summaryrefslogtreecommitdiff
path: root/source/ap
diff options
context:
space:
mode:
authorPatrick J Volkerding <volkerdi@slackware.com>2019-02-17 01:45:20 +0000
committerEric Hameleers <alien@slackware.com>2019-02-17 12:28:26 +0100
commita576ec7a0e6c880029328d465402520ee1c20571 (patch)
treeb8213af51a4e616b41bb256d9e1a6bdc4d268536 /source/ap
parent32bf7dfc2d59c3200fbe2dfc94400b8f966b6ab1 (diff)
downloadcurrent-a576ec7a0e6c880029328d465402520ee1c20571.tar.gz
Sun Feb 17 01:45:20 UTC 201920190217014520
a/glibc-solibs-2.29-x86_64-3.txz: Rebuilt. ap/texinfo-6.6-x86_64-1.txz: Upgraded. l/elfutils-0.176-x86_64-1.txz: Upgraded. l/glibc-2.29-x86_64-3.txz: Rebuilt. l/glibc-i18n-2.29-x86_64-3.txz: Rebuilt. Go back to using the glibc.locale.no-archive.diff patch rather than the new built-in no-archive locale target. Avoiding hardlinks is not worth 700MB of useless bloat. Thanks to baldzhang. l/glibc-profile-2.29-x86_64-3.txz: Rebuilt. l/librsvg-2.44.13-x86_64-1.txz: Upgraded. x/xf86-video-chips-1.4.0-x86_64-1.txz: Upgraded. x/xf86-video-tdfx-1.5.0-x86_64-1.txz: Upgraded.
Diffstat (limited to 'source/ap')
-rwxr-xr-xsource/ap/texinfo/texinfo.SlackBuild5
-rw-r--r--source/ap/texinfo/texinfo.fix.unescaped.left.brace.diff16
2 files changed, 1 insertions, 20 deletions
diff --git a/source/ap/texinfo/texinfo.SlackBuild b/source/ap/texinfo/texinfo.SlackBuild
index 11e98bbd..1252ef7c 100755
--- a/source/ap/texinfo/texinfo.SlackBuild
+++ b/source/ap/texinfo/texinfo.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=texinfo
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-7}
+BUILD=${BUILD:-1}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
@@ -84,9 +84,6 @@ find . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \;
-# Fix for perl-5.28.0:
-zcat $CWD/texinfo.fix.unescaped.left.brace.diff.gz | patch -p1 --verbose || exit 1
-
# The --disable-perl-xs below prevents some perl extensions from being replaced
# by C versions which have been known to choke over UTF-8 issues:
diff --git a/source/ap/texinfo/texinfo.fix.unescaped.left.brace.diff b/source/ap/texinfo/texinfo.fix.unescaped.left.brace.diff
deleted file mode 100644
index 84dacb3b..00000000
--- a/source/ap/texinfo/texinfo.fix.unescaped.left.brace.diff
+++ /dev/null
@@ -1,16 +0,0 @@
---- ./tp/Texinfo/Parser.pm.orig 2017-09-12 13:49:03.000000000 -0500
-+++ ./tp/Texinfo/Parser.pm 2018-06-27 13:14:33.982547765 -0500
-@@ -5478,11 +5478,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->__(