summaryrefslogtreecommitdiffstats
path: root/meta/recipes-sato
diff options
context:
space:
mode:
authorAndreas Müller <schnitzeltony@googlemail.com>2014-12-05 09:11:55 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-12-11 11:34:57 +0000
commitbcc18fedf02133d50b28541570e9d9cf3b4da795 (patch)
tree5037df1c4cd73ab8fc043e852748dd3dc0c2d512 /meta/recipes-sato
parentb9001b69b231efefbb9ed1e09eec211e61cd8cb1 (diff)
downloadpoky-bcc18fedf02133d50b28541570e9d9cf3b4da795.tar.gz
midori: update to 0.5.8
midori has moved to cmake for configuration (From OE-Core rev: 39bb9f47c727c5518a794aac976dacd4b00a0534) Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-sato')
-rw-r--r--meta/recipes-sato/midori/midori_0.5.5.bb47
-rw-r--r--meta/recipes-sato/midori/midori_0.5.8.bb26
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 @@
1SUMMARY = "A lightweight web browser"
2HOMEPAGE = "http://www.twotoasts.de/index.php?/pages/midori_summary.html"
3LICENSE = "LGPLv2.1"
4LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24"
5DEPENDS = "webkit-gtk libsoup-2.4 openssl python-native python-docutils-native librsvg-native libnotify libunique libxscrnsaver"
6
7SRC_URI = "http://www.midori-browser.org/downloads/${BPN}_${PV}_all_.tar.bz2 \
8"
9
10SRC_URI[md5sum] = "b99e87d4b73a4732ed1c1e591f0242ac"
11SRC_URI[sha256sum] = "ca69382a285222a86028abebd73fed1976735883027ff0adc094b627789bbd62"
12
13# midori depends on webkit-gtk, and webkit-gtk can NOT be built on
14# MIPS64 with n32 ABI. So remove it from mips64 n32 temporarily.
15COMPATIBLE_HOST_mips64 = "mips64.*-linux$"
16
17inherit gtk-icon-cache pkgconfig vala pythonnative
18
19do_configure() {
20 sed -i -e 's:, shell=False::g' -e s:/usr/X11R6/include::g -e s:/usr/X11R6/lib::g wscript
21 ./configure \
22 --prefix=${prefix} \
23 --bindir=${bindir} \
24 --sbindir=${sbindir} \
25 --libexecdir=${libexecdir} \
26 --datadir=${datadir} \
27 --sysconfdir=${sysconfdir} \
28 --sharedstatedir=${sharedstatedir} \
29 --localstatedir=${localstatedir} \
30 --libdir=${libdir} \
31 --includedir=${includedir} \
32 --infodir=${infodir} \
33 --mandir=${mandir} \
34 --disable-gtk3 \
35 --disable-zeitgeist \
36}
37
38PARALLEL_MAKE = ""
39TARGET_CC_ARCH += "${LDFLAGS}"
40
41do_install() {
42 oe_runmake DESTDIR=${D} install
43}
44
45RRECOMMENDS_${PN} += "glib-networking ca-certificates gnome-icon-theme"
46
47FILES_${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 @@
1SUMMARY = "A lightweight web browser"
2HOMEPAGE = "http://midori-browser.org/"
3LICENSE = "LGPLv2.1"
4LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24"
5DEPENDS = "webkit-gtk libsoup-2.4 openssl python-native python-docutils-native librsvg-native libnotify libxscrnsaver"
6
7SRC_URI = "https://launchpad.net/midori/trunk/0.5.8/+download/${BPN}-${PV}.tar.bz2;subdir=${BPN}-${PV}"
8SRC_URI[md5sum] = "b89e25e74199d705e74767499a415976"
9SRC_URI[sha256sum] = "af19135fd4c4b04345df4d3592e7939c20f9b40eaca24550e6cb619751aa9381"
10
11# midori depends on webkit-gtk, and webkit-gtk can NOT be built on
12# MIPS64 with n32 ABI. So remove it from mips64 n32 temporarily.
13COMPATIBLE_HOST_mips64 = "mips64.*-linux$"
14
15inherit gtk-icon-cache pkgconfig vala pythonnative cmake
16
17EXTRA_OECMAKE = " \
18 -DCMAKE_INSTALL_PREFIX=${prefix} \
19 -DUSE_ZEITGEIST=0 \
20"
21
22TARGET_CC_ARCH += "${LDFLAGS}"
23
24RRECOMMENDS_${PN} += "glib-networking ca-certificates gnome-icon-theme"
25
26FILES_${PN} += "${datadir}/appdata"