pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

slade: Update to 3.2.5



Module Name:	pkgsrc-wip
Committed By:	Michael Baeuerle <micha%NetBSD.org@localhost>
Pushed By:	micha
Date:		Fri May 3 16:59:54 2024 +0200
Changeset:	0792480d81d895333cd2cc1251fcc5b6be2badca

Modified Files:
	slade/COMMIT_MSG
	slade/Makefile
	slade/distinfo
Added Files:
	slade/patches/patch-dist_CMakeLists.txt

Log Message:
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!

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=0792480d81d895333cd2cc1251fcc5b6be2badca

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 slade/COMMIT_MSG                        |  2 +-
 slade/Makefile                          | 22 +++++++++++-----------
 slade/distinfo                          |  7 ++++---
 slade/patches/patch-dist_CMakeLists.txt | 20 ++++++++++++++++++++
 4 files changed, 36 insertions(+), 15 deletions(-)

diffs:
diff --git a/slade/COMMIT_MSG b/slade/COMMIT_MSG
index 4ee35ed4a0..5acb246222 100644
--- a/slade/COMMIT_MSG
+++ b/slade/COMMIT_MSG
@@ -1,4 +1,4 @@
-games/slade: Import version 3.2.1
+games/slade: Import version 3.2.5
 
 SLADE3 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
diff --git a/slade/Makefile b/slade/Makefile
index 2c390b1a98..efbb2927b0 100644
--- a/slade/Makefile
+++ b/slade/Makefile
@@ -1,9 +1,9 @@
 # $NetBSD$
 
-DISTNAME=	SLADE-3.2.1
+DISTNAME=	slade-3.2.5
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_GITHUB:=sirjuddington/}
-GITHUB_TAG=	${DISTNAME:S/SLADE-//}
+GITHUB_TAG=	${DISTNAME:S/slade-//}
 
 MAINTAINER=	micha%NetBSD.org@localhost
 HOMEPAGE=	https://slade.mancubus.net/
@@ -12,20 +12,22 @@ LICENSE=	gnu-gpl-v2
 
 .include "../../mk/bsd.prefs.mk"
 
-# Needs C++17 std::filesystem
-# GCC needs additional libraries for it before version 9
-GCC_REQD+=	9
-USE_LANGUAGES=	c c++17
+USE_LANGUAGES=		c c++
+USE_CXX_FEATURES+=	c++17 filesystem
+
 USE_TOOLS+=	pkg-config zip
-USE_CMAKE=	yes
+
 CMAKE_ARGS+=	-Wno-dev
 CMAKE_ARGS+=	-DNO_COTIRE=ON  # CMake has similar functionality since 3.16
 CMAKE_ARGS+=	-DNO_LUA=ON
 CMAKE_ARGS+=	-DNO_WEBVIEW=ON
+CMAKE_ARGS+=	-DBUILD_PK3=ON
 CMAKE_ARGS+=	-DCMAKE_BUILD_TYPE=Release  # Use "Debug" for development
 
 INSTALLATION_DIRS+=	share/icons/hicolor/128x128/apps
 
+WRKSRC=		${WRKDIR}/${DISTNAME:S/slade-/SLADE-/}
+
 post-install:
 	${MV} ${DESTDIR}${PREFIX}/share/applications/net.mancubus.SLADE.desktop \
 		${DESTDIR}${PREFIX}/share/applications/SLADE.desktop
@@ -37,6 +39,7 @@ post-install:
 BUILDLINK_API_DEPENDS.fluidsynth+=	fluidsynth>=1.1.3
 .include "../../audio/fluidsynth/buildlink3.mk"
 .include "../../archivers/bzip2/buildlink3.mk"
+.include "../../devel/cmake/build.mk"
 BUILDLINK_API_DEPENDS.zlib+=		zlib>=1.2.3
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../graphics/freeimage/buildlink3.mk"
@@ -46,9 +49,6 @@ BUILDLINK_API_DEPENDS.sfml+=		sfml>=2.0
 .include "../../multimedia/sfml/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../www/curl/buildlink3.mk"
-.include "../../x11/wxGTK30/buildlink3.mk"
-.if ${PKG_BUILD_OPTIONS.wxGTK30:Mgtk2}
-CMAKE_ARGS+=	-DWX_GTK3=OFF
-.endif
+.include "../../wip/wxGTK32/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/slade/distinfo b/slade/distinfo
index 20e963f54b..5e1346a81c 100644
--- a/slade/distinfo
+++ b/slade/distinfo
@@ -1,5 +1,6 @@
 $NetBSD$
 
-BLAKE2s (SLADE-3.2.1.tar.gz) = d611a60ea98fa62e06c039ce38490884e5fbebda87b68bdaf2073f56d66ef75e
-SHA512 (SLADE-3.2.1.tar.gz) = b7d5a91c759c5a68af63aa9a8412452a5b2986e70f7189ca92ee99ce4953ef47381be907c8ce1166e479f24679904bf5f0e0b1a5da846fe7873c5b97f4315449
-Size (SLADE-3.2.1.tar.gz) = 6471666 bytes
+BLAKE2s (slade-3.2.5.tar.gz) = 7460685c42f1d57ca9bdebd0bf2198750a64ff2dc8e3733ecf1472274441c972
+SHA512 (slade-3.2.5.tar.gz) = 7a0185230c03deaff9745f7b038a0e6aedd62986afbd127b8904be91ea13d9d050fe6d03f0039203ee9fa46cdb2e5879e77f769f26d3eb935628785c5ffbf13f
+Size (slade-3.2.5.tar.gz) = 7010771 bytes
+SHA1 (patch-dist_CMakeLists.txt) = eabb1e742facd6f84012409f0a2ce02e9eff341f
diff --git a/slade/patches/patch-dist_CMakeLists.txt b/slade/patches/patch-dist_CMakeLists.txt
new file mode 100644
index 0000000000..37feea67cb
--- /dev/null
+++ b/slade/patches/patch-dist_CMakeLists.txt
@@ -0,0 +1,20 @@
+$NetBSD$
+
+Fix destination for file "slade.pk3".
+
+/usr/bin/make  -f dist/CMakeFiles/pk3.dir/build.make dist/CMakeFiles/pk3.dir/build
+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 .
+zip I/O error: Permission denied
+zip error: Could not create output file (/slade.pk3)
+
+--- dist/CMakeLists.txt.orig	2023-12-19 10:25:26.000000000 +0000
++++ dist/CMakeLists.txt
+@@ -13,7 +13,7 @@ elseif(ZIPTOOL_ZIP_EXECUTABLE)
+ 	if(NOT APPLE)
+ 		set(ZIP_COMMAND_CHARSET "-UN=UTF8")
+ 	endif()
+-	set(ZIP_COMMAND "${ZIPTOOL_ZIP_EXECUTABLE}" -X ${ZIP_COMMAND_CHARSET} -9 -r "${PK3_OUTPUT}/slade.pk3" .)
++	set(ZIP_COMMAND "${ZIPTOOL_ZIP_EXECUTABLE}" -X ${ZIP_COMMAND_CHARSET} -9 -r "${PK3_DESTINATION}/slade.pk3" .)
+ else()
+ 	message(STATUS "no zip executable, slade.pk3 won't build")
+ endif()


Home | Main Index | Thread Index | Old Index