Date: Thursday, October 11, 2018 @ 09:37:35 Author: bpiotrowski Revision: 336171
6.5-2: fix testsuite fixes FS#60200 Added: texinfo/trunk/r8006.patch Modified: texinfo/trunk/PKGBUILD -------------+ PKGBUILD | 13 ++++++++++--- r8006.patch | 16 ++++++++++++++++ 2 files changed, 26 insertions(+), 3 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2018-10-11 09:03:05 UTC (rev 336170) +++ PKGBUILD 2018-10-11 09:37:35 UTC (rev 336171) @@ -4,7 +4,7 @@ pkgname=texinfo pkgver=6.5 -pkgrel=1 +pkgrel=2 pkgdesc='GNU documentation system for on-line information and printed output' arch=(x86_64) url='http://www.gnu.org/software/texinfo/' @@ -13,13 +13,20 @@ depends=(ncurses gzip perl sh) source=(https://ftp.gnu.org/pub/gnu/$pkgname/$pkgname-$pkgver.tar.xz{,.sig} texinfo-install.hook - texinfo-remove.hook) + texinfo-remove.hook + r8006.patch) md5sums=('3715197e62e0e07f85860b3d7aab55ed' 'SKIP' '9a98fb162650ff3065f9a4ebec22db36' - '5590fb3ef9ec309c98f5a4d85eca49da') + '5590fb3ef9ec309c98f5a4d85eca49da' + 'd764aef5e2e5424f3f2d8303542d7443') validpgpkeys=('EAF669B31E31E1DECBD11513DDBC579DAB37FBA9') # Gavin Smith +prepare() { + cd $pkgname-$pkgver + patch -p1 -i "$srcdir/r8006.patch" +} + build() { cd $pkgname-$pkgver ./configure --prefix=/usr Added: r8006.patch =================================================================== --- r8006.patch (rev 0) +++ r8006.patch 2018-10-11 09:37:35 UTC (rev 336171) @@ -0,0 +1,16 @@ +--- trunk/tp/Texinfo/Parser.pm 2018/06/04 19:51:36 8006 ++++ trunk/tp/Texinfo/Parser.pm 2018/07/13 15:31:28 8007 +@@ -5531,11 +5531,11 @@ + } + } elsif ($command eq 'clickstyle') { + # REMACRO +- if ($line =~ /^\s+@([[:alnum:]][[:alnum:]\-]*)({})?\s*/) { ++ if ($line =~ /^\s+@([[:alnum:]][[:alnum:]\-]*)(\{\})?\s*/) { + $args = ['@'.$1]; + $self->{'clickstyle'} = $1; + $remaining = $line; +- $remaining =~ s/^\s+@([[:alnum:]][[:alnum:]\-]*)({})?\s*(\@(c|comment)((\@|\s+).*)?)?//; ++ $remaining =~ s/^\s+@([[:alnum:]][[:alnum:]\-]*)(\{\})?\s*(\@(c|comment)((\@|\s+).*)?)?//; + $has_comment = 1 if (defined($4)); + } else { + $self->line_error (sprintf($self->__(