diff options
author | Andreas Sturmlechner <asturm@gentoo.org> | 2020-05-15 22:28:14 +0200 |
---|---|---|
committer | Andreas Sturmlechner <asturm@gentoo.org> | 2020-05-15 22:28:45 +0200 |
commit | 997c8c030e644b17a1f64b3d92b44276e29eb375 (patch) | |
tree | cab75747ab54b74ae7e03ab68716e6a8597f6008 /kde-apps | |
parent | package.mask: Last rite dev-python/ PEAK packages (diff) | |
download | gentoo-997c8c030e644b17a1f64b3d92b44276e29eb375.tar.gz gentoo-997c8c030e644b17a1f64b3d92b44276e29eb375.tar.bz2 gentoo-997c8c030e644b17a1f64b3d92b44276e29eb375.zip |
kde-apps: Drop unused patches
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'kde-apps')
-rw-r--r-- | kde-apps/konqueror/files/konqueror-20.04.0-kf5bookmarks-5.69.patch | 55 | ||||
-rw-r--r-- | kde-apps/ktp-kded-module/files/ktp-kded-module-20.04.0-ktp_integration_module.patch | 49 |
2 files changed, 0 insertions, 104 deletions
diff --git a/kde-apps/konqueror/files/konqueror-20.04.0-kf5bookmarks-5.69.patch b/kde-apps/konqueror/files/konqueror-20.04.0-kf5bookmarks-5.69.patch deleted file mode 100644 index 67eab1d6315d..000000000000 --- a/kde-apps/konqueror/files/konqueror-20.04.0-kf5bookmarks-5.69.patch +++ /dev/null @@ -1,55 +0,0 @@ -From b61086cfece0d0f11ecfe9c3309697997cada201 Mon Sep 17 00:00:00 2001 -From: Stefano Crocco <stefano.crocco@alice.it> -Date: Tue, 14 Apr 2020 10:21:48 +0200 -Subject: [PATCH] Fix crash due to changes in KBookmarkMenu - -Summary: -Since version 5.69, KBookmarkMenu doesn't automatically create an action -collection. This causes Konqueror to crash when going on a submenu in -the Bookmarks menu. To avoid it, manually create the action collection. - -Also, avoid calling the version of KBookmarkMenu construction which -takes a KActionCollection, as it's deprecated. - -Test Plan: -Open the bookmarks menu and hover with the mouse on a submenu. Check -that it crashes. Do the same after this change and check it doesn't crash -anymore. - -Reviewers: dfaure, nicolasfella - -Reviewed By: dfaure, nicolasfella - -Subscribers: arojas, poboiko - -Differential Revision: https://phabricator.kde.org/D28789 ---- - src/konqbookmarkmenu.h | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/src/konqbookmarkmenu.h b/src/konqbookmarkmenu.h -index 9ff4c0f55..d47960f7b 100644 ---- a/src/konqbookmarkmenu.h -+++ b/src/konqbookmarkmenu.h -@@ -26,6 +26,7 @@ - #include "kbookmarkcontextmenu.h" - - #include <KActionCollection> -+#include <kbookmarks_version.h> - - namespace Konqueror { // to avoid clashing with KF5::Bookmarks which had a KonqBookmarkMenu class. Remove once using KF6. - -@@ -61,7 +62,10 @@ public: - KonqBookmarkMenu(KBookmarkManager *mgr, KBookmarkOwner *owner, KBookmarkActionMenu *parentMenu, QString parentAddress) - : KBookmarkMenu(mgr, owner, parentMenu->menu(), parentAddress) - { -+//KBookmarkMenu doesn't create an action collection only in version 5.69.0 -+#if KBOOKMARKS_VERSION == QT_VERSION_CHECK(5, 69, 0) - m_actionCollection = new KActionCollection(this); -+#endif - } - - protected: --- -2.26.2 - diff --git a/kde-apps/ktp-kded-module/files/ktp-kded-module-20.04.0-ktp_integration_module.patch b/kde-apps/ktp-kded-module/files/ktp-kded-module-20.04.0-ktp_integration_module.patch deleted file mode 100644 index f008b02ab8a3..000000000000 --- a/kde-apps/ktp-kded-module/files/ktp-kded-module-20.04.0-ktp_integration_module.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 5b412673cbbd7739b8de8c477e048e7bba85edc1 Mon Sep 17 00:00:00 2001 -From: Serg Truf <strufkin@gmail.com> -Date: Thu, 30 Apr 2020 16:16:27 +0200 -Subject: rename ktp_integration target so it comply to the name in dbus - service file - -Summary: -kded was complaining that it could not find some of the modules - -``` -kded5[7242]: kf5.kded: could not find kded module with id "ktp_integration_module" -``` - -so let's rename target from ktp_integration to ktp_integration_module so we comply with what configured in service file: -``` -[D-BUS Service] -Name=org.freedesktop.Telepathy.Client.KTp.KdedIntegrationModule -Exec=/usr/bin/dbus-send --session --type=method_call --dest=org.kde.kded5 /kded org.kde.kded5.loadModule string:"ktp_integration_module" -``` - -Reviewers: #kde_telepathy, akulichalexandr, nicolasfella - -Reviewed By: #kde_telepathy, akulichalexandr - -Subscribers: asturmlechner, rdieter, arojas, #kde_telepathy - -Tags: #kde_telepathy - -Differential Revision: https://phabricator.kde.org/D28604 ---- - CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 3f8130c..66d95bc 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -54,7 +54,7 @@ set (kded_ktp_integration_module_SRCS - ) - - add_library (kded_ktp_integration_module MODULE ${kded_ktp_integration_module_SRCS}) --set_target_properties (kded_ktp_integration_module PROPERTIES OUTPUT_NAME ktp_integration) -+set_target_properties (kded_ktp_integration_module PROPERTIES OUTPUT_NAME ktp_integration_module) - kcoreaddons_desktop_to_json(kded_ktp_integration_module ktp_integration_module.desktop) - - target_link_libraries (kded_ktp_integration_module --- -cgit v1.1 - |