rpms/xfce4-xkb-plugin/devel xxp-0.5.2-xklavier-api.patch, NONE, 1.1 xfce4-xkb-plugin.spec, 1.19, 1.20

[Adam Jackson]

Author: ajax

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

Modified Files:
	xfce4-xkb-plugin.spec 
Added Files:
	xxp-0.5.2-xklavier-api.patch 
Log Message:
* Tue Jul 07 2009 Adam Jackson <ajax at redhat.com> 0.5.2-4
- xxp-0.5.2-xklavier-api.patch: Fix for new libxklavier API.


xxp-0.5.2-xklavier-api.patch:

--- NEW FILE xxp-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;
 }


Index: xfce4-xkb-plugin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-xkb-plugin/devel/xfce4-xkb-plugin.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- xfce4-xkb-plugin.spec	26 Feb 2009 09:17:08 -0000	1.19
+++ xfce4-xkb-plugin.spec	7 Jul 2009 19:43:56 -0000	1.20
@@ -1,6 +1,6 @@
 Name:		xfce4-xkb-plugin
 Version:	0.5.2
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	XKB layout switcher for the Xfce panel
 
 Group:		User Interface/Desktops
@@ -14,6 +14,8 @@ BuildRequires:	libxklavier-devel >= 3.2,
 BuildRequires:	gettext, perl(XML::Parser)
 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 
@@ -23,6 +25,7 @@ XF86Config file or some other way (e.g. 
 
 %prep
 %setup -q
+%patch0 -p1 -b .api
 
 %build
 %configure --disable-static
@@ -46,6 +49,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/xfce4/xkb/flags/*.svg
 
 %changelog
+* Tue Jul 07 2009 Adam Jackson <ajax at redhat.com> 0.5.2-4
+- xxp-0.5.2-xklavier-api.patch: Fix for new libxklavier API.
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5.2-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild