CVS commit: pkgsrc/games/gemrb

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Wed Nov 15 16:30:13 UTC 2023

Modified Files:
        pkgsrc/games/gemrb: distinfo
Added Files:
        pkgsrc/games/gemrb/patches:
            patch-gemrb_core_Strings_StringConversion.cpp
            patch-gemrb_plugins_TTFImporter_TTFFont.cpp

Log Message:
gemrb: Restore patches. iconv problems were wrongly "fixed" upstream.


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 pkgsrc/games/gemrb/distinfo
cvs rdiff -u -r0 -r1.3 \
    pkgsrc/games/gemrb/patches/patch-gemrb_core_Strings_StringConversion.cpp
cvs rdiff -u -r0 -r1.4 \
    pkgsrc/games/gemrb/patches/patch-gemrb_plugins_TTFImporter_TTFFont.cpp

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

Modified files:

Index: pkgsrc/games/gemrb/distinfo
diff -u pkgsrc/games/gemrb/distinfo:1.10 pkgsrc/games/gemrb/distinfo:1.11
--- pkgsrc/games/gemrb/distinfo:1.10    Sun Sep 10 09:21:39 2023
+++ pkgsrc/games/gemrb/distinfo Wed Nov 15 16:30:13 2023
@@ -1,5 +1,7 @@
-$NetBSD: distinfo,v 1.10 2023/09/10 09:21:39 yhardy Exp $
+$NetBSD: distinfo,v 1.11 2023/11/15 16:30:13 nia Exp $
 
 BLAKE2s (gemrb-0.9.2.tar.gz) = 1ca150a79f78839227012fa5a9d4f6982a8a3f83d33fb4c0ebbe8125a4cbdefd
 SHA512 (gemrb-0.9.2.tar.gz) = cc26f56de19f603645a36533b3ad6abb345809570d69d84c2defc6f2af7a08f6dad3a3db0f89f749ff5df4888fd32a8eb6a1b253e0efbf11ec3ebf3bc5a3ec91
 Size (gemrb-0.9.2.tar.gz) = 14327547 bytes
+SHA1 (patch-gemrb_core_Strings_StringConversion.cpp) = ace8de07050463be5aec5deae23fbc29b5082f86
+SHA1 (patch-gemrb_plugins_TTFImporter_TTFFont.cpp) = 31e6565948df99c6b190a8637025de491a3d6d47

Added files:

Index: pkgsrc/games/gemrb/patches/patch-gemrb_core_Strings_StringConversion.cpp
diff -u /dev/null pkgsrc/games/gemrb/patches/patch-gemrb_core_Strings_StringConversion.cpp:1.3
--- /dev/null   Wed Nov 15 16:30:13 2023
+++ pkgsrc/games/gemrb/patches/patch-gemrb_core_Strings_StringConversion.cpp    Wed Nov 15 16:30:13 2023
@@ -0,0 +1,34 @@
+$NetBSD: patch-gemrb_core_Strings_StringConversion.cpp,v 1.3 2023/11/15 16:30:13 nia Exp $
+
+Deal with old NetBSD/SunOS style iconv.
+
+--- gemrb/core/Strings/StringConversion.cpp.orig       2023-07-08 08:54:22.000000000 +0000
++++ gemrb/core/Strings/StringConversion.cpp
+@@ -20,6 +20,15 @@
+ 
+ #include <iconv.h>
+ 
++#if defined(__NetBSD__)
++#include <sys/param.h>
++#if __NetBSD_Prereq__(9,99,17)
++#define NETBSD_POSIX_ICONV 1
++#else
++#define NETBSD_POSIX_ICONV 0
++#endif /* __NetBSD_Prereq__(9,99,17) */
++#endif /* defined(__NetBSD__) */
++
+ #include "ie_types.h"
+ #include "Interface.h"
+ #include "Logging/Logging.h"
+@@ -109,7 +118,11 @@ char* ConvertCharEncoding(const char* st
+       }
+ 
+ 
++#if (defined(__NetBSD__) && !NETBSD_POSIX_ICONV) || defined(__sun)
++      const char * in = (const char *) string;
++#else
+       char * in = (char *) string;
++#endif
+       size_t in_len = strlen(string);
+       size_t out_len = (in_len + 1) * 4;
+       size_t out_len_left = out_len;

Index: pkgsrc/games/gemrb/patches/patch-gemrb_plugins_TTFImporter_TTFFont.cpp
diff -u /dev/null pkgsrc/games/gemrb/patches/patch-gemrb_plugins_TTFImporter_TTFFont.cpp:1.4
--- /dev/null   Wed Nov 15 16:30:13 2023
+++ pkgsrc/games/gemrb/patches/patch-gemrb_plugins_TTFImporter_TTFFont.cpp      Wed Nov 15 16:30:13 2023
@@ -0,0 +1,34 @@
+$NetBSD: patch-gemrb_plugins_TTFImporter_TTFFont.cpp,v 1.4 2023/11/15 16:30:13 nia Exp $
+
+Deal with old NetBSD/SunOS style iconv.
+
+--- gemrb/plugins/TTFImporter/TTFFont.cpp.orig 2023-07-08 08:54:22.000000000 +0000
++++ gemrb/plugins/TTFImporter/TTFFont.cpp
+@@ -29,6 +29,15 @@
+ #include <iconv.h>
+ #include <cerrno>
+ 
++#if defined(__NetBSD__) 
++#include <sys/param.h> 
++#if __NetBSD_Prereq__(9,99,17)
++#define NETBSD_POSIX_ICONV 1
++#else   
++#define NETBSD_POSIX_ICONV 0
++#endif /* __NetBSD_Prereq__(9,99,17) */
++#endif /* defined(__NetBSD__) */
++
+ namespace GemRB {
+ 
+ const Glyph& TTFFont::AliasBlank(ieWord chr) const
+@@ -40,7 +49,11 @@ const Glyph& TTFFont::AliasBlank(ieWord 
+ const Glyph& TTFFont::GetGlyph(ieWord chr) const
+ {
+       if (!core->TLKEncoding.multibyte) {
++#if (defined(__NetBSD__) && !NETBSD_POSIX_ICONV) || defined(__sun)
++              const char* oldchar = (const char*)&chr;
++#else
+               char* oldchar = (char*)&chr;
++#endif
+               ieWord unicodeChr = 0;
+               char* newchar = (char*)&unicodeChr;
+               size_t in = (core->TLKEncoding.widechar) ? 2 : 1;