From 9b4783572db0a7f4462c1ca6a7e6b95c319f3d19 Mon Sep 17 00:00:00 2001 From: Jussi Kukkonen Date: Fri, 15 Jul 2016 15:20:03 +0300 Subject: matchbox-keyboard: Upgrade to 0.1.1 Signed-off-by: Jussi Kukkonen Signed-off-by: Ross Burton --- .../matchbox-keyboard/matchbox-keyboard_0.1.1.bb | 59 +++++++++++++++++++++ .../matchbox-keyboard/matchbox-keyboard_git.bb | 60 ---------------------- 2 files changed, 59 insertions(+), 60 deletions(-) create mode 100644 meta/recipes-sato/matchbox-keyboard/matchbox-keyboard_0.1.1.bb delete mode 100644 meta/recipes-sato/matchbox-keyboard/matchbox-keyboard_git.bb diff --git a/meta/recipes-sato/matchbox-keyboard/matchbox-keyboard_0.1.1.bb b/meta/recipes-sato/matchbox-keyboard/matchbox-keyboard_0.1.1.bb new file mode 100644 index 0000000000..465f1349af --- /dev/null +++ b/meta/recipes-sato/matchbox-keyboard/matchbox-keyboard_0.1.1.bb @@ -0,0 +1,59 @@ +SUMMARY = "Matchbox virtual keyboard for X11" +HOMEPAGE = "http://matchbox-project.org" +BUGTRACKER = "http://bugzilla.yoctoproject.org/" +SECTION = "x11" + +LICENSE = "LGPLv2.1" +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" + +#SRCREV for 0.1.1 +SRCREV = "630d89068dc0a1e9199306d405cb32f892dfa4d3" +SRC_URI = "git://git.yoctoproject.org/${BPN};branch=matchbox-keyboard-0-1 \ + file://0001-desktop-file-Hide-the-keyboard-from-app-list.patch \ + file://80matchboxkeyboard.sh" + +S = "${WORKDIR}/git" + +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" + +PACKAGECONFIG ??= "gtk3-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" + +FILES_${PN} = "${bindir}/ \ + ${sysconfdir} \ + ${datadir}/applications \ + ${datadir}/pixmaps \ + ${datadir}/matchbox-keyboard" + +FILES_${PN}-im = "${libdir}/gtk-2.0/*/immodules/*.so \ + ${libdir}/gtk-3.0/*/immodules/*.so" + +FILES_${PN}-applet = "${libdir}/matchbox-panel/*.so" + + +do_install_append () { + install -d ${D}/${sysconfdir}/X11/Xsession.d/ + install -m 755 ${WORKDIR}/80matchboxkeyboard.sh ${D}/${sysconfdir}/X11/Xsession.d/ + + rm -f ${D}${libdir}/gtk-2.0/*/immodules/*.la + rm -f ${D}${libdir}/gtk-3.0/*/immodules/*.la + rm -f ${D}${libdir}/matchbox-panel/*.la +} + +GTKIMMODULES_PACKAGES = "${PN}-im" + +RDEPENDS_${PN} = "formfactor dbus-wait" +RRECOMMENDS_${PN} = "${PN}-applet" diff --git a/meta/recipes-sato/matchbox-keyboard/matchbox-keyboard_git.bb b/meta/recipes-sato/matchbox-keyboard/matchbox-keyboard_git.bb deleted file mode 100644 index c7870cf083..0000000000 --- a/meta/recipes-sato/matchbox-keyboard/matchbox-keyboard_git.bb +++ /dev/null @@ -1,60 +0,0 @@ -SUMMARY = "Matchbox virtual keyboard for X11" -HOMEPAGE = "http://matchbox-project.org" -BUGTRACKER = "http://bugzilla.yoctoproject.org/" -SECTION = "x11" - -LICENSE = "LGPLv2.1" -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" - -SRCREV = "69d03e2aceb79cf7a616c07f8e0be4e1f9f7976b" -PV = "0.0+git${SRCPV}" - -SRC_URI = "git://git.yoctoproject.org/${BPN};branch=matchbox-keyboard-0-1 \ - file://0001-desktop-file-Hide-the-keyboard-from-app-list.patch \ - file://80matchboxkeyboard.sh" - -S = "${WORKDIR}/git" - -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" - -PACKAGECONFIG ??= "gtk3-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" - -FILES_${PN} = "${bindir}/ \ - ${sysconfdir} \ - ${datadir}/applications \ - ${datadir}/pixmaps \ - ${datadir}/matchbox-keyboard" - -FILES_${PN}-im = "${libdir}/gtk-2.0/*/immodules/*.so \ - ${libdir}/gtk-3.0/*/immodules/*.so" - -FILES_${PN}-applet = "${libdir}/matchbox-panel/*.so" - - -do_install_append () { - install -d ${D}/${sysconfdir}/X11/Xsession.d/ - install -m 755 ${WORKDIR}/80matchboxkeyboard.sh ${D}/${sysconfdir}/X11/Xsession.d/ - - rm -f ${D}${libdir}/gtk-2.0/*/immodules/*.la - rm -f ${D}${libdir}/gtk-3.0/*/immodules/*.la - rm -f ${D}${libdir}/matchbox-panel/*.la -} - -GTKIMMODULES_PACKAGES = "${PN}-im" - -RDEPENDS_${PN} = "formfactor dbus-wait" -RRECOMMENDS_${PN} = "${PN}-applet" -- cgit 1.2.3-korg