summaryrefslogtreecommitdiffstats
path: root/source/kde
diff options
context:
space:
mode:
author Patrick J Volkerding <volkerdi@slackware.com>2021-04-26 22:04:20 +0000
committer Eric Hameleers <alien@slackware.com>2021-04-27 08:59:57 +0200
commite8ee1c899f7806500603c155005637b4186b32a2 (patch)
tree392ca11cd23a8e8f36ccf2822ffe16d7890a88d3 /source/kde
parentbab99bb8a8cc20ba9ee3a0e38a68ce7581915647 (diff)
downloadcurrent-e8ee1c899f7806500603c155005637b4186b32a2.tar.gz
current-e8ee1c899f7806500603c155005637b4186b32a2.tar.xz
Mon Apr 26 22:04:20 UTC 202120210426220420
a/hdparm-9.61-x86_64-1.txz: Upgraded. a/kernel-firmware-20210426_fa0efef-noarch-1.txz: Upgraded. ap/cups-2.3.3-x86_64-6.txz: Rebuilt. Removed /lib/modprobe.d/cups-blacklist-usblp.conf. Thanks to vovim. ap/vim-8.2.2814-x86_64-1.txz: Upgraded. d/strace-5.12-x86_64-1.txz: Upgraded. kde/kstars-3.5.3-x86_64-1.txz: Upgraded. kde/sddm-0.19.0-x86_64-7.txz: Rebuilt. List X11 sessions before Wayland sessions. Thanks to Heinz Wiesinger. l/imagemagick-7.0.11_9-x86_64-1.txz: Upgraded. xap/vim-gvim-8.2.2814-x86_64-1.txz: Upgraded. testing/packages/linux-5.12.x/kernel-generic-5.12.0-x86_64-2.txz: Rebuilt. testing/packages/linux-5.12.x/kernel-headers-5.12.0-x86-2.txz: Rebuilt. testing/packages/linux-5.12.x/kernel-huge-5.12.0-x86_64-2.txz: Rebuilt. testing/packages/linux-5.12.x/kernel-modules-5.12.0-x86_64-2.txz: Rebuilt. testing/packages/linux-5.12.x/kernel-source-5.12.0-noarch-2.txz: Rebuilt. Restore dm-crypt as built-in. Thanks to ctrlaltca. DM_CRYPT m -> y TCG_TPM m -> y TRUSTED_KEYS m -> y
Diffstat (limited to 'source/kde')
-rw-r--r--source/kde/kde/build/sddm2
-rw-r--r--source/kde/kde/patch/sddm.patch3
-rw-r--r--source/kde/kde/patch/sddm/sddm.list.X11.sessions.before.Wayland.Sessions.diff12
3 files changed, 16 insertions, 1 deletions
diff --git a/source/kde/kde/build/sddm b/source/kde/kde/build/sddm
index 1e8b31496..7f8f011eb 100644
--- a/source/kde/kde/build/sddm
+++ b/source/kde/kde/build/sddm
@@ -1 +1 @@
-6
+7
diff --git a/source/kde/kde/patch/sddm.patch b/source/kde/kde/patch/sddm.patch
index f03ee6262..5c905557a 100644
--- a/source/kde/kde/patch/sddm.patch
+++ b/source/kde/kde/patch/sddm.patch
@@ -6,3 +6,6 @@ cat $CWD/patch/sddm/sddm_honor-PAM-supplemental-groups-v2.patch | patch -p1 --ve
# 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.list.X11.sessions.before.Wayland.Sessions.diff b/source/kde/kde/patch/sddm/sddm.list.X11.sessions.before.Wayland.Sessions.diff
new file mode 100644
index 000000000..78a6c966b
--- /dev/null
+++ b/source/kde/kde/patch/sddm/sddm.list.X11.sessions.before.Wayland.Sessions.diff
@@ -0,0 +1,12 @@
+--- ./src/greeter/SessionModel.cpp.orig 2020-11-03 01:41:06.000000000 -0600
++++ ./src/greeter/SessionModel.cpp 2021-04-26 12:54:48.558769977 -0500
+@@ -41,8 +41,8 @@
+ SessionModel::SessionModel(QObject *parent) : QAbstractListModel(parent), d(new SessionModelPrivate()) {
+ // initial population
+ beginResetModel();
+- populate(Session::WaylandSession, mainConfig.Wayland.SessionDir.get());
+ populate(Session::X11Session, mainConfig.X11.SessionDir.get());
++ populate(Session::WaylandSession, mainConfig.Wayland.SessionDir.get());
+ endResetModel();
+
+ // refresh everytime a file is changed, added or removed