1.26

4 files changed, 10 insertions, 31 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 08c6eabbed7a..cb030e7f3b9d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Sat Nov 26 10:36:12 UTC 2016
+# Sun Jan  1 11:55:47 UTC 2017
 pkgbase = mingw-w64-libgpg-error
 	pkgdesc = Support library for libgcrypt (mingw-w64)
-	pkgver = 1.25
+	pkgver = 1.26
 	pkgrel = 1
 	url = http://www.gnupg.org
 	arch = any
@@ -12,18 +12,16 @@ pkgbase = mingw-w64-libgpg-error
 	options = staticlibs
 	options = !strip
 	options = !buildflags
-	source = ftp://ftp.gnupg.org/gcrypt/libgpg-error/libgpg-error-1.25.tar.bz2
-	source = ftp://ftp.gnupg.org/gcrypt/libgpg-error/libgpg-error-1.25.tar.bz2.sig
+	source = ftp://ftp.gnupg.org/gcrypt/libgpg-error/libgpg-error-1.26.tar.bz2
+	source = ftp://ftp.gnupg.org/gcrypt/libgpg-error/libgpg-error-1.26.tar.bz2.sig
 	source = 01-mingw32-fix-potomo.mingw.patch
 	source = 02-fix-symbollist-on.mingw.patch
 	source = 05-w32-gen.all.patch
-	source = 07-windows-build.patch
-	sha1sums = 8ab7494e40f80f4138edc9516981bf4afe7d9dbf
+	sha1sums = 9a926e7ee6309e539313443555535d49a2a5c9f1
 	sha1sums = SKIP
 	sha1sums = b32a305f593835132a610272aeb219165dc354c4
 	sha1sums = a7bbc4637aba322cd43aa7c5a6d99faa8f801133
 	sha1sums = 07f1c34b3861bc2658d1cad4fafe895f654815df
-	sha1sums = 367b3b33da0ae3a8f959ae8535d6584a997ad6b8
 
 pkgname = mingw-w64-libgpg-error
 
diff --git a/.gitignore b/.gitignore
index d6a576c6d1bb..4ba98af9a1a4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
 pkg/
 src/
 *.bz2
+*.log
 *.sig
 *.tar
 *.xz
diff --git a/07-windows-build.patch b/07-windows-build.patch
deleted file mode 100644
index c50a3016224c..000000000000
--- a/07-windows-build.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- 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 w32-lock-obj.h
-+	./gen-w32-lock-obj >$@
-+else
- ./lock-obj-pub.native.h: Makefile gen-posix-lock-obj 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 72e80a520fcc..bbfd6d6225e7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,5 +1,5 @@
 pkgname=mingw-w64-libgpg-error
-pkgver=1.25
+pkgver=1.26
 pkgrel=1
 pkgdesc="Support library for libgcrypt (mingw-w64)"
 arch=(any)
@@ -11,14 +11,12 @@ 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"
-"07-windows-build.patch")
-sha1sums=('8ab7494e40f80f4138edc9516981bf4afe7d9dbf'
+"05-w32-gen.all.patch")
+sha1sums=('9a926e7ee6309e539313443555535d49a2a5c9f1'
           'SKIP'
           'b32a305f593835132a610272aeb219165dc354c4'
           'a7bbc4637aba322cd43aa7c5a6d99faa8f801133'
-          '07f1c34b3861bc2658d1cad4fafe895f654815df'
-          '367b3b33da0ae3a8f959ae8535d6584a997ad6b8')
+          '07f1c34b3861bc2658d1cad4fafe895f654815df')
 validpgpkeys=('D8692123C4065DEA5E0F3AB5249B39D24F25E3B6'  # Werner Koch
               '031EC2536E580D8EA286A9F22071B08A33BD3F06') # NIIBE Yutaka (GnuPG Release Key) <gniibe@fsij.org>
 _architectures="i686-w64-mingw32 x86_64-w64-mingw32"
@@ -28,7 +26,6 @@ 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
 }