summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGard Spreemann <gspreemann@gmail.com>2017-10-09 16:08:22 +0200
committerGard Spreemann <gspreemann@gmail.com>2017-10-09 16:22:04 +0200
commitab3927695a137947a012f60b6affd7d8ea7dff76 (patch)
tree98e7dd2af57cf9817d096025c29b17352675e9ce
parentee84975c98c897c7fb171663876ed60ea965ad4f (diff)
Patch for using the system MathJax.
-rw-r--r--debian/patches/0001-Force-Python-3-detection-to-avoid-mixing-2-and-3.patch4
-rw-r--r--debian/patches/0002-Disable-the-Sphinx-test.-We-re-not-using-it-as-it-re.patch4
-rw-r--r--debian/patches/0003-Disable-tests-that-use-DFSG-deleted-data-files.patch4
-rw-r--r--debian/patches/0004-Use-system-MathJax.patch25
-rw-r--r--debian/patches/series1
5 files changed, 32 insertions, 6 deletions
diff --git a/debian/patches/0001-Force-Python-3-detection-to-avoid-mixing-2-and-3.patch b/debian/patches/0001-Force-Python-3-detection-to-avoid-mixing-2-and-3.patch
index 1b76f052..b6e05ed7 100644
--- a/debian/patches/0001-Force-Python-3-detection-to-avoid-mixing-2-and-3.patch
+++ b/debian/patches/0001-Force-Python-3-detection-to-avoid-mixing-2-and-3.patch
@@ -1,7 +1,7 @@
-From 3a8816f0a83e92307c39cd9cfa85ea6e67df48eb Mon Sep 17 00:00:00 2001
+From e92363ab8125cff24a9c2ef5eec159ff09afc381 Mon Sep 17 00:00:00 2001
From: Gard Spreemann <gspreemann@gmail.com>
Date: Mon, 9 Oct 2017 11:46:06 +0200
-Subject: [PATCH 1/3] Force Python 3 detection to avoid mixing 2 and 3.
+Subject: [PATCH 1/4] Force Python 3 detection to avoid mixing 2 and 3.
---
cmake/modules/FindCython.cmake | 6 +++---
diff --git a/debian/patches/0002-Disable-the-Sphinx-test.-We-re-not-using-it-as-it-re.patch b/debian/patches/0002-Disable-the-Sphinx-test.-We-re-not-using-it-as-it-re.patch
index 76bb686e..2eb76f06 100644
--- a/debian/patches/0002-Disable-the-Sphinx-test.-We-re-not-using-it-as-it-re.patch
+++ b/debian/patches/0002-Disable-the-Sphinx-test.-We-re-not-using-it-as-it-re.patch
@@ -1,7 +1,7 @@
-From c167dcc8b48db2670f132d579ca68984938c1d5a Mon Sep 17 00:00:00 2001
+From 2511e115a28311263e7ed85e98296c6af12ea960 Mon Sep 17 00:00:00 2001
From: Gard Spreemann <gspreemann@gmail.com>
Date: Mon, 9 Oct 2017 12:05:01 +0200
-Subject: [PATCH 2/3] Disable the Sphinx test. We're not using it, as it
+Subject: [PATCH 2/4] Disable the Sphinx test. We're not using it, as it
requires the Sphinx bibtex module (#800358).
---
diff --git a/debian/patches/0003-Disable-tests-that-use-DFSG-deleted-data-files.patch b/debian/patches/0003-Disable-tests-that-use-DFSG-deleted-data-files.patch
index 279c6091..eade3da7 100644
--- a/debian/patches/0003-Disable-tests-that-use-DFSG-deleted-data-files.patch
+++ b/debian/patches/0003-Disable-tests-that-use-DFSG-deleted-data-files.patch
@@ -1,7 +1,7 @@
-From c80f7efa2fbdc3152fde015505be0e6b64074c49 Mon Sep 17 00:00:00 2001
+From f31347031ea99c60d11064ec28bc27805b5c28b9 Mon Sep 17 00:00:00 2001
From: Gard Spreemann <gspreemann@gmail.com>
Date: Mon, 9 Oct 2017 14:15:02 +0200
-Subject: [PATCH 3/3] Disable tests that use DFSG-deleted data files.
+Subject: [PATCH 3/4] Disable tests that use DFSG-deleted data files.
---
example/Persistent_cohomology/CMakeLists.txt | 8 ++++----
diff --git a/debian/patches/0004-Use-system-MathJax.patch b/debian/patches/0004-Use-system-MathJax.patch
new file mode 100644
index 00000000..916d23b9
--- /dev/null
+++ b/debian/patches/0004-Use-system-MathJax.patch
@@ -0,0 +1,25 @@
+From 46fdbaf1a91c320d7f731d061ef6d8d6da73232a Mon Sep 17 00:00:00 2001
+From: Gard Spreemann <gspreemann@gmail.com>
+Date: Mon, 9 Oct 2017 16:06:36 +0200
+Subject: [PATCH 4/4] Use system MathJax.
+
+---
+ Doxyfile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Doxyfile b/Doxyfile
+index 0ef81e5..51df82e 100644
+--- a/Doxyfile
++++ b/Doxyfile
+@@ -1450,7 +1450,7 @@ MATHJAX_FORMAT = HTML-CSS
+ # The default value is: http://cdn.mathjax.org/mathjax/latest.
+ # This tag requires that the tag USE_MATHJAX is set to YES.
+
+-MATHJAX_RELPATH = ../common
++MATHJAX_RELPATH = /usr/share/javascript/mathjax
+
+ # The MATHJAX_EXTENSIONS tag can be used to specify one or more MathJax
+ # extension names that should be enabled during MathJax rendering. For example
+--
+2.11.0
+
diff --git a/debian/patches/series b/debian/patches/series
index e40c26b6..d1117f4a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
0001-Force-Python-3-detection-to-avoid-mixing-2-and-3.patch
0002-Disable-the-Sphinx-test.-We-re-not-using-it-as-it-re.patch
0003-Disable-tests-that-use-DFSG-deleted-data-files.patch
+0004-Use-system-MathJax.patch