summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2021-03-25 23:44:26 +0100
committerAndreas Sturmlechner <asturm@gentoo.org>2021-03-26 00:13:19 +0100
commitda142c953d5d2df787df3bacfb63856163d445ec (patch)
treede1c87ca4909f2de209a6de20be09b30617ac0b9 /kde-frameworks/kio/files
parentmedia-gfx/digikam: 7.2.0 version bump (diff)
downloadgentoo-da142c953d5d2df787df3bacfb63856163d445ec.tar.gz
gentoo-da142c953d5d2df787df3bacfb63856163d445ec.tar.bz2
gentoo-da142c953d5d2df787df3bacfb63856163d445ec.zip
kde-frameworks/kio: Fix kinit not terminating file.so, build w/ GCC-11
Upstream commits: 05e1090603ca81eb54a23febe41a8823a0e7d572 493188b3d616f3223ccf3a41327a4c7e69282df8 KDE-Bug: https://bugs.kde.org/show_bug.cgi?id=434455 Closes: https://bugs.gentoo.org/766480 Package-Manager: Portage-3.0.17, Repoman-3.0.2 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-gcc11-include-order.patch36
2 files changed, 66 insertions, 0 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
new file mode 100644
index 00000000000..a25898fb88b
--- /dev/null
+++ b/kde-frameworks/kio/files/kio-5.80.1-MimeTypeFinderJob-file.so.patch
@@ -0,0 +1,30 @@
+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-gcc11-include-order.patch b/kde-frameworks/kio/files/kio-5.80.1-gcc11-include-order.patch
new file mode 100644
index 00000000000..e3675ce0234
--- /dev/null
+++ b/kde-frameworks/kio/files/kio-5.80.1-gcc11-include-order.patch
@@ -0,0 +1,36 @@
+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
+