diff options
author | Michael Palimaka <kensington@gentoo.org> | 2016-02-15 03:45:01 +1100 |
---|---|---|
committer | Michael Palimaka <kensington@gentoo.org> | 2016-02-15 03:46:01 +1100 |
commit | 308018c879d78532b4deb50754fce3b4baa9aa25 (patch) | |
tree | c239383027c2b8c67494d1a43884bb4e979733ac /kde-frameworks/kactivities | |
parent | kde5-functions.eclass: add_{frameworks,plasma,kdeapps}_dep slot overrides (diff) | |
download | gentoo-308018c879d78532b4deb50754fce3b4baa9aa25.tar.gz gentoo-308018c879d78532b4deb50754fce3b4baa9aa25.tar.bz2 gentoo-308018c879d78532b4deb50754fce3b4baa9aa25.zip |
kde-frameworks: version bump 5.19.0
Package-Manager: portage-2.2.27
Diffstat (limited to 'kde-frameworks/kactivities')
-rw-r--r-- | kde-frameworks/kactivities/Manifest | 1 | ||||
-rw-r--r-- | kde-frameworks/kactivities/files/kactivities-5.19.0-crash.patch | 89 | ||||
-rw-r--r-- | kde-frameworks/kactivities/kactivities-5.19.0.ebuild | 39 |
3 files changed, 129 insertions, 0 deletions
diff --git a/kde-frameworks/kactivities/Manifest b/kde-frameworks/kactivities/Manifest index a95f6c0022d6..a14f8826a86f 100644 --- a/kde-frameworks/kactivities/Manifest +++ b/kde-frameworks/kactivities/Manifest @@ -1,2 +1,3 @@ DIST kactivities-5.17.0.tar.xz 185028 SHA256 5a7580770349f005972ab5cf27f2f67ce643c1b3cfffdf56c03729fbd61cdd52 SHA512 08b407d544ab9ea1cd115d132603538dc948bfd6367160126944d981b2510bfb5e562bb91f35de22b179ac2a374aa8f74f9f61cb4dcf22ca482e41f92f883156 WHIRLPOOL 328bf46d92853728954927f6656f3557d69526f029977bca40d2c7cfea7a40fbab32d5d49611049029bb2adf41a18ffe9e766b33da56f8204b840701652778f6 DIST kactivities-5.18.0.tar.xz 181888 SHA256 b95e76570963a9f8797f103e32ddf58382c104e935fc27de3f48eea3db300a5b SHA512 f21a162234f068083d3aae0b184ba6fd7253c0dd40c989300c9553eb1a04ec2136476e212e0b19b52f2aa68c08079a882bca1c624a1532d5cc4860b0e13468d1 WHIRLPOOL cde7404bea3eb6c289e328f9d0590dc27f6f95d7cb2c9c3afb199122f7699fef7516e64bc944807a9bf9676cd6358a96fc49e93fa54e8bdbf5393a4fd10ba90b +DIST kactivities-5.19.0.tar.xz 151552 SHA256 43cff33c5c4a232206bf6ffdaa1ea3f50e40339e4568a7376992fc61970eb47a SHA512 8354979888fc23108237482a37686c302527d79c7d16f3c858a7627c8a018d425fee0f2b810e62fd9552552d90c4fbc0235b4066082f3fc011ccfa91c8db2514 WHIRLPOOL aca6d791c3288c9957a4a7c8d9c5fdec0dc9a9edb1090627d63cd0c62a75f8686d3c90e8caade0c26be7c33ad40625b534dc8ca32e60cd2499c4872119969907 diff --git a/kde-frameworks/kactivities/files/kactivities-5.19.0-crash.patch b/kde-frameworks/kactivities/files/kactivities-5.19.0-crash.patch new file mode 100644 index 000000000000..001fbb26ea4c --- /dev/null +++ b/kde-frameworks/kactivities/files/kactivities-5.19.0-crash.patch @@ -0,0 +1,89 @@ +From b3c8ad1ad48d65ea77724f94073909dc8ab97596 Mon Sep 17 00:00:00 2001 +From: David Edmundson <david@davidedmundson.co.uk> +Date: Sat, 6 Feb 2016 18:02:53 +0000 +Subject: [PATCH] Fix crash in activities context menu + +Currently we call deleteLater() from inside ::run which is running in a +different thread than the receiving object. +(QThread objects live in the thread that created them, not in the thread +they create) + +This patch causes deleteLater to be run in the right thread. + +QCoreApplication::postEvent is thread safe but it needs to be in the +right thread to work out the correct event loop level for deferred +delete events. + +BUG: 351485 +REVIEW: 126955 +--- + src/workspace/fileitemplugin/FileItemLinkingPlugin.cpp | 2 +- + .../fileitemplugin/FileItemLinkingPluginActionLoader.cpp | 9 +++++++-- + src/workspace/fileitemplugin/FileItemLinkingPluginActionLoader.h | 4 ++-- + 3 files changed, 10 insertions(+), 5 deletions(-) + +diff --git a/src/workspace/fileitemplugin/FileItemLinkingPlugin.cpp b/src/workspace/fileitemplugin/FileItemLinkingPlugin.cpp +index a887132..f3f6dde 100644 +--- a/src/workspace/fileitemplugin/FileItemLinkingPlugin.cpp ++++ b/src/workspace/fileitemplugin/FileItemLinkingPlugin.cpp +@@ -124,7 +124,7 @@ void FileItemLinkingPlugin::Private::loadAllActions() + setActions({ action }); + + } else if (!loaded) { +- auto loader = new FileItemLinkingPluginActionLoader(items); ++ auto loader = FileItemLinkingPluginActionLoader::create(items); + + static FileItemLinkingPluginActionStaticInit init; + +diff --git a/src/workspace/fileitemplugin/FileItemLinkingPluginActionLoader.cpp b/src/workspace/fileitemplugin/FileItemLinkingPluginActionLoader.cpp +index 3343eb4..b35713d 100644 +--- a/src/workspace/fileitemplugin/FileItemLinkingPluginActionLoader.cpp ++++ b/src/workspace/fileitemplugin/FileItemLinkingPluginActionLoader.cpp +@@ -40,6 +40,13 @@ + + #include "common/dbus/common.h" + ++FileItemLinkingPluginActionLoader* FileItemLinkingPluginActionLoader::create(const KFileItemListProperties &items) ++{ ++ auto l = new FileItemLinkingPluginActionLoader(items); ++ connect(l, &QThread::finished, l, &QObject::deleteLater); ++ return l; ++} ++ + FileItemLinkingPluginActionLoader::FileItemLinkingPluginActionLoader( + const KFileItemListProperties &items) + : items(items) +@@ -150,8 +157,6 @@ void FileItemLinkingPluginActionLoader::run() + } + + emit result(actions); +- +- deleteLater(); + } + + Action +diff --git a/src/workspace/fileitemplugin/FileItemLinkingPluginActionLoader.h b/src/workspace/fileitemplugin/FileItemLinkingPluginActionLoader.h +index 50dccc5..5264a45 100644 +--- a/src/workspace/fileitemplugin/FileItemLinkingPluginActionLoader.h ++++ b/src/workspace/fileitemplugin/FileItemLinkingPluginActionLoader.h +@@ -33,8 +33,7 @@ class FileItemLinkingPluginActionLoader: public QThread { + Q_OBJECT + + public: +- FileItemLinkingPluginActionLoader(const KFileItemListProperties &items); +- ++ static FileItemLinkingPluginActionLoader* create(const KFileItemListProperties &items); + void run() Q_DECL_OVERRIDE; + + Action createAction(const QString &activity, bool link, +@@ -46,6 +45,7 @@ Q_SIGNALS: + void result(const ActionList &actions); + + private: ++ FileItemLinkingPluginActionLoader(const KFileItemListProperties &items); + KFileItemListProperties items; + KActivities::Consumer activities; + }; +-- +2.4.10 + diff --git a/kde-frameworks/kactivities/kactivities-5.19.0.ebuild b/kde-frameworks/kactivities/kactivities-5.19.0.ebuild new file mode 100644 index 000000000000..d9e765cb4b1f --- /dev/null +++ b/kde-frameworks/kactivities/kactivities-5.19.0.ebuild @@ -0,0 +1,39 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +inherit kde5 + +DESCRIPTION="Framework for working with KDE activities" +LICENSE="LGPL-2+" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="" + +RDEPEND=" + $(add_frameworks_dep kcmutils) + $(add_frameworks_dep kconfig) + $(add_frameworks_dep kconfigwidgets) + $(add_frameworks_dep kcoreaddons) + $(add_frameworks_dep kdbusaddons) + $(add_frameworks_dep kdeclarative) + $(add_frameworks_dep kglobalaccel) + $(add_frameworks_dep ki18n) + $(add_frameworks_dep kio) + $(add_frameworks_dep kservice) + $(add_frameworks_dep kwidgetsaddons) + $(add_frameworks_dep kwindowsystem) + $(add_frameworks_dep kxmlgui) + $(add_qt_dep qtdbus) + $(add_qt_dep qtdeclarative widgets) + $(add_qt_dep qtgui) + $(add_qt_dep qtsql) + $(add_qt_dep qtwidgets) + !<kde-base/kactivities-4.13.3-r1:4[-minimal(-)] +" +DEPEND="${RDEPEND} + >=dev-libs/boost-1.54 +" + +PATCHES=( "${FILESDIR}/${P}-crash.patch" ) |