Hello community, here is the log from the commit of package bluez-qt for openSUSE:Factory checked in at 2020-02-14 16:30:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/bluez-qt (Old) and /work/SRC/openSUSE:Factory/.bluez-qt.new.26092 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "bluez-qt" Fri Feb 14 16:30:58 2020 rev:62 rq:773229 version:5.67.0 Changes: -------- --- /work/SRC/openSUSE:Factory/bluez-qt/bluez-qt.changes 2020-01-30 09:32:22.673200385 +0100 +++ /work/SRC/openSUSE:Factory/.bluez-qt.new.26092/bluez-qt.changes 2020-02-14 16:31:00.183373956 +0100 @@ -1,0 +2,17 @@ +Sun Feb 2 18:06:40 UTC 2020 - Christophe Giboudeaux <[email protected]> + +- Replace %make_jobs with %cmake_build. + +------------------------------------------------------------------- +Sun Feb 2 14:32:25 UTC 2020 - Christophe Giboudeaux <[email protected]> + +- Update to 5.67.0 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/kde-frameworks-5.67.0.php +- Changes since 5.66.0: + * Remove extra flush when we close file it will flush + * endl is Qt:: namespaced in qt5.15. Port to \n and flush + when QTextStream is not on a QFile + +------------------------------------------------------------------- Old: ---- bluez-qt-5.66.0.tar.xz bluez-qt-5.66.0.tar.xz.sig New: ---- bluez-qt-5.67.0.tar.xz bluez-qt-5.67.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ bluez-qt.spec ++++++ --- /var/tmp/diff_new_pack.iNTs3c/_old 2020-02-14 16:31:00.723374249 +0100 +++ /var/tmp/diff_new_pack.iNTs3c/_new 2020-02-14 16:31:00.731374254 +0100 @@ -18,7 +18,7 @@ %define sonum 6 %define _libname KF5BluezQt -%define _tar_path 5.66 +%define _tar_path 5.67 # Full KF5 version (e.g. 5.33.0) %{!?_kf5_version: %global _kf5_version %{version}} # Last major and minor KF5 version (e.g. 5.33) @@ -26,7 +26,7 @@ # Only needed for the package signature condition %bcond_without lang Name: bluez-qt -Version: 5.66.0 +Version: 5.67.0 Release: 0 Summary: Async Bluez wrapper library License: LGPL-2.1-or-later @@ -41,12 +41,12 @@ BuildRequires: extra-cmake-modules >= %{_kf5_bugfix_version} BuildRequires: fdupes BuildRequires: kf5-filesystem -BuildRequires: cmake(Qt5Core) >= 5.11.0 -BuildRequires: cmake(Qt5DBus) >= 5.11.0 -BuildRequires: cmake(Qt5Gui) >= 5.11.0 -BuildRequires: cmake(Qt5Network) >= 5.11.0 -BuildRequires: cmake(Qt5Qml) >= 5.11.0 -BuildRequires: cmake(Qt5Widgets) >= 5.11.0 +BuildRequires: cmake(Qt5Core) >= 5.12.0 +BuildRequires: cmake(Qt5DBus) >= 5.12.0 +BuildRequires: cmake(Qt5Gui) >= 5.12.0 +BuildRequires: cmake(Qt5Network) >= 5.12.0 +BuildRequires: cmake(Qt5Qml) >= 5.12.0 +BuildRequires: cmake(Qt5Widgets) >= 5.12.0 BuildRequires: pkgconfig(udev) %description @@ -85,7 +85,7 @@ Summary: Async Bluez wrapper library - development files Group: Development/Libraries/C and C++ Requires: lib%{_libname}%{sonum} = %{version} -Requires: cmake(Qt5Core) >= 5.11.0 +Requires: cmake(Qt5Core) >= 5.12.0 %description devel Development files for QBluez Async Bluez wrapper library. @@ -95,7 +95,7 @@ %build %cmake_kf5 -d build -- -DUDEV_RULES_INSTALL_DIR="%{_udevrulesdir}" - %make_jobs + %cmake_build %install %kf5_makeinstall -C build ++++++ bluez-qt-5.66.0.tar.xz -> bluez-qt-5.67.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bluez-qt-5.66.0/CMakeLists.txt new/bluez-qt-5.67.0/CMakeLists.txt --- old/bluez-qt-5.66.0/CMakeLists.txt 2020-01-04 00:09:10.000000000 +0100 +++ new/bluez-qt-5.67.0/CMakeLists.txt 2020-02-01 09:58:47.000000000 +0100 @@ -1,10 +1,10 @@ cmake_minimum_required(VERSION 3.5) -set(KF5_VERSION "5.66.0") # handled by release scripts +set(KF5_VERSION "5.67.0") # handled by release scripts project(BluezQt VERSION ${KF5_VERSION}) include(FeatureSummary) -find_package(ECM 5.66.0 NO_MODULE) +find_package(ECM 5.67.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/bluez-qt-5.66.0/tools/bluezapi2qt/CppGenerator.cpp new/bluez-qt-5.67.0/tools/bluezapi2qt/CppGenerator.cpp --- old/bluez-qt-5.66.0/tools/bluezapi2qt/CppGenerator.cpp 2020-01-04 00:09:10.000000000 +0100 +++ new/bluez-qt-5.67.0/tools/bluezapi2qt/CppGenerator.cpp 2020-02-01 09:58:47.000000000 +0100 @@ -58,14 +58,14 @@ // Write content QTextStream stream(&file); writeCopyrightHeader(stream); - stream << "#pragma once" << endl << endl; - stream << "#include <QDBusAbstractAdaptor>" << endl << endl; - stream << "class QDBusObjectPath;" << endl << endl; - stream << "namespace BluezQt" << endl << "{" << endl << endl; - stream << "class " << className << ";" << endl << endl; - stream << "class " << className << "Adaptor : public QDBusAbstractAdaptor" << endl << "{" << endl; - stream << " Q_OBJECT " << endl; - stream << " Q_CLASSINFO(\"D-Bus Interface\", \"" << interface.name() << "\")" << endl; + stream << "#pragma once\n\n"; + stream << "#include <QDBusAbstractAdaptor>\n\n"; + stream << "class QDBusObjectPath;\n\n"; + stream << "namespace BluezQt\n{\n\n"; + stream << "class " << className << ";\n\n"; + stream << "class " << className << "Adaptor : public QDBusAbstractAdaptor\n{\n"; + stream << " Q_OBJECT \n"; + stream << " Q_CLASSINFO(\"D-Bus Interface\", \"" << interface.name() << "\")\n"; // Write properties for (const auto &property : interface.properties().properties()) { @@ -78,11 +78,11 @@ if (!property.tags().isReadOnly) { stream << " WRITE set" << property.name(); } - stream << ")" << endl; + stream << ")\n"; } - stream << endl << "public:" << endl; - stream << " explicit " << className << "Adaptor(" << className << "* parent);" << endl << endl; + stream << "\npublic:\n"; + stream << " explicit " << className << "Adaptor(" << className << "* parent);\n\n"; // Write property accessors for (const auto &property : interface.properties().properties()) { @@ -91,14 +91,14 @@ (property.tags().isExperimental && !m_config.useExperimental)) { continue; } - stream << " " << bluezToQt(property.type()) << " " << lowerFirstChars(property.name()) << "() const;" << endl; + stream << " " << bluezToQt(property.type()) << " " << lowerFirstChars(property.name()) << "() const;\n"; if (!property.tags().isReadOnly) { - stream << " void set" << property.name() << "(const " << bluezToQt(property.type()) << " &" << lowerFirstChars(property.name()) << ");" << endl; + stream << " void set" << property.name() << "(const " << bluezToQt(property.type()) << " &" << lowerFirstChars(property.name()) << ");\n"; } - stream << endl; + stream << "\n"; } - stream << "public Q_SLOTS:" << endl; + stream << "public Q_SLOTS:\n"; // write Methods for (const auto &method : interface.methods().methods()) { @@ -115,13 +115,13 @@ stream << ", "; } } - stream << ");" << endl; + stream << ");\n"; } // write private members - stream << endl << "private:" << endl; - stream << " " << className << " *m_" << lowerFirstChars(className) << ";" << endl; - stream << "};" << endl << endl << "} // namespace BluezQt" << endl; + stream << "\nprivate:\n"; + stream << " " << className << " *m_" << lowerFirstChars(className) << ";\n"; + stream << "};\n\n} // namespace BluezQt\n"; file.close(); } @@ -143,13 +143,13 @@ // Write content QTextStream stream(&file); writeCopyrightHeader(stream); - stream << "#include \"" << className << "Adaptor.h\"" << endl << endl; - stream << "#include \"" << className << ".h\"" << endl << endl; - stream << "namespace BluezQt" << endl << "{" << endl << endl; - stream << className << "Adaptor::" << className << "Adaptor(" << className << " *parent)" << endl; - stream << " : QDBusAbstractAdaptor(parent)" << endl; - stream << " , m_" << lowerFirstChars(className) << "(parent)" << endl; - stream << "{" << endl << "}" << endl << endl; + stream << "#include \"" << className << "Adaptor.h\"\n\n"; + stream << "#include \"" << className << ".h\"\n\n"; + stream << "namespace BluezQt\n{\n\n"; + stream << className << "Adaptor::" << className << "Adaptor(" << className << " *parent)\n"; + stream << " : QDBusAbstractAdaptor(parent)\n"; + stream << " , m_" << lowerFirstChars(className) << "(parent)\n"; + stream << "{\n}\n\n"; // Write property accessors for (const auto &property : interface.properties().properties()) { @@ -158,15 +158,15 @@ (property.tags().isExperimental && !m_config.useExperimental)) { continue; } - stream << bluezToQt(property.type()) << " " << className << "Adaptor::" << lowerFirstChars(property.name()) << "() const" << endl; - stream << "{" << endl; - stream << " return m_" << lowerFirstChars(className) << "->" << lowerFirstChars(property.name()) << "();" << endl; - stream << "}" << endl << endl; + stream << bluezToQt(property.type()) << " " << className << "Adaptor::" << lowerFirstChars(property.name()) << "() const\n"; + stream << "{\n"; + stream << " return m_" << lowerFirstChars(className) << "->" << lowerFirstChars(property.name()) << "();\n"; + stream << "}\n\n"; if (!property.tags().isReadOnly) { - stream << "void " << className << "Adaptor::set" << property.name() << "(const " << bluezToQt(property.type()) << " &" << lowerFirstChars(property.name()) << ");" << endl; - stream << "{" << endl; - stream << " m_" << lowerFirstChars(className) << "->set" << property.name() << "(" << lowerFirstChars(property.name()) << ");" << endl; - stream << "}" << endl << endl; + stream << "void " << className << "Adaptor::set" << property.name() << "(const " << bluezToQt(property.type()) << " &" << lowerFirstChars(property.name()) << ");\n"; + stream << "{\n"; + stream << " m_" << lowerFirstChars(className) << "->set" << property.name() << "(" << lowerFirstChars(property.name()) << ");\n"; + stream << "}\n\n"; } } @@ -185,7 +185,7 @@ stream << ", "; } } - stream << ")" << endl << "{" << endl; + stream << ")\n{\n"; stream << " return m_" << lowerFirstChars(className) << "->" << lowerFirstChars(method.name()) << "("; for (auto it = method.inParameters().begin(); it != method.inParameters().end(); ++it) { @@ -194,10 +194,10 @@ stream << ", "; } } - stream << ");" << endl << "}" << endl << endl; + stream << ");\n}\n\n"; } - stream << "} // namespace BluezQt" << endl; + stream << "} // namespace BluezQt\n"; file.close(); } @@ -235,25 +235,25 @@ void CppGenerator::writeCopyrightHeader(QTextStream &stream) { - stream << "/*" << endl; - stream << " * BluezQt - Asynchronous Bluez wrapper library" << endl; - stream << " *" << endl; - stream << " * Copyright (C) " << m_config.year << " " << m_config.author << endl; - stream << " *" << endl; - stream << " * This library is free software; you can redistribute it and/or" << endl; - stream << " * modify it under the terms of the GNU Lesser General Public" << endl; - stream << " * License as published by the Free Software Foundation; either" << endl; - stream << " * version 2.1 of the License, or (at your option) version 3, or any" << endl; - stream << " * later version accepted by the membership of KDE e.V. (or its" << endl; - stream << " * successor approved by the membership of KDE e.V.), which shall" << endl; - stream << " * act as a proxy defined in Section 6 of version 3 of the license." << endl; - stream << " *" << endl; - stream << " * This library is distributed in the hope that it will be useful," << endl; - stream << " * but WITHOUT ANY WARRANTY; without even the implied warranty of" << endl; - stream << " * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU" << endl; - stream << " * Lesser General Public License for more details." << endl; - stream << " *" << endl; - stream << " * You should have received a copy of the GNU Lesser General Public" << endl; - stream << " * License along with this library. If not, see <http://www.gnu.org/licenses/>." << endl; - stream << " */" << endl << endl; + stream << "/*\n"; + stream << " * BluezQt - Asynchronous Bluez wrapper library\n"; + stream << " *\n"; + stream << " * Copyright (C) " << m_config.year << " " << m_config.author << "\n"; + stream << " *\n"; + stream << " * This library is free software; you can redistribute it and/or\n"; + stream << " * modify it under the terms of the GNU Lesser General Public\n"; + stream << " * License as published by the Free Software Foundation; either\n"; + stream << " * version 2.1 of the License, or (at your option) version 3, or any\n"; + stream << " * later version accepted by the membership of KDE e.V. (or its\n"; + stream << " * successor approved by the membership of KDE e.V.), which shall\n"; + stream << " * act as a proxy defined in Section 6 of version 3 of the license.\n"; + stream << " *\n"; + stream << " * This library is distributed in the hope that it will be useful,\n"; + stream << " * but WITHOUT ANY WARRANTY; without even the implied warranty of\n"; + stream << " * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU\n"; + stream << " * Lesser General Public License for more details.\n"; + stream << " *\n"; + stream << " * You should have received a copy of the GNU Lesser General Public\n"; + stream << " * License along with this library. If not, see <http://www.gnu.org/licenses/>.\n"; + stream << " */\n\n"; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bluez-qt-5.66.0/tools/bluezapi2qt/XmlGenerator.cpp new/bluez-qt-5.67.0/tools/bluezapi2qt/XmlGenerator.cpp --- old/bluez-qt-5.66.0/tools/bluezapi2qt/XmlGenerator.cpp 2020-01-04 00:09:10.000000000 +0100 +++ new/bluez-qt-5.67.0/tools/bluezapi2qt/XmlGenerator.cpp 2020-02-01 09:58:47.000000000 +0100 @@ -76,24 +76,24 @@ void XmlGenerator::writeHeader(QTextStream &stream) { - stream << "<?xml version=\"1.0\"?>" << endl; - stream << "<!DOCTYPE node PUBLIC \"-//freedesktop//DTD D-BUS Object Introspection 1.0//EN\" \"http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd\";>" << endl; - stream << "<node>" << endl; + stream << "<?xml version=\"1.0\"?>\n"; + stream << "<!DOCTYPE node PUBLIC \"-//freedesktop//DTD D-BUS Object Introspection 1.0//EN\" \"http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd\";>\n"; + stream << "<node>\n"; } void XmlGenerator::writeFooter(QTextStream &stream) { - stream << "</node>" << endl; + stream << "</node>\n"; } void XmlGenerator::writeInterface(QTextStream &stream, const QString &name) { - stream << " <interface name=\"" << name << "\">" << endl; + stream << " <interface name=\"" << name << "\">\n"; } void XmlGenerator::closeInterface(QTextStream &stream) { - stream << " </interface>" << endl; + stream << " </interface>\n"; } bool XmlGenerator::writeMethod(QTextStream &stream, const Method &method) @@ -102,11 +102,11 @@ // Some beautification if (method.inParameters().empty() && method.outParameters().empty()) { - stream << "/>" << endl; + stream << "/>\n"; return true; } - stream << ">" << endl; + stream << ">\n"; for (const auto ¶m : method.inParameters()) { if (!writeArg(stream, param, QStringLiteral("in"))) { @@ -125,7 +125,7 @@ writeAnnotation(stream, method.outParameters().at(i), QStringLiteral("Out"), i); } - stream << " </method>" << endl; + stream << " </method>\n"; return true; } @@ -137,7 +137,7 @@ return false; } stream << " <arg name=\"" << param.name() << "\" type=\"" << dbusType << - "\" direction=\"" << dir << "\"/>" << endl; + "\" direction=\"" << dir << "\"/>\n"; return true; } @@ -149,7 +149,7 @@ return; } stream << " <annotation name=\"org.qtproject.QtDBus.QtTypeName." << dir << - QString::number(i) << "\" value=\"" << qtType << "\"/>" << endl; + QString::number(i) << "\" value=\"" << qtType << "\"/>\n"; return; }
