From 153db55519cfec3dc0167550b8ea2f097adbd0e4 Mon Sep 17 00:00:00 2001 From: Cameron Gutman Date: Thu, 29 Aug 2024 23:28:08 -0500 Subject: [PATCH] Replace OpenSSL static libs with dylibs to enable Qt OpenSSL TLS plugin SecureTransport is deprecated, stuck on TLS 1.2, and seems prone to random breakage in OS updates (see #1355). --- app/app.pro | 2 +- libs | 2 +- scripts/clean-libs.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/app.pro b/app/app.pro index a712cb0d..740f0103 100644 --- a/app/app.pro +++ b/app/app.pro @@ -156,7 +156,7 @@ win32:!winrt { } macx { !disable-prebuilts { - LIBS += -lssl -lcrypto -lavcodec.61 -lavutil.59 -lswscale.8 -lopus -framework SDL2 -framework SDL2_ttf + LIBS += -lssl.3 -lcrypto.3 -lavcodec.61 -lavutil.59 -lswscale.8 -lopus -framework SDL2 -framework SDL2_ttf CONFIG += discord-rpc } diff --git a/libs b/libs index 77f06dd9..5e4c03ca 160000 --- a/libs +++ b/libs @@ -1 +1 @@ -Subproject commit 77f06dd92d960881c912fa8483ce2996cbdb9802 +Subproject commit 5e4c03cad562dfd1030537bea8e0aeac7b38a5f8 diff --git a/scripts/clean-libs.sh b/scripts/clean-libs.sh index c96cde25..7049039b 100755 --- a/scripts/clean-libs.sh +++ b/scripts/clean-libs.sh @@ -42,7 +42,7 @@ while [[ "$#" -gt 0 ]]; do ;; --openssl_mac) rm -r $LIB_PATH/mac/include/openssl - rm $LIB_PATH/mac/lib/libssl.a $LIB_PATH/mac/lib/libcrypto.a + rm $LIB_PATH/mac/lib/libssl*.dylib $LIB_PATH/mac/lib/libcrypto*.dylib shift ;; --ffmpeg_win)