Commit 185a1d70 authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

Contribs: update gpg-error to 1.16

Close #12400

(cherry picked from commit e5cd171227b1982dc70cc97703622cbef82ead29)
Signed-off-by: default avatarJean-Baptiste Kempf <jb@videolan.org>
parent 2099d8b8
7ceb654b9690b27ea904861a47eb2da16d68da11f69e150cb413970b3dd756093d1fcf1fabeabb7aadc888bfa03edc64115dbc572a97428ddcf9f0af0c1b210b libgpg-error-1.15.tar.bz2 2f223ca40a3cb8c5343106d712ff32415628afe06e8fe199907cb2aa5e85748b8b2222a2963e3ab5fd48232a702858d16dcb8f69640d67ea94cafe441f2bb15f libgpg-error-1.16.tar.bz2
--- 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);
# GPGERROR # GPGERROR
GPGERROR_VERSION := 1.15 GPGERROR_VERSION := 1.16
GPGERROR_URL := ftp://ftp.gnupg.org/gcrypt/libgpg-error/libgpg-error-$(GPGERROR_VERSION).tar.bz2 GPGERROR_URL := ftp://ftp.gnupg.org/gcrypt/libgpg-error/libgpg-error-$(GPGERROR_VERSION).tar.bz2
$(TARBALLS)/libgpg-error-$(GPGERROR_VERSION).tar.bz2: $(TARBALLS)/libgpg-error-$(GPGERROR_VERSION).tar.bz2:
...@@ -13,7 +13,6 @@ ifdef HAVE_WIN32 ...@@ -13,7 +13,6 @@ ifdef HAVE_WIN32
$(APPLY) $(SRC)/gpg-error/windres-make.patch $(APPLY) $(SRC)/gpg-error/windres-make.patch
endif endif
$(APPLY) $(SRC)/gpg-error/missing-unistd-include.patch $(APPLY) $(SRC)/gpg-error/missing-unistd-include.patch
$(APPLY) $(SRC)/gpg-error/gpgerror-android.patch
$(MOVE) $(MOVE)
cp $@/src/syscfg/lock-obj-pub.arm-unknown-linux-androideabi.h $@/src/syscfg/lock-obj-pub.linux-android.h cp $@/src/syscfg/lock-obj-pub.arm-unknown-linux-androideabi.h $@/src/syscfg/lock-obj-pub.linux-android.h
ifdef HAVE_IOS ifdef HAVE_IOS
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment