Date: Tue, 12 Sep 2023 10:52:08 GMT From: Diane Bruce <db@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 5e3351caf5c6 - main - comms/wsjtx: Stray line left in broke build Message-ID: <202309121052.38CAq8wp081873@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by db: URL: https://cgit.FreeBSD.org/ports/commit/?id=5e3351caf5c6df3fb50c2e0493b4debc7842026a commit 5e3351caf5c6df3fb50c2e0493b4debc7842026a Author: Diane Bruce <db@FreeBSD.org> AuthorDate: 2023-09-12 10:43:04 +0000 Commit: Diane Bruce <db@FreeBSD.org> CommitDate: 2023-09-12 10:43:04 +0000 comms/wsjtx: Stray line left in broke build wsjtx has it's own patch system which is hard to work with. I goofed and somehow left a line in which broke the build completely. :-( PR: ports/262937 --- comms/wsjtx/Makefile | 2 +- comms/wsjtx/files/wsjtx.patch | 33 +++++++++++++-------------------- 2 files changed, 14 insertions(+), 21 deletions(-) diff --git a/comms/wsjtx/Makefile b/comms/wsjtx/Makefile index 6b7b0decbf5b..da0ada6fbe6e 100644 --- a/comms/wsjtx/Makefile +++ b/comms/wsjtx/Makefile @@ -1,6 +1,6 @@ PORTNAME= wsjtx DISTVERSION= 2.5.4 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= comms hamradio MASTER_SITES= SF/wsjt/${PORTNAME}-${PORTVERSION}${DISTVERSIONSUFFIX} diff --git a/comms/wsjtx/files/wsjtx.patch b/comms/wsjtx/files/wsjtx.patch index 4cd6321db885..36015bda3556 100644 --- a/comms/wsjtx/files/wsjtx.patch +++ b/comms/wsjtx/files/wsjtx.patch @@ -1,17 +1,10 @@ ---- wsjtx/wsjtx_config.h.in.orig 2023-09-03 10:51:04.025598000 -0400 -+++ wsjtx/wsjtx_config.h.in 2023-09-03 10:51:06.011258000 -0400 -@@ -18,7 +18,6 @@ - - #cmakedefine CMAKE_INSTALL_DATAROOTDIR "@CMAKE_INSTALL_DATAROOTDIR@" - #cmakedefine CMAKE_INSTALL_DOCDIR "@CMAKE_INSTALL_DOCDIR@" --#cmakedefine CMAKE_INSTALL_DATADIR "@CMAKE_INSTALL_DATADIR@" - #cmakedefine CMAKE_PROJECT_NAME "@CMAKE_PROJECT_NAME@" - #cmakedefine PROJECT_VENDOR "@PROJECT_VENDOR@" - #cmakedefine PROJECT_NAME "@PROJECT_NAME@" -@@ -58,16 +57,23 @@ +--- wsjtx/wsjtx_config.h.in.orig 2021-12-28 04:31:58.000000000 -0500 ++++ wsjtx/wsjtx_config.h.in 2023-09-10 09:55:54.397156000 -0400 +@@ -57,17 +57,22 @@ + # endif #endif - /* typedef for consistent gfortran ABI for charlen type hidden arguments */ +- /* typedef for consistent gfortran ABI for charlen type hidden arguments */ -#if __GNUC__ > 7 -#ifdef __cplusplus -#include <cstddef> @@ -20,6 +13,8 @@ -#endif - typedef size_t fortran_charlen_t; -#else +- typedef int fortran_charlen_t; +-#endif +#if (__GNUC__ > 7) + #ifdef __cplusplus + #include <cstddef> @@ -28,8 +23,6 @@ + #endif + typedef size_t fortran_charlen_t; + #else - typedef int fortran_charlen_t; --#endif +/* typedef for consistent gfortran ABI for charlen type hidden arguments */ + #if defined(__clang__) + #include <stddef.h> @@ -42,7 +35,7 @@ #ifdef __cplusplus } --- wsjtx/CMakeLists.txt.orig 2021-12-28 04:31:58.000000000 -0500 -+++ wsjtx/CMakeLists.txt 2023-09-03 10:35:34.257208000 -0400 ++++ wsjtx/CMakeLists.txt 2023-09-10 09:39:14.606813000 -0400 @@ -41,7 +41,7 @@ endif () @@ -89,7 +82,7 @@ add_executable (jt4code lib/jt4code.f90) target_link_libraries (jt4code wsjt_fort wsjt_cxx) --- wsjtx/Radio.cpp.orig 2021-12-28 04:31:58.000000000 -0500 -+++ wsjtx/Radio.cpp 2023-09-03 10:35:34.257683000 -0400 ++++ wsjtx/Radio.cpp 2023-09-10 09:39:14.607286000 -0400 @@ -54,7 +54,8 @@ value *= std::pow (10., scale); if (ok) @@ -110,7 +103,7 @@ value = 0.; *ok = false; --- wsjtx/widgets/FrequencyLineEdit.cpp.orig 2021-12-28 04:31:58.000000000 -0500 -+++ wsjtx/widgets/FrequencyLineEdit.cpp 2023-09-03 10:35:34.258093000 -0400 ++++ wsjtx/widgets/FrequencyLineEdit.cpp 2023-09-10 09:39:14.607697000 -0400 @@ -39,7 +39,8 @@ FrequencyLineEdit::FrequencyLineEdit (QWidget * parent) : QLineEdit (parent) @@ -122,7 +115,7 @@ auto FrequencyLineEdit::frequency () const -> Frequency --- wsjtx/widgets/FrequencyDeltaLineEdit.cpp.orig 2021-12-28 04:31:58.000000000 -0500 -+++ wsjtx/widgets/FrequencyDeltaLineEdit.cpp 2023-09-03 10:35:34.258484000 -0400 ++++ wsjtx/widgets/FrequencyDeltaLineEdit.cpp 2023-09-10 09:39:14.608093000 -0400 @@ -39,8 +39,8 @@ FrequencyDeltaLineEdit::FrequencyDeltaLineEdit (QWidget * parent) : QLineEdit (parent) @@ -135,7 +128,7 @@ auto FrequencyDeltaLineEdit::frequency_delta () const -> FrequencyDelta --- wsjtx/CMake/Modules/FindUsb.cmake.orig 2021-12-28 04:31:58.000000000 -0500 -+++ wsjtx/CMake/Modules/FindUsb.cmake 2023-09-03 10:35:34.258886000 -0400 ++++ wsjtx/CMake/Modules/FindUsb.cmake 2023-09-10 09:39:14.608507000 -0400 @@ -13,25 +13,35 @@ # Usb::Usb - The libusb library # @@ -202,7 +195,7 @@ ) +endif() --- wsjtx/CMake/Modules/FindHamlib.cmake.orig 2021-12-28 04:31:58.000000000 -0500 -+++ wsjtx/CMake/Modules/FindHamlib.cmake 2023-09-03 10:35:34.259262000 -0400 ++++ wsjtx/CMake/Modules/FindHamlib.cmake 2023-09-10 09:39:14.608876000 -0400 @@ -18,7 +18,9 @@ FIND_LIBRARY hamlib )
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202309121052.38CAq8wp081873>