From dda96ce532ef99400e2b7703a0f538771b36b624 Mon Sep 17 00:00:00 2001
From: root <root@rshg054.dnsready.net>
Date: Sun, 9 Sep 2012 00:11:39 +0000
Subject: Sun Sep  9 00:11:39 UTC 2012

---
 multilib/lib32-fontconfig/PKGBUILD | 37 +++++++++++++++++++++++++------------
 1 file changed, 25 insertions(+), 12 deletions(-)

(limited to 'multilib/lib32-fontconfig/PKGBUILD')

diff --git a/multilib/lib32-fontconfig/PKGBUILD b/multilib/lib32-fontconfig/PKGBUILD
index 6afdec946..b3b29008a 100644
--- a/multilib/lib32-fontconfig/PKGBUILD
+++ b/multilib/lib32-fontconfig/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 63974 2012-02-08 18:48:56Z pschmitz $
+# $Id: PKGBUILD 75964 2012-09-07 10:17:43Z bluewind $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 _pkgbasename=fontconfig
 pkgname=lib32-$_pkgbasename
-pkgver=2.8.0
-pkgrel=4
+pkgver=2.10.1
+pkgrel=1
 pkgdesc="A library for configuring and customizing font access (32-bit)"
 arch=(x86_64)
 url="http://www.fontconfig.org/release/"
@@ -11,10 +11,8 @@ license=('custom')
 depends=('lib32-expat>=2.0.1' 'lib32-freetype2>=2.3.11' $_pkgbasename)
 makedepends=(gcc-multilib)
 options=('!libtool')
-source=(http://www.fontconfig.org/release/${_pkgbasename}-${pkgver}.tar.gz
-        30-urw-aliases.patch)
-md5sums=('77e15a92006ddc2adbb06f840d591c0e'
-         '51bc6cb633b50f3c28793361738aac5b')
+source=(http://www.fontconfig.org/release/${_pkgbasename}-${pkgver}.tar.gz)
+md5sums=('c94e380eea42f2f23ca9537035ef1899')
 
 build() {
   export CC="gcc -m32"
@@ -22,18 +20,33 @@ build() {
   export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
 
   cd "${srcdir}/${_pkgbasename}-${pkgver}"
-  patch -Np1 -i "${srcdir}/30-urw-aliases.patch"
-  # enable Position Independent Code for prelinking
-  export CFLAGS="${CFLAGS} -fPIC"
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libdir=/usr/lib32
+  # make sure there's no rpath trouble and sane .so versioning - FC and Gentoo do this as well
+  libtoolize -f
+  autoreconf -f
+
+  ./configure --prefix=/usr \
+	  --sysconfdir=/etc \
+	  --with-templatedir=/etc/fonts/conf.avail \
+	  --with-xmldir=/etc/fonts \
+	  --localstatedir=/var \
+	  --disable-static \
+	  --with-default-fonts=/usr/share/fonts \
+	  --with-add-fonts=/usr/share/fonts \
+	  --libdir=/usr/lib32
+
   make
 }
 
+check() {
+	cd "$srcdir/$_pkgbasename-$pkgver"
+	make -k check
+}
+
 package() {
   cd "${srcdir}/${_pkgbasename}-${pkgver}"
 
   make DESTDIR="${pkgdir}" install
-  
+
   rm -rf "${pkgdir}"/usr/{include,share,bin} "$pkgdir"/{etc,var}
   mkdir -p "$pkgdir/usr/share/licenses"
   ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname"
-- 
cgit v1.2.3-54-g00ecf