Accepting request 502952 from KDE:Frameworks5

KDE Frameworks 5.35

OBS-URL: https://build.opensuse.org/request/show/502952
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kio?expand=0&rev=49
This commit is contained in:
Dominique Leuenberger 2017-07-05 21:51:15 +00:00 committed by Git OBS Bridge
commit 2ab9192224
5 changed files with 17 additions and 74 deletions

View File

@ -1,66 +0,0 @@
From 5fce5efdd5fc2e2f4f3a2b7e89ba230318c7d21a Mon Sep 17 00:00:00 2001
From: Fabian Vogt <fabian@ritter-vogt.de>
Date: Sun, 28 May 2017 14:49:03 +0200
Subject: [PATCH] Identify PIE binaries (application/x-sharedlib) as executable
files
Summary:
x86_64 binaries compiled with PIE are just shared objects with the
executable bit set. Without this patch, kio does not know that they
can be executed as well, causing "kioclient5 exec" to ask for an
application that can handle application/x-sharedlib.
BUG: 350018
Test Plan: Can run applications fine again.
Reviewers: dfaure, aacid
Subscribers: #frameworks
Tags: #frameworks
Differential Revision: https://phabricator.kde.org/D6002
---
src/widgets/krun.cpp | 4 +++-
src/widgets/krun.h | 2 +-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/widgets/krun.cpp b/src/widgets/krun.cpp
index 399ca975..35d894a7 100644
--- a/src/widgets/krun.cpp
+++ b/src/widgets/krun.cpp
@@ -139,7 +139,8 @@ bool KRun::isExecutableFile(const QUrl &url, const QString &mimetype)
#ifdef Q_OS_WIN
mimeType.inherits(QLatin1String("application/x-ms-dos-executable")) ||
#endif
- mimeType.inherits(QStringLiteral("application/x-executable-script"))
+ mimeType.inherits(QStringLiteral("application/x-executable-script")) ||
+ mimeType.inherits(QStringLiteral("application/x-sharedlib"))
) {
return true;
}
@@ -1438,6 +1439,7 @@ bool KRun::isExecutable(const QString &serviceType)
{
return (serviceType == QLatin1String("application/x-desktop") ||
serviceType == QLatin1String("application/x-executable") ||
+ serviceType == QLatin1String("application/x-sharedlib") ||
serviceType == QLatin1String("application/x-ms-dos-executable") ||
serviceType == QLatin1String("application/x-shellscript"));
}
diff --git a/src/widgets/krun.h b/src/widgets/krun.h
index 9885a838..f9069672 100644
--- a/src/widgets/krun.h
+++ b/src/widgets/krun.h
@@ -434,7 +434,7 @@ public:
* To be executable the file must pass the following rules:
* -# Must reside on the local filesystem.
* -# Must be marked as executable for the user by the filesystem.
- * -# The mime type must inherit application/x-executable or application/x-executable-script.
+ * -# The mime type must inherit application/x-executable, application/x-executable-script or application/x-sharedlib.
* To allow a script to run when the above rules are satisfied add the entry
* @code
* X-KDE-IsAlso=application/x-executable-script
--
2.13.0

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:6acb28de757a0d5eccb1e3e533a1ef22b5f5de92e96c3aba804ebdb44aa343c4
size 3082092

3
kio-5.35.0.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:4d2fb8d17addf69fc438558526accf5bf4edb3dbe24fbd87a4c097f8818ff235
size 3081392

View File

@ -1,3 +1,15 @@
-------------------------------------------------------------------
Sun Jun 11 09:27:43 CEST 2017 - lbeltrame@kde.org
- Update to 5.35.0
* New feature release
* For more details please see:
* https://www.kde.org/announcements/kde-frameworks-5.35.0.php
- Changes since 5.34.0:
* Too many changes to list here
- Dropped patches, now upstream:
* 0001-Identify-PIE-binaries-application-x-sharedlib-as-exe.patch
------------------------------------------------------------------- -------------------------------------------------------------------
Mon May 29 11:36:10 UTC 2017 - fabian@ritter-vogt.de Mon May 29 11:36:10 UTC 2017 - fabian@ritter-vogt.de

View File

@ -17,9 +17,9 @@
%bcond_without lang %bcond_without lang
%define _tar_path 5.34 %define _tar_path 5.35
Name: kio Name: kio
Version: 5.34.0 Version: 5.35.0
Release: 0 Release: 0
%define kf5_version %{version} %define kf5_version %{version}
BuildRequires: cmake >= 3.0 BuildRequires: cmake >= 3.0
@ -75,8 +75,6 @@ Source: http://download.kde.org/stable/frameworks/%{_tar_path}/%{name}-%
Source1: baselibs.conf Source1: baselibs.conf
# PATCH-FIX-OPENSUSE kio_help-fallback-to-kde4-docs.patch -- allow kio_help to see into kde4 documentation, needed especially for khelpcenter5 # PATCH-FIX-OPENSUSE kio_help-fallback-to-kde4-docs.patch -- allow kio_help to see into kde4 documentation, needed especially for khelpcenter5
Patch0: kio_help-fallback-to-kde4-docs.patch Patch0: kio_help-fallback-to-kde4-docs.patch
# PATCH-FIX-UPSTREAM
Patch2: 0001-Identify-PIE-binaries-application-x-sharedlib-as-exe.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description %description
@ -123,7 +121,6 @@ Development files.
%prep %prep
%setup -q %setup -q
%patch0 -p1 %patch0 -p1
%patch2 -p1
%build %build
%cmake_kf5 -d build %cmake_kf5 -d build