summaryrefslogtreecommitdiffstats
path: root/source
diff options
context:
space:
mode:
author Patrick J Volkerding <volkerdi@slackware.com>2019-02-17 01:45:20 +0000
committer Eric Hameleers <alien@slackware.com>2019-02-17 12:28:26 +0100
commita576ec7a0e6c880029328d465402520ee1c20571 (patch)
treeb8213af51a4e616b41bb256d9e1a6bdc4d268536 /source
parent32bf7dfc2d59c3200fbe2dfc94400b8f966b6ab1 (diff)
downloadcurrent-a576ec7a0e6c880029328d465402520ee1c20571.tar.gz
current-a576ec7a0e6c880029328d465402520ee1c20571.tar.xz
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')
-rwxr-xr-xsource/ap/texinfo/texinfo.SlackBuild5
-rw-r--r--source/ap/texinfo/texinfo.fix.unescaped.left.brace.diff16
-rwxr-xr-xsource/l/glibc/glibc.SlackBuild9
-rw-r--r--source/l/glibc/glibc.locale.no-archive.diff10
-rw-r--r--source/x/x11/build/xf86-video-tdfx2
5 files changed, 19 insertions, 23 deletions
diff --git a/source/ap/texinfo/texinfo.SlackBuild b/source/ap/texinfo/texinfo.SlackBuild
index 11e98bbd5..1252ef7c0 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 84dacb3b3..000000000
--- 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->__(
diff --git a/source/l/glibc/glibc.SlackBuild b/source/l/glibc/glibc.SlackBuild
index 3f20e6677..17bee21b3 100755
--- a/source/l/glibc/glibc.SlackBuild
+++ b/source/l/glibc/glibc.SlackBuild
@@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=glibc
VERSION=${VERSION:-$(echo glibc-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
CHECKOUT=${CHECKOUT:-""}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
# I was considering disabling NSCD, but MoZes talked me out of it. :)
#DISABLE_NSCD=" --disable-nscd "
@@ -148,6 +148,9 @@ fix_doinst() {
# This is a patch function to put all glibc patches in the build script
# up near the top.
apply_patches() {
+ # Use old-style locale directories rather than a single (and strangely
+ # formatted) /usr/lib/locale/locale-archive file:
+ zcat $CWD/glibc.locale.no-archive.diff.gz | patch -p1 --verbose || exit 1
# Support ru_RU.CP1251 locale:
zcat $CWD/glibc.ru_RU.CP1251.diff.gz | patch -p1 --verbose || exit 1
# Add a C.UTF-8 locale:
@@ -244,7 +247,9 @@ CFLAGS="-g $OPTIMIZ" \
make $NUMJOBS || make || exit 1
make install install_root=$PKG || exit 1
-make localedata/install-locale-files DESTDIR=$PKG || exit 1
+# Don't use this, as it makes the i18n package WAY bigger:
+#make localedata/install-locale-files DESTDIR=$PKG || exit 1
+make localedata/install-locales install_root=$PKG DESTDIR=$PKG || exit 1
# We've always had an sln symlink in /bin, so let's make sure it
# remains there so as not to break any scripts that might need it:
diff --git a/source/l/glibc/glibc.locale.no-archive.diff b/source/l/glibc/glibc.locale.no-archive.diff
new file mode 100644
index 000000000..173bafc72
--- /dev/null
+++ b/source/l/glibc/glibc.locale.no-archive.diff
@@ -0,0 +1,10 @@
+--- ./localedata/Makefile.orig 2019-02-16 14:05:01.794154302 -0600
++++ ./localedata/Makefile 2019-02-16 14:06:25.744146460 -0600
+@@ -413,6 +413,7 @@
+ echo -n '...'; \
+ input=`echo $$locale | sed 's/\([^.]*\)[^@]*\(.*\)/\1\2/'`; \
+ $(LOCALEDEF) $$flags --alias-file=../intl/locale.alias \
++ --no-archive \
+ -i locales/$$input -f charmaps/$$charset \
+ $(addprefix --prefix=,$(install_root)) $$locale \
+ && echo ' done';
diff --git a/source/x/x11/build/xf86-video-tdfx b/source/x/x11/build/xf86-video-tdfx
index 00750edc0..d00491fd7 100644
--- a/source/x/x11/build/xf86-video-tdfx
+++ b/source/x/x11/build/xf86-video-tdfx
@@ -1 +1 @@
-3
+1