diff options
author | Patrick J Volkerding <volkerdi@slackware.com> | 2020-12-29 20:34:54 +0000 |
---|---|---|
committer | Eric Hameleers <alien@slackware.com> | 2020-12-30 08:59:52 +0100 |
commit | 651d40d6d3b5ec8921993052339ec463b4b507ef (patch) | |
tree | b1616d035f419f4455e6d4d334b41ee9640bfa9a /source | |
parent | eae3926cf3efec6fbc3ce2b7df32c2ac37f90c77 (diff) | |
download | current-651d40d6d3b5ec8921993052339ec463b4b507ef.tar.gz |
Tue Dec 29 20:34:54 UTC 202020201229203454
a/pkgtools-15.0-noarch-34.txz: Rebuilt.
installpkg: run doinst.sh in a subshell for NOLOCK packages.
removepkg: run uninstall scripts in a subshell.
This avoids a bug when handling multiple packages where these scripts might
be in the wrong directory when a new file/package is to be processed.
Thanks to Mario Preksavec.
ap/terminus-font-4.49.1-noarch-1.txz: Upgraded.
d/git-2.30.0-x86_64-1.txz: Upgraded.
d/python-setuptools-51.1.1-x86_64-1.txz: Upgraded.
l/libproxy-0.4.17-x86_64-1.txz: Upgraded.
l/netpbm-10.93.00-x86_64-1.txz: Upgraded.
l/openjpeg-2.4.0-x86_64-1.txz: Upgraded.
xap/hexchat-2.14.3-x86_64-5.txz: Rebuilt.
Compile using -Dwith-python=python3-embed instead of -Dwith-python=python3
to ensure that /usr/lib*/hexchat/plugins/python.so is linked with libpython,
otherwise the module will not load properly.
Thanks to Mario Preksavec.
xfce/xfce4-panel-profiles-1.0.12-x86_64-1.txz: Upgraded.
xfce/xfce4-taskmanager-1.4.0-x86_64-1.txz: Upgraded.
Diffstat (limited to 'source')
-rwxr-xr-x | source/a/pkgtools/pkgtools.SlackBuild | 2 | ||||
-rw-r--r-- | source/a/pkgtools/scripts/installpkg | 4 | ||||
-rw-r--r-- | source/a/pkgtools/scripts/removepkg | 2 | ||||
-rwxr-xr-x | source/l/openjpeg/openjpeg.SlackBuild | 1 | ||||
-rwxr-xr-x | source/xap/hexchat/hexchat.SlackBuild | 6 | ||||
-rwxr-xr-x | source/xfce/xfce4-panel-profiles/xfce4-panel-profiles.SlackBuild | 18 | ||||
-rwxr-xr-x | source/xfce/xfce4-taskmanager/xfce4-taskmanager.SlackBuild | 2 |
7 files changed, 15 insertions, 20 deletions
diff --git a/source/a/pkgtools/pkgtools.SlackBuild b/source/a/pkgtools/pkgtools.SlackBuild index c92be7f4..d37ca076 100755 --- a/source/a/pkgtools/pkgtools.SlackBuild +++ b/source/a/pkgtools/pkgtools.SlackBuild @@ -30,7 +30,7 @@ PKGNAM=pkgtools # *** UPDATE THESE WITH EACH BUILD: VERSION=15.0 ARCH=${ARCH:-noarch} -BUILD=${BUILD:-33} +BUILD=${BUILD:-34} # If the variable PRINT_PACKAGE_NAME is set, then this script will report what # the name of the created package would be, and then exit. This information diff --git a/source/a/pkgtools/scripts/installpkg b/source/a/pkgtools/scripts/installpkg index f19cf59c..ddd8e693 100644 --- a/source/a/pkgtools/scripts/installpkg +++ b/source/a/pkgtools/scripts/installpkg @@ -677,9 +677,9 @@ EOF # rather than spawning subshells which is slow on ARM. This will also speed up # install script processing on any platform. if [ -x /bin/bash ]; then - cd $ROOT/ ; sed -e's?^( cd \([^;]*\);\(.*\) )$?pushd \1 \&\> /dev/null ; \2 ; popd \&\> /dev/null?g ' $INSTDIR/doinst.sh | /bin/bash + ( cd $ROOT/ ; sed -e's?^( cd \([^;]*\);\(.*\) )$?pushd \1 \&\> /dev/null ; \2 ; popd \&\> /dev/null?g ' $INSTDIR/doinst.sh | /bin/bash ) else - cd $ROOT/ ; sh $INSTDIR/doinst.sh + ( cd $ROOT/ ; sh $INSTDIR/doinst.sh ) fi else # use locking # If bash is available, use sed to convert the install script to use pushd/popd diff --git a/source/a/pkgtools/scripts/removepkg b/source/a/pkgtools/scripts/removepkg index 5a1c7dcd..ec9b4299 100644 --- a/source/a/pkgtools/scripts/removepkg +++ b/source/a/pkgtools/scripts/removepkg @@ -411,7 +411,7 @@ remove_packages() { fi # If there is an uninstall script, run it here: if [ -r $TMP/$PKGNAME ]; then - cd $ROOT/ ; sh $TMP/$PKGNAME + ( cd $ROOT/ ; sh $TMP/$PKGNAME ) # Move the uninstall script to $LOG_DIR/removed_uninstall_scripts: mv $TMP/$PKGNAME $LOG_DIR/removed_uninstall_scripts fi diff --git a/source/l/openjpeg/openjpeg.SlackBuild b/source/l/openjpeg/openjpeg.SlackBuild index e6e69350..a33c632b 100755 --- a/source/l/openjpeg/openjpeg.SlackBuild +++ b/source/l/openjpeg/openjpeg.SlackBuild @@ -100,6 +100,7 @@ cd build -DBUILD_MJ2:BOOL=ON \ -DBUILD_JPIP:BOOL=ON \ -DBUILD_JP3D:BOOL=ON \ + -DBUILD_STATIC_LIBS=OFF \ .. || exit 1 make $NUMJOBS || make || exit 1 diff --git a/source/xap/hexchat/hexchat.SlackBuild b/source/xap/hexchat/hexchat.SlackBuild index 73bab50b..c3c19bc5 100755 --- a/source/xap/hexchat/hexchat.SlackBuild +++ b/source/xap/hexchat/hexchat.SlackBuild @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright 2016, 2018 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2016, 2018, 2020 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=hexchat VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-4} +BUILD=${BUILD:-5} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -94,7 +94,7 @@ meson setup \ -Dwith-text=true \ -Dwith-ssl=true \ -Dwith-lua=false \ - -Dwith-python=python3 \ + -Dwith-python=python3-embed \ .. || exit 1 "${NINJA:=ninja}" $NUMJOBS || exit 1 DESTDIR=$PKG $NINJA install || exit 1 diff --git a/source/xfce/xfce4-panel-profiles/xfce4-panel-profiles.SlackBuild b/source/xfce/xfce4-panel-profiles/xfce4-panel-profiles.SlackBuild index 7ad0bf49..47ac305c 100755 --- a/source/xfce/xfce4-panel-profiles/xfce4-panel-profiles.SlackBuild +++ b/source/xfce/xfce4-panel-profiles/xfce4-panel-profiles.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=xfce4-panel-profiles VERSION=${VERSION:-$(echo xfce4-panel-profiles-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -80,13 +80,14 @@ find . \ # Configure, build, and install: CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ -./configure --prefix=/usr --python=python3 || exit 1 +./configure \ + --prefix=/usr \ + --mandir=/usr/man \ + --docdir=/usr/doc/$PKGNAM-$VERSION \ + --python=python3 || exit 1 make $NUMJOBS || exit 1 make install DESTDIR=$PKG || exit 1 -# Relocate man pages: -mv $PKG/usr/share/man $PKG/usr - find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null @@ -105,13 +106,6 @@ if [ -d $PKG/usr/man ]; then ) fi -rm -rf $PKG/usr/share/doc -mkdir -p $PKG/usr/doc/xfce4-panel-profiles-$VERSION -cp -a \ - AUTHORS COPYING* NEWS README* TODO \ - $PKG/usr/doc/xfce4-panel-profiles-$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: if [ -r ChangeLog ]; then DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION) cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog diff --git a/source/xfce/xfce4-taskmanager/xfce4-taskmanager.SlackBuild b/source/xfce/xfce4-taskmanager/xfce4-taskmanager.SlackBuild index e63d0b6a..50a0e111 100755 --- a/source/xfce/xfce4-taskmanager/xfce4-taskmanager.SlackBuild +++ b/source/xfce/xfce4-taskmanager/xfce4-taskmanager.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=xfce4-taskmanager VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} if [ -z "$ARCH" ]; then case "$( uname -m )" in |