commit: 85129545ab1c57b74ed4a37c44e756c71755488e
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 27 15:52:58 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Oct 27 15:54:36 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=85129545
sci-geosciences/qgis: Fix patch
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
.../qgis/files/qgis-3.0.0-featuresummary.patch | 23 +++++++++-------------
1 file changed, 9 insertions(+), 14 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 8787dc09196..8b841a39b50 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
-
