pmos-ui-phosh: add vvmd/vvmplayer to pmb_recommends

These enable visual voicemail support, added to pmb_recommends since some folks may not want/need this. But it's a feature that all other phone OSes support out of the box, so folks who use it would expect it to be there.
pmos-ui-phosh: add mmsd-tng as a dependency
2023-02-07 01:26:55 -08:00 · 2023-02-07 01:26:55 -08:00 · 2023-02-07 01:26:55 -08:00 · 2023-02-07 01:26:24 -08:00
3 changed files with 33 additions and 5 deletions
@@ -4,7 +4,7 @@
 # Co-Maintainer: Newbyte <newbyte@postmarketos.org>
 pkgname=device-purism-librem5
 pkgdesc="Purism Librem 5 Phone"
-pkgver=1.38
+pkgver=1.39
 pkgrel=1
 _confver=54
 _purismrel=1
@@ -79,9 +79,15 @@ phosh() {
 	install_if="$pkgname phosh"
 	depends="
 		wys
+		superd-services
 	"
 	install -D -m644 "$builddir"/default/org.freedesktop.ModemManager1.pkla \
 		"$subpkgdir"/var/lib/polkit-1/localauthority/10-vendor.d/org.freedesktop.ModemManager1.pkla
+
+	# configure wys to start by default
+	mkdir -p "$pkgdir"/etc/superd/services/
+	ln -sf /usr/share/superd/services/wys.service \
+		"$pkgdir"/etc/superd/services/
 }

 pulseaudio() {
@@ -0,0 +1,7 @@
+#!/bin/sh
+# this instructs gnome-session to load user-specified autostart apps from a
+# different directory than the default (/etc/xdg/autostart). Apps that are
+# required by gnome-session (e.g. things like gsd-sound, etc) are still started
+# even when this is set. By pointing it here, it'll start superd, which can
+# then start/supervise everything not requried by gnome-session.
+export GNOME_SESSION_AUTOSTART_DIR="/usr/share/superd/"
@@ -1,8 +1,8 @@
 # Reference: https://postmarketos.org/uipkg
 # Maintainer: Newbyte <newbyte@postmarketos.org>
 pkgname=postmarketos-ui-phosh
-pkgver=22.2
-pkgrel=0
+pkgver=23.0
+pkgrel=2
 pkgdesc="(Wayland) Mobile UI developed for the Librem 5"
 url="https://puri.sm"
 arch="noarch !armhf"
@@ -18,10 +18,13 @@ depends="
 	gnome-keyring
 	iio-sensor-proxy
 	iio-sensor-proxy-openrc
+	mmsd-tng
 	modemmanager
 	modemmanager-openrc
 	phosh
 	postmarketos-base-ui-gnome
+	superd
+	superd-services
 	tinydm
 	tinydm-openrc
 	udiskie
@@ -52,6 +55,8 @@ _pmb_recommends="
 	postmarketos-welcome
 	postprocessd
 	ttyescape
+	vvmd
+	vvmplayer
 	xdg-user-dirs
 	"
 _pmb_groups="feedbackd"
@@ -59,6 +64,7 @@ subpackages="$pkgname-qt_tweaks"
 install="$pkgname.post-install $pkgname.post-upgrade"
 source="
 	01_postmarketos-ui-phosh.gschema.override
+	90-gnome-session-autostart.sh
 	mimeapps.list
 	phosh-qt-mobile-controls.sh
 	phosh-qt-wayland.sh
@@ -71,8 +77,16 @@ package() {
 		-t "$pkgdir"/usr/share/glib-2.0/schemas/
 	install -Dm644 "$srcdir"/mimeapps.list \
 		"$pkgdir"/usr/share/applications/mimeapps.list
-	install -Dm644 "$srcdir"/udiskie.desktop \
-		"$pkgdir"/etc/xdg/autostart/udiskie.desktop
+
+	install -Dm644 "$srcdir"/90-gnome-session-autostart.sh \
+		-t "$pkgdir"/etc/tinydm.d/env-wayland.d/
+
+	# configure default user services
+	mkdir -p "$pkgdir"/etc/superd/services/
+	for service in calls chatty mpris-proxy udiskie mmsd-tng vvmd; do
+		ln -sf /usr/share/superd/services/$service.service \
+			"$pkgdir"/etc/superd/services/
+	done
 }

 qt_tweaks() {
@@ -85,6 +99,7 @@ qt_tweaks() {

 sha512sums="
 bfdef6d89015c34cbb9cf67f623f8d51f0b2d9665bca447c434ac14031ad13e8a5fe6fc63bdf52957bc6fd5404f2fe1321df8f5f2a9b945a2df09c741a2c672b  01_postmarketos-ui-phosh.gschema.override
+15170009514671d581d5c64526806b091cee9c709751bc0bcff9b91b3a1429433be1aee8507f44870012b54443677eddf6954ac82600fbeed74228b34e069507  90-gnome-session-autostart.sh
 d58379d4dcbcc8df68e20c4a2f45dc320db5e9c383b8ffe2f3ba3815ebff46e8c1c32d18195800ac8b37adfab23ef4f985be2bf5da7ed3f10d15c5e3915c2fd3  mimeapps.list
 bf8db527c49fa724e640a90269ba2648a2555f5867b2adbfbd88d1f685261f757339757c09ee08f590c76de4bd3d0c73a47dea9bd340644dd4707e76152cefd1  phosh-qt-mobile-controls.sh
 6e193eca3961a78d47b4656892eae34d019d9317a255a201f5ea61e3300caff04c526a27cd98d0edc072b36e3eaf3a1768f4cd27c5e2be8b19c167d535c820a6  phosh-qt-wayland.sh
Author	SHA1	Message	Date
Clayton Craft	06a9ea40e5	pmos-ui-phosh: add vvmd/vvmplayer to pmb_recommends These enable visual voicemail support, added to pmb_recommends since some folks may not want/need this. But it's a feature that all other phone OSes support out of the box, so folks who use it would expect it to be there.	2023-02-07 01:26:55 -08:00
Clayton Craft	565df5742e	pmos-ui-phosh: add mmsd-tng as a dependency Even though many carriers don't use/offer MMS, having mmsd around is useful since it will clear out any SMS WAPs that might be received. If the queue is "too full", it can lead to no longer being able to receive any SMS (some might recall seeing this problem from a couple of years ago...). So I think it's a good idea to always run mmsd to prevent these from building up. And, obviously, it's helpful to have it running for those of us who do use MMS so that it requires a little less user interaction to enable it.	2023-02-07 01:26:55 -08:00
Clayton Craft	ab5a5cb172	purism-librem5: configure wys to start by default with phosh/superd	2023-02-07 01:26:55 -08:00
Clayton Craft	8cc916dd85	main/pmos-ui-phosh: use superd for user services This uses gnome-session to run superd by changing the directory that gnome-session searches for apps to autostart to one that has only a .desktop file that runs superd. superd then starts/manages non-critical services. Some services in /etc/xdg/autostart are critical to phosh/gnome-session, they are listed in a phosh session file. gnome-session will continue to use /etc/xdg/autostart when searching for these services, and gnome-session is still used to start those. They are "critical" because stopping any of them causes the session to die. As such, I do not believe it makes sense to manage those in superd anyways, since if any die, the whole session (including superd) is doing down with it.	2023-02-07 01:26:24 -08:00