From 48798f9b3350418107c62aa712e7418853c7e6bb Mon Sep 17 00:00:00 2001
From: Ben Cotton <bcotton@fedoraproject.org>
Date: Mon, 13 Aug 2018 08:32:54 -0400
Subject: [PATCH] Fix perl incompatibility (BZ #1582267)

---
 latex2html-issue48-1.patch | 32 ++++++++++++++++++++++++++++++++
 latex2html-issue48-2.patch | 20 ++++++++++++++++++++
 latex2html.spec            | 11 ++++++++++-
 3 files changed, 62 insertions(+), 1 deletion(-)
 create mode 100644 latex2html-issue48-1.patch
 create mode 100644 latex2html-issue48-2.patch

diff --git a/latex2html-issue48-1.patch b/latex2html-issue48-1.patch
new file mode 100644
index 0000000..e28cc40
--- /dev/null
+++ b/latex2html-issue48-1.patch
@@ -0,0 +1,32 @@
+From ead9c5ade86d90b07f778b2fcb972f273d52c3c2 Mon Sep 17 00:00:00 2001
+From: Dan Gildea <dgildea>
+Date: Thu, 24 May 2018 14:01:34 -0400
+Subject: [PATCH] escape var in regexp
+
+Fixes #48
+---
+ latex2html.pin | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/latex2html.pin b/latex2html.pin
+index 116473f..398b3db 100755
+--- a/latex2html.pin
++++ b/latex2html.pin
+@@ -4627,7 +4627,7 @@ sub balance_tags {
+     $save_tags = join(',',@save_open_tags) if (@save_open_tags);
+     $open_tags = join(',',@$open_tags_R) if (@$open_tags_R);
+     if ($open_tags eq $save_tags) { return(); }
+-    if ($save_tags =~ s/^$open_tags//) {
++    if ($save_tags =~ s/^\Q$open_tags\E//) {
+ 	@reopen_tags = split (',',$');
+     } else {
+ 	@reopen_tags = @save_open_tags;
+@@ -4637,7 +4637,7 @@ sub balance_tags {
+ 	    $declarations{$tag_cmd} =~ m|</.*$|;
+ 	    $tags .= $& unless ($` =~ /^<>$/);
+ 	    $open_tags = join(',',@$open_tags_R) if (@$open_tags_R);
+-	    last if ( $save_tags =~ s/^$open_tags/
++	    last if ( $save_tags =~ s/^\Q$open_tags\E/
+ 		     @reopen_tags = split (',',$');''/e);
+ 	}
+     }
diff --git a/latex2html-issue48-2.patch b/latex2html-issue48-2.patch
new file mode 100644
index 0000000..ef33f9d
--- /dev/null
+++ b/latex2html-issue48-2.patch
@@ -0,0 +1,20 @@
+From 78c9a4d6be6c403f2fbe4174a40a7a6585493793 Mon Sep 17 00:00:00 2001
+From: Dan Gildea <dgildea>
+Date: Thu, 24 May 2018 14:05:27 -0400
+Subject: [PATCH] \usepackage{xcolor}
+
+just loads "color" package
+---
+ styles/xcolor.perl | 3 +++
+ 1 file changed, 3 insertions(+)
+ create mode 100644 styles/xcolor.perl
+
+diff --git a/styles/xcolor.perl b/styles/xcolor.perl
+new file mode 100644
+index 0000000..90ace0a
+--- /dev/null
++++ b/styles/xcolor.perl
+@@ -0,0 +1,3 @@
++do_require_package('color');
++
++1;
diff --git a/latex2html.spec b/latex2html.spec
index ec244b1..3b133e0 100644
--- a/latex2html.spec
+++ b/latex2html.spec
@@ -3,7 +3,7 @@
 Summary: Converts LaTeX documents to HTML
 Name: latex2html
 Version: 2017.2
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPLv2+
 Group: Applications/Publishing
 URL: http://www.latex2html.org/
@@ -18,6 +18,8 @@ Patch1: teTeX-l2h-config.patch
 Patch3: latex2html-2K.1beta-DB.patch
 Patch4: latex2html-2002-2-1-SHLIB.patch
 Patch5: latex2html-2002-2-1-gsfont.patch
+Patch6: latex2html-issue48-1.patch
+Patch7: latex2html-issue48-2.patch
 Requires: tex(latex), tex(dvips), tex(url.sty), netpbm-progs
 BuildRequires: perl-interpreter >= 5.003, perl-generators, ghostscript >= 4.03, netpbm-progs >= 9.21, tex(latex)
 BuildArch: noarch
@@ -49,6 +51,10 @@ pushd %{name}-%{version}
 # don't require the font directory to be ended with PATH/fonts
 %patch5 -p1 -b .gsfont
 
+# Patch Perl compatibility. Fixes are upstream in a later release
+%patch6 -p1
+%patch7 -p1
+
 # remove all platforms we don't need
 for i in Dos Mac OS2 Win32; do
   rm -f L2hos/${i}.pm
@@ -216,6 +222,9 @@ rm -f %{buildroot}%{_datadir}/texmf/tex/latex/html/url.sty
 %{_mandir}/man1/pstoimg.*
 
 %changelog
+* Mon Aug 13 2018 Ben Cotton <bcotton@fedoraproject.org> - 2017.2-5
+- Add patch to fix Perl incompatibilities (BZ #1582267)
+
 * Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2017.2-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild