[gentoo-commits] gentoo-x86 commit in xfce-base/xfce4-settings/files: xfce4-settings-4.7.1-libxklavier.patch

[gentoo-commits] gentoo-x86 commit in xfce-base/xfce4-settings/files: xfce4-settings-4.7.1-libxklavier.patch

[Samuli Suominen (ssuominen)]

ssuominen    10/02/15 12:18:35

  Added:                xfce4-settings-4.7.1-libxklavier.patch
  Log:
  Version bump.
  (Portage version: 2.2_rc62/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  xfce-base/xfce4-settings/files/xfce4-settings-4.7.1-libxklavier.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/xfce-base/xfce4-settings/files/xfce4-settings-4.7.1-libxklavier.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/xfce-base/xfce4-settings/files/xfce4-settings-4.7.1-libxklavier.patch?rev=1.1&content-type=text/plain

Index: xfce4-settings-4.7.1-libxklavier.patch
===================================================================
--- configure.ac
+++ configure.ac
@@ -142,6 +142,8 @@
                            [libxklavier], [Keyboard layout selection])
 XDT_CHECK_OPTIONAL_PACKAGE([LIBXKLAVIER4], [libxklavier], [4.0],
                            [libxklavier], [Keyboard layout selection])
+XDT_CHECK_OPTIONAL_PACKAGE([LIBXKLAVIER5], [libxklavier], [5.0],
+                           [libxklavier], [Keyboard layout selection])
 
 dnl ************************************
 dnl *** Xsettings daemon is optional ***
diff -ur xfce4-settings-4.7.1.orig/dialogs/keyboard-settings/xfce-keyboard-settings.c xfce4-settings-4.7.1/dialogs/keyboard-settings/xfce-keyboard-settings.c
--- xfce4-settings-4.7.1.orig/dialogs/keyboard-settings/xfce-keyboard-settings.c	2010-01-23 13:48:05.000000000 +0200
+++ xfce4-settings-4.7.1/dialogs/keyboard-settings/xfce-keyboard-settings.c	2010-02-15 14:23:24.000000000 +0200
@@ -395,7 +395,11 @@
 
 #ifdef HAVE_LIBXKLAVIER
   /* Stop xklavier engine */
+#ifdef HAVE_LIBXKLAVIER5
+  xkl_engine_stop_listen (settings->priv->xkl_engine, XKLL_TRACK_KEYBOARD_STATE);
+#else
   xkl_engine_stop_listen (settings->priv->xkl_engine);
+#endif /* HAVE_LIBXKLAVIER5 */
 #endif /* HAVE_LIBXKLAVIER */
 
   g_object_unref (G_OBJECT (settings->priv->provider));

[gentoo-commits] gentoo-x86 commit in xfce-base/xfce4-settings/files: xfce4-settings-4.7.1-libxklavier.patch

[Samuli Suominen (ssuominen)]

ssuominen    10/02/15 12:26:05

  Modified:             xfce4-settings-4.7.1-libxklavier.patch
  Log:
  Port 4.6.3-r1 to libxklavier-5.0 API.
  (Portage version: 2.2_rc62/cvs/Linux x86_64)

Revision  Changes    Path
1.2                  xfce-base/xfce4-settings/files/xfce4-settings-4.7.1-libxklavier.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/xfce-base/xfce4-settings/files/xfce4-settings-4.7.1-libxklavier.patch?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/xfce-base/xfce4-settings/files/xfce4-settings-4.7.1-libxklavier.patch?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/xfce-base/xfce4-settings/files/xfce4-settings-4.7.1-libxklavier.patch?r1=1.1&r2=1.2

Index: xfce4-settings-4.7.1-libxklavier.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/xfce-base/xfce4-settings/files/xfce4-settings-4.7.1-libxklavier.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xfce4-settings-4.7.1-libxklavier.patch	15 Feb 2010 12:18:34 -0000	1.1
+++ xfce4-settings-4.7.1-libxklavier.patch	15 Feb 2010 12:26:05 -0000	1.2
@@ -1,5 +1,6 @@
---- configure.ac
-+++ configure.ac
+diff -ur xfce4-settings-4.7.1.orig/configure.ac xfce4-settings-4.7.1/configure.ac
+--- xfce4-settings-4.7.1.orig/configure.ac	2010-01-23 13:48:05.000000000 +0200
++++ xfce4-settings-4.7.1/configure.ac	2010-02-15 14:20:55.000000000 +0200
 @@ -142,6 +142,8 @@
                             [libxklavier], [Keyboard layout selection])
  XDT_CHECK_OPTIONAL_PACKAGE([LIBXKLAVIER4], [libxklavier], [4.0],

[gentoo-commits] gentoo-x86 commit in xfce-base/xfce4-settings/files: xfce4-settings-4.7.1-libxklavier.patch

[Samuli Suominen (ssuominen)]

ssuominen    10/09/23 09:20:42

  Removed:              xfce4-settings-4.7.1-libxklavier.patch
  Log:
  Make sure index.theme from sound-theme-freedesktop is available by depending on USE="sound" of media-libs/libcanberra wrt #323379.
  
  (Portage version: 2.2_rc86/cvs/Linux x86_64)