From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id DCFC4158089 for ; Sat, 11 Nov 2023 20:00:48 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 092CC2BC02F; Sat, 11 Nov 2023 20:00:48 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id DD8532BC02F for ; Sat, 11 Nov 2023 20:00:47 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D52B2335D72 for ; Sat, 11 Nov 2023 20:00:46 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3B094D5E for ; Sat, 11 Nov 2023 20:00:45 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1699732217.b3168dc4daa93676caa1a84c07cbb4aa16a382e5.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtlocation/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-qt/qtlocation/Manifest dev-qt/qtlocation/qtlocation-5.15.11-r1.ebuild X-VCS-Directories: dev-qt/qtlocation/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: b3168dc4daa93676caa1a84c07cbb4aa16a382e5 X-VCS-Branch: master Date: Sat, 11 Nov 2023 20:00:45 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 84d18ab2-ca79-4867-be48-1ca7a707488d X-Archives-Hash: c1306f967f6edc639d44be9ed9b3d2d8 commit: b3168dc4daa93676caa1a84c07cbb4aa16a382e5 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Nov 11 16:26:52 2023 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Nov 11 19:50:17 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b3168dc4 dev-qt/qtlocation: Fix HereMap plugin not supporting auth via apiKey QTBUG: https://bugreports.qt.io/browse/QTBUG-118447 Signed-off-by: Andreas Sturmlechner gentoo.org> dev-qt/qtlocation/Manifest | 1 + dev-qt/qtlocation/qtlocation-5.15.11-r1.ebuild | 59 ++++++++++++++++++++++++++ 2 files changed, 60 insertions(+) diff --git a/dev-qt/qtlocation/Manifest b/dev-qt/qtlocation/Manifest index fe7340d4467d..15c5e2f5fd20 100644 --- a/dev-qt/qtlocation/Manifest +++ b/dev-qt/qtlocation/Manifest @@ -1,4 +1,5 @@ DIST qtlocation-5.15.11-fix-appendChildNode.patch.xz 536 BLAKE2B f20566fb1b28cbb6784a270e9687153166779fe70d048dc947a705bb77126c7420b6f714c3135770708a2a0e1b65da385ef3d893f94307f99fa3b39b8abb2b6e SHA512 3a72c142150f65630a209a6d5ca36f796eeb57addae390dc1ae87ecf9d27d07a3a8c799bc4729a3030680bf032a245622037bcba7abaceaf3d1b98091b1eb66b +DIST qtlocation-5.15.11-patchset.tar.xz 4796 BLAKE2B dcfa75bd3fb2e9069e1a530c27e2b4e9ac921fcf0ccb712f0894375b575ba25103948c6e5b85b56a8f9c9f2d7edf7df8e38501e93356e69f060b577a04c2d221 SHA512 14bd2864abc6f446dc4fbac03548cb42305685b46db757d856360780144095a021130bc0ebf1d07a516dc7991dc0cfbf733bd0ef6be58237bc15822c21af1d0b DIST qtlocation-everywhere-opensource-src-5.15.11.tar.xz 6554216 BLAKE2B e882ecdc4f565f48874371e5235dc96769fbded9446a2a7f1afd869217f4bc75a9f42c6c34627311b55fbfc60da9a95fc7472c3ced83fca722799497b437a9d9 SHA512 d439d03ff9044fc70165d1ceb5def9ec3290beec56b3e893409a24cd355651a4317e0eadff0266d38203ff84429a5fb8659a200f094669716579b6791a1a0f6d DIST qtlocation-everywhere-src-6.5.2.tar.xz 3032488 BLAKE2B c8cd34980b0f78326fb70bf76a04094cf3e27afbd6aed6d982ce30abfa9dc4250d164dbe11c1027bedcdeee3b7c907c3716e88f16eeae173b846ccdf2c38d458 SHA512 b1e5c1813deb8a4eb9f8548afa935f1a2145ed3168f0276493ea501057fd4f70b8980ae387248a59e50f0e450ae245a04cd8636fb61d37af9c3634ff1cdd24f3 DIST qtlocation-everywhere-src-6.5.3.tar.xz 3032844 BLAKE2B 3b23b8d1b1a06476428879c0d32d3fc21119e50410d97ee3948c0ab7b22832f27f1e5ed2d06e62f53baf668b77630a27e5c6814b54c2e9498706a436256c4005 SHA512 6633dedba335b8de4c96f98f4709a147e225e82fee1ed741938e15e1540421ad7c3140baec75914f0844a793433abcadaf3ce72d944662b62778327d65ff7348 diff --git a/dev-qt/qtlocation/qtlocation-5.15.11-r1.ebuild b/dev-qt/qtlocation/qtlocation-5.15.11-r1.ebuild new file mode 100644 index 000000000000..2b566c3af445 --- /dev/null +++ b/dev-qt/qtlocation/qtlocation-5.15.11-r1.ebuild @@ -0,0 +1,59 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PATCHSET="${P}-patchset" +inherit qt5-build + +DESCRIPTION="Location (places, maps, navigation) library for the Qt5 framework" + +if [[ ${QT5_BUILD_TYPE} == release ]]; then + MAPBOXGL_COMMIT=4c88f2c0e61daa89f584a8a9a3eba210221c6920 + 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 ~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 +}