From adaa32c2beee7bce9ef075664a8889cfdacd5b87 Mon Sep 17 00:00:00 2001
From: Alexpux <alexey.pawlow@gmail.com>
Date: Mon, 24 Mar 2014 23:14:59 +0400
Subject: [PATCH] fontconfig: Update to 2.11.1

---
 mingw-w64-fontconfig/PKGBUILD                 | 53 ++++++++-----------
 ...nfig32.install => fontconfig-i686.install} |  6 +--
 ...ig64.install => fontconfig-x86_64.install} |  6 +--
 3 files changed, 29 insertions(+), 36 deletions(-)
 rename mingw-w64-fontconfig/{fontconfig32.install => fontconfig-i686.install} (82%)
 rename mingw-w64-fontconfig/{fontconfig64.install => fontconfig-x86_64.install} (82%)

diff --git a/mingw-w64-fontconfig/PKGBUILD b/mingw-w64-fontconfig/PKGBUILD
index a30bca323e..654ed0bc90 100644
--- a/mingw-w64-fontconfig/PKGBUILD
+++ b/mingw-w64-fontconfig/PKGBUILD
@@ -3,8 +3,8 @@
 _realname=fontconfig
 _mingw_suff=mingw-w64-${CARCH}
 pkgname="${_mingw_suff}-${_realname}"
-pkgver=2.11.0
-pkgrel=2
+pkgver=2.11.1
+pkgrel=1
 pkgdesc="A library for configuring and customizing font access (mingw-w64)"
 arch=('any')
 url="http://www.fontconfig.org/release"
@@ -16,42 +16,35 @@ depends=("${_mingw_suff}-gcc-libs"
 		"${_mingw_suff}-bzip2>=1.0.6"
 		"${_mingw_suff}-libiconv")
 options=('staticlibs' 'strip')
-case $MINGW_CHOST in
-	i686*)
-		install=${_realname}32.install
-	;;
-	x86_64*)
-		install=${_realname}64.install
-	;;
-esac
+install=${_realname}-${CARCH}.install
 source=("http://www.fontconfig.org/release/fontconfig-$pkgver.tar.bz2"
 		"fontconfig-2.11.0-symlinks-fix.patch")
-sha256sums=('cb0e0ef6f03bc8568e95653840bb07d5859dc89d7ce2cade9d94fcccf8c1a467'
+sha256sums=('dc62447533bca844463a3c3fd4083b57c90f18a70506e7a9f4936b5a1e516a99'
             '92541375e945261832d4876551f94596fcf540c4edaf789ac0f36de7592c5966')
 
 prepare() {
-  cd "${srcdir}"/${_realname}-${pkgver}
-  patch -p1 -i ${srcdir}/fontconfig-2.11.0-symlinks-fix.patch
+	cd "${srcdir}"/${_realname}-${pkgver}
+	patch -p1 -i ${srcdir}/fontconfig-2.11.0-symlinks-fix.patch
 }
 
 build() {
-    mkdir -p "${srcdir}/${_realname}-${pkgver}-build-${CARCH}"
-    cd "${srcdir}/${_realname}-${pkgver}-build-${CARCH}"
-    "${srcdir}"/${_realname}-${pkgver}/configure \
-      --prefix=${MINGW_PREFIX} \
-      --build=${MINGW_CHOST} \
-      --host=${MINGW_CHOST} \
-      --enable-iconv \
-	  --disable-docs \
-      --with-arch=${CARCH} \
-	  as_ln_s="cp -pR"
-    sed -i 's,all-am: Makefile $(PROGRAMS),all-am:,' test/Makefile
-    make
+	[[ -d "${srcdir}/build-${MINGW_CHOST}" ]] && rm -rf "${srcdir}/build-${MINGW_CHOST}"
+	mkdir -p "${srcdir}/build-${MINGW_CHOST}"
+	cd "${srcdir}/build-${MINGW_CHOST}"
+	"${srcdir}"/${_realname}-${pkgver}/configure \
+		--prefix=${MINGW_PREFIX} \
+		--build=${MINGW_CHOST} \
+		--host=${MINGW_CHOST} \
+		--enable-iconv \
+		--disable-docs \
+		--with-arch=${CARCH} \
+		as_ln_s="cp -pR"
+	sed -i 's,all-am: Makefile $(PROGRAMS),all-am:,' test/Makefile
+	make
 }
 
 package() {
-    cd "${srcdir}/${_realname}-${pkgver}-build-${CARCH}"
-    make -j1 DESTDIR="$pkgdir" install
-    find "${pkgdir}${MINGW_PREFIX}" -name '*.def' -o -name '*.exp' | xargs -rtl1 rm
-    #rm -r "${pkgdir}${MINGW_PREFIX}/"{etc,share}
-}
\ No newline at end of file
+	cd "${srcdir}/build-${MINGW_CHOST}"
+	make -j1 DESTDIR="$pkgdir" install
+	find "${pkgdir}${MINGW_PREFIX}" -name '*.def' -o -name '*.exp' | xargs -rtl1 rm
+}
diff --git a/mingw-w64-fontconfig/fontconfig32.install b/mingw-w64-fontconfig/fontconfig-i686.install
similarity index 82%
rename from mingw-w64-fontconfig/fontconfig32.install
rename to mingw-w64-fontconfig/fontconfig-i686.install
index 548bbfba1b..bb00ce6431 100644
--- a/mingw-w64-fontconfig/fontconfig32.install
+++ b/mingw-w64-fontconfig/fontconfig-i686.install
@@ -7,13 +7,13 @@ post_install() {
 _EOF
 
   echo -n "updating font cache... "
-  /mingw32/bin/fc-cache -f
+  mingw32/bin/fc-cache -f
   echo "done."
 }
 
 post_upgrade() {
   echo -n "updating font cache... "
-  /mingw32/bin/fc-cache -f
+  mingw32/bin/fc-cache -f
   echo "done."
 }
 
@@ -21,7 +21,7 @@ post_remove() {
   cat << _EOF
 
   Check for dead symlinks and leftover files 
-  in /mingw32/etc/fonts/conf.d/
+  in mingw32/etc/fonts/conf.d/
   
 _EOF
 }
\ No newline at end of file
diff --git a/mingw-w64-fontconfig/fontconfig64.install b/mingw-w64-fontconfig/fontconfig-x86_64.install
similarity index 82%
rename from mingw-w64-fontconfig/fontconfig64.install
rename to mingw-w64-fontconfig/fontconfig-x86_64.install
index e2f4962570..e7bccead84 100644
--- a/mingw-w64-fontconfig/fontconfig64.install
+++ b/mingw-w64-fontconfig/fontconfig-x86_64.install
@@ -7,13 +7,13 @@ post_install() {
 _EOF
 
   echo -n "updating font cache... "
-  /mingw64/bin/fc-cache -f
+  mingw64/bin/fc-cache -f
   echo "done."
 }
 
 post_upgrade() {
   echo -n "updating font cache... "
-  /mingw64/bin/fc-cache -f
+  mingw64/bin/fc-cache -f
   echo "done."
 }
 
@@ -21,7 +21,7 @@ post_remove() {
   cat << _EOF
 
   Check for dead symlinks and leftover files 
-  in /mingw64/etc/fonts/conf.d/
+  in mingw64/etc/fonts/conf.d/
   
 _EOF
 }