Date: Thursday, August 7, 2014 @ 10:29:59 Author: bluewind Revision: 116958
archrelease: copy trunk to multilib-x86_64 Added: lib32-tdb/repos/multilib-x86_64/0001-tdb-include-include-stdbool.h-in-tdb.h.patch (from rev 116957, lib32-tdb/trunk/0001-tdb-include-include-stdbool.h-in-tdb.h.patch) lib32-tdb/repos/multilib-x86_64/PKGBUILD (from rev 116957, lib32-tdb/trunk/PKGBUILD) Deleted: lib32-tdb/repos/multilib-x86_64/PKGBUILD ---------------------------------------------------+ 0001-tdb-include-include-stdbool.h-in-tdb.h.patch | 27 ++++++ PKGBUILD | 84 ++++++++++---------- 2 files changed, 73 insertions(+), 38 deletions(-) Copied: lib32-tdb/repos/multilib-x86_64/0001-tdb-include-include-stdbool.h-in-tdb.h.patch (from rev 116957, lib32-tdb/trunk/0001-tdb-include-include-stdbool.h-in-tdb.h.patch) =================================================================== --- 0001-tdb-include-include-stdbool.h-in-tdb.h.patch (rev 0) +++ 0001-tdb-include-include-stdbool.h-in-tdb.h.patch 2014-08-07 08:29:59 UTC (rev 116958) @@ -0,0 +1,27 @@ +From 4e14a437963ba54987cd58b4e0705d9a6d8aea6f Mon Sep 17 00:00:00 2001 +From: Adam Williamson <awill...@redhat.com> +Date: Fri, 23 May 2014 10:08:14 -0700 +Subject: [PATCH] tdb/include: include stdbool.h in tdb.h + +Commit db5bda56bf08 (tdb: add TDB_MUTEX_LOCKING support) adds a bool, but does +not include stdbool.h. This causes any build including tdb.h to fail, at least +for me with GCC 4.9.0. +--- + lib/tdb/include/tdb.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/include/tdb.h b/include/tdb.h +index 5ea5e60..03e429c 100644 +--- a/include/tdb.h ++++ b/include/tdb.h +@@ -31,6 +31,7 @@ extern "C" { + #endif + + #include <signal.h> ++#include <stdbool.h> + + /** + * @defgroup tdb The tdb API +-- +1.9.3 + Deleted: PKGBUILD =================================================================== --- PKGBUILD 2014-08-07 08:29:56 UTC (rev 116957) +++ PKGBUILD 2014-08-07 08:29:59 UTC (rev 116958) @@ -1,38 +0,0 @@ -# $Id$ -# Maintainer: Florian Pritz <f...@xssn.at> - -_pkgbasename=tdb -pkgname=lib32-$_pkgbasename -pkgver=1.2.12 -pkgrel=1 -pkgdesc="A Trivial Database similar to GDBM but allows simultaneous commits (32-bit)" -arch=(x86_64) -license=('GPL3') -url="http://tdb.samba.org/" -depends=(lib32-glibc $_pkgbasename) -makedepends=(gcc-multilib libxslt python2) -source=(http://samba.org/ftp/${_pkgbasename}/${_pkgbasename}-${pkgver}.tar.gz) -md5sums=('53e6168a7c2c93735a1c024fd2c3a7b4') - -build() { - export CC="gcc -m32" - export CXX="g++ -m32" - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - - cd "${srcdir}/${_pkgbasename}-${pkgver}" - - sed -i -e 's#python#python2#g' buildtools/bin/waf - - ./configure --prefix=/usr \ - --localstatedir=/var \ - --sysconfdir=/etc/samba \ - --libdir=/usr/lib32 \ - --disable-python - make -} - -package() { - cd "${srcdir}/${_pkgbasename}-${pkgver}" - make -j1 DESTDIR="$pkgdir" install - rm -rf "${pkgdir}"/usr/{include,share,bin} -} Copied: lib32-tdb/repos/multilib-x86_64/PKGBUILD (from rev 116957, lib32-tdb/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2014-08-07 08:29:59 UTC (rev 116958) @@ -0,0 +1,46 @@ +# $Id$ +# Maintainer: Florian Pritz <f...@xssn.at> + +_pkgbasename=tdb +pkgname=lib32-$_pkgbasename +pkgver=1.3.0 +pkgrel=1 +pkgdesc="A Trivial Database similar to GDBM but allows simultaneous commits (32-bit)" +arch=(x86_64) +license=('GPL3') +url="http://tdb.samba.org/" +depends=(lib32-glibc $_pkgbasename) +makedepends=(gcc-multilib libxslt python2) +source=(http://samba.org/ftp/${_pkgbasename}/${_pkgbasename}-${pkgver}.tar.gz + 0001-tdb-include-include-stdbool.h-in-tdb.h.patch) +md5sums=('f18cd6afc4f5670edfe58f72d2665f94' + '2b0b6003b3d8ca03adccd4aa1a3b8313') + +prepare() { + cd "${srcdir}/${_pkgbasename}-${pkgver}" + patch -Np1 -i ../0001-tdb-include-include-stdbool.h-in-tdb.h.patch +} + + +build() { + export CC="gcc -m32" + export CXX="g++ -m32" + export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" + + cd "${srcdir}/${_pkgbasename}-${pkgver}" + + sed -i -e 's#python#python2#g' buildtools/bin/waf + + ./configure --prefix=/usr \ + --localstatedir=/var \ + --sysconfdir=/etc/samba \ + --libdir=/usr/lib32 \ + --disable-python + make +} + +package() { + cd "${srcdir}/${_pkgbasename}-${pkgver}" + make -j1 DESTDIR="$pkgdir" install + rm -rf "${pkgdir}"/usr/{include,share,bin} +}