From 2d0919cf77fa3d175bd42969c6d26415026135d0 Mon Sep 17 00:00:00 2001
From: Raul Metsma <raul@metsma.ee>
Date: Tue, 27 Dec 2022 08:32:03 +0200
Subject: [PATCH] Update Qt 6.4.1 (#1134)

IB-7541

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

Signed-off-by: Raul Metsma <raul@metsma.ee>
---
 .github/workflows/build.yml      |  2 +-
 README.md                        | 12 ++++++++----
 prepare_osx_build_environment.sh | 14 ++++++--------
 3 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 30d8a3523..6cb359a9e 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -141,7 +141,7 @@ jobs:
       matrix:
         vcver: [142, 143]
         arch: [x64]
-        qtver: [6.3.2]
+        qtver: [6.4.1]
         qt: [win64_msvc2019_64]
         qtmodules: [qt5compat]
         include:
diff --git a/README.md b/README.md
index 03e2b3229..547e3bf7b 100644
--- a/README.md
+++ b/README.md
@@ -53,8 +53,7 @@
    * [XCode](https://apps.apple.com/us/app/xcode/id497799835?mt=12)
    * [http://www.cmake.org](http://www.cmake.org)
    * [http://qt-project.org](http://qt-project.org)  
-       Since Qt 5.6 default SSL backend is SecureTransport and this project depends on openssl.  
-       Build Qt with openssl backend using provided [prepare_osx_build_environment.sh](prepare_osx_build_environment.sh) script; by default Qt is built in the `~/cmake_builds` folder but alternate build path can be defined with the `-p` option.
+       Build universal binary of Qt using provided [prepare_osx_build_environment.sh](prepare_osx_build_environment.sh) script; by default Qt is built in the `~/cmake_builds` folder but alternate build path can be defined with the `-p` option.
    * [libdigidocpp-*.pkg](https://github.com/open-eid/libdigidocpp/releases)
 
 2. Fetch the source
@@ -64,7 +63,11 @@
 
 3. Configure
 
-        cmake -DCMAKE_PREFIX_PATH="~/cmake_builds/Qt-6.3.1-OpenSSL/lib/cmake/Qt6" -B build -S .
+        cmake -B build -S . \
+          -DCMAKE_PREFIX_PATH=~/cmake_builds/Qt-6.4.1-OpenSSL/lib/cmake/Qt6
+          -DOPENSSL_ROOT_DIR=~/cmake_build/OpenSSL \
+          -DLDAP_ROOT=~/cmake_build/OpenLDAP \
+          -DCMAKE_OSX_ARCHITECTURES="x86_64;arm64"
 
 4. Build
 
@@ -82,6 +85,7 @@
     * [http://www.cmake.org](http://www.cmake.org)
     * [http://qt-project.org](http://qt-project.org)
     * [libdigidocpp-*.msi](https://github.com/open-eid/libdigidocpp/releases)
+
 2. Fetch the source
 
         git clone --recursive https://github.com/open-eid/DigiDoc4-Client
@@ -89,7 +93,7 @@
 
 3. Configure
 
-        cmake -G"NMAKE Makefiles" -DCMAKE_PREFIX_PATH="C:\Qt\6.3.1\msvc2019\lib\cmake\Qt6" -B build -S .
+        cmake -G"NMAKE Makefiles" -DCMAKE_PREFIX_PATH="C:\Qt\6.4.1\msvc2019\lib\cmake\Qt6" -B build -S .
 
 4. Build
 
diff --git a/prepare_osx_build_environment.sh b/prepare_osx_build_environment.sh
index 9cbefc865..9467ae9b9 100755
--- a/prepare_osx_build_environment.sh
+++ b/prepare_osx_build_environment.sh
@@ -4,14 +4,13 @@
 set -e
 
 ######### Versions of libraries/frameworks to be compiled
-QT_VER="6.3.2"
-OPENSSL_VER="1.1.1q"
+QT_VER="6.4.1"
+OPENSSL_VER="1.1.1s"
 OPENLDAP_VER="2.6.3"
 REBUILD=false
 BUILD_PATH=~/cmake_builds
 : ${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)
 
 while [[ $# -gt 0 ]]
 do
@@ -113,14 +112,14 @@ if [[ "$REBUILD" = true || ! -d ${QT_PATH} ]] ; then
     QT_MINOR="${qt_ver_parts[0]}.${qt_ver_parts[1]}"
     echo -e "\n${ORANGE}##### Building Qt ${QT_VER} ${QT_PATH} #####${RESET}\n"
     mkdir -p ${BUILD_PATH}
-    cd ${BUILD_PATH}
+    pushd ${BUILD_PATH}
     for PACKAGE in qtbase-everywhere-src-${QT_VER} qtsvg-everywhere-src-${QT_VER} qttools-everywhere-src-${QT_VER} qt5compat-everywhere-src-${QT_VER}; do
         if [ ! -f ${PACKAGE}.tar.xz ]; then
             curl -O -L http://download.qt.io/official_releases/qt/${QT_MINOR}/${QT_VER}/submodules/${PACKAGE}.tar.xz
         fi
         rm -rf ${PACKAGE}
         tar xf ${PACKAGE}.tar.xz
-        cd ${PACKAGE}
+        pushd ${PACKAGE}
         if [[ "${PACKAGE}" == *"qtbase"* ]] ; then
             ./configure -prefix ${QT_PATH} -opensource -nomake tests -nomake examples -no-securetransport -openssl -openssl-linked -confirm-license -- -DOPENSSL_ROOT_DIR=${OPENSSL_PATH} -DCMAKE_OSX_ARCHITECTURES="x86_64;arm64"
         else
@@ -128,16 +127,15 @@ if [[ "$REBUILD" = true || ! -d ${QT_PATH} ]] ; then
         fi
         cmake --build . --parallel
         cmake --build . --target install
-        cd -
+        popd
         rm -rf ${PACKAGE}
     done
-    cd -
+    popd
 else
     echo -e "\n${GREY}  Qt not built${RESET}"
 fi
 
 if [[ "$REBUILD" = true || ! -d ${OPENLDAP_PATH} ]] ; then
-    SCRIPTPATH="$( cd "$(dirname "$0")" >/dev/null 2>&1 ; pwd -P )"
     echo -e "\n${ORANGE}##### Building OpenLDAP ${OPENLDAP_VER} ${OPENLDAP_PATH} #####${RESET}\n"
     curl -O -L http://mirror.eu.oneandone.net/software/openldap/openldap-release/openldap-${OPENLDAP_VER}.tgz
     tar xf openldap-${OPENLDAP_VER}.tgz