diff options
| author | B. Watson <yalhcru@gmail.com> | 2021-08-25 16:32:27 -0400 |
|---|---|---|
| committer | Willy Sudiarto Raharjo <willysr@slackbuilds.org> | 2021-10-13 00:51:43 +0700 |
| commit | c7616d1b968f59e8880dd94a75b6de3e9797f51d (patch) | |
| tree | 35119a1b48b0362764ab3a7aee4b68bc9c7904e5 /system/fsviewer/fsviewer.SlackBuild | |
| parent | ef97bb80afe309126d6ab9ae533e6f78e6ab9e4f (diff) | |
system/fsviewer: Fix build on -current.
Signed-off-by: B. Watson <yalhcru@gmail.com>
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
Diffstat (limited to 'system/fsviewer/fsviewer.SlackBuild')
| -rw-r--r-- | system/fsviewer/fsviewer.SlackBuild | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/system/fsviewer/fsviewer.SlackBuild b/system/fsviewer/fsviewer.SlackBuild index acdb7b66420f8..ae0c4097a7b0d 100644 --- a/system/fsviewer/fsviewer.SlackBuild +++ b/system/fsviewer/fsviewer.SlackBuild @@ -6,11 +6,13 @@ # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details. +# 20210825 bkw: fix build on -current, BUILD=2. + cd $(dirname $0) ; CWD=$(pwd) PRGNAM=fsviewer VERSION=${VERSION:-0.2.6} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -22,9 +24,6 @@ if [ -z "$ARCH" ]; then esac fi -# 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 -# could be useful to other scripts. if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" exit 0 @@ -57,11 +56,8 @@ rm -rf $PRGNAM-app-$VERSION tar xvf $CWD/$PRGNAM-app-$VERSION.tar.bz2 cd $PRGNAM-app-$VERSION chown -R root:root . -find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; +find -L . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \ + \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+ # The WINGs API has changed slightly in the newer versions of WindowMaker patch -p1 < $CWD/wingsfix.diff @@ -71,6 +67,14 @@ if [ "${TITLEBAR:-no}" = "yes" ]; then patch -p1 < $CWD/titlebar.diff fi +# dirty hack way to handle this. easier than dealing with autocrap. +cp $CWD/get-wraster-flags . +chmod +x get-wraster-flags + +# gcc 10+ needs this. +SLKCFLAGS="$SLKCFLAGS -Wl,--allow-multiple-definition" + +PATH=".:$PATH" \ LIBS="-lWUtil -lX11 -lm -lXpm" \ CFLAGS="$SLKCFLAGS -std=gnu89" \ CXXFLAGS="$SLKCFLAGS" \ |