From c235f787e646bebc3d91c0bd01c5a9115dd82e95 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D9=85=D9=87=D8=AF=D9=8A=20=D8=B4=D9=8A=D9=86=D9=88=D9=86?=
 =?UTF-8?q?=20=28Mehdi=20Chinoune=29?= <mehdi.chinoune@hotmail.com>
Date: Thu, 24 Aug 2023 20:03:26 +0100
Subject: [PATCH] qt6-base: Fix definition of QOSV::MacOSSonoma

---
 .../010-export-some-constexpr-variables.patch | 20 -------------------
 mingw-w64-qt6-base/PKGBUILD                   |  9 ++++++---
 2 files changed, 6 insertions(+), 23 deletions(-)

diff --git a/mingw-w64-qt6-base/010-export-some-constexpr-variables.patch b/mingw-w64-qt6-base/010-export-some-constexpr-variables.patch
index d1cae9b3c6..e04bcbaa77 100644
--- a/mingw-w64-qt6-base/010-export-some-constexpr-variables.patch
+++ b/mingw-w64-qt6-base/010-export-some-constexpr-variables.patch
@@ -12,23 +12,3 @@
  
  QHostAddressPrivate::QHostAddressPrivate()
      : a(0), protocol(QHostAddress::UnknownNetworkLayerProtocol)
---- a/src/corelib/global/qoperatingsystemversion.cpp
-+++ b/src/corelib/global/qoperatingsystemversion.cpp
-@@ -682,4 +682,17 @@
- }
- #endif // !QT_NO_DEBUG_STREAM
- 
-+constexpr QOperatingSystemVersionBase QOperatingSystemVersion::Windows10_1809;
-+constexpr QOperatingSystemVersionBase QOperatingSystemVersion::Windows10_1903;
-+constexpr QOperatingSystemVersionBase QOperatingSystemVersion::Windows10_1909;
-+constexpr QOperatingSystemVersionBase QOperatingSystemVersion::Windows10_2004;
-+constexpr QOperatingSystemVersionBase QOperatingSystemVersion::Windows10_20H2;
-+constexpr QOperatingSystemVersionBase QOperatingSystemVersion::Windows10_21H1;
-+constexpr QOperatingSystemVersionBase QOperatingSystemVersion::Windows10_21H2;
-+constexpr QOperatingSystemVersionBase QOperatingSystemVersion::Windows10_22H2;
-+constexpr QOperatingSystemVersionBase QOperatingSystemVersion::Windows11;
-+constexpr QOperatingSystemVersionBase QOperatingSystemVersion::Windows11_21H2;
-+constexpr QOperatingSystemVersionBase QOperatingSystemVersion::Windows11_22H2;
-+constexpr QOperatingSystemVersionBase QOperatingSystemVersion::MacOSVentura;
-+
- QT_END_NAMESPACE
diff --git a/mingw-w64-qt6-base/PKGBUILD b/mingw-w64-qt6-base/PKGBUILD
index a443630ab9..66f190d396 100644
--- a/mingw-w64-qt6-base/PKGBUILD
+++ b/mingw-w64-qt6-base/PKGBUILD
@@ -6,11 +6,11 @@ pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}"
          "${MINGW_PACKAGE_PREFIX}-${_realname}-debug")
 _qtver=6.5.2
 pkgver=${_qtver/-/}
-pkgrel=3
+pkgrel=4
 arch=(any)
 mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
 url='https://www.qt.io'
-license=(GPL3 LGPL3 FDL custom)
+license=('spdx:AFL-2.1 AND spdx:Apache-2.0 AND spdx:BSL-1.0 AND spdx:CC0-1.0 AND spdx:BSD-3-Clause AND spdx:CC-BY-4.0 AND spdx:GFDL-1.3-no-invariants-only AND spdx:GPL-2.0-only AND spdx:GPL-2.0-or-later AND spdx:GPL-3.0-only AND spdx:LGPL-3.0-only AND spdx:Qt-GPL-exception-1.0 AND custom')
 pkgdesc="A cross-platform application and UI framework (mingw-w64)"
 makedepends=("${MINGW_PACKAGE_PREFIX}-cmake"
              "${MINGW_PACKAGE_PREFIX}-ninja"
@@ -46,6 +46,7 @@ source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/subm
         005-Allow-overriding-CMAKE_FIND_LIBRARY_SUFFIXES-to-pref.patch
         006-qt-6.2.0-dont-add-resource-files-to-qmake-libs.patch
         007-Fix-crashes-in-rasterization-code-using-setjmp.patch
+        008-Fix-definition-of-QOSV-MacOSSonoma.patch::https://invent.kde.org/qt/qt/qtbase/-/commit/5d597f6a.patch
         009-qfileinfo-undefine-mingw-stat.patch
         010-export-some-constexpr-variables.patch
         011-qt6-windeployqt-fixes.patch
@@ -58,8 +59,9 @@ sha256sums=('3db4c729b4d80a9d8fda8dd77128406353baff4755ca619177eda4cddae71269'
             'b644586be741dabf66b79bcc2eed71727739f4b301e0ae7da35506b30605aeb5'
             '4085a10b290b8e3d930de535cbad2ba3e643432cba433aa2b28fe664f86d38a3'
             '3a256533401a48aff7e3c4b02118d62a0cccc2b3566c6e550e7b467aca3e496f'
+            'f86488d8c99883c1704b44c20351a5d68ba552dca704497252d9f550fc6e06d8'
             '97a00b185fe6a952eeb3b8b154996e0527fd78a75150e908cd6acd61676fd453'
-            'e9dcf3275163b7dd73f613f2929b10551649c8df80677fafd873b5e31430b43a'
+            'b193d60fb3ecd97c297d797075d1c92f39dd2259a2288f45c2a39798866eb15d'
             '7f1a0a14f423741956253690d16d635055a8e887fe39f7f0160d40c5c63ae1b1'
             'b217dad1b9ebf212f4d0d5c88140c26c491373e66d3ae88cb98deb5d688e59b0')
 
@@ -90,6 +92,7 @@ prepare() {
     005-Allow-overriding-CMAKE_FIND_LIBRARY_SUFFIXES-to-pref.patch \
     006-qt-6.2.0-dont-add-resource-files-to-qmake-libs.patch \
     007-Fix-crashes-in-rasterization-code-using-setjmp.patch \
+    008-Fix-definition-of-QOSV-MacOSSonoma.patch \
     009-qfileinfo-undefine-mingw-stat.patch \
     011-qt6-windeployqt-fixes.patch