diff options
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 |
commit | fa5f20fb262197b86096a40ac0334f8aeb2cf6c1 (patch) | |
tree | e61e038e792184e2d2afb55ca6de94318580cc5c /source/kde | |
parent | 2498bfb1f9e335b2fb31eb63081359ee7b7c1cfa (diff) | |
download | current-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')
-rw-r--r-- | source/kde/kde/build/sddm | 1 | ||||
-rw-r--r-- | source/kde/kde/cmake/sddm | 20 | ||||
-rw-r--r-- | source/kde/kde/doinst.sh/sddm | 19 | ||||
-rw-r--r-- | source/kde/kde/modules/plasma-extra | 1 | ||||
-rw-r--r-- | source/kde/kde/patch/sddm.patch | 7 | ||||
-rw-r--r-- | source/kde/kde/patch/sddm/sddm.do.not.source.HOME.xsession.diff | 18 | ||||
-rw-r--r-- | source/kde/kde/patch/sddm/sddm.list.X11.sessions.before.Wayland.Sessions.diff | 29 | ||||
-rw-r--r-- | source/kde/kde/post-install/sddm.post-install | 65 | ||||
-rw-r--r-- | source/kde/kde/post-install/sddm/pam.d/sddm | 26 | ||||
-rw-r--r-- | source/kde/kde/post-install/sddm/pam.d/sddm-autologin | 25 | ||||
-rw-r--r-- | source/kde/kde/post-install/sddm/pam.d/sddm-greeter | 19 | ||||
-rw-r--r-- | source/kde/kde/slack-desc/sddm | 19 |
12 files changed, 0 insertions, 249 deletions
diff --git a/source/kde/kde/build/sddm b/source/kde/kde/build/sddm deleted file mode 100644 index 00750edc0..000000000 --- a/source/kde/kde/build/sddm +++ /dev/null @@ -1 +0,0 @@ -3 diff --git a/source/kde/kde/cmake/sddm b/source/kde/kde/cmake/sddm deleted file mode 100644 index 11b81a199..000000000 --- a/source/kde/kde/cmake/sddm +++ /dev/null @@ -1,20 +0,0 @@ -mkdir -p cmake-build -cd cmake-build - cmake \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_C_FLAGS_RELEASE:STRING="$SLKCFLAGS" \ - -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS" \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_INSTALL_MANDIR=/usr/man \ - -DLIB_SUFFIX=${LIBDIRSUFFIX} \ - -DBUILD_MAN_PAGES:BOOL=TRUE \ - -DDBUS_CONFIG_FILENAME="org.freedesktop.sddm.conf" \ - -DUSE_QT5:BOOL=TRUE \ - -DENABLE_JOURNALD:BOOL=FALSE \ - -DENABLE_PAM:BOOL=ON \ - -DNO_SYSTEMD:BOOL=TRUE \ - -DUSE_ELOGIND:BOOL=TRUE \ - .. - diff --git a/source/kde/kde/doinst.sh/sddm b/source/kde/kde/doinst.sh/sddm deleted file mode 100644 index f5dd9379f..000000000 --- a/source/kde/kde/doinst.sh/sddm +++ /dev/null @@ -1,19 +0,0 @@ -config() { - NEW="$1" - OLD="$(dirname $NEW)/$(basename $NEW .new)" - # If there's no config file by that name, mv it over: - if [ ! -r $OLD ]; then - mv $NEW $OLD - elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then - # toss the redundant copy - rm $NEW - fi - # Otherwise, we leave the .new copy for the admin to consider... -} - -config etc/sddm.conf.new -config etc/default/sddm.new -config etc/pam.d/sddm.new -config etc/pam.d/sddm-autologin.new -config etc/pam.d/sddm-greeter.new - diff --git a/source/kde/kde/modules/plasma-extra b/source/kde/kde/modules/plasma-extra index 48d104c9a..bf207557b 100644 --- a/source/kde/kde/modules/plasma-extra +++ b/source/kde/kde/modules/plasma-extra @@ -1,4 +1,3 @@ -sddm kpeoplevcard pulseaudio-qt latte-dock 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() { diff --git a/source/kde/kde/post-install/sddm.post-install b/source/kde/kde/post-install/sddm.post-install deleted file mode 100644 index b2e03c154..000000000 --- a/source/kde/kde/post-install/sddm.post-install +++ /dev/null @@ -1,65 +0,0 @@ -# Replace systemd-centric files with ours: -rm -f $PKG/etc/pam.d/sddm* -for FILE in sddm sddm-autologin sddm-greeter ; do - install -Dm644 $CWD/post-install/sddm/pam.d/$FILE $PKG/etc/pam.d/${FILE}.new -done - -# Create the SDDM home directory: -mkdir -p $PKG/var/lib/sddm -chmod 755 $PKG/var/lib/sddm -chown sddm:sddm $PKG/var/lib/sddm - -# D-Bus configs should be under /usr, not /etc: -mkdir -p $PKG/usr/share/dbus-1/system.d -mv $PKG/etc/dbus-1/system.d/* $PKG/usr/share/dbus-1/system.d -rmdir --parents $PKG/etc/dbus-1/system.d - -# Remove the sddm.conf file because we will generate our own in doinst.sh: -rm -f $PKG/etc/sddm.conf - -# Generate the default sddm.conf: -$PKG/usr/bin/sddm --example-config > $PKG/etc/sddm.conf - -# Set the KDE5 theme 'breeze' as default (integrates better with Plasma 5): -sed -i -e "/\[Theme\]/,/^\[/s/^Current.*/Current=breeze/" $PKG/etc/sddm.conf - -# Move the default config file to .new: -mv $PKG/etc/sddm.conf $PKG/etc/sddm.conf.new - -# Make sure that Plasma and SDDM work on older GPUs, -# by forcing Qt5 to use software GL rendering: -cat << "EOF" >> $PKG/usr/share/sddm/scripts/Xsetup -# Make sure that Plasma and SDDM work on older GPUs by forcing Qt5 to use -# software GL rendering if the OpenGL version is not new enough: -OPENGL_VERSION=$(LANG=C glxinfo |grep '^OpenGL version string: ' |head -n 1 |sed -e 's/^OpenGL version string: \([0-9]\).*$/\1/g') -if [ "$OPENGL_VERSION" -lt 2 ]; then - QT_XCB_FORCE_SOFTWARE_OPENGL=1 - export QT_XCB_FORCE_SOFTWARE_OPENGL -fi -EOF - -# Add a wrapper for the sddm binary, to enable a custom environment: -mv $PKG/usr/bin/sddm $PKG/usr/bin/sddm.bin -cat <<"EOT" > $PKG/usr/bin/sddm -#!/bin/sh -# Customized environment (LANG definition): -if [ -f /etc/default/sddm ]; then - . /etc/default/sddm -fi - -# Ensure non-world readable permissions on /var/log/sddm.log: -touch /var/log/sddm.log -chmod 640 /var/log/sddm.log - -# Add a timestamp: -date >> /var/log/sddm.log - -# Redirect stdout/stderr to /dev/null to avoid polluting a virtual -# console with duplicate log messages: -exec /usr/bin/sddm.bin "$@" 1> /dev/null 2> /dev/null -EOT -chmod 0755 $PKG/usr/bin/sddm - -# Let's also add an example customization (localization of the UI): -mkdir -p $PKG/etc/default -echo ". /etc/profile.d/lang.sh" > $PKG/etc/default/sddm.new diff --git a/source/kde/kde/post-install/sddm/pam.d/sddm b/source/kde/kde/post-install/sddm/pam.d/sddm deleted file mode 100644 index df016a7ec..000000000 --- a/source/kde/kde/post-install/sddm/pam.d/sddm +++ /dev/null @@ -1,26 +0,0 @@ -#%PAM-1.0 - -auth substack system-auth - -# Uncomment this line to restrict login to users with a UID greater -# than 999 (in other words, don't allow login for root): -#auth required pam_succeed_if.so uid >= 1000 quiet - --auth optional pam_gnome_keyring.so --auth optional pam_kwallet5.so -auth include postlogin - -account include system-auth - -password substack system-auth --password optional pam_gnome_keyring.so use_authtok --password optional pam_kwallet5.so use_authtok - -session optional pam_keyinit.so force revoke -session substack system-auth -session required pam_loginuid.so --session optional pam_ck_connector.so nox11 --session optional pam_elogind.so --session optional pam_gnome_keyring.so auto_start --session optional pam_kwallet5.so auto_start -session include postlogin diff --git a/source/kde/kde/post-install/sddm/pam.d/sddm-autologin b/source/kde/kde/post-install/sddm/pam.d/sddm-autologin deleted file mode 100644 index 360239544..000000000 --- a/source/kde/kde/post-install/sddm/pam.d/sddm-autologin +++ /dev/null @@ -1,25 +0,0 @@ -#%PAM-1.0 -auth requisite pam_nologin.so -auth required pam_env.so -auth required pam_shells.so - -# Uncomment this line to restrict autologin to users with a UID greater -# than 999 (in other words, don't allow autologin for root): -#auth required pam_succeed_if.so uid >= 1000 quiet - -auth required pam_permit.so --auth optional pam_gnome_keyring.so --auth optional pam_kwallet5.so - -account include system-auth - -password include system-auth - -session substack system-auth -session required pam_loginuid.so --session optional pam_ck_connector.so nox11 --session optional pam_elogind.so --session optional pam_gnome_keyring.so auto_start --session optional pam_kwallet5.so auto_start -session include postlogin - diff --git a/source/kde/kde/post-install/sddm/pam.d/sddm-greeter b/source/kde/kde/post-install/sddm/pam.d/sddm-greeter deleted file mode 100644 index fe30e60c2..000000000 --- a/source/kde/kde/post-install/sddm/pam.d/sddm-greeter +++ /dev/null @@ -1,19 +0,0 @@ -#%PAM-1.0 - -# Load environment from /etc/environment and ~/.pam_environment -auth required pam_env.so - -# Always let the greeter start without authentication -auth required pam_permit.so - -# No action required for account management -account required pam_permit.so - -# Can't change password -password required pam_deny.so - -# Setup session -session required pam_unix.so --session optional pam_systemd.so --session optional pam_ck_connector.so nox11 --session optional pam_elogind.so diff --git a/source/kde/kde/slack-desc/sddm b/source/kde/kde/slack-desc/sddm deleted file mode 100644 index 7fa590b2a..000000000 --- a/source/kde/kde/slack-desc/sddm +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':'. - - |-----handy-ruler------------------------------------------------------| -sddm: sddm (QML based X11 display manager) -sddm: -sddm: SDDM is a modern display manager for X11 aiming to be fast, simple and -sddm: beautiful. It uses modern technologies like QtQuick, which in turn -sddm: gives the designer the ability to create smooth, animated user -sddm: interfaces. SDDM is extremely themeable. There are a few sample themes -sddm: distributed with SDDM. They can be used as a starting point for new -sddm: themes. -sddm: -sddm: Homepage: https://github.com/sddm/sddm -sddm: |