From 59b83d7847d7b1756cef1bc6d0a308688f83b509 Mon Sep 17 00:00:00 2001 From: Clayton Craft Date: Fri, 17 May 2024 12:20:29 -0700 Subject: [PATCH] main/postmarketos-ui-*: remove hardcoded dependency on pulseaudio (MR 5145) This allows the audio switching backend stuff to work on all UIs (see !5072 / 87d355e08). For example, users of any UI can switch audio backends by installing one of the pmos-base-ui-audio-* metapackages. [ci:skip-build] already built successfully in CI --- main/postmarketos-base-ui-gnome/APKBUILD | 3 +-- main/postmarketos-base-ui-plasma/APKBUILD | 3 +-- main/postmarketos-ui-bananui/APKBUILD | 3 +-- main/postmarketos-ui-kodi/APKBUILD | 3 +-- main/postmarketos-ui-lxqt/APKBUILD | 4 +--- main/postmarketos-ui-mate/APKBUILD | 3 +-- main/postmarketos-ui-sway/APKBUILD | 3 +-- main/postmarketos-ui-xfce4/APKBUILD | 3 +-- 8 files changed, 8 insertions(+), 17 deletions(-) diff --git a/main/postmarketos-base-ui-gnome/APKBUILD b/main/postmarketos-base-ui-gnome/APKBUILD index c34e84bf9..6c53a1ad7 100644 --- a/main/postmarketos-base-ui-gnome/APKBUILD +++ b/main/postmarketos-base-ui-gnome/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Oliver Smith pkgname=postmarketos-base-ui-gnome pkgver=3 -pkgrel=6 +pkgrel=7 pkgdesc="Meta package for shared configuration for GNOME-based UIs" url="https://postmarketos.org" arch="noarch" @@ -16,7 +16,6 @@ depends=" postmarketos-base-ui postmarketos-base-ui-networkmanager power-profiles-daemon - pulseaudio xdg-desktop-portal-gnome xdg-desktop-portal-gtk xdg-user-dirs diff --git a/main/postmarketos-base-ui-plasma/APKBUILD b/main/postmarketos-base-ui-plasma/APKBUILD index 30629f44e..7e08cc193 100644 --- a/main/postmarketos-base-ui-plasma/APKBUILD +++ b/main/postmarketos-base-ui-plasma/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Bart Ribbers pkgname=postmarketos-base-ui-plasma pkgver=2 -pkgrel=3 +pkgrel=4 pkgdesc="Meta package for shared configuration for Plasma-based UIs" url="https://postmarketos.org" arch="noarch !armhf" # armhf is not supported @@ -21,7 +21,6 @@ depends=" postmarketos-base-ui postmarketos-base-ui-networkmanager powerdevil - pulseaudio urfkill xdg-desktop-portal-kde " diff --git a/main/postmarketos-ui-bananui/APKBUILD b/main/postmarketos-ui-bananui/APKBUILD index d5298b182..4402df63e 100644 --- a/main/postmarketos-ui-bananui/APKBUILD +++ b/main/postmarketos-ui-bananui/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Affe Null pkgname=postmarketos-ui-bananui pkgver=1 -pkgrel=0 +pkgrel=1 pkgdesc="(Wayland) Keypad controlled UI for feature phones" url="https://git.abscue.de/obp/bananui" arch="noarch" @@ -14,7 +14,6 @@ depends=" pam-rundir postmarketos-base-ui postmarketos-base-ui-networkmanager - pulseaudio seatd seatd-openrc tinydm diff --git a/main/postmarketos-ui-kodi/APKBUILD b/main/postmarketos-ui-kodi/APKBUILD index 68f890bbf..dcf389dec 100644 --- a/main/postmarketos-ui-kodi/APKBUILD +++ b/main/postmarketos-ui-kodi/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Bart Ribbers pkgname=postmarketos-ui-kodi pkgver=2 -pkgrel=7 +pkgrel=8 pkgdesc="(GBM) 10-foot UI useful on TV's" url="https://kodi.tv" # kodi does not know of other archs @@ -17,7 +17,6 @@ depends=" polkit-elogind postmarketos-base-ui postmarketos-base-ui-networkmanager - pulseaudio upower " install="$pkgname.post-install $pkgname.post-upgrade" diff --git a/main/postmarketos-ui-lxqt/APKBUILD b/main/postmarketos-ui-lxqt/APKBUILD index 453e48808..d9e2c1a9c 100644 --- a/main/postmarketos-ui-lxqt/APKBUILD +++ b/main/postmarketos-ui-lxqt/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Antoni Aloy pkgname=postmarketos-ui-lxqt pkgver=0.3 -pkgrel=0 +pkgrel=1 pkgdesc="(X11) Lightweight Qt Desktop Environment (stylus recommended)" url="https://lxqt-project.org/" # armhf: lxqt-desktop not available @@ -41,8 +41,6 @@ _pmb_recommends=" pavucontrol-qt pm-utils postmarketos-artwork-wallpapers - pulseaudio - pulseaudio-utils qps screengrab unclutter-xfixes diff --git a/main/postmarketos-ui-mate/APKBUILD b/main/postmarketos-ui-mate/APKBUILD index 3b540e0f6..fd3286743 100644 --- a/main/postmarketos-ui-mate/APKBUILD +++ b/main/postmarketos-ui-mate/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Jakko pkgname=postmarketos-ui-mate pkgver=7 -pkgrel=0 +pkgrel=1 pkgdesc="(X11) MATE Desktop Environment, fork of GNOME2 (stylus recommended)" url="http://mate-desktop.org/" arch="noarch" @@ -31,7 +31,6 @@ _pmb_recommends=" mate-tweak network-manager-applet onboard - pulseaudio unclutter-xfixes " install="$pkgname.post-install $pkgname.post-upgrade" diff --git a/main/postmarketos-ui-sway/APKBUILD b/main/postmarketos-ui-sway/APKBUILD index 7be1738fe..6808ca0d2 100644 --- a/main/postmarketos-ui-sway/APKBUILD +++ b/main/postmarketos-ui-sway/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Oliver Smith pkgname=postmarketos-ui-sway pkgver=3.1 -pkgrel=2 +pkgrel=3 pkgdesc="(Wayland) Tiling WM, drop-in replacement for i3wm (DOES NOT RUN WITHOUT HW ACCELERATION!)" url="https://postmarketos.org" arch="noarch" @@ -15,7 +15,6 @@ depends=" polkit-elogind postmarketos-base-ui postmarketos-base-ui-networkmanager - pulseaudio sway swaybg tinydm diff --git a/main/postmarketos-ui-xfce4/APKBUILD b/main/postmarketos-ui-xfce4/APKBUILD index ceb28534e..d2715084b 100644 --- a/main/postmarketos-ui-xfce4/APKBUILD +++ b/main/postmarketos-ui-xfce4/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Jakko pkgname=postmarketos-ui-xfce4 pkgver=0.5.2 -pkgrel=1 +pkgrel=2 pkgdesc="(X11) Lightweight desktop (stylus recommended)" url="https://gitlab.com/postmarketOS/xfce4-phone" arch="noarch" @@ -32,7 +32,6 @@ _pmb_recommends=" pavucontrol pm-utils postmarketos-artwork-wallpapers - pulseaudio unclutter-xfixes xfce4-notifyd xfce4-pulseaudio-plugin