diff --git a/.gitignore b/.gitignore index 5cec911..91fa938 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ gtk+-2.21.5.tar.bz2 /gtk+-2.24.1.tar.bz2 /gtk+-2.24.3.tar.bz2 /gtk+-2.24.4.tar.bz2 +/gtk+-2.24.5.tar.xz diff --git a/gtk2.spec b/gtk2.spec index a8c20c1..96d84f9 100644 --- a/gtk2.spec +++ b/gtk2.spec @@ -1,6 +1,6 @@ # Note that this is NOT a relocatable package -%define glib2_base_version 2.23.6 +%define glib2_base_version 2.27.3 %define glib2_version %{glib2_base_version}-1 %define pango_base_version 1.20.0 %define pango_version %{pango_base_version}-1 @@ -17,13 +17,13 @@ Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X Name: gtk2 -Version: 2.24.4 -Release: 2%{?dist} +Version: 2.24.5 +Release: 1%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://www.gtk.org #VCS: git:git://git.gnome.org/gtk+#gtk-2-24 -Source: http://download.gnome.org/sources/gtk+/2.24/gtk+-%{version}.tar.bz2 +Source: http://download.gnome.org/sources/gtk+/2.24/gtk+-%{version}.tar.xz Source2: update-gtk-immodules Source3: im-cedilla.conf @@ -39,7 +39,6 @@ Patch8: tooltip-positioning.patch #Patch14: gtk2-landscape-pdf-print.patch # https://bugzilla.gnome.org/show_bug.cgi?id=611313 Patch15: window-dragging.patch -Patch16: gtkdnd-keycode-unbind.patch BuildRequires: atk-devel >= %{atk_version} BuildRequires: glib2-devel >= %{glib2_version} @@ -156,7 +155,6 @@ This package contains developer documentation for the GTK+ widget toolkit. %patch8 -p1 -b .tooltip-positioning #%patch14 -p1 -b .landscape-pdf-print %patch15 -p1 -b .window-dragging -%patch16 -p1 -b .keycode-unbind %build # For the gobject-introspection patch @@ -352,6 +350,9 @@ fi %doc tmpdocs/examples %changelog +* Fri Jun 17 2011 Tomas Bzatek - 2.24.5-1 +- Update to 2.24.5 + * Mon Jun 13 2011 Daniel Drake - 2.24.4-2 - Fix unbinding of keycodes on drag-and-drop (olpc#10643) diff --git a/gtkdnd-keycode-unbind.patch b/gtkdnd-keycode-unbind.patch deleted file mode 100644 index 9c8d680..0000000 --- a/gtkdnd-keycode-unbind.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 794a3706cd29f8457731b09ac39870ee1d11bf94 Mon Sep 17 00:00:00 2001 -From: Daniel Drake -Date: Sun, 12 Jun 2011 17:48:17 +0100 -Subject: [PATCH] gtkdnd: Don't bind/unbind keycodes that couldn't be - determined - -At http://dev.laptop.org/ticket/10643 we are seeing that drag-and-drop -within the Sugar shell causes all of Sugar's custom keybindings to be -removed. - -This is because gtkdnd tries to unbind XK_KP_Space, which (on my systems) -is resolved to NoSymbol by XKeycodeToKeysym(). NoSymbol has value 0, -the same as AnyKey, and XUngrabKey(AnyKey) is equivalent to unbinding -all possible keycodes. - -Fix this by catching NoSymbol before binding/unbinding. - -https://bugzilla.gnome.org/show_bug.cgi?id=652402 ---- - gtk/gtkdnd.c | 4 ++++ - 1 files changed, 4 insertions(+), 0 deletions(-) - -diff --git a/gtk/gtkdnd.c b/gtk/gtkdnd.c -index 4805a6f..617a02e 100644 ---- a/gtk/gtkdnd.c -+++ b/gtk/gtkdnd.c -@@ -475,6 +475,8 @@ grab_dnd_keys (GtkWidget *widget, - for (i = 0; i < G_N_ELEMENTS (grab_keys); ++i) - { - keycode = XKeysymToKeycode (GDK_WINDOW_XDISPLAY (window), grab_keys[i].keysym); -+ if (keycode == NoSymbol) -+ continue; - XGrabKey (GDK_WINDOW_XDISPLAY (window), - keycode, grab_keys[i].modifiers, - GDK_WINDOW_XID (root), -@@ -508,6 +510,8 @@ ungrab_dnd_keys (GtkWidget *widget, - for (i = 0; i < G_N_ELEMENTS (grab_keys); ++i) - { - keycode = XKeysymToKeycode (GDK_WINDOW_XDISPLAY (window), grab_keys[i].keysym); -+ if (keycode == NoSymbol) -+ continue; - XUngrabKey (GDK_WINDOW_XDISPLAY (window), - keycode, grab_keys[i].modifiers, - GDK_WINDOW_XID (root)); --- -1.7.5.2 - diff --git a/sources b/sources index 01b6df1..9f721d4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e05a700ba79c8813d56e83e80636ee21 gtk+-2.24.4.tar.bz2 +f229b6de6699b898682939bc5baa0c61 gtk+-2.24.5.tar.xz