[neon/3rdparty/sddm/Neon/unstable] debian: port to qt6
Jonathan Esk-Riddell
null at kde.org
Fri Jun 23 14:45:51 BST 2023
Git commit 2a899bf41933af49aa5a52b740b474d2e8ee24fa by Jonathan Esk-Riddell, on behalf of Carlos De Maine.
Committed on 23/06/2023 at 13:45.
Pushed by jriddell into branch 'Neon/unstable'.
port to qt6
M +9 -10 debian/control
M +2 -1 debian/rules
M +1 -1 debian/sddm.install
M +5 -1 debian/sddm.service
https://invent.kde.org/neon/3rdparty/sddm/-/commit/2a899bf41933af49aa5a52b740b474d2e8ee24fa
diff --git a/debian/control b/debian/control
index f719551..b235413 100644
--- a/debian/control
+++ b/debian/control
@@ -3,9 +3,9 @@ Section: kde
Priority: optional
Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
Uploaders: Aurélien COUDERC <coucouf at debian.org>,
-Build-Depends: cmake (>= 2.8.8),
- debhelper-compat (= 12),
- extra-cmake-modules (>= 1.4.0~),
+Build-Depends: cmake,
+ debhelper-compat (= 13),
+ kf6-extra-cmake-modules,
libpam0g-dev,
libsystemd-dev [linux-any],
libupower-glib-dev,
@@ -14,10 +14,9 @@ Build-Depends: cmake (>= 2.8.8),
libxkbcommon-dev,
pkg-config,
python3-docutils,
- qtbase5-dev (>= 5.8.0~),
- qtdeclarative5-dev (>= 5.8.0~),
- qttools5-dev,
- qttools5-dev-tools (>= 5.8.0~),
+ qt6-base-dev,
+ qt6-declarative-dev,
+ qt6-tools-dev,
systemd [linux-any],
Standards-Version: 4.5.0
Homepage: https://github.com/sddm/sddm
@@ -28,7 +27,7 @@ Rules-Requires-Root: no
Package: sddm
Architecture: any
Depends: adduser,
- qml-module-qtquick2,
+ qt6-declarative,
xauth,
x11-common,
xserver-xorg | xserver,
@@ -44,7 +43,7 @@ Description: modern display manager for X11
Package: sddm-theme-debian-elarun
Architecture: all
-Depends: desktop-base, ${misc:Depends}
+Depends: ${misc:Depends}
Recommends: sddm
Provides: sddm-theme
Breaks: sddm (<< ${source:Version})
@@ -54,7 +53,7 @@ Description: 'Debian Elarun' Theme for SDDM X11 display manager
Package: sddm-theme-debian-maui
Architecture: all
-Depends: desktop-base, ${misc:Depends}
+Depends: ${misc:Depends}
Recommends: sddm
Provides: sddm-theme
Breaks: sddm (<< ${source:Version})
diff --git a/debian/rules b/debian/rules
index 9fc9ac4..4601e2d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,7 +11,8 @@ SDDM_CMAKE_ARGS = -DCMAKE_INSTALL_LIBEXECDIR=/usr/lib/${DEB_HOST_MULTIARCH}/sddm
-DSESSION_COMMAND="/etc/sddm/Xsession" \
-DWAYLAND_SESSION_COMMAND="/etc/sddm/wayland-session" \
-DBUILD_MAN_PAGES=ON \
- -DDBUS_CONFIG_FILENAME="sddm_org.freedesktop.DisplayManager.conf"
+ -DDBUS_CONFIG_FILENAME="sddm_org.freedesktop.DisplayManager.conf" \
+ -DBUILD_WITH_QT6=ON
ifneq ($(DEB_HOST_ARCH_OS),linux)
SDDM_CMAKE_ARGS += -DNO_SYSTEMD=ON -DENABLE_JOURNALD=OFF
diff --git a/debian/sddm.install b/debian/sddm.install
index dde3d19..2e4b748 100644
--- a/debian/sddm.install
+++ b/debian/sddm.install
@@ -3,7 +3,7 @@ debian/wayland-session etc/sddm/
etc/dbus-1/system.d/sddm_org.freedesktop.DisplayManager.conf
etc/pam.d
usr/bin/sddm*
-usr/lib/*/qt5/qml/SddmComponents/
+usr/lib/*/qt6/qml/SddmComponents/
usr/lib/*/sddm/
usr/lib/sysusers.d/sddm.conf
usr/lib/tmpfiles.d/sddm.conf
diff --git a/debian/sddm.service b/debian/sddm.service
index e73da81..e93de6b 100644
--- a/debian/sddm.service
+++ b/debian/sddm.service
@@ -11,11 +11,15 @@ After=haveged.service
# If using tty1 and plymouth, sddm will fail till plymouth stops
# consider using:
-After=plymouth-quit.service
+After=plymouth-quit.service systemd-logind.service
# or to forcefully stop plymouth and start earlier:
## Conflicts=plymouth-quit-wait.service
## After=plymouth-start.service plymouth-quit-wait.service
## OnFailure=plymouth-quit.service
+PartOf=graphical.target
+StartLimitIntervalSec=30
+StartLimitBurst=2
+
[Service]
# temporary safety check until all DMs are converted to correct
More information about the Neon-commits
mailing list