From c6e8a72de43723bbcd6c1103e602f33edfec6dfd Mon Sep 17 00:00:00 2001 From: Oliver Smith Date: Sun, 20 Oct 2019 21:28:39 +0200 Subject: [PATCH] main/postmarketos-ui: depend on lightdm-openrc The openrc service of lightdm has been moved to lightdm-openrc in Alpine. Fix all UIs depending on lightdm, so their post-install script does not fail with: Executing postmarketos-ui-plasma-mobile-2-r6.post-install * rc-update: service `lightdm' does not exist --- main/postmarketos-ui-hildon/APKBUILD | 4 ++-- main/postmarketos-ui-i3wm/APKBUILD | 4 ++-- main/postmarketos-ui-kodi/APKBUILD | 4 ++-- main/postmarketos-ui-matchbox/APKBUILD | 4 ++-- main/postmarketos-ui-mate/APKBUILD | 4 ++-- main/postmarketos-ui-phosh/APKBUILD | 4 ++-- main/postmarketos-ui-plasma-mobile/APKBUILD | 4 ++-- main/postmarketos-ui-sway/APKBUILD | 4 ++-- main/postmarketos-ui-weston/APKBUILD | 4 ++-- main/postmarketos-ui-xfce4/APKBUILD | 4 ++-- 10 files changed, 20 insertions(+), 20 deletions(-) diff --git a/main/postmarketos-ui-hildon/APKBUILD b/main/postmarketos-ui-hildon/APKBUILD index 493030683..b6230c2b3 100644 --- a/main/postmarketos-ui-hildon/APKBUILD +++ b/main/postmarketos-ui-hildon/APKBUILD @@ -1,12 +1,12 @@ # Maintainer: Nikita Ukhrenkov pkgname=postmarketos-ui-hildon pkgver=1 -pkgrel=8 +pkgrel=9 pkgdesc="(X11) Lightweight GTK+2 UI (optimized for single-touch touchscreens)" url="https://postmarketos.org" arch="noarch" license="GPL3+" -depends="dbus-x11 gtk+2.0-maemo hildon-desktop hildon-theme-alpha mesa xorg-server lightdm" +depends="dbus-x11 gtk+2.0-maemo hildon-desktop hildon-theme-alpha mesa xorg-server lightdm-openrc" install="$pkgname.post-install $pkgname.pre-deinstall $pkgname.post-deinstall $pkgname.post-upgrade" source="60-lightdm-autologin.conf hildon.desktop xinitrc_hildon.sh" options="!check" diff --git a/main/postmarketos-ui-i3wm/APKBUILD b/main/postmarketos-ui-i3wm/APKBUILD index cb9179b97..e4a11e1b6 100644 --- a/main/postmarketos-ui-i3wm/APKBUILD +++ b/main/postmarketos-ui-i3wm/APKBUILD @@ -1,11 +1,11 @@ pkgname=postmarketos-ui-i3wm pkgver=0.3 -pkgrel=2 +pkgrel=3 pkgdesc="(X11) Tiling WM (keyboard required)" url="https://i3wm.org" arch="noarch" license="GPL-3.0" -depends="xorg-server mesa-egl i3wm i3status dmenu xset xinput st lightdm" +depends="xorg-server mesa-egl i3wm i3status dmenu xset xinput st lightdm-openrc" install="$pkgname.post-install $pkgname.pre-deinstall $pkgname.post-deinstall $pkgname.post-upgrade" source="lock.sh 60-lightdm-autologin.conf" options="!check" diff --git a/main/postmarketos-ui-kodi/APKBUILD b/main/postmarketos-ui-kodi/APKBUILD index dee458668..11ce3c2ce 100644 --- a/main/postmarketos-ui-kodi/APKBUILD +++ b/main/postmarketos-ui-kodi/APKBUILD @@ -2,12 +2,12 @@ # Maintainer: Bart Ribbers pkgname=postmarketos-ui-kodi pkgver=1 -pkgrel=0 +pkgrel=1 pkgdesc="(Wayland) 10-foot UI useful on TV's" url="https://kodi.tv" arch="noarch" license="GPL-3.0-or-later" -depends="kodi-wayland kodi cage lightdm xorg-server" +depends="kodi-wayland kodi cage lightdm-openrc xorg-server" install="$pkgname.post-install" source="60-lightdm-autologin.conf kodi.desktop" options="!check" diff --git a/main/postmarketos-ui-matchbox/APKBUILD b/main/postmarketos-ui-matchbox/APKBUILD index ae395788d..76437a273 100644 --- a/main/postmarketos-ui-matchbox/APKBUILD +++ b/main/postmarketos-ui-matchbox/APKBUILD @@ -1,11 +1,11 @@ pkgname=postmarketos-ui-matchbox pkgver=1 -pkgrel=4 +pkgrel=5 pkgdesc="(X11) Very basic user interface for handhelds" url="https://matchbox-project.org" arch="noarch" license="GPL-2.0-only" -depends="matchbox-common matchbox-panel matchbox-desktop matchbox-keyboard matchbox-window-manager xterm xorg-server dbus-x11 mesa-egl gtk+2.0 lightdm" +depends="matchbox-common matchbox-panel matchbox-desktop matchbox-keyboard matchbox-window-manager xterm xorg-server dbus-x11 mesa-egl gtk+2.0 lightdm-openrc" install="$pkgname.post-install $pkgname.pre-deinstall $pkgname.post-deinstall $pkgname.post-upgrade" source="matchbox.desktop 60-lightdm-autologin.conf" options="!check" diff --git a/main/postmarketos-ui-mate/APKBUILD b/main/postmarketos-ui-mate/APKBUILD index d2979551b..616e7676e 100644 --- a/main/postmarketos-ui-mate/APKBUILD +++ b/main/postmarketos-ui-mate/APKBUILD @@ -1,11 +1,11 @@ pkgname=postmarketos-ui-mate pkgver=1 -pkgrel=6 +pkgrel=7 pkgdesc="(X11) MATE Desktop Environment, fork of GNOME2 (stylus recommended)" url="http://mate-desktop.org/" arch="noarch" license="GPL3+" -depends="mate-desktop-environment xorg-server dbus-x11 mesa-egl postmarketos-artwork-wallpapers gtk+2.0 lightdm" +depends="mate-desktop-environment xorg-server dbus-x11 mesa-egl postmarketos-artwork-wallpapers gtk+2.0 lightdm-openrc" install="$pkgname.post-install $pkgname.pre-deinstall $pkgname.post-deinstall $pkgname.post-upgrade" subpackages="" source="000-system-background.gschema.override 60-lightdm-autologin.conf" diff --git a/main/postmarketos-ui-phosh/APKBUILD b/main/postmarketos-ui-phosh/APKBUILD index a2faaf3b7..832004c6a 100644 --- a/main/postmarketos-ui-phosh/APKBUILD +++ b/main/postmarketos-ui-phosh/APKBUILD @@ -2,12 +2,12 @@ # Maintainer: Bart Ribbers pkgname=postmarketos-ui-phosh pkgver=1 -pkgrel=4 +pkgrel=5 pkgdesc="(Wayland) Mobile UI developed for the Librem 5 (does not work for armhf)" url="https://puri.sm" arch="noarch !armhf" license="GPL-3.0-or-later" -depends="phosh lightdm xorg-server postmarketos-artwork-wallpapers epiphany calls chatty " +depends="phosh lightdm-openrc xorg-server postmarketos-artwork-wallpapers epiphany calls chatty " install="$pkgname.post-install" source="60-lightdm-autologin.conf 000-gschema.override osk.sh" options="!check" diff --git a/main/postmarketos-ui-plasma-mobile/APKBUILD b/main/postmarketos-ui-plasma-mobile/APKBUILD index 332575567..959ec3589 100644 --- a/main/postmarketos-ui-plasma-mobile/APKBUILD +++ b/main/postmarketos-ui-plasma-mobile/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Bart Ribbers pkgname=postmarketos-ui-plasma-mobile pkgver=2 -pkgrel=6 +pkgrel=7 pkgdesc="(Wayland) Mobile variant of KDE Plasma, optimized for touchscreen (slow without hardware acceleration!)" url="https://wiki.postmarketos.org/wiki/Plasma_Mobile" arch="noarch !armhf" # Crashes on armhf due to https://gitlab.com/postmarketOS/pmaports/issues/75 @@ -34,7 +34,7 @@ depends=" " # Required to launch depends="$depends - lightdm + lightdm-openrc xorg-server " install="$pkgname.post-install" diff --git a/main/postmarketos-ui-sway/APKBUILD b/main/postmarketos-ui-sway/APKBUILD index c2a952818..f6945f361 100644 --- a/main/postmarketos-ui-sway/APKBUILD +++ b/main/postmarketos-ui-sway/APKBUILD @@ -3,13 +3,13 @@ # Maintainer: Danct12 pkgname=postmarketos-ui-sway pkgver=1 -pkgrel=1 +pkgrel=2 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 lightdm-gtk-greeter elogind" + rxvt-unicode xorg-server lightdm-openrc lightdm-gtk-greeter elogind" install="$pkgname.post-install" source="60-lightdm-autologin.conf postmarketos_background" options="!check" # no testsuite diff --git a/main/postmarketos-ui-weston/APKBUILD b/main/postmarketos-ui-weston/APKBUILD index 51fb8a048..af583683e 100644 --- a/main/postmarketos-ui-weston/APKBUILD +++ b/main/postmarketos-ui-weston/APKBUILD @@ -2,12 +2,12 @@ # Maintainer: Bart Ribbers pkgname=postmarketos-ui-weston pkgver=4 -pkgrel=9 +pkgrel=10 pkgdesc="(Wayland) Reference compositor (demo, not a phone interface)" url="https://postmarketos.org" arch="noarch" license="GPL-3.0-or-later" -depends="weston-clients weston weston-shell-desktop weston-backend-fbdev weston-backend-drm weston-backend-x11 weston-terminal weston-xwayland xorg-server-xwayland postmarketos-demos postmarketos-artwork-wallpapers elogind lightdm xorg-server" +depends="weston-clients weston weston-shell-desktop weston-backend-fbdev weston-backend-drm weston-backend-x11 weston-terminal weston-xwayland xorg-server-xwayland postmarketos-demos postmarketos-artwork-wallpapers elogind lightdm-openrc xorg-server" install="$pkgname.post-install" source="start_weston.sh weston.ini.default 60-lightdm-autologin.conf" options="!check" # Meta package, no test suite diff --git a/main/postmarketos-ui-xfce4/APKBUILD b/main/postmarketos-ui-xfce4/APKBUILD index d0a2ac98d..aea17ffef 100644 --- a/main/postmarketos-ui-xfce4/APKBUILD +++ b/main/postmarketos-ui-xfce4/APKBUILD @@ -1,11 +1,11 @@ pkgname=postmarketos-ui-xfce4 pkgver=0.2 -pkgrel=7 +pkgrel=8 pkgdesc="(X11) Lightweight GTK+2 desktop (stylus recommended)" url="https://gitlab.com/postmarketOS/xfce4-phone" arch="noarch" license="GPL-3.0+" -depends="xfce4 xorg-server mesa-egl postmarketos-artwork-wallpapers faenza-icon-theme xfce4-battery-plugin network-manager-applet gnome-keyring lxpolkit gtk+2.0 lightdm" +depends="xfce4 xorg-server mesa-egl postmarketos-artwork-wallpapers faenza-icon-theme xfce4-battery-plugin network-manager-applet gnome-keyring lxpolkit gtk+2.0 lightdm-openrc" install="$pkgname.post-install $pkgname.pre-deinstall $pkgname.post-deinstall $pkgname.post-upgrade" source="$pkgname-$pkgver.tar.gz::https://gitlab.com/postmarketOS/xfce4-phone/-/archive/$pkgver/xfce4-phone-$pkgver.tar.gz 60-lightdm-autologin.conf"