summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2021-04-06 14:14:11 +0200
committerAndreas Sturmlechner <asturm@gentoo.org>2021-04-11 16:23:00 +0200
commit81610521de144cef8396511ce080bc5fa0490cdc (patch)
treecb97b3fee4986979b564c85baf87f8c79169c595 /kde-frameworks/kio/files
parentkde-frameworks/kinit: drop 5.77.0* (diff)
downloadgentoo-81610521de144cef8396511ce080bc5fa0490cdc.tar.gz
gentoo-81610521de144cef8396511ce080bc5fa0490cdc.tar.bz2
gentoo-81610521de144cef8396511ce080bc5fa0490cdc.zip
kde-frameworks/kio: drop 5.77.0*
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'kde-frameworks/kio/files')
-rw-r--r--kde-frameworks/kio/files/kio-5.77.0-crashfix.patch29
-rw-r--r--kde-frameworks/kio/files/kio-5.77.0-fix-default-codec-not-usascii-1.patch36
-rw-r--r--kde-frameworks/kio/files/kio-5.77.0-fix-default-codec-not-usascii-2.patch100
-rw-r--r--kde-frameworks/kio/files/kio-5.77.0-gcc11.patch32
4 files changed, 0 insertions, 197 deletions
diff --git a/kde-frameworks/kio/files/kio-5.77.0-crashfix.patch b/kde-frameworks/kio/files/kio-5.77.0-crashfix.patch
deleted file mode 100644
index d24a0d976c0..00000000000
--- a/kde-frameworks/kio/files/kio-5.77.0-crashfix.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 9dc9e26b9196111eeacb5609b36957f74f5a14c4 Mon Sep 17 00:00:00 2001
-From: Ismael Asensio <isma.af@gmail.com>
-Date: Tue, 22 Dec 2020 22:23:17 +0100
-Subject: [PATCH] RenameDialog: Add missing nullptr initialization
-
-It fixes a crash when pressing `Apply to All` in those cases where
-the action was not present, as the code checks for nullptr
-
-BUG: 430374
-FIXED-IN: 5.78
----
- src/widgets/renamedialog.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/widgets/renamedialog.cpp b/src/widgets/renamedialog.cpp
-index ac1d91d2..c3e04753 100644
---- a/src/widgets/renamedialog.cpp
-+++ b/src/widgets/renamedialog.cpp
-@@ -161,6 +161,7 @@ public:
- bCancel = nullptr;
- bRename = bSkip = nullptr;
- bOverwrite = nullptr;
-+ bOverwriteWhenOlder = nullptr;
- bResume = bSuggestNewName = nullptr;
- bApplyAll = nullptr;
- m_pLineEdit = nullptr;
---
-GitLab
-
diff --git a/kde-frameworks/kio/files/kio-5.77.0-fix-default-codec-not-usascii-1.patch b/kde-frameworks/kio/files/kio-5.77.0-fix-default-codec-not-usascii-1.patch
deleted file mode 100644
index 8f589b796aa..00000000000
--- a/kde-frameworks/kio/files/kio-5.77.0-fix-default-codec-not-usascii-1.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 0a13e0a3e830be2b2b2e5c2c6cf8cef25bd68bd8 Mon Sep 17 00:00:00 2001
-From: Tusooa Zhu <tusooa@vista.aero>
-Date: Thu, 4 Feb 2021 08:36:26 -0500
-Subject: [PATCH] Fix default codec being set to "US-ASCII" in KIO apps
-
-From https://doc.qt.io/qt-5/qloggingcategory.html#Q_LOGGING_CATEGORY-1 :
-"The implicitly-defined QLoggingCategory object is created on first use,
-in a thread-safe manner."
-
-The original way to explicitly define a static QLoggingCategory will lead
-to a call to ucnv_getDefaultName() before QApplication constructor (where
-setlocale() is called), thus making QTextCodec::codecForLocale() misbehave.
-Here we replace the explicit definition with the Q_LOGGING_CATEGORY macro,
-and thus avoid this problem.
-
-BUG: 432406
----
- src/widgets/kdirmodel.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/widgets/kdirmodel.cpp b/src/widgets/kdirmodel.cpp
-index a48ab462..aa049e3d 100644
---- a/src/widgets/kdirmodel.cpp
-+++ b/src/widgets/kdirmodel.cpp
-@@ -36,7 +36,7 @@
- #include <qt_windows.h>
- #endif
-
--static QLoggingCategory category("kf.kio.widgets.kdirmodel", QtInfoMsg);
-+Q_LOGGING_CATEGORY(category, "kf.kio.widgets.kdirmodel", QtInfoMsg)
-
- class KDirModelNode;
- class KDirModelDirNode;
---
-GitLab
-
diff --git a/kde-frameworks/kio/files/kio-5.77.0-fix-default-codec-not-usascii-2.patch b/kde-frameworks/kio/files/kio-5.77.0-fix-default-codec-not-usascii-2.patch
deleted file mode 100644
index 90f4bb5b0a9..00000000000
--- a/kde-frameworks/kio/files/kio-5.77.0-fix-default-codec-not-usascii-2.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-From 423bea37e4bb06b9c04a62a9a91b720ec5d5e3d5 Mon Sep 17 00:00:00 2001
-From: Tusooa Zhu <tusooa@vista.aero>
-Date: Thu, 4 Feb 2021 18:06:23 -0500
-Subject: [PATCH] Use Q_LOGGING_CATEGORY macro instead of explicit
- QLoggingCategory
-
-Explicitly defining a QLoggingCategory will make QTextCodec::codecForLocale()
-misbehave, so we change it to Q_LOGGING_CATEGORY macro.
-
-CCBUG: 432406
----
- src/kpasswdserver/kpasswdserver.cpp | 2 +-
- src/urifilters/ikws/kuriikwsfilter.cpp | 2 +-
- src/urifilters/ikws/kuriikwsfiltereng.cpp | 2 +-
- src/urifilters/ikws/kurisearchfilter.cpp | 2 +-
- src/urifilters/localdomain/localdomainurifilter.cpp | 2 +-
- src/urifilters/shorturi/kshorturifilter.cpp | 2 +-
- 6 files changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/src/kpasswdserver/kpasswdserver.cpp b/src/kpasswdserver/kpasswdserver.cpp
-index 4ed73085..a832a0ab 100644
---- a/src/kpasswdserver/kpasswdserver.cpp
-+++ b/src/kpasswdserver/kpasswdserver.cpp
-@@ -28,7 +28,7 @@
- #include <QTimer>
- #include <ctime>
-
--static QLoggingCategory category("kf.kio.kpasswdserver", QtInfoMsg);
-+Q_LOGGING_CATEGORY(category, "kf.kio.kpasswdserver", QtInfoMsg)
-
- #define AUTHINFO_EXTRAFIELD_DOMAIN QStringLiteral("domain")
- #define AUTHINFO_EXTRAFIELD_ANONYMOUS QStringLiteral("anonymous")
-diff --git a/src/urifilters/ikws/kuriikwsfilter.cpp b/src/urifilters/ikws/kuriikwsfilter.cpp
-index 3a516fd8..bbc17678 100644
---- a/src/urifilters/ikws/kuriikwsfilter.cpp
-+++ b/src/urifilters/ikws/kuriikwsfilter.cpp
-@@ -22,7 +22,7 @@
- #define QL1C(x) QLatin1Char(x)
-
- namespace {
--QLoggingCategory category("kf.kio.urifilters.ikws", QtWarningMsg);
-+Q_LOGGING_CATEGORY(category, "kf.kio.urifilters.ikws", QtWarningMsg)
- }
-
- /**
-diff --git a/src/urifilters/ikws/kuriikwsfiltereng.cpp b/src/urifilters/ikws/kuriikwsfiltereng.cpp
-index 5b1bbc48..29647e3e 100644
---- a/src/urifilters/ikws/kuriikwsfiltereng.cpp
-+++ b/src/urifilters/ikws/kuriikwsfiltereng.cpp
-@@ -22,7 +22,7 @@
- #include <QLoggingCategory>
-
- namespace {
--QLoggingCategory category("kf.kio.urifilters.ikws", QtWarningMsg);
-+Q_LOGGING_CATEGORY(category, "kf.kio.urifilters.ikws", QtWarningMsg)
- }
-
- #define PDVAR(n, v) qCDebug(category) << n << " = '" << v << "'"
-diff --git a/src/urifilters/ikws/kurisearchfilter.cpp b/src/urifilters/ikws/kurisearchfilter.cpp
-index a12a9f59..669246c1 100644
---- a/src/urifilters/ikws/kurisearchfilter.cpp
-+++ b/src/urifilters/ikws/kurisearchfilter.cpp
-@@ -26,7 +26,7 @@
- K_PLUGIN_CLASS_WITH_JSON(KUriSearchFilter, "kurisearchfilter.json")
-
- namespace {
--QLoggingCategory category("kf.kio.urifilters.ikws", QtWarningMsg);
-+Q_LOGGING_CATEGORY(category, "kf.kio.urifilters.ikws", QtWarningMsg)
- }
-
- KUriSearchFilter::KUriSearchFilter(QObject *parent, const QVariantList &)
-diff --git a/src/urifilters/localdomain/localdomainurifilter.cpp b/src/urifilters/localdomain/localdomainurifilter.cpp
-index 862419a7..94a53606 100644
---- a/src/urifilters/localdomain/localdomainurifilter.cpp
-+++ b/src/urifilters/localdomain/localdomainurifilter.cpp
-@@ -20,7 +20,7 @@
- #define QL1S(x) QLatin1String(x)
-
- namespace {
--QLoggingCategory category("kf.kio.urifilters.localdomain", QtWarningMsg);
-+Q_LOGGING_CATEGORY(category, "kf.kio.urifilters.localdomain", QtWarningMsg)
- }
-
- /**
-diff --git a/src/urifilters/shorturi/kshorturifilter.cpp b/src/urifilters/shorturi/kshorturifilter.cpp
-index dc866e6c..62d810c4 100644
---- a/src/urifilters/shorturi/kshorturifilter.cpp
-+++ b/src/urifilters/shorturi/kshorturifilter.cpp
-@@ -27,7 +27,7 @@
- #include <KUser>
-
- namespace {
--QLoggingCategory category("kf.kio.urifilters.shorturi", QtWarningMsg);
-+Q_LOGGING_CATEGORY(category, "kf.kio.urifilters.shorturi", QtWarningMsg)
- }
-
- /**
---
-GitLab
-
diff --git a/kde-frameworks/kio/files/kio-5.77.0-gcc11.patch b/kde-frameworks/kio/files/kio-5.77.0-gcc11.patch
deleted file mode 100644
index 7432364a986..00000000000
--- a/kde-frameworks/kio/files/kio-5.77.0-gcc11.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 9965ec1b9e6f6db192a2355e4e3eb80bc27fc092 Mon Sep 17 00:00:00 2001
-From: Ahmad Samir <a.samirh78@gmail.com>
-Date: Sun, 24 Jan 2021 11:10:27 +0200
-Subject: [PATCH] Fix build with gcc11
-
-Apparently now we need to #include <limit>.
-
-Patch by Geoff Leach:
-https://bugs.gentoo.org/766480
-https://invent.kde.org/frameworks/kio/-/issues/3
-
-NO_CHANGELOG
----
- src/kntlm/des.cpp | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/kntlm/des.cpp b/src/kntlm/des.cpp
-index 18d85bfd..65c86f06 100644
---- a/src/kntlm/des.cpp
-+++ b/src/kntlm/des.cpp
-@@ -29,6 +29,8 @@
- #include <string.h>
- #include <qendian.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
-