Contribs: update gpg-error to 1.16

Close #12400

diff --git a/contrib/src/gpg-error/SHA512SUMS b/contrib/src/gpg-error/SHA512SUMS
index aabc9e816fc04de0ffaf366cc381cbc6fc06127d..1a10c80756a0eeb7aa4461ee5df283bb3762785d 100644 (file)
--- a/contrib/src/gpg-error/SHA512SUMS
+++ b/contrib/src/gpg-error/SHA512SUMS
@@ -1 +1 @@
-7ceb654b9690b27ea904861a47eb2da16d68da11f69e150cb413970b3dd756093d1fcf1fabeabb7aadc888bfa03edc64115dbc572a97428ddcf9f0af0c1b210b  libgpg-error-1.15.tar.bz2
+2f223ca40a3cb8c5343106d712ff32415628afe06e8fe199907cb2aa5e85748b8b2222a2963e3ab5fd48232a702858d16dcb8f69640d67ea94cafe441f2bb15f  libgpg-error-1.16.tar.bz2

diff --git a/contrib/src/gpg-error/gpgerror-android.patch b/contrib/src/gpg-error/gpgerror-android.patch
deleted file mode 100644 (file)
index 3b7b43d..0000000
--- a/contrib/src/gpg-error/gpgerror-android.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- libgpg-error/src/gpgrt-int.h.orig  2014-09-17 15:23:22.992333706 +0200
-+++ libgpg-error/src/gpgrt-int.h       2014-09-17 15:23:52.772783925 +0200
-@@ -105,9 +105,9 @@
- 
- int _gpgrt_fflush (gpgrt_stream_t stream);
- int _gpgrt_fseek (gpgrt_stream_t stream, long int offset, int whence);
--int _gpgrt_fseeko (gpgrt_stream_t stream, off_t offset, int whence);
-+int _gpgrt_fseeko (gpgrt_stream_t stream, gpgrt_off_t offset, int whence);
- long int _gpgrt_ftell (gpgrt_stream_t stream);
--off_t _gpgrt_ftello (gpgrt_stream_t stream);
-+gpgrt_off_t _gpgrt_ftello (gpgrt_stream_t stream);
- void _gpgrt_rewind (gpgrt_stream_t stream);
- 
- int _gpgrt_fgetc (gpgrt_stream_t stream);

diff --git a/contrib/src/gpg-error/rules.mak b/contrib/src/gpg-error/rules.mak
index 7fb6bddb1f599415102b80874fc3f6d4d5a7521e..b68d17ff24c465c1298e8e35edc531e56884799b 100644 (file)
--- a/contrib/src/gpg-error/rules.mak
+++ b/contrib/src/gpg-error/rules.mak
@@ -1,5 +1,5 @@
 # GPGERROR
-GPGERROR_VERSION := 1.15
+GPGERROR_VERSION := 1.16
 GPGERROR_URL := ftp://ftp.gnupg.org/gcrypt/libgpg-error/libgpg-error-$(GPGERROR_VERSION).tar.bz2
 
 $(TARBALLS)/libgpg-error-$(GPGERROR_VERSION).tar.bz2:
@@ -13,7 +13,6 @@ ifdef HAVE_WIN32
        $(APPLY) $(SRC)/gpg-error/windres-make.patch
 endif
        $(APPLY) $(SRC)/gpg-error/missing-unistd-include.patch
-       $(APPLY) $(SRC)/gpg-error/gpgerror-android.patch
        $(MOVE)
        cp $@/src/syscfg/lock-obj-pub.arm-unknown-linux-androideabi.h $@/src/syscfg/lock-obj-pub.linux-android.h
 ifdef HAVE_IOS