From 639cebef5f2e194ccbd9aec4d5ccf2f4ceee28e3 Mon Sep 17 00:00:00 2001
From: Raul Metsma <raul@metsma.ee>
Date: Mon, 6 Dec 2021 16:41:30 +0200
Subject: [PATCH] Update Qt to 5.12.2 (#1019)

IB-6907

Signed-off-by: Raul Metsma <raul@metsma.ee>
---
 .github/workflows/build.yml      |  2 +-
 prepare_osx_build_environment.sh |  4 +++-
 qt-macos12.patch                 | 11 +++++++++++
 3 files changed, 15 insertions(+), 2 deletions(-)
 create mode 100644 qt-macos12.patch

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index ccbdd04de..2af854c43 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -50,7 +50,7 @@ jobs:
     container: ${{ matrix.container }}
     strategy:
       matrix:
-        container: ['ubuntu:20.04', 'ubuntu:21.04']
+        container: ['ubuntu:20.04', 'ubuntu:21.10']
     env:
       DEBIAN_FRONTEND: noninteractive
       DEBFULLNAME: 'github-actions'
diff --git a/prepare_osx_build_environment.sh b/prepare_osx_build_environment.sh
index 65e275842..55866fe2b 100755
--- a/prepare_osx_build_environment.sh
+++ b/prepare_osx_build_environment.sh
@@ -4,13 +4,14 @@
 set -e
 
 ######### Versions of libraries/frameworks to be compiled
-QT_VER="5.12.11"
+QT_VER="5.12.12"
 OPENSSL_VER="1.1.1l"
 OPENLDAP_VER="2.6.0"
 REBUILD=false
 BUILD_PATH=~/cmake_builds
 : ${MACOSX_DEPLOYMENT_TARGET:="10.14"}
 export MACOSX_DEPLOYMENT_TARGET
+SCRIPTPATH=$(exec 2>/dev/null;cd -- $(dirname "$0"); unset PWD; /usr/bin/pwd || /bin/pwd || pwd)
 
 while [[ $# -gt 0 ]]
 do
@@ -124,6 +125,7 @@ if [[ "$REBUILD" = true || ! -d ${QT_PATH} ]] ; then
                 if [[ "${ARCH}" == "arm64" ]] ; then
                     CROSSCOMPILE="-device-option QMAKE_APPLE_DEVICE_ARCHS=${ARCH}"
                 fi
+                patch -Np1 -i ${SCRIPTPATH}/qt-macos12.patch
                 ./configure -prefix ${QT_PATH} -opensource -nomake tests -nomake examples -no-securetransport -openssl -openssl-linked -confirm-license OPENSSL_PREFIX=${OPENSSL_PATH} ${CROSSCOMPILE}
             else
                 "${QT_PATH}"/bin/qmake
diff --git a/qt-macos12.patch b/qt-macos12.patch
new file mode 100644
index 000000000..8de8aa8a9
--- /dev/null
+++ b/qt-macos12.patch
@@ -0,0 +1,11 @@
+--- qtbase-everywhere-src-5.12.11.orig/src/plugins/platforms/cocoa/qiosurfacegraphicsbuffer.h   2021-05-18 09:43:52.000000000 +0300
++++ qtbase-everywhere-src-5.12.11/src/plugins/platforms/cocoa/qiosurfacegraphicsbuffer.h        2021-11-26 19:44:43.000000000 +0200
+@@ -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