From e93ccce41330d44721b4f87a74b304a6d6d72482 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Fri, 5 Feb 2010 15:57:59 +0000 Subject: eds-dbus: Pull from git, not svn Signed-off-by: Richard Purdie --- meta/packages/eds/eds-dbus/no_iconv_test.patch | 30 --------- meta/packages/eds/eds-dbus/nossl.patch | 68 ++++++++++++++++++++ meta/packages/eds/eds-dbus/oh-contact.patch | 14 ++-- meta/packages/eds/eds-dbus_git.bb | 89 ++++++++++++++++++++++++++ meta/packages/eds/eds-dbus_svn.bb | 86 ------------------------- 5 files changed, 165 insertions(+), 122 deletions(-) delete mode 100644 meta/packages/eds/eds-dbus/no_iconv_test.patch create mode 100644 meta/packages/eds/eds-dbus/nossl.patch create mode 100644 meta/packages/eds/eds-dbus_git.bb delete mode 100644 meta/packages/eds/eds-dbus_svn.bb (limited to 'meta/packages/eds') diff --git a/meta/packages/eds/eds-dbus/no_iconv_test.patch b/meta/packages/eds/eds-dbus/no_iconv_test.patch deleted file mode 100644 index 4a034b6c5..000000000 --- a/meta/packages/eds/eds-dbus/no_iconv_test.patch +++ /dev/null @@ -1,30 +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 -@@ -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/meta/packages/eds/eds-dbus/nossl.patch b/meta/packages/eds/eds-dbus/nossl.patch new file mode 100644 index 000000000..30568ff07 --- /dev/null +++ b/meta/packages/eds/eds-dbus/nossl.patch @@ -0,0 +1,68 @@ +Index: git/camel/Makefile.am +=================================================================== +--- git.orig/camel/Makefile.am 2010-02-05 15:25:09.000000000 +0000 ++++ git/camel/Makefile.am 2010-02-05 15:25:20.000000000 +0000 +@@ -80,7 +80,6 @@ + camel-store-summary.c \ + camel-store.c \ + camel-tcp-stream-raw.c \ +- camel-tcp-stream-ssl.c \ + camel-tcp-stream.c \ + camel-transport.c \ + camel-uid-cache.c \ +@@ -133,7 +132,6 @@ + camel-store-summary.h \ + camel-store.h \ + camel-tcp-stream-raw.h \ +- camel-tcp-stream-ssl.h \ + camel-tcp-stream.h \ + camel-transport.h \ + camel-uid-cache.h \ +Index: git/camel/camel.h +=================================================================== +--- git.orig/camel/camel.h 2010-02-05 15:26:30.000000000 +0000 ++++ git/camel/camel.h 2010-02-05 15:26:52.000000000 +0000 +@@ -122,7 +122,6 @@ + #include + #include + #include +-#include + #include + #include + #include +Index: git/camel/providers/imap/camel-imap-store.c +=================================================================== +--- git.orig/camel/providers/imap/camel-imap-store.c 2010-02-05 15:28:19.000000000 +0000 ++++ git/camel/providers/imap/camel-imap-store.c 2010-02-05 15:28:38.000000000 +0000 +@@ -51,7 +51,6 @@ + #include "camel/camel-stream.h" + #include "camel/camel-string-utils.h" + #include "camel/camel-tcp-stream-raw.h" +-#include "camel/camel-tcp-stream-ssl.h" + #include "camel/camel-url.h" + #include "camel/camel-utf8.h" + +Index: git/configure.ac +=================================================================== +--- git.orig/configure.ac 2010-02-05 15:31:59.000000000 +0000 ++++ git/configure.ac 2010-02-05 15:33:00.000000000 +0000 +@@ -1272,7 +1272,8 @@ + dnl We have fixed all our instances to use . Until the .pc from + dnl libical is fixed, we have to work-around the buggy CFlags. + dnl ***** +- LIBICAL_EXTRA_CFLAGS=" -I`$PKG_CONFIG --variable=includedir libical` " ++ m4_pattern_allow([^PKG_CONFIG_SYSROOT_DIR$]) ++ LIBICAL_EXTRA_CFLAGS=" -I$PKG_CONFIG_SYSROOT_DIR`$PKG_CONFIG --variable=includedir libical` " + LIBICAL_EXTRA_LIBS="" + AC_SUBST(LIBICAL_EXTRA_CFLAGS) + AC_SUBST(LIBICAL_EXTRA_LIBS) +Index: git/calendar/libecal/libecal.pc.in +=================================================================== +--- git.orig/calendar/libecal/libecal.pc.in 2010-02-05 15:39:41.000000000 +0000 ++++ git/calendar/libecal/libecal.pc.in 2010-02-05 15:39:55.000000000 +0000 +@@ -12,4 +12,4 @@ + Version: @VERSION@ + Requires: libical >= @LIBICAL_REQUIRED@ libedataserver-1.2 dbus-glib-1 + Libs: -L${libdir} -lecal-1.2 +-Cflags: -I${privincludedir} @LIBICAL_EXTRA_CFLAGS@ ++Cflags: -I${privincludedir} diff --git a/meta/packages/eds/eds-dbus/oh-contact.patch b/meta/packages/eds/eds-dbus/oh-contact.patch index e5c0f5184..fdd7e4bdf 100644 --- a/meta/packages/eds/eds-dbus/oh-contact.patch +++ b/meta/packages/eds/eds-dbus/oh-contact.patch @@ -1,7 +1,7 @@ Index: addressbook/libedata-book/ximian-vcard.h =================================================================== ---- addressbook/libedata-book/ximian-vcard.h (revision 578) -+++ addressbook/libedata-book/ximian-vcard.h (working copy) +--- addressbook/libedata-book/ximian-vcard.h.orig 2010-02-05 14:57:14.000000000 +0000 ++++ addressbook/libedata-book/ximian-vcard.h 2010-02-05 14:58:14.000000000 +0000 @@ -1,80 +1,40 @@ #define XIMIAN_VCARD \ "BEGIN:VCARD\n" \ @@ -122,10 +122,12 @@ Index: addressbook/libedata-book/ximian-vcard.h "END:VCARD" Index: addressbook/backends/file/Makefile.am =================================================================== ---- addressbook/backends/file/Makefile.am (revision 578) -+++ addressbook/backends/file/Makefile.am (working copy) -@@ -1,4 +1,5 @@ - INCLUDES = \ +--- addressbook/backends/file/Makefile.am.orig 2010-02-05 14:57:14.000000000 +0000 ++++ addressbook/backends/file/Makefile.am 2010-02-05 14:59:10.000000000 +0000 +@@ -2,6 +2,7 @@ + + libebookbackendfile_la_CPPFLAGS = \ + $(AM_CPPFLAGS) \ + -DCREATE_DEFAULT_VCARD \ -DG_LOG_DOMAIN=\"libebookbackend\" \ -I$(top_srcdir) \ diff --git a/meta/packages/eds/eds-dbus_git.bb b/meta/packages/eds/eds-dbus_git.bb new file mode 100644 index 000000000..cb49630a3 --- /dev/null +++ b/meta/packages/eds/eds-dbus_git.bb @@ -0,0 +1,89 @@ +DESCRIPTION = "Evolution database backend server" +LICENSE = "LGPL" +DEPENDS = "intltool-native glib-2.0 gtk+ gconf dbus db gnome-common virtual/libiconv zlib libsoup libglade libical" + +PV = "2.29+git${SRCPV}" +PR = "r2" + +SRC_URI = "git://git.gnome.org/evolution-data-server;protocol=git \ + file://oh-contact.patch;patch=1;pnum=0 \ + file://nossl.patch;patch=1 \ + file://iconv-detect.h" + +S = "${WORKDIR}/git" + +inherit autotools_stage pkgconfig + +# -ldb needs this on some platforms +LDFLAGS += "-lpthread" + +do_configure_prepend () { + echo "EXTRA_DIST = " > ${S}/gtk-doc.make +} + +do_configure_append () { + cp ${WORKDIR}/iconv-detect.h ${S} +} + +EXTRA_OECONF = "--without-openldap --with-dbus --without-bug-buddy \ + --with-soup --with-libdb=${STAGING_DIR_HOST}${prefix} \ + --disable-smime --disable-ssl --disable-nntp --disable-gtk-doc --without-weather" + + +PACKAGES =+ "libcamel libcamel-dev libebook libebook-dev libecal libecal-dev \ + libedata-book libedata-book-dev libedata-cal libedata-cal-dev \ + libedataserver libedataserver-dev \ + libedataserverui libedataserverui-dev" + +FILES_${PN}-dev =+ "${libdir}/pkgconfig/evolution-data-server-*.pc" +FILES_${PN}-dbg =+ "${libdir}/evolution-data-server-*/camel-providers/.debug \ + ${libdir}/evolution-data-server*/extensions/.debug/" +RRECOMMENDS_${PN}-dev += "libecal-dev libebook-dev" + +FILES_libcamel = "${libexecdir}/camel-* ${libdir}/libcamel-*.so.* \ + ${libdir}/libcamel-provider-*.so.* \ + ${libdir}/evolution-data-server-*/camel-providers/*.so \ + ${libdir}/evolution-data-server-*/camel-providers/*.urls" +FILES_libcamel-dev = "${libdir}/libcamel-*.so ${libdir}/libcamel-provider-*.so \ + ${libdir}/pkgconfig/camel*pc \ + ${includedir}/evolution-data-server*/camel" + +FILES_libebook = "${libdir}/libebook-*.so.*" +FILES_libebook-dev = "${libdir}/libebook-1.2.so \ + ${libdir}/pkgconfig/libebook-*.pc \ + ${includedir}/evolution-data-server*/libebook/*.h" +RRECOMMENDS_libebook = "libedata-book" + +FILES_libecal = "${libdir}/libecal-*.so.* \ + ${datadir}/evolution-data-server-1.4/zoneinfo" +FILES_libecal-dev = "${libdir}/libecal-*.so ${libdir}/pkgconfig/libecal-*.pc \ + ${includedir}/evolution-data-server*/libecal/*.h \ + ${includedir}/evolution-data-server*/libical/*.h" +RRECOMMENDS_libecal = "libedata-cal tzdata" + +FILES_libedata-book = "${libexecdir}/e-addressbook-factory \ + ${datadir}/dbus-1/services/*.AddressBook.service \ + ${libdir}/libedata-book-*.so.* \ + ${libdir}/evolution-data-server-*/extensions/libebook*.so" +FILES_libedata-book-dev = "${libdir}/libedata-book-*.so \ + ${libdir}/pkgconfig/libedata-book-*.pc \ + ${includedir}/evolution-data-server-*/libedata-book" + +FILES_libedata-cal = "${libexecdir}/e-calendar-factory \ + ${datadir}/dbus-1/services/*.Calendar.service \ + ${libdir}/libedata-cal-*.so.* \ + ${libdir}/evolution-data-server-*/extensions/libecal*.so" +FILES_libedata-cal-dev = "${libdir}/libedata-cal-*.so \ + ${libdir}/pkgconfig/libedata-cal-*.pc \ + ${includedir}/evolution-data-server-*/libedata-cal" + +FILES_libedataserver = "${libdir}/libedataserver-*.so.*" +FILES_libedataserver-dev = "${libdir}/libedataserver-*.so \ + ${libdir}/pkgconfig/libedataserver-*.pc \ + ${includedir}/evolution-data-server-*/libedataserver/*.h" + +FILES_libedataserverui = "${libdir}/libedataserverui-*.so.* ${datadir}/evolution-data-server-1.4/glade/*.glade" +FILES_libedataserverui-dev = "${libdir}/libedataserverui-*.so \ + ${libdir}/pkgconfig/libedataserverui-*.pc \ + ${includedir}/evolution-data-server-*/libedataserverui/*.h" + diff --git a/meta/packages/eds/eds-dbus_svn.bb b/meta/packages/eds/eds-dbus_svn.bb deleted file mode 100644 index a4c91412c..000000000 --- a/meta/packages/eds/eds-dbus_svn.bb +++ /dev/null @@ -1,86 +0,0 @@ -DESCRIPTION = "Evolution database backend server" -HOMEPAGE = "http://projects.o-hand.com/eds" -LICENSE = "LGPL" -DEPENDS = "intltool-native glib-2.0 gtk+ gconf dbus db gnome-common virtual/libiconv zlib libsoup libglade" - -PV = "1.4.0+svnr${SRCREV}" -PR = "r6" - -SRC_URI = "svn://svn.o-hand.com/repos/${PN};module=trunk;proto=http \ - file://oh-contact.patch;patch=1;pnum=0 \ - file://no_iconv_test.patch;patch=1 \ - file://iconv-detect.h" - -S = "${WORKDIR}/trunk" - -inherit autotools_stage 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 \ - --with-soup --with-libdb=${STAGING_DIR_HOST}${prefix} \ - --disable-smime --disable-nss --disable-nntp --disable-gtk-doc" - - -PACKAGES =+ "libcamel libcamel-dev libebook libebook-dev libecal libecal-dev \ - libedata-book libedata-book-dev libedata-cal libedata-cal-dev \ - libedataserver libedataserver-dev \ - libedataserverui libedataserverui-dev" - -FILES_${PN}-dev =+ "${libdir}/pkgconfig/evolution-data-server-*.pc" -FILES_${PN}-dbg =+ "${libdir}/evolution-data-server-*/camel-providers/.debug \ - ${libdir}/evolution-data-server*/extensions/.debug/" -RRECOMMENDS_${PN}-dev += "libecal-dev libebook-dev" - -FILES_libcamel = "${libexecdir}/camel-* ${libdir}/libcamel-*.so.* \ - ${libdir}/libcamel-provider-*.so.* \ - ${libdir}/evolution-data-server-*/camel-providers/*.so \ - ${libdir}/evolution-data-server-*/camel-providers/*.urls" -FILES_libcamel-dev = "${libdir}/libcamel-*.so ${libdir}/libcamel-provider-*.so \ - ${libdir}/pkgconfig/camel*pc \ - ${includedir}/evolution-data-server*/camel" - -FILES_libebook = "${libdir}/libebook-*.so.*" -FILES_libebook-dev = "${libdir}/libebook-1.2.so \ - ${libdir}/pkgconfig/libebook-*.pc \ - ${includedir}/evolution-data-server*/libebook/*.h" -RRECOMMENDS_libebook = "libedata-book" - -FILES_libecal = "${libdir}/libecal-*.so.* \ - ${datadir}/evolution-data-server-1.4/zoneinfo" -FILES_libecal-dev = "${libdir}/libecal-*.so ${libdir}/pkgconfig/libecal-*.pc \ - ${includedir}/evolution-data-server*/libecal/*.h \ - ${includedir}/evolution-data-server*/libical/*.h" -RRECOMMENDS_libecal = "libedata-cal tzdata" - -FILES_libedata-book = "${libexecdir}/e-addressbook-factory \ - ${datadir}/dbus-1/services/*.AddressBook.service \ - ${libdir}/libedata-book-*.so.* \ - ${libdir}/evolution-data-server-*/extensions/libebook*.so" -FILES_libedata-book-dev = "${libdir}/libedata-book-*.so \ - ${libdir}/pkgconfig/libedata-book-*.pc \ - ${includedir}/evolution-data-server-*/libedata-book" - -FILES_libedata-cal = "${libexecdir}/e-calendar-factory \ - ${datadir}/dbus-1/services/*.Calendar.service \ - ${libdir}/libedata-cal-*.so.* \ - ${libdir}/evolution-data-server-*/extensions/libecal*.so" -FILES_libedata-cal-dev = "${libdir}/libedata-cal-*.so \ - ${libdir}/pkgconfig/libedata-cal-*.pc \ - ${includedir}/evolution-data-server-*/libedata-cal" - -FILES_libedataserver = "${libdir}/libedataserver-*.so.*" -FILES_libedataserver-dev = "${libdir}/libedataserver-*.so \ - ${libdir}/pkgconfig/libedataserver-*.pc \ - ${includedir}/evolution-data-server-*/libedataserver/*.h" - -FILES_libedataserverui = "${libdir}/libedataserverui-*.so.* ${datadir}/evolution-data-server-1.4/glade/*.glade" -FILES_libedataserverui-dev = "${libdir}/libedataserverui-*.so \ - ${libdir}/pkgconfig/libedataserverui-*.pc \ - ${includedir}/evolution-data-server-*/libedataserverui/*.h" - -- cgit v1.2.3