From b847cfc7483ae8b02a78d22e5233a0f62afb928a Mon Sep 17 00:00:00 2001
From: Jan Grulich <jgrulich@redhat.com>
Date: Mon, 13 Sep 2021 19:29:11 +0200
Subject: [PATCH] 6.2.0 - beta4

---
 .gitignore         |  1 +
 qt6-qtwayland.spec | 45 ++++++++++++++++++++++++++++++++++++++++++---
 sources            |  2 +-
 3 files changed, 44 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 88ef6c5..b89405a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
 /qtwayland-everywhere-src-6.1.0.tar.xz
 /qtwayland-everywhere-src-6.1.1.tar.xz
 /qtwayland-everywhere-src-6.1.2.tar.xz
+/qtwayland-everywhere-src-6.2.0-beta4.tar.xz
diff --git a/qt6-qtwayland.spec b/qt6-qtwayland.spec
index ae21d69..00c415c 100644
--- a/qt6-qtwayland.spec
+++ b/qt6-qtwayland.spec
@@ -1,14 +1,29 @@
+# FIXME: qt6-qtdeclarative doesn't build on S390x
+# BUG: https://bugreports.qt.io/browse/QTBUG-93101
+ExcludeArch: s390x
+
 %global qt_module qtwayland
 
+%global unstable 1
+%if 0%{unstable}
+%global prerelease beta4
+%endif
+
 Summary: Qt6 - Wayland platform support and QtCompositor module
 Name:    qt6-%{qt_module}
-Version: 6.1.2
+Version: 6.2.0%{?unstable:~%{prerelease}}
 Release: 1%{?dist}
 
 License: LGPLv3
 Url:     http://www.qt.io
 %global majmin %(echo %{version} | cut -d. -f1-2)
+%global  qt_version %(echo %{version} | cut -d~ -f1)
+
+%if 0%{unstable}
+Source0: https://download.qt.io/development_releases/qt/%{majmin}/%{qt_version}/submodules/%{qt_module}-everywhere-src-%{qt_version}-%{prerelease}.tar.xz
+%else
 Source0: https://download.qt.io/official_releases/qt/%{majmin}/%{version}/submodules/%{qt_module}-everywhere-src-%{version}.tar.xz
+%endif
 
 # Upstream patches
 
@@ -62,7 +77,7 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
 
 
 %prep
-%autosetup -n %{qt_module}-everywhere-src-%{version} -p1
+%autosetup -n %{qt_module}-everywhere-src-%{qt_version}%{?unstable:-%{prerelease}} -p1
 
 
 %build
@@ -94,6 +109,11 @@ popd
 %license LICENSE.*
 %{_qt6_libdir}/libQt6WaylandCompositor.so.6*
 %{_qt6_libdir}/libQt6WaylandClient.so.6*
+%{_qt6_libdir}/libQt6WaylandCompositor.so.6*
+%{_qt6_libdir}/libQt6WaylandClient.so.6*
+%{_qt6_libdir}/libQt6WaylandEglClientHwIntegration.so.6*
+%{_qt6_libdir}/libQt6WaylandEglCompositorHwIntegration.so.6*
+%{_qt6_libdir}/libQt6WlShellIntegration.so.6*
 %{_qt6_plugindir}/wayland-decoration-client/
 %{_qt6_plugindir}/wayland-graphics-integration-server
 %{_qt6_plugindir}/wayland-graphics-integration-client
@@ -105,13 +125,23 @@ popd
 %{_qt6_qmldir}/QtWayland/
 
 %files devel
-%{_qt6_bindir}/qtwaylandscanner
+%{_qt6_libexecdir}/qtwaylandscanner
 %{_qt6_headerdir}/QtWaylandCompositor/
 %{_qt6_headerdir}/QtWaylandClient/
+%{_qt6_headerdir}/QtWaylandEglClientHwIntegration/
+%{_qt6_headerdir}/QtWaylandEglCompositorHwIntegration/
+%{_qt6_headerdir}/QtWlShellIntegration/
 %{_qt6_libdir}/libQt6WaylandCompositor.so
 %{_qt6_libdir}/libQt6WaylandClient.so
+%{_qt6_libdir}/libQt6WaylandEglClientHwIntegration.so
+%{_qt6_libdir}/libQt6WaylandEglCompositorHwIntegration.so
+%{_qt6_libdir}/libQt6WlShellIntegration.so
 %{_qt6_libdir}/libQt6WaylandCompositor.prl
 %{_qt6_libdir}/libQt6WaylandClient.prl
+%{_qt6_libdir}/libQt6WaylandEglClientHwIntegration.prl
+%{_qt6_libdir}/libQt6WaylandEglCompositorHwIntegration.prl
+%{_qt6_libdir}/libQt6WlShellIntegration.prl
+
 %{_qt6_libdir}/cmake/Qt6WaylandCompositor/Qt6WaylandCompositorConfig*.cmake
 %{_qt6_archdatadir}/mkspecs/modules/*.pri
 %{_qt6_datadir}/modules/*.json
@@ -125,6 +155,12 @@ popd
 %{_qt6_libdir}/cmake/Qt6WaylandClient/
 %dir %{_qt6_libdir}/cmake/Qt6WaylandScannerTools/
 %{_qt6_libdir}/cmake/Qt6WaylandScannerTools/
+%dir %{_qt6_libdir}/cmake/Qt6WaylandEglClientHwIntegrationPrivate/
+%{_qt6_libdir}/cmake/Qt6WaylandEglClientHwIntegrationPrivate/
+%dir %{_qt6_libdir}/cmake/Qt6WaylandEglCompositorHwIntegrationPrivate/
+%{_qt6_libdir}/cmake/Qt6WaylandEglCompositorHwIntegrationPrivate/
+%dir %{_qt6_libdir}/cmake/Qt6WlShellIntegrationPrivate/
+%{_qt6_libdir}/cmake/Qt6WlShellIntegrationPrivate/
 %{_qt6_libdir}/metatypes/qt6*_metatypes.json
 
 
@@ -133,6 +169,9 @@ popd
 
 
 %changelog
+* Mon Sep 13 2021 Jan Grulich <jgrulich@redhat.com> - 6.2.0~beta4-1
+- 6.2.0 - beta4
+
 * Thu Aug 12 2021 Jan Grulich <jgrulich@redhat.com> - 6.1.2-1
 - 6.1.2
 
diff --git a/sources b/sources
index ed63ce5..90caa19 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (qtwayland-everywhere-src-6.1.2.tar.xz) = 6a9acac05df9b40c2b0370342eef50eb2832538f88f9b38aca40ff261313cc2bcd61d35b6fde3730d1bc6f7c943776dd53a72f3f7ea6347daa371854f8adf4cb
+SHA512 (qtwayland-everywhere-src-6.2.0-beta4.tar.xz) = 3e0f04b5fd2479f2efe0784f4e961096e846515fce692c6a6b6ef19c2d781316e196bb3272ab780bb692ba2dddf3af7cee4dcd61ecc2688d9e0f717ad6c9c298