diff options
| author |   Andreas Sturmlechner <asturm@gentoo.org> | 2018-07-21 23:07:45 +0200 |
|---|---|---|
| committer | Andreas Sturmlechner <asturm@gentoo.org> | 2018-07-22 13:21:17 +0200 |
| commit | ae159450bf401ffa9651ce243e8c12ca088e127b (patch) | |
| tree | c165253e1bc9a2db09e894f488d81baddd364ff9 /x11-misc/sddm/files | |
| parent | app-backup/rdiff-backup: Drop old (diff) | |
| download | gentoo-ae159450bf401ffa9651ce243e8c12ca088e127b.tar.gz gentoo-ae159450bf401ffa9651ce243e8c12ca088e127b.tar.bz2 gentoo-ae159450bf401ffa9651ce243e8c12ca088e127b.zip | |
x11-misc/sddm: 0.18.0 version bump
Bug: https://bugs.gentoo.org/661510
Package-Manager: Portage-2.3.43, Repoman-2.3.10
Diffstat (limited to 'x11-misc/sddm/files')
| -rw-r--r-- | x11-misc/sddm/files/sddm-0.18.0-Xsession.patch | 24 | ||||
| -rw-r--r-- | x11-misc/sddm/files/sddm-0.18.0-sddmconfdir.patch | 32 |
2 files changed, 56 insertions, 0 deletions
diff --git a/x11-misc/sddm/files/sddm-0.18.0-Xsession.patch b/x11-misc/sddm/files/sddm-0.18.0-Xsession.patch new file mode 100644 index 000000000000..41c813a06645 --- /dev/null +++ b/x11-misc/sddm/files/sddm-0.18.0-Xsession.patch @@ -0,0 +1,24 @@ +--- a/data/scripts/Xsession 2016-08-28 14:52:04.910181422 +0200 ++++ b/data/scripts/Xsession 2017-10-21 15:25:47.668886596 +0200 +@@ -50,6 +50,10 @@ + ;; + esac + ++# Make D-Bus and ConsoleKit start properly, see: ++# /etc/X11/xinit/xinitrc.d/{80-dbus,90-consolekit} ++command="$@" ++ + [ -f /etc/xprofile ] && . /etc/xprofile + [ -f $HOME/.xprofile ] && . $HOME/.xprofile + +@@ -94,8 +98,8 @@ + . "$USERXSESSION" + fi + +-if [ -z "$*" ]; then ++if [ -z "$command" ]; then + exec xmessage -center -buttons OK:0 -default OK "Sorry, $DESKTOP_SESSION is no valid session." + else +- exec $@ ++ exec $command + fi diff --git a/x11-misc/sddm/files/sddm-0.18.0-sddmconfdir.patch b/x11-misc/sddm/files/sddm-0.18.0-sddmconfdir.patch new file mode 100644 index 000000000000..9d8f2b545a1e --- /dev/null +++ b/x11-misc/sddm/files/sddm-0.18.0-sddmconfdir.patch @@ -0,0 +1,32 @@ +From 300078995ae82495cf09a0646a07e0214f0ae030 Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com> +Date: Sat, 21 Jul 2018 22:41:29 +0200 +Subject: [PATCH] Change location of sddm.conf.d to DATAROOTDIR + +/usr/lib is not a location that should be hardcoded - depending on +distribution and architecture this can be different. So far, SDDM +does not use this path unless the above conditions happen to make +it coincide with the install location of its Qml modules. + +DATAROOTDIR is defined as: Read-only architecture-independent data. +This seems to be a better fit for a system SDDM default config dir. +--- + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 8500c65..5150b7d 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -184,7 +184,7 @@ set(WAYLAND_SESSION_COMMAND "${DATA_INSTALL_DIR}/scripts/wayland-session" + + set(CONFIG_FILE "${CMAKE_INSTALL_FULL_SYSCONFDIR}/sddm.conf" CACHE PATH "Path of the sddm config file") + set(CONFIG_DIR "${CMAKE_INSTALL_FULL_SYSCONFDIR}/sddm.conf.d" CACHE PATH "Path of the sddm config directory") +-set(SYSTEM_CONFIG_DIR "${CMAKE_INSTALL_PREFIX}/lib/sddm/sddm.conf.d" CACHE PATH "Path of the system sddm config directory") ++set(SYSTEM_CONFIG_DIR "${CMAKE_INSTALL_FULL_DATAROOTDIR}/sddm/sddm.conf.d" CACHE PATH "Path of the system sddm config directory") + set(LOG_FILE "${CMAKE_INSTALL_FULL_LOCALSTATEDIR}/log/sddm.log" CACHE PATH "Path of the sddm log file") + set(DBUS_CONFIG_FILENAME "org.freedesktop.DisplayManager.conf" CACHE STRING "Name of the sddm config file") + set(COMPONENTS_TRANSLATION_DIR "${DATA_INSTALL_DIR}/translations" CACHE PATH "Components translations directory") +-- +2.18.0 + |