summaryrefslogtreecommitdiff
path: root/source
diff options
context:
space:
mode:
authorPatrick J Volkerding <volkerdi@slackware.com>2021-10-04 19:28:39 +0000
committerEric Hameleers <alien@slackware.com>2021-10-05 09:00:04 +0200
commitc8de49b25af424891cc61038361873c809f5c2b7 (patch)
tree4efc0afbcac561c4779c1251f354699da4fcf868 /source
parentd1596dee9dd02b4f89228bf87a72a6fb8cefccf5 (diff)
downloadcurrent-c8de49b25af424891cc61038361873c809f5c2b7.tar.gz
Mon Oct 4 19:28:39 UTC 202120211004192839
a/util-linux-2.37.2-x86_64-3.txz: Rebuilt. Removed broken /usr/bin/raw symlink. Thanks to marav. d/gdb-11.1-x86_64-2.txz: Rebuilt. Don't ship .la files. d/vala-0.54.2-x86_64-1.txz: Upgraded. kde/artikulate-21.08.1-x86_64-3.txz: Rebuilt. Fixed broken COPYING{,.DOC} symlinks. Thanks to marav. kde/kservice-5.86.0-x86_64-4.txz: Rebuilt. In /etc/profile.d/kde.{csh,sh}: Fixed test for kf5 directory. Thanks to LuckyCyborg. Make adding /etc/kde/xdg to $XDG_CONFIG_DIRS conditional on the existence of that directory. l/imagemagick-7.1.0_9-x86_64-1.txz: Upgraded. n/bind-9.16.21-x86_64-4.txz: Rebuilt. Removed broken symlink. Thanks to marav. n/httpd-2.4.50-x86_64-1.txz: Upgraded. x/cldr-emoji-annotation-37.0_13.0_0_2-noarch-4.txz: Rebuilt. Fixed broken COPYING symlink. Thanks to marav. xap/x3270-4.0ga14-x86_64-2.txz: Rebuilt. Fixed symlinks in html directory. Thanks to marav.
Diffstat (limited to 'source')
-rwxr-xr-xsource/a/util-linux/util-linux.SlackBuild3
-rwxr-xr-xsource/d/gdb/gdb.SlackBuild5
-rw-r--r--source/kde/kde/build/artikulate2
-rw-r--r--source/kde/kde/build/kservice2
-rwxr-xr-xsource/kde/kde/kde.SlackBuild2
-rw-r--r--source/kde/kde/post-install/kservice/profile.d/kde.csh13
-rw-r--r--source/kde/kde/post-install/kservice/profile.d/kde.sh14
-rwxr-xr-xsource/n/bind/bind.SlackBuild7
-rw-r--r--source/n/httpd/httpd.url4
-rwxr-xr-xsource/x/cldr-emoji-annotation/cldr-emoji-annotation.SlackBuild5
-rwxr-xr-xsource/xap/x3270/x3270.SlackBuild11
11 files changed, 40 insertions, 28 deletions
diff --git a/source/a/util-linux/util-linux.SlackBuild b/source/a/util-linux/util-linux.SlackBuild
index a0635751..033aa9ab 100755
--- a/source/a/util-linux/util-linux.SlackBuild
+++ b/source/a/util-linux/util-linux.SlackBuild
@@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=util-linux
VERSION=${VERSION:-$(echo util-linux*.tar.xz | cut -d - -f 3 | rev | cut -f 3- -d . | rev)}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
ADJTIMEXVERS=1.29
SETSERIALVERS=2.17
@@ -335,7 +335,6 @@ cd $TMP/util-linux-$VERSION # Go back home :)
# tunelp was removed by upstream:
#ln -s ../sbin/tunelp .
ln -s ../../bin/more .
- ln -s ../../sbin/raw .
cd $PKG/usr/man/man1
#ln -s ziptool.1 jaztool.1
cd $PKG/usr/man/man8
diff --git a/source/d/gdb/gdb.SlackBuild b/source/d/gdb/gdb.SlackBuild
index fae55a98..0a0a4c6c 100755
--- a/source/d/gdb/gdb.SlackBuild
+++ b/source/d/gdb/gdb.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=gdb
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
@@ -101,6 +101,9 @@ rmdir $PKG/usr/lib${LIBDIRSUFFIX} 2> /dev/null
rm -f $PKG/usr/info/{annotate*,bfd*,configure*,standards*}
rm -rf $PKG/usr/include
+# Don't ship .la files:
+rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la
+
# Head back out of the build-gdb directory..
cd ..
diff --git a/source/kde/kde/build/artikulate b/source/kde/kde/build/artikulate
index 0cfbf088..00750edc 100644
--- a/source/kde/kde/build/artikulate
+++ b/source/kde/kde/build/artikulate
@@ -1 +1 @@
-2
+3
diff --git a/source/kde/kde/build/kservice b/source/kde/kde/build/kservice
index 00750edc..b8626c4c 100644
--- a/source/kde/kde/build/kservice
+++ b/source/kde/kde/build/kservice
@@ -1 +1 @@
-3
+4
diff --git a/source/kde/kde/kde.SlackBuild b/source/kde/kde/kde.SlackBuild
index 459165b0..86b2bcd3 100755
--- a/source/kde/kde/kde.SlackBuild
+++ b/source/kde/kde/kde.SlackBuild
@@ -396,7 +396,7 @@ build_mod_pkg () {
else
cp -a \
AUTHORS* CONTRIBUTING* COPYING* HACKING* \
- INSTALL* MAINTAINERS README* NEWS* TODO* \
+ INSTALL* LICENSE* MAINTAINERS README* NEWS* TODO* \
$PKG/usr/doc/${PKGNAME}-${MODULAR_PACKAGE_VERSION}
# If there's a ChangeLog, installing at least part of the recent
# history is useful, but don't let it get totally out of control:
diff --git a/source/kde/kde/post-install/kservice/profile.d/kde.csh b/source/kde/kde/post-install/kservice/profile.d/kde.csh
index a5bc081f..6884c0f1 100644
--- a/source/kde/kde/post-install/kservice/profile.d/kde.csh
+++ b/source/kde/kde/post-install/kservice/profile.d/kde.csh
@@ -5,18 +5,21 @@ if ( ! $?KDEDIRS ) then
endif
# Add KDE paths if they exist:
-if ( -d /usr/lib/kf5 ) then
+if ( -d /usr/lib/libexec/kf5 ) then
setenv PATH ${PATH}:/usr/lib/libexec/kf5
endif
if ( -d /usr/lib/kde4/libexec ) then
setenv PATH ${PATH}:/usr/lib/kde4/libexec
endif
-# Add /etc/kde/xdg to $XDG_CONFIG_DIRS:
-if ( $?XDG_CONFIG_DIRS ) then
+# If there's no $XDG_CONFIG_DIRS variable, set it to /etc/xdg:
+if ( ! $?XDG_CONFIG_DIRS ) then
+ setenv XDG_CONFIG_DIRS /etc/xdg
+endif
+
+# Add /etc/kde/xdg to $XDG_CONFIG_DIRS (if it exists):
+if ( -d /etc/kde/xdg ) then
setenv XDG_CONFIG_DIRS ${XDG_CONFIG_DIRS}:/etc/kde/xdg
-else
- setenv XDG_CONFIG_DIRS /etc/xdg:/etc/kde/xdg
endif
# Commented out, since PAM should take care of this:
diff --git a/source/kde/kde/post-install/kservice/profile.d/kde.sh b/source/kde/kde/post-install/kservice/profile.d/kde.sh
index ced4a482..8b7c3e37 100644
--- a/source/kde/kde/post-install/kservice/profile.d/kde.sh
+++ b/source/kde/kde/post-install/kservice/profile.d/kde.sh
@@ -4,7 +4,7 @@ KDEDIRS=/usr
export KDEDIRS
# Add KDE paths if they exist:
-if [ -d /usr/lib/kf5 ]; then
+if [ -d /usr/lib/libexec/kf5 ]; then
PATH="$PATH:/usr/lib/libexec/kf5"
fi
if [ -d /usr/lib/kde4/libexec ]; then
@@ -12,12 +12,16 @@ if [ -d /usr/lib/kde4/libexec ]; then
fi
export PATH
-# Add /etc/kde/xdg to $XDG_CONFIG_DIRS:
-if [ ! "$XDG_CONFIG_DIRS" = "" ]; then
+# If there's no $XDG_CONFIG_DIRS variable, set it to /etc/xdg:
+if [ -z "$XDG_CONFIG_DIRS" ]; then
+ XDG_CONFIG_DIRS=/etc/xdg
+fi
+
+# Add /etc/kde/xdg to $XDG_CONFIG_DIRS (if it exists):
+if [ -d /etc/kde/xdg ]; then
XDG_CONFIG_DIRS=$XDG_CONFIG_DIRS:/etc/kde/xdg
-else
- XDG_CONFIG_DIRS=/etc/xdg:/etc/kde/xdg
fi
+
export XDG_CONFIG_DIRS
# Commented out, since PAM should take care of this:
diff --git a/source/n/bind/bind.SlackBuild b/source/n/bind/bind.SlackBuild
index 5e752c76..b1b0d888 100755
--- a/source/n/bind/bind.SlackBuild
+++ b/source/n/bind/bind.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=bind
VERSION=${VERSION:-$(echo ${PKGNAM}-[0-9]*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-3}
+BUILD=${BUILD:-4}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
@@ -133,11 +133,6 @@ chmod 755 $PKG/usr/lib${LIBDIRSUFFIX}/*
find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
| cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
-# Symlink hardlinked man pages:
-( cd $PKG/usr/man/man1
- ln -sf isc-config.sh.1 bind9-config.1
-)
-
# Compress manual pages:
find $PKG/usr/man -type f -exec gzip -9 {} \+
for i in $( find $PKG/usr/man -type l ) ; do
diff --git a/source/n/httpd/httpd.url b/source/n/httpd/httpd.url
index 08da5553..e21c78ba 100644
--- a/source/n/httpd/httpd.url
+++ b/source/n/httpd/httpd.url
@@ -1,2 +1,2 @@
-http://www.apache.org/dist/httpd/httpd-2.4.49.tar.bz2
-http://www.apache.org/dist/httpd/httpd-2.4.49.tar.bz2.asc
+http://www.apache.org/dist/httpd/httpd-2.4.50.tar.bz2
+http://www.apache.org/dist/httpd/httpd-2.4.50.tar.bz2.asc
diff --git a/source/x/cldr-emoji-annotation/cldr-emoji-annotation.SlackBuild b/source/x/cldr-emoji-annotation/cldr-emoji-annotation.SlackBuild
index 4a0df793..b5466f18 100755
--- a/source/x/cldr-emoji-annotation/cldr-emoji-annotation.SlackBuild
+++ b/source/x/cldr-emoji-annotation/cldr-emoji-annotation.SlackBuild
@@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=cldr-emoji-annotation
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-3}
+BUILD=${BUILD:-4}
NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
@@ -85,8 +85,9 @@ make $NUMJOBS || make || exit 1
make install DESTDIR=$PKG || exit 1
mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
-cp -a AUTHORS ChangeLog COPYING INSTALL NEWS README \
+cp -a AUTHORS* ChangeLog INSTALL* NEWS* README* \
$PKG/usr/doc/$PKGNAM-$VERSION
+cp -a $(readlink -f COPYING) $PKG/usr/doc/$PKGNAM-$VERSION/COPYING
mkdir -p $PKG/install
cat $CWD/slack-desc > $PKG/install/slack-desc
diff --git a/source/xap/x3270/x3270.SlackBuild b/source/xap/x3270/x3270.SlackBuild
index 1966e0ac..eb922d77 100755
--- a/source/xap/x3270/x3270.SlackBuild
+++ b/source/xap/x3270/x3270.SlackBuild
@@ -26,7 +26,7 @@ PKGNAM=x3270
VERSION=4.0
TARBVER=${TARBVER:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
VERSION=$(echo $TARBVER | cut -f 1,2 -d .)
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
@@ -128,9 +128,16 @@ done
mkdir -p $PKG/usr/doc/x3270-$TARBVER
cp -a \
- x3270/LICENSE* x3270/README* x3270/Examples x3270/html \
+ x3270/LICENSE* x3270/README* x3270/Examples \
README* \
$PKG/usr/doc/x3270-$TARBVER
+# Dereference symbolic links while copying html docs:
+mkdir -p $PKG/usr/doc/x3270-$TARBVER/html
+( cd x3270/html
+ for file in * ; do
+ cp -a $(readlink -f $file) $PKG/usr/doc/x3270-$TARBVER/html/$file
+ done
+)
mkdir -p $PKG/install
zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh