From fbf2ef9840e6b241d05651d8f8a26b7c0f11aa6d Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Fri, 30 Sep 2005 17:25:47 +0000 Subject: [PATCH] Change db to 4.1.25, update PR's across the board git-svn-id: https://svn.o-hand.com/repos/poky@89 311d38ba-8fff-0310-9ca6-ca027cbcb966 --- openembedded/packages/contacts/contacts_0.0.bb | 2 ++ openembedded/packages/dates/dates_svn.bb | 2 ++ .../packages/db/{db_4.3.27.bb => db_4.1.25.bb} | 11 +++++++---- .../packages/eds/eds-dbus/external_libdb.patch | 6 +++--- openembedded/packages/eds/eds-dbus_svn.bb | 4 ++-- openembedded/packages/meta/meta-oh.bb | 2 +- openembedded/packages/meta/oh-image.bb | 2 +- 7 files changed, 18 insertions(+), 11 deletions(-) rename openembedded/packages/db/{db_4.3.27.bb => db_4.1.25.bb} (91%) diff --git a/openembedded/packages/contacts/contacts_0.0.bb b/openembedded/packages/contacts/contacts_0.0.bb index c855997343..02a8903206 100755 --- a/openembedded/packages/contacts/contacts_0.0.bb +++ b/openembedded/packages/contacts/contacts_0.0.bb @@ -3,6 +3,8 @@ SECTION = "x11" DEPENDS = "glib-2.0 gtk+ libglade eds-dbus" MAINTAINER = "Chris Lord " DESCRIPTION = "Contacts is an address-book application." +PR = "r1" + SRC_URI = "file:///tmp/${PN}-${PV}.tar.gz" diff --git a/openembedded/packages/dates/dates_svn.bb b/openembedded/packages/dates/dates_svn.bb index be8e40d368..eea555c949 100755 --- a/openembedded/packages/dates/dates_svn.bb +++ b/openembedded/packages/dates/dates_svn.bb @@ -4,6 +4,8 @@ DEPENDS = "glib-2.0 gtk+ libglade eds-dbus" MAINTAINER = "Chris Lord " DESCRIPTION = "Dates is a calendar application." +PR = "r1" + PV = "0.0cvs${CVSDATE}" S = "${WORKDIR}/${PN}" diff --git a/openembedded/packages/db/db_4.3.27.bb b/openembedded/packages/db/db_4.1.25.bb similarity index 91% rename from openembedded/packages/db/db_4.3.27.bb rename to openembedded/packages/db/db_4.1.25.bb index 518fddee9f..168dde478d 100644 --- a/openembedded/packages/db/db_4.3.27.bb +++ b/openembedded/packages/db/db_4.1.25.bb @@ -73,17 +73,20 @@ do_stage() { # Install, for the moment, into include/db4 to avoid # interfering with the db3 headers (which have the same # name). -I${STAGING_INCDIR}/db4 to use db4, as opposed - # to db3. + # to db3 + rm -rf ${STAGE_TEMP} mkdir -p ${STAGE_TEMP} - oe_runmake DESTDIR="${STAGE_TEMP}" install_include + oe_runmake DESTDIR="${STAGE_TEMP}" includedir="${STAGE_TEMP}${includedir}" install_include mkdir -p ${STAGING_INCDIR}/db4 cp -pPRf ${STAGE_TEMP}/${includedir}/* ${STAGING_INCDIR}/db4 rm -rf ${STAGE_TEMP} - oe_libinstall -so -C .libs libdb-4.3 ${STAGING_LIBDIR} + oe_libinstall -so -C .libs libdb-4.1 ${STAGING_LIBDIR} } -do_install_append() { +do_install() { + oe_runmake includedir="${D}${includedir}" libdir="${D}${libdir}" bindir="${D}${bindir}" docdir="${D}${docdir}" install + # The docs end up in /usr/docs - not right. if test -d "${D}/${prefix}/docs" then diff --git a/openembedded/packages/eds/eds-dbus/external_libdb.patch b/openembedded/packages/eds/eds-dbus/external_libdb.patch index ebb32403e8..50b9e9b48a 100644 --- a/openembedded/packages/eds/eds-dbus/external_libdb.patch +++ b/openembedded/packages/eds/eds-dbus/external_libdb.patch @@ -36,14 +36,14 @@ Index: trunk/configure.in AC_SUBST(REGEX_LIBS) dnl ****************************** -+dnl * db-4.3 checking ++dnl * db-4.1 checking +dnl ****************************** + -+AC_ARG_WITH(libdb43, [ --with-libdb43 Prefix where libdb 4.3 is installed]) ++AC_ARG_WITH(libdb41, [ --with-libdb41 Prefix where libdb 4.1 is installed]) +case $withval in +/*) + DB_CFLAGS="-I$withval/include/db4" -+ DB_LIBS="-L$withval/lib -ldb-4.3" ++ DB_LIBS="-L$withval/lib -ldb-4.1" + ;; +esac + diff --git a/openembedded/packages/eds/eds-dbus_svn.bb b/openembedded/packages/eds/eds-dbus_svn.bb index 2ffa363fe2..77ea4141da 100755 --- a/openembedded/packages/eds/eds-dbus_svn.bb +++ b/openembedded/packages/eds/eds-dbus_svn.bb @@ -4,7 +4,7 @@ RDEPENDS = "gtk+ gconf db libiconv" MAINTAINER = "Chris Lord " DESCRIPTION = "Evolution database backend server" PV = "1.4.0cvs${CVSDATE}" -PR = "r4" +PR = "r5" SRC_URI = "svn://svn.o-hand.com/repos/${PN};module=trunk;proto=http \ file://external_libdb.patch;patch=1 \ @@ -17,7 +17,7 @@ S = "${WORKDIR}/trunk" inherit autotools pkgconfig -EXTRA_OECONF = "--without-openldap --disable-nntp --disable-gtk-doc --with-dbus=yes --with-libgnome=no --enable-soup=no --with-libdb43=${STAGING_DIR}/${HOST_SYS} --enable-smime=no --enable-nss=no --disable-camel" +EXTRA_OECONF = "--without-openldap --disable-nntp --disable-gtk-doc --with-dbus=yes --with-libgnome=no --enable-soup=no --with-libdb41=${STAGING_DIR}/${HOST_SYS} --enable-smime=no --enable-nss=no --disable-camel" acpaths = " -I ${STAGING_DATADIR}/aclocal/gnome-macros " diff --git a/openembedded/packages/meta/meta-oh.bb b/openembedded/packages/meta/meta-oh.bb index 7a82a69e30..c2d3110af6 100644 --- a/openembedded/packages/meta/meta-oh.bb +++ b/openembedded/packages/meta/meta-oh.bb @@ -2,7 +2,7 @@ PACKAGES = "oh-base-depends oh-task-base" # oh-task-base DESCRIPTION = "Meta-package for OpenHand Palmtop Environment" MAINTAINER = "Richard Purdie " -PR = "r11" +PR = "r14" ALLOW_EMPTY = "1" diff --git a/openembedded/packages/meta/oh-image.bb b/openembedded/packages/meta/oh-image.bb index 20dd7a6096..c4a0f84571 100644 --- a/openembedded/packages/meta/oh-image.bb +++ b/openembedded/packages/meta/oh-image.bb @@ -1,4 +1,4 @@ -PR = "r6" +PR = "r8" export IMAGE_BASENAME = "oh-image"