commit: 0c51122bbb5e82a36b9d8d0a2f97e8dc94521c77 Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org> AuthorDate: Sun Apr 2 19:56:48 2023 +0000 Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org> CommitDate: Fri Apr 21 20:18:22 2023 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=0c51122b
kde-plasma/discover: add flag for snap support Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org> Closes: https://github.com/gentoo/kde/pull/919 Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org> kde-plasma/discover/discover-5.27.49.9999.ebuild | 12 ++++++++++-- kde-plasma/discover/discover-9999.ebuild | 12 ++++++++++-- kde-plasma/discover/metadata.xml | 1 + 3 files changed, 21 insertions(+), 4 deletions(-) diff --git a/kde-plasma/discover/discover-5.27.49.9999.ebuild b/kde-plasma/discover/discover-5.27.49.9999.ebuild index f69e4ec7b2..9f54843dc7 100644 --- a/kde-plasma/discover/discover-5.27.49.9999.ebuild +++ b/kde-plasma/discover/discover-5.27.49.9999.ebuild @@ -15,7 +15,7 @@ HOMEPAGE="https://userbase.kde.org/Discover"; LICENSE="GPL-2" # TODO: CHECK SLOT="5" KEYWORDS="" -IUSE="+firmware flatpak telemetry webengine" +IUSE="+firmware flatpak snap telemetry webengine" # libmarkdown (app-text/discount) only used in PackageKitBackend DEPEND=" @@ -45,11 +45,13 @@ DEPEND=" >=kde-frameworks/purpose-${KFMIN}:5 firmware? ( >=sys-apps/fwupd-1.5.0 ) flatpak? ( sys-apps/flatpak ) + snap? ( sys-libs/snapd-glib:=[qt5] ) telemetry? ( dev-libs/kuserfeedback:5 ) webengine? ( >=dev-qt/qtwebview-${QTMIN}:5 ) " RDEPEND="${DEPEND} >=dev-qt/qtquickcontrols2-${QTMIN}:5 + snap? ( app-containers/snapd ) " BDEPEND=">=kde-frameworks/kcmutils-${KFMIN}:5" @@ -67,11 +69,17 @@ src_prepare() { src_configure() { local mycmakeargs=( + # TODO: Port PackageKit's portage back-end to python3 -DCMAKE_DISABLE_FIND_PACKAGE_packagekitqt5=ON - -DCMAKE_DISABLE_FIND_PACKAGE_Snapd=ON + # Automated updates will not work for us + # https://invent.kde.org/plasma/discover/-/merge_requests/142 -DWITH_KCM=OFF + -DBUILD_DummyBackend=OFF -DBUILD_FlatpakBackend=$(usex flatpak) -DBUILD_FwupdBackend=$(usex firmware) + -DBUILD_RpmOstreeBackend=OFF + -DBUILD_SnapBackend=$(usex snap) + -DBUILD_SteamOSBackend=OFF $(cmake_use_find_package telemetry KUserFeedback) $(cmake_use_find_package webengine Qt5WebView) ) diff --git a/kde-plasma/discover/discover-9999.ebuild b/kde-plasma/discover/discover-9999.ebuild index f69e4ec7b2..9f54843dc7 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 telemetry webengine" +IUSE="+firmware flatpak snap telemetry webengine" # libmarkdown (app-text/discount) only used in PackageKitBackend DEPEND=" @@ -45,11 +45,13 @@ DEPEND=" >=kde-frameworks/purpose-${KFMIN}:5 firmware? ( >=sys-apps/fwupd-1.5.0 ) flatpak? ( sys-apps/flatpak ) + snap? ( sys-libs/snapd-glib:=[qt5] ) telemetry? ( dev-libs/kuserfeedback:5 ) webengine? ( >=dev-qt/qtwebview-${QTMIN}:5 ) " RDEPEND="${DEPEND} >=dev-qt/qtquickcontrols2-${QTMIN}:5 + snap? ( app-containers/snapd ) " BDEPEND=">=kde-frameworks/kcmutils-${KFMIN}:5" @@ -67,11 +69,17 @@ src_prepare() { src_configure() { local mycmakeargs=( + # TODO: Port PackageKit's portage back-end to python3 -DCMAKE_DISABLE_FIND_PACKAGE_packagekitqt5=ON - -DCMAKE_DISABLE_FIND_PACKAGE_Snapd=ON + # Automated updates will not work for us + # https://invent.kde.org/plasma/discover/-/merge_requests/142 -DWITH_KCM=OFF + -DBUILD_DummyBackend=OFF -DBUILD_FlatpakBackend=$(usex flatpak) -DBUILD_FwupdBackend=$(usex firmware) + -DBUILD_RpmOstreeBackend=OFF + -DBUILD_SnapBackend=$(usex snap) + -DBUILD_SteamOSBackend=OFF $(cmake_use_find_package telemetry KUserFeedback) $(cmake_use_find_package webengine Qt5WebView) ) diff --git a/kde-plasma/discover/metadata.xml b/kde-plasma/discover/metadata.xml index dd2b69f939..13c683e940 100644 --- a/kde-plasma/discover/metadata.xml +++ b/kde-plasma/discover/metadata.xml @@ -12,6 +12,7 @@ <use> <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="snap">Enable support for snap packages using <pkg>app-containers/snapd</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>
