summaryrefslogtreecommitdiffstats
path: root/openembedded
diff options
context:
space:
mode:
Diffstat (limited to 'openembedded')
-rw-r--r--openembedded/packages/eds/eds-dbus/external_libdb.patch116
-rwxr-xr-xopenembedded/packages/eds/eds-dbus_svn.bb3
2 files changed, 1 insertions, 118 deletions
diff --git a/openembedded/packages/eds/eds-dbus/external_libdb.patch b/openembedded/packages/eds/eds-dbus/external_libdb.patch
deleted file mode 100644
index 635f4cb5ec..0000000000
--- a/openembedded/packages/eds/eds-dbus/external_libdb.patch
+++ /dev/null
@@ -1,116 +0,0 @@
1Index: trunk/Makefile.am
2===================================================================
3--- trunk.orig/Makefile.am 2005-09-29 09:19:48.000000000 +0000
4+++ trunk/Makefile.am 2005-09-29 09:19:53.000000000 +0000
5@@ -8,9 +8,9 @@
6 endif
7
8 if ENABLE_DBUS
9-SUBDIRS = libdb libedataserver $(CAMEL_DIR) addressbook calendar libedataserverui docs art po
10+SUBDIRS = libedataserver $(CAMEL_DIR) addressbook calendar libedataserverui 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-29 09:19:48.000000000 +0000
34+++ trunk/configure.in 2005-09-29 10:11:00.000000000 +0000
35@@ -179,6 +179,21 @@
36 AC_SUBST(REGEX_LIBS)
37
38 dnl ******************************
39+dnl * db-4.1 checking
40+dnl ******************************
41+
42+AC_ARG_WITH(libdb41, [ --with-libdb41 Prefix where libdb 4.1 is installed])
43+case $withval in
44+/*)
45+ DB_CFLAGS="-I$withval/include/db4"
46+ DB_LIBS="-L$withval/lib -ldb-4.1"
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-29 09:19:48.000000000 +0000
76+++ trunk/libedataserver/Makefile.am 2005-09-29 09:19:53.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 = \
95Index: trunk/addressbook/backends/file/Makefile.am
96===================================================================
97--- trunk.orig/addressbook/backends/file/Makefile.am 2005-09-29 09:05:35.000000000 +0000
98+++ trunk/addressbook/backends/file/Makefile.am 2005-09-29 09:27:21.000000000 +0000
99@@ -4,7 +4,7 @@
100 -I$(top_builddir) \
101 -I$(top_srcdir)/addressbook \
102 -I$(top_builddir)/addressbook \
103- -I$(top_srcdir)/libdb/dist \
104+ $(DB_CFLAGS) \
105 $(EVOLUTION_ADDRESSBOOK_CFLAGS)
106
107 extension_LTLIBRARIES = libebookbackendfile.la
108@@ -18,7 +18,7 @@
109 $(top_builddir)/addressbook/libebook-dbus/libebook-$(API_VERSION).la \
110 $(top_builddir)/addressbook/libedata-book-dbus/libedata-book-$(API_VERSION).la \
111 $(top_builddir)/libedataserver/libedataserver-$(API_VERSION).la \
112- $(top_builddir)/libdb/dist/libdb-4.1.la \
113+ $(DB_LIBS) \
114 $(EVOLUTION_ADDRESSBOOK_LIBS)
115
116 libebookbackendfile_la_LDFLAGS = \
diff --git a/openembedded/packages/eds/eds-dbus_svn.bb b/openembedded/packages/eds/eds-dbus_svn.bb
index 552a129691..4838dd5640 100755
--- a/openembedded/packages/eds/eds-dbus_svn.bb
+++ b/openembedded/packages/eds/eds-dbus_svn.bb
@@ -4,10 +4,9 @@ RDEPENDS = "gtk+ gconf db libiconv"
4MAINTAINER = "Chris Lord <chris@openedhand.com>" 4MAINTAINER = "Chris Lord <chris@openedhand.com>"
5DESCRIPTION = "Evolution database backend server" 5DESCRIPTION = "Evolution database backend server"
6PV = "1.4.0cvs${CVSDATE}" 6PV = "1.4.0cvs${CVSDATE}"
7PR = "r10" 7PR = "r11"
8 8
9SRC_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_gnomevfs.patch;patch=1 \ 10 file://no_gnomevfs.patch;patch=1 \
12 file://no_gnomevfs2.patch;patch=1 \ 11 file://no_gnomevfs2.patch;patch=1 \
13 file://no_iconv_test.patch;patch=1 \ 12 file://no_iconv_test.patch;patch=1 \
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-07-07 16:01:56 +0000