diff --git a/0001-Fix-typos-in-32-emoji-reject.conf-and-59-family-pref.patch b/0001-Fix-typos-in-32-emoji-reject.conf-and-59-family-pref.patch new file mode 100644 index 0000000..be9a7b8 --- /dev/null +++ b/0001-Fix-typos-in-32-emoji-reject.conf-and-59-family-pref.patch @@ -0,0 +1,53 @@ +From e167f66b80dc4511a614e6fe971261ff125d021b Mon Sep 17 00:00:00 2001 +From: Takashi Iwai +Date: Tue, 28 Nov 2023 18:01:49 +0100 +Subject: [PATCH] Fix typos in 32-emoji-reject.conf and + 59-family-prefer-lang-specific + +Fix typos as fc-cache complained: + Fontconfig error: "/etc/fonts/conf.d/32-emoji-reject.conf", line 27: mismatched tag + Fontconfig error: "/etc/fonts/conf.d/59-family-prefer-lang-specific-cjk.conf", line 165: mismatched tag + Fontconfig warning: "/etc/fonts/conf.d/59-family-prefer-lang-specific-cjk.conf", line 165: invalid attribute 'name' + Fontconfig warning: "/etc/fonts/conf.d/59-family-prefer-lang-specific-cjk.conf", line 165: invalid attribute 'mode' +--- + 32-emoji-reject.conf | 2 +- + 59-family-prefer-lang-specific-cjk.conf | 4 ++-- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/32-emoji-reject.conf b/32-emoji-reject.conf +index b07d8e44ba82..134877428107 100644 +--- a/32-emoji-reject.conf ++++ b/32-emoji-reject.conf +@@ -23,6 +23,6 @@ + Noto Emoji + + +- ++ + + +diff --git a/59-family-prefer-lang-specific-cjk.conf b/59-family-prefer-lang-specific-cjk.conf +index 11aa96b27837..8692e103a519 100644 +--- a/59-family-prefer-lang-specific-cjk.conf ++++ b/59-family-prefer-lang-specific-cjk.conf +@@ -162,7 +162,7 @@ + + + Noto Serif SC +- Noto Serif HK ++ Noto Serif HK + Noto Serif TC + Noto Serif JP + Noto Serif KR +@@ -194,7 +194,7 @@ + + + Noto Serif TC +- Noto Serif HK ++ Noto Serif HK + Noto Serif JP + Noto Serif KR + Noto Serif SC +-- +2.35.3 + diff --git a/fonts-config-20200609+git0.42e2b1b.tar.xz b/fonts-config-20200609+git0.42e2b1b.tar.xz deleted file mode 100644 index 1321861..0000000 --- a/fonts-config-20200609+git0.42e2b1b.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:80fe50de8acb29a1c2f42259f604188e69d1d68d97ef501e50e49081356e2930 -size 29544 diff --git a/fonts-config-20230604+git0.630c8206607c.tar.xz b/fonts-config-20230604+git0.630c8206607c.tar.xz new file mode 100644 index 0000000..5cb7110 --- /dev/null +++ b/fonts-config-20230604+git0.630c8206607c.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:834e6d2f0e14843cd05f7e5dedb82d50f37871f41b4f6cfb48a29616189e7016 +size 25760 diff --git a/fonts-config.changes b/fonts-config.changes index cb1df41..6a284a3 100644 --- a/fonts-config.changes +++ b/fonts-config.changes @@ -1,3 +1,23 @@ +------------------------------------------------------------------- +Tue Nov 28 16:38:44 UTC 2023 - Takashi Iwai + +- Update to 20230604+git0.630c8206607c: + * Fix uninitialised use of the HOME environment variable + (bsc#1086804,bsc#1210700) + * font match and pattern match can't put in one file. + * source han are packaged nowadays, no need to give alias; + just give CFF fontformat fonts in zh-/ja/ko hintfull + * split 59-family-prefer-lang-specific to cjk/noto and raw, + the former two may be generated by scripts in later version + * emoji support(part1): add emoji family + * delete 10-group-tt*.conf, since fontconfig 2.14 introduces + 09-autohint-if-no-hinting.conf (bsc#1217542) + * Fix fonts-config does not read user config with `-u` option given + * widen comparison operator for emoji fonts +- Fix typos in the configs: + 0001-Fix-typos-in-32-emoji-reject.conf-and-59-family-pref.patch +- Enable 09-autohint-if-no-hinting.conf from fontconfig + ------------------------------------------------------------------- Tue Jun 9 09:45:34 UTC 2020 - Antonio Larrosa diff --git a/fonts-config.spec b/fonts-config.spec index 33835bf..cf15256 100644 --- a/fonts-config.spec +++ b/fonts-config.spec @@ -22,18 +22,19 @@ %endif Name: fonts-config -Version: 20200609+git0.42e2b1b +Version: 20230604+git0.630c8206607c Release: 0 Summary: Script to configure fonts for X Windows and other applications # MIT for infinality License: GPL-2.0-or-later AND MIT Group: System/X11/Fonts Source: %{name}-%{version}.tar.xz +Patch1: 0001-Fix-typos-in-32-emoji-reject.conf-and-59-family-pref.patch BuildRequires: fontconfig BuildRequires: fontpackages-devel Requires(pre): %fillup_prereq %reconfigure_fonts_prereq -Requires: fontconfig +Requires: fontconfig >= 2.14 Requires: gawk Requires: perl(English) Recommends: mkfontscale @@ -49,7 +50,7 @@ fonts is installed, upgraded or removed. But it can also be executed directly, which is mainly useful to debug it (use the --debug flag). %prep -%setup +%autosetup -p1 %build # empty configuration now, should be filled after fonts-config call @@ -81,24 +82,31 @@ for conf in 10-rendering-options.conf \ install -m 644 $conf %{buildroot}%{_fontsconfddir} done # -for conf in 10-group-tt-hinted-fonts.conf \ - 10-group-tt-non-hinted-fonts.conf \ - 11-base-rendering.conf \ +for conf in 11-base-rendering.conf \ 12-tt-monospace-rendering.conf \ 13-selective-rendering.conf \ 13-selective-rendering-ipa.conf \ - 21-emoji-rendering.conf \ - 31-metric-aliases-bw.conf \ - 32-emoji-reject.conf \ - 32-symbol-substitution.conf \ + 21-emoji-rendering.conf \ + 22-noto-cjk-rendering.conf \ + 31-metric-aliases-bw.conf \ + 32-emoji-reject.conf \ + 32-symbol-substitution.conf \ 49-family-default.conf \ + 49-family-default-emoji.conf \ 59-family-prefer-lang-specific.conf \ + 59-family-prefer-lang-specific-cjk.conf \ + 59-family-prefer-lang-specific-noto.conf \ 60-family-prefer.conf \ 61-wine-aliases.conf \ 70-reject.conf; do install -m 644 $conf %{buildroot}%{_datadir}/%{name}/conf.avail/ %link_avail_to_system_fontsconf $conf done +# missing symlink from fontconfig +for conf in 09-autohint-if-no-hinting.conf; do + ln -s ../../..%{_datadir}/fontconfig/conf.avail/$conf \ + %{buildroot}%{_fontsconfddir}/$conf +done %post if [ -f %{_sysconfdir}/sysconfig/fonts-config ]; then