summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2018-06-24 14:50:26 +0200
committerAndreas Sturmlechner <asturm@gentoo.org>2018-06-24 15:18:03 +0200
commit055505c2bc2b434bf5961a55dd979bf72731988b (patch)
tree485feb13e2ca60484671725ca0bb7e8e5eeed935 /sci-geosciences
parentsci-geosciences/qgis: Add USE=qml (diff)
downloadgentoo-055505c2bc2b434bf5961a55dd979bf72731988b.tar.gz
gentoo-055505c2bc2b434bf5961a55dd979bf72731988b.tar.bz2
gentoo-055505c2bc2b434bf5961a55dd979bf72731988b.zip
sci-geosciences/qgis: Fix build with USE=grass w/ Qt-5.11.0
Package-Manager: Portage-2.3.40, Repoman-2.3.9
Diffstat (limited to 'sci-geosciences')
-rw-r--r--sci-geosciences/qgis/files/qgis-3.0.3-qt-5.11.0.patch38
-rw-r--r--sci-geosciences/qgis/qgis-3.0.3-r1.ebuild1
2 files changed, 39 insertions, 0 deletions
diff --git a/sci-geosciences/qgis/files/qgis-3.0.3-qt-5.11.0.patch b/sci-geosciences/qgis/files/qgis-3.0.3-qt-5.11.0.patch
new file mode 100644
index 000000000000..abda33b2dd28
--- /dev/null
+++ b/sci-geosciences/qgis/files/qgis-3.0.3-qt-5.11.0.patch
@@ -0,0 +1,38 @@
+From 83346e5ec77dc3474c01acd27d4a3e03690170b5 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
+Date: Sun, 24 Jun 2018 14:38:44 +0200
+Subject: [PATCH] Fix WITH_GRASS7 build with Qt-5.11.0 (missing headers)
+
+---
+ src/plugins/grass/qgsgrassmoduleinput.cpp | 1 +
+ src/plugins/grass/qgsgrassregion.cpp | 2 ++
+ 2 files changed, 3 insertions(+)
+
+diff --git a/src/plugins/grass/qgsgrassmoduleinput.cpp b/src/plugins/grass/qgsgrassmoduleinput.cpp
+index ebb8efd493..6968a34d8c 100644
+--- a/src/plugins/grass/qgsgrassmoduleinput.cpp
++++ b/src/plugins/grass/qgsgrassmoduleinput.cpp
+@@ -17,6 +17,7 @@
+ #include <QCompleter>
+ #include <QFileDialog>
+ #include <QFileInfo>
++#include <QHeaderView>
+ #include <QHBoxLayout>
+ #include <QIcon>
+ #include <QLatin1String>
+diff --git a/src/plugins/grass/qgsgrassregion.cpp b/src/plugins/grass/qgsgrassregion.cpp
+index 00928da4a7..b31f1b9ae9 100644
+--- a/src/plugins/grass/qgsgrassregion.cpp
++++ b/src/plugins/grass/qgsgrassregion.cpp
+@@ -27,6 +27,8 @@
+
+ #include <QButtonGroup>
+ #include <QColorDialog>
++#include <QDoubleValidator>
++#include <QIntValidator>
+ #include <QMessageBox>
+ #include <QMouseEvent>
+ #include <QRubberBand>
+--
+2.18.0
+
diff --git a/sci-geosciences/qgis/qgis-3.0.3-r1.ebuild b/sci-geosciences/qgis/qgis-3.0.3-r1.ebuild
index 2b4443c3425a..ff58cbbac4da 100644
--- a/sci-geosciences/qgis/qgis-3.0.3-r1.ebuild
+++ b/sci-geosciences/qgis/qgis-3.0.3-r1.ebuild
@@ -102,6 +102,7 @@ PATCHES=(
"${FILESDIR}/${PN}-2.18.12-cmake-lib-suffix.patch"
# TODO upstream
"${FILESDIR}/${PN}-3.0.0-featuresummary.patch"
+ "${FILESDIR}/${P}-qt-5.11.0.patch"
)
pkg_setup() {