fix thumbpdf issue

This commit is contained in:
Tom Callaway 2016-02-16 14:50:29 -05:00
parent 5d44ab45f5
commit fb64a30851
2 changed files with 64 additions and 1 deletions

View File

@ -0,0 +1,53 @@
diff -up ./thumbpdf.pl.fix ./thumbpdf.pl
--- ./thumbpdf.pl.fix 2016-02-16 14:43:35.161557949 -0500
+++ ./thumbpdf.pl 2016-02-16 14:44:58.346003794 -0500
@@ -937,6 +937,16 @@ if ($::opt_makedata)
$objno[$count] = $1;
$getobjindex[$1] = $count;
$objdict[$count] = ($2); # boolean (if $2 exists)
+ if (!$objdict[$count]) {
+ # check for << on thext line, new PDF-X/2014
+ $_ = <PDF>;
+ if (/^<<$/) {
+ $objdict[$count] = 1;
+ $lineno++;
+ $_ = <PDF>;
+ $lineno++;
+ }
+ }
my $stream = 0;
print "* obj $objno[$count]" .
(($objdict[$count]) ? " (dict)" : "") .
@@ -944,18 +954,18 @@ if ($::opt_makedata)
# get obj
$objtext[$count] = "";
- while (<PDF>)
+ while ($_)
{
- $lineno++;
-
if ($objdict[$count])
{
if (/^>>/)
{
last if /^>>\s+endobj$/; # obj without stream
- # get stream
$_ = <PDF>; $lineno++;
+ last if /^endobj$/; # obj without stream, new PDF-X/2014
+
+ # get stream
/^stream$/ or die "$Error `stream' expected on line $lineno!\n";
print "* stream\n" if $::opt_debug;
@@ -982,6 +992,9 @@ if ($::opt_makedata)
last if /^endobj$/;
}
$objtext[$count] .= $_;
+
+ $_ = <PDF>;
+ $lineno++;
}
$count++;
}

View File

@ -1,6 +1,6 @@
%global source_date 20140525_r34255
%global tl_version 2014
%global tl_rel 18
%global tl_rel 19
%global tl_release %{tl_rel}.%{source_date}%{?dist}
%global tl_noarch_release %{tl_rel}%{?dist}
%global source_name texlive-%{source_date}-source
@ -59,6 +59,7 @@ Patch101: etex-addlanguage-fix-bz1215257.patch
Patch102: texlive-latexpand-perl518.patch
Patch103: texlive-latexdiff-perl518.patch
Patch104: texlive-dvipdfm-x-svn34700.patch
Patch105: texlive-thumbpdf-pdf-without-stream-fix.patch
Source0: %{source_name}.tar.xz
Source1: tl2rpm.c
Source2: texlive.tlpdb
@ -212578,6 +212579,12 @@ patch -p0 < %{_sourcedir}/texlive-latexdiff-perl518.patch
# %patch103 -p0
popd
#patch thumbpdf.pl
pushd %{buildroot}%{_texdir}/texmf-dist/scripts/thumbpdf
patch -p0 < %{_sourcedir}/texlive-thumbpdf-pdf-without-stream-fix.patch
# %patch104 -p0
popd
mkdir -p %{buildroot}%{_bindir}
mv %{buildroot}/bin/i386-linux/* %{buildroot}%{_bindir}
for i in `find %{buildroot}%{_bindir} -type f`; do
@ -355469,6 +355476,9 @@ fi
%{_libdir}/*.so
%changelog
* Tue Feb 16 2016 Tom Callaway <spot@fedoraproject.org> - 4:2014-19.20140525_r34255
- fix thumbpdf issue (bz1305887)
* Mon Jan 18 2016 Tom Callaway <spot@fedoraproject.org> - 4:2014-18.20140525_r34255
- fix pdfjam-bin to have Requires: tex(pdfpages.sty) (bz1296265)
- fix pstricks to have Requires: texlive-pst-tools (bz1294634)