Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package libqt5-qtwayland for openSUSE:Factory checked in at 2021-10-31 22:55:27 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libqt5-qtwayland (Old) and /work/SRC/openSUSE:Factory/.libqt5-qtwayland.new.1890 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libqt5-qtwayland" Sun Oct 31 22:55:27 2021 rev:40 rq:928085 version:5.15.2+kde34 Changes: -------- --- /work/SRC/openSUSE:Factory/libqt5-qtwayland/libqt5-qtwayland.changes 2021-06-27 18:59:35.996316891 +0200 +++ /work/SRC/openSUSE:Factory/.libqt5-qtwayland.new.1890/libqt5-qtwayland.changes 2021-10-31 22:56:06.727719921 +0100 @@ -1,0 +2,11 @@ +Thu Oct 28 07:16:50 UTC 2021 - Fabian Vogt <fab...@ritter-vogt.de> + +- Update to version 5.15.2+kde34: + * Fix the logic for decoding modifiers map in Wayland text input protocol + * Client: Always destroy frame callback in the actual callback + * Client: Don't always recreate frame callbacks + * Wayland client: Fix crash when windows are shown/hidden during drag + * Correctly detect if image format is supported by QImageWriter + * Do not update the mask if we do not have a surface + +------------------------------------------------------------------- Old: ---- qtwayland-everywhere-src-5.15.2+kde28.obscpio New: ---- qtwayland-everywhere-src-5.15.2+kde34.obscpio ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libqt5-qtwayland.spec ++++++ --- /var/tmp/diff_new_pack.QpZKHx/_old 2021-10-31 22:56:07.731720692 +0100 +++ /var/tmp/diff_new_pack.QpZKHx/_new 2021-10-31 22:56:07.735720695 +0100 @@ -26,7 +26,7 @@ %define so_version 5.15.2 %define tar_version qtwayland-everywhere-src-%{version} Name: libqt5-qtwayland -Version: 5.15.2+kde28 +Version: 5.15.2+kde34 Release: 0 Summary: Qt 5 Wayland Addon # The wayland compositor files are GPL-3.0-or-later ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.QpZKHx/_old 2021-10-31 22:56:07.779720729 +0100 +++ /var/tmp/diff_new_pack.QpZKHx/_new 2021-10-31 22:56:07.779720729 +0100 @@ -1,4 +1,4 @@ <servicedata> <service name="tar_scm"> <param name="url">https://invent.kde.org/qt/qt/qtwayland.git</param> - <param name="changesrevision">a6476d1a1c78eb7f17408241b268404e27b3e161</param></service></servicedata> \ No newline at end of file + <param name="changesrevision">02f9585ca19c17ae0978b864195533dc527d825e</param></service></servicedata> \ No newline at end of file ++++++ qtwayland-everywhere-src-5.15.2+kde28.obscpio -> qtwayland-everywhere-src-5.15.2+kde34.obscpio ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwayland-everywhere-src-5.15.2+kde28/.gitignore new/qtwayland-everywhere-src-5.15.2+kde34/.gitignore --- old/qtwayland-everywhere-src-5.15.2+kde28/.gitignore 1970-01-01 01:00:00.000000000 +0100 +++ new/qtwayland-everywhere-src-5.15.2+kde34/.gitignore 2021-10-15 18:55:33.000000000 +0200 @@ -0,0 +1,62 @@ +.*.callgrind.out.* +Makefile* +*.pro.user* +*.qmlproject.user* +.*.swp +*.o +*.moc +*_wrapper.sh +.qmake.stash +qwayland-*.cpp +qwayland-*.h +*-protocol.c +*-client-protocol.h +*-server-protocol.h +qtwayland*-config.* +qtwayland*-config_p.h +.qmake.cache +config.log +config.tests/egl/egl +config.tests/glx/glx +config.tests/wayland_cursor/wayland_cursor +config.tests/wayland_egl/wayland_egl +config.tests/xcomposite/xcomposite +config.tests/xkbcommon/xkbcommon +config.tests/wayland/wayland +config.tests/drm_egl_server/drm_egl_server +config.tests/wayland_scanner/wayland_scanner +config.cache +config.opt +config.summary +qrc_*.cpp +moc_*.cpp +.obj/ +.moc/ +mkspecs/ +lib/ +include/ +bin/ +/plugins/ +/qml/ +examples/wayland/qwindow-compositor/qwindow-compositor +examples/wayland/custom-extension/testapp/testapp +examples/wayland/minimal-cpp/minimal-cpp +examples/wayland/minimal-qml/minimal-qml +examples/wayland/multi-output/multi-output +examples/wayland/pure-qml/pure-qml +examples/wayland/server-buffer/client/client +examples/wayland/server-buffer/compositor/compositor +examples/wayland/server-side-decoration/server-side-decoration +examples/wayland/subsurface/subsurface +examples/wayland/spanning-screens/spanning-screens +src/client/QtWaylandClient.version +src/client/QtWaylandClient.version.in +src/compositor/QtWaylandCompositor.version +src/compositor/QtWaylandCompositor.version.in +src/plugins/platforms/wayland_common/libwayland_common.a +src/plugins/platforms/wayland_common/libwayland_common.prl +src/imports/compositor/compositor.qrc +tests/auto/client/*/tst_* +!tests/auto/client/*/tst_*.cpp +tests/auto/compositor/compositor/tst_compositor +*~ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwayland-everywhere-src-5.15.2+kde28/0001-Revert-Bump-version.patch new/qtwayland-everywhere-src-5.15.2+kde34/0001-Revert-Bump-version.patch --- old/qtwayland-everywhere-src-5.15.2+kde28/0001-Revert-Bump-version.patch 2021-06-15 23:58:10.000000000 +0200 +++ new/qtwayland-everywhere-src-5.15.2+kde34/0001-Revert-Bump-version.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,23 +0,0 @@ -From 3e5ee8f5e9d71be398d97c64e2c70c176fec2645 Mon Sep 17 00:00:00 2001 -From: Fabian Vogt <fv...@suse.de> -Date: Mon, 21 Jun 2021 22:17:30 +0200 -Subject: [PATCH] Revert "Bump version" - -This reverts commit 30cb2a87fcc6265232cb5a3ffce9836da6e531d6. ---- - .qmake.conf | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/.qmake.conf b/.qmake.conf -index bb8d0645..f63b6641 100644 ---- a/.qmake.conf -+++ b/.qmake.conf -@@ -4,4 +4,4 @@ DEFINES += QT_NO_FOREACH - DEFINES += QT_NO_JAVA_STYLE_ITERATORS - DEFINES += 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/qtwayland-everywhere-src-5.15.2+kde28/examples/wayland/custom-extension/client-common/.gitignore new/qtwayland-everywhere-src-5.15.2+kde34/examples/wayland/custom-extension/client-common/.gitignore --- old/qtwayland-everywhere-src-5.15.2+kde28/examples/wayland/custom-extension/client-common/.gitignore 1970-01-01 01:00:00.000000000 +0100 +++ new/qtwayland-everywhere-src-5.15.2+kde34/examples/wayland/custom-extension/client-common/.gitignore 2021-10-15 18:55:33.000000000 +0200 @@ -0,0 +1,4 @@ +qwayland-custom.cpp +qwayland-custom.h +wayland-custom-client-protocol.h +wayland-custom-protocol.c diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwayland-everywhere-src-5.15.2+kde28/examples/wayland/custom-extension/compositor/.gitignore new/qtwayland-everywhere-src-5.15.2+kde34/examples/wayland/custom-extension/compositor/.gitignore --- old/qtwayland-everywhere-src-5.15.2+kde28/examples/wayland/custom-extension/compositor/.gitignore 1970-01-01 01:00:00.000000000 +0100 +++ new/qtwayland-everywhere-src-5.15.2+kde34/examples/wayland/custom-extension/compositor/.gitignore 2021-10-15 18:55:33.000000000 +0200 @@ -0,0 +1,8 @@ +custom-compositor +qwayland-custom.cpp +qwayland-custom.h +qwayland-server-custom.cpp +qwayland-server-custom.h +wayland-custom-client-protocol.h +wayland-custom-protocol.c +wayland-custom-server-protocol.h diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwayland-everywhere-src-5.15.2+kde28/examples/wayland/custom-extension/cpp-client/.gitignore new/qtwayland-everywhere-src-5.15.2+kde34/examples/wayland/custom-extension/cpp-client/.gitignore --- old/qtwayland-everywhere-src-5.15.2+kde28/examples/wayland/custom-extension/cpp-client/.gitignore 1970-01-01 01:00:00.000000000 +0100 +++ new/qtwayland-everywhere-src-5.15.2+kde34/examples/wayland/custom-extension/cpp-client/.gitignore 2021-10-15 18:55:33.000000000 +0200 @@ -0,0 +1,3 @@ +cpp-client +qwayland-custom.cpp +qwayland-custom.h diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwayland-everywhere-src-5.15.2+kde28/examples/wayland/custom-extension/qml-client/.gitignore new/qtwayland-everywhere-src-5.15.2+kde34/examples/wayland/custom-extension/qml-client/.gitignore --- old/qtwayland-everywhere-src-5.15.2+kde28/examples/wayland/custom-extension/qml-client/.gitignore 1970-01-01 01:00:00.000000000 +0100 +++ new/qtwayland-everywhere-src-5.15.2+kde34/examples/wayland/custom-extension/qml-client/.gitignore 2021-10-15 18:55:33.000000000 +0200 @@ -0,0 +1,3 @@ +qml-client +qwayland-custom.cpp +qwayland-custom.h diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwayland-everywhere-src-5.15.2+kde28/examples/wayland/hwlayer-compositor/.gitignore new/qtwayland-everywhere-src-5.15.2+kde34/examples/wayland/hwlayer-compositor/.gitignore --- old/qtwayland-everywhere-src-5.15.2+kde28/examples/wayland/hwlayer-compositor/.gitignore 1970-01-01 01:00:00.000000000 +0100 +++ new/qtwayland-everywhere-src-5.15.2+kde34/examples/wayland/hwlayer-compositor/.gitignore 2021-10-15 18:55:33.000000000 +0200 @@ -0,0 +1 @@ +hwlayer-compositor diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwayland-everywhere-src-5.15.2+kde28/examples/wayland/ivi-compositor/.gitignore new/qtwayland-everywhere-src-5.15.2+kde34/examples/wayland/ivi-compositor/.gitignore --- old/qtwayland-everywhere-src-5.15.2+kde28/examples/wayland/ivi-compositor/.gitignore 1970-01-01 01:00:00.000000000 +0100 +++ new/qtwayland-everywhere-src-5.15.2+kde34/examples/wayland/ivi-compositor/.gitignore 2021-10-15 18:55:33.000000000 +0200 @@ -0,0 +1 @@ +ivi-compositor diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwayland-everywhere-src-5.15.2+kde28/examples/wayland/multi-screen/.gitignore new/qtwayland-everywhere-src-5.15.2+kde34/examples/wayland/multi-screen/.gitignore --- old/qtwayland-everywhere-src-5.15.2+kde28/examples/wayland/multi-screen/.gitignore 1970-01-01 01:00:00.000000000 +0100 +++ new/qtwayland-everywhere-src-5.15.2+kde34/examples/wayland/multi-screen/.gitignore 2021-10-15 18:55:33.000000000 +0200 @@ -0,0 +1 @@ +multi-screen diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwayland-everywhere-src-5.15.2+kde28/examples/wayland/overview-compositor/.gitignore new/qtwayland-everywhere-src-5.15.2+kde34/examples/wayland/overview-compositor/.gitignore --- old/qtwayland-everywhere-src-5.15.2+kde28/examples/wayland/overview-compositor/.gitignore 1970-01-01 01:00:00.000000000 +0100 +++ new/qtwayland-everywhere-src-5.15.2+kde34/examples/wayland/overview-compositor/.gitignore 2021-10-15 18:55:33.000000000 +0200 @@ -0,0 +1 @@ +overview-compositor diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwayland-everywhere-src-5.15.2+kde28/examples/wayland/texture-sharing/.gitignore new/qtwayland-everywhere-src-5.15.2+kde34/examples/wayland/texture-sharing/.gitignore --- old/qtwayland-everywhere-src-5.15.2+kde28/examples/wayland/texture-sharing/.gitignore 1970-01-01 01:00:00.000000000 +0100 +++ new/qtwayland-everywhere-src-5.15.2+kde34/examples/wayland/texture-sharing/.gitignore 2021-10-15 18:55:33.000000000 +0200 @@ -0,0 +1,2 @@ +custom-compositor/custom-compositor +qml-client/qml-client diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwayland-everywhere-src-5.15.2+kde28/src/client/qwaylanddatadevice.cpp new/qtwayland-everywhere-src-5.15.2+kde34/src/client/qwaylanddatadevice.cpp --- old/qtwayland-everywhere-src-5.15.2+kde28/src/client/qwaylanddatadevice.cpp 2021-06-15 23:58:10.000000000 +0200 +++ new/qtwayland-everywhere-src-5.15.2+kde34/src/client/qwaylanddatadevice.cpp 2021-10-15 18:55:33.000000000 +0200 @@ -169,7 +169,7 @@ void QWaylandDataDevice::data_device_enter(uint32_t serial, wl_surface *surface, wl_fixed_t x, wl_fixed_t y, wl_data_offer *id) { - auto *dragWaylandWindow = QWaylandWindow::fromWlSurface(surface); + auto *dragWaylandWindow = surface ? QWaylandWindow::fromWlSurface(surface) : nullptr; if (!dragWaylandWindow) return; // Ignore foreign surfaces diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwayland-everywhere-src-5.15.2+kde28/src/client/qwaylandinputcontext.cpp new/qtwayland-everywhere-src-5.15.2+kde34/src/client/qwaylandinputcontext.cpp --- old/qtwayland-everywhere-src-5.15.2+kde28/src/client/qwaylandinputcontext.cpp 2021-06-15 23:58:10.000000000 +0200 +++ new/qtwayland-everywhere-src-5.15.2+kde34/src/client/qwaylandinputcontext.cpp 2021-10-15 18:55:33.000000000 +0200 @@ -387,8 +387,10 @@ Qt::KeyboardModifiers QWaylandTextInput::modifiersToQtModifiers(uint32_t modifiers) { Qt::KeyboardModifiers ret = Qt::NoModifier; - for (int i = 0; modifiers >>= 1; ++i) { - ret |= m_modifiersMap[i]; + for (int i = 0; i < m_modifiersMap.size(); ++i) { + if (modifiers & (1 << i)) { + ret |= m_modifiersMap[i]; + } } return ret; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwayland-everywhere-src-5.15.2+kde28/src/client/qwaylandwindow.cpp new/qtwayland-everywhere-src-5.15.2+kde34/src/client/qwaylandwindow.cpp --- old/qtwayland-everywhere-src-5.15.2+kde28/src/client/qwaylandwindow.cpp 2021-06-15 23:58:10.000000000 +0200 +++ new/qtwayland-everywhere-src-5.15.2+kde34/src/client/qwaylandwindow.cpp 2021-10-15 18:55:33.000000000 +0200 @@ -464,14 +464,15 @@ void QWaylandWindow::setMask(const QRegion &mask) { + QReadLocker locker(&mSurfaceLock); + if (!mSurface) + return; + if (mMask == mask) return; mMask = mask; - if (!mSurface) - return; - if (mMask.isEmpty()) { mSurface->set_input_region(nullptr); @@ -621,9 +622,13 @@ const wl_callback_listener QWaylandWindow::callbackListener = { [](void *data, wl_callback *callback, uint32_t time) { - Q_UNUSED(callback); Q_UNUSED(time); auto *window = static_cast<QWaylandWindow*>(data); + + Q_ASSERT(callback == window->mFrameCallback); + wl_callback_destroy(callback); + window->mFrameCallback = nullptr; + window->handleFrameCallback(); } }; @@ -1169,16 +1174,15 @@ void QWaylandWindow::handleUpdate() { qCDebug(lcWaylandBackingstore) << "handleUpdate" << QThread::currentThread(); + + if (mWaitingForFrameCallback) + return; + // TODO: Should sync subsurfaces avoid requesting frame callbacks? QReadLocker lock(&mSurfaceLock); if (!mSurface) return; - if (mFrameCallback) { - wl_callback_destroy(mFrameCallback); - mFrameCallback = nullptr; - } - QMutexLocker locker(mFrameQueue.mutex); struct ::wl_surface *wrappedSurface = reinterpret_cast<struct ::wl_surface *>(wl_proxy_create_wrapper(mSurface->object())); wl_proxy_set_queue(reinterpret_cast<wl_proxy *>(wrappedSurface), mFrameQueue.queue); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwayland-everywhere-src-5.15.2+kde28/src/compositor/extensions/pregenerated/3rdparty/.gitignore new/qtwayland-everywhere-src-5.15.2+kde34/src/compositor/extensions/pregenerated/3rdparty/.gitignore --- old/qtwayland-everywhere-src-5.15.2+kde28/src/compositor/extensions/pregenerated/3rdparty/.gitignore 1970-01-01 01:00:00.000000000 +0100 +++ new/qtwayland-everywhere-src-5.15.2+kde34/src/compositor/extensions/pregenerated/3rdparty/.gitignore 2021-10-15 18:55:33.000000000 +0200 @@ -0,0 +1,3 @@ +!qwayland-server-*.cpp +!qwayland-server-*.h +!wayland-*-protocol.cpp diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwayland-everywhere-src-5.15.2+kde28/src/plugins/shellintegration/xdg-shell-v5/pregenerated/3rdparty/.gitignore new/qtwayland-everywhere-src-5.15.2+kde34/src/plugins/shellintegration/xdg-shell-v5/pregenerated/3rdparty/.gitignore --- old/qtwayland-everywhere-src-5.15.2+kde28/src/plugins/shellintegration/xdg-shell-v5/pregenerated/3rdparty/.gitignore 1970-01-01 01:00:00.000000000 +0100 +++ new/qtwayland-everywhere-src-5.15.2+kde34/src/plugins/shellintegration/xdg-shell-v5/pregenerated/3rdparty/.gitignore 2021-10-15 18:55:33.000000000 +0200 @@ -0,0 +1,3 @@ +!qwayland-*.cpp +!qwayland-*.h +!wayland-*-protocol.c diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwayland-everywhere-src-5.15.2+kde28/src/shared/qwaylandmimehelper.cpp new/qtwayland-everywhere-src-5.15.2+kde34/src/shared/qwaylandmimehelper.cpp --- old/qtwayland-everywhere-src-5.15.2+kde28/src/shared/qwaylandmimehelper.cpp 2021-06-15 23:58:10.000000000 +0200 +++ new/qtwayland-everywhere-src-5.15.2+kde34/src/shared/qwaylandmimehelper.cpp 2021-10-15 18:55:33.000000000 +0200 @@ -60,7 +60,7 @@ buf.open(QIODevice::ReadWrite); QByteArray fmt = "BMP"; if (mimeType.startsWith(QLatin1String("image/"))) { - QByteArray imgFmt = mimeType.mid(6).toUpper().toLatin1(); + QByteArray imgFmt = mimeType.mid(6).toLower().toLatin1(); if (QImageWriter::supportedImageFormats().contains(imgFmt)) fmt = imgFmt; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwayland-everywhere-src-5.15.2+kde28/tests/auto/client/xdgshell/tst_xdgshell.cpp new/qtwayland-everywhere-src-5.15.2+kde34/tests/auto/client/xdgshell/tst_xdgshell.cpp --- old/qtwayland-everywhere-src-5.15.2+kde28/tests/auto/client/xdgshell/tst_xdgshell.cpp 2021-06-15 23:58:10.000000000 +0200 +++ new/qtwayland-everywhere-src-5.15.2+kde34/tests/auto/client/xdgshell/tst_xdgshell.cpp 2021-10-15 18:55:33.000000000 +0200 @@ -138,6 +138,7 @@ void tst_xdgshell::configureStates() { + QVERIFY(qputenv("QT_WAYLAND_FRAME_CALLBACK_TIMEOUT", "0")); QRasterWindow window; window.resize(64, 48); window.show(); @@ -186,6 +187,7 @@ QCOMPARE(window.windowStates(), Qt::WindowNoState); QCOMPARE(window.frameGeometry().size(), windowedSize); // QCOMPARE(window.frameGeometry().topLeft(), QPoint()); // TODO: this doesn't currently work when window decorations are enabled + QVERIFY(qunsetenv("QT_WAYLAND_FRAME_CALLBACK_TIMEOUT")); } void tst_xdgshell::popup() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwayland-everywhere-src-5.15.2+kde28/tests/global/.gitignore new/qtwayland-everywhere-src-5.15.2+kde34/tests/global/.gitignore --- old/qtwayland-everywhere-src-5.15.2+kde28/tests/global/.gitignore 1970-01-01 01:00:00.000000000 +0100 +++ new/qtwayland-everywhere-src-5.15.2+kde34/tests/global/.gitignore 2021-10-15 18:55:33.000000000 +0200 @@ -0,0 +1 @@ +global.pro ++++++ qtwayland-everywhere-src.obsinfo ++++++ --- /var/tmp/diff_new_pack.QpZKHx/_old 2021-10-31 22:56:08.147721012 +0100 +++ /var/tmp/diff_new_pack.QpZKHx/_new 2021-10-31 22:56:08.147721012 +0100 @@ -1,5 +1,5 @@ name: qtwayland-everywhere-src -version: 5.15.2+kde28 -mtime: 1623794290 -commit: a6476d1a1c78eb7f17408241b268404e27b3e161 +version: 5.15.2+kde34 +mtime: 1634316933 +commit: 02f9585ca19c17ae0978b864195533dc527d825e