commit: 055505c2bc2b434bf5961a55dd979bf72731988b Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Sun Jun 24 12:50:26 2018 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Sun Jun 24 13:18:03 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=055505c2
sci-geosciences/qgis: Fix build with USE=grass w/ Qt-5.11.0 Package-Manager: Portage-2.3.40, Repoman-2.3.9 .../qgis/files/qgis-3.0.3-qt-5.11.0.patch | 38 ++++++++++++++++++++++ sci-geosciences/qgis/qgis-3.0.3-r1.ebuild | 1 + 2 files changed, 39 insertions(+) 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 00000000000..abda33b2dd2 --- /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 <[email protected]> +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 2b4443c3425..ff58cbbac4d 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() {
