[arch-commits] Commit in fontconfig/trunk (PKGBUILD)

[andyrtr at archlinux.org]

    Date: Wednesday, September 5, 2012 @ 10:35:10
  Author: andyrtr
Revision: 166193

upgpkg: fontconfig 2.10.1-2

bring back proper font family wrapping required for helvetica famliy

Modified:
  fontconfig/trunk/PKGBUILD

----------+
 PKGBUILD |   13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-09-05 13:26:53 UTC (rev 166192)
+++ PKGBUILD	2012-09-05 14:35:10 UTC (rev 166193)
@@ -3,7 +3,7 @@
 
 pkgname=fontconfig
 pkgver=2.10.1
-pkgrel=1
+pkgrel=2
 pkgdesc="A library for configuring and customizing font access"
 arch=(i686 x86_64)
 url="http://www.fontconfig.org/release/"
@@ -43,12 +43,13 @@
   cd "$srcdir/$pkgname-$pkgver"
   make DESTDIR="$pkgdir" install
 
-  # not upstream, not in FC and not in Gentoo, let's drop it for testing - should be covered in 30-metric-aliases.conf
-  #install -m644 "$srcdir/29-replace-bitmap-fonts.conf" "$pkgdir/etc/fonts/conf.avail"
+  # not upstream, not in FC and not in Gentoo, this should probably go upstream
+  # meanwhile to satisfy pages like http://zipcon.net/~swhite/docs/computers/browsers/fonttest.html we bring it back
+  install -m644 "$srcdir/29-replace-bitmap-fonts.conf" "$pkgdir/etc/fonts/conf.avail"
+  pushd $pkgdir/etc/fonts/conf.d
+  ln -s /etc/fonts/conf.avail/29-replace-bitmap-fonts.conf .
+  popd
 
-  # we should keep upstream presettings and not leave them all up to the users decision - so FC and Gentoo do
-  #rm -f "$pkgdir"/etc/fonts/conf.d/*.conf
-
   #Install license
   install -m755 -d "$pkgdir/usr/share/licenses/$pkgname"
   install -m644 COPYING "$pkgdir/usr/share/licenses/$pkgname"