Update eds-dbus to svn as of 20061215, and drop integrated patches.

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@1043 311d38ba-8fff-0310-9ca6-ca027cbcb966

5 files changed, 3 insertions, 30 deletions

diff --git a/meta/conf/distro/poky.conf b/meta/conf/distro/poky.conf
index d1bff56e35..4bd512f60f 100644
--- a/meta/conf/distro/poky.conf
+++ b/meta/conf/distro/poky.conf
@@ -76,7 +76,7 @@ SRCDATE_contacts ?= "20060707"
 SRCDATE_dates ?= "20060721"
 SRCDATE_gtkhtml2 ?= "20060323"
 SRCDATE_web ?= "20060613"
-SRCDATE_eds-dbus ?= "20060707"
+SRCDATE_eds-dbus ?= "20061215"
 SRCDATE_minimo ?= "20050401"
 SRCDATE_ipkg-utils-native ?= "20050930"
 SRCDATE_ipkg-link-1 ?= "20050930"
diff --git a/meta/packages/eds/eds-dbus/disable_orbit.patch b/meta/packages/eds/eds-dbus/disable_orbit.patch
deleted file mode 100644
index 8757666e9d..0000000000
--- a/meta/packages/eds/eds-dbus/disable_orbit.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: trunk/configure.in
-===================================================================
---- trunk.orig/configure.in     2006-01-20 02:08:42.555073776 +0000
-+++ trunk/configure.in  2006-01-20 10:19:13.631870024 +0000
-@@ -1114,7 +1114,7 @@
- AC_MSG_RESULT($with_bug_buddy)
- 
- if test "x${with_dbus}" = "xno"; then
--        AM_PATH_ORBIT2(2.9.8)
-+dnl        AM_PATH_ORBIT2(2.9.8)
- 
-         AC_MSG_CHECKING(for CORBA include paths)
-         IDL_INCLUDES="-I "`pkg-config --variable=idldir libbonobo-2.0`" -I "`pkg-config --variable=idldir bonobo-activation-2.0`
diff --git a/meta/packages/eds/eds-dbus/fix_calendar.patch b/meta/packages/eds/eds-dbus/fix_calendar.patch
deleted file mode 100644
index dab40a822a..0000000000
--- a/meta/packages/eds/eds-dbus/fix_calendar.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- trunk/calendar/libecal-dbus/e-cal.c.old     2006-07-05 12:23:17.000000000 +0100
-+++ trunk/calendar/libecal-dbus/e-cal.c 2006-07-05 12:24:17.000000000 +0100
-@@ -2930,7 +2930,7 @@
-                E_CALENDAR_CHECK_STATUS (E_CALENDAR_STATUS_CORBA_EXCEPTION, error);
-        }
- 
--       if (uid)
-+       if (!uid)
-                E_CALENDAR_CHECK_STATUS (E_CALENDAR_STATUS_OTHER_ERROR, error);
-        else
-                E_CALENDAR_CHECK_STATUS (E_CALENDAR_STATUS_OK, error);
diff --git a/meta/packages/eds/eds-dbus/no_libedataserverui.patch b/meta/packages/eds/eds-dbus/no_libedataserverui.patch
index bb6f78d9f7..766c547a56 100644
--- a/meta/packages/eds/eds-dbus/no_libedataserverui.patch
+++ b/meta/packages/eds/eds-dbus/no_libedataserverui.patch
@@ -6,8 +6,8 @@ Index: Makefile.am
  endif
  
  if ENABLE_DBUS
--SUBDIRS = $(LIBDB) libedataserver $(CAMEL_DIR) addressbook $(CALENDAR_DIR) libedataserverui docs art po
-+SUBDIRS = $(LIBDB) libedataserver $(CAMEL_DIR) addressbook $(CALENDAR_DIR) docs art po
+-SUBDIRS = $(LIBDB) libedataserver camel addressbook $(CALENDAR_DIR) libedataserverui docs art po
++SUBDIRS = $(LIBDB) libedataserver camel addressbook $(CALENDAR_DIR) docs art po
  else
  SUBDIRS = $(LIBDB) libedataserver servers $(CAMEL_DIR) addressbook $(CALENDAR_DIR) libedataserverui src docs art po
  endif
diff --git a/meta/packages/eds/eds-dbus_svn.bb b/meta/packages/eds/eds-dbus_svn.bb
index def7a3094f..9ccb065752 100755
--- a/meta/packages/eds/eds-dbus_svn.bb
+++ b/meta/packages/eds/eds-dbus_svn.bb
@@ -4,14 +4,11 @@ LICENSE = "LGPL"
 DEPENDS = "glib-2.0 gtk+ gconf dbus db gnome-common libglade virtual/libiconv zlib"
 
 PV = "1.4.0+svn${SRCDATE}"
-PR = "r20"
 
 SRC_URI = "svn://svn.o-hand.com/repos/${PN};module=trunk;proto=http \
            file://no_libdb.patch;patch=1 \
            file://no_iconv_test.patch;patch=1 \
            file://no_libedataserverui.patch;patch=1 \
-           file://disable_orbit.patch;patch=1;maxdate=20060126 \
-           file://fix_calendar.patch;patch=1;maxdate=20060619 \
            file://iconv-detect.h"
 
 S = "${WORKDIR}/trunk"