[opencv] 02/02: d/p/mathjax: make the MATHJAX_RELPATH option configurable at build time through cmake, and then forward the patch

[Mattia Rizzolo]

This is an automated email from the git hooks/post-receive script.

mattia pushed a commit to branch sid
in repository opencv.

commit c1406aa27daa1613ebb4a02d210de8d48132b215
Author: Mattia Rizzolo <mattia at debian.org>
Date:   Tue Oct 17 02:15:32 2017 +0200

    d/p/mathjax: make the MATHJAX_RELPATH option configurable at build time through cmake, and then forward the patch
    
    Signed-off-by: Mattia Rizzolo <mattia at debian.org>
---
 debian/patches/mathjax | 16 ++++++++++++++--
 debian/rules           |  1 +
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/debian/patches/mathjax b/debian/patches/mathjax
index 9bd2c10..5ef643d 100644
--- a/debian/patches/mathjax
+++ b/debian/patches/mathjax
@@ -1,13 +1,25 @@
 Description: use system-installed mathjx instead of downloading from the net
+Forwarded: https://github.com/opencv/opencv/pull/9866
 
 --- a/doc/Doxyfile.in
 +++ b/doc/Doxyfile.in
-@@ -167,7 +167,7 @@
+@@ -174,7 +174,7 @@
  FORMULA_TRANSPARENT    = YES
  USE_MATHJAX            = YES
  MATHJAX_FORMAT         = HTML-CSS
 -MATHJAX_RELPATH        = http://cdn.mathjax.org/mathjax/latest
-+MATHJAX_RELPATH        = /usr/share/javascript/mathjax/
++MATHJAX_RELPATH        = @OCV_MATHJAX_RELPATH@
  MATHJAX_EXTENSIONS     = TeX/AMSmath TeX/AMSsymbols
  MATHJAX_CODEFILE       = @CMAKE_CURRENT_SOURCE_DIR@/mymath.js
  SEARCHENGINE           = YES
+--- a/doc/CMakeLists.txt
++++ b/doc/CMakeLists.txt
+@@ -36,6 +36,8 @@
+   list(APPEND blacklist "ts" "java" "python2" "python3" "world" "contrib_world")
+   unset(CMAKE_DOXYGEN_TUTORIAL_CONTRIB_ROOT)
+ 
++  set(OCV_MATHJAX_RELPATH "http://cdn.mathjax.org/mathjax/latest" CACHE STRING "URI to a MathJax installation")
++
+   # gathering headers
+   set(paths_include)
+   set(paths_doc)
diff --git a/debian/rules b/debian/rules
index 33d13a1..610272f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -29,6 +29,7 @@ CMAKE_FLAGS = \
 	-DCMAKE_C_FLAGS_RELEASE="$(CFLAGS)" \
 	-DCMAKE_CXX_FLAGS_RELEASE="$(CXXFLAGS)" \
 	-DCMAKE_EXE_LINKER_FLAGS_RELEASE="$(LDFLAGS)" \
+	-DOCV_MATHJAX_RELPATH=/usr/share/javascript/mathjax/ \
 	-DCMAKE_BUILD_TYPE=Release	\
 	-DBUILD_EXAMPLES=ON	\
 	-DINSTALL_C_EXAMPLES=ON	\

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/opencv.git