[neon/3rdparty/sddm/Neon/release] debian: Revert "port to qt6"

Jonathan Esk-Riddell null at kde.org
Fri Jun 23 14:45:51 BST 2023


Git commit 9e8796e60b4edf404760530517f66982a4a89dff by Jonathan Esk-Riddell.
Committed on 23/06/2023 at 13:45.
Pushed by jriddell into branch 'Neon/release'.

Revert "port to qt6"

This reverts commit 7366789e32bb88bf27c061a85e339041d7242946.

M  +10   -9    debian/control
M  +1    -2    debian/rules
M  +1    -1    debian/sddm.install
M  +1    -5    debian/sddm.service

https://invent.kde.org/neon/3rdparty/sddm/-/commit/9e8796e60b4edf404760530517f66982a4a89dff

diff --git a/debian/control b/debian/control
index b235413..f719551 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,
-               debhelper-compat (= 13),
-               kf6-extra-cmake-modules,
+Build-Depends: cmake (>= 2.8.8),
+               debhelper-compat (= 12),
+               extra-cmake-modules (>= 1.4.0~),
                libpam0g-dev,
                libsystemd-dev [linux-any],
                libupower-glib-dev,
@@ -14,9 +14,10 @@ Build-Depends: cmake,
                libxkbcommon-dev,
                pkg-config,
                python3-docutils,
-               qt6-base-dev,
-               qt6-declarative-dev,
-               qt6-tools-dev,
+               qtbase5-dev (>= 5.8.0~),
+               qtdeclarative5-dev (>= 5.8.0~),
+               qttools5-dev,
+               qttools5-dev-tools (>= 5.8.0~),
                systemd [linux-any],
 Standards-Version: 4.5.0
 Homepage: https://github.com/sddm/sddm
@@ -27,7 +28,7 @@ Rules-Requires-Root: no
 Package: sddm
 Architecture: any
 Depends: adduser,
-         qt6-declarative,
+         qml-module-qtquick2,
          xauth,
          x11-common,
          xserver-xorg | xserver,
@@ -43,7 +44,7 @@ Description: modern display manager for X11
 
 Package: sddm-theme-debian-elarun
 Architecture: all
-Depends: ${misc:Depends}
+Depends: desktop-base, ${misc:Depends}
 Recommends: sddm
 Provides: sddm-theme
 Breaks: sddm (<< ${source:Version})
@@ -53,7 +54,7 @@ Description: 'Debian Elarun' Theme for SDDM X11 display manager
 
 Package: sddm-theme-debian-maui
 Architecture: all
-Depends: ${misc:Depends}
+Depends: desktop-base, ${misc:Depends}
 Recommends: sddm
 Provides: sddm-theme
 Breaks: sddm (<< ${source:Version})
diff --git a/debian/rules b/debian/rules
index 4601e2d..9fc9ac4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,8 +11,7 @@ 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" \
-	    -DBUILD_WITH_QT6=ON
+	    -DDBUS_CONFIG_FILENAME="sddm_org.freedesktop.DisplayManager.conf"
 
 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 2e4b748..dde3d19 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/*/qt6/qml/SddmComponents/
+usr/lib/*/qt5/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 e93de6b..e73da81 100644
--- a/debian/sddm.service
+++ b/debian/sddm.service
@@ -11,15 +11,11 @@ After=haveged.service
 
 # If using tty1 and plymouth, sddm will fail till plymouth stops
 # consider using:
-After=plymouth-quit.service systemd-logind.service
+After=plymouth-quit.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