summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2023-12-19 20:45:47 +0100
committerAndreas Sturmlechner <asturm@gentoo.org>2023-12-19 21:44:04 +0100
commit2eb79a53cdcd4a838485337f4c58d12d62b55388 (patch)
tree2b3a4f0cfe0865b69b90ec5bbfe793aec57f5719 /kde-apps/marble
parentkde-apps/libkeduvocdocument: drop 23.04.3 (diff)
downloadgentoo-2eb79a53cdcd4a838485337f4c58d12d62b55388.tar.gz
gentoo-2eb79a53cdcd4a838485337f4c58d12d62b55388.tar.bz2
gentoo-2eb79a53cdcd4a838485337f4c58d12d62b55388.zip
kde-apps/marble: drop 23.04.3
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-23.04.3-cxx17-for-protobuf-23.patch29
-rw-r--r--kde-apps/marble/marble-23.04.3.ebuild99
3 files changed, 0 insertions, 129 deletions
diff --git a/kde-apps/marble/Manifest b/kde-apps/marble/Manifest
index ce823261cbaa..30d50ba6385d 100644
--- a/kde-apps/marble/Manifest
+++ b/kde-apps/marble/Manifest
@@ -1,3 +1,2 @@
-DIST marble-23.04.3.tar.xz 53762636 BLAKE2B 2ed2061e91efc01ea627377783ed674ff938d5925dccf14d08ba49519460a8dd456654975e144d213274313015c8239fa9af6b99309626704ad4ae7ebf53fa9b SHA512 e92b4e42c78a4b9c7cdcce04d077fcdf1aaf54ce235ceb6fb4b74ddcc348b03f53f96d0666ebf681602cd95abed18697dda55f63b63f9f9cafe4568da625a06b
DIST marble-23.08.3.tar.xz 53785784 BLAKE2B b08197a781b95d12db1377298034f62600b34e53caeaeee3738bb4b244648fdb2fcd683158a92e989421b50ee77c860080127c57c8649dc0ccc89551676fd5be SHA512 b59497bca28114397eb138d4d1b002e436dec9c4ec4845c103c1d13c256681febbe8914091dbebceee56716a4b54b8e5fba99813a85c6ef340b2ea828f740234
DIST marble-23.08.4.tar.xz 53784524 BLAKE2B 1b02d5d8086f6be64483fb1d89f676fe26a6f2ad3aa3d25f48b4c812813d8952d65f02a0778e3d69b924d25b55e1dc3e59f6c58a3971c81ff4acf895cbccbb90 SHA512 a51c9ea45fdbddcda104000cc8781052737cbaa936097dcedef43e64be6072cf57658ed3167922ba80be8c27b53ba1eb5c6ef84d8f927ae7defed1db17968651
diff --git a/kde-apps/marble/files/marble-23.04.3-cxx17-for-protobuf-23.patch b/kde-apps/marble/files/marble-23.04.3-cxx17-for-protobuf-23.patch
deleted file mode 100644
index b03f800bf19d..000000000000
--- a/kde-apps/marble/files/marble-23.04.3-cxx17-for-protobuf-23.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From dea7bb66fb0b89990c2ca69606d51f02af6c4cf1 Mon Sep 17 00:00:00 2001
-From: Albert Astals Cid <aacid@kde.org>
-Date: Tue, 11 Jul 2023 23:31:01 +0200
-Subject: [PATCH] Require C++17
-
-Newer protobuf will fail to compile without C++17
----
- CMakeLists.txt | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index c6d0e47ac0..b779501047 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -32,9 +32,9 @@ if ("${CMAKE_C_COMPILER_ID}" STREQUAL "GNU" OR "${CMAKE_C_COMPILER_ID}" STREQUAL
- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=iso9899:1990")
- endif()
- if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
-- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x")
-+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17")
- elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Intel" AND NOT WIN32)
-- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x")
-+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17")
- endif()
- # Default to hidden visibility for symbols
- set(CMAKE_C_VISIBILITY_PRESET hidden)
---
-GitLab
-
diff --git a/kde-apps/marble/marble-23.04.3.ebuild b/kde-apps/marble/marble-23.04.3.ebuild
deleted file mode 100644
index b81c7bcc5f26..000000000000
--- a/kde-apps/marble/marble-23.04.3.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2023 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.106.0
-QTMIN=5.15.9
-inherit ecm gear.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 +pbf phonon shapefile +webengine"
-
-# bug 588320
-RESTRICT="test"
-
-# FIXME (new package): libwlocate, WLAN-based geolocation
-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[qt5(+)] )
- shapefile? ( sci-libs/shapelib:= )
- webengine? (
- >=dev-qt/qtwebchannel-${QTMIN}:5
- >=dev-qt/qtwebengine-${QTMIN}:5[widgets]
- )
-"
-RDEPEND="${DEPEND}"
-BDEPEND="
- >=dev-qt/linguist-tools-${QTMIN}:5
- aprs? ( dev-lang/perl )
-"
-
-PATCHES=( "${FILESDIR}/${P}-cxx17-for-protobuf-23.patch" ) # bug 909081, in 23.08.0
-
-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
-}