From 6417b034311f80f9170c7fdd0c02ef8916b42275 Mon Sep 17 00:00:00 2001
From: Luke Sandell <lasandell@gmail.com>
Date: Sat, 10 Aug 2019 18:54:55 -0500
Subject: [PATCH] wsjtx: 2.0.1 -> 2.1.0

---
 pkgs/applications/radio/wsjtx/default.nix | 16 ++++++++--------
 pkgs/applications/radio/wsjtx/wsjtx.patch | 11 ++++++-----
 2 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/pkgs/applications/radio/wsjtx/default.nix b/pkgs/applications/radio/wsjtx/default.nix
index 6e287b571d75..212f93fb093d 100644
--- a/pkgs/applications/radio/wsjtx/default.nix
+++ b/pkgs/applications/radio/wsjtx/default.nix
@@ -1,22 +1,22 @@
 { stdenv, fetchurl, asciidoc, asciidoctor, autoconf, automake, cmake,
-  docbook_xsl, fftw, fftwFloat, gfortran, libtool, qtbase,
-  qtmultimedia, qtserialport, texinfo, libusb1 }:
+  docbook_xsl, fftw, fftwFloat, gfortran, libtool, libusb1, qtbase,
+  qtmultimedia, qtserialport, qttools, texinfo }:
 
 stdenv.mkDerivation rec {
   name = "wsjtx-${version}";
-  version = "2.0.1";
+  version = "2.1.0";
 
   # This is a "superbuild" tarball containing both wsjtx and a hamlib fork
   src = fetchurl {
     url = "http://physics.princeton.edu/pulsar/k1jt/wsjtx-${version}.tgz";
-    sha256 = "1kd0w57i9d9srbbfacza491vah8wa8100zjzzwqwdv70yy9qzw8q";
+    sha256 = "04flhyfw0djnnbrzh3f5lx06bnn92khchz3bmswk8if8n8j58v4y";
   };
 
   # Hamlib builds with autotools, wsjtx builds with cmake
   # Omitting pkgconfig because it causes issues locating the built hamlib
   nativeBuildInputs = [
     asciidoc asciidoctor autoconf automake cmake docbook_xsl gfortran libtool
-    texinfo
+    qttools texinfo
   ];
   buildInputs = [ fftw fftwFloat libusb1 qtbase qtmultimedia qtserialport ];
 
@@ -29,8 +29,8 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "Weak-signal digital communication modes for amateur radio";
     longDescription = ''
-      WSJT-X implements communication protocols or "modes" called FT8, JT4, JT9,
-      JT65, QRA64, ISCAT, MSK144, and WSPR, as well as one called Echo for
+      WSJT-X implements communication protocols or "modes" called FT4, FT8, JT4,
+      JT9, JT65, QRA64, ISCAT, MSK144, and WSPR, as well as one called Echo for
       detecting and measuring your own radio signals reflected from the Moon.
       These modes were all designed for making reliable, confirmed ham radio
       contacts under extreme weak-signal conditions.
@@ -39,6 +39,6 @@ stdenv.mkDerivation rec {
     # Older licenses are for the statically-linked hamlib
     license = with licenses; [ gpl3Plus gpl2Plus lgpl21Plus ];
     platforms = platforms.linux;
-    maintainers = [ maintainers.lasandell ];
+    maintainers = with maintainers; [ lasandell ];
   };
 }
diff --git a/pkgs/applications/radio/wsjtx/wsjtx.patch b/pkgs/applications/radio/wsjtx/wsjtx.patch
index e92b420e58a4..fd7c40fdc13d 100644
--- a/pkgs/applications/radio/wsjtx/wsjtx.patch
+++ b/pkgs/applications/radio/wsjtx/wsjtx.patch
@@ -2,11 +2,12 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt
 index 3e7e816b..e7dbb14a 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -860,6 +860,7 @@ find_package (Qt5Widgets 5 REQUIRED)
- find_package (Qt5Multimedia 5 REQUIRED)
- find_package (Qt5PrintSupport 5 REQUIRED)
- find_package (Qt5Sql 5 REQUIRED)
-+find_package (Qt5SerialPort 5 REQUIRED)
+@@ -885,6 +885,6 @@
+ #
+ 
+ # Widgets finds its own dependencies.
+-find_package (Qt5 COMPONENTS Widgets Multimedia PrintSupport Sql LinguistTools REQUIRED)
++find_package (Qt5 COMPONENTS Widgets Multimedia PrintSupport Sql LinguistTools SerialPort REQUIRED)
  
  if (WIN32)
    add_definitions (-DQT_NEEDS_QTMAIN)