pkgsrc-WIP-changes archive

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

0ad: last phase needs zip. remove patch which was added in 2016 when NetBSD lacked wcsnlen(3).



Module Name:	pkgsrc-wip
Committed By:	nikita <nikita%NetBSD.org@localhost>
Pushed By:	nikita
Date:		Thu May 4 08:02:48 2023 +0200
Changeset:	cd8ad56c07edbf7b6024fbe91cf0f66119056496

Modified Files:
	0ad/Makefile
	0ad/distinfo
Removed Files:
	0ad/patches/patch-source_lib_secure__crt.cpp

Log Message:
0ad: last phase needs zip. remove patch which was added in 2016 when
NetBSD lacked wcsnlen(3).

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

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

diffstat:
 0ad/Makefile                                 |  7 ++++---
 0ad/distinfo                                 |  1 -
 0ad/patches/patch-source_lib_secure__crt.cpp | 13 -------------
 3 files changed, 4 insertions(+), 17 deletions(-)

diffs:
diff --git a/0ad/Makefile b/0ad/Makefile
index 789d8fd507..58252fe4b4 100644
--- a/0ad/Makefile
+++ b/0ad/Makefile
@@ -15,12 +15,13 @@ GCC_REQD+=	7
 USE_LANGUAGES=	c c++
 
 USE_TOOLS+=	gmake perl bash pkg-config pax tar
-TOOL_DEPENDS+=	python${PYTHON_VERSION_DEFAULT}-[0-9]*:../../lang/python${PYTHON_VERSION_DEFAULT}
 
 PYTHON_VERSIONS_INCOMPATIBLE=	27
 
-DEPENDS+=	0ad-data-${PKGVERSION}:../../wip/0ad-data
-DEPENDS+=	premake5-[0-9]*:../../devel/premake5
+DEPENDS+=		0ad-data-${PKGVERSION}:../../wip/0ad-data
+BUILD_DEPENDS+=		premake5-[0-9]*:../../devel/premake5
+BUILD_DEPENDS+=		zip-[0-9]*:../../archivers/zip
+TOOL_DEPENDS+=		python${PYTHON_VERSION_DEFAULT}-[0-9]*:../../lang/python${PYTHON_VERSION_DEFAULT}
 
 SUBST_CLASSES+=			sysincludedir
 SUBST_MESSAGE.sysincludedir=	Fixing "/usr/local" path assumption
diff --git a/0ad/distinfo b/0ad/distinfo
index 7cc49c4647..941b238d6e 100644
--- a/0ad/distinfo
+++ b/0ad/distinfo
@@ -15,7 +15,6 @@ SHA1 (patch-libraries_source_fcollada_src_FCollada_FUtils_FUStringBuilder.hpp) =
 SHA1 (patch-libraries_source_fcollada_src_FCollada_FUtils_Platforms.h) = 6887cca8e6ff1765a6b666bd595f8bcb41c2a90f
 SHA1 (patch-libraries_source_spidermonkey_build.sh) = 34225c82659cc236bff076301dd52adca9888f92
 SHA1 (patch-source_lib_allocators_page__aligned.cpp) = c25054afd543a1a90530964a63b2b692b1687765
-SHA1 (patch-source_lib_secure__crt.cpp) = 1eaa9eb892d75e6a2533dc031675615138550e51
 SHA1 (patch-source_maths_tests_test__Bound.h) = 8d6b79199d86dabdddf3dca68eed2d252ef9a649
 SHA1 (patch-source_network_StunClient.cpp) = 6267d44c3d0345d3e47c19746f105657ba984876
 SHA1 (patch-source_scriptinterface_ScriptTypes.h) = f2351c637ba7ed7a36b4399b6e89a0d8281c9ad4
diff --git a/0ad/patches/patch-source_lib_secure__crt.cpp b/0ad/patches/patch-source_lib_secure__crt.cpp
deleted file mode 100644
index 719515a5e3..0000000000
--- a/0ad/patches/patch-source_lib_secure__crt.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD$
-
---- source/lib/secure_crt.cpp.orig	2022-08-21 14:45:19.000000000 +0200
-+++ source/lib/secure_crt.cpp	2023-05-03 23:36:26.329771228 +0200
-@@ -113,7 +113,7 @@
- // self-test and the t* defines (needed for test).
- #if EMULATE_SECURE_CRT
- 
--#if !OS_UNIX || OS_MACOSX || OS_OPENBSD
-+#if !OS_UNIX || OS_MACOSX || OS_OPENBSD || defined(__NetBSD__) /* XXX: Add wcsnlen(3) in NetBSD */
- // return length [in characters] of a string, not including the trailing
- // null character. to protect against access violations, only the
- // first <max_len> characters are examined; if the null character is


Home | Main Index | Thread Index | Old Index