fontconfig: Branch 'main' - 2 commits

[GitLab Mirror]

 .gitlab-ci/build.sh       |    2 +-
 .gitlab-ci/other.yml      |    4 ++--
 fc-fontations/meson.build |    5 ++---
 meson.build               |    4 ----
 4 files changed, 5 insertions(+), 10 deletions(-)

New commits:
commit 81572e86d6a798d4882397639513c6dd849848bd
Merge: 1188be6 80bbe03
Author: Akira TAGOH <akira at tagoh.org>
Date:   Tue Apr 22 08:59:03 2025 +0000

    Merge branch 'meson161features' into 'main'
    
    [Fontations] Improve resolution of Rust crate features
    
    Closes #459
    
    See merge request fontconfig/fontconfig!387

commit 80bbe031c9a09fe8a3b8079e7de6a90bf7457884
Author: Dominik Röttsches <drott at chromium.org>
Date:   Thu Apr 17 11:50:53 2025 +0300

    [Fontations] Improve resolution of Rust crate features
    
    Order and fix dependencies in fc-fontations/meson.build and
    allow meson >= 1.6.1 without requiring clamping on ==1.6.1.
    
    Fixes #459.

diff --git a/.gitlab-ci/build.sh b/.gitlab-ci/build.sh
index 765ddf4..f58e1c7 100755
--- a/.gitlab-ci/build.sh
+++ b/.gitlab-ci/build.sh
@@ -139,7 +139,7 @@ if [ x"$buildsys" == "xautotools" ]; then
     fi
 elif [ x"$buildsys" == "xmeson" ]; then
     TASK="pip install"
-    pip install meson==1.6.1
+    pip install meson>=1.6.1
 #   tomli not required for Python >= 3.11
     pip install tomli
     pip install pytest pytest-tap requests
diff --git a/.gitlab-ci/other.yml b/.gitlab-ci/other.yml
index 3424d6d..f019a88 100644
--- a/.gitlab-ci/other.yml
+++ b/.gitlab-ci/other.yml
@@ -19,7 +19,7 @@
     #   -Dbar=disabled
   before_script:
     # Make sure meson is up to date, so we don't need to rebuild the image with each release
-    - pip3 install -U meson==1.6.1 certifi tomli requests
+    - pip3 install -U meson>=1.6.1 certifi tomli requests
     # Test Rust availability. As of 11/25/2024, according to
     # https://gitlab.freedesktop.org/gstreamer/gstreamer/-/blob/main/ci/docker/windows/Dockerfile
     # Rust 1.82 is already installed.
@@ -72,7 +72,7 @@ meson vs2019 x86:
   before_script:
     - pip3 install --upgrade pip
     # Make sure meson is up to date
-    - pip3 install -U meson==1.6.1
+    - pip3 install -U 'meson>=1.6.1'
     # For Python < 3.11 we need tomli for Rust build support
     - pip3 install -U tomli
     # Need to install certificates for python
diff --git a/fc-fontations/meson.build b/fc-fontations/meson.build
index 213671e..6fdd33d 100644
--- a/fc-fontations/meson.build
+++ b/fc-fontations/meson.build
@@ -44,11 +44,10 @@ if (fontations.enabled())
     link_with: [bindgen_lib, pattern_lib],
     rust_abi: 'c',
     dependencies: [
-      dependency('libc-0.2-rs'),
-      dependency('read-fonts-0.23-rs'),
       dependency('skrifa-0.24-rs'),
+      dependency('read-fonts-0.23-rs'),
+      dependency('font-types-0.7-rs'),
       dependency('libc-0.2-rs')
-
     ],
     install: true,
 
diff --git a/meson.build b/meson.build
index c710b16..eb5c618 100644
--- a/meson.build
+++ b/meson.build
@@ -4,9 +4,6 @@ project('fontconfig', 'c',
   default_options: [
     'c_std=c11,c99',
     'buildtype=debugoptimized',
-  'bytemuck-1-rs:feature-derive=true',
-  'bytemuck-1-rs:feature-min_const_generics=true',
-  'read-fonts-0.23-rs:feature-experimental_traverse=true',
   ]
 )
 
@@ -84,7 +81,6 @@ fontations = get_option('fontations')
 if (fontations.enabled())
   conf.set('ENABLE_FONTATIONS', 1)
   add_languages(['rust'], native: false, required : true)
-
 endif
 
 pkgmod = import('pkgconfig')