Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package qt6-coap for openSUSE:Factory checked in at 2023-07-26 13:22:29 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/qt6-coap (Old) and /work/SRC/openSUSE:Factory/.qt6-coap.new.15225 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qt6-coap" Wed Jul 26 13:22:29 2023 rev:23 rq:1099986 version:6.5.2 Changes: -------- --- /work/SRC/openSUSE:Factory/qt6-coap/qt6-coap.changes 2023-07-08 22:47:45.663346177 +0200 +++ /work/SRC/openSUSE:Factory/.qt6-coap.new.15225/qt6-coap.changes 2023-07-26 13:22:50.863620215 +0200 @@ -1,0 +2,6 @@ +Thu Jul 20 08:43:27 UTC 2023 - Christophe Marin <[email protected]> + +- Update to 6.5.2 + * https://www.qt.io/blog/qt-6.5.2-released-1 + +------------------------------------------------------------------- Old: ---- qtcoap-everywhere-src-6.5.1.tar.xz New: ---- qtcoap-everywhere-src-6.5.2.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qt6-coap.spec ++++++ --- /var/tmp/diff_new_pack.IX4nv9/_old 2023-07-26 13:22:52.027626804 +0200 +++ /var/tmp/diff_new_pack.IX4nv9/_new 2023-07-26 13:22:52.031626826 +0200 @@ -16,7 +16,7 @@ # -%define real_version 6.5.1 +%define real_version 6.5.2 %define short_version 6.5 %define tar_name qtcoap-everywhere-src %define tar_suffix %{nil} @@ -27,7 +27,7 @@ %endif # Name: qt6-coap%{?pkg_suffix} -Version: 6.5.1 +Version: 6.5.2 Release: 0 Summary: Qt 6 CoAP client module License: GPL-3.0-or-later ++++++ _service ++++++ --- /var/tmp/diff_new_pack.IX4nv9/_old 2023-07-26 13:22:52.075627075 +0200 +++ /var/tmp/diff_new_pack.IX4nv9/_new 2023-07-26 13:22:52.079627098 +0200 @@ -1,9 +1,9 @@ <services> <service name="tar_scm" mode="disabled"> <param name="changesgenerate">disable</param> - <param name="version">6.5.1</param> + <param name="version">6.5.2</param> <param name="url">git://code.qt.io/qt/qtcoap.git</param> - <param name="revision">v6.5.1</param> + <param name="revision">v6.5.2</param> <param name="scm">git</param> <param name="filename">qtcoap-everywhere-src</param> </service> ++++++ qtcoap-everywhere-src-6.5.1.tar.xz -> qtcoap-everywhere-src-6.5.2.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtcoap-everywhere-src-6.5.1/.cmake.conf new/qtcoap-everywhere-src-6.5.2/.cmake.conf --- old/qtcoap-everywhere-src-6.5.1/.cmake.conf 2023-05-16 08:44:07.000000000 +0200 +++ new/qtcoap-everywhere-src-6.5.2/.cmake.conf 2023-07-07 05:21:00.000000000 +0200 @@ -1,3 +1,3 @@ -set(QT_REPO_MODULE_VERSION "6.5.1") +set(QT_REPO_MODULE_VERSION "6.5.2") 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/qtcoap-everywhere-src-6.5.1/CMakeLists.txt new/qtcoap-everywhere-src-6.5.2/CMakeLists.txt --- old/qtcoap-everywhere-src-6.5.1/CMakeLists.txt 2023-05-16 08:44:07.000000000 +0200 +++ new/qtcoap-everywhere-src-6.5.2/CMakeLists.txt 2023-07-07 05:21:00.000000000 +0200 @@ -13,5 +13,6 @@ find_package(Qt6 ${PROJECT_VERSION} CONFIG REQUIRED COMPONENTS BuildInternals Core Network) find_package(Qt6 ${PROJECT_VERSION} CONFIG OPTIONAL_COMPONENTS Gui Widgets Quick Qml) +qt_internal_project_setup() qt_build_repo() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtcoap-everywhere-src-6.5.1/conanfile.py new/qtcoap-everywhere-src-6.5.2/conanfile.py --- old/qtcoap-everywhere-src-6.5.1/conanfile.py 2023-05-16 08:44:07.000000000 +0200 +++ new/qtcoap-everywhere-src-6.5.2/conanfile.py 1970-01-01 01:00:00.000000000 +0100 @@ -1,34 +0,0 @@ -# Copyright (C) 2021 The Qt Company Ltd. -# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 - -from conans import ConanFile -import re -from pathlib import Path - - -def _parse_qt_version_by_key(key: str) -> str: - with open(Path(__file__).parent.resolve() / ".cmake.conf") as f: - m = re.search(fr'{key} .*"(.*)"', f.read()) - return m.group(1) if m else "" - - -def _get_qt_minor_version() -> str: - return ".".join(_parse_qt_version_by_key("QT_REPO_MODULE_VERSION").split(".")[:2]) - - -class QtCoAP(ConanFile): - name = "qtcoap" - license = "GPL-3.0+, Commercial Qt License Agreement" - author = "The Qt Company <https://www.qt.io/contact-us>" - url = "https://code.qt.io/cgit/qt/qtcoap.git"; - description = ( - "CoAP is a protocol for IoT devices, and machine to machine communication. " - "The full specification can be found in RFC 7252" - ) - topics = "qt", "qt6", "CoAP", "IoT", "M2M" - settings = "os", "compiler", "arch", "build_type" - # for referencing the version number and prerelease tag and dependencies info - exports = ".cmake.conf", "dependencies.yaml" - exports_sources = "*", "!conan*.*" - python_requires = f"qt-conan-common/{_get_qt_minor_version()}@qt/everywhere" - python_requires_extend = "qt-conan-common.QtLeafModule" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtcoap-everywhere-src-6.5.1/dependencies.yaml new/qtcoap-everywhere-src-6.5.2/dependencies.yaml --- old/qtcoap-everywhere-src-6.5.1/dependencies.yaml 2023-05-16 08:44:07.000000000 +0200 +++ new/qtcoap-everywhere-src-6.5.2/dependencies.yaml 2023-07-07 05:21:00.000000000 +0200 @@ -1,4 +1,4 @@ dependencies: ../qtbase: - ref: 55aee8697512af105dfefabc1e2ec41d4df1e45e + ref: af457a9f0f7eb1a2a7d11f495da508faab91a442 required: true diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtcoap-everywhere-src-6.5.1/examples/coap/simplecoapclient/CMakeLists.txt new/qtcoap-everywhere-src-6.5.2/examples/coap/simplecoapclient/CMakeLists.txt --- old/qtcoap-everywhere-src-6.5.1/examples/coap/simplecoapclient/CMakeLists.txt 2023-05-16 08:44:07.000000000 +0200 +++ new/qtcoap-everywhere-src-6.5.2/examples/coap/simplecoapclient/CMakeLists.txt 2023-07-07 05:21:00.000000000 +0200 @@ -4,9 +4,6 @@ cmake_minimum_required(VERSION 3.16) project(simplecoapclient LANGUAGES CXX) -set(CMAKE_AUTOMOC ON) -set(CMAKE_AUTOUIC ON) - if(NOT DEFINED INSTALL_EXAMPLESDIR) set(INSTALL_EXAMPLESDIR "examples") endif() @@ -15,6 +12,8 @@ find_package(Qt6 REQUIRED COMPONENTS Coap Core Gui Network Widgets) +qt_standard_project_setup() + qt_add_executable(simplecoapclient main.cpp mainwindow.cpp mainwindow.h mainwindow.ui @@ -26,16 +25,12 @@ MACOSX_BUNDLE TRUE ) -target_compile_definitions(simplecoapclient PUBLIC - QT_DEPRECATED_WARNINGS -) - -target_link_libraries(simplecoapclient PUBLIC - Qt::Coap - Qt::Core - Qt::Gui - Qt::Network - Qt::Widgets +target_link_libraries(simplecoapclient PRIVATE + Qt6::Coap + Qt6::Core + Qt6::Gui + Qt6::Network + Qt6::Widgets ) install(TARGETS simplecoapclient diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtcoap-everywhere-src-6.5.1/examples/coap/simplecoapclient/mainwindow.cpp new/qtcoap-everywhere-src-6.5.2/examples/coap/simplecoapclient/mainwindow.cpp --- old/qtcoap-everywhere-src-6.5.1/examples/coap/simplecoapclient/mainwindow.cpp 2023-05-16 08:44:07.000000000 +0200 +++ new/qtcoap-everywhere-src-6.5.2/examples/coap/simplecoapclient/mainwindow.cpp 2023-07-07 05:21:00.000000000 +0200 @@ -5,6 +5,7 @@ #include "optiondialog.h" #include "ui_mainwindow.h" +#include <QCoapClient> #include <QCoapResourceDiscoveryReply> #include <QCoapReply> #include <QDateTime> @@ -168,7 +169,7 @@ connect(observeReply, &QCoapReply::notified, this, &MainWindow::onNotified); ui->cancelObserveButton->setEnabled(true); - connect(ui->cancelObserveButton, &QPushButton::clicked, this, [=]() { + connect(ui->cancelObserveButton, &QPushButton::clicked, this, [this, url]() { m_client->cancelObserve(url); ui->cancelObserveButton->setEnabled(false); }); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtcoap-everywhere-src-6.5.1/examples/coap/simplecoapclient/mainwindow.h new/qtcoap-everywhere-src-6.5.2/examples/coap/simplecoapclient/mainwindow.h --- old/qtcoap-everywhere-src-6.5.1/examples/coap/simplecoapclient/mainwindow.h 2023-05-16 08:44:07.000000000 +0200 +++ new/qtcoap-everywhere-src-6.5.2/examples/coap/simplecoapclient/mainwindow.h 2023-07-07 05:21:00.000000000 +0200 @@ -4,7 +4,7 @@ #ifndef MAINWINDOW_H #define MAINWINDOW_H -#include <QCoapClient> +#include <QtCoap/qcoapnamespace.h> #include <QCoapOption> #include <QCoapResource> #include <QMainWindow> @@ -13,7 +13,10 @@ namespace Ui { class MainWindow; } +class QCoapClient; +class QCoapResourceDiscoveryReply; class QCoapMessage; +class QCoapReply; QT_END_NAMESPACE class MainWindow : public QMainWindow diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtcoap-everywhere-src-6.5.1/examples/coap/simplecoapclient/optiondialog.cpp new/qtcoap-everywhere-src-6.5.2/examples/coap/simplecoapclient/optiondialog.cpp --- old/qtcoap-everywhere-src-6.5.1/examples/coap/simplecoapclient/optiondialog.cpp 2023-05-16 08:44:07.000000000 +0200 +++ new/qtcoap-everywhere-src-6.5.2/examples/coap/simplecoapclient/optiondialog.cpp 2023-07-07 05:21:00.000000000 +0200 @@ -9,6 +9,10 @@ ui(new Ui::OptionDialog) { ui->setupUi(this); + connect(ui->tableWidget, &QTableWidget::itemSelectionChanged, this, [this]() { + const auto selection = ui->tableWidget->selectedItems(); + ui->removeButton->setEnabled(!selection.isEmpty()); + }); fillOptions(); @@ -44,6 +48,15 @@ ui->tableWidget->setItem(rowCount, 1, valueItem); } +void OptionDialog::on_removeButton_clicked() +{ + const auto idx = ui->tableWidget->currentRow(); + if (idx >= 0 && idx < ui->tableWidget->rowCount()) { + ui->tableWidget->removeRow(idx); + m_options.removeAt(idx); + } +} + void OptionDialog::on_clearButton_clicked() { m_options.clear(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtcoap-everywhere-src-6.5.1/examples/coap/simplecoapclient/optiondialog.h new/qtcoap-everywhere-src-6.5.2/examples/coap/simplecoapclient/optiondialog.h --- old/qtcoap-everywhere-src-6.5.1/examples/coap/simplecoapclient/optiondialog.h 2023-05-16 08:44:07.000000000 +0200 +++ new/qtcoap-everywhere-src-6.5.2/examples/coap/simplecoapclient/optiondialog.h 2023-07-07 05:21:00.000000000 +0200 @@ -26,6 +26,7 @@ private slots: void on_addButton_clicked(); void on_clearButton_clicked(); + void on_removeButton_clicked(); private: void fillOptions(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtcoap-everywhere-src-6.5.1/examples/coap/simplecoapclient/optiondialog.ui new/qtcoap-everywhere-src-6.5.2/examples/coap/simplecoapclient/optiondialog.ui --- old/qtcoap-everywhere-src-6.5.1/examples/coap/simplecoapclient/optiondialog.ui 2023-05-16 08:44:07.000000000 +0200 +++ new/qtcoap-everywhere-src-6.5.2/examples/coap/simplecoapclient/optiondialog.ui 2023-07-07 05:21:00.000000000 +0200 @@ -50,6 +50,12 @@ </item> <item> <widget class="QTableWidget" name="tableWidget"> + <property name="selectionMode"> + <enum>QAbstractItemView::SingleSelection</enum> + </property> + <property name="selectionBehavior"> + <enum>QAbstractItemView::SelectRows</enum> + </property> <property name="columnCount"> <number>2</number> </property> @@ -90,6 +96,16 @@ </property> </widget> </item> + <item> + <widget class="QPushButton" name="removeButton"> + <property name="enabled"> + <bool>false</bool> + </property> + <property name="text"> + <string>Remove</string> + </property> + </widget> + </item> <item> <widget class="QPushButton" name="clearButton"> <property name="text"> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtcoap-everywhere-src-6.5.1/examples/coap/simplecoapclient/simplecoapclient.pro new/qtcoap-everywhere-src-6.5.2/examples/coap/simplecoapclient/simplecoapclient.pro --- old/qtcoap-everywhere-src-6.5.1/examples/coap/simplecoapclient/simplecoapclient.pro 2023-05-16 08:44:07.000000000 +0200 +++ new/qtcoap-everywhere-src-6.5.2/examples/coap/simplecoapclient/simplecoapclient.pro 2023-07-07 05:21:00.000000000 +0200 @@ -3,19 +3,6 @@ TARGET = simplecoapclient TEMPLATE = app -# The following define makes your compiler emit warnings if you use -# any feature of Qt which has been marked as deprecated (the exact warnings -# depend on your compiler). Please consult the documentation of the -# deprecated API in order to know how to port your code away from it. -DEFINES += QT_DEPRECATED_WARNINGS - -# You can also make your code fail to compile if you use deprecated APIs. -# In order to do so, uncomment the following line. -# You can also select to disable deprecated APIs only up to a certain version of Qt. -#DEFINES += QT_DISABLE_DEPRECATED_UP_TO=0x060000 # disables all APIs deprecated in Qt 6.0.0 and earlier - -CONFIG += c++11 - SOURCES += \ main.cpp \ mainwindow.cpp \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtcoap-everywhere-src-6.5.1/src/coap/qcoapmessage.cpp new/qtcoap-everywhere-src-6.5.2/src/coap/qcoapmessage.cpp --- old/qtcoap-everywhere-src-6.5.1/src/coap/qcoapmessage.cpp 2023-05-16 08:44:07.000000000 +0200 +++ new/qtcoap-everywhere-src-6.5.2/src/coap/qcoapmessage.cpp 2023-07-07 05:21:00.000000000 +0200 @@ -22,6 +22,11 @@ { } +QCoapMessagePrivate *QCoapMessagePrivate::clone() const +{ + return new QCoapMessagePrivate(*this); +} + /*! \class QCoapMessage \inmodule QtCoap diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtcoap-everywhere-src-6.5.1/src/coap/qcoapmessage_p.h new/qtcoap-everywhere-src-6.5.2/src/coap/qcoapmessage_p.h --- old/qtcoap-everywhere-src-6.5.1/src/coap/qcoapmessage_p.h 2023-05-16 08:44:07.000000000 +0200 +++ new/qtcoap-everywhere-src-6.5.2/src/coap/qcoapmessage_p.h 2023-07-07 05:21:00.000000000 +0200 @@ -26,8 +26,9 @@ { public: QCoapMessagePrivate(QCoapMessage::Type type = QCoapMessage::Type::NonConfirmable); - QCoapMessagePrivate(const QCoapMessagePrivate &other); - ~QCoapMessagePrivate(); + virtual ~QCoapMessagePrivate(); + + virtual QCoapMessagePrivate *clone() const; QList<QCoapOption>::const_iterator findOption(QCoapOption::OptionName name) const; @@ -37,8 +38,19 @@ QByteArray token; QList<QCoapOption> options; QByteArray payload; + +protected: + QCoapMessagePrivate(const QCoapMessagePrivate &other); }; +// don't use the copy constructor when detaching from a QSharedDataPointer, +// use virtual clone() call instead. +template <> +Q_INLINE_TEMPLATE QCoapMessagePrivate *QSharedDataPointer<QCoapMessagePrivate>::clone() +{ + return d->clone(); +} + QT_END_NAMESPACE #endif // QCOAPMESSAGE_P_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtcoap-everywhere-src-6.5.1/src/coap/qcoaprequest.cpp new/qtcoap-everywhere-src-6.5.2/src/coap/qcoaprequest.cpp --- old/qtcoap-everywhere-src-6.5.1/src/coap/qcoaprequest.cpp 2023-05-16 08:44:07.000000000 +0200 +++ new/qtcoap-everywhere-src-6.5.2/src/coap/qcoaprequest.cpp 2023-07-07 05:21:00.000000000 +0200 @@ -30,6 +30,11 @@ { } +QCoapRequestPrivate *QCoapRequestPrivate::clone() const +{ + return new QCoapRequestPrivate(*this); +} + /*! \internal @@ -107,7 +112,7 @@ QCoapRequest::QCoapRequest(const QCoapRequest &other) : //! No private data sharing, as QCoapRequestPrivate!=QCoapMessagePrivate //! and the d_ptr is a QSharedDataPointer<QCoapMessagePrivate> - QCoapMessage(*new QCoapRequestPrivate(*other.d_func())) + QCoapMessage(*other.d_func()->clone()) { } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtcoap-everywhere-src-6.5.1/src/coap/qcoaprequest_p.h new/qtcoap-everywhere-src-6.5.2/src/coap/qcoaprequest_p.h --- old/qtcoap-everywhere-src-6.5.1/src/coap/qcoaprequest_p.h 2023-05-16 08:44:07.000000000 +0200 +++ new/qtcoap-everywhere-src-6.5.2/src/coap/qcoaprequest_p.h 2023-07-07 05:21:00.000000000 +0200 @@ -28,9 +28,10 @@ QCoapRequestPrivate(const QUrl &url = QUrl(), QCoapMessage::Type type = QCoapMessage::Type::NonConfirmable, const QUrl &proxyUrl = QUrl()); - QCoapRequestPrivate(const QCoapRequestPrivate &other) = default; ~QCoapRequestPrivate(); + QCoapRequestPrivate *clone() const override; + void setUrl(const QUrl &url); void adjustUrl(bool secure); @@ -42,6 +43,9 @@ QUrl uri; QUrl proxyUri; QtCoap::Method method = QtCoap::Method::Invalid; + +protected: + QCoapRequestPrivate(const QCoapRequestPrivate &other) = default; }; QT_END_NAMESPACE
