Hello community, here is the log from the commit of package kbookmarks for openSUSE:Factory checked in at 2020-01-14 20:59:38 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kbookmarks (Old) and /work/SRC/openSUSE:Factory/.kbookmarks.new.6675 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kbookmarks" Tue Jan 14 20:59:38 2020 rev:74 rq:763439 version:5.66.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kbookmarks/kbookmarks.changes 2019-12-18 14:41:57.501764073 +0100 +++ /work/SRC/openSUSE:Factory/.kbookmarks.new.6675/kbookmarks.changes 2020-01-14 21:03:14.170650466 +0100 @@ -1,0 +2,11 @@ +Sun Jan 5 09:01:59 UTC 2020 - Christophe Giboudeaux <[email protected]> + +- Update to 5.66.0 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/kde-frameworks-5.66.0.php +- Changes since 5.65.0: + * Remove endl in qDebug + * Update the obsolete projects.kde.org URL + +------------------------------------------------------------------- Old: ---- kbookmarks-5.65.0.tar.xz kbookmarks-5.65.0.tar.xz.sig New: ---- kbookmarks-5.66.0.tar.xz kbookmarks-5.66.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kbookmarks.spec ++++++ --- /var/tmp/diff_new_pack.imxMgt/_old 2020-01-14 21:03:15.054650875 +0100 +++ /var/tmp/diff_new_pack.imxMgt/_new 2020-01-14 21:03:15.054650875 +0100 @@ -1,7 +1,7 @@ # # spec file for package kbookmarks # -# Copyright (c) 2019 SUSE LLC +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,14 +17,14 @@ %define lname libKF5Bookmarks5 -%define _tar_path 5.65 +%define _tar_path 5.66 # 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.65.0 +Version: 5.66.0 Release: 0 Summary: Framework for manipulating bookmarks in XBEL format License: LGPL-2.1-or-later ++++++ kbookmarks-5.65.0.tar.xz -> kbookmarks-5.66.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kbookmarks-5.65.0/CMakeLists.txt new/kbookmarks-5.66.0/CMakeLists.txt --- old/kbookmarks-5.65.0/CMakeLists.txt 2019-12-07 22:39:48.000000000 +0100 +++ new/kbookmarks-5.66.0/CMakeLists.txt 2020-01-04 11:03:59.000000000 +0100 @@ -1,16 +1,16 @@ cmake_minimum_required(VERSION 3.5) -set(KF5_VERSION "5.65.0") # handled by release scripts -set(KF5_DEP_VERSION "5.65.0") # handled by release scripts +set(KF5_VERSION "5.66.0") # handled by release scripts +set(KF5_DEP_VERSION "5.66.0") # handled by release scripts project(KBookmarks VERSION ${KF5_VERSION}) include(FeatureSummary) -find_package(ECM 5.65.0 NO_MODULE) -set_package_properties(ECM PROPERTIES TYPE REQUIRED DESCRIPTION "Extra CMake Modules." URL "https://projects.kde.org/projects/kdesupport/extra-cmake-modules";) +find_package(ECM 5.66.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) -set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR}) +set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH}) include(KDEInstallDirs) include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE) @@ -36,7 +36,7 @@ SOVERSION 5) # Dependencies -set(REQUIRED_QT_VERSION 5.11.0) +set(REQUIRED_QT_VERSION 5.12.0) find_package(Qt5 ${REQUIRED_QT_VERSION} NO_MODULE REQUIRED Widgets Xml) if (NOT ANDROID) @@ -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=0x053f00) +add_definitions(-DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x054100) add_subdirectory(src) if (BUILD_TESTING) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kbookmarks-5.65.0/src/kbookmarkimporter_ns.cpp new/kbookmarks-5.66.0/src/kbookmarkimporter_ns.cpp --- old/kbookmarks-5.65.0/src/kbookmarkimporter_ns.cpp 2019-12-07 22:39:48.000000000 +0100 +++ new/kbookmarks-5.66.0/src/kbookmarkimporter_ns.cpp 2020-01-04 11:03:59.000000000 +0100 @@ -144,7 +144,7 @@ QFile file(m_fileName); if (!file.open(QIODevice::WriteOnly)) { - qCCritical(KBOOKMARKS_LOG) << "Can't write to file " << m_fileName << endl; + qCCritical(KBOOKMARKS_LOG) << "Can't write to file " << m_fileName; return; } @@ -154,15 +154,15 @@ QString charset = m_utf8 ? QStringLiteral("UTF-8") : QString::fromLatin1(QTextCodec::codecForLocale()->name()).toUpper(); - fstream << "<!DOCTYPE NETSCAPE-Bookmark-file-1>" << endl - << KNSBookmarkImporterImpl::tr("<!-- This file was generated by Konqueror -->") << endl + fstream << "<!DOCTYPE NETSCAPE-Bookmark-file-1>\n" + << KNSBookmarkImporterImpl::tr("<!-- This file was generated by Konqueror -->") << "\n" << "<META HTTP-EQUIV=\"Content-Type\" CONTENT=\"text/html; charset=" - << charset << "\">" << endl - << "<TITLE>" << KNSBookmarkImporterImpl::tr("Bookmarks") << "</TITLE>" << endl - << "<H1>" << KNSBookmarkImporterImpl::tr("Bookmarks") << "</H1>" << endl - << "<DL><p>" << endl + << charset << "\">\n" + << "<TITLE>" << KNSBookmarkImporterImpl::tr("Bookmarks") << "</TITLE>\n" + << "<H1>" << KNSBookmarkImporterImpl::tr("Bookmarks") << "</H1>\n" + << "<DL><p>\n" << folderAsString(parent) - << "</DL><P>" << endl; + << "</DL><P>\n"; } QString KNSBookmarkExporterImpl::folderAsString(const KBookmarkGroup &parent) const @@ -172,7 +172,8 @@ for (KBookmark bk = parent.first(); !bk.isNull(); bk = parent.next(bk)) { if (bk.isSeparator()) { - fstream << "<HR>" << endl; + fstream << "<HR>\n"; + fstream.flush(); continue; } @@ -182,17 +183,19 @@ fstream << "<DT><H3 " << (!bk.toGroup().isOpen() ? "FOLDED " : "") << bk.internalElement().attribute(QStringLiteral("netscapeinfo")) << ">" - << text << "</H3>" << endl - << "<DL><P>" << endl + << text << "</H3>\n" + << "<DL><P>\n" << folderAsString(bk.toGroup()) - << "</DL><P>" << endl; + << "</DL><P>\n"; + fstream.flush(); continue; } else { // note - netscape seems to use local8bit for url... fstream << "<DT><A HREF=\"" << bk.url().toString() << "\"" << bk.internalElement().attribute(QStringLiteral("netscapeinfo")) << ">" - << text << "</A>" << endl; + << text << "</A>\n"; + fstream.flush(); continue; } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kbookmarks-5.65.0/src/kbookmarkimporter_opera.cpp new/kbookmarks-5.66.0/src/kbookmarkimporter_opera.cpp --- old/kbookmarks-5.65.0/src/kbookmarkimporter_opera.cpp 2019-12-07 22:39:48.000000000 +0100 +++ new/kbookmarks-5.66.0/src/kbookmarkimporter_opera.cpp 2020-01-04 11:03:59.000000000 +0100 @@ -146,32 +146,36 @@ OperaExporter::OperaExporter() : m_out(&m_string, QIODevice::WriteOnly) { - m_out << "Opera Hotlist version 2.0" << endl; - m_out << "Options: encoding = utf8, version=3" << endl; + m_out << "Opera Hotlist version 2.0\n"; + m_out << "Options: encoding = utf8, version=3\n"; + m_out.flush(); } void OperaExporter::visit(const KBookmark &bk) { // qCDebug(KBOOKMARKS_LOG) << "visit(" << bk.text() << ")"; - m_out << "#URL" << endl; - m_out << "\tNAME=" << bk.fullText() << endl; - m_out << "\tURL=" << bk.url().toString().toUtf8() << endl; - m_out << endl; + m_out << "#URL\n"; + m_out << "\tNAME=" << bk.fullText() << '\n'; + m_out << "\tURL=" << bk.url().toString().toUtf8() << '\n'; + m_out << '\n'; + m_out.flush(); } void OperaExporter::visitEnter(const KBookmarkGroup &grp) { // qCDebug(KBOOKMARKS_LOG) << "visitEnter(" << grp.text() << ")"; - m_out << "#FOLDER" << endl; - m_out << "\tNAME=" << grp.fullText() << endl; - m_out << endl; + m_out << "#FOLDER\n"; + m_out << "\tNAME=" << grp.fullText() << '\n'; + m_out << '\n'; + m_out.flush(); } void OperaExporter::visitLeave(const KBookmarkGroup &) { // qCDebug(KBOOKMARKS_LOG) << "visitLeave()"; - m_out << "-" << endl; - m_out << endl; + m_out << "-\n"; + m_out << '\n'; + m_out.flush(); } void KOperaBookmarkExporterImpl::write(const KBookmarkGroup &parent) @@ -180,7 +184,7 @@ QString content = exporter.generate(parent); QFile file(m_fileName); if (!file.open(QIODevice::WriteOnly)) { - qCCritical(KBOOKMARKS_LOG) << "Can't write to file " << m_fileName << endl; + qCCritical(KBOOKMARKS_LOG) << "Can't write to file " << m_fileName; return; } QTextStream fstream(&file);
