commit: b557ce87a82bda203b010127e532a16e6f219232 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Tue Sep 20 18:52:30 2022 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Tue Sep 20 19:05:00 2022 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=b557ce87
kde-plasma/discover: Add IUSE webengine, respin tests-optional.patch Upstream commit 08f0ab031e74d722fd2b569f89c98f1c61a00b35 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> kde-plasma/discover/discover-5.25.90.ebuild | 4 +++- kde-plasma/discover/discover-5.26.49.9999.ebuild | 4 +++- kde-plasma/discover/discover-9999.ebuild | 5 +++-- .../files/discover-5.25.90-tests-optional.patch | 26 ++++++++++------------ kde-plasma/discover/metadata.xml | 1 + 5 files changed, 22 insertions(+), 18 deletions(-) diff --git a/kde-plasma/discover/discover-5.25.90.ebuild b/kde-plasma/discover/discover-5.25.90.ebuild index a7aa853225..1f6fd4255c 100644 --- a/kde-plasma/discover/discover-5.25.90.ebuild +++ b/kde-plasma/discover/discover-5.25.90.ebuild @@ -15,7 +15,7 @@ HOMEPAGE="https://userbase.kde.org/Discover"; LICENSE="GPL-2" # TODO: CHECK SLOT="5" KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" -IUSE="+firmware flatpak share telemetry" +IUSE="+firmware flatpak share telemetry webengine" # libmarkdown (app-text/discount) only used in PackageKitBackend DEPEND=" @@ -50,6 +50,7 @@ DEPEND=" ) share? ( >=kde-frameworks/purpose-${KFMIN}:5 ) telemetry? ( dev-libs/kuserfeedback:5 ) + webengine? ( >=dev-qt/qtwebview-${QTMIN}:5 ) " RDEPEND="${DEPEND} >=dev-qt/qtquickcontrols2-${QTMIN}:5 @@ -77,6 +78,7 @@ src_configure() { -DBUILD_FwupdBackend=$(usex firmware) $(cmake_use_find_package share KF5Purpose) $(cmake_use_find_package telemetry KUserFeedback) + $(cmake_use_find_package webengine Qt5WebView) ) ecm_src_configure diff --git a/kde-plasma/discover/discover-5.26.49.9999.ebuild b/kde-plasma/discover/discover-5.26.49.9999.ebuild index b1f9e2848c..dc5b90d983 100644 --- a/kde-plasma/discover/discover-5.26.49.9999.ebuild +++ b/kde-plasma/discover/discover-5.26.49.9999.ebuild @@ -15,7 +15,7 @@ HOMEPAGE="https://userbase.kde.org/Discover"; LICENSE="GPL-2" # TODO: CHECK SLOT="5" KEYWORDS="" -IUSE="+firmware flatpak share telemetry" +IUSE="+firmware flatpak share telemetry webengine" # libmarkdown (app-text/discount) only used in PackageKitBackend DEPEND=" @@ -50,6 +50,7 @@ DEPEND=" ) share? ( >=kde-frameworks/purpose-${KFMIN}:5 ) telemetry? ( dev-libs/kuserfeedback:5 ) + webengine? ( >=dev-qt/qtwebview-${QTMIN}:5 ) " RDEPEND="${DEPEND} >=dev-qt/qtquickcontrols2-${QTMIN}:5 @@ -77,6 +78,7 @@ src_configure() { -DBUILD_FwupdBackend=$(usex firmware) $(cmake_use_find_package share KF5Purpose) $(cmake_use_find_package telemetry KUserFeedback) + $(cmake_use_find_package webengine Qt5WebView) ) ecm_src_configure diff --git a/kde-plasma/discover/discover-9999.ebuild b/kde-plasma/discover/discover-9999.ebuild index e7a86646e9..9d527966ea 100644 --- a/kde-plasma/discover/discover-9999.ebuild +++ b/kde-plasma/discover/discover-9999.ebuild @@ -15,7 +15,7 @@ HOMEPAGE="https://userbase.kde.org/Discover"; LICENSE="GPL-2" # TODO: CHECK SLOT="5" KEYWORDS="" -IUSE="+firmware flatpak share telemetry" +IUSE="+firmware flatpak share telemetry webengine" # libmarkdown (app-text/discount) only used in PackageKitBackend DEPEND=" @@ -24,7 +24,6 @@ DEPEND=" >=dev-qt/qtdeclarative-${QTMIN}:5 >=dev-qt/qtgui-${QTMIN}:5 >=dev-qt/qtnetwork-${QTMIN}:5 - >=dev-qt/qtwebview-${QTMIN}:5 >=dev-qt/qtwidgets-${QTMIN}:5 >=dev-qt/qtxml-${QTMIN}:5 >=kde-frameworks/attica-${KFMIN}:5 @@ -50,6 +49,7 @@ DEPEND=" ) share? ( >=kde-frameworks/purpose-${KFMIN}:5 ) telemetry? ( dev-libs/kuserfeedback:5 ) + webengine? ( >=dev-qt/qtwebview-${QTMIN}:5 ) " RDEPEND="${DEPEND} >=dev-qt/qtquickcontrols2-${QTMIN}:5 @@ -77,6 +77,7 @@ src_configure() { -DBUILD_FwupdBackend=$(usex firmware) $(cmake_use_find_package share KF5Purpose) $(cmake_use_find_package telemetry KUserFeedback) + $(cmake_use_find_package webengine Qt5WebView) ) ecm_src_configure diff --git a/kde-plasma/discover/files/discover-5.25.90-tests-optional.patch b/kde-plasma/discover/files/discover-5.25.90-tests-optional.patch index 188f7d5b9e..50f1175116 100644 --- a/kde-plasma/discover/files/discover-5.25.90-tests-optional.patch +++ b/kde-plasma/discover/files/discover-5.25.90-tests-optional.patch @@ -1,4 +1,4 @@ -From e7ff50753b17ba97c3abfe08dfe2eb43f264ab6b Mon Sep 17 00:00:00 2001 +From 8706a81bccfbaf9d06a3aedf9f968d760757af07 Mon Sep 17 00:00:00 2001 From: Andreas Sturmlechner <[email protected]> Date: Fri, 14 May 2021 12:38:57 +0200 Subject: [PATCH] Use BUILD_TESTING to make tests optional @@ -7,30 +7,28 @@ Variable is provided by KDECMakeSettings and default enabled. Signed-off-by: Andreas Sturmlechner <[email protected]> --- - CMakeLists.txt | 6 +++++- + CMakeLists.txt | 4 ++++ 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(-) + 5 files changed, 16 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index 3127d0e92..4fac1c926 100644 +index 13fe64228..7453c8bfb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -22,7 +22,11 @@ include(GenerateExportHeader) - include(ECMQtDeclareLoggingCategory) - include(KDEClangFormat) - include(KDEGitCommitHooks) --find_package(Qt${QT_MAJOR_VERSION} ${QT_MIN_VERSION} REQUIRED CONFIG COMPONENTS Widgets Test Network Xml Concurrent DBus Quick WebView) -+find_package(Qt${QT_MAJOR_VERSION} ${QT_MIN_VERSION} REQUIRED CONFIG COMPONENTS Widgets Network Xml Concurrent DBus Quick WebView) -+ +@@ -25,6 +25,10 @@ include(KDEGitCommitHooks) + find_package(Qt${QT_MAJOR_VERSION} ${QT_MIN_VERSION} REQUIRED CONFIG COMPONENTS Widgets Test Network Xml Concurrent DBus Quick) + find_package(Qt${QT_MAJOR_VERSION} ${QT_MIN_VERSION} CONFIG OPTIONAL_COMPONENTS WebView) + +if(BUILD_TESTING) -+ find_package(Qt${QT_MAJOR_VERSION} ${QT_MIN_VERSION} CONFIG REQUIRED) ++ find_package(Qt${QT_MAJOR_VERSION}Test ${QT_MIN_VERSION} CONFIG REQUIRED) +endif() - ++ find_package(PkgConfig REQUIRED) + find_package(KF5 ${KF5_MIN_VERSION} REQUIRED CoreAddons Config Crash DBusAddons I18n Archive XmlGui KIO Declarative KCMUtils IdleTime Notifications Purpose) diff --git a/libdiscover/CMakeLists.txt b/libdiscover/CMakeLists.txt index 023b110fd..7778fab0c 100644 --- a/libdiscover/CMakeLists.txt @@ -59,7 +57,7 @@ index 5b4aef10c..38377d808 100644 set(dummy-backend_SRCS DummyResource.cpp diff --git a/libdiscover/backends/FlatpakBackend/CMakeLists.txt b/libdiscover/backends/FlatpakBackend/CMakeLists.txt -index a051a4a21..f228f1ec0 100644 +index eac5a3241..e9ee78fd0 100644 --- a/libdiscover/backends/FlatpakBackend/CMakeLists.txt +++ b/libdiscover/backends/FlatpakBackend/CMakeLists.txt @@ -1,4 +1,6 @@ diff --git a/kde-plasma/discover/metadata.xml b/kde-plasma/discover/metadata.xml index d275ea3a63..cac82ca8e8 100644 --- a/kde-plasma/discover/metadata.xml +++ b/kde-plasma/discover/metadata.xml @@ -12,5 +12,6 @@ <flag name="share">Enable support for a sharing application URLs <pkg>kde-frameworks/purpose</pkg></flag> <flag name="firmware">Enable support for firmware upgrades using <pkg>sys-apps/fwupd</pkg></flag> <flag name="flatpak">Enable support for flatpak repositories using <pkg>sys-apps/flatpak</pkg></flag> + <flag name="webengine">Enable webflow support using <pkg>dev-qt/qtwebview</pkg> and <pkg>dev-qt/qtwebengine</pkg> instead of default URL handler</flag> </use> </pkgmetadata>
