From 156baf84e72158193d596158b53c4c5a42860bc9 Mon Sep 17 00:00:00 2001
From: Richard Purdie <richard.purdie@linuxfoundation.org>
Date: Fri, 30 Aug 2013 17:25:26 +0100
Subject: [PATCH] web-webkit: Drop, we have midori now

This was never a particularly useful browser and is a dead codebase, retire
it and suggest midori instead.

[YOCTO #2318]

(From OE-Core rev: 3883d2cb03fb79fa39a7d85505c79784a996f178)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 meta/conf/distro/include/seperatebuilddir.inc |  1 -
 .../packagegroup-core-x11-sato.bb             |  2 +-
 meta/recipes-sato/web/web-webkit_git.bb       | 29 -------------------
 3 files changed, 1 insertion(+), 31 deletions(-)
 delete mode 100644 meta/recipes-sato/web/web-webkit_git.bb

diff --git a/meta/conf/distro/include/seperatebuilddir.inc b/meta/conf/distro/include/seperatebuilddir.inc
index bd98f8f634..5bd0ab44f4 100644
--- a/meta/conf/distro/include/seperatebuilddir.inc
+++ b/meta/conf/distro/include/seperatebuilddir.inc
@@ -694,7 +694,6 @@ B_pn-wayland = "${SEPB}"
 B_pn-wayland-native = "${SEPB}"
 # Not even going there
 #B_pn-webkit-gtk = "${SEPB}"
-B_pn-web-webkit = "${SEPB}"
 B_pn-weston = "${SEPB}"
 B_pn-wget = "${SEPB}"
 B_pn-which = "${SEPB}"
diff --git a/meta/recipes-sato/packagegroups/packagegroup-core-x11-sato.bb b/meta/recipes-sato/packagegroups/packagegroup-core-x11-sato.bb
index a7fee55646..4ec5e8961c 100644
--- a/meta/recipes-sato/packagegroups/packagegroup-core-x11-sato.bb
+++ b/meta/recipes-sato/packagegroups/packagegroup-core-x11-sato.bb
@@ -49,7 +49,7 @@ FILEMANAGER ?= "pcmanfm"
 FILEMANAGER_mips ?= ""
 
 WEB ?= ""
-#WEB = "web-webkit"
+#WEB = "midori"
 
 SUMMARY_${PN}-apps = "Sato desktop - applications"
 RDEPENDS_${PN}-apps = "\
diff --git a/meta/recipes-sato/web/web-webkit_git.bb b/meta/recipes-sato/web/web-webkit_git.bb
deleted file mode 100644
index f32304eec4..0000000000
--- a/meta/recipes-sato/web/web-webkit_git.bb
+++ /dev/null
@@ -1,29 +0,0 @@
-DESCRIPTION = "Multi-platform web browsing application."
-HOMEPAGE = "http://o-hand.com/"
-BUGTRACKER = "http://bugzilla.openedhand.com/"
-
-LICENSE = "LGPLv2.1"
-LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34"
-
-SECTION = "x11"
-DEPENDS = "glib-2.0 gtk+ webkit-gtk libowl"
-
-# To access https web pages
-RRECOMMENDS_${PN} += "glib-networking"
-
-SRCREV = "b0676c190f876cbdb1df202fbcec42f212374503"
-PV = "0.1+git${SRCPV}"
-PR = "r2"
-
-SRC_URI = "git://git.yoctoproject.org/${BPN}"
-
-S = "${WORKDIR}/git"
-
-EXTRA_OECONF = "--enable-libowl"
-
-# web-webkit could NOT be built on MIPS64 with 64 bits userspace
-COMPATIBLE_HOST_mips64 = "mips64.*-linux-gnun32"
-
-inherit autotools pkgconfig
-
-FILES_${PN} += "${datadir}/web2"