diff --git a/srcpkgs/gettext/patches/automake-1.16.4.patch b/srcpkgs/gettext/patches/automake-1.16.4.patch deleted file mode 100644 index 9de0e0b1208..00000000000 --- a/srcpkgs/gettext/patches/automake-1.16.4.patch +++ /dev/null @@ -1,52 +0,0 @@ -From d1836dbbd6a90b4c0ab79bc5292c023f08b49511 Mon Sep 17 00:00:00 2001 -From: Bruno Haible -Date: Sun, 8 Aug 2021 02:08:43 +0200 -Subject: [PATCH] libtextstyle: Make gl_INIT_PACKAGE work with Automake >= - 1.16.4. - -Reported and analyzed by Nicole Mazzuca in -. - -* m4/init-package-version.m4 (gl_INIT_PACKAGE): Use a new macro gl_INIT_EMPTY. -(gl_INIT_DUMMY): Expand to empty in two steps, via a new macro gl_INIT_DUMMY2. ---- - libtextstyle/m4/init-package-version.m4 | 12 ++++++++---- - 1 file changed, 8 insertions(+), 4 deletions(-) - -diff --git a/libtextstyle/m4/init-package-version.m4 b/libtextstyle/m4/init-package-version.m4 -index f131a844f..a26b1ab88 100644 ---- a/libtextstyle/m4/init-package-version.m4 -+++ b/libtextstyle/m4/init-package-version.m4 -@@ -1,5 +1,5 @@ --# init-package-version.m4 serial 1 (gettext-0.18) --dnl Copyright (C) 1992-2009 Free Software Foundation, Inc. -+# init-package-version.m4 serial 2 -+dnl Copyright (C) 1992-2021 Free Software Foundation, Inc. - dnl This file is free software, distributed under the terms of the GNU - dnl General Public License. As a special exception to the GNU General - dnl Public License, this file may be distributed as part of a program -@@ -77,7 +77,7 @@ AC_DEFUN([gl_INIT_PACKAGE], - m4_bpatsubst(m4_dquote( - m4_defn([AM_INIT_AUTOMAKE])), - [AC_PACKAGE_NAME], [gl_INIT_DUMMY])), -- [AC_PACKAGE_TARNAME], [gl_INIT_DUMMY])), -+ [AC_PACKAGE_TARNAME], [gl_INIT_EMPTY])), - [AC_PACKAGE_VERSION], [gl_INIT_DUMMY]) - [AC_SUBST([PACKAGE], [$1]) - AC_SUBST([VERSION], [$2]) -@@ -85,7 +85,11 @@ AC_DEFUN([gl_INIT_PACKAGE], - m4_define([AM_INIT_AUTOMAKE], - m4_defn([gl_RPL_INIT_AUTOMAKE])) - ]) --m4_define([gl_INIT_DUMMY], []) -+m4_define([gl_INIT_EMPTY], []) -+dnl Automake 1.16.4 no longer accepts an empty value for gl_INIT_DUMMY. -+dnl But a macro that later expands to empty works. -+m4_define([gl_INIT_DUMMY], [gl_INIT_DUMMY2]) -+m4_define([gl_INIT_DUMMY2], []) - AC_DEFUN([gl_RPL_INIT_AUTOMAKE], [ - m4_ifval([$2], - [m4_fatal([After gl_INIT_PACKAGE, the two-argument form of AM_INIT_AUTOMAKE cannot be used.])]) --- -2.17.1 - diff --git a/srcpkgs/gettext/patches/musl-unsupported-iconv-encoding.patch b/srcpkgs/gettext/patches/musl-unsupported-iconv-encoding.patch deleted file mode 100644 index de9a6b02b3a..00000000000 --- a/srcpkgs/gettext/patches/musl-unsupported-iconv-encoding.patch +++ /dev/null @@ -1,44 +0,0 @@ -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/msgconv-2 b/gettext-tools/tests/msgconv-2 -index d286cda..d96c487 100755 ---- a/gettext-tools/tests/msgconv-2 -+++ b/gettext-tools/tests/msgconv-2 -@@ -7,6 +7,8 @@ - # Note: This test fails on Linux with musl libc versions that don't support - # the BIG5 encoding in 'iconv'. - -+Exit 77 -+ - cat <<\EOF > mco-test2.po - # Chinese translation for GNU gettext messages. - # -diff --git a/gettext-tools/tests/msgmerge-compendium-6 b/gettext-tools/tests/msgmerge-compendium-6 -index 0afbe1e..1b2fe6b 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'. - -+Exit 77 -+ - : ${MSGCONV=msgconv} - ${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 ---- a/gettext-tools/tests/xgettext-python-3 -+++ b/gettext-tools/tests/xgettext-python-3 -@@ -6,6 +6,8 @@ - # Note: This test fails on Linux with musl libc versions that don't support - # the EUC-JP encoding in 'iconv'. - -+Exit 77 -+ - cat <<\EOF > xg-py-3a.py - #!/usr/bin/env python - # TRANSLATORS: Franois Pinard is a hero. diff --git a/srcpkgs/gettext/template b/srcpkgs/gettext/template index 2ab568366d2..2fa05b5de85 100644 --- a/srcpkgs/gettext/template +++ b/srcpkgs/gettext/template @@ -1,7 +1,7 @@ # Template file for 'gettext' pkgname=gettext -version=0.21 -revision=4 +version=0.22.5 +revision=1 build_style=gnu-configure configure_args="--disable-java --disable-native-java --disable-csharp --disable-libasprintf --enable-threads=posix --disable-rpath --without-emacs @@ -14,14 +14,14 @@ configure_args="--disable-java --disable-native-java --disable-csharp # Either: # - Have xz in hostmakedepends; or # - Let gettext-devel depends on bzip2 -hostmakedepends="xz automake libtool" +hostmakedepends="xz" short_desc="Internationalized Message Handling Library and tools" maintainer="Enno Boland " license="GPL-3.0-or-later" homepage="https://www.gnu.org/software/gettext/" changelog="https://git.savannah.gnu.org/cgit/gettext.git/plain/NEWS" distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.gz" -checksum=c77d0da3102aec9c07f43671e60611ebff89a996ef159497ce8e59d075786b12 +checksum=ec1705b1e969b83a9f073144ec806151db88127f5e40fe5a94cb6c8fa48996a0 subpackages="gettext-devel-examples gettext-devel gettext-devel-tools" unset _intl_lib @@ -36,8 +36,18 @@ else conflicts="gettext-libs>=0" fi -pre_configure() { - autoreconf -fi +post_patch() { + if [ "$XBPS_TARGET_LIBC" = musl ]; then + grep -rl 'test fails on Linux with musl' gettext-tools/tests | + xargs sed -i '/test fails on Linux with musl/s/^/Exit 77 /' + sed -i 's/defined MUSL_LIBC/0/' \ + gettext-tools/gnulib-tests/test-canonicalize.c + # return 7, not sure what's the problem + # which means have openat(2) but ERANGE or ENOENT on getcwd(3) + # not sure what is the problem here + sed -i 's/test_long_name.*;/0;/' \ + gettext-tools/gnulib-tests/test-getcwd.c + fi } post_install() { @@ -60,6 +70,8 @@ gettext-devel_package() { gettext-devel-tools>=${version}_${revision}" if [ -n "${_intl_lib}" ]; then depends+=" gettext-libs>=${version}_${revision}" + else + replaces="gettext-libs>=0" fi short_desc+=" - development files" pkg_install() { @@ -76,6 +88,7 @@ gettext-devel_package() { gettext-devel-tools_package() { depends="${sourcepkg}>=${version}_${revision} tar xz" + conflicts="gettext-tiny>=0 gettext-tiny-devel>=0" short_desc+=" - development tools" pkg_install() { vmove usr/share/aclocal