desktop/fvwm3: Updated for version 1.0.4.

Signed-off-by: Robby Workman <rworkman@slackbuilds.org>

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

4 files changed, 29 insertions, 87 deletions

diff --git a/desktop/fvwm3/cmd_geometrywindow-move_null_check.patch b/desktop/fvwm3/cmd_geometrywindow-move_null_check.patch
new file mode 100644
index 000000000000..7d3c7b2f3f1d
--- /dev/null
+++ b/desktop/fvwm3/cmd_geometrywindow-move_null_check.patch
@@ -0,0 +1,21 @@
+--- 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 c824bffe8d3e..6996e2b1beae 100644
--- a/desktop/fvwm3/fvwm3.SlackBuild
+++ b/desktop/fvwm3/fvwm3.SlackBuild
@@ -25,8 +25,8 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=fvwm3
-VERSION=${VERSION:-1.0.2}
-BUILD=${BUILD:-3}
+VERSION=${VERSION:-1.0.4}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
 
@@ -73,34 +73,7 @@ rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 
-patch -p1 < $CWD/update_fvwm_screen-dont_lose_desk_from_StartsOnScreen.patch
-
-mkdir -p bin/FvwmPrompt/vendor/golang.org/x
-for DEPENDENCY in \
-  abiosoft/ishell/2.0.0 \
-  abiosoft/readline/155bce2042db95a783081fab225e74dd879055b0 \
-  fatih/color/1.9.0 \
-  flynn-archive/go-shlex/3f9db97f856818214da2e1057f8ad84803971cff \
-  mattn/go-colorable/0.1.4 \
-  mattn/go-isatty/0.0.12 \
-  sirupsen/logrus/1.6.0 \
-  golang/sys/12a6c2dcc1e4cb348b57847c73987099e261714b
-do
-  DEPENDENCY_OWNER="$(echo "$DEPENDENCY" | cut -d/ -f1)"
-  DEPENDENCY_NAME="$(echo "$DEPENDENCY" | cut -d/ -f2)"
-  DEPENDENCY_REV="$(echo "$DEPENDENCY" | cut -d/ -f3)"
-  mkdir -p "bin/FvwmPrompt/vendor/github.com/$DEPENDENCY_OWNER"
-  tar xvf "$CWD/$DEPENDENCY_NAME-$DEPENDENCY_REV.tar.gz"
-  if [ "$DEPENDENCY_OWNER" = "golang" ]; then
-    mv "$DEPENDENCY_NAME-$DEPENDENCY_REV" \
-      "bin/FvwmPrompt/vendor/golang.org/x/$DEPENDENCY_NAME"
-  else
-    mv "$DEPENDENCY_NAME-$DEPENDENCY_REV" \
-      "bin/FvwmPrompt/vendor/github.com/$DEPENDENCY_OWNER/$DEPENDENCY_NAME"
-  fi
-done
-
-cat $CWD/modules.txt > bin/FvwmPrompt/vendor/modules.txt
+patch -p1 < $CWD/cmd_geometrywindow-move_null_check.patch
 
 chown -R root:root .
 find -L . \
@@ -122,7 +95,7 @@ CXXFLAGS="$SLKCFLAGS" \
   --enable-golang \
   --program-prefix= \
   --program-suffix= \
-  --program-transform-name='s/^fvwm-/fvwm3-/' \
+  --program-transform-name='/vwm[^3]/ s/vwm/vwm3/' \
   --build=$ARCH-slackware-linux
 
 make
@@ -135,35 +108,12 @@ mkdir -p $PKG/etc/X11/xinit
 zcat $CWD/xinitrc.fvwm3.gz > $PKG/etc/X11/xinit/xinitrc.fvwm3
 chmod 755 $PKG/etc/X11/xinit/xinitrc.fvwm3
 
-rm -rf $PKG/usr/share/doc
-rm -rf $PKG/usr/share/locale
-rm -f $PKG/usr/bin/fvwm3-convert-2.6
-mv $PKG/usr/bin/FvwmCommand $PKG/usr/bin/Fvwm3Command
-mv $PKG/usr/bin/xpmroot $PKG/usr/bin/xpmroot3
-
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 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
 
-for m in $PKG/usr/man/man1/Fvwm* ; do
-  case "$m" in *FvwmPrompt*) continue ;; esac
-  mv $m ${m/Fvwm/Fvwm3}
-done
-
-for m in $PKG/usr/man/man1/fvwm-* ; do
-  mv $m ${m/fvwm-/fvwm3-}
-done
-
-rm -f $PKG/usr/man/man1/xpmroot*
-ln -s fvwm3-root.1.gz $PKG/usr/man/man1/xpmroot3.1.gz
-
-rm -f $PKG/usr/man/man1/fvwm3-convert-2.6.1.gz
-rm -f $PKG/usr/man/man1/fvwm3-config-2.6.1.gz
-rm -f $PKG/usr/man/man1/Fvwm3Console.1.gz
-rm -f $PKG/usr/man/man1/Fvwm3ConsoleC.pl.1.gz
-
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a NEWS $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
diff --git a/desktop/fvwm3/fvwm3.info b/desktop/fvwm3/fvwm3.info
index 7043ad4509d3..36aa677e5311 100644
--- a/desktop/fvwm3/fvwm3.info
+++ b/desktop/fvwm3/fvwm3.info
@@ -1,26 +1,10 @@
 PRGNAM="fvwm3"
-VERSION="1.0.2"
+VERSION="1.0.4"
 HOMEPAGE="https://github.com/fvwmorg/fvwm3"
-DOWNLOAD="https://github.com/fvwmorg/fvwm3/releases/download/1.0.2/fvwm3-1.0.2.tar.gz \
-          https://github.com/abiosoft/ishell/archive/v2.0.0/ishell-2.0.0.tar.gz \
-          https://github.com/abiosoft/readline/archive/155bce2042db95a783081fab225e74dd879055b0/readline-155bce2042db95a783081fab225e74dd879055b0.tar.gz \
-          https://github.com/fatih/color/archive/v1.9.0/color-1.9.0.tar.gz \
-          https://github.com/flynn-archive/go-shlex/archive/3f9db97f856818214da2e1057f8ad84803971cff/go-shlex-3f9db97f856818214da2e1057f8ad84803971cff.tar.gz \
-          https://github.com/mattn/go-colorable/archive/v0.1.4/go-colorable-0.1.4.tar.gz \
-          https://github.com/mattn/go-isatty/archive/v0.0.12/go-isatty-0.0.12.tar.gz \
-          https://github.com/sirupsen/logrus/archive/v1.6.0/logrus-1.6.0.tar.gz \
-          https://github.com/golang/sys/archive/12a6c2dcc1e4cb348b57847c73987099e261714b/sys-12a6c2dcc1e4cb348b57847c73987099e261714b.tar.gz"
-MD5SUM="afdf88159cf06486a8a86d3d64b69b18 \
-        3058feb8c64ce23c122c212673a769fc \
-        5f9283762aece4866ec12481c911dc04 \
-        63c08b74df39b3df587594710c13d543 \
-        73c1c839e2866ecfe7ad25aa21dd74d6 \
-        c67b2200da0ec27b69b62afc308b6d0c \
-        56a6121ba7ae8a13dad2925edd9f11b5 \
-        7e9bd1531d38f1994307cc2cd9435cb9 \
-        62bb00c7e07850c8fa836a3614667ded"
+DOWNLOAD="https://github.com/fvwmorg/fvwm3/releases/download/1.0.4/fvwm3-1.0.4.tar.gz"
+MD5SUM="3fd50b508940e9549fc9a9b40ec94a47"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="libbson google-go-lang"
+REQUIRES="google-go-lang"
 MAINTAINER="Alexander Verbovetsky"
 EMAIL="alik@ejik.org"
diff --git a/desktop/fvwm3/update_fvwm_screen-dont_lose_desk_from_StartsOnScreen.patch b/desktop/fvwm3/update_fvwm_screen-dont_lose_desk_from_StartsOnScreen.patch
deleted file mode 100644
index 8635f5a35c4c..000000000000
--- a/desktop/fvwm3/update_fvwm_screen-dont_lose_desk_from_StartsOnScreen.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -Nur fvwm3-1.0.2.orig/fvwm/screen.h fvwm3-1.0.2/fvwm/screen.h
---- fvwm3-1.0.2.orig/fvwm/screen.h	2020-12-12 03:37:08.000000000 +0300
-+++ fvwm3-1.0.2/fvwm/screen.h	2020-12-22 03:21:41.103120674 +0300
-@@ -485,8 +485,7 @@
- 		get_unshaded_geometry((fw), &g);			   \
- 		mnew = FindScreenOfXY((fw)->g.frame.x, (fw)->g.frame.y);   \
- 		/* Avoid unnecessary updates. */			   \
--		if (mnew == (fw)->m &&					   \
--		    (fw)->Desk == mnew->virtual_scr.CurrentDesk)	   \
-+		if (mnew == (fw)->m)					   \
- 			break;						   \
- 		(fw)->m_prev = (fw)->m;					   \
- 		(fw)->m = mnew;						   \