pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/news/pan pan: Fix build on NetBSD-current (POSIX iconv)



details:   https://anonhg.NetBSD.org/pkgsrc/rev/c42bf1be5273
branches:  trunk
changeset: 442784:c42bf1be5273
user:      nia <nia%pkgsrc.org@localhost>
date:      Mon Nov 30 13:06:40 2020 +0000

description:
pan: Fix build on NetBSD-current (POSIX iconv)

diffstat:

 news/pan/distinfo                                     |   3 +-
 news/pan/patches/patch-pan_usenet-utils_mime-utils.cc |  29 +++++++++++++++++++
 2 files changed, 31 insertions(+), 1 deletions(-)

diffs (47 lines):

diff -r 3c84e60311de -r c42bf1be5273 news/pan/distinfo
--- a/news/pan/distinfo Mon Nov 30 12:49:23 2020 +0000
+++ b/news/pan/distinfo Mon Nov 30 13:06:40 2020 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.34 2019/10/15 18:09:21 rhialto Exp $
+$NetBSD: distinfo,v 1.35 2020/11/30 13:06:40 nia Exp $
 
 SHA1 (pan-0.146.tar.bz2) = 843bcfb0a432a5f6a15a22c4570f65a2bb55052d
 RMD160 (pan-0.146.tar.bz2) = 50a97800690e7926ef4c20c90350187786d3741a
@@ -8,3 +8,4 @@
 SHA1 (patch-pan_general_text-match.cc) = eaf15f3323f693d094892d3283437ad5ac3c9682
 SHA1 (patch-pan_general_text-match.h) = 6ac5a68a8b1cb472df517a8df53eee5a79e4c73c
 SHA1 (patch-pan_gui_group-prefs-dialog.cc) = ac268282f3af83ac4beb17d431eec10bb2b6eb4b
+SHA1 (patch-pan_usenet-utils_mime-utils.cc) = 6cec0237458495657752dffdb836df32e4f4da6d
diff -r 3c84e60311de -r c42bf1be5273 news/pan/patches/patch-pan_usenet-utils_mime-utils.cc
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/news/pan/patches/patch-pan_usenet-utils_mime-utils.cc     Mon Nov 30 13:06:40 2020 +0000
@@ -0,0 +1,29 @@
+$NetBSD: patch-pan_usenet-utils_mime-utils.cc,v 1.5 2020/11/30 13:06:40 nia Exp $
+
+NetBSD iconv's argument is no longer const.
+
+--- pan/usenet-utils/mime-utils.cc.orig        2019-09-29 21:01:34.000000000 +0000
++++ pan/usenet-utils/mime-utils.cc
+@@ -17,6 +17,13 @@
+  *
+  */
+ 
++#ifdef __NetBSD__
++#include <sys/param.h>
++#if __NetBSD_Prereq__(9,99,17)
++#define NETBSD_POSIX_ICONV
++#endif
++#endif
++
+ #include <config.h>
+ #include <cctype>
+ #include <cstring>
+@@ -77,7 +84,7 @@ namespace pan
+       outbuf = out + converted;
+       outleft = outlen - converted;
+ 
+-#if defined(__NetBSD__)
++#if (defined(__NetBSD__) && !defined(NETBSD_POSIX_ICONV)) || defined(__sun)
+       converted = iconv (cd, &inbuf, &inleft, &outbuf, &outleft);
+ #else
+       converted = iconv (cd, (char **) &inbuf, &inleft, &outbuf, &outleft);



Home | Main Index | Thread Index | Old Index