From e90e45cf7169f4fb5d0aeccdc9814f6213864e6d Mon Sep 17 00:00:00 2001 From: Oliver Smith Date: Sun, 8 Dec 2024 15:07:53 +0100 Subject: [PATCH] main/postmarketos-base-ui-gnome: fix polkit conflict, pt. 2 (MR 5886) Move the polkit-elogind into depends= instead of pmb_recommends=, so packages depending on postmarketos-base-ui-gnome can build successfully again. The previous fix only helped for "pmbootstrap install", this fix will help for both cases. Without this, e.g. postmarketos-base-ui-gnome-mobile fails to build: https://builds.sr.ht/~postmarketos/job/1384469 [ci:skip-build]: already built successfully in CI --- main/postmarketos-base-ui-gnome/APKBUILD | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/main/postmarketos-base-ui-gnome/APKBUILD b/main/postmarketos-base-ui-gnome/APKBUILD index 013038f4b..14872803e 100644 --- a/main/postmarketos-base-ui-gnome/APKBUILD +++ b/main/postmarketos-base-ui-gnome/APKBUILD @@ -1,11 +1,13 @@ # Maintainer: Oliver Smith pkgname=postmarketos-base-ui-gnome pkgver=4 -pkgrel=1 +pkgrel=2 pkgdesc="Meta package for shared configuration for GNOME-based UIs" url="https://postmarketos.org" arch="noarch" license="GPL-3.0-or-later" +# polkit-elogind is needed so apk can resolve polkit: +# https://gitlab.alpinelinux.org/alpine/apk-tools/-/issues/11054 depends=" dnsmasq gcr-ssh-agent @@ -16,6 +18,7 @@ depends=" postmarketos-artwork-wallpapers postmarketos-base-ui postmarketos-base-ui-networkmanager + polkit-elogind power-profiles-daemon xdg-desktop-portal-gnome xdg-desktop-portal-gtk @@ -30,8 +33,6 @@ source=" options="!check" subpackages="$pkgname-openrc" -# polkit-elogind is needed so apk can resolve polkit: -# https://gitlab.alpinelinux.org/alpine/apk-tools/-/issues/11054 _pmb_recommends=" decibels firefox-esr @@ -49,7 +50,6 @@ _pmb_recommends=" loupe nautilus papers - polkit-elogind snapshot "