packages: xfce4-settings/xfce4-settings.spec, xfce4-settings/xfce4-settings...

[blues]

Author: blues                        Date: Fri Apr 30 16:33:23 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel.5 - libxklavier5 patch from FC

---- Files affected:
packages/xfce4-settings:
   xfce4-settings.spec (1.8 -> 1.9) , xfce4-settings-libxklavier5.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/xfce4-settings/xfce4-settings.spec
diff -u packages/xfce4-settings/xfce4-settings.spec:1.8 packages/xfce4-settings/xfce4-settings.spec:1.9
--- packages/xfce4-settings/xfce4-settings.spec:1.8	Wed Apr 21 19:09:02 2010
+++ packages/xfce4-settings/xfce4-settings.spec	Fri Apr 30 18:33:18 2010
@@ -3,13 +3,14 @@
 Summary(pl.UTF-8):	Menadżer ustawień dla środowiska Xfce
 Name:		xfce4-settings
 Version:	4.6.1
-Release:	4
+Release:	5
 License:	GPL v2
 Group:		X11/Applications
 Source0:	http://www.xfce.org/archive/xfce-%{version}/src/%{name}-%{version}.tar.bz2
 # Source0-md5:	dc1c8704471c5b0104fa10c30eb60cb6
 Patch0:		%{name}-default-icon-theme.patch
 Patch1:		%{name}-libxklavier4.patch
+Patch2:		%{name}-libxklavier5.patch
 URL:		http://www.xfce.org/projects/xfce4-settings/
 BuildRequires:	autoconf >= 2.50
 BuildRequires:	automake >= 1:1.8
@@ -45,6 +46,7 @@
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 %{__intltoolize}
@@ -95,6 +97,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.9  2010/04/30 16:33:18  blues
+- rel.5 - libxklavier5 patch from FC
+
 Revision 1.8  2010/04/21 17:09:02  arekm
 - release 4
 

================================================================
Index: packages/xfce4-settings/xfce4-settings-libxklavier5.patch
diff -u /dev/null packages/xfce4-settings/xfce4-settings-libxklavier5.patch:1.1
--- /dev/null	Fri Apr 30 18:33:23 2010
+++ packages/xfce4-settings/xfce4-settings-libxklavier5.patch	Fri Apr 30 18:33:18 2010
@@ -0,0 +1,11 @@
+--- ./dialogs/keyboard-settings/xfce-keyboard-settings.c.org	2010-04-30 18:29:46.201317308 +0200
++++ ./dialogs/keyboard-settings/xfce-keyboard-settings.c	2010-04-30 18:30:34.551318908 +0200
+@@ -453,7 +453,7 @@ xfce_keyboard_settings_finalize (GObject
+ 
+ #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);
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xfce4-settings/xfce4-settings.spec?r1=1.8&r2=1.9&f=u