(wip/trustedQSL) Add patch for wxGTK30

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

Module Name:	pkgsrc-wip
Committed By:	Makoto Fujiwara <makoto%ki.nu@localhost>
Pushed By:	mef
Date:		Thu Nov 5 23:59:12 2015 +0900
Changeset:	765833bc174c534a24ddd16f5b548bc080d1a92a

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

Log Message:
(wip/trustedQSL) Add patch for wxGTK30

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

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

diffstat:
 trustedQSL/distinfo                    |  3 ++-
 trustedQSL/patches/patch-apps_tqsl_cpp | 19 +++++++++++++++----
 2 files changed, 17 insertions(+), 5 deletions(-)

diffs:
diff --git a/trustedQSL/distinfo b/trustedQSL/distinfo
index 0c33a5a..d1b724f 100644
--- a/trustedQSL/distinfo
+++ b/trustedQSL/distinfo
@@ -2,8 +2,9 @@ $NetBSD: distinfo,v 1.10 2015/10/11 02:59:07 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) = 9daa628f082498e2701a1fa14fce11befe8eecf7
 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 9e53ac3..417e701 100644
--- a/trustedQSL/patches/patch-apps_tqsl_cpp
+++ b/trustedQSL/patches/patch-apps_tqsl_cpp
@@ -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-05 23:46:24.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 @@
  // 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.
@@ -30,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 @@ MyFrame::DoCheckForUpdates(bool silent, 
+@@ -3632,7 +3632,7 @@
  		DoCheckExpiringCerts(noGUI);
  	return;
  }
@@ -39,3 +41,12 @@ 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 @@
+ 	for (int i = 1; i < argc; i++) {
+ 		origCommandLine += wxT(" ");
+ 		origCommandLine += argv[i];
+-		if (argv[i] && (argv[i][0] == wxT('-') || argv[i][0] == wxT('/')))
++		if (!argv[i].empty() && (argv[i][0] == wxT('-') || argv[i][0] == wxT('/')))
+ 			if (wxIsalpha(argv[i][1]) && wxIsupper(argv[i][1]))
+ 				argv[i][1] = wxTolower(argv[i][1]);
+ 	}