gtk: updated to version 2.12.2

6 files changed, 20 insertions, 90 deletions

diff --git a/gtk/.footprint b/gtk/.footprint
index f7a555a25..e051ee8b0 100644
--- a/gtk/.footprint
+++ b/gtk/.footprint
@@ -335,21 +335,21 @@ drwxr-xr-x	root/root	usr/lib/gtk-2.0/2.10.0/printbackends/
 drwxr-xr-x	root/root	usr/lib/gtk-2.0/include/
 -rw-r--r--	root/root	usr/lib/gtk-2.0/include/gdkconfig.h
 -rw-r--r--	root/root	usr/lib/libgdk-x11-2.0.la
-lrwxrwxrwx	root/root	usr/lib/libgdk-x11-2.0.so -> libgdk-x11-2.0.so.0.1200.1
-lrwxrwxrwx	root/root	usr/lib/libgdk-x11-2.0.so.0 -> libgdk-x11-2.0.so.0.1200.1
--rwxr-xr-x	root/root	usr/lib/libgdk-x11-2.0.so.0.1200.1
+lrwxrwxrwx	root/root	usr/lib/libgdk-x11-2.0.so -> libgdk-x11-2.0.so.0.1200.2
+lrwxrwxrwx	root/root	usr/lib/libgdk-x11-2.0.so.0 -> libgdk-x11-2.0.so.0.1200.2
+-rwxr-xr-x	root/root	usr/lib/libgdk-x11-2.0.so.0.1200.2
 -rwxr-xr-x	root/root	usr/lib/libgdk_pixbuf-2.0.la
-lrwxrwxrwx	root/root	usr/lib/libgdk_pixbuf-2.0.so -> libgdk_pixbuf-2.0.so.0.1200.1
-lrwxrwxrwx	root/root	usr/lib/libgdk_pixbuf-2.0.so.0 -> libgdk_pixbuf-2.0.so.0.1200.1
--rwxr-xr-x	root/root	usr/lib/libgdk_pixbuf-2.0.so.0.1200.1
+lrwxrwxrwx	root/root	usr/lib/libgdk_pixbuf-2.0.so -> libgdk_pixbuf-2.0.so.0.1200.2
+lrwxrwxrwx	root/root	usr/lib/libgdk_pixbuf-2.0.so.0 -> libgdk_pixbuf-2.0.so.0.1200.2
+-rwxr-xr-x	root/root	usr/lib/libgdk_pixbuf-2.0.so.0.1200.2
 -rwxr-xr-x	root/root	usr/lib/libgdk_pixbuf_xlib-2.0.la
-lrwxrwxrwx	root/root	usr/lib/libgdk_pixbuf_xlib-2.0.so -> libgdk_pixbuf_xlib-2.0.so.0.1200.1
-lrwxrwxrwx	root/root	usr/lib/libgdk_pixbuf_xlib-2.0.so.0 -> libgdk_pixbuf_xlib-2.0.so.0.1200.1
--rwxr-xr-x	root/root	usr/lib/libgdk_pixbuf_xlib-2.0.so.0.1200.1
+lrwxrwxrwx	root/root	usr/lib/libgdk_pixbuf_xlib-2.0.so -> libgdk_pixbuf_xlib-2.0.so.0.1200.2
+lrwxrwxrwx	root/root	usr/lib/libgdk_pixbuf_xlib-2.0.so.0 -> libgdk_pixbuf_xlib-2.0.so.0.1200.2
+-rwxr-xr-x	root/root	usr/lib/libgdk_pixbuf_xlib-2.0.so.0.1200.2
 -rw-r--r--	root/root	usr/lib/libgtk-x11-2.0.la
-lrwxrwxrwx	root/root	usr/lib/libgtk-x11-2.0.so -> libgtk-x11-2.0.so.0.1200.1
-lrwxrwxrwx	root/root	usr/lib/libgtk-x11-2.0.so.0 -> libgtk-x11-2.0.so.0.1200.1
--rwxr-xr-x	root/root	usr/lib/libgtk-x11-2.0.so.0.1200.1
+lrwxrwxrwx	root/root	usr/lib/libgtk-x11-2.0.so -> libgtk-x11-2.0.so.0.1200.2
+lrwxrwxrwx	root/root	usr/lib/libgtk-x11-2.0.so.0 -> libgtk-x11-2.0.so.0.1200.2
+-rwxr-xr-x	root/root	usr/lib/libgtk-x11-2.0.so.0.1200.2
 drwxr-xr-x	root/root	usr/lib/pkgconfig/
 -rw-r--r--	root/root	usr/lib/pkgconfig/gdk-2.0.pc
 -rw-r--r--	root/root	usr/lib/pkgconfig/gdk-pixbuf-2.0.pc
diff --git a/gtk/.md5sum b/gtk/.md5sum
index 02ca51d65..efb1c1cc9 100644
--- a/gtk/.md5sum
+++ b/gtk/.md5sum
@@ -1,6 +1,5 @@
-64224edbaca5937481d3ae7d3ae4abe7  gdk-pixbuf.loaders
-b50c279539fca50a496d7feafae350d4  gdkwindow.patch
-c46f34addc2fe3ea6756055d59fb8856  gtk+-2.12.1.tar.bz2
+02de6f709f70966463d323661fc25732  gdk-pixbuf.loaders
+a789a8a333d418f47cda1dba106d9aac  gtk+-2.12.2.tar.bz2
 3c88561a89724dfe9d807077ba0603c8  gtk-register.sh
-142aacfd2e437691078a1648733b3fe0  gtk.immodules
+6fefc12d53672a07274bf3204fec9daf  gtk.immodules
 9d8d54627b9ec37900a10d0295600dd9  gtkclipboard.patch
diff --git a/gtk/Pkgfile b/gtk/Pkgfile
index 08728c5db..64db69085 100644
--- a/gtk/Pkgfile
+++ b/gtk/Pkgfile
@@ -4,16 +4,15 @@
 # Depends on: atk, hicolor-icon-theme, libtiff, pango, xorg-libsm, xorg-libxcursor, xorg-libxinerama, xorg-libxrandr
 
 name=gtk
-version=2.12.1
-release=2
+version=2.12.2
+release=1
 source=(ftp://ftp.gtk.org/pub/gtk/2.12/${name}+-$version.tar.bz2 \
-	gdk-pixbuf.loaders gtk.immodules gdkwindow.patch \
+	gdk-pixbuf.loaders gtk.immodules \
 	gtk-register.sh gtkclipboard.patch)
 
 build () {
 	cd gtk+-$version
 
-	patch -p0 -i $SRC/gdkwindow.patch
 	patch -p1 -i $SRC/gtkclipboard.patch
 
 	./configure --prefix=/usr \
diff --git a/gtk/gdk-pixbuf.loaders b/gtk/gdk-pixbuf.loaders
index ba82b4d28..fc3df6c23 100644
--- a/gtk/gdk-pixbuf.loaders
+++ b/gtk/gdk-pixbuf.loaders
@@ -1,6 +1,6 @@
 # GdkPixbuf Image Loader Modules file
 # Automatically generated file, do not edit
-# Created by gdk-pixbuf-query-loaders from gtk+-2.12.1
+# Created by gdk-pixbuf-query-loaders from gtk+-2.12.2
 #
 # LoaderDir = /usr/lib/gtk-2.0/2.10.0/loaders
 #
diff --git a/gtk/gdkwindow.patch b/gtk/gdkwindow.patch
deleted file mode 100644
index 92a0ad372..000000000
--- a/gtk/gdkwindow.patch
+++ /dev/null
@@ -1,68 +0,0 @@
---- gdk/gdkwindow.c.orig	2007-10-02 11:22:11.000000000 +0200
-+++ gdk/gdkwindow.c	2007-10-02 11:22:20.000000000 +0200
-@@ -609,18 +609,21 @@ gdk_window_get_parent (GdkWindow *window
- GdkWindow*
- gdk_window_get_toplevel (GdkWindow *window)
- {
-   GdkWindowObject *obj;
-   
-   g_return_val_if_fail (GDK_IS_WINDOW (window), NULL);
- 
-   obj = (GdkWindowObject *)window;
--  while (GDK_WINDOW_TYPE (obj) == GDK_WINDOW_CHILD)
-+  while (obj && GDK_WINDOW_TYPE (obj) == GDK_WINDOW_CHILD) {
-     obj = (GdkWindowObject *)obj->parent;
-+  }
-+
-+  g_return_val_if_fail (obj != NULL, NULL);
-   
-   return GDK_WINDOW (obj);
- }
- 
- /**
-  * gdk_window_get_children:
-  * @window: a #GdkWindow
-  * 
-@@ -2290,19 +2293,21 @@ gdk_window_update_idle (gpointer data)
-   return FALSE;
- }
- 
- static gboolean
- gdk_window_is_toplevel_frozen (GdkWindow *window)
- {
-   GdkWindowObject *toplevel;
- 
-+  g_return_val_if_fail (window != NULL, FALSE);
-+
-   toplevel = (GdkWindowObject *)gdk_window_get_toplevel (window);
- 
--  return toplevel->update_and_descendants_freeze_count > 0;
-+  return toplevel ? toplevel->update_and_descendants_freeze_count > 0 : FALSE;
- }
- 
- static void
- gdk_window_schedule_update (GdkWindow *window)
- {
-   if (window &&
-       (GDK_WINDOW_OBJECT (window)->update_freeze_count ||
-        gdk_window_is_toplevel_frozen (window)))
-@@ -2428,16 +2433,19 @@ gdk_window_process_all_updates (void)
-   
-   update_windows = NULL;
-   update_idle = 0;
- 
-   g_slist_foreach (old_update_windows, (GFunc)g_object_ref, NULL);
-   
-   while (tmp_list)
-     {
-+      if(!tmp_list->data)
-+        continue;
-+
-       GdkWindowObject *private = (GdkWindowObject *)tmp_list->data;
-       
-       if (private->update_freeze_count ||
- 	  gdk_window_is_toplevel_frozen (tmp_list->data))
- 	update_windows = g_slist_prepend (update_windows, private);
-       else
- 	gdk_window_process_updates_internal (tmp_list->data);
-       
diff --git a/gtk/gtk.immodules b/gtk/gtk.immodules
index d53f7bba8..5b5aba783 100644
--- a/gtk/gtk.immodules
+++ b/gtk/gtk.immodules
@@ -1,6 +1,6 @@
 # GTK+ Input Method Modules file
 # Automatically generated file, do not edit
-# Created by /usr/bin/gtk-query-immodules-2.0 from gtk+-2.12.1
+# Created by /usr/bin/gtk-query-immodules-2.0 from gtk+-2.12.2
 #
 # ModulesPath = /root/.gtk-2.0/2.10.0/i686-pc-linux-gnu/immodules:/root/.gtk-2.0/2.10.0/immodules:/root/.gtk-2.0/i686-pc-linux-gnu/immodules:/root/.gtk-2.0/immodules:/usr/lib/gtk-2.0/2.10.0/i686-pc-linux-gnu/immodules:/usr/lib/gtk-2.0/2.10.0/immodules:/usr/lib/gtk-2.0/i686-pc-linux-gnu/immodules:/usr/lib/gtk-2.0/immodules
 #