Update Qt6.7 patch

3 files changed, 250 insertions, 123 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 62099b86ddcc..2507d8d92aef 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = vlc-git
 	pkgdesc = Multi-platform MPEG, VCD/DVD, and DivX player
-	pkgver = 4.0.0.r28594.g30b5a2ac41
+	pkgver = 4.0.0.r28720.g4c78bc6063
 	pkgrel = 1
 	url = https://code.videolan.org/videolan/vlc
 	arch = i686
@@ -167,7 +167,7 @@ pkgbase = vlc-git
 	optdepends = aom: AOM AV1 codec
 	optdepends = srt: SRT input/output plugin
 	optdepends = dav1d: dav1d AV1 decoder
-	provides = vlc=4.0.0.r28594.g30b5a2ac41
+	provides = vlc=4.0.0.r28720.g4c78bc6063
 	conflicts = vlc
 	options = !emptydirs
 	source = git+https://code.videolan.org/videolan/vlc.git
@@ -176,7 +176,7 @@ pkgbase = vlc-git
 	source = update-vlc-plugin-cache.hook
 	b2sums = SKIP
 	b2sums = 76103422a1eaad40d33bfb7897bf25c1b5748729270974bec13f642f2861c4458f0dc07b5fb68d9ba4fae6e44d4a6c8e4d67af7ec10e0c117f1b804dd06868e3
-	b2sums = 186c39289733227a85b83ed50e6cae80846324a0fc72ac17e9f3f6f5984c8d391969ebbad869ff09feb7ec4367d5c095efe2522bd28f97a2f8d526817d2837c3
+	b2sums = 5cdefbec32ef97381311bff101f565cf1a2f04146d0bd23b3185ca2347bee1fde55cccbe8f1a8cd6a3016f0a9ef90ab87058915e06f7bd84cddaf91098edb3ed
 	b2sums = fe3849f45fb91d3697573a9c23b90b78ff0bef5f94c42bc6e7c14427637f45f2fc86786803fb9b36c657ac2c50f6bf3c860cd763248711308ceab2bfcf7be49a
 
 pkgname = vlc-git
diff --git a/5182.patch b/5182.patch
index 11540fcf3c2a..bf2b0d19090f 100644
--- a/5182.patch
+++ b/5182.patch
@@ -1,4 +1,4 @@
-From a040365318f540df920e50947413b7f5ec691f09 Mon Sep 17 00:00:00 2001
+From 624c92430536eebf9aba0d3f399bf5daa9aac6f2 Mon Sep 17 00:00:00 2001
 From: Fatih Uzunoglu <fuzun54@outlook.com>
 Date: Thu, 4 Apr 2024 21:40:52 +0300
 Subject: [PATCH 1/7] qt: update to Qt 6.7.0
@@ -92,7 +92,7 @@ index 4f0acd14f530..ff86ffaa286b 100644
  
      void onItemsReset(const QVector<PlaylistItem>& items);
 diff --git a/modules/gui/qt/plugins.hpp b/modules/gui/qt/plugins.hpp
-index d817162c2268..2a84597db862 100644
+index b4d90279589a..d6d0b12af38e 100644
 --- a/modules/gui/qt/plugins.hpp
 +++ b/modules/gui/qt/plugins.hpp
 @@ -61,7 +61,11 @@
@@ -108,7 +108,7 @@ index d817162c2268..2a84597db862 100644
      Q_IMPORT_QML_PLUGIN(QtQuickControls2WindowsStylePlugin)
      Q_IMPORT_QML_PLUGIN(QtQuickControls2NativeStylePlugin)
 diff --git a/modules/gui/qt/qt.cpp b/modules/gui/qt/qt.cpp
-index e622422858fb..c662d8a5f0f6 100644
+index ba7412f2f8b6..41d45017b070 100644
 --- a/modules/gui/qt/qt.cpp
 +++ b/modules/gui/qt/qt.cpp
 @@ -780,11 +780,19 @@ static void *Thread( void *obj )
@@ -148,7 +148,7 @@ index 5dee16bd631e..7cdebaf28919 100644
 GitLab
 
 
-From 07958a6475eb388b309caf0f749087378662dbe1 Mon Sep 17 00:00:00 2001
+From db95ffcc49488457e03d2f37e36e35cb4edbbd52 Mon Sep 17 00:00:00 2001
 From: Fatih Uzunoglu <fuzun54@outlook.com>
 Date: Thu, 4 Apr 2024 21:40:52 +0300
 Subject: [PATCH 2/7] contrib: qtbase: use the version variable for pkg check
@@ -158,7 +158,7 @@ Subject: [PATCH 2/7] contrib: qtbase: use the version variable for pkg check
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/contrib/src/qt/rules.mak b/contrib/src/qt/rules.mak
-index 445fdc1eba4c..34276233fb10 100644
+index f4d0e6a96bd4..1f2ac5aa62e5 100644
 --- a/contrib/src/qt/rules.mak
 +++ b/contrib/src/qt/rules.mak
 @@ -22,7 +22,7 @@ ifdef HAVE_WIN32
@@ -174,7 +174,7 @@ index 445fdc1eba4c..34276233fb10 100644
 GitLab
 
 
-From 8d6d53df8dcfe977468d3b68bc5431effbcc8c73 Mon Sep 17 00:00:00 2001
+From f81259a2ee3069c09fd730fb72347174dc58a610 Mon Sep 17 00:00:00 2001
 From: Fatih Uzunoglu <fuzun54@outlook.com>
 Date: Thu, 4 Apr 2024 21:40:52 +0300
 Subject: [PATCH 3/7] contrib: qtsvg: use the version variable for pkg check
@@ -184,7 +184,7 @@ Subject: [PATCH 3/7] contrib: qtsvg: use the version variable for pkg check
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/contrib/src/qtsvg/rules.mak b/contrib/src/qtsvg/rules.mak
-index b3905579673c..4c64a7901849 100644
+index 9bc60c5153b9..4a2d5488e473 100644
 --- a/contrib/src/qtsvg/rules.mak
 +++ b/contrib/src/qtsvg/rules.mak
 @@ -10,7 +10,7 @@ ifdef HAVE_WIN32
@@ -200,7 +200,7 @@ index b3905579673c..4c64a7901849 100644
 GitLab
 
 
-From 8b7fcff88ef07af7159c4880e4c9b0b1f8c7954c Mon Sep 17 00:00:00 2001
+From 8691f03968fc2edcff605730bbeaece886f52806 Mon Sep 17 00:00:00 2001
 From: Fatih Uzunoglu <fuzun54@outlook.com>
 Date: Thu, 4 Apr 2024 21:40:52 +0300
 Subject: [PATCH 4/7] contrib: qtshadertools: use the version variable for pkg
@@ -211,7 +211,7 @@ Subject: [PATCH 4/7] contrib: qtshadertools: use the version variable for pkg
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/contrib/src/qtshadertools/rules.mak b/contrib/src/qtshadertools/rules.mak
-index 9b86f3c45d8d..bdb0eab67d51 100644
+index 607c3a4e47c0..c4d24ffad7a5 100644
 --- a/contrib/src/qtshadertools/rules.mak
 +++ b/contrib/src/qtshadertools/rules.mak
 @@ -23,7 +23,7 @@ PKGS_TOOLS += qtshadertools-tools
@@ -227,7 +227,7 @@ index 9b86f3c45d8d..bdb0eab67d51 100644
 GitLab
 
 
-From 908ec7f845f4458c0be85972d4e41f7388d5c5ed Mon Sep 17 00:00:00 2001
+From d5852396dbc00b4fadd7423de8242c27d8edeef0 Mon Sep 17 00:00:00 2001
 From: Fatih Uzunoglu <fuzun54@outlook.com>
 Date: Thu, 4 Apr 2024 21:40:52 +0300
 Subject: [PATCH 5/7] contrib: qtdeclarative: use the version variable for pkg
@@ -238,7 +238,7 @@ Subject: [PATCH 5/7] contrib: qtdeclarative: use the version variable for pkg
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/contrib/src/qtdeclarative/rules.mak b/contrib/src/qtdeclarative/rules.mak
-index 084c1111afef..6ac7065f40c2 100644
+index 5c0da16b69f7..fe34ae3a42dc 100644
 --- a/contrib/src/qtdeclarative/rules.mak
 +++ b/contrib/src/qtdeclarative/rules.mak
 @@ -19,7 +19,7 @@ PKGS_TOOLS += qtdeclarative-tools
@@ -254,7 +254,7 @@ index 084c1111afef..6ac7065f40c2 100644
 GitLab
 
 
-From 9c5f47b039752f68326210c0287e333f030911df Mon Sep 17 00:00:00 2001
+From 357aaaeabb618148b26824d4e653bc69e09a6466 Mon Sep 17 00:00:00 2001
 From: Fatih Uzunoglu <fuzun54@outlook.com>
 Date: Thu, 4 Apr 2024 21:40:52 +0300
 Subject: [PATCH 6/7] contrib: qt5compat: use the version variable for pkg
@@ -265,7 +265,7 @@ Subject: [PATCH 6/7] contrib: qt5compat: use the version variable for pkg
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/contrib/src/qt5compat/rules.mak b/contrib/src/qt5compat/rules.mak
-index 0c2f37d44aea..e0b718b87835 100644
+index a309b612658c..0f15fe57dce4 100644
 --- a/contrib/src/qt5compat/rules.mak
 +++ b/contrib/src/qt5compat/rules.mak
 @@ -10,7 +10,7 @@ ifdef HAVE_WIN32
@@ -281,48 +281,53 @@ index 0c2f37d44aea..e0b718b87835 100644
 GitLab
 
 
-From 0b38081e6c8b187afd2a9420e613a2836feb42d6 Mon Sep 17 00:00:00 2001
+From d4060b7b55cb2e2aa51f83452f68a63c097431d2 Mon Sep 17 00:00:00 2001
 From: Fatih Uzunoglu <fuzun54@outlook.com>
 Date: Thu, 4 Apr 2024 21:40:52 +0300
 Subject: [PATCH 7/7] contrib: update to Qt 6.7.0
 
 ---
  ...urces-into-static-libraries-not-obje.patch | 399 ------------------
+ ...0001-QTypeInfo-Add-a-missing-include.patch |  40 --
  ... 0001-Windows-Tray-Icon-Set-NOSOUND.patch} |  10 +-
+ ...tringTokenizer-Add-a-missing-include.patch |  38 --
  ...-pkgconfig-pc-files-in-static-build.patch} |   6 +-
+ ...-Fix-a-misplaced-in-pkg-config-files.patch |  57 ---
  ...Revert-QMutex-remove-qmutex_win.cpp.patch} |  20 +-
  ...4-Expose-QRhiImplementation-in-QRhi.patch} |  10 +-
  ...lude-D3D12MemAlloc.h-in-header-file.patch} |  24 +-
  ...ionCreateDevice3-first-if-available.patch} |  18 +-
  ...-to-satisfy-Windows-7-compatibility.patch} | 317 +++++++++-----
  contrib/src/qt/SHA512SUMS                     |   2 +-
- contrib/src/qt/rules.mak                      |  19 +-
+ contrib/src/qt/rules.mak                      |  22 +-
  contrib/src/qt5compat/SHA512SUMS              |   2 +-
  contrib/src/qt5compat/rules.mak               |   4 +-
  ...0001-Fix-incorrect-library-inclusion.patch |   6 +-
  ...02-Fix-build-with-no-feature-network.patch |  27 ++
- .../0003-Disable-svgtoqml-tool.patch          |  27 ++
  contrib/src/qtdeclarative/SHA512SUMS          |   2 +-
- contrib/src/qtdeclarative/rules.mak           |   6 +-
- ...Use-fxc2-through-wine-instead-of-fxc.patch |  19 +-
+ contrib/src/qtdeclarative/rules.mak           |   7 +-
+ ...e-to-SPIRV-Cross-to-add-a-missing-in.patch |  33 --
  contrib/src/qtshadertools/SHA512SUMS          |   2 +-
- contrib/src/qtshadertools/rules.mak           |   4 +-
+ contrib/src/qtshadertools/rules.mak           |   5 +-
  contrib/src/qtsvg/SHA512SUMS                  |   2 +-
  contrib/src/qtsvg/rules.mak                   |   4 +-
  contrib/src/qtvlcdeps/vlcdeps.pro             |   2 +-
  contrib/src/qtwayland/SHA512SUMS              |   2 +-
  contrib/src/qtwayland/rules.mak               |   4 +-
- 25 files changed, 358 insertions(+), 580 deletions(-)
+ 27 files changed, 322 insertions(+), 743 deletions(-)
  delete mode 100644 contrib/src/qt/0001-CMake-Place-resources-into-static-libraries-not-obje.patch
+ delete mode 100644 contrib/src/qt/0001-QTypeInfo-Add-a-missing-include.patch
  rename contrib/src/qt/{0002-Windows-Tray-Icon-Set-NOSOUND.patch => 0001-Windows-Tray-Icon-Set-NOSOUND.patch} (77%)
+ delete mode 100644 contrib/src/qt/0002-QStringTokenizer-Add-a-missing-include.patch
  rename contrib/src/qt/{0003-Try-to-generate-pkgconfig-pc-files-in-static-build.patch => 0002-Try-to-generate-pkgconfig-pc-files-in-static-build.patch} (86%)
+ delete mode 100644 contrib/src/qt/0003-CMake-Fix-a-misplaced-in-pkg-config-files.patch
  rename contrib/src/qt/{0004-Revert-QMutex-remove-qmutex_win.cpp.patch => 0003-Revert-QMutex-remove-qmutex_win.cpp.patch} (90%)
  rename contrib/src/qt/{0005-Expose-QRhiImplementation-in-QRhi.patch => 0004-Expose-QRhiImplementation-in-QRhi.patch} (70%)
  rename contrib/src/qt/{0006-Do-not-include-D3D12MemAlloc.h-in-header-file.patch => 0005-Do-not-include-D3D12MemAlloc.h-in-header-file.patch} (77%)
  rename contrib/src/qt/{0007-Try-DCompositionCreateDevice3-first-if-available.patch => 0006-Try-DCompositionCreateDevice3-first-if-available.patch} (71%)
  rename contrib/src/qt/{0008-Try-to-satisfy-Windows-7-compatibility.patch => 0007-Try-to-satisfy-Windows-7-compatibility.patch} (84%)
  create mode 100644 contrib/src/qtdeclarative/0002-Fix-build-with-no-feature-network.patch
- create mode 100644 contrib/src/qtdeclarative/0003-Disable-svgtoqml-tool.patch
+ delete mode 100644 contrib/src/qtshadertools/0001-Backport-a-change-to-SPIRV-Cross-to-add-a-missing-in.patch
 
 diff --git a/contrib/src/qt/0001-CMake-Place-resources-into-static-libraries-not-obje.patch b/contrib/src/qt/0001-CMake-Place-resources-into-static-libraries-not-obje.patch
 deleted file mode 100644
@@ -729,6 +734,52 @@ index 31276889fde5..000000000000
 --- 
 -2.43.1
 -
+diff --git a/contrib/src/qt/0001-QTypeInfo-Add-a-missing-include.patch b/contrib/src/qt/0001-QTypeInfo-Add-a-missing-include.patch
+deleted file mode 100644
+index e67573e8b659..000000000000
+--- a/contrib/src/qt/0001-QTypeInfo-Add-a-missing-include.patch
++++ /dev/null
+@@ -1,40 +0,0 @@
+-From 52965e15b8f87e192c4cfbeb772648d018b77016 Mon Sep 17 00:00:00 2001
+-From: =?UTF-8?q?Martin=20Storsj=C3=B6?= <martin@martin.st>
+-Date: Thu, 4 Apr 2024 13:32:31 +0300
+-Subject: [PATCH] QTypeInfo: Add a missing include
+-
+-This header uses std::is_trivial_v, which requires including
+-the <type_traits> header.
+-
+-When building with PCH enabled (which is the default), this
+-dependency does get satisfied via the PCH, so no issue is
+-visible.
+-
+-This fixes building with recent version of libc++ when configured
+-with _LIBCPP_REMOVE_TRANSITIVE_INCLUDES (which removes unnecessary
+-transitive dependencies between the libc++ headers, a configuration
+-which may become the default in the future), with PCH disabled.
+-
+-Pick-to: 6.7 6.5 6.2
+-Change-Id: I5e3ae20e366ed3028b1156cee05bcf2908d6e845
+-Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
+-(cherry picked from commit adb49d65e0774fa6be0b0d9d490c6f1fc5066a1b)
+----
+- src/corelib/global/qtypeinfo.h | 1 +
+- 1 file changed, 1 insertion(+)
+-
+-diff --git a/src/corelib/global/qtypeinfo.h b/src/corelib/global/qtypeinfo.h
+-index f89bf72635..3b8c40e974 100644
+---- a/src/corelib/global/qtypeinfo.h
+-+++ b/src/corelib/global/qtypeinfo.h
+-@@ -11,6 +11,7 @@
+- #include <variant>
+- #include <optional>
+- #include <tuple>
+-+#include <type_traits>
+- 
+- QT_BEGIN_NAMESPACE
+- 
+--- 
+-2.34.1
+-
 diff --git a/contrib/src/qt/0002-Windows-Tray-Icon-Set-NOSOUND.patch b/contrib/src/qt/0001-Windows-Tray-Icon-Set-NOSOUND.patch
 similarity index 77%
 rename from contrib/src/qt/0002-Windows-Tray-Icon-Set-NOSOUND.patch
@@ -765,6 +816,50 @@ index 2c76c1d4bb6c..ee892753ae69 100644
 -2.43.1
 +2.44.0
  
+diff --git a/contrib/src/qt/0002-QStringTokenizer-Add-a-missing-include.patch b/contrib/src/qt/0002-QStringTokenizer-Add-a-missing-include.patch
+deleted file mode 100644
+index 5fe7f3c7567e..000000000000
+--- a/contrib/src/qt/0002-QStringTokenizer-Add-a-missing-include.patch
++++ /dev/null
+@@ -1,38 +0,0 @@
+-From 55a7e34d7b4eeafb3465d9869920dc88dbc3a6e9 Mon Sep 17 00:00:00 2001
+-From: =?UTF-8?q?Martin=20Storsj=C3=B6?= <martin@martin.st>
+-Date: Tue, 9 Apr 2024 14:03:29 +0300
+-Subject: [PATCH 2/3] QStringTokenizer: Add a missing include
+-MIME-Version: 1.0
+-Content-Type: text/plain; charset=UTF-8
+-Content-Transfer-Encoding: 8bit
+-
+-This header uses std::forward_iterator_tag, which requires including
+-the <iterator> header.
+-
+-This fixes building with libc++ with
+-_LIBCPP_REMOVE_TRANSITIVE_INCLUDES enabled.
+-
+-Pick-to: 6.7 6.5 6.2
+-Change-Id: Id2ce97e158c87dab1efe30e54a93f0bc9351de5a
+-Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
+-Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
+-(cherry picked from commit aa896ca9f51252b6d01766e19a03e41bd49857f3)
+----
+- src/corelib/text/qstringtokenizer.h | 1 +
+- 1 file changed, 1 insertion(+)
+-
+-diff --git a/src/corelib/text/qstringtokenizer.h b/src/corelib/text/qstringtokenizer.h
+-index 2b679608f9..7a627b4508 100644
+---- a/src/corelib/text/qstringtokenizer.h
+-+++ b/src/corelib/text/qstringtokenizer.h
+-@@ -5,6 +5,7 @@
+- 
+- #include <QtCore/qnamespace.h>
+- #include <QtCore/qcontainerfwd.h>
+-+#include <iterator>
+- 
+- QT_BEGIN_NAMESPACE
+- 
+--- 
+-2.25.1
+-
 diff --git a/contrib/src/qt/0003-Try-to-generate-pkgconfig-pc-files-in-static-build.patch b/contrib/src/qt/0002-Try-to-generate-pkgconfig-pc-files-in-static-build.patch
 similarity index 86%
 rename from contrib/src/qt/0003-Try-to-generate-pkgconfig-pc-files-in-static-build.patch
@@ -789,6 +884,69 @@ index cdec53fd8312..dd60ae536fac 100644
 -2.43.1
 +2.44.0
  
+diff --git a/contrib/src/qt/0003-CMake-Fix-a-misplaced-in-pkg-config-files.patch b/contrib/src/qt/0003-CMake-Fix-a-misplaced-in-pkg-config-files.patch
+deleted file mode 100644
+index e4003978d3aa..000000000000
+--- a/contrib/src/qt/0003-CMake-Fix-a-misplaced-in-pkg-config-files.patch
++++ /dev/null
+@@ -1,57 +0,0 @@
+-From ba1059325eedba710d933fa0be4af1e6a4056aac Mon Sep 17 00:00:00 2001
+-From: =?UTF-8?q?Martin=20Storsj=C3=B6?= <martin@martin.st>
+-Date: Tue, 9 Apr 2024 15:38:02 +0300
+-Subject: [PATCH 3/3] CMake: Fix a misplaced > in pkg-config files
+-
+-The Qt CMake routines for generating pkg-config files don't
+-handle all sorts of generator expressions, see
+-qt_internal_set_pkg_config_cpp_flags in QtPkgConfigHelpers.cmake
+-which hardcodes handling of some specific expressions. In this
+-case, they don't handle the semicolon within the generator
+-expression expansion.
+-
+-For the UNICODE and _UNICODE defines, this means that the pkg-config
+-file ends up containing "-D_UNICODE>" with the trailing ">". (The
+-pkg-config generator tries to parse out the generator expressions,
+-but the semicolon gets handled as a higher level separator, leaving
+-the closing bracket ">" behind.)
+-
+-This issue only shows up for mingw targets, because pkg-config files
+-aren't generated in MSVC style builds.
+-
+-Escape the semicolon as $<SEMICOLON> to make it not break the
+-surrounding generator expression, as parsed by the pkg-config file
+-generator.
+-
+-The generator expressions aren't fully correctly evaluated for the
+-pkg-config files though; the UNICODE and _UNICODE defines don't
+-end up in the resulting pkg-config file even though they're used
+-during compilation (both before and after this change).
+-
+-Fixes: QTBUG-103019
+-Co-authored-by: Martin Reboredo <yakoyoku@gmail.com>
+-Pick-to: 6.7 6.5 6.2
+-Change-Id: Icdb380e3b42be2a47372a8ee2b61378a33c685f7
+-Reviewed-by:  Alexey Edelev <alexey.edelev@qt.io>
+-Reviewed-by: Li Xinwei <1326710505@qq.com>
+-(cherry picked from commit f35b9530b9acf954f8741d0ee2b4b68fc90a4afc)
+----
+- cmake/QtFlagHandlingHelpers.cmake | 2 +-
+- 1 file changed, 1 insertion(+), 1 deletion(-)
+-
+-diff --git a/cmake/QtFlagHandlingHelpers.cmake b/cmake/QtFlagHandlingHelpers.cmake
+-index 91e1de8644..cdbaaacad4 100644
+---- a/cmake/QtFlagHandlingHelpers.cmake
+-+++ b/cmake/QtFlagHandlingHelpers.cmake
+-@@ -365,7 +365,7 @@ function(qt_internal_enable_unicode_defines)
+-         set(no_unicode_condition
+-             "$<NOT:$<BOOL:$<TARGET_PROPERTY:QT_NO_UNICODE_DEFINES>>>")
+-         target_compile_definitions(Platform
+--            INTERFACE "$<${no_unicode_condition}:UNICODE;_UNICODE>")
+-+            INTERFACE "$<${no_unicode_condition}:UNICODE$<SEMICOLON>_UNICODE>")
+-     endif()
+- endfunction()
+- 
+--- 
+-2.25.1
+-
 diff --git a/contrib/src/qt/0004-Revert-QMutex-remove-qmutex_win.cpp.patch b/contrib/src/qt/0003-Revert-QMutex-remove-qmutex_win.cpp.patch
 similarity index 90%
 rename from contrib/src/qt/0004-Revert-QMutex-remove-qmutex_win.cpp.patch
@@ -1744,7 +1902,7 @@ index ce54db63bdf9..88d1269ee2ec 100644
 -ea343bcf269779a4e078ed8baddfbe6c5ec4a34275c7d72b3f3928da60feece2ddc9ce4a380c6536a4e1654b483cee8918f8ad3038904725d2dd1c653ae83ece qtbase-everywhere-src-6.6.2.tar.xz
 +72896cc5a677361779f49d60dbdfc33a21d77bd479e0586b0beb03eee2016d613aee56e798143a489431a07a5e7a7db4c7c046105a11b63dd178768f3a7f195a qtbase-everywhere-src-6.7.0.tar.xz
 diff --git a/contrib/src/qt/rules.mak b/contrib/src/qt/rules.mak
-index 34276233fb10..1a50f1b6d425 100644
+index 1f2ac5aa62e5..7fad58a3e831 100644
 --- a/contrib/src/qt/rules.mak
 +++ b/contrib/src/qt/rules.mak
 @@ -1,7 +1,7 @@
@@ -1757,7 +1915,7 @@ index 34276233fb10..1a50f1b6d425 100644
  # Insert potential -betaX suffix here:
  QTBASE_VERSION_FULL := $(QTBASE_VERSION)
  QTBASE_URL := $(QT)/$(QTBASE_VERSION_MAJOR)/$(QTBASE_VERSION_FULL)/submodules/qtbase-everywhere-src-$(QTBASE_VERSION_FULL).tar.xz
-@@ -42,14 +42,13 @@ $(TARBALLS)/qtbase-everywhere-src-$(QTBASE_VERSION_FULL).tar.xz:
+@@ -41,18 +41,14 @@ $(TARBALLS)/qtbase-everywhere-src-$(QTBASE_VERSION_FULL).tar.xz:
  
  qt: qtbase-everywhere-src-$(QTBASE_VERSION_FULL).tar.xz .sum-qt
  	$(UNPACK)
@@ -1777,8 +1935,12 @@ index 34276233fb10..1a50f1b6d425 100644
 +	$(APPLY) $(SRC)/qt/0006-Try-DCompositionCreateDevice3-first-if-available.patch
 +	$(APPLY) $(SRC)/qt/0007-Try-to-satisfy-Windows-7-compatibility.patch
  	$(APPLY) $(SRC)/qt/0001-disable-precompiled-headers-when-forcing-WINVER-inte.patch
+-	$(APPLY) $(SRC)/qt/0001-QTypeInfo-Add-a-missing-include.patch
+-	$(APPLY) $(SRC)/qt/0002-QStringTokenizer-Add-a-missing-include.patch
+-	$(APPLY) $(SRC)/qt/0003-CMake-Fix-a-misplaced-in-pkg-config-files.patch
  	$(MOVE)
  
+ ifeq ($(V),1)
 diff --git a/contrib/src/qt5compat/SHA512SUMS b/contrib/src/qt5compat/SHA512SUMS
 index 3c3cfabae75a..9780372252a2 100644
 --- a/contrib/src/qt5compat/SHA512SUMS
@@ -1787,7 +1949,7 @@ index 3c3cfabae75a..9780372252a2 100644
 -12e4142ce8e9b0863ee5d39c37f9a04ef696fd34c98b5d955464a1cfcc7d55ea8387b6238a49d9e9380f8c95f4b655ffa64fe250f27fee3d4e9f48065bcabb6a qt5compat-everywhere-src-6.6.2.tar.xz
 +92115ca88b839171cf69360e0c3add64bb84305fdc28b9459da5eb69df79bfc2884616991ada898242e3614ac4f188dd76aa17889b5fb7fa72316a11efd61c85 qt5compat-everywhere-src-6.7.0.tar.xz
 diff --git a/contrib/src/qt5compat/rules.mak b/contrib/src/qt5compat/rules.mak
-index e0b718b87835..e5e794d516c8 100644
+index 0f15fe57dce4..fd0f334b88b8 100644
 --- a/contrib/src/qt5compat/rules.mak
 +++ b/contrib/src/qt5compat/rules.mak
 @@ -1,7 +1,7 @@
@@ -1854,39 +2016,6 @@ index 000000000000..72cf264e12eb
 +-- 
 +2.44.0
 +
-diff --git a/contrib/src/qtdeclarative/0003-Disable-svgtoqml-tool.patch b/contrib/src/qtdeclarative/0003-Disable-svgtoqml-tool.patch
-new file mode 100644
-index 000000000000..5d379f3c966c
---- /dev/null
-+++ b/contrib/src/qtdeclarative/0003-Disable-svgtoqml-tool.patch
-@@ -0,0 +1,27 @@
-+From 67e1a86fee2ad14704f1970de325ef8897400631 Mon Sep 17 00:00:00 2001
-+From: Fatih Uzunoglu <fuzun54@outlook.com>
-+Date: Mon, 1 Apr 2024 19:43:59 +0300
-+Subject: [PATCH 3/3] Disable svgtoqml tool
-+
-+This tool requires a more extended build of host.
-+We do not use svgtoqml, so disable it instead.
-+---
-+ tools/CMakeLists.txt | 2 +-
-+ 1 file changed, 1 insertion(+), 1 deletion(-)
-+
-+diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
-+index 5770183d88..21bf5f6fd7 100644
-+--- a/tools/CMakeLists.txt
-++++ b/tools/CMakeLists.txt
-+@@ -75,7 +75,7 @@ if(TARGET Qt::Quick
-+         AND NOT IOS
-+         AND NOT WASM
-+         AND NOT rtems)
-+-    add_subdirectory(svgtoqml)
-++    # add_subdirectory(svgtoqml)
-+ endif()
-+ if(QT_FEATURE_thread AND TARGET Qt::QuickTest AND NOT ANDROID AND NOT WASM AND NOT rtems)
-+     add_subdirectory(qmltestrunner)
-+-- 
-+2.44.0
-+
 diff --git a/contrib/src/qtdeclarative/SHA512SUMS b/contrib/src/qtdeclarative/SHA512SUMS
 index 29e0c4547bf0..ac394126acfb 100644
 --- a/contrib/src/qtdeclarative/SHA512SUMS
@@ -1895,7 +2024,7 @@ index 29e0c4547bf0..ac394126acfb 100644
 -944e9f824dd8ec47d9e23e716d09142c5942f4478238f207d70f1144993440afa7925f85f3fd4cb5659191dee6a142524db40c7144c69c8bec9817591324cee1 qtdeclarative-everywhere-src-6.6.2.tar.xz
 +b189f3fc4ae9ad3e5c26aa56696b97cb2f1894cb23110928a31e5a62fb779578b492bec2f4dda5b31958a33eb2571ec4e1085ae6864442507be3ae0da83c96ee qtdeclarative-everywhere-src-6.7.0.tar.xz
 diff --git a/contrib/src/qtdeclarative/rules.mak b/contrib/src/qtdeclarative/rules.mak
-index 6ac7065f40c2..b304ef5528a9 100644
+index fe34ae3a42dc..6fbdff656869 100644
 --- a/contrib/src/qtdeclarative/rules.mak
 +++ b/contrib/src/qtdeclarative/rules.mak
 @@ -1,7 +1,7 @@
@@ -1907,66 +2036,56 @@ index 6ac7065f40c2..b304ef5528a9 100644
 +QTDECLARATIVE_VERSION := $(QTDECLARATIVE_VERSION_MAJOR).0
  QTDECLARATIVE_URL := $(QT)/$(QTDECLARATIVE_VERSION_MAJOR)/$(QTDECLARATIVE_VERSION)/submodules/qtdeclarative-everywhere-src-$(QTDECLARATIVE_VERSION).tar.xz
  
- DEPS_qtdeclarative-tools := qt-tools $(DEPS_qt-tools)
-@@ -40,6 +40,8 @@ $(TARBALLS)/qtdeclarative-everywhere-src-$(QTDECLARATIVE_VERSION).tar.xz:
+ DEPS_qtdeclarative-tools := qt-tools $(DEPS_qt-tools) qtshadertools-tools $(DEPS_qtshadertools-tools)
+@@ -39,6 +39,9 @@ $(TARBALLS)/qtdeclarative-everywhere-src-$(QTDECLARATIVE_VERSION).tar.xz:
  qtdeclarative: qtdeclarative-everywhere-src-$(QTDECLARATIVE_VERSION).tar.xz .sum-qtdeclarative
  	$(UNPACK)
  	$(APPLY) $(SRC)/qtdeclarative/0001-Fix-incorrect-library-inclusion.patch
 +	$(APPLY) $(SRC)/qtdeclarative/0002-Fix-build-with-no-feature-network.patch
-+	$(APPLY) $(SRC)/qtdeclarative/0003-Disable-svgtoqml-tool.patch
++	# disable unused svgtoqml tool:
++	sed -i.orig -e 's,add_subdirectory(svgtoqml),#add_subdirectory(svgtoqml),' $(UNPACK_DIR)/tools/CMakeLists.txt
  	$(MOVE)
  
- QT_DECLARATIVE_CONFIG := \
-diff --git a/contrib/src/qtshadertools/0001-Use-fxc2-through-wine-instead-of-fxc.patch b/contrib/src/qtshadertools/0001-Use-fxc2-through-wine-instead-of-fxc.patch
-index 6a8edacf20c1..ebfd73309e49 100644
---- a/contrib/src/qtshadertools/0001-Use-fxc2-through-wine-instead-of-fxc.patch
-+++ b/contrib/src/qtshadertools/0001-Use-fxc2-through-wine-instead-of-fxc.patch
-@@ -1,14 +1,14 @@
--From c596f3a817a22856e36db9df10615a8e722a33f7 Mon Sep 17 00:00:00 2001
-+From 3a69753af76268f4e57ba50c05d13ca73d850e0b Mon Sep 17 00:00:00 2001
- From: Fatih Uzunoglu <fuzun54@outlook.com>
- Date: Wed, 21 Feb 2024 20:27:36 +0200
- Subject: [PATCH] Use fxc2 through wine instead of fxc
- 
- ---
-- tools/qsb/qsb.cpp | 8 +++++---
-- 1 file changed, 5 insertions(+), 3 deletions(-)
-+ tools/qsb/qsb.cpp | 9 +++++----
-+ 1 file changed, 5 insertions(+), 4 deletions(-)
- 
- diff --git a/tools/qsb/qsb.cpp b/tools/qsb/qsb.cpp
--index bc38e14..d1a96fe 100644
-+index 3700a07a89..b761bb3913 100644
- --- a/tools/qsb/qsb.cpp
- +++ b/tools/qsb/qsb.cpp
- @@ -81,6 +81,7 @@ static bool runProcess(const QString &binary, const QStringList &arguments,
-@@ -19,7 +19,7 @@ index bc38e14..d1a96fe 100644
-      p.start(binary, arguments);
-      const QString cmd = binary + QLatin1Char(' ') + arguments.join(QLatin1Char(' '));
-      if (!silent)
--@@ -820,14 +821,15 @@ int main(int argc, char **argv)
-+@@ -832,15 +833,15 @@ int main(int argc, char **argv)
-                                                QLatin1String("/nologo"),
-                                                QLatin1String("/E"), QString::fromLocal8Bit(s.entryPoint()),
-                                                QLatin1String("/T"), QString::fromLocal8Bit(typeArg),
-@@ -32,12 +32,13 @@ index bc38e14..d1a96fe 100644
- +                    arguments.append("Z:" + QDir::toNativeSeparators(tmpIn));
-                      QByteArray output;
-                      QByteArray errorOutput;
---                    bool success = runProcess(QLatin1String("fxc"), arguments, &output, &errorOutput);
--+                    arguments.prepend(QStringLiteral("fxc2"));
-+-                    const QString compilerName = useDxc ? QLatin1String("dxc") : QLatin1String("fxc");
-+-                    bool success = runProcess(compilerName, arguments, &output, &errorOutput);
-++                    const QString compilerName = useDxc ? QLatin1String("dxc") : QLatin1String("fxc2");
- +                    bool success = runProcess(QLatin1String("wine"), arguments, &output, &errorOutput);
-                      if (success) {
-                          const QByteArray bytecode = readFile(tmpOut, FileType::Binary);
--                         if (!bytecode.isEmpty())
-+                         if (!bytecode.isEmpty()) {
- -- 
--2.43.1
-+2.44.0
- 
+ QT_DECLARATIVE_COMMON_CONFIG := \
+diff --git a/contrib/src/qtshadertools/0001-Backport-a-change-to-SPIRV-Cross-to-add-a-missing-in.patch b/contrib/src/qtshadertools/0001-Backport-a-change-to-SPIRV-Cross-to-add-a-missing-in.patch
+deleted file mode 100644
+index a571b48ede31..000000000000
+--- a/contrib/src/qtshadertools/0001-Backport-a-change-to-SPIRV-Cross-to-add-a-missing-in.patch
++++ /dev/null
+@@ -1,33 +0,0 @@
+-From 0813ef63bb445437d364d16aeca42f7425608a0e Mon Sep 17 00:00:00 2001
+-From: =?UTF-8?q?Martin=20Storsj=C3=B6?= <martin@martin.st>
+-Date: Thu, 4 Apr 2024 14:26:47 +0300
+-Subject: [PATCH] Backport a change to SPIRV-Cross to add a missing include
+-
+-This backports this change from later upstream SPIRV-Cross:
+-https://github.com/KhronosGroup/SPIRV-Cross/commit/a25d0acaad9406e5e5d5a712ebb7e798965aacf6
+-
+-Further upstream in qtshadertools, this issue goes away entirely
+-by updating to a newer version of SPIRV-Cross, with this fix
+-included.
+-
+-This fixes building with libc++ with
+-_LIBCPP_REMOVE_TRANSITIVE_INCLUDES set.
+----
+- src/3rdparty/SPIRV-Cross/spirv_cross_containers.hpp | 1 +
+- 1 file changed, 1 insertion(+)
+-
+-diff --git a/src/3rdparty/SPIRV-Cross/spirv_cross_containers.hpp b/src/3rdparty/SPIRV-Cross/spirv_cross_containers.hpp
+-index 506b069..9fc2a80 100644
+---- a/src/3rdparty/SPIRV-Cross/spirv_cross_containers.hpp
+-+++ b/src/3rdparty/SPIRV-Cross/spirv_cross_containers.hpp
+-@@ -26,6 +26,7 @@
+- 
+- #include "spirv_cross_error_handling.hpp"
+- #include <algorithm>
+-+#include <exception>
+- #include <functional>
+- #include <iterator>
+- #include <limits>
+--- 
+-2.25.1
+-
 diff --git a/contrib/src/qtshadertools/SHA512SUMS b/contrib/src/qtshadertools/SHA512SUMS
 index 0d4db08d22c9..43c2a17042ea 100644
 --- a/contrib/src/qtshadertools/SHA512SUMS
@@ -1975,7 +2094,7 @@ index 0d4db08d22c9..43c2a17042ea 100644
 -f016b55d229bf331141bf439de2b094080c601efca524f2f904e8767e6c3d82f097e62e671014e44680bd63c966509eb45f55d1b661b56ed65b13f987e9bb9c5 qtshadertools-everywhere-src-6.6.2.tar.xz
 +30f737093fcdba6b247425c21f15d5682454255fdcf04cbe9f822e5b549dcdbb6fa519bfbcd0f2ba8acfa775cec7c30a630b61d50e00afa8c017ae9a16a73497 qtshadertools-everywhere-src-6.7.0.tar.xz
 diff --git a/contrib/src/qtshadertools/rules.mak b/contrib/src/qtshadertools/rules.mak
-index bdb0eab67d51..7902a31f896c 100644
+index c4d24ffad7a5..7aeb00f2837b 100644
 --- a/contrib/src/qtshadertools/rules.mak
 +++ b/contrib/src/qtshadertools/rules.mak
 @@ -1,8 +1,8 @@
@@ -1989,6 +2108,14 @@ index bdb0eab67d51..7902a31f896c 100644
  QTSHADERTOOLS_URL := $(QT)/$(QTSHADERTOOLS_VERSION_MAJOR)/$(QTSHADERTOOLS_VERSION)/submodules/qtshadertools-everywhere-src-$(QTSHADERTOOLS_VERSION).tar.xz
  
  DEPS_qtshadertools-tools := qt-tools $(DEPS_qt-tools)
+@@ -51,7 +51,6 @@ QT_SHADETOOLS_NATIVE_CONFIG := -DCMAKE_TOOLCHAIN_FILE=$(BUILDPREFIX)/lib/cmake/Q
+ 
+ qtshadertools: qtshadertools-everywhere-src-$(QTSHADERTOOLS_VERSION).tar.xz .sum-qtshadertools
+ 	$(UNPACK)
+-	$(APPLY) $(SRC)/qtshadertools/0001-Backport-a-change-to-SPIRV-Cross-to-add-a-missing-in.patch
+ 	$(MOVE)
+ 
+ .qtshadertools-tools: BUILD_DIR=$</vlc_native
 diff --git a/contrib/src/qtsvg/SHA512SUMS b/contrib/src/qtsvg/SHA512SUMS
 index 1c62c35eec00..b5825804186c 100644
 --- a/contrib/src/qtsvg/SHA512SUMS
@@ -1997,7 +2124,7 @@ index 1c62c35eec00..b5825804186c 100644
 -cdfc3fb9aa00eaedd232c2b93482154f97e4e37d48db62b91142ae0dcc9d03bb9aa07cdfaa77e2973e6bfb5fdcdbf4365e6b9c855ffc82b3542d4cd07c1857a7 qtsvg-everywhere-src-6.6.2.tar.xz
 +b68e4e235f1a6b0ddbb130fbc06aa7ac06f074c5d33f588dd7049b5986ae070e1e4e976f22fba2bef81adc3beac8c4564a01c818b3594e06ab36d9939ce0e7b3 qtsvg-everywhere-src-6.7.0.tar.xz
 diff --git a/contrib/src/qtsvg/rules.mak b/contrib/src/qtsvg/rules.mak
-index 4c64a7901849..b39adad6c884 100644
+index 4a2d5488e473..1d0beabb2aca 100644
 --- a/contrib/src/qtsvg/rules.mak
 +++ b/contrib/src/qtsvg/rules.mak
 @@ -1,7 +1,7 @@
@@ -2011,11 +2138,11 @@ index 4c64a7901849..b39adad6c884 100644
  
  DEPS_qtsvg += qt $(DEPS_qt)
 diff --git a/contrib/src/qtvlcdeps/vlcdeps.pro b/contrib/src/qtvlcdeps/vlcdeps.pro
-index 47ddab434e5c..8fa139f13ac1 100644
+index 127884b72e75..a95832745687 100644
 --- a/contrib/src/qtvlcdeps/vlcdeps.pro
 +++ b/contrib/src/qtvlcdeps/vlcdeps.pro
-@@ -4,7 +4,7 @@ QT = core gui qml svg quick widgets quickcontrols2 network
- QTPLUGIN = qsvgicon qsvg qjpeg qico
+@@ -6,7 +6,7 @@ QTPLUGIN = qsvgicon qsvg qjpeg qico
+ CONFIG -= entrypoint
  
  win32 {
 -QTPLUGIN += qwindows qwindowsvistastyle
@@ -2031,7 +2158,7 @@ index 099b31ea4929..8cf0b14e4139 100644
 -ed5539ac9515ba93822ee1dfdedd3ece46a51c50b23efd0fb90ead2728b651c41bec42a6e2e2caf72bda0f274940e9f00049bae42c1315e0226e4a42c708f664  qtwayland-everywhere-src-6.6.2.tar.xz
 +cda0e0736f85656d05b2399970413ffc5082af4256c8b3087c3f1d06cad5ef5ad7cb8838513723569193df02cd3c3df3d5478d99464606c62c42629ef75c225f  qtwayland-everywhere-src-6.7.0.tar.xz
 diff --git a/contrib/src/qtwayland/rules.mak b/contrib/src/qtwayland/rules.mak
-index 848957c32802..7ce4c1149ea9 100644
+index c062c4a35bbb..f5247f978d98 100644
 --- a/contrib/src/qtwayland/rules.mak
 +++ b/contrib/src/qtwayland/rules.mak
 @@ -1,7 +1,7 @@
diff --git a/PKGBUILD b/PKGBUILD
index f5021e5d2df4..bc21192982d8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -12,7 +12,7 @@
 
 pkgname="vlc-git"
 pkgdesc="Multi-platform MPEG, VCD/DVD, and DivX player"
-pkgver=4.0.0.r28594.g30b5a2ac41
+pkgver=4.0.0.r28720.g4c78bc6063
 pkgrel=1
 url='https://code.videolan.org/videolan/vlc'
 arch=('i686' 'x86_64')
@@ -107,7 +107,7 @@ source=('git+https://code.videolan.org/videolan/vlc.git'
         'update-vlc-plugin-cache.hook')
 b2sums=('SKIP'
         '76103422a1eaad40d33bfb7897bf25c1b5748729270974bec13f642f2861c4458f0dc07b5fb68d9ba4fae6e44d4a6c8e4d67af7ec10e0c117f1b804dd06868e3'
-        '186c39289733227a85b83ed50e6cae80846324a0fc72ac17e9f3f6f5984c8d391969ebbad869ff09feb7ec4367d5c095efe2522bd28f97a2f8d526817d2837c3'
+        '5cdefbec32ef97381311bff101f565cf1a2f04146d0bd23b3185ca2347bee1fde55cccbe8f1a8cd6a3016f0a9ef90ab87058915e06f7bd84cddaf91098edb3ed'
         'fe3849f45fb91d3697573a9c23b90b78ff0bef5f94c42bc6e7c14427637f45f2fc86786803fb9b36c657ac2c50f6bf3c860cd763248711308ceab2bfcf7be49a')
 
 pkgver() {