diff --git a/Build-qt.sh b/Build-qt.sh index 7f33138..c115e3a 100755 --- a/Build-qt.sh +++ b/Build-qt.sh @@ -2,6 +2,9 @@ set -ex set -o pipefail +script_dir=$(cd $(dirname $0) || exit 1; pwd) + + # # Configuration # @@ -358,6 +361,10 @@ qt_install_dir_options="-prefix $install_dir" if [[ ! -d $src_dir ]] then tar --no-same-owner -xf $deps_dir/$qt_archive + + # Apply patches + git apply --ignore-whitespace $script_dir/patches/*.patch + fi cd $src_dir diff --git a/patches/0001-8467beddb-add-missing-macos-header-file-that-was-indirectly-included.patch b/patches/0001-8467beddb-add-missing-macos-header-file-that-was-indirectly-included.patch new file mode 100644 index 0000000..f1d7cd6 --- /dev/null +++ b/patches/0001-8467beddb-add-missing-macos-header-file-that-was-indirectly-included.patch @@ -0,0 +1,26 @@ +From 8467beddb7239cc213ae13900fa30e3d26df5e78 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?=C3=98ystein=20Heskestad?= +Date: Wed, 27 Oct 2021 13:07:46 +0200 +Subject: [PATCH] Add missing macOS header file that was indirectly included + before + +Change-Id: I4d4c7d4f957fc36dea5e06eb6d661aeecf6385f1 +(cherry picked from commit dece6f5840463ae2ddf927d65eb1b3680e34a547) +Reviewed-by: Volker Hilsheimer +--- + src/plugins/platforms/cocoa/qiosurfacegraphicsbuffer.h | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/qtbase/src/plugins/platforms/cocoa/qiosurfacegraphicsbuffer.h b/qtbase/src/plugins/platforms/cocoa/qiosurfacegraphicsbuffer.h +index dd3ebca4a65..ee7ac5c0143 100644 +--- a/qtbase/src/plugins/platforms/cocoa/qiosurfacegraphicsbuffer.h ++++ b/qtbase/src/plugins/platforms/cocoa/qiosurfacegraphicsbuffer.h +@@ -43,6 +43,8 @@ + #include + #include + ++#include ++ + QT_BEGIN_NAMESPACE + + class QIOSurfaceGraphicsBuffer : public QPlatformGraphicsBuffer diff --git a/patches/README.md b/patches/README.md new file mode 100644 index 0000000..9b6c3f4 --- /dev/null +++ b/patches/README.md @@ -0,0 +1,11 @@ +# Qt Patches + +Fixes and improvements to Qt that should first be contributed upstream. The [Qt Contribution Guidelines](https://wiki.qt.io/Qt_Contribution_Guidelines) is a great resource to guide you through the process. + +Each patch is documented by adding an entry below. Whenever possible, references to bugs.python.org https://bugreports.qt.io/, corresponding GitHub PRs and any related discussions on forums or mailing lists are also provided. + +Before being applied, patches are sorted alphabetically. This ensures that patch starting with 0001- is applied before the one starting with 0002-. + +## Patches + +* [0001-8467beddb-add-missing-macos-header-file-that-was-indirectly-included.patch][0001-8467beddb-add-missing-macos-header-file-that-was-indirectly-included.patch] adapted from [qt/qtbase@8467beddb](https://github.com/qt/qtbase/commit/8467beddb7239cc213ae13900fa30e3d26df5e78). The `qtbase/` sub-directory has been added to the patch.