[packages/sddm] - missing commit updates

baggins baggins at pld-linux.org
Mon Sep 23 01:06:48 CEST 2024 

commit 60636e9db82ad8971acf5ca375e90fcf3024353c
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Mon Sep 23 01:06:32 2024 +0200

    - missing commit updates

 sddm.conf | 194 +++++++++++++++++++++++++++++---------------------------------
 sddm.spec |  21 ++++---
 2 files changed, 103 insertions(+), 112 deletions(-)
---
diff --git a/sddm.spec b/sddm.spec
index 95e50bd..c17c308 100644
--- a/sddm.spec
+++ b/sddm.spec
@@ -3,18 +3,19 @@
 Summary:	QML based X11 desktop manager
 Name:		sddm
 Version:	0.21.0
-Release:	1
+Release:	2
 License:	GPLv2+ and CC-BY-SA
 Group:		X11/Applications
+#Source0:	https://github.com/sddm/sddm/archive/v%{version}/%{name}-%version}.tar.gz
 Source0:	https://github.com/sddm/sddm/archive/v%{version}.tar.gz
 # Source0-md5:	e32a35c282d9be3360737eefbe25b5fa
-Source1:	wayland-session
 Source10:	%{name}.pam
 Source11:	%{name}-autologin.pam
 Source12:	tmpfiles-%{name}.conf
 # sample sddm.conf generated with sddm --example-config, and entries commented-out
 Source13:	%{name}.conf
-Source14:	Xsession
+Patch0:		always-load-profile.patch
+Patch1:		no-display-manager-alias.patch
 URL:		https://github.com/sddm/sddm
 BuildRequires:	Qt5Core-devel >= %{qtver}
 BuildRequires:	Qt5DBus-devel >= %{qtver}
@@ -55,6 +56,7 @@ Requires:	Qt5Qml >= %{qtver}
 Requires:	Qt5Quick >= %{qtver}
 Requires:	systemd-units >= 38
 Requires:	xinitrc-ng >= 1.0
+Recommends:	Qt5VirtualKeyboard
 Suggests:	weston
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -66,15 +68,19 @@ interfaces.
 
 %prep
 %setup -q
+%patch0 -p1
+%patch1 -p1
 
 %build
 install -d build
 cd build
-%cmake \
+%cmake ../ \
+	-DSESSION_COMMAND:PATH=/etc/X11/xinit/xinitrc \
 	-DBUILD_MAN_PAGES:BOOL=ON \
 	-DENABLE_JOURNALD:BOOL=ON \
-	-DUSE_QT5:BOOL=ON \
-	..
+	-DBUILD_WITH_QT6:BOOL=OFF \
+	-DBUILD_MAN_PAGES:BOOL=ON
+
 %{__make}
 
 %install
@@ -90,8 +96,6 @@ install -Dpm 644 %{SOURCE10} $RPM_BUILD_ROOT/etc/pam.d/sddm
 install -Dpm 644 %{SOURCE11} $RPM_BUILD_ROOT/etc/pam.d/sddm-autologin
 install -Dpm 644 %{SOURCE12} $RPM_BUILD_ROOT%{systemdtmpfilesdir}/sddm.conf
 install -Dpm 644 %{SOURCE13} $RPM_BUILD_ROOT%{_sysconfdir}/sddm.conf
-install -Dpm 644 %{SOURCE14} $RPM_BUILD_ROOT%{_datadir}/sddm/scripts/Xsession
-install -Dpm 644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/sddm/scripts/wayland-session
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -134,6 +138,7 @@ fi
 %attr(1770, sddm, sddm) %dir %{_localstatedir}/lib/sddm
 %{systemdunitdir}/sddm.service
 %{_libdir}/qt5/qml/SddmComponents/
+%{_prefix}/lib/sysusers.d/sddm.conf
 %{_datadir}/dbus-1/system.d/org.freedesktop.DisplayManager.conf
 %dir %{_datadir}/sddm
 %{_datadir}/sddm/faces
diff --git a/sddm.conf b/sddm.conf
index d8b0e76..e5e8e19 100644
--- a/sddm.conf
+++ b/sddm.conf
@@ -1,151 +1,137 @@
 [Autologin]
-#Name of the user to automatically log in when the
-#system starts first time.
-#User=
+# Whether sddm should automatically log back into sessions when they exit
+#Relogin=false
 
-#Name of the session to automatically log in when the
-#system starts first time.
+# Name of session file for autologin session (if empty try last logged in)
 #Session=
 
-#If true and User and Session are set automatic login will
-#kick in again on session exit, otherwise it will work
-#only the first time.
-#Relogin=false
+# Username for autologin session
+#User=
+
 
 [General]
-#Halt command.
+# Which display server should be used.
+# Valid values are: x11, x11-user, wayland. Wayland support is experimental
+#DisplayServer=x11
+
+# Comma-separated list of environment variables to be set
+#GreeterEnvironment=
+
+# Halt command
 #HaltCommand=/usr/bin/systemctl poweroff
 
-#Reboot command.
-#RebootCommand=/usr/bin/systemctl reboot
+# Input method module
+#InputMethod=qtvirtualkeyboard
+
+# Comma-separated list of Linux namespaces for user session to enter
+#Namespaces=
 
-#Change numlock state when **sddm-greeter** starts.
-#Valid values are `on`, `off` or `none`.
-#If property is set to `none`, numlock won't be changed.
+# Initial NumLock state. Can be on, off or none.
+# If property is set to none, numlock won't be changed
+# NOTE: Currently ignored if autologin is enabled.
 #Numlock=none
 
-#Set the Qt input method for the greeter.
-#Tablet users with Qt Virtual Keyboard installed can set this
-#to "qtvirtualkeyboard" for the on-screen keyboard.
-#Other known values are "ibus" for the Intelligent Input Bus,
-#or "compose" for dead keys support.
-#Leave this empty if unsure.
-#InputMethod=
-
-#Comma-separated list of paths bound to Linux namespaces to enter with
-#setns() before starting the user session.  For example, to enter network
-#namespace `mynet` created with `ip netns add mynet`, the value might be
-#`/run/netns/mynet`.  Default value is empty.  (The value is ignored if
-#the operating system is not Linux.)
-#Namespaces=
+# Reboot command
+#RebootCommand=/usr/bin/systemctl reboot
 
-[Theme]
-#Path of the directory containing theme files.
-#ThemeDir=/usr/share/sddm/themes
 
-#Name of the current theme.
+[Theme]
+# Current theme name
 #Current=
 
-#Path of the directory containing face files,
-#face files should be in username.face.icon format.
-#FacesDir=/usr/share/sddm/faces
+# Cursor size used in the greeter
+#CursorSize=
 
-#Name of the cursor theme to be set before starting
-#the display server.
+# Cursor theme used in the greeter
 #CursorTheme=
 
-#Name of the font to be set before starting the
-#display server. Please note that the theme can still override this option.
-#Font=
+# Number of users to use as threshold
+# above which avatars are disabled
+# unless explicitly enabled with EnableAvatars
+#DisableAvatarsThreshold=7
 
-#When enabled, home directories are searched for ".face.icon" images to
-#display as their avatars. This can be slow on some file systems.
-#When disabled, all avatars will be default. Themes may choose to hide
-#them altogether.
+# Enable display of custom user avatars
 #EnableAvatars=true
 
+# Global directory for user avatars
+# The files should be named <username>.face.icon
+F#acesDir=/usr/share/sddm/faces
+
+# Font used in the greeter
+#Font=
+
+# Theme directory path
+#ThemeDir=/usr/share/sddm/themes
+
+
 [Users]
-#Default path to set after successfully logging in.
-#This is also where SDDM looks for programs.
+# Default $PATH for logged in users
 #DefaultPath=/usr/local/bin:/usr/bin:/bin
 
-#Minimum user id of the users to be listed in the
-#user interface.
-#MinimumUid=1000
-
-#Maximum user id of the users to be listed in the
-#user interface.
-#MaximumUid=6000
+# Comma-separated list of shells.
+# Users with these shells as their default won't be listed
+#HideShells=
 
-#Comma-separated list of Users that shouldn't show up in the user list.
+# Comma-separated list of users that should not be listed
 #HideUsers=
 
-#Comma-separated list of Shells of users that shouldn't show up in the user list.
-HideShells=/usr/bin/git-shell
+# Maximum user id for displayed users
+#MaximumUid=60000
 
-#If this flag is true, LastUser value will updated
-#on every successful login, if false last user value
-#won't be updated.
-#RememberLastUser=true
+# Minimum user id for displayed users
+#MinimumUid=1000
 
-#If this flag is true, LastSession value will updated
-#on every successful login, if false last session value
-#won't be updated.
+# Remember the session of the last successfully logged in user
 #RememberLastSession=true
 
+# Remember the last successfully logged in user
+#RememberLastUser=true
+
+# When logging in as the same user twice, restore the original session, rather than create a new one
+#ReuseSession=true
+
+
 [Wayland]
-#Path of the directory containing session files.
-#SessionDir=/usr/share/wayland-sessions
+# Path of the Wayland compositor to execute when starting the greeter
+#CompositorCommand=weston --shell=kiosk
 
-#Path of script to execute when starting the user session. This script
-#receives the value of the "Exec" setting in the ".desktop" file of the selected
-#session and run it.
+# Enable Qt's automatic high-DPI scaling
+#EnableHiDPI=true
+
+# Path to a script to execute when starting the desktop session
 #SessionCommand=/usr/share/sddm/scripts/wayland-session
 
-#Path to the user session log file, relative to the home directory.
+# Comma-separated list of directories containing available Wayland sessions
+#SessionDir=/usr/local/share/wayland-sessions,/usr/share/wayland-sessions
+
+# Path to the user session log file
 #SessionLogFile=.local/share/sddm/wayland-session.log
 
-#Enables Qt's automatic HiDPI scaling.
-#Can be either "true" or "false".
-#EnableHiDPI=false
 
 [X11]
-#Path of the X server.
-#ServerPath=/usr/bin/X
-
-#Arguments to the X server.
-#ServerArguments=-nolisten tcp
-
-#Path of the Xephyr.
-#XephyrPath=/usr/bin/Xephyr
-
-#Path of the Xauth.
-#XauthPath=/usr/bin/xauth
+# Path to a script to execute when starting the display server
+#DisplayCommand=/usr/share/sddm/scripts/Xsetup
 
-#Path of the directory containing session files.
-#SessionDir=/usr/share/xsessions
+# Path to a script to execute when stopping the display server
+#DisplayStopCommand=/usr/share/sddm/scripts/Xstop
 
-#Path of script to execute when starting the user session. This script
-#receives the value of the "Exec" setting in the ".desktop" file of the selected
-#session and runs it.
-#SessionCommand=/usr/share/sddm/scripts/Xsession
+# Enable Qt's automatic high-DPI scaling
+#EnableHiDPI=true
 
-#Path to the user session log file, relative to the home directory.
-#SessionLogFile=.local/share/sddm/xorg-session.log
+# Arguments passed to the X server invocation
+#ServerArguments=-nolisten tcp
 
-#Path to the Xauthority file, relative to the home directory.
-#UserAuthFile=.Xauthority
+# Path to X server binary
+#ServerPath=/usr/bin/X
 
-#Path of script to execute when starting the display server.
-#DisplayCommand=/usr/share/sddm/scripts/Xsetup
+# Path to a script to execute when starting the desktop session
+#SessionCommand=/etc/X11/xinit/xinitrc
 
-#Path of script to execute when stopping the display server.
-#DisplayStopCommand=/usr/share/sddm/scripts/Xstop
+# Comma-separated list of directories containing available X sessions
+#SessionDir=/usr/local/share/xsessions,/usr/share/xsessions
 
-#Minimum virtual terminal number that will be used
-#by the first display. Virtual terminal number will
-#increase as new displays added.
-MinimumVT=7
+# Path to the user session log file
+#SessionLogFile=.local/share/sddm/xorg-session.log
 
-#Enables Qt's automatic HiDPI scaling.
-#EnableHiDPI=false
+# Path to Xephyr binary
+#XephyrPath=/usr/bin/Xephyr
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/sddm.git/commitdiff/60636e9db82ad8971acf5ca375e90fcf3024353c

More information about the pld-cvs-commit mailing list