diff options
| author | Diane Bruce <db@FreeBSD.org> | 2020-09-03 23:54:20 +0000 |
|---|---|---|
| committer | Diane Bruce <db@FreeBSD.org> | 2020-09-03 23:54:20 +0000 |
| commit | 96c7941402d77fa60fe77aea9d35e09108d334b7 (patch) | |
| tree | 9f96dbc0ac7f7665b8ce0581ffd9f91ad4331f54 /comms/wsjtx | |
| parent | 81750cabf0f1cd84c96a0900ef9cb702ed1704bf (diff) | |
| download | ports-96c7941402d77fa60fe77aea9d35e09108d334b7.tar.gz ports-96c7941402d77fa60fe77aea9d35e09108d334b7.zip | |
Fix build under clang-11
Notes
Notes:
svn path=/head/; revision=547490
Diffstat (limited to 'comms/wsjtx')
| -rw-r--r-- | comms/wsjtx/Makefile | 6 | ||||
| -rw-r--r-- | comms/wsjtx/files/wsjtx.patch | 12 |
2 files changed, 16 insertions, 2 deletions
diff --git a/comms/wsjtx/Makefile b/comms/wsjtx/Makefile index 5435e0774176..d3eb970450f4 100644 --- a/comms/wsjtx/Makefile +++ b/comms/wsjtx/Makefile @@ -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 diff --git a/comms/wsjtx/files/wsjtx.patch b/comms/wsjtx/files/wsjtx.patch index 19472884f7a7..73f987d12565 100644 --- a/comms/wsjtx/files/wsjtx.patch +++ b/comms/wsjtx/files/wsjtx.patch @@ -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, |