bos #23995: normalize ParaView patches names

diff --git a/products/ParaView.pyconf b/products/ParaView.pyconf
index eb4dbce4cfae29d9a05e03e73ab624406f2839df..7156de09022adb246a8840e6cdeb5c2e74df3b44 100755 (executable)
--- a/products/ParaView.pyconf
+++ b/products/ParaView.pyconf
@@ -40,9 +40,9 @@ version_5_9_0 :
                'paraview.0005-ParaView_find_cgns.patch',
                'paraview.0006-ParaView_find_libxml2.patch',
                'paraview.0007-ParaView_find_freetype.patch',
-               'ParaView-5.9.0-CATALYST_cmake.patch',
+               'paraview.0010-ParaView_CATALYST_cmake.patch',
                'paraview.0008-ParaView_coincident_rendering.patch',
-               'paraview.0017-ParaView_protobuf_crash.patch'
+               'paraview.0011-ParaView_protobuf_crash.patch'
               ]
 }
 
@@ -56,9 +56,9 @@ version_5_9_0_int32 :
                'paraview.0005-ParaView_find_cgns.patch',
                'paraview.0006-ParaView_find_libxml2.patch',
                'paraview.0007-ParaView_find_freetype.patch',
-               'ParaView-5.9.0-CATALYST_cmake.patch',
+               'paraview.0010-ParaView_CATALYST_cmake.patch',
                'paraview.0008-ParaView_coincident_rendering.patch',
-               'paraview.0017-ParaView_protobuf_crash.patch'
+               'paraview.0011-ParaView_protobuf_crash.patch'
               ]
 }
 
@@ -85,10 +85,10 @@ version_5_9_0_win :
                'paraview.0006-ParaView_find_libxml2.patch',
                'paraview.0007-ParaView_find_freetype.patch',
                'paraview.0009-ParaView_find_zlib.patch',
-               'ParaView-5.9.0-CATALYST_cmake.patch',
-               'paraview.0010-ParaView_windows_catalyst_cmake.patch',
+               'paraview.0010-ParaView_CATALYST_cmake.patch',
+               'paraview.1001-ParaView_windows_catalyst_cmake.patch',
                'paraview.0008-ParaView_coincident_rendering.patch',
-               'paraview.0017-ParaView_protobuf_crash.patch'
+               'paraview.0011-ParaView_protobuf_crash.patch'
               ]
 }
 
@@ -115,10 +115,10 @@ version_5_9_0_win_int32 :
                'paraview.0006-ParaView_find_libxml2.patch',
                'paraview.0007-ParaView_find_freetype.patch',
                'paraview.0008-ParaView_find_zlib.patch',
-               'ParaView-5.9.0-CATALYST_cmake.patch',
-               'paraview.0010-ParaView_windows_catalyst_cmake.patch',
+               'paraview.0010-ParaView_CATALYST_cmake.patch',
+               'paraview.1001-ParaView_windows_catalyst_cmake.patch',
                'paraview.0008-ParaView_coincident_rendering.patch',
-               'paraview.0017-ParaView_protobuf_crash.patch'
+               'paraview.0011-ParaView_protobuf_crash.patch'
               ]
 }
 
@@ -132,9 +132,9 @@ version_5_9_0_MPI :
                'paraview.0006-ParaView_find_libxml2.patch',
                'paraview.0007-ParaView_find_freetype.patch',
                'paraview-5.9-VTKM_MPI.patch',
-               'ParaView-5.9.0-CATALYST_cmake.patch',
+               'paraview.0010-ParaView_CATALYST_cmake.patch',
                'paraview.0008-ParaView_coincident_rendering.patch',
-               'paraview.0017-ParaView_protobuf_crash.patch'
+               'paraview.0011-ParaView_protobuf_crash.patch'
               ]
 }
 
@@ -148,9 +148,9 @@ version_5_9_0_MPI_int32 :
                'paraview.0006-ParaView_find_libxml2.patch',
                'paraview.0007-ParaView_find_freetype.patch',
                'paraview-5.9-VTKM_MPI.patch',
-               'ParaView-5.9.0-CATALYST_cmake.patch',
+               'paraview.0010-ParaView_CATALYST_cmake.patch',
                'paraview.0008-ParaView_coincident_rendering.patch',
-               'paraview.0017-ParaView_protobuf_crash.patch'
+               'paraview.0011-ParaView_protobuf_crash.patch'
               ]
 }
 

diff --git a/products/patches/ParaView-5.9.0-CATALYST_cmake.patch b/products/patches/ParaView-5.9.0-CATALYST_cmake.patch
deleted file mode 100644 (file)
index 7f79c1f..0000000
--- a/products/patches/ParaView-5.9.0-CATALYST_cmake.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -Naur ParaView-5.9.0_ref/ThirdParty/catalyst/vtkcatalyst/catalyst/cmake/catalyst-config.cmake.in ParaView-5.9.0/ThirdParty/catalyst/vtkcatalyst/catalyst/cmake/catalyst-config.cmake.in
---- ParaView-5.9.0_ref/ThirdParty/catalyst/vtkcatalyst/catalyst/cmake/catalyst-config.cmake.in 2021-02-04 15:22:02.000000000 +0100
-+++ ParaView-5.9.0/ThirdParty/catalyst/vtkcatalyst/catalyst/cmake/catalyst-config.cmake.in     2021-03-01 15:51:58.110940810 +0100
-@@ -1,6 +1,6 @@
- # Catalyst Package config file.
- cmake_policy(PUSH)
--cmake_policy(VERSION 3.13)
-+cmake_policy(VERSION 3.12)
- 
- set(CATALYST_VERSION "@CATALYST_VERSION@")
- set(CATALYST_ABI_VERSION "@CATALYST_ABI_VERSION@")
-
-diff -Naur ParaView-5.9.0_ref/ThirdParty/catalyst/vtkcatalyst/catalyst/CMakeLists.txt ParaView-5.9.0/ThirdParty/catalyst/vtkcatalyst/catalyst/CMakeLists.txt
---- ParaView-5.9.0_ref/ThirdParty/catalyst/vtkcatalyst/catalyst/CMakeLists.txt 2021-02-04 15:22:02.000000000 +0100
-+++ ParaView-5.9.0/ThirdParty/catalyst/vtkcatalyst/catalyst/CMakeLists.txt     2021-03-01 15:56:02.640910857 +0100
-@@ -1,4 +1,4 @@
--cmake_minimum_required(VERSION 3.13...3.16 FATAL_ERROR)
-+cmake_minimum_required(VERSION 3.12...3.16 FATAL_ERROR)
- project(CATALYST VERSION 2.0 LANGUAGES C CXX)
- 
- #------------------------------------------------------------------------------

diff --git a/products/patches/paraview.0010-ParaView_CATALYST_cmake.patch b/products/patches/paraview.0010-ParaView_CATALYST_cmake.patch
new file mode 100644 (file)
index 0000000..7f79c1f
--- /dev/null
+++ b/products/patches/paraview.0010-ParaView_CATALYST_cmake.patch
@@ -0,0 +1,21 @@
+diff -Naur ParaView-5.9.0_ref/ThirdParty/catalyst/vtkcatalyst/catalyst/cmake/catalyst-config.cmake.in ParaView-5.9.0/ThirdParty/catalyst/vtkcatalyst/catalyst/cmake/catalyst-config.cmake.in
+--- ParaView-5.9.0_ref/ThirdParty/catalyst/vtkcatalyst/catalyst/cmake/catalyst-config.cmake.in 2021-02-04 15:22:02.000000000 +0100
++++ ParaView-5.9.0/ThirdParty/catalyst/vtkcatalyst/catalyst/cmake/catalyst-config.cmake.in     2021-03-01 15:51:58.110940810 +0100
+@@ -1,6 +1,6 @@
+ # Catalyst Package config file.
+ cmake_policy(PUSH)
+-cmake_policy(VERSION 3.13)
++cmake_policy(VERSION 3.12)
+ 
+ set(CATALYST_VERSION "@CATALYST_VERSION@")
+ set(CATALYST_ABI_VERSION "@CATALYST_ABI_VERSION@")
+
+diff -Naur ParaView-5.9.0_ref/ThirdParty/catalyst/vtkcatalyst/catalyst/CMakeLists.txt ParaView-5.9.0/ThirdParty/catalyst/vtkcatalyst/catalyst/CMakeLists.txt
+--- ParaView-5.9.0_ref/ThirdParty/catalyst/vtkcatalyst/catalyst/CMakeLists.txt 2021-02-04 15:22:02.000000000 +0100
++++ ParaView-5.9.0/ThirdParty/catalyst/vtkcatalyst/catalyst/CMakeLists.txt     2021-03-01 15:56:02.640910857 +0100
+@@ -1,4 +1,4 @@
+-cmake_minimum_required(VERSION 3.13...3.16 FATAL_ERROR)
++cmake_minimum_required(VERSION 3.12...3.16 FATAL_ERROR)
+ project(CATALYST VERSION 2.0 LANGUAGES C CXX)
+ 
+ #------------------------------------------------------------------------------

diff --git a/products/patches/paraview.0010-ParaView_windows_catalyst_cmake.patch b/products/patches/paraview.0010-ParaView_windows_catalyst_cmake.patch
deleted file mode 100644 (file)
index 4db1c33..0000000
--- a/products/patches/paraview.0010-ParaView_windows_catalyst_cmake.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff -Naur ParaView-5.9.0_SRC_orig/ThirdParty/catalyst/vtkcatalyst/catalyst/cmake/catalyst-macros.cmake ParaView-5.9.0_SRC_modif/ThirdParty/catalyst/vtkcatalyst/catalyst/cmake/catalyst-macros.cmake
---- ParaView-5.9.0_SRC_orig/ThirdParty/catalyst/vtkcatalyst/catalyst/cmake/catalyst-macros.cmake       2021-04-15 12:41:13.691878300 +0300
-+++ ParaView-5.9.0_SRC_modif/ThirdParty/catalyst/vtkcatalyst/catalyst/cmake/catalyst-macros.cmake      2021-04-15 12:50:29.348516100 +0300
-@@ -65,11 +65,20 @@
-   if (arg_INSTALL_EXPORT_DEFAULT)
-     set (_exports EXPORT Catalyst)
-   endif()
--  if (arg_LIBRARY_DESTINATION)
--    install(
--      TARGETS ${arg_TARGET}
--      ${_exports}
--      LIBRARY DESTINATION ${arg_LIBRARY_DESTINATION})
-+  if(WIN32)
-+    if (arg_LIBRARY_DESTINATION)
-+      install(
-+        TARGETS ${arg_TARGET}
-+        ${_exports}
-+        RUNTIME DESTINATION ${arg_LIBRARY_DESTINATION})
-+    endif()
-+  else()
-+    if (arg_LIBRARY_DESTINATION)
-+      install(
-+        TARGETS ${arg_TARGET}
-+        ${_exports}
-+        LIBRARY DESTINATION ${arg_LIBRARY_DESTINATION})
-+    endif()
-   endif()
- endfunction()
- 

diff --git a/products/patches/paraview.0011-ParaView_protobuf_crash.patch b/products/patches/paraview.0011-ParaView_protobuf_crash.patch
new file mode 100644 (file)
index 0000000..a9623e9
--- /dev/null
+++ b/products/patches/paraview.0011-ParaView_protobuf_crash.patch
@@ -0,0 +1,14 @@
+diff -Naur ParaView-5.9.0_SRC_orig/Remoting/Application/vtkInitializationHelper.cxx ParaView-5.9.0_SRC_modif/Remoting/Application/vtkInitializationHelper.cxx
+index e171735139..47784ec70e 100644
+--- ParaView-5.9.0_SRC_orig/Remoting/Application/vtkInitializationHelper.cxx
++++ ParaView-5.9.0_SRC_modif/Remoting/Application/vtkInitializationHelper.cxx
+@@ -300,7 +300,7 @@ void vtkInitializationHelper::Finalize()
+   vtkProcessModule::Finalize();
+ 
+   // Optional:  Delete all global objects allocated by libprotobuf.
+-  google::protobuf::ShutdownProtobufLibrary();
++  //google::protobuf::ShutdownProtobufLibrary();
+ }
+ 
+ //----------------------------------------------------------------------------
+

diff --git a/products/patches/paraview.0017-ParaView_protobuf_crash.patch b/products/patches/paraview.0017-ParaView_protobuf_crash.patch
deleted file mode 100644 (file)
index a9623e9..0000000
--- a/products/patches/paraview.0017-ParaView_protobuf_crash.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -Naur ParaView-5.9.0_SRC_orig/Remoting/Application/vtkInitializationHelper.cxx ParaView-5.9.0_SRC_modif/Remoting/Application/vtkInitializationHelper.cxx
-index e171735139..47784ec70e 100644
---- ParaView-5.9.0_SRC_orig/Remoting/Application/vtkInitializationHelper.cxx
-+++ ParaView-5.9.0_SRC_modif/Remoting/Application/vtkInitializationHelper.cxx
-@@ -300,7 +300,7 @@ void vtkInitializationHelper::Finalize()
-   vtkProcessModule::Finalize();
- 
-   // Optional:  Delete all global objects allocated by libprotobuf.
--  google::protobuf::ShutdownProtobufLibrary();
-+  //google::protobuf::ShutdownProtobufLibrary();
- }
- 
- //----------------------------------------------------------------------------
-

diff --git a/products/patches/paraview.1001-ParaView_windows_catalyst_cmake.patch b/products/patches/paraview.1001-ParaView_windows_catalyst_cmake.patch
new file mode 100644 (file)
index 0000000..4db1c33
--- /dev/null
+++ b/products/patches/paraview.1001-ParaView_windows_catalyst_cmake.patch
@@ -0,0 +1,29 @@
+diff -Naur ParaView-5.9.0_SRC_orig/ThirdParty/catalyst/vtkcatalyst/catalyst/cmake/catalyst-macros.cmake ParaView-5.9.0_SRC_modif/ThirdParty/catalyst/vtkcatalyst/catalyst/cmake/catalyst-macros.cmake
+--- ParaView-5.9.0_SRC_orig/ThirdParty/catalyst/vtkcatalyst/catalyst/cmake/catalyst-macros.cmake       2021-04-15 12:41:13.691878300 +0300
++++ ParaView-5.9.0_SRC_modif/ThirdParty/catalyst/vtkcatalyst/catalyst/cmake/catalyst-macros.cmake      2021-04-15 12:50:29.348516100 +0300
+@@ -65,11 +65,20 @@
+   if (arg_INSTALL_EXPORT_DEFAULT)
+     set (_exports EXPORT Catalyst)
+   endif()
+-  if (arg_LIBRARY_DESTINATION)
+-    install(
+-      TARGETS ${arg_TARGET}
+-      ${_exports}
+-      LIBRARY DESTINATION ${arg_LIBRARY_DESTINATION})
++  if(WIN32)
++    if (arg_LIBRARY_DESTINATION)
++      install(
++        TARGETS ${arg_TARGET}
++        ${_exports}
++        RUNTIME DESTINATION ${arg_LIBRARY_DESTINATION})
++    endif()
++  else()
++    if (arg_LIBRARY_DESTINATION)
++      install(
++        TARGETS ${arg_TARGET}
++        ${_exports}
++        LIBRARY DESTINATION ${arg_LIBRARY_DESTINATION})
++    endif()
+   endif()
+ endfunction()
+