summaryrefslogtreecommitdiffstats
path: root/meta/packages/eds
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2010-02-05 15:57:59 +0000
committerRichard Purdie <rpurdie@linux.intel.com>2010-02-05 15:57:59 +0000
commite93ccce41330d44721b4f87a74b304a6d6d72482 (patch)
tree38fdbf4e28fc6413ede43f14ce3877530e698e1c /meta/packages/eds
parent96cdddcdd707517d111330b9471ef88087d0d0ab (diff)
downloadpoky-e93ccce41330d44721b4f87a74b304a6d6d72482.tar.gz
eds-dbus: Pull from git, not svn
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'meta/packages/eds')
-rw-r--r--meta/packages/eds/eds-dbus/no_iconv_test.patch30
-rw-r--r--meta/packages/eds/eds-dbus/nossl.patch68
-rw-r--r--meta/packages/eds/eds-dbus/oh-contact.patch14
-rw-r--r--meta/packages/eds/eds-dbus_git.bb (renamed from meta/packages/eds/eds-dbus_svn.bb)19
4 files changed, 87 insertions, 44 deletions
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 4a034b6c58..0000000000
--- a/meta/packages/eds/eds-dbus/no_iconv_test.patch
+++ /dev/null
@@ -1,30 +0,0 @@
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@@ -254,25 +221,6 @@
6 AC_SUBST(ICONV_CFLAGS)
7 AC_SUBST(ICONV_LIBS)
8
9-CFLAGS="$CFLAGS -I$srcdir"
10-
11-AC_MSG_CHECKING(preferred charset formats for system iconv)
12-AC_TRY_RUN([
13-#define CONFIGURE_IN
14-#include "iconv-detect.c"
15-],[
16- AC_MSG_RESULT(found)
17-],[
18- AC_MSG_RESULT(not found)
19- AC_WARN([
20- *** The iconv-detect program was unable to determine the
21- *** preferred charset formats recognized by your system
22- *** iconv library. It is suggested that you install a
23- *** working iconv library such as the one found at
24- *** ftp://ftp.gnu.org/pub/gnu/libiconv
25- ])
26-])
27-
28 CFLAGS="$save_CFLAGS"
29 LIBS="$save_LIBS"
30
diff --git a/meta/packages/eds/eds-dbus/nossl.patch b/meta/packages/eds/eds-dbus/nossl.patch
new file mode 100644
index 0000000000..30568ff075
--- /dev/null
+++ b/meta/packages/eds/eds-dbus/nossl.patch
@@ -0,0 +1,68 @@
1Index: git/camel/Makefile.am
2===================================================================
3--- git.orig/camel/Makefile.am 2010-02-05 15:25:09.000000000 +0000
4+++ git/camel/Makefile.am 2010-02-05 15:25:20.000000000 +0000
5@@ -80,7 +80,6 @@
6 camel-store-summary.c \
7 camel-store.c \
8 camel-tcp-stream-raw.c \
9- camel-tcp-stream-ssl.c \
10 camel-tcp-stream.c \
11 camel-transport.c \
12 camel-uid-cache.c \
13@@ -133,7 +132,6 @@
14 camel-store-summary.h \
15 camel-store.h \
16 camel-tcp-stream-raw.h \
17- camel-tcp-stream-ssl.h \
18 camel-tcp-stream.h \
19 camel-transport.h \
20 camel-uid-cache.h \
21Index: git/camel/camel.h
22===================================================================
23--- git.orig/camel/camel.h 2010-02-05 15:26:30.000000000 +0000
24+++ git/camel/camel.h 2010-02-05 15:26:52.000000000 +0000
25@@ -122,7 +122,6 @@
26 #include <camel/camel-string-utils.h>
27 #include <camel/camel-tcp-stream.h>
28 #include <camel/camel-tcp-stream-raw.h>
29-#include <camel/camel-tcp-stream-ssl.h>
30 #include <camel/camel-text-index.h>
31 #include <camel/camel-transport.h>
32 #include <camel/camel-trie.h>
33Index: git/camel/providers/imap/camel-imap-store.c
34===================================================================
35--- git.orig/camel/providers/imap/camel-imap-store.c 2010-02-05 15:28:19.000000000 +0000
36+++ git/camel/providers/imap/camel-imap-store.c 2010-02-05 15:28:38.000000000 +0000
37@@ -51,7 +51,6 @@
38 #include "camel/camel-stream.h"
39 #include "camel/camel-string-utils.h"
40 #include "camel/camel-tcp-stream-raw.h"
41-#include "camel/camel-tcp-stream-ssl.h"
42 #include "camel/camel-url.h"
43 #include "camel/camel-utf8.h"
44
45Index: git/configure.ac
46===================================================================
47--- git.orig/configure.ac 2010-02-05 15:31:59.000000000 +0000
48+++ git/configure.ac 2010-02-05 15:33:00.000000000 +0000
49@@ -1272,7 +1272,8 @@
50 dnl We have fixed all our instances to use <libical/ical.h>. Until the .pc from
51 dnl libical is fixed, we have to work-around the buggy CFlags.
52 dnl *****
53- LIBICAL_EXTRA_CFLAGS=" -I`$PKG_CONFIG --variable=includedir libical` "
54+ m4_pattern_allow([^PKG_CONFIG_SYSROOT_DIR$])
55+ LIBICAL_EXTRA_CFLAGS=" -I$PKG_CONFIG_SYSROOT_DIR`$PKG_CONFIG --variable=includedir libical` "
56 LIBICAL_EXTRA_LIBS=""
57 AC_SUBST(LIBICAL_EXTRA_CFLAGS)
58 AC_SUBST(LIBICAL_EXTRA_LIBS)
59Index: git/calendar/libecal/libecal.pc.in
60===================================================================
61--- git.orig/calendar/libecal/libecal.pc.in 2010-02-05 15:39:41.000000000 +0000
62+++ git/calendar/libecal/libecal.pc.in 2010-02-05 15:39:55.000000000 +0000
63@@ -12,4 +12,4 @@
64 Version: @VERSION@
65 Requires: libical >= @LIBICAL_REQUIRED@ libedataserver-1.2 dbus-glib-1
66 Libs: -L${libdir} -lecal-1.2
67-Cflags: -I${privincludedir} @LIBICAL_EXTRA_CFLAGS@
68+Cflags: -I${privincludedir}
diff --git a/meta/packages/eds/eds-dbus/oh-contact.patch b/meta/packages/eds/eds-dbus/oh-contact.patch
index e5c0f51840..fdd7e4bdfb 100644
--- a/meta/packages/eds/eds-dbus/oh-contact.patch
+++ b/meta/packages/eds/eds-dbus/oh-contact.patch
@@ -1,7 +1,7 @@
1Index: addressbook/libedata-book/ximian-vcard.h 1Index: addressbook/libedata-book/ximian-vcard.h
2=================================================================== 2===================================================================
3--- addressbook/libedata-book/ximian-vcard.h (revision 578) 3--- addressbook/libedata-book/ximian-vcard.h.orig 2010-02-05 14:57:14.000000000 +0000
4+++ addressbook/libedata-book/ximian-vcard.h (working copy) 4+++ addressbook/libedata-book/ximian-vcard.h 2010-02-05 14:58:14.000000000 +0000
5@@ -1,80 +1,40 @@ 5@@ -1,80 +1,40 @@
6 #define XIMIAN_VCARD \ 6 #define XIMIAN_VCARD \
7 "BEGIN:VCARD\n" \ 7 "BEGIN:VCARD\n" \
@@ -122,10 +122,12 @@ Index: addressbook/libedata-book/ximian-vcard.h
122 "END:VCARD" 122 "END:VCARD"
123Index: addressbook/backends/file/Makefile.am 123Index: addressbook/backends/file/Makefile.am
124=================================================================== 124===================================================================
125--- addressbook/backends/file/Makefile.am (revision 578) 125--- addressbook/backends/file/Makefile.am.orig 2010-02-05 14:57:14.000000000 +0000
126+++ addressbook/backends/file/Makefile.am (working copy) 126+++ addressbook/backends/file/Makefile.am 2010-02-05 14:59:10.000000000 +0000
127@@ -1,4 +1,5 @@ 127@@ -2,6 +2,7 @@
128 INCLUDES = \ 128
129 libebookbackendfile_la_CPPFLAGS = \
130 $(AM_CPPFLAGS) \
129+ -DCREATE_DEFAULT_VCARD \ 131+ -DCREATE_DEFAULT_VCARD \
130 -DG_LOG_DOMAIN=\"libebookbackend\" \ 132 -DG_LOG_DOMAIN=\"libebookbackend\" \
131 -I$(top_srcdir) \ 133 -I$(top_srcdir) \
diff --git a/meta/packages/eds/eds-dbus_svn.bb b/meta/packages/eds/eds-dbus_git.bb
index a4c91412cd..cb49630a31 100644
--- a/meta/packages/eds/eds-dbus_svn.bb
+++ b/meta/packages/eds/eds-dbus_git.bb
@@ -1,30 +1,33 @@
1DESCRIPTION = "Evolution database backend server" 1DESCRIPTION = "Evolution database backend server"
2HOMEPAGE = "http://projects.o-hand.com/eds"
3LICENSE = "LGPL" 2LICENSE = "LGPL"
4DEPENDS = "intltool-native glib-2.0 gtk+ gconf dbus db gnome-common virtual/libiconv zlib libsoup libglade" 3DEPENDS = "intltool-native glib-2.0 gtk+ gconf dbus db gnome-common virtual/libiconv zlib libsoup libglade libical"
5 4
6PV = "1.4.0+svnr${SRCREV}" 5PV = "2.29+git${SRCPV}"
7PR = "r6" 6PR = "r2"
8 7
9SRC_URI = "svn://svn.o-hand.com/repos/${PN};module=trunk;proto=http \ 8SRC_URI = "git://git.gnome.org/evolution-data-server;protocol=git \
10 file://oh-contact.patch;patch=1;pnum=0 \ 9 file://oh-contact.patch;patch=1;pnum=0 \
11 file://no_iconv_test.patch;patch=1 \ 10 file://nossl.patch;patch=1 \
12 file://iconv-detect.h" 11 file://iconv-detect.h"
13 12
14S = "${WORKDIR}/trunk" 13S = "${WORKDIR}/git"
15 14
16inherit autotools_stage pkgconfig 15inherit autotools_stage pkgconfig
17 16
18# -ldb needs this on some platforms 17# -ldb needs this on some platforms
19LDFLAGS += "-lpthread" 18LDFLAGS += "-lpthread"
20 19
20do_configure_prepend () {
21 echo "EXTRA_DIST = " > ${S}/gtk-doc.make
22}
23
21do_configure_append () { 24do_configure_append () {
22 cp ${WORKDIR}/iconv-detect.h ${S} 25 cp ${WORKDIR}/iconv-detect.h ${S}
23} 26}
24 27
25EXTRA_OECONF = "--without-openldap --with-dbus --without-bug-buddy \ 28EXTRA_OECONF = "--without-openldap --with-dbus --without-bug-buddy \
26 --with-soup --with-libdb=${STAGING_DIR_HOST}${prefix} \ 29 --with-soup --with-libdb=${STAGING_DIR_HOST}${prefix} \
27 --disable-smime --disable-nss --disable-nntp --disable-gtk-doc" 30 --disable-smime --disable-ssl --disable-nntp --disable-gtk-doc --without-weather"
28 31
29 32
30PACKAGES =+ "libcamel libcamel-dev libebook libebook-dev libecal libecal-dev \ 33PACKAGES =+ "libcamel libcamel-dev libebook libebook-dev libecal libecal-dev \
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-15 10:43:13 +0000