commit: 6ab5a6ee741430214fd1f4137c90fbd6b915e522 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Mon Feb 11 16:23:47 2019 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Mon Feb 11 16:24:03 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ab5a6ee
sci-geosciences/qgis: Drop failing patch Not the most important thing to keep. Closes: https://bugs.gentoo.org/677732 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 | 26 ---------------------- sci-geosciences/qgis/qgis-9999.ebuild | 4 +--- 2 files changed, 1 insertion(+), 29 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 deleted file mode 100644 index 8b841a39b50..00000000000 --- a/sci-geosciences/qgis/files/qgis-3.0.0-featuresummary.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 70505aa1569c541dd252115848f46f91811955c0 Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner <[email protected]> -Date: Sun, 9 Apr 2017 20:21:28 +0200 -Subject: [PATCH 1/2] Use FeatureSummary - ---- - CMakeLists.txt | 4 ++++ - 1 file changed, 4 insertions(+) - ---- 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 - # -@@ -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) diff --git a/sci-geosciences/qgis/qgis-9999.ebuild b/sci-geosciences/qgis/qgis-9999.ebuild index afbd37bc704..9e1e9a34acb 100644 --- a/sci-geosciences/qgis/qgis-9999.ebuild +++ b/sci-geosciences/qgis/qgis-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -101,8 +101,6 @@ RESTRICT="test" PATCHES=( # git master "${FILESDIR}/${PN}-2.18.12-cmake-lib-suffix.patch" - # TODO upstream - "${FILESDIR}/${PN}-3.0.0-featuresummary.patch" ) pkg_setup() {
