grig: fix building with latest hamlib

6 files changed, 201 insertions, 5 deletions

diff --git a/ham/grig/distinfo b/ham/grig/distinfo
index 3eaf39d9cc7..d4709418f3a 100644
--- a/ham/grig/distinfo
+++ b/ham/grig/distinfo
@@ -1,8 +1,11 @@
-$NetBSD: distinfo,v 1.13 2021/10/26 10:48:38 nia Exp $
+$NetBSD: distinfo,v 1.14 2022/04/10 08:04:38 nia Exp $
 
 BLAKE2s (grig-0.8.1.tar.gz) = 9414be30de8fe2f26629497c27716b78334580545ba53dc7095f886d90ac1b59
 SHA512 (grig-0.8.1.tar.gz) = 84eda8db5d18324f26f0775483c8272296aad05dd75f0572c01a3c7af6dbd14bff7b98cc6a61fe3c43d25193866be4b3dafdc4e68dfc37217e88b53ca53266f9
 Size (grig-0.8.1.tar.gz) = 621728 bytes
-SHA1 (patch-src_rig-daemon-check.c) = 04c958c5a9fe5dfcd6db931e0de96f017201a053
-SHA1 (patch-src_rig-daemon.c) = e70633aad4468c3302f2abedf8d92ab27f17f823
+SHA1 (patch-src_rig-daemon-check.c) = a64b81269a521a94384eaf469e122f0db28505d2
+SHA1 (patch-src_rig-daemon.c) = 7905153e879059422d68df3ddf9bfec22b9b39f9
+SHA1 (patch-src_rig-data.c) = 4d23d504a590248651370bed5b45c634b230c5b8
 SHA1 (patch-src_rig-data.h) = cb2acfb5fdaa2bda4cc8674ee5977bcb003912ac
+SHA1 (patch-src_rig-gui-buttons.c) = 0b2413bd83ac4824bb52aa45e5ff1fa2c64baeb3
+SHA1 (patch-src_rig-gui-info.c) = 9dd6256e91994f3f95df88bf19dc10f29f16bf84
diff --git a/ham/grig/patches/patch-src_rig-daemon-check.c b/ham/grig/patches/patch-src_rig-daemon-check.c
index e551d672a01..e5276e78965 100644
--- a/ham/grig/patches/patch-src_rig-daemon-check.c
+++ b/ham/grig/patches/patch-src_rig-daemon-check.c
@@ -1,4 +1,4 @@
-$NetBSD: patch-src_rig-daemon-check.c,v 1.1 2021/03/09 08:14:01 nia Exp $
+$NetBSD: patch-src_rig-daemon-check.c,v 1.2 2022/04/10 08:04:39 nia Exp $
 
 Description: align affected parts for Hamlib4.0
 Author: Ervin Hegedus <airween@gmail.com>
@@ -24,3 +24,21 @@ https://sources.debian.org/data/main/g/grig/0.8.1-3/debian/patches/04-hamlib-ali
  				
  				grig_debug_local (RIG_DEBUG_VERBOSE,
  						  _("%s: Found frequency range for mode %d"),
+@@ -884,7 +884,7 @@ rig_daemon_check_level     (RIG         
+ 	if (has_get->att || has_set->att) {
+ 		int i = 0;
+ 
+-		while ((i < MAXDBLSTSIZ) && (myrig->state.attenuator[i] != 0)) {
++		while ((i < HAMLIB_MAXDBLSTSIZ) && (myrig->state.attenuator[i] != 0)) {
+ 			rig_data_set_att_data (i, myrig->state.attenuator[i]);
+ 			i++;
+ 		}
+@@ -895,7 +895,7 @@ rig_daemon_check_level     (RIG         
+ 	if (has_get->preamp || has_set->preamp) {
+ 		int i = 0;
+ 
+-		while ((i < MAXDBLSTSIZ) && (myrig->state.preamp[i] != 0)) {
++		while ((i < HAMLIB_MAXDBLSTSIZ) && (myrig->state.preamp[i] != 0)) {
+ 			rig_data_set_preamp_data (i, myrig->state.preamp[i]);
+ 			i++;
+ 		}
diff --git a/ham/grig/patches/patch-src_rig-daemon.c b/ham/grig/patches/patch-src_rig-daemon.c
index 04b10dff356..f9c9716c2cf 100644
--- a/ham/grig/patches/patch-src_rig-daemon.c
+++ b/ham/grig/patches/patch-src_rig-daemon.c
@@ -1,4 +1,4 @@
-$NetBSD: patch-src_rig-daemon.c,v 1.1 2021/03/09 08:14:01 nia Exp $
+$NetBSD: patch-src_rig-daemon.c,v 1.2 2022/04/10 08:04:39 nia Exp $
 
 Description: align affected parts for Hamlib4.0
 Author: Ervin Hegedus <airween@gmail.com>
@@ -7,6 +7,15 @@ https://sources.debian.org/data/main/g/grig/0.8.1-3/debian/patches/04-hamlib-ali
 
 --- src/rig-daemon.c.orig	2015-12-19 15:14:27.000000000 +0000
 +++ src/rig-daemon.c
+@@ -537,7 +537,7 @@ rig_daemon_start       (int          rig
+ 	}
+ 
+ 	/* configure and open rig device */
+-	strncpy (myrig->state.rigport.pathname, rigport, FILPATHLEN);
++	strncpy (myrig->state.rigport.pathname, rigport, HAMLIB_FILPATHLEN);
+ 	g_free (rigport);
+ 
+ 	/* set speed if any special whishes */
 @@ -1674,12 +1674,12 @@ rig_daemon_exec_cmd         (rig_cmd_t c
  						   is the current frequency within this range?
  						*/
diff --git a/ham/grig/patches/patch-src_rig-data.c b/ham/grig/patches/patch-src_rig-data.c
new file mode 100644
index 00000000000..af29f315463
--- /dev/null
+++ b/ham/grig/patches/patch-src_rig-data.c
@@ -0,0 +1,73 @@
+$NetBSD: patch-src_rig-data.c,v 1.1 2022/04/10 08:04:39 nia Exp $
+
+Fix building with latest hamlib.
+
+--- src/rig-data.c.orig	2011-06-21 20:57:14.000000000 +0000
++++ src/rig-data.c
+@@ -64,10 +64,10 @@ grig_cmd_avail_t has_get;  /*!< Flags to
+ 
+ 
+ /** \brief List of attenuator values (absolute values). */
+-static int att[MAXDBLSTSIZ];
++static int att[HAMLIB_MAXDBLSTSIZ];
+ 
+ /** \brief List of preamp values. */
+-static int preamp[MAXDBLSTSIZ];
++static int preamp[HAMLIB_MAXDBLSTSIZ];
+ 
+ /** \brief Bit field of available VFO's */
+ static int vfo_list;
+@@ -116,7 +116,7 @@ rig_data_set_vfos         (int vfos)
+ void
+ rig_data_set_att_data (int index, int data)
+ {
+-	if ((index >= 0) && (index < MAXDBLSTSIZ))
++	if ((index >= 0) && (index < HAMLIB_MAXDBLSTSIZ))
+ 		att[index] = data;
+ }
+ 
+@@ -132,7 +132,7 @@ rig_data_set_att_data (int index, int da
+ int
+ rig_data_get_att_data (int index)
+ {
+-	if ((index >= 0) && (index < MAXDBLSTSIZ)) {
++	if ((index >= 0) && (index < HAMLIB_MAXDBLSTSIZ)) {
+ 		return att[index];
+ 	}
+ 	else {
+@@ -158,7 +158,7 @@ rig_data_get_att_index    (int data)
+ 		return -1;
+ 
+ 	/* scan through the array */
+-	while ((i < MAXDBLSTSIZ) && (att[i] != 0)) {
++	while ((i < HAMLIB_MAXDBLSTSIZ) && (att[i] != 0)) {
+ 		if (att[i] == data) {
+ 			return i;
+ 		}
+@@ -182,7 +182,7 @@ rig_data_get_att_index    (int data)
+ void
+ rig_data_set_preamp_data (int index, int data)
+ {
+-	if ((index >= 0) && (index < MAXDBLSTSIZ))
++	if ((index >= 0) && (index < HAMLIB_MAXDBLSTSIZ))
+ 		preamp[index] = data;
+ }
+ 
+@@ -198,7 +198,7 @@ rig_data_set_preamp_data (int index, int
+ int
+ rig_data_get_preamp_data (int index)
+ {
+-	if ((index >= 0) && (index < MAXDBLSTSIZ)) {
++	if ((index >= 0) && (index < HAMLIB_MAXDBLSTSIZ)) {
+ 		return preamp[index];
+ 	}
+ 	else {
+@@ -225,7 +225,7 @@ rig_data_get_preamp_index    (int data)
+ 		return -1;
+ 
+ 	/* scan through the array */
+-	while ((i < MAXDBLSTSIZ) && (preamp[i] != 0)) {
++	while ((i < HAMLIB_MAXDBLSTSIZ) && (preamp[i] != 0)) {
+ 		if (preamp[i] == data) {
+ 			return i;
+ 		}
diff --git a/ham/grig/patches/patch-src_rig-gui-buttons.c b/ham/grig/patches/patch-src_rig-gui-buttons.c
new file mode 100644
index 00000000000..1e21c530500
--- /dev/null
+++ b/ham/grig/patches/patch-src_rig-gui-buttons.c
@@ -0,0 +1,24 @@
+$NetBSD: patch-src_rig-gui-buttons.c,v 1.1 2022/04/10 08:04:39 nia Exp $
+
+Fix building with latest hamlib.
+
+--- src/rig-gui-buttons.c.orig	2009-06-01 14:21:27.000000000 +0000
++++ src/rig-gui-buttons.c
+@@ -286,7 +286,7 @@ rig_gui_buttons_create_att_selector    (
+     /* note: MAXDBLSTSIZ is defined in hamlib; it is the max size of the
+         ATT and preamp arrays.
+     */
+-    while ((i < MAXDBLSTSIZ) && rig_data_get_att_data (i)) {
++    while ((i < HAMLIB_MAXDBLSTSIZ) && rig_data_get_att_data (i)) {
+ 
+         text = g_strdup_printf ("-%d dB", rig_data_get_att_data (i));
+         gtk_combo_box_append_text (GTK_COMBO_BOX (att), text);
+@@ -346,7 +346,7 @@ rig_gui_buttons_create_preamp_selector  
+     /* note: MAXDBLSTSIZ is defined in hamlib; it is the max size of the
+         ATT and preamp arrays.
+     */
+-    while ((i < MAXDBLSTSIZ) && rig_data_get_preamp_data (i)) {
++    while ((i < HAMLIB_MAXDBLSTSIZ) && rig_data_get_preamp_data (i)) {
+ 
+         text = g_strdup_printf ("%d dB", rig_data_get_preamp_data (i));
+         gtk_combo_box_append_text (GTK_COMBO_BOX (preamp), text);
diff --git a/ham/grig/patches/patch-src_rig-gui-info.c b/ham/grig/patches/patch-src_rig-gui-info.c
new file mode 100644
index 00000000000..27ebd9c4e42
--- /dev/null
+++ b/ham/grig/patches/patch-src_rig-gui-info.c
@@ -0,0 +1,69 @@
+$NetBSD: patch-src_rig-gui-info.c,v 1.1 2022/04/10 08:04:39 nia Exp $
+
+Fix building with latest hamlib.
+
+--- src/rig-gui-info.c.orig	2007-11-16 21:58:22.000000000 +0000
++++ src/rig-gui-info.c
+@@ -714,7 +714,7 @@ rig_gui_info_create_tunstep_frame  ()
+ 	/* Create a table with enough rows to show the
+ 	   max possible number of unique tuning steps.
+ 	*/
+-	table = gtk_table_new (TSLSTSIZ, 2, FALSE);
++	table = gtk_table_new (HAMLIB_TSLSTSIZ, 2, FALSE);
+ 
+ 	label = gtk_label_new (NULL);
+ 	gtk_label_set_markup (GTK_LABEL (label), _("<b>STEP</b>"));
+@@ -746,7 +746,7 @@ rig_gui_info_create_tunstep_frame  ()
+ 	      }
+ 	*/
+ 	/* for each available tuning ste */
+-	for (i = 0; i < TSLSTSIZ; i++) {
++	for (i = 0; i < HAMLIB_TSLSTSIZ; i++) {
+ 
+ 		gboolean firsthit = TRUE;   /* indicates whether found mode is the first one
+ 					       for the current tuning step. */
+@@ -757,7 +757,7 @@ rig_gui_info_create_tunstep_frame  ()
+ 		*/
+ 		if (myrig->caps->tuning_steps[i].ts == 0) {
+ 
+-			i = TSLSTSIZ;
++			i = HAMLIB_TSLSTSIZ;
+ 		}
+ 		
+ 		/* otherwise continue */
+@@ -853,7 +853,7 @@ rig_gui_info_create_frontend_frame ()
+ 	text = g_strdup ("");
+ 
+ 	/* loop over all available preamp values and concatenate them into a label */
+-	for (i = 0; i < MAXDBLSTSIZ; i++) {
++	for (i = 0; i < HAMLIB_MAXDBLSTSIZ; i++) {
+ 
+ 		data = rig_data_get_preamp_data (i);
+ 
+@@ -861,7 +861,7 @@ rig_gui_info_create_frontend_frame ()
+ 		   reached the terminator
+ 		*/
+ 		if (data == 0) {
+-			i = MAXDBLSTSIZ;
++			i = HAMLIB_MAXDBLSTSIZ;
+ 		}
+ 		else {
+ 			if (i > 0) {
+@@ -900,7 +900,7 @@ rig_gui_info_create_frontend_frame ()
+ 
+ 	text = g_strdup ("");
+ 	/* loop over all available attenuator values and concatenate them into a label */
+-	for (i = 0; i < MAXDBLSTSIZ; i++) {
++	for (i = 0; i < HAMLIB_MAXDBLSTSIZ; i++) {
+ 
+ 		data = rig_data_get_att_data (i);
+ 
+@@ -908,7 +908,7 @@ rig_gui_info_create_frontend_frame ()
+ 		   reached the terminator
+ 		*/
+ 		if (data == 0) {
+-			i = MAXDBLSTSIZ;
++			i = HAMLIB_MAXDBLSTSIZ;
+ 		}
+ 		else {
+ 			if (i > 0) {