diff options
| author |   Patrick J Volkerding <volkerdi@slackware.com> | 2024-03-30 18:08:12 +0000 |
|---|---|---|
| committer |   Eric Hameleers <alien@slackware.com> | 2024-03-30 19:28:56 +0100 |
| commit | 730cbea73016aa93a7291927d237c371d9b196cd (patch) | |
| tree | ed04d78d1ae1bd92b09f4d2d3bdac4d5baa01460 /extra | |
| parent | 44183f6ba3935ea6dd56a2fad0394bc736e7461d (diff) | |
| download | current-730cbea73016aa93a7291927d237c371d9b196cd.tar.gz current-730cbea73016aa93a7291927d237c371d9b196cd.tar.xz | |
Sat Mar 30 18:08:12 UTC 202420240330180812
a/xz-5.6.1-x86_64-3.txz: Rebuilt.
[PATCH] CMake: Fix sabotaged Landlock sandbox check.
We don't build with CMake (yet), but it doesn't hurt to apply this.
d/mercurial-6.7.2-x86_64-1.txz: Upgraded.
l/boost-1.84.0-x86_64-3.txz: Rebuilt.
Recompiled against python-3.11.8. Thanks to rinza.
l/python-pycparser-2.22-x86_64-1.txz: Upgraded.
l/python-pytz-2024.1-x86_64-2.txz: Removed.
No longer needed with python-3.11. Thanks to audriusk.
l/python-tomli-2.0.1-x86_64-2.txz: Removed.
No longer needed with python-3.11. Thanks to TommyC7 and audriusk.
n/c-ares-1.28.0-x86_64-1.txz: Upgraded.
xap/xsnow-3.7.9-x86_64-1.txz: Upgraded.
extra/brltty/brltty-6.6-x86_64-4.txz: Rebuilt.
Don't install anything under /usr/local. Thanks to reddog83.
Diffstat (limited to 'extra')
| -rwxr-xr-x | extra/source/brltty/brltty.SlackBuild | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/extra/source/brltty/brltty.SlackBuild b/extra/source/brltty/brltty.SlackBuild index 74ea05d32..d0cef43ed 100755 --- a/extra/source/brltty/brltty.SlackBuild +++ b/extra/source/brltty/brltty.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright 2010, 2012, 2013, 2016, 2017, 2018, 2020, 2021 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2010, 2012, 2013, 2016, 2017, 2018, 2020, 2021, 2024 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -32,7 +32,7 @@ PKG=/tmp/package-brltty PKGNAM=brltty VERSION=${VERSION:-$(echo $PKGNAM-*.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 @@ -81,6 +81,7 @@ find . -perm 600 -exec chmod 644 {} \+ --bindir=/bin \ --sbindir=/sbin \ --libdir=/lib${LIBDIRSUFFIX} \ + --libexecdir=/usr/lib${LIBDIRSUFFIX} \ --infodir=/usr/info \ --mandir=/usr/man \ --sysconfdir=/etc \ @@ -95,6 +96,13 @@ make install INSTALL_ROOT=$PKG || exit 1 make install TCL_DIR=/usr/lib${LIBDIRSUFFIX} INSTALL_ROOT=$PKG || exit 1 chmod 755 $PKG/bin/* $PKG/lib${LIBDIRSUFFIX}/brltty/* +# This location does not appear to be (easily) configurable, so we'll +# just go ahead and move this directory if we find it in the wrong place: +if [ -d $PKG/usr/local/lib${LIBDIRSUFFIX}/lua ]; then + mv $PKG/usr/local/lib${LIBDIRSUFFIX}/lua $PKG/usr/lib${LIBDIRSUFFIX} + ( cd $PKG/usr ; rmdir -p local/lib${LIBDIRSUFFIX} ) +fi + # Add polkit configs: ( cd Authorization/Polkit make install INSTALL_ROOT=$PKG @@ -155,5 +163,4 @@ EOF cat $CWD/slack-desc > $PKG/install/slack-desc cd $PKG -makepkg -l y -c n ../brltty-$VERSION-$ARCH-$BUILD.txz - +makepkg -l y -c n $TMP/brltty-$VERSION-$ARCH-$BUILD.txz |