[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtlocation/, dev-qt/qtlocation/files/
commit: 6ab548af1c7260368fabc0e498de5feb0d207f5a
Author: Ionen Wolkens gentoo org>
AuthorDate: Mon Sep 4 14:46:46 2023 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Tue Sep 5 13:01:13 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ab548af
dev-qt/qtlocation: backport build fix for clang+glibc (qt6)
Signed-off-by: Ionen Wolkens gentoo.org>
.../files/qtlocation-6.5.2-missing-memory.patch| 22 ++
dev-qt/qtlocation/qtlocation-6.5.2-r1.ebuild | 4
2 files changed, 26 insertions(+)
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
new file mode 100644
index ..e57681c7ba97
--- /dev/null
+++ b/dev-qt/qtlocation/files/qtlocation-6.5.2-missing-memory.patch
@@ -0,0 +1,22 @@
+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
+Date: Thu, 20 Jul 2023 17:04:39 +0800
+Subject: [PATCH] location: include missing header
+
+std::unique_ptr requires
+
+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
+ #include
+
++#include
++
+ 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
index 890f51c7979c..227c0e646e5b 100644
--- a/dev-qt/qtlocation/qtlocation-6.5.2-r1.ebuild
+++ b/dev-qt/qtlocation/qtlocation-6.5.2-r1.ebuild
@@ -24,6 +24,10 @@ CMAKE_SKIP_TESTS=(
tst_declarative_ui
)
+PATCHES=(
+ "${FILESDIR}"/${P}-missing-memory.patch
+)
+
src_install() {
qt6-build_src_install
[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtlocation/, dev-qt/qtlocation/files/
commit: 1c15a18309c64c5713ef22cd1113192e69f6b23d
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sun Mar 5 09:48:53 2023 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sun Mar 5 10:19:37 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c15a183
dev-qt/qtlocation: Fix build with GCC-13
Closes: https://bugs.gentoo.org/885431
Signed-off-by: Andreas Sturmlechner gentoo.org>
.../files/qtlocation-5.15.8-mapboxgl-gcc13.patch | 51 ++
dev-qt/qtlocation/qtlocation-5.15.8.ebuild | 2 +
2 files changed, 53 insertions(+)
diff --git a/dev-qt/qtlocation/files/qtlocation-5.15.8-mapboxgl-gcc13.patch
b/dev-qt/qtlocation/files/qtlocation-5.15.8-mapboxgl-gcc13.patch
new file mode 100644
index ..ba4e94e859fb
--- /dev/null
+++ b/dev-qt/qtlocation/files/qtlocation-5.15.8-mapboxgl-gcc13.patch
@@ -0,0 +1,51 @@
+From d8054f1efa0b97b291a6f8c7fff9090b0fd4328e Mon Sep 17 00:00:00 2001
+From: Fabian Vogt
+Date: Fri, 3 Mar 2023 11:39:58 +0100
+Subject: [PATCH] Add some missing cstdint inclusions (#872)
+
+GCC 13 removed some indirect inclusions of cstdint which this relied on.
+Include it explicitly to fix build errors.
+---
+ include/mbgl/util/geometry.hpp | 2 ++
+ include/mbgl/util/string.hpp | 1 +
+ src/mbgl/gl/stencil_mode.hpp | 2 ++
+ 3 files changed, 5 insertions(+)
+
+diff --git a/include/mbgl/util/geometry.hpp b/include/mbgl/util/geometry.hpp
+index a28c59a47d..283ec7dbbe 100644
+--- a/src/3rdparty/mapbox-gl-native/include/mbgl/util/geometry.hpp
b/src/3rdparty/mapbox-gl-native/include/mbgl/util/geometry.hpp
+@@ -1,5 +1,7 @@
+ #pragma once
+
++#include
++
+ #include
+ #include
+ #include
+diff --git a/include/mbgl/util/string.hpp b/include/mbgl/util/string.hpp
+index 13498ccb92..2f6acb6410 100644
+--- a/src/3rdparty/mapbox-gl-native/include/mbgl/util/string.hpp
b/src/3rdparty/mapbox-gl-native/include/mbgl/util/string.hpp
+@@ -3,6 +3,7 @@
+ #include
+ #include
+ #include
++#include
+ #include
+ #include
+
+diff --git a/src/mbgl/gl/stencil_mode.hpp b/src/mbgl/gl/stencil_mode.hpp
+index bc959c9a73..fd00370f88 100644
+--- a/src/3rdparty/mapbox-gl-native/src/mbgl/gl/stencil_mode.hpp
b/src/3rdparty/mapbox-gl-native/src/mbgl/gl/stencil_mode.hpp
+@@ -1,5 +1,7 @@
+ #pragma once
+
++#include
++
+ #include
+
+ namespace mbgl {
+--
+GitLab
diff --git a/dev-qt/qtlocation/qtlocation-5.15.8.ebuild
b/dev-qt/qtlocation/qtlocation-5.15.8.ebuild
index 219efff528b3..a1ab77f7306e 100644
--- a/dev-qt/qtlocation/qtlocation-5.15.8.ebuild
+++ b/dev-qt/qtlocation/qtlocation-5.15.8.ebuild
@@ -39,6 +39,8 @@ QT5_TARGET_SUBDIRS=(
src/plugins/geoservices
)
+PATCHES=( "${FILESDIR}/${P}-mapboxgl-gcc13.patch" ) # bug 885431
+
src_configure() {
# src/plugins/geoservices requires files that are only generated when
# qmake is run in the root directory. Bug 633776.
[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtlocation/, dev-qt/qtlocation/files/
commit: 6c15f422ef1ae2def29a3b9fc1ad9f3c7b77bad3
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Fri Jan 1 16:46:32 2021 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sat Jan 2 01:22:32 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6c15f422
dev-qt/qtlocation: Fix QSG Render Thread crash
See also: https://bugreports.qt.io/browse/QTBUG-85260
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner gentoo.org>
...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 +
3 files changed, 231 insertions(+)
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
new file mode 100644
index 000..d4cd0188d1a
--- /dev/null
+++ b/dev-qt/qtlocation/files/qtlocation-5.15.2-qsg-render-thread-crash-1.patch
@@ -0,0 +1,66 @@
+From 4fe9e0ed027134a833b2243597a2ccd00987b559 Mon Sep 17 00:00:00 2001
+From: Piotr Mikolajczyk
+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
+---
+ 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 )
+ }
+ 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 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
new file mode 100644
index 000..4bd70b99abb
--- /dev/null
+++ b/dev-qt/qtlocation/files/qtlocation-5.15.2-qsg-render-thread-crash-2.patch
@@ -0,0 +1,115 @@
+From 861e372b6ad81570d4f496e42fb25a6699b72f2f Mon Sep 17 00:00:00 2001
+From: Piotr Mikolajczyk
+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: I705848483d7dc2639da0ff66c682b3fffca0
+Reviewed-by: Andy Shaw
+---
+ 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 )
+ }
+ return -1;
+ }
+-namespace {
[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtlocation/, dev-qt/qtlocation/files/
commit: b3c9738568a19e21a38b45d9263846ab19f144a8
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Mon May 11 21:31:50 2020 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Thu May 14 17:20:47 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b3c97385
dev-qt/qtlocation: Fix build with GCC-10
Reported-by: Vadim Dyadkin 3lp.cx>
Bug: https://bugs.gentoo.org/722102
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner gentoo.org>
.../files/qtlocation-5.14.2-gcc-10.patch | 36 ++
dev-qt/qtlocation/qtlocation-5.14.2.ebuild | 2 ++
2 files changed, 38 insertions(+)
diff --git a/dev-qt/qtlocation/files/qtlocation-5.14.2-gcc-10.patch
b/dev-qt/qtlocation/files/qtlocation-5.14.2-gcc-10.patch
new file mode 100644
index 000..e7cc6f70d05
--- /dev/null
+++ b/dev-qt/qtlocation/files/qtlocation-5.14.2-gcc-10.patch
@@ -0,0 +1,36 @@
+From 0853378b2f2de82c59501e31d18906694ec6e27e Mon Sep 17 00:00:00 2001
+From: Bruno de Oliveira Abinader
+Date: Wed, 22 Apr 2020 19:54:53 +0300
+Subject: Fix compilation issues on GCC 9
+
+---
+ platform/default/bidi.cpp | 1 +
+ src/mbgl/util/convert.cpp | 2 ++
+ 2 files changed, 3 insertions(+)
+
+diff --git a/src/3rdparty/mapbox-gl-native/platform/default/bidi.cpp
b/src/3rdparty/mapbox-gl-native/platform/default/bidi.cpp
+index d475c387b..c1710a6f1 100644
+--- a/src/3rdparty/mapbox-gl-native/platform/default/bidi.cpp
b/src/3rdparty/mapbox-gl-native/platform/default/bidi.cpp
+@@ -5,6 +5,7 @@
+ #include
+
+ #include
++#include
+
+ namespace mbgl {
+
+diff --git a/src/3rdparty/mapbox-gl-native/src/mbgl/util/convert.cpp
b/src/3rdparty/mapbox-gl-native/src/mbgl/util/convert.cpp
+index 97bfe9108..510ff2386 100644
+--- a/src/3rdparty/mapbox-gl-native/src/mbgl/util/convert.cpp
b/src/3rdparty/mapbox-gl-native/src/mbgl/util/convert.cpp
+@@ -1,5 +1,7 @@
+ #include
+
++#include
++
+ namespace mbgl {
+ namespace util {
+
+--
+cgit v1.2.1
diff --git a/dev-qt/qtlocation/qtlocation-5.14.2.ebuild
b/dev-qt/qtlocation/qtlocation-5.14.2.ebuild
index d7e1e290a78..33f50e77187 100644
--- a/dev-qt/qtlocation/qtlocation-5.14.2.ebuild
+++ b/dev-qt/qtlocation/qtlocation-5.14.2.ebuild
@@ -37,6 +37,8 @@ QT5_TARGET_SUBDIRS=(
src/plugins/geoservices
)
+PATCHES=( "${FILESDIR}/${P}-gcc-10.patch" ) # bug 722102
+
src_configure() {
# src/plugins/geoservices requires files that are only generated when
# qmake is run in the root directory. Bug 633776.
