From bcc9201867a11a5d5b77335b31f639ef1d6651f59499780605e06673b99660ae Mon Sep 17 00:00:00 2001 From: Karl Cheng Date: Wed, 12 Dec 2018 12:30:52 +0000 Subject: [PATCH] Accepting request 657353 from home:simotek:branches:M17N - Update to 20181211 * Update subpixel rendering config * fix missspelling fonts-config-fix-misspelling.patch no longer required * fix boo#1092737 * other minor tidyups OBS-URL: https://build.opensuse.org/request/show/657353 OBS-URL: https://build.opensuse.org/package/show/M17N/fonts-config?expand=0&rev=98 --- fonts-config-20180430.tar.xz | 3 --- fonts-config-20181211.tar.xz | 3 +++ fonts-config-fix-misspelling.patch | 21 --------------- fonts-config.changes | 43 ++++++++++++++++++------------ fonts-config.spec | 20 +++++++------- 5 files changed, 39 insertions(+), 51 deletions(-) delete mode 100644 fonts-config-20180430.tar.xz create mode 100644 fonts-config-20181211.tar.xz delete mode 100644 fonts-config-fix-misspelling.patch diff --git a/fonts-config-20180430.tar.xz b/fonts-config-20180430.tar.xz deleted file mode 100644 index eb9a772..0000000 --- a/fonts-config-20180430.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9a6fdc8aefff569b1ac3f1ad2643125e9d129d2016bc8cbd3d37c3cfb2c497eb -size 108028 diff --git a/fonts-config-20181211.tar.xz b/fonts-config-20181211.tar.xz new file mode 100644 index 0000000..ded66ac --- /dev/null +++ b/fonts-config-20181211.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ed8ccee735566f4e6e82f672638c0987ffacee63b98fce48f31291a92cdc7449 +size 337920 diff --git a/fonts-config-fix-misspelling.patch b/fonts-config-fix-misspelling.patch deleted file mode 100644 index 76538a7..0000000 --- a/fonts-config-fix-misspelling.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -Nura fonts-config-20180430/60-family-prefer.conf fonts-config-20180430_new/60-family-prefer.conf ---- fonts-config-20180430/60-family-prefer.conf 2018-04-30 03:40:26.486246092 +0000 -+++ fonts-config-20180430_new/60-family-prefer.conf 2018-10-15 10:43:38.221995233 +0000 -@@ -165,7 +165,7 @@ - Noto Sans Syriac Eastern - Noto Sans Syriac Estrangela - Noto Sans Syriac Western -- Noto Sans S Chinese -+ Noto Sans SC - Noto Sans Tagalog - Noto Sans Tagbanwa - Noto Sans Tai Le -@@ -175,7 +175,7 @@ - Noto Sans Telugu - Noto Sans Thai - Noto Sans Tifinagh -- Noto Sans T Chinese -+ Noto Sans TC - Noto Sans Ugaritic - Noto Sans Vai - Noto Sans Yi diff --git a/fonts-config.changes b/fonts-config.changes index d868033..733e9a1 100644 --- a/fonts-config.changes +++ b/fonts-config.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Tue Dec 11 13:49:51 UTC 2018 - sflees@suse.de + +- Update to 20181211 + * Update subpixel rendering config + * fix missspelling fonts-config-fix-misspelling.patch no longer + required + * fix boo#1092737 + * other minor tidyups + ------------------------------------------------------------------- Mon Nov 5 11:18:01 UTC 2018 - Jan Engelhardt @@ -6,7 +16,7 @@ Mon Nov 5 11:18:01 UTC 2018 - Jan Engelhardt ------------------------------------------------------------------- Mon Oct 15 08:25:11 UTC 2018 - qzhao@suse.com -- Add fonts-config-fix-misspelling.patch: fix misspelling in +- Add fonts-config-fix-misspelling.patch: fix misspelling in configuration file(boo#1111791). ------------------------------------------------------------------- @@ -25,13 +35,13 @@ Mon Apr 30 03:40:53 UTC 2018 - i@marguerite.su ------------------------------------------------------------------- Mon Mar 12 22:53:10 UTC 2018 - stefan.bruens@rwth-aachen.de -- Do not create fonts.{dir,scale} in encodings directory +- Do not create fonts.{dir,scale} in encodings directory (boo#1106850). ------------------------------------------------------------------- Thu Nov 23 13:49:51 UTC 2017 - rbrown@suse.com -- Replace references to /var/adm/fillup-templates with new +- Replace references to /var/adm/fillup-templates with new %_fillupdir macro (boo#1069468) ------------------------------------------------------------------- @@ -48,13 +58,13 @@ Wed Sep 14 15:15:11 UTC 2016 - pgajdos@suse.com - version 20160914: * comma and the rest of family string is ignored while translating - preference lists from sysconfig to fontconfig snippets + preference lists from sysconfig to fontconfig snippets [bsc#998300] ------------------------------------------------------------------- Mon Nov 9 08:04:29 UTC 2015 - pgajdos@suse.com -- Roboto prefered for sans and serif and Source Sans Pro for +- Roboto prefered for sans and serif and Source Sans Pro for monospace [bsc#951898] ------------------------------------------------------------------- @@ -86,7 +96,7 @@ Tue Apr 21 13:34:43 UTC 2015 - pgajdos@suse.com - updated to 20150421: * use mkpath instead of make_path [bnc#927968] - * behave better when + * behave better when /usr/share/fontconfig/conf.avail/30-metric-aliases.conf not found @@ -175,7 +185,7 @@ Fri Feb 28 07:34:57 UTC 2014 - pgajdos@suse.com Wed Feb 26 11:44:23 UTC 2014 - pgajdos@suse.com - updated to 20140226: - * FORCE_{SANS,SERIF,MONO}_PREFERENCE replaced by + * FORCE_{SANS,SERIF,MONO}_PREFERENCE replaced by SEARCH_METRIC_COMPATIBLE ------------------------------------------------------------------- @@ -211,14 +221,14 @@ Thu Feb 13 13:17:33 UTC 2014 - pgajdos@suse.com one - added patches: - * fontconfig-infinality-main.patch (remove parts of original + * fontconfig-infinality-main.patch (remove parts of original 52-infinality.conf) ------------------------------------------------------------------- Thu Jan 30 12:38:10 UTC 2014 - pgajdos@suse.com - fonts-config 20131102 [bnc#860097]: - * do not check for font module used -> fixes TTCap entries + * do not check for font module used -> fixes TTCap entries generation * drop generating ghostscript fontmap * drop generating ooo xcu file @@ -281,7 +291,7 @@ Tue Jun 12 12:45:17 CEST 2012 - tiwai@suse.de ------------------------------------------------------------------- Mon Mar 26 12:36:46 UTC 2012 - pgajdos@suse.com -- in generate_java_font_setup() was wrongly picked last installed +- in generate_java_font_setup() was wrongly picked last installed font from @sans_latin1_priority, instead of first ------------------------------------------------------------------- @@ -310,7 +320,7 @@ Wed Oct 12 10:31:50 UTC 2011 - ftake@geeko.jp - changed Japanese fonts setting for Java * IPA Gothic for monospaced - * Propotional IPA fonts for others + * Propotional IPA fonts for others ------------------------------------------------------------------- Sun Sep 18 17:17:12 UTC 2011 - jengelh@medozas.de @@ -376,7 +386,7 @@ Fri Mar 23 18:46:17 CET 2007 - mfabian@suse.de that even if there are fontconfig rules matching on "font" which should override it again). This doesn't cause any problems for Cairo/Gnome (see bug #104365) because Cairo/Gnome don't try to - change the autohint value anyway. + change the autohint value anyway. ------------------------------------------------------------------- Tue Jan 30 12:47:41 CET 2007 - mfabian@suse.de @@ -425,7 +435,7 @@ Tue Sep 12 17:48:05 CEST 2006 - mfabian@suse.de ------------------------------------------------------------------- Thu Aug 17 12:47:58 CEST 2006 - mfabian@suse.de -- fix font paths in Java font setup for X11R7. +- fix font paths in Java font setup for X11R7. ------------------------------------------------------------------- Wed Aug 16 15:40:10 CEST 2006 - mfabian@suse.de @@ -545,10 +555,10 @@ Thu Oct 27 12:23:42 CEST 2005 - mfabian@suse.de - revert last change because I downgraded to fontconfig 2.3.2.20050721 (the version from SUSE 10.0) in STABLE. - This fontconfig version is solid and works reliable. The + This fontconfig version is solid and works reliable. The fontconfig 2.4 branch will be checked into BETA and come back to STABLE as soon as the crash problems are solved. - + ------------------------------------------------------------------- Wed Oct 26 18:29:40 CEST 2005 - mfabian@suse.de @@ -592,7 +602,7 @@ Tue Sep 06 12:27:33 CEST 2005 - mfabian@suse.de created by the script /usr/sbin/acroread-cidfont-config happens to have the same family name. These CID-keyed fonts and the must be ignored, neither of them will work with Java. - + ------------------------------------------------------------------- Mon Sep 05 17:55:14 CEST 2005 - mfabian@suse.de @@ -628,4 +638,3 @@ Tue Jul 6 15:39:51 CEST 2004 - mfabian@suse.de Thu May 6 00:08:41 CEST 2004 - sndirsch@suse.de - created package - diff --git a/fonts-config.spec b/fonts-config.spec index 50515f8..a7a13c8 100644 --- a/fonts-config.spec +++ b/fonts-config.spec @@ -22,14 +22,13 @@ %endif Name: fonts-config -Version: 20180430 +Version: 20181211 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: fonts-config-20180430.tar.xz -Patch: fonts-config-fix-misspelling.patch +Source: %{name}-%{version}.tar.xz BuildRequires: fontconfig BuildRequires: fontpackages-devel Requires(pre): %fillup_prereq @@ -51,13 +50,12 @@ directly, which is mainly useful to debug it (use the --debug flag). %prep %setup -%patch -p1 %build # empty configuration now, should be filled after fonts-config call -cp 99-example.conf 10-rendering-options.conf +cp 99-example.conf 10-rendering-options.conf # empty configuration now, can be filled after fonts-config call -cp 99-example.conf 58-family-prefer-local.conf +cp 99-example.conf 58-family-prefer-local.conf %install mkdir -p %{buildroot}/sbin/conf.d @@ -76,7 +74,7 @@ pod2man --section 1 --center=" " fonts-config > \ install -m 644 10-rendering-options.conf.template %{buildroot}%{_datadir}/%{name} mkdir -p %{buildroot}%{_fontsconfavaildir} # following two conf files can not be under /usr/share/fonts-config -# as they are changed during installation [bnc#882029 (internal)] +# as they are changed during installation [bnc#882029 (internal)] mkdir -p %{buildroot}%{_fontsconfddir} for conf in 10-rendering-options.conf \ 58-family-prefer-local.conf; do @@ -89,13 +87,15 @@ for conf in 10-group-tt-hinted-fonts.conf \ 12-tt-monospace-rendering.conf \ 13-selective-rendering.conf \ 13-selective-rendering-ipa.conf \ - 31-metric-aliases-bw.conf \ + 21-emoji-rendering.conf \ + 31-metric-aliases-bw.conf \ + 32-emoji-reject.conf \ + 32-symbol-substitution.conf \ 49-family-default.conf \ - 59-family-prefer-emoji.conf \ 59-family-prefer-lang-specific.conf \ 60-family-prefer.conf \ 61-wine-aliases.conf \ - 70-reject.conf; do + 70-reject.conf; do install -m 644 $conf %{buildroot}%{_datadir}/%{name}/conf.avail/ %link_avail_to_system_fontsconf $conf done