Date: Thursday, May 21, 2020 @ 05:28:12 Author: allan Revision: 387353
archrelease: copy trunk to extra-x86_64 Added: rcs/repos/extra-x86_64/PKGBUILD (from rev 387352, rcs/trunk/PKGBUILD) rcs/repos/extra-x86_64/rcs-c++11.patch (from rev 387352, rcs/trunk/rcs-c++11.patch) rcs/repos/extra-x86_64/t810.diff (from rev 387352, rcs/trunk/t810.diff) Deleted: rcs/repos/extra-x86_64/PKGBUILD rcs/repos/extra-x86_64/rcs-c++11.patch -----------------+ PKGBUILD | 79 +++++++++++----------- rcs-c++11.patch | 186 +++++++++++++++++++++++++++--------------------------- t810.diff | 14 ++++ 3 files changed, 148 insertions(+), 131 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2020-05-21 05:27:50 UTC (rev 387352) +++ PKGBUILD 2020-05-21 05:28:12 UTC (rev 387353) @@ -1,38 +0,0 @@ -# $Id$ -# Maintainer: Gaetan Bisson <bis...@archlinux.org> -# Contributor: dorphell <dorph...@archlinux.org> - -pkgname=rcs -pkgver=5.9.4 -pkgrel=2 -pkgdesc='Revision Control System: manages multiple revisions of files' -url='http://www.gnu.org/software/rcs/' -license=('GPL3') -arch=('x86_64') -depends=('ed') -validpgpkeys=('748EA0E81CB8A7489BFA6CE4670322244C807502') -source=("ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.xz"{,.sig} rcs-c++11.patch) -sha256sums=('063d5a0d7da1821754b80c639cdae2c82b535c8ff4131f75dc7bbf0cd63a5dff' - 'SKIP' - '569a8d5c851d2619393474a681e05c2eb83912e71adcf1124b895478c91e1fbb') - -prepare() { - cd $pkgname-$pkgver - patch -p1 -i ../rcs-c++11.patch # Fix build with C++11 -} - -build() { - cd ${pkgname}-${pkgver} - ./configure --prefix=/usr - make -} - -check() { - cd ${pkgname}-${pkgver} - make check -} - -package() { - cd ${pkgname}-${pkgver} - make prefix="${pkgdir}/usr" install -} Copied: rcs/repos/extra-x86_64/PKGBUILD (from rev 387352, rcs/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2020-05-21 05:28:12 UTC (rev 387353) @@ -0,0 +1,41 @@ +# Maintainer: Gaetan Bisson <bis...@archlinux.org> +# Contributor: dorphell <dorph...@archlinux.org> + +pkgname=rcs +pkgver=5.9.4 +pkgrel=3 +pkgdesc='Revision Control System: manages multiple revisions of files' +url='https://www.gnu.org/software/rcs/' +license=('GPL3') +arch=('x86_64') +depends=('ed') +validpgpkeys=('748EA0E81CB8A7489BFA6CE4670322244C807502') +source=("https://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.xz"{,.sig} + rcs-c++11.patch + t810.diff) +sha256sums=('063d5a0d7da1821754b80c639cdae2c82b535c8ff4131f75dc7bbf0cd63a5dff' + 'SKIP' + '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() { + cd ${pkgname}-${pkgver} + ./configure --prefix=/usr + make +} + +check() { + cd ${pkgname}-${pkgver} + make check +} + +package() { + cd ${pkgname}-${pkgver} + make prefix="${pkgdir}/usr" install +} Deleted: rcs-c++11.patch =================================================================== --- rcs-c++11.patch 2020-05-21 05:27:50 UTC (rev 387352) +++ rcs-c++11.patch 2020-05-21 05:28:12 UTC (rev 387353) @@ -1,93 +0,0 @@ -From 260704a9164dd34cf7128d6b1e88075ffa3be054 Mon Sep 17 00:00:00 2001 -From: Thien-Thi Nguyen <address@hidden> -Date: Thu, 18 Jun 2015 21:25:53 +0200 -Subject: [PATCH] =?UTF-8?q?[C=20slog]=20Move=20=E2=80=98exiting=E2=80=99?= - =?UTF-8?q?=20to=20beginning=20of=20func=20decl.?= -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Apparently, ‘gcc --std=c11’ does not abide the ‘exiting’ -attribute appearing at the end of the func decl. -Reported by Romain Francoise. -See also <https://bugs.debian.org/778100>. - -* src/b-complain.h (generic_fatal, fatal_syntax, fatal_sys) -* src/b-fb.h (Ierror, Oerror) -* src/base.h (unexpected_EOF, thank_you_and_goodnight): -Move ‘exiting’ attribute to beginning of func decl. ---- - src/b-complain.h | 10 ++++++---- - src/b-fb.h | 6 ++++-- - src/base.h | 8 ++++---- - -diff --git a/src/b-complain.h b/src/b-complain.h -index 0ffd157..ea0ffc5 100644 ---- a/src/b-complain.h -+++ b/src/b-complain.h -@@ -32,12 +32,14 @@ extern void generic_warn (char const *who, char const *fmt, ...) - printf_string (2, 3); - extern void generic_error (char const *who, char const *fmt, ...) - printf_string (2, 3); -+exiting - extern void generic_fatal (char const *who, char const *fmt, ...) -- printf_string (2, 3) exiting; -+ printf_string (2, 3); -+exiting - extern void fatal_syntax (size_t lno, char const *fmt, ...) -- printf_string (2, 3) exiting; --extern void fatal_sys (char const *who) -- exiting; -+ printf_string (2, 3); -+exiting -+extern void fatal_sys (char const *who); - - /* Idioms. Here, prefix P stands for "program" (general operation); - M for "manifestation"; R for "repository". */ -diff --git a/src/b-fb.h b/src/b-fb.h -index c9850e7..bf5eaf8 100644 ---- a/src/b-fb.h -+++ b/src/b-fb.h -@@ -21,9 +21,11 @@ - */ - - extern int change_mode (int fd, mode_t mode); --extern void Ierror (void) exiting; -+exiting -+extern void Ierror (void); - extern void testIerror (FILE *f); --extern void Oerror (void) exiting; -+exiting -+extern void Oerror (void); - extern void testOerror (FILE *o); - extern FILE *fopen_safer (char const *filename, char const *type); - extern void Ozclose (FILE **p); -diff --git a/src/base.h b/src/base.h -index 163ee09..5e7a9f8 100644 ---- a/src/base.h -+++ b/src/base.h -@@ -755,8 +755,8 @@ int dorewrite (bool lockflag, int changed); - int donerewrite (int changed, time_t newRCStime); - void ORCSclose (void); - void ORCSerror (void); --void unexpected_EOF (void) -- exiting; -+exiting -+void unexpected_EOF (void); - void initdiffcmd (struct diffcmd *dc); - int getdiffcmd (struct fro *finfile, bool delimiter, - FILE *foutfile, struct diffcmd *dc); -@@ -831,8 +831,8 @@ char const *date2str (char const date[datesize], - char datebuf[datesize + zonelenmax]); - - /* rcsutil */ --void thank_you_and_goodnight (int const how) -- exiting; -+exiting -+void thank_you_and_goodnight (int const how); - /* These are for ‘thank_you_and_goodnight’. */ - #define TYAG_ORCSERROR (1 << 3) - #define TYAG_DIRTMPUNLINK (1 << 2) --- -2.1.0 - Copied: rcs/repos/extra-x86_64/rcs-c++11.patch (from rev 387352, rcs/trunk/rcs-c++11.patch) =================================================================== --- rcs-c++11.patch (rev 0) +++ rcs-c++11.patch 2020-05-21 05:28:12 UTC (rev 387353) @@ -0,0 +1,93 @@ +From 260704a9164dd34cf7128d6b1e88075ffa3be054 Mon Sep 17 00:00:00 2001 +From: Thien-Thi Nguyen <address@hidden> +Date: Thu, 18 Jun 2015 21:25:53 +0200 +Subject: [PATCH] =?UTF-8?q?[C=20slog]=20Move=20=E2=80=98exiting=E2=80=99?= + =?UTF-8?q?=20to=20beginning=20of=20func=20decl.?= +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Apparently, ‘gcc --std=c11’ does not abide the ‘exiting’ +attribute appearing at the end of the func decl. +Reported by Romain Francoise. +See also <https://bugs.debian.org/778100>. + +* src/b-complain.h (generic_fatal, fatal_syntax, fatal_sys) +* src/b-fb.h (Ierror, Oerror) +* src/base.h (unexpected_EOF, thank_you_and_goodnight): +Move ‘exiting’ attribute to beginning of func decl. +--- + src/b-complain.h | 10 ++++++---- + src/b-fb.h | 6 ++++-- + src/base.h | 8 ++++---- + +diff --git a/src/b-complain.h b/src/b-complain.h +index 0ffd157..ea0ffc5 100644 +--- a/src/b-complain.h ++++ b/src/b-complain.h +@@ -32,12 +32,14 @@ extern void generic_warn (char const *who, char const *fmt, ...) + printf_string (2, 3); + extern void generic_error (char const *who, char const *fmt, ...) + printf_string (2, 3); ++exiting + extern void generic_fatal (char const *who, char const *fmt, ...) +- printf_string (2, 3) exiting; ++ printf_string (2, 3); ++exiting + extern void fatal_syntax (size_t lno, char const *fmt, ...) +- printf_string (2, 3) exiting; +-extern void fatal_sys (char const *who) +- exiting; ++ printf_string (2, 3); ++exiting ++extern void fatal_sys (char const *who); + + /* Idioms. Here, prefix P stands for "program" (general operation); + M for "manifestation"; R for "repository". */ +diff --git a/src/b-fb.h b/src/b-fb.h +index c9850e7..bf5eaf8 100644 +--- a/src/b-fb.h ++++ b/src/b-fb.h +@@ -21,9 +21,11 @@ + */ + + extern int change_mode (int fd, mode_t mode); +-extern void Ierror (void) exiting; ++exiting ++extern void Ierror (void); + extern void testIerror (FILE *f); +-extern void Oerror (void) exiting; ++exiting ++extern void Oerror (void); + extern void testOerror (FILE *o); + extern FILE *fopen_safer (char const *filename, char const *type); + extern void Ozclose (FILE **p); +diff --git a/src/base.h b/src/base.h +index 163ee09..5e7a9f8 100644 +--- a/src/base.h ++++ b/src/base.h +@@ -755,8 +755,8 @@ int dorewrite (bool lockflag, int changed); + int donerewrite (int changed, time_t newRCStime); + void ORCSclose (void); + void ORCSerror (void); +-void unexpected_EOF (void) +- exiting; ++exiting ++void unexpected_EOF (void); + void initdiffcmd (struct diffcmd *dc); + int getdiffcmd (struct fro *finfile, bool delimiter, + FILE *foutfile, struct diffcmd *dc); +@@ -831,8 +831,8 @@ char const *date2str (char const date[datesize], + char datebuf[datesize + zonelenmax]); + + /* rcsutil */ +-void thank_you_and_goodnight (int const how) +- exiting; ++exiting ++void thank_you_and_goodnight (int const how); + /* These are for ‘thank_you_and_goodnight’. */ + #define TYAG_ORCSERROR (1 << 3) + #define TYAG_DIRTMPUNLINK (1 << 2) +-- +2.1.0 + Copied: rcs/repos/extra-x86_64/t810.diff (from rev 387352, rcs/trunk/t810.diff) =================================================================== --- t810.diff (rev 0) +++ t810.diff 2020-05-21 05:28:12 UTC (rev 387353) @@ -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