Hello community, here is the log from the commit of package libqt5-qtwayland for openSUSE:Factory checked in at 2018-06-02 11:51:57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libqt5-qtwayland (Old) and /work/SRC/openSUSE:Factory/.libqt5-qtwayland.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libqt5-qtwayland" Sat Jun 2 11:51:57 2018 rev:20 rq:611689 version:5.11.0 Changes: -------- --- /work/SRC/openSUSE:Factory/libqt5-qtwayland/libqt5-qtwayland.changes 2018-01-16 09:33:03.443840872 +0100 +++ /work/SRC/openSUSE:Factory/.libqt5-qtwayland.new/libqt5-qtwayland.changes 2018-06-02 11:51:59.628340136 +0200 @@ -1,0 +2,78 @@ +Tue May 22 16:16:49 CEST 2018 - [email protected] + +- Update to 5.11.0 + * New bugfix release + * For more details please see: + * http://code.qt.io/cgit/qt/qtwayland.git/plain/dist/changes-5.11.0/?h=v5.11.0 + +------------------------------------------------------------------- +Tue May 8 11:01:44 CEST 2018 - [email protected] + +- Update to 5.11.0-rc + * New bugfix release + * No changelog available + +------------------------------------------------------------------- +Mon Apr 23 08:58:08 CEST 2018 - [email protected] + +- Update to 5.11.0-beta4 + * New bugfix release + * No changelog available + +------------------------------------------------------------------- +Wed Apr 11 09:15:05 CEST 2018 - [email protected] + +- Update to 5.11.0-beta3 + * New bugfix release + * No changelog available + +------------------------------------------------------------------- +Wed Mar 28 09:17:53 CEST 2018 - [email protected] + +- Update to 5.11.0-beta2 + * New bugfix release + * No changelog available +- Refresh 0001-Handle-maximize-minimize-fullscreen-xdgshellv6.patch + +------------------------------------------------------------------- +Tue Mar 13 13:40:51 UTC 2018 - [email protected] + +- Fix the license tag. + +------------------------------------------------------------------- +Thu Mar 1 09:55:54 CET 2018 - [email protected] + +- Update to 5.11.0-beta1 + * New feature release + * For more details please see: + * http://code.qt.io/cgit/qt/qtwayland.git/plain/dist/changes-5.11.0-beta1/?h=v5.11.0-beta1 + +------------------------------------------------------------------- +Tue Feb 20 14:29:57 CET 2018 - [email protected] + +- Update to 5.11.0-alpha + * New feature release + * For more details please see: + * https://wiki.qt.io/New_Features_in_Qt_5.11 +- Remove patches, now upstream: + * 0001-Implement-basic-key-composition-support.patch + * 0002-Automatically-change-scale-when-entering-a-new-outpu.patch + +------------------------------------------------------------------- +Wed Feb 14 15:47:14 CET 2018 - [email protected] + +- Update to 5.10.1 + * New bugfix release + * For more details please see: + * http://code.qt.io/cgit/qt/qtwayland.git/plain/dist/changes-5.10.1/?h=v5.10.1 +- Drop patches, now upstream: + * Dont-recreate-hidden-egl-surfaces.patch + +------------------------------------------------------------------- +Sat Feb 10 21:11:54 UTC 2018 - [email protected] + +- Add patch (pending upstream) to implement fullscreen windows for + xdg-shell v6 (boo#1080447): + * 0001-Handle-maximize-minimize-fullscreen-xdgshellv6.patch + +------------------------------------------------------------------- Old: ---- 0001-Implement-basic-key-composition-support.patch 0002-Automatically-change-scale-when-entering-a-new-outpu.patch Dont-recreate-hidden-egl-surfaces.patch qtwayland-everywhere-src-5.10.0.tar.xz New: ---- 0001-Handle-maximize-minimize-fullscreen-xdgshellv6.patch qtwayland-everywhere-src-5.11.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libqt5-qtwayland.spec ++++++ --- /var/tmp/diff_new_pack.zTfiHH/_old 2018-06-02 11:52:00.424310941 +0200 +++ /var/tmp/diff_new_pack.zTfiHH/_new 2018-06-02 11:52:00.424310941 +0200 @@ -19,29 +19,30 @@ %define qt5_snapshot 0 %define libname libQt5WaylandCompositor5 %define base_name libqt5 -%define real_version 5.10.0 -%define so_version 5.10.0 -%define tar_version qtwayland-everywhere-src-5.10.0 +%define real_version 5.11.0 +%define so_version 5.11.0 +%define tar_version qtwayland-everywhere-src-5.11.0 Name: libqt5-qtwayland -Version: 5.10.0 +Version: 5.11.0 Release: 0 Summary: Qt 5 Wayland Addon -License: LGPL-2.1-with-Qt-Company-Qt-exception-1.1 or LGPL-3.0-with-Qt-Company-Qt-exception-1.1 +License: LGPL-2.1-with-Qt-Company-Qt-exception-1.1 or LGPL-3.0-only Group: Development/Libraries/X11 Url: https://www.qt.io -Source: https://download.qt.io/official_releases/qt/5.10/%{real_version}/submodules/%{tar_version}.tar.xz +Source: https://download.qt.io/official_releases/qt/5.11/%{real_version}/submodules/%{tar_version}.tar.xz Source1: baselibs.conf # PATCH-FIX-OPENSUSE Patch1: workaround-null-object.patch -# Pending for upstream 5.9 (https://codereview.qt-project.org/#/c/210552/) -Patch1500: Dont-recreate-hidden-egl-surfaces.patch -# Patches from upstream dev branch -Patch2000: 0001-Implement-basic-key-composition-support.patch -Patch2001: 0002-Automatically-change-scale-when-entering-a-new-outpu.patch +# Pending for upstream 5.9 (https://codereview.qt-project.org/#/c/199123/) +Patch1501: 0001-Handle-maximize-minimize-fullscreen-xdgshellv6.patch BuildRequires: fdupes BuildRequires: libqt5-qtbase-private-headers-devel >= %{version} BuildRequires: libqt5-qtdeclarative-private-headers-devel >= %{version} BuildRequires: xz +%if 0%{?suse_version} < 1330 +# It does not build with the default compiler (GCC 4.8) on Leap 42.x +BuildRequires: gcc7-c++ +%endif BuildRequires: pkgconfig(egl) BuildRequires: pkgconfig(wayland-client) >= 1.1.0 BuildRequires: pkgconfig(wayland-egl) @@ -108,10 +109,7 @@ %prep %setup -q -n %{tar_version} -%patch1 -p1 -%patch1500 -p1 -%patch2000 -p1 -%patch2001 -p1 +%autopatch -p1 %post -n libQt5WaylandCompositor5 -p /sbin/ldconfig @@ -130,7 +128,17 @@ #force the configure script to generate the forwarding headers (it checks whether .git directory exists) mkdir .git %endif -%{_libqt5_qmake} CONFIG+=wayland-compositor +%{_libqt5_qmake} \ +%if 0%{?suse_version} < 1330 + QMAKE_CC=gcc-7 QMAKE_CXX=g++-7 CONFIG+=c++14 \ +%endif + CONFIG+=wayland-compositor + +%if 0%{?suse_version} < 1330 + export CC=gcc-7 + export CXX=g++-7 +%endif + %{make_jobs} %install ++++++ 0001-Handle-maximize-minimize-fullscreen-xdgshellv6.patch ++++++ >From da43d51dcbafc5fa1db245efd6737aa54c245afb Mon Sep 17 00:00:00 2001 From: Giulio Camuffo <[email protected]> Date: Sat, 1 Jul 2017 09:53:07 +0200 Subject: [PATCH] Handle maximize/minimize/fullscreen in xdg_shell_v6 Change-Id: I385eb3279d91f1c38d2f5d46bc63b324f0456ca4 --- src/client/qwaylandwindow.cpp | 6 +++- src/client/qwaylandxdgshellv6.cpp | 61 ++++++++++++++++++++++++++++++++++++--- src/client/qwaylandxdgshellv6_p.h | 8 ++++- 3 files changed, 69 insertions(+), 6 deletions(-) Index: qtwayland-everywhere-src-5.11.0-beta2/src/client/qwaylandwindow.cpp =================================================================== --- qtwayland-everywhere-src-5.11.0-beta2.orig/src/client/qwaylandwindow.cpp +++ qtwayland-everywhere-src-5.11.0-beta2/src/client/qwaylandwindow.cpp @@ -980,7 +980,11 @@ bool QWaylandWindow::setWindowStateInter // As of february 2013 QWindow::setWindowState sets the new state value after // QPlatformWindow::setWindowState returns, so we cannot rely on QWindow::windowState // here. We use then this mState variable. - mState = state; + // NOTE: The compositor does not tell us when the window is not minimized anymore, + // so we store the state except for the WindowMinimized value, to make sure that + // the equality check above does not return true when setWindowState(Qt::WindowMinimized) + // is called, even though the window is actually not minimized anymore. + mState = state & ~Qt::WindowMinimized; if (mShellSurface) { createDecoration(); Index: qtwayland-everywhere-src-5.11.0-beta2/src/client/qwaylandxdgshellv6.cpp =================================================================== --- qtwayland-everywhere-src-5.11.0-beta2.orig/src/client/qwaylandxdgshellv6.cpp +++ qtwayland-everywhere-src-5.11.0-beta2/src/client/qwaylandxdgshellv6.cpp @@ -56,6 +56,8 @@ QWaylandXdgSurfaceV6::Toplevel::Toplevel : QtWayland::zxdg_toplevel_v6(xdgSurface->get_toplevel()) , m_xdgSurface(xdgSurface) { + m_configureState.fullscreen = false; + m_configureState.maximized = false; } QWaylandXdgSurfaceV6::Toplevel::~Toplevel() @@ -75,13 +77,35 @@ void QWaylandXdgSurfaceV6::Toplevel::zxd m_configureState.width = width; m_configureState.height = height; + bool wasMaximized = m_configureState.maximized; + bool wasFullscreen = m_configureState.fullscreen; + uint32_t *state = reinterpret_cast<uint32_t *>(states->data); size_t numStates = states->size / sizeof(uint32_t); - m_configureState.states.reserve(numStates); - m_configureState.states.clear(); - for (size_t i = 0; i < numStates; i++) - m_configureState.states << state[i]; + m_configureState.fullscreen = false; + m_configureState.maximized = false; + + for (size_t i = 0; i < numStates; i++) { + switch (state[i]) { + case ZXDG_TOPLEVEL_V6_STATE_MAXIMIZED: + m_configureState.maximized = true; + break; + case ZXDG_TOPLEVEL_V6_STATE_FULLSCREEN: + m_configureState.fullscreen = true; + break; + default: + break; + } + } + + if ((!wasMaximized && m_configureState.maximized) || (!wasFullscreen && m_configureState.fullscreen)) + m_normalSize = m_xdgSurface->m_window->window()->frameGeometry().size(); + + if ((width == 0 || height == 0) && !m_normalSize.isEmpty()) { + m_configureState.width = m_normalSize.width(); + m_configureState.height = m_normalSize.height(); + } } void QWaylandXdgSurfaceV6::Toplevel::zxdg_toplevel_v6_close() @@ -232,6 +256,35 @@ void QWaylandXdgSurfaceV6::zxdg_surface_ ack_configure(serial); } +void QWaylandXdgSurfaceV6::setMaximized() +{ + if (m_toplevel) + m_toplevel->set_maximized(); +} + +void QWaylandXdgSurfaceV6::setFullscreen() +{ + if (m_toplevel) + m_toplevel->set_fullscreen(nullptr); +} + +void QWaylandXdgSurfaceV6::setNormal() +{ + if (!m_toplevel) + return; + + if (m_toplevel->m_configureState.maximized) + m_toplevel->unset_maximized(); + if (m_toplevel->m_configureState.fullscreen) + m_toplevel->unset_fullscreen(); +} + +void QWaylandXdgSurfaceV6::setMinimized() +{ + if (m_toplevel) + m_toplevel->set_minimized(); +} + QWaylandXdgShellV6::QWaylandXdgShellV6(struct ::wl_registry *registry, uint32_t id, uint32_t availableVersion) Index: qtwayland-everywhere-src-5.11.0-beta2/src/client/qwaylandxdgshellv6_p.h =================================================================== --- qtwayland-everywhere-src-5.11.0-beta2.orig/src/client/qwaylandxdgshellv6_p.h +++ qtwayland-everywhere-src-5.11.0-beta2/src/client/qwaylandxdgshellv6_p.h @@ -88,6 +88,10 @@ public: protected: void zxdg_surface_v6_configure(uint32_t serial) override; + void setMaximized() override; + void setFullscreen() override; + void setNormal() override; + void setMinimized() override; private: class Toplevel: public QtWayland::zxdg_toplevel_v6 @@ -103,8 +107,10 @@ private: struct { int32_t width, height; - QVarLengthArray<uint32_t> states; + bool maximized; + bool fullscreen; } m_configureState; + QSize m_normalSize; QWaylandXdgSurfaceV6 *m_xdgSurface = nullptr; }; ++++++ qtwayland-everywhere-src-5.10.0.tar.xz -> qtwayland-everywhere-src-5.11.0.tar.xz ++++++ ++++ 20392 lines of diff (skipped)
