Accepting request 1129729 from home:tiwai:branches:M17N

- 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

OBS-URL: https://build.opensuse.org/request/show/1129729
OBS-URL: https://build.opensuse.org/package/show/M17N/fonts-config?expand=0&rev=103

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 <tiwai@suse.de>
+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 @@
+           <string>Noto Emoji</string>
+         </patelt>
+       </pattern>
+-    <rejectfont>
++    </rejectfont>
+   </selectfont>
+ </fontconfig>
+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 @@
+     </test>
+     <edit name="family" mode="prepend">
+       <string>Noto Serif SC</string>
+-      <string>Noto Serif HK</stirng>
++      <string>Noto Serif HK</string>
+       <string>Noto Serif TC</string>
+       <string>Noto Serif JP</string>
+       <string>Noto Serif KR</string>
+@@ -194,7 +194,7 @@
+     </test>
+     <edit name="family" mode="prepend">
+       <string>Noto Serif TC</string>
+-      <string>Noto Serif HK</stirng>
++      <string>Noto Serif HK</string>
+       <string>Noto Serif JP</string>
+       <string>Noto Serif KR</string>
+       <string>Noto Serif SC</string>
+-- 
+2.35.3
+

fonts-config-20200609+git0.42e2b1b.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:80fe50de8acb29a1c2f42259f604188e69d1d68d97ef501e50e49081356e2930
-size 29544

fonts-config-20230604+git0.630c8206607c.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:834e6d2f0e14843cd05f7e5dedb82d50f37871f41b4f6cfb48a29616189e7016
+size 25760

fonts-config.changes

@@ -1,3 +1,23 @@
+-------------------------------------------------------------------
+Tue Nov 28 16:38:44 UTC 2023 - Takashi Iwai <tiwai@suse.com>
+
+- 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 <alarrosa@suse.com>
 

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 \
+for conf in	11-base-rendering.conf \
-		10-group-tt-non-hinted-fonts.conf \
-		11-base-rendering.conf \
 		12-tt-monospace-rendering.conf \
 		13-selective-rendering.conf \
 		13-selective-rendering-ipa.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