# HG changeset patch
# User John Donoghue
# Date 1581454568 18000
# Node ID e8d4843a6b559d3112bf0ab33f51e73ed2fe93b5
# Parent  904c78a5156ce316d04404447f3a0234d9e36fc4
Update libgpg_error to v1.37

* src/libgpg_error-1-fixes.patch: new file

* dist-files.mk: add ref to new file

* src/libgpg_error.mk: update version, checksum

diff -r 904c78a5156c -r e8d4843a6b55 dist-files.mk
--- a/dist-files.mk	Tue Feb 11 15:52:38 2020 -0500
+++ b/dist-files.mk	Tue Feb 11 15:56:08 2020 -0500
@@ -241,6 +241,7 @@
   libgnurx.mk \
   libgomp-test.c \
   libgomp.mk \
+  libgpg_error-1-fixes.patch \
   libgpg_error.mk \
   libgsasl-1-fixes.patch \
   libgsasl-test.c \
diff -r 904c78a5156c -r e8d4843a6b55 src/libgpg_error-1-fixes.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/libgpg_error-1-fixes.patch	Tue Feb 11 15:56:08 2020 -0500
@@ -0,0 +1,85 @@
+This file is part of MXE. See LICENSE.md for licensing information.
+
+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/3] more tolerant parsing for mingw in host triplet
+
+
+diff --git a/src/mkheader.c b/src/mkheader.c
+index 1111111..2222222 100644
+--- a/src/mkheader.c
++++ b/src/mkheader.c
+@@ -602,7 +602,7 @@ write_special (const char *fname, int lnr, const char *tag)
+     }
+   else if (!strcmp (tag, "include:os-add"))
+     {
+-      if (!strcmp (host_os, "mingw32"))
++      if (strstr (host_os, "mingw"))
+         {
+           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, 6 Nov 2019 19:00:10 +1100
+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
+
+diff --git a/src/gpg-error.def.in b/src/gpg-error.def.in
+index 1111111..2222222 100644
+--- a/src/gpg-error.def.in
++++ b/src/gpg-error.def.in
+@@ -24,7 +24,6 @@
+  */
+ 
+ #include <config.h>
+-
+ EXPORTS
+  gpg_strerror                 @1
+  gpg_strerror_r               @2
+
+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 3/3] fix for automake < 1.12
+
+
+diff --git a/configure.ac b/configure.ac
+index 1111111..2222222 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -62,9 +62,28 @@ VERSION_NUMBER=m4_esyscmd(printf "0x%02x%02x00" mym4_major mym4_minor)
+ AC_SUBST(VERSION_NUMBER)
+ 
+ AC_CONFIG_AUX_DIR([build-aux])
+-AM_INIT_AUTOMAKE([serial-tests dist-bzip2])
+ AM_MAINTAINER_MODE
+ AC_CONFIG_SRCDIR([src/err-sources.h.in])
++
++
++dnl Initialize automake.  automake < 1.12 didn't have serial-tests and
++dnl gives an error if it sees this, but for automake >= 1.13
++dnl serial-tests is required so we have to include it.  Solution is to
++dnl test for the version of automake (by running an external command)
++dnl and provide it if necessary.  Note we have to do this entirely using
++dnl m4 macros since automake queries this macro by running
++dnl 'autoconf --trace ...'.
++m4_define([serial_tests], [
++    m4_esyscmd([automake --version |
++                head -1 |
++                awk '{split ($NF,a,"."); if (a[1] == 1 && a[2] >= 12) { '\
++                    'print "serial-tests" }}'
++    ])
++])
++dnl NB: Do not [quote] this parameter.
++AM_INIT_AUTOMAKE(serial_tests dist-bzip2)
++
++
+ AC_CONFIG_HEADER([config.h])
+ AC_CONFIG_MACRO_DIR([m4])
+ AM_SILENT_RULES
diff -r 904c78a5156c -r e8d4843a6b55 src/libgpg_error.mk
--- a/src/libgpg_error.mk	Tue Feb 11 15:52:38 2020 -0500
+++ b/src/libgpg_error.mk	Tue Feb 11 15:56:08 2020 -0500
@@ -3,8 +3,8 @@
 
 PKG             := libgpg_error
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 1.36
-$(PKG)_CHECKSUM := 5245ce38b198cecd57775fb3c7b7328ec1a2a615
+$(PKG)_VERSION  := 1.37
+$(PKG)_CHECKSUM := 6dff83371e0c03fe9ba468cc23d528a8c247785a
 $(PKG)_SUBDIR   := libgpg-error-$($(PKG)_VERSION)
 $(PKG)_FILE     := libgpg-error-$($(PKG)_VERSION).tar.bz2
 $(PKG)_URL      := ftp://ftp.gnupg.org/gcrypt/libgpg-error/$($(PKG)_FILE)