Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package libqt5-qtserialbus for openSUSE:Factory checked in at 2023-10-08 12:18:20 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libqt5-qtserialbus (Old) and /work/SRC/openSUSE:Factory/.libqt5-qtserialbus.new.28202 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libqt5-qtserialbus" Sun Oct 8 12:18:20 2023 rev:28 rq:1116124 version:5.15.11+kde0 Changes: -------- --- /work/SRC/openSUSE:Factory/libqt5-qtserialbus/libqt5-qtserialbus.changes 2023-06-16 16:53:06.761088650 +0200 +++ /work/SRC/openSUSE:Factory/.libqt5-qtserialbus.new.28202/libqt5-qtserialbus.changes 2023-10-08 12:21:40.525399260 +0200 @@ -1,0 +2,7 @@ +Fri Oct 6 06:42:49 UTC 2023 - Fabian Vogt <fab...@ritter-vogt.de> + +- Update to version 5.15.11+kde0, rebased upstream: + * Make pduFromStream work on big endian (again) + * Modbus: extend documentation + +------------------------------------------------------------------- Old: ---- qtserialbus-everywhere-src-5.15.10+kde0.obscpio New: ---- qtserialbus-everywhere-src-5.15.11+kde0.obscpio ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libqt5-qtserialbus.spec ++++++ --- /var/tmp/diff_new_pack.28HhKu/_old 2023-10-08 12:21:41.785444564 +0200 +++ /var/tmp/diff_new_pack.28HhKu/_new 2023-10-08 12:21:41.785444564 +0200 @@ -19,15 +19,15 @@ %define qt5_snapshot 1 Name: libqt5-qtserialbus -Version: 5.15.10+kde0 +Version: 5.15.11+kde0 Release: 0 Summary: Qt 5 Serial Bus Addon License: LGPL-3.0-only OR GPL-2.0-or-later Group: Development/Libraries/X11 Url: https://www.qt.io %define base_name libqt5 -%define real_version 5.15.10 -%define so_version 5.15.10 +%define real_version 5.15.11 +%define so_version 5.15.11 %define tar_version qtserialbus-everywhere-src-%{version} Source: %{tar_version}.tar.xz Source1: baselibs.conf ++++++ _service ++++++ --- /var/tmp/diff_new_pack.28HhKu/_old 2023-10-08 12:21:41.817445714 +0200 +++ /var/tmp/diff_new_pack.28HhKu/_new 2023-10-08 12:21:41.821445858 +0200 @@ -1,12 +1,12 @@ <services> <service name="obs_scm" mode="disabled"> <param name="changesgenerate">enable</param> - <param name="versionformat">5.15.10+kde@TAG_OFFSET@</param> + <param name="versionformat">5.15.11+kde@TAG_OFFSET@</param> <param name="url">https://invent.kde.org/qt/qt/qtserialbus.git</param> <param name="scm">git</param> <param name="filename">qtserialbus-everywhere-src</param> <param name="revision">kde/5.15</param> - <param name="parent-tag">v5.15.10-lts-lgpl</param> + <param name="parent-tag">v5.15.11-lts-lgpl</param> <param name="changesgenerate">enable</param> </service> <service name="set_version" mode="disabled"/> ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.28HhKu/_old 2023-10-08 12:21:41.841446577 +0200 +++ /var/tmp/diff_new_pack.28HhKu/_new 2023-10-08 12:21:41.845446721 +0200 @@ -1,6 +1,6 @@ <servicedata> <service name="tar_scm"> <param name="url">https://invent.kde.org/qt/qt/qtserialbus.git</param> - <param name="changesrevision">b3081c36baee48b43b6285b4811dc6da451e2390</param></service></servicedata> + <param name="changesrevision">c41785c9f36560722b917d373ee97eed8cc4089a</param></service></servicedata> (No newline at EOF) ++++++ qtserialbus-everywhere-src-5.15.10+kde0.obscpio -> qtserialbus-everywhere-src-5.15.11+kde0.obscpio ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtserialbus-everywhere-src-5.15.10+kde0/.qmake.conf new/qtserialbus-everywhere-src-5.15.11+kde0/.qmake.conf --- old/qtserialbus-everywhere-src-5.15.10+kde0/.qmake.conf 2023-04-24 09:14:04.000000000 +0200 +++ new/qtserialbus-everywhere-src-5.15.11+kde0/.qmake.conf 2023-06-09 16:09:15.000000000 +0200 @@ -2,4 +2,4 @@ CONFIG += warning_clean DEFINES += QT_NO_FOREACH -MODULE_VERSION = 5.15.10 +MODULE_VERSION = 5.15.11 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtserialbus-everywhere-src-5.15.10+kde0/src/serialbus/qmodbusclient.cpp new/qtserialbus-everywhere-src-5.15.11+kde0/src/serialbus/qmodbusclient.cpp --- old/qtserialbus-everywhere-src-5.15.10+kde0/src/serialbus/qmodbusclient.cpp 2023-04-24 09:14:04.000000000 +0200 +++ new/qtserialbus-everywhere-src-5.15.11+kde0/src/serialbus/qmodbusclient.cpp 2023-06-09 16:09:15.000000000 +0200 @@ -222,8 +222,12 @@ } /*! - Processes a Modbus server \a response and stores the decoded information in \a data. Returns - true on success; otherwise false. + Processes a Modbus server \a response and stores the decoded information in + \a data. Returns \c true on success; otherwise \c false. + + \note The default implementation does not support all + \l {QModbusPdu::}{FunctionCode}s. Override this method in a custom Modbus + client implementations to handle the needed functions. */ bool QModbusClient::processResponse(const QModbusResponse &response, QModbusDataUnit *data) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtserialbus-everywhere-src-5.15.10+kde0/src/serialbus/qmodbusdevice.cpp new/qtserialbus-everywhere-src-5.15.11+kde0/src/serialbus/qmodbusdevice.cpp --- old/qtserialbus-everywhere-src-5.15.10+kde0/src/serialbus/qmodbusdevice.cpp 2023-04-24 09:14:04.000000000 +0200 +++ new/qtserialbus-everywhere-src-5.15.11+kde0/src/serialbus/qmodbusdevice.cpp 2023-06-09 16:09:15.000000000 +0200 @@ -204,6 +204,13 @@ \value ReplyAbortedError The reply was aborted due to a disconnection of the device. \value UnknownError An unknown error occurred. + + \note An UnknownError can also indicate that the received + \l {QModbusPdu::}{FunctionCode} is not supported in the current + implementation. In this case custom Modbus client implementations need to + override the \l {QModbusClient::}{processResponse()} and + \l {QModbusClient::}{processPrivateResponse()} methods to provide support + for needed functions. */ /*! diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtserialbus-everywhere-src-5.15.10+kde0/src/serialbus/qmodbuspdu.cpp new/qtserialbus-everywhere-src-5.15.11+kde0/src/serialbus/qmodbuspdu.cpp --- old/qtserialbus-everywhere-src-5.15.10+kde0/src/serialbus/qmodbuspdu.cpp 2023-04-24 09:14:04.000000000 +0200 +++ new/qtserialbus-everywhere-src-5.15.11+kde0/src/serialbus/qmodbuspdu.cpp 2023-06-09 16:09:15.000000000 +0200 @@ -128,11 +128,12 @@ } raii = { pdu }; QModbusPdu::FunctionCode code = QModbusPdu::FunctionCode::Invalid; - if (stream.readRawData(reinterpret_cast<char *>(&code), sizeof(quint8)) != sizeof(quint8)) + stream >> code; + if (stream.status() == QDataStream::ReadPastEnd) return stream; pdu->setFunctionCode(code); - if (code == QModbusPdu::Invalid || code == QModbusPdu::UndefinedFunctionCode) // shortcut + if (code == QModbusPdu::Invalid) // shortcut return stream; constexpr const int MaxPduDataSize = 252; // in bytes @@ -623,6 +624,22 @@ } /*! + \internal + + Reads a FunctionCode from a \a stream. + In stream we serialize FunctionCode as one byte, so we use a temporary char + variable to make the code work on both little endian and big endian systems. + If reading from stream fails, code will retain original value. +*/ +QDataStream &operator>>(QDataStream &stream, QModbusPdu::FunctionCode &code) +{ + char buffer; + if (stream.readRawData(&buffer, 1) == 1) + code = static_cast<QModbusPdu::FunctionCode>(buffer); + return stream; +} + +/*! \relates QModbusRequest Reads a \a pdu from the \a stream and returns a reference to the stream. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtserialbus-everywhere-src-5.15.10+kde0/src/serialbus/qmodbuspdu.h new/qtserialbus-everywhere-src-5.15.11+kde0/src/serialbus/qmodbuspdu.h --- old/qtserialbus-everywhere-src-5.15.10+kde0/src/serialbus/qmodbuspdu.h 2023-04-24 09:14:04.000000000 +0200 +++ new/qtserialbus-everywhere-src-5.15.11+kde0/src/serialbus/qmodbuspdu.h 2023-06-09 16:09:15.000000000 +0200 @@ -187,6 +187,7 @@ }; Q_SERIALBUS_EXPORT QDebug operator<<(QDebug debug, const QModbusPdu &pdu); Q_SERIALBUS_EXPORT QDataStream &operator<<(QDataStream &stream, const QModbusPdu &pdu); +Q_SERIALBUS_EXPORT QDataStream &operator>>(QDataStream &stream, QModbusPdu::FunctionCode &code); class QModbusRequest : public QModbusPdu { ++++++ qtserialbus-everywhere-src.obsinfo ++++++ --- /var/tmp/diff_new_pack.28HhKu/_old 2023-10-08 12:21:42.109456213 +0200 +++ /var/tmp/diff_new_pack.28HhKu/_new 2023-10-08 12:21:42.113456357 +0200 @@ -1,5 +1,5 @@ name: qtserialbus-everywhere-src -version: 5.15.10+kde0 -mtime: 1682320444 -commit: b3081c36baee48b43b6285b4811dc6da451e2390 +version: 5.15.11+kde0 +mtime: 1686319755 +commit: c41785c9f36560722b917d373ee97eed8cc4089a
