summaryrefslogtreecommitdiff
path: root/meta
diff options
context:
space:
mode:
authorJoshua Lock <josh@linux.intel.com>2010-12-15 14:31:21 +0000
committerRichard Purdie <rpurdie@linux.intel.com>2010-12-16 17:36:01 +0000
commit3188c6aa0f7cc26d7157f1be5a17b7b30194c5cd (patch)
tree895453c7c0ef3f7be133a17a8cfa3cc9ebb63828 /meta
parenta9ce04f22d7c1791cbab5dbece1785dc0a076860 (diff)
downloadopenembedded-core-3188c6aa0f7cc26d7157f1be5a17b7b30194c5cd.tar.gz
openembedded-core-3188c6aa0f7cc26d7157f1be5a17b7b30194c5cd.tar.bz2
openembedded-core-3188c6aa0f7cc26d7157f1be5a17b7b30194c5cd.tar.xz
openembedded-core-3188c6aa0f7cc26d7157f1be5a17b7b30194c5cd.zip
web-webkit: fix for make 3.82
Signed-off-by: Joshua Lock <josh@linux.intel.com>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-sato/web/web-webkit/make-382.patch15
-rw-r--r--meta/recipes-sato/web/web-webkit_svn.bb5
2 files changed, 18 insertions, 2 deletions
diff --git a/meta/recipes-sato/web/web-webkit/make-382.patch b/meta/recipes-sato/web/web-webkit/make-382.patch
new file mode 100644
index 000000000..253743d18
--- /dev/null
+++ b/meta/recipes-sato/web/web-webkit/make-382.patch
@@ -0,0 +1,15 @@
+Make 3.82 does not allow 8 spaces instead of a tab
+
+JL - 15/12/10
+
+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_svn.bb b/meta/recipes-sato/web/web-webkit_svn.bb
index 9cdf1f9da..895d49b27 100644
--- a/meta/recipes-sato/web/web-webkit_svn.bb
+++ b/meta/recipes-sato/web/web-webkit_svn.bb
@@ -8,10 +8,11 @@ SECTION = "x11"
DEPENDS = "libxml2 glib-2.0 gtk+ libglade webkit-gtk curl gconf js libowl"
PV = "0.0+svnr${SRCREV}"
-PR = "r2"
+PR = "r3"
SRC_URI = "svn://svn.o-hand.com/repos/web/branches;module=webkit;proto=http \
- file://link-with-g++.patch;patch=1"
+ file://link-with-g++.patch \
+ file://make-382.patch"
S = "${WORKDIR}/webkit"