commit: 30ba2161fc1d32508cd92b32ded8dd18e7172fda Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Thu Aug 26 15:20:55 2021 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Thu Aug 26 15:20:55 2021 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=30ba2161
kde-plasma/discover: Disable updates KCM Upstream commit 725ae1f2b9d4a8995881faafb323c541ff6d3c1b See also: https://invent.kde.org/plasma/discover/-/merge_requests/142 Package-Manager: Portage-3.0.22, Repoman-3.0.3 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> kde-plasma/discover/discover-5.22.49.9999.ebuild | 6 ++++- kde-plasma/discover/discover-9999.ebuild | 1 + .../files/discover-5.22.5-no-updates-kcm.patch | 30 ++++++++++++++++++++++ 3 files changed, 36 insertions(+), 1 deletion(-) diff --git a/kde-plasma/discover/discover-5.22.49.9999.ebuild b/kde-plasma/discover/discover-5.22.49.9999.ebuild index 18cba0b621..7326ebca86 100644 --- a/kde-plasma/discover/discover-5.22.49.9999.ebuild +++ b/kde-plasma/discover/discover-5.22.49.9999.ebuild @@ -56,7 +56,10 @@ RDEPEND="${DEPEND} >=kde-frameworks/kirigami-${KFMIN}:5 " -PATCHES=( "${FILESDIR}/${PN}-5.21.90-tests-optional.patch" ) +PATCHES=( + "${FILESDIR}/${PN}-5.21.90-tests-optional.patch" + "${FILESDIR}/${PN}-5.22.5-no-updates-kcm.patch" +) src_prepare() { ecm_src_prepare @@ -68,6 +71,7 @@ src_configure() { local mycmakeargs=( -DCMAKE_DISABLE_FIND_PACKAGE_packagekitqt5=ON -DCMAKE_DISABLE_FIND_PACKAGE_Snapd=ON + -DWITH_KCM=OFF -DBUILD_FlatpakBackend=$(usex flatpak) $(cmake_use_find_package flatpak AppStreamQt) -DBUILD_FwupdBackend=$(usex firmware) diff --git a/kde-plasma/discover/discover-9999.ebuild b/kde-plasma/discover/discover-9999.ebuild index 2fc53ff9f1..c94a2d0760 100644 --- a/kde-plasma/discover/discover-9999.ebuild +++ b/kde-plasma/discover/discover-9999.ebuild @@ -68,6 +68,7 @@ src_configure() { local mycmakeargs=( -DCMAKE_DISABLE_FIND_PACKAGE_packagekitqt5=ON -DCMAKE_DISABLE_FIND_PACKAGE_Snapd=ON + -DWITH_KCM=OFF -DBUILD_FlatpakBackend=$(usex flatpak) $(cmake_use_find_package flatpak AppStreamQt) -DBUILD_FwupdBackend=$(usex firmware) diff --git a/kde-plasma/discover/files/discover-5.22.5-no-updates-kcm.patch b/kde-plasma/discover/files/discover-5.22.5-no-updates-kcm.patch new file mode 100644 index 0000000000..e2c21ac1b9 --- /dev/null +++ b/kde-plasma/discover/files/discover-5.22.5-no-updates-kcm.patch @@ -0,0 +1,30 @@ +From 725ae1f2b9d4a8995881faafb323c541ff6d3c1b Mon Sep 17 00:00:00 2001 +From: Antonio Rojas <aro...@archlinux.org> +Date: Thu, 1 Jul 2021 22:24:40 +0200 +Subject: [PATCH] Make building updates KCM optional + +Some distros (such as Arch) don't support offline updates or automatic updates, so the options in the KCM are misleading and can cause unexpected behavior. +--- + CMakeLists.txt | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index fa27fc77a..26387b2f0 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -53,7 +53,11 @@ add_subdirectory(libdiscover) + add_subdirectory(discover) + add_subdirectory(exporter) + add_subdirectory(update) +-add_subdirectory(kcm) ++ ++option(WITH_KCM "Build and install the updates KCM" ON) ++if(WITH_KCM) ++ add_subdirectory(kcm) ++endif() + + option(WITH_NOTIFIER "Build and install the notifier plasmoid" ON) + if(WITH_NOTIFIER) +-- +GitLab +
