Update to 2.2.0.

sources

@@ -1 +1 @@
-SHA512 (wsjtx-2.1.2.tgz) = 037f0604b0a22f6d02f0979b94dd054157c96ee7a8c07284d072f87f6586901346bef1a3c7e19d367a82764dafc9f00b7d1a0929d163a46f1b249aaa3929b1a8
+SHA512 (wsjtx-2.2.0.tgz) = 7df7c80047b34097fc26b0d8c21de8b3ca27bae15602b1bb1ad117fe13f14931145bd55fcdceb86f2ee931d51285c6175f7b7cd89891b7e88c4baf7c17ed82cd

wsjtx-2.0.0-compile-fix.patch

@@ -1,8 +1,8 @@
-Index: wsjtx-2.1.2/wsjtx/CMakeLists.txt
+Index: wsjtx-2.2.0/wsjtx/CMakeLists.txt
 ===================================================================
---- wsjtx-2.1.2.orig/wsjtx/CMakeLists.txt
-+++ wsjtx-2.1.2/wsjtx/CMakeLists.txt
-@@ -850,7 +850,7 @@ find_program(ETAGS etags)
+--- wsjtx-2.2.0.orig/wsjtx/CMakeLists.txt
++++ wsjtx-2.2.0/wsjtx/CMakeLists.txt
+@@ -852,7 +852,7 @@ find_program(ETAGS etags)
  #
  # Boost
  #
@@ -11,7 +11,7 @@ Index: wsjtx-2.1.2/wsjtx/CMakeLists.txt
  if (Boost_NO_SYSTEM_PATHS)
    set (BOOST_ROOT ${PROJECT_SOURCE_DIR}/boost)
  endif ()
-@@ -869,7 +869,7 @@ find_package (FFTW3 COMPONENTS double si
+@@ -871,7 +871,7 @@ find_package (FFTW3 COMPONENTS double si
  #
  # libhamlib setup
  #
@@ -20,7 +20,7 @@ Index: wsjtx-2.1.2/wsjtx/CMakeLists.txt
  find_package (hamlib 3 REQUIRED)
  find_program (RIGCTL_EXE rigctl)
  find_program (RIGCTLD_EXE rigctld)
-@@ -1372,7 +1372,8 @@ else ()
+@@ -1395,7 +1395,8 @@ else ()
        )
    endif ()
  endif ()
@@ -30,7 +30,7 @@ Index: wsjtx-2.1.2/wsjtx/CMakeLists.txt
  
  # make a library for WSJT-X UDP servers
  # add_library (wsjtx_udp SHARED ${UDP_library_CXXSRCS})
-@@ -1393,7 +1394,7 @@ set_target_properties (wsjtx_udp-static
+@@ -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)
@@ -39,7 +39,7 @@ Index: wsjtx-2.1.2/wsjtx/CMakeLists.txt
  generate_export_header (wsjtx_udp-static BASE_NAME udp)
  
  add_executable (udp_daemon UDPExamples/UDPDaemon.cpp UDPExamples/udp_daemon.rc ${WSJTX_ICON_FILE})
-@@ -1471,27 +1472,6 @@ install (TARGETS ft8code jt65code qra64c
+@@ -1494,27 +1495,6 @@ install (TARGETS ft8code jt65code qra64c
    )
  endif(WSJT_BUILD_UTILS)  
  
@@ -67,30 +67,3 @@ Index: wsjtx-2.1.2/wsjtx/CMakeLists.txt
  install (FILES
    README
    COPYING
-Index: wsjtx-2.1.2/wsjtx/HamlibTransceiver.hpp
-===================================================================
---- wsjtx-2.1.2.orig/wsjtx/HamlibTransceiver.hpp
-+++ wsjtx-2.1.2/wsjtx/HamlibTransceiver.hpp
-@@ -1,6 +1,10 @@
- #ifndef HAMLIB_TRANSCEIVER_HPP_
- #define HAMLIB_TRANSCEIVER_HPP_
- 
-+#ifndef RIG_PASSBAND_NOCHANGE
-+#define RIG_PASSBAND_NOCHANGE RIG_PASSBAND_NORMAL
-+#endif
-+
- #include <tuple>
- 
- #include <QString>
-@@ -12,9 +16,9 @@
- 
- extern "C"
- {
--  typedef struct rig RIG;
-+  typedef struct s_rig RIG;
-   struct rig_caps;
--  typedef int vfo_t;
-+  typedef unsigned int vfo_t;
- }
- 
- // hamlib transceiver and PTT mostly delegated directly to hamlib Rig class

wsjtx.spec

@@ -1,8 +1,8 @@
 #global rctag rc6
 
 Name:           wsjtx
-Version:	2.1.2
-Release:	4%{?dist}
+Version:	2.2.0
+Release:	1%{?dist}
 Summary:	Weak Signal communication by K1JT
 License:	GPLv3+
 
@@ -10,7 +10,6 @@ URL:		http://physics.princeton.edu/pulsar/k1jt/wsjtx.html
 Source0:	http://physics.princeton.edu/pulsar/k1jt/%{name}-%{version}%{?rctag:-%{rctag}}.tgz
 
 Patch0:		wsjtx-2.0.0-compile-fix.patch
-Patch1:		wsjtx-2.1.2-gcc-10-fix.patch
 
 BuildRequires:	dos2unix, tar, cmake, gcc-c++, gcc-gfortran
 BuildRequires:  qt5-qtbase-devel
@@ -35,7 +34,6 @@ from the Moon.
 rm -f src/hamlib.tgz*
 tar -xzf src/%{name}.tgz
 %patch0 -p1
-%patch1 -p1
 
 # remove archive
 rm -f src/wsjtx.tgz*
@@ -115,6 +113,9 @@ install -p -m 0644 -t %{buildroot}%{_datadir}/doc/%{name} GUIcontrols.txt jt9.tx
 
 
 %changelog
+* Tue Jun 02 2020 Richard Shaw <hobbes1069@gmail.com> - 2.2.0-1
+- Update to 2.2.0.
+
 * Tue Mar 31 2020 Richard Shaw <hobbes1069@gmail.com> - 2.1.2-4
 - Rebuilt with hamlib 4.0.