summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2021-06-06 19:03:28 +0200
committerAndreas Sturmlechner <asturm@gentoo.org>2021-06-10 17:29:22 +0200
commit017f80e86263d21cd7504d2dc17443e4be11eab5 (patch)
tree3043395f25389a431ddae136d1b060ce058645fd /kde-frameworks/kio/files
parentkde-frameworks/kinit: drop 5.80.0* (diff)
downloadgentoo-017f80e86263d21cd7504d2dc17443e4be11eab5.tar.gz
gentoo-017f80e86263d21cd7504d2dc17443e4be11eab5.tar.bz2
gentoo-017f80e86263d21cd7504d2dc17443e4be11eab5.zip
kde-frameworks/kio: Drop 5.80.1-r2
Package-Manager: Portage-3.0.19, Repoman-3.0.3 Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'kde-frameworks/kio/files')
-rw-r--r--kde-frameworks/kio/files/kio-5.80.1-MimeTypeFinderJob-file.so.patch30
-rw-r--r--kde-frameworks/kio/files/kio-5.80.1-fix-crash-in-ThumbnailProtocol.patch104
-rw-r--r--kde-frameworks/kio/files/kio-5.80.1-fix-create-files-on-ftp.patch26
-rw-r--r--kde-frameworks/kio/files/kio-5.80.1-gcc11-include-order.patch36
4 files changed, 0 insertions, 196 deletions
diff --git a/kde-frameworks/kio/files/kio-5.80.1-MimeTypeFinderJob-file.so.patch b/kde-frameworks/kio/files/kio-5.80.1-MimeTypeFinderJob-file.so.patch
deleted file mode 100644
index a25898fb88b..00000000000
--- a/kde-frameworks/kio/files/kio-5.80.1-MimeTypeFinderJob-file.so.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 05e1090603ca81eb54a23febe41a8823a0e7d572 Mon Sep 17 00:00:00 2001
-From: David Faure <faure@kde.org>
-Date: Tue, 23 Mar 2021 00:29:31 +0100
-Subject: [PATCH] MimeTypeFinderJob: don't put job on hold for local files
-
-Fixes: 434455
----
- src/core/mimetypefinderjob.cpp | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/src/core/mimetypefinderjob.cpp b/src/core/mimetypefinderjob.cpp
-index 147f3aa9a..f5e50cdc4 100644
---- a/src/core/mimetypefinderjob.cpp
-+++ b/src/core/mimetypefinderjob.cpp
-@@ -241,8 +241,10 @@ void KIO::MimeTypeFinderJobPrivate::scanFileWithGet()
- m_suggestedFileName = job->queryMetaData(QStringLiteral("content-disposition-filename"));
- }
-
-- job->putOnHold();
-- KIO::Scheduler::publishSlaveOnHold();
-+ if (!m_url.isLocalFile()) { // #434455
-+ job->putOnHold();
-+ KIO::Scheduler::publishSlaveOnHold();
-+ }
- q->emitResult();
- });
- }
---
-GitLab
-
diff --git a/kde-frameworks/kio/files/kio-5.80.1-fix-crash-in-ThumbnailProtocol.patch b/kde-frameworks/kio/files/kio-5.80.1-fix-crash-in-ThumbnailProtocol.patch
deleted file mode 100644
index 059c9f82424..00000000000
--- a/kde-frameworks/kio/files/kio-5.80.1-fix-crash-in-ThumbnailProtocol.patch
+++ /dev/null
@@ -1,104 +0,0 @@
-From a68cb73c4e071ed24b18a95e11fbbbc8d59840b4 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?M=C3=A9ven=20Car?= <meven29@gmail.com>
-Date: Sun, 21 Mar 2021 05:22:57 +0100
-Subject: [PATCH] PreviewJob: Initialize cachesSize with 0, only pass size > 0
- to shmget, improve createThumbnail
-
-BUG: 430862
----
- src/widgets/previewjob.cpp | 48 +++++++++++++++++++++++---------------
- 1 file changed, 29 insertions(+), 19 deletions(-)
-
-diff --git a/src/widgets/previewjob.cpp b/src/widgets/previewjob.cpp
-index 988da16b0..9b6e661e8 100644
---- a/src/widgets/previewjob.cpp
-+++ b/src/widgets/previewjob.cpp
-@@ -70,7 +70,7 @@ public:
- : initialItems(items)
- , width(size.width())
- , height(size.height())
-- , cacheSize(-1)
-+ , cacheSize(0)
- , bScale(true)
- , bSave(true)
- , ignoreMaximumSize(false)
-@@ -114,8 +114,8 @@ public:
- // Size of thumbnail
- int width;
- int height;
-- // Unscaled size of thumbnail (128 or 256 if cache is enabled)
-- int cacheSize;
-+ // Unscaled size of thumbnail (128, 256 or 512 if cache is enabled)
-+ ushort cacheSize;
- // Whether the thumbnail should be scaled
- bool bScale;
- // Whether we should save the thumbnail
-@@ -712,39 +712,49 @@ void PreviewJobPrivate::createThumbnail(const QString &pixPath)
- });
-
- bool save = bSave && currentItem.plugin->property(QStringLiteral("CacheThumbnail")).toBool() && !sequenceIndex;
-+ int thumb_width = width;
-+ int thumb_height = height;
-+ int thumb_iconSize = iconSize;
-+ if (save) {
-+ thumb_width = thumb_height = cacheSize;
-+ thumb_iconSize = 64;
-+ }
-+
- job->addMetaData(QStringLiteral("mimeType"), currentItem.item.mimetype());
-- job->addMetaData(QStringLiteral("width"), QString().setNum(save ? cacheSize : width));
-- job->addMetaData(QStringLiteral("height"), QString().setNum(save ? cacheSize : height));
-- job->addMetaData(QStringLiteral("iconSize"), QString().setNum(save ? 64 : iconSize));
-- job->addMetaData(QStringLiteral("iconAlpha"), QString().setNum(iconAlpha));
-+ job->addMetaData(QStringLiteral("width"), QString::number(thumb_width));
-+ job->addMetaData(QStringLiteral("height"), QString::number(thumb_height));
-+ job->addMetaData(QStringLiteral("iconSize"), QString::number(thumb_iconSize));
-+ job->addMetaData(QStringLiteral("iconAlpha"), QString::number(iconAlpha));
- job->addMetaData(QStringLiteral("plugin"), currentItem.plugin->library());
- job->addMetaData(QStringLiteral("enabledPlugins"), enabledPlugins.join(QLatin1Char(',')));
- job->addMetaData(QStringLiteral("devicePixelRatio"), QString::number(devicePixelRatio));
- if (sequenceIndex) {
-- job->addMetaData(QStringLiteral("sequence-index"), QString().setNum(sequenceIndex));
-+ job->addMetaData(QStringLiteral("sequence-index"), QString::number(sequenceIndex));
- }
-
- #if WITH_SHM
- if (shmid == -1) {
- if (shmaddr) {
-+ // clean previous shared memory segment
- shmdt((char *)shmaddr);
- shmctl(shmid, IPC_RMID, nullptr);
-+ shmaddr = nullptr;
- }
-- auto size = std::max(cacheSize * cacheSize, width * height);
-- shmid = shmget(IPC_PRIVATE, size * 4 * devicePixelRatio * devicePixelRatio, IPC_CREAT | 0600);
-- if (shmid != -1) {
-- shmaddr = (uchar *)(shmat(shmid, nullptr, SHM_RDONLY));
-- if (shmaddr == (uchar *)-1) {
-- shmctl(shmid, IPC_RMID, nullptr);
-- shmaddr = nullptr;
-- shmid = -1;
-+ auto size = thumb_width * thumb_height;
-+ if (size > 0) {
-+ shmid = shmget(IPC_PRIVATE, size * 4 * devicePixelRatio * devicePixelRatio, IPC_CREAT | 0600);
-+ if (shmid != -1) {
-+ shmaddr = (uchar *)(shmat(shmid, nullptr, SHM_RDONLY));
-+ if (shmaddr == (uchar *)-1) {
-+ shmctl(shmid, IPC_RMID, nullptr);
-+ shmaddr = nullptr;
-+ shmid = -1;
-+ }
- }
-- } else {
-- shmaddr = nullptr;
- }
- }
- if (shmid != -1) {
-- job->addMetaData(QStringLiteral("shmid"), QString().setNum(shmid));
-+ job->addMetaData(QStringLiteral("shmid"), QString::number(shmid));
- }
- #endif
- }
---
-GitLab
-
diff --git a/kde-frameworks/kio/files/kio-5.80.1-fix-create-files-on-ftp.patch b/kde-frameworks/kio/files/kio-5.80.1-fix-create-files-on-ftp.patch
deleted file mode 100644
index cece0096529..00000000000
--- a/kde-frameworks/kio/files/kio-5.80.1-fix-create-files-on-ftp.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 71c7420e4b33b4bace8ed6d4fa45fa5e281d38bd Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?M=C3=A9ven=20Car?= <meven.car@enioka.com>
-Date: Sat, 27 Mar 2021 11:00:07 +0100
-Subject: [PATCH] KNewFileMenu: use destination side to stat destination
-
-BUG: 429541
----
- src/filewidgets/knewfilemenu.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/filewidgets/knewfilemenu.cpp b/src/filewidgets/knewfilemenu.cpp
-index 64c4b1c2e..48fdf8622 100644
---- a/src/filewidgets/knewfilemenu.cpp
-+++ b/src/filewidgets/knewfilemenu.cpp
-@@ -1242,7 +1242,7 @@ void KNewFileMenuPrivate::_k_slotTextChanged(const QString &text)
- } else {
- url = QUrl(m_baseUrl.toString() + QLatin1Char('/') + text);
- }
-- KIO::StatJob *job = KIO::statDetails(url, KIO::StatJob::StatSide::SourceSide, KIO::StatDetail::StatBasic);
-+ KIO::StatJob *job = KIO::statDetails(url, KIO::StatJob::StatSide::DestinationSide, KIO::StatDetail::StatBasic);
- QObject::connect(job, &KJob::result, q, [this](KJob *job) {
- _k_slotStatResult(job);
- });
---
-GitLab
-
diff --git a/kde-frameworks/kio/files/kio-5.80.1-gcc11-include-order.patch b/kde-frameworks/kio/files/kio-5.80.1-gcc11-include-order.patch
deleted file mode 100644
index e3675ce0234..00000000000
--- a/kde-frameworks/kio/files/kio-5.80.1-gcc11-include-order.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 493188b3d616f3223ccf3a41327a4c7e69282df8 Mon Sep 17 00:00:00 2001
-From: Ahmad Samir <a.samirh78@gmail.com>
-Date: Mon, 15 Mar 2021 14:29:42 +0200
-Subject: [PATCH] Fix #include's order
-
-According to[1] <limits> needs to be included first when building with
-GCC 11.
-
-[1] https://invent.kde.org/frameworks/kio/-/issues/3
-
-GIT_SILENT
----
- src/kntlm/des.cpp | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/kntlm/des.cpp b/src/kntlm/des.cpp
-index d90e6d21a..78c7a3fd2 100644
---- a/src/kntlm/des.cpp
-+++ b/src/kntlm/des.cpp
-@@ -26,11 +26,11 @@
-
- #include "des.h"
-
-+#include <limits> // This needs to be first with GCC 11
-+
- #include <qendian.h>
- #include <string.h>
-
--#include <limits>
--
- static void permute_ip(unsigned char *inblock, DES_KEY *key, unsigned char *outblock);
- static void permute_fp(unsigned char *inblock, DES_KEY *key, unsigned char *outblock);
- static void perminit_ip(DES_KEY *key);
---
-GitLab
-