Hello community, here is the log from the commit of package kbookmarks for openSUSE:Factory checked in at 2020-03-19 19:41:41 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kbookmarks (Old) and /work/SRC/openSUSE:Factory/.kbookmarks.new.3160 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kbookmarks" Thu Mar 19 19:41:41 2020 rev:76 rq:785300 version:5.68.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kbookmarks/kbookmarks.changes 2020-02-14 16:32:42.395429652 +0100 +++ /work/SRC/openSUSE:Factory/.kbookmarks.new.3160/kbookmarks.changes 2020-03-19 19:43:38.527964264 +0100 @@ -1,0 +2,12 @@ +Sun Mar 8 09:17:36 UTC 2020 - Christophe Giboudeaux <[email protected]> + +- Update to 5.68.0 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/kde-frameworks-5.68.0.php +- Changes since 5.67.0: + * Make it compile against qt5.15. SkipEmptyParts is part of Qt::. + * Rename actions to be consistent + * Use ecm_qt_install_logging_categories over manual categories file + +------------------------------------------------------------------- Old: ---- kbookmarks-5.67.0.tar.xz kbookmarks-5.67.0.tar.xz.sig New: ---- kbookmarks-5.68.0.tar.xz kbookmarks-5.68.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kbookmarks.spec ++++++ --- /var/tmp/diff_new_pack.Gp5ZOV/_old 2020-03-19 19:43:39.295964710 +0100 +++ /var/tmp/diff_new_pack.Gp5ZOV/_new 2020-03-19 19:43:39.351964743 +0100 @@ -17,14 +17,14 @@ %define lname libKF5Bookmarks5 -%define _tar_path 5.67 +%define _tar_path 5.68 # 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.67.0 +Version: 5.68.0 Release: 0 Summary: Framework for manipulating bookmarks in XBEL format License: LGPL-2.1-or-later ++++++ kbookmarks-5.67.0.tar.xz -> kbookmarks-5.68.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kbookmarks-5.67.0/.gitignore new/kbookmarks-5.68.0/.gitignore --- old/kbookmarks-5.67.0/.gitignore 2020-02-02 13:44:08.000000000 +0100 +++ new/kbookmarks-5.68.0/.gitignore 2020-03-07 10:35:28.000000000 +0100 @@ -19,3 +19,4 @@ /build*/ CMakeLists.txt.user* *.unc-backup* +.cmake/ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kbookmarks-5.67.0/CMakeLists.txt new/kbookmarks-5.68.0/CMakeLists.txt --- old/kbookmarks-5.67.0/CMakeLists.txt 2020-02-02 13:44:08.000000000 +0100 +++ new/kbookmarks-5.68.0/CMakeLists.txt 2020-03-07 10:35:28.000000000 +0100 @@ -1,11 +1,11 @@ cmake_minimum_required(VERSION 3.5) -set(KF5_VERSION "5.67.0") # handled by release scripts -set(KF5_DEP_VERSION "5.67.0") # handled by release scripts +set(KF5_VERSION "5.68.0") # handled by release scripts +set(KF5_DEP_VERSION "5.68.0") # handled by release scripts project(KBookmarks VERSION ${KF5_VERSION}) include(FeatureSummary) -find_package(ECM 5.67.0 NO_MODULE) +find_package(ECM 5.68.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) @@ -55,7 +55,7 @@ endif() add_definitions(-DQT_NO_FOREACH) add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050d00) -add_definitions(-DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x054200) +add_definitions(-DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x054300) add_subdirectory(src) if (BUILD_TESTING) @@ -98,7 +98,4 @@ DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5} COMPONENT Devel ) -# contains list of debug categories, for kdebugsettings -install(FILES kbookmarks.categories DESTINATION ${KDE_INSTALL_LOGGINGCATEGORIESDIR}) - feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kbookmarks-5.67.0/kbookmarks.categories new/kbookmarks-5.68.0/kbookmarks.categories --- old/kbookmarks-5.67.0/kbookmarks.categories 2020-02-02 13:44:08.000000000 +0100 +++ new/kbookmarks-5.68.0/kbookmarks.categories 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -kf5.kbookmarks kbookmarks IDENTIFIER [KBOOKMARKS_LOG] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kbookmarks-5.67.0/po/ia/kbookmarks5_qt.po new/kbookmarks-5.68.0/po/ia/kbookmarks5_qt.po --- old/kbookmarks-5.67.0/po/ia/kbookmarks5_qt.po 2020-02-02 13:44:08.000000000 +0100 +++ new/kbookmarks-5.68.0/po/ia/kbookmarks5_qt.po 2020-03-07 10:35:28.000000000 +0100 @@ -1,21 +1,21 @@ # Copyright (C) YEAR This_file_is_part_of_KDE # This file is distributed under the same license as the PACKAGE package. # -# g.sora <[email protected]>, 2010, 2011, 2012, 2013, 2014. +# g.sora <[email protected]>, 2010, 2011, 2012, 2013, 2014, 2020. msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2014-03-28 02:03+0000\n" -"PO-Revision-Date: 2014-03-31 15:54+0200\n" -"Last-Translator: G.Sora <[email protected]>\n" -"Language-Team: Interlingua <[email protected]>\n" +"PO-Revision-Date: 2020-02-13 12:18+0100\n" +"Last-Translator: giovanni <[email protected]>\n" +"Language-Team: Interlingua <[email protected]>\n" "Language: ia\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Lokalize 1.5\n" +"X-Generator: Lokalize 18.12.3\n" "X-Qt-Contexts: true\n" #: kbookmark.cpp:316 @@ -220,6 +220,9 @@ "\n" "Most likely you do not have keditbookmarks currently installed" msgstr "" +"Non pote lancear keditbookmarks.\n" +"\n" +"Plus probabilemente tu non ha actualmente installate keditbookmarks" #: kbookmarkmanager.cpp:491 #, qt-format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kbookmarks-5.67.0/po/id/kbookmarks5_qt.po new/kbookmarks-5.68.0/po/id/kbookmarks5_qt.po --- old/kbookmarks-5.67.0/po/id/kbookmarks5_qt.po 2020-02-02 13:44:08.000000000 +0100 +++ new/kbookmarks-5.68.0/po/id/kbookmarks5_qt.po 2020-03-07 10:35:28.000000000 +0100 @@ -1,4 +1,4 @@ -# Wantoyo <[email protected]>, 2018, 2019. +# Wantoyo <[email protected]>, 2018, 2019, 2020. msgid "" msgstr "" "Project-Id-Version: \n" @@ -10,6 +10,7 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Generator: Lokalize 19.12.1\n" "X-Qt-Contexts: true\n" #: kbookmark.cpp:316 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kbookmarks-5.67.0/po/nb/kbookmarks5_qt.po new/kbookmarks-5.68.0/po/nb/kbookmarks5_qt.po --- old/kbookmarks-5.67.0/po/nb/kbookmarks5_qt.po 2020-02-02 13:44:08.000000000 +0100 +++ new/kbookmarks-5.68.0/po/nb/kbookmarks5_qt.po 2020-03-07 10:35:28.000000000 +0100 @@ -241,37 +241,37 @@ "vil bare vises en gang. Årsaken til feilen må fikses så raskt som mulig, " "sannsynligvis er det en full harddisk." -#: kbookmarkmenu.cpp:280 +#: kbookmarkmenu.cpp:275 msgctxt "KBookmarkMenu|" msgid "Open Folder in Tabs" msgstr "Åpne mappa i faner" -#: kbookmarkmenu.cpp:284 +#: kbookmarkmenu.cpp:279 msgctxt "KBookmarkMenu|" msgid "Open all bookmarks in this folder as a new tab." msgstr "Åpne alle bokmerker i denne mappa som en ny fane." -#: kbookmarkmenu.cpp:300 +#: kbookmarkmenu.cpp:295 msgctxt "KBookmarkMenu|" msgid "Bookmark Tabs as Folder..." msgstr "Bokmerk faner som mappe …" -#: kbookmarkmenu.cpp:304 +#: kbookmarkmenu.cpp:299 msgctxt "KBookmarkMenu|" msgid "Add a folder of bookmarks for all open tabs." msgstr "Legg til en mappe med bokmerker for alle åpne vinduer med faner." -#: kbookmarkmenu.cpp:344 +#: kbookmarkmenu.cpp:339 msgctxt "KBookmarkMenu|" msgid "Edit your bookmark collection in a separate window" msgstr "Rediger bokmerkesamlinga i et eget vindu" -#: kbookmarkmenu.cpp:356 +#: kbookmarkmenu.cpp:351 msgctxt "KBookmarkMenu|" msgid "New Bookmark Folder..." msgstr "Ny bokmerkemappe …" -#: kbookmarkmenu.cpp:358 +#: kbookmarkmenu.cpp:353 msgctxt "KBookmarkMenu|" msgid "Create a new bookmark folder in this menu" msgstr "Lag en ny bokmerkemappe i denne menyen" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kbookmarks-5.67.0/po/nn/kbookmarks5_qt.po new/kbookmarks-5.68.0/po/nn/kbookmarks5_qt.po --- old/kbookmarks-5.67.0/po/nn/kbookmarks5_qt.po 2020-02-02 13:44:08.000000000 +0100 +++ new/kbookmarks-5.68.0/po/nn/kbookmarks5_qt.po 2020-03-07 10:35:28.000000000 +0100 @@ -240,37 +240,37 @@ "vert berre vist ein gong. Årsaka til feilen, som truleg er ein full " "harddisk, må rettast så raskt som mogleg." -#: kbookmarkmenu.cpp:280 +#: kbookmarkmenu.cpp:275 msgctxt "KBookmarkMenu|" msgid "Open Folder in Tabs" msgstr "Opna mappe i faner" -#: kbookmarkmenu.cpp:284 +#: kbookmarkmenu.cpp:279 msgctxt "KBookmarkMenu|" msgid "Open all bookmarks in this folder as a new tab." msgstr "Opna alle bokmerka i denne mappa som nye faner." -#: kbookmarkmenu.cpp:300 +#: kbookmarkmenu.cpp:295 msgctxt "KBookmarkMenu|" msgid "Bookmark Tabs as Folder..." msgstr "Bokmerk faner som mappe …" -#: kbookmarkmenu.cpp:304 +#: kbookmarkmenu.cpp:299 msgctxt "KBookmarkMenu|" msgid "Add a folder of bookmarks for all open tabs." msgstr "Legg til ei mappe med bokmerke for alle opne vindauge med faner." -#: kbookmarkmenu.cpp:344 +#: kbookmarkmenu.cpp:339 msgctxt "KBookmarkMenu|" msgid "Edit your bookmark collection in a separate window" msgstr "Rediger bokmerkesamlinga i eit eige vindauge" -#: kbookmarkmenu.cpp:356 +#: kbookmarkmenu.cpp:351 msgctxt "KBookmarkMenu|" msgid "New Bookmark Folder..." msgstr "Ny bokmerkemappe …" -#: kbookmarkmenu.cpp:358 +#: kbookmarkmenu.cpp:353 msgctxt "KBookmarkMenu|" msgid "Create a new bookmark folder in this menu" msgstr "Lag ei ny bokmerkemappe i denne menyen" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kbookmarks-5.67.0/po/se/kbookmarks5_qt.po new/kbookmarks-5.68.0/po/se/kbookmarks5_qt.po --- old/kbookmarks-5.67.0/po/se/kbookmarks5_qt.po 2020-02-02 13:44:08.000000000 +0100 +++ new/kbookmarks-5.68.0/po/se/kbookmarks5_qt.po 2020-03-07 10:35:28.000000000 +0100 @@ -271,43 +271,43 @@ "lei: %2. Dát vihkedieđáhus čájehuvvo dušše oktii. Fertet divvut meattáhusa " "siva nu johtilit go lea vojolaš, mii árvideames lea deavva garraskearru." -#: kbookmarkmenu.cpp:280 +#: kbookmarkmenu.cpp:275 #, fuzzy msgctxt "KBookmarkMenu|" msgid "Open Folder in Tabs" msgstr "Raba máhpa gilkoriin" -#: kbookmarkmenu.cpp:284 +#: kbookmarkmenu.cpp:279 #, fuzzy msgctxt "KBookmarkMenu|" msgid "Open all bookmarks in this folder as a new tab." msgstr "Raba buot girjemearkkaid dán máhpas ođđa gilkorin." -#: kbookmarkmenu.cpp:300 +#: kbookmarkmenu.cpp:295 #, fuzzy msgctxt "KBookmarkMenu|" msgid "Bookmark Tabs as Folder..." msgstr "Merke gilkoriid máhppan …" -#: kbookmarkmenu.cpp:304 +#: kbookmarkmenu.cpp:299 #, fuzzy msgctxt "KBookmarkMenu|" msgid "Add a folder of bookmarks for all open tabs." msgstr "Lasit girjemearkemáhpa buot rabas gilkoriid várás." -#: kbookmarkmenu.cpp:344 +#: kbookmarkmenu.cpp:339 #, fuzzy msgctxt "KBookmarkMenu|" msgid "Edit your bookmark collection in a separate window" msgstr "Doaimmat girjemearkkaid sierra láses" -#: kbookmarkmenu.cpp:356 +#: kbookmarkmenu.cpp:351 #, fuzzy msgctxt "KBookmarkMenu|" msgid "New Bookmark Folder..." msgstr "Ođđa girjemearkamáhppa …" -#: kbookmarkmenu.cpp:358 +#: kbookmarkmenu.cpp:353 #, fuzzy msgctxt "KBookmarkMenu|" msgid "Create a new bookmark folder in this menu" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kbookmarks-5.67.0/src/CMakeLists.txt new/kbookmarks-5.68.0/src/CMakeLists.txt --- old/kbookmarks-5.67.0/src/CMakeLists.txt 2020-02-02 13:44:08.000000000 +0100 +++ new/kbookmarks-5.68.0/src/CMakeLists.txt 2020-03-07 10:35:28.000000000 +0100 @@ -22,7 +22,13 @@ list(APPEND kbookmarks_SRCS kbookmarkmanageradaptor.cpp) endif() -ecm_qt_declare_logging_category(kbookmarks_SRCS HEADER kbookmarks_debug.h IDENTIFIER KBOOKMARKS_LOG CATEGORY_NAME kf5.kbookmarks) +ecm_qt_declare_logging_category(kbookmarks_SRCS + HEADER kbookmarks_debug.h + IDENTIFIER KBOOKMARKS_LOG + CATEGORY_NAME kf5.kbookmarks + DESCRIPTION "KBookmarks" + EXPORT KBOOKMARKS +) add_library(KF5Bookmarks ${kbookmarks_SRCS}) add_library(KF5::Bookmarks ALIAS KF5Bookmarks) @@ -90,6 +96,12 @@ DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5}/KBookmarks COMPONENT Devel ) +ecm_qt_install_logging_categories( + EXPORT KBOOKMARKS + FILE kbookmarks.categories + DESTINATION ${KDE_INSTALL_LOGGINGCATEGORIESDIR} +) + if(BUILD_QCH) ecm_add_qch( KF5Bookmarks_QCH diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kbookmarks-5.67.0/src/kbookmarkmanager.cpp new/kbookmarks-5.68.0/src/kbookmarkmanager.cpp --- old/kbookmarks-5.67.0/src/kbookmarkmanager.cpp 2020-02-02 13:44:08.000000000 +0100 +++ new/kbookmarks-5.68.0/src/kbookmarkmanager.cpp 2020-03-07 10:35:28.000000000 +0100 @@ -560,7 +560,11 @@ // qCDebug(KBOOKMARKS_LOG) << "KBookmarkManager::findByAddress " << address; KBookmark result = root(); // The address is something like /5/10/2+ +#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0) const QStringList addresses = address.split(QRegularExpression(QStringLiteral("[/+]")), QString::SkipEmptyParts); +#else + const QStringList addresses = address.split(QRegularExpression(QStringLiteral("[/+]")), Qt::SkipEmptyParts); +#endif // qCWarning(KBOOKMARKS_LOG) << addresses.join(","); for (QStringList::const_iterator it = addresses.begin(); it != addresses.end();) { bool append = ((*it) == QLatin1String("+")); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kbookmarks-5.67.0/src/kbookmarkmenu.cpp new/kbookmarks-5.68.0/src/kbookmarkmenu.cpp --- old/kbookmarks-5.67.0/src/kbookmarkmenu.cpp 2020-02-02 13:44:08.000000000 +0100 +++ new/kbookmarks-5.68.0/src/kbookmarkmenu.cpp 2020-03-07 10:35:28.000000000 +0100 @@ -44,16 +44,16 @@ { public: KBookmarkMenuPrivate() - : newBookmarkFolder(nullptr), + : newBookmarkFolderAction(nullptr), addBookmarkAction(nullptr), - bookmarksToFolder(nullptr), + bookmarksToFolderAction(nullptr), numberOfOpenTabs(2) { } - QAction *newBookmarkFolder; + QAction *newBookmarkFolderAction; QAction *addBookmarkAction; - QAction *bookmarksToFolder; + QAction *bookmarksToFolderAction; int numberOfOpenTabs; }; @@ -291,17 +291,17 @@ return; } - if (!d->bookmarksToFolder) { + if (!d->bookmarksToFolderAction) { QString title = tr("Bookmark Tabs as Folder..."); - d->bookmarksToFolder = new QAction(title, this); - m_actionCollection->addAction(m_bIsRoot ? QStringLiteral("add_bookmarks_list") : QString(), d->bookmarksToFolder); - d->bookmarksToFolder->setIcon(QIcon::fromTheme(QStringLiteral("bookmark-new-list"))); - d->bookmarksToFolder->setToolTip(tr("Add a folder of bookmarks for all open tabs.")); - d->bookmarksToFolder->setStatusTip(d->bookmarksToFolder->toolTip()); - connect(d->bookmarksToFolder, &QAction::triggered, this, &KBookmarkMenu::slotAddBookmarksList); + d->bookmarksToFolderAction = new QAction(title, this); + m_actionCollection->addAction(m_bIsRoot ? QStringLiteral("add_bookmarks_list") : QString(), d->bookmarksToFolderAction); + d->bookmarksToFolderAction->setIcon(QIcon::fromTheme(QStringLiteral("bookmark-new-list"))); + d->bookmarksToFolderAction->setToolTip(tr("Add a folder of bookmarks for all open tabs.")); + d->bookmarksToFolderAction->setStatusTip(d->bookmarksToFolderAction->toolTip()); + connect(d->bookmarksToFolderAction, &QAction::triggered, this, &KBookmarkMenu::slotAddBookmarksList); } - m_parentMenu->addAction(d->bookmarksToFolder); + m_parentMenu->addAction(d->bookmarksToFolderAction); } void KBookmarkMenu::addAddBookmark() @@ -347,15 +347,15 @@ return; } - if (!d->newBookmarkFolder) { - d->newBookmarkFolder = new QAction(tr("New Bookmark Folder..."), this); - d->newBookmarkFolder->setIcon(QIcon::fromTheme(QStringLiteral("folder-new"))); - d->newBookmarkFolder->setToolTip(tr("Create a new bookmark folder in this menu")); - d->newBookmarkFolder->setStatusTip(d->newBookmarkFolder->toolTip()); - connect(d->newBookmarkFolder, &QAction::triggered, this, &KBookmarkMenu::slotNewFolder); + if (!d->newBookmarkFolderAction) { + d->newBookmarkFolderAction = new QAction(tr("New Bookmark Folder..."), this); + 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()); + connect(d->newBookmarkFolderAction, &QAction::triggered, this, &KBookmarkMenu::slotNewFolder); } - m_parentMenu->addAction(d->newBookmarkFolder); + m_parentMenu->addAction(d->newBookmarkFolderAction); }
