1.6.4, disabled padlock support

3 files changed, 7 insertions, 22 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c94355ec8dce..ad3cdae0a947 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = mingw-w64-libgcrypt
 	pkgdesc = General purpose cryptographic library based on the code from GnuPG (mingw-w64)
-	pkgver = 1.6.3
+	pkgver = 1.6.4
 	pkgrel = 1
 	url = http://www.gnupg.org
 	arch = any
@@ -12,12 +12,10 @@ pkgbase = mingw-w64-libgcrypt
 	options = staticlibs
 	options = !buildflags
 	options = !strip
-	source = ftp://ftp.gnupg.org/gcrypt/libgcrypt/libgcrypt-1.6.3.tar.bz2
-	source = libgcrypt-mingw64-use-correct-datatype-for-GetProcessWorkingSet.patch
+	source = ftp://ftp.gnupg.org/gcrypt/libgcrypt/libgcrypt-1.6.4.tar.bz2
 	source = libgcrypt-use-correct-def-file.patch
 	source = libgcrypt-use-correct-asm-code-for-win64.patch
-	md5sums = 4262c3aadf837500756c2051a5c4ae5e
-	md5sums = 7bb247584a66a83677c618aec812ca9b
+	md5sums = 4c13c5fa43147866f993d73ee62af176
 	md5sums = 531e089caca74b5daf130b7173c2a5c5
 	md5sums = ccdd21fdd8b28690ed7e736a77606735
 
diff --git a/PKGBUILD b/PKGBUILD
index 5ee14775ffa6..6cd8648ef544 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,5 +1,5 @@
 pkgname=mingw-w64-libgcrypt
-pkgver=1.6.3
+pkgver=1.6.4
 pkgrel=1
 pkgdesc="General purpose cryptographic library based on the code from GnuPG (mingw-w64)"
 arch=("any")
@@ -9,18 +9,15 @@ depends=(mingw-w64-libgpg-error)
 makedepends=(mingw-w64-configure transfig ghostscript)
 options=(staticlibs !buildflags !strip)
 source=("ftp://ftp.gnupg.org/gcrypt/libgcrypt/libgcrypt-${pkgver}.tar.bz2"
-"libgcrypt-mingw64-use-correct-datatype-for-GetProcessWorkingSet.patch"
 "libgcrypt-use-correct-def-file.patch"
 "libgcrypt-use-correct-asm-code-for-win64.patch")
-md5sums=('4262c3aadf837500756c2051a5c4ae5e'
-         '7bb247584a66a83677c618aec812ca9b'
+md5sums=('4c13c5fa43147866f993d73ee62af176'
          '531e089caca74b5daf130b7173c2a5c5'
          'ccdd21fdd8b28690ed7e736a77606735')
 _architectures="i686-w64-mingw32 x86_64-w64-mingw32"
 
 prepare() {
   cd "${srcdir}/libgcrypt-${pkgver}"
-  patch -p0 -i "$srcdir"/libgcrypt-mingw64-use-correct-datatype-for-GetProcessWorkingSet.patch
   patch -p0 -i "$srcdir"/libgcrypt-use-correct-def-file.patch
   patch -p1 -i "$srcdir"/libgcrypt-use-correct-asm-code-for-win64.patch
   autoreconf -vfi
@@ -38,7 +35,8 @@ build() {
     fi
     ${_arch}-configure \
       --enable-pubkey-ciphers='dsa elgamal rsa ecc' \
-      --with-gpg-error-prefix=/usr/${_arch} $configure_args
+      --with-gpg-error-prefix=/usr/${_arch} \
+      --disable-padlock-support $configure_args
     make
     popd
   done
diff --git a/libgcrypt-mingw64-use-correct-datatype-for-GetProcessWorkingSet.patch b/libgcrypt-mingw64-use-correct-datatype-for-GetProcessWorkingSet.patch
deleted file mode 100644
index 86924eb4832e..000000000000
--- a/libgcrypt-mingw64-use-correct-datatype-for-GetProcessWorkingSet.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- random/rndw32.c.orig	2011-07-04 19:11:18.137525831 +0200
-+++ random/rndw32.c	2011-07-04 19:11:40.785404249 +0200
-@@ -887,7 +887,7 @@
-   {
-     HANDLE handle;
-     FILETIME creationTime, exitTime, kernelTime, userTime;
--    DWORD minimumWorkingSetSize, maximumWorkingSetSize;
-+    SIZE_T minimumWorkingSetSize, maximumWorkingSetSize;
- 
-     handle = GetCurrentThread ();
-     GetThreadTimes (handle, &creationTime, &exitTime,