From b8975a7078e9ac0f5d1419e7fbbe8d8d26119d6c Mon Sep 17 00:00:00 2001 From: Richard Shaw Date: Jun 22 2020 16:11:32 +0000 Subject: Update to 2.2.2. --- diff --git a/sources b/sources index d6c6d47..099c406 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wsjtx-2.2.1.tgz) = bb0b1003cfd346e582f2352eb1b36af0391d61621fb61d4efb673138417bbaf886ee4b12be5918111b51b647f2b8890fc3d2d1dce0b91baada46db8059118f66 +SHA512 (wsjtx-2.2.2.tgz) = 923df18f5cbbd3e40294ccc4d3730f40c13c7777345723b9e66063ff0dd7db65caa9a64323711201a73b8c455dc1c29f67e4645dfbf98e0fc2c60a1630ce6cd1 diff --git a/wsjtx-2.0.0-compile-fix.patch b/wsjtx-2.0.0-compile-fix.patch index 022d7c3..f442c25 100644 --- a/wsjtx-2.0.0-compile-fix.patch +++ b/wsjtx-2.0.0-compile-fix.patch @@ -1,7 +1,7 @@ -Index: wsjtx-2.2.0/wsjtx/CMakeLists.txt +Index: wsjtx-2.2.2/wsjtx/CMakeLists.txt =================================================================== ---- wsjtx-2.2.0.orig/wsjtx/CMakeLists.txt -+++ wsjtx-2.2.0/wsjtx/CMakeLists.txt +--- wsjtx-2.2.2.orig/wsjtx/CMakeLists.txt ++++ wsjtx-2.2.2/wsjtx/CMakeLists.txt @@ -852,7 +852,7 @@ find_program(ETAGS etags) # # Boost @@ -20,26 +20,7 @@ Index: wsjtx-2.2.0/wsjtx/CMakeLists.txt find_package (hamlib 3 REQUIRED) find_program (RIGCTL_EXE rigctl) find_program (RIGCTLD_EXE rigctld) -@@ -1395,7 +1395,8 @@ else () - ) - endif () - endif () --qt5_use_modules (wsjtx SerialPort) # not sure why the interface link library syntax above doesn't work -+find_package(Qt5SerialPort) -+target_link_libraries (wsjtx Qt5::SerialPort) # not sure why the interface link library syntax above doesn't work - - # make a library for WSJT-X UDP servers - # add_library (wsjtx_udp SHARED ${UDP_library_CXXSRCS}) -@@ -1416,7 +1417,7 @@ set_target_properties (wsjtx_udp-static - ) - target_compile_definitions (wsjtx_udp-static PUBLIC UDP_STATIC_DEFINE) - #qt5_use_modules (wsjtx_udp Network) --qt5_use_modules (wsjtx_udp-static Network Gui) -+target_link_libraries (wsjtx_udp-static Qt5::Network Qt5::Gui) - generate_export_header (wsjtx_udp-static BASE_NAME udp) - - add_executable (udp_daemon UDPExamples/UDPDaemon.cpp UDPExamples/udp_daemon.rc ${WSJTX_ICON_FILE}) -@@ -1494,27 +1495,6 @@ install (TARGETS ft8code jt65code qra64c +@@ -1491,27 +1491,6 @@ install (TARGETS ft8code jt65code qra64c ) endif(WSJT_BUILD_UTILS) diff --git a/wsjtx.spec b/wsjtx.spec index 5539318..9d46ba3 100644 --- a/wsjtx.spec +++ b/wsjtx.spec @@ -1,7 +1,7 @@ #global rctag rc6 Name: wsjtx -Version: 2.2.1 +Version: 2.2.2 Release: 1%{?dist} Summary: Weak Signal communication by K1JT License: GPLv3+ @@ -113,6 +113,9 @@ install -p -m 0644 -t %{buildroot}%{_datadir}/doc/%{name} GUIcontrols.txt jt9.tx %changelog +* Mon Jun 22 2020 Richard Shaw - 2.2.2-1 +- Update to 2.2.2. + * Sat Jun 06 2020 Richard Shaw - 2.2.1-1 - Update to 2.2.1.