From c417025a2ab386cddabb71ad598a9b75b47af313 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 30 Sep 2023 11:39:43 +0100 Subject: gentoo auto-resync : 30:09:2023 - 11:39:43 --- kde-plasma/kscreenlocker/Manifest | 2 + ...creenlocker-5.27.8-disable-qml-disk-cache.patch | 42 +++++++++++ .../kscreenlocker/kscreenlocker-5.27.8-r1.ebuild | 87 ++++++++++++++++++++++ 3 files changed, 131 insertions(+) create mode 100644 kde-plasma/kscreenlocker/files/kscreenlocker-5.27.8-disable-qml-disk-cache.patch create mode 100644 kde-plasma/kscreenlocker/kscreenlocker-5.27.8-r1.ebuild (limited to 'kde-plasma/kscreenlocker') diff --git a/kde-plasma/kscreenlocker/Manifest b/kde-plasma/kscreenlocker/Manifest index b13872a3e0d3..bf673be6769c 100644 --- a/kde-plasma/kscreenlocker/Manifest +++ b/kde-plasma/kscreenlocker/Manifest @@ -1,5 +1,7 @@ AUX kde-np.pam 217 BLAKE2B 47e599ef678a81bd12a3e2a04b662c284136f13d5e0aeab06961e9d57007c51a93af1132239f97421cc6f9c47e8622d698d0eb2235e99820efbb8523b227c2de SHA512 88cae39981916a1d4ad115bcac6f4c7db92fa2eef606217ce270cf7ffeb422c18dbabc9f3f4c4581fc1a99b814f51c34b4ccb1dbc8fe255e64a63a31f80c91cb AUX kde.pam 226 BLAKE2B b281adb40b654aa616af66818613f6446b1bfd2025c0819130ae684f61f6683689d1facd3a4b248849bbfda0975603094988b809d01dcab501f69e1f4ef8825f SHA512 a44c3325ea4c56e1b3c8c2953a68e5c7eaea5e2f059c0eea4b4dfde2b2e056e5223574c967d991c6427117ce4db0c4fb00fb6a241f29bf2eaac37b1195496776 +AUX kscreenlocker-5.27.8-disable-qml-disk-cache.patch 1525 BLAKE2B 1051d31e85ca1f8a31ef3d2893fe68d999afdd061851a335625bb93b7c06b4146fe413fcd86196e3090d4e93c1cd45b9ff5229bdcd232a72efce9165e578eb32 SHA512 8211ace31547064e9830ddc3a970202738f4567c752536beef38b90e5beda40b33501323ebb261ee2599bbf5e134f556d9e56d994aca7b686c2e7865b18b9d13 DIST kscreenlocker-5.27.8.tar.xz 160892 BLAKE2B 8670d19e537baca4b3052bc8dcd04227df45fc47fbe4f2b3e8094fbbb799e9ae382d110df198282ddc3d935ccbbb6d12c1e21e29bca4be370e6af436bf3e40dd SHA512 c412e61f0e340206b3f208fbc3c6dede4228d24ef11580adc7f212da039f5cd4e6fc5b7cb93a206a4a43b73ce7396feafcf230363f9d309e71c707682a1677a1 +EBUILD kscreenlocker-5.27.8-r1.ebuild 2147 BLAKE2B 85444717d34d9951402da857fc47824482155472e0814cb2e9722feba7658bf374ca983bb00521acd0ce4bb103002f5bc66b6415bfcac944241240e7c6909e7b SHA512 75138044ebec71f92bd8982d5631806c2a0686e1c72dccc55c1c9b03dc88477959cafccfa76f7c03cc6e28a5d5dd931807c42a06a788f3b59e32528dedc300a0 EBUILD kscreenlocker-5.27.8.ebuild 2066 BLAKE2B adb6fd7ddc038ff6843a7fb9e93a9ac526c140230fb77f5d7486763d93671d121da8b3ba05addd75e28591d5e316137412326579156c0bcd93ff6c8c2ed37c14 SHA512 f2ce11c01e12e89a73959f7d95a2ddb11f1100c857f5c3c9a3d4ae4c3263e8dcb4792e73a06160b0a5d8327c6e49570b8b637b927a0bf5056e02d10c4c704703 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6 diff --git a/kde-plasma/kscreenlocker/files/kscreenlocker-5.27.8-disable-qml-disk-cache.patch b/kde-plasma/kscreenlocker/files/kscreenlocker-5.27.8-disable-qml-disk-cache.patch new file mode 100644 index 000000000000..e177bb290f52 --- /dev/null +++ b/kde-plasma/kscreenlocker/files/kscreenlocker-5.27.8-disable-qml-disk-cache.patch @@ -0,0 +1,42 @@ +From f9b5596b2763e33319134cfd9e9fd5e6bd124a0b Mon Sep 17 00:00:00 2001 +From: Harald Sitter +Date: Mon, 18 Sep 2023 10:56:47 +0200 +Subject: [PATCH] greeter: disable qml disk cache + +The cache currently runs risk of getting corrupted and breaking the lock +screen until the cache hash changes or the cache file gets removed by +the user. Since we don't necessarily need a cache here let's just +disable it for the time being in the interest of greater fault +tolerance. + +BUG: 471952 +(cherry picked from commit d1640daa360943f86196e323c4a76bde57566150) +--- + greeter/main.cpp | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/greeter/main.cpp b/greeter/main.cpp +index f5c3c05c..6c2bff28 100644 +--- a/greeter/main.cpp ++++ b/greeter/main.cpp +@@ -1,5 +1,6 @@ + /* + SPDX-FileCopyrightText: 2011 Martin Gräßlin ++SPDX-FileCopyrightText: 2023 Harald Sitter + + SPDX-License-Identifier: GPL-2.0-or-later + */ +@@ -81,6 +82,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"); ++ // Disable QML caching to prevent cache corruption in full or near-full disk scenarios. ++ // https://bugs.kde.org/show_bug.cgi?id=471952 ++ // https://bugreports.qt.io/browse/QTBUG-117130 ++ qputenv("QML_DISABLE_DISK_CACHE", "1"); + + auto format = QSurfaceFormat::defaultFormat(); + format.setOption(QSurfaceFormat::ResetNotification); +-- +GitLab + diff --git a/kde-plasma/kscreenlocker/kscreenlocker-5.27.8-r1.ebuild b/kde-plasma/kscreenlocker/kscreenlocker-5.27.8-r1.ebuild new file mode 100644 index 000000000000..48009bd2b6db --- /dev/null +++ b/kde-plasma/kscreenlocker/kscreenlocker-5.27.8-r1.ebuild @@ -0,0 +1,87 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ECM_TEST="forceoptional" +KFMIN=5.106.0 +PVCUT=$(ver_cut 1-3) +QTMIN=5.15.9 +inherit ecm plasma.kde.org pam + +DESCRIPTION="Library and components for secure lock screen architecture" + +LICENSE="GPL-2" # TODO: CHECK +SLOT="5" +KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" +IUSE="" + +RESTRICT="test" + +COMMON_DEPEND=" + dev-libs/wayland + >=dev-qt/qtdbus-${QTMIN}:5 + >=dev-qt/qtdeclarative-${QTMIN}:5 + >=dev-qt/qtgui-${QTMIN}:5 + >=dev-qt/qtnetwork-${QTMIN}:5 + >=dev-qt/qtwidgets-${QTMIN}:5 + >=dev-qt/qtx11extras-${QTMIN}:5 + >=kde-frameworks/kcmutils-${KFMIN}:5 + >=kde-frameworks/kconfig-${KFMIN}:5[qml] + >=kde-frameworks/kconfigwidgets-${KFMIN}:5 + >=kde-frameworks/kcoreaddons-${KFMIN}:5 + >=kde-frameworks/kcrash-${KFMIN}:5 + >=kde-frameworks/kdeclarative-${KFMIN}:5 + >=kde-frameworks/kglobalaccel-${KFMIN}:5 + >=kde-frameworks/ki18n-${KFMIN}:5 + >=kde-frameworks/kidletime-${KFMIN}:5 + >=kde-frameworks/kio-${KFMIN}:5 + >=kde-frameworks/knotifications-${KFMIN}:5 + >=kde-frameworks/kpackage-${KFMIN}:5 + >=kde-frameworks/kwayland-${KFMIN}:5 + >=kde-frameworks/kwindowsystem-${KFMIN}:5 + >=kde-frameworks/kxmlgui-${KFMIN}:5 + >=kde-frameworks/solid-${KFMIN}:5 + >=kde-plasma/layer-shell-qt-${PVCUT}:5 + >=kde-plasma/libkscreen-${PVCUT}:5 + sys-libs/pam + x11-libs/libX11 + x11-libs/libXi + x11-libs/libxcb + x11-libs/xcb-util-keysyms +" +DEPEND="${COMMON_DEPEND} + x11-base/xorg-proto +" +RDEPEND="${COMMON_DEPEND} + >=dev-qt/qtquickcontrols2-${QTMIN}:5 + >=kde-frameworks/kirigami-${KFMIN}:5 + >=kde-frameworks/plasma-${KFMIN}:5 +" +BDEPEND=" + dev-util/wayland-scanner + >=kde-frameworks/kcmutils-${KFMIN}:5 +" +PDEPEND=">=kde-plasma/kde-cli-tools-${PVCUT}:5" + +PATCHES=( "${FILESDIR}/${P}-disable-qml-disk-cache.patch" ) # KDE-bug 471952 + +src_prepare() { + ecm_src_prepare + use test || cmake_run_in greeter cmake_comment_add_subdirectory autotests +} + +src_test() { + # requires running environment + local myctestargs=( + -E x11LockerTest + ) + ecm_src_test +} + +src_install() { + ecm_src_install + + newpamd "${FILESDIR}/kde.pam" kde + newpamd "${FILESDIR}/kde-np.pam" kde-np +} -- cgit v1.2.3