summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2017-09-12 15:29:40 +0200
committerAndreas Sturmlechner <asturm@gentoo.org>2017-09-12 22:32:55 +0200
commitd94e4d403a72074c80a12e088cfb2ed055669d76 (patch)
treeca9547cd2515508030ce07f6ac893e7fdd5c4b5d /kde-frameworks/kio/files
parentkde-frameworks/kirigami: Drop old (diff)
downloadgentoo-d94e4d403a72074c80a12e088cfb2ed055669d76.tar.gz
gentoo-d94e4d403a72074c80a12e088cfb2ed055669d76.tar.bz2
gentoo-d94e4d403a72074c80a12e088cfb2ed055669d76.zip
kde-frameworks: Drop KDE Frameworks 5.34.0
Except ECM which is required for hppa. Package-Manager: Portage-2.3.6, Repoman-2.3.1
Diffstat (limited to 'kde-frameworks/kio/files')
-rw-r--r--kde-frameworks/kio/files/kio-5.34.0-pie.patch62
-rw-r--r--kde-frameworks/kio/files/kio-5.34.0-previewjob1.patch64
-rw-r--r--kde-frameworks/kio/files/kio-5.34.0-previewjob2.patch35
3 files changed, 0 insertions, 161 deletions
diff --git a/kde-frameworks/kio/files/kio-5.34.0-pie.patch b/kde-frameworks/kio/files/kio-5.34.0-pie.patch
deleted file mode 100644
index 973f9550447..00000000000
--- a/kde-frameworks/kio/files/kio-5.34.0-pie.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-commit 4122b52fee540f6b7cdd8fde2f55e2f7c2673b1a
-Author: Fabian Vogt <fabian@ritter-vogt.de>
-Date: Sun May 28 14:49:03 2017 +0200
-
- 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
-
- Reviewed By: dfaure
-
- Subscribers: asturmlechner, #frameworks
-
- Tags: #frameworks
-
- Differential Revision: https://phabricator.kde.org/D6002
-
-diff --git a/src/widgets/krun.cpp b/src/widgets/krun.cpp
-index 399ca975..2a9b563a 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,8 @@ bool KRun::isExecutable(const QString &serviceType)
- {
- return (serviceType == QLatin1String("application/x-desktop") ||
- serviceType == QLatin1String("application/x-executable") ||
-+ /* See https://bugs.freedesktop.org/show_bug.cgi?id=97226 */
-+ 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 2d167fc8..1012fb2b 100644
---- a/src/widgets/krun.h
-+++ b/src/widgets/krun.h
-@@ -436,7 +436,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
diff --git a/kde-frameworks/kio/files/kio-5.34.0-previewjob1.patch b/kde-frameworks/kio/files/kio-5.34.0-previewjob1.patch
deleted file mode 100644
index 87ba27d807f..00000000000
--- a/kde-frameworks/kio/files/kio-5.34.0-previewjob1.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From 78c45a1ea0e28a98f34c6d113c807f14700b22d4 Mon Sep 17 00:00:00 2001
-From: David Faure <faure@kde.org>
-Date: Sun, 14 May 2017 15:40:02 +0200
-Subject: [PATCH 1/2] PreviewJob: clean up empty temp file when get() fails.
-
-(e.g. because it's a directory)
-
-CCBUG: 208625
----
- src/widgets/previewjob.cpp | 17 +++++++++++++----
- 1 file changed, 13 insertions(+), 4 deletions(-)
-
-diff --git a/src/widgets/previewjob.cpp b/src/widgets/previewjob.cpp
-index 9eae3469..e836f7da 100644
---- a/src/widgets/previewjob.cpp
-+++ b/src/widgets/previewjob.cpp
-@@ -143,6 +143,7 @@ public:
- void getOrCreateThumbnail();
- bool statResultThumbnail();
- void createThumbnail(const QString &);
-+ void cleanupTempFile();
- void determineNextFile();
- void emitPreview(const QImage &thumb);
-
-@@ -409,6 +410,16 @@ void PreviewJob::setIgnoreMaximumSize(bool ignoreSize)
- d_func()->ignoreMaximumSize = ignoreSize;
- }
-
-+void PreviewJobPrivate::cleanupTempFile()
-+{
-+ if (!tempName.isEmpty()) {
-+ Q_ASSERT(!QFileInfo(tempName).isDir());
-+ Q_ASSERT(QFileInfo(tempName).isFile());
-+ QFile::remove(tempName);
-+ tempName.clear();
-+ }
-+}
-+
- void PreviewJobPrivate::determineNextFile()
- {
- Q_Q(PreviewJob);
-@@ -491,6 +502,7 @@ void PreviewJob::slotResult(KJob *job)
- }
- case PreviewJobPrivate::STATE_GETORIG: {
- if (job->error()) {
-+ d->cleanupTempFile();
- d->determineNextFile();
- return;
- }
-@@ -499,10 +511,7 @@ void PreviewJob::slotResult(KJob *job)
- return;
- }
- case PreviewJobPrivate::STATE_CREATETHUMB: {
-- if (!d->tempName.isEmpty()) {
-- QFile::remove(d->tempName);
-- d->tempName.clear();
-- }
-+ d->cleanupTempFile();
- d->determineNextFile();
- return;
- }
---
-2.13.0
-
diff --git a/kde-frameworks/kio/files/kio-5.34.0-previewjob2.patch b/kde-frameworks/kio/files/kio-5.34.0-previewjob2.patch
deleted file mode 100644
index fab4d8825f4..00000000000
--- a/kde-frameworks/kio/files/kio-5.34.0-previewjob2.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 1620032772465be475ae0746aff63a566ef2a546 Mon Sep 17 00:00:00 2001
-From: David Faure <faure@kde.org>
-Date: Sun, 14 May 2017 15:48:33 +0200
-Subject: [PATCH 2/2] PreviewJob: skip remote directories. Too expensive to
- preview.
-
-For some protocols, file_copy() would end up copying the whole
-directory locally!
-
-FIXED-IN: 5.35
-BUG: 208625
----
- src/widgets/previewjob.cpp | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/src/widgets/previewjob.cpp b/src/widgets/previewjob.cpp
-index e836f7da..da50b219 100644
---- a/src/widgets/previewjob.cpp
-+++ b/src/widgets/previewjob.cpp
-@@ -599,6 +599,12 @@ void PreviewJobPrivate::getOrCreateThumbnail()
- createThumbnail(fileUrl.toString());
- return;
- }
-+ if (item.isDir()) {
-+ // Skip remote dirs (bug 208625)
-+ cleanupTempFile();
-+ determineNextFile();
-+ return;
-+ }
- // No plugin support access to this remote content, copy the file
- // to the local machine, then create the thumbnail
- state = PreviewJobPrivate::STATE_GETORIG;
---
-2.13.0
-