commit:     47968ab348d8360284aa5351502d61a39f1cd4d8
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 10 19:48:29 2024 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Nov 22 19:08:16 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=47968ab3

dev-qt/qtlocation: Re-apply >=dev-libs/icu-75 buildfix

Bumping to MAPBOXGL_COMMIT=35d566724c48180c9a372c2ed50a253871a51574
that was already part of 5.15.14-r1.

Closes: https://bugs.gentoo.org/944408
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 dev-qt/qtlocation/qtlocation-5.15.16-r1.ebuild | 59 ++++++++++++++++++++++++++
 1 file changed, 59 insertions(+)

diff --git a/dev-qt/qtlocation/qtlocation-5.15.16-r1.ebuild 
b/dev-qt/qtlocation/qtlocation-5.15.16-r1.ebuild
new file mode 100644
index 000000000000..3a3718d72c58
--- /dev/null
+++ b/dev-qt/qtlocation/qtlocation-5.15.16-r1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PATCHSET="${PN}-5.15.11-patchset"
+inherit qt5-build
+
+DESCRIPTION="Location (places, maps, navigation) library for the Qt5 framework"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+       MAPBOXGL_COMMIT=35d566724c48180c9a372c2ed50a253871a51574
+       SRC_URI+=" 
https://invent.kde.org/qt/qt/${PN}-mapboxgl/-/archive/${MAPBOXGL_COMMIT}/${PN}-mapboxgl-${MAPBOXGL_COMMIT}.tar.gz
 -> ${PN}-mapboxgl-${PV}-${MAPBOXGL_COMMIT:0:8}.tar.gz
+       https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}.tar.xz";
+       KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+fi
+
+RDEPEND="
+       dev-libs/icu:=
+       =dev-qt/qtcore-${QT5_PV}*
+       =dev-qt/qtdeclarative-${QT5_PV}*
+       =dev-qt/qtgui-${QT5_PV}*
+       =dev-qt/qtnetwork-${QT5_PV}*
+       =dev-qt/qtpositioning-${QT5_PV}*[qml]
+       =dev-qt/qtsql-${QT5_PV}*
+       sys-libs/zlib
+"
+DEPEND="${RDEPEND}
+       =dev-qt/qtconcurrent-${QT5_PV}*
+"
+
+QT5_TARGET_SUBDIRS=(
+       src/3rdparty/clipper
+       src/3rdparty/poly2tri
+       src/3rdparty/clip2tri
+       src/3rdparty/mapbox-gl-native
+       src/location
+       src/imports/location
+       src/imports/locationlabs
+       src/plugins/geoservices
+)
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+
+PATCHES=( "${WORKDIR}/${PATCHSET}" )
+
+src_prepare() {
+       rm -rf src/3rdparty/mapbox-gl-native/* || die
+       mv "${WORKDIR}"/${PN}-mapboxgl-${MAPBOXGL_COMMIT}/* 
src/3rdparty/mapbox-gl-native || die
+       qt5-build_src_prepare
+}
+fi
+
+src_configure() {
+       # src/plugins/geoservices requires files that are only generated when
+       # qmake is run in the root directory. Bug 633776.
+       qt5_configure_oos_quirk qtlocation-config.pri src/location
+       qt5-build_src_configure
+}

Reply via email to