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 2021-03-17 20:14:20 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/qt6-coap (Old) and /work/SRC/openSUSE:Factory/.qt6-coap.new.2401 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qt6-coap" Wed Mar 17 20:14:20 2021 rev:2 rq:877996 version:6.0.2 Changes: -------- --- /work/SRC/openSUSE:Factory/qt6-coap/qt6-coap.changes 2020-12-18 19:58:41.202017480 +0100 +++ /work/SRC/openSUSE:Factory/.qt6-coap.new.2401/qt6-coap.changes 2021-03-17 20:17:41.815132336 +0100 @@ -1,0 +2,12 @@ +Fri Mar 5 09:31:19 UTC 2021 - Christophe Giboudeaux <christo...@krop.fr> + +- Update to 6.0.2: + https://www.qt.io/blog/qt-6.0.2-released + +------------------------------------------------------------------- +Thu Feb 4 07:48:13 UTC 2021 - Christophe Giboudeaux <christo...@krop.fr> + +- Update to 6.0.1 + https://code.qt.io/cgit/qt/qtreleasenotes.git/tree/qt/6.0.1/release-note.txt + +------------------------------------------------------------------- Old: ---- qtcoap-6.0.0.tar.xz New: ---- qtcoap-6.0.2.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qt6-coap.spec ++++++ --- /var/tmp/diff_new_pack.DartVL/_old 2021-03-17 20:17:42.487133254 +0100 +++ /var/tmp/diff_new_pack.DartVL/_new 2021-03-17 20:17:42.491133260 +0100 @@ -1,7 +1,7 @@ # # spec file for package qt6-coap # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,7 +16,7 @@ # -%define real_version 6.0.0 +%define real_version 6.0.2 %define short_version 6.0 %define tar_name qtcoap %define tar_suffix %{nil} @@ -27,9 +27,9 @@ %endif # Name: qt6-coap%{?pkg_suffix} -Version: 6.0.0 +Version: 6.0.2 Release: 0 -Summary: Qt 6 CoAP Library +Summary: Qt 6 CoAP client module License: GPL-3.0-or-later URL: https://www.qt.io Source: %{tar_name}-%{real_version}%{tar_suffix}.tar.xz ++++++ _service ++++++ --- /var/tmp/diff_new_pack.DartVL/_old 2021-03-17 20:17:42.563133358 +0100 +++ /var/tmp/diff_new_pack.DartVL/_new 2021-03-17 20:17:42.567133364 +0100 @@ -1,9 +1,9 @@ <services> <service name="tar_scm" mode="disabled"> <param name="changesgenerate">disable</param> - <param name="version">6.0.0</param> + <param name="version">6.0.2</param> <param name="url">git://code.qt.io/qt/qtcoap.git</param> - <param name="revision">v6.0.0</param> + <param name="revision">v6.0.2</param> <param name="scm">git</param> <param name="filename">qtcoap</param> </service> ++++++ qtcoap-6.0.0.tar.xz -> qtcoap-6.0.2.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtcoap-6.0.0/.cmake.conf new/qtcoap-6.0.2/.cmake.conf --- old/qtcoap-6.0.0/.cmake.conf 2020-11-24 21:02:22.000000000 +0100 +++ new/qtcoap-6.0.2/.cmake.conf 2021-02-25 07:09:08.000000000 +0100 @@ -1 +1 @@ -set(QT_REPO_MODULE_VERSION "6.0.0") +set(QT_REPO_MODULE_VERSION "6.0.2") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtcoap-6.0.0/.qmake.conf new/qtcoap-6.0.2/.qmake.conf --- old/qtcoap-6.0.0/.qmake.conf 2020-11-24 21:02:22.000000000 +0100 +++ new/qtcoap-6.0.2/.qmake.conf 2021-02-25 07:09:08.000000000 +0100 @@ -2,4 +2,4 @@ DEFINES += QT_NO_FOREACH QT_NO_JAVA_STYLE_ITERATORS -MODULE_VERSION = 6.0.0 +MODULE_VERSION = 6.0.2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtcoap-6.0.0/conanfile.py new/qtcoap-6.0.2/conanfile.py --- old/qtcoap-6.0.0/conanfile.py 1970-01-01 01:00:00.000000000 +0100 +++ new/qtcoap-6.0.2/conanfile.py 2021-02-25 07:09:08.000000000 +0100 @@ -0,0 +1,130 @@ +############################################################################# +## +## Copyright (C) 2021 The Qt Company Ltd. +## Contact: https://www.qt.io/licensing/ +## +## This file is part of the release tools of the Qt Toolkit. +## +## $QT_BEGIN_LICENSE:GPL-EXCEPT$ +## Commercial License Usage +## Licensees holding valid commercial Qt licenses may use this file in +## accordance with the commercial license agreement provided with the +## Software or, alternatively, in accordance with the terms contained in +## a written agreement between you and The Qt Company. For licensing terms +## and conditions see https://www.qt.io/terms-conditions. For further +## information use the contact form at https://www.qt.io/contact-us. +## +## GNU General Public License Usage +## Alternatively, this file may be used under the terms of the GNU +## General Public License version 3 as published by the Free Software +## Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT +## included in the packaging of this file. Please review the following +## information to ensure the GNU General Public License requirements will +## be met: https://www.gnu.org/licenses/gpl-3.0.html. +## +## $QT_END_LICENSE$ +## +############################################################################# + +from conans import ConanFile, tools, CMake +import os + + +class QtConanError(Exception): + pass + + +class QtCoAP(ConanFile): + name = "qtcoap" + version = "6.0.2" + 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", "build_type", "arch" + options = {"shared": [True, False], + "qt6": "ANY"} # this is needed to model unique package_id for the Add-on build per used Qt6 version + default_options = {"shared": False, + "qt6": None} + exports_sources = "*", "!conan*.*" + + def source(self): + # sources are installed next to recipe, no need to clone etc. sources here + pass + + def _get_cmake_prefix_path(self): + # 'QT_PATH' provided as env variable in profile file which is part of the Qt essential binary + # package(s). Installed under .conan/profiles + cmake_prefix_path = os.environ.get("QT_PATH") + if not cmake_prefix_path: + raise QtConanError("'QT_PATH' not defined! The 'QT_PATH' needs to point to Qt installation directory.") + print(f"CMAKE_PREFIX_PATH for '{self.name}/{self.version}' build is: {cmake_prefix_path}") + return cmake_prefix_path + + def _read_env(self, key): + value = os.environ.get(key) + if not value: + raise QtConanError(f"{self.settings.os} build specified but '{key}' was not defined?") + return value + + def _get_qtcmake(self): + qt_install_path = self._get_cmake_prefix_path() + ext = ".bat" if tools.os_info.is_windows else "" + qtcmake = os.path.abspath(os.path.join(qt_install_path, "bin", "qt-cmake" + ext)) + if not os.path.exists(qtcmake): + raise QtConanError(f"Unable to locate {qtcmake} from 'QT_PATH': {qt_install_path}") + return qtcmake + + def _get_cmake_tool(self): + cmake = CMake(self, cmake_program=self._get_qtcmake()) + cmake.verbose = True + + # Qt modules need to be 'installed'. + # We need to direct the 'make install' to some directory under Conan cache, + # place it under the current build directory which is also under the Conan cache. + # Note, the actual 'make install' is called in "package()". + install_dir = os.path.join(os.getcwd(), "_install_tmp") + cmake.definitions["CMAKE_INSTALL_PREFIX"] = install_dir + + cmake_toolchain_file = os.environ.get("CMAKE_TOOLCHAIN_FILE") + if cmake_toolchain_file: + cmake.definitions["CMAKE_TOOLCHAIN_FILE"] = cmake_toolchain_file + + if self.settings.os == "Android": + cmake.definitions["ANDROID_SDK_ROOT"] = self._read_env('ANDROID_SDK_ROOT') + cmake.definitions["ANDROID_NDK_ROOT"] = self._read_env('ANDROID_NDK_ROOT') + + if self.settings.os == "iOS": + # Instead of Conan's auto-added 'Darwin', explicitly pass 'iOS'. + cmake.definitions["CMAKE_SYSTEM_NAME"] = "iOS" + + # Remove the explicit sysroot, let CMake detect the sysroots, to ensure + # that multi-arch builds work. + del cmake.definitions["CMAKE_OSX_SYSROOT"] + + # Remove the conan provided architecture, instead rely on the architectures set + # by the Qt toolchain file, which with official Qt packages most likely means + # multi-arch iOS. + del cmake.definitions["CMAKE_OSX_ARCHITECTURES"] + + return cmake + + def build(self): + cmake = self._get_cmake_tool() + self.run('%s "%s" %s' % (self._get_qtcmake(), self.source_folder, cmake.command_line)) + self.run('cmake --build . %s' % cmake.build_config) + + def package(self): + install_dir = os.path.join(os.getcwd(), "_install_tmp") # see 'CMAKE_INSTALL_PREFIX' above + self.run('cmake --build . --target install') + self.copy("*", src=install_dir, dst=".") + + def package_info(self): + self.cpp_info.libs = ["Qt6Coap"] # used for the actual library filename, Ordered list with the library names + + def deploy(self): + self.copy("*") # copy from current package + self.copy_deps("*") # copy from dependencies + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtcoap-6.0.0/dependencies.yaml new/qtcoap-6.0.2/dependencies.yaml --- old/qtcoap-6.0.0/dependencies.yaml 2020-11-24 21:02:22.000000000 +0100 +++ new/qtcoap-6.0.2/dependencies.yaml 2021-02-25 07:09:08.000000000 +0100 @@ -1,11 +1,7 @@ dependencies: ../qtbase: -<<<<<<< HEAD - ref: 1ff25785ff93d0bd3d597e3a65a261bdbfa13c3b -======= - ref: fc9cda5f08ac848e88f63dd4a07c08b2fbc6bf17 + ref: 723077eb3529810aa3b99d8c06f9b81a586763c9 required: true ../qttools: - ref: 3fd594493c3ba31639a7515b901554456a90b4c7 ->>>>>>> v6.0.0 + ref: e9c0625d07ed4d476cd8fdba4cfb4d2509f46317 required: true diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtcoap-6.0.0/src/coap/qcoapoption.cpp new/qtcoap-6.0.2/src/coap/qcoapoption.cpp --- old/qtcoap-6.0.0/src/coap/qcoapoption.cpp 2020-11-24 21:02:22.000000000 +0100 +++ new/qtcoap-6.0.2/src/coap/qcoapoption.cpp 2021-02-25 07:09:08.000000000 +0100 @@ -164,8 +164,8 @@ */ QCoapOption &QCoapOption::operator=(const QCoapOption &other) { - d_ptr->name = other.d_ptr->name; - d_ptr->value = other.d_ptr->value; + QCoapOption copy(other); + swap(copy); return *this; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtcoap-6.0.0/tests/auto/qcoapoption/tst_qcoapoption.cpp new/qtcoap-6.0.2/tests/auto/qcoapoption/tst_qcoapoption.cpp --- old/qtcoap-6.0.0/tests/auto/qcoapoption/tst_qcoapoption.cpp 2020-11-24 21:02:22.000000000 +0100 +++ new/qtcoap-6.0.2/tests/auto/qcoapoption/tst_qcoapoption.cpp 2021-02-25 07:09:08.000000000 +0100 @@ -37,12 +37,51 @@ Q_OBJECT private Q_SLOTS: + void constructAndAssign(); void constructWithQByteArray(); void constructWithQString(); void constructWithInteger(); void constructWithUtf8Characters(); }; +void tst_QCoapOption::constructAndAssign() +{ + QCoapOption option1; + QCOMPARE(option1.name(), QCoapOption::Invalid); + QCOMPARE(option1.uintValue(), 0); + QVERIFY(option1.stringValue().isEmpty()); + QVERIFY(option1.opaqueValue().isEmpty()); + + QCoapOption option2(QCoapOption::Size1, 1); + QCOMPARE(option2.name(), QCoapOption::Size1); + QCOMPARE(option2.uintValue(), 1); + + // Copy-construction + QCoapOption option3(option2); + QCOMPARE(option3.name(), QCoapOption::Size1); + QCOMPARE(option3.uintValue(), 1); + + // Move-construction + QCoapOption option4(std::move(option2)); + QCOMPARE(option4.name(), QCoapOption::Size1); + QCOMPARE(option4.uintValue(), 1); + + // Copy-assignment + option4 = option1; + QCOMPARE(option4.name(), QCoapOption::Invalid); + QCOMPARE(option4.uintValue(), 0); + + // Move-assignment + option4 = std::move(option3); + QCOMPARE(option4.name(), QCoapOption::Size1); + QCOMPARE(option4.uintValue(), 1); + + // Assign to a moved-from + option2 = option4; + QCOMPARE(option2.name(), QCoapOption::Size1); + QCOMPARE(option2.uintValue(), 1); +} + void tst_QCoapOption::constructWithQByteArray() { QByteArray ba = "some data";
