2.2.0

2 files changed, 19 insertions, 21 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ca880adff43b..001f4bb4c3be 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,18 +1,19 @@
+# Generated by mksrcinfo v8
+# Tue Mar 21 19:52:44 UTC 2017
 pkgbase = mingw-w64-expat
 	pkgdesc = An XML parser library (mingw-w64)
-	pkgver = 2.1.0
-	pkgrel = 5
+	pkgver = 2.2.0
+	pkgrel = 1
 	url = http://expat.sourceforge.net
 	arch = any
 	license = custom
-	makedepends = mingw-w64-gcc
-	makedepends = mingw-w64-pkg-config
+	makedepends = mingw-w64-configure
 	depends = mingw-w64-crt
 	options = !strip
 	options = !buildflags
 	options = staticlibs
-	source = http://downloads.sourceforge.net/expat/expat-2.1.0.tar.gz
-	md5sums = dd7dab7a5fea97d2a6a43f511449b7cd
+	source = http://downloads.sourceforge.net/expat/expat-2.2.0.tar.bz2
+	md5sums = 2f47841c829facb346eb6e3fab5212e2
 
 pkgname = mingw-w64-expat
 
diff --git a/PKGBUILD b/PKGBUILD
index f1d4da3f3ad2..0eb9aa307bab 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,38 +1,35 @@
 pkgname=mingw-w64-expat
-pkgver=2.1.0
-pkgrel=5
+pkgver=2.2.0
+pkgrel=1
 pkgdesc="An XML parser library (mingw-w64)"
 arch=(any)
 url="http://expat.sourceforge.net"
 license=("custom")
-makedepends=(mingw-w64-gcc mingw-w64-pkg-config)
+makedepends=(mingw-w64-configure)
 depends=(mingw-w64-crt)
 options=(!strip !buildflags staticlibs)
-source=("http://downloads.sourceforge.net/expat/expat-${pkgver}.tar.gz")
-md5sums=('dd7dab7a5fea97d2a6a43f511449b7cd')
+source=("http://downloads.sourceforge.net/expat/expat-${pkgver}.tar.bz2")
+md5sums=('2f47841c829facb346eb6e3fab5212e2')
 
 _architectures="i686-w64-mingw32 x86_64-w64-mingw32"
 
 build() {
+  cd "${srcdir}/expat-${pkgver}"
   for _arch in ${_architectures}; do
-    unset LDFLAGS
-    mkdir -p "${srcdir}/${pkgname}-${pkgver}-build-${_arch}"
-    cd "${srcdir}/${pkgname}-${pkgver}-build-${_arch}"
-    "${srcdir}"/expat-${pkgver}/configure \
-      --prefix=/usr/${_arch} \
-      --build=$CHOST \
-      --host=${_arch}
+    mkdir -p build-${_arch} && pushd build-${_arch}
+    ${_arch}-configure ..
     make
+    popd
   done
 }
 
 package() {
   for _arch in ${_architectures}; do
-    cd "${srcdir}/${pkgname}-${pkgver}-build-${_arch}"
+    cd "${srcdir}/expat-${pkgver}/build-${_arch}"
     make DESTDIR="$pkgdir" install
     rm "$pkgdir/usr/${_arch}/bin/xmlwf"
-    find "$pkgdir/usr/${_arch}" -name '*.dll' | xargs -rtl1 ${_arch}-strip --strip-unneeded
-    find "$pkgdir/usr/${_arch}" -name '*.a' -o -name '*.dll' | xargs -rtl1 ${_arch}-strip -g
+    ${_arch}-strip --strip-unneeded "$pkgdir"/usr/${_arch}/bin/*.dll
+    ${_arch}-strip -g "$pkgdir"/usr/${_arch}/lib/*.a
     rm -r "$pkgdir/usr/${_arch}/share"
   done
 }