update to 1.31

3 files changed, 32 insertions, 10 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 679ee287f101..30150e42720b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,6 @@
-# Generated by mksrcinfo v8
-# Sun Mar  5 04:18:31 UTC 2017
 pkgbase = mingw-w64-libgpg-error
 	pkgdesc = Support library for libgcrypt (mingw-w64)
-	pkgver = 1.27
+	pkgver = 1.31
 	pkgrel = 1
 	url = http://www.gnupg.org
 	arch = any
@@ -12,16 +10,20 @@ pkgbase = mingw-w64-libgpg-error
 	options = staticlibs
 	options = !strip
 	options = !buildflags
-	source = ftp://ftp.gnupg.org/gcrypt/libgpg-error/libgpg-error-1.27.tar.bz2
-	source = ftp://ftp.gnupg.org/gcrypt/libgpg-error/libgpg-error-1.27.tar.bz2.sig
+	source = ftp://ftp.gnupg.org/gcrypt/libgpg-error/libgpg-error-1.31.tar.bz2
+	source = ftp://ftp.gnupg.org/gcrypt/libgpg-error/libgpg-error-1.31.tar.bz2.sig
 	source = 01-mingw32-fix-potomo.mingw.patch
 	source = 02-fix-symbollist-on.mingw.patch
 	source = 05-w32-gen.all.patch
-	sha1sums = a428758999ff573e62d06892e3d2c0b0f335787c
+	source = 07-windows-build.patch
+	validpgpkeys = D8692123C4065DEA5E0F3AB5249B39D24F25E3B6
+	validpgpkeys = 031EC2536E580D8EA286A9F22071B08A33BD3F06
+	sha1sums = 2bafad316d4e3e12bae4822b14ed9020090e6acf
 	sha1sums = SKIP
 	sha1sums = b32a305f593835132a610272aeb219165dc354c4
 	sha1sums = a7bbc4637aba322cd43aa7c5a6d99faa8f801133
 	sha1sums = 07f1c34b3861bc2658d1cad4fafe895f654815df
+	sha1sums = 86977605a345a0684c8066824f935042990b085f
 
 pkgname = mingw-w64-libgpg-error
 
diff --git a/07-windows-build.patch b/07-windows-build.patch
new file mode 100644
index 000000000000..6f68cd4385c6
--- /dev/null
+++ b/07-windows-build.patch
@@ -0,0 +1,17 @@
+--- libgpg-error-1.16/src/Makefile.am.orig	2014-09-23 23:35:27.832600000 +0500
++++ libgpg-error-1.16/src/Makefile.am	2014-09-24 00:08:20.985200000 +0500
+@@ -268,9 +268,14 @@
+ pre_mkheader_cmds = :
+ parts_of_gpg_error_h += ./lock-obj-pub.native.h
+ 
++if HAVE_W32_SYSTEM
++./lock-obj-pub.native.h: Makefile gen-w32-lock-obj$(EXEEXT) w32-lock-obj.h
++	./gen-w32-lock-obj >$@
++else
+ ./lock-obj-pub.native.h: Makefile gen-posix-lock-obj$(EXEEXT) posix-lock-obj.h
+ 	./gen-posix-lock-obj >$@
+ endif
++endif
+ 
+ # We also depend on versioninfo.rc because that is build by
+ # config.status and thus has up-to-date version numbers.
diff --git a/PKGBUILD b/PKGBUILD
index ef75aefb8bbf..57248f18f606 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,5 +1,5 @@
 pkgname=mingw-w64-libgpg-error
-pkgver=1.27
+pkgver=1.31
 pkgrel=1
 pkgdesc="Support library for libgcrypt (mingw-w64)"
 arch=(any)
@@ -11,12 +11,14 @@ options=(staticlibs !strip !buildflags)
 source=("ftp://ftp.gnupg.org/gcrypt/libgpg-error/libgpg-error-${pkgver}.tar.bz2"{,.sig}
 "01-mingw32-fix-potomo.mingw.patch"
 "02-fix-symbollist-on.mingw.patch"
-"05-w32-gen.all.patch")
-sha1sums=('a428758999ff573e62d06892e3d2c0b0f335787c'
+"05-w32-gen.all.patch"
+"07-windows-build.patch")
+sha1sums=('2bafad316d4e3e12bae4822b14ed9020090e6acf'
           'SKIP'
           'b32a305f593835132a610272aeb219165dc354c4'
           'a7bbc4637aba322cd43aa7c5a6d99faa8f801133'
-          '07f1c34b3861bc2658d1cad4fafe895f654815df')
+          '07f1c34b3861bc2658d1cad4fafe895f654815df'
+          '86977605a345a0684c8066824f935042990b085f')
 validpgpkeys=('D8692123C4065DEA5E0F3AB5249B39D24F25E3B6'  # Werner Koch
               '031EC2536E580D8EA286A9F22071B08A33BD3F06') # NIIBE Yutaka (GnuPG Release Key) <gniibe@fsij.org>
 _architectures="i686-w64-mingw32 x86_64-w64-mingw32"
@@ -26,6 +28,7 @@ prepare() {
 	patch -p1 -i ${srcdir}/01-mingw32-fix-potomo.mingw.patch
 	patch -p1 -i ${srcdir}/02-fix-symbollist-on.mingw.patch
 	patch -p1 -i ${srcdir}/05-w32-gen.all.patch
+  patch -p1 -i ${srcdir}/07-windows-build.patch
   autoreconf -fi
 }