[rpms/fontconfig] rawhide: New upstream release

[Akira TAGOH <tagoh@redhat.com>]

            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