Attachment 168715 Details for Bug 208350 – wsjtx-1.6.0.patch

[patch] wsjtx-1.6.0.patch

wsjtx.patch (text/plain), 11.09 KB, created by takefu on 2016-03-28 08:26:40 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: takefu

Created: 2016-03-28 08:26:40 UTC

Size: 11.09 KB

patch

obsolete

>diff -dpruN /usr/ports/comms/wsjtx/Makefile ./Makefile
>--- /usr/ports/comms/wsjtx/Makefile	2015-12-24 14:31:18.000000000 +0000
>+++ ./Makefile	2016-03-28 08:23:41.000000000 +0000
>@@ -1,42 +1,40 @@
> # $FreeBSD: head/comms/wsjtx/Makefile 404367 2015-12-24 14:31:18Z db $
> 
> PORTNAME=	wsjtx
>-PORTVERSION=	1.5
>-PORTREVISION=	1
>+PORTVERSION=	1.6.0
> CATEGORIES=	comms hamradio
>-MASTER_SITES=	http://physics.princeton.edu/pulsar/K1JT/:src \
>-		http://www.physics.princeton.edu/pulsar/K1JT/wsjtx-doc/:docs \
>+MASTER_SITES=	SF/wsjt/${PORTNAME}-${DISTVERSIONPREFIX}${DISTVERSION}${DISTVERSIONSUFFIX}:src\
>+		http://physics.princeton.edu/pulsar/k1jt/:src\
>+		http://physics.princeton.edu/pulsar/k1jt/wsjtx-doc/:docs\
> 		LOCAL/db
>-DISTFILES=	wsjtx-1.5.0.tgz:src \
>-		wsjtx-main.html:docs
>+DISTFILES=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}:src\
>+		${PORTNAME}-main-${PORTVERSION}.html:docs
> 
> MAINTAINER=	hamradio@FreeBSD.org
> COMMENT=	Weak signal ham radio communication package
> 
> LICENSE=	GPLv3
> 
>-BUILD_DEPENDS=	asciidoc:${PORTSDIR}/textproc/asciidoc \
>-		xsltproc:${PORTSDIR}/textproc/libxslt \
>-		docbook-xsl>0:${PORTSDIR}/textproc/docbook-xsl
>+BUILD_DEPENDS=	a2x:${PORTSDIR}/textproc/asciidoc
> LIB_DEPENDS=	libfftw3.so:${PORTSDIR}/math/fftw3 \
> 		libfftw3f.so:${PORTSDIR}/math/fftw3-float \
> 		libhamlib.so:${PORTSDIR}/comms/hamlib
> RUN_DEPENDS=	${LOCALBASE}/bin/kvasd:${PORTSDIR}/comms/kvasd
> 
> MAKE_JOBS_UNSAFE=	yes
>-USE_QT5=	gui buildtools qmake_build widgets multimedia concurrent serialport
>+USE_GCC=	yes
> USE_GL=		yes
>-USES=		cmake compiler:c++11-lib dos2unix fortran pkgconfig
>+USE_QT5=	gui buildtools qmake_build widgets multimedia concurrent serialport
>+USES=		cmake compiler fortran pkgconfig tar:tgz
> CMAKE_ARGS+=	-DPORT_BUILDING::STRING="ON" \
> 		-DCMAKE_PREFIX_PATH+=${LOCALBASE}/wsjtx/lib
>-
>-WRKSRC=		${WRKDIR}/wsjtx
>+WRKSRC=		${WRKDIR}/${PORTNAME}
> 
> do-extract:
>-		(cd ${WRKDIR};tar xvf ${DISTDIR}/wsjtx-1.5.0.tgz)
>-		(cd ${WRKDIR};tar xvf ${WRKDIR}/wsjtx-1.5.0/src/wsjtx.tgz)
>+	${TAR} xf ${DISTDIR}/${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} -C${WRKDIR}
>+	${TAR} xf ${WRKDIR}/${PORTNAME}-${PORTVERSION}/src/wsjtx.tgz -C${WRKDIR}
> 
> post-install:
>-		${CP} ${DISTDIR}/wsjtx-main.html ${STAGEDIR}${DOCSDIR}
>+	${CP} ${DISTDIR}/wsjtx-main.html ${STAGEDIR}${DOCSDIR}
> 
> .include <bsd.port.mk>
>diff -dpruN /usr/ports/comms/wsjtx/distinfo ./distinfo
>--- /usr/ports/comms/wsjtx/distinfo	2015-11-25 20:41:55.000000000 +0000
>+++ ./distinfo	2015-12-24 02:55:01.000000000 +0000
>@@ -1,4 +1,4 @@
>-SHA256 (wsjtx-1.5.0.tgz) = 9b9d58b034ab5caa9f174eef2bf378b726d9c08cfdbfec162969ad9b4c62d016
>-SIZE (wsjtx-1.5.0.tgz) = 9477485
>-SHA256 (wsjtx-main.html) = 404a97ff469da71710c05c00460e16926483f19fbc2641dbdbd8835a49c9f539
>-SIZE (wsjtx-main.html) = 1204470
>+SHA256 (wsjtx-1.6.0.tgz) = 2dc2563827146b0009ab75f0bf45771bf2530cfcd8a341a93bc6958d238f86f2
>+SIZE (wsjtx-1.6.0.tgz) = 12537071
>+SHA256 (wsjtx-main-1.6.0.html) = 330a9bbd916888cfbab8294d4e3091749513de55eecc10ae90fc2e2d1efbfcff
>+SIZE (wsjtx-main-1.6.0.html) = 2606015
>diff -dpruN /usr/ports/comms/wsjtx/files/patch-CMakeLists.txt ./files/patch-CMakeLists.txt
>--- /usr/ports/comms/wsjtx/files/patch-CMakeLists.txt	2015-11-25 20:41:55.000000000 +0000
>+++ ./files/patch-CMakeLists.txt	2016-03-28 07:37:20.000000000 +0000
>@@ -1,4 +1,4 @@
>---- CMakeLists.txt.orig	2015-11-25 02:16:23 UTC
>+--- CMakeLists.txt.orig	2015-12-11 00:00:13 UTC
> +++ CMakeLists.txt
> @@ -93,6 +93,13 @@ if (CMAKE_BUILD_TYPE MATCHES "[Dd][Ee][B
>    set (is_debug_build 1)
>@@ -9,52 +9,43 @@
> +endif()
> +
> +if (FREEBSD)
>-+	set (WSJT_INCLUDE_KVASD Off)
>++       set (WSJT_INCLUDE_KVASD Off)
> +endif ()
>  
>  #
>  # Options & features
>-@@ -152,7 +159,14 @@ set (WSJT_BIN_DESTINATION bin)
>- set (WSJT_LIB_DESTINATION lib)
>- set (WSJT_SHARE_DESTINATION share)
>- set (WSJT_DOC_DESTINATION doc/${CMAKE_PROJECT_NAME})
>--set (WSJT_MANPAGE_DESTINATION share)
>+@@ -153,7 +160,14 @@ set (LIB_DESTINATION lib)
>+ set (SHARE_DESTINATION share)
>+ set (DOC_DESTINATION doc/${CMAKE_PROJECT_NAME})
>+ set (DATA_DESTINATION ${CMAKE_PROJECT_NAME})
>+-set (MANPAGE_DESTINATION ${SHARE_DESTINATION})
> +if (NOT FREEBSD)
> +  message (STATUS "NOT FREEBSD")
>-+  set (WSJT_MANPAGE_DESTINATION share)
>++  set (MANPAGE_DESTINATION share)
> +else()
> +  message (STATUS "FREEBSD")
>-+  set (WSJT_MANPAGE_DESTINATION "${CMAKE_INSTALL_PREFIX}" )
>++  set (MANPAGE_DESTINATION "${CMAKE_INSTALL_PREFIX}" )
> +endif()
>-+message (STATUS WSJT_MANPAGE_DESTINATION ${WSJT_MANPAGE_DESTINATION})
>- set (WSJT_PLUGIN_DESTINATION lib/plugins)
>- set (WSJT_QT_CONF_DESTINATION bin)
>++message (STATUS MANPAGE_DESTINATION ${MANPAGE_DESTINATION})
>+ set (PLUGIN_DESTINATION lib/plugins)
>+ set (QT_CONF_DESTINATION bin)
>  
>-@@ -881,7 +895,13 @@ set_target_properties (wsjtx PROPERTIES
>+@@ -937,7 +951,13 @@ set_target_properties (wsjtx PROPERTIES
>    MACOSX_BUNDLE_GUI_IDENTIFIER "org.k1jt.wsjtx"
>    )
>  
>--target_link_libraries (wsjtx wsjt_fort wsjt_cxx wsjt_qt ${hamlib_LIBRARIES} ${FFTW3_LIBRARIES})
>+-target_link_libraries (wsjtx wsjt_fort wsjt_cxx wsjt_qt ${hamlib_LIBRARIES} ${FFTW3_LIBRARIES} Qt5::Multimedia)
> +if(FREEBSD)
> +  set (extraLIBS "ltdl" "usb")
> +else()
> +  set (extraLIBS "")
> +endif()
> +
>-+target_link_libraries (wsjtx wsjt_fort wsjt_cxx wsjt_qt ${hamlib_LIBRARIES} ${extraLIBS} ${FFTW3_LIBRARIES})
>- qt5_use_modules (wsjtx Widgets OpenGL Network Multimedia SerialPort)
>++target_link_libraries (wsjtx wsjt_fort wsjt_cxx wsjt_qt ${hamlib_LIBRARIES} ${extraLIBS} ${FFTW3_LIBRARIES} Qt5::Multimedia)
>+ qt5_use_modules (wsjtx SerialPort) # not sure why the interface link library syntax above doesn't work
>  
>  add_resources (message_aggregator_RESOURCES /qss ${message_aggregator_STYLESHEETS})
>-@@ -942,7 +962,7 @@ install (TARGETS jt9 jt65code jt9code me
>-   )
>- 
>- if (WSJT_INCLUDE_KVASD)
>--  install (PROGRAMS
>-+    install (PROGRAMS
>-     ${CMAKE_BINARY_DIR}/${KVASD_BINARY}
>-     DESTINATION ${WSJT_BIN_DESTINATION} COMPONENT runtime
>-   )
>-@@ -956,20 +976,6 @@ else (WSJT_INCLUDE_KVASD)
>+@@ -1011,20 +1031,6 @@ else (WSJT_INCLUDE_KVASD)
>    endif (APPLE)
>  endif (WSJT_INCLUDE_KVASD)
>  
>diff -dpruN /usr/ports/comms/wsjtx/files/patch-Configuration ./files/patch-Configuration
>--- /usr/ports/comms/wsjtx/files/patch-Configuration	1970-01-01 00:00:00.000000000 +0000
>+++ ./files/patch-Configuration	2016-03-22 23:02:03.000000000 +0000
>@@ -0,0 +1,18 @@
>+--- Configuration.cpp.orig	2015-12-11 00:00:14 UTC
>++++ Configuration.cpp
>+@@ -2507,13 +2507,13 @@ void Configuration::impl::fill_port_comb
>+ 
>+ auto Configuration::impl::apply_calibration (Frequency f) const -> Frequency
>+ {
>+-  return std::llround (frequency_calibration_intercept_
>++  return llround (frequency_calibration_intercept_
>+                        + (1. + frequency_calibration_slope_ppm_ / 1.e6) * f);
>+ }
>+ 
>+ auto Configuration::impl::remove_calibration (Frequency f) const -> Frequency
>+ {
>+-  return std::llround ((f - frequency_calibration_intercept_)
>++  return llround ((f - frequency_calibration_intercept_)
>+                        / (1. + frequency_calibration_slope_ppm_ / 1.e6));
>+ }
>+ 
>diff -dpruN /usr/ports/comms/wsjtx/files/patch-Radio.cpp ./files/patch-Radio.cpp
>--- /usr/ports/comms/wsjtx/files/patch-Radio.cpp	2015-11-25 20:41:55.000000000 +0000
>+++ ./files/patch-Radio.cpp	2016-01-04 05:57:17.000000000 +0000
>@@ -1,17 +1,20 @@
>---- Radio.cpp.orig	2015-11-25 02:16:24 UTC
>+--- Radio.cpp.orig	2015-12-11 00:00:13 UTC
> +++ Radio.cpp
>-@@ -38,12 +38,12 @@ namespace Radio
>- 
>-   Frequency frequency (QVariant const& v, int scale)
>-   {
>--    return std::llround (v.toDouble () * std::pow (10., scale));
>-+    return llround (v.toDouble () * std::pow (10., scale));
>+@@ -33,7 +34,7 @@ namespace Radio
>+       {
>+         value = v.toDouble ();
>+       }
>+-    return std::llround (value * std::pow (10., scale));
>++    return llround (value * std::pow (10., scale));
>    }
>  
>-   FrequencyDelta frequency_delta (QVariant const& v, int scale)
>-   {
>--    return std::llround (v.toDouble () * std::pow (10., scale));
>-+    return llround (v.toDouble () * std::pow (10., scale));
>+   FrequencyDelta frequency_delta (QVariant const& v, int scale, QLocale const& locale)
>+@@ -47,7 +48,7 @@ namespace Radio
>+       {
>+         value = v.toDouble ();
>+       }
>+-    return std::llround (value * std::pow (10., scale));
>++    return llround (value * std::pow (10., scale));
>    }
>  
>  
>diff -dpruN /usr/ports/comms/wsjtx/files/patch-lib_wsprd_Makefile ./files/patch-lib_wsprd_Makefile
>--- /usr/ports/comms/wsjtx/files/patch-lib_wsprd_Makefile	1970-01-01 00:00:00.000000000 +0000
>+++ ./files/patch-lib_wsprd_Makefile	2016-03-23 02:28:23.000000000 +0000
>@@ -0,0 +1,16 @@
>+--- lib/wsprd/Makefile.orig	2015-12-11 00:00:13 UTC
>++++ lib/wsprd/Makefile
>+@@ -1,9 +1,9 @@
>+-CC = gcc
>++#CC = gcc
>+ #CC = clang
>+-FC = gfortran
>++#FC = gfortran
>+ 
>+-CFLAGS= -I/usr/include -Wall -Wno-missing-braces -O3 -ffast-math
>+-LDFLAGS = -L/usr/lib
>++CFLAGS= -Wno-missing-braces -O3 -ffast-math
>++#LDFLAGS = -L/usr/lib
>+ LIBS = -lfftw3 -lm
>+ 
>+ # Default rules
>diff -dpruN /usr/ports/comms/wsjtx/files/patch-manpages_CMakeLists.txt ./files/patch-manpages_CMakeLists.txt
>--- /usr/ports/comms/wsjtx/files/patch-manpages_CMakeLists.txt	2015-11-25 20:41:55.000000000 +0000
>+++ ./files/patch-manpages_CMakeLists.txt	2015-12-25 07:02:06.000000000 +0000
>@@ -1,4 +1,4 @@
>---- manpages/CMakeLists.txt.orig	2015-11-25 02:16:24 UTC
>+--- manpages/CMakeLists.txt.orig	2015-12-11 00:00:14 UTC
> +++ manpages/CMakeLists.txt
> @@ -1,8 +1,6 @@
>  set (ASCIIDOC_MANS
>@@ -6,6 +6,6 @@
>    man1/jt65code.1.txt
> -  man1/rigctl-wsjtx.1.txt
> -  man1/rigctld-wsjtx.1.txt
>+   man1/message_aggregator.1.txt
>    )
>  
>- find_program (A2X_EXECUTABLE NAMES a2x a2x.py)
>diff -dpruN /usr/ports/comms/wsjtx/pkg-descr ./pkg-descr
>--- /usr/ports/comms/wsjtx/pkg-descr	2015-11-25 20:41:55.000000000 +0000
>+++ ./pkg-descr	2016-03-28 08:08:24.000000000 +0000
>@@ -4,4 +4,4 @@ at VHF/UHF, as well as HF skywave propag
> fraction-of-a-second signals reflected from ionized meteor trails and
> steady signals 10 dB below the audible threshold.  
> 
>-WWW: http://physics.princeton.edu/pulsar/K1JT
>+WWW: http://physics.princeton.edu/pulsar/k1jt/wsjtx.html
>diff -dpruN /usr/ports/comms/wsjtx/pkg-plist ./pkg-plist
>--- /usr/ports/comms/wsjtx/pkg-plist	2015-11-25 20:41:55.000000000 +0000
>+++ ./pkg-plist	2016-03-28 07:41:28.000000000 +0000
>@@ -1,22 +1,28 @@
>+bin/jt4code
> bin/jt65code
>-bin/jt9code
> bin/jt9
>+bin/jt9code
> bin/message_aggregator
> bin/wsjtx
>+bin/wsprd
>+man/man1/jt4code.1.gz
> man/man1/jt65code.1.gz
>+man/man1/jt9.1.gz
> man/man1/jt9code.1.gz
>+man/man1/message_aggregator.1.gz
> man/man1/wsjtx.1.gz
>-man/man1/jt9.1.gz
>+man/man1/wsprd.1.gz
> share/applications/wsjtx.desktop
>+%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
>+%%PORTDOCS%%%%DOCSDIR%%/BUGS
>+%%PORTDOCS%%%%DOCSDIR%%/COPYING
>+%%PORTDOCS%%%%DOCSDIR%%/INSTALL
>+%%PORTDOCS%%%%DOCSDIR%%/NEWS
>+%%PORTDOCS%%%%DOCSDIR%%/README
>+%%PORTDOCS%%%%DOCSDIR%%/THANKS
>+%%PORTDOCS%%%%DOCSDIR%%/changelog.Debian.gz
>+%%PORTDOCS%%%%DOCSDIR%%/copyright
>+%%PORTDOCS%%%%DOCSDIR%%/wsjtx-main-1.6.0.html
>+%%PORTDOCS%%%%DOCSDIR%%/wsjtx-main.html
> share/pixmaps/wsjtx_icon.png
>-%%DOCSDIR%%/AUTHORS
>-%%DOCSDIR%%/BUGS
>-%%DOCSDIR%%/COPYING
>-%%DOCSDIR%%/INSTALL
>-%%DOCSDIR%%/NEWS
>-%%DOCSDIR%%/README
>-%%DOCSDIR%%/THANKS
>-%%DOCSDIR%%/changelog.Debian.gz
>-%%DOCSDIR%%/copyright
>-%%DOCSDIR%%/wsjtx-main-1.5.0.html
>-%%DOCSDIR%%/wsjtx-main.html
>+%%DATADIR%%/JPLEPH

Actions: View | Diff

Attachments on bug 208350: 168715