From 0e0ba7dcb9f96307867ead3f382d1b922e6538ba Mon Sep 17 00:00:00 2001 From: John Date: Fri, 20 Nov 2020 23:02:49 +0100 Subject: [PATCH] qt5: update to 5.15.2. --- .../qt5/patches/0060-upstream-65243ad7.patch | 87 ------------------- .../patches/qtnetwork-5.15.0-libressl.patch | 74 +++++++++++----- srcpkgs/qt5/template | 6 +- 3 files changed, 54 insertions(+), 113 deletions(-) delete mode 100644 srcpkgs/qt5/patches/0060-upstream-65243ad7.patch diff --git a/srcpkgs/qt5/patches/0060-upstream-65243ad7.patch b/srcpkgs/qt5/patches/0060-upstream-65243ad7.patch deleted file mode 100644 index d11ae1d886..0000000000 --- a/srcpkgs/qt5/patches/0060-upstream-65243ad7.patch +++ /dev/null @@ -1,87 +0,0 @@ -From 65243ad7aef48af4689ea4454916b504025b5051 Mon Sep 17 00:00:00 2001 -From: Friedemann Kleint -Date: Fri, 25 Sep 2020 14:10:58 +0200 -Subject: Emit QScreen::geometryChanged when the logical DPI changes - -Add the missing call to QScreenPrivate::emitGeometryChangeSignals() -along with an emission of physicalDotsPerInchChanged() -since that is calculated from geometry and physical size. - -Rearrange the code in -QGuiApplicationPrivate::processScreenGeometryChange() -to prevent duplicate emissions of geometryChanged(), -physicalDotsPerInchChanged() which this change would introduce. - -Amends 5290027e3bab75f14fc0a2b7c206594d9cb91e76. - -Task-number: QTBUG-76902 -Task-number: QTBUG-79248 -Fixes: QTBUG-86604 -Change-Id: I3dc2ec5ccd9c6413e92f9246242f323e8afc5e57 -Reviewed-by: David Edmundson -(cherry picked from commit 5c7307775d32ae0a54acad8ae7a1c9d3cff7d45e) -Reviewed-by: Qt Cherry-pick Bot ---- - src/gui/kernel/qguiapplication.cpp | 11 +++++------ - src/gui/kernel/qscreen.cpp | 6 ++++++ - 2 files changed, 11 insertions(+), 6 deletions(-) - -diff --git a/src/gui/kernel/qguiapplication.cpp b/src/gui/kernel/qguiapplication.cpp -index 239a78313c..ef09060581 100644 ---- qtbase/src/gui/kernel/qguiapplication.cpp -+++ qtbase/src/gui/kernel/qguiapplication.cpp -@@ -3162,13 +3162,14 @@ void QGuiApplicationPrivate::processScreenGeometryChange(QWindowSystemInterfaceP - bool availableGeometryChanged = e->availableGeometry != s->d_func()->availableGeometry; - s->d_func()->availableGeometry = e->availableGeometry; - -- if (geometryChanged) { -- Qt::ScreenOrientation primaryOrientation = s->primaryOrientation(); -+ const Qt::ScreenOrientation primaryOrientation = s->primaryOrientation(); -+ if (geometryChanged) - s->d_func()->updatePrimaryOrientation(); - -- emit s->geometryChanged(s->geometry()); -+ s->d_func()->emitGeometryChangeSignals(geometryChanged, availableGeometryChanged); -+ -+ if (geometryChanged) { - emit s->physicalSizeChanged(s->physicalSize()); -- emit s->physicalDotsPerInchChanged(s->physicalDotsPerInch()); - emit s->logicalDotsPerInchChanged(s->logicalDotsPerInch()); - - if (s->primaryOrientation() != primaryOrientation) -@@ -3178,8 +3179,6 @@ void QGuiApplicationPrivate::processScreenGeometryChange(QWindowSystemInterfaceP - updateFilteredScreenOrientation(s); - } - -- s->d_func()->emitGeometryChangeSignals(geometryChanged, availableGeometryChanged); -- - resetCachedDevicePixelRatio(); - } - -diff --git a/src/gui/kernel/qscreen.cpp b/src/gui/kernel/qscreen.cpp -index df628fcc73..a1afc1ba14 100644 ---- qtbase/src/gui/kernel/qscreen.cpp -+++ qtbase/src/gui/kernel/qscreen.cpp -@@ -88,6 +88,9 @@ void QScreenPrivate::updateGeometriesWithSignals() - void QScreenPrivate::emitGeometryChangeSignals(bool geometryChanged, bool availableGeometryChanged) - { - Q_Q(QScreen); -+ if (geometryChanged) -+ emit q->geometryChanged(geometry); -+ - if (availableGeometryChanged) - emit q->availableGeometryChanged(availableGeometry); - -@@ -96,6 +99,9 @@ void QScreenPrivate::emitGeometryChangeSignals(bool geometryChanged, bool availa - for (QScreen* sibling : siblings) - emit sibling->virtualGeometryChanged(sibling->virtualGeometry()); - } -+ -+ if (geometryChanged) -+ emit q->physicalDotsPerInchChanged(q->physicalDotsPerInch()); - } - - void QScreenPrivate::setPlatformScreen(QPlatformScreen *screen) --- -cgit v1.2.1 - diff --git a/srcpkgs/qt5/patches/qtnetwork-5.15.0-libressl.patch b/srcpkgs/qt5/patches/qtnetwork-5.15.0-libressl.patch index 838d6f0597..997e68156c 100644 --- a/srcpkgs/qt5/patches/qtnetwork-5.15.0-libressl.patch +++ b/srcpkgs/qt5/patches/qtnetwork-5.15.0-libressl.patch @@ -1,19 +1,20 @@ -From 4774fcd31a49f6f193bf10990601ad494fab2013 Mon Sep 17 00:00:00 2001 +From 2aa448121ff62e104d333f192a7f19fc76d0cf19 Mon Sep 17 00:00:00 2001 From: Stefan Strogin Date: Wed, 5 Feb 2020 03:49:35 +0200 -Subject: [PATCH] QSslSocket - add LibreSSL support +Subject: [PATCH] [PATCH] QSslSocket - add LibreSSL support Upstream-Status: Inappropriate [Upstream is not willing to accept any patches for LibreSSL support] Signed-off-by: Stefan Strogin --- src/network/ssl/qsslcertificate_openssl.cpp | 2 +- - src/network/ssl/qsslcontext_openssl.cpp | 17 +++++++- + src/network/ssl/qsslcontext_openssl.cpp | 19 +++++++- src/network/ssl/qsslcontext_openssl_p.h | 7 +++ + src/network/ssl/qsslkey_openssl.cpp | 2 +- src/network/ssl/qsslsocket_openssl.cpp | 2 +- - .../ssl/qsslsocket_openssl_symbols.cpp | 25 +++++++++++ - .../ssl/qsslsocket_openssl_symbols_p.h | 43 +++++++++++++++++++ - 6 files changed, 93 insertions(+), 3 deletions(-) + .../ssl/qsslsocket_openssl_symbols.cpp | 37 ++++++++++++++- + .../ssl/qsslsocket_openssl_symbols_p.h | 45 ++++++++++++++++++- + 7 files changed, 107 insertions(+), 7 deletions(-) diff --git qtbase/src/network/ssl/qsslcertificate_openssl.cpp qtbase/src/network/ssl/qsslcertificate_openssl.cpp index ca9d61ccb1..19774432ce 100644 @@ -29,10 +30,22 @@ index ca9d61ccb1..19774432ce 100644 #else q_CRYPTO_free(data); diff --git qtbase/src/network/ssl/qsslcontext_openssl.cpp qtbase/src/network/ssl/qsslcontext_openssl.cpp -index abc398b209..c2f90be009 100644 +index c9f202f573..2ecdbbb7e5 100644 --- qtbase/src/network/ssl/qsslcontext_openssl.cpp +++ qtbase/src/network/ssl/qsslcontext_openssl.cpp -@@ -397,16 +397,28 @@ init_context: +@@ -351,9 +351,11 @@ init_context: + return; + } + ++#ifndef LIBRESSL_VERSION_NUMBER + // A nasty hacked OpenSSL using a level that will make our auto-tests fail: + if (q_SSL_CTX_get_security_level(sslContext->ctx) > 1 && *forceSecurityLevel()) + q_SSL_CTX_set_security_level(sslContext->ctx, 1); ++#endif + + const long anyVersion = + #if QT_CONFIG(dtls) +@@ -408,16 +410,28 @@ init_context: maxVersion = DTLS1_VERSION; break; case QSsl::DtlsV1_0OrLater: @@ -61,7 +74,7 @@ index abc398b209..c2f90be009 100644 break; case QSsl::TlsV1_3OrLater: #ifdef TLS1_3_VERSION -@@ -711,6 +723,7 @@ void QSslContext::applyBackendConfig(QSslContext *sslContext) +@@ -722,6 +736,7 @@ void QSslContext::applyBackendConfig(QSslContext *sslContext) } #endif // ocsp @@ -69,7 +82,7 @@ index abc398b209..c2f90be009 100644 QSharedPointer cctx(q_SSL_CONF_CTX_new(), &q_SSL_CONF_CTX_free); if (cctx) { q_SSL_CONF_CTX_set_ssl_ctx(cctx.data(), sslContext->ctx); -@@ -757,7 +770,9 @@ void QSslContext::applyBackendConfig(QSslContext *sslContext) +@@ -768,7 +783,9 @@ void QSslContext::applyBackendConfig(QSslContext *sslContext) sslContext->errorStr = msgErrorSettingBackendConfig(QSslSocket::tr("SSL_CONF_finish() failed")); sslContext->errorCode = QSslError::UnspecifiedError; } @@ -125,7 +138,7 @@ index 277037e59c..f599498df5 100644 if (mode == QSslSocket::SslClientMode && QSslSocket::sslLibraryBuildVersionNumber() >= 0x10101006L) { diff --git qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp -index 2f57998cea..a3eb363385 100644 +index ed80fc14bd..bad2ee2e41 100644 --- qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp +++ qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp @@ -146,10 +146,13 @@ DEFINEFUNC2(int, BN_is_word, BIGNUM *a, a, BN_ULONG w, w, return 0, return) @@ -142,7 +155,7 @@ index 2f57998cea..a3eb363385 100644 DEFINEFUNC(int, DSA_bits, DSA *a, a, return 0, return) 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) -@@ -157,6 +160,14 @@ DEFINEFUNC(OPENSSL_STACK *, OPENSSL_sk_new_null, DUMMYARG, DUMMYARG, return null +@@ -157,10 +160,20 @@ DEFINEFUNC(OPENSSL_STACK *, OPENSSL_sk_new_null, DUMMYARG, DUMMYARG, return null 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) @@ -156,8 +169,14 @@ index 2f57998cea..a3eb363385 100644 +#endif // LIBRESSL_VERSION_NUMBER DEFINEFUNC(int, SSL_session_reused, SSL *a, a, return 0, return) DEFINEFUNC2(unsigned long, SSL_CTX_set_options, SSL_CTX *ctx, ctx, unsigned long op, op, return 0, return) ++#ifndef LIBRESSL_VERSION_NUMBER + DEFINEFUNC(int, SSL_CTX_get_security_level, const SSL_CTX *ctx, ctx, return -1, return) + DEFINEFUNC2(void, SSL_CTX_set_security_level, SSL_CTX *ctx, ctx, int level, level, return, return) ++#endif #ifdef TLS1_3_VERSION -@@ -182,7 +193,11 @@ DEFINEFUNC2(void, X509_STORE_set_verify_cb, X509_STORE *a, a, X509_STORE_CTX_ver + 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) +@@ -184,7 +197,11 @@ DEFINEFUNC2(void, X509_STORE_set_verify_cb, X509_STORE *a, a, X509_STORE_CTX_ver DEFINEFUNC3(int, X509_STORE_set_ex_data, X509_STORE *a, a, int idx, idx, void *data, data, return 0, return) DEFINEFUNC2(void *, X509_STORE_get_ex_data, X509_STORE *r, r, int idx, idx, return nullptr, return) DEFINEFUNC(STACK_OF(X509) *, X509_STORE_CTX_get0_chain, X509_STORE_CTX *a, a, return nullptr, return) @@ -169,7 +188,7 @@ index 2f57998cea..a3eb363385 100644 DEFINEFUNC(long, OpenSSL_version_num, void, DUMMYARG, return 0, return) DEFINEFUNC(const char *, OpenSSL_version, int a, a, return nullptr, return) DEFINEFUNC(unsigned long, SSL_SESSION_get_ticket_lifetime_hint, const SSL_SESSION *session, session, return 0, return) -@@ -222,7 +237,9 @@ DEFINEFUNC5(int, OCSP_id_get0_info, ASN1_OCTET_STRING **piNameHash, piNameHash, +@@ -224,7 +241,9 @@ DEFINEFUNC5(int, OCSP_id_get0_info, ASN1_OCTET_STRING **piNameHash, piNameHash, 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) @@ -179,7 +198,7 @@ index 2f57998cea..a3eb363385 100644 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) -@@ -267,7 +284,7 @@ DEFINEFUNC2(int, EVP_CIPHER_CTX_set_key_length, EVP_CIPHER_CTX *ctx, ctx, int ke +@@ -269,7 +288,7 @@ DEFINEFUNC2(int, EVP_CIPHER_CTX_set_key_length, EVP_CIPHER_CTX *ctx, ctx, int ke DEFINEFUNC5(int, EVP_CipherInit, EVP_CIPHER_CTX *ctx, ctx, const EVP_CIPHER *type, type, const unsigned char *key, key, const unsigned char *iv, iv, int enc, enc, return 0, return) DEFINEFUNC6(int, EVP_CipherInit_ex, EVP_CIPHER_CTX *ctx, ctx, const EVP_CIPHER *cipher, cipher, ENGINE *impl, impl, const unsigned char *key, key, const unsigned char *iv, iv, int enc, enc, return 0, return) DEFINEFUNC5(int, EVP_CipherUpdate, EVP_CIPHER_CTX *ctx, ctx, unsigned char *out, out, int *outl, outl, const unsigned char *in, in, int inl, inl, return 0, return) @@ -188,7 +207,7 @@ index 2f57998cea..a3eb363385 100644 DEFINEFUNC(const EVP_MD *, EVP_get_digestbyname, const char *name, name, return nullptr, return) #ifndef OPENSSL_NO_DES DEFINEFUNC(const EVP_CIPHER *, EVP_des_cbc, DUMMYARG, DUMMYARG, return nullptr, return) -@@ -354,12 +371,14 @@ DEFINEFUNC2(int, SSL_CTX_use_PrivateKey, SSL_CTX *a, a, EVP_PKEY *b, b, return - +@@ -356,12 +375,14 @@ DEFINEFUNC2(int, SSL_CTX_use_PrivateKey, SSL_CTX *a, a, EVP_PKEY *b, b, return - DEFINEFUNC2(int, SSL_CTX_use_RSAPrivateKey, SSL_CTX *a, a, RSA *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) @@ -203,7 +222,7 @@ index 2f57998cea..a3eb363385 100644 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) -@@ -844,16 +863,20 @@ bool q_resolveOpenSslSymbols() +@@ -846,20 +867,26 @@ bool q_resolveOpenSslSymbols() RESOLVEFUNC(EVP_CIPHER_CTX_reset) RESOLVEFUNC(EVP_PKEY_up_ref) RESOLVEFUNC(EVP_PKEY_CTX_new) @@ -223,8 +242,14 @@ index 2f57998cea..a3eb363385 100644 +#endif RESOLVEFUNC(DH_get0_pqg) RESOLVEFUNC(SSL_CTX_set_options) - -@@ -895,7 +918,9 @@ bool q_resolveOpenSslSymbols() ++#ifndef LIBRESSL_VERSION_NUMBER + RESOLVEFUNC(SSL_CTX_get_security_level) + RESOLVEFUNC(SSL_CTX_set_security_level) ++#endif + #ifdef TLS1_3_VERSION + RESOLVEFUNC(SSL_CTX_set_ciphersuites) + RESOLVEFUNC(SSL_set_psk_use_session_callback) +@@ -898,7 +925,9 @@ bool q_resolveOpenSslSymbols() RESOLVEFUNC(SSL_SESSION_get_ticket_lifetime_hint) RESOLVEFUNC(DH_bits) @@ -234,7 +259,7 @@ index 2f57998cea..a3eb363385 100644 #if QT_CONFIG(dtls) RESOLVEFUNC(DTLSv1_listen) -@@ -925,7 +950,9 @@ bool q_resolveOpenSslSymbols() +@@ -928,7 +957,9 @@ bool q_resolveOpenSslSymbols() RESOLVEFUNC(OCSP_check_validity) RESOLVEFUNC(OCSP_cert_to_id) RESOLVEFUNC(OCSP_id_get0_info) @@ -244,7 +269,7 @@ index 2f57998cea..a3eb363385 100644 RESOLVEFUNC(OCSP_basic_sign) RESOLVEFUNC(OCSP_response_create) RESOLVEFUNC(i2d_OCSP_RESPONSE) -@@ -976,7 +1003,7 @@ bool q_resolveOpenSslSymbols() +@@ -979,7 +1010,7 @@ bool q_resolveOpenSslSymbols() RESOLVEFUNC(EVP_CipherInit) RESOLVEFUNC(EVP_CipherInit_ex) RESOLVEFUNC(EVP_CipherUpdate) @@ -253,7 +278,7 @@ index 2f57998cea..a3eb363385 100644 RESOLVEFUNC(EVP_get_digestbyname) #ifndef OPENSSL_NO_DES RESOLVEFUNC(EVP_des_cbc) -@@ -1055,12 +1082,14 @@ bool q_resolveOpenSslSymbols() +@@ -1058,12 +1089,14 @@ bool q_resolveOpenSslSymbols() RESOLVEFUNC(SSL_CTX_use_RSAPrivateKey) RESOLVEFUNC(SSL_CTX_use_PrivateKey_file) RESOLVEFUNC(SSL_CTX_get_cert_store); @@ -269,7 +294,7 @@ index 2f57998cea..a3eb363385 100644 RESOLVEFUNC(SSL_clear) RESOLVEFUNC(SSL_connect) diff --git qtbase/src/network/ssl/qsslsocket_openssl_symbols_p.h qtbase/src/network/ssl/qsslsocket_openssl_symbols_p.h -index 018962bcc1..8977f428e0 100644 +index c46afcf53e..3945bada5f 100644 --- qtbase/src/network/ssl/qsslsocket_openssl_symbols_p.h +++ qtbase/src/network/ssl/qsslsocket_openssl_symbols_p.h @@ -80,6 +80,13 @@ QT_BEGIN_NAMESPACE @@ -390,3 +415,6 @@ index 018962bcc1..8977f428e0 100644 Q_AUTOTEST_EXPORT OCSP_CERTID *q_OCSP_cert_to_id(const EVP_MD *dgst, X509 *subject, X509 *issuer); Q_AUTOTEST_EXPORT void q_OCSP_CERTID_free(OCSP_CERTID *cid); int q_OCSP_id_cmp(OCSP_CERTID *a, OCSP_CERTID *b); +-- +2.29.2 + diff --git a/srcpkgs/qt5/template b/srcpkgs/qt5/template index b717438d4d..16cf689807 100644 --- a/srcpkgs/qt5/template +++ b/srcpkgs/qt5/template @@ -1,7 +1,7 @@ # Template file for 'qt5' pkgname=qt5 -version=5.15.1 -revision=3 +version=5.15.2 +revision=1 wrksrc="qt-everywhere-src-${version}" build_style=meta hostmakedepends="cmake clang flex perl glib-devel pkg-config @@ -22,7 +22,7 @@ maintainer="John " license="GPL-3.0-or-later, LGPL-3.0-or-later" homepage="https://qt.io/" distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/single/qt-everywhere-src-${version}.tar.xz" -checksum=44da876057e21e1be42de31facd99be7d5f9f07893e1ea762359bcee0ef64ee9 +checksum=3a530d1b243b5dec00bc54937455471aaa3e56849d2593edb8ded07228202240 python_version=2 #unverified replaces="qt5-doc<5.6.0 qt5-quick1<5.6.0 qt5-quick1-devel<5.6.0 qt5-webkit<5.6.0 qt5-webkit-devel<5.6.0 qt5-enginio<5.7.1 qt5-enginio-devel<5.7.1 qt5-plugin-gtk<5.7.1 qt5-canvas3d<5.13.0"