diff options
| author | Jussi Kukkonen <jussi.kukkonen@intel.com> | 2016-05-23 15:44:08 +0300 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-05-25 07:50:17 +0100 |
| commit | 44e4d20a6f64822c4d4288dab17a28397e20d60c (patch) | |
| tree | 62172743aeb485e0c921e2c0f25ebc444be68f0a /meta/recipes-sato | |
| parent | b5fe46044ea6324d66a7387c4f0d1d42fb418a70 (diff) | |
| download | poky-44e4d20a6f64822c4d4288dab17a28397e20d60c.tar.gz | |
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.
(From OE-Core rev: f0dc96a0babfc0b7562677eefc105bcb48557c53)
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-sato')
| -rw-r--r-- | meta/recipes-sato/matchbox-keyboard/matchbox-keyboard_git.bb | 12 |
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 \ | |||
| 8 | file://src/matchbox-keyboard.h;endline=17;md5=9d6586c69e4a926f3cb0b4425f24ba3c \ | 8 | file://src/matchbox-keyboard.h;endline=17;md5=9d6586c69e4a926f3cb0b4425f24ba3c \ |
| 9 | file://applet/applet.c;endline=18;md5=4a0f721724746b14d95b51ddd42b95e7" | 9 | file://applet/applet.c;endline=18;md5=4a0f721724746b14d95b51ddd42b95e7" |
| 10 | 10 | ||
| 11 | DEPENDS = "libfakekey expat libxft gtk+ matchbox-panel-2" | 11 | DEPENDS = "libfakekey expat libxft" |
| 12 | 12 | ||
| 13 | SRCREV = "ebc330eac8b9d38e9aef9f01e7241c904bd01073" | 13 | SRCREV = "69d03e2aceb79cf7a616c07f8e0be4e1f9f7976b" |
| 14 | PV = "0.0+git${SRCPV}" | 14 | PV = "0.0+git${SRCPV}" |
| 15 | PR = "r4" | ||
| 16 | 15 | ||
| 17 | SRC_URI = "git://git.yoctoproject.org/${BPN};branch=matchbox-keyboard-0-1 \ | 16 | SRC_URI = "git://git.yoctoproject.org/${BPN};branch=matchbox-keyboard-0-1 \ |
| 18 | file://0001-desktop-file-Hide-the-keyboard-from-app-list.patch \ | 17 | 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 | |||
| 25 | # The libxft, libfakekey and matchbox-panel-2 requires x11 in DISTRO_FEATURES | 24 | # The libxft, libfakekey and matchbox-panel-2 requires x11 in DISTRO_FEATURES |
| 26 | REQUIRED_DISTRO_FEATURES = "x11" | 25 | REQUIRED_DISTRO_FEATURES = "x11" |
| 27 | 26 | ||
| 28 | EXTRA_OECONF = "--disable-cairo --enable-gtk-im --enable-applet" | 27 | EXTRA_OECONF = "--disable-cairo" |
| 28 | |||
| 29 | PACKAGECONFIG ??= "gtk2-im applet" | ||
| 30 | PACKAGECONFIG[applet] = "--enable-applet,--disable-applet,matchbox-panel-2" | ||
| 31 | PACKAGECONFIG[gtk2-im] = "--enable-gtk-im,--disable-gtk-im,gtk+" | ||
| 32 | PACKAGECONFIG[gtk3-im] = "--enable-gtk3-im,--disable-gtk3-im,gtk+3" | ||
| 29 | 33 | ||
| 30 | PACKAGES += "${PN}-im ${PN}-applet" | 34 | PACKAGES += "${PN}-im ${PN}-applet" |
| 31 | 35 | ||