r25124 - in /desktop/experimental/gtk+2.0/debian: changelog patches/062_udeb-no-composite.patch patches/series

[slomo at users.alioth.debian.org]

Author: slomo
Date: Wed Sep 15 09:32:54 2010
New Revision: 25124

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=25124
Log:
* debian/patches/062_udeb-no-composite.patch:
  + Fix build of the udeb variant without XComposite.

Added:
    desktop/experimental/gtk+2.0/debian/patches/062_udeb-no-composite.patch
Modified:
    desktop/experimental/gtk+2.0/debian/changelog
    desktop/experimental/gtk+2.0/debian/patches/series

Modified: desktop/experimental/gtk+2.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B2.0/debian/changelog?rev=25124&op=diff
==============================================================================
--- desktop/experimental/gtk+2.0/debian/changelog [utf-8] (original)
+++ desktop/experimental/gtk+2.0/debian/changelog [utf-8] Wed Sep 15 09:32:54 2010
@@ -6,8 +6,10 @@
       - Update for new API symbols.
     + debian/patches/070_mandatory-relibtoolize.patch:
       - Refreshed.
-
- -- Sebastian Dröge <slomo at debian.org>  Tue, 14 Sep 2010 20:17:04 +0200
+  * debian/patches/062_udeb-no-composite.patch:
+    + Fix build of the udeb variant without XComposite.
+
+ -- Sebastian Dröge <slomo at debian.org>  Wed, 15 Sep 2010 11:32:17 +0200
 
 gtk+2.0 (2.21.7-1) experimental; urgency=low
 

Added: desktop/experimental/gtk+2.0/debian/patches/062_udeb-no-composite.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B2.0/debian/patches/062_udeb-no-composite.patch?rev=25124&op=file
==============================================================================
--- desktop/experimental/gtk+2.0/debian/patches/062_udeb-no-composite.patch (added)
+++ desktop/experimental/gtk+2.0/debian/patches/062_udeb-no-composite.patch [utf-8] Wed Sep 15 09:32:54 2010
@@ -1,0 +1,20 @@
+Index: gtk+2.0-2.21.8/gdk/x11/gdkdnd-x11.c
+===================================================================
+--- gtk+2.0-2.21.8.orig/gdk/x11/gdkdnd-x11.c	2010-09-15 11:31:48.162871918 +0200
++++ gtk+2.0-2.21.8/gdk/x11/gdkdnd-x11.c	2010-09-15 11:31:50.781884886 +0200
+@@ -570,6 +570,7 @@
+ 
+   g_free (children);
+ 
++#ifdef HAVE_XCOMPOSITE
+   /*
+    * Add the composite overlay window to the cache, as this can be a reasonable
+    * Xdnd proxy as well.
+@@ -583,6 +584,7 @@
+       gdk_window_cache_add (result, cow, 0, 0, gdk_screen_get_width (screen), gdk_screen_get_height (screen), TRUE);
+       XCompositeReleaseOverlayWindow (xdisplay, GDK_WINDOW_XWINDOW (root_window));
+     }
++#endif
+ 
+   return result;
+ }

Modified: desktop/experimental/gtk+2.0/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B2.0/debian/patches/series?rev=25124&op=diff
==============================================================================
--- desktop/experimental/gtk+2.0/debian/patches/series [utf-8] (original)
+++ desktop/experimental/gtk+2.0/debian/patches/series [utf-8] Wed Sep 15 09:32:54 2010
@@ -11,4 +11,5 @@
 042_treeview_single-focus.patch
 060_ignore-random-icons.patch
 061_use_pdf_as_default_printing_standard.patch
+062_udeb-no-composite.patch
 070_mandatory-relibtoolize.patch