fix bug 552318

(Portage version: 2.2.18/cvs/Linux i686, signed Manifest commit with key B2EFA1D4)

3 files changed, 58 insertions, 2 deletions

diff --git a/x11-misc/sddm/ChangeLog b/x11-misc/sddm/ChangeLog
index 68b15ab88cf5..8061ec80c755 100644
--- a/x11-misc/sddm/ChangeLog
+++ b/x11-misc/sddm/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-misc/sddm
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/sddm/ChangeLog,v 1.17 2015/06/22 10:47:52 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/sddm/ChangeLog,v 1.18 2015/06/28 13:52:08 jauhien Exp $
+
+*sddm-0.11.0-r1 (28 Jun 2015)
+
+  28 Jun 2015; Jauhien Piatlicki <jauhien@gentoo.org>
+  +files/sddm-0.11.0-dbus-config.patch, +sddm-0.11.0-r1.ebuild,
+  -sddm-0.11.0.ebuild:
+  fix bug 552318
 
   22 Jun 2015; Manuel Rüger <mrueg@gentoo.org> -sddm-0.10.0.ebuild:
   Remove old.
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
new file mode 100644
index 000000000000..c13c2bd79cf4
--- /dev/null
+++ b/x11-misc/sddm/files/sddm-0.11.0-dbus-config.patch
@@ -0,0 +1,46 @@
+From 4ab6ab1b78617c51a6d9db4d03be2b3d75e7acc5 Mon Sep 17 00:00:00 2001
+From: Harald Sitter <sitter@kde.org>
+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/sddm-0.11.0.ebuild b/x11-misc/sddm/sddm-0.11.0-r1.ebuild
index fbfabe4e5420..2f5712765fa6 100644
--- a/x11-misc/sddm/sddm-0.11.0.ebuild
+++ b/x11-misc/sddm/sddm-0.11.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/sddm/sddm-0.11.0.ebuild,v 1.2 2015/02/02 19:33:50 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/sddm/sddm-0.11.0-r1.ebuild,v 1.1 2015/06/28 13:52:08 jauhien Exp $
 
 EAPI=5
 inherit cmake-utils toolchain-funcs user
@@ -39,6 +39,8 @@ pkg_pretend() {
 src_prepare() {
 	use consolekit && epatch "${FILESDIR}/${P}-consolekit.patch"
 	use upower && epatch "${FILESDIR}/${PN}-0.10.0-upower.patch"
+	# fix bug 552318
+	epatch "${FILESDIR}/${P}-dbus-config.patch"
 
 	# respect user's cflags
 	sed -e 's|-Wall -march=native||' \
@@ -49,6 +51,7 @@ src_prepare() {
 src_configure() {
 	local mycmakeargs=(
 		$(cmake-utils_use_no systemd SYSTEMD)
+		-DDBUS_CONFIG_FILENAME:STRING="org.freedesktop.sddm.conf"
 	)
 	cmake-utils_src_configure
 }