Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] [WiP] qt5: update to 5.15.1.
@ 2020-09-09 19:32 Johnnynator
  2020-09-10 19:29 ` [PR PATCH] [Updated] " Johnnynator
  2020-09-15 11:03 ` [PR PATCH] [Closed]: " Johnnynator
  0 siblings, 2 replies; 3+ messages in thread
From: Johnnynator @ 2020-09-09 19:32 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 322 bytes --]

There is a new pull request by Johnnynator against master on the void-packages repository

https://github.com/Johnnynator/void-packages qt5.15.1
https://github.com/void-linux/void-packages/pull/24788

[WiP] qt5: update to 5.15.1.


A patch file from https://github.com/void-linux/void-packages/pull/24788.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-qt5.15.1-24788.patch --]
[-- Type: text/x-diff, Size: 39270 bytes --]

From cf65b1a893b8f251c44df6177ab61d220765125d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 9 Sep 2020 19:31:52 +0200
Subject: [PATCH 1/9] qt5: update to 5.15.1.

---
 srcpkgs/qt5/patches/0001-addlr.patch          |   2 +-
 .../patches/qtnetwork-5.15.0-libressl.patch   | 148 ++++++++++--------
 srcpkgs/qt5/template                          |   6 +-
 3 files changed, 83 insertions(+), 73 deletions(-)

diff --git a/srcpkgs/qt5/patches/0001-addlr.patch b/srcpkgs/qt5/patches/0001-addlr.patch
index e415332dd89..1d2b4651bc4 100644
--- a/srcpkgs/qt5/patches/0001-addlr.patch
+++ b/srcpkgs/qt5/patches/0001-addlr.patch
@@ -11,7 +11,7 @@ index 8bcf67e73d..28d7355310 100644
 @@ -558,6 +558,12 @@ static QString getRelocatablePrefix()
      int result = dladdr(reinterpret_cast<void *>(&QLibraryInfo::isDebugBuild), &info);
      if (result > 0 && info.dli_fname)
-         prefixPath = prefixFromQtCoreLibraryHelper(QString::fromLatin1(info.dli_fname));
+         prefixPath = prefixFromQtCoreLibraryHelper(QString::fromLocal8Bit(info.dli_fname));
 +#if 1
 +    QDir preDir(prefixPath);
 +    if (preDir.isRoot()) {
diff --git a/srcpkgs/qt5/patches/qtnetwork-5.15.0-libressl.patch b/srcpkgs/qt5/patches/qtnetwork-5.15.0-libressl.patch
index d7414f68dc5..838d6f05975 100644
--- a/srcpkgs/qt5/patches/qtnetwork-5.15.0-libressl.patch
+++ b/srcpkgs/qt5/patches/qtnetwork-5.15.0-libressl.patch
@@ -16,10 +16,10 @@ Signed-off-by: Stefan Strogin <steils@gentoo.org>
  6 files changed, 93 insertions(+), 3 deletions(-)
 
 diff --git qtbase/src/network/ssl/qsslcertificate_openssl.cpp qtbase/src/network/ssl/qsslcertificate_openssl.cpp
-index 6f1fb26a..eba5a729 100644
+index ca9d61ccb1..19774432ce 100644
 --- qtbase/src/network/ssl/qsslcertificate_openssl.cpp
 +++ qtbase/src/network/ssl/qsslcertificate_openssl.cpp
-@@ -658,7 +658,7 @@ static QMultiMap<QByteArray, QString> _q_mapFromX509Name(X509_NAME *name)
+@@ -661,7 +661,7 @@ static QMultiMap<QByteArray, QString> _q_mapFromX509Name(X509_NAME *name)
          unsigned char *data = nullptr;
          int size = q_ASN1_STRING_to_UTF8(&data, q_X509_NAME_ENTRY_get_data(e));
          info.insert(name, QString::fromUtf8((char*)data, size));
@@ -29,7 +29,7 @@ index 6f1fb26a..eba5a729 100644
  #else
          q_CRYPTO_free(data);
 diff --git qtbase/src/network/ssl/qsslcontext_openssl.cpp qtbase/src/network/ssl/qsslcontext_openssl.cpp
-index 0aa8a4f4..f161af8a 100644
+index abc398b209..c2f90be009 100644
 --- qtbase/src/network/ssl/qsslcontext_openssl.cpp
 +++ qtbase/src/network/ssl/qsslcontext_openssl.cpp
 @@ -397,16 +397,28 @@ init_context:
@@ -61,7 +61,7 @@ index 0aa8a4f4..f161af8a 100644
          break;
      case QSsl::TlsV1_3OrLater:
  #ifdef TLS1_3_VERSION
-@@ -696,6 +708,7 @@ void QSslContext::applyBackendConfig(QSslContext *sslContext)
+@@ -711,6 +723,7 @@ void QSslContext::applyBackendConfig(QSslContext *sslContext)
      }
  #endif // ocsp
  
@@ -69,7 +69,7 @@ index 0aa8a4f4..f161af8a 100644
      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);
-@@ -742,7 +755,9 @@ void QSslContext::applyBackendConfig(QSslContext *sslContext)
+@@ -757,7 +770,9 @@ void QSslContext::applyBackendConfig(QSslContext *sslContext)
              sslContext->errorStr = msgErrorSettingBackendConfig(QSslSocket::tr("SSL_CONF_finish() failed"));
              sslContext->errorCode = QSslError::UnspecifiedError;
          }
@@ -81,7 +81,7 @@ index 0aa8a4f4..f161af8a 100644
          sslContext->errorCode = QSslError::UnspecifiedError;
      }
 diff --git qtbase/src/network/ssl/qsslcontext_openssl_p.h qtbase/src/network/ssl/qsslcontext_openssl_p.h
-index 70cb97aa..01a61cf5 100644
+index 70cb97aad8..01a61cf535 100644
 --- qtbase/src/network/ssl/qsslcontext_openssl_p.h
 +++ qtbase/src/network/ssl/qsslcontext_openssl_p.h
 @@ -61,6 +61,13 @@
@@ -98,11 +98,24 @@ index 70cb97aa..01a61cf5 100644
  #ifndef QT_NO_SSL
  
  class QSslContextPrivate;
+diff --git qtbase/src/network/ssl/qsslkey_openssl.cpp qtbase/src/network/ssl/qsslkey_openssl.cpp
+index 43cb8c6de8..a27336aa26 100644
+--- qtbase/src/network/ssl/qsslkey_openssl.cpp
++++ qtbase/src/network/ssl/qsslkey_openssl.cpp
+@@ -360,7 +360,7 @@ static QByteArray doCrypt(QSslKeyPrivate::Cipher cipher, const QByteArray &data,
+     q_EVP_CipherUpdate(ctx,
+         reinterpret_cast<unsigned char *>(output.data()), &len,
+         reinterpret_cast<const unsigned char *>(data.constData()), data.size());
+-    q_EVP_CipherFinal(ctx,
++    q_EVP_CipherFinal_ex(ctx,
+         reinterpret_cast<unsigned char *>(output.data()) + len, &i);
+     len += i;
+ 
 diff --git qtbase/src/network/ssl/qsslsocket_openssl.cpp qtbase/src/network/ssl/qsslsocket_openssl.cpp
-index 4be27aff..1f33911e 100644
+index 277037e59c..f599498df5 100644
 --- qtbase/src/network/ssl/qsslsocket_openssl.cpp
 +++ qtbase/src/network/ssl/qsslsocket_openssl.cpp
-@@ -598,7 +598,7 @@ bool QSslSocketBackendPrivate::initSslContext()
+@@ -653,7 +653,7 @@ bool QSslSocketBackendPrivate::initSslContext()
      else if (mode == QSslSocket::SslServerMode)
          q_SSL_set_psk_server_callback(ssl, &q_ssl_psk_server_callback);
  
@@ -112,18 +125,24 @@ index 4be27aff..1f33911e 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 71a268ae..8a43035b 100644
+index 2f57998cea..a3eb363385 100644
 --- qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp
 +++ qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp
-@@ -147,6 +147,7 @@ DEFINEFUNC(int, EVP_CIPHER_CTX_reset, EVP_CIPHER_CTX *c, c, return 0, return)
+@@ -146,10 +146,13 @@ 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)
+ DEFINEFUNC2(EVP_PKEY_CTX *, EVP_PKEY_CTX_new, EVP_PKEY *pkey, pkey, ENGINE *e, e, return nullptr, return)
++#ifndef LIBRESSL_VERSION_NUMBER
+ DEFINEFUNC(int, EVP_PKEY_param_check, EVP_PKEY_CTX *ctx, ctx, return 0, return)
++#endif
+ DEFINEFUNC(void, EVP_PKEY_CTX_free, EVP_PKEY_CTX *ctx, ctx, return, return)
  DEFINEFUNC(int, EVP_PKEY_base_id, EVP_PKEY *a, a, return NID_undef, return)
  DEFINEFUNC(int, RSA_bits, RSA *a, a, return 0, return)
 +#ifndef LIBRESSL_VERSION_NUMBER
  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)
-@@ -154,6 +155,14 @@ DEFINEFUNC(OPENSSL_STACK *, OPENSSL_sk_new_null, DUMMYARG, DUMMYARG, return null
+@@ -157,6 +160,14 @@ 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)
@@ -138,7 +157,7 @@ index 71a268ae..8a43035b 100644
  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)
  #ifdef TLS1_3_VERSION
-@@ -179,7 +188,11 @@ DEFINEFUNC2(void, X509_STORE_set_verify_cb, X509_STORE *a, a, X509_STORE_CTX_ver
+@@ -182,7 +193,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)
@@ -150,7 +169,7 @@ index 71a268ae..8a43035b 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)
-@@ -219,7 +232,9 @@ DEFINEFUNC5(int, OCSP_id_get0_info, ASN1_OCTET_STRING **piNameHash, piNameHash,
+@@ -222,7 +237,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)
@@ -160,7 +179,16 @@ index 71a268ae..8a43035b 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)
-@@ -351,12 +366,14 @@ DEFINEFUNC2(int, SSL_CTX_use_PrivateKey, SSL_CTX *a, a, EVP_PKEY *b, b, return -
+@@ -267,7 +284,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)
+-DEFINEFUNC3(int, EVP_CipherFinal, EVP_CIPHER_CTX *ctx, ctx, unsigned char *out, out, int *outl, outl, return 0, return)
++DEFINEFUNC3(int, EVP_CipherFinal_ex, EVP_CIPHER_CTX *ctx, ctx, unsigned char *out, out, int *outl, outl, return 0, return)
+ 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 -
  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)
@@ -175,8 +203,14 @@ index 71a268ae..8a43035b 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)
-@@ -833,12 +850,14 @@ bool q_resolveOpenSslSymbols()
+@@ -844,16 +863,20 @@ bool q_resolveOpenSslSymbols()
+     RESOLVEFUNC(EVP_CIPHER_CTX_reset)
      RESOLVEFUNC(EVP_PKEY_up_ref)
+     RESOLVEFUNC(EVP_PKEY_CTX_new)
++#ifndef LIBRESSL_VERSION_NUMBER
+     RESOLVEFUNC(EVP_PKEY_param_check)
++#endif
+     RESOLVEFUNC(EVP_PKEY_CTX_free)
      RESOLVEFUNC(EVP_PKEY_base_id)
      RESOLVEFUNC(RSA_bits)
 +#ifndef LIBRESSL_VERSION_NUMBER
@@ -190,7 +224,7 @@ index 71a268ae..8a43035b 100644
      RESOLVEFUNC(DH_get0_pqg)
      RESOLVEFUNC(SSL_CTX_set_options)
  
-@@ -880,7 +899,9 @@ bool q_resolveOpenSslSymbols()
+@@ -895,7 +918,9 @@ bool q_resolveOpenSslSymbols()
  
      RESOLVEFUNC(SSL_SESSION_get_ticket_lifetime_hint)
      RESOLVEFUNC(DH_bits)
@@ -200,7 +234,7 @@ index 71a268ae..8a43035b 100644
  
  #if QT_CONFIG(dtls)
      RESOLVEFUNC(DTLSv1_listen)
-@@ -910,7 +931,9 @@ bool q_resolveOpenSslSymbols()
+@@ -925,7 +950,9 @@ bool q_resolveOpenSslSymbols()
      RESOLVEFUNC(OCSP_check_validity)
      RESOLVEFUNC(OCSP_cert_to_id)
      RESOLVEFUNC(OCSP_id_get0_info)
@@ -210,7 +244,16 @@ index 71a268ae..8a43035b 100644
      RESOLVEFUNC(OCSP_basic_sign)
      RESOLVEFUNC(OCSP_response_create)
      RESOLVEFUNC(i2d_OCSP_RESPONSE)
-@@ -1040,12 +1063,14 @@ bool q_resolveOpenSslSymbols()
+@@ -976,7 +1003,7 @@ bool q_resolveOpenSslSymbols()
+     RESOLVEFUNC(EVP_CipherInit)
+     RESOLVEFUNC(EVP_CipherInit_ex)
+     RESOLVEFUNC(EVP_CipherUpdate)
+-    RESOLVEFUNC(EVP_CipherFinal)
++    RESOLVEFUNC(EVP_CipherFinal_ex)
+     RESOLVEFUNC(EVP_get_digestbyname)
+ #ifndef OPENSSL_NO_DES
+     RESOLVEFUNC(EVP_des_cbc)
+@@ -1055,12 +1082,14 @@ bool q_resolveOpenSslSymbols()
      RESOLVEFUNC(SSL_CTX_use_RSAPrivateKey)
      RESOLVEFUNC(SSL_CTX_use_PrivateKey_file)
      RESOLVEFUNC(SSL_CTX_get_cert_store);
@@ -226,7 +269,7 @@ index 71a268ae..8a43035b 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 f35e0ba2..30097317 100644
+index 018962bcc1..8977f428e0 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
@@ -243,7 +286,7 @@ index f35e0ba2..30097317 100644
  #if !defined QT_LINKED_OPENSSL
  // **************** Shared declarations ******************
  // ret func(arg)
-@@ -230,17 +237,38 @@ const unsigned char * q_ASN1_STRING_get0_data(const ASN1_STRING *x);
+@@ -230,7 +237,11 @@ const unsigned char * q_ASN1_STRING_get0_data(const ASN1_STRING *x);
  Q_AUTOTEST_EXPORT BIO *q_BIO_new(const BIO_METHOD *a);
  Q_AUTOTEST_EXPORT const BIO_METHOD *q_BIO_s_mem();
  
@@ -254,6 +297,9 @@ index f35e0ba2..30097317 100644
 +#endif
  int q_EVP_CIPHER_CTX_reset(EVP_CIPHER_CTX *c);
  Q_AUTOTEST_EXPORT int q_EVP_PKEY_up_ref(EVP_PKEY *a);
+ EVP_PKEY_CTX *q_EVP_PKEY_CTX_new(EVP_PKEY *pkey, ENGINE *e);
+@@ -238,12 +249,29 @@ void q_EVP_PKEY_CTX_free(EVP_PKEY_CTX *ctx);
+ int q_EVP_PKEY_param_check(EVP_PKEY_CTX *ctx);
  int q_EVP_PKEY_base_id(EVP_PKEY *a);
  int q_RSA_bits(RSA *a);
 +
@@ -282,7 +328,7 @@ index f35e0ba2..30097317 100644
  int q_SSL_session_reused(SSL *a);
  unsigned long q_SSL_CTX_set_options(SSL_CTX *ctx, unsigned long op);
  int q_OPENSSL_init_ssl(uint64_t opts, const OPENSSL_INIT_SETTINGS *settings);
-@@ -266,8 +294,13 @@ int q_DH_bits(DH *dh);
+@@ -269,8 +297,13 @@ int q_DH_bits(DH *dh);
  # define q_SSL_load_error_strings() q_OPENSSL_init_ssl(OPENSSL_INIT_LOAD_SSL_STRINGS \
                                                         | OPENSSL_INIT_LOAD_CRYPTO_STRINGS, NULL)
  
@@ -296,7 +342,7 @@ index f35e0ba2..30097317 100644
  
  #define q_OPENSSL_add_all_algorithms_conf()  q_OPENSSL_init_crypto(OPENSSL_INIT_ADD_ALL_CIPHERS \
                                                                     | OPENSSL_INIT_ADD_ALL_DIGESTS \
-@@ -276,7 +309,11 @@ int q_DH_bits(DH *dh);
+@@ -279,7 +312,11 @@ int q_DH_bits(DH *dh);
                                                                      | OPENSSL_INIT_ADD_ALL_DIGESTS, NULL)
  
  int q_OPENSSL_init_crypto(uint64_t opts, const OPENSSL_INIT_SETTINGS *settings);
@@ -308,7 +354,16 @@ index f35e0ba2..30097317 100644
  
  long q_OpenSSL_version_num();
  const char *q_OpenSSL_version(int type);
-@@ -494,12 +531,14 @@ int q_SSL_CTX_use_PrivateKey(SSL_CTX *a, EVP_PKEY *b);
+@@ -395,7 +432,7 @@ int q_EVP_CIPHER_CTX_set_key_length(EVP_CIPHER_CTX *x, int keylen);
+ int q_EVP_CipherInit(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *type, const unsigned char *key, const unsigned char *iv, int enc);
+ int q_EVP_CipherInit_ex(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *cipher, ENGINE *impl, const unsigned char *key, const unsigned char *iv, int enc);
+ int q_EVP_CipherUpdate(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl, const unsigned char *in, int inl);
+-int q_EVP_CipherFinal(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl);
++int q_EVP_CipherFinal_ex(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl);
+ const EVP_MD *q_EVP_get_digestbyname(const char *name);
+ 
+ #ifndef OPENSSL_NO_DES
+@@ -497,12 +534,14 @@ int q_SSL_CTX_use_PrivateKey(SSL_CTX *a, EVP_PKEY *b);
  int q_SSL_CTX_use_RSAPrivateKey(SSL_CTX *a, RSA *b);
  int q_SSL_CTX_use_PrivateKey_file(SSL_CTX *a, const char *b, int c);
  X509_STORE *q_SSL_CTX_get_cert_store(const SSL_CTX *a);
@@ -323,7 +378,7 @@ index f35e0ba2..30097317 100644
  void q_SSL_free(SSL *a);
  STACK_OF(SSL_CIPHER) *q_SSL_get_ciphers(const SSL *a);
  const SSL_CIPHER *q_SSL_get_current_cipher(SSL *a);
-@@ -715,7 +754,11 @@ int q_OCSP_check_validity(ASN1_GENERALIZEDTIME *thisupd, ASN1_GENERALIZEDTIME *n
+@@ -728,7 +767,11 @@ int q_OCSP_check_validity(ASN1_GENERALIZEDTIME *thisupd, ASN1_GENERALIZEDTIME *n
  int q_OCSP_id_get0_info(ASN1_OCTET_STRING **piNameHash, ASN1_OBJECT **pmd, ASN1_OCTET_STRING **pikeyHash,
                          ASN1_INTEGER **pserial, OCSP_CERTID *cid);
  
@@ -335,48 +390,3 @@ index f35e0ba2..30097317 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.25.0
-
---- qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp	2020-05-11 10:15:08.000000000 +0200
-+++ qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp	2020-07-01 17:06:34.471202351 +0200
-@@ -264,7 +264,7 @@
- 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)
--DEFINEFUNC3(int, EVP_CipherFinal, EVP_CIPHER_CTX *ctx, ctx, unsigned char *out, out, int *outl, outl, return 0, return)
-+DEFINEFUNC3(int, EVP_CipherFinal_ex, EVP_CIPHER_CTX *ctx, ctx, unsigned char *out, out, int *outl, outl, return 0, return)
- 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)
-@@ -962,7 +962,7 @@
-     RESOLVEFUNC(EVP_CipherInit)
-     RESOLVEFUNC(EVP_CipherInit_ex)
-     RESOLVEFUNC(EVP_CipherUpdate)
--    RESOLVEFUNC(EVP_CipherFinal)
-+    RESOLVEFUNC(EVP_CipherFinal_ex)
-     RESOLVEFUNC(EVP_get_digestbyname)
- #ifndef OPENSSL_NO_DES
-     RESOLVEFUNC(EVP_des_cbc)
---- qtbase/src/network/ssl/qsslkey_openssl.cpp	2020-05-11 10:15:08.000000000 +0200
-+++ qtbase/src/network/ssl/qsslkey_openssl.cpp	2020-07-01 17:58:44.674363835 +0200
-@@ -360,7 +360,7 @@
-     q_EVP_CipherUpdate(ctx,
-         reinterpret_cast<unsigned char *>(output.data()), &len,
-         reinterpret_cast<const unsigned char *>(data.constData()), data.size());
--    q_EVP_CipherFinal(ctx,
-+    q_EVP_CipherFinal_ex(ctx,
-         reinterpret_cast<unsigned char *>(output.data()) + len, &i);
-     len += i;
- 
---- qtbase/src/network/ssl/qsslsocket_openssl_symbols_p.h	2020-07-01 18:00:20.748368792 +0200
-+++ qtbase/src/network/ssl/qsslsocket_openssl_symbols_p.h	2020-07-01 18:04:38.177382072 +0200
-@@ -429,7 +429,7 @@
- int q_EVP_CipherInit(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *type, const unsigned char *key, const unsigned char *iv, int enc);
- int q_EVP_CipherInit_ex(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *cipher, ENGINE *impl, const unsigned char *key, const unsigned char *iv, int enc);
- int q_EVP_CipherUpdate(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl, const unsigned char *in, int inl);
--int q_EVP_CipherFinal(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl);
-+int q_EVP_CipherFinal_ex(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl);
- const EVP_MD *q_EVP_get_digestbyname(const char *name);
- 
- #ifndef OPENSSL_NO_DES
diff --git a/srcpkgs/qt5/template b/srcpkgs/qt5/template
index ff2dbd7f11b..8dd5b6eaaf2 100644
--- a/srcpkgs/qt5/template
+++ b/srcpkgs/qt5/template
@@ -1,7 +1,7 @@
 # Template file for 'qt5'
 pkgname=qt5
-version=5.15.0
-revision=2
+version=5.15.1
+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 <me@johnnynator.dev>"
 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=22b63d7a7a45183865cc4141124f12b673e7a17b1fe2b91e433f6547c5d548c3
+checksum=44da876057e21e1be42de31facd99be7d5f9f07893e1ea762359bcee0ef64ee9
 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"

From d8f7debe5bde5a2f0f93a96d079155b773f0b99d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 9 Sep 2020 19:31:56 +0200
Subject: [PATCH 2/9] qt5-webengine: update to 5.15.1.

---
 srcpkgs/qt5-webengine/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qt5-webengine/template b/srcpkgs/qt5-webengine/template
index 09c41278a80..ebe1b31abaf 100644
--- a/srcpkgs/qt5-webengine/template
+++ b/srcpkgs/qt5-webengine/template
@@ -1,6 +1,6 @@
 # Template file for 'qt5-webengine'
 pkgname=qt5-webengine
-version=5.15.0
+version=5.15.1
 revision=1
 archs="x86_64* i686* armv[67]* ppc64* aarch64*"
 wrksrc="qtwebengine-everywhere-src-${version}"
@@ -24,10 +24,11 @@ maintainer="John <me@johnnynator.dev>"
 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}/submodules/qtwebengine-everywhere-src-${version}.tar.xz"
-checksum=c38e2fda7ed1b7d5a90f26abf231ec0715d78a5bc39a94673d8e39d75f04c5df
+checksum=f903e98fe3cd717161252710125fce011cf882ced96c24968b0c38811fbefdf2
 patch_args="-Np1"
 
 build_options="sndio"
+build_options_default="sndio"
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" nss-devel libevent-devel qt5-location-devel

From 7e8e6db8cce9e4b381fe1e0feeebcb8eed481b30 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 9 Sep 2020 19:31:59 +0200
Subject: [PATCH 3/9] qt5-webview: update to 5.15.1.

---
 srcpkgs/qt5-webview/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qt5-webview/template b/srcpkgs/qt5-webview/template
index c8483aabf67..545eb13de73 100644
--- a/srcpkgs/qt5-webview/template
+++ b/srcpkgs/qt5-webview/template
@@ -1,6 +1,6 @@
 # Template file for 'qt5-webview'
 pkgname=qt5-webview
-version=5.15.0
+version=5.15.1
 revision=1
 wrksrc="qtwebview-everywhere-src-${version}"
 build_style=qmake
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 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}/submodules/qtwebview-everywhere-src-${version}.tar.xz"
-checksum=b87ea205ce79c6b438ebe596e91fa80ba11f6aac7e89ffbf52b337d0fc8d6660
+checksum=426852a3f569da82aa84dfd7f06c6aeb06488a927b66342a612401b41392b260
 
 build_options="webengine"
 if [ "$XBPS_TARGET_ENDIAN" = "le" ] && [ "$XBPS_WORDSIZE" = "$XBPS_TARGET_WORDSIZE" ]; then

From ad448b26c7d2a474f1c1ff5a042806b1d6382f72 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 9 Sep 2020 20:49:27 +0200
Subject: [PATCH 4/9] fixup! qt5-webengine: update to 5.15.1.

---
 .../patches/0092-getAllFieldPositions.patch   | 169 ------------------
 .../qt5-webengine/patches/0100-sndio.patch    |   9 +-
 srcpkgs/qt5-webengine/template                |   3 +-
 3 files changed, 7 insertions(+), 174 deletions(-)
 delete mode 100644 srcpkgs/qt5-webengine/patches/0092-getAllFieldPositions.patch

diff --git a/srcpkgs/qt5-webengine/patches/0092-getAllFieldPositions.patch b/srcpkgs/qt5-webengine/patches/0092-getAllFieldPositions.patch
deleted file mode 100644
index f8f66a07683..00000000000
--- a/srcpkgs/qt5-webengine/patches/0092-getAllFieldPositions.patch
+++ /dev/null
@@ -1,169 +0,0 @@
-From 2b107e7670ffb43719a66ee4a55ab408a5dcf2a5 Mon Sep 17 00:00:00 2001
-From: Ujjwal Sharma <ryzokuken@disroot.org>
-Date: Wed, 22 Apr 2020 12:20:17 +0530
-Subject: [PATCH] deps: V8: backport 3f8dc4b2e5ba
-
-Original commit message:
-
-    [intl] Remove soon-to-be removed getAllFieldPositions
-
-    Needed to land ICU67.1 soon.
-
-    Bug: v8:10393
-    Change-Id: I3c7737ca600d6ccfdc46ffaddfb318ce60bc7618
-    Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/2136489
-    Reviewed-by: Jakob Kummerow <jkummerow@chromium.org>
-    Commit-Queue: Frank Tang <ftang@chromium.org>
-    Cr-Commit-Position: refs/heads/master@{#67027}
-
-Refs: https://github.com/v8/v8/commit/3f8dc4b2e5baf77b463334c769af85b79d8c1463
----
- common.gypi                             |  2 +-
- deps/v8/src/objects/js-number-format.cc | 72 +++++++++++++------------
- 2 files changed, 38 insertions(+), 36 deletions(-)
-
-diff --git a/src/3rdparty/chromium/v8/src/objects/js-number-format.cc b/src/3rdparty/chromium/v8/src/objects/js-number-format.cc
-index 92d3e2fb82e..ced408aa173 100644
---- a/src/3rdparty/chromium/v8/src/objects/js-number-format.cc
-+++ b/src/3rdparty/chromium/v8/src/objects/js-number-format.cc
-@@ -1197,42 +1197,31 @@ MaybeHandle<JSNumberFormat> JSNumberFormat::New(Isolate* isolate,
- }
- 
- namespace {
--Maybe<icu::UnicodeString> IcuFormatNumber(
-+Maybe<bool> IcuFormatNumber(
-     Isolate* isolate,
-     const icu::number::LocalizedNumberFormatter& number_format,
--    Handle<Object> numeric_obj, icu::FieldPositionIterator* fp_iter) {
-+    Handle<Object> numeric_obj, icu::number::FormattedNumber* formatted) {
-   // If it is BigInt, handle it differently.
-   UErrorCode status = U_ZERO_ERROR;
--  icu::number::FormattedNumber formatted;
-   if (numeric_obj->IsBigInt()) {
-     Handle<BigInt> big_int = Handle<BigInt>::cast(numeric_obj);
-     Handle<String> big_int_string;
-     ASSIGN_RETURN_ON_EXCEPTION_VALUE(isolate, big_int_string,
-                                      BigInt::ToString(isolate, big_int),
--                                     Nothing<icu::UnicodeString>());
--    formatted = number_format.formatDecimal(
-+                                     Nothing<bool>());
-+    *formatted = number_format.formatDecimal(
-         {big_int_string->ToCString().get(), big_int_string->length()}, status);
-   } else {
-     double number = numeric_obj->Number();
--    formatted = number_format.formatDouble(number, status);
-+    *formatted = number_format.formatDouble(number, status);
-   }
-   if (U_FAILURE(status)) {
-     // This happen because of icu data trimming trim out "unit".
-     // See https://bugs.chromium.org/p/v8/issues/detail?id=8641
--    THROW_NEW_ERROR_RETURN_VALUE(isolate,
--                                 NewTypeError(MessageTemplate::kIcuError),
--                                 Nothing<icu::UnicodeString>());
--  }
--  if (fp_iter) {
--    formatted.getAllFieldPositions(*fp_iter, status);
-+    THROW_NEW_ERROR_RETURN_VALUE(
-+        isolate, NewTypeError(MessageTemplate::kIcuError), Nothing<bool>());
-   }
--  icu::UnicodeString result = formatted.toString(status);
--  if (U_FAILURE(status)) {
--    THROW_NEW_ERROR_RETURN_VALUE(isolate,
--                                 NewTypeError(MessageTemplate::kIcuError),
--                                 Nothing<icu::UnicodeString>());
--  }
--  return Just(result);
-+  return Just(true);
- }
- 
- }  // namespace
-@@ -1243,10 +1232,16 @@ MaybeHandle<String> JSNumberFormat::FormatNumeric(
-     Handle<Object> numeric_obj) {
-   DCHECK(numeric_obj->IsNumeric());
- 
--  Maybe<icu::UnicodeString> maybe_format =
--      IcuFormatNumber(isolate, number_format, numeric_obj, nullptr);
-+  icu::number::FormattedNumber formatted;
-+  Maybe<bool> maybe_format =
-+      IcuFormatNumber(isolate, number_format, numeric_obj, &formatted);
-   MAYBE_RETURN(maybe_format, Handle<String>());
--  return Intl::ToString(isolate, maybe_format.FromJust());
-+  UErrorCode status = U_ZERO_ERROR;
-+  icu::UnicodeString result = formatted.toString(status);
-+  if (U_FAILURE(status)) {
-+    THROW_NEW_ERROR(isolate, NewTypeError(MessageTemplate::kIcuError), String);
-+  }
-+  return Intl::ToString(isolate, result);
- }
- 
- namespace {
-@@ -1359,12 +1354,18 @@ std::vector<NumberFormatSpan> FlattenRegionsToParts(
- }
- 
- namespace {
--Maybe<int> ConstructParts(Isolate* isolate, const icu::UnicodeString& formatted,
--                          icu::FieldPositionIterator* fp_iter,
-+Maybe<int> ConstructParts(Isolate* isolate,
-+                          icu::number::FormattedNumber* formatted,
-                           Handle<JSArray> result, int start_index,
-                           Handle<Object> numeric_obj, bool style_is_unit) {
-+  UErrorCode status = U_ZERO_ERROR;
-+  icu::UnicodeString formatted_text = formatted->toString(status);
-+  if (U_FAILURE(status)) {
-+    THROW_NEW_ERROR_RETURN_VALUE(
-+        isolate, NewTypeError(MessageTemplate::kIcuError), Nothing<int>());
-+  }
-   DCHECK(numeric_obj->IsNumeric());
--  int32_t length = formatted.length();
-+  int32_t length = formatted_text.length();
-   int index = start_index;
-   if (length == 0) return Just(index);
- 
-@@ -1373,13 +1374,14 @@ Maybe<int> ConstructParts(Isolate* isolate, const icu::UnicodeString& formatted,
-   // other region covers some part of the formatted string. It's possible
-   // there's another field with exactly the same begin and end as this backdrop,
-   // in which case the backdrop's field_id of -1 will give it lower priority.
--  regions.push_back(NumberFormatSpan(-1, 0, formatted.length()));
-+  regions.push_back(NumberFormatSpan(-1, 0, formatted_text.length()));
- 
-   {
--    icu::FieldPosition fp;
--    while (fp_iter->next(fp)) {
--      regions.push_back(NumberFormatSpan(fp.getField(), fp.getBeginIndex(),
--                                         fp.getEndIndex()));
-+    icu::ConstrainedFieldPosition cfp;
-+    cfp.constrainCategory(UFIELD_CATEGORY_NUMBER);
-+    while (formatted->nextPosition(cfp, status)) {
-+      regions.push_back(
-+          NumberFormatSpan(cfp.getField(), cfp.getStart(), cfp.getLimit()));
-     }
-   }
- 
-@@ -1401,7 +1403,7 @@ Maybe<int> ConstructParts(Isolate* isolate, const icu::UnicodeString& formatted,
-     Handle<String> substring;
-     ASSIGN_RETURN_ON_EXCEPTION_VALUE(
-         isolate, substring,
--        Intl::ToString(isolate, formatted, part.begin_pos, part.end_pos),
-+        Intl::ToString(isolate, formatted_text, part.begin_pos, part.end_pos),
-         Nothing<int>());
-     Intl::AddElement(isolate, result, index, field_type_string, substring);
-     ++index;
-@@ -1421,14 +1423,14 @@ MaybeHandle<JSArray> JSNumberFormat::FormatToParts(
-       number_format->icu_number_formatter().raw();
-   CHECK_NOT_NULL(fmt);
- 
--  icu::FieldPositionIterator fp_iter;
--  Maybe<icu::UnicodeString> maybe_format =
--      IcuFormatNumber(isolate, *fmt, numeric_obj, &fp_iter);
-+  icu::number::FormattedNumber formatted;
-+  Maybe<bool> maybe_format =
-+      IcuFormatNumber(isolate, *fmt, numeric_obj, &formatted);
-   MAYBE_RETURN(maybe_format, Handle<JSArray>());
- 
-   Handle<JSArray> result = factory->NewJSArray(0);
-   Maybe<int> maybe_format_to_parts = ConstructParts(
--      isolate, maybe_format.FromJust(), &fp_iter, result, 0, numeric_obj,
-+      isolate, &formatted, result, 0, numeric_obj,
-       number_format->style() == JSNumberFormat::Style::UNIT);
-   MAYBE_RETURN(maybe_format_to_parts, Handle<JSArray>());
- 
diff --git a/srcpkgs/qt5-webengine/patches/0100-sndio.patch b/srcpkgs/qt5-webengine/patches/0100-sndio.patch
index cc1cbfb2e97..38e18d89a6b 100644
--- a/srcpkgs/qt5-webengine/patches/0100-sndio.patch
+++ b/srcpkgs/qt5-webengine/patches/0100-sndio.patch
@@ -1,14 +1,15 @@
---- a/src/buildtools/config/linux.pri	2020-03-24 10:16:30.000000000 +0100
-+++ -	2020-04-06 14:42:50.189729758 +0200
-@@ -190,6 +190,11 @@
-     } else {
+--- a/src/core/config/linux.pri	2020-09-01 13:02:34.000000000 +0200
++++ -	2020-09-09 20:19:13.595622950 +0200
+@@ -20,6 +20,12 @@
          gn_args += use_alsa=false
      }
+ 
 +    qtConfig(webengine-sndio) {
 +        gn_args += use_sndio=true
 +    } else {
 +       gn_args += use_sndio=true
 +    }
++
      !packagesExist(libpci): gn_args += use_libpci=false
  
      qtConfig(webengine-ozone-x11) {
diff --git a/srcpkgs/qt5-webengine/template b/srcpkgs/qt5-webengine/template
index ebe1b31abaf..dabfb767892 100644
--- a/srcpkgs/qt5-webengine/template
+++ b/srcpkgs/qt5-webengine/template
@@ -18,7 +18,8 @@ makedepends="qt5-webchannel-devel qt5-location-devel qt5-tools-devel qt5-devel
  libwebp-devel opus-devel cups-devel nss-devel minizip-devel libxslt-devel
  libvpx-devel re2-devel libXtst-devel libXcursor-devel libXcomposite-devel
  jsoncpp-devel harfbuzz-devel lcms2-devel protobuf-devel pulseaudio-devel
- libXrandr-devel MesaLib-devel mit-krb5-devel alsa-lib-devel $(vopt_if sndio sndio-devel)"
+ libXrandr-devel MesaLib-devel mit-krb5-devel alsa-lib-devel libxkbcommon-devel
+ $(vopt_if sndio sndio-devel)"
 short_desc="Cross-platform application and UI framework (QT5) - WebEngine component"
 maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later, LGPL-3.0-or-later"

From 8636e7ef68483bd2eef99877e037fbc9a22a1e7e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 9 Sep 2020 20:51:03 +0200
Subject: [PATCH 5/9] telegram-desktop: rebuild against qt5.15.1

---
 srcpkgs/telegram-desktop/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/telegram-desktop/template b/srcpkgs/telegram-desktop/template
index cb6c593e019..ac51ff356e3 100644
--- a/srcpkgs/telegram-desktop/template
+++ b/srcpkgs/telegram-desktop/template
@@ -1,7 +1,7 @@
 # Template file for 'telegram-desktop'
 pkgname=telegram-desktop
 version=2.3.0
-revision=1
+revision=2
 wrksrc="tdesktop-${version}-full"
 build_style=cmake
 build_helper="qemu"
@@ -23,7 +23,7 @@ makedepends="alsa-lib-devel ffmpeg-devel libdbusmenu-glib-devel libopenal-devel
  libva-devel rapidjson liblz4-devel liblzma-devel rlottie-devel gtk+3-devel
  MesaLib-devel libdbusmenu-qt5-devel qt5-wayland-devel libatomic-devel
  $(vopt_if spellcheck hunspell-devel)"
-depends="qt5-imageformats qt5-core>=5.15.0<5.15.1"
+depends="qt5-imageformats qt5-core>=5.15.1<5.15.2"
 short_desc="Telegram Desktop messaging app"
 maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later WITH OpenSSL"

From 610c00fe3181916dab0b0132edf4edf6d0820f4d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 9 Sep 2020 20:51:18 +0200
Subject: [PATCH 6/9] qt5dxcb-plugin: rebuild against qt5.15.1

---
 srcpkgs/qt5dxcb-plugin/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/qt5dxcb-plugin/template b/srcpkgs/qt5dxcb-plugin/template
index 0647370bfb9..7e755d48ea6 100644
--- a/srcpkgs/qt5dxcb-plugin/template
+++ b/srcpkgs/qt5dxcb-plugin/template
@@ -9,7 +9,7 @@ hostmakedepends="pkg-config qt5-qmake"
 makedepends="cairo-devel libSM-devel libXi-devel libxkbcommon-devel
  qt5-x11extras-devel xcb-util-image-devel xcb-util-keysyms-devel
  xcb-util-renderutil-devel xcb-util-wm-devel qt5-xcb-private-headers"
-depends="qt5-core>=5.15.0<5.15.1"
+depends="qt5-core>=5.15.1<5.15.2"
 short_desc="Qt platform plugins for DDE"
 maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"

From 2e7cb3502b8964ed793c3142df2c265991d09a28 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 9 Sep 2020 20:51:32 +0200
Subject: [PATCH 7/9] qt5integration: rebuild for qt5-5.15.1

---
 srcpkgs/qt5integration/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qt5integration/template b/srcpkgs/qt5integration/template
index e1602604d77..f083e559d83 100644
--- a/srcpkgs/qt5integration/template
+++ b/srcpkgs/qt5integration/template
@@ -1,12 +1,12 @@
 # Template file for 'qt5integration'
 pkgname=qt5integration
 version=5.0.0
-revision=5
+revision=7
 build_style=qmake
 hostmakedepends="qt5-qmake pkg-config"
 makedepends="libqtxdg-devel dtkwm-devel dtkwidget-devel mtdev-devel
  qt5-svg-devel qt5-x11extras-devel qt5-multimedia-devel"
-depends="qt5dxcb-plugin qt5-styleplugins qt5-core>=5.15.0<5.15.1"
+depends="qt5dxcb-plugin qt5-styleplugins qt5-core>=5.15.1<5.15.2"
 short_desc="Qt platform theme integration plugins for Deepin Desktop Environment"
 maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"

From 5b9fb4700ec25bdc6c0dfc6e0baa31060a8abe43 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 9 Sep 2020 20:51:47 +0200
Subject: [PATCH 8/9] kwin: rebuild against qt5.15.1

---
 srcpkgs/kwin/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kwin/template b/srcpkgs/kwin/template
index af93c9fe694..ee2fc8b890c 100644
--- a/srcpkgs/kwin/template
+++ b/srcpkgs/kwin/template
@@ -1,7 +1,7 @@
 # Template file for 'kwin'
 pkgname=kwin
 version=5.19.5
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
 hostmakedepends="extra-cmake-modules gettext breeze pkg-config"
@@ -10,7 +10,7 @@ makedepends="plasma-framework-devel kcmutils-devel knewstuff-devel
  kdecoration-devel libxkbcommon-devel libinput-devel libSM-devel
  libICE-devel xcb-util-wm-devel qt5-sensors-devel libcap-devel
  kwayland-server-devel"
-depends="breeze hicolor-icon-theme kinit qt5-core>=5.15.0<5.15.1"
+depends="breeze hicolor-icon-theme kinit qt5-core>=5.15.1<5.15.2"
 short_desc="KDE Window manager"
 maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"

From 5bc9c1764db7823dc0b548e8a3a5ed28151a6342 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 9 Sep 2020 20:52:04 +0200
Subject: [PATCH 9/9] qt5-styleplugins: rebuild against qt5.15.1

[ci skip]
---
 srcpkgs/qt5-styleplugins/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qt5-styleplugins/template b/srcpkgs/qt5-styleplugins/template
index 06d99c3cbe9..04ae6034582 100644
--- a/srcpkgs/qt5-styleplugins/template
+++ b/srcpkgs/qt5-styleplugins/template
@@ -1,13 +1,13 @@
 # Template file for 'qt5-styleplugins'
 pkgname=qt5-styleplugins
 version=5.0.0
-revision=13
+revision=14
 _gitrev=335dbece103e2cbf6c7cf819ab6672c2956b17b3
 wrksrc="qtstyleplugins-${_gitrev}"
 build_style=qmake
 hostmakedepends="pkg-config qt5-host-tools qt5-devel"
 makedepends="libxcb-devel libxkbcommon-devel libinput-devel tslib-devel gtk+-devel qt5-devel"
-depends="qt5-core>=5.15.0<5.15.1"
+depends="qt5-core>=5.15.1<5.15.2"
 short_desc="Additional style plugins for Qt5"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="LGPL-2.1-only, LGPL-3.0-only"

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PR PATCH] [Updated] [WiP] qt5: update to 5.15.1.
  2020-09-09 19:32 [PR PATCH] [WiP] qt5: update to 5.15.1 Johnnynator
@ 2020-09-10 19:29 ` Johnnynator
  2020-09-15 11:03 ` [PR PATCH] [Closed]: " Johnnynator
  1 sibling, 0 replies; 3+ messages in thread
From: Johnnynator @ 2020-09-10 19:29 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 327 bytes --]

There is an updated pull request by Johnnynator against master on the void-packages repository

https://github.com/Johnnynator/void-packages qt5.15.1
https://github.com/void-linux/void-packages/pull/24788

[WiP] qt5: update to 5.15.1.


A patch file from https://github.com/void-linux/void-packages/pull/24788.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-qt5.15.1-24788.patch --]
[-- Type: text/x-diff, Size: 41060 bytes --]

From 63521928a8ca296410226500bab9ecfdcdaf055f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 9 Sep 2020 19:31:52 +0200
Subject: [PATCH 1/8] qt5: update to 5.15.1.

---
 srcpkgs/qt5/patches/0001-addlr.patch          |   2 +-
 .../patches/qtnetwork-5.15.0-libressl.patch   | 148 ++++++++++--------
 srcpkgs/qt5/template                          |   6 +-
 3 files changed, 83 insertions(+), 73 deletions(-)

diff --git a/srcpkgs/qt5/patches/0001-addlr.patch b/srcpkgs/qt5/patches/0001-addlr.patch
index e415332dd89..1d2b4651bc4 100644
--- a/srcpkgs/qt5/patches/0001-addlr.patch
+++ b/srcpkgs/qt5/patches/0001-addlr.patch
@@ -11,7 +11,7 @@ index 8bcf67e73d..28d7355310 100644
 @@ -558,6 +558,12 @@ static QString getRelocatablePrefix()
      int result = dladdr(reinterpret_cast<void *>(&QLibraryInfo::isDebugBuild), &info);
      if (result > 0 && info.dli_fname)
-         prefixPath = prefixFromQtCoreLibraryHelper(QString::fromLatin1(info.dli_fname));
+         prefixPath = prefixFromQtCoreLibraryHelper(QString::fromLocal8Bit(info.dli_fname));
 +#if 1
 +    QDir preDir(prefixPath);
 +    if (preDir.isRoot()) {
diff --git a/srcpkgs/qt5/patches/qtnetwork-5.15.0-libressl.patch b/srcpkgs/qt5/patches/qtnetwork-5.15.0-libressl.patch
index d7414f68dc5..838d6f05975 100644
--- a/srcpkgs/qt5/patches/qtnetwork-5.15.0-libressl.patch
+++ b/srcpkgs/qt5/patches/qtnetwork-5.15.0-libressl.patch
@@ -16,10 +16,10 @@ Signed-off-by: Stefan Strogin <steils@gentoo.org>
  6 files changed, 93 insertions(+), 3 deletions(-)
 
 diff --git qtbase/src/network/ssl/qsslcertificate_openssl.cpp qtbase/src/network/ssl/qsslcertificate_openssl.cpp
-index 6f1fb26a..eba5a729 100644
+index ca9d61ccb1..19774432ce 100644
 --- qtbase/src/network/ssl/qsslcertificate_openssl.cpp
 +++ qtbase/src/network/ssl/qsslcertificate_openssl.cpp
-@@ -658,7 +658,7 @@ static QMultiMap<QByteArray, QString> _q_mapFromX509Name(X509_NAME *name)
+@@ -661,7 +661,7 @@ static QMultiMap<QByteArray, QString> _q_mapFromX509Name(X509_NAME *name)
          unsigned char *data = nullptr;
          int size = q_ASN1_STRING_to_UTF8(&data, q_X509_NAME_ENTRY_get_data(e));
          info.insert(name, QString::fromUtf8((char*)data, size));
@@ -29,7 +29,7 @@ index 6f1fb26a..eba5a729 100644
  #else
          q_CRYPTO_free(data);
 diff --git qtbase/src/network/ssl/qsslcontext_openssl.cpp qtbase/src/network/ssl/qsslcontext_openssl.cpp
-index 0aa8a4f4..f161af8a 100644
+index abc398b209..c2f90be009 100644
 --- qtbase/src/network/ssl/qsslcontext_openssl.cpp
 +++ qtbase/src/network/ssl/qsslcontext_openssl.cpp
 @@ -397,16 +397,28 @@ init_context:
@@ -61,7 +61,7 @@ index 0aa8a4f4..f161af8a 100644
          break;
      case QSsl::TlsV1_3OrLater:
  #ifdef TLS1_3_VERSION
-@@ -696,6 +708,7 @@ void QSslContext::applyBackendConfig(QSslContext *sslContext)
+@@ -711,6 +723,7 @@ void QSslContext::applyBackendConfig(QSslContext *sslContext)
      }
  #endif // ocsp
  
@@ -69,7 +69,7 @@ index 0aa8a4f4..f161af8a 100644
      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);
-@@ -742,7 +755,9 @@ void QSslContext::applyBackendConfig(QSslContext *sslContext)
+@@ -757,7 +770,9 @@ void QSslContext::applyBackendConfig(QSslContext *sslContext)
              sslContext->errorStr = msgErrorSettingBackendConfig(QSslSocket::tr("SSL_CONF_finish() failed"));
              sslContext->errorCode = QSslError::UnspecifiedError;
          }
@@ -81,7 +81,7 @@ index 0aa8a4f4..f161af8a 100644
          sslContext->errorCode = QSslError::UnspecifiedError;
      }
 diff --git qtbase/src/network/ssl/qsslcontext_openssl_p.h qtbase/src/network/ssl/qsslcontext_openssl_p.h
-index 70cb97aa..01a61cf5 100644
+index 70cb97aad8..01a61cf535 100644
 --- qtbase/src/network/ssl/qsslcontext_openssl_p.h
 +++ qtbase/src/network/ssl/qsslcontext_openssl_p.h
 @@ -61,6 +61,13 @@
@@ -98,11 +98,24 @@ index 70cb97aa..01a61cf5 100644
  #ifndef QT_NO_SSL
  
  class QSslContextPrivate;
+diff --git qtbase/src/network/ssl/qsslkey_openssl.cpp qtbase/src/network/ssl/qsslkey_openssl.cpp
+index 43cb8c6de8..a27336aa26 100644
+--- qtbase/src/network/ssl/qsslkey_openssl.cpp
++++ qtbase/src/network/ssl/qsslkey_openssl.cpp
+@@ -360,7 +360,7 @@ static QByteArray doCrypt(QSslKeyPrivate::Cipher cipher, const QByteArray &data,
+     q_EVP_CipherUpdate(ctx,
+         reinterpret_cast<unsigned char *>(output.data()), &len,
+         reinterpret_cast<const unsigned char *>(data.constData()), data.size());
+-    q_EVP_CipherFinal(ctx,
++    q_EVP_CipherFinal_ex(ctx,
+         reinterpret_cast<unsigned char *>(output.data()) + len, &i);
+     len += i;
+ 
 diff --git qtbase/src/network/ssl/qsslsocket_openssl.cpp qtbase/src/network/ssl/qsslsocket_openssl.cpp
-index 4be27aff..1f33911e 100644
+index 277037e59c..f599498df5 100644
 --- qtbase/src/network/ssl/qsslsocket_openssl.cpp
 +++ qtbase/src/network/ssl/qsslsocket_openssl.cpp
-@@ -598,7 +598,7 @@ bool QSslSocketBackendPrivate::initSslContext()
+@@ -653,7 +653,7 @@ bool QSslSocketBackendPrivate::initSslContext()
      else if (mode == QSslSocket::SslServerMode)
          q_SSL_set_psk_server_callback(ssl, &q_ssl_psk_server_callback);
  
@@ -112,18 +125,24 @@ index 4be27aff..1f33911e 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 71a268ae..8a43035b 100644
+index 2f57998cea..a3eb363385 100644
 --- qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp
 +++ qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp
-@@ -147,6 +147,7 @@ DEFINEFUNC(int, EVP_CIPHER_CTX_reset, EVP_CIPHER_CTX *c, c, return 0, return)
+@@ -146,10 +146,13 @@ 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)
+ DEFINEFUNC2(EVP_PKEY_CTX *, EVP_PKEY_CTX_new, EVP_PKEY *pkey, pkey, ENGINE *e, e, return nullptr, return)
++#ifndef LIBRESSL_VERSION_NUMBER
+ DEFINEFUNC(int, EVP_PKEY_param_check, EVP_PKEY_CTX *ctx, ctx, return 0, return)
++#endif
+ DEFINEFUNC(void, EVP_PKEY_CTX_free, EVP_PKEY_CTX *ctx, ctx, return, return)
  DEFINEFUNC(int, EVP_PKEY_base_id, EVP_PKEY *a, a, return NID_undef, return)
  DEFINEFUNC(int, RSA_bits, RSA *a, a, return 0, return)
 +#ifndef LIBRESSL_VERSION_NUMBER
  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)
-@@ -154,6 +155,14 @@ DEFINEFUNC(OPENSSL_STACK *, OPENSSL_sk_new_null, DUMMYARG, DUMMYARG, return null
+@@ -157,6 +160,14 @@ 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)
@@ -138,7 +157,7 @@ index 71a268ae..8a43035b 100644
  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)
  #ifdef TLS1_3_VERSION
-@@ -179,7 +188,11 @@ DEFINEFUNC2(void, X509_STORE_set_verify_cb, X509_STORE *a, a, X509_STORE_CTX_ver
+@@ -182,7 +193,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)
@@ -150,7 +169,7 @@ index 71a268ae..8a43035b 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)
-@@ -219,7 +232,9 @@ DEFINEFUNC5(int, OCSP_id_get0_info, ASN1_OCTET_STRING **piNameHash, piNameHash,
+@@ -222,7 +237,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)
@@ -160,7 +179,16 @@ index 71a268ae..8a43035b 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)
-@@ -351,12 +366,14 @@ DEFINEFUNC2(int, SSL_CTX_use_PrivateKey, SSL_CTX *a, a, EVP_PKEY *b, b, return -
+@@ -267,7 +284,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)
+-DEFINEFUNC3(int, EVP_CipherFinal, EVP_CIPHER_CTX *ctx, ctx, unsigned char *out, out, int *outl, outl, return 0, return)
++DEFINEFUNC3(int, EVP_CipherFinal_ex, EVP_CIPHER_CTX *ctx, ctx, unsigned char *out, out, int *outl, outl, return 0, return)
+ 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 -
  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)
@@ -175,8 +203,14 @@ index 71a268ae..8a43035b 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)
-@@ -833,12 +850,14 @@ bool q_resolveOpenSslSymbols()
+@@ -844,16 +863,20 @@ bool q_resolveOpenSslSymbols()
+     RESOLVEFUNC(EVP_CIPHER_CTX_reset)
      RESOLVEFUNC(EVP_PKEY_up_ref)
+     RESOLVEFUNC(EVP_PKEY_CTX_new)
++#ifndef LIBRESSL_VERSION_NUMBER
+     RESOLVEFUNC(EVP_PKEY_param_check)
++#endif
+     RESOLVEFUNC(EVP_PKEY_CTX_free)
      RESOLVEFUNC(EVP_PKEY_base_id)
      RESOLVEFUNC(RSA_bits)
 +#ifndef LIBRESSL_VERSION_NUMBER
@@ -190,7 +224,7 @@ index 71a268ae..8a43035b 100644
      RESOLVEFUNC(DH_get0_pqg)
      RESOLVEFUNC(SSL_CTX_set_options)
  
-@@ -880,7 +899,9 @@ bool q_resolveOpenSslSymbols()
+@@ -895,7 +918,9 @@ bool q_resolveOpenSslSymbols()
  
      RESOLVEFUNC(SSL_SESSION_get_ticket_lifetime_hint)
      RESOLVEFUNC(DH_bits)
@@ -200,7 +234,7 @@ index 71a268ae..8a43035b 100644
  
  #if QT_CONFIG(dtls)
      RESOLVEFUNC(DTLSv1_listen)
-@@ -910,7 +931,9 @@ bool q_resolveOpenSslSymbols()
+@@ -925,7 +950,9 @@ bool q_resolveOpenSslSymbols()
      RESOLVEFUNC(OCSP_check_validity)
      RESOLVEFUNC(OCSP_cert_to_id)
      RESOLVEFUNC(OCSP_id_get0_info)
@@ -210,7 +244,16 @@ index 71a268ae..8a43035b 100644
      RESOLVEFUNC(OCSP_basic_sign)
      RESOLVEFUNC(OCSP_response_create)
      RESOLVEFUNC(i2d_OCSP_RESPONSE)
-@@ -1040,12 +1063,14 @@ bool q_resolveOpenSslSymbols()
+@@ -976,7 +1003,7 @@ bool q_resolveOpenSslSymbols()
+     RESOLVEFUNC(EVP_CipherInit)
+     RESOLVEFUNC(EVP_CipherInit_ex)
+     RESOLVEFUNC(EVP_CipherUpdate)
+-    RESOLVEFUNC(EVP_CipherFinal)
++    RESOLVEFUNC(EVP_CipherFinal_ex)
+     RESOLVEFUNC(EVP_get_digestbyname)
+ #ifndef OPENSSL_NO_DES
+     RESOLVEFUNC(EVP_des_cbc)
+@@ -1055,12 +1082,14 @@ bool q_resolveOpenSslSymbols()
      RESOLVEFUNC(SSL_CTX_use_RSAPrivateKey)
      RESOLVEFUNC(SSL_CTX_use_PrivateKey_file)
      RESOLVEFUNC(SSL_CTX_get_cert_store);
@@ -226,7 +269,7 @@ index 71a268ae..8a43035b 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 f35e0ba2..30097317 100644
+index 018962bcc1..8977f428e0 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
@@ -243,7 +286,7 @@ index f35e0ba2..30097317 100644
  #if !defined QT_LINKED_OPENSSL
  // **************** Shared declarations ******************
  // ret func(arg)
-@@ -230,17 +237,38 @@ const unsigned char * q_ASN1_STRING_get0_data(const ASN1_STRING *x);
+@@ -230,7 +237,11 @@ const unsigned char * q_ASN1_STRING_get0_data(const ASN1_STRING *x);
  Q_AUTOTEST_EXPORT BIO *q_BIO_new(const BIO_METHOD *a);
  Q_AUTOTEST_EXPORT const BIO_METHOD *q_BIO_s_mem();
  
@@ -254,6 +297,9 @@ index f35e0ba2..30097317 100644
 +#endif
  int q_EVP_CIPHER_CTX_reset(EVP_CIPHER_CTX *c);
  Q_AUTOTEST_EXPORT int q_EVP_PKEY_up_ref(EVP_PKEY *a);
+ EVP_PKEY_CTX *q_EVP_PKEY_CTX_new(EVP_PKEY *pkey, ENGINE *e);
+@@ -238,12 +249,29 @@ void q_EVP_PKEY_CTX_free(EVP_PKEY_CTX *ctx);
+ int q_EVP_PKEY_param_check(EVP_PKEY_CTX *ctx);
  int q_EVP_PKEY_base_id(EVP_PKEY *a);
  int q_RSA_bits(RSA *a);
 +
@@ -282,7 +328,7 @@ index f35e0ba2..30097317 100644
  int q_SSL_session_reused(SSL *a);
  unsigned long q_SSL_CTX_set_options(SSL_CTX *ctx, unsigned long op);
  int q_OPENSSL_init_ssl(uint64_t opts, const OPENSSL_INIT_SETTINGS *settings);
-@@ -266,8 +294,13 @@ int q_DH_bits(DH *dh);
+@@ -269,8 +297,13 @@ int q_DH_bits(DH *dh);
  # define q_SSL_load_error_strings() q_OPENSSL_init_ssl(OPENSSL_INIT_LOAD_SSL_STRINGS \
                                                         | OPENSSL_INIT_LOAD_CRYPTO_STRINGS, NULL)
  
@@ -296,7 +342,7 @@ index f35e0ba2..30097317 100644
  
  #define q_OPENSSL_add_all_algorithms_conf()  q_OPENSSL_init_crypto(OPENSSL_INIT_ADD_ALL_CIPHERS \
                                                                     | OPENSSL_INIT_ADD_ALL_DIGESTS \
-@@ -276,7 +309,11 @@ int q_DH_bits(DH *dh);
+@@ -279,7 +312,11 @@ int q_DH_bits(DH *dh);
                                                                      | OPENSSL_INIT_ADD_ALL_DIGESTS, NULL)
  
  int q_OPENSSL_init_crypto(uint64_t opts, const OPENSSL_INIT_SETTINGS *settings);
@@ -308,7 +354,16 @@ index f35e0ba2..30097317 100644
  
  long q_OpenSSL_version_num();
  const char *q_OpenSSL_version(int type);
-@@ -494,12 +531,14 @@ int q_SSL_CTX_use_PrivateKey(SSL_CTX *a, EVP_PKEY *b);
+@@ -395,7 +432,7 @@ int q_EVP_CIPHER_CTX_set_key_length(EVP_CIPHER_CTX *x, int keylen);
+ int q_EVP_CipherInit(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *type, const unsigned char *key, const unsigned char *iv, int enc);
+ int q_EVP_CipherInit_ex(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *cipher, ENGINE *impl, const unsigned char *key, const unsigned char *iv, int enc);
+ int q_EVP_CipherUpdate(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl, const unsigned char *in, int inl);
+-int q_EVP_CipherFinal(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl);
++int q_EVP_CipherFinal_ex(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl);
+ const EVP_MD *q_EVP_get_digestbyname(const char *name);
+ 
+ #ifndef OPENSSL_NO_DES
+@@ -497,12 +534,14 @@ int q_SSL_CTX_use_PrivateKey(SSL_CTX *a, EVP_PKEY *b);
  int q_SSL_CTX_use_RSAPrivateKey(SSL_CTX *a, RSA *b);
  int q_SSL_CTX_use_PrivateKey_file(SSL_CTX *a, const char *b, int c);
  X509_STORE *q_SSL_CTX_get_cert_store(const SSL_CTX *a);
@@ -323,7 +378,7 @@ index f35e0ba2..30097317 100644
  void q_SSL_free(SSL *a);
  STACK_OF(SSL_CIPHER) *q_SSL_get_ciphers(const SSL *a);
  const SSL_CIPHER *q_SSL_get_current_cipher(SSL *a);
-@@ -715,7 +754,11 @@ int q_OCSP_check_validity(ASN1_GENERALIZEDTIME *thisupd, ASN1_GENERALIZEDTIME *n
+@@ -728,7 +767,11 @@ int q_OCSP_check_validity(ASN1_GENERALIZEDTIME *thisupd, ASN1_GENERALIZEDTIME *n
  int q_OCSP_id_get0_info(ASN1_OCTET_STRING **piNameHash, ASN1_OBJECT **pmd, ASN1_OCTET_STRING **pikeyHash,
                          ASN1_INTEGER **pserial, OCSP_CERTID *cid);
  
@@ -335,48 +390,3 @@ index f35e0ba2..30097317 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.25.0
-
---- qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp	2020-05-11 10:15:08.000000000 +0200
-+++ qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp	2020-07-01 17:06:34.471202351 +0200
-@@ -264,7 +264,7 @@
- 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)
--DEFINEFUNC3(int, EVP_CipherFinal, EVP_CIPHER_CTX *ctx, ctx, unsigned char *out, out, int *outl, outl, return 0, return)
-+DEFINEFUNC3(int, EVP_CipherFinal_ex, EVP_CIPHER_CTX *ctx, ctx, unsigned char *out, out, int *outl, outl, return 0, return)
- 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)
-@@ -962,7 +962,7 @@
-     RESOLVEFUNC(EVP_CipherInit)
-     RESOLVEFUNC(EVP_CipherInit_ex)
-     RESOLVEFUNC(EVP_CipherUpdate)
--    RESOLVEFUNC(EVP_CipherFinal)
-+    RESOLVEFUNC(EVP_CipherFinal_ex)
-     RESOLVEFUNC(EVP_get_digestbyname)
- #ifndef OPENSSL_NO_DES
-     RESOLVEFUNC(EVP_des_cbc)
---- qtbase/src/network/ssl/qsslkey_openssl.cpp	2020-05-11 10:15:08.000000000 +0200
-+++ qtbase/src/network/ssl/qsslkey_openssl.cpp	2020-07-01 17:58:44.674363835 +0200
-@@ -360,7 +360,7 @@
-     q_EVP_CipherUpdate(ctx,
-         reinterpret_cast<unsigned char *>(output.data()), &len,
-         reinterpret_cast<const unsigned char *>(data.constData()), data.size());
--    q_EVP_CipherFinal(ctx,
-+    q_EVP_CipherFinal_ex(ctx,
-         reinterpret_cast<unsigned char *>(output.data()) + len, &i);
-     len += i;
- 
---- qtbase/src/network/ssl/qsslsocket_openssl_symbols_p.h	2020-07-01 18:00:20.748368792 +0200
-+++ qtbase/src/network/ssl/qsslsocket_openssl_symbols_p.h	2020-07-01 18:04:38.177382072 +0200
-@@ -429,7 +429,7 @@
- int q_EVP_CipherInit(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *type, const unsigned char *key, const unsigned char *iv, int enc);
- int q_EVP_CipherInit_ex(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *cipher, ENGINE *impl, const unsigned char *key, const unsigned char *iv, int enc);
- int q_EVP_CipherUpdate(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl, const unsigned char *in, int inl);
--int q_EVP_CipherFinal(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl);
-+int q_EVP_CipherFinal_ex(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl);
- const EVP_MD *q_EVP_get_digestbyname(const char *name);
- 
- #ifndef OPENSSL_NO_DES
diff --git a/srcpkgs/qt5/template b/srcpkgs/qt5/template
index ff2dbd7f11b..8dd5b6eaaf2 100644
--- a/srcpkgs/qt5/template
+++ b/srcpkgs/qt5/template
@@ -1,7 +1,7 @@
 # Template file for 'qt5'
 pkgname=qt5
-version=5.15.0
-revision=2
+version=5.15.1
+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 <me@johnnynator.dev>"
 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=22b63d7a7a45183865cc4141124f12b673e7a17b1fe2b91e433f6547c5d548c3
+checksum=44da876057e21e1be42de31facd99be7d5f9f07893e1ea762359bcee0ef64ee9
 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"

From 4a7e9ab73c060a0f5c91230bd2d2976d5be4430a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 9 Sep 2020 19:31:56 +0200
Subject: [PATCH 2/8] qt5-webengine: update to 5.15.1.

---
 .../patches/0021-sandbox-sched_getparam.patch |  10 +-
 .../patches/0070-musl-glibc.patch             |  11 ++
 .../patches/0092-getAllFieldPositions.patch   | 169 ------------------
 .../qt5-webengine/patches/0100-sndio.patch    |   9 +-
 srcpkgs/qt5-webengine/template                |   8 +-
 5 files changed, 27 insertions(+), 180 deletions(-)
 create mode 100644 srcpkgs/qt5-webengine/patches/0070-musl-glibc.patch
 delete mode 100644 srcpkgs/qt5-webengine/patches/0092-getAllFieldPositions.patch

diff --git a/srcpkgs/qt5-webengine/patches/0021-sandbox-sched_getparam.patch b/srcpkgs/qt5-webengine/patches/0021-sandbox-sched_getparam.patch
index a91e85eca3c..a574b994abc 100644
--- a/srcpkgs/qt5-webengine/patches/0021-sandbox-sched_getparam.patch
+++ b/srcpkgs/qt5-webengine/patches/0021-sandbox-sched_getparam.patch
@@ -3,22 +3,24 @@ musl uses them for pthread_getschedparam()
 
 source: https://git.alpinelinux.org/aports/commit/community/chromium?id=54af9f8ac24f52d382c5758e2445bf0206eff40e
 
---- a/src/3rdparty/chromium/services/service_manager/sandbox/linux/bpf_renderer_policy_linux.cc	2019-10-08 08:27:43.000000000 +0200
-+++ -	2019-11-11 22:33:51.865153684 +0100
-@@ -88,10 +88,16 @@
+--- a/src/3rdparty/chromium/services/service_manager/sandbox/linux/bpf_renderer_policy_linux.cc	2020-09-01 13:02:34.000000000 +0200
++++ -	2020-09-10 19:16:13.884275822 +0200
+@@ -88,11 +88,18 @@
      case __NR_sysinfo:
      case __NR_times:
      case __NR_uname:
 +#if !defined(__GLIBC__)
 +    case __NR_sched_getparam:
 +    case __NR_sched_getscheduler:
++    case __NR_sched_setscheduler:
 +#endif
        return Allow();
      case __NR_sched_getaffinity:
 +#if defined(__GLIBC__)
      case __NR_sched_getparam:
      case __NR_sched_getscheduler:
-+#endif
      case __NR_sched_setscheduler:
++#endif
        return sandbox::RestrictSchedTarget(GetPolicyPid(), sysno);
      case __NR_prlimit64:
+       // See crbug.com/662450 and setrlimit comment above.
diff --git a/srcpkgs/qt5-webengine/patches/0070-musl-glibc.patch b/srcpkgs/qt5-webengine/patches/0070-musl-glibc.patch
new file mode 100644
index 00000000000..87425038b57
--- /dev/null
+++ b/srcpkgs/qt5-webengine/patches/0070-musl-glibc.patch
@@ -0,0 +1,11 @@
+--- qtwebengine/src/buildtools/configure.json	2020-09-01 13:02:34.000000000 +0200
++++ -	2020-09-10 16:39:33.309237834 +0200
+@@ -269,7 +269,7 @@
+             "test": {
+                 "include": "features.h",
+                 "tail": [
+-                    "#if __GLIBC__ < 2 || __GLIBC_MINOR__ < 17",
++                    "#if false",
+                     "#error glibc versions below 2.17 are not supported",
+                     "#endif"
+                 ]
diff --git a/srcpkgs/qt5-webengine/patches/0092-getAllFieldPositions.patch b/srcpkgs/qt5-webengine/patches/0092-getAllFieldPositions.patch
deleted file mode 100644
index f8f66a07683..00000000000
--- a/srcpkgs/qt5-webengine/patches/0092-getAllFieldPositions.patch
+++ /dev/null
@@ -1,169 +0,0 @@
-From 2b107e7670ffb43719a66ee4a55ab408a5dcf2a5 Mon Sep 17 00:00:00 2001
-From: Ujjwal Sharma <ryzokuken@disroot.org>
-Date: Wed, 22 Apr 2020 12:20:17 +0530
-Subject: [PATCH] deps: V8: backport 3f8dc4b2e5ba
-
-Original commit message:
-
-    [intl] Remove soon-to-be removed getAllFieldPositions
-
-    Needed to land ICU67.1 soon.
-
-    Bug: v8:10393
-    Change-Id: I3c7737ca600d6ccfdc46ffaddfb318ce60bc7618
-    Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/2136489
-    Reviewed-by: Jakob Kummerow <jkummerow@chromium.org>
-    Commit-Queue: Frank Tang <ftang@chromium.org>
-    Cr-Commit-Position: refs/heads/master@{#67027}
-
-Refs: https://github.com/v8/v8/commit/3f8dc4b2e5baf77b463334c769af85b79d8c1463
----
- common.gypi                             |  2 +-
- deps/v8/src/objects/js-number-format.cc | 72 +++++++++++++------------
- 2 files changed, 38 insertions(+), 36 deletions(-)
-
-diff --git a/src/3rdparty/chromium/v8/src/objects/js-number-format.cc b/src/3rdparty/chromium/v8/src/objects/js-number-format.cc
-index 92d3e2fb82e..ced408aa173 100644
---- a/src/3rdparty/chromium/v8/src/objects/js-number-format.cc
-+++ b/src/3rdparty/chromium/v8/src/objects/js-number-format.cc
-@@ -1197,42 +1197,31 @@ MaybeHandle<JSNumberFormat> JSNumberFormat::New(Isolate* isolate,
- }
- 
- namespace {
--Maybe<icu::UnicodeString> IcuFormatNumber(
-+Maybe<bool> IcuFormatNumber(
-     Isolate* isolate,
-     const icu::number::LocalizedNumberFormatter& number_format,
--    Handle<Object> numeric_obj, icu::FieldPositionIterator* fp_iter) {
-+    Handle<Object> numeric_obj, icu::number::FormattedNumber* formatted) {
-   // If it is BigInt, handle it differently.
-   UErrorCode status = U_ZERO_ERROR;
--  icu::number::FormattedNumber formatted;
-   if (numeric_obj->IsBigInt()) {
-     Handle<BigInt> big_int = Handle<BigInt>::cast(numeric_obj);
-     Handle<String> big_int_string;
-     ASSIGN_RETURN_ON_EXCEPTION_VALUE(isolate, big_int_string,
-                                      BigInt::ToString(isolate, big_int),
--                                     Nothing<icu::UnicodeString>());
--    formatted = number_format.formatDecimal(
-+                                     Nothing<bool>());
-+    *formatted = number_format.formatDecimal(
-         {big_int_string->ToCString().get(), big_int_string->length()}, status);
-   } else {
-     double number = numeric_obj->Number();
--    formatted = number_format.formatDouble(number, status);
-+    *formatted = number_format.formatDouble(number, status);
-   }
-   if (U_FAILURE(status)) {
-     // This happen because of icu data trimming trim out "unit".
-     // See https://bugs.chromium.org/p/v8/issues/detail?id=8641
--    THROW_NEW_ERROR_RETURN_VALUE(isolate,
--                                 NewTypeError(MessageTemplate::kIcuError),
--                                 Nothing<icu::UnicodeString>());
--  }
--  if (fp_iter) {
--    formatted.getAllFieldPositions(*fp_iter, status);
-+    THROW_NEW_ERROR_RETURN_VALUE(
-+        isolate, NewTypeError(MessageTemplate::kIcuError), Nothing<bool>());
-   }
--  icu::UnicodeString result = formatted.toString(status);
--  if (U_FAILURE(status)) {
--    THROW_NEW_ERROR_RETURN_VALUE(isolate,
--                                 NewTypeError(MessageTemplate::kIcuError),
--                                 Nothing<icu::UnicodeString>());
--  }
--  return Just(result);
-+  return Just(true);
- }
- 
- }  // namespace
-@@ -1243,10 +1232,16 @@ MaybeHandle<String> JSNumberFormat::FormatNumeric(
-     Handle<Object> numeric_obj) {
-   DCHECK(numeric_obj->IsNumeric());
- 
--  Maybe<icu::UnicodeString> maybe_format =
--      IcuFormatNumber(isolate, number_format, numeric_obj, nullptr);
-+  icu::number::FormattedNumber formatted;
-+  Maybe<bool> maybe_format =
-+      IcuFormatNumber(isolate, number_format, numeric_obj, &formatted);
-   MAYBE_RETURN(maybe_format, Handle<String>());
--  return Intl::ToString(isolate, maybe_format.FromJust());
-+  UErrorCode status = U_ZERO_ERROR;
-+  icu::UnicodeString result = formatted.toString(status);
-+  if (U_FAILURE(status)) {
-+    THROW_NEW_ERROR(isolate, NewTypeError(MessageTemplate::kIcuError), String);
-+  }
-+  return Intl::ToString(isolate, result);
- }
- 
- namespace {
-@@ -1359,12 +1354,18 @@ std::vector<NumberFormatSpan> FlattenRegionsToParts(
- }
- 
- namespace {
--Maybe<int> ConstructParts(Isolate* isolate, const icu::UnicodeString& formatted,
--                          icu::FieldPositionIterator* fp_iter,
-+Maybe<int> ConstructParts(Isolate* isolate,
-+                          icu::number::FormattedNumber* formatted,
-                           Handle<JSArray> result, int start_index,
-                           Handle<Object> numeric_obj, bool style_is_unit) {
-+  UErrorCode status = U_ZERO_ERROR;
-+  icu::UnicodeString formatted_text = formatted->toString(status);
-+  if (U_FAILURE(status)) {
-+    THROW_NEW_ERROR_RETURN_VALUE(
-+        isolate, NewTypeError(MessageTemplate::kIcuError), Nothing<int>());
-+  }
-   DCHECK(numeric_obj->IsNumeric());
--  int32_t length = formatted.length();
-+  int32_t length = formatted_text.length();
-   int index = start_index;
-   if (length == 0) return Just(index);
- 
-@@ -1373,13 +1374,14 @@ Maybe<int> ConstructParts(Isolate* isolate, const icu::UnicodeString& formatted,
-   // other region covers some part of the formatted string. It's possible
-   // there's another field with exactly the same begin and end as this backdrop,
-   // in which case the backdrop's field_id of -1 will give it lower priority.
--  regions.push_back(NumberFormatSpan(-1, 0, formatted.length()));
-+  regions.push_back(NumberFormatSpan(-1, 0, formatted_text.length()));
- 
-   {
--    icu::FieldPosition fp;
--    while (fp_iter->next(fp)) {
--      regions.push_back(NumberFormatSpan(fp.getField(), fp.getBeginIndex(),
--                                         fp.getEndIndex()));
-+    icu::ConstrainedFieldPosition cfp;
-+    cfp.constrainCategory(UFIELD_CATEGORY_NUMBER);
-+    while (formatted->nextPosition(cfp, status)) {
-+      regions.push_back(
-+          NumberFormatSpan(cfp.getField(), cfp.getStart(), cfp.getLimit()));
-     }
-   }
- 
-@@ -1401,7 +1403,7 @@ Maybe<int> ConstructParts(Isolate* isolate, const icu::UnicodeString& formatted,
-     Handle<String> substring;
-     ASSIGN_RETURN_ON_EXCEPTION_VALUE(
-         isolate, substring,
--        Intl::ToString(isolate, formatted, part.begin_pos, part.end_pos),
-+        Intl::ToString(isolate, formatted_text, part.begin_pos, part.end_pos),
-         Nothing<int>());
-     Intl::AddElement(isolate, result, index, field_type_string, substring);
-     ++index;
-@@ -1421,14 +1423,14 @@ MaybeHandle<JSArray> JSNumberFormat::FormatToParts(
-       number_format->icu_number_formatter().raw();
-   CHECK_NOT_NULL(fmt);
- 
--  icu::FieldPositionIterator fp_iter;
--  Maybe<icu::UnicodeString> maybe_format =
--      IcuFormatNumber(isolate, *fmt, numeric_obj, &fp_iter);
-+  icu::number::FormattedNumber formatted;
-+  Maybe<bool> maybe_format =
-+      IcuFormatNumber(isolate, *fmt, numeric_obj, &formatted);
-   MAYBE_RETURN(maybe_format, Handle<JSArray>());
- 
-   Handle<JSArray> result = factory->NewJSArray(0);
-   Maybe<int> maybe_format_to_parts = ConstructParts(
--      isolate, maybe_format.FromJust(), &fp_iter, result, 0, numeric_obj,
-+      isolate, &formatted, result, 0, numeric_obj,
-       number_format->style() == JSNumberFormat::Style::UNIT);
-   MAYBE_RETURN(maybe_format_to_parts, Handle<JSArray>());
- 
diff --git a/srcpkgs/qt5-webengine/patches/0100-sndio.patch b/srcpkgs/qt5-webengine/patches/0100-sndio.patch
index cc1cbfb2e97..38e18d89a6b 100644
--- a/srcpkgs/qt5-webengine/patches/0100-sndio.patch
+++ b/srcpkgs/qt5-webengine/patches/0100-sndio.patch
@@ -1,14 +1,15 @@
---- a/src/buildtools/config/linux.pri	2020-03-24 10:16:30.000000000 +0100
-+++ -	2020-04-06 14:42:50.189729758 +0200
-@@ -190,6 +190,11 @@
-     } else {
+--- a/src/core/config/linux.pri	2020-09-01 13:02:34.000000000 +0200
++++ -	2020-09-09 20:19:13.595622950 +0200
+@@ -20,6 +20,12 @@
          gn_args += use_alsa=false
      }
+ 
 +    qtConfig(webengine-sndio) {
 +        gn_args += use_sndio=true
 +    } else {
 +       gn_args += use_sndio=true
 +    }
++
      !packagesExist(libpci): gn_args += use_libpci=false
  
      qtConfig(webengine-ozone-x11) {
diff --git a/srcpkgs/qt5-webengine/template b/srcpkgs/qt5-webengine/template
index 09c41278a80..dabfb767892 100644
--- a/srcpkgs/qt5-webengine/template
+++ b/srcpkgs/qt5-webengine/template
@@ -1,6 +1,6 @@
 # Template file for 'qt5-webengine'
 pkgname=qt5-webengine
-version=5.15.0
+version=5.15.1
 revision=1
 archs="x86_64* i686* armv[67]* ppc64* aarch64*"
 wrksrc="qtwebengine-everywhere-src-${version}"
@@ -18,16 +18,18 @@ makedepends="qt5-webchannel-devel qt5-location-devel qt5-tools-devel qt5-devel
  libwebp-devel opus-devel cups-devel nss-devel minizip-devel libxslt-devel
  libvpx-devel re2-devel libXtst-devel libXcursor-devel libXcomposite-devel
  jsoncpp-devel harfbuzz-devel lcms2-devel protobuf-devel pulseaudio-devel
- libXrandr-devel MesaLib-devel mit-krb5-devel alsa-lib-devel $(vopt_if sndio sndio-devel)"
+ libXrandr-devel MesaLib-devel mit-krb5-devel alsa-lib-devel libxkbcommon-devel
+ $(vopt_if sndio sndio-devel)"
 short_desc="Cross-platform application and UI framework (QT5) - WebEngine component"
 maintainer="John <me@johnnynator.dev>"
 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}/submodules/qtwebengine-everywhere-src-${version}.tar.xz"
-checksum=c38e2fda7ed1b7d5a90f26abf231ec0715d78a5bc39a94673d8e39d75f04c5df
+checksum=f903e98fe3cd717161252710125fce011cf882ced96c24968b0c38811fbefdf2
 patch_args="-Np1"
 
 build_options="sndio"
+build_options_default="sndio"
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" nss-devel libevent-devel qt5-location-devel

From e76ad178f0f5f9a26af2375ee7bfa6451f460f36 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 9 Sep 2020 19:31:59 +0200
Subject: [PATCH 3/8] qt5-webview: update to 5.15.1.

---
 srcpkgs/qt5-webview/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qt5-webview/template b/srcpkgs/qt5-webview/template
index c8483aabf67..545eb13de73 100644
--- a/srcpkgs/qt5-webview/template
+++ b/srcpkgs/qt5-webview/template
@@ -1,6 +1,6 @@
 # Template file for 'qt5-webview'
 pkgname=qt5-webview
-version=5.15.0
+version=5.15.1
 revision=1
 wrksrc="qtwebview-everywhere-src-${version}"
 build_style=qmake
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 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}/submodules/qtwebview-everywhere-src-${version}.tar.xz"
-checksum=b87ea205ce79c6b438ebe596e91fa80ba11f6aac7e89ffbf52b337d0fc8d6660
+checksum=426852a3f569da82aa84dfd7f06c6aeb06488a927b66342a612401b41392b260
 
 build_options="webengine"
 if [ "$XBPS_TARGET_ENDIAN" = "le" ] && [ "$XBPS_WORDSIZE" = "$XBPS_TARGET_WORDSIZE" ]; then

From 960317269bafd1d7b530f77c5cd5523130576b44 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 9 Sep 2020 20:51:03 +0200
Subject: [PATCH 4/8] telegram-desktop: rebuild against qt5.15.1

---
 srcpkgs/telegram-desktop/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/telegram-desktop/template b/srcpkgs/telegram-desktop/template
index cb6c593e019..ac51ff356e3 100644
--- a/srcpkgs/telegram-desktop/template
+++ b/srcpkgs/telegram-desktop/template
@@ -1,7 +1,7 @@
 # Template file for 'telegram-desktop'
 pkgname=telegram-desktop
 version=2.3.0
-revision=1
+revision=2
 wrksrc="tdesktop-${version}-full"
 build_style=cmake
 build_helper="qemu"
@@ -23,7 +23,7 @@ makedepends="alsa-lib-devel ffmpeg-devel libdbusmenu-glib-devel libopenal-devel
  libva-devel rapidjson liblz4-devel liblzma-devel rlottie-devel gtk+3-devel
  MesaLib-devel libdbusmenu-qt5-devel qt5-wayland-devel libatomic-devel
  $(vopt_if spellcheck hunspell-devel)"
-depends="qt5-imageformats qt5-core>=5.15.0<5.15.1"
+depends="qt5-imageformats qt5-core>=5.15.1<5.15.2"
 short_desc="Telegram Desktop messaging app"
 maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later WITH OpenSSL"

From dde4b03067c7201a90fe2afa72592c87f2479eca Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 9 Sep 2020 20:51:18 +0200
Subject: [PATCH 5/8] qt5dxcb-plugin: rebuild against qt5.15.1

---
 srcpkgs/qt5dxcb-plugin/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/qt5dxcb-plugin/template b/srcpkgs/qt5dxcb-plugin/template
index 0647370bfb9..7e755d48ea6 100644
--- a/srcpkgs/qt5dxcb-plugin/template
+++ b/srcpkgs/qt5dxcb-plugin/template
@@ -9,7 +9,7 @@ hostmakedepends="pkg-config qt5-qmake"
 makedepends="cairo-devel libSM-devel libXi-devel libxkbcommon-devel
  qt5-x11extras-devel xcb-util-image-devel xcb-util-keysyms-devel
  xcb-util-renderutil-devel xcb-util-wm-devel qt5-xcb-private-headers"
-depends="qt5-core>=5.15.0<5.15.1"
+depends="qt5-core>=5.15.1<5.15.2"
 short_desc="Qt platform plugins for DDE"
 maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"

From ebf0a9175d8051dfcc6a03505043abe6eb007020 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 9 Sep 2020 20:51:32 +0200
Subject: [PATCH 6/8] qt5integration: rebuild for qt5-5.15.1

---
 srcpkgs/qt5integration/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qt5integration/template b/srcpkgs/qt5integration/template
index e1602604d77..f083e559d83 100644
--- a/srcpkgs/qt5integration/template
+++ b/srcpkgs/qt5integration/template
@@ -1,12 +1,12 @@
 # Template file for 'qt5integration'
 pkgname=qt5integration
 version=5.0.0
-revision=5
+revision=7
 build_style=qmake
 hostmakedepends="qt5-qmake pkg-config"
 makedepends="libqtxdg-devel dtkwm-devel dtkwidget-devel mtdev-devel
  qt5-svg-devel qt5-x11extras-devel qt5-multimedia-devel"
-depends="qt5dxcb-plugin qt5-styleplugins qt5-core>=5.15.0<5.15.1"
+depends="qt5dxcb-plugin qt5-styleplugins qt5-core>=5.15.1<5.15.2"
 short_desc="Qt platform theme integration plugins for Deepin Desktop Environment"
 maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"

From b037dc82f751175d2d725f8a31e11fd9b1395b0a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 9 Sep 2020 20:51:47 +0200
Subject: [PATCH 7/8] kwin: rebuild against qt5.15.1

---
 srcpkgs/kwin/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kwin/template b/srcpkgs/kwin/template
index af93c9fe694..ee2fc8b890c 100644
--- a/srcpkgs/kwin/template
+++ b/srcpkgs/kwin/template
@@ -1,7 +1,7 @@
 # Template file for 'kwin'
 pkgname=kwin
 version=5.19.5
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
 hostmakedepends="extra-cmake-modules gettext breeze pkg-config"
@@ -10,7 +10,7 @@ makedepends="plasma-framework-devel kcmutils-devel knewstuff-devel
  kdecoration-devel libxkbcommon-devel libinput-devel libSM-devel
  libICE-devel xcb-util-wm-devel qt5-sensors-devel libcap-devel
  kwayland-server-devel"
-depends="breeze hicolor-icon-theme kinit qt5-core>=5.15.0<5.15.1"
+depends="breeze hicolor-icon-theme kinit qt5-core>=5.15.1<5.15.2"
 short_desc="KDE Window manager"
 maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"

From 291a0e121935f7a18b4a94549d2a335232899a2f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 9 Sep 2020 20:52:04 +0200
Subject: [PATCH 8/8] qt5-styleplugins: rebuild against qt5.15.1

[ci skip]
---
 srcpkgs/qt5-styleplugins/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qt5-styleplugins/template b/srcpkgs/qt5-styleplugins/template
index 06d99c3cbe9..04ae6034582 100644
--- a/srcpkgs/qt5-styleplugins/template
+++ b/srcpkgs/qt5-styleplugins/template
@@ -1,13 +1,13 @@
 # Template file for 'qt5-styleplugins'
 pkgname=qt5-styleplugins
 version=5.0.0
-revision=13
+revision=14
 _gitrev=335dbece103e2cbf6c7cf819ab6672c2956b17b3
 wrksrc="qtstyleplugins-${_gitrev}"
 build_style=qmake
 hostmakedepends="pkg-config qt5-host-tools qt5-devel"
 makedepends="libxcb-devel libxkbcommon-devel libinput-devel tslib-devel gtk+-devel qt5-devel"
-depends="qt5-core>=5.15.0<5.15.1"
+depends="qt5-core>=5.15.1<5.15.2"
 short_desc="Additional style plugins for Qt5"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="LGPL-2.1-only, LGPL-3.0-only"

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PR PATCH] [Closed]: qt5: update to 5.15.1.
  2020-09-09 19:32 [PR PATCH] [WiP] qt5: update to 5.15.1 Johnnynator
  2020-09-10 19:29 ` [PR PATCH] [Updated] " Johnnynator
@ 2020-09-15 11:03 ` Johnnynator
  1 sibling, 0 replies; 3+ messages in thread
From: Johnnynator @ 2020-09-15 11:03 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 156 bytes --]

There's a closed pull request on the void-packages repository

qt5: update to 5.15.1.
https://github.com/void-linux/void-packages/pull/24788

Description:


^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2020-09-15 11:03 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-09-09 19:32 [PR PATCH] [WiP] qt5: update to 5.15.1 Johnnynator
2020-09-10 19:29 ` [PR PATCH] [Updated] " Johnnynator
2020-09-15 11:03 ` [PR PATCH] [Closed]: " Johnnynator

Github messages for voidlinux

This inbox may be cloned and mirrored by anyone:

	git clone --mirror http://inbox.vuxu.org/voidlinux-github

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V1 voidlinux-github voidlinux-github/ http://inbox.vuxu.org/voidlinux-github \
		voidlinux-github@inbox.vuxu.org
	public-inbox-index voidlinux-github

Example config snippet for mirrors.
Newsgroup available over NNTP:
	nntp://inbox.vuxu.org/vuxu.github.voidlinux


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git