diff options
author | Tobias C. Berner <tcberner@FreeBSD.org> | 2021-12-10 06:26:32 +0000 |
---|---|---|
committer | Tobias C. Berner <tcberner@FreeBSD.org> | 2021-12-10 06:26:32 +0000 |
commit | 2c348825da717d6771688449161324e3864d0207 (patch) | |
tree | 733f521def88414d2ac8c17bdd1d247a61eb253b /x11-fm | |
parent | 937188af9d1a4dd7622b8aef33814345a6a9b73a (diff) | |
download | ports-2c348825da717d6771688449161324e3864d0207.tar.gz ports-2c348825da717d6771688449161324e3864d0207.zip |
KDE: Update KDE Gear to 21.12
KDE Gear 21.12 has landed and comes with a massive number of updates and
new versions of applications and libraries. Literally, dozens of classic
KDE everyday tools and the specialised sophisticated apps you use to
work, be creative and play, are getting refreshers with design
improvements, new features and performance and stability enhancements.
What's new:
https://kde.org/announcements/gear/21.12.0/#whatsnew
Changelog:
https://kde.org/announcements/changelogs/gear/21.12.0/
Diffstat (limited to 'x11-fm')
-rw-r--r-- | x11-fm/dolphin/distinfo | 6 | ||||
-rw-r--r-- | x11-fm/dolphin/files/patch-git_27b5cde-arch_backport | 101 | ||||
-rw-r--r-- | x11-fm/dolphin/pkg-plist | 6 | ||||
-rw-r--r-- | x11-fm/konqueror/distinfo | 6 | ||||
-rw-r--r-- | x11-fm/konqueror/pkg-plist | 24 |
5 files changed, 18 insertions, 125 deletions
diff --git a/x11-fm/dolphin/distinfo b/x11-fm/dolphin/distinfo index 75896fd8a8ad..9c433b247fab 100644 --- a/x11-fm/dolphin/distinfo +++ b/x11-fm/dolphin/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1636032465 -SHA256 (KDE/release-service/21.08.3/dolphin-21.08.3.tar.xz) = 3b17bfd81dcb04d37810cea0d52d098ce5244289a2eb0173f575291ca97bd9a7 -SIZE (KDE/release-service/21.08.3/dolphin-21.08.3.tar.xz) = 5327496 +TIMESTAMP = 1638571005 +SHA256 (KDE/release-service/21.12.0/dolphin-21.12.0.tar.xz) = e70fc08ee292c5f9bfd4fc3bb12eef524528bee8e856d294bf484b3eff7b2669 +SIZE (KDE/release-service/21.12.0/dolphin-21.12.0.tar.xz) = 5319968 diff --git a/x11-fm/dolphin/files/patch-git_27b5cde-arch_backport b/x11-fm/dolphin/files/patch-git_27b5cde-arch_backport deleted file mode 100644 index 145aa5707ea2..000000000000 --- a/x11-fm/dolphin/files/patch-git_27b5cde-arch_backport +++ /dev/null @@ -1,101 +0,0 @@ -Obtained from: - https://raw.githubusercontent.com/archlinux/svntogit-packages/packages/dolphin/trunk/27bfcde4.patch - - -From 27bfcde4efaf936243fc41e4a61d0cac32105ef6 Mon Sep 17 00:00:00 2001 -From: Nate Graham <nate@kde.org> -Date: Tue, 31 Aug 2021 09:09:14 -0600 -Subject: [PATCH] Port to KTerminalLauncherJob - -Dolphin still uses KToolInvocation::invokeTerminal() which is -deprecated and requires KInit. However Dolphin was ported away from -requiring it in other ways, so it is now possible to have Dolphin -running but not KInit, which breaks the "Open in Terminal" -functionality. - -Using KTerminalLauncherJob fixes this. It was introduced in Frameworks -5.83, so the CMake dependency version is accordingly increased. - -BUG: 441072 -FIXED-IN: 21.12 ---- - CMakeLists.txt | 2 +- - src/dolphinmainwindow.cpp | 14 ++++++++++---- - src/dolphinpart.cpp | 6 ++++-- - 3 files changed, 15 insertions(+), 7 deletions(-) - -diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp -index 62e347032..f3a5e3b4e 100644 ---- src/dolphinmainwindow.cpp -+++ src/dolphinmainwindow.cpp -@@ -56,10 +56,10 @@ - #include <KStandardAction> - #include <KStartupInfo> - #include <KSycoca> -+#include <KTerminalLauncherJob> - #include <KToggleAction> - #include <KToolBar> - #include <KToolBarPopupAction> --#include <KToolInvocation> - #include <KUrlComboBox> - #include <KUrlNavigator> - #include <KWindowSystem> -@@ -1033,7 +1033,9 @@ void DolphinMainWindow::openTerminal() - const QUrl url = m_activeViewContainer->url(); - - if (url.isLocalFile()) { -- KToolInvocation::invokeTerminal(QString(), {}, url.toLocalFile()); -+ auto job = new KTerminalLauncherJob(QString()); -+ job->setWorkingDirectory(url.toLocalFile()); -+ job->start(); - return; - } - -@@ -1047,14 +1049,18 @@ void DolphinMainWindow::openTerminal() - statUrl = job->mostLocalUrl(); - } - -- KToolInvocation::invokeTerminal(QString(), {}, statUrl.isLocalFile() ? statUrl.toLocalFile() : QDir::homePath()); -+ auto job = new KTerminalLauncherJob(QString()); -+ job->setWorkingDirectory(statUrl.isLocalFile() ? statUrl.toLocalFile() : QDir::homePath()); -+ job->start(); - }); - - return; - } - - // Nothing worked, just use $HOME -- KToolInvocation::invokeTerminal(QString(), {}, QDir::homePath()); -+ auto job = new KTerminalLauncherJob(QString()); -+ job->setWorkingDirectory(QDir::homePath()); -+ job->start(); - } - - void DolphinMainWindow::editSettings() -diff --git a/src/dolphinpart.cpp b/src/dolphinpart.cpp -index 9c551d67a..8d528f418 100644 ---- src/dolphinpart.cpp -+++ src/dolphinpart.cpp -@@ -32,7 +32,7 @@ - #include <KPluginFactory> - #include <KIO/CommandLauncherJob> - #include <KSharedConfig> --#include <KToolInvocation> -+#include <KTerminalLauncherJob> - - #include <QActionGroup> - #include <QApplication> -@@ -567,7 +567,9 @@ QString DolphinPart::localFilePathOrHome() const - - void DolphinPart::slotOpenTerminal() - { -- KToolInvocation::invokeTerminal(QString(), {}, localFilePathOrHome()); -+ auto job = new KTerminalLauncherJob(QString()); -+ job->setWorkingDirectory(localFilePathOrHome()); -+ job->start(); - } - - void DolphinPart::slotFindFile() --- -GitLab - diff --git a/x11-fm/dolphin/pkg-plist b/x11-fm/dolphin/pkg-plist index a2aaf46e2136..9e7020e3f603 100644 --- a/x11-fm/dolphin/pkg-plist +++ b/x11-fm/dolphin/pkg-plist @@ -14,9 +14,9 @@ lib/libdolphinprivate.so.%%SHLIB_VER%% lib/libdolphinvcs.so lib/libdolphinvcs.so.%%SHLIB_SHVER%% lib/libdolphinvcs.so.%%SHLIB_VER%% -%%QT_PLUGINDIR%%/kcm_dolphingeneral.so -%%QT_PLUGINDIR%%/kcm_dolphinnavigation.so -%%QT_PLUGINDIR%%/kcm_dolphinviewmodes.so +%%QT_PLUGINDIR%%/dolphin/kcms/libkcm_dolphingeneral.so +%%QT_PLUGINDIR%%/dolphin/kcms/libkcm_dolphinnavigation.so +%%QT_PLUGINDIR%%/dolphin/kcms/libkcm_dolphinviewmodes.so %%QT_PLUGINDIR%%/kf%%SHLIB_SHVER%%/parts/dolphinpart.so lib/systemd/user/plasma-dolphin.service share/applications/org.kde.dolphin.desktop diff --git a/x11-fm/konqueror/distinfo b/x11-fm/konqueror/distinfo index 779b1512c7d8..79aeca8f1dfc 100644 --- a/x11-fm/konqueror/distinfo +++ b/x11-fm/konqueror/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1636032464 -SHA256 (KDE/release-service/21.08.3/konqueror-21.08.3.tar.xz) = bf81b7312cf7ec64dc2fda7b69e1c0894b3d468a4bab5e2d4eec38c6e75649d3 -SIZE (KDE/release-service/21.08.3/konqueror-21.08.3.tar.xz) = 7418888 +TIMESTAMP = 1638571004 +SHA256 (KDE/release-service/21.12.0/konqueror-21.12.0.tar.xz) = 67360d0a5051c1f572b2234f5b9e8c5ea9510d3eb748ca80aedc656b09b0c0b3 +SIZE (KDE/release-service/21.12.0/konqueror-21.12.0.tar.xz) = 7427672 diff --git a/x11-fm/konqueror/pkg-plist b/x11-fm/konqueror/pkg-plist index 0fdf4421a731..54c15b67d43f 100644 --- a/x11-fm/konqueror/pkg-plist +++ b/x11-fm/konqueror/pkg-plist @@ -27,15 +27,19 @@ lib/libkonqsidebarplugin.so.5 lib/libkonquerorprivate.so.%%KDE_APPLICATIONS_VERSION%% lib/libkonquerorprivate.so.5 lib/libkwebenginepart.so +%%QT_PLUGINDIR%%/konqueror_kcms/kcm_bookmarks.so +%%QT_PLUGINDIR%%/konqueror_kcms/kcm_history.so +%%QT_PLUGINDIR%%/konqueror_kcms/kcm_konq.so +%%QT_PLUGINDIR%%/konqueror_kcms/kcm_performance.so +%%QT_PLUGINDIR%%/konqueror_kcms/khtml_appearance.so +%%QT_PLUGINDIR%%/konqueror_kcms/khtml_behavior.so +%%QT_PLUGINDIR%%/konqueror_kcms/khtml_filter.so +%%QT_PLUGINDIR%%/konqueror_kcms/khtml_general.so +%%QT_PLUGINDIR%%/konqueror_kcms/khtml_java_js.so %%QT_PLUGINDIR%%/akregatorkonqfeedicon.so %%QT_PLUGINDIR%%/autorefresh.so %%QT_PLUGINDIR%%/babelfishplugin.so %%QT_PLUGINDIR%%/dirfilterplugin.so -%%QT_PLUGINDIR%%/kcm_bookmarks.so -%%QT_PLUGINDIR%%/kcm_history.so -%%QT_PLUGINDIR%%/kcm_konq.so -%%QT_PLUGINDIR%%/kcm_konqhtml.so -%%QT_PLUGINDIR%%/kcm_performance.so %%QT_PLUGINDIR%%/kf5/kfileitemaction/akregatorplugin.so %%QT_PLUGINDIR%%/kf5/parts/fsviewpart.so %%QT_PLUGINDIR%%/kf5/parts/konq_sidebar.so @@ -141,17 +145,7 @@ share/konqsidebartng/plugins/konqsidebar_history.desktop share/konqsidebartng/plugins/konqsidebar_places.desktop share/konqsidebartng/plugins/konqsidebar_tree.desktop share/kservices5/akregator_konqplugin.desktop -share/kservices5/bookmarks.desktop -share/kservices5/filebehavior.desktop share/kservices5/fsview_part.desktop -share/kservices5/kcmhistory.desktop -share/kservices5/kcmkonqyperformance.desktop -share/kservices5/kcmperformance.desktop -share/kservices5/khtml_appearance.desktop -share/kservices5/khtml_behavior.desktop -share/kservices5/khtml_filter.desktop -share/kservices5/khtml_general.desktop -share/kservices5/khtml_java_js.desktop share/kservices5/konq_sidebartng.desktop share/kservices5/org.kde.konqueror.desktop share/kservices5/webarchivethumbnail.desktop |