summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas K. Huettel <dilfridge@gentoo.org>2020-06-17 20:37:55 +0300
committerAndreas K. Huettel <dilfridge@gentoo.org>2020-06-17 20:38:34 +0300
commit0372a0298fcbfc357c7275b92bf773ce4d6ca0c2 (patch)
tree67b8e25146ed3041214f9fc439226f142ad32134 /sci-visualization
parentsci-visualization/gr: Hard-enable Qt5 and OpenGL, otherwise build fails (diff)
downloadgentoo-0372a0298fcbfc357c7275b92bf773ce4d6ca0c2.tar.gz
gentoo-0372a0298fcbfc357c7275b92bf773ce4d6ca0c2.tar.bz2
gentoo-0372a0298fcbfc357c7275b92bf773ce4d6ca0c2.zip
sci-visualization/gr: Add build fix for Qt 5.15.0
Closes: https://bugs.gentoo.org/726108 Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: Andreas K. Huettel <dilfridge@gentoo.org>
Diffstat (limited to 'sci-visualization')
-rw-r--r--sci-visualization/gr/files/gr-0.50.0-qt-5.15.patch21
-rw-r--r--sci-visualization/gr/gr-0.50.0-r1.ebuild4
2 files changed, 25 insertions, 0 deletions
diff --git a/sci-visualization/gr/files/gr-0.50.0-qt-5.15.patch b/sci-visualization/gr/files/gr-0.50.0-qt-5.15.patch
new file mode 100644
index 000000000000..800492350cc6
--- /dev/null
+++ b/sci-visualization/gr/files/gr-0.50.0-qt-5.15.patch
@@ -0,0 +1,21 @@
+From 20204e37d8411b19b69a7ee5c776035c07f7175d Mon Sep 17 00:00:00 2001
+From: Sutou Kouhei <kou@clear-code.com>
+Date: Sun, 31 May 2020 11:56:51 +0900
+Subject: [PATCH] Include QPainterPath explicitly for Qt 5.15.0
+
+---
+ lib/gks/plugin/qt5plugin.cxx | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/lib/gks/plugin/qt5plugin.cxx b/lib/gks/plugin/qt5plugin.cxx
+index de9cd3d2..301d7fb9 100644
+--- a/lib/gks/plugin/qt5plugin.cxx
++++ b/lib/gks/plugin/qt5plugin.cxx
+@@ -6,6 +6,7 @@
+
+ #include <QtWidgets/QWidget>
+ #include <QtGui/QPainter>
++#include <QtGui/QPainterPath>
+ #include <QtGui/QImage>
+ #include <QtGui/QGuiApplication>
+ #include <QtGui/QScreen>
diff --git a/sci-visualization/gr/gr-0.50.0-r1.ebuild b/sci-visualization/gr/gr-0.50.0-r1.ebuild
index 3a7bb7d68fbd..b15a75608877 100644
--- a/sci-visualization/gr/gr-0.50.0-r1.ebuild
+++ b/sci-visualization/gr/gr-0.50.0-r1.ebuild
@@ -33,6 +33,10 @@ DEPEND="
RDEPEND="${DEPEND}"
BDEPEND=""
+PATCHES=(
+ "${FILESDIR}/${P}-qt-5.15.patch"
+)
+
src_configure() {
use cairo || mycmakeargs+=( -DCAIRO_LIBRARY= )
use postscript || mycmakeargs+=( -DGS_LIBRARY= )