sphinx-pre-install: dvipng not checked by default, python-sphinx added always for --no-virtualenv

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Hi Mauro! I noticed two small oddities with sphinx-pre-install I wanted
to quickly tell your about:

(1) running "./scripts/sphinx-pre-install --no-virtualenv" always tells
me to run "sudo dnf install -y python3-sphinx
", even if it's already installed on the system. On a quick look that
seems to happen due to line 738 (on docs-next), that afaics always does...

> add_package("python-sphinx", 0);

...when running with "--no-virtualenv". Doesn't matter too much, but I
thought I mentioned it while reporting the issue that made me write this
mail:

(2) when running 'make htmldocs' I saw this warning:

> WARNING: dvipng command 'dvipng' cannot be run (needed for math display), check the imgmath_dvipng setting 

I had run "sphinx-pre-install --no-virtualenv" earlier to get everything
I needed, but it had not told me to install dvipng. So it might be wise
to fix this with a patch like the one below. Please let me know if
that's the right approach, that I submit it as proper patch.

Ciao, Thorsten


diff --git a/scripts/sphinx-pre-install b/scripts/sphinx-pre-install
index 40fa6923e80a..5515cac027ef 100755
--- a/scripts/sphinx-pre-install
+++ b/scripts/sphinx-pre-install
@@ -379,7 +379,6 @@ sub give_debian_hints()
 				   "fonts-noto-cjk", 2);
 	}

-	check_program("dvipng", 2) if ($pdf);
 	check_missing(\%map);

 	return if (!$need && !$optional);
@@ -397,6 +396,7 @@ sub give_redhat_hints()
 		"Pod::Usage"		=> "perl-Pod-Usage",
 		"xelatex"		=> "texlive-xetex-bin",
 		"rsvg-convert"		=> "librsvg2-tools",
+		"dvipng"		=> "texlive-dvipng",
 	);

 	my @fedora26_opt_pkgs = (
@@ -757,6 +757,7 @@ sub check_needs()
 	check_python_module("sphinx_rtd_theme", 1) if (!$virtualenv);
 	check_program("dot", 1);
 	check_program("convert", 1);
+	check_program("dvipng", 2);

 	# Extra PDF files - should use 2 for is_optional
 	check_program("xelatex", 2) if ($pdf);



[Index of Archives]     [Kernel Newbies]     [Security]     [Netfilter]     [Bugtraq]     [Linux FS]     [Yosemite Forum]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Samba]     [Video 4 Linux]     [Device Mapper]     [Linux Resources]

  Powered by Linux