From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 9C78B138351 for ; Thu, 23 Apr 2020 22:07:34 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4091FE0D62; Thu, 23 Apr 2020 22:07:31 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 1C41AE0D62 for ; Thu, 23 Apr 2020 22:07:31 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E1C9234F28B for ; Thu, 23 Apr 2020 22:07:29 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 112291FA for ; Thu, 23 Apr 2020 22:07:27 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1587679618.93d86ef95882e8cc6d1e02b0ce84444f5de92eb8.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: kde-apps/konqueror/files/, kde-apps/konqueror/ X-VCS-Repository: repo/gentoo X-VCS-Files: kde-apps/konqueror/files/konqueror-20.04.0-kf5bookmarks-5.69.patch kde-apps/konqueror/konqueror-20.04.0.ebuild X-VCS-Directories: kde-apps/konqueror/ kde-apps/konqueror/files/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 93d86ef95882e8cc6d1e02b0ce84444f5de92eb8 X-VCS-Branch: master Date: Thu, 23 Apr 2020 22:07:27 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 130eba17-32fa-44b5-b0ed-5d48c74bf44c X-Archives-Hash: f4e180d4633b3846cb93c5c0a50bce87 commit: 93d86ef95882e8cc6d1e02b0ce84444f5de92eb8 Author: Andreas Sturmlechner gentoo org> AuthorDate: Thu Apr 23 13:56:07 2020 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Thu Apr 23 22:06:58 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=93d86ef9 kde-apps/konqueror: Adapt to >=kde-frameworks/kbookmarks-5.69 Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: Andreas Sturmlechner gentoo.org> .../konqueror-20.04.0-kf5bookmarks-5.69.patch | 55 ++++++++++++++++++++++ kde-apps/konqueror/konqueror-20.04.0.ebuild | 4 ++ 2 files changed, 59 insertions(+) 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 new file mode 100644 index 00000000000..67eab1d6315 --- /dev/null +++ b/kde-apps/konqueror/files/konqueror-20.04.0-kf5bookmarks-5.69.patch @@ -0,0 +1,55 @@ +From b61086cfece0d0f11ecfe9c3309697997cada201 Mon Sep 17 00:00:00 2001 +From: Stefano Crocco +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 ++#include + + 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/konqueror/konqueror-20.04.0.ebuild b/kde-apps/konqueror/konqueror-20.04.0.ebuild index 4d7a5e44fde..9f95cfadf19 100644 --- a/kde-apps/konqueror/konqueror-20.04.0.ebuild +++ b/kde-apps/konqueror/konqueror-20.04.0.ebuild @@ -63,6 +63,10 @@ RDEPEND="${COMMON_DEPEND} kde-plasma/kde-cli-tools:5 " +PATCHES=( + "${FILESDIR}/${P}-kf5bookmarks-5.69.patch" # bug 717316, KDE-Bug 420010 +) + src_prepare() { [[ ${CHOST} == *-solaris* ]] && append-ldflags -lmalloc