diff options
| author |   Ionen Wolkens <ionen@gentoo.org> | 2023-11-15 13:00:40 -0500 |
|---|---|---|
| committer | Ionen Wolkens <ionen@gentoo.org> | 2023-11-15 14:27:55 -0500 |
| commit | 9694b748bd20fe694b637cf3e854df308d7b6108 (patch) | |
| tree | c684d01f67dedd89dacab8c000cc90208a49de9b | |
| parent | dev-qt/qtimageformats: drop 6.5.2 (diff) | |
| download | gentoo-9694b748bd20fe694b637cf3e854df308d7b6108.tar.gz gentoo-9694b748bd20fe694b637cf3e854df308d7b6108.tar.bz2 gentoo-9694b748bd20fe694b637cf3e854df308d7b6108.zip | |
dev-qt/qtlocation: drop 6.5.2-r1
Signed-off-by: Ionen Wolkens <ionen@gentoo.org>
| -rw-r--r-- | dev-qt/qtlocation/Manifest | 1 | ||||
| -rw-r--r-- | dev-qt/qtlocation/files/qtlocation-6.5.2-missing-memory.patch | 22 | ||||
| -rw-r--r-- | dev-qt/qtlocation/qtlocation-6.5.2-r1.ebuild | 48 |
3 files changed, 0 insertions, 71 deletions
diff --git a/dev-qt/qtlocation/Manifest b/dev-qt/qtlocation/Manifest index 15c5e2f5fd20..abe1d392b343 100644 --- a/dev-qt/qtlocation/Manifest +++ b/dev-qt/qtlocation/Manifest @@ -1,7 +1,6 @@ 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 DIST qtlocation-everywhere-src-6.6.0.tar.xz 3035992 BLAKE2B 9adfb9bfc91cecaac473b517b223d590bf762393c387346e55f5f1ee4a3e59b2377c0ed4de037c45ebe5fb1e2997980c400fa587fbd1f503aa6531b6438840a1 SHA512 e4e492229d961bc34630aaff030b46385708312de174c9c47f85a6010f1fcb74e198333920fd5c02153a8bbae770c83d8cd1777177d9c9d7a1d555b6619be8f2 DIST qtlocation-mapboxgl-5.15.11-4c88f2c0.tar.gz 3726387 BLAKE2B e9b818505ace86516262d1407450c14be82122bb91363a57708795844089371ac7d511a857f713c7cb4e6f8b54867aab0bc5dcdb9c49aa28aa3f8363271378e0 SHA512 e4d9133db892fd8b7b1bcf584bf7dae30c0f0353f3b0a696a6cabc9485067f262d42554b583640521734498572e5480b5e8d0143d5be47bb92077f3192fefa4d diff --git a/dev-qt/qtlocation/files/qtlocation-6.5.2-missing-memory.patch b/dev-qt/qtlocation/files/qtlocation-6.5.2-missing-memory.patch deleted file mode 100644 index e57681c7ba97..000000000000 --- a/dev-qt/qtlocation/files/qtlocation-6.5.2-missing-memory.patch +++ /dev/null @@ -1,22 +0,0 @@ -Manifests itself as an issue only with clang+glibc -(gcc+glibc, or clang+musl are fine). - -https://github.com/qt/qtlocation/commit/3a1b28126a0a182bef9fe0ccb85409fceb39d1f3 -From: Tim Blechmann <tim@klingt.org> -Date: Thu, 20 Jul 2023 17:04:39 +0800 -Subject: [PATCH] location: include missing header - -std::unique_ptr requires <memory> - -Pick-to: 6.5 6.6 ---- a/src/location/maps/qgeocameratiles_p.h -+++ b/src/location/maps/qgeocameratiles_p.h -@@ -17,6 +17,8 @@ - #include <QtLocation/private/qlocationglobal_p.h> - #include <QtCore/QScopedPointer> - -+#include <memory> -+ - QT_BEGIN_NAMESPACE - - class QGeoCameraData; diff --git a/dev-qt/qtlocation/qtlocation-6.5.2-r1.ebuild b/dev-qt/qtlocation/qtlocation-6.5.2-r1.ebuild deleted file mode 100644 index 464ab4a2d682..000000000000 --- a/dev-qt/qtlocation/qtlocation-6.5.2-r1.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 2021-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit qt6-build - -DESCRIPTION="Location (places, maps, navigation) library for the Qt6 framework" - -if [[ ${QT6_BUILD_TYPE} == release ]]; then - KEYWORDS="amd64" -fi - -RDEPEND=" - ~dev-qt/qtbase-${PV}:6[network] - ~dev-qt/qtdeclarative-${PV}:6 - ~dev-qt/qtpositioning-${PV}:6[qml(+)] -" -DEPEND="${RDEPEND}" - -CMAKE_SKIP_TESTS=( - # ignores QML_IMPORT_PATH (unlike other tests) and looks in - # the missing builddir/qml, skip rather than work around - tst_declarative_ui -) - -PATCHES=( - "${FILESDIR}"/${P}-missing-memory.patch -) - -src_install() { - qt6-build_src_install - - if use test; then - local delete=( # sigh - "${D}${QT6_LIBDIR}"/cmake/Qt6Location/*TestGeoServicePlugin*.cmake - "${D}${QT6_LIBDIR}"/cmake/Qt6Location/*UnsupportedPlacesGeoServicePlugin*.cmake - "${D}${QT6_LIBDIR}"/cmake/Qt6Qml/QmlPlugins/*declarative_location_test*.cmake - "${D}${QT6_PLUGINDIR}"/geoservices/libqtgeoservices_geocodingplugin.so - "${D}${QT6_PLUGINDIR}"/geoservices/libqtgeoservices_placesplugin_unsupported.so - "${D}${QT6_PLUGINDIR}"/geoservices/libqtgeoservices_qmltestplugin.so - "${D}${QT6_PLUGINDIR}"/geoservices/libqtgeoservices_routingplugin.so - "${D}${QT6_QMLDIR}"/QtLocation/Test - ) - # using -f given not tracking which tests may be skipped or not - rm -rf -- "${delete[@]}" || die - fi -} |