diff mbox

[dpdk-dev,v2] doc: remove dejavu font from doc build

Message ID 1446387213-7568-1-git-send-email-john.mcnamara@intel.com (mailing list archive)
State Superseded, archived
Headers

Commit Message

John McNamara Nov. 1, 2015, 2:13 p.m. UTC 
  Remove requirement for occasionally hard to find/install
DejaVuSansMono font. It isn't gnerally required anyway.
The default mono font is sufficient.

Signed-off-by: John McNamara <john.mcnamara@intel.com>
Acked-by: Harry van Haaren <harry.van.haaren@intel.com>
---
 doc/guides/conf.py                        |  1 -
 doc/guides/contributing/documentation.rst | 20 ++++++++------------
 pkg/dpdk.spec                             |  2 +-
 3 files changed, 9 insertions(+), 14 deletions(-)

Comments

Thomas Monjalon Nov. 1, 2015, 2:59 p.m. UTC | #1 
2015-11-01 14:13, John McNamara:
> Remove requirement for occasionally hard to find/install
> DejaVuSansMono font. It isn't gnerally required anyway.
> The default mono font is sufficient.
> 
> Signed-off-by: John McNamara <john.mcnamara@intel.com>
> Acked-by: Harry van Haaren <harry.van.haaren@intel.com>
[...]
> --- a/doc/guides/contributing/documentation.rst
> +++ b/doc/guides/contributing/documentation.rst
> -* TexLive (at least TexLive-core, extra Latex support and extra fonts).
> +* TexLive.

Why not keep minimum requirements? (TexLive-core and extra Latex support)
John McNamara Nov. 1, 2015, 4:35 p.m. UTC | #2 
> -----Original Message-----
> From: Thomas Monjalon [mailto:thomas.monjalon@6wind.com]
> Sent: Sunday, November 1, 2015 3:00 PM
> To: Mcnamara, John
> Cc: dev@dpdk.org
> Subject: Re: [PATCH v2] doc: remove dejavu font from doc build
> 
> Why not keep minimum requirements? (TexLive-core and extra Latex support)

Hi,

Mainly because the requirements are now at the minimum with only one package required.

John.
--
Thomas Monjalon Nov. 1, 2015, 6:32 p.m. UTC | #3 
2015-11-01 16:35, Mcnamara, John:
> > -----Original Message-----
> > From: Thomas Monjalon [mailto:thomas.monjalon@6wind.com]
> > Sent: Sunday, November 1, 2015 3:00 PM
> > To: Mcnamara, John
> > Cc: dev@dpdk.org
> > Subject: Re: [PATCH v2] doc: remove dejavu font from doc build
> > 
> > Why not keep minimum requirements? (TexLive-core and extra Latex support)
> 
> Hi,
> 
> Mainly because the requirements are now at the minimum with only one package required.

If we don't give tips about how to install a minimum texlive, it means we
have to install the whole texlive distribution which is a huge dependency.
John McNamara Nov. 1, 2015, 7:37 p.m. UTC | #4 
> -----Original Message-----
> From: Thomas Monjalon [mailto:thomas.monjalon@6wind.com]
> Sent: Sunday, November 1, 2015 6:32 PM
> To: Mcnamara, John
> Cc: dev@dpdk.org
> Subject: Re: [PATCH v2] doc: remove dejavu font from doc build
> 
> 2015-11-01 16:35, Mcnamara, John:
> > > -----Original Message-----
> > > From: Thomas Monjalon [mailto:thomas.monjalon@6wind.com]
> > > Sent: Sunday, November 1, 2015 3:00 PM
> > > To: Mcnamara, John
> > > Cc: dev@dpdk.org
> > > Subject: Re: [PATCH v2] doc: remove dejavu font from doc build


> > Mainly because the requirements are now at the minimum with only one
> package required.
> 
> If we don't give tips about how to install a minimum texlive, it means we
> have to install the whole texlive distribution which is a huge dependency.

Ok. I'll put that back in.
diff mbox

Patch

diff --git a/doc/guides/conf.py b/doc/guides/conf.py
index b2290b4..4a4fad2 100644
--- a/doc/guides/conf.py
+++ b/doc/guides/conf.py
@@ -59,7 +59,6 @@  latex_documents = [
 # Latex directives to be included directly in the latex/pdf docs.
 latex_preamble = r"""
 \usepackage[utf8]{inputenc}
-\usepackage{DejaVuSansMono}
 \usepackage[T1]{fontenc}
 \usepackage{helvet}
 \renewcommand{\familydefault}{\sfdefault}
diff --git a/doc/guides/contributing/documentation.rst b/doc/guides/contributing/documentation.rst
index 7f5f061..6b8a5c6 100644
--- a/doc/guides/contributing/documentation.rst
+++ b/doc/guides/contributing/documentation.rst
@@ -142,7 +142,7 @@  The following dependencies must be installed to build the documentation:
 
 * Sphinx (also called python-sphinx).
 
-* TexLive (at least TexLive-core, extra Latex support and extra fonts).
+* TexLive.
 
 * Inkscape.
 
@@ -158,18 +158,17 @@  It can be installed as follows:
    sudo yum     -y install doxygen
 
 `Sphinx`_ is a Python documentation tool for converting RST files to Html or to PDF (via LaTeX).
-It can be installed as follows:
+For full support with figure and table captioning the latest version of Sphinx can be installed as follows:
 
 .. code-block:: console
 
    # Ubuntu/Debian.
-   sudo apt-get -y install python-sphinx
+   sudo apt-get -y install python-pip
+   sudo pip install --upgrade sphinx
 
    # Red Hat/Fedora.
-   sudo yum     -y install python-sphinx
-
-   # Or, on any system with Python installed.
-   sudo easy_install -U sphinx
+   sudo yum     -y install python-pip
+   sudo pip install --upgrade sphinx
 
 For further information on getting started with Sphinx see the `Sphinx Tutorial <http://sphinx-doc.org/tutorial.html>`_.
 
@@ -196,13 +195,10 @@  The main required packages can be installed as follows:
 .. code-block:: console
 
    # Ubuntu/Debian.
-   sudo apt-get -y install texlive-latex-extra texlive-fonts-extra \
-                           texlive-fonts-recommended
-
+   sudo apt-get -y install texlive-latex-extra
 
    # Red Hat/Fedora, selective install.
-   sudo yum     -y install texlive-collection-latexextra \
-                           texlive-collection-fontsextra
+   sudo yum     -y install texlive-collection-latexextra
 
 
 Build commands
diff --git a/pkg/dpdk.spec b/pkg/dpdk.spec
index acbb2be..2d27d40 100644
--- a/pkg/dpdk.spec
+++ b/pkg/dpdk.spec
@@ -46,7 +46,7 @@  ExclusiveArch: i686, x86_64
 
 BuildRequires: kernel-devel, kernel-headers, libpcap-devel, xen-devel
 BuildRequires: doxygen, python-sphinx, inkscape
-BuildRequires: texlive-collection-latexextra, texlive-collection-fontsextra
+BuildRequires: texlive-collection-latexextra
 
 %description
 DPDK core includes kernel modules, core libraries and tools.