diff options
| author | Alexander Verbovetsky <alik@ejik.org> | 2022-10-01 07:30:31 +0700 |
|---|---|---|
| committer | Willy Sudiarto Raharjo <willysr@slackbuilds.org> | 2022-10-01 07:30:31 +0700 |
| commit | 24cb09314f15c093b53f2f1396b6abec1bcbcd9b (patch) | |
| tree | bf7f5558145e4c7b1b7877246f8ba7423f184c1a | |
| parent | f17907b67603f5fb36ced83c4699173cd110a46b (diff) | |
desktop/fvwm3: Updated for version 1.0.5.
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
| -rw-r--r-- | desktop/fvwm3/cmd_geometrywindow-move_null_check.patch | 21 | ||||
| -rw-r--r-- | desktop/fvwm3/fvwm3.SlackBuild | 13 | ||||
| -rw-r--r-- | desktop/fvwm3/fvwm3.info | 6 |
3 files changed, 8 insertions, 32 deletions
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 7d3c7b2f3f1df..0000000000000 --- 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 6996e2b1beae6..77eab06fd24c5 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-2022, 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.0.5} 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,8 +70,6 @@ rm -rf $PRGNAM-$VERSION tar xvf $CWD/$PRGNAM-$VERSION.tar.gz cd $PRGNAM-$VERSION -patch -p1 < $CWD/cmd_geometrywindow-move_null_check.patch - chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ @@ -101,6 +96,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 +112,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 36aa677e5311e..7c42d3830ab59 100644 --- a/desktop/fvwm3/fvwm3.info +++ b/desktop/fvwm3/fvwm3.info @@ -1,8 +1,8 @@ PRGNAM="fvwm3" -VERSION="1.0.4" +VERSION="1.0.5" 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/releases/download/1.0.5/fvwm3-1.0.5.tar.gz" +MD5SUM="83a91498e85b6e61daf403ca1a87d216" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="google-go-lang" |