[Octave-bug-tracker] [bug #62648] build problem with texinfo>6.8

[Markus Mützel]

Follow-up Comment #19, bug #62648 (project octave):

I don't have access to texinfo 7.0 currently:

$ info --version
info (GNU texinfo) 6.8

Copyright (C) 2021 Free Software Foundation, Inc.
License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>
This is free software: you are free to change and redistribute it.
There is NO WARRANTY, to the extent permitted by law.


The following changes still work with that version:

diff -r 9f4a9dd4a6ee doc/interpreter/mk-qthelp.pl
--- a/doc/interpreter/mk-qthelp.pl      Sun Nov 13 13:00:16 2022 -0500
+++ b/doc/interpreter/mk-qthelp.pl      Mon Nov 14 12:24:39 2022 +0100
@@ -26,8 +26,10 @@
 open (my $HTML, "<", $htmlfname) or die "Unable to open $htmlfname";
 
 # Skip through preamble of file to find start of list
-while (($_ = <$HTML>) !~ /^<div class="contents">/ ) {;}
-while (($_ = <$HTML>) !~ /^<ul class="no-bullet">/ ) {;}
+while (not (eof ($HTML)) and ( ($_ = <$HTML>) !~ /^<div class="contents">/ )
) {;}
+while (not (eof ($HTML)) and ( ($_ = <$HTML>) !~ /^<ul
class="(no-bullet|toc-numbered-mark)">/ ) ) {;}
+
+die "index.html: reached EOF: bait changed?" if eof($HTML);
 
 $level = 0;
 while (<$HTML>)
@@ -68,7 +70,9 @@
 open ($HTML, "<", $htmlfname) or die "Unable to open $htmlfname";
 
 # Skip through preamble of file to find start of list
-while (($_ = <$HTML>) !~ /^<table class="index-fn/ ) {;}
+while (not (eof ($HTML)) and ( ($_ = <$HTML>) !~ /^<table
class="(index-fn|fn-entries)/ ) ) {;}
+
+die "Function-Index.html: reached EOF: bait changed?" if eof($HTML);
 
 while (<$HTML>)
 {


Do those changes fix the issue with texinfo 7.0?



    _______________________________________________________

Reply to this item at:

  <https://savannah.gnu.org/bugs/?62648>

_______________________________________________
Message sent via Savannah
https://savannah.gnu.org/