diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2020-07-05 13:55:24 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2020-07-05 13:55:24 +0100 |
commit | fd890516aacba5ee2d8902fb31cc27964c4632c1 (patch) | |
tree | 666b979dfc54571d6c6e04e1939ca5a9bb06b0f0 /x11-misc/sddm/files/sddm-enable-elogind.patch | |
parent | 3f081bc83000affd8ec16e0b941c6c08925ea098 (diff) |
x11-misc/sddm : version bump (bugfix: https://bugs.redcorelinux.org/show_bug.cgi?id=117)
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, 0 insertions, 56 deletions
diff --git a/x11-misc/sddm/files/sddm-enable-elogind.patch b/x11-misc/sddm/files/sddm-enable-elogind.patch deleted file mode 100644 index b427ddd9..00000000 --- a/x11-misc/sddm/files/sddm-enable-elogind.patch +++ /dev/null @@ -1,56 +0,0 @@ ---- 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 "/bin/loginctl poweroff") -+ set(REBOOT_COMMAND "/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 |