From 83a49d84c7d8a1acc831e0755fb3c3cd568f77e3 Mon Sep 17 00:00:00 2001 From: fossdd Date: Wed, 5 Feb 2025 14:48:43 +0100 Subject: [PATCH] main/postmarketos-ui-phosh: use tinydm for systemd (MR 6150) Ref: https://gitlab.postmarketos.org/postmarketOS/pmaports/-/issues/3464#note_467493 Closes: https://gitlab.postmarketos.org/postmarketOS/pmaports/-/issues/3460 Closes: https://gitlab.postmarketos.org/postmarketOS/pmaports/-/issues/3464 Edit by Oliver: added tinydm-openrc back to the openrc() subpackage, as otherwise we may try to enable the service before it is installed in the post-install script. --- main/postmarketos-ui-phosh/APKBUILD | 8 +++----- .../postmarketos-ui-phosh-openrc.post-install | 1 - .../postmarketos-ui-phosh.post-install | 2 ++ 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/main/postmarketos-ui-phosh/APKBUILD b/main/postmarketos-ui-phosh/APKBUILD index 426a53344..01f30051d 100644 --- a/main/postmarketos-ui-phosh/APKBUILD +++ b/main/postmarketos-ui-phosh/APKBUILD @@ -1,7 +1,7 @@ # Reference: https://postmarketos.org/uipkg # Maintainer: Newbyte pkgname=postmarketos-ui-phosh -pkgver=22.5 +pkgver=23 pkgrel=0 pkgdesc="(Wayland) Mobile UI initially developed for the Librem 5" url="https://phosh.mobi" @@ -18,6 +18,7 @@ depends=" postmarketos-base-ui-gnome-mobile postmarketos-base-ui-qt-tweaks postmarketos-base-ui-qt-wayland + tinydm udiskie xdg-desktop-portal-wlr xdg-desktop-portal-phosh @@ -47,10 +48,7 @@ package() { openrc() { install_if="$pkgname=$pkgver-r$pkgrel openrc" install="$subpkgname.post-install" - depends=" - tinydm - tinydm-openrc - " + depends="tinydm-openrc" mkdir "$subpkgdir" } diff --git a/main/postmarketos-ui-phosh/postmarketos-ui-phosh-openrc.post-install b/main/postmarketos-ui-phosh/postmarketos-ui-phosh-openrc.post-install index 3dfad457b..7fc751ab8 100644 --- a/main/postmarketos-ui-phosh/postmarketos-ui-phosh-openrc.post-install +++ b/main/postmarketos-ui-phosh/postmarketos-ui-phosh-openrc.post-install @@ -2,6 +2,5 @@ rc-update add tinydm default rc-update add waked default -tinydm-set-session -s /usr/share/wayland-sessions/phosh.desktop exit 0 diff --git a/main/postmarketos-ui-phosh/postmarketos-ui-phosh.post-install b/main/postmarketos-ui-phosh/postmarketos-ui-phosh.post-install index 8de74e9e7..b3ad58952 100644 --- a/main/postmarketos-ui-phosh/postmarketos-ui-phosh.post-install +++ b/main/postmarketos-ui-phosh/postmarketos-ui-phosh.post-install @@ -10,4 +10,6 @@ if [ -n "$default_user" ]; then usermod -aG feedbackd "$default_user" fi +tinydm-set-session -s /usr/share/wayland-sessions/phosh.desktop + exit 0