Date: Saturday, May 20, 2017 @ 09:59:48 Author: arojas Revision: 228762
boost 1.64 rebuild Added: schroot/trunk/schroot-cppunit.patch Modified: schroot/trunk/PKGBUILD -----------------------+ PKGBUILD | 10 +++++++--- schroot-cppunit.patch | 11 +++++++++++ 2 files changed, 18 insertions(+), 3 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2017-05-20 09:25:39 UTC (rev 228761) +++ PKGBUILD 2017-05-20 09:59:48 UTC (rev 228762) @@ -4,7 +4,7 @@ pkgname=schroot pkgver=1.6.10 -pkgrel=14 +pkgrel=15 pkgdesc="Allows users to execute shell commands under different root filesystems. (Successor to dchroot)." url="http://packages.qa.debian.org/s/schroot.html" license=('GPL3') @@ -21,7 +21,7 @@ 'etc/schroot/arch32/mount' 'etc/schroot/arch32/nssdatabases') source=("http://ftp.debian.org/debian/pool/main/s/$pkgname/${pkgname}_${pkgver}.orig.tar.xz" - "http://http.debian.net/debian/pool/main/s/schroot/schroot_$pkgver-2.debian.tar.xz" + "http://http.debian.net/debian/pool/main/s/schroot/schroot_$pkgver-3.debian.tar.xz" 'arch32-example' 'arch32-config' 'arch32-copyfiles' @@ -28,9 +28,10 @@ 'arch32-mount' 'arch32-nssdatabases' 'pam.d.schroot.patch' + 'schroot-cppunit.patch' 'fix-bash-completion.patch') md5sums=('f8ec667831487f4b12e094bc0dc9bbe3' - '44c9913952e62738e244dda412f3d819' + '6ac9df83936f350ffe178fbe042829a1' '54239847f89b9a4772910415bde6276a' '5a3f7b839c7e0b8933748da7c5b6385b' 'ddb2f09c02b24dab777110f9808472e1' @@ -37,6 +38,7 @@ 'f0d5d5b5e34a860f6f90b5628c680f46' 'af1da6edd8c8c0dafeeb2c2c4e0c840b' 'a8d77cac806a0a9adef3f93cdbeb280a' + '4c744c38b1541359de5696c65a508e5e' '5ba775d4f401e2c167414caa548b71e5') prepare() { @@ -45,6 +47,8 @@ cat "$srcdir"/debian/patches/series | while read p; do patch -p1 -i "$srcdir"/debian/patches/$p done + # fix configure with cppunit 1.4 + patch -p1 -i ../schroot-cppunit.patch ./bootstrap } Added: schroot-cppunit.patch =================================================================== --- schroot-cppunit.patch (rev 0) +++ schroot-cppunit.patch 2017-05-20 09:59:48 UTC (rev 228762) @@ -0,0 +1,11 @@ +--- schroot-1.6.10/configure.ac.orig 2017-05-20 09:50:30.146864516 +0000 ++++ schroot-1.6.10/configure.ac 2017-05-20 09:51:26.216792794 +0000 +@@ -336,7 +336,7 @@ + [HAVE_UUID=yes], + [HAVE_UUID=no]) + +-AM_PATH_CPPUNIT([1.10.0], [HAVE_CPPUNIT=yes]) ++PKG_CHECK_MODULES([CPPUNIT], [cppunit], [HAVE_CPPUNIT=yes], [HAVE_CPPUNIT=no]) + AM_CONDITIONAL([USE_UNIT_TESTS], [test -n "$HAVE_CPPUNIT"]) + + SCHROOT_CFLAGS="$UUID_CFLAGS"