From 6ac99e1445cd505a6b4af3612c4694aae32e899707b93181eaf11620332fa457 Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux Date: Sat, 9 May 2020 06:30:24 +0000 Subject: [PATCH] KDE Frameworks 5.70 OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kbookmarks?expand=0&rev=201 --- Always-create-actioncollection.patch | 45 ---------------------------- kbookmarks-5.69.0.tar.xz | 3 -- kbookmarks-5.69.0.tar.xz.sig | 11 ------- kbookmarks-5.70.0.tar.xz | 3 ++ kbookmarks-5.70.0.tar.xz.sig | 11 +++++++ kbookmarks.changes | 13 ++++++++ kbookmarks.spec | 7 ++--- 7 files changed, 29 insertions(+), 64 deletions(-) delete mode 100644 Always-create-actioncollection.patch delete mode 100644 kbookmarks-5.69.0.tar.xz delete mode 100644 kbookmarks-5.69.0.tar.xz.sig create mode 100644 kbookmarks-5.70.0.tar.xz create mode 100644 kbookmarks-5.70.0.tar.xz.sig diff --git a/Always-create-actioncollection.patch b/Always-create-actioncollection.patch deleted file mode 100644 index 76bb75a..0000000 --- a/Always-create-actioncollection.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 4b3fc2aedd86505a47b9b185e086ef253e73ede8 Mon Sep 17 00:00:00 2001 -From: Nicolas Fella -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 - diff --git a/kbookmarks-5.69.0.tar.xz b/kbookmarks-5.69.0.tar.xz deleted file mode 100644 index 23127a2..0000000 --- a/kbookmarks-5.69.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9bd8c3226cde3fa307cc72875fe3f2b768949c16ef3b198e01a49a39b1624ea4 -size 121596 diff --git a/kbookmarks-5.69.0.tar.xz.sig b/kbookmarks-5.69.0.tar.xz.sig deleted file mode 100644 index 189cbfc..0000000 --- a/kbookmarks-5.69.0.tar.xz.sig +++ /dev/null @@ -1,11 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQEzBAABCgAdFiEEU+a0e0XOo+DVt0V3WNDuZIpIs7sFAl6JFJcACgkQWNDuZIpI -s7sJRggAn8DX/dMkGe9FPLTOBVytjIefrN/YL3bawR8ugQqZLN3KwuJ0uqFyajBG -3pLHUpS35yXVclMKchm1ceVhcrpdYfrgGjA9uW6xpPBv1A/pUauXeEJoZMvjeRcI -242cKaGJmiGqzapBxuowfVKWHwL+aSQLoZOO7THLoOb2uOUIcWYZR/jCJ8E9IgfN -s6tDFaulYon4TOOq/6qqtrZq7uLCakGPQcQOKy5J6EtzBDpStME6++0e6PVPvTlO -J/Htt3qsAj3X78vrhQZTsUTpk7D9+23Hbg6j2xp+W04F8hOqYyKnqKwyfaWu/zUA -7Wvk53zIlsVRjKb973zhnVIsf48+ZQ== -=48Z6 ------END PGP SIGNATURE----- diff --git a/kbookmarks-5.70.0.tar.xz b/kbookmarks-5.70.0.tar.xz new file mode 100644 index 0000000..f448a48 --- /dev/null +++ b/kbookmarks-5.70.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5ae557a511ef90f1930d2cb0e898f62341264c61533cb6a8ab9027e6b767bbc4 +size 121656 diff --git a/kbookmarks-5.70.0.tar.xz.sig b/kbookmarks-5.70.0.tar.xz.sig new file mode 100644 index 0000000..65d9cbc --- /dev/null +++ b/kbookmarks-5.70.0.tar.xz.sig @@ -0,0 +1,11 @@ +-----BEGIN PGP SIGNATURE----- + +iQEzBAABCgAdFiEEU+a0e0XOo+DVt0V3WNDuZIpIs7sFAl6wk+IACgkQWNDuZIpI +s7t3mwf9El1Hq+wWzgMWU0Pa/geYFNWOdHmoGm2ElTSGl9YTFVnF0u1z0R1RzaDo +99SSc+/28yQE/TOKG2uZ/vppiUyGmpG5Mm2Zm9ipocGICz85Dt5l6qDq1+wV/E4q +YAtkaYTUdlce7FC6J/i/55k6EUN8kelQMIbv+f4V08x0GK22o2TFgNm26E6TdSM4 +eNk7lneS0EeY4sitWWSK/25exEmC6A/ZUbCXwu/1u7RhFrilC3oNlUJt4IXlZ1+F +dJ1cXsAr/0xZ3qE9UhCssJUaJo1N0XKfgDo/0tycTnA7qmEhal3tfzgBfHXz/JVf +6gVmWWD6RASbe+xrl+ABBgoAv3tOCQ== +=fT6F +-----END PGP SIGNATURE----- diff --git a/kbookmarks.changes b/kbookmarks.changes index d150703..f11a2ed 100644 --- a/kbookmarks.changes +++ b/kbookmarks.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Sun May 3 09:39:44 UTC 2020 - Christophe Giboudeaux + +- Update to 5.70.0 + * New feature release + * For more details please see: + * https://kde.org/announcements/kde-frameworks-5.70.0 +- Changes since 5.69.0: + * Always create actioncollection + * [KBookMarksMenu] Set objectName for newBookmarkFolderAction + * [KBookmarksMenu] Assign m_actionCollection early to prevent crash +- Drop Always-create-actioncollection.patch. Merged upstream + ------------------------------------------------------------------- Mon Apr 20 09:19:16 UTC 2020 - Wolfgang Bauer diff --git a/kbookmarks.spec b/kbookmarks.spec index f1f214d..5d8a5f4 100644 --- a/kbookmarks.spec +++ b/kbookmarks.spec @@ -17,14 +17,14 @@ %define lname libKF5Bookmarks5 -%define _tar_path 5.69 +%define _tar_path 5.70 # Full KF5 version (e.g. 5.33.0) %{!?_kf5_version: %global _kf5_version %{version}} # Last major and minor KF5 version (e.g. 5.33) %{!?_kf5_bugfix_version: %define _kf5_bugfix_version %(echo %{_kf5_version} | awk -F. '{print $1"."$2}')} %bcond_without lang Name: kbookmarks -Version: 5.69.0 +Version: 5.70.0 Release: 0 Summary: Framework for manipulating bookmarks in XBEL format License: LGPL-2.1-or-later @@ -36,8 +36,6 @@ Source1: https://download.kde.org/stable/frameworks/%{_tar_path}/%{name}- 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 @@ -85,7 +83,6 @@ manipulating bookmarks using the XBEL format %prep %setup -q -%autopatch -p1 %build %cmake_kf5 -d build