From: Koen Kooi <koen@openembedded.org>
Date: Fri, 23 Apr 2010 13:45:46 +0000 (+0200)
Subject: xfce4-settings: add 4.6.4
X-Git-Tag: Release-2010-05/1~15
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5b6f0b7364fe410f1cda6b583eb6e32d3524c71a;p=openembedded.git

xfce4-settings: add 4.6.4
---

diff --git a/recipes/xfce-base/xfce4-settings-4.6.4/0001-Port-to-libxklavier-5.0-API.patch b/recipes/xfce-base/xfce4-settings-4.6.4/0001-Port-to-libxklavier-5.0-API.patch
new file mode 100644
index 0000000000..2a849aff25
--- /dev/null
+++ b/recipes/xfce-base/xfce4-settings-4.6.4/0001-Port-to-libxklavier-5.0-API.patch
@@ -0,0 +1,34 @@
+From 8e1ce14a33351f2664678f945c7050e42529c5d4 Mon Sep 17 00:00:00 2001
+From: Lionel Le Folgoc <mrpouit@ubuntu.com>
+Date: Mon, 25 Jan 2010 21:02:53 +0100
+Subject: [PATCH] Port to libxklavier 5.0 API.
+
+Patch slightly modified for Xubuntu to add POTFILES.skip.
+
+---
+ dialogs/keyboard-settings/xfce-keyboard-settings.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/dialogs/keyboard-settings/xfce-keyboard-settings.c b/dialogs/keyboard-settings/xfce-keyboard-settings.c
+index 631dc69..0e36375 100644
+--- a/dialogs/keyboard-settings/xfce-keyboard-settings.c
++++ b/dialogs/keyboard-settings/xfce-keyboard-settings.c
+@@ -395,7 +395,7 @@ xfce_keyboard_settings_finalize (GObject *object)
+ 
+ #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 (G_OBJECT (settings->priv->provider));
+diff --git a/po/POTFILES.skip b/po/POTFILES.skip
+new file mode 100644
+index 0000000..0e36375
+--- /dev/null
++++ b/po/POTFILES.skip
+@@ -0,0 +1,1 @@
++.pc/0001-Port-to-libxklavier-5.0-API.patch/dialogs/keyboard-settings/xfce-keyboard-settings.c
+-- 
+1.6.3.3
+
diff --git a/recipes/xfce-base/xfce4-settings_4.6.4.bb b/recipes/xfce-base/xfce4-settings_4.6.4.bb
new file mode 100644
index 0000000000..c3b0f06b01
--- /dev/null
+++ b/recipes/xfce-base/xfce4-settings_4.6.4.bb
@@ -0,0 +1,16 @@
+DESCRIPTION = "Xfce4 settings"
+HOMEPAGE = "http://www.xfce.org"
+SECTION = "x11/wm"
+LICENSE = "GPL-2"
+
+DEPENDS = "virtual/libx11 virtual/xserver libxi libwnck xrandr exo libxfce4util"
+
+inherit xfce46
+
+SRC_URI += "file://0001-Port-to-libxklavier-5.0-API.patch;patch=1" 
+
+SRC_URI[archive.md5sum] = "04985407e8e5b916c44780314a177e96"
+SRC_URI[archive.sha256sum] = "a5e3f0d959b0d424355414769250473785043c3977446a73b36fa3a5ce44ecdb"
+
+RDEPENDS_${PN} = "xfconf exo"
+