Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package qt6-serialport for openSUSE:Factory checked in at 2022-06-20 15:37:41 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/qt6-serialport (Old) and /work/SRC/openSUSE:Factory/.qt6-serialport.new.1548 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qt6-serialport" Mon Jun 20 15:37:41 2022 rev:7 rq:983751 version:6.3.1 Changes: -------- --- /work/SRC/openSUSE:Factory/qt6-serialport/qt6-serialport.changes 2022-04-20 16:56:19.002566256 +0200 +++ /work/SRC/openSUSE:Factory/.qt6-serialport.new.1548/qt6-serialport.changes 2022-06-20 15:38:09.918937579 +0200 @@ -1,0 +2,6 @@ +Fri Jun 17 15:15:34 UTC 2022 - Christophe Giboudeaux <christo...@krop.fr> + +- Update to 6.3.1: + * https://www.qt.io/blog/qt-6.3.1-released + +------------------------------------------------------------------- Old: ---- qtserialport-everywhere-src-6.3.0.tar.xz New: ---- qtserialport-everywhere-src-6.3.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qt6-serialport.spec ++++++ --- /var/tmp/diff_new_pack.uV8W8U/_old 2022-06-20 15:38:10.494938421 +0200 +++ /var/tmp/diff_new_pack.uV8W8U/_new 2022-06-20 15:38:10.498938427 +0200 @@ -16,7 +16,7 @@ # -%define real_version 6.3.0 +%define real_version 6.3.1 %define short_version 6.3 %define tar_name qtserialport-everywhere-src %define tar_suffix %{nil} @@ -27,7 +27,7 @@ %endif # Name: qt6-serialport%{?pkg_suffix} -Version: 6.3.0 +Version: 6.3.1 Release: 0 Summary: Qt 6 SerialPort library License: LGPL-3.0-only OR (GPL-2.0-only OR GPL-3.0-or-later) @@ -111,6 +111,7 @@ %{_qt6_libdir}/libQt6SerialPort.so %{_qt6_metatypesdir}/qt6serialport_*_metatypes.json %{_qt6_mkspecsdir}/modules/qt_lib_serialport.pri +%{_qt6_pkgconfigdir}/Qt6SerialPort.pc %exclude %{_qt6_includedir}/QtSerialPort/%{real_version}/ %files private-devel ++++++ qtserialport-everywhere-src-6.3.0.tar.xz -> qtserialport-everywhere-src-6.3.1.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtserialport-everywhere-src-6.3.0/.cmake.conf new/qtserialport-everywhere-src-6.3.1/.cmake.conf --- old/qtserialport-everywhere-src-6.3.0/.cmake.conf 2022-04-05 16:01:25.000000000 +0200 +++ new/qtserialport-everywhere-src-6.3.1/.cmake.conf 2022-06-06 03:06:51.000000000 +0200 @@ -1,2 +1,2 @@ -set(QT_REPO_MODULE_VERSION "6.3.0") -set(QT_REPO_MODULE_PRERELEASE_VERSION_SEGMENT "alpha1") +set(QT_REPO_MODULE_VERSION "6.3.1") +set(QT_REPO_MODULE_PRERELEASE_VERSION_SEGMENT "") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtserialport-everywhere-src-6.3.0/.tag new/qtserialport-everywhere-src-6.3.1/.tag --- old/qtserialport-everywhere-src-6.3.0/.tag 2022-04-05 16:01:25.000000000 +0200 +++ new/qtserialport-everywhere-src-6.3.1/.tag 2022-06-06 03:06:51.000000000 +0200 @@ -1 +1 @@ -da602a3e43d7c5dae6c62e597284de9eba0f430e +51e896081c70c40bf2a02a8f4953e9b27b984bff diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtserialport-everywhere-src-6.3.0/dependencies.yaml new/qtserialport-everywhere-src-6.3.1/dependencies.yaml --- old/qtserialport-everywhere-src-6.3.0/dependencies.yaml 2022-04-05 16:01:25.000000000 +0200 +++ new/qtserialport-everywhere-src-6.3.1/dependencies.yaml 2022-06-06 03:06:51.000000000 +0200 @@ -1,4 +1,4 @@ dependencies: ../qtbase: - ref: 9554d315aa74eaba1726405ee09117e2ebc6111f + ref: 8483dcde90f40cdfd0a0ec4245b03610b46b6cae required: true diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtserialport-everywhere-src-6.3.0/include/QtSerialPort/6.3.0/QtSerialPort/private/qserialport_p.h new/qtserialport-everywhere-src-6.3.1/include/QtSerialPort/6.3.0/QtSerialPort/private/qserialport_p.h --- old/qtserialport-everywhere-src-6.3.0/include/QtSerialPort/6.3.0/QtSerialPort/private/qserialport_p.h 2022-04-05 16:01:25.000000000 +0200 +++ new/qtserialport-everywhere-src-6.3.1/include/QtSerialPort/6.3.0/QtSerialPort/private/qserialport_p.h 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -#include "../../../../../src/serialport/qserialport_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtserialport-everywhere-src-6.3.0/include/QtSerialPort/6.3.0/QtSerialPort/private/qserialportinfo_p.h new/qtserialport-everywhere-src-6.3.1/include/QtSerialPort/6.3.0/QtSerialPort/private/qserialportinfo_p.h --- old/qtserialport-everywhere-src-6.3.0/include/QtSerialPort/6.3.0/QtSerialPort/private/qserialportinfo_p.h 2022-04-05 16:01:25.000000000 +0200 +++ new/qtserialport-everywhere-src-6.3.1/include/QtSerialPort/6.3.0/QtSerialPort/private/qserialportinfo_p.h 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -#include "../../../../../src/serialport/qserialportinfo_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtserialport-everywhere-src-6.3.0/include/QtSerialPort/6.3.0/QtSerialPort/private/qtudev_p.h new/qtserialport-everywhere-src-6.3.1/include/QtSerialPort/6.3.0/QtSerialPort/private/qtudev_p.h --- old/qtserialport-everywhere-src-6.3.0/include/QtSerialPort/6.3.0/QtSerialPort/private/qtudev_p.h 2022-04-05 16:01:25.000000000 +0200 +++ new/qtserialport-everywhere-src-6.3.1/include/QtSerialPort/6.3.0/QtSerialPort/private/qtudev_p.h 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -#include "../../../../../src/serialport/qtudev_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtserialport-everywhere-src-6.3.0/include/QtSerialPort/6.3.0/QtSerialPort/private/qwinoverlappedionotifier_p.h new/qtserialport-everywhere-src-6.3.1/include/QtSerialPort/6.3.0/QtSerialPort/private/qwinoverlappedionotifier_p.h --- old/qtserialport-everywhere-src-6.3.0/include/QtSerialPort/6.3.0/QtSerialPort/private/qwinoverlappedionotifier_p.h 2022-04-05 16:01:25.000000000 +0200 +++ new/qtserialport-everywhere-src-6.3.1/include/QtSerialPort/6.3.0/QtSerialPort/private/qwinoverlappedionotifier_p.h 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -#include "../../../../../src/serialport/qwinoverlappedionotifier_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtserialport-everywhere-src-6.3.0/include/QtSerialPort/6.3.1/QtSerialPort/private/qserialport_p.h new/qtserialport-everywhere-src-6.3.1/include/QtSerialPort/6.3.1/QtSerialPort/private/qserialport_p.h --- old/qtserialport-everywhere-src-6.3.0/include/QtSerialPort/6.3.1/QtSerialPort/private/qserialport_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtserialport-everywhere-src-6.3.1/include/QtSerialPort/6.3.1/QtSerialPort/private/qserialport_p.h 2022-06-06 03:06:51.000000000 +0200 @@ -0,0 +1 @@ +#include "../../../../../src/serialport/qserialport_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtserialport-everywhere-src-6.3.0/include/QtSerialPort/6.3.1/QtSerialPort/private/qserialportinfo_p.h new/qtserialport-everywhere-src-6.3.1/include/QtSerialPort/6.3.1/QtSerialPort/private/qserialportinfo_p.h --- old/qtserialport-everywhere-src-6.3.0/include/QtSerialPort/6.3.1/QtSerialPort/private/qserialportinfo_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtserialport-everywhere-src-6.3.1/include/QtSerialPort/6.3.1/QtSerialPort/private/qserialportinfo_p.h 2022-06-06 03:06:51.000000000 +0200 @@ -0,0 +1 @@ +#include "../../../../../src/serialport/qserialportinfo_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtserialport-everywhere-src-6.3.0/include/QtSerialPort/6.3.1/QtSerialPort/private/qtudev_p.h new/qtserialport-everywhere-src-6.3.1/include/QtSerialPort/6.3.1/QtSerialPort/private/qtudev_p.h --- old/qtserialport-everywhere-src-6.3.0/include/QtSerialPort/6.3.1/QtSerialPort/private/qtudev_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtserialport-everywhere-src-6.3.1/include/QtSerialPort/6.3.1/QtSerialPort/private/qtudev_p.h 2022-06-06 03:06:51.000000000 +0200 @@ -0,0 +1 @@ +#include "../../../../../src/serialport/qtudev_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtserialport-everywhere-src-6.3.0/include/QtSerialPort/6.3.1/QtSerialPort/private/qwinoverlappedionotifier_p.h new/qtserialport-everywhere-src-6.3.1/include/QtSerialPort/6.3.1/QtSerialPort/private/qwinoverlappedionotifier_p.h --- old/qtserialport-everywhere-src-6.3.0/include/QtSerialPort/6.3.1/QtSerialPort/private/qwinoverlappedionotifier_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtserialport-everywhere-src-6.3.1/include/QtSerialPort/6.3.1/QtSerialPort/private/qwinoverlappedionotifier_p.h 2022-06-06 03:06:51.000000000 +0200 @@ -0,0 +1 @@ +#include "../../../../../src/serialport/qwinoverlappedionotifier_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtserialport-everywhere-src-6.3.0/include/QtSerialPort/qtserialportversion.h new/qtserialport-everywhere-src-6.3.1/include/QtSerialPort/qtserialportversion.h --- old/qtserialport-everywhere-src-6.3.0/include/QtSerialPort/qtserialportversion.h 2022-04-06 19:56:41.000000000 +0200 +++ new/qtserialport-everywhere-src-6.3.1/include/QtSerialPort/qtserialportversion.h 2022-06-09 02:14:40.000000000 +0200 @@ -2,8 +2,8 @@ #ifndef QT_QTSERIALPORT_VERSION_H #define QT_QTSERIALPORT_VERSION_H -#define QTSERIALPORT_VERSION_STR "6.3.0" +#define QTSERIALPORT_VERSION_STR "6.3.1" -#define QTSERIALPORT_VERSION 0x060300 +#define QTSERIALPORT_VERSION 0x060301 #endif // QT_QTSERIALPORT_VERSION_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtserialport-everywhere-src-6.3.0/src/serialport/doc/src/qtserialport-module-use.qdocinc new/qtserialport-everywhere-src-6.3.1/src/serialport/doc/src/qtserialport-module-use.qdocinc --- old/qtserialport-everywhere-src-6.3.0/src/serialport/doc/src/qtserialport-module-use.qdocinc 2022-04-05 16:01:25.000000000 +0200 +++ new/qtserialport-everywhere-src-6.3.1/src/serialport/doc/src/qtserialport-module-use.qdocinc 2022-06-06 03:06:51.000000000 +0200 @@ -27,7 +27,7 @@ //! [cmakebuild] \code - find_package(Qt6 COMPONENTS SerialPort REQUIRED) + find_package(Qt6 REQUIRED COMPONENTS SerialPort) target_link_libraries(mytarget PRIVATE Qt6::SerialPort) \endcode //! [cmakebuild] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtserialport-everywhere-src-6.3.0/src/serialport/qserialport_p.h new/qtserialport-everywhere-src-6.3.1/src/serialport/qserialport_p.h --- old/qtserialport-everywhere-src-6.3.0/src/serialport/qserialport_p.h 2022-04-05 16:01:25.000000000 +0200 +++ new/qtserialport-everywhere-src-6.3.1/src/serialport/qserialport_p.h 2022-06-06 03:06:51.000000000 +0200 @@ -60,11 +60,12 @@ #include <private/qiodevice_p.h> #include <private/qproperty_p.h> +#include <memory> + #if defined(Q_OS_WIN32) # include <qt_windows.h> #elif defined(Q_OS_UNIX) # include <QtCore/qlockfile.h> -# include <QtCore/qscopedpointer.h> # include <QtCore/qfileinfo.h> # include <QtCore/qstringlist.h> # include <limits.h> @@ -287,7 +288,7 @@ qint64 pendingBytesWritten = 0; bool writeSequenceStarted = false; - QScopedPointer<QLockFile> lockFileScopedPointer; + std::unique_ptr<QLockFile> lockFileScopedPointer; #endif }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtserialport-everywhere-src-6.3.0/src/serialport/qserialport_unix.cpp new/qtserialport-everywhere-src-6.3.1/src/serialport/qserialport_unix.cpp --- old/qtserialport-everywhere-src-6.3.0/src/serialport/qserialport_unix.cpp 2022-04-05 16:01:25.000000000 +0200 +++ new/qtserialport-everywhere-src-6.3.1/src/serialport/qserialport_unix.cpp 2022-06-06 03:06:51.000000000 +0200 @@ -316,7 +316,7 @@ return false; } - QScopedPointer<QLockFile> newLockFileScopedPointer(new QLockFile(lockFilePath)); + auto newLockFileScopedPointer = std::make_unique<QLockFile>(lockFilePath); if (!newLockFileScopedPointer->tryLock()) { setError(QSerialPortErrorInfo(QSerialPort::PermissionError, QSerialPort::tr("Permission error while locking the device"))); @@ -349,7 +349,7 @@ return false; } - lockFileScopedPointer.swap(newLockFileScopedPointer); + lockFileScopedPointer = std::move(newLockFileScopedPointer); return true; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtserialport-everywhere-src-6.3.0/src/serialport/qserialportinfo_unix.cpp new/qtserialport-everywhere-src-6.3.1/src/serialport/qserialportinfo_unix.cpp --- old/qtserialport-everywhere-src-6.3.0/src/serialport/qserialportinfo_unix.cpp 2022-04-05 16:01:25.000000000 +0200 +++ new/qtserialport-everywhere-src-6.3.1/src/serialport/qserialportinfo_unix.cpp 2022-06-06 03:06:51.000000000 +0200 @@ -46,10 +46,11 @@ #include <QtCore/qlockfile.h> #include <QtCore/qfile.h> #include <QtCore/qdir.h> -#include <QtCore/qscopedpointer.h> #include <private/qcore_unix_p.h> +#include <memory> + #include <errno.h> #include <sys/types.h> // kill #include <signal.h> // kill @@ -313,29 +314,22 @@ return serialPortInfoList; } -struct ScopedPointerUdevDeleter -{ - static inline void cleanup(struct ::udev *pointer) +struct udev_deleter { + void operator()(struct ::udev *pointer) const { ::udev_unref(pointer); } -}; - -struct ScopedPointerUdevEnumeratorDeleter -{ - static inline void cleanup(struct ::udev_enumerate *pointer) + void operator()(struct ::udev_enumerate *pointer) const { ::udev_enumerate_unref(pointer); } -}; - -struct ScopedPointerUdevDeviceDeleter -{ - static inline void cleanup(struct ::udev_device *pointer) + void operator()(struct ::udev_device *pointer) const { ::udev_device_unref(pointer); } }; +template <typename T> +using udev_ptr = std::unique_ptr<T, udev_deleter>; #ifndef LINK_LIBUDEV Q_GLOBAL_STATIC(QLibrary, udevLibrary) @@ -396,21 +390,20 @@ return QList<QSerialPortInfo>(); #endif - QScopedPointer<struct ::udev, ScopedPointerUdevDeleter> udev(::udev_new()); + const udev_ptr<struct ::udev> udev(::udev_new()); if (!udev) return QList<QSerialPortInfo>(); - QScopedPointer<udev_enumerate, ScopedPointerUdevEnumeratorDeleter> - enumerate(::udev_enumerate_new(udev.data())); + const udev_ptr<udev_enumerate> enumerate(::udev_enumerate_new(udev.get())); if (!enumerate) return QList<QSerialPortInfo>(); - ::udev_enumerate_add_match_subsystem(enumerate.data(), "tty"); - ::udev_enumerate_scan_devices(enumerate.data()); + ::udev_enumerate_add_match_subsystem(enumerate.get(), "tty"); + ::udev_enumerate_scan_devices(enumerate.get()); - udev_list_entry *devices = ::udev_enumerate_get_list_entry(enumerate.data()); + udev_list_entry *devices = ::udev_enumerate_get_list_entry(enumerate.get()); QList<QSerialPortInfo> serialPortInfoList; udev_list_entry *dev_list_entry; @@ -418,29 +411,29 @@ ok = true; - QScopedPointer<udev_device, ScopedPointerUdevDeviceDeleter> + const udev_ptr<udev_device> dev(::udev_device_new_from_syspath( - udev.data(), ::udev_list_entry_get_name(dev_list_entry))); + udev.get(), ::udev_list_entry_get_name(dev_list_entry))); if (!dev) return serialPortInfoList; QSerialPortInfoPrivate priv; - priv.device = deviceLocation(dev.data()); - priv.portName = deviceName(dev.data()); + priv.device = deviceLocation(dev.get()); + priv.portName = deviceName(dev.get()); - udev_device *parentdev = ::udev_device_get_parent(dev.data()); + udev_device *parentdev = ::udev_device_get_parent(dev.get()); if (parentdev) { const QString driverName = deviceDriver(parentdev); if (isSerial8250Driver(driverName) && !isValidSerial8250(priv.device)) continue; - priv.description = deviceDescription(dev.data()); - priv.manufacturer = deviceManufacturer(dev.data()); - priv.serialNumber = deviceSerialNumber(dev.data()); - priv.vendorIdentifier = deviceVendorIdentifier(dev.data(), priv.hasVendorIdentifier); - priv.productIdentifier = deviceProductIdentifier(dev.data(), priv.hasProductIdentifier); + priv.description = deviceDescription(dev.get()); + priv.manufacturer = deviceManufacturer(dev.get()); + priv.serialNumber = deviceSerialNumber(dev.get()); + priv.vendorIdentifier = deviceVendorIdentifier(dev.get(), priv.hasVendorIdentifier); + priv.productIdentifier = deviceProductIdentifier(dev.get(), priv.hasProductIdentifier); } else { if (!isRfcommDevice(priv.portName) && !isVirtualNullModemDevice(priv.portName)
