Skip to content

Commit

Permalink
comms/wsjtx: Stray line left in broke build
Browse files Browse the repository at this point in the history
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
  • Loading branch information
Diane Bruce authored and Diane Bruce committed Sep 12, 2023
1 parent c0df195 commit 5e3351c
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 21 deletions.
2 changes: 1 addition & 1 deletion 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}

Expand Down
33 changes: 13 additions & 20 deletions 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>
Expand All @@ -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>
Expand All @@ -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>
Expand All @@ -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 ()

Expand Down Expand Up @@ -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)
Expand All @@ -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)
Expand All @@ -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)
Expand All @@ -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
#
Expand Down Expand Up @@ -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
)
Expand Down

0 comments on commit 5e3351c

Please sign in to comment.