From ebe0a578b31473e7aabf20c260c06fedcbbb0b27 Mon Sep 17 00:00:00 2001
From: Ting-Wei Lan <lantw44@gmail.com>
Date: Tue, 18 Jun 2013 02:21:22 +0800
Subject: mingw-w64-gtk2: 2.24.19-1 -> 2.24.19-2 (fix build problem)

---
 mingw-w64-gtk2/.SRCINFO |  4 ++--
 mingw-w64-gtk2/PKGBUILD | 21 ++++++++++++---------
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/mingw-w64-gtk2/.SRCINFO b/mingw-w64-gtk2/.SRCINFO
index 76ee811..a64cd4a 100644
--- a/mingw-w64-gtk2/.SRCINFO
+++ b/mingw-w64-gtk2/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = mingw-w64-gtk2
 	pkgdesc = GTK+ is a multi-platform toolkit (v2) (mingw-w64)
 	pkgver = 2.24.19
-	pkgrel = 1
+	pkgrel = 2
 	url = http://www.gtk.org
 	arch = any
 	license = LGPL
@@ -10,7 +10,7 @@ pkgbase = mingw-w64-gtk2
 	depends = mingw-w64-crt
 	depends = mingw-w64-atk
 	depends = mingw-w64-pango
-	depends = mingw-w64-glib2
+	depends = mingw-w64-glib2>=2.28.0
 	depends = mingw-w64-cairo
 	depends = mingw-w64-gdk-pixbuf2
 	options = !libtool
diff --git a/mingw-w64-gtk2/PKGBUILD b/mingw-w64-gtk2/PKGBUILD
index ae7c61a..77d2524 100644
--- a/mingw-w64-gtk2/PKGBUILD
+++ b/mingw-w64-gtk2/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=mingw-w64-gtk2
 pkgver=2.24.19
-pkgrel=1
+pkgrel=2
 pkgdesc="GTK+ is a multi-platform toolkit (v2) (mingw-w64)"
 arch=(any)
 url="http://www.gtk.org"
@@ -9,7 +9,7 @@ makedepends=(mingw-w64-gcc mingw-w64-pkg-config)
 depends=(mingw-w64-crt
 mingw-w64-atk
 mingw-w64-pango
-mingw-w64-glib2
+'mingw-w64-glib2>=2.28.0'
 mingw-w64-cairo
 mingw-w64-gdk-pixbuf2)
 options=(!libtool !strip !buildflags)
@@ -20,7 +20,7 @@ source=(
 # The second source file is downloaded from Fedora Project
 
 md5sums=("490236abeb0d9351b2a34e9aca70e1de"
-		"4038939df90f80ea6923d67afff28e03")
+         "4038939df90f80ea6923d67afff28e03")
 
 _architectures="i686-w64-mingw32 x86_64-w64-mingw32"
 
@@ -32,19 +32,22 @@ build() {
     export CXXFLAGS="${CFLAGS}"
     unset LDFLAGS
     mkdir -p "${srcdir}/${pkgname}-${pkgver}-build-${_arch}"
-    cp -r "$srcdir/gtk+-$pkgver/"* "${srcdir}/${pkgname}-${pkgver}-build-${_arch}"
+    msg "Building for ${_arch}"
+    msg "Copying the source directory"
+    cp -pr "$srcdir/gtk+-$pkgver/"* "${srcdir}/${pkgname}-${pkgver}-build-${_arch}"
     cd "${srcdir}/${pkgname}-${pkgver}-build-${_arch}"
-#    if [ $_arch = "x86_64-w64-mingw32" ]; then
-#      rm "gtk/gtk.def"
-#    fi
-    ${srcdir}/gtk+-${pkgver}/configure \
+    if [ $_arch = "x86_64-w64-mingw32" ]; then
+      rm "gtk/gtk.def"
+    fi
+    msg "Starting configure and make"
+    ./configure \
       --prefix=/usr/${_arch} \
       --build=$CHOST \
       --host=${_arch} \
       --with-gdktarget=win32 \
       --disable-modules \
       --disable-cups \
-      --with-included-loaders=png,bmp,ico,pnm,xpm \
+      --disable-papi \
       --enable-static \
       --enable-shared \
       --disable-glibtest
-- 
cgit v1.2.3