From 153fe4ee0ea08015b34f5c58a8e122547c52cab0 Mon Sep 17 00:00:00 2001 From: icp Date: Mon, 20 Nov 2023 13:13:02 +0530 Subject: [PATCH] texinfo: update to 7.1. --- .../patches/fix-configure-on-cross.patch | 92 +++++++++++++++++++ srcpkgs/texinfo/template | 8 +- 2 files changed, 96 insertions(+), 4 deletions(-) create mode 100644 srcpkgs/texinfo/patches/fix-configure-on-cross.patch diff --git a/srcpkgs/texinfo/patches/fix-configure-on-cross.patch b/srcpkgs/texinfo/patches/fix-configure-on-cross.patch new file mode 100644 index 00000000000000..fa7b3a55962b05 --- /dev/null +++ b/srcpkgs/texinfo/patches/fix-configure-on-cross.patch @@ -0,0 +1,92 @@ +--- a/configure ++++ b/configure +@@ -36421,89 +36421,6 @@ + + + ICONV_CONVERTS_EUC_CN=no +-# partly based on gnulib/m4/iconv.m4 +-if test "x$am_func_iconv" = "xyes" ; then +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether iconv converts EUC-CN to UTF-8" >&5 +-printf %s "checking whether iconv converts EUC-CN to UTF-8... " >&6; } +-if test ${texinfo_cv_sys_iconv_converts_euc_cn+y} +-then : +- printf %s "(cached) " >&6 +-else $as_nop +- +- euc_cn_save_LIBS="$LIBS" +- #if test $am_cv_lib_iconv = yes; then +- LIBS="$LIBS $LIBICONV" +- #fi +- texinfo_cv_sys_iconv_converts_euc_cn=no +- for euc_cn_iconv_const in '' 'const'; do +- if test "$cross_compiling" = yes +-then : +- { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +-printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} +-as_fn_error $? "cannot run test program while cross compiling +-See \`config.log' for more details" "$LINENO" 5; } +-else $as_nop +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +- +-#include +-#include +- +-#ifndef ICONV_CONST +-# define ICONV_CONST $euc_cn_iconv_const +-#endif +- +-int +-main (void) +-{ +-int result = 0; +- { +- iconv_t cd_euc_cn_to_utf8 = iconv_open ("UTF-8", "EUC-CN"); +- if (cd_euc_cn_to_utf8 != (iconv_t)(-1)) +- { +- static ICONV_CONST char input[] = "abc"; +- char buf[10]; +- ICONV_CONST char *inptr = input; +- size_t inbytesleft = strlen (input); +- char *outptr = buf; +- size_t outbytesleft = sizeof (buf); +- size_t res = iconv (cd_euc_cn_to_utf8, +- &inptr, &inbytesleft, +- &outptr, &outbytesleft); +- if (res != 0) +- result |= 2; +- if (strcmp(buf, input)) +- result |= 4; +- iconv_close (cd_euc_cn_to_utf8); +- } +- else +- result |= 1; +- } +- return result; +- +- ; +- return 0; +-} +-_ACEOF +-if ac_fn_c_try_run "$LINENO" +-then : +- texinfo_cv_sys_iconv_converts_euc_cn=yes +-fi +-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ +- conftest.$ac_objext conftest.beam conftest.$ac_ext +-fi +- +- test "$texinfo_cv_sys_iconv_converts_euc_cn" = no || break +- done +- LIBS="$euc_cn_save_LIBS" +- +-fi +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $texinfo_cv_sys_iconv_converts_euc_cn" >&5 +-printf "%s\n" "$texinfo_cv_sys_iconv_converts_euc_cn" >&6; } +- if test "$texinfo_cv_sys_iconv_converts_euc_cn" = yes; then +- ICONV_CONVERTS_EUC_CN=yes +- fi +-fi + + + diff --git a/srcpkgs/texinfo/template b/srcpkgs/texinfo/template index 644042cba9c84d..db4bea51dd0b04 100644 --- a/srcpkgs/texinfo/template +++ b/srcpkgs/texinfo/template @@ -1,10 +1,10 @@ # Template file for 'texinfo' pkgname=texinfo -version=7.0.3 +version=7.1 revision=1 build_style=gnu-configure -configure_args="--disable-static --disable-perl-xs" -hostmakedepends="perl ncurses-devel" +configure_args="--disable-perl-xs" +hostmakedepends="perl automake help2man ncurses-devel" makedepends="ncurses-devel" depends="gzip perl" short_desc="GNU Documentation System" @@ -13,7 +13,7 @@ license="GPL-3.0-or-later" homepage="https://www.gnu.org/software/texinfo/" changelog="https://git.savannah.gnu.org/cgit/texinfo.git/plain/NEWS" distfiles="${GNU_SITE}/texinfo/texinfo-${version}.tar.xz" -checksum=74b420d09d7f528e84f97aa330f0dd69a98a6053e7a4e01767eed115038807bf +checksum=deeec9f19f159e046fdf8ad22231981806dac332cc372f1c763504ad82b30953 if [ -z "$CROSS_BUILD" ]; then # XXX fails with cross compilation