diff --git a/testing/veracrypt/APKBUILD b/testing/veracrypt/APKBUILD index c04a6be1e96..9e84057c8b3 100644 --- a/testing/veracrypt/APKBUILD +++ b/testing/veracrypt/APKBUILD @@ -4,17 +4,18 @@ pkgname=veracrypt _pkgname=VeraCrypt pkgver=1.25.9 -pkgrel=0 +pkgrel=1 pkgdesc="disk encryption with strong security based on TrueCrypt" url="https://www.veracrypt.fr/" arch="all !x86 !s390x" # issues on linking license="Apache-2.0" depends="device-mapper" -makedepends="fuse-dev wxgtk-dev libsm-dev yasm" +makedepends="fuse-dev wxwidgets-dev libsm-dev yasm" options="!check" # no test suite provided subpackages="$pkgname-doc" source="$pkgname-$pkgver.tar.bz2::https://launchpad.net/veracrypt/trunk/$pkgver/+download/${_pkgname}_${pkgver}_Source.tar.bz2 10-ssize-t.patch + wxwidgets-3.2.patch " builddir="$srcdir/src" @@ -46,4 +47,5 @@ package() { sha512sums=" 9b11c8d8e85770ae05960fef8fc9639731e4f9caf0cc4e50bc8c9c92b45d44c80eaeff483d3ab048fd6a82cc873a6027820e21abde7ddb92b3c368f85b837cf2 veracrypt-1.25.9.tar.bz2 d0f31db39fd98a073e67cb70cc53e8b61a8fc47be12b84395b75607b4ba56c18a47cffc63b60f10421edb59ca464141e9cbc4221080a840fdb73cf2bedfb816d 10-ssize-t.patch +fed32629ef5c1a50df3ad31e46d1346189a43cee88120018bf511ded6393118867da92528f59e339c3a4de883718058e7d375629f0746b79832f58d990d7aa1f wxwidgets-3.2.patch " diff --git a/testing/veracrypt/wxwidgets-3.2.patch b/testing/veracrypt/wxwidgets-3.2.patch new file mode 100644 index 00000000000..f03bec40089 --- /dev/null +++ b/testing/veracrypt/wxwidgets-3.2.patch @@ -0,0 +1,136 @@ +Patch-Source: https://github.com/archlinux/svntogit-community/blob/59b298fcc0a14236f2ce26ac95b3071f8e7ac48a/trunk/wx-3.2-size-warnings.patch +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 );