Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 3 Sep 2020 23:54:20 +0000 (UTC)
From:      Diane Bruce <db@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r547490 - in head/comms/wsjtx: . files
Message-ID:  <202009032354.083NsKjg011955@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: db
Date: Thu Sep  3 23:54:20 2020
New Revision: 547490
URL: https://svnweb.freebsd.org/changeset/ports/547490

Log:
  Fix build under clang-11

Modified:
  head/comms/wsjtx/Makefile
  head/comms/wsjtx/files/wsjtx.patch

Modified: head/comms/wsjtx/Makefile
==============================================================================
--- head/comms/wsjtx/Makefile	Thu Sep  3 22:34:38 2020	(r547489)
+++ head/comms/wsjtx/Makefile	Thu Sep  3 23:54:20 2020	(r547490)
@@ -2,7 +2,7 @@
 
 PORTNAME=	wsjtx
 DISTVERSION=	2.1.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	comms hamradio
 MASTER_SITES=	SF/wsjt/${PORTNAME}-${PORTVERSION}${DISTVERSIONSUFFIX}
 
@@ -30,6 +30,8 @@ USE_QT=		core gui network widgets \
 
 CMAKE_ARGS+=	-DCMAKE_PREFIX_PATH+=${LOCALBASE}/wsjtx/lib \
 		-DLOCALBASE::STRING="${LOCALBASE}"
+# for detailed debugging uncomment the next line
+#CMAKE_ARGS+=   --debug-output --trace
 PLIST_SUB+=	PORTVERSION="${PORTVERSION}"
 
 _PATCHES=	wsjtx.patch hamlib.patch
@@ -44,7 +46,7 @@ post-patch:
 
 post-build:
 	# With cmake 3.18, the patching stage in the internal build
-	# is ran again, trick it by removing the patch again.
+	# is run again, trick it by removing the patch again.
 .  for _patch in ${_PATCHES}
 	${MV} ${WRKSRC}/${_patch}.orig  ${WRKSRC}/${_patch}
 .  endfor

Modified: head/comms/wsjtx/files/wsjtx.patch
==============================================================================
--- head/comms/wsjtx/files/wsjtx.patch	Thu Sep  3 22:34:38 2020	(r547489)
+++ head/comms/wsjtx/files/wsjtx.patch	Thu Sep  3 23:54:20 2020	(r547490)
@@ -74,3 +74,15 @@
  
  // Register some useful Qt types with QMetaType
  Q_DECLARE_METATYPE (QHostAddress);
+
+--- wsjtx/lib/wsprd/jelinek.h.orig	2020-08-23 10:47:23.539369000 -0400
++++ wsjtx/lib/wsprd/jelinek.h	2020-08-23 10:40:31.539503000 -0400
+@@ -10,7 +10,7 @@
+     unsigned int jpointer;
+ };
+ 
+-struct snode *stack;
++static struct snode *stack;
+ 
+ int jelinek(unsigned int *metric,
+             unsigned int *cycles,



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202009032354.083NsKjg011955>