merge of 095485c13d43cfd2d416d2dd5827fd20d2f21c51

     and f0f7c07492861973e86b3e409efdcb411a4fd09e

5 files changed, 37 insertions, 8 deletions

diff --git a/packages/gnome/gnome-vfs-dbus/werror_compile.patch b/packages/gnome/gnome-vfs-dbus/werror_compile.patch
new file mode 100644
index 0000000000..f2eba7d712
--- /dev/null
+++ b/packages/gnome/gnome-vfs-dbus/werror_compile.patch
@@ -0,0 +1,11 @@
+--- gnome-vfs-dbus-2.8.4.4/configure.in.old	2006-01-26 11:56:09.000000000 +0100
++++ gnome-vfs-dbus-2.8.4.4/configure.in	2006-01-26 11:45:02.000000000 +0100
+@@ -279,7 +279,7 @@
+ 
+ if test "$GCC" = "yes" -a "$set_more_warnings" != "no"; then
+ 	echo "enable compile warnings = $set_more_warnings"
+-	VFS_CFLAGS="-Wall -Werror \
++	VFS_CFLAGS="-Wall \
+ 	-Wchar-subscripts -Wmissing-declarations -Wmissing-prototypes \
+ 	-Wnested-externs -Wpointer-arith"
+ 
diff --git a/packages/gnome/gnome-vfs-dbus_svn.bb b/packages/gnome/gnome-vfs-dbus_svn.bb
index 604da1168c..466d52adbe 100644
--- a/packages/gnome/gnome-vfs-dbus_svn.bb
+++ b/packages/gnome/gnome-vfs-dbus_svn.bb
@@ -1,6 +1,6 @@
 LICENSE = "GPL"
 SECTION = "x11/gnome"
-PR = "r0"
+PR = "r1"
 PROVIDES = "gnome-vfs"
 RPROVIDES = "gnome-vfs"
 
@@ -17,9 +17,8 @@ SRC_URI = "svn://developer.imendio.com/svn/gnome-vfs-dbus;module=trunk;proto=htt
            file://gconftool-lossage.patch;patch=1;pnum=1 \
            file://glib-after-nameser.patch;patch=1;pnum=1 \
 	   file://gtk-doc.m4 \
-	   file://gtk-doc.make"
-# Missing patch
-#	   file://werror_compile.patch;patch=1;pnum=1
+	   file://gtk-doc.make \
+	   file://werror_compile.patch;patch=1;pnum=1"
 
 EXTRA_OECONF = "--with-ipc=dbus --disable-gtk-doc"
 S = "${WORKDIR}/trunk"
diff --git a/packages/gpe-calendar/gpe-calendar_cvs.bb b/packages/gpe-calendar/gpe-calendar_cvs.bb
index 09164f88cf..a891431ffb 100644
--- a/packages/gpe-calendar/gpe-calendar_cvs.bb
+++ b/packages/gpe-calendar/gpe-calendar_cvs.bb
@@ -2,8 +2,8 @@ LICENSE = "GPL"
 DEFAULT_PREFERENCE = "-1"
 
 S = "${WORKDIR}/${PN}"
-PV = "0.67+cvs${SRCDATE}"
-PR = "r0"
+PV = "0.72+cvs${SRCDATE}"
+PR = "r1"
 
 inherit autotools gpe
 
diff --git a/packages/gpe-filemanager/gpe-filemanager_0.25.bb b/packages/gpe-filemanager/gpe-filemanager_0.25.bb
index 2beee83596..898ff6002b 100644
--- a/packages/gpe-filemanager/gpe-filemanager_0.25.bb
+++ b/packages/gpe-filemanager/gpe-filemanager_0.25.bb
@@ -1,12 +1,12 @@
 
 inherit gpe
 
-PR          = "r0"
+PR          = "r1"
 LICENSE     = "GPL"
 DESCRIPTION = "GPE file manager"
 DEPENDS     = "libgpewidget gnome-vfs dbus"
 SECTION     = "gpe"
 RDEPENDS    = "gpe-icons"
-RRECOMMENDS = "gnome-vfs-plugin-file"
+RRECOMMENDS = "gnome-vfs-plugin-file gnome-vfs-plugin-smb gnome-vfs-plugin-ftp gnome-vfs-plugin-computer gnome-vfs-plugin-network gnome-vfs-plugin-sftp gnome-vfs-plugin-http"
 
 FILES_${PN} += " ${datadir}/gpe"
diff --git a/packages/libeventdb/libeventdb_cvs.bb b/packages/libeventdb/libeventdb_cvs.bb
new file mode 100644
index 0000000000..83f938ff62
--- /dev/null
+++ b/packages/libeventdb/libeventdb_cvs.bb
@@ -0,0 +1,19 @@
+LICENSE     = "LGPL"
+DESCRIPTION = "Database access library for GPE calendar"
+SECTION  = "gpe/libs"
+PRIORITY = "optional"
+DEPENDS  = "libgpewidget libgpepimc sqlite"
+MAINTAINER  = "Florian Boor <florian.boor@kernelconcepts.de>"
+PV = "0.21+cvs${SRCDATE}"
+PR = "r0"
+DEFAULT_PREFERENCE = "-1"
+
+inherit pkgconfig gpe autotools
+
+SRC_URI = "${HANDHELDS_CVS};module=gpe/base/${PN}"
+
+S = ${WORKDIR}/${PN}
+
+do_stage () {
+autotools_stage_all
+}