openSUSE Commits
Threads by month
- ----- 2025 -----
- January
- ----- 2024 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2012 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2011 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2010 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2009 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2008 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2007 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2006 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
June 2022
- 1 participants
- 2040 discussions
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package libqt5-qtserialbus for openSUSE:Factory checked in at 2022-06-29 16:01:14
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libqt5-qtserialbus (Old)
and /work/SRC/openSUSE:Factory/.libqt5-qtserialbus.new.1548 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libqt5-qtserialbus"
Wed Jun 29 16:01:14 2022 rev:22 rq:985491 version:5.15.5+kde0
Changes:
--------
--- /work/SRC/openSUSE:Factory/libqt5-qtserialbus/libqt5-qtserialbus.changes 2021-06-26 21:25:26.115341100 +0200
+++ /work/SRC/openSUSE:Factory/.libqt5-qtserialbus.new.1548/libqt5-qtserialbus.changes 2022-06-29 16:02:30.512714573 +0200
@@ -1,0 +2,12 @@
+Mon Jun 27 13:10:23 UTC 2022 - Fabian Vogt <fabian(a)ritter-vogt.de>
+
+- Update to version 5.15.5+kde0, rebased upstream:
+ * Revert "Update commercial license headers"
+ * Fix 5.15 compile error
+ * Fix Modbus custom command response processing
+ * Fix Modbus custom command size calculation
+ * SocketCAN: Fix returning bitrate setting result
+ * Update commercial license headers
+- Drop 0001-Revert-Bump-version.patch, it's versioned correctly now
+
+-------------------------------------------------------------------
Old:
----
0001-Revert-Bump-version.patch
qtserialbus-everywhere-src-5.15.2+kde2.obscpio
New:
----
qtserialbus-everywhere-src-5.15.5+kde0.obscpio
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libqt5-qtserialbus.spec ++++++
--- /var/tmp/diff_new_pack.CQWbB1/_old 2022-06-29 16:02:31.196715483 +0200
+++ /var/tmp/diff_new_pack.CQWbB1/_new 2022-06-29 16:02:31.204715494 +0200
@@ -19,20 +19,18 @@
%define qt5_snapshot 1
Name: libqt5-qtserialbus
-Version: 5.15.2+kde2
+Version: 5.15.5+kde0
Release: 0
Summary: Qt 5 Serial Bus Addon
License: LGPL-3.0-only OR GPL-2.0-or-later
Group: Development/Libraries/X11
Url: https://www.qt.io
%define base_name libqt5
-%define real_version 5.15.2
-%define so_version 5.15.2
+%define real_version 5.15.5
+%define so_version 5.15.5
%define tar_version qtserialbus-everywhere-src-%{version}
Source: %{tar_version}.tar.xz
Source1: baselibs.conf
-# PATCH-FIX-OPENSUSE
-Patch1: 0001-Revert-Bump-version.patch
BuildRequires: fdupes
BuildRequires: libQt5Core-private-headers-devel >= %{real_version}
BuildRequires: libQt5DBus-devel >= %{real_version}
++++++ _service ++++++
--- /var/tmp/diff_new_pack.CQWbB1/_old 2022-06-29 16:02:31.244715547 +0200
+++ /var/tmp/diff_new_pack.CQWbB1/_new 2022-06-29 16:02:31.248715553 +0200
@@ -1,12 +1,12 @@
<services>
<service name="obs_scm" mode="disabled">
<param name="changesgenerate">enable</param>
- <param name="versionformat">5.15.2+kde@TAG_OFFSET@</param>
+ <param name="versionformat">5.15.5+kde@TAG_OFFSET@</param>
<param name="url">https://invent.kde.org/qt/qt/qtserialbus.git</param>
<param name="scm">git</param>
<param name="filename">qtserialbus-everywhere-src</param>
<param name="revision">kde/5.15</param>
- <param name="parent-tag">v5.15.2</param>
+ <param name="parent-tag">v5.15.5-lts-lgpl</param>
<param name="changesgenerate">enable</param>
</service>
<service name="set_version" mode="disabled"/>
++++++ qtserialbus-everywhere-src-5.15.2+kde2.obscpio -> qtserialbus-everywhere-src-5.15.5+kde0.obscpio ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtserialbus-everywhere-src-5.15.2+kde2/.gitignore new/qtserialbus-everywhere-src-5.15.5+kde0/.gitignore
--- old/qtserialbus-everywhere-src-5.15.2+kde2/.gitignore 1970-01-01 01:00:00.000000000 +0100
+++ new/qtserialbus-everywhere-src-5.15.5+kde0/.gitignore 2022-06-02 22:27:49.000000000 +0200
@@ -0,0 +1,53 @@
+config.log
+Makefile*
+*.pro.user
+.qmake.cache
+*.obj
+config.tests/language/language
+config.tests/socketcan/socketcan
+config.tests/socketcan_fd/socketcan_fd
+examples/serialbus/modbus/adueditor/adueditor
+examples/serialbus/modbus/master/modbusmaster
+examples/serialbus/modbus/slave/modbusslave
+*.moc
+*.uic
+*.pch
+.rcc
+src/serialbus/doc/snippets/serialbus_cppsnippet
+src/serialbus/QtSerialBus.version*
+examples/serialbus/can/can
+tests/auto/qcanbus/tst_qcanbus
+tests/auto/qcanbusdevice/tst_qcanbusdevice
+tests/auto/qcanbusframe/tst_qcanbusframe
+tests/auto/qmodbusadu/tst_qmodbusadu
+tests/auto/qmodbusclient/tst_qmodbusclient
+tests/auto/qmodbuscommevent/tst_qmodbuscommevent
+tests/auto/qmodbusdataunit/tst_qmodbusdataunit
+tests/auto/qmodbusdevice/tst_qmodbusdevice
+tests/auto/qmodbusdeviceidentification/tst_qmodbusdeviceidentification
+tests/auto/qmodbuspdu/tst_qmodbuspdu
+tests/auto/qmodbusreply/tst_qmodbusreply
+tests/auto/qmodbusrtuserialmaster/tst_qmodbusrtuserialmaster
+tests/auto/qmodbusserver/tst_qmodbusserver
+*_resource.rc
+*.exe
+*.ipch
+*_wrapper.bat
+*_wrapper.sh
+qtserialbus-config.pri
+
+# Visual Studio generated files
+*.ib_pdb_index
+*.idb
+*.ilk
+*.pdb
+*.sln
+*.suo
+*.vcproj
+*vcproj.*.*.user
+*.ncb
+*.vcxproj
+*.vcxproj.filters
+*.vcxproj.user
+*.sdf
+*.opensdf
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtserialbus-everywhere-src-5.15.2+kde2/.qmake.conf new/qtserialbus-everywhere-src-5.15.5+kde0/.qmake.conf
--- old/qtserialbus-everywhere-src-5.15.2+kde2/.qmake.conf 2020-10-28 08:43:31.000000000 +0100
+++ new/qtserialbus-everywhere-src-5.15.5+kde0/.qmake.conf 2022-06-02 22:27:49.000000000 +0200
@@ -2,4 +2,4 @@
CONFIG += warning_clean
DEFINES += QT_NO_FOREACH
-MODULE_VERSION = 5.15.3
+MODULE_VERSION = 5.15.5
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtserialbus-everywhere-src-5.15.2+kde2/0001-Revert-Bump-version.patch new/qtserialbus-everywhere-src-5.15.5+kde0/0001-Revert-Bump-version.patch
--- old/qtserialbus-everywhere-src-5.15.2+kde2/0001-Revert-Bump-version.patch 2020-10-28 08:43:31.000000000 +0100
+++ new/qtserialbus-everywhere-src-5.15.5+kde0/0001-Revert-Bump-version.patch 1970-01-01 01:00:00.000000000 +0100
@@ -1,23 +0,0 @@
-From f3e916c2c910b10571c6d5ea926e5de11cda2ca5 Mon Sep 17 00:00:00 2001
-From: Fabian Vogt <fvogt(a)suse.de>
-Date: Tue, 22 Jun 2021 21:23:27 +0200
-Subject: [PATCH] Revert "Bump version"
-
-This reverts commit 8bc2ee81eb399a22cd2641aaab169c632dc94fe2.
----
- .qmake.conf | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/.qmake.conf b/.qmake.conf
-index 3dea105..23f20e2 100644
---- a/.qmake.conf
-+++ b/.qmake.conf
-@@ -2,4 +2,4 @@ load(qt_build_config)
- CONFIG += warning_clean
- DEFINES += QT_NO_FOREACH
-
--MODULE_VERSION = 5.15.3
-+MODULE_VERSION = 5.15.2
---
-2.20.1
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtserialbus-everywhere-src-5.15.2+kde2/src/plugins/canbus/socketcan/socketcanbackend.cpp new/qtserialbus-everywhere-src-5.15.5+kde0/src/plugins/canbus/socketcan/socketcanbackend.cpp
--- old/qtserialbus-everywhere-src-5.15.2+kde2/src/plugins/canbus/socketcan/socketcanbackend.cpp 2020-10-28 08:43:31.000000000 +0100
+++ new/qtserialbus-everywhere-src-5.15.5+kde0/src/plugins/canbus/socketcan/socketcanbackend.cpp 2022-06-02 22:27:49.000000000 +0200
@@ -349,7 +349,7 @@
case QCanBusDevice::BitRateKey:
{
const quint32 bitRate = value.toUInt();
- libSocketCan->setBitrate(canSocketName, bitRate);
+ success = libSocketCan->setBitrate(canSocketName, bitRate);
break;
}
default:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtserialbus-everywhere-src-5.15.2+kde2/src/serialbus/qmodbusclient.cpp new/qtserialbus-everywhere-src-5.15.5+kde0/src/serialbus/qmodbusclient.cpp
--- old/qtserialbus-everywhere-src-5.15.2+kde2/src/serialbus/qmodbusclient.cpp 2020-10-28 08:43:31.000000000 +0100
+++ new/qtserialbus-everywhere-src-5.15.5+kde0/src/serialbus/qmodbusclient.cpp 2022-06-02 22:27:49.000000000 +0200
@@ -361,7 +361,7 @@
return;
}
- if (element.reply->type() != QModbusReply::Common) {
+ if (element.reply->type() == QModbusReply::Broadcast) {
element.reply->setFinished(true);
return;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtserialbus-everywhere-src-5.15.2+kde2/src/serialbus/qmodbuspdu.cpp new/qtserialbus-everywhere-src-5.15.5+kde0/src/serialbus/qmodbuspdu.cpp
--- old/qtserialbus-everywhere-src-5.15.2+kde2/src/serialbus/qmodbuspdu.cpp 2020-10-28 08:43:31.000000000 +0100
+++ new/qtserialbus-everywhere-src-5.15.5+kde0/src/serialbus/qmodbuspdu.cpp 2022-06-02 22:27:49.000000000 +0200
@@ -48,13 +48,23 @@
using ResSizeCalc = QHash<quint8, QModbusResponse::CalcFuncPtr>;
Q_GLOBAL_STATIC(ResSizeCalc, responseSizeCalculators);
-namespace Private {
+struct QModbusPduPrivate
+{
+ QModbusPduPrivate() = delete;
+ Q_DISABLE_COPY_MOVE(QModbusPduPrivate)
enum struct Type {
Request,
Response
};
+/*!
+ \internal
+
+ Returns the minimum data size in bytes for the given \a pdu and the
+ Modbus PDU \a type. If the PDU's function code is invalid, undefined
+ or unknown, the return value will be \c {-1}.
+*/
static int minimumDataSize(const QModbusPdu &pdu, Type type)
{
if (pdu.isException())
@@ -103,44 +113,53 @@
return -1;
}
-static QDataStream &pduFromStream(QDataStream &stream, QModbusPdu &pdu, Type type)
-{
- quint8 codeByte = 0;
- if (stream.readRawData(reinterpret_cast<char *>(&codeByte), sizeof(quint8)) != sizeof(quint8))
- return stream;
- QModbusPdu::FunctionCode code = QModbusPdu::FunctionCode(codeByte);
- pdu.setFunctionCode(code);
+/*!
+ \internal
- auto needsAdditionalRead = [](QModbusPdu &pdu, int size) -> bool {
- if (size < 0)
- pdu.setFunctionCode(QModbusResponse::Invalid);
- if (size <= 0)
- return false;
- return true;
- };
+ Extracts a Modbus PDU from a \a stream into the given \a pdu based on \a type.
+*/
+static QDataStream &pduFromStream(QDataStream &stream, Type type, QModbusPdu *pdu)
+{
+ struct RAII {
+ RAII(QModbusPdu *ptr = nullptr)
+ : tmp(ptr) {}
+ QModbusPdu *tmp{ nullptr };
+ ~RAII() { if (tmp) *tmp = {}; }
+ } raii = { pdu };
- const bool isResponse = (type == Type::Response);
- int size = isResponse ? QModbusResponse::minimumDataSize(pdu)
- : QModbusRequest::minimumDataSize(pdu);
- if (!needsAdditionalRead(pdu, size))
+ QModbusPdu::FunctionCode code = QModbusPdu::FunctionCode::Invalid;
+ if (stream.readRawData(reinterpret_cast<char *>(&code), sizeof(quint8)) != sizeof(quint8))
return stream;
+ pdu->setFunctionCode(code);
- QByteArray data(size, Qt::Uninitialized);
- if (stream.device()->peek(data.data(), data.size()) != size)
+ if (code == QModbusPdu::Invalid || code == QModbusPdu::UndefinedFunctionCode) // shortcut
return stream;
- pdu.setData(data);
- size = isResponse ? QModbusResponse::calculateDataSize(pdu)
- : QModbusRequest::calculateDataSize(pdu);
- if (!needsAdditionalRead(pdu, size))
+ constexpr const int MaxPduDataSize = 252; // in bytes
+
+ // The calculateDataSize(...) function might need some data inside the
+ // given PDU argument to be able to figure out the right data size (e.g.
+ // WriteMultipleCoils contains some kind of "header"). So fake fill the PDU
+ // with the maximum available data but no more than the allowed max PDU
+ // data size.
+ QByteArray data(MaxPduDataSize, Qt::Uninitialized);
+ int read = stream.device()->peek(data.data(), MaxPduDataSize);
+ if (read < 0)
return stream;
+ data.resize(read);
+ pdu->setData(data);
+
+ const bool isResponse = (type == Type::Response);
+ int size = isResponse ? QModbusResponse::calculateDataSize(*pdu)
+ : QModbusRequest::calculateDataSize(*pdu);
+
if (isResponse && (code == QModbusPdu::EncapsulatedInterfaceTransport)) {
quint8 meiType;
- pdu.decodeData(&meiType);
+ pdu->decodeData(&meiType);
if (meiType == EncapsulatedInterfaceTransport::ReadDeviceIdentification) {
int left = size, offset = 0;
- while ((left > 0) && (size <= 252)) { // The maximum PDU data size is 252 bytes.
+ while ((left > 0) && (size <= MaxPduDataSize)) {
data.resize(size);
const int read = stream.readRawData(data.data() + offset, size - offset);
if ((read < 0) || (read != (size - offset))) {
@@ -152,35 +171,31 @@
left = QModbusResponse::calculateDataSize(QModbusResponse(code, data)) - offset;
size += left;
}
- if ((stream.status() == QDataStream::Ok) && (size <= 252)) {
- pdu.setData(data);
+ if ((stream.status() == QDataStream::Ok) && (size <= MaxPduDataSize)) {
+ raii = {};
+ pdu->setData(data);
return stream; // early return to avoid second read
}
} else {
data.resize(int(stream.device()->size() - 1)); // One byte for the function code.
}
- } else if (pdu.functionCode() == QModbusPdu::Diagnostics) {
+ } else if (pdu->functionCode() == QModbusPdu::Diagnostics) {
quint16 subCode;
- pdu.decodeData(&subCode);
+ pdu->decodeData(&subCode);
if (subCode == Diagnostics::ReturnQueryData)
data.resize(int(stream.device()->size() - 1)); // One byte for the function code.
}
- // reset what we have so far, next read might fail as well
- pdu.setData(QByteArray());
- pdu.setFunctionCode(QModbusPdu::Invalid);
-
- if (data.size() <= 252) { // The maximum PDU data size is 252 bytes.
+ if (data.size() <= MaxPduDataSize) {
data.resize(size);
if (stream.readRawData(data.data(), data.size()) == size) {
- pdu.setData(data);
- pdu.setFunctionCode(code);
+ raii = {};
+ pdu->setData(data);
}
}
return stream;
}
-
-} // namespace Private
+};
/*!
\class QModbusPdu
@@ -533,7 +548,7 @@
*/
int QModbusRequest::minimumDataSize(const QModbusRequest &request)
{
- return Private::minimumDataSize(request, Private::Type::Request);
+ return QModbusPduPrivate::minimumDataSize(request, QModbusPduPrivate::Type::Request);
}
/*!
@@ -555,7 +570,7 @@
return 1;
int size = -1;
- int minimum = Private::minimumDataSize(request, Private::Type::Request);
+ int minimum = QModbusPduPrivate::minimumDataSize(request, QModbusPduPrivate::Type::Request);
if (minimum < 0)
return size;
@@ -620,7 +635,7 @@
*/
QDataStream &operator>>(QDataStream &stream, QModbusRequest &pdu)
{
- return Private::pduFromStream(stream, pdu, Private::Type::Request);
+ return QModbusPduPrivate::pduFromStream(stream, QModbusPduPrivate::Type::Request, &pdu);
}
/*!
@@ -689,7 +704,7 @@
*/
int QModbusResponse::minimumDataSize(const QModbusResponse &response)
{
- return Private::minimumDataSize(response, Private::Type::Response);
+ return QModbusPduPrivate::minimumDataSize(response, QModbusPduPrivate::Type::Response);
}
/*!
@@ -711,7 +726,7 @@
return 1;
int size = -1;
- int minimum = Private::minimumDataSize(response, Private::Type::Response);
+ int minimum = QModbusPduPrivate::minimumDataSize(response, QModbusPduPrivate::Type::Response);
if (minimum < 0)
return size;
@@ -806,7 +821,7 @@
*/
QDataStream &operator>>(QDataStream &stream, QModbusResponse &pdu)
{
- return Private::pduFromStream(stream, pdu, Private::Type::Response);
+ return QModbusPduPrivate::pduFromStream(stream, QModbusPduPrivate::Type::Response, &pdu);
}
/*!
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtserialbus-everywhere-src-5.15.2+kde2/src/serialbus/qmodbuspdu.h new/qtserialbus-everywhere-src-5.15.5+kde0/src/serialbus/qmodbuspdu.h
--- old/qtserialbus-everywhere-src-5.15.2+kde2/src/serialbus/qmodbuspdu.h 2020-10-28 08:43:31.000000000 +0100
+++ new/qtserialbus-everywhere-src-5.15.5+kde0/src/serialbus/qmodbuspdu.h 2022-06-02 22:27:49.000000000 +0200
@@ -183,6 +183,7 @@
FunctionCode m_code = Invalid;
QByteArray m_data;
friend class QModbusSerialAdu;
+ friend struct QModbusPduPrivate;
};
Q_SERIALBUS_EXPORT QDebug operator<<(QDebug debug, const QModbusPdu &pdu);
Q_SERIALBUS_EXPORT QDataStream &operator<<(QDataStream &stream, const QModbusPdu &pdu);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtserialbus-everywhere-src-5.15.2+kde2/src/serialbus/qmodbusreply.cpp new/qtserialbus-everywhere-src-5.15.5+kde0/src/serialbus/qmodbusreply.cpp
--- old/qtserialbus-everywhere-src-5.15.2+kde2/src/serialbus/qmodbusreply.cpp 2020-10-28 08:43:31.000000000 +0100
+++ new/qtserialbus-everywhere-src-5.15.5+kde0/src/serialbus/qmodbusreply.cpp 2022-06-02 22:27:49.000000000 +0200
@@ -147,15 +147,17 @@
If the request has not finished, has failed with an error or was a write
request then the returned \l QModbusDataUnit instance is invalid.
- \note If the \l type() of the reply is \l QModbusReply::Raw, the return
- value will always be invalid.
+ \note If the \l type() of the reply is \l QModbusReply::Broadcast, the
+ return value will always be invalid. If the l type() of the reply is
+ \l QModbusReply::Raw, the return value might be invalid depending on the
+ implementation of \l QModbusClient::processPrivateResponse().
- \sa type(), rawResult()
+ \sa type(), rawResult(), QModbusClient::processPrivateResponse()
*/
QModbusDataUnit QModbusReply::result() const
{
Q_D(const QModbusReply);
- if (type() == QModbusReply::Common)
+ if (type() != QModbusReply::Broadcast)
return d->m_unit;
return QModbusDataUnit();
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtserialbus-everywhere-src-5.15.2+kde2/tests/auto/qmodbusreply/tst_qmodbusreply.cpp new/qtserialbus-everywhere-src-5.15.5+kde0/tests/auto/qmodbusreply/tst_qmodbusreply.cpp
--- old/qtserialbus-everywhere-src-5.15.2+kde2/tests/auto/qmodbusreply/tst_qmodbusreply.cpp 2020-10-28 08:43:31.000000000 +0100
+++ new/qtserialbus-everywhere-src-5.15.5+kde0/tests/auto/qmodbusreply/tst_qmodbusreply.cpp 2022-06-02 22:27:49.000000000 +0200
@@ -213,7 +213,7 @@
replyRawTest.setRawResult(response);
QCOMPARE(finishedSpy.count(), 0);
QCOMPARE(errorSpyRaw.count(), 0);
- QCOMPARE(replyRawTest.result().isValid(), false);
+ QCOMPARE(replyRawTest.result().isValid(), true);
QCOMPARE(replyRawTest.rawResult().isValid(), true);
tmp = replyRawTest.rawResult();
++++++ qtserialbus-everywhere-src.obsinfo ++++++
--- /var/tmp/diff_new_pack.CQWbB1/_old 2022-06-29 16:02:31.524715920 +0200
+++ /var/tmp/diff_new_pack.CQWbB1/_new 2022-06-29 16:02:31.524715920 +0200
@@ -1,6 +1,5 @@
name: qtserialbus-everywhere-src
-version: 5.15.2+kde2
-mtime: 1603871011
-commit: 8884c5e43df846deac5a0c7c290eeb633d6bfe32
-
+version: 5.15.5+kde0
+mtime: 1654201669
+commit: b6e22f07fb529736c9362d81de7f5c632bd1f439
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package libqt5-qtscxml for openSUSE:Factory checked in at 2022-06-29 16:01:13
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libqt5-qtscxml (Old)
and /work/SRC/openSUSE:Factory/.libqt5-qtscxml.new.1548 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libqt5-qtscxml"
Wed Jun 29 16:01:13 2022 rev:20 rq:985489 version:5.15.5+kde0
Changes:
--------
--- /work/SRC/openSUSE:Factory/libqt5-qtscxml/libqt5-qtscxml.changes 2021-06-26 21:25:37.615356286 +0200
+++ /work/SRC/openSUSE:Factory/.libqt5-qtscxml.new.1548/libqt5-qtscxml.changes 2022-06-29 16:02:29.344713018 +0200
@@ -1,0 +2,10 @@
+Mon Jun 27 13:10:18 UTC 2022 - Fabian Vogt <fabian(a)ritter-vogt.de>
+
+- Update to version 5.15.5+kde0, rebased upstream:
+ * Fix calling of the overloaded Scxml statemachine methods
+ * Revert "Update commercial license headers"
+ * Mark dynamic state machines' metaobjects as fully dynamic
+ * Update commercial license headers
+- Drop 0001-Revert-Bump-version.patch, it's versioned correctly now
+
+-------------------------------------------------------------------
Old:
----
0001-Revert-Bump-version.patch
qtscxml-everywhere-src-5.15.2+kde1.obscpio
New:
----
qtscxml-everywhere-src-5.15.5+kde0.obscpio
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libqt5-qtscxml.spec ++++++
--- /var/tmp/diff_new_pack.BJ49xq/_old 2022-06-29 16:02:30.008713902 +0200
+++ /var/tmp/diff_new_pack.BJ49xq/_new 2022-06-29 16:02:30.012713907 +0200
@@ -22,11 +22,11 @@
%define qt5_snapshot 1
%define libname libQt5Scxml5
%define base_name libqt5
-%define real_version 5.15.2
-%define so_version 5.15.2
+%define real_version 5.15.5
+%define so_version 5.15.5
%define tar_version qtscxml-everywhere-src-%{version}
Name: libqt5-qtscxml
-Version: 5.15.2+kde1
+Version: 5.15.5+kde0
Release: 0
Summary: Qt 5 State Chart XML Library
License: LGPL-3.0-only OR (GPL-2.0-only OR GPL-3.0-or-later)
@@ -34,8 +34,6 @@
URL: https://qt.io
Source: %{tar_version}.tar.xz
Source1: baselibs.conf
-# PATCH-FIX-OPENSUSE
-Patch1: 0001-Revert-Bump-version.patch
BuildRequires: libQt5Core-private-headers-devel >= %{real_version}
BuildRequires: libqt5-qtbase-devel >= %{real_version}
BuildRequires: libqt5-qtdeclarative-devel >= %{real_version}
++++++ _service ++++++
--- /var/tmp/diff_new_pack.BJ49xq/_old 2022-06-29 16:02:30.048713955 +0200
+++ /var/tmp/diff_new_pack.BJ49xq/_new 2022-06-29 16:02:30.052713960 +0200
@@ -1,12 +1,12 @@
<services>
<service name="obs_scm" mode="disabled">
<param name="changesgenerate">enable</param>
- <param name="versionformat">5.15.2+kde@TAG_OFFSET@</param>
+ <param name="versionformat">5.15.5+kde@TAG_OFFSET@</param>
<param name="url">https://invent.kde.org/qt/qt/qtscxml.git</param>
<param name="scm">git</param>
<param name="filename">qtscxml-everywhere-src</param>
<param name="revision">kde/5.15</param>
- <param name="parent-tag">v5.15.2</param>
+ <param name="parent-tag">v5.15.5-lts-lgpl</param>
<param name="changesgenerate">enable</param>
</service>
<service name="set_version" mode="disabled"/>
++++++ qtscxml-everywhere-src-5.15.2+kde1.obscpio -> qtscxml-everywhere-src-5.15.5+kde0.obscpio ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscxml-everywhere-src-5.15.2+kde1/.gitignore new/qtscxml-everywhere-src-5.15.5+kde0/.gitignore
--- old/qtscxml-everywhere-src-5.15.2+kde1/.gitignore 1970-01-01 01:00:00.000000000 +0100
+++ new/qtscxml-everywhere-src-5.15.5+kde0/.gitignore 2022-05-19 06:24:12.000000000 +0200
@@ -0,0 +1,31 @@
+.DS_Store
+/tests/3rdparty/scion-tests/node_modules
+*~
+*.pro.user
+*.qmlproject.user
+*.o
+Makefile
+.qmake.stash
+*.app
+moc_*.cpp
+*.dylib
+*.moc
+/tools/qscxmlc/qscxmlc
+/tests/testCpp/testCpp
+
+tst_cppgen
+qrc_*.cpp
+tst_scion
+.qmake.cache
+*.pch
+tests/auto/scion/compiled_tests.h
+tests/auto/scion/scxml
+tests/auto/scion/scion.h
+tests/auto/scion/scion.qrc
+
+examples/trafficlight-qml/statemachine.cpp
+examples/trafficlight-qml/statemachine.h
+examples/trafficlight-qml/Makefile.*
+examples/trafficlight-widgets/statemachine.cpp
+examples/trafficlight-widgets/statemachine.h
+examples/trafficlight-widgets/Makefile.*
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscxml-everywhere-src-5.15.2+kde1/.qmake.conf new/qtscxml-everywhere-src-5.15.5+kde0/.qmake.conf
--- old/qtscxml-everywhere-src-5.15.2+kde1/.qmake.conf 2020-10-27 06:49:46.000000000 +0100
+++ new/qtscxml-everywhere-src-5.15.5+kde0/.qmake.conf 2022-05-19 06:24:12.000000000 +0200
@@ -4,4 +4,4 @@
DEFINES += QT_NO_FOREACH QT_NO_JAVA_STYLE_ITERATORS QT_NO_LINKED_LIST
-MODULE_VERSION = 5.15.3
+MODULE_VERSION = 5.15.5
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscxml-everywhere-src-5.15.2+kde1/0001-Revert-Bump-version.patch new/qtscxml-everywhere-src-5.15.5+kde0/0001-Revert-Bump-version.patch
--- old/qtscxml-everywhere-src-5.15.2+kde1/0001-Revert-Bump-version.patch 2020-10-27 06:49:46.000000000 +0100
+++ new/qtscxml-everywhere-src-5.15.5+kde0/0001-Revert-Bump-version.patch 1970-01-01 01:00:00.000000000 +0100
@@ -1,23 +0,0 @@
-From 17bcf4ec9385ea48da11a2b4672e29f736aad0f7 Mon Sep 17 00:00:00 2001
-From: Fabian Vogt <fvogt(a)suse.de>
-Date: Tue, 22 Jun 2021 21:23:26 +0200
-Subject: [PATCH] Revert "Bump version"
-
-This reverts commit 7a15000f42c7a3171719727cd056f82a78244ed7.
----
- .qmake.conf | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/.qmake.conf b/.qmake.conf
-index fc6f10a..cca4cfa 100644
---- a/.qmake.conf
-+++ b/.qmake.conf
-@@ -4,4 +4,4 @@ CONFIG += warning_clean
-
- DEFINES += QT_NO_FOREACH QT_NO_JAVA_STYLE_ITERATORS QT_NO_LINKED_LIST
-
--MODULE_VERSION = 5.15.3
-+MODULE_VERSION = 5.15.2
---
-2.20.1
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscxml-everywhere-src-5.15.2+kde1/src/scxml/qscxmlcompiler.cpp new/qtscxml-everywhere-src-5.15.5+kde0/src/scxml/qscxmlcompiler.cpp
--- old/qtscxml-everywhere-src-5.15.2+kde1/src/scxml/qscxmlcompiler.cpp 2020-10-27 06:49:46.000000000 +0100
+++ new/qtscxml-everywhere-src-5.15.5+kde0/src/scxml/qscxmlcompiler.cpp 2022-05-19 06:24:12.000000000 +0200
@@ -54,6 +54,14 @@
#include "qscxmltabledata_p.h"
#include <private/qmetaobjectbuilder_p.h>
+#if QT_CONFIG(scxml_ecmascriptdatamodel)
+// In Qt5 the ecmascript datamodel brings in QML dependency.
+// We use that to include the QML headers needed for invalidating
+// property cache, even though strictly speaking these are distinct
+// functionalities.
+#include <private/qqmldata_p.h>
+#include <private/qqmlpropertycache_p.h>
+#endif
#endif // BUILD_QSCXMLC
#include <functional>
@@ -587,6 +595,22 @@
{
Q_D(DynamicStateMachine);
if (d->m_metaObject != &QScxmlStateMachine::staticMetaObject) {
+#if QT_CONFIG(scxml_ecmascriptdatamodel)
+ // Invalidate the QML property cache as we delete the dynamic
+ // metaobject, otherwise stale string accesses might occur.
+ // Important! This invalidation is a workaround and brittle at
+ // at best; while string cache will be cleared, the cache itself
+ // will not. Instead we rely on that the (only) user for the cache
+ // is gone as well. This workaround is specific to Qt5, in Qt6
+ // we are able to fix the issue more properly by marking the
+ // metaobject dynamic => QML property caching will not be done.
+ //
+ // All further interaction with this property cache must be
+ // avoided.
+ QQmlData *ddata = QQmlData::get(this, false);
+ if (ddata && ddata->propertyCache)
+ ddata->propertyCache->invalidate(d->m_metaObject);
+#endif
free(const_cast<QMetaObject *>(d->m_metaObject));
d->m_metaObject = &QScxmlStateMachine::staticMetaObject;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscxml-everywhere-src-5.15.2+kde1/tests/3rdparty/scion-tests/scxml-test-framework/.gitignore new/qtscxml-everywhere-src-5.15.5+kde0/tests/3rdparty/scion-tests/scxml-test-framework/.gitignore
--- old/qtscxml-everywhere-src-5.15.2+kde1/tests/3rdparty/scion-tests/scxml-test-framework/.gitignore 1970-01-01 01:00:00.000000000 +0100
+++ new/qtscxml-everywhere-src-5.15.5+kde0/tests/3rdparty/scion-tests/scxml-test-framework/.gitignore 2022-05-19 06:24:12.000000000 +0200
@@ -0,0 +1,4 @@
+*.sw*
+node_modules
+
+test/w3c-ecma/.DS_Store
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscxml-everywhere-src-5.15.2+kde1/tests/auto/auto.pro new/qtscxml-everywhere-src-5.15.5+kde0/tests/auto/auto.pro
--- old/qtscxml-everywhere-src-5.15.2+kde1/tests/auto/auto.pro 2020-10-27 06:49:46.000000000 +0100
+++ new/qtscxml-everywhere-src-5.15.5+kde0/tests/auto/auto.pro 2022-05-19 06:24:12.000000000 +0200
@@ -5,4 +5,5 @@
parser\
scion\
statemachine \
- statemachineinfo
+ statemachineinfo \
+ qmltest
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscxml-everywhere-src-5.15.2+kde1/tests/auto/qmltest/qmltest.pro new/qtscxml-everywhere-src-5.15.5+kde0/tests/auto/qmltest/qmltest.pro
--- old/qtscxml-everywhere-src-5.15.2+kde1/tests/auto/qmltest/qmltest.pro 1970-01-01 01:00:00.000000000 +0100
+++ new/qtscxml-everywhere-src-5.15.5+kde0/tests/auto/qmltest/qmltest.pro 2022-05-19 06:24:12.000000000 +0200
@@ -0,0 +1,14 @@
+TEMPLATE = app
+TARGET = tst_scxmlqml
+CONFIG += qmltestcase
+
+SOURCES += \
+ $$PWD/tst_scxmlqml.cpp
+
+RESOURCES += tst_scxmlqml.qrc
+
+OTHER_FILES += \
+ $$PWD/*.qml
+
+TESTDATA += \
+ $$PWD/tst_*
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscxml-everywhere-src-5.15.2+kde1/tests/auto/qmltest/statemachine.scxml new/qtscxml-everywhere-src-5.15.5+kde0/tests/auto/qmltest/statemachine.scxml
--- old/qtscxml-everywhere-src-5.15.2+kde1/tests/auto/qmltest/statemachine.scxml 1970-01-01 01:00:00.000000000 +0100
+++ new/qtscxml-everywhere-src-5.15.5+kde0/tests/auto/qmltest/statemachine.scxml 2022-05-19 06:24:12.000000000 +0200
@@ -0,0 +1,45 @@
+<?xml version="1.0" ?>
+<!--
+/****************************************************************************
+**
+** Copyright (C) 2021 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the QtScxml module 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$
+**
+****************************************************************************/
+-->
+<scxml xmlns="http://www.w3.org/2005/07/scxml"
+ version="1.0"
+ name="ColorStepper"
+ initial="red">
+
+ <state id = "red">
+ <transition target="yellow" event="step"/>
+ </state>
+
+ <state id = "yellow">
+ <transition target="green" event="step"/>
+ </state>
+
+ <final id="green"/>
+</scxml>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscxml-everywhere-src-5.15.2+kde1/tests/auto/qmltest/tst_dynamic.qml new/qtscxml-everywhere-src-5.15.5+kde0/tests/auto/qmltest/tst_dynamic.qml
--- old/qtscxml-everywhere-src-5.15.2+kde1/tests/auto/qmltest/tst_dynamic.qml 1970-01-01 01:00:00.000000000 +0100
+++ new/qtscxml-everywhere-src-5.15.5+kde0/tests/auto/qmltest/tst_dynamic.qml 2022-05-19 06:24:12.000000000 +0200
@@ -0,0 +1,52 @@
+/****************************************************************************
+**
+** Copyright (C) 2021 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the test suite 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$
+**
+****************************************************************************/
+
+import QtTest 1.15
+import QtScxml 5.15
+
+TestCase {
+ id: testCase
+
+ StateMachineLoader {
+ id: loader
+ source: "qrc:///statemachine.scxml"
+ }
+
+ function test_overloaded_calls_with_dynamic_statemachine()
+ {
+ // This test calls "submitEvent" invokable function which has 3
+ // overloads, differentiated both by parameter types and amounts.
+ // Test verifies that the overloads are callable while using
+ // a dynamic statemachine which has a dynamic metaobject under the hood
+ tryVerify(() => loader.stateMachine.activeStateNames()[0] === "red", 200)
+ loader.stateMachine.submitEvent("step")
+ tryVerify(() => loader.stateMachine.activeStateNames()[0] === "yellow", 200)
+ loader.stateMachine.submitEvent("step", "somedata")
+ tryVerify(() => loader.stateMachine.activeStateNames()[0] === "green", 200)
+ }
+}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscxml-everywhere-src-5.15.2+kde1/tests/auto/qmltest/tst_scxmlqml.cpp new/qtscxml-everywhere-src-5.15.5+kde0/tests/auto/qmltest/tst_scxmlqml.cpp
--- old/qtscxml-everywhere-src-5.15.2+kde1/tests/auto/qmltest/tst_scxmlqml.cpp 1970-01-01 01:00:00.000000000 +0100
+++ new/qtscxml-everywhere-src-5.15.5+kde0/tests/auto/qmltest/tst_scxmlqml.cpp 2022-05-19 06:24:12.000000000 +0200
@@ -0,0 +1,30 @@
+/****************************************************************************
+**
+** Copyright (C) 2021 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the test suite 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$
+**
+****************************************************************************/
+
+#include <QtQuickTest/quicktest.h>
+QUICK_TEST_MAIN(tst_scxmlqml)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtscxml-everywhere-src-5.15.2+kde1/tests/auto/qmltest/tst_scxmlqml.qrc new/qtscxml-everywhere-src-5.15.5+kde0/tests/auto/qmltest/tst_scxmlqml.qrc
--- old/qtscxml-everywhere-src-5.15.2+kde1/tests/auto/qmltest/tst_scxmlqml.qrc 1970-01-01 01:00:00.000000000 +0100
+++ new/qtscxml-everywhere-src-5.15.5+kde0/tests/auto/qmltest/tst_scxmlqml.qrc 2022-05-19 06:24:12.000000000 +0200
@@ -0,0 +1,5 @@
+<RCC>
+ <qresource prefix="/">
+ <file>statemachine.scxml</file>
+ </qresource>
+</RCC>
++++++ qtscxml-everywhere-src.obsinfo ++++++
--- /var/tmp/diff_new_pack.BJ49xq/_old 2022-06-29 16:02:30.388714408 +0200
+++ /var/tmp/diff_new_pack.BJ49xq/_new 2022-06-29 16:02:30.392714413 +0200
@@ -1,6 +1,5 @@
name: qtscxml-everywhere-src
-version: 5.15.2+kde1
-mtime: 1603777786
-commit: 7a15000f42c7a3171719727cd056f82a78244ed7
-
+version: 5.15.5+kde0
+mtime: 1652934252
+commit: bb5d10f926c51aa462a56ffb331afd4f9607855c
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package libqt5-qtremoteobjects for openSUSE:Factory checked in at 2022-06-29 16:01:12
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libqt5-qtremoteobjects (Old)
and /work/SRC/openSUSE:Factory/.libqt5-qtremoteobjects.new.1548 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libqt5-qtremoteobjects"
Wed Jun 29 16:01:12 2022 rev:21 rq:985487 version:5.15.5+kde0
Changes:
--------
--- /work/SRC/openSUSE:Factory/libqt5-qtremoteobjects/libqt5-qtremoteobjects.changes 2021-06-26 21:25:40.171359661 +0200
+++ /work/SRC/openSUSE:Factory/.libqt5-qtremoteobjects.new.1548/libqt5-qtremoteobjects.changes 2022-06-29 16:02:28.292711618 +0200
@@ -1,0 +2,24 @@
+Mon Jun 27 13:10:12 UTC 2022 - Fabian Vogt <fabian(a)ritter-vogt.de>
+
+- Update to version 5.15.5+kde0, rebased upstream:
+ * Update the replica when the layoutChanged signal is emitted
+ * Simplify the FetchData test-helper class
+ * Fix an error in TestModelView::testDataRemoval test
+ * Simplify the WaitForDataChanged test-helper class
+ * Refactor the TestModelView test
+ * Add a helper class for waiting for model changes in tests
+ * Revert "Update commercial license headers"
+ * ExternalIODevice fixes
+ * Document the QtRemoteObjects namespace
+ * Regenerate certificates to match new macOS 10.15 restrictions
+ * Attempt to fix flaky test
+ * Try to stabilize flaky tests
+ * Migrate from old signal/slot connection syntax (part 2)
+ * Fix prefetching data for QAIM when no roles hint is provided
+ * Document the QtRemoteObjects::InitialAction enum and its usage
+ * Migrate from old signal/slot connection syntax
+ * tst_external_IODevice: skip the test for macOS 10.15
+ * Update commercial license headers
+- Drop 0001-Revert-Bump-version.patch, it's versioned correctly now
+
+-------------------------------------------------------------------
Old:
----
0001-Revert-Bump-version.patch
qtremoteobjects-everywhere-src-5.15.2+kde3.obscpio
New:
----
qtremoteobjects-everywhere-src-5.15.5+kde0.obscpio
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libqt5-qtremoteobjects.spec ++++++
--- /var/tmp/diff_new_pack.3zuLOU/_old 2022-06-29 16:02:28.936712475 +0200
+++ /var/tmp/diff_new_pack.3zuLOU/_new 2022-06-29 16:02:28.940712480 +0200
@@ -19,11 +19,11 @@
%define qt5_snapshot 1
%define libname libQt5RemoteObjects5
%define base_name libqt5
-%define real_version 5.15.2
-%define so_version 5.15.2
+%define real_version 5.15.5
+%define so_version 5.15.5
%define tar_version qtremoteobjects-everywhere-src-%{version}
Name: libqt5-qtremoteobjects
-Version: 5.15.2+kde3
+Version: 5.15.5+kde0
Release: 0
Summary: Qt 5 RemoteObjects Library
License: LGPL-3.0-only OR (GPL-2.0-only OR GPL-3.0-or-later)
@@ -31,8 +31,6 @@
Url: http://qt.io
Source: %{tar_version}.tar.xz
Source1: baselibs.conf
-# PATCH-FIX-OPENSUSE
-Patch1: 0001-Revert-Bump-version.patch
BuildRequires: libQt5Core-private-headers-devel >= %{real_version}
BuildRequires: libqt5-qtbase-devel >= %{real_version}
BuildRequires: xz
++++++ _service ++++++
--- /var/tmp/diff_new_pack.3zuLOU/_old 2022-06-29 16:02:28.968712518 +0200
+++ /var/tmp/diff_new_pack.3zuLOU/_new 2022-06-29 16:02:28.972712523 +0200
@@ -1,12 +1,12 @@
<services>
<service name="obs_scm" mode="disabled">
<param name="changesgenerate">enable</param>
- <param name="versionformat">5.15.2+kde@TAG_OFFSET@</param>
+ <param name="versionformat">5.15.5+kde@TAG_OFFSET@</param>
<param name="url">https://invent.kde.org/qt/qt/qtremoteobjects.git</param>
<param name="scm">git</param>
<param name="filename">qtremoteobjects-everywhere-src</param>
<param name="revision">kde/5.15</param>
- <param name="parent-tag">v5.15.2</param>
+ <param name="parent-tag">v5.15.5-lts-lgpl</param>
<param name="changesgenerate">enable</param>
</service>
<service name="set_version" mode="disabled"/>
++++++ qtremoteobjects-everywhere-src-5.15.2+kde3.obscpio -> qtremoteobjects-everywhere-src-5.15.5+kde0.obscpio ++++++
++++ 2956 lines of diff (skipped)
++++++ qtremoteobjects-everywhere-src.obsinfo ++++++
--- /var/tmp/diff_new_pack.3zuLOU/_old 2022-06-29 16:02:29.236712874 +0200
+++ /var/tmp/diff_new_pack.3zuLOU/_new 2022-06-29 16:02:29.240712879 +0200
@@ -1,6 +1,5 @@
name: qtremoteobjects-everywhere-src
-version: 5.15.2+kde3
-mtime: 1603952891
-commit: 4d6d1e35fb8e0cb900b5e5e9266edea51dc4f735
-
+version: 5.15.5+kde0
+mtime: 1652934018
+commit: 89407ff20e4f76314887e2f3625f5126910031ac
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package libqt5-qtquicktimeline for openSUSE:Factory checked in at 2022-06-29 16:01:11
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libqt5-qtquicktimeline (Old)
and /work/SRC/openSUSE:Factory/.libqt5-qtquicktimeline.new.1548 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libqt5-qtquicktimeline"
Wed Jun 29 16:01:11 2022 rev:7 rq:985486 version:5.15.5+kde0
Changes:
--------
--- /work/SRC/openSUSE:Factory/libqt5-qtquicktimeline/libqt5-qtquicktimeline.changes 2021-06-26 21:25:35.559353571 +0200
+++ /work/SRC/openSUSE:Factory/.libqt5-qtquicktimeline.new.1548/libqt5-qtquicktimeline.changes 2022-06-29 16:02:27.432710473 +0200
@@ -1,0 +2,9 @@
+Mon Jun 27 13:10:09 UTC 2022 - Fabian Vogt <fabian(a)ritter-vogt.de>
+
+- Update to version 5.15.5+kde0, rebased upstream:
+ * Revert "Update commercial license headers"
+ * Update commercial license headers
+ * Fix license header test
+- Drop 0001-Revert-Bump-version.patch, it's versioned correctly now
+
+-------------------------------------------------------------------
Old:
----
0001-Revert-Bump-version.patch
qtquicktimeline-everywhere-src-5.15.2+kde3.obscpio
New:
----
qtquicktimeline-everywhere-src-5.15.5+kde0.obscpio
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libqt5-qtquicktimeline.spec ++++++
--- /var/tmp/diff_new_pack.7GUwwA/_old 2022-06-29 16:02:27.996711224 +0200
+++ /var/tmp/diff_new_pack.7GUwwA/_new 2022-06-29 16:02:28.000711229 +0200
@@ -1,7 +1,7 @@
#
# spec file for package libqt5-qtquicktimeline
#
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -18,19 +18,17 @@
%define qt5_snapshot 1
Name: libqt5-qtquicktimeline
-Version: 5.15.2+kde3
+Version: 5.15.5+kde0
Release: 0
Summary: Qt 5 Quick Timeline Addon
License: GPL-3.0-or-later
Group: Development/Libraries/X11
URL: https://www.qt.io
%define base_name libqt5
-%define real_version 5.15.2
-%define so_version 5.15.2
+%define real_version 5.15.5
+%define so_version 5.15.5
%define tar_version qtquicktimeline-everywhere-src-%{version}
Source: %{tar_version}.tar.xz
-# PATCH-FIX-OPENSUSE
-Patch1: 0001-Revert-Bump-version.patch
BuildRequires: fdupes
BuildRequires: libqt5-qtdeclarative-private-headers-devel >= %{real_version}
%if %{qt5_snapshot}
++++++ _service ++++++
--- /var/tmp/diff_new_pack.7GUwwA/_old 2022-06-29 16:02:28.032711272 +0200
+++ /var/tmp/diff_new_pack.7GUwwA/_new 2022-06-29 16:02:28.036711276 +0200
@@ -1,12 +1,12 @@
<services>
<service name="obs_scm" mode="disabled">
<param name="changesgenerate">enable</param>
- <param name="versionformat">5.15.2+kde@TAG_OFFSET@</param>
+ <param name="versionformat">5.15.5+kde@TAG_OFFSET@</param>
<param name="url">https://invent.kde.org/qt/qt/qtquicktimeline.git</param>
<param name="scm">git</param>
<param name="filename">qtquicktimeline-everywhere-src</param>
<param name="revision">kde/5.15</param>
- <param name="parent-tag">v5.15.2</param>
+ <param name="parent-tag">v5.15.5-lts-lgpl</param>
<param name="changesgenerate">enable</param>
</service>
<service name="set_version" mode="disabled"/>
++++++ qtquicktimeline-everywhere-src-5.15.2+kde3.obscpio -> qtquicktimeline-everywhere-src-5.15.5+kde0.obscpio ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtquicktimeline-everywhere-src-5.15.2+kde3/.gitignore new/qtquicktimeline-everywhere-src-5.15.5+kde0/.gitignore
--- old/qtquicktimeline-everywhere-src-5.15.2+kde3/.gitignore 1970-01-01 01:00:00.000000000 +0100
+++ new/qtquicktimeline-everywhere-src-5.15.5+kde0/.gitignore 2022-06-02 22:30:25.000000000 +0200
@@ -0,0 +1,16 @@
+.DS_Store
+build*
+*.pro.*
+*.qmlproject.*
+.qmake.stash
+.qmake.cache
+*.autosave
+Makefile*
+/mkspecs*
+.moc/
+.pch/
+.obj/
+.rcc
+qmlplugindump_wrapper*
+Makefile
+*_resource.rc
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtquicktimeline-everywhere-src-5.15.2+kde3/.qmake.conf new/qtquicktimeline-everywhere-src-5.15.5+kde0/.qmake.conf
--- old/qtquicktimeline-everywhere-src-5.15.2+kde3/.qmake.conf 2020-12-23 09:12:04.000000000 +0100
+++ new/qtquicktimeline-everywhere-src-5.15.5+kde0/.qmake.conf 2022-06-02 22:30:25.000000000 +0200
@@ -2,6 +2,6 @@
CONFIG += warning_clean
DEFINES += QT_NO_FOREACH
-MODULE_VERSION = 5.15.3
+MODULE_VERSION = 5.15.5
CMAKE_MODULE_TESTS = -
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtquicktimeline-everywhere-src-5.15.2+kde3/tests/manual/timelineTestApp/main.cpp new/qtquicktimeline-everywhere-src-5.15.5+kde0/tests/manual/timelineTestApp/main.cpp
--- old/qtquicktimeline-everywhere-src-5.15.2+kde3/tests/manual/timelineTestApp/main.cpp 2020-12-23 09:12:04.000000000 +0100
+++ new/qtquicktimeline-everywhere-src-5.15.5+kde0/tests/manual/timelineTestApp/main.cpp 2022-06-02 22:30:25.000000000 +0200
@@ -1,7 +1,7 @@
/******************************************************************************
**
-** Copyright (C) 2018 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2021 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
**
** This file is part of the Qt Quick Timeline module of the Qt Toolkit.
**
@@ -12,8 +12,8 @@
** 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 http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
**
** $QT_END_LICENSE$
**
++++++ qtquicktimeline-everywhere-src.obsinfo ++++++
--- /var/tmp/diff_new_pack.7GUwwA/_old 2022-06-29 16:02:28.168711453 +0200
+++ /var/tmp/diff_new_pack.7GUwwA/_new 2022-06-29 16:02:28.168711453 +0200
@@ -1,6 +1,5 @@
name: qtquicktimeline-everywhere-src
-version: 5.15.2+kde3
-mtime: 1608711124
-commit: 67503cdadea43b95ddad0de1a04951aff0ce1a07
-
+version: 5.15.5+kde0
+mtime: 1654201825
+commit: 2da3c0efd5016bdba26b80789773238c2886fdf6
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package libqt5-qtquick3d for openSUSE:Factory checked in at 2022-06-29 16:01:06
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libqt5-qtquick3d (Old)
and /work/SRC/openSUSE:Factory/.libqt5-qtquick3d.new.1548 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libqt5-qtquick3d"
Wed Jun 29 16:01:06 2022 rev:8 rq:985483 version:5.15.5+kde1
Changes:
--------
--- /work/SRC/openSUSE:Factory/libqt5-qtquick3d/libqt5-qtquick3d.changes 2022-01-03 10:49:43.547587486 +0100
+++ /work/SRC/openSUSE:Factory/.libqt5-qtquick3d.new.1548/libqt5-qtquick3d.changes 2022-06-29 16:02:23.748705569 +0200
@@ -1,0 +2,20 @@
+Mon Jun 27 13:12:43 UTC 2022 - Fabian Vogt <fabian(a)ritter-vogt.de>
+
+- Update to version 5.15.5+kde1, rebased upstream:
+ * Handle 1bpp images in texture loading
+ * Handle opacityMap with NoLighting
+ * Add more error checking for shader cache import
+ * Make IdComboBox compatible with both Qt6 and Qt5 creator
+ * Fix writing compressed shader cache data
+ * Introduce some civilization to QQuick3DShaderUtilsRenderPass::m_shaders
+ * Fix bounds for imported objects
+ * Check if sceneBounds is finite
+ * Revert "Update commercial license headers"
+ * Update designer light icons
+ * Update commercial license headers
+ * Remove shader cache export restriction
+ * Allow import/export of shader cache data
+ * Disable to use the system assimp when static-build
+- Drop 0001-Revert-Bump-version.patch, it's versioned correctly now
+
+-------------------------------------------------------------------
Old:
----
0001-Revert-Bump-version.patch
qtquick3d-everywhere-src-5.15.2+kde19.obscpio
New:
----
qtquick3d-everywhere-src-5.15.5+kde1.obscpio
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libqt5-qtquick3d.spec ++++++
--- /var/tmp/diff_new_pack.QHlyBb/_old 2022-06-29 16:02:27.208710175 +0200
+++ /var/tmp/diff_new_pack.QHlyBb/_new 2022-06-29 16:02:27.212710180 +0200
@@ -1,7 +1,7 @@
#
# spec file for package libqt5-qtquick3d
#
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -26,11 +26,11 @@
%define qt5_snapshot 1
%define base_name libqt5
-%define real_version 5.15.2
-%define so_version 5.15.2
+%define real_version 5.15.5
+%define so_version 5.15.5
%define tar_version qtquick3d-everywhere-src-%{version}
Name: libqt5-qtquick3d
-Version: 5.15.2+kde19
+Version: 5.15.5+kde1
Release: 0
Summary: Qt 5 Quick 3D Module
License: GPL-3.0-or-later
@@ -39,8 +39,6 @@
Source: %{tar_version}.tar.xz
# PATCH-FIX-UPSTREAM
Patch0: qt5-quick3d-assimp-5.1.patch
-# PATCH-FIX-OPENSUSE
-Patch1: 0001-Revert-Bump-version.patch
BuildRequires: fdupes
%if %{with system_assimp}
BuildRequires: pkgconfig(assimp) >= 5.0.0
++++++ _service ++++++
--- /var/tmp/diff_new_pack.QHlyBb/_old 2022-06-29 16:02:27.248710228 +0200
+++ /var/tmp/diff_new_pack.QHlyBb/_new 2022-06-29 16:02:27.248710228 +0200
@@ -1,12 +1,12 @@
<services>
<service name="obs_scm" mode="disabled">
<param name="changesgenerate">enable</param>
- <param name="versionformat">5.15.2+kde@TAG_OFFSET@</param>
+ <param name="versionformat">5.15.5+kde@TAG_OFFSET@</param>
<param name="url">https://invent.kde.org/qt/qt/qtquick3d.git</param>
<param name="scm">git</param>
<param name="filename">qtquick3d-everywhere-src</param>
<param name="revision">kde/5.15</param>
- <param name="parent-tag">v5.15.2</param>
+ <param name="parent-tag">v5.15.5-lts-lgpl</param>
<param name="changesgenerate">enable</param>
</service>
<service name="set_version" mode="disabled"/>
++++++ qtquick3d-everywhere-src-5.15.2+kde19.obscpio -> qtquick3d-everywhere-src-5.15.5+kde1.obscpio ++++++
/work/SRC/openSUSE:Factory/libqt5-qtquick3d/qtquick3d-everywhere-src-5.15.2+kde19.obscpio /work/SRC/openSUSE:Factory/.libqt5-qtquick3d.new.1548/qtquick3d-everywhere-src-5.15.5+kde1.obscpio differ: char 8, line 1
++++++ qtquick3d-everywhere-src.obsinfo ++++++
--- /var/tmp/diff_new_pack.QHlyBb/_old 2022-06-29 16:02:27.300710297 +0200
+++ /var/tmp/diff_new_pack.QHlyBb/_new 2022-06-29 16:02:27.304710303 +0200
@@ -1,6 +1,5 @@
name: qtquick3d-everywhere-src
-version: 5.15.2+kde19
-mtime: 1622888767
-commit: 3e3e53c834b25dc2959dd30f319d12d6f84ee1e3
-
+version: 5.15.5+kde1
+mtime: 1655461380
+commit: 1a8736a5834492aa8b7fc2dbc59a1eb4420a7330
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package libqt5-qtlottie for openSUSE:Factory checked in at 2022-06-29 16:01:05
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libqt5-qtlottie (Old)
and /work/SRC/openSUSE:Factory/.libqt5-qtlottie.new.1548 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libqt5-qtlottie"
Wed Jun 29 16:01:05 2022 rev:7 rq:985480 version:5.15.5+kde0
Changes:
--------
--- /work/SRC/openSUSE:Factory/libqt5-qtlottie/libqt5-qtlottie.changes 2021-06-26 21:25:28.071343683 +0200
+++ /work/SRC/openSUSE:Factory/.libqt5-qtlottie.new.1548/libqt5-qtlottie.changes 2022-06-29 16:02:22.860704387 +0200
@@ -1,0 +2,8 @@
+Mon Jun 27 13:09:44 UTC 2022 - Fabian Vogt <fabian(a)ritter-vogt.de>
+
+- Update to version 5.15.5+kde0, rebased upstream:
+ * Revert "Update commercial license headers"
+ * Update commercial license headers
+- Drop 0001-Revert-Bump-version.patch, it's versioned correctly now
+
+-------------------------------------------------------------------
Old:
----
0001-Revert-Bump-version.patch
qtlottie-everywhere-src-5.15.2+kde1.obscpio
New:
----
qtlottie-everywhere-src-5.15.5+kde0.obscpio
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libqt5-qtlottie.spec ++++++
--- /var/tmp/diff_new_pack.oEGKbW/_old 2022-06-29 16:02:23.408705117 +0200
+++ /var/tmp/diff_new_pack.oEGKbW/_new 2022-06-29 16:02:23.412705122 +0200
@@ -1,7 +1,7 @@
#
# spec file for package libqt5-qtlottie
#
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -18,19 +18,17 @@
%define qt5_snapshot 1
Name: libqt5-qtlottie
-Version: 5.15.2+kde1
+Version: 5.15.5+kde0
Release: 0
Summary: Qt 5 Quick Lottie Addon
License: GPL-3.0-or-later
Group: Development/Libraries/X11
URL: https://www.qt.io
%define base_name libqt5
-%define real_version 5.15.2
-%define so_version 5.15.2
+%define real_version 5.15.5
+%define so_version 5.15.5
%define tar_version qtlottie-everywhere-src-%{version}
Source: %{tar_version}.tar.xz
-# PATCH-FIX-OPENSUSE
-Patch1: 0001-Revert-Bump-version.patch
BuildRequires: fdupes
BuildRequires: libQt5Gui-private-headers-devel >= %{real_version}
%if %{qt5_snapshot}
++++++ _service ++++++
--- /var/tmp/diff_new_pack.oEGKbW/_old 2022-06-29 16:02:23.440705159 +0200
+++ /var/tmp/diff_new_pack.oEGKbW/_new 2022-06-29 16:02:23.444705165 +0200
@@ -1,12 +1,12 @@
<services>
<service name="obs_scm" mode="disabled">
<param name="changesgenerate">enable</param>
- <param name="versionformat">5.15.2+kde@TAG_OFFSET@</param>
+ <param name="versionformat">5.15.5+kde@TAG_OFFSET@</param>
<param name="url">https://invent.kde.org/qt/qt/qtlottie.git</param>
<param name="scm">git</param>
<param name="filename">qtlottie-everywhere-src</param>
<param name="revision">kde/5.15</param>
- <param name="parent-tag">v5.15.2</param>
+ <param name="parent-tag">v5.15.5-lts-lgpl</param>
<param name="changesgenerate">enable</param>
</service>
<service name="set_version" mode="disabled"/>
++++++ qtlottie-everywhere-src-5.15.2+kde1.obscpio -> qtlottie-everywhere-src-5.15.5+kde0.obscpio ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlottie-everywhere-src-5.15.2+kde1/.gitignore new/qtlottie-everywhere-src-5.15.5+kde0/.gitignore
--- old/qtlottie-everywhere-src-5.15.2+kde1/.gitignore 1970-01-01 01:00:00.000000000 +0100
+++ new/qtlottie-everywhere-src-5.15.5+kde0/.gitignore 2022-05-16 17:16:43.000000000 +0200
@@ -0,0 +1,73 @@
+# This file is used to ignore files which are generated
+# ----------------------------------------------------------------------------
+
+*~
+*.autosave
+*.a
+*.core
+*.moc
+*.o
+*.obj
+*.orig
+*.rej
+*.so
+*.so.*
+*_pch.h.cpp
+*_resource.rc
+*.qm
+.#*
+*.*#
+core
+!core/
+tags
+.DS_Store
+.directory
+*.debug
+Makefile*
+*.prl
+*.app
+moc_*.cpp
+ui_*.h
+qrc_*.cpp
+Thumbs.db
+*.res
+*.rc
+/.qmake.cache
+/.qmake.stash
+
+# qtcreator generated files
+*.pro.user*
+
+# xemacs temporary files
+*.flc
+
+# Vim temporary files
+.*.swp
+
+# Visual Studio generated files
+*.ib_pdb_index
+*.idb
+*.ilk
+*.pdb
+*.sln
+*.suo
+*.vcproj
+*vcproj.*.*.user
+*.ncb
+*.sdf
+*.opensdf
+*.vcxproj
+*vcxproj.*
+
+# MinGW generated files
+*.Debug
+*.Release
+
+# Python byte code
+*.pyc
+
+# Binaries
+# --------
+*.dll
+*.exe
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtlottie-everywhere-src-5.15.2+kde1/.qmake.conf new/qtlottie-everywhere-src-5.15.5+kde0/.qmake.conf
--- old/qtlottie-everywhere-src-5.15.2+kde1/.qmake.conf 2020-10-27 06:49:57.000000000 +0100
+++ new/qtlottie-everywhere-src-5.15.5+kde0/.qmake.conf 2022-05-16 17:16:43.000000000 +0200
@@ -3,4 +3,4 @@
DEFINES += QT_NO_FOREACH QT_NO_JAVA_STYLE_ITERATORS QT_NO_LINKED_LIST
-MODULE_VERSION = 5.15.3
+MODULE_VERSION = 5.15.5
++++++ qtlottie-everywhere-src.obsinfo ++++++
--- /var/tmp/diff_new_pack.oEGKbW/_old 2022-06-29 16:02:23.628705409 +0200
+++ /var/tmp/diff_new_pack.oEGKbW/_new 2022-06-29 16:02:23.632705414 +0200
@@ -1,6 +1,5 @@
name: qtlottie-everywhere-src
-version: 5.15.2+kde1
-mtime: 1603777797
-commit: fa8c8bfc6742ab98b61d1351e054e0e73e9a42f4
-
+version: 5.15.5+kde0
+mtime: 1652714203
+commit: 4b3d1e824fdde2c835041464a9f85feaed0b313d
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package libqt5-qtgamepad for openSUSE:Factory checked in at 2022-06-29 16:01:04
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libqt5-qtgamepad (Old)
and /work/SRC/openSUSE:Factory/.libqt5-qtgamepad.new.1548 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libqt5-qtgamepad"
Wed Jun 29 16:01:04 2022 rev:20 rq:985476 version:5.15.5+kde0
Changes:
--------
--- /work/SRC/openSUSE:Factory/libqt5-qtgamepad/libqt5-qtgamepad.changes 2021-10-16 22:48:17.600724940 +0200
+++ /work/SRC/openSUSE:Factory/.libqt5-qtgamepad.new.1548/libqt5-qtgamepad.changes 2022-06-29 16:02:21.848703040 +0200
@@ -1,0 +2,8 @@
+Mon Jun 27 13:09:23 UTC 2022 - Fabian Vogt <fabian(a)ritter-vogt.de>
+
+- Update to version 5.15.5+kde0, rebased upstream:
+ * Revert "Update commercial license headers"
+ * Update commercial license headers
+- Drop 0001-Revert-Bump-version.patch, it's versioned correctly now
+
+-------------------------------------------------------------------
Old:
----
0001-Revert-Bump-version.patch
qtgamepad-everywhere-src-5.15.2+kde2.obscpio
New:
----
qtgamepad-everywhere-src-5.15.5+kde0.obscpio
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libqt5-qtgamepad.spec ++++++
--- /var/tmp/diff_new_pack.NNaw4G/_old 2022-06-29 16:02:22.524703940 +0200
+++ /var/tmp/diff_new_pack.NNaw4G/_new 2022-06-29 16:02:22.532703951 +0200
@@ -19,11 +19,11 @@
%define qt5_snapshot 1
%define libname libQt5Gamepad5
%define base_name libqt5
-%define real_version 5.15.2
-%define so_version 5.15.2
+%define real_version 5.15.5
+%define so_version 5.15.5
%define tar_version qtgamepad-everywhere-src-%{version}
Name: libqt5-qtgamepad
-Version: 5.15.2+kde2
+Version: 5.15.5+kde0
Release: 0
Summary: Qt 5 Gamepad Library
License: LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-or-later
@@ -31,8 +31,6 @@
URL: https://qt.io
Source: %{tar_version}.tar.xz
Source1: baselibs.conf
-# PATCH-FIX-OPENSUSE
-Patch1: 0001-Revert-Bump-version.patch
BuildRequires: libQt5Core-private-headers-devel >= %{real_version}
BuildRequires: libQt5PlatformSupport-devel-static >= %{real_version}
BuildRequires: libQt5PlatformSupport-private-headers-devel >= %{real_version}
++++++ _service ++++++
--- /var/tmp/diff_new_pack.NNaw4G/_old 2022-06-29 16:02:22.568703998 +0200
+++ /var/tmp/diff_new_pack.NNaw4G/_new 2022-06-29 16:02:22.572704004 +0200
@@ -1,12 +1,12 @@
<services>
<service name="obs_scm" mode="disabled">
<param name="changesgenerate">enable</param>
- <param name="versionformat">5.15.2+kde@TAG_OFFSET@</param>
+ <param name="versionformat">5.15.5+kde@TAG_OFFSET@</param>
<param name="url">https://invent.kde.org/qt/qt/qtgamepad.git</param>
<param name="scm">git</param>
<param name="filename">qtgamepad-everywhere-src</param>
<param name="revision">kde/5.15</param>
- <param name="parent-tag">v5.15.2</param>
+ <param name="parent-tag">v5.15.5-lts-lgpl</param>
<param name="changesgenerate">enable</param>
</service>
<service name="set_version" mode="disabled"/>
++++++ qtgamepad-everywhere-src-5.15.2+kde2.obscpio -> qtgamepad-everywhere-src-5.15.5+kde0.obscpio ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtgamepad-everywhere-src-5.15.2+kde2/.gitignore new/qtgamepad-everywhere-src-5.15.5+kde0/.gitignore
--- old/qtgamepad-everywhere-src-5.15.2+kde2/.gitignore 1970-01-01 01:00:00.000000000 +0100
+++ new/qtgamepad-everywhere-src-5.15.5+kde0/.gitignore 2022-05-16 17:16:39.000000000 +0200
@@ -0,0 +1,329 @@
+# This file is used to ignore files which are generated in the Qt build system
+# ----------------------------------------------------------------------------
+
+examples/*/*/*
+!examples/*/*/*[.]*
+!examples/*/*/README
+!examples/*/doc/*
+!examples/*/doc/*/*
+examples/*/*/*[.]app
+!examples/declarative/*
+examples/tutorials/*/*/*
+!examples/tutorials/*/*/*[.]*
+!examples/tutorials/*/*/README
+!examples/tutorials/*
+!examples/tutorials/*/*
+!examples/ja_JP/*/*
+!examples/*/*/qml/*
+demos/*/*
+!demos/spectrum/*
+demos/spectrum/bin
+!demos/*/*[.]*
+demos/*/*[.]app
+!demos/declarative/*
+config.tests/*/*/*
+!config.tests/*/*/*[.]*
+config.tests/*/*/*[.]app
+
+callgrind.out.*
+pcviewer.cfg
+*~
+*.a
+*.la
+*.core
+*.d
+*.dylib
+*.moc
+*.o
+*.obj
+*.orig
+*.swp
+*.rej
+*.so
+*.so.*
+*.pbxuser
+*.mode1
+*.mode1v3
+*_pch.h.cpp
+*_resource.rc
+.#*
+*.*#
+core
+.qmake.cache
+.qmake.vars
+.device.vars
+*.prl
+tags
+.DS_Store
+*.debug
+Makefile*
+!qmake/Makefile.win32*
+!qmake/Makefile.unix
+*.prl
+*.app
+*.pro.user*
+*.qmlproject.user*
+*.gcov
+*.gcda
+*.gcno
+bin/*.dll
+bin/assistant*
+bin/designer*
+bin/dumpcpp*
+bin/idc*
+bin/jsondb*
+bin/linguist*
+bin/lrelease*
+bin/lupdate*
+bin/lconvert*
+bin/moc*
+bin/makeqpf*
+bin/pixeltool*
+bin/qmake*
+bin/qdoc*
+bin/qt3to4*
+bin/qttracereplay*
+bin/rcc*
+bin/uic*
+bin/patternist*
+bin/phonon*
+bin/qcollectiongenerator*
+bin/qdbus*
+bin/qhelpconverter*
+bin/qhelpgenerator*
+bin/qglinfo*
+bin/qtconfig*
+bin/xmlpatterns*
+bin/cetest*
+bin/collectiongenerator
+bin/helpconverter
+bin/helpgenerator
+bin/kmap2qmap*
+bin/qlalr*
+bin/qmlconv*
+bin/qmldebugger*
+bin/qml*
+bin/qttracereplay*
+bin/qt.conf
+bin/servicefw*
+bin/sfwlisten*
+configure.cache
+config.status
+config.summary
+mkspecs/default
+mkspecs/default-host
+mkspecs/qconfig.pri
+mkspecs/qdevice.pri
+mkspecs/qfeatures.pri
+moc_*.cpp
+qmake/qmake.exe
+qmake/Makefile.bak
+qmake/qmake_pch.pch
+src/corelib/global/qconfig.cpp
+src/corelib/global/qconfig.h
+src/corelib/global/qconfig.h.qmake
+src/corelib/global/qfeatures.h
+src/platformsupport/*_interface.*
+src/platformsupport/*_adaptor.*
+ui_*.h
+tests/auto/qprocess/test*/*.exe
+tests/auto/qtcpsocket/stressTest/*.exe
+tests/auto/qprocess/fileWriterProcess/*.exe
+tests/auto/qmake/testdata/quotedfilenames/*.exe
+tests/auto/compilerwarnings/*.exe
+tests/auto/qmake/testdata/quotedfilenames/test.cpp
+tests/auto/qprocess/fileWriterProcess.txt
+tests/auto/corelib/mimetypes/qmimedatabase/qmimedatabase-cache/mime/
+tests/auto/corelib/mimetypes/qmimedatabase/qmimedatabase-xml/mime/
+.com.apple.timemachine.supported
+tests/auto/qlibrary/libmylib.so*
+tests/auto/qresourceengine/runtime_resource.rcc
+tools/activeqt/testcon/testcon.tlb
+translations/*.qm
+translations/*_untranslated.ts
+qrc_*.cpp
+
+# Test generated files
+QObject.log
+tst_*
+!tst_*.*
+tst_*.log
+tst_*.debug
+tst_*~
+tests/auto/cmake/build
+
+# xemacs temporary files
+*.flc
+
+# Vim temporary files
+.*.swp
+
+# Visual Studio generated files
+*.ib_pdb_index
+*.idb
+*.ilk
+*.pdb
+*.sln
+*.suo
+*.vcproj
+*vcproj.*.*.user
+*.ncb
+*.vcxproj
+*.vcxproj.filters
+*.vcxproj.user
+*.exe.embed.manifest
+*.exe_manifest.rc
+*.exe_manifest.res
+
+# MinGW generated files
+*.Debug
+*.Release
+
+# WebKit temp files
+src/3rdparty/webkit/WebCore/mocinclude.tmp
+src/3rdparty/webkit/includes.txt
+src/3rdparty/webkit/includes2.txt
+
+# generated files in configure.exe bootstrapping
+tools/configure/configure.intermediate.manifest
+tools/configure/configure_pch.pch
+/configure.exe
+
+# Symlinks generated by configure
+tools/qvfb/qvfbhdr.h
+tools/qvfb/qlock_p.h
+tools/qvfb/qlock.cpp
+tools/qvfb/qwssignalhandler.cpp
+tools/qvfb/qwssignalhandler_p.h
+.DS_Store
+.pch
+.rcc
+*.app
+config.status
+config.tests/unix/cups/cups
+config.tests/unix/getaddrinfo/getaddrinfo
+config.tests/unix/getifaddrs/getifaddrs
+config.tests/unix/iconv/iconv
+config.tests/unix/ipv6/ipv6
+config.tests/unix/ipv6ifname/ipv6ifname
+config.tests/unix/largefile/largefile
+config.tests/unix/nis/nis
+config.tests/unix/odbc/odbc
+config.tests/unix/openssl/openssl
+config.tests/unix/stl/stl
+config.tests/unix/zlib/zlib
+config.tests/unix/3dnow/3dnow
+config.tests/unix/mmx/mmx
+config.tests/unix/sse/sse
+config.tests/unix/sse2/sse2
+
+
+
+# Directories to ignore
+# ---------------------
+
+debug
+examples/tools/plugandpaint/plugins
+include/*
+include/*/*
+lib/*
+imports/*
+!lib/fonts
+!lib/README
+plugins/*/*
+release
+tmp
+doc-build
+doc/html/*
+doc/qt*/*
+doc/qch
+doc-build
+.rcc
+.pch
+.metadata
+tmp-debug
+tmp-debug-shared
+tmp-release
+tmp-release-shared
+
+qtc-debugging-helper
+qtc-qmldump
+qtc-qmldbg
+src/corelib/lib
+src/network/lib
+src/xml/lib/
+
+.pc/
+
+# INTEGRITY generated files
+*.gpj
+*.int
+*.ael
+*.dla
+*.dnm
+*.dep
+*.map
+work
+
+
+#generated module def and version header files
+mkspecs/modules/qt_*.pri
+mkspecs/modules-inst/
+mkspecs/qmodule.pri
+
+#unit tests libs/plugins
+tests/auto/corelib/plugin/qlibrary/libmylib.so2
+tests/auto/corelib/plugin/qlibrary/mylib.dl2
+
+#unit tests executables (other than those named tst_*)
+tests/auto/testlib/selftests/assert/assert
+tests/auto/testlib/selftests/badxml/badxml
+tests/auto/testlib/selftests/benchlibcallgrind/benchlibcallgrind
+tests/auto/testlib/selftests/benchlibeventcounter/benchlibeventcounter
+tests/auto/testlib/selftests/benchliboptions/benchliboptions
+tests/auto/testlib/selftests/benchlibtickcounter/benchlibtickcounter
+tests/auto/testlib/selftests/benchlibwalltime/benchlibwalltime
+tests/auto/testlib/selftests/cmptest/cmptest
+tests/auto/testlib/selftests/commandlinedata/commandlinedata
+tests/auto/testlib/selftests/crashes/crashes
+tests/auto/testlib/selftests/datatable/datatable
+tests/auto/testlib/selftests/datetime/datetime
+tests/auto/testlib/selftests/differentexec/differentexec
+tests/auto/testlib/selftests/exceptionthrow/exceptionthrow
+tests/auto/testlib/selftests/expectfail/expectfail
+tests/auto/testlib/selftests/failinit/failinit
+tests/auto/testlib/selftests/failinitdata/failinitdata
+tests/auto/testlib/selftests/fetchbogus/fetchbogus
+tests/auto/testlib/selftests/float/float
+tests/auto/testlib/selftests/globaldata/globaldata
+tests/auto/testlib/selftests/longstring/longstring
+tests/auto/testlib/selftests/maxwarnings/maxwarnings
+tests/auto/testlib/selftests/multiexec/multiexec
+tests/auto/testlib/selftests/qexecstringlist/qexecstringlist
+tests/auto/testlib/selftests/singleskip/singleskip
+tests/auto/testlib/selftests/skip/skip
+tests/auto/testlib/selftests/skipglobal/skipglobal
+tests/auto/testlib/selftests/skipinit/skipinit
+tests/auto/testlib/selftests/skipinitdata/skipinitdata
+tests/auto/testlib/selftests/sleep/sleep
+tests/auto/testlib/selftests/strcmp/strcmp
+tests/auto/testlib/selftests/subtest/subtest
+tests/auto/testlib/selftests/waitwithoutgui/waitwithoutgui
+tests/auto/testlib/selftests/warnings/warnings
+tests/auto/testlib/selftests/xunit/xunit
+tests/auto/corelib/thread/qthreadstorage/crashOnExit
+tests/auto/corelib/io/qresourceengine/qresourceengine
+tests/auto/corelib/codecs/qtextcodec/echo/echo
+tests/auto/corelib/plugin/quuid/testProcessUniqueness/testProcessUniqueness
+tests/auto/corelib/io/qlockfile/qlockfiletesthelper/qlockfile_test_helper
+tests/auto/corelib/tools/qcommandlineparser/testhelper/qcommandlineparser_test_helper
+tests/auto/dbus/qdbusabstractadaptor/qmyserver/qmyserver
+tests/auto/dbus/qdbusabstractinterface/qpinger/qpinger
+tests/auto/dbus/qdbusabstractinterface/test/pinger_interface.*
+tests/auto/dbus/qdbusinterface/qmyserver/qmyserver
+tests/auto/gui/kernel/qfileopenevent/qfileopeneventexternal/qfileopeneventexternal
+tests/auto/network/bearer/qnetworksession/lackey/lackey
+tests/auto/widgets/kernel/qapplication/modal/modal
+
+# Generated static plugin import sources
+*_plugin_import.cpp
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtgamepad-everywhere-src-5.15.2+kde2/.qmake.conf new/qtgamepad-everywhere-src-5.15.5+kde0/.qmake.conf
--- old/qtgamepad-everywhere-src-5.15.2+kde2/.qmake.conf 2020-10-28 12:11:21.000000000 +0100
+++ new/qtgamepad-everywhere-src-5.15.5+kde0/.qmake.conf 2022-05-16 17:16:39.000000000 +0200
@@ -3,4 +3,4 @@
CONFIG += warning_clean
DEFINES += QT_NO_FOREACH
-MODULE_VERSION = 5.15.3
+MODULE_VERSION = 5.15.5
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtgamepad-everywhere-src-5.15.2+kde2/0001-Revert-Bump-version.patch new/qtgamepad-everywhere-src-5.15.5+kde0/0001-Revert-Bump-version.patch
--- old/qtgamepad-everywhere-src-5.15.2+kde2/0001-Revert-Bump-version.patch 2020-10-28 12:11:21.000000000 +0100
+++ new/qtgamepad-everywhere-src-5.15.5+kde0/0001-Revert-Bump-version.patch 1970-01-01 01:00:00.000000000 +0100
@@ -1,23 +0,0 @@
-From ee6f6601f0f334ae08ebb59dc4d1d62b660c7b27 Mon Sep 17 00:00:00 2001
-From: Fabian Vogt <fvogt(a)suse.de>
-Date: Tue, 22 Jun 2021 21:33:30 +0200
-Subject: [PATCH] Revert "Bump version"
-
-This reverts commit fa85943ea52625204606a069094a651504e5037c.
----
- .qmake.conf | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/.qmake.conf b/.qmake.conf
-index bbf484f..ba84e23 100644
---- a/.qmake.conf
-+++ b/.qmake.conf
-@@ -3,4 +3,4 @@ load(qt_build_config)
- CONFIG += warning_clean
- DEFINES += QT_NO_FOREACH
-
--MODULE_VERSION = 5.15.3
-+MODULE_VERSION = 5.15.2
---
-2.20.1
-
++++++ qtgamepad-everywhere-src.obsinfo ++++++
--- /var/tmp/diff_new_pack.NNaw4G/_old 2022-06-29 16:02:22.752704243 +0200
+++ /var/tmp/diff_new_pack.NNaw4G/_new 2022-06-29 16:02:22.756704249 +0200
@@ -1,6 +1,5 @@
name: qtgamepad-everywhere-src
-version: 5.15.2+kde2
-mtime: 1603883481
-commit: 64afa18a0a1e9588060e2e6d917bb01ccdd48a81
-
+version: 5.15.5+kde0
+mtime: 1652714199
+commit: 5107ddf28177112cdbf505f92bb4191a91e6521a
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package libqt5-qtdoc for openSUSE:Factory checked in at 2022-06-29 16:01:04
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libqt5-qtdoc (Old)
and /work/SRC/openSUSE:Factory/.libqt5-qtdoc.new.1548 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libqt5-qtdoc"
Wed Jun 29 16:01:04 2022 rev:44 rq:985475 version:5.15.5
Changes:
--------
--- /work/SRC/openSUSE:Factory/libqt5-qtdoc/libqt5-qtdoc.changes 2022-01-14 23:13:52.802656522 +0100
+++ /work/SRC/openSUSE:Factory/.libqt5-qtdoc.new.1548/libqt5-qtdoc.changes 2022-06-29 16:02:07.532683983 +0200
@@ -1,0 +2,11 @@
+Mon Jun 27 12:50:15 UTC 2022 - Fabian Vogt <fvogt(a)suse.com>
+
+- Update to 5.15.5:
+ * See individual module packages for changelogs
+- Drop patches, now upstream:
+ * 0001-Fix-build-with-GCC-11-include-limits.patch
+- Rebase patches:
+ * 0002-Build-fixes-for-GCC-11.patch
+ * 0001-Partially-revert-813a928c7c3cf98670b6043149880ed5c95.patch
+
+-------------------------------------------------------------------
Old:
----
0001-Fix-build-with-GCC-11-include-limits.patch
qt-everywhere-src-5.15.2.tar.xz
New:
----
qt-everywhere-opensource-src-5.15.5.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libqt5-qtdoc.spec ++++++
--- /var/tmp/diff_new_pack.F8qLPx/_old 2022-06-29 16:02:21.600702710 +0200
+++ /var/tmp/diff_new_pack.F8qLPx/_new 2022-06-29 16:02:21.604702715 +0200
@@ -17,10 +17,10 @@
# nodebuginfo
-%define real_version 5.15.2
-%define tar_version qt-everywhere-src-5.15.2
+%define real_version 5.15.5
+%define tar_version qt-everywhere-opensource-src-5.15.5
Name: libqt5-qtdoc
-Version: 5.15.2
+Version: 5.15.5
Release: 0
Summary: Qt 5 API Documentation
License: LGPL-2.1-with-Qt-Company-Qt-exception-1.1 or LGPL-3.0-only
@@ -28,7 +28,6 @@
URL: https://www.qt.io
Source: https://download.qt.io/official_releases/qt/5.15/%{real_version}/single/%{t…
# PATCH-FIX-UPSTREAM
-Patch1: 0001-Fix-build-with-GCC-11-include-limits.patch
Patch2: 0002-Build-fixes-for-GCC-11.patch
Patch3: 0001-Partially-revert-813a928c7c3cf98670b6043149880ed5c95.patch
# Breaks make_jobs
@@ -126,8 +125,7 @@
required.
%prep
-%setup -q -n %{tar_version}
-%autopatch -p1
+%autosetup -p1 -n qt-everywhere-src-%{version}
%build
# We need to link to some of the programs used as that the source assumes they were just built.
++++++ 0001-Partially-revert-813a928c7c3cf98670b6043149880ed5c95.patch ++++++
--- /var/tmp/diff_new_pack.F8qLPx/_old 2022-06-29 16:02:21.628702747 +0200
+++ /var/tmp/diff_new_pack.F8qLPx/_new 2022-06-29 16:02:21.632702752 +0200
@@ -13,10 +13,10 @@
src/corelib/tools/qsharedpointer_impl.h | 3 +++
1 file changed, 3 insertions(+)
-diff --git a/qtbase/src/corelib/tools/qsharedpointer_impl.h b/qtbase/src/corelib/tools/qsharedpointer_impl.h
-index 4aee98af53..790c187cb9 100644
---- a/qtbase/src/corelib/tools/qsharedpointer_impl.h
-+++ b/qtbase/src/corelib/tools/qsharedpointer_impl.h
+Index: qt-everywhere-src-5.15.5/qtbase/src/corelib/tools/qsharedpointer_impl.h
+===================================================================
+--- qt-everywhere-src-5.15.5.orig/qtbase/src/corelib/tools/qsharedpointer_impl.h
++++ qt-everywhere-src-5.15.5/qtbase/src/corelib/tools/qsharedpointer_impl.h
@@ -155,6 +155,9 @@ namespace QtSharedPointer {
#endif
inline void checkQObjectShared(...) { }
@@ -27,7 +27,4 @@
};
// sizeof(ExternalRefCountData) = 12 (32-bit) / 16 (64-bit)
---
-2.25.1
-
++++++ 0002-Build-fixes-for-GCC-11.patch ++++++
--- /var/tmp/diff_new_pack.F8qLPx/_old 2022-06-29 16:02:21.652702779 +0200
+++ /var/tmp/diff_new_pack.F8qLPx/_new 2022-06-29 16:02:21.652702779 +0200
@@ -14,23 +14,10 @@
src/plugins/platforms/xcb/qxcbwindow.cpp | 2 +-
3 files changed, 3 insertions(+), 4 deletions(-)
-diff --git a/qtbase/src/corelib/text/qbytearraymatcher.h b/qtbase/src/corelib/text/qbytearraymatcher.h
-index 0eedfc1d20..f5f9bef7b8 100644
---- a/qtbase/src/corelib/text/qbytearraymatcher.h
-+++ b/qtbase/src/corelib/text/qbytearraymatcher.h
-@@ -42,6 +42,8 @@
-
- #include <QtCore/qbytearray.h>
-
-+#include <limits>
-+
- QT_BEGIN_NAMESPACE
-
-
-diff --git a/qtbase/src/corelib/tools/qsharedpointer_impl.h b/qtbase/src/corelib/tools/qsharedpointer_impl.h
-index 790c187cb9..4aee98af53 100644
---- a/qtbase/src/corelib/tools/qsharedpointer_impl.h
-+++ b/qtbase/src/corelib/tools/qsharedpointer_impl.h
+Index: qt-everywhere-src-5.15.5/qtbase/src/corelib/tools/qsharedpointer_impl.h
+===================================================================
+--- qt-everywhere-src-5.15.5.orig/qtbase/src/corelib/tools/qsharedpointer_impl.h
++++ qt-everywhere-src-5.15.5/qtbase/src/corelib/tools/qsharedpointer_impl.h
@@ -155,9 +155,6 @@ namespace QtSharedPointer {
#endif
inline void checkQObjectShared(...) { }
@@ -41,10 +28,10 @@
};
// sizeof(ExternalRefCountData) = 12 (32-bit) / 16 (64-bit)
-diff --git a/qtbase/src/plugins/platforms/xcb/qxcbwindow.cpp b/qtbase/src/plugins/platforms/xcb/qxcbwindow.cpp
-index 9e7e1a5572..f0866a90ac 100644
---- a/qtbase/src/plugins/platforms/xcb/qxcbwindow.cpp
-+++ b/qtbase/src/plugins/platforms/xcb/qxcbwindow.cpp
+Index: qt-everywhere-src-5.15.5/qtbase/src/plugins/platforms/xcb/qxcbwindow.cpp
+===================================================================
+--- qt-everywhere-src-5.15.5.orig/qtbase/src/plugins/platforms/xcb/qxcbwindow.cpp
++++ qt-everywhere-src-5.15.5/qtbase/src/plugins/platforms/xcb/qxcbwindow.cpp
@@ -698,7 +698,7 @@ void QXcbWindow::show()
if (isTransient(window())) {
const QWindow *tp = window()->transientParent();
@@ -54,7 +41,4 @@
// Default to client leader if there is no transient parent, else modal dialogs can
// be hidden by their parents.
if (!transientXcbParent)
---
-2.25.1
-
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package libqt5-qtdatavis3d for openSUSE:Factory checked in at 2022-06-29 16:01:03
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libqt5-qtdatavis3d (Old)
and /work/SRC/openSUSE:Factory/.libqt5-qtdatavis3d.new.1548 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libqt5-qtdatavis3d"
Wed Jun 29 16:01:03 2022 rev:22 rq:985473 version:5.15.5+kde0
Changes:
--------
--- /work/SRC/openSUSE:Factory/libqt5-qtdatavis3d/libqt5-qtdatavis3d.changes 2021-06-26 21:25:22.923336885 +0200
+++ /work/SRC/openSUSE:Factory/.libqt5-qtdatavis3d.new.1548/libqt5-qtdatavis3d.changes 2022-06-29 16:02:06.212682227 +0200
@@ -1,0 +2,10 @@
+Mon Jun 27 13:09:20 UTC 2022 - Fabian Vogt <fabian(a)ritter-vogt.de>
+
+- Update to version 5.15.5+kde0, rebased upstream:
+ * Fix QML theme showing totally dark
+ * Revert "Update commercial license headers"
+ * QSurfaceDataProxy: Fix crashes adding the first row of data
+ * Update commercial license headers
+- Drop 0001-Revert-Bump-version.patch, it's versioned correctly now
+
+-------------------------------------------------------------------
Old:
----
0001-Revert-Bump-version.patch
qtdatavis3d-everywhere-src-5.15.2+kde2.obscpio
New:
----
qtdatavis3d-everywhere-src-5.15.5+kde0.obscpio
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libqt5-qtdatavis3d.spec ++++++
--- /var/tmp/diff_new_pack.8D5LSP/_old 2022-06-29 16:02:07.264683627 +0200
+++ /var/tmp/diff_new_pack.8D5LSP/_new 2022-06-29 16:02:07.268683632 +0200
@@ -22,19 +22,17 @@
%define qt5_snapshot 1
%define libname libQt5DataVisualization5
%define base_name libqt5
-%define real_version 5.15.2
-%define so_version 5.15.2
+%define real_version 5.15.5
+%define so_version 5.15.5
%define tar_version qtdatavis3d-everywhere-src-%{version}
Name: libqt5-qtdatavis3d
-Version: 5.15.2+kde2
+Version: 5.15.5+kde0
Release: 0
Summary: Qt5 Data Visualization 3D
License: GPL-3.0-or-later
Group: Development/Libraries/X11
URL: https://doc.qt.io/qt-5/qtdatavisualization-index.html
Source: %{tar_version}.tar.xz
-# PATCH-FIX-OPENSUSE
-Patch1: 0001-Revert-Bump-version.patch
BuildRequires: fdupes
BuildRequires: libqt5-qtdeclarative-devel >= %{real_version}
%if %{qt5_snapshot}
++++++ _service ++++++
--- /var/tmp/diff_new_pack.8D5LSP/_old 2022-06-29 16:02:07.308683686 +0200
+++ /var/tmp/diff_new_pack.8D5LSP/_new 2022-06-29 16:02:07.312683691 +0200
@@ -1,12 +1,12 @@
<services>
<service name="obs_scm" mode="disabled">
<param name="changesgenerate">enable</param>
- <param name="versionformat">5.15.2+kde@TAG_OFFSET@</param>
+ <param name="versionformat">5.15.5+kde@TAG_OFFSET@</param>
<param name="url">https://invent.kde.org/qt/qt/qtdatavis3d.git</param>
<param name="scm">git</param>
<param name="filename">qtdatavis3d-everywhere-src</param>
<param name="revision">kde/5.15</param>
- <param name="parent-tag">v5.15.2</param>
+ <param name="parent-tag">v5.15.5-lts-lgpl</param>
<param name="changesgenerate">enable</param>
</service>
<service name="set_version" mode="disabled"/>
++++++ qtdatavis3d-everywhere-src-5.15.2+kde2.obscpio -> qtdatavis3d-everywhere-src-5.15.5+kde0.obscpio ++++++
/work/SRC/openSUSE:Factory/libqt5-qtdatavis3d/qtdatavis3d-everywhere-src-5.15.2+kde2.obscpio /work/SRC/openSUSE:Factory/.libqt5-qtdatavis3d.new.1548/qtdatavis3d-everywhere-src-5.15.5+kde0.obscpio differ: char 8, line 1
++++++ qtdatavis3d-everywhere-src.obsinfo ++++++
--- /var/tmp/diff_new_pack.8D5LSP/_old 2022-06-29 16:02:07.376683776 +0200
+++ /var/tmp/diff_new_pack.8D5LSP/_new 2022-06-29 16:02:07.380683781 +0200
@@ -1,6 +1,5 @@
name: qtdatavis3d-everywhere-src
-version: 5.15.2+kde2
-mtime: 1603885577
-commit: c085311c02dd216e5a041b90c164d55b3cf3ce92
-
+version: 5.15.5+kde0
+mtime: 1652714198
+commit: a32c95d27224c6c9e41d6080ea54bc937c5d1455
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package libqt5-qt3d for openSUSE:Factory checked in at 2022-06-29 16:01:02
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libqt5-qt3d (Old)
and /work/SRC/openSUSE:Factory/.libqt5-qt3d.new.1548 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libqt5-qt3d"
Wed Jun 29 16:01:02 2022 rev:35 rq:985469 version:5.15.5+kde15
Changes:
--------
--- /work/SRC/openSUSE:Factory/libqt5-qt3d/libqt5-qt3d.changes 2022-01-23 12:17:08.627884140 +0100
+++ /work/SRC/openSUSE:Factory/.libqt5-qt3d.new.1548/libqt5-qt3d.changes 2022-06-29 16:02:02.128676791 +0200
@@ -1,0 +2,8 @@
+Mon Jun 27 13:08:59 UTC 2022 - Fabian Vogt <fabian(a)ritter-vogt.de>
+
+- Update to version 5.15.5+kde15, rebased upstream:
+ * Revert "Update commercial license headers"
+ * Update commercial license headers
+- Drop 0001-Revert-Bump-version.patch, it's versioned correctly now
+
+-------------------------------------------------------------------
Old:
----
0001-Revert-Bump-version.patch
qt3d-everywhere-src-5.15.2+kde39.obscpio
New:
----
qt3d-everywhere-src-5.15.5+kde15.obscpio
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libqt5-qt3d.spec ++++++
--- /var/tmp/diff_new_pack.C73yHo/_old 2022-06-29 16:02:05.868681769 +0200
+++ /var/tmp/diff_new_pack.C73yHo/_new 2022-06-29 16:02:05.876681780 +0200
@@ -21,12 +21,12 @@
%define qt5_snapshot 1
%define libname libQt53DCore5
%define base_name libqt5
-%define real_version 5.15.2
-%define so_version 5.15.2
+%define real_version 5.15.5
+%define so_version 5.15.5
%define tar_version qt3d-everywhere-src-%{version}
%global enable_assimp (0%{?suse_version} >= 1550)
Name: libqt5-qt3d
-Version: 5.15.2+kde39
+Version: 5.15.5+kde15
Release: 0
Summary: Qt 5 3D Addon
# Legal: some files are GPL-3.0-only WITH Qt-GPL-exception-1.0
@@ -35,8 +35,6 @@
Group: Development/Libraries/X11
URL: https://www.qt.io
Source: %{tar_version}.tar.xz
-# PATCH-FIX-OPENSUSE
-Patch1: 0001-Revert-Bump-version.patch
BuildRequires: fdupes
BuildRequires: libQt5Bootstrap-devel-static >= %{real_version}
BuildRequires: libQt5Concurrent-devel >= %{real_version}
++++++ _service ++++++
--- /var/tmp/diff_new_pack.C73yHo/_old 2022-06-29 16:02:05.928681849 +0200
+++ /var/tmp/diff_new_pack.C73yHo/_new 2022-06-29 16:02:05.932681854 +0200
@@ -1,12 +1,12 @@
<services>
<service name="obs_scm" mode="disabled">
<param name="changesgenerate">enable</param>
- <param name="versionformat">5.15.2+kde@TAG_OFFSET@</param>
+ <param name="versionformat">5.15.5+kde@TAG_OFFSET@</param>
<param name="url">https://invent.kde.org/qt/qt/qt3d.git</param>
<param name="scm">git</param>
<param name="filename">qt3d-everywhere-src</param>
<param name="revision">kde/5.15</param>
- <param name="parent-tag">v5.15.2</param>
+ <param name="parent-tag">v5.15.5-lts-lgpl</param>
<param name="changesgenerate">enable</param>
</service>
<service name="set_version" mode="disabled"/>
++++++ qt3d-everywhere-src-5.15.2+kde39.obscpio -> qt3d-everywhere-src-5.15.5+kde15.obscpio ++++++
/work/SRC/openSUSE:Factory/libqt5-qt3d/qt3d-everywhere-src-5.15.2+kde39.obscpio /work/SRC/openSUSE:Factory/.libqt5-qt3d.new.1548/qt3d-everywhere-src-5.15.5+kde15.obscpio differ: char 48, line 1
++++++ qt3d-everywhere-src.obsinfo ++++++
--- /var/tmp/diff_new_pack.C73yHo/_old 2022-06-29 16:02:05.988681928 +0200
+++ /var/tmp/diff_new_pack.C73yHo/_new 2022-06-29 16:02:05.992681933 +0200
@@ -1,5 +1,5 @@
name: qt3d-everywhere-src
-version: 5.15.2+kde39
-mtime: 1638341627
-commit: dba14d48611b9e9d59576172658779ab4a39b416
+version: 5.15.5+kde15
+mtime: 1655460882
+commit: 3cc801c4ae41ff3f155258c4bf7e21bb5b3f6a3d
1
0