Update gpg-error to 1.11

diff --git a/contrib/src/gpg-error/SHA512SUMS b/contrib/src/gpg-error/SHA512SUMS
index a769b1fd3d05177eca7c95a6d5bd29d2603df219..109830cd62296df6705f8039875217e27de210b7 100644 (file)
--- a/contrib/src/gpg-error/SHA512SUMS
+++ b/contrib/src/gpg-error/SHA512SUMS
@@ -1 +1 @@
-438f922a3a4fa7db22ba9b68deab18c663afbc8166ddeee487b7eb0a9ee04ce84bbc871ad31bf11a7c77322948869a2dc5014cf6a73b68d8f10fcf7e24d165d5  libgpg-error-1.10.tar.bz2
+1c05dec32bba0a3ff9b238559161cfe5ea70fdcf0b7d2e645ac8afcade125711c1e369fcfb385835d42ce78cbbec75e3ea99573adfb371689e440a799ae8b848  libgpg-error-1.11.tar.bz2

diff --git a/contrib/src/gpg-error/cppflags.patch b/contrib/src/gpg-error/cppflags.patch
deleted file mode 100644 (file)
index 2f4fa75..0000000
--- a/contrib/src/gpg-error/cppflags.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur libgpg-error.orig/src/Makefile.in libgpg-error/src/Makefile.in
---- libgpg-error.orig/src/Makefile.in  2012-06-25 22:14:30.745691001 +0200
-+++ libgpg-error/src/Makefile.in       2012-06-25 22:15:16.897691001 +0200
-@@ -848,7 +848,7 @@
- # It is correct to use $(CPP).  We want the host's idea of the error codes.
- mkerrcodes.h: Makefile mkerrcodes.awk $(gpg_extra_headers)
-       $(AWK) -f $(srcdir)/mkerrcodes1.awk $(srcdir)/errnos.in >_$@
--      $(CPP) $(extra_cppflags) _$@ | grep GPG_ERR_ | \
-+      $(CPP) $(CPPFLAGS) $(extra_cppflags) _$@ | grep GPG_ERR_ | \
-                $(AWK) -f $(srcdir)/mkerrcodes.awk >$@
-       -rm _$@
- 

diff --git a/contrib/src/gpg-error/rules.mak b/contrib/src/gpg-error/rules.mak
index 477481fc6d6afde587ae915a4673e68dcc7b10a3..912de40d6ca97583d1dc406cbb60d2f76924b376 100644 (file)
--- a/contrib/src/gpg-error/rules.mak
+++ b/contrib/src/gpg-error/rules.mak
@@ -1,5 +1,5 @@
 # GPGERROR
-GPGERROR_VERSION := 1.10
+GPGERROR_VERSION := 1.11
 GPGERROR_URL := ftp://ftp.gnupg.org/gcrypt/libgpg-error/libgpg-error-$(GPGERROR_VERSION).tar.bz2
 
 $(TARBALLS)/libgpg-error-$(GPGERROR_VERSION).tar.bz2:
@@ -12,7 +12,6 @@ libgpg-error: libgpg-error-$(GPGERROR_VERSION).tar.bz2 .sum-gpg-error
 ifdef HAVE_WIN32
        $(APPLY) $(SRC)/gpg-error/windres-make.patch
 endif
-       $(APPLY) $(SRC)/gpg-error/cppflags.patch
        $(MOVE)
 
 .gpg-error: libgpg-error