Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 0613584D6F for ; Sat, 22 Jul 2023 09:13:30 +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 L_GL7YdRNC_h for ; Sat, 22 Jul 2023 09:13:29 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 6CDC084CFE for ; Sat, 22 Jul 2023 09:13:29 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 625BBFBDB; Sat, 22 Jul 2023 09:12:59 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1690017179124300" MIME-Version: 1.0 Date: Sat, 22 Jul 2023 09:12:59 +0000 From: "Nia Alarie" Subject: CVS commit: pkgsrc/games/valyriatear To: pkgsrc-changes@NetBSD.org Approved: commit_and_comment Reply-To: nia@netbsd.org X-Mailer: log_accum Message-Id: <20230722091259.625BBFBDB@cvs.NetBSD.org> This is a multi-part message in MIME format. --_----------=_1690017179124300 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: nia Date: Sat Jul 22 09:12:58 UTC 2023 Modified Files: pkgsrc/games/valyriatear: distinfo pkgsrc/games/valyriatear/patches: patch-src_utils_src_utils_ustring.cpp Log Message: valyriatear: quick hack to fix a patch on non-netbsd To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 pkgsrc/games/valyriatear/distinfo cvs rdiff -u -r1.1 -r1.2 \ 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. --_----------=_1690017179124300 Content-Disposition: inline Content-Length: 2442 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/games/valyriatear/distinfo diff -u pkgsrc/games/valyriatear/distinfo:1.5 pkgsrc/games/valyriatear/distinfo:1.6 --- pkgsrc/games/valyriatear/distinfo:1.5 Tue Oct 26 10:44:29 2021 +++ pkgsrc/games/valyriatear/distinfo Sat Jul 22 09:12:58 2023 @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.5 2021/10/26 10:44:29 nia Exp $ +$NetBSD: distinfo,v 1.6 2023/07/22 09:12:58 nia Exp $ BLAKE2s (ValyriaTear-src-with-deps-1.1.0.tar.gz) = 495aab3e77a776eb97b7117978f70d22d80ba9deb3af9ad2cd1431411d20c140 SHA512 (ValyriaTear-src-with-deps-1.1.0.tar.gz) = 29d4927f2dba691ff99568acdbaa70c9608ad9f5b56160982c0e10be78a3c401aab85b43c633e48bc36e00e7f6e2de6aea5577790cb65fedd72d4e6ad14baf8d @@ -7,4 +7,4 @@ SHA1 (patch-src_CMakeLists.txt) = 6189c5 SHA1 (patch-src_common_app__settings.cpp) = 826d0eb42ad777b61296b5b4a21787ce0707930b SHA1 (patch-src_common_global_shop_shop__data.h) = baddc1a5b2b9756d1a11b82b7f3ee36fd60de1ef SHA1 (patch-src_main.cpp) = 2c8f826e34341f2a7a47c67886d6a6a3ce0fa819 -SHA1 (patch-src_utils_src_utils_ustring.cpp) = 061337fd91124edba8ecaa53ba4e23651ba0445b +SHA1 (patch-src_utils_src_utils_ustring.cpp) = 988486c6b3f88f06ea50efdf9f4183e8f659f434 Index: pkgsrc/games/valyriatear/patches/patch-src_utils_src_utils_ustring.cpp diff -u pkgsrc/games/valyriatear/patches/patch-src_utils_src_utils_ustring.cpp:1.1 pkgsrc/games/valyriatear/patches/patch-src_utils_src_utils_ustring.cpp:1.2 --- pkgsrc/games/valyriatear/patches/patch-src_utils_src_utils_ustring.cpp:1.1 Sat Apr 10 09:38:21 2021 +++ pkgsrc/games/valyriatear/patches/patch-src_utils_src_utils_ustring.cpp Sat Jul 22 09:12:58 2023 @@ -1,21 +1,23 @@ -$NetBSD: patch-src_utils_src_utils_ustring.cpp,v 1.1 2021/04/10 09:38:21 nia Exp $ +$NetBSD: patch-src_utils_src_utils_ustring.cpp,v 1.2 2023/07/22 09:12:58 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.orig 2023-07-22 09:11:40.115042146 +0000 +++ src/utils/src/utils/ustring.cpp -@@ -25,6 +25,10 @@ +@@ -25,6 +25,12 @@ // For correct endianess support #include +#ifdef __NetBSD__ +#include ++#else ++#define __NetBSD_Prereq__(x,y,z) (0) +#endif + namespace vt_utils { -@@ -171,7 +175,8 @@ static bool UTF8ToUTF16(const std::strin +@@ -171,7 +177,8 @@ static bool UTF8ToUTF16(const std::strin return false; } --_----------=_1690017179124300--