From f16207547b2a8dd9bf17ee7c36e64b5c61e2d21a Mon Sep 17 00:00:00 2001 From: Bart Ribbers Date: Thu, 17 Oct 2019 19:58:35 +0200 Subject: [PATCH] main/postmarketos-ui-sway: fix lightdm (!690) Fix missing lightdm dependency, replace post-upgrade script with symlink. --- main/postmarketos-ui-mate/APKBUILD | 2 +- main/postmarketos-ui-sway/APKBUILD | 6 +++--- main/postmarketos-ui-sway/postmarketos-ui-sway.post-upgrade | 6 +----- 3 files changed, 5 insertions(+), 9 deletions(-) mode change 100644 => 120000 main/postmarketos-ui-sway/postmarketos-ui-sway.post-upgrade diff --git a/main/postmarketos-ui-mate/APKBUILD b/main/postmarketos-ui-mate/APKBUILD index 1cb847616..5609c39e7 100644 --- a/main/postmarketos-ui-mate/APKBUILD +++ b/main/postmarketos-ui-mate/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Daniele Debernardi pkgname=postmarketos-ui-mate pkgver=1 -pkgrel=8 +pkgrel=9 pkgdesc="(X11) MATE Desktop Environment, fork of GNOME2 (stylus recommended)" url="http://mate-desktop.org/" arch="noarch" diff --git a/main/postmarketos-ui-sway/APKBUILD b/main/postmarketos-ui-sway/APKBUILD index f6945f361..5e8125dcd 100644 --- a/main/postmarketos-ui-sway/APKBUILD +++ b/main/postmarketos-ui-sway/APKBUILD @@ -3,14 +3,14 @@ # Maintainer: Danct12 pkgname=postmarketos-ui-sway pkgver=1 -pkgrel=2 +pkgrel=3 pkgdesc="(Wayland) Tiling WM, drop-in replacement for i3wm (DOES NOT RUN WITHOUT HW ACCELERATION!)" url="https://postmarketos.org" arch="noarch" license="MIT" depends="dbus sway swaylock swayidle xorg-server-xwayland postmarketos-artwork-wallpapers - rxvt-unicode xorg-server lightdm-openrc lightdm-gtk-greeter elogind" -install="$pkgname.post-install" + rxvt-unicode xorg-server lightdm lightdm-openrc elogind" +install="$pkgname.post-install $pkgname.post-upgrade" source="60-lightdm-autologin.conf postmarketos_background" options="!check" # no testsuite diff --git a/main/postmarketos-ui-sway/postmarketos-ui-sway.post-upgrade b/main/postmarketos-ui-sway/postmarketos-ui-sway.post-upgrade deleted file mode 100644 index a7791b1e4..000000000 --- a/main/postmarketos-ui-sway/postmarketos-ui-sway.post-upgrade +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh - -sed -i "s/username/$(getent passwd 10000 | cut -d: -f1)/g" /usr/share/lightdm/lightdm.conf.d/60-autologin.conf - -rc-update add lightdm default diff --git a/main/postmarketos-ui-sway/postmarketos-ui-sway.post-upgrade b/main/postmarketos-ui-sway/postmarketos-ui-sway.post-upgrade new file mode 120000 index 000000000..39bd0994a --- /dev/null +++ b/main/postmarketos-ui-sway/postmarketos-ui-sway.post-upgrade @@ -0,0 +1 @@ +postmarketos-ui-sway.post-install \ No newline at end of file