diff options
| author | Ross Burton <ross.burton@intel.com> | 2012-06-26 12:43:15 +0100 |
|---|---|---|
| committer | Saul Wold <sgw@linux.intel.com> | 2012-07-18 00:34:36 -0700 |
| commit | 9073ec0610a9e28c4b2bc90ace7a6b1c0cc99f75 (patch) | |
| tree | a8654d54e3f57eb743fdd6c97c33c5589934d8c7 /meta/recipes-sato/web | |
| parent | cc156badafe1e42653b9eb080c0dffd47d2a6130 (diff) | |
| download | openembedded-core-9073ec0610a9e28c4b2bc90ace7a6b1c0cc99f75.tar.gz openembedded-core-9073ec0610a9e28c4b2bc90ace7a6b1c0cc99f75.tar.bz2 openembedded-core-9073ec0610a9e28c4b2bc90ace7a6b1c0cc99f75.zip | |
web-webkit: push make whitespace fix upstream
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
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 3689435e32..0000000000 --- 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 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" # 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" |