diff options
author | Andreas Müller <schnitzeltony@googlemail.com> | 2014-12-05 09:11:55 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-12-11 11:26:08 +0000 |
commit | 39bb9f47c727c5518a794aac976dacd4b00a0534 (patch) | |
tree | c5da9bafcd3b7d0bcfbf54b4cfa3ff25030ad456 | |
parent | 9a32da05f5a9bc62c592fd2d6057dc052e363261 (diff) | |
download | openembedded-core-39bb9f47c727c5518a794aac976dacd4b00a0534.tar.gz openembedded-core-39bb9f47c727c5518a794aac976dacd4b00a0534.tar.bz2 openembedded-core-39bb9f47c727c5518a794aac976dacd4b00a0534.zip |
midori: update to 0.5.8
midori has moved to cmake for configuration
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
-rw-r--r-- | meta/recipes-sato/midori/midori_0.5.5.bb | 47 | ||||
-rw-r--r-- | meta/recipes-sato/midori/midori_0.5.8.bb | 26 |
2 files changed, 26 insertions, 47 deletions
diff --git a/meta/recipes-sato/midori/midori_0.5.5.bb b/meta/recipes-sato/midori/midori_0.5.5.bb deleted file mode 100644 index a9379e7fff..0000000000 --- a/meta/recipes-sato/midori/midori_0.5.5.bb +++ /dev/null @@ -1,47 +0,0 @@ -SUMMARY = "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 openssl python-native python-docutils-native librsvg-native libnotify libunique libxscrnsaver" - -SRC_URI = "http://www.midori-browser.org/downloads/${BPN}_${PV}_all_.tar.bz2 \ -" - -SRC_URI[md5sum] = "b99e87d4b73a4732ed1c1e591f0242ac" -SRC_URI[sha256sum] = "ca69382a285222a86028abebd73fed1976735883027ff0adc094b627789bbd62" - -# midori depends on webkit-gtk, and webkit-gtk can NOT be built on -# MIPS64 with n32 ABI. So remove it from mips64 n32 temporarily. -COMPATIBLE_HOST_mips64 = "mips64.*-linux$" - -inherit gtk-icon-cache pkgconfig vala pythonnative - -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-gtk3 \ - --disable-zeitgeist \ -} - -PARALLEL_MAKE = "" -TARGET_CC_ARCH += "${LDFLAGS}" - -do_install() { - oe_runmake DESTDIR=${D} install -} - -RRECOMMENDS_${PN} += "glib-networking ca-certificates gnome-icon-theme" - -FILES_${PN}-dev += "${datadir}/vala/vapi" diff --git a/meta/recipes-sato/midori/midori_0.5.8.bb b/meta/recipes-sato/midori/midori_0.5.8.bb new file mode 100644 index 0000000000..299ecb324c --- /dev/null +++ b/meta/recipes-sato/midori/midori_0.5.8.bb @@ -0,0 +1,26 @@ +SUMMARY = "A lightweight web browser" +HOMEPAGE = "http://midori-browser.org/" +LICENSE = "LGPLv2.1" +LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24" +DEPENDS = "webkit-gtk libsoup-2.4 openssl python-native python-docutils-native librsvg-native libnotify libxscrnsaver" + +SRC_URI = "https://launchpad.net/midori/trunk/0.5.8/+download/${BPN}-${PV}.tar.bz2;subdir=${BPN}-${PV}" +SRC_URI[md5sum] = "b89e25e74199d705e74767499a415976" +SRC_URI[sha256sum] = "af19135fd4c4b04345df4d3592e7939c20f9b40eaca24550e6cb619751aa9381" + +# midori depends on webkit-gtk, and webkit-gtk can NOT be built on +# MIPS64 with n32 ABI. So remove it from mips64 n32 temporarily. +COMPATIBLE_HOST_mips64 = "mips64.*-linux$" + +inherit gtk-icon-cache pkgconfig vala pythonnative cmake + +EXTRA_OECMAKE = " \ + -DCMAKE_INSTALL_PREFIX=${prefix} \ + -DUSE_ZEITGEIST=0 \ +" + +TARGET_CC_ARCH += "${LDFLAGS}" + +RRECOMMENDS_${PN} += "glib-networking ca-certificates gnome-icon-theme" + +FILES_${PN} += "${datadir}/appdata" |