Hello community, here is the log from the commit of package kbookmarks for openSUSE:Factory checked in at 2014-03-10 12:17:52 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2014-02-28 16:24:20.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kbookmarks.new/kbookmarks.changes 2014-03-10 12:17:55.000000000 +0100 @@ -1,0 +2,8 @@ +Tue Mar 4 16:35:40 UTC 2014 - [email protected] + +- Update to 4.97.0: + * Buildsystem fixes + * For more details please see: + http://www.kde.org/announcements/announce-frameworks5-alpha2.php + +------------------------------------------------------------------- Old: ---- kbookmarks-4.96.0.tar.xz New: ---- kbookmarks-4.97.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kbookmarks.spec ++++++ --- /var/tmp/diff_new_pack.KtLiUh/_old 2014-03-10 12:17:56.000000000 +0100 +++ /var/tmp/diff_new_pack.KtLiUh/_new 2014-03-10 12:17:56.000000000 +0100 @@ -16,12 +16,12 @@ # -%define lname libKF5Bookmarks4 +%define lname libKF5Bookmarks5 Name: kbookmarks -Version: 4.96.0 +Version: 4.97.0 Release: 0 BuildRequires: cmake >= 2.8.12 -BuildRequires: extra-cmake-modules >= 0.0.10 +BuildRequires: extra-cmake-modules >= 0.0.11 BuildRequires: fdupes BuildRequires: kconfigwidgets-devel >= %{_kf5_version} BuildRequires: kcoreaddons-devel >= %{_kf5_version} @@ -29,7 +29,9 @@ BuildRequires: kiconthemes-devel >= %{_kf5_version} BuildRequires: kwidgetsaddons-devel >= %{_kf5_version} BuildRequires: kxmlgui-devel >= %{_kf5_version} -BuildRequires: pkgconfig(Qt5Core) >= 5.2.0 +Requires: pkgconfig(Qt5DBus) >= 5.2.0 +Requires: pkgconfig(Qt5Widgets) >= 5.2.0 +Requires: pkgconfig(Qt5Xml) >= 5.2.0 Summary: Lets you access and manipulate bookmarks stored using XBEL format License: LGPL-2.1+ Group: System/GUI/KDE @@ -53,11 +55,10 @@ Requires: %lname = %{version} Requires: extra-cmake-modules Requires: kconfigwidgets-devel >= %{_kf5_version} -Requires: kcoreaddons-devel >= %{_kf5_version} Requires: kiconthemes-devel >= %{_kf5_version} -Requires: kwidgetsaddons-devel >= %{_kf5_version} Requires: kxmlgui-devel >= %{_kf5_version} -Requires: pkgconfig(Qt5Core) >= 5.2.0 +Requires: pkgconfig(Qt5Widgets) >= 5.2.0 +Requires: pkgconfig(Qt5Xml) >= 5.2.0 %description devel Framework which lets you access and manipulate bookmarks stored using XBEL format. ++++++ kbookmarks-4.96.0.tar.xz -> kbookmarks-4.97.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kbookmarks-4.96.0/CMakeLists.txt new/kbookmarks-4.97.0/CMakeLists.txt --- old/kbookmarks-4.96.0/CMakeLists.txt 2014-02-05 00:02:37.000000000 +0100 +++ new/kbookmarks-4.97.0/CMakeLists.txt 2014-03-01 12:50:09.000000000 +0100 @@ -2,7 +2,7 @@ project(KBookmarks) -find_package(ECM 0.0.10 REQUIRED NO_MODULE) +find_package(ECM 0.0.11 REQUIRED NO_MODULE) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR}) @@ -16,12 +16,13 @@ include(ECMSetupVersion) include(ECMGenerateHeaders) -set(KF5_VERSION "4.96.0") +set(KF5_VERSION "4.97.0") ecm_setup_version(${KF5_VERSION} VARIABLE_PREFIX KBOOKMARKS VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/kbookmarks_version.h" - PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/KF5BookmarksConfigVersion.cmake") + PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/KF5BookmarksConfigVersion.cmake" + SOVERSION 5) # Dependencies set(REQUIRED_QT_VERSION 5.2.0) @@ -43,9 +44,9 @@ # create a Config.cmake and a ConfigVersion.cmake file and install them set(CMAKECONFIG_INSTALL_DIR "${CMAKECONFIG_INSTALL_PREFIX}/KF5Bookmarks") -include(CMakePackageConfigHelpers) +include(ECMPackageConfigHelpers) -configure_package_config_file( +ecm_configure_package_config_file( "${CMAKE_CURRENT_SOURCE_DIR}/KF5BookmarksConfig.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/KF5BookmarksConfig.cmake" INSTALL_DESTINATION ${CMAKECONFIG_INSTALL_DIR} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kbookmarks-4.96.0/src/CMakeLists.txt new/kbookmarks-4.97.0/src/CMakeLists.txt --- old/kbookmarks-4.96.0/src/CMakeLists.txt 2014-02-05 00:02:37.000000000 +0100 +++ new/kbookmarks-4.97.0/src/CMakeLists.txt 2014-03-01 12:50:09.000000000 +0100 @@ -39,7 +39,8 @@ EXPORT_NAME Bookmarks ) -ecm_generate_headers( +ecm_generate_headers(KBookmarks_HEADERS + HEADER_NAMES KBookmark KBookmarkAction KBookmarkActionInterface @@ -52,10 +53,8 @@ KBookmarkDialog KonqBookmarkMenu - MODULE_NAME KBookmarks REQUIRED_HEADERS KBookmarks_HEADERS ) -install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/KBookmarks DESTINATION ${INCLUDE_INSTALL_DIR} COMPONENT Devel) install(TARGETS KF5Bookmarks EXPORT KF5BookmarksTargets ${INSTALL_TARGETS_DEFAULT_ARGS}) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kbookmarks-4.96.0/src/kbookmark.cpp new/kbookmarks-4.97.0/src/kbookmark.cpp --- old/kbookmarks-4.96.0/src/kbookmark.cpp 2014-02-05 00:02:37.000000000 +0100 +++ new/kbookmarks-4.97.0/src/kbookmark.cpp 2014-03-01 12:50:09.000000000 +0100 @@ -241,18 +241,11 @@ if (element.attribute("toolbar") == "yes") { return element; } - for (QDomNode n = element.firstChild(); !n.isNull(); n = n.nextSibling()) { - QDomElement e = n.toElement(); - // Search among the "folder" children only - if (e.tagName() == "folder") { - if (e.attribute("toolbar") == "yes") { - return e; - } else { - QDomElement result = KBookmarkGroup(e).findToolbar(); - if (!result.isNull()) { - return result; - } - } + for (QDomElement e = element.firstChildElement("folder"); !e.isNull(); + e = e.nextSiblingElement("folder") ) { + QDomElement result = KBookmarkGroup(e).findToolbar(); + if (!result.isNull()) { + return result; } } return QDomElement(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kbookmarks-4.96.0/src/kbookmarkdialog.cpp new/kbookmarks-4.97.0/src/kbookmarkdialog.cpp --- old/kbookmarks-4.96.0/src/kbookmarkdialog.cpp 2014-02-05 00:02:37.000000000 +0100 +++ new/kbookmarks-4.97.0/src/kbookmarkdialog.cpp 2014-03-01 12:50:09.000000000 +0100 @@ -99,12 +99,16 @@ layout = true; } -void KBookmarkDialogPrivate::fillGroup(QTreeWidgetItem *parentItem, const KBookmarkGroup &group) +void KBookmarkDialogPrivate::fillGroup(QTreeWidgetItem *parentItem, const KBookmarkGroup &group, const KBookmarkGroup &selectGroup) { for (KBookmark bk = group.first(); !bk.isNull(); bk = group.next(bk)) { if (bk.isGroup()) { - QTreeWidgetItem *item = new KBookmarkTreeItem(parentItem, folderTree, bk.toGroup()); - fillGroup(item, bk.toGroup()); + const KBookmarkGroup bkGroup = bk.toGroup(); + QTreeWidgetItem* item = new KBookmarkTreeItem(parentItem, folderTree, bkGroup); + if (selectGroup == bkGroup) { + folderTree->setCurrentItem(item); + } + fillGroup(item, bkGroup, selectGroup); } } } @@ -370,7 +374,7 @@ d->mgr->emitChanged(parentGroup); d->folderTree->clear(); QTreeWidgetItem *root = new KBookmarkTreeItem(d->folderTree); - d->fillGroup(root, d->mgr->root()); + d->fillGroup(root, d->mgr->root(), group); } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kbookmarks-4.96.0/src/kbookmarkdialog_p.h new/kbookmarks-4.97.0/src/kbookmarkdialog_p.h --- old/kbookmarks-4.96.0/src/kbookmarkdialog_p.h 2014-02-05 00:02:37.000000000 +0100 +++ new/kbookmarks-4.97.0/src/kbookmarkdialog_p.h 2014-03-01 12:50:09.000000000 +0100 @@ -43,7 +43,7 @@ // selects the specified bookmark in the folder tree void setParentBookmark(const KBookmark &bm); KBookmarkGroup parentBookmark(); - void fillGroup(QTreeWidgetItem *parentItem, const KBookmarkGroup &group); + void fillGroup(QTreeWidgetItem *parentItem, const KBookmarkGroup &group, const KBookmarkGroup &selectGroup = KBookmarkGroup()); KBookmarkDialog *q; BookmarkDialogMode mode; -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
