Sat Apr 10 09:38:21 2021 UTC ()
valyriatear: fix build on netbsd releases without posix iconv


(nia)
diff -r1.1 -r1.2 pkgsrc/games/valyriatear/Makefile
diff -r1.1 -r1.2 pkgsrc/games/valyriatear/distinfo
diff -r0 -r1.1 pkgsrc/games/valyriatear/patches/patch-src_utils_src_utils_ustring.cpp
cvs diff -r1.1 -r1.2 pkgsrc/games/valyriatear/Makefile (expand / switch to unified diff)

--- pkgsrc/games/valyriatear/Makefile 2021/04/04 11:10:37 1.1
+++ pkgsrc/games/valyriatear/Makefile 2021/04/10 09:38:20 1.2
@@ -1,34 +1,39 @@ @@ -1,34 +1,39 @@
1# $NetBSD: Makefile,v 1.1 2021/04/04 11:10:37 nia Exp $ 1# $NetBSD: Makefile,v 1.2 2021/04/10 09:38:20 nia Exp $
2 2
3DISTNAME= ValyriaTear-src-with-deps-1.1.0 3DISTNAME= ValyriaTear-src-with-deps-1.1.0
4PKGNAME= ${DISTNAME:tl:S/-src-with-deps//1} 4PKGNAME= ${DISTNAME:tl:S/-src-with-deps//1}
5CATEGORIES= games 5CATEGORIES= games
6MASTER_SITES= ${MASTER_SITE_GITHUB:=ValyriaTear/} 6MASTER_SITES= ${MASTER_SITE_GITHUB:=ValyriaTear/}
7GITHUB_RELEASE= ${PKGVERSION_NOREV} 7GITHUB_RELEASE= ${PKGVERSION_NOREV}
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= https://github.com/ValyriaTear/ValyriaTear 10HOMEPAGE= https://github.com/ValyriaTear/ValyriaTear
11COMMENT= Single player medieval fantasy 2D JRPG 11COMMENT= Single player medieval fantasy 2D JRPG
12LICENSE= gnu-gpl-v2 AND gnu-gpl-v3 AND cc-by-sa-v3.0 12LICENSE= gnu-gpl-v2 AND gnu-gpl-v3 AND cc-by-sa-v3.0
13 13
 14TOOL_DEPENDS+= dos2unix-[0-9]*:../../converters/dos2unix
 15
14WRKSRC= ${WRKDIR}/ValyriaTear 16WRKSRC= ${WRKDIR}/ValyriaTear
15 17
16USE_CMAKE= yes 18USE_CMAKE= yes
17USE_TOOLS+= pkg-config msgfmt 19USE_TOOLS+= pkg-config msgfmt
18USE_LANGUAGES= c c++ 20USE_LANGUAGES= c c++
19 21
20LDFLAGS+= ${BUILDLINK_LDADD.gettext} 22LDFLAGS+= ${BUILDLINK_LDADD.gettext}
21 23
 24post-extract:
 25 dos2unix src/utils/src/utils/ustring.cpp
 26
22.include "../../audio/libvorbis/buildlink3.mk" 27.include "../../audio/libvorbis/buildlink3.mk"
23.include "../../audio/openal-soft/buildlink3.mk" 28.include "../../audio/openal-soft/buildlink3.mk"
24.include "../../devel/SDL2/buildlink3.mk" 29.include "../../devel/SDL2/buildlink3.mk"
25.include "../../devel/boost-headers/buildlink3.mk" 30.include "../../devel/boost-headers/buildlink3.mk"
26.include "../../devel/gettext-lib/buildlink3.mk" 31.include "../../devel/gettext-lib/buildlink3.mk"
27.include "../../devel/zlib/buildlink3.mk" 32.include "../../devel/zlib/buildlink3.mk"
28.include "../../fonts/SDL2_ttf/buildlink3.mk" 33.include "../../fonts/SDL2_ttf/buildlink3.mk"
29.include "../../graphics/hicolor-icon-theme/buildlink3.mk" 34.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
30.include "../../graphics/SDL2_image/buildlink3.mk" 35.include "../../graphics/SDL2_image/buildlink3.mk"
31.include "../../graphics/glew/buildlink3.mk" 36.include "../../graphics/glew/buildlink3.mk"
32.include "../../graphics/png/buildlink3.mk" 37.include "../../graphics/png/buildlink3.mk"
33.include "../../lang/lua51/buildlink3.mk" 38.include "../../lang/lua51/buildlink3.mk"
34.include "../../sysutils/desktop-file-utils/desktopdb.mk" 39.include "../../sysutils/desktop-file-utils/desktopdb.mk"
cvs diff -r1.1 -r1.2 pkgsrc/games/valyriatear/distinfo (expand / switch to unified diff)

--- pkgsrc/games/valyriatear/distinfo 2021/04/04 11:10:37 1.1
+++ pkgsrc/games/valyriatear/distinfo 2021/04/10 09:38:20 1.2
@@ -1,9 +1,10 @@ @@ -1,9 +1,10 @@
1$NetBSD: distinfo,v 1.1 2021/04/04 11:10:37 nia Exp $ 1$NetBSD: distinfo,v 1.2 2021/04/10 09:38:20 nia Exp $
2 2
3SHA1 (ValyriaTear-src-with-deps-1.1.0.tar.gz) = 407cc5bdf4ed67236cfab089c14cee0377bb3cc7 3SHA1 (ValyriaTear-src-with-deps-1.1.0.tar.gz) = 407cc5bdf4ed67236cfab089c14cee0377bb3cc7
4RMD160 (ValyriaTear-src-with-deps-1.1.0.tar.gz) = 243b04060c6d2bdec717f98835f3c5f27e6742ea 4RMD160 (ValyriaTear-src-with-deps-1.1.0.tar.gz) = 243b04060c6d2bdec717f98835f3c5f27e6742ea
5SHA512 (ValyriaTear-src-with-deps-1.1.0.tar.gz) = 29d4927f2dba691ff99568acdbaa70c9608ad9f5b56160982c0e10be78a3c401aab85b43c633e48bc36e00e7f6e2de6aea5577790cb65fedd72d4e6ad14baf8d 5SHA512 (ValyriaTear-src-with-deps-1.1.0.tar.gz) = 29d4927f2dba691ff99568acdbaa70c9608ad9f5b56160982c0e10be78a3c401aab85b43c633e48bc36e00e7f6e2de6aea5577790cb65fedd72d4e6ad14baf8d
6Size (ValyriaTear-src-with-deps-1.1.0.tar.gz) = 117039173 bytes 6Size (ValyriaTear-src-with-deps-1.1.0.tar.gz) = 117039173 bytes
7SHA1 (patch-src_CMakeLists.txt) = 6189c5313ef3f01b174032e249c1a94ceabfa96c 7SHA1 (patch-src_CMakeLists.txt) = 6189c5313ef3f01b174032e249c1a94ceabfa96c
8SHA1 (patch-src_common_app__settings.cpp) = 826d0eb42ad777b61296b5b4a21787ce0707930b 8SHA1 (patch-src_common_app__settings.cpp) = 826d0eb42ad777b61296b5b4a21787ce0707930b
9SHA1 (patch-src_main.cpp) = 2c8f826e34341f2a7a47c67886d6a6a3ce0fa819 9SHA1 (patch-src_main.cpp) = 2c8f826e34341f2a7a47c67886d6a6a3ce0fa819
 10SHA1 (patch-src_utils_src_utils_ustring.cpp) = 061337fd91124edba8ecaa53ba4e23651ba0445b
File Added: pkgsrc/games/valyriatear/patches/patch-src_utils_src_utils_ustring.cpp
$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 <SDL2/SDL_endian.h>
 
+#ifdef __NetBSD__
+#include <sys/param.h>
+#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