fontconfig: Branch 'main' - 4 commits

[GitLab Mirror]

 .gitlab-ci/other.yml |    4 ++--
 meson.build          |    2 +-
 src/meson.build      |   10 +++++-----
 3 files changed, 8 insertions(+), 8 deletions(-)

New commits:
commit f19cbe1cb255e0855c99fa5e1d64a058d48b5197
Author: Akira TAGOH <akira at tagoh.org>
Date:   Wed Apr 10 14:20:04 2024 +0900

    ci: build with expat on MSVC

diff --git a/.gitlab-ci/other.yml b/.gitlab-ci/other.yml
index a52e9c7..dc53011 100644
--- a/.gitlab-ci/other.yml
+++ b/.gitlab-ci/other.yml
@@ -31,7 +31,7 @@
       SET CERT_PATH=$(python -m certifi) &&
       SET SSL_CERT_FILE=$(python -m certifi) &&
       SET REQUESTS_CA_BUNDLE=$(python -m certifi) &&
-      meson setup $env:MESON_ARGS build &&
+      meson setup -Dxml-backend=expat $env:MESON_ARGS build &&
       meson compile --verbose -C build &&
       meson test -C build"
   artifacts:
commit 3875d3260e85b65062108583ffbfee1e88c1b186
Author: Akira TAGOH <akira at tagoh.org>
Date:   Wed Apr 10 13:56:29 2024 +0900

    ci: disable iconv for MSVC

diff --git a/.gitlab-ci/other.yml b/.gitlab-ci/other.yml
index bc5d8b8..a52e9c7 100644
--- a/.gitlab-ci/other.yml
+++ b/.gitlab-ci/other.yml
@@ -31,7 +31,7 @@
       SET CERT_PATH=$(python -m certifi) &&
       SET SSL_CERT_FILE=$(python -m certifi) &&
       SET REQUESTS_CA_BUNDLE=$(python -m certifi) &&
-      meson setup -Diconv=enabled $env:MESON_ARGS build &&
+      meson setup $env:MESON_ARGS build &&
       meson compile --verbose -C build &&
       meson test -C build"
   artifacts:
commit 78d1e6180601146478ec794279cb6ea603f8cf35
Author: Akira TAGOH <akira at tagoh.org>
Date:   Wed Apr 10 13:00:29 2024 +0900

    ci: Fix a typo

diff --git a/.gitlab-ci/other.yml b/.gitlab-ci/other.yml
index e72835c..bc5d8b8 100644
--- a/.gitlab-ci/other.yml
+++ b/.gitlab-ci/other.yml
@@ -33,7 +33,7 @@
       SET REQUESTS_CA_BUNDLE=$(python -m certifi) &&
       meson setup -Diconv=enabled $env:MESON_ARGS build &&
       meson compile --verbose -C build &&
-      meson test -C build
+      meson test -C build"
   artifacts:
     name: fontconfig-$CI_COMMIT_SHA-$CI_JOB_ID
     when: always
commit 162326d84ec9e99e770c4b9674572655ff6a7ec7
Author: Akira TAGOH <akira at tagoh.org>
Date:   Wed Apr 10 12:30:15 2024 +0900

    meson: Use c_shared_args to take care of --default-library=both on Win32

diff --git a/meson.build b/meson.build
index 8d7a6e1..f358227 100644
--- a/meson.build
+++ b/meson.build
@@ -1,6 +1,6 @@
 project('fontconfig', 'c',
   version: '2.15.0',
-  meson_version : '>= 0.60.0',
+  meson_version : '>= 1.3.0',
   default_options: [ 'buildtype=debugoptimized'],
 )
 
diff --git a/src/meson.build b/src/meson.build
index 63c7340..c994f92 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -55,16 +55,16 @@ fcobjshash_h = custom_target('fcobjshash.h',
 )
 
 # Define FcPublic appropriately for exports on windows
-fc_extra_c_args = []
+fc_c_shared_args = []
 
-if host_machine.system() == 'windows' and get_option('default_library') == 'shared'
-  fc_extra_c_args += '-DFcPublic=__declspec(dllexport)'
-  fc_extra_c_args += '-DDLL_EXPORT'
+if host_machine.system() == 'windows' and get_option('default_library') in ['both', 'shared']
+  fc_c_shared_args += '-DFcPublic=__declspec(dllexport)'
+  fc_c_shared_args += '-DDLL_EXPORT'
 endif
 
 libfontconfig = library('fontconfig',
   fc_sources, alias_headers, ft_alias_headers, fclang_h, fccase_h, fcobjshash_h,
-  c_args: c_args + fc_extra_c_args,
+  c_shared_args: fc_c_shared_args,
   include_directories: incbase,
   dependencies: [deps, math_dep],
   install: true,