[forge] 01/03: Update patch queue.

[Ghislain Vaillant]

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

ghisvail-guest pushed a commit to branch debian/master
in repository forge.

commit e30a79d9032a274d42dacaf0b4c4aaa4f0de066f
Author: Ghislain Antony Vaillant <ghisvail at gmail.com>
Date:   Tue Dec 6 18:48:59 2016 +0000

    Update patch queue.
    
    - Refresh Use-system-MathJax.patch.
    - New patch Fix-build-of-examples-with-the-system-cl2hpp.patch.
    
    Gbp-Dch: full
---
 ...-build-of-examples-with-the-system-cl2hpp.patch | 34 ++++++++++++++++++++++
 debian/patches/Use-system-MathJax.patch            |  4 ++-
 debian/patches/series                              |  1 +
 3 files changed, 38 insertions(+), 1 deletion(-)

diff --git a/debian/patches/Fix-build-of-examples-with-the-system-cl2hpp.patch b/debian/patches/Fix-build-of-examples-with-the-system-cl2hpp.patch
new file mode 100644
index 0000000..0d4ebaa
--- /dev/null
+++ b/debian/patches/Fix-build-of-examples-with-the-system-cl2hpp.patch
@@ -0,0 +1,34 @@
+From: Ghislain Antony Vaillant <ghisvail at gmail.com>
+Date: Tue, 6 Dec 2016 18:47:56 +0000
+Subject: Fix build of examples with the system cl2hpp.
+
+---
+ examples/CMakeLists.txt | 8 ++++++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
+index fc94a13..51cad0d 100644
+--- a/examples/CMakeLists.txt
++++ b/examples/CMakeLists.txt
+@@ -7,7 +7,9 @@ OPTION(BUILD_EXAMPLES_CUDA "Turn off/on building cuda examples" ON)
+ OPTION(BUILD_EXAMPLES_OPENCL "Turn off/on building opencl examples" ON)
+ OPTION(USE_SYSTEM_CL2HPP "Use cl2.hpp header installed on the system" OFF)
+ 
+-INCLUDE(build_cl2hpp)
++IF(NOT USE_SYSTEM_CL2HPP)
++    INCLUDE(build_cl2hpp)
++ENDIF()
+ 
+ MACRO(BUILD_EXAMPLE EX_NAME EX_SRC COMPUTE_NAME FG_LIBS COMPUTE_LIBS)
+     IF(${COMPUTE_NAME} STREQUAL "cuda")
+@@ -22,7 +24,9 @@ MACRO(BUILD_EXAMPLE EX_NAME EX_SRC COMPUTE_NAME FG_LIBS COMPUTE_LIBS)
+         RUNTIME_OUTPUT_DIRECTORY ${DIR_NAME}
+         FOLDER "Examples/${COMPUTE_NAME}")
+     IF(${COMPUTE_NAME} STREQUAL "opencl")
+-        ADD_DEPENDENCIES(example_${EX_NAME}_${COMPUTE_NAME} cl2hpp)
++        IF(NOT USE_SYSTEM_CL2HPP)
++            ADD_DEPENDENCIES(example_${EX_NAME}_${COMPUTE_NAME} cl2hpp)
++        ENDIF()
+     ENDIF()
+ ENDMACRO()
+ 
diff --git a/debian/patches/Use-system-MathJax.patch b/debian/patches/Use-system-MathJax.patch
index 5edef9b..7676148 100644
--- a/debian/patches/Use-system-MathJax.patch
+++ b/debian/patches/Use-system-MathJax.patch
@@ -6,9 +6,11 @@ Subject: Use system MathJax.
  docs/doxygen.mk | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
+diff --git a/docs/doxygen.mk b/docs/doxygen.mk
+index 44a5e8a..4f2ddf0 100644
 --- a/docs/doxygen.mk
 +++ b/docs/doxygen.mk
-@@ -1452,7 +1452,7 @@
+@@ -1452,7 +1452,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.
  
diff --git a/debian/patches/series b/debian/patches/series
index fa6ab1e..d4e15b3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 Use-system-MathJax.patch
+Fix-build-of-examples-with-the-system-cl2hpp.patch

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