From 4e2507c9e591da42785f56d46e7aa06387703f5d Mon Sep 17 00:00:00 2001
From: Caleb Connolly <caleb@connolly.tech>
Date: Mon, 20 Feb 2023 23:51:24 +0000
Subject: [PATCH] Revert "postmarketos-ui-mate: switch to tinydm (MR 3887)" (MR
 3893)

This reverts commit 2c5c22f3e3a7c3e647b9948ca02456d0a7661b4c.
---
 main/postmarketos-ui-mate/61-lightdm-autologin.conf   |  5 +++++
 main/postmarketos-ui-mate/APKBUILD                    | 10 ++++++++--
 .../postmarketos-ui-mate.post-install                 | 11 +++++++----
 3 files changed, 20 insertions(+), 6 deletions(-)
 create mode 100644 main/postmarketos-ui-mate/61-lightdm-autologin.conf

diff --git a/main/postmarketos-ui-mate/61-lightdm-autologin.conf b/main/postmarketos-ui-mate/61-lightdm-autologin.conf
new file mode 100644
index 000000000..c2d16d741
--- /dev/null
+++ b/main/postmarketos-ui-mate/61-lightdm-autologin.conf
@@ -0,0 +1,5 @@
+# This file gets removed with postmarketos-ui-mate, even if modified!
+[Seat:*]
+autologin-user=username
+autologin-user-timeout=0
+autologin-session=mate
diff --git a/main/postmarketos-ui-mate/APKBUILD b/main/postmarketos-ui-mate/APKBUILD
index c61876732..f36a32e30 100644
--- a/main/postmarketos-ui-mate/APKBUILD
+++ b/main/postmarketos-ui-mate/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Jakko <jahau@rocketmail.com>
 pkgname=postmarketos-ui-mate
 pkgver=6
-pkgrel=0
+pkgrel=1
 pkgdesc="(X11) MATE Desktop Environment, fork of GNOME2 (stylus recommended)"
 url="http://mate-desktop.org/"
 arch="noarch"
@@ -13,13 +13,14 @@ depends="
 	dnsmasq
 	elogind
 	gtk+2.0
+	lightdm
+	lightdm-openrc
 	mate-desktop-environment
 	mesa-egl
 	polkit-elogind
 	postmarketos-base-ui
 	postmarketos-base-ui-networkmanager
 	postmarketos-artwork-wallpapers
-	tinydm
 	xorg-server
 	"
 _pmb_recommends="
@@ -39,6 +40,7 @@ source="
 	10_caja_single-click.gschema.override
 	10_mate-terminal_colors.gschema.override
 	10_onboard.gschema.override
+	61-lightdm-autologin.conf
 	onboard-autostart.desktop
 	unclutter-xfixes.desktop
 	"
@@ -60,6 +62,9 @@ package() {
 	install -Dm644 "$srcdir"/10_onboard.gschema.override \
 		"$pkgdir"/usr/share/glib-2.0/schemas/10_onboard.gschema.override
 
+	install -Dm644 "$srcdir"/61-lightdm-autologin.conf \
+		"$pkgdir"/usr/share/lightdm/lightdm.conf.d/61-autologin.conf
+
 	install -Dm644 "$srcdir"/onboard-autostart.desktop \
 		"$pkgdir"/etc/skel/.config/autostart/onboard-autostart.desktop
 
@@ -73,6 +78,7 @@ fe6a37a1e22fbf29a8b6de3b3e137bc19becd6d80d391ad1a0c7908cb996dd9982c88ef55b84fd25
 c69d44f1c69e3880ba822a4b98bc59f4049f7b8e228bec31076b9d3fa510e8e205ecf7e3e4b7b00fb28b39a447a55126aaede7e5e5741350aff2a37172b77659  10_caja_single-click.gschema.override
 edef87a2b88a09d023dd51e8b32e2fc1cc9f5bec4a00b88b4f2adfb844ae2dc72747ef8891fc8a08652ae563fb1b914fba214c28a93e77de76b489a5fb50a96c  10_mate-terminal_colors.gschema.override
 ffcc518ff58d37de302bd101e57bf983800e45899645d476045d0a74096704333a0b513f45e6a5485fdbd80ac1caebce14a760cab6fcc6d5dde0d766ade8b58b  10_onboard.gschema.override
+225c4d1bccad4bdacad34958322015147077158b395b8db095b7afd47e18638044780b381124c3b82bf639af66ea565e1763c54ab9599ec13177c289e0d2a000  61-lightdm-autologin.conf
 d598b806bf749e0fedfdaeb51aa035b3877fedf4adc123ce2e50aef20f3cc6727b520a379aa26e88f9a2fe0f1fb96c4682895bb49c6a9cf4b5a5fd963ea93747  onboard-autostart.desktop
 b626c8b27d9418df15124d6e97f5174c173863536e9c3eebfb11473d764c81e1db40cf4b7cdabe44b67a0e295d920c7a849a3e2e40dd86402de8200242c7b05a  unclutter-xfixes.desktop
 "
diff --git a/main/postmarketos-ui-mate/postmarketos-ui-mate.post-install b/main/postmarketos-ui-mate/postmarketos-ui-mate.post-install
index d887caa02..be115982d 100644
--- a/main/postmarketos-ui-mate/postmarketos-ui-mate.post-install
+++ b/main/postmarketos-ui-mate/postmarketos-ui-mate.post-install
@@ -1,7 +1,10 @@
 #!/bin/sh
 
-rc-update add bluetooth default
-rc-update add networkmanager default
-rc-update add tinydm default
+sed -i "s/username/$(getent passwd 10000 | cut -d: -f1)/g" /usr/share/lightdm/lightdm.conf.d/61-autologin.conf
 
-tinydm-set-session -s /usr/share/xsessions/mate.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