* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtlocation/files/, dev-qt/qtlocation/
@ 2021-10-16 8:20 Andreas Sturmlechner
0 siblings, 0 replies; 3+ messages in thread
From: Andreas Sturmlechner @ 2021-10-16 8:20 UTC (permalink / raw
To: gentoo-commits
commit: b4597275c977004e21f4a08b064e8eee9c7eb226
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 15 19:57:45 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Oct 16 08:20:12 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b4597275
dev-qt/qtlocation: Drop 5.15.2-r1
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
dev-qt/qtlocation/Manifest | 1 -
...location-5.15.2-qsg-render-thread-crash-1.patch | 66 ------------
...location-5.15.2-qsg-render-thread-crash-2.patch | 115 ---------------------
dev-qt/qtlocation/qtlocation-5.15.2-r1.ebuild | 50 ---------
4 files changed, 232 deletions(-)
diff --git a/dev-qt/qtlocation/Manifest b/dev-qt/qtlocation/Manifest
index 7c53765f8f1..169ed434c67 100644
--- a/dev-qt/qtlocation/Manifest
+++ b/dev-qt/qtlocation/Manifest
@@ -1,3 +1,2 @@
DIST qtlocation-5.15.2-861e372b.tar.gz 5431120 BLAKE2B c66e81f7e726b53000a0f8a4eafa9a4a6168aa08c89d4d0e2ef11b02e3598fd0b3f30dbd21e6c5436814bb88fa69c96d141b0d0d79f13239ec61396269af089a SHA512 b7cac8cd42185504c6140f1dcd4e8c0c749e3d8f22bf9977e97268e0ad6fbd3733e571a255ab7824eba31e30e707e804b07317f2ec9b7be15a4a5756c78c9e41
-DIST qtlocation-everywhere-src-5.15.2.tar.xz 6556764 BLAKE2B a322f35ece266fff6428da9090f02c0d5749a4750ff0655ef09695f147d88d667b5917335e44d0f8721cc56f425c171fb11d0f34342aff005327518e9c1d6db8 SHA512 6192922506b3ea354e85431df83c19d7cc9aebb17549c6a1de48f625bf8365ff3db3161080dde254a5fb9199d99c3c5dc8e1533429150be55df96ddb7d6ce16f
DIST qtlocation-mapboxgl-5.15.2-d3101bbc.tar.gz 3726244 BLAKE2B e571a72e041b80b155eae7d171cee7f996fbe223c8d3337f549ea2a40472fc2da9dd8abf54238f22c1828d467aaf01307a61acecd3aedc4f5f7cabc06f48d830 SHA512 6e38e5ca0b9e17de690af79f4702278bdc933a74561aa135b3e82245df7d795602403048bcc5bce00237f774ce3957540a8bded1a71f8730a08da05dec1f039f
diff --git a/dev-qt/qtlocation/files/qtlocation-5.15.2-qsg-render-thread-crash-1.patch b/dev-qt/qtlocation/files/qtlocation-5.15.2-qsg-render-thread-crash-1.patch
deleted file mode 100644
index d4cd0188d1a..00000000000
--- a/dev-qt/qtlocation/files/qtlocation-5.15.2-qsg-render-thread-crash-1.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-From 4fe9e0ed027134a833b2243597a2ccd00987b559 Mon Sep 17 00:00:00 2001
-From: Piotr Mikolajczyk <piotr.mikolajczyk@qt.io>
-Date: Tue, 29 Sep 2020 10:41:23 +0200
-Subject: [PATCH] Fix crash when showing Map QML comp. for 2nd+ time
-
-Crash caused by storing pointer to a node that could be deleted elsewhere
-
-Fixes: QTBUG-85260
-Change-Id: I871123322fac84b8bf91e9bab8ecad08e75c2854
-Reviewed-by: Paolo Angelelli <paolo.angelelli.qt@gmail.com>
----
- src/location/labs/qsg/qgeomapobjectqsgsupport.cpp | 29 ++++++++++++++++++++++-
- 1 file changed, 28 insertions(+), 1 deletion(-)
-
-diff --git a/src/location/labs/qsg/qgeomapobjectqsgsupport.cpp b/src/location/labs/qsg/qgeomapobjectqsgsupport.cpp
-index 0e1df8f6c..cd1801305 100644
---- a/src/location/labs/qsg/qgeomapobjectqsgsupport.cpp
-+++ b/src/location/labs/qsg/qgeomapobjectqsgsupport.cpp
-@@ -48,7 +48,32 @@ static int findMapObject(QGeoMapObject *o, const QList<MapObject> &list)
- }
- return -1;
- }
-+namespace {
-+bool findNodeInStructure(QSGNode *root, QSGNode *item)
-+{
-+ if (root == nullptr || item == nullptr)
-+ return false;
-+ if (root == item)
-+ return true;
-+ auto currentChild = root->firstChild();
-+ // First check the direct child nodes and if not found let's dive deeper
-+ bool bFound = (item == currentChild);
-+
-+ while (!bFound && currentChild) {
-+ currentChild = currentChild->nextSibling();
-+ bFound = (item == currentChild);
-+ }
-
-+ if (!bFound) {
-+ currentChild = root->firstChild();
-+ while (!bFound && currentChild) {
-+ bFound = findNodeInStructure(currentChild, item);
-+ currentChild = currentChild->nextSibling();
-+ }
-+ }
-+ return bFound;
-+}
-+}
- bool QGeoMapObjectQSGSupport::createMapObjectImplementation(QGeoMapObject *obj, QGeoMapPrivate *d)
- {
- QExplicitlySharedDataPointer<QGeoMapObjectPrivate> pimpl =
-@@ -157,9 +182,11 @@ void QGeoMapObjectQSGSupport::updateMapObjects(QSGNode *root, QQuickWindow *wind
- {
- if (!root)
- return;
-+ if (!findNodeInStructure(root, m_mapObjectsRootNode))
-+ m_mapObjectsRootNode = nullptr;
- if (!m_mapObjectsRootNode) {
- m_mapObjectsRootNode = new QDeclarativePolygonMapItemPrivateOpenGL::RootNode();
-- root->appendChildNode(m_mapObjectsRootNode);
-+ root->appendChildNode(m_mapObjectsRootNode); // PASSING OWNERSHIP!
- }
-
- m_mapObjectsRootNode->removeAllChildNodes();
---
-2.16.3
diff --git a/dev-qt/qtlocation/files/qtlocation-5.15.2-qsg-render-thread-crash-2.patch b/dev-qt/qtlocation/files/qtlocation-5.15.2-qsg-render-thread-crash-2.patch
deleted file mode 100644
index 4bd70b99abb..00000000000
--- a/dev-qt/qtlocation/files/qtlocation-5.15.2-qsg-render-thread-crash-2.patch
+++ /dev/null
@@ -1,115 +0,0 @@
-From 861e372b6ad81570d4f496e42fb25a6699b72f2f Mon Sep 17 00:00:00 2001
-From: Piotr Mikolajczyk <piotr.mikolajczyk@qt.io>
-Date: Tue, 3 Nov 2020 11:43:22 +0100
-Subject: [PATCH] Simpler fix to crashing Qml Map appearing 2nd+ time
-
-Previous solution did not take advantage of the QSGNode::OwnedByParent
-flag. Setting this flag to false allows to use parent() property
-to determine if the node has been removed from node tree.
-This amends 4fe9e0ed027134a833b2243597a2ccd00987b559
-
-Fixes: QTBUG-85260
-Change-Id: I705848483d7dc2639dffffa0ff66c682b3fffca0
-Reviewed-by: Andy Shaw <andy.shaw@qt.io>
----
- src/location/labs/qsg/qgeomapobjectqsgsupport.cpp | 40 +++++------------------
- src/location/labs/qsg/qgeomapobjectqsgsupport_p.h | 3 +-
- 2 files changed, 11 insertions(+), 32 deletions(-)
-
-diff --git a/src/location/labs/qsg/qgeomapobjectqsgsupport.cpp b/src/location/labs/qsg/qgeomapobjectqsgsupport.cpp
-index cd1801305..a978573d6 100644
---- a/src/location/labs/qsg/qgeomapobjectqsgsupport.cpp
-+++ b/src/location/labs/qsg/qgeomapobjectqsgsupport.cpp
-@@ -48,32 +48,7 @@ static int findMapObject(QGeoMapObject *o, const QList<MapObject> &list)
- }
- return -1;
- }
--namespace {
--bool findNodeInStructure(QSGNode *root, QSGNode *item)
--{
-- if (root == nullptr || item == nullptr)
-- return false;
-- if (root == item)
-- return true;
-- auto currentChild = root->firstChild();
-- // First check the direct child nodes and if not found let's dive deeper
-- bool bFound = (item == currentChild);
--
-- while (!bFound && currentChild) {
-- currentChild = currentChild->nextSibling();
-- bFound = (item == currentChild);
-- }
-
-- if (!bFound) {
-- currentChild = root->firstChild();
-- while (!bFound && currentChild) {
-- bFound = findNodeInStructure(currentChild, item);
-- currentChild = currentChild->nextSibling();
-- }
-- }
-- return bFound;
--}
--}
- bool QGeoMapObjectQSGSupport::createMapObjectImplementation(QGeoMapObject *obj, QGeoMapPrivate *d)
- {
- QExplicitlySharedDataPointer<QGeoMapObjectPrivate> pimpl =
-@@ -182,11 +157,14 @@ void QGeoMapObjectQSGSupport::updateMapObjects(QSGNode *root, QQuickWindow *wind
- {
- if (!root)
- return;
-- if (!findNodeInStructure(root, m_mapObjectsRootNode))
-- m_mapObjectsRootNode = nullptr;
-+
-+ if (m_mapObjectsRootNode && m_mapObjectsRootNode->parent())
-+ root->appendChildNode(m_mapObjectsRootNode.get());
-+
- if (!m_mapObjectsRootNode) {
-- m_mapObjectsRootNode = new QDeclarativePolygonMapItemPrivateOpenGL::RootNode();
-- root->appendChildNode(m_mapObjectsRootNode); // PASSING OWNERSHIP!
-+ m_mapObjectsRootNode = std::make_unique<QDeclarativePolygonMapItemPrivateOpenGL::RootNode>();
-+ root->appendChildNode(m_mapObjectsRootNode.get());
-+ m_mapObjectsRootNode->setFlag(QSGNode::OwnedByParent, false);
- }
-
- m_mapObjectsRootNode->removeAllChildNodes();
-@@ -211,7 +189,7 @@ void QGeoMapObjectQSGSupport::updateMapObjects(QSGNode *root, QQuickWindow *wind
- MapObject &mo = m_mapObjects[i];
- QQSGMapObject *sgo = mo.sgObject;
- QSGNode *oldNode = mo.qsgNode;
-- mo.qsgNode = sgo->updateMapObjectNode(oldNode, &mo.visibleNode, m_mapObjectsRootNode, window);
-+ mo.qsgNode = sgo->updateMapObjectNode(oldNode, &mo.visibleNode, m_mapObjectsRootNode.get(), window);
- if (Q_UNLIKELY(!mo.qsgNode)) {
- qWarning() << "updateMapObjectNode for "<<mo.object->type() << " returned NULL";
- } else if (mo.visibleNode && (mo.visibleNode->visible() != mo.object->visible())) {
-@@ -227,7 +205,7 @@ void QGeoMapObjectQSGSupport::updateMapObjects(QSGNode *root, QQuickWindow *wind
- QQSGMapObject *sgo = mo.sgObject;
- QSGNode *oldNode = mo.qsgNode;
- sgo->updateGeometry(); // or subtree will be blocked
-- mo.qsgNode = sgo->updateMapObjectNode(oldNode, &mo.visibleNode, m_mapObjectsRootNode, window);
-+ mo.qsgNode = sgo->updateMapObjectNode(oldNode, &mo.visibleNode, m_mapObjectsRootNode.get(), window);
- if (mo.qsgNode) {
- if (mo.visibleNode && (mo.visibleNode->visible() != mo.object->visible())) {
- mo.visibleNode->setVisible(mo.object->visible());
-diff --git a/src/location/labs/qsg/qgeomapobjectqsgsupport_p.h b/src/location/labs/qsg/qgeomapobjectqsgsupport_p.h
-index 1ec966fa9..cbbc09691 100644
---- a/src/location/labs/qsg/qgeomapobjectqsgsupport_p.h
-+++ b/src/location/labs/qsg/qgeomapobjectqsgsupport_p.h
-@@ -59,6 +59,7 @@
- #include <QtLocation/private/qdeclarativepolylinemapitem_p.h>
- #include <QtLocation/private/qdeclarativepolygonmapitem_p_p.h>
- #include <QtCore/qpointer.h>
-+#include <memory>
-
- QT_BEGIN_NAMESPACE
- struct Q_LOCATION_PRIVATE_EXPORT MapObject {
-@@ -85,7 +86,7 @@ public:
- QList<MapObject> m_pendingMapObjects;
- QList<MapObject> m_removedMapObjects;
- QGeoMap *m_map = nullptr;
-- QDeclarativePolygonMapItemPrivateOpenGL::RootNode *m_mapObjectsRootNode = nullptr;
-+ std::unique_ptr<QDeclarativePolygonMapItemPrivateOpenGL::RootNode> m_mapObjectsRootNode;
- };
-
- QT_END_NAMESPACE
---
-2.16.3
diff --git a/dev-qt/qtlocation/qtlocation-5.15.2-r1.ebuild b/dev-qt/qtlocation/qtlocation-5.15.2-r1.ebuild
deleted file mode 100644
index f1ee8b34f18..00000000000
--- a/dev-qt/qtlocation/qtlocation-5.15.2-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit qt5-build
-
-DESCRIPTION="Location (places, maps, navigation) library for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="amd64 arm arm64 ~riscv x86"
-fi
-
-IUSE=""
-
-RDEPEND="
- dev-libs/icu:=
- ~dev-qt/qtcore-${PV}
- ~dev-qt/qtdeclarative-${PV}
- ~dev-qt/qtgui-${PV}
- ~dev-qt/qtnetwork-${PV}
- ~dev-qt/qtpositioning-${PV}[qml]
- ~dev-qt/qtsql-${PV}
- sys-libs/zlib
-"
-DEPEND="${RDEPEND}
- ~dev-qt/qtconcurrent-${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
-)
-
-PATCHES=( "${FILESDIR}"/${P}-qsg-render-thread-crash-{1,2}.patch ) # QTBUG-85260
-
-src_configure() {
- # src/plugins/geoservices requires files that are only generated when
- # qmake is run in the root directory. Bug 633776.
- mkdir -p "${QT5_BUILD_DIR}"/src/location || die
- qt5_qmake "${QT5_BUILD_DIR}"
- cp "${S}"/src/location/qtlocation-config.pri "${QT5_BUILD_DIR}"/src/location || die
- qt5-build_src_configure
-}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtlocation/files/, dev-qt/qtlocation/
@ 2023-04-12 12:14 Andreas Sturmlechner
0 siblings, 0 replies; 3+ messages in thread
From: Andreas Sturmlechner @ 2023-04-12 12:14 UTC (permalink / raw
To: gentoo-commits
commit: b0b8ec0eb0812395514c4ff9f48448fe80ba651b
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 12 07:44:07 2023 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Apr 12 12:13:46 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b0b8ec0e
dev-qt/qtlocation: Fix build with libcxx
Closes: https://bugs.gentoo.org/903575
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
...tlocation-5.15.8-mapboxgl-missing-include.patch | 26 ++++++++++++++++++++++
dev-qt/qtlocation/qtlocation-5.15.8.ebuild | 5 ++++-
2 files changed, 30 insertions(+), 1 deletion(-)
diff --git a/dev-qt/qtlocation/files/qtlocation-5.15.8-mapboxgl-missing-include.patch b/dev-qt/qtlocation/files/qtlocation-5.15.8-mapboxgl-missing-include.patch
new file mode 100644
index 000000000000..9dabca5aa231
--- /dev/null
+++ b/dev-qt/qtlocation/files/qtlocation-5.15.8-mapboxgl-missing-include.patch
@@ -0,0 +1,26 @@
+From 5a07e1967dcc925d9def47accadae991436b9686 Mon Sep 17 00:00:00 2001
+From: Manuel Nickschas <sputnick@quassel-irc.org>
+Date: Tue, 11 Apr 2023 22:24:11 +0200
+Subject: [PATCH] Add missing include
+
+Fixes build with libcxx, see also:
+https://bugs.gentoo.org/903575
+---
+ include/mbgl/util/unique_any.hpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/3rdparty/mapbox-gl-native/include/mbgl/util/unique_any.hpp b/src/3rdparty/mapbox-gl-native/include/mbgl/util/unique_any.hpp
+index c7dc8b38ea..0fb25b8b4a 100644
+--- a/src/3rdparty/mapbox-gl-native/include/mbgl/util/unique_any.hpp
++++ b/src/3rdparty/mapbox-gl-native/include/mbgl/util/unique_any.hpp
+@@ -3,6 +3,7 @@
+ #include <typeinfo>
+ #include <type_traits>
+ #include <stdexcept>
++#include <utility>
+ namespace mbgl {
+ namespace util {
+
+--
+GitLab
+
diff --git a/dev-qt/qtlocation/qtlocation-5.15.8.ebuild b/dev-qt/qtlocation/qtlocation-5.15.8.ebuild
index a1ab77f7306e..5ed68b32837c 100644
--- a/dev-qt/qtlocation/qtlocation-5.15.8.ebuild
+++ b/dev-qt/qtlocation/qtlocation-5.15.8.ebuild
@@ -39,7 +39,10 @@ QT5_TARGET_SUBDIRS=(
src/plugins/geoservices
)
-PATCHES=( "${FILESDIR}/${P}-mapboxgl-gcc13.patch" ) # bug 885431
+PATCHES=(
+ "${FILESDIR}/${P}-mapboxgl-gcc13.patch" # bug 885431
+ "${FILESDIR}/${P}-mapboxgl-missing-include.patch" # bug 903575
+)
src_configure() {
# src/plugins/geoservices requires files that are only generated when
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtlocation/files/, dev-qt/qtlocation/
@ 2023-11-15 19:28 Ionen Wolkens
0 siblings, 0 replies; 3+ messages in thread
From: Ionen Wolkens @ 2023-11-15 19:28 UTC (permalink / raw
To: gentoo-commits
commit: 9694b748bd20fe694b637cf3e854df308d7b6108
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 15 18:00:40 2023 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Wed Nov 15 19:27:55 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9694b748
dev-qt/qtlocation: drop 6.5.2-r1
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
dev-qt/qtlocation/Manifest | 1 -
.../files/qtlocation-6.5.2-missing-memory.patch | 22 ----------
dev-qt/qtlocation/qtlocation-6.5.2-r1.ebuild | 48 ----------------------
3 files changed, 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
-}
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2023-11-15 19:28 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-11-15 19:28 [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtlocation/files/, dev-qt/qtlocation/ Ionen Wolkens
-- strict thread matches above, loose matches on Subject: below --
2023-04-12 12:14 Andreas Sturmlechner
2021-10-16 8:20 Andreas Sturmlechner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox