diff options
Diffstat (limited to 'devel/qt6-base/files')
13 files changed, 97 insertions, 62 deletions
diff --git a/devel/qt6-base/files/patch-cmake_QtPkgConfigHelpers.cmake b/devel/qt6-base/files/patch-cmake_QtPkgConfigHelpers.cmake index aaf8eb7bcb2d..d28657a45f25 100644 --- a/devel/qt6-base/files/patch-cmake_QtPkgConfigHelpers.cmake +++ b/devel/qt6-base/files/patch-cmake_QtPkgConfigHelpers.cmake @@ -1,6 +1,6 @@ ---- cmake/QtPkgConfigHelpers.cmake.orig 2023-09-21 19:24:26 UTC +--- cmake/QtPkgConfigHelpers.cmake.orig 2025-02-19 13:05:34 UTC +++ cmake/QtPkgConfigHelpers.cmake -@@ -159,6 +159,6 @@ function(qt_internal_generate_pkg_config_file module) +@@ -174,6 +174,6 @@ function(qt_internal_generate_pkg_config_file module) # This is inspired by https://gitlab.kitware.com/cmake/cmake/-/issues/20842 target_sources(${module} PRIVATE "${final_pc_path}") diff --git a/devel/qt6-base/files/patch-src_corelib_CMakeLists.txt b/devel/qt6-base/files/patch-src_corelib_CMakeLists.txt index febbf2386c27..32dfb0e5e986 100644 --- a/devel/qt6-base/files/patch-src_corelib_CMakeLists.txt +++ b/devel/qt6-base/files/patch-src_corelib_CMakeLists.txt @@ -1,6 +1,6 @@ ---- src/corelib/CMakeLists.txt.orig 2024-11-14 11:02:40 UTC +--- src/corelib/CMakeLists.txt.orig 2025-02-19 13:05:34 UTC +++ src/corelib/CMakeLists.txt -@@ -397,6 +397,10 @@ endif() +@@ -402,6 +402,10 @@ endif() target_link_libraries(Platform INTERFACE Threads::Threads) endif() diff --git a/devel/qt6-base/files/patch-src_corelib_global_qcomparehelpers.h b/devel/qt6-base/files/patch-src_corelib_global_qcomparehelpers.h index cad98022de4a..5d37ac721415 100644 --- a/devel/qt6-base/files/patch-src_corelib_global_qcomparehelpers.h +++ b/devel/qt6-base/files/patch-src_corelib_global_qcomparehelpers.h @@ -7,21 +7,21 @@ qcompare.h that upstream suppresses for GCC. /usr/local/include/qt6/QtCore/qcomparehelpers.h:211:43: note: expanded from macro 'QT_DECLARE_ORDERING_HELPER_TEMPLATE' 211 | { return compareThreeWay(lhs, rhs) >= 0; } ---- src/corelib/global/qcomparehelpers.h.orig 2024-11-12 10:55:11 UTC +--- src/corelib/global/qcomparehelpers.h.orig 2025-02-19 13:05:34 UTC +++ src/corelib/global/qcomparehelpers.h -@@ -242,6 +242,7 @@ template <typename In> constexpr auto to_Qt(In in) noe +@@ -316,6 +316,7 @@ orderingFlagsFor(T t) noexcept #define QT_DECLARE_ORDERING_HELPER_TEMPLATE(OrderingType, LeftType, RightType, Constexpr, \ - Noexcept, Attributes) \ + Noexcept, ...) \ + QT_WARNING_DISABLE_CLANG("-Wzero-as-null-pointer-constant") \ - Attributes \ + __VA_ARGS__ \ friend Constexpr bool operator<(LeftType const &lhs, RightType const &rhs) Noexcept \ { \ -@@ -279,6 +280,7 @@ template <typename In> constexpr auto to_Qt(In in) noe +@@ -357,6 +358,7 @@ orderingFlagsFor(T t) noexcept // Helpers for reversed ordering, using the existing compareThreeWay() function. #define QT_DECLARE_REVERSED_ORDERING_HELPER_TEMPLATE(OrderingType, LeftType, RightType, Constexpr, \ - Noexcept, Attributes) \ + Noexcept, ...) \ + QT_WARNING_DISABLE_CLANG("-Wzero-as-null-pointer-constant") \ - Attributes \ + __VA_ARGS__ \ friend Constexpr bool operator<(RightType const &lhs, LeftType const &rhs) Noexcept \ { return is_gt(compareThreeWay(rhs, lhs)); } \ diff --git a/devel/qt6-base/files/patch-src_corelib_global_qcompilerdetection.h b/devel/qt6-base/files/patch-src_corelib_global_qcompilerdetection.h index fe3f15c482e9..5047f42ef687 100644 --- a/devel/qt6-base/files/patch-src_corelib_global_qcompilerdetection.h +++ b/devel/qt6-base/files/patch-src_corelib_global_qcompilerdetection.h @@ -5,14 +5,14 @@ error: use of the 'nodiscard' attribute is a C++20 extension https://github.com/llvm/llvm-project/issues/32865 ---- src/corelib/global/qcompilerdetection.h.orig 2024-11-14 11:02:40 UTC +--- src/corelib/global/qcompilerdetection.h.orig 2025-05-28 10:22:57 UTC +++ src/corelib/global/qcompilerdetection.h -@@ -959,7 +959,7 @@ +@@ -966,7 +966,7 @@ # define Q_REQUIRED_RESULT [[nodiscard]] #endif --#if __has_cpp_attribute(nodiscard) >= 201907L /* used for both P1771 and P1301... */ -+#if __has_cpp_attribute(nodiscard) >= 201907L && (!defined(Q_CC_CLANG) || __cplusplus >= 201907L) /* used for both P1771 and P1301... */ +-#if (defined(__cplusplus) && __has_cpp_attribute(nodiscard) >= 201907L /* used for both P1771 and P1301... */) \ ++#if (defined(__cplusplus) && __has_cpp_attribute(nodiscard) >= 201907L && (!defined(Q_CC_CLANG) || __cplusplus >= 201907L) /* used for both P1771 and P1301... */) \ + || (!defined(__cplusplus) && __has_c_attribute(nodiscard) /* N2448 */) // [[nodiscard]] constructor (P1771) # ifndef Q_NODISCARD_CTOR - # define Q_NODISCARD_CTOR [[nodiscard]] diff --git a/devel/qt6-base/files/patch-src_corelib_kernel_qeventdispatcher__glib.cpp b/devel/qt6-base/files/patch-src_corelib_kernel_qeventdispatcher__glib.cpp new file mode 100644 index 000000000000..1c20f8d819fc --- /dev/null +++ b/devel/qt6-base/files/patch-src_corelib_kernel_qeventdispatcher__glib.cpp @@ -0,0 +1,17 @@ +https://codereview.qt-project.org/c/qt/qtbase/+/651677 + +--- src/corelib/kernel/qeventdispatcher_glib.cpp.orig 2025-02-13 17:45:28 UTC ++++ src/corelib/kernel/qeventdispatcher_glib.cpp +@@ -434,10 +434,10 @@ void QEventDispatcherGlib::registerSocketNotifier(QSoc + p->pollfd.events = G_IO_IN | G_IO_HUP | G_IO_ERR; + break; + case QSocketNotifier::Write: +- p->pollfd.events = G_IO_OUT | G_IO_ERR; ++ p->pollfd.events = G_IO_OUT | G_IO_HUP | G_IO_ERR; + break; + case QSocketNotifier::Exception: +- p->pollfd.events = G_IO_PRI | G_IO_ERR; ++ p->pollfd.events = G_IO_PRI | G_IO_HUP | G_IO_ERR; + break; + } + p->socketNotifier = notifier; diff --git a/devel/qt6-base/files/patch-src_network_socket_qnativesocketengine__unix.cpp b/devel/qt6-base/files/patch-src_network_socket_qnativesocketengine__unix.cpp new file mode 100644 index 000000000000..a61cd8a94a13 --- /dev/null +++ b/devel/qt6-base/files/patch-src_network_socket_qnativesocketengine__unix.cpp @@ -0,0 +1,13 @@ +https://codereview.qt-project.org/c/qt/qtbase/+/651678 + +--- src/network/socket/qnativesocketengine_unix.cpp.orig 2025-06-08 12:42:24 UTC ++++ src/network/socket/qnativesocketengine_unix.cpp +@@ -1379,7 +1379,7 @@ int QNativeSocketEnginePrivate::nativeSelect(QDeadline + } + + static const short read_flags = POLLIN | POLLHUP | POLLERR; +- static const short write_flags = POLLOUT | POLLERR; ++ static const short write_flags = POLLOUT | POLLHUP | POLLERR; + + *selectForRead = ((pfd.revents & read_flags) != 0); + *selectForWrite = ((pfd.revents & write_flags) != 0); diff --git a/devel/qt6-base/files/patch-src_platformsupport_devicediscovery_qdevicediscovery__static.cpp b/devel/qt6-base/files/patch-src_platformsupport_devicediscovery_qdevicediscovery__static.cpp index 3d9fef9324c9..1ee06b28634b 100644 --- a/devel/qt6-base/files/patch-src_platformsupport_devicediscovery_qdevicediscovery__static.cpp +++ b/devel/qt6-base/files/patch-src_platformsupport_devicediscovery_qdevicediscovery__static.cpp @@ -1,13 +1,14 @@ ---- src/platformsupport/devicediscovery/qdevicediscovery_static.cpp.orig 2024-09-18 16:48:24 UTC +--- src/platformsupport/devicediscovery/qdevicediscovery_static.cpp.orig 2025-02-19 13:05:34 UTC +++ src/platformsupport/devicediscovery/qdevicediscovery_static.cpp -@@ -11,9 +11,7 @@ +@@ -11,11 +11,7 @@ #include <QLoggingCategory> #include <QtCore/private/qcore_unix_p.h> -#ifdef Q_OS_FREEBSD -#include <dev/evdev/input.h> --#elif defined(Q_OS_VXWORKS) -+#if defined(Q_OS_VXWORKS) - #include <evdevLib.h> - #define ABS_X EV_DEV_PTR_ABS_X - #else +-#else + #include <linux/input.h> +-#endif + #include <fcntl.h> + + /* android (and perhaps some other linux-derived stuff) don't define everything diff --git a/devel/qt6-base/files/patch-src_platformsupport_input_evdevkeyboard_qevdevkeyboard__defaultmap__p.h b/devel/qt6-base/files/patch-src_platformsupport_input_evdevkeyboard_qevdevkeyboard__defaultmap__p.h index 9758fa6d2577..54be3f5036af 100644 --- a/devel/qt6-base/files/patch-src_platformsupport_input_evdevkeyboard_qevdevkeyboard__defaultmap__p.h +++ b/devel/qt6-base/files/patch-src_platformsupport_input_evdevkeyboard_qevdevkeyboard__defaultmap__p.h @@ -1,13 +1,14 @@ ---- src/platformsupport/input/evdevkeyboard/qevdevkeyboard_defaultmap_p.h.orig 2024-09-18 16:48:24 UTC +--- src/platformsupport/input/evdevkeyboard/qevdevkeyboard_defaultmap_p.h.orig 2025-02-19 13:05:34 UTC +++ src/platformsupport/input/evdevkeyboard/qevdevkeyboard_defaultmap_p.h -@@ -17,9 +17,7 @@ +@@ -19,11 +19,7 @@ + #include <QtInputSupport/private/qkeyboardmap_p.h> - #include "qnamespace.h" #include "private/qglobal_p.h" -#ifdef Q_OS_FREEBSD -#include <dev/evdev/input.h> --#elif !defined(Q_OS_VXWORKS) -+#if !defined(Q_OS_VXWORKS) +-#else #include "linux/input.h" - #endif +-#endif + + // no QT_BEGIN_NAMESPACE, since we include it internally... diff --git a/devel/qt6-base/files/patch-src_platformsupport_input_evdevkeyboard_qevdevkeyboardhandler.cpp b/devel/qt6-base/files/patch-src_platformsupport_input_evdevkeyboard_qevdevkeyboardhandler.cpp index f6c12d7e0838..f3d5f982e63c 100644 --- a/devel/qt6-base/files/patch-src_platformsupport_input_evdevkeyboard_qevdevkeyboardhandler.cpp +++ b/devel/qt6-base/files/patch-src_platformsupport_input_evdevkeyboard_qevdevkeyboardhandler.cpp @@ -1,13 +1,14 @@ ---- src/platformsupport/input/evdevkeyboard/qevdevkeyboardhandler.cpp.orig 2024-09-18 16:48:24 UTC +--- src/platformsupport/input/evdevkeyboard/qevdevkeyboardhandler.cpp.orig 2025-02-19 13:05:34 UTC +++ src/platformsupport/input/evdevkeyboard/qevdevkeyboardhandler.cpp -@@ -17,9 +17,7 @@ +@@ -17,11 +17,7 @@ #include <QtGui/private/qguiapplication_p.h> #include <QtGui/private/qinputdevicemanager_p.h> -#ifdef Q_OS_FREEBSD -#include <dev/evdev/input.h> --#elif defined(Q_OS_VXWORKS) -+#if defined(Q_OS_VXWORKS) - #include <evdevLib.h> - #else +-#else #include <linux/input.h> +-#endif + + #ifndef input_event_sec + #define input_event_sec time.tv_sec diff --git a/devel/qt6-base/files/patch-src_platformsupport_input_evdevtablet_qevdevtablethandler.cpp b/devel/qt6-base/files/patch-src_platformsupport_input_evdevtablet_qevdevtablethandler.cpp index eab2816a23c0..2eac7348aecf 100644 --- a/devel/qt6-base/files/patch-src_platformsupport_input_evdevtablet_qevdevtablethandler.cpp +++ b/devel/qt6-base/files/patch-src_platformsupport_input_evdevtablet_qevdevtablethandler.cpp @@ -1,13 +1,14 @@ ---- src/platformsupport/input/evdevtablet/qevdevtablethandler.cpp.orig 2024-09-18 16:48:24 UTC +--- src/platformsupport/input/evdevtablet/qevdevtablethandler.cpp.orig 2025-02-19 13:05:34 UTC +++ src/platformsupport/input/evdevtablet/qevdevtablethandler.cpp -@@ -10,9 +10,7 @@ +@@ -10,11 +10,7 @@ #include <QLoggingCategory> #include <QtCore/private/qcore_unix_p.h> #include <qpa/qwindowsysteminterface.h> -#ifdef Q_OS_FREEBSD -#include <dev/evdev/input.h> --#elif defined(Q_OS_VXWORKS) -+#if defined(Q_OS_VXWORKS) - #include <qpa/qplatformscreen.h> - #include <evdevLib.h> - #define SYN_REPORT 0 +-#else + #include <linux/input.h> +-#endif + + QT_BEGIN_NAMESPACE + diff --git a/devel/qt6-base/files/patch-src_platformsupport_input_evdevtouch_qevdevtouchhandler.cpp b/devel/qt6-base/files/patch-src_platformsupport_input_evdevtouch_qevdevtouchhandler.cpp index 0d76065f028a..9b553ea8f5c8 100644 --- a/devel/qt6-base/files/patch-src_platformsupport_input_evdevtouch_qevdevtouchhandler.cpp +++ b/devel/qt6-base/files/patch-src_platformsupport_input_evdevtouch_qevdevtouchhandler.cpp @@ -1,13 +1,14 @@ ---- src/platformsupport/input/evdevtouch/qevdevtouchhandler.cpp.orig 2024-09-18 16:48:24 UTC +--- src/platformsupport/input/evdevtouch/qevdevtouchhandler.cpp.orig 2025-02-19 13:05:34 UTC +++ src/platformsupport/input/evdevtouch/qevdevtouchhandler.cpp -@@ -19,9 +19,7 @@ +@@ -19,11 +19,7 @@ #include <mutex> -#ifdef Q_OS_FREEBSD -#include <dev/evdev/input.h> --#elif defined(Q_OS_VXWORKS) -+#if defined(Q_OS_VXWORKS) - #include <qpa/qplatformscreen.h> - #include <evdevLib.h> - #define SYN_REPORT 0 +-#else + #include <linux/input.h> +-#endif + + #ifndef input_event_sec + #define input_event_sec time.tv_sec diff --git a/devel/qt6-base/files/patch-src_plugins_tls_openssl_qsslcontext__openssl.cpp b/devel/qt6-base/files/patch-src_plugins_tls_openssl_qsslcontext__openssl.cpp index 3f65f6206cf6..02dc9a1f8e2a 100644 --- a/devel/qt6-base/files/patch-src_plugins_tls_openssl_qsslcontext__openssl.cpp +++ b/devel/qt6-base/files/patch-src_plugins_tls_openssl_qsslcontext__openssl.cpp @@ -1,4 +1,4 @@ ---- src/plugins/tls/openssl/qsslcontext_openssl.cpp.orig 2023-09-15 10:20:51 UTC +--- src/plugins/tls/openssl/qsslcontext_openssl.cpp.orig 2025-02-19 13:05:34 UTC +++ src/plugins/tls/openssl/qsslcontext_openssl.cpp @@ -49,9 +49,9 @@ extern "C" int q_verify_cookie_callback(SSL *ssl, cons } @@ -49,7 +49,7 @@ QSharedPointer<SSL_CONF_CTX> cctx(q_SSL_CONF_CTX_new(), &q_SSL_CONF_CTX_free); if (cctx) { q_SSL_CONF_CTX_set_ssl_ctx(cctx.data(), sslContext->ctx); -@@ -806,7 +809,9 @@ void QSslContext::applyBackendConfig(QSslContext *sslC +@@ -803,7 +806,9 @@ void QSslContext::applyBackendConfig(QSslContext *sslC sslContext->errorStr = msgErrorSettingBackendConfig(QSslSocket::tr("SSL_CONF_finish() failed")); sslContext->errorCode = QSslError::UnspecifiedError; } diff --git a/devel/qt6-base/files/patch-src_plugins_tls_openssl_qsslsocket__openssl__symbols.cpp b/devel/qt6-base/files/patch-src_plugins_tls_openssl_qsslsocket__openssl__symbols.cpp index b8f5dfd475da..23d57861e45e 100644 --- a/devel/qt6-base/files/patch-src_plugins_tls_openssl_qsslsocket__openssl__symbols.cpp +++ b/devel/qt6-base/files/patch-src_plugins_tls_openssl_qsslsocket__openssl__symbols.cpp @@ -1,6 +1,6 @@ ---- src/plugins/tls/openssl/qsslsocket_openssl_symbols.cpp.orig 2024-03-19 15:46:43 UTC +--- src/plugins/tls/openssl/qsslsocket_openssl_symbols.cpp.orig 2025-02-19 13:05:34 UTC +++ src/plugins/tls/openssl/qsslsocket_openssl_symbols.cpp -@@ -112,23 +112,36 @@ DEFINEFUNC(int, EVP_PKEY_up_ref, EVP_PKEY *a, a, retur +@@ -113,23 +113,36 @@ DEFINEFUNC(int, EVP_PKEY_up_ref, EVP_PKEY *a, a, retur DEFINEFUNC2(int, BN_is_word, BIGNUM *a, a, BN_ULONG w, w, return 0, return) DEFINEFUNC(int, EVP_CIPHER_CTX_reset, EVP_CIPHER_CTX *c, c, return 0, return) DEFINEFUNC(int, EVP_PKEY_up_ref, EVP_PKEY *a, a, return 0, return) @@ -37,7 +37,7 @@ #ifdef TLS1_3_VERSION DEFINEFUNC2(int, SSL_CTX_set_ciphersuites, SSL_CTX *ctx, ctx, const char *str, str, return 0, return) DEFINEFUNC2(void, SSL_set_psk_use_session_callback, SSL *ssl, ssl, q_SSL_psk_use_session_cb_func_t callback, callback, return, DUMMYARG) -@@ -193,7 +206,9 @@ DEFINEFUNC2(OCSP_RESPONSE *, OCSP_response_create, int +@@ -194,7 +207,9 @@ DEFINEFUNC2(OCSP_RESPONSE *, OCSP_response_create, int ASN1_OCTET_STRING **piKeyHash, piKeyHash, ASN1_INTEGER **pserial, pserial, OCSP_CERTID *cid, cid, return 0, return) DEFINEFUNC2(OCSP_RESPONSE *, OCSP_response_create, int status, status, OCSP_BASICRESP *bs, bs, return nullptr, return) @@ -47,7 +47,7 @@ DEFINEFUNC2(int, OCSP_id_cmp, OCSP_CERTID *a, a, OCSP_CERTID *b, b, return -1, return) DEFINEFUNC7(OCSP_SINGLERESP *, OCSP_basic_add1_status, OCSP_BASICRESP *r, r, OCSP_CERTID *c, c, int s, s, int re, re, ASN1_TIME *rt, rt, ASN1_TIME *t, t, ASN1_TIME *n, n, return nullptr, return) -@@ -214,7 +229,9 @@ DEFINEFUNC2(int, ASN1_STRING_to_UTF8, unsigned char ** +@@ -215,7 +230,9 @@ DEFINEFUNC2(int, ASN1_STRING_to_UTF8, unsigned char ** DEFINEFUNC2(int, ASN1_INTEGER_cmp, const ASN1_INTEGER *a, a, const ASN1_INTEGER *b, b, return 1, return) DEFINEFUNC(int, ASN1_STRING_length, ASN1_STRING *a, a, return 0, return) DEFINEFUNC2(int, ASN1_STRING_to_UTF8, unsigned char **a, a, ASN1_STRING *b, b, return 0, return) @@ -57,7 +57,7 @@ DEFINEFUNC4(long, BIO_ctrl, BIO *a, a, int b, b, long c, c, void *d, d, return -1, return) DEFINEFUNC(int, BIO_free, BIO *a, a, return 0, return) DEFINEFUNC2(BIO *, BIO_new_mem_buf, void *a, a, int b, b, return nullptr, return) -@@ -289,12 +306,14 @@ DEFINEFUNC(X509_STORE *, SSL_CTX_get_cert_store, const +@@ -290,12 +307,14 @@ DEFINEFUNC(X509_STORE *, SSL_CTX_get_cert_store, const DEFINEFUNC2(int, SSL_CTX_use_PrivateKey, SSL_CTX *a, a, EVP_PKEY *b, b, return -1, return) DEFINEFUNC3(int, SSL_CTX_use_PrivateKey_file, SSL_CTX *a, a, const char *b, b, int c, c, return -1, return) DEFINEFUNC(X509_STORE *, SSL_CTX_get_cert_store, const SSL_CTX *a, a, return nullptr, return) @@ -72,7 +72,7 @@ DEFINEFUNC(void, SSL_free, SSL *a, a, return, DUMMYARG) DEFINEFUNC(STACK_OF(SSL_CIPHER) *, SSL_get_ciphers, const SSL *a, a, return nullptr, return) DEFINEFUNC(const SSL_CIPHER *, SSL_get_current_cipher, SSL *a, a, return nullptr, return) -@@ -761,8 +780,8 @@ static LoadedOpenSsl loadOpenSsl() +@@ -764,8 +783,8 @@ static LoadedOpenSsl loadOpenSsl() libcrypto->setFileNameAndVersion("crypto"_L1, shlibVersion); #elif defined(SHLIB_VERSION_NUMBER) // first attempt: the canonical name is libssl.so.<SHLIB_VERSION_NUMBER> @@ -83,7 +83,7 @@ #endif // OPENSSL_SHLIB_VERSION if (libcrypto->load() && libssl->load()) { -@@ -795,8 +814,8 @@ static LoadedOpenSsl loadOpenSsl() +@@ -798,8 +817,8 @@ static LoadedOpenSsl loadOpenSsl() libssl->setFileNameAndVersion("ssl"_L1 + suffix, -1); libcrypto->setFileNameAndVersion("crypto"_L1 + suffix, -1); # else @@ -94,7 +94,7 @@ # endif if (libcrypto->load() && libssl->load()) { // libssl.so.0 and libcrypto.so.0 found -@@ -865,21 +884,34 @@ bool q_resolveOpenSslSymbols() +@@ -868,21 +887,34 @@ bool q_resolveOpenSslSymbols() RESOLVEFUNC(EVP_CIPHER_CTX_reset) RESOLVEFUNC(AUTHORITY_INFO_ACCESS_free) RESOLVEFUNC(EVP_PKEY_up_ref) @@ -129,7 +129,7 @@ #ifdef TLS1_3_VERSION RESOLVEFUNC(SSL_CTX_set_ciphersuites) RESOLVEFUNC(SSL_set_psk_use_session_callback) -@@ -961,7 +993,9 @@ bool q_resolveOpenSslSymbols() +@@ -964,7 +996,9 @@ bool q_resolveOpenSslSymbols() RESOLVEFUNC(OCSP_check_validity) RESOLVEFUNC(OCSP_cert_to_id) RESOLVEFUNC(OCSP_id_get0_info) @@ -140,7 +140,7 @@ RESOLVEFUNC(OCSP_basic_sign) RESOLVEFUNC(OCSP_response_create) RESOLVEFUNC(i2d_OCSP_RESPONSE) -@@ -1056,12 +1090,14 @@ bool q_resolveOpenSslSymbols() +@@ -1059,12 +1093,14 @@ bool q_resolveOpenSslSymbols() RESOLVEFUNC(SSL_CTX_use_PrivateKey) RESOLVEFUNC(SSL_CTX_use_PrivateKey_file) RESOLVEFUNC(SSL_CTX_get_cert_store); @@ -155,7 +155,7 @@ RESOLVEFUNC(SSL_accept) RESOLVEFUNC(SSL_clear) RESOLVEFUNC(SSL_connect) -@@ -1121,7 +1157,9 @@ bool q_resolveOpenSslSymbols() +@@ -1124,7 +1160,9 @@ bool q_resolveOpenSslSymbols() RESOLVEFUNC(RSA_free) RESOLVEFUNC(DH_bits) |