From 86dc99351046defe656e9eda0d632532aaeefc60 Mon Sep 17 00:00:00 2001
From: Alexander Verbovetsky <alik@ejik.org>
Date: Sat, 6 Feb 2021 05:20:15 +0000
Subject: desktop/fvwm3: Updated for go 1.14.x..

Signed-off-by: Dave Woodfall <dave@slackbuilds.org>

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
---
 desktop/fvwm3/fvwm3.SlackBuild | 11 ++++-------
 desktop/fvwm3/modules.txt      | 31 +++++++++++++++++++++++++++++++
 2 files changed, 35 insertions(+), 7 deletions(-)
 create mode 100644 desktop/fvwm3/modules.txt

(limited to 'desktop/fvwm3')

diff --git a/desktop/fvwm3/fvwm3.SlackBuild b/desktop/fvwm3/fvwm3.SlackBuild
index 73f5b0d69e1c9..66dfdd475f6dc 100644
--- a/desktop/fvwm3/fvwm3.SlackBuild
+++ b/desktop/fvwm3/fvwm3.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for fvwm3
 
-# Copyright 2020, Alexander Verbovetsky, Moscow, Russia
+# Copyright 2020-2021, Alexander Verbovetsky, Moscow, Russia
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,7 +24,7 @@
 
 PRGNAM=fvwm3
 VERSION=${VERSION:-1.0.2}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -65,11 +65,6 @@ cd $PRGNAM-$VERSION
 
 patch -p1 < $CWD/update_fvwm_screen-dont_lose_desk_from_StartsOnScreen.patch
 
-sed -i '/^@FVWM_BUILD_GOLANG_TRUE@GOBUILD = $(GOCMD) build/s/$/ -mod=vendor/' \
-  bin/FvwmPrompt/Makefile.in
-
-sed -i 's/1.14\*|1.15/1.13\*|1.14\*|1.15/' configure
-
 mkdir -p bin/FvwmPrompt/vendor/golang.org/x
 for DEPENDENCY in \
   abiosoft/ishell/2.0.0 \
@@ -95,6 +90,8 @@ do
   fi
 done
 
+cat $CWD/modules.txt > bin/FvwmPrompt/vendor/modules.txt
+
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
diff --git a/desktop/fvwm3/modules.txt b/desktop/fvwm3/modules.txt
new file mode 100644
index 0000000000000..01470c4d21a93
--- /dev/null
+++ b/desktop/fvwm3/modules.txt
@@ -0,0 +1,31 @@
+# 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
-- 
cgit v1.2.3