[mingw-gtk2: 50/65] Update to 2.24.5
epienbro
epienbro at fedoraproject.org
Tue Mar 6 20:04:26 UTC 2012
commit 227cc412073303682414dfdc589db6b0f0317f51
Author: Erik van Pienbroek <epienbro at fedoraproject.org>
Date: Sun Jul 10 19:31:32 2011 +0200
Update to 2.24.5
.gitignore | 1 +
gtk2-commit-d0aa7ffc.patch | 33 +++++++++++++++++++++++++++++++++
mingw32-gtk2.spec | 11 +++++++++--
sources | 2 +-
4 files changed, 44 insertions(+), 3 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 4f941c3..28b4a7c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
/gtk+-2.22.0.tar.bz2
/gtk+-2.24.4.tar.bz2
+/gtk+-2.24.5.tar.bz2
diff --git a/gtk2-commit-d0aa7ffc.patch b/gtk2-commit-d0aa7ffc.patch
new file mode 100644
index 0000000..f97721b
--- /dev/null
+++ b/gtk2-commit-d0aa7ffc.patch
@@ -0,0 +1,33 @@
+From d0aa7ffc61d67b42a2343fd144bb74a20fbbe7c8 Mon Sep 17 00:00:00 2001
+From: Chun-wei Fan <fanchunwei at 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 c8cf6b2..447c62a 100644
--- a/mingw32-gtk2.spec
+++ b/mingw32-gtk2.spec
@@ -6,8 +6,8 @@
%define __debug_install_post %{_mingw32_debug_install_post}
Name: mingw32-gtk2
-Version: 2.24.4
-Release: 2%{?dist}
+Version: 2.24.5
+Release: 1%{?dist}
Summary: MinGW Windows Gtk2 library
License: LGPLv2+
@@ -26,6 +26,9 @@ 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 >= 49
@@ -78,6 +81,7 @@ Static version of the MinGW Windows Gtk2 library.
%patch1000 -p1
%patch1001 -p0
+%patch1002 -p1
%build
@@ -218,6 +222,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Sun Jul 10 2011 Erik van Pienbroek <epienbro at fedoraproject.org> - 2.24.5-1
+- Update to 2.24.5
+
* Wed Jul 06 2011 Kalev Lember <kalevlember at gmail.com> - 2.24.4-2
- Rebuilt against win-iconv
diff --git a/sources b/sources
index 01b6df1..eec88cb 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e05a700ba79c8813d56e83e80636ee21 gtk+-2.24.4.tar.bz2
+aebeb2e9efc2e541dc9631546aed7900 gtk+-2.24.5.tar.bz2
More information about the scm-commits
mailing list