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 | |
parent | e4ce4b41a801b1236af6f4e836b1c7e732282bc1 (diff) | |
download | 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>
-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 3689435e32..0000000000 --- a/meta/recipes-sato/web/web-webkit/make-382.patch +++ /dev/null | |||
@@ -1,17 +0,0 @@ | |||
1 | Make 3.82 does not allow 8 spaces instead of a tab | ||
2 | |||
3 | JL - 15/12/10 | ||
4 | |||
5 | Upstream-Status: Inappropriate [configuration] | ||
6 | |||
7 | Index: webkit/Makefile.am | ||
8 | =================================================================== | ||
9 | --- webkit.orig/Makefile.am | ||
10 | +++ webkit/Makefile.am | ||
11 | @@ -5,5 +5,5 @@ SUBDIRS = src data | ||
12 | MAINTAINERCLEANFILES = aclocal.m4 compile config.guess config.sub configure depcomp install-sh ltmain.sh Makefile.in missing | ||
13 | |||
14 | snapshot: | ||
15 | - $(MAKE) dist distdir=$(PACKAGE)-snap`date +"%Y%m%d"` | ||
16 | + $(MAKE) dist distdir=$(PACKAGE)-snap`date +"%Y%m%d"` | ||
17 | |||
diff --git a/meta/recipes-sato/web/web-webkit_git.bb b/meta/recipes-sato/web/web-webkit_git.bb index 57cd545063..dae7faf6da 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" | |||
11 | # To access https web pages | 11 | # To access https web pages |
12 | RRECOMMENDS_${PN} += "glib-networking" | 12 | RRECOMMENDS_${PN} += "glib-networking" |
13 | 13 | ||
14 | SRCREV = "0f7019acd9db5383c732d0524c7c3a5eaec9be2b" | 14 | SRCREV = "b0676c190f876cbdb1df202fbcec42f212374503" |
15 | PV = "0.1+git${SRCPV}" | 15 | PV = "0.1+git${SRCPV}" |
16 | PR = "r0" | 16 | PR = "r1" |
17 | 17 | ||
18 | SRC_URI = "git://git.yoctoproject.org/${BPN};protocol=git \ | 18 | SRC_URI = "git://git.yoctoproject.org/${BPN};protocol=git \ |
19 | file://link-with-g++.patch \ | 19 | file://link-with-g++.patch" |
20 | file://make-382.patch" | ||
21 | 20 | ||
22 | S = "${WORKDIR}/git" | 21 | S = "${WORKDIR}/git" |
23 | 22 | ||