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 2024-01-04 15:55:02 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libqt5-qtwayland (Old) and /work/SRC/openSUSE:Factory/.libqt5-qtwayland.new.28375 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libqt5-qtwayland" Thu Jan 4 15:55:02 2024 rev:53 rq:1136127 version:5.15.12+kde60 Changes: -------- --- /work/SRC/openSUSE:Factory/libqt5-qtwayland/libqt5-qtwayland.changes 2023-10-08 12:18:15.918042840 +0200 +++ /work/SRC/openSUSE:Factory/.libqt5-qtwayland.new.28375/libqt5-qtwayland.changes 2024-01-04 15:55:49.301064982 +0100 @@ -1,0 +2,11 @@ +Fri Dec 29 13:31:58 UTC 2023 - Fabian Vogt <fabian@ritter-vogt.de> + +- Update to version 5.15.12+kde60, rebased upstream: + * Client: Always populate mimedata in drags + * Client: Honor QGuiApplication::overrideCursor() + * Always use blocking write for data_source.send + * client: Mark return values as unused to suppress compiler warnings + * tests: fix tst_seatv4 to use 24 as default cursor size + * Bump version to 5.15.12 + +------------------------------------------------------------------- Old: ---- qtwayland-everywhere-src-5.15.11+kde59.obscpio New: ---- qtwayland-everywhere-src-5.15.12+kde60.obscpio ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libqt5-qtwayland.spec ++++++ --- /var/tmp/diff_new_pack.5mND3e/_old 2024-01-04 15:55:51.177133516 +0100 +++ /var/tmp/diff_new_pack.5mND3e/_new 2024-01-04 15:55:51.177133516 +0100 @@ -22,11 +22,11 @@ %define qt5_snapshot 1 %define libname libQt5WaylandCompositor5 %define base_name libqt5 -%define real_version 5.15.11 -%define so_version 5.15.11 +%define real_version 5.15.12 +%define so_version 5.15.12 %define tar_version qtwayland-everywhere-src-%{version} Name: libqt5-qtwayland -Version: 5.15.11+kde59 +Version: 5.15.12+kde60 Release: 0 Summary: Qt 5 Wayland Addon # The wayland compositor files are GPL-3.0-or-later ++++++ _service ++++++ --- /var/tmp/diff_new_pack.5mND3e/_old 2024-01-04 15:55:51.205134539 +0100 +++ /var/tmp/diff_new_pack.5mND3e/_new 2024-01-04 15:55:51.209134685 +0100 @@ -1,12 +1,12 @@ <services> <service name="obs_scm" mode="disabled"> <param name="changesgenerate">enable</param> - <param name="versionformat">5.15.11+kde@TAG_OFFSET@</param> + <param name="versionformat">5.15.12+kde@TAG_OFFSET@</param> <param name="url">https://invent.kde.org/qt/qt/qtwayland.git</param> <param name="scm">git</param> <param name="filename">qtwayland-everywhere-src</param> <param name="revision">kde/5.15</param> - <param name="parent-tag">v5.15.11-lts-lgpl</param> + <param name="parent-tag">v5.15.12-lts-lgpl</param> <param name="changesgenerate">enable</param> </service> <service name="set_version" mode="disabled"/> ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.5mND3e/_old 2024-01-04 15:55:51.229135416 +0100 +++ /var/tmp/diff_new_pack.5mND3e/_new 2024-01-04 15:55:51.229135416 +0100 @@ -1,6 +1,6 @@ <servicedata> <service name="tar_scm"> <param name="url">https://invent.kde.org/qt/qt/qtwayland.git</param> - <param name="changesrevision">4de268cbaf6ff3b633429577f06d3d746a3b202a</param></service></servicedata> + <param name="changesrevision">c84d171fa84065fb3b4b6b3d33e7707676d87e47</param></service></servicedata> (No newline at EOF) ++++++ qtwayland-everywhere-src-5.15.11+kde59.obscpio -> qtwayland-everywhere-src-5.15.12+kde60.obscpio ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwayland-everywhere-src-5.15.11+kde59/.qmake.conf new/qtwayland-everywhere-src-5.15.12+kde60/.qmake.conf --- old/qtwayland-everywhere-src-5.15.11+kde59/.qmake.conf 2023-10-04 22:59:02.000000000 +0200 +++ new/qtwayland-everywhere-src-5.15.12+kde60/.qmake.conf 2023-12-28 23:39:22.000000000 +0100 @@ -4,4 +4,4 @@ DEFINES += QT_NO_JAVA_STYLE_ITERATORS DEFINES += QT_NO_LINKED_LIST -MODULE_VERSION = 5.15.11 +MODULE_VERSION = 5.15.12 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwayland-everywhere-src-5.15.11+kde59/src/client/qwaylanddatadevice.cpp new/qtwayland-everywhere-src-5.15.12+kde60/src/client/qwaylanddatadevice.cpp --- old/qtwayland-everywhere-src-5.15.11+kde59/src/client/qwaylanddatadevice.cpp 2023-10-04 22:59:02.000000000 +0200 +++ new/qtwayland-everywhere-src-5.15.12+kde60/src/client/qwaylanddatadevice.cpp 2023-12-28 23:39:22.000000000 +0100 @@ -124,6 +124,12 @@ return false; } + // dragging data without mimetypes is a legal operation in Qt terms + // but Wayland uses a mimetype to determine if a drag is accepted or not + // In this rare case, insert a placeholder + if (mimeData->formats().isEmpty()) + mimeData->setData(QString::fromLatin1("application/x-qt-avoid-empty-placeholder"), QByteArray("1")); + m_dragSource.reset(new QWaylandDataSource(m_display->dndSelectionHandler(), mimeData)); if (wl_data_device_get_version(object()) >= 3) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwayland-everywhere-src-5.15.11+kde59/src/client/qwaylanddatasource.cpp new/qtwayland-everywhere-src-5.15.12+kde60/src/client/qwaylanddatasource.cpp --- old/qtwayland-everywhere-src-5.15.11+kde59/src/client/qwaylanddatasource.cpp 2023-10-04 22:59:02.000000000 +0200 +++ new/qtwayland-everywhere-src-5.15.12+kde60/src/client/qwaylanddatasource.cpp 2023-12-28 23:39:22.000000000 +0100 @@ -49,6 +49,7 @@ #include <unistd.h> #include <signal.h> +#include <fcntl.h> QT_BEGIN_NAMESPACE @@ -88,7 +89,15 @@ action.sa_flags = 0; sigaction(SIGPIPE, &action, &oldAction); - write(fd, content.constData(), content.size()); + // Some compositors (e.g., mutter) make fd with O_NONBLOCK. + // Since wl_data_source.send describes that fd is closed here, + // it should be done in a loop and don't have any advantage. + // Blocking operation will be used. + // According to fcntl(2), FSETFL ignores O_WRONLY. So this + // call will just remove O_NONBLOCK. + fcntl(fd, F_SETFL, O_WRONLY); + ssize_t unused = write(fd, content.constData(), content.size()); + Q_UNUSED(unused); sigaction(SIGPIPE, &oldAction, nullptr); } close(fd); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwayland-everywhere-src-5.15.11+kde59/src/client/qwaylandinputdevice.cpp new/qtwayland-everywhere-src-5.15.12+kde60/src/client/qwaylandinputdevice.cpp --- old/qtwayland-everywhere-src-5.15.11+kde59/src/client/qwaylandinputdevice.cpp 2023-10-04 22:59:02.000000000 +0200 +++ new/qtwayland-everywhere-src-5.15.12+kde60/src/client/qwaylandinputdevice.cpp 2023-12-28 23:39:22.000000000 +0100 @@ -263,7 +263,7 @@ int QWaylandInputDevice::Pointer::cursorSize() const { - constexpr int defaultCursorSize = 32; + constexpr int defaultCursorSize = 24; static const int xCursorSize = qEnvironmentVariableIntValue("XCURSOR_SIZE"); return xCursorSize > 0 ? xCursorSize : defaultCursorSize; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwayland-everywhere-src-5.15.11+kde59/src/client/qwaylandprimaryselectionv1.cpp new/qtwayland-everywhere-src-5.15.12+kde60/src/client/qwaylandprimaryselectionv1.cpp --- old/qtwayland-everywhere-src-5.15.11+kde59/src/client/qwaylandprimaryselectionv1.cpp 2023-10-04 22:59:02.000000000 +0200 +++ new/qtwayland-everywhere-src-5.15.12+kde60/src/client/qwaylandprimaryselectionv1.cpp 2023-12-28 23:39:22.000000000 +0100 @@ -155,7 +155,8 @@ action.sa_flags = 0; sigaction(SIGPIPE, &action, &oldAction); - write(fd, content.constData(), size_t(content.size())); + ssize_t unused = write(fd, content.constData(), size_t(content.size())); + Q_UNUSED(unused); sigaction(SIGPIPE, &oldAction, nullptr); } close(fd); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwayland-everywhere-src-5.15.11+kde59/src/client/qwaylandwindow.cpp new/qtwayland-everywhere-src-5.15.12+kde60/src/client/qwaylandwindow.cpp --- old/qtwayland-everywhere-src-5.15.11+kde59/src/client/qwaylandwindow.cpp 2023-10-04 22:59:02.000000000 +0200 +++ new/qtwayland-everywhere-src-5.15.12+kde60/src/client/qwaylandwindow.cpp 2023-12-28 23:39:22.000000000 +0100 @@ -1080,7 +1080,10 @@ void QWaylandWindow::restoreMouseCursor(QWaylandInputDevice *device) { - setMouseCursor(device, window()->cursor()); + if (const QCursor *overrideCursor = QGuiApplication::overrideCursor()) + setMouseCursor(device, *overrideCursor); + else + setMouseCursor(device, window()->cursor()); } #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwayland-everywhere-src-5.15.11+kde59/tests/auto/client/seatv4/tst_seatv4.cpp new/qtwayland-everywhere-src-5.15.12+kde60/tests/auto/client/seatv4/tst_seatv4.cpp --- old/qtwayland-everywhere-src-5.15.11+kde59/tests/auto/client/seatv4/tst_seatv4.cpp 2023-10-04 22:59:02.000000000 +0200 +++ new/qtwayland-everywhere-src-5.15.12+kde60/tests/auto/client/seatv4/tst_seatv4.cpp 2023-12-28 23:39:22.000000000 +0100 @@ -63,6 +63,7 @@ { Q_OBJECT private slots: + void init(); void cleanup(); void bindsToSeat(); void keyboardKeyPress(); @@ -85,6 +86,12 @@ #endif }; +void tst_seatv4::init() +{ + // Remove the extra outputs to clean up for the next test + exec([&] { while (auto *o = output(1)) remove(o); }); +} + void tst_seatv4::cleanup() { QTRY_VERIFY2(isClean(), qPrintable(dirtyMessage())); @@ -135,7 +142,7 @@ window.show(); QCOMPOSITOR_TRY_VERIFY(xdgSurface() && xdgSurface()->m_committedConfigureSerial); - exec([&] { pointer()->sendEnter(xdgSurface()->m_surface, {32, 32}); }); + exec([&] { pointer()->sendEnter(xdgSurface()->m_surface, {24, 24}); }); QCOMPOSITOR_TRY_VERIFY(cursorSurface()); } @@ -360,7 +367,7 @@ static uint defaultCursorSize() { const int xCursorSize = qEnvironmentVariableIntValue("XCURSOR_SIZE"); - return xCursorSize > 0 ? uint(xCursorSize) : 32; + return xCursorSize > 0 ? uint(xCursorSize) : 24; } void tst_seatv4::scaledCursor() ++++++ qtwayland-everywhere-src.obsinfo ++++++ --- /var/tmp/diff_new_pack.5mND3e/_old 2024-01-04 15:55:51.705152805 +0100 +++ /var/tmp/diff_new_pack.5mND3e/_new 2024-01-04 15:55:51.705152805 +0100 @@ -1,5 +1,5 @@ name: qtwayland-everywhere-src -version: 5.15.11+kde59 -mtime: 1696453142 -commit: 4de268cbaf6ff3b633429577f06d3d746a3b202a +version: 5.15.12+kde60 +mtime: 1703803162 +commit: c84d171fa84065fb3b4b6b3d33e7707676d87e47