> diff --git 
> a/x11/qt6/qtbase/patches/patch-src_network_ssl_qsslsocket_openssl_symbols_cpp 
> b/x11/qt6/qtbase/patches/patch-src_network_ssl_qsslsocket_openssl_symbols_cpp
> index a845b21c71e..b6cf19f47c5 100644
> --- 
> a/x11/qt6/qtbase/patches/patch-src_network_ssl_qsslsocket_openssl_symbols_cpp
> +++ 
> b/x11/qt6/qtbase/patches/patch-src_network_ssl_qsslsocket_openssl_symbols_cpp
> @@ -1,20 +1,19 @@
>  Index: src/plugins/tls/openssl/qsslsocket_openssl_symbols.cpp
>  --- src/plugins/tls/openssl/qsslsocket_openssl_symbols.cpp.orig
>  +++ src/plugins/tls/openssl/qsslsocket_openssl_symbols.cpp
> -@@ -112,23 +112,37 @@ DEFINEFUNC(const BIO_METHOD *, BIO_s_mem, void, DUMMYA
> +@@ -112,7 +112,11 @@ DEFINEFUNC(const BIO_METHOD *, BIO_s_mem, void, DUMMYA
>   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)
>  +#ifdef OPENSSL_NO_DEPRECATED_3_0
>   DEFINEFUNC2(EVP_PKEY_CTX *, EVP_PKEY_CTX_new, EVP_PKEY *pkey, pkey, ENGINE 
> *e, e, return nullptr, return)
>  +DEFINEFUNC2(EVP_PKEY_CTX *, EVP_PKEY_CTX_new, EVP_PKEY *pkey, pkey, ENGINE 
> *e, e, return nullptr, return)

This entire hunk looks wrong. Is this a git merge accident?

It makes no sense to duplicate the DEFINEFUNC2 line for EVP_PKEY_CTX_new().
The function isn't deprecated in OpenSSL 3, so it shouldn't be wrapped in
#ifdef OPENSSL_NO_DEPRECATED_3_0 in the first place.

> - DEFINEFUNC(int, EVP_PKEY_param_check, EVP_PKEY_CTX *ctx, ctx, return 0, 
> return)
> - DEFINEFUNC(void, EVP_PKEY_CTX_free, EVP_PKEY_CTX *ctx, ctx, return, return)
>  +#endif // OPENSSL_NO_DEPRECATED_3_0
>  +#ifndef LIBRESSL_VERSION_NUMBER
> + DEFINEFUNC(int, EVP_PKEY_param_check, EVP_PKEY_CTX *ctx, ctx, return 0, 
> return)
> + DEFINEFUNC(void, EVP_PKEY_CTX_free, EVP_PKEY_CTX *ctx, ctx, return, return)

Both these functions are available in LibreSSL, so the #ifndef should go
after them. The OPENSSL_sk_*() functions aren't available and we should
use sk_* instead.

>   DEFINEFUNC(int, OPENSSL_sk_num, OPENSSL_STACK *a, a, return -1, return)
> - DEFINEFUNC2(void, OPENSSL_sk_pop_free, OPENSSL_STACK *a, a, void 
> (*b)(void*), b, return, DUMMYARG)
> - DEFINEFUNC(OPENSSL_STACK *, OPENSSL_sk_new_null, DUMMYARG, DUMMYARG, return 
> nullptr, return)
> +@@ -121,14 +125,24 @@ DEFINEFUNC(OPENSSL_STACK *, OPENSSL_sk_new_null, DUMMY
>   DEFINEFUNC2(void, OPENSSL_sk_push, OPENSSL_STACK *a, a, void *b, b, return, 
> DUMMYARG)
>   DEFINEFUNC(void, OPENSSL_sk_free, OPENSSL_STACK *a, a, return, DUMMYARG)
>   DEFINEFUNC2(void *, OPENSSL_sk_value, OPENSSL_STACK *a, a, int b, b, return 
> nullptr, return)
> @@ -25,7 +24,7 @@ Index: 
> src/plugins/tls/openssl/qsslsocket_openssl_symbols.cpp
>  +DEFINEFUNC2(void, sk_push, _STACK *a, a, void *b, b, return, DUMMYARG)
>  +DEFINEFUNC(void, sk_free, _STACK *a, a, return, DUMMYARG)
>  +DEFINEFUNC2(void *, sk_value, STACK *a, a, int b, b, return nullptr, return)
> -+#endif // LIBRESSL_VERSION_NUMBER
> ++#endif // LIBRESSL_VERSION_NUMBE

typo

The entire patch looks like it needs some love, but I can deal with that
once you landed it.

Reply via email to