eds-dbus: Pull from git, not svn

Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>

7 files changed, 90 insertions, 45 deletions

diff --git a/meta-moblin/conf/distro/include/moblin-fixed-revisions.inc b/meta-moblin/conf/distro/include/moblin-fixed-revisions.inc
index 42996964a4..ca10a17704 100644
--- a/meta-moblin/conf/distro/include/moblin-fixed-revisions.inc
+++ b/meta-moblin/conf/distro/include/moblin-fixed-revisions.inc
@@ -61,6 +61,7 @@ SRCREV_pn-connman-gnome ?= "4e38b3885654ee9256416e985b7fc615d18462b9"
 SRCREV_pn-contacts ?= "c8e6b16222d5bc9d8f60ae6594af4933613a4e25"
 SRCREV_pn-dalston ?= "b4d03283cb8aa2b76014eeb20e78cd13c14012ae"
 SRCREV_pn-dates ?= "966969063535da0786b7483c1bcd427df8a0d87d"
+SRCREV_pn-eds-dbus ?= "ed729af002b935f7ab8542f4177919859dfc22c2"
 SRCREV_pn-gconnman ?= "3d951640146d08249e0219cbae6a4c2da787a878"
 SRCREV_pn-hornsey ?= "39cb0cd0ee3526cba27aeebcc3e28dee6add136a"
 SRCREV_pn-json-glib ?= "7411cadc0fdd9ffc2bd7004c9980913ac857a495"
diff --git a/meta-moblin/conf/distro/include/moblin-floating-revisions.inc b/meta-moblin/conf/distro/include/moblin-floating-revisions.inc
index becdb76fa4..584270316e 100644
--- a/meta-moblin/conf/distro/include/moblin-floating-revisions.inc
+++ b/meta-moblin/conf/distro/include/moblin-floating-revisions.inc
@@ -26,6 +26,7 @@ SRCREV_pn-contacts ?= "${AUTOREV}"
 SRCREV_pn-dalston ?= "${AUTOREV}"
 PREFERRED_VERSION_dalston ?= "0.1.12+git%"
 SRCREV_pn-dates ?= "${AUTOREV}"
+SRCREV_pn-eds-dbus ?= "${AUTOREV}"
 SRCREV_pn-gconnman ?= "${AUTOREV}"
 PREFERRED_VERSION_gupnp-av ?= "0.5.2"
 SRCREV_pn-hornsey ?= "${AUTOREV}"
diff --git a/meta/conf/distro/include/poky-fixed-revisions.inc b/meta/conf/distro/include/poky-fixed-revisions.inc
index b964020384..086e8b5340 100644
--- a/meta/conf/distro/include/poky-fixed-revisions.inc
+++ b/meta/conf/distro/include/poky-fixed-revisions.inc
@@ -41,7 +41,7 @@ SRCREV_pn-connman-gnome ?= "b589f4f89bff20d54682cc6b49efa86feac8adb4"
 SRCREV_pn-dialer ?= "42a2b4dd62cf94dc905caeb087f5e7e9f418bf93"
 SRCREV_pn-eee-acpi-scripts ?= "df785afdacedf869b20fb88a793c13b539819270"
 SRCREV_pn-dbus-wait ?= "402"
-SRCREV_pn-eds-dbus ?= "691"
+SRCREV_pn-eds-dbus ?= "ed729af002b935f7ab8542f4177919859dfc22c2"
 SRCREV_pn-evince ?= "2437"
 SRCREV_pn-exmap-console ?= "405"
 SRCREV_pn-fstests ?= "266"
diff --git a/meta/packages/eds/eds-dbus/no_iconv_test.patch b/meta/packages/eds/eds-dbus/no_iconv_test.patch
deleted file mode 100644
index 4a034b6c58..0000000000
--- a/meta/packages/eds/eds-dbus/no_iconv_test.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Index: trunk/configure.in
-===================================================================
---- trunk.orig/configure.in     2005-09-28 17:34:08.000000000 +0000
-+++ trunk/configure.in  2005-09-28 19:13:22.000000000 +0000
-@@ -254,25 +221,6 @@
- AC_SUBST(ICONV_CFLAGS)
- AC_SUBST(ICONV_LIBS)
- 
--CFLAGS="$CFLAGS -I$srcdir"
--
--AC_MSG_CHECKING(preferred charset formats for system iconv)
--AC_TRY_RUN([
--#define CONFIGURE_IN
--#include "iconv-detect.c"
--],[
--       AC_MSG_RESULT(found)
--],[
--       AC_MSG_RESULT(not found)
--       AC_WARN([
--       *** The iconv-detect program was unable to determine the
--       *** preferred charset formats recognized by your system
--       *** iconv library. It is suggested that you install a
--       *** working iconv library such as the one found at
--       *** ftp://ftp.gnu.org/pub/gnu/libiconv
--       ])
--])
--
- CFLAGS="$save_CFLAGS"
- LIBS="$save_LIBS"
- 
diff --git a/meta/packages/eds/eds-dbus/nossl.patch b/meta/packages/eds/eds-dbus/nossl.patch
new file mode 100644
index 0000000000..30568ff075
--- /dev/null
+++ b/meta/packages/eds/eds-dbus/nossl.patch
@@ -0,0 +1,68 @@
+Index: git/camel/Makefile.am
+===================================================================
+--- git.orig/camel/Makefile.am  2010-02-05 15:25:09.000000000 +0000
++++ git/camel/Makefile.am       2010-02-05 15:25:20.000000000 +0000
+@@ -80,7 +80,6 @@
+        camel-store-summary.c                   \
+        camel-store.c                           \
+        camel-tcp-stream-raw.c                  \
+-       camel-tcp-stream-ssl.c                  \
+        camel-tcp-stream.c                      \
+        camel-transport.c                       \
+        camel-uid-cache.c                       \
+@@ -133,7 +132,6 @@
+        camel-store-summary.h                   \
+        camel-store.h                           \
+        camel-tcp-stream-raw.h                  \
+-       camel-tcp-stream-ssl.h                  \
+        camel-tcp-stream.h                      \
+        camel-transport.h                       \
+        camel-uid-cache.h                       \
+Index: git/camel/camel.h
+===================================================================
+--- git.orig/camel/camel.h      2010-02-05 15:26:30.000000000 +0000
++++ git/camel/camel.h   2010-02-05 15:26:52.000000000 +0000
+@@ -122,7 +122,6 @@
+ #include <camel/camel-string-utils.h>
+ #include <camel/camel-tcp-stream.h>
+ #include <camel/camel-tcp-stream-raw.h>
+-#include <camel/camel-tcp-stream-ssl.h>
+ #include <camel/camel-text-index.h>
+ #include <camel/camel-transport.h>
+ #include <camel/camel-trie.h>
+Index: git/camel/providers/imap/camel-imap-store.c
+===================================================================
+--- git.orig/camel/providers/imap/camel-imap-store.c    2010-02-05 15:28:19.000000000 +0000
++++ git/camel/providers/imap/camel-imap-store.c 2010-02-05 15:28:38.000000000 +0000
+@@ -51,7 +51,6 @@
+ #include "camel/camel-stream.h"
+ #include "camel/camel-string-utils.h"
+ #include "camel/camel-tcp-stream-raw.h"
+-#include "camel/camel-tcp-stream-ssl.h"
+ #include "camel/camel-url.h"
+ #include "camel/camel-utf8.h"
+ 
+Index: git/configure.ac
+===================================================================
+--- git.orig/configure.ac       2010-02-05 15:31:59.000000000 +0000
++++ git/configure.ac    2010-02-05 15:33:00.000000000 +0000
+@@ -1272,7 +1272,8 @@
+ dnl We have fixed all our instances to use <libical/ical.h>. Until the .pc from
+ dnl libical is fixed, we have to work-around the buggy CFlags.
+ dnl *****
+-       LIBICAL_EXTRA_CFLAGS=" -I`$PKG_CONFIG --variable=includedir libical` "
++       m4_pattern_allow([^PKG_CONFIG_SYSROOT_DIR$])
++       LIBICAL_EXTRA_CFLAGS=" -I$PKG_CONFIG_SYSROOT_DIR`$PKG_CONFIG --variable=includedir libical` "
+        LIBICAL_EXTRA_LIBS=""
+        AC_SUBST(LIBICAL_EXTRA_CFLAGS)
+        AC_SUBST(LIBICAL_EXTRA_LIBS)
+Index: git/calendar/libecal/libecal.pc.in
+===================================================================
+--- git.orig/calendar/libecal/libecal.pc.in     2010-02-05 15:39:41.000000000 +0000
++++ git/calendar/libecal/libecal.pc.in  2010-02-05 15:39:55.000000000 +0000
+@@ -12,4 +12,4 @@
+ Version: @VERSION@
+ Requires: libical >= @LIBICAL_REQUIRED@ libedataserver-1.2 dbus-glib-1
+ Libs: -L${libdir} -lecal-1.2
+-Cflags: -I${privincludedir} @LIBICAL_EXTRA_CFLAGS@
++Cflags: -I${privincludedir}
diff --git a/meta/packages/eds/eds-dbus/oh-contact.patch b/meta/packages/eds/eds-dbus/oh-contact.patch
index e5c0f51840..fdd7e4bdfb 100644
--- a/meta/packages/eds/eds-dbus/oh-contact.patch
+++ b/meta/packages/eds/eds-dbus/oh-contact.patch
@@ -1,7 +1,7 @@
 Index: addressbook/libedata-book/ximian-vcard.h
 ===================================================================
---- addressbook/libedata-book/ximian-vcard.h    (revision 578)
-+++ addressbook/libedata-book/ximian-vcard.h    (working copy)
+--- addressbook/libedata-book/ximian-vcard.h.orig       2010-02-05 14:57:14.000000000 +0000
++++ addressbook/libedata-book/ximian-vcard.h    2010-02-05 14:58:14.000000000 +0000
 @@ -1,80 +1,40 @@
  #define XIMIAN_VCARD \
  "BEGIN:VCARD\n" \
@@ -122,10 +122,12 @@ Index: addressbook/libedata-book/ximian-vcard.h
  "END:VCARD"
 Index: addressbook/backends/file/Makefile.am
 ===================================================================
---- addressbook/backends/file/Makefile.am       (revision 578)
-+++ addressbook/backends/file/Makefile.am       (working copy)
-@@ -1,4 +1,5 @@
- INCLUDES =                                             \
+--- addressbook/backends/file/Makefile.am.orig  2010-02-05 14:57:14.000000000 +0000
++++ addressbook/backends/file/Makefile.am       2010-02-05 14:59:10.000000000 +0000
+@@ -2,6 +2,7 @@
+ 
+ libebookbackendfile_la_CPPFLAGS = \
+        $(AM_CPPFLAGS)                                  \
 +       -DCREATE_DEFAULT_VCARD \
         -DG_LOG_DOMAIN=\"libebookbackend\"              \
         -I$(top_srcdir)                                 \
diff --git a/meta/packages/eds/eds-dbus_svn.bb b/meta/packages/eds/eds-dbus_git.bb
index a4c91412cd..cb49630a31 100644
--- a/meta/packages/eds/eds-dbus_svn.bb
+++ b/meta/packages/eds/eds-dbus_git.bb
@@ -1,30 +1,33 @@
 DESCRIPTION = "Evolution database backend server"
-HOMEPAGE = "http://projects.o-hand.com/eds"
 LICENSE = "LGPL"
-DEPENDS = "intltool-native glib-2.0 gtk+ gconf dbus db gnome-common virtual/libiconv zlib libsoup libglade"
+DEPENDS = "intltool-native glib-2.0 gtk+ gconf dbus db gnome-common virtual/libiconv zlib libsoup libglade libical"
 
-PV = "1.4.0+svnr${SRCREV}"
-PR = "r6"
+PV = "2.29+git${SRCPV}"
+PR = "r2"
 
-SRC_URI = "svn://svn.o-hand.com/repos/${PN};module=trunk;proto=http \
+SRC_URI = "git://git.gnome.org/evolution-data-server;protocol=git \
            file://oh-contact.patch;patch=1;pnum=0 \
-           file://no_iconv_test.patch;patch=1 \
+           file://nossl.patch;patch=1 \
            file://iconv-detect.h"
 
-S = "${WORKDIR}/trunk"
+S = "${WORKDIR}/git"
 
 inherit autotools_stage pkgconfig
 
 # -ldb needs this on some platforms
 LDFLAGS += "-lpthread"
 
+do_configure_prepend () {
+        echo "EXTRA_DIST = " > ${S}/gtk-doc.make
+}
+
 do_configure_append () {
         cp ${WORKDIR}/iconv-detect.h ${S}
 }
 
 EXTRA_OECONF = "--without-openldap --with-dbus --without-bug-buddy \
                 --with-soup --with-libdb=${STAGING_DIR_HOST}${prefix} \
-                --disable-smime --disable-nss --disable-nntp --disable-gtk-doc"
+                --disable-smime --disable-ssl --disable-nntp --disable-gtk-doc --without-weather"
 
 
 PACKAGES =+ "libcamel libcamel-dev libebook libebook-dev libecal libecal-dev \