From a948dc6159da326e4dc6e58db115b04c85dbfcbf Mon Sep 17 00:00:00 2001
From: Raul Metsma <raul@metsma.ee>
Date: Thu, 22 Sep 2022 10:53:09 +0300
Subject: [PATCH] Update libraries and SDK-s (#1117)

IB-7508, IB-7462, IB-7510

Signed-off-by: Raul Metsma <raul@metsma.ee>

Signed-off-by: Raul Metsma <raul@metsma.ee>
---
 .github/workflows/build.yml      | 27 +++++++++------------------
 common                           |  2 +-
 prepare_osx_build_environment.sh |  8 ++++----
 3 files changed, 14 insertions(+), 23 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 6f3a95808..6bb462042 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -96,7 +96,7 @@ jobs:
     container: ${{ matrix.container }}
     strategy:
       matrix:
-        container: ['fedora:35']
+        container: ['fedora:35', 'fedora:36']
     env:
       MAKEFLAGS: -j3
     steps:
@@ -132,34 +132,25 @@ jobs:
     runs-on: ${{ matrix.image }}
     strategy:
       matrix:
-        vcver: [141, 142, 143]
+        vcver: [142, 143]
         arch: [x64]
-        qtver: [5.12.12]
+        qtver: [6.3.2]
+        qt: [win64_msvc2019_64]
+        qtmodules: [qt5compat]
         include:
-        - arch: x64
-          qt: win64_msvc2017_64
-        - vcver: 141
-          image: windows-2019
-          toolset: 14.16
         - vcver: 142
           image: windows-2019
           toolset: 14.29
         - vcver: 143
           image: windows-2022
           toolset: 14.33
-        - vcver: 142
+        - vcver: 141
           arch: x86
           qtver: 5.12.12
           qt: win32_msvc2017
+          qtmodules:
           image: windows-2019
-          toolset: 14.29
-        - vcver: 142
-          arch: x64
-          qtver: 6.3.1
-          qtmodules: qt5compat
-          qt: win64_msvc2019_64
-          image: windows-2019
-          toolset: 14.29
+          toolset: 14.16
     env:
       VER_SUFFIX: .VS${{ matrix.vcver }}
     steps:
@@ -186,7 +177,7 @@ jobs:
         vcpkgGitCommitId: a69b65229b3956b7f45abd81671b7330114bcaad
         vcpkgTriplet: ${{ matrix.arch }}-windows
     - name: Install Qt
-      uses: jurplel/install-qt-action@v2
+      uses: jurplel/install-qt-action@v3
       with:
         version: ${{ matrix.qtver }}
         arch: ${{ matrix.qt }}
diff --git a/common b/common
index 77a979e51..3cc21c542 160000
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit 77a979e511033df92171de3ff7b5315b25248746
+Subproject commit 3cc21c542772c239e6902560cf5eb26b2bda58e4
diff --git a/prepare_osx_build_environment.sh b/prepare_osx_build_environment.sh
index 6f4bfa0d0..9cbefc865 100755
--- a/prepare_osx_build_environment.sh
+++ b/prepare_osx_build_environment.sh
@@ -4,12 +4,12 @@
 set -e
 
 ######### Versions of libraries/frameworks to be compiled
-QT_VER="6.3.0"
-OPENSSL_VER="1.1.1o"
-OPENLDAP_VER="2.6.2"
+QT_VER="6.3.2"
+OPENSSL_VER="1.1.1q"
+OPENLDAP_VER="2.6.3"
 REBUILD=false
 BUILD_PATH=~/cmake_builds
-: ${MACOSX_DEPLOYMENT_TARGET:="10.14"}
+: ${MACOSX_DEPLOYMENT_TARGET:="10.15"}
 export MACOSX_DEPLOYMENT_TARGET
 SCRIPTPATH=$(exec 2>/dev/null;cd -- $(dirname "$0"); unset PWD; /usr/bin/pwd || /bin/pwd || pwd)