Skip to content

Commit 0792480

Browse files
Michael BaeuerleMichael Baeuerle
authored andcommitted
slade: Update to 3.2.5
- Change package name to use small letters. - Declare required C++ features. - Switch to wip/wxGTK32 (does no longer work with x11/wxGTK30). Warning: x11/wxGTK32 has insane dependencies!
1 parent fdaa6a0 commit 0792480

4 files changed

Lines changed: 36 additions & 15 deletions

File tree

slade/COMMIT_MSG

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
games/slade: Import version 3.2.1
1+
games/slade: Import version 3.2.5
22

33
SLADE3 is a modern editor for Doom-engine based games and source ports.
44
It has the ability to view, modify, and write many different game-specific

slade/Makefile

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
# $NetBSD$
22

3-
DISTNAME= SLADE-3.2.1
3+
DISTNAME= slade-3.2.5
44
CATEGORIES= games
55
MASTER_SITES= ${MASTER_SITE_GITHUB:=sirjuddington/}
6-
GITHUB_TAG= ${DISTNAME:S/SLADE-//}
6+
GITHUB_TAG= ${DISTNAME:S/slade-//}
77

88
MAINTAINER= micha@NetBSD.org
99
HOMEPAGE= https://slade.mancubus.net/
@@ -12,20 +12,22 @@ LICENSE= gnu-gpl-v2
1212

1313
.include "../../mk/bsd.prefs.mk"
1414

15-
# Needs C++17 std::filesystem
16-
# GCC needs additional libraries for it before version 9
17-
GCC_REQD+= 9
18-
USE_LANGUAGES= c c++17
15+
USE_LANGUAGES= c c++
16+
USE_CXX_FEATURES+= c++17 filesystem
17+
1918
USE_TOOLS+= pkg-config zip
20-
USE_CMAKE= yes
19+
2120
CMAKE_ARGS+= -Wno-dev
2221
CMAKE_ARGS+= -DNO_COTIRE=ON # CMake has similar functionality since 3.16
2322
CMAKE_ARGS+= -DNO_LUA=ON
2423
CMAKE_ARGS+= -DNO_WEBVIEW=ON
24+
CMAKE_ARGS+= -DBUILD_PK3=ON
2525
CMAKE_ARGS+= -DCMAKE_BUILD_TYPE=Release # Use "Debug" for development
2626

2727
INSTALLATION_DIRS+= share/icons/hicolor/128x128/apps
2828

29+
WRKSRC= ${WRKDIR}/${DISTNAME:S/slade-/SLADE-/}
30+
2931
post-install:
3032
${MV} ${DESTDIR}${PREFIX}/share/applications/net.mancubus.SLADE.desktop \
3133
${DESTDIR}${PREFIX}/share/applications/SLADE.desktop
@@ -37,6 +39,7 @@ post-install:
3739
BUILDLINK_API_DEPENDS.fluidsynth+= fluidsynth>=1.1.3
3840
.include "../../audio/fluidsynth/buildlink3.mk"
3941
.include "../../archivers/bzip2/buildlink3.mk"
42+
.include "../../devel/cmake/build.mk"
4043
BUILDLINK_API_DEPENDS.zlib+= zlib>=1.2.3
4144
.include "../../devel/zlib/buildlink3.mk"
4245
.include "../../graphics/freeimage/buildlink3.mk"
@@ -46,9 +49,6 @@ BUILDLINK_API_DEPENDS.sfml+= sfml>=2.0
4649
.include "../../multimedia/sfml/buildlink3.mk"
4750
.include "../../sysutils/desktop-file-utils/desktopdb.mk"
4851
.include "../../www/curl/buildlink3.mk"
49-
.include "../../x11/wxGTK30/buildlink3.mk"
50-
.if ${PKG_BUILD_OPTIONS.wxGTK30:Mgtk2}
51-
CMAKE_ARGS+= -DWX_GTK3=OFF
52-
.endif
52+
.include "../../wip/wxGTK32/buildlink3.mk"
5353

5454
.include "../../mk/bsd.pkg.mk"

slade/distinfo

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
$NetBSD$
22

3-
BLAKE2s (SLADE-3.2.1.tar.gz) = d611a60ea98fa62e06c039ce38490884e5fbebda87b68bdaf2073f56d66ef75e
4-
SHA512 (SLADE-3.2.1.tar.gz) = b7d5a91c759c5a68af63aa9a8412452a5b2986e70f7189ca92ee99ce4953ef47381be907c8ce1166e479f24679904bf5f0e0b1a5da846fe7873c5b97f4315449
5-
Size (SLADE-3.2.1.tar.gz) = 6471666 bytes
3+
BLAKE2s (slade-3.2.5.tar.gz) = 7460685c42f1d57ca9bdebd0bf2198750a64ff2dc8e3733ecf1472274441c972
4+
SHA512 (slade-3.2.5.tar.gz) = 7a0185230c03deaff9745f7b038a0e6aedd62986afbd127b8904be91ea13d9d050fe6d03f0039203ee9fa46cdb2e5879e77f769f26d3eb935628785c5ffbf13f
5+
Size (slade-3.2.5.tar.gz) = 7010771 bytes
6+
SHA1 (patch-dist_CMakeLists.txt) = eabb1e742facd6f84012409f0a2ce02e9eff341f
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
$NetBSD$
2+
3+
Fix destination for file "slade.pk3".
4+
5+
/usr/bin/make -f dist/CMakeFiles/pk3.dir/build.make dist/CMakeFiles/pk3.dir/build
6+
cd /usr/pkgsrc/work/wip/slade/work/SLADE-3.2.5/dist/res && /usr/pkgsrc/work/wip/slade/work/.tools/bin/zip -X -UN=UTF8 -9 -r /slade.pk3 .
7+
zip I/O error: Permission denied
8+
zip error: Could not create output file (/slade.pk3)
9+
10+
--- dist/CMakeLists.txt.orig 2023-12-19 10:25:26.000000000 +0000
11+
+++ dist/CMakeLists.txt
12+
@@ -13,7 +13,7 @@ elseif(ZIPTOOL_ZIP_EXECUTABLE)
13+
if(NOT APPLE)
14+
set(ZIP_COMMAND_CHARSET "-UN=UTF8")
15+
endif()
16+
- set(ZIP_COMMAND "${ZIPTOOL_ZIP_EXECUTABLE}" -X ${ZIP_COMMAND_CHARSET} -9 -r "${PK3_OUTPUT}/slade.pk3" .)
17+
+ set(ZIP_COMMAND "${ZIPTOOL_ZIP_EXECUTABLE}" -X ${ZIP_COMMAND_CHARSET} -9 -r "${PK3_DESTINATION}/slade.pk3" .)
18+
else()
19+
message(STATUS "no zip executable, slade.pk3 won't build")
20+
endif()

0 commit comments

Comments
 (0)