summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorA. Wilcox <AWilcox@Wilcox-Tech.com>2019-06-02 08:32:51 +0000
committerA. Wilcox <AWilcox@Wilcox-Tech.com>2019-06-02 08:33:01 +0000
commit6fddc7245f6b42d3625f59fb8b81efcdbdec0747 (patch)
tree6b2e6c027045cc58987652a185f35eedf82d563b
parent708fb3dfe19d6ef541dee2df14bed1620f78bdad (diff)
downloadpackages-6fddc7245f6b42d3625f59fb8b81efcdbdec0747.tar.gz
packages-6fddc7245f6b42d3625f59fb8b81efcdbdec0747.tar.bz2
packages-6fddc7245f6b42d3625f59fb8b81efcdbdec0747.tar.xz
packages-6fddc7245f6b42d3625f59fb8b81efcdbdec0747.zip
user/sddm: add official OpenRC support, thanks @Aerdan
Merges !233
-rw-r--r--user/sddm/APKBUILD19
-rw-r--r--user/sddm/sddm.initd17
-rw-r--r--user/sddm/xdm.confd1
3 files changed, 27 insertions, 10 deletions
diff --git a/user/sddm/APKBUILD b/user/sddm/APKBUILD
index 94f03db23..6496110b7 100644
--- a/user/sddm/APKBUILD
+++ b/user/sddm/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=sddm
pkgver=0.18.1
-pkgrel=0
+pkgrel=1
pkgdesc="Simple Desktop Display Manager"
url="https://github.com/sddm/sddm/"
arch="all"
@@ -11,7 +11,7 @@ depends="consolekit2"
makedepends="cmake extra-cmake-modules qt5-qtbase-dev libxcb-dev upower-dev
consolekit2-dev linux-pam-dev qt5-qtdeclarative-dev qt5-qttools-dev
utmps-dev"
-subpackages="$pkgname-lang $pkgname-xdm::noarch"
+subpackages="$pkgname-lang $pkgname-openrc"
install="sddm.post-install"
langdir="/usr/share/sddm/translations"
pkgusers="sddm"
@@ -19,8 +19,9 @@ pkggroups="sddm"
source="https://github.com/sddm/sddm/releases/download/v$pkgver/sddm-$pkgver.tar.xz
ck2-support.patch
pam-path-fix.patch
+ sddm.initd
utmpx.patch
- xdm.confd"
+ "
build() {
if [ "$CBUILD" != "$CHOST" ]; then
@@ -46,16 +47,16 @@ check() {
package() {
make DESTDIR="$pkgdir" install
+ install -D -m755 "$srcdir"/sddm.initd "$pkgdir"/etc/init.d/sddm
}
-xdm() {
- pkgdesc="Package to use SDDM as the system X display manager"
- depends="sddm=$pkgver-r$pkgrel"
- install -D -m644 "$srcdir"/xdm.confd "$subpkgdir"/etc/conf.d/xdm
+openrc() {
+ default_openrc
+ depends="sddm xorg-server"
}
sha512sums="ff0637600cda2f4da1f643f047f8ee822bd9651ae4ccbb614b9804175c97360ada7af93e07a7b63832f014ef6e7d1b5380ab2b8959f8024ea520fa5ff17efd60 sddm-0.18.1.tar.xz
075e3baf24606cdea620737dbc00f7cf5c487ab6d88e37b23a581afcfbcf872c379753c89c80ad5c90c28fa27d3e5c5df64d4fd30764fdbfc0586e0f26666fe1 ck2-support.patch
f0b4eb7ef0581701157f9decc637629156f36f6711b9a4bae517f94d7a1df614c81bbd891c918f07ac50e2a3d1519c43ccb9eefd80282c95dd79eca0e8d90904 pam-path-fix.patch
-c42d8b3edbc0ae7e3d5ea7bb0080c5c50e0569f0ea947e1ba17bc794c8c0d67a214e62aad7eba0a51791c44b29a3017692bbe738250c63cb2219891bb1313422 utmpx.patch
-5a03b3211e9d84ee762523631859a26b869aee2189f6845dc780c7a1e60a6658e2240e9ef9be05858708d2552ae77b594509dabe49794538f88d2ad6578d1fdf xdm.confd"
+10cac48b821ff7ad39ece4cbc45a8e814d00251b0f8d02f9e42888ad97f465438320f078663be98c5b39630a0bbb26f4f0d76b44574c87a76b4871872add8b9f sddm.initd
+c42d8b3edbc0ae7e3d5ea7bb0080c5c50e0569f0ea947e1ba17bc794c8c0d67a214e62aad7eba0a51791c44b29a3017692bbe738250c63cb2219891bb1313422 utmpx.patch"
diff --git a/user/sddm/sddm.initd b/user/sddm/sddm.initd
new file mode 100644
index 000000000..cf5c1af79
--- /dev/null
+++ b/user/sddm/sddm.initd
@@ -0,0 +1,17 @@
+#!/sbin/openrc-run
+
+depends() {
+ needs localmount
+ after bootmisc consolefont modules netmount keymaps
+
+ use consolekit dbus
+}
+
+description="Simple Desktop Display Manager"
+command="/usr/bin/sddm"
+command_args="${sddm_opts}"
+start_stop_daemon_args="-m --background"
+pidfile="/var/run/sddm.pid"
+
+# uses the openrc templates for start()/stop()
+
diff --git a/user/sddm/xdm.confd b/user/sddm/xdm.confd
deleted file mode 100644
index 9a6cd65da..000000000
--- a/user/sddm/xdm.confd
+++ /dev/null
@@ -1 +0,0 @@
-DISPLAYMANAGER="sddm"