aboutsummaryrefslogtreecommitdiffstats
path: root/packages/eds/eds-dbus_svn.bb
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@rpsys.net>2007-11-17 23:48:17 +0000
committerRichard Purdie <rpurdie@rpsys.net>2007-11-17 23:48:17 +0000
commit3b75030e368aef947eef4a2d5b21a329c362f512 (patch)
tree59069733202dee3f62ee6eec548f0530da57171d /packages/eds/eds-dbus_svn.bb
parentdb61eaee2dd018e053065a3a0e0bb586ffc4ee31 (diff)
downloadopenembedded-3b75030e368aef947eef4a2d5b21a329c362f512.tar.gz
openembedded-3b75030e368aef947eef4a2d5b21a329c362f512.tar.bz2
openembedded-3b75030e368aef947eef4a2d5b21a329c362f512.zip
eds-dbus: Sync some changes from Poky (mainly for staging fix)
Diffstat (limited to 'packages/eds/eds-dbus_svn.bb')
-rw-r--r--packages/eds/eds-dbus_svn.bb9
1 files changed, 5 insertions, 4 deletions
diff --git a/packages/eds/eds-dbus_svn.bb b/packages/eds/eds-dbus_svn.bb
index e076e44aee..4e40528747 100644
--- a/packages/eds/eds-dbus_svn.bb
+++ b/packages/eds/eds-dbus_svn.bb
@@ -4,7 +4,7 @@ LICENSE = "LGPL"
DEPENDS = "intltool-native libglade glib-2.0 gtk+ gconf dbus db gnome-common virtual/libiconv zlib intltool"
PV = "1.4.0+svnr${SRCREV}"
-PR = "r6"
+PR = "r7"
SRC_URI = "svn://svn.o-hand.com/repos/${PN};module=trunk;proto=http \
file://no_libdb.patch;patch=1 \
@@ -19,7 +19,8 @@ inherit autotools pkgconfig
# -ldb needs this on some platforms
LDFLAGS += "-lpthread"
-EXTRA_OECONF = "--without-openldap --with-dbus --without-bug-buddy --without-soup --with-libdb=${STAGING_DIR}/${HOST_SYS} --disable-smime --disable-nss --disable-nntp --disable-gtk-doc"
+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"
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"
@@ -32,9 +33,11 @@ FILES_libcamel-collateral = "${libdir}/libcamel-provider-*.so.* ${libdir}/evolut
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"
@@ -45,8 +48,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_configure_append = " cp ${WORKDIR}/iconv-detect.h ${S} "
-
do_stage () {
autotools_stage_all
}