web: switch to git and fix Makefile

The SVN repo is no longer available and we don't have a mirror of the
SVN tarball.

Further the Makefile in git uses spaces where the Make parser
expects tabs.

Signed-off-by: Joshua Lock <josh@linux.intel.com>

3 files changed, 16 insertions, 4 deletions

diff --git a/meta/conf/distro/include/poky-default-revisions.inc b/meta/conf/distro/include/poky-default-revisions.inc
index 20f54d9d6b..0521fe508b 100644
--- a/meta/conf/distro/include/poky-default-revisions.inc
+++ b/meta/conf/distro/include/poky-default-revisions.inc
@@ -180,7 +180,7 @@ SRCREV_pn-tidy ??= "e25416e1293e1074bfa6727c80527dcff5b1f3cb"
 SRCREV_pn-ubootchart ??= "10"
 SRCREV_pn-webkit-gtk ??= "72836"
 SRCREV_pn-web-webkit ??= "130"
-SRCREV_pn-web ??= "131"
+SRCREV_pn-web ??= "8adaf105a0cbfd835ea5d3915d7dee22586208e7"
 SRCREV_pn-xcb-proto ??= "d81ca233e98be8fa59e8c90d262c0516944c5a66"
 SRCREV_pn-xcb-proto-native ??= "d81ca233e98be8fa59e8c90d262c0516944c5a66"
 SRCREV_pn-xf86-video-intel ??= "87ea531c5dc5b39809395b277c330854aaaaf019"
diff --git a/meta/recipes-sato/web/web/makefile-whitespace.patch b/meta/recipes-sato/web/web/makefile-whitespace.patch
new file mode 100644
index 0000000000..544cc9ba66
--- /dev/null
+++ b/meta/recipes-sato/web/web/makefile-whitespace.patch
@@ -0,0 +1,11 @@
+Index: git/Makefile.am
+===================================================================
+--- git.orig/Makefile.am
++++ git/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_svn.bb b/meta/recipes-sato/web/web_git.bb
index bdcdaba009..04328422b4 100644
--- a/meta/recipes-sato/web/web_svn.bb
+++ b/meta/recipes-sato/web/web_git.bb
@@ -4,15 +4,16 @@ DEPENDS = "libxml2 glib-2.0 gtk+ libglade gtkhtml2 curl gconf js libowl"
 DESCRIPTION = "Web is a multi-platform web browsing application."
 PR = "r4"
 
-PV = "0.0+svnr${SRCPV}"
+PV = "0.0+git${SRCPV}"
 
-SRC_URI =       "svn://svn.o-hand.com/repos/${PN};module=trunk;proto=http \
+SRC_URI =       "git://git.yoctoproject.org/web-sato;protocol=git \
                 file://owl-window-menu.patch \
+                file://makefile-whitespace.patch \
                 "
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
 
-S = "${WORKDIR}/trunk"
+S = "${WORKDIR}/git"
 
 do_unpack_append () {
         bb.build.exec_func('do_remove_patches', d)