summaryrefslogtreecommitdiff
path: root/pcr/sddm-elogind/sddm-enable-elogind.patch
diff options
context:
space:
mode:
authorDavid P <megver83@parabola.nu>2018-05-06 17:03:57 -0300
committerDavid P <megver83@parabola.nu>2018-05-06 17:03:57 -0300
commit8bbd7ad91b66d9ec6d4a7a44b89c7c8f9410353d (patch)
tree1a5771f30196c121eb44b3d4db00a96e98d0dd39 /pcr/sddm-elogind/sddm-enable-elogind.patch
parent53742a64907fd86c7ae25a21bd0bf18760f19cca (diff)
downloadabslibre-8bbd7ad91b66d9ec6d4a7a44b89c7c8f9410353d.tar.gz
abslibre-8bbd7ad91b66d9ec6d4a7a44b89c7c8f9410353d.tar.bz2
abslibre-8bbd7ad91b66d9ec6d4a7a44b89c7c8f9410353d.zip
upgpkg: pcr/sddm-elogind 0.17.0-1
Signed-off-by: David P <megver83@parabola.nu>
Diffstat (limited to 'pcr/sddm-elogind/sddm-enable-elogind.patch')
-rw-r--r--pcr/sddm-elogind/sddm-enable-elogind.patch58
1 files changed, 0 insertions, 58 deletions
diff --git a/pcr/sddm-elogind/sddm-enable-elogind.patch b/pcr/sddm-elogind/sddm-enable-elogind.patch
deleted file mode 100644
index 363a3e4b7..000000000
--- a/pcr/sddm-elogind/sddm-enable-elogind.patch
+++ /dev/null
@@ -1,58 +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 "/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")
-diff --git a/services/sddm-greeter.pam b/services/sddm-greeter.pam
-index 44e209e..633a128 100644
---- a/services/sddm-greeter.pam
-+++ b/services/sddm-greeter.pam
-@@ -14,4 +14,4 @@ password required pam_deny.so
-
- # Setup session
- session required pam_unix.so
--session optional pam_systemd.so
-+session optional pam_elogind.so