Hello community, here is the log from the commit of package plasma5-desktop for openSUSE:Factory checked in at 2017-02-08 10:49:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/plasma5-desktop (Old) and /work/SRC/openSUSE:Factory/.plasma5-desktop.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "plasma5-desktop" Changes: -------- --- /work/SRC/openSUSE:Factory/plasma5-desktop/plasma5-desktop.changes 2017-02-03 18:56:05.964476072 +0100 +++ /work/SRC/openSUSE:Factory/.plasma5-desktop.new/plasma5-desktop.changes 2017-02-08 10:49:34.598950920 +0100 @@ -1,0 +2,13 @@ +Thu Feb 2 10:50:45 UTC 2017 - [email protected] + +- use individual libboost-*-devel packages instead of boost-devel + +------------------------------------------------------------------- +Tue Jan 31 22:09:24 UTC 2017 - [email protected] + +- Add patch to fix prompt for executing files in folderview containment: + * boo#1022904, kde#375793 + * 0001-Folder-View-show-script-execution-prompt-when-clicki.patch + * 0002-Folder-View-Open-selection-in-preferred-application-.patch + +------------------------------------------------------------------- New: ---- 0001-Folder-View-show-script-execution-prompt-when-clicki.patch 0002-Folder-View-Open-selection-in-preferred-application-.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ plasma5-desktop.spec ++++++ --- /var/tmp/diff_new_pack.Vbrzj9/_old 2017-02-08 10:49:35.282855611 +0100 +++ /var/tmp/diff_new_pack.Vbrzj9/_new 2017-02-08 10:49:35.286855054 +0100 @@ -32,8 +32,16 @@ Url: http://www.kde.org/ Source: plasma-desktop-%{version}.tar.xz # PATCHES 100-200 and above are from upstream 5.9 branch +# PATCH-FIX-UPSTREAM 0001-Folder-View-show-script-execution-prompt-when-clicki.patch [email protected] -- [Folder View] show script execution prompt when clicking item +Patch100: 0001-Folder-View-show-script-execution-prompt-when-clicki.patch +# PATCH-FIX-UPSTREAM 0002-Folder-View-Open-selection-in-preferred-application-.patch [email protected] -- [Folder View] Open selection in preferred application instead of running them +Patch101: 0002-Folder-View-Open-selection-in-preferred-application-.patch # PATCHES 201-300 and above are from upstream master/5.10 branch +%if 0%{?suse_version} > 1325 +BuildRequires: libboost_headers-devel +%else BuildRequires: boost-devel +%endif BuildRequires: extra-cmake-modules >= 1.8.0 BuildRequires: fdupes BuildRequires: glib2-devel @@ -169,6 +177,8 @@ %lang_package %prep %setup -q -n plasma-desktop-%{version} +%patch100 -p1 +%patch101 -p1 %build %cmake_kf5 -d build -- -DCMAKE_INSTALL_LOCALEDIR=%{_kf5_localedir} ++++++ 0001-Folder-View-show-script-execution-prompt-when-clicki.patch ++++++ >From 771e57f3b2c19f4e6f867c01c2457ec87531b4cf Mon Sep 17 00:00:00 2001 From: Kai Uwe Broulik <[email protected]> Date: Tue, 31 Jan 2017 15:07:42 +0100 Subject: [PATCH 1/2] [Folder View] show script execution prompt when clicking item When clicking a file in FolderView, we should ask for whether to open or run a script depending on user settings. This is what Dolphin does. BUG: 375793 FIXED-IN: 5.8.6 Differential Revision: https://phabricator.kde.org/D4367 --- containments/desktop/plugins/folder/foldermodel.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) Index: plasma-desktop-5.9.0/containments/desktop/plugins/folder/foldermodel.cpp =================================================================== --- plasma-desktop-5.9.0.orig/containments/desktop/plugins/folder/foldermodel.cpp +++ plasma-desktop-5.9.0/containments/desktop/plugins/folder/foldermodel.cpp @@ -523,7 +523,8 @@ void FolderModel::run(int row) url.setScheme(QStringLiteral("file")); } - new KRun(url, 0); + KRun *run = new KRun(url, 0); + run->setShowScriptExecutionPrompt(true); } void FolderModel::runSelected() ++++++ 0002-Folder-View-Open-selection-in-preferred-application-.patch ++++++ >From bb1d73a99f0cfddae6befb4e14312ebb9c9fe30e Mon Sep 17 00:00:00 2001 From: Kai Uwe Broulik <[email protected]> Date: Tue, 31 Jan 2017 15:55:15 +0100 Subject: [PATCH 2/2] [Folder View] Open selection in preferred application instead of running them This makes it consistent with Dolphin which will run scripts only if one is selected. If multiple are selected, they are opened in their preferred associated application (e.g. Kate) instead. I also removed the restriction on opening folders when only one item is selected. CCBUG: 375793 Differential Revision: https://phabricator.kde.org/D4368 --- containments/desktop/plugins/folder/foldermodel.cpp | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/containments/desktop/plugins/folder/foldermodel.cpp b/containments/desktop/plugins/folder/foldermodel.cpp index dd1d4736..970d7c8a 100644 --- a/containments/desktop/plugins/folder/foldermodel.cpp +++ b/containments/desktop/plugins/folder/foldermodel.cpp @@ -533,14 +533,22 @@ void FolderModel::runSelected() return; } - bool unarySelection = (m_selectionModel->selectedIndexes().count() == 1); + if (m_selectionModel->selectedIndexes().count() == 1) { + run(m_selectionModel->selectedIndexes().constFirst().row()); + return; + } + + KFileItemActions fileItemActions(this); + KFileItemList items; foreach (const QModelIndex &index, m_selectionModel->selectedIndexes()) { // Skip over directories. - if (!unarySelection && !index.data(IsDirRole).toBool()) { - run(index.row()); + if (!index.data(IsDirRole).toBool()) { + items << itemForIndex(index); } } + + fileItemActions.runPreferredApplications(items, QString()); } void FolderModel::rename(int row, const QString& name) -- 2.11.0
