fish: Fix part of Clang build errors

[Kamil Rytarowski <n54%gmx.com@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By:	kamil
Date:		Sun Oct 22 01:07:12 2017 +0200
Changeset:	ebfbe4d84786248d750c98a9f7895431896c6ba6

Modified Files:
	fish/distinfo
Added Files:
	fish/patches/patch-src_fallback.cpp
	fish/patches/patch-src_fallback.h
	fish/patches/patch-src_output.cpp
	fish/patches/patch-src_output.h

Log Message:
fish: Fix part of Clang build errors

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=ebfbe4d84786248d750c98a9f7895431896c6ba6

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

diffstat:
 fish/distinfo                       |  4 ++++
 fish/patches/patch-src_fallback.cpp | 13 +++++++++++++
 fish/patches/patch-src_fallback.h   | 22 ++++++++++++++++++++++
 fish/patches/patch-src_output.cpp   | 13 +++++++++++++
 fish/patches/patch-src_output.h     | 13 +++++++++++++
 5 files changed, 65 insertions(+)

diffs:
diff --git a/fish/distinfo b/fish/distinfo
index d09481549e..9807100721 100644
--- a/fish/distinfo
+++ b/fish/distinfo
@@ -7,4 +7,8 @@ Size (fish-2.6.0.tar.gz) = 3575346 bytes
 SHA1 (patch-Makefile.in) = e2f5722d2e08e644e0813a662b64bbfe811a8ec6
 SHA1 (patch-configure.ac) = 862b6cef9e269531924965ce928031e063aa90ba
 SHA1 (patch-src_builtin.cpp) = b48a52d45ba545a92043e58dc554305670c7fcfc
+SHA1 (patch-src_fallback.cpp) = 4a35401ed0d3c3a912e448d56c9375801c919fbc
+SHA1 (patch-src_fallback.h) = 87537e6f5be2fa1b8a196d67eb21e6b48380cabb
+SHA1 (patch-src_output.cpp) = 139e77063bb3eadec205dceeaa6bbd0da8de97b6
+SHA1 (patch-src_output.h) = 8e72aefbd940450fb69f4b970ce1d151f17eb48a
 SHA1 (patch-src_wutil.cpp) = dbb73cf81d850c4b73598d0c711f68b0d74cabd6
diff --git a/fish/patches/patch-src_fallback.cpp b/fish/patches/patch-src_fallback.cpp
new file mode 100644
index 0000000000..76ddf6bdc8
--- /dev/null
+++ b/fish/patches/patch-src_fallback.cpp
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- src/fallback.cpp.orig	2017-06-03 12:45:13.000000000 +0000
++++ src/fallback.cpp
+@@ -46,7 +46,7 @@
+ #undef tparm
+ 
+ /// Checks for known string values and maps to correct number of parameters.
+-char *tparm_solaris_kludge(char *str, ...) {
++char *tparm_solaris_kludge(const char *str, ...) {
+     long int param[9] = {};
+ 
+     va_list ap;
diff --git a/fish/patches/patch-src_fallback.h b/fish/patches/patch-src_fallback.h
new file mode 100644
index 0000000000..053629123e
--- /dev/null
+++ b/fish/patches/patch-src_fallback.h
@@ -0,0 +1,22 @@
+$NetBSD$
+
+--- src/fallback.h.orig	2017-06-03 12:45:13.000000000 +0000
++++ src/fallback.h
+@@ -37,7 +37,7 @@ int fish_mkstemp_cloexec(char *);
+ /// Under curses, tputs expects an int (*func)(char) as its last parameter, but in ncurses, tputs
+ /// expects a int (*func)(int) as its last parameter. tputs_arg_t is defined to always be what tputs
+ /// expects. Hopefully.
+-#ifdef NCURSES_VERSION
++#if defined(NCURSES_VERSION) || defined(__NetBSD__)
+ typedef int tputs_arg_t;
+ #else
+ typedef char tputs_arg_t;
+@@ -57,7 +57,7 @@ struct winsize {
+ #ifdef TPARM_SOLARIS_KLUDGE
+ /// Solaris tparm has a set fixed of paramters in it's curses implementation, work around this here.
+ #define tparm tparm_solaris_kludge
+-char *tparm_solaris_kludge(char *str, ...);
++char *tparm_solaris_kludge(const char *str, ...);
+ #endif
+ 
+ /// On OS X, use weak linking for wcsdup and wcscasecmp. Weak linking allows you to call the
diff --git a/fish/patches/patch-src_output.cpp b/fish/patches/patch-src_output.cpp
new file mode 100644
index 0000000000..0c28aa1da5
--- /dev/null
+++ b/fish/patches/patch-src_output.cpp
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- src/output.cpp.orig	2017-06-03 12:45:13.000000000 +0000
++++ src/output.cpp
+@@ -63,7 +63,7 @@ unsigned char index_for_color(rgb_color_
+     return c.to_term256_index();
+ }
+ 
+-static bool write_color_escape(char *todo, unsigned char idx, bool is_fg) {
++static bool write_color_escape(const char *todo, unsigned char idx, bool is_fg) {
+     if (term_supports_color_natively(idx)) {
+         // Use tparm to emit color escape.
+         writembs(tparm(todo, idx));
diff --git a/fish/patches/patch-src_output.h b/fish/patches/patch-src_output.h
new file mode 100644
index 0000000000..8e787612b5
--- /dev/null
+++ b/fish/patches/patch-src_output.h
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- src/output.h.orig	2017-06-03 12:45:13.000000000 +0000
++++ src/output.h
+@@ -29,7 +29,7 @@ enum {
+ 
+ void set_color(rgb_color_t c, rgb_color_t c2);
+ 
+-void writembs_check(char *mbs, const char *mbs_name, const char *file, long line);
++void writembs_check(const char *mbs, const char *mbs_name, const char *file, long line);
+ #define writembs(mbs) writembs_check((mbs), #mbs, __FILE__, __LINE__)
+ 
+ int writech(wint_t ch);