main/gettext: fix testsuite with libunistring 0.9.10

gettext bundles libunistring and parts of it, data tables, gets built
and included even when external libunistring is used. The newer external
libunistring (0.9.10) ends up use the data table from the older version
of the bundled libunistring and things goes horribly wrong.

We work around this by exclude unilbrk from the build so we only use
external libunistring.

Upstream bug reports:
https://lists.gnu.org/archive/html/bug-gettext/2018-08/msg00008.html
https://savannah.gnu.org/bugs/index.php?54453

3 files changed, 113 insertions, 5 deletions

diff --git a/main/gettext/APKBUILD b/main/gettext/APKBUILD
index 10ef236c25..6c092dd879 100644
--- a/main/gettext/APKBUILD
+++ b/main/gettext/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Carlo Landmeter <clandmeter@gmail.com>
 pkgname=gettext
 pkgver=0.19.8.1
-pkgrel=2
+pkgrel=3
 pkgdesc="GNU locale utilities"
 url="https://www.gnu.org/software/gettext/gettext.html"
 arch="all"
@@ -12,16 +12,22 @@ depends=
 # they depend on gettext and would introduce cyclic dependencies
 makedepends="perl ncurses-dev libxml2-dev libunistring-dev"
 checkdepends="coreutils"
-source="ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.xz
+source="http://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.xz
+	disable-gettext-runtime-test-lock.patch
 	fix-abi.patch
 	localename-fix.patch
 	skip-tests-musl.patch
 	skip-tests-alpine.patch
+	unbundle-libunistring.patch
 	"
-subpackages="$pkgname-doc $pkgname-static $pkgname-dev $pkgname-lang libintl $pkgname-asprintf $pkgname-libs"
+subpackages="$pkgname-dbg $pkgname-doc $pkgname-static $pkgname-dev $pkgname-lang libintl $pkgname-asprintf $pkgname-libs"
 
 build() {
 	cd "$builddir"
+	# make sure we dont bundle libunistring bits
+	rm -r gettext-tools/gnulib-lib/unilbrk \
+		gettext-tools/libgettextpo/unilbrk
+
 	# force using system posix complaint printf
 	# the test is broken and fails with ash
 	gt_cv_func_printf_posix=yes \
@@ -37,7 +43,8 @@ build() {
 
 check() {
 	cd "$builddir"
-	make check
+	# test-verify fails if run in parallel
+	make -j1 check
 }
 
 package() {
@@ -68,7 +75,9 @@ asprintf() {
 }
 
 sha512sums="3553227b62f2a7d9b67c881ef889c030a6a21d5ecd210c4bf3d649df0b37193a99a68cf8fd5f2c69b6a87e847035dd9576f9bcb9363422866e26b04f4f6dd431  gettext-0.19.8.1.tar.xz
+eb505507f7cc1114edb29267b864e2dd28683cdcd08da0195181ee7641e7ca197362c7e7b3df5f9ab4291a07de88410ed1e0d976f11e57c2f3740a00b91ce888  disable-gettext-runtime-test-lock.patch
 f517a351864bb194117e7147015db9a9b0ffbb1feb22ecf39bc1c99ad904420467e267a893c3b1a76c1adb810d1b37b1c2c1273cda861ff1d260102701bc644a  fix-abi.patch
 2765f8d9d72d85ad0adb87ee0edd83d3aec59995ef21a3c8bbd1ac20a3680058a2122bd3f6c37be3f50cb5ea00c19b3ad569a47ceedc8ae2cb4a6e8d4e30976d  localename-fix.patch
 8fced6ec5c1f54686545aa91759f8501a0ccfa4bb66a781d282e65f7309c70ab74bf753f4969374facb135b7b9341e26d8a3e27679ea09cb1543b82dfb8a16dd  skip-tests-musl.patch
-4171b52abb9a34cc30ad9d737a6d4fc94d7365781f13522eef9111e2fc34f08f3206508471b2c2ab70ae95ecb110bc569535ca949bded3e8896c83e9d752d06e  skip-tests-alpine.patch"
+4171b52abb9a34cc30ad9d737a6d4fc94d7365781f13522eef9111e2fc34f08f3206508471b2c2ab70ae95ecb110bc569535ca949bded3e8896c83e9d752d06e  skip-tests-alpine.patch
+86dcba9b53048b01c8912bdcfc7e9372a37f196352ef366d5192af204cb1bad95c31803991e0a408ab16b0c7094846df5ef95243bb09894e3dc9b3c4e5daaa43  unbundle-libunistring.patch"
diff --git a/main/gettext/disable-gettext-runtime-test-lock.patch b/main/gettext/disable-gettext-runtime-test-lock.patch
new file mode 100644
index 0000000000..ec3a59b402
--- /dev/null
+++ b/main/gettext/disable-gettext-runtime-test-lock.patch
@@ -0,0 +1,47 @@
+commit bd2c6ca2b7ae0be02d4bb85db79def454f3153fb
+Author:     rpm-build <rpm-build>
+AuthorDate: Wed Dec 21 12:50:54 2016 +0100
+Commit:     rpm-build <rpm-build>
+CommitDate: Wed Dec 21 12:52:36 2016 +0100
+
+    disable-gettext-runtime-test-lock.patch
+
+diff --git a/gettext-runtime/tests/Makefile.am b/gettext-runtime/tests/Makefile.am
+index 88a0684..3a27b79 100644
+--- a/gettext-runtime/tests/Makefile.am
++++ b/gettext-runtime/tests/Makefile.am
+@@ -19,7 +19,7 @@
+ AUTOMAKE_OPTIONS = 1.11 gnits no-dependencies color-tests subdir-objects
+ EXTRA_DIST =
+ 
+-TESTS = test-lock
++TESTS =
+ 
+ AM_CPPFLAGS = \
+   -I.. \
+diff --git a/gettext-runtime/tests/Makefile.in b/gettext-runtime/tests/Makefile.in
+index 4327733..5879146 100644
+--- a/gettext-runtime/tests/Makefile.in
++++ b/gettext-runtime/tests/Makefile.in
+@@ -86,7 +86,7 @@ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+ build_triplet = @build@
+ host_triplet = @host@
+-TESTS = test-lock$(EXEEXT)
++TESTS =
+ check_PROGRAMS = test-lock$(EXEEXT)
+ subdir = tests
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+diff --git a/gettext-tools/gnulib-tests/Makefile.in b/gettext-tools/gnulib-tests/Makefile.in
+index 26becd9..4b9d0e4 100644
+--- a/gettext-tools/gnulib-tests/Makefile.in
++++ b/gettext-tools/gnulib-tests/Makefile.in
+@@ -143,7 +143,7 @@ TESTS = test-set-mode-acl.sh test-set-mode-acl-1.sh \
+ 	test-isnanl-nolibm$(EXEEXT) test-isnanl$(EXEEXT) \
+ 	test-iswblank$(EXEEXT) test-langinfo$(EXEEXT) \
+ 	test-linkedhash_list$(EXEEXT) test-locale$(EXEEXT) \
+-	test-localename$(EXEEXT) test-lock$(EXEEXT) \
++	test-localename$(EXEEXT) \
+ 	test-log10$(EXEEXT) test-lseek.sh test-lstat$(EXEEXT) \
+ 	test-malloca$(EXEEXT) test-math$(EXEEXT) test-mbrtowc1.sh \
+ 	test-mbrtowc2.sh test-mbrtowc3.sh test-mbrtowc4.sh \
diff --git a/main/gettext/unbundle-libunistring.patch b/main/gettext/unbundle-libunistring.patch
new file mode 100644
index 0000000000..20f50e0654
--- /dev/null
+++ b/main/gettext/unbundle-libunistring.patch
@@ -0,0 +1,52 @@
+diff --git a/gettext-tools/gnulib-lib/Makefile.in b/gettext-tools/gnulib-lib/Makefile.in
+index a8e89eb..4fc24d7 100644
+--- a/gettext-tools/gnulib-lib/Makefile.in
++++ b/gettext-tools/gnulib-lib/Makefile.in
+@@ -593,8 +593,8 @@ am_libgettextlib_la_OBJECTS = copy-acl.lo set-acl.lo \
+ 	striconveha.lo strnlen1.lo styled-ostream.lo tempname.lo \
+ 	term-ostream.lo $(am__objects_4) $(am__objects_5) \
+ 	glthread/threadlib.lo glthread/tls.lo tmpdir.lo trim.lo \
+-	$(am__objects_6) $(am__objects_7) unilbrk/lbrktables.lo \
+-	$(am__objects_8) $(am__objects_9) unilbrk/ulc-common.lo \
++	$(am__objects_6) $(am__objects_7) \
++	$(am__objects_8) $(am__objects_9) \
+ 	$(am__objects_10) $(am__objects_11) unistd.lo dup-safer.lo \
+ 	fd-safer.lo pipe-safer.lo $(am__objects_12) $(am__objects_13) \
+ 	$(am__objects_14) $(am__objects_15) $(am__objects_16) \
+@@ -2400,8 +2400,8 @@ libgettextlib_la_SOURCES = copy-acl.c set-acl.c acl-errno-valid.c \
+ 	tempname.c term-ostream.c $(am__append_19) $(am__append_20) \
+ 	glthread/threadlib.c glthread/tls.h glthread/tls.c tmpdir.h \
+ 	tmpdir.c trim.c $(am__append_21) $(am__append_22) \
+-	unilbrk/lbrktables.c $(am__append_23) $(am__append_24) \
+-	unilbrk/ulc-common.c $(am__append_25) $(am__append_26) \
++	$(am__append_23) $(am__append_24) \
++	$(am__append_25) $(am__append_26) \
+ 	unistd.c dup-safer.c fd-safer.c pipe-safer.c $(am__append_27) \
+ 	$(am__append_28) $(am__append_29) $(am__append_30) \
+ 	$(am__append_31) $(am__append_32) $(am__append_33) \
+diff --git a/gettext-tools/libgettextpo/Makefile.in b/gettext-tools/libgettextpo/Makefile.in
+index 5f9550d..bd684cb 100644
+--- a/gettext-tools/libgettextpo/Makefile.in
++++ b/gettext-tools/libgettextpo/Makefile.in
+@@ -554,8 +554,8 @@ am_libgnu_la_OBJECTS = basename.lo c-ctype.lo c-strcasecmp.lo \
+ 	malloca.lo markup.lo mbswidth.lo ostream.lo progname.lo \
+ 	striconv.lo striconveh.lo striconveha.lo glthread/threadlib.lo \
+ 	glthread/tls.lo $(am__objects_3) $(am__objects_4) \
+-	$(am__objects_5) unilbrk/lbrktables.lo $(am__objects_6) \
+-	$(am__objects_7) unilbrk/ulc-common.lo $(am__objects_8) \
++	$(am__objects_5) $(am__objects_6) \
++	$(am__objects_7) $(am__objects_8) \
+ 	unistd.lo $(am__objects_9) $(am__objects_10) $(am__objects_11) \
+ 	$(am__objects_12) $(am__objects_13) $(am__objects_14) \
+ 	$(am__objects_15) $(am__objects_16) $(am__objects_17) \
+@@ -2179,8 +2179,8 @@ libgnu_la_SOURCES = basename.h basename.c c-ctype.h c-ctype.c \
+ 	striconv.c striconveh.h striconveh.c striconveha.h \
+ 	striconveha.c glthread/threadlib.c glthread/tls.h \
+ 	glthread/tls.c $(am__append_6) $(am__append_7) $(am__append_8) \
+-	unilbrk/lbrktables.c $(am__append_9) $(am__append_10) \
+-	unilbrk/ulc-common.c $(am__append_11) unistd.c \
++	$(am__append_9) $(am__append_10) \
++	$(am__append_11) unistd.c \
+ 	$(am__append_12) $(am__append_13) $(am__append_14) \
+ 	$(am__append_15) $(am__append_16) $(am__append_17) \
+ 	$(am__append_18) $(am__append_19) $(am__append_20) \