Attachment 198270 Details for Bug 232356 – maybe upstream patch

[patch] maybe upstream patch

Fix_pathes.patch (text/plain), 2.55 KB, created by kikadf on 2018-10-17 14:36:20 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: kikadf

Created: 2018-10-17 14:36:20 UTC

Size: 2.55 KB

patch

obsolete

>diff -Naur -x .git -x .kdev4 -x build -x sddm-kcm.kdev4 sddm-kcm.orig/src/CMakeLists.txt sddm-kcm/src/CMakeLists.txt
>--- sddm-kcm.orig/src/CMakeLists.txt	2018-10-15 12:16:30.201679000 +0200
>+++ sddm-kcm/src/CMakeLists.txt	2018-10-15 12:11:23.467080000 +0200
>@@ -1,6 +1,8 @@
> set(SDDM_CONFIG_FILE                 "${CMAKE_INSTALL_FULL_SYSCONFDIR}/sddm.conf"        CACHE PATH      "Path of the sddm config file")
> set(SDDM_CONFIG_DIR                  "${CMAKE_INSTALL_FULL_SYSCONFDIR}/sddm.conf.d"      CACHE PATH      "Path of the sddm config directory")
> set(SDDM_SYSTEM_CONFIG_DIR           "${CMAKE_INSTALL_PREFIX}/lib/sddm/sddm.conf.d"      CACHE PATH      "Path of the system sddm config directory")
>+set(XSESSIONS_DIR                    "${CMAKE_INSTALL_PREFIX}/share/xsessions"           CACHE PATH      "Path of the xsessions")
>+set(WAYLAND_SESSIONS_DIR             "${CMAKE_INSTALL_PREFIX}/share/wayland-sessions"    CACHE PATH      "Path of the wayland sessions")
> 
> configure_file(config.h.in config.h IMMEDIATE @ONLY)
> # add_subdirectory(configwidgets)
>diff -Naur -x .git -x .kdev4 -x build -x sddm-kcm.kdev4 sddm-kcm.orig/src/config.h.in sddm-kcm/src/config.h.in
>--- sddm-kcm.orig/src/config.h.in	2018-10-15 12:16:30.201980000 +0200
>+++ sddm-kcm/src/config.h.in	2018-10-15 12:13:00.124050000 +0200
>@@ -4,5 +4,7 @@
> #define SDDM_CONFIG_FILE                 "@SDDM_CONFIG_FILE@"
> #define SDDM_CONFIG_DIR                  "@SDDM_CONFIG_DIR@"
> #define SDDM_SYSTEM_CONFIG_DIR           "@SDDM_SYSTEM_CONFIG_DIR@"
>+#define XSESSIONS_DIR                    "@XSESSIONS_DIR@"
>+#define WAYLAND_SESSIONS_DIR             "@WAYLAND_SESSIONS_DIR@"
> 
> #endif //CONFIG_H
>diff -Naur -x .git -x .kdev4 -x build -x sddm-kcm.kdev4 sddm-kcm.orig/src/sessionmodel.cpp sddm-kcm/src/sessionmodel.cpp
>--- sddm-kcm.orig/src/sessionmodel.cpp	2018-10-15 12:16:30.204073000 +0200
>+++ sddm-kcm/src/sessionmodel.cpp	2018-10-15 12:15:44.643700000 +0200
>@@ -17,6 +17,7 @@
> * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
> ***************************************************************************/
> 
>+#include "config.h"
> #include "sessionmodel.h"
> 
> #include <QDir>
>@@ -46,8 +47,8 @@
> };
> 
> SessionModel::SessionModel(QObject *parent) : QAbstractListModel(parent), d(new SessionModelPrivate()) {
>-    loadDir(QStringLiteral("/usr/share/xsessions"), SessionTypeX);
>-    loadDir(QStringLiteral("/usr/share/wayland-sessions"), SessionTypeWayland);
>+    loadDir(QStringLiteral(XSESSIONS_DIR), SessionTypeX);
>+    loadDir(QStringLiteral(WAYLAND_SESSIONS_DIR), SessionTypeWayland);
> }
> 
> SessionModel::~SessionModel() {

Actions: View | Diff

Attachments on bug 232356: 198269 | 198270