[rpms/fontconfig] rawhide: Fallback to Noto Sans if no system-ui font available

[rpms/fontconfig] rawhide: Fallback to Noto Sans if no system-ui font available

[Akira TAGOH]

A new commit has been pushed.

Repo   : rpms/fontconfig
Branch : rawhide
Commit : 0e4236435c6e7056f187e0fa4cd77d31cba77010
Author : Akira TAGOH <tagoh@redhat.com>
Date   : 2026-07-17T16:33:52+09:00
Stats  : +110/-0 in 2 file(s)
URL    : https://src.fedoraproject.org/rpms/fontconfig/c/0e4236435c6e7056f187e0fa4cd77d31cba77010?branch=rawhide

Log:
Fallback to Noto Sans if no system-ui font available

---
diff --git a/fontconfig-fix-system-ui.patch b/fontconfig-fix-system-ui.patch
new file mode 100644
index 0000000..c83a01e
--- /dev/null
+++ b/fontconfig-fix-system-ui.patch
@@ -0,0 +1,108 @@
+From f88ed10fdc55cec2a55089e708ec4600ad526225 Mon Sep 17 00:00:00 2001
+From: Akira TAGOH <akira@tagoh.org>
+Date: Thu, 16 Jul 2026 16:57:12 +0900
+Subject: [PATCH 1/2] Add Noto Sans as system-ui for fallback
+
+This is a workaround that applications accidentally picks up Noto Sans CJK KR as a system-ui font.
+This is actually a regression since 84ae86bc though, it happens when a system doesn't have any
+system-ui font we have in 40-nonlatin.conf and 60-latin.conf.
+
+Fixes https://github.com/fedora-eln/eln/issues/580
+
+Changelog: fixed
+---
+ conf.d/60-latin.conf    |  1 +
+ test/test-60-latin.json | 38 ++++++++++++++++++++++++++++++++++++++
+ 2 files changed, 39 insertions(+)
+ create mode 100644 test/test-60-latin.json
+
+diff --git a/conf.d/60-latin.conf b/conf.d/60-latin.conf
+index ae3be3c7..6233ea28 100644
+--- a/conf.d/60-latin.conf
++++ b/conf.d/60-latin.conf
+@@ -83,6 +83,7 @@
+ 			<family>Segoe UI</family>
+ 			<family>Segoe UI Historic</family>
+ 			<family>Segoe UI Symbol</family>
++			<family>Noto Sans</family><!-- fallback -->
+ 		</prefer>
+ 	</alias>
+ 
+diff --git a/test/test-60-latin.json b/test/test-60-latin.json
+new file mode 100644
+index 00000000..da142c88
+--- /dev/null
++++ b/test/test-60-latin.json
+@@ -0,0 +1,38 @@
++{
++  "env": {
++    "locale": "en_US.UTF-8",
++  },
++  "fonts": [
++    {
++      "family": "Noto Sans",
++      "style": "Regular",
++      "file": "/path/to/NotoSans.ttf",
++    },
++    {
++      "family": "Noto Sans CJK KR",
++      "style": "Regular",
++      "file": "/path/to/NotoSansCJK.ttc",
++    }
++  ],
++  "load_xml": [
++    "conf.d/40-nonlatin.conf",
++    "conf.d/45-latin.conf",
++    "conf.d/48-guessfamily.conf",
++    "conf.d/49-sansserif.conf",
++    "conf.d/60-latin.conf",
++    "conf.d/65-nonlatin.conf",
++  ],
++  "tests": [
++    {
++      "method": "match",
++      "query": {
++        "family": "Cantarell",
++      },
++      "result": {
++        "family": "Noto Sans",
++        "style": "Regular",
++        "file": "/path/to/NotoSans.ttf",
++      }
++    },
++  ]
++}
+-- 
+2.55.0
+
+From 7d13bb959c7b55bbaebdc09b7e71311e0cf78f77 Mon Sep 17 00:00:00 2001
+From: Akira TAGOH <akira@tagoh.org>
+Date: Thu, 16 Jul 2026 16:59:27 +0900
+Subject: [PATCH 2/2] Drop Noto Sans CJK KR from 60-nonlatin.conf
+
+Noto Sans CJK KR can be used as system-ui but Noto Sans CJK KR can't be system-ui. We shouldn't
+request any candidate of system-ui fonts for fallback of "Noto Sans CJK KR".
+
+Changelog: fixed
+---
+ conf.d/40-nonlatin.conf | 4 ----
+ 1 file changed, 4 deletions(-)
+
+diff --git a/conf.d/40-nonlatin.conf b/conf.d/40-nonlatin.conf
+index 2609619b..742deaca 100644
+--- a/conf.d/40-nonlatin.conf
++++ b/conf.d/40-nonlatin.conf
+@@ -312,10 +312,6 @@
+ 		<family>Khmer UI</family>
+ 		<default><family>system-ui</family></default>
+ 	</alias>
+-	<alias>
+-		<family>Noto Sans CJK KR</family>
+-		<default><family>system-ui</family></default>
+-	</alias>
+ 	<alias>
+ 		<family>Lao UI</family>
+ 		<default><family>system-ui</family></default>
+-- 
+2.55.0
+

diff --git a/fontconfig.spec b/fontconfig.spec
index b16065e..1ded4ab 100644
--- a/fontconfig.spec
+++ b/fontconfig.spec
@@ -23,6 +23,8 @@ Patch4:		%{name}-drop-lang-from-pkgkit-format.patch
 Patch6:		%{name}-lower-nonlatin-conf.patch
 # Fedora specific
 Patch7:		%{name}-update-fcgenericfamily.patch
+# Backport
+Patch8:		%{name}-fix-system-ui.patch
 
 BuildRequires:	libxml2-devel
 BuildRequires:	freetype-devel >= %{freetype_version}