games/gzdoom: Updated for version 4.7.0.

Signed-off-by: B. Watson <yalhcru@gmail.com>

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

5 files changed, 4 insertions, 40 deletions

diff --git a/games/gzdoom/compilefix.4.5.0.diff b/games/gzdoom/compilefix.4.5.0.diff
deleted file mode 100644
index 5c195189018ea..0000000000000
--- a/games/gzdoom/compilefix.4.5.0.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur gzdoom-g4.5.0/src/common/scripting/core/dynarrays.cpp gzdoom-g4.5.0.patched/src/common/scripting/core/dynarrays.cpp
---- gzdoom-g4.5.0/src/common/scripting/core/dynarrays.cpp	2020-10-31 05:07:33.000000000 -0400
-+++ gzdoom-g4.5.0.patched/src/common/scripting/core/dynarrays.cpp	2020-11-08 14:45:48.654222783 -0500
-@@ -89,7 +89,7 @@
- {
- 	int oldSize = self->Size();
- 	self->Insert(index, static_cast<typename T::value_type>(val));
--	if constexpr (fill) 
-+	if (fill) 
- 	{
- 		for (unsigned i = oldSize; i < self->Size() - 1; i++) (*self)[i] = 0;
- 	}
diff --git a/games/gzdoom/fix_zipdir.diff b/games/gzdoom/fix_zipdir.diff
deleted file mode 100644
index 88fb01696685f..0000000000000
--- a/games/gzdoom/fix_zipdir.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/tools/zipdir/zipdir.c
-+++ b/tools/zipdir/zipdir.c
-@@ -781,6 +781,8 @@
-			if (central_dir == NULL)
-			{
-				fprintf(stderr, "Could not read central directory from %s. (Is it a zipfile?)\n", zipname);
-+				fclose(ozip);
-+				ozip = NULL;
-				update = 0;
-			}
-		}
diff --git a/games/gzdoom/gzdoom.SlackBuild b/games/gzdoom/gzdoom.SlackBuild
index 1f5a823aa1848..780f2f6f318ee 100644
--- a/games/gzdoom/gzdoom.SlackBuild
+++ b/games/gzdoom/gzdoom.SlackBuild
@@ -36,7 +36,7 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=gzdoom
-VERSION=${VERSION:-4.5.0}
+VERSION=${VERSION:-4.7.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
@@ -49,9 +49,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
@@ -95,15 +92,6 @@ sed -i '/COMMAND.*UpdateRevision/s,^,# ,' src/CMakeLists.txt
   echo "#define GIT_HASH \"release\""
   echo "#define GIT_TIME __DATE__" ) > src/gitinfo.h
 
-# 4.5.0 uses "if constexpr", which is a c++17 feature not supported by
-# our compiler from 2016.
-[ -e $CWD/compilefix.$VERSION.diff ] && \
-  patch -p1 < $CWD/compilefix.$VERSION.diff
-
-# 20201107 bkw: 4.5.0 needs this, patch comes from upstream git. Thanks
-# to Steven Voges on the mailing list for pointing it out to me.
-patch -p1 < $CWD/fix_zipdir.diff
-
 # 3.1.0 started needing -DNDEBUG. Using ld.gold speeds up the final link
 # enough to be worth using (saves 17+ sec on my test box).
 SLKCFLAGS="$SLKCFLAGS -DNDEBUG -fuse-ld=gold"
@@ -115,7 +103,6 @@ sed -i '1i#include <cmath>' \
 
 mkdir -p build
 cd build
-  export "PATH=/opt/cmake-202x/bin:$PATH"
   cmake \
     -DCMAKE_C_FLAGS_RELEASE:STRING="$SLKCFLAGS -DSHARE_DIR=\\\"/usr/share/games/doom\\\"" \
     -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS -DSHARE_DIR=\\\"/usr/share/games/doom\\\"" \
diff --git a/games/gzdoom/gzdoom.info b/games/gzdoom/gzdoom.info
index 21083a0aadb03..cc474393e8d59 100644
--- a/games/gzdoom/gzdoom.info
+++ b/games/gzdoom/gzdoom.info
@@ -1,8 +1,8 @@
 PRGNAM="gzdoom"
-VERSION="4.5.0"
+VERSION="4.7.0"
 HOMEPAGE="http://gzdoom.drdteam.org/"
-DOWNLOAD="https://github.com/coelckers/gzdoom/archive/g4.5.0/gzdoom-g4.5.0.tar.gz"
-MD5SUM="64b0b98c6538a75626de3319653d6539"
+DOWNLOAD="https://github.com/coelckers/gzdoom/archive/g4.7.0/gzdoom-g4.7.0.tar.gz"
+MD5SUM="1b858a2ef68f04c2c9f0ba7592cb73bd"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="zmusic"
diff --git a/games/gzdoom/gzdoom.png b/games/gzdoom/gzdoom.png
deleted file mode 100644
index 013cf60890680..0000000000000
--- a/games/gzdoom/gzdoom.png
+++ /dev/null