public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/fontconfig] rawhide: New upstream release
@ 2026-08-06 12:20 Akira TAGOH
0 siblings, 0 replies; 2+ messages in thread
From: Akira TAGOH @ 2026-08-06 12:20 UTC (permalink / raw)
To: git-commits
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
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [rpms/fontconfig] rawhide: New upstream release
@ 2026-07-10 9:34 Akira TAGOH
0 siblings, 0 replies; 2+ messages in thread
From: Akira TAGOH @ 2026-07-10 9:34 UTC (permalink / raw)
To: git-commits
A new commit has been pushed.
Repo : rpms/fontconfig
Branch : rawhide
Commit : 7e86024bb5065bf36dac31f61e948f5664f0b74b
Author : Akira TAGOH <tagoh@redhat.com>
Date : 2026-07-10T18:34:11+09:00
Stats : +49/-145 in 4 file(s)
URL : https://src.fedoraproject.org/rpms/fontconfig/c/7e86024bb5065bf36dac31f61e948f5664f0b74b?branch=rawhide
Log:
New upstream release
Resolves: rhbz#2480521
---
diff --git a/fontconfig-disable-network-required-test.patch b/fontconfig-disable-network-required-test.patch
deleted file mode 100644
index e048b49..0000000
--- a/fontconfig-disable-network-required-test.patch
+++ /dev/null
@@ -1,113 +0,0 @@
-diff -pruN fontconfig-2.17.0.orig/test/meson.build fontconfig-2.17.0/test/meson.build
---- fontconfig-2.17.0.orig/test/meson.build 2025-06-27 12:12:04.000000000 +0900
-+++ fontconfig-2.17.0/test/meson.build 2025-06-27 14:41:08.843726446 +0900
-@@ -1,16 +1,16 @@
--fetch_test_fonts = custom_target(
-- 'fetch_test_fonts',
-- output: 'testfonts',
-- command: [
-- python3,
-- join_paths(meson.project_source_root(), 'build-aux', 'fetch-testfonts.py'),
-- '--target-dir',
-- '@BUILD_ROOT@/testfonts',
-- '--try-symlink',
-- ],
-- build_by_default: false,
-- build_always_stale: true,
--)
-+#fetch_test_fonts = custom_target(
-+# 'fetch_test_fonts',
-+# output: 'testfonts',
-+# command: [
-+# python3,
-+# join_paths(meson.project_source_root(), 'build-aux', 'fetch-testfonts.py'),
-+# '--target-dir',
-+# '@BUILD_ROOT@/testfonts',
-+# '--try-symlink',
-+# ],
-+# build_by_default: false,
-+# build_always_stale: true,
-+#)
-
- tests = [
- ['test-bz89617.c', {'c_args': ['-DSRCDIR="@0@"'.format(meson.current_source_dir())]}],
-@@ -33,7 +33,7 @@ if host_machine.system() != 'windows'
- ]
- tests_not_parallel += [
- # FIXME: this needs NotoSans-hinted.zip font downloaded and unpacked into test build directory! see run-test.sh
-- ['test-crbug1004254.c', {'dependencies': dependency('threads')}], # for pthread
-+ # ['test-crbug1004254.c', {'dependencies': dependency('threads')}], # for pthread
- ['test-mt-fccfg.c', {'include_directories': include_directories('../src'), 'dependencies': dependency('threads')}],
- ]
-
-@@ -74,10 +74,10 @@ foreach test_data : tests + tests_not_pa
- endforeach
-
-
--if get_option('fontations').enabled()
-- rust = import('rust')
-- rust.test('fc_fontations_rust_tests', fc_fontations, link_with: [libfontconfig_internal], depends: fetch_test_fonts, env: ['builddir=@0@'.format(meson.project_build_root())],)
--endif
-+#if get_option('fontations').enabled()
-+# rust = import('rust')
-+# rust.test('fc_fontations_rust_tests', fc_fontations, link_with: [libfontconfig_internal], depends: fetch_test_fonts, env: ['builddir=@0@'.format(meson.project_build_root())],)
-+#endif
-
- fs = import('fs')
-
-@@ -92,14 +92,14 @@ if host_machine.system() != 'windows'
-
- test('run_test_sh', find_program('run-test.sh'), timeout: 600, env: ['srcdir=@0@'.format(meson.current_source_dir()), 'builddir=@0@'.format(meson.current_build_dir()), 'EXEEXT=@0@'.format(conf.get('EXEEXT')), 'VERBOSE=1'])
-
-- if pytest.found()
-- test('pytest', pytest, args: ['--tap'],
-- workdir: meson.current_source_dir(),
-- env: ['builddir=@0@'.format(meson.project_build_root())],
-- protocol: 'tap',
-- timeout: 600,
-- depends: fetch_test_fonts)
-- endif
-+# if pytest.found()
-+# test('pytest', pytest, args: ['--tap'],
-+# workdir: meson.current_source_dir(),
-+# env: ['builddir=@0@'.format(meson.project_build_root())],
-+# protocol: 'tap',
-+# timeout: 600,
-+# depends: fetch_test_fonts)
-+# endif
- endif
-
- if jsonc_dep.found()
-diff -pruN fontconfig-2.17.0.orig/test/run-test.sh fontconfig-2.17.0/test/run-test.sh
---- fontconfig-2.17.0.orig/test/run-test.sh 2025-06-27 12:12:04.000000000 +0900
-+++ fontconfig-2.17.0/test/run-test.sh 2025-06-27 14:39:19.098581228 +0900
-@@ -521,18 +521,18 @@ rm -rf "$MYCACHEBASEDIR" "$MYCONFIG" "$B
-
- fi # if [ "x$EXEEXT" = "x" ]
-
--if [ -x "$BUILDTESTDIR"/test-crbug1004254 ]; then
-- dotest "MT-safe global config"
-- prep
-- curl -s -o "$FONTDIR"/noto.zip https://noto-website-2.storage.googleapis.com/pkgs/NotoSans-hinted.zip
-- (cd "$FONTDIR"; unzip noto.zip)
-- if [ -n "${SOURCE_DATE_EPOCH:-}" ] && [ ${#SOURCE_DATE_EPOCH} -gt 0 ]; then
-- touch -m -t "$(fdate ${SOURCE_DATE_EPOCH})" "$FONTDIR"
-- fi
-- "$BUILDTESTDIR"/test-crbug1004254
--else
-+#if [ -x "$BUILDTESTDIR"/test-crbug1004254 ]; then
-+# dotest "MT-safe global config"
-+# prep
-+# curl -s -o "$FONTDIR"/noto.zip https://noto-website-2.storage.googleapis.com/pkgs/NotoSans-hinted.zip
-+# (cd "$FONTDIR"; unzip noto.zip)
-+# if [ -n "${SOURCE_DATE_EPOCH:-}" ] && [ ${#SOURCE_DATE_EPOCH} -gt 0 ]; then
-+# touch -m -t "$(fdate ${SOURCE_DATE_EPOCH})" "$FONTDIR"
-+# fi
-+# "$BUILDTESTDIR"/test-crbug1004254
-+#else
- echo "No test-crbug1004254: skipped"
--fi
-+#fi
-
- if [ "x$EXEEXT" = "x" ]; then
-
diff --git a/fontconfig-fix-crash.patch b/fontconfig-fix-crash.patch
deleted file mode 100644
index c52b33d..0000000
--- a/fontconfig-fix-crash.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From b9bec06d73340f1b5727302d13ac3df307b7febc Mon Sep 17 00:00:00 2001
-From: Akira TAGOH <akira@tagoh.org>
-Date: Mon, 30 Jun 2025 09:05:18 +0900
-Subject: [PATCH] Fix a heap buffer overflow
-
-https://gitlab.freedesktop.org/fontconfig/fontconfig/-/issues/481
-
-Changelog: fixed
----
- src/fcfreetype.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/fcfreetype.c b/src/fcfreetype.c
-index 7a4d9811..0a87d27a 100644
---- a/src/fcfreetype.c
-+++ b/src/fcfreetype.c
-@@ -2661,7 +2661,7 @@ FcFontCapabilities (FT_Face face)
- goto bail;
-
- maxsize = (((FT_ULong)gpos_count + (FT_ULong)gsub_count) * OTLAYOUT_LEN +
-- (issilgraphitefont ? strlen(fcSilfCapability) : 0));
-+ (issilgraphitefont ? strlen(fcSilfCapability) + 1: 0));
- complex_ = malloc (sizeof (FcChar8) * maxsize);
- if (!complex_)
- goto bail;
---
-2.50.0
-
diff --git a/fontconfig-update-fcgenericfamily.patch b/fontconfig-update-fcgenericfamily.patch
new file mode 100644
index 0000000..9b93769
--- /dev/null
+++ b/fontconfig-update-fcgenericfamily.patch
@@ -0,0 +1,43 @@
+diff -pruN fontconfig-2.18.1.orig/fc-genericfamily/monospace.txt fontconfig-2.18.1/fc-genericfamily/monospace.txt
+--- fontconfig-2.18.1.orig/fc-genericfamily/monospace.txt 2026-07-02 18:26:39.000000000 +0900
++++ fontconfig-2.18.1/fc-genericfamily/monospace.txt 2026-07-02 20:28:07.336811750 +0900
+@@ -257,3 +257,20 @@ Tinos Nerd Font
+ Ubuntu Nerd Font
+ UbuntuMono Nerd Font
+ VictorMono Nerd Font
++# Fedora-specific
++Noto Sans Ethiopic
++Noto Sans Bengali
++Noto Sans Georgian
++Noto Sans Gujarati
++Noto Sans Hebrew
++Noto Sans Devanagari
++Noto Sans Kannada
++Noto Sans Khmer
++Noto Sans Lao
++Noto Sans Oriya
++Noto Sans Sinhala
++Noto Sans Tamil
++Noto Sans Telugu
++Noto Sans Thai
++Jomolhari
++
+diff -pruN fontconfig-2.18.1.orig/fc-genericfamily/sans-serif.txt fontconfig-2.18.1/fc-genericfamily/sans-serif.txt
+--- fontconfig-2.18.1.orig/fc-genericfamily/sans-serif.txt 2026-07-02 18:26:39.000000000 +0900
++++ fontconfig-2.18.1/fc-genericfamily/sans-serif.txt 2026-07-02 20:24:37.079481274 +0900
+@@ -565,3 +565,6 @@ Ubuntu
+ Ubuntu Condensed
+ # Nerd Fonts - Nerd Font sans-serif variants
+ Ubuntu Nerd Font
++# Fedora-specific
++PakType Naskh Basic
++Jomolhari
+diff -pruN fontconfig-2.18.1.orig/fc-genericfamily/serif.txt fontconfig-2.18.1/fc-genericfamily/serif.txt
+--- fontconfig-2.18.1.orig/fc-genericfamily/serif.txt 2026-07-02 18:26:39.000000000 +0900
++++ fontconfig-2.18.1/fc-genericfamily/serif.txt 2026-07-02 20:25:02.909273913 +0900
+@@ -325,3 +325,5 @@ Noto Serif Vithkuqi
+ Noto Serif Yezidi
+ # Nerd Fonts - Nerd Font serif variants
+ Tinos Nerd Font
++# Fedora-specific
++Padauk
diff --git a/fontconfig.spec b/fontconfig.spec
index 95d816b..12f50ae 100644
--- a/fontconfig.spec
+++ b/fontconfig.spec
@@ -4,7 +4,7 @@
Summary: Font configuration and customization library
Name: fontconfig
-Version: 2.17.0
+Version: 2.18.2
Release: %autorelease
# src/ftglue.[ch] is in Public Domain
# src/fccache.c contains Public Domain code
@@ -20,16 +20,16 @@ Source2: fc-cache
# https://bugzilla.redhat.com/show_bug.cgi?id=140335
Patch0: %{name}-sleep-less.patch
Patch4: %{name}-drop-lang-from-pkgkit-format.patch
-Patch5: %{name}-disable-network-required-test.patch
Patch6: %{name}-lower-nonlatin-conf.patch
-Patch7: %{name}-fix-crash.patch
+# Fedora specific
+Patch7: %{name}-update-fcgenericfamily.patch
BuildRequires: libxml2-devel
BuildRequires: freetype-devel >= %{freetype_version}
BuildRequires: fontpackages-devel
BuildRequires: gettext
BuildRequires: gperf
-BuildRequires: docbook-utils docbook-utils-pdf
+BuildRequires: docbook-utils wkhtmltopdf
BuildRequires: meson ninja-build gcc
Requires: fonts-filesystem freetype
@@ -79,6 +79,7 @@ mv conf.d/65-nonlatin.conf conf.d/69-nonlatin.conf
%meson -Ddoc=disabled -Dcache-build=disabled -Dxml-backend=libxml2 \
-Dadditional-fonts-dirs=/usr/share/X11/fonts/Type1,/usr/share/X11/fonts/TTF,/usr/local/share/fonts \
-Dcache-dir=/usr/lib/fontconfig/cache \
+ -Dtests-external-fonts=disabled \
--default-library=shared
%meson_build
@@ -175,6 +176,7 @@ fi
%{_bindir}/fc-cache*
%{_bindir}/fc-cat
%{_bindir}/fc-conflist
+%{_bindir}/fc-genconf
%{_bindir}/fc-list
%{_bindir}/fc-match
%{_bindir}/fc-pattern
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2026-08-06 12:20 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-08-06 12:20 [rpms/fontconfig] rawhide: New upstream release Akira TAGOH
-- strict thread matches above, loose matches on Subject: below --
2026-07-10 9:34 Akira TAGOH
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox