CVS commit: pkgsrc/news/newsbeuter

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Fri Mar 25 10:37:30 UTC 2022

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

Log Message:
newsbeuter: fix NetBSD iconv change

Should fix build on NetBSD<9.99.17


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 pkgsrc/news/newsbeuter/distinfo
cvs rdiff -u -r1.1 -r1.2 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.6 pkgsrc/news/newsbeuter/distinfo:1.7
--- pkgsrc/news/newsbeuter/distinfo:1.6 Mon Dec 20 07:19:42 2021
+++ pkgsrc/news/newsbeuter/distinfo     Fri Mar 25 10:37:30 2022
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.6 2021/12/20 07:19:42 nia Exp $
+$NetBSD: distinfo,v 1.7 2022/03/25 10:37:30 wiz Exp $
 
 BLAKE2s (newsbeuter-2.9.tar.gz) = d42446556199395cf370c229208d52e21fd8d666cc415ae6f4cd2bd92d9ea889
 SHA512 (newsbeuter-2.9.tar.gz) = b173008c8c8d3729f8ccef3ce62645a05c1803fb842d5c0afdf9ffd4ed3726030f9c359c20bc817402a6a0ea12af742d0ae7faf9b92d52c11f420f62b430b0aa
@@ -11,4 +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
+SHA1 (patch-src_utils.cpp) = e8b63a872e5452a29205b3c62977cd9e546e61ee

Index: pkgsrc/news/newsbeuter/patches/patch-src_utils.cpp
diff -u pkgsrc/news/newsbeuter/patches/patch-src_utils.cpp:1.1 pkgsrc/news/newsbeuter/patches/patch-src_utils.cpp:1.2
--- pkgsrc/news/newsbeuter/patches/patch-src_utils.cpp:1.1      Mon Dec 20 07:19:42 2021
+++ pkgsrc/news/newsbeuter/patches/patch-src_utils.cpp  Fri Mar 25 10:37:30 2022
@@ -1,10 +1,10 @@
-$NetBSD: patch-src_utils.cpp,v 1.1 2021/12/20 07:19:42 nia Exp $
+$NetBSD: patch-src_utils.cpp,v 1.2 2022/03/25 10:37:30 wiz 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;
+@@ -37,6 +37,13 @@ GCRY_THREAD_OPTION_PTHREAD_IMPL;
  #include <openssl/crypto.h>
  #endif
  
@@ -12,15 +12,13 @@ Adapt to NetBSD iconv prototype change.
 +#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
+@@ -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.
         */