summaryrefslogtreecommitdiffstats
path: root/openembedded/packages/eds
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2005-09-28 22:59:28 +0000
committerRichard Purdie <richard@openedhand.com>2005-09-28 22:59:28 +0000
commit156e5b0e0bcc19f0a5fbeac71c1397d085844cd6 (patch)
tree37eafc2531e7d0c6d08f11d53204e6ed106cebbb /openembedded/packages/eds
parent2c5ba6f6cbe5067532aebea044ec79c6e7a0432b (diff)
downloadpoky-156e5b0e0bcc19f0a5fbeac71c1397d085844cd6.tar.gz
eds: Update so it manages to configure. To do this:
* soup needed to be disabled * an external db was used which required hacking in * some iconv tests were removed - this now causes a compile failure - suggest copying in a rigged iconv-detect.h file for now * it couldn't find the gnome ac macros - added path to acpath * updated depends and rdepends * disable some references to libgnome * disable some references to gnome-vfs git-svn-id: https://svn.o-hand.com/repos/poky@59 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'openembedded/packages/eds')
-rw-r--r--openembedded/packages/eds/eds-dbus/external_libdb.patch94
-rw-r--r--openembedded/packages/eds/eds-dbus/no_iconv_test.patch70
-rw-r--r--openembedded/packages/eds/eds-dbus/no_libgnome.patch45
-rwxr-xr-xopenembedded/packages/eds/eds-dbus_svn.bb12
4 files changed, 218 insertions, 3 deletions
diff --git a/openembedded/packages/eds/eds-dbus/external_libdb.patch b/openembedded/packages/eds/eds-dbus/external_libdb.patch
new file mode 100644
index 0000000000..cb88efbc08
--- /dev/null
+++ b/openembedded/packages/eds/eds-dbus/external_libdb.patch
@@ -0,0 +1,94 @@
1Index: trunk/Makefile.am
2===================================================================
3--- trunk.orig/Makefile.am 2005-09-28 17:12:46.000000000 +0000
4+++ trunk/Makefile.am 2005-09-28 20:01:01.000000000 +0000
5@@ -8,9 +8,9 @@
6 endif
7
8 if ENABLE_DBUS
9-SUBDIRS = libdb libedataserver $(CAMEL_DIR) addressbook calendar docs art po
10+SUBDIRS = libedataserver $(CAMEL_DIR) addressbook calendar docs art po
11 else
12-SUBDIRS = libdb libedataserver servers $(CAMEL_DIR) addressbook calendar libedataserverui src docs art po
13+SUBDIRS = libedataserver servers $(CAMEL_DIR) addressbook calendar libedataserverui src docs art po
14 endif
15
16 DIST_SUBDIRS= libedataserver servers camel ucamel addressbook calendar libedataserverui src docs art po
17@@ -37,12 +37,9 @@
18 intltool-merge.in \
19 intltool-update.in \
20 intltool-extract.in \
21- $(pkgconfig_DATA:-$(API_VERSION).pc=.pc.in) \
22- $(LIBDB_FILES)
23+ $(pkgconfig_DATA:-$(API_VERSION).pc=.pc.in)
24
25 DISTCLEANFILES = intltool-extract intltool-merge intltool-update iconv-detect.h $(pkgconfig_DATA)
26-distclean-local:
27- (cd libdb && $(MAKE) $(AM_MAKEFLAGS) distclean)
28
29 LIBDB_FILES= \
30 libdb/Makefile.am \
31Index: trunk/configure.in
32===================================================================
33--- trunk.orig/configure.in 2005-09-28 17:12:46.000000000 +0000
34+++ trunk/configure.in 2005-09-28 21:45:00.000000000 +0000
35@@ -179,6 +179,21 @@
36 AC_SUBST(REGEX_LIBS)
37
38 dnl ******************************
39+dnl * db-4.3 checking
40+dnl ******************************
41+
42+AC_ARG_WITH(libdb43, [ --with-libdb43 Prefix where libdb 4.3 is installed])
43+case $withval in
44+/*)
45+ DB_CFLAGS="-I$withval/include/db4"
46+ DB_LIBS="-L$withval/lib -ldb-4.3"
47+ ;;
48+esac
49+
50+AC_SUBST(DB_CFLAGS)
51+AC_SUBST(DB_LIBS)
52+
53+dnl ******************************
54 dnl iconv checking
55 dnl ******************************
56 have_iconv=no
57@@ -1316,7 +1331,6 @@
58 export privincludedir
59 export privdatadir
60 AC_CONFIG_SUBDIRS(calendar/libical)
61-AC_CONFIG_SUBDIRS(libdb/dist)
62
63 AC_OUTPUT([
64 Makefile
65@@ -1380,7 +1394,6 @@
66 camel/tests/stream/Makefile
67 camel/camel.pc
68 camel/camel-provider.pc
69-libdb/Makefile
70 libedataserver/Makefile
71 libedataserver/libedataserver.pc
72 libedataserverui/Makefile
73Index: trunk/libedataserver/Makefile.am
74===================================================================
75--- trunk.orig/libedataserver/Makefile.am 2005-09-28 17:07:06.000000000 +0000
76+++ trunk/libedataserver/Makefile.am 2005-09-28 21:41:32.000000000 +0000
77@@ -1,7 +1,7 @@
78 INCLUDES = \
79 -I$(top_srcdir) \
80 -DG_LOG_DOMAIN=\"e-data-server\" \
81- -I$(top_srcdir)/libdb/dist \
82+ $(DB_CFLAGS) \
83 -DE_DATA_SERVER_EXTENSIONDIR=\"$(extensiondir)\" \
84 -DE_DATA_SERVER_IMAGESDIR=\"$(imagesdir)\" \
85 $(E_DATA_SERVER_CFLAGS)
86@@ -48,7 +48,7 @@
87 libedataserver_1_2_la_LIBADD = \
88 $(E_DATA_SERVER_LIBS) \
89 $(ICONV_LIBS) \
90- $(top_builddir)/libdb/dist/libdb-4.1.la \
91+ $(DB_LIBS) \
92 $(SOCKET_LIBS)
93
94 libedataserver_1_2_la_LDFLAGS = \
diff --git a/openembedded/packages/eds/eds-dbus/no_iconv_test.patch b/openembedded/packages/eds/eds-dbus/no_iconv_test.patch
new file mode 100644
index 0000000000..0589bdb887
--- /dev/null
+++ b/openembedded/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 \xE2\x82\xAC";
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-15");
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/openembedded/packages/eds/eds-dbus/no_libgnome.patch b/openembedded/packages/eds/eds-dbus/no_libgnome.patch
new file mode 100644
index 0000000000..a8bae50d03
--- /dev/null
+++ b/openembedded/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/openembedded/packages/eds/eds-dbus_svn.bb b/openembedded/packages/eds/eds-dbus_svn.bb
index bb4782d94a..a087b0493d 100755
--- a/openembedded/packages/eds/eds-dbus_svn.bb
+++ b/openembedded/packages/eds/eds-dbus_svn.bb
@@ -1,13 +1,19 @@
1LICENSE = "LGPL" 1LICENSE = "LGPL"
2DEPENDS = "glib-2.0 gtk+ gconf dbus" 2DEPENDS = "glib-2.0 gtk+ gconf dbus db gnome-common libglade libiconv"
3RDEPENDS = "glib-2.0 gtk+ gconf dbus db libglade libiconv"
3MAINTAINER = "Chris Lord <chris@openedhand.com>" 4MAINTAINER = "Chris Lord <chris@openedhand.com>"
4DESCRIPTION = "Evolution database backend server" 5DESCRIPTION = "Evolution database backend server"
5PV = "1.4.0cvs${CVSDATE}" 6PV = "1.4.0cvs${CVSDATE}"
7PR = "r1"
6 8
7SRC_URI = "svn://svn.o-hand.com/repos/${PN};module=trunk;proto=http" 9SRC_URI = "svn://svn.o-hand.com/repos/${PN};module=trunk;proto=http \
10 file://external_libdb.patch;patch=1 \
11 file://no_libgnome.patch;patch=1 \
12 file://no_iconv_test.patch;patch=1"
8S = "${WORKDIR}/trunk" 13S = "${WORKDIR}/trunk"
9 14
10inherit autotools pkgconfig 15inherit autotools pkgconfig
11 16
12EXTRA_OECONF = "--without-openldap --disable-nntp --disable-gtk-doc --enable-groupwise=no --with-dbus=yes --with-libgnome=no" 17EXTRA_OECONF = "--without-openldap --disable-nntp --disable-gtk-doc --enable-groupwise=no --with-dbus=yes --with-libgnome=no --enable-soup=no --with-libdb43=${STAGING_DIR}/${HOST_SYS}"
13 18
19acpaths = " -I ${STAGING_DATADIR}/aclocal/gnome-macros "
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-06-30 22:19:55 +0000