aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2010-06-28 15:13:08 -0700
committerMartin Jansa <Martin.Jansa@gmail.com>2010-08-08 09:58:18 +0200
commit3372002d18ac4769be3d888c7b6e1cffca0d6e85 (patch)
tree898ba0db764e72fa9168c07bfb7a45fa41ba73d0
parent6c31b1f62514d431b1db3377d437b85ea579891e (diff)
downloadopenembedded-3372002d18ac4769be3d888c7b6e1cffca0d6e85.zip
openembedded-3372002d18ac4769be3d888c7b6e1cffca0d6e85.tar.gz
openembedded-3372002d18ac4769be3d888c7b6e1cffca0d6e85.tar.bz2
eds-dbus: Update to follow git repository.
* Remove unused patches. Thanks to initial patch from Ilyes Gouta Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
-rw-r--r--recipes/eds/eds-dbus/disable_orbit.patch13
-rw-r--r--recipes/eds/eds-dbus/fix-bindig-tool.patch22
-rw-r--r--recipes/eds/eds-dbus/gtk-doc.make2
-rw-r--r--recipes/eds/eds-dbus/libxml2-for-libedataserverui.patch25
-rw-r--r--recipes/eds/eds-dbus/no_iconv_test.patch70
-rw-r--r--recipes/eds/eds-dbus/no_libdb.patch14
-rw-r--r--recipes/eds/eds-dbus/no_libedataserverui-20060126.patch13
-rw-r--r--recipes/eds/eds-dbus/no_libedataserverui.patch13
-rw-r--r--recipes/eds/eds-dbus/no_libgnome.patch45
-rw-r--r--recipes/eds/eds-dbus_git.bb (renamed from recipes/eds/eds-dbus_svn.bb)35
10 files changed, 45 insertions, 207 deletions
diff --git a/recipes/eds/eds-dbus/disable_orbit.patch b/recipes/eds/eds-dbus/disable_orbit.patch
deleted file mode 100644
index 8757666..0000000
--- a/recipes/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/recipes/eds/eds-dbus/fix-bindig-tool.patch b/recipes/eds/eds-dbus/fix-bindig-tool.patch
deleted file mode 100644
index 704df84..0000000
--- a/recipes/eds/eds-dbus/fix-bindig-tool.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- /tmp/Makefile.am 2007-01-16 13:56:57.000000000 +0100
-+++ trunk/calendar/libecal-dbus/Makefile.am 2007-01-16 13:57:40.045251000 +0100
-@@ -64,7 +64,7 @@
- dbus-binding-tool --mode=glib-server --output=$@ --prefix=$(subst -,_,$*) $^
-
- %-bindings.h: ../libedata-cal-dbus/%.xml
-- dbus-binding-tool --mode=glib-client --output=$@ $^
-+ dbus-binding-tool --mode=glib-client --prefix= --output=$@ $^
-
- BUILT_SOURCES = $(DBUS_GENERATED_H) $(MARSHAL_GENERATED)
- CLEANFILES = $(BUILT_SOURCES)
---- /tmp/Makefile.am 2007-01-16 14:05:49.000000000 +0100
-+++ trunk/calendar/libedata-cal-dbus/Makefile.am 2007-01-16 14:06:15.865251000 +0100
-@@ -90,7 +90,7 @@
- dbus-binding-tool --mode=glib-server --output=$@ --prefix=$(subst -,_,$*) $^
-
- %-bindings.h: %.xml
-- dbus-binding-tool --mode=glib-client --output=$@ $^
-+ dbus-binding-tool --mode=glib-client --prefix= --output=$@ $^
-
-
- DBUS_BINDINGS = e-data-cal-factory-bindings.h e-data-cal-bindings.h e-data-cal-view-bindings.h
diff --git a/recipes/eds/eds-dbus/gtk-doc.make b/recipes/eds/eds-dbus/gtk-doc.make
new file mode 100644
index 0000000..4c8ef12
--- /dev/null
+++ b/recipes/eds/eds-dbus/gtk-doc.make
@@ -0,0 +1,2 @@
+
+EXTRA_DIST =
diff --git a/recipes/eds/eds-dbus/libxml2-for-libedataserverui.patch b/recipes/eds/eds-dbus/libxml2-for-libedataserverui.patch
new file mode 100644
index 0000000..42da462
--- /dev/null
+++ b/recipes/eds/eds-dbus/libxml2-for-libedataserverui.patch
@@ -0,0 +1,25 @@
+diff --git a/.gitignore b/.gitignore
+index 96787d6..622d967 100644
+--- a/.gitignore
++++ b/.gitignore
+@@ -24,7 +24,6 @@ missing
+ mkinstalldirs
+ stamp-it
+ stamp-h1
+-gtk-doc.make
+ po/POTFILES
+ *.la
+ *.lo
+diff --git a/configure.ac b/configure.ac
+index ae9addb..83239d3 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1472,7 +1472,7 @@ EVO_SET_COMPILE_FLAGS(E_DATA_SERVER, $E_DATA_SERVER_DEPS, $THREADS_CFLAGS $MANUA
+ AC_SUBST(E_DATA_SERVER_CFLAGS)
+ AC_SUBST(E_DATA_SERVER_LIBS)
+
+-E_DATA_SERVER_UI_DEPS="gtk+-2.0 libglade-2.0 gobject-2.0 gthread-2.0 gconf-2.0 $GNOME_KEYRING_REQUIREMENT"
++E_DATA_SERVER_UI_DEPS="libxml-2.0 gtk+-2.0 libglade-2.0 gobject-2.0 gthread-2.0 gconf-2.0 $GNOME_KEYRING_REQUIREMENT"
+
+ EVO_SET_COMPILE_FLAGS(E_DATA_SERVER_UI, $E_DATA_SERVER_UI_DEPS, $THREADS_CFLAGS, $THREADS_LIBS)
+ AC_SUBST(E_DATA_SERVER_UI_CFLAGS)
diff --git a/recipes/eds/eds-dbus/no_iconv_test.patch b/recipes/eds/eds-dbus/no_iconv_test.patch
deleted file mode 100644
index 6e33c78..0000000
--- a/recipes/eds/eds-dbus/no_iconv_test.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-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 \xC2\xA4";
-- 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-1");
-- 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/recipes/eds/eds-dbus/no_libdb.patch b/recipes/eds/eds-dbus/no_libdb.patch
deleted file mode 100644
index ae9a66d..0000000
--- a/recipes/eds/eds-dbus/no_libdb.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Index: configure.in
-===================================================================
---- trunk/configure.in (revision 306)
-+++ trunk/configure.in (working copy)
-@@ -1353,9 +1353,6 @@
- if test $enable_calendar = yes; then
- AC_CONFIG_SUBDIRS(calendar/libical)
- fi
--if test $dynamic_libdb = no; then
-- AC_CONFIG_SUBDIRS(libdb/dist)
--fi
-
- AC_OUTPUT([
- Makefile
diff --git a/recipes/eds/eds-dbus/no_libedataserverui-20060126.patch b/recipes/eds/eds-dbus/no_libedataserverui-20060126.patch
deleted file mode 100644
index bb6f78d..0000000
--- a/recipes/eds/eds-dbus/no_libedataserverui-20060126.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-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
diff --git a/recipes/eds/eds-dbus/no_libedataserverui.patch b/recipes/eds/eds-dbus/no_libedataserverui.patch
deleted file mode 100644
index 766c547..0000000
--- a/recipes/eds/eds-dbus/no_libedataserverui.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-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 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/recipes/eds/eds-dbus/no_libgnome.patch b/recipes/eds/eds-dbus/no_libgnome.patch
deleted file mode 100644
index a8bae50..0000000
--- a/recipes/eds/eds-dbus/no_libgnome.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-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/recipes/eds/eds-dbus_svn.bb b/recipes/eds/eds-dbus_git.bb
index 20d7f79..88a4da5 100644
--- a/recipes/eds/eds-dbus_svn.bb
+++ b/recipes/eds/eds-dbus_git.bb
@@ -1,27 +1,32 @@
DESCRIPTION = "Evolution database backend server"
-HOMEPAGE = "http://projects.o-hand.com/eds"
+HOMEPAGE = "http://labs.o-hand.com/embedded-eds/"
LICENSE = "LGPL"
-DEPENDS = "intltool-native libglade glib-2.0 gtk+ gconf dbus db gnome-common virtual/libiconv zlib intltool"
+DEPENDS = "intltool-native libglade glib-2.0 gtk+ gconf dbus db gnome-common virtual/libiconv zlib intltool libxml2"
-PV = "1.4.0+svnr${SRCPV}"
-PR = "r7"
-SRCREV = "736"
+SRCREV = "91812cd2f797fb8ec8befbb2685037584ce144ee"
+PV = "1.4.0"
+PR = "r2"
+PE = "1"
+PR_append = "+gitr${SRCREV}"
-SRC_URI = "svn://svn.o-hand.com/repos/${PN};module=trunk;proto=http \
- file://no_libdb.patch;maxrev=659 \
- file://no_iconv_test.patch \
- file://no_libedataserverui.patch;maxrev=659 \
- file://iconv-detect.h"
+SRC_URI = "git://git.o-hand.com/eds-dbus;branch=master;protocol=git \
+ file://iconv-detect.h \
+ file://libxml2-for-libedataserverui.patch;patch=1 \
+ file://gtk-doc.make"
-S = "${WORKDIR}/trunk"
+S = "${WORKDIR}/git"
inherit autotools pkgconfig
# -ldb needs this on some platforms
LDFLAGS += "-lpthread"
-do_configure_append = " cp ${WORKDIR}/iconv-detect.h ${S} "
-EXTRA_OECONF = "--without-openldap --with-dbus --without-bug-buddy --without-soup --with-libdb=${STAGING_DIR_HOST}${layout_prefix} --disable-smime --disable-nss --disable-nntp --disable-gtk-doc"
+do_configure_prepend () {
+ cp ${WORKDIR}/iconv-detect.h ${S}
+ cp ${WORKDIR}/gtk-doc.make ${S}
+}
+
+EXTRA_OECONF = "--without-openldap --with-dbus --without-weather --without-bug-buddy --without-soup --without-libdb --with-libdb=${STAGING_DIR_HOST}${layout_prefix} --disable-smime --disable-nss --disable-nntp --disable-gtk-doc --disable-calendar --disable-hula --disable-dot-locking --disable-gnome-keyring"
PACKAGES =+ "libcamel-collateral libcamel libcamel-dev libebook libebook-dev libecal libecal-dev libedata-book libedata-book-dev libedata-cal libedata-cal-dev libedataserver libedataserver-dev"
@@ -51,10 +56,6 @@ FILES_libedata-cal-dev = "${libdir}/libedata-cal-*.so ${libdir}/pkgconfig/libeda
FILES_libedataserver = "${libdir}/libedataserver-*.so.*"
FILES_libedataserver-dev = "${libdir}/libedataserver-*.so ${libdir}/pkgconfig/libedataserver-*.pc ${includedir}/evolution-data-server-*/libedataserver/*.h"
-do_stage () {
- autotools_stage_all
-}
-
do_install_append () {
rm ${D}${libdir}/evolution-data-server-*/*/*.la
}