Deal with C++11 user defined string literals. Add missing includes.

4 files changed, 41 insertions, 1 deletions

diff --git a/ham/fldigi/distinfo b/ham/fldigi/distinfo
index 45826515ec2..afa9baba4a6 100644
--- a/ham/fldigi/distinfo
+++ b/ham/fldigi/distinfo
@@ -1,8 +1,11 @@
-$NetBSD: distinfo,v 1.24 2015/04/26 03:04:59 mef Exp $
+$NetBSD: distinfo,v 1.25 2015/04/27 23:51:52 joerg Exp $
 
 SHA1 (fldigi-3.22.08.tar.gz) = 862476bc0c68aa54abe60b22bfb84c03c458da2b
 RMD160 (fldigi-3.22.08.tar.gz) = ca9eaee2ade1fdf56c594fc613e23cdd655354e5
 Size (fldigi-3.22.08.tar.gz) = 2876959 bytes
+SHA1 (patch-src_dominoex_dominoex.cxx) = d59360b3649b879080f57d583000fd88861623dd
+SHA1 (patch-src_include_qrunner.h) = 8ee58ce3ce8a05cd9007fb947dc32e5783216d5a
 SHA1 (patch-src_misc_configuration.cxx) = 4ebf0c46913f73047ad5b858f6d4ae9def82ec60
 SHA1 (patch-src_misc_newinstall.cxx) = 2c215e9423d27dd4f4657221b17cf4ed3f12355c
 SHA1 (patch-src_thor_thor.cxx) = 8148f14d6f2a96d5435be871345c24ed2e4cc8b9
+SHA1 (patch-src_xmlrpcpp_XmlRpcBase64.h) = 2fedf94f19b58494287c970abbe0ee8ddaaba5d9
diff --git a/ham/fldigi/patches/patch-src_dominoex_dominoex.cxx b/ham/fldigi/patches/patch-src_dominoex_dominoex.cxx
new file mode 100644
index 00000000000..18db6cfb36b
--- /dev/null
+++ b/ham/fldigi/patches/patch-src_dominoex_dominoex.cxx
@@ -0,0 +1,13 @@
+$NetBSD: patch-src_dominoex_dominoex.cxx,v 1.5 2015/04/27 23:51:52 joerg Exp $
+
+--- src/dominoex/dominoex.cxx.orig	2015-04-27 23:30:32.000000000 +0000
++++ src/dominoex/dominoex.cxx
+@@ -63,7 +63,7 @@ void dominoex::tx_init(SoundBase *sc)
+ 
+ 	strSecXmtText = progdefaults.secText;
+ 	if (strSecXmtText.length() == 0)
+-		strSecXmtText = "fldigi "PACKAGE_VERSION" ";
++		strSecXmtText = "fldigi " PACKAGE_VERSION " ";
+ 
+ 	videoText();
+ }
diff --git a/ham/fldigi/patches/patch-src_include_qrunner.h b/ham/fldigi/patches/patch-src_include_qrunner.h
new file mode 100644
index 00000000000..a4ab5079f85
--- /dev/null
+++ b/ham/fldigi/patches/patch-src_include_qrunner.h
@@ -0,0 +1,12 @@
+$NetBSD: patch-src_include_qrunner.h,v 1.5 2015/04/27 23:51:52 joerg Exp $
+
+--- src/include/qrunner.h.orig	2015-04-27 23:31:20.000000000 +0000
++++ src/include/qrunner.h
+@@ -32,6 +32,7 @@
+ #include <cerrno>
+ #include <stdexcept>
+ #include <cstring>
++#include <string>
+ 
+ #if HAVE_STD_BIND
+ #   include <functional>
diff --git a/ham/fldigi/patches/patch-src_xmlrpcpp_XmlRpcBase64.h b/ham/fldigi/patches/patch-src_xmlrpcpp_XmlRpcBase64.h
new file mode 100644
index 00000000000..547d5296740
--- /dev/null
+++ b/ham/fldigi/patches/patch-src_xmlrpcpp_XmlRpcBase64.h
@@ -0,0 +1,12 @@
+$NetBSD: patch-src_xmlrpcpp_XmlRpcBase64.h,v 1.1 2015/04/27 23:51:52 joerg Exp $
+
+--- src/xmlrpcpp/XmlRpcBase64.h.orig	2015-04-27 23:29:49.000000000 +0000
++++ src/xmlrpcpp/XmlRpcBase64.h
+@@ -19,6 +19,7 @@
+ #define __BASE64_H_INCLUDED__ 1
+ 
+ #include <iterator>
++#include <ios>
+ 
+ static
+ int _xmlrpc_base64Chars[]= {'A','B','C','D','E','F','G','H','I','J','K','L','M','N','O','P','Q','R','S','T','U','V','W','X','Y','Z',