summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2017-03-30 22:47:00 +0200
committerAndreas Sturmlechner <asturm@gentoo.org>2017-04-09 22:42:09 +0200
commitdde563923f3bbc453abe5469af32cb712bd677ce (patch)
tree74801465dfd1d61a8d9fcf1aeadd691fee7caf56 /sci-geosciences/qgis/files
parentx11-libs/qwt: Drop 6.1.0 (diff)
downloadgentoo-dde563923f3bbc453abe5469af32cb712bd677ce.tar.gz
gentoo-dde563923f3bbc453abe5469af32cb712bd677ce.tar.bz2
gentoo-dde563923f3bbc453abe5469af32cb712bd677ce.zip
sci-geosciences/qgis: 2.18.6 version bump, Qt5 build
Gentoo-bug: 607044 Package-Manager: Portage-2.3.3, Repoman-2.3.1
Diffstat (limited to 'sci-geosciences/qgis/files')
-rw-r--r--sci-geosciences/qgis/files/qgis-2.18.6-featuresummary.patch31
1 files changed, 31 insertions, 0 deletions
diff --git a/sci-geosciences/qgis/files/qgis-2.18.6-featuresummary.patch b/sci-geosciences/qgis/files/qgis-2.18.6-featuresummary.patch
new file mode 100644
index 000000000000..0d4c99de9de0
--- /dev/null
+++ b/sci-geosciences/qgis/files/qgis-2.18.6-featuresummary.patch
@@ -0,0 +1,31 @@
+From 70505aa1569c541dd252115848f46f91811955c0 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
+Date: Sun, 9 Apr 2017 20:21:28 +0200
+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})
+
++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_EXECUTABLES "qgis" "QGIS")
+ SET(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_SOURCE_DIR}/README.md")
+ INCLUDE(CPack)
++
++FEATURE_SUMMARY(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
+--
+2.12.2
+