| 1 |
commit: f590713a6e588cc79bd5c2a9b6ab9b95f827e865 |
| 2 |
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Feb 17 13:57:20 2016 +0000 |
| 4 |
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Feb 17 13:57:20 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=f590713a |
| 7 |
|
| 8 |
kde-frameworks/kactivities: remove unused patch |
| 9 |
|
| 10 |
Package-Manager: portage-2.2.27 |
| 11 |
|
| 12 |
.../files/kactivities-5.19.0-crash.patch | 89 ---------------------- |
| 13 |
1 file changed, 89 deletions(-) |
| 14 |
|
| 15 |
diff --git a/kde-frameworks/kactivities/files/kactivities-5.19.0-crash.patch b/kde-frameworks/kactivities/files/kactivities-5.19.0-crash.patch |
| 16 |
deleted file mode 100644 |
| 17 |
index 001fbb2..0000000 |
| 18 |
--- a/kde-frameworks/kactivities/files/kactivities-5.19.0-crash.patch |
| 19 |
+++ /dev/null |
| 20 |
@@ -1,89 +0,0 @@ |
| 21 |
-From b3c8ad1ad48d65ea77724f94073909dc8ab97596 Mon Sep 17 00:00:00 2001 |
| 22 |
-From: David Edmundson <david@×××××××××××××××××.uk> |
| 23 |
-Date: Sat, 6 Feb 2016 18:02:53 +0000 |
| 24 |
-Subject: [PATCH] Fix crash in activities context menu |
| 25 |
- |
| 26 |
-Currently we call deleteLater() from inside ::run which is running in a |
| 27 |
-different thread than the receiving object. |
| 28 |
-(QThread objects live in the thread that created them, not in the thread |
| 29 |
-they create) |
| 30 |
- |
| 31 |
-This patch causes deleteLater to be run in the right thread. |
| 32 |
- |
| 33 |
-QCoreApplication::postEvent is thread safe but it needs to be in the |
| 34 |
-right thread to work out the correct event loop level for deferred |
| 35 |
-delete events. |
| 36 |
- |
| 37 |
-BUG: 351485 |
| 38 |
-REVIEW: 126955 |
| 39 |
---- |
| 40 |
- src/workspace/fileitemplugin/FileItemLinkingPlugin.cpp | 2 +- |
| 41 |
- .../fileitemplugin/FileItemLinkingPluginActionLoader.cpp | 9 +++++++-- |
| 42 |
- src/workspace/fileitemplugin/FileItemLinkingPluginActionLoader.h | 4 ++-- |
| 43 |
- 3 files changed, 10 insertions(+), 5 deletions(-) |
| 44 |
- |
| 45 |
-diff --git a/src/workspace/fileitemplugin/FileItemLinkingPlugin.cpp b/src/workspace/fileitemplugin/FileItemLinkingPlugin.cpp |
| 46 |
-index a887132..f3f6dde 100644 |
| 47 |
---- a/src/workspace/fileitemplugin/FileItemLinkingPlugin.cpp |
| 48 |
-+++ b/src/workspace/fileitemplugin/FileItemLinkingPlugin.cpp |
| 49 |
-@@ -124,7 +124,7 @@ void FileItemLinkingPlugin::Private::loadAllActions() |
| 50 |
- setActions({ action }); |
| 51 |
- |
| 52 |
- } else if (!loaded) { |
| 53 |
-- auto loader = new FileItemLinkingPluginActionLoader(items); |
| 54 |
-+ auto loader = FileItemLinkingPluginActionLoader::create(items); |
| 55 |
- |
| 56 |
- static FileItemLinkingPluginActionStaticInit init; |
| 57 |
- |
| 58 |
-diff --git a/src/workspace/fileitemplugin/FileItemLinkingPluginActionLoader.cpp b/src/workspace/fileitemplugin/FileItemLinkingPluginActionLoader.cpp |
| 59 |
-index 3343eb4..b35713d 100644 |
| 60 |
---- a/src/workspace/fileitemplugin/FileItemLinkingPluginActionLoader.cpp |
| 61 |
-+++ b/src/workspace/fileitemplugin/FileItemLinkingPluginActionLoader.cpp |
| 62 |
-@@ -40,6 +40,13 @@ |
| 63 |
- |
| 64 |
- #include "common/dbus/common.h" |
| 65 |
- |
| 66 |
-+FileItemLinkingPluginActionLoader* FileItemLinkingPluginActionLoader::create(const KFileItemListProperties &items) |
| 67 |
-+{ |
| 68 |
-+ auto l = new FileItemLinkingPluginActionLoader(items); |
| 69 |
-+ connect(l, &QThread::finished, l, &QObject::deleteLater); |
| 70 |
-+ return l; |
| 71 |
-+} |
| 72 |
-+ |
| 73 |
- FileItemLinkingPluginActionLoader::FileItemLinkingPluginActionLoader( |
| 74 |
- const KFileItemListProperties &items) |
| 75 |
- : items(items) |
| 76 |
-@@ -150,8 +157,6 @@ void FileItemLinkingPluginActionLoader::run() |
| 77 |
- } |
| 78 |
- |
| 79 |
- emit result(actions); |
| 80 |
-- |
| 81 |
-- deleteLater(); |
| 82 |
- } |
| 83 |
- |
| 84 |
- Action |
| 85 |
-diff --git a/src/workspace/fileitemplugin/FileItemLinkingPluginActionLoader.h b/src/workspace/fileitemplugin/FileItemLinkingPluginActionLoader.h |
| 86 |
-index 50dccc5..5264a45 100644 |
| 87 |
---- a/src/workspace/fileitemplugin/FileItemLinkingPluginActionLoader.h |
| 88 |
-+++ b/src/workspace/fileitemplugin/FileItemLinkingPluginActionLoader.h |
| 89 |
-@@ -33,8 +33,7 @@ class FileItemLinkingPluginActionLoader: public QThread { |
| 90 |
- Q_OBJECT |
| 91 |
- |
| 92 |
- public: |
| 93 |
-- FileItemLinkingPluginActionLoader(const KFileItemListProperties &items); |
| 94 |
-- |
| 95 |
-+ static FileItemLinkingPluginActionLoader* create(const KFileItemListProperties &items); |
| 96 |
- void run() Q_DECL_OVERRIDE; |
| 97 |
- |
| 98 |
- Action createAction(const QString &activity, bool link, |
| 99 |
-@@ -46,6 +45,7 @@ Q_SIGNALS: |
| 100 |
- void result(const ActionList &actions); |
| 101 |
- |
| 102 |
- private: |
| 103 |
-+ FileItemLinkingPluginActionLoader(const KFileItemListProperties &items); |
| 104 |
- KFileItemListProperties items; |
| 105 |
- KActivities::Consumer activities; |
| 106 |
- }; |
| 107 |
--- |
| 108 |
-2.4.10 |
| 109 |
- |
Archives