summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJussi Kukkonen <jussi.kukkonen@intel.com>2016-05-23 15:44:08 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-05-25 07:49:54 +0100
commitf0dc96a0babfc0b7562677eefc105bcb48557c53 (patch)
treed871ff3e747948502d404476085439c624c9ac89
parent747762233ee21eaaf480f19b85cd1d6543c7ca51 (diff)
downloadopenembedded-core-contrib-f0dc96a0babfc0b7562677eefc105bcb48557c53.tar.gz
openembedded-core-contrib-f0dc96a0babfc0b7562677eefc105bcb48557c53.tar.bz2
openembedded-core-contrib-f0dc96a0babfc0b7562677eefc105bcb48557c53.zip
matchbox-keyboard: Upgrade
This version includes: * french keyboard and the Caps improvements it requires * Gtk+3 input method is now included (not enabled by default yet) Define some additional PACKAGECONFIGs: the default configuration does not change. Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-sato/matchbox-keyboard/matchbox-keyboard_git.bb12
1 files changed, 8 insertions, 4 deletions
diff --git a/meta/recipes-sato/matchbox-keyboard/matchbox-keyboard_git.bb b/meta/recipes-sato/matchbox-keyboard/matchbox-keyboard_git.bb
index eba1970ee6..fb4c6e9166 100644
--- a/meta/recipes-sato/matchbox-keyboard/matchbox-keyboard_git.bb
+++ b/meta/recipes-sato/matchbox-keyboard/matchbox-keyboard_git.bb
@@ -8,11 +8,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c \
file://src/matchbox-keyboard.h;endline=17;md5=9d6586c69e4a926f3cb0b4425f24ba3c \
file://applet/applet.c;endline=18;md5=4a0f721724746b14d95b51ddd42b95e7"
-DEPENDS = "libfakekey expat libxft gtk+ matchbox-panel-2"
+DEPENDS = "libfakekey expat libxft"
-SRCREV = "ebc330eac8b9d38e9aef9f01e7241c904bd01073"
+SRCREV = "69d03e2aceb79cf7a616c07f8e0be4e1f9f7976b"
PV = "0.0+git${SRCPV}"
-PR = "r4"
SRC_URI = "git://git.yoctoproject.org/${BPN};branch=matchbox-keyboard-0-1 \
file://0001-desktop-file-Hide-the-keyboard-from-app-list.patch \
@@ -25,7 +24,12 @@ inherit autotools pkgconfig gettext gtk-immodules-cache distro_features_check
# The libxft, libfakekey and matchbox-panel-2 requires x11 in DISTRO_FEATURES
REQUIRED_DISTRO_FEATURES = "x11"
-EXTRA_OECONF = "--disable-cairo --enable-gtk-im --enable-applet"
+EXTRA_OECONF = "--disable-cairo"
+
+PACKAGECONFIG ??= "gtk2-im applet"
+PACKAGECONFIG[applet] = "--enable-applet,--disable-applet,matchbox-panel-2"
+PACKAGECONFIG[gtk2-im] = "--enable-gtk-im,--disable-gtk-im,gtk+"
+PACKAGECONFIG[gtk3-im] = "--enable-gtk3-im,--disable-gtk3-im,gtk+3"
PACKAGES += "${PN}-im ${PN}-applet"