diff options
| author | dbj <dbj@pkgsrc.org> | 2018-07-13 04:14:48 +0000 |
|---|---|---|
| committer | dbj <dbj@pkgsrc.org> | 2018-07-13 04:14:48 +0000 |
| commit | 9daf466f2fdd9ff1d68edb685b5d7b2502b2505c (patch) | |
| tree | b1e46523be7cfed77a0a4e8649eb63faf5195bd4 /ham/fldigi | |
| parent | fbeed2928536441a685389bd34e71dc315d5ab94 (diff) | |
| download | pkgsrc-9daf466f2fdd9ff1d68edb685b5d7b2502b2505c.tar.gz | |
ham/fldigi: fix crash loading hamlib
The c++ std::sort comparator was being used incorrectly
Diffstat (limited to 'ham/fldigi')
| -rw-r--r-- | ham/fldigi/Makefile | 4 | ||||
| -rw-r--r-- | ham/fldigi/distinfo | 3 | ||||
| -rw-r--r-- | ham/fldigi/patches/patch-src_rigcontrol_hamlib.cxx | 21 |
3 files changed, 25 insertions, 3 deletions
diff --git a/ham/fldigi/Makefile b/ham/fldigi/Makefile index 78b9f2a0cbf..fe244236e21 100644 --- a/ham/fldigi/Makefile +++ b/ham/fldigi/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.104 2018/07/06 15:06:47 ryoon Exp $ +# $NetBSD: Makefile,v 1.105 2018/07/13 04:14:48 dbj Exp $ DISTNAME= fldigi-4.0.16 -PKGREVISION= 3 +PKGREVISION= 4 CATEGORIES= ham MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=fldigi/} diff --git a/ham/fldigi/distinfo b/ham/fldigi/distinfo index 5dc1958f42b..41acc607c30 100644 --- a/ham/fldigi/distinfo +++ b/ham/fldigi/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.64 2018/02/18 14:57:55 mef Exp $ +$NetBSD: distinfo,v 1.65 2018/07/13 04:14:48 dbj Exp $ SHA1 (fldigi-4.0.16.tar.gz) = 0933d28cafd6a4c0121a27946c877e88cca69130 RMD160 (fldigi-4.0.16.tar.gz) = d8152033e7bd4aa3d5f507be8d443af87ec278b7 @@ -6,3 +6,4 @@ SHA512 (fldigi-4.0.16.tar.gz) = cb8eb7eb64be755bcf2021ff27fd8d6982b2fde44f3d49f4 Size (fldigi-4.0.16.tar.gz) = 3727379 bytes SHA1 (patch-src_misc_configuration.cxx) = 4ebf0c46913f73047ad5b858f6d4ae9def82ec60 SHA1 (patch-src_misc_newinstall.cxx) = 2c215e9423d27dd4f4657221b17cf4ed3f12355c +SHA1 (patch-src_rigcontrol_hamlib.cxx) = 69c56c1acb756f2fd2d97d4022e714fad451233c diff --git a/ham/fldigi/patches/patch-src_rigcontrol_hamlib.cxx b/ham/fldigi/patches/patch-src_rigcontrol_hamlib.cxx new file mode 100644 index 00000000000..1d10362e3ab --- /dev/null +++ b/ham/fldigi/patches/patch-src_rigcontrol_hamlib.cxx @@ -0,0 +1,21 @@ +$NetBSD: patch-src_rigcontrol_hamlib.cxx,v 1.1 2018/07/13 04:14:48 dbj Exp $ + +The C++ std::sort requires the comparator return false when items are equal + +--- src/rigcontrol/hamlib.cxx.orig 2017-11-08 12:41:13.000000000 +0000 ++++ src/rigcontrol/hamlib.cxx +@@ -582,10 +582,10 @@ static bool rig_cmp(const struct rig_cap + if (ret < 0) return true; + ret = strcasecmp(rig1->model_name, rig2->model_name); + if (ret > 0) return false; +- if (ret <= 0) return true; +- if (rig1->rig_model > rig2->rig_model) +- return false; +- return true; ++ if (ret < 0) return true; ++ if (rig1->rig_model < rig2->rig_model) ++ return true; ++ return false; + } + + void hamlib_get_rigs(void) |