epel9
Rex Dieter 8 years ago
parent ec5d09c073
commit adc4b22062

1
.gitignore vendored

@ -6,3 +6,4 @@
/plasma-desktop-5.8.3.tar.xz /plasma-desktop-5.8.3.tar.xz
/plasma-desktop-5.8.4.tar.xz /plasma-desktop-5.8.4.tar.xz
/plasma-desktop-5.8.5.tar.xz /plasma-desktop-5.8.5.tar.xz
/plasma-desktop-5.8.6.tar.xz

@ -1,17 +0,0 @@
diff -up plasma-desktop-5.8.5/containments/desktop/plugins/folder/foldermodel.cpp.than plasma-desktop-5.8.5/containments/desktop/plugins/folder/foldermodel.cpp
--- plasma-desktop-5.8.5/containments/desktop/plugins/folder/foldermodel.cpp.than 2017-02-13 17:02:37.079245114 +0100
+++ plasma-desktop-5.8.5/containments/desktop/plugins/folder/foldermodel.cpp 2017-02-13 17:46:04.152443288 +0100
@@ -509,7 +509,12 @@ void FolderModel::run(int row)
url.setScheme(QStringLiteral("file"));
}
- new KRun(url, 0);
+ KRun *run = new KRun(url, 0);
+ // On desktop:/ we want to be able to run .desktop files right away,
+ // otherwise ask for security reasons. We also don't use the targetUrl()
+ // from above since we don't want the resolved /home/foo/Desktop URL.
+ run->setShowScriptExecutionPrompt(item.url().scheme() != QLatin1String("desktop")
+ || item.url().adjusted(QUrl::RemoveFilename).path() != QLatin1String("/"));
}
void FolderModel::rename(int row, const QString& name)

@ -3,8 +3,8 @@
Name: plasma-desktop Name: plasma-desktop
Summary: Plasma Desktop shell Summary: Plasma Desktop shell
Version: 5.8.5 Version: 5.8.6
Release: 4%{?dist} Release: 1%{?dist}
License: GPLv2+ and (GPLv2 or GPLv3) License: GPLv2+ and (GPLv2 or GPLv3)
URL: https://quickgit.kde.org/?p=%{name}.git URL: https://quickgit.kde.org/?p=%{name}.git
@ -24,12 +24,6 @@ Source0: http://download.kde.org/%{stable}/plasma/%{version}/%{name}-%{version}.
Patch100: plasma-desktop-5.8-default_favorites.patch Patch100: plasma-desktop-5.8-default_favorites.patch
## upstream patches ## upstream patches
#
# Folder view should honor kiorc settings
# https://bugs.kde.org/show_bug.cgi?id=375793
Patch200: plasma-desktop-folderview-security.patch
## upstream patches (master branch)
## upstreamable patches ## upstreamable patches
# fix error: 'placeholders' is not a namespace-name with gcc-7 # fix error: 'placeholders' is not a namespace-name with gcc-7
@ -336,6 +330,9 @@ fi
%changelog %changelog
* Tue Feb 21 2017 Rex Dieter <rdieter@fedoraproject.org> - 5.8.6-1
- 5.8.6
* Mon Feb 13 2017 Than Ngo <than@redhat.com> - 5.8.5-4 * Mon Feb 13 2017 Than Ngo <than@redhat.com> - 5.8.5-4
- backport upstream to security issue - backport upstream to security issue
honor the setting for prompting when executing executable files on the desktop honor the setting for prompting when executing executable files on the desktop

@ -1 +1 @@
SHA512 (plasma-desktop-5.8.5.tar.xz) = d8ef41f5e2a041de04f353e04274062ca4be069ffe88b5cfb0c9a2e5b1395631a8adaf0fda50a784a61a2585c0a503d84730a8c2df844aba71e894bd1f17915e SHA512 (plasma-desktop-5.8.6.tar.xz) = 703dcc555da6c609f858185468694d2c204478d2c7c5822ebfc57a7153899e57e81ce7ab0b2533f30e3e1a3c20bb358f63c5ff26f833b0bf4ab3bc5dec283f7e

Loading…
Cancel
Save