summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2021-10-07 20:59:14 +0200
committerAndreas Sturmlechner <asturm@gentoo.org>2021-10-07 21:58:11 +0200
commit2391bc3facdbe8e52178af1c03e9f0c440876c56 (patch)
tree693c8b0c6c605d29ad468a2a9b1efbb76adff49c /kde-apps/marble
parentkde-apps/libkeduvocdocument: drop 21.08.1* (diff)
downloadgentoo-2391bc3facdbe8e52178af1c03e9f0c440876c56.tar.gz
gentoo-2391bc3facdbe8e52178af1c03e9f0c440876c56.tar.bz2
gentoo-2391bc3facdbe8e52178af1c03e9f0c440876c56.zip
kde-apps/marble: drop 21.08.1*
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'kde-apps/marble')
-rw-r--r--kde-apps/marble/Manifest1
-rw-r--r--kde-apps/marble/files/marble-21.08.1-gpsd-3.23.1.patch32
-rw-r--r--kde-apps/marble/marble-21.08.1.ebuild101
3 files changed, 0 insertions, 134 deletions
diff --git a/kde-apps/marble/Manifest b/kde-apps/marble/Manifest
index 1bcbaeafb4e7..d7ab9f478b78 100644
--- a/kde-apps/marble/Manifest
+++ b/kde-apps/marble/Manifest
@@ -1,3 +1,2 @@
DIST marble-21.04.3.tar.xz 52386284 BLAKE2B a23a326e7c181046f03c896fb49d2d39156bce060cdf643d92e98a1d2fc44000a7e1367dbe1e00a939cf78a9d1b07d47152735f3e528126dbda85594f1e5b5b9 SHA512 db926120fd275e0803cf176137c32463de784dd54f16b1d2d7e20e6ae750e6d6b373ef2fd51d1e31a0bee219d8e7c278ede8e83bdbe753edd32d138098855b8c
-DIST marble-21.08.1.tar.xz 52420536 BLAKE2B e5dcaf22e0b1ffa64f1055bf8e8f47aa806abaeabff62ce536b07181c4c03f0d8859688f71155ccaf2a37ba12b79c256ea7b9d46fc29f1bac785403242ebaf8b SHA512 a4d0a6ec02d231f95f0428ad61df4a891dc701179fed3cc77bf9876c98042e257793ab455fdaa7d25863c6a1ad182806f62acd758adc1e12388969ae014a13e5
DIST marble-21.08.2.tar.xz 52415600 BLAKE2B b5ebc094fb816d13a2169690079a69fba7678c25fae62213b760a52a105c6c76e070d9ad4420bc0609d10994fab500e5c963d3f4412e43ec40920174866b5cbd SHA512 defa7da6357479cbbd604c6c06bc01ea5fb66c113829fdadcb78a70a2736819973e323687d537dfa4deb8003735e7aef8bfb1b9c60de4eb83737fd23706747a7
diff --git a/kde-apps/marble/files/marble-21.08.1-gpsd-3.23.1.patch b/kde-apps/marble/files/marble-21.08.1-gpsd-3.23.1.patch
deleted file mode 100644
index ee01af9e4380..000000000000
--- a/kde-apps/marble/files/marble-21.08.1-gpsd-3.23.1.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 2732740676c236b832dead0b74511043db64787e Mon Sep 17 00:00:00 2001
-From: ivan tkachenko <me@ratijas.tk>
-Date: Wed, 29 Sep 2021 00:55:23 +0300
-Subject: [PATCH] Fix build with gpsd 3.23.1
-
-STATUS_NO_FIX was renamed to STATUS_UNK.
-
-https://gitlab.com/gpsd/gpsd/-/commit/d4a4d8d3606fd50f10bcd20096a8a0cdb8b2d427
-
-Co-Authored-By: Vlad Zahorodnii <vlad.zahorodnii@kde.org>
----
- .../positionprovider/gpsd/GpsdPositionProviderPlugin.cpp | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/src/plugins/positionprovider/gpsd/GpsdPositionProviderPlugin.cpp b/src/plugins/positionprovider/gpsd/GpsdPositionProviderPlugin.cpp
-index 6aaf3a34c..30b955cd1 100644
---- a/src/plugins/positionprovider/gpsd/GpsdPositionProviderPlugin.cpp
-+++ b/src/plugins/positionprovider/gpsd/GpsdPositionProviderPlugin.cpp
-@@ -74,7 +74,9 @@ 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 defined(STATUS_UNK) // STATUS_NO_FIX was renamed to STATUS_UNK without bumping API version
-+ if ( data.fix.status == STATUS_UNK || std::isnan( data.fix.longitude ) || std::isnan( data.fix.latitude ) )
-+#elif 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 ) )
---
-GitLab
-
diff --git a/kde-apps/marble/marble-21.08.1.ebuild b/kde-apps/marble/marble-21.08.1.ebuild
deleted file mode 100644
index 4bcdb54ca1c5..000000000000
--- a/kde-apps/marble/marble-21.08.1.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="optional" # see src/apps/marble-kde/CMakeLists.txt
-ECM_TEST="forceoptional"
-KFMIN=5.84.0
-QTMIN=5.15.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 ~riscv ~x86"
-IUSE="aprs +dbus designer +geolocation gps +kde nls +pbf phonon 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
- )
- pbf? ( dev-libs/protobuf:= )
- phonon? ( >=media-libs/phonon-4.11.0 )
- shapefile? ( sci-libs/shapelib:= )
- webengine? (
- >=dev-qt/qtwebchannel-${QTMIN}:5
- >=dev-qt/qtwebengine-${QTMIN}:5[widgets]
- )
-"
-RDEPEND="${DEPEND}"
-
-# bug 588320
-RESTRICT="test"
-
-# Upstream pending: https://invent.kde.org/education/marble/-/merge_requests/57
-PATCHES=( "${FILESDIR}/${P}-gpsd-3.23.1.patch" )
-
-src_prepare() {
- ecm_src_prepare
-
- rm -rf src/3rdparty/zlib || die "Failed to remove bundled libs"
-
- use kde && cmake_run_in src/apps cmake_comment_add_subdirectory marble-qt
-}
-
-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)
- $(cmake_use_find_package pbf Protobuf)
- -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
-}