From patchwork Tue Jul 17 16:22:09 2012
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: [2/3] web-webkit: push make whitespace fix upstream
Date: Tue, 17 Jul 2012 16:22:09 -0000
From: Ross Burton <ross.burton@intel.com>
X-Patchwork-Id: 32285
Message-Id: <6343e5717bfa734d8bfc9308d075a26e5f587468.1342542040.git.ross.burton@intel.com>
To: openembedded-core@lists.openembedded.org

Signed-off-by: Ross Burton <ross.burton@intel.com>

---
meta/recipes-sato/web/web-webkit/make-382.patch |   17 -----------------
 meta/recipes-sato/web/web-webkit_git.bb         |    7 +++----
 2 files changed, 3 insertions(+), 21 deletions(-)
 delete mode 100644 meta/recipes-sato/web/web-webkit/make-382.patch

diff --git a/meta/recipes-sato/web/web-webkit/make-382.patch b/meta/recipes-sato/web/web-webkit/make-382.patch
deleted file mode 100644
index 3689435..0000000
--- a/meta/recipes-sato/web/web-webkit/make-382.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Make 3.82 does not allow 8 spaces instead of a tab
-
-JL - 15/12/10
-
-Upstream-Status: Inappropriate [configuration]
-
-Index: webkit/Makefile.am
-===================================================================
---- webkit.orig/Makefile.am
-+++ webkit/Makefile.am
-@@ -5,5 +5,5 @@ SUBDIRS = src data
- MAINTAINERCLEANFILES = aclocal.m4 compile config.guess config.sub configure depcomp install-sh ltmain.sh Makefile.in missing
- 
- snapshot:
--        $(MAKE) dist distdir=$(PACKAGE)-snap`date +"%Y%m%d"`
-+	$(MAKE) dist distdir=$(PACKAGE)-snap`date +"%Y%m%d"`
- 
diff --git a/meta/recipes-sato/web/web-webkit_git.bb b/meta/recipes-sato/web/web-webkit_git.bb
index 57cd545..dae7faf 100644
--- a/meta/recipes-sato/web/web-webkit_git.bb
+++ b/meta/recipes-sato/web/web-webkit_git.bb
@@ -11,13 +11,12 @@ DEPENDS = "glib-2.0 gtk+ webkit-gtk libowl"
 # To access https web pages
 RRECOMMENDS_${PN} += "glib-networking"
 
-SRCREV = "0f7019acd9db5383c732d0524c7c3a5eaec9be2b"
+SRCREV = "b0676c190f876cbdb1df202fbcec42f212374503"
 PV = "0.1+git${SRCPV}"
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "git://git.yoctoproject.org/${BPN};protocol=git \
-           file://link-with-g++.patch \
-	   file://make-382.patch"
+           file://link-with-g++.patch"
 
 S = "${WORKDIR}/git"