From 11e14327461d3f486bec253dd665c600f3ab0dfc Mon Sep 17 00:00:00 2001
From: Ting-Wei Lan <lantw44@gmail.com>
Date: Sun, 22 Sep 2013 00:11:48 +0800
Subject: mingw-w64-gtk2: 2.24.20-1 -> 2.24.21-1

gtk-dont-define-initguid.patch is removed because it is upstreamed.
---
 mingw-w64-gtk2/.SRCINFO                       |  8 +++-----
 mingw-w64-gtk2/PKGBUILD                       | 11 +++--------
 mingw-w64-gtk2/gtk-dont-define-initguid.patch | 11 -----------
 3 files changed, 6 insertions(+), 24 deletions(-)
 delete mode 100644 mingw-w64-gtk2/gtk-dont-define-initguid.patch

diff --git a/mingw-w64-gtk2/.SRCINFO b/mingw-w64-gtk2/.SRCINFO
index e68a192..3b68512 100644
--- a/mingw-w64-gtk2/.SRCINFO
+++ b/mingw-w64-gtk2/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = mingw-w64-gtk2
 	pkgdesc = GTK+ is a multi-platform toolkit (v2) (mingw-w64)
-	pkgver = 2.24.20
+	pkgver = 2.24.21
 	pkgrel = 1
 	url = http://www.gtk.org
 	arch = any
@@ -17,10 +17,8 @@ pkgbase = mingw-w64-gtk2
 	options = !libtool
 	options = !strip
 	options = !buildflags
-	source = http://ftp.gnome.org/pub/gnome/sources/gtk+/2.24/gtk+-2.24.20.tar.xz
-	source = gtk-dont-define-initguid.patch
-	md5sums = 9d7833331d7accd80668e29d7f567ce5
-	md5sums = 4038939df90f80ea6923d67afff28e03
+	source = http://ftp.gnome.org/pub/gnome/sources/gtk+/2.24/gtk+-2.24.21.tar.xz
+	md5sums = d7ba702e76236237f2667f3def591fe7
 
 pkgname = mingw-w64-gtk2
 
diff --git a/mingw-w64-gtk2/PKGBUILD b/mingw-w64-gtk2/PKGBUILD
index 1f1c67d..55ff3b3 100644
--- a/mingw-w64-gtk2/PKGBUILD
+++ b/mingw-w64-gtk2/PKGBUILD
@@ -1,5 +1,5 @@
 pkgname=mingw-w64-gtk2
-pkgver=2.24.20
+pkgver=2.24.21
 pkgrel=1
 pkgdesc="GTK+ is a multi-platform toolkit (v2) (mingw-w64)"
 arch=(any)
@@ -15,19 +15,14 @@ depends=(
 'mingw-w64-gdk-pixbuf2>=2.21.0')
 options=(!libtool !strip !buildflags)
 source=(
-"http://ftp.gnome.org/pub/gnome/sources/gtk+/${pkgver%.*}/gtk+-${pkgver}.tar.xz"
-"gtk-dont-define-initguid.patch")
+"http://ftp.gnome.org/pub/gnome/sources/gtk+/${pkgver%.*}/gtk+-${pkgver}.tar.xz")
 
-# The second source file is downloaded from Fedora Project
-
-md5sums=("9d7833331d7accd80668e29d7f567ce5"
-         "4038939df90f80ea6923d67afff28e03")
+md5sums=("d7ba702e76236237f2667f3def591fe7")
 
 _architectures="i686-w64-mingw32 x86_64-w64-mingw32"
 
 build() {
   cd "${srcdir}/gtk+-${pkgver}"
-  patch -Np0 < '../gtk-dont-define-initguid.patch'
   for _arch in ${_architectures}; do
     export CFLAGS="-O2 -mms-bitfields"
     export CXXFLAGS="${CFLAGS}"
diff --git a/mingw-w64-gtk2/gtk-dont-define-initguid.patch b/mingw-w64-gtk2/gtk-dont-define-initguid.patch
deleted file mode 100644
index 5f41a48..0000000
--- a/mingw-w64-gtk2/gtk-dont-define-initguid.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- gdk/win32/gdkdnd-win32.c.orig	2013-04-04 21:15:55.689671748 +0200
-+++ gdk/win32/gdkdnd-win32.c	2013-04-04 21:16:02.083782327 +0200
-@@ -70,8 +70,6 @@
-  *
-  */
-  
--#define INITGUID
--
- #include "gdkdnd.h"
- #include "gdkproperty.h"
- #include "gdkinternals.h"
-- 
cgit v1.2.3