contrib: qt: update to 6.8.0

contrib/src/main.mak

@@ -17,8 +17,8 @@ DATE := $(shell date +%Y%m%d)
 VPATH := $(TARBALLS)
 
 # Default Qt version
-QTBASE_VERSION_MAJOR := 6.7
-QTBASE_VERSION := $(QTBASE_VERSION_MAJOR).1
+QTBASE_VERSION_MAJOR := 6.8
+QTBASE_VERSION := $(QTBASE_VERSION_MAJOR).0
 
 # Common download locations
 GNU ?= http://ftp.gnu.org/gnu

contrib/src/qt/0005-Do-not-include-D3D12MemAlloc.h-in-header-file.patch → contrib/src/qt/0001-Do-not-include-D3D12MemAlloc.h-in-header-file.patch

@@ -1,7 +1,7 @@
 From 94a120d3668a29b3f08b3dcba68656038888a60d Mon Sep 17 00:00:00 2001
 From: Fatih Uzunoglu <[email protected]>
 Date: Mon, 22 Jan 2024 21:19:55 +0200
-Subject: [PATCH 5/7] Do not include D3D12MemAlloc.h in header file
+Subject: [PATCH] Do not include D3D12MemAlloc.h in header file
 
 D3D12MemAlloc.h is a third-party header and is not deployed with
 the Qt installation, which makes `qrhid3d12_p.h` useless. This is

contrib/src/qt/0003-Revert-QMutex-remove-qmutex_win.cpp.patch → contrib/src/qt/0001-Revert-QMutex-remove-qmutex_win.cpp.patch

@@ -1,7 +1,7 @@
 From a566b1d5192a99b41ae13706668b7c8bf786e204 Mon Sep 17 00:00:00 2001
 From: Fatih Uzunoglu <[email protected]>
 Date: Sun, 14 Jan 2024 23:34:29 +0200
-Subject: [PATCH 3/7] Revert "QMutex: remove qmutex_win.cpp"
+Subject: [PATCH] Revert "QMutex: remove qmutex_win.cpp"
 
 qmutex_win.cpp is useful for Windows 7 where futex is not
 available.

contrib/src/qt/0006-Try-DCompositionCreateDevice3-first-if-available.patch → contrib/src/qt/0001-Try-DCompositionCreateDevice3-first-if-available.patch

@@ -1,7 +1,7 @@
 From 2e74ca54c146bda95482900faba547e96ece24a1 Mon Sep 17 00:00:00 2001
 From: Fatih Uzunoglu <[email protected]>
 Date: Wed, 24 Jan 2024 16:31:06 +0200
-Subject: [PATCH 6/7] Try DCompositionCreateDevice3() first if available
+Subject: [PATCH] Try DCompositionCreateDevice3() first if available
 
 When the native acrylic effect is not available, the application uses
 effects that can be created through IDCompositionDevice3 with the

contrib/src/qt/0001-Use-DirectWrite-font-database-only-with-Windows-10-a.patch

@@ -0,0 +1,34 @@
+From 0c0f01b6481ba58035e1115e732cf1dadfc4dddc Mon Sep 17 00:00:00 2001
+From: Fatih Uzunoglu <[email protected]>
+Date: Tue, 8 Oct 2024 19:29:32 +0300
+Subject: [PATCH] Use DirectWrite font database only with Windows 10 and above
+
+Functionalities used by Qt are not provided with Windows
+versions that are not officially supported by Qt (Windows
+7, Windows 8) but supported by VLC media player.
+
+For example, IDWriteFontFace3 is only reportedly available
+starting with Windows 10. This change is necessary starting
+with Qt 6.8, where DirectWrite is used by default to populate
+the font database.
+---
+ src/plugins/platforms/windows/qwindowsintegration.cpp | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/plugins/platforms/windows/qwindowsintegration.cpp b/src/plugins/platforms/windows/qwindowsintegration.cpp
+index 487e1d47b6..9e879815dc 100644
+--- a/src/plugins/platforms/windows/qwindowsintegration.cpp
++++ b/src/plugins/platforms/windows/qwindowsintegration.cpp
+@@ -485,7 +485,8 @@ QPlatformFontDatabase *QWindowsIntegration::fontDatabase() const
+         else
+ #endif // QT_NO_FREETYPE
+ #if QT_CONFIG(directwrite3)
+-        if (!(d->m_options & (QWindowsIntegration::FontDatabaseGDI | QWindowsIntegration::DontUseDirectWriteFonts)))
++        if (QOperatingSystemVersion::current() >= QOperatingSystemVersion::Windows10 &&
++            !(d->m_options & (QWindowsIntegration::FontDatabaseGDI | QWindowsIntegration::DontUseDirectWriteFonts)))
+             d->m_fontDatabase = new QWindowsDirectWriteFontDatabase;
+         else
+ #endif
+-- 
+2.46.2
+

contrib/src/qt/0001-Windows-QPA-Disable-systray-notification-sounds.patch

@@ -1,7 +1,7 @@
 From 846a13b3703dc4bac6f7a9f3bbb6aa31fa5660f7 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Hugo=20Beauz=C3=A9e-Luyssen?= <[email protected]>
 Date: Tue, 9 Jan 2024 20:59:45 +0200
-Subject: Windows QPA: Disable systray notification sounds
+Subject: [PATCH] Windows QPA: Disable systray notification sounds
 
 ---
  src/plugins/platforms/windows/qwindowssystemtrayicon.cpp | 3 +++