From 33ae18f25fa1e1adcf9754b3848013856082c126 Mon Sep 17 00:00:00 2001
From: Jan Grulich <jgrulich@redhat.com>
Date: Fri, 29 Oct 2021 11:10:17 +0200
Subject: [PATCH] 6.2.1

---
 .gitignore                        |  1 +
 qt6-qtbase.spec                   | 13 ++++++++-----
 qtbase-libglvnd.patch             | 16 ++++++++++++++++
 qtbase-use-wayland-on-gnome.patch | 19 -------------------
 sources                           |  2 +-
 5 files changed, 26 insertions(+), 25 deletions(-)
 create mode 100644 qtbase-libglvnd.patch
 delete mode 100644 qtbase-use-wayland-on-gnome.patch

diff --git a/.gitignore b/.gitignore
index 858a6cb..40b5237 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@
 /qtbase-everywhere-src-6.2.0-rc.tar.xz
 /qtbase-everywhere-src-6.2.0-rc2.tar.xz
 /qtbase-everywhere-src-6.2.0.tar.xz
+/qtbase-everywhere-src-6.2.1.tar.xz
diff --git a/qt6-qtbase.spec b/qt6-qtbase.spec
index f6a57a2..84f3e3d 100644
--- a/qt6-qtbase.spec
+++ b/qt6-qtbase.spec
@@ -41,7 +41,7 @@ BuildRequires: pkgconfig(libsystemd)
 
 Name:    qt6-qtbase
 Summary: Qt6 - QtBase components
-Version: 6.2.0%{?unstable:~%{prerelease}}
+Version: 6.2.1
 Release: 1%{?dist}
 
 # See LGPL_EXCEPTIONS.txt, for exception details
@@ -98,9 +98,8 @@ Patch56: qtbase-mysql.patch
 # python3
 Patch57: qtbase-python3.patch
 
-# https://fedoraproject.org/wiki/Changes/Qt_Wayland_By_Default_On_Gnome
-# https://bugzilla.redhat.com/show_bug.cgi?id=1732129
-Patch80: qtbase-use-wayland-on-gnome.patch
+# fix FTBFS against libglvnd-1.3.4+
+Patch58: qtbase-libglvnd.patch
 
 # gcc-11
 Patch90: qtbase-gcc11.patch
@@ -430,7 +429,7 @@ translationdir=%{_qt6_translationdir}
 
 Name: Qt6
 Description: Qt6 Configuration
-Version: 6.2.0
+Version: 6.2.1
 EOF
 
 # rpm macros
@@ -683,6 +682,7 @@ make check -k ||:
 %{_qt6_libdir}/cmake/Qt6/*.cmake
 %{_qt6_libdir}/cmake/Qt6/*.cmake.in
 %{_qt6_libdir}/cmake/Qt6/config.tests/*
+%{_qt6_libdir}/cmake/Qt6/platforms/Platform/*.cmake
 %{_qt6_libdir}/cmake/Qt6/ModuleDescription.json.in
 %{_qt6_libdir}/cmake/Qt6/QtFileConfigure.txt.in
 %{_qt6_libdir}/cmake/Qt6/QtSeparateDebugInfo.Info.plist.in
@@ -834,6 +834,9 @@ make check -k ||:
 
 
 %changelog
+* Fri Oct 29 2021 Jan Grulich <jgrulich@redhat.com> - 6.2.1-1
+- 6.2.1
+
 * Thu Sep 30 2021 Jan Grulich <jgrulich@redhat.com> - 6.2.0-1
 - 6.2.0
 
diff --git a/qtbase-libglvnd.patch b/qtbase-libglvnd.patch
new file mode 100644
index 0000000..c5aa7e5
--- /dev/null
+++ b/qtbase-libglvnd.patch
@@ -0,0 +1,16 @@
+diff --git a/src/gui/configure.cmake b/src/gui/configure.cmake
+index 0bf250ea..2d1bb645 100644
+--- a/src/gui/configure.cmake
++++ b/src/gui/configure.cmake
+@@ -174,9 +174,9 @@ qt_config_compile_test(egl_x11
+ int main(void)
+ {
+     /* BEGIN TEST: */
+-Display *dpy = EGL_DEFAULT_DISPLAY;
++Display *dpy = reinterpret_cast<Display *>(EGL_DEFAULT_DISPLAY);
+ EGLNativeDisplayType egldpy = XOpenDisplay(\"\");
+-dpy = egldpy;
++dpy = reinterpret_cast<Display *>(egldpy);
+ EGLNativeWindowType w = XCreateWindow(dpy, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0);
+ XDestroyWindow(dpy, w);
+ XCloseDisplay(dpy);
diff --git a/qtbase-use-wayland-on-gnome.patch b/qtbase-use-wayland-on-gnome.patch
deleted file mode 100644
index 5cbf336..0000000
--- a/qtbase-use-wayland-on-gnome.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff --git a/src/gui/kernel/qguiapplication.cpp b/src/gui/kernel/qguiapplication.cpp
-index 08a00d82..f555fb4f 100644
---- a/src/gui/kernel/qguiapplication.cpp
-+++ b/src/gui/kernel/qguiapplication.cpp
-@@ -1411,13 +1411,7 @@ void QGuiApplicationPrivate::createPlatformIntegration()
-     bool isGnome = false;
-     const QByteArray waylandPlatformName = defaultIsWayland ? platformName : "wayland";
-     if (hasWaylandDisplay || isWaylandSessionType) {
--        const QByteArray currentDesktop = qgetenv("XDG_CURRENT_DESKTOP").toLower();
--        const QByteArray sessionDesktop = qgetenv("XDG_SESSION_DESKTOP").toLower();
--        isGnome = currentDesktop.contains("gnome") || sessionDesktop.contains("gnome");
--        if (isGnome)
--            preferredPlatformOrder.append(waylandPlatformName);
--        else
--            preferredPlatformOrder.prepend(waylandPlatformName);
-+        preferredPlatformOrder.prepend(waylandPlatformName);
- 
-         if (defaultIsWayland)
-             platformName.clear();
diff --git a/sources b/sources
index 2c4ee68..27e3d15 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (qtbase-everywhere-src-6.2.0.tar.xz) = 3ed301a531633e1e72da7833d1eea47edaf7e5474678a16ec29080e34de1d0def7000b68aa96fa18779880e3aa7b1a9b7c0cf699de2b4cba2c7de84442722fda
+SHA512 (qtbase-everywhere-src-6.2.1.tar.xz) = 9c1c3db8589ce085e1e895dfe6346f2f7a1928defb19e5ea87829f05138f4ceb78e8390c70bda86f430f5c059c4ab73a28e230f792be3cccf38951bdc1ee5dc2