diff options
author | joerg <joerg> | 2013-05-06 14:49:32 +0000 |
---|---|---|
committer | joerg <joerg> | 2013-05-06 14:49:32 +0000 |
commit | 99065baad5690e4a95a664554a47af9ee568068c (patch) | |
tree | fac1be187fac3d1a516d85ca9ade2a267610a4fd /ham/fldigi/patches | |
parent | 8a317681ae5dc196d3f781713bb579fddab8103f (diff) | |
download | pkgsrc-99065baad5690e4a95a664554a47af9ee568068c.tar.gz |
Avoid implicit conversions to bool for streams.
Require C++11 for Clang and prefer std version over tr1 when in C++11
mode.
Diffstat (limited to 'ham/fldigi/patches')
-rw-r--r-- | ham/fldigi/patches/patch-src_dominoex_dominoex.cxx | 13 | ||||
-rw-r--r-- | ham/fldigi/patches/patch-src_include_qrunner.h | 12 | ||||
-rw-r--r-- | ham/fldigi/patches/patch-src_logbook_logsupport.cxx | 39 | ||||
-rw-r--r-- | ham/fldigi/patches/patch-src_misc_dxcc.cxx | 30 | ||||
-rw-r--r-- | ham/fldigi/patches/patch-src_misc_re.cxx | 24 | ||||
-rw-r--r-- | ham/fldigi/patches/patch-src_navtex_navtex.cxx | 19 | ||||
-rw-r--r-- | ham/fldigi/patches/patch-src_spot_notify.cxx | 16 | ||||
-rw-r--r-- | ham/fldigi/patches/patch-src_spot_pskrep.cxx | 17 | ||||
-rw-r--r-- | ham/fldigi/patches/patch-src_spot_spot.cxx | 38 | ||||
-rw-r--r-- | ham/fldigi/patches/patch-src_thor_thor.cxx | 13 | ||||
-rw-r--r-- | ham/fldigi/patches/patch-src_xmlrpcpp_XmlRpcClient.cpp | 13 | ||||
-rw-r--r-- | ham/fldigi/patches/patch-src_xmlrpcpp_XmlRpcServer.cpp | 13 | ||||
-rw-r--r-- | ham/fldigi/patches/patch-src_xmlrpcpp_base64.h | 12 |
13 files changed, 259 insertions, 0 deletions
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..b8a3650c909 --- /dev/null +++ b/ham/fldigi/patches/patch-src_dominoex_dominoex.cxx @@ -0,0 +1,13 @@ +$NetBSD: patch-src_dominoex_dominoex.cxx,v 1.1 2013/05/06 14:49:32 joerg Exp $ + +--- src/dominoex/dominoex.cxx.orig 2013-05-03 14:18:53.000000000 +0000 ++++ src/dominoex/dominoex.cxx +@@ -64,7 +64,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..cb02aed5479 --- /dev/null +++ b/ham/fldigi/patches/patch-src_include_qrunner.h @@ -0,0 +1,12 @@ +$NetBSD: patch-src_include_qrunner.h,v 1.1 2013/05/06 14:49:32 joerg Exp $ + +--- src/include/qrunner.h.orig 2013-05-03 14:32:45.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_logbook_logsupport.cxx b/ham/fldigi/patches/patch-src_logbook_logsupport.cxx new file mode 100644 index 00000000000..503cc37266c --- /dev/null +++ b/ham/fldigi/patches/patch-src_logbook_logsupport.cxx @@ -0,0 +1,39 @@ +$NetBSD: patch-src_logbook_logsupport.cxx,v 1.1 2013/05/06 14:49:32 joerg Exp $ + +--- src/logbook/logsupport.cxx.orig 2013-05-03 14:19:39.000000000 +0000 ++++ src/logbook/logsupport.cxx +@@ -211,7 +211,7 @@ void Export_ADIF() + } + } + string sp = p; +- if (sp.find("."ADIF_SUFFIX) == string::npos) sp.append("."ADIF_SUFFIX); ++ if (sp.find("." ADIF_SUFFIX) == string::npos) sp.append("." ADIF_SUFFIX); + adifFile.writeFile (sp.c_str(), &qsodb); + } + +@@ -308,8 +308,8 @@ void cb_mnuSaveLogbook(Fl_Menu_*m, void* + const char* p = FSEL::saveas( title.c_str(), filter.c_str(), logbook_filename.c_str()); + if (p) { + logbook_filename = p; +- if (logbook_filename.find("."ADIF_SUFFIX) == string::npos) +- logbook_filename.append("."ADIF_SUFFIX); ++ if (logbook_filename.find("." ADIF_SUFFIX) == string::npos) ++ logbook_filename.append("." ADIF_SUFFIX); + dlgLogbook->label(fl_filename_name(logbook_filename.c_str())); + + cQsoDb::reverse = false; +@@ -1542,9 +1542,13 @@ SOAPBOX: \n\n", + return; + } + +- ++#if __cplusplus >= 200103L ++#include <unordered_map> ++typedef unordered_map<string, unsigned> dxcc_entity_cache_t; ++#else + #include <tr1/unordered_map> + typedef tr1::unordered_map<string, unsigned> dxcc_entity_cache_t; ++#endif + static dxcc_entity_cache_t dxcc_entity_cache; + static bool dxcc_entity_cache_enabled = false; + diff --git a/ham/fldigi/patches/patch-src_misc_dxcc.cxx b/ham/fldigi/patches/patch-src_misc_dxcc.cxx new file mode 100644 index 00000000000..e9bf8ad8d39 --- /dev/null +++ b/ham/fldigi/patches/patch-src_misc_dxcc.cxx @@ -0,0 +1,30 @@ +$NetBSD: patch-src_misc_dxcc.cxx,v 1.1 2013/05/06 14:49:32 joerg Exp $ + +--- src/misc/dxcc.cxx.orig 2013-05-03 14:21:04.000000000 +0000 ++++ src/misc/dxcc.cxx +@@ -30,7 +30,6 @@ + #include <string> + #include <list> + #include <map> +-#include <tr1/unordered_map> + #include <algorithm> + + #include <FL/filename.H> +@@ -43,8 +42,16 @@ + #include "confdialog.h" + #include "main.h" + ++#if __cplusplus >= 201103L ++#include <unordered_map> ++using std::unordered_map; ++#else ++#include <tr1/unordered_map> ++using std::tr1::unordered_map; ++#endif ++ + using namespace std; +-using tr1::unordered_map; ++ + + + dxcc::dxcc(const char* cn, int cq, int itu, const char* ct, float lat, float lon, float tz) diff --git a/ham/fldigi/patches/patch-src_misc_re.cxx b/ham/fldigi/patches/patch-src_misc_re.cxx new file mode 100644 index 00000000000..36af7643080 --- /dev/null +++ b/ham/fldigi/patches/patch-src_misc_re.cxx @@ -0,0 +1,24 @@ +$NetBSD: patch-src_misc_re.cxx,v 1.1 2013/05/06 14:49:32 joerg Exp $ + +--- src/misc/re.cxx.orig 2013-05-03 14:24:52.000000000 +0000 ++++ src/misc/re.cxx +@@ -120,12 +120,17 @@ void re_t::suboff(size_t n, int* start, + } + } + ++#if __cplusplus >= 201103L ++#include <functional> ++#else + #include <tr1/functional> ++using tr1::hash; ++#endif + + size_t re_t::hash(void) const + { +- size_t h = tr1::hash<string>()(pattern); +- return h ^ (tr1::hash<int>()(cflags) + 0x9e3779b9 + (h << 6) + (h >> 2)); ++ size_t h = ::hash<string>()(pattern); ++ return h ^ (::hash<int>()(cflags) + 0x9e3779b9 + (h << 6) + (h >> 2)); + } + + // ------------------------------------------------------------------------ diff --git a/ham/fldigi/patches/patch-src_navtex_navtex.cxx b/ham/fldigi/patches/patch-src_navtex_navtex.cxx new file mode 100644 index 00000000000..34d1b7fe78d --- /dev/null +++ b/ham/fldigi/patches/patch-src_navtex_navtex.cxx @@ -0,0 +1,19 @@ +$NetBSD: patch-src_navtex_navtex.cxx,v 1.1 2013/05/06 14:49:32 joerg Exp $ + +--- src/navtex/navtex.cxx.orig 2013-05-03 14:31:34.000000000 +0000 ++++ src/navtex/navtex.cxx +@@ -177,12 +177,12 @@ bool read_until_delim( std::istream & is + if( ! std::getline( istrm, parsed_str, delim ) ) return false ; + std::stringstream sstrm( parsed_str ); + sstrm >> ref ; +- return sstrm ; ++ return sstrm.good(); + } + + static bool read_until_delim( std::istream & istrm, std::string & ref ) + { +- return std::getline( istrm, ref, delim ); ++ return std::getline( istrm, ref, delim ).good(); + } + + class NavtexRecord diff --git a/ham/fldigi/patches/patch-src_spot_notify.cxx b/ham/fldigi/patches/patch-src_spot_notify.cxx new file mode 100644 index 00000000000..b76d266da47 --- /dev/null +++ b/ham/fldigi/patches/patch-src_spot_notify.cxx @@ -0,0 +1,16 @@ +$NetBSD: patch-src_spot_notify.cxx,v 1.1 2013/05/06 14:49:32 joerg Exp $ + +--- src/spot/notify.cxx.orig 2013-05-03 14:35:28.000000000 +0000 ++++ src/spot/notify.cxx +@@ -33,7 +33,10 @@ + #include <cctype> + #include <cstdlib> + +-#if (__GNUC__ > 4) || (__GNUC__ == 4 && __GNUC_MINOR__ >= 1) ++#if __cplusplus >= 201103L ++# define MAP_TYPE std::unordered_map ++# include <unordered_map> ++#elif (__GNUC__ > 4) || (__GNUC__ == 4 && __GNUC_MINOR__ >= 1) + # define MAP_TYPE std::tr1::unordered_map + # include <tr1/unordered_map> + #else diff --git a/ham/fldigi/patches/patch-src_spot_pskrep.cxx b/ham/fldigi/patches/patch-src_spot_pskrep.cxx new file mode 100644 index 00000000000..4fdd04a4596 --- /dev/null +++ b/ham/fldigi/patches/patch-src_spot_pskrep.cxx @@ -0,0 +1,17 @@ +$NetBSD: patch-src_spot_pskrep.cxx,v 1.1 2013/05/06 14:49:32 joerg Exp $ + +--- src/spot/pskrep.cxx.orig 2013-05-03 14:36:37.000000000 +0000 ++++ src/spot/pskrep.cxx +@@ -50,7 +50,11 @@ + #include <algorithm> + #include <fstream> + +-#if (__GNUC__ > 4) || (__GNUC__ == 4 && __GNUC_MINOR__ >= 1) ++#if __cplusplus >= 201103L ++# define MAP_TYPE std::unordered_map ++# define HASH_TYPE std::hash ++# include <unordered_map> ++#elif (__GNUC__ > 4) || (__GNUC__ == 4 && __GNUC_MINOR__ >= 1) + # define MAP_TYPE std::tr1::unordered_map + #define HASH_TYPE std::tr1::hash + # include <tr1/unordered_map> diff --git a/ham/fldigi/patches/patch-src_spot_spot.cxx b/ham/fldigi/patches/patch-src_spot_spot.cxx new file mode 100644 index 00000000000..68164ebf36c --- /dev/null +++ b/ham/fldigi/patches/patch-src_spot_spot.cxx @@ -0,0 +1,38 @@ +$NetBSD: patch-src_spot_spot.cxx,v 1.1 2013/05/06 14:49:32 joerg Exp $ + +--- src/spot/spot.cxx.orig 2013-05-03 14:37:33.000000000 +0000 ++++ src/spot/spot.cxx +@@ -23,7 +23,6 @@ + #include <config.h> + + #include <list> +-#include <tr1/unordered_map> + #include <functional> + + #include "trx.h" +@@ -33,6 +32,13 @@ + #include "debug.h" + #include "spot.h" + ++#if __cplusplus >= 201103L ++#include <unordered_map> ++#else ++#include <tr1/unordered_map> ++using std::tr1::unordered_map; ++#endif ++ + // the number of characters that we match our REs against + #define SEARCHLEN 32 + #define DECBUFSIZE 8 * SEARCHLEN +@@ -60,9 +66,9 @@ struct fre_comp : std::unary_function<co + }; + + typedef list<callback_t*> callback_p_list_t; +-typedef tr1::unordered_map<fre_t*, callback_p_list_t, fre_hash, fre_comp> rcblist_t; ++typedef unordered_map<fre_t*, callback_p_list_t, fre_hash, fre_comp> rcblist_t; + +-static tr1::unordered_map<int, string> buffers; ++static unordered_map<int, string> buffers; + static cblist_t cblist; + static rcblist_t rcblist; + diff --git a/ham/fldigi/patches/patch-src_thor_thor.cxx b/ham/fldigi/patches/patch-src_thor_thor.cxx new file mode 100644 index 00000000000..04997092c88 --- /dev/null +++ b/ham/fldigi/patches/patch-src_thor_thor.cxx @@ -0,0 +1,13 @@ +$NetBSD: patch-src_thor_thor.cxx,v 1.1 2013/05/06 14:49:32 joerg Exp $ + +--- src/thor/thor.cxx.orig 2013-05-03 14:19:08.000000000 +0000 ++++ src/thor/thor.cxx +@@ -63,7 +63,7 @@ void thor::tx_init(SoundBase *sc) + videoText(); + strSecXmtText = progdefaults.THORsecText; + if (strSecXmtText.length() == 0) +- strSecXmtText = "fldigi "PACKAGE_VERSION" "; ++ strSecXmtText = "fldigi " PACKAGE_VERSION " "; + cptr = 0; + } + diff --git a/ham/fldigi/patches/patch-src_xmlrpcpp_XmlRpcClient.cpp b/ham/fldigi/patches/patch-src_xmlrpcpp_XmlRpcClient.cpp new file mode 100644 index 00000000000..6d9452ca4a7 --- /dev/null +++ b/ham/fldigi/patches/patch-src_xmlrpcpp_XmlRpcClient.cpp @@ -0,0 +1,13 @@ +$NetBSD: patch-src_xmlrpcpp_XmlRpcClient.cpp,v 1.1 2013/05/06 14:49:32 joerg Exp $ + +--- src/xmlrpcpp/XmlRpcClient.cpp.orig 2013-05-03 14:41:57.000000000 +0000 ++++ src/xmlrpcpp/XmlRpcClient.cpp +@@ -319,7 +319,7 @@ XmlRpcClient::generateHeader(std::string + + header += "Content-Type: text/xml\r\nContent-length: "; + +- sprintf(buff,"%"PRIuSZ"\r\n\r\n", body.size()); ++ sprintf(buff,"%" PRIuSZ "\r\n\r\n", body.size()); + + return header + buff; + } diff --git a/ham/fldigi/patches/patch-src_xmlrpcpp_XmlRpcServer.cpp b/ham/fldigi/patches/patch-src_xmlrpcpp_XmlRpcServer.cpp new file mode 100644 index 00000000000..fee4cd7db20 --- /dev/null +++ b/ham/fldigi/patches/patch-src_xmlrpcpp_XmlRpcServer.cpp @@ -0,0 +1,13 @@ +$NetBSD: patch-src_xmlrpcpp_XmlRpcServer.cpp,v 1.1 2013/05/06 14:49:32 joerg Exp $ + +--- src/xmlrpcpp/XmlRpcServer.cpp.orig 2013-05-03 14:42:36.000000000 +0000 ++++ src/xmlrpcpp/XmlRpcServer.cpp +@@ -481,7 +481,7 @@ XmlRpcServer::generateHeader(std::string + "Content-length: "; + + char buffLen[40]; +- sprintf(buffLen,"%"PRIuSZ"\r\n\r\n", body.size()); ++ sprintf(buffLen,"%" PRIuSZ "\r\n\r\n", body.size()); + + return header + buffLen; + } diff --git a/ham/fldigi/patches/patch-src_xmlrpcpp_base64.h b/ham/fldigi/patches/patch-src_xmlrpcpp_base64.h new file mode 100644 index 00000000000..478ee4e6f05 --- /dev/null +++ b/ham/fldigi/patches/patch-src_xmlrpcpp_base64.h @@ -0,0 +1,12 @@ +$NetBSD: patch-src_xmlrpcpp_base64.h,v 1.1 2013/05/06 14:49:32 joerg Exp $ + +--- src/xmlrpcpp/base64.h.orig 2013-05-03 14:39:47.000000000 +0000 ++++ src/xmlrpcpp/base64.h +@@ -10,6 +10,7 @@ + #define __BASE64_H_INCLUDED__ 1 + + #include <iterator> ++#include <ios> + + static + int _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', |