diff options
Diffstat (limited to 'desktop/fvwm95/fvwm95.SlackBuild')
-rw-r--r-- | desktop/fvwm95/fvwm95.SlackBuild | 36 |
1 files changed, 29 insertions, 7 deletions
diff --git a/desktop/fvwm95/fvwm95.SlackBuild b/desktop/fvwm95/fvwm95.SlackBuild index 682021a832..596bf22c65 100644 --- a/desktop/fvwm95/fvwm95.SlackBuild +++ b/desktop/fvwm95/fvwm95.SlackBuild @@ -1,8 +1,10 @@ -#!/bin/sh +#!/bin/bash # Slackware build script for fvwm95 # Copyright 2014 Tomasz Konojacki <me@xenu.tk> +# Copyright 2020 Logan Rathbone <poprocks@gmail.com> +# # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -22,26 +24,36 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +cd $(dirname $0) ; CWD=$(pwd) + PRGNAM=fvwm95 VERSION=${VERSION:-2.0.43f} -BUILD=${BUILD:-2} +BUILD=${BUILD:-3} TAG=${TAG:-_SBo} +PKGTYPE=${PKGTYPE:-tgz} if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac fi -CWD=$(pwd) +# 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 +fi + TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" @@ -71,6 +83,8 @@ find -L . \ # Apply patch to make compilation possible patch -p1 < $CWD/fvwm95.patch +# Apply patch to repair FvwmTaskbar 06/2022 +patch -p1 < $CWD/fvwm95.new.patch CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ @@ -109,8 +123,16 @@ cp -a Changelog README GPL INSTALL README.rouat fvwm-StackingOrder.html \ FvwmTaskBar-plugins.patch.README $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild +# plop the old Slackware <= 10.0 default config into /usr/doc as a little Easter Egg +cat $CWD/fvwm95rc-slack10_0.in | sed -e "s,@libdir@,/usr/lib${LIBDIRSUFFIX},g" \ + > $PKG/usr/doc/$PRGNAM-$VERSION/fvwm95rc-slack10_0 + +# ... this also needs to be there for the Start button to work: +install -m 644 $CWD/fvwm95-menu.xpm \ + $PKG/usr/lib${LIBDIRSUFFIX}/X11/pixmaps/fvwm95-menu.xpm + mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE |