Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package qt6-mqtt for openSUSE:Factory checked in at 2023-05-28 19:22:30 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/qt6-mqtt (Old) and /work/SRC/openSUSE:Factory/.qt6-mqtt.new.1533 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qt6-mqtt" Sun May 28 19:22:30 2023 rev:21 rq:1089149 version:6.5.1 Changes: -------- --- /work/SRC/openSUSE:Factory/qt6-mqtt/qt6-mqtt.changes 2023-04-05 21:36:43.530935044 +0200 +++ /work/SRC/openSUSE:Factory/.qt6-mqtt.new.1533/qt6-mqtt.changes 2023-05-28 19:22:57.261002002 +0200 @@ -1,0 +2,6 @@ +Wed May 24 07:45:34 UTC 2023 - Christophe Marin <[email protected]> + +- Update to 6.5.1 + * https://www.qt.io/blog/qt-6.5.1-released + +------------------------------------------------------------------- Old: ---- qtmqtt-everywhere-src-6.5.0.tar.xz New: ---- qtmqtt-everywhere-src-6.5.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qt6-mqtt.spec ++++++ --- /var/tmp/diff_new_pack.CWbupU/_old 2023-05-28 19:22:57.689004549 +0200 +++ /var/tmp/diff_new_pack.CWbupU/_new 2023-05-28 19:22:57.697004597 +0200 @@ -16,7 +16,7 @@ # -%define real_version 6.5.0 +%define real_version 6.5.1 %define short_version 6.5 %define tar_name qtmqtt-everywhere-src %define tar_suffix %{nil} @@ -27,7 +27,7 @@ %endif # Name: qt6-mqtt%{?pkg_suffix} -Version: 6.5.0 +Version: 6.5.1 Release: 0 Summary: Qt 6 Module to implement MQTT protocol version 3.1 and 3.1.1 License: GPL-3.0-only WITH Qt-GPL-exception-1.0 ++++++ _service ++++++ --- /var/tmp/diff_new_pack.CWbupU/_old 2023-05-28 19:22:57.741004859 +0200 +++ /var/tmp/diff_new_pack.CWbupU/_new 2023-05-28 19:22:57.745004882 +0200 @@ -1,9 +1,9 @@ <services> <service name="tar_scm" mode="disabled"> <param name="changesgenerate">disable</param> - <param name="version">6.5.0</param> + <param name="version">6.5.1</param> <param name="url">git://code.qt.io/qt/qtmqtt.git</param> - <param name="revision">v6.5.0</param> + <param name="revision">v6.5.1</param> <param name="scm">git</param> <param name="filename">qtmqtt-everywhere-src</param> </service> ++++++ qtmqtt-everywhere-src-6.5.0.tar.xz -> qtmqtt-everywhere-src-6.5.1.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmqtt-everywhere-src-6.5.0/.cmake.conf new/qtmqtt-everywhere-src-6.5.1/.cmake.conf --- old/qtmqtt-everywhere-src-6.5.0/.cmake.conf 2023-03-28 16:23:49.000000000 +0200 +++ new/qtmqtt-everywhere-src-6.5.1/.cmake.conf 2023-05-16 11:46:45.000000000 +0200 @@ -1,3 +1,3 @@ -set(QT_REPO_MODULE_VERSION "6.5.0") +set(QT_REPO_MODULE_VERSION "6.5.1") set(QT_REPO_MODULE_PRERELEASE_VERSION_SEGMENT "alpha1") set(QT_EXTRA_INTERNAL_TARGET_DEFINES "QT_NO_AS_CONST=1") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmqtt-everywhere-src-6.5.0/dependencies.yaml new/qtmqtt-everywhere-src-6.5.1/dependencies.yaml --- old/qtmqtt-everywhere-src-6.5.0/dependencies.yaml 2023-03-28 16:23:49.000000000 +0200 +++ new/qtmqtt-everywhere-src-6.5.1/dependencies.yaml 2023-05-16 11:46:45.000000000 +0200 @@ -1,7 +1,7 @@ dependencies: ../qtbase: - ref: aea92807be2567c4212b96ae67de7137075ba4ee + ref: 55aee8697512af105dfefabc1e2ec41d4df1e45e required: true ../qtdeclarative: - ref: 3238e18d6b0dc45d2e765fb0b93da5cbf3f396ec + ref: 65651dc1d333e2aded18b0d6f0b71c35e5b40c1c required: true diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmqtt-everywhere-src-6.5.0/examples/mqtt/simpleclient/mainwindow.cpp new/qtmqtt-everywhere-src-6.5.1/examples/mqtt/simpleclient/mainwindow.cpp --- old/qtmqtt-everywhere-src-6.5.0/examples/mqtt/simpleclient/mainwindow.cpp 2023-03-28 16:23:49.000000000 +0200 +++ new/qtmqtt-everywhere-src-6.5.1/examples/mqtt/simpleclient/mainwindow.cpp 2023-05-16 11:46:45.000000000 +0200 @@ -16,7 +16,7 @@ m_client = new QMqttClient(this); m_client->setHostname(ui->lineEditHost->text()); - m_client->setPort(ui->spinBoxPort->value()); + m_client->setPort(static_cast<quint16>(ui->spinBoxPort->value())); connect(m_client, &QMqttClient::stateChanged, this, &MainWindow::updateLogStateChange); connect(m_client, &QMqttClient::disconnected, this, &MainWindow::brokerDisconnected); @@ -86,7 +86,7 @@ void MainWindow::setClientPort(int p) { - m_client->setPort(p); + m_client->setPort(static_cast<quint16>(p)); } void MainWindow::on_buttonPublish_clicked() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmqtt-everywhere-src-6.5.0/examples/mqtt/subscriptions/mainwindow.cpp new/qtmqtt-everywhere-src-6.5.1/examples/mqtt/subscriptions/mainwindow.cpp --- old/qtmqtt-everywhere-src-6.5.0/examples/mqtt/subscriptions/mainwindow.cpp 2023-03-28 16:23:49.000000000 +0200 +++ new/qtmqtt-everywhere-src-6.5.1/examples/mqtt/subscriptions/mainwindow.cpp 2023-05-16 11:46:45.000000000 +0200 @@ -17,7 +17,7 @@ m_client = new QMqttClient(this); m_client->setHostname(ui->lineEditHost->text()); - m_client->setPort(ui->spinBoxPort->value()); + m_client->setPort(static_cast<quint16>(ui->spinBoxPort->value())); connect(m_client, &QMqttClient::stateChanged, this, &MainWindow::updateLogStateChange); connect(m_client, &QMqttClient::disconnected, this, &MainWindow::brokerDisconnected); @@ -96,21 +96,22 @@ void MainWindow::setClientPort(int p) { - m_client->setPort(p); + m_client->setPort(static_cast<quint16>(p)); } void MainWindow::on_buttonPublish_clicked() { - if (m_client->publish(ui->lineEditTopic->text(), - ui->lineEditMessage->text().toUtf8(), - ui->spinQoS_2->text().toUInt(), - ui->checkBoxRetain->isChecked()) == -1) + if (m_client->publish(ui->lineEditTopic->text(), ui->lineEditMessage->text().toUtf8(), + static_cast<quint8>(ui->spinQoS_2->text().toUInt()), + ui->checkBoxRetain->isChecked()) + == -1) QMessageBox::critical(this, QLatin1String("Error"), QLatin1String("Could not publish message")); } void MainWindow::on_buttonSubscribe_clicked() { - auto subscription = m_client->subscribe(ui->lineEditTopic->text(), ui->spinQoS->text().toUInt()); + auto subscription = m_client->subscribe(ui->lineEditTopic->text(), + static_cast<quint8>(ui->spinQoS->text().toUInt())); if (!subscription) { QMessageBox::critical(this, QLatin1String("Error"), QLatin1String("Could not subscribe. Is there a valid connection?")); return; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmqtt-everywhere-src-6.5.0/examples/mqtt/subscriptions/subscriptionwindow.cpp new/qtmqtt-everywhere-src-6.5.1/examples/mqtt/subscriptions/subscriptionwindow.cpp --- old/qtmqtt-everywhere-src-6.5.0/examples/mqtt/subscriptions/subscriptionwindow.cpp 2023-03-28 16:23:49.000000000 +0200 +++ new/qtmqtt-everywhere-src-6.5.1/examples/mqtt/subscriptions/subscriptionwindow.cpp 2023-05-16 11:46:45.000000000 +0200 @@ -48,6 +48,9 @@ case QMqttSubscription::Error: ui->labelStatus->setText(QLatin1String("Error")); break; + case QMqttSubscription::UnsubscriptionPending: + ui->labelStatus->setText(QLatin1String("Pending Unsubscription")); + break; default: ui->labelStatus->setText(QLatin1String("--Unknown--")); break; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmqtt-everywhere-src-6.5.0/src/mqtt/qmqttclient.cpp new/qtmqtt-everywhere-src-6.5.1/src/mqtt/qmqttclient.cpp --- old/qtmqtt-everywhere-src-6.5.0/src/mqtt/qmqttclient.cpp 2023-03-28 16:23:49.000000000 +0200 +++ new/qtmqtt-everywhere-src-6.5.1/src/mqtt/qmqttclient.cpp 2023-05-16 11:46:45.000000000 +0200 @@ -326,7 +326,11 @@ */ QMqttClient::~QMqttClient() { - disconnectFromHost(); + Q_D(QMqttClient); + if (d->m_connection.internalState() == QMqttConnection::BrokerConnected) { + d->m_connection.setClientDestruction(); + disconnectFromHost(); + } } /*! @@ -575,6 +579,7 @@ switch (d->m_connection.internalState()) { case QMqttConnection::BrokerConnected: + case QMqttConnection::ClientDestruction: d->m_connection.sendControlDisconnect(); break; case QMqttConnection::BrokerDisconnected: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmqtt-everywhere-src-6.5.0/src/mqtt/qmqttconnection.cpp new/qtmqtt-everywhere-src-6.5.1/src/mqtt/qmqttconnection.cpp --- old/qtmqtt-everywhere-src-6.5.0/src/mqtt/qmqttconnection.cpp 2023-03-28 16:23:49.000000000 +0200 +++ new/qtmqtt-everywhere-src-6.5.1/src/mqtt/qmqttconnection.cpp 2023-05-16 11:46:45.000000000 +0200 @@ -291,6 +291,7 @@ switch (m_internalState) { case BrokerDisconnected: case BrokerConnecting: + case ClientDestruction: qCDebug(lcMqttConnection) << "Using AUTH while disconnected."; return false; case BrokerWaitForConnectAck: @@ -601,7 +602,8 @@ qCDebug(lcMqttConnection) << "Failed to write DISCONNECT to transport."; return false; } - m_internalState = BrokerDisconnected; + if (m_internalState != ClientDestruction) + m_internalState = BrokerDisconnected; if (m_transport->waitForBytesWritten(30000)) { // MQTT-3.14.4-1 must disconnect @@ -676,6 +678,8 @@ m_readPosition = 0; m_pingTimer.stop(); m_pingTimeout = 0; + if (m_internalState == ClientDestruction) + return; if (m_internalState == BrokerDisconnected) // We manually disconnected m_clientPrivate->setStateAndError(QMqttClient::Disconnected, QMqttClient::NoError); else diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmqtt-everywhere-src-6.5.0/src/mqtt/qmqttconnection_p.h new/qtmqtt-everywhere-src-6.5.1/src/mqtt/qmqttconnection_p.h --- old/qtmqtt-everywhere-src-6.5.0/src/mqtt/qmqttconnection_p.h 2023-03-28 16:23:49.000000000 +0200 +++ new/qtmqtt-everywhere-src-6.5.1/src/mqtt/qmqttconnection_p.h 2023-05-16 11:46:45.000000000 +0200 @@ -38,7 +38,8 @@ BrokerDisconnected = 0, BrokerConnecting, BrokerWaitForConnectAck, - BrokerConnected + BrokerConnected, + ClientDestruction }; explicit QMqttConnection(QObject *parent = nullptr); @@ -67,6 +68,7 @@ inline quint16 unusedPacketIdentifier() const; inline InternalConnectionState internalState() const { return m_internalState; } + inline void setClientDestruction() { m_internalState = ClientDestruction; } void cleanSubscriptions();
