packages (DEVEL): libxklavier/libxklavier.spec, libxklavier/libxklavier-enu...

[patrys]

Author: patrys                       Date: Thu Aug 20 10:42:44 2009 GMT
Module: packages                      Tag: DEVEL
---- Log message:
- fix enumeration not to crash gdm
- rel 2

---- Files affected:
packages/libxklavier:
   libxklavier.spec (1.48.2.1 -> 1.48.2.2) , libxklavier-enumeration.patch (NONE -> 1.1.2.1)  (NEW)

---- Diffs:

================================================================
Index: packages/libxklavier/libxklavier.spec
diff -u packages/libxklavier/libxklavier.spec:1.48.2.1 packages/libxklavier/libxklavier.spec:1.48.2.2
--- packages/libxklavier/libxklavier.spec:1.48.2.1	Mon Jun 29 22:38:24 2009
+++ packages/libxklavier/libxklavier.spec	Thu Aug 20 12:42:38 2009
@@ -7,11 +7,12 @@
 Summary(pl.UTF-8):	Biblioteka libxklavier
 Name:		libxklavier
 Version:	4.0
-Release:	1
+Release:	2
 License:	LGPL v2+
 Group:		X11/Libraries
 Source0:	http://ftp.gnome.org/pub/GNOME/sources/libxklavier/4.0/%{name}-%{version}.tar.bz2
 # Source0-md5:	1b714ba04835fb49511f9e1444a5ea4c
+Patch0:		%{name}-enumeration.patch
 URL:		http://www.freedesktop.org/Software/LibXklavier
 BuildRequires:	autoconf >= 2.59
 BuildRequires:	automake >= 1:1.10
@@ -72,6 +73,7 @@
 
 %prep
 %setup -q
+%patch0 -p0
 
 %build
 %{__libtoolize}
@@ -129,6 +131,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.48.2.2  2009/08/20 10:42:38  patrys
+- fix enumeration not to crash gdm
+- rel 2
+
 Revision 1.48.2.1  2009/06/29 20:38:24  patrys
 - 0.4
 

================================================================
Index: packages/libxklavier/libxklavier-enumeration.patch
diff -u /dev/null packages/libxklavier/libxklavier-enumeration.patch:1.1.2.1
--- /dev/null	Thu Aug 20 12:42:44 2009
+++ packages/libxklavier/libxklavier-enumeration.patch	Thu Aug 20 12:42:38 2009
@@ -0,0 +1,22 @@
+--- libxklavier/xkl_engine.h	2009/06/28 21:41:15	1.8
++++ libxklavier/xkl_engine.h	2009/07/02 21:07:46	1.9
+@@ -60,12 +60,12 @@
+  *   @XKLF_DEVICE_DISCOVERY: Backend supports device discovery, can notify
+  */
+ 	typedef enum {
+-		XKLF_CAN_TOGGLE_INDICATORS = 0x01,
+-		XKLF_CAN_OUTPUT_CONFIG_AS_ASCII = 0x02,
+-		XKLF_CAN_OUTPUT_CONFIG_AS_BINARY = 0x04,
+-		XKLF_MULTIPLE_LAYOUTS_SUPPORTED = 0x08,
+-		XKLF_REQUIRES_MANUAL_LAYOUT_MANAGEMENT = 0x10,
+-		XKLF_DEVICE_DISCOVERY = 0x20
++		XKLF_CAN_TOGGLE_INDICATORS = 1 << 0,
++		XKLF_CAN_OUTPUT_CONFIG_AS_ASCII = 1 << 1,
++		XKLF_CAN_OUTPUT_CONFIG_AS_BINARY = 1 << 2,
++		XKLF_MULTIPLE_LAYOUTS_SUPPORTED = 1 << 3,
++		XKLF_REQUIRES_MANUAL_LAYOUT_MANAGEMENT = 1 << 4,
++		XKLF_DEVICE_DISCOVERY = 1 << 5
+ 	} XklEngineFeatures;
+ 
+ /**
+
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/libxklavier/libxklavier.spec?r1=1.48.2.1&r2=1.48.2.2&f=u