diff options
| author | Ross Burton <ross.burton@intel.com> | 2012-06-26 12:43:15 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-07-18 14:29:29 +0100 |
| commit | 12f5b06fe4fe93ec95d76a7c62cd4e6af7c38b80 (patch) | |
| tree | 6e5e7d7558da86d57ff667eda865f0e162e0e3e9 /meta/recipes-sato/web | |
| parent | e4ce4b41a801b1236af6f4e836b1c7e732282bc1 (diff) | |
| download | ast2050-yocto-poky-12f5b06fe4fe93ec95d76a7c62cd4e6af7c38b80.zip ast2050-yocto-poky-12f5b06fe4fe93ec95d76a7c62cd4e6af7c38b80.tar.gz | |
web-webkit: push make whitespace fix upstream
(From OE-Core rev: 9073ec0610a9e28c4b2bc90ace7a6b1c0cc99f75)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-sato/web')
| -rw-r--r-- | meta/recipes-sato/web/web-webkit/make-382.patch | 17 | ||||
| -rw-r--r-- | meta/recipes-sato/web/web-webkit_git.bb | 7 |
2 files changed, 3 insertions, 21 deletions
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" |
