diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2020-11-25 22:39:15 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2020-11-25 22:39:15 +0000 |
commit | d934827bf44b7cfcf6711964418148fa60877668 (patch) | |
tree | 0625f358789b5e015e49db139cc1dbc9be00428f /kde-apps/marble | |
parent | 2e34d110f164bf74d55fced27fe0000201b3eec5 (diff) |
gentoo resync : 25.11.2020
Diffstat (limited to 'kde-apps/marble')
-rw-r--r-- | kde-apps/marble/Manifest | 7 | ||||
-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 | ||||
-rw-r--r-- | kde-apps/marble/marble-20.08.3.ebuild (renamed from kde-apps/marble/marble-20.08.1.ebuild) | 6 |
4 files changed, 5 insertions, 138 deletions
diff --git a/kde-apps/marble/Manifest b/kde-apps/marble/Manifest index 0dfd63880942..b4133d9372ed 100644 --- a/kde-apps/marble/Manifest +++ b/kde-apps/marble/Manifest @@ -1,6 +1,3 @@ -AUX marble-20.04.3-gpsd-3.21.patch 1275 BLAKE2B 9a028d6869e2ea4e860a170f648d6b3a83b2e8fe509b43a11a33a7915bade3ecf565810996b51bafc9e55b70bab78636aef89987a5ef6da3f968d45dc1ebb6d1 SHA512 23f5dcd9b577e4f2fc07afbc44e374fdf94b326f76ce436c703173577b15337a5747014e73bc62a84ff1601ae8fd0d21902c3e746e34c8d432980197fe428944 -DIST marble-20.04.3.tar.xz 52200548 BLAKE2B 83388e292487dbbe10bde4f4d67337b8d8606df26fda3621640cf49a1a930b6cdb9357a96568fc33597f0ee2627a22a2f2920a7dad45bab1502e5a8869934de1 SHA512 5c29b0a25164b50f197c826258d8de8b4e1a386d91fa7a6f67eb3da64197b2cefef31b0759c3bd19e9a5b0f0c639adc779d71a7ef1d7b51fca4e58cc3c8530cd -DIST marble-20.08.1.tar.xz 52194612 BLAKE2B 69d58959c632e289b70bebabd55b7f9e66d202676a36597527d945b055620dd0b373cde6211d2c9bbef2b56c952f326fd8bbbcf4946b7fbcdcd17f47ece2ea6b SHA512 4306ba2ca620d7081b289b309abca9d741ee3376583ee662b34d09a1b03b42e00f034c34be371fed03a1196df5dd21fecf7e6c981053acfc9511a2bd85417485 -EBUILD marble-20.04.3.ebuild 2749 BLAKE2B c691aaf1364d590d281ba48cf45ac687b9f677e6a34bdade741b87a6c5b4f0a4f366fc654c64e1c3c31b1de2e150aebc5b04034096292bc205fa39c05e569f4b SHA512 c3998c234e287e5662ac94d6f1d9703370a73092e55390881321e072397f72ff63e991de632cb034b4888413455c3415d264f810c4523b8c47e75436567f456e -EBUILD marble-20.08.1.ebuild 2624 BLAKE2B c80b29ea7ab282e06e08474b4c9b223a55ff5767357d3b751a42ea7564fb11668a2b248f9ffd979fa80392ef55a7d28cbbe9a377743e01c5df69f2b012fd83b9 SHA512 3dd6c70ab5ef8404289a94a169105f0ed006da27bcc4835c141fdf524645a231ce7f72851cee7a941c656836816b2460408d20271964a1d9730a1152df6cf223 +DIST marble-20.08.3.tar.xz 52191936 BLAKE2B a7990d76d6df1333b5beac62d82e4e10ad55fa2513f579d4d169bd24e54e8d2f4132847d9544dcbeb1205b4bedcd193792332434c64c97cf9eb1180f6bad9b05 SHA512 0bffe97a14fe74300eef8c94a3d14217abba6602fef86e07c799d52970e37047576defd4baeaebe9171ff3915f35c0a64ca2e46d233fde834c8bd5dc3f15ebce +EBUILD marble-20.08.3.ebuild 2621 BLAKE2B 712cb3696459b0e58b6d28fc8048ec3b3b848284ef1057d831af3e2e82b2b52505fba68b35dda3a2ad8baa9c82103cc21534d109131e78c3172a00a96b5e3f40 SHA512 ade08fba6df6222d95cb99694085dd20084c71a4f66c6b2174a1f1f23a4e1bc93ce82bf48c78ff11d875ea3cb9c39d451fbd242a1de6cc6201696b6c2dbd7f61 MISC metadata.xml 744 BLAKE2B 30ba725f71b40212a305dbe604efa03d57cc35812bb1533168fda73401076dc1941f357f45aa7ea84a59e9107441318675e223fc01cf7ced5978ba57f2aa56c6 SHA512 8992b885dd614a6f784fd516a4fc8c38cb127bdce2eab9aaead3af778a0972fa0297037b2132b9a9180e416331e15b6691c4a4213158f7425d58d5cc369f6473 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 -} diff --git a/kde-apps/marble/marble-20.08.1.ebuild b/kde-apps/marble/marble-20.08.3.ebuild index 49121f7a989f..f1581b300d5c 100644 --- a/kde-apps/marble/marble-20.08.1.ebuild +++ b/kde-apps/marble/marble-20.08.3.ebuild @@ -5,8 +5,8 @@ EAPI=7 ECM_HANDBOOK="optional" # see src/apps/marble-kde/CMakeLists.txt ECM_TEST="forceoptional" -KFMIN=5.72.0 -QTMIN=5.14.2 +KFMIN=5.74.0 +QTMIN=5.15.1 VIRTUALX_REQUIRED="test" inherit ecm kde.org @@ -15,7 +15,7 @@ HOMEPAGE="https://marble.kde.org/" LICENSE="GPL-2" # TODO: CHECK SLOT="5/$(ver_cut 1-2)" -KEYWORDS="~amd64 ~arm64 ~x86" +KEYWORDS="amd64 arm64 x86" IUSE="aprs +dbus designer gps +kde nls phonon +geolocation shapefile +webengine" # FIXME (new package): libwlocate, WLAN-based geolocation |