FIX package and trigger rebuild

2 files changed, 7 insertions, 26 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f6ea31c75478..0fd1f5981c74 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Thu Dec 10 01:06:53 UTC 2015
+# Thu Dec 10 19:53:20 UTC 2015
 pkgbase = veracrypt
 	pkgdesc = Disk encryption with strong security based on TrueCrypt
 	pkgver = 1.16
-	pkgrel = 4
+	pkgrel = 5
 	url = http://veracrypt.codeplex.com/
 	install = veracrypt.install
 	arch = i686
@@ -11,25 +11,16 @@ pkgbase = veracrypt
 	arch = armv6h
 	license = custom
 	makedepends = nasm
-	makedepends = wxgtk
-	makedepends = webkitgtk2
-	makedepends = glu
-	makedepends = gstreamer0.10-base-plugins
 	depends = fuse
-	depends = libsm
-	depends = device-mapper
+	depends = wxgtk>=3.0
 	source = veracrypt_1.16_Source.tar.bz2::http://sourceforge.net/projects/veracrypt/files/VeraCrypt 1.16/veracrypt_1.16_Source.tar.bz2/download
 	source = veracrypt_1.16_Source.tar.bz2.sig::http://sourceforge.net/projects/veracrypt/files/VeraCrypt 1.16/veracrypt_1.16_Source.tar.bz2.sig/download
-	source = https://github.com/wxWidgets/wxWidgets/releases/download/v3.0.2/wxWidgets-3.0.2.tar.bz2
 	source = no_makeself.patch
-	source = no_glibcxx_use_cxx11_abi.patch
 	source = veracrypt.desktop
 	source = veracrypt.install
 	sha1sums = 54467b063609d854dd8f1b780201378e706f452f
 	sha1sums = 23db8fd6bfea26986a1034d51aa0a6826440b0ba
-	sha1sums = 6461eab4428c0a8b9e41781b8787510484dea800
 	sha1sums = 0cbe9f7875ab52be125cc575533f76fab60314a5
-	sha1sums = 435d3e7bb306886ba570e6249f81d7131f10510a
 	sha1sums = ebdd450e719fe3cff5e459f027856cbaf03db13a
 	sha1sums = 14dceabf658a7e3505c855c2862aa86e343fcda5
 
diff --git a/PKGBUILD b/PKGBUILD
index 84cd4054ad7f..2eb031982f24 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,26 +6,22 @@ _pkgname=VeraCrypt
 pkgver=1.16
 _pkgver=${pkgver//_/-}
 _wxver=3.0.2
-pkgrel=4
+pkgrel=5
 pkgdesc="Disk encryption with strong security based on TrueCrypt"
 arch=('i686' 'x86_64' 'armv6h')
 url="http://veracrypt.codeplex.com/"
 license=('custom')
-depends=('fuse' 'libsm' 'device-mapper')
-makedepends=('nasm' 'wxgtk' 'webkitgtk2' 'glu' 'gstreamer0.10-base-plugins')
+depends=('fuse' 'wxgtk>=3.0')
+makedepends=('nasm')
 install='veracrypt.install'
 source=("${pkgname}_${pkgver}_Source.tar.bz2::http://sourceforge.net/projects/${pkgname}/files/${_pkgname} ${pkgver}/${pkgname}_${pkgver}_Source.tar.bz2/download"
 	"${pkgname}_${pkgver}_Source.tar.bz2.sig::http://sourceforge.net/projects/${pkgname}/files/${_pkgname} ${pkgver}/${pkgname}_${pkgver}_Source.tar.bz2.sig/download"
-	"https://github.com/wxWidgets/wxWidgets/releases/download/v${_wxver}/wxWidgets-${_wxver}.tar.bz2"
 	"no_makeself.patch"
-	"no_glibcxx_use_cxx11_abi.patch"
         "veracrypt.desktop"
         "veracrypt.install")
 sha1sums=('54467b063609d854dd8f1b780201378e706f452f'
           '23db8fd6bfea26986a1034d51aa0a6826440b0ba'
-          '6461eab4428c0a8b9e41781b8787510484dea800'
           '0cbe9f7875ab52be125cc575533f76fab60314a5'
-          '435d3e7bb306886ba570e6249f81d7131f10510a'
           'ebdd450e719fe3cff5e459f027856cbaf03db13a'
           '14dceabf658a7e3505c855c2862aa86e343fcda5')
 validpgpkeys=('993B7D7E8E413809828F0F29EB559C7C54DDD393')
@@ -35,19 +31,13 @@ prepare() {
 
   msg2 "Applying patches..."
   patch -Np1 -i ../no_makeself.patch  # disable sfx archive
-  patch -Np1 -i ../no_glibcxx_use_cxx11_abi.patch
 }
 
 build() {
   cd ${srcdir}/src
 
-  msg2 "Building static wxWidgets..."
-  export WX_ROOT="${srcdir}/wxWidgets-${_wxver}"
-  export WXSTATIC=1
-  make wxbuild
-
   msg2 "Building veracrypt..."
-#  export WX_CONFIG=/usr/bin/wx-config
+  export WX_CONFIG=/usr/bin/wx-config
   make LFLAGS+="-ldl"
 }