mingw-w64-gtk2: 2.24.28 -> 2.24.29

3 files changed, 8 insertions, 87 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a2df505a9145..8803320a8b43 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,8 @@
+# Generated by mksrcinfo v8
+# Sat Dec 12 13:42:02 UTC 2015
 pkgbase = mingw-w64-gtk2
 	pkgdesc = GTK+ is a multi-platform toolkit (v2) (mingw-w64)
-	pkgver = 2.24.28
+	pkgver = 2.24.29
 	pkgrel = 1
 	url = http://www.gtk.org
 	arch = any
@@ -18,10 +20,8 @@ pkgbase = mingw-w64-gtk2
 	options = !strip
 	options = !buildflags
 	options = staticlibs
-	source = https://download.gnome.org/sources/gtk+/2.24/gtk+-2.24.28.tar.xz
-	source = gtk2-bug-753691-fix-parallel-installation.patch
-	sha256sums = b2c6441e98bc5232e5f9bba6965075dcf580a8726398f7374d39f90b88ed4656
-	sha256sums = 6c74279653fdeed9a5c79a13f1593460398e8409a850eddfe437c333f60be8be
+	source = https://download.gnome.org/sources/gtk+/2.24/gtk+-2.24.29.tar.xz
+	sha256sums = 0741c59600d3d810a223866453dc2bbb18ce4723828681ba24aa6519c37631b8
 
 pkgname = mingw-w64-gtk2
 
diff --git a/PKGBUILD b/PKGBUILD
index cb4d0bc79e20..1ffef305a658 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,5 +1,5 @@
 pkgname=mingw-w64-gtk2
-pkgver=2.24.28
+pkgver=2.24.29
 pkgrel=1
 pkgdesc="GTK+ is a multi-platform toolkit (v2) (mingw-w64)"
 arch=(any)
@@ -18,16 +18,13 @@ depends=(
   'mingw-w64-cairo>=1.6'
   'mingw-w64-gdk-pixbuf2>=2.21.0')
 options=(!strip !buildflags staticlibs)
-source=("https://download.gnome.org/sources/gtk+/${pkgver%.*}/gtk+-${pkgver}.tar.xz"
-        'gtk2-bug-753691-fix-parallel-installation.patch')
-sha256sums=("b2c6441e98bc5232e5f9bba6965075dcf580a8726398f7374d39f90b88ed4656"
-            '6c74279653fdeed9a5c79a13f1593460398e8409a850eddfe437c333f60be8be')
+source=("https://download.gnome.org/sources/gtk+/${pkgver%.*}/gtk+-${pkgver}.tar.xz")
+sha256sums=("0741c59600d3d810a223866453dc2bbb18ce4723828681ba24aa6519c37631b8")
 
 _architectures="i686-w64-mingw32 x86_64-w64-mingw32"
 
 build() {
   cd "${srcdir}/gtk+-${pkgver}"
-  patch -p1 < "${srcdir}/${source[1]}"
   for _arch in ${_architectures}; do
     msg "Building for ${_arch}"
     rm "${srcdir}/gtk+-${pkgver}/gtk/gtk.def"
diff --git a/gtk2-bug-753691-fix-parallel-installation.patch b/gtk2-bug-753691-fix-parallel-installation.patch
deleted file mode 100644
index eba0447cd3a6..000000000000
--- a/gtk2-bug-753691-fix-parallel-installation.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-From 46c28bd54d274c1d8c7d75795b043e21122749eb Mon Sep 17 00:00:00 2001
-From: Ting-Wei Lan <lantw@src.gnome.org>
-Date: Wed, 19 Aug 2015 10:38:39 +0800
-Subject: [PATCH] Makefiles: Fix parallel installation for MinGW
-
-Make sure that the destination exists before installing files.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=753691
----
- gdk/Makefile.am                             | 2 ++
- gtk/Makefile.am                             | 2 ++
- modules/other/gail/libgail-util/Makefile.am | 2 ++
- 3 files changed, 6 insertions(+)
-
-diff --git a/gdk/Makefile.am b/gdk/Makefile.am
-index c880f6e..bccd7b8 100644
---- a/gdk/Makefile.am
-+++ b/gdk/Makefile.am
-@@ -263,6 +263,7 @@ endif # HAVE_INTROSPECTION
- 
- if OS_WIN32
- install-def-file: gdk.def
-+	$(mkinstalldirs) $(DESTDIR)$(libdir)
- 	$(INSTALL) $(srcdir)/gdk.def $(DESTDIR)$(libdir)/gdk-win32-2.0.def
- uninstall-def-file:
- 	-rm $(DESTDIR)$(libdir)/gdk-win32-2.0.def
-@@ -278,6 +279,7 @@ gdk-win32-$(GTK_API_VERSION).lib: libgdk-win32-$(GTK_API_VERSION).la gdk.def
- 	lib -machine:@LIB_EXE_MACHINE_FLAG@ -name:libgdk-win32-$(GTK_API_VERSION)-@LT_CURRENT_MINUS_AGE@.dll -def:gdk.def -out:$@
- 
- install-ms-lib:
-+	$(mkinstalldirs) $(DESTDIR)$(libdir)
- 	$(INSTALL) gdk-win32-$(GTK_API_VERSION).lib $(DESTDIR)$(libdir)
- 
- uninstall-ms-lib:
-diff --git a/gtk/Makefile.am b/gtk/Makefile.am
-index 248220d..1b2afc5 100644
---- a/gtk/Makefile.am
-+++ b/gtk/Makefile.am
-@@ -73,6 +73,7 @@ gtk-win32-res.o : gtk-win32.rc
- 	$(WINDRES) gtk-win32.rc $@
- 
- install-def-file: gtk.def
-+	$(mkinstalldirs) $(DESTDIR)$(libdir)
- 	$(INSTALL) $(srcdir)/gtk.def $(DESTDIR)$(libdir)/gtk-win32-2.0.def
- uninstall-def-file:
- 	-rm $(DESTDIR)$(libdir)/gtk-win32-2.0.def
-@@ -88,6 +89,7 @@ gtk-win32-$(GTK_API_VERSION).lib: libgtk-win32-$(GTK_API_VERSION).la gtk.def
- 	lib -machine:@LIB_EXE_MACHINE_FLAG@ -name:libgtk-win32-$(GTK_API_VERSION)-@LT_CURRENT_MINUS_AGE@.dll -def:gtk.def -out:$@
- 
- install-ms-lib:
-+	$(mkinstalldirs) $(DESTDIR)$(libdir)
- 	$(INSTALL) gtk-win32-$(GTK_API_VERSION).lib $(DESTDIR)$(libdir)
- 
- uninstall-ms-lib:
-diff --git a/modules/other/gail/libgail-util/Makefile.am b/modules/other/gail/libgail-util/Makefile.am
-index 3145719..22d18d9 100644
---- a/modules/other/gail/libgail-util/Makefile.am
-+++ b/modules/other/gail/libgail-util/Makefile.am
-@@ -7,6 +7,7 @@ endif
- if OS_WIN32
- export_symbols = -export-symbols $(srcdir)/gailutil.def
- install-def-file: gailutil.def
-+	$(mkinstalldirs) $(DESTDIR)$(libdir)
- 	$(INSTALL) $(srcdir)/gailutil.def $(DESTDIR)$(libdir)
- uninstall-def-file:
- 	-rm $(DESTDIR)$(libdir)/gailutil.def
-@@ -19,6 +20,7 @@ if MS_LIB_AVAILABLE
- noinst_DATA = gailutil.lib
- 
- install-ms-lib:
-+	$(mkinstalldirs) $(DESTDIR)$(libdir)
- 	$(INSTALL) gailutil.lib $(DESTDIR)$(libdir)
- 
- uninstall-ms-lib:
--- 
-2.4.3
\ No newline at end of file