From 727ff3a27ee2206cc5d84a47319e79eb24ed2032 Mon Sep 17 00:00:00 2001 From: John Date: Fri, 20 Nov 2020 23:02:49 +0100 Subject: [PATCH 1/6] 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 d11ae1d8865..00000000000 --- 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 838d6f05975..997e68156c6 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 b717438d4dd..16cf6898075 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" From f8bb69f0212ed40f33fd99ee7e565a749948ffcb Mon Sep 17 00:00:00 2001 From: John Date: Fri, 20 Nov 2020 23:02:51 +0100 Subject: [PATCH 2/6] qt5-webview: update to 5.15.2. --- 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 545eb13de73..fc2265296fc 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.1 +version=5.15.2 revision=1 wrksrc="qtwebview-everywhere-src-${version}" build_style=qmake @@ -12,7 +12,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}/submodules/qtwebview-everywhere-src-${version}.tar.xz" -checksum=426852a3f569da82aa84dfd7f06c6aeb06488a927b66342a612401b41392b260 +checksum=be9f46167e4977ead5ef5ecf883fdb812a4120f2436383583792f65557e481e7 build_options="webengine" if [ "$XBPS_TARGET_ENDIAN" = "le" ] && [ "$XBPS_WORDSIZE" = "$XBPS_TARGET_WORDSIZE" ]; then From 7b342f49c41d25c63439ae45951e078ca78af2b5 Mon Sep 17 00:00:00 2001 From: John Date: Fri, 20 Nov 2020 23:02:55 +0100 Subject: [PATCH 3/6] qt5-webengine: update to 5.15.2. --- .../patches/0010-musl-stackstart.patch | 6 +- .../patches/0090-qtwebengine-ppc64.patch | 280 +++++++++--------- .../patches/0091-chromium-ppc64le-musl.patch | 44 +-- ...200-nullptr-rtcpeerconnectionhandler.patch | 39 --- srcpkgs/qt5-webengine/template | 31 +- 5 files changed, 169 insertions(+), 231 deletions(-) delete mode 100644 srcpkgs/qt5-webengine/patches/0200-nullptr-rtcpeerconnectionhandler.patch diff --git a/srcpkgs/qt5-webengine/patches/0010-musl-stackstart.patch b/srcpkgs/qt5-webengine/patches/0010-musl-stackstart.patch index 57136bc2bcd..a9f8ab6c252 100644 --- a/srcpkgs/qt5-webengine/patches/0010-musl-stackstart.patch +++ b/srcpkgs/qt5-webengine/patches/0010-musl-stackstart.patch @@ -4,11 +4,11 @@ // FIXME: On Mac OSX and Linux, this method cannot estimate stack size // correctly for the main thread. --#if defined(__GLIBC__) || defined(OS_ANDROID) || defined(OS_FREEBSD) || \ -+#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FREEBSD) || \ +-#elif defined(__GLIBC__) || defined(OS_ANDROID) || defined(OS_FREEBSD) || \ ++#elif defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FREEBSD) || \ defined(OS_FUCHSIA) // pthread_getattr_np() can fail if the thread is not invoked by - // pthread_create() (e.g., the main thread of webkit_unit_tests). + // pthread_create() (e.g., the main thread of blink_unittests). @@ -96,7 +96,7 @@ } diff --git a/srcpkgs/qt5-webengine/patches/0090-qtwebengine-ppc64.patch b/srcpkgs/qt5-webengine/patches/0090-qtwebengine-ppc64.patch index 21957425e31..31cfa708409 100644 --- a/srcpkgs/qt5-webengine/patches/0090-qtwebengine-ppc64.patch +++ b/srcpkgs/qt5-webengine/patches/0090-qtwebengine-ppc64.patch @@ -1,8 +1,8 @@ diff --git a/src/3rdparty/chromium/chrome/installer/linux/BUILD.gn b/src/3rdparty/chromium/chrome/installer/linux/BUILD.gn -index 64ba93f44..0cb3d1623 100644 +index 9c92012ce..a4a5cd86d 100644 --- a/src/3rdparty/chromium/chrome/installer/linux/BUILD.gn +++ b/src/3rdparty/chromium/chrome/installer/linux/BUILD.gn -@@ -62,8 +62,6 @@ packaging_files = packaging_files_binaries + [ +@@ -65,8 +65,6 @@ packaging_files = packaging_files_binaries + [ "$root_out_dir/xdg-mime", "$root_out_dir/xdg-settings", "$root_out_dir/locales/en-US.pak", @@ -11,7 +11,7 @@ index 64ba93f44..0cb3d1623 100644 ] action_foreach("calculate_deb_dependencies") { -@@ -350,7 +348,6 @@ group("installer_deps") { +@@ -331,7 +329,6 @@ group("installer_deps") { ":theme_files", "//chrome", "//chrome:packed_resources", @@ -19,36 +19,24 @@ index 64ba93f44..0cb3d1623 100644 "//sandbox/linux:chrome_sandbox", "//third_party/crashpad/crashpad/handler:crashpad_handler", ] -diff --git a/src/3rdparty/chromium/media/gpu/vaapi/vaapi_picture_tfp.cc b/src/3rdparty/chromium/media/gpu/vaapi/vaapi_picture_tfp.cc -index f65d580da..abd9aa969 100644 ---- a/src/3rdparty/chromium/media/gpu/vaapi/vaapi_picture_tfp.cc -+++ b/src/3rdparty/chromium/media/gpu/vaapi/vaapi_picture_tfp.cc -@@ -55,7 +55,7 @@ bool VaapiTFPPicture::Initialize() { - if (make_context_current_cb_ && !make_context_current_cb_.Run()) - return false; - -- glx_image_ = new gl::GLImageGLX(size_, GL_RGB); -+ glx_image_ = new gl::GLImageGLX(size_, gfx::BufferFormat::BGRX_8888); - if (!glx_image_->Initialize(x_pixmap_)) { - // x_pixmap_ will be freed in the destructor. - DLOG(ERROR) << "Failed creating a GLX Pixmap for TFP"; diff --git a/src/3rdparty/chromium/sandbox/features.gni b/src/3rdparty/chromium/sandbox/features.gni -index 89693c54c..6017c7eea 100644 +index 09280d35f..42514157f 100644 --- a/src/3rdparty/chromium/sandbox/features.gni +++ b/src/3rdparty/chromium/sandbox/features.gni -@@ -12,6 +12,6 @@ use_seccomp_bpf = - (is_linux || is_android) && - (current_cpu == "x86" || current_cpu == "x64" || current_cpu == "arm" || - current_cpu == "arm64" || current_cpu == "mipsel" || -- current_cpu == "mips64el") -+ current_cpu == "mips64el" || current_cpu == "ppc64") +@@ -11,6 +11,7 @@ import("//build/config/nacl/config.gni") + use_seccomp_bpf = (is_linux || is_android) && + (current_cpu == "x86" || current_cpu == "x64" || + current_cpu == "arm" || current_cpu == "arm64" || +- current_cpu == "mipsel" || current_cpu == "mips64el") ++ current_cpu == "mipsel" || current_cpu == "mips64el" || ++ current_cpu == "ppc64") use_seccomp_bpf = use_seccomp_bpf || is_nacl_nonsfi diff --git a/src/3rdparty/chromium/sandbox/linux/BUILD.gn b/src/3rdparty/chromium/sandbox/linux/BUILD.gn -index b00a88cfa..b3e55d5cb 100644 +index c27351f9a..9141e1239 100644 --- a/src/3rdparty/chromium/sandbox/linux/BUILD.gn +++ b/src/3rdparty/chromium/sandbox/linux/BUILD.gn -@@ -416,6 +416,8 @@ component("sandbox_services") { +@@ -407,6 +407,8 @@ component("sandbox_services") { source_set("sandbox_services_headers") { sources = [ @@ -142,7 +130,7 @@ index 1a407b952..a6aec544e 100644 #error Unsupported target platform diff --git a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc -index 768025ce1..e436910c0 100644 +index 712f9699a..55f062817 100644 --- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc +++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc @@ -88,7 +88,8 @@ bool IsBaselinePolicyWatched(int sysno) { @@ -184,7 +172,7 @@ index 768025ce1..e436910c0 100644 return RestrictSocketcallCommand(); #endif diff --git a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/baseline_policy_unittest.cc b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/baseline_policy_unittest.cc -index 41fdde3bf..7a38e73c0 100644 +index fc36187c9..1affc9189 100644 --- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/baseline_policy_unittest.cc +++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/baseline_policy_unittest.cc @@ -291,8 +291,10 @@ TEST_BASELINE_SIGSYS(__NR_timer_create) @@ -199,7 +187,7 @@ index 41fdde3bf..7a38e73c0 100644 #if defined(LIBC_GLIBC) && !defined(OS_CHROMEOS) BPF_TEST_C(BaselinePolicy, FutexEINVAL, BaselinePolicy) { diff --git a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc -index d9789a713..6ff40c9b0 100644 +index 002b07a25..f390f106a 100644 --- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc +++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc @@ -36,7 +36,8 @@ @@ -276,7 +264,7 @@ index d9789a713..6ff40c9b0 100644 ResultExpr RestrictSocketcallCommand() { // Unfortunately, we are unable to restrict the first parameter to // socketpair(2). Whilst initially sounding bad, it's noteworthy that very -@@ -420,7 +446,7 @@ ResultExpr RestrictPrlimit(pid_t target_pid) { +@@ -429,7 +455,7 @@ ResultExpr RestrictPrlimitToGetrlimit(pid_t target_pid) { ResultExpr RestrictPtrace() { const Arg request(0); return Switch(request).CASES(( @@ -284,9 +272,9 @@ index d9789a713..6ff40c9b0 100644 +#if !defined(__aarch64__) && !defined(__powerpc64__) PTRACE_GETREGS, PTRACE_GETFPREGS, - PTRACE_GET_THREAD_AREA, + #if defined(TRACE_GET_THREAD_AREA) diff --git a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.h b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.h -index 15442892b..50fa559f3 100644 +index ba4289f05..9a4d5ab2d 100644 --- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.h +++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.h @@ -48,7 +48,7 @@ SANDBOX_EXPORT bpf_dsl::ResultExpr RestrictMprotectFlags(); @@ -299,7 +287,7 @@ index 15442892b..50fa559f3 100644 // sendto(2), recvfrom(2), shutdown(2), sendmsg(2) and recvmsg(2). SANDBOX_EXPORT bpf_dsl::ResultExpr RestrictSocketcallCommand(); diff --git a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc -index d9d18822f..4ce4263ff 100644 +index e16223a5e..8f37dd7dc 100644 --- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc +++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc @@ -29,7 +29,8 @@ bool SyscallSets::IsAllowedGettime(int sysno) { @@ -449,25 +437,25 @@ index d9d18822f..4ce4263ff 100644 case __NR_shutdown: #endif return true; -@@ -389,7 +401,7 @@ bool SyscallSets::IsAllowedProcessStartOrDeath(int sysno) { - case __NR_exit_group: +@@ -390,7 +402,7 @@ bool SyscallSets::IsAllowedProcessStartOrDeath(int sysno) { + case __NR_membarrier: case __NR_wait4: case __NR_waitid: -#if defined(__i386__) +#if defined(__i386__) || defined(__powerpc64__) case __NR_waitpid: #endif - return true; -@@ -406,7 +418,7 @@ bool SyscallSets::IsAllowedProcessStartOrDeath(int sysno) { - #endif + #if !defined(__GLIBC__) +@@ -412,7 +424,7 @@ bool SyscallSets::IsAllowedProcessStartOrDeath(int sysno) { case __NR_set_tid_address: + #endif case __NR_unshare: -#if !defined(__mips__) && !defined(__aarch64__) +#if !defined(__mips__) && !defined(__aarch64__) || defined(__powerpc64__) case __NR_vfork: #endif default: -@@ -455,7 +467,7 @@ bool SyscallSets::IsAllowedGetOrModifySocket(int sysno) { +@@ -461,7 +473,7 @@ bool SyscallSets::IsAllowedGetOrModifySocket(int sysno) { return true; default: #if defined(__x86_64__) || defined(__arm__) || defined(__mips__) || \ @@ -476,7 +464,7 @@ index d9d18822f..4ce4263ff 100644 case __NR_socketpair: // We will want to inspect its argument. #endif return false; -@@ -465,7 +477,7 @@ bool SyscallSets::IsAllowedGetOrModifySocket(int sysno) { +@@ -471,7 +483,7 @@ bool SyscallSets::IsAllowedGetOrModifySocket(int sysno) { bool SyscallSets::IsDeniedGetOrModifySocket(int sysno) { switch (sysno) { #if defined(__x86_64__) || defined(__arm__) || defined(__mips__) || \ @@ -485,7 +473,7 @@ index d9d18822f..4ce4263ff 100644 case __NR_accept: case __NR_accept4: case __NR_bind: -@@ -480,7 +492,8 @@ bool SyscallSets::IsDeniedGetOrModifySocket(int sysno) { +@@ -486,7 +498,8 @@ bool SyscallSets::IsDeniedGetOrModifySocket(int sysno) { } #if defined(__i386__) || \ @@ -495,7 +483,7 @@ index d9d18822f..4ce4263ff 100644 // Big multiplexing system call for sockets. bool SyscallSets::IsSocketCall(int sysno) { switch (sysno) { -@@ -494,7 +507,8 @@ bool SyscallSets::IsSocketCall(int sysno) { +@@ -500,7 +513,8 @@ bool SyscallSets::IsSocketCall(int sysno) { } #endif @@ -505,7 +493,7 @@ index d9d18822f..4ce4263ff 100644 bool SyscallSets::IsNetworkSocketInformation(int sysno) { switch (sysno) { case __NR_getpeername: -@@ -519,7 +533,7 @@ bool SyscallSets::IsAllowedAddressSpaceAccess(int sysno) { +@@ -528,7 +542,7 @@ bool SyscallSets::IsAllowedAddressSpaceAccess(int sysno) { case __NR_mincore: case __NR_mlockall: #if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \ @@ -514,7 +502,7 @@ index d9d18822f..4ce4263ff 100644 case __NR_mmap: #endif #if defined(__i386__) || defined(__arm__) || \ -@@ -549,7 +563,8 @@ bool SyscallSets::IsAllowedGeneralIo(int sysno) { +@@ -560,7 +574,8 @@ bool SyscallSets::IsAllowedGeneralIo(int sysno) { switch (sysno) { case __NR_lseek: #if defined(__i386__) || defined(__arm__) || \ @@ -524,7 +512,7 @@ index d9d18822f..4ce4263ff 100644 case __NR__llseek: #endif #if !defined(__aarch64__) -@@ -561,26 +576,28 @@ bool SyscallSets::IsAllowedGeneralIo(int sysno) { +@@ -572,26 +587,28 @@ bool SyscallSets::IsAllowedGeneralIo(int sysno) { case __NR_readv: case __NR_pread64: #if defined(__arm__) || \ @@ -559,7 +547,7 @@ index d9d18822f..4ce4263ff 100644 case __NR_sendmsg: // Could specify destination. case __NR_sendto: // Could specify destination. #endif -@@ -637,7 +654,8 @@ bool SyscallSets::IsAllowedBasicScheduler(int sysno) { +@@ -648,7 +665,8 @@ bool SyscallSets::IsAllowedBasicScheduler(int sysno) { return true; case __NR_getpriority: #if defined(__i386__) || defined(__arm__) || \ @@ -569,7 +557,7 @@ index d9d18822f..4ce4263ff 100644 case __NR_nice: #endif case __NR_setpriority: -@@ -649,7 +667,8 @@ bool SyscallSets::IsAllowedBasicScheduler(int sysno) { +@@ -660,7 +678,8 @@ bool SyscallSets::IsAllowedBasicScheduler(int sysno) { bool SyscallSets::IsAdminOperation(int sysno) { switch (sysno) { #if defined(__i386__) || defined(__arm__) || \ @@ -579,7 +567,7 @@ index d9d18822f..4ce4263ff 100644 case __NR_bdflush: #endif case __NR_kexec_load: -@@ -665,7 +684,8 @@ bool SyscallSets::IsAdminOperation(int sysno) { +@@ -676,7 +695,8 @@ bool SyscallSets::IsAdminOperation(int sysno) { bool SyscallSets::IsKernelModule(int sysno) { switch (sysno) { @@ -589,7 +577,7 @@ index d9d18822f..4ce4263ff 100644 case __NR_create_module: case __NR_get_kernel_syms: // Should ENOSYS. case __NR_query_module: -@@ -698,7 +718,8 @@ bool SyscallSets::IsFsControl(int sysno) { +@@ -709,7 +729,8 @@ bool SyscallSets::IsFsControl(int sysno) { case __NR_swapoff: case __NR_swapon: #if defined(__i386__) || \ @@ -599,7 +587,7 @@ index d9d18822f..4ce4263ff 100644 case __NR_umount: #endif case __NR_umount2: -@@ -714,7 +735,7 @@ bool SyscallSets::IsNuma(int sysno) { +@@ -725,7 +746,7 @@ bool SyscallSets::IsNuma(int sysno) { case __NR_getcpu: case __NR_mbind: #if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \ @@ -608,7 +596,7 @@ index d9d18822f..4ce4263ff 100644 case __NR_migrate_pages: #endif case __NR_move_pages: -@@ -743,14 +764,15 @@ bool SyscallSets::IsGlobalProcessEnvironment(int sysno) { +@@ -754,14 +775,15 @@ bool SyscallSets::IsGlobalProcessEnvironment(int sysno) { switch (sysno) { case __NR_acct: // Privileged. #if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \ @@ -627,7 +615,7 @@ index d9d18822f..4ce4263ff 100644 case __NR_ulimit: #endif case __NR_getrusage: -@@ -784,7 +806,7 @@ bool SyscallSets::IsGlobalSystemStatus(int sysno) { +@@ -795,7 +817,7 @@ bool SyscallSets::IsGlobalSystemStatus(int sysno) { #endif case __NR_sysinfo: case __NR_uname: @@ -636,7 +624,7 @@ index d9d18822f..4ce4263ff 100644 case __NR_olduname: case __NR_oldolduname: #endif -@@ -879,7 +902,8 @@ bool SyscallSets::IsSystemVMessageQueue(int sysno) { +@@ -890,7 +912,8 @@ bool SyscallSets::IsSystemVMessageQueue(int sysno) { #endif #if defined(__i386__) || \ @@ -646,7 +634,7 @@ index d9d18822f..4ce4263ff 100644 // Big system V multiplexing system call. bool SyscallSets::IsSystemVIpc(int sysno) { switch (sysno) { -@@ -899,7 +923,8 @@ bool SyscallSets::IsAnySystemV(int sysno) { +@@ -910,7 +933,8 @@ bool SyscallSets::IsAnySystemV(int sysno) { return IsSystemVMessageQueue(sysno) || IsSystemVSemaphores(sysno) || IsSystemVSharedMemory(sysno); #elif defined(__i386__) || \ @@ -656,7 +644,7 @@ index d9d18822f..4ce4263ff 100644 return IsSystemVIpc(sysno); #endif } -@@ -952,7 +977,8 @@ bool SyscallSets::IsFaNotify(int sysno) { +@@ -963,7 +987,8 @@ bool SyscallSets::IsFaNotify(int sysno) { bool SyscallSets::IsTimer(int sysno) { switch (sysno) { case __NR_getitimer: @@ -666,7 +654,7 @@ index d9d18822f..4ce4263ff 100644 case __NR_alarm: #endif case __NR_setitimer: -@@ -1011,18 +1037,22 @@ bool SyscallSets::IsMisc(int sysno) { +@@ -1022,18 +1047,22 @@ bool SyscallSets::IsMisc(int sysno) { case __NR_syncfs: case __NR_vhangup: // The system calls below are not implemented. @@ -693,7 +681,7 @@ index d9d18822f..4ce4263ff 100644 case __NR_gtty: case __NR_idle: case __NR_lock: -@@ -1030,20 +1060,22 @@ bool SyscallSets::IsMisc(int sysno) { +@@ -1041,20 +1070,22 @@ bool SyscallSets::IsMisc(int sysno) { case __NR_prof: case __NR_profil: #endif @@ -721,7 +709,7 @@ index d9d18822f..4ce4263ff 100644 #endif return true; diff --git a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_sets.h b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_sets.h -index 923533ec9..99184a7f9 100644 +index 923533ec9..e2bb1db98 100644 --- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_sets.h +++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_sets.h @@ -43,13 +43,14 @@ class SANDBOX_EXPORT SyscallSets { @@ -741,7 +729,7 @@ index 923533ec9..99184a7f9 100644 static bool IsNetworkSocketInformation(int sysno); #endif -@@ -88,7 +90,8 @@ class SANDBOX_EXPORT SyscallSets { +@@ -88,7 +89,8 @@ class SANDBOX_EXPORT SyscallSets { #endif #if defined(__i386__) || \ @@ -852,10 +840,10 @@ index 34edabd2b..10fa5fd07 100644 SECCOMP_RESULT(ctx) = static_cast(ret_val); } diff --git a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf/trap.cc b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf/trap.cc -index 003708d2c..8f9b3af4e 100644 +index 663d9e896..f55e03ed5 100644 --- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf/trap.cc +++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf/trap.cc -@@ -225,6 +225,20 @@ void Trap::SigSys(int nr, LinuxSigInfo* info, ucontext_t* ctx) { +@@ -237,6 +237,20 @@ void Trap::SigSys(int nr, LinuxSigInfo* info, ucontext_t* ctx) { SetIsInSigHandler(); } @@ -877,10 +865,10 @@ index 003708d2c..8f9b3af4e 100644 // is what we are showing to TrapFnc callbacks that the system call // evaluator registered with the sandbox. diff --git a/src/3rdparty/chromium/sandbox/linux/services/credentials.cc b/src/3rdparty/chromium/sandbox/linux/services/credentials.cc -index 542567f3e..31d493c26 100644 +index d7b5d8c44..4adc6d0d4 100644 --- a/src/3rdparty/chromium/sandbox/linux/services/credentials.cc +++ b/src/3rdparty/chromium/sandbox/linux/services/credentials.cc -@@ -79,7 +79,7 @@ bool ChrootToSafeEmptyDir() { +@@ -81,7 +81,7 @@ bool ChrootToSafeEmptyDir() { pid_t pid = -1; alignas(16) char stack_buf[PTHREAD_STACK_MIN]; #if defined(ARCH_CPU_X86_FAMILY) || defined(ARCH_CPU_ARM_FAMILY) || \ @@ -903,10 +891,10 @@ index fcfd2aa12..f6eb32fb7 100644 return syscall(__NR_clone, flags, child_stack, ptid, tls, ctid); #endif diff --git a/src/3rdparty/chromium/sandbox/linux/syscall_broker/broker_process.cc b/src/3rdparty/chromium/sandbox/linux/syscall_broker/broker_process.cc -index 19b825a15..474d17351 100644 +index 8321d2379..7e5ad1de3 100644 --- a/src/3rdparty/chromium/sandbox/linux/syscall_broker/broker_process.cc +++ b/src/3rdparty/chromium/sandbox/linux/syscall_broker/broker_process.cc -@@ -153,7 +153,7 @@ bool BrokerProcess::IsSyscallAllowed(int sysno) const { +@@ -157,7 +157,7 @@ bool BrokerProcess::IsSyscallAllowed(int sysno) const { #if defined(__NR_fstatat) case __NR_fstatat: #endif @@ -1019,7 +1007,7 @@ index 000000000..07728e087 + +#endif // SANDBOX_LINUX_SYSTEM_HEADERS_PPC64_LINUX_UCONTEXT_H_ diff --git a/src/3rdparty/chromium/services/service_manager/sandbox/linux/bpf_renderer_policy_linux.cc b/src/3rdparty/chromium/services/service_manager/sandbox/linux/bpf_renderer_policy_linux.cc -index 017f13cf7..a76e579b7 100644 +index 443e9114b..6df5678d6 100644 --- a/src/3rdparty/chromium/services/service_manager/sandbox/linux/bpf_renderer_policy_linux.cc +++ b/src/3rdparty/chromium/services/service_manager/sandbox/linux/bpf_renderer_policy_linux.cc @@ -15,6 +15,11 @@ @@ -1057,7 +1045,7 @@ index 3a807e1e3..5258617a7 100644 } // Write boolean values as their names instead of integral value. diff --git a/src/3rdparty/chromium/third_party/angle/src/libANGLE/Constants.h b/src/3rdparty/chromium/third_party/angle/src/libANGLE/Constants.h -index 016426651..9b6a9aef9 100644 +index 746789913..9132b3fc0 100644 --- a/src/3rdparty/chromium/third_party/angle/src/libANGLE/Constants.h +++ b/src/3rdparty/chromium/third_party/angle/src/libANGLE/Constants.h @@ -9,6 +9,7 @@ @@ -1069,10 +1057,10 @@ index 016426651..9b6a9aef9 100644 #include diff --git a/src/3rdparty/chromium/third_party/boringssl/BUILD.gn b/src/3rdparty/chromium/third_party/boringssl/BUILD.gn -index a8aa9c9ec..5478458ad 100644 +index b435499f4..ac8a84b6d 100644 --- a/src/3rdparty/chromium/third_party/boringssl/BUILD.gn +++ b/src/3rdparty/chromium/third_party/boringssl/BUILD.gn -@@ -100,6 +100,13 @@ if (is_win && !is_msan && current_cpu != "arm64") { +@@ -101,6 +101,13 @@ if (is_win && !is_msan && current_cpu != "arm64") { } else { public_configs = [ ":no_asm_config" ] } @@ -1186,7 +1174,7 @@ index aae1dc13b..03afec7a5 100644 + } // namespace google_breakpad diff --git a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.h b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.h -index fb216fa6d..fb669126f 100644 +index fb216fa6d..593aac822 100644 --- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.h +++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.h @@ -68,6 +68,10 @@ struct ThreadInfo { @@ -1213,7 +1201,7 @@ index fb216fa6d..fb669126f 100644 } // namespace google_breakpad diff --git a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc -index 6ee6cc1e4..477352e37 100644 +index a8f9ccc72..7620cf6f7 100644 --- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc +++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc @@ -254,6 +254,48 @@ void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext_t *uc) { @@ -1266,7 +1254,7 @@ index 6ee6cc1e4..477352e37 100644 } // namespace google_breakpad diff --git a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h -index f830618f2..6248818e7 100644 +index f3dde1f4d..96079169d 100644 --- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h +++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h @@ -54,6 +54,9 @@ struct UContextReader { @@ -1458,10 +1446,10 @@ index c2fea0225..8c62c524a 100644 ASSERT_NE(std::string::npos, buf.find("M 00001000 0000002A 00001000 " diff --git a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_core_dumper.cc b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_core_dumper.cc -index 415068983..b93e4afcf 100644 +index 4756a5416..4805fb694 100644 --- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_core_dumper.cc +++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_core_dumper.cc -@@ -112,6 +112,9 @@ bool LinuxCoreDumper::GetThreadInfoByIndex(size_t index, ThreadInfo* info) { +@@ -117,6 +117,9 @@ bool LinuxCoreDumper::GetThreadInfoByIndex(size_t index, ThreadInfo* info) { #elif defined(__mips__) stack_pointer = reinterpret_cast(info->mcontext.gregs[MD_CONTEXT_MIPS_REG_SP]); @@ -1471,7 +1459,7 @@ index 415068983..b93e4afcf 100644 #else #error "This code hasn't been ported to your platform yet." #endif -@@ -197,7 +200,10 @@ bool LinuxCoreDumper::EnumerateThreads() { +@@ -202,7 +205,10 @@ bool LinuxCoreDumper::EnumerateThreads() { memset(&info, 0, sizeof(ThreadInfo)); info.tgid = status->pr_pgrp; info.ppid = status->pr_ppid; @@ -1526,10 +1514,10 @@ index 3ad48e501..1688c365e 100644 #error This test has not been ported to this platform. #endif diff --git a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper.cc b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper.cc -index e3ddb81a6..fa28575ef 100644 +index 8a3f04e29..e607b28d5 100644 --- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper.cc +++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper.cc -@@ -149,19 +149,27 @@ bool LinuxPtraceDumper::CopyFromProcess(void* dest, pid_t child, +@@ -154,19 +154,27 @@ bool LinuxPtraceDumper::CopyFromProcess(void* dest, pid_t child, return true; } @@ -1561,7 +1549,7 @@ index e3ddb81a6..fa28575ef 100644 return true; #else return false; -@@ -298,6 +306,9 @@ bool LinuxPtraceDumper::GetThreadInfoByIndex(size_t index, ThreadInfo* info) { +@@ -303,6 +311,9 @@ bool LinuxPtraceDumper::GetThreadInfoByIndex(size_t index, ThreadInfo* info) { #elif defined(__mips__) stack_pointer = reinterpret_cast(info->mcontext.gregs[MD_CONTEXT_MIPS_REG_SP]); @@ -1652,7 +1640,7 @@ index f8cdf2a1c..cb808c151 100644 #endif LinuxDumper* dumper_; diff --git a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.h b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.h -index d1dc33121..63d805922 100644 +index d1cc5624c..320847643 100644 --- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.h +++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.h @@ -47,6 +47,8 @@ class ExceptionHandler; @@ -1662,7 +1650,7 @@ index d1dc33121..63d805922 100644 +#elif defined(__powerpc64__) +typedef vrregset_t vstate_t; #elif !defined(__ARM_EABI__) && !defined(__mips__) - typedef struct _libc_fpstate fpstate_t; + typedef struct _fpstate fpstate_t; #endif diff --git a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer_unittest.cc b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer_unittest.cc index c951e69d8..e1d6e40d6 100644 @@ -2237,7 +2225,7 @@ index fb23c4679..eebede63c 100644 }; diff --git a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/cpu_context_linux.h b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/cpu_context_linux.h -index 37fbc4325..cf4ef7ef9 100644 +index 9f46a4897..aa677c4eb 100644 --- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/cpu_context_linux.h +++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/cpu_context_linux.h @@ -15,6 +15,7 @@ @@ -2491,7 +2479,7 @@ index 5b5723616..049c32858 100644 module.ehdr.e_version = EV_CURRENT; diff --git a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/signal_context.h b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/signal_context.h -index 110024680..8e335a096 100644 +index 110024680..a1f2da259 100644 --- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/signal_context.h +++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/signal_context.h @@ -422,6 +422,89 @@ static_assert(offsetof(UContext, mcontext.fpregs) == @@ -2691,10 +2679,10 @@ index 155a1e0c6..5e50ceb5f 100644 void* alloc = sbrk(alloc_size); if (reinterpret_cast(alloc) == -1) { diff --git a/src/3rdparty/chromium/third_party/crashpad/crashpad/util/linux/ptracer.cc b/src/3rdparty/chromium/third_party/crashpad/crashpad/util/linux/ptracer.cc -index c6c922994..c770b6b6f 100644 +index 557e0d363..08ae434b8 100644 --- a/src/3rdparty/chromium/third_party/crashpad/crashpad/util/linux/ptracer.cc +++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/util/linux/ptracer.cc -@@ -394,6 +394,64 @@ bool GetThreadArea64(pid_t tid, +@@ -398,6 +398,64 @@ bool GetThreadArea64(pid_t tid, return true; } @@ -2759,7 +2747,7 @@ index c6c922994..c770b6b6f 100644 #else #error Port. #endif // ARCH_CPU_X86_FAMILY -@@ -486,6 +544,9 @@ bool Ptracer::GetThreadInfo(pid_t tid, ThreadInfo* info) { +@@ -494,6 +552,9 @@ bool Ptracer::GetThreadInfo(pid_t tid, ThreadInfo* info) { if (is_64_bit_) { return GetGeneralPurposeRegisters64(tid, &info->thread_context, can_log_) && GetFloatingPointRegisters64(tid, &info->float_context, can_log_) && @@ -2892,10 +2880,10 @@ index 5b55c24a7..dea0d1f39 100644 LinuxVMAddress thread_specific_data_address; }; diff --git a/src/3rdparty/chromium/third_party/crashpad/crashpad/util/misc/capture_context.h b/src/3rdparty/chromium/third_party/crashpad/crashpad/util/misc/capture_context.h -index 541589dfd..5b0fc8218 100644 +index a88a10336..b0d6578bd 100644 --- a/src/3rdparty/chromium/third_party/crashpad/crashpad/util/misc/capture_context.h +++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/util/misc/capture_context.h -@@ -66,6 +66,7 @@ using NativeCPUContext = ucontext_t; +@@ -70,6 +70,7 @@ using NativeCPUContext = ucontext_t; //! macOS/Linux/Fuchsia | x86_64 | `%%rdi` //! Linux | ARM/ARM64 | `r0`/`x0` //! Linux | MIPS/MIPS64 | `$a0` @@ -2904,19 +2892,19 @@ index 541589dfd..5b0fc8218 100644 //! Additionally, the value `LR` on ARM/ARM64 will be the return address of //! this function. diff --git a/src/3rdparty/chromium/third_party/crashpad/crashpad/util/misc/capture_context_linux.S b/src/3rdparty/chromium/third_party/crashpad/crashpad/util/misc/capture_context_linux.S -index de71e7231..af0ffff39 100644 +index 52215ee5d..b3e4a3ec7 100644 --- a/src/3rdparty/chromium/third_party/crashpad/crashpad/util/misc/capture_context_linux.S +++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/util/misc/capture_context_linux.S -@@ -28,7 +28,7 @@ - .globl CAPTURECONTEXT_SYMBOL2 - #if defined(__i386__) || defined(__x86_64__) - .balign 16, 0x90 --#elif defined(__arm__) || defined(__aarch64__) || defined(__mips__) -+#elif defined(__arm__) || defined(__aarch64__) || defined(__mips__) || defined(__powerpc64__) +@@ -32,7 +32,7 @@ + .balign 4, 0x0 + .type CAPTURECONTEXT_SYMBOL, %function + .type CAPTURECONTEXT_SYMBOL2, %function +-#elif defined(__mips__) ++#elif defined(__mips__) || defined(__powerpc64__) .balign 4, 0x0 #endif -@@ -419,4 +419,214 @@ CAPTURECONTEXT_SYMBOL2: +@@ -423,4 +423,214 @@ CAPTURECONTEXT_SYMBOL2: jr $ra .set at @@ -3218,10 +3206,10 @@ index 58bfa8f83..8fc37c464 100644 #if defined(ARCH_CPU_X86_FAMILY) || defined(ARCH_CPU_ARMEL) case SIGILL: { diff --git a/src/3rdparty/chromium/third_party/dav1d/BUILD.gn b/src/3rdparty/chromium/third_party/dav1d/BUILD.gn -index 63f12f805..99cc13fd9 100644 +index 788dc6cff..5fd7e8fda 100644 --- a/src/3rdparty/chromium/third_party/dav1d/BUILD.gn +++ b/src/3rdparty/chromium/third_party/dav1d/BUILD.gn -@@ -177,6 +177,8 @@ static_library("dav1d_8bit") { +@@ -182,6 +182,8 @@ static_library("dav1d_8bit") { sources += arm_template_sources } else if (current_cpu == "arm64") { sources += arm_template_sources @@ -3230,7 +3218,7 @@ index 63f12f805..99cc13fd9 100644 } cflags = dav1d_copts -@@ -205,6 +207,8 @@ static_library("dav1d_10bit") { +@@ -210,6 +212,8 @@ static_library("dav1d_10bit") { sources += arm_template_sources } else if (current_cpu == "arm64") { sources += arm_template_sources @@ -3239,7 +3227,7 @@ index 63f12f805..99cc13fd9 100644 } cflags = dav1d_copts -@@ -244,6 +248,21 @@ if (current_cpu == "x86" || current_cpu == "x64") { +@@ -256,6 +260,21 @@ if (current_cpu == "x86" || current_cpu == "x64") { ":dav1d_config", ] @@ -3261,7 +3249,7 @@ index 63f12f805..99cc13fd9 100644 cflags = dav1d_copts } } -@@ -273,5 +292,7 @@ static_library("dav1d") { +@@ -285,5 +304,7 @@ static_library("dav1d") { } } else if (current_cpu == "arm" || current_cpu == "arm64") { deps += [ ":dav1d_arm" ] @@ -3271,10 +3259,10 @@ index 63f12f805..99cc13fd9 100644 } diff --git a/src/3rdparty/chromium/third_party/dav1d/config/linux/ppc64/config.h b/src/3rdparty/chromium/third_party/dav1d/config/linux/ppc64/config.h new file mode 100644 -index 000000000..f6ca57f7f +index 000000000..9fbbf75cc --- /dev/null +++ b/src/3rdparty/chromium/third_party/dav1d/config/linux/ppc64/config.h -@@ -0,0 +1,35 @@ +@@ -0,0 +1,39 @@ +/* + * Autogenerated by the Meson build system. + * Do not edit, your changes will be lost. @@ -3298,12 +3286,16 @@ index 000000000..f6ca57f7f + +#define CONFIG_8BPC 1 + -+#define CONFIG_LOG 1 ++// #define CONFIG_LOG 1 -- Logging is controlled by Chromium + +#define ENDIANNESS_BIG 0 + +#define HAVE_ASM 1 + ++#define HAVE_CLOCK_GETTIME 1 ++ ++#define HAVE_DLSYM 1 ++ +#define HAVE_GETAUXVAL 1 + +#define HAVE_POSIX_MEMALIGN 1 @@ -3311,10 +3303,10 @@ index 000000000..f6ca57f7f +#define HAVE_UNISTD_H 1 + diff --git a/src/3rdparty/chromium/third_party/dav1d/dav1d_generated.gni b/src/3rdparty/chromium/third_party/dav1d/dav1d_generated.gni -index e5c6fda31..34c0320f4 100644 +index 458935cd8..f0cbc4aed 100644 --- a/src/3rdparty/chromium/third_party/dav1d/dav1d_generated.gni +++ b/src/3rdparty/chromium/third_party/dav1d/dav1d_generated.gni -@@ -61,6 +61,11 @@ arm_template_sources = [ +@@ -70,6 +70,11 @@ arm_template_sources = [ "libdav1d/src/arm/mc_init_tmpl.c", ] @@ -3327,10 +3319,10 @@ index e5c6fda31..34c0320f4 100644 "libdav1d/src/cdef_apply_tmpl.c", "libdav1d/src/cdef_tmpl.c", diff --git a/src/3rdparty/chromium/third_party/dav1d/generate_source.py b/src/3rdparty/chromium/third_party/dav1d/generate_source.py -index 0ca1c5595..46ae92ec7 100755 +index 9ab5e00b8..ad3feffee 100755 --- a/src/3rdparty/chromium/third_party/dav1d/generate_source.py +++ b/src/3rdparty/chromium/third_party/dav1d/generate_source.py -@@ -53,7 +53,8 @@ def WriteGn(fd): +@@ -50,7 +50,8 @@ def WriteGn(fd): WriteArray(fd, "arm32_asm_sources", glob.glob("libdav1d/src/arm/32/*.S")) WriteArray(fd, "arm64_asm_sources", glob.glob("libdav1d/src/arm/64/*.S")) WriteArray(fd, "arm_template_sources", glob.glob("libdav1d/src/arm/*_tmpl.c")) @@ -3365,10 +3357,10 @@ index 0b4bd72f0..a0caa5e71 100644 + #endif /* DAV1D_SRC_PPC_TYPES_H */ diff --git a/src/3rdparty/chromium/third_party/libdrm/src/xf86drm.c b/src/3rdparty/chromium/third_party/libdrm/src/xf86drm.c -index 1e87610b6..d1283f256 100644 +index b7d586591..cead05021 100644 --- a/src/3rdparty/chromium/third_party/libdrm/src/xf86drm.c +++ b/src/3rdparty/chromium/third_party/libdrm/src/xf86drm.c -@@ -54,10 +54,10 @@ +@@ -51,10 +51,10 @@ #include #include #include @@ -3382,10 +3374,10 @@ index 1e87610b6..d1283f256 100644 #endif #include diff --git a/src/3rdparty/chromium/third_party/lss/linux_syscall_support.h b/src/3rdparty/chromium/third_party/lss/linux_syscall_support.h -index 8e0cc3857..70b4da2e0 100644 +index 597d8b6e5..99d1ec0c7 100644 --- a/src/3rdparty/chromium/third_party/lss/linux_syscall_support.h +++ b/src/3rdparty/chromium/third_party/lss/linux_syscall_support.h -@@ -3914,7 +3914,7 @@ struct kernel_statfs { +@@ -3931,7 +3931,7 @@ struct kernel_statfs { LSS_REG(2, buf); LSS_BODY(void*, mmap2, "0"(__r2)); } @@ -3394,7 +3386,7 @@ index 8e0cc3857..70b4da2e0 100644 #define __NR__mmap2 __NR_mmap2 LSS_INLINE _syscall6(void*, _mmap2, void*, s, size_t, l, int, p, -@@ -4025,7 +4025,7 @@ struct kernel_statfs { +@@ -4042,7 +4042,7 @@ struct kernel_statfs { #if defined(__i386__) || \ defined(__ARM_ARCH_3__) || defined(__ARM_EABI__) || \ (defined(__mips__) && _MIPS_SIM == _MIPS_SIM_ABI32) || \ @@ -3455,11 +3447,34 @@ index 88eb1c7d3..4be33fa5b 100644 } SKSL_INT stoi(const String& s) { -diff --git a/src/3rdparty/chromium/third_party/sqlite/amalgamation/sqlite3.c b/src/3rdparty/chromium/third_party/sqlite/amalgamation/sqlite3.c -index 4d60a82..b24e1b8 100644 ---- a/src/3rdparty/chromium/third_party/sqlite/amalgamation/sqlite3.c -+++ b/src/3rdparty/chromium/third_party/sqlite/amalgamation/sqlite3.c -@@ -14301,7 +14301,8 @@ typedef INT16_TYPE LogEst; +diff --git a/src/3rdparty/chromium/third_party/sqlite/src/amalgamation/sqlite3.c b/src/3rdparty/chromium/third_party/sqlite/src/amalgamation/sqlite3.c +index 1b2c2ec7a..baa2b2a5d 100644 +--- a/src/3rdparty/chromium/third_party/sqlite/src/amalgamation/sqlite3.c ++++ b/src/3rdparty/chromium/third_party/sqlite/src/amalgamation/sqlite3.c +@@ -14400,7 +14400,8 @@ typedef INT16_TYPE LogEst; + # if defined(i386) || defined(__i386__) || defined(_M_IX86) || \ + defined(__x86_64) || defined(__x86_64__) || defined(_M_X64) || \ + defined(_M_AMD64) || defined(_M_ARM) || defined(__x86) || \ +- defined(__ARMEL__) || defined(__AARCH64EL__) || defined(_M_ARM64) ++ defined(__ARMEL__) || defined(__AARCH64EL__) || defined(_M_ARM64) || \ ++ defined(__powerpc64__) && (__BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__) + # define SQLITE_BYTEORDER 1234 + # elif defined(sparc) || defined(__ppc__) || \ + defined(__ARMEB__) || defined(__AARCH64EB__) +@@ -187118,7 +187119,7 @@ struct RtreeMatchArg { + #if defined(i386) || defined(__i386__) || defined(_M_IX86) || \ + defined(__x86_64) || defined(__x86_64__) || defined(_M_X64) || \ + defined(_M_AMD64) || defined(_M_ARM) || defined(__x86) || \ +- defined(__arm__) ++ defined(__arm__) || defined(__powerpc64__) && (__BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__) + # define SQLITE_BYTEORDER 1234 + #elif defined(sparc) || defined(__ppc__) + # define SQLITE_BYTEORDER 4321 +diff --git a/src/3rdparty/chromium/third_party/sqlite/src/amalgamation_dev/sqlite3.c b/src/3rdparty/chromium/third_party/sqlite/src/amalgamation_dev/sqlite3.c +index 734ac355d..43fabe805 100644 +--- a/src/3rdparty/chromium/third_party/sqlite/src/amalgamation_dev/sqlite3.c ++++ b/src/3rdparty/chromium/third_party/sqlite/src/amalgamation_dev/sqlite3.c +@@ -14314,7 +14314,8 @@ typedef INT16_TYPE LogEst; # if defined(i386) || defined(__i386__) || defined(_M_IX86) || \ defined(__x86_64) || defined(__x86_64__) || defined(_M_X64) || \ defined(_M_AMD64) || defined(_M_ARM) || defined(__x86) || \ @@ -3469,34 +3484,32 @@ index 4d60a82..b24e1b8 100644 # define SQLITE_BYTEORDER 1234 # elif defined(sparc) || defined(__ppc__) || \ defined(__ARMEB__) || defined(__AARCH64EB__) -@@ -185974,7 +185975,8 @@ struct RtreeMatchArg { +@@ -186514,7 +186515,7 @@ struct RtreeMatchArg { #if defined(i386) || defined(__i386__) || defined(_M_IX86) || \ defined(__x86_64) || defined(__x86_64__) || defined(_M_X64) || \ defined(_M_AMD64) || defined(_M_ARM) || defined(__x86) || \ - defined(__arm__) -+ defined(__arm__) || \ -+ defined(__powerpc64__) && (__BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__) ++ defined(__arm__) || defined(__powerpc64__) && (__BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__) # define SQLITE_BYTEORDER 1234 #elif defined(sparc) || defined(__ppc__) # define SQLITE_BYTEORDER 4321 -diff --git a/src/3rdparty/chromium/third_party/sqlite/patched/ext/rtree/rtree.c b/src/3rdparty/chromium/third_party/sqlite/patched/ext/rtree/rtree.c -index 6c1e817..5013d96 100644 ---- a/src/3rdparty/chromium/third_party/sqlite/patched/ext/rtree/rtree.c -+++ b/src/3rdparty/chromium/third_party/sqlite/patched/ext/rtree/rtree.c -@@ -432,7 +432,8 @@ struct RtreeMatchArg { +diff --git a/src/3rdparty/chromium/third_party/sqlite/src/ext/rtree/rtree.c b/src/3rdparty/chromium/third_party/sqlite/src/ext/rtree/rtree.c +index 1eef1a1b5..b53097b7f 100644 +--- a/src/3rdparty/chromium/third_party/sqlite/src/ext/rtree/rtree.c ++++ b/src/3rdparty/chromium/third_party/sqlite/src/ext/rtree/rtree.c +@@ -432,7 +432,7 @@ struct RtreeMatchArg { #if defined(i386) || defined(__i386__) || defined(_M_IX86) || \ defined(__x86_64) || defined(__x86_64__) || defined(_M_X64) || \ defined(_M_AMD64) || defined(_M_ARM) || defined(__x86) || \ - defined(__arm__) -+ defined(__arm__) || \ -+ defined(__powerpc64__) && (__BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__) ++ defined(__arm__) || defined(__powerpc64__) && (__BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__) # define SQLITE_BYTEORDER 1234 #elif defined(sparc) || defined(__ppc__) # define SQLITE_BYTEORDER 4321 -diff --git a/src/3rdparty/chromium/third_party/sqlite/patched/src/sqliteInt.h b/src/3rdparty/chromium/third_party/sqlite/patched/src/sqliteInt.h -index 34e2d2d..d96c8bc 100644 ---- a/src/3rdparty/chromium/third_party/sqlite/patched/src/sqliteInt.h -+++ b/src/3rdparty/chromium/third_party/sqlite/patched/src/sqliteInt.h +diff --git a/src/3rdparty/chromium/third_party/sqlite/src/src/sqliteInt.h b/src/3rdparty/chromium/third_party/sqlite/src/src/sqliteInt.h +index 9ef2437b0..6c70148c7 100644 +--- a/src/3rdparty/chromium/third_party/sqlite/src/src/sqliteInt.h ++++ b/src/3rdparty/chromium/third_party/sqlite/src/src/sqliteInt.h @@ -853,7 +853,8 @@ typedef INT16_TYPE LogEst; # if defined(i386) || defined(__i386__) || defined(_M_IX86) || \ defined(__x86_64) || defined(__x86_64__) || defined(_M_X64) || \ @@ -3559,10 +3572,10 @@ index ed216e660..25d36c071 100644 #error Please add support for your architecture in rtc_base/system/arch.h #endif diff --git a/src/3rdparty/chromium/v8/BUILD.gn b/src/3rdparty/chromium/v8/BUILD.gn -index 9107b3024..e885696d5 100644 +index ab20142de..001921c59 100644 --- a/src/3rdparty/chromium/v8/BUILD.gn +++ b/src/3rdparty/chromium/v8/BUILD.gn -@@ -620,6 +620,12 @@ config("toolchain") { +@@ -678,6 +678,12 @@ config("toolchain") { } if (host_byteorder == "little") { defines += [ "V8_TARGET_ARCH_PPC_LE" ] @@ -3575,6 +3588,3 @@ index 9107b3024..e885696d5 100644 } else if (host_byteorder == "big") { defines += [ "V8_TARGET_ARCH_PPC_BE" ] if (current_os == "aix") { --- -2.26.2 - diff --git a/srcpkgs/qt5-webengine/patches/0091-chromium-ppc64le-musl.patch b/srcpkgs/qt5-webengine/patches/0091-chromium-ppc64le-musl.patch index a24835410c8..47904dec06b 100644 --- a/srcpkgs/qt5-webengine/patches/0091-chromium-ppc64le-musl.patch +++ b/srcpkgs/qt5-webengine/patches/0091-chromium-ppc64le-musl.patch @@ -1,18 +1,3 @@ -From 8854db726f90e53bf5ed5af8b236ef36a709a682 Mon Sep 17 00:00:00 2001 -From: q66 -Date: Sun, 19 Jan 2020 01:06:40 +0100 -Subject: [PATCH 3/3] Additional fixes for musl libc with ppc64 - ---- - .../chromium/sandbox/linux/bpf_dsl/seccomp_macros.h | 6 +++--- - src/3rdparty/chromium/sandbox/linux/seccomp-bpf/syscall.cc | 4 ++-- - .../abseil-cpp/absl/base/internal/unscaledcycleclock.cc | 4 ++-- - .../abseil-cpp/absl/base/internal/unscaledcycleclock.h | 2 +- - .../src/client/linux/dump_writer_common/thread_info.cc | 7 +++++-- - .../src/client/linux/dump_writer_common/ucontext_reader.cc | 7 +++++-- - .../breakpad/src/client/linux/handler/exception_handler.cc | 5 +++++ - 7 files changed, 23 insertions(+), 12 deletions(-) - diff --git a/src/3rdparty/chromium/sandbox/linux/bpf_dsl/seccomp_macros.h b/src/3rdparty/chromium/sandbox/linux/bpf_dsl/seccomp_macros.h index a6aec544e..2a4a7f1bc 100644 --- a/src/3rdparty/chromium/sandbox/linux/bpf_dsl/seccomp_macros.h @@ -56,30 +41,8 @@ index 10fa5fd07..30b7b3851 100644 } #endif SECCOMP_RESULT(ctx) = static_cast(ret_val); -diff --git a/src/3rdparty/chromium/third_party/abseil-cpp/absl/base/internal/unscaledcycleclock.cc b/src/3rdparty/chromium/third_party/abseil-cpp/absl/base/internal/unscaledcycleclock.cc -index 593762bc8..689248755 100644 ---- a/src/3rdparty/chromium/third_party/abseil-cpp/absl/base/internal/unscaledcycleclock.cc -+++ b/src/3rdparty/chromium/third_party/abseil-cpp/absl/base/internal/unscaledcycleclock.cc -@@ -20,7 +20,7 @@ - #include - #endif - --#if defined(__powerpc__) || defined(__ppc__) -+#if (defined(__powerpc__) || defined(__ppc__)) && defined(__GLIBC__) - #include - #endif - -@@ -53,7 +53,7 @@ double UnscaledCycleClock::Frequency() { - return base_internal::NominalCPUFrequency(); - } - --#elif defined(__powerpc__) || defined(__ppc__) -+#elif (defined(__powerpc__) || defined(__ppc__)) && defined(__GLIBC__) - - int64_t UnscaledCycleClock::Now() { - return __ppc_get_timebase(); diff --git a/src/3rdparty/chromium/third_party/abseil-cpp/absl/base/internal/unscaledcycleclock.h b/src/3rdparty/chromium/third_party/abseil-cpp/absl/base/internal/unscaledcycleclock.h -index 2d361e962..98242096c 100644 +index cdce9bf8a..73d77dda4 100644 --- a/src/3rdparty/chromium/third_party/abseil-cpp/absl/base/internal/unscaledcycleclock.h +++ b/src/3rdparty/chromium/third_party/abseil-cpp/absl/base/internal/unscaledcycleclock.h @@ -46,7 +46,7 @@ @@ -159,6 +122,8 @@ index 901cd68fb..561958c44 100644 namespace google_breakpad { namespace { +diff --git a/src/3rdparty/chromium/third_party/crashpad/crashpad/util/linux/thread_info.h b/src/3rdparty/chromium/third_party/crashpad/crashpad/util/linux/thread_info.h +index dea0d1f39..b203e5b2f 100644 --- a/src/3rdparty/chromium/third_party/crashpad/crashpad/util/linux/thread_info.h +++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/util/linux/thread_info.h @@ -30,6 +30,7 @@ @@ -169,6 +134,3 @@ index 901cd68fb..561958c44 100644 #endif namespace crashpad { --- -2.26.0 - diff --git a/srcpkgs/qt5-webengine/patches/0200-nullptr-rtcpeerconnectionhandler.patch b/srcpkgs/qt5-webengine/patches/0200-nullptr-rtcpeerconnectionhandler.patch deleted file mode 100644 index 3c650f30559..00000000000 --- a/srcpkgs/qt5-webengine/patches/0200-nullptr-rtcpeerconnectionhandler.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 4e828b3bd2d410151dc2574d084bed631dac42ca Mon Sep 17 00:00:00 2001 -From: Daniel McArdle -Date: Thu, 16 Apr 2020 20:18:47 +0000 -Subject: [PATCH] [Backport] Fix for bug 1071327 - -Manual backport of patch originally reviewed on -https://chromium-review.googlesource.com/c/chromium/src/+/2153325: -Avoid nullptr dereference in RTCPeerConnectionHandler - -Bug: 1071327 -Fixes: QTBUG-86752 -Change-Id: Icf4189905dc5c95854b5af4b3e5e25e0607dd39e -Reviewed-by: Allan Sandfeld Jensen ---- - -diff --git a/chromium/third_party/blink/renderer/modules/peerconnection/rtc_peer_connection_handler.cc b/chromium/third_party/blink/renderer/modules/peerconnection/rtc_peer_connection_handler.cc -index 5a68327..371f25c 100644 ---- a/src/3rdparty/chromium/third_party/blink/renderer/modules/peerconnection/rtc_peer_connection_handler.cc -+++ b/src/3rdparty/chromium/third_party/blink/renderer/modules/peerconnection/rtc_peer_connection_handler.cc -@@ -2319,7 +2319,8 @@ - - void RTCPeerConnectionHandler::OnModifySctpTransport( - blink::WebRTCSctpTransportSnapshot state) { -- client_->DidModifySctpTransport(state); -+ if (client_) -+ client_->DidModifySctpTransport(state); - } - - void RTCPeerConnectionHandler::OnModifyTransceivers( -@@ -2446,7 +2447,8 @@ - } - - void RTCPeerConnectionHandler::OnInterestingUsage(int usage_pattern) { -- client_->DidNoteInterestingUsage(usage_pattern); -+ if (client_) -+ client_->DidNoteInterestingUsage(usage_pattern); - } - - webrtc::SessionDescriptionInterface* diff --git a/srcpkgs/qt5-webengine/template b/srcpkgs/qt5-webengine/template index 5191c63435a..13f46da1b0a 100644 --- a/srcpkgs/qt5-webengine/template +++ b/srcpkgs/qt5-webengine/template @@ -1,7 +1,7 @@ # Template file for 'qt5-webengine' pkgname=qt5-webengine -version=5.15.1 -revision=2 +version=5.15.2 +revision=1 archs="x86_64* i686* armv[67]* ppc64* aarch64*" wrksrc="qtwebengine-everywhere-src-${version}" build_style=qmake @@ -9,8 +9,8 @@ configure_args="-- -webengine-icu -webengine-ffmpeg -webengine-opus -webengine-webp -webengine-pepper-plugins -webengine-printing-and-pdf -webengine-proprietary-codecs -webengine-pulseaudio -webengine-spellchecker -webengine-webrtc -webengine-geolocation - $(vopt_if sndio '-sndio') -webengine-kerberos" -# Rely on auto detection (fails if forced for cross builds) -webengine-alsa + -webengine-kerberos -no-webengine-embedded-build" + # Rely on auto detection (fails if forced for cross builds) -webengine-alsa hostmakedepends="qt5-qmake gperf ninja qt5-host-tools flex pkg-config which perl python protobuf" makedepends="qt5-webchannel-devel qt5-location-devel qt5-tools-devel qt5-devel @@ -25,11 +25,16 @@ 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}/submodules/qtwebengine-everywhere-src-${version}.tar.xz" -checksum=f903e98fe3cd717161252710125fce011cf882ced96c24968b0c38811fbefdf2 +checksum=c8afca0e43d84f7bd595436fbe4d13a5bbdb81ec5104d605085d07545b6f91e0 patch_args="-Np1" build_options="sndio" -build_options_default="sndio" +build_options_default="" + + +if [ "$build_option_sndio" ]; then + configure_args+=" -sndio" +fi if [ "$CROSS_BUILD" ]; then hostmakedepends+=" nss-devel libevent-devel qt5-location-devel @@ -82,12 +87,13 @@ _bootstrap_gn() { CFLAGS="$CFLAGS_host" CXXFLAGS="$CXXFLAGS_host" LDFLAGS="$LDFLAGS_host" \ PKGCONFIG=/usr/bin/pkgconfig PKG_CONFIG_PATH="/usr/lib/pkgconfig:/usr/share/pkgconfig" \ python2 build/gen.py --no-last-commit-position --out-path \ - ${wrksrc}/src/3rdparty/gn/out/Release --cc "$CC_host" \ - --cxx "$CXX_host" --ld "$CXX_host" --ar "$AR_host" $opts + ${wrksrc}/src/3rdparty/gn/out/Release --cc "${CC_host:-$CC}" \ + --cxx "${CXX_host:-$CXX}" --ld "${CXX_host:-$CXX}" --ar "${AR_host:-$AR}" $opts ninja -C out/Release gn cd ${wrksrc} } + _cleanup_wrksrc_leak() { if [ -d "${PKGDESTDIR}/usr/lib/cmake" ]; then # Replace references to ${wrksrc} in cmake files @@ -124,11 +130,10 @@ post_patch() { patch -Np0 -i "$f" cd "$wrksrc" done - fi + fi } pre_configure() { - export PATH=${PATH/\/builddir\/.xbps-qt5-webengine\/wrappers:/} cp ${FILESDIR}/resolv_compat.h ${wrksrc}/src/3rdparty/chromium/net/dns case "$XBPS_TARGET_MACHINE" in armv5*|armv6*) # Disable "yield" assembler instruction @@ -158,9 +163,9 @@ pre_configure() { ;; esac - if [ "$CROSS_BUILD" ]; then - _bootstrap_gn - fi + _bootstrap_gn + #AR="ar" CC=$CC_FOR_BUILD CXX=$CXX_FOR_BUILD LD=$CXX_FOR_BUILD \ + #python2 src/3rdparty/chromium/tools/gn/bootstrap/bootstrap.py --skip-generate-buildfiles } pre_build() { From a6ddf5d8ce61963a9822874552a7451413463c5a Mon Sep 17 00:00:00 2001 From: John Date: Sat, 21 Nov 2020 13:55:59 +0100 Subject: [PATCH 4/6] telegram-desktop: rebuild against qt5-5.15.2 --- 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 dbadaded1fb..730585a10b2 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.4.7 -revision=1 +revision=2 wrksrc="tdesktop-${version}-full" build_style=cmake build_helper="qemu" @@ -18,7 +18,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.1<5.15.2" +depends="qt5-imageformats qt5-core>=5.15.2<5.15.3" short_desc="Telegram Desktop messaging app" maintainer="John " license="GPL-3.0-or-later, OpenSSL" From 57f8499c599d4006f7d9141dc94a5d181aef434e Mon Sep 17 00:00:00 2001 From: John Date: Sat, 21 Nov 2020 13:56:00 +0100 Subject: [PATCH 5/6] kwin: rebuild against qt5-5.15.2 --- srcpkgs/kwin/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kwin/template b/srcpkgs/kwin/template index daade558303..2b72b568886 100644 --- a/srcpkgs/kwin/template +++ b/srcpkgs/kwin/template @@ -1,7 +1,7 @@ # Template file for 'kwin' pkgname=kwin version=5.20.4 -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 $(vopt_if pipewire pipewire-devel)" -depends="breeze hicolor-icon-theme kinit qt5-core>=5.15.1<5.15.2" +depends="breeze hicolor-icon-theme kinit qt5-core>=5.15.2<5.15.3" short_desc="KDE Window manager" maintainer="John " license="GPL-2.0-or-later" From 2b92ba4ed12a0bc93c19e7686e805da856096321 Mon Sep 17 00:00:00 2001 From: John Date: Sat, 21 Nov 2020 13:56:00 +0100 Subject: [PATCH 6/6] qt5-styleplugins: rebuild against qt5-5.15.2 --- 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 04ae6034582..be8a125b466 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=14 +revision=15 _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.1<5.15.2" +depends="qt5-core>=5.15.2<5.15.3" short_desc="Additional style plugins for Qt5" maintainer="Jürgen Buchmüller " license="LGPL-2.1-only, LGPL-3.0-only"