Hello community, here is the log from the commit of package kbookmarks for openSUSE:Factory checked in at 2020-04-25 20:09:35 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kbookmarks (Old) and /work/SRC/openSUSE:Factory/.kbookmarks.new.2738 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kbookmarks" Sat Apr 25 20:09:35 2020 rev:78 rq:795748 version:5.69.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kbookmarks/kbookmarks.changes 2020-04-15 20:02:10.237918933 +0200 +++ /work/SRC/openSUSE:Factory/.kbookmarks.new.2738/kbookmarks.changes 2020-04-25 20:09:45.399724935 +0200 @@ -1,0 +2,7 @@ +Mon Apr 20 09:19:16 UTC 2020 - Wolfgang Bauer <[email protected]> + +- Add Always-create-actioncollection.patch to fix crash in + Konqueror when going to a subfolder in the bookmarks menu + (boo#1169838) + +------------------------------------------------------------------- New: ---- Always-create-actioncollection.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kbookmarks.spec ++++++ --- /var/tmp/diff_new_pack.2tNSuI/_old 2020-04-25 20:09:47.967730230 +0200 +++ /var/tmp/diff_new_pack.2tNSuI/_new 2020-04-25 20:09:47.971730238 +0200 @@ -36,6 +36,8 @@ Source2: frameworks.keyring %endif Source99: baselibs.conf +# PATCH-FIX-UPSTREAM +Patch: Always-create-actioncollection.patch BuildRequires: cmake >= 3.5 BuildRequires: extra-cmake-modules >= %{_kf5_bugfix_version} BuildRequires: fdupes @@ -83,6 +85,7 @@ %prep %setup -q +%autopatch -p1 %build %cmake_kf5 -d build ++++++ Always-create-actioncollection.patch ++++++ >From 4b3fc2aedd86505a47b9b185e086ef253e73ede8 Mon Sep 17 00:00:00 2001 From: Nicolas Fella <[email protected]> Date: Mon, 13 Apr 2020 19:14:56 +0200 Subject: Always create actioncollection Summary: Otherwise subclasses that unconditionally use m_actionCollection will get crashes. Observed in D28789 Reviewers: #frameworks, dfaure, stefanocrocco Reviewed By: dfaure Subscribers: kde-frameworks-devel Tags: #frameworks Differential Revision: https://phabricator.kde.org/D28800 --- src/kbookmarkmenu.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/kbookmarkmenu.cpp b/src/kbookmarkmenu.cpp index 34720ba..56a4359 100644 --- a/src/kbookmarkmenu.cpp +++ b/src/kbookmarkmenu.cpp @@ -72,7 +72,7 @@ KBookmarkMenu::KBookmarkMenu(KBookmarkManager *mgr, KBookmarkMenu::KBookmarkMenu(KBookmarkManager* manager, KBookmarkOwner* _owner, QMenu* _parentMenu) : QObject(), - m_actionCollection(nullptr), + m_actionCollection(new KActionCollection(this)), d(new KBookmarkMenuPrivate()), m_bIsRoot(true), m_pManager(manager), @@ -124,7 +124,7 @@ KBookmarkMenu::KBookmarkMenu(KBookmarkManager *mgr, QMenu *_parentMenu, const QString &parentAddress) : QObject(), - m_actionCollection(nullptr), + m_actionCollection(new KActionCollection(this)), d(new KBookmarkMenuPrivate()), m_bIsRoot(false), m_pManager(mgr), -- cgit v1.1
