games/SLADE: Updated for version 3.2.6.

Signed-off-by: B. Watson <urchlay@slackware.uk>

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

3 files changed, 29 insertions, 11 deletions

diff --git a/games/SLADE/README b/games/SLADE/README
index e4e89e9f9fdd..84148b2a70f1 100644
--- a/games/SLADE/README
+++ b/games/SLADE/README
@@ -3,3 +3,13 @@ SLADE (DOOM editor)
 SLADE is a modern editor for DOOM-engine based games and source
 ports. It has the ability to view, modify and write many different
 game-specific formats, and even convert between some of them.
+
+For SLADE to be useful, you'll have to install the game data (IWAD
+file) from at least one of the supported games.
+
+Note: for SLADE to build, you must have a wxWidgets that was built
+with nanosvg support. If you build & install the dependencies in order
+(nanosvg first), this will take care of itself. If you already had
+wxWidgets installed without nanosvg support, the SLADE build will fail
+(and you can easily fix it by rebuilding wxWidgets after you install
+nanosvg).
diff --git a/games/SLADE/SLADE.SlackBuild b/games/SLADE/SLADE.SlackBuild
index 10dd63140928..a631da936772 100644
--- a/games/SLADE/SLADE.SlackBuild
+++ b/games/SLADE/SLADE.SlackBuild
@@ -49,7 +49,7 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=SLADE
-VERSION=${VERSION:-3.2.4}
+VERSION=${VERSION:-3.2.6}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
@@ -94,8 +94,8 @@ rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
-find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
-        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} + -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} +
 
 # 20200416 bkw: game binaries do not belong in /usr/bin.
 sed -i 's,\<bin\>,games,' src/CMakeLists.txt
@@ -112,7 +112,7 @@ sed -i -e 's,  *$,,' -e 's,^Exec=,&/usr/games/,' *.desktop
 # 20200416 bkw: don't depend on unstable /usr/bin/wx-config symlink.
 # stupid thing insists on searching for wx-config in PATH, instead of
 # allowing us to explicitly give a full path and name for the script, so:
-WXCONF=/usr/lib$LIBDIRSUFFIX/wx/config/gtk3-unicode-3.0
+WXCONF=/usr/lib$LIBDIRSUFFIX/wx/config/gtk3-unicode-3.2
 WXTMP=$( pwd )/wxtmp
 mkdir -p $WXTMP
 ln -s $WXCONF $WXTMP/wx-config
@@ -136,6 +136,13 @@ ln -s $WXCONF $WXTMP/wx-config
 # 20220208 bkw: I screwed up: I forgot wxGTK3 isn't always built with
 # webkit2gtk (so it doesn't always have wxWebView). slade doesn't
 # autodetect this, so detect it ourselves:
+# 20240928 bkw: Upstream upgraded to wx-3.2, meaning this now uses
+# wxWidgets rather than wxGTK3. Currently, webkit2gtk is listed
+# as a hard dep for wxWidgets, but this is actually incorrect: if
+# wxWidgets is built without webkit2gtk installed, it'll build fine,
+# minus wxWebView support, just like wxGTK3 would. This means wxWidgets
+# should be (and likely will be) changed so that webkit2gtk becomes an
+# optional dep... in which case, this code still applies:
 NO_WEBVIEW_OPT="ON"
 $WXTMP/wx-config --libs | grep -q webview && NO_WEBVIEW_OPT="OFF"
 echo "=== NO_WEBVIEW_OPT='$NO_WEBVIEW_OPT'"
@@ -165,9 +172,10 @@ done
 mkdir -p $PKG/usr/share/pixmaps
 ln -s ../icons/hicolor/48x48/apps/$iconname.png $PKG/usr/share/pixmaps/$PRGNAM.png
 
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a README.md LICENSE* $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+PKGDOC=$PKG/usr/doc/$PRGNAM-$VERSION
+mkdir -p $PKGDOC
+cp -a README.md LICENSE* $PKGDOC
+cat $CWD/$PRGNAM.SlackBuild > $PKGDOC/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
diff --git a/games/SLADE/SLADE.info b/games/SLADE/SLADE.info
index a7e6485e95b0..9b67cec62764 100644
--- a/games/SLADE/SLADE.info
+++ b/games/SLADE/SLADE.info
@@ -1,10 +1,10 @@
 PRGNAM="SLADE"
-VERSION="3.2.4"
+VERSION="3.2.6"
 HOMEPAGE="http://slade.mancubus.net/"
-DOWNLOAD="https://github.com/sirjuddington/SLADE/archive/3.2.4/SLADE-3.2.4.tar.gz"
-MD5SUM="ba3fbbbb970497e558e26856f7d7ea2c"
+DOWNLOAD="https://github.com/sirjuddington/SLADE/archive/3.2.6/SLADE-3.2.6.tar.gz"
+MD5SUM="d97a6951b048a61754901cac8f7e7fb9"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="wxGTK3 fmt SFML ftgl FreeImage p7zip lua"
+REQUIRES="nanosvg wxWidgets fmt SFML ftgl FreeImage p7zip lua"
 MAINTAINER="B. Watson"
 EMAIL="urchlay@slackware.uk"