CVS commit: pkgsrc/ham/xlog

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

Module Name:    pkgsrc
Committed By:   gdt
Date:           Thu Feb  4 14:10:07 UTC 2021

Modified Files:
        pkgsrc/ham/xlog: Makefile distinfo
        pkgsrc/ham/xlog/patches: patch-configure
Added Files:
        pkgsrc/ham/xlog/patches: patch-src_logfile_editest_c
Removed Files:
        pkgsrc/ham/xlog/patches: patch-src_log.c patch-src_logfile_edittest_c

Log Message:
ham/xlog: Update to 2.0.20

pkgsrc changes:
  - drop workaround for upstream bug fixed in this release
  - rename patchfile per pkglint

- Changes for xlog version 2.0.20 - 2021-jan-30
  * Updated cty.dat 20210127 (cty-3102)
  * Added FST4 support and 5m/8m bands for ADIF 3.1.1
  * Added /dev/ttyUSB0 and /dev/ttyUSB1 to the hamlib device menu
  * Logeditor can hide TX(RST) and RX (RST) (useful for VHF contests)
  * ADIF exports Distance and Azimuth correctly if enabled in Logeditor
  * Imports ADIF from wsjt-x on UDP port 2333
  * Fixed use-after-free error discovered by Chris K2CR and valgrind
  * Fixed hash-table != null assert in dxcc.c
  * Fixed GLib-GObject-WARNING in log.c
  * Compiles cleanly with hamlib4 on ubuntu 18.04 and 20.04


To generate a diff of this commit:
cvs rdiff -u -r1.91 -r1.92 pkgsrc/ham/xlog/Makefile
cvs rdiff -u -r1.24 -r1.25 pkgsrc/ham/xlog/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/ham/xlog/patches/patch-configure
cvs rdiff -u -r1.1 -r0 pkgsrc/ham/xlog/patches/patch-src_log.c \
    pkgsrc/ham/xlog/patches/patch-src_logfile_edittest_c
cvs rdiff -u -r0 -r1.1 pkgsrc/ham/xlog/patches/patch-src_logfile_editest_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.91 pkgsrc/ham/xlog/Makefile:1.92
--- pkgsrc/ham/xlog/Makefile:1.91       Mon Aug 17 20:19:14 2020
+++ pkgsrc/ham/xlog/Makefile    Thu Feb  4 14:10:07 2021
@@ -1,13 +1,12 @@
-# $NetBSD: Makefile,v 1.91 2020/08/17 20:19:14 leot Exp $
+# $NetBSD: Makefile,v 1.92 2021/02/04 14:10:07 gdt Exp $
 #
 
-DISTNAME=      xlog-2.0.19
-PKGREVISION=   1
+DISTNAME=      xlog-2.0.20
 CATEGORIES=    ham
 MASTER_SITES=  http://download.savannah.gnu.org/releases/xlog/
 LICENSE=       gnu-gpl-v3
 
-MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
+MAINTAINER=    gdt%NetBSD.org@localhost
 HOMEPAGE=      https://www.nongnu.org/xlog/
 COMMENT=       Amateur Radio logging program
 
@@ -29,10 +28,6 @@ CWRAPPERS_APPEND.cc+=        -Wno-error=parenth
 BUILDLINK_TRANSFORM+=  rm:-Wno-stringop-truncation
 .endif
 
-# Work around https://savannah.nongnu.org/bugs/index.php?57920
-_WRAP_EXTRA_ARGS.CC+=  -Wno-deprecated-declarations
-CWRAPPERS_APPEND.cc+=  -Wno-deprecated-declarations
-
 .include "../../databases/shared-mime-info/buildlink3.mk"
 .include "../../graphics/gnome-icon-theme/buildlink3.mk"
 .include "../../ham/hamlib/buildlink3.mk"

Index: pkgsrc/ham/xlog/distinfo
diff -u pkgsrc/ham/xlog/distinfo:1.24 pkgsrc/ham/xlog/distinfo:1.25
--- pkgsrc/ham/xlog/distinfo:1.24       Wed Dec  9 10:12:14 2020
+++ pkgsrc/ham/xlog/distinfo    Thu Feb  4 14:10:07 2021
@@ -1,13 +1,12 @@
-$NetBSD: distinfo,v 1.24 2020/12/09 10:12:14 nia Exp $
+$NetBSD: distinfo,v 1.25 2021/02/04 14:10:07 gdt Exp $
 
-SHA1 (xlog-2.0.19.tar.gz) = 4ec716e741c19bd7a52308a53997a6f34ea0ca1e
-RMD160 (xlog-2.0.19.tar.gz) = 82d63f1824d27bff3364670e376cba939836f45e
-SHA512 (xlog-2.0.19.tar.gz) = b69e592f97fbfbd989378a2b74036f4a169be3ca1f5b7ba8715e3a5293f1efbdbc431b0c09a305c2ca0190953777010a9d9a9b53caea8eb26609111b4f7da40b
-Size (xlog-2.0.19.tar.gz) = 11431541 bytes
-SHA1 (patch-configure) = 53d257db7dd9185b86cd9ab8c1a3bffff7978efd
+SHA1 (xlog-2.0.20.tar.gz) = 38d7ab90dbae902581eb9e0f01ee0707458e57c8
+RMD160 (xlog-2.0.20.tar.gz) = aaf37b7184f3487735f60628457baccb573cb777
+SHA512 (xlog-2.0.20.tar.gz) = 50feaede582ea505021c5530efa702915f2ec6f64e4677055657adbaefca92b3b45b6c6fe5af8d65ed2ae38d0d0e4cda6782fa7781516b5263f738c90fb17c89
+Size (xlog-2.0.20.tar.gz) = 11437051 bytes
+SHA1 (patch-configure) = 862afdb3bb07faae6f1b84ab50398501f68ce545
 SHA1 (patch-src_callbacks_mainwindow_qsoframe_c) = 354d979f0f591039df0377e640bdc76b6d4831a4
 SHA1 (patch-src_dxcc_c) = 2fea7448ecd452064ff86ab228ec7490a0c187f3
-SHA1 (patch-src_log.c) = a7f33aebece54b97ac635883eeeddad49bdb8801
-SHA1 (patch-src_logfile_edittest_c) = 803cec0af65e359eecfea6fc9e079899999a7529
+SHA1 (patch-src_logfile_editest_c) = 803cec0af65e359eecfea6fc9e079899999a7529
 SHA1 (patch-src_logfile_logfile_c) = 92ccae2d101297365ef1cd69464edd182b142338
 SHA1 (patch-src_strptime_c) = 5471f5acc7adc16ca08d479473b424c6798bf30c

Index: pkgsrc/ham/xlog/patches/patch-configure
diff -u pkgsrc/ham/xlog/patches/patch-configure:1.1 pkgsrc/ham/xlog/patches/patch-configure:1.2
--- pkgsrc/ham/xlog/patches/patch-configure:1.1 Wed Dec  9 10:12:14 2020
+++ pkgsrc/ham/xlog/patches/patch-configure     Thu Feb  4 14:10:07 2021
@@ -1,15 +1,15 @@
-$NetBSD: patch-configure,v 1.1 2020/12/09 10:12:14 nia Exp $
+$NetBSD: patch-configure,v 1.2 2021/02/04 14:10:07 gdt Exp $
 
 Do not use -Werror.
 
---- configure.orig     2020-04-19 10:56:08.000000000 +0000
+--- configure.orig     2021-01-30 16:02:21.000000000 +0000
 +++ configure
 @@ -4476,7 +4476,7 @@ done
  
  
  if test "${ac_cv_c_compiler_gnu}" = "yes"; then
--  CFLAGS="${CFLAGS} -Wall -Wno-stringop-truncation -Wno-unused-but-set-variable -Werror"
-+  CFLAGS="${CFLAGS} -Wall -Wno-stringop-truncation -Wno-unused-but-set-variable"
+-  CFLAGS="${CFLAGS} -Wno-deprecated-declarations -Wall -Wno-stringop-truncation -Wno-unused-but-set-variable -Werror"
++  CFLAGS="${CFLAGS} -Wno-deprecated-declarations -Wall -Wno-stringop-truncation -Wno-unused-but-set-variable"
  fi
  
  

Added files:

Index: pkgsrc/ham/xlog/patches/patch-src_logfile_editest_c
diff -u /dev/null pkgsrc/ham/xlog/patches/patch-src_logfile_editest_c:1.1
--- /dev/null   Thu Feb  4 14:10:07 2021
+++ pkgsrc/ham/xlog/patches/patch-src_logfile_editest_c Thu Feb  4 14:10:07 2021
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_logfile_editest_c,v 1.1 2021/02/04 14:10:07 gdt Exp $
+
+error: array subscript has type 'char' [-Werror=char-subscripts]
+
+--- src/logfile/editest.c~     2012-11-04 00:46:05.000000000 +0900
++++ src/logfile/editest.c      2014-11-17 20:26:23.000000000 +0900
+@@ -268,7 +268,7 @@ editest_qso_foreach (LOGDB * handle,
+               break;
+               case LOCATOR:
+               /* HF logs don't have locator, but useless NR */
+-              qfield = g_strdup ( isalpha(field[0]) ? field : "");
++              qfield = g_strdup ( isalpha((unsigned char) field[0]) ? field : "");
+               break;
+             default:
+               qfield = g_strdup (field);