Patchwork [meta-xfce] xfce4-xkb-plugin: Update to latest git

login
register
mail settings
Submitter Andreas Müller
Date April 23, 2013, 6:03 a.m.
Message ID <1366697033-1109-1-git-send-email-schnitzeltony@googlemail.com>
Download mbox | patch
Permalink /patch/48667/
State Accepted, archived
Headers show

Comments

Andreas Müller - April 23, 2013, 6:03 a.m.
In 7b35cdc554ee3f42f9619996604d4674126711c1 xfce4-settings was updated to
development-release 4.11.0. Reason for this was handling of keyboard layout
by xfce4-settings.
With this patch xfce4-xkb-plugin synchronizes with xfce4-settings, shares
settings and uses dialogs from xfce4-settings. These changes were not yet
released because they depend on development-release of xfce4-settings.
Next stable release of xfce4-settings will be with xfce 4.12 with release date
unknown [1].

[1] http://wiki.xfce.org/releng/4.12/roadmap#roadmapplanned_features

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
 ...b-plugin_0.5.4.3.bb => xfce4-xkb-plugin_git.bb} |   15 ++++++++++++---
 1 files changed, 12 insertions(+), 3 deletions(-)
 rename meta-xfce/recipes-panel-plugins/xkb/{xfce4-xkb-plugin_0.5.4.3.bb => xfce4-xkb-plugin_git.bb} (51%)

Patch

diff --git a/meta-xfce/recipes-panel-plugins/xkb/xfce4-xkb-plugin_0.5.4.3.bb b/meta-xfce/recipes-panel-plugins/xkb/xfce4-xkb-plugin_git.bb
similarity index 51%
rename from meta-xfce/recipes-panel-plugins/xkb/xfce4-xkb-plugin_0.5.4.3.bb
rename to meta-xfce/recipes-panel-plugins/xkb/xfce4-xkb-plugin_git.bb
index 8ec7fd2..a1f1a2f 100644
--- a/meta-xfce/recipes-panel-plugins/xkb/xfce4-xkb-plugin_0.5.4.3.bb
+++ b/meta-xfce/recipes-panel-plugins/xkb/xfce4-xkb-plugin_git.bb
@@ -6,9 +6,18 @@  LIC_FILES_CHKSUM = "file://COPYING;md5=496f09f084b0f7e6f02f769a84490c6b"
 
 inherit xfce-panel-plugin
 
-DEPENDS += "libxklavier libwnck librsvg"
+DEPENDS += "libxklavier libwnck librsvg garcon"
 
-SRC_URI[md5sum] = "b31144bd50875ec73f0b3101456c97fd"
-SRC_URI[sha256sum] = "ca4801bb2edfe04eeceb71879b3cf79a0674e8311c39117efdb9d3521307396d"
+PV = "0.5.4.3+gitr${SRCPV}"
+
+SRC_URI = "git://git.xfce.org/panel-plugins/xfce4-xkb-plugin;protocol=git;branch=master"
+SRCREV = "b98b82d8522842e38a6355f9144f8348a6ab2aeb"
+S = "${WORKDIR}/git"
+
+do_configure_prepend() {
+    NOCONFIGURE=yes ./autogen.sh
+}
 
 FILES_${PN} += "${datadir}/xfce4/xkb"
+
+RDEPENDS_${PN} = "xfce4-settings"