[arch-commits] Commit in veracrypt/trunk (PKGBUILD wx-3.2-size-warnings.patch)
Antonio Rojas
arojas at gemini.archlinux.org
Sun Jul 17 19:44:07 UTC 2022
Date: Sunday, July 17, 2022 @ 19:44:06
Author: arojas
Revision: 1254337
Fix asserts with wxwidgets 3.2 (FS#75330)
Added:
veracrypt/trunk/wx-3.2-size-warnings.patch
Modified:
veracrypt/trunk/PKGBUILD
----------------------------+
PKGBUILD | 9 +-
wx-3.2-size-warnings.patch | 135 +++++++++++++++++++++++++++++++++++++++++++
2 files changed, 141 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2022-07-17 18:47:42 UTC (rev 1254336)
+++ PKGBUILD 2022-07-17 19:44:06 UTC (rev 1254337)
@@ -5,7 +5,7 @@
pkgname=veracrypt
_pkgname=VeraCrypt
pkgver=1.25.9
-pkgrel=2
+pkgrel=3
pkgdesc='Disk encryption with strong security based on TrueCrypt'
url='https://www.veracrypt.fr/'
arch=('x86_64')
@@ -15,11 +15,13 @@
makedepends=('yasm')
source=(https://launchpad.net/veracrypt/trunk/${pkgver}/+download/VeraCrypt_${pkgver}_Source.tar.bz2{,.sig}
no-makeself.patch
- veracrypt.desktop)
+ veracrypt.desktop
+ wx-3.2-size-warnings.patch)
sha512sums=('9b11c8d8e85770ae05960fef8fc9639731e4f9caf0cc4e50bc8c9c92b45d44c80eaeff483d3ab048fd6a82cc873a6027820e21abde7ddb92b3c368f85b837cf2'
'SKIP'
'40c269859bb97fbcceb443e5f457788bac650271ed118ec79d34f56fc340ad6e613114fe905ec5aba8c4d171c51c9a6865f97e9fa1ba01fa98ef18be4e97bbe1'
- 'f689ca64bac7042030de7714aed8cc89f2c5f87b407444b1b121491c1d89c147babaaa454ddc2a93b70ae20d4da59f96ad64f01b04bea9017d658c377faeb75d')
+ 'f689ca64bac7042030de7714aed8cc89f2c5f87b407444b1b121491c1d89c147babaaa454ddc2a93b70ae20d4da59f96ad64f01b04bea9017d658c377faeb75d'
+ '174e302ac9aad9188ce47fbd34953c910650a2604d75ee936c6777e04a106a565217e07471b921b9b59c04dae80ef305023c94e1912b016042dca6fd9728545f')
validpgpkeys=('5069A233D55A0EEB174A5FC3821ACD02680D16DE') # VeraCrypt Team <veracrypt at idrix.fr>
prepare() {
@@ -26,6 +28,7 @@
cd src
chmod -R u+w . # WAT award
patch -Np1 < "${srcdir}/no-makeself.patch"
+ patch -p1 < ../wx-3.2-size-warnings.patch # https://github.com/veracrypt/VeraCrypt/issues/952
}
build() {
Added: wx-3.2-size-warnings.patch
===================================================================
--- wx-3.2-size-warnings.patch (rev 0)
+++ wx-3.2-size-warnings.patch 2022-07-17 19:44:06 UTC (rev 1254337)
@@ -0,0 +1,135 @@
+diff --git a/Main/Forms/Forms.cpp b/Main/Forms/Forms.cpp
+index d281feb..3ab11b8 100644
+--- a/Main/Forms/Forms.cpp
++++ b/Main/Forms/Forms.cpp
+@@ -253,7 +253,7 @@ MainFrameBase::MainFrameBase( wxWindow* parent, wxWindowID id, const wxString& t
+
+ bSizer18->SetMinSize( wxSize( 138,34 ) );
+ VolumePropertiesButton = new wxButton( LowStaticBoxSizer->GetStaticBox(), wxID_ANY, _("IDC_VOLUME_PROPERTIES"), wxDefaultPosition, wxDefaultSize, 0 );
+- bSizer18->Add( VolumePropertiesButton, 1, wxALL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 );
++ bSizer18->Add( VolumePropertiesButton, 1, wxALL|wxEXPAND, 5 );
+
+
+ gSizer1->Add( bSizer18, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
+@@ -263,7 +263,7 @@ MainFrameBase::MainFrameBase( wxWindow* parent, wxWindowID id, const wxString& t
+
+ bSizer19->SetMinSize( wxSize( 138,34 ) );
+ WipeCacheButton = new wxButton( LowStaticBoxSizer->GetStaticBox(), wxID_ANY, _("HK_WIPE_CACHE"), wxDefaultPosition, wxDefaultSize, 0 );
+- bSizer19->Add( WipeCacheButton, 1, wxALL|wxALIGN_RIGHT|wxEXPAND, 5 );
++ bSizer19->Add( WipeCacheButton, 1, wxALL|wxEXPAND, 5 );
+
+
+ gSizer1->Add( bSizer19, 0, wxALIGN_RIGHT, 5 );
+@@ -345,7 +345,7 @@ MainFrameBase::MainFrameBase( wxWindow* parent, wxWindowID id, const wxString& t
+
+ VolumeButton->SetMinSize( wxSize( -1,32 ) );
+
+- sbSizer4->Add( VolumeButton, 1, wxALIGN_CENTER_HORIZONTAL|wxEXPAND|wxALL, 2 );
++ sbSizer4->Add( VolumeButton, 1, wxEXPAND|wxALL, 2 );
+
+
+ gSizer2->Add( sbSizer4, 1, wxEXPAND, 0 );
+@@ -357,7 +357,7 @@ MainFrameBase::MainFrameBase( wxWindow* parent, wxWindowID id, const wxString& t
+ MountAllDevicesButton = new wxButton( sbSizer41->GetStaticBox(), wxID_ANY, _("IDC_MOUNTALL"), wxDefaultPosition, wxDefaultSize, 0 );
+ MountAllDevicesButton->SetMinSize( wxSize( -1,32 ) );
+
+- sbSizer41->Add( MountAllDevicesButton, 1, wxALIGN_CENTER_HORIZONTAL|wxEXPAND|wxALL, 2 );
++ sbSizer41->Add( MountAllDevicesButton, 1, wxEXPAND|wxALL, 2 );
+
+
+ gSizer2->Add( sbSizer41, 1, wxEXPAND, 5 );
+@@ -369,7 +369,7 @@ MainFrameBase::MainFrameBase( wxWindow* parent, wxWindowID id, const wxString& t
+ DismountAllButton = new wxButton( sbSizer42->GetStaticBox(), wxID_ANY, _("IDC_UNMOUNTALL"), wxDefaultPosition, wxDefaultSize, 0 );
+ DismountAllButton->SetMinSize( wxSize( -1,32 ) );
+
+- sbSizer42->Add( DismountAllButton, 1, wxALIGN_CENTER_HORIZONTAL|wxEXPAND|wxALL, 2 );
++ sbSizer42->Add( DismountAllButton, 1, wxEXPAND|wxALL, 2 );
+
+
+ gSizer2->Add( sbSizer42, 1, wxEXPAND, 5 );
+@@ -381,7 +381,7 @@ MainFrameBase::MainFrameBase( wxWindow* parent, wxWindowID id, const wxString& t
+ ExitButton = new wxButton( sbSizer43->GetStaticBox(), wxID_ANY, _("IDC_EXIT"), wxDefaultPosition, wxDefaultSize, 0 );
+ ExitButton->SetMinSize( wxSize( -1,32 ) );
+
+- sbSizer43->Add( ExitButton, 1, wxALIGN_CENTER_HORIZONTAL|wxEXPAND|wxALL, 2 );
++ sbSizer43->Add( ExitButton, 1, wxEXPAND|wxALL, 2 );
+
+
+ gSizer2->Add( sbSizer43, 1, wxEXPAND, 5 );
+@@ -606,7 +606,7 @@ WizardFrameBase::WizardFrameBase( wxWindow* parent, wxWindowID id, const wxStrin
+ bSizer70->Add( CancelButton, 0, wxALL|wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL, 5 );
+
+
+- bSizer64->Add( bSizer70, 0, wxEXPAND|wxALIGN_RIGHT|wxALL, 5 );
++ bSizer64->Add( bSizer70, 0, wxEXPAND|wxALL, 5 );
+
+
+ bSizer63->Add( bSizer64, 1, wxEXPAND, 5 );
+@@ -2648,7 +2648,7 @@ EncryptionOptionsWizardPageBase::EncryptionOptionsWizardPageBase( wxWindow* pare
+ bSizer96->Add( EncryptionAlgorithmChoice, 1, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+
+ TestButton = new wxButton( sbSizer29->GetStaticBox(), wxID_ANY, _("TEST"), wxDefaultPosition, wxDefaultSize, 0 );
+- bSizer96->Add( TestButton, 0, wxALL|wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
++ bSizer96->Add( TestButton, 0, wxALL|wxEXPAND, 5 );
+
+
+ sbSizer29->Add( bSizer96, 0, wxEXPAND, 5 );
+@@ -2999,7 +2999,7 @@ VolumeCreationProgressWizardPageBase::VolumeCreationProgressWizardPageBase( wxWi
+
+ RandomPoolSampleStaticText->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxT("Courier New") ) );
+
+- bSizer126->Add( RandomPoolSampleStaticText, 0, wxEXPAND|wxTOP|wxRIGHT|wxALIGN_BOTTOM, 7 );
++ bSizer126->Add( RandomPoolSampleStaticText, 0, wxEXPAND|wxTOP|wxRIGHT, 7 );
+
+ DisplayKeysCheckBox = new wxCheckBox( sbSizer31->GetStaticBox(), wxID_ANY, _("IDC_DISPLAY_POOL_CONTENTS"), wxDefaultPosition, wxDefaultSize, 0 );
+ bSizer126->Add( DisplayKeysCheckBox, 0, wxEXPAND|wxRIGHT, 5 );
+@@ -3082,13 +3082,13 @@ VolumeCreationProgressWizardPageBase::VolumeCreationProgressWizardPageBase( wxWi
+ SizeDoneStaticText = new wxStaticText( m_panel12, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxALIGN_RIGHT|wxST_NO_AUTORESIZE );
+ SizeDoneStaticText->Wrap( -1 );
+
+- bSizer115->Add( SizeDoneStaticText, 1, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxALL, 3 );
++ bSizer115->Add( SizeDoneStaticText, 1, wxEXPAND|wxALL, 3 );
+
+
+ m_panel12->SetSizer( bSizer115 );
+ m_panel12->Layout();
+ bSizer115->Fit( m_panel12 );
+- bSizer108->Add( m_panel12, 1, wxEXPAND|wxALIGN_CENTER_VERTICAL|wxALL, 5 );
++ bSizer108->Add( m_panel12, 1, wxEXPAND|wxALL, 5 );
+
+
+ gSizer6->Add( bSizer108, 1, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
+@@ -3108,13 +3108,13 @@ VolumeCreationProgressWizardPageBase::VolumeCreationProgressWizardPageBase( wxWi
+ SpeedStaticText = new wxStaticText( m_panel121, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxALIGN_RIGHT|wxST_NO_AUTORESIZE );
+ SpeedStaticText->Wrap( -1 );
+
+- bSizer1151->Add( SpeedStaticText, 1, wxALL|wxALIGN_CENTER_VERTICAL|wxEXPAND, 3 );
++ bSizer1151->Add( SpeedStaticText, 1, wxALL|wxEXPAND, 3 );
+
+
+ m_panel121->SetSizer( bSizer1151 );
+ m_panel121->Layout();
+ bSizer1151->Fit( m_panel121 );
+- bSizer1081->Add( m_panel121, 1, wxALL|wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 );
++ bSizer1081->Add( m_panel121, 1, wxALL|wxEXPAND, 5 );
+
+
+ gSizer6->Add( bSizer1081, 1, wxEXPAND|wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+@@ -3134,7 +3134,7 @@ VolumeCreationProgressWizardPageBase::VolumeCreationProgressWizardPageBase( wxWi
+ TimeLeftStaticText = new wxStaticText( m_panel122, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxALIGN_RIGHT|wxST_NO_AUTORESIZE );
+ TimeLeftStaticText->Wrap( -1 );
+
+- bSizer1152->Add( TimeLeftStaticText, 1, wxALL|wxALIGN_CENTER_VERTICAL|wxEXPAND, 3 );
++ bSizer1152->Add( TimeLeftStaticText, 1, wxALL|wxEXPAND, 3 );
+
+
+ m_panel122->SetSizer( bSizer1152 );
+@@ -3677,7 +3677,7 @@ WaitDialogBase::WaitDialogBase( wxWindow* parent, wxWindowID id, const wxString&
+ WaitStaticText = new wxStaticText( this, wxID_ANY, _("MyLabel"), wxDefaultPosition, wxDefaultSize, wxALIGN_CENTRE );
+ WaitStaticText->Wrap( -1 );
+
+- bSizer160->Add( WaitStaticText, 0, wxALIGN_CENTER_HORIZONTAL|wxALL|wxEXPAND, 5 );
++ bSizer160->Add( WaitStaticText, 0, wxALL|wxEXPAND, 5 );
+
+ WaitProgessBar = new wxGauge( this, wxID_ANY, 100, wxDefaultPosition, wxDefaultSize, wxGA_HORIZONTAL|wxGA_SMOOTH );
+ WaitProgessBar->SetValue( 0 );
More information about the arch-commits
mailing list