summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorNeal2020-11-15 10:34:33 -0600
committerNeal2020-11-15 10:34:33 -0600
commit690c29d50f607c8812d78ca104ec769800506441 (patch)
treea88513a3057e37b96a959ae84c3c8455be5ba038
parenta8b9847a060d03f9e13f42d582973b66e9bb943e (diff)
downloadaur-690c29d50f607c8812d78ca104ec769800506441.tar.gz
Update patch so it doesn't fail
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD6
-rw-r--r--wsjtx.patch49
3 files changed, 12 insertions, 49 deletions
diff --git a/.SRCINFO b/.SRCINFO
index c379344a9cf..3b4c112e3d6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = wsjtx-git
pkgdesc = Software for Amateur Radio Weak-Signal Communication (JT9 and JT65)
- pkgver = r5497.0068f9bc
- pkgrel = 2
+ pkgver = r6921.4c05f80a2
+ pkgrel = 1
url = http://physics.princeton.edu/pulsar/k1jt/wsjtx.html
arch = i686
arch = x86_64
@@ -24,7 +24,7 @@ pkgbase = wsjtx-git
source = git+https://git.code.sf.net/p/wsjt/wsjtx/#tag=master
source = wsjtx.patch
md5sums = SKIP
- md5sums = 337acf49878ae0f9980c2c9c9a0b7d7b
+ md5sums = 4a6220d2a93011fff9057046a15a43c0
pkgname = wsjtx-git
diff --git a/PKGBUILD b/PKGBUILD
index 4294cdc1698..68240a0b0c5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,8 +2,8 @@
# Contributor: Thomas Gatzweiler <thomas.gatzweiler@gmail.com> wsjtx-svn maintainer
pkgname=wsjtx-git
-pkgver=r5497.0068f9bc
-pkgrel=2
+pkgver=r6921.4c05f80a2
+pkgrel=1
pkgdesc='Software for Amateur Radio Weak-Signal Communication (JT9 and JT65)'
# change _wsjtx_tag to other versions such as wsjtx-2.1.0-rc5
_wsjtx_tag=master
@@ -17,7 +17,7 @@ conflicts=('wsjtx')
source=("git+https://git.code.sf.net/p/wsjt/wsjtx/#tag=$_wsjtx_tag"
"wsjtx.patch")
md5sums=('SKIP'
- '337acf49878ae0f9980c2c9c9a0b7d7b')
+ '4a6220d2a93011fff9057046a15a43c0')
pkgver() {
cd "$srcdir/${pkgname%-git}"
diff --git a/wsjtx.patch b/wsjtx.patch
index 1d19a1bca12..3298406ccf3 100644
--- a/wsjtx.patch
+++ b/wsjtx.patch
@@ -1,6 +1,8 @@
---- CMakeLists.txt 2019-05-27 12:15:30.212133672 -0500
-+++ CMakeLists.txt 2019-05-27 12:16:01.995437956 -0500
-@@ -845,7 +845,7 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 72c38fa13..8a876da64 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -854,7 +854,7 @@ find_package (FFTW3 COMPONENTS single threads REQUIRED)
# libhamlib setup
#
set (hamlib_STATIC 1)
@@ -9,27 +11,7 @@
find_program (RIGCTL_EXE rigctl)
find_program (RIGCTLD_EXE rigctld)
find_program (RIGCTLCOM_EXE rigctlcom)
-@@ -1305,7 +1305,8 @@
- )
- 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)
-
- # make a library for WSJT-X UDP servers
- # add_library (wsjtx_udp SHARED ${UDP_library_CXXSRCS})
-@@ -1326,7 +1327,8 @@
- )
- 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})
-@@ -1418,13 +1420,6 @@
+@@ -1549,13 +1549,6 @@ install (PROGRAMS
RENAME rigctld-wsjtx${CMAKE_EXECUTABLE_SUFFIX}
)
@@ -43,22 +25,3 @@
install (FILES
README
COPYING
-
---- a/qt_helpers.hpp 2019-11-26 09:22:32.000000000 -0500
-+++ b/qt_helpers.hpp 2020-02-03 11:30:07.488214336 -0500
-@@ -83,6 +83,7 @@
- // std::hash<> specialization for QString based on the dbj2
- // algorithm <http://www.cse.yorku.ca/~oz/hash.html> because qHash()
- // is poor on 64-bit platforms due to being a 32-bit hash value
-+ #if QT_VERSION < QT_VERSION_CHECK(5, 14, 0)
- template<>
- struct hash<QString>
- {
-@@ -96,6 +97,7 @@
- return hash;
- }
- };
-+#endif
- }
-
- // Register some useful Qt types with QMetaType