diff options
| -rw-r--r-- | desktop/fvwm3/0001-rename-perl-fvwm.patch.gz | bin | 13139 -> 0 bytes | |||
| -rw-r--r-- | desktop/fvwm3/README | 2 | ||||
| -rw-r--r-- | desktop/fvwm3/config-renames.patch.gz (renamed from desktop/fvwm3/renamed-items.patch.gz) | bin | 2440 -> 2441 bytes | |||
| -rw-r--r-- | desktop/fvwm3/fvwm3.SlackBuild | 50 | ||||
| -rw-r--r-- | desktop/fvwm3/fvwm3.info | 8 | ||||
| -rw-r--r-- | desktop/fvwm3/renames.patch.gz | bin | 0 -> 21110 bytes |
6 files changed, 38 insertions, 22 deletions
diff --git a/desktop/fvwm3/0001-rename-perl-fvwm.patch.gz b/desktop/fvwm3/0001-rename-perl-fvwm.patch.gz Binary files differdeleted file mode 100644 index b9992b1fd6..0000000000 --- a/desktop/fvwm3/0001-rename-perl-fvwm.patch.gz +++ /dev/null diff --git a/desktop/fvwm3/README b/desktop/fvwm3/README index d17068a74a..46e94eb259 100644 --- a/desktop/fvwm3/README +++ b/desktop/fvwm3/README @@ -19,4 +19,4 @@ FvwmAnimate --> Fvwm3Animate FvwmAuto --> Fvwm3Auto ... -google-go-lang is needed only at build time. +google-go-lang and python3-meson-opt are needed only at build time. diff --git a/desktop/fvwm3/renamed-items.patch.gz b/desktop/fvwm3/config-renames.patch.gz Binary files differindex 7649de77c8..1b449636f8 100644 --- a/desktop/fvwm3/renamed-items.patch.gz +++ b/desktop/fvwm3/config-renames.patch.gz diff --git a/desktop/fvwm3/fvwm3.SlackBuild b/desktop/fvwm3/fvwm3.SlackBuild index de9f8afae2..723a269619 100644 --- a/desktop/fvwm3/fvwm3.SlackBuild +++ b/desktop/fvwm3/fvwm3.SlackBuild @@ -26,8 +26,8 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=fvwm3 -VERSION=${VERSION:-1.1.0} -BUILD=${BUILD:-3} +VERSION=${VERSION:-1.1.1} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -74,9 +74,24 @@ cd $PRGNAM-$VERSION # 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 +# +# KEC: Replaced previous to accommodate meson (2024-12-01) +zcat $CWD/renames.patch.gz | patch -p0 # fix references to renamed man pages and binaries -zcat $CWD/renamed-items.patch.gz | patch -p0 +zcat $CWD/config-renames.patch.gz | patch -p0 + +mv perllib/FVWM perllib/FVWM3 +mv perllib/General perllib/FVWM3General + +( +cd doc +for adoc in $(find . -type f -name "*Fvwm*") ; do + mv $adoc $(echo $adoc | sed -e 's|Fvwm|Fvwm3|') +done +for adoc in $(find . -type f -name "*fvwm-*") ; do + mv $adoc $(echo $adoc | sed -e 's|fvwm|fvwm3|') +done +) chown -R root:root . find -L . \ @@ -85,27 +100,28 @@ 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)" +PYVER=$(python3 -c 'import sys; print("%d.%d" % sys.version_info[:2])') +export PYTHONPATH=/opt/python$PYVER/site-packages + +mkdir build +( +cd build -./autogen.sh CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ -./configure \ +meson setup \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ --sysconfdir=/etc \ --localstatedir=/var \ --mandir=/usr/man \ - --enable-mandoc \ - --docdir=/usr/doc/$PRGNAM-$VERSION \ - --enable-golang \ - --program-prefix= \ - --program-suffix= \ - --program-transform-name='/vwm[^3]/ s/vwm/vwm3/' \ - --build=$ARCH-$OSNAME-linux + --buildtype=release \ + -Ddocdir=/usr/doc/$PRGNAM-$VERSION \ + -Dmandoc=true -make -make install DESTDIR=$PKG +"${NINJA:=ninja}" +DESTDIR=$PKG $NINJA install +) rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la @@ -123,7 +139,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 COPYING NEWS README.md $PKG/usr/doc/$PRGNAM-$VERSION +cp -a CHANGELOG.md COPYING 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 413d926b76..408f06b054 100644 --- a/desktop/fvwm3/fvwm3.info +++ b/desktop/fvwm3/fvwm3.info @@ -1,10 +1,10 @@ PRGNAM="fvwm3" -VERSION="1.1.0" +VERSION="1.1.1" HOMEPAGE="https://github.com/fvwmorg/fvwm3" -DOWNLOAD="https://github.com/fvwmorg/fvwm3/archive/1.1.0/fvwm3-1.1.0.tar.gz" -MD5SUM="033cb2740c12b5acd406d75271dd1317" +DOWNLOAD="https://github.com/fvwmorg/fvwm3/archive/1.1.1/fvwm3-1.1.1.tar.gz" +MD5SUM="1d97dc8c9e499ef748509e8593a5b019" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="google-go-lang" +REQUIRES="google-go-lang python3-meson-opt" MAINTAINER="K. Eugene Carlson" EMAIL="kvngncrlsn@gmail.com" diff --git a/desktop/fvwm3/renames.patch.gz b/desktop/fvwm3/renames.patch.gz Binary files differnew file mode 100644 index 0000000000..2e27cedd02 --- /dev/null +++ b/desktop/fvwm3/renames.patch.gz |