Mageia Bugzilla – Attachment 8562 Details for
Bug 19601
wrong [XDisplay] section in sddm.conf config file
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
Log In
[x]
|
New Account
|
Forgot Password
[patch]
patch for using /etc/X11/xdm/Xsetup_0
sddm.patch (text/plain), 6.82 KB, created by
Giuseppe Ghibò
on 2016-10-18 00:42:15 CEST
(
hide
)
Description:
patch for using /etc/X11/xdm/Xsetup_0
Filename:
MIME Type:
Creator:
Giuseppe Ghibò
Created:
2016-10-18 00:42:15 CEST
Size:
6.82 KB
patch
obsolete
>Index: SOURCES/sddm-0.14-cmake-display-command.patch >=================================================================== >--- SOURCES/sddm-0.14-cmake-display-command.patch (nonexistent) >+++ SOURCES/sddm-0.14-cmake-display-command.patch (working copy) >@@ -0,0 +1,46 @@ >+diff -up sddm-0.14.0/CMakeLists.txt.displaycommand sddm-0.14.0/CMakeLists.txt >+--- sddm-0.14.0/CMakeLists.txt.displaycommand 2016-08-28 13:54:03.000000000 +0200 >++++ sddm-0.14.0/CMakeLists.txt 2016-10-17 23:44:35.487460761 +0200 >+@@ -157,6 +157,7 @@ set(STATE_DIR "${CMAKE >+ set(RUNTIME_DIR "${CMAKE_INSTALL_FULL_LOCALSTATEDIR}/run/sddm" CACHE PATH "Runtime data storage directory") >+ >+ set(SESSION_COMMAND "${DATA_INSTALL_DIR}/scripts/Xsession" CACHE PATH "Script to execute when starting the X11 desktop session") >++set(DISPLAY_COMMAND "${DATA_INSTALL_DIR}/scripts/Xsetup" CACHE FILEPATH "Script to execute when starting the display server") >+ set(WAYLAND_SESSION_COMMAND "${DATA_INSTALL_DIR}/scripts/wayland-session" CACHE PATH "Script to execute when starting the Wayland desktop session") >+ >+ set(CONFIG_FILE "${CMAKE_INSTALL_FULL_SYSCONFDIR}/sddm.conf" CACHE PATH "Path of the sddm config file") >+diff -up sddm-0.14.0/data/man/sddm.conf.rst.in.displaycommand sddm-0.14.0/data/man/sddm.conf.rst.in >+--- sddm-0.14.0/data/man/sddm.conf.rst.in.displaycommand 2016-08-28 13:54:03.000000000 +0200 >++++ sddm-0.14.0/data/man/sddm.conf.rst.in 2016-10-17 23:45:34.556510361 +0200 >+@@ -113,7 +113,7 @@ OPTIONS >+ >+ `DisplayCommand=` >+ Path of script to execute when starting the display server. >+- Default value is "@DATA_INSTALL_DIR@/scripts/Xsetup". >++ Default value is "@DISPLAY_COMMAND@". >+ >+ `DisplayStopCommand=` >+ Path of script to execute when stopping the display server. >+diff -up sddm-0.14.0/src/common/Configuration.h.displaycommand sddm-0.14.0/src/common/Configuration.h >+--- sddm-0.14.0/src/common/Configuration.h.displaycommand 2016-08-28 13:54:03.000000000 +0200 >++++ sddm-0.14.0/src/common/Configuration.h 2016-10-17 23:47:54.838628157 +0200 >+@@ -66,7 +66,7 @@ namespace SDDM { >+ Entry(SessionCommand, QString, _S(SESSION_COMMAND), _S("Path to a script to execute when starting the desktop session")); >+ Entry(SessionLogFile, QString, _S(".local/share/sddm/xorg-session.log"), _S("Path to the user session log file")); >+ Entry(UserAuthFile, QString, _S(".Xauthority"), _S("Path to the Xauthority file")); >+- Entry(DisplayCommand, QString, _S(DATA_INSTALL_DIR "/scripts/Xsetup"), _S("Path to a script to execute when starting the display server")); >++ Entry(DisplayCommand, QString, _S(DISPLAY_COMMAND), _S("Path to a script to execute when starting the display server")); >+ Entry(DisplayStopCommand, QString, _S(DATA_INSTALL_DIR "/scripts/Xstop"), _S("Path to a script to execute when stopping the display server")); >+ Entry(MinimumVT, int, MINIMUM_VT, _S("The lowest virtual terminal number that will be used.")); >+ ); >+diff -up sddm-0.14.0/src/common/Constants.h.in.displaycommand sddm-0.14.0/src/common/Constants.h.in >+--- sddm-0.14.0/src/common/Constants.h.in.displaycommand 2016-08-28 13:54:03.000000000 +0200 >++++ sddm-0.14.0/src/common/Constants.h.in 2016-10-17 23:46:19.899548437 +0200 >+@@ -30,6 +30,7 @@ >+ #define STATE_DIR "@STATE_DIR@" >+ >+ #define SESSION_COMMAND "@SESSION_COMMAND@" >++#define DISPLAY_COMMAND "@DISPLAY_COMMAND@" >+ #define WAYLAND_SESSION_COMMAND "@WAYLAND_SESSION_COMMAND@" >+ >+ #define CONFIG_FILE "@CONFIG_FILE@" >Index: SOURCES/sddm.conf >=================================================================== >--- SOURCES/sddm.conf (revision 1061508) >+++ SOURCES/sddm.conf (working copy) >@@ -65,7 +65,7 @@ > # > #SessionCommand= > # 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. Default value is "/usr/share/sddm/scripts/Xsession". >+# ".desktop" file of the selected session and runs it. Default value is "/etc/X11/Xsession". > # > #SessionLogFile= > # Path to the user session log file, relative to the home directory. >@@ -75,7 +75,7 @@ > # Path to the Xauthority file, relative to the home directory. Default value is ".Xauthority". > # > #DisplayCommand= >-# Path of script to execute when starting the display server. Default value is "/usr/share/sddm/scripts/Xsetup". >+# Path of script to execute when starting the display server. Default value is "/etc/X11/xdm/Xsetup_0". > # > #DisplayStopCommand= > # Path of script to execute when stopping the display server. Default value is "/usr/share/sddm/scripts/Xstop". >@@ -107,7 +107,7 @@ > # Minimum user id of the users to be listed in the user interface. Default value is 1000. > # > #MaximumUid= >-# Maximum user id of the users to be listed in the user interface. Default value is 65000. >+# Maximum user id of the users to be listed in the user interface. Default value is 60000. > # > #HideUsers= > # Comma-separated list of Users that shouldn't show up in the user list. Default value is empty. >Index: SPECS/sddm.spec >=================================================================== >--- SPECS/sddm.spec (revision 1061508) >+++ SPECS/sddm.spec (working copy) >@@ -1,4 +1,4 @@ >-%define rel 8 >+%define rel 9 > > Name: sddm > Version: 0.14.0 >@@ -28,7 +28,8 @@ > # taken from examples at https://github.com/sddm/sddm/issues/501 > Patch0: sddm-0.12.0-mga-autofocus.patch > Patch1: sddm-0.14-fix-swedish-translation.patch >- >+Patch2: sddm-0.14-cmake-display-command.patch >+# > BuildRequires: extra-cmake-modules > BuildRequires: cmake > BuildRequires: systemd-devel >@@ -87,6 +88,8 @@ > # set UID_MIN and UID_MAX here as autodetection from /etc/login.defs is not > # possible for normal users due to missing read permissions > %cmake_qt5 \ >+ -DSESSION_COMMAND:FILEPATH=/etc/X11/Xsession \ >+ -DDISPLAY_COMMAND:FILEPATH=/etc/X11/xdm/Xsetup_0 \ > -DUSE_QT5=ON \ > -DBUILD_MAN_PAGES=ON \ > -DENABLE_JOURNALD=ON \ >@@ -97,6 +100,7 @@ > > %install > make install/fast DESTDIR=%{buildroot} -C build >+mv -f %{buildroot}%{_sysconfdir}/sddm.conf %{buildroot}%{_sysconfdir}/sddm.conf.default > > # dm config > install -Dpm 644 %{_sourcedir}/11sddm.conf %{buildroot}%{_datadir}/X11/dm.d/11sddm.conf >@@ -165,6 +169,7 @@ > %files > %attr(700,sddm,sddm) %{_localstatedir}/lib/%{name}/ > %config(noreplace) %{_sysconfdir}/sddm.conf >+%config(noreplace) %{_sysconfdir}/sddm.conf.default > %config(noreplace) %{_sysconfdir}/pam.d/sddm > %config(noreplace) %{_sysconfdir}/pam.d/sddm-autologin > %config(noreplace) %{_sysconfdir}/pam.d/sddm-greeter
Index: SOURCES/sddm-0.14-cmake-display-command.patch =================================================================== --- SOURCES/sddm-0.14-cmake-display-command.patch (nonexistent) +++ SOURCES/sddm-0.14-cmake-display-command.patch (working copy) @@ -0,0 +1,46 @@ +diff -up sddm-0.14.0/CMakeLists.txt.displaycommand sddm-0.14.0/CMakeLists.txt +--- sddm-0.14.0/CMakeLists.txt.displaycommand 2016-08-28 13:54:03.000000000 +0200 ++++ sddm-0.14.0/CMakeLists.txt 2016-10-17 23:44:35.487460761 +0200 +@@ -157,6 +157,7 @@ set(STATE_DIR "${CMAKE + set(RUNTIME_DIR "${CMAKE_INSTALL_FULL_LOCALSTATEDIR}/run/sddm" CACHE PATH "Runtime data storage directory") + + set(SESSION_COMMAND "${DATA_INSTALL_DIR}/scripts/Xsession" CACHE PATH "Script to execute when starting the X11 desktop session") ++set(DISPLAY_COMMAND "${DATA_INSTALL_DIR}/scripts/Xsetup" CACHE FILEPATH "Script to execute when starting the display server") + set(WAYLAND_SESSION_COMMAND "${DATA_INSTALL_DIR}/scripts/wayland-session" CACHE PATH "Script to execute when starting the Wayland desktop session") + + set(CONFIG_FILE "${CMAKE_INSTALL_FULL_SYSCONFDIR}/sddm.conf" CACHE PATH "Path of the sddm config file") +diff -up sddm-0.14.0/data/man/sddm.conf.rst.in.displaycommand sddm-0.14.0/data/man/sddm.conf.rst.in +--- sddm-0.14.0/data/man/sddm.conf.rst.in.displaycommand 2016-08-28 13:54:03.000000000 +0200 ++++ sddm-0.14.0/data/man/sddm.conf.rst.in 2016-10-17 23:45:34.556510361 +0200 +@@ -113,7 +113,7 @@ OPTIONS + + `DisplayCommand=` + Path of script to execute when starting the display server. +- Default value is "@DATA_INSTALL_DIR@/scripts/Xsetup". ++ Default value is "@DISPLAY_COMMAND@". + + `DisplayStopCommand=` + Path of script to execute when stopping the display server. +diff -up sddm-0.14.0/src/common/Configuration.h.displaycommand sddm-0.14.0/src/common/Configuration.h +--- sddm-0.14.0/src/common/Configuration.h.displaycommand 2016-08-28 13:54:03.000000000 +0200 ++++ sddm-0.14.0/src/common/Configuration.h 2016-10-17 23:47:54.838628157 +0200 +@@ -66,7 +66,7 @@ namespace SDDM { + Entry(SessionCommand, QString, _S(SESSION_COMMAND), _S("Path to a script to execute when starting the desktop session")); + Entry(SessionLogFile, QString, _S(".local/share/sddm/xorg-session.log"), _S("Path to the user session log file")); + Entry(UserAuthFile, QString, _S(".Xauthority"), _S("Path to the Xauthority file")); +- Entry(DisplayCommand, QString, _S(DATA_INSTALL_DIR "/scripts/Xsetup"), _S("Path to a script to execute when starting the display server")); ++ Entry(DisplayCommand, QString, _S(DISPLAY_COMMAND), _S("Path to a script to execute when starting the display server")); + Entry(DisplayStopCommand, QString, _S(DATA_INSTALL_DIR "/scripts/Xstop"), _S("Path to a script to execute when stopping the display server")); + Entry(MinimumVT, int, MINIMUM_VT, _S("The lowest virtual terminal number that will be used.")); + ); +diff -up sddm-0.14.0/src/common/Constants.h.in.displaycommand sddm-0.14.0/src/common/Constants.h.in +--- sddm-0.14.0/src/common/Constants.h.in.displaycommand 2016-08-28 13:54:03.000000000 +0200 ++++ sddm-0.14.0/src/common/Constants.h.in 2016-10-17 23:46:19.899548437 +0200 +@@ -30,6 +30,7 @@ + #define STATE_DIR "@STATE_DIR@" + + #define SESSION_COMMAND "@SESSION_COMMAND@" ++#define DISPLAY_COMMAND "@DISPLAY_COMMAND@" + #define WAYLAND_SESSION_COMMAND "@WAYLAND_SESSION_COMMAND@" + + #define CONFIG_FILE "@CONFIG_FILE@" Index: SOURCES/sddm.conf =================================================================== --- SOURCES/sddm.conf (revision 1061508) +++ SOURCES/sddm.conf (working copy) @@ -65,7 +65,7 @@ # #SessionCommand= # 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. Default value is "/usr/share/sddm/scripts/Xsession". +# ".desktop" file of the selected session and runs it. Default value is "/etc/X11/Xsession". # #SessionLogFile= # Path to the user session log file, relative to the home directory. @@ -75,7 +75,7 @@ # Path to the Xauthority file, relative to the home directory. Default value is ".Xauthority". # #DisplayCommand= -# Path of script to execute when starting the display server. Default value is "/usr/share/sddm/scripts/Xsetup". +# Path of script to execute when starting the display server. Default value is "/etc/X11/xdm/Xsetup_0". # #DisplayStopCommand= # Path of script to execute when stopping the display server. Default value is "/usr/share/sddm/scripts/Xstop". @@ -107,7 +107,7 @@ # Minimum user id of the users to be listed in the user interface. Default value is 1000. # #MaximumUid= -# Maximum user id of the users to be listed in the user interface. Default value is 65000. +# Maximum user id of the users to be listed in the user interface. Default value is 60000. # #HideUsers= # Comma-separated list of Users that shouldn't show up in the user list. Default value is empty. Index: SPECS/sddm.spec =================================================================== --- SPECS/sddm.spec (revision 1061508) +++ SPECS/sddm.spec (working copy) @@ -1,4 +1,4 @@ -%define rel 8 +%define rel 9 Name: sddm Version: 0.14.0 @@ -28,7 +28,8 @@ # taken from examples at https://github.com/sddm/sddm/issues/501 Patch0: sddm-0.12.0-mga-autofocus.patch Patch1: sddm-0.14-fix-swedish-translation.patch - +Patch2: sddm-0.14-cmake-display-command.patch +# BuildRequires: extra-cmake-modules BuildRequires: cmake BuildRequires: systemd-devel @@ -87,6 +88,8 @@ # set UID_MIN and UID_MAX here as autodetection from /etc/login.defs is not # possible for normal users due to missing read permissions %cmake_qt5 \ + -DSESSION_COMMAND:FILEPATH=/etc/X11/Xsession \ + -DDISPLAY_COMMAND:FILEPATH=/etc/X11/xdm/Xsetup_0 \ -DUSE_QT5=ON \ -DBUILD_MAN_PAGES=ON \ -DENABLE_JOURNALD=ON \ @@ -97,6 +100,7 @@ %install make install/fast DESTDIR=%{buildroot} -C build +mv -f %{buildroot}%{_sysconfdir}/sddm.conf %{buildroot}%{_sysconfdir}/sddm.conf.default # dm config install -Dpm 644 %{_sourcedir}/11sddm.conf %{buildroot}%{_datadir}/X11/dm.d/11sddm.conf @@ -165,6 +169,7 @@ %files %attr(700,sddm,sddm) %{_localstatedir}/lib/%{name}/ %config(noreplace) %{_sysconfdir}/sddm.conf +%config(noreplace) %{_sysconfdir}/sddm.conf.default %config(noreplace) %{_sysconfdir}/pam.d/sddm %config(noreplace) %{_sysconfdir}/pam.d/sddm-autologin %config(noreplace) %{_sysconfdir}/pam.d/sddm-greeter
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 19601
:
8551
|
8561
|
8562
|
8572
|
8589
|
8590
|
8591
|
8599