Accepting request 318502 from KDE:Extra

1

OBS-URL: https://build.opensuse.org/request/show/318502
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/opencv?expand=0&rev=57

improve-sphinx-search.diff

@@ -2,11 +2,19 @@ Index: cmake/OpenCVDetectPython.cmake
 ===================================================================
 --- cmake/OpenCVDetectPython.cmake.orig
 +++ cmake/OpenCVDetectPython.cmake
-@@ -126,7 +126,7 @@ if(PYTHON_EXECUTABLE)
+@@ -122,11 +122,12 @@ if(PYTHON_EXECUTABLE)
-                         OUTPUT_QUIET
+   if(BUILD_DOCS)
+     find_host_program(SPHINX_BUILD sphinx-build)
+     if(SPHINX_BUILD)
+-        execute_process(COMMAND "${SPHINX_BUILD}"
+-                        OUTPUT_QUIET
++        execute_process(COMMAND "${SPHINX_BUILD}" -h
++                        OUTPUT_VARIABLE SPHINX_OUTPUT
                          ERROR_VARIABLE SPHINX_OUTPUT
-                         OUTPUT_STRIP_TRAILING_WHITESPACE)
+-                        OUTPUT_STRIP_TRAILING_WHITESPACE)
 -        if(SPHINX_OUTPUT MATCHES "Sphinx v([0-9][^ \n]*)")
++                        OUTPUT_STRIP_TRAILING_WHITESPACE
++                        ERROR_STRIP_TRAILING_WHITESPACE)
 +        if(SPHINX_OUTPUT MATCHES "Sphinx v([0-9]*[^ \n]*)")
            set(SPHINX_VERSION "${CMAKE_MATCH_1}")
            set(HAVE_SPHINX 1)

opencv-qt5.changes

@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Fri Jul 24 14:48:48 UTC 2015 - mlin@suse.com
+
+- Update improve-sphinx-search.diff for new python-Sphinx(1.3.1)
+    * now that sphinx-build disallow executing without arguments and 
+      give you "Insufficient arguments" error, use "sphinx-build -h" 
+      instead
+    * the default usages output ie. sphinx-build(or --help) no longer
+      are standard error but standard output, drop OUTPUT_QUIET and 
+      add OUTPUT_VARIABLE throws the output to SPHINX_OUTPUT as well
+
 -------------------------------------------------------------------
 Wed Jun 10 12:42:49 UTC 2015 - schwab@suse.de
 

opencv.changes

@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Fri Jul 24 14:40:06 UTC 2015 - mlin@suse.com
+
+- Update improve-sphinx-search.diff for new python-Sphinx(1.3.1)
+  * now that sphinx-build disallow executing without arguments and
+    give you "Insufficient arguments" error, use "sphinx-build -h"
+    instead
+  * the default usages output ie. sphinx-build(or --help) no longer
+    are standard error but standard output, drop OUTPUT_QUIET and
+    add OUTPUT_VARIABLE throws the output to SPHINX_OUTPUT as well
+
 -------------------------------------------------------------------
 Wed Apr 29 11:53:09 UTC 2015 - coolo@suse.com