Hello community, here is the log from the commit of package kbookmarks for openSUSE:Factory checked in at 2015-07-14 17:21:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kbookmarks (Old) and /work/SRC/openSUSE:Factory/.kbookmarks.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kbookmarks" Changes: -------- --- /work/SRC/openSUSE:Factory/kbookmarks/kbookmarks.changes 2015-06-23 12:06:14.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kbookmarks.new/kbookmarks.changes 2015-07-14 17:21:55.000000000 +0200 @@ -1,0 +2,9 @@ +Sun Jul 5 18:44:48 UTC 2015 - hrvoje.sen...@gmail.com + +- Update to 5.12.0 + * Don't add a bookmark with url is empty and text is empty + * Encode KBookmark URL to fix compatibility with KDE4 applications + * For more details please see: + https://www.kde.org/announcements/kde-frameworks-5.12.0.php + +------------------------------------------------------------------- Old: ---- kbookmarks-5.11.0.tar.xz New: ---- kbookmarks-5.12.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kbookmarks.spec ++++++ --- /var/tmp/diff_new_pack.tep0L4/_old 2015-07-14 17:21:56.000000000 +0200 +++ /var/tmp/diff_new_pack.tep0L4/_new 2015-07-14 17:21:56.000000000 +0200 @@ -18,9 +18,9 @@ %bcond_without lang %define lname libKF5Bookmarks5 -%define _tar_path 5.11 +%define _tar_path 5.12 Name: kbookmarks -Version: 5.11.0 +Version: 5.12.0 Release: 0 %define kf5_version %{version} BuildRequires: cmake >= 2.8.12 ++++++ kbookmarks-5.11.0.tar.xz -> kbookmarks-5.12.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kbookmarks-5.11.0/CMakeLists.txt new/kbookmarks-5.12.0/CMakeLists.txt --- old/kbookmarks-5.11.0/CMakeLists.txt 2015-06-06 23:08:19.000000000 +0200 +++ new/kbookmarks-5.12.0/CMakeLists.txt 2015-07-05 10:52:55.000000000 +0200 @@ -3,7 +3,7 @@ project(KBookmarks) include(FeatureSummary) -find_package(ECM 5.11.0 NO_MODULE) +find_package(ECM 5.12.0 NO_MODULE) set_package_properties(ECM PROPERTIES TYPE REQUIRED DESCRIPTION "Extra CMake Modules." URL "https://projects.kde.org/projects/kdesupport/extra-cmake-modules";) feature_summary(WHAT REQUIRED_PACKAGES_NOT_FOUND FATAL_ON_MISSING_REQUIRED_PACKAGES) @@ -22,8 +22,8 @@ include(ECMPoQmTools) -set(KF5_VERSION "5.11.0") # handled by release scripts -set(KF5_DEP_VERSION "5.11.0") # handled by release scripts +set(KF5_VERSION "5.12.0") # handled by release scripts +set(KF5_DEP_VERSION "5.12.0") # handled by release scripts ecm_setup_version(${KF5_VERSION} VARIABLE_PREFIX KBOOKMARKS diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kbookmarks-5.11.0/src/kbookmark.cpp new/kbookmarks-5.12.0/src/kbookmark.cpp --- old/kbookmarks-5.11.0/src/kbookmark.cpp 2015-06-06 23:08:19.000000000 +0200 +++ new/kbookmarks-5.12.0/src/kbookmark.cpp 2015-07-05 10:52:55.000000000 +0200 @@ -213,7 +213,7 @@ } QDomDocument doc = element.ownerDocument(); QDomElement elem = doc.createElement("bookmark"); - elem.setAttribute("href", url.toString()); + elem.setAttribute("href", url.toString(QUrl::FullyEncoded)); QDomElement textElem = doc.createElement("title"); elem.appendChild(textElem); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kbookmarks-5.11.0/src/kbookmarkmanager.h new/kbookmarks-5.12.0/src/kbookmarkmanager.h --- old/kbookmarks-5.11.0/src/kbookmarkmanager.h 2015-06-06 23:08:19.000000000 +0200 +++ new/kbookmarks-5.12.0/src/kbookmarkmanager.h 2015-07-05 10:52:55.000000000 +0200 @@ -131,7 +131,7 @@ * @param toolbarCache iff true save a cache of the toolbar folder, too * @return true if saving was successful */ - // KDE5 TODO: Use an enum and not a bool + // KF6 TODO: Use an enum and not a bool bool saveAs(const QString &filename, bool toolbarCache = true) const; /** @@ -202,7 +202,7 @@ * @param toolbarCache iff true save a cache of the toolbar folder, too * @return true if saving was successful */ - // KDE5 TODO: Use an enum and not a bool + // KF6 TODO: Use an enum and not a bool bool save(bool toolbarCache = true) const; void emitConfigChanged(); @@ -216,7 +216,7 @@ * @param browser iff false display no browser specific * menu items in keditbookmarks :: --nobrowser */ - // KDE5 TODO: Use an enum and not a bool + // KF6 TODO: Use an enum and not a bool void setEditorOptions(const QString &caption, bool browser); /** diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kbookmarks-5.11.0/src/kbookmarkmenu.cpp new/kbookmarks-5.12.0/src/kbookmarkmenu.cpp --- old/kbookmarks-5.11.0/src/kbookmarkmenu.cpp 2015-06-06 23:08:19.000000000 +0200 +++ new/kbookmarks-5.12.0/src/kbookmarkmenu.cpp 2015-07-05 10:52:55.000000000 +0200 @@ -95,7 +95,7 @@ addNewFolder(); addEditBookmarks(); } else { - if (m_parentMenu->actions().count() > 0) { + if (!m_parentMenu->actions().isEmpty()) { m_parentMenu->addSeparator(); } @@ -211,7 +211,7 @@ void KBookmarkMenu::slotBookmarksChanged(const QString &groupAddress) { - qDebug() << "KBookmarkMenu::slotBookmarksChanged( " << groupAddress; + qDebug() << "KBookmarkMenu::slotBookmarksChanged groupAddress: " << groupAddress; if (groupAddress == m_parentAddress) { //qDebug() << "KBookmarkMenu::slotBookmarksChanged -> setting m_bDirty on " << groupAddress; m_bDirty = true; @@ -393,6 +393,9 @@ if (!m_pOwner) { return; } + if (m_pOwner->currentTitle().isEmpty() && m_pOwner->currentUrl().isEmpty()) { + return; + } KBookmarkGroup parentBookmark = m_pManager->findByAddress(m_parentAddress).toGroup(); if (KBookmarkSettings::self()->m_advancedaddbookmark) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kbookmarks-5.11.0/src/kbookmarkmenu.h new/kbookmarks-5.12.0/src/kbookmarkmenu.h --- old/kbookmarks-5.11.0/src/kbookmarkmenu.h 2015-06-06 23:08:19.000000000 +0200 +++ new/kbookmarks-5.12.0/src/kbookmarkmenu.h 2015-07-05 10:52:55.000000000 +0200 @@ -81,7 +81,7 @@ /** * Creates a bookmark submenu * - * @todo KDE 5: give ownership of the bookmarkmenu to another qobject, e.g. parentMenu. + * @todo KF6: give ownership of the bookmarkmenu to another qobject, e.g. parentMenu. * Currently this is a QObject without a parent, use setParent to benefit from automatic deletion. */ KBookmarkMenu(KBookmarkManager *mgr, KBookmarkOwner *owner,
