mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-05-30 13:00:02 +00:00
maliit-framework: Clean up recipe and use gtk-immodules-cache.bbclass
To be merged after gtk-immodules-cache.bbclass hits oe-core Signed-off-by: Samuel Stirtzel <s.stirtzel@googlemail.com> Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
This commit is contained in:
committed by
Koen Kooi
parent
80e475919c
commit
eb66e508e3
@@ -4,7 +4,7 @@ HOMEPAGE = "https://wiki.maliit.org/Main_Page"
|
|||||||
LICENSE = "LGPLv2.1"
|
LICENSE = "LGPLv2.1"
|
||||||
LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=5c917f6ce94ceb8d8d5e16e2fca5b9ad"
|
LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=5c917f6ce94ceb8d8d5e16e2fca5b9ad"
|
||||||
|
|
||||||
inherit autotools qt4x11
|
inherit autotools qt4x11 gtk-immodules-cache
|
||||||
|
|
||||||
|
|
||||||
SRC_URI = "git://gitorious.org/maliit/maliit-framework.git;branch=master \
|
SRC_URI = "git://gitorious.org/maliit/maliit-framework.git;branch=master \
|
||||||
@@ -16,9 +16,8 @@ SRCREV = "750842dec74a9b17dca91ef779c4fc5a43c4d9dc"
|
|||||||
PV = "0.92.3+git${SRCPV}"
|
PV = "0.92.3+git${SRCPV}"
|
||||||
|
|
||||||
|
|
||||||
PACKAGES =+ "\
|
PACKAGES =+ "${PN}-gtk"
|
||||||
${PN}-gtk \
|
GTKIMMODULES_PACKAGES = "${PN}-gtk"
|
||||||
"
|
|
||||||
|
|
||||||
# Maliit needs Qt configured with -accessibility, a patch for that was already sent and will get merged in post 1.2.
|
# Maliit needs Qt configured with -accessibility, a patch for that was already sent and will get merged in post 1.2.
|
||||||
RDEPENDS_${PN} = "qt4-plugin-inputmethod-imsw-multi libqtsvg4"
|
RDEPENDS_${PN} = "qt4-plugin-inputmethod-imsw-multi libqtsvg4"
|
||||||
@@ -58,29 +57,12 @@ EXTRA_QMAKEVARS_PRE = "\
|
|||||||
CONFIG+=local-install \
|
CONFIG+=local-install \
|
||||||
"
|
"
|
||||||
|
|
||||||
do_install() {
|
EXTRA_OEMAKE += "INSTALL_ROOT=${D}"
|
||||||
cd ${S} && (INSTALL_ROOT=${D} oe_runmake install)
|
|
||||||
|
|
||||||
|
do_install_append() {
|
||||||
#Fix absolute paths
|
#Fix absolute paths
|
||||||
cd ${D}/${datadir}/qt4/mkspecs/features && sed -i -e "s|/usr|${STAGING_DIR_TARGET}${prefix}|" ./maliit-framework.prf
|
sed -i -e "s|/usr|${STAGING_DIR_TARGET}${prefix}|" ${D}/${datadir}/qt4/mkspecs/features/maliit-framework.prf
|
||||||
cd ${D}/${datadir}/qt4/mkspecs/features && sed -i -e "s|/usr|${STAGING_DIR_TARGET}${prefix}|" ./maliit-plugins.prf
|
sed -i -e "s|/usr|${STAGING_DIR_TARGET}${prefix}|" ${D}/${datadir}/qt4/mkspecs/features/maliit-plugins.prf
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
# Update the inputmethod modules in gtk
|
|
||||||
pkg_postinst_${PN}-gtk() {
|
|
||||||
if [ "x$D" != "x" ]; then
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
gtk-query-immodules-2.0 > /etc/gtk-2.0/gtk.immodules
|
|
||||||
}
|
|
||||||
|
|
||||||
pkg_postrm_${PN}-gtk() {
|
|
||||||
if [ "x$D" != "x" ]; then
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
gtk-query-immodules-2.0 > /etc/gtk-2.0/gtk.immodules
|
|
||||||
}
|
}
|
||||||
|
|
||||||
S= "${WORKDIR}/git"
|
S= "${WORKDIR}/git"
|
||||||
|
|||||||
Reference in New Issue
Block a user