Adapting to wxGTK28/wxGTK30 both versions compliant.

3 files changed, 22 insertions, 8 deletions

diff --git a/ham/trustedQSL/Makefile b/ham/trustedQSL/Makefile
index b794262f339..3a02b1cb230 100644
--- a/ham/trustedQSL/Makefile
+++ b/ham/trustedQSL/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2015/10/11 02:59:07 mef Exp $
+# $NetBSD: Makefile,v 1.18 2015/11/22 09:52:55 mef Exp $
 
 DISTNAME=		tqsl-2.1.2
 CATEGORIES=		ham
@@ -43,7 +43,7 @@ post-install:
 
 .include "../../textproc/expat/buildlink3.mk"
 .include "../../databases/db5/buildlink3.mk"
-.include "../../x11/wxGTK28/buildlink3.mk"
+.include "../../mk/wxGTK.mk"
 .include "../../www/curl/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/ham/trustedQSL/distinfo b/ham/trustedQSL/distinfo
index 15b2d59aa17..413d09da18a 100644
--- a/ham/trustedQSL/distinfo
+++ b/ham/trustedQSL/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.11 2015/11/02 23:57:24 agc Exp $
+$NetBSD: distinfo,v 1.12 2015/11/22 09:52:55 mef Exp $
 
 SHA1 (tqsl-2.1.2.tar.gz) = b84416aba4736ddc39f638da74fb1fd8b3a52aaf
 RMD160 (tqsl-2.1.2.tar.gz) = cdf040eb24c4ad29785c360b8d93600ffcb67f75
 SHA512 (tqsl-2.1.2.tar.gz) = 7ce4779427c9fda826fef4a58fd86c1a06ea41c731c2ca8e498ff7d3a93d59d72c79b35e235be45eec348e051872932aef05abfff4416f77e80d883f09dd200e
 Size (tqsl-2.1.2.tar.gz) = 3442792 bytes
 SHA1 (patch-apps_CMakeLists.txt) = e685f6dba817c783dfe18796b714785923c42982
-SHA1 (patch-apps_tqsl_cpp) = fc6d0fc61b8002945d73b9275ffe5fe163c2dda1
+SHA1 (patch-apps_tqsl_cpp) = 6ef2ba4a5cae2cb35efd80493e8f11c475d54047
 SHA1 (patch-openssl__cert.cpp) = 158c7086014f9cef05835beb1fb9aa52f091343f
 SHA1 (patch-src_tqslconvert_cpp) = 212530497270d7354d2081f2a985e266e8569896
diff --git a/ham/trustedQSL/patches/patch-apps_tqsl_cpp b/ham/trustedQSL/patches/patch-apps_tqsl_cpp
index 9e53ac30b15..98e3f04ec9c 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.3 2015/10/11 02:59:07 mef Exp $
+$NetBSD: patch-apps_tqsl_cpp,v 1.4 2015/11/22 09:52:55 mef Exp $
 
 (1)
 Avoid following error (interim, only valid with db5)
@@ -10,9 +10,11 @@ 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
+
 --- apps/tqsl.cpp.orig	2015-09-20 09:15:24.000000000 +0900
-+++ apps/tqsl.cpp	2015-10-11 01:19:49.000000000 +0900
-@@ -55,7 +55,7 @@
++++ apps/tqsl.cpp	2015-11-17 23:08:20.000000000 +0900
+@@ -64,7 +64,7 @@
  #endif
  #include <zlib.h>
  #include <openssl/opensslv.h> // only for version info!
@@ -21,7 +23,7 @@ tqsl-2.0.1/apps/tqsl.cpp:2967:10: error: #pragma GCC diagnostic not allowed insi
  
  #include <iostream>
  #include <fstream>
-@@ -3022,7 +3022,7 @@ MyFrame::OnUpdateCheckDone(wxCommandEven
+@@ -3428,7 +3428,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.
@@ -39,3 +41,15 @@ tqsl-2.0.1/apps/tqsl.cpp:2967:10: error: #pragma GCC diagnostic not allowed insi
  	#pragma GCC diagnostic warning "-Wunused-local-typedefs"
  #endif
  
+@@ -4676,7 +4676,11 @@ QSLApp::OnInit() {
+ 	for (int i = 1; i < argc; i++) {
+ 		origCommandLine += wxT(" ");
+ 		origCommandLine += argv[i];
++#if defined (wxABI_VERSION) && (wxABI_VERSION < 30000 )
+ 		if (argv[i] && (argv[i][0] == wxT('-') || argv[i][0] == wxT('/')))
++#else
++		if (!argv[i].empty() && (argv[i][0] == wxT('-') || argv[i][0] == wxT('/')))
++#endif
+ 			if (wxIsalpha(argv[i][1]) && wxIsupper(argv[i][1]))
+ 				argv[i][1] = wxTolower(argv[i][1]);
+ 	}