CVS commit: pkgsrc/ham/trustedQSL

["Greg Troxel" <gdt%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   gdt
Date:           Thu Jun 24 00:09:06 UTC 2021

Modified Files:
        pkgsrc/ham/trustedQSL: Makefile PLIST distinfo
        pkgsrc/ham/trustedQSL/patches: patch-apps_tqsl_cpp
Removed Files:
        pkgsrc/ham/trustedQSL/patches: patch-apps_CMakeLists.txt

Log Message:
trustedQSL: Update to 2.5.7

This is basically a bugfix release.

Some patches are overtaken by upstream events.


To generate a diff of this commit:
cvs rdiff -u -r1.54 -r1.55 pkgsrc/ham/trustedQSL/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/ham/trustedQSL/PLIST
cvs rdiff -u -r1.19 -r1.20 pkgsrc/ham/trustedQSL/distinfo
cvs rdiff -u -r1.6 -r0 \
    pkgsrc/ham/trustedQSL/patches/patch-apps_CMakeLists.txt
cvs rdiff -u -r1.7 -r1.8 pkgsrc/ham/trustedQSL/patches/patch-apps_tqsl_cpp

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/ham/trustedQSL/Makefile
diff -u pkgsrc/ham/trustedQSL/Makefile:1.54 pkgsrc/ham/trustedQSL/Makefile:1.55
--- pkgsrc/ham/trustedQSL/Makefile:1.54 Mon May 24 19:52:29 2021
+++ pkgsrc/ham/trustedQSL/Makefile      Thu Jun 24 00:09:06 2021
@@ -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 \

Index: pkgsrc/ham/trustedQSL/PLIST
diff -u pkgsrc/ham/trustedQSL/PLIST:1.8 pkgsrc/ham/trustedQSL/PLIST:1.9
--- pkgsrc/ham/trustedQSL/PLIST:1.8     Tue Apr 30 13:22:09 2019
+++ pkgsrc/ham/trustedQSL/PLIST Thu Jun 24 00:09:06 2021
@@ -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.h
 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

Index: pkgsrc/ham/trustedQSL/distinfo
diff -u pkgsrc/ham/trustedQSL/distinfo:1.19 pkgsrc/ham/trustedQSL/distinfo:1.20
--- pkgsrc/ham/trustedQSL/distinfo:1.19 Mon Mar 16 16:43:22 2020
+++ pkgsrc/ham/trustedQSL/distinfo      Thu Jun 24 00:09:06 2021
@@ -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

Index: pkgsrc/ham/trustedQSL/patches/patch-apps_tqsl_cpp
diff -u pkgsrc/ham/trustedQSL/patches/patch-apps_tqsl_cpp:1.7 pkgsrc/ham/trustedQSL/patches/patch-apps_tqsl_cpp:1.8
--- pkgsrc/ham/trustedQSL/patches/patch-apps_tqsl_cpp:1.7       Tue Apr 30 13:22:09 2019
+++ pkgsrc/ham/trustedQSL/patches/patch-apps_tqsl_cpp   Thu Jun 24 00:09:06 2021
@@ -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/
 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:
  #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