rpms/xfce4-xkb-plugin/devel xfce4-xkb-plugin-0.5.2-xklavier-api.patch, NONE, 1.1 xfce4-xkb-plugin-0.5.3.3-libxklavier5.patch, NONE, 1.1 xfce4-xkb-plugin.spec, 1.22, 1.23 xxp-0.5.2-xklavier-api.patch, 1.1, NONE

[Christoph Wickert]

Author: cwickert

Update of /cvs/pkgs/rpms/xfce4-xkb-plugin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17728

Modified Files:
	xfce4-xkb-plugin.spec 
Added Files:
	xfce4-xkb-plugin-0.5.2-xklavier-api.patch 
	xfce4-xkb-plugin-0.5.3.3-libxklavier5.patch 
Removed Files:
	xxp-0.5.2-xklavier-api.patch 
Log Message:
* Mon Jan 25 2010 Christoph Wickert <cwickert at fedoraproject.org> - 0.5.3.3-2
- Add patch for libxklavier 5.0. Thanks to Caolan McNamara (#558083)


xfce4-xkb-plugin-0.5.2-xklavier-api.patch:
 xkb-config.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE xfce4-xkb-plugin-0.5.2-xklavier-api.patch ---
diff -up xfce4-xkb-plugin-0.5.2/panel-plugin/xkb-config.c.jx xfce4-xkb-plugin-0.5.2/panel-plugin/xkb-config.c
--- xfce4-xkb-plugin-0.5.2/panel-plugin/xkb-config.c.jx	2008-11-10 04:06:31.000000000 -0500
+++ xfce4-xkb-plugin-0.5.2/panel-plugin/xkb-config.c	2009-07-07 15:42:40.000000000 -0400
@@ -153,7 +153,7 @@ xkb_config_initialize_xkb_options (t_xkb
     config->application_map = g_hash_table_new (g_direct_hash, NULL);
 
     registry = xkl_config_registry_get_instance (config->engine);
-    xkl_config_registry_load (registry);
+    xkl_config_registry_load (registry, FALSE);
     
     config_item = xkl_config_item_new ();
 
@@ -529,7 +529,7 @@ xkb_config_get_xkl_registry ()
     if (!config) return NULL;
 
     registry = xkl_config_registry_get_instance (config->engine);
-    xkl_config_registry_load (registry);
+    xkl_config_registry_load (registry, FALSE);
 
     return registry;
 }

xfce4-xkb-plugin-0.5.3.3-libxklavier5.patch:
 xkb-config.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE xfce4-xkb-plugin-0.5.3.3-libxklavier5.patch ---
diff -ru xfce4-xkb-plugin-0.5.3.3.orig/panel-plugin/xkb-config.c xfce4-xkb-plugin-0.5.3.3/panel-plugin/xkb-config.c
--- xfce4-xkb-plugin-0.5.3.3.orig/panel-plugin/xkb-config.c	2010-01-23 15:16:47.000000000 +0000
+++ xfce4-xkb-plugin-0.5.3.3/panel-plugin/xkb-config.c	2010-01-23 15:17:10.000000000 +0000
@@ -214,7 +214,7 @@
 
     gdk_window_remove_filter (NULL, (GdkFilterFunc) handle_xevent, NULL);
 
-    xkl_engine_stop_listen (config->engine);
+    xkl_engine_stop_listen (config->engine, XKLL_TRACK_KEYBOARD_STATE);
 }
 
 gint


Index: xfce4-xkb-plugin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-xkb-plugin/devel/xfce4-xkb-plugin.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- xfce4-xkb-plugin.spec	8 Aug 2009 23:59:47 -0000	1.22
+++ xfce4-xkb-plugin.spec	25 Jan 2010 23:43:23 -0000	1.23
@@ -1,12 +1,14 @@
 Name:		xfce4-xkb-plugin
 Version:	0.5.3.3
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	XKB layout switcher for the Xfce panel
 
 Group:		User Interface/Desktops
 License:	BSD
 URL:		http://goodies.xfce.org/projects/panel-plugins/%{name}
 Source0:	http://goodies.xfce.org/releases/%{name}/%{name}-%{version}.tar.gz
+Patch0:		xfce4-xkb-plugin-0.5.2-xklavier-api.patch
+Patch1:		xfce4-xkb-plugin-0.5.3.3-libxklavier5.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	xfce4-panel-devel >= 4.3.20, libxfcegui4-devel >= 4.3.90.2, libxml2-devel
@@ -14,8 +16,6 @@ BuildRequires:	libxklavier-devel >= 3.2,
 BuildRequires:	gettext, intltool
 Requires:	xfce4-panel >= 4.4.0
 
-Patch0:		xxp-0.5.2-xklavier-api.patch
-
 %description
 Xfce XKB layout switch plugin for the Xfce panel. It displays the current 
 keyboard layout, and refreshes when layout changes. The layout can be 
@@ -25,8 +25,13 @@ XF86Config file or some other way (e.g. 
 
 %prep
 %setup -q
-%if 0%{?fedora} >= 12
-%patch0 -p1 -b .api
+# Fedora > 11 has libxklavier 4.0
+%if 0%{?fedora} > 11
+%patch0 -p1 -b .xklavier4
+%endif
+# Fedora > 12 has libxklavier 5.0
+%if 0%{?fedora} > 12
+%patch1 -p1 -b .xklavier5
 %endif
 
 %build
@@ -51,6 +56,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/xfce4/xkb/flags/*.svg
 
 %changelog
+* Mon Jan 25 2010 Christoph Wickert <cwickert at fedoraproject.org> - 0.5.3.3-2
+- Add patch for libxklavier 5.0. Thanks to Caolan McNamara (#558083)
+
 * Sun Aug 09 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.5.3.3-1
 - Update to 0.5.3.3 (#502878)
 


--- xxp-0.5.2-xklavier-api.patch DELETED ---