1 |
commit: 1e82a4168e8ff20cc5d985b531db74d9c869a560 |
2 |
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Jan 30 13:05:52 2016 +0000 |
4 |
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Jan 30 13:07:38 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e82a416 |
7 |
|
8 |
x11-misc/sddm: remove old |
9 |
|
10 |
It was interfering with consolekit. |
11 |
|
12 |
Gentoo-bug: 571974 |
13 |
|
14 |
Package-Manager: portage-2.2.27 |
15 |
|
16 |
x11-misc/sddm/Manifest | 1 - |
17 |
x11-misc/sddm/files/sddm-0.10.0-upower.patch | 12 ---- |
18 |
.../sddm/files/sddm-0.11.0-CVE-2015-0856.patch | 15 ----- |
19 |
x11-misc/sddm/files/sddm-0.11.0-dbus-config.patch | 46 -------------- |
20 |
x11-misc/sddm/sddm-0.11.0-r4.ebuild | 73 ---------------------- |
21 |
5 files changed, 147 deletions(-) |
22 |
|
23 |
diff --git a/x11-misc/sddm/Manifest b/x11-misc/sddm/Manifest |
24 |
index 957cdec..d5410c3 100644 |
25 |
--- a/x11-misc/sddm/Manifest |
26 |
+++ b/x11-misc/sddm/Manifest |
27 |
@@ -1,3 +1,2 @@ |
28 |
-DIST sddm-0.11.0.tar.gz 4735807 SHA256 80d53f075c275f744bd547523d6d640baccfacb4e463a71ec0facb8231b832ce SHA512 9dd2b80788e3cfdb353e64f709db451e04828991976b8b0f74c0e97dbf467fa2744702c73e5e50137eec10dac92df7dacd83fb458f75dd595556fc95fb1759f7 WHIRLPOOL 079c5093374710c2a3247a3e27dd26f3d10962c7cb8f260b80a4ba17a72e63676012d4b8e50f8f4bffc43124efdf05c7e14aefe86253b391345c7fa98a2d4c2f |
29 |
DIST sddm-0.12.0.tar.xz 3866620 SHA256 7d7504bf8a717a9131a2f32be852d7631365d21a468ca2649c8245f24ff29ae0 SHA512 d1d9f60634cb2a71096d92321a7a8b33efb8879a766979ca7c1d31ac5f1dbde8253384070338eef80f777db1cd78eef540e9111151f7f9e7d8e648d557e58047 WHIRLPOOL 58d21ead822b85bf3f0f6375cfadee6225dd9bf696e786fe68f283def43b4107d11e14b357d60b0278266270f9ddcb6a9b86285bc3b1a19644583f6ebebc4990 |
30 |
DIST sddm-0.13.0.tar.xz 3869452 SHA256 dd868caaccf7783ead799f3b79e442d5adcb46251b78c8dbf3e9da0016dd347d SHA512 292a584945e74ea987088f975d5973b45a5b4fc07fa90b487fb9ece2de7ecca352344354474dfa8d103c8242367c19ad926e62a553e5b567d8d88a3f2c73c171 WHIRLPOOL e3961ecd5e22e8d565c16d86b6043ba7f3d6c1c296047d196577ab25af4e50216d67d53e9690b4df262c5ae4486bf36f88d345110a54bada9d75c4ff0dfc5ff3 |
31 |
|
32 |
diff --git a/x11-misc/sddm/files/sddm-0.10.0-upower.patch b/x11-misc/sddm/files/sddm-0.10.0-upower.patch |
33 |
deleted file mode 100644 |
34 |
index 8c0f34c..0000000 |
35 |
--- a/x11-misc/sddm/files/sddm-0.10.0-upower.patch |
36 |
+++ /dev/null |
37 |
@@ -1,12 +0,0 @@ |
38 |
-diff -u -r sddm-0.9.0.orig/src/daemon/PowerManager.cpp sddm-0.9.0/src/daemon/PowerManager.cpp |
39 |
---- sddm-0.9.0.orig/src/daemon/PowerManager.cpp 2014-10-01 18:40:37.402683578 +0200 |
40 |
-+++ sddm-0.9.0/src/daemon/PowerManager.cpp 2014-10-01 18:40:43.502618164 +0200 |
41 |
-@@ -197,7 +197,7 @@ |
42 |
- m_backends << new Login1Backend(); |
43 |
- |
44 |
- // check if upower interface exists |
45 |
-- if (interface->isServiceRegistered(UPOWER_SERVICE)) |
46 |
-+// if (interface->isServiceRegistered(UPOWER_SERVICE)) |
47 |
- m_backends << new UPowerBackend(); |
48 |
- } |
49 |
- |
50 |
|
51 |
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 |
52 |
deleted file mode 100644 |
53 |
index 37c1b97..0000000 |
54 |
--- a/x11-misc/sddm/files/sddm-0.11.0-CVE-2015-0856.patch |
55 |
+++ /dev/null |
56 |
@@ -1,15 +0,0 @@ |
57 |
-Fix for CVE-2015-0856 (bug 563108) backported from the version 0.12.0. |
58 |
---- src/daemon/Greeter.cpp |
59 |
-+++ src/daemon/Greeter.cpp |
60 |
-@@ -135,6 +135,11 @@ |
61 |
- env.insert("XDG_VTNR", QString::number(m_display->terminalId())); |
62 |
- env.insert("XDG_SESSION_CLASS", "greeter"); |
63 |
- env.insert("XDG_SESSION_TYPE", m_display->sessionType()); |
64 |
-+ |
65 |
-+ //some themes may use KDE components and that will automatically load KDE's crash handler which we don't want |
66 |
-+ //counterintuitively setting this env disables that handler |
67 |
-+ env.insert("KDE_DEBUG", "1"); |
68 |
-+ |
69 |
- m_auth->insertEnvironment(env); |
70 |
- |
71 |
- // log message |
72 |
|
73 |
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 |
74 |
deleted file mode 100644 |
75 |
index c13c2bd..0000000 |
76 |
--- a/x11-misc/sddm/files/sddm-0.11.0-dbus-config.patch |
77 |
+++ /dev/null |
78 |
@@ -1,46 +0,0 @@ |
79 |
-From 4ab6ab1b78617c51a6d9db4d03be2b3d75e7acc5 Mon Sep 17 00:00:00 2001 |
80 |
-From: Harald Sitter <sitter@×××.org> |
81 |
-Date: Tue, 14 Apr 2015 10:50:00 +0200 |
82 |
-Subject: [PATCH] allow changing the dbus config file name |
83 |
- |
84 |
-on some distributions the generic name of the dbus config might be provided |
85 |
-by more than one display manager, so always installing with the generic |
86 |
-name would require distributions to hard-patch the cmake code. |
87 |
-allowing to change it through a cmake cache variable enables distributions |
88 |
-to simply parameterize in their cmake call. |
89 |
- |
90 |
-this for example affects Ubuntu where the config would be provided by both |
91 |
-SDDM and LightDM. |
92 |
---- |
93 |
- CMakeLists.txt | 1 + |
94 |
- data/CMakeLists.txt | 2 +- |
95 |
- 2 files changed, 2 insertions(+), 1 deletion(-) |
96 |
- |
97 |
-diff --git a/CMakeLists.txt b/CMakeLists.txt |
98 |
-index 7ceed6e..cf21dc9 100644 |
99 |
---- a/CMakeLists.txt |
100 |
-+++ b/CMakeLists.txt |
101 |
-@@ -141,6 +141,7 @@ set(SESSION_COMMAND "${DATA_INSTALL_DIR}/scripts/Xsession" |
102 |
- |
103 |
- set(CONFIG_FILE "${CMAKE_INSTALL_FULL_SYSCONFDIR}/sddm.conf" CACHE PATH "Path of the sddm config file") |
104 |
- set(LOG_FILE "${CMAKE_INSTALL_FULL_LOCALSTATEDIR}/log/sddm.log" CACHE PATH "Path of the sddm log file") |
105 |
-+set(DBUS_CONFIG_FILENAME "org.freedesktop.DisplayManager.conf" CACHE STRING "Name of the sddm config file") |
106 |
- set(COMPONENTS_TRANSLATION_DIR "${DATA_INSTALL_DIR}/translations" CACHE PATH "Components translations directory") |
107 |
- |
108 |
- # Add subdirectories |
109 |
-diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt |
110 |
-index 918892f..335f4e7 100644 |
111 |
---- a/data/CMakeLists.txt |
112 |
-+++ b/data/CMakeLists.txt |
113 |
-@@ -1,7 +1,7 @@ |
114 |
- install(DIRECTORY "faces" DESTINATION "${DATA_INSTALL_DIR}") |
115 |
- install(DIRECTORY "flags" DESTINATION "${DATA_INSTALL_DIR}") |
116 |
- |
117 |
--install(FILES "org.freedesktop.DisplayManager.conf" DESTINATION "${DBUS_CONFIG_DIR}") |
118 |
-+install(FILES "org.freedesktop.DisplayManager.conf" DESTINATION "${DBUS_CONFIG_DIR}" RENAME ${DBUS_CONFIG_FILENAME}) |
119 |
- |
120 |
- install(FILES "scripts/Xsession" "scripts/Xsetup" "scripts/Xstop" DESTINATION "${DATA_INSTALL_DIR}/scripts" |
121 |
- PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE |
122 |
--- |
123 |
-2.3.6 |
124 |
- |
125 |
|
126 |
diff --git a/x11-misc/sddm/sddm-0.11.0-r4.ebuild b/x11-misc/sddm/sddm-0.11.0-r4.ebuild |
127 |
deleted file mode 100644 |
128 |
index 50cbf07..0000000 |
129 |
--- a/x11-misc/sddm/sddm-0.11.0-r4.ebuild |
130 |
+++ /dev/null |
131 |
@@ -1,73 +0,0 @@ |
132 |
-# Copyright 1999-2015 Gentoo Foundation |
133 |
-# Distributed under the terms of the GNU General Public License v2 |
134 |
-# $Id$ |
135 |
- |
136 |
-EAPI=5 |
137 |
-inherit cmake-utils toolchain-funcs user |
138 |
- |
139 |
-DESCRIPTION="Simple Desktop Display Manager" |
140 |
-HOMEPAGE="https://github.com/sddm/sddm" |
141 |
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" |
142 |
-KEYWORDS="~amd64 ~arm ~x86" |
143 |
- |
144 |
-LICENSE="GPL-2+ MIT CC-BY-3.0 public-domain" |
145 |
-SLOT="0" |
146 |
-IUSE="consolekit systemd" |
147 |
- |
148 |
-RDEPEND="sys-libs/pam |
149 |
- >=x11-base/xorg-server-1.15.1 |
150 |
- x11-libs/libxcb[xkb(-)] |
151 |
- dev-qt/qtcore:5 |
152 |
- dev-qt/qtdbus:5 |
153 |
- dev-qt/qtdeclarative:5 |
154 |
- dev-qt/qttest:5 |
155 |
- systemd? ( sys-apps/systemd:= ) |
156 |
- !systemd? ( || ( sys-power/upower sys-power/upower-pm-utils ) )" |
157 |
-DEPEND="${RDEPEND} |
158 |
- dev-qt/linguist-tools:5 |
159 |
- virtual/pkgconfig" |
160 |
- |
161 |
-pkg_pretend() { |
162 |
- if [[ ${MERGE_TYPE} != binary && $(tc-getCC) == *gcc* ]]; then |
163 |
- if [[ $(gcc-major-version) -lt 4 || $(gcc-major-version) == 4 && $(gcc-minor-version) -lt 7 ]] ; then |
164 |
- die 'The active compiler needs to be gcc 4.7 (or newer)' |
165 |
- fi |
166 |
- fi |
167 |
-} |
168 |
- |
169 |
-src_prepare() { |
170 |
- use consolekit && epatch "${FILESDIR}/${P}-consolekit.patch" |
171 |
- use !systemd && epatch "${FILESDIR}/${PN}-0.10.0-upower.patch" |
172 |
- # fix bug 552318 and bug 563108 |
173 |
- epatch "${FILESDIR}/${P}-dbus-config.patch" "${FILESDIR}/${P}-CVE-2015-0856.patch" |
174 |
- |
175 |
- # respect user's cflags |
176 |
- sed -e 's|-Wall -march=native||' \ |
177 |
- -e 's|-O2||' \ |
178 |
- -i CMakeLists.txt || die 'sed failed' |
179 |
-} |
180 |
- |
181 |
-src_configure() { |
182 |
- local mycmakeargs=( |
183 |
- $(cmake-utils_use_no systemd SYSTEMD) |
184 |
- -DDBUS_CONFIG_FILENAME:STRING="org.freedesktop.sddm.conf" |
185 |
- ) |
186 |
- cmake-utils_src_configure |
187 |
-} |
188 |
- |
189 |
-pkg_postinst() { |
190 |
- if use consolekit; then |
191 |
- ewarn "This display manager doesn't have native built-in ConsoleKit support." |
192 |
- ewarn "In order to use ConsoleKit pam module with this display manager," |
193 |
- ewarn "you should remove the \"nox11\" parameter from pm_ck_connector.so" |
194 |
- ewarn "line in /etc/pam.d/system-login" |
195 |
- fi |
196 |
- ewarn "Add the sddm user manually to the video group" |
197 |
- ewarn "if you experience flickering or other rendering issues of sddm-greeter" |
198 |
- ewarn "see https://github.com/gentoo/qt/pull/52" |
199 |
-} |
200 |
- |
201 |
-pkg_postinst() { |
202 |
- enewgroup ${PN} |
203 |
- enewuser ${PN} -1 -1 /var/lib/${PN} ${PN} video |
204 |
-} |