[vlc-devel] [PATCH] contrib: gpg-error update to 1.37
Biswapriyo Nath
nathbappai at gmail.com
Tue Mar 24 20:44:49 CET 2020
-------------- next part --------------
From fd8b99557649ea628ce82369c3e72f5f621188c0 Mon Sep 17 00:00:00 2001
From: Biswapriyo Nath <nathbappai at gmail.com>
Date: Tue, 24 Mar 2020 23:56:47 +0530
Subject: [PATCH] contrib: gpg-error update to 1.37
use https link and remove upstreamed patches
Signed-off-by: Biswapriyo Nath <nathbappai at gmail.com>
---
contrib/src/gpg-error/SHA512SUMS | 2 +-
.../gpg-error/missing-unistd-include.patch | 11 --
contrib/src/gpg-error/no-executable.patch | 2 +-
contrib/src/gpg-error/rules.mak | 7 +-
.../src/gpg-error/version-bump-gawk-5.patch | 159 ------------------
.../src/gpg-error/win32-extern-struct.patch | 11 --
contrib/src/gpg-error/win32-unicode.patch | 6 +-
contrib/src/gpg-error/windres-make.patch | 12 +-
contrib/src/gpg-error/winrt.patch | 14 +-
9 files changed, 19 insertions(+), 205 deletions(-)
delete mode 100644 contrib/src/gpg-error/missing-unistd-include.patch
delete mode 100644 contrib/src/gpg-error/version-bump-gawk-5.patch
delete mode 100644 contrib/src/gpg-error/win32-extern-struct.patch
diff --git a/contrib/src/gpg-error/SHA512SUMS b/contrib/src/gpg-error/SHA512SUMS
index 889f056..69e7a9f 100644
--- a/contrib/src/gpg-error/SHA512SUMS
+++ b/contrib/src/gpg-error/SHA512SUMS
@@ -1 +1 @@
-51b313c1159074fdbbce84f63bd8afd84b3b58cd608714865b25bed84c1862d050708aa06ac3dab92f1906593df5121161e594c2809653b0fb2c236cae5dcc2f libgpg-error-1.27.tar.bz2
+fa12977237fcc872e944cda39ca43ee7d2cc9c52e243ede6077f4a31ae135e322dc848b4b55cffdc4ec53f27601ba30ddb368b090a94cd00d9345a55b323f179 libgpg-error-1.37.tar.bz2
diff --git a/contrib/src/gpg-error/missing-unistd-include.patch b/contrib/src/gpg-error/missing-unistd-include.patch
deleted file mode 100644
index 19dc806..0000000
--- a/contrib/src/gpg-error/missing-unistd-include.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -ru libgpg-error/tests/t-lock.c libgpg-error-fixed/tests/t-lock.c
---- libgpg-error/tests/t-lock.c 2014-01-24 21:50:09.000000000 +0100
-+++ libgpg-error-fixed/tests/t-lock.c 2014-08-17 22:10:24.000000000 +0200
-@@ -24,6 +24,7 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
-+#include <unistd.h>
- #include <assert.h>
- #ifdef _WIN32
- # include <windows.h>
diff --git a/contrib/src/gpg-error/no-executable.patch b/contrib/src/gpg-error/no-executable.patch
index 0f94139..93e74fd 100644
--- a/contrib/src/gpg-error/no-executable.patch
+++ b/contrib/src/gpg-error/no-executable.patch
@@ -1,6 +1,6 @@
--- libgpg-error/src/Makefile.am.orig 2014-10-25 14:42:43.000000000 +0200
+++ libgpg-error/src/Makefile.am 2015-05-05 16:59:40.887486960 +0200
-@@ -31,7 +31,7 @@
+@@ -34,7 +34,7 @@
localedir = $(datadir)/locale
diff --git a/contrib/src/gpg-error/rules.mak b/contrib/src/gpg-error/rules.mak
index e045c8e..723c2e5 100644
--- a/contrib/src/gpg-error/rules.mak
+++ b/contrib/src/gpg-error/rules.mak
@@ -1,6 +1,6 @@
# GPGERROR
-GPGERROR_VERSION := 1.27
-GPGERROR_URL := ftp://ftp.gnupg.org/gcrypt/libgpg-error/libgpg-error-$(GPGERROR_VERSION).tar.bz2
+GPGERROR_VERSION := 1.37
+GPGERROR_URL := https://gnupg.org/ftp/gcrypt/libgpg-error/libgpg-error-$(GPGERROR_VERSION).tar.bz2
$(TARBALLS)/libgpg-error-$(GPGERROR_VERSION).tar.bz2:
$(call download_pkg,$(GPGERROR_URL),gpg-error)
@@ -19,11 +19,8 @@ ifdef HAVE_WINSTORE
$(APPLY) $(SRC)/gpg-error/winrt.patch
endif
endif
- $(APPLY) $(SRC)/gpg-error/missing-unistd-include.patch
$(APPLY) $(SRC)/gpg-error/no-executable.patch
$(APPLY) $(SRC)/gpg-error/win32-unicode.patch
- $(APPLY) $(SRC)/gpg-error/version-bump-gawk-5.patch
- $(APPLY) $(SRC)/gpg-error/win32-extern-struct.patch
$(MOVE)
ifdef HAVE_ANDROID
ifeq ($(ARCH),aarch64)
diff --git a/contrib/src/gpg-error/version-bump-gawk-5.patch b/contrib/src/gpg-error/version-bump-gawk-5.patch
deleted file mode 100644
index 67fa74b..0000000
--- a/contrib/src/gpg-error/version-bump-gawk-5.patch
+++ /dev/null
@@ -1,159 +0,0 @@
-From 5fab5cefbd250619adb2701859ee9e7b1ebf694f Mon Sep 17 00:00:00 2001
-From:
-Date: Sun, 21 Apr 2019 17:30:47 -0500
-Subject: [PATCH] Fully support gawk-5
-
----
- lang/cl/mkerrcodes.awk | 2 +-
- src/Makefile.am | 2 +-
- src/Makefile.in | 2 +-
- src/mkerrcodes.awk | 2 +-
- src/mkerrcodes1.awk | 2 +-
- src/mkerrcodes2.awk | 2 +-
- src/mkerrnos.awk | 2 +-
- src/mkstrtable.awk | 10 +++++-----
- 8 files changed, 12 insertions(+), 12 deletions(-)
-
-diff --git a/lang/cl/mkerrcodes.awk b/lang/cl/mkerrcodes.awk
-index ae29043..9a1fc18 100644
---- a/lang/cl/mkerrcodes.awk
-+++ b/lang/cl/mkerrcodes.awk
-@@ -122,7 +122,7 @@ header {
- }
-
- !header {
-- sub (/\#.+/, "");
-+ sub (/#.+/, "");
- sub (/[ ]+$/, ""); # Strip trailing space and tab characters.
-
- if (/^$/)
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 42998e4..0ceac9f 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -281,7 +281,7 @@ code-from-errno.h: mkerrcodes Makefile
-
- errnos-sym.h: Makefile mkstrtable.awk errnos.in
- $(AWK) -f $(srcdir)/mkstrtable.awk -v textidx=2 -v nogettext=1 \
-- -v prefix=GPG_ERR_ -v namespace=errnos_ \
-+ -v prefix=GPG_ERR_ -v pkg_namespace=errnos_ \
- $(srcdir)/errnos.in >$@
-
-
-diff --git a/src/Makefile.in b/src/Makefile.in
-index 9ffb29d..a9efa38 100644
---- a/src/Makefile.in
-+++ b/src/Makefile.in
-@@ -1449,7 +1449,7 @@ code-from-errno.h: mkerrcodes Makefile
-
- errnos-sym.h: Makefile mkstrtable.awk errnos.in
- $(AWK) -f $(srcdir)/mkstrtable.awk -v textidx=2 -v nogettext=1 \
-- -v prefix=GPG_ERR_ -v namespace=errnos_ \
-+ -v prefix=GPG_ERR_ -v pkg_namespace=errnos_ \
- $(srcdir)/errnos.in >$@
-
- mkheader: mkheader.c Makefile
-diff --git a/src/mkerrcodes.awk b/src/mkerrcodes.awk
-index 46d436c..e9c857c 100644
---- a/src/mkerrcodes.awk
-+++ b/src/mkerrcodes.awk
-@@ -85,7 +85,7 @@ header {
- }
-
- !header {
-- sub (/\#.+/, "");
-+ sub (/#.+/, "");
- sub (/[ ]+$/, ""); # Strip trailing space and tab characters.
-
- if (/^$/)
-diff --git a/src/mkerrcodes1.awk b/src/mkerrcodes1.awk
-index a771a73..4578e29 100644
---- a/src/mkerrcodes1.awk
-+++ b/src/mkerrcodes1.awk
-@@ -81,7 +81,7 @@ header {
- }
-
- !header {
-- sub (/\#.+/, "");
-+ sub (/#.+/, "");
- sub (/[ ]+$/, ""); # Strip trailing space and tab characters.
-
- if (/^$/)
-diff --git a/src/mkerrcodes2.awk b/src/mkerrcodes2.awk
-index ea58503..188f7a4 100644
---- a/src/mkerrcodes2.awk
-+++ b/src/mkerrcodes2.awk
-@@ -91,7 +91,7 @@ header {
- }
-
- !header {
-- sub (/\#.+/, "");
-+ sub (/#.+/, "");
- sub (/[ ]+$/, ""); # Strip trailing space and tab characters.
-
- if (/^$/)
-diff --git a/src/mkerrnos.awk b/src/mkerrnos.awk
-index f79df66..15b1aad 100644
---- a/src/mkerrnos.awk
-+++ b/src/mkerrnos.awk
-@@ -83,7 +83,7 @@ header {
- }
-
- !header {
-- sub (/\#.+/, "");
-+ sub (/#.+/, "");
- sub (/[ ]+$/, ""); # Strip trailing space and tab characters.
-
- if (/^$/)
-diff --git a/src/mkstrtable.awk b/src/mkstrtable.awk
-index c9de9c1..285e45f 100644
---- a/src/mkstrtable.awk
-+++ b/src/mkstrtable.awk
-@@ -77,7 +77,7 @@
- #
- # The variable prefix can be used to prepend a string to each message.
- #
--# The variable namespace can be used to prepend a string to each
-+# The variable pkg_namespace can be used to prepend a string to each
- # variable and macro name.
-
- BEGIN {
-@@ -102,7 +102,7 @@ header {
- print "/* The purpose of this complex string table is to produce";
- print " optimal code with a minimum of relocations. */";
- print "";
-- print "static const char " namespace "msgstr[] = ";
-+ print "static const char " pkg_namespace "msgstr[] = ";
- header = 0;
- }
- else
-@@ -110,7 +110,7 @@ header {
- }
-
- !header {
-- sub (/\#.+/, "");
-+ sub (/#.+/, "");
- sub (/[ ]+$/, ""); # Strip trailing space and tab characters.
-
- if (/^$/)
-@@ -150,7 +150,7 @@ END {
- else
- print " gettext_noop (\"" last_msgstr "\");";
- print "";
-- print "static const int " namespace "msgidx[] =";
-+ print "static const int " pkg_namespace "msgidx[] =";
- print " {";
- for (i = 0; i < coded_msgs; i++)
- print " " pos[i] ",";
-@@ -158,7 +158,7 @@ END {
- print " };";
- print "";
- print "static GPG_ERR_INLINE int";
-- print namespace "msgidxof (int code)";
-+ print pkg_namespace "msgidxof (int code)";
- print "{";
- print " return (0 ? 0";
-
---
-2.21.0
-
diff --git a/contrib/src/gpg-error/win32-extern-struct.patch b/contrib/src/gpg-error/win32-extern-struct.patch
deleted file mode 100644
index 5d92491..0000000
--- a/contrib/src/gpg-error/win32-extern-struct.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- libgpg-error-1.27/src/gpgrt-int.h.orig 2020-03-10 10:54:53.127491822 +0200
-+++ libgpg-error-1.27/src/gpgrt-int.h 2020-03-10 10:55:48.526283928 +0200
-@@ -359,7 +359,7 @@
-
- #if _WIN32
- /* Prototypes for w32-estream.c. */
--struct cookie_io_functions_s _gpgrt_functions_w32_pollable;
-+extern struct cookie_io_functions_s _gpgrt_functions_w32_pollable;
- int _gpgrt_w32_pollable_create (void *_GPGRT__RESTRICT *_GPGRT__RESTRICT cookie,
- unsigned int modeflags,
- struct cookie_io_functions_s next_functions,
diff --git a/contrib/src/gpg-error/win32-unicode.patch b/contrib/src/gpg-error/win32-unicode.patch
index 0b6c832..c3f052e 100644
--- a/contrib/src/gpg-error/win32-unicode.patch
+++ b/contrib/src/gpg-error/win32-unicode.patch
@@ -1,6 +1,6 @@
--- libgpg-error/src/estream.c 2016-05-24 11:21:10.180251700 +0200
+++ libgpg-error/src/estream.c.msvc 2016-05-24 11:23:18.195880200 +0200
-@@ -4115,7 +4115,7 @@ tmpfd (void)
+@@ -4500,7 +4500,7 @@
{
#ifdef HAVE_W32_SYSTEM
int attempts, n;
@@ -9,7 +9,7 @@
wchar_t buffer[MAX_PATH+9+12+1];
# define mystrlen(a) wcslen (a)
wchar_t *name, *p;
-@@ -4136,7 +4136,7 @@ tmpfd (void)
+@@ -4521,7 +4521,7 @@
return -1;
}
p = buffer + mystrlen (buffer);
@@ -18,7 +18,7 @@
wcscpy (p, L"_estream");
#else
strcpy (p, "_estream");
-@@ -4157,7 +4157,7 @@ tmpfd (void)
+@@ -4542,7 +4542,7 @@
*p++ = tohex (((value >> 28) & 0x0f));
value <<= 4;
}
diff --git a/contrib/src/gpg-error/windres-make.patch b/contrib/src/gpg-error/windres-make.patch
index 53ddbec..386ef02 100644
--- a/contrib/src/gpg-error/windres-make.patch
+++ b/contrib/src/gpg-error/windres-make.patch
@@ -1,8 +1,8 @@
--- libgpg-error/src/Makefile.am 2010-04-14 11:16:44.000000000 +0200
+++ libgpg-error.new/src/Makefile.am 2010-08-09 11:21:56.000000000 +0200
-@@ -60,7 +60,7 @@
- arch_sources = w32-gettext.c
-
+@@ -129,7 +129,7 @@
+ arch_sources = w32-gettext.c w32-lock.c w32-lock-obj.h w32-thread.c \
+ w32-iconv.c w32-estream.c w32-reg.c spawn-w32.c
RCCOMPILE = $(RC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- -DLOCALEDIR=\"$(localedir)\" $(AM_CPPFLAGS) $(CPPFLAGS)
+ -DLOCALEDIR=\"$(localedir)\" $(AM_CPPFLAGS)
@@ -11,9 +11,9 @@
SUFFIXES = .rc .lo
--- libgpg-error/src/Makefile.in.orig 2011-11-22 23:23:14.450340031 -0500
+++ libgpg-error/src/Makefile.in 2011-11-22 23:23:20.650370779 -0500
-@@ -306,7 +306,7 @@
- @HAVE_W32_SYSTEM_FALSE at arch_sources =
- @HAVE_W32_SYSTEM_TRUE at arch_sources = w32-gettext.c
+@@ -610,7 +610,7 @@
+ @HAVE_W32_SYSTEM_TRUE@ w32-iconv.c w32-estream.c w32-reg.c spawn-w32.c
+
@HAVE_W32_SYSTEM_TRUE at RCCOMPILE = $(RC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- at HAVE_W32_SYSTEM_TRUE@ -DLOCALEDIR=\"$(localedir)\" $(AM_CPPFLAGS) $(CPPFLAGS)
+ at HAVE_W32_SYSTEM_TRUE@ -DLOCALEDIR=\"$(localedir)\" $(AM_CPPFLAGS)
diff --git a/contrib/src/gpg-error/winrt.patch b/contrib/src/gpg-error/winrt.patch
index 4bcee8d..7b06acb 100644
--- a/contrib/src/gpg-error/winrt.patch
+++ b/contrib/src/gpg-error/winrt.patch
@@ -1,15 +1,15 @@
--- libgpg-error/src/w32-gettext.c.orig 2016-05-09 17:30:18.306788566 +0200
+++ libgpg-error/src/w32-gettext.c 2016-05-09 17:32:19.830771580 +0200
-@@ -53,7 +53,7 @@
- #include "init.h"
- #include "gpg-error.h"
+@@ -63,7 +63,7 @@
+ } override_locale;
+
-#ifdef HAVE_W32CE_SYSTEM
+#if defined(HAVE_W32CE_SYSTEM) || WINAPI_FAMILY_PARTITION (WINAPI_PARTITION_APP)
/* Forward declaration. */
static wchar_t *utf8_to_wchar (const char *string, size_t length, size_t *retlen);
-@@ -644,6 +644,7 @@
+@@ -654,6 +654,7 @@
static const char *
my_nl_locale_name (const char *categoryname)
{
@@ -17,7 +17,7 @@
#ifndef HAVE_W32CE_SYSTEM
const char *retval;
#endif
-@@ -1053,6 +1054,9 @@
+@@ -1067,6 +1068,9 @@
case LANG_ZULU: return "zu_ZA";
default: return "C";
}
@@ -27,9 +27,7 @@
}
/* localname.c from gettext END. */
---- libgpg-error/src/w32-gettext.c.orig 2016-08-25 15:55:09.006943405 +0200
-+++ libgpg-error/src/w32-gettext.c 2016-08-25 15:56:47.442788455 +0200
-@@ -1383,7 +1383,7 @@
+@@ -1397,7 +1401,7 @@
{
int n;
char *result;
--
2.25.2
More information about the vlc-devel
mailing list