rpms/tk/F-10 tk-8.5.6-segv_due_XCreateIC.patch, NONE, 1.1 tk.spec, 1.57, 1.58

[Marcela Mašláňová]

Author: mmaslano

Update of /cvs/pkgs/rpms/tk/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17991

Modified Files:
	tk.spec 
Added Files:
	tk-8.5.6-segv_due_XCreateIC.patch 
Log Message:
* Thu Mar  5 2009 Marcela Mašláňová <mmaslano at redhat.com> - 1:8.5.3-5
- 488453 fix XGetICValues. Visible only in Gnome.


tk-8.5.6-segv_due_XCreateIC.patch:

--- NEW FILE tk-8.5.6-segv_due_XCreateIC.patch ---
diff -up tk8.5.6/generic/tkEvent.c.seg tk8.5.6/generic/tkEvent.c
--- tk8.5.6/generic/tkEvent.c.seg	2008-08-05 22:31:53.000000000 +0200
+++ tk8.5.6/generic/tkEvent.c	2009-02-23 08:14:02.000000000 +0100
@@ -359,6 +359,11 @@ CreateXIC(
 	XFree(preedit_attlist);
     }
 
+    if (winPtr->inputContext == NULL) {
+    /* XCreateIC failed. */
+    return;
+    }
+
     /*
      * Adjust the window's event mask if the IM requires it.
      */


Index: tk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tk/F-10/tk.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- tk.spec	6 Aug 2008 07:50:19 -0000	1.57
+++ tk.spec	5 Mar 2009 09:10:33 -0000	1.58
@@ -4,7 +4,7 @@
 Summary: The graphical toolkit for the Tcl scripting language
 Name: tk
 Version: %{vers}
-Release: 4%{?dist}
+Release: 5%{?dist}
 Epoch:   1
 License: TCL
 Group: Development/Languages
@@ -24,6 +24,7 @@
 Patch1: tk8.5-make.patch
 Patch2: tk8.5-conf.patch
 Patch3: genericevent.patch
+Patch4: tk-8.5.6-segv_due_XCreateIC.patch
 
 %description
 When paired with the Tcl scripting language, Tk provides a fast and powerful
@@ -48,6 +49,7 @@
 %patch1 -p1 -b .make
 %patch2 -p1 -b .conf
 %patch3 -p1 -b .crash1
+%patch4 -p1 -b .crash2
 
 %build
 cd unix
@@ -115,6 +117,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Thu Mar  5 2009 Marcela Mašláňová <mmaslano at redhat.com> - 1:8.5.3-5
+- 488453 fix XGetICValues. Visible only in Gnome.
+
 * Wed Aug  6 2008 Marcela Maslanova <mmaslano at redhat.com> - 1:8.5.3-4
 - rewrite patch once more - the same way how upstream fix it