diff --git a/desktop/fvwm3/0001-rename-perl-fvwm.patch.gz b/desktop/fvwm3/0001-rename-perl-fvwm.patch.gz index 10d31a2603..b9992b1fd6 100644 Binary files a/desktop/fvwm3/0001-rename-perl-fvwm.patch.gz and b/desktop/fvwm3/0001-rename-perl-fvwm.patch.gz differ diff --git a/desktop/fvwm3/README b/desktop/fvwm3/README index b3b2977903..d17068a74a 100644 --- a/desktop/fvwm3/README +++ b/desktop/fvwm3/README @@ -1,13 +1,17 @@ Fvwm3 is the newest version of the fvwm window manager, the successor to -fvwm2. +fvwm-2.6.x. -Fvwm3 is a multiple large virtual desktop window manager, originally (a -looooong time ago!) derived from twm. +Fvwm3 is a multiple large virtual desktop window manager, originally +derived from twm in 1993. Fvwm3 is intended to have a small memory footprint but a rich feature -set, be extremely customizable and extendible, and have a high degree of +set, be extremely customizable and extensible, and have a high degree of Motif mwm compatibility. +Although an existing fvwm2 configuration should mostly work with fvwm3, +it isn't guaranteed to work without some modifications. This is because +longstanding deprecated options have been removed, for example. + This package does not conflict with the stock fvwm package. Manpages for fvwm3 modules were moved as follows: diff --git a/desktop/fvwm3/fvwm3.SlackBuild b/desktop/fvwm3/fvwm3.SlackBuild index fc4eba2a1e..de9f8afae2 100644 --- a/desktop/fvwm3/fvwm3.SlackBuild +++ b/desktop/fvwm3/fvwm3.SlackBuild @@ -3,6 +3,7 @@ # Slackware build script for fvwm3 # Copyright 2020-2024, Alexander Verbovetsky, Moscow, Russia +# Copyright 2024, K. Eugene Carlson, Tsukuba, Japan # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -26,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=fvwm3 VERSION=${VERSION:-1.1.0} -BUILD=${BUILD:-2} +BUILD=${BUILD:-3} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -74,6 +75,8 @@ cd $PRGNAM-$VERSION # 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 +# fix references to renamed man pages and binaries +zcat $CWD/renamed-items.patch.gz | patch -p0 chown -R root:root . find -L . \ @@ -82,6 +85,8 @@ 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 {} \; +OSNAME="$(awk -F= '/^ID=/{print $2}' /etc/os-release)" + ./autogen.sh CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ @@ -97,7 +102,7 @@ CXXFLAGS="$SLKCFLAGS" \ --program-prefix= \ --program-suffix= \ --program-transform-name='/vwm[^3]/ s/vwm/vwm3/' \ - --build=$ARCH-slackware-linux + --build=$ARCH-$OSNAME-linux make make install DESTDIR=$PKG @@ -118,7 +123,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 CHANGELOG.md NEWS README.md $PKG/usr/doc/$PRGNAM-$VERSION +cp -a CHANGELOG.md COPYING NEWS README.md $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install diff --git a/desktop/fvwm3/fvwm3.info b/desktop/fvwm3/fvwm3.info index 942791e618..413d926b76 100644 --- a/desktop/fvwm3/fvwm3.info +++ b/desktop/fvwm3/fvwm3.info @@ -6,5 +6,5 @@ MD5SUM="033cb2740c12b5acd406d75271dd1317" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="google-go-lang" -MAINTAINER="Alexander Verbovetsky" -EMAIL="alik@ejik.org" +MAINTAINER="K. Eugene Carlson" +EMAIL="kvngncrlsn@gmail.com" diff --git a/desktop/fvwm3/renamed-items.patch.gz b/desktop/fvwm3/renamed-items.patch.gz new file mode 100644 index 0000000000..7649de77c8 Binary files /dev/null and b/desktop/fvwm3/renamed-items.patch.gz differ diff --git a/desktop/fvwm3/slack-desc b/desktop/fvwm3/slack-desc index 5c368a484d..3824d9a4b2 100644 --- a/desktop/fvwm3/slack-desc +++ b/desktop/fvwm3/slack-desc @@ -9,11 +9,11 @@ fvwm3: fvwm3 (the newest version of the fvwm window manager) fvwm3: fvwm3: Fvwm3 is a multiple large virtual desktop window manager, originally -fvwm3: (a looooong time ago!) derived from twm. The successor to fvwm2. +fvwm3: derived from twm in 1993. The successor to fvwm-2.6.x. +fvwm3: fvwm3: Fvwm3 is intended to have a small memory footprint but a rich feature -fvwm3: set, be extremely customizable and extendible, and have a high degree +fvwm3: set, be extremely customizable and extensible, and have a high degree fvwm3: of Motif mwm compatibility. fvwm3: +fvwm3: Maintainer: Thomas Adam fvwm3: Homepage: https://github.com/fvwmorg/fvwm3 -fvwm3: -fvwm3: diff --git a/desktop/fvwm3/xinitrc.fvwm3.gz b/desktop/fvwm3/xinitrc.fvwm3.gz index 269016347b..289f5fe10e 100644 Binary files a/desktop/fvwm3/xinitrc.fvwm3.gz and b/desktop/fvwm3/xinitrc.fvwm3.gz differ