From e8ee1c899f7806500603c155005637b4186b32a2 Mon Sep 17 00:00:00 2001 From: Patrick J Volkerding Date: Mon, 26 Apr 2021 22:04:20 +0000 Subject: Mon Apr 26 22:04:20 UTC 2021 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 --- source/a/hdparm/hdparm.SlackBuild | 2 +- source/ap/cups/cups-blacklist-usblp.conf | 10 ---------- source/ap/cups/cups.SlackBuild | 9 +-------- source/ap/cups/doinst.sh | 6 ------ source/kde/kde/build/sddm | 2 +- source/kde/kde/patch/sddm.patch | 3 +++ .../sddm/sddm.list.X11.sessions.before.Wayland.Sessions.diff | 12 ++++++++++++ 7 files changed, 18 insertions(+), 26 deletions(-) delete mode 100644 source/ap/cups/cups-blacklist-usblp.conf create mode 100644 source/kde/kde/patch/sddm/sddm.list.X11.sessions.before.Wayland.Sessions.diff (limited to 'source') diff --git a/source/a/hdparm/hdparm.SlackBuild b/source/a/hdparm/hdparm.SlackBuild index 8ef44beab..3fbfe61c6 100755 --- a/source/a/hdparm/hdparm.SlackBuild +++ b/source/a/hdparm/hdparm.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=hdparm VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-3} +BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/ap/cups/cups-blacklist-usblp.conf b/source/ap/cups/cups-blacklist-usblp.conf deleted file mode 100644 index 0ebaa9a63..000000000 --- a/source/ap/cups/cups-blacklist-usblp.conf +++ /dev/null @@ -1,10 +0,0 @@ -############################################################################## -# Do not edit this file; instead, copy it to /etc/modprobe.d/ and edit that -############################################################################## - -# Blacklist the (obsolete) usblp module. While the CUPS package has been -# patched to handle if this module is loaded, there are some reports that -# it doesn't always work. Anyway, there should be no need to have this -# module loaded, so we'll blacklist it just in case. - -blacklist usblp diff --git a/source/ap/cups/cups.SlackBuild b/source/ap/cups/cups.SlackBuild index aa9370284..010002919 100755 --- a/source/ap/cups/cups.SlackBuild +++ b/source/ap/cups/cups.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=cups VERSION=${VERSION:-$(echo $PKGNAM-*-source.tar.?z | cut -f 2 -d -)} -BUILD=${BUILD:-5} +BUILD=${BUILD:-6} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -114,13 +114,6 @@ if [ ! -z "$PAM_OPTIONS" ]; then mv $PKG/etc/pam.d/cups $PKG/etc/pam.d/cups.new fi -# Blacklist the usblp module just to make sure that it doesn't cause -# any problems: -mkdir -p $PKG/lib/modprobe.d -cp -a $CWD/cups-blacklist-usblp.conf $PKG/lib/modprobe.d -chown root:root $PKG/lib/modprobe.d/cups-blacklist-usblp.conf -chmod 644 $PKG/lib/modprobe.d/cups-blacklist-usblp.conf - # Remove files that overlap with the cups-filters package: ( cd $PKG rm -f \ diff --git a/source/ap/cups/doinst.sh b/source/ap/cups/doinst.sh index 80ebbd17e..b317ed95c 100644 --- a/source/ap/cups/doinst.sh +++ b/source/ap/cups/doinst.sh @@ -17,12 +17,6 @@ if [ -r etc/pam.d/cups.new ]; then config etc/pam.d/cups.new fi -# This file will just have to go. It appeared for a while during a -current -# devel period and has never been part of a stable release. -#config etc/modprobe.d/cups.blacklist.usblp.conf.new -rm -f etc/modprobe.d/cups.blacklist.usblp.conf.new -rm -f etc/modprobe.d/cups.blacklist.usblp.conf - # Leave any new rc.cups with the same permissions as the old one: # This is a kludge, but it's because there's no --reference option # on busybox's 'chmod': 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 -- cgit v1.2.3