From ff5dd7b3704b9e8f9f606d4929f95694ec84ddf3 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 11 Aug 2016 00:33:31 +0100 Subject: cleanup --- x11-misc/sddm/files/sddm-0.10.0-consolekit.patch | 13 ------- x11-misc/sddm/files/sddm-0.10.0-upower.patch | 12 ------ x11-misc/sddm/files/sddm-0.11.0-consolekit.patch | 11 ------ x11-misc/sddm/files/sddm-0.11.0-dbus-config.patch | 46 ----------------------- x11-misc/sddm/files/systemd_service.patch | 20 ---------- 5 files changed, 102 deletions(-) delete mode 100644 x11-misc/sddm/files/sddm-0.10.0-consolekit.patch delete mode 100644 x11-misc/sddm/files/sddm-0.10.0-upower.patch delete mode 100644 x11-misc/sddm/files/sddm-0.11.0-consolekit.patch delete mode 100644 x11-misc/sddm/files/sddm-0.11.0-dbus-config.patch delete mode 100644 x11-misc/sddm/files/systemd_service.patch (limited to 'x11-misc/sddm/files') diff --git a/x11-misc/sddm/files/sddm-0.10.0-consolekit.patch b/x11-misc/sddm/files/sddm-0.10.0-consolekit.patch deleted file mode 100644 index acdfdc1a..00000000 --- a/x11-misc/sddm/files/sddm-0.10.0-consolekit.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/data/scripts/Xsession b/data/scripts/Xsession -index a5d270d..4b48524 100755 ---- a/data/scripts/Xsession -+++ b/data/scripts/Xsession -@@ -74,7 +74,7 @@ case $session in - exec xterm -geometry 80x24-0-0 - ;; - *) -- eval exec "$session" -+ eval exec ck-launch-session "$session" - ;; - esac - exec xmessage -center -buttons OK:0 -default OK "Sorry, cannot execute $session. Check $DESKTOP_SESSION.desktop." diff --git a/x11-misc/sddm/files/sddm-0.10.0-upower.patch b/x11-misc/sddm/files/sddm-0.10.0-upower.patch deleted file mode 100644 index 8c0f34c2..00000000 --- a/x11-misc/sddm/files/sddm-0.10.0-upower.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -u -r sddm-0.9.0.orig/src/daemon/PowerManager.cpp sddm-0.9.0/src/daemon/PowerManager.cpp ---- sddm-0.9.0.orig/src/daemon/PowerManager.cpp 2014-10-01 18:40:37.402683578 +0200 -+++ sddm-0.9.0/src/daemon/PowerManager.cpp 2014-10-01 18:40:43.502618164 +0200 -@@ -197,7 +197,7 @@ - m_backends << new Login1Backend(); - - // check if upower interface exists -- if (interface->isServiceRegistered(UPOWER_SERVICE)) -+// if (interface->isServiceRegistered(UPOWER_SERVICE)) - m_backends << new UPowerBackend(); - } - diff --git a/x11-misc/sddm/files/sddm-0.11.0-consolekit.patch b/x11-misc/sddm/files/sddm-0.11.0-consolekit.patch deleted file mode 100644 index 4871bee0..00000000 --- a/x11-misc/sddm/files/sddm-0.11.0-consolekit.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- data/scripts/Xsession.old 2015-01-08 12:58:24.448241484 +0100 -+++ data/scripts/Xsession 2015-01-08 13:00:07.794244087 +0100 -@@ -93,7 +93,7 @@ - exec xterm -geometry 80x24-0-0 - ;; - *) -- eval exec "$session" -+ eval exec ck-launch-session "$session" - ;; - esac - exec xmessage -center -buttons OK:0 -default OK "Sorry, cannot execute $session. Check $DESKTOP_SESSION.desktop." diff --git a/x11-misc/sddm/files/sddm-0.11.0-dbus-config.patch b/x11-misc/sddm/files/sddm-0.11.0-dbus-config.patch deleted file mode 100644 index c13c2bd7..00000000 --- a/x11-misc/sddm/files/sddm-0.11.0-dbus-config.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 4ab6ab1b78617c51a6d9db4d03be2b3d75e7acc5 Mon Sep 17 00:00:00 2001 -From: Harald Sitter -Date: Tue, 14 Apr 2015 10:50:00 +0200 -Subject: [PATCH] allow changing the dbus config file name - -on some distributions the generic name of the dbus config might be provided -by more than one display manager, so always installing with the generic -name would require distributions to hard-patch the cmake code. -allowing to change it through a cmake cache variable enables distributions -to simply parameterize in their cmake call. - -this for example affects Ubuntu where the config would be provided by both -SDDM and LightDM. ---- - CMakeLists.txt | 1 + - data/CMakeLists.txt | 2 +- - 2 files changed, 2 insertions(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 7ceed6e..cf21dc9 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -141,6 +141,7 @@ set(SESSION_COMMAND "${DATA_INSTALL_DIR}/scripts/Xsession" - - set(CONFIG_FILE "${CMAKE_INSTALL_FULL_SYSCONFDIR}/sddm.conf" CACHE PATH "Path of the sddm config file") - 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") - - # Add subdirectories -diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt -index 918892f..335f4e7 100644 ---- a/data/CMakeLists.txt -+++ b/data/CMakeLists.txt -@@ -1,7 +1,7 @@ - install(DIRECTORY "faces" DESTINATION "${DATA_INSTALL_DIR}") - install(DIRECTORY "flags" DESTINATION "${DATA_INSTALL_DIR}") - --install(FILES "org.freedesktop.DisplayManager.conf" DESTINATION "${DBUS_CONFIG_DIR}") -+install(FILES "org.freedesktop.DisplayManager.conf" DESTINATION "${DBUS_CONFIG_DIR}" RENAME ${DBUS_CONFIG_FILENAME}) - - install(FILES "scripts/Xsession" "scripts/Xsetup" "scripts/Xstop" DESTINATION "${DATA_INSTALL_DIR}/scripts" - PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE --- -2.3.6 - diff --git a/x11-misc/sddm/files/systemd_service.patch b/x11-misc/sddm/files/systemd_service.patch deleted file mode 100644 index 7fc9e3f5..00000000 --- a/x11-misc/sddm/files/systemd_service.patch +++ /dev/null @@ -1,20 +0,0 @@ -mudler ---- services/~sddm.service.in 2015-08-31 16:11:52.267460238 +0200 -+++ services/sddm.service.in 2015-08-31 16:12:22.497417043 +0200 -@@ -1,13 +1,14 @@ - [Unit] - Description=Simple Desktop Display Manager - Documentation=man:sddm(1) man:sddm.conf(5) --Conflicts=getty@tty1.service --After=systemd-user-sessions.service getty@tty1.service plymouth-quit.service -+After=systemd-user-sessions.service - - [Service] - ExecStart=@CMAKE_INSTALL_FULL_BINDIR@/sddm - Restart=always - #PrivateTmp=yes -+StandardOutput=syslog -+BusName=org.freedesktop.DisplayManager - - [Install] - Alias=display-manager.service -- cgit v1.2.3