Update to beta2

6 files changed, 25 insertions, 139 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c024cad59467..0503040af58f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = mingw-w64-qt6-base
 	pkgdesc = A cross-platform application and UI framework (mingw-w64)
-	pkgver = 6.0.0beta1
+	pkgver = 6.0.0beta2
 	pkgrel = 1
 	url = https://www.qt.io
 	arch = any
@@ -35,14 +35,12 @@ pkgbase = mingw-w64-qt6-base
 	options = !buildflags
 	options = staticlibs
 	options = !emptydirs
-	source = https://download.qt.io/development_releases/qt/6.0/6.0.0-beta1/submodules/qtbase-everywhere-src-6.0.0-beta1.tar.xz
+	source = https://download.qt.io/development_releases/qt/6.0/6.0.0-beta2/submodules/qtbase-everywhere-src-6.0.0-beta2.tar.xz
 	source = 0001-Use-CMake-s-default-import-library-suffix.patch
-	source = 0002-Rename-qtmain-to-qt6main-to-make-Qt-6-co-installable.patch
-	source = 0003-Fix-finding-D-Bus.patch
-	sha256sums = d23210ba903be38aa43fe7887b8df62a1a310ea053712a30670cc479cf0219a0
-	sha256sums = 43a19aaaf39d9e5fbce15657f216b5bd343b4be3eeffcb888dcb0d00a011d744
-	sha256sums = 74871688a19acd6e254852485c07a1bceb0ce8ae67274d44227528c25e913b37
-	sha256sums = 969c980eb3d8e9dc06063def818172e443e87b0511e5a6c95a84a1b5f4a5f841
+	source = 0002-Fix-finding-D-Bus.patch
+	sha256sums = 1207a5ceb001d164f3cf6646fbd483a055440400c20a315f98f36e23c73f204e
+	sha256sums = 10ea48221878769b7bd50328f31f16effc6789d92dd91e9cb22c0acb77ca6095
+	sha256sums = 35ef8ed4f01727ef4a56b856fd91e33fd7f93e5f2813b308872231d182c5df8f
 
 pkgname = mingw-w64-qt6-base
 
diff --git a/0001-Use-CMake-s-default-import-library-suffix.patch b/0001-Use-CMake-s-default-import-library-suffix.patch
index 779576aad1d2..77356be11aee 100644
--- a/0001-Use-CMake-s-default-import-library-suffix.patch
+++ b/0001-Use-CMake-s-default-import-library-suffix.patch
@@ -1,7 +1,7 @@
-From b9fa200e7404db3edae936f7975526b78bad556a Mon Sep 17 00:00:00 2001
+From b067b34ebd6238a6b4c3c0f9d56e88ef169ef53e Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Mon, 14 Sep 2020 20:39:52 +0200
-Subject: [PATCH 1/3] Use CMake's default import library suffix
+Subject: [PATCH 1/2] Use CMake's default import library suffix
 
 Change-Id: I371abd37c85bd8edf338c16b149dbcaa872a85bd
 ---
@@ -13,10 +13,10 @@ Change-Id: I371abd37c85bd8edf338c16b149dbcaa872a85bd
  5 files changed, 18 insertions(+), 6 deletions(-)
 
 diff --git a/cmake/QtPriHelpers.cmake b/cmake/QtPriHelpers.cmake
-index 007acc95dd..8dd7ca63d2 100644
+index b79f17243e..a689b2b775 100644
 --- a/cmake/QtPriHelpers.cmake
 +++ b/cmake/QtPriHelpers.cmake
-@@ -293,11 +293,17 @@ QT.${config_module_name}_private.disabled_features = ${disabled_private_features
+@@ -292,11 +292,17 @@ QT.${config_module_name}_private.disabled_features = ${disabled_private_features
      qt_path_join(private_pri_file_path "${target_path}" "${private_pri_file_name}")
      list(APPEND pri_files "${private_pri_file_path}")
  
@@ -36,10 +36,10 @@ index 007acc95dd..8dd7ca63d2 100644
          OUTPUT "${private_pri_file_path}"
          DEPENDS ${inputs}
 diff --git a/cmake/QtPrlHelpers.cmake b/cmake/QtPrlHelpers.cmake
-index 7977afd030..7488d5f959 100644
+index 932565f318..9729c150a4 100644
 --- a/cmake/QtPrlHelpers.cmake
 +++ b/cmake/QtPrlHelpers.cmake
-@@ -248,11 +248,17 @@ QMAKE_PRL_VERSION = ${PROJECT_VERSION}
+@@ -258,11 +258,17 @@ QMAKE_PRL_VERSION = ${PROJECT_VERSION}
           CONTENT
           "FINAL_PRL_FILE_PATH = ${final_prl_file_path}")
  
@@ -59,10 +59,10 @@ index 7977afd030..7488d5f959 100644
      if(QT_GENERATOR_IS_MULTI_CONFIG)
          set(configs ${CMAKE_CONFIGURATION_TYPES})
 diff --git a/cmake/QtTargetHelpers.cmake b/cmake/QtTargetHelpers.cmake
-index dd23e8c95b..2213b04cd7 100644
+index fcbb3ab1f2..332ef6ee4c 100644
 --- a/cmake/QtTargetHelpers.cmake
 +++ b/cmake/QtTargetHelpers.cmake
-@@ -274,8 +274,6 @@ function(qt_internal_apply_win_prefix_and_suffix target)
+@@ -283,8 +283,6 @@ function(qt_internal_apply_win_prefix_and_suffix target)
  
          # This should cover both MINGW with GCC and CLANG.
          if(NOT MSVC)
@@ -72,7 +72,7 @@ index dd23e8c95b..2213b04cd7 100644
              if(target_type STREQUAL "STATIC_LIBRARY")
                  set_property(TARGET "${target}" PROPERTY PREFIX "lib")
 diff --git a/mkspecs/common/g++-win32.conf b/mkspecs/common/g++-win32.conf
-index a1e08ed63b..9f3ae47108 100644
+index 67ad1e3b8c..b98c7121f6 100644
 --- a/mkspecs/common/g++-win32.conf
 +++ b/mkspecs/common/g++-win32.conf
 @@ -54,6 +54,7 @@ QMAKE_PREFIX_SHLIB      =
@@ -100,5 +100,5 @@ index 24ed125f12..73ebe453d3 100644
          CMAKE_WINMAIN_FILE_LOCATION_DEBUG = qtmain$${QT_LIBINFIX}$${debug_suffix}.lib
          CMAKE_WINMAIN_FILE_LOCATION_RELEASE = qtmain$${QT_LIBINFIX}.lib
 -- 
-2.28.0
+2.29.1
 
diff --git a/0003-Fix-finding-D-Bus.patch b/0002-Fix-finding-D-Bus.patch
index aa8b2a6c264f..77688efb1fc4 100644
--- a/0003-Fix-finding-D-Bus.patch
+++ b/0002-Fix-finding-D-Bus.patch
@@ -1,7 +1,7 @@
-From 2e121479348d9c6151e191d58f631faa4fc0cad6 Mon Sep 17 00:00:00 2001
+From 3568ffe90378ce9507ad9403f66adac8cbc31df4 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Wed, 7 Oct 2020 12:13:37 +0200
-Subject: [PATCH 3/3] Fix finding D-Bus
+Subject: [PATCH 2/2] Fix finding D-Bus
 
 Change-Id: Ie21eb9cbc6b1b5d9c8b34eea46f54718e5926986
 ---
@@ -19,5 +19,5 @@ index e227d224e0..4982e7c8ae 100644
 +set_property(TARGET dbus-1 PROPERTY IMPORTED_IMPLIB ${DBus1_LIBRARY})
 \ No newline at end of file
 -- 
-2.28.0
+2.29.1
 
diff --git a/0002-Rename-qtmain-to-qt6main-to-make-Qt-6-co-installable.patch b/0002-Rename-qtmain-to-qt6main-to-make-Qt-6-co-installable.patch
deleted file mode 100644
index c8206b9ddd34..000000000000
--- a/0002-Rename-qtmain-to-qt6main-to-make-Qt-6-co-installable.patch
+++ /dev/null
@@ -1,110 +0,0 @@
-From 029abc25e2a00675868ae89c4251564a4fa81fa5 Mon Sep 17 00:00:00 2001
-From: Martchus <martchus@gmx.net>
-Date: Mon, 14 Sep 2020 20:49:14 +0200
-Subject: [PATCH 2/3] Rename qtmain to qt6main to make Qt 6 co-installable with
- previous versions
-
-Change-Id: Ic750ae711673e3ff246fcff0c54ab71644a3041e
----
- mkspecs/common/g++-win32.conf      | 2 +-
- mkspecs/common/msvc-desktop.conf   | 2 +-
- mkspecs/features/create_cmake.prf  | 8 ++++----
- mkspecs/features/win32/windows.prf | 4 ++--
- src/winmain/CMakeLists.txt         | 2 +-
- src/winmain/winmain.pro            | 2 +-
- 6 files changed, 10 insertions(+), 10 deletions(-)
-
-diff --git a/mkspecs/common/g++-win32.conf b/mkspecs/common/g++-win32.conf
-index 9f3ae47108..3623645155 100644
---- a/mkspecs/common/g++-win32.conf
-+++ b/mkspecs/common/g++-win32.conf
-@@ -64,7 +64,7 @@ QMAKE_LIBS_OPENGL       = -lglu32 -lopengl32 -lgdi32 -luser32
- QMAKE_LIBS_OPENGL_ES2   = -lgdi32 -luser32
- QMAKE_LIBS_OPENGL_ES2_DEBUG = -lgdi32 -luser32
- QMAKE_LIBS_COMPAT       = -ladvapi32 -lshell32 -lcomdlg32 -luser32 -lgdi32 -lws2_32
--QMAKE_LIBS_QT_ENTRY     = -lmingw32 -lqtmain
-+QMAKE_LIBS_QT_ENTRY     = -lmingw32 -lqt6main
- 
- QMAKE_IDL               = midl
- QMAKE_LIB               = $${CROSS_COMPILE}ar -rc
-diff --git a/mkspecs/common/msvc-desktop.conf b/mkspecs/common/msvc-desktop.conf
-index a5993287ed..92dd730c39 100644
---- a/mkspecs/common/msvc-desktop.conf
-+++ b/mkspecs/common/msvc-desktop.conf
-@@ -105,7 +105,7 @@ QMAKE_LIBS_OPENGL       = glu32.lib opengl32.lib gdi32.lib user32.lib
- QMAKE_LIBS_OPENGL_ES2   = gdi32.lib user32.lib
- QMAKE_LIBS_OPENGL_ES2_DEBUG = gdi32.lib user32.lib
- QMAKE_LIBS_COMPAT       = advapi32.lib shell32.lib comdlg32.lib user32.lib gdi32.lib ws2_32.lib
--QMAKE_LIBS_QT_ENTRY     = -lqtmain
-+QMAKE_LIBS_QT_ENTRY     = -lqt6main
- 
- QMAKE_IDL               = midl
- QMAKE_LIB               = lib /NOLOGO
-diff --git a/mkspecs/features/create_cmake.prf b/mkspecs/features/create_cmake.prf
-index 73ebe453d3..98f32e1f04 100644
---- a/mkspecs/features/create_cmake.prf
-+++ b/mkspecs/features/create_cmake.prf
-@@ -329,15 +329,15 @@ mac {
-     }
- 
-     mingw {
--        CMAKE_WINMAIN_FILE_LOCATION_DEBUG = libqtmain$${QT_LIBINFIX}$${debug_suffix}.a
--        CMAKE_WINMAIN_FILE_LOCATION_RELEASE = libqtmain$${QT_LIBINFIX}.a
-+        CMAKE_WINMAIN_FILE_LOCATION_DEBUG = libqt6main$${QT_LIBINFIX}$${debug_suffix}.a
-+        CMAKE_WINMAIN_FILE_LOCATION_RELEASE = libqt6main$${QT_LIBINFIX}.a
- 
-         isEmpty(QMAKE_EXTENSION_IMPORTLIB): QMAKE_EXTENSION_IMPORTLIB = a
-         CMAKE_IMPLIB_FILE_LOCATION_DEBUG = lib$${CMAKE_QT_STEM}$${debug_suffix}.$${QMAKE_EXTENSION_IMPORTLIB}
-         CMAKE_IMPLIB_FILE_LOCATION_RELEASE = lib$${CMAKE_QT_STEM}.$${QMAKE_EXTENSION_IMPORTLIB}
-     } else {
--        CMAKE_WINMAIN_FILE_LOCATION_DEBUG = qtmain$${QT_LIBINFIX}$${debug_suffix}.lib
--        CMAKE_WINMAIN_FILE_LOCATION_RELEASE = qtmain$${QT_LIBINFIX}.lib
-+        CMAKE_WINMAIN_FILE_LOCATION_DEBUG = qt6main$${QT_LIBINFIX}$${debug_suffix}.lib
-+        CMAKE_WINMAIN_FILE_LOCATION_RELEASE = qt6main$${QT_LIBINFIX}.lib
- 
-         CMAKE_IMPLIB_FILE_LOCATION_DEBUG = $${CMAKE_QT_STEM}$${debug_suffix}.lib
-         CMAKE_IMPLIB_FILE_LOCATION_RELEASE = $${CMAKE_QT_STEM}.lib
-diff --git a/mkspecs/features/win32/windows.prf b/mkspecs/features/win32/windows.prf
-index 272170d428..d5314247db 100644
---- a/mkspecs/features/win32/windows.prf
-+++ b/mkspecs/features/win32/windows.prf
-@@ -5,8 +5,8 @@ contains(TEMPLATE, ".*app") {
-     mingw:DEFINES += QT_NEEDS_QMAIN
- 
-     qt:for(entryLib, $$list($$unique(QMAKE_LIBS_QT_ENTRY))) {
--        isEqual(entryLib, -lqtmain) {
--            lib = $$QT.core.libs/$${QMAKE_PREFIX_STATICLIB}qtmain$$QT_LIBINFIX$$qtPlatformTargetSuffix().$$QMAKE_EXTENSION_STATICLIB
-+        isEqual(entryLib, -lqt6main) {
-+            lib = $$QT.core.libs/$${QMAKE_PREFIX_STATICLIB}qt6main$$QT_LIBINFIX$$qtPlatformTargetSuffix().$$QMAKE_EXTENSION_STATICLIB
-             PRE_TARGETDEPS += $$lib
-             QMAKE_LIBS += $$lib
-         } else {
-diff --git a/src/winmain/CMakeLists.txt b/src/winmain/CMakeLists.txt
-index 1a74a1e3ae..e2482f16e0 100644
---- a/src/winmain/CMakeLists.txt
-+++ b/src/winmain/CMakeLists.txt
-@@ -20,7 +20,7 @@ if (MSVC)
-     string(REPLACE "/Zi" "/Z7" CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO}")
- endif()
- 
--set_property(TARGET WinMain PROPERTY OUTPUT_NAME qtmain)
-+set_property(TARGET WinMain PROPERTY OUTPUT_NAME qt6main)
- 
- qt_internal_extend_target(WinMain CONDITION
-     SOURCES qtmain_win.cpp
-diff --git a/src/winmain/winmain.pro b/src/winmain/winmain.pro
-index 19ce9ffa82..cbbeea7323 100644
---- a/src/winmain/winmain.pro
-+++ b/src/winmain/winmain.pro
-@@ -2,7 +2,7 @@
- !win32:error("$$_FILE_ is intended only for Windows!")
- 
- TEMPLATE = lib
--TARGET = qtmain
-+TARGET = qt6main
- DESTDIR = $$QT.core.libs
- 
- CONFIG += static
--- 
-2.28.0
-
diff --git a/PKGBUILD b/PKGBUILD
index 164dc2a6fb07..16bf59aa45b1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -11,7 +11,7 @@
 # All patches are managed at https://github.com/Martchus/qtbase
 
 pkgname=mingw-w64-qt6-base
-_qtver=6.0.0-beta1
+_qtver=6.0.0-beta2
 pkgver=${_qtver/-/}
 pkgrel=1
 arch=(any)
@@ -32,12 +32,10 @@ groups=(mingw-w64-qt6)
 _pkgfqn="qtbase-everywhere-src-${_qtver}"
 source=("https://download.qt.io/development_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz"
         '0001-Use-CMake-s-default-import-library-suffix.patch'
-        '0002-Rename-qtmain-to-qt6main-to-make-Qt-6-co-installable.patch'
-        '0003-Fix-finding-D-Bus.patch')
-sha256sums=('d23210ba903be38aa43fe7887b8df62a1a310ea053712a30670cc479cf0219a0'
-            '43a19aaaf39d9e5fbce15657f216b5bd343b4be3eeffcb888dcb0d00a011d744'
-            '74871688a19acd6e254852485c07a1bceb0ce8ae67274d44227528c25e913b37'
-            '969c980eb3d8e9dc06063def818172e443e87b0511e5a6c95a84a1b5f4a5f841')
+        '0002-Fix-finding-D-Bus.patch')
+sha256sums=('1207a5ceb001d164f3cf6646fbd483a055440400c20a315f98f36e23c73f204e'
+            '10ea48221878769b7bd50328f31f16effc6789d92dd91e9cb22c0acb77ca6095'
+            '35ef8ed4f01727ef4a56b856fd91e33fd7f93e5f2813b308872231d182c5df8f')
 
 _architectures='i686-w64-mingw32 x86_64-w64-mingw32'
 
diff --git a/qtbase-sha256.txt b/qtbase-sha256.txt
index d3f67a5845a4..31da929c0923 100644
--- a/qtbase-sha256.txt
+++ b/qtbase-sha256.txt
@@ -1 +1 @@
-d23210ba903be38aa43fe7887b8df62a1a310ea053712a30670cc479cf0219a0
+1207a5ceb001d164f3cf6646fbd483a055440400c20a315f98f36e23c73f204e