From 781ea43563979f3c99fb00cedd6063448fbe45dd Mon Sep 17 00:00:00 2001
From: Andreas Sturmlechner <asturm@gentoo.org>
Date: Fri, 17 Apr 2020 21:40:50 +0200
Subject: net-irc/konversation: Adapt to >=kde-frameworks/kbookmarks-5.69

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
---
 .../konversation-1.7.5-kf5bookmarks-5.69.patch     | 51 ++++++++++++++++++++++
 net-irc/konversation/konversation-1.7.5-r2.ebuild  |  4 +-
 2 files changed, 54 insertions(+), 1 deletion(-)
 create mode 100644 net-irc/konversation/files/konversation-1.7.5-kf5bookmarks-5.69.patch

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
new file mode 100644
index 000000000000..2c36f69aa99c
--- /dev/null
+++ b/net-irc/konversation/files/konversation-1.7.5-kf5bookmarks-5.69.patch
@@ -0,0 +1,51 @@
+From 57df81cd8a11c4dbe170f9d81abd5b35b4887e0b Mon Sep 17 00:00:00 2001
+From: Ahmad Samir <a.samirh78@gmail.com>
+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 <pfeiffer@kde.org>
+ #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.5-r2.ebuild b/net-irc/konversation/konversation-1.7.5-r2.ebuild
index 9940dae72376..cb4852121368 100644
--- a/net-irc/konversation/konversation-1.7.5-r2.ebuild
+++ b/net-irc/konversation/konversation-1.7.5-r2.ebuild
@@ -26,7 +26,7 @@ DEPEND="
 	>=dev-qt/qtwidgets-${QTMIN}:5
 	>=dev-qt/qtxml-${QTMIN}:5
 	>=kde-frameworks/karchive-${KFMIN}:5
-	>=kde-frameworks/kbookmarks-${KFMIN}:5
+	>=kde-frameworks/kbookmarks-${KFMIN}:5=
 	>=kde-frameworks/kcodecs-${KFMIN}:5
 	>=kde-frameworks/kcompletion-${KFMIN}:5
 	>=kde-frameworks/kconfig-${KFMIN}:5
@@ -63,6 +63,8 @@ PATCHES=(
 	"${FILESDIR}"/${P}-missing-header.patch
 	"${FILESDIR}"/${P}-QElapsedTimer.patch
 	"${FILESDIR}"/${P}-kf5windowsystem-5.63.patch
+	# git master
+	"${FILESDIR}"/${P}-kf5bookmarks-5.69.patch
 )
 
 src_configure() {
-- 
cgit v1.2.3