# HG changeset patch # User Masamichi Hosoda # Date 1439653661 -32400 # Node ID ffeca91898b8939912bd0d017bdf58f73d6b13ec # Parent ac4b8fa454879e80f94e8d5ce1e81b06273d761e Update fontconfig built-in conf file for new URW++ fonts aliases These patches are from fontconfig git repo. So they will be unnecessary from fontconfig-2.11.91. diff -r ac4b8fa45487 -r ffeca91898b8 gub/specs/fontconfig.py --- a/gub/specs/fontconfig.py Sat Aug 15 22:58:34 2015 +0900 +++ b/gub/specs/fontconfig.py Sun Aug 16 00:47:41 2015 +0900 @@ -22,6 +22,12 @@ specified by applications.''' source = 'http://fontconfig.org/release/fontconfig-2.11.1.tar.bz2' + patches = [ + # This patch will be unnecessary from fontconfig-2.11.91. + 'fontconfig-2.11.1-texgyre-aliases.patch', + # This patch will be unnecessary from fontconfig-2.11.91. + 'fontconfig-2.11.1-new-urw-aliases.patch', + ] #source = 'git://anongit.freedesktop.org/git/fontconfig?branch=master&revision=' + version dependencies = ['libtool', 'expat-devel', 'freetype-devel', 'tools::freetype', 'tools::pkg-config', 'tools::bzip2'] # FIXME: system dir vs packaging install diff -r ac4b8fa45487 -r ffeca91898b8 patches/fontconfig-2.11.1-new-urw-aliases.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/fontconfig-2.11.1-new-urw-aliases.patch Sun Aug 16 00:47:41 2015 +0900 @@ -0,0 +1,308 @@ +From b732bf057f4b3ec3bac539803005e9c42d056b2a Mon Sep 17 00:00:00 2001 +From: Akira TAGOH +Date: Thu, 6 Nov 2014 13:15:09 +0900 +Subject: Update aliases for new URW fonts + +Patch from Tom Yan + +https://bugs.freedesktop.org/show_bug.cgi?id=85225 + +diff --git a/conf.d/30-metric-aliases.conf b/conf.d/30-metric-aliases.conf +index 49a9602..cd1e924 100644 +--- a/conf.d/30-metric-aliases.conf ++++ b/conf.d/30-metric-aliases.conf +@@ -6,17 +6,17 @@ + + Alias similar/metric-compatible families from various sources: + +-PostScript fonts: URW fonts: GUST fonts: Windows fonts: +-====================== ==================== ================= ================== +-Helvetica Nimbus Sans L TeX Gyre Heros +-Helvetica Condensed TeX Gyre Heros Cn +-Times Nimbus Roman No9 L TeX Gyre Termes +-Courier Nimbus Mono L TeX Gyre Cursor +-ITC Avant Garde Gothic URW Gothic L TeX Gyre Adventor +-ITC Bookman URW Bookman L TeX Gyre Bonum Bookman Old Style +-ITC Zapf Chancery URW Chancery L TeX Gyre Chorus +-Palatino URW Palladio L TeX Gyre Pagella Palatino Linotype +-New Century Schoolbook Century Schoolbook L TeX Gyre Schola Century Schoolbook ++PostScript fonts: URW fonts: GUST fonts: Windows fonts: ++====================== ====================== ================= ================== ++Helvetica Nimbus Sans TeX Gyre Heros ++Helvetica Condensed Nimbus Sans Narrow TeX Gyre Heros Cn ++Times Nimbus Roman TeX Gyre Termes ++Courier Nimbus Mono TeX Gyre Cursor ++ITC Avant Garde Gothic URW Gothic TeX Gyre Adventor ++ITC Bookman Bookman URW TeX Gyre Bonum Bookman Old Style ++ITC Zapf Chancery Chancery URW TeX Gyre Chorus ++Palatino Palladio URW TeX Gyre Pagella Palatino Linotype ++New Century Schoolbook Century SchoolBook URW TeX Gyre Schola Century Schoolbook + + Microsoft fonts: Liberation fonts: Google CrOS core fonts: StarOffice fonts: AMT fonts: + ================ ====================== ======================= ================= ============== +@@ -57,6 +57,13 @@ but in an order preferring similar designs first. We do this in three steps: + + + ++ Nimbus Sans ++ ++ Helvetica ++ ++ ++ ++ + TeX Gyre Heros + + Helvetica +@@ -64,6 +71,13 @@ but in an order preferring similar designs first. We do this in three steps: + + + ++ Nimbus Sans Narrow ++ ++ Helvetica Condensed ++ ++ ++ ++ + TeX Gyre Heros Cn + + Helvetica Condensed +@@ -78,6 +92,13 @@ but in an order preferring similar designs first. We do this in three steps: + + + ++ Nimbus Roman ++ ++ Times ++ ++ ++ ++ + TeX Gyre Termes + + Times +@@ -92,6 +113,13 @@ but in an order preferring similar designs first. We do this in three steps: + + + ++ Nimbus Mono ++ ++ Courier ++ ++ ++ ++ + TeX Gyre Cursor + + Courier +@@ -113,6 +141,13 @@ but in an order preferring similar designs first. We do this in three steps: + + + ++ URW Gothic ++ ++ ITC Avant Garde Gothic ++ ++ ++ ++ + TeX Gyre Adventor + + ITC Avant Garde Gothic +@@ -134,6 +169,13 @@ but in an order preferring similar designs first. We do this in three steps: + + + ++ Bookman URW ++ ++ ITC Bookman ++ ++ ++ ++ + TeX Gyre Bonum + + ITC Bookman +@@ -162,6 +204,13 @@ but in an order preferring similar designs first. We do this in three steps: + + + ++ Chancery URW ++ ++ ITC Zapf Chancery ++ ++ ++ ++ + TeX Gyre Chorus + + ITC Zapf Chancery +@@ -176,6 +225,13 @@ but in an order preferring similar designs first. We do this in three steps: + + + ++ Palladio URW ++ ++ Palatino ++ ++ ++ ++ + TeX Gyre Pagella + + Palatino +@@ -197,6 +253,13 @@ but in an order preferring similar designs first. We do this in three steps: + + + ++ Century SchoolBook URW ++ ++ New Century Schoolbook ++ ++ ++ ++ + TeX Gyre Schola + + New Century Schoolbook +@@ -401,6 +464,7 @@ but in an order preferring similar designs first. We do this in three steps: + Helvetica + + TeX Gyre Heros ++ Nimbus Sans + Nimbus Sans L + + +@@ -409,6 +473,7 @@ but in an order preferring similar designs first. We do this in three steps: + Helvetica Condensed + + TeX Gyre Heros Cn ++ Nimbus Sans Narrow + + + +@@ -416,6 +481,7 @@ but in an order preferring similar designs first. We do this in three steps: + Times + + TeX Gyre Termes ++ Nimbus Roman + Nimbus Roman No9 L + + +@@ -424,6 +490,7 @@ but in an order preferring similar designs first. We do this in three steps: + Courier + + TeX Gyre Cursor ++ Nimbus Mono + Nimbus Mono L + + +@@ -432,6 +499,7 @@ but in an order preferring similar designs first. We do this in three steps: + ITC Avant Garde Gothic + + TeX Gyre Adventor ++ URW Gothic + URW Gothic L + + +@@ -441,6 +509,7 @@ but in an order preferring similar designs first. We do this in three steps: + + Bookman Old Style + TeX Gyre Bonum ++ Bookman URW + URW Bookman L + + +@@ -449,6 +518,7 @@ but in an order preferring similar designs first. We do this in three steps: + ITC Zapf Chancery + + TeX Gyre Chorus ++ Chancery URW + URW Chancery L + + +@@ -458,6 +528,7 @@ but in an order preferring similar designs first. We do this in three steps: + + Palatino Linotype + TeX Gyre Pagella ++ Palladio URW + URW Palladio L + + +@@ -467,6 +538,7 @@ but in an order preferring similar designs first. We do this in three steps: + + Century Schoolbook + TeX Gyre Schola ++ Century SchoolBook URW + Century Schoolbook L + + +diff --git a/conf.d/45-latin.conf b/conf.d/45-latin.conf +index 996fb81..72490f3 100644 +--- a/conf.d/45-latin.conf ++++ b/conf.d/45-latin.conf +@@ -34,6 +34,10 @@ + serif + + ++ Nimbus Roman ++ serif ++ ++ + Luxi Serif + serif + +@@ -97,6 +101,10 @@ + sans-serif + + ++ Nimbus Sans ++ sans-serif ++ ++ + Luxi Sans + sans-serif + +@@ -151,6 +159,10 @@ + Nimbus Mono L + monospace + ++ ++ Nimbus Mono ++ monospace ++ + +diff --git a/conf.d/60-latin.conf b/conf.d/60-latin.conf +index 2107e31..35600ea 100644 +--- a/conf.d/60-latin.conf ++++ b/conf.d/60-latin.conf +@@ -10,6 +10,7 @@ + Thorndale AMT + Luxi Serif + Nimbus Roman No9 L ++ Nimbus Roman + Times + + +@@ -23,6 +24,7 @@ + Albany AMT + Luxi Sans + Nimbus Sans L ++ Nimbus Sans + Helvetica + Lucida Sans Unicode + BPG Glaho International +@@ -40,6 +42,7 @@ + Cumberland AMT + Luxi Mono + Nimbus Mono L ++ Nimbus Mono + Courier + + +-- +cgit v0.10.2 + diff -r ac4b8fa45487 -r ffeca91898b8 patches/fontconfig-2.11.1-texgyre-aliases.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/fontconfig-2.11.1-texgyre-aliases.patch Sun Aug 16 00:47:41 2015 +0900 @@ -0,0 +1,43 @@ +From e7121de237a1873c3241a5b8451e7d00a3d41524 Mon Sep 17 00:00:00 2001 +From: Akira TAGOH +Date: Fri, 3 Oct 2014 12:26:42 +0900 +Subject: Revert "Bug 73291 - poppler does not show fl ligature" + +This reverts commit c6aa4d4bfcbed14f39d070fe7ef90a4b74642ee7. + +This issue has been fixed in poppler and we no longer need to patch it out in fontconfig. + +diff --git a/conf.d/30-metric-aliases.conf b/conf.d/30-metric-aliases.conf +index 08c8ba3..49a9602 100644 +--- a/conf.d/30-metric-aliases.conf ++++ b/conf.d/30-metric-aliases.conf +@@ -77,15 +77,12 @@ but in an order preferring similar designs first. We do this in three steps: + + + +- + + + Nimbus Mono L +@@ -418,10 +415,7 @@ but in an order preferring similar designs first. We do this in three steps: + + Times + +- + Nimbus Roman No9 L + + +-- +cgit v0.10.2 +