rpms/gtk2/F-8 foreign-cmap.patch,NONE,1.1 gtk2.spec,1.274,1.275

[Bastien Nocera (hadess)]

Author: hadess

Update of /cvs/pkgs/rpms/gtk2/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7945

Modified Files:
	gtk2.spec 
Added Files:
	foreign-cmap.patch 
Log Message:
* Mon Apr 07 2008 - Bastien Nocera <bnocera at redhat.com> - 2.12.8-2
- Add patch for GtkVNC (#440340)


foreign-cmap.patch:

--- NEW FILE foreign-cmap.patch ---
diff -rup gtk+-2.12.8.orig/gdk/x11/gdkcolor-x11.c gtk+-2.12.8.new/gdk/x11/gdkcolor-x11.c
--- gtk+-2.12.8.orig/gdk/x11/gdkcolor-x11.c	2008-02-12 12:57:43.000000000 -0500
+++ gtk+-2.12.8.new/gdk/x11/gdkcolor-x11.c	2008-04-02 22:02:07.000000000 -0400
@@ -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;
 


Index: gtk2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtk2/F-8/gtk2.spec,v
retrieving revision 1.274
retrieving revision 1.275
diff -u -r1.274 -r1.275
--- gtk2.spec	13 Feb 2008 03:21:19 -0000	1.274
+++ gtk2.spec	7 Apr 2008 11:17:11 -0000	1.275
@@ -16,7 +16,7 @@
 Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X
 Name: gtk2
 Version: %{base_version}
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 Source: http://download.gnome.org/sources/gtk+/2.12/gtk+-%{version}.tar.bz2
@@ -34,6 +34,9 @@
 # http://bugzilla.gnome.org/show_bug.cgi?id=488119
 Patch3: system-log-crash.patch
 
+https://bugzilla.redhat.com/show_bug.cgi?id=440340
+Patch4: foreign-cmap.patch
+
 BuildRequires: atk-devel >= %{atk_version}
 BuildRequires: pango-devel >= %{pango_version}
 BuildRequires: glib2-devel >= %{glib2_version}
@@ -112,6 +115,7 @@
 %patch1 -p1 -b .set-invisible-char-to-bullet
 %patch2 -p1 -b .workaround
 %patch3 -p1 -b .system-log-crash
+%patch4 -p1 -b .foreign-cmap
 
 for i in config.guess config.sub ; do
   test -f %{_datadir}/libtool/$i && cp %{_datadir}/libtool/$i .
@@ -295,6 +299,9 @@
 %{_datadir}/gtk-2.0
 
 %changelog
+* Mon Apr 07 2008 - Bastien Nocera <bnocera at redhat.com> - 2.12.8-2
+- Add patch for GtkVNC (#440340)
+
 * Tue Feb 12 2008 Matthias Clasen  <mclasen at redhat.com> - 2.12.8-1
 - Update to 2.12.8