diff options
| author |   Andreas Sturmlechner <asturm@gentoo.org> | 2020-06-06 10:41:08 +0200 |
|---|---|---|
| committer | Andreas Sturmlechner <asturm@gentoo.org> | 2020-06-06 11:41:50 +0200 |
| commit | 3ca9613d7ad604c93d714e29b116952561e4e41c (patch) | |
| tree | f561fae4b47aea7b9c7c9eae6ee20c046aed511c /sci-libs | |
| parent | sci-libs/vtk: Fix EAPI-7 bump and break up python_gen_cond_dep scope (diff) | |
| download | gentoo-3ca9613d7ad604c93d714e29b116952561e4e41c.tar.gz gentoo-3ca9613d7ad604c93d714e29b116952561e4e41c.tar.bz2 gentoo-3ca9613d7ad604c93d714e29b116952561e4e41c.zip | |
sci-libs/vtk: Fix build with Qt 5.15
Closes: https://bugs.gentoo.org/726960
Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'sci-libs')
| -rw-r--r-- | sci-libs/vtk/files/vtk-8.2.0-qt-5.15.patch | 37 | ||||
| -rw-r--r-- | sci-libs/vtk/vtk-8.2.0.ebuild | 1 |
2 files changed, 38 insertions, 0 deletions
diff --git a/sci-libs/vtk/files/vtk-8.2.0-qt-5.15.patch b/sci-libs/vtk/files/vtk-8.2.0-qt-5.15.patch new file mode 100644 index 000000000000..d5a02ca75929 --- /dev/null +++ b/sci-libs/vtk/files/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/Rendering/Qt/vtkQtLabelRenderStrategy.cxx b/Rendering/Qt/vtkQtLabelRenderStrategy.cxx +index afda585cca..eca65c64cd 100644 +--- a/Rendering/Qt/vtkQtLabelRenderStrategy.cxx ++++ b/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/Rendering/Qt/vtkQtStringToImage.cxx b/Rendering/Qt/vtkQtStringToImage.cxx +index 659c71570e..fbb9b78f05 100644 +--- a/Rendering/Qt/vtkQtStringToImage.cxx ++++ b/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-libs/vtk/vtk-8.2.0.ebuild b/sci-libs/vtk/vtk-8.2.0.ebuild index c9ab9cf4bdb1..1097c4df324f 100644 --- a/sci-libs/vtk/vtk-8.2.0.ebuild +++ b/sci-libs/vtk/vtk-8.2.0.ebuild @@ -125,6 +125,7 @@ S="${WORKDIR}"/VTK-${PV} PATCHES=( "${FILESDIR}"/${PN}-8.1.0-openmpi-4-compatibility.patch + "${FILESDIR}"/${P}-qt-5.15.patch # bug 726960 ) RESTRICT="test" |