From 806b1acebe9940b035d74a1eb8750989a91441a3 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 | 62 +++++++++++++++++++ srcpkgs/texinfo/template | 8 +-- 2 files changed, 66 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..2aff2aacb19629 --- /dev/null +++ b/srcpkgs/texinfo/patches/fix-configure-on-cross.patch @@ -0,0 +1,62 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -111,59 +111,6 @@ + gl_INIT + + ICONV_CONVERTS_EUC_CN=no +-# partly based on gnulib/m4/iconv.m4 +-if test "x$am_func_iconv" = "xyes" ; then +- AC_CACHE_CHECK([whether iconv converts EUC-CN to UTF-8], [texinfo_cv_sys_iconv_converts_euc_cn], [ +- 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 +- AC_RUN_IFELSE( +- [AC_LANG_PROGRAM( +- [[ +-#include +-#include +- +-#ifndef ICONV_CONST +-# define ICONV_CONST $euc_cn_iconv_const +-#endif +- ]], +- [[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; +-]])], +- [texinfo_cv_sys_iconv_converts_euc_cn=yes], ,) +- test "$texinfo_cv_sys_iconv_converts_euc_cn" = no || break +- done +- LIBS="$euc_cn_save_LIBS" +- ]) +- if test "$texinfo_cv_sys_iconv_converts_euc_cn" = yes; then +- ICONV_CONVERTS_EUC_CN=yes +- fi +-fi + + AC_SUBST([ICONV_CONVERTS_EUC_CN]) + 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