Mon Dec 20 07:19:42 2021 UTC ()
newsbeuter: Fix building on NetBSD HEAD.


(nia)
diff -r1.5 -r1.6 pkgsrc/news/newsbeuter/distinfo
diff -r0 -r1.1 pkgsrc/news/newsbeuter/patches/patch-src_utils.cpp
cvs diff -r1.5 -r1.6 pkgsrc/news/newsbeuter/distinfo (expand / switch to unified diff)

--- pkgsrc/news/newsbeuter/distinfo 2021/10/26 11:09:35 1.5
+++ pkgsrc/news/newsbeuter/distinfo 2021/12/20 07:19:42 1.6
@@ -1,13 +1,14 @@ @@ -1,13 +1,14 @@
1$NetBSD: distinfo,v 1.5 2021/10/26 11:09:35 nia Exp $ 1$NetBSD: distinfo,v 1.6 2021/12/20 07:19:42 nia Exp $
2 2
3BLAKE2s (newsbeuter-2.9.tar.gz) = d42446556199395cf370c229208d52e21fd8d666cc415ae6f4cd2bd92d9ea889 3BLAKE2s (newsbeuter-2.9.tar.gz) = d42446556199395cf370c229208d52e21fd8d666cc415ae6f4cd2bd92d9ea889
4SHA512 (newsbeuter-2.9.tar.gz) = b173008c8c8d3729f8ccef3ce62645a05c1803fb842d5c0afdf9ffd4ed3726030f9c359c20bc817402a6a0ea12af742d0ae7faf9b92d52c11f420f62b430b0aa 4SHA512 (newsbeuter-2.9.tar.gz) = b173008c8c8d3729f8ccef3ce62645a05c1803fb842d5c0afdf9ffd4ed3726030f9c359c20bc817402a6a0ea12af742d0ae7faf9b92d52c11f420f62b430b0aa
5Size (newsbeuter-2.9.tar.gz) = 432763 bytes 5Size (newsbeuter-2.9.tar.gz) = 432763 bytes
6SHA1 (patch-Makefile) = 53d6ddfa518a1a371428afdf36745028530b30de 6SHA1 (patch-Makefile) = 53d6ddfa518a1a371428afdf36745028530b30de
7SHA1 (patch-config.sh) = e5d4adf96cae46c8febf818ff03b4f598a865945 7SHA1 (patch-config.sh) = e5d4adf96cae46c8febf818ff03b4f598a865945
8SHA1 (patch-include_configcontainer.h) = 54c7756cf29550c60181c3cdf52e9178183b78ed 8SHA1 (patch-include_configcontainer.h) = 54c7756cf29550c60181c3cdf52e9178183b78ed
9SHA1 (patch-src_configcontainer.cpp) = 3f799235a4d36acbfa3938ed68abd48776eb143f 9SHA1 (patch-src_configcontainer.cpp) = 3f799235a4d36acbfa3938ed68abd48776eb143f
10SHA1 (patch-src_controller.cpp) = 927b11064deac38acbb577aa0d3f750f72c0e55a 10SHA1 (patch-src_controller.cpp) = 927b11064deac38acbb577aa0d3f750f72c0e55a
11SHA1 (patch-src_feedhq__api.cpp) = 53d2807fc03cc048b6af928d304efcf9c6bd5c70 11SHA1 (patch-src_feedhq__api.cpp) = 53d2807fc03cc048b6af928d304efcf9c6bd5c70
12SHA1 (patch-src_oldreader__api.cpp) = fccad7823870717eab2f0c87e3ab78465dbf8128 12SHA1 (patch-src_oldreader__api.cpp) = fccad7823870717eab2f0c87e3ab78465dbf8128
13SHA1 (patch-src_ttrss__api.cpp) = 60e0f71819c6a91d7d8ab44daf24e1df06029601 13SHA1 (patch-src_ttrss__api.cpp) = 60e0f71819c6a91d7d8ab44daf24e1df06029601
 14SHA1 (patch-src_utils.cpp) = e153e29a0234901176485e16b92360f1e9bdea7e
File Added: pkgsrc/news/newsbeuter/patches/patch-src_utils.cpp
$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,15 @@ GCRY_THREAD_OPTION_PTHREAD_IMPL;
 #include <openssl/crypto.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 newsbeuter {
 
 std::vector<std::string> utils::tokenize_quoted(const std::string& str, std::string delimiters) {
@@ -274,7 +283,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;