[oe-commits] org.oe.dev eds-dbus: repair build for SRCDATE=20060126 which has been broken by previous sync. w/ poky

[mickeyl commit]

eds-dbus: repair build for SRCDATE=20060126 which has been broken by previous sync. w/ poky

Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: 9d4c63819084cf385a16232369e7d698fcb6dd87
ViewMTN: http://monotone.openembedded.org/revision.psp?id=9d4c63819084cf385a16232369e7d698fcb6dd87
Files:
1
packages/eds/eds-dbus/disable_orbit.patch
packages/eds/eds-dbus/no_libedataserverui-20060126.patch
packages/eds/eds-dbus_svn.bb
Diffs:

#
# mt diff -r8bee8c12a8f566036b80dc740f5215782a19eb8b -r9d4c63819084cf385a16232369e7d698fcb6dd87
#
# 
# 
# add_file "packages/eds/eds-dbus/disable_orbit.patch"
#  content [8de611085997c19281e98d2e5cf51a3be547c572]
# 
# add_file "packages/eds/eds-dbus/no_libedataserverui-20060126.patch"
#  content [fa216724a2551f569999836589d7cd5f3016df53]
# 
# patch "packages/eds/eds-dbus_svn.bb"
#  from [9310129686ac85ea3469227794e173029fce2683]
#    to [dc328d55168bdac4ed39e13ea7adeaad4bb2cd61]
# 
============================================================
--- packages/eds/eds-dbus/disable_orbit.patch	8de611085997c19281e98d2e5cf51a3be547c572
+++ packages/eds/eds-dbus/disable_orbit.patch	8de611085997c19281e98d2e5cf51a3be547c572
@@ -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`
============================================================
--- packages/eds/eds-dbus/no_libedataserverui-20060126.patch	fa216724a2551f569999836589d7cd5f3016df53
+++ packages/eds/eds-dbus/no_libedataserverui-20060126.patch	fa216724a2551f569999836589d7cd5f3016df53
@@ -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
============================================================
--- packages/eds/eds-dbus_svn.bb	9310129686ac85ea3469227794e173029fce2683
+++ packages/eds/eds-dbus_svn.bb	dc328d55168bdac4ed39e13ea7adeaad4bb2cd61
@@ -8,9 +8,10 @@ SRC_URI = "svn://svn.o-hand.com/repos/${
 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