diff options
Diffstat (limited to 'desktop/fvwm3')
| -rw-r--r-- | desktop/fvwm3/0001-rename-perl-fvwm.patch.gz | bin | 0 -> 13111 bytes | |||
| -rw-r--r-- | desktop/fvwm3/cmd_geometrywindow-move_null_check.patch | 21 | ||||
| -rw-r--r-- | desktop/fvwm3/fvwm3.SlackBuild | 19 | ||||
| -rw-r--r-- | desktop/fvwm3/fvwm3.info | 6 | ||||
| -rw-r--r-- | desktop/fvwm3/modules.txt | 31 |
5 files changed, 14 insertions, 63 deletions
diff --git a/desktop/fvwm3/0001-rename-perl-fvwm.patch.gz b/desktop/fvwm3/0001-rename-perl-fvwm.patch.gz Binary files differnew file mode 100644 index 0000000000..10d31a2603 --- /dev/null +++ b/desktop/fvwm3/0001-rename-perl-fvwm.patch.gz diff --git a/desktop/fvwm3/cmd_geometrywindow-move_null_check.patch b/desktop/fvwm3/cmd_geometrywindow-move_null_check.patch deleted file mode 100644 index 7d3c7b2f3f..0000000000 --- a/desktop/fvwm3/cmd_geometrywindow-move_null_check.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- fvwm3-1.0.4.orig/fvwm/move_resize.c 2021-07-17 18:03:08.000000000 +0300 -+++ fvwm3-1.0.4/fvwm/move_resize.c 2021-07-21 01:20:34.428964491 +0300 -@@ -3269,13 +3269,14 @@ - - static void set_geom_win_visible_val(char *token, bool val) - { -- if (token == NULL) -- return; -- - Scr.gs.do_hide_position_window = !val; - Scr.gs.do_hide_resize_window = !val; - -- if (StrEquals(token, "never")) -+ if (token == NULL) -+ { -+ return; -+ } -+ else if (StrEquals(token, "never")) - { - Scr.gs.do_hide_position_window = val; - Scr.gs.do_hide_resize_window = val; diff --git a/desktop/fvwm3/fvwm3.SlackBuild b/desktop/fvwm3/fvwm3.SlackBuild index 6996e2b1be..fc4eba2a1e 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,8 +25,8 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=fvwm3 -VERSION=${VERSION:-1.0.4} -BUILD=${BUILD:-1} +VERSION=${VERSION:-1.1.0} +BUILD=${BUILD:-2} 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 diff --git a/desktop/fvwm3/fvwm3.info b/desktop/fvwm3/fvwm3.info index 36aa677e53..942791e618 100644 --- a/desktop/fvwm3/fvwm3.info +++ b/desktop/fvwm3/fvwm3.info @@ -1,8 +1,8 @@ PRGNAM="fvwm3" -VERSION="1.0.4" +VERSION="1.1.0" HOMEPAGE="https://github.com/fvwmorg/fvwm3" -DOWNLOAD="https://github.com/fvwmorg/fvwm3/releases/download/1.0.4/fvwm3-1.0.4.tar.gz" -MD5SUM="3fd50b508940e9549fc9a9b40ec94a47" +DOWNLOAD="https://github.com/fvwmorg/fvwm3/archive/1.1.0/fvwm3-1.1.0.tar.gz" +MD5SUM="033cb2740c12b5acd406d75271dd1317" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="google-go-lang" diff --git a/desktop/fvwm3/modules.txt b/desktop/fvwm3/modules.txt deleted file mode 100644 index 01470c4d21..0000000000 --- a/desktop/fvwm3/modules.txt +++ /dev/null @@ -1,31 +0,0 @@ -# github.com/abiosoft/ishell v2.0.0+incompatible -## explicit -github.com/abiosoft/ishell -# github.com/abiosoft/readline v0.0.0-20180607040430-155bce2042db -## explicit -github.com/abiosoft/readline -# github.com/chzyer/logex v1.1.10 -## explicit -# github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1 -## explicit -# github.com/fatih/color v1.9.0 -## explicit -github.com/fatih/color -# github.com/flynn-archive/go-shlex v0.0.0-20150515145356-3f9db97f8568 -## explicit -github.com/flynn-archive/go-shlex -# github.com/konsorten/go-windows-terminal-sequences v1.0.3 -github.com/konsorten/go-windows-terminal-sequences -# github.com/mattn/go-colorable v0.1.4 -github.com/mattn/go-colorable -# github.com/mattn/go-isatty v0.0.12 -## explicit -github.com/mattn/go-isatty -# github.com/sirupsen/logrus v1.6.0 -## explicit -github.com/sirupsen/logrus -# github.com/stretchr/testify v1.6.1 -## explicit -# golang.org/x/sys v0.0.0-20200212091648-12a6c2dcc1e4 -## explicit -golang.org/x/sys/unix |