0.22

4 files changed, 6 insertions, 48 deletions

diff --git a/.SRCINFO b/.SRCINFO
index eaae60c0317e..9bb0cfa1e814 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = mingw-w64-gettext
 	pkgdesc = GNU internationalization library (mingw-w64)
-	pkgver = 0.21
+	pkgver = 0.22
 	pkgrel = 1
 	url = http://www.gnu.org/software/gettext/
 	arch = any
@@ -12,19 +12,14 @@ pkgbase = mingw-w64-gettext
 	options = !strip
 	options = !buildflags
 	options = staticlibs
-	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 = http://ftp.gnu.org/pub/gnu/gettext/gettext-0.22.tar.gz
+	source = http://ftp.gnu.org/pub/gnu/gettext/gettext-0.22.tar.gz.sig
 	source = intl.pc
 	validpgpkeys = 462225C3B46F34879FC8496CD605848ED7E69871
 	validpgpkeys = 68D94D8AAEEAD48AE7DC5B904F494A942E4616C2
 	validpgpkeys = 9001B85AF9E1B83DF1BDA942F5BE8B267C6A406D
-	sha256sums = c77d0da3102aec9c07f43671e60611ebff89a996ef159497ce8e59d075786b12
+	sha256sums = 49f089be11b490170bbf09ed2f51e5f5177f55be4cc66504a5861820e0fb06ab
 	sha256sums = SKIP
-	sha256sums = 7da6794550b0704a58ed9984913ebf671d98ab3178dbc58dd88337c35c8cdadb
-	sha256sums = 380910da75c5aa62524acb18fc54415b2c0ad391f6385ea4369bbd1e6e0d29ef
 	sha256sums = 0dc8a3e2c95d79aacaeaacd3c90e41c0f5d6ba9cfbc949a0ca55f4b0fd389d9c
 
 pkgname = mingw-w64-gettext
-
diff --git a/PKGBUILD b/PKGBUILD
index e190eb27b1f7..2caa4940717e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,5 +1,5 @@
 pkgname=mingw-w64-gettext
-pkgver=0.21
+pkgver=0.22
 pkgrel=1
 arch=('any')
 pkgdesc='GNU internationalization library (mingw-w64)'
@@ -9,13 +9,9 @@ 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}
-        gettext-printf_collision.patch
-        gettext_formatstring-ruby.patch
         intl.pc)
-sha256sums=('c77d0da3102aec9c07f43671e60611ebff89a996ef159497ce8e59d075786b12'
+sha256sums=('49f089be11b490170bbf09ed2f51e5f5177f55be4cc66504a5861820e0fb06ab'
             'SKIP'
-            '7da6794550b0704a58ed9984913ebf671d98ab3178dbc58dd88337c35c8cdadb'
-            '380910da75c5aa62524acb18fc54415b2c0ad391f6385ea4369bbd1e6e0d29ef'
             '0dc8a3e2c95d79aacaeaacd3c90e41c0f5d6ba9cfbc949a0ca55f4b0fd389d9c')
 validpgpkeys=('462225C3B46F34879FC8496CD605848ED7E69871'  # Daiki Ueno
               '68D94D8AAEEAD48AE7DC5B904F494A942E4616C2'
@@ -25,8 +21,6 @@ _architectures='i686-w64-mingw32 x86_64-w64-mingw32'
 
 prepare() {
   cd gettext-$pkgver
-  patch -p1 -i "${srcdir}"/gettext-printf_collision.patch
-  patch -p1 -i "${srcdir}"/gettext_formatstring-ruby.patch
 }
 
 build() {
diff --git a/gettext-printf_collision.patch b/gettext-printf_collision.patch
deleted file mode 100644
index 18fcee26c4f0..000000000000
--- a/gettext-printf_collision.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-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
deleted file mode 100644
index d3a60dd0802c..000000000000
--- a/gettext_formatstring-ruby.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-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)