From fc79bbb2a7d3af3b0b65d178bf9f744a6906f015 Mon Sep 17 00:00:00 2001
From: Kalev Lember <kalevlember@gmail.com>
Date: Oct 18 2011 16:24:05 +0000
Subject: Update to 2.24.7


---

diff --git a/.gitignore b/.gitignore
index 28b4a7c..e22a2db 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /gtk+-2.22.0.tar.bz2
 /gtk+-2.24.4.tar.bz2
 /gtk+-2.24.5.tar.bz2
+/gtk+-2.24.7.tar.xz
diff --git a/gtk2-commit-d0aa7ffc.patch b/gtk2-commit-d0aa7ffc.patch
deleted file mode 100644
index f97721b..0000000
--- a/gtk2-commit-d0aa7ffc.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From d0aa7ffc61d67b42a2343fd144bb74a20fbbe7c8 Mon Sep 17 00:00:00 2001
-From: Chun-wei Fan <fanchunwei@src.gnome.org>
-Date: Thu, 16 Jun 2011 05:48:56 +0000
-Subject: Add G_ENABLE_DEBUG #ifdef check in gdkdisplay-win32.c
-
-Commit 88707e6912c376faedf0b8c5b02895aa18473cb4 used
-_gdk_win32_cf_to_string, which is only defined when G_ENABLE_DEBUG
-is defined, so add G_ENABLE_DEBUG #ifdef around that part.
----
-diff --git a/gdk/win32/gdkdisplay-win32.c b/gdk/win32/gdkdisplay-win32.c
-index 6f48a2f..2611c03 100644
---- a/gdk/win32/gdkdisplay-win32.c
-+++ b/gdk/win32/gdkdisplay-win32.c
-@@ -383,14 +383,17 @@ inner_clipboard_window_procedure (HWND   hwnd,
- 
-         GDK_NOTE (DND, g_print (" drawclipboard owner: %p", hwndOwner));
- 
-+#ifdef G_ENABLE_DEBUG
-         if (_gdk_debug_flags & GDK_DEBUG_DND)
-           {
-             while ((nFormat = EnumClipboardFormats (nFormat)) != 0)
-               g_print ("%s ", _gdk_win32_cf_to_string (nFormat));
-           }
-+#endif
- 
-         GDK_NOTE (DND, g_print (" \n"));
- 
-+
-         event = gdk_event_new (GDK_OWNER_CHANGE);
-         event->owner_change.window = _gdk_root;
-         event->owner_change.owner = owner;
---
-cgit v0.9
diff --git a/mingw32-gtk2.spec b/mingw32-gtk2.spec
index f3a809a..150a0b5 100644
--- a/mingw32-gtk2.spec
+++ b/mingw32-gtk2.spec
@@ -3,14 +3,14 @@
 %define __debug_install_post %{_mingw32_debug_install_post}
 
 Name:           mingw32-gtk2
-Version:        2.24.5
+Version:        2.24.7
 Release:        1%{?dist}
 Summary:        MinGW Windows Gtk2 library
 
 License:        LGPLv2+
 Group:          Development/Libraries
 URL:            http://www.gtk.org
-Source0:        http://download.gnome.org/sources/gtk+/2.24/gtk+-%{version}.tar.bz2
+Source0:        http://download.gnome.org/sources/gtk+/2.24/gtk+-%{version}.tar.xz
 
 # wine %{_mingw32_bindir}/gtk-query-immodules-2.0.exe > gtk.immodules
 Source1:        gtk.immodules
@@ -21,9 +21,6 @@ Patch1000:      mingw32-gtk2-2.15.0-xbuttons.patch
 # Enable building a static library of GTK
 Patch1001:      mingw32-gtk2-enable_static_build.patch
 
-# Backport an already upstreamed commit which fixes compilation
-Patch1002:      gtk2-commit-d0aa7ffc.patch
-
 BuildArch:      noarch
 
 BuildRequires:  mingw32-filesystem >= 68
@@ -80,7 +77,6 @@ Static version of the MinGW Windows Gtk2 library.
 
 %patch1000 -p1
 %patch1001 -p0
-%patch1002 -p1
 
 
 %build
@@ -213,6 +209,10 @@ install -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_mingw32_sysconfdir}/gtk-2.0/
 
 
 %changelog
+* Tue Oct 18 2011 Kalev Lember <kalevlember@gmail.com> - 2.24.7-1
+- Update to 2.24.7
+- Switch to .xz tarballs
+
 * Sun Jul 10 2011 Erik van Pienbroek <epienbro@fedoraproject.org> - 2.24.5-1
 - Update to 2.24.5
 
diff --git a/sources b/sources
index eec88cb..97027e1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-aebeb2e9efc2e541dc9631546aed7900  gtk+-2.24.5.tar.bz2
+719df30b5076a0e37b62f968a5e1312c  gtk+-2.24.7.tar.xz