diff options
| author | joerg <joerg> | 2014-12-23 18:52:54 +0000 |
|---|---|---|
| committer | joerg <joerg> | 2014-12-23 18:52:54 +0000 |
| commit | d5e68e221846f3050dc97e374ed5e123384605ce (patch) | |
| tree | 3ea6eda5b2642546f7b7b2e2199d004f3c1a04a3 /ham | |
| parent | c2ce2ce46ff7be4ed0bddefac38ba8ce907cd332 (diff) | |
| download | pkgsrc-d5e68e221846f3050dc97e374ed5e123384605ce.tar.gz | |
Fix build with clang.
Diffstat (limited to 'ham')
| -rw-r--r-- | ham/xlog/Makefile | 9 | ||||
| -rw-r--r-- | ham/xlog/distinfo | 3 | ||||
| -rw-r--r-- | ham/xlog/patches/patch-src_logfile_adif2.c | 13 |
3 files changed, 23 insertions, 2 deletions
diff --git a/ham/xlog/Makefile b/ham/xlog/Makefile index 18cdef9ee80..ed20704b9ec 100644 --- a/ham/xlog/Makefile +++ b/ham/xlog/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.62 2014/12/15 08:36:40 mef Exp $ +# $NetBSD: Makefile,v 1.63 2014/12/23 18:52:54 joerg Exp $ # DISTNAME= xlog-2.0.12 @@ -18,6 +18,13 @@ USE_TOOLS+= gmake pkg-config CONFIGURE_ARGS+= --enable-hamlib +.include "../../mk/compiler.mk" +.if !empty(PKGSRC_COMPILER:Mclang) +BUILDLINK_TRANSFORM+= rm:-Wno-unused-but-set-variable +_WRAP_EXTRA_ARGS.CC+= -Wno-error=parentheses-equality -Wno-error=tautological-compare +CWRAPPERS_APPEND.cc+= -Wno-error=parentheses-equality -Wno-error=tautological-compare +.endif + .include "../../databases/shared-mime-info/buildlink3.mk" .include "../../ham/hamlib/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" diff --git a/ham/xlog/distinfo b/ham/xlog/distinfo index ed0a022970c..229c014794a 100644 --- a/ham/xlog/distinfo +++ b/ham/xlog/distinfo @@ -1,10 +1,11 @@ -$NetBSD: distinfo,v 1.15 2014/12/15 08:36:40 mef Exp $ +$NetBSD: distinfo,v 1.16 2014/12/23 18:52:54 joerg Exp $ SHA1 (xlog-2.0.12.tar.gz) = d63c200f388720e4cb594be6d8d2925b0df0511a RMD160 (xlog-2.0.12.tar.gz) = b597452ae9468517da2c263c3f4dfcdf1702aecd Size (xlog-2.0.12.tar.gz) = 11396005 bytes SHA1 (patch-src_callbacks_mainwindow_qsoframe_c) = 354d979f0f591039df0377e640bdc76b6d4831a4 SHA1 (patch-src_dxcc_c) = 2fea7448ecd452064ff86ab228ec7490a0c187f3 +SHA1 (patch-src_logfile_adif2.c) = 19c52c20d2bb0c86fc489691a8bd996c14f6e03f 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_logfile_adif2.c b/ham/xlog/patches/patch-src_logfile_adif2.c new file mode 100644 index 00000000000..7dd95566fce --- /dev/null +++ b/ham/xlog/patches/patch-src_logfile_adif2.c @@ -0,0 +1,13 @@ +$NetBSD: patch-src_logfile_adif2.c,v 1.1 2014/12/23 18:52:54 joerg Exp $ + +--- src/logfile/adif2.c.orig 2014-12-23 17:34:08.000000000 +0000 ++++ src/logfile/adif2.c +@@ -56,8 +56,6 @@ extern preferencestype preferences; + */ + static const gint adif_fields[] = { DATE, GMT, CALL, BAND, MODE, RST, MYRST, + QSLOUT, QSLIN, REMARKS, POWER, GMTEND, NAME, QTH, LOCATOR, U1, U2 }; +-static const gint adif_widths[] = { 15, 8, 15, 15, 8, 8, 8, 8, 8, 80, 8, 8, 8, +- 8, 6, 8, 8 }; + static const gint adif_field_nr = 17; + + static LOGDB *adif_handle; |