[arch-commits] Commit in rcs/trunk (PKGBUILD t810.diff)

Allan McRae allan at archlinux.org
Thu May 21 05:27:51 UTC 2020


    Date: Thursday, May 21, 2020 @ 05:27:50
  Author: allan
Revision: 387352

upgpkg: rcs 5.9.4-3: fix FTBFS

Added:
  rcs/trunk/t810.diff
Modified:
  rcs/trunk/PKGBUILD

-----------+
 PKGBUILD  |   10 +++++++---
 t810.diff |   14 ++++++++++++++
 2 files changed, 21 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-05-21 05:16:35 UTC (rev 387351)
+++ PKGBUILD	2020-05-21 05:27:50 UTC (rev 387352)
@@ -3,7 +3,7 @@
 
 pkgname=rcs
 pkgver=5.9.4
-pkgrel=2
+pkgrel=3
 pkgdesc='Revision Control System: manages multiple revisions of files'
 url='https://www.gnu.org/software/rcs/'
 license=('GPL3')
@@ -10,14 +10,18 @@
 arch=('x86_64')
 depends=('ed')
 validpgpkeys=('748EA0E81CB8A7489BFA6CE4670322244C807502')
-source=("https://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.xz"{,.sig} rcs-c++11.patch)
+source=("https://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.xz"{,.sig}
+        rcs-c++11.patch
+        t810.diff)
 sha256sums=('063d5a0d7da1821754b80c639cdae2c82b535c8ff4131f75dc7bbf0cd63a5dff'
             'SKIP'
-            '569a8d5c851d2619393474a681e05c2eb83912e71adcf1124b895478c91e1fbb')
+            '569a8d5c851d2619393474a681e05c2eb83912e71adcf1124b895478c91e1fbb'
+            'f7d8f458c6c7a0d435183378eb222244e07d9d66c8013b2fea4efca9a3e66a6d')
 
 prepare() {
   cd $pkgname-$pkgver
   patch -p1 -i ../rcs-c++11.patch # Fix build with C++11
+  patch -p1 -i $srcdir/t810.diff # fix test suite failure - git f2330a6268d244e97f47a97f4767736fc3b31455
 }
 
 build() {

Added: t810.diff
===================================================================
--- t810.diff	                        (rev 0)
+++ t810.diff	2020-05-21 05:27:50 UTC (rev 387352)
@@ -0,0 +1,14 @@
+diff --git a/tests/t810 b/tests/t810
+index ad3c00d..2e1c653 100644
+--- a/tests/t810
++++ b/tests/t810
+@@ -27,7 +27,8 @@ split_std_out_err no
+ 
+ must 'echo new line >> $w'
+ must 'ci -mm -l -d -T $w'
+-test $w -nt $v && problem "$w newer than $v"
++test 1 = `./btdt mtimecmp $w $v` \
++    && problem "$w newer than $v"
+ 
+ exit 0
+ 
\ No newline at end of file


More information about the arch-commits mailing list