diff options
| author |   Patrick J Volkerding <volkerdi@slackware.com> | 2020-12-15 20:39:53 +0000 |
|---|---|---|
| committer |   Eric Hameleers <alien@slackware.com> | 2020-12-16 08:59:50 +0100 |
| commit | c56a16f1ecd0afa42c16dab6fdfb1f0b667dc287 (patch) | |
| tree | d954850372722972b665c6894a50f57f2463a5ae /source/kde | |
| parent | 0dc2fd5cf511a8234b81a1df1444fb2a0a131eaa (diff) | |
| download | current-c56a16f1ecd0afa42c16dab6fdfb1f0b667dc287.tar.gz current-c56a16f1ecd0afa42c16dab6fdfb1f0b667dc287.tar.xz | |
Tue Dec 15 20:39:53 UTC 202020201215203953
d/python-pip-20.3.3-x86_64-1.txz: Upgraded.
kde/sddm-0.19.0-x86_64-3.txz: Rebuilt.
In SDDM's Xsession script, don't source $HOME/.xsession as this may launch
the wrong session type or cause dbus-run-session to start twice breaking
logout.
l/orc-0.4.32-x86_64-1.txz: Upgraded.
l/pipewire-0.3.18-x86_64-1.txz: Upgraded.
l/python-chardet-4.0.0-x86_64-1.txz: Upgraded.
l/python-packaging-20.8-x86_64-1.txz: Upgraded.
n/samba-4.13.3-x86_64-1.txz: Upgraded.
xap/mozilla-thunderbird-78.6.0-x86_64-1.txz: Upgraded.
This is a bugfix release.
For more information, see:
https://www.mozilla.org/en-US/thunderbird/78.6.0/releasenotes/
xfce/mousepad-0.5.0-x86_64-1.txz: Upgraded.
Diffstat (limited to 'source/kde')
| -rw-r--r-- | source/kde/kde/build/sddm | 2 | ||||
| -rw-r--r-- | source/kde/kde/patch/sddm.patch | 5 | ||||
| -rw-r--r-- | source/kde/kde/patch/sddm/sddm.do.not.source.HOME.xsession.diff | 18 |
3 files changed, 24 insertions, 1 deletions
diff --git a/source/kde/kde/build/sddm b/source/kde/kde/build/sddm index 0cfbf0888..00750edc0 100644 --- a/source/kde/kde/build/sddm +++ b/source/kde/kde/build/sddm @@ -1 +1 @@ -2 +3 diff --git a/source/kde/kde/patch/sddm.patch b/source/kde/kde/patch/sddm.patch index a77c521f6..f03ee6262 100644 --- a/source/kde/kde/patch/sddm.patch +++ b/source/kde/kde/patch/sddm.patch @@ -1,3 +1,8 @@ # Properly honor supplemental groups, https://github.com/sddm/sddm/issues/1159 : cat $CWD/patch/sddm/sddm_revert-honor-PAM-supplemental-groups.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } cat $CWD/patch/sddm/sddm_honor-PAM-supplemental-groups-v2.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } + +# Don't source $HOME/.xession in SDDM's Xsession script. It may cause the +# wrong session type to launch, or run a second copy of dbus-run-session which +# will break logout: +cat $CWD/patch/sddm/sddm.do.not.source.HOME.xsession.diff | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } diff --git a/source/kde/kde/patch/sddm/sddm.do.not.source.HOME.xsession.diff b/source/kde/kde/patch/sddm/sddm.do.not.source.HOME.xsession.diff new file mode 100644 index 000000000..c14b266d6 --- /dev/null +++ b/source/kde/kde/patch/sddm/sddm.do.not.source.HOME.xsession.diff @@ -0,0 +1,18 @@ +--- ./data/scripts/Xsession.orig 2020-11-03 01:41:06.000000000 -0600 ++++ ./data/scripts/Xsession 2020-12-15 14:16:30.968724577 -0600 +@@ -94,9 +94,12 @@ + if [ -f "$USERXSESSIONRC" ]; then + . "$USERXSESSIONRC" + fi +-if [ -f "$USERXSESSION" ]; then +- . "$USERXSESSION" +-fi ++ ++# Commented out because $HOME/.xsession may start the wrong session type or ++# cause dbus-run-session to start twice. ++#if [ -f "$USERXSESSION" ]; then ++# . "$USERXSESSION" ++#fi + + if [ -z "$*" ]; then + exec xmessage -center -buttons OK:0 -default OK "Sorry, $DESKTOP_SESSION is no valid session." |