[arch-commits] Commit in truecrypt/trunk (PKGBUILD wxwidgets31.patch)

[Levente Polyak]

    Date: Monday, March 25, 2019 @ 19:26:08
  Author: anthraxx
Revision: 349183

upgpkg: truecrypt 1:7.1a-7 wxgtk 3.1 rebuild

Added:
  truecrypt/trunk/wxwidgets31.patch
Modified:
  truecrypt/trunk/PKGBUILD

-------------------+
 PKGBUILD          |    5 ++++-
 wxwidgets31.patch |   37 +++++++++++++++++++++++++++++++++++++
 2 files changed, 41 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-03-25 16:10:20 UTC (rev 349182)
+++ PKGBUILD	2019-03-25 19:26:08 UTC (rev 349183)
@@ -4,7 +4,7 @@
 
 pkgname=truecrypt
 pkgver=7.1a
-pkgrel=6
+pkgrel=7
 epoch=1
 pkgdesc='Free open-source cross-platform disk encryption software'
 url='http://www.truecrypt.org/'
@@ -25,6 +25,7 @@
         fix-invalid-characters.patch
         no-exec-stack.patch
         wxwidgets3.patch
+        wxwidgets31.patch
         xdg-open.patch)
 sha512sums=('b5e766023168015cb91bfd85c9e2621055dd98408215e02704775861b5070c5a0234a00c64c1bf7faa34e6d0b51ac71cd36169dd7a6f84d7a34ad0cfa304796a'
             'SKIP'
@@ -35,6 +36,7 @@
             'd52826572178a471bb608fd4991766f4f9fa7c5cbf3659922372feb9fdfcbab596d5f1360e30f66613681619672d0be6c5457f5617f5fb1f84061de779831f96'
             'c64f9255303a521b4e531ebea574befe80a9f193c9aa42fd9cb552e56d087815ca161b50b593e7c3ede10a65c67dc36d0447dbffb0f4d4614f181a95759c2f79'
             'f5dcbcd046489b52657fd99ec1d4d926883414b450af5bbd90890b210988f75055346c9276526486e9db00bffd50926e01c4f17da18144ad903fb40d81043769'
+            '461f27cb72a9230591de9131e1f4d32df0531316265164429dfb89b0787d0da25bf6f18231a77d596f2bf0fee4340bec6f3bae8cc1ca8a96cc7e2d2bab04dcee'
             'e60f780bbd2d72ff86ce14df6bda929e696c825f20ccc54bee74c6fc85a98cbf73ccfdb311f6e33c92ef3f7e9095907ab98d62cfe067ab6254513731e9d69ab7')
 validpgpkeys=('C5F4BAC4A7B22DB8B8F85538E3BA73CAF0D6B1E0') # TrueCrypt Foundation
 
@@ -45,6 +47,7 @@
   patch -p2 < "${srcdir}/fix-invalid-characters.patch"
   patch -p0 < "${srcdir}/no-exec-stack.patch"
   patch -p2 < "${srcdir}/wxwidgets3.patch"
+  patch -p2 < "${srcdir}/wxwidgets31.patch"
   patch -p2 < "${srcdir}/xdg-open.patch"
 }
 

Added: wxwidgets31.patch
===================================================================
--- wxwidgets31.patch	                        (rev 0)
+++ wxwidgets31.patch	2019-03-25 19:26:08 UTC (rev 349183)
@@ -0,0 +1,37 @@
+From 2c6e9fc15c6467d559cc5e212bd63b02f82640bb Mon Sep 17 00:00:00 2001
+From: Mounir IDRASSI <mounir.idrassi at idrix.fr>
+Date: Sun, 26 Oct 2014 17:28:59 +0100
+Subject: [PATCH] Replace deprecated wxTextValidator::SetBellOnError whose
+ logic whose inverted by the new wxTextValidator::SuppressBellOnError. Since
+ its used in constructor only for TC_WINDOWS, we do the same in the
+ destructor.
+
+---
+ src/Main/Forms/PreferencesDialog.cpp | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/src/Main/Forms/PreferencesDialog.cpp b/src/Main/Forms/PreferencesDialog.cpp
+index 50c9c300c..e22e304b6 100644
+--- a/src/Main/Forms/PreferencesDialog.cpp
++++ b/src/Main/Forms/PreferencesDialog.cpp
+@@ -154,7 +154,7 @@ namespace VeraCrypt
+ 		Gui->SetListCtrlColumnWidths (HotkeyListCtrl, colPermilles);
+ 
+ 		RestoreValidatorBell = !wxTextValidator::IsSilent();
+-		wxTextValidator::SetBellOnError (true);
++		wxTextValidator::SuppressBellOnError (true);
+ 		HotkeyTextCtrl->SetValidator (wxTextValidator (wxFILTER_INCLUDE_CHAR_LIST));
+ 
+ 		UpdateHotkeyButtons();
+@@ -203,8 +203,10 @@ namespace VeraCrypt
+ 
+ 	PreferencesDialog::~PreferencesDialog ()
+ 	{
++#ifdef TC_WINDOWS
+ 		if (RestoreValidatorBell)
+-			wxTextValidator::SetBellOnError (false);
++			wxTextValidator::SuppressBellOnError (false);
++#endif
+ 	}
+ 
+ 	void PreferencesDialog::SelectPage (wxPanel *page)