0.21

9 files changed, 56 insertions, 190 deletions

diff --git a/.SRCINFO b/.SRCINFO
index be1da9902c91..75da4aa243df 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = mingw-w64-gettext
 	pkgdesc = GNU internationalization library (mingw-w64)
-	pkgver = 0.19.8.1
-	pkgrel = 3
+	pkgver = 0.21
+	pkgrel = 1
 	url = http://www.gnu.org/software/gettext/
 	arch = any
 	license = GPL
@@ -12,23 +12,17 @@ pkgbase = mingw-w64-gettext
 	options = !strip
 	options = !buildflags
 	options = staticlibs
-	source = http://ftp.gnu.org/pub/gnu/gettext/gettext-0.19.8.1.tar.gz
-	source = http://ftp.gnu.org/pub/gnu/gettext/gettext-0.19.8.1.tar.gz.sig
-	source = 05-always-use-libintl-vsnprintf.mingw.patch
-	source = 06-dont-include-ctype-after-gnulibs-wctype.mingw.patch
-	source = 07-fix-asprintf-conflict.mingw.patch
-	source = 08-vs-compatible.patch
-	source = 09-gnulib-fix-underscore-cond.patch
+	source = http://ftp.gnu.org/pub/gnu/gettext/gettext-0.21.tar.gz
+	source = http://ftp.gnu.org/pub/gnu/gettext/gettext-0.21.tar.gz.sig
+	source = gettext-printf_collision.patch
+	source = gettext_formatstring-ruby.patch
 	source = intl.pc
 	validpgpkeys = 462225C3B46F34879FC8496CD605848ED7E69871
-	md5sums = 97e034cf8ce5ba73a28ff6c3c0638092
-	md5sums = SKIP
-	md5sums = 27852a388b8cf38188dc392c244230ff
-	md5sums = f69747f43f279b8a81286cfe5916b82f
-	md5sums = 3ebccf730ec3377b068027eb2283afb2
-	md5sums = f5b611172ae58f1e4589a8d0c1d53414
-	md5sums = bed0da63d251975a21ca830f2f156766
-	md5sums = b0a123ec7ad1a345d0d712dae986a543
+	sha256sums = c77d0da3102aec9c07f43671e60611ebff89a996ef159497ce8e59d075786b12
+	sha256sums = SKIP
+	sha256sums = 7da6794550b0704a58ed9984913ebf671d98ab3178dbc58dd88337c35c8cdadb
+	sha256sums = 380910da75c5aa62524acb18fc54415b2c0ad391f6385ea4369bbd1e6e0d29ef
+	sha256sums = 0dc8a3e2c95d79aacaeaacd3c90e41c0f5d6ba9cfbc949a0ca55f4b0fd389d9c
 
 pkgname = mingw-w64-gettext
 
diff --git a/05-always-use-libintl-vsnprintf.mingw.patch b/05-always-use-libintl-vsnprintf.mingw.patch
deleted file mode 100644
index 28d543730300..000000000000
--- a/05-always-use-libintl-vsnprintf.mingw.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- gettext-runtime/intl/printf.c.orig	2012-09-22 16:23:24 +0400
-+++ gettext-runtime/intl/printf.c	2012-09-22 23:45:29 +0400
-@@ -209,7 +209,7 @@
- int
- libintl_vsnprintf (char *resultbuf, size_t length, const char *format, va_list args)
- {
--  if (strchr (format, '$') == NULL)
-+  if (0 && (strchr (format, '$') == NULL))
-     return system_vsnprintf (resultbuf, length, format, args);
-   else
-     {
diff --git a/06-dont-include-ctype-after-gnulibs-wctype.mingw.patch b/06-dont-include-ctype-after-gnulibs-wctype.mingw.patch
deleted file mode 100644
index a52883bd258a..000000000000
--- a/06-dont-include-ctype-after-gnulibs-wctype.mingw.patch
+++ /dev/null
@@ -1,44 +0,0 @@
---- gettext-tools/gnulib-lib/libxml/parser.c.orig	2013-01-18 10:24:37 +0400
-+++ gettext-tools/gnulib-lib/libxml/parser.c	2013-01-18 10:36:35 +0400
-@@ -42,6 +42,9 @@
- #include <stdlib.h>
- #include <string.h>
- #include <stdarg.h>
-+#ifdef HAVE_CTYPE_H
-+#include <ctype.h>
-+#endif
- #include <libxml/xmlmemory.h>
- #include <libxml/threads.h>
- #include <libxml/globals.h>
-@@ -61,9 +64,6 @@
- #include <libxml/xmlschemastypes.h>
- #include <libxml/relaxng.h>
- #endif
--#ifdef HAVE_CTYPE_H
--#include <ctype.h>
--#endif
- #ifdef HAVE_STDLIB_H
- #include <stdlib.h>
- #endif
---- gettext-tools/gnulib-lib/libxml/threads.c.orig	2013-01-18 10:38:24 +0400
-+++ gettext-tools/gnulib-lib/libxml/threads.c	2013-01-18 10:41:11 +0400
-@@ -12,15 +12,16 @@
- 
- #include <string.h>
- 
-+#ifdef HAVE_UNISTD_H
-+#include <unistd.h>
-+#endif
-+
- #include <libxml/threads.h>
- #include <libxml/globals.h>
- 
- #ifdef HAVE_SYS_TYPES_H
- #include <sys/types.h>
- #endif
--#ifdef HAVE_UNISTD_H
--#include <unistd.h>
--#endif
- #ifdef HAVE_STDLIB_H
- #include <stdlib.h>
- #endif
diff --git a/07-fix-asprintf-conflict.mingw.patch b/07-fix-asprintf-conflict.mingw.patch
deleted file mode 100644
index 725d2c797ad1..000000000000
--- a/07-fix-asprintf-conflict.mingw.patch
+++ /dev/null
@@ -1,63 +0,0 @@
---- gettext-runtime/libasprintf/vasnprintf.h.orig	2013-01-17 09:09:12 +0400
-+++ gettext-runtime/libasprintf/vasnprintf.h	2013-05-01 17:33:31 +0400
-@@ -40,6 +40,8 @@
- extern "C" {
- #endif
- 
-+#if !defined(__USE_MINGW_ANSI_STDIO) && defined(__MINGW64_VERSION_MAJOR)
-+
- /* Write formatted output to a string dynamically allocated with malloc().
-    You can pass a preallocated buffer for the result in RESULTBUF and its
-    size in *LENGTHP; otherwise you pass RESULTBUF = NULL.
-@@ -64,11 +66,14 @@
-                 free (output);
-             }
-   */
-+
- extern char * asnprintf (char *resultbuf, size_t *lengthp, const char *format, ...)
-        __attribute__ ((__format__ (__printf__, 3, 4)));
- extern char * vasnprintf (char *resultbuf, size_t *lengthp, const char *format, va_list args)
-        __attribute__ ((__format__ (__printf__, 3, 0)));
- 
-+#endif /* !defined(__USE_MINGW_ANSI_STDIO) && defined(__MINGW64_VERSION_MAJOR) */
-+
- #ifdef __cplusplus
- }
- #endif
---- gettext-runtime/libasprintf/vasprintf.h.orig	2013-04-30 09:03:19 +0400
-+++ gettext-runtime/libasprintf/vasprintf.h	2013-05-01 17:32:04 +0400
-@@ -37,6 +37,8 @@
- extern "C" {
- #endif
- 
-+#if !defined(__USE_MINGW_ANSI_STDIO) && defined(__MINGW64_VERSION_MAJOR)
-+
- /* Write formatted output to a string dynamically allocated with malloc().
-    If the memory allocation succeeds, store the address of the string in
-    *RESULT and return the number of resulting bytes, excluding the trailing
-@@ -46,6 +48,8 @@
- extern int vasprintf (char **result, const char *format, va_list args)
-        __attribute__ ((__format__ (__printf__, 2, 0)));
- 
-+#endif /* !defined(__USE_MINGW_ANSI_STDIO) && defined(__MINGW64_VERSION_MAJOR) */
-+
- #ifdef __cplusplus
- }
- #endif
---- gettext-runtime/libasprintf/vasnprintf.c.orig	2013-05-01 18:07:02 +0400
-+++ gettext-runtime/libasprintf/vasnprintf.c	2013-05-01 18:42:46 +0400
-@@ -67,7 +67,14 @@
- #endif
- 
- #include <locale.h>     /* localeconv() */
-+#if defined(__MINGW64_VERSION_MAJOR) && defined(__USE_MINGW_ANSI_STDIO)
-+#  define REMOVED__USE_MINGW_ANSI_STDIO
-+#  undef __USE_MINGW_ANSI_STDIO
-+#endif
- #include <stdio.h>      /* snprintf(), sprintf() */
-+#if defined(__MINGW64_VERSION_MAJOR) && defined(REMOVED__USE_MINGW_ANSI_STDIO)
-+#  define __USE_MINGW_ANSI_STDIO
-+#endif
- #include <stdlib.h>     /* abort(), malloc(), realloc(), free() */
- #include <string.h>     /* memcpy(), strlen() */
- #include <errno.h>      /* errno */
diff --git a/08-vs-compatible.patch b/08-vs-compatible.patch
deleted file mode 100644
index d6413ad50882..000000000000
--- a/08-vs-compatible.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- gettext-runtime/intl/libgnuintl.in.h.old	2015-06-15 10:40:11.594942600 +0200
-+++ gettext-runtime/intl/libgnuintl.in.h	2015-06-15 10:40:50.579345400 +0200
-@@ -336,7 +336,7 @@ extern int vfprintf (FILE *, const char
- 
- #if !(defined printf && defined _GL_STDIO_H) /* don't override gnulib */
- #undef printf
--#if defined __NetBSD__ || defined __BEOS__ || defined __CYGWIN__ || defined __MINGW32__
-+#if defined __NetBSD__ || defined __BEOS__ || defined __CYGWIN__ || defined __MINGW32__ || defined _MSC_VER
- /* Don't break __attribute__((format(printf,M,N))).
-    This redefinition is only possible because the libc in NetBSD, Cygwin,
-    mingw does not have a function __printf__.
diff --git a/09-gnulib-fix-underscore-cond.patch b/09-gnulib-fix-underscore-cond.patch
deleted file mode 100644
index d1fa96022ef6..000000000000
--- a/09-gnulib-fix-underscore-cond.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- gettext-tools/gnulib-m4/asm-underscore.m4.orig   2016-08-12 19:58:41.845742375 +0200
-+++ gettext-tools/gnulib-m4/asm-underscore.m4      2016-08-12 19:55:53.967056822 +0200
-@@ -29,7 +29,7 @@
- EOF
-      # Look for the assembly language name in the .s file.
-      AC_TRY_COMMAND(${CC-cc} $CFLAGS $CPPFLAGS $gl_c_asm_opt conftest.c) >/dev/null 2>&1
--     if LC_ALL=C grep -E '(^|[^a-zA-Z0-9_])_foo([^a-zA-Z0-9_]|$)' conftest.$gl_asmext >/dev/null; then
-+     if LC_ALL=C grep -E '(^|[[^a-zA-Z0-9_]])_foo([[^a-zA-Z0-9_]]|$)' conftest.$gl_asmext >/dev/null; then
-        gl_cv_prog_as_underscore=yes
-      else
-        gl_cv_prog_as_underscore=no
diff --git a/PKGBUILD b/PKGBUILD
index 6cbf5ecc51c7..46e65ace9344 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,9 +1,6 @@
-# Contributor: Filip Brcic <brcha@gna.org>
-# Contributor: Martchus <martchus@gmx.net>
-
 pkgname=mingw-w64-gettext
-pkgver=0.19.8.1
-pkgrel=3
+pkgver=0.21
+pkgrel=1
 arch=('any')
 pkgdesc='GNU internationalization library (mingw-w64)'
 depends=('mingw-w64-termcap' 'mingw-w64-libunistring')
@@ -11,46 +8,30 @@ makedepends=('gettext' 'mingw-w64-configure')
 options=(!strip !buildflags staticlibs)
 license=("GPL")
 url="http://www.gnu.org/software/gettext/"
-source=("http://ftp.gnu.org/pub/gnu/gettext/gettext-${pkgver}.tar.gz"{,.sig}
-        "05-always-use-libintl-vsnprintf.mingw.patch"
-        "06-dont-include-ctype-after-gnulibs-wctype.mingw.patch"
-        "07-fix-asprintf-conflict.mingw.patch"
-        "08-vs-compatible.patch"
-        "09-gnulib-fix-underscore-cond.patch"
-        "intl.pc")
-md5sums=('97e034cf8ce5ba73a28ff6c3c0638092'
-         'SKIP'
-         '27852a388b8cf38188dc392c244230ff'
-         'f69747f43f279b8a81286cfe5916b82f'
-         '3ebccf730ec3377b068027eb2283afb2'
-         'f5b611172ae58f1e4589a8d0c1d53414'
-         'bed0da63d251975a21ca830f2f156766'
-         'b0a123ec7ad1a345d0d712dae986a543')
+source=(http://ftp.gnu.org/pub/gnu/gettext/gettext-${pkgver}.tar.gz{,.sig}
+        gettext-printf_collision.patch
+        gettext_formatstring-ruby.patch
+        intl.pc)
+sha256sums=('c77d0da3102aec9c07f43671e60611ebff89a996ef159497ce8e59d075786b12'
+            'SKIP'
+            '7da6794550b0704a58ed9984913ebf671d98ab3178dbc58dd88337c35c8cdadb'
+            '380910da75c5aa62524acb18fc54415b2c0ad391f6385ea4369bbd1e6e0d29ef'
+            '0dc8a3e2c95d79aacaeaacd3c90e41c0f5d6ba9cfbc949a0ca55f4b0fd389d9c')
 validpgpkeys=('462225C3B46F34879FC8496CD605848ED7E69871') # Daiki Ueno
 
 _architectures='i686-w64-mingw32 x86_64-w64-mingw32'
 
 prepare() {
   cd gettext-$pkgver
-  patch -p0 -i ${srcdir}/05-always-use-libintl-vsnprintf.mingw.patch
-  patch -p0 -i ${srcdir}/06-dont-include-ctype-after-gnulibs-wctype.mingw.patch
-  patch -p0 -i ${srcdir}/07-fix-asprintf-conflict.mingw.patch
-  patch -p0 -i ${srcdir}/08-vs-compatible.patch
-  # prevents "Cannot export rpl_printf: symbol not found"
-  patch -p0 -i ${srcdir}/09-gnulib-fix-underscore-cond.patch
-  autoreconf -i
+  patch -p1 -i "${srcdir}"/gettext-printf_collision.patch
+  patch -p1 -i "${srcdir}"/gettext_formatstring-ruby.patch
 }
 
 build() {
   cd gettext-${pkgver}
   for _arch in ${_architectures}; do
     mkdir -p build-${_arch} && pushd build-${_arch}
-    # define USER_LABEL_PREFIX_UNDERSCORE to prevent undefined reference to `__imp_exit_failure'
-    # and similar errors
-    local underscore_flag=''
-    [[ ${_arch} == i686-w64-mingw32 ]] && underscore_flag='-DUSER_LABEL_PREFIX_UNDERSCORE'
-    export CFLAGS="$underscore_flag"
-    export CXXFLAGS="$underscore_flag"
+    export MINGW_LDFLAGS="-Wl,--enable-auto-import"
     LIBS="-lssp" ${_arch}-configure \
       --disable-java \
       --disable-native-java \
diff --git a/gettext-printf_collision.patch b/gettext-printf_collision.patch
new file mode 100644
index 000000000000..18fcee26c4f0
--- /dev/null
+++ b/gettext-printf_collision.patch
@@ -0,0 +1,20 @@
+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@
++#ifndef __cplusplus
+ 
+ #undef fwprintf
+ #define fwprintf libintl_fwprintf
+@@ -455,6 +456,8 @@ extern int vswprintf (wchar_t *, size_t,
+ 
+ #endif
+ 
++#endif
++
+ #endif
+ 
+ 
diff --git a/gettext_formatstring-ruby.patch b/gettext_formatstring-ruby.patch
new file mode 100644
index 000000000000..d3a60dd0802c
--- /dev/null
+++ b/gettext_formatstring-ruby.patch
@@ -0,0 +1,11 @@
+diff -rupN gettext-0.21/gettext-tools/woe32dll/gettextsrc-exports.c gettext-0.21-new/gettext-tools/woe32dll/gettextsrc-exports.c
+--- gettext-0.21/gettext-tools/woe32dll/gettextsrc-exports.c	2019-12-23 12:21:12.000000000 +0100
++++ gettext-0.21-new/gettext-tools/woe32dll/gettextsrc-exports.c	2020-08-03 14:22:17.096473605 +0200
+@@ -50,6 +50,7 @@ VARIABLE(formatstring_python)
+ VARIABLE(formatstring_python_brace)
+ VARIABLE(formatstring_qt)
+ VARIABLE(formatstring_qt_plural)
++VARIABLE(formatstring_ruby)
+ VARIABLE(formatstring_scheme)
+ VARIABLE(formatstring_sh)
+ VARIABLE(formatstring_smalltalk)