mirror of https://git.wownero.com/dsc/mxe.git
update: gnutls, libgpg_error, libtasn1, poppler
This commit is contained in:
parent
c48405d817
commit
32689aeecf
|
@ -60,7 +60,7 @@ diff --git a/configure.ac b/configure.ac
|
|||
index 1111111..2222222 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -549,26 +549,19 @@ idna_support=no
|
||||
@@ -559,26 +559,19 @@ idna_support=no
|
||||
with_libidn2=no
|
||||
|
||||
if test "$try_libidn2" = yes;then
|
||||
|
@ -123,7 +123,7 @@ diff --git a/configure.ac b/configure.ac
|
|||
index 1111111..2222222 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -1023,17 +1023,6 @@ AC_DEFINE_UNQUOTED([INI_START_COMMENT_PREFIXES], [";#"], [The comment prefixes])
|
||||
@@ -1062,17 +1062,6 @@ AC_DEFINE_UNQUOTED([INI_START_COMMENT_PREFIXES], [";#"], [The comment prefixes])
|
||||
AC_CONFIG_FILES([guile/pre-inst-guile], [chmod +x guile/pre-inst-guile])
|
||||
AC_CONFIG_FILES([
|
||||
Makefile
|
||||
|
|
|
@ -3,8 +3,8 @@
|
|||
PKG := gnutls
|
||||
$(PKG)_WEBSITE := https://www.gnu.org/software/gnutls/
|
||||
$(PKG)_DESCR := GnuTLS
|
||||
$(PKG)_VERSION := 3.6.11.1
|
||||
$(PKG)_CHECKSUM := fbba12f3db9a55dbf027e14111755817ec44b57eabec3e8089aac8ac6f533cf8
|
||||
$(PKG)_VERSION := 3.6.12
|
||||
$(PKG)_CHECKSUM := bfacf16e342949ffd977a9232556092c47164bd26e166736cf3459a870506c4b
|
||||
$(PKG)_SUBDIR := gnutls-$($(PKG)_VERSION)
|
||||
$(PKG)_FILE := gnutls-$($(PKG)_VERSION).tar.xz
|
||||
$(PKG)_URL := https://gnupg.org/ftp/gcrypt/gnutls/v3.6/$($(PKG)_FILE)
|
||||
|
|
|
@ -5,7 +5,7 @@ Contains ad hoc patches for cross building.
|
|||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Mark Brand <mabrand@mabrand.nl>
|
||||
Date: Sat, 15 Dec 2018 16:51:30 +0100
|
||||
Subject: [PATCH 1/4] more tolerant parsing for mingw in host triplet
|
||||
Subject: [PATCH 1/3] more tolerant parsing for mingw in host triplet
|
||||
|
||||
|
||||
diff --git a/src/mkheader.c b/src/mkheader.c
|
||||
|
@ -22,146 +22,10 @@ index 1111111..2222222 100644
|
|||
include_file (fname, lnr, "w32-add.h", write_line);
|
||||
}
|
||||
|
||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Tony Theodore <tonyt@logyst.com>
|
||||
Date: Wed, 24 Apr 2019 23:18:54 +1000
|
||||
Subject: [PATCH 2/4] awk: Prepare for Gawk 5.0.
|
||||
|
||||
taken from:
|
||||
https://dev.gnupg.org/rE7865041c77f4f7005282f10f9b6666b19072fbdf
|
||||
|
||||
diff --git a/lang/cl/mkerrcodes.awk b/lang/cl/mkerrcodes.awk
|
||||
index 1111111..2222222 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 1111111..2222222 100644
|
||||
--- a/src/Makefile.am
|
||||
+++ b/src/Makefile.am
|
||||
@@ -293,7 +293,7 @@ code-from-errno.h: mkerrcodes$(EXEEXT_FOR_BUILD) 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/mkerrcodes.awk b/src/mkerrcodes.awk
|
||||
index 1111111..2222222 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 1111111..2222222 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 1111111..2222222 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 1111111..2222222 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 1111111..2222222 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";
|
||||
|
||||
|
||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Tony Theodore <tonyt@logyst.com>
|
||||
Date: Wed, 6 Nov 2019 19:00:10 +1100
|
||||
Subject: [PATCH 3/4] avoid whitespace in gpg-error.def linker script for
|
||||
Subject: [PATCH 2/3] avoid whitespace in gpg-error.def linker script for
|
||||
mingw32
|
||||
|
||||
https://lists.gnupg.org/pipermail/gnupg-devel/2016-February/030798.html
|
||||
|
@ -182,7 +46,7 @@ index 1111111..2222222 100644
|
|||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Tony Theodore <tonyt@logyst.com>
|
||||
Date: Wed, 6 Nov 2019 19:11:35 +1100
|
||||
Subject: [PATCH 4/4] fix for automake < 1.12
|
||||
Subject: [PATCH 3/3] fix for automake < 1.12
|
||||
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
|
|
|
@ -4,8 +4,8 @@ PKG := libgpg_error
|
|||
$(PKG)_WEBSITE := https://www.gnupg.org/related_software/libgpg-error/
|
||||
$(PKG)_DESCR := libgpg-error
|
||||
$(PKG)_IGNORE :=
|
||||
$(PKG)_VERSION := 1.36
|
||||
$(PKG)_CHECKSUM := babd98437208c163175c29453f8681094bcaf92968a15cafb1a276076b33c97c
|
||||
$(PKG)_VERSION := 1.37
|
||||
$(PKG)_CHECKSUM := b32d6ff72a73cf79797f7f2d039e95e9c6f92f0c1450215410840ab62aea9763
|
||||
$(PKG)_SUBDIR := libgpg-error-$($(PKG)_VERSION)
|
||||
$(PKG)_FILE := libgpg-error-$($(PKG)_VERSION).tar.bz2
|
||||
$(PKG)_URL := https://gnupg.org/ftp/gcrypt/libgpg-error/$($(PKG)_FILE)
|
||||
|
|
|
@ -3,8 +3,8 @@
|
|||
PKG := libtasn1
|
||||
$(PKG)_WEBSITE := https://www.gnu.org/software/libtasn1/
|
||||
$(PKG)_DESCR := GnuTLS
|
||||
$(PKG)_VERSION := 4.15.0
|
||||
$(PKG)_CHECKSUM := dd77509fe8f5304deafbca654dc7f0ea57f5841f41ba530cff9a5bf71382739e
|
||||
$(PKG)_VERSION := 4.16.0
|
||||
$(PKG)_CHECKSUM := 0e0fb0903839117cb6e3b56e68222771bebf22ad7fc2295a0ed7d576e8d4329d
|
||||
$(PKG)_SUBDIR := libtasn1-$($(PKG)_VERSION)
|
||||
$(PKG)_FILE := libtasn1-$($(PKG)_VERSION).tar.gz
|
||||
$(PKG)_URL := https://ftp.gnu.org/gnu/libtasn1/$($(PKG)_FILE)
|
||||
|
|
|
@ -3,8 +3,8 @@
|
|||
PKG := poppler
|
||||
$(PKG)_WEBSITE := https://poppler.freedesktop.org/
|
||||
$(PKG)_IGNORE :=
|
||||
$(PKG)_VERSION := 0.84.0
|
||||
$(PKG)_CHECKSUM := c7a130da743b38a548f7a21fe5940506fb1949f4ebdd3209f0e5b302fa139731
|
||||
$(PKG)_VERSION := 0.85.0
|
||||
$(PKG)_CHECKSUM := 2bc875eb323002ae6b287e09980473518e2b2ed6b5b7d2e1089e36a6cd00d94b
|
||||
$(PKG)_SUBDIR := poppler-$($(PKG)_VERSION)
|
||||
$(PKG)_FILE := poppler-$($(PKG)_VERSION).tar.xz
|
||||
$(PKG)_URL := https://poppler.freedesktop.org/$($(PKG)_FILE)
|
||||
|
|
Loading…
Reference in New Issue