From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 20800158020 for ; Tue, 15 Nov 2022 04:58:45 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5F107E09BE; Tue, 15 Nov 2022 04:58:44 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 402BDE09BE for ; Tue, 15 Nov 2022 04:58:44 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 2670D340E1F for ; Tue, 15 Nov 2022 04:58:43 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4CDFA599 for ; Tue, 15 Nov 2022 04:58:41 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1668488288.c8016a40d4749950f493e0831547351a1f8a2982.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/files/, sci-mathematics/octave/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-mathematics/octave/files/octave-7.3.0-docs-texinfo-7.0.patch sci-mathematics/octave/octave-7.3.0-r1.ebuild X-VCS-Directories: sci-mathematics/octave/ sci-mathematics/octave/files/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: c8016a40d4749950f493e0831547351a1f8a2982 X-VCS-Branch: master Date: Tue, 15 Nov 2022 04:58:41 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 2f8ec981-e001-4511-b103-cb9b280b5956 X-Archives-Hash: d8f07bc58bc8affd14c84d5d72ab45e4 commit: c8016a40d4749950f493e0831547351a1f8a2982 Author: Sam James gentoo org> AuthorDate: Tue Nov 15 04:58:08 2022 +0000 Commit: Sam James gentoo org> CommitDate: Tue Nov 15 04:58:08 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c8016a40 sci-mathematics/octave: fix build loop with USE=doc & texinfo-7.0 Closes: https://bugs.gentoo.org/880623 Signed-off-by: Sam James gentoo.org> .../files/octave-7.3.0-docs-texinfo-7.0.patch | 45 ++++++++++++++++++++++ sci-mathematics/octave/octave-7.3.0-r1.ebuild | 1 + 2 files changed, 46 insertions(+) diff --git a/sci-mathematics/octave/files/octave-7.3.0-docs-texinfo-7.0.patch b/sci-mathematics/octave/files/octave-7.3.0-docs-texinfo-7.0.patch new file mode 100644 index 000000000000..7a6249ae80d4 --- /dev/null +++ b/sci-mathematics/octave/files/octave-7.3.0-docs-texinfo-7.0.patch @@ -0,0 +1,45 @@ +https://savannah.gnu.org/bugs/?62648#comment22 +https://bugs.gentoo.org/880623 + +# HG changeset patch +# User Rik +# Date 1668451079 28800 +# Mon Nov 14 10:37:59 2022 -0800 +# Node ID 67d5b2d119e254efc3d9f2658de47b293ac1f6eb +# Parent 9f4a9dd4a6ee34ddc6e8d0a87d0c703782af7358 +doc: Enable building of Qt documentation with Texinfo >= 7.0 (bug #62648) + +* mk-qthelp.pl: Update regular expressions that find the start of data in +index.html and Function-index.html to include additional pattern generated by +Texinfo 7.0. + +--- a/doc/interpreter/mk-qthelp.pl ++++ b/doc/interpreter/mk-qthelp.pl +@@ -26,8 +26,11 @@ if ($#ARGV != 1) + open (my $HTML, "<", $htmlfname) or die "Unable to open $htmlfname"; + + # Skip through preamble of file to find start of list +-while (($_ = <$HTML>) !~ /^
/ ) {;} +-while (($_ = <$HTML>) !~ /^
    / ) {;} ++while (defined ($_ = <$HTML>) and ! /^
    / ) {;} ++while (defined ($_ = <$HTML>) ++ and ! /^
      / ) {;} ++ ++die "index.html: reached EOF without finding data start pattern" if eof ($HTML); + + $level = 0; + while (<$HTML>) +@@ -68,7 +71,11 @@ die "Failed to parse index.html" if ($le + open ($HTML, "<", $htmlfname) or die "Unable to open $htmlfname"; + + # Skip through preamble of file to find start of list +-while (($_ = <$HTML>) !~ /^) + { + diff --git a/sci-mathematics/octave/octave-7.3.0-r1.ebuild b/sci-mathematics/octave/octave-7.3.0-r1.ebuild index 05285cf1f3e5..0901c51c9f76 100644 --- a/sci-mathematics/octave/octave-7.3.0-r1.ebuild +++ b/sci-mathematics/octave/octave-7.3.0-r1.ebuild @@ -131,6 +131,7 @@ PATCHES=( "${FILESDIR}"/${PN}-4.2.2-ncurses-pkgconfig.patch "${FILESDIR}"/${PN}-6.4.0-slibtool.patch "${FILESDIR}"/${PN}-6.4.0-omit-qtchooser-qtver.patch + "${FILESDIR}"/${P}-docs-texinfo-7.0.patch ) src_prepare() {