diff options
Diffstat (limited to 'math/vtk8/files')
8 files changed, 0 insertions, 150 deletions
diff --git a/math/vtk8/files/patch-GUISupport_Qt_CMakeLists.txt b/math/vtk8/files/patch-GUISupport_Qt_CMakeLists.txt deleted file mode 100644 index 43e82e2f9310..000000000000 --- a/math/vtk8/files/patch-GUISupport_Qt_CMakeLists.txt +++ /dev/null @@ -1,28 +0,0 @@ ---- GUISupport/Qt/CMakeLists.txt.orig 2019-01-30 17:15:13 UTC -+++ GUISupport/Qt/CMakeLists.txt -@@ -128,21 +128,21 @@ if(VTK_BUILD_QT_DESIGNER_PLUGIN AND add_qvtkwidget) - find_package(Qt5 COMPONENTS ${qt_component} REQUIRED QUIET) - add_definitions(${Qt5${qt_component}_DEFINITIONS}) - include_directories(${Qt5${qt_component}_INCLUDE_DIRS}) -- qt5_wrap_cpp(PluginMocSrcs ${PluginMocHeaders} TARGET QVTKWidgetPlugin) -+ qt5_wrap_cpp(PluginMocSrcs ${PluginMocHeaders} TARGET QVTKWidgetPlugin-${VTK_MAJOR_VERSION}.${VTK_MINOR_VERSION}) - set(QT_LIBRARIES Qt5::${qt_component}) - - # add QVTK plugin from sources - # stand-alone as it doesn't depend on QVTK library -- add_library(QVTKWidgetPlugin -+ add_library(QVTKWidgetPlugin-${VTK_MAJOR_VERSION}.${VTK_MINOR_VERSION} - SHARED - ${PluginLibSrcs} - ${PluginMocSrcs} - ) - -- set_target_properties(QVTKWidgetPlugin PROPERTIES COMPILE_DEFINITIONS QT_NO_DEBUG) -+ set_target_properties(QVTKWidgetPlugin-${VTK_MAJOR_VERSION}.${VTK_MINOR_VERSION} PROPERTIES COMPILE_DEFINITIONS QT_NO_DEBUG) - - # link with Qt libs -- vtk_module_link_libraries(QVTKWidgetPlugin ${QT_LIBRARIES}) -+ vtk_module_link_libraries(QVTKWidgetPlugin-${VTK_MAJOR_VERSION}.${VTK_MINOR_VERSION} ${QT_LIBRARIES}) - - # install rules - diff --git a/math/vtk8/files/patch-GUISupport_Qt_PluginInstall.cmake.in b/math/vtk8/files/patch-GUISupport_Qt_PluginInstall.cmake.in deleted file mode 100644 index 19c95db7c524..000000000000 --- a/math/vtk8/files/patch-GUISupport_Qt_PluginInstall.cmake.in +++ /dev/null @@ -1,11 +0,0 @@ ---- GUISupport/Qt/PluginInstall.cmake.in.orig 2017-11-21 08:23:50 UTC -+++ GUISupport/Qt/PluginInstall.cmake.in -@@ -10,7 +10,7 @@ if (WIN32) - set(BUILDTYPE_SUFFIX @CMAKE_RELEASE_POSTFIX@) - endif () - endif () --set(VTK_INSTALL_QT_PLUGIN_FILE "@CMAKE_SHARED_LIBRARY_PREFIX@QVTKWidgetPlugin${BUILDTYPE_SUFFIX}@CMAKE_SHARED_LIBRARY_SUFFIX@") -+set(VTK_INSTALL_QT_PLUGIN_FILE "@CMAKE_SHARED_LIBRARY_PREFIX@QVTKWidgetPlugin-@VTK_MAJOR_VERSION@.@VTK_MINOR_VERSION@${BUILDTYPE_SUFFIX}@CMAKE_SHARED_LIBRARY_SUFFIX@") - set(VTK_CONFIGURATIONS "@CMAKE_CONFIGURATION_TYPES@") - - if(VTK_CONFIGURATIONS) diff --git a/math/vtk8/files/patch-Rendering_FreeType_vtkFreeTypeTools.cxx b/math/vtk8/files/patch-Rendering_FreeType_vtkFreeTypeTools.cxx deleted file mode 100644 index e3d29d4d7deb..000000000000 --- a/math/vtk8/files/patch-Rendering_FreeType_vtkFreeTypeTools.cxx +++ /dev/null @@ -1,11 +0,0 @@ ---- Rendering/FreeType/vtkFreeTypeTools.cxx.orig 2020-10-22 10:20:24 UTC -+++ Rendering/FreeType/vtkFreeTypeTools.cxx -@@ -387,7 +387,7 @@ FTC_CMapCache* vtkFreeTypeTools::GetCMapCache() - } - - //---------------------------------------------------------------------------- --FT_CALLBACK_DEF(FT_Error) -+static FT_Error - vtkFreeTypeToolsFaceRequester(FTC_FaceID face_id, - FT_Library lib, - FT_Pointer request_data, diff --git a/math/vtk8/files/patch-Rendering_Qt_vtkQtLabelRenderStrategy.cxx b/math/vtk8/files/patch-Rendering_Qt_vtkQtLabelRenderStrategy.cxx deleted file mode 100644 index b733cfeee383..000000000000 --- a/math/vtk8/files/patch-Rendering_Qt_vtkQtLabelRenderStrategy.cxx +++ /dev/null @@ -1,10 +0,0 @@ ---- Rendering/Qt/vtkQtLabelRenderStrategy.cxx.orig 2020-05-28 17:13:13 UTC -+++ Rendering/Qt/vtkQtLabelRenderStrategy.cxx -@@ -41,6 +41,7 @@ - #include <QImage> - #include <QMap> - #include <QPainter> -+#include <QPainterPath> - #include <QPair> - #include <QPixmap> - #include <QTextDocument> diff --git a/math/vtk8/files/patch-Rendering_Qt_vtkQtStringToImage.cxx b/math/vtk8/files/patch-Rendering_Qt_vtkQtStringToImage.cxx deleted file mode 100644 index 299be5f51c46..000000000000 --- a/math/vtk8/files/patch-Rendering_Qt_vtkQtStringToImage.cxx +++ /dev/null @@ -1,10 +0,0 @@ ---- Rendering/Qt/vtkQtStringToImage.cxx.orig 2020-06-05 04:36:21 UTC -+++ Rendering/Qt/vtkQtStringToImage.cxx -@@ -31,6 +31,7 @@ - #include <QFontMetrics> - #include <QImage> - #include <QPainter> -+#include <QPainterPath> - #include <QPixmap> - #include <QTextDocument> - #include <QTextStream> diff --git a/math/vtk8/files/patch-ThirdParty_libproj_vtklibproj_src_pj__mutex.c b/math/vtk8/files/patch-ThirdParty_libproj_vtklibproj_src_pj__mutex.c deleted file mode 100644 index bd453a0dc9ca..000000000000 --- a/math/vtk8/files/patch-ThirdParty_libproj_vtklibproj_src_pj__mutex.c +++ /dev/null @@ -1,11 +0,0 @@ ---- ThirdParty/libproj/vtklibproj/src/pj_mutex.c.orig 2020-04-25 01:23:01 UTC -+++ ThirdParty/libproj/vtklibproj/src/pj_mutex.c -@@ -124,7 +124,7 @@ void pj_acquire_lock() - pthread_mutex_lock( &pj_precreated_lock); - - pthread_mutexattr_init(&mutex_attr); --#ifdef HAVE_PTHREAD_MUTEX_RECURSIVE -+#if defined(HAVE_PTHREAD_MUTEX_RECURSIVE) || defined(__FreeBSD__) - pthread_mutexattr_settype(&mutex_attr, PTHREAD_MUTEX_RECURSIVE); - #else - pthread_mutexattr_settype(&mutex_attr, PTHREAD_MUTEX_RECURSIVE_NP); diff --git a/math/vtk8/files/patch-ThirdParty_verdict_vtkverdict_CMakeLists.txt b/math/vtk8/files/patch-ThirdParty_verdict_vtkverdict_CMakeLists.txt deleted file mode 100644 index f7e860060a89..000000000000 --- a/math/vtk8/files/patch-ThirdParty_verdict_vtkverdict_CMakeLists.txt +++ /dev/null @@ -1,25 +0,0 @@ ---- ThirdParty/verdict/vtkverdict/CMakeLists.txt.orig 2019-01-30 17:15:13 UTC -+++ ThirdParty/verdict/vtkverdict/CMakeLists.txt -@@ -128,14 +128,14 @@ endif () - # Installation stuff - # - IF(NOT verdict_INSTALL_NO_DEVELOPMENT) -- install(FILES -- README -- Verdict.htm -- Verdict.doc -- verdict_test.cpp -- DESTINATION ${verdict_INSTALL_DOC_DIR}/verdict/${verdict_VERSION}/ -- COMPONENT Development -- ) -+# install(FILES -+# README -+# Verdict.htm -+# Verdict.doc -+# verdict_test.cpp -+# DESTINATION ${verdict_INSTALL_DOC_DIR}/verdict/${verdict_VERSION}/ -+# COMPONENT Development -+# ) - - install( - FILES ${verdict_BINARY_DIR}/verdict.h diff --git a/math/vtk8/files/patch-git_a9079bd b/math/vtk8/files/patch-git_a9079bd deleted file mode 100644 index 1248811772dd..000000000000 --- a/math/vtk8/files/patch-git_a9079bd +++ /dev/null @@ -1,44 +0,0 @@ -Obtained from: - https://gitlab.kitware.com/vtk/vtk/-/commit/a9079bdccbb2165583d6773a5ed848427e2a38a8.patch - -From a9079bdccbb2165583d6773a5ed848427e2a38a8 Mon Sep 17 00:00:00 2001 -From: Seacas Upstream <kwrobot@kitware.com> -Date: Tue, 28 Jan 2020 09:13:38 -0500 -Subject: [PATCH] exodusII 2020-01-28 (d97eb08d) - -Code extracted from: - - https://gitlab.kitware.com/third-party/seacas.git - -at commit d97eb08d79e87c82facfae39bc75deb60c0a2d83 (for/vtk-20200128-7.24f-v2019-12-18). ---- - src/ex_create_par.c | 2 +- - src/ex_open_par.c | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/ex_create_par.c b/src/ex_create_par.c -index 8d5d6734f0..ef439618da 100644 ---- ThirdParty/exodusII/vtkexodusII/src/ex_create_par.c -+++ ThirdParty/exodusII/vtkexodusII/src/ex_create_par.c -@@ -216,5 +216,5 @@ int ex_create_par_int(const char *path, int cmode, int *comp_ws, int *io_ws, MPI - * Prevent warning in some versions of ranlib(1) because the object - * file has no symbols. - */ --const char exodus_unused_symbol_dummy_1; -+const char exodus_unused_symbol_dummy_ex_create_par; - #endif -diff --git a/src/ex_open_par.c b/src/ex_open_par.c -index b2faa22c29..9df4818767 100644 ---- ThirdParty/exodusII/vtkexodusII/src/ex_open_par.c -+++ ThirdParty/exodusII/vtkexodusII/src/ex_open_par.c -@@ -459,5 +459,5 @@ int ex_open_par_int(const char *path, int mode, int *comp_ws, int *io_ws, float - * Prevent warning in some versions of ranlib(1) because the object - * file has no symbols. - */ --const char exodus_unused_symbol_dummy_1; -+const char exodus_unused_symbol_dummy_ex_open_par; - #endif --- -GitLab - - |