[Fontconfig] fontconfig: Branch 'main' - 3 commits

[GitLab Mirror]

 conf.d/link_confs.py |    4 +++-
 fc-cache/meson.build |    3 ++-
 meson.build          |    5 +++--
 po-conf/meson.build  |    2 +-
 po/meson.build       |    2 +-
 5 files changed, 10 insertions(+), 6 deletions(-)

New commits:
commit 0924a35b6755baaaa4af7c9c2c6001c4ff7bea3d
Author: Xavier Claessens <xavier.claessens at collabora.com>
Date:   Tue Sep 13 08:51:36 2022 -0400

    link_confs.py: Fix prepending DESTDIR to absolute path
    
    Stripping the first char of a path to make it relative only works with
    UNIX paths like '/prefix' but not with Windows paths like 'c:\prefix'.
    
    This copies the code Meson uses.

diff --git a/conf.d/link_confs.py b/conf.d/link_confs.py
index 52b8093..11e759a 100644
--- a/conf.d/link_confs.py
+++ b/conf.d/link_confs.py
@@ -4,6 +4,7 @@ import os
 import sys
 import argparse
 import platform
+from pathlib import PurePath
 
 if __name__=='__main__':
     parser = argparse.ArgumentParser()
@@ -15,7 +16,8 @@ if __name__=='__main__':
     if os.path.isabs(args.confpath):
         destdir = os.environ.get('DESTDIR')
         if destdir:
-            confpath = os.path.join(destdir, args.confpath[1:])
+            # c:\destdir + c:\prefix must produce c:\destdir\prefix
+            confpath = str(PurePath(destdir, *PurePath(args.confpath).parts[1:]))
         else:
             confpath = args.confpath
     else:
commit 36f5b76640b73f5e0c6aa1ed19100d238e54d650
Author: Xavier Claessens <xavier.claessens at collabora.com>
Date:   Wed Sep 7 09:34:29 2022 -0400

    meson: Fix configuration warnings

diff --git a/meson.build b/meson.build
index 88b553b..a9ec544 100644
--- a/meson.build
+++ b/meson.build
@@ -334,7 +334,8 @@ else
   @1@
   '''
   gperf_snippet_format = 'echo foo,bar | @0@ -L ANSI-C'
-  gperf_snippet = run_command(sh, '-c', gperf_snippet_format.format(gperf.path()))
+  gperf_snippet = run_command(sh, '-c', gperf_snippet_format.format(gperf.full_path()),
+    check: true)
   gperf_test = gperf_test_format.format('size_t', gperf_snippet.stdout())
 
   if cc.compiles(gperf_test)
diff --git a/po-conf/meson.build b/po-conf/meson.build
index 4567cae..5c2a39e 100644
--- a/po-conf/meson.build
+++ b/po-conf/meson.build
@@ -1,3 +1,3 @@
 i18n.gettext(meson.project_name(),
-    args: '--directory=' + meson.source_root()
+    args: '--directory=' + meson.project_source_root()
 )
diff --git a/po/meson.build b/po/meson.build
index 20152e3..5cea343 100644
--- a/po/meson.build
+++ b/po/meson.build
@@ -1,3 +1,3 @@
 i18n.gettext(meson.project_name() + '-conf',
-    args: '--directory=' + meson.source_root()
+    args: '--directory=' + meson.project_source_root()
 )
commit 952a04a9f26706c13af569419b7966f36899ee0c
Author: Xavier Claessens <xavier.claessens at collabora.com>
Date:   Wed Sep 7 09:32:31 2022 -0400

    meson: Do not run fc-cache when installing into a DESTDIR
    
    It cause permission denied errors because it is often not run as root.
    This requires Meson >=0.57.0.

diff --git a/fc-cache/meson.build b/fc-cache/meson.build
index 5e40fac..313cfef 100644
--- a/fc-cache/meson.build
+++ b/fc-cache/meson.build
@@ -9,5 +9,6 @@ tools_man_pages += ['fc-cache']
 
 # Do not try to execute target's fc-cache on host when cross compiling
 if get_option('cache-build').enabled() and not meson.is_cross_build()
-  meson.add_install_script(fccache, '-s', '-f', '-v')
+  meson.add_install_script(fccache, '-s', '-f', '-v',
+    skip_if_destdir: true)
 endif
diff --git a/meson.build b/meson.build
index aca67ad..88b553b 100644
--- a/meson.build
+++ b/meson.build
@@ -1,6 +1,6 @@
 project('fontconfig', 'c',
   version: '2.14.0',
-  meson_version : '>= 0.56.0',
+  meson_version : '>= 0.57.0',
   default_options: [ 'buildtype=debugoptimized'],
 )