rpms/xfce4-settings/devel xfce4-settings-4.6.4-libxklavier5.patch, NONE, 1.1 xfce4-settings.spec, 1.23, 1.24

[Christoph Wickert]

Author: cwickert

Update of /cvs/pkgs/rpms/xfce4-settings/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4482

Modified Files:
	xfce4-settings.spec 
Added Files:
	xfce4-settings-4.6.4-libxklavier5.patch 
Log Message:
* Sat Jan 23 2010 Christoph Wickert <cwickert at fedoraproject.org> - 4.6.4-2
- Add patch for libxklavier 5.0. Thanks to Caolan McNamara (#558081)
- Use Clearlooks theme by default


xfce4-settings-4.6.4-libxklavier5.patch:
 xfce-keyboard-settings.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE xfce4-settings-4.6.4-libxklavier5.patch ---
diff -ru xfce4-settings-4.6.4.orig/dialogs/keyboard-settings/xfce-keyboard-settings.c xfce4-settings-4.6.4/dialogs/keyboard-settings/xfce-keyboard-settings.c
--- xfce4-settings-4.6.4.orig/dialogs/keyboard-settings/xfce-keyboard-settings.c	2010-01-23 14:58:17.000000000 +0000
+++ xfce4-settings-4.6.4/dialogs/keyboard-settings/xfce-keyboard-settings.c	2010-01-23 14:58:35.000000000 +0000
@@ -457,7 +457,7 @@
 
 #ifdef HAVE_LIBXKLAVIER
   /* Stop xklavier engine */
-  xkl_engine_stop_listen (settings->priv->xkl_engine);
+  xkl_engine_stop_listen (settings->priv->xkl_engine, XKLL_TRACK_KEYBOARD_STATE);
 #endif /* HAVE_LIBXKLAVIER */
 
   g_object_unref (settings->priv->provider);


Index: xfce4-settings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-settings/devel/xfce4-settings.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- xfce4-settings.spec	18 Jan 2010 01:54:06 -0000	1.23
+++ xfce4-settings.spec	25 Jan 2010 17:18:00 -0000	1.24
@@ -10,6 +10,7 @@ Group:          User Interface/Desktops
 License:        GPLv2+ and GPLv2
 URL:            http://www.xfce.org/
 Source0:        http://www.xfce.org/archive/src/xfce/%{name}/%{xfceversion}/%{name}-%{version}.tar.bz2
+Patch0:         xfce4-settings-4.6.4-libxklavier5.patch
 # use vendor's artwork
 Patch10:        xfce4-settings-4.6.0-fedora.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -39,6 +40,10 @@ This package includes the settings manag
 
 %prep
 %setup -q
+# Fedora > 12 has libxklavier
+%if 0%{?fedora} > 12
+%patch0 -p1 -b .xklavier5
+%endif
 %patch10 -p1 -b .vendor
 
 %build
@@ -117,8 +122,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/applications/xfce*.desktop
 
 %changelog
-* Mon Jan 18 2010 Christoph Wickert <cwickert at fedoraproject.org> - 4.6.4-2
-- Rebuild for libxklavier 5.0
+* Sat Jan 23 2010 Christoph Wickert <cwickert at fedoraproject.org> - 4.6.4-2
+- Add patch for libxklavier 5.0. Thanks to Caolan McNamara (#558081)
 - Use Clearlooks theme by default
 
 * Sat Jan 02 2010 Christoph Wickert <cwickert at fedoraproject.org> - 4.6.4-1