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

Revert "postmarketos-ui-xfce: switch to tinydm (MR 3887)" (MR 3893)

Browse source 
This reverts commit 5915d1630b.
This commit is contained in:
Caleb Connolly 2023-02-20 23:51:22 +00:00 committed by Oliver Smith
parent fe29c9ab34
commit 2d100dcbdf
No known key found for this signature in database
GPG key ID: 5AE7F5513E0885CB
3 changed files with 20 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
main/postmarketos-ui-xfce4/64-lightdm-autologin.conf Normal file
View file

@ -0,0 +1,5 @@
# This file gets removed with postmarketos-ui-xfce4, even if modified!
[Seat:*]
autologin-user=username
autologin-user-timeout=0
autologin-session=xfce

10
main/postmarketos-ui-xfce4/APKBUILD
View file

@ -2,7 +2,7 @@
# Maintainer: Jakko <jahau@rocketmail.com> # Maintainer: Jakko <jahau@rocketmail.com>
pkgname=postmarketos-ui-xfce4 pkgname=postmarketos-ui-xfce4
pkgver=0.5.1 pkgver=0.5.1
pkgrel=10 pkgrel=11
pkgdesc="(X11) Lightweight desktop (stylus recommended)" pkgdesc="(X11) Lightweight desktop (stylus recommended)"
url="https://gitlab.com/postmarketOS/xfce4-phone" url="https://gitlab.com/postmarketOS/xfce4-phone"
arch="noarch" arch="noarch"
@ -11,11 +11,12 @@ depends="
bluez bluez
dnsmasq dnsmasq
elogind elogind
lightdm
lightdm-openrc
mesa-egl mesa-egl
polkit-elogind polkit-elogind
postmarketos-base-ui postmarketos-base-ui
postmarketos-base-ui-networkmanager postmarketos-base-ui-networkmanager
tinydm
xfce4 xfce4
xorg-server xorg-server
" "
@ -42,6 +43,7 @@ install="$pkgname.post-install $pkgname.post-upgrade"
source=" source="
xfce4-phone-$pkgver.tar.gz::https://gitlab.com/postmarketOS/xfce4-phone/-/archive/$pkgver/xfce4-phone-$pkgver.tar.gz xfce4-phone-$pkgver.tar.gz::https://gitlab.com/postmarketOS/xfce4-phone/-/archive/$pkgver/xfce4-phone-$pkgver.tar.gz
10_onboard.gschema.override 10_onboard.gschema.override
64-lightdm-autologin.conf
enable-scrollbars.sh enable-scrollbars.sh
onboard-autostart.desktop onboard-autostart.desktop
unclutter-xfixes.desktop unclutter-xfixes.desktop
@ -60,6 +62,9 @@ package() {
install -Dm644 "$srcdir"/10_onboard.gschema.override \ install -Dm644 "$srcdir"/10_onboard.gschema.override \
"$pkgdir"/usr/share/glib-2.0/schemas/10_onboard.gschema.override "$pkgdir"/usr/share/glib-2.0/schemas/10_onboard.gschema.override
install -Dm644 "$srcdir"/64-lightdm-autologin.conf \
"$pkgdir"/usr/share/lightdm/lightdm.conf.d/64-autologin.conf
install -Dm644 "$srcdir"/enable-scrollbars.sh \ install -Dm644 "$srcdir"/enable-scrollbars.sh \
"$pkgdir"/etc/profile.d/enable-scrollbars.sh "$pkgdir"/etc/profile.d/enable-scrollbars.sh
@ -76,6 +81,7 @@ package() {
sha512sums=" sha512sums="
1dd80635d726bac3e0436a7e5f407204d1768ab69a515a42b1affc852ec3dd7780529230c7f7f6626e58c0337c22a14895f6598c69918ef2c31b0eec4353838f xfce4-phone-0.5.1.tar.gz 1dd80635d726bac3e0436a7e5f407204d1768ab69a515a42b1affc852ec3dd7780529230c7f7f6626e58c0337c22a14895f6598c69918ef2c31b0eec4353838f xfce4-phone-0.5.1.tar.gz
ffcc518ff58d37de302bd101e57bf983800e45899645d476045d0a74096704333a0b513f45e6a5485fdbd80ac1caebce14a760cab6fcc6d5dde0d766ade8b58b 10_onboard.gschema.override ffcc518ff58d37de302bd101e57bf983800e45899645d476045d0a74096704333a0b513f45e6a5485fdbd80ac1caebce14a760cab6fcc6d5dde0d766ade8b58b 10_onboard.gschema.override
3841294daffdd3e0da5a7ba155ba8c21e9e5a2f2ba5b3b5ffa3ea6a16486625d3655d03f8c18740fcddfbca673c42a5289ec3b22720cfbbdd56fde8fdc3bf9b0 64-lightdm-autologin.conf
262cdcf334cfa56872797c960cb8683b79c7b13b0a8179cd002e598576f0e9fe07057fd0fe724e87a6664db4b91b31a8c0cbf026ab137533b07675f838ae57bb enable-scrollbars.sh 262cdcf334cfa56872797c960cb8683b79c7b13b0a8179cd002e598576f0e9fe07057fd0fe724e87a6664db4b91b31a8c0cbf026ab137533b07675f838ae57bb enable-scrollbars.sh
ce7921f500b603796572bc02fa123e58d58ed1e9efd4d909de8f73c11a3e0bc0893639ce159f0701578b19db764893d021502d1c98cc24eb692e9d48320ff68c onboard-autostart.desktop ce7921f500b603796572bc02fa123e58d58ed1e9efd4d909de8f73c11a3e0bc0893639ce159f0701578b19db764893d021502d1c98cc24eb692e9d48320ff68c onboard-autostart.desktop
b626c8b27d9418df15124d6e97f5174c173863536e9c3eebfb11473d764c81e1db40cf4b7cdabe44b67a0e295d920c7a849a3e2e40dd86402de8200242c7b05a unclutter-xfixes.desktop b626c8b27d9418df15124d6e97f5174c173863536e9c3eebfb11473d764c81e1db40cf4b7cdabe44b67a0e295d920c7a849a3e2e40dd86402de8200242c7b05a unclutter-xfixes.desktop

11
main/postmarketos-ui-xfce4/postmarketos-ui-xfce4.post-install
View file

@ -1,7 +1,10 @@
#!/bin/sh #!/bin/sh
rc-update add bluetooth default sed -i "s/username/$(getent passwd 10000 | cut -d: -f1)/g" /usr/share/lightdm/lightdm.conf.d/64-autologin.conf
rc-update add networkmanager default
rc-update add tinydm default
tinydm-set-session -s /usr/share/xsessions/xfce.desktop rc-update add bluetooth default
rc-update add lightdm default
rc-update add networkmanager default
# Needed to fully revert pma!3887
rc-update -q del tinydm default