diff options
| author | Cliff Brake <cbrake@bec-systems.com> | 2006-11-13 18:57:30 +0000 |
|---|---|---|
| committer | Cliff Brake <cbrake@bec-systems.com> | 2006-11-13 18:57:30 +0000 |
| commit | 40951de5f883d7a2d9d5445a9b73c3424ee245f1 (patch) | |
| tree | 6a9d8dfe2fef258e9dd8b079c3517b0c1edbfbe6 /packages/eds | |
| parent | 1c9e8b7ced097812f43cdd5782023464cef09ed8 (diff) | |
| parent | e2e9b0ab1d6af8ec246cef0f9d848083dff2b8e0 (diff) | |
merge of '9ebe19c38b13611632684c440b048e45471bf916'
and 'e0d42dfa54011bb501a5a723ec0554c757bfc933'
Diffstat (limited to 'packages/eds')
| -rw-r--r-- | packages/eds/eds-dbus_svn.bb | 25 |
1 files changed, 4 insertions, 21 deletions
diff --git a/packages/eds/eds-dbus_svn.bb b/packages/eds/eds-dbus_svn.bb index c39d5b7443..e56b41e595 100644 --- a/packages/eds/eds-dbus_svn.bb +++ b/packages/eds/eds-dbus_svn.bb @@ -4,13 +4,13 @@ LICENSE = "LGPL" DEPENDS = "glib-2.0 gtk+ gconf dbus db gnome-common libglade virtual/libiconv zlib" PV = "1.4.0+svn${SRCDATE}" -PR = "r16" +PR = "r17" SRC_URI = "svn://svn.o-hand.com/repos/${PN};module=trunk;proto=http \ file://no_libdb.patch;patch=1 \ file://no_iconv_test.patch;patch=1 \ file://no_libedataserverui.patch;patch=1 \ - file://disable_orbit.patch;patch=1 \ + file://disable_orbit.patch;patch=1;maxdate=20060126 \ file://iconv-detect.h" S = "${WORKDIR}/trunk" @@ -18,7 +18,7 @@ S = "${WORKDIR}/trunk" inherit autotools pkgconfig # -ldb needs this on some platforms -export LDFLAGS += "-lpthread" +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" @@ -38,24 +38,7 @@ FILES_${PN}-dev += "${libdir}/evolution-data-server-1.2/extensions/*.la \ do_configure_append = " cp ${WORKDIR}/iconv-detect.h ${S} " do_stage () { - oe_libinstall -so -C addressbook/libebook-dbus libebook-1.2 ${STAGING_LIBDIR} - oe_libinstall -so -C addressbook/libedata-book-dbus libedata-book-1.2 ${STAGING_LIBDIR} - oe_libinstall -so -C calendar/libecal-dbus libecal-1.2 ${STAGING_LIBDIR} - oe_libinstall -so -C calendar/libedata-cal-dbus libedata-cal-1.2 ${STAGING_LIBDIR} - oe_libinstall -so -C libedataserver libedataserver-1.2 ${STAGING_LIBDIR} - oe_libinstall -so -C camel libcamel-1.2 ${STAGING_LIBDIR} - oe_libinstall -so -C camel libcamel-provider-1.2 ${STAGING_LIBDIR} - - install -d ${STAGING_INCDIR}/camel-1.2 ${STAGING_INCDIR}/libebook \ - ${STAGING_INCDIR}/libecal ${STAGING_INCDIR}/libedataserver \ - ${STAGING_INCDIR}/libical - install -m 0644 ${S}/camel/*.h ${STAGING_INCDIR}/camel-1.2 - install -m 0644 ${S}/camel/*.def ${STAGING_INCDIR}/camel-1.2 - ln -sf ${STAGING_INCDIR}/camel-1.2 ${STAGING_INCDIR}/camel - install -m 0644 ${S}/addressbook/libebook-dbus/*.h ${STAGING_INCDIR}/libebook - install -m 0644 ${S}/calendar/libecal-dbus/*.h ${STAGING_INCDIR}/libecal - install -m 0644 ${S}/libedataserver/*.h ${STAGING_INCDIR}/libedataserver - install -m 0644 ${S}/calendar/libical/src/libical/*.h ${STAGING_INCDIR}/libical + autotools_stage_all } |