diff options
Diffstat (limited to 'desktop-plasma/patches')
8 files changed, 88 insertions, 274 deletions
diff --git a/desktop-plasma/patches/kde-apps/dolphin/0001-Ignore-trailing-slashes-when-comparing-place-URLs.patch b/desktop-plasma/patches/kde-apps/dolphin/0001-Ignore-trailing-slashes-when-comparing-place-URLs.patch deleted file mode 100644 index 385da80..0000000 --- a/desktop-plasma/patches/kde-apps/dolphin/0001-Ignore-trailing-slashes-when-comparing-place-URLs.patch +++ /dev/null @@ -1,73 +0,0 @@ -From 046ddcf5607e597cd6290147bf7ee10c08e526dd Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Wolfgang=20M=C3=BCller?= <wolf@oriole.systems> -Date: Thu, 19 Sep 2024 11:46:09 +0200 -Subject: [PATCH] Ignore trailing slashes when comparing place URLs - -There's two locations where place URLs are compared in Dolphin. One -is in DolphinContextMenu::placeExists, which determines whether or not -to show an "Add to Places" context menu entry. The other one is in -DolphinViewContainer::caption, which provides the place name for use in -the window title, if applicable. - -Neither of these functions correctly normalize the URL to account for -trailing slashes. Whilst placeExists() does not even attempt it, -caption() was changed in 681d8bb6c (Fix wrong window titles, 2019-09-15) -to support this using a regular expression. - -However, caption() fails to escape the URL before incorporating it in -the regular expression, leading to failed matches and errors like the -following when browsing to directories that do not happen to make up a -valid regular expression: - - QString(View)::contains(): called on an invalid QRegularExpression - object (pattern is '\A(?:file:///home/foo/[Z-A]/?)\z') - -Instead of relying on complex and possibly brittle regular expressions, -use KFilePlacesModel's closestItem() function to find the closest -matching URL and then finally check whether the normalized URLs match -exactly. ---- - src/dolphincontextmenu.cpp | 5 ++--- - src/dolphinviewcontainer.cpp | 9 ++++----- - 2 files changed, 6 insertions(+), 8 deletions(-) - -diff --git a/src/dolphincontextmenu.cpp b/src/dolphincontextmenu.cpp -index 68f6dbd21..3ce1d1d51 100644 ---- a/src/dolphincontextmenu.cpp -+++ b/src/dolphincontextmenu.cpp -@@ -381,9 +381,8 @@ bool DolphinContextMenu::placeExists(const QUrl &url) const - { - const KFilePlacesModel *placesModel = DolphinPlacesModelSingleton::instance().placesModel(); - -- const auto &matchedPlaces = placesModel->match(placesModel->index(0, 0), KFilePlacesModel::UrlRole, url, 1, Qt::MatchExactly); -- -- return !matchedPlaces.isEmpty(); -+ QModelIndex url_index = placesModel->closestItem(url); -+ return url_index.isValid() && placesModel->url(url_index).matches(url, QUrl::StripTrailingSlash); - } - - QAction *DolphinContextMenu::createPasteAction() -diff --git a/src/dolphinviewcontainer.cpp b/src/dolphinviewcontainer.cpp -index ef76042b8..e55519d04 100644 ---- a/src/dolphinviewcontainer.cpp -+++ b/src/dolphinviewcontainer.cpp -@@ -552,12 +552,11 @@ QString DolphinViewContainer::caption() const - } - - KFilePlacesModel *placesModel = DolphinPlacesModelSingleton::instance().placesModel(); -- const QString pattern = url().adjusted(QUrl::StripTrailingSlash).toString(QUrl::FullyEncoded).append("/?"); -- const auto &matchedPlaces = -- placesModel->match(placesModel->index(0, 0), KFilePlacesModel::UrlRole, QRegularExpression::anchoredPattern(pattern), 1, Qt::MatchRegularExpression); - -- if (!matchedPlaces.isEmpty()) { -- return placesModel->text(matchedPlaces.first()); -+ QModelIndex url_index = placesModel->closestItem(url()); -+ -+ if (url_index.isValid() && placesModel->url(url_index).matches(url(), QUrl::StripTrailingSlash)) { -+ return placesModel->text(url_index); - } - - if (!url().isLocalFile()) { --- -2.46.0 - diff --git a/desktop-plasma/patches/kde-apps/dolphin/0001-TerminalPanel-Send-End-instead-of-Ctrl-E-to-move-to-.patch b/desktop-plasma/patches/kde-apps/dolphin/0001-TerminalPanel-Send-End-instead-of-Ctrl-E-to-move-to-.patch new file mode 100644 index 0000000..6b11063 --- /dev/null +++ b/desktop-plasma/patches/kde-apps/dolphin/0001-TerminalPanel-Send-End-instead-of-Ctrl-E-to-move-to-.patch @@ -0,0 +1,33 @@ +From b65e53ac65c265dad3dca5c6687873f035d7c949 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Wolfgang=20M=C3=BCller?= <wolf@oriole.systems> +Date: Tue, 8 Oct 2024 15:36:33 +0200 +Subject: [PATCH] TerminalPanel: Send End instead of Ctrl-E to move to the end + of the line + +When using fish in vi mode it does not have Ctrl-E mapped to go to the +end of the line. Instead use the End key, which should be mapped in all +modes. +--- + src/panels/terminal/terminalpanel.cpp | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/panels/terminal/terminalpanel.cpp b/src/panels/terminal/terminalpanel.cpp +index 5b17023a3..dfdc896ff 100644 +--- a/src/panels/terminal/terminalpanel.cpp ++++ b/src/panels/terminal/terminalpanel.cpp +@@ -251,10 +251,10 @@ void TerminalPanel::sendCdToTerminal(const QString &dir, HistoryPolicy addToHist + return; + } + +- // Send prior Ctrl-E, Ctrl-U to ensure the line is empty. This is ++ // Send prior End, Ctrl-U to ensure the line is empty. This is + // mandatory, otherwise sending a 'cd x\n' to a prompt with 'rm -rf *' + // would result in data loss. +- m_terminal->sendInput(QStringLiteral("\x05\x15")); ++ m_terminal->sendInput(QStringLiteral("\x1B[F\x15")); + + // We want to ignore the currentDirectoryChanged(QString) signal, which we will receive after + // the directory change, because this directory change is not caused by a "cd" command that the +-- +2.46.2 + diff --git a/desktop-plasma/patches/kde-apps/konsole/0001-Always-pick-QFont-Bold-for-bold-fonts.patch b/desktop-plasma/patches/kde-apps/konsole/0001-Always-pick-QFont-Bold-for-bold-fonts.patch new file mode 100644 index 0000000..d2551fd --- /dev/null +++ b/desktop-plasma/patches/kde-apps/konsole/0001-Always-pick-QFont-Bold-for-bold-fonts.patch @@ -0,0 +1,25 @@ +From 40c72bb232ff37c69fb1c300d2ea40e13051cdb0 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Wolfgang=20M=C3=BCller?= <wolf@oriole.systems> +Date: Wed, 2 Oct 2024 23:43:17 +0200 +Subject: [PATCH] Always pick QFont::Bold for bold fonts + +--- + src/terminalDisplay/TerminalPainter.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/terminalDisplay/TerminalPainter.cpp b/src/terminalDisplay/TerminalPainter.cpp +index cb8b8fbe9..4157b5989 100644 +--- a/src/terminalDisplay/TerminalPainter.cpp ++++ b/src/terminalDisplay/TerminalPainter.cpp +@@ -211,7 +211,7 @@ void TerminalPainter::drawContents(Character *image, + }; + const QFont::Weight normalWeight = static_cast<QFont::Weight>(m_parentDisplay->font().weight()); // Qt6: cast can go away + auto it = std::upper_bound(std::begin(FontWeights), std::end(FontWeights), normalWeight); +- const QFont::Weight boldWeight = it != std::end(FontWeights) ? *it : QFont::Black; ++ const QFont::Weight boldWeight = it != std::end(FontWeights) ? QFont::Bold : QFont::Black; + paint.setLayoutDirection(Qt::LeftToRight); + const QColor *colorTable = m_parentDisplay->terminalColor()->colorTable(); + +-- +2.46.2 + diff --git a/desktop-plasma/patches/kde-frameworks/kio/0001-KFilePlacesView-have-setUrl-handle-trailing-slashes-.patch b/desktop-plasma/patches/kde-frameworks/kio/0001-KFilePlacesView-have-setUrl-handle-trailing-slashes-.patch deleted file mode 100644 index 09b3415..0000000 --- a/desktop-plasma/patches/kde-frameworks/kio/0001-KFilePlacesView-have-setUrl-handle-trailing-slashes-.patch +++ /dev/null @@ -1,91 +0,0 @@ -From 9140e58ea4ec9034d75fc7a3572cf0789dd4bb32 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Wolfgang=20M=C3=BCller?= <wolf@oriole.systems> -Date: Fri, 20 Sep 2024 09:23:18 +0200 -Subject: [PATCH] KFilePlacesView: have setUrl() handle trailing slashes in - place URLs - -Whilst KFilePlacesView::setUrl() correctly strips its argument when -comparing it to place URLs, it fails to strip the place URL itself. This -means that if a place URL contains a trailing slash, it is not correctly -highlighted in the place view. - -Instead of comparing both QUrl objects directly, use QUrl::matches, -which allows us to pass QUrl::StripTrailingSlash to both. - -Add a test case for this behaviour as well. ---- - autotests/kfileplacesviewtest.cpp | 37 +++++++++++++++++++++++++++++ - src/filewidgets/kfileplacesview.cpp | 2 +- - 2 files changed, 38 insertions(+), 1 deletion(-) - -diff --git a/autotests/kfileplacesviewtest.cpp b/autotests/kfileplacesviewtest.cpp -index 673bec37b..e70979eb3 100644 ---- a/autotests/kfileplacesviewtest.cpp -+++ b/autotests/kfileplacesviewtest.cpp -@@ -34,6 +34,8 @@ private Q_SLOTS: - - void testUrlChanged_data(); - void testUrlChanged(); -+ void testSetUrl_data(); -+ void testSetUrl(); - - private: - QTemporaryDir m_tmpHome; -@@ -100,6 +102,41 @@ void KFilePlacesViewTest::testUrlChanged() - QCOMPARE(args.at(0).toUrl().toString(), expectedUrl); - } - -+void KFilePlacesViewTest::testSetUrl_data() -+{ -+ QTest::addColumn<QUrl>("place"); -+ QTest::addColumn<QUrl>("url"); -+ -+ QString testPath = QString("file://%1/testSetUrl").arg(m_tmpHome.path()); -+ QUrl bareUrl = QUrl(testPath); -+ QUrl trailingUrl = QUrl(testPath.append("/")); -+ -+ QTest::newRow("place-bare-url-bare") << bareUrl << bareUrl; -+ QTest::newRow("place-bare-url-trailing") << bareUrl << trailingUrl; -+ QTest::newRow("place-trailing-url-bare") << trailingUrl << bareUrl; -+ QTest::newRow("place-trailing-url-trailing") << trailingUrl << trailingUrl; -+} -+ -+void KFilePlacesViewTest::testSetUrl() -+{ -+ QFETCH(QUrl, place); -+ QFETCH(QUrl, url); -+ -+ KFilePlacesView pv; -+ KFilePlacesModel pm; -+ pv.setModel(&pm); -+ -+ pm.addPlace("testSetUrl", place); -+ QModelIndex added = pm.closestItem(place); -+ -+ QSignalSpy selectionChangedSpy(pv.selectionModel(), &QItemSelectionModel::selectionChanged); -+ pv.setUrl(url); -+ -+ QVERIFY(!selectionChangedSpy.isEmpty()); -+ const QList<QVariant> args = selectionChangedSpy.takeFirst(); -+ QVERIFY(args.at(0).value<QItemSelection>().indexes().contains(added)); -+} -+ - QTEST_MAIN(KFilePlacesViewTest) - - #include "kfileplacesviewtest.moc" -diff --git a/src/filewidgets/kfileplacesview.cpp b/src/filewidgets/kfileplacesview.cpp -index dd4830353..c8eefde78 100644 ---- a/src/filewidgets/kfileplacesview.cpp -+++ b/src/filewidgets/kfileplacesview.cpp -@@ -1037,7 +1037,7 @@ void KFilePlacesView::setUrl(const QUrl &url) - - d->m_currentUrl = url; - -- if (placesModel->url(index) == url.adjusted(QUrl::StripTrailingSlash)) { -+ if (placesModel->url(index).matches(url, QUrl::StripTrailingSlash)) { - selectionModel()->setCurrentIndex(index, QItemSelectionModel::ClearAndSelect); - } else { - selectionModel()->clear(); --- -2.46.0 - diff --git a/desktop-plasma/patches/kde-frameworks/kio/0001-Pass-arguments-to-weltschmerz-correctly.patch b/desktop-plasma/patches/kde-frameworks/kio/0001-Pass-arguments-to-weltschmerz-correctly.patch index b7e19fb..087c21b 100644 --- a/desktop-plasma/patches/kde-frameworks/kio/0001-Pass-arguments-to-weltschmerz-correctly.patch +++ b/desktop-plasma/patches/kde-frameworks/kio/0001-Pass-arguments-to-weltschmerz-correctly.patch @@ -1,4 +1,4 @@ -From 532a7c03a4c5cc26a1f06ce4882b1d2010b6c44d Mon Sep 17 00:00:00 2001 +From 5dee62540628f2bebbe783bae0cf5a564d1c333f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wolfgang=20M=C3=BCller?= <wolf@oriole.systems> Date: Tue, 10 Sep 2024 23:11:02 +0200 Subject: [PATCH] Pass arguments to weltschmerz correctly @@ -34,7 +34,7 @@ index 63c924737..b2851077e 100644 KShell::Errors err; diff --git a/src/gui/kterminallauncherjob.cpp b/src/gui/kterminallauncherjob.cpp -index edd99327b..beb80b090 100644 +index edd99327b..1feca99c3 100644 --- a/src/gui/kterminallauncherjob.cpp +++ b/src/gui/kterminallauncherjob.cpp @@ -136,7 +136,11 @@ void KTerminalLauncherJob::determineFullCommand(bool fallbackToKonsoleService /* @@ -43,7 +43,7 @@ index edd99327b..beb80b090 100644 if (!d->m_command.isEmpty()) { - exec += QLatin1String(" -e ") + d->m_command; + if (exec == QLatin1String("weltschmerz")) { -+ exec += d->m_command; ++ exec += QLatin1String(" ") + d->m_command; + } else { + exec += QLatin1String(" -e ") + d->m_command; + } @@ -51,5 +51,5 @@ index edd99327b..beb80b090 100644 #else const QString windowsTerminal = QStringLiteral("wt.exe"); -- -2.46.0 +2.46.2 diff --git a/desktop-plasma/patches/kde-misc/kdeconnect/0001-Use-smartphone-icon-for-KDE-Connect-devices-in-Dolph.patch b/desktop-plasma/patches/kde-misc/kdeconnect/0001-Use-smartphone-icon-for-KDE-Connect-devices-in-Dolph.patch new file mode 100644 index 0000000..b15dcf5 --- /dev/null +++ b/desktop-plasma/patches/kde-misc/kdeconnect/0001-Use-smartphone-icon-for-KDE-Connect-devices-in-Dolph.patch @@ -0,0 +1,26 @@ +From a3b5f463b46d8f850a9e4eb0f3730d46b99de114 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Wolfgang=20M=C3=BCller?= <wolf@oriole.systems> +Date: Sat, 28 Sep 2024 11:45:39 +0200 +Subject: [PATCH] Use "smartphone" icon for KDE Connect devices in Dolphin + places + +--- + plugins/sftp/sftpplugin.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/plugins/sftp/sftpplugin.cpp b/plugins/sftp/sftpplugin.cpp +index b72a38c3..b0c22474 100644 +--- a/plugins/sftp/sftpplugin.cpp ++++ b/plugins/sftp/sftpplugin.cpp +@@ -42,7 +42,7 @@ void SftpPlugin::addToDolphin() + removeFromDolphin(); + + QUrl kioUrl(QStringLiteral("kdeconnect://") + deviceId + QStringLiteral("/")); +- m_placesModel.addPlace(device()->name(), kioUrl, QStringLiteral("kdeconnect")); ++ m_placesModel.addPlace(device()->name(), kioUrl, QStringLiteral("smartphone")); + qCDebug(KDECONNECT_PLUGIN_SFTP) << "add to dolphin"; + } + +-- +2.46.2 + diff --git a/desktop-plasma/patches/net-irc/quassel-0.14.0/0001-uisupport-Use-correct-application-name-in-KAboutData.patch b/desktop-plasma/patches/net-irc/quassel-0.14.0/0001-uisupport-Use-correct-application-name-in-KAboutData.patch deleted file mode 100644 index 4668031..0000000 --- a/desktop-plasma/patches/net-irc/quassel-0.14.0/0001-uisupport-Use-correct-application-name-in-KAboutData.patch +++ /dev/null @@ -1,43 +0,0 @@ -From f17bfbabb1f2cabfbc312f42e9628fd9905cde2b Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Wolfgang=20M=C3=BCller?= <wolf@oriole.systems> -Date: Wed, 18 Sep 2024 13:37:36 +0200 -Subject: [PATCH 1/2] uisupport: Use correct application name in KAboutData - -In commit 020c1634 (uisupport: fix application name for .desktop shell -integration, 2023-04-18), a call to setDesktopFileName() was added to -provide the correct .desktop file name for shell integration. However, -it also changed the application name from "quassel" to "quasselclient", -which does not match the application name Quassel sets when not built -with support for KDE, and breaks integration with KNotifications. - -The reason for this is that KNotifications expects the filename of the -global notification configuration file (quassel.notifyrc) to match the -application name [1]. With "quasselclient" now set as the application name -through KAboutData, this is no longer the case, and notifications simply -do not appear. - -Instead, use the previous application name, "quassel". This fixes -notifications for KDE and does not regress shell integration since we -still set the correct desktop file name. - -[1] https://api.kde.org/frameworks/knotifications/html/index.html ---- - src/uisupport/aboutdata.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/uisupport/aboutdata.cpp b/src/uisupport/aboutdata.cpp -index 380e54a5..afade4d3 100644 ---- a/src/uisupport/aboutdata.cpp -+++ b/src/uisupport/aboutdata.cpp -@@ -114,7 +114,7 @@ AboutData& AboutData::addCredits(std::initializer_list<AboutPerson> credits) - - KAboutData AboutData::kAboutData() const - { -- KAboutData aboutData(Quassel::buildInfo().clientApplicationName, tr("Quassel IRC"), Quassel::buildInfo().plainVersionString); -+ KAboutData aboutData(Quassel::buildInfo().applicationName, tr("Quassel IRC"), Quassel::buildInfo().plainVersionString); - aboutData.addLicense(KAboutLicense::GPL_V2); - aboutData.addLicense(KAboutLicense::GPL_V3); - aboutData.setShortDescription(tr("A modern, distributed IRC client")); --- -2.46.0 - diff --git a/desktop-plasma/patches/net-irc/quassel-0.14.0/0002-data-Set-DesktopEntry-correctly-in-notifyrc.patch b/desktop-plasma/patches/net-irc/quassel-0.14.0/0002-data-Set-DesktopEntry-correctly-in-notifyrc.patch deleted file mode 100644 index b1c9362..0000000 --- a/desktop-plasma/patches/net-irc/quassel-0.14.0/0002-data-Set-DesktopEntry-correctly-in-notifyrc.patch +++ /dev/null @@ -1,63 +0,0 @@ -From 4d6cb4424296e172a95d24f27c1cff54fccde372 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Wolfgang=20M=C3=BCller?= <wolf@oriole.systems> -Date: Wed, 18 Sep 2024 14:34:35 +0200 -Subject: [PATCH 2/2] data: Set DesktopEntry correctly in notifyrc - -KNotifications requires the DesktopEntry field in notifyrc to match the -base name of the application's desktop file [1]. Monolithic installs come -with a "quassel.desktop" file, which matches what is set presently in -notifyrc. However, client installs come with "quasselclient.desktop", -and do not match. - -To match up these values dynamically, introduce a notifyrc.in template -containing a placeholder which will be replaced by cmake. Since a system -can technically have both a monolithic binary and a client installed at -the same time, and we can't install two separate notifyrc files because -the application name stays the same throughout, assume the user prefers -the monolithic install when configured. - -[1] https://api.kde.org/frameworks/knotifications/html/index.html ---- - data/CMakeLists.txt | 10 +++++++++- - data/{quassel.notifyrc => quassel.notifyrc.in} | 2 +- - 2 files changed, 10 insertions(+), 2 deletions(-) - rename data/{quassel.notifyrc => quassel.notifyrc.in} (99%) - -diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt -index 099d53b0..509e2c55 100644 ---- a/data/CMakeLists.txt -+++ b/data/CMakeLists.txt -@@ -1,6 +1,14 @@ - if (BUILD_GUI) - if (WITH_KF5) -- install(FILES quassel.notifyrc DESTINATION ${CMAKE_INSTALL_KNOTIFY5RCDIR}) -+ set(DESKTOP_FILE "quasselclient") -+ -+ if (WANT_MONO) -+ set(DESKTOP_FILE "quassel") -+ endif() -+ -+ configure_file(quassel.notifyrc.in quassel.notifyrc @ONLY) -+ -+ install(FILES ${CMAKE_BINARY_DIR}/data/quassel.notifyrc DESTINATION ${CMAKE_INSTALL_KNOTIFY5RCDIR}) - endif() - - if (UNIX AND NOT APPLE) -diff --git a/data/quassel.notifyrc b/data/quassel.notifyrc.in -similarity index 99% -rename from data/quassel.notifyrc -rename to data/quassel.notifyrc.in -index 733b379a..c20638fb 100644 ---- a/data/quassel.notifyrc -+++ b/data/quassel.notifyrc.in -@@ -1,6 +1,6 @@ - [Global] - IconName=quassel --DesktopEntry=quassel -+DesktopEntry=@DESKTOP_FILE@ - Comment=Quassel IRC - Comment[ast]=Quassel IRC - Comment[ca]=Xat IRC Quassel --- -2.46.0 - |