1 |
commit: dc186212892ef0c9872c16b73f55f79a96f0198e |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun May 27 20:26:08 2018 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun May 27 21:34:11 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dc186212 |
7 |
|
8 |
x11-misc/sddm: Upstream adj. to sddm.service to fix logind race cond. |
9 |
|
10 |
Closes: https://bugs.gentoo.org/656286 |
11 |
Package-Manager: Portage-2.3.40, Repoman-2.3.9 |
12 |
|
13 |
x11-misc/sddm/files/sddm-0.17.0-logind-race.patch | 26 +++++++ |
14 |
x11-misc/sddm/sddm-0.17.0-r3.ebuild | 83 +++++++++++++++++++++++ |
15 |
2 files changed, 109 insertions(+) |
16 |
|
17 |
diff --git a/x11-misc/sddm/files/sddm-0.17.0-logind-race.patch b/x11-misc/sddm/files/sddm-0.17.0-logind-race.patch |
18 |
new file mode 100644 |
19 |
index 00000000000..a55702061c9 |
20 |
--- /dev/null |
21 |
+++ b/x11-misc/sddm/files/sddm-0.17.0-logind-race.patch |
22 |
@@ -0,0 +1,26 @@ |
23 |
+From fca8c808b7fa4a947a0c60157f0eb5227b3ccfff Mon Sep 17 00:00:00 2001 |
24 |
+From: Pier Luigi Fiorini <pierluigi.fiorini@××××.io> |
25 |
+Date: Mon, 26 Feb 2018 09:03:05 +0100 |
26 |
+Subject: [PATCH] Fix race between sddm and logind |
27 |
+ |
28 |
+Make sure sddm is run after logind. |
29 |
+An explicit dependency will make sddm run after logind every time. |
30 |
+ |
31 |
+Closes: #978 |
32 |
+--- |
33 |
+ services/sddm.service.in | 2 +- |
34 |
+ 1 file changed, 1 insertion(+), 1 deletion(-) |
35 |
+ |
36 |
+diff --git a/services/sddm.service.in b/services/sddm.service.in |
37 |
+index df03d92a..9d7618c6 100644 |
38 |
+--- a/services/sddm.service.in |
39 |
++++ b/services/sddm.service.in |
40 |
+@@ -2,7 +2,7 @@ |
41 |
+ Description=Simple Desktop Display Manager |
42 |
+ Documentation=man:sddm(1) man:sddm.conf(5) |
43 |
+ Conflicts=getty@××××.service |
44 |
+-After=systemd-user-sessions.service getty@××××.service plymouth-quit.service |
45 |
++After=systemd-user-sessions.service getty@××××.service plymouth-quit.service systemd-logind.service |
46 |
+ |
47 |
+ [Service] |
48 |
+ ExecStart=@CMAKE_INSTALL_FULL_BINDIR@/sddm |
49 |
|
50 |
diff --git a/x11-misc/sddm/sddm-0.17.0-r3.ebuild b/x11-misc/sddm/sddm-0.17.0-r3.ebuild |
51 |
new file mode 100644 |
52 |
index 00000000000..623e779a6f1 |
53 |
--- /dev/null |
54 |
+++ b/x11-misc/sddm/sddm-0.17.0-r3.ebuild |
55 |
@@ -0,0 +1,83 @@ |
56 |
+# Copyright 1999-2018 Gentoo Foundation |
57 |
+# Distributed under the terms of the GNU General Public License v2 |
58 |
+ |
59 |
+EAPI=6 |
60 |
+ |
61 |
+PLOCALES="ar ca cs da de es et fi fr hi_IN hu it ja kk ko lt lv nb nl nn pl pt_BR pt_PT ro ru sk sr sr@ijekavian sr@ijekavianlatin sr@latin sv tr uk zh_CN zh_TW" |
62 |
+inherit cmake-utils l10n systemd user |
63 |
+ |
64 |
+DESCRIPTION="Simple Desktop Display Manager" |
65 |
+HOMEPAGE="https://github.com/sddm/sddm" |
66 |
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz" |
67 |
+KEYWORDS="amd64 ~arm ~arm64 x86" |
68 |
+ |
69 |
+LICENSE="GPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0 public-domain" |
70 |
+SLOT="0" |
71 |
+IUSE="consolekit elogind +pam systemd test" |
72 |
+ |
73 |
+REQUIRED_USE="?? ( elogind systemd )" |
74 |
+ |
75 |
+RDEPEND=" |
76 |
+ >=dev-qt/qtcore-5.6:5 |
77 |
+ >=dev-qt/qtdbus-5.6:5 |
78 |
+ >=dev-qt/qtdeclarative-5.6:5 |
79 |
+ >=dev-qt/qtgui-5.6:5 |
80 |
+ >=dev-qt/qtnetwork-5.6:5 |
81 |
+ >=x11-base/xorg-server-1.15.1 |
82 |
+ x11-libs/libxcb[xkb] |
83 |
+ consolekit? ( >=sys-auth/consolekit-0.9.4 ) |
84 |
+ elogind? ( sys-auth/elogind ) |
85 |
+ pam? ( sys-libs/pam ) |
86 |
+ systemd? ( sys-apps/systemd:= ) |
87 |
+ !systemd? ( sys-power/upower )" |
88 |
+ |
89 |
+DEPEND="${RDEPEND} |
90 |
+ dev-python/docutils |
91 |
+ >=dev-qt/linguist-tools-5.6:5 |
92 |
+ kde-frameworks/extra-cmake-modules |
93 |
+ virtual/pkgconfig |
94 |
+ test? ( >=dev-qt/qttest-5.6:5 )" |
95 |
+ |
96 |
+PATCHES=( |
97 |
+ "${FILESDIR}/${PN}-0.12.0-respect-user-flags.patch" # fix for flags handling and bug 563108 |
98 |
+ "${FILESDIR}/${PN}-0.16.0-Xsession.patch" # bug 611210 |
99 |
+ "${FILESDIR}/${PN}-0.16.0-ck2-revert.patch" # bug 633920 |
100 |
+ "${FILESDIR}/${P}-logind-race.patch" # bug 656286 |
101 |
+ # TODO: not yet upstream |
102 |
+ "${FILESDIR}/${P}-switchtogreeter.patch" # bugs 644718, 649888 |
103 |
+) |
104 |
+ |
105 |
+src_prepare() { |
106 |
+ cmake-utils_src_prepare |
107 |
+ |
108 |
+ disable_locale() { |
109 |
+ sed -e "/${1}\.ts/d" -i data/translations/CMakeLists.txt || die |
110 |
+ } |
111 |
+ l10n_find_plocales_changes "data/translations" "" ".ts" |
112 |
+ l10n_for_each_disabled_locale_do disable_locale |
113 |
+ |
114 |
+ use test || cmake_comment_add_subdirectory test |
115 |
+} |
116 |
+ |
117 |
+src_configure() { |
118 |
+ local mycmakeargs=( |
119 |
+ -DENABLE_PAM=$(usex pam) |
120 |
+ -DNO_SYSTEMD=$(usex '!systemd') |
121 |
+ -DUSE_ELOGIND=$(usex 'elogind') |
122 |
+ -DBUILD_MAN_PAGES=ON |
123 |
+ -DDBUS_CONFIG_FILENAME="org.freedesktop.sddm.conf" |
124 |
+ ) |
125 |
+ cmake-utils_src_configure |
126 |
+} |
127 |
+ |
128 |
+src_install() { |
129 |
+ cmake-utils_src_install |
130 |
+ sed -i -e "/^InputMethod/s/qtvirtualkeyboard//" "${D}"/etc/sddm.conf || die |
131 |
+} |
132 |
+ |
133 |
+pkg_postinst() { |
134 |
+ enewgroup ${PN} |
135 |
+ enewuser ${PN} -1 -1 /var/lib/${PN} ${PN},video |
136 |
+ |
137 |
+ systemd_reenable sddm.service |
138 |
+} |