mingw-w64-{gdk-pixbuf2,gtk2,gtk3}: Use mingw-w64-configure

3 files changed, 68 insertions, 70 deletions

diff --git a/mingw-w64-gdk-pixbuf2/PKGBUILD b/mingw-w64-gdk-pixbuf2/PKGBUILD
index daf64ef..f44e63a 100644
--- a/mingw-w64-gdk-pixbuf2/PKGBUILD
+++ b/mingw-w64-gdk-pixbuf2/PKGBUILD
@@ -1,17 +1,21 @@
 pkgname=mingw-w64-gdk-pixbuf2
 pkgver=2.31.1
 pkgrel=1
-pkgdesc="An image loading library (mingw-w64)"
+pkgdesc='An image loading library (mingw-w64)'
 arch=(any)
-url="http://www.gtk.org"
-license=("LGPL")
-makedepends=(mingw-w64-gcc mingw-w64-pkg-config)
-depends=(mingw-w64-crt
-'mingw-w64-glib2>=2.37.6'
-mingw-w64-jasper
-mingw-w64-libpng
-mingw-w64-libjpeg-turbo
-mingw-w64-libtiff)
+url='http://www.gtk.org'
+license=('LGPL')
+makedepends=(
+  'mingw-w64-gcc'
+  'mingw-w64-pkg-config'
+  'mingw-w64-configure')
+depends=(
+  'mingw-w64-crt'
+  'mingw-w64-glib2>=2.37.6'
+  'mingw-w64-jasper'
+  'mingw-w64-libpng'
+  'mingw-w64-libjpeg-turbo'
+  'mingw-w64-libtiff')
 options=(!strip !buildflags staticlibs)
 source=("http://download.gnome.org/sources/gdk-pixbuf/${pkgver%.*}/gdk-pixbuf-$pkgver.tar.xz")
 sha256sums=('25a75e3c61dac11e6ff6416ad846951ccafac6486b1c6a1bfb0b213b99db52cd')
@@ -19,31 +23,27 @@ sha256sums=('25a75e3c61dac11e6ff6416ad846951ccafac6486b1c6a1bfb0b213b99db52cd')
 _architectures="i686-w64-mingw32 x86_64-w64-mingw32"
 
 build() {
+  cd "${srcdir}/gdk-pixbuf-${pkgver}"
   for _arch in ${_architectures}; do
     unset LDFLAGS
-    export CFLAGS="-O2 -pipe -mms-bitfields"
-    export CXXFLAGS="${CFLAGS}"
-    export CXX=$_arch-g++
-    mkdir -p "${srcdir}/${pkgname}-${pkgver}-build-${_arch}"
-    cd "${srcdir}/${pkgname}-${pkgver}-build-${_arch}"
-    ${srcdir}/gdk-pixbuf-${pkgver}/configure \
-      --prefix=/usr/${_arch} \
-      --build=$CHOST \
-      --host=${_arch} \
-      --enable-static \
-      --enable-shared \
+    mkdir -p "build-${_arch}"
+    cd "build-${_arch}"
+    ${_arch}-configure \
       --with-included-loaders=wbmp,png,pnm,ras,ani,xpm,xbm,tga,icns,pcx,qtif,gdip-ico,gdip-wmf,gdip-emf,gdip-bmp,gdip-gif,gdip-jpeg,gdip-tiff
     make
+    cd ..
   done
 }
 
 package() {
+  cd "${srcdir}/gdk-pixbuf-${pkgver}"
   for _arch in ${_architectures}; do
-    cd "${srcdir}/${pkgname}-${pkgver}-build-${_arch}"
+    cd "build-${_arch}"
     make DESTDIR="$pkgdir" install
     find "$pkgdir/usr/${_arch}" -name '*.exe' -o -name '*.bat' -o -name '*.def' -o -name '*.exp' | 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}/share"
+    cd ..
   done
 }
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
 }
diff --git a/mingw-w64-gtk3/PKGBUILD b/mingw-w64-gtk3/PKGBUILD
index 35e0821..73d4b22 100644
--- a/mingw-w64-gtk3/PKGBUILD
+++ b/mingw-w64-gtk3/PKGBUILD
@@ -3,26 +3,30 @@
 pkgname=mingw-w64-gtk3
 pkgver=3.14.5
 pkgrel=1
-pkgdesc="GObject-based multi-platform GUI toolkit (v3) (mingw-w64)"
+pkgdesc='GObject-based multi-platform GUI toolkit (v3) (mingw-w64)'
 arch=(any)
-url="http://www.gtk.org"
-license=("LGPL")
-makedepends=(mingw-w64-gcc mingw-w64-pkg-config gtk-update-icon-cache python2)
-# python2 is required to run gdbus-codegen
+url='http://www.gtk.org'
+license=('LGPL')
+makedepends=(
+  'mingw-w64-gcc'
+  'mingw-w64-pkg-config'
+  'mingw-w64-configure'
+  'gtk-update-icon-cache'
+  'python2') # python2 is required to run gdbus-codegen
 depends=(
-'mingw-w64-crt'
-'mingw-w64-atk>=2.12.0'
-'mingw-w64-pango>=1.36.7'
-'mingw-w64-glib2>=2.41.2'
-'mingw-w64-cairo>=1.12.0'
-'mingw-w64-gdk-pixbuf2>=2.30.0')
+  'mingw-w64-crt'
+  'mingw-w64-atk>=2.12.0'
+  'mingw-w64-pango>=1.36.7'
+  'mingw-w64-glib2>=2.41.2'
+  'mingw-w64-cairo>=1.12.0'
+  'mingw-w64-gdk-pixbuf2>=2.30.0')
 options=(!strip !buildflags staticlibs)
 
 source=(
-"http://ftp.gnome.org/pub/gnome/sources/gtk+/${pkgver%.*}/gtk+-${pkgver}.tar.xz"
-"0005-Remove-gobject-introspection.patch"
-"gtk3-bug-731013-fix-cross-compilation.patch"
-"window-GtkPlug-is-conditionally-supported-on-X11-o.patch")
+  "http://ftp.gnome.org/pub/gnome/sources/gtk+/${pkgver%.*}/gtk+-${pkgver}.tar.xz"
+  "0005-Remove-gobject-introspection.patch"
+  "gtk3-bug-731013-fix-cross-compilation.patch"
+  "window-GtkPlug-is-conditionally-supported-on-X11-o.patch")
 
 # The third patch is downloaded from Fedora Project
 # The fourth patch: https://bugzilla.gnome.org/show_bug.cgi?id=739885
@@ -42,34 +46,30 @@ build() {
   autoreconf -i
   for _arch in ${_architectures}; do
     unset LDFLAGS
-    export CFLAGS="-O2 -mms-bitfields"
-    export CXXFLAGS="${CFLAGS}"
     export PKG_CONFIG="${_arch}-pkg-config"
     export PKG_CONFIG_FOR_BUILD="pkg-config"
-    mkdir -p "${srcdir}/${pkgname}-${pkgver}-build-${_arch}"
-    cd "${srcdir}/${pkgname}-${pkgver}-build-${_arch}"
+    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 \
       --enable-win32-backend \
       --enable-gtk2-dependency \
-      --enable-static \
-      --enable-shared \
       --disable-cups
     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/man"
+    cd ..
   done
 }