Date: Sunday, March 13, 2016 @ 18:28:21 Author: andyrtr Revision: 261411
upgpkg: fontconfig 2.11.94-1 upstream update 2.11.94 - use developement snapshot for now, last release has more bugs and is pretty old Added: fontconfig/trunk/Avoid_an_error_message_on_testing_when_no_fonts.conf_installed.diff Modified: fontconfig/trunk/0002-Update-aliases-for-new-URW-fonts.patch fontconfig/trunk/PKGBUILD ---------------------------------------------------------------------+ 0002-Update-aliases-for-new-URW-fonts.patch | 259 ---------- Avoid_an_error_message_on_testing_when_no_fonts.conf_installed.diff | 23 PKGBUILD | 35 - 3 files changed, 47 insertions(+), 270 deletions(-) Modified: 0002-Update-aliases-for-new-URW-fonts.patch =================================================================== --- 0002-Update-aliases-for-new-URW-fonts.patch 2016-03-13 14:51:04 UTC (rev 261410) +++ 0002-Update-aliases-for-new-URW-fonts.patch 2016-03-13 17:28:21 UTC (rev 261411) @@ -7,237 +7,6 @@ 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: - </alias> - - <alias binding="same"> -+ <family>Nimbus Sans</family> -+ <default> -+ <family>Helvetica</family> -+ </default> -+ </alias> -+ -+ <alias binding="same"> - <family>TeX Gyre Heros</family> - <default> - <family>Helvetica</family> -@@ -64,6 +71,13 @@ but in an order preferring similar designs first. We do this in three steps: - </alias> - - <alias binding="same"> -+ <family>Nimbus Sans Narrow</family> -+ <default> -+ <family>Helvetica Condensed</family> -+ </default> -+ </alias> -+ -+ <alias binding="same"> - <family>TeX Gyre Heros Cn</family> - <default> - <family>Helvetica Condensed</family> -@@ -78,6 +92,13 @@ but in an order preferring similar designs first. We do this in three steps: - </alias> - - <alias binding="same"> -+ <family>Nimbus Roman</family> -+ <default> -+ <family>Times</family> -+ </default> -+ </alias> -+ -+ <alias binding="same"> - <family>TeX Gyre Termes</family> - <default> - <family>Times</family> -@@ -92,6 +113,13 @@ but in an order preferring similar designs first. We do this in three steps: - </alias> - - <alias binding="same"> -+ <family>Nimbus Mono</family> -+ <default> -+ <family>Courier</family> -+ </default> -+ </alias> -+ -+ <alias binding="same"> - <family>TeX Gyre Cursor</family> - <default> - <family>Courier</family> -@@ -113,6 +141,13 @@ but in an order preferring similar designs first. We do this in three steps: - </alias> - - <alias binding="same"> -+ <family>URW Gothic</family> -+ <default> -+ <family>ITC Avant Garde Gothic</family> -+ </default> -+ </alias> -+ -+ <alias binding="same"> - <family>TeX Gyre Adventor</family> - <default> - <family>ITC Avant Garde Gothic</family> -@@ -134,6 +169,13 @@ but in an order preferring similar designs first. We do this in three steps: - </alias> - - <alias binding="same"> -+ <family>Bookman URW</family> -+ <default> -+ <family>ITC Bookman</family> -+ </default> -+ </alias> -+ -+ <alias binding="same"> - <family>TeX Gyre Bonum</family> - <default> - <family>ITC Bookman</family> -@@ -162,6 +204,13 @@ but in an order preferring similar designs first. We do this in three steps: - </alias> - - <alias binding="same"> -+ <family>Chancery URW</family> -+ <default> -+ <family>ITC Zapf Chancery</family> -+ </default> -+ </alias> -+ -+ <alias binding="same"> - <family>TeX Gyre Chorus</family> - <default> - <family>ITC Zapf Chancery</family> -@@ -176,6 +225,13 @@ but in an order preferring similar designs first. We do this in three steps: - </alias> - - <alias binding="same"> -+ <family>Palladio URW</family> -+ <default> -+ <family>Palatino</family> -+ </default> -+ </alias> -+ -+ <alias binding="same"> - <family>TeX Gyre Pagella</family> - <default> - <family>Palatino</family> -@@ -197,6 +253,13 @@ but in an order preferring similar designs first. We do this in three steps: - </alias> - - <alias binding="same"> -+ <family>Century SchoolBook URW</family> -+ <default> -+ <family>New Century Schoolbook</family> -+ </default> -+ </alias> -+ -+ <alias binding="same"> - <family>TeX Gyre Schola</family> - <default> - <family>New Century Schoolbook</family> -@@ -401,6 +464,7 @@ but in an order preferring similar designs first. We do this in three steps: - <family>Helvetica</family> - <accept> - <family>TeX Gyre Heros</family> -+ <family>Nimbus Sans</family> - <family>Nimbus Sans L</family> - </accept> - </alias> -@@ -409,6 +473,7 @@ but in an order preferring similar designs first. We do this in three steps: - <family>Helvetica Condensed</family> - <accept> - <family>TeX Gyre Heros Cn</family> -+ <family>Nimbus Sans Narrow</family> - </accept> - </alias> - -@@ -416,6 +481,7 @@ but in an order preferring similar designs first. We do this in three steps: - <family>Times</family> - <accept> - <family>TeX Gyre Termes</family> -+ <family>Nimbus Roman</family> - <family>Nimbus Roman No9 L</family> - </accept> - </alias> -@@ -424,6 +490,7 @@ but in an order preferring similar designs first. We do this in three steps: - <family>Courier</family> - <accept> - <family>TeX Gyre Cursor</family> -+ <family>Nimbus Mono</family> - <family>Nimbus Mono L</family> - </accept> - </alias> -@@ -432,6 +499,7 @@ but in an order preferring similar designs first. We do this in three steps: - <family>ITC Avant Garde Gothic</family> - <accept> - <family>TeX Gyre Adventor</family> -+ <family>URW Gothic</family> - <family>URW Gothic L</family> - </accept> - </alias> -@@ -441,6 +509,7 @@ but in an order preferring similar designs first. We do this in three steps: - <accept> - <family>Bookman Old Style</family> - <family>TeX Gyre Bonum</family> -+ <family>Bookman URW</family> - <family>URW Bookman L</family> - </accept> - </alias> -@@ -449,6 +518,7 @@ but in an order preferring similar designs first. We do this in three steps: - <family>ITC Zapf Chancery</family> - <accept> - <family>TeX Gyre Chorus</family> -+ <family>Chancery URW</family> - <family>URW Chancery L</family> - </accept> - </alias> -@@ -458,6 +528,7 @@ but in an order preferring similar designs first. We do this in three steps: - <accept> - <family>Palatino Linotype</family> - <family>TeX Gyre Pagella</family> -+ <family>Palladio URW</family> - <family>URW Palladio L</family> - </accept> - </alias> -@@ -467,6 +538,7 @@ but in an order preferring similar designs first. We do this in three steps: - <accept> - <family>Century Schoolbook</family> - <family>TeX Gyre Schola</family> -+ <family>Century SchoolBook URW</family> - <family>Century Schoolbook L</family> - </accept> - </alias> diff --git a/conf.d/45-latin.conf b/conf.d/45-latin.conf index 996fb81..72490f3 100644 --- a/conf.d/45-latin.conf @@ -275,34 +44,6 @@ <!-- Fantasy faces --> -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 @@ - <family>Thorndale AMT</family> - <family>Luxi Serif</family> - <family>Nimbus Roman No9 L</family> -+ <family>Nimbus Roman</family> - <family>Times</family> - </prefer> - </alias> -@@ -23,6 +24,7 @@ - <family>Albany AMT</family> - <family>Luxi Sans</family> - <family>Nimbus Sans L</family> -+ <family>Nimbus Sans</family> - <family>Helvetica</family> - <family>Lucida Sans Unicode</family> - <family>BPG Glaho International</family> <!-- lat,cyr,arab,geor --> -@@ -40,6 +42,7 @@ - <family>Cumberland AMT</family> - <family>Luxi Mono</family> - <family>Nimbus Mono L</family> -+ <family>Nimbus Mono</family> - <family>Courier</family> - </prefer> - </alias> -- cgit v0.10.2 Added: Avoid_an_error_message_on_testing_when_no_fonts.conf_installed.diff =================================================================== --- Avoid_an_error_message_on_testing_when_no_fonts.conf_installed.diff (rev 0) +++ Avoid_an_error_message_on_testing_when_no_fonts.conf_installed.diff 2016-03-13 17:28:21 UTC (rev 261411) @@ -0,0 +1,23 @@ +From 04763135d47ae24a808fc15c4482e2bb6f847ab9 Mon Sep 17 00:00:00 2001 +From: Akira TAGOH <ak...@tagoh.org> +Date: Wed, 25 Nov 2015 11:58:14 +0900 +Subject: Avoid an error message on testing when no fonts.conf installed + +This test case doesn't require any config files so no need to ensure loading them. + +diff --git a/test/test-bz89617.c b/test/test-bz89617.c +index 587214a..35df885 100644 +--- a/test/test-bz89617.c ++++ b/test/test-bz89617.c +@@ -28,7 +28,7 @@ + int + main (void) + { +- FcConfig *config = FcConfigGetCurrent (); ++ FcConfig *config = FcConfigCreate (); + + if (!FcConfigAppFontAddFile (config, (const FcChar8 *)SRCDIR "/4x6.pcf") || + FcConfigAppFontAddFile (config, (const FcChar8 *)"/dev/null")) +-- +cgit v0.10.2 + Modified: PKGBUILD =================================================================== --- PKGBUILD 2016-03-13 14:51:04 UTC (rev 261410) +++ PKGBUILD 2016-03-13 17:28:21 UTC (rev 261411) @@ -2,20 +2,23 @@ # Maintainer: Jan de Groot <j...@archlinux.org> pkgname=fontconfig -pkgver=2.11.1 -pkgrel=2 +pkgver=2.11.94 +pkgrel=1 pkgdesc="A library for configuring and customizing font access" arch=(i686 x86_64) url="http://www.fontconfig.org/release/" license=('custom') depends=('expat' 'freetype2') +makedepends=('python2' 'docbook2x') +#makedepends=('python2' 'python2-lxml' 'gperf' 'git') # for git build install=fontconfig.install source=(http://www.fontconfig.org/release/$pkgname-$pkgver.tar.bz2 - 0001-Revert-Bug-73291-poppler-does-not-show-fl-ligature.patch + Avoid_an_error_message_on_testing_when_no_fonts.conf_installed.diff + #git://anongit.freedesktop.org/fontconfig#commit=d05d083e9f87eb378b92e477d34a88061a572d86 # 2016-03-09 01:20:41 (GMT) 0002-Update-aliases-for-new-URW-fonts.patch) -sha256sums=('dc62447533bca844463a3c3fd4083b57c90f18a70506e7a9f4936b5a1e516a99' - '657d180d9d78555df4f1b81871ba9c1c7c6056c83455514950d064fdfae4646b' - '1194d1b92d228d8ed705f5502fdf4fcfad5a794f388bcb4928074df4c34a1bfb') +sha256sums=('d763c024df434146f3352448bc1f4554f390c8a48340cef7aa9cc44716a159df' + '911ec42fe2c0b57b2115d61aa1bb327b40189374cc115e648c58b57c8a7f3aba' + '08b5b1ccdfc1fb91787b9211758b01d9d7a988ad939c4cd0c4b5ae0e8143e59d') # a nice page to test font matching: # http://zipcon.net/~swhite/docs/computers/browsers/fonttest.html @@ -22,19 +25,27 @@ prepare() { cd $pkgname-$pkgver + # fix a bug in the testsuite + # https://cgit.freedesktop.org/fontconfig/commit/?id=04763135d47ae24a808fc15c4482e2bb6f847ab9 + patch -Np1 -i $srcdir/Avoid_an_error_message_on_testing_when_no_fonts.conf_installed.diff + + #cd $pkgname # 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 + # changes in 30-metric-aliases.conf and 60-latin.conf went upstream, + # keep changes in 45-latin.conf - is this really required? - disable for testing purpose +# patch -p1 -i ../0002-Update-aliases-for-new-URW-fonts.patch + } build() { cd $pkgname-$pkgver + #cd $pkgname # make sure there's no rpath trouble and sane .so versioning - FC and Gentoo do this as well - libtoolize -f - autoreconf -fi - +# libtoolize -f +# autoreconf -fi + ./configure --prefix=/usr \ --sysconfdir=/etc \ --with-templatedir=/etc/fonts/conf.avail \ @@ -48,11 +59,13 @@ check() { cd $pkgname-$pkgver + #cd $pkgname make -k check } package() { cd $pkgname-$pkgver + #cd $pkgname make DESTDIR="$pkgdir" install install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING" }