Remove Qt6 patch as build issues are fixed upstream (commits #f4b91ae1 and #e012186b)

3 files changed, 3 insertions, 45 deletions

diff --git a/.SRCINFO b/.SRCINFO
index db8d8bf6854d..62099b86ddcc 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.r28563.g35210a54fb
+	pkgver = 4.0.0.r28594.g30b5a2ac41
 	pkgrel = 1
 	url = https://code.videolan.org/videolan/vlc
 	arch = i686
@@ -167,17 +167,15 @@ pkgbase = vlc-git
 	optdepends = aom: AOM AV1 codec
 	optdepends = srt: SRT input/output plugin
 	optdepends = dav1d: dav1d AV1 decoder
-	provides = vlc=4.0.0.r28563.g35210a54fb
+	provides = vlc=4.0.0.r28594.g30b5a2ac41
 	conflicts = vlc
 	options = !emptydirs
 	source = git+https://code.videolan.org/videolan/vlc.git
 	source = vlc-live-media-2021.patch
-	source = qt6.patch
 	source = 5182.patch
 	source = update-vlc-plugin-cache.hook
 	b2sums = SKIP
 	b2sums = 76103422a1eaad40d33bfb7897bf25c1b5748729270974bec13f642f2861c4458f0dc07b5fb68d9ba4fae6e44d4a6c8e4d67af7ec10e0c117f1b804dd06868e3
-	b2sums = 03342d23952f481cd9061e142a0c85b6a469ebab8de48ae845d724625947feeb6e8cbfbd9e10693b5df53f2509be38d645fb738c0da0c9b1b5505567a1edcc3f
 	b2sums = 186c39289733227a85b83ed50e6cae80846324a0fc72ac17e9f3f6f5984c8d391969ebbad869ff09feb7ec4367d5c095efe2522bd28f97a2f8d526817d2837c3
 	b2sums = fe3849f45fb91d3697573a9c23b90b78ff0bef5f94c42bc6e7c14427637f45f2fc86786803fb9b36c657ac2c50f6bf3c860cd763248711308ceab2bfcf7be49a
 
diff --git a/PKGBUILD b/PKGBUILD
index 5288c12329fa..f5021e5d2df4 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.r28563.g35210a54fb
+pkgver=4.0.0.r28594.g30b5a2ac41
 pkgrel=1
 url='https://code.videolan.org/videolan/vlc'
 arch=('i686' 'x86_64')
@@ -103,12 +103,10 @@ provides=("${_name}=${pkgver}")
 options=(!emptydirs)
 source=('git+https://code.videolan.org/videolan/vlc.git'
         'vlc-live-media-2021.patch'
-        'qt6.patch'
         '5182.patch'
         'update-vlc-plugin-cache.hook')
 b2sums=('SKIP'
         '76103422a1eaad40d33bfb7897bf25c1b5748729270974bec13f642f2861c4458f0dc07b5fb68d9ba4fae6e44d4a6c8e4d67af7ec10e0c117f1b804dd06868e3'
-        '03342d23952f481cd9061e142a0c85b6a469ebab8de48ae845d724625947feeb6e8cbfbd9e10693b5df53f2509be38d645fb738c0da0c9b1b5505567a1edcc3f'
         '186c39289733227a85b83ed50e6cae80846324a0fc72ac17e9f3f6f5984c8d391969ebbad869ff09feb7ec4367d5c095efe2522bd28f97a2f8d526817d2837c3'
         'fe3849f45fb91d3697573a9c23b90b78ff0bef5f94c42bc6e7c14427637f45f2fc86786803fb9b36c657ac2c50f6bf3c860cd763248711308ceab2bfcf7be49a')
 
@@ -129,7 +127,6 @@ prepare() {
   sed 's|whoami|echo builduser|g' -i configure
   sed 's|hostname -f|echo arch|g' -i configure
   autoreconf -vf
-  patch -Np1 < "${srcdir}"/qt6.patch
 }
 
 build() {
diff --git a/qt6.patch b/qt6.patch
deleted file mode 100644
index 91cc9b9351a1..000000000000
--- a/qt6.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- a/buildsystem/check_qml_module.py
-+++ b/buildsystem/check_qml_module.py
-@@ -82,11 +82,18 @@
-             print("qmake not found")
-             return False
- 
--        ret = subprocess.run(
--            [ qmake, "-qtconf", qtconf, "-query"],
--            capture_output=True,
--            encoding="utf8"
--        )
-+        if os.path.isfile(qtconf):
-+            ret = subprocess.run(
-+                [ qmake, "-qtconf", qtconf, "-query"],
-+                capture_output=True,
-+                encoding="utf8"
-+            )
-+        else:
-+            ret = subprocess.run(
-+                [ qmake, "-query"],
-+                capture_output=True,
-+                encoding="utf8"
-+            )
- 
-         if ret.returncode != 0:
-             return None
---- a/configure
-+++ b/configure
-@@ -61836,7 +61836,7 @@
- 
-             { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if contribs provide qmake" >&5
- printf %s "checking if contribs provide qmake... " >&6; }
--      if test -x "${CONTRIB_DIR}/../bin/qmake${BUILDEXEEXT}"
-+      if [ ! -z ${CONTRIB_DIR} ] && [ test -x "${CONTRIB_DIR}/../bin/qmake${BUILDEXEEXT}" ]
- then :
- 
-         QMAKE="${CONTRIB_DIR}/../bin/qmake${BUILDEXEEXT}"