summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcin Juszkiewicz <hrw@openedhand.com>2008-04-30 21:48:50 +0000
committerMarcin Juszkiewicz <hrw@openedhand.com>2008-04-30 21:48:50 +0000
commit7a0c34aa576c553a0d47193abf4d7108f5b0f033 (patch)
tree135168f8e3f00253a88b3f053ebb2983b31ba7f8
parent14ccccfb95972dcf259df7f826a10a587cd0bdcf (diff)
downloadopenembedded-core-7a0c34aa576c553a0d47193abf4d7108f5b0f033.tar.gz
openembedded-core-7a0c34aa576c553a0d47193abf4d7108f5b0f033.tar.bz2
openembedded-core-7a0c34aa576c553a0d47193abf4d7108f5b0f033.zip
gypsy: bump SRCREV to 147
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4378 311d38ba-8fff-0310-9ca6-ca027cbcb966
-rw-r--r--meta-extras/packages/gypsy/files/fixups.patch23
-rw-r--r--meta-extras/packages/gypsy/gypsy_svn.bb2
-rw-r--r--meta/conf/distro/poky.conf2
3 files changed, 16 insertions, 11 deletions
diff --git a/meta-extras/packages/gypsy/files/fixups.patch b/meta-extras/packages/gypsy/files/fixups.patch
index 1f64d58513..8bc8c5cbac 100644
--- a/meta-extras/packages/gypsy/files/fixups.patch
+++ b/meta-extras/packages/gypsy/files/fixups.patch
@@ -1,14 +1,19 @@
---
- docs/reference/Makefile.am | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
+ docs/reference/Makefile.am | 2 ++
+ 1 file changed, 2 insertions(+)
-Index: gypsy/docs/reference/Makefile.am
-===================================================================
---- gypsy.orig/docs/reference/Makefile.am 2007-10-04 23:04:44.000000000 +0100
-+++ gypsy/docs/reference/Makefile.am 2007-10-04 23:04:53.000000000 +0100
-@@ -82,4 +82,4 @@ include $(top_srcdir)/gtk-doc.make
+--- gypsy.orig/docs/reference/Makefile.am
++++ gypsy/docs/reference/Makefile.am
+@@ -81,10 +81,12 @@ expand_content_files=
+ # e.g. GTKDOC_LIBS=$(top_builddir)/gtk/$(gtktargetlib)
+
+ INCLUDES=-I$(top_srcdir) $(GYPSY_CFLAGS)
+ GTKDOC_LIBS=$(top_builddir)/gypsy/libgypsy.la $(GYPSY_LIBS)
+
++EXTRA_DIST =
++CLEANFILES =
+ # This includes the standard gtk-doc make rules, copied by gtkdocize.
+ include $(top_srcdir)/gtk-doc.make
# Other files to distribute
# e.g. EXTRA_DIST += version.xml.in
--EXTRA_DIST +=
-+# EXTRA_DIST =
diff --git a/meta-extras/packages/gypsy/gypsy_svn.bb b/meta-extras/packages/gypsy/gypsy_svn.bb
index b24ef26775..ac1b6bc12f 100644
--- a/meta-extras/packages/gypsy/gypsy_svn.bb
+++ b/meta-extras/packages/gypsy/gypsy_svn.bb
@@ -6,4 +6,4 @@ PV = "0.0+svnr${SRCREV}"
S = "${WORKDIR}/${PN}"
SRC_URI = "svn://svn.o-hand.com/repos/${PN}/trunk;module=${PN};proto=http \
- file://fixups.patch;patch=1" \ No newline at end of file
+ file://fixups.patch;patch=1"
diff --git a/meta/conf/distro/poky.conf b/meta/conf/distro/poky.conf
index 896dd22144..77ed36c1fc 100644
--- a/meta/conf/distro/poky.conf
+++ b/meta/conf/distro/poky.conf
@@ -140,7 +140,7 @@ SRCREV_pn-clutter ?= "2616"
SRCREV_pn-clutter-gst ?= "2616"
SRCDATE_libgsmd ?= "20070917"
SRCREV_pn-gaku ?= "375"
-SRCREV_pn-gypsy ?= "39"
+SRCREV_pn-gypsy ?= "147"
SRCDATE_yaffs2-utils = "20071107"
SRCDATE_yaffs2-utils-native = "20071107"
SRCREV_pn-webkit-gtk ?= "31859"