(trustedQSL) make both wxGTK28 and wxGTK30 ready

[Makoto Fujiwara <makoto%ki.nu@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Makoto Fujiwara <makoto%ki.nu@localhost>
Pushed By:	mef
Date:		Tue Nov 17 23:17:17 2015 +0900
Changeset:	8e01c86f9d9405924b54672ee3cab0180e26525a

Modified Files:
	trustedQSL/Makefile
	trustedQSL/distinfo
	trustedQSL/patches/patch-apps_tqsl_cpp

Log Message:
(trustedQSL) make both wxGTK28 and wxGTK30 ready

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=8e01c86f9d9405924b54672ee3cab0180e26525a

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

diffstat:
 trustedQSL/Makefile                    |  2 +-
 trustedQSL/distinfo                    |  2 +-
 trustedQSL/patches/patch-apps_tqsl_cpp | 13 ++++++++-----
 3 files changed, 10 insertions(+), 7 deletions(-)

diffs:
diff --git a/trustedQSL/Makefile b/trustedQSL/Makefile
index df79133..7f8736f 100644
--- a/trustedQSL/Makefile
+++ b/trustedQSL/Makefile
@@ -43,7 +43,7 @@ post-install:
 
 .include "../../textproc/expat/buildlink3.mk"
 .include "../../databases/db5/buildlink3.mk"
-.include "../../wip/mk/wxGTK.mk"
+.include "../../mk/wxGTK.mk"
 .include "../../www/curl/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/trustedQSL/distinfo b/trustedQSL/distinfo
index d1b724f..05b2f1f 100644
--- a/trustedQSL/distinfo
+++ b/trustedQSL/distinfo
@@ -5,6 +5,6 @@ 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) = 9daa628f082498e2701a1fa14fce11befe8eecf7
+SHA1 (patch-apps_tqsl_cpp) = 6ef2ba4a5cae2cb35efd80493e8f11c475d54047
 SHA1 (patch-openssl__cert.cpp) = 158c7086014f9cef05835beb1fb9aa52f091343f
 SHA1 (patch-src_tqslconvert_cpp) = 212530497270d7354d2081f2a985e266e8569896
diff --git a/trustedQSL/patches/patch-apps_tqsl_cpp b/trustedQSL/patches/patch-apps_tqsl_cpp
index 417e701..836c0a7 100644
--- a/trustedQSL/patches/patch-apps_tqsl_cpp
+++ b/trustedQSL/patches/patch-apps_tqsl_cpp
@@ -13,7 +13,7 @@ tqsl-2.0.1/apps/tqsl.cpp:2967:10: error: #pragma GCC diagnostic not allowed insi
 (3) Trial code for wxGTK30
 
 --- apps/tqsl.cpp.orig	2015-09-20 09:15:24.000000000 +0900
-+++ apps/tqsl.cpp	2015-11-05 23:46:24.000000000 +0900
++++ apps/tqsl.cpp	2015-11-17 23:08:20.000000000 +0900
 @@ -64,7 +64,7 @@
  #endif
  #include <zlib.h>
@@ -23,7 +23,7 @@ tqsl-2.0.1/apps/tqsl.cpp:2967:10: error: #pragma GCC diagnostic not allowed insi
  
  #include <iostream>
  #include <fstream>
-@@ -3428,7 +3428,7 @@
+@@ -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.
@@ -32,7 +32,7 @@ tqsl-2.0.1/apps/tqsl.cpp:2967:10: error: #pragma GCC diagnostic not allowed insi
  	#pragma GCC diagnostic ignored "-Wunused-local-typedefs"
  #endif
  void
-@@ -3632,7 +3632,7 @@
+@@ -3632,7 +3632,7 @@ MyFrame::DoCheckForUpdates(bool silent, 
  		DoCheckExpiringCerts(noGUI);
  	return;
  }
@@ -41,12 +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,7 @@
+@@ -4676,7 +4676,11 @@ QSLApp::OnInit() {
  	for (int i = 1; i < argc; i++) {
  		origCommandLine += wxT(" ");
  		origCommandLine += argv[i];
--		if (argv[i] && (argv[i][0] == wxT('-') || argv[i][0] == wxT('/')))
++#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]);
  	}