summaryrefslogtreecommitdiff
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)
downloadopenembedded-core-156e5b0e0bcc19f0a5fbeac71c1397d085844cd6.tar.gz
openembedded-core-156e5b0e0bcc19f0a5fbeac71c1397d085844cd6.tar.bz2
openembedded-core-156e5b0e0bcc19f0a5fbeac71c1397d085844cd6.tar.xz
openembedded-core-156e5b0e0bcc19f0a5fbeac71c1397d085844cd6.zip
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 000000000..cb88efbc0
--- /dev/null
+++ b/openembedded/packages/eds/eds-dbus/external_libdb.patch
@@ -0,0 +1,94 @@
+Index: trunk/Makefile.am
+===================================================================
+--- trunk.orig/Makefile.am 2005-09-28 17:12:46.000000000 +0000
++++ trunk/Makefile.am 2005-09-28 20:01:01.000000000 +0000
+@@ -8,9 +8,9 @@
+ endif
+
+ if ENABLE_DBUS
+-SUBDIRS = libdb libedataserver $(CAMEL_DIR) addressbook calendar docs art po
++SUBDIRS = libedataserver $(CAMEL_DIR) addressbook calendar docs art po
+ else
+-SUBDIRS = libdb libedataserver servers $(CAMEL_DIR) addressbook calendar libedataserverui src docs art po
++SUBDIRS = libedataserver servers $(CAMEL_DIR) addressbook calendar libedataserverui src docs art po
+ endif
+
+ DIST_SUBDIRS= libedataserver servers camel ucamel addressbook calendar libedataserverui src docs art po
+@@ -37,12 +37,9 @@
+ intltool-merge.in \
+ intltool-update.in \
+ intltool-extract.in \
+- $(pkgconfig_DATA:-$(API_VERSION).pc=.pc.in) \
+- $(LIBDB_FILES)
++ $(pkgconfig_DATA:-$(API_VERSION).pc=.pc.in)
+
+ DISTCLEANFILES = intltool-extract intltool-merge intltool-update iconv-detect.h $(pkgconfig_DATA)
+-distclean-local:
+- (cd libdb && $(MAKE) $(AM_MAKEFLAGS) distclean)
+
+ LIBDB_FILES= \
+ libdb/Makefile.am \
+Index: trunk/configure.in
+===================================================================
+--- trunk.orig/configure.in 2005-09-28 17:12:46.000000000 +0000
++++ trunk/configure.in 2005-09-28 21:45:00.000000000 +0000
+@@ -179,6 +179,21 @@
+ AC_SUBST(REGEX_LIBS)
+
+ dnl ******************************
++dnl * db-4.3 checking
++dnl ******************************
++
++AC_ARG_WITH(libdb43, [ --with-libdb43 Prefix where libdb 4.3 is installed])
++case $withval in
++/*)
++ DB_CFLAGS="-I$withval/include/db4"
++ DB_LIBS="-L$withval/lib -ldb-4.3"
++ ;;
++esac
++
++AC_SUBST(DB_CFLAGS)
++AC_SUBST(DB_LIBS)
++
++dnl ******************************
+ dnl iconv checking
+ dnl ******************************
+ have_iconv=no
+@@ -1316,7 +1331,6 @@
+ export privincludedir
+ export privdatadir
+ AC_CONFIG_SUBDIRS(calendar/libical)
+-AC_CONFIG_SUBDIRS(libdb/dist)
+
+ AC_OUTPUT([
+ Makefile
+@@ -1380,7 +1394,6 @@
+ camel/tests/stream/Makefile
+ camel/camel.pc
+ camel/camel-provider.pc
+-libdb/Makefile
+ libedataserver/Makefile
+ libedataserver/libedataserver.pc
+ libedataserverui/Makefile
+Index: trunk/libedataserver/Makefile.am
+===================================================================
+--- trunk.orig/libedataserver/Makefile.am 2005-09-28 17:07:06.000000000 +0000
++++ trunk/libedataserver/Makefile.am 2005-09-28 21:41:32.000000000 +0000
+@@ -1,7 +1,7 @@
+ INCLUDES = \
+ -I$(top_srcdir) \
+ -DG_LOG_DOMAIN=\"e-data-server\" \
+- -I$(top_srcdir)/libdb/dist \
++ $(DB_CFLAGS) \
+ -DE_DATA_SERVER_EXTENSIONDIR=\"$(extensiondir)\" \
+ -DE_DATA_SERVER_IMAGESDIR=\"$(imagesdir)\" \
+ $(E_DATA_SERVER_CFLAGS)
+@@ -48,7 +48,7 @@
+ libedataserver_1_2_la_LIBADD = \
+ $(E_DATA_SERVER_LIBS) \
+ $(ICONV_LIBS) \
+- $(top_builddir)/libdb/dist/libdb-4.1.la \
++ $(DB_LIBS) \
+ $(SOCKET_LIBS)
+
+ 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 000000000..0589bdb88
--- /dev/null
+++ b/openembedded/packages/eds/eds-dbus/no_iconv_test.patch
@@ -0,0 +1,70 @@
+Index: trunk/configure.in
+===================================================================
+--- trunk.orig/configure.in 2005-09-28 17:34:08.000000000 +0000
++++ trunk/configure.in 2005-09-28 19:13:22.000000000 +0000
+@@ -213,39 +213,6 @@
+ if test $ac_cv_libiconv = no; then
+ AC_CHECK_FUNCS(gnu_get_libc_version)
+ fi
+- AC_CACHE_CHECK([if iconv() handles UTF-8], ac_cv_libiconv_utf8, AC_TRY_RUN([
+-#include <iconv.h>
+-#include <stdlib.h>
+-#include <string.h>
+-#ifdef HAVE_GNU_GET_LIBC_VERSION
+-#include <gnu/libc-version.h>
+-#endif
+-
+-int main (int argc, char **argv)
+-{
+- const char *from = "Some Text \xA4";
+- const char *utf8 = "Some Text \xE2\x82\xAC";
+- char *transbuf = malloc (20), *trans = transbuf;
+- iconv_t cd;
+- size_t from_len = strlen (from), utf8_len = 20;
+- size_t utf8_real_len = strlen (utf8);
+-
+-#ifdef HAVE_GNU_GET_LIBC_VERSION
+- /* glibc 2.1.2's iconv is broken in hard to test ways. */
+- if (!strcmp (gnu_get_libc_version (), "2.1.2"))
+- exit (1);
+-#endif
+-
+- cd = iconv_open ("UTF-8", "ISO_8859-15");
+- if (cd == (iconv_t) -1)
+- exit (1);
+- if (iconv (cd, &from, &from_len, &trans, &utf8_len) == -1 || from_len != 0)
+- exit (1);
+- if (memcmp (utf8, transbuf, utf8_real_len) != 0)
+- exit (1);
+-
+- exit (0);
+-}], ac_cv_libiconv_utf8=yes, [ac_cv_libiconv_utf8=no; have_iconv=no], [ac_cv_libiconv_utf8=no; have_iconv=no]))
+ fi
+
+ if test "$have_iconv" = no; then
+@@ -254,25 +221,6 @@
+ AC_SUBST(ICONV_CFLAGS)
+ AC_SUBST(ICONV_LIBS)
+
+-CFLAGS="$CFLAGS -I$srcdir"
+-
+-AC_MSG_CHECKING(preferred charset formats for system iconv)
+-AC_TRY_RUN([
+-#define CONFIGURE_IN
+-#include "iconv-detect.c"
+-],[
+- AC_MSG_RESULT(found)
+-],[
+- AC_MSG_RESULT(not found)
+- AC_WARN([
+- *** The iconv-detect program was unable to determine the
+- *** preferred charset formats recognized by your system
+- *** iconv library. It is suggested that you install a
+- *** working iconv library such as the one found at
+- *** ftp://ftp.gnu.org/pub/gnu/libiconv
+- ])
+-])
+-
+ CFLAGS="$save_CFLAGS"
+ LIBS="$save_LIBS"
+
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 000000000..a8bae50d0
--- /dev/null
+++ b/openembedded/packages/eds/eds-dbus/no_libgnome.patch
@@ -0,0 +1,45 @@
+Index: trunk/configure.in
+===================================================================
+--- trunk.orig/configure.in 2005-09-28 20:01:02.000000000 +0000
++++ trunk/configure.in 2005-09-28 21:02:35.000000000 +0000
+@@ -1120,7 +1120,12 @@
+ AC_SUBST(E_DATA_SERVER_CFLAGS)
+ AC_SUBST(E_DATA_SERVER_LIBS)
+
+-E_DATA_SERVER_UI_DEPS="gtk+-2.0 libglade-2.0 gconf-2.0 libgnome-2.0"
++if test "x${with_libgnome}" != "xno"; then
++ E_DATA_SERVER_UI_DEPS="gtk+-2.0 libglade-2.0 gconf-2.0 libgnome-2.0"
++else
++ E_DATA_SERVER_UI_DEPS="gtk+-2.0 libglade-2.0 gconf-2.0"
++fi
++
+
+ EVO_SET_COMPILE_FLAGS(E_DATA_SERVER_UI, $E_DATA_SERVER_UI_DEPS, $THREADS_CFLAGS, $THREADS_LIBS)
+ AC_SUBST(E_DATA_SERVER_UI_CFLAGS)
+@@ -1128,7 +1133,7 @@
+
+ dnl --- evolution-addressbook flags
+
+-EVOLUTION_ADDRESSBOOK_DEPS="libxml-2.0 gobject-2.0 gconf-2.0 $IPC_DEPS gnome-vfs-2.0 "
++EVOLUTION_ADDRESSBOOK_DEPS="libxml-2.0 gobject-2.0 gconf-2.0 $IPC_DEPS "
+
+ EVO_SET_COMPILE_FLAGS(EVOLUTION_ADDRESSBOOK, $EVOLUTION_ADDRESSBOOK_DEPS)
+ AC_SUBST(EVOLUTION_ADDRESSBOOK_CFLAGS)
+@@ -1136,7 +1141,7 @@
+
+ dnl --- evolution-calendar flags
+
+-EVOLUTION_CALENDAR_DEPS="libxml-2.0 gobject-2.0 gconf-2.0 gnome-vfs-2.0 dbus-glib-1"
++EVOLUTION_CALENDAR_DEPS="libxml-2.0 gobject-2.0 gconf-2.0 dbus-glib-1"
+
+ EVO_SET_COMPILE_FLAGS(EVOLUTION_CALENDAR, $EVOLUTION_CALENDAR_DEPS)
+ AC_SUBST(EVOLUTION_CALENDAR_CFLAGS)
+@@ -1145,7 +1150,7 @@
+ if test "x${with_dbus}" = "xno"; then
+ dnl --- factory flags
+
+- E_FACTORY_DEPS="gobject-2.0 >= $GLIB_REQUIRED $IPC_DEPS gconf-2.0 gnome-vfs-2.0 libgnome-2.0 $mozilla_nspr"
++ E_FACTORY_DEPS="gobject-2.0 >= $GLIB_REQUIRED $IPC_DEPS gconf-2.0 $mozilla_nspr"
+
+ EVO_SET_COMPILE_FLAGS(E_FACTORY, $E_FACTORY_DEPS, $THREADS_CFLAGS $MANUAL_NSPR_CFLAGS, $THREADS_LIBS $MANUAL_NSPR_LIBS)
+ AC_SUBST(E_FACTORY_CFLAGS)
diff --git a/openembedded/packages/eds/eds-dbus_svn.bb b/openembedded/packages/eds/eds-dbus_svn.bb
index bb4782d94..a087b0493 100755
--- a/openembedded/packages/eds/eds-dbus_svn.bb
+++ b/openembedded/packages/eds/eds-dbus_svn.bb
@@ -1,13 +1,19 @@
LICENSE = "LGPL"
-DEPENDS = "glib-2.0 gtk+ gconf dbus"
+DEPENDS = "glib-2.0 gtk+ gconf dbus db gnome-common libglade libiconv"
+RDEPENDS = "glib-2.0 gtk+ gconf dbus db libglade libiconv"
MAINTAINER = "Chris Lord <chris@openedhand.com>"
DESCRIPTION = "Evolution database backend server"
PV = "1.4.0cvs${CVSDATE}"
+PR = "r1"
-SRC_URI = "svn://svn.o-hand.com/repos/${PN};module=trunk;proto=http"
+SRC_URI = "svn://svn.o-hand.com/repos/${PN};module=trunk;proto=http \
+ file://external_libdb.patch;patch=1 \
+ file://no_libgnome.patch;patch=1 \
+ file://no_iconv_test.patch;patch=1"
S = "${WORKDIR}/trunk"
inherit autotools pkgconfig
-EXTRA_OECONF = "--without-openldap --disable-nntp --disable-gtk-doc --enable-groupwise=no --with-dbus=yes --with-libgnome=no"
+EXTRA_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}"
+acpaths = " -I ${STAGING_DATADIR}/aclocal/gnome-macros "