From 655cf47c63a14b26bd2e819d2abee148f697ac2d Mon Sep 17 00:00:00 2001
From: Andreas Müller <schnitzeltony@googlemail.com>
Date: Thu, 7 Mar 2013 11:43:30 +0000
Subject: midori: update to 0.4.8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

the following issues caused similarity index decreasing:

| waf: error: no such option: --disable-hildon

| Checking for Python			:  /usr/bin/python2

| Checking for zeitgeist-1.0 >= 0.3.14        : Package zeitgeist-1.0 was not found in the pkg-config search path.
| Perhaps you should add the directory containing `zeitgeist-1.0.pc'

Run tests showed artifacts with google maps. Theses showed up with previous
version of midori and current version of firefox too. So they seem
independent of this update.

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 .../recipes-connectivity/midori/midori_0.4.7.bb    | 42 ----------------------
 .../recipes-connectivity/midori/midori_0.4.8.bb    | 42 ++++++++++++++++++++++
 2 files changed, 42 insertions(+), 42 deletions(-)
 delete mode 100644 meta-gnome/recipes-connectivity/midori/midori_0.4.7.bb
 create mode 100644 meta-gnome/recipes-connectivity/midori/midori_0.4.8.bb

diff --git a/meta-gnome/recipes-connectivity/midori/midori_0.4.7.bb b/meta-gnome/recipes-connectivity/midori/midori_0.4.7.bb
deleted file mode 100644
index 8521e47e8..000000000
--- a/meta-gnome/recipes-connectivity/midori/midori_0.4.7.bb
+++ /dev/null
@@ -1,42 +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 openssl python-native python-docutils-native librsvg-native libnotify libunique"
-
-SRC_URI = "http://archive.xfce.org/src/apps/midori/0.4/midori-${PV}.tar.bz2;name=midori \
-          "
-SRC_URI[midori.md5sum] = "06db7b88a41e9b2265728960d5e98f35"
-SRC_URI[midori.sha256sum] = "65bf9976733597c405492ce91aa664fd10547cb7df16e0a70f260c7a3e97ea5d"
-
-inherit gtk-icon-cache pkgconfig vala
-
-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 \
-}
-
-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-gnome/recipes-connectivity/midori/midori_0.4.8.bb b/meta-gnome/recipes-connectivity/midori/midori_0.4.8.bb
new file mode 100644
index 000000000..266df4ff0
--- /dev/null
+++ b/meta-gnome/recipes-connectivity/midori/midori_0.4.8.bb
@@ -0,0 +1,42 @@
+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 openssl python-native python-docutils-native librsvg-native libnotify libunique"
+
+SRC_URI = "http://archive.xfce.org/src/apps/midori/0.4/midori-${PV}.tar.bz2;name=midori \
+          "
+SRC_URI[midori.md5sum] = "ce1b01fa5aa33d2ee50196df0c71e96f"
+SRC_URI[midori.sha256sum] = "40bf23f84a3537f54d7eb45df1da40ebef54c321b1b34d0d0c8e45bb0cce5e9f"
+
+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"
-- 
cgit v1.2.3-54-g00ecf