From 798ce7cd108beab912a79e3b6a2e30003f61066a Mon Sep 17 00:00:00 2001
From: Ross Burton <ross@openedhand.com>
Date: Wed, 31 Oct 2007 16:24:53 +0000
Subject: [PATCH] openmoko2: update packages from OE so that openmoko-today2
 builds

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3051 311d38ba-8fff-0310-9ca6-ca027cbcb966
---
 .../packages/openmoko2/libjana_svn.bb         | 28 +++++++++++++++++++
 .../packages/openmoko2/libmokogsmd2_svn.bb    |  2 +-
 .../packages/openmoko2/libmokojournal2_svn.bb |  6 +++-
 .../packages/openmoko2/libmokoui2_svn.bb      | 12 ++++----
 .../openmoko2/openmoko-dialer2_svn.bb         |  4 +--
 .../openmoko2/openmoko-today2-folders_svn.bb  |  2 +-
 .../packages/openmoko2/openmoko-today2_svn.bb |  6 ++--
 7 files changed, 46 insertions(+), 14 deletions(-)
 create mode 100644 meta-openmoko/packages/openmoko2/libjana_svn.bb

diff --git a/meta-openmoko/packages/openmoko2/libjana_svn.bb b/meta-openmoko/packages/openmoko2/libjana_svn.bb
new file mode 100644
index 0000000000..065f380969
--- /dev/null
+++ b/meta-openmoko/packages/openmoko2/libjana_svn.bb
@@ -0,0 +1,28 @@
+DESCRIPTION = "O-Hand Jana Library"
+DEPENDS = "libmokojournal2 gtk+ eds-dbus gconf" 
+PV = "0.1.0+svnr${SRCREV}"
+PR = "r4"
+
+inherit autotools pkgconfig lib_package
+
+SRC_URI = "svn://svn.o-hand.com/repos/jana/;module=trunk;proto=http"
+S = "${WORKDIR}/trunk/"
+
+do_configure_prepend() {
+	touch gtk-doc.make
+}
+
+do_stage() {
+	autotools_stage_all
+}
+
+PACKAGES =+ "libjana-ecal libjana-ecal-dbg \
+             libjana-gtk libjana-gtk-dbg \ 
+            "
+
+LEAD_SONAME = "libjana.so"
+
+FILES_libjana-ecal = "${libdir}/libjana-ecal.so.*"
+FILES_libjana-ecal-dbg = "${libdir}/.debug/libjana-ecal*"
+FILES_libjana-gtk = "${libdir}/libjana-gtk.so.* ${datadir}/jana/landwater.vmf"
+FILES_libjana-gtk-dbg = "${libdir}/.debug/libjana-gtk.so.*"
diff --git a/meta-openmoko/packages/openmoko2/libmokogsmd2_svn.bb b/meta-openmoko/packages/openmoko2/libmokogsmd2_svn.bb
index 2551519348..8e547b3663 100644
--- a/meta-openmoko/packages/openmoko2/libmokogsmd2_svn.bb
+++ b/meta-openmoko/packages/openmoko2/libmokogsmd2_svn.bb
@@ -1,6 +1,6 @@
 SECTION = "openmoko/libs"
 DEPENDS = "libgsmd glib-2.0"
-PV = "0.1.0+svn${SVNREV}"
+PV = "0.1.0+svnr${SRCREV}"
 PR = "r1"
 
 inherit openmoko2
diff --git a/meta-openmoko/packages/openmoko2/libmokojournal2_svn.bb b/meta-openmoko/packages/openmoko2/libmokojournal2_svn.bb
index 6e5383af83..354b8e3f26 100644
--- a/meta-openmoko/packages/openmoko2/libmokojournal2_svn.bb
+++ b/meta-openmoko/packages/openmoko2/libmokojournal2_svn.bb
@@ -1,10 +1,14 @@
 SECTION = "openmoko/libs"
 DEPENDS = "eds-dbus"
-PV = "0.1.0+svn${SVNREV}"
+PV = "0.1.0+svnr${SRCREV}"
 PR = "r2"
 
 inherit openmoko2 lib_package
 
+do_configure_prepend() {
+        touch gtk-doc.make
+}
+
 do_stage() {
         autotools_stage_all
 }
diff --git a/meta-openmoko/packages/openmoko2/libmokoui2_svn.bb b/meta-openmoko/packages/openmoko2/libmokoui2_svn.bb
index 86372ae274..7d22f27a58 100644
--- a/meta-openmoko/packages/openmoko2/libmokoui2_svn.bb
+++ b/meta-openmoko/packages/openmoko2/libmokoui2_svn.bb
@@ -1,14 +1,14 @@
 SECTION = "openmoko/libs"
 DEPENDS = "gtk+"
-PV = "0.1.0+svn${SVNREV}"
-PR = "r1"
+PV = "0.1.0+svnr${SRCREV}"
+PR = "r2"
 
 inherit openmoko2
 
+do_configure_prepend() {
+        touch gtk-doc.make
+}
+
 do_stage() {
         autotools_stage_all
 }
-
-
-
-
diff --git a/meta-openmoko/packages/openmoko2/openmoko-dialer2_svn.bb b/meta-openmoko/packages/openmoko2/openmoko-dialer2_svn.bb
index 655272f293..b01d9d3c05 100644
--- a/meta-openmoko/packages/openmoko2/openmoko-dialer2_svn.bb
+++ b/meta-openmoko/packages/openmoko2/openmoko-dialer2_svn.bb
@@ -1,8 +1,8 @@
 DESCRIPTION = "The OpenMoko Dialer"
 SECTION = "openmoko/pim"
 DEPENDS = "libmokogsmd2 libmokoui2 libmokojournal2 pulseaudio"
-PV = "0.1.0+svn${SVNREV}"
-PR = "r4"
+PV = "0.1.0+svnr${SRCREV}"
+PR = "r5"
 
 inherit openmoko2
 
diff --git a/meta-openmoko/packages/openmoko2/openmoko-today2-folders_svn.bb b/meta-openmoko/packages/openmoko2/openmoko-today2-folders_svn.bb
index 7a7c90c091..ecd28d1b68 100644
--- a/meta-openmoko/packages/openmoko2/openmoko-today2-folders_svn.bb
+++ b/meta-openmoko/packages/openmoko2/openmoko-today2-folders_svn.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "The OpenMoko Today2 vfolder files"
 SECTION = "openmoko/misc"
-PV = "0.1.0+svn${SVNREV}"
+PV = "0.1.0+svnr${SRCREV}"
 PR = "r1"
 
 inherit openmoko2
diff --git a/meta-openmoko/packages/openmoko2/openmoko-today2_svn.bb b/meta-openmoko/packages/openmoko2/openmoko-today2_svn.bb
index bfc5fc201d..6b2d1b6ec7 100644
--- a/meta-openmoko/packages/openmoko2/openmoko-today2_svn.bb
+++ b/meta-openmoko/packages/openmoko2/openmoko-today2_svn.bb
@@ -1,8 +1,8 @@
 DESCRIPTION = "The OpenMoko Application Launcher"
 SECTION = "openmoko/pim"
-DEPENDS = "libmokoui2 libmokojournal2 startup-notification dbus-glib libice libsm"
+DEPENDS = "libmokoui2 libmokojournal2 libjana startup-notification dbus-glib"
 RDEPENDS = "libedata-cal openmoko-today2-folders"
-PV = "0.1.0+svn${SVNREV}"
-PR = "r1"
+PV = "0.1.0+svnr${SRCREV}"
+PR = "r2"
 
 inherit openmoko2 gtk-icon-cache