Skip to content

Commit

Permalink
Trac #31529: texlive: Add spkg-configure.m4 and system package inform…
Browse files Browse the repository at this point in the history
…ation; remove install script

Right now presence of tex is not tested, and texlive is included in
system packages of `_recommended`.

In this ticket, we associate the tex system package with `texlive`
instead.

We also test presence of latex packages that are needed for building the
sage pdf documentation and make `texlive` a dependency of
`sagemath_doc_pdf`.

We remove the install script due to lack of use and maintenance
(#21922). Installing tex should not be the concern of !SageMath.

URL: https://trac.sagemath.org/31529
Reported by: mkoeppe
Ticket author(s): Matthias Koeppe, Dima Pasechnik, Antonio Rojas,
François Bissey
Reviewer(s): Sébastien Labbé, Matthias Koeppe, Dima Pasechnik, Andrey
Belgorodski
  • Loading branch information
Release Manager committed Feb 12, 2022
2 parents c4e4a63 + 7a1a1fe commit b34c0d5
Show file tree
Hide file tree
Showing 15 changed files with 88 additions and 148 deletions.
12 changes: 1 addition & 11 deletions build/pkgs/_recommended/distros/debian.txt
Original file line number Diff line number Diff line change
@@ -1,17 +1,7 @@
# From https://wiki.sagemath.org/prerequisitesUbuntu
# - see also separate script packages texlive, pandoc, ffmpeg

# to generate pdf documentation
texlive-latex-extra
# to convert Jupyter notebooks to pdf
texlive-xetex
# to generate pdf documentation
latexmk
# to convert Jupyter notebooks to pdf
# pandoc -- this is a separate script package
# to render text with LaTeX in Matplotlib
dvipng
# to run the Jmol 3D viewer from the console and generate images for 3D plots in the documentation
default-jdk
# to produce animations
# ffmpeg -- this is a separate script package
libavdevice-dev
2 changes: 1 addition & 1 deletion build/pkgs/sagemath_doc_pdf/dependencies
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sagemath_doc_html
sagemath_doc_html texlive
1 change: 1 addition & 0 deletions build/pkgs/texlive/distros/alpine.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
texlive
4 changes: 4 additions & 0 deletions build/pkgs/texlive/distros/arch.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
texlive-core
texlive-latexextra
texlive-langjapanese
texlive-langcyrillic
1 change: 1 addition & 0 deletions build/pkgs/texlive/distros/cygwin.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
texlive
23 changes: 23 additions & 0 deletions build/pkgs/texlive/distros/debian.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
# to generate pdf documentation
texlive-latex-extra
# to convert Jupyter notebooks to pdf
texlive-xetex
# to generate pdf documentation
latexmk
# to render text with LaTeX in Matplotlib
dvipng
# for tgtermes.sty used in doc-pdf
tex-gyre
# for use of rsfs font in pdf documentation
texlive-fonts-recommended
# language support for the pdf documentation
texlive-lang-cyrillic
texlive-lang-english
texlive-lang-european
texlive-lang-french
texlive-lang-german
texlive-lang-italian
texlive-lang-japanese
texlive-lang-polish
texlive-lang-portuguese
texlive-lang-spanish
13 changes: 13 additions & 0 deletions build/pkgs/texlive/distros/fedora.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
latexmk
texlive
texlive-collection-latexextra
# language support for the pdf documentation
texlive-collection-langcyrillic
texlive-collection-langeuropean
texlive-collection-langfrench
texlive-collection-langgerman
texlive-collection-langitalian
texlive-collection-langjapanese
texlive-collection-langpolish
texlive-collection-langportuguese
texlive-collection-langspanish
16 changes: 16 additions & 0 deletions build/pkgs/texlive/distros/gentoo.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
dev-tex/latexmk
app-text/texlive
app-text/dvipng
dev-texlive/texlive-langcjk
dev-texlive/texlive-langcyrillic
dev-texlive/texlive-langenglish
dev-texlive/texlive-langeuropean
dev-texlive/texlive-langfrench
dev-texlive/texlive-langgerman
dev-texlive/texlive-langitalian
dev-texlive/texlive-langjapanese
dev-texlive/texlive-langportuguese
dev-texlive/texlive-langspanish
dev-texlive/texlive-latexextra
dev-texlive/texlive-latexrecommended
dev-texlive/texlive-mathscience
1 change: 1 addition & 0 deletions build/pkgs/texlive/distros/opensuse.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
texlive
1 change: 1 addition & 0 deletions build/pkgs/texlive/distros/slackware.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
texlive
1 change: 1 addition & 0 deletions build/pkgs/texlive/distros/void.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
texlive
22 changes: 22 additions & 0 deletions build/pkgs/texlive/spkg-configure.m4
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
SAGE_SPKG_CONFIGURE([texlive], [
sage_spkg_install_texlive=no
AC_PATH_PROG([PDFLATEX], [pdflatex])
AS_IF([test -z "$PDFLATEX"], [sage_spkg_install_texlive=yes])
AC_PATH_PROG([LATEXMK], [latexmk])
AS_IF([test -z "$LATEXMK"], [sage_spkg_install_texlive=yes])
AC_PATH_PROG([DVIPNG], [dvipng])
AS_IF([test -z "$DVIPNG"], [sage_spkg_install_texlive=yes])
m4_foreach([latex_package],
[fontspec,xunicode,xltxtra,amssymb,amsfonts,graphicx,mathrsfs,
textcomp,tikz,tikz-qtree,iftex,tkz-berge,tkz-graph,xy,babel,
subfigure,hyperref,hypcap,xr,tgtermes,fncychap],
[
AC_MSG_CHECKING([for latex package ]latex_package)
AS_IF([kpsewhich ]latex_package[.sty >& AS_MESSAGE_LOG_FD 2>&1], [
AC_MSG_RESULT([yes])
], [
AC_MSG_RESULT([no])
sage_spkg_install_texlive=yes
])
])
])
3 changes: 2 additions & 1 deletion build/pkgs/texlive/spkg-install
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
exec python3 spkg-install.py
#! /usr/bin/env bash
# Nothing to do
134 changes: 0 additions & 134 deletions build/pkgs/texlive/spkg-install.py

This file was deleted.

2 changes: 1 addition & 1 deletion src/doc/bootstrap
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ for SYSTEM in arch debian fedora cygwin homebrew conda; do
*:standard)
SYSTEM_PACKAGES+=" $PKG_SYSTEM_PACKAGES"
;;
_recommended:*|pandoc:*|ffmpeg:*|imagemagick:*)
_recommended:*|pandoc:*|ffmpeg:*|imagemagick:*|texlive:*)
RECOMMENDED_SYSTEM_PACKAGES+=" $PKG_SYSTEM_PACKAGES"
;;
*)
Expand Down

0 comments on commit b34c0d5

Please sign in to comment.