CONFIG: update patches for paraview 5.0.1, 5.1.0, 5.1.2

- also avoid issues with '+' being treated as a list separator
  (already patched in 5.2)

--
STYLE: reformat version check output (in makeParaView)

etc/patches/mkdiff-paraview-5.0.1

@@ -2,12 +2,26 @@
 
 # simple script to generate patches
 paraview=ParaView-5.0.1
+if [ "$#" -gt 0 ]
+then
+    paraview="${1%%/}"
+fi
+
+[ -d "$paraview" ] || {
+    echo "No directory '$paraview'" 1>&2
+    exit 2
+}
 
 for i in \
     $paraview/VTK/CMake/vtkCompilerExtras.cmake \
     $paraview/VTK/CMake/GenerateExportHeader.cmake \
     $paraview/Qt/Components/CMakeLists.txt \
+    $paraview/CMake/generate_qhp.cmake \
+    $paraview/CMake/ParaViewMacros.cmake \
+    $paraview/CMake/generate_proxydocumentation.cmake \
     ;
 do
     diff -uw $i.orig $i
 done
+
+# -----------------------------------------------------------------------------

etc/patches/paraview-4.4.0

@@ -16,7 +16,7 @@
      ERROR_VARIABLE _gcc_version_info)
 
 -  string (REGEX MATCH "[345]\\.[0-9]\\.[0-9]*"
-+  string (REGEX MATCH "[3-6]\\.[0-9]\\.[0-9]*"
++  string (REGEX MATCH "[3-9]\\.[0-9]\\.[0-9]*"
      _gcc_version "${_gcc_version_info}")
    if(NOT _gcc_version)
      string (REGEX REPLACE ".*\\(GCC\\).*([34]\\.[0-9]).*" "\\1.0"
@@ -27,24 +27,18 @@
        OUTPUT_VARIABLE _gcc_version_info
        ERROR_VARIABLE _gcc_version_info)
 -    string(REGEX MATCH "[345]\\.[0-9]\\.[0-9]*"
-+    string(REGEX MATCH "[3-6]\\.[0-9]\\.[0-9]*"
++    string(REGEX MATCH "[3-9]\\.[0-9]\\.[0-9]*"
        _gcc_version "${_gcc_version_info}")
      # gcc on mac just reports: "gcc (GCC) 3.3 20030304 ..." without the
      # patch level, handle this here:
 --- ParaView-5.0.1/Qt/Components/CMakeLists.txt.orig	2016-06-13 09:27:27.827849525 +0200
 +++ ParaView-5.0.1/Qt/Components/CMakeLists.txt	2016-06-13 09:29:28.599318445 +0200
-@@ -656,10 +656,10 @@
+@@ -640,7 +640,7 @@
  #the pqSGExportStateWizard has subclasses that directly access
  #the UI file, and currently we don't have a clean way to break this hard
  #dependency, so for no we install this ui file.
 -if(PARAVIEW_INSTALL_DEVELOPMENT_FILES)
--  install(FILES "${CMAKE_CURRENT_BINARY_DIR}/ui_pqExportStateWizard.h"
--          DESTINATION "${VTK_INSTALL_INCLUDE_DIR}")
--endif()
-+#OPENFOAM patch#if(PARAVIEW_INSTALL_DEVELOPMENT_FILES)
-+#OPENFOAM patch#  install(FILES "${CMAKE_CURRENT_BINARY_DIR}/ui_pqExportStateWizard.h"
-+#OPENFOAM patch#          DESTINATION "${VTK_INSTALL_INCLUDE_DIR}")
-+#OPENFOAM patch#endif()
-
- #IF (NOT PV_INSTALL_NO_DEVELOPMENT)
- #  # Headers
++if(PARAVIEW_INSTALL_DEVELOPMENT_FILES AND PARAVIEW_ENABLE_PYTHON)
+   install(FILES "${CMAKE_CURRENT_BINARY_DIR}/ui_pqExportStateWizard.h"
+           DESTINATION "${VTK_INSTALL_INCLUDE_DIR}")
+ endif()

etc/patches/paraview-5.0.0

@@ -0,0 +1 @@
+paraview-5.0.1

etc/patches/paraview-5.0.1

@@ -1,39 +1,87 @@
 --- ParaView-5.0.1/VTK/CMake/vtkCompilerExtras.cmake.orig	2016-03-28 17:07:10.000000000 +0200
-+++ ParaView-5.0.1/VTK/CMake/vtkCompilerExtras.cmake	2016-06-11 15:10:14.820958942 +0200
++++ ParaView-5.0.1/VTK/CMake/vtkCompilerExtras.cmake	2016-12-13 17:21:25.382720945 +0100
 @@ -32,7 +32,7 @@
      OUTPUT_VARIABLE _gcc_version_info
      ERROR_VARIABLE _gcc_version_info)
 
 -  string (REGEX MATCH "[345]\\.[0-9]\\.[0-9]*"
-+  string (REGEX MATCH "[3-6]\\.[0-9]\\.[0-9]*"
++  string (REGEX MATCH "[3-9]\\.[0-9]\\.[0-9]*"
      _gcc_version "${_gcc_version_info}")
    if(NOT _gcc_version)
      string (REGEX REPLACE ".*\\(GCC\\).*([34]\\.[0-9]).*" "\\1.0"
 --- ParaView-5.0.1/VTK/CMake/GenerateExportHeader.cmake.orig	2016-03-28 17:07:10.000000000 +0200
-+++ ParaView-5.0.1/VTK/CMake/GenerateExportHeader.cmake	2016-06-11 15:12:16.344357746 +0200
++++ ParaView-5.0.1/VTK/CMake/GenerateExportHeader.cmake	2016-12-13 17:21:25.382720945 +0100
 @@ -166,7 +166,7 @@
      execute_process(COMMAND ${CMAKE_C_COMPILER} ARGS --version
        OUTPUT_VARIABLE _gcc_version_info
        ERROR_VARIABLE _gcc_version_info)
 -    string(REGEX MATCH "[345]\\.[0-9]\\.[0-9]*"
-+    string(REGEX MATCH "[3-6]\\.[0-9]\\.[0-9]*"
++    string(REGEX MATCH "[3-9]\\.[0-9]\\.[0-9]*"
        _gcc_version "${_gcc_version_info}")
      # gcc on mac just reports: "gcc (GCC) 3.3 20030304 ..." without the
      # patch level, handle this here:
---- ParaView-5.0.1/Qt/Components/CMakeLists.txt.orig	2016-06-13 09:27:27.827849525 +0200
-+++ ParaView-5.0.1/Qt/Components/CMakeLists.txt	2016-06-13 09:29:28.599318445 +0200
-@@ -656,10 +656,10 @@
+--- ParaView-5.0.1/Qt/Components/CMakeLists.txt.orig	2016-03-28 17:07:03.000000000 +0200
++++ ParaView-5.0.1/Qt/Components/CMakeLists.txt	2016-12-13 17:38:42.713553032 +0100
+@@ -656,7 +656,7 @@
  #the pqSGExportStateWizard has subclasses that directly access
  #the UI file, and currently we don't have a clean way to break this hard
  #dependency, so for no we install this ui file.
 -if(PARAVIEW_INSTALL_DEVELOPMENT_FILES)
--  install(FILES "${CMAKE_CURRENT_BINARY_DIR}/ui_pqExportStateWizard.h"
--          DESTINATION "${VTK_INSTALL_INCLUDE_DIR}")
--endif()
-+#OPENFOAM patch#if(PARAVIEW_INSTALL_DEVELOPMENT_FILES)
-+#OPENFOAM patch#  install(FILES "${CMAKE_CURRENT_BINARY_DIR}/ui_pqExportStateWizard.h"
-+#OPENFOAM patch#          DESTINATION "${VTK_INSTALL_INCLUDE_DIR}")
-+#OPENFOAM patch#endif()
++if(PARAVIEW_INSTALL_DEVELOPMENT_FILES AND PARAVIEW_ENABLE_PYTHON)
+   install(FILES "${CMAKE_CURRENT_BINARY_DIR}/ui_pqExportStateWizard.h"
+           DESTINATION "${VTK_INSTALL_INCLUDE_DIR}")
+ endif()
+--- ParaView-5.0.1/CMake/generate_qhp.cmake.orig	2016-03-28 17:06:22.000000000 +0200
++++ ParaView-5.0.1/CMake/generate_qhp.cmake	2016-12-13 17:21:25.382720945 +0100
+@@ -44,7 +48,9 @@
+   message(FATAL_ERROR "Missing one of the required arguments!!")
+ endif ()
+
+-string (REPLACE "+" ";" file_patterns "${file_patterns}")
++# Recover original ';' separated list.
++string(REPLACE "_s" ";"  file_patterns "${file_patterns}")
++string(REPLACE "_u" "_"  file_patterns "${file_patterns}")
+
+ get_filename_component(working_dir "${output_file}" PATH)
+
+--- ParaView-5.0.1/CMake/ParaViewMacros.cmake.orig	2016-03-28 17:07:03.000000000 +0200
++++ ParaView-5.0.1/CMake/ParaViewMacros.cmake	2016-12-13 17:21:25.382720945 +0100
+@@ -219,15 +226,21 @@
+   set (xmls_string "")
+   foreach (xml ${xmls})
+     get_filename_component(xml "${xml}" ABSOLUTE)
+-    set (xmls_string "${xmls_string}${xml}+")
++    set (xmls_string "${xmls_string}${xml};")
+   endforeach()
+
+   set (gui_xmls_string "")
+   foreach (gui_xml ${gui_xmls})
+     get_filename_component(gui_xml "${gui_xml}" ABSOLUTE)
+-    set (gui_xmls_string "${gui_xmls_string}${gui_xml}+")
++    set (gui_xmls_string "${gui_xmls_string}${gui_xml};")
+   endforeach()
+
++  # Escape ';' in lists
++  string(REPLACE "_" "_u"  xmls_string "${xmls_string}")
++  string(REPLACE ";" "_s"  xmls_string "${xmls_string}")
++  string(REPLACE "_" "_u"  gui_xmls_string "${gui_xmls_string}")
++  string(REPLACE ";" "_s"  gui_xmls_string "${gui_xmls_string}")
++
+   set (all_xmls ${xmls} ${gui_xmls})
+   list (GET all_xmls 0 first_xml)
+   if (NOT first_xml)
+--- ParaView-5.0.1/CMake/generate_proxydocumentation.cmake.orig	2016-03-28 17:06:22.000000000 +0200
++++ ParaView-5.0.1/CMake/generate_proxydocumentation.cmake	2016-12-13 17:21:25.382720945 +0100
+@@ -21,8 +21,10 @@
+ endif()
+
+ # input_xmls is a pseudo-list. Convert it to a real CMake list.
+-string(REPLACE "+" ";" input_xmls "${input_xmls}")
+-string(REPLACE "+" ";" input_gui_xmls "${input_gui_xmls}")
++string(REPLACE "_s" ";"  input_xmls "${input_xmls}")
++string(REPLACE "_u" "_"  input_xmls "${input_xmls}")
++string(REPLACE "_s" ";"  input_gui_xmls "${input_gui_xmls}")
++string(REPLACE "_u" "_"  input_gui_xmls "${input_gui_xmls}")
+
+ set (xslt_xml)
 
- #IF (NOT PV_INSTALL_NO_DEVELOPMENT)
- #  # Headers

etc/patches/paraview-5.1.0

@@ -1,17 +0,0 @@
---- ParaView-5.1.0/Qt/Components/CMakeLists.txt.orig	2016-06-13 09:27:27.827849525 +0200
-+++ ParaView-5.1.0/Qt/Components/CMakeLists.txt	2016-06-13 09:29:28.599318445 +0200
-@@ -656,10 +656,10 @@
- #the pqSGExportStateWizard has subclasses that directly access
- #the UI file, and currently we don't have a clean way to break this hard
- #dependency, so for no we install this ui file.
--if(PARAVIEW_INSTALL_DEVELOPMENT_FILES)
--  install(FILES "${CMAKE_CURRENT_BINARY_DIR}/ui_pqExportStateWizard.h"
--          DESTINATION "${VTK_INSTALL_INCLUDE_DIR}")
--endif()
-+#OPENFOAM patch#if(PARAVIEW_INSTALL_DEVELOPMENT_FILES)
-+#OPENFOAM patch#  install(FILES "${CMAKE_CURRENT_BINARY_DIR}/ui_pqExportStateWizard.h"
-+#OPENFOAM patch#          DESTINATION "${VTK_INSTALL_INCLUDE_DIR}")
-+#OPENFOAM patch#endif()
-
- #IF (NOT PV_INSTALL_NO_DEVELOPMENT)
- #  # Headers

etc/patches/paraview-5.1.0

@@ -0,0 +1 @@
+paraview-5.1.2

etc/patches/paraview-5.1.2

@@ -1,13 +1,65 @@
 --- ParaView-5.1.2/Qt/Components/CMakeLists.txt.orig	2016-07-26 21:52:16.000000000 +0200
-+++ ParaView-5.1.2/Qt/Components/CMakeLists.txt	2016-11-11 14:41:19.395242358 +0100
-@@ -590,8 +590,8 @@
-
++++ ParaView-5.1.2/Qt/Components/CMakeLists.txt	2016-12-13 17:38:42.713553032 +0100
+@@ -591,7 +591,7 @@
  #the pqSGExportStateWizard has subclasses that directly access
  #the UI file, and currently we don't have a clean way to break this hard
--#dependency, so for no we install this ui file.
+ #dependency, so for no we install this ui file.
 -if(PARAVIEW_INSTALL_DEVELOPMENT_FILES)
-+#dependency, so for now we manually install this ui file.
 +if(PARAVIEW_INSTALL_DEVELOPMENT_FILES AND PARAVIEW_ENABLE_PYTHON)
    install(FILES "${CMAKE_CURRENT_BINARY_DIR}/ui_pqExportStateWizard.h"
            DESTINATION "${VTK_INSTALL_INCLUDE_DIR}")
  endif()
+--- ParaView-5.1.2/CMake/generate_qhp.cmake.orig	2016-03-28 17:06:22.000000000 +0200
++++ ParaView-5.1.2/CMake/generate_qhp.cmake	2016-12-13 17:21:25.382720945 +0100
+@@ -44,7 +48,9 @@
+   message(FATAL_ERROR "Missing one of the required arguments!!")
+ endif ()
+
+-string (REPLACE "+" ";" file_patterns "${file_patterns}")
++# Recover original ';' separated list.
++string(REPLACE "_s" ";"  file_patterns "${file_patterns}")
++string(REPLACE "_u" "_"  file_patterns "${file_patterns}")
+
+ get_filename_component(working_dir "${output_file}" PATH)
+
+--- ParaView-5.1.2/CMake/ParaViewMacros.cmake.orig	2016-03-28 17:07:03.000000000 +0200
++++ ParaView-5.1.2/CMake/ParaViewMacros.cmake	2016-12-13 17:21:25.382720945 +0100
+@@ -219,15 +226,21 @@
+   set (xmls_string "")
+   foreach (xml ${xmls})
+     get_filename_component(xml "${xml}" ABSOLUTE)
+-    set (xmls_string "${xmls_string}${xml}+")
++    set (xmls_string "${xmls_string}${xml};")
+   endforeach()
+
+   set (gui_xmls_string "")
+   foreach (gui_xml ${gui_xmls})
+     get_filename_component(gui_xml "${gui_xml}" ABSOLUTE)
+-    set (gui_xmls_string "${gui_xmls_string}${gui_xml}+")
++    set (gui_xmls_string "${gui_xmls_string}${gui_xml};")
+   endforeach()
+
++  # Escape ';' in lists
++  string(REPLACE "_" "_u"  xmls_string "${xmls_string}")
++  string(REPLACE ";" "_s"  xmls_string "${xmls_string}")
++  string(REPLACE "_" "_u"  gui_xmls_string "${gui_xmls_string}")
++  string(REPLACE ";" "_s"  gui_xmls_string "${gui_xmls_string}")
++
+   set (all_xmls ${xmls} ${gui_xmls})
+   list (GET all_xmls 0 first_xml)
+   if (NOT first_xml)
+--- ParaView-5.1.2/CMake/generate_proxydocumentation.cmake.orig	2016-03-28 17:06:22.000000000 +0200
++++ ParaView-5.1.2/CMake/generate_proxydocumentation.cmake	2016-12-13 17:21:25.382720945 +0100
+@@ -21,8 +21,10 @@
+ endif()
+
+ # input_xmls is a pseudo-list. Convert it to a real CMake list.
+-string(REPLACE "+" ";" input_xmls "${input_xmls}")
+-string(REPLACE "+" ";" input_gui_xmls "${input_gui_xmls}")
++string(REPLACE "_s" ";"  input_xmls "${input_xmls}")
++string(REPLACE "_u" "_"  input_xmls "${input_xmls}")
++string(REPLACE "_s" ";"  input_gui_xmls "${input_gui_xmls}")
++string(REPLACE "_u" "_"  input_gui_xmls "${input_gui_xmls}")
+
+ set (xslt_xml)
+

etc/tools/ParaViewFunctions

@@ -117,9 +117,9 @@ checkVersion()
 
     if [ "$ParaView_VERSION" != "$ver" ]
     then
-        echo "MISMATCH!"
-        echo "    specified $ParaView_VERSION"
-        echo "    found     ${ver:-NONE}"
+        echo "(${ver:-none}) mismatch?"
+    else
+        echo "(${ver:-none})"
     fi
 }
 

makeParaView

@@ -381,10 +381,9 @@ Features selected
 ---------------------
 Version information
     qt        ${QtVersion:-none}
-    version   ${ParaView_VERSION:-unknown}
+    version   ${ParaView_VERSION:-unknown} $(checkVersion)
     major     ${ParaView_MAJOR:-unknown}
     build     ${buildType:-Release}
-$(checkVersion)
 ---------------------
 SUMMARY
 

makeVTK.example

@@ -3,8 +3,8 @@
 # - off-screen mesa
 
 vtk=VTK-7.1.0
-mesa=mesa-11.2.2
-# mesa=mesa-13.0.2
+# mesa=mesa-11.2.2
+mesa=mesa-13.0.1
 
 ./makeVTK \
     $vtk \