From a85e008dd22187757e50fb6ddccccd18f4a4d81a Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Tue, 7 Feb 2017 21:20:33 +0000 Subject: fontconfig: update to 2.12.1 --- ...g-73291-poppler-does-not-show-fl-ligature.patch | 43 --- .../0001-fix-test-with-freetype2-2.7.1.patch | 42 +++ .../0002-Update-aliases-for-new-URW-fonts.patch | 308 --------------------- abs/core/fontconfig/PKGBUILD | 40 +-- abs/core/fontconfig/fontconfig.hook | 11 + abs/core/fontconfig/fontconfig.install | 12 +- 6 files changed, 78 insertions(+), 378 deletions(-) delete mode 100644 abs/core/fontconfig/0001-Revert-Bug-73291-poppler-does-not-show-fl-ligature.patch create mode 100644 abs/core/fontconfig/0001-fix-test-with-freetype2-2.7.1.patch delete mode 100644 abs/core/fontconfig/0002-Update-aliases-for-new-URW-fonts.patch create mode 100644 abs/core/fontconfig/fontconfig.hook diff --git a/abs/core/fontconfig/0001-Revert-Bug-73291-poppler-does-not-show-fl-ligature.patch b/abs/core/fontconfig/0001-Revert-Bug-73291-poppler-does-not-show-fl-ligature.patch deleted file mode 100644 index 8c1e55d..0000000 --- a/abs/core/fontconfig/0001-Revert-Bug-73291-poppler-does-not-show-fl-ligature.patch +++ /dev/null @@ -1,43 +0,0 @@ -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 - diff --git a/abs/core/fontconfig/0001-fix-test-with-freetype2-2.7.1.patch b/abs/core/fontconfig/0001-fix-test-with-freetype2-2.7.1.patch new file mode 100644 index 0000000..d834b70 --- /dev/null +++ b/abs/core/fontconfig/0001-fix-test-with-freetype2-2.7.1.patch @@ -0,0 +1,42 @@ +From 165f0f012f8d4bebb12d188c1c2a369d233d586e Mon Sep 17 00:00:00 2001 +From: Christian Hesse +Date: Tue, 10 Jan 2017 10:01:54 +0100 +Subject: [PATCH 1/1] fix test with freetype2 2.7.1 + +Upstream freetype2 applied a patch from openSuSE [0]: + +[pcf] Enrich family name with foundry name and glyph width info. +3576487add2f0e9691e8c43f8b0cd8e61aebf14f + +This prepends the foundry name plus a space to the family name. We needs +change the font name in expexted test output. + +[0] http://git.savannah.gnu.org/cgit/freetype/freetype2.git/commit/?id=3576487add2f0e9691e8c43f8b0cd8e61aebf14f + +Signed-off-by: Christian Hesse +--- + test/out.expected | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +diff --git a/test/out.expected b/test/out.expected +index 39634c5..f3a8856 100644 +--- a/test/out.expected ++++ b/test/out.expected +@@ -1,8 +1,8 @@ +-Fixed:pixelsize=16 +-Fixed:pixelsize=6 ++Misc Fixed:pixelsize=6 ++Sony Fixed:pixelsize=16 + = +-Fixed:pixelsize=16 +-Fixed:pixelsize=6 ++Misc Fixed:pixelsize=6 ++Sony Fixed:pixelsize=16 + = +-Fixed:pixelsize=16 +-Fixed:pixelsize=6 ++Misc Fixed:pixelsize=6 ++Sony Fixed:pixelsize=16 +-- +2.11.0 + diff --git a/abs/core/fontconfig/0002-Update-aliases-for-new-URW-fonts.patch b/abs/core/fontconfig/0002-Update-aliases-for-new-URW-fonts.patch deleted file mode 100644 index 58df7ea..0000000 --- a/abs/core/fontconfig/0002-Update-aliases-for-new-URW-fonts.patch +++ /dev/null @@ -1,308 +0,0 @@ -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 --git a/abs/core/fontconfig/PKGBUILD b/abs/core/fontconfig/PKGBUILD index 9f1fe17..e15ebc6 100644 --- a/abs/core/fontconfig/PKGBUILD +++ b/abs/core/fontconfig/PKGBUILD @@ -2,39 +2,33 @@ # Maintainer: Jan de Groot pkgname=fontconfig -pkgver=2.11.1 -pkgrel=2 +pkgver=2.12.1 +pkgrel=4 pkgdesc="A library for configuring and customizing font access" arch=(i686 x86_64) -url="http://www.fontconfig.org/release/" +url="https://www.freedesktop.org/wiki/Software/fontconfig/" license=('custom') depends=('expat' 'freetype2') +makedepends=('python2' 'docbook2x') install=fontconfig.install -source=(http://www.fontconfig.org/release/$pkgname-$pkgver.tar.bz2 - 0001-Revert-Bug-73291-poppler-does-not-show-fl-ligature.patch - 0002-Update-aliases-for-new-URW-fonts.patch) -sha256sums=('dc62447533bca844463a3c3fd4083b57c90f18a70506e7a9f4936b5a1e516a99' - '657d180d9d78555df4f1b81871ba9c1c7c6056c83455514950d064fdfae4646b' - '1194d1b92d228d8ed705f5502fdf4fcfad5a794f388bcb4928074df4c34a1bfb') +source=(https://www.freedesktop.org/software/$pkgname/release/$pkgname-$pkgver.tar.bz2 + fontconfig.hook + 0001-fix-test-with-freetype2-2.7.1.patch) +sha256sums=('b449a3e10c47e1d1c7a6ec6e2016cca73d3bd68fbbd4f0ae5cc6b573f7d6c7f3' + '672f6a1c5e164671955ce807e670306194142a1794ce88df653aa717a972e274' + 'b4992aab4e2b4ddae01f7565486752fa877edb6cd5ed435e15938ed21dfe22c8') - # a nice page to test font matching: - # http://zipcon.net/~swhite/docs/computers/browsers/fonttest.html +# a nice page to test font matching: +# http://zipcon.net/~swhite/docs/computers/browsers/fonttest.html +# http://getemoji.com/ prepare() { cd $pkgname-$pkgver - - # Upstream patches implementing FS#45928 - patch -p1 -i ../0001-Revert-Bug-73291-poppler-does-not-show-fl-ligature.patch - patch -p1 -i ../0002-Update-aliases-for-new-URW-fonts.patch + patch -Np1 -i ../0001-fix-test-with-freetype2-2.7.1.patch } build() { cd $pkgname-$pkgver - - # make sure there's no rpath trouble and sane .so versioning - FC and Gentoo do this as well - libtoolize -f - autoreconf -fi - ./configure --prefix=/usr \ --sysconfdir=/etc \ --with-templatedir=/etc/fonts/conf.avail \ @@ -51,8 +45,14 @@ check() { make -k check } +_install_conf() { + install -m644 "$1" "$pkgdir/etc/fonts/conf.avail" + ln -s "../conf.avail/${1##*/}" "$pkgdir/etc/fonts/conf.d" +} + package() { cd $pkgname-$pkgver make DESTDIR="$pkgdir" install install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING" + install -Dm644 ../fontconfig.hook "$pkgdir/usr/share/libalpm/hooks/fontconfig.hook" } diff --git a/abs/core/fontconfig/fontconfig.hook b/abs/core/fontconfig/fontconfig.hook new file mode 100644 index 0000000..0f24bc4 --- /dev/null +++ b/abs/core/fontconfig/fontconfig.hook @@ -0,0 +1,11 @@ +[Trigger] +Type = File +Operation = Install +Operation = Upgrade +Operation = Remove +Target = usr/share/fonts/* + +[Action] +Description = Updating fontconfig cache... +When = PostTransaction +Exec = /usr/bin/fc-cache -s diff --git a/abs/core/fontconfig/fontconfig.install b/abs/core/fontconfig/fontconfig.install index 961bba5..1a80d04 100644 --- a/abs/core/fontconfig/fontconfig.install +++ b/abs/core/fontconfig/fontconfig.install @@ -18,16 +18,14 @@ post_install() { _EOF - echo -n "updating font cache... " - # a full forced directory scan is required here - /usr/bin/fc-cache -f - echo "done." + post_upgrade $1 } post_upgrade() { - echo -n "updating font cache... " - /usr/bin/fc-cache -f - echo "done." + echo -n "Updating font cache..." + # a full forced directory scan is required here + /usr/bin/fc-cache -rs + echo " done." } post_remove() { -- cgit v0.12