CVS commit: pkgsrc/ham/xlog

["Greg Troxel" <gdt%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   gdt
Date:           Thu Dec 26 13:32:39 UTC 2024

Modified Files:
        pkgsrc/ham/xlog: Makefile distinfo
Added Files:
        pkgsrc/ham/xlog/patches: patch-src_hamlib-utils.c

Log Message:
ham/xlog: Fix build with hamlib 4.6


To generate a diff of this commit:
cvs rdiff -u -r1.112 -r1.113 pkgsrc/ham/xlog/Makefile
cvs rdiff -u -r1.32 -r1.33 pkgsrc/ham/xlog/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/ham/xlog/patches/patch-src_hamlib-utils.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/ham/xlog/Makefile
diff -u pkgsrc/ham/xlog/Makefile:1.112 pkgsrc/ham/xlog/Makefile:1.113
--- pkgsrc/ham/xlog/Makefile:1.112      Sun Nov 17 07:16:13 2024
+++ pkgsrc/ham/xlog/Makefile    Thu Dec 26 13:32:39 2024
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.112 2024/11/17 07:16:13 wiz Exp $
+# $NetBSD: Makefile,v 1.113 2024/12/26 13:32:39 gdt Exp $
 #
 
 DISTNAME=      xlog-2.0.25
-PKGREVISION=   2
+PKGREVISION=   3
 CATEGORIES=    ham
 MASTER_SITES=  https://download.savannah.gnu.org/releases/xlog/
 LICENSE=       gnu-gpl-v3

Index: pkgsrc/ham/xlog/distinfo
diff -u pkgsrc/ham/xlog/distinfo:1.32 pkgsrc/ham/xlog/distinfo:1.33
--- pkgsrc/ham/xlog/distinfo:1.32       Mon Oct 14 00:53:52 2024
+++ pkgsrc/ham/xlog/distinfo    Thu Dec 26 13:32:39 2024
@@ -1,10 +1,11 @@
-$NetBSD: distinfo,v 1.32 2024/10/14 00:53:52 mef Exp $
+$NetBSD: distinfo,v 1.33 2024/12/26 13:32:39 gdt Exp $
 
 BLAKE2s (xlog-2.0.25.tar.gz) = 69096218bb8cc189dbe86f5a66243a15bfc09bfb47f5b318a7b07dc91d358110
 SHA512 (xlog-2.0.25.tar.gz) = 3ce5b27a0529885862a8c5256162068504e05cbbca6e0fc6cf492bfabbb2aa84b82a54502319646ee49e78aac6cd2b685877ec3687fb962c59c8648e0be4e121
 Size (xlog-2.0.25.tar.gz) = 11425326 bytes
 SHA1 (patch-src_callbacks_mainwindow_qsoframe_c) = 354d979f0f591039df0377e640bdc76b6d4831a4
 SHA1 (patch-src_dxcc_c) = 2fea7448ecd452064ff86ab228ec7490a0c187f3
+SHA1 (patch-src_hamlib-utils.c) = d56c18139a1f7be96aeb6d5138da3e129d14bb5e
 SHA1 (patch-src_logfile_editest_c) = 803cec0af65e359eecfea6fc9e079899999a7529
 SHA1 (patch-src_logfile_logfile_c) = 92ccae2d101297365ef1cd69464edd182b142338
 SHA1 (patch-src_strptime_c) = 5471f5acc7adc16ca08d479473b424c6798bf30c

Added files:

Index: pkgsrc/ham/xlog/patches/patch-src_hamlib-utils.c
diff -u /dev/null pkgsrc/ham/xlog/patches/patch-src_hamlib-utils.c:1.1
--- /dev/null   Thu Dec 26 13:32:39 2024
+++ pkgsrc/ham/xlog/patches/patch-src_hamlib-utils.c    Thu Dec 26 13:32:39 2024
@@ -0,0 +1,17 @@
+$NetBSD: patch-src_hamlib-utils.c,v 1.1 2024/12/26 13:32:39 gdt Exp $
+
+Resolve type error in usage of hamlib function (4.6).
+
+https://savannah.nongnu.org/bugs/index.php?66598
+
+--- src/hamlib-utils.c.orig    2024-12-26 13:23:19.845248277 +0000
++++ src/hamlib-utils.c
+@@ -197,7 +197,7 @@ start_hamlib (gint rigid, gchar *device,
+ 
+ /* Append a new entry in the driver list. It is called by rig_list_foreach */
+ static gint
+-riglist_make_list (const struct rig_caps *caps, gpointer data)
++riglist_make_list (struct rig_caps *caps, gpointer data)
+ {
+       rigs = g_list_append (rigs, (gpointer) caps);
+       return 1;               /* !=0, we want them all ! */