latex-mk: Fix build with newer texlive & texinfo

5 files changed, 260 insertions, 0 deletions

diff --git a/latex/latex-mk/HISTORY b/latex/latex-mk/HISTORY
index 9f7e39ff8e..8146f43abb 100644
--- a/latex/latex-mk/HISTORY
+++ b/latex/latex-mk/HISTORY
@@ -1,5 +1,7 @@
 2021-07-16 Ismael Luceno <ismael@sourcemage.org>
 	* PRE_BUILD: Fixed build against musl
+	* patches/fix-documentation.patch, patches/new-nomencl.patch,
+	  patches/use-fancyhdr.patch: Fixed build with newer texlive & texinfo
 
 2015-05-25 Thomas Orgis <sobukus@sourcemage.org>
 	* DETAILS: remove SOURCEFORGE_URL usage (automated)
diff --git a/latex/latex-mk/PRE_BUILD b/latex/latex-mk/PRE_BUILD
index 3c8cac271f..49ddb907ac 100755
--- a/latex/latex-mk/PRE_BUILD
+++ b/latex/latex-mk/PRE_BUILD
@@ -1,3 +1,4 @@
 default_pre_build &&
 cd "$SOURCE_DIRECTORY" &&
+apply_patch_dir patches &&
 sedit 's!maybe_os in$!& linux-musl*|\\!' config.sub
diff --git a/latex/latex-mk/patches/fix-documentation.patch b/latex/latex-mk/patches/fix-documentation.patch
new file mode 100644
index 0000000000..c4b24f7c7a
--- /dev/null
+++ b/latex/latex-mk/patches/fix-documentation.patch
@@ -0,0 +1,31 @@
+From: Christoph Biedl <debian.axhn@manchmal.in-ulm.de>
+Subject: Fix error when creating the documentation
+Date: Wed, 21 Dec 2016 02:02:44 +0100
+
+Reported-by: Martin Michlmayr <tbm@hpe.com>
+Ref: https://bugs.debian.org/790534
+Origin: Debian
+
+---
+ doc/latex-mk.texi |    3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+--- a/doc/latex-mk.texi
++++ b/doc/latex-mk.texi
+@@ -3,7 +3,6 @@
+ @c %**start of header
+ @setfilename latex-mk.info
+ @settitle LaTeX-Mk
+-@setcontentsaftertitlepage
+ @c %**end of header
+ 
+ @include version.texi
+@@ -133,7 +132,7 @@
+ @end menu
+ 
+ @page
+-@c @contents
++@contents
+ 
+ @node Introduction, Targets, Top, Top
+ @chapter Introduction
diff --git a/latex/latex-mk/patches/new-nomencl.patch b/latex/latex-mk/patches/new-nomencl.patch
new file mode 100644
index 0000000000..9154c65a4d
--- /dev/null
+++ b/latex/latex-mk/patches/new-nomencl.patch
@@ -0,0 +1,29 @@
+From: Rafael Laboissiere <rafael@debian.org>
+Subject: Make one of the tests work with a recent version of nomencl.sty
+
+Origin: Debian
+
+---
+ testsuite/texfiles/nomencl.tex |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- a/testsuite/texfiles/nomencl.tex
++++ b/testsuite/texfiles/nomencl.tex
+@@ -14,7 +14,7 @@
+ \rhead{Doc with Nomenclatures}
+ \usepackage{hyperref}
+ 
+-\makeglossary
++\makenomenclature
+ 
+ \begin{document}
+ \maketitle
+@@ -27,7 +27,7 @@
+ \nomenclature{$m$}{Mass}%
+ \nomenclature{$c$}{Speed of light}%
+ 
+-\printglossary
++\printnomenclature
+ 
+ \end{document}
+ 
diff --git a/latex/latex-mk/patches/use-fancyhdr.patch b/latex/latex-mk/patches/use-fancyhdr.patch
new file mode 100644
index 0000000000..5c6043c0c0
--- /dev/null
+++ b/latex/latex-mk/patches/use-fancyhdr.patch
@@ -0,0 +1,197 @@
+From: Rafael Laboissiere <rafael@debian.org>
+Subject: Use fancyhdr.sty instead of fancyheadings.sty
+  fancyheadings.sty cannot be found in TeXLive
+
+Origin: Debian
+
+---
+ example/ex2.tex                      |    2 +-
+ example/ex3.tex                      |    2 +-
+ example/ex4.tex                      |    2 +-
+ example/ex5.tex                      |    2 +-
+ example/example.tex                  |    2 +-
+ testsuite/texfiles/bibliography.tex  |    2 +-
+ testsuite/texfiles/bibliography2.tex |    2 +-
+ testsuite/texfiles/index.tex         |    2 +-
+ testsuite/texfiles/nomencl.tex       |    2 +-
+ 9 files changed, 9 insertions(+), 9 deletions(-)
+
+--- a/example/ex2.tex
++++ b/example/ex2.tex
+@@ -8,7 +8,7 @@
+ \date{\today}
+ 
+ \usepackage{graphicx}
+-\usepackage{fancyheadings}
++\usepackage{fancyhdr}
+ \pagestyle{fancy}
+ \rhead{Notes on Sleep}
+ \usepackage{hyperref}
+--- a/example/ex3.tex
+ example/ex2.tex                      |    2 +-
+ example/ex3.tex                      |    2 +-
+ example/ex4.tex                      |    2 +-
+ example/ex5.tex                      |    2 +-
+ example/example.tex                  |    2 +-
+ testsuite/texfiles/bibliography.tex  |    2 +-
+ testsuite/texfiles/bibliography2.tex |    2 +-
+ testsuite/texfiles/index.tex         |    2 +-
+ testsuite/texfiles/nomencl.tex       |    2 +-
+ 9 files changed, 9 insertions(+), 9 deletions(-)
++++ b/example/ex3.tex
+@@ -7,7 +7,7 @@
+ \author{Anonymous}
+ \date{\today}
+ 
+-\usepackage{fancyheadings}
++\usepackage{fancyhdr}
+ \pagestyle{fancy}
+ \rhead{RE: LaTeX-Mk}
+ \usepackage{hyperref}
+--- a/example/ex4.tex
+ example/ex2.tex                      |    2 +-
+ example/ex3.tex                      |    2 +-
+ example/ex4.tex                      |    2 +-
+ example/ex5.tex                      |    2 +-
+ example/example.tex                  |    2 +-
+ testsuite/texfiles/bibliography.tex  |    2 +-
+ testsuite/texfiles/bibliography2.tex |    2 +-
+ testsuite/texfiles/index.tex         |    2 +-
+ testsuite/texfiles/nomencl.tex       |    2 +-
+ 9 files changed, 9 insertions(+), 9 deletions(-)
++++ b/example/ex4.tex
+@@ -7,7 +7,7 @@
+ \author{Someone}
+ \date{\today}
+ 
+-\usepackage{fancyheadings}
++\usepackage{fancyhdr}
+ \pagestyle{fancy}
+ \rhead{Unreferenced Notes}
+ \usepackage{hyperref}
+--- a/example/ex5.tex
+ example/ex2.tex                      |    2 +-
+ example/ex3.tex                      |    2 +-
+ example/ex4.tex                      |    2 +-
+ example/ex5.tex                      |    2 +-
+ example/example.tex                  |    2 +-
+ testsuite/texfiles/bibliography.tex  |    2 +-
+ testsuite/texfiles/bibliography2.tex |    2 +-
+ testsuite/texfiles/index.tex         |    2 +-
+ testsuite/texfiles/nomencl.tex       |    2 +-
+ 9 files changed, 9 insertions(+), 9 deletions(-)
++++ b/example/ex5.tex
+@@ -9,7 +9,7 @@
+ \author{Someone}
+ \date{\today}
+ 
+-\usepackage{fancyheadings}
++\usepackage{fancyhdr}
+ \pagestyle{fancy}
+ \rhead{Indexed Doc}
+ \usepackage{hyperref}
+--- a/example/example.tex
+ example/ex2.tex                      |    2 +-
+ example/ex3.tex                      |    2 +-
+ example/ex4.tex                      |    2 +-
+ example/ex5.tex                      |    2 +-
+ example/example.tex                  |    2 +-
+ testsuite/texfiles/bibliography.tex  |    2 +-
+ testsuite/texfiles/bibliography2.tex |    2 +-
+ testsuite/texfiles/index.tex         |    2 +-
+ testsuite/texfiles/nomencl.tex       |    2 +-
+ 9 files changed, 9 insertions(+), 9 deletions(-)
++++ b/example/example.tex
+@@ -8,7 +8,7 @@
+ \date{\today}
+ 
+ \usepackage{graphicx}
+-\usepackage{fancyheadings}
++\usepackage{fancyhdr}
+ \pagestyle{fancy}
+ \rhead{Notes on Sleep}
+ \usepackage{hyperref}
+--- a/testsuite/texfiles/bibliography2.tex
+ example/ex2.tex                      |    2 +-
+ example/ex3.tex                      |    2 +-
+ example/ex4.tex                      |    2 +-
+ example/ex5.tex                      |    2 +-
+ example/example.tex                  |    2 +-
+ testsuite/texfiles/bibliography.tex  |    2 +-
+ testsuite/texfiles/bibliography2.tex |    2 +-
+ testsuite/texfiles/index.tex         |    2 +-
+ testsuite/texfiles/nomencl.tex       |    2 +-
+ 9 files changed, 9 insertions(+), 9 deletions(-)
++++ b/testsuite/texfiles/bibliography2.tex
+@@ -9,7 +9,7 @@
+ \author{Dan}
+ \date{\today}
+ 
+-\usepackage{fancyheadings}
++\usepackage{fancyhdr}
+ \pagestyle{fancy}
+ \rhead{Referenced Notes}
+ \usepackage{hyperref}
+--- a/testsuite/texfiles/bibliography.tex
+ example/ex2.tex                      |    2 +-
+ example/ex3.tex                      |    2 +-
+ example/ex4.tex                      |    2 +-
+ example/ex5.tex                      |    2 +-
+ example/example.tex                  |    2 +-
+ testsuite/texfiles/bibliography.tex  |    2 +-
+ testsuite/texfiles/bibliography2.tex |    2 +-
+ testsuite/texfiles/index.tex         |    2 +-
+ testsuite/texfiles/nomencl.tex       |    2 +-
+ 9 files changed, 9 insertions(+), 9 deletions(-)
++++ b/testsuite/texfiles/bibliography.tex
+@@ -7,7 +7,7 @@
+ \author{Dan}
+ \date{\today}
+ 
+-\usepackage{fancyheadings}
++\usepackage{fancyhdr}
+ \pagestyle{fancy}
+ \rhead{Referenced Notes}
+ \usepackage{hyperref}
+--- a/testsuite/texfiles/index.tex
+ example/ex2.tex                      |    2 +-
+ example/ex3.tex                      |    2 +-
+ example/ex4.tex                      |    2 +-
+ example/ex5.tex                      |    2 +-
+ example/example.tex                  |    2 +-
+ testsuite/texfiles/bibliography.tex  |    2 +-
+ testsuite/texfiles/bibliography2.tex |    2 +-
+ testsuite/texfiles/index.tex         |    2 +-
+ testsuite/texfiles/nomencl.tex       |    2 +-
+ 9 files changed, 9 insertions(+), 9 deletions(-)
++++ b/testsuite/texfiles/index.tex
+@@ -9,7 +9,7 @@
+ \author{Dan}
+ \date{\today}
+ 
+-\usepackage{fancyheadings}
++\usepackage{fancyhdr}
+ \pagestyle{fancy}
+ \rhead{Indexed Doc}
+ \usepackage{hyperref}
+--- a/testsuite/texfiles/nomencl.tex
+ example/ex2.tex                      |    2 +-
+ example/ex3.tex                      |    2 +-
+ example/ex4.tex                      |    2 +-
+ example/ex5.tex                      |    2 +-
+ example/example.tex                  |    2 +-
+ testsuite/texfiles/bibliography.tex  |    2 +-
+ testsuite/texfiles/bibliography2.tex |    2 +-
+ testsuite/texfiles/index.tex         |    2 +-
+ testsuite/texfiles/nomencl.tex       |    2 +-
+ 9 files changed, 9 insertions(+), 9 deletions(-)
++++ b/testsuite/texfiles/nomencl.tex
+@@ -9,7 +9,7 @@
+ \author{Dan}
+ \date{\today}
+ 
+-\usepackage{fancyheadings}
++\usepackage{fancyhdr}
+ \pagestyle{fancy}
+ \rhead{Doc with Nomenclatures}
+ \usepackage{hyperref}