From 32dbec1e063877011a3ff611df7dafb04d4dee12 Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Mon, 14 May 2018 10:21:56 -0400 Subject: [PATCH] update geometry to 5.7 (bz1575363) --- texlive-bz#1575363-geometry-5.7.patch | 91 +++++++++++++++++++++++++++ texlive.spec | 12 +++- 2 files changed, 102 insertions(+), 1 deletion(-) create mode 100644 texlive-bz#1575363-geometry-5.7.patch diff --git a/texlive-bz#1575363-geometry-5.7.patch b/texlive-bz#1575363-geometry-5.7.patch new file mode 100644 index 0000000..4aaf02e --- /dev/null +++ b/texlive-bz#1575363-geometry-5.7.patch @@ -0,0 +1,91 @@ +--- tex/latex/geometry/geometry.sty 2016-11-25 19:33:49.000000000 +0100 ++++ tex/latex/geometry/geometry.sty 2018-05-06 13:09:27.223486373 +0200 +@@ -8,6 +8,8 @@ + %% + %% Copyright (C) 1996-2010 + %% by Hideo Umeki ++%% Copyright (C) 2018 ++%% by Hideo Umeki and David Carlisle https://github.com/davidcarlisle/geometry + %% + %% This work may be distributed and/or modified under the conditions of + %% the LaTeX Project Public License, either version 1.3c of this license +@@ -18,14 +20,14 @@ + %% version 2005/12/01 or later. + %% + %% This work is "maintained" (as per the LPPL maintenance status) +-%% by Hideo Umeki. ++%% by David Carlisle. + %% + %% This work consists of the files geometry.dtx and + %% the derived files: geometry.{sty,ins,drv}, geometry-samples.tex. + %% + \NeedsTeXFormat{LaTeX2e} + \ProvidesPackage{geometry} +- [2010/09/12 v5.6 Page Geometry] ++ [2018/03/24 v5.7 Page Geometry] + \RequirePackage{keyval}% + \RequirePackage{ifpdf}% + \RequirePackage{ifvtex}% +@@ -72,6 +74,7 @@ + \def\Gm@dvips{dvips}% + \def\Gm@dvipdfm{dvipdfm}% + \def\Gm@pdftex{pdftex}% ++\def\Gm@luatex{luatex}% + \def\Gm@xetex{xetex}% + \def\Gm@vtex{vtex}% + \def\Gm@true{true}% +@@ -592,6 +595,8 @@ + \Gm@doifelse{dvipdfm}{#1}{\Gm@setdriver{dvipdfm}}{\Gm@unsetdriver{dvipdfm}}}}% + \define@key{Gm}{pdftex}[true]{\ifGm@preamble{pdftex}{% + \Gm@doifelse{pdftex}{#1}{\Gm@setdriver{pdftex}}{\Gm@unsetdriver{pdftex}}}}% ++\define@key{Gm}{luatex}[true]{\ifGm@preamble{luatex}{% ++ \Gm@doifelse{luatex}{#1}{\Gm@setdriver{luatex}}{\Gm@unsetdriver{luatex}}}}% + \define@key{Gm}{xetex}[true]{\ifGm@preamble{xetex}{% + \Gm@doifelse{xetex}{#1}{\Gm@setdriver{xetex}}{\Gm@unsetdriver{xetex}}}}% + \define@key{Gm}{vtex}[true]{\ifGm@preamble{vtex}{% +@@ -809,7 +814,11 @@ + \ifx\Gm@driver\@empty + \typeout{*geometry* driver: auto-detecting}% + \ifpdf +- \Gm@setdriver{pdftex}% ++ \ifx\pdfextension\@undefined ++ \Gm@setdriver{pdftex}% ++ \else ++ \Gm@setdriver{luatex}% ++ \fi + \else + \Gm@setdriver{dvips}% + \fi +@@ -1030,7 +1039,7 @@ + \setlength\pdfpagewidth{\Gm@pw}% + \setlength\pdfpageheight{\Gm@ph}}% + \ifnum\mag=\@m\else +- \@tempdima=\mag sp% ++ \@tempdima=\mag sp + \@ifundefined{pdfhorigin}{}{% + \divide\pdfhorigin\@tempdima + \multiply\pdfhorigin\@m +@@ -1039,6 +1048,23 @@ + \ifx\Gm@truedimen\Gm@true + \setlength\paperwidth{\Gm@pw}% + \setlength\paperheight{\Gm@ph}% ++ \fi ++ \fi ++ \fi ++ \ifx\Gm@driver\Gm@luatex ++ \setlength\pagewidth{\Gm@pw}% ++ \setlength\pageheight{\Gm@ph}% ++ \ifnum\mag=\@m\else ++ \@tempdima=\mag sp ++ \edef\Gm@horigin{\pdfvariable horigin}% ++ \edef\Gm@vorigin{\pdfvariable vorigin}% ++ \divide\Gm@horigin\@tempdima ++ \multiply\Gm@horigin\@m ++ \divide\Gm@vorigin\@tempdima ++ \multiply\Gm@vorigin\@m ++ \ifx\Gm@truedimen\Gm@true ++ \setlength\paperwidth{\Gm@pw}% ++ \setlength\paperheight{\Gm@ph}% + \fi + \fi + \fi diff --git a/texlive.spec b/texlive.spec index 8eba7ea..1c4087a 100644 --- a/texlive.spec +++ b/texlive.spec @@ -8,7 +8,7 @@ Name: texlive Version: %{tl_version} -Release: 6%{?dist} +Release: 7%{?dist} Epoch: 7 Summary: TeX formatting system Group: Applications/Publishing @@ -47,6 +47,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 bz#1575363, update geometry to 5.7 +Patch107: texlive-bz#1575363-geometry-5.7.patch Source3: texlive-licenses.tar.xz Source0100: http://ctan.sharelatex.com/tex-archive/systems/texlive/tlnet/archive/12many.tar.xz Source0101: http://ctan.sharelatex.com/tex-archive/systems/texlive/tlnet/archive/12many.doc.tar.xz @@ -176950,6 +176952,11 @@ pushd %{buildroot}%{_texdir}/texmf-dist patch -p0 < %{_sourcedir}/texlive-bz#1442706-python-path.patch popd +#patch geometry to resolve bz1575363 +pushd %{buildroot}%{_texdir}/texmf-dist +patch -p0 < %{_sourcedir}/texlive-bz#1575363-geometry-5.7.patch +popd + # make opentype fontdir symlinks # NOTE: fontawesome, stix, oldstandard are a conflict, so we just add Requires for the # corresponding system font packages for them. @@ -201522,6 +201529,9 @@ ln -s %{_sysconfdir}/texlive/tex/generic/config/language.dat %{buildroot}%{_texd %{_texdir}/texmf-dist/tex/latex/translator/ %changelog +* Mon May 14 2018 Tom Callaway 7:2017-7 +- update geometry to 5.7 (bz1575363) + * Mon May 14 2018 Tom Callaway 7:2017-6 - drop preview (provided by emacs-auctex)