From ece48a2c6e832f3f2863b0b63954fa8dbb414e63 Mon Sep 17 00:00:00 2001 From: Bart Ribbers Date: Fri, 13 Nov 2020 11:16:11 +0100 Subject: [PATCH] main/postmarketos-ui-plasma-mobile: use tinydm instead of lightdm (MR 1715) Follow-up of !1659, but now for Plasma Mobile --- .../62-lightdm-autologin.conf | 5 ----- main/postmarketos-ui-plasma-mobile/APKBUILD | 12 +++--------- .../postmarketos-ui-plasma-mobile.post-install | 5 ++--- 3 files changed, 5 insertions(+), 17 deletions(-) delete mode 100644 main/postmarketos-ui-plasma-mobile/62-lightdm-autologin.conf diff --git a/main/postmarketos-ui-plasma-mobile/62-lightdm-autologin.conf b/main/postmarketos-ui-plasma-mobile/62-lightdm-autologin.conf deleted file mode 100644 index e96a9a4b0..000000000 --- a/main/postmarketos-ui-plasma-mobile/62-lightdm-autologin.conf +++ /dev/null @@ -1,5 +0,0 @@ -# This file gets removed with postmarketos-ui-plasma-mobile, even if modified! -[Seat:*] -autologin-user=username -autologin-user-timeout=0 -autologin-session=plasma-mobile diff --git a/main/postmarketos-ui-plasma-mobile/APKBUILD b/main/postmarketos-ui-plasma-mobile/APKBUILD index 095af3166..e706a127f 100644 --- a/main/postmarketos-ui-plasma-mobile/APKBUILD +++ b/main/postmarketos-ui-plasma-mobile/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Bart Ribbers pkgname=postmarketos-ui-plasma-mobile -pkgver=3 -pkgrel=5 +pkgver=3.1 +pkgrel=0 pkgdesc="(Wayland) Mobile variant of KDE Plasma (does not run without hardware acceleration, allows only numeric passwords!)" url="https://wiki.postmarketos.org/wiki/Plasma_Mobile" arch="noarch !armhf !x86" # armhf: pmaports#75, x86: aports#11807 @@ -28,8 +28,7 @@ depends="bluedevil " # Required to launch depends="$depends - lightdm - lightdm-openrc + tinydm xorg-server " _pmb_recommends="breeze-gtk @@ -59,7 +58,6 @@ source="kwinrc kdeglobals qtlogging.ini unlock-plasma - 62-lightdm-autologin.conf 000-gschema.override gtk-app-wayland.sh " @@ -67,9 +65,6 @@ subpackages="$pkgname-extras" options="!check" package() { - install -Dm644 "$srcdir"/62-lightdm-autologin.conf \ - "$pkgdir"/usr/share/lightdm/lightdm.conf.d/62-autologin.conf - install -Dm644 "$srcdir"/kwinrc \ "$pkgdir"/etc/xdg/kwinrc @@ -108,6 +103,5 @@ sha512sums="a95d3bbd1e8051c9b394ad7a26e4beb2d1be8d3c38189819da61fd42b1c7fd3948c4 93d6c3e76b6e8d3c8c5424fcb921595ad3569e1aba1b03255b977230b33146dc73a97327e455e8a539018cb02c3bf1a700dd951622f798b50f36c5d381a1b342 kdeglobals 341f0b866c315f37868ef3e7137cce8b53a0e8e6164e5af71b3e8e2fa68321afbf0652d76124ef84bade1393f701748852ac939aef9daff7e272a0df827780eb qtlogging.ini e5dcc82c0e58288fd7a8f805e60fa777fab71c68355f085a0e4f25b05526491476fdb6decbc7c0495626d6736a53bfc8e8f34a3231210858998e19cd6fbc89a0 unlock-plasma -564d682f188ebba7371d9b860c699cf7e73006788f48b9fc2e2ba925e0359194ae1a4508fad2b3a5c2ed92a99d7cbc4cd3cb2e3d5bb003511d51e7bd249958a9 62-lightdm-autologin.conf 2c0ac3cc66e9af71fb89c4f790b6f71598b5c0ecd9b684bd7cbd95d25ce27c256154b8e3a66e1f2648e4d4410d7a5cedc9663b31c1c87b33dcc3179c98d04252 000-gschema.override 57793bb079c76ba3bdcfca7880aa887de11fe80e7a05557b78435e57feabab70fbaeedc42da3aec6f914c35bba8e8ee9918367516eb45ee247f63f694624f179 gtk-app-wayland.sh" diff --git a/main/postmarketos-ui-plasma-mobile/postmarketos-ui-plasma-mobile.post-install b/main/postmarketos-ui-plasma-mobile/postmarketos-ui-plasma-mobile.post-install index 72629f233..333c94a21 100644 --- a/main/postmarketos-ui-plasma-mobile/postmarketos-ui-plasma-mobile.post-install +++ b/main/postmarketos-ui-plasma-mobile/postmarketos-ui-plasma-mobile.post-install @@ -1,9 +1,8 @@ #!/bin/sh -sed -i "s/username/$(getent passwd 10000 | cut -d: -f1)/g" /usr/share/lightdm/lightdm.conf.d/62-autologin.conf - -rc-update add lightdm default +rc-update add tinydm default rc-update add urfkill default rc-update add ofono default rc-update add ofono-auto-enable default rc-update add iio-sensor-proxy default +tinydm-set-session -s /usr/share/wayland-sessions/plasma-mobile.desktop