CVS commit: pkgsrc/news/newsbeuter

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Mon Dec 20 07:19:42 UTC 2021

Modified Files:
        pkgsrc/news/newsbeuter: distinfo
Added Files:
        pkgsrc/news/newsbeuter/patches: patch-src_utils.cpp

Log Message:
newsbeuter: Fix building on NetBSD HEAD.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 pkgsrc/news/newsbeuter/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/news/newsbeuter/patches/patch-src_utils.cpp

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/news/newsbeuter/distinfo
diff -u pkgsrc/news/newsbeuter/distinfo:1.5 pkgsrc/news/newsbeuter/distinfo:1.6
--- pkgsrc/news/newsbeuter/distinfo:1.5 Tue Oct 26 11:09:35 2021
+++ pkgsrc/news/newsbeuter/distinfo     Mon Dec 20 07:19:42 2021
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2021/10/26 11:09:35 nia Exp $
+$NetBSD: distinfo,v 1.6 2021/12/20 07:19:42 nia Exp $
 
 BLAKE2s (newsbeuter-2.9.tar.gz) = d42446556199395cf370c229208d52e21fd8d666cc415ae6f4cd2bd92d9ea889
 SHA512 (newsbeuter-2.9.tar.gz) = b173008c8c8d3729f8ccef3ce62645a05c1803fb842d5c0afdf9ffd4ed3726030f9c359c20bc817402a6a0ea12af742d0ae7faf9b92d52c11f420f62b430b0aa
@@ -11,3 +11,4 @@ SHA1 (patch-src_controller.cpp) = 927b11
 SHA1 (patch-src_feedhq__api.cpp) = 53d2807fc03cc048b6af928d304efcf9c6bd5c70
 SHA1 (patch-src_oldreader__api.cpp) = fccad7823870717eab2f0c87e3ab78465dbf8128
 SHA1 (patch-src_ttrss__api.cpp) = 60e0f71819c6a91d7d8ab44daf24e1df06029601
+SHA1 (patch-src_utils.cpp) = e153e29a0234901176485e16b92360f1e9bdea7e

Added files:

Index: pkgsrc/news/newsbeuter/patches/patch-src_utils.cpp
diff -u /dev/null pkgsrc/news/newsbeuter/patches/patch-src_utils.cpp:1.1
--- /dev/null   Mon Dec 20 07:19:42 2021
+++ pkgsrc/news/newsbeuter/patches/patch-src_utils.cpp  Mon Dec 20 07:19:42 2021
@@ -0,0 +1,31 @@
+$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;