commit: 3465c2f72285e1a4abe8cb3c54b5846fbe0c8427 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Sat Oct 24 09:22:52 2020 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Sat Oct 24 09:22:52 2020 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=3465c2f7
net-irc/konversation: Drop patch, cherry-picked upstream Upstream commit 915fd59dc31ce625dda87cf3ce72519dd8bc5f75 Package-Manager: Portage-3.0.8, Repoman-3.0.2 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> .../konversation-1.7.5-kf5bookmarks-5.69.patch | 51 ---------------------- net-irc/konversation/konversation-1.7.9999.ebuild | 1 - 2 files changed, 52 deletions(-) diff --git a/net-irc/konversation/files/konversation-1.7.5-kf5bookmarks-5.69.patch b/net-irc/konversation/files/konversation-1.7.5-kf5bookmarks-5.69.patch deleted file mode 100644 index 2c36f69aa9..0000000000 --- a/net-irc/konversation/files/konversation-1.7.5-kf5bookmarks-5.69.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 57df81cd8a11c4dbe170f9d81abd5b35b4887e0b Mon Sep 17 00:00:00 2001 -From: Ahmad Samir <[email protected]> -Date: Fri, 17 Apr 2020 13:14:26 +0200 -Subject: Adapt the code to KBookmarkMenu-5.69 changes - -Test Plan: -Bookmarks menu still works, and the bookmark actions still show in the -shortcuts editor dialog. - -Reviewers: #konversation, psn - -Reviewed By: #konversation, psn - -Subscribers: #konversation - -Differential Revision: https://phabricator.kde.org/D28911 ---- - src/bookmarkhandler.cpp | 8 ++++++++ - 1 file changed, 8 insertions(+) - -diff --git a/src/bookmarkhandler.cpp b/src/bookmarkhandler.cpp -index 5a70591..74b51ff 100644 ---- a/src/bookmarkhandler.cpp -+++ b/src/bookmarkhandler.cpp -@@ -21,7 +21,10 @@ Copyright (C) 2002 Carsten Pfeiffer <[email protected]> - #include "connectionmanager.h" - #include "viewer/viewcontainer.h" - -+#include <KActionCollection> -+#include <kbookmarks_version.h> - #include <KBookmarkMenu> -+#include <QMenu> - #include <QStandardPaths> - - -@@ -41,7 +44,12 @@ m_mainWindow(mainWindow) - manager->setEditorOptions(i18n("Konversation Bookmarks Editor"), false); - manager->setUpdate( true ); - -+#if KBOOKMARKS_VERSION < QT_VERSION_CHECK(5, 69, 0) - m_bookmarkMenu = new KBookmarkMenu(manager, this, menu, m_mainWindow->actionCollection()); -+#else -+ m_bookmarkMenu = new KBookmarkMenu(manager, this, menu); -+ m_mainWindow->actionCollection()->addActions(menu->actions()); -+#endif - } - - KonviBookmarkHandler::~KonviBookmarkHandler() --- -cgit v1.1 - diff --git a/net-irc/konversation/konversation-1.7.9999.ebuild b/net-irc/konversation/konversation-1.7.9999.ebuild index 820ba38372..5775461662 100644 --- a/net-irc/konversation/konversation-1.7.9999.ebuild +++ b/net-irc/konversation/konversation-1.7.9999.ebuild @@ -61,7 +61,6 @@ RDEPEND="${DEPEND} PATCHES=( # git master - "${FILESDIR}"/${PN}-1.7.5-kf5bookmarks-5.69.patch "${FILESDIR}"/${PN}-1.7.5-unused-kemoticons.patch "${FILESDIR}"/${PN}-1.7.6-no-kiconthemes.patch )
