main/postmarketos-ui-phosh: fix pipewire startup (MR 1951)

Override pipewire.desktop with a different X-GNOME-Autostart-Phase, so
Phosh can start it properly.
This commit is contained in:
Oliver Smith 2021-02-13 08:40:12 +01:00
parent 3ce53843f0
commit e4820e1ed2
No known key found for this signature in database
GPG key ID: 5AE7F5513E0885CB
2 changed files with 26 additions and 4 deletions

View file

@ -1,7 +1,7 @@
# Maintainer: Bart Ribbers <bribbers@disroot.org>
pkgname=postmarketos-ui-phosh
pkgver=6
pkgrel=6
pkgrel=7
pkgdesc="(Wayland) Mobile UI developed for the Librem 5 (works only with numeric passwords!)"
url="https://puri.sm"
arch="noarch !armhf"
@ -38,7 +38,7 @@ _pmb_recommends="calls
xorg-server-xwayland
"
_pmb_groups="feedbackd"
subpackages="$pkgname-qt_tweaks"
subpackages="$pkgname-qt_tweaks $pkgname-pipewire"
install="$pkgname.post-install $pkgname.post-upgrade"
source="
000-gschema.override
@ -49,6 +49,7 @@ source="
mimeapps.list
mpris-proxy.desktop
osk.sh
pipewire.desktop
qt-tweaks.sh
"
options="!check"
@ -73,12 +74,21 @@ package() {
}
qt_tweaks() {
source="qt-tweaks.sh"
install_if="$pkgname qt5-qtbase"
install_if="$pkgname=$pkgver-r$pkgrel qt5-qtbase"
depends="qt5-qtwayland"
install -Dm755 "$srcdir"/qt-tweaks.sh \
"$subpkgdir"/etc/profile.d/phosh-qt-tweaks.sh
}
pipewire() {
install_if="$pkgname=$pkgver-r$pkgrel pipewire"
replaces="pipewire"
# Workaround for #963 until .desktop is adjusted in pipewire package
install -Dm644 "$srcdir"/pipewire.desktop \
-t "$subpkgdir"/etc/xdg/autostart/
}
sha512sums="77a8aec2a43829422481c17beaf4224d686cc973f80d72be383103a6be0bf5d0689486c50a1dffecf9f2605bd607647e23ab539dc283978792d248625ab327d5 000-gschema.override
4a60c08c86688f2d92820bc07305fe1bcff54986d29ee5dd84c7902ea5247b73b96f7453d2da9931a19903b2f5825b8a636f92edcf89bc205a7d389defea0b0e 01-phoc-scaling
834d1c558b6a9ca26345928895a5436919aab13f944410240516953a13f8fdafae995af4b1baeee560a800c405a4d67c44bb92499bf8cacae7a17f6d9893577e 02-gnome-software-no-first-run
@ -87,4 +97,5 @@ e00756c2c056f68123d877f2f6a5ad3434ca7851095f021c26831c081728b821cf7947ba08d6742e
0a376140da36538fd73cbd8305ff97b54d2b82831bab64a3b7167019f1d005752eda4e81ef7c19fd64fcba3a775c9e87fca1a250b55a522a0ee9728ab712f089 mimeapps.list
9276b4282860229da47b8b690307a8bf8907370fcdebf0be4c2b71f933593e115572e61d846cb13821d51859ec9e53af6de250afa953b42c06cf0ad4905377c3 mpris-proxy.desktop
4113ef59267e88d205ef1e1aec0ed11ccf817a25c232f2006a538b56fb466fad5025ad445d109e367ca92ee98d9b25f1f9a1a4b9bae2cb80df12a3739d62d10a osk.sh
e499c5440e1690447ea0840898b577083be0387264e0b5c65e93ee5b4bdf7a01ad51814be4168d75e167451baebcd4cc37a55920a4240249b268dad8b180f540 pipewire.desktop
6e193eca3961a78d47b4656892eae34d019d9317a255a201f5ea61e3300caff04c526a27cd98d0edc072b36e3eaf3a1768f4cd27c5e2be8b19c167d535c820a6 qt-tweaks.sh"

View file

@ -0,0 +1,11 @@
[Desktop Entry]
Version=1.0
Name=Pipewire
Comment=Start Pipewire
Exec=/usr/bin/pipewire
Terminal=false
Type=Application
# Note: earlier phases cause pipewire to lock up on some DE gnome-sessions
# https://gitlab.com/postmarketOS/pmaports/-/issues/963
X-GNOME-Autostart-Phase=Panel
X-KDE-autostart-phase=1