| 1 |
commit: 85129545ab1c57b74ed4a37c44e756c71755488e |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Oct 27 15:52:58 2018 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Oct 27 15:54:36 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=85129545 |
| 7 |
|
| 8 |
sci-geosciences/qgis: Fix patch |
| 9 |
|
| 10 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
| 11 |
Package-Manager: Portage-2.3.51, Repoman-2.3.11 |
| 12 |
|
| 13 |
.../qgis/files/qgis-3.0.0-featuresummary.patch | 23 +++++++++------------- |
| 14 |
1 file changed, 9 insertions(+), 14 deletions(-) |
| 15 |
|
| 16 |
diff --git a/sci-geosciences/qgis/files/qgis-3.0.0-featuresummary.patch b/sci-geosciences/qgis/files/qgis-3.0.0-featuresummary.patch |
| 17 |
index 8787dc09196..8b841a39b50 100644 |
| 18 |
--- a/sci-geosciences/qgis/files/qgis-3.0.0-featuresummary.patch |
| 19 |
+++ b/sci-geosciences/qgis/files/qgis-3.0.0-featuresummary.patch |
| 20 |
@@ -7,25 +7,20 @@ Subject: [PATCH 1/2] Use FeatureSummary |
| 21 |
CMakeLists.txt | 4 ++++ |
| 22 |
1 file changed, 4 insertions(+) |
| 23 |
|
| 24 |
-diff --git a/CMakeLists.txt b/CMakeLists.txt |
| 25 |
-index ed0a84013a..26f4659f61 100644 |
| 26 |
---- a/CMakeLists.txt |
| 27 |
-+++ b/CMakeLists.txt |
| 28 |
-@@ -28,6 +28,8 @@ SET(CMAKE_COLOR_MAKEFILE ON) |
| 29 |
- # set path to additional CMake modules |
| 30 |
- SET(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake ${CMAKE_MODULE_PATH}) |
| 31 |
+--- a/CMakeLists.txt 2018-10-27 17:19:26.188192919 +0200 |
| 32 |
++++ b/CMakeLists.txt 2018-10-27 17:19:13.915507445 +0200 |
| 33 |
+@@ -68,6 +68,8 @@ |
| 34 |
+ endif(USE_CCACHE) |
| 35 |
+ endif(NOT MSVC) |
| 36 |
|
| 37 |
+include(FeatureSummary) |
| 38 |
+ |
| 39 |
# in generated makefiles use relative paths so the project dir is moveable |
| 40 |
# Note commented out since it cause problems but it would be nice to resolve these and enable |
| 41 |
# |
| 42 |
-@@ -908,3 +910,5 @@ ENDIF(WIN32 AND NOT UNIX) |
| 43 |
- SET(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_SOURCE_DIR}/README.md") |
| 44 |
- INCLUDE(CPack) |
| 45 |
- ENDIF (WITH_CORE) |
| 46 |
+@@ -935,3 +937,5 @@ |
| 47 |
+ IF (CMAKE_SYSTEM_NAME STREQUAL "Linux") |
| 48 |
+ ADD_SUBDIRECTORY(linux) |
| 49 |
+ ENDIF (CMAKE_SYSTEM_NAME STREQUAL "Linux") |
| 50 |
+ |
| 51 |
+FEATURE_SUMMARY(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES) |
| 52 |
--- |
| 53 |
-2.12.2 |
| 54 |
- |
Archives