Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package qt6-wayland for openSUSE:Factory checked in at 2024-05-27 11:45:22 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/qt6-wayland (Old) and /work/SRC/openSUSE:Factory/.qt6-wayland.new.24587 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qt6-wayland" Mon May 27 11:45:22 2024 rev:33 rq:1176079 version:6.7.1 Changes: -------- --- /work/SRC/openSUSE:Factory/qt6-wayland/qt6-wayland.changes 2024-04-08 17:43:37.078513128 +0200 +++ /work/SRC/openSUSE:Factory/.qt6-wayland.new.24587/qt6-wayland.changes 2024-05-27 11:46:58.066249122 +0200 @@ -1,0 +2,6 @@ +Tue May 21 08:31:51 UTC 2024 - Christophe Marin <christo...@krop.fr> + +- Update to 6.7.1: + * https://www.qt.io/blog/qt-6.7.1-released + +------------------------------------------------------------------- Old: ---- qtwayland-everywhere-src-6.7.0.tar.xz New: ---- qtwayland-everywhere-src-6.7.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qt6-wayland.spec ++++++ --- /var/tmp/diff_new_pack.pIBhbe/_old 2024-05-27 11:46:59.246292362 +0200 +++ /var/tmp/diff_new_pack.pIBhbe/_new 2024-05-27 11:46:59.246292362 +0200 @@ -16,7 +16,7 @@ # -%define real_version 6.7.0 +%define real_version 6.7.1 %define short_version 6.7 %define tar_name qtwayland-everywhere-src %define tar_suffix %{nil} @@ -30,13 +30,13 @@ %global with_opengl 1 %endif Name: qt6-wayland%{?pkg_suffix} -Version: 6.7.0 +Version: 6.7.1 Release: 0 Summary: Qt 6 Wayland libraries and tools # The wayland compositor files are GPL-3.0-or-later License: GPL-3.0-or-later AND (LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-or-later) URL: https://www.qt.io -Source: https://download.qt.io/official_releases/qt/%{short_version}/%{real_version}%{tar_suffix}/submodules/%{tar_name}-%{real_version}%{tar_suffix}.tar.xz +Source0: https://download.qt.io/official_releases/qt/%{short_version}/%{real_version}%{tar_suffix}/submodules/%{tar_name}-%{real_version}%{tar_suffix}.tar.xz Source99: qt6-wayland-rpmlintrc BuildRequires: pkgconfig BuildRequires: qt6-core-private-devel ++++++ qtwayland-everywhere-src-6.7.0.tar.xz -> qtwayland-everywhere-src-6.7.1.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwayland-everywhere-src-6.7.0/.cmake.conf new/qtwayland-everywhere-src-6.7.1/.cmake.conf --- old/qtwayland-everywhere-src-6.7.0/.cmake.conf 2024-03-22 19:51:23.000000000 +0100 +++ new/qtwayland-everywhere-src-6.7.1/.cmake.conf 2024-05-09 01:15:10.000000000 +0200 @@ -1,4 +1,4 @@ -set(QT_REPO_MODULE_VERSION "6.7.0") +set(QT_REPO_MODULE_VERSION "6.7.1") set(QT_REPO_MODULE_PRERELEASE_VERSION_SEGMENT "alpha1") set(QT_EXTRA_INTERNAL_TARGET_DEFINES "QT_NO_AS_CONST=1") list(APPEND QT_EXTRA_INTERNAL_TARGET_DEFINES "QT_NO_FOREACH=1") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwayland-everywhere-src-6.7.0/.tag new/qtwayland-everywhere-src-6.7.1/.tag --- old/qtwayland-everywhere-src-6.7.0/.tag 2024-03-22 19:51:23.000000000 +0100 +++ new/qtwayland-everywhere-src-6.7.1/.tag 2024-05-09 01:15:10.000000000 +0200 @@ -1 +1 @@ -b71592631fa653985bf6f0e3024244460a42e5a6 +c898ccb3d1596cf8448995c9cd5e93ffe2027c5e diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwayland-everywhere-src-6.7.0/config.tests/wayland_scanner/main.cpp new/qtwayland-everywhere-src-6.7.1/config.tests/wayland_scanner/main.cpp --- old/qtwayland-everywhere-src-6.7.0/config.tests/wayland_scanner/main.cpp 2024-03-22 19:51:23.000000000 +0100 +++ new/qtwayland-everywhere-src-6.7.1/config.tests/wayland_scanner/main.cpp 2024-05-09 01:15:10.000000000 +0200 @@ -1,5 +1,5 @@ // Copyright (C) 2017 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause +// SPDX-License-Identifier: BSD-3-Clause //If wayland-scanner is available, the following file should exist #include "wayland-scanner-test-client-protocol.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwayland-everywhere-src-6.7.0/dependencies.yaml new/qtwayland-everywhere-src-6.7.1/dependencies.yaml --- old/qtwayland-everywhere-src-6.7.0/dependencies.yaml 2024-03-22 19:51:23.000000000 +0100 +++ new/qtwayland-everywhere-src-6.7.1/dependencies.yaml 2024-05-09 01:15:10.000000000 +0200 @@ -1,7 +1,7 @@ dependencies: ../qtbase: - ref: 98602c26fc97eb41e3dd7548194ca637420a31b9 + ref: c195fe7d33decbd5ddd47ae46dbf8e0d9c20ba85 required: true ../qtdeclarative: - ref: e6d14fcdc95713f65367499629f93fb1f1e35ec9 + ref: 734849e4577b75e85420b08ddb55974482bbd063 required: false diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwayland-everywhere-src-6.7.0/examples/CMakeLists.txt new/qtwayland-everywhere-src-6.7.1/examples/CMakeLists.txt --- old/qtwayland-everywhere-src-6.7.0/examples/CMakeLists.txt 2024-03-22 19:51:23.000000000 +0100 +++ new/qtwayland-everywhere-src-6.7.1/examples/CMakeLists.txt 2024-05-09 01:15:10.000000000 +0200 @@ -1,5 +1,5 @@ # Copyright (C) 2022 The Qt Company Ltd. -# SPDX-License-Identifier: BSD-3-Clause +# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause qt_examples_build_begin(EXTERNAL_BUILD) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwayland-everywhere-src-6.7.0/examples/wayland/CMakeLists.txt new/qtwayland-everywhere-src-6.7.1/examples/wayland/CMakeLists.txt --- old/qtwayland-everywhere-src-6.7.0/examples/wayland/CMakeLists.txt 2024-03-22 19:51:23.000000000 +0100 +++ new/qtwayland-everywhere-src-6.7.1/examples/wayland/CMakeLists.txt 2024-05-09 01:15:10.000000000 +0200 @@ -1,5 +1,5 @@ # Copyright (C) 2022 The Qt Company Ltd. -# SPDX-License-Identifier: BSD-3-Clause +# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause if(QT_FEATURE_wayland_server) if(QT_FEATURE_opengl) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwayland-everywhere-src-6.7.0/examples/wayland/custom-extension/CMakeLists.txt new/qtwayland-everywhere-src-6.7.1/examples/wayland/custom-extension/CMakeLists.txt --- old/qtwayland-everywhere-src-6.7.0/examples/wayland/custom-extension/CMakeLists.txt 2024-03-22 19:51:23.000000000 +0100 +++ new/qtwayland-everywhere-src-6.7.1/examples/wayland/custom-extension/CMakeLists.txt 2024-05-09 01:15:10.000000000 +0200 @@ -1,5 +1,5 @@ # Copyright (C) 2022 The Qt Company Ltd. -# SPDX-License-Identifier: BSD-3-Clause +# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause cmake_minimum_required(VERSION 3.16) project(custom-extension) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwayland-everywhere-src-6.7.0/examples/wayland/custom-extension/compositor/CMakeLists.txt new/qtwayland-everywhere-src-6.7.1/examples/wayland/custom-extension/compositor/CMakeLists.txt --- old/qtwayland-everywhere-src-6.7.0/examples/wayland/custom-extension/compositor/CMakeLists.txt 2024-03-22 19:51:23.000000000 +0100 +++ new/qtwayland-everywhere-src-6.7.1/examples/wayland/custom-extension/compositor/CMakeLists.txt 2024-05-09 01:15:10.000000000 +0200 @@ -1,5 +1,5 @@ # Copyright (C) 2022 The Qt Company Ltd. -# SPDX-License-Identifier: BSD-3-Clause +# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause cmake_minimum_required(VERSION 3.16) project(custom-extension-compositor) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwayland-everywhere-src-6.7.0/examples/wayland/custom-extension/cpp-client/CMakeLists.txt new/qtwayland-everywhere-src-6.7.1/examples/wayland/custom-extension/cpp-client/CMakeLists.txt --- old/qtwayland-everywhere-src-6.7.0/examples/wayland/custom-extension/cpp-client/CMakeLists.txt 2024-03-22 19:51:23.000000000 +0100 +++ new/qtwayland-everywhere-src-6.7.1/examples/wayland/custom-extension/cpp-client/CMakeLists.txt 2024-05-09 01:15:10.000000000 +0200 @@ -1,5 +1,5 @@ # Copyright (C) 2022 The Qt Company Ltd. -# SPDX-License-Identifier: BSD-3-Clause +# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause cmake_minimum_required(VERSION 3.16) project(custom-extension-cpp-client) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwayland-everywhere-src-6.7.0/examples/wayland/custom-extension/qml-client/CMakeLists.txt new/qtwayland-everywhere-src-6.7.1/examples/wayland/custom-extension/qml-client/CMakeLists.txt --- old/qtwayland-everywhere-src-6.7.0/examples/wayland/custom-extension/qml-client/CMakeLists.txt 2024-03-22 19:51:23.000000000 +0100 +++ new/qtwayland-everywhere-src-6.7.1/examples/wayland/custom-extension/qml-client/CMakeLists.txt 2024-05-09 01:15:10.000000000 +0200 @@ -1,5 +1,5 @@ # Copyright (C) 2022 The Qt Company Ltd. -# SPDX-License-Identifier: BSD-3-Clause +# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause cmake_minimum_required(VERSION 3.16) project(custom-extension-qml-client) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwayland-everywhere-src-6.7.0/examples/wayland/custom-shell/client-plugin/CMakeLists.txt new/qtwayland-everywhere-src-6.7.1/examples/wayland/custom-shell/client-plugin/CMakeLists.txt --- old/qtwayland-everywhere-src-6.7.0/examples/wayland/custom-shell/client-plugin/CMakeLists.txt 2024-03-22 19:51:23.000000000 +0100 +++ new/qtwayland-everywhere-src-6.7.1/examples/wayland/custom-shell/client-plugin/CMakeLists.txt 2024-05-09 01:15:10.000000000 +0200 @@ -1,5 +1,5 @@ # Copyright (C) 2022 The Qt Company Ltd. -# SPDX-License-Identifier: BSD-3-Clause +# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause cmake_minimum_required(VERSION 3.14) project(exampleshellplugin LANGUAGES CXX) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwayland-everywhere-src-6.7.0/examples/wayland/custom-shell/compositor/CMakeLists.txt new/qtwayland-everywhere-src-6.7.1/examples/wayland/custom-shell/compositor/CMakeLists.txt --- old/qtwayland-everywhere-src-6.7.0/examples/wayland/custom-shell/compositor/CMakeLists.txt 2024-03-22 19:51:23.000000000 +0100 +++ new/qtwayland-everywhere-src-6.7.1/examples/wayland/custom-shell/compositor/CMakeLists.txt 2024-05-09 01:15:10.000000000 +0200 @@ -1,5 +1,5 @@ # Copyright (C) 2022 The Qt Company Ltd. -# SPDX-License-Identifier: BSD-3-Clause +# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause cmake_minimum_required(VERSION 3.14) project(custom-shell-compositor) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwayland-everywhere-src-6.7.0/examples/wayland/fancy-compositor/CMakeLists.txt new/qtwayland-everywhere-src-6.7.1/examples/wayland/fancy-compositor/CMakeLists.txt --- old/qtwayland-everywhere-src-6.7.0/examples/wayland/fancy-compositor/CMakeLists.txt 2024-03-22 19:51:23.000000000 +0100 +++ new/qtwayland-everywhere-src-6.7.1/examples/wayland/fancy-compositor/CMakeLists.txt 2024-05-09 01:15:10.000000000 +0200 @@ -1,5 +1,5 @@ # Copyright (C) 2022 The Qt Company Ltd. -# SPDX-License-Identifier: BSD-3-Clause +# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause cmake_minimum_required(VERSION 3.16) project(fancy-compositor LANGUAGES CXX) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwayland-everywhere-src-6.7.0/examples/wayland/ivi-compositor/CMakeLists.txt new/qtwayland-everywhere-src-6.7.1/examples/wayland/ivi-compositor/CMakeLists.txt --- old/qtwayland-everywhere-src-6.7.0/examples/wayland/ivi-compositor/CMakeLists.txt 2024-03-22 19:51:23.000000000 +0100 +++ new/qtwayland-everywhere-src-6.7.1/examples/wayland/ivi-compositor/CMakeLists.txt 2024-05-09 01:15:10.000000000 +0200 @@ -1,5 +1,5 @@ # Copyright (C) 2022 The Qt Company Ltd. -# SPDX-License-Identifier: BSD-3-Clause +# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause cmake_minimum_required(VERSION 3.16) project(ivi-compositor LANGUAGES CXX) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwayland-everywhere-src-6.7.0/examples/wayland/minimal-cpp/CMakeLists.txt new/qtwayland-everywhere-src-6.7.1/examples/wayland/minimal-cpp/CMakeLists.txt --- old/qtwayland-everywhere-src-6.7.0/examples/wayland/minimal-cpp/CMakeLists.txt 2024-03-22 19:51:23.000000000 +0100 +++ new/qtwayland-everywhere-src-6.7.1/examples/wayland/minimal-cpp/CMakeLists.txt 2024-05-09 01:15:10.000000000 +0200 @@ -1,5 +1,5 @@ # Copyright (C) 2022 The Qt Company Ltd. -# SPDX-License-Identifier: BSD-3-Clause +# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause cmake_minimum_required(VERSION 3.16) project(minimal-cpp LANGUAGES CXX) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwayland-everywhere-src-6.7.0/examples/wayland/minimal-qml/CMakeLists.txt new/qtwayland-everywhere-src-6.7.1/examples/wayland/minimal-qml/CMakeLists.txt --- old/qtwayland-everywhere-src-6.7.0/examples/wayland/minimal-qml/CMakeLists.txt 2024-03-22 19:51:23.000000000 +0100 +++ new/qtwayland-everywhere-src-6.7.1/examples/wayland/minimal-qml/CMakeLists.txt 2024-05-09 01:15:10.000000000 +0200 @@ -1,5 +1,5 @@ # Copyright (C) 2022 The Qt Company Ltd. -# SPDX-License-Identifier: BSD-3-Clause +# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause cmake_minimum_required(VERSION 3.16) project(minimal-qml LANGUAGES CXX) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwayland-everywhere-src-6.7.0/examples/wayland/multi-output/CMakeLists.txt new/qtwayland-everywhere-src-6.7.1/examples/wayland/multi-output/CMakeLists.txt --- old/qtwayland-everywhere-src-6.7.0/examples/wayland/multi-output/CMakeLists.txt 2024-03-22 19:51:23.000000000 +0100 +++ new/qtwayland-everywhere-src-6.7.1/examples/wayland/multi-output/CMakeLists.txt 2024-05-09 01:15:10.000000000 +0200 @@ -1,5 +1,5 @@ # Copyright (C) 2022 The Qt Company Ltd. -# SPDX-License-Identifier: BSD-3-Clause +# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause cmake_minimum_required(VERSION 3.16) project(multi-output LANGUAGES CXX) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwayland-everywhere-src-6.7.0/examples/wayland/multi-screen/CMakeLists.txt new/qtwayland-everywhere-src-6.7.1/examples/wayland/multi-screen/CMakeLists.txt --- old/qtwayland-everywhere-src-6.7.0/examples/wayland/multi-screen/CMakeLists.txt 2024-03-22 19:51:23.000000000 +0100 +++ new/qtwayland-everywhere-src-6.7.1/examples/wayland/multi-screen/CMakeLists.txt 2024-05-09 01:15:10.000000000 +0200 @@ -1,5 +1,5 @@ # Copyright (C) 2022 The Qt Company Ltd. -# SPDX-License-Identifier: BSD-3-Clause +# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause cmake_minimum_required(VERSION 3.16) project(multi-screen LANGUAGES CXX) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwayland-everywhere-src-6.7.0/examples/wayland/overview-compositor/CMakeLists.txt new/qtwayland-everywhere-src-6.7.1/examples/wayland/overview-compositor/CMakeLists.txt --- old/qtwayland-everywhere-src-6.7.0/examples/wayland/overview-compositor/CMakeLists.txt 2024-03-22 19:51:23.000000000 +0100 +++ new/qtwayland-everywhere-src-6.7.1/examples/wayland/overview-compositor/CMakeLists.txt 2024-05-09 01:15:10.000000000 +0200 @@ -1,5 +1,5 @@ # Copyright (C) 2022 The Qt Company Ltd. -# SPDX-License-Identifier: BSD-3-Clause +# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause cmake_minimum_required(VERSION 3.16) project(overview-compositor LANGUAGES CXX) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwayland-everywhere-src-6.7.0/examples/wayland/qtshell/CMakeLists.txt new/qtwayland-everywhere-src-6.7.1/examples/wayland/qtshell/CMakeLists.txt --- old/qtwayland-everywhere-src-6.7.0/examples/wayland/qtshell/CMakeLists.txt 2024-03-22 19:51:23.000000000 +0100 +++ new/qtwayland-everywhere-src-6.7.1/examples/wayland/qtshell/CMakeLists.txt 2024-05-09 01:15:10.000000000 +0200 @@ -1,5 +1,5 @@ # Copyright (C) 2022 The Qt Company Ltd. -# SPDX-License-Identifier: BSD-3-Clause +# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause cmake_minimum_required(VERSION 3.14) project(qtshell LANGUAGES CXX) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwayland-everywhere-src-6.7.0/examples/wayland/server-side-decoration/CMakeLists.txt new/qtwayland-everywhere-src-6.7.1/examples/wayland/server-side-decoration/CMakeLists.txt --- old/qtwayland-everywhere-src-6.7.0/examples/wayland/server-side-decoration/CMakeLists.txt 2024-03-22 19:51:23.000000000 +0100 +++ new/qtwayland-everywhere-src-6.7.1/examples/wayland/server-side-decoration/CMakeLists.txt 2024-05-09 01:15:10.000000000 +0200 @@ -1,5 +1,5 @@ # Copyright (C) 2022 The Qt Company Ltd. -# SPDX-License-Identifier: BSD-3-Clause +# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause cmake_minimum_required(VERSION 3.16) project(server-side-decoration LANGUAGES CXX) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwayland-everywhere-src-6.7.0/examples/wayland/spanning-screens/CMakeLists.txt new/qtwayland-everywhere-src-6.7.1/examples/wayland/spanning-screens/CMakeLists.txt --- old/qtwayland-everywhere-src-6.7.0/examples/wayland/spanning-screens/CMakeLists.txt 2024-03-22 19:51:23.000000000 +0100 +++ new/qtwayland-everywhere-src-6.7.1/examples/wayland/spanning-screens/CMakeLists.txt 2024-05-09 01:15:10.000000000 +0200 @@ -1,5 +1,5 @@ # Copyright (C) 2022 The Qt Company Ltd. -# SPDX-License-Identifier: BSD-3-Clause +# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause cmake_minimum_required(VERSION 3.16) project(spanning-screens LANGUAGES CXX) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwayland-everywhere-src-6.7.0/src/client/qwaylanddataoffer.cpp new/qtwayland-everywhere-src-6.7.1/src/client/qwaylanddataoffer.cpp --- old/qtwayland-everywhere-src-6.7.0/src/client/qwaylanddataoffer.cpp 2024-03-22 19:51:23.000000000 +0100 +++ new/qtwayland-everywhere-src-6.7.1/src/client/qwaylanddataoffer.cpp 2024-05-09 01:15:10.000000000 +0200 @@ -32,6 +32,11 @@ return QStringLiteral("text/x-moz-url"); } +static QString portalFileTransfer() +{ + return QStringLiteral("application/vnd.portal.filetransfer"); +} + static QByteArray convertData(const QString &originalMime, const QString &newMime, const QByteArray &data) { if (originalMime == newMime) @@ -214,7 +219,9 @@ content = convertData(mimeType, mime, content); - m_data.insert(mimeType, content); + if (mimeType != portalFileTransfer()) + m_data.insert(mimeType, content); + return content; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwayland-everywhere-src-6.7.0/src/client/qwaylandinputdevice.cpp new/qtwayland-everywhere-src-6.7.1/src/client/qwaylandinputdevice.cpp --- old/qtwayland-everywhere-src-6.7.0/src/client/qwaylandinputdevice.cpp 2024-03-22 19:51:23.000000000 +0100 +++ new/qtwayland-everywhere-src-6.7.1/src/client/qwaylandinputdevice.cpp 2024-05-09 01:15:10.000000000 +0200 @@ -69,11 +69,12 @@ return; } mRepeatTimer.setInterval(1000 / mRepeatRate); - handleKey(mRepeatKey.time, QEvent::KeyRelease, mRepeatKey.key, mRepeatKey.modifiers, - mRepeatKey.code, mRepeatKey.nativeVirtualKey, mRepeatKey.nativeModifiers, + Qt::KeyboardModifiers modifiers = this->modifiers(); + handleKey(mRepeatKey.time, QEvent::KeyRelease, mRepeatKey.key, modifiers, + mRepeatKey.code, mRepeatKey.nativeVirtualKey, this->mNativeModifiers, mRepeatKey.text, true); - handleKey(mRepeatKey.time, QEvent::KeyPress, mRepeatKey.key, mRepeatKey.modifiers, - mRepeatKey.code, mRepeatKey.nativeVirtualKey, mRepeatKey.nativeModifiers, + handleKey(mRepeatKey.time, QEvent::KeyPress, mRepeatKey.key, modifiers, + mRepeatKey.code, mRepeatKey.nativeVirtualKey, this->mNativeModifiers, mRepeatKey.text, true); }); } @@ -829,6 +830,8 @@ default: return; // invalid button number (as far as Qt is concerned) } + mLastButton = qt_button; + if (state) mButtons |= qt_button; else @@ -867,10 +870,13 @@ void QWaylandInputDevice::Pointer::releaseButtons() { + if (mButtons == Qt::NoButton) + return; + mButtons = Qt::NoButton; if (auto *window = focusWindow()) { - ReleaseEvent e(focusWindow(), mParent->mTime, mSurfacePos, mGlobalPos, mButtons, Qt::NoButton, mParent->modifiers()); + ReleaseEvent e(focusWindow(), mParent->mTime, mSurfacePos, mGlobalPos, mButtons, mLastButton, mParent->modifiers()); window->handleMouse(mParent, e); } } @@ -1349,8 +1355,6 @@ mRepeatKey.code = code; mRepeatKey.time = time; mRepeatKey.text = text; - mRepeatKey.modifiers = modifiers; - mRepeatKey.nativeModifiers = mNativeModifiers; mRepeatKey.nativeVirtualKey = sym; mRepeatTimer.setInterval(mRepeatDelay); mRepeatTimer.start(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwayland-everywhere-src-6.7.0/src/client/qwaylandinputdevice_p.h new/qtwayland-everywhere-src-6.7.1/src/client/qwaylandinputdevice_p.h --- old/qtwayland-everywhere-src-6.7.0/src/client/qwaylandinputdevice_p.h 2024-03-22 19:51:23.000000000 +0100 +++ new/qtwayland-everywhere-src-6.7.1/src/client/qwaylandinputdevice_p.h 2024-05-09 01:15:10.000000000 +0200 @@ -237,9 +237,7 @@ uint32_t code = 0; uint32_t time = 0 ; QString text; - Qt::KeyboardModifiers modifiers; uint32_t nativeVirtualKey = 0; - uint32_t nativeModifiers = 0; } mRepeatKey; QTimer mRepeatTimer; @@ -340,6 +338,7 @@ QPointF mSurfacePos; QPointF mGlobalPos; Qt::MouseButtons mButtons = Qt::NoButton; + Qt::MouseButton mLastButton = Qt::NoButton; struct FrameData { QWaylandPointerEvent *event = nullptr; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwayland-everywhere-src-6.7.0/src/client/qwaylandscreen.cpp new/qtwayland-everywhere-src-6.7.1/src/client/qwaylandscreen.cpp --- old/qtwayland-everywhere-src-6.7.0/src/client/qwaylandscreen.cpp 2024-03-22 19:51:23.000000000 +0100 +++ new/qtwayland-everywhere-src-6.7.1/src/client/qwaylandscreen.cpp 2024-05-09 01:15:10.000000000 +0200 @@ -163,6 +163,16 @@ return list; } +QWindow *QWaylandScreen::topLevelAt(const QPoint & pos) const +{ + if (QWaylandWindow::fixedToplevelPositions) { + Q_UNUSED(pos); + return nullptr; + } + + return QPlatformScreen::topLevelAt(pos); +} + Qt::ScreenOrientation QWaylandScreen::orientation() const { return m_orientation; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwayland-everywhere-src-6.7.0/src/client/qwaylandscreen_p.h new/qtwayland-everywhere-src-6.7.1/src/client/qwaylandscreen_p.h --- old/qtwayland-everywhere-src-6.7.0/src/client/qwaylandscreen_p.h 2024-03-22 19:51:23.000000000 +0100 +++ new/qtwayland-everywhere-src-6.7.1/src/client/qwaylandscreen_p.h 2024-05-09 01:15:10.000000000 +0200 @@ -62,6 +62,8 @@ QDpi logicalDpi() const override; QList<QPlatformScreen *> virtualSiblings() const override; + QWindow *topLevelAt(const QPoint &point) const override; + Qt::ScreenOrientation orientation() const override; int scale() const; qreal devicePixelRatio() const override; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwayland-everywhere-src-6.7.0/src/client/qwaylandtextinputv3.cpp new/qtwayland-everywhere-src-6.7.1/src/client/qwaylandtextinputv3.cpp --- old/qtwayland-everywhere-src-6.7.0/src/client/qwaylandtextinputv3.cpp 2024-03-22 19:51:23.000000000 +0100 +++ new/qtwayland-everywhere-src-6.7.1/src/client/qwaylandtextinputv3.cpp 2024-05-09 01:15:10.000000000 +0200 @@ -67,7 +67,6 @@ m_currentPreeditString.clear(); m_surface = nullptr; - m_currentSerial = 0U; disable(); qCDebug(qLcQpaWaylandTextInput) << Q_FUNC_INFO << "Done"; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwayland-everywhere-src-6.7.0/src/client/qwaylandwindow.cpp new/qtwayland-everywhere-src-6.7.1/src/client/qwaylandwindow.cpp --- old/qtwayland-everywhere-src-6.7.0/src/client/qwaylandwindow.cpp 2024-03-22 19:51:23.000000000 +0100 +++ new/qtwayland-everywhere-src-6.7.1/src/client/qwaylandwindow.cpp 2024-05-09 01:15:10.000000000 +0200 @@ -184,7 +184,9 @@ } } - if (display()->viewporter()) { + // The fractional scale manager check is needed to work around Gnome < 36 where viewports don't work + // Right now viewports are only necessary when a fractional scale manager is used + if (display()->viewporter() && display()->fractionalScaleManager()) { mViewport.reset(new QWaylandViewport(display()->createViewport(this))); } @@ -1708,15 +1710,21 @@ bool QWaylandWindow::startSystemResize(Qt::Edges edges) { - if (auto *seat = display()->lastInputDevice()) - return mShellSurface && mShellSurface->resize(seat, edges); + if (auto *seat = display()->lastInputDevice()) { + bool rc = mShellSurface && mShellSurface->resize(seat, edges); + seat->handleEndDrag(); + return rc; + } return false; } bool QtWaylandClient::QWaylandWindow::startSystemMove() { - if (auto seat = display()->lastInputDevice()) - return mShellSurface && mShellSurface->move(seat); + if (auto seat = display()->lastInputDevice()) { + bool rc = mShellSurface && mShellSurface->move(seat); + seat->handleEndDrag(); + return rc; + } return false; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwayland-everywhere-src-6.7.0/src/compositor/compositor_api/qwaylandquickitem.cpp new/qtwayland-everywhere-src-6.7.1/src/compositor/compositor_api/qwaylandquickitem.cpp --- old/qtwayland-everywhere-src-6.7.0/src/compositor/compositor_api/qwaylandquickitem.cpp 2024-03-22 19:51:23.000000000 +0100 +++ new/qtwayland-everywhere-src-6.7.1/src/compositor/compositor_api/qwaylandquickitem.cpp 2024-05-09 01:15:10.000000000 +0200 @@ -158,9 +158,9 @@ descData->inVars = { texCoordInput }; QShaderDescription::InOutVariable fragColorOutput; - texCoordInput.name = "gl_FragColor"; - texCoordInput.type = QShaderDescription::Vec4; - texCoordInput.location = 0; + fragColorOutput.name = "gl_FragColor"; + fragColorOutput.type = QShaderDescription::Vec4; + fragColorOutput.location = 0; descData->outVars = { fragColorOutput }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwayland-everywhere-src-6.7.0/src/compositor/compositor_api/qwaylandseat.cpp new/qtwayland-everywhere-src-6.7.1/src/compositor/compositor_api/qwaylandseat.cpp --- old/qtwayland-everywhere-src-6.7.0/src/compositor/compositor_api/qwaylandseat.cpp 2024-03-22 19:51:23.000000000 +0100 +++ new/qtwayland-everywhere-src-6.7.1/src/compositor/compositor_api/qwaylandseat.cpp 2024-05-09 01:15:10.000000000 +0200 @@ -598,11 +598,10 @@ qWarning("Can't send a unicode key event, no keyboard focus, fix the compositor"); return; } - #if QT_CONFIG(im) - // make a keysym value for the UCS4 - const uint keysym = 0x01000000 | unicode; - auto text = QXkbCommon::lookupStringNoKeysymTransformations(keysym); + QString text; + text += QChar::fromUcs4(static_cast<char32_t>(unicode)); + QKeyEvent event(eventType, Qt::Key_unknown, Qt::KeyboardModifiers{}, text); if (keyboardFocus()->client()->textInputProtocols().testFlag(QWaylandClient::TextInputProtocol::TextInputV2)) { QWaylandTextInput *textInput = QWaylandTextInput::findIn(this); @@ -630,7 +629,7 @@ } } #else - Q_UNUSED(keysym); + Q_UNUSED(unicode); Q_UNUSED(eventType); qWarning() << "Can't send a unicode key event: Unable to find a text-input protocol."; #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwayland-everywhere-src-6.7.0/src/compositor/extensions/qwaylandtextinputv3.cpp new/qtwayland-everywhere-src-6.7.1/src/compositor/extensions/qwaylandtextinputv3.cpp --- old/qtwayland-everywhere-src-6.7.0/src/compositor/extensions/qwaylandtextinputv3.cpp 2024-03-22 19:51:23.000000000 +0100 +++ new/qtwayland-everywhere-src-6.7.1/src/compositor/extensions/qwaylandtextinputv3.cpp 2024-05-09 01:15:10.000000000 +0200 @@ -126,7 +126,7 @@ } if (needsDone) - send_done(focusResource->handle, serial); + send_done(focusResource->handle, serials[focusResource]); } @@ -139,7 +139,7 @@ send_commit_string(focusResource->handle, event->text()); - send_done(focusResource->handle, serial); + send_done(focusResource->handle, serials[focusResource]); } QVariant QWaylandTextInputV3Private::inputMethodQuery(Qt::InputMethodQuery property, QVariant argument) const @@ -188,7 +188,7 @@ void QWaylandTextInputV3Private::setFocus(QWaylandSurface *surface) { - qCDebug(qLcWaylandCompositorTextInput) << Q_FUNC_INFO; + qCDebug(qLcWaylandCompositorTextInput) << Q_FUNC_INFO << surface; if (focusResource && focus) { // sync before leave @@ -225,13 +225,14 @@ { qCDebug(qLcWaylandCompositorTextInput) << Q_FUNC_INFO; - Q_UNUSED(resource); + serials.insert(resource, 0); } void QWaylandTextInputV3Private::zwp_text_input_v3_destroy_resource(Resource *resource) { qCDebug(qLcWaylandCompositorTextInput) << Q_FUNC_INFO; + serials.remove(resource); if (focusResource == resource) focusResource = nullptr; } @@ -254,7 +255,6 @@ enabledSurfaces.insert(resource, focus); emit q->surfaceEnabled(focus); - serial = 0; inputPanelVisible = true; qApp->inputMethod()->show(); } @@ -293,12 +293,7 @@ { qCDebug(qLcWaylandCompositorTextInput) << Q_FUNC_INFO; - if (resource != focusResource) { - qCDebug(qLcWaylandCompositorTextInput) << "OBS: Disabled surface!!"; - return; - } - - serial = serial < UINT_MAX ? serial + 1U : 0U; + serials[resource] = serials[resource] < UINT_MAX ? serials[resource] + 1U : 0U; // Just increase serials and ignore empty commits if (!pendingState->changedState) { @@ -488,7 +483,7 @@ void QWaylandTextInputV3::add(::wl_client *client, uint32_t id, int version) { - qCDebug(qLcWaylandCompositorTextInput) << Q_FUNC_INFO; + qCDebug(qLcWaylandCompositorTextInput) << Q_FUNC_INFO << client << id << version; Q_D(QWaylandTextInputV3); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwayland-everywhere-src-6.7.0/src/compositor/extensions/qwaylandtextinputv3_p.h new/qtwayland-everywhere-src-6.7.1/src/compositor/extensions/qwaylandtextinputv3_p.h --- old/qtwayland-everywhere-src-6.7.0/src/compositor/extensions/qwaylandtextinputv3_p.h 2024-03-22 19:51:23.000000000 +0100 +++ new/qtwayland-everywhere-src-6.7.1/src/compositor/extensions/qwaylandtextinputv3_p.h 2024-05-09 01:15:10.000000000 +0200 @@ -73,9 +73,8 @@ QScopedPointer<QWaylandTextInputV3ClientState> currentState; QScopedPointer<QWaylandTextInputV3ClientState> pendingState; - uint32_t serial = 0; - - QHash<Resource *, QWaylandSurface*> enabledSurfaces; + QHash<Resource *, uint32_t> serials; + QHash<Resource *, QWaylandSurface *> enabledSurfaces; protected: void zwp_text_input_v3_bind_resource(Resource *resource) override; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwayland-everywhere-src-6.7.0/src/configure.cmake new/qtwayland-everywhere-src-6.7.1/src/configure.cmake --- old/qtwayland-everywhere-src-6.7.0/src/configure.cmake 2024-03-22 19:51:23.000000000 +0100 +++ new/qtwayland-everywhere-src-6.7.1/src/configure.cmake 2024-05-09 01:15:10.000000000 +0200 @@ -260,6 +260,6 @@ qt_configure_add_report_entry( TYPE ERROR - MESSAGE "Qt Wayland Client requires QtGui to be build with support for wayland" + MESSAGE "Qt Gui has been built without 'wayland' feature. This feature is required for building Qt Wayland Client." CONDITION NOT QT_FEATURE_wayland AND QT_FEATURE_wayland_client ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwayland-everywhere-src-6.7.0/src/plugins/shellintegration/xdg-shell/qwaylandxdgshell.cpp new/qtwayland-everywhere-src-6.7.1/src/plugins/shellintegration/xdg-shell/qwaylandxdgshell.cpp --- old/qtwayland-everywhere-src-6.7.0/src/plugins/shellintegration/xdg-shell/qwaylandxdgshell.cpp 2024-03-22 19:51:23.000000000 +0100 +++ new/qtwayland-everywhere-src-6.7.1/src/plugins/shellintegration/xdg-shell/qwaylandxdgshell.cpp 2024-05-09 01:15:10.000000000 +0200 @@ -158,7 +158,7 @@ void QWaylandXdgSurface::Toplevel::xdg_toplevel_close() { - m_xdgSurface->m_window->window()->close(); + QWindowSystemInterface::handleCloseEvent(m_xdgSurface->m_window->window()); } void QWaylandXdgSurface::Toplevel::requestWindowFlags(Qt::WindowFlags flags) @@ -241,7 +241,9 @@ leave = m_xdgSurface->window()->window(); QWindowSystemInterface::handleLeaveEvent(leave); - if (QWindow *enter = QGuiApplication::topLevelAt(QCursor::pos())) { + QWindow *enter = nullptr; + if (m_parentXdgSurface && m_parentXdgSurface->window()) { + enter = m_parentXdgSurface->window()->window(); const auto pos = m_xdgSurface->window()->display()->waylandCursor()->pos(); QWindowSystemInterface::handleEnterEvent(enter, enter->handle()->mapFromGlobal(pos), pos); } @@ -589,11 +591,7 @@ // Synthesize Qt enter/leave events for popup if (!parent) return; - QWindow *current = QGuiApplication::topLevelAt(QCursor::pos()); QWindow *leave = parent->window(); - if (current != leave) - return; - QWindowSystemInterface::handleLeaveEvent(leave); QWindow *enter = nullptr; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwayland-everywhere-src-6.7.0/src/qtwaylandscanner/qtwaylandscanner.cpp new/qtwayland-everywhere-src-6.7.1/src/qtwaylandscanner/qtwaylandscanner.cpp --- old/qtwayland-everywhere-src-6.7.0/src/qtwaylandscanner/qtwaylandscanner.cpp 2024-03-22 19:51:23.000000000 +0100 +++ new/qtwayland-everywhere-src-6.7.1/src/qtwaylandscanner/qtwaylandscanner.cpp 2024-05-09 01:15:10.000000000 +0200 @@ -3,6 +3,7 @@ #include <QCoreApplication> #include <QFile> +#include <QFileInfo> #include <QXmlStreamReader> #include <vector> @@ -422,6 +423,8 @@ //QByteArray preProcessorProtocolName = QByteArray(m_protocolName).replace('-', '_').toUpper(); QByteArray preProcessorProtocolName = QByteArray(m_protocolName).toUpper(); + const QByteArray fileBaseName = QFileInfo(file).completeBaseName().toLocal8Bit(); + std::vector<WaylandInterface> interfaces; while (m_xml->readNextStartElement()) { @@ -467,9 +470,9 @@ printf("\n"); printf("#include \"wayland-server-core.h\"\n"); if (m_headerPath.isEmpty()) - printf("#include \"wayland-%s-server-protocol.h\"\n", QByteArray(m_protocolName).replace('_', '-').constData()); + printf("#include \"wayland-%s-server-protocol.h\"\n", fileBaseName.constData()); else - printf("#include <%s/wayland-%s-server-protocol.h>\n", m_headerPath.constData(), QByteArray(m_protocolName).replace('_', '-').constData()); + printf("#include <%s/wayland-%s-server-protocol.h>\n", m_headerPath.constData(), fileBaseName.constData()); printf("#include <QByteArray>\n"); printf("#include <QMultiMap>\n"); printf("#include <QString>\n"); @@ -632,9 +635,9 @@ if (m_option == ServerCode) { if (m_headerPath.isEmpty()) - printf("#include \"qwayland-server-%s.h\"\n", QByteArray(m_protocolName).replace('_', '-').constData()); + printf("#include \"qwayland-server-%s.h\"\n", fileBaseName.constData()); else - printf("#include <%s/qwayland-server-%s.h>\n", m_headerPath.constData(), QByteArray(m_protocolName).replace('_', '-').constData()); + printf("#include <%s/qwayland-server-%s.h>\n", m_headerPath.constData(), fileBaseName.constData()); printf("\n"); printf("QT_BEGIN_NAMESPACE\n"); printf("QT_WARNING_PUSH\n"); @@ -962,9 +965,9 @@ printf("#define %s\n", inclusionGuard.constData()); printf("\n"); if (m_headerPath.isEmpty()) - printf("#include \"wayland-%s-client-protocol.h\"\n", QByteArray(m_protocolName).replace('_', '-').constData()); + printf("#include \"wayland-%s-client-protocol.h\"\n", fileBaseName.constData()); else - printf("#include <%s/wayland-%s-client-protocol.h>\n", m_headerPath.constData(), QByteArray(m_protocolName).replace('_', '-').constData()); + printf("#include <%s/wayland-%s-client-protocol.h>\n", m_headerPath.constData(), fileBaseName.constData()); printf("#include <QByteArray>\n"); printf("#include <QString>\n"); printf("\n"); @@ -1074,9 +1077,9 @@ if (m_option == ClientCode) { if (m_headerPath.isEmpty()) - printf("#include \"qwayland-%s.h\"\n", QByteArray(m_protocolName).replace('_', '-').constData()); + printf("#include \"qwayland-%s.h\"\n", fileBaseName.constData()); else - printf("#include <%s/qwayland-%s.h>\n", m_headerPath.constData(), QByteArray(m_protocolName).replace('_', '-').constData()); + printf("#include <%s/qwayland-%s.h>\n", m_headerPath.constData(), fileBaseName.constData()); printf("\n"); printf("QT_BEGIN_NAMESPACE\n"); printf("QT_WARNING_PUSH\n");
