Skip to content
Snippets Groups Projects
Verified Commit e60c77ac authored by Jakko's avatar Jakko Committed by Newbyte
Browse files

main/postmarketos-ui-{mate,xfce4}: switch to slick-greeter (MR 5805)

The main goal of switching LightDM to slick-greeter is to ease
enabling/disabling autologin. With "lightdm-settings" installed, there
is an administration/settings GUI "Login Window" available that allows
among others to configure autologin. Contrary to its general purpose
name, it works on LightDM greeter "slick-greeter" only.

[ci:skip-build]: already built successfully in CI
parent 8379700a
No related branches found
No related tags found
No related merge requests found
Showing
with 45 additions and 56 deletions
[x.dm.slick-greeter]
background="/usr/share/wallpapers/postmarketos.jpg"
draw-user-backgrounds=false
onscreen-keyboard=true
onscreen-keyboard-layout="/usr/share/onboard/layouts/Phone.onboard"
# This file gets removed with postmarketos-ui-mate, even if modified!
[Seat:*]
autologin-user=username
autologin-user-timeout=0
autologin-session=mate
[Seat:*]
greeter-session=slick-greeter
display-setup-script=unclutter-xfixes --fork --start-hidden --hide-on-touch
# Reference: https://postmarketos.org/uipkg
# Maintainer: Jakko <jahau@rocketmail.com>
pkgname=postmarketos-ui-mate
pkgver=8
pkgrel=1
pkgver=9
pkgrel=0
pkgdesc="(X11) MATE Desktop Environment, fork of GNOME2 (stylus recommended)"
url="http://mate-desktop.org/"
arch="noarch"
......@@ -15,12 +15,16 @@ depends="
font-dejavu
gtk+2.0
lightdm
lightdm-settings
mate-desktop-environment
mesa-egl
onboard
polkit-elogind
postmarketos-base-ui
postmarketos-base-ui-networkmanager
postmarketos-artwork-wallpapers
slick-greeter
unclutter-xfixes
xorg-server
"
_pmb_recommends="
......@@ -29,10 +33,7 @@ _pmb_recommends="
gvfs
mate-tweak
network-manager-applet
onboard
unclutter-xfixes
"
install="$pkgname.post-install $pkgname.post-upgrade"
subpackages="$pkgname-openrc"
source="
10_caja-single-click.gschema.override
......@@ -44,20 +45,19 @@ source="
10_mate-window-buttons.gschema.override
10_onboard.gschema.override
10_screensaver.gschema.override
10_slick-greeter.gschema.override
10_system-background.gschema.override
61-lightdm-autologin.conf
70-lightdm-pmos.conf
gtk.css
mate-terminal-maximized.desktop
onboard-autostart.desktop
pmOS-panel.layout
unclutter-xfixes.desktop
"
options="!check"
package() {
install -Dm644 -t "$pkgdir"/etc/skel/.config/autostart \
"$srcdir"/onboard-autostart.desktop \
"$srcdir"/unclutter-xfixes.desktop
"$srcdir"/onboard-autostart.desktop
install -Dm644 -t "$pkgdir"/etc/skel/.config/gtk-3.0 \
"$srcdir"/gtk.css
......@@ -75,13 +75,14 @@ package() {
"$srcdir"/10_mate-window-buttons.gschema.override \
"$srcdir"/10_onboard.gschema.override \
"$srcdir"/10_screensaver.gschema.override \
"$srcdir"/10_slick-greeter.gschema.override \
"$srcdir"/10_system-background.gschema.override
install -Dm644 -t "$pkgdir"/usr/share/lightdm/lightdm.conf.d \
"$srcdir"/70-lightdm-pmos.conf
install -Dm644 -t "$pkgdir"/usr/share/mate-panel/layouts \
"$srcdir"/pmOS-panel.layout
install -Dm644 "$srcdir"/61-lightdm-autologin.conf \
"$pkgdir"/usr/share/lightdm/lightdm.conf.d/61-autologin.conf
}
openrc() {
......@@ -107,11 +108,11 @@ edef87a2b88a09d023dd51e8b32e2fc1cc9f5bec4a00b88b4f2adfb844ae2dc72747ef8891fc8a08
4e91b44aad0b9d290b0c76bfa1fd1eabc6aa3b06a4e96068cc67c54de75bb3ba495b0fe46db58eb304f2fc63eea4d26d2618ca191f66f1dde98efe5a418bd1b6 10_mate-window-buttons.gschema.override
114d77e6e7c11fc87244fc7c179244274c8f8711f111fcb1b9774ef6b226bd2bea01f85395da130f53670a870cfe571babd7f1c233ba85e1ef5a056ab65bd0b7 10_onboard.gschema.override
fe6a37a1e22fbf29a8b6de3b3e137bc19becd6d80d391ad1a0c7908cb996dd9982c88ef55b84fd258a81263e37d47df5a81566ce7c337886ae4c0d7a83d640aa 10_screensaver.gschema.override
7ce4ee56bbff8052ceb14f52e010ae48290589f45dfd0afbb240bf95abac1bd02e7a75a22776f90a1c96b59286ec4d8b6cbe18881550f4488b589cbf2b12bfc8 10_slick-greeter.gschema.override
b4eded3d1aba2086d53507d434da6f2d5aae24fa49c7a8619abb1d81f87898d7a6d813be777a285ce988d78db236bea7507e7868c39fe020e5d23c230dd36242 10_system-background.gschema.override
225c4d1bccad4bdacad34958322015147077158b395b8db095b7afd47e18638044780b381124c3b82bf639af66ea565e1763c54ab9599ec13177c289e0d2a000 61-lightdm-autologin.conf
c11a66b639570ecad51b97c127898afc3f123e2de95ea2a788abc51a45c23c82dbf1022224c15a88691656a8065874d6f396aee0df64e93e1966a82b32d6a31c 70-lightdm-pmos.conf
4532cf5c4cb687947c922d75cc942f26d4a695762a6b90cf53fddab84f2185799b7ee04c95b5e2263655e68a9a111967d92062ef5eb99b4122068c8585cf43a1 gtk.css
adff2ad4dbd82debd3be32e521c8d70f8ea7a05c4942f1f72b28146149f93fcda7c0569d4be80b61fb3a46aa3d3312629c06f0ae112515efb8e735b19d9a1d53 mate-terminal-maximized.desktop
d598b806bf749e0fedfdaeb51aa035b3877fedf4adc123ce2e50aef20f3cc6727b520a379aa26e88f9a2fe0f1fb96c4682895bb49c6a9cf4b5a5fd963ea93747 onboard-autostart.desktop
eb6269566be4114be04fb27ced5c3233b361478f3e63a777deb109723658876b41644bf39446dc40c062e0e618c33baff627f7066f699d0a3d6c811a4466c84b pmOS-panel.layout
b626c8b27d9418df15124d6e97f5174c173863536e9c3eebfb11473d764c81e1db40cf4b7cdabe44b67a0e295d920c7a849a3e2e40dd86402de8200242c7b05a unclutter-xfixes.desktop
"
#!/bin/sh
sed -i "s/username/$(getent passwd 10000 | cut -d: -f1)/g" /usr/share/lightdm/lightdm.conf.d/61-autologin.conf
postmarketos-ui-mate.post-install
\ No newline at end of file
[Desktop Entry]
Type=Application
Name=unclutter-xfixes
Comment=Hide cursor on touchscreen
Exec=unclutter-xfixes --start-hidden --hide-on-touch
[x.dm.slick-greeter]
onscreen-keyboard=true
onscreen-keyboard-layout="/usr/share/onboard/layouts/Phone.onboard"
# This file gets removed with postmarketos-ui-xfce4, even if modified!
[Seat:*]
autologin-user=username
autologin-user-timeout=0
autologin-session=xfce
[Seat:*]
greeter-session=slick-greeter
display-setup-script=unclutter-xfixes --fork --start-hidden --hide-on-touch
......@@ -2,7 +2,7 @@
# Maintainer: Jakko <jahau@rocketmail.com>
pkgname=postmarketos-ui-xfce4
pkgver=0.5.2
pkgrel=7
pkgrel=8
pkgdesc="(X11) Lightweight desktop (stylus recommended)"
url="https://gitlab.postmarketos.org/postmarketOS/xfce4-phone"
arch="noarch"
......@@ -12,10 +12,15 @@ depends="
dnsmasq
elogind
lightdm
lightdm-settings
mesa-egl
onboard
polkit-elogind
postmarketos-base-ui
postmarketos-base-ui-networkmanager
slick-greeter
unclutter-xfixes
xfce-polkit
xfce4
xorg-server
"
......@@ -26,26 +31,23 @@ _pmb_recommends="
gnome-keyring
greybird-themes
network-manager-applet
onboard
pavucontrol
pm-utils
postmarketos-artwork-wallpapers
unclutter-xfixes
xfce4-notifyd
xfce4-pulseaudio-plugin
xfce4-screensaver
xfce4-terminal
xfce4-whiskermenu-plugin
"
install="$pkgname.post-install $pkgname.post-upgrade"
subpackages="$pkgname-openrc"
source="
xfce4-phone-$pkgver.tar.gz::https://gitlab.postmarketos.org/postmarketOS/xfce4-phone/-/archive/$pkgver/xfce4-phone-$pkgver.tar.gz
10_onboard.gschema.override
64-lightdm-autologin.conf
10_slick-greeter.gschema.override
70-lightdm-pmos.conf
enable-scrollbars.sh
onboard-autostart.desktop
unclutter-xfixes.desktop
xfce4-phone.sh
"
options="!check"
......@@ -63,14 +65,14 @@ package() {
"$srcdir"/xfce4-phone.sh
install -Dm644 -t "$pkgdir"/etc/xdg/xfce4-phone/autostart \
"$srcdir"/onboard-autostart.desktop \
"$srcdir"/unclutter-xfixes.desktop
"$srcdir"/onboard-autostart.desktop
install -Dm644 -t "$pkgdir"/usr/share/glib-2.0/schemas \
"$srcdir"/10_onboard.gschema.override
install -Dm644 -t "$pkgdir"/usr/share/lightdm/lightdm.conf.d \
"$srcdir"/70-lightdm-pmos.conf
install -Dm644 "$srcdir"/64-lightdm-autologin.conf \
"$pkgdir"/usr/share/lightdm/lightdm.conf.d/64-autologin.conf
install -Dm644 -t "$pkgdir"/usr/share/glib-2.0/schemas \
"$srcdir"/10_onboard.gschema.override \
"$srcdir"/10_slick-greeter.gschema.override
}
openrc() {
......@@ -89,9 +91,9 @@ openrc() {
sha512sums="
a30b34fb87150810a291faa71726822942fc2b49e418fe3011445f7921b54bdf645e52ff61f31f61fbe799f221931f1d1a17f04b7378c2d72f4eb1795e5d78b7 xfce4-phone-0.5.2.tar.gz
114d77e6e7c11fc87244fc7c179244274c8f8711f111fcb1b9774ef6b226bd2bea01f85395da130f53670a870cfe571babd7f1c233ba85e1ef5a056ab65bd0b7 10_onboard.gschema.override
3841294daffdd3e0da5a7ba155ba8c21e9e5a2f2ba5b3b5ffa3ea6a16486625d3655d03f8c18740fcddfbca673c42a5289ec3b22720cfbbdd56fde8fdc3bf9b0 64-lightdm-autologin.conf
28eb2bda33ad9c45afa915a88afbc56e2843e5b707b017f583eec22704fee5980a6f7b4a646151807dc6e8ed190b7dc2877f888ec0c36f1d8494d3be223c1f14 10_slick-greeter.gschema.override
c11a66b639570ecad51b97c127898afc3f123e2de95ea2a788abc51a45c23c82dbf1022224c15a88691656a8065874d6f396aee0df64e93e1966a82b32d6a31c 70-lightdm-pmos.conf
262cdcf334cfa56872797c960cb8683b79c7b13b0a8179cd002e598576f0e9fe07057fd0fe724e87a6664db4b91b31a8c0cbf026ab137533b07675f838ae57bb enable-scrollbars.sh
ce7921f500b603796572bc02fa123e58d58ed1e9efd4d909de8f73c11a3e0bc0893639ce159f0701578b19db764893d021502d1c98cc24eb692e9d48320ff68c onboard-autostart.desktop
b626c8b27d9418df15124d6e97f5174c173863536e9c3eebfb11473d764c81e1db40cf4b7cdabe44b67a0e295d920c7a849a3e2e40dd86402de8200242c7b05a unclutter-xfixes.desktop
9ef0891cb1476c693175cf1ef8c64112354c1b2bf80c3cdfff4aabb2b9b9c434ccfa7dbdde3385fb215e94fc6216f3dc898be31b4ce9ad5bdb1c23bbb338d633 xfce4-phone.sh
"
#!/bin/sh
sed -i "s/username/$(getent passwd 10000 | cut -d: -f1)/g" /usr/share/lightdm/lightdm.conf.d/64-autologin.conf
postmarketos-ui-xfce4.post-install
\ No newline at end of file
[Desktop Entry]
Type=Application
Name=unclutter-xfixes
Comment=Hide cursor on touchscreen
Exec=unclutter-xfixes --start-hidden --hide-on-touch
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment