summaryrefslogtreecommitdiffstats
path: root/source/kde
diff options
context:
space:
mode:
Diffstat (limited to 'source/kde')
-rw-r--r--source/kde/kde/build/ark2
-rw-r--r--source/kde/kde/build/cantor2
-rw-r--r--source/kde/kde/build/kdepim-runtime2
-rw-r--r--source/kde/kde/build/kitinerary2
-rw-r--r--source/kde/kde/build/konsole2
-rw-r--r--source/kde/kde/build/krita2
-rw-r--r--source/kde/kde/build/okular2
-rw-r--r--source/kde/kde/build/umbrello2
-rw-r--r--source/kde/kde/patch/ark.patch2
-rw-r--r--source/kde/kde/patch/ark/015bdfd1de9135279c7662eb89acc81d1a843202.patch36
-rw-r--r--source/kde/kde/patch/ark/75c6927883342ec533aea4663b7b5dfcf8d699a6.patch43
-rw-r--r--source/kde/kde/patch/kdepim-runtime.patch1
-rw-r--r--source/kde/kde/patch/kdepim-runtime/f14fabcefb45790175e209ef8ae394def4a805e9.patch127
-rw-r--r--source/kde/kde/patch/konsole/eb44240235fa61e662e9a521f72e8be9213bb536.patch38
14 files changed, 8 insertions, 255 deletions
diff --git a/source/kde/kde/build/ark b/source/kde/kde/build/ark
index 0cfbf0888..d00491fd7 100644
--- a/source/kde/kde/build/ark
+++ b/source/kde/kde/build/ark
@@ -1 +1 @@
-2
+1
diff --git a/source/kde/kde/build/cantor b/source/kde/kde/build/cantor
index 0cfbf0888..d00491fd7 100644
--- a/source/kde/kde/build/cantor
+++ b/source/kde/kde/build/cantor
@@ -1 +1 @@
-2
+1
diff --git a/source/kde/kde/build/kdepim-runtime b/source/kde/kde/build/kdepim-runtime
index 00750edc0..d00491fd7 100644
--- a/source/kde/kde/build/kdepim-runtime
+++ b/source/kde/kde/build/kdepim-runtime
@@ -1 +1 @@
-3
+1
diff --git a/source/kde/kde/build/kitinerary b/source/kde/kde/build/kitinerary
index 0cfbf0888..d00491fd7 100644
--- a/source/kde/kde/build/kitinerary
+++ b/source/kde/kde/build/kitinerary
@@ -1 +1 @@
-2
+1
diff --git a/source/kde/kde/build/konsole b/source/kde/kde/build/konsole
index 0cfbf0888..d00491fd7 100644
--- a/source/kde/kde/build/konsole
+++ b/source/kde/kde/build/konsole
@@ -1 +1 @@
-2
+1
diff --git a/source/kde/kde/build/krita b/source/kde/kde/build/krita
index 0cfbf0888..d00491fd7 100644
--- a/source/kde/kde/build/krita
+++ b/source/kde/kde/build/krita
@@ -1 +1 @@
-2
+1
diff --git a/source/kde/kde/build/okular b/source/kde/kde/build/okular
index 0cfbf0888..d00491fd7 100644
--- a/source/kde/kde/build/okular
+++ b/source/kde/kde/build/okular
@@ -1 +1 @@
-2
+1
diff --git a/source/kde/kde/build/umbrello b/source/kde/kde/build/umbrello
index 0cfbf0888..d00491fd7 100644
--- a/source/kde/kde/build/umbrello
+++ b/source/kde/kde/build/umbrello
@@ -1 +1 @@
-2
+1
diff --git a/source/kde/kde/patch/ark.patch b/source/kde/kde/patch/ark.patch
deleted file mode 100644
index 77f409c90..000000000
--- a/source/kde/kde/patch/ark.patch
+++ /dev/null
@@ -1,2 +0,0 @@
-cat $CWD/patch/ark/015bdfd1de9135279c7662eb89acc81d1a843202.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
-cat $CWD/patch/ark/75c6927883342ec533aea4663b7b5dfcf8d699a6.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
diff --git a/source/kde/kde/patch/ark/015bdfd1de9135279c7662eb89acc81d1a843202.patch b/source/kde/kde/patch/ark/015bdfd1de9135279c7662eb89acc81d1a843202.patch
deleted file mode 100644
index 3144292e7..000000000
--- a/source/kde/kde/patch/ark/015bdfd1de9135279c7662eb89acc81d1a843202.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 015bdfd1de9135279c7662eb89acc81d1a843202 Mon Sep 17 00:00:00 2001
-From: 2155X 2155X <syenergyyy@gmail.com>
-Date: Tue, 7 Dec 2021 01:12:35 +0200
-Subject: [PATCH] Fix extraction "Dolphin Actions" not abiding "Open
- destination folder after extracting" setting.
-
-BUG: 319134
-CCBUG: 298248
-
-
-(cherry picked from commit 6b3b77e81a05154204ca89140afbec2021ea431b)
----
- app/extractfileitemaction.cpp | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/app/extractfileitemaction.cpp b/app/extractfileitemaction.cpp
-index b714cee6..cd6b6f96 100644
---- a/app/extractfileitemaction.cpp
-+++ b/app/extractfileitemaction.cpp
-@@ -14,6 +14,7 @@
- #include <KLocalizedString>
- #include <KPluginFactory>
-
-+#include "settings.h"
- #include "mimetypes.h"
- #include "pluginmanager.h"
- #include "batchextract.h"
-@@ -96,7 +97,7 @@ QAction *ExtractFileItemAction::createAction(const QIcon& icon, const QString& n
- connect(action, &QAction::triggered, this, [urls,name, option, parent,this]() {
- auto *batchExtractJob = new BatchExtract(parent);
- batchExtractJob->setDestinationFolder(QFileInfo(urls.first().toLocalFile()).path());
-- batchExtractJob->setOpenDestinationAfterExtraction(true);
-+ batchExtractJob->setOpenDestinationAfterExtraction(ArkSettings::openDestinationFolderAfterExtraction());
- if (option == AutoSubfolder) {
- batchExtractJob->setAutoSubfolder(true);
- } else if (option == ShowDialog) {
diff --git a/source/kde/kde/patch/ark/75c6927883342ec533aea4663b7b5dfcf8d699a6.patch b/source/kde/kde/patch/ark/75c6927883342ec533aea4663b7b5dfcf8d699a6.patch
deleted file mode 100644
index 764708e2b..000000000
--- a/source/kde/kde/patch/ark/75c6927883342ec533aea4663b7b5dfcf8d699a6.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 75c6927883342ec533aea4663b7b5dfcf8d699a6 Mon Sep 17 00:00:00 2001
-From: Alexander Lohnau <alexander.lohnau@gmx.de>
-Date: Sat, 25 Dec 2021 13:00:29 +0100
-Subject: [PATCH] Do not highlight file after compression
-
-Dolphin opens a new tab whenever the file is compressed and
-is not smart enough to highlight it in the currently open view.
-Because people are annoyed by it and the alternatives are complex to implement,
-removing it is the best solution.
-
-BUG: 440663
-
-
-(cherry picked from commit 28f2ef4b22f53200cb8789dbc8fe8ecdba3a377f)
----
- app/compressfileitemaction.cpp | 7 ++-----
- 1 file changed, 2 insertions(+), 5 deletions(-)
-
-diff --git a/app/compressfileitemaction.cpp b/app/compressfileitemaction.cpp
-index 45e75a6e..692a7195 100644
---- a/app/compressfileitemaction.cpp
-+++ b/app/compressfileitemaction.cpp
-@@ -16,7 +16,6 @@
- #include <KPluginFactory>
-
- #include <algorithm>
--#include <KIO/OpenFileManagerWindowJob>
-
- #include "pluginmanager.h"
- #include "addtoarchive.h"
-@@ -102,10 +101,8 @@ QAction *CompressFileItemAction::createAction(const QIcon& icon, const QString&
- }
- }
- addToArchiveJob->start();
-- connect(addToArchiveJob, &KJob::finished, this, [this, addToArchiveJob](){
-- if (addToArchiveJob->error() == 0) {
-- KIO::highlightInFileManager({QUrl::fromLocalFile(addToArchiveJob->fileName())});
-- } else if (!addToArchiveJob->errorString().isEmpty()) {
-+ connect(addToArchiveJob, &KJob::finished, this, [this, addToArchiveJob]() {
-+ if (addToArchiveJob->error() != 0) {
- Q_EMIT error(addToArchiveJob->errorString());
- }
- });
diff --git a/source/kde/kde/patch/kdepim-runtime.patch b/source/kde/kde/patch/kdepim-runtime.patch
deleted file mode 100644
index d113ad44c..000000000
--- a/source/kde/kde/patch/kdepim-runtime.patch
+++ /dev/null
@@ -1 +0,0 @@
-cat $CWD/patch/kdepim-runtime/f14fabcefb45790175e209ef8ae394def4a805e9.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
diff --git a/source/kde/kde/patch/kdepim-runtime/f14fabcefb45790175e209ef8ae394def4a805e9.patch b/source/kde/kde/patch/kdepim-runtime/f14fabcefb45790175e209ef8ae394def4a805e9.patch
deleted file mode 100644
index e911588db..000000000
--- a/source/kde/kde/patch/kdepim-runtime/f14fabcefb45790175e209ef8ae394def4a805e9.patch
+++ /dev/null
@@ -1,127 +0,0 @@
-From f14fabcefb45790175e209ef8ae394def4a805e9 Mon Sep 17 00:00:00 2001
-From: Albert Astals Cid <aacid@kde.org>
-Date: Fri, 10 Dec 2021 21:55:13 +0100
-Subject: [PATCH] POP3: Fix SSL connections
-
-We need to go into ssl before trying to read from the socket, otherwise
-nothing works
-
-BUGS: 446751
----
- resources/pop3/pop3protocol.cpp | 72 ++++++++++++++++++++-------------
- resources/pop3/pop3protocol.h | 2 +
- 2 files changed, 45 insertions(+), 29 deletions(-)
-
-diff --git a/resources/pop3/pop3protocol.cpp b/resources/pop3/pop3protocol.cpp
-index c2d01d33a..15971919e 100644
---- a/resources/pop3/pop3protocol.cpp
-+++ b/resources/pop3/pop3protocol.cpp
-@@ -535,6 +535,39 @@ Result POP3Protocol::loginPASS()
- return Result::pass();
- }
-
-+Result POP3Protocol::startSsl()
-+{
-+ mSocket->ignoreSslErrors(); // Don't worry, errors are handled manually below
-+ mSocket->startClientEncryption();
-+ const bool encryptionStarted = mSocket->waitForEncrypted(s_connectTimeout);
-+
-+ const QSslCipher cipher = mSocket->sessionCipher();
-+ const QList<QSslError> errors = mSocket->sslHandshakeErrors();
-+ if (!encryptionStarted || !errors.isEmpty() || !mSocket->isEncrypted() || cipher.isNull() || cipher.usedBits() == 0) {
-+ QString errorString = std::accumulate(errors.begin(), errors.end(), QString(), [](QString cur, const QSslError &error) {
-+ if (!cur.isEmpty())
-+ cur += QLatin1Char('\n');
-+ cur += error.errorString();
-+ return cur;
-+ });
-+
-+ qCDebug(POP3_LOG) << "Initial SSL handshake failed. cipher.isNull() is" << cipher.isNull() << ", cipher.usedBits() is" << cipher.usedBits()
-+ << ", the socket says:" << mSocket->errorString() << "and the SSL errors are:" << errorString;
-+ mContinueAfterSslError = false;
-+ Q_EMIT sslError(KSslErrorUiData(mSocket));
-+ if (!mContinueAfterSslError) {
-+ if (errorString.isEmpty())
-+ errorString = mSocket->errorString();
-+ qCDebug(POP3_LOG) << "TLS setup has failed. Aborting." << errorString;
-+ closeConnection();
-+ return Result::fail(ERR_SSL_FAILURE, i18n("SSL/TLS error: %1", errorString));
-+ }
-+ } else {
-+ qCDebug(POP3_LOG) << "TLS has been enabled.";
-+ }
-+ return Result::pass();
-+}
-+
- Result POP3Protocol::openConnection()
- {
- m_try_apop = mSettings.authenticationMethod() == MailTransport::Transport::EnumAuthenticationType::APOP;
-@@ -560,6 +593,13 @@ Result POP3Protocol::openConnection()
- return Result::fail(mSocket->error(), errorString);
- }
-
-+ if (mSettings.useSSL()) {
-+ const Result res = startSsl();
-+ if (!res.success) {
-+ return res;
-+ }
-+ }
-+
- mConnected = true;
-
- greeting_buf = new char[GREETING_BUF_LEN];
-@@ -608,35 +648,9 @@ Result POP3Protocol::openConnection()
- "was unsuccessful.\nYou can "
- "disable TLS in the POP account settings dialog."));
- }
-- }
-- if (mSettings.useSSL() || mSettings.useTLS()) {
-- mSocket->ignoreSslErrors(); // Don't worry, errors are handled manually below
-- mSocket->startClientEncryption();
-- const bool encryptionStarted = mSocket->waitForEncrypted(s_connectTimeout);
--
-- const QSslCipher cipher = mSocket->sessionCipher();
-- const QList<QSslError> errors = mSocket->sslHandshakeErrors();
-- if (!encryptionStarted || !errors.isEmpty() || !mSocket->isEncrypted() || cipher.isNull() || cipher.usedBits() == 0) {
-- QString errorString = std::accumulate(errors.begin(), errors.end(), QString(), [](QString cur, const QSslError &error) {
-- if (!cur.isEmpty())
-- cur += QLatin1Char('\n');
-- cur += error.errorString();
-- return cur;
-- });
--
-- qCDebug(POP3_LOG) << "Initial SSL handshake failed. cipher.isNull() is" << cipher.isNull() << ", cipher.usedBits() is" << cipher.usedBits()
-- << ", the socket says:" << mSocket->errorString() << "and the SSL errors are:" << errorString;
-- mContinueAfterSslError = false;
-- Q_EMIT sslError(KSslErrorUiData(mSocket));
-- if (!mContinueAfterSslError) {
-- if (errorString.isEmpty())
-- errorString = mSocket->errorString();
-- qCDebug(POP3_LOG) << "TLS setup has failed. Aborting." << errorString;
-- closeConnection();
-- return Result::fail(ERR_SSL_FAILURE, i18n("SSL/TLS error: %1", errorString));
-- }
-- } else {
-- qCDebug(POP3_LOG) << "TLS has been enabled.";
-+ const Result res = startSsl();
-+ if (!res.success) {
-+ return res;
- }
- }
-
-diff --git a/resources/pop3/pop3protocol.h b/resources/pop3/pop3protocol.h
-index 9b40b334f..d01f7ab7a 100644
---- a/resources/pop3/pop3protocol.h
-+++ b/resources/pop3/pop3protocol.h
-@@ -127,6 +127,8 @@ private:
- */
- Q_REQUIRED_RESULT Result loginPASS();
-
-+ Q_REQUIRED_RESULT Result startSsl();
-+
- const Settings &mSettings;
- QSslSocket *const mSocket;
- unsigned short int m_iPort;
---
-GitLab
-
diff --git a/source/kde/kde/patch/konsole/eb44240235fa61e662e9a521f72e8be9213bb536.patch b/source/kde/kde/patch/konsole/eb44240235fa61e662e9a521f72e8be9213bb536.patch
deleted file mode 100644
index b34efb01f..000000000
--- a/source/kde/kde/patch/konsole/eb44240235fa61e662e9a521f72e8be9213bb536.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From eb44240235fa61e662e9a521f72e8be9213bb536 Mon Sep 17 00:00:00 2001
-From: Ahmad Samir <a.samirh78@gmail.com>
-Date: Mon, 3 Jan 2022 14:19:22 +0200
-Subject: [PATCH] Use tighter matching when finding the default profile file
- name
-
-The code was checking if the path ended with a specific file name, which
-meant that if you have two profiles "Root Shell.profile" and
-"Shell.profile", the matching is messed up because the former ends with
-the latter. Instead since we're using the path, add a '/', this way we're
-matching the whole file name which is the last component in the path after
-the last '/'.
-
-Thanks to the bug reporter for git bisect'ing the repo to find the culprit
-commit.
-
-BUG: 447872
-FIXED_IN: 21.12.0
----
- src/profile/ProfileManager.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/profile/ProfileManager.cpp b/src/profile/ProfileManager.cpp
-index b19847074..18bc1dda8 100644
---- a/src/profile/ProfileManager.cpp
-+++ b/src/profile/ProfileManager.cpp
-@@ -206,7 +206,7 @@ void ProfileManager::loadAllProfiles(const QString &defaultProfileFileName)
- const QStringList &paths = availableProfilePaths();
- for (const QString &path : paths) {
- Profile::Ptr profile = loadProfile(path);
-- if (profile && !defaultProfileFileName.isEmpty() && path.endsWith(defaultProfileFileName)) {
-+ if (profile && !defaultProfileFileName.isEmpty() && path.endsWith(QLatin1Char('/') + defaultProfileFileName)) {
- _defaultProfile = profile;
- }
- }
---
-GitLab
-
generated by cgit v1.2.3-65-gdbad (git 2.45.1) at 2024-06-15 16:10:38 +0000