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 <ast...@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 <ast...@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 +}
