diff options
| author |   Michael Palimaka <kensington@gentoo.org> | 2017-03-25 13:48:44 +1100 |
|---|---|---|
| committer | Michael Palimaka <kensington@gentoo.org> | 2017-03-25 13:49:26 +1100 |
| commit | d19f8d9400c010a9878a88e888fd5163042ff348 (patch) | |
| tree | 76982342de14bd77baa3357f21ced6d344542dbd /x11-misc/sddm/files/sddm-enable-elogind.patch | |
| parent | kde-apps/marble: fix configuratoin installation path (diff) | |
| download | gentoo-d19f8d9400c010a9878a88e888fd5163042ff348.tar.gz gentoo-d19f8d9400c010a9878a88e888fd5163042ff348.tar.bz2 gentoo-d19f8d9400c010a9878a88e888fd5163042ff348.zip | |
x11-misc/sddm: introduce elogind support
Gentoo-bug: 599506
Package-Manager: Portage-2.3.5, Repoman-2.3.2
Diffstat (limited to 'x11-misc/sddm/files/sddm-enable-elogind.patch')
| -rw-r--r-- | x11-misc/sddm/files/sddm-enable-elogind.patch | 56 |
1 files changed, 56 insertions, 0 deletions
diff --git a/x11-misc/sddm/files/sddm-enable-elogind.patch b/x11-misc/sddm/files/sddm-enable-elogind.patch new file mode 100644 index 000000000000..d1277e9554f3 --- /dev/null +++ b/x11-misc/sddm/files/sddm-enable-elogind.patch @@ -0,0 +1,56 @@ +--- a/CMakeLists.txt 2016-11-10 09:27:03.866358608 +0100 ++++ b/CMakeLists.txt 2016-11-10 10:28:25.384374766 +0100 +@@ -93,7 +93,7 @@ + endif() + + # systemd +-if(NOT NO_SYSTEMD) ++if(NOT NO_SYSTEMD AND NOT USE_ELOGIND) + pkg_check_modules(SYSTEMD "systemd") + endif() + +@@ -127,12 +127,34 @@ + set(REBOOT_COMMAND "/usr/bin/systemctl reboot") + else() + set(SYSTEMD_FOUND 0) ++endif() ++add_feature_info("systemd" SYSTEMD_FOUND "systemd support") ++add_feature_info("journald" JOURNALD_FOUND "journald support") ++ ++# elogind ++if(NO_SYSTEMD AND USE_ELOGIND) ++ pkg_check_modules(ELOGIND "libelogind") ++endif() ++ ++if(ELOGIND_FOUND) ++ add_definitions(-DHAVE_ELOGIND) ++ set(CMAKE_AUTOMOC_MOC_OPTIONS -DHAVE_ELOGIND) ++ ++ set(MINIMUM_VT 7) ++ set(HALT_COMMAND "/usr/bin/loginctl poweroff") ++ set(REBOOT_COMMAND "/usr/bin/loginctl reboot") ++else() ++ set(ELOGIND_FOUND 0) ++endif() ++add_feature_info("elogind" ELOGIND_FOUND "elogind support") ++ ++# Default behaviour if neither systemd nor elogind is used ++if (NOT ELOGIND_FOUND AND NOT SYSTEMD_FOUND) + set(MINIMUM_VT 7) + set(HALT_COMMAND "/sbin/shutdown -h -P now") + set(REBOOT_COMMAND "/sbin/shutdown -r now") + endif() +-add_feature_info("systemd" SYSTEMD_FOUND "systemd support") +-add_feature_info("journald" JOURNALD_FOUND "journald support") ++ + + # Set constants + set(DATA_INSTALL_DIR "${CMAKE_INSTALL_FULL_DATADIR}/sddm" CACHE PATH "System application data install directory") +--- a/services/sddm-greeter.pam 2016-06-19 12:24:42.000000000 +0200 ++++ b/services/sddm-greeter.pam 2016-11-02 09:48:18.990032363 +0100 +@@ -14,4 +14,5 @@ + + # Setup session + session required pam_unix.so + session optional pam_systemd.so ++session optional pam_elogind.so |