From 9220d670aef8fe1ef8d1ac47ba62a50717edb50a Mon Sep 17 00:00:00 2001 From: John Date: Wed, 30 Oct 2024 11:48:06 +0100 Subject: [PATCH 01/30] qt6-3d: update to 6.8.0. --- srcpkgs/qt6-3d/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/qt6-3d/template b/srcpkgs/qt6-3d/template index 6a61ebb2e1f1d2..758e55a78d37bc 100644 --- a/srcpkgs/qt6-3d/template +++ b/srcpkgs/qt6-3d/template @@ -1,6 +1,6 @@ # Template file for 'qt6-3d' pkgname=qt6-3d -version=6.7.2 +version=6.8.0 revision=1 build_style=cmake hostmakedepends="perl qt6-declarative-host-tools" @@ -11,7 +11,7 @@ maintainer="John " license="(LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only) AND GPL-3.0-only with Qt-GPL-exception-1.0" homepage="https://qt.io/" distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qt3d-everywhere-src-${version}.tar.xz" -checksum=8bc087d904973133186e58471845c5df376bbfdcfcf079fda287e1cda27c8adf +checksum=3a11919e15437c351b742dbf4e0115ce51aa969cba844dd6388aae14810c7b7d qt6-3d-devel_package() { depends="${sourcepkg}>=${version}_${revision}" From b895b4055ac788025353a118c2e3d8431171bd8d Mon Sep 17 00:00:00 2001 From: John Date: Wed, 30 Oct 2024 11:48:09 +0100 Subject: [PATCH 02/30] qt6-base: update to 6.8.0. --- .../patches/CVE-2024-39936-qtbase-6.7.patch | 138 ------------------ srcpkgs/qt6-base/template | 6 +- 2 files changed, 3 insertions(+), 141 deletions(-) delete mode 100644 srcpkgs/qt6-base/patches/CVE-2024-39936-qtbase-6.7.patch diff --git a/srcpkgs/qt6-base/patches/CVE-2024-39936-qtbase-6.7.patch b/srcpkgs/qt6-base/patches/CVE-2024-39936-qtbase-6.7.patch deleted file mode 100644 index bef53fb76a396e..00000000000000 --- a/srcpkgs/qt6-base/patches/CVE-2024-39936-qtbase-6.7.patch +++ /dev/null @@ -1,138 +0,0 @@ -diff --git a/src/network/access/qhttp2protocolhandler.cpp b/src/network/access/qhttp2protocolhandler.cpp -index 0abd99b9bc2..3631b13dc85 100644 ---- a/src/network/access/qhttp2protocolhandler.cpp -+++ b/src/network/access/qhttp2protocolhandler.cpp -@@ -303,12 +303,12 @@ bool QHttp2ProtocolHandler::sendRequest() - } - } - -- if (!prefaceSent && !sendClientPreface()) -- return false; -- - if (!requests.size()) - return true; - -+ if (!prefaceSent && !sendClientPreface()) -+ return false; -+ - m_channel->state = QHttpNetworkConnectionChannel::WritingState; - // Check what was promised/pushed, maybe we do not have to send a request - // and have a response already? -diff --git a/src/network/access/qhttpnetworkconnectionchannel.cpp b/src/network/access/qhttpnetworkconnectionchannel.cpp -index 6766989690c..1e4161d1fdf 100644 ---- a/src/network/access/qhttpnetworkconnectionchannel.cpp -+++ b/src/network/access/qhttpnetworkconnectionchannel.cpp -@@ -209,6 +209,10 @@ void QHttpNetworkConnectionChannel::abort() - bool QHttpNetworkConnectionChannel::sendRequest() - { - Q_ASSERT(protocolHandler); -+ if (waitingForPotentialAbort) { -+ needInvokeSendRequest = true; -+ return false; // this return value is unused -+ } - return protocolHandler->sendRequest(); - } - -@@ -221,21 +225,28 @@ bool QHttpNetworkConnectionChannel::sendRequest() - void QHttpNetworkConnectionChannel::sendRequestDelayed() - { - QMetaObject::invokeMethod(this, [this] { -- Q_ASSERT(protocolHandler); - if (reply) -- protocolHandler->sendRequest(); -+ sendRequest(); - }, Qt::ConnectionType::QueuedConnection); - } - - void QHttpNetworkConnectionChannel::_q_receiveReply() - { - Q_ASSERT(protocolHandler); -+ if (waitingForPotentialAbort) { -+ needInvokeReceiveReply = true; -+ return; -+ } - protocolHandler->_q_receiveReply(); - } - - void QHttpNetworkConnectionChannel::_q_readyRead() - { - Q_ASSERT(protocolHandler); -+ if (waitingForPotentialAbort) { -+ needInvokeReadyRead = true; -+ return; -+ } - protocolHandler->_q_readyRead(); - } - -@@ -1239,7 +1250,18 @@ void QHttpNetworkConnectionChannel::_q_encrypted() - if (!h2RequestsToSend.isEmpty()) { - // Similar to HTTP/1.1 counterpart below: - const auto &pair = std::as_const(h2RequestsToSend).first(); -+ waitingForPotentialAbort = true; - emit pair.second->encrypted(); -+ -+ // We don't send or handle any received data until any effects from -+ // emitting encrypted() have been processed. This is necessary -+ // because the user may have called abort(). We may also abort the -+ // whole connection if the request has been aborted and there is -+ // no more requests to send. -+ QMetaObject::invokeMethod(this, -+ &QHttpNetworkConnectionChannel::checkAndResumeCommunication, -+ Qt::QueuedConnection); -+ - // In case our peer has sent us its settings (window size, max concurrent streams etc.) - // let's give _q_receiveReply a chance to read them first ('invokeMethod', QueuedConnection). - } -@@ -1257,6 +1279,28 @@ void QHttpNetworkConnectionChannel::_q_encrypted() - QMetaObject::invokeMethod(connection, "_q_startNextRequest", Qt::QueuedConnection); - } - -+ -+void QHttpNetworkConnectionChannel::checkAndResumeCommunication() -+{ -+ Q_ASSERT(connection->connectionType() == QHttpNetworkConnection::ConnectionTypeHTTP2 -+ || connection->connectionType() == QHttpNetworkConnection::ConnectionTypeHTTP2Direct); -+ -+ // Because HTTP/2 requires that we send a SETTINGS frame as the first thing we do, and respond -+ // to a SETTINGS frame with an ACK, we need to delay any handling until we can ensure that any -+ // effects from emitting encrypted() have been processed. -+ // This function is called after encrypted() was emitted, so check for changes. -+ -+ if (!reply && h2RequestsToSend.isEmpty()) -+ abort(); -+ waitingForPotentialAbort = false; -+ if (needInvokeReadyRead) -+ _q_readyRead(); -+ if (needInvokeReceiveReply) -+ _q_receiveReply(); -+ if (needInvokeSendRequest) -+ sendRequest(); -+} -+ - void QHttpNetworkConnectionChannel::requeueHttp2Requests() - { - const auto h2RequestsToSendCopy = std::exchange(h2RequestsToSend, {}); -diff --git a/src/network/access/qhttpnetworkconnectionchannel_p.h b/src/network/access/qhttpnetworkconnectionchannel_p.h -index c42290feca4..061f20fd426 100644 ---- a/src/network/access/qhttpnetworkconnectionchannel_p.h -+++ b/src/network/access/qhttpnetworkconnectionchannel_p.h -@@ -74,6 +74,10 @@ public: - QAbstractSocket *socket; - bool ssl; - bool isInitialized; -+ bool waitingForPotentialAbort = false; -+ bool needInvokeReceiveReply = false; -+ bool needInvokeReadyRead = false; -+ bool needInvokeSendRequest = false; - ChannelState state; - QHttpNetworkRequest request; // current request, only used for HTTP - QHttpNetworkReply *reply; // current reply for this request, only used for HTTP -@@ -146,6 +150,8 @@ public: - void closeAndResendCurrentRequest(); - void resendCurrentRequest(); - -+ void checkAndResumeCommunication(); -+ - bool isSocketBusy() const; - bool isSocketWriting() const; - bool isSocketWaiting() const; diff --git a/srcpkgs/qt6-base/template b/srcpkgs/qt6-base/template index 4ac4eb88add6eb..cffe1db39e2880 100644 --- a/srcpkgs/qt6-base/template +++ b/srcpkgs/qt6-base/template @@ -2,8 +2,8 @@ # # On update rebuild all pkg with qt6-base-private-devel pkgname=qt6-base -version=6.7.2 -revision=2 +version=6.8.0 +revision=1 build_style=cmake configure_args="-DINSTALL_DATADIR=share/qt6 -DINSTALL_ARCHDATADIR=lib${XBPS_TARGET_WORDSIZE}/qt6 @@ -35,7 +35,7 @@ maintainer="John " license="GPL-3.0-only WITH Qt-GPL-exception-1.0, LGPL-3.0-only, GPL-2.0-or-later" homepage="https://www.qt.io" distfiles="https://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtbase-everywhere-src-${version}.tar.xz" -checksum=c5f22a5e10fb162895ded7de0963328e7307611c688487b5d152c9ee64767599 +checksum=1bad481710aa27f872de6c9f72651f89a6107f0077003d0ebfcc9fd15cba3c75 python_version=3 if [ "$CROSS_BUILD" ]; then From 9c2af6dd129eeafec2f48233d1b68664efc366cf Mon Sep 17 00:00:00 2001 From: John Date: Wed, 30 Oct 2024 11:48:10 +0100 Subject: [PATCH 03/30] qt6-charts: update to 6.8.0. --- srcpkgs/qt6-charts/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/qt6-charts/template b/srcpkgs/qt6-charts/template index e20893dd2c1a57..6859c53c21c0f5 100644 --- a/srcpkgs/qt6-charts/template +++ b/srcpkgs/qt6-charts/template @@ -1,7 +1,7 @@ # Template file for 'qt6-charts' pkgname=qt6-charts -version=6.7.2 -revision=2 +version=6.8.0 +revision=1 build_style=cmake hostmakedepends="perl qt6-declarative-host-tools" makedepends="qt6-declarative-private-devel qt6-base-private-devel" @@ -10,7 +10,7 @@ maintainer="John " license="GPL-3.0-only" homepage="https://qt.io/" distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtcharts-everywhere-src-${version}.tar.xz" -checksum=00f6a437458b7f2c4e81d748dbe2a077567a9e6ad8d8e3820b36c39dc5279bda +checksum=1923daac0d1a69b03a4cb119b147c2e3f5080f642af365098fd8771a465b132f subpackages="qt6-charts-private-devel qt6-charts-devel" From 3a0908dd24920307126401be03fc37174d0a2b7c Mon Sep 17 00:00:00 2001 From: John Date: Wed, 30 Oct 2024 11:48:12 +0100 Subject: [PATCH 04/30] qt6-connectivity: update to 6.8.0. --- srcpkgs/qt6-connectivity/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/qt6-connectivity/template b/srcpkgs/qt6-connectivity/template index a37892b61f2d9f..ef089b058af49d 100644 --- a/srcpkgs/qt6-connectivity/template +++ b/srcpkgs/qt6-connectivity/template @@ -1,6 +1,6 @@ # Template file for 'qt6-connectivity' pkgname=qt6-connectivity -version=6.7.2 +version=6.8.0 revision=1 build_style=cmake configure_args="-DQT_FEATURE_pcsclite=ON" @@ -12,7 +12,7 @@ maintainer="Đoàn Trần Công Danh " license="GPL-3.0-only" homepage="https://qt.io/" distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtconnectivity-everywhere-src-${version}.tar.xz" -checksum=8ed321b242f0e956473a295fa31670271f9b3acb797508644cb740f89f6c08e8 +checksum=bbbefb6cc07507fcc961362b3380553eba6400aa15480600126793ba3dc21788 do_check() { ctest -E tst_qlowenergycontroller From 76326c77db7b54b23dfc47e201b25c6e72d46139 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 30 Oct 2024 11:48:14 +0100 Subject: [PATCH 05/30] qt6-declarative: update to 6.8.0. --- srcpkgs/qt6-declarative/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/qt6-declarative/template b/srcpkgs/qt6-declarative/template index 33031bc568e62e..3e039b593e1b89 100644 --- a/srcpkgs/qt6-declarative/template +++ b/srcpkgs/qt6-declarative/template @@ -2,7 +2,7 @@ # # On update, rebuild pkgs with qt6-declarative-private-devel pkgname=qt6-declarative -version=6.7.2 +version=6.8.0 revision=1 build_style=cmake configure_args="-DQT_BUILD_TESTS=ON" @@ -14,7 +14,7 @@ maintainer="John " license="GPL-3.0-only WITH Qt-GPL-exception-1.0, LGPL-3.0-only, GPL-2.0-or-later" homepage="https://www.qt.io" distfiles="https://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtdeclarative-everywhere-src-${version}.tar.xz" -checksum=4c29cba1af8c42d425d8eb6e01bad24cb80f4b983d71eef566a0542dfdb9b999 +checksum=3b41a36b42e919a3aa0da1f71107591504200f41707bee2ad8e8d4f99b5644c2 replaces="qt6-quickcontrols2>=0" if [ "$CROSS_BUILD" ]; then From 526e8224aab22b4b687e94939375aba788282eb2 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 30 Oct 2024 11:48:15 +0100 Subject: [PATCH 06/30] qt6-imageformats: update to 6.8.0. --- srcpkgs/qt6-imageformats/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/qt6-imageformats/template b/srcpkgs/qt6-imageformats/template index 5a6c89ee07084c..ec80cc4785317b 100644 --- a/srcpkgs/qt6-imageformats/template +++ b/srcpkgs/qt6-imageformats/template @@ -1,6 +1,6 @@ # Template file for 'qt6-imageformats' pkgname=qt6-imageformats -version=6.7.2 +version=6.8.0 revision=1 build_style=cmake hostmakedepends="perl qt6-base" @@ -10,4 +10,4 @@ maintainer="John " license="LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only" homepage="https://qt.io/" distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtimageformats-everywhere-src-${version}.tar.xz" -checksum=e1a1d8785fae67d16ad0a443b01d5f32663a6b68d275f1806ebab257485ce5d6 +checksum=595bf8557b91e1f8ebc726f1e09868a3c7e610ff5045068f2d4ea2428c49a5d4 From 9a82dc1b1505631fd2d68872d714247723b5e1e9 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 30 Oct 2024 11:48:17 +0100 Subject: [PATCH 07/30] qt6-languageserver: update to 6.8.0. --- ...QtLanguageServer-Enforce-static-buil.patch | 106 ++++++++++++++++++ srcpkgs/qt6-languageserver/template | 4 +- 2 files changed, 108 insertions(+), 2 deletions(-) create mode 100644 srcpkgs/qt6-languageserver/patches/0001-Revert-JSON-RPC-QtLanguageServer-Enforce-static-buil.patch diff --git a/srcpkgs/qt6-languageserver/patches/0001-Revert-JSON-RPC-QtLanguageServer-Enforce-static-buil.patch b/srcpkgs/qt6-languageserver/patches/0001-Revert-JSON-RPC-QtLanguageServer-Enforce-static-buil.patch new file mode 100644 index 00000000000000..026ca4d47d19cf --- /dev/null +++ b/srcpkgs/qt6-languageserver/patches/0001-Revert-JSON-RPC-QtLanguageServer-Enforce-static-buil.patch @@ -0,0 +1,106 @@ +From f611f50746d7da1814fad7e6a602d7d0d4ad3654 Mon Sep 17 00:00:00 2001 +From: John Zimmermann +Date: Mon, 4 Nov 2024 22:42:56 +0100 +Subject: [PATCH] Revert "JSON-RPC/QtLanguageServer: Enforce static builds" + +This reverts commit 1a9a75cacaf4c45fc399915804f7f25d17747343. +--- + src/jsonrpc/CMakeLists.txt | 2 +- + src/jsonrpc/qtjsonrpcglobal.h | 16 +++++++++++++--- + src/languageserver/CMakeLists.txt | 2 +- + src/languageserver/qtlanguageserverglobal.h | 16 +++++++++++++--- + 4 files changed, 28 insertions(+), 8 deletions(-) + +diff --git a/src/jsonrpc/CMakeLists.txt b/src/jsonrpc/CMakeLists.txt +index c2950b4..f960325 100644 +--- a/src/jsonrpc/CMakeLists.txt ++++ b/src/jsonrpc/CMakeLists.txt +@@ -7,7 +7,6 @@ + + qt_internal_add_module(JsonRpcPrivate + INTERNAL_MODULE +- STATIC + SOURCES + qhttpmessagestreamparser_p.h qhttpmessagestreamparser.cpp + qjsonrpcprotocol.cpp qjsonrpcprotocol_p.h qjsonrpcprotocol_p_p.h +@@ -20,4 +19,5 @@ qt_internal_add_module(JsonRpcPrivate + QT_NO_CONTEXTLESS_CONNECT + PUBLIC_LIBRARIES + Qt::Core ++ NO_GENERATE_CPP_EXPORTS + ) +diff --git a/src/jsonrpc/qtjsonrpcglobal.h b/src/jsonrpc/qtjsonrpcglobal.h +index 7c23910..ee1fefc 100644 +--- a/src/jsonrpc/qtjsonrpcglobal.h ++++ b/src/jsonrpc/qtjsonrpcglobal.h +@@ -6,8 +6,18 @@ + + #include + +-// include qtjsonrpcexports.h here instead +-// if module is no longer unconditionally static +-#define Q_JSONRPC_EXPORT ++QT_BEGIN_NAMESPACE ++ ++#ifndef QT_STATIC ++# if defined(QT_BUILD_JSONRPC_LIB) ++# define Q_JSONRPC_EXPORT Q_DECL_EXPORT ++# else ++# define Q_JSONRPC_EXPORT Q_DECL_IMPORT ++# endif ++#else ++# define Q_JSONRPC_EXPORT ++#endif ++ ++QT_END_NAMESPACE + + #endif // QTJSONRPCGLOBAL_H +diff --git a/src/languageserver/CMakeLists.txt b/src/languageserver/CMakeLists.txt +index e45916c..0242739 100644 +--- a/src/languageserver/CMakeLists.txt ++++ b/src/languageserver/CMakeLists.txt +@@ -7,7 +7,6 @@ + + qt_internal_add_module(LanguageServerPrivate + INTERNAL_MODULE +- STATIC + SOURCES + qlanguageserverprespectypes_p.h + qlanguageserverspec_p.h +@@ -24,6 +23,7 @@ qt_internal_add_module(LanguageServerPrivate + PUBLIC_LIBRARIES + Qt::CorePrivate + Qt::JsonRpcPrivate ++ NO_GENERATE_CPP_EXPORTS + ) + + if(MSVC) +diff --git a/src/languageserver/qtlanguageserverglobal.h b/src/languageserver/qtlanguageserverglobal.h +index 872960c..94e31f5 100644 +--- a/src/languageserver/qtlanguageserverglobal.h ++++ b/src/languageserver/qtlanguageserverglobal.h +@@ -5,8 +5,18 @@ + #define QTLANGUAGESERVERGLOBAL_H + #include + +-// include qtlanguageserverexports.h here instead +-// if module is no longer unconditionally static +-#define Q_LANGUAGESERVER_EXPORT ++QT_BEGIN_NAMESPACE ++ ++#ifndef QT_STATIC ++# if defined(QT_BUILD_LANGUAGESERVER_LIB) ++# define Q_LANGUAGESERVER_EXPORT Q_DECL_EXPORT ++# else ++# define Q_LANGUAGESERVER_EXPORT Q_DECL_IMPORT ++# endif ++#else ++# define Q_LANGUAGESERVER_EXPORT ++#endif ++ ++QT_END_NAMESPACE + + #endif // QTLANGUAGESERVERGLOBAL_H +-- +2.47.0 + diff --git a/srcpkgs/qt6-languageserver/template b/srcpkgs/qt6-languageserver/template index 2521c5d684c509..902575485590c1 100644 --- a/srcpkgs/qt6-languageserver/template +++ b/srcpkgs/qt6-languageserver/template @@ -1,6 +1,6 @@ # Template file for 'qt6-languageserver' pkgname=qt6-languageserver -version=6.7.2 +version=6.8.0 revision=1 build_style=cmake configure_args="-DQT_BUILD_TESTS=ON" @@ -11,7 +11,7 @@ maintainer="classabbyamp " license="GPL-3.0-only WITH Qt-GPL-exception-1.0, LGPL-3.0-only, GPL-2.0-or-later" homepage="https://www.qt.io" distfiles="https://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtlanguageserver-everywhere-src-${version}.tar.xz" -checksum=b659fe655144ffa061e3ae509eadb42ae373230517295a96935434340e101a92 +checksum=fbf7152c8ca4d1dbdd30205e64a830f378d7ac5ac0b5f02eecab9d7501065cef subpackages="qt6-languageserver-private-devel qt6-languageserver-devel" From 480c4023b213959eb8283ba98a2097d87585139a Mon Sep 17 00:00:00 2001 From: John Date: Wed, 30 Oct 2024 11:48:18 +0100 Subject: [PATCH 08/30] qt6-location: update to 6.8.0. --- srcpkgs/qt6-location/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/qt6-location/template b/srcpkgs/qt6-location/template index 99708c66321a37..f26e1bf56dd5a6 100644 --- a/srcpkgs/qt6-location/template +++ b/srcpkgs/qt6-location/template @@ -1,6 +1,6 @@ # Template file for 'qt6-location' pkgname=qt6-location -version=6.7.2 +version=6.8.0 revision=1 build_style=cmake hostmakedepends="perl qt6-base qt6-declarative-host-tools" @@ -11,7 +11,7 @@ maintainer="John " license="(LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only) AND GPL-3.0-only with Qt-GPL-exception-1.0" homepage="https://qt.io/" distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtlocation-everywhere-src-${version}.tar.xz" -checksum=f232da58bf1189b69f1f7029417ddfeffcfb801b275aedc720e38244f88a485d +checksum=a0c487f4b36965ea921127033cc227acf1f292ba577081842c5b75d2ef9731a0 pre_check() { export QML2_IMPORT_PATH="$wrksrc/build/lib${XBPS_TARGET_WORDSIZE}/qt6/qml" From aba1e55e3d58f25248ee7ecd9812a800168f10d2 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 30 Oct 2024 11:48:20 +0100 Subject: [PATCH 09/30] qt6-lottie: update to 6.8.0. --- srcpkgs/qt6-lottie/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/qt6-lottie/template b/srcpkgs/qt6-lottie/template index 8495153d4b5148..b3954954bc281a 100644 --- a/srcpkgs/qt6-lottie/template +++ b/srcpkgs/qt6-lottie/template @@ -1,6 +1,6 @@ # Template file for 'qt6-lottie' pkgname=qt6-lottie -version=6.7.2 +version=6.8.0 revision=1 build_style=cmake hostmakedepends="perl qt6-base qt6-declarative-host-tools" @@ -10,7 +10,7 @@ maintainer="John " license="GPL-3.0-only" homepage="https://qt.io/" distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtlottie-everywhere-src-${version}.tar.xz" -checksum=d9afbc9358d352a4e521d4693d5bdad6a004272b6e8a9ec7a9f851700fe3f10e +checksum=cb69e6396a6b14b6fba3aa690040bbe45a7717551e0d046e841541dc1f137c96 if [ "$XBPS_CHECK_PKGS" ]; then configure_args="-DQT_BUILD_TESTS=ON" From c5648db8fafdae128cceceb2c8ed254f3c226ed9 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 30 Oct 2024 11:48:21 +0100 Subject: [PATCH 10/30] qt6-multimedia: update to 6.8.0. --- srcpkgs/qt6-multimedia/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/qt6-multimedia/template b/srcpkgs/qt6-multimedia/template index b1d1b89b2d2267..8e7060edc11d0a 100644 --- a/srcpkgs/qt6-multimedia/template +++ b/srcpkgs/qt6-multimedia/template @@ -1,7 +1,7 @@ # Template file for 'qt6-multimedia' pkgname=qt6-multimedia -version=6.7.2 -revision=2 +version=6.8.0 +revision=1 build_style=cmake configure_args="-DQT_FEATURE_gstreamer=ON" hostmakedepends="perl qt6-declarative-host-tools pkg-config qt6-shadertools" @@ -14,7 +14,7 @@ maintainer="John " license="(LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only) AND GPL-3.0-only with Qt-GPL-exception-1.0" homepage="https://qt.io/" distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtmultimedia-everywhere-src-${version}.tar.xz" -checksum=8ef835115acb9a1d3d2c9f23cfacb43f2c537e3786a8ab822299a2a7765651d3 +checksum=28766aa562fa7aa7dfa8420defd6ece90a891a0496b8d8a4c51958182d73cfcd if [ "$XBPS_MACHINE" = "i686" ]; then CXXFLAGS="-DPFFFT_SIMD_DISABLE=1" From 0817168769f2d1faf64131604f3aafd30c9cf22f Mon Sep 17 00:00:00 2001 From: John Date: Wed, 30 Oct 2024 11:48:23 +0100 Subject: [PATCH 11/30] qt6-networkauth: update to 6.8.0. --- srcpkgs/qt6-networkauth/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/qt6-networkauth/template b/srcpkgs/qt6-networkauth/template index 65f468da81df72..ac2d3c3fd26991 100644 --- a/srcpkgs/qt6-networkauth/template +++ b/srcpkgs/qt6-networkauth/template @@ -1,6 +1,6 @@ # Template file for 'qt6-networkauth' pkgname=qt6-networkauth -version=6.7.2 +version=6.8.0 revision=1 build_style=cmake hostmakedepends="perl qt6-base" @@ -10,7 +10,7 @@ maintainer="John " license="GPL-3.0-only" homepage="https://qt.io/" distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtnetworkauth-everywhere-src-${version}.tar.xz" -checksum=7f09824fcfe589eb32260c305ff9a126fe3bf93be218d372e8e9c10e212df470 +checksum=b95d566544c6b35d895be39473fef51985b04df2f16008de54660966ae80cc48 if [ "$XBPS_CHECK_PKGS" ]; then configure_args="-DQT_BUILD_TESTS=ON" From 8bcae669541c6a5e9cfcd3ca47c49eafd0991ebe Mon Sep 17 00:00:00 2001 From: John Date: Wed, 30 Oct 2024 11:48:31 +0100 Subject: [PATCH 12/30] qt6-pdf: update to 6.8.0. --- ...ERT-roll-src-third_party-ffmpeg-m102.patch | 52 --- .../patches/0110-chromium-117-typename.patch | 91 ---- ...12-chromium-118-missing-header-files.patch | 379 ---------------- ...chromium-118-no_matching_constructor.patch | 410 ------------------ ...-chromium-118-python-3.12-deprecated.patch | 98 ----- ...x-aarch64-musl-memory-tagging-macros.patch | 29 -- .../qt6-pdf/patches/0132-libc_malloc.patch | 14 - .../patches/0133-musl-no-execinfo.patch | 27 +- .../patches/0134-musl-no-mallinfo.patch | 33 +- .../patches/0135-musl-partition-atfork.patch | 8 +- srcpkgs/qt6-pdf/patches/0138-no-mte.patch | 11 - srcpkgs/qt6-pdf/patches/1000-cstdint.patch | 10 + srcpkgs/qt6-pdf/template | 6 +- 13 files changed, 43 insertions(+), 1125 deletions(-) delete mode 100644 srcpkgs/qt6-pdf/patches/0100-REVERT-roll-src-third_party-ffmpeg-m102.patch delete mode 100644 srcpkgs/qt6-pdf/patches/0110-chromium-117-typename.patch delete mode 100644 srcpkgs/qt6-pdf/patches/0112-chromium-118-missing-header-files.patch delete mode 100644 srcpkgs/qt6-pdf/patches/0113-chromium-118-no_matching_constructor.patch delete mode 100644 srcpkgs/qt6-pdf/patches/0114-chromium-118-python-3.12-deprecated.patch delete mode 100644 srcpkgs/qt6-pdf/patches/0122-fix-aarch64-musl-memory-tagging-macros.patch delete mode 100644 srcpkgs/qt6-pdf/patches/0138-no-mte.patch create mode 100644 srcpkgs/qt6-pdf/patches/1000-cstdint.patch diff --git a/srcpkgs/qt6-pdf/patches/0100-REVERT-roll-src-third_party-ffmpeg-m102.patch b/srcpkgs/qt6-pdf/patches/0100-REVERT-roll-src-third_party-ffmpeg-m102.patch deleted file mode 100644 index aaaa3018c57f3b..00000000000000 --- a/srcpkgs/qt6-pdf/patches/0100-REVERT-roll-src-third_party-ffmpeg-m102.patch +++ /dev/null @@ -1,52 +0,0 @@ ---- a/src/3rdparty/chromium/media/filters/audio_file_reader_unittest.cc -+++ b/src/3rdparty/chromium/media/filters/audio_file_reader_unittest.cc -@@ -121,11 +121,11 @@ class AudioFileReaderTest : public testi - EXPECT_FALSE(reader_->Open()); - } - -- void RunTestFailingDecode(const char* fn, int expect_read = 0) { -+ void RunTestFailingDecode(const char* fn) { - Initialize(fn); - EXPECT_TRUE(reader_->Open()); - std::vector> decoded_audio_packets; -- EXPECT_EQ(reader_->Read(&decoded_audio_packets), expect_read); -+ EXPECT_EQ(reader_->Read(&decoded_audio_packets), 0); - } - - void RunTestPartialDecode(const char* fn) { -@@ -219,7 +219,7 @@ TEST_F(AudioFileReaderTest, AAC_ADTS) { - } - - TEST_F(AudioFileReaderTest, MidStreamConfigChangesFail) { -- RunTestFailingDecode("midstream_config_change.mp3", 42624); -+ RunTestFailingDecode("midstream_config_change.mp3"); - } - #endif - ---- a/src/3rdparty/chromium/media/filters/audio_video_metadata_extractor.cc -+++ b/src/3rdparty/chromium/media/filters/audio_video_metadata_extractor.cc -@@ -113,15 +113,6 @@ bool AudioVideoMetadataExtractor::Extrac - if (!stream) - continue; - -- void* display_matrix = -- av_stream_get_side_data(stream, AV_PKT_DATA_DISPLAYMATRIX, nullptr); -- if (display_matrix) { -- rotation_ = VideoTransformation::FromFFmpegDisplayMatrix( -- static_cast(display_matrix)) -- .rotation; -- info.tags["rotate"] = base::NumberToString(rotation_); -- } -- - // Extract dictionary from streams also. Needed for containers that attach - // metadata to contained streams instead the container itself, like OGG. - ExtractDictionary(stream->metadata, &info.tags); -@@ -264,6 +255,8 @@ void AudioVideoMetadataExtractor::Extrac - if (raw_tags->find(tag->key) == raw_tags->end()) - (*raw_tags)[tag->key] = tag->value; - -+ if (ExtractInt(tag, "rotate", &rotation_)) -+ continue; - if (ExtractString(tag, "album", &album_)) - continue; - if (ExtractString(tag, "artist", &artist_)) diff --git a/srcpkgs/qt6-pdf/patches/0110-chromium-117-typename.patch b/srcpkgs/qt6-pdf/patches/0110-chromium-117-typename.patch deleted file mode 100644 index 6e4af0c0e074fa..00000000000000 --- a/srcpkgs/qt6-pdf/patches/0110-chromium-117-typename.patch +++ /dev/null @@ -1,91 +0,0 @@ ---- a/src/3rdparty/chromium/components/optimization_guide/core/tflite_model_executor.h -+++ b/src/3rdparty/chromium/components/optimization_guide/core/tflite_model_executor.h -@@ -240,7 +240,7 @@ class TFLiteModelExecutor : public Model - void SendForBatchExecution( - BatchExecutionCallback callback_on_complete, - base::TimeTicks start_time, -- ModelExecutor::ConstRefInputVector inputs) -+ typename ModelExecutor::ConstRefInputVector inputs) - override { - DCHECK(execution_task_runner_->RunsTasksInCurrentSequence()); - DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); -@@ -262,7 +262,7 @@ class TFLiteModelExecutor : public Model - // Starts the synchronous execution of the model. Returns model outputs. - // Model needs to be loaded. Synchronous calls do not load or unload model. - std::vector> SendForBatchExecutionSync( -- ModelExecutor::ConstRefInputVector inputs) -+ typename ModelExecutor::ConstRefInputVector inputs) - override { - DCHECK(execution_task_runner_->RunsTasksInCurrentSequence()); - DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); -@@ -417,7 +417,7 @@ class TFLiteModelExecutor : public Model - // executes it on the model execution thread. - void LoadModelFileAndBatchExecute( - BatchExecutionCallback callback_on_complete, -- ModelExecutor::ConstRefInputVector inputs) { -+ typename ModelExecutor::ConstRefInputVector inputs) { - DCHECK(execution_task_runner_->RunsTasksInCurrentSequence()); - DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); - -@@ -434,7 +434,7 @@ class TFLiteModelExecutor : public Model - - // Batch executes the loaded model for inputs. - void BatchExecuteLoadedModel( -- ModelExecutor::ConstRefInputVector inputs, -+ typename ModelExecutor::ConstRefInputVector inputs, - std::vector>* outputs) { - DCHECK(execution_task_runner_->RunsTasksInCurrentSequence()); - DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); -@@ -494,7 +494,7 @@ class TFLiteModelExecutor : public Model - // Unloads the model if needed. - void BatchExecuteLoadedModelAndRunCallback( - BatchExecutionCallback callback_on_complete, -- ModelExecutor::ConstRefInputVector inputs, -+ typename ModelExecutor::ConstRefInputVector inputs, - ExecutionStatus execution_status) { - DCHECK(execution_task_runner_->RunsTasksInCurrentSequence()); - DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); ---- a/src/3rdparty/chromium/components/supervised_user/core/browser/proto_fetcher.cc -+++ b/src/3rdparty/chromium/components/supervised_user/core/browser/proto_fetcher.cc -@@ -399,7 +399,7 @@ class RetryingFetcherImpl final : public - RetryingFetcherImpl(const RetryingFetcherImpl&) = delete; - RetryingFetcherImpl& operator=(const RetryingFetcherImpl&) = delete; - -- void Start(ProtoFetcher::Callback callback) override { -+ void Start(typename ProtoFetcher::Callback callback) override { - callback_ = std::move(callback); - Retry(); - } -@@ -435,7 +435,7 @@ class RetryingFetcherImpl final : public - } - - // Client callback. -- ProtoFetcher::Callback callback_; -+ typename ProtoFetcher::Callback callback_; - - // Retry controls. - base::OneShotTimer timer_; -@@ -578,7 +578,7 @@ ParallelFetchManager: - template - void ParallelFetchManager::Fetch( - const Request& request, -- Fetcher::Callback callback) { -+ typename Fetcher::Callback callback) { - CHECK(callback) << "Use base::DoNothing() instead of empty callback."; - KeyType key = requests_in_flight_.Add(MakeFetcher(request)); - requests_in_flight_.Lookup(key)->Start( ---- a/src/3rdparty/chromium/components/supervised_user/core/browser/proto_fetcher.h -+++ b/src/3rdparty/chromium/components/supervised_user/core/browser/proto_fetcher.h -@@ -165,10 +165,10 @@ class ParallelFetchManager { - - // Starts the fetch. Underlying fetcher is stored internally, and will be - // cleaned up after finish or when this manager is destroyed. -- void Fetch(const Request& request, Fetcher::Callback callback); -+ void Fetch(const Request& request, typename Fetcher::Callback callback); - - private: -- using KeyType = base::IDMap>::KeyType; -+ using KeyType = typename base::IDMap>::KeyType; - - // Remove fetcher under key from requests_in_flight_. - void Remove(KeyType key); diff --git a/srcpkgs/qt6-pdf/patches/0112-chromium-118-missing-header-files.patch b/srcpkgs/qt6-pdf/patches/0112-chromium-118-missing-header-files.patch deleted file mode 100644 index 43861ea7321752..00000000000000 --- a/srcpkgs/qt6-pdf/patches/0112-chromium-118-missing-header-files.patch +++ /dev/null @@ -1,379 +0,0 @@ ---- a/src/3rdparty/chromium/base/memory/ref_counted.h -+++ b/src/3rdparty/chromium/base/memory/ref_counted.h -@@ -6,6 +6,7 @@ - #define BASE_MEMORY_REF_COUNTED_H_ - - #include -+#include - - #include - #include ---- a/src/3rdparty/chromium/base/check_op.h -+++ b/src/3rdparty/chromium/base/check_op.h -@@ -5,6 +5,7 @@ - #ifndef BASE_CHECK_OP_H_ - #define BASE_CHECK_OP_H_ - -+#include - #include - #include - #include ---- a/src/3rdparty/chromium/base/debug/profiler.h -+++ b/src/3rdparty/chromium/base/debug/profiler.h -@@ -8,6 +8,7 @@ - #include - #include - -+#include - #include - - #include "base/base_export.h" ---- a/src/3rdparty/chromium/gpu/config/gpu_feature_info.h -+++ b/src/3rdparty/chromium/gpu/config/gpu_feature_info.h -@@ -7,6 +7,7 @@ - - #include - -+#include - #include - #include - ---- a/src/3rdparty/chromium/net/base/net_export.h -+++ b/src/3rdparty/chromium/net/base/net_export.h -@@ -5,6 +5,8 @@ - #ifndef NET_BASE_NET_EXPORT_H_ - #define NET_BASE_NET_EXPORT_H_ - -+#include -+ - // Defines NET_EXPORT so that functionality implemented by the net module can - // be exported to consumers, and NET_EXPORT_PRIVATE that allows unit tests to - // access features not intended to be used directly by real consumers. ---- a/src/3rdparty/chromium/sandbox/linux/syscall_broker/broker_file_permission.h -+++ b/src/3rdparty/chromium/sandbox/linux/syscall_broker/broker_file_permission.h -@@ -5,6 +5,7 @@ - #ifndef SANDBOX_LINUX_SYSCALL_BROKER_BROKER_FILE_PERMISSION_H_ - #define SANDBOX_LINUX_SYSCALL_BROKER_BROKER_FILE_PERMISSION_H_ - -+#include - #include - #include - #include ---- a/src/3rdparty/chromium/third_party/abseil-cpp/absl/strings/string_view.h -+++ b/src/3rdparty/chromium/third_party/abseil-cpp/absl/strings/string_view.h -@@ -27,6 +27,7 @@ - #ifndef ABSL_STRINGS_STRING_VIEW_H_ - #define ABSL_STRINGS_STRING_VIEW_H_ - -+#include - #include - #include - #include ---- a/src/3rdparty/chromium/third_party/angle/include/GLSLANG/ShaderVars.h -+++ b/src/3rdparty/chromium/third_party/angle/include/GLSLANG/ShaderVars.h -@@ -10,6 +10,7 @@ - #ifndef GLSLANG_SHADERVARS_H_ - #define GLSLANG_SHADERVARS_H_ - -+#include - #include - #include - #include ---- a/src/3rdparty/chromium/third_party/blink/public/common/bluetooth/web_bluetooth_device_id.h -+++ b/src/3rdparty/chromium/third_party/blink/public/common/bluetooth/web_bluetooth_device_id.h -@@ -7,6 +7,7 @@ - - #include - -+#include - #include - #include - #include ---- a/src/3rdparty/chromium/third_party/dawn/src/tint/lang/spirv/reader/ast_parser/namer.h -+++ b/src/3rdparty/chromium/third_party/dawn/src/tint/lang/spirv/reader/ast_parser/namer.h -@@ -15,6 +15,7 @@ - #ifndef SRC_TINT_LANG_SPIRV_READER_AST_PARSER_NAMER_H_ - #define SRC_TINT_LANG_SPIRV_READER_AST_PARSER_NAMER_H_ - -+#include - #include - #include - #include ---- a/src/3rdparty/chromium/third_party/openscreen/src/discovery/dnssd/public/dns_sd_txt_record.h -+++ b/src/3rdparty/chromium/third_party/openscreen/src/discovery/dnssd/public/dns_sd_txt_record.h -@@ -7,6 +7,7 @@ - - #include - -+#include - #include - #include - #include ---- a/src/3rdparty/chromium/third_party/swiftshader/src/System/LRUCache.hpp -+++ b/src/3rdparty/chromium/third_party/swiftshader/src/System/LRUCache.hpp -@@ -17,6 +17,7 @@ - - #include "System/Debug.hpp" - -+#include - #include - #include - #include ---- a/src/3rdparty/chromium/ui/gfx/geometry/linear_gradient.h -+++ b/src/3rdparty/chromium/ui/gfx/geometry/linear_gradient.h -@@ -7,6 +7,7 @@ - - #include - -+#include - #include - #include - #include ---- a/src/3rdparty/chromium/third_party/ruy/src/ruy/profiler/instrumentation.h -+++ b/src/3rdparty/chromium/third_party/ruy/src/ruy/profiler/instrumentation.h -@@ -17,6 +17,7 @@ limitations under the License. - #define RUY_RUY_PROFILER_INSTRUMENTATION_H_ - - #ifdef RUY_PROFILER -+#include - #include - #include - #include ---- a/src/3rdparty/chromium/base/containers/flat_map.h -+++ b/src/3rdparty/chromium/base/containers/flat_map.h -@@ -5,6 +5,7 @@ - #ifndef BASE_CONTAINERS_FLAT_MAP_H_ - #define BASE_CONTAINERS_FLAT_MAP_H_ - -+#include - #include - #include - #include ---- a/src/3rdparty/chromium/components/crash/core/app/crash_reporter_client.h -+++ b/src/3rdparty/chromium/components/crash/core/app/crash_reporter_client.h -@@ -7,6 +7,7 @@ - - #include - -+#include - #include - - #include "build/build_config.h" ---- a/src/3rdparty/chromium/ui/base/prediction/kalman_filter.h -+++ b/src/3rdparty/chromium/ui/base/prediction/kalman_filter.h -@@ -7,6 +7,8 @@ - - #include - -+#include -+ - #include "base/component_export.h" - #include "ui/gfx/geometry/matrix3_f.h" - ---- a/src/3rdparty/chromium/components/password_manager/core/browser/generation/password_generator.h -+++ b/src/3rdparty/chromium/components/password_manager/core/browser/generation/password_generator.h -@@ -7,6 +7,7 @@ - - #include - -+#include - #include - - ---- a/src/3rdparty/chromium/components/feature_engagement/internal/event_storage_validator.h -+++ b/src/3rdparty/chromium/components/feature_engagement/internal/event_storage_validator.h -@@ -7,6 +7,7 @@ - - #include - -+#include - #include - - namespace feature_engagement { ---- a/src/3rdparty/chromium/components/feature_engagement/internal/never_event_storage_validator.h -+++ b/src/3rdparty/chromium/components/feature_engagement/internal/never_event_storage_validator.h -@@ -5,6 +5,7 @@ - #ifndef COMPONENTS_FEATURE_ENGAGEMENT_INTERNAL_NEVER_EVENT_STORAGE_VALIDATOR_H_ - #define COMPONENTS_FEATURE_ENGAGEMENT_INTERNAL_NEVER_EVENT_STORAGE_VALIDATOR_H_ - -+#include - #include - - #include "components/feature_engagement/internal/event_storage_validator.h" ---- a/src/3rdparty/chromium/components/autofill/core/browser/autofill_ablation_study.h -+++ b/src/3rdparty/chromium/components/autofill/core/browser/autofill_ablation_study.h -@@ -7,6 +7,7 @@ - - #include - -+#include - #include - - class GURL; ---- a/src/3rdparty/chromium/components/payments/content/utility/fingerprint_parser.h -+++ b/src/3rdparty/chromium/components/payments/content/utility/fingerprint_parser.h -@@ -5,6 +5,7 @@ - #ifndef COMPONENTS_PAYMENTS_CONTENT_UTILITY_FINGERPRINT_PARSER_H_ - #define COMPONENTS_PAYMENTS_CONTENT_UTILITY_FINGERPRINT_PARSER_H_ - -+#include - #include - #include - ---- a/src/3rdparty/chromium/pdf/document_attachment_info.h -+++ b/src/3rdparty/chromium/pdf/document_attachment_info.h -@@ -7,6 +7,7 @@ - - #include - -+#include - #include - - ---- a/src/3rdparty/chromium/third_party/pdfium/constants/annotation_flags.h -+++ b/src/3rdparty/chromium/third_party/pdfium/constants/annotation_flags.h -@@ -7,6 +7,8 @@ - - #include - -+#include -+ - namespace pdfium { - namespace annotation_flags { - ---- a/src/3rdparty/chromium/third_party/vulkan-deps/vulkan-validation-layers/src/layers/external/vma/vk_mem_alloc.h -+++ b/src/3rdparty/chromium/third_party/vulkan-deps/vulkan-validation-layers/src/layers/external/vma/vk_mem_alloc.h -@@ -2884,6 +2884,7 @@ static void vma_aligned_free(void* VMA_N - - // Define this macro to 1 to enable functions: vmaBuildStatsString, vmaFreeStatsString. - #if VMA_STATS_STRING_ENABLED -+#include - static inline void VmaUint32ToStr(char* VMA_NOT_NULL outStr, size_t strLen, uint32_t num) - { - snprintf(outStr, strLen, "%u", static_cast(num)); ---- a/src/3rdparty/chromium/gin/time_clamper.h -+++ b/src/3rdparty/chromium/gin/time_clamper.h -@@ -48,7 +48,7 @@ class GIN_EXPORT TimeClamper { - const int64_t micros = now_micros % 1000; - // abs() is necessary for devices with times before unix-epoch (most likely - // configured incorrectly). -- if (abs(micros) + kResolutionMicros < 1000) { -+ if (std::abs(micros) + kResolutionMicros < 1000) { - return now_micros / 1000; - } - return ClampTimeResolution(now_micros) / 1000; ---- a/src/3rdparty/chromium/chrome/test/chromedriver/chrome/web_view_impl.cc -+++ b/src/3rdparty/chromium/chrome/test/chromedriver/chrome/web_view_impl.cc -@@ -11,6 +11,7 @@ - #include - #include - #include -+#include - - #include "base/check.h" - #include "base/files/file_path.h" ---- a/src/3rdparty/chromium/skia/ext/skcolorspace_trfn.cc -+++ b/src/3rdparty/chromium/skia/ext/skcolorspace_trfn.cc -@@ -3,6 +3,7 @@ - // found in the LICENSE file. - - #include "skia/ext/skcolorspace_trfn.h" -+#include - - #include - ---- a/src/3rdparty/chromium/third_party/webrtc/common_video/h264/sps_parser.h -+++ b/src/3rdparty/chromium/third_party/webrtc/common_video/h264/sps_parser.h -@@ -11,6 +11,7 @@ - #ifndef COMMON_VIDEO_H264_SPS_PARSER_H_ - #define COMMON_VIDEO_H264_SPS_PARSER_H_ - -+#include - #include "absl/types/optional.h" - #include "rtc_base/bitstream_reader.h" - ---- a/src/3rdparty/chromium/third_party/webrtc/modules/include/module_common_types_public.h -+++ b/src/3rdparty/chromium/third_party/webrtc/modules/include/module_common_types_public.h -@@ -11,6 +11,7 @@ - #ifndef MODULES_INCLUDE_MODULE_COMMON_TYPES_PUBLIC_H_ - #define MODULES_INCLUDE_MODULE_COMMON_TYPES_PUBLIC_H_ - -+#include - #include - - #include "absl/types/optional.h" ---- a/src/3rdparty/chromium/ui/gfx/linux/drm_util_linux.h -+++ b/src/3rdparty/chromium/ui/gfx/linux/drm_util_linux.h -@@ -9,6 +9,8 @@ - - #include "ui/gfx/buffer_types.h" - -+#include -+ - namespace ui { - - int GetFourCCFormatFromBufferFormat(gfx::BufferFormat format); ---- a/src/3rdparty/chromium/third_party/webrtc/audio/utility/channel_mixer.cc -+++ b/src/3rdparty/chromium/third_party/webrtc/audio/utility/channel_mixer.cc -@@ -8,6 +8,8 @@ - * be found in the AUTHORS file in the root of the source tree. - */ - -+#include -+ - #include "audio/utility/channel_mixer.h" - - #include "audio/utility/channel_mixing_matrix.h" ---- a/src/3rdparty/chromium/third_party/webrtc/modules/video_coding/utility/ivf_file_reader.cc -+++ b/src/3rdparty/chromium/third_party/webrtc/modules/video_coding/utility/ivf_file_reader.cc -@@ -10,6 +10,7 @@ - - #include "modules/video_coding/utility/ivf_file_reader.h" - -+#include - #include - #include - ---- a/src/3rdparty/chromium/third_party/ipcz/src/ipcz/router_link.h -+++ b/src/3rdparty/chromium/third_party/ipcz/src/ipcz/router_link.h -@@ -5,6 +5,7 @@ - #ifndef IPCZ_SRC_IPCZ_ROUTER_LINK_H_ - #define IPCZ_SRC_IPCZ_ROUTER_LINK_H_ - -+#include - #include - #include - #include ---- a/src/3rdparty/chromium/third_party/material_color_utilities/src/cpp/palettes/tones.cc -+++ b/src/3rdparty/chromium/third_party/material_color_utilities/src/cpp/palettes/tones.cc -@@ -14,6 +14,7 @@ - * limitations under the License. - */ - -+#include - #include "cpp/palettes/tones.h" - - #include ---- a/src/3rdparty/chromium/services/device/public/cpp/generic_sensor/sensor_reading.h -+++ b/src/3rdparty/chromium/services/device/public/cpp/generic_sensor/sensor_reading.h -@@ -8,6 +8,9 @@ - #include - #include - -+#include -+#include -+ - #include - - namespace device { ---- a/src/3rdparty/chromium/components/gwp_asan/client/lightweight_detector.h -+++ b/src/3rdparty/chromium/components/gwp_asan/client/lightweight_detector.h -@@ -5,6 +5,8 @@ - #ifndef COMPONENTS_GWP_ASAN_CLIENT_LIGHTWEIGHT_DETECTOR_H_ - #define COMPONENTS_GWP_ASAN_CLIENT_LIGHTWEIGHT_DETECTOR_H_ - -+#include -+ - #include "base/gtest_prod_util.h" - #include "components/gwp_asan/client/export.h" - #include "components/gwp_asan/common/lightweight_detector_state.h" diff --git a/srcpkgs/qt6-pdf/patches/0113-chromium-118-no_matching_constructor.patch b/srcpkgs/qt6-pdf/patches/0113-chromium-118-no_matching_constructor.patch deleted file mode 100644 index 97926daa8ca0ef..00000000000000 --- a/srcpkgs/qt6-pdf/patches/0113-chromium-118-no_matching_constructor.patch +++ /dev/null @@ -1,410 +0,0 @@ ---- a/src/3rdparty/chromium/ui/base/wayland/color_manager_util.h -+++ b/src/3rdparty/chromium/ui/base/wayland/color_manager_util.h -@@ -52,53 +52,53 @@ constexpr auto kChromaticityMap = base:: - zcr_color_manager_v1_chromaticity_names, - PrimaryVersion>( - {{ZCR_COLOR_MANAGER_V1_CHROMATICITY_NAMES_BT601_525_LINE, -- PrimaryVersion(gfx::ColorSpace::PrimaryID::SMPTE170M, -- kDefaultSinceVersion)}, -+ PrimaryVersion{gfx::ColorSpace::PrimaryID::SMPTE170M, -+ kDefaultSinceVersion}}, - {ZCR_COLOR_MANAGER_V1_CHROMATICITY_NAMES_BT601_625_LINE, -- PrimaryVersion(gfx::ColorSpace::PrimaryID::BT470BG, -- kDefaultSinceVersion)}, -+ PrimaryVersion{gfx::ColorSpace::PrimaryID::BT470BG, -+ kDefaultSinceVersion}}, - {ZCR_COLOR_MANAGER_V1_CHROMATICITY_NAMES_SMPTE170M, -- PrimaryVersion(gfx::ColorSpace::PrimaryID::SMPTE170M, -- kDefaultSinceVersion)}, -+ PrimaryVersion{gfx::ColorSpace::PrimaryID::SMPTE170M, -+ kDefaultSinceVersion}}, - {ZCR_COLOR_MANAGER_V1_CHROMATICITY_NAMES_BT709, -- PrimaryVersion(gfx::ColorSpace::PrimaryID::BT709, kDefaultSinceVersion)}, -+ PrimaryVersion{gfx::ColorSpace::PrimaryID::BT709, kDefaultSinceVersion}}, - {ZCR_COLOR_MANAGER_V1_CHROMATICITY_NAMES_BT2020, -- PrimaryVersion(gfx::ColorSpace::PrimaryID::BT2020, kDefaultSinceVersion)}, -+ PrimaryVersion{gfx::ColorSpace::PrimaryID::BT2020, kDefaultSinceVersion}}, - {ZCR_COLOR_MANAGER_V1_CHROMATICITY_NAMES_SRGB, -- PrimaryVersion(gfx::ColorSpace::PrimaryID::BT709, kDefaultSinceVersion)}, -+ PrimaryVersion{gfx::ColorSpace::PrimaryID::BT709, kDefaultSinceVersion}}, - {ZCR_COLOR_MANAGER_V1_CHROMATICITY_NAMES_DISPLAYP3, -- PrimaryVersion(gfx::ColorSpace::PrimaryID::P3, kDefaultSinceVersion)}, -+ PrimaryVersion{gfx::ColorSpace::PrimaryID::P3, kDefaultSinceVersion}}, - {ZCR_COLOR_MANAGER_V1_CHROMATICITY_NAMES_ADOBERGB, -- PrimaryVersion(gfx::ColorSpace::PrimaryID::ADOBE_RGB, -- kDefaultSinceVersion)}, -+ PrimaryVersion{gfx::ColorSpace::PrimaryID::ADOBE_RGB, -+ kDefaultSinceVersion}}, - {ZCR_COLOR_MANAGER_V1_CHROMATICITY_NAMES_WIDE_GAMUT_COLOR_SPIN, -- PrimaryVersion( -+ PrimaryVersion{ - gfx::ColorSpace::PrimaryID::WIDE_GAMUT_COLOR_SPIN, -- ZCR_COLOR_MANAGER_V1_CHROMATICITY_NAMES_WIDE_GAMUT_COLOR_SPIN_SINCE_VERSION)}, -+ ZCR_COLOR_MANAGER_V1_CHROMATICITY_NAMES_WIDE_GAMUT_COLOR_SPIN_SINCE_VERSION}}, - {ZCR_COLOR_MANAGER_V1_CHROMATICITY_NAMES_BT470M, -- PrimaryVersion( -+ PrimaryVersion{ - gfx::ColorSpace::PrimaryID::BT470M, -- ZCR_COLOR_MANAGER_V1_CHROMATICITY_NAMES_BT470M_SINCE_VERSION)}, -+ ZCR_COLOR_MANAGER_V1_CHROMATICITY_NAMES_BT470M_SINCE_VERSION}}, - {ZCR_COLOR_MANAGER_V1_CHROMATICITY_NAMES_SMPTE240M, -- PrimaryVersion( -+ PrimaryVersion{ - gfx::ColorSpace::PrimaryID::SMPTE240M, -- ZCR_COLOR_MANAGER_V1_CHROMATICITY_NAMES_SMPTE240M_SINCE_VERSION)}, -+ ZCR_COLOR_MANAGER_V1_CHROMATICITY_NAMES_SMPTE240M_SINCE_VERSION}}, - {ZCR_COLOR_MANAGER_V1_CHROMATICITY_NAMES_XYZ_D50, -- PrimaryVersion( -+ PrimaryVersion{ - gfx::ColorSpace::PrimaryID::XYZ_D50, -- ZCR_COLOR_MANAGER_V1_CHROMATICITY_NAMES_XYZ_D50_SINCE_VERSION)}, -+ ZCR_COLOR_MANAGER_V1_CHROMATICITY_NAMES_XYZ_D50_SINCE_VERSION}}, - {ZCR_COLOR_MANAGER_V1_CHROMATICITY_NAMES_SMPTEST428_1, -- PrimaryVersion( -+ PrimaryVersion{ - gfx::ColorSpace::PrimaryID::SMPTEST428_1, -- ZCR_COLOR_MANAGER_V1_CHROMATICITY_NAMES_SMPTEST428_1_SINCE_VERSION)}, -+ ZCR_COLOR_MANAGER_V1_CHROMATICITY_NAMES_SMPTEST428_1_SINCE_VERSION}}, - {ZCR_COLOR_MANAGER_V1_CHROMATICITY_NAMES_SMPTEST431_2, -- PrimaryVersion( -+ PrimaryVersion{ - gfx::ColorSpace::PrimaryID::SMPTEST431_2, -- ZCR_COLOR_MANAGER_V1_CHROMATICITY_NAMES_SMPTEST431_2_SINCE_VERSION)}, -+ ZCR_COLOR_MANAGER_V1_CHROMATICITY_NAMES_SMPTEST431_2_SINCE_VERSION}}, - {ZCR_COLOR_MANAGER_V1_CHROMATICITY_NAMES_FILM, -- PrimaryVersion( -+ PrimaryVersion{ - gfx::ColorSpace::PrimaryID::FILM, -- ZCR_COLOR_MANAGER_V1_CHROMATICITY_NAMES_FILM_SINCE_VERSION)}}); -+ ZCR_COLOR_MANAGER_V1_CHROMATICITY_NAMES_FILM_SINCE_VERSION}}}); - - // A map from the zcr_color_manager_v1 eotf_names enum values - // representing well-known EOTFs, to their equivalent TransferIDs. -@@ -107,65 +107,65 @@ constexpr auto kEotfMap = base::MakeFixe - zcr_color_manager_v1_eotf_names, - TransferVersion>({ - {ZCR_COLOR_MANAGER_V1_EOTF_NAMES_LINEAR, -- TransferVersion(gfx::ColorSpace::TransferID::LINEAR, -- kDefaultSinceVersion)}, -+ TransferVersion{gfx::ColorSpace::TransferID::LINEAR, -+ kDefaultSinceVersion}}, - {ZCR_COLOR_MANAGER_V1_EOTF_NAMES_SRGB, -- TransferVersion(gfx::ColorSpace::TransferID::SRGB, kDefaultSinceVersion)}, -+ TransferVersion{gfx::ColorSpace::TransferID::SRGB, kDefaultSinceVersion}}, - {ZCR_COLOR_MANAGER_V1_EOTF_NAMES_BT709, -- TransferVersion(gfx::ColorSpace::TransferID::BT709, -- ZCR_COLOR_MANAGER_V1_EOTF_NAMES_BT709_SINCE_VERSION)}, -+ TransferVersion{gfx::ColorSpace::TransferID::BT709, -+ ZCR_COLOR_MANAGER_V1_EOTF_NAMES_BT709_SINCE_VERSION}}, - {ZCR_COLOR_MANAGER_V1_EOTF_NAMES_BT2087, -- TransferVersion(gfx::ColorSpace::TransferID::GAMMA24, -- kDefaultSinceVersion)}, -+ TransferVersion{gfx::ColorSpace::TransferID::GAMMA24, -+ kDefaultSinceVersion}}, - {ZCR_COLOR_MANAGER_V1_EOTF_NAMES_ADOBERGB, - // This is ever so slightly inaccurate. The number ought to be - // 2.19921875f, not 2.2 -- TransferVersion(gfx::ColorSpace::TransferID::GAMMA22, -- kDefaultSinceVersion)}, -+ TransferVersion{gfx::ColorSpace::TransferID::GAMMA22, -+ kDefaultSinceVersion}}, - {ZCR_COLOR_MANAGER_V1_EOTF_NAMES_PQ, -- TransferVersion(gfx::ColorSpace::TransferID::PQ, kDefaultSinceVersion)}, -+ TransferVersion{gfx::ColorSpace::TransferID::PQ, kDefaultSinceVersion}}, - {ZCR_COLOR_MANAGER_V1_EOTF_NAMES_HLG, -- TransferVersion(gfx::ColorSpace::TransferID::HLG, -- ZCR_COLOR_MANAGER_V1_EOTF_NAMES_HLG_SINCE_VERSION)}, -+ TransferVersion{gfx::ColorSpace::TransferID::HLG, -+ ZCR_COLOR_MANAGER_V1_EOTF_NAMES_HLG_SINCE_VERSION}}, - {ZCR_COLOR_MANAGER_V1_EOTF_NAMES_SMPTE170M, -- TransferVersion(gfx::ColorSpace::TransferID::SMPTE170M, -- ZCR_COLOR_MANAGER_V1_EOTF_NAMES_SMPTE170M_SINCE_VERSION)}, -+ TransferVersion{gfx::ColorSpace::TransferID::SMPTE170M, -+ ZCR_COLOR_MANAGER_V1_EOTF_NAMES_SMPTE170M_SINCE_VERSION}}, - {ZCR_COLOR_MANAGER_V1_EOTF_NAMES_SMPTE240M, -- TransferVersion(gfx::ColorSpace::TransferID::SMPTE240M, -- ZCR_COLOR_MANAGER_V1_EOTF_NAMES_SMPTE240M_SINCE_VERSION)}, -+ TransferVersion{gfx::ColorSpace::TransferID::SMPTE240M, -+ ZCR_COLOR_MANAGER_V1_EOTF_NAMES_SMPTE240M_SINCE_VERSION}}, - {ZCR_COLOR_MANAGER_V1_EOTF_NAMES_SMPTEST428_1, -- TransferVersion( -+ TransferVersion{ - gfx::ColorSpace::TransferID::SMPTEST428_1, -- ZCR_COLOR_MANAGER_V1_EOTF_NAMES_SMPTEST428_1_SINCE_VERSION)}, -+ ZCR_COLOR_MANAGER_V1_EOTF_NAMES_SMPTEST428_1_SINCE_VERSION}}, - {ZCR_COLOR_MANAGER_V1_EOTF_NAMES_LOG, -- TransferVersion(gfx::ColorSpace::TransferID::LOG, -- ZCR_COLOR_MANAGER_V1_EOTF_NAMES_LOG_SINCE_VERSION)}, -+ TransferVersion{gfx::ColorSpace::TransferID::LOG, -+ ZCR_COLOR_MANAGER_V1_EOTF_NAMES_LOG_SINCE_VERSION}}, - {ZCR_COLOR_MANAGER_V1_EOTF_NAMES_LOG_SQRT, -- TransferVersion(gfx::ColorSpace::TransferID::LOG_SQRT, -- ZCR_COLOR_MANAGER_V1_EOTF_NAMES_LOG_SQRT_SINCE_VERSION)}, -+ TransferVersion{gfx::ColorSpace::TransferID::LOG_SQRT, -+ ZCR_COLOR_MANAGER_V1_EOTF_NAMES_LOG_SQRT_SINCE_VERSION}}, - {ZCR_COLOR_MANAGER_V1_EOTF_NAMES_IEC61966_2_4, -- TransferVersion( -+ TransferVersion{ - gfx::ColorSpace::TransferID::IEC61966_2_4, -- ZCR_COLOR_MANAGER_V1_EOTF_NAMES_IEC61966_2_4_SINCE_VERSION)}, -+ ZCR_COLOR_MANAGER_V1_EOTF_NAMES_IEC61966_2_4_SINCE_VERSION}}, - {ZCR_COLOR_MANAGER_V1_EOTF_NAMES_BT1361_ECG, -- TransferVersion(gfx::ColorSpace::TransferID::BT1361_ECG, -- ZCR_COLOR_MANAGER_V1_EOTF_NAMES_BT1361_ECG_SINCE_VERSION)}, -+ TransferVersion{gfx::ColorSpace::TransferID::BT1361_ECG, -+ ZCR_COLOR_MANAGER_V1_EOTF_NAMES_BT1361_ECG_SINCE_VERSION}}, - {ZCR_COLOR_MANAGER_V1_EOTF_NAMES_BT2020_10, -- TransferVersion(gfx::ColorSpace::TransferID::BT2020_10, -- ZCR_COLOR_MANAGER_V1_EOTF_NAMES_BT2020_10_SINCE_VERSION)}, -+ TransferVersion{gfx::ColorSpace::TransferID::BT2020_10, -+ ZCR_COLOR_MANAGER_V1_EOTF_NAMES_BT2020_10_SINCE_VERSION}}, - {ZCR_COLOR_MANAGER_V1_EOTF_NAMES_BT2020_12, -- TransferVersion(gfx::ColorSpace::TransferID::BT2020_12, -- ZCR_COLOR_MANAGER_V1_EOTF_NAMES_BT2020_12_SINCE_VERSION)}, -+ TransferVersion{gfx::ColorSpace::TransferID::BT2020_12, -+ ZCR_COLOR_MANAGER_V1_EOTF_NAMES_BT2020_12_SINCE_VERSION}}, - {ZCR_COLOR_MANAGER_V1_EOTF_NAMES_SCRGB_LINEAR_80_NITS, -- TransferVersion( -+ TransferVersion{ - gfx::ColorSpace::TransferID::SCRGB_LINEAR_80_NITS, -- ZCR_COLOR_MANAGER_V1_EOTF_NAMES_SCRGB_LINEAR_80_NITS_SINCE_VERSION)}, -+ ZCR_COLOR_MANAGER_V1_EOTF_NAMES_SCRGB_LINEAR_80_NITS_SINCE_VERSION}}, - {ZCR_COLOR_MANAGER_V1_EOTF_NAMES_GAMMA18, -- TransferVersion(gfx::ColorSpace::TransferID::GAMMA18, -- ZCR_COLOR_MANAGER_V1_EOTF_NAMES_GAMMA18_SINCE_VERSION)}, -+ TransferVersion{gfx::ColorSpace::TransferID::GAMMA18, -+ ZCR_COLOR_MANAGER_V1_EOTF_NAMES_GAMMA18_SINCE_VERSION}}, - {ZCR_COLOR_MANAGER_V1_EOTF_NAMES_GAMMA28, -- TransferVersion(gfx::ColorSpace::TransferID::GAMMA28, -- ZCR_COLOR_MANAGER_V1_EOTF_NAMES_GAMMA28_SINCE_VERSION)}, -+ TransferVersion{gfx::ColorSpace::TransferID::GAMMA28, -+ ZCR_COLOR_MANAGER_V1_EOTF_NAMES_GAMMA28_SINCE_VERSION}}, - }); - - // A map from the SDR zcr_color_manager_v1 eotf_names enum values -@@ -174,18 +174,18 @@ constexpr auto kEotfMap = base::MakeFixe - constexpr auto kTransferMap = - base::MakeFixedFlatMap({ - {ZCR_COLOR_MANAGER_V1_EOTF_NAMES_LINEAR, -- TransferFnVersion(SkNamedTransferFn::kLinear, kDefaultSinceVersion)}, -+ TransferFnVersion{SkNamedTransferFn::kLinear, kDefaultSinceVersion}}, - {ZCR_COLOR_MANAGER_V1_EOTF_NAMES_SRGB, -- TransferFnVersion(SkNamedTransferFnExt::kSRGB, kDefaultSinceVersion)}, -+ TransferFnVersion{SkNamedTransferFnExt::kSRGB, kDefaultSinceVersion}}, - {ZCR_COLOR_MANAGER_V1_EOTF_NAMES_BT709, -- TransferFnVersion( -+ TransferFnVersion{ - SkNamedTransferFnExt::kRec709, -- ZCR_COLOR_MANAGER_V1_EOTF_NAMES_BT709_SINCE_VERSION)}, -+ ZCR_COLOR_MANAGER_V1_EOTF_NAMES_BT709_SINCE_VERSION}}, - {ZCR_COLOR_MANAGER_V1_EOTF_NAMES_BT2087, -- TransferFnVersion(gamma24, kDefaultSinceVersion)}, -+ TransferFnVersion{gamma24, kDefaultSinceVersion}}, - {ZCR_COLOR_MANAGER_V1_EOTF_NAMES_ADOBERGB, -- TransferFnVersion(SkNamedTransferFnExt::kA98RGB, -- kDefaultSinceVersion)}, -+ TransferFnVersion{SkNamedTransferFnExt::kA98RGB, -+ kDefaultSinceVersion}}, - }); - - // A map from the HDR zcr_color_manager_v1 eotf_names enum values -@@ -194,68 +194,68 @@ constexpr auto kTransferMap = - constexpr auto kHDRTransferMap = - base::MakeFixedFlatMap( - {{ZCR_COLOR_MANAGER_V1_EOTF_NAMES_LINEAR, -- TransferFnVersion(SkNamedTransferFn::kLinear, kDefaultSinceVersion)}, -+ TransferFnVersion{SkNamedTransferFn::kLinear, kDefaultSinceVersion}}, - {ZCR_COLOR_MANAGER_V1_EOTF_NAMES_SRGB, -- TransferFnVersion(SkNamedTransferFnExt::kSRGB, kDefaultSinceVersion)}, -+ TransferFnVersion{SkNamedTransferFnExt::kSRGB, kDefaultSinceVersion}}, - {ZCR_COLOR_MANAGER_V1_EOTF_NAMES_PQ, -- TransferFnVersion(SkNamedTransferFn::kPQ, kDefaultSinceVersion)}, -+ TransferFnVersion{SkNamedTransferFn::kPQ, kDefaultSinceVersion}}, - {ZCR_COLOR_MANAGER_V1_EOTF_NAMES_HLG, -- TransferFnVersion(SkNamedTransferFn::kHLG, -- ZCR_COLOR_MANAGER_V1_EOTF_NAMES_HLG_SINCE_VERSION)}, -+ TransferFnVersion{SkNamedTransferFn::kHLG, -+ ZCR_COLOR_MANAGER_V1_EOTF_NAMES_HLG_SINCE_VERSION}}, - {ZCR_COLOR_MANAGER_V1_EOTF_NAMES_EXTENDEDSRGB10, -- TransferFnVersion( -+ TransferFnVersion{ - SkNamedTransferFnExt::kSRGBExtended1023Over510, -- ZCR_COLOR_MANAGER_V1_EOTF_NAMES_EXTENDEDSRGB10_SINCE_VERSION)}}); -+ ZCR_COLOR_MANAGER_V1_EOTF_NAMES_EXTENDEDSRGB10_SINCE_VERSION}}}); - - // A map from zcr_color_manager_v1 matrix_names enum values to - // gfx::ColorSpace::MatrixIDs. - constexpr auto kMatrixMap = - base::MakeFixedFlatMap( - {{ZCR_COLOR_MANAGER_V1_MATRIX_NAMES_RGB, -- MatrixVersion(gfx::ColorSpace::MatrixID::RGB, kDefaultSinceVersion)}, -+ MatrixVersion{gfx::ColorSpace::MatrixID::RGB, kDefaultSinceVersion}}, - {ZCR_COLOR_MANAGER_V1_MATRIX_NAMES_BT709, -- MatrixVersion(gfx::ColorSpace::MatrixID::BT709, -- kDefaultSinceVersion)}, -+ MatrixVersion{gfx::ColorSpace::MatrixID::BT709, -+ kDefaultSinceVersion}}, - {ZCR_COLOR_MANAGER_V1_MATRIX_NAMES_BT470BG, -- MatrixVersion( -+ MatrixVersion{ - gfx::ColorSpace::MatrixID::BT470BG, -- ZCR_COLOR_MANAGER_V1_MATRIX_NAMES_BT470BG_SINCE_VERSION)}, -+ ZCR_COLOR_MANAGER_V1_MATRIX_NAMES_BT470BG_SINCE_VERSION}}, - {ZCR_COLOR_MANAGER_V1_MATRIX_NAMES_BT2020_NCL, -- MatrixVersion(gfx::ColorSpace::MatrixID::BT2020_NCL, -- kDefaultSinceVersion)}, -+ MatrixVersion{gfx::ColorSpace::MatrixID::BT2020_NCL, -+ kDefaultSinceVersion}}, - {ZCR_COLOR_MANAGER_V1_MATRIX_NAMES_BT2020_CL, -- MatrixVersion(gfx::ColorSpace::MatrixID::BT2020_CL, -- kDefaultSinceVersion)}, -+ MatrixVersion{gfx::ColorSpace::MatrixID::BT2020_CL, -+ kDefaultSinceVersion}}, - {ZCR_COLOR_MANAGER_V1_MATRIX_NAMES_FCC, -- MatrixVersion(gfx::ColorSpace::MatrixID::FCC, kDefaultSinceVersion)}, -+ MatrixVersion{gfx::ColorSpace::MatrixID::FCC, kDefaultSinceVersion}}, - {ZCR_COLOR_MANAGER_V1_MATRIX_NAMES_YCOCG, -- MatrixVersion(gfx::ColorSpace::MatrixID::YCOCG, -- ZCR_COLOR_MANAGER_V1_MATRIX_NAMES_YCOCG_SINCE_VERSION)}, -+ MatrixVersion{gfx::ColorSpace::MatrixID::YCOCG, -+ ZCR_COLOR_MANAGER_V1_MATRIX_NAMES_YCOCG_SINCE_VERSION}}, - {ZCR_COLOR_MANAGER_V1_MATRIX_NAMES_YDZDX, -- MatrixVersion(gfx::ColorSpace::MatrixID::YDZDX, -- ZCR_COLOR_MANAGER_V1_MATRIX_NAMES_YDZDX_SINCE_VERSION)}, -+ MatrixVersion{gfx::ColorSpace::MatrixID::YDZDX, -+ ZCR_COLOR_MANAGER_V1_MATRIX_NAMES_YDZDX_SINCE_VERSION}}, - {ZCR_COLOR_MANAGER_V1_MATRIX_NAMES_GBR, -- MatrixVersion(gfx::ColorSpace::MatrixID::GBR, -- ZCR_COLOR_MANAGER_V1_MATRIX_NAMES_GBR_SINCE_VERSION)}, -+ MatrixVersion{gfx::ColorSpace::MatrixID::GBR, -+ ZCR_COLOR_MANAGER_V1_MATRIX_NAMES_GBR_SINCE_VERSION}}, - {ZCR_COLOR_MANAGER_V1_MATRIX_NAMES_SMPTE170M, -- MatrixVersion(gfx::ColorSpace::MatrixID::SMPTE170M, -- kDefaultSinceVersion)}, -+ MatrixVersion{gfx::ColorSpace::MatrixID::SMPTE170M, -+ kDefaultSinceVersion}}, - {ZCR_COLOR_MANAGER_V1_MATRIX_NAMES_SMPTE240M, -- MatrixVersion(gfx::ColorSpace::MatrixID::SMPTE240M, -- kDefaultSinceVersion)}}); -+ MatrixVersion{gfx::ColorSpace::MatrixID::SMPTE240M, -+ kDefaultSinceVersion}}}); - - // A map from zcr_color_manager_v1 range_names enum values to - // gfx::ColorSpace::RangeIDs. - constexpr auto kRangeMap = - base::MakeFixedFlatMap( - {{ZCR_COLOR_MANAGER_V1_RANGE_NAMES_LIMITED, -- RangeVersion(gfx::ColorSpace::RangeID::LIMITED, -- kDefaultSinceVersion)}, -+ RangeVersion{gfx::ColorSpace::RangeID::LIMITED, -+ kDefaultSinceVersion}}, - {ZCR_COLOR_MANAGER_V1_RANGE_NAMES_FULL, -- RangeVersion(gfx::ColorSpace::RangeID::FULL, kDefaultSinceVersion)}, -+ RangeVersion{gfx::ColorSpace::RangeID::FULL, kDefaultSinceVersion}}, - {ZCR_COLOR_MANAGER_V1_RANGE_NAMES_DERIVED, -- RangeVersion(gfx::ColorSpace::RangeID::DERIVED, -- kDefaultSinceVersion)}}); -+ RangeVersion{gfx::ColorSpace::RangeID::DERIVED, -+ kDefaultSinceVersion}}}); - - zcr_color_manager_v1_chromaticity_names ToColorManagerChromaticity( - gfx::ColorSpace::PrimaryID primaryID, ---- a/src/3rdparty/chromium/chrome/test/chromedriver/capabilities.cc -+++ b/src/3rdparty/chromium/chrome/test/chromedriver/capabilities.cc -@@ -346,7 +346,7 @@ Status ParseMobileEmulation(const base:: - "'version' field of type string"); - } - -- brands.emplace_back(*brand, *version); -+ brands.emplace_back() = {*brand, *version}; - } - - client_hints.brands = std::move(brands); -@@ -384,7 +384,7 @@ Status ParseMobileEmulation(const base:: - "a 'version' field of type string"); - } - -- full_version_list.emplace_back(*brand, *version); -+ full_version_list.emplace_back() = {*brand, *version}; - } - - client_hints.full_version_list = std::move(full_version_list); ---- a/src/3rdparty/chromium/base/trace_event/trace_log.cc -+++ b/src/3rdparty/chromium/base/trace_event/trace_log.cc -@@ -2190,8 +2190,8 @@ void TraceLog::SetTraceBufferForTesting( - #if BUILDFLAG(USE_PERFETTO_CLIENT_LIBRARY) - void TraceLog::OnSetup(const perfetto::DataSourceBase::SetupArgs& args) { - AutoLock lock(track_event_lock_); -- track_event_sessions_.emplace_back(args.internal_instance_index, *args.config, -- args.backend_type); -+ track_event_sessions_.emplace_back() = {args.internal_instance_index, *args.config, -+ args.backend_type}; - } - - void TraceLog::OnStart(const perfetto::DataSourceBase::StartArgs&) { ---- a/src/3rdparty/chromium/ui/gtk/gtk_ui.cc -+++ b/src/3rdparty/chromium/ui/gtk/gtk_ui.cc -@@ -955,11 +955,11 @@ ui::DisplayConfig GtkUi::GetDisplayConfi - GdkRectangle geometry; - gdk_monitor_get_geometry(monitor, &geometry); - int monitor_scale = std::max(1, gdk_monitor_get_scale_factor(monitor)); -- config.display_geometries.emplace_back( -+ config.display_geometries.emplace_back() = { - gfx::Rect(monitor_scale * geometry.x, monitor_scale * geometry.y, - monitor_scale * geometry.width, - monitor_scale * geometry.height), -- monitor_scale * font_scale); -+ static_cast(monitor_scale * font_scale)}; - } - return config; - } ---- a/src/3rdparty/chromium/components/autofill/core/browser/contact_info_sync_util.cc -+++ b/src/3rdparty/chromium/components/autofill/core/browser/contact_info_sync_util.cc -@@ -174,9 +174,9 @@ class ContactInfoProfileSetter { - CHECK(observations.empty()); - for (const sync_pb::ContactInfoSpecifics::Observation& proto_observation : - proto_observations) { -- observations.emplace_back(proto_observation.type(), -+ observations.emplace_back() = {static_cast(proto_observation.type()), - ProfileTokenQuality::FormSignatureHash( -- proto_observation.form_hash())); -+ proto_observation.form_hash())}; - } - } - ---- a/src/3rdparty/chromium/components/autofill/core/browser/webdata/autofill_sync_bridge_util.cc -+++ b/src/3rdparty/chromium/components/autofill/core/browser/webdata/autofill_sync_bridge_util.cc -@@ -553,11 +553,11 @@ ServerCvc AutofillWalletCvcStructDataFro - base::StringToInt64(wallet_credential_specifics.instrument_id(), - &instrument_id); - -- return ServerCvc( -+ return ServerCvc{ - instrument_id, base::UTF8ToUTF16(wallet_credential_specifics.cvc()), - base::Time::UnixEpoch() + - base::Milliseconds(wallet_credential_specifics -- .last_updated_time_unix_epoch_millis())); -+ .last_updated_time_unix_epoch_millis())}; - } - - VirtualCardUsageData VirtualCardUsageDataFromUsageSpecifics( ---- a/src/3rdparty/chromium/chrome/test/chromedriver/capabilities.cc -+++ b/src/3rdparty/chromium/chrome/test/chromedriver/capabilities.cc -@@ -346,7 +346,7 @@ Status ParseMobileEmulation(const base:: - "'version' field of type string"); - } - -- brands.emplace_back() = {*brand, *version}; -+ brands.emplace_back(*brand, *version); - } - - client_hints.brands = std::move(brands); -@@ -384,7 +384,7 @@ Status ParseMobileEmulation(const base:: - "a 'version' field of type string"); - } - -- full_version_list.emplace_back() = {*brand, *version}; -+ full_version_list.emplace_back(*brand, *version); - } - - client_hints.full_version_list = std::move(full_version_list); diff --git a/srcpkgs/qt6-pdf/patches/0114-chromium-118-python-3.12-deprecated.patch b/srcpkgs/qt6-pdf/patches/0114-chromium-118-python-3.12-deprecated.patch deleted file mode 100644 index 1b71a5a0ad023c..00000000000000 --- a/srcpkgs/qt6-pdf/patches/0114-chromium-118-python-3.12-deprecated.patch +++ /dev/null @@ -1,98 +0,0 @@ ---- a/src/3rdparty/chromium/base/write_build_date_header.py -+++ b/src/3rdparty/chromium/base/write_build_date_header.py -@@ -17,7 +17,7 @@ def main(): - args = argument_parser.parse_args() - - date_val = int(args.timestamp) -- date = datetime.datetime.utcfromtimestamp(date_val) -+ date = datetime.datetime.fromtimestamp(date_val, datetime.timezone.utc) - output = ('// Generated by //base/write_build_date_header.py\n' - '#ifndef BASE_GENERATED_BUILD_DATE_TIMESTAMP \n' - f'#define BASE_GENERATED_BUILD_DATE_TIMESTAMP {date_val}' ---- a/src/3rdparty/chromium/components/resources/protobufs/binary_proto_generator.py -+++ b/src/3rdparty/chromium/components/resources/protobufs/binary_proto_generator.py -@@ -40,6 +40,12 @@ class GoogleProtobufModuleImporter: - return filepath - return None - -+ def load_source(name: str, path: str) -> types.ModuleType: -+ spec = importlib.util.spec_from_file_location(name, path) -+ module = importlib.util.module_from_spec(spec) -+ spec.loader.exec_module(module) -+ return module -+ - def _module_exists(self, fullname): - return self._fullname_to_filepath(fullname) is not None - ---- a/src/3rdparty/chromium/third_party/catapult/common/py_vulcanize/py_vulcanize/html_generation_controller.py -+++ b/src/3rdparty/chromium/third_party/catapult/common/py_vulcanize/py_vulcanize/html_generation_controller.py -@@ -18,7 +18,7 @@ class HTMLGenerationController(object): - - def GetHTMLForInlineStylesheet(self, contents): - if self.current_module is None: -- if re.search('url\(.+\)', contents): -+ if re.search(r'url\(.+\)', contents): - raise Exception( - 'Default HTMLGenerationController cannot handle inline style urls') - return contents ---- a/src/3rdparty/chromium/third_party/catapult/common/py_vulcanize/py_vulcanize/js_utils.py -+++ b/src/3rdparty/chromium/third_party/catapult/common/py_vulcanize/py_vulcanize/js_utils.py -@@ -4,4 +4,4 @@ - - - def EscapeJSIfNeeded(js): -- return js.replace('', '<\/script>') -+ return js.replace(r'', r'<\/script>') ---- a/src/3rdparty/chromium/third_party/catapult/common/py_vulcanize/py_vulcanize/parse_html_deps.py -+++ b/src/3rdparty/chromium/third_party/catapult/common/py_vulcanize/py_vulcanize/parse_html_deps.py -@@ -293,6 +293,6 @@ class HTMLModuleParser(): - html = '' - else: - if html.find('< /script>') != -1: -- raise Exception('Escape script tags with <\/script>') -+ raise Exception(r'Escape script tags with <\/script>') - - return HTMLModuleParserResults(html) ---- a/src/3rdparty/chromium/third_party/catapult/common/py_vulcanize/py_vulcanize/style_sheet.py -+++ b/src/3rdparty/chromium/third_party/catapult/common/py_vulcanize/py_vulcanize/style_sheet.py -@@ -60,7 +60,7 @@ class ParsedStyleSheet(object): - return 'url(data:image/%s;base64,%s)' % (ext[1:], data.decode('utf-8')) - - # I'm assuming we only have url()'s associated with images -- return re.sub('url\((?P"|\'|)(?P[^"\'()]*)(?P=quote)\)', -+ return re.sub(r'url\((?P"|\'|)(?P[^"\'()]*)(?P=quote)\)', - InlineUrl, self.contents) - - def AppendDirectlyDependentFilenamesTo(self, dependent_filenames): -@@ -72,7 +72,7 @@ class ParsedStyleSheet(object): - raise Exception('@imports are not supported') - - matches = re.findall( -- 'url\((?:["|\']?)([^"\'()]*)(?:["|\']?)\)', -+ r'url\((?:["|\']?)([^"\'()]*)(?:["|\']?)\)', - self.contents) - - def resolve_url(url): ---- a/src/3rdparty/chromium/third_party/dawn/generator/generator_lib.py -+++ b/src/3rdparty/chromium/third_party/dawn/generator/generator_lib.py -@@ -119,8 +119,8 @@ class _PreprocessingLoader(jinja2.BaseLo - source = self.preprocess(f.read()) - return source, path, lambda: mtime == os.path.getmtime(path) - -- blockstart = re.compile('{%-?\s*(if|elif|else|for|block|macro)[^}]*%}') -- blockend = re.compile('{%-?\s*(end(if|for|block|macro)|elif|else)[^}]*%}') -+ blockstart = re.compile(r'{%-?\s*(if|elif|else|for|block|macro)[^}]*%}') -+ blockend = re.compile(r'{%-?\s*(end(if|for|block|macro)|elif|else)[^}]*%}') - - def preprocess(self, source): - lines = source.split('\n') ---- a/src/3rdparty/chromium/components/resources/protobufs/binary_proto_generator.py -+++ b/src/3rdparty/chromium/components/resources/protobufs/binary_proto_generator.py -@@ -16,6 +16,7 @@ import re - import subprocess - import sys - import traceback -+import types - - - class GoogleProtobufModuleImporter: diff --git a/srcpkgs/qt6-pdf/patches/0122-fix-aarch64-musl-memory-tagging-macros.patch b/srcpkgs/qt6-pdf/patches/0122-fix-aarch64-musl-memory-tagging-macros.patch deleted file mode 100644 index f2d6541b26f4fc..00000000000000 --- a/srcpkgs/qt6-pdf/patches/0122-fix-aarch64-musl-memory-tagging-macros.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- a/src/3rdparty/chromium/base/allocator/partition_allocator/tagging.cc -+++ b/src/3rdparty/chromium/base/allocator/partition_allocator/tagging.cc -@@ -29,13 +29,25 @@ - #endif - #endif - --#ifndef HAS_PR_MTE_MACROS -+#ifndef PR_MTE_TCF_SHIFT - #define PR_MTE_TCF_SHIFT 1 -+#endif -+#ifndef PR_MTE_TCF_NONE - #define PR_MTE_TCF_NONE (0UL << PR_MTE_TCF_SHIFT) -+#endif -+#ifndef PR_MTE_TCF_SYNC - #define PR_MTE_TCF_SYNC (1UL << PR_MTE_TCF_SHIFT) -+#endif -+#ifndef PR_MTE_TCF_ASYNC - #define PR_MTE_TCF_ASYNC (2UL << PR_MTE_TCF_SHIFT) -+#endif -+#ifndef PR_MTE_TCF_MASK - #define PR_MTE_TCF_MASK (3UL << PR_MTE_TCF_SHIFT) -+#endif -+#ifndef PR_MTE_TAG_SHIFT - #define PR_MTE_TAG_SHIFT 3 -+#endif -+#ifndef PR_MTE_TAG_MASK - #define PR_MTE_TAG_MASK (0xffffUL << PR_MTE_TAG_SHIFT) - #define HWCAP2_MTE (1 << 18) - #endif diff --git a/srcpkgs/qt6-pdf/patches/0132-libc_malloc.patch b/srcpkgs/qt6-pdf/patches/0132-libc_malloc.patch index 0352361083d699..74f398d542a172 100644 --- a/srcpkgs/qt6-pdf/patches/0132-libc_malloc.patch +++ b/srcpkgs/qt6-pdf/patches/0132-libc_malloc.patch @@ -1,19 +1,5 @@ --- a/src/3rdparty/chromium/base/process/memory_linux.cc +++ b/src/3rdparty/chromium/base/process/memory_linux.cc -@@ -18,6 +18,13 @@ - #include "base/threading/thread_restrictions.h" - #include "build/build_config.h" - -+#if defined(LIBC_GLIBC) -+extern "C" { -+extern void *__libc_malloc(size_t size); -+extern void *__libc_free(void *ptr); -+} -+#endif -+ - namespace base { - - namespace { @@ -111,7 +118,7 @@ bool UncheckedMalloc(size_t size, void** #elif defined(MEMORY_TOOL_REPLACES_ALLOCATOR) || !defined(LIBC_GLIBC) || defined(TOOLKIT_QT) *result = malloc(size); diff --git a/srcpkgs/qt6-pdf/patches/0133-musl-no-execinfo.patch b/srcpkgs/qt6-pdf/patches/0133-musl-no-execinfo.patch index 3fa2dab93da01c..b6460ee330c6c4 100644 --- a/srcpkgs/qt6-pdf/patches/0133-musl-no-execinfo.patch +++ b/srcpkgs/qt6-pdf/patches/0133-musl-no-execinfo.patch @@ -6,19 +6,19 @@ for discussion about this, see https://www.openwall.com/lists/musl/2021/07/16/1 -- --- a/src/3rdparty/chromium/v8/src/codegen/external-reference-table.cc +++ b/src/3rdparty/chromium/v8/src/codegen/external-reference-table.cc -@@ -12,7 +12,9 @@ - +@@ -11,7 +11,9 @@ + #if defined(DEBUG) && defined(V8_OS_LINUX) && !defined(V8_OS_ANDROID) #define SYMBOLIZE_FUNCTION +#if defined(__GLIBC__) #include +#endif - + #include - -@@ -118,7 +120,7 @@ void ExternalReferenceTable::Init(Isolat + +@@ -96,7 +98,7 @@ } - + const char* ExternalReferenceTable::ResolveSymbol(void* address) { -#ifdef SYMBOLIZE_FUNCTION +#if defined(SYMBOLIZE_FUNCTION) && defined(__GLIBC__) @@ -27,7 +27,7 @@ for discussion about this, see https://www.openwall.com/lists/musl/2021/07/16/1 // The array of names is malloc'ed. However, each name string is static --- a/src/3rdparty/chromium/base/debug/stack_trace.cc +++ b/src/3rdparty/chromium/base/debug/stack_trace.cc -@@ -273,7 +273,9 @@ void StackTrace::Print() const { +@@ -251,7 +253,9 @@ } void StackTrace::OutputToStream(std::ostream* os) const { @@ -37,7 +37,7 @@ for discussion about this, see https://www.openwall.com/lists/musl/2021/07/16/1 } std::string StackTrace::ToString() const { -@@ -281,7 +283,7 @@ std::string StackTrace::ToString() const +@@ -281,7 +281,7 @@ } std::string StackTrace::ToStringWithPrefix(const char* prefix_string) const { std::stringstream stream; @@ -48,7 +48,7 @@ for discussion about this, see https://www.openwall.com/lists/musl/2021/07/16/1 return stream.str(); --- a/src/3rdparty/chromium/base/debug/stack_trace_unittest.cc +++ b/src/3rdparty/chromium/base/debug/stack_trace_unittest.cc -@@ -33,7 +33,7 @@ typedef MultiProcessTest StackTraceTest; +@@ -33,7 +33,7 @@ typedef testing::Test StackTraceTest; #endif @@ -57,12 +57,3 @@ for discussion about this, see https://www.openwall.com/lists/musl/2021/07/16/1 // StackTrace::OutputToStream() is not implemented under uclibc, nor AIX. // See https://crbug.com/706728 -@@ -156,7 +156,7 @@ TEST_F(StackTraceTest, DebugOutputToStre - - #endif // !defined(__UCLIBC__) && !defined(_AIX) - --#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_ANDROID) -+#if (BUILDFLAG(IS_POSIX) && defined(__GLIBC__)) && !BUILDFLAG(IS_ANDROID) - #if !BUILDFLAG(IS_IOS) - static char* newArray() { - // Clang warns about the mismatched new[]/delete if they occur in the same diff --git a/srcpkgs/qt6-pdf/patches/0134-musl-no-mallinfo.patch b/srcpkgs/qt6-pdf/patches/0134-musl-no-mallinfo.patch index 3ec083a830f49c..c96d850172f653 100644 --- a/srcpkgs/qt6-pdf/patches/0134-musl-no-mallinfo.patch +++ b/srcpkgs/qt6-pdf/patches/0134-musl-no-mallinfo.patch @@ -4,7 +4,7 @@ musl does not implement mallinfo()/mallinfo2() -- --- a/src/3rdparty/chromium/base/trace_event/malloc_dump_provider.cc +++ b/src/3rdparty/chromium/base/trace_event/malloc_dump_provider.cc -@@ -199,7 +199,6 @@ void ReportMallinfoStats(ProcessMemoryDu +@@ -185,7 +185,6 @@ #define MALLINFO2_FOUND_IN_LIBC struct mallinfo2 info = mallinfo2(); #endif @@ -12,15 +12,15 @@ musl does not implement mallinfo()/mallinfo2() #if !defined(MALLINFO2_FOUND_IN_LIBC) struct mallinfo info = mallinfo(); #endif -@@ -221,6 +220,7 @@ void ReportMallinfoStats(ProcessMemoryDu - MemoryAllocatorDump::kUnitsBytes, - total_allocated_size); +@@ -205,6 +204,7 @@ + sys_alloc_dump->AddScalar(MemoryAllocatorDump::kNameSize, + MemoryAllocatorDump::kUnitsBytes, info.uordblks); } +#endif // defined(__GLIBC__) && defined(__GLIBC_PREREQ) } #endif -@@ -359,7 +359,7 @@ bool MallocDumpProvider::OnMemoryDump(co +@@ -339,7 +340,7 @@ &allocated_objects_count); #elif BUILDFLAG(IS_FUCHSIA) // TODO(fuchsia): Port, see https://crbug.com/706592. @@ -31,7 +31,7 @@ musl does not implement mallinfo()/mallinfo2() #endif --- a/src/3rdparty/chromium/base/process/process_metrics_posix.cc +++ b/src/3rdparty/chromium/base/process/process_metrics_posix.cc -@@ -106,7 +106,7 @@ void IncreaseFdLimitTo(unsigned int max_ +@@ -105,7 +105,7 @@ #endif // !BUILDFLAG(IS_FUCHSIA) @@ -40,7 +40,7 @@ musl does not implement mallinfo()/mallinfo2() namespace { size_t GetMallocUsageMallinfo() { -@@ -124,7 +124,7 @@ size_t GetMallocUsageMallinfo() { +@@ -123,7 +123,7 @@ } } // namespace @@ -49,7 +49,7 @@ musl does not implement mallinfo()/mallinfo2() // BUILDFLAG(IS_ANDROID) size_t ProcessMetrics::GetMallocUsage() { -@@ -132,9 +132,9 @@ size_t ProcessMetrics::GetMallocUsage() +@@ -131,9 +131,9 @@ malloc_statistics_t stats = {0}; malloc_zone_statistics(nullptr, &stats); return stats.size_in_use; @@ -61,25 +61,26 @@ musl does not implement mallinfo()/mallinfo2() // TODO(fuchsia): Not currently exposed. https://crbug.com/735087. return 0; #endif ---- a/src/3rdparty/chromium/base/allocator/partition_allocator/shim/allocator_shim_default_dispatch_to_partition_alloc.cc -+++ b/src/3rdparty/chromium/base/allocator/partition_allocator/shim/allocator_shim_default_dispatch_to_partition_alloc.cc -@@ -736,7 +736,7 @@ SHIM_ALWAYS_EXPORT int mallopt(int cmd, + #define HAVE_MALLOC_H 1 +--- a/src/3rdparty/chromium/base/allocator/partition_allocator/src/partition_alloc/shim/allocator_shim_default_dispatch_to_partition_alloc.cc ++++ b/src/3rdparty/chromium/base/allocator/partition_allocator/src/partition_alloc/shim/allocator_shim_default_dispatch_to_partition_alloc.cc +@@ -717,7 +717,7 @@ #endif // !BUILDFLAG(IS_APPLE) && !BUILDFLAG(IS_ANDROID) -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if 0 SHIM_ALWAYS_EXPORT struct mallinfo mallinfo(void) __THROW { - partition_alloc::SimplePartitionStatsDumper allocator_dumper; + base::SimplePartitionStatsDumper allocator_dumper; Allocator()->DumpStats("malloc", true, &allocator_dumper); ---- a/src/3rdparty/chromium/base/allocator/partition_allocator/shim/allocator_shim_default_dispatch_to_partition_alloc_unittest.cc -+++ b/src/3rdparty/chromium/base/allocator/partition_allocator/shim/allocator_shim_default_dispatch_to_partition_alloc_unittest.cc -@@ -24,7 +24,7 @@ namespace allocator_shim::internal { +--- a/src/3rdparty/chromium/base/allocator/partition_allocator/src/partition_alloc/shim/allocator_shim_default_dispatch_to_partition_alloc_unittest.cc ++++ b/src/3rdparty/chromium/base/allocator/partition_allocator/src/partition_alloc/shim/allocator_shim_default_dispatch_to_partition_alloc_unittest.cc +@@ -24,7 +24,7 @@ #if BUILDFLAG(USE_PARTITION_ALLOC_AS_MALLOC) // Platforms on which we override weak libc symbols. -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if (BUILDFLAG(IS_LINUX) && defined(__GLIBC__)) || BUILDFLAG(IS_CHROMEOS) - PA_NOINLINE void FreeForTest(void* data) { + NOINLINE void FreeForTest(void* data) { free(data); diff --git a/srcpkgs/qt6-pdf/patches/0135-musl-partition-atfork.patch b/srcpkgs/qt6-pdf/patches/0135-musl-partition-atfork.patch index 1d838142146c78..b41ebf850a9428 100644 --- a/srcpkgs/qt6-pdf/patches/0135-musl-partition-atfork.patch +++ b/srcpkgs/qt6-pdf/patches/0135-musl-partition-atfork.patch @@ -1,8 +1,8 @@ ---- a/src/3rdparty/chromium/base/allocator/partition_allocator/partition_root.cc -+++ b/src/3rdparty/chromium/base/allocator/partition_allocator/partition_root.cc -@@ -281,7 +281,7 @@ void PartitionAllocMallocInitOnce() { +--- a/src/3rdparty/chromium/base/allocator/partition_allocator/src/partition_alloc/partition_root.cc ++++ b/src/3rdparty/chromium/base/allocator/partition_allocator/src/partition_alloc/partition_root.cc +@@ -239,7 +239,7 @@ + if (!g_global_init_called.compare_exchange_strong(expected, true)) return; - } -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if (BUILDFLAG(IS_LINUX) && defined(__GLIBC__)) || BUILDFLAG(IS_CHROMEOS) diff --git a/srcpkgs/qt6-pdf/patches/0138-no-mte.patch b/srcpkgs/qt6-pdf/patches/0138-no-mte.patch deleted file mode 100644 index 074a518d6cf926..00000000000000 --- a/srcpkgs/qt6-pdf/patches/0138-no-mte.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/src/3rdparty/chromium/base/allocator/partition_allocator/partition_alloc_config.h -+++ b/src/3rdparty/chromium/base/allocator/partition_allocator/partition_alloc_config.h -@@ -153,7 +153,7 @@ static_assert(sizeof(void*) != 8, ""); - defined(ARCH_CPU_LITTLE_ENDIAN)) - - #define PA_CONFIG_HAS_MEMORY_TAGGING() \ -- (defined(ARCH_CPU_ARM64) && defined(__clang__) && \ -+ (0 && defined(ARCH_CPU_ARM64) && defined(__clang__) && \ - !defined(ADDRESS_SANITIZER) && \ - (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID))) - diff --git a/srcpkgs/qt6-pdf/patches/1000-cstdint.patch b/srcpkgs/qt6-pdf/patches/1000-cstdint.patch new file mode 100644 index 00000000000000..baedcfced5995f --- /dev/null +++ b/srcpkgs/qt6-pdf/patches/1000-cstdint.patch @@ -0,0 +1,10 @@ +--- a/src/3rdparty/chromium/third_party/webrtc/modules/audio_coding/neteq/reorder_optimizer.cc 2024-10-02 17:40:01.000000000 +0200 ++++ - 2024-11-17 01:58:53.289344135 +0100 +@@ -11,6 +11,7 @@ + #include "modules/audio_coding/neteq/reorder_optimizer.h" + + #include ++#include + #include + #include + diff --git a/srcpkgs/qt6-pdf/template b/srcpkgs/qt6-pdf/template index bb29283ebea9ee..235495f14b271c 100644 --- a/srcpkgs/qt6-pdf/template +++ b/srcpkgs/qt6-pdf/template @@ -1,7 +1,7 @@ # Template file for 'qt6-pdf' pkgname=qt6-pdf -version=6.7.2 -revision=2 +version=6.8.0 +revision=1 build_style=cmake configure_args="-DQT_FEATURE_qtpdf_build=ON -DQT_FEATURE_qtpdf_widgets_build=ON @@ -22,7 +22,7 @@ maintainer="John " license="GPL-3.0-only, GPL-2.0-only, LGPL-3.0-only, BSD-3-Clause" homepage="https://www.qt.io" distfiles="https://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtwebengine-everywhere-src-${version}.tar.xz" -checksum=c7755875594d8be382b07bf3634d44fd77012805794d8b588891709a6405ffd1 +checksum=2484459248a8624c16b70780bef3fe4bc7f4eace2178f84233d4e711cb7f7452 if [ "$XBPS_LIBC" = "musl" ]; then hostmakedepends+=" musl-legacy-compat" From e88cb907a821465ad14a561be3f871d18a33b3ca Mon Sep 17 00:00:00 2001 From: John Date: Wed, 30 Oct 2024 11:48:33 +0100 Subject: [PATCH 13/30] qt6-position: update to 6.8.0. --- srcpkgs/qt6-position/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/qt6-position/template b/srcpkgs/qt6-position/template index 61e463e81dd05a..ece6caff4e253c 100644 --- a/srcpkgs/qt6-position/template +++ b/srcpkgs/qt6-position/template @@ -1,6 +1,6 @@ # Template file for 'qt6-position' pkgname=qt6-position -version=6.7.2 +version=6.8.0 revision=1 build_style=cmake hostmakedepends="perl qt6-base qt6-declarative-host-tools" @@ -11,7 +11,7 @@ maintainer="John " license="(LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only) AND GPL-3.0-only with Qt-GPL-exception-1.0" homepage="https://qt.io/" distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtpositioning-everywhere-src-${version}.tar.xz" -checksum=020009f0aa8f6b1042963a45b6e19f2784cc937949cdb673f3b876153e087b1c +checksum=ec81463e2b01475911131b11c96d312ffd7aa90d4482bbd6a9965b189e7eeb39 pre_check() { export QML2_IMPORT_PATH="$wrksrc/build/lib${XBPS_TARGET_WORDSIZE}/qt6/qml" From 7a6b8ab82c2e647c14adb324e02de95dd8fe9ccb Mon Sep 17 00:00:00 2001 From: John Date: Wed, 30 Oct 2024 11:48:34 +0100 Subject: [PATCH 14/30] qt6-qt5compat: update to 6.8.0. --- srcpkgs/qt6-qt5compat/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/qt6-qt5compat/template b/srcpkgs/qt6-qt5compat/template index fa9c9d6eabb147..3240517b989393 100644 --- a/srcpkgs/qt6-qt5compat/template +++ b/srcpkgs/qt6-qt5compat/template @@ -1,6 +1,6 @@ # Template file for 'qt6-qt5compat' pkgname=qt6-qt5compat -version=6.7.2 +version=6.8.0 revision=1 build_style=cmake configure_args="-DQT_FEATURE_textcodec=ON -DQT_FEATURE_codecs=ON @@ -13,7 +13,7 @@ maintainer="John " license="GPL-3.0-only with Qt-GPL-exception-1.0, LGPL-3.0-only, GPL-2.0-or-later" homepage="https://qt.io/" distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qt5compat-everywhere-src-${version}.tar.xz" -checksum=8826b5189efc4d9bdb64fdb1aa89d0fdf4e53c60948ed7995621ed046e38c003 +checksum=3c9b05fdd70b6bd6ec152e6b43f2a5f4c7b31c9eb342d62fa8450d63f5835e30 if [ "$XBPS_CHECK_PKGS" ]; then configure_args="-DQT_BUILD_TESTS=ON" From 4efd039494c31e518e55748795a5a33b2146215f Mon Sep 17 00:00:00 2001 From: John Date: Wed, 30 Oct 2024 11:48:37 +0100 Subject: [PATCH 15/30] qt6-quick3d: update to 6.8.0. --- srcpkgs/qt6-quick3d/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/qt6-quick3d/template b/srcpkgs/qt6-quick3d/template index 8cf3f07d37a848..93babdde7e1a27 100644 --- a/srcpkgs/qt6-quick3d/template +++ b/srcpkgs/qt6-quick3d/template @@ -1,6 +1,6 @@ # Template file for 'qt6-quick3d' pkgname=qt6-quick3d -version=6.7.2 +version=6.8.0 revision=1 build_style=cmake hostmakedepends="perl qt6-declarative-host-tools qt6-shadertools" @@ -11,7 +11,7 @@ maintainer="John " license="GPL-3.0-or-later" homepage="https://qt.io/" distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtquick3d-everywhere-src-${version}.tar.xz" -checksum=bb8ff9aec6da2e2d3b3986cc859333a98b2f3d4bbe564c5733e8f1a089d15270 +checksum=3e95044ee2da33db1a6fa3f834b09e71b2491c4899bac3a3bdf0c10b06f0223f subpackages="qt6-quick3d-tools qt6-quick3d-private-devel qt6-quick3d-devel" if [ "$CROSS_BUILD" ]; then From 55530509d6305d031f456274e1d4c6e22de6ab94 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 30 Oct 2024 11:48:39 +0100 Subject: [PATCH 16/30] qt6-quicktimeline: update to 6.8.0. --- srcpkgs/qt6-quicktimeline/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/qt6-quicktimeline/template b/srcpkgs/qt6-quicktimeline/template index 5c19476ea230f3..c28165fc25585f 100644 --- a/srcpkgs/qt6-quicktimeline/template +++ b/srcpkgs/qt6-quicktimeline/template @@ -1,6 +1,6 @@ # Template file for 'qt6-quicktimeline' pkgname=qt6-quicktimeline -version=6.7.2 +version=6.8.0 revision=1 build_style=cmake hostmakedepends="perl qt6-base qt6-declarative-host-tools" @@ -10,7 +10,7 @@ maintainer="John " license="GPL-3.0-or-later" homepage="https://qt.io/" distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version/rc/-rc}/submodules/qtquicktimeline-everywhere-src-${version/rc/-rc}.tar.xz" -checksum=21eddea01cf095cede10362eea4fb8402ffd06868c88d50a757c8c1f6b0719eb +checksum=1106a41bd8081903058a47a2bca3a147d594d15cc21006aa45f38c6e1dd91f08 if [ "$XBPS_CHECK_PKGS" ]; then configure_args="-DQT_BUILD_TESTS=ON" From 67796d52738380e56ffae6722a2db7513c70f9e3 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 30 Oct 2024 11:48:40 +0100 Subject: [PATCH 17/30] qt6-remoteobjects: update to 6.8.0. --- srcpkgs/qt6-remoteobjects/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/qt6-remoteobjects/template b/srcpkgs/qt6-remoteobjects/template index 1f6aa61dc8831c..735cd3e6f2a711 100644 --- a/srcpkgs/qt6-remoteobjects/template +++ b/srcpkgs/qt6-remoteobjects/template @@ -1,6 +1,6 @@ # Template file for 'qt6-remoteobjects' pkgname=qt6-remoteobjects -version=6.7.2 +version=6.8.0 revision=1 build_style=cmake hostmakedepends="perl qt6-declarative-host-tools pkg-config" @@ -14,7 +14,7 @@ maintainer="Đoàn Trần Công Danh " license="(LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only) AND GPL-3.0-only with Qt-GPL-exception-1.0" homepage="https://qt.io/" distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtremoteobjects-everywhere-src-${version}.tar.xz" -checksum=0b906b81aa7d6f4e47d4a298da67894433f3096a06f4c4237788c1b2cb9b7483 +checksum=f1df570c6d9796e98374414f0f24f31bdd1e61f8063d6d9e2f407632559c7588 if [ "$CROSS_BUILD" ]; then hostmakedepends+=" qt6-remoteobjects" From 9241197f8e672aa3ccc44db6e14e1a65f1f6a3cd Mon Sep 17 00:00:00 2001 From: John Date: Wed, 30 Oct 2024 11:48:42 +0100 Subject: [PATCH 18/30] qt6-scxml: update to 6.8.0. --- srcpkgs/qt6-scxml/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/qt6-scxml/template b/srcpkgs/qt6-scxml/template index a5dfb1f85357de..730cc46944064b 100644 --- a/srcpkgs/qt6-scxml/template +++ b/srcpkgs/qt6-scxml/template @@ -1,6 +1,6 @@ # Template file for 'qt6-scxml' pkgname=qt6-scxml -version=6.7.2 +version=6.8.0 revision=1 build_style=cmake configure_args="-DQT_FEATURE_scxml_ecmascriptdatamodel=ON" @@ -11,7 +11,7 @@ maintainer="John " license="LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only" homepage="https://qt.io/" distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtscxml-everywhere-src-${version}.tar.xz" -checksum=20ecf93506d48f27b492ad3dd9d88830e08d642faec3071ce53396a8ae05c86f +checksum=bba9aa4ef441b01b2d391486ddccfb09efa378c8a24e6d13e983fc019837b43b subpackages="qt6-scxml-tools qt6-scxml-devel" if [ "$CROSS_BUILD" ]; then From 6cde89c76de895f75d586d4335503a3b4c65cf1a Mon Sep 17 00:00:00 2001 From: John Date: Wed, 30 Oct 2024 11:48:43 +0100 Subject: [PATCH 19/30] qt6-sensors: update to 6.8.0. --- srcpkgs/qt6-sensors/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/qt6-sensors/template b/srcpkgs/qt6-sensors/template index 8dbfd92079ba46..f3059ec7a03291 100644 --- a/srcpkgs/qt6-sensors/template +++ b/srcpkgs/qt6-sensors/template @@ -1,6 +1,6 @@ # Template file for 'qt6-sensors' pkgname=qt6-sensors -version=6.7.2 +version=6.8.0 revision=1 build_style=cmake hostmakedepends="perl qt6-declarative-host-tools pkg-config" @@ -10,7 +10,7 @@ maintainer="Đoàn Trần Công Danh " license="(LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only) AND GPL-3.0-only with Qt-GPL-exception-1.0" homepage="https://qt.io/" distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtsensors-everywhere-src-${version}.tar.xz" -checksum=ead1dec787c56ed4dc02ed810af54ff1e1f6875cb5cc2506c74eeb9554e6bb59 +checksum=723544c5fa05fab75d53d66186a7ce83fb2f6f9a770ce796306992e983dde679 post_install() { rm -rf ${DESTDIR}/usr/tests From efa203040cbcdf4cbdd0d95a329bf2176d50ec06 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 30 Oct 2024 11:48:45 +0100 Subject: [PATCH 20/30] qt6-serialport: update to 6.8.0. --- srcpkgs/qt6-serialport/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/qt6-serialport/template b/srcpkgs/qt6-serialport/template index 491e1463daa366..313368d32877e3 100644 --- a/srcpkgs/qt6-serialport/template +++ b/srcpkgs/qt6-serialport/template @@ -1,6 +1,6 @@ # Template file for 'qt6-serialport' pkgname=qt6-serialport -version=6.7.2 +version=6.8.0 revision=1 build_style=cmake hostmakedepends="perl qt6-base pkg-config" @@ -10,7 +10,7 @@ maintainer="John " license="(LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only) AND GPL-3.0-only with Qt-GPL-exception-1.0" homepage="https://qt.io/" distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtserialport-everywhere-src-${version}.tar.xz" -checksum=21c34cd1161cb5197bcec662d26a17647b59b6fdff5c364576883c42dbd3b4fc +checksum=7767d72ecfadb1045c50d0b30b952327c242a6eb40a46780e8e01b75ad77e7c3 qt6-serialport-devel_package() { depends="${sourcepkg}>=${version}_${revision} qt6-base-devel>=${version}_1" From 8c0f8d2d00d3261f3809b85f9878e799d2fa25f8 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 30 Oct 2024 11:48:46 +0100 Subject: [PATCH 21/30] qt6-shadertools: update to 6.8.0. --- srcpkgs/qt6-shadertools/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/qt6-shadertools/template b/srcpkgs/qt6-shadertools/template index 0357e1abd4c442..1a9d123217761d 100644 --- a/srcpkgs/qt6-shadertools/template +++ b/srcpkgs/qt6-shadertools/template @@ -1,6 +1,6 @@ # Template file for 'qt6-shadertools' pkgname=qt6-shadertools -version=6.7.2 +version=6.8.0 revision=1 build_style=cmake hostmakedepends="perl qt6-base" @@ -11,7 +11,7 @@ maintainer="John " license="GPL-3.0-or-later" homepage="https://qt.io/" distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtshadertools-everywhere-src-${version}.tar.xz" -checksum=edfa34c0ac8c00fcaa949df1d8e7a77d89dadd6386e683ce6c3e3b117e2f7cc1 +checksum=44692dc93482374bf3b39e96c881fa08275f0bf82958b68a7e3c796b76d4c4cb if [ "$CROSS_BUILD" ]; then configure_args="-DQT_FORCE_BUILD_TOOLS=true" From 09af11f11e94249296ad16f2ea460de66c285a59 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 30 Oct 2024 11:48:48 +0100 Subject: [PATCH 22/30] qt6-speech: update to 6.8.0. --- srcpkgs/qt6-speech/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/qt6-speech/template b/srcpkgs/qt6-speech/template index 776995f2567c75..759cd237e65439 100644 --- a/srcpkgs/qt6-speech/template +++ b/srcpkgs/qt6-speech/template @@ -1,6 +1,6 @@ # Template file for 'qt6-speech' pkgname=qt6-speech -version=6.7.2 +version=6.8.0 revision=1 build_style=cmake hostmakedepends="perl pkg-config qt6-declarative-host-tools" @@ -11,7 +11,7 @@ maintainer="John " license="(LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only) AND GPL-3.0-only with Qt-GPL-exception-1.0" homepage="https://www.qt.io" distfiles="https://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtspeech-everywhere-src-${version}.tar.xz" -checksum=cc8c769404e3e49713be304a73f936890a1ef2f88d590732785f34692a4814ce +checksum=75230a12bc37b8535f3858c11247bf68a502e2559265243eb3b44fc917166565 if [ "$XBPS_CHECK_PKGS" ]; then configure_args="-DQT_BUILD_TESTS=ON" From 4731261b41269a17be7cb0f9b936f896360cde3a Mon Sep 17 00:00:00 2001 From: John Date: Wed, 30 Oct 2024 11:48:49 +0100 Subject: [PATCH 23/30] qt6-svg: update to 6.8.0. --- srcpkgs/qt6-svg/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/qt6-svg/template b/srcpkgs/qt6-svg/template index fecf0655fdb832..b64c81d052359e 100644 --- a/srcpkgs/qt6-svg/template +++ b/srcpkgs/qt6-svg/template @@ -1,6 +1,6 @@ # Template file for 'qt6-svg' pkgname=qt6-svg -version=6.7.2 +version=6.8.0 revision=1 build_style=cmake hostmakedepends="qt6-base perl" @@ -10,7 +10,7 @@ maintainer="John " license="GPL-3.0-only with Qt-GPL-exception-1.0, GPL-2.0-or-later, LGPL-3.0-only" homepage="https://qt.io/" distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtsvg-everywhere-src-${version}.tar.xz" -checksum=fb0d1286a35be3583fee34aeb5843c94719e07193bdf1d4d8b0dc14009caef01 +checksum=cf7a593d5e520f8177240610d9e55d5b75b0887fe5f385554ff64377f1646199 if [ "$XBPS_CHECK_PKGS" ]; then configure_args="-DQT_BUILD_TESTS=ON" From b9977c08eafc43775e1fd6147c12c9a6ca5f9264 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 30 Oct 2024 11:48:51 +0100 Subject: [PATCH 24/30] qt6-tools: update to 6.8.0. --- srcpkgs/qt6-tools/patches/qdoc-location.patch | 6 +++--- srcpkgs/qt6-tools/template | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/srcpkgs/qt6-tools/patches/qdoc-location.patch b/srcpkgs/qt6-tools/patches/qdoc-location.patch index 8e4df56a00b404..f970f25011be32 100644 --- a/srcpkgs/qt6-tools/patches/qdoc-location.patch +++ b/srcpkgs/qt6-tools/patches/qdoc-location.patch @@ -54,16 +54,16 @@ --- a/tests/auto/linguist/lupdate/tst_lupdate.cpp +++ b/tests/auto/linguist/lupdate/tst_lupdate.cpp -@@ -44,7 +44,10 @@ private: - +@@ -55,7 +55,10 @@ tst_lupdate::tst_lupdate() { + m_timer.start(); - QString binPath = QLibraryInfo::path(QLibraryInfo::BinariesPath); + auto binPath = QLibraryInfo::path(QLibraryInfo::BinariesPath); + char *build_binpath = getenv("QT_BUILD_BIN_PATH"); + if (build_binpath && *build_binpath) + binPath = build_binpath; - m_cmdLupdate = binPath + QLatin1String("/lupdate"); + m_cmdLupdate = binPath + "/lupdate"_L1; m_basePath = QFINDTESTDATA("testdata/"); } --- a/tests/auto/qtdiag/tst_qtdiag.cpp diff --git a/srcpkgs/qt6-tools/template b/srcpkgs/qt6-tools/template index 5fde45439cdc4a..14a81f84050944 100644 --- a/srcpkgs/qt6-tools/template +++ b/srcpkgs/qt6-tools/template @@ -1,6 +1,6 @@ # Template file for 'qt6-tools' pkgname=qt6-tools -version=6.7.2 +version=6.8.0 revision=1 build_style=cmake configure_args="-DEXTERNAL_GUMBO=ON -DLITEHTML_UTF8=ON -DUSE_ICU=ON @@ -16,7 +16,7 @@ maintainer="John " license="custom:GPL-3.0-only-with-Qt-GPL-exception-1.0, LGPL-3.0-only, GPL-2.0-or-later" homepage="https://qt.io/" distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qttools-everywhere-src-${version}.tar.xz" -checksum=58e855ad1b2533094726c8a425766b63a04a0eede2ed85086860e54593aa4b2a +checksum=403115d8268503c6cc6e43310c8ae28eb9e605072a5d04e4a2de8b6af39981f7 if [ "$CROSS_BUILD" ]; then configure_args+=" -DQT_FORCE_BUILD_TOOLS=TRUE" From adb8065d69b2b450d00245079cbf2a7140731139 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 30 Oct 2024 11:48:52 +0100 Subject: [PATCH 25/30] qt6-translations: update to 6.8.0. --- srcpkgs/qt6-translations/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/qt6-translations/template b/srcpkgs/qt6-translations/template index 3a87df627a2f2e..978e8a378221df 100644 --- a/srcpkgs/qt6-translations/template +++ b/srcpkgs/qt6-translations/template @@ -1,6 +1,6 @@ # Template file for 'qt6-translations' pkgname=qt6-translations -version=6.7.2 +version=6.8.0 revision=1 build_style=cmake hostmakedepends="qt6-base-devel qt6-tools-devel perl" @@ -9,7 +9,7 @@ maintainer="John " license="GPL-3.0-only with Qt-GPL-exception-1.0" homepage="https://qt.io/" distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qttranslations-everywhere-src-${version}.tar.xz" -checksum=9845780b5dc1b7279d57836db51aeaf2e4a1160c42be09750616f39157582ca9 +checksum=84bf2b67c243cd0c50a08acd7bfa9df2b1965028511815c1b6b65a0687437cb6 do_configure() { rm -rf build From 206fb4f4d78d6f9c6ce08c1eaec5c8358a9f05be Mon Sep 17 00:00:00 2001 From: John Date: Wed, 30 Oct 2024 11:48:54 +0100 Subject: [PATCH 26/30] qt6-virtualkeyboard: update to 6.8.0. --- srcpkgs/qt6-virtualkeyboard/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/qt6-virtualkeyboard/template b/srcpkgs/qt6-virtualkeyboard/template index 5f06025c759358..f0a834b510ce0f 100644 --- a/srcpkgs/qt6-virtualkeyboard/template +++ b/srcpkgs/qt6-virtualkeyboard/template @@ -1,6 +1,6 @@ # Template file for 'qt6-virtualkeyboard' pkgname=qt6-virtualkeyboard -version=6.7.2 +version=6.8.0 revision=1 build_style=cmake hostmakedepends="perl pkg-config qt6-declarative-host-tools" @@ -11,7 +11,7 @@ maintainer="John " license="GPL-3.0-only" homepage="https://qt.io/" distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtvirtualkeyboard-everywhere-src-${version}.tar.xz" -checksum=320664b55a0960ff79c1b822dcf6e8cebe3e08b791147d41b570996d81ce180f +checksum=8f6502d7f40765fb4960b804927f9d86da39bdf42acc5021353c49527b6d0ce0 if [ "$XBPS_CHECK_PKGS" ]; then configure_args="-DQT_BUILD_TESTS=ON" From face373a3f76c1498cb3249bd9efdfce5ad730d7 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 30 Oct 2024 11:48:56 +0100 Subject: [PATCH 27/30] qt6-wayland: update to 6.8.0. --- srcpkgs/qt6-wayland/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/qt6-wayland/template b/srcpkgs/qt6-wayland/template index ed5fbfa00b43a2..4a001ab397ad44 100644 --- a/srcpkgs/qt6-wayland/template +++ b/srcpkgs/qt6-wayland/template @@ -1,7 +1,7 @@ # Template file for 'qt6-wayland' pkgname=qt6-wayland -version=6.7.2 -revision=2 +version=6.8.0 +revision=1 build_style=cmake hostmakedepends="qt6-base perl pkg-config wayland-devel qt6-declarative-host-tools" # XXX: Qml as optional dep @@ -14,7 +14,7 @@ maintainer="John " license="GPL-3.0-only with Qt-GPL-exception-1.0, LGPL-3.0-only, GPL-2.0-or-later" homepage="https://www.qt.io" distfiles="https://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtwayland-everywhere-src-${version}.tar.xz" -checksum=a2a057e1dd644bd44abb9990fecc194b2e25c2e0f39e81aa9fee4c1e5e2a8a5b +checksum=175758591638ebf1c6fbb66ac11c7fa0eb8d4ed52e9243cc59075d06a6a2060a subpackages="qt6-wayland-tools qt6-wayland-private-devel qt6-wayland-devel" From 792ed8d1ed1d3a4d1466e0989963ffaf24bcb4f4 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 30 Oct 2024 11:48:57 +0100 Subject: [PATCH 28/30] qt6-webchannel: update to 6.8.0. --- srcpkgs/qt6-webchannel/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/qt6-webchannel/template b/srcpkgs/qt6-webchannel/template index 4a867790d99cf2..bc19b759fdd8bf 100644 --- a/srcpkgs/qt6-webchannel/template +++ b/srcpkgs/qt6-webchannel/template @@ -1,6 +1,6 @@ # Template file for 'qt6-webchannel' pkgname=qt6-webchannel -version=6.7.2 +version=6.8.0 revision=1 build_style=cmake hostmakedepends="perl qt6-base qt6-declarative-host-tools" @@ -11,7 +11,7 @@ maintainer="John " license="(LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only) AND GPL-3.0-only with Qt-GPL-exception-1.0" homepage="https://qt.io/" distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtwebchannel-everywhere-src-${version}.tar.xz" -checksum=ac5d96607b10e7de546eaf93bb9f65c0fd631ef9b91ef8a794e26fd57db4501c +checksum=d6250d25bf8a8d2af608239d259ec72db6dc28f08aefc8895492ad09ebaf60c0 do_check() { cd build From d398f10cfe1c20cdcaafef27af2be8e1321538ef Mon Sep 17 00:00:00 2001 From: John Date: Wed, 30 Oct 2024 11:48:59 +0100 Subject: [PATCH 29/30] qt6-websockets: update to 6.8.0. --- srcpkgs/qt6-websockets/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/qt6-websockets/template b/srcpkgs/qt6-websockets/template index 4b816db33bfba7..15b684f6cbc541 100644 --- a/srcpkgs/qt6-websockets/template +++ b/srcpkgs/qt6-websockets/template @@ -1,6 +1,6 @@ # Template file for 'qt6-websockets' pkgname=qt6-websockets -version=6.7.2 +version=6.8.0 revision=1 build_style=cmake hostmakedepends="perl qt6-base qt6-declarative-host-tools" @@ -12,7 +12,7 @@ maintainer="John " license="(LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only) AND GPL-3.0-only with Qt-GPL-exception-1.0" homepage="https://qt.io/" distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtwebsockets-everywhere-src-${version}.tar.xz" -checksum=5bde4af6ec9ce8c8632b782ab77b82d910721be2c714e6d38902521bcd1d215f +checksum=c14be05c46b71c2a89865987ffe0a8d40d8ecb01d48dcdca7fc02ba83a5eaf6f do_check() { cd build From 2d2d49a2e05861bc640822bb76bb875f130465b7 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 30 Oct 2024 11:49:00 +0100 Subject: [PATCH 30/30] qt6-webview: update to 6.8.0. --- srcpkgs/qt6-webview/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/qt6-webview/template b/srcpkgs/qt6-webview/template index abdfa65829429d..e420f19dbe5531 100644 --- a/srcpkgs/qt6-webview/template +++ b/srcpkgs/qt6-webview/template @@ -1,6 +1,6 @@ # Template file for 'qt6-webview' pkgname=qt6-webview -version=6.7.2 +version=6.8.0 revision=1 build_style=cmake hostmakedepends="qt6-base qt6-declarative-host-tools" @@ -10,7 +10,7 @@ maintainer="Đoàn Trần Công Danh " license="GPL-3.0-only, GPL-2.0-only, LGPL-3.0-only" homepage="https://www.qt.io" distfiles="https://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtwebview-everywhere-src-${version}.tar.xz" -checksum=4ce1096903d4fec39bfcd95d4015acbf105eddf66a384303cb0fe899dd24e4fe +checksum=7cb89d41593876b176368b15c1cded3d5a3c4fdf7e0a10f0c61021e3e8c179f3 if [ "$XBPS_WORDSIZE$XBPS_WORDSIZE" != "64$XBPS_TARGET_WORDSIZE" ]; then broken="no qt6-webengine"