r15780 - in /desktop/unstable/gtk+2.0/debian: changelog control patches/061_foreign_colormaps.patch patches/series

[joss at users.alioth.debian.org]

Author: joss
Date: Sat Apr 26 14:22:18 2008
New Revision: 15780

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=15780
Log:
061_foreign_colormaps.patch: stolen from upstream SVN. Don't call 
XFreeColormap on foreign colormaps, this causes crashes in e.g. 
vinagre. Closes: #477199.

Added:
    desktop/unstable/gtk+2.0/debian/patches/061_foreign_colormaps.patch
Modified:
    desktop/unstable/gtk+2.0/debian/changelog
    desktop/unstable/gtk+2.0/debian/control
    desktop/unstable/gtk+2.0/debian/patches/series

Modified: desktop/unstable/gtk+2.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B2.0/debian/changelog?rev=15780&op=diff
==============================================================================
--- desktop/unstable/gtk+2.0/debian/changelog (original)
+++ desktop/unstable/gtk+2.0/debian/changelog Sat Apr 26 14:22:18 2008
@@ -1,5 +1,6 @@
 gtk+2.0 (2.12.9-4) UNRELEASED; urgency=low
 
+  [ Loic Minier ]
   * Flip back gdkpixbuf_module_files_d_str after gdkpixbuf_module_file_str in
     patch 021_loader-files-d; this fixes config of gdk loaders and hence the
     current ia32-libs implementation; the change in 2.12.0-3 was incorrect in
@@ -19,6 +20,11 @@
         libxext-dev >= 1:1.0.1-2, libxinerama-dev >= 1:1.0.1-4.1, libxi-dev >=
         1:1.0.1-4, libxrandr-dev >= 1:1.0.2-2, libxfixes-dev >= 1:3.0.0-3,
         libxcomposite-dev >= 1:0.2.0-3, libxdamage-dev >= 1:1.0.1-3.
+
+  [ Josselin Mouette ]
+  * 061_foreign_colormaps.patch: stolen from upstream SVN. Don't call 
+    XFreeColormap on foreign colormaps, this causes crashes in e.g. 
+    vinagre. Closes: #477199.
 
  -- Loic Minier <lool at dooz.org>  Thu, 17 Apr 2008 12:34:24 +0200
 

Modified: desktop/unstable/gtk+2.0/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B2.0/debian/control?rev=15780&op=diff
==============================================================================
--- desktop/unstable/gtk+2.0/debian/control (original)
+++ desktop/unstable/gtk+2.0/debian/control Sat Apr 26 14:22:18 2008
@@ -2,7 +2,7 @@
 Section: libs
 Priority: optional
 Maintainer: Sebastien Bacher <seb128 at debian.org>
-Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Loic Minier <lool at dooz.org>, Sebastian Dröge <slomo at debian.org>
+Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Loic Minier <lool at dooz.org>, Sebastian Dröge <slomo at debian.org>, Josselin Mouette <joss at debian.org>
 Build-Depends: debhelper (>= 5.0.22),
                gettext,
                pkg-config,

Added: desktop/unstable/gtk+2.0/debian/patches/061_foreign_colormaps.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B2.0/debian/patches/061_foreign_colormaps.patch?rev=15780&op=file
==============================================================================
--- desktop/unstable/gtk+2.0/debian/patches/061_foreign_colormaps.patch (added)
+++ desktop/unstable/gtk+2.0/debian/patches/061_foreign_colormaps.patch Sat Apr 26 14:22:18 2008
@@ -1,0 +1,32 @@
+Debian #477199
+Upstream SVN r19969
+Index: gtk+-2.12.9/gdk/x11/gdkcolor-x11.c
+===================================================================
+--- gtk+-2.12.9.orig/gdk/x11/gdkcolor-x11.c	2008-04-26 16:20:24.494968621 +0200
++++ gtk+-2.12.9/gdk/x11/gdkcolor-x11.c	2008-04-26 16:20:48.030968466 +0200
+@@ -46,7 +46,7 @@ struct _GdkColormapPrivateX11
+   GdkColorInfo *info;
+   time_t last_sync_time;
+ 
+-  guint foreign : 1;
++  gboolean foreign;
+ };
+ 
+ #define GDK_COLORMAP_PRIVATE_DATA(cmap) ((GdkColormapPrivateX11 *) GDK_COLORMAP (cmap)->windowing_data)
+@@ -107,7 +107,7 @@ gdk_colormap_finalize (GObject *object)
+ 
+   gdk_colormap_remove (colormap);
+ 
+-  if (!private->screen->closed)
++  if (!private->screen->closed && !private->foreign)
+     XFreeColormap (GDK_SCREEN_XDISPLAY (private->screen), private->xcolormap);
+ 
+   if (private->hash)
+@@ -1292,6 +1292,7 @@ gdk_x11_colormap_foreign_new (GdkVisual 
+   private->screen = screen;
+   private->xcolormap = xcolormap;
+   private->private_val = FALSE;
++  private->foreign = TRUE;
+ 
+   colormap->size = visual->colormap_size;
+ 

Modified: desktop/unstable/gtk+2.0/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B2.0/debian/patches/series?rev=15780&op=diff
==============================================================================
--- desktop/unstable/gtk+2.0/debian/patches/series (original)
+++ desktop/unstable/gtk+2.0/debian/patches/series Sat Apr 26 14:22:18 2008
@@ -13,10 +13,11 @@
 021_loader-files-d.patch
 030_gtkentry_password-char-circle.patch
 031_gtksearchenginetracker_fixes.patch
-033_treeview_resizing.patch
+#033_treeview_resizing.patch
 041_ia32-libs.patch
 042_treeview_single-focus.patch
 060_ignore-random-icons.patch
+061_foreign_colormaps.patch
 070_mandatory-relibtoolize.patch
 091_workaround_no_gtk_init_incorrect_display.patch
 095_gtk-im-module-setting.patch