pool/kactivities5
SHA256
12
0
Fork 1
Code Issues Pull Requests Activity

Accepting request 382227 from KDE:Frameworks5

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/382227
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kactivities5?expand=0&rev=26
This commit is contained in:
Dominique Leuenberger
2016-04-07 11:31:44 +00:00
committed by Git OBS Bridge
parent be38f3fd4f 4c3039a320
commit b513cfe97b
5 changed files with 33 additions and 141 deletions
Download Patch File Download Diff File Expand all files Collapse all files

82
fix-crash-in-activities-context-menu.patch
View File

@@ -1,82 +0,0 @@
From: David Edmundson <david@davidedmundson.co.uk>
Date: Sat, 06 Feb 2016 18:02:53 +0000
Subject: Fix crash in activities context menu
X-Git-Url: http://quickgit.kde.org/?p=kactivities.git&a=commitdiff&h=b3c8ad1ad48d65ea77724f94073909dc8ab97596
---
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
---
--- a/src/workspace/fileitemplugin/FileItemLinkingPlugin.cpp
+++ b/src/workspace/fileitemplugin/FileItemLinkingPlugin.cpp
@@ -124,7 +124,7 @@
setActions({ action });
} else if (!loaded) {
- auto loader = new FileItemLinkingPluginActionLoader(items);
+ auto loader = FileItemLinkingPluginActionLoader::create(items);
static FileItemLinkingPluginActionStaticInit init;
--- a/src/workspace/fileitemplugin/FileItemLinkingPluginActionLoader.cpp
+++ b/src/workspace/fileitemplugin/FileItemLinkingPluginActionLoader.cpp
@@ -39,6 +39,13 @@
#include <KLocalizedString>
#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)
@@ -150,8 +157,6 @@
}
emit result(actions);
-
- deleteLater();
}
Action
--- a/src/workspace/fileitemplugin/FileItemLinkingPluginActionLoader.h
+++ b/src/workspace/fileitemplugin/FileItemLinkingPluginActionLoader.h
@@ -33,8 +33,7 @@
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 @@
void result(const ActionList &actions);
private:
+ FileItemLinkingPluginActionLoader(const KFileItemListProperties &items);
KFileItemListProperties items;
KActivities::Consumer activities;
};

3
kactivities-5.19.0.tar.xz
View File

@@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:43cff33c5c4a232206bf6ffdaa1ea3f50e40339e4568a7376992fc61970eb47a
size 151552

3
kactivities-5.20.0.tar.xz Normal file
View File

@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:5b0a664f77749c441d61417f9dce5cb8a11668f7e7db1a7613378f555dac3795
size 67280

20
kactivities5.changes
View File

@@ -1,3 +1,23 @@
-------------------------------------------------------------------
Sun Mar 6 09:54:26 UTC 2016 - hrvoje.senjan@gmail.com
- Update to 5.20.0 (boo#970856)
* Remove dependency on Qt5::Widgets
* Remove dependency on KDBusAddons
* Remove dependency on KI18n
* Remove unused includes
* Shell scripts output improved
* Added the data model (ActivitiesModel) showing the activities
to the library
* Build only the library by default
* Remove the service and workspace components from the build
* Move the library into src/lib from src/lib/core
* Fix CMake warning
* Fix crash in activities context menu (boo#952139, kde#351485)
* For more details please see:
https://www.kde.org/announcements/kde-frameworks-5.20.0.php
- Drop upstreamed fix-crash-in-activities-context-menu.patch
-------------------------------------------------------------------
Sun Feb 7 05:32:00 UTC 2016 - wbauer@tmo.at

66
kactivities5.spec
View File

@@ -16,11 +16,10 @@
#
%bcond_without lang
%define lname libKF5Activities5
%define _tar_path 5.19
%define _tar_path 5.20
Name: kactivities5
Version: 5.19.0
Version: 5.20.0
Release: 0
%define kf5_version %{version}
Summary: KDE Plasma Activities support
@@ -29,25 +28,16 @@ Group: System/GUI/KDE
Url: http://projects.kde.org/kactivities
Source: http://download.kde.org/stable/frameworks/%{_tar_path}/kactivities-%{version}.tar.xz
Source1: baselibs.conf
# PATCH-FIX-UPSTREAM fix-crash-in-activities-context-menu.patch boo#952139, kde#351485 -- fixes a dolphin and desktop crash when right-clicking on a file and opening the "Activities" submenu
Patch: fix-crash-in-activities-context-menu.patch
BuildRequires: boost-devel >= 1.49.0
BuildRequires: boost-devel
BuildRequires: cmake >= 2.8.12
BuildRequires: extra-cmake-modules >= %{_tar_path}
BuildRequires: fdupes
BuildRequires: kcmutils-devel >= %{_tar_path}
BuildRequires: kconfig-devel >= %{_tar_path}
BuildRequires: kcoreaddons-devel >= %{_tar_path}
BuildRequires: kdbusaddons-devel >= %{_tar_path}
BuildRequires: kdeclarative-devel >= %{_tar_path}
BuildRequires: kf5-filesystem
BuildRequires: kglobalaccel-devel >= %{_tar_path}
BuildRequires: ki18n-devel >= %{_tar_path}
BuildRequires: kio-devel >= %{_tar_path}
BuildRequires: kservice-devel >= %{_tar_path}
BuildRequires: kwindowsystem-devel >= %{_tar_path}
BuildRequires: kxmlgui-devel >= %{_tar_path}
BuildRequires: xz
BuildRequires: cmake(KF5Config) >= %{_tar_path}
BuildRequires: cmake(KF5CoreAddons) >= %{_tar_path}
BuildRequires: cmake(KF5KIO) >= %{_tar_path}
BuildRequires: cmake(KF5WindowSystem) >= %{_tar_path}
BuildRequires: cmake(Qt5Core) >= 5.3.0
BuildRequires: cmake(Qt5DBus) >= 5.3.0
BuildRequires: cmake(Qt5Gui) >= 5.3.0
@@ -55,12 +45,6 @@ BuildRequires: cmake(Qt5Qml) >= 5.3.0
BuildRequires: cmake(Qt5Quick) >= 5.3.0
BuildRequires: cmake(Qt5Sql) >= 5.3.0
BuildRequires: cmake(Qt5Test) >= 5.3.0
BuildRequires: cmake(Qt5Widgets) >= 5.3.0
Recommends: %{name}-imports = %{version}
# for kactivitymanagerd_plugin_sqlite.so
Recommends: libQt5Sql5-sqlite
Provides: kactivities4 = %{version}
Obsoletes: kactivities4 < %{version}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -69,9 +53,6 @@ Kactivities provides an API for using and interacting with the Plasma Activities
%package -n %lname
Summary: Library for KDE's Plasma Activities support
Group: System/GUI/KDE
%if %{with lang}
Recommends: %lname-lang = %{version}
%endif
%description -n %lname
Kactivities provides an API for using and interacting with the Plasma Activities Manager.
@@ -95,56 +76,29 @@ Requires: cmake(Qt5Core) >= 5.3.0
Kactivities provides an API for using and interacting with the Plasma Activities Manager.
Development files.
%lang_package -n %lname
%prep
%setup -q -n kactivities-%{version}
%patch -p1
%build
%if 0%{?suse_version} == 1310
%cmake_kf5 -d build -- -DKACTIVITIES_ENABLE_EXCEPTIONS=ON
%else
%cmake_kf5 -d build
%endif
%make_jobs
%install
%kf5_makeinstall -C build
%fdupes %{buildroot}
%if %{with lang}
%find_lang %{name}
%endif
%post -n %lname -p /sbin/ldconfig
%postun -n %lname -p /sbin/ldconfig
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
%if %{with lang}
%files -n %lname-lang -f %{name}.lang
%endif
%files
%defattr(-,root,root)
%{_kf5_bindir}/kactivitymanagerd
%{_kf5_libdir}/libkactivitymanagerd_plugin.so
%{_kf5_plugindir}/
%{_kf5_servicesdir}/
%{_kf5_servicetypesdir}/
%{_kf5_datadir}/
%files -n %lname
%defattr(-,root,root,-)
%{_kf5_libdir}/libKF5Activities.so.*
%files imports
%defattr(-,root,root)
%{_kf5_qmldir}/
%files -n %lname
%defattr(-,root,root,-)
%{_kf5_libdir}/libKF5Activities.so.*
%files devel
%defattr(-,root,root)
%{_kf5_libdir}/libKF5Activities.so