rpms/gtk2/F-9 empty-modmap-crash.patch, NONE, 1.1 gtk2.spec, 1.293, 1.294

[Matthias Clasen (mclasen)]

Author: mclasen

Update of /cvs/extras/rpms/gtk2/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29082

Modified Files:
	gtk2.spec 
Added Files:
	empty-modmap-crash.patch 
Log Message:
Fix a crash when the modifier map is empty


empty-modmap-crash.patch:

--- NEW FILE empty-modmap-crash.patch ---
diff -up gtk+-2.12.10/gdk/x11/gdkkeys-x11.c.empty-modmap-crash gtk+-2.12.10/gdk/x11/gdkkeys-x11.c
--- gtk+-2.12.10/gdk/x11/gdkkeys-x11.c.empty-modmap-crash	2008-06-16 22:16:51.000000000 -0400
+++ gtk+-2.12.10/gdk/x11/gdkkeys-x11.c	2008-06-16 22:17:09.000000000 -0400
@@ -1661,7 +1661,7 @@ _gdk_keymap_key_is_modifier (GdkKeymap *
     {
       XkbDescRec *xkb = get_xkb (keymap_x11);
       
-      if (xkb->map->modmap[keycode] != 0)
+      if (xkb->map->modmap && xkb->map->modmap[keycode] != 0)
 	return TRUE;
     }
   else


Index: gtk2.spec
===================================================================
RCS file: /cvs/extras/rpms/gtk2/F-9/gtk2.spec,v
retrieving revision 1.293
retrieving revision 1.294
diff -u -r1.293 -r1.294
--- gtk2.spec	13 Jun 2008 13:50:40 -0000	1.293
+++ gtk2.spec	17 Jun 2008 02:22:48 -0000	1.294
@@ -16,7 +16,7 @@
 Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X
 Name: gtk2
 Version: %{base_version}
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 Source: http://download.gnome.org/sources/gtk+/2.12/gtk+-%{version}.tar.bz2
@@ -55,6 +55,9 @@
 # https://bugzilla.redhat.com/show_bug.cgi?id=204621
 Patch13: printer-paper-size.patch
 
+# fixed upstream
+Patch14: empty-modmap-crash.patch
+
 BuildRequires: atk-devel >= %{atk_version}
 BuildRequires: pango-devel >= %{pango_version}
 BuildRequires: glib2-devel >= %{glib2_version}
@@ -330,6 +333,9 @@
 %{_datadir}/gtk-2.0
 
 %changelog
+* Mon Jun 16 2008 Matthias Clasen <mclasen at redhat.com> - 2.12.10-5
+- Fix a crash if the modifier map is empty 
+
 * Fri Jun 13 2008 - Marek Kasik <mkasik at redhat.com> - 2.12.10-4
 - Sets default paper size according to default paper size of
   selected printer and locale.