Merge pull request #896 from otahirs/libssl

fix: incompatibility between libpq and libssl

Author: fvacek

.github/workflows/c-cpp.yml

@@ -72,20 +72,18 @@ jobs:
         path: |
           C:/openssl/bin/libssl-1_1-x64.dll
           C:/openssl/bin/libcrypto-1_1-x64.dll
-          C:/msys64/mingw64/bin/libiconv-2.dll
-          C:/msys64/mingw64/bin/libintl-8.dll
-          C:/msys64/mingw64/bin/libxml2-2.dll
-          C:/msys64/mingw64/bin/liblzma-5.dll
-          C:/msys64/mingw64/bin/zlib1.dll
-          C:/msys64/mingw64/bin/libpq.dll
+          C:/Program Files/PostgreSQL/14/bin/libiconv-2.dll
+          C:/Program Files/PostgreSQL/14/bin/libintl-9.dll
+          C:/Program Files/PostgreSQL/14/bin/liblz4.dll
+          C:/Program Files/PostgreSQL/14/bin/zlib1.dll
+          C:/Program Files/PostgreSQL/14/bin/libpq.dll
         key: ${{ runner.os }}-Libraries
 
     - name: Get OpenSSL and PostgreSQL libraries
       if: steps.cache-libs.outputs.cache-hit != 'true'
       run: |
         choco install openssl.light --params "/InstallDir:C:\openssl" --version 1.1.1 -y
-        C:/msys64/usr/bin/pacman -Sy --noconfirm
-        C:/msys64/usr/bin/pacman -S mingw-w64-x86_64-postgresql --noconfirm
+        choco install postgresql14 --version 14.5.1 -y
       shell: cmd
 
     - name: Install Qt
@@ -109,7 +107,7 @@ jobs:
     - name: Create installer
       run: |
         choco install innosetup --no-progress
-        "C:\Program Files (x86)\Inno Setup 6\iscc.exe" "/DVERSION=%VERSION%" "/DQT_DIR=%Qt5_Dir%" "/DPSQL_DIR=C:\msys64\mingw64" "/DSSL_DIR=C:\openssl\bin" quickevent/quickevent.iss
+        "C:\Program Files (x86)\Inno Setup 6\iscc.exe" "/DVERSION=%VERSION%" "/DQT_DIR=%Qt5_Dir%" "/DPSQL_DIR=C:/Program Files/PostgreSQL/14" "/DSSL_DIR=C:\openssl\bin" quickevent/quickevent.iss
       shell: cmd
 
     - name: Save setup

quickevent/quickevent.iss

@@ -63,10 +63,9 @@ Source: {#SSL_DIR}\libcrypto-1_1-x64.dll; DestDir: {app}; Flags: ignoreversion
 Source: {#SSL_DIR}\libssl-1_1-x64.dll; DestDir: {app}; Flags: ignoreversion
 
 Source: {#PSQL_DIR}\bin\libpq.dll; DestDir: {app}; Flags: ignoreversion
-Source: {#PSQL_DIR}\bin\libintl-8.dll; DestDir: {app}; Flags: ignoreversion
+Source: {#PSQL_DIR}\bin\libintl-9.dll; DestDir: {app}; Flags: ignoreversion
 Source: {#PSQL_DIR}\bin\libiconv-2.dll; DestDir: {app}; Flags: ignoreversion
-Source: {#PSQL_DIR}\bin\libxml2-2.dll; DestDir: {app}; Flags: ignoreversion
-Source: {#PSQL_DIR}\bin\liblzma-5.dll; DestDir: {app}; Flags: ignoreversion
+Source: {#PSQL_DIR}\bin\liblz4.dll; DestDir: {app}; Flags: ignoreversion
 Source: {#PSQL_DIR}\bin\zlib1.dll; DestDir: {app}; Flags: ignoreversion
 
 #ifdef INCLUDE_QT