Update to 2.24.9

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@16669 df743ca5-7f9a-e211-a948-0013205c9059

2 files changed, 5 insertions, 105 deletions

diff --git a/x11-toolkits/gtk20/files/patch-DND-vnc-fix b/x11-toolkits/gtk20/files/patch-DND-vnc-fix
deleted file mode 100644
index 35ee2fae9..000000000
--- a/x11-toolkits/gtk20/files/patch-DND-vnc-fix
+++ /dev/null
@@ -1,84 +0,0 @@
---- gdk/x11/gdkdnd-x11.c
-+++ gdk/x11/gdkdnd-x11.c
-@@ -683,11 +683,16 @@ is_pointer_within_shape (GdkDisplay    *display,
-       GdkDisplayX11 *display_x11 = GDK_DISPLAY_X11 (display);
-       GdkRegion *input_shape;
- 
--      child->shape = _xwindow_get_shape (display_x11->xdisplay,
--                                         child->xid, ShapeBounding);
-+      child->shape = NULL;
-+      if (gdk_display_supports_shapes (display))
-+        child->shape = _xwindow_get_shape (display_x11->xdisplay,
-+                                           child->xid, ShapeBounding);
- #ifdef ShapeInput
--      input_shape = _xwindow_get_shape (display_x11->xdisplay,
--                                        child->xid, ShapeInput);
-+      input_shape = NULL;
-+      if (gdk_display_supports_input_shapes (display))
-+        input_shape = _xwindow_get_shape (display_x11->xdisplay,
-+                                          child->xid, ShapeInput);
-+
-       if (child->shape && input_shape)
-         {
-           gdk_region_intersect (child->shape, input_shape);
-diff --git a/gdk/x11/gdkwindow-x11.c b/gdk/x11/gdkwindow-x11.c
-index c2c32f0..f32246e 100644
---- gdk/x11/gdkwindow-x11.c
-+++ gdk/x11/gdkwindow-x11.c
-@@ -4659,17 +4659,24 @@ _xwindow_get_shape (Display *xdisplay,
-   shape = NULL;
-   rn = 0;
- 
--  xrl = XShapeGetRectangles (xdisplay,
--			     window,
--			     shape_type, &rn, &ord);
-+  /* Note that XShapeGetRectangles returns NULL in two situations:
-+   * - the server doesn't support the SHAPE extension
-+   * - the shape is empty
-+   *
-+   * Since we can't discriminate these here, we always return
-+   * an empty shape. It is the callers responsibility to check
-+   * whether the server supports the SHAPE extensions beforehand.
-+   */
-+  xrl = XShapeGetRectangles (xdisplay, window, shape_type, &rn, &ord);
- 
--  if (xrl == NULL || rn == 0)
-+  if (rn == 0)
-     return gdk_region_new (); /* Empty */
- 
-   if (ord != YXBanded)
-     {
-       /* This really shouldn't happen with any xserver, as they
--	 generally convert regions to YXBanded internally */
-+       * generally convert regions to YXBanded internally
-+       */
-       g_warning ("non YXBanded shape masks not supported");
-       XFree (xrl);
-       return NULL;
-@@ -4684,10 +4691,10 @@ _xwindow_get_shape (Display *xdisplay,
-       rl[i].height = xrl[i].height;
-     }
-   XFree (xrl);
--  
-+
-   shape = _gdk_region_new_from_yxbanded_rects (rl, rn);
-   g_free (rl);
--  
-+
-   return shape;
- }
- 
-@@ -4736,10 +4743,10 @@ _gdk_windowing_window_get_input_shape (GdkWindow *window)
- {
- #if defined(ShapeInput)
-   if (!GDK_WINDOW_DESTROYED (window) &&
--      gdk_display_supports_shapes (GDK_WINDOW_DISPLAY (window)))
-+      gdk_display_supports_input_shapes (GDK_WINDOW_DISPLAY (window)))
-     return _xwindow_get_shape (GDK_WINDOW_XDISPLAY (window),
--			      GDK_WINDOW_XID (window),
--			      ShapeInput);
-+                              GDK_WINDOW_XID (window),
-+                              ShapeInput);
- #endif
- 
-   return NULL;
diff --git a/x11-toolkits/gtk20/files/patch-gtk_Makefile.in b/x11-toolkits/gtk20/files/patch-gtk_Makefile.in
index 9846a2751..7668f953b 100644
--- a/x11-toolkits/gtk20/files/patch-gtk_Makefile.in
+++ b/x11-toolkits/gtk20/files/patch-gtk_Makefile.in
@@ -1,9 +1,5 @@
-Stock icons. This was removed in 2.21.x, however it is used by atleast firefox.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=629878
-
---- gtk/Makefile.in.orig	2011-03-04 12:02:32.000000000 +0100
-+++ gtk/Makefile.in	2011-03-04 12:03:28.000000000 +0100
+--- gtk/Makefile.in.orig	2012-01-24 23:53:56.800847574 -0500
++++ gtk/Makefile.in	2012-01-24 23:53:56.889849878 -0500
 @@ -71,8 +71,7 @@
  @HAVE_INTROSPECTION_TRUE@@USE_X11_TRUE@am__append_15 = --add-include-path=$(top_builddir)/gdk/x11
  @HAVE_INTROSPECTION_TRUE@am__append_16 = Gtk-2.0.gir
@@ -14,19 +10,7 @@ https://bugzilla.gnome.org/show_bug.cgi?id=629878
  @OS_WIN32_TRUE@am__append_18 = \
  @OS_WIN32_TRUE@	$(GTK_UPDATE_ICON_CACHE_MANIFEST)
  
-@@ -1358,9 +1357,9 @@
- # gtk-update-icon-cache.exe doesn't require any special privileges.
- @OS_WIN32_TRUE@GTK_UPDATE_ICON_CACHE_MANIFEST = gtk-update-icon-cache.exe.manifest
- gtk_query_immodules_2_0_DEPENDENCIES = $(DEPS)
--gtk_query_immodules_2_0_LDADD = $(LDADDS)
-+gtk_query_immodules_2_0_LDADD = $(LDADDS) $(GLIB_LIBS)
- gtk_query_immodules_2_0_SOURCES = queryimmodules.c
--gtk_update_icon_cache_LDADD = $(GDK_PIXBUF_LIBS)
-+gtk_update_icon_cache_LDADD = $(GDK_PIXBUF_LIBS) $(GLIB_LIBS)
- gtk_update_icon_cache_SOURCES = updateiconcache.c 
- STOCK_ICONS = \
- 	stock-icons/16/document-open-recent.png		\
-@@ -1601,7 +1600,171 @@  	
+@@ -1898,7 +1897,171 @@
  	stock-icons/24/folder-remote.png 		\
  	stock-icons/24/user-home.png 			\
  	stock-icons/24/user-desktop.png 		\
@@ -199,9 +183,9 @@ https://bugzilla.gnome.org/show_bug.cgi?id=629878
  
  @CROSS_COMPILING_FALSE@gtk_update_icon_cache_program = \
  @CROSS_COMPILING_FALSE@	   ./gtk-update-icon-cache
-@@ -2873,6 +3036,88 @@
+@@ -5628,6 +5791,88 @@
  	   && $(LN_S) folder.png user-desktop.png 			\
- 	   && $(RM) user-home.png.png 					\
+ 	   && $(RM) user-home.png 					\
  	   && $(LN_S) folder.png user-home.png 				\
 +	   && $(LN_S) application-exit.png gtk-quit.png                 \
 +	   && $(LN_S) dialog-info.png gtk-info.png                      \