summaryrefslogtreecommitdiff
path: root/ham
diff options
context:
space:
mode:
authorgdt <gdt@pkgsrc.org>2020-02-28 17:52:13 +0000
committergdt <gdt@pkgsrc.org>2020-02-28 17:52:13 +0000
commitc24dc7b88852d4199a191cde2d6ce2db619ad1ca (patch)
tree20c1e759202a37b4514e947a9c53360d1f4ebf03 /ham
parent44df21312019269abd393cad7b58e3aed312c5c4 (diff)
downloadpkgsrc-c24dc7b88852d4199a191cde2d6ce2db619ad1ca.tar.gz
ham/xlog: Work around use of deprecated glib2 APIs
Diffstat (limited to 'ham')
-rw-r--r--ham/xlog/Makefile13
-rw-r--r--ham/xlog/distinfo3
-rw-r--r--ham/xlog/patches/patch-src_log.c17
3 files changed, 30 insertions, 3 deletions
diff --git a/ham/xlog/Makefile b/ham/xlog/Makefile
index 54839fe354f..28c8239164c 100644
--- a/ham/xlog/Makefile
+++ b/ham/xlog/Makefile
@@ -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=parentheses-equality -Wno-error=tautological-co
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"
diff --git a/ham/xlog/distinfo b/ham/xlog/distinfo
index fa7060388a4..aabff2359f5 100644
--- a/ham/xlog/distinfo
+++ b/ham/xlog/distinfo
@@ -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) = 0110c7b70794aaeded939040e9baf3093d06122ec35e7bec25
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
diff --git a/ham/xlog/patches/patch-src_log.c b/ham/xlog/patches/patch-src_log.c
new file mode 100644
index 00000000000..51193e78e67
--- /dev/null
+++ b/ham/xlog/patches/patch-src_log.c
@@ -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];