| 1 |
jauhien 15/06/28 13:52:08 |
| 2 |
|
| 3 |
Added: sddm-0.11.0-dbus-config.patch |
| 4 |
Log: |
| 5 |
fix bug 552318 |
| 6 |
|
| 7 |
(Portage version: 2.2.18/cvs/Linux i686, signed Manifest commit with key B2EFA1D4) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 x11-misc/sddm/files/sddm-0.11.0-dbus-config.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/sddm/files/sddm-0.11.0-dbus-config.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/sddm/files/sddm-0.11.0-dbus-config.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: sddm-0.11.0-dbus-config.patch |
| 16 |
=================================================================== |
| 17 |
From 4ab6ab1b78617c51a6d9db4d03be2b3d75e7acc5 Mon Sep 17 00:00:00 2001 |
| 18 |
From: Harald Sitter <sitter@×××.org> |
| 19 |
Date: Tue, 14 Apr 2015 10:50:00 +0200 |
| 20 |
Subject: [PATCH] allow changing the dbus config file name |
| 21 |
|
| 22 |
on some distributions the generic name of the dbus config might be provided |
| 23 |
by more than one display manager, so always installing with the generic |
| 24 |
name would require distributions to hard-patch the cmake code. |
| 25 |
allowing to change it through a cmake cache variable enables distributions |
| 26 |
to simply parameterize in their cmake call. |
| 27 |
|
| 28 |
this for example affects Ubuntu where the config would be provided by both |
| 29 |
SDDM and LightDM. |
| 30 |
--- |
| 31 |
CMakeLists.txt | 1 + |
| 32 |
data/CMakeLists.txt | 2 +- |
| 33 |
2 files changed, 2 insertions(+), 1 deletion(-) |
| 34 |
|
| 35 |
diff --git a/CMakeLists.txt b/CMakeLists.txt |
| 36 |
index 7ceed6e..cf21dc9 100644 |
| 37 |
--- a/CMakeLists.txt |
| 38 |
+++ b/CMakeLists.txt |
| 39 |
@@ -141,6 +141,7 @@ set(SESSION_COMMAND "${DATA_INSTALL_DIR}/scripts/Xsession" |
| 40 |
|
| 41 |
set(CONFIG_FILE "${CMAKE_INSTALL_FULL_SYSCONFDIR}/sddm.conf" CACHE PATH "Path of the sddm config file") |
| 42 |
set(LOG_FILE "${CMAKE_INSTALL_FULL_LOCALSTATEDIR}/log/sddm.log" CACHE PATH "Path of the sddm log file") |
| 43 |
+set(DBUS_CONFIG_FILENAME "org.freedesktop.DisplayManager.conf" CACHE STRING "Name of the sddm config file") |
| 44 |
set(COMPONENTS_TRANSLATION_DIR "${DATA_INSTALL_DIR}/translations" CACHE PATH "Components translations directory") |
| 45 |
|
| 46 |
# Add subdirectories |
| 47 |
diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt |
| 48 |
index 918892f..335f4e7 100644 |
| 49 |
--- a/data/CMakeLists.txt |
| 50 |
+++ b/data/CMakeLists.txt |
| 51 |
@@ -1,7 +1,7 @@ |
| 52 |
install(DIRECTORY "faces" DESTINATION "${DATA_INSTALL_DIR}") |
| 53 |
install(DIRECTORY "flags" DESTINATION "${DATA_INSTALL_DIR}") |
| 54 |
|
| 55 |
-install(FILES "org.freedesktop.DisplayManager.conf" DESTINATION "${DBUS_CONFIG_DIR}") |
| 56 |
+install(FILES "org.freedesktop.DisplayManager.conf" DESTINATION "${DBUS_CONFIG_DIR}" RENAME ${DBUS_CONFIG_FILENAME}) |
| 57 |
|
| 58 |
install(FILES "scripts/Xsession" "scripts/Xsetup" "scripts/Xstop" DESTINATION "${DATA_INSTALL_DIR}/scripts" |
| 59 |
PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE |
| 60 |
-- |
| 61 |
2.3.6 |
Archives