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-09-29 18:12:00
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libqt5-qtremoteobjects (Old)
and /work/SRC/openSUSE:Factory/.libqt5-qtremoteobjects.new.2275 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libqt5-qtremoteobjects"
Thu Sep 29 18:12:00 2022 rev:22 rq:1006226 version:5.15.6+kde0
Changes:
--------
---
/work/SRC/openSUSE:Factory/libqt5-qtremoteobjects/libqt5-qtremoteobjects.changes
2022-06-29 16:02:28.292711618 +0200
+++
/work/SRC/openSUSE:Factory/.libqt5-qtremoteobjects.new.2275/libqt5-qtremoteobjects.changes
2022-09-29 18:12:07.083110003 +0200
@@ -1,0 +2,9 @@
+Mon Sep 26 10:34:30 UTC 2022 - Fabian Vogt <[email protected]>
+
+- Update to version 5.15.6+kde0, rebased upstream:
+ * Remove dead code in serializeDefinition()
+ * Remove dead code in qt_metacall()
+ * CMake: Don't claim we have qt6_generate_repc in Qt6
+ * Fix "Failed to create a timer" issue on Windows
+
+-------------------------------------------------------------------
Old:
----
qtremoteobjects-everywhere-src-5.15.5+kde0.obscpio
New:
----
qtremoteobjects-everywhere-src-5.15.6+kde0.obscpio
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libqt5-qtremoteobjects.spec ++++++
--- /var/tmp/diff_new_pack.bSCCuc/_old 2022-09-29 18:12:08.195112175 +0200
+++ /var/tmp/diff_new_pack.bSCCuc/_new 2022-09-29 18:12:08.203112191 +0200
@@ -19,11 +19,11 @@
%define qt5_snapshot 1
%define libname libQt5RemoteObjects5
%define base_name libqt5
-%define real_version 5.15.5
-%define so_version 5.15.5
+%define real_version 5.15.6
+%define so_version 5.15.6
%define tar_version qtremoteobjects-everywhere-src-%{version}
Name: libqt5-qtremoteobjects
-Version: 5.15.5+kde0
+Version: 5.15.6+kde0
Release: 0
Summary: Qt 5 RemoteObjects Library
License: LGPL-3.0-only OR (GPL-2.0-only OR GPL-3.0-or-later)
++++++ _service ++++++
--- /var/tmp/diff_new_pack.bSCCuc/_old 2022-09-29 18:12:08.247112277 +0200
+++ /var/tmp/diff_new_pack.bSCCuc/_new 2022-09-29 18:12:08.251112284 +0200
@@ -1,12 +1,12 @@
<services>
<service name="obs_scm" mode="disabled">
<param name="changesgenerate">enable</param>
- <param name="versionformat">5.15.5+kde@TAG_OFFSET@</param>
+ <param name="versionformat">5.15.6+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.5-lts-lgpl</param>
+ <param name="parent-tag">v5.15.6-lts-lgpl</param>
<param name="changesgenerate">enable</param>
</service>
<service name="set_version" mode="disabled"/>
++++++ qtremoteobjects-everywhere-src-5.15.5+kde0.obscpio ->
qtremoteobjects-everywhere-src-5.15.6+kde0.obscpio ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtremoteobjects-everywhere-src-5.15.5+kde0/.qmake.conf
new/qtremoteobjects-everywhere-src-5.15.6+kde0/.qmake.conf
--- old/qtremoteobjects-everywhere-src-5.15.5+kde0/.qmake.conf 2022-05-19
06:20:18.000000000 +0200
+++ new/qtremoteobjects-everywhere-src-5.15.6+kde0/.qmake.conf 2022-08-16
19:37:46.000000000 +0200
@@ -4,6 +4,6 @@
DEFINES += QT_NO_JAVA_STYLE_ITERATORS
DEFINES += QT_NO_FOREACH
-MODULE_VERSION = 5.15.5
+MODULE_VERSION = 5.15.6
QTRO_SOURCE_TREE = $$PWD
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtremoteobjects-everywhere-src-5.15.5+kde0/src/remoteobjects/Qt5RemoteObjectsMacros.cmake
new/qtremoteobjects-everywhere-src-5.15.6+kde0/src/remoteobjects/Qt5RemoteObjectsMacros.cmake
---
old/qtremoteobjects-everywhere-src-5.15.5+kde0/src/remoteobjects/Qt5RemoteObjectsMacros.cmake
2022-05-19 06:20:18.000000000 +0200
+++
new/qtremoteobjects-everywhere-src-5.15.6+kde0/src/remoteobjects/Qt5RemoteObjectsMacros.cmake
2022-08-16 19:37:46.000000000 +0200
@@ -105,7 +105,8 @@
if(QT_DEFAULT_MAJOR_VERSION EQUAL 5)
qt5_generate_repc("${outfiles}" ${ARGN})
elseif(QT_DEFAULT_MAJOR_VERSION EQUAL 6)
- qt6_generate_repc("${outfiles}" ${ARGN})
+ message(FATAL_ERROR "qt_generate_repc is not available in Qt6. "
+ "See the Qt6 documentation for replacements.")
endif()
set("${outfiles}" "${${outfiles}}" PARENT_SCOPE)
endfunction()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtremoteobjects-everywhere-src-5.15.5+kde0/src/remoteobjects/qremoteobjectdynamicreplica.cpp
new/qtremoteobjects-everywhere-src-5.15.6+kde0/src/remoteobjects/qremoteobjectdynamicreplica.cpp
---
old/qtremoteobjects-everywhere-src-5.15.5+kde0/src/remoteobjects/qremoteobjectdynamicreplica.cpp
2022-05-19 06:20:18.000000000 +0200
+++
new/qtremoteobjects-everywhere-src-5.15.6+kde0/src/remoteobjects/qremoteobjectdynamicreplica.cpp
2022-08-16 19:37:46.000000000 +0200
@@ -142,7 +142,6 @@
if (call == QMetaObject::ReadProperty || call ==
QMetaObject::WriteProperty) {
QMetaProperty mp = metaObject()->property(saved_id);
- int &status = *reinterpret_cast<int *>(argv[2]);
if (call == QMetaObject::WriteProperty) {
QVariantList args;
@@ -159,13 +158,6 @@
QMetaType::destruct(mp.userType(), argv[0]);
QMetaType::construct(mp.userType(), argv[0], value.data());
}
- const bool readStatus = true;
- // Caller supports QVariant returns? Then we can also report errors
- // by storing an invalid variant.
- if (!readStatus && argv[1]) {
- status = 0;
- reinterpret_cast<QVariant*>(argv[1])->clear();
- }
}
id = -1;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtremoteobjects-everywhere-src-5.15.5+kde0/src/remoteobjects/qremoteobjectpacket.cpp
new/qtremoteobjects-everywhere-src-5.15.6+kde0/src/remoteobjects/qremoteobjectpacket.cpp
---
old/qtremoteobjects-everywhere-src-5.15.5+kde0/src/remoteobjects/qremoteobjectpacket.cpp
2022-05-19 06:20:18.000000000 +0200
+++
new/qtremoteobjects-everywhere-src-5.15.6+kde0/src/remoteobjects/qremoteobjectpacket.cpp
2022-08-16 19:37:46.000000000 +0200
@@ -480,13 +480,10 @@
serializeEnum(ds, enumerator);
}
- if (source->d->isDynamic) {
- QSet<const QMetaObject *> gadgets;
- QSet<QMetaEnum> enums;
- recurseForGadgets(gadgets, enums, source);
- serializeGadgets(ds, gadgets, enums, source);
- } else
- ds << quint32(0) << quint32(0); // qtEnums, numGadgets
+ QSet<const QMetaObject *> gadgets;
+ QSet<QMetaEnum> enums;
+ recurseForGadgets(gadgets, enums, source);
+ serializeGadgets(ds, gadgets, enums, source);
const int numSignals = api->signalCount();
ds << quint32(numSignals); //Number of signals
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtremoteobjects-everywhere-src-5.15.5+kde0/src/remoteobjects/qremoteobjectreplica.cpp
new/qtremoteobjects-everywhere-src-5.15.6+kde0/src/remoteobjects/qremoteobjectreplica.cpp
---
old/qtremoteobjects-everywhere-src-5.15.5+kde0/src/remoteobjects/qremoteobjectreplica.cpp
2022-05-19 06:20:18.000000000 +0200
+++
new/qtremoteobjects-everywhere-src-5.15.6+kde0/src/remoteobjects/qremoteobjectreplica.cpp
2022-08-16 19:37:46.000000000 +0200
@@ -345,8 +345,11 @@
&loop,
QEventLoop::staticMetaObject.indexOfMethod("quit()"),
Qt::DirectConnection, nullptr);
+ QTimer t; // NB: Related to QTBUG-94570 - don't use QTimer::singleShot
here.
if (timeout >= 0) {
- QTimer::singleShot(timeout, &loop, &QEventLoop::quit);
+ t.setSingleShot(true);
+ connect(&t, &QTimer::timeout, &loop, &QEventLoop::quit);
+ t.start(timeout);
}
// enter the event loop and wait for a reply
@@ -439,7 +442,13 @@
QEventLoop loop;
loop.connect(call.d->watcherHelper.data(),
&QRemoteObjectPendingCallWatcherHelper::finished,
&loop, &QEventLoop::quit);
- QTimer::singleShot(timeout, &loop, &QEventLoop::quit);
+
+ QTimer t; // NB: Related to QTBUG-94570 - don't use QTimer::singleShot
here.
+ if (timeout >= 0) {
+ t.setSingleShot(true);
+ connect(&t, &QTimer::timeout, &loop, &QEventLoop::quit);
+ t.start(timeout);
+ }
// enter the event loop and wait for a reply
loop.exec(QEventLoop::ExcludeUserInputEvents |
QEventLoop::WaitForMoreEvents);
++++++ qtremoteobjects-everywhere-src.obsinfo ++++++
--- /var/tmp/diff_new_pack.bSCCuc/_old 2022-09-29 18:12:08.563112894 +0200
+++ /var/tmp/diff_new_pack.bSCCuc/_new 2022-09-29 18:12:08.563112894 +0200
@@ -1,5 +1,5 @@
name: qtremoteobjects-everywhere-src
-version: 5.15.5+kde0
-mtime: 1652934018
-commit: 89407ff20e4f76314887e2f3625f5126910031ac
+version: 5.15.6+kde0
+mtime: 1660671466
+commit: aa705010da0f658b78c1155babce7091ae44529a
