Architecture specific change in rpms/mingw-qt6-qtbase.git - Arch-excludes - Fedora mailing-lists

1 Nov 2021

The package rpms/mingw-qt6-qtbase.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/mingw-qt6-qtbase.git/commit/?id=30e0....
Change:
+ExcludeArch:    s390x
Thanks.
Full change:
============
commit 3997a901de7c44736d5ec46aad96bf0a0867ffab
Author: Sandro Mani manisandro@gmail.com
Date:   Mon Nov 1 14:14:08 2021 +0100
Update to 6.2.1

diff --git a/.gitignore b/.gitignore
index 5d931f3..b277674 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,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/mingw-qt6-qtbase.spec b/mingw-qt6-qtbase.spec
index d4fa7a0..5eaeb41 100644
--- a/mingw-qt6-qtbase.spec
+++ b/mingw-qt6-qtbase.spec
@@ -19,15 +19,14 @@
 %define release_version %(echo %{version} | awk -F. '{print $1"."$2}')
Name:           mingw-qt6-qtbase
-Version:        6.2.0
+Version:        6.2.1
 Release:        1%{?pre:.%pre}%{?dist}
 Summary:        Qt6 for Windows - QtBase component
 # Native build is not available for s390x
 ExcludeArch:    s390x
 # Can't make package noarch as it could lead to -DQT_HOST_PATH_CMAKE_DIR=%%{_libdir}/cmake ponting to the wrong libdir
-# See LGPL_EXCEPTIONS.txt, for exception details
-License:        GPLv3 with exceptions or LGPLv2 with exceptions
+License:        LGPLv3 or GPLv2
 URL:            http://qt.io/
%if 0%{?commit:1}
@@ -108,7 +107,7 @@ Provides:       bundled(double-conversion)
 This package contains the Qt software toolkit for developing
 cross-platform applications.
-This is the Windows version of Qt, for use in conjunction with the
+This is the 32-bit Windows version of Qt, for use in conjunction with the
 Fedora Windows cross-compiler.
@@ -124,7 +123,7 @@ Requires:       mingw32-vulkan-headers
 This package contains the Qt software toolkit for developing
 cross-platform applications.
-This is the Windows version of Qt, for use in conjunction with the
+This is the 64-bit Windows version of Qt, for use in conjunction with the
 Fedora Windows cross-compiler.
@@ -447,6 +446,9 @@ ln -s %{_prefix}/%{mingw64_target}/bin/qt6/qt-cmake %{buildroot}%{_bindir}/%{min
%changelog
+* Mon Nov 01 2021 Sandro Mani manisandro@gmail.com - 6.2.1-1
+- Update to 6.2.1
+
 * Sat Oct 02 2021 Sandro Mani manisandro@gmail.com - 6.2.0-1
 - Update to 6.2.0
diff --git a/qtbase-cmake-prefix-path.patch b/qtbase-cmake-prefix-path.patch
index 2653bc4..d7a18be 100644
--- a/qtbase-cmake-prefix-path.patch
+++ b/qtbase-cmake-prefix-path.patch
@@ -1,6 +1,6 @@
-diff -rupN --no-dereference qtbase-everywhere-src-6.2.0/cmake/QtToolHelpers.cmake qtbase-everywhere-src-6.2.0-new/cmake/QtToolHelpers.cmake
---- qtbase-everywhere-src-6.2.0/cmake/QtToolHelpers.cmake	2021-09-23 09:42:06.000000000 +0200
-+++ qtbase-everywhere-src-6.2.0-new/cmake/QtToolHelpers.cmake	2021-10-02 20:15:31.056661776 +0200
+diff -rupN --no-dereference qtbase-everywhere-src-6.2.1/cmake/QtToolHelpers.cmake qtbase-everywhere-src-6.2.1-new/cmake/QtToolHelpers.cmake
+--- qtbase-everywhere-src-6.2.1/cmake/QtToolHelpers.cmake	2021-10-20 13:54:23.000000000 +0200
++++ qtbase-everywhere-src-6.2.1-new/cmake/QtToolHelpers.cmake	2021-11-01 12:28:16.688394428 +0100
 @@ -82,7 +82,7 @@ function(qt_internal_add_tool target_nam
          # instead of PATHS option, because any find_dependency call inside a Tools package would
          # not get the proper prefix when using PATHS.
diff --git a/qtbase-import-lib-suffix.patch b/qtbase-import-lib-suffix.patch
index feaa815..c929573 100644
--- a/qtbase-import-lib-suffix.patch
+++ b/qtbase-import-lib-suffix.patch
@@ -1,7 +1,7 @@
-diff -rupN --no-dereference qtbase-everywhere-src-6.2.0/cmake/QtPriHelpers.cmake qtbase-everywhere-src-6.2.0-new/cmake/QtPriHelpers.cmake
---- qtbase-everywhere-src-6.2.0/cmake/QtPriHelpers.cmake	2021-09-23 09:42:06.000000000 +0200
-+++ qtbase-everywhere-src-6.2.0-new/cmake/QtPriHelpers.cmake	2021-10-02 20:15:27.393649240 +0200
-@@ -401,9 +401,13 @@ QT.${config_module_name}_private.disable
+diff -rupN --no-dereference qtbase-everywhere-src-6.2.1/cmake/QtPriHelpers.cmake qtbase-everywhere-src-6.2.1-new/cmake/QtPriHelpers.cmake
+--- qtbase-everywhere-src-6.2.1/cmake/QtPriHelpers.cmake	2021-10-20 13:54:23.000000000 +0200
++++ qtbase-everywhere-src-6.2.1-new/cmake/QtPriHelpers.cmake	2021-11-01 12:28:08.950351795 +0100
+@@ -506,9 +506,13 @@ QT.${config_module_name}_private.disable
          qt_path_join(private_pri_file_path "${target_path}" "${private_pri_file_name}")
          list(APPEND pri_files "${private_pri_file_path}")
@@ -16,7 +16,7 @@ diff -rupN --no-dereference qtbase-everywhere-src-6.2.0/cmake/QtPriHelpers.cmake
              ${CMAKE_EXTRA_SHARED_LIBRARY_SUFFIXES}
              ${CMAKE_STATIC_LIBRARY_SUFFIX})
          if(MSVC)
-@@ -828,9 +832,13 @@ CONFIG += ${private_config_joined}
+@@ -933,9 +937,13 @@ CONFIG += ${private_config_joined}
          list(APPEND inputs "${preliminary_pri_root}/${cfg}/${pri_data_cmake_file}")
      endforeach()
@@ -31,9 +31,9 @@ diff -rupN --no-dereference qtbase-everywhere-src-6.2.0/cmake/QtPriHelpers.cmake
          ${CMAKE_EXTRA_SHARED_LIBRARY_SUFFIXES}
          ${CMAKE_STATIC_LIBRARY_SUFFIX})
      if(MSVC)
-diff -rupN --no-dereference qtbase-everywhere-src-6.2.0/cmake/QtPrlHelpers.cmake qtbase-everywhere-src-6.2.0-new/cmake/QtPrlHelpers.cmake
---- qtbase-everywhere-src-6.2.0/cmake/QtPrlHelpers.cmake	2021-09-23 09:42:06.000000000 +0200
-+++ qtbase-everywhere-src-6.2.0-new/cmake/QtPrlHelpers.cmake	2021-10-02 20:15:27.394649243 +0200
+diff -rupN --no-dereference qtbase-everywhere-src-6.2.1/cmake/QtPrlHelpers.cmake qtbase-everywhere-src-6.2.1-new/cmake/QtPrlHelpers.cmake
+--- qtbase-everywhere-src-6.2.1/cmake/QtPrlHelpers.cmake	2021-10-20 13:54:23.000000000 +0200
++++ qtbase-everywhere-src-6.2.1-new/cmake/QtPrlHelpers.cmake	2021-11-01 12:28:08.951351800 +0100
 @@ -120,11 +120,17 @@ ${prl_step1_content_libs}
           CONTENT
           "FINAL_PRL_FILE_PATH = ${final_prl_file_path}")
@@ -53,9 +53,9 @@ diff -rupN --no-dereference qtbase-everywhere-src-6.2.0/cmake/QtPrlHelpers.cmake
if(QT_GENERATOR_IS_MULTI_CONFIG)
          set(configs ${CMAKE_CONFIGURATION_TYPES})
-diff -rupN --no-dereference qtbase-everywhere-src-6.2.0/mkspecs/common/g++-win32.conf qtbase-everywhere-src-6.2.0-new/mkspecs/common/g++-win32.conf
---- qtbase-everywhere-src-6.2.0/mkspecs/common/g++-win32.conf	2021-09-23 09:42:06.000000000 +0200
-+++ qtbase-everywhere-src-6.2.0-new/mkspecs/common/g++-win32.conf	2021-10-02 20:15:27.394649243 +0200
+diff -rupN --no-dereference qtbase-everywhere-src-6.2.1/mkspecs/common/g++-win32.conf qtbase-everywhere-src-6.2.1-new/mkspecs/common/g++-win32.conf
+--- qtbase-everywhere-src-6.2.1/mkspecs/common/g++-win32.conf	2021-10-20 13:54:23.000000000 +0200
++++ qtbase-everywhere-src-6.2.1-new/mkspecs/common/g++-win32.conf	2021-11-01 12:28:08.951351800 +0100
 @@ -54,6 +54,7 @@ QMAKE_PREFIX_SHLIB      =
  QMAKE_EXTENSION_SHLIB   = dll
  QMAKE_PREFIX_STATICLIB  = lib
@@ -64,9 +64,9 @@ diff -rupN --no-dereference qtbase-everywhere-src-6.2.0/mkspecs/common/g++-win32
  QMAKE_LIB_EXTENSIONS    = a dll.a
QMAKE_LIBS              =
-diff -rupN --no-dereference qtbase-everywhere-src-6.2.0/mkspecs/features/create_cmake.prf qtbase-everywhere-src-6.2.0-new/mkspecs/features/create_cmake.prf
---- qtbase-everywhere-src-6.2.0/mkspecs/features/create_cmake.prf	2021-09-23 09:42:06.000000000 +0200
-+++ qtbase-everywhere-src-6.2.0-new/mkspecs/features/create_cmake.prf	2021-10-02 20:15:27.394649243 +0200
+diff -rupN --no-dereference qtbase-everywhere-src-6.2.1/mkspecs/features/create_cmake.prf qtbase-everywhere-src-6.2.1-new/mkspecs/features/create_cmake.prf
+--- qtbase-everywhere-src-6.2.1/mkspecs/features/create_cmake.prf	2021-10-20 13:54:23.000000000 +0200
++++ qtbase-everywhere-src-6.2.1-new/mkspecs/features/create_cmake.prf	2021-11-01 12:28:08.952351806 +0100
 @@ -332,8 +332,9 @@ mac {
          CMAKE_WINMAIN_FILE_LOCATION_DEBUG = libqtmain$${QT_LIBINFIX}$${debug_suffix}.a
          CMAKE_WINMAIN_FILE_LOCATION_RELEASE = libqtmain$${QT_LIBINFIX}.a
@@ -79,9 +79,9 @@ diff -rupN --no-dereference qtbase-everywhere-src-6.2.0/mkspecs/features/create_
      } else {
          CMAKE_WINMAIN_FILE_LOCATION_DEBUG = qtmain$${QT_LIBINFIX}$${debug_suffix}.lib
          CMAKE_WINMAIN_FILE_LOCATION_RELEASE = qtmain$${QT_LIBINFIX}.lib
-diff -rupN --no-dereference qtbase-everywhere-src-6.2.0/src/corelib/Qt6CoreMacros.cmake qtbase-everywhere-src-6.2.0-new/src/corelib/Qt6CoreMacros.cmake
---- qtbase-everywhere-src-6.2.0/src/corelib/Qt6CoreMacros.cmake	2021-09-23 09:42:06.000000000 +0200
-+++ qtbase-everywhere-src-6.2.0-new/src/corelib/Qt6CoreMacros.cmake	2021-10-02 20:15:27.394649243 +0200
+diff -rupN --no-dereference qtbase-everywhere-src-6.2.1/src/corelib/Qt6CoreMacros.cmake qtbase-everywhere-src-6.2.1-new/src/corelib/Qt6CoreMacros.cmake
+--- qtbase-everywhere-src-6.2.1/src/corelib/Qt6CoreMacros.cmake	2021-10-20 13:54:23.000000000 +0200
++++ qtbase-everywhere-src-6.2.1-new/src/corelib/Qt6CoreMacros.cmake	2021-11-01 12:28:08.953351811 +0100
 @@ -495,7 +495,6 @@ function(_qt_internal_apply_win_prefix_a
# This should cover both MINGW with GCC and CLANG.
diff --git a/qtbase-include-toolchain.patch b/qtbase-include-toolchain.patch
index 9e0fadc..c4f6f45 100644
--- a/qtbase-include-toolchain.patch
+++ b/qtbase-include-toolchain.patch
@@ -1,6 +1,6 @@
-diff -rupN --no-dereference qtbase-everywhere-src-6.2.0/cmake/QtConfig.cmake.in qtbase-everywhere-src-6.2.0-new/cmake/QtConfig.cmake.in
---- qtbase-everywhere-src-6.2.0/cmake/QtConfig.cmake.in	2021-09-23 09:42:06.000000000 +0200
-+++ qtbase-everywhere-src-6.2.0-new/cmake/QtConfig.cmake.in	2021-10-02 20:15:30.155658691 +0200
+diff -rupN --no-dereference qtbase-everywhere-src-6.2.1/cmake/QtConfig.cmake.in qtbase-everywhere-src-6.2.1-new/cmake/QtConfig.cmake.in
+--- qtbase-everywhere-src-6.2.1/cmake/QtConfig.cmake.in	2021-10-20 13:54:23.000000000 +0200
++++ qtbase-everywhere-src-6.2.1-new/cmake/QtConfig.cmake.in	2021-11-01 12:28:14.792384033 +0100
 @@ -1,5 +1,7 @@
  @PACKAGE_INIT@
diff --git a/qtbase-python3.patch b/qtbase-python3.patch
index 76e5f04..e647f40 100644
--- a/qtbase-python3.patch
+++ b/qtbase-python3.patch
@@ -1,6 +1,6 @@
-diff -rupN --no-dereference qtbase-everywhere-src-6.2.0/mkspecs/features/uikit/devices.py qtbase-everywhere-src-6.2.0-new/mkspecs/features/uikit/devices.py
---- qtbase-everywhere-src-6.2.0/mkspecs/features/uikit/devices.py	2021-09-23 09:42:06.000000000 +0200
-+++ qtbase-everywhere-src-6.2.0-new/mkspecs/features/uikit/devices.py	2021-10-02 20:15:29.250655593 +0200
+diff -rupN --no-dereference qtbase-everywhere-src-6.2.1/mkspecs/features/uikit/devices.py qtbase-everywhere-src-6.2.1-new/mkspecs/features/uikit/devices.py
+--- qtbase-everywhere-src-6.2.1/mkspecs/features/uikit/devices.py	2021-10-20 13:54:23.000000000 +0200
++++ qtbase-everywhere-src-6.2.1-new/mkspecs/features/uikit/devices.py	2021-11-01 12:28:12.967373996 +0100
 @@ -1,4 +1,4 @@
 -#!/usr/bin/python
 +#!/usr/bin/python3
diff --git a/qtbase-readlink.patch b/qtbase-readlink.patch
index 8e2e708..1d84af9 100644
--- a/qtbase-readlink.patch
+++ b/qtbase-readlink.patch
@@ -1,6 +1,6 @@
-diff -rupN --no-dereference qtbase-everywhere-src-6.2.0/bin/qmake-wrapper-for-target.in qtbase-everywhere-src-6.2.0-new/bin/qmake-wrapper-for-target.in
---- qtbase-everywhere-src-6.2.0/bin/qmake-wrapper-for-target.in	2021-09-23 09:42:06.000000000 +0200
-+++ qtbase-everywhere-src-6.2.0-new/bin/qmake-wrapper-for-target.in	2021-10-02 20:15:28.334652459 +0200
+diff -rupN --no-dereference qtbase-everywhere-src-6.2.1/bin/qmake-wrapper-for-target.in qtbase-everywhere-src-6.2.1-new/bin/qmake-wrapper-for-target.in
+--- qtbase-everywhere-src-6.2.1/bin/qmake-wrapper-for-target.in	2021-10-20 13:54:23.000000000 +0200
++++ qtbase-everywhere-src-6.2.1-new/bin/qmake-wrapper-for-target.in	2021-11-01 12:28:11.058363464 +0100
 @@ -1,7 +1,7 @@
  #!/bin/sh
@@ -10,9 +10,9 @@ diff -rupN --no-dereference qtbase-everywhere-src-6.2.0/bin/qmake-wrapper-for-ta
  script_dir_path=`(cd "$script_dir_path"; /bin/pwd)`
@host_qt_bindir@/qmake -qtconf "$script_dir_path/target_qt.conf" $*
-diff -rupN --no-dereference qtbase-everywhere-src-6.2.0/bin/qt-cmake.in qtbase-everywhere-src-6.2.0-new/bin/qt-cmake.in
---- qtbase-everywhere-src-6.2.0/bin/qt-cmake.in	2021-09-23 09:42:06.000000000 +0200
-+++ qtbase-everywhere-src-6.2.0-new/bin/qt-cmake.in	2021-10-02 20:15:28.334652459 +0200
+diff -rupN --no-dereference qtbase-everywhere-src-6.2.1/bin/qt-cmake.in qtbase-everywhere-src-6.2.1-new/bin/qt-cmake.in
+--- qtbase-everywhere-src-6.2.1/bin/qt-cmake.in	2021-10-20 13:54:23.000000000 +0200
++++ qtbase-everywhere-src-6.2.1-new/bin/qt-cmake.in	2021-11-01 12:28:11.058363464 +0100
 @@ -1,7 +1,7 @@
  #!/bin/sh
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
commit 138e9affca829e3a5315e789c95eab7c1a278d69
Author: Sandro Mani manisandro@gmail.com
Date:   Sat Oct 2 23:26:27 2021 +0200
Update to 6.2.0
diff --git a/.gitignore b/.gitignore
index 93a4f71..5d931f3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 /qtbase-everywhere-src-6.1.2.tar.xz
 /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
diff --git a/mingw-qt6-qtbase.spec b/mingw-qt6-qtbase.spec
index 6a65e2e..d4fa7a0 100644
--- a/mingw-qt6-qtbase.spec
+++ b/mingw-qt6-qtbase.spec
@@ -4,7 +4,7 @@
 # Disable debugsource packages
 %undefine _debugsource_packages
-%global pre rc2
+#global pre rc2
#global commit d725239c3e09c2b740a093265f6a9675fd2f8524
 #global shortcommit %(c=%{commit}; echo ${c:0:7})
@@ -20,7 +20,7 @@
Name:           mingw-qt6-qtbase
 Version:        6.2.0
-Release:        0.2%{?pre:.%pre}%{?dist}
+Release:        1%{?pre:.%pre}%{?dist}
 Summary:        Qt6 for Windows - QtBase component
 # Native build is not available for s390x
 ExcludeArch:    s390x
@@ -447,6 +447,9 @@ ln -s %{_prefix}/%{mingw64_target}/bin/qt6/qt-cmake %{buildroot}%{_bindir}/%{min
%changelog
+* Sat Oct 02 2021 Sandro Mani manisandro@gmail.com - 6.2.0-1
+- Update to 6.2.0
+
 * Mon Sep 27 2021 Sandro Mani manisandro@gmail.com - 6.2.0-0.2.rc2
 - Update to 6.2.0-rc2
diff --git a/qtbase-cmake-prefix-path.patch b/qtbase-cmake-prefix-path.patch
index f19e76d..2653bc4 100644
--- a/qtbase-cmake-prefix-path.patch
+++ b/qtbase-cmake-prefix-path.patch
@@ -1,6 +1,6 @@
-diff -rupN --no-dereference qtbase-everywhere-src-6.2.0-rc2/cmake/QtToolHelpers.cmake qtbase-everywhere-src-6.2.0-rc2-new/cmake/QtToolHelpers.cmake
---- qtbase-everywhere-src-6.2.0-rc2/cmake/QtToolHelpers.cmake	2021-09-20 15:22:21.000000000 +0200
-+++ qtbase-everywhere-src-6.2.0-rc2-new/cmake/QtToolHelpers.cmake	2021-09-27 17:24:00.181546919 +0200
+diff -rupN --no-dereference qtbase-everywhere-src-6.2.0/cmake/QtToolHelpers.cmake qtbase-everywhere-src-6.2.0-new/cmake/QtToolHelpers.cmake
+--- qtbase-everywhere-src-6.2.0/cmake/QtToolHelpers.cmake	2021-09-23 09:42:06.000000000 +0200
++++ qtbase-everywhere-src-6.2.0-new/cmake/QtToolHelpers.cmake	2021-10-02 20:15:31.056661776 +0200
 @@ -82,7 +82,7 @@ function(qt_internal_add_tool target_nam
          # instead of PATHS option, because any find_dependency call inside a Tools package would
          # not get the proper prefix when using PATHS.
diff --git a/qtbase-import-lib-suffix.patch b/qtbase-import-lib-suffix.patch
index 8531926..feaa815 100644
--- a/qtbase-import-lib-suffix.patch
+++ b/qtbase-import-lib-suffix.patch
@@ -1,6 +1,6 @@
-diff -rupN --no-dereference qtbase-everywhere-src-6.2.0-rc2/cmake/QtPriHelpers.cmake qtbase-everywhere-src-6.2.0-rc2-new/cmake/QtPriHelpers.cmake
---- qtbase-everywhere-src-6.2.0-rc2/cmake/QtPriHelpers.cmake	2021-09-20 15:22:21.000000000 +0200
-+++ qtbase-everywhere-src-6.2.0-rc2-new/cmake/QtPriHelpers.cmake	2021-09-27 17:23:56.604557202 +0200
+diff -rupN --no-dereference qtbase-everywhere-src-6.2.0/cmake/QtPriHelpers.cmake qtbase-everywhere-src-6.2.0-new/cmake/QtPriHelpers.cmake
+--- qtbase-everywhere-src-6.2.0/cmake/QtPriHelpers.cmake	2021-09-23 09:42:06.000000000 +0200
++++ qtbase-everywhere-src-6.2.0-new/cmake/QtPriHelpers.cmake	2021-10-02 20:15:27.393649240 +0200
 @@ -401,9 +401,13 @@ QT.${config_module_name}_private.disable
          qt_path_join(private_pri_file_path "${target_path}" "${private_pri_file_name}")
          list(APPEND pri_files "${private_pri_file_path}")
@@ -31,9 +31,9 @@ diff -rupN --no-dereference qtbase-everywhere-src-6.2.0-rc2/cmake/QtPriHelpers.c
          ${CMAKE_EXTRA_SHARED_LIBRARY_SUFFIXES}
          ${CMAKE_STATIC_LIBRARY_SUFFIX})
      if(MSVC)
-diff -rupN --no-dereference qtbase-everywhere-src-6.2.0-rc2/cmake/QtPrlHelpers.cmake qtbase-everywhere-src-6.2.0-rc2-new/cmake/QtPrlHelpers.cmake
---- qtbase-everywhere-src-6.2.0-rc2/cmake/QtPrlHelpers.cmake	2021-09-20 15:22:21.000000000 +0200
-+++ qtbase-everywhere-src-6.2.0-rc2-new/cmake/QtPrlHelpers.cmake	2021-09-27 17:23:56.604557202 +0200
+diff -rupN --no-dereference qtbase-everywhere-src-6.2.0/cmake/QtPrlHelpers.cmake qtbase-everywhere-src-6.2.0-new/cmake/QtPrlHelpers.cmake
+--- qtbase-everywhere-src-6.2.0/cmake/QtPrlHelpers.cmake	2021-09-23 09:42:06.000000000 +0200
++++ qtbase-everywhere-src-6.2.0-new/cmake/QtPrlHelpers.cmake	2021-10-02 20:15:27.394649243 +0200
 @@ -120,11 +120,17 @@ ${prl_step1_content_libs}
           CONTENT
           "FINAL_PRL_FILE_PATH = ${final_prl_file_path}")
@@ -53,9 +53,9 @@ diff -rupN --no-dereference qtbase-everywhere-src-6.2.0-rc2/cmake/QtPrlHelpers.c
if(QT_GENERATOR_IS_MULTI_CONFIG)
          set(configs ${CMAKE_CONFIGURATION_TYPES})
-diff -rupN --no-dereference qtbase-everywhere-src-6.2.0-rc2/mkspecs/common/g++-win32.conf qtbase-everywhere-src-6.2.0-rc2-new/mkspecs/common/g++-win32.conf
---- qtbase-everywhere-src-6.2.0-rc2/mkspecs/common/g++-win32.conf	2021-09-20 15:22:21.000000000 +0200
-+++ qtbase-everywhere-src-6.2.0-rc2-new/mkspecs/common/g++-win32.conf	2021-09-27 17:23:56.604557202 +0200
+diff -rupN --no-dereference qtbase-everywhere-src-6.2.0/mkspecs/common/g++-win32.conf qtbase-everywhere-src-6.2.0-new/mkspecs/common/g++-win32.conf
+--- qtbase-everywhere-src-6.2.0/mkspecs/common/g++-win32.conf	2021-09-23 09:42:06.000000000 +0200
++++ qtbase-everywhere-src-6.2.0-new/mkspecs/common/g++-win32.conf	2021-10-02 20:15:27.394649243 +0200
 @@ -54,6 +54,7 @@ QMAKE_PREFIX_SHLIB      =
  QMAKE_EXTENSION_SHLIB   = dll
  QMAKE_PREFIX_STATICLIB  = lib
@@ -64,9 +64,9 @@ diff -rupN --no-dereference qtbase-everywhere-src-6.2.0-rc2/mkspecs/common/g++-w
  QMAKE_LIB_EXTENSIONS    = a dll.a
QMAKE_LIBS              =
-diff -rupN --no-dereference qtbase-everywhere-src-6.2.0-rc2/mkspecs/features/create_cmake.prf qtbase-everywhere-src-6.2.0-rc2-new/mkspecs/features/create_cmake.prf
---- qtbase-everywhere-src-6.2.0-rc2/mkspecs/features/create_cmake.prf	2021-09-20 15:22:21.000000000 +0200
-+++ qtbase-everywhere-src-6.2.0-rc2-new/mkspecs/features/create_cmake.prf	2021-09-27 17:23:56.605557200 +0200
+diff -rupN --no-dereference qtbase-everywhere-src-6.2.0/mkspecs/features/create_cmake.prf qtbase-everywhere-src-6.2.0-new/mkspecs/features/create_cmake.prf
+--- qtbase-everywhere-src-6.2.0/mkspecs/features/create_cmake.prf	2021-09-23 09:42:06.000000000 +0200
++++ qtbase-everywhere-src-6.2.0-new/mkspecs/features/create_cmake.prf	2021-10-02 20:15:27.394649243 +0200
 @@ -332,8 +332,9 @@ mac {
          CMAKE_WINMAIN_FILE_LOCATION_DEBUG = libqtmain$${QT_LIBINFIX}$${debug_suffix}.a
          CMAKE_WINMAIN_FILE_LOCATION_RELEASE = libqtmain$${QT_LIBINFIX}.a
@@ -79,9 +79,9 @@ diff -rupN --no-dereference qtbase-everywhere-src-6.2.0-rc2/mkspecs/features/cre
      } else {
          CMAKE_WINMAIN_FILE_LOCATION_DEBUG = qtmain$${QT_LIBINFIX}$${debug_suffix}.lib
          CMAKE_WINMAIN_FILE_LOCATION_RELEASE = qtmain$${QT_LIBINFIX}.lib
-diff -rupN --no-dereference qtbase-everywhere-src-6.2.0-rc2/src/corelib/Qt6CoreMacros.cmake qtbase-everywhere-src-6.2.0-rc2-new/src/corelib/Qt6CoreMacros.cmake
---- qtbase-everywhere-src-6.2.0-rc2/src/corelib/Qt6CoreMacros.cmake	2021-09-20 15:22:21.000000000 +0200
-+++ qtbase-everywhere-src-6.2.0-rc2-new/src/corelib/Qt6CoreMacros.cmake	2021-09-27 17:23:56.605557200 +0200
+diff -rupN --no-dereference qtbase-everywhere-src-6.2.0/src/corelib/Qt6CoreMacros.cmake qtbase-everywhere-src-6.2.0-new/src/corelib/Qt6CoreMacros.cmake
+--- qtbase-everywhere-src-6.2.0/src/corelib/Qt6CoreMacros.cmake	2021-09-23 09:42:06.000000000 +0200
++++ qtbase-everywhere-src-6.2.0-new/src/corelib/Qt6CoreMacros.cmake	2021-10-02 20:15:27.394649243 +0200
 @@ -495,7 +495,6 @@ function(_qt_internal_apply_win_prefix_a
# This should cover both MINGW with GCC and CLANG.
diff --git a/qtbase-include-toolchain.patch b/qtbase-include-toolchain.patch
index 03095d6..9e0fadc 100644
--- a/qtbase-include-toolchain.patch
+++ b/qtbase-include-toolchain.patch
@@ -1,6 +1,6 @@
-diff -rupN --no-dereference qtbase-everywhere-src-6.2.0-rc2/cmake/QtConfig.cmake.in qtbase-everywhere-src-6.2.0-rc2-new/cmake/QtConfig.cmake.in
---- qtbase-everywhere-src-6.2.0-rc2/cmake/QtConfig.cmake.in	2021-09-20 15:22:21.000000000 +0200
-+++ qtbase-everywhere-src-6.2.0-rc2-new/cmake/QtConfig.cmake.in	2021-09-27 17:23:59.302549445 +0200
+diff -rupN --no-dereference qtbase-everywhere-src-6.2.0/cmake/QtConfig.cmake.in qtbase-everywhere-src-6.2.0-new/cmake/QtConfig.cmake.in
+--- qtbase-everywhere-src-6.2.0/cmake/QtConfig.cmake.in	2021-09-23 09:42:06.000000000 +0200
++++ qtbase-everywhere-src-6.2.0-new/cmake/QtConfig.cmake.in	2021-10-02 20:15:30.155658691 +0200
 @@ -1,5 +1,7 @@
  @PACKAGE_INIT@
diff --git a/qtbase-python3.patch b/qtbase-python3.patch
index b65f233..76e5f04 100644
--- a/qtbase-python3.patch
+++ b/qtbase-python3.patch
@@ -1,6 +1,6 @@
-diff -rupN --no-dereference qtbase-everywhere-src-6.2.0-rc2/mkspecs/features/uikit/devices.py qtbase-everywhere-src-6.2.0-rc2-new/mkspecs/features/uikit/devices.py
---- qtbase-everywhere-src-6.2.0-rc2/mkspecs/features/uikit/devices.py	2021-09-20 15:22:21.000000000 +0200
-+++ qtbase-everywhere-src-6.2.0-rc2-new/mkspecs/features/uikit/devices.py	2021-09-27 17:23:58.423551972 +0200
+diff -rupN --no-dereference qtbase-everywhere-src-6.2.0/mkspecs/features/uikit/devices.py qtbase-everywhere-src-6.2.0-new/mkspecs/features/uikit/devices.py
+--- qtbase-everywhere-src-6.2.0/mkspecs/features/uikit/devices.py	2021-09-23 09:42:06.000000000 +0200
++++ qtbase-everywhere-src-6.2.0-new/mkspecs/features/uikit/devices.py	2021-10-02 20:15:29.250655593 +0200
 @@ -1,4 +1,4 @@
 -#!/usr/bin/python
 +#!/usr/bin/python3
diff --git a/qtbase-readlink.patch b/qtbase-readlink.patch
index d555e56..8e2e708 100644
--- a/qtbase-readlink.patch
+++ b/qtbase-readlink.patch
@@ -1,6 +1,6 @@
-diff -rupN --no-dereference qtbase-everywhere-src-6.2.0-rc2/bin/qmake-wrapper-for-target.in qtbase-everywhere-src-6.2.0-rc2-new/bin/qmake-wrapper-for-target.in
---- qtbase-everywhere-src-6.2.0-rc2/bin/qmake-wrapper-for-target.in	2021-09-20 15:22:21.000000000 +0200
-+++ qtbase-everywhere-src-6.2.0-rc2-new/bin/qmake-wrapper-for-target.in	2021-09-27 17:23:57.527554548 +0200
+diff -rupN --no-dereference qtbase-everywhere-src-6.2.0/bin/qmake-wrapper-for-target.in qtbase-everywhere-src-6.2.0-new/bin/qmake-wrapper-for-target.in
+--- qtbase-everywhere-src-6.2.0/bin/qmake-wrapper-for-target.in	2021-09-23 09:42:06.000000000 +0200
++++ qtbase-everywhere-src-6.2.0-new/bin/qmake-wrapper-for-target.in	2021-10-02 20:15:28.334652459 +0200
 @@ -1,7 +1,7 @@
  #!/bin/sh
@@ -10,9 +10,9 @@ diff -rupN --no-dereference qtbase-everywhere-src-6.2.0-rc2/bin/qmake-wrapper-fo
  script_dir_path=`(cd "$script_dir_path"; /bin/pwd)`
@host_qt_bindir@/qmake -qtconf "$script_dir_path/target_qt.conf" $*
-diff -rupN --no-dereference qtbase-everywhere-src-6.2.0-rc2/bin/qt-cmake.in qtbase-everywhere-src-6.2.0-rc2-new/bin/qt-cmake.in
---- qtbase-everywhere-src-6.2.0-rc2/bin/qt-cmake.in	2021-09-20 15:22:21.000000000 +0200
-+++ qtbase-everywhere-src-6.2.0-rc2-new/bin/qt-cmake.in	2021-09-27 17:23:57.527554548 +0200
+diff -rupN --no-dereference qtbase-everywhere-src-6.2.0/bin/qt-cmake.in qtbase-everywhere-src-6.2.0-new/bin/qt-cmake.in
+--- qtbase-everywhere-src-6.2.0/bin/qt-cmake.in	2021-09-23 09:42:06.000000000 +0200
++++ qtbase-everywhere-src-6.2.0-new/bin/qt-cmake.in	2021-10-02 20:15:28.334652459 +0200
 @@ -1,7 +1,7 @@
  #!/bin/sh
diff --git a/sources b/sources
index 055fdcb..2c4ee68 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (qtbase-everywhere-src-6.2.0-rc2.tar.xz) = d5c5b759115d3caa41412e6d99a30036d89469e92db2495d9cf49f6cf70696881f54da6f8c577ff35a83db4e503def76510af5962d6ed2a4dbda0d06d365b9ca
+SHA512 (qtbase-everywhere-src-6.2.0.tar.xz) = 3ed301a531633e1e72da7833d1eea47edaf7e5474678a16ec29080e34de1d0def7000b68aa96fa18779880e3aa7b1a9b7c0cf699de2b4cba2c7de84442722fda
commit a58de019c36665ac407941443470c2f675a13239
Author: Sandro Mani manisandro@gmail.com
Date:   Mon Sep 27 17:46:13 2021 +0200
Update to 6.2.0-rc2
diff --git a/.gitignore b/.gitignore
index 8208c92..93a4f71 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /qtbase-everywhere-src-6.1.1.tar.xz
 /qtbase-everywhere-src-6.1.2.tar.xz
 /qtbase-everywhere-src-6.2.0-rc.tar.xz
+/qtbase-everywhere-src-6.2.0-rc2.tar.xz
diff --git a/mingw-qt6-qtbase.spec b/mingw-qt6-qtbase.spec
index 3d2666f..6a65e2e 100644
--- a/mingw-qt6-qtbase.spec
+++ b/mingw-qt6-qtbase.spec
@@ -4,7 +4,7 @@
 # Disable debugsource packages
 %undefine _debugsource_packages
-%global pre rc
+%global pre rc2
#global commit d725239c3e09c2b740a093265f6a9675fd2f8524
 #global shortcommit %(c=%{commit}; echo ${c:0:7})
@@ -20,7 +20,7 @@
Name:           mingw-qt6-qtbase
 Version:        6.2.0
-Release:        0.1%{?pre:.%pre}%{?dist}
+Release:        0.2%{?pre:.%pre}%{?dist}
 Summary:        Qt6 for Windows - QtBase component
 # Native build is not available for s390x
 ExcludeArch:    s390x
@@ -447,7 +447,10 @@ ln -s %{_prefix}/%{mingw64_target}/bin/qt6/qt-cmake %{buildroot}%{_bindir}/%{min
%changelog
-* Tue Sep 21 2021 Sandro Mani manisandro@gmail.com - 6.2.0-0.1.rc1
+* Mon Sep 27 2021 Sandro Mani manisandro@gmail.com - 6.2.0-0.2.rc2
+- Update to 6.2.0-rc2
+
+* Tue Sep 21 2021 Sandro Mani manisandro@gmail.com - 6.2.0-0.1.rc
 - Update to 6.2.0-rc
* Thu Aug 12 2021 Sandro Mani manisandro@gmail.com - 6.1.2-1
diff --git a/qtbase-cmake-prefix-path.patch b/qtbase-cmake-prefix-path.patch
index eb6d9ce..f19e76d 100644
--- a/qtbase-cmake-prefix-path.patch
+++ b/qtbase-cmake-prefix-path.patch
@@ -1,6 +1,6 @@
-diff -rupN --no-dereference qtbase-everywhere-src-6.2.0-rc/cmake/QtToolHelpers.cmake qtbase-everywhere-src-6.2.0-rc-new/cmake/QtToolHelpers.cmake
---- qtbase-everywhere-src-6.2.0-rc/cmake/QtToolHelpers.cmake	2021-09-09 16:14:07.000000000 +0200
-+++ qtbase-everywhere-src-6.2.0-rc-new/cmake/QtToolHelpers.cmake	2021-09-21 14:13:17.225539326 +0200
+diff -rupN --no-dereference qtbase-everywhere-src-6.2.0-rc2/cmake/QtToolHelpers.cmake qtbase-everywhere-src-6.2.0-rc2-new/cmake/QtToolHelpers.cmake
+--- qtbase-everywhere-src-6.2.0-rc2/cmake/QtToolHelpers.cmake	2021-09-20 15:22:21.000000000 +0200
++++ qtbase-everywhere-src-6.2.0-rc2-new/cmake/QtToolHelpers.cmake	2021-09-27 17:24:00.181546919 +0200
 @@ -82,7 +82,7 @@ function(qt_internal_add_tool target_nam
          # instead of PATHS option, because any find_dependency call inside a Tools package would
          # not get the proper prefix when using PATHS.
diff --git a/qtbase-import-lib-suffix.patch b/qtbase-import-lib-suffix.patch
index 9ac59fa..8531926 100644
--- a/qtbase-import-lib-suffix.patch
+++ b/qtbase-import-lib-suffix.patch
@@ -1,6 +1,6 @@
-diff -rupN --no-dereference qtbase-everywhere-src-6.2.0-rc/cmake/QtPriHelpers.cmake qtbase-everywhere-src-6.2.0-rc-new/cmake/QtPriHelpers.cmake
---- qtbase-everywhere-src-6.2.0-rc/cmake/QtPriHelpers.cmake	2021-09-09 16:14:07.000000000 +0200
-+++ qtbase-everywhere-src-6.2.0-rc-new/cmake/QtPriHelpers.cmake	2021-09-21 14:13:13.123546798 +0200
+diff -rupN --no-dereference qtbase-everywhere-src-6.2.0-rc2/cmake/QtPriHelpers.cmake qtbase-everywhere-src-6.2.0-rc2-new/cmake/QtPriHelpers.cmake
+--- qtbase-everywhere-src-6.2.0-rc2/cmake/QtPriHelpers.cmake	2021-09-20 15:22:21.000000000 +0200
++++ qtbase-everywhere-src-6.2.0-rc2-new/cmake/QtPriHelpers.cmake	2021-09-27 17:23:56.604557202 +0200
 @@ -401,9 +401,13 @@ QT.${config_module_name}_private.disable
          qt_path_join(private_pri_file_path "${target_path}" "${private_pri_file_name}")
          list(APPEND pri_files "${private_pri_file_path}")
@@ -31,9 +31,9 @@ diff -rupN --no-dereference qtbase-everywhere-src-6.2.0-rc/cmake/QtPriHelpers.cm
          ${CMAKE_EXTRA_SHARED_LIBRARY_SUFFIXES}
          ${CMAKE_STATIC_LIBRARY_SUFFIX})
      if(MSVC)
-diff -rupN --no-dereference qtbase-everywhere-src-6.2.0-rc/cmake/QtPrlHelpers.cmake qtbase-everywhere-src-6.2.0-rc-new/cmake/QtPrlHelpers.cmake
---- qtbase-everywhere-src-6.2.0-rc/cmake/QtPrlHelpers.cmake	2021-09-09 16:14:07.000000000 +0200
-+++ qtbase-everywhere-src-6.2.0-rc-new/cmake/QtPrlHelpers.cmake	2021-09-21 14:13:13.124546796 +0200
+diff -rupN --no-dereference qtbase-everywhere-src-6.2.0-rc2/cmake/QtPrlHelpers.cmake qtbase-everywhere-src-6.2.0-rc2-new/cmake/QtPrlHelpers.cmake
+--- qtbase-everywhere-src-6.2.0-rc2/cmake/QtPrlHelpers.cmake	2021-09-20 15:22:21.000000000 +0200
++++ qtbase-everywhere-src-6.2.0-rc2-new/cmake/QtPrlHelpers.cmake	2021-09-27 17:23:56.604557202 +0200
 @@ -120,11 +120,17 @@ ${prl_step1_content_libs}
           CONTENT
           "FINAL_PRL_FILE_PATH = ${final_prl_file_path}")
@@ -53,9 +53,9 @@ diff -rupN --no-dereference qtbase-everywhere-src-6.2.0-rc/cmake/QtPrlHelpers.cm
if(QT_GENERATOR_IS_MULTI_CONFIG)
          set(configs ${CMAKE_CONFIGURATION_TYPES})
-diff -rupN --no-dereference qtbase-everywhere-src-6.2.0-rc/mkspecs/common/g++-win32.conf qtbase-everywhere-src-6.2.0-rc-new/mkspecs/common/g++-win32.conf
---- qtbase-everywhere-src-6.2.0-rc/mkspecs/common/g++-win32.conf	2021-09-09 16:14:07.000000000 +0200
-+++ qtbase-everywhere-src-6.2.0-rc-new/mkspecs/common/g++-win32.conf	2021-09-21 14:13:13.124546796 +0200
+diff -rupN --no-dereference qtbase-everywhere-src-6.2.0-rc2/mkspecs/common/g++-win32.conf qtbase-everywhere-src-6.2.0-rc2-new/mkspecs/common/g++-win32.conf
+--- qtbase-everywhere-src-6.2.0-rc2/mkspecs/common/g++-win32.conf	2021-09-20 15:22:21.000000000 +0200
++++ qtbase-everywhere-src-6.2.0-rc2-new/mkspecs/common/g++-win32.conf	2021-09-27 17:23:56.604557202 +0200
 @@ -54,6 +54,7 @@ QMAKE_PREFIX_SHLIB      =
  QMAKE_EXTENSION_SHLIB   = dll
  QMAKE_PREFIX_STATICLIB  = lib
@@ -64,9 +64,9 @@ diff -rupN --no-dereference qtbase-everywhere-src-6.2.0-rc/mkspecs/common/g++-wi
  QMAKE_LIB_EXTENSIONS    = a dll.a
QMAKE_LIBS              =
-diff -rupN --no-dereference qtbase-everywhere-src-6.2.0-rc/mkspecs/features/create_cmake.prf qtbase-everywhere-src-6.2.0-rc-new/mkspecs/features/create_cmake.prf
---- qtbase-everywhere-src-6.2.0-rc/mkspecs/features/create_cmake.prf	2021-09-09 16:14:07.000000000 +0200
-+++ qtbase-everywhere-src-6.2.0-rc-new/mkspecs/features/create_cmake.prf	2021-09-21 14:13:13.124546796 +0200
+diff -rupN --no-dereference qtbase-everywhere-src-6.2.0-rc2/mkspecs/features/create_cmake.prf qtbase-everywhere-src-6.2.0-rc2-new/mkspecs/features/create_cmake.prf
+--- qtbase-everywhere-src-6.2.0-rc2/mkspecs/features/create_cmake.prf	2021-09-20 15:22:21.000000000 +0200
++++ qtbase-everywhere-src-6.2.0-rc2-new/mkspecs/features/create_cmake.prf	2021-09-27 17:23:56.605557200 +0200
 @@ -332,8 +332,9 @@ mac {
          CMAKE_WINMAIN_FILE_LOCATION_DEBUG = libqtmain$${QT_LIBINFIX}$${debug_suffix}.a
          CMAKE_WINMAIN_FILE_LOCATION_RELEASE = libqtmain$${QT_LIBINFIX}.a
@@ -79,10 +79,10 @@ diff -rupN --no-dereference qtbase-everywhere-src-6.2.0-rc/mkspecs/features/crea
      } else {
          CMAKE_WINMAIN_FILE_LOCATION_DEBUG = qtmain$${QT_LIBINFIX}$${debug_suffix}.lib
          CMAKE_WINMAIN_FILE_LOCATION_RELEASE = qtmain$${QT_LIBINFIX}.lib
-diff -rupN --no-dereference qtbase-everywhere-src-6.2.0-rc/src/corelib/Qt6CoreMacros.cmake qtbase-everywhere-src-6.2.0-rc-new/src/corelib/Qt6CoreMacros.cmake
---- qtbase-everywhere-src-6.2.0-rc/src/corelib/Qt6CoreMacros.cmake	2021-09-09 16:14:07.000000000 +0200
-+++ qtbase-everywhere-src-6.2.0-rc-new/src/corelib/Qt6CoreMacros.cmake	2021-09-21 14:13:13.125546794 +0200
-@@ -466,7 +466,6 @@ function(_qt_internal_apply_win_prefix_a
+diff -rupN --no-dereference qtbase-everywhere-src-6.2.0-rc2/src/corelib/Qt6CoreMacros.cmake qtbase-everywhere-src-6.2.0-rc2-new/src/corelib/Qt6CoreMacros.cmake
+--- qtbase-everywhere-src-6.2.0-rc2/src/corelib/Qt6CoreMacros.cmake	2021-09-20 15:22:21.000000000 +0200
++++ qtbase-everywhere-src-6.2.0-rc2-new/src/corelib/Qt6CoreMacros.cmake	2021-09-27 17:23:56.605557200 +0200
+@@ -495,7 +495,6 @@ function(_qt_internal_apply_win_prefix_a
# This should cover both MINGW with GCC and CLANG.
          if(NOT MSVC)
diff --git a/qtbase-include-toolchain.patch b/qtbase-include-toolchain.patch
index ca57d4b..03095d6 100644
--- a/qtbase-include-toolchain.patch
+++ b/qtbase-include-toolchain.patch
@@ -1,6 +1,6 @@
-diff -rupN --no-dereference qtbase-everywhere-src-6.2.0-rc/cmake/QtConfig.cmake.in qtbase-everywhere-src-6.2.0-rc-new/cmake/QtConfig.cmake.in
---- qtbase-everywhere-src-6.2.0-rc/cmake/QtConfig.cmake.in	2021-09-09 16:14:07.000000000 +0200
-+++ qtbase-everywhere-src-6.2.0-rc-new/cmake/QtConfig.cmake.in	2021-09-21 14:13:16.236541128 +0200
+diff -rupN --no-dereference qtbase-everywhere-src-6.2.0-rc2/cmake/QtConfig.cmake.in qtbase-everywhere-src-6.2.0-rc2-new/cmake/QtConfig.cmake.in
+--- qtbase-everywhere-src-6.2.0-rc2/cmake/QtConfig.cmake.in	2021-09-20 15:22:21.000000000 +0200
++++ qtbase-everywhere-src-6.2.0-rc2-new/cmake/QtConfig.cmake.in	2021-09-27 17:23:59.302549445 +0200
 @@ -1,5 +1,7 @@
  @PACKAGE_INIT@
diff --git a/qtbase-python3.patch b/qtbase-python3.patch
index c207a26..b65f233 100644
--- a/qtbase-python3.patch
+++ b/qtbase-python3.patch
@@ -1,6 +1,6 @@
-diff -rupN --no-dereference qtbase-everywhere-src-6.2.0-rc/mkspecs/features/uikit/devices.py qtbase-everywhere-src-6.2.0-rc-new/mkspecs/features/uikit/devices.py
---- qtbase-everywhere-src-6.2.0-rc/mkspecs/features/uikit/devices.py	2021-09-09 16:14:07.000000000 +0200
-+++ qtbase-everywhere-src-6.2.0-rc-new/mkspecs/features/uikit/devices.py	2021-09-21 14:13:15.233542955 +0200
+diff -rupN --no-dereference qtbase-everywhere-src-6.2.0-rc2/mkspecs/features/uikit/devices.py qtbase-everywhere-src-6.2.0-rc2-new/mkspecs/features/uikit/devices.py
+--- qtbase-everywhere-src-6.2.0-rc2/mkspecs/features/uikit/devices.py	2021-09-20 15:22:21.000000000 +0200
++++ qtbase-everywhere-src-6.2.0-rc2-new/mkspecs/features/uikit/devices.py	2021-09-27 17:23:58.423551972 +0200
 @@ -1,4 +1,4 @@
 -#!/usr/bin/python
 +#!/usr/bin/python3
diff --git a/qtbase-readlink.patch b/qtbase-readlink.patch
index a7444d7..d555e56 100644
--- a/qtbase-readlink.patch
+++ b/qtbase-readlink.patch
@@ -1,6 +1,6 @@
-diff -rupN --no-dereference qtbase-everywhere-src-6.2.0-rc/bin/qmake-wrapper-for-target.in qtbase-everywhere-src-6.2.0-rc-new/bin/qmake-wrapper-for-target.in
---- qtbase-everywhere-src-6.2.0-rc/bin/qmake-wrapper-for-target.in	2021-09-09 16:14:07.000000000 +0200
-+++ qtbase-everywhere-src-6.2.0-rc-new/bin/qmake-wrapper-for-target.in	2021-09-21 14:13:14.195544846 +0200
+diff -rupN --no-dereference qtbase-everywhere-src-6.2.0-rc2/bin/qmake-wrapper-for-target.in qtbase-everywhere-src-6.2.0-rc2-new/bin/qmake-wrapper-for-target.in
+--- qtbase-everywhere-src-6.2.0-rc2/bin/qmake-wrapper-for-target.in	2021-09-20 15:22:21.000000000 +0200
++++ qtbase-everywhere-src-6.2.0-rc2-new/bin/qmake-wrapper-for-target.in	2021-09-27 17:23:57.527554548 +0200
 @@ -1,7 +1,7 @@
  #!/bin/sh
@@ -10,9 +10,9 @@ diff -rupN --no-dereference qtbase-everywhere-src-6.2.0-rc/bin/qmake-wrapper-for
  script_dir_path=`(cd "$script_dir_path"; /bin/pwd)`
@host_qt_bindir@/qmake -qtconf "$script_dir_path/target_qt.conf" $*
-diff -rupN --no-dereference qtbase-everywhere-src-6.2.0-rc/bin/qt-cmake.in qtbase-everywhere-src-6.2.0-rc-new/bin/qt-cmake.in
---- qtbase-everywhere-src-6.2.0-rc/bin/qt-cmake.in	2021-09-09 16:14:07.000000000 +0200
-+++ qtbase-everywhere-src-6.2.0-rc-new/bin/qt-cmake.in	2021-09-21 14:13:14.196544844 +0200
+diff -rupN --no-dereference qtbase-everywhere-src-6.2.0-rc2/bin/qt-cmake.in qtbase-everywhere-src-6.2.0-rc2-new/bin/qt-cmake.in
+--- qtbase-everywhere-src-6.2.0-rc2/bin/qt-cmake.in	2021-09-20 15:22:21.000000000 +0200
++++ qtbase-everywhere-src-6.2.0-rc2-new/bin/qt-cmake.in	2021-09-27 17:23:57.527554548 +0200
 @@ -1,7 +1,7 @@
  #!/bin/sh
diff --git a/sources b/sources
index 8e351aa..055fdcb 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (qtbase-everywhere-src-6.2.0-rc.tar.xz) = ff2a14c026db6ca34c09a0e3b29c13796ccf412bece4a81401bb2948bd60369613c2758632065f13cf95f535bc39bf1dbefd912700b3f49b24b5dbcb02f3252d
+SHA512 (qtbase-everywhere-src-6.2.0-rc2.tar.xz) = d5c5b759115d3caa41412e6d99a30036d89469e92db2495d9cf49f6cf70696881f54da6f8c577ff35a83db4e503def76510af5962d6ed2a4dbda0d06d365b9ca
commit 30e085349df2a8a13a9c10a0469dfc65a08a0e35
Author: Sandro Mani manisandro@gmail.com
Date:   Tue Sep 21 19:04:14 2021 +0200
Update to 6.2.0-rc
diff --git a/.gitignore b/.gitignore
index d7dc3ff..8208c92 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /qtbase-everywhere-src-6.1.1.tar.xz
 /qtbase-everywhere-src-6.1.2.tar.xz
+/qtbase-everywhere-src-6.2.0-rc.tar.xz
diff --git a/mingw-qt6-qtbase.spec b/mingw-qt6-qtbase.spec
index ee08863..3d2666f 100644
--- a/mingw-qt6-qtbase.spec
+++ b/mingw-qt6-qtbase.spec
@@ -4,7 +4,7 @@
 # Disable debugsource packages
 %undefine _debugsource_packages
-#global pre rc
+%global pre rc
#global commit d725239c3e09c2b740a093265f6a9675fd2f8524
 #global shortcommit %(c=%{commit}; echo ${c:0:7})
@@ -19,9 +19,11 @@
 %define release_version %(echo %{version} | awk -F. '{print $1"."$2}')
Name:           mingw-qt6-qtbase
-Version:        6.1.2
-Release:        1%{?pre:.%pre}%{?dist}
+Version:        6.2.0
+Release:        0.1%{?pre:.%pre}%{?dist}
 Summary:        Qt6 for Windows - QtBase component
+# Native build is not available for s390x
+ExcludeArch:    s390x
 # Can't make package noarch as it could lead to -DQT_HOST_PATH_CMAKE_DIR=%%{_libdir}/cmake ponting to the wrong libdir
# See LGPL_EXCEPTIONS.txt, for exception details
@@ -34,25 +36,23 @@ Source0:        https://github.com/qt/%%7Bqt_module%7D/archive/%%7Bcommit%7D/%%7Bqt_module
 Source0:        http://download.qt.io/%%7B?pre:development%7D%%7B?!pre:official%7D_releases/...
 %endif
-# Fix library names (case)
-Patch0:         qtbase-libnames.patch
 # Fix import library suffix
-Patch1:         qtbase-import-lib-suffix.patch
+Patch0:         qtbase-import-lib-suffix.patch
 # Resolve symlinks in wrapper scripts
-Patch2:         qtbase-readlink.patch
+Patch1:         qtbase-readlink.patch
 # Fix python ambiguous shebang
-Patch3:         qtbase-python3.patch
+Patch2:         qtbase-python3.patch
 # Include toolchain file automatically if it exists
 # Rather than having to specify -DCMAKE_TOOLCHAIN_FILE="$toolchain_path" manually when invoking cmake...
-Patch4:         qtbase-include-toolchain.patch
+Patch3:         qtbase-include-toolchain.patch
 # Fix CMAKE_PREFIX_PATH incorrectly set to QT_HOST_PATH rather than QT_HOST_PATH_CMAKE_DIR
-Patch5:         qtbase-cmake-prefix-path.patch
+Patch4:         qtbase-cmake-prefix-path.patch
BuildRequires:  cmake
 BuildRequires:  ninja-build
 BuildRequires:  perl-interpreter
-BuildRequires:  qt6-qtbase-devel = %{version}
+BuildRequires:  qt6-qtbase-devel = %{version}%{?pre:~%pre}
 BuildRequires:  xmlstarlet
BuildRequires:  mingw32-filesystem >= 95
@@ -116,7 +116,7 @@ Fedora Windows cross-compiler.
 %package -n mingw32-qt6-qtbase
 Summary:        Qt6 for Windows - QtBase component
 # Dependency for host tools
-Requires:       qt6-qtbase-devel = %{version}
+Requires:       qt6-qtbase-devel = %{version}%{?pre:~%pre}
 # Public headers require vulkan/vulkan.h
 Requires:       mingw32-vulkan-headers
@@ -133,7 +133,7 @@ Fedora Windows cross-compiler.
 %package -n mingw64-qt6-qtbase
 Summary:        Qt6 for Windows - QtBase component
 # Dependency for host tools
-Requires:       qt6-qtbase-devel = %{version}
+Requires:       qt6-qtbase-devel = %{version}%{?pre:~%pre}
 # Public headers require vulkan/vulkan.h
 Requires:       mingw64-vulkan-headers
@@ -279,14 +279,18 @@ ln -s %{_prefix}/%{mingw64_target}/bin/qt6/qt-cmake %{buildroot}%{_bindir}/%{min
 %{mingw32_libdir}/qt6/plugins/sqldrivers/qsqlpsql.dll
 %dir %{mingw32_libdir}/qt6/plugins/styles
 %{mingw32_libdir}/qt6/plugins/styles/qwindowsvistastyle.dll
+%dir %{mingw32_libdir}/qt6/plugins/tls
+%{mingw32_libdir}/qt6/plugins/tls/qcertonlybackend.dll
+%{mingw32_libdir}/qt6/plugins/tls/qopensslbackend.dll
+%{mingw32_libdir}/qt6/plugins/tls/qschannelbackend.dll
 %{mingw32_libdir}/cmake/Qt6/
 %{mingw32_libdir}/cmake/Qt6BuildInternals/
 %{mingw32_libdir}/cmake/Qt6Concurrent/
 %{mingw32_libdir}/cmake/Qt6Core/
 %{mingw32_libdir}/cmake/Qt6DBus/
-%{mingw32_libdir}/cmake/Qt6DeviceDiscoverySupport/
-%{mingw32_libdir}/cmake/Qt6EntryPoint/
-%{mingw32_libdir}/cmake/Qt6FbSupport/
+%{mingw32_libdir}/cmake/Qt6DeviceDiscoverySupportPrivate/
+%{mingw32_libdir}/cmake/Qt6EntryPointPrivate/
+%{mingw32_libdir}/cmake/Qt6FbSupportPrivate/
 %{mingw32_libdir}/cmake/Qt6Gui/
 %{mingw32_libdir}/cmake/Qt6HostInfo/
 %{mingw32_libdir}/cmake/Qt6Network/
@@ -298,9 +302,20 @@ ln -s %{_prefix}/%{mingw64_target}/bin/qt6/qt-cmake %{buildroot}%{_bindir}/%{min
 %{mingw32_libdir}/cmake/Qt6Widgets/
 %{mingw32_libdir}/cmake/Qt6Xml/
 %dir %{mingw32_libdir}/metatypes
+%{mingw32_libdir}/metatypes/qt6concurrent_relwithdebinfo_metatypes.json
 %{mingw32_libdir}/metatypes/qt6core_relwithdebinfo_metatypes.json
+%{mingw32_libdir}/metatypes/qt6dbus_relwithdebinfo_metatypes.json
+%{mingw32_libdir}/metatypes/qt6devicediscoverysupportprivate_relwithdebinfo_metatypes.json
+%{mingw32_libdir}/metatypes/qt6fbsupportprivate_relwithdebinfo_metatypes.json
 %{mingw32_libdir}/metatypes/qt6gui_relwithdebinfo_metatypes.json
+%{mingw32_libdir}/metatypes/qt6network_relwithdebinfo_metatypes.json
+%{mingw32_libdir}/metatypes/qt6opengl_relwithdebinfo_metatypes.json
+%{mingw32_libdir}/metatypes/qt6openglwidgets_relwithdebinfo_metatypes.json
+%{mingw32_libdir}/metatypes/qt6printsupport_relwithdebinfo_metatypes.json
+%{mingw32_libdir}/metatypes/qt6sql_relwithdebinfo_metatypes.json
+%{mingw32_libdir}/metatypes/qt6test_relwithdebinfo_metatypes.json
 %{mingw32_libdir}/metatypes/qt6widgets_relwithdebinfo_metatypes.json
+%{mingw32_libdir}/metatypes/qt6xml_relwithdebinfo_metatypes.json
 %dir %{mingw32_includedir}/qt6/
 %{mingw32_includedir}/qt6/*
 %dir %{mingw32_datadir}/qt6/
@@ -380,14 +395,18 @@ ln -s %{_prefix}/%{mingw64_target}/bin/qt6/qt-cmake %{buildroot}%{_bindir}/%{min
 %{mingw64_libdir}/qt6/plugins/sqldrivers/qsqlpsql.dll
 %dir %{mingw64_libdir}/qt6/plugins/styles
 %{mingw64_libdir}/qt6/plugins/styles/qwindowsvistastyle.dll
+%dir %{mingw64_libdir}/qt6/plugins/tls
+%{mingw64_libdir}/qt6/plugins/tls/qcertonlybackend.dll
+%{mingw64_libdir}/qt6/plugins/tls/qopensslbackend.dll
+%{mingw64_libdir}/qt6/plugins/tls/qschannelbackend.dll
 %{mingw64_libdir}/cmake/Qt6/
 %{mingw64_libdir}/cmake/Qt6BuildInternals/
 %{mingw64_libdir}/cmake/Qt6Concurrent/
 %{mingw64_libdir}/cmake/Qt6Core/
 %{mingw64_libdir}/cmake/Qt6DBus/
-%{mingw64_libdir}/cmake/Qt6DeviceDiscoverySupport/
-%{mingw64_libdir}/cmake/Qt6EntryPoint/
-%{mingw64_libdir}/cmake/Qt6FbSupport/
+%{mingw64_libdir}/cmake/Qt6DeviceDiscoverySupportPrivate/
+%{mingw64_libdir}/cmake/Qt6EntryPointPrivate/
+%{mingw64_libdir}/cmake/Qt6FbSupportPrivate/
 %{mingw64_libdir}/cmake/Qt6Gui/
 %{mingw64_libdir}/cmake/Qt6HostInfo/
 %{mingw64_libdir}/cmake/Qt6Network/
@@ -399,9 +418,20 @@ ln -s %{_prefix}/%{mingw64_target}/bin/qt6/qt-cmake %{buildroot}%{_bindir}/%{min
 %{mingw64_libdir}/cmake/Qt6Widgets/
 %{mingw64_libdir}/cmake/Qt6Xml/
 %dir %{mingw64_libdir}/metatypes
+%{mingw64_libdir}/metatypes/qt6concurrent_relwithdebinfo_metatypes.json
 %{mingw64_libdir}/metatypes/qt6core_relwithdebinfo_metatypes.json
+%{mingw64_libdir}/metatypes/qt6dbus_relwithdebinfo_metatypes.json
+%{mingw64_libdir}/metatypes/qt6devicediscoverysupportprivate_relwithdebinfo_metatypes.json
+%{mingw64_libdir}/metatypes/qt6fbsupportprivate_relwithdebinfo_metatypes.json
 %{mingw64_libdir}/metatypes/qt6gui_relwithdebinfo_metatypes.json
+%{mingw64_libdir}/metatypes/qt6network_relwithdebinfo_metatypes.json
+%{mingw64_libdir}/metatypes/qt6opengl_relwithdebinfo_metatypes.json
+%{mingw64_libdir}/metatypes/qt6openglwidgets_relwithdebinfo_metatypes.json
+%{mingw64_libdir}/metatypes/qt6printsupport_relwithdebinfo_metatypes.json
+%{mingw64_libdir}/metatypes/qt6sql_relwithdebinfo_metatypes.json
+%{mingw64_libdir}/metatypes/qt6test_relwithdebinfo_metatypes.json
 %{mingw64_libdir}/metatypes/qt6widgets_relwithdebinfo_metatypes.json
+%{mingw64_libdir}/metatypes/qt6xml_relwithdebinfo_metatypes.json
 %dir %{mingw64_includedir}/qt6/
 %{mingw64_includedir}/qt6/*
 %dir %{mingw64_datadir}/qt6/
@@ -417,6 +447,9 @@ ln -s %{_prefix}/%{mingw64_target}/bin/qt6/qt-cmake %{buildroot}%{_bindir}/%{min
%changelog
+* Tue Sep 21 2021 Sandro Mani manisandro@gmail.com - 6.2.0-0.1.rc1
+- Update to 6.2.0-rc
+
 * Thu Aug 12 2021 Sandro Mani manisandro@gmail.com - 6.1.2-1
 - Update to 6.1.2
diff --git a/qtbase-cmake-prefix-path.patch b/qtbase-cmake-prefix-path.patch
index 50ecc09..eb6d9ce 100644
--- a/qtbase-cmake-prefix-path.patch
+++ b/qtbase-cmake-prefix-path.patch
@@ -1,7 +1,7 @@
-diff -rupN --no-dereference qtbase-everywhere-src-6.1.2/cmake/QtToolHelpers.cmake qtbase-everywhere-src-6.1.2-new/cmake/QtToolHelpers.cmake
---- qtbase-everywhere-src-6.1.2/cmake/QtToolHelpers.cmake	2021-06-08 16:49:53.000000000 +0200
-+++ qtbase-everywhere-src-6.1.2-new/cmake/QtToolHelpers.cmake	2021-08-12 21:28:03.675099529 +0200
-@@ -73,7 +73,7 @@ function(qt_internal_add_tool target_nam
+diff -rupN --no-dereference qtbase-everywhere-src-6.2.0-rc/cmake/QtToolHelpers.cmake qtbase-everywhere-src-6.2.0-rc-new/cmake/QtToolHelpers.cmake
+--- qtbase-everywhere-src-6.2.0-rc/cmake/QtToolHelpers.cmake	2021-09-09 16:14:07.000000000 +0200
++++ qtbase-everywhere-src-6.2.0-rc-new/cmake/QtToolHelpers.cmake	2021-09-21 14:13:17.225539326 +0200
+@@ -82,7 +82,7 @@ function(qt_internal_add_tool target_nam
          # instead of PATHS option, because any find_dependency call inside a Tools package would
          # not get the proper prefix when using PATHS.
          set(BACKUP_CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH})
diff --git a/qtbase-import-lib-suffix.patch b/qtbase-import-lib-suffix.patch
index ea0f7c9..9ac59fa 100644
--- a/qtbase-import-lib-suffix.patch
+++ b/qtbase-import-lib-suffix.patch
@@ -1,7 +1,7 @@
-diff -rupN --no-dereference qtbase-everywhere-src-6.1.2/cmake/QtPriHelpers.cmake qtbase-everywhere-src-6.1.2-new/cmake/QtPriHelpers.cmake
---- qtbase-everywhere-src-6.1.2/cmake/QtPriHelpers.cmake	2021-06-08 16:49:53.000000000 +0200
-+++ qtbase-everywhere-src-6.1.2-new/cmake/QtPriHelpers.cmake	2021-08-12 21:27:59.470986537 +0200
-@@ -372,9 +372,13 @@ QT.${config_module_name}_private.disable
+diff -rupN --no-dereference qtbase-everywhere-src-6.2.0-rc/cmake/QtPriHelpers.cmake qtbase-everywhere-src-6.2.0-rc-new/cmake/QtPriHelpers.cmake
+--- qtbase-everywhere-src-6.2.0-rc/cmake/QtPriHelpers.cmake	2021-09-09 16:14:07.000000000 +0200
++++ qtbase-everywhere-src-6.2.0-rc-new/cmake/QtPriHelpers.cmake	2021-09-21 14:13:13.123546798 +0200
+@@ -401,9 +401,13 @@ QT.${config_module_name}_private.disable
          qt_path_join(private_pri_file_path "${target_path}" "${private_pri_file_name}")
          list(APPEND pri_files "${private_pri_file_path}")
@@ -16,7 +16,7 @@ diff -rupN --no-dereference qtbase-everywhere-src-6.1.2/cmake/QtPriHelpers.cmake
              ${CMAKE_EXTRA_SHARED_LIBRARY_SUFFIXES}
              ${CMAKE_STATIC_LIBRARY_SUFFIX})
          if(MSVC)
-@@ -785,9 +789,13 @@ CONFIG += ${private_config_joined}
+@@ -828,9 +832,13 @@ CONFIG += ${private_config_joined}
          list(APPEND inputs "${preliminary_pri_root}/${cfg}/${pri_data_cmake_file}")
      endforeach()
@@ -31,10 +31,10 @@ diff -rupN --no-dereference qtbase-everywhere-src-6.1.2/cmake/QtPriHelpers.cmake
          ${CMAKE_EXTRA_SHARED_LIBRARY_SUFFIXES}
          ${CMAKE_STATIC_LIBRARY_SUFFIX})
      if(MSVC)
-diff -rupN --no-dereference qtbase-everywhere-src-6.1.2/cmake/QtPrlHelpers.cmake qtbase-everywhere-src-6.1.2-new/cmake/QtPrlHelpers.cmake
---- qtbase-everywhere-src-6.1.2/cmake/QtPrlHelpers.cmake	2021-06-08 16:49:53.000000000 +0200
-+++ qtbase-everywhere-src-6.1.2-new/cmake/QtPrlHelpers.cmake	2021-08-12 21:27:59.471986565 +0200
-@@ -348,11 +348,17 @@ ${prl_step1_content_libs}
+diff -rupN --no-dereference qtbase-everywhere-src-6.2.0-rc/cmake/QtPrlHelpers.cmake qtbase-everywhere-src-6.2.0-rc-new/cmake/QtPrlHelpers.cmake
+--- qtbase-everywhere-src-6.2.0-rc/cmake/QtPrlHelpers.cmake	2021-09-09 16:14:07.000000000 +0200
++++ qtbase-everywhere-src-6.2.0-rc-new/cmake/QtPrlHelpers.cmake	2021-09-21 14:13:13.124546796 +0200
+@@ -120,11 +120,17 @@ ${prl_step1_content_libs}
           CONTENT
           "FINAL_PRL_FILE_PATH = ${final_prl_file_path}")
@@ -53,9 +53,9 @@ diff -rupN --no-dereference qtbase-everywhere-src-6.1.2/cmake/QtPrlHelpers.cmake
if(QT_GENERATOR_IS_MULTI_CONFIG)
          set(configs ${CMAKE_CONFIGURATION_TYPES})
-diff -rupN --no-dereference qtbase-everywhere-src-6.1.2/mkspecs/common/g++-win32.conf qtbase-everywhere-src-6.1.2-new/mkspecs/common/g++-win32.conf
---- qtbase-everywhere-src-6.1.2/mkspecs/common/g++-win32.conf	2021-06-08 16:49:53.000000000 +0200
-+++ qtbase-everywhere-src-6.1.2-new/mkspecs/common/g++-win32.conf	2021-08-12 21:27:59.471986565 +0200
+diff -rupN --no-dereference qtbase-everywhere-src-6.2.0-rc/mkspecs/common/g++-win32.conf qtbase-everywhere-src-6.2.0-rc-new/mkspecs/common/g++-win32.conf
+--- qtbase-everywhere-src-6.2.0-rc/mkspecs/common/g++-win32.conf	2021-09-09 16:14:07.000000000 +0200
++++ qtbase-everywhere-src-6.2.0-rc-new/mkspecs/common/g++-win32.conf	2021-09-21 14:13:13.124546796 +0200
 @@ -54,6 +54,7 @@ QMAKE_PREFIX_SHLIB      =
  QMAKE_EXTENSION_SHLIB   = dll
  QMAKE_PREFIX_STATICLIB  = lib
@@ -64,9 +64,9 @@ diff -rupN --no-dereference qtbase-everywhere-src-6.1.2/mkspecs/common/g++-win32
  QMAKE_LIB_EXTENSIONS    = a dll.a
QMAKE_LIBS              =
-diff -rupN --no-dereference qtbase-everywhere-src-6.1.2/mkspecs/features/create_cmake.prf qtbase-everywhere-src-6.1.2-new/mkspecs/features/create_cmake.prf
---- qtbase-everywhere-src-6.1.2/mkspecs/features/create_cmake.prf	2021-06-08 16:49:53.000000000 +0200
-+++ qtbase-everywhere-src-6.1.2-new/mkspecs/features/create_cmake.prf	2021-08-12 21:27:59.471986565 +0200
+diff -rupN --no-dereference qtbase-everywhere-src-6.2.0-rc/mkspecs/features/create_cmake.prf qtbase-everywhere-src-6.2.0-rc-new/mkspecs/features/create_cmake.prf
+--- qtbase-everywhere-src-6.2.0-rc/mkspecs/features/create_cmake.prf	2021-09-09 16:14:07.000000000 +0200
++++ qtbase-everywhere-src-6.2.0-rc-new/mkspecs/features/create_cmake.prf	2021-09-21 14:13:13.124546796 +0200
 @@ -332,8 +332,9 @@ mac {
          CMAKE_WINMAIN_FILE_LOCATION_DEBUG = libqtmain$${QT_LIBINFIX}$${debug_suffix}.a
          CMAKE_WINMAIN_FILE_LOCATION_RELEASE = libqtmain$${QT_LIBINFIX}.a
@@ -79,10 +79,10 @@ diff -rupN --no-dereference qtbase-everywhere-src-6.1.2/mkspecs/features/create_
      } else {
          CMAKE_WINMAIN_FILE_LOCATION_DEBUG = qtmain$${QT_LIBINFIX}$${debug_suffix}.lib
          CMAKE_WINMAIN_FILE_LOCATION_RELEASE = qtmain$${QT_LIBINFIX}.lib
-diff -rupN --no-dereference qtbase-everywhere-src-6.1.2/src/corelib/Qt6CoreMacros.cmake qtbase-everywhere-src-6.1.2-new/src/corelib/Qt6CoreMacros.cmake
---- qtbase-everywhere-src-6.1.2/src/corelib/Qt6CoreMacros.cmake	2021-06-08 16:49:53.000000000 +0200
-+++ qtbase-everywhere-src-6.1.2-new/src/corelib/Qt6CoreMacros.cmake	2021-08-12 21:27:59.472986593 +0200
-@@ -460,7 +460,6 @@ function(_qt_internal_apply_win_prefix_a
+diff -rupN --no-dereference qtbase-everywhere-src-6.2.0-rc/src/corelib/Qt6CoreMacros.cmake qtbase-everywhere-src-6.2.0-rc-new/src/corelib/Qt6CoreMacros.cmake
+--- qtbase-everywhere-src-6.2.0-rc/src/corelib/Qt6CoreMacros.cmake	2021-09-09 16:14:07.000000000 +0200
++++ qtbase-everywhere-src-6.2.0-rc-new/src/corelib/Qt6CoreMacros.cmake	2021-09-21 14:13:13.125546794 +0200
+@@ -466,7 +466,6 @@ function(_qt_internal_apply_win_prefix_a
# This should cover both MINGW with GCC and CLANG.
          if(NOT MSVC)
diff --git a/qtbase-include-toolchain.patch b/qtbase-include-toolchain.patch
index 20f930b..ca57d4b 100644
--- a/qtbase-include-toolchain.patch
+++ b/qtbase-include-toolchain.patch
@@ -1,6 +1,6 @@
-diff -rupN --no-dereference qtbase-everywhere-src-6.1.2/cmake/QtConfig.cmake.in qtbase-everywhere-src-6.1.2-new/cmake/QtConfig.cmake.in
---- qtbase-everywhere-src-6.1.2/cmake/QtConfig.cmake.in	2021-06-08 16:49:53.000000000 +0200
-+++ qtbase-everywhere-src-6.1.2-new/cmake/QtConfig.cmake.in	2021-08-12 21:28:02.699074191 +0200
+diff -rupN --no-dereference qtbase-everywhere-src-6.2.0-rc/cmake/QtConfig.cmake.in qtbase-everywhere-src-6.2.0-rc-new/cmake/QtConfig.cmake.in
+--- qtbase-everywhere-src-6.2.0-rc/cmake/QtConfig.cmake.in	2021-09-09 16:14:07.000000000 +0200
++++ qtbase-everywhere-src-6.2.0-rc-new/cmake/QtConfig.cmake.in	2021-09-21 14:13:16.236541128 +0200
 @@ -1,5 +1,7 @@
  @PACKAGE_INIT@
@@ -8,4 +8,4 @@ diff -rupN --no-dereference qtbase-everywhere-src-6.1.2/cmake/QtConfig.cmake.in
 +
  cmake_minimum_required(VERSION @min_new_policy_version@...@max_new_policy_version@)
- get_filename_component(_qt_cmake_dir "${CMAKE_CURRENT_LIST_DIR}/.." ABSOLUTE)
+ include("${CMAKE_CURRENT_LIST_DIR}/@INSTALL_CMAKE_NAMESPACE@ConfigExtras.cmake")
diff --git a/qtbase-libnames.patch b/qtbase-libnames.patch
deleted file mode 100644
index d357afa..0000000
--- a/qtbase-libnames.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -rupN --no-dereference qtbase-everywhere-src-6.1.2/cmake/FindWrapOpenSSL.cmake qtbase-everywhere-src-6.1.2-new/cmake/FindWrapOpenSSL.cmake
---- qtbase-everywhere-src-6.1.2/cmake/FindWrapOpenSSL.cmake	2021-06-08 16:49:53.000000000 +0200
-+++ qtbase-everywhere-src-6.1.2-new/cmake/FindWrapOpenSSL.cmake	2021-08-12 21:27:58.397956066 +0200
-@@ -18,7 +18,7 @@ if(OpenSSL_FOUND)
-         else()
-             set(writableLib OpenSSL::Crypto)
-         endif()
--        set_property(TARGET ${writableLib} APPEND PROPERTY INTERFACE_LINK_LIBRARIES Ws2_32 Crypt32)
-+        set_property(TARGET ${writableLib} APPEND PROPERTY INTERFACE_LINK_LIBRARIES ws2_32 crypt32)
-         unset(libType)
-         unset(writableLib)
-     endif()
-diff -rupN --no-dereference qtbase-everywhere-src-6.1.2/src/network/configure.json qtbase-everywhere-src-6.1.2-new/src/network/configure.json
---- qtbase-everywhere-src-6.1.2/src/network/configure.json	2021-06-08 16:49:53.000000000 +0200
-+++ qtbase-everywhere-src-6.1.2-new/src/network/configure.json	2021-08-12 21:27:58.397956066 +0200
-@@ -89,7 +89,7 @@
-             "sources": [
-                 { "type": "openssl" },
-                 {
--                    "libs": "-lssleay32 -llibeay32 -lUser32 -lWs2_32 -lAdvapi32 -lGdi32",
-+                    "libs": "-lssleay32 -llibeay32 -luser32 -lws2_32 -ladvapi32 -lgdi32",
-                     "condition": "config.win32"
-                 },
-                 {
diff --git a/qtbase-python3.patch b/qtbase-python3.patch
index 9757579..c207a26 100644
--- a/qtbase-python3.patch
+++ b/qtbase-python3.patch
@@ -1,6 +1,6 @@
-diff -rupN --no-dereference qtbase-everywhere-src-6.1.2/mkspecs/features/uikit/devices.py qtbase-everywhere-src-6.1.2-new/mkspecs/features/uikit/devices.py
---- qtbase-everywhere-src-6.1.2/mkspecs/features/uikit/devices.py	2021-06-08 16:49:53.000000000 +0200
-+++ qtbase-everywhere-src-6.1.2-new/mkspecs/features/uikit/devices.py	2021-08-12 21:28:01.579044447 +0200
+diff -rupN --no-dereference qtbase-everywhere-src-6.2.0-rc/mkspecs/features/uikit/devices.py qtbase-everywhere-src-6.2.0-rc-new/mkspecs/features/uikit/devices.py
+--- qtbase-everywhere-src-6.2.0-rc/mkspecs/features/uikit/devices.py	2021-09-09 16:14:07.000000000 +0200
++++ qtbase-everywhere-src-6.2.0-rc-new/mkspecs/features/uikit/devices.py	2021-09-21 14:13:15.233542955 +0200
 @@ -1,4 +1,4 @@
 -#!/usr/bin/python
 +#!/usr/bin/python3
diff --git a/qtbase-readlink.patch b/qtbase-readlink.patch
index 51b0725..a7444d7 100644
--- a/qtbase-readlink.patch
+++ b/qtbase-readlink.patch
@@ -1,6 +1,6 @@
-diff -rupN --no-dereference qtbase-everywhere-src-6.1.2/bin/qmake-wrapper-for-target.in qtbase-everywhere-src-6.1.2-new/bin/qmake-wrapper-for-target.in
---- qtbase-everywhere-src-6.1.2/bin/qmake-wrapper-for-target.in	2021-06-08 16:49:53.000000000 +0200
-+++ qtbase-everywhere-src-6.1.2-new/bin/qmake-wrapper-for-target.in	2021-08-12 21:28:00.528015894 +0200
+diff -rupN --no-dereference qtbase-everywhere-src-6.2.0-rc/bin/qmake-wrapper-for-target.in qtbase-everywhere-src-6.2.0-rc-new/bin/qmake-wrapper-for-target.in
+--- qtbase-everywhere-src-6.2.0-rc/bin/qmake-wrapper-for-target.in	2021-09-09 16:14:07.000000000 +0200
++++ qtbase-everywhere-src-6.2.0-rc-new/bin/qmake-wrapper-for-target.in	2021-09-21 14:13:14.195544846 +0200
 @@ -1,7 +1,7 @@
  #!/bin/sh
@@ -10,9 +10,9 @@ diff -rupN --no-dereference qtbase-everywhere-src-6.1.2/bin/qmake-wrapper-for-ta
  script_dir_path=`(cd "$script_dir_path"; /bin/pwd)`
@host_qt_bindir@/qmake -qtconf "$script_dir_path/target_qt.conf" $*
-diff -rupN --no-dereference qtbase-everywhere-src-6.1.2/bin/qt-cmake.in qtbase-everywhere-src-6.1.2-new/bin/qt-cmake.in
---- qtbase-everywhere-src-6.1.2/bin/qt-cmake.in	2021-06-08 16:49:53.000000000 +0200
-+++ qtbase-everywhere-src-6.1.2-new/bin/qt-cmake.in	2021-08-12 21:28:00.528015894 +0200
+diff -rupN --no-dereference qtbase-everywhere-src-6.2.0-rc/bin/qt-cmake.in qtbase-everywhere-src-6.2.0-rc-new/bin/qt-cmake.in
+--- qtbase-everywhere-src-6.2.0-rc/bin/qt-cmake.in	2021-09-09 16:14:07.000000000 +0200
++++ qtbase-everywhere-src-6.2.0-rc-new/bin/qt-cmake.in	2021-09-21 14:13:14.196544844 +0200
 @@ -1,7 +1,7 @@
  #!/bin/sh
diff --git a/sources b/sources
index f55dd1a..8e351aa 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (qtbase-everywhere-src-6.1.2.tar.xz) = 0f9bf5680268c6dc95c10c28297908c9113a7e3e498ba80ed3ba73cc98b809b38fa610ee3b15f367b6ace2f593842db8d27dc7ec2142737574cfa32cdf57ea91
+SHA512 (qtbase-everywhere-src-6.2.0-rc.tar.xz) = ff2a14c026db6ca34c09a0e3b29c13796ccf412bece4a81401bb2948bd60369613c2758632065f13cf95f535bc39bf1dbefd912700b3f49b24b5dbcb02f3252d

    