diff options
Diffstat (limited to 'desktop/fvwm3/fvwm3.SlackBuild')
-rw-r--r-- | desktop/fvwm3/fvwm3.SlackBuild | 77 |
1 files changed, 17 insertions, 60 deletions
diff --git a/desktop/fvwm3/fvwm3.SlackBuild b/desktop/fvwm3/fvwm3.SlackBuild index 988122f400..de7467eaa6 100644 --- a/desktop/fvwm3/fvwm3.SlackBuild +++ b/desktop/fvwm3/fvwm3.SlackBuild @@ -1,8 +1,8 @@ -#!/bin/sh +#!/bin/bash # Slackware build script for fvwm3 -# Copyright 2020-2021, Alexander Verbovetsky, Moscow, Russia +# Copyright 2020-2024, Alexander Verbovetsky, Moscow, Russia # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -22,10 +22,13 @@ # 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=fvwm3 -VERSION=${VERSION:-1.0.2} -BUILD=${BUILD:-3} +VERSION=${VERSION:-1.1.0} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} +PKGTYPE=${PKGTYPE:-tgz} if [ -z "$ARCH" ]; then case "$( uname -m )" in @@ -35,7 +38,11 @@ if [ -z "$ARCH" ]; then esac fi -CWD=$(pwd) +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} @@ -63,35 +70,6 @@ rm -rf $PRGNAM-$VERSION tar xvf $CWD/$PRGNAM-$VERSION.tar.gz cd $PRGNAM-$VERSION -patch -p1 < $CWD/update_fvwm_screen-dont_lose_desk_from_StartsOnScreen.patch - -mkdir -p bin/FvwmPrompt/vendor/golang.org/x -for DEPENDENCY in \ - abiosoft/ishell/2.0.0 \ - abiosoft/readline/155bce2042db95a783081fab225e74dd879055b0 \ - fatih/color/1.9.0 \ - flynn-archive/go-shlex/3f9db97f856818214da2e1057f8ad84803971cff \ - mattn/go-colorable/0.1.4 \ - mattn/go-isatty/0.0.12 \ - sirupsen/logrus/1.6.0 \ - golang/sys/12a6c2dcc1e4cb348b57847c73987099e261714b -do - DEPENDENCY_OWNER="$(echo "$DEPENDENCY" | cut -d/ -f1)" - DEPENDENCY_NAME="$(echo "$DEPENDENCY" | cut -d/ -f2)" - DEPENDENCY_REV="$(echo "$DEPENDENCY" | cut -d/ -f3)" - mkdir -p "bin/FvwmPrompt/vendor/github.com/$DEPENDENCY_OWNER" - tar xvf "$CWD/$DEPENDENCY_NAME-$DEPENDENCY_REV.tar.gz" - if [ "$DEPENDENCY_OWNER" = "golang" ]; then - mv "$DEPENDENCY_NAME-$DEPENDENCY_REV" \ - "bin/FvwmPrompt/vendor/golang.org/x/$DEPENDENCY_NAME" - else - mv "$DEPENDENCY_NAME-$DEPENDENCY_REV" \ - "bin/FvwmPrompt/vendor/github.com/$DEPENDENCY_OWNER/$DEPENDENCY_NAME" - fi -done - -cat $CWD/modules.txt > bin/FvwmPrompt/vendor/modules.txt - chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ @@ -112,12 +90,14 @@ CXXFLAGS="$SLKCFLAGS" \ --enable-golang \ --program-prefix= \ --program-suffix= \ - --program-transform-name='s/^fvwm-/fvwm3-/' \ + --program-transform-name='/vwm[^3]/ s/vwm/vwm3/' \ --build=$ARCH-slackware-linux make make install DESTDIR=$PKG +rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la + zcat $CWD/startfvwm3.gz > $PKG/usr/bin/startfvwm3 chmod 755 $PKG/usr/bin/startfvwm3 @@ -125,41 +105,18 @@ mkdir -p $PKG/etc/X11/xinit zcat $CWD/xinitrc.fvwm3.gz > $PKG/etc/X11/xinit/xinitrc.fvwm3 chmod 755 $PKG/etc/X11/xinit/xinitrc.fvwm3 -rm -rf $PKG/usr/share/doc -rm -rf $PKG/usr/share/locale -rm -f $PKG/usr/bin/fvwm3-convert-2.6 -mv $PKG/usr/bin/FvwmCommand $PKG/usr/bin/Fvwm3Command -mv $PKG/usr/bin/xpmroot $PKG/usr/bin/xpmroot3 - find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true find $PKG/usr/man -type f -exec gzip -9 {} \; for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done -for m in $PKG/usr/man/man1/Fvwm* ; do - case "$m" in *FvwmPrompt*) continue ;; esac - mv $m ${m/Fvwm/Fvwm3} -done - -for m in $PKG/usr/man/man1/fvwm-* ; do - mv $m ${m/fvwm-/fvwm3-} -done - -rm -f $PKG/usr/man/man1/xpmroot* -ln -s fvwm3-root.1.gz $PKG/usr/man/man1/xpmroot3.1.gz - -rm -f $PKG/usr/man/man1/fvwm3-convert-2.6.1.gz -rm -f $PKG/usr/man/man1/fvwm3-config-2.6.1.gz -rm -f $PKG/usr/man/man1/Fvwm3Console.1.gz -rm -f $PKG/usr/man/man1/Fvwm3ConsoleC.pl.1.gz - mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a NEWS $PKG/usr/doc/$PRGNAM-$VERSION +cp -a CHANGELOG.md NEWS README.md $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild 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 |