diff options
Diffstat (limited to 'source/kde')
-rw-r--r-- | source/kde/kde/build/ark | 2 | ||||
-rw-r--r-- | source/kde/kde/build/calligra | 2 | ||||
-rw-r--r-- | source/kde/kde/build/cantor | 2 | ||||
-rw-r--r-- | source/kde/kde/build/digikam | 2 | ||||
-rw-r--r-- | source/kde/kde/build/kfilemetadata | 2 | ||||
-rw-r--r-- | source/kde/kde/build/kile | 2 | ||||
-rw-r--r-- | source/kde/kde/build/kitinerary | 2 | ||||
-rw-r--r-- | source/kde/kde/build/krita | 2 | ||||
-rw-r--r-- | source/kde/kde/build/okular | 2 | ||||
-rw-r--r-- | source/kde/kde/patch/ark.patch | 2 | ||||
-rw-r--r-- | source/kde/kde/patch/ark/015bdfd1de9135279c7662eb89acc81d1a843202.patch | 36 | ||||
-rw-r--r-- | source/kde/kde/patch/ark/75c6927883342ec533aea4663b7b5dfcf8d699a6.patch | 43 |
12 files changed, 90 insertions, 9 deletions
diff --git a/source/kde/kde/build/ark b/source/kde/kde/build/ark index d00491fd7..0cfbf0888 100644 --- a/source/kde/kde/build/ark +++ b/source/kde/kde/build/ark @@ -1 +1 @@ -1 +2 diff --git a/source/kde/kde/build/calligra b/source/kde/kde/build/calligra index 8351c1939..60d3b2f4a 100644 --- a/source/kde/kde/build/calligra +++ b/source/kde/kde/build/calligra @@ -1 +1 @@ -14 +15 diff --git a/source/kde/kde/build/cantor b/source/kde/kde/build/cantor index d00491fd7..0cfbf0888 100644 --- a/source/kde/kde/build/cantor +++ b/source/kde/kde/build/cantor @@ -1 +1 @@ -1 +2 diff --git a/source/kde/kde/build/digikam b/source/kde/kde/build/digikam index d00491fd7..0cfbf0888 100644 --- a/source/kde/kde/build/digikam +++ b/source/kde/kde/build/digikam @@ -1 +1 @@ -1 +2 diff --git a/source/kde/kde/build/kfilemetadata b/source/kde/kde/build/kfilemetadata index d00491fd7..0cfbf0888 100644 --- a/source/kde/kde/build/kfilemetadata +++ b/source/kde/kde/build/kfilemetadata @@ -1 +1 @@ -1 +2 diff --git a/source/kde/kde/build/kile b/source/kde/kde/build/kile index 8351c1939..60d3b2f4a 100644 --- a/source/kde/kde/build/kile +++ b/source/kde/kde/build/kile @@ -1 +1 @@ -14 +15 diff --git a/source/kde/kde/build/kitinerary b/source/kde/kde/build/kitinerary index d00491fd7..0cfbf0888 100644 --- a/source/kde/kde/build/kitinerary +++ b/source/kde/kde/build/kitinerary @@ -1 +1 @@ -1 +2 diff --git a/source/kde/kde/build/krita b/source/kde/kde/build/krita index d00491fd7..0cfbf0888 100644 --- a/source/kde/kde/build/krita +++ b/source/kde/kde/build/krita @@ -1 +1 @@ -1 +2 diff --git a/source/kde/kde/build/okular b/source/kde/kde/build/okular index d00491fd7..0cfbf0888 100644 --- a/source/kde/kde/build/okular +++ b/source/kde/kde/build/okular @@ -1 +1 @@ -1 +2 diff --git a/source/kde/kde/patch/ark.patch b/source/kde/kde/patch/ark.patch new file mode 100644 index 000000000..77f409c90 --- /dev/null +++ b/source/kde/kde/patch/ark.patch @@ -0,0 +1,2 @@ +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 new file mode 100644 index 000000000..3144292e7 --- /dev/null +++ b/source/kde/kde/patch/ark/015bdfd1de9135279c7662eb89acc81d1a843202.patch @@ -0,0 +1,36 @@ +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 new file mode 100644 index 000000000..764708e2b --- /dev/null +++ b/source/kde/kde/patch/ark/75c6927883342ec533aea4663b7b5dfcf8d699a6.patch @@ -0,0 +1,43 @@ +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()); + } + }); |