Received: by mail.netbsd.org (Postfix, from userid 605) id B1E5584D99; Sat, 10 Apr 2021 09:38:22 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id EBE9E84D7A for ; Sat, 10 Apr 2021 09:38:21 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id oH0wFfcoBnYz for ; Sat, 10 Apr 2021 09:38:21 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 4CDAD84C13 for ; Sat, 10 Apr 2021 09:38:21 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 45D48FA95; Sat, 10 Apr 2021 09:38:21 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1618047501146300" MIME-Version: 1.0 Date: Sat, 10 Apr 2021 09:38:21 +0000 From: "Nia Alarie" Subject: CVS commit: pkgsrc/games/valyriatear To: pkgsrc-changes@NetBSD.org Reply-To: nia@netbsd.org X-Mailer: log_accum Message-Id: <20210410093821.45D48FA95@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1618047501146300 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: nia Date: Sat Apr 10 09:38:21 UTC 2021 Modified Files: pkgsrc/games/valyriatear: Makefile distinfo Added Files: pkgsrc/games/valyriatear/patches: patch-src_utils_src_utils_ustring.cpp Log Message: valyriatear: fix build on netbsd releases without posix iconv To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 pkgsrc/games/valyriatear/Makefile \ pkgsrc/games/valyriatear/distinfo cvs rdiff -u -r0 -r1.1 \ pkgsrc/games/valyriatear/patches/patch-src_utils_src_utils_ustring.cpp Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1618047501146300 Content-Disposition: inline Content-Length: 3200 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/games/valyriatear/Makefile diff -u pkgsrc/games/valyriatear/Makefile:1.1 pkgsrc/games/valyriatear/Makefile:1.2 --- pkgsrc/games/valyriatear/Makefile:1.1 Sun Apr 4 11:10:37 2021 +++ pkgsrc/games/valyriatear/Makefile Sat Apr 10 09:38:20 2021 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1 2021/04/04 11:10:37 nia Exp $ +# $NetBSD: Makefile,v 1.2 2021/04/10 09:38:20 nia Exp $ DISTNAME= ValyriaTear-src-with-deps-1.1.0 PKGNAME= ${DISTNAME:tl:S/-src-with-deps//1} @@ -11,6 +11,8 @@ HOMEPAGE= https://github.com/ValyriaTear COMMENT= Single player medieval fantasy 2D JRPG LICENSE= gnu-gpl-v2 AND gnu-gpl-v3 AND cc-by-sa-v3.0 +TOOL_DEPENDS+= dos2unix-[0-9]*:../../converters/dos2unix + WRKSRC= ${WRKDIR}/ValyriaTear USE_CMAKE= yes @@ -19,6 +21,9 @@ USE_LANGUAGES= c c++ LDFLAGS+= ${BUILDLINK_LDADD.gettext} +post-extract: + dos2unix src/utils/src/utils/ustring.cpp + .include "../../audio/libvorbis/buildlink3.mk" .include "../../audio/openal-soft/buildlink3.mk" .include "../../devel/SDL2/buildlink3.mk" Index: pkgsrc/games/valyriatear/distinfo diff -u pkgsrc/games/valyriatear/distinfo:1.1 pkgsrc/games/valyriatear/distinfo:1.2 --- pkgsrc/games/valyriatear/distinfo:1.1 Sun Apr 4 11:10:37 2021 +++ pkgsrc/games/valyriatear/distinfo Sat Apr 10 09:38:20 2021 @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.1 2021/04/04 11:10:37 nia Exp $ +$NetBSD: distinfo,v 1.2 2021/04/10 09:38:20 nia Exp $ SHA1 (ValyriaTear-src-with-deps-1.1.0.tar.gz) = 407cc5bdf4ed67236cfab089c14cee0377bb3cc7 RMD160 (ValyriaTear-src-with-deps-1.1.0.tar.gz) = 243b04060c6d2bdec717f98835f3c5f27e6742ea @@ -7,3 +7,4 @@ Size (ValyriaTear-src-with-deps-1.1.0.ta SHA1 (patch-src_CMakeLists.txt) = 6189c5313ef3f01b174032e249c1a94ceabfa96c SHA1 (patch-src_common_app__settings.cpp) = 826d0eb42ad777b61296b5b4a21787ce0707930b SHA1 (patch-src_main.cpp) = 2c8f826e34341f2a7a47c67886d6a6a3ce0fa819 +SHA1 (patch-src_utils_src_utils_ustring.cpp) = 061337fd91124edba8ecaa53ba4e23651ba0445b Added files: Index: pkgsrc/games/valyriatear/patches/patch-src_utils_src_utils_ustring.cpp diff -u /dev/null pkgsrc/games/valyriatear/patches/patch-src_utils_src_utils_ustring.cpp:1.1 --- /dev/null Sat Apr 10 09:38:21 2021 +++ pkgsrc/games/valyriatear/patches/patch-src_utils_src_utils_ustring.cpp Sat Apr 10 09:38:21 2021 @@ -0,0 +1,27 @@ +$NetBSD: patch-src_utils_src_utils_ustring.cpp,v 1.1 2021/04/10 09:38:21 nia Exp $ + +Support non-POSIX iconv on NetBSD. + +--- src/utils/src/utils/ustring.cpp.orig 2019-07-29 10:50:15.000000000 +0000 ++++ src/utils/src/utils/ustring.cpp +@@ -25,6 +25,10 @@ + // For correct endianess support + #include + ++#ifdef __NetBSD__ ++#include ++#endif ++ + namespace vt_utils + { + +@@ -171,7 +175,8 @@ static bool UTF8ToUTF16(const std::strin + return false; + } + +-#if (defined(_LIBICONV_VERSION) && _LIBICONV_VERSION == 0x0109) || defined(__FreeBSD__) ++#if (defined(_LIBICONV_VERSION) && _LIBICONV_VERSION == 0x0109) || defined(__FreeBSD__) || \ ++ (defined(__NetBSD__) && !__NetBSD_Prereq__(9,99,17)) + // We are using an iconv API that uses const char* + const char *sourceChar = source.c_str(); + #else --_----------=_1618047501146300--