Date: Thursday, June 7, 2018 @ 07:47:01 Author: arojas Revision: 326187
BUILDINFO rebuild Added: rcs/trunk/rcs-c++11.patch Modified: rcs/trunk/PKGBUILD -----------------+ PKGBUILD | 26 +++++++++------ rcs-c++11.patch | 93 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 109 insertions(+), 10 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2018-06-07 07:46:48 UTC (rev 326186) +++ PKGBUILD 2018-06-07 07:47:01 UTC (rev 326187) @@ -4,7 +4,7 @@ pkgname=rcs pkgver=5.9.4 -pkgrel=1 +pkgrel=2 pkgdesc='Revision Control System: manages multiple revisions of files' url='http://www.gnu.org/software/rcs/' license=('GPL3') @@ -11,22 +11,28 @@ arch=('x86_64') depends=('ed') validpgpkeys=('748EA0E81CB8A7489BFA6CE4670322244C807502') -source=("ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.xz"{,.sig}) +source=("ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.xz"{,.sig} rcs-c++11.patch) sha256sums=('063d5a0d7da1821754b80c639cdae2c82b535c8ff4131f75dc7bbf0cd63a5dff' - 'SKIP') + 'SKIP' + '569a8d5c851d2619393474a681e05c2eb83912e71adcf1124b895478c91e1fbb') +prepare() { + cd $pkgname-$pkgver + patch -p1 -i ../rcs-c++11.patch # Fix build with C++11 +} + build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr - make + cd ${pkgname}-${pkgver} + ./configure --prefix=/usr + make } check() { - cd "${srcdir}/${pkgname}-${pkgver}" - make check + cd ${pkgname}-${pkgver} + make check } package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make prefix="${pkgdir}/usr" install + cd ${pkgname}-${pkgver} + make prefix="${pkgdir}/usr" install } Added: rcs-c++11.patch =================================================================== --- rcs-c++11.patch (rev 0) +++ rcs-c++11.patch 2018-06-07 07:47:01 UTC (rev 326187) @@ -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 +
