forge/pmaports
1
0
Fork 0
Code Issues 2 Pull requests Projects Releases Packages Wiki Activity Actions

main/postmarketos-ui-weston: actually start dbus (!1280)

Browse source 
dbus-launch doesn't get installed automatically. On the other hand,
dbus-run-session does. This version ensures that dbus is also launched
for the graphical demos
This commit is contained in:
Antoine Fontaine 2020-06-02 16:43:10 +02:00 committed by Bart Ribbers
parent 8013cad133
commit 67493f8003
No known key found for this signature in database
GPG key ID: 699D16185DAFAE61
3 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
main/postmarketos-ui-weston/APKBUILD
View file

@ -1,7 +1,7 @@
# Maintainer: Bart Ribbers <bribbers@disroot.org>
pkgname=postmarketos-ui-weston
pkgver=4
pkgrel=16
pkgrel=17
pkgdesc="(Wayland) Reference compositor (demo, not a phone interface)"
url="https://postmarketos.org"
arch="noarch"
@ -21,6 +21,6 @@ package() {
install -Dm644 "$srcdir"/weston.ini.default \
"$pkgdir"/etc/xdg/weston/weston.ini.default
}
sha512sums="02cb16254fa6bff405bd19448daeb1b4c2ac1fa696b6f7d67ea89795e4480ed1a9b5487dc00fc671d31d175fc8b8e509071b53dba879519a69d54648a076a549 start_weston.sh
sha512sums="33fbf6a3b5558a6d7c3a5993e890e4cee10e868ebc70e8f602d5e07513a77a0bebf7fd343c90a2a72c4f4b30777d3cd7b48c66efb4112032f4421d2806ef3b9b start_weston.sh
b712c9d4c846437656781656ec15e9b7e238a9244e0b77bf84b67f6661d44f68718330706f69ccb8b4d7f6182b8f17f273018ca461c0c40e49b9185f6eec168d weston.ini.default
6800b81055c854ef69c0084341e31841d4b06d1d894542f1e125d0d70b6606f11218bda0d29dab9a48594b4c2f815a540f91bfba6c2c22c3378040c41fe4bbb1 66-lightdm-autologin.conf"

2
main/postmarketos-ui-weston/postmarketos-ui-weston.post-install
View file

@ -2,6 +2,6 @@
sed -i "s/username/$(getent passwd 10000 | cut -d: -f1)/g" /usr/share/lightdm/lightdm.conf.d/66-autologin.conf
sed -i "s/^Exec=weston$/Exec=start_weston.sh/g" /usr/share/wayland-sessions/weston.desktop
sed -i "s/^Exec=weston$/Exec=dbus-run-session start_weston.sh/g" /usr/share/wayland-sessions/weston.desktop
rc-update add lightdm default

5
main/postmarketos-ui-weston/start_weston.sh
View file

@ -18,9 +18,6 @@ cfg="/etc/xdg/weston/weston.ini"
[ -e "$cfg" ] || cfg="$cfg.default"
WESTON_OPTS="--config=$cfg"
# Start dbus and export its environment variables
eval "$(dbus-launch --sh-syntax --exit-with-session)"
# #633: Weston doesn't support autostarting applications (yet), so
# we try to run postmarketos-demos for 10 seconds, until it succeeds.
(
@ -31,4 +28,4 @@ eval "$(dbus-launch --sh-syntax --exit-with-session)"
) &
weston "${WESTON_OPTS}" 2>&1 | logger -t "$(whoami):weston"
exec weston "${WESTON_OPTS}" 2>&1 | logger -t "$(whoami):weston"