[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/, sci-geosciences/qgis/files/

["Andreas Sturmlechner" <asturm@gentoo.org>]

commit:     ca2e91369b76276e44cfd8355f209f60f92ef580
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 20 19:28:48 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Nov 20 20:39:48 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ca2e9136

sci-geosciences/qgis: 3.16.1 version bump

Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 sci-geosciences/qgis/Manifest                           |  1 +
 ...lt-qmldir.patch => qgis-3.16.1-default-qmldir.patch} | 13 +++++++------
 ...resummary.patch => qgis-3.16.1-featuresummary.patch} | 17 +++++++++--------
 .../qgis/{qgis-9999.ebuild => qgis-3.16.1.ebuild}       |  7 ++++---
 sci-geosciences/qgis/qgis-9999.ebuild                   |  4 ++--
 5 files changed, 23 insertions(+), 19 deletions(-)

diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest
index 93502ed3377..d86c91000ad 100644
--- a/sci-geosciences/qgis/Manifest
+++ b/sci-geosciences/qgis/Manifest
@@ -1,2 +1,3 @@
 DIST qgis-3.16.0.tar.bz2 113238659 BLAKE2B 42bdf8d0d69b28c20aa0decd79883c3b83d2ff9aa9d7633866b6c7d624ad20cb602beeca0e22585077c3d0ceba791e51b81ba221bc305c9bd2ebff71a4ea4bd4 SHA512 c87959a6412f85b6e4d30d4677e0e0914fd9a1009348c8bfe6063d7e1a9416f0a33ae63ded15273d8edde26ae0e6c32ba4d62d83c33c2c6251c444360dc47d10
+DIST qgis-3.16.1.tar.bz2 113943328 BLAKE2B 0c0f9c0a038e87d7f16e66a00cd6844db27b9238ef4f42cf2504a5e498843d4f93bde42542cf7bedcc7f58303daa4fdc7d9cb9e1954958a0de29e294e502a461 SHA512 2df53731468b734c95ad32cd8ecc930dd113b1084c4d3971aba2aaf58b473dc8e0dd204d979b74ee79d443cd95e4f91c51d071eb645254142a76d7a4d0bc3dc8
 DIST qgis_sample_data-2.8.14.tar.gz 22119181 BLAKE2B 2d0565e91ec8119382bc9ab8e262dc04227fe8289146794891759ff5a32012245270614ba1119a6329fc45cf56852830c2079589309aa3467873f71f5c608eac SHA512 6b2653d5b57ffc2c2317639dac212429840984ac917ca3e452b39aabb99ea106d1a77c1c1dd967244ef16ede9deae751b170affdf08b72239eafed5b8977da3d

diff --git a/sci-geosciences/qgis/files/qgis-9999-default-qmldir.patch b/sci-geosciences/qgis/files/qgis-3.16.1-default-qmldir.patch
similarity index 68%
rename from sci-geosciences/qgis/files/qgis-9999-default-qmldir.patch
rename to sci-geosciences/qgis/files/qgis-3.16.1-default-qmldir.patch
index afcaa693ced..9a57d45984e 100644
--- a/sci-geosciences/qgis/files/qgis-9999-default-qmldir.patch
+++ b/sci-geosciences/qgis/files/qgis-3.16.1-default-qmldir.patch
@@ -1,17 +1,18 @@
-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
+From ad432e066fcc3d985fb5a451ad128cdf35c1dad9 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Fri, 20 Nov 2020 20:41:36 +0100
 Subject: [PATCH] cmake: Fix DEFAULT_QML_DIR path to comply with LFS layout
 
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
 ---
  CMakeLists.txt | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 4626042ca4..fe93ff3c4f 100644
+index 61b4c863d0..e7d0bdc8d3 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -660,7 +660,7 @@ IF (WITH_CORE)
+@@ -750,7 +750,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)
@@ -21,5 +22,5 @@ index 4626042ca4..fe93ff3c4f 100644
        set (DEFAULT_SERVER_MODULE_SUBDIR ${DEFAULT_LIBEXEC_SUBDIR}/server)
      endif()
 -- 
-2.21.0
+2.29.2
 

diff --git a/sci-geosciences/qgis/files/qgis-9999-featuresummary.patch b/sci-geosciences/qgis/files/qgis-3.16.1-featuresummary.patch
similarity index 60%
rename from sci-geosciences/qgis/files/qgis-9999-featuresummary.patch
rename to sci-geosciences/qgis/files/qgis-3.16.1-featuresummary.patch
index 8fa7ab0e842..b1098175647 100644
--- a/sci-geosciences/qgis/files/qgis-9999-featuresummary.patch
+++ b/sci-geosciences/qgis/files/qgis-3.16.1-featuresummary.patch
@@ -1,18 +1,19 @@
-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
+From f0fd6e80ad034cf7c49f4ba3708819424b6857b2 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Fri, 20 Nov 2020 20:41:06 +0100
 Subject: [PATCH] cmake: Use FeatureSummary
 
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
 ---
  CMakeLists.txt | 4 ++++
  1 file changed, 4 insertions(+)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 4dff8ea0f4..4626042ca4 100644
+index f581b2c889..61b4c863d0 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -71,6 +71,8 @@ IF(NOT MSVC)
-   endif(USE_CCACHE)
+@@ -111,6 +111,8 @@ if (FORCE_STATIC_PROVIDERS)
+   set (HAVE_STATIC_PROVIDERS TRUE)
  endif()
  
 +include(FeatureSummary)
@@ -20,12 +21,12 @@ index 4dff8ea0f4..4626042ca4 100644
  # 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)
+@@ -1035,3 +1037,5 @@ endif()
  if (UNIX AND NOT APPLE)
    add_subdirectory(linux)
  endif()
 +
 +FEATURE_SUMMARY(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
 -- 
-2.21.0
+2.29.2
 

diff --git a/sci-geosciences/qgis/qgis-9999.ebuild b/sci-geosciences/qgis/qgis-3.16.1.ebuild
similarity index 95%
copy from sci-geosciences/qgis/qgis-9999.ebuild
copy to sci-geosciences/qgis/qgis-3.16.1.ebuild
index 3f589eac32d..54158d96a48 100644
--- a/sci-geosciences/qgis/qgis-9999.ebuild
+++ b/sci-geosciences/qgis/qgis-3.16.1.ebuild
@@ -107,8 +107,8 @@ PATCHES=(
 	# git master
 	"${FILESDIR}/${PN}-3.16.0-cmake-lib-suffix.patch"
 	# TODO upstream
-	"${FILESDIR}/${PN}-9999-featuresummary.patch"
-	"${FILESDIR}/${PN}-9999-default-qmldir.patch"
+	"${FILESDIR}/${P}-featuresummary.patch"
+	"${FILESDIR}/${P}-default-qmldir.patch"
 )
 
 pkg_setup() {
@@ -158,7 +158,8 @@ src_configure() {
 		)
 	fi
 
-	use python && mycmakeargs+=( -DBINDINGS_GLOBAL_INSTALL=ON )
+	use python && mycmakeargs+=( -DBINDINGS_GLOBAL_INSTALL=ON ) ||
+		mycmakeargs+=( -DWITH_QGIS_PROCESS=OFF ) # FIXME upstream issue #39973
 
 	# bugs 612956, 648726
 	addpredict /dev/dri/renderD128

diff --git a/sci-geosciences/qgis/qgis-9999.ebuild b/sci-geosciences/qgis/qgis-9999.ebuild
index 3f589eac32d..e895dc65581 100644
--- a/sci-geosciences/qgis/qgis-9999.ebuild
+++ b/sci-geosciences/qgis/qgis-9999.ebuild
@@ -107,8 +107,8 @@ PATCHES=(
 	# git master
 	"${FILESDIR}/${PN}-3.16.0-cmake-lib-suffix.patch"
 	# TODO upstream
-	"${FILESDIR}/${PN}-9999-featuresummary.patch"
-	"${FILESDIR}/${PN}-9999-default-qmldir.patch"
+	"${FILESDIR}/${PN}-3.16.1-featuresummary.patch"
+	"${FILESDIR}/${PN}-3.16.1-default-qmldir.patch"
 )
 
 pkg_setup() {