head	1.2;
access;
symbols
	pkgsrc-2026Q1:1.2.0.28
	pkgsrc-2026Q1-base:1.2
	pkgsrc-2025Q4:1.2.0.26
	pkgsrc-2025Q4-base:1.2
	pkgsrc-2025Q3:1.2.0.24
	pkgsrc-2025Q3-base:1.2
	pkgsrc-2025Q2:1.2.0.22
	pkgsrc-2025Q2-base:1.2
	pkgsrc-2025Q1:1.2.0.20
	pkgsrc-2025Q1-base:1.2
	pkgsrc-2024Q4:1.2.0.18
	pkgsrc-2024Q4-base:1.2
	pkgsrc-2024Q3:1.2.0.16
	pkgsrc-2024Q3-base:1.2
	pkgsrc-2024Q2:1.2.0.14
	pkgsrc-2024Q2-base:1.2
	pkgsrc-2024Q1:1.2.0.12
	pkgsrc-2024Q1-base:1.2
	pkgsrc-2023Q4:1.2.0.10
	pkgsrc-2023Q4-base:1.2
	pkgsrc-2023Q3:1.2.0.8
	pkgsrc-2023Q3-base:1.2
	pkgsrc-2023Q2:1.2.0.6
	pkgsrc-2023Q2-base:1.2
	pkgsrc-2023Q1:1.2.0.4
	pkgsrc-2023Q1-base:1.2
	pkgsrc-2022Q4:1.2.0.2
	pkgsrc-2022Q4-base:1.2
	pkgsrc-2022Q3:1.1.0.4
	pkgsrc-2022Q3-base:1.1
	pkgsrc-2022Q2:1.1.0.2
	pkgsrc-2022Q2-base:1.1;
locks; strict;
comment	@// @;


1.2
date	2022.11.03.12.35.00;	author nros;	state Exp;
branches;
next	1.1;
commitid	clNAcCYoKJJ2Qf0E;

1.1
date	2022.04.10.07.59.29;	author nia;	state Exp;
branches;
next	;
commitid	EyXkvBp2KU21YCzD;


desc
@@


1.2
log
@fcitx-libthai: fix building with const **char in second argument to iconv
@
text
@$NetBSD: patch-src_iconvwrapper.cpp,v 1.1 2022/04/10 07:59:29 nia Exp $

Fix building on NetBSD <=9 with non-POSIX iconv.

--- src/iconvwrapper.cpp.orig	2020-12-11 07:57:11.364756600 +0000
+++ src/iconvwrapper.cpp
@@@@ -9,6 +9,15 @@@@
 #include <fcitx-utils/utf8.h>
 #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
+#endif
+
 class IconvWrapperPrivate {
 public:
     IconvWrapperPrivate(iconv_t conv) : conv_(conv) {}
@@@@ -37,8 +46,12 @@@@ std::vector<uint8_t> IconvWrapper::tryCo
         result.resize(s.size() * 10);
         size_t byteLength = s.size();
         size_t byteRemains = result.size();
-        char *data = const_cast<char *>(s.data());
         char *outData = reinterpret_cast<char *>(result.data());
+#if (defined(__NetBSD__) && !NETBSD_POSIX_ICONV) || defined(__sun)
+        const char *data = s.data();
+#else
+        char *data = const_cast<char *>(s.data());
+#endif
         auto err = iconv(conv, &data, &byteLength, &outData, &byteRemains);
         if (err == static_cast<size_t>(-1)) {
             continue;
@


1.1
log
@fcitx5-libthai: fix building on netbsd-9
@
text
@d1 1
a1 1
$NetBSD$
d23 1
a23 1
@@@@ -37,9 +46,13 @@@@ std::vector<uint8_t> IconvWrapper::tryCo
d30 1
a30 1
+        auto err = iconv(conv, s.data(), &byteLength, &outData, &byteRemains);
d33 1
a34 1
+#endif
a36 1
         }
@