diff options
author | mef <mef@pkgsrc.org> | 2014-06-15 14:27:43 +0000 |
---|---|---|
committer | mef <mef@pkgsrc.org> | 2014-06-15 14:27:43 +0000 |
commit | 25cf14df3e53ec69ca41647e53bdbfaf5eea8fbb (patch) | |
tree | e224f462ce2565e883c953124468ad9c0606cf36 /ham/fldigi/patches | |
parent | 12ca875cfbfd9cb1180d43b6417967b6ca63c384 (diff) | |
download | pkgsrc-25cf14df3e53ec69ca41647e53bdbfaf5eea8fbb.tar.gz |
(Upstream update 3.21.79 to 3.21.82)
=Version 3.21.82=
2014-04-30 David Freese <w1hkj at w1hkj.com>
92a7d01: hash-fix
b0db34c: RnA Analysis
fa9e10a: Phase accumulator
b7ce1cd: Base Directories
c9c6f28: WF Height/Speed
ca61d3f: RX Only
43fbe22: RTTY mem leak
f470ce3: Olivia/Contestia custom
b87e664: ARQ abort
a9818aa: RTTY Custom Shift
=Version 3.21.81=
x 134221e: TX monitor
922c16f: Spotter seg fault
dbe4181: Audio selectors for PORTAUDIO
9771f4b: M4 tr1 detect
03643a6: ttyACMxx identification
cfe6f87: Olivia critical section
a60d6f7: MT63 critical section
c97043c: Logbook fields
3bc4f31: Hamlib selector
d33b7e7: Combobox
6f71f12: RTTY macro
ac671da: clang compatibility
=Version 3.21.80=
2014-03-19 David Freese <w1hkj at w1hkj.com>
FreeBSD nitems
Cabrillo time off
Change Fl_ListBox
Restore Fl_Choice
Olivia select fix
ComboBox
fluid update
(pkgsrc)
Upstream now includes following patches:
(with slightly different code, say, #ifdef __clang__ etc),
thus deleted:
patch-src_include_logsupport.h
patch-src_include_strutil.h
patch-src_logbook_logsupport.cxx
patch-src_misc_dxcc.cxx
patch-src_misc_re.cxx
patch-src_spot_notify.cxx
patch-src_spot_pskrep.cxx
patch-src_spot_spot.cxx
Diffstat (limited to 'ham/fldigi/patches')
-rw-r--r-- | ham/fldigi/patches/patch-src_include_logsupport.h | 13 | ||||
-rw-r--r-- | ham/fldigi/patches/patch-src_include_strutil.h | 52 | ||||
-rw-r--r-- | ham/fldigi/patches/patch-src_logbook_logsupport.cxx | 43 | ||||
-rw-r--r-- | ham/fldigi/patches/patch-src_misc_dxcc.cxx | 34 | ||||
-rw-r--r-- | ham/fldigi/patches/patch-src_misc_re.cxx | 28 | ||||
-rw-r--r-- | ham/fldigi/patches/patch-src_spot_notify.cxx | 20 | ||||
-rw-r--r-- | ham/fldigi/patches/patch-src_spot_pskrep.cxx | 21 | ||||
-rw-r--r-- | ham/fldigi/patches/patch-src_spot_spot.cxx | 42 |
8 files changed, 0 insertions, 253 deletions
diff --git a/ham/fldigi/patches/patch-src_include_logsupport.h b/ham/fldigi/patches/patch-src_include_logsupport.h deleted file mode 100644 index 9139776024b..00000000000 --- a/ham/fldigi/patches/patch-src_include_logsupport.h +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-src_include_logsupport.h,v 1.2 2014/03/14 14:39:22 mef Exp $ - -Fix a header guard to reduce warnings. - ---- src/include/logsupport.h.orig 2013-09-17 19:27:33.000000000 +0000 -+++ src/include/logsupport.h -@@ -1,5 +1,5 @@ - #ifndef SUPPORT_H --#define SUPPORT_h -+#define SUPPORT_H - - #include <string> - diff --git a/ham/fldigi/patches/patch-src_include_strutil.h b/ham/fldigi/patches/patch-src_include_strutil.h deleted file mode 100644 index 80a517ded61..00000000000 --- a/ham/fldigi/patches/patch-src_include_strutil.h +++ /dev/null @@ -1,52 +0,0 @@ -$NetBSD: patch-src_include_strutil.h,v 1.2 2014/03/14 14:39:22 mef Exp $ - -Don't depend on implicit boolean conversion for streams. - ---- src/include/strutil.h.orig 2013-09-17 19:23:48.000000000 +0000 -+++ src/include/strutil.h -@@ -207,7 +207,8 @@ inline bool read_until_delim( char delim - /// Reads a string up to the given delimiter. - inline bool read_until_delim( char delim, std::istream & istrm, std::string & ref ) - { -- return std::getline( istrm, ref, delim ); -+ std::getline( istrm, ref, delim ); -+ return istrm.good() || istrm.eof(); - } - - /// For reading from a string with tokens separated by a char. Used to load CSV files. -@@ -220,7 +221,7 @@ bool read_until_delim( char delim, std:: - } - imemstream sstrm( parsed_str ); - sstrm >> ref ; -- return sstrm ; -+ return sstrm.good() || sstrm.eof(); - } - - /// Same, with a default value if there is nothing to read. -@@ -237,7 +238,7 @@ bool read_until_delim( char delim, std:: - } - imemstream sstrm( parsed_str ); - sstrm >> ref ; -- return sstrm ; -+ return sstrm.good() || sstrm.eof(); - } - - /// For reading from a string with tokens separated by a char to a fixed-size array. -@@ -246,7 +247,7 @@ bool read_until_delim( char delim, std:: - { - istrm.getline( ref, DtTyp< Tp >::Size, delim ); - // Should we return an error if buffer is too small? -- return istrm ; -+ return istrm.good() || istrm.eof(); - } - - /// Same, with a default value if there is nothing to read. Fixed-size array. -@@ -259,7 +260,7 @@ bool read_until_delim( char delim, std:: - strncpy( ref, dflt, DtTyp< Tp >::Size - 1 ); - } - // Should we return an error if buffer is too small? -- return istrm; -+ return istrm.good() || istrm.eof(); - } - - // ---------------------------------------------------------------------------- diff --git a/ham/fldigi/patches/patch-src_logbook_logsupport.cxx b/ham/fldigi/patches/patch-src_logbook_logsupport.cxx deleted file mode 100644 index 07253cd2903..00000000000 --- a/ham/fldigi/patches/patch-src_logbook_logsupport.cxx +++ /dev/null @@ -1,43 +0,0 @@ -$NetBSD: patch-src_logbook_logsupport.cxx,v 1.2 2013/09/13 06:35:55 mef Exp $ - -Avoid implicit conversions to bool for streams. -Require C++11 for Clang and prefer std version over tr1 when in C++11 -mode. - ---- 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 deleted file mode 100644 index 24a82426046..00000000000 --- a/ham/fldigi/patches/patch-src_misc_dxcc.cxx +++ /dev/null @@ -1,34 +0,0 @@ -$NetBSD: patch-src_misc_dxcc.cxx,v 1.2 2013/09/13 06:35:55 mef Exp $ - -Avoid implicit conversions to bool for streams. -Require C++11 for Clang and prefer std version over tr1 when in C++11 -mode. - ---- 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 deleted file mode 100644 index 7c06d28ab74..00000000000 --- a/ham/fldigi/patches/patch-src_misc_re.cxx +++ /dev/null @@ -1,28 +0,0 @@ -$NetBSD: patch-src_misc_re.cxx,v 1.2 2013/09/13 06:35:55 mef Exp $ - -Avoid implicit conversions to bool for streams. -Require C++11 for Clang and prefer std version over tr1 when in C++11 -mode. - ---- 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_spot_notify.cxx b/ham/fldigi/patches/patch-src_spot_notify.cxx deleted file mode 100644 index 48721db9627..00000000000 --- a/ham/fldigi/patches/patch-src_spot_notify.cxx +++ /dev/null @@ -1,20 +0,0 @@ -$NetBSD: patch-src_spot_notify.cxx,v 1.2 2013/09/13 06:35:55 mef Exp $ - -Avoid implicit conversions to bool for streams. -Require C++11 for Clang and prefer std version over tr1 when in C++11 -mode. - ---- src/spot/notify.cxx.orig 2013-07-06 20:54:45.000000000 +0900 -+++ src/spot/notify.cxx 2013-07-07 15:25:39.000000000 +0900 -@@ -35,7 +35,10 @@ - - #include "timeops.h" - --#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 deleted file mode 100644 index 1a499d83777..00000000000 --- a/ham/fldigi/patches/patch-src_spot_pskrep.cxx +++ /dev/null @@ -1,21 +0,0 @@ -$NetBSD: patch-src_spot_pskrep.cxx,v 1.2 2013/09/13 06:35:55 mef Exp $ - -Avoid implicit conversions to bool for streams. -Require C++11 for Clang and prefer std version over tr1 when in C++11 -mode. - ---- 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 deleted file mode 100644 index e6896bc58a3..00000000000 --- a/ham/fldigi/patches/patch-src_spot_spot.cxx +++ /dev/null @@ -1,42 +0,0 @@ -$NetBSD: patch-src_spot_spot.cxx,v 1.2 2013/09/13 06:35:55 mef Exp $ - -Avoid implicit conversions to bool for streams. -Require C++11 for Clang and prefer std version over tr1 when in C++11 -mode. - ---- 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; - |