fontconfig: Branch 'main' - 3 commits

[GitLab Mirror]

 .gitlab-ci/other.yml |    2 ++
 conf.d/45-latin.conf |    4 ++++
 conf.d/60-latin.conf |    1 +
 3 files changed, 7 insertions(+)

New commits:
commit 25f58a52b0b30efbba0ea27c98dc58e411a42b84
Merge: 8e2416e 5206550
Author: Akira TAGOH <akira at tagoh.org>
Date:   Tue Feb 25 17:14:36 2025 +0000

    Merge branch 'issues/449' into 'main'
    
    conf.d: Add Adwaita Sans as system-ui
    
    Closes #449
    
    See merge request fontconfig/fontconfig!365

commit 5206550a7abab62429f8014ee6dda564e8e79c9e
Author: Akira TAGOH <akira at tagoh.org>
Date:   Wed Feb 26 01:19:17 2025 +0900

    ci: disable  job tentatively

diff --git a/.gitlab-ci/other.yml b/.gitlab-ci/other.yml
index b2aad54..9a61518 100644
--- a/.gitlab-ci/other.yml
+++ b/.gitlab-ci/other.yml
@@ -123,6 +123,8 @@ meson msys2:
       ninja -C build test"
 
 meson android arm64 fedora:
+  # No container images available. Disabling
+  when: "manual"
   # See https://gitlab.freedesktop.org/gstreamer/gst-ci/container_registry/164 for current images
   image: "registry.freedesktop.org/gstreamer/gst-ci/amd64/android-fedora:2020-10-22.0-master"
   stage: "test"
commit cae799b569f3befcd405d948e50ee98fc6d17f08
Author: Akira TAGOH <akira at tagoh.org>
Date:   Wed Feb 26 00:42:23 2025 +0900

    conf.d: Add Adwaita Sans as system-ui
    
    Fixes https://gitlab.freedesktop.org/fontconfig/fontconfig/-/issues/449

diff --git a/conf.d/45-latin.conf b/conf.d/45-latin.conf
index e48a753..53158c7 100644
--- a/conf.d/45-latin.conf
+++ b/conf.d/45-latin.conf
@@ -281,6 +281,10 @@
 <!--
   system-ui
 -->
+	<alias>
+		<family>Adwaita Sans</family>
+		<default><family>system-ui</family></default>
+	</alias>
 	<alias>
 		<family>Cantarell</family>
 		<default><family>system-ui</family></default>
diff --git a/conf.d/60-latin.conf b/conf.d/60-latin.conf
index ff933af..ae3be3c 100644
--- a/conf.d/60-latin.conf
+++ b/conf.d/60-latin.conf
@@ -77,6 +77,7 @@
 	<alias>
 		<family>system-ui</family>
 		<prefer>
+			<family>Adwaita Sans</family>
 			<family>Cantarell</family>
 			<family>Noto Sans UI</family>
 			<family>Segoe UI</family>