trustedQSL: Update to 2.5.7

This is basically a bugfix release.

Some patches are overtaken by upstream events.

5 files changed, 16 insertions, 58 deletions

diff --git a/ham/trustedQSL/Makefile b/ham/trustedQSL/Makefile
index 8c19f68bf3e..1522795391d 100644
--- a/ham/trustedQSL/Makefile
+++ b/ham/trustedQSL/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.54 2021/05/24 19:52:29 wiz Exp $
+# $NetBSD: Makefile,v 1.55 2021/06/24 00:09:06 gdt Exp $
 
-DISTNAME=		tqsl-2.5.1
-PKGREVISION=		7
+DISTNAME=		tqsl-2.5.7
 CATEGORIES=		ham
 MASTER_SITES=		http://www.arrl.org/files/file/LoTW%20Instructions/
 
@@ -34,6 +33,8 @@ SUBST_STAGE.lib-suffix=		pre-configure
 SUBST_FILES.lib-suffix=		src/CMakeLists.txt
 SUBST_SED.lib-suffix=		-e s/\$${\LIB_SUFFIX\}//
 
+CHECK_PORTABILITY_SKIP+=	osx_createdmg.sh
+
 do-configure:
 	(cd ${WRKSRC} ; \
 	cmake \
diff --git a/ham/trustedQSL/PLIST b/ham/trustedQSL/PLIST
index 58c91af9653..1a7c6ddb36d 100644
--- a/ham/trustedQSL/PLIST
+++ b/ham/trustedQSL/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2019/04/30 13:22:09 mef Exp $
+@comment $NetBSD: PLIST,v 1.9 2021/06/24 00:09:06 gdt Exp $
 bin/tqsl
 include/adif.h
 include/cabrillo.h
@@ -86,6 +86,7 @@ share/TrustedQSL/help/tqslapp/pref-cab.htm
 share/TrustedQSL/help/tqslapp/pref-cab1.bmp
 share/TrustedQSL/help/tqslapp/pref-cab2.bmp
 share/TrustedQSL/help/tqslapp/pref-cab3.bmp
+share/TrustedQSL/help/tqslapp/pref-log.htm
 share/TrustedQSL/help/tqslapp/pref-opt.bmp
 share/TrustedQSL/help/tqslapp/pref-opt.htm
 share/TrustedQSL/help/tqslapp/primary.htm
diff --git a/ham/trustedQSL/distinfo b/ham/trustedQSL/distinfo
index 2350c7172ab..d0765e6dd2c 100644
--- a/ham/trustedQSL/distinfo
+++ b/ham/trustedQSL/distinfo
@@ -1,11 +1,10 @@
-$NetBSD: distinfo,v 1.19 2020/03/16 16:43:22 gdt Exp $
+$NetBSD: distinfo,v 1.20 2021/06/24 00:09:06 gdt Exp $
 
-SHA1 (tqsl-2.5.1.tar.gz) = 59f01749e56ab4bbf79b2ecdeac633b591b4cf08
-RMD160 (tqsl-2.5.1.tar.gz) = 2c7bdec9e1881850ef8849f020d25156e861c32e
-SHA512 (tqsl-2.5.1.tar.gz) = 35f699da45a02851956a1abb800919b4fa8ce78dd4fb67e0a3dc480816f7018c85b543d751a2f53b040fcf6c6b46e2b84cc42e46c7efc1096546b74f45b81d25
-Size (tqsl-2.5.1.tar.gz) = 3362342 bytes
+SHA1 (tqsl-2.5.7.tar.gz) = 49d718b76735906ee3e1a6bc86fc6f435687a993
+RMD160 (tqsl-2.5.7.tar.gz) = a9c184ced044921002cfb749e604ac3f3a4b53ae
+SHA512 (tqsl-2.5.7.tar.gz) = 8ce29ce1a4905590250037e9487fac6db2be590b0406b2c0452b533c28d2c7b804d26b4879b065a99670c24124ff6bdfad1c24c099a75237e5013b7b5bd8470d
+Size (tqsl-2.5.7.tar.gz) = 3526972 bytes
 SHA1 (patch-CMakeLists.txt) = db7383ea82b2cb05abfcd61430c68c90bca1b81b
-SHA1 (patch-apps_CMakeLists.txt) = 5063cf616a65e6d5650e946fd0929759ad04c9c0
-SHA1 (patch-apps_tqsl_cpp) = bb25d35498320f308538a84881ff1a8dd7c86f32
+SHA1 (patch-apps_tqsl_cpp) = 9b6459e01541708354a5bf895e73c124a7fea26d
 SHA1 (patch-openssl__cert.cpp) = 158c7086014f9cef05835beb1fb9aa52f091343f
 SHA1 (patch-src_tqslconvert_cpp) = 4c64c9ad063090fb25fa4869964838c00f2db620
diff --git a/ham/trustedQSL/patches/patch-apps_CMakeLists.txt b/ham/trustedQSL/patches/patch-apps_CMakeLists.txt
deleted file mode 100644
index 67af8116160..00000000000
--- a/ham/trustedQSL/patches/patch-apps_CMakeLists.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-$NetBSD: patch-apps_CMakeLists.txt,v 1.6 2016/04/21 12:26:19 jperkin Exp $
-
-(1) Avoid ${WRKSRC} included in RPATH.
-
---- apps/CMakeLists.txt.orig	2016-03-12 05:49:01.000000000 +0000
-+++ apps/CMakeLists.txt
-@@ -120,8 +120,8 @@ if(APPLE)
- endif()
- 
- if(NOT WIN32) #rpath setup
--	SET(CMAKE_SKIP_BUILD_RPATH  FALSE)
--	SET(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE) 
-+	SET(CMAKE_SKIP_BUILD_RPATH TRUE)
-+	SET(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE) 
- 	SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
- 	SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
- endif()
-@@ -149,9 +149,9 @@ if(NOT APPLE AND NOT WIN32)
- 	install(TARGETS tqsl DESTINATION bin)
- 	install(DIRECTORY help DESTINATION share/TrustedQSL)
- 	if (CMAKE_INSTALL_PREFIX STREQUAL "/usr")
--		install(FILES tqsl.5 DESTINATION share/man/man5)
-+		install(FILES tqsl.5 DESTINATION ${CMAKE_INSTALL_MANDIR}/man5)
- 	else()
--		install(FILES tqsl.5 DESTINATION man/man5)
-+		install(FILES tqsl.5 DESTINATION ${CMAKE_INSTALL_MANDIR}/man5)
- 	endif()
- 	install(FILES icons/key48.png DESTINATION share/pixmaps RENAME TrustedQSL.png)
- 	install(FILES lang/de/tqslapp.mo DESTINATION share/locale/de/LC_MESSAGES)
diff --git a/ham/trustedQSL/patches/patch-apps_tqsl_cpp b/ham/trustedQSL/patches/patch-apps_tqsl_cpp
index ae194d60134..0da7982af12 100644
--- a/ham/trustedQSL/patches/patch-apps_tqsl_cpp
+++ b/ham/trustedQSL/patches/patch-apps_tqsl_cpp
@@ -1,4 +1,4 @@
-$NetBSD: patch-apps_tqsl_cpp,v 1.7 2019/04/30 13:22:09 mef Exp $
+$NetBSD: patch-apps_tqsl_cpp,v 1.8 2021/06/24 00:09:06 gdt Exp $
 
 (1)
 Avoid following error (interim, only valid with db5)
@@ -10,14 +10,9 @@ gmake[1]: *** [apps/CMakeFiles/tqsl.dir/all] Error 2
 tqsl-2.0.1/apps/tqsl.cpp:2963:10: error: #pragma GCC diagnostic not allowed inside functions
 tqsl-2.0.1/apps/tqsl.cpp:2967:10: error: #pragma GCC diagnostic not allowed inside functions
 
-(3) Trial code for wxGTK30
-
-(4) Avoid error with wxGTK30
- error: cannot pass objects of non-trivially-copyable type 'class wxCStrData' through '...'
-
---- apps/tqsl.cpp.orig	2018-11-24 07:35:22.000000000 +0900
-+++ apps/tqsl.cpp	2019-01-23 22:37:52.667485645 +0900
-@@ -67,7 +67,7 @@
+--- apps/tqsl.cpp.orig	2020-11-18 19:03:28.000000000 +0000
++++ apps/tqsl.cpp
+@@ -70,7 +70,7 @@
  #ifdef USE_LMDB
  #include <lmdb.h> //only for version info!
  #else
@@ -26,12 +21,3 @@ tqsl-2.0.1/apps/tqsl.cpp:2967:10: error: #pragma GCC diagnostic not allowed insi
  #endif
  
  #include <iostream>
-@@ -3628,7 +3628,7 @@ MyFrame::OnUpdateCheckDone(wxCommandEven
- // The macro for declaring a hash map defines a couple of typedefs
- // that it never uses. Current GCC warns about those. The pragma
- // below suppresses those warnings for those.
--#if !defined(__APPLE__) && !defined(_WIN32) && !defined(__clang__)
-+#if !defined(__APPLE__) && !defined(_WIN32) && !defined(__clang__) && !defined(__NetBSD__) && !defined(__DragonFly__) && !defined(__FreeBSD__)
- 	#pragma GCC diagnostic ignored "-Wunused-local-typedefs"
- #endif
- void