Accepting request 528505 from home:coolo:branches:openSUSE:Factory
- add latex2html-perl526.patch to work with perl 5.26 OBS-URL: https://build.opensuse.org/request/show/528505 OBS-URL: https://build.opensuse.org/package/show/Publishing/latex2html?expand=0&rev=30
This commit is contained in:
parent
0e2f06a65f
commit
f19de812e6
110
latex2html-perl526.patch
Normal file
110
latex2html-perl526.patch
Normal file
@ -0,0 +1,110 @@
|
||||
Index: latex2html-2017.2/versions/html3_2.pl
|
||||
===================================================================
|
||||
--- latex2html-2017.2.orig/versions/html3_2.pl
|
||||
+++ latex2html-2017.2/versions/html3_2.pl
|
||||
@@ -607,7 +607,7 @@ sub process_tabular {
|
||||
|
||||
if ($color_env) {
|
||||
local($color_test) = join(',',@$open_tags_R);
|
||||
- if ($color_test =~ /(color{[^}]*})/g ) {
|
||||
+ if ($color_test =~ /(color\{[^}]*})/g ) {
|
||||
$color_env = $1;
|
||||
}
|
||||
}
|
||||
Index: latex2html-2017.2/versions/html4_01.pl
|
||||
===================================================================
|
||||
--- latex2html-2017.2.orig/versions/html4_01.pl
|
||||
+++ latex2html-2017.2/versions/html4_01.pl
|
||||
@@ -976,7 +976,7 @@ sub process_tabular {
|
||||
|
||||
if ($color_env) {
|
||||
local($color_test) = join(',',@$open_tags_R);
|
||||
- if ($color_test =~ /(color{[^}]*})/g ) {
|
||||
+ if ($color_test =~ /(color\{[^}]*})/g ) {
|
||||
$color_env = $1;
|
||||
}
|
||||
}
|
||||
Index: latex2html-2017.2/versions/html4_1.pl
|
||||
===================================================================
|
||||
--- latex2html-2017.2.orig/versions/html4_1.pl
|
||||
+++ latex2html-2017.2/versions/html4_1.pl
|
||||
@@ -976,7 +976,7 @@ sub process_tabular {
|
||||
|
||||
if ($color_env) {
|
||||
local($color_test) = join(',',@$open_tags_R);
|
||||
- if ($color_test =~ /(color{[^}]*})/g ) {
|
||||
+ if ($color_test =~ /(color\{[^}]*})/g ) {
|
||||
$color_env = $1;
|
||||
}
|
||||
}
|
||||
Index: latex2html-2017.2/configure
|
||||
===================================================================
|
||||
--- latex2html-2017.2.orig/configure
|
||||
+++ latex2html-2017.2/configure
|
||||
@@ -1225,7 +1225,7 @@ if test "$?" != "0"; then
|
||||
fi
|
||||
|
||||
# this is used to get the values from the config file
|
||||
-eval `perl -w -e 'use cfgcache; foreach(keys %cfg) { print qq($_='"'"'$cfg{$_}'"'"'\n);}'`
|
||||
+eval `perl -w -e 'use lib q[.]; use cfgcache; foreach(keys %cfg) { print qq($_='"'"'$cfg{$_}'"'"'\n);}'`
|
||||
|
||||
|
||||
|
||||
Index: latex2html-2017.2/latex2html.pin
|
||||
===================================================================
|
||||
--- latex2html-2017.2.orig/latex2html.pin
|
||||
+++ latex2html-2017.2/latex2html.pin
|
||||
@@ -123,7 +123,7 @@ if($ENV{'L2HCONFIG'}) {
|
||||
require $ENV{'L2HCONFIG'} ||
|
||||
die "Fatal (require $ENV{'L2HCONFIG'}): $!";
|
||||
} else {
|
||||
- eval 'use l2hconf';
|
||||
+ eval 'use lib "."; use l2hconf';
|
||||
if($@) {
|
||||
die "Fatal (use l2hconf): $@\n";
|
||||
}
|
||||
@@ -1922,7 +1922,7 @@ sub mark_string {
|
||||
}
|
||||
$_[0] = join('',$before,"\{",$after) if($change);
|
||||
# MRO: mark one opening brace
|
||||
- if($_[0] =~ s/^([^{]*){/push(@processedB,$1);join('',$O,++$id,$C)/eos) {
|
||||
+ if($_[0] =~ s/^([^{]*)\{/push(@processedB,$1);join('',$O,++$id,$C)/eos) {
|
||||
$before=''; $after=$';
|
||||
}
|
||||
if ($after =~ /\}/) {
|
||||
Index: latex2html-2017.2/config/build.pl
|
||||
===================================================================
|
||||
--- latex2html-2017.2.orig/config/build.pl
|
||||
+++ latex2html-2017.2/config/build.pl
|
||||
@@ -145,6 +145,7 @@ my ($VERSION) = q$Revision: 1.6 $ =~ /:\
|
||||
# Read in the system's configuration
|
||||
use FindBin;
|
||||
use lib "$FindBin::Bin/..";
|
||||
+use lib "$FindBin::Bin";
|
||||
use cfgcache;
|
||||
|
||||
my $dd = $cfg{'dd'};
|
||||
Index: latex2html-2017.2/config/config.pl
|
||||
===================================================================
|
||||
--- latex2html-2017.2.orig/config/config.pl
|
||||
+++ latex2html-2017.2/config/config.pl
|
||||
@@ -435,6 +435,7 @@ use IO::File;
|
||||
|
||||
use FindBin;
|
||||
use lib "$FindBin::Bin/..";
|
||||
+use lib "$FindBin::Bin";
|
||||
use L2hos;
|
||||
|
||||
#use diagnostics;
|
||||
Index: latex2html-2017.2/config/install.pl
|
||||
===================================================================
|
||||
--- latex2html-2017.2.orig/config/install.pl
|
||||
+++ latex2html-2017.2/config/install.pl
|
||||
@@ -183,6 +183,7 @@ my ($VERSION) = q$Revision: 1.12 $ =~ /:
|
||||
|
||||
use FindBin;
|
||||
use lib "$FindBin::Bin/..";
|
||||
+use lib "$FindBin::Bin";
|
||||
use cfgcache;
|
||||
use L2hos;
|
||||
|
@ -1,3 +1,8 @@
|
||||
-------------------------------------------------------------------
|
||||
Sun Sep 24 09:32:42 UTC 2017 - coolo@suse.com
|
||||
|
||||
- add latex2html-perl526.patch to work with perl 5.26
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Jul 10 11:27:31 UTC 2017 - jengelh@inai.de
|
||||
|
||||
|
@ -35,6 +35,7 @@ Patch1: latex2html-perl-bindir.diff
|
||||
Patch2: latex2html-dest-dir.diff
|
||||
Patch3: latex2html-binmode.diff
|
||||
Patch4: latex2html-backref-workaround.diff
|
||||
Patch5: latex2html-perl526.patch
|
||||
BuildRequires: fdupes
|
||||
BuildRequires: ghostscript-fonts-std
|
||||
BuildRequires: ghostscript-x11
|
||||
@ -79,6 +80,7 @@ This subpackage contains the documentation for the Latex2HTML converter.
|
||||
%patch2
|
||||
%patch3
|
||||
%patch4
|
||||
%patch5 -p1
|
||||
cp %{SOURCE2} README.SUSE
|
||||
cp %{SOURCE4} .
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user