mingw-w64-gtk2: Preserve most share files and build out of the source tree

2 files changed, 7 insertions, 10 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 3b68512c7243..e066e5ebbb47 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = mingw-w64-gtk2
 	pkgdesc = GTK+ is a multi-platform toolkit (v2) (mingw-w64)
 	pkgver = 2.24.21
-	pkgrel = 1
+	pkgrel = 2
 	url = http://www.gtk.org
 	arch = any
 	license = LGPL
diff --git a/PKGBUILD b/PKGBUILD
index 55ff3b388dbb..a02f35b62cd4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=mingw-w64-gtk2
 pkgver=2.24.21
-pkgrel=1
+pkgrel=2
 pkgdesc="GTK+ is a multi-platform toolkit (v2) (mingw-w64)"
 arch=(any)
 url="http://www.gtk.org"
@@ -27,16 +27,12 @@ build() {
     export CFLAGS="-O2 -mms-bitfields"
     export CXXFLAGS="${CFLAGS}"
     unset LDFLAGS
-    mkdir -p "${srcdir}/${pkgname}-${pkgver}-build-${_arch}"
     msg "Building for ${_arch}"
-    msg "Copying the source directory"
-    cp -pr "$srcdir/gtk+-$pkgver/"* "${srcdir}/${pkgname}-${pkgver}-build-${_arch}"
+    mkdir -p "${srcdir}/${pkgname}-${pkgver}-build-${_arch}"
     cd "${srcdir}/${pkgname}-${pkgver}-build-${_arch}"
-    if [ $_arch = "x86_64-w64-mingw32" ]; then
-      rm "gtk/gtk.def"
-    fi
+    rm "${srcdir}/gtk+-${pkgver}/gtk/gtk.def"
     msg "Starting configure and make"
-    ./configure \
+    ${srcdir}/gtk+-${pkgver}/configure \
       --prefix=/usr/${_arch} \
       --build=$CHOST \
       --host=${_arch} \
@@ -58,6 +54,7 @@ package() {
     find "$pkgdir/usr/${_arch}" -name '*.exe' -o -name '*.bat' -o -name '*.def' -o -name '*.exp' -o -name '*.manifest' | xargs -rtl1 rm
     find "$pkgdir/usr/${_arch}" -name '*.dll' | xargs -rtl1 ${_arch}-strip -x
     find "$pkgdir/usr/${_arch}" -name '*.a' -o -name '*.dll' | xargs -rtl1 ${_arch}-strip -g
-    rm -r "$pkgdir/usr/${_arch}/"{etc,share}
+    rm -r "$pkgdir/usr/${_arch}/etc"
+    rm -r "$pkgdir/usr/${_arch}/share/gtk-2.0"
   done
 }