summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2020-05-09 13:25:52 +0200
committerAndreas Sturmlechner <asturm@gentoo.org>2020-05-09 13:31:40 +0200
commit218edde006943b065d56ceda1afc15bbae0e523c (patch)
treee2c91b86eb2253a0fda022900c4720b07deae652 /kde-frameworks/kbookmarks
parentkde-frameworks: Add KDE Frameworks 5.70.0 (diff)
downloadgentoo-218edde006943b065d56ceda1afc15bbae0e523c.tar.gz
gentoo-218edde006943b065d56ceda1afc15bbae0e523c.tar.bz2
gentoo-218edde006943b065d56ceda1afc15bbae0e523c.zip
kde-frameworks: Drop KDE Frameworks 5.69.0
Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'kde-frameworks/kbookmarks')
-rw-r--r--kde-frameworks/kbookmarks/Manifest1
-rw-r--r--kde-frameworks/kbookmarks/files/kbookmarks-5.69.0-konqbookmarkmenu.patch67
-rw-r--r--kde-frameworks/kbookmarks/kbookmarks-5.69.0-r1.ebuild36
3 files changed, 0 insertions, 104 deletions
diff --git a/kde-frameworks/kbookmarks/Manifest b/kde-frameworks/kbookmarks/Manifest
index 6620805bab6..4eed28dbda5 100644
--- a/kde-frameworks/kbookmarks/Manifest
+++ b/kde-frameworks/kbookmarks/Manifest
@@ -1,3 +1,2 @@
DIST kbookmarks-5.67.0.tar.xz 120776 BLAKE2B 67cc22431d9ef75d6a0c7239a39cc40e9db2d941185ffdd96f0085c0f419569885cee8efe65f21214fb6188ff96bc52d26e0d2fe4b1b18fb9ba99920aa3d74d7 SHA512 3ab71f193e3acf2bd0074d3e20e38c9cc3ee9aec207d59b06cb8f7d160b40337d5473f29afd1fec17f0af0d82abd8b31821f46991734ae8906c5fd6aa926e066
-DIST kbookmarks-5.69.0.tar.xz 121596 BLAKE2B 8a04dedb7eefc048ca4061521825e4eceb5f8c29bcbe08fb976ae3bb2060fb7fd525f171d15584a5b14481b5958e18e260e7cf8cf68f8638b6bccd3a39b366dc SHA512 9c13e15f63ac65215fb0517b781fc217f1e7fc4756a3faca1ce12a9de8cdf5d08094fce5a6dfddaacfe6a9718ba2f47ffce72b690a7903ab726af6e13056ec5a
DIST kbookmarks-5.70.0.tar.xz 121656 BLAKE2B 5d45e10aec1b2940b3124af54ae0f3afc320817292f4ad495ccf1e4177376edf5aad752ea34acbe54c843392a882d754b327848ed8ef26593c532ad5da160ed1 SHA512 8b267b13efc2546fb30a3d43fb17ee4edfc1a09c3ba8a56d87538592862404fb7d7d9424e3f35dda56749e250abf7103d63834375418d262a6dc822744d0e8ed
diff --git a/kde-frameworks/kbookmarks/files/kbookmarks-5.69.0-konqbookmarkmenu.patch b/kde-frameworks/kbookmarks/files/kbookmarks-5.69.0-konqbookmarkmenu.patch
deleted file mode 100644
index c0e68bc8427..00000000000
--- a/kde-frameworks/kbookmarks/files/kbookmarks-5.69.0-konqbookmarkmenu.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From 8504e095478b1c922055fc4ae6c736472708fddd Mon Sep 17 00:00:00 2001
-From: Stefano Crocco <stefano.crocco@alice.it>
-Date: Mon, 13 Apr 2020 10:53:06 +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: nicolasfella
-
-Subscribers: poboiko
-
-Differential Revision: https://phabricator.kde.org/D28789
-
-* asturm, 2020-04-23: This *is* KF-5.69 so no need to check for the
- version wrt commit b61086cf.
----
- src/konqbookmarkmenu.h | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/src/konqbookmarkmenu.h b/src/konqbookmarkmenu.h
-index 4898c3a..45bdb84 100644
---- a/src/konqbookmarkmenu.h
-+++ b/src/konqbookmarkmenu.h
-@@ -25,6 +25,8 @@
- #include "kbookmarkactionmenu.h"
- #include "kbookmarkcontextmenu.h"
-
-+#include <KActionCollection>
-+
- #if KBOOKMARKS_ENABLE_DEPRECATED_SINCE(5, 0)
- #include "kbookmarkowner.h" // for SC reasons
-
-@@ -56,8 +58,9 @@ public:
- */
- KBOOKMARKS_DEPRECATED_VERSION(5, 65, "This class has moved to Konqueror")
- KonqBookmarkMenu(KBookmarkManager *mgr, KBookmarkOwner *owner, KBookmarkActionMenu *parentMenu, KActionCollection *collec)
-- : KBookmarkMenu(mgr, owner, parentMenu->menu(), collec)
-+ : KBookmarkMenu(mgr, owner, parentMenu->menu())
- {
-+ m_actionCollection = collec;
- }
- ~KonqBookmarkMenu() override
- {}
-@@ -71,6 +74,7 @@ public:
- KonqBookmarkMenu(KBookmarkManager *mgr, KBookmarkOwner *owner, KBookmarkActionMenu *parentMenu, QString parentAddress)
- : KBookmarkMenu(mgr, owner, parentMenu->menu(), parentAddress)
- {
-+ m_actionCollection = new KActionCollection(this);
- }
-
- protected:
---
-2.26.2
-
diff --git a/kde-frameworks/kbookmarks/kbookmarks-5.69.0-r1.ebuild b/kde-frameworks/kbookmarks/kbookmarks-5.69.0-r1.ebuild
deleted file mode 100644
index 886f2635f73..00000000000
--- a/kde-frameworks/kbookmarks/kbookmarks-5.69.0-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.12.3
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Framework for managing bookmarks stored in XBEL format"
-
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="nls"
-
-BDEPEND="
- nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
-"
-RDEPEND="
- >=dev-qt/qtdbus-${QTMIN}:5
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
- >=dev-qt/qtxml-${QTMIN}:5
- =kde-frameworks/kcodecs-${PVCUT}*:5
- =kde-frameworks/kconfig-${PVCUT}*:5
- =kde-frameworks/kcoreaddons-${PVCUT}*:5
- =kde-frameworks/kiconthemes-${PVCUT}*:5
- =kde-frameworks/kwidgetsaddons-${PVCUT}*:5
- =kde-frameworks/kxmlgui-${PVCUT}*:5
-"
-DEPEND="${RDEPEND}
- >=kde-frameworks/kconfigwidgets-${PVCUT}:5
-"
-
-PATCHES=( "${FILESDIR}/${P}-konqbookmarkmenu.patch" )