Update libs (open-eid#1236)

- OpenSSL 3.0.12 - Qt 6.6.1 IB-7906, IB-7907 Signed-off-by: Raul Metsma <[email protected]>
metsma · Jan 23, 2024 · 09a2139 · 09a2139
1 parent 4384a8c
commit 09a2139
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -4,7 +4,6 @@ permissions:
   contents: read
 env:
   BUILD_NUMBER: ${{ github.run_number }}
-  MAKEFLAGS: -j3
 jobs:
   macos:
     name: Build on macOS
@@ -106,8 +105,6 @@ jobs:
     strategy:
       matrix:
         container: ['fedora:37', 'fedora:38']
-    env:
-      MAKEFLAGS: -j3
     steps:
     - name: Install Deps
       run: |
@@ -172,12 +169,12 @@ jobs:
       uses: lukka/run-vcpkg@v7
       with:
         vcpkgArguments: openssl zlib flatbuffers
-        vcpkgGitCommitId: 6a349fe1fbea1e5fcda2e0775f555d829a5e82df
+        vcpkgGitCommitId: 18b028fe785e707265fa0e35590b7537ae1d12ea
         vcpkgTriplet: x64-windows
     - name: Install Qt
       uses: jurplel/install-qt-action@v3
       with:
-        version: 6.5.3
+        version: 6.6.1
         arch: win64_msvc2019_64
         modules: qt5compat
     - name: Setup dev env

diff --git a/debian/control b/debian/control
@@ -10,6 +10,9 @@ Build-Depends:
  libldap2-dev,
  libpcsclite-dev,
  libssl-dev,
+ libflatbuffers-dev,
+ flatbuffers-compiler-dev,
+ zlib1g-dev,
  qt6-tools-dev | qttools5-dev,
  qt6-l10n-tools | qttools5-dev-tools,
  libqt6svg6-dev | libqt5svg5-dev

diff --git a/prepare_osx_build_environment.sh b/prepare_osx_build_environment.sh
@@ -4,8 +4,8 @@
 set -e
 
 ######### Versions of libraries/frameworks to be compiled
-QT_VER="6.5.3"
-OPENSSL_VER="3.0.11"
+QT_VER="6.6.1"
+OPENSSL_VER="3.0.12"
 OPENLDAP_VER="2.6.6"
 REBUILD=false
 BUILD_PATH=~/cmake_builds