head 1.2; access; symbols pkgsrc-2026Q3:1.2.0.38 pkgsrc-2026Q3-base:1.2 pkgsrc-2026Q2:1.2.0.36 pkgsrc-2026Q2-base:1.2 pkgsrc-2026Q1:1.2.0.34 pkgsrc-2026Q1-base:1.2 pkgsrc-2025Q4:1.2.0.32 pkgsrc-2025Q4-base:1.2 pkgsrc-2025Q3:1.2.0.30 pkgsrc-2025Q3-base:1.2 pkgsrc-2025Q2:1.2.0.28 pkgsrc-2025Q2-base:1.2 pkgsrc-2025Q1:1.2.0.26 pkgsrc-2025Q1-base:1.2 pkgsrc-2024Q4:1.2.0.24 pkgsrc-2024Q4-base:1.2 pkgsrc-2024Q3:1.2.0.22 pkgsrc-2024Q3-base:1.2 pkgsrc-2024Q2:1.2.0.20 pkgsrc-2024Q2-base:1.2 pkgsrc-2024Q1:1.2.0.18 pkgsrc-2024Q1-base:1.2 pkgsrc-2023Q4:1.2.0.16 pkgsrc-2023Q4-base:1.2 pkgsrc-2023Q3:1.2.0.14 pkgsrc-2023Q3-base:1.2 pkgsrc-2023Q2:1.2.0.12 pkgsrc-2023Q2-base:1.2 pkgsrc-2023Q1:1.2.0.10 pkgsrc-2023Q1-base:1.2 pkgsrc-2022Q4:1.2.0.8 pkgsrc-2022Q4-base:1.2 pkgsrc-2022Q3:1.2.0.6 pkgsrc-2022Q3-base:1.2 pkgsrc-2022Q2:1.2.0.4 pkgsrc-2022Q2-base:1.2 pkgsrc-2022Q1:1.2.0.2 pkgsrc-2022Q1-base:1.2 pkgsrc-2021Q4:1.1.0.2 pkgsrc-2021Q4-base:1.1; locks; strict; comment @// @; 1.2 date 2022.03.25.10.37.30; author wiz; state Exp; branches; next 1.1; commitid xewiY0nAp654mAxD; 1.1 date 2021.12.20.07.19.42; author nia; state Exp; branches; next ; commitid L4XIKSSXDHHpjmlD; desc @@ 1.2 log @newsbeuter: fix NetBSD iconv change Should fix build on NetBSD<9.99.17 @ text @$NetBSD: patch-src_utils.cpp,v 1.1 2021/12/20 07:19:42 nia Exp $ Adapt to NetBSD iconv prototype change. --- src/utils.cpp.orig 2015-02-19 10:56:59.000000000 +0000 +++ src/utils.cpp @@@@ -37,6 +37,13 @@@@ GCRY_THREAD_OPTION_PTHREAD_IMPL; #include #endif +#if defined(__NetBSD__) +#include +#if __NetBSD_Prereq__(9,99,17) +#define NETBSD_POSIX_ICONV 1 +#endif +#endif + namespace newsbeuter { std::vector utils::tokenize_quoted(const std::string& str, std::string delimiters) { @@@@ -274,7 +281,7 @@@@ std::string utils::convert_text(const st * of all the Unix-like systems around there, only Linux/glibc seems to * come with a SuSv3-conforming iconv implementation. */ -#if !(__linux) && !defined(__GLIBC__) && !defined(__APPLE__) && !defined(__OpenBSD__) +#if !(__linux) && !defined(__GLIBC__) && !defined(__APPLE__) && !defined(__OpenBSD__) && !defined(NETBSD_POSIX_ICONV) const char * inbufp; #else char * inbufp; @ 1.1 log @newsbeuter: Fix building on NetBSD HEAD. @ text @d1 1 a1 1 $NetBSD$ d7 1 a7 1 @@@@ -37,6 +37,15 @@@@ GCRY_THREAD_OPTION_PTHREAD_IMPL; a14 2 +#else +#define NETBSD_POSIX_ICONV 0 d21 1 a21 1 @@@@ -274,7 +283,7 @@@@ std::string utils::convert_text(const st @