callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

061_foreign_colormaps.patch: stolen from upstream SVN. Don't call

Browse Source 
XFreeColormap on foreign colormaps, this causes crashes in e.g. 
vinagre. Closes: #477199.
This commit is contained in:
Josselin Mouette
2008-04-26 14:22:18 +00:00
parent 599dcfd50c
commit 5cb2158646
4 changed files with 41 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
debian/changelog vendored
View File

@ -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
@ -20,6 +21,11 @@ gtk+2.0 (2.12.9-4) UNRELEASED; urgency=low
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@dooz.org> Thu, 17 Apr 2008 12:34:24 +0200
gtk+2.0 (2.12.9-3) unstable; urgency=low

2
debian/control vendored
View File

@ -2,7 +2,7 @@ Source: gtk+2.0
Section: libs
Priority: optional
Maintainer: Sebastien Bacher <seb128@debian.org>
Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>, Loic Minier <lool@dooz.org>, Sebastian Dröge <slomo@debian.org>
Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>, Loic Minier <lool@dooz.org>, Sebastian Dröge <slomo@debian.org>, Josselin Mouette <joss@debian.org>
Build-Depends: debhelper (>= 5.0.22),
gettext,
pkg-config,

32
debian/patches/061_foreign_colormaps.patch vendored Normal file
View File

@ -0,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;

3
debian/patches/series vendored
View File

@ -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