[opencv] 02/02: d/patches/fix_java_build.patch: add to fix FTBFS in certain conditions.

[Mattia Rizzolo]

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

mattia pushed a commit to branch master
in repository opencv.

commit 309d8e09367c9baa365235a05431fa0641c9262f
Author: Mattia Rizzolo <mattia at debian.org>
Date:   Fri Oct 27 21:21:56 2017 +0200

    d/patches/fix_java_build.patch: add to fix FTBFS in certain conditions.
    
    Signed-off-by: Mattia Rizzolo <mattia at debian.org>
---
 debian/patches/fix_java_build.patch | 21 +++++++++++++++++++++
 debian/patches/series               |  1 +
 2 files changed, 22 insertions(+)

diff --git a/debian/patches/fix_java_build.patch b/debian/patches/fix_java_build.patch
new file mode 100644
index 0000000..57518d2
--- /dev/null
+++ b/debian/patches/fix_java_build.patch
@@ -0,0 +1,21 @@
+Description: fix FTBFS when building the java bindings
+ I'm not yet entirely sure of why, but all files tends to go inside that branch,
+ despite all ${java_file} matching "${OpenCV_BINARY_DIR}/".  I believe it has
+ something to do with the content of ${OpenCV_BINARY_DIR}, in particular the
+ presence of '+' and/or '.' in the build path.
+ For now let's just patch it out until something better comes around.
+Author: Mattia Rizzolo <mattia at debian.org>
+Forwarded: not-needed
+Last-Update: 2017-10-27
+
+--- a/modules/java/CMakeLists.txt
++++ b/modules/java/CMakeLists.txt
+@@ -291,8 +291,6 @@
+   endif()
+   if(__configure)
+     configure_file("${java_file}" "${java_src_dir}/${output_name}" @ONLY)
+-  elseif(NOT "${java_file}" MATCHES "${OpenCV_BINARY_DIR}/")
+-    configure_file("${java_file}" "${java_src_dir}/${output_name}" COPYONLY)
+   else()
+     add_custom_command(OUTPUT "${java_src_dir}/${output_name}"
+                        COMMAND ${CMAKE_COMMAND} -E copy_if_different "${java_file}" "${java_src_dir}/${output_name}"
diff --git a/debian/patches/series b/debian/patches/series
index 7c8c914..441e91b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@ disable_opengl_test_build
 mathjax
 change_jquery.js_path
 disable_dnn_modern
+fix_java_build.patch

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