[oe-commits] org.oe.dev eds-dbus: Sync some changes from Poky (mainly for staging fix)

[rpurdie commit]

eds-dbus: Sync some changes from Poky (mainly for staging fix)

Author: rpurdie at openembedded.org
Branch: org.openembedded.dev
Revision: e34628e7e259929b32c2f303b17d82c0e541eb69
ViewMTN: http://monotone.openembedded.org/revision/info/e34628e7e259929b32c2f303b17d82c0e541eb69
Files:
1
packages/eds/eds-dbus_svn.bb
Diffs:

#
# mt diff -r3850fbf81af0ebf909f0b5e15607f660d10cd943 -re34628e7e259929b32c2f303b17d82c0e541eb69
#
# 
# 
# patch "packages/eds/eds-dbus_svn.bb"
#  from [8a86f6fbd6b6db637d98ac1c7a87a33eebd8e4bf]
#    to [7abc578fce79a61821501f43eaac6092b4d56b7b]
# 
============================================================
--- packages/eds/eds-dbus_svn.bb	8a86f6fbd6b6db637d98ac1c7a87a33eebd8e4bf
+++ packages/eds/eds-dbus_svn.bb	7abc578fce79a61821501f43eaac6092b4d56b7b
@@ -1,10 +1,10 @@ PV = "1.4.0+svnr${SRCREV}"
 DESCRIPTION = "Evolution database backend server"
 HOMEPAGE = "http://projects.o-hand.com/eds"
 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 @@ LDFLAGS += "-lpthread"
 # -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_libebook-dev = "${libdir}/libebook
 
 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_libedataserver-dev = "${libdir}/li
 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
 }