Skip to content

Commit

Permalink
texinfo: update to 7.1.
Browse files Browse the repository at this point in the history
  • Loading branch information
icp1994 committed Feb 29, 2024
1 parent 20f512f commit 806b1ac
Show file tree
Hide file tree
Showing 2 changed files with 66 additions and 4 deletions.
62 changes: 62 additions & 0 deletions srcpkgs/texinfo/patches/fix-configure-on-cross.patch
Original file line number Diff line number Diff line change
@@ -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 <iconv.h>
-#include <string.h>
-
-#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])

8 changes: 4 additions & 4 deletions srcpkgs/texinfo/template
Original file line number Diff line number Diff line change
@@ -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"
Expand All @@ -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
Expand Down

0 comments on commit 806b1ac

Please sign in to comment.