diff options
author | Patrick J Volkerding <volkerdi@slackware.com> | 2022-01-07 06:03:52 +0000 |
---|---|---|
committer | Eric Hameleers <alien@slackware.com> | 2022-01-07 17:59:49 +0100 |
commit | 2e2faadf3a2ae216d9186936e42587ade953ece7 (patch) | |
tree | 253984762e1a439cadda3f9237848bb98ff36f67 /source/kde | |
parent | 9ebd346711497d3ae7d6cae7f7f304e89fdaf116 (diff) | |
download | current-2e2faadf3a2ae216d9186936e42587ade953ece7.tar.gz |
Fri Jan 7 06:03:52 UTC 202220220107060352
a/kernel-firmware-20220106_4aa2c65-noarch-1.txz: Upgraded.
a/tcsh-6.23.02-x86_64-1.txz: Upgraded.
ap/sqlite-3.37.2-x86_64-1.txz: Upgraded.
ap/vim-8.2.4018-x86_64-1.txz: Upgraded.
d/mercurial-6.0.1-x86_64-1.txz: Upgraded.
kde/akonadi-21.12.1-x86_64-1.txz: Upgraded.
kde/akonadi-calendar-21.12.1-x86_64-1.txz: Upgraded.
kde/akonadi-calendar-tools-21.12.1-x86_64-1.txz: Upgraded.
kde/akonadi-contacts-21.12.1-x86_64-1.txz: Upgraded.
kde/akonadi-import-wizard-21.12.1-x86_64-1.txz: Upgraded.
kde/akonadi-mime-21.12.1-x86_64-1.txz: Upgraded.
kde/akonadi-notes-21.12.1-x86_64-1.txz: Upgraded.
kde/akonadi-search-21.12.1-x86_64-1.txz: Upgraded.
kde/akonadiconsole-21.12.1-x86_64-1.txz: Upgraded.
kde/akregator-21.12.1-x86_64-1.txz: Upgraded.
kde/analitza-21.12.1-x86_64-1.txz: Upgraded.
kde/ark-21.12.1-x86_64-1.txz: Upgraded.
kde/artikulate-21.12.1-x86_64-1.txz: Upgraded.
kde/audiocd-kio-21.12.1-x86_64-1.txz: Upgraded.
kde/baloo-widgets-21.12.1-x86_64-1.txz: Upgraded.
kde/blinken-21.12.1-x86_64-1.txz: Upgraded.
kde/bomber-21.12.1-x86_64-1.txz: Upgraded.
kde/bovo-21.12.1-x86_64-1.txz: Upgraded.
kde/calendarsupport-21.12.1-x86_64-1.txz: Upgraded.
kde/cantor-21.12.1-x86_64-1.txz: Upgraded.
kde/cervisia-21.12.1-x86_64-1.txz: Upgraded.
kde/dolphin-21.12.1-x86_64-1.txz: Upgraded.
kde/dolphin-plugins-21.12.1-x86_64-1.txz: Upgraded.
kde/dragon-21.12.1-x86_64-1.txz: Upgraded.
kde/elisa-21.12.1-x86_64-1.txz: Upgraded.
kde/eventviews-21.12.1-x86_64-1.txz: Upgraded.
kde/ffmpegthumbs-21.12.1-x86_64-1.txz: Upgraded.
kde/filelight-21.12.1-x86_64-1.txz: Upgraded.
kde/granatier-21.12.1-x86_64-1.txz: Upgraded.
kde/grantlee-editor-21.12.1-x86_64-1.txz: Upgraded.
kde/grantleetheme-21.12.1-x86_64-1.txz: Upgraded.
kde/gwenview-21.12.1-x86_64-1.txz: Upgraded.
kde/incidenceeditor-21.12.1-x86_64-1.txz: Upgraded.
kde/itinerary-21.12.1-x86_64-1.txz: Upgraded.
kde/juk-21.12.1-x86_64-1.txz: Upgraded.
kde/k3b-21.12.1-x86_64-1.txz: Upgraded.
kde/kaddressbook-21.12.1-x86_64-1.txz: Upgraded.
kde/kalarm-21.12.1-x86_64-1.txz: Upgraded.
kde/kalarmcal-21.12.1-x86_64-1.txz: Upgraded.
kde/kalgebra-21.12.1-x86_64-1.txz: Upgraded.
kde/kalzium-21.12.1-x86_64-1.txz: Upgraded.
kde/kamera-21.12.1-x86_64-1.txz: Upgraded.
kde/kamoso-21.12.1-x86_64-1.txz: Upgraded.
kde/kanagram-21.12.1-x86_64-1.txz: Upgraded.
kde/kapman-21.12.1-x86_64-1.txz: Upgraded.
kde/kapptemplate-21.12.1-x86_64-1.txz: Upgraded.
kde/kate-21.12.1-x86_64-1.txz: Upgraded.
kde/katomic-21.12.1-x86_64-1.txz: Upgraded.
kde/kbackup-21.12.1-x86_64-1.txz: Upgraded.
kde/kblackbox-21.12.1-x86_64-1.txz: Upgraded.
kde/kblocks-21.12.1-x86_64-1.txz: Upgraded.
kde/kbounce-21.12.1-x86_64-1.txz: Upgraded.
kde/kbreakout-21.12.1-x86_64-1.txz: Upgraded.
kde/kbruch-21.12.1-x86_64-1.txz: Upgraded.
kde/kcachegrind-21.12.1-x86_64-1.txz: Upgraded.
kde/kcalc-21.12.1-x86_64-1.txz: Upgraded.
kde/kcalutils-21.12.1-x86_64-1.txz: Upgraded.
kde/kcharselect-21.12.1-x86_64-1.txz: Upgraded.
kde/kcolorchooser-21.12.1-x86_64-1.txz: Upgraded.
kde/kcron-21.12.1-x86_64-1.txz: Upgraded.
kde/kde-dev-scripts-21.12.1-x86_64-1.txz: Upgraded.
kde/kde-dev-utils-21.12.1-x86_64-1.txz: Upgraded.
kde/kdebugsettings-21.12.1-x86_64-1.txz: Upgraded.
kde/kdeconnect-kde-21.12.1-x86_64-1.txz: Upgraded.
kde/kdeedu-data-21.12.1-x86_64-1.txz: Upgraded.
kde/kdegraphics-mobipocket-21.12.1-x86_64-1.txz: Upgraded.
kde/kdegraphics-thumbnailers-21.12.1-x86_64-1.txz: Upgraded.
kde/kdenetwork-filesharing-21.12.1-x86_64-1.txz: Upgraded.
kde/kdenlive-21.12.1-x86_64-1.txz: Upgraded.
kde/kdepim-addons-21.12.1-x86_64-1.txz: Upgraded.
kde/kdepim-runtime-21.12.1-x86_64-1.txz: Upgraded.
kde/kdesdk-kioslaves-21.12.1-x86_64-1.txz: Upgraded.
kde/kdesdk-thumbnailers-21.12.1-x86_64-1.txz: Upgraded.
kde/kdev-php-21.12.1-x86_64-1.txz: Upgraded.
kde/kdev-python-21.12.1-x86_64-1.txz: Upgraded.
kde/kdevelop-21.12.1-x86_64-1.txz: Upgraded.
kde/kdf-21.12.1-x86_64-1.txz: Upgraded.
kde/kdialog-21.12.1-x86_64-1.txz: Upgraded.
kde/kdiamond-21.12.1-x86_64-1.txz: Upgraded.
kde/keditbookmarks-21.12.1-x86_64-1.txz: Upgraded.
kde/kfind-21.12.1-x86_64-1.txz: Upgraded.
kde/kfloppy-21.12.1-x86_64-1.txz: Upgraded.
kde/kfourinline-21.12.1-x86_64-1.txz: Upgraded.
kde/kgeography-21.12.1-x86_64-1.txz: Upgraded.
kde/kget-21.12.1-x86_64-1.txz: Upgraded.
kde/kgoldrunner-21.12.1-x86_64-1.txz: Upgraded.
kde/kgpg-21.12.1-x86_64-1.txz: Upgraded.
kde/khangman-21.12.1-x86_64-1.txz: Upgraded.
kde/khelpcenter-21.12.1-x86_64-1.txz: Upgraded.
kde/kidentitymanagement-21.12.1-x86_64-1.txz: Upgraded.
kde/kig-21.12.1-x86_64-1.txz: Upgraded.
kde/kigo-21.12.1-x86_64-1.txz: Upgraded.
kde/killbots-21.12.1-x86_64-1.txz: Upgraded.
kde/kimagemapeditor-21.12.1-x86_64-1.txz: Upgraded.
kde/kimap-21.12.1-x86_64-1.txz: Upgraded.
kde/kio-extras-21.12.1-x86_64-1.txz: Upgraded.
kde/kio-gdrive-21.12.1-x86_64-1.txz: Upgraded.
kde/kipi-plugins-21.12.1-x86_64-1.txz: Upgraded.
kde/kirigami-gallery-21.12.1-x86_64-1.txz: Upgraded.
kde/kiriki-21.12.1-x86_64-1.txz: Upgraded.
kde/kiten-21.12.1-x86_64-1.txz: Upgraded.
kde/kitinerary-21.12.1-x86_64-1.txz: Upgraded.
kde/kjumpingcube-21.12.1-x86_64-1.txz: Upgraded.
kde/kldap-21.12.1-x86_64-1.txz: Upgraded.
kde/kleopatra-21.12.1-x86_64-1.txz: Upgraded.
kde/klickety-21.12.1-x86_64-1.txz: Upgraded.
kde/klines-21.12.1-x86_64-1.txz: Upgraded.
kde/kmag-21.12.1-x86_64-1.txz: Upgraded.
kde/kmahjongg-21.12.1-x86_64-1.txz: Upgraded.
kde/kmail-21.12.1-x86_64-1.txz: Upgraded.
kde/kmail-account-wizard-21.12.1-x86_64-1.txz: Upgraded.
kde/kmailtransport-21.12.1-x86_64-1.txz: Upgraded.
kde/kmbox-21.12.1-x86_64-1.txz: Upgraded.
kde/kmime-21.12.1-x86_64-1.txz: Upgraded.
kde/kmines-21.12.1-x86_64-1.txz: Upgraded.
kde/kmix-21.12.1-x86_64-1.txz: Upgraded.
kde/kmousetool-21.12.1-x86_64-1.txz: Upgraded.
kde/kmouth-21.12.1-x86_64-1.txz: Upgraded.
kde/kmplot-21.12.1-x86_64-1.txz: Upgraded.
kde/knavalbattle-21.12.1-x86_64-1.txz: Upgraded.
kde/knetwalk-21.12.1-x86_64-1.txz: Upgraded.
kde/knights-21.12.1-x86_64-1.txz: Upgraded.
kde/knotes-21.12.1-x86_64-1.txz: Upgraded.
kde/kolf-21.12.1-x86_64-1.txz: Upgraded.
kde/kollision-21.12.1-x86_64-1.txz: Upgraded.
kde/kolourpaint-21.12.1-x86_64-1.txz: Upgraded.
kde/kompare-21.12.1-x86_64-1.txz: Upgraded.
kde/konqueror-21.12.1-x86_64-1.txz: Upgraded.
kde/konquest-21.12.1-x86_64-1.txz: Upgraded.
kde/konsole-21.12.1-x86_64-1.txz: Upgraded.
kde/kontact-21.12.1-x86_64-1.txz: Upgraded.
kde/kontactinterface-21.12.1-x86_64-1.txz: Upgraded.
kde/kontrast-21.12.1-x86_64-1.txz: Upgraded.
kde/konversation-21.12.1-x86_64-1.txz: Upgraded.
kde/kopeninghours-21.12.1-x86_64-1.txz: Upgraded.
kde/kopete-21.12.1-x86_64-1.txz: Upgraded.
kde/korganizer-21.12.1-x86_64-1.txz: Upgraded.
kde/kosmindoormap-21.12.1-x86_64-1.txz: Upgraded.
kde/kpat-21.12.1-x86_64-1.txz: Upgraded.
kde/kpimtextedit-21.12.1-x86_64-1.txz: Upgraded.
kde/kpkpass-21.12.1-x86_64-1.txz: Upgraded.
kde/kpmcore-21.12.1-x86_64-1.txz: Upgraded.
kde/kpublictransport-21.12.1-x86_64-1.txz: Upgraded.
kde/kqtquickcharts-21.12.1-x86_64-1.txz: Upgraded.
kde/krdc-21.12.1-x86_64-1.txz: Upgraded.
kde/kreversi-21.12.1-x86_64-1.txz: Upgraded.
kde/krfb-21.12.1-x86_64-1.txz: Upgraded.
kde/krita-5.0.2-x86_64-1.txz: Upgraded.
kde/kross-interpreters-21.12.1-x86_64-1.txz: Upgraded.
kde/kruler-21.12.1-x86_64-1.txz: Upgraded.
kde/kshisen-21.12.1-x86_64-1.txz: Upgraded.
kde/ksirk-21.12.1-x86_64-1.txz: Upgraded.
kde/ksmtp-21.12.1-x86_64-1.txz: Upgraded.
kde/ksnakeduel-21.12.1-x86_64-1.txz: Upgraded.
kde/kspaceduel-21.12.1-x86_64-1.txz: Upgraded.
kde/ksquares-21.12.1-x86_64-1.txz: Upgraded.
kde/ksudoku-21.12.1-x86_64-1.txz: Upgraded.
kde/ksystemlog-21.12.1-x86_64-1.txz: Upgraded.
kde/kteatime-21.12.1-x86_64-1.txz: Upgraded.
kde/ktimer-21.12.1-x86_64-1.txz: Upgraded.
kde/ktnef-21.12.1-x86_64-1.txz: Upgraded.
kde/ktorrent-21.12.1-x86_64-1.txz: Upgraded.
kde/ktouch-21.12.1-x86_64-1.txz: Upgraded.
kde/kturtle-21.12.1-x86_64-1.txz: Upgraded.
kde/kubrick-21.12.1-x86_64-1.txz: Upgraded.
kde/kwalletmanager-21.12.1-x86_64-1.txz: Upgraded.
kde/kwave-21.12.1-x86_64-1.txz: Upgraded.
kde/kwordquiz-21.12.1-x86_64-1.txz: Upgraded.
kde/libgravatar-21.12.1-x86_64-1.txz: Upgraded.
kde/libkcddb-21.12.1-x86_64-1.txz: Upgraded.
kde/libkcompactdisc-21.12.1-x86_64-1.txz: Upgraded.
kde/libkdcraw-21.12.1-x86_64-1.txz: Upgraded.
kde/libkdegames-21.12.1-x86_64-1.txz: Upgraded.
kde/libkdepim-21.12.1-x86_64-1.txz: Upgraded.
kde/libkeduvocdocument-21.12.1-x86_64-1.txz: Upgraded.
kde/libkexiv2-21.12.1-x86_64-1.txz: Upgraded.
kde/libkgapi-21.12.1-x86_64-1.txz: Upgraded.
kde/libkipi-21.12.1-x86_64-1.txz: Upgraded.
kde/libkleo-21.12.1-x86_64-1.txz: Upgraded.
kde/libkmahjongg-21.12.1-x86_64-1.txz: Upgraded.
kde/libkomparediff2-21.12.1-x86_64-1.txz: Upgraded.
kde/libksane-21.12.1-x86_64-1.txz: Upgraded.
kde/libksieve-21.12.1-x86_64-1.txz: Upgraded.
kde/libktorrent-21.12.1-x86_64-1.txz: Upgraded.
kde/lokalize-21.12.1-x86_64-1.txz: Upgraded.
kde/lskat-21.12.1-x86_64-1.txz: Upgraded.
kde/mailcommon-21.12.1-x86_64-1.txz: Upgraded.
kde/mailimporter-21.12.1-x86_64-1.txz: Upgraded.
kde/marble-21.12.1-x86_64-1.txz: Upgraded.
kde/markdownpart-21.12.1-x86_64-1.txz: Upgraded.
kde/mbox-importer-21.12.1-x86_64-1.txz: Upgraded.
kde/messagelib-21.12.1-x86_64-1.txz: Upgraded.
kde/minuet-21.12.1-x86_64-1.txz: Upgraded.
kde/okular-21.12.1-x86_64-1.txz: Upgraded.
kde/palapeli-21.12.1-x86_64-1.txz: Upgraded.
kde/parley-21.12.1-x86_64-1.txz: Upgraded.
kde/partitionmanager-21.12.1-x86_64-1.txz: Upgraded.
kde/picmi-21.12.1-x86_64-1.txz: Upgraded.
kde/pim-data-exporter-21.12.1-x86_64-1.txz: Upgraded.
kde/pim-sieve-editor-21.12.1-x86_64-1.txz: Upgraded.
kde/pimcommon-21.12.1-x86_64-1.txz: Upgraded.
kde/poxml-21.12.1-x86_64-1.txz: Upgraded.
kde/print-manager-21.12.1-x86_64-1.txz: Upgraded.
kde/rocs-21.12.1-x86_64-1.txz: Upgraded.
kde/skanlite-21.12.1-x86_64-1.txz: Upgraded.
kde/spectacle-21.12.1-x86_64-1.txz: Upgraded.
kde/step-21.12.1-x86_64-1.txz: Upgraded.
kde/svgpart-21.12.1-x86_64-1.txz: Upgraded.
kde/sweeper-21.12.1-x86_64-1.txz: Upgraded.
kde/umbrello-21.12.1-x86_64-1.txz: Upgraded.
kde/yakuake-21.12.1-x86_64-1.txz: Upgraded.
kde/zanshin-21.12.1-x86_64-1.txz: Upgraded.
kde/zeroconf-ioslave-21.12.1-x86_64-1.txz: Upgraded.
l/mozilla-nss-3.74-x86_64-1.txz: Upgraded.
l/readline-8.1.002-x86_64-1.txz: Upgraded.
n/bluez-5.63-x86_64-1.txz: Upgraded.
xap/vim-gvim-8.2.4018-x86_64-1.txz: Upgraded.
Diffstat (limited to 'source/kde')
-rw-r--r-- | source/kde/kde/build/ark | 2 | ||||
-rw-r--r-- | source/kde/kde/build/cantor | 2 | ||||
-rw-r--r-- | source/kde/kde/build/kdepim-runtime | 2 | ||||
-rw-r--r-- | source/kde/kde/build/kitinerary | 2 | ||||
-rw-r--r-- | source/kde/kde/build/konsole | 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/build/umbrello | 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 | ||||
-rw-r--r-- | source/kde/kde/patch/kdepim-runtime.patch | 1 | ||||
-rw-r--r-- | source/kde/kde/patch/kdepim-runtime/f14fabcefb45790175e209ef8ae394def4a805e9.patch | 127 | ||||
-rw-r--r-- | source/kde/kde/patch/konsole/eb44240235fa61e662e9a521f72e8be9213bb536.patch | 38 |
14 files changed, 8 insertions, 255 deletions
diff --git a/source/kde/kde/build/ark b/source/kde/kde/build/ark index 0cfbf088..d00491fd 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 0cfbf088..d00491fd 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 00750edc..d00491fd 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 0cfbf088..d00491fd 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 0cfbf088..d00491fd 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 0cfbf088..d00491fd 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 0cfbf088..d00491fd 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 0cfbf088..d00491fd 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 77f409c9..00000000 --- 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 3144292e..00000000 --- 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 764708e2..00000000 --- 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 d113ad44..00000000 --- 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 e911588d..00000000 --- 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 b34efb01..00000000 --- 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 - |