Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Hotfix QT OpenSSL compatibility #236

Merged
merged 5 commits into from
Aug 12, 2022
Merged

Hotfix QT OpenSSL compatibility #236

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ab59b11
Downgrade to OpenSSL 1.1.1 for QT compatibility
exactly-one-kas Jul 27, 2022
af88605
Revert "Fix packaging for windows deploying old OpenSSL DLLs"
exactly-one-kas Jul 27, 2022
9c0db69
Fix macOS build error
exactly-one-kas Jul 27, 2022
82be7a3
Update version to 1.1.2
exactly-one-kas Aug 12, 2022
5334978
add missing end document line
Murmele Aug 12, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
)
Expand Down
2 changes: 1 addition & 1 deletion dep/openssl/openssl
Open in desktop
Submodule openssl updated 9008 files
10 changes: 10 additions & 0 deletions docs/changelog.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
6 changes: 3 additions & 3 deletions pack/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down