summaryrefslogtreecommitdiffstats
path: root/meta/packages/eds
diff options
context:
space:
mode:
Diffstat (limited to 'meta/packages/eds')
-rw-r--r--meta/packages/eds/eds-dbus/disable_orbit.patch13
-rw-r--r--meta/packages/eds/eds-dbus/fix_calendar.patch11
-rw-r--r--meta/packages/eds/eds-dbus/iconv-detect.h5
-rw-r--r--meta/packages/eds/eds-dbus/no_iconv_test.patch70
-rw-r--r--meta/packages/eds/eds-dbus/no_libdb.patch14
-rw-r--r--meta/packages/eds/eds-dbus/no_libedataserverui.patch13
-rw-r--r--meta/packages/eds/eds-dbus/no_libgnome.patch45
-rwxr-xr-xmeta/packages/eds/eds-dbus_svn.bb40
8 files changed, 211 insertions, 0 deletions
diff --git a/meta/packages/eds/eds-dbus/disable_orbit.patch b/meta/packages/eds/eds-dbus/disable_orbit.patch
new file mode 100644
index 0000000000..8757666e9d
--- /dev/null
+++ b/meta/packages/eds/eds-dbus/disable_orbit.patch
@@ -0,0 +1,13 @@
1Index: trunk/configure.in
2===================================================================
3--- trunk.orig/configure.in 2006-01-20 02:08:42.555073776 +0000
4+++ trunk/configure.in 2006-01-20 10:19:13.631870024 +0000
5@@ -1114,7 +1114,7 @@
6 AC_MSG_RESULT($with_bug_buddy)
7
8 if test "x${with_dbus}" = "xno"; then
9- AM_PATH_ORBIT2(2.9.8)
10+dnl AM_PATH_ORBIT2(2.9.8)
11
12 AC_MSG_CHECKING(for CORBA include paths)
13 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
new file mode 100644
index 0000000000..dab40a822a
--- /dev/null
+++ b/meta/packages/eds/eds-dbus/fix_calendar.patch
@@ -0,0 +1,11 @@
1--- trunk/calendar/libecal-dbus/e-cal.c.old 2006-07-05 12:23:17.000000000 +0100
2+++ trunk/calendar/libecal-dbus/e-cal.c 2006-07-05 12:24:17.000000000 +0100
3@@ -2930,7 +2930,7 @@
4 E_CALENDAR_CHECK_STATUS (E_CALENDAR_STATUS_CORBA_EXCEPTION, error);
5 }
6
7- if (uid)
8+ if (!uid)
9 E_CALENDAR_CHECK_STATUS (E_CALENDAR_STATUS_OTHER_ERROR, error);
10 else
11 E_CALENDAR_CHECK_STATUS (E_CALENDAR_STATUS_OK, error);
diff --git a/meta/packages/eds/eds-dbus/iconv-detect.h b/meta/packages/eds/eds-dbus/iconv-detect.h
new file mode 100644
index 0000000000..46f476d5bc
--- /dev/null
+++ b/meta/packages/eds/eds-dbus/iconv-detect.h
@@ -0,0 +1,5 @@
1/* This is an auto-generated header, DO NOT EDIT! */
2
3#define ICONV_ISO_D_FORMAT "iso-%d-%d"
4#define ICONV_ISO_S_FORMAT "iso-%d-%s"
5#define ICONV_10646 "iso-10646"
diff --git a/meta/packages/eds/eds-dbus/no_iconv_test.patch b/meta/packages/eds/eds-dbus/no_iconv_test.patch
new file mode 100644
index 0000000000..6e33c7889e
--- /dev/null
+++ b/meta/packages/eds/eds-dbus/no_iconv_test.patch
@@ -0,0 +1,70 @@
1Index: trunk/configure.in
2===================================================================
3--- trunk.orig/configure.in 2005-09-28 17:34:08.000000000 +0000
4+++ trunk/configure.in 2005-09-28 19:13:22.000000000 +0000
5@@ -213,39 +213,6 @@
6 if test $ac_cv_libiconv = no; then
7 AC_CHECK_FUNCS(gnu_get_libc_version)
8 fi
9- AC_CACHE_CHECK([if iconv() handles UTF-8], ac_cv_libiconv_utf8, AC_TRY_RUN([
10-#include <iconv.h>
11-#include <stdlib.h>
12-#include <string.h>
13-#ifdef HAVE_GNU_GET_LIBC_VERSION
14-#include <gnu/libc-version.h>
15-#endif
16-
17-int main (int argc, char **argv)
18-{
19- const char *from = "Some Text \xA4";
20- const char *utf8 = "Some Text \xC2\xA4";
21- char *transbuf = malloc (20), *trans = transbuf;
22- iconv_t cd;
23- size_t from_len = strlen (from), utf8_len = 20;
24- size_t utf8_real_len = strlen (utf8);
25-
26-#ifdef HAVE_GNU_GET_LIBC_VERSION
27- /* glibc 2.1.2's iconv is broken in hard to test ways. */
28- if (!strcmp (gnu_get_libc_version (), "2.1.2"))
29- exit (1);
30-#endif
31-
32- cd = iconv_open ("UTF-8", "ISO_8859-1");
33- if (cd == (iconv_t) -1)
34- exit (1);
35- if (iconv (cd, &from, &from_len, &trans, &utf8_len) == -1 || from_len != 0)
36- exit (1);
37- if (memcmp (utf8, transbuf, utf8_real_len) != 0)
38- exit (1);
39-
40- exit (0);
41-}], ac_cv_libiconv_utf8=yes, [ac_cv_libiconv_utf8=no; have_iconv=no], [ac_cv_libiconv_utf8=no; have_iconv=no]))
42 fi
43
44 if test "$have_iconv" = no; then
45@@ -254,25 +221,6 @@
46 AC_SUBST(ICONV_CFLAGS)
47 AC_SUBST(ICONV_LIBS)
48
49-CFLAGS="$CFLAGS -I$srcdir"
50-
51-AC_MSG_CHECKING(preferred charset formats for system iconv)
52-AC_TRY_RUN([
53-#define CONFIGURE_IN
54-#include "iconv-detect.c"
55-],[
56- AC_MSG_RESULT(found)
57-],[
58- AC_MSG_RESULT(not found)
59- AC_WARN([
60- *** The iconv-detect program was unable to determine the
61- *** preferred charset formats recognized by your system
62- *** iconv library. It is suggested that you install a
63- *** working iconv library such as the one found at
64- *** ftp://ftp.gnu.org/pub/gnu/libiconv
65- ])
66-])
67-
68 CFLAGS="$save_CFLAGS"
69 LIBS="$save_LIBS"
70
diff --git a/meta/packages/eds/eds-dbus/no_libdb.patch b/meta/packages/eds/eds-dbus/no_libdb.patch
new file mode 100644
index 0000000000..ae9a66deac
--- /dev/null
+++ b/meta/packages/eds/eds-dbus/no_libdb.patch
@@ -0,0 +1,14 @@
1Index: configure.in
2===================================================================
3--- trunk/configure.in (revision 306)
4+++ trunk/configure.in (working copy)
5@@ -1353,9 +1353,6 @@
6 if test $enable_calendar = yes; then
7 AC_CONFIG_SUBDIRS(calendar/libical)
8 fi
9-if test $dynamic_libdb = no; then
10- AC_CONFIG_SUBDIRS(libdb/dist)
11-fi
12
13 AC_OUTPUT([
14 Makefile
diff --git a/meta/packages/eds/eds-dbus/no_libedataserverui.patch b/meta/packages/eds/eds-dbus/no_libedataserverui.patch
new file mode 100644
index 0000000000..bb6f78d9f7
--- /dev/null
+++ b/meta/packages/eds/eds-dbus/no_libedataserverui.patch
@@ -0,0 +1,13 @@
1Index: Makefile.am
2===================================================================
3--- trunk/Makefile.am (revision 306)
4+++ trunk/Makefile.am (working copy)
5@@ -16,7 +16,7 @@
6 endif
7
8 if ENABLE_DBUS
9-SUBDIRS = $(LIBDB) libedataserver $(CAMEL_DIR) addressbook $(CALENDAR_DIR) libedataserverui docs art po
10+SUBDIRS = $(LIBDB) libedataserver $(CAMEL_DIR) addressbook $(CALENDAR_DIR) docs art po
11 else
12 SUBDIRS = $(LIBDB) libedataserver servers $(CAMEL_DIR) addressbook $(CALENDAR_DIR) libedataserverui src docs art po
13 endif
diff --git a/meta/packages/eds/eds-dbus/no_libgnome.patch b/meta/packages/eds/eds-dbus/no_libgnome.patch
new file mode 100644
index 0000000000..a8bae50d03
--- /dev/null
+++ b/meta/packages/eds/eds-dbus/no_libgnome.patch
@@ -0,0 +1,45 @@
1Index: trunk/configure.in
2===================================================================
3--- trunk.orig/configure.in 2005-09-28 20:01:02.000000000 +0000
4+++ trunk/configure.in 2005-09-28 21:02:35.000000000 +0000
5@@ -1120,7 +1120,12 @@
6 AC_SUBST(E_DATA_SERVER_CFLAGS)
7 AC_SUBST(E_DATA_SERVER_LIBS)
8
9-E_DATA_SERVER_UI_DEPS="gtk+-2.0 libglade-2.0 gconf-2.0 libgnome-2.0"
10+if test "x${with_libgnome}" != "xno"; then
11+ E_DATA_SERVER_UI_DEPS="gtk+-2.0 libglade-2.0 gconf-2.0 libgnome-2.0"
12+else
13+ E_DATA_SERVER_UI_DEPS="gtk+-2.0 libglade-2.0 gconf-2.0"
14+fi
15+
16
17 EVO_SET_COMPILE_FLAGS(E_DATA_SERVER_UI, $E_DATA_SERVER_UI_DEPS, $THREADS_CFLAGS, $THREADS_LIBS)
18 AC_SUBST(E_DATA_SERVER_UI_CFLAGS)
19@@ -1128,7 +1133,7 @@
20
21 dnl --- evolution-addressbook flags
22
23-EVOLUTION_ADDRESSBOOK_DEPS="libxml-2.0 gobject-2.0 gconf-2.0 $IPC_DEPS gnome-vfs-2.0 "
24+EVOLUTION_ADDRESSBOOK_DEPS="libxml-2.0 gobject-2.0 gconf-2.0 $IPC_DEPS "
25
26 EVO_SET_COMPILE_FLAGS(EVOLUTION_ADDRESSBOOK, $EVOLUTION_ADDRESSBOOK_DEPS)
27 AC_SUBST(EVOLUTION_ADDRESSBOOK_CFLAGS)
28@@ -1136,7 +1141,7 @@
29
30 dnl --- evolution-calendar flags
31
32-EVOLUTION_CALENDAR_DEPS="libxml-2.0 gobject-2.0 gconf-2.0 gnome-vfs-2.0 dbus-glib-1"
33+EVOLUTION_CALENDAR_DEPS="libxml-2.0 gobject-2.0 gconf-2.0 dbus-glib-1"
34
35 EVO_SET_COMPILE_FLAGS(EVOLUTION_CALENDAR, $EVOLUTION_CALENDAR_DEPS)
36 AC_SUBST(EVOLUTION_CALENDAR_CFLAGS)
37@@ -1145,7 +1150,7 @@
38 if test "x${with_dbus}" = "xno"; then
39 dnl --- factory flags
40
41- E_FACTORY_DEPS="gobject-2.0 >= $GLIB_REQUIRED $IPC_DEPS gconf-2.0 gnome-vfs-2.0 libgnome-2.0 $mozilla_nspr"
42+ E_FACTORY_DEPS="gobject-2.0 >= $GLIB_REQUIRED $IPC_DEPS gconf-2.0 $mozilla_nspr"
43
44 EVO_SET_COMPILE_FLAGS(E_FACTORY, $E_FACTORY_DEPS, $THREADS_CFLAGS $MANUAL_NSPR_CFLAGS, $THREADS_LIBS $MANUAL_NSPR_LIBS)
45 AC_SUBST(E_FACTORY_CFLAGS)
diff --git a/meta/packages/eds/eds-dbus_svn.bb b/meta/packages/eds/eds-dbus_svn.bb
new file mode 100755
index 0000000000..6a6162da83
--- /dev/null
+++ b/meta/packages/eds/eds-dbus_svn.bb
@@ -0,0 +1,40 @@
1LICENSE = "LGPL"
2DEPENDS = "glib-2.0 gtk+ gconf dbus db gnome-common libglade virtual/libiconv"
3MAINTAINER = "Chris Lord <chris@openedhand.com>"
4DESCRIPTION = "Evolution database backend server"
5PV = "1.4.0+svn${SRCDATE}"
6PR = "r19"
7
8SRC_URI = "svn://svn.o-hand.com/repos/${PN};module=trunk;proto=http \
9 file://no_libdb.patch;patch=1 \
10 file://no_iconv_test.patch;patch=1 \
11 file://no_libedataserverui.patch;patch=1 \
12 file://disable_orbit.patch;patch=1;maxdate=20060126 \
13 file://fix_calendar.patch;patch=1;maxdate=20060619 \
14 file://iconv-detect.h"
15
16S = "${WORKDIR}/trunk"
17
18inherit autotools pkgconfig
19
20EXTRA_OECONF = "--without-openldap --with-dbus --without-bug-buddy --without-soup --with-libdb=${STAGING_DIR}/${HOST_SYS} --disable-smime --disable-nss --disable-nntp --disable-gtk-doc"
21
22acpaths = " -I ${STAGING_DATADIR}/aclocal/gnome-macros "
23
24FILES_${PN} += "${libdir}/evolution-data-server-1.2/extensions/*.so \
25 ${libdir}/evolution-data-server-1.2/camel-providers/*.so \
26 ${libdir}/evolution-data-server-1.2/camel-providers/*.urls \
27 ${datadir}/evolution-data-server-1.4/zoneinfo/zones.tab \
28 ${datadir}/evolution-data-server-1.4/zoneinfo/*/*.ics \
29 ${datadir}/evolution-data-server-1.4/zoneinfo/*/*/*.ics \
30 ${datadir}/dbus-1/services/*.service"
31FILES_${PN}-dev += "${libdir}/evolution-data-server-1.2/extensions/*.la \
32 ${libdir}/evolution-data-server-1.2/camel-providers/*.la"
33
34
35do_configure_append = " cp ${WORKDIR}/iconv-detect.h ${S} "
36
37do_stage () {
38 autotools_stage_all
39}
40