From a0474ed98acc1bdc83373a1889b798236a05df08 Mon Sep 17 00:00:00 2001
From: Sandro Mani <manisandro@gmail.com>
Date: Wed, 12 Aug 2020 14:10:15 +0200
Subject: [PATCH] Update to 0.21

---
 .gitignore                     |  1 +
 gettext-printf_collision.patch | 10 +++++-----
 mingw-gettext.spec             | 19 ++++++++++++-------
 sources                        |  2 +-
 4 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/.gitignore b/.gitignore
index b2f6b19..952d23b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@ gettext-0.17.tar.gz
 /gettext-0.19.7.tar.gz
 /gettext-0.20.1.tar.xz
 /gettext-0.20.2.tar.xz
+/gettext-0.21.tar.xz
diff --git a/gettext-printf_collision.patch b/gettext-printf_collision.patch
index f303374..18fcee2 100644
--- a/gettext-printf_collision.patch
+++ b/gettext-printf_collision.patch
@@ -1,7 +1,7 @@
-diff -rupN gettext-0.20.2/gettext-runtime/intl/libgnuintl.in.h gettext-0.20.2-new/gettext-runtime/intl/libgnuintl.in.h
---- gettext-0.20.2/gettext-runtime/intl/libgnuintl.in.h	2020-04-14 03:32:21.000000000 +0200
-+++ gettext-0.20.2-new/gettext-runtime/intl/libgnuintl.in.h	2020-07-28 14:51:42.012066985 +0200
-@@ -410,6 +410,7 @@ extern int vasprintf (char **, const cha
+diff -rupN --no-dereference gettext-0.21/gettext-runtime/intl/libgnuintl.in.h gettext-0.21-new/gettext-runtime/intl/libgnuintl.in.h
+--- gettext-0.21/gettext-runtime/intl/libgnuintl.in.h	2020-07-26 22:13:34.000000000 +0200
++++ gettext-0.21-new/gettext-runtime/intl/libgnuintl.in.h	2020-08-03 11:57:20.495613456 +0200
+@@ -431,6 +431,7 @@ extern int vasprintf (char **, const cha
  #endif
  
  #if @HAVE_WPRINTF@
@@ -9,7 +9,7 @@ diff -rupN gettext-0.20.2/gettext-runtime/intl/libgnuintl.in.h gettext-0.20.2-ne
  
  #undef fwprintf
  #define fwprintf libintl_fwprintf
-@@ -434,6 +435,8 @@ extern int vswprintf (wchar_t *, size_t,
+@@ -455,6 +456,8 @@ extern int vswprintf (wchar_t *, size_t,
  
  #endif
  
diff --git a/mingw-gettext.spec b/mingw-gettext.spec
index 8d55777..fafba94 100644
--- a/mingw-gettext.spec
+++ b/mingw-gettext.spec
@@ -1,15 +1,17 @@
 %{?mingw_package_header}
 
 Name:      mingw-gettext
-Version:   0.20.2
-Release:   3%{?dist}
+Version:   0.21
+Release:   1%{?dist}
 Summary:   GNU libraries and utilities for producing multi-lingual messages
 
 License:   GPLv2+ and LGPLv2+
 URL:       http://www.gnu.org/software/gettext/
-Source0:   http://ftp.gnu.org/pub/gnu/gettext/gettext-%{version}.tar.xz
+Source0:   https://ftp.gnu.org/pub/gnu/gettext/gettext-%{version}.tar.xz
 # Don't override various *printf macros in C++, they collide with the std::xxx counterparts
 Patch0:   gettext-printf_collision.patch
+# Add missing symbol export
+Patch1:    gettext_formatstring-ruby.patch
 
 BuildArch: noarch
 
@@ -123,9 +125,9 @@ find %{buildroot} -name "*.la" -delete
 %{mingw32_bindir}/gettext.sh
 %{mingw32_bindir}/gettextize
 %{mingw32_bindir}/libasprintf-0.dll
-%{mingw32_bindir}/libgettextlib-0-20-2.dll
+%{mingw32_bindir}/libgettextlib-0-21.dll
 %{mingw32_bindir}/libgettextpo-0.dll
-%{mingw32_bindir}/libgettextsrc-0-20-2.dll
+%{mingw32_bindir}/libgettextsrc-0-21.dll
 %{mingw32_bindir}/libintl-8.dll
 %{mingw32_bindir}/libtextstyle-0.dll
 %{mingw32_bindir}/msg*.exe
@@ -164,9 +166,9 @@ find %{buildroot} -name "*.la" -delete
 %{mingw64_bindir}/gettext.sh
 %{mingw64_bindir}/gettextize
 %{mingw64_bindir}/libasprintf-0.dll
-%{mingw64_bindir}/libgettextlib-0-20-2.dll
+%{mingw64_bindir}/libgettextlib-0-21.dll
 %{mingw64_bindir}/libgettextpo-0.dll
-%{mingw64_bindir}/libgettextsrc-0-20-2.dll
+%{mingw64_bindir}/libgettextsrc-0-21.dll
 %{mingw64_bindir}/libintl-8.dll
 %{mingw64_bindir}/libtextstyle-0.dll
 %{mingw64_bindir}/msg*.exe
@@ -198,6 +200,9 @@ find %{buildroot} -name "*.la" -delete
 
 
 %changelog
+* Mon Aug 03 2020 Sandro Mani <manisandro@gmail.com> - 0.21.0-1
+- Update to 0.21.0
+
 * Tue Jul 28 2020 Sandro Mani <manisandro@gmail.com> - 0.20.2-3
 - Add gettext-printf_collision.patch
 
diff --git a/sources b/sources
index 5075748..bfe361b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (gettext-0.20.2.tar.xz) = 08d20c659004a77e607af17df15f5ce9bd4fc0feca9436aa206b0cbd2516f9f0c98c7ee1faacf7ff429f9b0dd9de219947b300216887a60727602a688acabc82
+SHA512 (gettext-0.21.tar.xz) = f7e2968651879f8444d43a176a149db9f9411f4a03132a7f3b37c2ed97e3978ae6888169c995c1953cb78943b6e3573811abcbb8661b6631edbbe067b2699ddf