aboutsummaryrefslogtreecommitdiff
path: root/games/SLADE
diff options
context:
space:
mode:
authorB. Watson <yalhcru@gmail.com>2022-02-08 02:42:11 -0500
committerWilly Sudiarto Raharjo <willysr@slackbuilds.org>2022-02-09 09:35:14 +0700
commit27fa2f508dd47169df7d77a30b2dadcf0e0c2c1d (patch)
treed16b3a4e3f1a06e8b5ad46d2fdd2123eaa1bf166 /games/SLADE
parent6f0797ad1a5197dabd044cec2453cf4b0b8714ac (diff)
games/SLADE: Fix build.
Signed-off-by: B. Watson <yalhcru@gmail.com> Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
Diffstat (limited to 'games/SLADE')
-rw-r--r--games/SLADE/SLADE.SlackBuild12
-rw-r--r--games/SLADE/SLADE.info2
2 files changed, 13 insertions, 1 deletions
diff --git a/games/SLADE/SLADE.SlackBuild b/games/SLADE/SLADE.SlackBuild
index 976010385b1b0..0c3b1c044fefa 100644
--- a/games/SLADE/SLADE.SlackBuild
+++ b/games/SLADE/SLADE.SlackBuild
@@ -23,6 +23,10 @@
# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# 20220208 bkw:
+# - grr. add missing 'fmt' dep. my bad.
+# - autodetect wxWebView support in wxGTK3. also my bad.
+
# 20211118 bkw:
# - update for v3.2.0_b3. normally won't package a beta, but
# 3.1.12a and 3.1.13 won't build, and life is too short.
@@ -126,10 +130,18 @@ ln -s $WXCONF $WXTMP/wx-config
# a non-ccached build with cotire only takes me 5 minutes, I won't go
# to extreme lengths here like I did for mame.
+# 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:
+NO_WEBVIEW_OPT="ON"
+$WXTMP/wx-config --libs | grep -q webview && NO_WEBVIEW_OPT="OFF"
+echo "=== NO_WEBVIEW_OPT='$NO_WEBVIEW_OPT'"
+
mkdir -p build
cd build
cmake \
-DWITH_WXPATH=$WXTMP \
+ -DNO_WEBVIEW=$NO_WEBVIEW_OPT \
-DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
-DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
-DCMAKE_INSTALL_PREFIX=/usr \
diff --git a/games/SLADE/SLADE.info b/games/SLADE/SLADE.info
index 5a3bacc81b863..4a8c972fffd41 100644
--- a/games/SLADE/SLADE.info
+++ b/games/SLADE/SLADE.info
@@ -5,6 +5,6 @@ DOWNLOAD="https://github.com/sirjuddington/SLADE/archive/3.2.0_b3/SLADE-3.2.0_b3
MD5SUM="428f84a8abaa086e953568955e3a1876"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
-REQUIRES="wxGTK3 SFML ftgl FreeImage p7zip"
+REQUIRES="wxGTK3 fmt SFML ftgl FreeImage p7zip"
MAINTAINER="B. Watson"
EMAIL="yalhcru@gmail.com"