kpriv/pkgsrc-wip
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Add patches as of pkgsrc proper ham/fldigi

Browse source 
date: 2013/09/17 21:12:25;  author: joerg;  state: Exp;
    Don't depend on implicit boolean conversion for streams.
    Fix a header guard to reduce warnings.
Add COMMIT_MSG for preparation.
This commit is contained in:
Makoto Fujiwara 2014-03-12 02:08:35 +00:00 committed by Thomas Klausner
parent b493ce9c6f
commit 023cb3add5
4 changed files with 158 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

90
fldigi/COMMIT_MSG Normal file
View file

@ -0,0 +1,90 @@
(Upstream update 3.21.76 to 3.21.79)
=Version 3.21.79=
2014-03-07 David Freese <w1hkj@w1hkj.com>
2d189bd: RigCAT initialize
b391b02: Modem cleanup
720f88d: Missing build script
ea4042e: Choice-->ListBox
632d5ae: combobox-listbox
3204698: FreeBSD One More Time
01dffcb: RTTY normalize
89bb26d: Sound.cxx cleanup
4d30c67: Portaudio ring buffer
0cff262: Headers update
4e55345: Portaudio error reporting
2014-01-28 Kamal Mostafa <kamal@whence.com>
58aeb6a: Avoid nitems fltk kfreebsd collision
2014-01-13 David Freese <w1hkj@w1hkj.com>
3b9ace3: modem timing test
1af2407: XMLRPC seg fault
2817731: Mailing address
2014-01-11 John Phelps <kl4yfd@gmail.com>
aad3a84: 64 bit stacktrace
2014-01-11 David Freese <w1hkj@w1hkj.com>
b778b42: Developer update
440c65f: CW timing
=Version 3.21.78=
05e0bfc: SKED macro
52ba259: FreeBSD issues
c0ba6f8: WF max size
4e085ba: PSKR softbits
2013-11-09 Andrej Lajovic <s57ln@hamradio.si>
0621261: CharsetDistiller
8f5640b: UTF-8
2013-11-08 Arvo J<>«£rve <arvo@softshark.ee>
3425ce0: RigCAT close
74c6533: Save Wordwrap
2013-11-05 David Freese <w1hkj@w1hkj.com>
0d1a309: ARQ timeouts
eeacf5e: Deutsch
c474790: DTMF
1cca53a: WF latency
=Version 3.21.77=
665f195: Load preferences
7dcfc50: Waterfall race condition
2013-10-22 John Phelps <kl4yfd@gmail.com>
0b8143b: MFSK HF Long Modes
* Added MFSK64L and MFSL128L new modes
* 6.25 Second interleaver for very-robust HF reception
* Assigned new RSIDs
* Mode MFSK-64L : 1026
* Mode MFSK-128L : 1029
2013-10-20 David Freese <w1hkj@w1hkj.com>
e0d91cb: Waterfall improvements
2013-10-19 Remi Chateauneu <remi.chateauneu@gmail.com>
1e39501: Fix test_process on MacOS
fb5c891: Various speed-ups, fixes and cleanups
2013-10-16 David Freese <w1hkj@w1hkj.com>
d56a7f4: Cfft removal
a322875: fldigi.pot update
adc6128: Multi-channel decode
267b914: fft filter
1bad52f: g_fft
9b62e1b3: WF fft
6d79e55: rsid fft
d600d02: Wefax Config tab
683b364: Autostart programs
bb91898: RsID Error Control
1eaba46: Macro tag Image
2013-09-17 Kamal Mostafa <kamal@whence.com>
51ead20: Avoid-nitems-fltk-kfreebsd-collision.patch
2013-09-14 David Freese <w1hkj@w1hkj.com>
8159199: MFSKpic improvements
78d11dd: ADIF log database
dbabd63: MFSK update
3d400ae: Thor update

4
fldigi/distinfo
View file

@ -1,10 +1,12 @@
$NetBSD: distinfo,v 1.28 2014/03/12 00:50:35 makoto Exp $
$NetBSD: distinfo,v 1.29 2014/03/12 02:08:35 makoto Exp $
SHA1 (fldigi-3.21.79.tar.gz) = d00d29997eb809046f43231f2815d10c8f01a85d
RMD160 (fldigi-3.21.79.tar.gz) = 5c3f949f36edbc8f156d215e18982718aaec3633
Size (fldigi-3.21.79.tar.gz) = 2646946 bytes
SHA1 (patch-src_dominoex_dominoex.cxx) = 39d2d2e75497ec5264148bc4927278df5adaa84d
SHA1 (patch-src_include_logsupport.h) = 2291272db0ddba2d106f4006143df96e2d466e4b
SHA1 (patch-src_include_qrunner.h) = 5dac7e9fd52f10c66978a854963bd03d39a729d0
SHA1 (patch-src_include_strutil.h) = e35090f545ce957cf67d408e469c203e29fb7447
SHA1 (patch-src_logbook_logsupport.cxx) = bffff9fe6ee6f07596fa1e65208377d17b822263
SHA1 (patch-src_misc_configuration.cxx) = 4f1940b0ff9d51418b37d01636c1a45f9a392943
SHA1 (patch-src_misc_dxcc.cxx) = 23533d5062d731b56c7f7b2e9e4cac0b2b4f7194

13
fldigi/patches/patch-src_include_logsupport.h Normal file
View file

@ -0,0 +1,13 @@
$NetBSD: patch-src_include_logsupport.h,v 1.1 2014/03/12 02:08:35 makoto 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>

52
fldigi/patches/patch-src_include_strutil.h Normal file
View file

@ -0,0 +1,52 @@
$NetBSD: patch-src_include_strutil.h,v 1.1 2014/03/12 02:08:35 makoto 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();
}
// ----------------------------------------------------------------------------