Merge pull request #236 from exactly-one-kas/qt-openssl

Hotfix QT OpenSSL compatibility
Murmele · Aug 12, 2022 · 7fa0bce · 7fa0bce
2 parents 57d7aff + 5334978
commit 7fa0bce
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 5 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -243,6 +243,11 @@ jobs:
         if: matrix.env.ninja_platform == 'mac'
         run: |
           cd dep/openssl/openssl
+
+          # this is necessary until https://github.com/openssl/openssl/issues/18720
+          # is fixed in OpenSSL 1.1.1r
+          export CFLAGS=-Wno-error=implicit-function-declaration
+
           ./Configure ${{ matrix.env.openssl_arch }} no-shared
           make
 

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -5,7 +5,7 @@ project(Gittyup)
 set(GITTYUP_NAME "Gittyup")
 set(GITTYUP_VERSION_MAJOR 1)
 set(GITTYUP_VERSION_MINOR 1)
-set(GITTYUP_VERSION_PATCH 1)
+set(GITTYUP_VERSION_PATCH 2)
 set(GITTYUP_VERSION
     "${GITTYUP_VERSION_MAJOR}.${GITTYUP_VERSION_MINOR}.${GITTYUP_VERSION_PATCH}"
 )

diff --git a/dep/openssl/openssl b/dep/openssl/openssl
diff --git a/docs/changelog.md b/docs/changelog.md
@@ -1,3 +1,13 @@
+### v1.1.2 - 2022-08-12
+
+Bug fix release
+
+#### Changed
+
+* Fix bundled OpenSSL version incompatibility
+
+----
+
 ### v1.1.1 - 2022-06-09
 
 Bug fix release

diff --git a/pack/CMakeLists.txt b/pack/CMakeLists.txt
@@ -149,12 +149,12 @@ if(NOT FLATPAK)
   if(NOT APPLE)
     if(WIN32)
       if(CMAKE_SIZEOF_VOID_P EQUAL 8)
-        set(SSL_LIB_SUFFIX "-3-x64.dll")
+        set(SSL_LIB_SUFFIX "-1_1-x64.dll")
       else()
-        set(SSL_LIB_SUFFIX "-3.dll")
+        set(SSL_LIB_SUFFIX "-1_1.dll")
       endif()
     else()
-      set(SSL_LIB_SUFFIX ".so.3")
+      set(SSL_LIB_SUFFIX ".so.1.1")
     endif()
 
     foreach(SSL_LIB_NAME ssl crypto)