[vlc-commits] [Git][videolan/vlc][master] 2 commits: contrib: qt: remove unneeded GCC 11 patches

[Steve Lhomme (@robUx4)]

Steve Lhomme pushed to branch master at VideoLAN / VLC


Commits:
e12ccd45 by Johannes Kauffmann at 2023-02-27T06:42:37+00:00
contrib: qt: remove unneeded GCC 11 patches

These were fixed with Qt 5.15.3 and 5.15.5.

- - - - -
e1ddf339 by Johannes Kauffmann at 2023-02-27T06:42:37+00:00
contrib: qt: remove unneeded macOS patch

This was fixed in Qt 5.15.8.

- - - - -


3 changed files:

- − contrib/src/qt/qt-add-missing-header-darwin.patch
- contrib/src/qt/qt-fix-gcc11-build.patch
- contrib/src/qt/rules.mak


Changes:

=====================================
contrib/src/qt/qt-add-missing-header-darwin.patch deleted
=====================================
@@ -1,28 +0,0 @@
-From 2fe5acf1d581236641037df268e1d968f6b54121 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?=3D=3FUTF-8=3Fq=3F=3DC3=3D98ystein=3D20Heskestad=3F=3D?=
- <oystein.heskestad at qt.io>
-Date: Mon, 16 May 2022 10:57:39 +0200
-Subject: [PATCH] Add missing macOS header file that was indirectly included
-
-Change-Id: I4d4c7d4f957fc36dea5e06eb6d661aeecf6385f1
-Reviewed-by: Timur Pocheptsov <timur.pocheptsov at qt.io>
----
- src/plugins/platforms/cocoa/qiosurfacegraphicsbuffer.h | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/plugins/platforms/cocoa/qiosurfacegraphicsbuffer.h b/src/plugins/platforms/cocoa/qiosurfacegraphicsbuffer.h
-index e070ba977d..0896917334 100644
---- a/src/plugins/platforms/cocoa/qiosurfacegraphicsbuffer.h
-+++ b/src/plugins/platforms/cocoa/qiosurfacegraphicsbuffer.h
-@@ -43,6 +43,8 @@
- #include <qpa/qplatformgraphicsbuffer.h>
- #include <private/qcore_mac_p.h>
- 
-+#include <CoreGraphics/CGColorSpace.h>
-+
- QT_BEGIN_NAMESPACE
- 
- class QIOSurfaceGraphicsBuffer : public QPlatformGraphicsBuffer
--- 
-2.35.1
-


=====================================
contrib/src/qt/qt-fix-gcc11-build.patch
=====================================
@@ -1,23 +1,3 @@
---- qt/src/corelib/global/qfloat16.h.old	2022-01-18 17:46:03.821787862 +0100
-+++ qt/src/corelib/global/qfloat16.h	2022-01-18 17:46:52.824906487 +0100
-@@ -44,6 +44,7 @@
- #include <QtCore/qglobal.h>
- #include <QtCore/qmetatype.h>
- #include <string.h>
-+#include <limits>
- 
- #if defined(QT_COMPILER_SUPPORTS_F16C) && defined(__AVX2__) && !defined(__F16C__)
- // All processors that support AVX2 do support F16C too. That doesn't mean
---- qt/src/corelib/text/qbytearraymatcher.h.old	2022-01-18 17:47:49.667887059 +0100
-+++ qt/src/corelib/text/qbytearraymatcher.h	2022-01-18 17:48:09.055540031 +0100
-@@ -41,6 +41,7 @@
- #define QBYTEARRAYMATCHER_H
- 
- #include <QtCore/qbytearray.h>
-+#include <limits>
- 
- QT_BEGIN_NAMESPACE
- 
 --- qt/src/3rdparty/angle/src/libANGLE/HandleAllocator.cpp.old	2022-01-18 17:55:16.527952044 +0100
 +++ qt/src/3rdparty/angle/src/libANGLE/HandleAllocator.cpp	2022-01-18 17:55:28.315744081 +0100
 @@ -10,6 +10,7 @@


=====================================
contrib/src/qt/rules.mak
=====================================
@@ -40,7 +40,6 @@ qt: qtbase-everywhere-src-$(QT_VERSION_FULL).tar.xz .sum-qt
 	$(APPLY) $(SRC)/qt/0009-Add-KHRONOS_STATIC-to-allow-static-linking-on-Windows.patch
 	$(APPLY) $(SRC)/qt/0003-allow-cross-compilation-of-angle-with-wine.patch
 	$(APPLY) $(SRC)/qt/qt-fix-gcc11-build.patch
-	$(APPLY) $(SRC)/qt/qt-add-missing-header-darwin.patch
 	# force path replacement in pkg-config output files
 	$(APPLY) $(SRC)/qt/force-pkgconfg-replace.patch
 	# pass all files installed through our installer



View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/e09bec51c0fab46125a70c5dbaa17b3f47390448...e1ddf339c14982c75e9344cca23c10f8f099e56b

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/e09bec51c0fab46125a70c5dbaa17b3f47390448...e1ddf339c14982c75e9344cca23c10f8f099e56b
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance