Compare commits

...

2 Commits
master ... f27

2 changed files with 76 additions and 3 deletions

View File

@ -0,0 +1,55 @@
--- a2ping.pl.gs922 2018-03-11 14:15:15.824669043 -0400
+++ a2ping.pl 2018-03-11 14:15:21.803523499 -0400
@@ -352,7 +352,7 @@ use just +1; # a JustLib application
use strict;
use integer;
use Htex::papers;
-BEGIN { $Htex::a2ping::VERSION="2.77p" }
+BEGIN { $Htex::a2ping::VERSION="2.77p1" }
# Imp: option to ignore `%%Orientation: Portrait', which gs respects and rotates by 90 degrees if necessary
# Imp: gs(704?!) sometimes finds too small bbox, see Univers.eps
@@ -401,7 +401,7 @@ BEGIN { $Htex::a2ping::VERSION="2.77p" }
### program identification
my $program = "a2ping.pl";
-my $filedate="2006-11-15"; # my $filedate="2001/03/05";
+my $filedate="2018-03-07"; # my $filedate="2001/03/05";
my $copyright = "Written by <pts\@fazekas.hu> from April 2003.
This is free software, GNU GPL >=2.0. There is NO WARRANTY.
(epstopdf 2.7 Copyright 1998-2001 by Sebastian Rahtz et al.)\n";
@@ -1543,12 +1543,13 @@ count /OPCOUNT exch def
(bbox-success\n) ..print
quit
} if
- .callbeginpage
}
+ % Run the previous contents of /BeginPage: {--.callbeginpage--}
+ [exch aload pop currentpagedevice /BeginPage get aload pop] cvx
>> setpagedevice
% vvv do these after our call to /setpagedevice
-.currentglobal true .setglobal
+currentglobal true setglobal
systemdict begin
/..paper.redef<< >>def
/..print/print load def
@@ -1657,7 +1658,7 @@ dup/= exch def /print exch def
pop
}forall} forall
end % systemdict
-.setglobal
+setglobal
systemdict readonly pop
(bbox-begin\n) ..print
@@ -2570,3 +2571,9 @@ texutil.
* separated FileFormat features to FL_* constants
* added --doc
* there is no default FileFormat (PDF) anymore
+
+=head2 2018-03-07 v2.77p1 (Szab<61> P<>ter)
+
+ * .callbeginpage and .setglobal fix for Ghostscript 9.22
+ (https://bugs.ghostscript.com/show_bug.cgi?id=699063).
+ Problem reported by Akira Yokosawa

View File

@ -1,6 +1,6 @@
%global source_date 20160520
%global tl_version 2016
%global tl_rel 36
%global tl_rel 38
%global tl_release %{tl_rel}.%{source_date}%{?dist}
%global tl_noarch_release %{tl_rel}%{?dist}
%global source_name texlive-%{source_date}-source
@ -24,7 +24,7 @@
Name: texlive
Version: %{tl_version}
Release: %{tl_release}.5
Release: %{tl_release}
Epoch: 6
Summary: TeX formatting system
Group: Applications/Publishing
@ -68,6 +68,8 @@ Patch104: texlive-mpost-CVE-2016-10243.patch
Patch105: texlive-2016-upmendex-crash
# fix bz#1442706, set correct python path
Patch106: texlive-bz#1442706-python-path.patch
# Fix a2perl with ghostscript 9.22+
Patch107: texlive-base-fix-a2ping-with-gs-9.22.patch
Source0: %{source_name}.tar.xz
Source1: tl2rpm.c
Source2: texlive.tlpdb
@ -49131,7 +49133,6 @@ Release: %{tl_noarch_release}.5
BuildArch: noarch
Requires: texlive-base
Requires: texlive-kpathsea-bin, tex-kpathsea
Requires: texlive-pdfjam-bin
Provides: pdfjam = %{tl_version}
Obsoletes: pdfjam < %{tl_version}
@ -49160,6 +49161,8 @@ Version: svn17868.0
Requires: texlive-base
Requires: texlive-pdfjam
Requires: tex(pdfpages.sty)
Requires: texlive-latex-bin-bin
Requires: texlive-collection-latex
Release: %{tl_release}.5
BuildArch: noarch
@ -180084,6 +180087,14 @@ xz -dc %{SOURCE104} | tar x -C %{buildroot}%{_texdir}/texmf-dist
xz -dc %{SOURCE105} | tar x -C %{buildroot}%{_texdir}/texmf-dist
xz -dc %{SOURCE106} | tar x -C %{buildroot}%{_texdir}/texmf-dist
xz -dc %{SOURCE107} | tar x -C %{buildroot}%{_texdir}
# need to patch a2ping.pl from tarball here. master source patching is overwritten.
pushd %{buildroot}%{_texdir}/texmf-dist/scripts/a2ping
patch -p0 < %{_sourcedir}/texlive-base-fix-a2ping-with-gs-9.22.patch
# %patch107 -p0
popd
xz -dc %{SOURCE108} | tar x -C %{buildroot}%{_texdir}
xz -dc %{SOURCE7000} | tar x -C %{buildroot}
xz -dc %{SOURCE109} | tar x -C %{buildroot}%{_texdir}/texmf-dist
@ -222045,6 +222056,13 @@ fi
%{_libdir}/pkgconfig/*.pc
%changelog
* Thu Mar 15 2018 Tom Callaway <spot@fedoraproject.org> - 6:2016-38.20160520
- fix dependencies for pdfjam-bin (bz1164237)
- actually apply a2perl patch in a way that will stick into the package.
* Sun Mar 11 2018 Tom Callaway <spot@fedoraproject.org> - 6:2016-37.20160520
- fix a2perl to work with ghostscript 9.22+
* Sat Aug 05 2017 Björn Esser <besser82@fedoraproject.org> - 6:2016-36.20160520.5
- Use '-std=c++11' for building C++ sources