Skip to content

Commit d07f392

Browse files
committed
sddm: add Conflict=kmscon@tty@{SDDM_INITIAL_VT}.service
- Use bash array for CMAKE_AFTER by the way. - Tracking AOSC patches at AOSC-Tracking/sddm @ aosc/v0.21.0 (HEAD: 7bd676f7f1ab96e20237787a4865b39adb9042c5).
1 parent 5b8eb60 commit d07f392

File tree

3 files changed

+35
-5
lines changed

3 files changed

+35
-5
lines changed

desktop-displaymanagers/sddm/autobuild/defines

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,9 @@ PKGDEP="qt-5"
55
BUILDDEP="extra-cmake-modules docutils"
66
PKGDES="QML based X11 display manager"
77

8-
CMAKE_AFTER="-DCMAKE_INSTALL_LIBEXECDIR=/usr/lib/sddm \
9-
-DDBUS_CONFIG_DIR=/usr/share/dbus-1/system.d \
10-
-DBUILD_MAN_PAGES=ON \
11-
-DDBUS_CONFIG_FILENAME=sddm_org.freedesktop.DisplayManager.conf"
8+
CMAKE_AFTER=(
9+
'-DCMAKE_INSTALL_LIBEXECDIR=/usr/lib/sddm'
10+
'-DDBUS_CONFIG_DIR=/usr/share/dbus-1/system.d'
11+
'-DBUILD_MAN_PAGES=ON'
12+
'-DDBUS_CONFIG_FILENAME=sddm_org.freedesktop.DisplayManager.conf'
13+
)
Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
From 7bd676f7f1ab96e20237787a4865b39adb9042c5 Mon Sep 17 00:00:00 2001
2+
From: Xi Ruoyao <xry111@xry111.site>
3+
Date: Sun, 22 Mar 2026 01:03:13 +0800
4+
Subject: [PATCH] AOSCOS: conflict with kmsconvt@${SDDM_INITIAL_VT}.service
5+
6+
Allow us to switch that tty to use kmscon.
7+
---
8+
services/sddm.service.in | 4 ++--
9+
1 file changed, 2 insertions(+), 2 deletions(-)
10+
11+
diff --git a/services/sddm.service.in b/services/sddm.service.in
12+
index 0b46443..a84874f 100644
13+
--- a/services/sddm.service.in
14+
+++ b/services/sddm.service.in
15+
@@ -1,8 +1,8 @@
16+
[Unit]
17+
Description=Simple Desktop Display Manager
18+
Documentation=man:sddm(1) man:sddm.conf(5)
19+
-Conflicts=getty@tty${SDDM_INITIAL_VT}.service
20+
-After=systemd-user-sessions.service getty@tty${SDDM_INITIAL_VT}.service plymouth-quit.service systemd-logind.service
21+
+Conflicts=getty@tty${SDDM_INITIAL_VT}.service kmsconvt@tty${SDDM_INITIAL_VT}.service
22+
+After=systemd-user-sessions.service getty@tty${SDDM_INITIAL_VT}.service kmsconvt@tty${SDDM_INITIAL_VT}.service plymouth-quit.service systemd-logind.service
23+
PartOf=graphical.target
24+
StartLimitIntervalSec=30
25+
StartLimitBurst=2
26+
--
27+
2.53.0
28+

desktop-displaymanagers/sddm/spec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
VER=0.21.0
2-
REL=1
2+
REL=2
33
SRCS="git::commit=tags/v$VER::https://github.com/sddm/sddm"
44
CHKSUMS="SKIP"
55
CHKUPDATE="anitya::id=4776"

0 commit comments

Comments
 (0)