1 |
commit: ef6b9e5792b528c6a7ae70d8cda5646d5e75bdfe |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Mar 31 20:32:24 2022 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Apr 1 14:47:07 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ef6b9e57 |
7 |
|
8 |
x11-misc/sddm: Drop obsolete ConsoleKit patch and quirks |
9 |
|
10 |
Package-Manager: Portage-3.0.30, Repoman-3.0.3 |
11 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
12 |
|
13 |
x11-misc/sddm/files/sddm-0.18.1-Xsession.patch | 24 ++++++++++++++++++++++++ |
14 |
x11-misc/sddm/sddm-0.18.1-r6.ebuild | 6 ++---- |
15 |
2 files changed, 26 insertions(+), 4 deletions(-) |
16 |
|
17 |
diff --git a/x11-misc/sddm/files/sddm-0.18.1-Xsession.patch b/x11-misc/sddm/files/sddm-0.18.1-Xsession.patch |
18 |
new file mode 100644 |
19 |
index 000000000000..e1e3c1527be7 |
20 |
--- /dev/null |
21 |
+++ b/x11-misc/sddm/files/sddm-0.18.1-Xsession.patch |
22 |
@@ -0,0 +1,24 @@ |
23 |
+--- a/data/scripts/Xsession |
24 |
++++ b/data/scripts/Xsession |
25 |
+@@ -50,6 +50,10 @@ |
26 |
+ ;; |
27 |
+ esac |
28 |
+ |
29 |
++# Make D-Bus start properly, see: |
30 |
++# /etc/X11/xinit/xinitrc.d/80-dbus |
31 |
++command="$@" |
32 |
++ |
33 |
+ [ -f /etc/xprofile ] && . /etc/xprofile |
34 |
+ [ -f $HOME/.xprofile ] && . $HOME/.xprofile |
35 |
+ |
36 |
+@@ -94,8 +98,8 @@ |
37 |
+ . "$USERXSESSION" |
38 |
+ fi |
39 |
+ |
40 |
+-if [ -z "$*" ]; then |
41 |
++if [ -z "$command" ]; then |
42 |
+ exec xmessage -center -buttons OK:0 -default OK "Sorry, $DESKTOP_SESSION is no valid session." |
43 |
+ else |
44 |
+- exec $@ |
45 |
++ exec $command |
46 |
+ fi |
47 |
|
48 |
diff --git a/x11-misc/sddm/sddm-0.18.1-r6.ebuild b/x11-misc/sddm/sddm-0.18.1-r6.ebuild |
49 |
index 3d1b2b680504..3ee4febc099e 100644 |
50 |
--- a/x11-misc/sddm/sddm-0.18.1-r6.ebuild |
51 |
+++ b/x11-misc/sddm/sddm-0.18.1-r6.ebuild |
52 |
@@ -46,7 +46,7 @@ DEPEND="${RDEPEND} |
53 |
|
54 |
PATCHES=( |
55 |
"${FILESDIR}/${P}-respect-user-flags.patch" |
56 |
- "${FILESDIR}/${PN}-0.18.0-Xsession.patch" # bug 611210 |
57 |
+ "${FILESDIR}/${P}-Xsession.patch" # bug 611210 |
58 |
"${FILESDIR}/${PN}-0.18.0-sddmconfdir.patch" |
59 |
# fix for groups: https://github.com/sddm/sddm/issues/1159 |
60 |
"${FILESDIR}/${P}-revert-honor-PAM-supplemental-groups.patch" |
61 |
@@ -54,12 +54,10 @@ PATCHES=( |
62 |
# fix for ReuseSession=true |
63 |
"${FILESDIR}/${P}-only-reuse-online-sessions.patch" |
64 |
# TODO: fix properly |
65 |
- "${FILESDIR}/${PN}-0.16.0-ck2-revert.patch" # bug 633920 |
66 |
"${FILESDIR}/pam-1.4-substack.patch" |
67 |
# upstream git develop branch: |
68 |
"${FILESDIR}/${P}-qt-5.15.2.patch" |
69 |
- # bug 753104 |
70 |
- "${FILESDIR}/${P}-cve-2020-28049.patch" |
71 |
+ "${FILESDIR}/${P}-cve-2020-28049.patch" # bug 753104 |
72 |
) |
73 |
|
74 |
src_prepare() { |