diff options
Diffstat (limited to 'desktop/fvwm3/fvwm3.SlackBuild')
| -rw-r--r-- | desktop/fvwm3/fvwm3.SlackBuild | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/desktop/fvwm3/fvwm3.SlackBuild b/desktop/fvwm3/fvwm3.SlackBuild index 6996e2b1be..b9a6827b5b 100644 --- a/desktop/fvwm3/fvwm3.SlackBuild +++ b/desktop/fvwm3/fvwm3.SlackBuild @@ -2,7 +2,7 @@ # 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 @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=fvwm3 -VERSION=${VERSION:-1.0.4} +VERSION=${VERSION:-1.1.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -38,9 +38,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 @@ -73,7 +70,10 @@ rm -rf $PRGNAM-$VERSION tar xvf $CWD/$PRGNAM-$VERSION.tar.gz cd $PRGNAM-$VERSION -patch -p1 < $CWD/cmd_geometrywindow-move_null_check.patch +# rename perl libraries to avoid collisions with the stock fvwm +# borrowed from ALT Linux +# https://git.altlinux.org/gears/f/fvwm3.git?a=blob_plain;f=0001-rename-perl-fvwm.patch +zcat $CWD/0001-rename-perl-fvwm.patch.gz | patch -p2 chown -R root:root . find -L . \ @@ -82,6 +82,7 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; +./autogen.sh CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ @@ -101,6 +102,8 @@ CXXFLAGS="$SLKCFLAGS" \ 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 @@ -115,7 +118,7 @@ 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 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 |