[arch-commits] Commit in tdb/repos (6 files)
Jan Steffens
heftig at archlinux.org
Tue Aug 5 01:18:32 UTC 2014
Date: Tuesday, August 5, 2014 @ 03:18:32
Author: heftig
Revision: 219300
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
tdb/repos/extra-i686/0001-tdb-include-include-stdbool.h-in-tdb.h.patch
(from rev 219299, tdb/trunk/0001-tdb-include-include-stdbool.h-in-tdb.h.patch)
tdb/repos/extra-i686/PKGBUILD
(from rev 219299, tdb/trunk/PKGBUILD)
tdb/repos/extra-x86_64/0001-tdb-include-include-stdbool.h-in-tdb.h.patch
(from rev 219299, tdb/trunk/0001-tdb-include-include-stdbool.h-in-tdb.h.patch)
tdb/repos/extra-x86_64/PKGBUILD
(from rev 219299, tdb/trunk/PKGBUILD)
Deleted:
tdb/repos/extra-i686/PKGBUILD
tdb/repos/extra-x86_64/PKGBUILD
----------------------------------------------------------------+
/PKGBUILD | 86 ++++++++++
extra-i686/0001-tdb-include-include-stdbool.h-in-tdb.h.patch | 27 +++
extra-i686/PKGBUILD | 36 ----
extra-x86_64/0001-tdb-include-include-stdbool.h-in-tdb.h.patch | 27 +++
extra-x86_64/PKGBUILD | 36 ----
5 files changed, 140 insertions(+), 72 deletions(-)
Copied: tdb/repos/extra-i686/0001-tdb-include-include-stdbool.h-in-tdb.h.patch (from rev 219299, tdb/trunk/0001-tdb-include-include-stdbool.h-in-tdb.h.patch)
===================================================================
--- extra-i686/0001-tdb-include-include-stdbool.h-in-tdb.h.patch (rev 0)
+++ extra-i686/0001-tdb-include-include-stdbool.h-in-tdb.h.patch 2014-08-05 01:18:32 UTC (rev 219300)
@@ -0,0 +1,27 @@
+From 4e14a437963ba54987cd58b4e0705d9a6d8aea6f Mon Sep 17 00:00:00 2001
+From: Adam Williamson <awilliam at 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: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2014-08-05 01:17:39 UTC (rev 219299)
+++ extra-i686/PKGBUILD 2014-08-05 01:18:32 UTC (rev 219300)
@@ -1,36 +0,0 @@
-# $Id$
-# Maintainer: Tobias Powalowski <tpowa at archlinux.org>
-# Contributor: eric <eric at archlinux.org>
-# Contributor: Tom Newsom <Jeepster at gmx.co.uk>
-
-pkgname=tdb
-pkgver=1.3.0
-pkgrel=1
-pkgdesc="A Trivial Database similar to GDBM but allows simultaneous commits"
-arch=(i686 x86_64)
-license=('GPL3')
-url="http://tdb.samba.org/"
-source=(http://samba.org/ftp/${pkgname}/${pkgname}-${pkgver}.tar.gz)
-makedepends=('python2' 'libxslt' 'docbook-xsl')
-optdepends=('python2: for python bindings')
-
-build() {
- cd ${srcdir}/${pkgname}-${pkgver}
- sed -i -e 's#python#python2#g' buildtools/bin/waf
- #sed -i 's#python2\.6\([^ ]*\)#python2.7\1 python2.6\1#' configure
- # Use system docbook.xsl
- #_manstyle="/usr/share/xml/docbook/xsl-stylesheets-1.76.1/manpages/docbook.xsl"
- #sed -i "s#http.*xsl#$_manstyle#" tdb.mk
- export PYTHON=/usr/bin/python2
- ./configure --prefix=/usr \
- --localstatedir=/var \
- --sysconfdir=/etc/samba
- make
-}
-
-package() {
- cd ${srcdir}/${pkgname}-${pkgver}
- export PYTHON=/usr/bin/python2
- make DESTDIR=$pkgdir/ install
-}
-md5sums=('f18cd6afc4f5670edfe58f72d2665f94')
Copied: tdb/repos/extra-i686/PKGBUILD (from rev 219299, tdb/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2014-08-05 01:18:32 UTC (rev 219300)
@@ -0,0 +1,43 @@
+# $Id$
+# Maintainer: Tobias Powalowski <tpowa at archlinux.org>
+# Contributor: eric <eric at archlinux.org>
+# Contributor: Tom Newsom <Jeepster at gmx.co.uk>
+
+pkgname=tdb
+pkgver=1.3.0
+pkgrel=2
+pkgdesc="A Trivial Database similar to GDBM but allows simultaneous commits"
+arch=(i686 x86_64)
+license=('GPL3')
+url="http://tdb.samba.org/"
+makedepends=('python2' 'libxslt' 'docbook-xsl')
+optdepends=('python2: for python bindings')
+source=(http://samba.org/ftp/${pkgname}/${pkgname}-${pkgver}.tar.gz
+ 0001-tdb-include-include-stdbool.h-in-tdb.h.patch)
+md5sums=('f18cd6afc4f5670edfe58f72d2665f94'
+ '2b0b6003b3d8ca03adccd4aa1a3b8313')
+
+prepare() {
+ cd ${srcdir}/${pkgname}-${pkgver}
+ patch -Np1 -i ../0001-tdb-include-include-stdbool.h-in-tdb.h.patch
+}
+
+build() {
+ cd ${srcdir}/${pkgname}-${pkgver}
+ sed -i -e 's#python#python2#g' buildtools/bin/waf
+ #sed -i 's#python2\.6\([^ ]*\)#python2.7\1 python2.6\1#' configure
+ # Use system docbook.xsl
+ #_manstyle="/usr/share/xml/docbook/xsl-stylesheets-1.76.1/manpages/docbook.xsl"
+ #sed -i "s#http.*xsl#$_manstyle#" tdb.mk
+ export PYTHON=/usr/bin/python2
+ ./configure --prefix=/usr \
+ --localstatedir=/var \
+ --sysconfdir=/etc/samba
+ make
+}
+
+package() {
+ cd ${srcdir}/${pkgname}-${pkgver}
+ export PYTHON=/usr/bin/python2
+ make DESTDIR=$pkgdir/ install
+}
Copied: tdb/repos/extra-x86_64/0001-tdb-include-include-stdbool.h-in-tdb.h.patch (from rev 219299, tdb/trunk/0001-tdb-include-include-stdbool.h-in-tdb.h.patch)
===================================================================
--- extra-x86_64/0001-tdb-include-include-stdbool.h-in-tdb.h.patch (rev 0)
+++ extra-x86_64/0001-tdb-include-include-stdbool.h-in-tdb.h.patch 2014-08-05 01:18:32 UTC (rev 219300)
@@ -0,0 +1,27 @@
+From 4e14a437963ba54987cd58b4e0705d9a6d8aea6f Mon Sep 17 00:00:00 2001
+From: Adam Williamson <awilliam at 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: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2014-08-05 01:17:39 UTC (rev 219299)
+++ extra-x86_64/PKGBUILD 2014-08-05 01:18:32 UTC (rev 219300)
@@ -1,36 +0,0 @@
-# $Id$
-# Maintainer: Tobias Powalowski <tpowa at archlinux.org>
-# Contributor: eric <eric at archlinux.org>
-# Contributor: Tom Newsom <Jeepster at gmx.co.uk>
-
-pkgname=tdb
-pkgver=1.3.0
-pkgrel=1
-pkgdesc="A Trivial Database similar to GDBM but allows simultaneous commits"
-arch=(i686 x86_64)
-license=('GPL3')
-url="http://tdb.samba.org/"
-source=(http://samba.org/ftp/${pkgname}/${pkgname}-${pkgver}.tar.gz)
-makedepends=('python2' 'libxslt' 'docbook-xsl')
-optdepends=('python2: for python bindings')
-
-build() {
- cd ${srcdir}/${pkgname}-${pkgver}
- sed -i -e 's#python#python2#g' buildtools/bin/waf
- #sed -i 's#python2\.6\([^ ]*\)#python2.7\1 python2.6\1#' configure
- # Use system docbook.xsl
- #_manstyle="/usr/share/xml/docbook/xsl-stylesheets-1.76.1/manpages/docbook.xsl"
- #sed -i "s#http.*xsl#$_manstyle#" tdb.mk
- export PYTHON=/usr/bin/python2
- ./configure --prefix=/usr \
- --localstatedir=/var \
- --sysconfdir=/etc/samba
- make
-}
-
-package() {
- cd ${srcdir}/${pkgname}-${pkgver}
- export PYTHON=/usr/bin/python2
- make DESTDIR=$pkgdir/ install
-}
-md5sums=('f18cd6afc4f5670edfe58f72d2665f94')
Copied: tdb/repos/extra-x86_64/PKGBUILD (from rev 219299, tdb/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2014-08-05 01:18:32 UTC (rev 219300)
@@ -0,0 +1,43 @@
+# $Id$
+# Maintainer: Tobias Powalowski <tpowa at archlinux.org>
+# Contributor: eric <eric at archlinux.org>
+# Contributor: Tom Newsom <Jeepster at gmx.co.uk>
+
+pkgname=tdb
+pkgver=1.3.0
+pkgrel=2
+pkgdesc="A Trivial Database similar to GDBM but allows simultaneous commits"
+arch=(i686 x86_64)
+license=('GPL3')
+url="http://tdb.samba.org/"
+makedepends=('python2' 'libxslt' 'docbook-xsl')
+optdepends=('python2: for python bindings')
+source=(http://samba.org/ftp/${pkgname}/${pkgname}-${pkgver}.tar.gz
+ 0001-tdb-include-include-stdbool.h-in-tdb.h.patch)
+md5sums=('f18cd6afc4f5670edfe58f72d2665f94'
+ '2b0b6003b3d8ca03adccd4aa1a3b8313')
+
+prepare() {
+ cd ${srcdir}/${pkgname}-${pkgver}
+ patch -Np1 -i ../0001-tdb-include-include-stdbool.h-in-tdb.h.patch
+}
+
+build() {
+ cd ${srcdir}/${pkgname}-${pkgver}
+ sed -i -e 's#python#python2#g' buildtools/bin/waf
+ #sed -i 's#python2\.6\([^ ]*\)#python2.7\1 python2.6\1#' configure
+ # Use system docbook.xsl
+ #_manstyle="/usr/share/xml/docbook/xsl-stylesheets-1.76.1/manpages/docbook.xsl"
+ #sed -i "s#http.*xsl#$_manstyle#" tdb.mk
+ export PYTHON=/usr/bin/python2
+ ./configure --prefix=/usr \
+ --localstatedir=/var \
+ --sysconfdir=/etc/samba
+ make
+}
+
+package() {
+ cd ${srcdir}/${pkgname}-${pkgver}
+ export PYTHON=/usr/bin/python2
+ make DESTDIR=$pkgdir/ install
+}
More information about the arch-commits
mailing list