pool/latex2html
SHA256
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 349190 from Publishing

Browse Source 
- updated to 2015: apply patches from Debian
D    latex2html-2012-backref-workaround.diff
D    latex2html-2012-binmode.diff
D    latex2html-2012-dest-dir.diff
D    latex2html-2012-gsout.diff (upstreamed)
D    latex2html-2012-match-multiline.diff (upstreamed)
D    latex2html-2012-perl-bindir.diff
D    latex2html-2012-share-dir.diff
A    latex2html-backref-workaround.diff
A    latex2html-binmode.diff
A    latex2html-dest-dir.diff
A    latex2html-perl-bindir.diff
A    latex2html-share-dir.diff

OBS-URL: https://build.opensuse.org/request/show/349190
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/latex2html?expand=0&rev=31
This commit is contained in:
Dominique Leuenberger 2015-12-20 09:52:08 +00:00 committed by Git OBS Bridge
commit 06179b9e1a
11 changed files with 98 additions and 1352 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
latex2html-2012-gsout.diff
View File

@ -1,11 +0,0 @@
--- config/config.pl
+++ config/config.pl
@@ -1043,7 +1043,7 @@
my $gs_version;
my $flag = 0;
- unless(open(GS,"$gs -h |")) {
+ unless(open(GS,"$gs -h 2>&1 |")) {
$opt{'have_pstoimg'} = 0;
logit("Error: could not execute $gs\n");
&warn_no_images();

1288
latex2html-2012-match-multiline.diff
View File

File diff suppressed because it is too large Load Diff

3
latex2html-2012.tgz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:36b4b633507dba19a356d4ec5c6c145b242406b2b47cbe44aabf5e7efa2aa16f
size 1155856

3
latex2html-2015.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:248cf84c70dd31221ddc69ef7ce0e720aadd26b572ee412827eae62f0eefb8dd
size 1217699

0
latex2html-2012-backref-workaround.diff → latex2html-backref-workaround.diff
View File

106
latex2html-2012-binmode.diff → latex2html-binmode.diff
View File

@ -1,5 +1,7 @@
--- IndicTeX-HTML/devnagri.perl Index: IndicTeX-HTML/devnagri.perl
+++ IndicTeX-HTML/devnagri.perl ===================================================================
--- IndicTeX-HTML/devnagri.perl.orig 2002-11-29 12:48:57.000000000 +0100
+++ IndicTeX-HTML/devnagri.perl 2015-12-16 15:54:34.214410597 +0100
@@ -331,6 +331,7 @@ @@ -331,6 +331,7 @@
sub do_env_pre_tr_devnagri { sub do_env_pre_tr_devnagri {
local($_) = @_; local($_) = @_;
@ -8,8 +10,10 @@
print DNTR "\$\$", &revert_to_raw_tex($_), "\$\$"; print DNTR "\$\$", &revert_to_raw_tex($_), "\$\$";
close DNTR; close DNTR;
&syswait("patc -p $PRE_FILTERS${dd}dng.pat dntr.tmp dntr.tmp1"); &syswait("patc -p $PRE_FILTERS${dd}dng.pat dntr.tmp dntr.tmp1");
--- IndicTeX-HTML/itrans.perl Index: IndicTeX-HTML/itrans.perl
+++ IndicTeX-HTML/itrans.perl ===================================================================
--- IndicTeX-HTML/itrans.perl.orig 2015-08-04 16:58:10.000000000 +0200
+++ IndicTeX-HTML/itrans.perl 2015-12-16 15:54:34.214410597 +0100
@@ -336,10 +336,11 @@ @@ -336,10 +336,11 @@
, "\#${indic}ifm=".$itrans_info{$indic.'ifm'} , "\#${indic}ifm=".$itrans_info{$indic.'ifm'}
, "\#$indic", $itext , "\#end$indic\n" ); , "\#$indic", $itext , "\#end$indic\n" );
@ -23,8 +27,10 @@
while (<ITRANS>) { while (<ITRANS>) {
next if (/^(\%|$)/); next if (/^(\%|$)/);
$itext .= $_ $itext .= $_
--- IndicTeX-HTML/malyalam.perl Index: IndicTeX-HTML/malyalam.perl
+++ IndicTeX-HTML/malyalam.perl ===================================================================
--- IndicTeX-HTML/malyalam.perl.orig 2002-11-29 12:48:59.000000000 +0100
+++ IndicTeX-HTML/malyalam.perl 2015-12-16 15:54:34.214410597 +0100
@@ -221,6 +221,7 @@ @@ -221,6 +221,7 @@
sub do_env_pre_mmtr { sub do_env_pre_mmtr {
local($_) = @_; local($_) = @_;
@ -33,8 +39,10 @@
print MMTR "\$\$", &revert_to_raw_tex($_), "\$\$"; print MMTR "\$\$", &revert_to_raw_tex($_), "\$\$";
close MMTR; close MMTR;
&syswait("$PATC -p $MMDIR${dd}mm.pat mmtr.tmp mmtr.tmp1"); &syswait("$PATC -p $MMDIR${dd}mm.pat mmtr.tmp mmtr.tmp1");
--- cweb2html/cweb2html Index: cweb2html/cweb2html
+++ cweb2html/cweb2html ===================================================================
--- cweb2html/cweb2html.orig 2015-12-16 15:54:34.198410597 +0100
+++ cweb2html/cweb2html 2015-12-16 15:54:34.214410597 +0100
@@ -258,7 +258,7 @@ @@ -258,7 +258,7 @@
open(INPUT,"<$filename") || open(INPUT,"<$filename") ||
@ -44,8 +52,10 @@
while (<INPUT>) { while (<INPUT>) {
$string{'STRING'} .= $_; $string{'STRING'} .= $_;
} }
--- cweb2html/htcweb.perl Index: cweb2html/htcweb.perl
+++ cweb2html/htcweb.perl ===================================================================
--- cweb2html/htcweb.perl.orig 2002-11-29 12:49:01.000000000 +0100
+++ cweb2html/htcweb.perl 2015-12-16 15:54:34.214410597 +0100
@@ -941,6 +941,7 @@ @@ -941,6 +941,7 @@
print "\nReading <$_[0]>..." if $DEBUG; print "\nReading <$_[0]>..." if $DEBUG;
@ -70,8 +80,10 @@
while (<INPUT>) { while (<INPUT>) {
$string{'STRING'} .= $_}; $string{'STRING'} .= $_};
$_ = delete $string{'STRING'}; # Blow it away and return the result $_ = delete $string{'STRING'}; # Blow it away and return the result
--- cweb2html/makemake.pl Index: cweb2html/makemake.pl
+++ cweb2html/makemake.pl ===================================================================
--- cweb2html/makemake.pl.orig 2015-12-16 15:54:34.198410597 +0100
+++ cweb2html/makemake.pl 2015-12-16 15:54:34.214410597 +0100
@@ -27,8 +27,10 @@ @@ -27,8 +27,10 @@
die "Cannot rename to $source.bak, $!\n"; die "Cannot rename to $source.bak, $!\n";
open(OUT,">$source") || open(OUT,">$source") ||
@ -83,8 +95,10 @@
while (<IN>) { while (<IN>) {
$string{'STRING'} .= $_; $string{'STRING'} .= $_;
} }
--- latex2html.pin Index: latex2html.pin
+++ latex2html.pin ===================================================================
--- latex2html.pin.orig 2015-08-04 16:58:10.000000000 +0200
+++ latex2html.pin 2015-12-16 15:54:34.218410597 +0100
@@ -1088,6 +1088,7 @@ @@ -1088,6 +1088,7 @@
unless($ignore); unless($ignore);
return undef; return undef;
@ -234,7 +248,7 @@
print CAPTIONS $_; print CAPTIONS $_;
close (CAPTIONS); close (CAPTIONS);
} else { } else {
@@ -16385,6 +16404,7 @@ @@ -16379,6 +16398,7 @@
if (-f $access_file) { if (-f $access_file) {
print STDOUT " ... found"; print STDOUT " ... found";
open(HTACCESS, "<$access_file"); open(HTACCESS, "<$access_file");
@ -242,26 +256,30 @@
while (<HTACCESS>) { while (<HTACCESS>) {
if (/^\s*XBitHack\s*on\s*$/) { if (/^\s*XBitHack\s*on\s*$/) {
print STDOUT " with XBitHack on"; print STDOUT " with XBitHack on";
--- styles/color.perl Index: styles/color.perl
+++ styles/color.perl ===================================================================
@@ -154,6 +154,7 @@ --- styles/color.perl.orig 2015-12-16 15:54:34.218410597 +0100
+++ styles/color.perl 2015-12-16 15:55:58.302409628 +0100
@@ -153,6 +153,7 @@
if (-f $file) { if (-f $file) {
if (open(COLORFILE,"<$file")) { if (open(COLORFILE,"<$file")) {
print STDOUT "\n(reading colors from $file" if $DEBUG; print STDOUT "\n(reading colors from $file" if $DEBUG;
+ binmode COLORFILE; + binmode COLORFILE;
$* = 0; # Multiline matching OFF
while (<COLORFILE>) { while (<COLORFILE>) {
s/^\s*(\d+)\s+(\d+)\s+(\d+)\s+(\w+(\s\w+)*)\s*/ s/^\s*(\d+)\s+(\d+)\s+(\d+)\s+(\w+(\s\w+)*)\s*/
@@ -187,6 +188,7 @@ ($r,$g,$b,$name)=($1,$2,$3,$4);
@@ -183,6 +184,7 @@
if (-f $file) { if (-f $file) {
if (open(COLORFILE,"<$file")) { if (open(COLORFILE,"<$file")) {
print STDOUT "\n(reading colors from $file"; print STDOUT "\n(reading colors from $file";
+ binmode COLORFILE; + binmode COLORFILE;
$* = 0; # Multiline matching OFF
@colors = (<COLORFILE>); @colors = (<COLORFILE>);
foreach (@colors) { foreach (@colors) {
--- styles/frames.perl next if (/^\s*$/);
+++ styles/frames.perl Index: styles/frames.perl
===================================================================
--- styles/frames.perl.orig 2002-11-29 12:49:18.000000000 +0100
+++ styles/frames.perl 2015-12-16 15:54:34.218410597 +0100
@@ -1126,6 +1126,7 @@ @@ -1126,6 +1126,7 @@
); );
&text_cleanup; &text_cleanup;
@ -270,8 +288,10 @@
print FILE $_; print FILE $_;
close(FILE); close(FILE);
} }
--- styles/getimagesize.perl Index: styles/getimagesize.perl
+++ styles/getimagesize.perl ===================================================================
--- styles/getimagesize.perl.orig 2002-11-29 12:49:18.000000000 +0100
+++ styles/getimagesize.perl 2015-12-16 15:54:34.218410597 +0100
@@ -12,6 +12,7 @@ @@ -12,6 +12,7 @@
my $type = lc($1); my $type = lc($1);
$type = $IMAGE_TYPE unless $type =~ /(gif|png|jpe?g)/; $type = $IMAGE_TYPE unless $type =~ /(gif|png|jpe?g)/;
@ -280,8 +300,10 @@
my ($buffer,$magic,$dummy,$width,$height) = ('','','',0,0); my ($buffer,$magic,$dummy,$width,$height) = ('','','',0,0);
binmode(IMAGE); # not harmful un UNIX binmode(IMAGE); # not harmful un UNIX
# if ($IMAGE_TYPE =~ /gif/) { # if ($IMAGE_TYPE =~ /gif/) {
--- styles/graphics-support.perl Index: styles/graphics-support.perl
+++ styles/graphics-support.perl ===================================================================
--- styles/graphics-support.perl.orig 2004-10-25 07:15:01.000000000 +0200
+++ styles/graphics-support.perl 2015-12-16 15:54:34.218410597 +0100
@@ -426,6 +426,7 @@ @@ -426,6 +426,7 @@
my($file)=@_; my($file)=@_;
my(@bb,$f); my(@bb,$f);
@ -290,8 +312,10 @@
while(<PS>){ while(<PS>){
if(/^%%BoundingBox:\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)\s*$/){ if(/^%%BoundingBox:\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)\s*$/){
@bb=($1,$2,$3,$4); last; }} @bb=($1,$2,$3,$4); last; }}
--- styles/html.perl Index: styles/html.perl
+++ styles/html.perl ===================================================================
--- styles/html.perl.orig 2015-08-04 16:58:10.000000000 +0200
+++ styles/html.perl 2015-12-16 15:54:34.218410597 +0100
@@ -293,6 +293,7 @@ @@ -293,6 +293,7 @@
if ($pretag) { if ($pretag) {
# code due to Alan Williams <alanw@cs.man.ac.uk> # code due to Alan Williams <alanw@cs.man.ac.uk>
@ -308,8 +332,10 @@
print "\nLoading external labels from $labelfile, with prefix $pretag" print "\nLoading external labels from $labelfile, with prefix $pretag"
if ($VERBOSITY > 1); if ($VERBOSITY > 1);
local($translated_stream, $instream); local($translated_stream, $instream);
--- styles/webtex.perl Index: styles/webtex.perl
+++ styles/webtex.perl ===================================================================
--- styles/webtex.perl.orig 2015-08-04 16:58:10.000000000 +0200
+++ styles/webtex.perl 2015-12-16 15:54:34.218410597 +0100
@@ -227,6 +227,7 @@ @@ -227,6 +227,7 @@
&webeq_failed($out_tag); $out_tag = ''; &webeq_failed($out_tag); $out_tag = '';
} else { } else {
@ -318,8 +344,10 @@
$app_tag = join('',<TAG>); $app_tag = join('',<TAG>);
close(TAG); close(TAG);
# replace webeq fall-back image by LaTeX2HTML's own, or none at all # replace webeq fall-back image by LaTeX2HTML's own, or none at all
--- texexpand.pin Index: texexpand.pin
+++ texexpand.pin ===================================================================
--- texexpand.pin.orig 2004-01-03 07:14:59.000000000 +0100
+++ texexpand.pin 2015-12-16 15:54:34.218410597 +0100
@@ -552,6 +552,7 @@ @@ -552,6 +552,7 @@
if($opt{save_styles}) { if($opt{save_styles}) {
open(STYLES,">$opt{save_styles}") open(STYLES,">$opt{save_styles}")
@ -344,8 +372,10 @@
print STDERR "$prompt %--- Processing $infile" if ($debug > 1); print STDERR "$prompt %--- Processing $infile" if ($debug > 1);
# if we don't include this file marker LaTeX2HTML won't split # if we don't include this file marker LaTeX2HTML won't split
--- versions/frame.pl Index: versions/frame.pl
+++ versions/frame.pl ===================================================================
--- versions/frame.pl.orig 2002-11-29 12:49:18.000000000 +0100
+++ versions/frame.pl 2015-12-16 15:54:34.222410596 +0100
@@ -1202,6 +1202,7 @@ @@ -1202,6 +1202,7 @@
); );
&text_cleanup; &text_cleanup;
@ -354,8 +384,10 @@
print FILE $_; print FILE $_;
close(FILE); close(FILE);
} }
--- versions/techexpl.pl Index: versions/techexpl.pl
+++ versions/techexpl.pl ===================================================================
--- versions/techexpl.pl.orig 2002-11-29 12:49:19.000000000 +0100
+++ versions/techexpl.pl 2015-12-16 15:54:34.222410596 +0100
@@ -212,6 +212,7 @@ @@ -212,6 +212,7 @@
sub TE_check_file_contents { sub TE_check_file_contents {
local ($ifile) = @_; local ($ifile) = @_;

0
latex2html-2012-dest-dir.diff → latex2html-dest-dir.diff
View File

0
latex2html-2012-perl-bindir.diff → latex2html-perl-bindir.diff
View File

0
latex2html-2012-share-dir.diff → latex2html-share-dir.diff
View File

17
latex2html.changes
View File

@ -1,3 +1,20 @@
-------------------------------------------------------------------
Wed Dec 16 15:01:36 UTC 2015 - pgajdos@suse.com
- updated to 2015: apply patches from Debian
D latex2html-2012-backref-workaround.diff
D latex2html-2012-binmode.diff
D latex2html-2012-dest-dir.diff
D latex2html-2012-gsout.diff (upstreamed)
D latex2html-2012-match-multiline.diff (upstreamed)
D latex2html-2012-perl-bindir.diff
D latex2html-2012-share-dir.diff
A latex2html-backref-workaround.diff
A latex2html-binmode.diff
A latex2html-dest-dir.diff
A latex2html-perl-bindir.diff
A latex2html-share-dir.diff
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Oct 6 15:35:19 UTC 2014 - crrodriguez@opensuse.org Mon Oct 6 15:35:19 UTC 2014 - crrodriguez@opensuse.org

20
latex2html.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package latex2html # spec file for package latex2html
# #
# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -33,25 +33,23 @@ Requires: netpbm
Requires: perl Requires: perl
Requires: texlive-dvips Requires: texlive-dvips
Requires: texlive-latex Requires: texlive-latex
Version: 2012 Version: 2015
Release: 0 Release: 0
Summary: LaTeX to HTML Converter Summary: LaTeX to HTML Converter
License: GPL-2.0+ License: GPL-2.0+
Group: Productivity/Publishing/TeX/Utilities Group: Productivity/Publishing/TeX/Utilities
BuildArch: noarch BuildArch: noarch
Source0: http://mirrors.ctan.org/support/latex2html/latex2html-%{version}.tgz Source0: http://mirrors.ctan.org/support/latex2html/latex2html-%{version}.tar.gz
Source1: latex2html-manual.tar.bz2 Source1: latex2html-manual.tar.bz2
Source2: latex2html-README.SUSE Source2: latex2html-README.SUSE
Source3: testfile.tex Source3: testfile.tex
Source4: local.pm Source4: local.pm
Source5: latex2html.1 Source5: latex2html.1
Patch0: latex2html-%{version}-share-dir.diff Patch0: latex2html-share-dir.diff
Patch1: latex2html-%{version}-perl-bindir.diff Patch1: latex2html-perl-bindir.diff
Patch2: latex2html-%{version}-dest-dir.diff Patch2: latex2html-dest-dir.diff
Patch3: latex2html-%{version}-binmode.diff Patch3: latex2html-binmode.diff
Patch4: latex2html-%{version}-gsout.diff Patch4: latex2html-backref-workaround.diff
Patch5: latex2html-%{version}-match-multiline.diff
Patch6: latex2html-%{version}-backref-workaround.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description %description
@ -84,8 +82,6 @@ LaTeX texts.
%patch2 %patch2
%patch3 %patch3
%patch4 %patch4
%patch5
%patch6
cp %{S:2} README.SUSE cp %{S:2} README.SUSE
cp %{S:4} . cp %{S:4} .