Hello community, here is the log from the commit of package gri for openSUSE:Factory checked in at 2017-10-27 14:01:46 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gri (Old) and /work/SRC/openSUSE:Factory/.gri.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gri" Fri Oct 27 14:01:46 2017 rev:15 rq:536995 version:2.12.23 Changes: -------- --- /work/SRC/openSUSE:Factory/gri/gri.changes 2017-06-27 10:21:45.935012272 +0200 +++ /work/SRC/openSUSE:Factory/.gri.new/gri.changes 2017-10-27 14:02:05.294146913 +0200 @@ -0,0 +1,5 @@ +------------------------------------------------------------------- +Thu Oct 26 12:20:43 UTC 2017 - [email protected] + +- Add gri-perl-5.26.patch: Fix usage of texinfo2HTML for usage with + perl 5.26. New: ---- gri-perl-5.26.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gri.spec ++++++ --- /var/tmp/diff_new_pack.Fkoa1p/_old 2017-10-27 14:02:06.906071561 +0200 +++ /var/tmp/diff_new_pack.Fkoa1p/_new 2017-10-27 14:02:06.906071561 +0200 @@ -30,6 +30,8 @@ Patch2: reproducible.patch # PATCH-FIX-UPSTREAM gri-invalid-char-to-pointer.patch [email protected] -- Fix a char to char* conversion by replacing '\0' with NULL Patch3: gri-invalid-char-to-pointer.patch +# PATCH-FIX-UPSTREAM gri-perl-5.26.patch [email protected] -- Fix texinfo2HTML for usage with Perl 5.26 +Patch4: gri-perl-5.26.patch BuildRequires: ImageMagick BuildRequires: fdupes BuildRequires: gcc-c++ @@ -62,6 +64,7 @@ %patch1 -p1 %patch2 -p1 %patch3 -p1 +%patch4 -p1 %build %configure ++++++ gri-perl-5.26.patch ++++++ Index: gri-2.12.23/doc/texinfo2HTML =================================================================== --- gri-2.12.23.orig/doc/texinfo2HTML +++ gri-2.12.23/doc/texinfo2HTML @@ -120,7 +120,7 @@ while(get_a_line()) { next; } # Process image commands (NOT...it's there already) - if (/\@image{(.*)}/) { + if (/\@image\{(.*)\}/) { #print "<img src=\"$1.gif\" border=\"1\">\n"; next; } @@ -208,12 +208,12 @@ while(get_a_line()) { s,<,<,og; # Special tweak to make 'Gri' look cooler. # s, Gri , G<FONT SIZE=-1>RI</FONT> ,og; - s,\@code{\@\@},\@code{TEXINFO2HTML-AT-AT},og; + s,\@code\{\@\@\},\@code\{TEXINFO2HTML-AT-AT\},og; s,\@},TEXINFO2HTML-CLOSE-BRACE,og; # retain inside e.g. @code{} s,\@\@,TEXINFO2HTML-AT-AT,og; - s,\@{,{,og; - s,\@TeX{},TeX,og; - s,\@dots{},...,og; + s,\@\{,\{,og; + s,\@TeX\{\},TeX,og; + s,\@dots\{\},...,og; # Put in place-holders for some accents. I should check for all # of them, but for now, I'm just kludging in a couple, # to solve an immediate problem and to serve as a place-holder @@ -237,18 +237,18 @@ while(get_a_line()) { } next; } - while (/\@url{([^}]*)}/) { + while (/\@url\{([^}]*)\}/) { $the_url = $1; - s:\@url{[^}]*}:<a href="$the_url">\@code{$the_url}</a>:; + s:\@url\{[^}]*}:<a href="$the_url">\@code\{$the_url}</a>:; } - while (/\@uref{([^}]*)}/) { + while (/\@uref\{([^}]*)}/) { @items = split(/,/, $1); if ($#items == 0) { - s:\@uref{[^}]*}:<a href="$items[0]">$items[0]</a>:; + s:\@uref\{[^}]*}:<a href="$items[0]">$items[0]</a>:; } elsif ($#items == 1) { - s:\@uref{[^}]*}:<a href="$items[0]">$items[1]</a>:; + s:\@uref\{[^}]*}:<a href="$items[0]">$items[1]</a>:; } elsif ($#items == 2) { - s:\@uref{[^}]*}:\@code{$items[2]}:; + s:\@uref\{[^}]*}:\@code\{$items[2]}:; } else { die "Cannot have more than 3 items in a 'uref' at \"$_\""; } @@ -330,7 +330,7 @@ while(get_a_line()) { while(get_a_line()) { next if /\@sp/; next if /\@cindex/; - s|\@anchor{([^}]*)}|<a name=\"$1\"></a>|g; + s|\@anchor\{([^}]*)}|<a name=\"$1\"></a>|g; &process_examples(); # Handle HTML inserts if (/^\@c HTML (.*)/o) { @@ -346,10 +346,10 @@ while(get_a_line()) { } if (/\s*\@item\s*(.*)/o) { $the_item = $1; - $the_item =~ s:\@{:{:og; + $the_item =~ s:\@\{:{:og; $the_item =~ s:\@}:}:og; $the_item =~ s:\@\@:\@:og; - $the_item =~ s:\@code{([^}]*)}:`<font color="$ex_color"><code>$1</code></font>':og; + $the_item =~ s:\@code\{([^}]*)}:`<font color="$ex_color"><code>$1</code></font>':og; print "<dt> $start_item$the_item$end_item\n<dd>"; } else { print "<p>" if (/^$/o); @@ -402,38 +402,38 @@ sub process_examples() { } else { s,\@value\{([^}]*)\},$value{$1},g; # Substitute set/value pair s,\@},},og; - s,\@{,{,og; + s,\@\{,{,og; } } sub sub_refs { - die "line $. of file: cannot have multiple refs on one line" if (/\@[px]*ref{(.*)}(.*)\@[px]*ref{(.*)}/); + die "line $. of file: cannot have multiple refs on one line" if (/\@[px]*ref\{(.*)}(.*)\@[px]*ref\{(.*)}/); # anchors - s|\@anchor{([^}]*)}|<a name=\"$1\"></a>|g; + s|\@anchor\{([^}]*)}|<a name=\"$1\"></a>|g; # Change e.g. # @xref{Viewing} # into # <a href="#Viewing">see Viewing</a> #if (/\@ref/){print "AAA[$_]AAA\n"; - s|\@ref{([^}]*)}|see <a href="#$1">$1</a>|g; + s|\@ref\{([^}]*)}|see <a href="#$1">$1</a>|g; #print "BBB[$_]BBB\n";} - s|\@xref{([^}]*)}|see <a href="#$1">$1</a>|g; - s|\@pxref{([^}]*)}|see <a href="#$1">$1.</a>|g; - while (/\@url{([^}]*)}/) { + s|\@xref\{([^}]*)}|see <a href="#$1">$1</a>|g; + s|\@pxref\{([^}]*)}|see <a href="#$1">$1.</a>|g; + while (/\@url\{([^}]*)}/) { $the_url = $1; - s:\@url{[^}]*}:<a href="$the_url">\@code{$the_url}</a>:; + s:\@url\{[^}]*}:<a href="$the_url">\@code{$the_url}</a>:; } - while (/\@uref{([^}]*)}/) { + while (/\@uref\{([^}]*)}/) { @items = split(/,/, $1); if ($#items == 0) { - s:\@uref{[^}]*}:<a href="$items[0]">$items[0]</a>:; + s:\@uref\{[^}]*}:<a href="$items[0]">$items[0]</a>:; } elsif ($#items == 1) { - s:\@uref{[^}]*}:<a href="$items[0]">$items[1]</a>:; + s:\@uref\{[^}]*}:<a href="$items[0]">$items[1]</a>:; } elsif ($#items == 2) { - s:\@uref{[^}]*}:\@code{$items[2]}:; + s:\@uref\{[^}]*}:\@code{$items[2]}:; } else { die "Cannot have more than 3 items in a 'uref' at \"$_\""; } @@ -466,17 +466,17 @@ sub sub_headings { sub sub_emphasis { s,<<,<<,g; s,>>,>>,g; - s,\@emph{([^}]*)},<em>$1</em>,g; - s,\@strong{([^}]*)},<b>$1</b>,g; - s,\@footnote{([^}]*)}, [$1],g; - s,\@b{([^}]*)},<b>$1</b>,g; + s,\@emph\{([^}]*)},<em>$1</em>,g; + s,\@strong\{([^}]*)},<b>$1</b>,g; + s,\@footnote\{([^}]*)}, [$1],g; + s,\@b\{([^}]*)},<b>$1</b>,g; - s,\@code{([^}]*)},`<font color="$ex_color"><code>$1</code></font>',g; + s,\@code\{([^}]*)},`<font color="$ex_color"><code>$1</code></font>',g; s,\@\@,\@,g; - s,\@samp{([^}]*)},`<font color="$ex_color"><samp>$1</samp></font>',g; - s,\@key{([^}]*)},`<font color="$ex_color"><kbd>$1</kbd></font>',g; - s,\@kbd{([^}]*)},`<font color="$ex_color"><kbd>$1</kbd></font>',g; - s,\@file{([^}]*)},`<font color="$ex_color"><samp>$1</samp></font>',g; + s,\@samp\{([^}]*)},`<font color="$ex_color"><samp>$1</samp></font>',g; + s,\@key\{([^}]*)},`<font color="$ex_color"><kbd>$1</kbd></font>',g; + s,\@kbd\{([^}]*)},`<font color="$ex_color"><kbd>$1</kbd></font>',g; + s,\@file\{([^}]*)},`<font color="$ex_color"><samp>$1</samp></font>',g; s,TEXINFO2HTML-CLOSE-BRACE,},g; s,TEXINFO2HTML-AT-AT,\@,g; s,TEXINFO2HTML-ACCENT-ACUTE-a,á,g;
