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

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

commit:     5d8db0c6c8a1cc7556c66b3ade0bbf959ebe71b8
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 23 22:10:06 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Nov 23 22:10:06 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5d8db0c6

sci-geosciences/qgis: Fix Qt5LinguistTools detection (for lrelease)

Build system relied on lrelease available in PATH so far.

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

 .../files/qgis-3.16.1-find-qt5linguisttools.patch  | 27 ++++++++++++++++++++++
 sci-geosciences/qgis/qgis-3.16.1.ebuild            |  1 +
 2 files changed, 28 insertions(+)

diff --git a/sci-geosciences/qgis/files/qgis-3.16.1-find-qt5linguisttools.patch b/sci-geosciences/qgis/files/qgis-3.16.1-find-qt5linguisttools.patch
new file mode 100644
index 00000000000..01f60269439
--- /dev/null
+++ b/sci-geosciences/qgis/files/qgis-3.16.1-find-qt5linguisttools.patch
@@ -0,0 +1,27 @@
+From db2fee6c199a34507e5742b2360d594a5bf67b18 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Mon, 23 Nov 2020 22:04:50 +0100
+Subject: [PATCH] Fix Qt5LinguistTools detection/lrelease binary location
+
+Correctly find the Qt5 module that provides the path to Qt5-based lrelease.
+Available since >= Qt-5.3.1 which is well below the current minimum for QGIS.
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ i18n/CMakeLists.txt | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/i18n/CMakeLists.txt b/i18n/CMakeLists.txt
+index a836e5cae5..7d7f79da89 100644
+--- a/i18n/CMakeLists.txt
++++ b/i18n/CMakeLists.txt
+@@ -1,4 +1,5 @@
+-find_program(QT_LRELEASE_EXECUTABLE NAMES lrelease-qt5 lrelease)
++find_package(Qt5LinguistTools REQUIRED)
++set(QT_LRELEASE_EXECUTABLE Qt5::lrelease)
+ 
+ macro(ADD_TRANSLATION_FILES _sources )
+     foreach (_current_FILE ${ARGN})
+-- 
+2.29.2
+

diff --git a/sci-geosciences/qgis/qgis-3.16.1.ebuild b/sci-geosciences/qgis/qgis-3.16.1.ebuild
index 54158d96a48..2bc3ef993a9 100644
--- a/sci-geosciences/qgis/qgis-3.16.1.ebuild
+++ b/sci-geosciences/qgis/qgis-3.16.1.ebuild
@@ -109,6 +109,7 @@ PATCHES=(
 	# TODO upstream
 	"${FILESDIR}/${P}-featuresummary.patch"
 	"${FILESDIR}/${P}-default-qmldir.patch"
+	"${FILESDIR}/${P}-find-qt5linguisttools.patch"
 )
 
 pkg_setup() {