diff options
| author |   Andreas Sturmlechner <asturm@gentoo.org> | 2022-03-31 22:32:24 +0200 |
|---|---|---|
| committer | Andreas Sturmlechner <asturm@gentoo.org> | 2022-04-01 16:47:07 +0200 |
| commit | ef6b9e5792b528c6a7ae70d8cda5646d5e75bdfe (patch) | |
| tree | 685b7e22476636a033a45003f8b31b1d4989e615 /x11-misc | |
| parent | x11-misc/sddm: Rebase *respect-user-flags.patch onto 0.18.1 (diff) | |
| download | gentoo-ef6b9e5792b528c6a7ae70d8cda5646d5e75bdfe.tar.gz gentoo-ef6b9e5792b528c6a7ae70d8cda5646d5e75bdfe.tar.bz2 gentoo-ef6b9e5792b528c6a7ae70d8cda5646d5e75bdfe.zip | |
x11-misc/sddm: Drop obsolete ConsoleKit patch and quirks
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'x11-misc')
| -rw-r--r-- | x11-misc/sddm/files/sddm-0.18.1-Xsession.patch | 24 | ||||
| -rw-r--r-- | x11-misc/sddm/sddm-0.18.1-r6.ebuild | 6 |
2 files changed, 26 insertions, 4 deletions
diff --git a/x11-misc/sddm/files/sddm-0.18.1-Xsession.patch b/x11-misc/sddm/files/sddm-0.18.1-Xsession.patch new file mode 100644 index 000000000000..e1e3c1527be7 --- /dev/null +++ b/x11-misc/sddm/files/sddm-0.18.1-Xsession.patch @@ -0,0 +1,24 @@ +--- a/data/scripts/Xsession ++++ b/data/scripts/Xsession +@@ -50,6 +50,10 @@ + ;; + esac + ++# Make D-Bus start properly, see: ++# /etc/X11/xinit/xinitrc.d/80-dbus ++command="$@" ++ + [ -f /etc/xprofile ] && . /etc/xprofile + [ -f $HOME/.xprofile ] && . $HOME/.xprofile + +@@ -94,8 +98,8 @@ + . "$USERXSESSION" + fi + +-if [ -z "$*" ]; then ++if [ -z "$command" ]; then + exec xmessage -center -buttons OK:0 -default OK "Sorry, $DESKTOP_SESSION is no valid session." + else +- exec $@ ++ exec $command + fi diff --git a/x11-misc/sddm/sddm-0.18.1-r6.ebuild b/x11-misc/sddm/sddm-0.18.1-r6.ebuild index 3d1b2b680504..3ee4febc099e 100644 --- a/x11-misc/sddm/sddm-0.18.1-r6.ebuild +++ b/x11-misc/sddm/sddm-0.18.1-r6.ebuild @@ -46,7 +46,7 @@ DEPEND="${RDEPEND} PATCHES=( "${FILESDIR}/${P}-respect-user-flags.patch" - "${FILESDIR}/${PN}-0.18.0-Xsession.patch" # bug 611210 + "${FILESDIR}/${P}-Xsession.patch" # bug 611210 "${FILESDIR}/${PN}-0.18.0-sddmconfdir.patch" # fix for groups: https://github.com/sddm/sddm/issues/1159 "${FILESDIR}/${P}-revert-honor-PAM-supplemental-groups.patch" @@ -54,12 +54,10 @@ PATCHES=( # fix for ReuseSession=true "${FILESDIR}/${P}-only-reuse-online-sessions.patch" # TODO: fix properly - "${FILESDIR}/${PN}-0.16.0-ck2-revert.patch" # bug 633920 "${FILESDIR}/pam-1.4-substack.patch" # upstream git develop branch: "${FILESDIR}/${P}-qt-5.15.2.patch" - # bug 753104 - "${FILESDIR}/${P}-cve-2020-28049.patch" + "${FILESDIR}/${P}-cve-2020-28049.patch" # bug 753104 ) src_prepare() { |