diff options
| author | Koen Kooi <koen@openembedded.org> | 2006-12-16 14:55:04 +0000 |
|---|---|---|
| committer | Koen Kooi <koen@openembedded.org> | 2006-12-16 14:55:04 +0000 |
| commit | b54f9af2030891f28312ea21869168df52dae9ce (patch) | |
| tree | 71b6cc1515878b1c8eae9207e478c173d1b8a6d0 /packages/eds | |
| parent | b29928b022bd34c6c8e902c0b311b4b69e1d36ec (diff) | |
edb-dbus: updates
* sync with poky
* add missing DEPENDS on intltool
* still a bug in the dbus-bindings-tool invocation
Diffstat (limited to 'packages/eds')
| -rw-r--r-- | packages/eds/eds-dbus/disable_orbit.patch | 13 | ||||
| -rw-r--r-- | packages/eds/eds-dbus/no_libedataserverui.patch | 4 | ||||
| -rw-r--r-- | packages/eds/eds-dbus_svn.bb | 7 |
3 files changed, 4 insertions, 20 deletions
diff --git a/packages/eds/eds-dbus/disable_orbit.patch b/packages/eds/eds-dbus/disable_orbit.patch deleted file mode 100644 index 8757666e9d..0000000000 --- a/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/packages/eds/eds-dbus/no_libedataserverui.patch b/packages/eds/eds-dbus/no_libedataserverui.patch index bb6f78d9f7..766c547a56 100644 --- a/packages/eds/eds-dbus/no_libedataserverui.patch +++ b/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/packages/eds/eds-dbus_svn.bb b/packages/eds/eds-dbus_svn.bb index e56b41e595..38a6e0a083 100644 --- a/packages/eds/eds-dbus_svn.bb +++ b/packages/eds/eds-dbus_svn.bb @@ -1,16 +1,14 @@ DESCRIPTION = "Evolution database backend server" HOMEPAGE = "http://projects.o-hand.com/eds" LICENSE = "LGPL" -DEPENDS = "glib-2.0 gtk+ gconf dbus db gnome-common libglade virtual/libiconv zlib" +DEPENDS = "glib-2.0 gtk+ gconf dbus db gnome-common libglade virtual/libiconv zlib intltool" PV = "1.4.0+svn${SRCDATE}" -PR = "r17" 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://iconv-detect.h" S = "${WORKDIR}/trunk" @@ -38,7 +36,6 @@ FILES_${PN}-dev += "${libdir}/evolution-data-server-1.2/extensions/*.la \ do_configure_append = " cp ${WORKDIR}/iconv-detect.h ${S} " do_stage () { - autotools_stage_all + autotools_stage_all } - |