diff options
| author |   Ionen Wolkens <ionen@gentoo.org> | 2023-09-04 10:46:46 -0400 |
|---|---|---|
| committer | Ionen Wolkens <ionen@gentoo.org> | 2023-09-05 09:01:13 -0400 |
| commit | 6ab548af1c7260368fabc0e498de5feb0d207f5a (patch) | |
| tree | 1c65f86ba8206d826756195c80f2b0b9b47e94c9 | |
| parent | qt6-build.eclass: re-arrange QT6_BUILD_TYPE, add pre-release (diff) | |
| download | gentoo-6ab548af1c7260368fabc0e498de5feb0d207f5a.tar.gz gentoo-6ab548af1c7260368fabc0e498de5feb0d207f5a.tar.bz2 gentoo-6ab548af1c7260368fabc0e498de5feb0d207f5a.zip | |
dev-qt/qtlocation: backport build fix for clang+glibc (qt6)
Signed-off-by: Ionen Wolkens <ionen@gentoo.org>
| -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 | 4 |
2 files changed, 26 insertions, 0 deletions
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 000000000000..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 <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 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 |