Sophie

Sophie

distrib > Mageia > 6 > x86_64 > by-pkgid > 25667ea3beb7fd9832975c8d5ecb1b60 > files > 25

sddm-0.14.0-13.2.mga6.src.rpm

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@"