SALOME 6.5.0 preparation: patch ParaView 3.14.0 - missing doc generation files

diff --git a/config_files/ParaView.sh b/config_files/ParaView.sh
index 3270897a1df51bcebf828a1382cf10fb56d1fabc..44b5ee080cb3edb0209cd0ac5874c7c35dc5b43c 100755 (executable)
--- a/config_files/ParaView.sh
+++ b/config_files/ParaView.sh
@@ -95,10 +95,15 @@ if [ "${need_patch_ftgl}" == "1" ] ; then
     cp patches/paraview-3.10.1-ftgl.patch ${PRODUCT_SRC_DIR}
     ( cd ${PRODUCT_SRC_DIR} ; patch -p1 < paraview-3.10.1-ftgl.patch )
 fi
-# 4. patch hang-up of the compiler on some platforms when building SurfaceLIC plug-in
+# 4. patch hang-up of the compiler on some platforms when building SurfaceLIC plug-in (v3.14.0)
 need_patch_surfaceLic=1
 if [ "${need_patch_surfaceLic}" == "1" ] ; then
-    test -f patches/surface_lic.png && cp -f patches/surface_lic.png ${PRODUCT_SRC_DIR}/Plugins/SurfaceLIC/doc
+    ( test -f patches/surface_lic.png && cp -f patches/surface_lic.png ${PRODUCT_SRC_DIR}/Plugins/SurfaceLIC/doc )
+fi
+# 5. patch for missing doc generation files (v3.14.0)
+need_patch_plugindoc=1
+if [ "${need_patch_plugindoc}" == "1" ] ; then
+    ( test -f patches/paraview-3.14.0-plugindoc.patch && cp -f patches/paraview-3.14.0-plugindoc.patch ${PRODUCT_SRC_DIR} && cd ${PRODUCT_SRC_DIR} && patch -p1 < paraview-3.14.0-plugindoc.patch )
 fi
 
 # to generate environment scripts

diff --git a/config_files/patches/paraview-3.14.0-plugindoc.patch b/config_files/patches/paraview-3.14.0-plugindoc.patch
new file mode 100644 (file)
index 0000000..dbb2b96
--- /dev/null
+++ b/config_files/patches/paraview-3.14.0-plugindoc.patch
@@ -0,0 +1,14 @@
+--- ParaView-3.14.0_SRC/CMakeLists.txt.orig    2012-04-09 16:27:29.000000000 +0400
++++ ParaView-3.14.0_SRC/CMakeLists.txt 2012-04-09 16:29:55.000000000 +0400
+@@ -409,6 +409,11 @@
+       ${ParaView_CMAKE_DIR}/branded_paraview_initializer.h.in
+       ${ParaView_CMAKE_DIR}/ParaViewCPackOptions.cmake.in
+       ${ParaView_CMAKE_DIR}/pv-forward.c.in
++      ${ParaView_CMAKE_DIR}/generate_proxydocumentation.cmake
++      ${ParaView_CMAKE_DIR}/smxml_to_xml.xsl
++      ${ParaView_CMAKE_DIR}/xml_to_html.xsl
++      ${ParaView_CMAKE_DIR}/xml_to_wiki.xsl.in
++      ${ParaView_CMAKE_DIR}/generate_qhp.cmake
+       # originaly from Qt/Components
+       ${ParaView_CMAKE_DIR}/pqObjectPanelImplementation.h.in
+       ${ParaView_CMAKE_DIR}/pqObjectPanelImplementation.cxx.in