Hello community, here is the log from the commit of package kbookmarks for openSUSE:Factory checked in at 2020-05-11 13:27:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kbookmarks (Old) and /work/SRC/openSUSE:Factory/.kbookmarks.new.2738 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kbookmarks" Mon May 11 13:27:11 2020 rev:79 rq:802064 version:5.70.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kbookmarks/kbookmarks.changes 2020-04-25 20:09:45.399724935 +0200 +++ /work/SRC/openSUSE:Factory/.kbookmarks.new.2738/kbookmarks.changes 2020-05-11 13:28:25.919492340 +0200 @@ -1,0 +2,13 @@ +Sun May 3 09:39:44 UTC 2020 - Christophe Giboudeaux <[email protected]> + +- 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 + +------------------------------------------------------------------- Old: ---- Always-create-actioncollection.patch kbookmarks-5.69.0.tar.xz kbookmarks-5.69.0.tar.xz.sig New: ---- kbookmarks-5.70.0.tar.xz kbookmarks-5.70.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kbookmarks.spec ++++++ --- /var/tmp/diff_new_pack.zJrKKV/_old 2020-05-11 13:28:26.459493472 +0200 +++ /var/tmp/diff_new_pack.zJrKKV/_new 2020-05-11 13:28:26.463493481 +0200 @@ -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 @@ 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 @@ %prep %setup -q -%autopatch -p1 %build %cmake_kf5 -d build ++++++ kbookmarks-5.69.0.tar.xz -> kbookmarks-5.70.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kbookmarks-5.69.0/CMakeLists.txt new/kbookmarks-5.70.0/CMakeLists.txt --- old/kbookmarks-5.69.0/CMakeLists.txt 2020-04-05 00:55:06.000000000 +0200 +++ new/kbookmarks-5.70.0/CMakeLists.txt 2020-05-05 00:14:52.000000000 +0200 @@ -1,11 +1,11 @@ cmake_minimum_required(VERSION 3.5) -set(KF5_VERSION "5.69.0") # handled by release scripts -set(KF5_DEP_VERSION "5.69.0") # handled by release scripts +set(KF5_VERSION "5.70.0") # handled by release scripts +set(KF5_DEP_VERSION "5.70.0") # handled by release scripts project(KBookmarks VERSION ${KF5_VERSION}) include(FeatureSummary) -find_package(ECM 5.69.0 NO_MODULE) +find_package(ECM 5.70.0 NO_MODULE) set_package_properties(ECM PROPERTIES TYPE REQUIRED DESCRIPTION "Extra CMake Modules." URL "https://commits.kde.org/extra-cmake-modules";) feature_summary(WHAT REQUIRED_PACKAGES_NOT_FOUND FATAL_ON_MISSING_REQUIRED_PACKAGES) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kbookmarks-5.69.0/po/ast/kbookmarks5_qt.po new/kbookmarks-5.70.0/po/ast/kbookmarks5_qt.po --- old/kbookmarks-5.69.0/po/ast/kbookmarks5_qt.po 2020-04-05 00:55:06.000000000 +0200 +++ new/kbookmarks-5.70.0/po/ast/kbookmarks5_qt.po 2020-05-05 00:14:52.000000000 +0200 @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" -"PO-Revision-Date: 2020-03-23 04:00+0100\n" +"PO-Revision-Date: 2020-04-28 01:37+0200\n" "Last-Translator: enolp <[email protected]>\n" "Language-Team: Asturian <[email protected]>\n" "Language: ast\n" @@ -11,7 +11,7 @@ "Content-Transfer-Encoding: 8bit\n" "X-Qt-Contexts: true\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Lokalize 20.03.80\n" +"X-Generator: Lokalize 20.04.0\n" #: kbookmark.cpp:316 msgctxt "KBookmark|Bookmark separator" @@ -126,7 +126,7 @@ #: kbookmarkdialog.cpp:228 msgctxt "KBookmarkDialog|@title:window" msgid "Add Bookmark" -msgstr "Amestar un marcador" +msgstr "Amiestu d'un marcador" #: kbookmarkdialog.cpp:266 msgctxt "KBookmarkDialog|@title:window" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kbookmarks-5.69.0/po/en_GB/kbookmarks5_qt.po new/kbookmarks-5.70.0/po/en_GB/kbookmarks5_qt.po --- old/kbookmarks-5.69.0/po/en_GB/kbookmarks5_qt.po 2020-04-05 00:55:06.000000000 +0200 +++ new/kbookmarks-5.70.0/po/en_GB/kbookmarks5_qt.po 2020-05-05 00:14:52.000000000 +0200 @@ -10,7 +10,7 @@ "POT-Creation-Date: 2014-03-28 02:03+0000\n" "PO-Revision-Date: 2017-11-26 15:57+0000\n" "Last-Translator: Steve Allewell <[email protected]>\n" -"Language-Team: British English <[email protected]>\n" +"Language-Team: British English <[email protected]>\n" "Language: en_GB\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kbookmarks-5.69.0/src/kbookmarkmenu.cpp new/kbookmarks-5.70.0/src/kbookmarkmenu.cpp --- old/kbookmarks-5.69.0/src/kbookmarkmenu.cpp 2020-04-05 00:55:06.000000000 +0200 +++ new/kbookmarks-5.70.0/src/kbookmarkmenu.cpp 2020-05-05 00:14:52.000000000 +0200 @@ -64,15 +64,23 @@ KBookmarkOwner *_owner, QMenu *_parentMenu, KActionCollection *actionCollection) - : KBookmarkMenu(mgr, _owner, _parentMenu) + : QObject(), + m_actionCollection(actionCollection), + d(new KBookmarkMenuPrivate()), + m_bIsRoot(true), + m_pManager(mgr), + m_pOwner(_owner), + m_parentMenu(_parentMenu), + m_parentAddress(QString()) //TODO KBookmarkAdress::root { - m_actionCollection = actionCollection; + init(); } + #endif 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), @@ -83,8 +91,11 @@ // TODO KDE5 find a QMenu equvalnet for this one //m_parentMenu->setKeyboardShortcutsEnabled( true ); - // qCDebug(KBOOKMARKS_LOG) << "KBookmarkMenu::KBookmarkMenu " << this << " address : " << m_parentAddress; + init(); +} +void KBookmarkMenu::init() +{ connect(m_parentMenu, &QMenu::aboutToShow, this, &KBookmarkMenu::slotAboutToShow); @@ -124,7 +135,7 @@ QMenu *_parentMenu, const QString &parentAddress) : QObject(), - m_actionCollection(nullptr), + m_actionCollection(new KActionCollection(this)), d(new KBookmarkMenuPrivate()), m_bIsRoot(false), m_pManager(mgr), @@ -382,6 +393,11 @@ d->newBookmarkFolderAction->setIcon(QIcon::fromTheme(QStringLiteral("folder-new"))); d->newBookmarkFolderAction->setToolTip(tr("Create a new bookmark folder in this menu")); d->newBookmarkFolderAction->setStatusTip(d->newBookmarkFolderAction->toolTip()); + + if (m_bIsRoot) { + d->newBookmarkFolderAction->setObjectName(QStringLiteral("new_bookmark_folder")); + } + connect(d->newBookmarkFolderAction, &QAction::triggered, this, &KBookmarkMenu::slotNewFolder); } @@ -486,6 +502,11 @@ return d->bookmarksToFolderAction; } +QAction *KBookmarkMenu::newBookmarkFolderAction() const +{ + return d->newBookmarkFolderAction; +} + QAction * KBookmarkMenu::editBookmarksAction() const { return d->editBookmarksAction; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kbookmarks-5.69.0/src/kbookmarkmenu.h new/kbookmarks-5.70.0/src/kbookmarkmenu.h --- old/kbookmarks-5.69.0/src/kbookmarkmenu.h 2020-04-05 00:55:06.000000000 +0200 +++ new/kbookmarks-5.70.0/src/kbookmarkmenu.h 2020-05-05 00:14:52.000000000 +0200 @@ -90,6 +90,17 @@ * QAction *editAction = menu->editBookmarksAction(); * actionCollection()->addAction(editAction->objectName(), editAction); * @endcode + * + * Alternatively you can get a list of the actions from @p parentMenu, and add them to your + * actionCollection: + * @code + * KBookmarkMenu *menu = new KBookmarkMenu(manager, owner, parentMenu); + * actionCollection()->addActions(parentMenu->actions()); + * @endcode + * + * Note that adding the actions to your KActionCollection will make them show up in the shortcuts editor + * dialog. + * */ KBOOKMARKS_DEPRECATED_VERSION(5, 69, "Use overload without KActionCollection and add actions manually to your actionCollection if desired") KBookmarkMenu(KBookmarkManager *mgr, KBookmarkOwner *owner, QMenu *parentMenu, KActionCollection *collec); @@ -144,7 +155,8 @@ int numberOfOpenTabs() const; /** - * Returns the action for adding a bookmark. If you are using KXmlGui add it to your action collection. + * Returns the action for adding a bookmark. If you are using KXmlGui, you can add it to your + * action collection. * @code * KBookmarkMenu *menu = new KBookmarkMenu(manager, owner, parentMenu); * QAction *addAction = menu->addBookmarkAction(); @@ -156,7 +168,8 @@ QAction *addBookmarkAction() const; /** - * Returns the action for adding all current tabs as bookmarks. If you are using KXmlGui add it to your action collection. + * Returns the action for adding all current tabs as bookmarks. If you are using KXmlGui, you can + * add it to your action collection. * @code * KBookmarkMenu *menu = new KBookmarkMenu(manager, owner, parentMenu); * QAction *bookmarkTabsAction = menu->bookmarkTabsAsFolderAction(); @@ -168,7 +181,21 @@ QAction *bookmarkTabsAsFolderAction() const; /** - * Returns the action for editing bookmarks. If you are using KXmlGui add it to your action collection. + * Returns the action for adding a new bookmarks folder. If you are using KXmlGui, you can add it + * to your action collection. + * @code + * KBookmarkMenu *menu = new KBookmarkMenu(manager, owner, parentMenu); + * QAction *newBookmarkFolderAction = menu->bookmarkTabsAsFolderAction(); + * actionCollection()->addAction(newBookmarkFolderAction->objectName(), newBookmarkFolderAction); + * @endcode + * @return the action for adding a new bookmarks folder + * @since 5.70 + */ + QAction *newBookmarkFolderAction() const; + + /** + * Returns the action for editing bookmarks. If you are using KXmlGui, you can add it to your + * action collection. * @code * KBookmarkMenu *menu = new KBookmarkMenu(manager, owner, parentMenu); * QAction *editAction = menu->editBookmarksAction(); @@ -238,6 +265,8 @@ void slotCustomContextMenu(const QPoint &); private: + void init(); + KBookmarkMenuPrivate *d; bool m_bIsRoot;
