[pkgsrc/trunk]: pkgsrc/audio/strawberry strawberry: Support non-POSIX iconv p...

[nia <nia%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/c1784f433478
branches:  trunk
changeset: 380979:c1784f433478
user:      nia <nia%pkgsrc.org@localhost>
date:      Wed Jun 22 09:36:49 2022 +0000

description:
strawberry: Support non-POSIX iconv prototype in NetBSD 9 and earlier.

diffstat:

 audio/strawberry/distinfo                             |   3 +-
 audio/strawberry/patches/patch-src_core_utilities.cpp |  34 +++++++++++++++++++
 2 files changed, 36 insertions(+), 1 deletions(-)

diffs (51 lines):

diff -r 732b4b0e39da -r c1784f433478 audio/strawberry/distinfo
--- a/audio/strawberry/distinfo Wed Jun 22 09:14:44 2022 +0000
+++ b/audio/strawberry/distinfo Wed Jun 22 09:36:49 2022 +0000
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.20 2022/06/12 16:16:44 nia Exp $
+$NetBSD: distinfo,v 1.21 2022/06/22 09:36:49 nia Exp $
 
 BLAKE2s (strawberry-1.0.5.tar.xz) = 5d223ed06087e64fe78ceb8bf963ab8495d44aa478fc5328e4faae59e1231277
 SHA512 (strawberry-1.0.5.tar.xz) = 4c625c75855f87952b274c85b4c5b021b27e75a74d46202ab3ea0aa3c86f510bccdece583483c4ba73e4733f151feb5eac5f5ef5d9a956995979fa307fd8d911
 Size (strawberry-1.0.5.tar.xz) = 11212028 bytes
 SHA1 (patch-src_analyzer_blockanalyzer.cpp) = e1e22a4ea278f03142f13fd8310730854a8ddc9a
 SHA1 (patch-src_analyzer_boomanalyzer.cpp) = 833bab9d6b59644c9acae662bc389bf731e507ad
+SHA1 (patch-src_core_utilities.cpp) = 4763a6a376d312a65a083fd798d4a34fe46a716f
diff -r 732b4b0e39da -r c1784f433478 audio/strawberry/patches/patch-src_core_utilities.cpp
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/audio/strawberry/patches/patch-src_core_utilities.cpp     Wed Jun 22 09:36:49 2022 +0000
@@ -0,0 +1,34 @@
+$NetBSD: patch-src_core_utilities.cpp,v 1.1 2022/06/22 09:36:49 nia Exp $
+
+Support non-POSIX iconv prototype in NetBSD 9/earlier and SunOS.
+
+--- src/core/utilities.cpp.orig        2022-06-22 09:33:19.522006535 +0000
++++ src/core/utilities.cpp
+@@ -103,6 +103,15 @@
+ #  include "scoped_cftyperef.h"
+ #endif
+ 
++#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
++#endif
++
+ namespace Utilities {
+ 
+ static QString tr(const char *str) {
+@@ -807,7 +816,11 @@ QString UnicodeToAscii(const QString &un
+ 
+   snprintf(input, input_len, "%s", utf8.constData());
+ 
++#if (defined(__NetBSD__) && !NETBSD_POSIX_ICONV) || defined(__sun)
++  iconv(conv, (const char **)&input, &input_len, &output, &output_len);
++#else
+   iconv(conv, &input, &input_len, &output, &output_len);
++#endif
+   iconv_close(conv);
+ 
+   QString ret(output_ptr);