summaryrefslogtreecommitdiffstats
path: root/source/kde/kde/patch
diff options
context:
space:
mode:
author Patrick J Volkerding <volkerdi@slackware.com>2024-01-11 20:27:14 +0000
committer Eric Hameleers <alien@slackware.com>2024-01-11 22:01:24 +0100
commitfa5f20fb262197b86096a40ac0334f8aeb2cf6c1 (patch)
treee61e038e792184e2d2afb55ca6de94318580cc5c /source/kde/kde/patch
parent2498bfb1f9e335b2fb31eb63081359ee7b7c1cfa (diff)
downloadcurrent-fa5f20fb262197b86096a40ac0334f8aeb2cf6c1.tar.gz
current-fa5f20fb262197b86096a40ac0334f8aeb2cf6c1.tar.xz
Thu Jan 11 20:27:14 UTC 202420240111202714
ap/mpg123-1.32.4-x86_64-1.txz: Upgraded. l/nodejs-20.11.0-x86_64-1.txz: Upgraded. l/pipewire-1.0.1-x86_64-1.txz: Upgraded. x/mesa-23.3.3-x86_64-1.txz: Upgraded. x/sddm-0.20.0-x86_64-4.txz: Rebuilt.
Diffstat (limited to 'source/kde/kde/patch')
-rw-r--r--source/kde/kde/patch/sddm.patch7
-rw-r--r--source/kde/kde/patch/sddm/sddm.do.not.source.HOME.xsession.diff18
-rw-r--r--source/kde/kde/patch/sddm/sddm.list.X11.sessions.before.Wayland.Sessions.diff29
3 files changed, 0 insertions, 54 deletions
diff --git a/source/kde/kde/patch/sddm.patch b/source/kde/kde/patch/sddm.patch
deleted file mode 100644
index a84399001..000000000
--- a/source/kde/kde/patch/sddm.patch
+++ /dev/null
@@ -1,7 +0,0 @@
-# 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 ; }
-
-# List Wayland sessions after X11 sessions since Wayland is more experimental:
-cat $CWD/patch/sddm/sddm.list.X11.sessions.before.Wayland.Sessions.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
deleted file mode 100644
index c14b266d6..000000000
--- a/source/kde/kde/patch/sddm/sddm.do.not.source.HOME.xsession.diff
+++ /dev/null
@@ -1,18 +0,0 @@
---- ./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."
diff --git a/source/kde/kde/patch/sddm/sddm.list.X11.sessions.before.Wayland.Sessions.diff b/source/kde/kde/patch/sddm/sddm.list.X11.sessions.before.Wayland.Sessions.diff
deleted file mode 100644
index 23577f97b..000000000
--- a/source/kde/kde/patch/sddm/sddm.list.X11.sessions.before.Wayland.Sessions.diff
+++ /dev/null
@@ -1,29 +0,0 @@
---- ./src/greeter/SessionModel.cpp.orig 2023-06-23 07:28:38.000000000 -0500
-+++ ./src/greeter/SessionModel.cpp 2023-07-16 14:56:32.741943650 -0500
-@@ -46,9 +46,9 @@
-
- // initial population
- beginResetModel();
-+ populate(Session::X11Session, mainConfig.X11.SessionDir.get());
- if (dri_active)
- populate(Session::WaylandSession, mainConfig.Wayland.SessionDir.get());
-- populate(Session::X11Session, mainConfig.X11.SessionDir.get());
- endResetModel();
-
- // refresh everytime a file is changed, added or removed
-@@ -59,13 +59,13 @@
- beginResetModel();
- d->sessions.clear();
- d->displayNames.clear();
-+ populate(Session::X11Session, mainConfig.X11.SessionDir.get());
- if (dri_active)
- populate(Session::WaylandSession, mainConfig.Wayland.SessionDir.get());
-- populate(Session::X11Session, mainConfig.X11.SessionDir.get());
- endResetModel();
- });
-- watcher->addPaths(mainConfig.Wayland.SessionDir.get());
- watcher->addPaths(mainConfig.X11.SessionDir.get());
-+ watcher->addPaths(mainConfig.Wayland.SessionDir.get());
- }
-
- SessionModel::~SessionModel() {