2012/10/30 Koen Kooi <k...@dominion.thruhere.net>: > -----BEGIN PGP SIGNED MESSAGE----- > Hash: SHA1 > > Op 30-10-12 10:24, Samuel Stirtzel schreef: >> 2012/10/24 <g...@git.openembedded.org>: >>> Module: meta-openembedded.git Branch: master Commit: >>> 80ef3c0aa0f92e93d1581e47ccb77a04022d04cf URL: >>> http://git.openembedded.org/?p=meta-openembedded.git&a=commit;h=80ef3c0aa0f92e93d1581e47ccb77a04022d04cf >>> >>> >>> > Author: Koen Kooi <k...@dominion.thruhere.net> >>> Date: Wed Oct 24 08:39:12 2012 +0200 >>> >>> Revert "maliit-framework: Clean up recipe and use >>> gtk-immodules-cache.bbclass" >>> >>> The class hasn't hit oe-core yet >>> >>> This reverts commit eb66e508e33ccbec8299041265eef183913a3a8c. >>> >>> --- >>> >>> .../recipes-support/maliit/maliit-framework_git.bb | 32 >>> +++++++++++++++---- 1 files changed, 25 insertions(+), 7 deletions(-) >>> >>> diff --git a/meta-oe/recipes-support/maliit/maliit-framework_git.bb >>> b/meta-oe/recipes-support/maliit/maliit-framework_git.bb index >>> 534a3c8..3f50d1b 100644 --- >>> a/meta-oe/recipes-support/maliit/maliit-framework_git.bb +++ >>> b/meta-oe/recipes-support/maliit/maliit-framework_git.bb @@ -4,7 +4,7 >>> @@ HOMEPAGE = "https://wiki.maliit.org/Main_Page"; LICENSE = "LGPLv2.1" >>> LIC_FILES_CHKSUM = >>> "file://LICENSE.LGPL;md5=5c917f6ce94ceb8d8d5e16e2fca5b9ad" >>> >>> -inherit autotools qt4x11 gtk-immodules-cache +inherit autotools >>> qt4x11 >>> >>> >>> SRC_URI = >>> "git://gitorious.org/maliit/maliit-framework.git;branch=master \ @@ >>> -16,8 +16,9 @@ SRCREV = "750842dec74a9b17dca91ef779c4fc5a43c4d9dc" PV = >>> "0.92.3+git${SRCPV}" >>> >>> >>> -PACKAGES =+ "${PN}-gtk" -GTKIMMODULES_PACKAGES = "${PN}-gtk" +PACKAGES >>> =+ "\ + ${PN}-gtk \ + " >>> >>> # 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" @@ -57,12 +58,29 @@ >>> EXTRA_QMAKEVARS_PRE = "\ CONFIG+=local-install \ " >>> >>> -EXTRA_OEMAKE += "INSTALL_ROOT=${D}" +do_install() { + cd ${S} && >>> (INSTALL_ROOT=${D} oe_runmake install) >>> >>> -do_install_append() { #Fix absolute paths - sed -i -e >>> "s|/usr|${STAGING_DIR_TARGET}${prefix}|" >>> ${D}/${datadir}/qt4/mkspecs/features/maliit-framework.prf - sed -i >>> -e "s|/usr|${STAGING_DIR_TARGET}${prefix}|" >>> ${D}/${datadir}/qt4/mkspecs/features/maliit-plugins.prf + cd >>> ${D}/${datadir}/qt4/mkspecs/features && sed -i -e >>> "s|/usr|${STAGING_DIR_TARGET}${prefix}|" ./maliit-framework.prf + cd >>> ${D}/${datadir}/qt4/mkspecs/features && sed -i -e >>> "s|/usr|${STAGING_DIR_TARGET}${prefix}|" ./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" >>> >>> >>> _______________________________________________ Openembedded-commits >>> mailing list >>> openembedded-comm...@lists.openembedded.org >>> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-commits >> >>> >> Hi, can this be re-applied please? >> >> The .bbclass was taken in OE-Core with commit: [1] >> >> [1] >> https://github.com/openembedded/oe-core/commit/c67f64e5846bb2a6774e61a4f3719c5f82fc3bd8 > > > That's >> > not present in the danny branch, see the RFC I sent about that a few > days ago.
Alright, this can wait until release branching is done. > > > -----BEGIN PGP SIGNATURE----- > Version: GnuPG v1.4.5 (Darwin) > Comment: GPGTools - http://gpgtools.org > > iD8DBQFQj7vmMkyGM64RGpERAj1SAJ9ozJzcWiIZaeYYsRvRC0vfYM3kYACgpCnu > fjQDb9JsGhFaGQ0bJgjkTxo= > =6kZU > -----END PGP SIGNATURE----- > > > _______________________________________________ > Openembedded-devel mailing list > Openembedded-devel@lists.openembedded.org > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel -- Regards Samuel _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
