diff options
Diffstat (limited to 'meta')
-rw-r--r-- | meta/conf/distro/include/poky-default-revisions.inc | 2 | ||||
-rw-r--r-- | meta/recipes-sato/web/web/makefile-whitespace.patch | 11 | ||||
-rw-r--r-- | meta/recipes-sato/web/web_git.bb (renamed from meta/recipes-sato/web/web_svn.bb) | 7 |
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" | |||
180 | SRCREV_pn-ubootchart ??= "10" | 180 | SRCREV_pn-ubootchart ??= "10" |
181 | SRCREV_pn-webkit-gtk ??= "72836" | 181 | SRCREV_pn-webkit-gtk ??= "72836" |
182 | SRCREV_pn-web-webkit ??= "130" | 182 | SRCREV_pn-web-webkit ??= "130" |
183 | SRCREV_pn-web ??= "131" | 183 | SRCREV_pn-web ??= "8adaf105a0cbfd835ea5d3915d7dee22586208e7" |
184 | SRCREV_pn-xcb-proto ??= "d81ca233e98be8fa59e8c90d262c0516944c5a66" | 184 | SRCREV_pn-xcb-proto ??= "d81ca233e98be8fa59e8c90d262c0516944c5a66" |
185 | SRCREV_pn-xcb-proto-native ??= "d81ca233e98be8fa59e8c90d262c0516944c5a66" | 185 | SRCREV_pn-xcb-proto-native ??= "d81ca233e98be8fa59e8c90d262c0516944c5a66" |
186 | SRCREV_pn-xf86-video-intel ??= "87ea531c5dc5b39809395b277c330854aaaaf019" | 186 | 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 @@ | |||
1 | Index: git/Makefile.am | ||
2 | =================================================================== | ||
3 | --- git.orig/Makefile.am | ||
4 | +++ git/Makefile.am | ||
5 | @@ -5,5 +5,5 @@ SUBDIRS = src data | ||
6 | MAINTAINERCLEANFILES = aclocal.m4 compile config.guess config.sub configure depcomp install-sh ltmain.sh Makefile.in missing | ||
7 | |||
8 | snapshot: | ||
9 | - $(MAKE) dist distdir=$(PACKAGE)-snap`date +"%Y%m%d"` | ||
10 | + $(MAKE) dist distdir=$(PACKAGE)-snap`date +"%Y%m%d"` | ||
11 | |||
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" | |||
4 | DESCRIPTION = "Web is a multi-platform web browsing application." | 4 | DESCRIPTION = "Web is a multi-platform web browsing application." |
5 | PR = "r4" | 5 | PR = "r4" |
6 | 6 | ||
7 | PV = "0.0+svnr${SRCPV}" | 7 | PV = "0.0+git${SRCPV}" |
8 | 8 | ||
9 | SRC_URI = "svn://svn.o-hand.com/repos/${PN};module=trunk;proto=http \ | 9 | SRC_URI = "git://git.yoctoproject.org/web-sato;protocol=git \ |
10 | file://owl-window-menu.patch \ | 10 | file://owl-window-menu.patch \ |
11 | file://makefile-whitespace.patch \ | ||
11 | " | 12 | " |
12 | 13 | ||
13 | LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" | 14 | LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" |
14 | 15 | ||
15 | S = "${WORKDIR}/trunk" | 16 | S = "${WORKDIR}/git" |
16 | 17 | ||
17 | do_unpack_append () { | 18 | do_unpack_append () { |
18 | bb.build.exec_func('do_remove_patches', d) | 19 | bb.build.exec_func('do_remove_patches', d) |