From f61d8811e916303cabe9fafdefbe188ba9b500d5 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 5 Mar 2024 13:06:03 +0000 Subject: gentoo auto-resync : 05:03:2024 - 13:06:02 --- kde-frameworks/Manifest.gz | Bin 13918 -> 13907 bytes kde-frameworks/breeze-icons/Manifest | 1 - .../files/breeze-icons-5.249.0-cmake.patch | 24 --- kde-frameworks/kio/Manifest | 2 - .../kio-5.113.0-fix-crash-malformed-exec.patch | 41 ----- .../kio-5.113.0-fix-crash-while-copying.patch | 184 --------------------- kde-frameworks/kirigami/Manifest | 1 - ...irigami-5.113.0-drawer-actions-accessible.patch | 38 ----- 8 files changed, 291 deletions(-) delete mode 100644 kde-frameworks/breeze-icons/files/breeze-icons-5.249.0-cmake.patch delete mode 100644 kde-frameworks/kio/files/kio-5.113.0-fix-crash-malformed-exec.patch delete mode 100644 kde-frameworks/kio/files/kio-5.113.0-fix-crash-while-copying.patch delete mode 100644 kde-frameworks/kirigami/files/kirigami-5.113.0-drawer-actions-accessible.patch (limited to 'kde-frameworks') diff --git a/kde-frameworks/Manifest.gz b/kde-frameworks/Manifest.gz index f6ff2efc0a32..21a109b49e00 100644 Binary files a/kde-frameworks/Manifest.gz and b/kde-frameworks/Manifest.gz differ diff --git a/kde-frameworks/breeze-icons/Manifest b/kde-frameworks/breeze-icons/Manifest index 68a76ae25b49..680a3f866c0c 100644 --- a/kde-frameworks/breeze-icons/Manifest +++ b/kde-frameworks/breeze-icons/Manifest @@ -1,4 +1,3 @@ -AUX breeze-icons-5.249.0-cmake.patch 766 BLAKE2B 353d26c2d2770a04ce42228f48d26195c210c60894de722adb66fac93d3872c362b33feb35d59e0f8462f23a701864b9d2cd80823f2d6007e4ea7487e376a72b SHA512 9f6d8b5744c97f7b494570a97863cee87ca0b482b45555f342c44525a2beb2b3691408f069445eb83b2a422ab361c1f8e2c4ba30f281b35a77124e141aac3c19 DIST breeze-icons-5.115.0.tar.xz 2173528 BLAKE2B 712c9cabb74bbdf9feb9a889fddda6ea654fd2a618f5c36a4aa782b5389032b829919ca5ef69a3310749ac10e2dc381700474d56e7cbc1478ae51030248d8789 SHA512 f4b5f54bb80dcd2bba6edd02a412eb675b02d438ba0ee82d6dc4eaac1ed2aceb11b46ce143bbe825c26f823d5b897619e02c26b23addf2de05830a320dd124f8 DIST breeze-icons-6.0.0.tar.xz 2254936 BLAKE2B 28fdc5e9bcdefd229440042e38f4628e9dd716c4a21d28edc5e6647507958d8d4e8596352ccf9ff0d90a5f25b0a331c106c04b76931212000fd78837738d29c8 SHA512 d0b224136f7021ae44e6a62e158a2c7b2f862701fa4008a10a9281701f3f8a588381501e42713ea76c66672fdb04801adfdcf01640d524d573e0ccd8cb44f101 EBUILD breeze-icons-5.115.0.ebuild 1154 BLAKE2B 461169ee4fe635cf4e85daa0e08a0b18181532aaa33be249630c2bdd853be21e636f5dd13d922d5b86d8b691622d0935976fbcf94b87d447234c07558e0bbd89 SHA512 c150c1cf4952bfe74a9d318298065a71349f1190f07cceea722a478d82c3c102c7ae1bd6d928d6e0bff485b3b736c2f80c34c9992c674015d48c7f9cebe79c64 diff --git a/kde-frameworks/breeze-icons/files/breeze-icons-5.249.0-cmake.patch b/kde-frameworks/breeze-icons/files/breeze-icons-5.249.0-cmake.patch deleted file mode 100644 index ece8dae14c83..000000000000 --- a/kde-frameworks/breeze-icons/files/breeze-icons-5.249.0-cmake.patch +++ /dev/null @@ -1,24 +0,0 @@ -From a4970ce40ec43c0a1db418aa05ee2853497a0c14 Mon Sep 17 00:00:00 2001 -From: Hannah von Reth -Date: Wed, 31 Jan 2024 13:24:09 +0000 -Subject: [PATCH] Fix cmake config if lib was not build - ---- - KF6BreezeIconsConfig.cmake.in | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/KF6BreezeIconsConfig.cmake.in b/KF6BreezeIconsConfig.cmake.in -index be4ae7310..2d03f0c6e 100644 ---- a/KF6BreezeIconsConfig.cmake.in -+++ b/KF6BreezeIconsConfig.cmake.in -@@ -3,6 +3,5 @@ - if(@ICONS_LIBRARY@) - include(CMakeFindDependencyMacro) - find_dependency(Qt6Gui "@REQUIRED_QT_VERSION@") -+ include("${CMAKE_CURRENT_LIST_DIR}/KF6BreezeIconsTargets.cmake") - endif() -- --include("${CMAKE_CURRENT_LIST_DIR}/KF6BreezeIconsTargets.cmake") --- -GitLab - diff --git a/kde-frameworks/kio/Manifest b/kde-frameworks/kio/Manifest index dc2b2561a2df..29e51955a928 100644 --- a/kde-frameworks/kio/Manifest +++ b/kde-frameworks/kio/Manifest @@ -1,5 +1,3 @@ -AUX kio-5.113.0-fix-crash-malformed-exec.patch 1629 BLAKE2B aa05b4b860cfd17f5676227ebffa42c9f5a0454eb3c5f1e5805ab80cf0bdeaa830cdb3f60d30895598edf8fc13803498094957a78368d709bac17f9d594695ae SHA512 1a307e14847928053440eb6cdf34a99f3296026f82e25a640619027df7d76a5ea72d6586a740ab5331b2fd74c4ef093a21e9c9cef350f53e521fc712be2d6561 -AUX kio-5.113.0-fix-crash-while-copying.patch 6118 BLAKE2B 0dee76a2102cc044deceb755ca8cd9438a40ba8f1710538325e4ca4b51a28de658ee04a8cc7585e4e72e9885f418bd864ac7f196edf8c30b57b61d95110b9233 SHA512 566ff7ce4032d3a83013f24370fc4f73f4b6e2c61b8288332cda7db61f5628eced0388e953223b333d17d8d33e5f4071345ffde35c024a4007c130e2660b94b9 DIST kio-5.115.0.tar.xz 3799964 BLAKE2B 020084259a4e41d102e786d34b899420e18d75f27a3f8391dfd05f57d86168676d5ae88b603d84176a8ad963aee7bc5883ef4952c25f6d8ea1b11cd6d04bb470 SHA512 014eab017a1a9ba65cf122a9f241764054b3591c5759d5121ccd82593ebfe301eec0ba1f9e08165ef75b0fdf057094ef81293a6ec020ee2100394a68ab80a8d7 DIST kio-6.0.0.tar.xz 3353680 BLAKE2B f65c2cc36e2e22494edf77f598ca6eff037d26de0981d3f136d3db901d1ca4cd069f696c5dd9a42622bcb6b60aabf79e1221b9862e47cc15205341101efe58e2 SHA512 ec230cda5fc9f973e0b02bf7e9a2c282c447c69cd247be10b11299b950043a9517ff17061c1262e4e709539d9fe17ff532d1ff69dae36abe56b1bb0d81327bfe EBUILD kio-5.115.0.ebuild 2433 BLAKE2B ef2dbdc733214e9ad012fbf45564b3eb052bf3980e346977d9c9c7ec13a4cd512fcc5a6b517d9993ed333c821e885228779ea53649905c9f744025ffdd21dd0d SHA512 9ea1c94266e3f638e891fdf834919deba8ade49b4339366d8ff965a23e221c55155e5bf963f585185ef8b191c3c242d04d7c88f09cbc73196bee5fb18d72c3ee diff --git a/kde-frameworks/kio/files/kio-5.113.0-fix-crash-malformed-exec.patch b/kde-frameworks/kio/files/kio-5.113.0-fix-crash-malformed-exec.patch deleted file mode 100644 index 3688fa4af276..000000000000 --- a/kde-frameworks/kio/files/kio-5.113.0-fix-crash-malformed-exec.patch +++ /dev/null @@ -1,41 +0,0 @@ -From ebad60218b9d9e6901ae48c3dec9b90da963809c Mon Sep 17 00:00:00 2001 -From: Harald Sitter -Date: Wed, 13 Dec 2023 07:44:01 +0100 -Subject: [PATCH] kpropertiesdialog: don't trip over malformed Exec - -when the user incorrectly put env vars into the Program field the -resulting desktop file will be somewhat malformed and literally contain - -> Exec='FOO=1 Bar' - -this then needs careful handling when parsing so we don't accidentally -drain the execline list. when this scenario appears we'll need to assume -the last item in the list is the program as we can't really tell if it -is a program that looks like an env var or an env var without program - -BUG: 465290 -(cherry picked from commit 78d4364677fbe658c6e05d19bb158f895403ccc9) ---- - src/widgets/kpropertiesdialog.cpp | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/src/widgets/kpropertiesdialog.cpp b/src/widgets/kpropertiesdialog.cpp -index 93ec0759cf..25061825af 100644 ---- a/src/widgets/kpropertiesdialog.cpp -+++ b/src/widgets/kpropertiesdialog.cpp -@@ -3379,6 +3379,12 @@ KDesktopPropsPlugin::KDesktopPropsPlugin(KPropertiesDialog *_props) - execLine.pop_front(); - } - for (auto env : execLine) { -+ if (execLine.length() <= 1) { -+ // Don't empty out the list. If the last element contains an equal sign we have to treat it as part of the -+ // program name lest we have no program -+ // https://bugs.kde.org/show_bug.cgi?id=465290 -+ break; -+ } - if (!env.contains(QLatin1String("="))) { - break; - } --- -GitLab - diff --git a/kde-frameworks/kio/files/kio-5.113.0-fix-crash-while-copying.patch b/kde-frameworks/kio/files/kio-5.113.0-fix-crash-while-copying.patch deleted file mode 100644 index 845e6bc64339..000000000000 --- a/kde-frameworks/kio/files/kio-5.113.0-fix-crash-while-copying.patch +++ /dev/null @@ -1,184 +0,0 @@ -From 6bea074739d5a75920d5540bc266549df5642511 Mon Sep 17 00:00:00 2001 -From: Akseli Lahtinen -Date: Fri, 1 Dec 2023 11:27:26 +0000 -Subject: [PATCH] WidgetsAskUserActionHandler: Use QPointer to check the - validity of parent widgets - -If Dolphin is closed during the copying process, -and the overwrite/skip dialog appears, -this crashes the copying process since the -parent shows to faulty location. - -Use QPointer to check that the parent widgets are still -valid. If not, we just use nullptr, and the dialogs -will still open. - -This also cleans some repetition in code. - -BUG:448532 -(cherry picked from commit bdef648edd54e146c30e881d8eb95990a59c5bbc) ---- - src/widgets/widgetsaskuseractionhandler.cpp | 90 +++++++++------------ - 1 file changed, 39 insertions(+), 51 deletions(-) - -diff --git a/src/widgets/widgetsaskuseractionhandler.cpp b/src/widgets/widgetsaskuseractionhandler.cpp -index fe2975d0ce..9cbaaec99f 100644 ---- a/src/widgets/widgetsaskuseractionhandler.cpp -+++ b/src/widgets/widgetsaskuseractionhandler.cpp -@@ -22,6 +22,7 @@ - - #include - #include -+#include - #include - #include - -@@ -40,7 +41,10 @@ - void savePersistentUserReply(KIO::AskUserActionInterface::MessageDialogType type, KConfigGroup &cg, const QString &dontAskAgainName, int result); - - WidgetsAskUserActionHandler *const q; -- QWidget *m_parentWidget = nullptr; -+ QPointer m_parentWidget = nullptr; -+ -+ QWidget *getParentWidget(KJob *job); -+ QWidget *getParentWidget(QWidget *widget); - }; - - bool KIO::WidgetsAskUserActionHandlerPrivate::gotPersistentUserReply(KIO::AskUserActionInterface::MessageDialogType type, -@@ -106,6 +110,36 @@ - } - } - -+QWidget *KIO::WidgetsAskUserActionHandlerPrivate::getParentWidget(KJob *job) -+{ -+ // This needs to be in qpointer, otherwise copying process -+ // will crash if done in background and dolphin is closed -+ QPointer parentWidget = nullptr; -+ -+ if (job) { -+ parentWidget = KJobWidgets::window(job); -+ } -+ -+ return getParentWidget(parentWidget); -+} -+ -+QWidget *KIO::WidgetsAskUserActionHandlerPrivate::getParentWidget(QWidget *widget) -+{ -+ // This needs to be in qpointer, otherwise copying process -+ // will crash if done in background and dolphin is closed -+ QPointer parentWidget = widget; -+ -+ if (!parentWidget) { -+ parentWidget = this->m_parentWidget; -+ } -+ -+ if (!parentWidget) { -+ parentWidget = qApp->activeWindow(); -+ } -+ -+ return parentWidget; -+} -+ - KIO::WidgetsAskUserActionHandler::WidgetsAskUserActionHandler(QObject *parent) - : KIO::AskUserActionInterface(parent) - , d(new WidgetsAskUserActionHandlerPrivate(this)) -@@ -128,22 +162,8 @@ - const QDateTime &mtimeSrc, - const QDateTime &mtimeDest) - { -- QWidget *parentWidget = nullptr; -- -- if (job) { -- parentWidget = KJobWidgets::window(job); -- } -- -- if (!parentWidget) { -- parentWidget = d->m_parentWidget; -- } -- -- if (!parentWidget) { -- parentWidget = qApp->activeWindow(); -- } -- - QMetaObject::invokeMethod(qGuiApp, [=] { -- auto *dlg = new KIO::RenameDialog(parentWidget, title, src, dest, options, sizeSrc, sizeDest, ctimeSrc, ctimeDest, mtimeSrc, mtimeDest); -+ auto *dlg = new KIO::RenameDialog(d->getParentWidget(job), title, src, dest, options, sizeSrc, sizeDest, ctimeSrc, ctimeDest, mtimeSrc, mtimeDest); - - dlg->setAttribute(Qt::WA_DeleteOnClose); - dlg->setWindowModality(Qt::WindowModal); -@@ -161,22 +181,8 @@ - - void KIO::WidgetsAskUserActionHandler::askUserSkip(KJob *job, KIO::SkipDialog_Options options, const QString &errorText) - { -- QWidget *parentWidget = nullptr; -- -- if (job) { -- parentWidget = KJobWidgets::window(job); -- } -- -- if (!parentWidget) { -- parentWidget = d->m_parentWidget; -- } -- -- if (!parentWidget) { -- parentWidget = qApp->activeWindow(); -- } -- - QMetaObject::invokeMethod(qGuiApp, [=] { -- auto *dlg = new KIO::SkipDialog(parentWidget, options, errorText); -+ auto *dlg = new KIO::SkipDialog(d->getParentWidget(job), options, errorText); - dlg->setAttribute(Qt::WA_DeleteOnClose); - dlg->setWindowModality(Qt::WindowModal); - -@@ -373,16 +379,6 @@ - return; - } - -- QWidget *parentWidget = parent; -- -- if (!parentWidget) { -- parentWidget = d->m_parentWidget; -- } -- -- if (!parentWidget) { -- parentWidget = qApp->activeWindow(); -- } -- - const KGuiItem primaryActionButton(primaryActionText, primaryActionIconName); - const KGuiItem secondaryActionButton(secondaryActionText, secondaryActionIconName); - -@@ -412,7 +408,7 @@ - hasCancelButton = true; - break; - case AskUserActionInterface::SSLMessageBox: -- d->sslMessageBox(text, metaData, parentWidget); -+ d->sslMessageBox(text, metaData, d->getParentWidget(parent)); - return; - case AskUserActionInterface::Information: - dlgType = KMessageDialog::Information; -@@ -442,7 +438,7 @@ - - QMetaObject::invokeMethod(qGuiApp, [=]() { - auto cancelButton = hasCancelButton ? KStandardGuiItem::cancel() : KGuiItem(); -- auto *dialog = new KMessageDialog(dlgType, text, parentWidget); -+ auto *dialog = new KMessageDialog(dlgType, text, d->getParentWidget(parent)); - - dialog->setAttribute(Qt::WA_DeleteOnClose); - dialog->setCaption(title); -@@ -492,15 +488,7 @@ - - void KIO::WidgetsAskUserActionHandlerPrivate::sslMessageBox(const QString &text, const KIO::MetaData &metaData, QWidget *parent) - { -- QWidget *parentWidget = parent; -- -- if (!parentWidget) { -- parentWidget = m_parentWidget; -- } -- -- if (!parentWidget) { -- parentWidget = qApp->activeWindow(); -- } -+ QWidget *parentWidget = getParentWidget(parent); - - const QStringList sslList = metaData.value(QStringLiteral("ssl_peer_chain")).split(QLatin1Char('\x01'), Qt::SkipEmptyParts); - diff --git a/kde-frameworks/kirigami/Manifest b/kde-frameworks/kirigami/Manifest index 7b4ad750ba75..f2e2a371ed2c 100644 --- a/kde-frameworks/kirigami/Manifest +++ b/kde-frameworks/kirigami/Manifest @@ -1,4 +1,3 @@ -AUX kirigami-5.113.0-drawer-actions-accessible.patch 1428 BLAKE2B 5a6631e2f80a790ecb9635d72b2da7d8065c9f54ca5c3de5c7d99b158bba827ef0c5afe2a5d87c197e79c036c21d981320e97f5d7a87300c96d1b484bbe844ae SHA512 c17a05b81a7686b13014dc9c706da8fdd79dd63e7baf71ed2d18946e6a2ffa370da56b73cee8fb99a9c6cb19ba4fe202051c39db8ca1a04c776f6b26758090bf DIST kirigami-6.0.0.tar.xz 371664 BLAKE2B 4d50f4b803d1042c0c69a6e31a4acd3d87d0269b45e60330aa7ea00c45f89504b61c86ed03f01834aeb4b7925fe720419b556d3c3cfaa45693a8a380bf8a816b SHA512 b94307d71f71ff59f670e98782924f54f4d4b32e41c21f29701946b2430131ed8e7e5d38e0145c601d2b50ecf3ab2e2e2a1bbad2e446fb533ffc5b9f3e464d62 DIST kirigami2-5.115.0.tar.xz 383944 BLAKE2B ce95794319ebbda40d384896da4e94dcf5137d176b0c3cab53bf5223ed48e0c95486002010c74008b42857ce7d27d4840c2af0395e957d0eade18bc2f5796f87 SHA512 b99d9829f864ae59b0ae4064e0b0b24a0f33ce2c35c60b4609fd9746bb322cab26d3f9afe6ba0893b486d4c546ead98c5ba42dc33271d2fdf47e34caef35ea90 EBUILD kirigami-5.115.0.ebuild 1179 BLAKE2B 931d5c609369b2cbe37388c90886b6287da66d74343b3d22fff37578667b2a87599821fc2a313394be435e4bcbfdf3ceded2bff1b5419333eb9bf61fb2198231 SHA512 e0c3775f55bf3e3f34a7d0f7d9e57e011fb3a5dfddbd1f3030ab419466948683078c25653d6c4372f0229458cd96dcfc496f5d3a73a1b2ba28ef2d2c4ef7b27e diff --git a/kde-frameworks/kirigami/files/kirigami-5.113.0-drawer-actions-accessible.patch b/kde-frameworks/kirigami/files/kirigami-5.113.0-drawer-actions-accessible.patch deleted file mode 100644 index 1a7dd0b98807..000000000000 --- a/kde-frameworks/kirigami/files/kirigami-5.113.0-drawer-actions-accessible.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 31f8fbc0d1c55e0d4af02be309aae5cef29055e7 Mon Sep 17 00:00:00 2001 -From: Volker Krause -Date: Mon, 14 Aug 2023 17:38:20 +0200 -Subject: [PATCH] Make drawer actions accessible - -They could previously not be triggered at all, and had no label in -the global drawer. ---- - src/controls/private/ContextDrawerActionItem.qml | 2 ++ - src/controls/private/GlobalDrawerActionItem.qml | 3 +++ - 2 files changed, 5 insertions(+) - -diff --git a/src/controls/private/ContextDrawerActionItem.qml b/src/controls/private/ContextDrawerActionItem.qml -index 430ff87e6..f5b2ca5c7 100644 ---- a/src/controls/private/ContextDrawerActionItem.qml -+++ b/src/controls/private/ContextDrawerActionItem.qml -@@ -95,4 +95,6 @@ Kirigami.BasicListItem { - console.warning("Don't know how to trigger the action") - } - } -+ -+ Accessible.onPressAction: listItem.clicked() - } -diff --git a/src/controls/private/GlobalDrawerActionItem.qml b/src/controls/private/GlobalDrawerActionItem.qml -index 07e63fa38..6d3c5fe35 100644 ---- a/src/controls/private/GlobalDrawerActionItem.qml -+++ b/src/controls/private/GlobalDrawerActionItem.qml -@@ -177,4 +177,7 @@ Kirigami.AbstractListItem { - - Keys.onDownPressed: event => nextItemInFocusChain().focus = true - Keys.onUpPressed: event => nextItemInFocusChain(false).focus = true -+ -+ Accessible.onPressAction: listItem.clicked() -+ Accessible.name: modelData.text - } --- -GitLab - -- cgit v1.2.3