public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Andreas Sturmlechner" <asturm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: x11-misc/sddm/, x11-misc/sddm/files/
Date: Fri,  1 Apr 2022 14:48:53 +0000 (UTC)	[thread overview]
Message-ID: <1648824427.ef6b9e5792b528c6a7ae70d8cda5646d5e75bdfe.asturm@gentoo> (raw)

commit:     ef6b9e5792b528c6a7ae70d8cda5646d5e75bdfe
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 31 20:32:24 2022 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Apr  1 14:47:07 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ef6b9e57

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 <AT> gentoo.org>

 x11-misc/sddm/files/sddm-0.18.1-Xsession.patch | 24 ++++++++++++++++++++++++
 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() {


             reply	other threads:[~2022-04-01 14:48 UTC|newest]

Thread overview: 23+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-04-01 14:48 Andreas Sturmlechner [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-04-09 20:02 [gentoo-commits] repo/gentoo:master commit in: x11-misc/sddm/, x11-misc/sddm/files/ Andreas Sturmlechner
2024-03-09  0:16 Andreas Sturmlechner
2024-03-08 22:59 Andreas Sturmlechner
2024-02-27 12:11 Andreas Sturmlechner
2023-09-02 18:01 Andreas Sturmlechner
2023-06-27 11:25 Andreas Sturmlechner
2022-11-24 21:05 Andreas Sturmlechner
2022-04-02 12:38 Andreas Sturmlechner
2022-04-01 14:48 Andreas Sturmlechner
2022-04-01 14:48 Andreas Sturmlechner
2020-10-06 18:20 Mikle Kolyada
2020-06-20 15:42 Mikle Kolyada
2018-06-06 10:14 Andreas Sturmlechner
2018-05-27 21:34 Andreas Sturmlechner
2018-04-05 15:55 Andreas Sturmlechner
2017-10-21 19:45 Andreas Sturmlechner
2017-10-21 19:45 Andreas Sturmlechner
2017-10-14  4:26 Michael Palimaka
2017-09-02 15:07 Andreas Sturmlechner
2017-08-15  9:21 Lars Wendler
2016-01-30 13:07 Michael Palimaka
2015-09-09 21:18 Jauhien Piatlicki

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1648824427.ef6b9e5792b528c6a7ae70d8cda5646d5e75bdfe.asturm@gentoo \
    --to=asturm@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox