head	1.4;
access;
symbols
	pkgsrc-2018Q4:1.1.0.4
	pkgsrc-2018Q4-base:1.1
	pkgsrc-2018Q3:1.1.0.2
	pkgsrc-2018Q3-base:1.1;
locks; strict;
comment	@// @;


1.4
date	2025.01.22.17.49.16;	author gdt;	state dead;
branches;
next	1.3;
commitid	m6a0mERZsacivvGF;

1.3
date	2025.01.14.01.30.02;	author gdt;	state Exp;
branches;
next	1.2;
commitid	lRuqnRRQJrvvloFF;

1.2
date	2019.02.23.11.30.03;	author mef;	state dead;
branches;
next	1.1;
commitid	oM1UJV8qIlCkPScB;

1.1
date	2018.07.13.04.14.48;	author dbj;	state Exp;
branches;
next	;
commitid	0rth5gqaMTrgFVJA;


desc
@@


1.4
log
@ham/{fldigi,freedv,xlog}: Undo accomodate for hamlib 4.6 API change

Recently updated hamlib 4.6.1 reverts the API change.
@
text
@$NetBSD: patch-src_rigcontrol_hamlib.cxx,v 1.3 2025/01/14 01:30:02 gdt Exp $

Accomodate hamlib 4.6 API break.

Not yet filed upstream because we are behind.

--- src/rigcontrol/hamlib.cxx.orig	2025-01-14 01:26:36.015676963 +0000
+++ src/rigcontrol/hamlib.cxx
@@@@ -567,7 +567,7 @@@@ static void *hamlib_loop(void *args)
 	return NULL;
 }
 
-static int add_to_list(const struct rig_caps* rc, void*)
+static int add_to_list(struct rig_caps* rc, void*)
 {
 	hamlib_rigs.push_back(rc);
 	return 1;
@


1.3
log
@ham/fldigi: Accomodate hamlib 4.6 API break
@
text
@d1 1
a1 1
$NetBSD$
@


1.2
log
@Updated ham/fldigi 4.0.16 to 4.1.01

- (pkgsrc) drop  patch-src_rigcontrol_hamlib.cxx, it is now included)
- (upstream) below

=Version 4.1.01=

2019-02-18  David Freese  <w1hkj@@bellsouth.net>

	1d4798c: CW h/w ptt
	ca3e777: nanoIO
	a943ae3: NAVTEX abort
	ce586b8: dup-check
	57cc6ea: ADIF submode
	96e1f05: WF only bug fix
	06c56b3: LotW
	c5af7e0: Pedantic warnings
	892336b: SD counties
	044dd29: QRZ.com
	aeed471: SV1GRB test report


=Version 4.1.0=

	39a76e8: po update
	79c67d3: WWV doc
	04e53b5: Winkeyer FSK
	b8ca88e: Contests
	b197c75: arq-override
	8572f35: flmsg-dir
	02c66eb: contest-docs
	9d85169: fldigi_def.xml
	20e2c02: socket_mods
	e1c2d80: Fltk 1.4 mod
	5ffd6f5: wefax
	fb1fd67: nanoIO
	7d604b8: CW SOM table
	4eec8f2: flrig: macro
	99b0a01: Audio adjust docs
	146bd7e: feldhell
	6b5c93a: C-11 fixes
	ccbd52f: nano FSK
	ed6a7db: Mint-19/Mate
	e9c0f2d: Signal Browser documentation
	fbb0654: flrig seg fault


=Version 4.0.18=

	2fef9cb: CPS testing
	aa757af: ipv6 addressing
	c62662c: MT63 centering
	9460c00: fsq mods
	5a7377f: IFKP/THOR greyscale image
	51e2829: Hamlib bug fix
	58c6362: Tooltip
	47d2c6c: nanoIO
	a253603: THROB adif
	f46cb9b: RigCAT dialog


=Version 4.0.17=

	a2b9172: flarq idtimer
	d58b0b7: Greek language update
	4c3ca8f: tmpfile
	87cb7e1: xmlrpc cat string
	4f72635: Modem start frequency
	dc68d02: Serial port discovery
	55aa627: Log entries
	2fea354: flarq appdir
	c480982: rx/tx
	56553fa: RTTY Quick pick
	79aa5d6: quick pick rtty baud
	d1f91ea: Documentation Update
	e4a5cec: CW/FSK I/O on start
	a9df13f: WinKey PTT
	6de7360: Navigator
	fa8e53e: nanoIO
	202ad12: Default Lighted Button
	dfd1b0b: ST/PR macro tags
	490f683: K2/K3/KX3 data modes
	c39a88b: Logbook read
	6cb1e5a: 8pskF
	89ff7c8: fsq/ifkp audit logs
	cd7e502: RTTY browser decode
@
text
@d1 1
a1 1
$NetBSD: patch-src_rigcontrol_hamlib.cxx,v 1.1 2018/07/13 04:14:48 dbj Exp $
d3 1
a3 1
The C++ std::sort requires the comparator return false when items are equal
d5 3
a7 1
--- src/rigcontrol/hamlib.cxx.orig	2017-11-08 12:41:13.000000000 +0000
d9 2
a10 12
@@@@ -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;
d13 5
a17 1
 void hamlib_get_rigs(void)
@


1.1
log
@ham/fldigi: fix crash loading hamlib

The c++ std::sort comparator was being used incorrectly
@
text
@d1 1
a1 1
$NetBSD$
@