public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: Akira TAGOH <tagoh@redhat.com>
To: git-commits@fedoraproject.org
Subject: [rpms/fontconfig] rawhide: New upstream release
Date: Thu, 06 Aug 2026 12:20:50 GMT	[thread overview]
Message-ID: <178601885002.1.11210799706455291982.rpms-fontconfig-08533c2effae@fedoraproject.org> (raw)

            A new commit has been pushed.

            Repo   : rpms/fontconfig
            Branch : rawhide
            Commit : 08533c2effae657c07bcb6c3ae63767e83726a4f
            Author : Akira TAGOH <tagoh@redhat.com>
            Date   : 2026-08-06T21:20:26+09:00
            Stats  : +3/-112 in 4 file(s)
            URL    : https://src.fedoraproject.org/rpms/fontconfig/c/08533c2effae657c07bcb6c3ae63767e83726a4f?branch=rawhide

            Log:
            New upstream release

- Resolves: rhbz#2511962

---
diff --git a/.gitignore b/.gitignore
index b3f1bd3..bc035b8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -45,3 +45,4 @@ fontconfig-2.8.0.tar.gz
 /fontconfig-2.16.2.tar.xz
 /fontconfig-2.17.0.tar.xz
 /fontconfig-2.18.2.tar.xz
+/fontconfig-2.18.3.tar.xz

diff --git a/fontconfig-fix-system-ui.patch b/fontconfig-fix-system-ui.patch
deleted file mode 100644
index c83a01e..0000000
--- a/fontconfig-fix-system-ui.patch
+++ /dev/null
@@ -1,108 +0,0 @@
-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 c60cf0f..fdb0d4d 100644
--- a/fontconfig.spec
+++ b/fontconfig.spec
@@ -4,7 +4,7 @@
 
 Summary:	Font configuration and customization library
 Name:		fontconfig
-Version:	2.18.2
+Version:	2.18.3
 Release:	%autorelease
 # src/ftglue.[ch] is in Public Domain
 # src/fccache.c contains Public Domain code
@@ -23,8 +23,6 @@ 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}

diff --git a/sources b/sources
index 2c7c3db..f98e0e7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (fontconfig-2.18.2.tar.xz) = eba8f7fe5409159d6a9e0fd562dd3a7643da94b41fc0fdb2b742d5f4950ca2d6e636461352b2f148720653c83957373d28329ed20b50e7efd76ecfc60b2f3434
+SHA512 (fontconfig-2.18.3.tar.xz) = c3e769f74dc21093ada48084bddaca1ab525b1c4f04c5c11f067b69346fab153cad95de8b8238b20b02e8b9679c314bf2e0e9c4218511d8fe0f1826e4c4c6a24

             reply	other threads:[~2026-08-06 12:20 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-08-06 12:20 Akira TAGOH [this message]
  -- strict thread matches above, loose matches on Subject: below --
2026-07-10  9:34 [rpms/fontconfig] rawhide: New upstream release Akira TAGOH

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=178601885002.1.11210799706455291982.rpms-fontconfig-08533c2effae@fedoraproject.org \
    --to=tagoh@redhat.com \
    --cc=git-commits@fedoraproject.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox