diff options
author | Andreas Sturmlechner <asturm@gentoo.org> | 2020-11-25 18:49:58 +0100 |
---|---|---|
committer | Andreas Sturmlechner <asturm@gentoo.org> | 2020-11-25 19:04:33 +0100 |
commit | ca761c6baf6d46771f4890f3a075ed14866e5340 (patch) | |
tree | 39ce3af3ca9089f72e9ea640218924cccabc79d9 /kde-apps/marble | |
parent | kde-apps/libkeduvocdocument: drop 20.04.3* (diff) | |
download | gentoo-ca761c6baf6d46771f4890f3a075ed14866e5340.tar.gz gentoo-ca761c6baf6d46771f4890f3a075ed14866e5340.tar.bz2 gentoo-ca761c6baf6d46771f4890f3a075ed14866e5340.zip |
kde-apps/marble: drop 20.04.3*
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'kde-apps/marble')
-rw-r--r-- | kde-apps/marble/Manifest | 1 | ||||
-rw-r--r-- | kde-apps/marble/files/marble-20.04.3-gpsd-3.21.patch | 29 | ||||
-rw-r--r-- | kde-apps/marble/marble-20.04.3.ebuild | 101 |
3 files changed, 0 insertions, 131 deletions
diff --git a/kde-apps/marble/Manifest b/kde-apps/marble/Manifest index 83750cc1554b..ad43f83d4d40 100644 --- a/kde-apps/marble/Manifest +++ b/kde-apps/marble/Manifest @@ -1,2 +1 @@ -DIST marble-20.04.3.tar.xz 52200548 BLAKE2B 83388e292487dbbe10bde4f4d67337b8d8606df26fda3621640cf49a1a930b6cdb9357a96568fc33597f0ee2627a22a2f2920a7dad45bab1502e5a8869934de1 SHA512 5c29b0a25164b50f197c826258d8de8b4e1a386d91fa7a6f67eb3da64197b2cefef31b0759c3bd19e9a5b0f0c639adc779d71a7ef1d7b51fca4e58cc3c8530cd DIST marble-20.08.3.tar.xz 52191936 BLAKE2B a7990d76d6df1333b5beac62d82e4e10ad55fa2513f579d4d169bd24e54e8d2f4132847d9544dcbeb1205b4bedcd193792332434c64c97cf9eb1180f6bad9b05 SHA512 0bffe97a14fe74300eef8c94a3d14217abba6602fef86e07c799d52970e37047576defd4baeaebe9171ff3915f35c0a64ca2e46d233fde834c8bd5dc3f15ebce diff --git a/kde-apps/marble/files/marble-20.04.3-gpsd-3.21.patch b/kde-apps/marble/files/marble-20.04.3-gpsd-3.21.patch deleted file mode 100644 index acde5d8b6610..000000000000 --- a/kde-apps/marble/files/marble-20.04.3-gpsd-3.21.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 7039b70f0255376e5d67dad603f5d67f8c3c07db Mon Sep 17 00:00:00 2001 -From: Antonio Rojas <arojas@archlinux.org> -Date: Wed, 5 Aug 2020 14:20:37 +0200 -Subject: [PATCH] Fix build with gpsd 3.21 - -Adapt to API changes ---- - .../positionprovider/gpsd/GpsdPositionProviderPlugin.cpp | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/src/plugins/positionprovider/gpsd/GpsdPositionProviderPlugin.cpp b/src/plugins/positionprovider/gpsd/GpsdPositionProviderPlugin.cpp -index 3a787eb1f..02dc4a355 100644 ---- a/src/plugins/positionprovider/gpsd/GpsdPositionProviderPlugin.cpp -+++ b/src/plugins/positionprovider/gpsd/GpsdPositionProviderPlugin.cpp -@@ -79,7 +79,11 @@ void GpsdPositionProviderPlugin::update( gps_data_t data ) - { - PositionProviderStatus oldStatus = m_status; - GeoDataCoordinates oldPosition = m_position; -+#if defined( GPSD_API_MAJOR_VERSION ) && ( GPSD_API_MAJOR_VERSION >= 10 ) -+ if ( data.fix.status == STATUS_NO_FIX || std::isnan( data.fix.longitude ) || std::isnan( data.fix.latitude ) ) -+#else - if ( data.status == STATUS_NO_FIX || std::isnan( data.fix.longitude ) || std::isnan( data.fix.latitude ) ) -+#endif - m_status = PositionProviderStatusAcquiring; - else { - m_status = PositionProviderStatusAvailable; --- -GitLab - diff --git a/kde-apps/marble/marble-20.04.3.ebuild b/kde-apps/marble/marble-20.04.3.ebuild deleted file mode 100644 index 72acb503e88c..000000000000 --- a/kde-apps/marble/marble-20.04.3.ebuild +++ /dev/null @@ -1,101 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -ECM_HANDBOOK="optional" # see src/apps/marble-kde/CMakeLists.txt -ECM_TEST="forceoptional" -KFMIN=5.70.0 -QTMIN=5.14.2 -VIRTUALX_REQUIRED="test" -inherit ecm kde.org - -DESCRIPTION="Virtual Globe and World Atlas to learn more about Earth" -HOMEPAGE="https://marble.kde.org/" - -LICENSE="GPL-2" # TODO: CHECK -SLOT="5/$(ver_cut 1-2)" -KEYWORDS="amd64 arm64 x86" -IUSE="aprs +dbus designer gps +kde nls phonon +geolocation shapefile +webengine" - -# FIXME (new package): libwlocate, WLAN-based geolocation -BDEPEND=" - aprs? ( dev-lang/perl ) - nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 ) -" -DEPEND=" - >=dev-qt/qtconcurrent-${QTMIN}:5 - >=dev-qt/qtdeclarative-${QTMIN}:5 - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtnetwork-${QTMIN}:5 - >=dev-qt/qtprintsupport-${QTMIN}:5 - >=dev-qt/qtsql-${QTMIN}:5 - >=dev-qt/qtsvg-${QTMIN}:5 - >=dev-qt/qtwidgets-${QTMIN}:5 - >=dev-qt/qtxml-${QTMIN}:5 - sys-libs/zlib - aprs? ( >=dev-qt/qtserialport-${QTMIN}:5 ) - dbus? ( >=dev-qt/qtdbus-${QTMIN}:5 ) - designer? ( >=dev-qt/designer-${QTMIN}:5 ) - geolocation? ( >=dev-qt/qtpositioning-${QTMIN}:5 ) - gps? ( sci-geosciences/gpsd ) - kde? ( - >=kde-frameworks/kconfig-${KFMIN}:5 - >=kde-frameworks/kconfigwidgets-${KFMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/kcrash-${KFMIN}:5 - >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/kio-${KFMIN}:5 - >=kde-frameworks/knewstuff-${KFMIN}:5 - >=kde-frameworks/kparts-${KFMIN}:5 - >=kde-frameworks/krunner-${KFMIN}:5 - >=kde-frameworks/kservice-${KFMIN}:5 - >=kde-frameworks/kwallet-${KFMIN}:5 - ) - phonon? ( media-libs/phonon[qt5(+)] ) - shapefile? ( sci-libs/shapelib:= ) - webengine? ( - >=dev-qt/qtwebchannel-${QTMIN}:5 - >=dev-qt/qtwebengine-${QTMIN}:5[widgets] - ) -" -RDEPEND="${DEPEND}" - -# bug 588320 -RESTRICT+=" test" - -PATCHES=( "${FILESDIR}/${P}-gpsd-3.21.patch" ) # bug 744823 - -src_prepare() { - ecm_src_prepare - - rm -rf src/3rdparty/zlib || die "Failed to remove bundled libs" - - if use kde; then - sed -e "/add_subdirectory(marble-qt)/ s/^/#DONT/" \ - -i src/apps/CMakeLists.txt || die "Failed to disable marble-qt" - fi -} - -src_configure() { - local mycmakeargs=( - $(cmake_use_find_package aprs Perl) - $(cmake_use_find_package geolocation Qt5Positioning) - -DBUILD_MARBLE_TESTS=$(usex test) - -DWITH_DESIGNER_PLUGIN=$(usex designer) - -DWITH_libgps=$(usex gps) - -DWITH_KF5=$(usex kde) - -DWITH_Phonon4Qt5=$(usex phonon) - -DWITH_libshp=$(usex shapefile) - $(cmake_use_find_package webengine Qt5WebEngine) - $(cmake_use_find_package webengine Qt5WebEngineWidgets) - -DWITH_libwlocate=OFF - # bug 608890 - -DKDE_INSTALL_CONFDIR="/etc/xdg" - ) - if use kde; then - ecm_src_configure - else - cmake_src_configure - fi -} |