diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2018-11-03 08:36:22 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2018-11-03 08:36:22 +0000 |
| commit | f65628136faa35d0c4d3b5e7332275c7b35fcd96 (patch) | |
| tree | 021998302365c5652e37824b6c26d4d969a62055 /sci-geosciences/qgis/files | |
| parent | 70b82ae359a5538711e103b0e8dfb92654296644 (diff) | |
gentoo resync : 03.11.2018
Diffstat (limited to 'sci-geosciences/qgis/files')
| -rw-r--r-- | sci-geosciences/qgis/files/qgis-3.0.0-featuresummary.patch | 23 | ||||
| -rw-r--r-- | sci-geosciences/qgis/files/qgis-3.0.3-qt-5.11.0.patch | 38 |
2 files changed, 9 insertions, 52 deletions
diff --git a/sci-geosciences/qgis/files/qgis-3.0.0-featuresummary.patch b/sci-geosciences/qgis/files/qgis-3.0.0-featuresummary.patch index 8787dc09196d..8b841a39b50f 100644 --- a/sci-geosciences/qgis/files/qgis-3.0.0-featuresummary.patch +++ b/sci-geosciences/qgis/files/qgis-3.0.0-featuresummary.patch @@ -7,25 +7,20 @@ Subject: [PATCH 1/2] Use FeatureSummary CMakeLists.txt | 4 ++++ 1 file changed, 4 insertions(+) -diff --git a/CMakeLists.txt b/CMakeLists.txt -index ed0a84013a..26f4659f61 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -28,6 +28,8 @@ SET(CMAKE_COLOR_MAKEFILE ON) - # set path to additional CMake modules - SET(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake ${CMAKE_MODULE_PATH}) +--- a/CMakeLists.txt 2018-10-27 17:19:26.188192919 +0200 ++++ b/CMakeLists.txt 2018-10-27 17:19:13.915507445 +0200 +@@ -68,6 +68,8 @@ + endif(USE_CCACHE) + endif(NOT MSVC) +include(FeatureSummary) + # in generated makefiles use relative paths so the project dir is moveable # Note commented out since it cause problems but it would be nice to resolve these and enable # -@@ -908,3 +910,5 @@ ENDIF(WIN32 AND NOT UNIX) - SET(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_SOURCE_DIR}/README.md") - INCLUDE(CPack) - ENDIF (WITH_CORE) +@@ -935,3 +937,5 @@ + IF (CMAKE_SYSTEM_NAME STREQUAL "Linux") + ADD_SUBDIRECTORY(linux) + ENDIF (CMAKE_SYSTEM_NAME STREQUAL "Linux") + +FEATURE_SUMMARY(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES) --- -2.12.2 - 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 deleted file mode 100644 index abda33b2dd28..000000000000 --- a/sci-geosciences/qgis/files/qgis-3.0.3-qt-5.11.0.patch +++ /dev/null @@ -1,38 +0,0 @@ -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 - |