From b49b8428eb84a9a673b623d68b6bad1de24ab758 Mon Sep 17 00:00:00 2001
From: Raul Metsma <raul@metsma.ee>
Date: Fri, 10 May 2024 09:15:04 +0300
Subject: [PATCH] Update libraries and minimum OS versions

IB-7825, IB-8026, IB-8094, IB-8095

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

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 360a9f74..693dca2d 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -9,7 +9,7 @@ jobs:
     name: Build on macOS
     runs-on: macos-latest
     env:
-      MACOSX_DEPLOYMENT_TARGET: 11.0
+      MACOSX_DEPLOYMENT_TARGET: 12.0
     steps:
     - name: Checkout
       uses: actions/checkout@v4
@@ -54,7 +54,7 @@ jobs:
     container: ubuntu:${{ matrix.container }}
     strategy:
       matrix:
-        container: ['20.04', '22.04', '23.10']
+        container: ['20.04', '22.04', '24.04']
     env:
       DEBIAN_FRONTEND: noninteractive
       DEBFULLNAME: github-actions
@@ -104,7 +104,7 @@ jobs:
     container: fedora:${{ matrix.container }}
     strategy:
       matrix:
-        container: [38, 39]
+        container: [39, 40]
     steps:
     - name: Install Deps
       run: |
@@ -180,13 +180,12 @@ jobs:
     - name: Install Qt
       uses: jurplel/install-qt-action@v3
       with:
-        version: 6.6.3
+        version: 6.7.1
         arch: win64_msvc2019_64
     - name: Setup dev env
       uses: ilammy/msvc-dev-cmd@v1
       with:
         arch: x64
-        sdk: 10.0.19041.0
     - name: Install WiX
       run: |
         dotnet tool install -g wix --version 5.0.0
diff --git a/prepare_osx_build_environment.sh b/prepare_osx_build_environment.sh
index 413cea83..c990ea91 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.6.3"
+QT_VER="6.7.1"
 OPENSSL_VER="3.0.13"
-OPENLDAP_VER="2.6.7"
+OPENLDAP_VER="2.6.8"
 REBUILD=false
 BUILD_PATH=~/cmake_builds
-: ${MACOSX_DEPLOYMENT_TARGET:="11.0"}
+: ${MACOSX_DEPLOYMENT_TARGET:="12.0"}
 export MACOSX_DEPLOYMENT_TARGET
 
 while [[ $# -gt 0 ]]