diff options
author | V3n3RiX <venerix@koprulu.sector> | 2024-03-05 13:06:03 +0000 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2024-03-05 13:06:03 +0000 |
commit | f61d8811e916303cabe9fafdefbe188ba9b500d5 (patch) | |
tree | 2af9236d3e678dca4d443b94bfc1b88aec45c669 /kde-frameworks/kio | |
parent | 66a7d60eb8beba754ba79c2752cbf70fcf741b0b (diff) |
gentoo auto-resync : 05:03:2024 - 13:06:02
Diffstat (limited to 'kde-frameworks/kio')
-rw-r--r-- | kde-frameworks/kio/Manifest | 2 | ||||
-rw-r--r-- | kde-frameworks/kio/files/kio-5.113.0-fix-crash-malformed-exec.patch | 41 | ||||
-rw-r--r-- | kde-frameworks/kio/files/kio-5.113.0-fix-crash-while-copying.patch | 184 |
3 files changed, 0 insertions, 227 deletions
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 <sitter@kde.org> -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 <akselmo@akselmo.dev> -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 <QApplication> - #include <QDialogButtonBox> -+#include <QPointer> - #include <QRegularExpression> - #include <QUrl> - -@@ -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<QWidget> 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<QWidget> 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<QWidget> 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); - |