summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2020-07-02 01:37:15 +0200
committerAndreas Sturmlechner <asturm@gentoo.org>2020-07-02 02:03:09 +0200
commit27516179bd0c405eaea4c5d3c6df21414f183c5f (patch)
treea4e291e0b5756e64b7b7b7d5caf0b0d1357de1bf /sci-visualization
parentnet-firewall/fwknop: Drop python2-only module, cleanup .a (diff)
downloadgentoo-27516179bd0c405eaea4c5d3c6df21414f183c5f.tar.gz
gentoo-27516179bd0c405eaea4c5d3c6df21414f183c5f.tar.bz2
gentoo-27516179bd0c405eaea4c5d3c6df21414f183c5f.zip
sci-visualization/paraview: Fix build with Qt 5.15
Closes: https://bugs.gentoo.org/729348 Package-Manager: Portage-2.3.103, Repoman-2.3.23 Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'sci-visualization')
-rw-r--r--sci-visualization/paraview/files/paraview-5.8.0-w-vtk-8.2.0-qt-5.15.patch37
-rw-r--r--sci-visualization/paraview/paraview-5.8.0-r3.ebuild1
2 files changed, 38 insertions, 0 deletions
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
new file mode 100644
index 000000000000..1f76b84ac2d6
--- /dev/null
+++ b/sci-visualization/paraview/files/paraview-5.8.0-w-vtk-8.2.0-qt-5.15.patch
@@ -0,0 +1,37 @@
+From 797f28697d5ba50c1fa2bc5596af626a3c277826 Mon Sep 17 00:00:00 2001
+From: "Andrew J. P. Maclean" <andrew.amaclean@gmail.com>
+Date: Wed, 27 May 2020 15:27:15 +1000
+Subject: [PATCH] Qt 5.15 needs the include file QPainterPath
+
+---
+ Rendering/Qt/vtkQtLabelRenderStrategy.cxx | 1 +
+ Rendering/Qt/vtkQtStringToImage.cxx | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/VTK/Rendering/Qt/vtkQtLabelRenderStrategy.cxx b/VTK/Rendering/Qt/vtkQtLabelRenderStrategy.cxx
+index afda585cca..eca65c64cd 100644
+--- a/VTK/Rendering/Qt/vtkQtLabelRenderStrategy.cxx
++++ b/VTK/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/VTK/Rendering/Qt/vtkQtStringToImage.cxx b/VTK/Rendering/Qt/vtkQtStringToImage.cxx
+index 659c71570e..fbb9b78f05 100644
+--- a/VTK/Rendering/Qt/vtkQtStringToImage.cxx
++++ b/VTK/Rendering/Qt/vtkQtStringToImage.cxx
+@@ -30,6 +30,7 @@
+ #include <QFontMetrics>
+ #include <QImage>
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QPixmap>
+ #include <QString>
+ #include <QTextDocument>
+--
+2.26.2
+
diff --git a/sci-visualization/paraview/paraview-5.8.0-r3.ebuild b/sci-visualization/paraview/paraview-5.8.0-r3.ebuild
index fad68f534bdd..ed78dca47642 100644
--- a/sci-visualization/paraview/paraview-5.8.0-r3.ebuild
+++ b/sci-visualization/paraview/paraview-5.8.0-r3.ebuild
@@ -105,6 +105,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-4.0.1-xdmf-cstring.patch
"${FILESDIR}"/${PN}-5.3.0-fix_buildsystem.patch
"${FILESDIR}"/${PN}-5.5.0-allow_custom_build_type.patch
+ "${FILESDIR}"/${P}-w-vtk-8.2.0-qt-5.15.patch
)
CMAKE_MAKEFILE_GENERATOR="emake" #579474