diff options
Diffstat (limited to 'source')
12 files changed, 86 insertions, 14 deletions
diff --git a/source/k/kernel-configs/config-generic-5.19.11 b/source/k/kernel-configs/config-generic-5.19.12 index ae00db351..4609844a2 100644 --- a/source/k/kernel-configs/config-generic-5.19.11 +++ b/source/k/kernel-configs/config-generic-5.19.12 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 5.19.11 Kernel Configuration +# Linux/x86 5.19.12 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 12.2.0" CONFIG_CC_IS_GCC=y @@ -3687,7 +3687,6 @@ CONFIG_IWLWIFI_OPMODE_MODULAR=y # CONFIG_IWLWIFI_DEVICE_TRACING is not set # end of Debugging Options -CONFIG_IWLMEI=m CONFIG_WLAN_VENDOR_INTERSIL=y CONFIG_HOSTAP=m CONFIG_HOSTAP_FIRMWARE=y diff --git a/source/k/kernel-configs/config-generic-5.19.11.x64 b/source/k/kernel-configs/config-generic-5.19.12.x64 index 1332d7613..59e97453d 100644 --- a/source/k/kernel-configs/config-generic-5.19.11.x64 +++ b/source/k/kernel-configs/config-generic-5.19.12.x64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 5.19.11 Kernel Configuration +# Linux/x86 5.19.12 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 12.2.0" CONFIG_CC_IS_GCC=y @@ -3760,7 +3760,6 @@ CONFIG_IWLWIFI_OPMODE_MODULAR=y # CONFIG_IWLWIFI_DEVICE_TRACING is not set # end of Debugging Options -CONFIG_IWLMEI=m CONFIG_WLAN_VENDOR_INTERSIL=y CONFIG_HOSTAP=m CONFIG_HOSTAP_FIRMWARE=y diff --git a/source/k/kernel-configs/config-generic-smp-5.19.11-smp b/source/k/kernel-configs/config-generic-smp-5.19.12-smp index 3fb3997c5..aeea99089 100644 --- a/source/k/kernel-configs/config-generic-smp-5.19.11-smp +++ b/source/k/kernel-configs/config-generic-smp-5.19.12-smp @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 5.19.11 Kernel Configuration +# Linux/x86 5.19.12 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 12.2.0" CONFIG_CC_IS_GCC=y @@ -3732,7 +3732,6 @@ CONFIG_IWLWIFI_OPMODE_MODULAR=y # CONFIG_IWLWIFI_DEVICE_TRACING is not set # end of Debugging Options -CONFIG_IWLMEI=m CONFIG_WLAN_VENDOR_INTERSIL=y CONFIG_HOSTAP=m CONFIG_HOSTAP_FIRMWARE=y diff --git a/source/k/kernel-configs/config-huge-5.19.11 b/source/k/kernel-configs/config-huge-5.19.12 index c31190a81..3cabd1b04 100644 --- a/source/k/kernel-configs/config-huge-5.19.11 +++ b/source/k/kernel-configs/config-huge-5.19.12 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 5.19.11 Kernel Configuration +# Linux/x86 5.19.12 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 12.2.0" CONFIG_CC_IS_GCC=y @@ -3687,7 +3687,6 @@ CONFIG_IWLWIFI_OPMODE_MODULAR=y # CONFIG_IWLWIFI_DEVICE_TRACING is not set # end of Debugging Options -CONFIG_IWLMEI=m CONFIG_WLAN_VENDOR_INTERSIL=y CONFIG_HOSTAP=m CONFIG_HOSTAP_FIRMWARE=y diff --git a/source/k/kernel-configs/config-huge-5.19.11.x64 b/source/k/kernel-configs/config-huge-5.19.12.x64 index 91725e5dd..4642382c0 100644 --- a/source/k/kernel-configs/config-huge-5.19.11.x64 +++ b/source/k/kernel-configs/config-huge-5.19.12.x64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 5.19.11 Kernel Configuration +# Linux/x86 5.19.12 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 12.2.0" CONFIG_CC_IS_GCC=y @@ -3760,7 +3760,6 @@ CONFIG_IWLWIFI_OPMODE_MODULAR=y # CONFIG_IWLWIFI_DEVICE_TRACING is not set # end of Debugging Options -CONFIG_IWLMEI=m CONFIG_WLAN_VENDOR_INTERSIL=y CONFIG_HOSTAP=m CONFIG_HOSTAP_FIRMWARE=y diff --git a/source/k/kernel-configs/config-huge-smp-5.19.11-smp b/source/k/kernel-configs/config-huge-smp-5.19.12-smp index 102eccbba..c8b20675e 100644 --- a/source/k/kernel-configs/config-huge-smp-5.19.11-smp +++ b/source/k/kernel-configs/config-huge-smp-5.19.12-smp @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 5.19.11 Kernel Configuration +# Linux/x86 5.19.12 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 12.2.0" CONFIG_CC_IS_GCC=y @@ -3732,7 +3732,6 @@ CONFIG_IWLWIFI_OPMODE_MODULAR=y # CONFIG_IWLWIFI_DEVICE_TRACING is not set # end of Debugging Options -CONFIG_IWLMEI=m CONFIG_WLAN_VENDOR_INTERSIL=y CONFIG_HOSTAP=m CONFIG_HOSTAP_FIRMWARE=y diff --git a/source/kde/kde/build/kscreenlocker b/source/kde/kde/build/kscreenlocker index d00491fd7..0cfbf0888 100644 --- a/source/kde/kde/build/kscreenlocker +++ b/source/kde/kde/build/kscreenlocker @@ -1 +1 @@ -1 +2 diff --git a/source/kde/kde/build/plasma-workspace b/source/kde/kde/build/plasma-workspace index 0cfbf0888..00750edc0 100644 --- a/source/kde/kde/build/plasma-workspace +++ b/source/kde/kde/build/plasma-workspace @@ -1 +1 @@ -2 +3 diff --git a/source/kde/kde/patch/kscreenlocker.patch b/source/kde/kde/patch/kscreenlocker.patch new file mode 100644 index 000000000..d86800687 --- /dev/null +++ b/source/kde/kde/patch/kscreenlocker.patch @@ -0,0 +1 @@ +cat $CWD/patch/kscreenlocker/07e2e4ddcdfb96bed232db2bc330e578cd05225f.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } diff --git a/source/kde/kde/patch/kscreenlocker/07e2e4ddcdfb96bed232db2bc330e578cd05225f.patch b/source/kde/kde/patch/kscreenlocker/07e2e4ddcdfb96bed232db2bc330e578cd05225f.patch new file mode 100644 index 000000000..6c73891b9 --- /dev/null +++ b/source/kde/kde/patch/kscreenlocker/07e2e4ddcdfb96bed232db2bc330e578cd05225f.patch @@ -0,0 +1,37 @@ +From 07e2e4ddcdfb96bed232db2bc330e578cd05225f Mon Sep 17 00:00:00 2001 +From: Andrey Butirsky <butirsky@gmail.com> +Date: Wed, 21 Sep 2022 18:34:04 +0300 +Subject: [PATCH] Set QSurfaceFormat::ResetNotification + +This got lost in frameworks porting from shared KDeclarative code and is +important especially for nvidia after suspend+resume. +--- + greeter/main.cpp | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/greeter/main.cpp b/greeter/main.cpp +index d9efbe1..f252097 100644 +--- a/greeter/main.cpp ++++ b/greeter/main.cpp +@@ -21,6 +21,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. + #include <QCommandLineParser> + #include <QDateTime> + #include <QSessionManager> ++#include <QSurfaceFormat> + + #include <iostream> + +@@ -94,6 +95,10 @@ int main(int argc, char *argv[]) + // Suppresses modal warnings about unwritable configuration files which may render the system inaccessible + qputenv("KDE_HOME_READONLY", "1"); + ++ auto format = QSurfaceFormat::defaultFormat(); ++ format.setOption(QSurfaceFormat::ResetNotification); ++ QSurfaceFormat::setDefaultFormat(format); ++ + ScreenLocker::UnlockApp app(argc, argv); + app.setQuitOnLastWindowClosed(false); + QCoreApplication::setApplicationName(QStringLiteral("kscreenlocker_greet")); +-- +GitLab + diff --git a/source/kde/kde/patch/plasma-workspace.patch b/source/kde/kde/patch/plasma-workspace.patch index a4ea1dc22..616ee3e2f 100644 --- a/source/kde/kde/patch/plasma-workspace.patch +++ b/source/kde/kde/patch/plasma-workspace.patch @@ -1,2 +1,3 @@ cat $CWD/patch/plasma-workspace/0001-Revert-No-icons-on-the-desktop-by-default.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } cat $CWD/patch/plasma-workspace/c7ba560ccaac5e469cb2d6bf66c39e1acf967454.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } +cat $CWD/patch/plasma-workspace/48ccb433ca79e94ef705734d9cab599f01df97e8.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } diff --git a/source/kde/kde/patch/plasma-workspace/48ccb433ca79e94ef705734d9cab599f01df97e8.patch b/source/kde/kde/patch/plasma-workspace/48ccb433ca79e94ef705734d9cab599f01df97e8.patch new file mode 100644 index 000000000..163ca16d3 --- /dev/null +++ b/source/kde/kde/patch/plasma-workspace/48ccb433ca79e94ef705734d9cab599f01df97e8.patch @@ -0,0 +1,39 @@ +From 48ccb433ca79e94ef705734d9cab599f01df97e8 Mon Sep 17 00:00:00 2001 +From: Marco Martin <notmart@gmail.com> +Date: Wed, 28 Sep 2022 11:33:33 +0200 +Subject: [PATCH] set setInteractiveAuthorizationAllowed on SetPassword call + +is important that the setpasswod call uses interactive authorization, +otherwise will be denied, unless the user had been modified beforehand +so an authorization was already granted + +BUG:459309 +--- + kcms/users/src/user.cpp | 11 ++++++++--- + 1 file changed, 8 insertions(+), 3 deletions(-) + +diff --git a/kcms/users/src/user.cpp b/kcms/users/src/user.cpp +index a28d6b713a..909170d008 100644 +--- a/kcms/users/src/user.cpp ++++ b/kcms/users/src/user.cpp +@@ -225,9 +225,14 @@ void User::setPassword(const QString &password) + { + // Blocking because we need to wait for the password to be changed before we + // can ask the user about also possibly changing their KWallet password +- auto invocation = m_dbusIface->SetPassword(saltPassword(password), QString()); +- invocation.waitForFinished(); +- if (!invocation.isError()) { ++ ++ auto mc = QDBusMessage::createMethodCall(m_dbusIface->service(), m_dbusIface->path(), m_dbusIface->interface(), "SetPassword"); ++ mc.setArguments({saltPassword(password), QString()}); ++ mc.setInteractiveAuthorizationAllowed(true); ++ auto message = QDBusConnection::systemBus().call(mc); ++ ++ // Not an error or invalid message ++ if (message.type() == QDBusMessage::ReplyMessage) { + Q_EMIT passwordSuccessfullyChanged(); + } + } +-- +GitLab + |