From d68e767d7b8619a18361a8f77e259384bc3c9e04 Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Wed, 11 Dec 2019 09:25:37 -0500 Subject: [PATCH] patch tabu to latest git code to fix doxygen issues --- tabu-update-to-git-930bc77.patch | 39 ++++++++++++++++++++++++++++++++ texlive.spec | 12 +++++++++- 2 files changed, 50 insertions(+), 1 deletion(-) create mode 100644 tabu-update-to-git-930bc77.patch diff --git a/tabu-update-to-git-930bc77.patch b/tabu-update-to-git-930bc77.patch new file mode 100644 index 0000000..d969da1 --- /dev/null +++ b/tabu-update-to-git-930bc77.patch @@ -0,0 +1,39 @@ +--- tabu.sty.old 2019-01-14 17:10:48.000000000 -0500 ++++ tabu.sty 2019-12-11 09:16:55.745034664 -0500 +@@ -52,12 +52,12 @@ + %% lppl copyright 2010-2011 by FC + %% + %% Updated 2019-01-11 +-%% Copyright 2019 tabu-fixed github group (LaTeX3 Project members) +-%% Please report any issues at https://github.com/tabu-fixed/tabu ++%% Copyright 2019 tabu-issues-for-future-maintainer github group (LaTeX3 Project members) ++%% Please report any issues at https://github.com/tabu-issues-for-future-maintainer/tabu + %% + + \NeedsTeXFormat{LaTeX2e} +-\ProvidesPackage{tabu}[2019/01/11 v2.9 - flexible LaTeX tabulars (FC+tabu-fixed)] ++\ProvidesPackage{tabu}[2019/01/11 v2.9 - flexible LaTeX tabulars (FC+tabu-issues-for-future-maintainer) + intermediate FMi] + \RequirePackage{array}[2008/09/09] + \RequirePackage{varwidth}[2009/03/30] + \AtEndOfPackage{\tabu@AtEnd \let\tabu@AtEnd \@undefined} +@@ -727,6 +727,10 @@ + \tabu@currentgrouptype\expandafter{\the\currentgrouptype}}% + \fi + }% \tabu@init ++%%TABU-FIXED set up \tabu@currentgrouptype ++%FMi cancel for nested arrays ... ++\def\@tabarray{\m@th\def\tabu@currentgrouptype{\currentgrouptype}\@ifnextchar[\@array{\@array[c]}} ++ + \def\tabu@indent{% correction for indentation + \ifdim \parindent>\z@\ifx \linewidth\tabudefaulttarget + \everypar\expandafter{% +@@ -1663,6 +1667,9 @@ + \ifdim \tabu@temp\p@>\z@ \ifdim \tabu@temp\tabucolX<\tabu@target + \tabu@target=\tabu@temp\tabucolX \fi\fi + \setbox\tabu@box \hbox \bgroup ++%%TABU-FIXED add \color@begingroup ++%%FMi not yet understood why this one is also needed ... ++ \color@begingroup + \begin{varwidth}\tabu@target + \let\FV@ListProcessLine \tabu@FV@ListProcessLine % \hbox to natural width... + \narrowragged \arraybackslash \parfillskip \@flushglue diff --git a/texlive.spec b/texlive.spec index f37604f..0b2f7f8 100644 --- a/texlive.spec +++ b/texlive.spec @@ -19,7 +19,7 @@ Name: texlive Version: %{tl_version} -Release: 10%{?dist} +Release: 11%{?dist} Epoch: 9 Summary: TeX formatting system License: Artistic 2.0 and CC-BY and CC-BY-SA and GPLv2 and GPLv2+ and GPLv3+ and LGPLv2+ and LPPL and MIT and Public Domain and UCD and Utopia @@ -61,6 +61,7 @@ Patch105: texlive-2016-upmendex-crash Patch106: texlive-bz#1442706-python-path.patch Patch108: texlive-2017-xepersian-python.patch Patch109: texlive-2019-py3-and-pep8.patch +Patch110: tabu-update-to-git-930bc77.patch Source3: texlive-licenses.tar.xz Source0100: http://ctan.math.illinois.edu/systems/texlive/tlnet/archive/12many.tar.xz Source0101: http://ctan.math.illinois.edu/systems/texlive/tlnet/archive/12many.doc.tar.xz @@ -186276,6 +186277,12 @@ patch -p0 < %{_sourcedir}/texlive-2017-xepersian-python.patch patch -p0 < %{_sourcedir}/texlive-2019-py3-and-pep8.patch popd +# Patch tabu +pushd %{buildroot}%{_texdir}/texmf-dist/tex/latex/tabu/ +patch -p0 < %{_sourcedir}/tabu-update-to-git-930bc77.patch +# %%patch110 -p0 +popd + # nuke useless tlmgr packaging stuff and doc droppings rm -rf %{buildroot}%{_texdir}/tlpkg/gpg/ rm -rf %{buildroot}%{_texdir}/tlpkg/tlpobj/ @@ -212417,6 +212424,9 @@ popd %{_texdir}/texmf-dist/tex/latex/marcellus/ %changelog +* Wed Dec 11 2019 Tom Callaway - 9:2019-11 +- patch tabu to latest git code to fix doxygen issues + * Mon Dec 9 2019 Tom Callaway - 9:2019-10 - add versioned Requires on biber for texlive-biblatex - add packager notes around biblatex