From 74db2e7ea3d186c60fbac8a616beba397d6f9660 Mon Sep 17 00:00:00 2001 From: Akira TAGOH Date: Tue, 3 Oct 2017 19:50:51 +0900 Subject: [PATCH 1/5] Revert URW changes in the config. --- fontconfig.spec | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/fontconfig.spec b/fontconfig.spec index 4646cc9..2b62071 100644 --- a/fontconfig.spec +++ b/fontconfig.spec @@ -16,6 +16,7 @@ Source2: fc-cache # https://bugzilla.redhat.com/show_bug.cgi?id=140335 Patch0: %{name}-sleep-less.patch +Patch1: %{name}-revert-urw.patch BuildRequires: expat-devel BuildRequires: freetype-devel >= %{freetype_version} @@ -60,6 +61,7 @@ which is useful for developing applications that uses fontconfig. %prep %setup -q %patch0 -p1 -b .sleep-less +%patch1 -p1 -b .urw %build # We don't want to rebuild the docs, but we want to install the included ones. @@ -151,6 +153,9 @@ HOME=/root /usr/bin/fc-cache -s %doc fontconfig-devel.txt fontconfig-devel %changelog +* Tue Oct 3 2017 Akira TAGOH - 2.12.6-2 +- Revert URW changes in the config. + * Thu Sep 21 2017 Akira TAGOH - 2.12.6-1 - New upstream release. From 812cb7e365a70347485586260fb27df509ab4a8a Mon Sep 17 00:00:00 2001 From: Akira TAGOH Date: Tue, 3 Oct 2017 19:51:26 +0900 Subject: [PATCH 2/5] Revert URW changes in the config. --- fontconfig.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fontconfig.spec b/fontconfig.spec index 2b62071..72fe959 100644 --- a/fontconfig.spec +++ b/fontconfig.spec @@ -3,7 +3,7 @@ Summary: Font configuration and customization library Name: fontconfig Version: 2.12.6 -Release: 1%{?dist} +Release: 2%{?dist} # src/ftglue.[ch] is in Public Domain # src/fccache.c contains Public Domain code # fc-case/CaseFolding.txt is in the UCD From 1161c4a337de895b8dfaa4205ea33bec3790e1fa Mon Sep 17 00:00:00 2001 From: Akira TAGOH Date: Tue, 3 Oct 2017 19:51:38 +0900 Subject: [PATCH 3/5] Revert URW changes in the config. --- fontconfig-revert-urw.patch | 183 ++++++++++++++++++++++++++++++++++++ 1 file changed, 183 insertions(+) create mode 100644 fontconfig-revert-urw.patch 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 \ From c07053bf303dd7e67dcc553e2fba58323a80e5c4 Mon Sep 17 00:00:00 2001 From: Akira TAGOH Date: Thu, 5 Oct 2017 21:00:25 +0900 Subject: [PATCH 4/5] Backport a patch to change the order of the emoji fonts. (#1496761) --- fontconfig-emoji.patch | 94 ++++++++++++++++++++++++++++++++++++++++++ fontconfig.spec | 8 +++- 2 files changed, 101 insertions(+), 1 deletion(-) create mode 100644 fontconfig-emoji.patch 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.spec b/fontconfig.spec index 72fe959..8085ef0 100644 --- a/fontconfig.spec +++ b/fontconfig.spec @@ -3,7 +3,7 @@ Summary: Font configuration and customization library Name: fontconfig Version: 2.12.6 -Release: 2%{?dist} +Release: 3%{?dist} # src/ftglue.[ch] is in Public Domain # src/fccache.c contains Public Domain code # fc-case/CaseFolding.txt is in the UCD @@ -17,6 +17,8 @@ Source2: fc-cache # https://bugzilla.redhat.com/show_bug.cgi?id=140335 Patch0: %{name}-sleep-less.patch Patch1: %{name}-revert-urw.patch +# https://bugzilla.redhat.com/show_bug.cgi?id=1496761 +Patch2: %{name}-emoji.patch BuildRequires: expat-devel BuildRequires: freetype-devel >= %{freetype_version} @@ -62,6 +64,7 @@ which is useful for developing applications that uses fontconfig. %setup -q %patch0 -p1 -b .sleep-less %patch1 -p1 -b .urw +%patch2 -p1 -b .emoji %build # We don't want to rebuild the docs, but we want to install the included ones. @@ -153,6 +156,9 @@ HOME=/root /usr/bin/fc-cache -s %doc fontconfig-devel.txt fontconfig-devel %changelog +* Thu Oct 5 2017 Akira TAGOH - 2.12.6-3 +- Backport a patch to change the order of the emoji fonts. (#1496761) + * Tue Oct 3 2017 Akira TAGOH - 2.12.6-2 - Revert URW changes in the config. From 938b90f307a8f40f6b6dd12dd1665d65dfadd8bc Mon Sep 17 00:00:00 2001 From: Akira TAGOH Date: Wed, 8 Nov 2017 17:25:35 +0900 Subject: [PATCH 5/5] Remove the debug print in fc-query. (#1509790) --- ...onfig-remove-debug-print-in-fc-query.patch | 25 +++++++++++++++++++ fontconfig.spec | 8 +++++- 2 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 fontconfig-remove-debug-print-in-fc-query.patch 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.spec b/fontconfig.spec index 8085ef0..aba62c6 100644 --- a/fontconfig.spec +++ b/fontconfig.spec @@ -3,7 +3,7 @@ Summary: Font configuration and customization library Name: fontconfig Version: 2.12.6 -Release: 3%{?dist} +Release: 4%{?dist} # src/ftglue.[ch] is in Public Domain # src/fccache.c contains Public Domain code # fc-case/CaseFolding.txt is in the UCD @@ -19,6 +19,8 @@ Patch0: %{name}-sleep-less.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: expat-devel BuildRequires: freetype-devel >= %{freetype_version} @@ -65,6 +67,7 @@ which is useful for developing applications that uses fontconfig. %patch0 -p1 -b .sleep-less %patch1 -p1 -b .urw %patch2 -p1 -b .emoji +%patch3 -p1 -b .fc-query %build # We don't want to rebuild the docs, but we want to install the included ones. @@ -156,6 +159,9 @@ HOME=/root /usr/bin/fc-cache -s %doc fontconfig-devel.txt fontconfig-devel %changelog +* Wed Nov 8 2017 Akira TAGOH - 2.12.6-4 +- Remove the debug print in fc-query. (#1509790) + * Thu Oct 5 2017 Akira TAGOH - 2.12.6-3 - Backport a patch to change the order of the emoji fonts. (#1496761)