CVS commit: pkgsrc/ham/xlog

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

Module Name:    pkgsrc
Committed By:   gdt
Date:           Fri Feb 28 17:52:13 UTC 2020

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

Log Message:
ham/xlog: Work around use of deprecated glib2 APIs


To generate a diff of this commit:
cvs rdiff -u -r1.85 -r1.86 pkgsrc/ham/xlog/Makefile
cvs rdiff -u -r1.21 -r1.22 pkgsrc/ham/xlog/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/ham/xlog/patches/patch-src_log.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.85 pkgsrc/ham/xlog/Makefile:1.86
--- pkgsrc/ham/xlog/Makefile:1.85       Fri Feb 28 15:17:03 2020
+++ pkgsrc/ham/xlog/Makefile    Fri Feb 28 17:52:13 2020
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.85 2020/02/28 15:17:03 gdt Exp $
+# $NetBSD: Makefile,v 1.86 2020/02/28 17:52:13 gdt Exp $
 #
 
 DISTNAME=      xlog-2.0.17
-PKGREVISION=   2
+PKGREVISION=   3
 CATEGORIES=    ham
 MASTER_SITES=  http://download.savannah.gnu.org/releases/xlog/
 LICENSE=       gnu-gpl-v3
@@ -26,6 +26,15 @@ _WRAP_EXTRA_ARGS.CC+=        -Wno-error=parenth
 CWRAPPERS_APPEND.cc+=  -Wno-error=parentheses-equality -Wno-error=tautological-compare -Wno-unknown-warning-option -Wno-deprecated-declarations
 .endif
 
+# Problematic with 5.5.0 on netbsd-8.
+.if !empty(PKGSRC_COMPILER:Mgcc)
+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.21 pkgsrc/ham/xlog/distinfo:1.22
--- pkgsrc/ham/xlog/distinfo:1.21       Sat Feb 23 07:31:26 2019
+++ pkgsrc/ham/xlog/distinfo    Fri Feb 28 17:52:13 2020
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.21 2019/02/23 07:31:26 mef Exp $
+$NetBSD: distinfo,v 1.22 2020/02/28 17:52:13 gdt Exp $
 
 SHA1 (xlog-2.0.17.tar.gz) = 1b82370b2a5c769efa424d116ae4d812e5fb26e9
 RMD160 (xlog-2.0.17.tar.gz) = cfce01ae8b53431b8d7feb251a00cf16dc9da9c2
@@ -6,6 +6,7 @@ SHA512 (xlog-2.0.17.tar.gz) = 0110c7b707
 Size (xlog-2.0.17.tar.gz) = 11461214 bytes
 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_logfile_c) = 92ccae2d101297365ef1cd69464edd182b142338
 SHA1 (patch-src_strptime_c) = 5471f5acc7adc16ca08d479473b424c6798bf30c

Added files:

Index: pkgsrc/ham/xlog/patches/patch-src_log.c
diff -u /dev/null pkgsrc/ham/xlog/patches/patch-src_log.c:1.1
--- /dev/null   Fri Feb 28 17:52:13 2020
+++ pkgsrc/ham/xlog/patches/patch-src_log.c     Fri Feb 28 17:52:13 2020
@@ -0,0 +1,17 @@
+$NetBSD: patch-src_log.c,v 1.1 2020/02/28 17:52:13 gdt Exp $
+
+G_CONST_RETURN has been deprecated for a long time.
+
+Not yet reported upstream.
+
+--- src/log.c.orig     2015-04-19 20:39:29.000000000 +0000
++++ src/log.c
+@@ -455,7 +455,7 @@ savelog (gpointer arg, gchar * logfile, 
+ {
+       LOGDB *lp;
+       gint i, j, k, pid, exported;
+-      G_CONST_RETURN gchar *label;
++      const gchar *label;
+       gchar *pathstr;
+       item_t *sorteditems;
+       gint fields[QSO_FIELDS], widths[QSO_FIELDS];