| 1 |
commit: 7de4915e9c99fba07343fc33c4bf50c85b2b7c76 |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Nov 26 22:23:53 2019 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Nov 27 00:12:47 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7de4915e |
| 7 |
|
| 8 |
media-libs/vigra: Fix build with sphinx-2 |
| 9 |
|
| 10 |
See also: https://github.com/ukoethe/vigra/issues/462 |
| 11 |
|
| 12 |
Closes: https://bugs.gentoo.org/678308 |
| 13 |
Package-Manager: Portage-2.3.79, Repoman-2.3.18 |
| 14 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
| 15 |
|
| 16 |
.../files/vigra-1.11.1-sphinx.ext.pngmath.patch | 27 ++++++++++++++++++++++ |
| 17 |
media-libs/vigra/vigra-1.11.1-r2.ebuild | 1 + |
| 18 |
media-libs/vigra/vigra-9999.ebuild | 6 ++++- |
| 19 |
3 files changed, 33 insertions(+), 1 deletion(-) |
| 20 |
|
| 21 |
diff --git a/media-libs/vigra/files/vigra-1.11.1-sphinx.ext.pngmath.patch b/media-libs/vigra/files/vigra-1.11.1-sphinx.ext.pngmath.patch |
| 22 |
new file mode 100644 |
| 23 |
index 00000000000..fc265763f6a |
| 24 |
--- /dev/null |
| 25 |
+++ b/media-libs/vigra/files/vigra-1.11.1-sphinx.ext.pngmath.patch |
| 26 |
@@ -0,0 +1,27 @@ |
| 27 |
+Description: Replace sphinx.ext.pngmath by sphinx.ext.imgmath to build with sphinx 1.8 |
| 28 |
+Bug-Debian: https://bugs.debian.org/923467 |
| 29 |
+Author: Andreas Tille <tille@××××××.org> |
| 30 |
+Last-Update: Fri, 08 Mar 2019 18:38:02 +0100 |
| 31 |
+ |
| 32 |
+--- a/vigranumpy/docsrc/conf.py.cmake2.in |
| 33 |
++++ b/vigranumpy/docsrc/conf.py.cmake2.in |
| 34 |
+@@ -59,7 +59,7 @@ os.environ['PATH'] = os.pathsep.join([vi |
| 35 |
+ |
| 36 |
+ # Add any Sphinx extension module names here, as strings. They can be extensions |
| 37 |
+ # coming with Sphinx (named 'sphinx.ext.*') or your custom ones. |
| 38 |
+-extensions = ['sphinx.ext.autodoc', 'sphinx.ext.todo', 'sphinx.ext.coverage', 'sphinx.ext.pngmath'] |
| 39 |
++extensions = ['sphinx.ext.autodoc', 'sphinx.ext.todo', 'sphinx.ext.coverage', 'sphinx.ext.imgmath'] |
| 40 |
+ |
| 41 |
+ # Add any paths that contain templates here, relative to this directory. |
| 42 |
+ templates_path = ['_templates'] |
| 43 |
+--- a/vigranumpy/docsrc/conf.py.in |
| 44 |
++++ b/vigranumpy/docsrc/conf.py.in |
| 45 |
+@@ -58,7 +58,7 @@ os.environ['PATH'] = os.pathsep.join([vi |
| 46 |
+ |
| 47 |
+ # Add any Sphinx extension module names here, as strings. They can be extensions |
| 48 |
+ # coming with Sphinx (named 'sphinx.ext.*') or your custom ones. |
| 49 |
+-extensions = ['sphinx.ext.autodoc', 'sphinx.ext.todo', 'sphinx.ext.coverage', 'sphinx.ext.pngmath'] |
| 50 |
++extensions = ['sphinx.ext.autodoc', 'sphinx.ext.todo', 'sphinx.ext.coverage', 'sphinx.ext.imgmath'] |
| 51 |
+ |
| 52 |
+ # Add any paths that contain templates here, relative to this directory. |
| 53 |
+ templates_path = ['_templates'] |
| 54 |
|
| 55 |
diff --git a/media-libs/vigra/vigra-1.11.1-r2.ebuild b/media-libs/vigra/vigra-1.11.1-r2.ebuild |
| 56 |
index 8f4b2b23a1c..757fe839d19 100644 |
| 57 |
--- a/media-libs/vigra/vigra-1.11.1-r2.ebuild |
| 58 |
+++ b/media-libs/vigra/vigra-1.11.1-r2.ebuild |
| 59 |
@@ -69,6 +69,7 @@ PATCHES=( |
| 60 |
"${FILESDIR}/${P}-boost-python.patch" |
| 61 |
# TODO: upstream |
| 62 |
"${FILESDIR}/${P}-lib_suffix.patch" |
| 63 |
+ "${FILESDIR}/${P}-sphinx.ext.pngmath.patch" # thanks to Debian; bug 678308 |
| 64 |
) |
| 65 |
|
| 66 |
pkg_setup() { |
| 67 |
|
| 68 |
diff --git a/media-libs/vigra/vigra-9999.ebuild b/media-libs/vigra/vigra-9999.ebuild |
| 69 |
index cad2a8191a7..6d9d2266b16 100644 |
| 70 |
--- a/media-libs/vigra/vigra-9999.ebuild |
| 71 |
+++ b/media-libs/vigra/vigra-9999.ebuild |
| 72 |
@@ -64,7 +64,11 @@ RDEPEND="${PYTHON_DEPS} |
| 73 |
# Severely broken, also disabled in Fedora, bugs #390447, #653442 |
| 74 |
RESTRICT="test" |
| 75 |
|
| 76 |
-PATCHES=( "${FILESDIR}/${PN}-1.11.1-lib_suffix.patch" ) |
| 77 |
+PATCHES=( |
| 78 |
+ # TODO: upstream |
| 79 |
+ "${FILESDIR}/${PN}-1.11.1-lib_suffix.patch" |
| 80 |
+ "${FILESDIR}/${PN}-1.11.1-sphinx.ext.pngmath.patch" # thanks to Debian; bug 678308 |
| 81 |
+) |
| 82 |
|
| 83 |
pkg_setup() { |
| 84 |
if use python || use doc; then |
Archives