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 2021-05-10 15:38:30 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/qt6-mqtt (Old) and /work/SRC/openSUSE:Factory/.qt6-mqtt.new.2988 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qt6-mqtt" Mon May 10 15:38:30 2021 rev:4 rq:891706 version:6.1.0 Changes: -------- --- /work/SRC/openSUSE:Factory/qt6-mqtt/qt6-mqtt.changes 2021-04-06 17:32:07.883283226 +0200 +++ /work/SRC/openSUSE:Factory/.qt6-mqtt.new.2988/qt6-mqtt.changes 2021-05-10 15:40:57.913183797 +0200 @@ -1,0 +2,16 @@ +Thu May 6 17:10:25 UTC 2021 - Christophe Giboudeaux <christo...@krop.fr> + +- Update to 6.1.0: + * https://www.qt.io/blog/qt-6.1-released + +------------------------------------------------------------------- +Fri Apr 23 14:24:40 UTC 2021 - Christophe Giboudeaux <christo...@krop.fr> + +- Update to 6.1.0-rc. + +------------------------------------------------------------------- +Tue Apr 13 06:36:40 UTC 2021 - Christophe Giboudeaux <christo...@krop.fr> + +- Update to 6.1.0-beta3. + +------------------------------------------------------------------- @@ -5,0 +22,12 @@ + +------------------------------------------------------------------- +Fri Mar 19 15:53:33 UTC 2021 - Christophe Giboudeaux <christo...@krop.fr> + +- Update to 6.1.0-beta2 + +------------------------------------------------------------------- +Fri Mar 5 17:24:02 UTC 2021 - Christophe Giboudeaux <christo...@krop.fr> + +- Update to 6.1.0-beta1 + https://www.qt.io/blog/qt-6.1-beta-released + Old: ---- qtmqtt-6.0.3.tar.xz New: ---- qtmqtt-6.1.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qt6-mqtt.spec ++++++ --- /var/tmp/diff_new_pack.KR96Lb/_old 2021-05-10 15:40:58.365182017 +0200 +++ /var/tmp/diff_new_pack.KR96Lb/_new 2021-05-10 15:40:58.365182017 +0200 @@ -16,8 +16,8 @@ # -%define real_version 6.0.3 -%define short_version 6.0 +%define real_version 6.1.0 +%define short_version 6.1 %define tar_name qtmqtt %define tar_suffix %{nil} # @@ -27,7 +27,7 @@ %endif # Name: qt6-mqtt%{?pkg_suffix} -Version: 6.0.3 +Version: 6.1.0 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.KR96Lb/_old 2021-05-10 15:40:58.401181875 +0200 +++ /var/tmp/diff_new_pack.KR96Lb/_new 2021-05-10 15:40:58.401181875 +0200 @@ -1,9 +1,9 @@ <services> <service name="tar_scm" mode="disabled"> <param name="changesgenerate">disable</param> - <param name="version">6.0.3</param> + <param name="version">6.1.0</param> <param name="url">git://code.qt.io/qt/qtmqtt.git</param> - <param name="revision">v6.0.3</param> + <param name="revision">v6.1.0</param> <param name="scm">git</param> <param name="filename">qtmqtt</param> </service> @@ -11,5 +11,4 @@ <param name="file">*.tar</param> <param name="compression">xz</param> </service> - <service name="set_version" mode="disabled" /> </services> ++++++ qtmqtt-6.0.3.tar.xz -> qtmqtt-6.1.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmqtt-6.0.3/.cmake.conf new/qtmqtt-6.1.0/.cmake.conf --- old/qtmqtt-6.0.3/.cmake.conf 2021-03-26 06:53:44.000000000 +0100 +++ new/qtmqtt-6.1.0/.cmake.conf 2021-05-04 06:24:04.000000000 +0200 @@ -1 +1 @@ -set(QT_REPO_MODULE_VERSION "6.0.3") +set(QT_REPO_MODULE_VERSION "6.1.0") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmqtt-6.0.3/.qmake.conf new/qtmqtt-6.1.0/.qmake.conf --- old/qtmqtt-6.0.3/.qmake.conf 2021-03-26 06:53:44.000000000 +0100 +++ new/qtmqtt-6.1.0/.qmake.conf 2021-05-04 06:24:04.000000000 +0200 @@ -3,4 +3,4 @@ DEFINES += QT_NO_FOREACH QT_NO_JAVA_STYLE_ITERATORS -MODULE_VERSION = 6.0.3 +MODULE_VERSION = 6.1.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmqtt-6.0.3/coin/module_config.yaml new/qtmqtt-6.1.0/coin/module_config.yaml --- old/qtmqtt-6.0.3/coin/module_config.yaml 2021-03-26 06:53:44.000000000 +0100 +++ new/qtmqtt-6.1.0/coin/module_config.yaml 2021-05-04 06:24:04.000000000 +0200 @@ -6,9 +6,6 @@ instructions: Build: - - type: EnvironmentVariable - variableName: BUILD_DOCUMENTATION - variableValue: "1" - !include "{{qt/qtbase}}/coin_module_build_template_v2.yaml" Test: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmqtt-6.0.3/conanfile.py new/qtmqtt-6.1.0/conanfile.py --- old/qtmqtt-6.0.3/conanfile.py 2021-03-26 06:53:44.000000000 +0100 +++ new/qtmqtt-6.1.0/conanfile.py 2021-05-04 06:24:04.000000000 +0200 @@ -28,6 +28,7 @@ from conans import ConanFile, tools, CMake import os +from pathlib import Path class QtConanError(Exception): @@ -36,29 +37,31 @@ class QtMQTT(ConanFile): name = "qtmqtt" - version = "6.0.3" + version = "6.1.0" 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/qtmqtt.git"; description = "Qt MQTT is a machine-to-machine (M2M) protocol utilizing the publish-and-subscribe paradigm." topics = ("qt", "qt6", "MQTT", "M2M") settings = "os", "compiler", "build_type", "arch" - options = {"shared": [True, False], + options = {"shared": [True, False, "default"], "qt6": "ANY"} # this is needed to model unique package_id for the Add-on build per used Qt6 version - default_options = {"shared": False, + default_options = {"shared": "default", # default: Use the value of the Qt build "qt6": None} exports_sources = "*", "!conan*.*" + # use commit ID as the RREV (recipe revision) if this is exported from .git repository + revision_mode = "scm" if Path(Path(__file__).parent.resolve() / ".git").exists() else "hash" 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 + # 'QTDIR' 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") + cmake_prefix_path = os.environ.get("QTDIR") if not cmake_prefix_path: - raise QtConanError("'QT_PATH' not defined! The 'QT_PATH' needs to point to Qt installation directory.") + raise QtConanError("'QTDIR' not defined! The 'QTDIR' 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 @@ -73,7 +76,7 @@ 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}") + raise QtConanError(f"Unable to locate {qtcmake} from 'QTDIR': {qt_install_path}") return qtcmake def _get_cmake_tool(self): @@ -87,6 +90,10 @@ install_dir = os.path.join(os.getcwd(), "_install_tmp") cmake.definitions["CMAKE_INSTALL_PREFIX"] = install_dir + # Use the value of the Qt build + if self.options.shared.value == "default": + del cmake.definitions["BUILD_SHARED_LIBS"] + cmake_toolchain_file = os.environ.get("CMAKE_TOOLCHAIN_FILE") if cmake_toolchain_file: cmake.definitions["CMAKE_TOOLCHAIN_FILE"] = cmake_toolchain_file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmqtt-6.0.3/dependencies.yaml new/qtmqtt-6.1.0/dependencies.yaml --- old/qtmqtt-6.0.3/dependencies.yaml 2021-03-26 06:53:44.000000000 +0100 +++ new/qtmqtt-6.1.0/dependencies.yaml 2021-05-04 06:24:04.000000000 +0200 @@ -1,10 +1,10 @@ dependencies: ../qtbase: - ref: 0ff1dc7110d373c85ce41e90073291b5e2eb16ad + ref: b2ebc64dd9914359fe8acf2bc9960e341e98cf80 required: true ../qtdeclarative: - ref: 373897b4bbbafc890e631ec19125d09efbc4c8c9 - required: false + ref: 2423608d6c0fa55595db3fe0138b0be94307596b + required: true ../qttools: - ref: 792adc3dd0f59a56273189f290c3edc327e140b7 + ref: c973cf4f088f9d97a10f03ad60a5a39395edd188 required: true diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmqtt-6.0.3/src/mqtt/qmqttclient.cpp new/qtmqtt-6.1.0/src/mqtt/qmqttclient.cpp --- old/qtmqtt-6.0.3/src/mqtt/qmqttclient.cpp 2021-03-26 06:53:44.000000000 +0100 +++ new/qtmqtt-6.1.0/src/mqtt/qmqttclient.cpp 2021-05-04 06:24:04.000000000 +0200 @@ -1063,10 +1063,9 @@ { Q_Q(QMqttClient); - if (s != m_state) - q->setState(s); - if (e != QMqttClient::NoError && m_error != e) + if (e != QMqttClient::NoError) q->setError(e); + q->setState(s); } void QMqttClientPrivate::setClientId(const QString &id)
