main/gettext: upgrade to 0.22

main/gettext/APKBUILD

@@ -2,8 +2,8 @@
 # Contributor: Valery Kartel <valery.kartel@gmail.com>
 # Maintainer: Carlo Landmeter <clandmeter@alpinelinux.org>
 pkgname=gettext
-pkgver=0.21.1
-pkgrel=9
+pkgver=0.22
+pkgrel=0
 pkgdesc="GNU locale utilities"
 url="https://www.gnu.org/software/gettext/gettext.html"
 arch="all"
@@ -20,18 +20,16 @@ subpackages="
 	$pkgname-static
 	$pkgname-dev
 	$pkgname-lang
-	$pkgname-envsubst
+	$pkgname-envsubst:_envsubst
 	libintl
 	$pkgname-asprintf
 	$pkgname-libs
 	"
 source="https://ftp.gnu.org/gnu/gettext/gettext-$pkgver.tar.xz
-	skip-tests-musl.patch
-	skip-tests-libunistring-1.0.patch
 	musl-realpath.patch
+	skip-tests-musl.patch
 	"
 
-
 # secfixes:
 #   0.20.1-r0:
 #     - CVE-2018-18751
@@ -79,7 +77,7 @@ asprintf() {
 	amove usr/lib/libasprintf.so.*
 }
 
-envsubst() {
+_envsubst() {
 	pkgdesc="GNU gettext envsubst binary"
 	provides="envsubst"
 	provider_priority=100 # highest (other provider of cmd:envsubst is testing/envsubst)
@@ -88,8 +86,7 @@ envsubst() {
 }
 
 sha512sums="
-61e93bc9876effd3ca1c4e64ff6ba5bd84b24951ec2cc6f40a0e3248410e60f887552f29ca1f70541fb5524f6a4e8191fed288713c3e280e18922dd5bff1a2c9  gettext-0.21.1.tar.xz
-9fae1898eaf7a871876d2eaeffdf6ab759455bc8062fc232992526d697752d864b6079eb3c1053aea08d3a41892008b201566564fa62275d0ced5cfa6088a4c0  skip-tests-musl.patch
-4f65c3ea09cf3b3be2fac560a820eeab5687e93bfdf4693343d756734144ec351fbf34e4671a4b89df07b47848905aba4099711ba0151d69fc56a954140b4325  skip-tests-libunistring-1.0.patch
+c6368344aa4e0f6fd7c4a93023a5f7b377c7bb97b8ea688fd54f4c385c069d9ff27611d8763b1aed6328b6d3c4db7b34bd89bfbf6525ecaef11eb58434a4d4fa  gettext-0.22.tar.xz
 593615f1d3a75e0fff1561b11e6363aacdc44045adf19c765e27360f256149e442643f40ef1ed781d4175e02dd9719871019e16b0c1393a124a8a87ef0cf75b0  musl-realpath.patch
+a16963f804ce4abe8480da211228f7b24a0715d6ef3ff7d5e5c58a1387d6c4260ee237864081b05b164f082ef199a592494ce691dd0c96c61978e4c451707c7a  skip-tests-musl.patch
 "

main/gettext/skip-tests-libunistring-1.0.patch

@@ -1,55 +0,0 @@
-Some of the tests are broken with libunistring 1.0
-https://lists.gnu.org/archive/html/bug-gettext/2022-04/msg00002.html
-
-diff --git a/gettext-tools/tests/msgcat-17 b/gettext-tools/tests/msgcat-17
-index 8fecc40..b26d8be 100755
---- a/gettext-tools/tests/msgcat-17
-+++ b/gettext-tools/tests/msgcat-17
-@@ -3,6 +3,8 @@
- 
- # Test msgcat with --width option. Check that format strings are not broken.
- 
-+exit 77
-+
- cat <<\EOF > mcat-test17.in
- msgid ""
- msgstr ""
-diff --git a/gettext-tools/tests/msgfilter-sr-latin-1 b/gettext-tools/tests/msgfilter-sr-latin-1
-index c1cc978..946b1a9 100755
---- a/gettext-tools/tests/msgfilter-sr-latin-1
-+++ b/gettext-tools/tests/msgfilter-sr-latin-1
-@@ -4,6 +4,8 @@
- # Test msgfilter with command recode-sr-latin1.
- # Verify that it converts to UTF-8.
- 
-+exit 77
-+
- cat <<\EOF > mfi-srl-1.po
- # Serbian translation of gettext-runtime
- # Copyright (C) 2003 Free Software Foundation, Inc.
-diff --git a/gettext-tools/tests/msgmerge-11 b/gettext-tools/tests/msgmerge-11
-index ed49db9..cc6849f 100755
---- a/gettext-tools/tests/msgmerge-11
-+++ b/gettext-tools/tests/msgmerge-11
-@@ -4,6 +4,8 @@
- # Test merging of a message which has plural forms in ref.pot but not
- # in def.po.
- 
-+exit 77
-+
- cat <<EOF > mm-test11.po
- # SOME DESCRIPTIVE TITLE.
- # Copyright (C) YEAR Free Software Foundation, Inc.
-diff --git a/gettext-tools/tests/xgettext-python-1 b/gettext-tools/tests/xgettext-python-1
-index 4901c71..f52ea00 100755
---- a/gettext-tools/tests/xgettext-python-1
-+++ b/gettext-tools/tests/xgettext-python-1
-@@ -3,6 +3,8 @@
- 
- # Test of Python support.
- 
-+exit 77
-+
- cat <<\EOF > xg-py-1.py
- # interpret_ansic = true, interpret_unicode = false
- _("abc\

main/gettext/skip-tests-musl.patch

@@ -3,6 +3,19 @@ As upstream notes:
 # Note: This test fails on Linux with musl libc versions that don't support
 # the BIG5 encoding in 'iconv'.
 
+diff --git a/gettext-tools/tests/msgcat-22 b/gettext-tools/tests/msgcat-22
+index 6047188..abe5877 100755
+--- a/gettext-tools/tests/msgcat-22
++++ b/gettext-tools/tests/msgcat-22
+@@ -6,6 +6,8 @@
+ # Note: This test fails on Linux with musl libc versions that don't support
+ # the GB18030 encoding in 'iconv'.
+ 
++exit 77
++
+ cat <<\EOF > mcat-test22.po
+ msgid ""
+ msgstr ""
 diff --git a/gettext-tools/tests/msgconv-2 b/gettext-tools/tests/msgconv-2
 index d286cda..d96c487 100755
 --- a/gettext-tools/tests/msgconv-2
@@ -16,13 +29,26 @@ index d286cda..d96c487 100755
  cat <<\EOF > mco-test2.po
  # Chinese translation for GNU gettext messages.
  #
+diff --git a/gettext-tools/tests/msgconv-8 b/gettext-tools/tests/msgconv-8
+index 207b0f0..618de0f 100755
+--- a/gettext-tools/tests/msgconv-8
++++ b/gettext-tools/tests/msgconv-8
+@@ -6,6 +6,8 @@
+ # Note: This test fails on Linux with musl libc versions that don't support
+ # the GB18030 encoding in 'iconv'.
+ 
++exit 77
++
+ cat <<\EOF > mco-test8.po
+ msgid ""
+ msgstr ""
 diff --git a/gettext-tools/tests/msgmerge-compendium-6 b/gettext-tools/tests/msgmerge-compendium-6
-index 0afbe1e..1b2fe6b 100755
+index 59eb00e..c4be0b2 100755
 --- a/gettext-tools/tests/msgmerge-compendium-6
 +++ b/gettext-tools/tests/msgmerge-compendium-6
 @@ -10,6 +10,8 @@
- # Note: This test fails on Linux with musl libc versions that don't support
- # the EUC-KR encoding in 'iconv'.
+ # Note: This test fails on Linux with musl libc versions and on Solaris 11
+ # (OpenIndiana, OmniOS) that don't support the EUC-KR encoding in 'iconv'.
  
 +Exit 77
 +
@@ -30,7 +56,7 @@ index 0afbe1e..1b2fe6b 100755
  ${MSGCONV} --to-code=UTF-8 -o mm-ko.utf-8.pot "$wabs_srcdir"/mm-ko.ascii.pot
  
 diff --git a/gettext-tools/tests/xgettext-python-3 b/gettext-tools/tests/xgettext-python-3
-index ca0926d..2c49fd7 100755
+index 1e13b57..7cd480d 100755
 --- a/gettext-tools/tests/xgettext-python-3
 +++ b/gettext-tools/tests/xgettext-python-3
 @@ -6,6 +6,8 @@