Github messages for voidlinux
 help / color / mirror / Atom feed
From: icp1994 <icp1994@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] texinfo: update to 7.1.
Date: Thu, 29 Feb 2024 18:15:55 +0100	[thread overview]
Message-ID: <20240229171555.CF1FA25850@inbox.vuxu.org> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-47441@inbox.vuxu.org>

[-- Attachment #1: Type: text/plain, Size: 479 bytes --]

There is an updated pull request by icp1994 against master on the void-packages repository

https://github.com/icp1994/void-packages texinfo
https://github.com/void-linux/void-packages/pull/47441

texinfo: update to 7.1.
#### Testing the changes
- I tested the changes in this PR: **briefly**

#### Local build testing
- I built this PR locally for my native architecture: **x86_64**

A patch file from https://github.com/void-linux/void-packages/pull/47441.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-texinfo-47441.patch --]
[-- Type: text/x-diff, Size: 4372 bytes --]

From 153fe4ee0ea08015b34f5c58a8e122547c52cab0 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
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 <iconv.h>
+-#include <string.h>
+-
+-#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

  parent reply	other threads:[~2024-02-29 17:15 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-11-27 20:50 [PR PATCH] " icp1994
2024-02-26  1:45 ` github-actions
2024-02-29 16:01 ` [PR PATCH] [Updated] " icp1994
2024-02-29 16:13 ` icp1994
2024-02-29 17:15 ` icp1994 [this message]
2024-03-05 20:50 ` [PR PATCH] [Merged]: " cinerea0

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20240229171555.CF1FA25850@inbox.vuxu.org \
    --to=icp1994@users.noreply.github.com \
    --cc=ml@inbox.vuxu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).