1 |
commit: 3d2c9b890a5b03e535d6d0d8892519d6833b2e24 |
2 |
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at> |
3 |
AuthorDate: Tue Sep 21 17:03:05 2021 +0000 |
4 |
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Sep 21 18:25:54 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3d2c9b89 |
7 |
|
8 |
sci-visualization/paraview: remove unused patches |
9 |
|
10 |
Closes: https://github.com/gentoo/gentoo/pull/22358 |
11 |
Package-Manager: Portage-3.0.23, Repoman-3.0.3 |
12 |
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at> |
13 |
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org> |
14 |
|
15 |
.../files/paraview-5.3.0-fix_buildsystem.patch | 24 -------------- |
16 |
.../files/paraview-5.8.0-w-vtk-8.2.0-qt-5.15.patch | 37 --------------------- |
17 |
.../files/paraview-5.8.1-find-xmlpatterns.patch | 38 ---------------------- |
18 |
3 files changed, 99 deletions(-) |
19 |
|
20 |
diff --git a/sci-visualization/paraview/files/paraview-5.3.0-fix_buildsystem.patch b/sci-visualization/paraview/files/paraview-5.3.0-fix_buildsystem.patch |
21 |
deleted file mode 100644 |
22 |
index 600c7d43744..00000000000 |
23 |
--- a/sci-visualization/paraview/files/paraview-5.3.0-fix_buildsystem.patch |
24 |
+++ /dev/null |
25 |
@@ -1,24 +0,0 @@ |
26 |
-From dcc3d775bddc270aa1a4d06f85807979ab0c8358 Mon Sep 17 00:00:00 2001 |
27 |
-From: Matthias Maier <tamiko@××××××××××.org> |
28 |
-Date: Thu, 1 Jun 2017 02:27:16 -0500 |
29 |
-Subject: [PATCH] fix buildsystem |
30 |
- |
31 |
---- |
32 |
- VTK/Utilities/Doxygen/CMakeLists.txt | 3 --- |
33 |
- 1 file changed, 3 deletions(-) |
34 |
- |
35 |
-diff --git a/VTK/Utilities/Doxygen/CMakeLists.txt b/VTK/Utilities/Doxygen/CMakeLists.txt |
36 |
-index 3f285f6..7ebf3ee 100644 |
37 |
---- a/VTK/Utilities/Doxygen/CMakeLists.txt |
38 |
-+++ b/VTK/Utilities/Doxygen/CMakeLists.txt |
39 |
-@@ -80,7 +80,4 @@ if(NOT VTK_INSTALL_NO_DOCUMENTATION) |
40 |
- install(FILES doc_readme.txt |
41 |
- DESTINATION ${VTK_INSTALL_DOXYGEN_DIR} |
42 |
- COMPONENT Development) |
43 |
-- install(DIRECTORY ${VTK_BINARY_DIR}/Utilities/Doxygen/doc/html |
44 |
-- DESTINATION ${VTK_INSTALL_DOXYGEN_DIR} |
45 |
-- COMPONENT Development) |
46 |
- endif() |
47 |
--- |
48 |
-2.13.0 |
49 |
- |
50 |
|
51 |
diff --git a/sci-visualization/paraview/files/paraview-5.8.0-w-vtk-8.2.0-qt-5.15.patch b/sci-visualization/paraview/files/paraview-5.8.0-w-vtk-8.2.0-qt-5.15.patch |
52 |
deleted file mode 100644 |
53 |
index 1f76b84ac2d..00000000000 |
54 |
--- a/sci-visualization/paraview/files/paraview-5.8.0-w-vtk-8.2.0-qt-5.15.patch |
55 |
+++ /dev/null |
56 |
@@ -1,37 +0,0 @@ |
57 |
-From 797f28697d5ba50c1fa2bc5596af626a3c277826 Mon Sep 17 00:00:00 2001 |
58 |
-From: "Andrew J. P. Maclean" <andrew.amaclean@×××××.com> |
59 |
-Date: Wed, 27 May 2020 15:27:15 +1000 |
60 |
-Subject: [PATCH] Qt 5.15 needs the include file QPainterPath |
61 |
- |
62 |
---- |
63 |
- Rendering/Qt/vtkQtLabelRenderStrategy.cxx | 1 + |
64 |
- Rendering/Qt/vtkQtStringToImage.cxx | 1 + |
65 |
- 2 files changed, 2 insertions(+) |
66 |
- |
67 |
-diff --git a/VTK/Rendering/Qt/vtkQtLabelRenderStrategy.cxx b/VTK/Rendering/Qt/vtkQtLabelRenderStrategy.cxx |
68 |
-index afda585cca..eca65c64cd 100644 |
69 |
---- a/VTK/Rendering/Qt/vtkQtLabelRenderStrategy.cxx |
70 |
-+++ b/VTK/Rendering/Qt/vtkQtLabelRenderStrategy.cxx |
71 |
-@@ -41,6 +41,7 @@ |
72 |
- #include <QImage> |
73 |
- #include <QMap> |
74 |
- #include <QPainter> |
75 |
-+#include <QPainterPath> |
76 |
- #include <QPair> |
77 |
- #include <QPixmap> |
78 |
- #include <QTextDocument> |
79 |
-diff --git a/VTK/Rendering/Qt/vtkQtStringToImage.cxx b/VTK/Rendering/Qt/vtkQtStringToImage.cxx |
80 |
-index 659c71570e..fbb9b78f05 100644 |
81 |
---- a/VTK/Rendering/Qt/vtkQtStringToImage.cxx |
82 |
-+++ b/VTK/Rendering/Qt/vtkQtStringToImage.cxx |
83 |
-@@ -30,6 +30,7 @@ |
84 |
- #include <QFontMetrics> |
85 |
- #include <QImage> |
86 |
- #include <QPainter> |
87 |
-+#include <QPainterPath> |
88 |
- #include <QPixmap> |
89 |
- #include <QString> |
90 |
- #include <QTextDocument> |
91 |
--- |
92 |
-2.26.2 |
93 |
- |
94 |
|
95 |
diff --git a/sci-visualization/paraview/files/paraview-5.8.1-find-xmlpatterns.patch b/sci-visualization/paraview/files/paraview-5.8.1-find-xmlpatterns.patch |
96 |
deleted file mode 100644 |
97 |
index b02107bad7a..00000000000 |
98 |
--- a/sci-visualization/paraview/files/paraview-5.8.1-find-xmlpatterns.patch |
99 |
+++ /dev/null |
100 |
@@ -1,38 +0,0 @@ |
101 |
-From 7fe2ebc709ecb3e7f3b2aa6fc124dda0622541d4 Mon Sep 17 00:00:00 2001 |
102 |
-From: Andreas Sturmlechner <asturm@g.o> |
103 |
-Date: Wed, 25 Nov 2020 16:32:56 +0100 |
104 |
-Subject: [PATCH] Make qt_xmlpatterns_executable overridable |
105 |
- |
106 |
-So far this relies on fragile guessing of path or binary being in PATH. |
107 |
- |
108 |
-Signed-off-by: Andreas Sturmlechner <asturm@g.o> |
109 |
---- |
110 |
- CMake/ParaViewClient.cmake | 12 +++++++----- |
111 |
- 1 file changed, 7 insertions(+), 5 deletions(-) |
112 |
- |
113 |
-diff --git a/CMake/ParaViewClient.cmake b/CMake/ParaViewClient.cmake |
114 |
-index b0dea2b328..13b59cd744 100644 |
115 |
---- a/CMake/ParaViewClient.cmake |
116 |
-+++ b/CMake/ParaViewClient.cmake |
117 |
-@@ -512,11 +512,13 @@ function (paraview_client_documentation) |
118 |
- endif () |
119 |
- |
120 |
- include("${_ParaViewClient_cmake_dir}/paraview-find-package-helpers.cmake" OPTIONAL) |
121 |
-- find_program(qt_xmlpatterns_executable |
122 |
-- NAMES xmlpatterns-qt5 xmlpatterns |
123 |
-- HINTS "${Qt5_DIR}/../../../bin" |
124 |
-- "${Qt5_DIR}/../../../libexec/qt5/bin" |
125 |
-- DOC "Path to xmlpatterns") |
126 |
-+ if (NOT qt_xmlpatterns_executable) |
127 |
-+ find_program(qt_xmlpatterns_executable |
128 |
-+ NAMES xmlpatterns-qt5 xmlpatterns |
129 |
-+ HINTS "${Qt5_DIR}/../../../bin" |
130 |
-+ "${Qt5_DIR}/../../../libexec/qt5/bin" |
131 |
-+ DOC "Path to xmlpatterns") |
132 |
-+ endif () |
133 |
- mark_as_advanced(qt_xmlpatterns_executable) |
134 |
- |
135 |
- if (NOT qt_xmlpatterns_executable) |
136 |
--- |
137 |
-2.29.2 |
138 |
- |