rpms/libxklavier/F-9 libxklavier-2.1-vnc-bug.patch, NONE, 1.1 libxklavier.spec, 1.36, 1.37

[Ray Strode (rstrode)]

Author: rstrode

Update of /cvs/pkgs/rpms/libxklavier/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20385

Modified Files:
	libxklavier.spec 
Added Files:
	libxklavier-2.1-vnc-bug.patch 
Log Message:
- Apply upstream patch to fix libxklavier crash (bug 452966)


libxklavier-2.1-vnc-bug.patch:

--- NEW FILE libxklavier-2.1-vnc-bug.patch ---
--- libxklavier-2.1/libxklavier/xklavier_util.orig	Wed Feb 27 20:14:01 2008
+++ libxklavier-2.1/libxklavier/xklavier_util.c	Wed Feb 27 20:16:52 2008
@@ -114,7 +114,10 @@ xkl_get_debug_window_title(XklEngine * e
 	static gchar sname[33];
 	gchar *name;
 	strcpy(sname, "NULL");
-	if (win != (Window) NULL) {
+
+	if (win == (Window *) PointerRoot) {
+		strcpy(sname, "ROOT");
+	} else if (win != (Window *) None) {
 		name = xkl_engine_get_window_title(engine, win);
 		if (name != NULL) {
 			snprintf(sname, sizeof(sname), "%.32s", name);
--- libxklavier-2.1/libxklavier/xklavier_toplevel.orig	Wed Feb 27 20:36:09 2008
+++ libxklavier-2.1/libxklavier/xklavier_toplevel.c	Wed Feb 27 20:36:14 2008
@@ -205,6 +205,7 @@ xkl_engine_find_toplevel_window(XklEngin
 	gboolean rv;

 	if (win == (Window) NULL
+	    || win == (Window *) PointerRoot
 	    || win == xkl_engine_priv(engine, root_window)) {
 		*toplevel_win_out = (Window) NULL;
 		xkl_last_error_message = "The window is either 0 or root";


Index: libxklavier.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libxklavier/F-9/libxklavier.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- libxklavier.spec	10 Mar 2008 21:29:00 -0000	1.36
+++ libxklavier.spec	27 Jun 2008 14:12:31 -0000	1.37
@@ -1,7 +1,7 @@
 Summary:	library providing high-level API for X Keyboard Extension
 Name:		libxklavier
 Version:	3.5
-Release: 	1%{?dist}
+Release: 	2%{?dist}
 License:	LGPLv2+
 Group:		Development/Libraries
 URL: http://gswitchit.sourceforge.net/
@@ -14,6 +14,8 @@
 Source: http://download.gnome.org/sources/libxklavier/3.5/libxklavier-3.5.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 
+Patch0: libxklavier-2.1-vnc-bug.patch
+
 %description
 libxklavier is a library providing high-level API for X Keyboard Extension
 known as XKB. This library is intended to support XFree86 and other
@@ -33,6 +35,7 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .vnc-bug
 
 %build
 
@@ -68,6 +71,9 @@
 %{_datadir}/gtk-doc/html/libxklavier/
 
 %changelog
+* Fri Jun 27 2008 Ray Strode <rstrode at redhat.com> - 3.5-2
+- Apply upstream patch to fix libxklavier crash (bug 452966)
+
 * Mon Mar 10 2008 Matthias Clasen <mclasen at redhat.com> - 3.5-1
 - Update to 3.5