CVS commit: pkgsrc/news/pan

["Olaf Seibert" <rhialto%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   rhialto
Date:           Sun Sep 19 18:02:37 UTC 2021

Modified Files:
        pkgsrc/news/pan: Makefile
Added Files:
        pkgsrc/news/pan/patches: patch-pan_general_text-match.cc
            patch-pan_general_text-match.h patch-pan_gui_group-prefs-dialog.cc
            patch-pan_usenet-utils_mime-utils.cc

Log Message:
news/pan: bring back some patches.

Pan compiled without them but they may still be useful.


To generate a diff of this commit:
cvs rdiff -u -r1.113 -r1.114 pkgsrc/news/pan/Makefile
cvs rdiff -u -r0 -r1.3 \
    pkgsrc/news/pan/patches/patch-pan_general_text-match.cc \
    pkgsrc/news/pan/patches/patch-pan_general_text-match.h \
    pkgsrc/news/pan/patches/patch-pan_gui_group-prefs-dialog.cc
cvs rdiff -u -r0 -r1.7 \
    pkgsrc/news/pan/patches/patch-pan_usenet-utils_mime-utils.cc

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

Modified files:

Index: pkgsrc/news/pan/Makefile
diff -u pkgsrc/news/pan/Makefile:1.113 pkgsrc/news/pan/Makefile:1.114
--- pkgsrc/news/pan/Makefile:1.113      Sun Sep 19 17:40:27 2021
+++ pkgsrc/news/pan/Makefile    Sun Sep 19 18:02:37 2021
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.113 2021/09/19 17:40:27 rhialto Exp $
+# $NetBSD: Makefile,v 1.114 2021/09/19 18:02:37 rhialto Exp $
 
 PKGNAME=               pan-0.147
+PKGREVISION=           1
 CATEGORIES=            news
 TAG=                   ${PKGNAME_NOREV:tu:C/-/_/:C/\./_/} # PAN_0_147
 MASTER_SITES=          https://gitlab.gnome.org/GNOME/pan/-/archive/${TAG}/
@@ -41,7 +42,6 @@ pre-build:
 .include "../../mail/gmime/buildlink3.mk"
 .include "../../security/gnutls/buildlink3.mk"
 .include "../../textproc/gtkspell/buildlink3.mk"
-.include "../../textproc/enchant/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../mk/bsd.pkg.mk"

Added files:

Index: pkgsrc/news/pan/patches/patch-pan_general_text-match.cc
diff -u /dev/null pkgsrc/news/pan/patches/patch-pan_general_text-match.cc:1.3
--- /dev/null   Sun Sep 19 18:02:37 2021
+++ pkgsrc/news/pan/patches/patch-pan_general_text-match.cc     Sun Sep 19 18:02:37 2021
@@ -0,0 +1,13 @@
+$NetBSD: patch-pan_general_text-match.cc,v 1.3 2021/09/19 18:02:37 rhialto Exp $
+Avoid clash with host defined ERR (on SunOS)
+--- pan/general/text-match.cc.orig     2012-06-29 22:24:54.000000000 +0000
++++ pan/general/text-match.cc
+@@ -209,7 +209,7 @@ TextMatch :: my_regexec (const StringVie
+       if (_pcre_info->set (_impl_text, state.case_sensitive))
+          _pcre_state = COMPILED;
+       else
+-         _pcre_state = ERR;
++         _pcre_state = PCRE_ERR;
+    }
+ 
+    return _pcre_state != COMPILED
Index: pkgsrc/news/pan/patches/patch-pan_general_text-match.h
diff -u /dev/null pkgsrc/news/pan/patches/patch-pan_general_text-match.h:1.3
--- /dev/null   Sun Sep 19 18:02:37 2021
+++ pkgsrc/news/pan/patches/patch-pan_general_text-match.h      Sun Sep 19 18:02:37 2021
@@ -0,0 +1,13 @@
+$NetBSD: patch-pan_general_text-match.h,v 1.3 2021/09/19 18:02:37 rhialto Exp $
+Avoid clash with host defined ERR (on SunOS)
+--- pan/general/text-match.h.orig      2012-06-29 22:24:54.000000000 +0000
++++ pan/general/text-match.h
+@@ -108,7 +108,7 @@ private:
+       class PcreInfo;
+       mutable PcreInfo * _pcre_info;
+ 
+-      enum PcreState { NEED_COMPILE, COMPILED, ERR };
++      enum PcreState { NEED_COMPILE, COMPILED, PCRE_ERR };
+       mutable PcreState _pcre_state;
+ 
+ public:
Index: pkgsrc/news/pan/patches/patch-pan_gui_group-prefs-dialog.cc
diff -u /dev/null pkgsrc/news/pan/patches/patch-pan_gui_group-prefs-dialog.cc:1.3
--- /dev/null   Sun Sep 19 18:02:37 2021
+++ pkgsrc/news/pan/patches/patch-pan_gui_group-prefs-dialog.cc Sun Sep 19 18:02:37 2021
@@ -0,0 +1,13 @@
+$NetBSD: patch-pan_gui_group-prefs-dialog.cc,v 1.3 2021/09/19 18:02:37 rhialto Exp $
+
+--- pan/gui/group-prefs-dialog.cc.orig 2021-09-16 16:17:07.000000000 +0000
++++ pan/gui/group-prefs-dialog.cc
+@@ -22,7 +22,7 @@
+ #include <glib.h>
+ #include "gtk-compat.h"
+ #ifdef HAVE_GTKSPELL
+-#include <enchant/enchant.h>
++#include <enchant-2/enchant.h>
+ #endif
+ #include <pan/general/debug.h>
+ #include <pan/general/macros.h>

Index: pkgsrc/news/pan/patches/patch-pan_usenet-utils_mime-utils.cc
diff -u /dev/null pkgsrc/news/pan/patches/patch-pan_usenet-utils_mime-utils.cc:1.7
--- /dev/null   Sun Sep 19 18:02:37 2021
+++ pkgsrc/news/pan/patches/patch-pan_usenet-utils_mime-utils.cc        Sun Sep 19 18:02:37 2021
@@ -0,0 +1,29 @@
+$NetBSD: patch-pan_usenet-utils_mime-utils.cc,v 1.7 2021/09/19 18:02:37 rhialto 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);