diff options
author | Andreas Sturmlechner <asturm@gentoo.org> | 2020-10-13 16:26:11 +0200 |
---|---|---|
committer | Andreas Sturmlechner <asturm@gentoo.org> | 2020-10-18 18:15:28 +0200 |
commit | 1c0947091db651f4e7d136e22d4887b47d9245cd (patch) | |
tree | dd264a79b23c6103b138807ca5b05d76fcd07959 /dev-qt/qtlocation | |
parent | media-sound/alsa-utils: x86 stable (bug #749159) (diff) | |
download | gentoo-1c0947091db651f4e7d136e22d4887b47d9245cd.tar.gz gentoo-1c0947091db651f4e7d136e22d4887b47d9245cd.tar.bz2 gentoo-1c0947091db651f4e7d136e22d4887b47d9245cd.zip |
dev-qt: Drop Qt 5.14.2
Bug: https://bugs.gentoo.org/734600
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'dev-qt/qtlocation')
-rw-r--r-- | dev-qt/qtlocation/Manifest | 1 | ||||
-rw-r--r-- | dev-qt/qtlocation/files/qtlocation-5.14.2-gcc-10.patch | 36 | ||||
-rw-r--r-- | dev-qt/qtlocation/qtlocation-5.14.2.ebuild | 49 |
3 files changed, 0 insertions, 86 deletions
diff --git a/dev-qt/qtlocation/Manifest b/dev-qt/qtlocation/Manifest index ce54b6246146..bccd0d823c9d 100644 --- a/dev-qt/qtlocation/Manifest +++ b/dev-qt/qtlocation/Manifest @@ -1,2 +1 @@ -DIST qtlocation-everywhere-src-5.14.2.tar.xz 6120852 BLAKE2B 0224cd6eecc182ddb960c6f3814d2d913a2776e879bb2e87a6c11f18840e275a770977df89c6bfa1aeb174502713969b5d8c02f9c46670671034f6879a41150f SHA512 ca11e118a9061f69ac0181db14b1bf92309c03615802092f7cf404c882108efa3acae9bb73ee3870ea68cd7d7d11863445fc72dcf52099d6be77e0986b7f012c DIST qtlocation-everywhere-src-5.15.1.tar.xz 6553252 BLAKE2B 493ea55065f03f05db7c65c22f53b96a62b3912a62f3385d393650a96b156e5a5d76dfe5ed3df8eee5ce379c9bbf36a62b6f088dab0519bd14355a7ba956a279 SHA512 b79383b60107bc4d8fcc9b4a087db57597d0b928248806fef9dfeaa8ce3347ce96b388cbce1a7bcaf3287d380f7c269c44e8ec25966112c041aa298313854106 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 deleted file mode 100644 index e7cc6f70d055..000000000000 --- a/dev-qt/qtlocation/files/qtlocation-5.14.2-gcc-10.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 0853378b2f2de82c59501e31d18906694ec6e27e Mon Sep 17 00:00:00 2001 -From: Bruno de Oliveira Abinader <bruno@mapbox.com> -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 <unicode/ushape.h> - - #include <memory> -+#include <stdexcept> - - 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 <mbgl/util/convert.hpp> - -+#include <cstdint> -+ - 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 deleted file mode 100644 index 6aa228fb575a..000000000000 --- a/dev-qt/qtlocation/qtlocation-5.14.2.ebuild +++ /dev/null @@ -1,49 +0,0 @@ -# Copyright 1999-2020 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 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}-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. - mkdir -p "${QT5_BUILD_DIR}"/src/location || die - qt5_qmake "${QT5_BUILD_DIR}" - cp src/location/qtlocation-config.pri "${QT5_BUILD_DIR}"/src/location || die - qt5-build_src_configure -} |