From adbcf06f0b4d970ee5f249d3296d9a39446e2690 Mon Sep 17 00:00:00 2001
From: Michael Lauer <mickey@vanille-media.de>
Date: Mon, 18 Dec 2006 17:16:21 +0000
Subject: eds-dbus: repair build for SRCDATE=20060126 which has been broken by
 previous sync. w/ poky

---
 packages/eds/eds-dbus/disable_orbit.patch                | 13 +++++++++++++
 packages/eds/eds-dbus/no_libedataserverui-20060126.patch | 13 +++++++++++++
 packages/eds/eds-dbus_svn.bb                             |  5 +++--
 3 files changed, 29 insertions(+), 2 deletions(-)
 create mode 100644 packages/eds/eds-dbus/disable_orbit.patch
 create mode 100644 packages/eds/eds-dbus/no_libedataserverui-20060126.patch

(limited to 'packages/eds')

diff --git a/packages/eds/eds-dbus/disable_orbit.patch b/packages/eds/eds-dbus/disable_orbit.patch
new file mode 100644
index 0000000000..8757666e9d
--- /dev/null
+++ b/packages/eds/eds-dbus/disable_orbit.patch
@@ -0,0 +1,13 @@
+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/packages/eds/eds-dbus/no_libedataserverui-20060126.patch b/packages/eds/eds-dbus/no_libedataserverui-20060126.patch
new file mode 100644
index 0000000000..bb6f78d9f7
--- /dev/null
+++ b/packages/eds/eds-dbus/no_libedataserverui-20060126.patch
@@ -0,0 +1,13 @@
+Index: Makefile.am
+===================================================================
+--- trunk/Makefile.am	(revision 306)
++++ trunk/Makefile.am	(working copy)
+@@ -16,7 +16,7 @@
+ 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
+ else
+ SUBDIRS = $(LIBDB) libedataserver servers $(CAMEL_DIR) addressbook $(CALENDAR_DIR) libedataserverui src docs art po
+ endif
diff --git a/packages/eds/eds-dbus_svn.bb b/packages/eds/eds-dbus_svn.bb
index 38a6e0a083..b97ed984bc 100644
--- a/packages/eds/eds-dbus_svn.bb
+++ b/packages/eds/eds-dbus_svn.bb
@@ -8,9 +8,10 @@ PV = "1.4.0+svn${SRCDATE}"
 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://no_libedataserverui-20060126.patch;patch=1;maxdate=20061214 \
+           file://no_libedataserverui.patch;patch=1;mindate=20061215 \
+           file://disable_orbit.patch;patch=1;maxdate=20061214 \
            file://iconv-detect.h"
-
 S = "${WORKDIR}/trunk"
 
 inherit autotools pkgconfig
-- 
cgit v1.2.3