From 858f683062931d5e10da5e4ba517b4f420439377 Mon Sep 17 00:00:00 2001
From: Andreas Sturmlechner <asturm@gentoo.org>
Date: Wed, 18 Nov 2020 19:58:27 +0100
Subject: sci-geosciences/qgis: Fix 9999 patches

Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
---
 .../qgis/files/qgis-9999-default-qmldir.patch      | 25 +++++++++++++++++
 .../qgis/files/qgis-9999-featuresummary.patch      | 31 ++++++++++++++++++++++
 sci-geosciences/qgis/qgis-9999.ebuild              |  6 ++---
 3 files changed, 59 insertions(+), 3 deletions(-)
 create mode 100644 sci-geosciences/qgis/files/qgis-9999-default-qmldir.patch
 create mode 100644 sci-geosciences/qgis/files/qgis-9999-featuresummary.patch

(limited to 'sci-geosciences/qgis')

diff --git a/sci-geosciences/qgis/files/qgis-9999-default-qmldir.patch b/sci-geosciences/qgis/files/qgis-9999-default-qmldir.patch
new file mode 100644
index 000000000000..afcaa693cedf
--- /dev/null
+++ b/sci-geosciences/qgis/files/qgis-9999-default-qmldir.patch
@@ -0,0 +1,25 @@
+From 9d095f7d502cbcea8c70c127be322568b71f6663 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
+Date: Sun, 28 Apr 2019 12:41:51 +0200
+Subject: [PATCH] cmake: Fix DEFAULT_QML_DIR path to comply with LFS layout
+
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 4626042ca4..fe93ff3c4f 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -660,7 +660,7 @@ IF (WITH_CORE)
+       set (DEFAULT_LIBEXEC_SUBDIR lib${LIB_SUFFIX}/qgis)
+       set (DEFAULT_PLUGIN_SUBDIR  lib${LIB_SUFFIX}/qgis/plugins)
+       set (DEFAULT_INCLUDE_SUBDIR include/qgis)
+-      set (DEFAULT_QML_SUBDIR     qml)
++      set (DEFAULT_QML_SUBDIR     ${DEFAULT_DATA_SUBDIR}/qml)
+ 
+       set (DEFAULT_SERVER_MODULE_SUBDIR ${DEFAULT_LIBEXEC_SUBDIR}/server)
+     endif()
+-- 
+2.21.0
+
diff --git a/sci-geosciences/qgis/files/qgis-9999-featuresummary.patch b/sci-geosciences/qgis/files/qgis-9999-featuresummary.patch
new file mode 100644
index 000000000000..8fa7ab0e8428
--- /dev/null
+++ b/sci-geosciences/qgis/files/qgis-9999-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()
+ 
++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()
++
++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 f6b820db0fd1..3f589eac32d7 100644
--- a/sci-geosciences/qgis/qgis-9999.ebuild
+++ b/sci-geosciences/qgis/qgis-9999.ebuild
@@ -105,10 +105,10 @@ RESTRICT="test"
 
 PATCHES=(
 	# git master
-	"${FILESDIR}/${P}-cmake-lib-suffix.patch"
+	"${FILESDIR}/${PN}-3.16.0-cmake-lib-suffix.patch"
 	# TODO upstream
-	"${FILESDIR}/${PN}-3.4.7-featuresummary.patch"
-	"${FILESDIR}/${PN}-3.4.7-default-qmldir.patch"
+	"${FILESDIR}/${PN}-9999-featuresummary.patch"
+	"${FILESDIR}/${PN}-9999-default-qmldir.patch"
 )
 
 pkg_setup() {
-- 
cgit v1.2.3