1 |
commit: cd51ce629612c468a58d64303e6ec94d6e9c0e56 |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Jul 15 08:54:42 2018 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Jul 15 16:08:54 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cd51ce62 |
7 |
|
8 |
sci-visualization/paraview: Fix build with Qt 5.11 |
9 |
|
10 |
Closes: https://bugs.gentoo.org/660798 |
11 |
Package-Manager: Portage-2.3.41, Repoman-2.3.9 |
12 |
|
13 |
.../paraview/files/paraview-5.5.2-qt-5.11.patch | 142 +++++++++++++++++++++ |
14 |
sci-visualization/paraview/paraview-5.5.2.ebuild | 1 + |
15 |
2 files changed, 143 insertions(+) |
16 |
|
17 |
diff --git a/sci-visualization/paraview/files/paraview-5.5.2-qt-5.11.patch b/sci-visualization/paraview/files/paraview-5.5.2-qt-5.11.patch |
18 |
new file mode 100644 |
19 |
index 00000000000..b4299d4ee37 |
20 |
--- /dev/null |
21 |
+++ b/sci-visualization/paraview/files/paraview-5.5.2-qt-5.11.patch |
22 |
@@ -0,0 +1,142 @@ |
23 |
+From 931c779dde8460fe32aa8a3d19956b175b96e4f9 Mon Sep 17 00:00:00 2001 |
24 |
+From: Robert O'Bara <bob.obara@×××××××.com> |
25 |
+Date: Thu, 24 May 2018 09:49:28 -0400 |
26 |
+Subject: [PATCH] ENH: Changes needed to support Qt 5.11 |
27 |
+ |
28 |
+Basically needed to add missing header files. |
29 |
+--- |
30 |
+ Plugins/SLACTools/pqSLACDataLoadManager.cxx | 1 + |
31 |
+ Qt/ApplicationComponents/pqColorMapEditor.cxx | 1 + |
32 |
+ Qt/ApplicationComponents/pqDoubleRangeSliderPropertyWidget.cxx | 1 + |
33 |
+ .../pqStandardViewFrameActionsImplementation.cxx | 1 + |
34 |
+ Qt/ApplicationComponents/pqTimeInspectorWidget.cxx | 1 + |
35 |
+ .../pqTransferFunctionWidgetPropertyDialog.cxx | 2 ++ |
36 |
+ Qt/ApplicationComponents/pqViewResolutionPropertyWidget.cxx | 1 + |
37 |
+ Qt/Components/pqChangeInputDialog.cxx | 1 + |
38 |
+ Qt/Components/pqCinemaTrackSelection.cxx | 1 + |
39 |
+ Qt/Python/pqPythonShell.cxx | 1 + |
40 |
+ 10 files changed, 11 insertions(+) |
41 |
+ |
42 |
+diff --git a/Plugins/SLACTools/pqSLACDataLoadManager.cxx b/Plugins/SLACTools/pqSLACDataLoadManager.cxx |
43 |
+index 3ba019c26b..ce38396f68 100644 |
44 |
+--- a/Plugins/SLACTools/pqSLACDataLoadManager.cxx |
45 |
++++ b/Plugins/SLACTools/pqSLACDataLoadManager.cxx |
46 |
+@@ -34,6 +34,7 @@ |
47 |
+ #include "vtkSMProperty.h" |
48 |
+ #include "vtkSMSourceProxy.h" |
49 |
+ |
50 |
++#include <QAction> |
51 |
+ #include <QPushButton> |
52 |
+ #include <QtDebug> |
53 |
+ |
54 |
+diff --git a/Qt/ApplicationComponents/pqColorMapEditor.cxx b/Qt/ApplicationComponents/pqColorMapEditor.cxx |
55 |
+index 0395185e0a..88b56745eb 100644 |
56 |
+--- a/Qt/ApplicationComponents/pqColorMapEditor.cxx |
57 |
++++ b/Qt/ApplicationComponents/pqColorMapEditor.cxx |
58 |
+@@ -59,6 +59,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
59 |
+ #include <QDebug> |
60 |
+ #include <QKeyEvent> |
61 |
+ #include <QPointer> |
62 |
++#include <QStyle> |
63 |
+ #include <QVBoxLayout> |
64 |
+ |
65 |
+ class pqColorMapEditor::pqInternals |
66 |
+diff --git a/Qt/ApplicationComponents/pqDoubleRangeSliderPropertyWidget.cxx b/Qt/ApplicationComponents/pqDoubleRangeSliderPropertyWidget.cxx |
67 |
+index 908e4598e0..820361a2b3 100644 |
68 |
+--- a/Qt/ApplicationComponents/pqDoubleRangeSliderPropertyWidget.cxx |
69 |
++++ b/Qt/ApplicationComponents/pqDoubleRangeSliderPropertyWidget.cxx |
70 |
+@@ -43,6 +43,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
71 |
+ #include "vtkSMUncheckedPropertyHelper.h" |
72 |
+ |
73 |
+ #include <QGridLayout> |
74 |
++#include <QStyle> |
75 |
+ |
76 |
+ class pqDoubleRangeSliderPropertyWidget::pqInternals |
77 |
+ { |
78 |
+diff --git a/Qt/ApplicationComponents/pqStandardViewFrameActionsImplementation.cxx b/Qt/ApplicationComponents/pqStandardViewFrameActionsImplementation.cxx |
79 |
+index c297dc3d9e..501633f63a 100644 |
80 |
+--- a/Qt/ApplicationComponents/pqStandardViewFrameActionsImplementation.cxx |
81 |
++++ b/Qt/ApplicationComponents/pqStandardViewFrameActionsImplementation.cxx |
82 |
+@@ -69,6 +69,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
83 |
+ #include <QPushButton> |
84 |
+ #include <QSet> |
85 |
+ #include <QShortcut> |
86 |
++#include <QStyle> |
87 |
+ |
88 |
+ //----------------------------------------------------------------------------- |
89 |
+ pqStandardViewFrameActionsImplementation::pqStandardViewFrameActionsImplementation( |
90 |
+diff --git a/Qt/ApplicationComponents/pqTimeInspectorWidget.cxx b/Qt/ApplicationComponents/pqTimeInspectorWidget.cxx |
91 |
+index 6774c2e48e..e85e614f04 100644 |
92 |
+--- a/Qt/ApplicationComponents/pqTimeInspectorWidget.cxx |
93 |
++++ b/Qt/ApplicationComponents/pqTimeInspectorWidget.cxx |
94 |
+@@ -49,6 +49,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
95 |
+ #include "vtkSMPropertyHelper.h" |
96 |
+ #include "vtkSMSourceProxy.h" |
97 |
+ |
98 |
++#include <QHeaderView> |
99 |
+ #include <QLineF> |
100 |
+ #include <QPainter> |
101 |
+ #include <QVariant> |
102 |
+diff --git a/Qt/ApplicationComponents/pqTransferFunctionWidgetPropertyDialog.cxx b/Qt/ApplicationComponents/pqTransferFunctionWidgetPropertyDialog.cxx |
103 |
+index 55d3146447..93cd995d92 100644 |
104 |
+--- a/Qt/ApplicationComponents/pqTransferFunctionWidgetPropertyDialog.cxx |
105 |
++++ b/Qt/ApplicationComponents/pqTransferFunctionWidgetPropertyDialog.cxx |
106 |
+@@ -36,6 +36,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
107 |
+ #include "vtkPiecewiseFunction.h" |
108 |
+ #include <QString> |
109 |
+ |
110 |
++#include <QDoubleValidator> |
111 |
++ |
112 |
+ class pqTransferFunctionWidgetPropertyDialog::pqInternals |
113 |
+ { |
114 |
+ public: |
115 |
+diff --git a/Qt/ApplicationComponents/pqViewResolutionPropertyWidget.cxx b/Qt/ApplicationComponents/pqViewResolutionPropertyWidget.cxx |
116 |
+index 6d2865431e..8d2c4b61cd 100644 |
117 |
+--- a/Qt/ApplicationComponents/pqViewResolutionPropertyWidget.cxx |
118 |
++++ b/Qt/ApplicationComponents/pqViewResolutionPropertyWidget.cxx |
119 |
+@@ -39,6 +39,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
120 |
+ #include "vtkSMProxy.h" |
121 |
+ |
122 |
+ #include <QIntValidator> |
123 |
++#include <QStyle> |
124 |
+ |
125 |
+ class pqViewResolutionPropertyWidget::pqInternals |
126 |
+ { |
127 |
+diff --git a/Qt/Components/pqChangeInputDialog.cxx b/Qt/Components/pqChangeInputDialog.cxx |
128 |
+index 8a67b10095..86db3de01c 100644 |
129 |
+--- a/Qt/Components/pqChangeInputDialog.cxx |
130 |
++++ b/Qt/Components/pqChangeInputDialog.cxx |
131 |
+@@ -45,6 +45,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
132 |
+ #include "vtkSMProxy.h" |
133 |
+ #include "vtkSmartPointer.h" |
134 |
+ |
135 |
++#include <QHeaderView> |
136 |
+ #include <QItemSelectionModel> |
137 |
+ #include <QLineEdit> |
138 |
+ #include <QRadioButton> |
139 |
+diff --git a/Qt/Components/pqCinemaTrackSelection.cxx b/Qt/Components/pqCinemaTrackSelection.cxx |
140 |
+index 3d6d9dde19..eea2e37680 100644 |
141 |
+--- a/Qt/Components/pqCinemaTrackSelection.cxx |
142 |
++++ b/Qt/Components/pqCinemaTrackSelection.cxx |
143 |
+@@ -30,6 +30,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
144 |
+ |
145 |
+ ========================================================================*/ |
146 |
+ #include <QDebug> |
147 |
++#include <QHeaderView> |
148 |
+ |
149 |
+ #include "vtkPVArrayInformation.h" |
150 |
+ #include "vtkPVDataInformation.h" |
151 |
+diff --git a/Qt/Python/pqPythonShell.cxx b/Qt/Python/pqPythonShell.cxx |
152 |
+index 3d01fd0a96..bc1a014936 100644 |
153 |
+--- a/Qt/Python/pqPythonShell.cxx |
154 |
++++ b/Qt/Python/pqPythonShell.cxx |
155 |
+@@ -52,6 +52,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
156 |
+ #include "vtkStringOutputWindow.h" |
157 |
+ #include "vtkWeakPointer.h" |
158 |
+ |
159 |
++#include <QAbstractItemView> |
160 |
+ #include <QApplication> |
161 |
+ #include <QCursor> |
162 |
+ #include <QFile> |
163 |
+-- |
164 |
+2.17.1 |
165 |
|
166 |
diff --git a/sci-visualization/paraview/paraview-5.5.2.ebuild b/sci-visualization/paraview/paraview-5.5.2.ebuild |
167 |
index b34d4ec9805..01c949e0ed1 100644 |
168 |
--- a/sci-visualization/paraview/paraview-5.5.2.ebuild |
169 |
+++ b/sci-visualization/paraview/paraview-5.5.2.ebuild |
170 |
@@ -99,6 +99,7 @@ PATCHES=( |
171 |
"${FILESDIR}"/${PN}-4.0.1-xdmf-cstring.patch |
172 |
"${FILESDIR}"/${PN}-5.3.0-fix_buildsystem.patch |
173 |
"${FILESDIR}"/${PN}-5.5.0-allow_custom_build_type.patch |
174 |
+ "${FILESDIR}"/${P}-qt-5.11.patch |
175 |
) |
176 |
|
177 |
pkg_pretend() { |