From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 11F2815ACFB for ; Fri, 21 Apr 2023 20:19:46 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 37891E0A49; Fri, 21 Apr 2023 20:19:45 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id EC462E0A49 for ; Fri, 21 Apr 2023 20:19:44 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id DB57D340F78 for ; Fri, 21 Apr 2023 20:19:43 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4EC87141 for ; Fri, 21 Apr 2023 20:19:42 +0000 (UTC) From: "Andrew Ammerlaan" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andrew Ammerlaan" Message-ID: <1682108302.0c51122bbb5e82a36b9d8d0a2f97e8dc94521c77.andrewammerlaan@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: kde-plasma/discover/ X-VCS-Repository: proj/kde X-VCS-Files: kde-plasma/discover/discover-5.27.49.9999.ebuild kde-plasma/discover/discover-9999.ebuild kde-plasma/discover/metadata.xml X-VCS-Directories: kde-plasma/discover/ X-VCS-Committer: andrewammerlaan X-VCS-Committer-Name: Andrew Ammerlaan X-VCS-Revision: 0c51122bbb5e82a36b9d8d0a2f97e8dc94521c77 X-VCS-Branch: master Date: Fri, 21 Apr 2023 20:19:42 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 4062d79d-9522-4654-a2fa-4c142b911ecc X-Archives-Hash: f15f7b9f1ab5a394ba1056a56d76fcb7 commit: 0c51122bbb5e82a36b9d8d0a2f97e8dc94521c77 Author: Andrew Ammerlaan gentoo org> AuthorDate: Sun Apr 2 19:56:48 2023 +0000 Commit: Andrew Ammerlaan gentoo 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 gentoo.org> Closes: https://github.com/gentoo/kde/pull/919 Signed-off-by: Andrew Ammerlaan 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 @@ Enable support for firmware upgrades using sys-apps/fwupd Enable support for flatpak repositories using sys-apps/flatpak + Enable support for snap packages using app-containers/snapd Enable webflow support using dev-qt/qtwebview and dev-qt/qtwebengine instead of default URL handler