diff options
6 files changed, 56 insertions, 6 deletions
diff --git a/packages/openmoko-projects/diversity-daemon/.mtn2git_empty b/packages/openmoko-projects/diversity-daemon/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/openmoko-projects/diversity-daemon/.mtn2git_empty diff --git a/packages/openmoko-projects/diversity-daemon/no-xmmp.patch b/packages/openmoko-projects/diversity-daemon/no-xmmp.patch new file mode 100644 index 0000000000..2065e97dce --- /dev/null +++ b/packages/openmoko-projects/diversity-daemon/no-xmmp.patch @@ -0,0 +1,24 @@ +Index: diversity-xmpp-backend/Makefile.am +=================================================================== +--- a/diversity-xmpp-backend/Makefile.am (revision 276) ++++ a/diversity-xmpp-backend/Makefile.am (working copy) +@@ -1,3 +1,4 @@ ++if HAVE_XMPP + INCLUDES = -I${top_srcdir}/include + + AM_CPPFLAGS = \ +@@ -4,9 +5,7 @@ + $(GLIB_CFLAGS) \ + $(LM_CFLAGS) + +-if HAVE_XMPP + noinst_LTLIBRARIES = libdiversity-xmpp-backend.la +-endif + + noinst_HEADERS = diversity-xmpp-backend.h + +@@ -48,3 +47,4 @@ + + xmpp-marshal.h: xmpp-marshal.list + $(GLIB_GENMARSHAL) --prefix xmpp_marshal --header $< > $@ ++endif diff --git a/packages/openmoko-projects/diversity-daemon_svn.bb b/packages/openmoko-projects/diversity-daemon_svn.bb index 8ffcdc5038..43c1d0a1b9 100644 --- a/packages/openmoko-projects/diversity-daemon_svn.bb +++ b/packages/openmoko-projects/diversity-daemon_svn.bb @@ -3,11 +3,12 @@ HOMEPAGE = "http://diversity.projects.openmoko.org/" SECTION = "network/misc" LICENSE = "GPL" DEPENDS = "glib-2.0 dbus dbus-glib eds-dbus libjana curl" -RDEPENDS_${PN} = "eds-dbus openmoko-dialer2" +RDEPENDS_${PN} = "eds-dbus" PV = "0.0+svnr${SRCREV}" -PR = "r2" +PR = "r3" -SRC_URI = "svn://svn.projects.openmoko.org/svnroot/diversity/trunk;module=diversity-daemon;proto=https" +SRC_URI = "svn://svn.projects.openmoko.org/svnroot/diversity/trunk;module=diversity-daemon;proto=https \ + file://no-xmmp.patch;patch=1;minrev=276" S = "${WORKDIR}/diversity-daemon" inherit autotools pkgconfig diff --git a/packages/openmoko-projects/diversity-maps-taipei_20080430.bb b/packages/openmoko-projects/diversity-maps-taipei_20080430.bb new file mode 100644 index 0000000000..c882963fb2 --- /dev/null +++ b/packages/openmoko-projects/diversity-maps-taipei_20080430.bb @@ -0,0 +1,7 @@ +PR = "r0" + +require diversity-maps.inc + +MAP_NAME = "Taipei" +MAP_FN = "taipei.eet" +MAP_VER = "${PV}" diff --git a/packages/openmoko-projects/diversity-maps.inc b/packages/openmoko-projects/diversity-maps.inc new file mode 100644 index 0000000000..9af5e95d95 --- /dev/null +++ b/packages/openmoko-projects/diversity-maps.inc @@ -0,0 +1,18 @@ +DESCRIPTION = "Diversity Maps - ${MAP_NAME}" +HOMEPAGE = "http://diversity.projects.openmoko.org/" +SECTION = "network/misc" +LICENSE = "Creative Commons Attribution-ShareAlike 2.0" + +SRC_URI = "http://people.openmoko.org/olv/diversity/${MAP_VER}/${MAP_FN}" + +MAP_DIR = "${datadir}/diversity-nav/maps" +FILES_${PN} = "${MAP_DIR}/${MAP_FN}" + +PACKAGES = "${PN}" +PACKAGE_ARCH = "all" +PKG_TAGS_${PN} = "group::maps" + +do_install() { + install -d ${D}${MAP_DIR} + cp -f ${WORKDIR}/${MAP_FN} ${D}${MAP_DIR} +} diff --git a/packages/openmoko-projects/diversity-nav_svn.bb b/packages/openmoko-projects/diversity-nav_svn.bb index 8d1af02d3a..9f839c5c5e 100644 --- a/packages/openmoko-projects/diversity-nav_svn.bb +++ b/packages/openmoko-projects/diversity-nav_svn.bb @@ -2,10 +2,10 @@ DESCRIPTION = "Diversity_nav - a GPS location based communicative application" HOMEPAGE = "http://diversity.projects.openmoko.org/" SECTION = "openmoko/applications" LICENSE = "GPL" -DEPENDS = "evas edje ecore edbus ewl" -RDEPENDS_${PN} = "diversity-daemon ewl-themes" +DEPENDS = "evas edje ecore edbus etk" +RDEPENDS_${PN} = "diversity-daemon" PV = "0.0.1+svnr${SRCREV}" -PR = "r3" +PR = "r4" SRC_URI = "svn://svn.projects.openmoko.org/svnroot/diversity/trunk;module=diversity-nav;proto=https" |