commit: 1e82a4168e8ff20cc5d985b531db74d9c869a560
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 30 13:05:52 2016 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sat Jan 30 13:07:38 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e82a416
x11-misc/sddm: remove old
It was interfering with consolekit.
Gentoo-bug: 571974
Package-Manager: portage-2.2.27
x11-misc/sddm/Manifest | 1 -
x11-misc/sddm/files/sddm-0.10.0-upower.patch | 12 ----
.../sddm/files/sddm-0.11.0-CVE-2015-0856.patch | 15 -----
x11-misc/sddm/files/sddm-0.11.0-dbus-config.patch | 46 --------------
x11-misc/sddm/sddm-0.11.0-r4.ebuild | 73 ----------------------
5 files changed, 147 deletions(-)
diff --git a/x11-misc/sddm/Manifest b/x11-misc/sddm/Manifest
index 957cdec..d5410c3 100644
--- a/x11-misc/sddm/Manifest
+++ b/x11-misc/sddm/Manifest
@@ -1,3 +1,2 @@
-DIST sddm-0.11.0.tar.gz 4735807 SHA256
80d53f075c275f744bd547523d6d640baccfacb4e463a71ec0facb8231b832ce SHA512
9dd2b80788e3cfdb353e64f709db451e04828991976b8b0f74c0e97dbf467fa2744702c73e5e50137eec10dac92df7dacd83fb458f75dd595556fc95fb1759f7
WHIRLPOOL
079c5093374710c2a3247a3e27dd26f3d10962c7cb8f260b80a4ba17a72e63676012d4b8e50f8f4bffc43124efdf05c7e14aefe86253b391345c7fa98a2d4c2f
DIST sddm-0.12.0.tar.xz 3866620 SHA256
7d7504bf8a717a9131a2f32be852d7631365d21a468ca2649c8245f24ff29ae0 SHA512
d1d9f60634cb2a71096d92321a7a8b33efb8879a766979ca7c1d31ac5f1dbde8253384070338eef80f777db1cd78eef540e9111151f7f9e7d8e648d557e58047
WHIRLPOOL
58d21ead822b85bf3f0f6375cfadee6225dd9bf696e786fe68f283def43b4107d11e14b357d60b0278266270f9ddcb6a9b86285bc3b1a19644583f6ebebc4990
DIST sddm-0.13.0.tar.xz 3869452 SHA256
dd868caaccf7783ead799f3b79e442d5adcb46251b78c8dbf3e9da0016dd347d SHA512
292a584945e74ea987088f975d5973b45a5b4fc07fa90b487fb9ece2de7ecca352344354474dfa8d103c8242367c19ad926e62a553e5b567d8d88a3f2c73c171
WHIRLPOOL
e3961ecd5e22e8d565c16d86b6043ba7f3d6c1c296047d196577ab25af4e50216d67d53e9690b4df262c5ae4486bf36f88d345110a54bada9d75c4ff0dfc5ff3
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 8c0f34c..0000000
--- 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-CVE-2015-0856.patch
b/x11-misc/sddm/files/sddm-0.11.0-CVE-2015-0856.patch
deleted file mode 100644
index 37c1b97..0000000
--- a/x11-misc/sddm/files/sddm-0.11.0-CVE-2015-0856.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Fix for CVE-2015-0856 (bug 563108) backported from the version 0.12.0.
---- src/daemon/Greeter.cpp
-+++ src/daemon/Greeter.cpp
-@@ -135,6 +135,11 @@
- env.insert("XDG_VTNR", QString::number(m_display->terminalId()));
- env.insert("XDG_SESSION_CLASS", "greeter");
- env.insert("XDG_SESSION_TYPE", m_display->sessionType());
-+
-+ //some themes may use KDE components and that will automatically
load KDE's crash handler which we don't want
-+ //counterintuitively setting this env disables that handler
-+ env.insert("KDE_DEBUG", "1");
-+
- m_auth->insertEnvironment(env);
-
- // log message
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 c13c2bd..0000000
--- 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 <sit...@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-r4.ebuild
b/x11-misc/sddm/sddm-0.11.0-r4.ebuild
deleted file mode 100644
index 50cbf07..0000000
--- a/x11-misc/sddm/sddm-0.11.0-r4.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit cmake-utils toolchain-funcs user
-
-DESCRIPTION="Simple Desktop Display Manager"
-HOMEPAGE="https://github.com/sddm/sddm";
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64 ~arm ~x86"
-
-LICENSE="GPL-2+ MIT CC-BY-3.0 public-domain"
-SLOT="0"
-IUSE="consolekit systemd"
-
-RDEPEND="sys-libs/pam
- >=x11-base/xorg-server-1.15.1
- x11-libs/libxcb[xkb(-)]
- dev-qt/qtcore:5
- dev-qt/qtdbus:5
- dev-qt/qtdeclarative:5
- dev-qt/qttest:5
- systemd? ( sys-apps/systemd:= )
- !systemd? ( || ( sys-power/upower sys-power/upower-pm-utils ) )"
-DEPEND="${RDEPEND}
- dev-qt/linguist-tools:5
- virtual/pkgconfig"
-
-pkg_pretend() {
- if [[ ${MERGE_TYPE} != binary && $(tc-getCC) == *gcc* ]]; then
- if [[ $(gcc-major-version) -lt 4 || $(gcc-major-version) == 4
&& $(gcc-minor-version) -lt 7 ]] ; then
- die 'The active compiler needs to be gcc 4.7 (or newer)'
- fi
- fi
-}
-
-src_prepare() {
- use consolekit && epatch "${FILESDIR}/${P}-consolekit.patch"
- use !systemd && epatch "${FILESDIR}/${PN}-0.10.0-upower.patch"
- # fix bug 552318 and bug 563108
- epatch "${FILESDIR}/${P}-dbus-config.patch"
"${FILESDIR}/${P}-CVE-2015-0856.patch"
-
- # respect user's cflags
- sed -e 's|-Wall -march=native||' \
- -e 's|-O2||' \
- -i CMakeLists.txt || die 'sed failed'
-}
-
-src_configure() {
- local mycmakeargs=(
- $(cmake-utils_use_no systemd SYSTEMD)
- -DDBUS_CONFIG_FILENAME:STRING="org.freedesktop.sddm.conf"
- )
- cmake-utils_src_configure
-}
-
-pkg_postinst() {
- if use consolekit; then
- ewarn "This display manager doesn't have native built-in
ConsoleKit support."
- ewarn "In order to use ConsoleKit pam module with this display
manager,"
- ewarn "you should remove the \"nox11\" parameter from
pm_ck_connector.so"
- ewarn "line in /etc/pam.d/system-login"
- fi
- ewarn "Add the sddm user manually to the video group"
- ewarn "if you experience flickering or other rendering issues of
sddm-greeter"
- ewarn "see https://github.com/gentoo/qt/pull/52";
-}
-
-pkg_postinst() {
- enewgroup ${PN}
- enewuser ${PN} -1 -1 /var/lib/${PN} ${PN} video
-}
