Signed-off-by: Andreas Müller <[email protected]> --- meta-oe/recipes-connectivity/midori/midori.inc | 39 ------------------ .../recipes-connectivity/midori/midori_0.4.4.bb | 42 ++++++++++++++++++- 2 files changed, 39 insertions(+), 42 deletions(-) delete mode 100644 meta-oe/recipes-connectivity/midori/midori.inc
diff --git a/meta-oe/recipes-connectivity/midori/midori.inc b/meta-oe/recipes-connectivity/midori/midori.inc deleted file mode 100644 index dccb3ee..0000000 --- a/meta-oe/recipes-connectivity/midori/midori.inc +++ /dev/null @@ -1,39 +0,0 @@ -DESCRIPTION = "Midori is a lightweight web browser." -HOMEPAGE = "http://www.twotoasts.de/index.php?/pages/midori_summary.html"; -LICENSE = "LGPLv2.1" -LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24" - -DEPENDS = "webkit-gtk libsoup-2.4 libsexy openssl vala-native python-native python-docutils-native" - -inherit gtk-icon-cache pkgconfig - -do_configure() { - sed -i -e 's:, shell=False::g' -e s:/usr/X11R6/include::g -e s:/usr/X11R6/lib::g wscript - ./configure \ - --prefix=${prefix} \ - --bindir=${bindir} \ - --sbindir=${sbindir} \ - --libexecdir=${libexecdir} \ - --datadir=${datadir} \ - --sysconfdir=${sysconfdir} \ - --sharedstatedir=${sharedstatedir} \ - --localstatedir=${localstatedir} \ - --libdir=${libdir} \ - --includedir=${includedir} \ - --infodir=${infodir} \ - --mandir=${mandir} \ - --disable-hildon \ - --disable-gtk3 \ -} - -LDFLAGS_append = " -ljavascriptcoregtk-1.0 " - -do_install() { - oe_runmake DESTDIR=${D} install -} - -RRECOMMENDS_${PN} += "glib-networking ca-certificates gnome-icon-theme" - -FILES_${PN}-dev += "${datadir}/vala/vapi" - -TARGET_CC_ARCH += "${LDFLAGS}" diff --git a/meta-oe/recipes-connectivity/midori/midori_0.4.4.bb b/meta-oe/recipes-connectivity/midori/midori_0.4.4.bb index 827eb19..7c51641 100644 --- a/meta-oe/recipes-connectivity/midori/midori_0.4.4.bb +++ b/meta-oe/recipes-connectivity/midori/midori_0.4.4.bb @@ -1,8 +1,44 @@ -require midori.inc - -PARALLEL_MAKE = "" +DESCRIPTION = "Midori is a lightweight web browser." +HOMEPAGE = "http://www.twotoasts.de/index.php?/pages/midori_summary.html"; +LICENSE = "LGPLv2.1" +LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24" +DEPENDS = "webkit-gtk libsoup-2.4 libsexy openssl vala-native python-native python-docutils-native" SRC_URI = "http://archive.xfce.org/src/apps/midori/0.4/midori-${PV}.tar.bz2;name=midori \ " SRC_URI[midori.md5sum] = "a6578ebfd237c0f22cce49113b95f70c" SRC_URI[midori.sha256sum] = "fadd43f76c1c9f6a16483e60a804e58fb6817c6a595b1acdd59bcbdd7b35bca2" + +inherit gtk-icon-cache pkgconfig + +do_configure() { + sed -i -e 's:, shell=False::g' -e s:/usr/X11R6/include::g -e s:/usr/X11R6/lib::g wscript + ./configure \ + --prefix=${prefix} \ + --bindir=${bindir} \ + --sbindir=${sbindir} \ + --libexecdir=${libexecdir} \ + --datadir=${datadir} \ + --sysconfdir=${sysconfdir} \ + --sharedstatedir=${sharedstatedir} \ + --localstatedir=${localstatedir} \ + --libdir=${libdir} \ + --includedir=${includedir} \ + --infodir=${infodir} \ + --mandir=${mandir} \ + --disable-hildon \ + --disable-gtk3 \ +} +do_install() { + oe_runmake DESTDIR=${D} install +} + +RRECOMMENDS_${PN} += "glib-networking ca-certificates gnome-icon-theme" + +FILES_${PN}-dev += "${datadir}/vala/vapi" + +LDFLAGS_append = " -ljavascriptcoregtk-1.0 " + +PARALLEL_MAKE = "" + +TARGET_CC_ARCH += "${LDFLAGS}" -- 1.7.4.4 _______________________________________________ Openembedded-devel mailing list [email protected] http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
