Attachment #242392 for bug #264831

Lines 1-6 Link Here

(-)b/comms/wsjtx/Makefile (-2 / +3 lines)
1	PORTNAME= wsjtx	1	PORTNAME= wsjtx
2	DISTVERSION= 2.5.4	2	DISTVERSION= 2.5.4
3	PORTREVISION= 6	3	PORTREVISION= 7
4	CATEGORIES= comms hamradio	4	CATEGORIES= comms hamradio
5	MASTER_SITES= SF/wsjt/${PORTNAME}-${PORTVERSION}${DISTVERSIONSUFFIX}	5	MASTER_SITES= SF/wsjt/${PORTNAME}-${PORTVERSION}${DISTVERSIONSUFFIX}
6		6
Lines 48-54 make-hamlib-patch: Link Here
48	(cd ${WRKDIR}/.build/hamlib-prefix/src;diff -u hamlib/$f.orig hamlib/$f >> ${FILESDIR}/hamlib.patch \|\| true)	48	(cd ${WRKDIR}/.build/hamlib-prefix/src;diff -u hamlib/$f.orig hamlib/$f >> ${FILESDIR}/hamlib.patch \|\| true)
49	. endfor	49	. endfor
50		50
51	_WSJTX_PATCHES= CMakeLists.txt Radio.cpp widgets/FrequencyLineEdit.cpp \	51	_WSJTX_PATCHES= wsjtx_config.h.in CMakeLists.txt Radio.cpp \
		52	widgets/FrequencyLineEdit.cpp \
52	widgets/FrequencyDeltaLineEdit.cpp \	53	widgets/FrequencyDeltaLineEdit.cpp \
53	CMake/Modules/FindUsb.cmake \	54	CMake/Modules/FindUsb.cmake \
54	CMake/Modules/FindHamlib.cmake	55	CMake/Modules/FindHamlib.cmake




--- wsjtx/wsjtx_config.h.in.orig	2021-12-28 04:31:58.000000000 -0500
+++ wsjtx/wsjtx_config.h.in	2023-05-25 08:11:05.662452000 -0400
@@ -57,16 +57,22 @@
 #	endif
 #endif
 
-  /* typedef for consistent gfortran ABI for charlen type hidden arguments */
-#if __GNUC__ > 7
-#ifdef __cplusplus
-#include <cstddef>
-#else
-#include <stddef.h>
-#endif
+
+#if (__GNUC__ > 7)
+  #ifdef __cplusplus
+    #include <cstddef>
+  #else
+    #include <stddef.h>
+  #endif
   typedef size_t fortran_charlen_t;
 #else
-  typedef int fortran_charlen_t;
+/* typedef for consistent gfortran ABI for charlen type hidden arguments */
+  #if defined(__clang__)
+    #include <stddef.h>
+    typedef size_t fortran_charlen_t;
+  #else
+    typedef int fortran_charlen_t;
+  #endif
 #endif
 
 #ifdef __cplusplus
--- wsjtx/CMakeLists.txt.orig	2021-12-28 04:31:58.000000000 -0500
+++ wsjtx/CMakeLists.txt	2023-05-25 08:05:34.633799000 -0400
@@ -41,7 +41,7 @@
 endif ()
 

 endif ()
 
 project (wsjtx
@@ -868,7 +868,7 @@
 # OpenMP
 #
 find_package (OpenMP)

 #
 # fftw3 single precision library
 #
@@ -885,7 +885,7 @@
 check_type_size (CACHE_ALL HAMLIB_OLD_CACHING)
 check_symbol_exists (rig_set_cache_timeout_ms "hamlib/rig.h" HAVE_HAMLIB_CACHING)
 

 
 #
 # Qt5 setup
@@ -915,7 +915,7 @@
 #
 set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra")
 

 
 if (NOT APPLE)
   set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-pragmas")
@@ -1161,7 +1161,7 @@
 target_link_libraries (encode77 wsjt_fort wsjt_cxx)
 
 add_executable (wsprsim ${wsprsim_CSRCS})

 
 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-05-25 08:05:34.634280000 -0400
@@ -54,7 +54,8 @@
     value *= std::pow (10., scale);
     if (ok)

           {
             value = 0.;
             *ok = false;
--- wsjtx/widgets/FrequencyLineEdit.cpp.orig	2021-12-28 04:31:58.000000000 -0500
+++ wsjtx/widgets/FrequencyLineEdit.cpp	2023-05-25 08:05:34.634693000 -0400
@@ -39,7 +39,8 @@
 FrequencyLineEdit::FrequencyLineEdit (QWidget * parent)
   : QLineEdit (parent)

 }
 
 auto FrequencyLineEdit::frequency () const -> Frequency
--- wsjtx/widgets/FrequencyDeltaLineEdit.cpp.orig	2021-12-28 04:31:58.000000000 -0500
+++ wsjtx/widgets/FrequencyDeltaLineEdit.cpp	2023-05-25 08:05:34.635086000 -0400
@@ -39,8 +39,8 @@
 FrequencyDeltaLineEdit::FrequencyDeltaLineEdit (QWidget * parent)
   : QLineEdit (parent)

 }
 
 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-05-25 08:05:34.635496000 -0400
@@ -13,25 +13,35 @@
 #  Usb::Usb	- The libusb library
 #

   Usb_LIBRARIES
   )
+endif()
--- wsjtx/CMake/Modules/FindHamlib.cmake.orig	2021-12-28 04:31:58.000000000 -0500
+++ wsjtx/CMake/Modules/FindHamlib.cmake	2023-05-25 08:05:34.635867000 -0400
@@ -18,7 +18,9 @@
   FIND_LIBRARY hamlib
   )

Return to bug 264831

Lines 1-5 Link Here

(-)b/comms/wsjtx/files/wsjtx.patch (-16 / +49 lines)
1	--- wsjtx/CMakeLists.txt.orig 2021-11-03 19:53:01.000000000 -0400	1	--- wsjtx/wsjtx_config.h.in.orig 2021-12-28 04:31:58.000000000 -0500
2	+++ wsjtx/CMakeLists.txt 2021-12-31 07:53:05.900792000 -0500	2	+++ wsjtx/wsjtx_config.h.in 2023-05-25 08:11:05.662452000 -0400
		3	@@ -57,16 +57,22 @@
		4	# endif
		5	#endif
		6
		7	- /* typedef for consistent gfortran ABI for charlen type hidden arguments */
		8	-#if __GNUC__ > 7
		9	-#ifdef __cplusplus
		10	-#include <cstddef>
		11	-#else
		12	-#include <stddef.h>
		13	-#endif
		14	+
		15	+#if (__GNUC__ > 7)
		16	+ #ifdef __cplusplus
		17	+ #include <cstddef>
		18	+ #else
		19	+ #include <stddef.h>
		20	+ #endif
		21	typedef size_t fortran_charlen_t;
		22	#else
		23	- typedef int fortran_charlen_t;
		24	+/* typedef for consistent gfortran ABI for charlen type hidden arguments */
		25	+ #if defined(__clang__)
		26	+ #include <stddef.h>
		27	+ typedef size_t fortran_charlen_t;
		28	+ #else
		29	+ typedef int fortran_charlen_t;
		30	+ #endif
		31	#endif
		32
		33	#ifdef __cplusplus
		34	--- wsjtx/CMakeLists.txt.orig 2021-12-28 04:31:58.000000000 -0500
		35	+++ wsjtx/CMakeLists.txt 2023-05-25 08:05:34.633799000 -0400
3	@@ -41,7 +41,7 @@	36	@@ -41,7 +41,7 @@
4	endif ()	37	endif ()
5		38
Lines 9-15 Link Here
9	endif ()	42	endif ()
10		43
11	project (wsjtx	44	project (wsjtx
12	@@ -867,7 +867,7 @@	45	@@ -868,7 +868,7 @@
13	# OpenMP	46	# OpenMP
14	#	47	#
15	find_package (OpenMP)	48	find_package (OpenMP)
Lines 18-24 Link Here
18	#	51	#
19	# fftw3 single precision library	52	# fftw3 single precision library
20	#	53	#
21	@@ -884,7 +884,7 @@	54	@@ -885,7 +885,7 @@
22	check_type_size (CACHE_ALL HAMLIB_OLD_CACHING)	55	check_type_size (CACHE_ALL HAMLIB_OLD_CACHING)
23	check_symbol_exists (rig_set_cache_timeout_ms "hamlib/rig.h" HAVE_HAMLIB_CACHING)	56	check_symbol_exists (rig_set_cache_timeout_ms "hamlib/rig.h" HAVE_HAMLIB_CACHING)
24		57
Lines 27-33 Link Here
27		60
28	#	61	#
29	# Qt5 setup	62	# Qt5 setup
30	@@ -914,7 +914,7 @@	63	@@ -915,7 +915,7 @@
31	#	64	#
32	set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra")	65	set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra")
33		66
Lines 36-42 Link Here
36		69
37	if (NOT APPLE)	70	if (NOT APPLE)
38	set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-pragmas")	71	set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-pragmas")
39	@@ -1160,7 +1160,7 @@	72	@@ -1161,7 +1161,7 @@
40	target_link_libraries (encode77 wsjt_fort wsjt_cxx)	73	target_link_libraries (encode77 wsjt_fort wsjt_cxx)
41		74
42	add_executable (wsprsim ${wsprsim_CSRCS})	75	add_executable (wsprsim ${wsprsim_CSRCS})
Lines 45-52 Link Here
45		78
46	add_executable (jt4code lib/jt4code.f90)	79	add_executable (jt4code lib/jt4code.f90)
47	target_link_libraries (jt4code wsjt_fort wsjt_cxx)	80	target_link_libraries (jt4code wsjt_fort wsjt_cxx)
48	--- wsjtx/Radio.cpp.orig 2021-11-03 19:53:01.000000000 -0400	81	--- wsjtx/Radio.cpp.orig 2021-12-28 04:31:58.000000000 -0500
49	+++ wsjtx/Radio.cpp 2021-12-31 07:48:03.411318000 -0500	82	+++ wsjtx/Radio.cpp 2023-05-25 08:05:34.634280000 -0400
50	@@ -54,7 +54,8 @@	83	@@ -54,7 +54,8 @@
51	value *= std::pow (10., scale);	84	value *= std::pow (10., scale);
52	if (ok)	85	if (ok)
Lines 66-73 Link Here
66	{	99	{
67	value = 0.;	100	value = 0.;
68	*ok = false;	101	*ok = false;
69	--- wsjtx/widgets/FrequencyLineEdit.cpp.orig 2021-11-03 19:53:01.000000000 -0400	102	--- wsjtx/widgets/FrequencyLineEdit.cpp.orig 2021-12-28 04:31:58.000000000 -0500
70	+++ wsjtx/widgets/FrequencyLineEdit.cpp 2021-12-31 07:48:03.411740000 -0500	103	+++ wsjtx/widgets/FrequencyLineEdit.cpp 2023-05-25 08:05:34.634693000 -0400
71	@@ -39,7 +39,8 @@	104	@@ -39,7 +39,8 @@
72	FrequencyLineEdit::FrequencyLineEdit (QWidget * parent)	105	FrequencyLineEdit::FrequencyLineEdit (QWidget * parent)
73	: QLineEdit (parent)	106	: QLineEdit (parent)
Lines 78-85 Link Here
78	}	111	}
79		112
80	auto FrequencyLineEdit::frequency () const -> Frequency	113	auto FrequencyLineEdit::frequency () const -> Frequency
81	--- wsjtx/widgets/FrequencyDeltaLineEdit.cpp.orig 2021-11-03 19:53:01.000000000 -0400	114	--- wsjtx/widgets/FrequencyDeltaLineEdit.cpp.orig 2021-12-28 04:31:58.000000000 -0500
82	+++ wsjtx/widgets/FrequencyDeltaLineEdit.cpp 2021-12-31 07:48:03.412129000 -0500	115	+++ wsjtx/widgets/FrequencyDeltaLineEdit.cpp 2023-05-25 08:05:34.635086000 -0400
83	@@ -39,8 +39,8 @@	116	@@ -39,8 +39,8 @@
84	FrequencyDeltaLineEdit::FrequencyDeltaLineEdit (QWidget * parent)	117	FrequencyDeltaLineEdit::FrequencyDeltaLineEdit (QWidget * parent)
85	: QLineEdit (parent)	118	: QLineEdit (parent)
Lines 91-98 Link Here
91	}	124	}
92		125
93	auto FrequencyDeltaLineEdit::frequency_delta () const -> FrequencyDelta	126	auto FrequencyDeltaLineEdit::frequency_delta () const -> FrequencyDelta
94	--- wsjtx/CMake/Modules/FindUsb.cmake.orig 2021-11-03 19:53:01.000000000 -0400	127	--- wsjtx/CMake/Modules/FindUsb.cmake.orig 2021-12-28 04:31:58.000000000 -0500
95	+++ wsjtx/CMake/Modules/FindUsb.cmake 2021-12-31 07:48:03.412537000 -0500	128	+++ wsjtx/CMake/Modules/FindUsb.cmake 2023-05-25 08:05:34.635496000 -0400
96	@@ -13,25 +13,35 @@	129	@@ -13,25 +13,35 @@
97	# Usb::Usb - The libusb library	130	# Usb::Usb - The libusb library
98	#	131	#
Lines 158-165 Link Here
158	Usb_LIBRARIES	191	Usb_LIBRARIES
159	)	192	)
160	+endif()	193	+endif()
161	--- wsjtx/CMake/Modules/FindHamlib.cmake.orig 2021-11-03 19:53:01.000000000 -0400	194	--- wsjtx/CMake/Modules/FindHamlib.cmake.orig 2021-12-28 04:31:58.000000000 -0500
162	+++ wsjtx/CMake/Modules/FindHamlib.cmake 2021-12-31 07:48:03.412916000 -0500	195	+++ wsjtx/CMake/Modules/FindHamlib.cmake 2023-05-25 08:05:34.635867000 -0400
163	@@ -18,7 +18,9 @@	196	@@ -18,7 +18,9 @@
164	FIND_LIBRARY hamlib	197	FIND_LIBRARY hamlib
165	)	198	)