diff options
| -rw-r--r-- | kde-plasma/discover/Manifest | 1 | ||||
| -rw-r--r-- | kde-plasma/discover/discover-5.22.0.ebuild | 87 | ||||
| -rw-r--r-- | kde-plasma/discover/files/discover-5.21.90-tests-optional.patch | 94 |
3 files changed, 182 insertions, 0 deletions
diff --git a/kde-plasma/discover/Manifest b/kde-plasma/discover/Manifest index f1da674d1b6d..a6da738a9b72 100644 --- a/kde-plasma/discover/Manifest +++ b/kde-plasma/discover/Manifest @@ -1 +1,2 @@ DIST discover-5.21.5.tar.xz 8431164 BLAKE2B 36d539ec0efdfa9d70c6fa3d45fb8abba5228d35a1d7260fa701610a9859ce7c9bd3d98e12b67dade598358a60ceeae78300635ea5ceb1017cc7e7fa3b046c11 SHA512 933a16dd5f99c18e61fdf77330a78e3c5251d13ce6aa99daa4f7b939320a3ddde2c66ead85e1bc31e7719c0cf657ef46516f35f08863cd6f2be25efcbf156fbf +DIST discover-5.22.0.tar.xz 8455148 BLAKE2B 7ce36561ad5e1dc221b62b81822e49878f0b76ebcfc05278338ac90e90847a4cfbe3330146fac679aeedde20eeff14bed35d7696aace1f975030f58353f2190b SHA512 0612ef86b1a49ea06da9a89e5ef537d34d80ad3c9b748d1e91e6e574670eb545094eb52e858747567c82b0d13a064fb27a8378d1eda3059fb1e1958ad30df945 diff --git a/kde-plasma/discover/discover-5.22.0.ebuild b/kde-plasma/discover/discover-5.22.0.ebuild new file mode 100644 index 000000000000..fa2059c11ccd --- /dev/null +++ b/kde-plasma/discover/discover-5.22.0.ebuild @@ -0,0 +1,87 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +ECM_TEST="true" +KFMIN=5.82.0 +QTMIN=5.15.2 +VIRTUALX_REQUIRED="test" +inherit ecm kde.org + +DESCRIPTION="KDE Plasma resources management GUI" +HOMEPAGE="https://userbase.kde.org/Discover" + +LICENSE="GPL-2" # TODO: CHECK +SLOT="5" +KEYWORDS="~amd64" +IUSE="+firmware flatpak telemetry" + +# libmarkdown (app-text/discount) only used in PackageKitBackend +DEPEND=" + >=dev-qt/qtconcurrent-${QTMIN}:5 + >=dev-qt/qtdbus-${QTMIN}:5 + >=dev-qt/qtdeclarative-${QTMIN}:5 + >=dev-qt/qtgui-${QTMIN}:5 + >=dev-qt/qtnetwork-${QTMIN}:5 + >=dev-qt/qtwidgets-${QTMIN}:5 + >=dev-qt/qtx11extras-${QTMIN}:5 + >=dev-qt/qtxml-${QTMIN}:5 + >=kde-frameworks/attica-${KFMIN}:5 + >=kde-frameworks/kcmutils-${KFMIN}:5 + >=kde-frameworks/kconfig-${KFMIN}:5 + >=kde-frameworks/kconfigwidgets-${KFMIN}:5 + >=kde-frameworks/kcoreaddons-${KFMIN}:5 + >=kde-frameworks/kcrash-${KFMIN}:5 + >=kde-frameworks/kdbusaddons-${KFMIN}:5 + >=kde-frameworks/kdeclarative-${KFMIN}:5 + >=kde-frameworks/ki18n-${KFMIN}:5 + >=kde-frameworks/kidletime-${KFMIN}:5 + >=kde-frameworks/kio-${KFMIN}:5 + >=kde-frameworks/kirigami-${KFMIN}:5 + >=kde-frameworks/kitemmodels-${KFMIN}:5 + >=kde-frameworks/knewstuff-${KFMIN}:5 + >=kde-frameworks/knotifications-${KFMIN}:5 + >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 + >=kde-frameworks/kxmlgui-${KFMIN}:5 + firmware? ( >=sys-apps/fwupd-1.5.0 ) + flatpak? ( + >=dev-libs/appstream-0.12.8:= + sys-apps/flatpak + ) + telemetry? ( dev-libs/kuserfeedback:5 ) +" +RDEPEND="${DEPEND} + >=dev-qt/qtquickcontrols2-${QTMIN}:5 + >=kde-frameworks/kirigami-${KFMIN}:5 +" + +PATCHES=( "${FILESDIR}/${PN}-5.21.90-tests-optional.patch" ) + +src_prepare() { + ecm_src_prepare + # we don't need it with PackageKitBackend off + ecm_punt_bogus_dep KF5 Archive +} + +src_configure() { + local mycmakeargs=( + -DCMAKE_DISABLE_FIND_PACKAGE_packagekitqt5=ON + -DCMAKE_DISABLE_FIND_PACKAGE_Snapd=ON + -DBUILD_FlatpakBackend=$(usex flatpak) + $(cmake_use_find_package flatpak AppStreamQt) + -DBUILD_FwupdBackend=$(usex firmware) + $(cmake_use_find_package telemetry KUserFeedback) + ) + + ecm_src_configure +} + +src_test() { + # bug 686392: needs network connection + local myctestargs=( + -E "(knsbackendtest)" + ) + + ecm_src_test +} diff --git a/kde-plasma/discover/files/discover-5.21.90-tests-optional.patch b/kde-plasma/discover/files/discover-5.21.90-tests-optional.patch new file mode 100644 index 000000000000..43976d145baf --- /dev/null +++ b/kde-plasma/discover/files/discover-5.21.90-tests-optional.patch @@ -0,0 +1,94 @@ +From f9e0be7a43665a7020e4bfffde0f48b332ec366b Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner <asturm@gentoo.org> +Date: Fri, 14 May 2021 12:38:57 +0200 +Subject: [PATCH] Use BUILD_TESTING to make tests optional + +Variable is provided by KDECMakeSettings and default enabled. + +Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org> +--- + CMakeLists.txt | 6 +++++- + libdiscover/CMakeLists.txt | 4 +++- + libdiscover/backends/DummyBackend/CMakeLists.txt | 4 +++- + libdiscover/backends/FlatpakBackend/CMakeLists.txt | 4 +++- + libdiscover/backends/KNSBackend/CMakeLists.txt | 4 +++- + 5 files changed, 17 insertions(+), 5 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 73061dde..7d230317 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -11,7 +11,7 @@ find_package(ECM ${KF5_MIN_VERSION} REQUIRED NO_MODULE) + + set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake") + +-find_package(Qt5 ${QT_MIN_VERSION} REQUIRED CONFIG COMPONENTS Widgets Test Network Xml Concurrent DBus Quick X11Extras) ++find_package(Qt5 ${QT_MIN_VERSION} REQUIRED CONFIG COMPONENTS Widgets Network Xml Concurrent DBus Quick X11Extras) + include(KDEInstallDirs) + include(KDECMakeSettings) + include(KDECompilerSettings NO_POLICY_SCOPE) +@@ -23,6 +23,10 @@ include(ECMQtDeclareLoggingCategory) + include(KDEClangFormat) + include(KDEGitCommitHooks) + ++if(BUILD_TESTING) ++ find_package(Qt5Test ${QT_MIN_VERSION} CONFIG REQUIRED) ++endif() ++ + find_package(PkgConfig REQUIRED) + + find_package(KF5 ${KF5_MIN_VERSION} REQUIRED CoreAddons Config Crash DBusAddons I18n Archive XmlGui ItemModels KIO Declarative KCMUtils IdleTime) +diff --git a/libdiscover/CMakeLists.txt b/libdiscover/CMakeLists.txt +index 661c371b..56c72008 100644 +--- a/libdiscover/CMakeLists.txt ++++ b/libdiscover/CMakeLists.txt +@@ -4,7 +4,9 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config-paths.h.cmake ${CMAKE_CURRENT_ + + add_subdirectory(backends) + add_subdirectory(notifiers) +-add_subdirectory(tests) ++if(BUILD_TESTING) ++ add_subdirectory(tests) ++endif() + + set(discovercommon_SRCS + Category/Category.cpp +diff --git a/libdiscover/backends/DummyBackend/CMakeLists.txt b/libdiscover/backends/DummyBackend/CMakeLists.txt +index 5b4aef10..38377d80 100644 +--- a/libdiscover/backends/DummyBackend/CMakeLists.txt ++++ b/libdiscover/backends/DummyBackend/CMakeLists.txt +@@ -1,4 +1,6 @@ +-add_subdirectory(tests) ++if(BUILD_TESTING) ++ add_subdirectory(tests) ++endif() + + set(dummy-backend_SRCS + DummyResource.cpp +diff --git a/libdiscover/backends/FlatpakBackend/CMakeLists.txt b/libdiscover/backends/FlatpakBackend/CMakeLists.txt +index 2006a829..810238f0 100644 +--- a/libdiscover/backends/FlatpakBackend/CMakeLists.txt ++++ b/libdiscover/backends/FlatpakBackend/CMakeLists.txt +@@ -1,4 +1,6 @@ +-add_subdirectory(tests) ++if(BUILD_TESTING) ++ add_subdirectory(tests) ++endif() + + set(flatpak-backend_SRCS + FlatpakResource.cpp +diff --git a/libdiscover/backends/KNSBackend/CMakeLists.txt b/libdiscover/backends/KNSBackend/CMakeLists.txt +index e2cb4e52..195cb98a 100644 +--- a/libdiscover/backends/KNSBackend/CMakeLists.txt ++++ b/libdiscover/backends/KNSBackend/CMakeLists.txt +@@ -1,4 +1,6 @@ +-add_subdirectory(tests) ++if(BUILD_TESTING) ++ add_subdirectory(tests) ++endif() + + add_library(kns-backend MODULE + KNSBackend.cpp +-- +2.31.1 + |