1 files changed, 20 insertions, 22 deletions
diff --git a/mingw-w64-gtk2/PKGBUILD b/mingw-w64-gtk2/PKGBUILD
index 3fb5062..f06dba4 100644
--- a/mingw-w64-gtk2/PKGBUILD
+++ b/mingw-w64-gtk2/PKGBUILD
@@ -5,18 +5,20 @@ pkgdesc="GTK+ is a multi-platform toolkit (v2) (mingw-w64)"
 arch=(any)
 url="http://www.gtk.org"
 license=("LGPL")
-makedepends=(mingw-w64-gcc mingw-w64-pkg-config gtk-update-icon-cache)
+makedepends=(
+  'mingw-w64-gcc'
+  'mingw-w64-pkg-config'
+  'mingw-w64-configure'
+  'gtk-update-icon-cache')
 depends=(
-'mingw-w64-crt'
-'mingw-w64-atk>=1.29.2'
-'mingw-w64-pango>=1.20'
-'mingw-w64-glib2>=2.28.0'
-'mingw-w64-cairo>=1.6'
-'mingw-w64-gdk-pixbuf2>=2.21.0')
+  'mingw-w64-crt'
+  'mingw-w64-atk>=1.29.2'
+  'mingw-w64-pango>=1.20'
+  'mingw-w64-glib2>=2.28.0'
+  'mingw-w64-cairo>=1.6'
+  'mingw-w64-gdk-pixbuf2>=2.21.0')
 options=(!libtool !strip !buildflags staticlibs)
-source=(
-"http://ftp.gnome.org/pub/gnome/sources/gtk+/${pkgver%.*}/gtk+-${pkgver}.tar.xz")
-
+source=("http://ftp.gnome.org/pub/gnome/sources/gtk+/${pkgver%.*}/gtk+-${pkgver}.tar.xz")
 sha256sums=("38af1020cb8ff3d10dda2c8807f11e92af9d2fa4045de61c62eedb7fbc7ea5b3")
 
 _architectures="i686-w64-mingw32 x86_64-w64-mingw32"
@@ -24,37 +26,33 @@ _architectures="i686-w64-mingw32 x86_64-w64-mingw32"
 build() {
   cd "${srcdir}/gtk+-${pkgver}"
   for _arch in ${_architectures}; do
-    export CFLAGS="-O2 -mms-bitfields"
-    export CXXFLAGS="${CFLAGS}"
-    unset LDFLAGS
     msg "Building for ${_arch}"
-    mkdir -p "${srcdir}/${pkgname}-${pkgver}-build-${_arch}"
-    cd "${srcdir}/${pkgname}-${pkgver}-build-${_arch}"
     rm "${srcdir}/gtk+-${pkgver}/gtk/gtk.def"
+    unset LDFLAGS
+    mkdir -p "build-${_arch}"
+    cd "build-${_arch}"
     msg "Starting configure and make"
-    ${srcdir}/gtk+-${pkgver}/configure \
-      --prefix=/usr/${_arch} \
-      --build=$CHOST \
-      --host=${_arch} \
+    ${_arch}-configure \
       --with-gdktarget=win32 \
       --disable-modules \
       --disable-cups \
       --disable-papi \
-      --enable-static \
-      --enable-shared \
       --disable-glibtest
     make
+    cd ..
   done
 }
 
 package() {
+  cd "${srcdir}/gtk+-${pkgver}"
   for _arch in ${_architectures}; do
-    cd "${srcdir}/${pkgname}-${pkgver}-build-${_arch}"
+    cd "build-${_arch}"
     make -j1 DESTDIR="$pkgdir" install
     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"
     rm -r "$pkgdir/usr/${_arch}/share/gtk-2.0"
+    cd ..
   done
 }