mirror of
https://git.yoctoproject.org/poky
synced 2026-06-02 01:19:52 +00:00
matchbox-keyboard: general clean up
Re-order variables, use $PN more, and merge the -dbg packages together. (From OE-Core rev: 1dfe4f5d49bbbaf1adc28dacac92b5288021309b) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
4878b3ced8
commit
1cdacff50e
@@ -1,6 +1,7 @@
|
|||||||
DESCRIPTION = "Matchbox virtual keyboard for X11"
|
DESCRIPTION = "Matchbox virtual keyboard for X11"
|
||||||
HOMEPAGE = "http://matchbox-project.org"
|
HOMEPAGE = "http://matchbox-project.org"
|
||||||
BUGTRACKER = "http://bugzilla.openedhand.com/"
|
BUGTRACKER = "http://bugzilla.openedhand.com/"
|
||||||
|
SECTION = "x11"
|
||||||
|
|
||||||
LICENSE = "GPLv2+"
|
LICENSE = "GPLv2+"
|
||||||
LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
|
LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
|
||||||
@@ -8,8 +9,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
|
|||||||
file://applet/applet.c;endline=20;md5=e9201b3efa0a81a160b88d6feb5cf75b"
|
file://applet/applet.c;endline=20;md5=e9201b3efa0a81a160b88d6feb5cf75b"
|
||||||
|
|
||||||
DEPENDS = "libfakekey expat libxft gtk+ matchbox-panel-2"
|
DEPENDS = "libfakekey expat libxft gtk+ matchbox-panel-2"
|
||||||
RDEPENDS_${PN} = "formfactor dbus-wait"
|
|
||||||
SECTION = "x11"
|
|
||||||
SRCREV = "b38f24036cff3be6c2fbcf9ca9881803e69003ac"
|
SRCREV = "b38f24036cff3be6c2fbcf9ca9881803e69003ac"
|
||||||
PV = "0.0+git${SRCPV}"
|
PV = "0.0+git${SRCPV}"
|
||||||
PR = "r4"
|
PR = "r4"
|
||||||
@@ -26,20 +26,20 @@ inherit autotools pkgconfig gettext gtk-immodules-cache
|
|||||||
|
|
||||||
EXTRA_OECONF = "--disable-cairo --enable-gtk-im --enable-applet"
|
EXTRA_OECONF = "--disable-cairo --enable-gtk-im --enable-applet"
|
||||||
|
|
||||||
PACKAGES += "matchbox-keyboard-im matchbox-keyboard-im-dbg \
|
PACKAGES += "${PN}-im ${PN}-applet"
|
||||||
matchbox-keyboard-applet matchbox-keyboard-applet-dbg"
|
|
||||||
|
|
||||||
FILES_${PN} = "${bindir}/* \
|
FILES_${PN} = "${bindir}/ \
|
||||||
${sysconfdir} \
|
${sysconfdir} \
|
||||||
${datadir}/applications \
|
${datadir}/applications \
|
||||||
${datadir}/pixmaps \
|
${datadir}/pixmaps \
|
||||||
${datadir}/matchbox-keyboard"
|
${datadir}/matchbox-keyboard"
|
||||||
|
|
||||||
FILES_matchbox-keyboard-im = "${libdir}/gtk-2.0/*/immodules/*.so"
|
FILES_${PN}-dbg += "${libdir}/gtk-2.0/*/immodules/.debug"
|
||||||
FILES_matchbox-keyboard-im-dbg += "${libdir}/gtk-2.0/*/immodules/.debug"
|
|
||||||
|
FILES_${PN}-im = "${libdir}/gtk-2.0/*/immodules/*.so"
|
||||||
|
|
||||||
|
FILES_${PN}-applet = "${libdir}/matchbox-panel/*.so"
|
||||||
|
|
||||||
FILES_matchbox-keyboard-applet = "${libdir}/matchbox-panel/*.so"
|
|
||||||
FILES_matchbox-keyboard-applet-dbg += "${libdir}/matchbox-panel/.debug"
|
|
||||||
|
|
||||||
do_install_append () {
|
do_install_append () {
|
||||||
install -d ${D}/${sysconfdir}/X11/Xsession.d/
|
install -d ${D}/${sysconfdir}/X11/Xsession.d/
|
||||||
@@ -50,3 +50,5 @@ do_install_append () {
|
|||||||
}
|
}
|
||||||
|
|
||||||
GTKIMMODULES_PACKAGES = "${PN}-im"
|
GTKIMMODULES_PACKAGES = "${PN}-im"
|
||||||
|
|
||||||
|
RDEPENDS_${PN} = "formfactor dbus-wait"
|
||||||
|
|||||||
Reference in New Issue
Block a user