diff --git a/.fmf/version b/.fmf/version deleted file mode 100644 index d00491f..0000000 --- a/.fmf/version +++ /dev/null @@ -1 +0,0 @@ -1 diff --git a/.gitignore b/.gitignore index 8ea9665..73405e9 100644 --- a/.gitignore +++ b/.gitignore @@ -25,22 +25,3 @@ fontconfig-2.8.0.tar.gz /fontconfig-2.12.4.tar.bz2 /fontconfig-2.12.5.tar.bz2 /fontconfig-2.12.6.tar.bz2 -/fontconfig-2.12.91.tar.bz2 -/fontconfig-2.12.92.tar.bz2 -/fontconfig-2.12.93.tar.bz2 -/fontconfig-2.13.0.tar.bz2 -/fontconfig-2.13.1.tar.bz2 -/fontconfig-2.13.91.tar.xz -/fontconfig-2.13.92.tar.xz -/fontconfig-2.13.93.tar.xz -/fontconfig-2.13.94.tar.xz -/fontconfig-2.13.95.tar.xz -/fontconfig-2.13.96.tar.xz -/fontconfig-2.14.0.tar.xz -/fontconfig-2.14.1.tar.xz -/fontconfig-2.14.2.tar.xz -/fontconfig-2.15.0.tar.xz -/fontconfig-2.16.0.tar.xz -/fontconfig-2.16.1.tar.xz -/fontconfig-2.16.2.tar.xz -/fontconfig-2.17.0.tar.xz diff --git a/fc-cache b/fc-cache index 8253ae7..6a12446 100755 --- a/fc-cache +++ b/fc-cache @@ -1,4 +1,4 @@ #! /bin/sh -[ -x /usr/bin/fc-cache-32 ] && /usr/bin/fc-cache-32 "$@" || : -[ -x /usr/bin/fc-cache-64 ] && /usr/bin/fc-cache-64 "$@" || : +[ -x /usr/bin/fc-cache-32 ] && /usr/bin/fc-cache-32 $@ || : +[ -x /usr/bin/fc-cache-64 ] && /usr/bin/fc-cache-64 $@ || : 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-drop-lang-from-pkgkit-format.patch b/fontconfig-drop-lang-from-pkgkit-format.patch deleted file mode 100644 index abece6d..0000000 --- a/fontconfig-drop-lang-from-pkgkit-format.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -pruN fontconfig-2.16.1.orig/src/fcformat.c fontconfig-2.16.1/src/fcformat.c ---- fontconfig-2.16.1.orig/src/fcformat.c 2025-03-13 20:16:47.000000000 +0900 -+++ fontconfig-2.16.1/src/fcformat.c 2025-03-13 20:42:03.633324643 +0900 -@@ -77,7 +77,7 @@ - #define FCCAT_FORMAT "\"%{file|basename|cescape}\" %{index} \"%{-file{%{=unparse|cescape}}}\"" - #define FCMATCH_FORMAT "%{file:-|basename}: \"%{family[0]:-}\" \"%{style[0]:-}\"" - #define FCLIST_FORMAT "%{?file{%{file}: }}%{-file{%{=unparse}}}" --#define PKGKIT_FORMAT "%{[]family{font(%{family|downcase|delete( )})\n}}%{[]lang{font(:lang=%{lang|downcase|translate(_,-)})\n}}" -+#define PKGKIT_FORMAT "%{[]family{font(%{family|downcase|delete( )})\n}}" - - static void - message (const char *fmt, ...) diff --git a/fontconfig-emoji.patch b/fontconfig-emoji.patch new file mode 100644 index 0000000..2c39e1b --- /dev/null +++ b/fontconfig-emoji.patch @@ -0,0 +1,94 @@ +From b861a2a5b09e06795dea4de6e72447d364b89473 Mon Sep 17 00:00:00 2001 +From: Bastien Nocera +Date: Thu, 5 Oct 2017 12:17:59 +0200 +Subject: [PATCH] conf: Prefer system emoji fonts to third-party ones + +Prefer the system provided emoji fonts on systems which provide one, +such as Windows, MacOS and Android, even if the Emoji One or Emoji Two +fonts are installed. + +This also allows free software OSes such as GNOME to prefer the Emoji +One font, which is not used in other OSes and therefore has a unique +brand identity, by installing them and only them by default. + +Users can use more capable fonts while Emoji One and Emoji Two catch up +by installing a font otherwise already used by another system, such as +Google's freely redistributable Noto Emoji font. + +https://bugzilla.redhat.com/show_bug.cgi?id=1496761 +--- + conf.d/45-generic.conf | 16 +++++++++------- + conf.d/60-generic.conf | 5 +++-- + 2 files changed, 12 insertions(+), 9 deletions(-) + +diff --git a/conf.d/45-generic.conf b/conf.d/45-generic.conf +index f6076bb..791d12d 100644 +--- a/conf.d/45-generic.conf ++++ b/conf.d/45-generic.conf +@@ -5,32 +5,34 @@ + + + ++ + +- Emoji Two ++ Noto Color Emoji + emoji + + +- Emoji One ++ Apple Color Emoji + emoji + + +- Noto Color Emoji ++ Segoe UI Emoji + emoji + + +- Apple Color Emoji ++ Twitter Color Emoji + emoji + + +- Segoe UI Emoji ++ EmojiOne Mozilla + emoji + ++ + +- Twitter Color Emoji ++ Emoji Two + emoji + + +- EmojiOne Mozilla ++ Emoji One + emoji + + +diff --git a/conf.d/60-generic.conf b/conf.d/60-generic.conf +index 2a2b809..7985ce9 100644 +--- a/conf.d/60-generic.conf ++++ b/conf.d/60-generic.conf +@@ -29,14 +29,15 @@ + + emoji + +- Emoji Two +- Emoji One + + Noto Color Emoji + Apple Color Emoji + Segoe UI Emoji + Twitter Color Emoji + EmojiOne Mozilla ++ ++ Emoji Two ++ Emoji One + + Noto Emoji + Android Emoji +-- +2.14.1 + 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 -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-lower-nonlatin-conf.patch b/fontconfig-lower-nonlatin-conf.patch deleted file mode 100644 index 3ff373a..0000000 --- a/fontconfig-lower-nonlatin-conf.patch +++ /dev/null @@ -1,42 +0,0 @@ -diff -pruN fontconfig-2.16.0.orig/conf.d/Makefile.am fontconfig-2.16.0/conf.d/Makefile.am ---- fontconfig-2.16.0.orig/conf.d/Makefile.am 2025-01-18 00:15:05.000000000 +0900 -+++ fontconfig-2.16.0/conf.d/Makefile.am 2025-01-18 00:38:32.245398277 +0900 -@@ -47,7 +47,7 @@ CONF_LINKS = \ - 60-generic.conf \ - 60-latin.conf \ - 65-fonts-persian.conf \ -- 65-nonlatin.conf \ -+ 69-nonlatin.conf \ - 69-unifont.conf \ - 80-delicious.conf \ - 90-synthetic.conf -@@ -95,7 +95,7 @@ template_DATA = \ - 60-latin.conf \ - 65-fonts-persian.conf \ - 65-khmer.conf \ -- 65-nonlatin.conf \ -+ 69-nonlatin.conf \ - 69-unifont.conf \ - 70-no-bitmaps.conf \ - 70-no-bitmaps-and-emoji.conf \ -diff -pruN fontconfig-2.16.0.orig/conf.d/meson.build fontconfig-2.16.0/conf.d/meson.build ---- fontconfig-2.16.0.orig/conf.d/meson.build 2025-01-18 00:15:05.000000000 +0900 -+++ fontconfig-2.16.0/conf.d/meson.build 2025-01-18 00:38:43.243595743 +0900 -@@ -33,7 +33,7 @@ conf_files = [ - '60-latin.conf', - '65-fonts-persian.conf', - '65-khmer.conf', -- '65-nonlatin.conf', -+ '69-nonlatin.conf', - '69-unifont.conf', - '70-no-bitmaps.conf', - '70-no-bitmaps-and-emoji.conf', -@@ -64,7 +64,7 @@ conf_links = [ - '60-generic.conf', - '60-latin.conf', - '65-fonts-persian.conf', -- '65-nonlatin.conf', -+ '69-nonlatin.conf', - '69-unifont.conf', - '80-delicious.conf', - '90-synthetic.conf', diff --git a/fontconfig-remove-debug-print-in-fc-query.patch b/fontconfig-remove-debug-print-in-fc-query.patch new file mode 100644 index 0000000..9aa0218 --- /dev/null +++ b/fontconfig-remove-debug-print-in-fc-query.patch @@ -0,0 +1,25 @@ +From b56207a069be2574df455ede0a6ab61f44d5ca2b Mon Sep 17 00:00:00 2001 +From: Behdad Esfahbod +Date: Tue, 12 Sep 2017 13:25:46 -0400 +Subject: [PATCH] Remove stray printf() + +Ouch. +--- + fc-query/fc-query.c | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/fc-query/fc-query.c b/fc-query/fc-query.c +index 842a8b6..6cd5abd 100644 +--- a/fc-query/fc-query.c ++++ b/fc-query/fc-query.c +@@ -170,7 +170,6 @@ main (int argc, char **argv) + FcPattern *pat; + + id = ((instance_num << 16) + face_num); +- printf("id %d\n", id); + if (FT_New_Face (ftLibrary, argv[i], id, &face)) + break; + num_faces = face->num_faces; +-- +2.13.6 + diff --git a/fontconfig-revert-urw.patch b/fontconfig-revert-urw.patch new file mode 100644 index 0000000..0be56d0 --- /dev/null +++ b/fontconfig-revert-urw.patch @@ -0,0 +1,183 @@ +diff --git a/conf.d/30-metric-aliases.conf b/conf.d/30-metric-aliases.conf +index c755c5e..1f0778d 100644 +--- a/conf.d/30-metric-aliases.conf ++++ b/conf.d/30-metric-aliases.conf +@@ -44,9 +44,6 @@ but in an order preferring similar designs first. We do this in three steps: + 3) Alias each generic to its specifics. + e.g. Arial to Liberation Sans, Arimo, Albany, and Albany AMT + +-NOTE: The (URW)++ fonts mappings of generics to specifics were removed, because +- upstream now includes them in their release of (URW)++ Core Font Set here: +- https://github.com/ArtifexSoftware/urw-base35-fonts/tree/master/fontconfig + --> + + +@@ -311,6 +308,7 @@ NOTE: The (URW)++ fonts mappings of generics to specifics were removed, because + + + ++ + + + Arimo +@@ -462,6 +460,7 @@ NOTE: The (URW)++ fonts mappings of generics to specifics were removed, because + + + ++ + + + Arial +@@ -491,6 +490,8 @@ NOTE: The (URW)++ fonts mappings of generics to specifics were removed, because + + + ++ ++ + + + +@@ -498,6 +499,8 @@ NOTE: The (URW)++ fonts mappings of generics to specifics were removed, because + Helvetica + + TeX Gyre Heros ++ Nimbus Sans ++ Nimbus Sans L + + + +@@ -505,6 +508,7 @@ NOTE: The (URW)++ fonts mappings of generics to specifics were removed, because + Helvetica Narrow + + TeX Gyre Heros Cn ++ Nimbus Sans Narrow + + + +@@ -512,6 +516,8 @@ NOTE: The (URW)++ fonts mappings of generics to specifics were removed, because + Times + + TeX Gyre Termes ++ Nimbus Roman ++ Nimbus Roman No9 L + + + +@@ -519,6 +525,9 @@ NOTE: The (URW)++ fonts mappings of generics to specifics were removed, because + Courier + + TeX Gyre Cursor ++ Nimbus Mono PS ++ Nimbus Mono ++ Nimbus Mono L + + + +@@ -526,6 +535,8 @@ NOTE: The (URW)++ fonts mappings of generics to specifics were removed, because + ITC Avant Garde Gothic + + TeX Gyre Adventor ++ URW Gothic ++ URW Gothic L + + + +@@ -534,6 +545,9 @@ NOTE: The (URW)++ fonts mappings of generics to specifics were removed, because + + Bookman Old Style + TeX Gyre Bonum ++ URW Bookman ++ Bookman URW ++ URW Bookman L + + + +@@ -541,6 +555,9 @@ NOTE: The (URW)++ fonts mappings of generics to specifics were removed, because + ITC Zapf Chancery + + TeX Gyre Chorus ++ Z003 ++ Chancery URW ++ URW Chancery L + + + +@@ -549,6 +566,9 @@ NOTE: The (URW)++ fonts mappings of generics to specifics were removed, because + + Palatino Linotype + TeX Gyre Pagella ++ P052 ++ Palladio URW ++ URW Palladio L + + + +@@ -557,6 +577,9 @@ NOTE: The (URW)++ fonts mappings of generics to specifics were removed, because + + Century Schoolbook + TeX Gyre Schola ++ C059 ++ Century SchoolBook URW ++ Century Schoolbook L + + + +diff --git a/conf.d/30-urw-aliases.conf b/conf.d/30-urw-aliases.conf +new file mode 100644 +index 0000000..cfde071 +--- /dev/null ++++ b/conf.d/30-urw-aliases.conf +@@ -0,0 +1,33 @@ ++ ++ ++ ++ ++ ++ Zapf Dingbats ++ ++ D050000L ++ Dingbats ++ ++ ++ ++ ITC Zapf Dingbats ++ ++ D050000L ++ Dingbats ++ ++ ++ ++ ++ Symbol ++ ++ ++ Standard Symbols PS ++ ++ ++ Standard Symbols L ++ ++ ++ +diff --git a/conf.d/Makefile.am b/conf.d/Makefile.am +index ff03fb2..fd50a5d 100644 +--- a/conf.d/Makefile.am ++++ b/conf.d/Makefile.am +@@ -29,6 +29,7 @@ CONF_LINKS = \ + 10-hinting-$(PREFERRED_HINTING).conf \ + 10-scale-bitmap-fonts.conf \ + 20-unhint-small-vera.conf \ ++ 30-urw-aliases.conf \ + 30-metric-aliases.conf \ + 40-nonlatin.conf \ + 45-generic.conf \ +@@ -69,6 +70,7 @@ template_DATA = \ + 11-lcdfilter-light.conf \ + 20-unhint-small-vera.conf \ + 25-unhint-nonlatin.conf \ ++ 30-urw-aliases.conf \ + 30-metric-aliases.conf \ + 40-nonlatin.conf \ + 45-generic.conf \ diff --git a/fontconfig-sleep-less.patch b/fontconfig-sleep-less.patch index bd9c58c..e0b0b9c 100644 --- a/fontconfig-sleep-less.patch +++ b/fontconfig-sleep-less.patch @@ -1,12 +1,12 @@ -diff -pruN fontconfig-2.12.91.orig/fc-cache/fc-cache.c fontconfig-2.12.91/fc-cache/fc-cache.c ---- fontconfig-2.12.91.orig/fc-cache/fc-cache.c 2017-11-20 21:02:20.000000000 +0900 -+++ fontconfig-2.12.91/fc-cache/fc-cache.c 2017-12-14 16:59:19.002003145 +0900 -@@ -413,7 +413,7 @@ main (int argc, char **argv) +diff -pruN fontconfig-2.11.0.orig/fc-cache/fc-cache.c fontconfig-2.11.0/fc-cache/fc-cache.c +--- fontconfig-2.11.0.orig/fc-cache/fc-cache.c 2013-10-11 12:10:17.000000000 +0900 ++++ fontconfig-2.11.0/fc-cache/fc-cache.c 2013-10-11 13:09:48.000000000 +0900 +@@ -399,7 +399,7 @@ main (int argc, char **argv) */ /* the resolution of mtime on FAT is 2 seconds */ if (changed) - sleep (2); + sleep (1); if (verbose) - printf ("%s: %s\n", argv[0], ret ? _("failed") : _("succeeded")); + printf ("%s: %s\n", argv[0], ret ? "failed" : "succeeded"); return ret; diff --git a/fontconfig.spec b/fontconfig.spec index 1bc63c7..aba62c6 100644 --- a/fontconfig.spec +++ b/fontconfig.spec @@ -1,46 +1,37 @@ -# ifdef'd in source code but runtime dep will be made for FT_Done_MM_Var symbol in freetype-2.9.1 -# so update the build deps as well to keep deps consistency between runtime and build time. -%global freetype_version 2.9.1 +%global freetype_version 2.1.4 Summary: Font configuration and customization library Name: fontconfig -Version: 2.17.0 -Release: 3%{?dist} +Version: 2.12.6 +Release: 4%{?dist} # src/ftglue.[ch] is in Public Domain # src/fccache.c contains Public Domain code -## https://gitlab.com/fedora/legal/fedora-license-data/-/issues/177 # fc-case/CaseFolding.txt is in the UCD # otherwise MIT -License: HPND AND LicenseRef-Fedora-Public-Domain AND Unicode-DFS-2016 -Source: http://fontconfig.org/release/%{name}-%{version}.tar.xz +License: MIT and Public Domain and UCD +Source: http://fontconfig.org/release/%{name}-%{version}.tar.bz2 URL: http://fontconfig.org Source1: 25-no-bitmap-fedora.conf 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 +Patch1: %{name}-revert-urw.patch +# https://bugzilla.redhat.com/show_bug.cgi?id=1496761 +Patch2: %{name}-emoji.patch +# https://bugzilla.redhat.com/show_bug.cgi?id=1509790 +Patch3: %{name}-remove-debug-print-in-fc-query.patch -BuildRequires: libxml2-devel +BuildRequires: expat-devel BuildRequires: freetype-devel >= %{freetype_version} BuildRequires: fontpackages-devel -BuildRequires: gettext +BuildRequires: autoconf automake libtool BuildRequires: gperf -BuildRequires: docbook-utils docbook-utils-pdf -BuildRequires: meson ninja-build gcc -Requires: fonts-filesystem freetype -# Register DTD system-wide to make validation work by default -# (used by fonts-rpm-macros) -Requires(pre): xml-common -Requires(postun): xml-common -PreReq: freetype >= 2.9.1-6 +Requires: fontpackages-filesystem freetype +Requires(pre): freetype Requires(post): grep coreutils Requires: font(:lang=en) -Suggests: font(notosans) %description Fontconfig is designed to locate fonts within the @@ -49,10 +40,10 @@ applications. %package devel Summary: Font configuration and customization library +Group: Development/Libraries Requires: %{name}%{?_isa} = %{version}-%{release} Requires: freetype-devel >= %{freetype_version} Requires: pkgconfig -Requires: gettext %description devel The fontconfig-devel package includes the header files, @@ -63,6 +54,7 @@ will use fontconfig. %package devel-doc Summary: Development Documentation files for fontconfig library +Group: Documentation BuildArch: noarch Requires: %{name}-devel = %{version}-%{release} @@ -71,68 +63,46 @@ The fontconfig-devel-doc package contains the documentation files which is useful for developing applications that uses fontconfig. %prep -%autosetup -p1 -# To reduce a maintenance cost of fontconfig-lower-nonlatin-conf.patch -mv conf.d/65-nonlatin.conf conf.d/69-nonlatin.conf +%setup -q +%patch0 -p1 -b .sleep-less +%patch1 -p1 -b .urw +%patch2 -p1 -b .emoji +%patch3 -p1 -b .fc-query %build -%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 \ - --default-library=shared -%meson_build +# We don't want to rebuild the docs, but we want to install the included ones. +export HASDOCBOOK=no + +autoreconf +%configure --with-add-fonts=/usr/share/X11/fonts/Type1,/usr/share/X11/fonts/TTF,/usr/local/share/fonts \ + --disable-static --with-cache-dir=/usr/lib/fontconfig/cache + +make %{?_smp_mflags} %install -%meson_install +make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" + +find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' install -p -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/fonts/conf.d ln -s %{_fontconfig_templatedir}/25-unhint-nonlatin.conf $RPM_BUILD_ROOT%{_fontconfig_confdir}/ -# Use implied value to allow the use of conditional conf -rm $RPM_BUILD_ROOT%{_sysconfdir}/fonts/conf.d/10-sub-pixel-*.conf - -# Do not enable bitmap-related conf -rm $RPM_BUILD_ROOT%{_sysconfdir}/fonts/conf.d/70-*bitmaps*.conf - -# Install docs manually -install -d $RPM_BUILD_ROOT%{_mandir}/man1 -install -d $RPM_BUILD_ROOT%{_mandir}/man3 -install -d $RPM_BUILD_ROOT%{_mandir}/man5 -for f in doc/*.1; do - install -p -m 0644 $f $RPM_BUILD_ROOT%{_mandir}/man1 -done -for f in doc/*.3; do - install -p -m 0644 $f $RPM_BUILD_ROOT%{_mandir}/man3 -done -for f in doc/*.5; do - install -p -m 0644 $f $RPM_BUILD_ROOT%{_mandir}/man5 -done -for f in doc/*.txt doc/*.pdf doc/*.html; do - install -p -m 0644 $f . -done - -# adjust the timestamp to avoid conflicts for multilib -touch -r doc/fontconfig-user.sgml fontconfig-user.txt -touch -r doc/fontconfig-user.sgml fontconfig-user.html -touch -r doc/fontconfig-devel.sgml fontconfig-devel.txt -touch -r doc/fontconfig-devel.sgml fontconfig-devel.html +# move installed doc files back to build directory to package them +# in the right place +mv $RPM_BUILD_ROOT%{_docdir}/fontconfig/* . +rmdir $RPM_BUILD_ROOT%{_docdir}/fontconfig/ # rename fc-cache binary mv $RPM_BUILD_ROOT%{_bindir}/fc-cache $RPM_BUILD_ROOT%{_bindir}/fc-cache-%{__isa_bits} -# create link to man page -echo ".so man1/fc-cache.1" > $RPM_BUILD_ROOT%{_mandir}/man1/fc-cache-%{__isa_bits}.1 - install -p -m 0755 %{SOURCE2} $RPM_BUILD_ROOT%{_bindir}/fc-cache -%find_lang %{name} -%find_lang %{name}-conf -cat %{name}-conf.lang >> %{name}.lang - %check -%meson_test +make check %post +/sbin/ldconfig + umask 0022 mkdir -p /usr/lib/fontconfig/cache @@ -147,34 +117,22 @@ if [ -x /usr/bin/fc-cache ] && /usr/bin/fc-cache --version 2>&1 | grep -q %{vers HOME=/root /usr/bin/fc-cache -f fi +%postun -p /sbin/ldconfig + %transfiletriggerin -- /usr/share/fonts /usr/share/X11/fonts/Type1 /usr/share/X11/fonts/TTF /usr/local/share/fonts HOME=/root /usr/bin/fc-cache -s %transfiletriggerpostun -- /usr/share/fonts /usr/share/X11/fonts/Type1 /usr/share/X11/fonts/TTF /usr/local/share/fonts HOME=/root /usr/bin/fc-cache -s -%posttrans -if [ -e %{_sysconfdir}/xml/catalog ]; then - %{_bindir}/xmlcatalog --noout --add system \ - "urn:fontconfig:fonts.dtd" \ - "file://%{_datadir}/xml/fontconfig/fonts.dtd" \ - %{_sysconfdir}/xml/catalog -fi - -%postun -if [ $1 == 0 ] && [ -e %{_sysconfdir}/xml/catalog ]; then - %{_bindir}/xmlcatalog --noout --del "urn:fontconfig:fonts.dtd" %{_sysconfdir}/xml/catalog -fi - -%files -f %{name}.lang -%doc README.md AUTHORS +%files +%doc README AUTHORS %doc fontconfig-user.txt fontconfig-user.html %doc %{_fontconfig_confdir}/README %license COPYING %{_libdir}/libfontconfig.so.* %{_bindir}/fc-cache* %{_bindir}/fc-cat -%{_bindir}/fc-conflist %{_bindir}/fc-list %{_bindir}/fc-match %{_bindir}/fc-pattern @@ -187,7 +145,6 @@ fi # If you want to do so, you should use local.conf instead. %config %{_fontconfig_masterdir}/fonts.conf %config(noreplace) %{_fontconfig_confdir}/*.conf -%dir /usr/lib/fontconfig %dir /usr/lib/fontconfig/cache %{_mandir}/man1/* %{_mandir}/man5/* @@ -197,277 +154,11 @@ fi %{_libdir}/pkgconfig/* %{_includedir}/fontconfig %{_mandir}/man3/* -%{_datadir}/gettext/its/fontconfig.its -%{_datadir}/gettext/its/fontconfig.loc %files devel-doc -%doc fontconfig-devel.txt fontconfig-devel.html +%doc fontconfig-devel.txt fontconfig-devel %changelog -* Wed Jul 23 2025 Fedora Release Engineering - 2.17.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Mon Jun 30 2025 Akira TAGOH - 2.17.0-2 -- Backport a patch to fix a crash with Graphite fonts -- Drop 70-*bitmaps*.conf from /etc/fonts/conf.d so far. - Resolves: rhbz#2375426 - -* Fri Jun 27 2025 Akira TAGOH - 2.17.0-1 -- New upstream release. - Resolves: rhbz#2375126 - -* Fri Apr 11 2025 Akira TAGOH - 2.16.2-1 -- New upstream release. - -* Thu Mar 13 2025 Akira TAGOH - 2.16.1-1 -- New upstream release. - -* Mon Jan 27 2025 Akira TAGOH - 2.16.0-2 -- Fix endian detection. - Resolves: rhbz#2341757 - -* Sat Jan 18 2025 Akira TAGOH - 2.16.0-1 -- New upstream release. - Resolves: rhbz#2338618 -- Use meson instead of autotools to build. -- Disable meson test on s390x temporarily. - -* Thu Jan 16 2025 Fedora Release Engineering - 2.15.0-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Thu Aug 1 2024 Akira TAGOH - 2.15.0-8 -- Fix a memory leak and potentially uninitialized values. - -* Wed Jul 17 2024 Fedora Release Engineering - 2.15.0-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Fri Jun 7 2024 Akira TAGOH - 2.15.0-6 -- Own /usr/lib/fontconfig - Resolves: rhbz#2284076 - -* Mon Apr 29 2024 Michael Kuhn - 2.15.0-5 -- Fix emoji fonts being disabled when bitmap fonts were disabled - -* Sat Feb 10 2024 Akira TAGOH - 2.15.0-4 -- Delete .uuid with fc-cache -f. - Resolves: rhbz#1761885 - -* Wed Jan 24 2024 Fedora Release Engineering - 2.15.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Fri Jan 19 2024 Fedora Release Engineering - 2.15.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Fri Dec 22 2023 Akira TAGOH - 2.15.0-1 -- New upstream release. - Resolves: rhbz#2255623 - -* Thu Aug 17 2023 Akira TAGOH - 2.14.2-5 -- Update 65-nonlatin.conf to 69-nonlatin.conf - This basically provides substitutes for certain languages and is helpful - to determine default behavior though, we have per-package config for similar purpose. - Since 65 is mostly used for default fonts and this config prevents some behavior for - packages named something coming later than "nonlatin" in the alphabetical order. - So moving this to the safer priority. - This would fixes an issue, particularly Lohit Marathi vs Lohit Devanagari after - updating their priorities from 65 to 66. - -* Wed Jul 19 2023 Fedora Release Engineering - 2.14.2-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Fri Jun 16 2023 Akira TAGOH - 2.14.2-3 -- Drop 10-sub-pixel-rgb-for-kde.conf - Resolves: rhbz#2212512 - -* Tue Apr 4 2023 Akira TAGOH - 2.14.2-2 -- Migrated license tag to SPDX. - -* Fri Jan 27 2023 Akira TAGOH - 2.14.2-1 -- New upstream release. - -* Thu Jan 19 2023 Fedora Release Engineering - 2.14.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Sat Nov 26 2022 Akira TAGOH - 2.14.1-2 -- Enable RGB stripes layout for sub-pixel rendering on KDE only. - Resolves: rhbz#2137825 - -* Fri Oct 21 2022 Akira TAGOH - 2.14.1-1 -- New upstream release. - -* Wed Sep 28 2022 Akira TAGOH - 2.14.0-3 -- Remap font paths to other place properly. - -* Thu Jul 21 2022 Fedora Release Engineering - 2.14.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Thu Mar 31 2022 Akira TAGOH - 2.14.0-1 -- New upstream release. - -* Fri Feb 4 2022 Akira TAGOH - 2.13.96-1 -- New upstream release. -- Fix missing a file in the archive. - Resolves: rhbz#2050478 - -* Tue Feb 1 2022 Akira TAGOH - 2.13.95-1 -- New upstream release. -- Update deps to font(notosans) - https://fedoraproject.org/wiki/Changes/DefaultToNotoFonts - -* Thu Jan 20 2022 Fedora Release Engineering - 2.13.94-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Wed Jul 21 2021 Fedora Release Engineering - 2.13.94-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Tue Jul 20 2021 Akira TAGOH - 2.13.94-2 -- Fix the score calculation on matching for multiple values. -- Enable 11-lcdfilter-default.conf. - Resolves: rhbz#1965684 - -* Tue Jun 29 2021 Akira TAGOH - 2.13.94-1 -- New upstream release. - -* Thu Mar 25 2021 Akira TAGOH - 2.13.93-6 -- Fix postun scriptlet to remove the entry from xml catalog. - -* Tue Jan 26 2021 Fedora Release Engineering - 2.13.93-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Wed Dec 23 2020 Akira TAGOH - 2.13.93-4 -- cherry pick some upstream patches - - Skip leading white space in style. - - Remove abort from FcCompareSize. - - Fix memory leaks - - Check qual and compare for family tests. -- -* Thu Dec 3 2020 Akira TAGOH - 2.13.93-3 -- Add back fullname property at the scan matching phase for the backward compatibility. - Resolves: rhbz#1902881 - -* Mon Nov 30 2020 Akira TAGOH - 2.13.93-2 -- Fix file conflicts. - -* Sat Nov 28 2020 Akira TAGOH - 2.13.93-1 -- New upstream release. - -* Mon Jul 27 2020 Fedora Release Engineering - 2.13.92-12 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Thu Apr 23 2020 Akira TAGOH - 2.13.92-11 -- deal with system caches as always latest on Silverblue. (#1750891) - -* Thu Apr 02 2020 Akira TAGOH - 2.13.92-10 -- Build against libxml2 instead of expat. - -* Sat Mar 28 2020 Nicolas Mailhot - 2.13.92-9 -- Fix DTD declaration and registration so users and Fedora automation can - easily validate new configuration files - -* Mon Mar 23 2020 Akira TAGOH - 2.13.92-8 -- Fix assertion in FcCacheFini() again. - Resolves: rhbz#1815684 - -* Wed Feb 26 2020 Akira TAGOH - 2.13.92-7 -- Fix assertion in FcCacheFini(). - -* Thu Jan 30 2020 Akira TAGOH - 2.13.92-6 -- Fix some wrong behavior with sysroot option. -- Fix reading the outdated caches. -- Apply a patch to make it MT-safe more. - -* Tue Jan 28 2020 Fedora Release Engineering - 2.13.92-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Mon Jan 20 2020 Akira TAGOH - 2.13.92-4 -- Drop font(:lang=...) from %%{=pkgkit} format. - Reference: rhbz#1792463 - -* Wed Aug 28 2019 Akira TAGOH - 2.13.92-3 -- Do not return false on FcConfigParseAndLoad*() if complain is set to false. - Resolves: rhbz#1744377 - -* Fri Aug 9 2019 Akira TAGOH - 2.13.92-2 -- Fix to affect fonthashint property for score on match. - -* Fri Aug 9 2019 Akira TAGOH - 2.13.92-1 -- New upstream release. - -* Wed Jul 31 2019 Akira TAGOH - 2.13.91-4 -- Fix make check fails. - -* Thu Jul 25 2019 Fedora Release Engineering - 2.13.91-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Sun Jun 16 2019 Tim Landscheidt - 2.13.91-2 -- Remove calls to ldconfig from scriptlets -- Use "PreReq" instead of "Requires(pre)" for freetype - -* Mon Jun 10 2019 Akira TAGOH - 2.13.91-1 -- New upstream release. - -* Fri Feb 22 2019 Akira TAGOH - 2.13.1-6 -- Update freetype version for runtime dependency to ensure - they have FT_Done_MM_Var symbol certainly. (#1679619) - -* Thu Jan 31 2019 Fedora Release Engineering - 2.13.1-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Tue Nov 13 2018 Akira TAGOH - 2.13.1-4 -- Use Rachana instead of Meera for serif subsitution. (#1649184) - -* Wed Nov 07 2018 Akira TAGOH - 2.13.1-3 -- Stop cleaning up .uuid file even when a directory is empty. - -* Wed Sep 26 2018 Akira TAGOH - 2.13.1-2 -- Add man page for fc-cache-* links to fc-cache. -- Drop unnecessary BR. - -* Thu Aug 30 2018 Akira TAGOH - 2.13.1-1 -- New upstream release. - -* Fri Jul 13 2018 Fedora Release Engineering - 2.13.0-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Fri Jun 29 2018 Akira TAGOH - 2.13.0-7 -- Use ldconfig rpm macro. - -* Thu Jun 07 2018 Akira TAGOH - 2.13.0-6 -- Add Suggests: dejavu-sans-fonts to address pulling the unpredicted - font package as dependency. (#1321551) - -* Wed Jun 06 2018 Akira TAGOH - 2.13.0-5 -- Update the version deps of freetype to resolve FT_Done_MM_Var symbol. (#1579464) - -* Fri May 11 2018 Akira TAGOH - 2.13.0-4 -- Fix the emboldening logic. (#1575649) - -* Thu Mar 15 2018 Akira TAGOH - 2.13.0-3 -- Another fix to accept the const names in param. -- Fix locale issue. - -* Mon Mar 12 2018 Akira TAGOH - 2.13.0-2 -- Allow the const names in the range. - -* Tue Mar 06 2018 Akira TAGOH - 2.13.0-1 -- New upstream release. - -* Thu Feb 15 2018 Akira TAGOH - 2.12.93-1 -- New upstream release. - -* Wed Feb 07 2018 Fedora Release Engineering - 2.12.92-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Thu Jan 4 2018 Akira TAGOH - 2.12.92-1 -- New upstream release. -- Fix the mis-ordering of evaluating config. (#1530211) - -* Sat Dec 23 2017 Akira TAGOH - 2.12.91-2 -- Fix crash (#1528706) - -* Thu Dec 14 2017 Akira TAGOH - 2.12.91-1 -- New upstream release. - * Wed Nov 8 2017 Akira TAGOH - 2.12.6-4 - Remove the debug print in fc-query. (#1509790) @@ -475,7 +166,7 @@ fi - Backport a patch to change the order of the emoji fonts. (#1496761) * Tue Oct 3 2017 Akira TAGOH - 2.12.6-2 -- Bump the release to address the upgrade path issue. +- Revert URW changes in the config. * Thu Sep 21 2017 Akira TAGOH - 2.12.6-1 - New upstream release. diff --git a/plans/basic.fmf b/plans/basic.fmf deleted file mode 100644 index c1627f9..0000000 --- a/plans/basic.fmf +++ /dev/null @@ -1,5 +0,0 @@ -summary: Basic smoke test -discover: - how: fmf -execute: - how: tmt diff --git a/sources b/sources index 9a3bb99..deaf5ad 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (fontconfig-2.17.0.tar.xz) = dd64905c3e0e5c5881df505b8f0bea594bbac5ce145f57aedcd7130978cd285491497198d8f2d6ed26f7b2abb31268dc3ff97aa75ce998b8e57f2d5c75b240b4 +SHA512 (fontconfig-2.12.6.tar.bz2) = 2a1d3e62cae2bfcae2e67e9cb75ab6534a35bda4215f1ad4b8bf757e77e7d9d609c016562f5288fd10046a0e94655a807f6dd044d7868ed81a146c4275c4dd06 diff --git a/tests/basic/main.fmf b/tests/basic/main.fmf deleted file mode 100644 index d6c06ec..0000000 --- a/tests/basic/main.fmf +++ /dev/null @@ -1,3 +0,0 @@ -summary: Concise summary describing what the test does -test: ./test.sh -framework: beakerlib diff --git a/tests/basic/test.sh b/tests/basic/test.sh deleted file mode 100755 index 10de1b4..0000000 --- a/tests/basic/test.sh +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/bash -# vim: dict+=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k -. /usr/share/beakerlib/beakerlib.sh || exit 1 - -rlJournalStart - rlPhaseStartSetup - rlRun "tmp=\$(mktemp -d)" 0 "Create tmp directory" - rlRun "pushd $tmp" - rlRun "set -o pipefail" - rlPhaseEnd - - rlPhaseStartTest - rlRun "fc-match" 0 "Check fc-match" - rlRun "fc-list" 0 "Check fc-list" - rlRun "fc-scan /usr/share/fonts" 0 "Check fc-scan" - rlPhaseEnd - - rlPhaseStartCleanup - rlRun "popd" - rlRun "rm -r $tmp" 0 "Remove tmp directory" - rlPhaseEnd -rlJournalEnd