* [gentoo-commits] repo/gentoo:master commit in: kde-apps/marble/, kde-apps/marble/files/
@ 2020-06-15 10:18 Andreas Sturmlechner
0 siblings, 0 replies; 4+ messages in thread
From: Andreas Sturmlechner @ 2020-06-15 10:18 UTC (permalink / raw
To: gentoo-commits
commit: 09a05accbcf6dd2dee97f50fa05559aeebe6dd68
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 15 10:10:58 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Jun 15 10:18:41 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=09a05acc
kde-apps/marble: Add missing DEPEND
Filed upstream: https://invent.kde.org/education/marble/-/merge_requests/1
Reported-by: Jérôme Borme <jerome.borme <AT> laposte.net>
Closes: https://bugs.gentoo.org/728234
Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../marble/files/marble-20.04.2-missing-dep.patch | 43 +++++++++
kde-apps/marble/marble-20.04.2-r1.ebuild | 101 +++++++++++++++++++++
2 files changed, 144 insertions(+)
diff --git a/kde-apps/marble/files/marble-20.04.2-missing-dep.patch b/kde-apps/marble/files/marble-20.04.2-missing-dep.patch
new file mode 100644
index 00000000000..f4f71bdf1cc
--- /dev/null
+++ b/kde-apps/marble/files/marble-20.04.2-missing-dep.patch
@@ -0,0 +1,43 @@
+From c062504a2864680fee9c81ea46e7613315de038a Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Mon, 15 Jun 2020 11:24:32 +0200
+Subject: [PATCH] Add missing Qt5WebChannel dependency
+
+QWebChannel header is used in src/lib/marble/MarbleLegendBrowser.cpp
+since commit b42ee5c8 but apparently not always implicitly included.
+
+Downstream report: https://bugs.gentoo.org/728234
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ CMakeLists.txt | 1 +
+ src/lib/marble/CMakeLists.txt | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 631a5b7d7..a3b2139dc 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -126,6 +126,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL Android)
+
+ set ( MARBLE_NO_WEBKITWIDGETS TRUE )
+ else()
++ find_package(Qt5WebChannel ${REQUIRED_QT_VERSION})
+ find_package(Qt5WebEngine ${REQUIRED_QT_VERSION})
+ find_package(Qt5WebEngineWidgets ${REQUIRED_QT_VERSION})
+
+diff --git a/src/lib/marble/CMakeLists.txt b/src/lib/marble/CMakeLists.txt
+index e02c7d160..7d27be94b 100644
+--- a/src/lib/marble/CMakeLists.txt
++++ b/src/lib/marble/CMakeLists.txt
+@@ -395,6 +395,7 @@ target_link_libraries(marblewidget
+ if (NOT MARBLE_NO_WEBKITWIDGETS)
+ target_link_libraries(marblewidget
+ LINK_PUBLIC
++ Qt5::WebChannel
+ Qt5::WebEngineWidgets
+ Qt5::WebEngine
+ )
+--
+2.27.0
+
diff --git a/kde-apps/marble/marble-20.04.2-r1.ebuild b/kde-apps/marble/marble-20.04.2-r1.ebuild
new file mode 100644
index 00000000000..1e9c7aff9db
--- /dev/null
+++ b/kde-apps/marble/marble-20.04.2-r1.ebuild
@@ -0,0 +1,101 @@
+# 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.1
+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}-missing-dep.patch" )
+
+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
+}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-apps/marble/, kde-apps/marble/files/
@ 2020-09-27 18:40 Andreas Sturmlechner
0 siblings, 0 replies; 4+ messages in thread
From: Andreas Sturmlechner @ 2020-09-27 18:40 UTC (permalink / raw
To: gentoo-commits
commit: 9a4b8baa6cad9a48f162dfb82fe01baa66c20718
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 27 18:38:03 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Sep 27 18:39:48 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9a4b8baa
kde-apps/marble: Fix build w/ IUSE=gps and >=sci-libs/gpsd-3.21
Upstream commit 7039b70f0255376e5d67dad603f5d67f8c3c07db
Thanks-to: <mario.haustein <AT> hrz.tu-chemnitz.de>
Closes: https://bugs.gentoo.org/744823
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../marble/files/marble-20.04.3-gpsd-3.21.patch | 29 ++++++++++++++++++++++
kde-apps/marble/marble-20.04.3.ebuild | 2 ++
2 files changed, 31 insertions(+)
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
new file mode 100644
index 00000000000..acde5d8b661
--- /dev/null
+++ b/kde-apps/marble/files/marble-20.04.3-gpsd-3.21.patch
@@ -0,0 +1,29 @@
+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
index f6ee6bf963a..72acb503e88 100644
--- a/kde-apps/marble/marble-20.04.3.ebuild
+++ b/kde-apps/marble/marble-20.04.3.ebuild
@@ -64,6 +64,8 @@ RDEPEND="${DEPEND}"
# bug 588320
RESTRICT+=" test"
+PATCHES=( "${FILESDIR}/${P}-gpsd-3.21.patch" ) # bug 744823
+
src_prepare() {
ecm_src_prepare
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-apps/marble/, kde-apps/marble/files/
@ 2021-10-02 13:13 Andreas Sturmlechner
0 siblings, 0 replies; 4+ messages in thread
From: Andreas Sturmlechner @ 2021-10-02 13:13 UTC (permalink / raw
To: gentoo-commits
commit: 2760960ec94bb177c1941861a0a18a446620fcf2
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 2 13:10:49 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Oct 2 13:13:03 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2760960e
kde-apps/marble: Fix build with gpsd-3.23.1
STATUS_NO_FIX was renamed to STATUS_UNK.
See also:
https://invent.kde.org/education/marble/-/merge_requests/57
https://invent.kde.org/plasma/plasma-workspace/-/merge_requests/1078
Package-Manager: Portage-3.0.26, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../marble/files/marble-21.08.1-gpsd-3.23.1.patch | 32 ++++++++++++++++++++++
kde-apps/marble/marble-21.08.1.ebuild | 3 ++
2 files changed, 35 insertions(+)
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
new file mode 100644
index 00000000000..ee01af9e438
--- /dev/null
+++ b/kde-apps/marble/files/marble-21.08.1-gpsd-3.23.1.patch
@@ -0,0 +1,32 @@
+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
index 0e56f3ae9a6..4bcdb54ca1c 100644
--- a/kde-apps/marble/marble-21.08.1.ebuild
+++ b/kde-apps/marble/marble-21.08.1.ebuild
@@ -65,6 +65,9 @@ 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
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-apps/marble/, kde-apps/marble/files/
@ 2023-08-21 19:36 Andreas Sturmlechner
0 siblings, 0 replies; 4+ messages in thread
From: Andreas Sturmlechner @ 2023-08-21 19:36 UTC (permalink / raw
To: gentoo-commits
commit: 384f80153eacb97f62b8374dad7b201adc1dbcad
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 21 19:22:15 2023 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Aug 21 19:35:53 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=384f8015
kde-apps/marble: Fix build against >=dev-libs/protobuf-23.3
Bug: https://bugs.gentoo.org/909081
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../marble-23.04.3-cxx17-for-protobuf-23.patch | 29 ++++++++++++++++++++++
kde-apps/marble/marble-23.04.3.ebuild | 2 ++
2 files changed, 31 insertions(+)
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
new file mode 100644
index 000000000000..b03f800bf19d
--- /dev/null
+++ b/kde-apps/marble/files/marble-23.04.3-cxx17-for-protobuf-23.patch
@@ -0,0 +1,29 @@
+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
index a79dff3c4856..3aeec198fe42 100644
--- a/kde-apps/marble/marble-23.04.3.ebuild
+++ b/kde-apps/marble/marble-23.04.3.ebuild
@@ -64,6 +64,8 @@ BDEPEND="
aprs? ( dev-lang/perl )
"
+PATCHES=( "${FILESDIR}/${P}-cxx17-for-protobuf-23.patch" ) # bug 909081, in 23.08.0
+
src_prepare() {
ecm_src_prepare
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2023-08-21 19:36 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-10-02 13:13 [gentoo-commits] repo/gentoo:master commit in: kde-apps/marble/, kde-apps/marble/files/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2023-08-21 19:36 Andreas Sturmlechner
2020-09-27 18:40 Andreas Sturmlechner
2020-06-15 10:18 Andreas Sturmlechner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox