diff options
| author |   Andreas Sturmlechner <asturm@gentoo.org> | 2019-04-28 00:21:16 +0200 |
|---|---|---|
| committer | Andreas Sturmlechner <asturm@gentoo.org> | 2019-04-28 17:26:43 +0200 |
| commit | 3df8529de826d43e13d5966131e3d918bc5604d0 (patch) | |
| tree | eac64f784e2375b5ec72cbc142f5f6ce6b4924a8 /sci-geosciences | |
| parent | sci-geosciences/qgis: Drop obsolete cmake hacks, fix icons install (diff) | |
| download | gentoo-3df8529de826d43e13d5966131e3d918bc5604d0.tar.gz gentoo-3df8529de826d43e13d5966131e3d918bc5604d0.tar.bz2 gentoo-3df8529de826d43e13d5966131e3d918bc5604d0.zip | |
sci-geosciences/qgis: Rebased FeatureSummary patch
Package-Manager: Portage-2.3.65, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'sci-geosciences')
| -rw-r--r-- | sci-geosciences/qgis/files/qgis-3.4.7-featuresummary.patch | 31 | ||||
| -rw-r--r-- | sci-geosciences/qgis/qgis-9999.ebuild | 2 |
2 files changed, 33 insertions, 0 deletions
diff --git a/sci-geosciences/qgis/files/qgis-3.4.7-featuresummary.patch b/sci-geosciences/qgis/files/qgis-3.4.7-featuresummary.patch new file mode 100644 index 000000000000..ec971cef7792 --- /dev/null +++ b/sci-geosciences/qgis/files/qgis-3.4.7-featuresummary.patch @@ -0,0 +1,31 @@ +From 0744b51784b779eab4bb2e78ed084d31258b5b4d Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com> +Date: Sun, 28 Apr 2019 00:10:21 +0200 +Subject: [PATCH] cmake: Use FeatureSummary + +--- + CMakeLists.txt | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 4dff8ea0f4..4626042ca4 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -71,6 +71,8 @@ IF(NOT MSVC) + 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 + # +@@ -937,3 +939,5 @@ ENDIF (WITH_CORE) + IF (UNIX AND NOT APPLE) + ADD_SUBDIRECTORY(linux) + ENDIF (UNIX AND NOT APPLE) ++ ++FEATURE_SUMMARY(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES) +-- +2.21.0 + diff --git a/sci-geosciences/qgis/qgis-9999.ebuild b/sci-geosciences/qgis/qgis-9999.ebuild index a1d962905d67..e52d6bd48024 100644 --- a/sci-geosciences/qgis/qgis-9999.ebuild +++ b/sci-geosciences/qgis/qgis-9999.ebuild @@ -102,6 +102,8 @@ RESTRICT="test" PATCHES=( # git master "${FILESDIR}/${PN}-2.18.12-cmake-lib-suffix.patch" + # TODO upstream + "${FILESDIR}/${PN}-3.4.7-featuresummary.patch" ) pkg_setup() { |