Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] WIP Qt6 webengine
@ 2022-08-07  4:36 sgn
  2022-08-07  4:38 ` [PR PATCH] [Updated] " sgn
                   ` (37 more replies)
  0 siblings, 38 replies; 39+ messages in thread
From: sgn @ 2022-08-07  4:36 UTC (permalink / raw)
  To: ml

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

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

https://github.com/sgn/void-packages qt6-webengine
https://github.com/void-linux/void-packages/pull/38509

WIP Qt6 webengine
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**
[ci skip]

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-qt6-webengine-38509.patch --]
[-- Type: text/x-diff, Size: 280542 bytes --]

From 5bd59c330d3c32546c3febd83e328cf94aeb549a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 28 Jul 2022 16:36:21 +0200
Subject: [PATCH 01/22] qt6-base: update to 6.3.1.

---
 srcpkgs/qt6-base/patches/libatomic.patch | 14 --------------
 srcpkgs/qt6-base/template                |  6 +++---
 2 files changed, 3 insertions(+), 17 deletions(-)
 delete mode 100644 srcpkgs/qt6-base/patches/libatomic.patch

diff --git a/srcpkgs/qt6-base/patches/libatomic.patch b/srcpkgs/qt6-base/patches/libatomic.patch
deleted file mode 100644
index 2f7a807518e4..000000000000
--- a/srcpkgs/qt6-base/patches/libatomic.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Index: cmake/FindWrapAtomic.cmake
-===================================================================
---- a/cmake/FindWrapAtomic.cmake
-+++ b/cmake/FindWrapAtomic.cmake
-@@ -38,7 +38,8 @@ endif()
- 
- add_library(WrapAtomic::WrapAtomic INTERFACE IMPORTED)
- if(HAVE_STDATOMIC_WITH_LIB)
--    target_link_libraries(WrapAtomic::WrapAtomic INTERFACE atomic)
-+    find_library(LIBATOMIC atomic REQUIRED)
-+    target_link_libraries(WrapAtomic::WrapAtomic INTERFACE ${LIBATOMIC})
- endif()
- 
- set(WrapAtomic_FOUND 1)
diff --git a/srcpkgs/qt6-base/template b/srcpkgs/qt6-base/template
index cc47e18a70ff..de7d1583c8f9 100644
--- a/srcpkgs/qt6-base/template
+++ b/srcpkgs/qt6-base/template
@@ -1,7 +1,7 @@
 # Template file for 'qt6-base'
 pkgname=qt6-base
-version=6.3.0
-revision=2
+version=6.3.1
+revision=1
 wrksrc="qtbase-everywhere-src-${version}"
 build_style=cmake
 configure_args="-DINSTALL_DATADIR=share/qt6
@@ -29,7 +29,7 @@ maintainer="John <me@johnnynator.dev>"
 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=b865aae43357f792b3b0a162899d9bf6a1393a55c4e5e4ede5316b157b1a0f99
+checksum=0a64421d9c2469c2c48490a032ab91d547017c9cc171f3f8070bc31888f24e03
 python_version=3
 
 if [ "$CROSS_BUILD" ]; then

From e89ac61ed2842f6d82da54a4417ee4a35fd54b38 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 28 Jul 2022 16:36:24 +0200
Subject: [PATCH 02/22] qt6-charts: update to 6.3.1.

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

diff --git a/srcpkgs/qt6-charts/template b/srcpkgs/qt6-charts/template
index 79cb8a220401..57a3a015d126 100644
--- a/srcpkgs/qt6-charts/template
+++ b/srcpkgs/qt6-charts/template
@@ -1,6 +1,6 @@
 # Template file for 'qt6-charts'
 pkgname=qt6-charts
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qtcharts-everywhere-src-${version}"
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 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=672762c5f641ccc88a30aeedefb63f03c0f837649b334f46eea57592e87e36cd
+checksum=f330cc2328729104d79b2088990ce0840f2da89d9d989360d4c352e797d27cf7
 
 qt6-charts-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 331b461605b93d7a966005a8344b4390149e6bc6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 28 Jul 2022 16:36:30 +0200
Subject: [PATCH 03/22] qt6-declarative: update to 6.3.1.

---
 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 e0bd28d9e383..f31990750af0 100644
--- a/srcpkgs/qt6-declarative/template
+++ b/srcpkgs/qt6-declarative/template
@@ -1,6 +1,6 @@
 # Template file for 'qt6-declarative'
 pkgname=qt6-declarative
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qtdeclarative-everywhere-src-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 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=d294b029dc2b2d4f65da516fdc3b8088d32643eb7ff77db135a8b9ce904caa37
+checksum=03e7694123820fcca397f95ce312e0b7f3039493c8754c836da098a1a04346e8
 replaces="qt6-quickcontrols2>=0"
 
 if [ "$CROSS_BUILD" ]; then

From 9c1d1370116c24624de6ffc0473e445fef301754 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 28 Jul 2022 16:36:32 +0200
Subject: [PATCH 04/22] qt6-imageformats: update to 6.3.1.

---
 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 eaca95243c48..65b6043fe497 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.3.0
+version=6.3.1
 revision=1
 wrksrc="qtimageformats-everywhere-src-${version}"
 build_style=cmake
@@ -12,4 +12,4 @@ maintainer="John <me@johnnynator.dev>"
 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=025d0d17ed75b42a7eb6b523731ab8f17025421a8810cade25caffe05d93abef
+checksum=ad0312b8dfbbb67f729bfadbfcd47246ee4a128b717731ba158c41d01fde212f

From a25609650e650c814cb14c5a41b5f88e4e201610 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 28 Jul 2022 16:36:33 +0200
Subject: [PATCH 05/22] qt6-location: update to 6.3.1.

---
 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 b7397f5f8942..ad372775f85a 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.3.0
+version=6.3.1
 revision=1
 wrksrc="qtpositioning-everywhere-src-${version}"
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 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=e9ed50f6b245a346db34d625d0012774ef0ec8e7fd65037127ec26758708236e
+checksum=06788e4ecae1920094b30e4046f0abd23c8189d8a51e9c939b02f0b6abe2e86c
 
 qt6-location-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel>=${version}_1"

From 4f191850d385c6f43d4c3e8acdb2f86151b4dbfd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 28 Jul 2022 16:36:35 +0200
Subject: [PATCH 06/22] qt6-lottie: update to 6.3.1.

---
 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 1c97cd5f4f32..43cb6871da58 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.3.0
+version=6.3.1
 revision=1
 wrksrc="qtlottie-everywhere-src-${version}"
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 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=39db570bbba5b527a1eb6a5774bed47398ace2f7217bbf45b1194ada6cf97deb
+checksum=740ba76999124d5e1a85ef3d01c69976bb8557862b6b26bf48b357fe0cab1cf5
 
 if [ "$XBPS_CHECK_PKGS" ]; then
 	configure_args+=" -DQT_BUILD_TESTS=ON"

From c54a8696b8c0ac7efb078e7f0824ee18e42c7354 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 28 Jul 2022 16:36:38 +0200
Subject: [PATCH 07/22] qt6-networkauth: update to 6.3.1.

---
 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 e934beada9b0..d13ead03866b 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.3.0
+version=6.3.1
 revision=1
 wrksrc="qtnetworkauth-everywhere-src-${version}"
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 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=203a98942919028520038f90a20cd7ee32b537233545d11e429c3e2c1ad9069f
+checksum=d60f54b9d4509fa8bdbf1990bc91f6e260e38cdb57a7b8119fa3861bc5d2fb2a
 
 if [ "$XBPS_CHECK_PKGS" ]; then
 	configure_args+=" -DQT_BUILD_TESTS=ON"

From 9ec9c2300f2df710e6e8d437aaf13a0843c52c13 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 28 Jul 2022 16:36:41 +0200
Subject: [PATCH 08/22] qt6-qt5compat: update to 6.3.1.

---
 srcpkgs/qt6-qt5compat/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/qt6-qt5compat/template b/srcpkgs/qt6-qt5compat/template
index 7fcd5ad5080e..87f1d32298be 100644
--- a/srcpkgs/qt6-qt5compat/template
+++ b/srcpkgs/qt6-qt5compat/template
@@ -1,7 +1,7 @@
 # Template file for 'qt6-qt5compat'
 pkgname=qt6-qt5compat
-version=6.3.0
-revision=2
+version=6.3.1
+revision=1
 wrksrc="qt5compat-everywhere-src-${version}"
 build_style=cmake
 configure_args="-DQT_HOST_PATH=/usr"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 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=2b199be780c50d9214512b922d94cb240b0412fd63f459e356b76102cad1713e
+checksum=a43ec62bd778eaecf88ad7847118d1c2a471b0fcb820f93beb311d7ab9566cfd
 
 if [ "$XBPS_CHECK_PKGS" ]; then
 	configure_args+=" -DQT_BUILD_TESTS=ON"

From fefddbbf6221f8bcf4dcbdbfbd21a98749ddb6f7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 28 Jul 2022 16:36:48 +0200
Subject: [PATCH 09/22] qt6-quick3d: update to 6.3.1.

---
 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 0f7ef336a3ff..44bffb41bb49 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.3.0
+version=6.3.1
 revision=1
 wrksrc="qtquick3d-everywhere-src-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 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=0ad05bd1ee1f784b18220a2d2625ee8de91662c88fdc7b798662953d86eb327e
+checksum=2fa766ee47b8c07412b3b755206ada0715fb07813b64ed069e7205044c061256
 
 if [ "$XBPS_TARGET_ENDIAN" = "be" ]; then
 	# possibly a qt6-shadertools bug, actually

From 23b425ec38c5d0b888b708801e6524d6725c7930 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 28 Jul 2022 16:36:49 +0200
Subject: [PATCH 10/22] qt6-quicktimeline: update to 6.3.1.

---
 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 15aa7a8e5819..dc7c3b13cba6 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.3.0
+version=6.3.1
 revision=1
 wrksrc="qtquicktimeline-everywhere-src-${version/rc/-rc}"
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 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=9ff0a931159efc6be5bd9f8a1e4a16a70e2dab37cf22ad85c6d330ccfdf31c1a
+checksum=58a13cf0ce8e7755639f20684078733af24f5a317f6ddb40d6079c8c5a28ebbe
 
 if [ "$XBPS_CHECK_PKGS" ]; then
 	configure_args+=" -DQT_BUILD_TESTS=ON"

From b3f8694e75403145d6addce27b4b4a9b771aa02d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 28 Jul 2022 16:36:51 +0200
Subject: [PATCH 11/22] qt6-scxml: update to 6.3.1.

---
 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 112baca0ab83..54f68b1fd61f 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.3.0
+version=6.3.1
 revision=1
 wrksrc="qtscxml-everywhere-src-${version}"
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 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=09b0dbd6ac367920fb1ba96a39dcd4c9d33eb0820dcc79538992825d588a70f0
+checksum=01bc154d6163d1f049f4e1e76658a044730ace7b0a5be35c9a46fcd1396f8619
 
 if [ "$XBPS_CHECK_PKGS" ]; then
 	configure_args+=" -DQT_BUILD_TESTS=ON"

From 18545340b29feef3c0c17f7475eb192f104e48a1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 28 Jul 2022 16:36:52 +0200
Subject: [PATCH 12/22] qt6-serialport: update to 6.3.1.

---
 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 0804671ca57b..2e915788300a 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.3.0
+version=6.3.1
 revision=1
 wrksrc="qtserialport-everywhere-src-${version}"
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 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=eebd6934d48cc044b8c87795a4fd91bb81f7195d4b5a2ddb12802f343d5db64f
+checksum=4eb6d80e65799dd2e0318df4dfba14173c1929e861718cda9bedca24253b616e
 
 qt6-serialport-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel>=${version}_1"

From f028877af7c772da6063eb242133e3b1505a8e56 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 28 Jul 2022 16:36:54 +0200
Subject: [PATCH 13/22] qt6-shadertools: update to 6.3.1.

---
 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 9c1ec210a96a..f59169184b12 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.3.0
+version=6.3.1
 revision=1
 wrksrc="qtshadertools-everywhere-src-${version}"
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 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=5498959b9d37c254bd126ab1320cf86aeb8a31b3ea7e51db666a8f9698afbd6c
+checksum=59b77176961528cc7b0c9325134655e273aa87b4cb386c0f4683d8f2852e435a
 
 qt6-shadertools-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel>=${version}_1"

From 6207ae8a3c94e9176def04ae16e2bf79ddc3ebf2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 28 Jul 2022 16:36:55 +0200
Subject: [PATCH 14/22] qt6-svg: update to 6.3.1.

---
 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 aa8e6b745109..637ce75e49ea 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.3.0
+version=6.3.1
 revision=1
 wrksrc="qtsvg-everywhere-src-${version}"
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 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=3164504d7e3f640439308235739b112605ab5fc9cc517ca0b28f9fb93a8db0e3
+checksum=7b19f418e6f7b8e23344082dd04440aacf5da23c5a73980ba22ae4eba4f87df7
 
 if [ "$XBPS_CHECK_PKGS" ]; then
 	configure_args+=" -DQT_BUILD_TESTS=ON"

From 1e5fc62926edfacadd7f93018e78765fd19a434e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 28 Jul 2022 16:36:58 +0200
Subject: [PATCH 15/22] qt6-tools: update to 6.3.1.

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

diff --git a/srcpkgs/qt6-tools/template b/srcpkgs/qt6-tools/template
index f875dff5c046..ff49d3cd63f2 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.3.0
+version=6.3.1
 revision=1
 wrksrc="qttools-everywhere-src-${version}"
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 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/qttools-everywhere-src-${version}.tar.xz"
-checksum=fce94688ea925782a2879347584991f854630daadba6c52aed6d93e33cd0b19c
+checksum=c412750f2aa3beb93fce5f30517c607f55daaeb7d0407af206a8adf917e126c1
 
 if [ "$XBPS_CHECK_PKGS" ]; then
 	configure_args+=" -DQT_BUILD_TESTS=ON"

From 4a30e57aab487cd4579fd8e85535d3c40ebd5a43 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 28 Jul 2022 16:37:00 +0200
Subject: [PATCH 16/22] qt6-translations: update to 6.3.1.

---
 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 be0a74ca74e2..fa751b097466 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.3.0
+version=6.3.1
 revision=1
 wrksrc="qttranslations-everywhere-src-${version}"
 build_style=cmake
@@ -12,4 +12,4 @@ maintainer="John <me@johnnynator.dev>"
 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=e4dd4ef892a34a9514a19238f189a33ed85c76f31dcad6599ced93b1e33440b3
+checksum=d7bdd55e2908ded901dcc262157100af2a490bf04d31e32995f6d91d78dfdb97

From b87e2d34bab04092e6e3336cf28ca6b23b62dbf9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 28 Jul 2022 16:37:02 +0200
Subject: [PATCH 17/22] qt6-virtualkeyboard: update to 6.3.1.

---
 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 67ecef145ea1..21fbcf5dbfbc 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.3.0
+version=6.3.1
 revision=1
 wrksrc="qtvirtualkeyboard-everywhere-src-${version}"
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 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=89aaf15acf5432af8f5cf4ec45cb32d87a3348906215dd56e81cb294eb276573
+checksum=5fe089b204d859ab0dd0169f811f2e30cae7c5cb36f8ab95ca36883f1fc0c2b8
 
 if [ "$XBPS_CHECK_PKGS" ]; then
 	configure_args+=" -DQT_BUILD_TESTS=ON"

From 12d4b7090a3c9fd2cc1e8cb1b3df03add5b6ee12 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 28 Jul 2022 16:37:03 +0200
Subject: [PATCH 18/22] qt6-wayland: update to 6.3.1.

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

diff --git a/srcpkgs/qt6-wayland/template b/srcpkgs/qt6-wayland/template
index b71a273009b9..6040a2dc1335 100644
--- a/srcpkgs/qt6-wayland/template
+++ b/srcpkgs/qt6-wayland/template
@@ -1,6 +1,6 @@
 # Template file for 'qt6-wayland'
 pkgname=qt6-wayland
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qtwayland-everywhere-src-${version}"
 build_style=cmake
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 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=e7b567f6e43ffc5918d4aa825ce1eced66a00cb0a87133b2912ba5c1b2a02190
+checksum=6f14fea2d172a5b4170be3efcb0e58535f6605b61bcd823f6d5c9d165bb8c0f0
 
 if [ "$XBPS_CHECK_PKGS" ]; then
 	configure_args+=" -DQT_BUILD_TESTS=ON"

From f4b097eb6f31e5e066b1c5bb1f82d2e7c82a5d1b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 28 Jul 2022 16:38:03 +0200
Subject: [PATCH 19/22] qt6-websockets: update to 6.3.1.

---
 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 c2e674aacb31..ad02065de69f 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.3.0
+version=6.3.1
 revision=1
 wrksrc="qtwebsockets-everywhere-src-${version}"
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 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=e018a09fe960b7d9560d6bbc9d3ca022fed6566e6ba6fc6d869a97482d4e6361
+checksum=9f980d90c97fcbde1b50c773f6dc580cfdf8c36ce14a1be3aa2ccadfe605121a
 
 qt6-websockets-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel>=${version}_1"

From f43fef6f870c20cb4e28c86fcc21fea95eaf6ff0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 26 Jun 2021 12:25:04 +0200
Subject: [PATCH 20/22] New package: qt6-webchannel-6.2.1

---
 srcpkgs/qt6-webchannel-devel    |  1 +
 srcpkgs/qt6-webchannel/template | 31 +++++++++++++++++++++++++++++++
 srcpkgs/qt6-webchannel/update   |  1 +
 3 files changed, 33 insertions(+)
 create mode 120000 srcpkgs/qt6-webchannel-devel
 create mode 100644 srcpkgs/qt6-webchannel/template
 create mode 100644 srcpkgs/qt6-webchannel/update

diff --git a/srcpkgs/qt6-webchannel-devel b/srcpkgs/qt6-webchannel-devel
new file mode 120000
index 000000000000..03e8b23d785d
--- /dev/null
+++ b/srcpkgs/qt6-webchannel-devel
@@ -0,0 +1 @@
+qt6-webchannel
\ No newline at end of file
diff --git a/srcpkgs/qt6-webchannel/template b/srcpkgs/qt6-webchannel/template
new file mode 100644
index 000000000000..6c39ec2a1c3a
--- /dev/null
+++ b/srcpkgs/qt6-webchannel/template
@@ -0,0 +1,31 @@
+# Template file for 'qt6-webchannel'
+pkgname=qt6-webchannel
+version=6.3.1
+revision=1
+wrksrc="qtwebchannel-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DQT_HOST_PATH=/usr"
+hostmakedepends="perl qt6-base-devel qt6-declarative-devel"
+makedepends="qt6-base-devel qt6-declarative-devel qt6-websockets-devel"
+short_desc="Cross-platform application and UI framework - webchannel"
+maintainer="John <me@johnnynator.dev>"
+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=aaa20ac23f86992721b7ee487c379a3fd68caa8cdcea0a77a37e0d8b47ff2668
+
+qt6-webchannel-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel>=${version}_1
+	 qt6-websockets-devel>=${version}_1"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/qt6/mkspecs
+		vmove usr/lib/qt6/qml/QtWebChannel/plugins.qmltypes
+		vmove usr/lib/qt6/qml/QtWebChannel/qmldir
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}
diff --git a/srcpkgs/qt6-webchannel/update b/srcpkgs/qt6-webchannel/update
new file mode 100644
index 000000000000..844552465222
--- /dev/null
+++ b/srcpkgs/qt6-webchannel/update
@@ -0,0 +1 @@
+pkgname="${pkgname/6-/}-everywhere-src"

From 5f8e9f6b4f86187563f160fd751a22bc0fab2f4e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 26 Jun 2021 21:08:25 +0200
Subject: [PATCH 21/22] New package: qt6-multimedia-6.2.1

---
 srcpkgs/qt6-multimedia-devel    |  1 +
 srcpkgs/qt6-multimedia/template | 32 ++++++++++++++++++++++++++++++++
 srcpkgs/qt6-multimedia/update   |  1 +
 3 files changed, 34 insertions(+)
 create mode 120000 srcpkgs/qt6-multimedia-devel
 create mode 100644 srcpkgs/qt6-multimedia/template
 create mode 100644 srcpkgs/qt6-multimedia/update

diff --git a/srcpkgs/qt6-multimedia-devel b/srcpkgs/qt6-multimedia-devel
new file mode 120000
index 000000000000..9343446502d0
--- /dev/null
+++ b/srcpkgs/qt6-multimedia-devel
@@ -0,0 +1 @@
+qt6-multimedia
\ No newline at end of file
diff --git a/srcpkgs/qt6-multimedia/template b/srcpkgs/qt6-multimedia/template
new file mode 100644
index 000000000000..17b0a4544467
--- /dev/null
+++ b/srcpkgs/qt6-multimedia/template
@@ -0,0 +1,32 @@
+# Template file for 'qt6-multimedia'
+pkgname=qt6-multimedia
+version=6.3.1
+revision=1
+wrksrc="qtmultimedia-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DQT_HOST_PATH=/usr -DQT_FEATURE_gstreamer=ON"
+hostmakedepends="perl qt6-declarative-devel pkg-config
+ qt6-shadertools-devel"
+makedepends="qt6-declarative-devel
+ qt6-shadertools-devel libglib-devel gst-plugins-base1-devel"
+short_desc="Cross-platform application and UI framework - multimedia"
+maintainer="John <me@johnnynator.dev>"
+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=7e03242aadd634ff2d9fcf08948290f03da3d9a5012369d908da89f82b1d7336
+
+qt6-multimedia-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel>=${version}_1"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/qt6/mkspecs
+		vmove usr/lib/qt6/qml/QtMultimedia/plugins.qmltypes
+		vmove usr/lib/qt6/qml/QtMultimedia/qmldir
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}
diff --git a/srcpkgs/qt6-multimedia/update b/srcpkgs/qt6-multimedia/update
new file mode 100644
index 000000000000..844552465222
--- /dev/null
+++ b/srcpkgs/qt6-multimedia/update
@@ -0,0 +1 @@
+pkgname="${pkgname/6-/}-everywhere-src"

From d1d2332070ad082bc28d61fc1bea84735ab78c30 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 7 Aug 2022 11:34:40 +0700
Subject: [PATCH 22/22] qt6-webengine: update to 6.3.1.

---
 srcpkgs/qt6-webengine-devel                   |    1 +
 srcpkgs/qt6-webengine/files/resolv_compat.h   |   29 +
 .../patches/0001-None-no-debug.patch          |   11 +
 .../patches/0002-enable-ppc64.patch           |   20 +
 .../patches/0003-cross-hack.patch             |   10 +
 .../0004-ppc-disable-jxl-decoder.patch        |   13 +
 .../patches/0050-no-glibc-cmake-check.patch   |   14 +
 .../0100-chromium-sandbox-membarrier.patch    |   58 +
 .../qt6-webengine/patches/0101-size_t.patch   |   16 +
 .../0102-chromium-90-ruy-include.patch        |   19 +
 ...-v8-monotonic-pthread-cont_timedwait.patch |   22 +
 .../0104-chromium-revert-9d080c0.patch        |  162 +
 ...-chromium-revert-drop-of-system-java.patch |   15 +
 .../patches/0106-chromium-system-nodejs.patch |   20 +
 .../0107-chromium-cursed^Uscoped_file.patch   |   18 +
 .../0108-chromium-fix-narrowing-cast.patch    |   53 +
 .../0109-chromium-remove-strip_binary.patch   |   32 +
 ...ium-revert-use-ffile-compilation-dir.patch |   57 +
 ...11-chromium-no-Wno-stringop-overread.patch |   10 +
 .../0150-chromium-glibc-libc_malloc.patch     |   24 +
 ...-include-sys-reg.h-to-get-__WORDSIZE.patch |   21 +
 .../0201-chromium-musl-dispatch-to-musl.patch |  103 +
 .../0202-chromium-musl-no-mallinfo.patch      |   62 +
 .../0203-chromium-musl-siginfo_t.patch        |   18 +
 .../0204-chromium-musl-stackstart.patch       |   20 +
 .../patches/0205-chromium-musl-sandbox.patch  |   92 +
 ...0206-chromium-musl-default-stacksize.patch |   15 +
 ...-chromium-musl-cross-no-asm_ptrace_h.patch |   30 +
 .../patches/0208-chromium-musl-execinfo.patch |  125 +
 .../0209-chromium-musl-thread-stacksize.patch |   22 +
 .../0210-chromium-musl-msgvec-push_back.patch |   14 +
 ...ium-musl-canonicalize-file-name-musl.patch |   11 +
 .../0212-chromium-musl-no-getcontext.patch    |   29 +
 .../patches/0213-chromium-musl-crashpad.patch |   22 +
 .../patches/0214-chromium-musl-fixes.patch    |  108 +
 .../patches/0215-chromium-musl-cdefs.patch    |   29 +
 .../patches/0216-chromium-musl-stat.patch     |   12 +
 .../patches/0217-chromium-musl-resolver.patch |   77 +
 .../patches/0600-chromium-sndio.patch         |  876 ++++
 .../patches/0700-armv7l-neon.patch            |   10 +
 .../0750-chromium-musl-arm-user_vfp.patch     |   20 +
 .../0751-chromium-musl-arm-elf_auxv_t.patch   |   18 +
 ...0801-chromium-i686-vaapi-fpermissive.patch |   24 +
 .../patches/0900-xxx-ppc64le-libvpx.patch     |   65 +
 .../0901-xxx-ppc64le-sandbox-linux-stat.patch |   31 +
 .../patches/0902-xxx-ppc64le-support.patch    | 3559 +++++++++++++++++
 .../0903-xxx-ppc64le-swiftshader.patch        |   18 +
 srcpkgs/qt6-webengine/template                |  151 +
 srcpkgs/qt6-webengine/update                  |    1 +
 49 files changed, 6187 insertions(+)
 create mode 120000 srcpkgs/qt6-webengine-devel
 create mode 100644 srcpkgs/qt6-webengine/files/resolv_compat.h
 create mode 100644 srcpkgs/qt6-webengine/patches/0001-None-no-debug.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0002-enable-ppc64.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0003-cross-hack.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0004-ppc-disable-jxl-decoder.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0050-no-glibc-cmake-check.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0100-chromium-sandbox-membarrier.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0101-size_t.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0102-chromium-90-ruy-include.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0103-chromium-v8-monotonic-pthread-cont_timedwait.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0104-chromium-revert-9d080c0.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0105-chromium-revert-drop-of-system-java.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0106-chromium-system-nodejs.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0107-chromium-cursed^Uscoped_file.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0108-chromium-fix-narrowing-cast.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0109-chromium-remove-strip_binary.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0110-chromium-revert-use-ffile-compilation-dir.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0111-chromium-no-Wno-stringop-overread.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0150-chromium-glibc-libc_malloc.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0200-chromium-musl-include-sys-reg.h-to-get-__WORDSIZE.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0201-chromium-musl-dispatch-to-musl.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0202-chromium-musl-no-mallinfo.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0203-chromium-musl-siginfo_t.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0204-chromium-musl-stackstart.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0205-chromium-musl-sandbox.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0206-chromium-musl-default-stacksize.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0207-chromium-musl-cross-no-asm_ptrace_h.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0208-chromium-musl-execinfo.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0209-chromium-musl-thread-stacksize.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0210-chromium-musl-msgvec-push_back.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0211-chromium-musl-canonicalize-file-name-musl.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0212-chromium-musl-no-getcontext.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0213-chromium-musl-crashpad.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0214-chromium-musl-fixes.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0215-chromium-musl-cdefs.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0216-chromium-musl-stat.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0217-chromium-musl-resolver.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0600-chromium-sndio.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0700-armv7l-neon.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0750-chromium-musl-arm-user_vfp.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0751-chromium-musl-arm-elf_auxv_t.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0801-chromium-i686-vaapi-fpermissive.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0900-xxx-ppc64le-libvpx.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0901-xxx-ppc64le-sandbox-linux-stat.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0902-xxx-ppc64le-support.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0903-xxx-ppc64le-swiftshader.patch
 create mode 100644 srcpkgs/qt6-webengine/template
 create mode 100644 srcpkgs/qt6-webengine/update

diff --git a/srcpkgs/qt6-webengine-devel b/srcpkgs/qt6-webengine-devel
new file mode 120000
index 000000000000..8e4d1b99c587
--- /dev/null
+++ b/srcpkgs/qt6-webengine-devel
@@ -0,0 +1 @@
+qt6-webengine
\ No newline at end of file
diff --git a/srcpkgs/qt6-webengine/files/resolv_compat.h b/srcpkgs/qt6-webengine/files/resolv_compat.h
new file mode 100644
index 000000000000..4f0e852a19d0
--- /dev/null
+++ b/srcpkgs/qt6-webengine/files/resolv_compat.h
@@ -0,0 +1,29 @@
+#if !defined(__GLIBC__)
+/***************************************************************************
+ * resolv_compat.h
+ *
+ * Mimick GLIBC's res_ninit() and res_nclose() for musl libc
+ * Note: res_init() is actually deprecated according to
+ * http://docs.oracle.com/cd/E36784_01/html/E36875/res-nclose-3resolv.html
+ **************************************************************************/
+#include <string.h>
+
+static inline int res_ninit(res_state statp)
+{
+	int rc = res_init();
+	if (statp != &_res) {
+		memcpy(statp, &_res, sizeof(*statp));
+	}
+	return rc;
+}
+
+static inline int res_nclose(res_state statp)
+{
+	if (!statp)
+		return -1;
+	if (statp != &_res) {
+		memset(statp, 0, sizeof(*statp));
+	}
+	return 0;
+}
+#endif
diff --git a/srcpkgs/qt6-webengine/patches/0001-None-no-debug.patch b/srcpkgs/qt6-webengine/patches/0001-None-no-debug.patch
new file mode 100644
index 000000000000..1ba33f8e6fd9
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0001-None-no-debug.patch
@@ -0,0 +1,11 @@
+--- a/cmake/Functions.cmake
++++ b/cmake/Functions.cmake
+@@ -813,6 +813,8 @@ macro(append_build_type_setup)
+         endif()
+     elseif(${config} STREQUAL "MinSizeRel")
+         list(APPEND gnArgArg is_debug=false symbol_level=0 optimize_for_size=true)
++    elseif(${config} STREQUAL "None")
++        list(APPEND gnArgArg is_debug=false symbol_level=0)
+     endif()
+     if(FEATURE_developer_build OR (${config} STREQUAL "Debug") OR QT_FEATURE_webengine_sanitizer)
+         list(APPEND gnArgArg
diff --git a/srcpkgs/qt6-webengine/patches/0002-enable-ppc64.patch b/srcpkgs/qt6-webengine/patches/0002-enable-ppc64.patch
new file mode 100644
index 000000000000..d72ef1ad1a10
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0002-enable-ppc64.patch
@@ -0,0 +1,20 @@
+--- a/cmake/Functions.cmake
++++ b/cmake/Functions.cmake
+@@ -622,6 +622,8 @@ function(get_gn_arch result arch)
+         set(${result} "mipsel" PARENT_SCOPE)
+     elseif(arch STREQUAL "mipsel64")
+         set(${result} "mips64el" PARENT_SCOPE)
++    elseif(arch STREQUAL "power64")
++        set(${result} "power64" PARENT_SCOPE)
+     else()
+         message(DEBUG "Unsupported architecture: ${arch}")
+     endif()
+@@ -641,6 +643,8 @@ function(get_v8_arch result targetArch h
+             set(${result} "mipsel" PARENT_SCOPE)
+         elseif(hostArch STREQUAL "mipsel64")
+             set(${result} "mipsel" PARENT_SCOPE)
++        elseif(hostArch STREQUAL "power64")
++            set(${result} "power64" PARENT_SCOPE)
+         else()
+             message(DEBUG "Unsupported architecture: ${hostArch}")
+         endif()
diff --git a/srcpkgs/qt6-webengine/patches/0003-cross-hack.patch b/srcpkgs/qt6-webengine/patches/0003-cross-hack.patch
new file mode 100644
index 000000000000..ea9f90094a63
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0003-cross-hack.patch
@@ -0,0 +1,10 @@
+--- a/src/core/api/CMakeLists.txt
++++ b/src/core/api/CMakeLists.txt
+@@ -50,6 +50,7 @@ qt_internal_add_module(WebEngineCore
+         Qt::Gui
+         Qt::Network
+         Qt::Quick
++        X11
+ )
+ 
+ set_target_properties(WebEngineCore PROPERTIES QTWEBENGINEPROCESS_NAME ${qtWebEngineProcessName})
diff --git a/srcpkgs/qt6-webengine/patches/0004-ppc-disable-jxl-decoder.patch b/srcpkgs/qt6-webengine/patches/0004-ppc-disable-jxl-decoder.patch
new file mode 100644
index 000000000000..73c1151968f4
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0004-ppc-disable-jxl-decoder.patch
@@ -0,0 +1,13 @@
+--- a/src/core/CMakeLists.txt
++++ b/src/core/CMakeLists.txt
+@@ -414,6 +414,10 @@ foreach(arch ${archs})
+                 CONDITION QT_FEATURE_webengine_ozone_x11 AND XSCRNSAVER_FOUND
+             )
+ 
++            if (cpu STREQUAL "ppc64")
++                list(APPEND gnArgArg enable_jxl_decoder=false)
++            endif()
++
+             if(QT_FEATURE_webengine_kerberos)
+                 list(APPEND gnArgArg
+                      external_gssapi_include_dir="${GSSAPI_INCLUDE_DIRS}/gssapi"
diff --git a/srcpkgs/qt6-webengine/patches/0050-no-glibc-cmake-check.patch b/srcpkgs/qt6-webengine/patches/0050-no-glibc-cmake-check.patch
new file mode 100644
index 000000000000..f756bf0286bb
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0050-no-glibc-cmake-check.patch
@@ -0,0 +1,14 @@
+--- a/configure.cmake
++++ b/configure.cmake
+@@ -499,11 +499,6 @@ add_check_for_support(
+ )
+ add_check_for_support(
+    MODULES QtWebEngine QtPdf
+-   CONDITION NOT LINUX OR TEST_glibc
+-   MESSAGE "A suitable version >= 2.17 of glibc is required."
+-)
+-add_check_for_support(
+-   MODULES QtWebEngine QtPdf
+    CONDITION NOT LINUX OR TEST_khr
+    MESSAGE "Build requires Khronos development headers for build - see mesa/libegl1-mesa-dev"
+ )
diff --git a/srcpkgs/qt6-webengine/patches/0100-chromium-sandbox-membarrier.patch b/srcpkgs/qt6-webengine/patches/0100-chromium-sandbox-membarrier.patch
new file mode 100644
index 000000000000..2dd7b4aa948f
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0100-chromium-sandbox-membarrier.patch
@@ -0,0 +1,58 @@
+--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
++++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
+@@ -413,6 +413,7 @@ bool SyscallSets::IsAllowedProcessStartO
+   switch (sysno) {
+     case __NR_exit:
+     case __NR_exit_group:
++    case __NR_membarrier:
+     case __NR_wait4:
+     case __NR_waitid:
+ #if defined(__i386__)
+--- a/src/3rdparty/chromium/sandbox/linux/system_headers/arm64_linux_syscalls.h
++++ b/src/3rdparty/chromium/sandbox/linux/system_headers/arm64_linux_syscalls.h
+@@ -1215,4 +1215,8 @@
+ #define __NR_landlock_restrict_self 446
+ #endif
+ 
++#if !defined(__NR_membarrier)
++#define __NR_membarrier 283
++#endif
++
+ #endif  // SANDBOX_LINUX_SYSTEM_HEADERS_ARM64_LINUX_SYSCALLS_H_
+--- a/src/3rdparty/chromium/sandbox/linux/system_headers/arm_linux_syscalls.h
++++ b/src/3rdparty/chromium/sandbox/linux/system_headers/arm_linux_syscalls.h
+@@ -1617,6 +1617,10 @@
+ #define __NR_landlock_restrict_self (__NR_SYSCALL_BASE + 446)
+ #endif
+ 
++#if !defined(__NR_membarrier)
++#define __NR_membarrier (__NR_SYSCALL_BASE+389)
++#endif
++
+ // ARM private syscalls.
+ #if !defined(__ARM_NR_BASE)
+ #define __ARM_NR_BASE (__NR_SYSCALL_BASE + 0xF0000)
+--- a/src/3rdparty/chromium/sandbox/linux/system_headers/x86_32_linux_syscalls.h
++++ b/src/3rdparty/chromium/sandbox/linux/system_headers/x86_32_linux_syscalls.h
+@@ -1750,5 +1750,9 @@
+ #define __NR_landlock_restrict_self 446
+ #endif
+ 
++#if !defined(__NR_membarrier)
++#define __NR_membarrier 375
++#endif
++
+ #endif  // SANDBOX_LINUX_SYSTEM_HEADERS_X86_32_LINUX_SYSCALLS_H_
+ 
+--- a/src/3rdparty/chromium/sandbox/linux/system_headers/x86_64_linux_syscalls.h
++++ b/src/3rdparty/chromium/sandbox/linux/system_headers/x86_64_linux_syscalls.h
+@@ -1438,5 +1438,9 @@
+ #define __NR_landlock_restrict_self 446
+ #endif
+ 
++#if !defined(__NR_membarrier)
++#define __NR_membarrier 324
++#endif
++
+ #endif  // SANDBOX_LINUX_SYSTEM_HEADERS_X86_64_LINUX_SYSCALLS_H_
+ 
diff --git a/srcpkgs/qt6-webengine/patches/0101-size_t.patch b/srcpkgs/qt6-webengine/patches/0101-size_t.patch
new file mode 100644
index 000000000000..fccc085da311
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0101-size_t.patch
@@ -0,0 +1,16 @@
+--- a/src/3rdparty/chromium/third_party/angle/include/platform/PlatformMethods.h
++++ b/src/3rdparty/chromium/third_party/angle/include/platform/PlatformMethods.h
+@@ -239,11 +239,11 @@ inline void DefaultOverrideFeaturesMtl(P
+ using ProgramKeyType   = std::array<uint8_t, 20>;
+ using CacheProgramFunc = void (*)(PlatformMethods *platform,
+                                   const ProgramKeyType &key,
+-                                  size_t programSize,
++                                  std::size_t programSize,
+                                   const uint8_t *programBytes);
+ inline void DefaultCacheProgram(PlatformMethods *platform,
+                                 const ProgramKeyType &key,
+-                                size_t programSize,
++                                std::size_t programSize,
+                                 const uint8_t *programBytes)
+ {}
+ 
diff --git a/srcpkgs/qt6-webengine/patches/0102-chromium-90-ruy-include.patch b/srcpkgs/qt6-webengine/patches/0102-chromium-90-ruy-include.patch
new file mode 100644
index 000000000000..bbba579076d6
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0102-chromium-90-ruy-include.patch
@@ -0,0 +1,19 @@
+From 714092f336bb14d2fcc27396ec323b3d843bb962 Mon Sep 17 00:00:00 2001
+From: Stephan Hartmann <stha09@googlemail.com>
+Date: Thu, 4 Mar 2021 15:05:46 +0000
+Subject: [PATCH] IWYU: include limits for std::numeric_limits
+
+---
+ third_party/ruy/src/ruy/block_map.cc | 1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/src/3rdparty/chromium/third_party/ruy/src/ruy/block_map.cc
++++ b/src/3rdparty/chromium/third_party/ruy/src/ruy/block_map.cc
+@@ -17,6 +17,7 @@ limitations under the License.
+ 
+ #include <algorithm>
+ #include <cstdint>
++#include <limits>
+ 
+ #ifdef RUY_MAKEBLOCKMAP_DEBUG
+ #include <cstdio>
diff --git a/srcpkgs/qt6-webengine/patches/0103-chromium-v8-monotonic-pthread-cont_timedwait.patch b/srcpkgs/qt6-webengine/patches/0103-chromium-v8-monotonic-pthread-cont_timedwait.patch
new file mode 100644
index 000000000000..1dc8bc4d3d17
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0103-chromium-v8-monotonic-pthread-cont_timedwait.patch
@@ -0,0 +1,22 @@
+Use monotonic clock for pthread_cond_timedwait with musl too.
+
+--- a/src/3rdparty/chromium/v8/src/base/platform/condition-variable.cc
++++ b/src/3rdparty/chromium/v8/src/base/platform/condition-variable.cc
+@@ -20,7 +20,7 @@ namespace base {
+ 
+ ConditionVariable::ConditionVariable() {
+ #if (V8_OS_FREEBSD || V8_OS_NETBSD || V8_OS_OPENBSD || \
+-     (V8_OS_LINUX && V8_LIBC_GLIBC))
++     V8_OS_LINUX)
+   // On Free/Net/OpenBSD and Linux with glibc we can change the time
+   // source for pthread_cond_timedwait() to use the monotonic clock.
+   pthread_condattr_t attr;
+@@ -96,7 +96,7 @@ bool ConditionVariable::WaitFor(Mutex* m
+       &native_handle_, &mutex->native_handle(), &ts);
+ #else
+ #if (V8_OS_FREEBSD || V8_OS_NETBSD || V8_OS_OPENBSD || \
+-     (V8_OS_LINUX && V8_LIBC_GLIBC))
++     V8_OS_LINUX)
+   // On Free/Net/OpenBSD and Linux with glibc we can change the time
+   // source for pthread_cond_timedwait() to use the monotonic clock.
+   result = clock_gettime(CLOCK_MONOTONIC, &ts);
diff --git a/srcpkgs/qt6-webengine/patches/0104-chromium-revert-9d080c0.patch b/srcpkgs/qt6-webengine/patches/0104-chromium-revert-9d080c0.patch
new file mode 100644
index 000000000000..42b1ee9ec063
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0104-chromium-revert-9d080c0.patch
@@ -0,0 +1,162 @@
+ Original change's description:
+ > Replace 'blacklist' with 'ignorelist' in ./tools/msan/.
+ >
+ > Bug: 1097272, 1097268
+ > Change-Id: Id5c8227a5bfb1ffaec82d3168b609085b10c8297
+ > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2867730
+ > Commit-Queue: Dylan Cutler <dylancutler@google.com>
+ > Reviewed-by: Nico Weber <thakis@chromium.org>
+ > Reviewed-by: Jonathan Metzman <metzman@chromium.org>
+ > Cr-Commit-Position: refs/heads/master@{#883035}
+--- a/src/3rdparty/chromium/build/config/sanitizers/BUILD.gn
++++ b/src/3rdparty/chromium/build/config/sanitizers/BUILD.gn
+@@ -272,11 +272,11 @@ config("asan_flags") {
+   if (is_asan) {
+     cflags += [ "-fsanitize=address" ]
+     if (is_win) {
+-      if (!defined(asan_win_blocklist_path)) {
+-        asan_win_blocklist_path =
++      if (!defined(asan_win_blacklist_path)) {
++        asan_win_blacklist_path =
+             rebase_path("//tools/memory/asan/blocklist_win.txt", root_build_dir)
+       }
+-      cflags += [ "-fsanitize-ignorelist=$asan_win_blocklist_path" ]
++      cflags += [ "-fsanitize-blacklist=$asan_win_blacklist_path" ]
+     }
+   }
+ }
+@@ -306,13 +306,13 @@ config("link_shared_library") {
+ config("cfi_flags") {
+   cflags = []
+   if (is_cfi && current_toolchain == default_toolchain) {
+-    if (!defined(cfi_ignorelist_path)) {
+-      cfi_ignorelist_path =
++    if (!defined(cfi_blacklist_path)) {
++      cfi_blacklist_path =
+           rebase_path("//tools/cfi/ignores.txt", root_build_dir)
+     }
+     cflags += [
+       "-fsanitize=cfi-vcall",
+-      "-fsanitize-ignorelist=$cfi_ignorelist_path",
++      "-fsanitize-blacklist=$cfi_blacklist_path",
+     ]
+ 
+     if (use_cfi_cast) {
+@@ -409,14 +409,14 @@ config("msan_flags") {
+   if (is_msan) {
+     assert(is_linux || is_chromeos,
+            "msan only supported on linux x86_64/ChromeOS")
+-    if (!defined(msan_ignorelist_path)) {
+-      msan_ignorelist_path =
+-          rebase_path("//tools/msan/ignorelist.txt", root_build_dir)
++    if (!defined(msan_blacklist_path)) {
++      msan_blacklist_path =
++          rebase_path("//tools/msan/blacklist.txt", root_build_dir)
+     }
+     cflags = [
+       "-fsanitize=memory",
+       "-fsanitize-memory-track-origins=$msan_track_origins",
+-      "-fsanitize-ignorelist=$msan_ignorelist_path",
++      "-fsanitize-blacklist=$msan_blacklist_path",
+     ]
+   }
+ }
+@@ -424,13 +424,13 @@ config("msan_flags") {
+ config("tsan_flags") {
+   if (is_tsan) {
+     assert(is_linux || is_chromeos, "tsan only supported on linux x86_64")
+-    if (!defined(tsan_ignorelist_path)) {
+-      tsan_ignorelist_path =
++    if (!defined(tsan_blacklist_path)) {
++      tsan_blacklist_path =
+           rebase_path("//tools/memory/tsan_v2/ignores.txt", root_build_dir)
+     }
+     cflags = [
+       "-fsanitize=thread",
+-      "-fsanitize-ignorelist=$tsan_ignorelist_path",
++      "-fsanitize-blacklist=$tsan_blacklist_path",
+     ]
+   }
+ }
+@@ -438,8 +438,8 @@ config("tsan_flags") {
+ config("ubsan_flags") {
+   cflags = []
+   if (is_ubsan) {
+-    if (!defined(ubsan_ignorelist_path)) {
+-      ubsan_ignorelist_path =
++    if (!defined(ubsan_blacklist_path)) {
++      ubsan_blacklist_path =
+           rebase_path("//tools/ubsan/ignorelist.txt", root_build_dir)
+     }
+     cflags += [
+@@ -456,7 +456,7 @@ config("ubsan_flags") {
+       "-fsanitize=signed-integer-overflow",
+       "-fsanitize=unreachable",
+       "-fsanitize=vla-bound",
+-      "-fsanitize-ignorelist=$ubsan_ignorelist_path",
++      "-fsanitize-blacklist=$ubsan_blacklist_path",
+     ]
+     if (!is_clang) {
+       # These exposes too much illegal C++14 code to compile on anything stricter than clang:
+@@ -497,8 +497,8 @@ config("ubsan_no_recover") {
+ 
+ config("ubsan_security_flags") {
+   if (is_ubsan_security) {
+-    if (!defined(ubsan_security_ignorelist_path)) {
+-      ubsan_security_ignorelist_path =
++    if (!defined(ubsan_security_blacklist_path)) {
++      ubsan_security_blacklist_path =
+           rebase_path("//tools/ubsan/security_ignorelist.txt", root_build_dir)
+     }
+     cflags = [
+@@ -506,7 +506,7 @@ config("ubsan_security_flags") {
+       "-fsanitize=shift",
+       "-fsanitize=signed-integer-overflow",
+       "-fsanitize=vla-bound",
+-      "-fsanitize-ignorelist=$ubsan_security_ignorelist_path",
++      "-fsanitize-blacklist=$ubsan_security_blacklist_path",
+     ]
+   }
+ }
+@@ -519,13 +519,13 @@ config("ubsan_null_flags") {
+ 
+ config("ubsan_vptr_flags") {
+   if (is_ubsan_vptr) {
+-    if (!defined(ubsan_vptr_ignorelist_path)) {
+-      ubsan_vptr_ignorelist_path =
++    if (!defined(ubsan_vptr_blacklist_path)) {
++      ubsan_vptr_blacklist_path =
+           rebase_path("//tools/ubsan/vptr_ignorelist.txt", root_build_dir)
+     }
+     cflags = [
+       "-fsanitize=vptr",
+-      "-fsanitize-ignorelist=$ubsan_vptr_ignorelist_path",
++      "-fsanitize-blacklist=$ubsan_vptr_blacklist_path",
+     ]
+     if (!is_clang) {
+       # Clang specific flag:
+--- a/src/3rdparty/chromium/build_overrides/build.gni
++++ b/src/3rdparty/chromium/build_overrides/build.gni
+@@ -43,15 +43,15 @@ declare_args() {
+ # Allows different projects to specify their own suppression/ignore lists for
+ # sanitizer tools.
+ # asan_suppressions_file = "path/to/asan_suppressions.cc"
+-# asan_win_ignorelist_path = "path/to/asan/blocklist_win.txt"
++# asan_win_blacklist_path = "path/to/asan/blocklist_win.txt"
+ # lsan_suppressions_file = "path/to/lsan_suppressions.cc"
+ # tsan_suppressions_file = "path/to/tsan_suppressions.cc"
+-# tsan_ignorelist_path = "path/to/tsan/ignores.txt"
+-# msan_ignorelist_path = "path/to/msan/ignorelist.txt"
+-# ubsan_ignorelist_path = "path/to/ubsan/ignorelist.txt"
+-# ubsan_vptr_ignorelist_path = "path/to/ubsan/vptr_ignorelist.txt"
+-# ubsan_security_ignorelist_path = "path/to/ubsan/security_ignorelist.txt"
+-# cfi_ignorelist_path = "path/to/cfi/ignores.txt"
++# tsan_blacklist_path = "path/to/tsan/ignores.txt"
++# msan_blacklist_path = "path/to/msan/blacklist.txt"
++# ubsan_blacklist_path = "path/to/ubsan/blacklist.txt"
++# ubsan_vptr_blacklist_path = "path/to/ubsan/vptr_blacklist.txt"
++# ubsan_security_blacklist_path = "path/to/ubsan/security_blacklist.txt"
++# cfi_blacklist_path = "path/to/cfi/ignores.txt"
+ 
+ declare_args() {
+   # Android 32-bit non-component, non-clang builds cannot have symbol_level=2
diff --git a/srcpkgs/qt6-webengine/patches/0105-chromium-revert-drop-of-system-java.patch b/srcpkgs/qt6-webengine/patches/0105-chromium-revert-drop-of-system-java.patch
new file mode 100644
index 000000000000..44f3aa8fae5e
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0105-chromium-revert-drop-of-system-java.patch
@@ -0,0 +1,15 @@
+This was dropped for some reason in 6951c37cecd05979b232a39e5c10e6346a0f74ef
+--- a/src/3rdparty/chromium/third_party/closure_compiler/compiler.py
++++ b/src/3rdparty/chromium/third_party/closure_compiler/compiler.py
+@@ -13,8 +13,9 @@ import subprocess
+ 
+ 
+ _CURRENT_DIR = os.path.join(os.path.dirname(__file__))
+-_JAVA_PATH = os.path.join(_CURRENT_DIR, "..", "jdk", "current", "bin", "java")
+-assert os.path.isfile(_JAVA_PATH), "java only allowed in android builds"
++_JAVA_BIN = "java"
++_JDK_PATH = os.path.join(_CURRENT_DIR, "..", "jdk", "current", "bin", "java")
++_JAVA_PATH = _JDK_PATH if os.path.isfile(_JDK_PATH) else _JAVA_BIN
+ 
+ class Compiler(object):
+   """Runs the Closure compiler on given source files to typecheck them
diff --git a/srcpkgs/qt6-webengine/patches/0106-chromium-system-nodejs.patch b/srcpkgs/qt6-webengine/patches/0106-chromium-system-nodejs.patch
new file mode 100644
index 000000000000..1e067cc6eda0
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0106-chromium-system-nodejs.patch
@@ -0,0 +1,20 @@
+--- a/src/3rdparty/chromium/third_party/node/node.py
++++ b/src/3rdparty/chromium/third_party/node/node.py
+@@ -36,11 +36,12 @@ def GetBinaryPath():
+   if platform.system() == 'Darwin' and platform.machine() == 'arm64':
+       return os.path.join(os_path.join(os_path.dirname(__file__), 'mac',
+                           'node-darwin-arm64', 'bin', 'node'))
+-  return os_path.join(os_path.dirname(__file__), *{
+-    'Darwin': ('mac', 'node-darwin-x64', 'bin', 'node'),
+-    'Linux': ('linux', 'node-linux-x64', 'bin', 'node'),
+-    'Windows': ('win', 'node.exe'),
+-  }[platform.system()])
++  return "/usr/bin/node"
++  #return os_path.join(os_path.dirname(__file__), *{
++  #  'Darwin': ('mac', 'node-darwin-x64', 'bin', 'node'),
++  #  'Linux': ('linux', 'node-linux-x64', 'bin', 'node'),
++  #  'Windows': ('win', 'node.exe'),
++  #}[platform.system()])
+ 
+ 
+ def RunNode(cmd_parts, stdout=None):
diff --git a/srcpkgs/qt6-webengine/patches/0107-chromium-cursed^Uscoped_file.patch b/srcpkgs/qt6-webengine/patches/0107-chromium-cursed^Uscoped_file.patch
new file mode 100644
index 000000000000..a8f5d971883d
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0107-chromium-cursed^Uscoped_file.patch
@@ -0,0 +1,18 @@
+--- a/src/3rdparty/chromium/base/files/scoped_file_linux.cc
++++ b/src/3rdparty/chromium/base/files/scoped_file_linux.cc
+@@ -77,15 +77,3 @@ bool IsFDOwned(int fd) {
+ }
+ 
+ }  // namespace base
+-
+-extern "C" {
+-
+-int __close(int);
+-
+-__attribute__((visibility("default"), noinline)) int close(int fd) {
+-  if (base::IsFDOwned(fd) && g_is_ownership_enforced)
+-    CrashOnFdOwnershipViolation();
+-  return __close(fd);
+-}
+-
+-}  // extern "C"
diff --git a/srcpkgs/qt6-webengine/patches/0108-chromium-fix-narrowing-cast.patch b/srcpkgs/qt6-webengine/patches/0108-chromium-fix-narrowing-cast.patch
new file mode 100644
index 000000000000..ed32cd9b7415
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0108-chromium-fix-narrowing-cast.patch
@@ -0,0 +1,53 @@
+--- a/src/3rdparty/chromium/base/files/file_util_linux.cc
++++ b/src/3rdparty/chromium/base/files/file_util_linux.cc
+@@ -23,14 +23,14 @@ bool GetFileSystemType(const FilePath& p
+ 
+   // Not all possible |statfs_buf.f_type| values are in linux/magic.h.
+   // Missing values are copied from the statfs man page.
+-  switch (statfs_buf.f_type) {
++  switch (static_cast<uintmax_t>(statfs_buf.f_type)) {
+     case 0:
+       *type = FILE_SYSTEM_0;
+       break;
+     case EXT2_SUPER_MAGIC:  // Also ext3 and ext4
+     case MSDOS_SUPER_MAGIC:
+     case REISERFS_SUPER_MAGIC:
+-    case static_cast<int>(BTRFS_SUPER_MAGIC):
++    case BTRFS_SUPER_MAGIC:
+     case 0x5346544E:  // NTFS
+     case 0x58465342:  // XFS
+     case 0x3153464A:  // JFS
+@@ -40,14 +40,14 @@ bool GetFileSystemType(const FilePath& p
+       *type = FILE_SYSTEM_NFS;
+       break;
+     case SMB_SUPER_MAGIC:
+-    case static_cast<int>(0xFF534D42):  // CIFS
++    case 0xFF534D42:  // CIFS
+       *type = FILE_SYSTEM_SMB;
+       break;
+     case CODA_SUPER_MAGIC:
+       *type = FILE_SYSTEM_CODA;
+       break;
+-    case static_cast<int>(HUGETLBFS_MAGIC):
+-    case static_cast<int>(RAMFS_MAGIC):
++    case HUGETLBFS_MAGIC:
++    case RAMFS_MAGIC:
+     case TMPFS_MAGIC:
+       *type = FILE_SYSTEM_MEMORY;
+       break;
+--- a/src/3rdparty/chromium/base/system/sys_info_posix.cc
++++ b/src/3rdparty/chromium/base/system/sys_info_posix.cc
+@@ -100,10 +100,10 @@ bool IsStatsZeroIfUnlimited(const base::
+   if (HANDLE_EINTR(statfs(path.value().c_str(), &stats)) != 0)
+     return false;
+ 
+-  switch (stats.f_type) {
++  switch (static_cast<uintmax_t>(stats.f_type)) {
+     case TMPFS_MAGIC:
+-    case static_cast<int>(HUGETLBFS_MAGIC):
+-    case static_cast<int>(RAMFS_MAGIC):
++    case HUGETLBFS_MAGIC:
++    case RAMFS_MAGIC:
+       return true;
+   }
+   return false;
diff --git a/srcpkgs/qt6-webengine/patches/0109-chromium-remove-strip_binary.patch b/srcpkgs/qt6-webengine/patches/0109-chromium-remove-strip_binary.patch
new file mode 100644
index 000000000000..5ebd16e659af
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0109-chromium-remove-strip_binary.patch
@@ -0,0 +1,32 @@
+--- a/src/3rdparty/chromium/chrome/test/chromedriver/BUILD.gn
++++ b/src/3rdparty/chromium/chrome/test/chromedriver/BUILD.gn
+@@ -308,11 +308,7 @@ source_set("lib") {
+   }
+ }
+ 
+-if (is_linux) {
+-  chromedriver_output = "chromedriver.unstripped"
+-} else {
+-  chromedriver_output = "chromedriver"
+-}
++chromedriver_output = "chromedriver"
+ 
+ executable("$chromedriver_output") {
+   testonly = true
+@@ -336,16 +332,6 @@ executable("$chromedriver_output") {
+   }
+ }
+ 
+-if (is_linux) {
+-  strip_binary("chromedriver") {
+-    testonly = true
+-    binary_input = "$root_out_dir/$chromedriver_output"
+-    symbol_output = "$root_out_dir/chromedriver.debug"
+-    stripped_binary_output = "$root_out_dir/chromedriver"
+-    deps = [ ":$chromedriver_output" ]
+-  }
+-}
+-
+ python_library("chromedriver_py_tests") {
+   testonly = true
+   deps = [
diff --git a/srcpkgs/qt6-webengine/patches/0110-chromium-revert-use-ffile-compilation-dir.patch b/srcpkgs/qt6-webengine/patches/0110-chromium-revert-use-ffile-compilation-dir.patch
new file mode 100644
index 000000000000..a00f7ea80f7a
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0110-chromium-revert-use-ffile-compilation-dir.patch
@@ -0,0 +1,57 @@
+From 34a955823630096f5b01c2b01d51c1ea59d22763 Mon Sep 17 00:00:00 2001
+From: Zequan Wu <zequanwu@google.com>
+Date: Tue, 20 Jul 2021 14:13:50 +0000
+Subject: [PATCH] Use -ffile-compilation-dir= instead of
+ -fdebug-compilation-dir=
+
+Bug: 1010267
+Change-Id: If2b4ead8535a76490eb466a38e3d8fed6ea91079
+Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2770738
+Auto-Submit: Zequan Wu <zequanwu@google.com>
+Commit-Queue: Nico Weber <thakis@chromium.org>
+Reviewed-by: Nico Weber <thakis@chromium.org>
+Cr-Commit-Position: refs/heads/master@{#903456}
+--- a/src/3rdparty/chromium/build/config/compiler/BUILD.gn
++++ b/src/3rdparty/chromium/build/config/compiler/BUILD.gn
+@@ -1269,19 +1269,12 @@ config("compiler_deterministic") {
+     # different build directory like "out/feature_a" and "out/feature_b" if
+     # we build same files with same compile flag.
+     # Other paths are already given in relative, no need to normalize them.
+-    if (is_nacl) {
+-      # TODO(https://crbug.com/1231236): Use -ffile-compilation-dir= here.
+-      cflags += [
+-        "-Xclang",
+-        "-fdebug-compilation-dir",
+-        "-Xclang",
+-        ".",
+-      ]
+-    } else {
+-      # -ffile-compilation-dir is an alias for both -fdebug-compilation-dir=
+-      # and -fcoverage-compilation-dir=.
+-      cflags += [ "-ffile-compilation-dir=." ]
+-    }
++    cflags += [
++      "-Xclang",
++      "-fdebug-compilation-dir",
++      "-Xclang",
++      ".",
++    ]
+     if (!is_win) {
+       # We don't use clang -cc1as on Windows (yet? https://crbug.com/762167)
+       asmflags = [ "-Wa,-fdebug-compilation-dir,." ]
+--- a/src/3rdparty/chromium/build/config/compiler/compiler.gni
++++ b/src/3rdparty/chromium/build/config/compiler/compiler.gni
+@@ -228,8 +228,11 @@ declare_args() {
+ # deterministic builds to reduce compile times, so this is less relevant for
+ # official builders.
+ strip_absolute_paths_from_debug_symbols_default =
+-    is_android || is_fuchsia || is_nacl || (is_win && use_lld) || is_linux ||
+-    is_chromeos || (is_apple && !enable_dsyms)
++    # TODO(crbug.com/1010267): remove '!use_clang_coverage', coverage build has
++    # dependency to absolute path of source files.
++    !use_clang_coverage &&
++    (is_android || is_fuchsia || is_nacl || (is_win && use_lld) || is_linux ||
++     is_chromeos || (is_apple && !enable_dsyms))
+ 
+ declare_args() {
+   strip_absolute_paths_from_debug_symbols = strip_absolute_paths_from_debug_symbols_default
diff --git a/srcpkgs/qt6-webengine/patches/0111-chromium-no-Wno-stringop-overread.patch b/srcpkgs/qt6-webengine/patches/0111-chromium-no-Wno-stringop-overread.patch
new file mode 100644
index 000000000000..03eac3f8e067
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0111-chromium-no-Wno-stringop-overread.patch
@@ -0,0 +1,10 @@
+--- a/src/3rdparty/chromium/build/config/compiler/BUILD.gn
++++ b/src/3rdparty/chromium/build/config/compiler/BUILD.gn
+@@ -394,7 +394,6 @@ config("compiler") {
+         "-Wno-parentheses",
+         "-Wno-sign-compare", # fido
+         "-Wno-stringop-overflow", # skia, libaom, protobuf, icu
+-        "-Wno-stringop-overread", # libaom
+         "-Wno-psabi", # skia
+         "-Wno-multichar", # crashpad
+         "-Wno-format-zero-length", # user_agent.cc
diff --git a/srcpkgs/qt6-webengine/patches/0150-chromium-glibc-libc_malloc.patch b/srcpkgs/qt6-webengine/patches/0150-chromium-glibc-libc_malloc.patch
new file mode 100644
index 000000000000..7e1b66e5c73d
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0150-chromium-glibc-libc_malloc.patch
@@ -0,0 +1,24 @@
+--- a/src/3rdparty/chromium/base/process/memory_linux.cc
++++ b/src/3rdparty/chromium/base/process/memory_linux.cc
+@@ -23,6 +23,12 @@
+ #include "third_party/tcmalloc/chromium/src/gperftools/tcmalloc.h"
+ #endif
+ 
++#if defined(LIBC_GLIBC)
++extern "C" {
++extern void *__libc_malloc(size_t size);
++}
++#endif
++
+ namespace base {
+ 
+ namespace {
+@@ -120,7 +126,7 @@ bool UncheckedMalloc(size_t size, void**
+     (!defined(LIBC_GLIBC) && !BUILDFLAG(USE_TCMALLOC))
+   *result = malloc(size);
+ #elif defined(LIBC_GLIBC) && !BUILDFLAG(USE_TCMALLOC)
+-  *result = __libc_malloc(size);
++  *result = ::__libc_malloc(size);
+ #elif BUILDFLAG(USE_TCMALLOC)
+   *result = tc_malloc_skip_new_handler(size);
+ #endif
diff --git a/srcpkgs/qt6-webengine/patches/0200-chromium-musl-include-sys-reg.h-to-get-__WORDSIZE.patch b/srcpkgs/qt6-webengine/patches/0200-chromium-musl-include-sys-reg.h-to-get-__WORDSIZE.patch
new file mode 100644
index 000000000000..41b90071b5e4
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0200-chromium-musl-include-sys-reg.h-to-get-__WORDSIZE.patch
@@ -0,0 +1,21 @@
+From 9001c54d6b974449174a8cee8f3f5d78a9bd6c9e Mon Sep 17 00:00:00 2001
+From: Felix Janda <felix.janda@posteo.de>
+Date: Sun, 1 Feb 2015 14:26:52 +0100
+Subject: [PATCH 3/6] include <sys/reg.h> to get __WORDSIZE on musl libc
+
+---
+ qtwebengine/src/3rdparty/chromium/third_party/breakpad/breakpad/src/common/linux/elf_core_dump.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/common/linux/elf_core_dump.h
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/common/linux/elf_core_dump.h
+@@ -37,6 +37,9 @@
+ #include <limits.h>
+ #include <link.h>
+ #include <stddef.h>
++#ifndef __GLIBC__
++#include <sys/reg.h>
++#endif
+ 
+ #include "common/memory_range.h"
+ 
diff --git a/srcpkgs/qt6-webengine/patches/0201-chromium-musl-dispatch-to-musl.patch b/srcpkgs/qt6-webengine/patches/0201-chromium-musl-dispatch-to-musl.patch
new file mode 100644
index 000000000000..a58a688a4b55
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0201-chromium-musl-dispatch-to-musl.patch
@@ -0,0 +1,103 @@
+--- a/src/3rdparty/chromium/base/allocator/allocator_shim_default_dispatch_to_glibc.cc
++++ b/src/3rdparty/chromium/base/allocator/allocator_shim_default_dispatch_to_glibc.cc
+@@ -8,6 +8,7 @@
+ #include <dlfcn.h>
+ #include <malloc.h>
+ 
++#if defined(__GLIBC__)
+ // This translation unit defines a default dispatch for the allocator shim which
+ // routes allocations to libc functions.
+ // The code here is strongly inspired from tcmalloc's libc_override_glibc.h.
+@@ -87,3 +88,92 @@ const AllocatorDispatch AllocatorDispatc
+     nullptr,               /* aligned_free_function */
+     nullptr,               /* next */
+ };
++
++#else // defined(__GLIBC__)
++
++#include <dlfcn.h>
++
++extern "C" {
++// Declare function pointers to the memory functions
++typedef void* (*t_libc_malloc)(size_t size);
++typedef void* (*t_libc_calloc)(size_t n, size_t size);
++typedef void* (*t_libc_realloc)(void* address, size_t size);
++typedef void* (*t_libc_memalign)(size_t alignment, size_t size);
++typedef void (*t_libc_free)(void* ptr);
++typedef size_t (*t_libc_malloc_usable_size)(void* ptr);
++
++// Static instances of pointers to libc.so dl symbols
++static t_libc_malloc libc_malloc = NULL;
++static t_libc_calloc libc_calloc = NULL;
++static t_libc_realloc libc_realloc = NULL;
++static t_libc_memalign libc_memalign = NULL;
++static t_libc_free libc_free = NULL;
++static t_libc_malloc_usable_size libc_malloc_usable_size = NULL;
++
++// resolve the symbols in libc.so
++void musl_libc_memory_init(void)
++{
++  libc_malloc = (t_libc_malloc) dlsym(RTLD_NEXT, "malloc");
++  libc_calloc = (t_libc_calloc) dlsym(RTLD_NEXT, "calloc");
++  libc_realloc = (t_libc_realloc) dlsym(RTLD_NEXT, "realloc");
++  libc_memalign = (t_libc_memalign) dlsym(RTLD_NEXT, "memalign");
++  libc_free = (t_libc_free) dlsym(RTLD_NEXT, "free");
++  libc_malloc_usable_size = (t_libc_malloc_usable_size) dlsym(RTLD_NEXT, "malloc_usable_size");
++}
++}  // extern "C"
++
++namespace {
++
++using base::allocator::AllocatorDispatch;
++
++void* MuslMalloc(const AllocatorDispatch*, size_t size, void* context) {
++  if (!libc_malloc)
++    musl_libc_memory_init();
++  return (*libc_malloc)(size);
++}
++
++void* MuslCalloc(const AllocatorDispatch*, size_t n, size_t size, void* context) {
++  if (!libc_calloc)
++    musl_libc_memory_init();
++  return (*libc_calloc)(n, size);
++}
++
++void* MuslRealloc(const AllocatorDispatch*, void* address, size_t size, void* context) {
++  if (!libc_realloc)
++    musl_libc_memory_init();
++  return (*libc_realloc)(address, size);
++}
++
++void* MuslMemalign(const AllocatorDispatch*, size_t alignment, size_t size, void* context) {
++  if (!libc_memalign)
++    musl_libc_memory_init();
++  return (*libc_memalign)(alignment, size);
++}
++
++void MuslFree(const AllocatorDispatch*, void* address, void* context) {
++  if (!libc_free)
++    musl_libc_memory_init();
++  (*libc_free)(address);
++}
++
++size_t MuslGetSizeEstimate(const AllocatorDispatch*, void* address, void* context) {
++  // TODO(siggi, primiano): malloc_usable_size may need redirection in the
++  //     presence of interposing shims that divert allocations.
++  if (!libc_malloc_usable_size)
++    musl_libc_memory_init();
++  return (*libc_malloc_usable_size)(address);
++}
++
++}  // namespace
++
++const AllocatorDispatch AllocatorDispatch::default_dispatch = {
++    &MuslMalloc,           /* alloc_function */
++    &MuslCalloc,           /* alloc_zero_initialized_function */
++    &MuslMemalign,         /* alloc_aligned_function */
++    &MuslRealloc,          /* realloc_function */
++    &MuslFree,             /* free_function */
++    &MuslGetSizeEstimate,  /* get_size_estimate_function */
++    nullptr,               /* next */
++};
++
++#endif
diff --git a/srcpkgs/qt6-webengine/patches/0202-chromium-musl-no-mallinfo.patch b/srcpkgs/qt6-webengine/patches/0202-chromium-musl-no-mallinfo.patch
new file mode 100644
index 000000000000..a5bdb5a43a5f
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0202-chromium-musl-no-mallinfo.patch
@@ -0,0 +1,62 @@
+--- a/src/3rdparty/chromium/base/process/process_metrics_posix.cc
++++ b/src/3rdparty/chromium/base/process/process_metrics_posix.cc
+@@ -105,7 +105,7 @@ void IncreaseFdLimitTo(unsigned int max_
+ 
+ #endif  // !defined(OS_FUCHSIA)
+ 
+-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID)
++#if (defined(OS_LINUX) && defined(__GLIBC__)) || defined(OS_CHROMEOS) || defined(OS_ANDROID)
+ namespace {
+ 
+ size_t GetMallocUsageMallinfo() {
+@@ -127,16 +127,16 @@ size_t GetMallocUsageMallinfo() {
+ }
+ 
+ }  // namespace
+-#endif  // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID)
++#endif  // (defined(OS_LINUX) && defined(__GLIBC__)) || defined(OS_CHROMEOS) || defined(OS_ANDROID)
+ 
+ size_t ProcessMetrics::GetMallocUsage() {
+ #if defined(OS_APPLE)
+   malloc_statistics_t stats = {0};
+   malloc_zone_statistics(nullptr, &stats);
+   return stats.size_in_use;
+-#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID)
++#elif (defined(OS_LINUX) && defined(__GLIBC__)) || defined(OS_CHROMEOS) || defined(OS_ANDROID)
+   return GetMallocUsageMallinfo();
+-#elif defined(OS_FUCHSIA)
++#else
+   // TODO(fuchsia): Not currently exposed. https://crbug.com/735087.
+   return 0;
+ #endif
+--- a/src/3rdparty/chromium/third_party/tflite/src/tensorflow/lite/profiling/memory_info.cc
++++ b/src/3rdparty/chromium/third_party/tflite/src/tensorflow/lite/profiling/memory_info.cc
+@@ -27,7 +27,7 @@ namespace memory {
+ const int MemoryUsage::kValueNotSet = 0;
+ 
+ bool MemoryUsage::IsSupported() {
+-#ifdef __linux__
++#ifdef __GLIBC__
+   return true;
+ #endif
+   return false;
+@@ -35,7 +35,7 @@ bool MemoryUsage::IsSupported() {
+ 
+ MemoryUsage GetMemoryUsage() {
+   MemoryUsage result;
+-#ifdef __linux__
++#ifdef __GLIBC__
+   rusage res;
+   if (getrusage(RUSAGE_SELF, &res) == 0) {
+     result.max_rss_kb = res.ru_maxrss;
+--- a/src/3rdparty/chromium/base/trace_event/malloc_dump_provider.cc
++++ b/src/3rdparty/chromium/base/trace_event/malloc_dump_provider.cc
+@@ -213,7 +213,7 @@ bool MallocDumpProvider::OnMemoryDump(co
+                      &allocated_objects_count);
+ #elif defined(OS_FUCHSIA)
+ // TODO(fuchsia): Port, see https://crbug.com/706592.
+-#else
++#elif defined(__GLIBC__)
+ #if defined(__GLIBC__) && defined(__GLIBC_PREREQ)
+ #if __GLIBC_PREREQ(2, 33)
+ #define MALLINFO2_FOUND_IN_LIBC
diff --git a/srcpkgs/qt6-webengine/patches/0203-chromium-musl-siginfo_t.patch b/srcpkgs/qt6-webengine/patches/0203-chromium-musl-siginfo_t.patch
new file mode 100644
index 000000000000..43ef7fd7c5d2
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0203-chromium-musl-siginfo_t.patch
@@ -0,0 +1,18 @@
+There's a subtle difference in the internal name of siginfo_t fields
+between glibc and musl. The structure itself is equivalent, so it
+should suffice to add a macro to rename the field.
+
+--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf/trap.cc
++++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf/trap.cc
+@@ -174,7 +174,11 @@ void Trap::SigSys(int nr, LinuxSigInfo*
+   // If the version of glibc doesn't include this information in
+   // siginfo_t (older than 2.17), we need to explicitly copy it
+   // into an arch_sigsys structure.
++#if defined(__GLIBC__)
+   memcpy(&sigsys, &info->_sifields, sizeof(sigsys));
++#else
++  memcpy(&sigsys, &info->__si_fields, sizeof(sigsys));
++#endif
+ #endif
+ 
+ #if defined(__mips__)
diff --git a/srcpkgs/qt6-webengine/patches/0204-chromium-musl-stackstart.patch b/srcpkgs/qt6-webengine/patches/0204-chromium-musl-stackstart.patch
new file mode 100644
index 000000000000..b03cf43b86db
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0204-chromium-musl-stackstart.patch
@@ -0,0 +1,20 @@
+--- a/src/3rdparty/chromium/third_party/blink/renderer/platform/wtf/stack_util.cc
++++ b/src/3rdparty/chromium/third_party/blink/renderer/platform/wtf/stack_util.cc
+@@ -29,7 +29,7 @@ size_t GetUnderestimatedStackSize() {
+ // FIXME: On Mac OSX and Linux, this method cannot estimate stack size
+ // correctly for the main thread.
+ 
+-#elif defined(__GLIBC__) || defined(OS_ANDROID) || defined(OS_FREEBSD) || \
++#elif defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FREEBSD) || \
+     defined(OS_FUCHSIA)
+   // pthread_getattr_np() can fail if the thread is not invoked by
+   // pthread_create() (e.g., the main thread of blink_unittests).
+@@ -97,7 +97,7 @@ return Threading::ThreadStackSize();
+ }
+ 
+ void* GetStackStart() {
+-#if defined(__GLIBC__) || defined(OS_ANDROID) || defined(OS_FREEBSD) || \
++#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FREEBSD) || \
+     defined(OS_FUCHSIA)
+   pthread_attr_t attr;
+   int error;
diff --git a/srcpkgs/qt6-webengine/patches/0205-chromium-musl-sandbox.patch b/srcpkgs/qt6-webengine/patches/0205-chromium-musl-sandbox.patch
new file mode 100644
index 000000000000..772a578fd823
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0205-chromium-musl-sandbox.patch
@@ -0,0 +1,92 @@
+--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc
++++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc
+@@ -138,7 +138,7 @@ namespace sandbox {
+ // present (as in newer versions of posix_spawn).
+ ResultExpr RestrictCloneToThreadsAndEPERMFork() {
+   const Arg<unsigned long> flags(0);
+-
++#if defined(__GLIBC__)
+   // TODO(mdempsky): Extend DSL to support (flags & ~mask1) == mask2.
+   const uint64_t kAndroidCloneMask = CLONE_VM | CLONE_FS | CLONE_FILES |
+                                      CLONE_SIGHAND | CLONE_THREAD |
+@@ -165,6 +165,17 @@ ResultExpr RestrictCloneToThreadsAndEPER
+   return If(IsAndroid() ? android_test : glibc_test, Allow())
+       .ElseIf(is_fork_or_clone_vfork, Error(EPERM))
+       .Else(CrashSIGSYSClone());
++#else
++  const int required = CLONE_VM | CLONE_FS | CLONE_FILES | CLONE_SIGHAND |
++                       CLONE_THREAD | CLONE_SYSVSEM;
++  const int safe = CLONE_SETTLS | CLONE_PARENT_SETTID | CLONE_CHILD_CLEARTID |
++                   CLONE_DETACHED;
++  const BoolExpr thread_clone_ok = (flags&~safe)==required;
++
++  return If(thread_clone_ok, Allow())
++      .ElseIf((flags & (CLONE_VM | CLONE_THREAD)) == 0, Error(EPERM))
++      .Else(CrashSIGSYSClone());
++#endif
+ }
+ 
+ #ifndef PR_PAC_RESET_KEYS
+--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
++++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
+@@ -419,6 +419,9 @@ bool SyscallSets::IsAllowedProcessStartO
+ #if defined(__i386__)
+     case __NR_waitpid:
+ #endif
++#if !defined(__GLIBC__)
++    case __NR_set_tid_address:
++#endif
+       return true;
+     case __NR_clone:  // Should be parameter-restricted.
+     case __NR_setns:  // Privileged.
+@@ -431,7 +434,9 @@ bool SyscallSets::IsAllowedProcessStartO
+ #if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
+     case __NR_set_thread_area:
+ #endif
++#if defined(__GLIBC__)
+     case __NR_set_tid_address:
++#endif
+     case __NR_unshare:
+ #if !defined(__mips__) && !defined(__aarch64__)
+     case __NR_vfork:
+@@ -545,6 +550,9 @@ bool SyscallSets::IsAllowedAddressSpaceA
+     case __NR_mlock:
+     case __NR_munlock:
+     case __NR_munmap:
++#if !defined(__GLIBC__)
++    case __NR_mremap:
++#endif
+       return true;
+     case __NR_madvise:
+     case __NR_mincore:
+@@ -562,7 +570,9 @@ bool SyscallSets::IsAllowedAddressSpaceA
+     case __NR_modify_ldt:
+ #endif
+     case __NR_mprotect:
++#if defined(__GLIBC__)
+     case __NR_mremap:
++#endif
+     case __NR_msync:
+     case __NR_munlockall:
+     case __NR_readahead:
+--- a/src/3rdparty/chromium/sandbox/policy/linux/bpf_renderer_policy_linux.cc
++++ b/src/3rdparty/chromium/sandbox/policy/linux/bpf_renderer_policy_linux.cc
+@@ -97,11 +97,18 @@ ResultExpr RendererProcessPolicy::Evalua
+     case __NR_sysinfo:
+     case __NR_times:
+     case __NR_uname:
++#if !defined(__GLIBC__)
++    case __NR_sched_getparam:
++    case __NR_sched_getscheduler:
++    case __NR_sched_setscheduler:
++#endif
+       return Allow();
+     case __NR_sched_getaffinity:
++#if defined(__GLIBC__)
+     case __NR_sched_getparam:
+     case __NR_sched_getscheduler:
+     case __NR_sched_setscheduler:
++#endif
+       return RestrictSchedTarget(GetPolicyPid(), sysno);
+     case __NR_prlimit64:
+       // See crbug.com/662450 and setrlimit comment above.
diff --git a/srcpkgs/qt6-webengine/patches/0206-chromium-musl-default-stacksize.patch b/srcpkgs/qt6-webengine/patches/0206-chromium-musl-default-stacksize.patch
new file mode 100644
index 000000000000..bc07495b8144
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0206-chromium-musl-default-stacksize.patch
@@ -0,0 +1,15 @@
+--- a/src/3rdparty/chromium/base/threading/platform_thread_linux.cc
++++ b/src/3rdparty/chromium/base/threading/platform_thread_linux.cc
+@@ -439,7 +439,12 @@ void TerminateOnThread() {}
+ 
+ size_t GetDefaultThreadStackSize(const pthread_attr_t& attributes) {
+ #if !defined(THREAD_SANITIZER)
++#if defined(__GLIBC__)
+   return 0;
++#else // defined(__GLIBC__)
++  // For Musl libc try with a default stack size of 2 MiB
++  return 2 * 1024 * 1024;
++#endif // !defined(__GLIBC__)
+ #else
+   // ThreadSanitizer bloats the stack heavily. Evidence has been that the
+   // default stack size isn't enough for some browser tests.
diff --git a/srcpkgs/qt6-webengine/patches/0207-chromium-musl-cross-no-asm_ptrace_h.patch b/srcpkgs/qt6-webengine/patches/0207-chromium-musl-cross-no-asm_ptrace_h.patch
new file mode 100644
index 000000000000..3cf132908af4
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0207-chromium-musl-cross-no-asm_ptrace_h.patch
@@ -0,0 +1,30 @@
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper.cc
+@@ -38,7 +38,12 @@
+ 
+ #include "client/linux/minidump_writer/linux_ptrace_dumper.h"
+ 
++#if defined(__GLIBC__)
+ #include <asm/ptrace.h>
++#else
++/* For arm*-musl this definition is missing */
++#define ARM_sp uregs[13]
++#endif
+ #include <assert.h>
+ #include <errno.h>
+ #include <fcntl.h>
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_core_dumper.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_core_dumper.cc
+@@ -32,7 +32,12 @@
+ 
+ #include "client/linux/minidump_writer/linux_core_dumper.h"
+ 
++#if defined(__GLIBC__)
+ #include <asm/ptrace.h>
++#else
++/* For arm*-musl this definition is missing */
++#define ARM_sp uregs[13]
++#endif
+ #include <assert.h>
+ #include <elf.h>
+ #include <stdio.h>
diff --git a/srcpkgs/qt6-webengine/patches/0208-chromium-musl-execinfo.patch b/srcpkgs/qt6-webengine/patches/0208-chromium-musl-execinfo.patch
new file mode 100644
index 000000000000..9f3b964676b3
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0208-chromium-musl-execinfo.patch
@@ -0,0 +1,125 @@
+--- a/src/3rdparty/chromium/base/debug/stack_trace.cc
++++ b/src/3rdparty/chromium/base/debug/stack_trace.cc
+@@ -252,7 +252,9 @@ void StackTrace::Print() const {
+ }
+ 
+ void StackTrace::OutputToStream(std::ostream* os) const {
++#if defined(__GLIBC__) && !defined(_AIX)
+   OutputToStreamWithPrefix(os, nullptr);
++#endif
+ }
+ 
+ std::string StackTrace::ToString() const {
+@@ -260,7 +262,7 @@ std::string StackTrace::ToString() const
+ }
+ std::string StackTrace::ToStringWithPrefix(const char* prefix_string) const {
+   std::stringstream stream;
+-#if !defined(__UCLIBC__) && !defined(_AIX)
++#if defined(__GLIBC__) && !defined(_AIX)
+   OutputToStreamWithPrefix(&stream, prefix_string);
+ #endif
+   return stream.str();
+--- a/src/3rdparty/chromium/base/debug/stack_trace_posix.cc
++++ b/src/3rdparty/chromium/base/debug/stack_trace_posix.cc
+@@ -27,7 +27,7 @@
+ #if !defined(USE_SYMBOLIZE)
+ #include <cxxabi.h>
+ #endif
+-#if !defined(__UCLIBC__) && !defined(_AIX)
++#if defined(__GLIBC__) && !defined(_AIX)
+ #include <execinfo.h>
+ #endif
+ 
+@@ -89,7 +89,7 @@ void DemangleSymbols(std::string* text)
+   // Note: code in this function is NOT async-signal safe (std::string uses
+   // malloc internally).
+ 
+-#if !defined(__UCLIBC__) && !defined(_AIX)
++#if defined(__GLIBC__) && !defined(_AIX)
+   std::string::size_type search_from = 0;
+   while (search_from < text->size()) {
+     // Look for the start of a mangled symbol, from search_from.
+@@ -124,7 +124,7 @@ void DemangleSymbols(std::string* text)
+       search_from = mangled_start + 2;
+     }
+   }
+-#endif  // !defined(__UCLIBC__) && !defined(_AIX)
++#endif  // !defined(__GLIBC__) && !defined(_AIX)
+ }
+ #endif  // !defined(USE_SYMBOLIZE)
+ 
+@@ -136,7 +136,7 @@ class BacktraceOutputHandler {
+   virtual ~BacktraceOutputHandler() = default;
+ };
+ 
+-#if !defined(__UCLIBC__) && !defined(_AIX)
++#if defined(__GLIBC__) && !defined(_AIX)
+ void OutputPointer(void* pointer, BacktraceOutputHandler* handler) {
+   // This should be more than enough to store a 64-bit number in hex:
+   // 16 hex digits + 1 for null-terminator.
+@@ -219,7 +219,7 @@ void ProcessBacktrace(void* const* trace
+   }
+ #endif  // defined(USE_SYMBOLIZE)
+ }
+-#endif  // !defined(__UCLIBC__) && !defined(_AIX)
++#endif  // !defined(__GLIBC__) && !defined(_AIX)
+ 
+ void PrintToStderr(const char* output) {
+   // NOTE: This code MUST be async-signal safe (it's used by in-process
+@@ -839,7 +839,7 @@ size_t CollectStackTrace(void** trace, s
+   // If we do not have unwind tables, then try tracing using frame pointers.
+   return base::debug::TraceStackFramePointers(const_cast<const void**>(trace),
+                                               count, 0);
+-#elif !defined(__UCLIBC__) && !defined(_AIX)
++#elif defined(__GLIBC__) && !defined(_AIX)
+   // Though the backtrace API man page does not list any possible negative
+   // return values, we take no chance.
+   return base::saturated_cast<size_t>(backtrace(trace, count));
+@@ -852,13 +852,13 @@ void StackTrace::PrintWithPrefix(const c
+ // NOTE: This code MUST be async-signal safe (it's used by in-process
+ // stack dumping signal handler). NO malloc or stdio is allowed here.
+ 
+-#if !defined(__UCLIBC__) && !defined(_AIX)
++#if defined(__GLIBC__) && !defined(_AIX)
+   PrintBacktraceOutputHandler handler;
+   ProcessBacktrace(trace_, count_, prefix_string, &handler);
+ #endif
+ }
+ 
+-#if !defined(__UCLIBC__) && !defined(_AIX)
++#if defined(__GLIBC__) && !defined(_AIX)
+ void StackTrace::OutputToStreamWithPrefix(std::ostream* os,
+                                           const char* prefix_string) const {
+   StreamBacktraceOutputHandler handler(os);
+--- a/src/3rdparty/chromium/base/logging.cc
++++ b/src/3rdparty/chromium/base/logging.cc
+@@ -582,7 +582,7 @@ LogMessage::LogMessage(const char* file,
+ 
+ LogMessage::~LogMessage() {
+   size_t stack_start = stream_.tellp();
+-#if !defined(OFFICIAL_BUILD) && !defined(OS_NACL) && !defined(__UCLIBC__) && \
++#if !defined(OFFICIAL_BUILD) && !defined(OS_NACL) && defined(__GLIBC__) && \
+     !defined(OS_AIX)
+   if (severity_ == LOGGING_FATAL && !base::debug::BeingDebugged()) {
+     // Include a stack trace on a fatal, unless a debugger is attached.
+--- 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 @@
+ 
+ #if defined(DEBUG) && defined(V8_OS_LINUX) && !defined(V8_OS_ANDROID)
+ #define SYMBOLIZE_FUNCTION
++#if defined(__GLIBC__)
+ #include <execinfo.h>
++#endif
+ 
+ #include <vector>
+ 
+@@ -103,7 +105,7 @@ void ExternalReferenceTable::Init(Isolat
+ }
+ 
+ const char* ExternalReferenceTable::ResolveSymbol(void* address) {
+-#ifdef SYMBOLIZE_FUNCTION
++#if defined(SYMBOLIZE_FUNCTION) && defined(__GLIBC__)
+   char** names = backtrace_symbols(&address, 1);
+   const char* name = names[0];
+   // The array of names is malloc'ed. However, each name string is static
diff --git a/srcpkgs/qt6-webengine/patches/0209-chromium-musl-thread-stacksize.patch b/srcpkgs/qt6-webengine/patches/0209-chromium-musl-thread-stacksize.patch
new file mode 100644
index 000000000000..4b760a428b25
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0209-chromium-musl-thread-stacksize.patch
@@ -0,0 +1,22 @@
+--- a/src/3rdparty/chromium/ppapi/utility/threading/simple_thread.cc
++++ b/src/3rdparty/chromium/ppapi/utility/threading/simple_thread.cc
+@@ -13,7 +13,7 @@ namespace pp {
+ namespace {
+ 
+ // Use 2MB default stack size for Native Client, otherwise use system default.
+-#if defined(__native_client__)
++#if defined(__native_client__) || !defined(__GLIBC__)
+ const size_t kDefaultStackSize = 2 * 1024 * 1024;
+ #else
+ const size_t kDefaultStackSize = 0;
+--- a/src/3rdparty/chromium/v8/src/base/platform/platform-posix.cc
++++ b/src/3rdparty/chromium/v8/src/base/platform/platform-posix.cc
+@@ -883,7 +883,7 @@ bool Thread::Start() {
+ #if V8_OS_MACOSX
+     // Default on Mac OS X is 512kB -- bump up to 1MB
+     stack_size = 1 * 1024 * 1024;
+-#elif V8_OS_AIX
++#elif V8_OS_AIX || !defined(__GLIBC__)
+     // Default on AIX is 96kB -- bump up to 2MB
+     stack_size = 2 * 1024 * 1024;
+ #endif
diff --git a/srcpkgs/qt6-webengine/patches/0210-chromium-musl-msgvec-push_back.patch b/srcpkgs/qt6-webengine/patches/0210-chromium-musl-msgvec-push_back.patch
new file mode 100644
index 000000000000..905daa223700
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0210-chromium-musl-msgvec-push_back.patch
@@ -0,0 +1,14 @@
+--- a/src/3rdparty/chromium/net/socket/udp_socket_posix.cc
++++ b/src/3rdparty/chromium/net/socket/udp_socket_posix.cc
+@@ -1162,7 +1162,11 @@ SendResult UDPSocketPosixSender::Interna
+     msg_iov->push_back({const_cast<char*>(buffer->data()), buffer->length()});
+   msgvec->reserve(buffers.size());
+   for (size_t j = 0; j < buffers.size(); j++)
++#if defined(__GLIBC__)
+     msgvec->push_back({{nullptr, 0, &msg_iov[j], 1, nullptr, 0, 0}, 0});
++#else
++    msgvec->push_back({{nullptr, 0, &msg_iov[j], 1, 0, 0, 0}, 0});
++#endif
+   int result = HANDLE_EINTR(Sendmmsg(fd, &msgvec[0], buffers.size(), 0));
+   SendResult send_result(0, 0, std::move(buffers));
+   if (result < 0) {
diff --git a/srcpkgs/qt6-webengine/patches/0211-chromium-musl-canonicalize-file-name-musl.patch b/srcpkgs/qt6-webengine/patches/0211-chromium-musl-canonicalize-file-name-musl.patch
new file mode 100644
index 000000000000..d43e6bd488bc
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0211-chromium-musl-canonicalize-file-name-musl.patch
@@ -0,0 +1,11 @@
+--- a/src/3rdparty/chromium/third_party/nasm/nasmlib/realpath.c
++++ b/src/3rdparty/chromium/third_party/nasm/nasmlib/realpath.c
+@@ -55,7 +55,7 @@
+  */
+ char *nasm_realpath(const char *rel_path)
+ {
+-    char *rp = canonicalize_file_name(rel_path);
++    char *rp = realpath(rel_path, NULL);
+     return rp ? rp : nasm_strdup(rel_path);
+ }
+ 
diff --git a/srcpkgs/qt6-webengine/patches/0212-chromium-musl-no-getcontext.patch b/srcpkgs/qt6-webengine/patches/0212-chromium-musl-no-getcontext.patch
new file mode 100644
index 000000000000..5755f1b45a7d
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0212-chromium-musl-no-getcontext.patch
@@ -0,0 +1,29 @@
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc
+@@ -489,8 +489,10 @@ bool ExceptionHandler::SimulateSignalDel
+   // ExceptionHandler::HandleSignal().
+   siginfo.si_code = SI_USER;
+   siginfo.si_pid = getpid();
+-  ucontext_t context;
++  ucontext_t context = { 0 };
++#if defined(__GLIBC__)
+   getcontext(&context);
++#endif
+   return HandleSignal(sig, &siginfo, &context);
+ }
+ 
+@@ -675,9 +677,14 @@ bool ExceptionHandler::WriteMinidump() {
+   sys_prctl(PR_SET_DUMPABLE, 1, 0, 0, 0);
+ 
+   CrashContext context;
++
++#if defined(__GLIBC__)
+   int getcontext_result = getcontext(&context.context);
+   if (getcontext_result)
+     return false;
++#else
++  return false;
++#endif
+ 
+ #if defined(__i386__)
+   // In CPUFillFromUContext in minidumpwriter.cc the stack pointer is retrieved
diff --git a/srcpkgs/qt6-webengine/patches/0213-chromium-musl-crashpad.patch b/srcpkgs/qt6-webengine/patches/0213-chromium-musl-crashpad.patch
new file mode 100644
index 000000000000..4d49997ed4f3
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0213-chromium-musl-crashpad.patch
@@ -0,0 +1,22 @@
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/compat/linux/sys/ptrace.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/compat/linux/sys/ptrace.h
+@@ -17,7 +17,9 @@
+ 
+ #include_next <sys/ptrace.h>
+ 
++#ifdef __GLIBC__
+ #include <sys/cdefs.h>
++#endif
+ 
+ // https://sourceware.org/bugzilla/show_bug.cgi?id=22433
+ #if !defined(PTRACE_GET_THREAD_AREA) && !defined(PT_GET_THREAD_AREA) && \
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/util/linux/ptracer.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/util/linux/ptracer.cc
+@@ -26,6 +26,7 @@
+ 
+ #if defined(ARCH_CPU_X86_FAMILY)
+ #include <asm/ldt.h>
++#include <asm/ptrace-abi.h>
+ #endif
+ 
+ namespace crashpad {
diff --git a/srcpkgs/qt6-webengine/patches/0214-chromium-musl-fixes.patch b/srcpkgs/qt6-webengine/patches/0214-chromium-musl-fixes.patch
new file mode 100644
index 000000000000..55b267ed1714
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0214-chromium-musl-fixes.patch
@@ -0,0 +1,108 @@
+--- a/src/3rdparty/chromium/sandbox/linux/suid/process_util.h
++++ b/src/3rdparty/chromium/sandbox/linux/suid/process_util.h
+@@ -12,6 +12,15 @@
+ #include <stdint.h>
+ #include <sys/types.h>
+ 
++#if !defined(__GLIBC__) && !defined(TEMP_FAILURE_RETRY)
++# define TEMP_FAILURE_RETRY(expression) \
++	(__extension__			\
++	 ({ long int __result;		\
++	  do __result = (long int) (expression); \
++	  while (__result == -1L && errno == EINTR); \
++	  __result; }))
++#endif
++
+ // This adjusts /proc/process/oom_score_adj so the Linux OOM killer
+ // will prefer certain process types over others. The range for the
+ // adjustment is [-1000, 1000], with [0, 1000] being user accessible.
+--- a/src/3rdparty/chromium/services/device/serial/serial_io_handler_posix.cc
++++ b/src/3rdparty/chromium/services/device/serial/serial_io_handler_posix.cc
+@@ -6,6 +6,7 @@
+ 
+ #include <sys/ioctl.h>
+ #include <termios.h>
++#include <asm-generic/ioctls.h>
+ 
+ #include <algorithm>
+ #include <utility>
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h
+@@ -38,6 +38,10 @@
+ #include "common/memory_allocator.h"
+ #include "google_breakpad/common/minidump_format.h"
+ 
++#ifndef __GLIBC__
++#define _libc_fpstate _fpstate
++#endif
++
+ namespace google_breakpad {
+ 
+ // Wraps platform-dependent implementations of accessors to ucontext_t structs.
+--- a/src/3rdparty/chromium/third_party/ffmpeg/libavutil/cpu.c
++++ b/src/3rdparty/chromium/third_party/ffmpeg/libavutil/cpu.c
+@@ -41,8 +41,10 @@
+ #include <sys/param.h>
+ #endif
+ #include <sys/types.h>
++#ifdef __GLIBC__
+ #include <sys/sysctl.h>
+ #endif
++#endif
+ #if HAVE_UNISTD_H
+ #include <unistd.h>
+ #endif
+--- a/src/3rdparty/chromium/third_party/perfetto/include/perfetto/ext/base/thread_utils.h
++++ b/src/3rdparty/chromium/third_party/perfetto/include/perfetto/ext/base/thread_utils.h
+@@ -29,9 +29,7 @@
+ #include <algorithm>
+ #endif
+ 
+-#if PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID)
+ #include <sys/prctl.h>
+-#endif
+ 
+ // Internal implementation utils that aren't as widely useful/supported as
+ // base/thread_utils.h.
+@@ -58,7 +56,7 @@ inline bool MaybeSetThreadName(const std
+ 
+ inline bool GetThreadName(std::string& out_result) {
+   char buf[16] = {};
+-#if PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID)
++#if !defined(__GLIBC__)
+   if (prctl(PR_GET_NAME, buf) != 0)
+     return false;
+ #else
+--- a/src/3rdparty/chromium/third_party/lss/linux_syscall_support.h
++++ b/src/3rdparty/chromium/third_party/lss/linux_syscall_support.h
+@@ -1300,6 +1300,18 @@ struct kernel_statfs {
+ #ifndef __NR_fallocate
+ #define __NR_fallocate          285
+ #endif
++
++#if !defined(__GLIBC__)
++#ifdef __NR_pread
++#undef __NR_pread
++#endif
++#ifdef __NR_pwrite
++#undef __NR_pwrite
++#endif
++#define __NR_pread __NR_pread64
++#define __NR_pwrite __NR_pwrite64
++#endif /* !defined(__GLIBC__) */
++
+ #ifndef __NR_getrandom
+ #define __NR_getrandom          318
+ #endif
+--- a/src/3rdparty/chromium/net/dns/dns_config_service_posix.cc
++++ b/src/3rdparty/chromium/net/dns/dns_config_service_posix.cc
+@@ -93,7 +93,8 @@ absl::optional<DnsConfig> ReadDnsConfig(
+ 
+   absl::optional<DnsConfig> dns_config;
+ // TODO(fuchsia): Use res_ninit() when it's implemented on Fuchsia.
+-#if defined(OS_OPENBSD) || defined(OS_FUCHSIA)
++#if defined(OS_OPENBSD) || defined(OS_FUCHSIA) || \
++  (defined(OS_LINUX) && !defined(__GLIBC__))
+   // Note: res_ninit in glibc always returns 0 and sets RES_INIT.
+   // res_init behaves the same way.
+   memset(&_res, 0, sizeof(_res));
diff --git a/srcpkgs/qt6-webengine/patches/0215-chromium-musl-cdefs.patch b/srcpkgs/qt6-webengine/patches/0215-chromium-musl-cdefs.patch
new file mode 100644
index 000000000000..9d1daec29118
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0215-chromium-musl-cdefs.patch
@@ -0,0 +1,29 @@
+--- a/src/3rdparty/chromium/third_party/libsync/src/include/sync/sync.h
++++ b/src/3rdparty/chromium/third_party/libsync/src/include/sync/sync.h
+@@ -19,12 +19,13 @@
+ #ifndef __SYS_CORE_SYNC_H
+ #define __SYS_CORE_SYNC_H
+ 
+-#include <sys/cdefs.h>
+ #include <stdint.h>
+ 
+ #include <linux/types.h>
+ 
+-__BEGIN_DECLS
++#ifdef __cplusplus
++extern "C" {
++#endif
+ 
+ struct sync_legacy_merge_data {
+  int32_t fd2;
+@@ -158,6 +159,9 @@ struct sync_pt_info *sync_pt_info(struct
+                                   struct sync_pt_info *itr);
+ void sync_fence_info_free(struct sync_fence_info_data *info);
+ 
+-__END_DECLS
++#ifdef __cplusplus
++}
++#endif
++
+ 
+ #endif /* __SYS_CORE_SYNC_H */
diff --git a/srcpkgs/qt6-webengine/patches/0216-chromium-musl-stat.patch b/srcpkgs/qt6-webengine/patches/0216-chromium-musl-stat.patch
new file mode 100644
index 000000000000..4509a6957cd7
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0216-chromium-musl-stat.patch
@@ -0,0 +1,12 @@
+--- a/src/3rdparty/chromium/base/files/file.h
++++ b/src/3rdparty/chromium/base/files/file.h
+@@ -19,7 +19,8 @@
+ #include "build/build_config.h"
+ 
+ #if defined(OS_BSD) || defined(OS_APPLE) || defined(OS_NACL) || \
+-    defined(OS_FUCHSIA) || (defined(OS_ANDROID) && __ANDROID_API__ < 21)
++    defined(OS_FUCHSIA) || (defined(OS_ANDROID) && __ANDROID_API__ < 21) || \
++    (defined(OS_LINUX) && !defined(__GLIBC__))
+ struct stat;
+ namespace base {
+ typedef struct stat stat_wrapper_t;
diff --git a/srcpkgs/qt6-webengine/patches/0217-chromium-musl-resolver.patch b/srcpkgs/qt6-webengine/patches/0217-chromium-musl-resolver.patch
new file mode 100644
index 000000000000..c3d7afad9b19
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0217-chromium-musl-resolver.patch
@@ -0,0 +1,77 @@
+--- a/src/3rdparty/chromium/net/dns/dns_config_service_linux.cc
++++ b/src/3rdparty/chromium/net/dns/dns_config_service_linux.cc
+@@ -432,11 +432,13 @@ class DnsConfigServiceLinux::ConfigReade
+     base::ScopedBlockingCall scoped_blocking_call(
+         FROM_HERE, base::BlockingType::MAY_BLOCK);
+ 
++#if defined(__GLIBC__)
+     std::unique_ptr<struct __res_state> res = resolv_reader_->GetResState();
+     if (res) {
+       dns_config_ = ConvertResStateToDnsConfig(*res.get());
+       resolv_reader_->CloseResState(res.get());
+     }
++#endif
+ 
+     UMA_HISTOGRAM_BOOLEAN("Net.DNS.DnsConfig.Resolv.Read",
+                           dns_config_.has_value());
+@@ -486,6 +488,7 @@ class DnsConfigServiceLinux::ConfigReade
+ 
+ std::unique_ptr<struct __res_state>
+ DnsConfigServiceLinux::ResolvReader::GetResState() {
++#if defined(__GLIBC__)
+   auto res = std::make_unique<struct __res_state>();
+   memset(res.get(), 0, sizeof(struct __res_state));
+ 
+@@ -495,11 +498,16 @@ DnsConfigServiceLinux::ResolvReader::Get
+   }
+ 
+   return res;
++#else
++  return nullptr;
++#endif
+ }
+ 
+ void DnsConfigServiceLinux::ResolvReader::CloseResState(
+     struct __res_state* res) {
++#if defined(__GLIBC__)
+   res_nclose(res);
++#endif
+ }
+ 
+ DnsConfigServiceLinux::DnsConfigServiceLinux()
+--- a/src/3rdparty/chromium/net/dns/dns_reloader.cc
++++ b/src/3rdparty/chromium/net/dns/dns_reloader.cc
+@@ -4,8 +4,7 @@
+ 
+ #include "net/dns/dns_reloader.h"
+ 
+-#if defined(OS_POSIX) && !defined(OS_APPLE) && !defined(OS_OPENBSD) && \
+-    !defined(OS_ANDROID) && !defined(OS_FUCHSIA)
++#ifdef __GLIBC__
+ 
+ #include <resolv.h>
+ 
+--- a/src/3rdparty/chromium/net/dns/host_resolver_manager.cc
++++ b/src/3rdparty/chromium/net/dns/host_resolver_manager.cc
+@@ -2720,8 +2720,7 @@ HostResolverManager::HostResolverManager
+   NetworkChangeNotifier::AddConnectionTypeObserver(this);
+   if (system_dns_config_notifier_)
+     system_dns_config_notifier_->AddObserver(this);
+-#if defined(OS_POSIX) && !defined(OS_APPLE) && !defined(OS_OPENBSD) && \
+-    !defined(OS_ANDROID)
++#ifdef __GLIBC__
+   EnsureDnsReloaderInit();
+ #endif
+ 
+--- a/src/3rdparty/chromium/net/dns/host_resolver_proc.cc
++++ b/src/3rdparty/chromium/net/dns/host_resolver_proc.cc
+@@ -176,8 +176,7 @@ int SystemHostResolverCall(const std::st
+   base::ScopedBlockingCall scoped_blocking_call(FROM_HERE,
+                                                 base::BlockingType::WILL_BLOCK);
+ 
+-#if defined(OS_POSIX) && !defined(OS_APPLE) && !defined(OS_OPENBSD) && \
+-    !defined(OS_ANDROID) && !defined(OS_FUCHSIA)
++#ifdef __GLIBC__
+   DnsReloaderMaybeReload();
+ #endif
+   absl::optional<AddressInfo> ai;
diff --git a/srcpkgs/qt6-webengine/patches/0600-chromium-sndio.patch b/srcpkgs/qt6-webengine/patches/0600-chromium-sndio.patch
new file mode 100644
index 000000000000..0302874ffba4
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0600-chromium-sndio.patch
@@ -0,0 +1,876 @@
+--- a/src/3rdparty/chromium/media/BUILD.gn
++++ b/src/3rdparty/chromium/media/BUILD.gn
+@@ -72,6 +72,9 @@ config("media_config") {
+       defines += [ "DLOPEN_PULSEAUDIO" ]
+     }
+   }
++  if (use_sndio) {
++    defines += [ "USE_SNDIO" ]
++  }
+   if (use_cras) {
+     defines += [ "USE_CRAS" ]
+   }
+--- a/src/3rdparty/chromium/media/audio/BUILD.gn
++++ b/src/3rdparty/chromium/media/audio/BUILD.gn
+@@ -240,6 +240,17 @@ source_set("audio") {
+     sources += [ "linux/audio_manager_linux.cc" ]
+   }
+ 
++  if (use_sndio) {
++    libs += [ "sndio" ]
++    sources += [
++      "sndio/audio_manager_sndio.cc",
++      "sndio/sndio_input.cc",
++      "sndio/sndio_input.h",
++      "sndio/sndio_output.cc",
++      "sndio/sndio_output.h"
++    ]
++  }
++
+   if (use_alsa) {
+     libs += [ "asound" ]
+     sources += [
+--- a/src/3rdparty/chromium/media/audio/linux/audio_manager_linux.cc
++++ b/src/3rdparty/chromium/media/audio/linux/audio_manager_linux.cc
+@@ -25,6 +25,11 @@
+ #include "media/audio/pulse/audio_manager_pulse.h"
+ #include "media/audio/pulse/pulse_util.h"
+ #endif
++#if defined(USE_SNDIO)
++#include "media/audio/sndio/audio_manager_sndio.h"
++#include "media/audio/sndio/sndio_input.h"
++#include "media/audio/sndio/sndio_output.h"
++#endif
+ 
+ namespace media {
+ 
+@@ -32,7 +37,8 @@ enum LinuxAudioIO {
+   kPulse,
+   kAlsa,
+   kCras,
+-  kAudioIOMax = kCras  // Must always be equal to largest logged entry.
++  kSndio,
++  kAudioIOMax = kSndio // Must always be equal to largest logged entry.
+ };
+ 
+ std::unique_ptr<media::AudioManager> CreateAudioManager(
+@@ -45,6 +51,16 @@ std::unique_ptr<media::AudioManager> Cre
+                                               audio_log_factory);
+   }
+ 
++#if defined(USE_SNDIO)
++  struct sio_hdl *hdl = sio_open(SIO_DEVANY, SIO_PLAY, 0);
++  if (hdl != NULL) {
++    sio_close(hdl);
++    UMA_HISTOGRAM_ENUMERATION("Media.LinuxAudioIO", kSndio, kAudioIOMax + 1);
++    return std::make_unique<AudioManagerSndio>(std::move(audio_thread),
++                                                  audio_log_factory);
++  }
++#endif
++
+ #if defined(USE_CRAS)
+   if (base::CommandLine::ForCurrentProcess()->HasSwitch(switches::kUseCras)) {
+     UMA_HISTOGRAM_ENUMERATION("Media.LinuxAudioIO", kCras, kAudioIOMax + 1);
+--- /dev/null
++++ b/src/3rdparty/chromium/media/audio/sndio/audio_manager_sndio.cc
+@@ -0,0 +1,148 @@
++// Copyright (c) 2012 The Chromium Authors. All rights reserved.
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++#include "media/audio/sndio/audio_manager_sndio.h"
++
++#include "base/metrics/histogram_macros.h"
++#include "base/memory/ptr_util.h"
++#include "media/audio/audio_device_description.h"
++#include "media/audio/audio_output_dispatcher.h"
++#include "media/audio/sndio/sndio_input.h"
++#include "media/audio/sndio/sndio_output.h"
++#include "media/base/limits.h"
++#include "media/base/media_switches.h"
++
++namespace media {
++
++
++// Maximum number of output streams that can be open simultaneously.
++static const int kMaxOutputStreams = 4;
++
++// Default sample rate for input and output streams.
++static const int kDefaultSampleRate = 48000;
++
++void AddDefaultDevice(AudioDeviceNames* device_names) {
++  DCHECK(device_names->empty());
++  device_names->push_front(AudioDeviceName::CreateDefault());
++}
++
++bool AudioManagerSndio::HasAudioOutputDevices() {
++  return true;
++}
++
++bool AudioManagerSndio::HasAudioInputDevices() {
++  return true;
++}
++
++void AudioManagerSndio::GetAudioInputDeviceNames(
++    AudioDeviceNames* device_names) {
++  DCHECK(device_names->empty());
++  AddDefaultDevice(device_names);
++}
++
++void AudioManagerSndio::GetAudioOutputDeviceNames(
++    AudioDeviceNames* device_names) {
++  AddDefaultDevice(device_names);
++}
++
++const char* AudioManagerSndio::GetName() {
++  return "SNDIO";
++}
++
++AudioParameters AudioManagerSndio::GetInputStreamParameters(
++    const std::string& device_id) {
++  static const int kDefaultInputBufferSize = 1024;
++
++  int user_buffer_size = GetUserBufferSize();
++  int buffer_size = user_buffer_size ?
++      user_buffer_size : kDefaultInputBufferSize;
++
++  return AudioParameters(
++      AudioParameters::AUDIO_PCM_LOW_LATENCY, CHANNEL_LAYOUT_STEREO,
++      kDefaultSampleRate, buffer_size);
++}
++
++AudioManagerSndio::AudioManagerSndio(std::unique_ptr<AudioThread> audio_thread,
++                                         AudioLogFactory* audio_log_factory)
++    : AudioManagerBase(std::move(audio_thread),
++                       audio_log_factory) {
++  DLOG(WARNING) << "AudioManagerSndio";
++  SetMaxOutputStreamsAllowed(kMaxOutputStreams);
++}
++
++AudioManagerSndio::~AudioManagerSndio() {
++  Shutdown();
++}
++
++AudioOutputStream* AudioManagerSndio::MakeLinearOutputStream(
++    const AudioParameters& params,
++    const LogCallback& log_callback) {
++  DCHECK_EQ(AudioParameters::AUDIO_PCM_LINEAR, params.format());
++  return MakeOutputStream(params);
++}
++
++AudioOutputStream* AudioManagerSndio::MakeLowLatencyOutputStream(
++    const AudioParameters& params,
++    const std::string& device_id,
++    const LogCallback& log_callback) {
++  DLOG_IF(ERROR, !device_id.empty()) << "Not implemented!";
++  DCHECK_EQ(AudioParameters::AUDIO_PCM_LOW_LATENCY, params.format());
++  return MakeOutputStream(params);
++}
++
++AudioInputStream* AudioManagerSndio::MakeLinearInputStream(
++    const AudioParameters& params,
++    const std::string& device_id,
++    const LogCallback& log_callback) {
++  DCHECK_EQ(AudioParameters::AUDIO_PCM_LINEAR, params.format());
++  return MakeInputStream(params);
++}
++
++AudioInputStream* AudioManagerSndio::MakeLowLatencyInputStream(
++    const AudioParameters& params,
++    const std::string& device_id,
++    const LogCallback& log_callback) {
++  DCHECK_EQ(AudioParameters::AUDIO_PCM_LOW_LATENCY, params.format());
++  return MakeInputStream(params);
++}
++
++AudioParameters AudioManagerSndio::GetPreferredOutputStreamParameters(
++    const std::string& output_device_id,
++    const AudioParameters& input_params) {
++  // TODO(tommi): Support |output_device_id|.
++  DLOG_IF(ERROR, !output_device_id.empty()) << "Not implemented!";
++  static const int kDefaultOutputBufferSize = 2048;
++
++  ChannelLayout channel_layout = CHANNEL_LAYOUT_STEREO;
++  int sample_rate = kDefaultSampleRate;
++  int buffer_size = kDefaultOutputBufferSize;
++  if (input_params.IsValid()) {
++    sample_rate = input_params.sample_rate();
++    channel_layout = input_params.channel_layout();
++    buffer_size = std::min(buffer_size, input_params.frames_per_buffer());
++  }
++
++  int user_buffer_size = GetUserBufferSize();
++  if (user_buffer_size)
++    buffer_size = user_buffer_size;
++
++  return AudioParameters(
++      AudioParameters::AUDIO_PCM_LOW_LATENCY, channel_layout,
++      sample_rate, buffer_size);
++}
++
++AudioInputStream* AudioManagerSndio::MakeInputStream(
++    const AudioParameters& params) {
++  DLOG(WARNING) << "MakeInputStream";
++  return new SndioAudioInputStream(this,
++             AudioDeviceDescription::kDefaultDeviceId, params);
++}
++
++AudioOutputStream* AudioManagerSndio::MakeOutputStream(
++    const AudioParameters& params) {
++  DLOG(WARNING) << "MakeOutputStream";
++  return new SndioAudioOutputStream(params, this);
++}
++
++}  // namespace media
+--- /dev/null
++++ b/src/3rdparty/chromium/media/audio/sndio/audio_manager_sndio.h
+@@ -0,0 +1,65 @@
++// Copyright (c) 2012 The Chromium Authors. All rights reserved.
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++#ifndef MEDIA_AUDIO_SNDIO_AUDIO_MANAGER_SNDIO_H_
++#define MEDIA_AUDIO_SNDIO_AUDIO_MANAGER_SNDIO_H_
++
++#include <set>
++
++#include "base/compiler_specific.h"
++#include "base/macros.h"
++#include "base/memory/ref_counted.h"
++#include "base/threading/thread.h"
++#include "media/audio/audio_manager_base.h"
++
++namespace media {
++
++class MEDIA_EXPORT AudioManagerSndio : public AudioManagerBase {
++ public:
++  AudioManagerSndio(std::unique_ptr<AudioThread> audio_thread,
++                   AudioLogFactory* audio_log_factory);
++  ~AudioManagerSndio() override;
++
++  // Implementation of AudioManager.
++  bool HasAudioOutputDevices() override;
++  bool HasAudioInputDevices() override;
++  void GetAudioInputDeviceNames(AudioDeviceNames* device_names) override;
++  void GetAudioOutputDeviceNames(AudioDeviceNames* device_names) override;
++  AudioParameters GetInputStreamParameters(
++      const std::string& device_id) override;
++  const char* GetName() override;
++
++  // Implementation of AudioManagerBase.
++  AudioOutputStream* MakeLinearOutputStream(
++      const AudioParameters& params,
++      const LogCallback& log_callback) override;
++  AudioOutputStream* MakeLowLatencyOutputStream(
++      const AudioParameters& params,
++      const std::string& device_id,
++      const LogCallback& log_callback) override;
++  AudioInputStream* MakeLinearInputStream(
++      const AudioParameters& params,
++      const std::string& device_id,
++      const LogCallback& log_callback) override;
++  AudioInputStream* MakeLowLatencyInputStream(
++      const AudioParameters& params,
++      const std::string& device_id,
++      const LogCallback& log_callback) override;
++
++ protected:
++  AudioParameters GetPreferredOutputStreamParameters(
++      const std::string& output_device_id,
++      const AudioParameters& input_params) override;
++
++ private:
++  // Called by MakeLinearOutputStream and MakeLowLatencyOutputStream.
++  AudioOutputStream* MakeOutputStream(const AudioParameters& params);
++  AudioInputStream* MakeInputStream(const AudioParameters& params);
++
++  DISALLOW_COPY_AND_ASSIGN(AudioManagerSndio);
++};
++
++}  // namespace media
++
++#endif  // MEDIA_AUDIO_SNDIO_AUDIO_MANAGER_SNDIO_H_
+--- /dev/null
++++ b/src/3rdparty/chromium/media/audio/sndio/sndio_input.cc
+@@ -0,0 +1,200 @@
++// Copyright 2013 The Chromium Authors. All rights reserved.
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++#include "base/bind.h"
++#include "base/logging.h"
++#include "base/macros.h"
++#include "media/base/audio_timestamp_helper.h"
++#include "media/audio/sndio/audio_manager_sndio.h"
++#include "media/audio/audio_manager.h"
++#include "media/audio/sndio/sndio_input.h"
++
++namespace media {
++
++static const SampleFormat kSampleFormat = kSampleFormatS16;
++
++void SndioAudioInputStream::OnMoveCallback(void *arg, int delta)
++{
++  SndioAudioInputStream* self = static_cast<SndioAudioInputStream*>(arg);
++
++  self->hw_delay += delta;
++}
++
++void *SndioAudioInputStream::ThreadEntry(void *arg) {
++  SndioAudioInputStream* self = static_cast<SndioAudioInputStream*>(arg);
++
++  self->ThreadLoop();
++  return NULL;
++}
++
++SndioAudioInputStream::SndioAudioInputStream(AudioManagerBase* manager,
++                                             const std::string& device_name,
++                                             const AudioParameters& params)
++    : manager(manager),
++      params(params),
++      audio_bus(AudioBus::Create(params)),
++      state(kClosed) {
++}
++
++SndioAudioInputStream::~SndioAudioInputStream() {
++  if (state != kClosed)
++    Close();
++}
++
++bool SndioAudioInputStream::Open() {
++  struct sio_par par;
++  int sig;
++
++  if (state != kClosed)
++    return false;
++
++  if (params.format() != AudioParameters::AUDIO_PCM_LINEAR &&
++      params.format() != AudioParameters::AUDIO_PCM_LOW_LATENCY) {
++    LOG(WARNING) << "Unsupported audio format.";
++    return false;
++  }
++
++  sio_initpar(&par);
++  par.rate = params.sample_rate();
++  par.rchan = params.channels();
++  par.bits = SampleFormatToBitsPerChannel(kSampleFormat);
++  par.bps = par.bits / 8;
++  par.sig = sig = par.bits != 8 ? 1 : 0;
++  par.le = SIO_LE_NATIVE;
++  par.appbufsz = params.frames_per_buffer();
++
++  hdl = sio_open(SIO_DEVANY, SIO_REC, 0);
++
++  if (hdl == NULL) {
++    LOG(ERROR) << "Couldn't open audio device.";
++    return false;
++  }
++
++  if (!sio_setpar(hdl, &par) || !sio_getpar(hdl, &par)) {
++    LOG(ERROR) << "Couldn't set audio parameters.";
++    goto bad_close;
++  }
++
++  if (par.rate  != (unsigned int)params.sample_rate() ||
++      par.rchan != (unsigned int)params.channels() ||
++      par.bits  != (unsigned int)SampleFormatToBitsPerChannel(kSampleFormat) ||
++      par.sig   != (unsigned int)sig ||
++      (par.bps > 1 && par.le != SIO_LE_NATIVE) ||
++      (par.bits != par.bps * 8)) {
++    LOG(ERROR) << "Unsupported audio parameters.";
++    goto bad_close;
++  }
++  state = kStopped;
++  buffer = new char[audio_bus->frames() * params.GetBytesPerFrame(kSampleFormat)];
++  sio_onmove(hdl, &OnMoveCallback, this);
++  return true;
++bad_close:
++  sio_close(hdl);
++  return false;
++}
++
++void SndioAudioInputStream::Start(AudioInputCallback* cb) {
++
++  StartAgc();
++
++  state = kRunning;
++  hw_delay = 0;
++  callback = cb;
++  sio_start(hdl);
++  if (pthread_create(&thread, NULL, &ThreadEntry, this) != 0) {
++    LOG(ERROR) << "Failed to create real-time thread for recording.";
++    sio_stop(hdl);
++    state = kStopped;
++  }
++}
++
++void SndioAudioInputStream::Stop() {
++
++  if (state == kStopped)
++    return;
++
++  state = kStopWait;
++  pthread_join(thread, NULL);
++  sio_stop(hdl);
++  state = kStopped;
++
++  StopAgc();
++}
++
++void SndioAudioInputStream::Close() {
++
++  if (state == kClosed)
++    return;
++
++  if (state == kRunning)
++    Stop();
++
++  state = kClosed;
++  delete [] buffer;
++  sio_close(hdl);
++
++  manager->ReleaseInputStream(this);
++}
++
++double SndioAudioInputStream::GetMaxVolume() {
++  // Not supported
++  return 0.0;
++}
++
++void SndioAudioInputStream::SetVolume(double volume) {
++  // Not supported. Do nothing.
++}
++
++double SndioAudioInputStream::GetVolume() {
++  // Not supported.
++  return 0.0;
++}
++
++bool SndioAudioInputStream::IsMuted() {
++  // Not supported.
++  return false;
++}
++
++void SndioAudioInputStream::SetOutputDeviceForAec(
++    const std::string& output_device_id) {
++  // Not supported.
++}
++
++void SndioAudioInputStream::ThreadLoop(void) {
++  size_t todo, n;
++  char *data;
++  unsigned int nframes;
++  double normalized_volume = 0.0;
++
++  nframes = audio_bus->frames();
++
++  while (state == kRunning && !sio_eof(hdl)) {
++
++    GetAgcVolume(&normalized_volume);
++
++    // read one block
++    todo = nframes * params.GetBytesPerFrame(kSampleFormat);
++    data = buffer;
++    while (todo > 0) {
++      n = sio_read(hdl, data, todo);
++      if (n == 0)
++        return;	// unrecoverable I/O error
++      todo -= n;
++      data += n;
++    }
++    hw_delay -= nframes;
++
++    // convert frames count to TimeDelta
++    const base::TimeDelta delay = AudioTimestampHelper::FramesToTime(hw_delay,
++      params.sample_rate());
++
++    // push into bus
++    audio_bus->FromInterleaved<SignedInt16SampleTypeTraits>(reinterpret_cast<int16_t*>(buffer), nframes);
++
++    // invoke callback
++    callback->OnData(audio_bus.get(), base::TimeTicks::Now() - delay, 1.);
++  }
++}
++
++}  // namespace media
+--- /dev/null
++++ b/src/3rdparty/chromium/media/audio/sndio/sndio_input.h
+@@ -0,0 +1,91 @@
++// Copyright 2013 The Chromium Authors. All rights reserved.
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++#ifndef MEDIA_AUDIO_SNDIO_SNDIO_INPUT_H_
++#define MEDIA_AUDIO_SNDIO_SNDIO_INPUT_H_
++
++#include <stdint.h>
++#include <string>
++#include <sndio.h>
++
++#include "base/compiler_specific.h"
++#include "base/macros.h"
++#include "base/memory/weak_ptr.h"
++#include "base/time/time.h"
++#include "media/audio/agc_audio_stream.h"
++#include "media/audio/audio_io.h"
++#include "media/audio/audio_device_description.h"
++#include "media/base/audio_parameters.h"
++
++namespace media {
++
++class AudioManagerBase;
++
++// Implementation of AudioOutputStream using sndio(7)
++class SndioAudioInputStream : public AgcAudioStream<AudioInputStream> {
++ public:
++  // Pass this to the constructor if you want to attempt auto-selection
++  // of the audio recording device.
++  static const char kAutoSelectDevice[];
++
++  // Create a PCM Output stream for the SNDIO device identified by
++  // |device_name|. If unsure of what to use for |device_name|, use
++  // |kAutoSelectDevice|.
++  SndioAudioInputStream(AudioManagerBase* audio_manager,
++                     const std::string& device_name,
++                     const AudioParameters& params);
++
++  ~SndioAudioInputStream() override;
++
++  // Implementation of AudioInputStream.
++  bool Open() override;
++  void Start(AudioInputCallback* callback) override;
++  void Stop() override;
++  void Close() override;
++  double GetMaxVolume() override;
++  void SetVolume(double volume) override;
++  double GetVolume() override;
++  bool IsMuted() override;
++  void SetOutputDeviceForAec(const std::string& output_device_id) override;
++
++ private:
++
++  enum StreamState {
++    kClosed,            // Not opened yet
++    kStopped,           // Device opened, but not started yet
++    kRunning,           // Started, device playing
++    kStopWait           // Stopping, waiting for the real-time thread to exit
++  };
++
++  // C-style call-backs
++  static void OnMoveCallback(void *arg, int delta);
++  static void* ThreadEntry(void *arg);
++
++  // Continuously moves data from the device to the consumer
++  void ThreadLoop();
++  // Our creator, the audio manager needs to be notified when we close.
++  AudioManagerBase* manager;
++  // Parameters of the source
++  AudioParameters params;
++  // We store data here for consumer
++  std::unique_ptr<AudioBus> audio_bus;
++  // Call-back that consumes recorded data
++  AudioInputCallback* callback;  // Valid during a recording session.
++  // Handle of the audio device
++  struct sio_hdl* hdl;
++  // Current state of the stream
++  enum StreamState state;
++  // High priority thread running ThreadLoop()
++  pthread_t thread;
++  // Number of frames buffered in the hardware
++  int hw_delay;
++  // Temporary buffer where data is stored sndio-compatible format
++  char* buffer;
++
++  DISALLOW_COPY_AND_ASSIGN(SndioAudioInputStream);
++};
++
++}  // namespace media
++
++#endif  // MEDIA_AUDIO_SNDIO_SNDIO_INPUT_H_
+--- /dev/null
++++ b/src/3rdparty/chromium/media/audio/sndio/sndio_output.cc
+@@ -0,0 +1,183 @@
++// Copyright (c) 2012 The Chromium Authors. All rights reserved.
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++#include "base/logging.h"
++#include "base/time/time.h"
++#include "base/time/default_tick_clock.h"
++#include "media/audio/audio_manager_base.h"
++#include "media/base/audio_timestamp_helper.h"
++#include "media/audio/sndio/sndio_output.h"
++
++namespace media {
++
++static const SampleFormat kSampleFormat = kSampleFormatS16;
++
++void SndioAudioOutputStream::OnMoveCallback(void *arg, int delta) {
++  SndioAudioOutputStream* self = static_cast<SndioAudioOutputStream*>(arg);
++
++  self->hw_delay -= delta;
++}
++
++void SndioAudioOutputStream::OnVolCallback(void *arg, unsigned int vol) {
++  SndioAudioOutputStream* self = static_cast<SndioAudioOutputStream*>(arg);
++
++  self->vol = vol;
++}
++
++void *SndioAudioOutputStream::ThreadEntry(void *arg) {
++  SndioAudioOutputStream* self = static_cast<SndioAudioOutputStream*>(arg);
++
++  self->ThreadLoop();
++  return NULL;
++}
++
++SndioAudioOutputStream::SndioAudioOutputStream(const AudioParameters& params,
++                                               AudioManagerBase* manager)
++    : manager(manager),
++      params(params),
++      audio_bus(AudioBus::Create(params)),
++      state(kClosed),
++      mutex(PTHREAD_MUTEX_INITIALIZER) {
++}
++
++SndioAudioOutputStream::~SndioAudioOutputStream() {
++  if (state != kClosed)
++    Close();
++}
++
++bool SndioAudioOutputStream::Open() {
++  struct sio_par par;
++  int sig;
++
++  if (params.format() != AudioParameters::AUDIO_PCM_LINEAR &&
++      params.format() != AudioParameters::AUDIO_PCM_LOW_LATENCY) {
++    LOG(WARNING) << "Unsupported audio format.";
++    return false;
++  }
++  sio_initpar(&par);
++  par.rate = params.sample_rate();
++  par.pchan = params.channels();
++  par.bits = SampleFormatToBitsPerChannel(kSampleFormat);
++  par.bps = par.bits / 8;
++  par.sig = sig = par.bits != 8 ? 1 : 0;
++  par.le = SIO_LE_NATIVE;
++  par.appbufsz = params.frames_per_buffer();
++
++  hdl = sio_open(SIO_DEVANY, SIO_PLAY, 0);
++  if (hdl == NULL) {
++    LOG(ERROR) << "Couldn't open audio device.";
++    return false;
++  }
++  if (!sio_setpar(hdl, &par) || !sio_getpar(hdl, &par)) {
++    LOG(ERROR) << "Couldn't set audio parameters.";
++    goto bad_close;
++  }
++  if (par.rate  != (unsigned int)params.sample_rate() ||
++      par.pchan != (unsigned int)params.channels() ||
++      par.bits  != (unsigned int)SampleFormatToBitsPerChannel(kSampleFormat) ||
++      par.sig   != (unsigned int)sig ||
++      (par.bps > 1 && par.le != SIO_LE_NATIVE) ||
++      (par.bits != par.bps * 8)) {
++    LOG(ERROR) << "Unsupported audio parameters.";
++    goto bad_close;
++  }
++  state = kStopped;
++  volpending = 0;
++  vol = 0;
++  buffer = new char[audio_bus->frames() * params.GetBytesPerFrame(kSampleFormat)];
++  sio_onmove(hdl, &OnMoveCallback, this);
++  sio_onvol(hdl, &OnVolCallback, this);
++  return true;
++ bad_close:
++  sio_close(hdl);
++  return false;
++}
++
++void SndioAudioOutputStream::Close() {
++  if (state == kClosed)
++    return;
++  if (state == kRunning)
++    Stop();
++  state = kClosed;
++  delete [] buffer;
++  sio_close(hdl);
++  manager->ReleaseOutputStream(this);  // Calls the destructor
++}
++
++void SndioAudioOutputStream::Start(AudioSourceCallback* callback) {
++  state = kRunning;
++  hw_delay = 0;
++  source = callback;
++  sio_start(hdl);
++  if (pthread_create(&thread, NULL, &ThreadEntry, this) != 0) {
++    LOG(ERROR) << "Failed to create real-time thread.";
++    sio_stop(hdl);
++    state = kStopped;
++  }
++}
++
++void SndioAudioOutputStream::Stop() {
++  if (state == kStopped)
++    return;
++  state = kStopWait;
++  pthread_join(thread, NULL);
++  sio_stop(hdl);
++  state = kStopped;
++}
++
++void SndioAudioOutputStream::SetVolume(double v) {
++  pthread_mutex_lock(&mutex);
++  vol = v * SIO_MAXVOL;
++  volpending = 1;
++  pthread_mutex_unlock(&mutex);
++}
++
++void SndioAudioOutputStream::GetVolume(double* v) {
++  pthread_mutex_lock(&mutex);
++  *v = vol * (1. / SIO_MAXVOL);
++  pthread_mutex_unlock(&mutex);
++}
++
++// This stream is always used with sub second buffer sizes, where it's
++// sufficient to simply always flush upon Start().
++void SndioAudioOutputStream::Flush() {}
++
++void SndioAudioOutputStream::ThreadLoop(void) {
++  int avail, count, result;
++
++  while (state == kRunning) {
++    // Update volume if needed
++    pthread_mutex_lock(&mutex);
++    if (volpending) {
++      volpending = 0;
++      sio_setvol(hdl, vol);
++    }
++    pthread_mutex_unlock(&mutex);
++
++    // Get data to play
++    const base::TimeDelta delay = AudioTimestampHelper::FramesToTime(hw_delay,
++	params.sample_rate());
++    count = source->OnMoreData(delay, base::TimeTicks::Now(), 0, audio_bus.get());
++    audio_bus->ToInterleaved<SignedInt16SampleTypeTraits>(count, reinterpret_cast<int16_t*>(buffer));
++    if (count == 0) {
++      // We have to submit something to the device
++      count = audio_bus->frames();
++      memset(buffer, 0, count * params.GetBytesPerFrame(kSampleFormat));
++      LOG(WARNING) << "No data to play, running empty cycle.";
++    }
++
++    // Submit data to the device
++    avail = count * params.GetBytesPerFrame(kSampleFormat);
++    result = sio_write(hdl, buffer, avail);
++    if (result == 0) {
++      LOG(WARNING) << "Audio device disconnected.";
++      break;
++    }
++
++    // Update hardware pointer
++    hw_delay += count;
++  }
++}
++
++}  // namespace media
+--- /dev/null
++++ b/src/3rdparty/chromium/media/audio/sndio/sndio_output.h
+@@ -0,0 +1,86 @@
++// Copyright (c) 2012 The Chromium Authors. All rights reserved.
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++#ifndef MEDIA_AUDIO_SNDIO_SNDIO_OUTPUT_H_
++#define MEDIA_AUDIO_SNDIO_SNDIO_OUTPUT_H_
++
++#include <pthread.h>
++#include <sndio.h>
++
++#include "base/time/tick_clock.h"
++#include "base/time/time.h"
++#include "media/audio/audio_io.h"
++
++namespace media {
++
++class AudioManagerBase;
++
++// Implementation of AudioOutputStream using sndio(7)
++class SndioAudioOutputStream : public AudioOutputStream {
++ public:
++  // The manager is creating this object
++  SndioAudioOutputStream(const AudioParameters& params,
++                         AudioManagerBase* manager);
++  virtual ~SndioAudioOutputStream();
++
++  // Implementation of AudioOutputStream.
++  bool Open() override;
++  void Close() override;
++  void Start(AudioSourceCallback* callback) override;
++  void Stop() override;
++  void SetVolume(double volume) override;
++  void GetVolume(double* volume) override;
++  void Flush() override;
++
++  friend void sndio_onmove(void *arg, int delta);
++  friend void sndio_onvol(void *arg, unsigned int vol);
++  friend void *sndio_threadstart(void *arg);
++
++ private:
++  enum StreamState {
++    kClosed,            // Not opened yet
++    kStopped,           // Device opened, but not started yet
++    kRunning,           // Started, device playing
++    kStopWait           // Stopping, waiting for the real-time thread to exit
++  };
++
++  // C-style call-backs
++  static void OnMoveCallback(void *arg, int delta);
++  static void OnVolCallback(void *arg, unsigned int vol);
++  static void* ThreadEntry(void *arg);
++
++  // Continuously moves data from the producer to the device
++  void ThreadLoop(void);
++
++  // Our creator, the audio manager needs to be notified when we close.
++  AudioManagerBase* manager;
++  // Parameters of the source
++  AudioParameters params;
++  // Source stores data here
++  std::unique_ptr<AudioBus> audio_bus;
++  // Call-back that produces data to play
++  AudioSourceCallback* source;
++  // Handle of the audio device
++  struct sio_hdl* hdl;
++  // Current state of the stream
++  enum StreamState state;
++  // High priority thread running ThreadLoop()
++  pthread_t thread;
++  // Protects vol, volpending and hw_delay
++  pthread_mutex_t mutex;
++  // Current volume in the 0..SIO_MAXVOL range
++  int vol;
++  // Set to 1 if volumes must be refreshed in the realtime thread
++  int volpending;
++  // Number of frames buffered in the hardware
++  int hw_delay;
++  // Temporary buffer where data is stored sndio-compatible format
++  char* buffer;
++
++  DISALLOW_COPY_AND_ASSIGN(SndioAudioOutputStream);
++};
++
++}  // namespace media
++
++#endif  // MEDIA_AUDIO_SNDIO_SNDIO_OUTPUT_H_
+--- a/src/3rdparty/chromium/media/media_options.gni
++++ b/src/3rdparty/chromium/media/media_options.gni
+@@ -121,6 +121,9 @@ declare_args() {
+   # Enables runtime selection of ALSA library for audio.
+   use_alsa = false
+ 
++  # Enable runtime selection of sndio(7)
++  use_sndio = false
++
+   # Alsa should be used on non-Android, non-Mac POSIX systems.
+   # Alsa should be used on desktop Chromecast and audio-only Chromecast builds.
+   if (is_posix && !is_android && !is_mac &&
diff --git a/srcpkgs/qt6-webengine/patches/0700-armv7l-neon.patch b/srcpkgs/qt6-webengine/patches/0700-armv7l-neon.patch
new file mode 100644
index 000000000000..d42fa19a07a1
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0700-armv7l-neon.patch
@@ -0,0 +1,10 @@
+--- a/src/3rdparty/chromium/skia/BUILD.gn
++++ b/src/3rdparty/chromium/skia/BUILD.gn
+@@ -800,7 +800,6 @@ skia_source_set("skia_opts") {
+         # Root build config sets -mfpu=$arm_fpu, which we expect to be neon
+         # when running this.
+         if (!arm_use_neon) {
+-          configs -= [ "//build/config/compiler:compiler_arm_fpu" ]
+           cflags += [ "-mfpu=neon" ]
+         }
+       }
diff --git a/srcpkgs/qt6-webengine/patches/0750-chromium-musl-arm-user_vfp.patch b/srcpkgs/qt6-webengine/patches/0750-chromium-musl-arm-user_vfp.patch
new file mode 100644
index 000000000000..6e2d62f35ee6
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0750-chromium-musl-arm-user_vfp.patch
@@ -0,0 +1,20 @@
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/util/linux/thread_info.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/util/linux/thread_info.h
+@@ -17,6 +17,17 @@
+ 
+ #include <stdint.h>
+ #include <sys/user.h>
++#if !defined(__GLIBC__)
++struct user_vfp {
++	unsigned long long fpregs[32];
++	unsigned long fpscr;
++};
++struct user_vfp_exc {
++	unsigned long fpexc;
++	unsigned long fpinst;
++	unsigned long fpinst2;
++};
++#endif /* !defined(__GLIBC__) */
+ 
+ #include <type_traits>
+ 
diff --git a/srcpkgs/qt6-webengine/patches/0751-chromium-musl-arm-elf_auxv_t.patch b/srcpkgs/qt6-webengine/patches/0751-chromium-musl-arm-elf_auxv_t.patch
new file mode 100644
index 000000000000..7112c8cfd3fa
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0751-chromium-musl-arm-elf_auxv_t.patch
@@ -0,0 +1,18 @@
+--- a/src/3rdparty/chromium/v8/src/base/cpu.cc
++++ b/src/3rdparty/chromium/v8/src/base/cpu.cc
+@@ -163,6 +163,15 @@ static V8_INLINE void __cpuid(int cpu_in
+ 
+ #if V8_HOST_ARCH_ARM || V8_HOST_ARCH_ARM64
+ 
++#ifndef __GLIBC__
++#include <elf.h>
++#ifdef __LP64__
++typedef Elf64_auxv_t elf_auxv_t;
++#else
++typedef Elf32_auxv_t elf_auxv_t;
++#endif
++#endif
++
+ static uint32_t ReadELFHWCaps() {
+   uint32_t result = 0;
+ #if V8_GLIBC_PREREQ(2, 16)
diff --git a/srcpkgs/qt6-webengine/patches/0801-chromium-i686-vaapi-fpermissive.patch b/srcpkgs/qt6-webengine/patches/0801-chromium-i686-vaapi-fpermissive.patch
new file mode 100644
index 000000000000..3d4043e03b89
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0801-chromium-i686-vaapi-fpermissive.patch
@@ -0,0 +1,24 @@
+--- a/src/3rdparty/chromium/media/gpu/vaapi/BUILD.gn
++++ b/src/3rdparty/chromium/media/gpu/vaapi/BUILD.gn
+@@ -14,6 +14,10 @@ import("//ui/gl/features.gni")
+ assert(is_linux || is_chromeos)
+ assert(use_vaapi)
+ 
++config("vaapi_permissive") {
++  cflags = [ "-fpermissive" ]
++}
++
+ generate_stubs("libva_stubs") {
+   extra_header = "va_stub_header.fragment"
+   sigs = [ "va.sigs" ]
+@@ -136,6 +140,10 @@ source_set("vaapi") {
+     ]
+   }
+ 
++  if (target_cpu == "x86") {
++    configs += [ ":vaapi_permissive" ]
++  }
++
+   if (use_x11) {
+     deps += [ "//ui/gfx/x" ]
+     sources += [
diff --git a/srcpkgs/qt6-webengine/patches/0900-xxx-ppc64le-libvpx.patch b/srcpkgs/qt6-webengine/patches/0900-xxx-ppc64le-libvpx.patch
new file mode 100644
index 000000000000..5c9566b56bd4
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0900-xxx-ppc64le-libvpx.patch
@@ -0,0 +1,65 @@
+Uses generic target for now. To use ppc64le, change --target to ppc64le-gnu
+and add --enable-vsx, and change generic to ppc for the rtcd header.
+
+From 18e6c5c55cfae0cfb458d8210d7bc709360a0e90 Mon Sep 17 00:00:00 2001
+From: q66 <daniel@octaforge.org>
+Date: Wed, 9 Sep 2020 19:08:25 +0200
+Subject: [PATCH] enable generation of ppc64 libvpx bits
+
+this doesn't update the gni file, that's done from
+the template by running the appropriate scripts
+---
+ third_party/libvpx/BUILD.gn        | 4 ++++
+ third_party/libvpx/generate_gni.sh | 9 +++++++++
+ 2 files changed, 13 insertions(+)
+
+--- a/src/3rdparty/chromium/third_party/libvpx/BUILD.gn
++++ b/src/3rdparty/chromium/third_party/libvpx/BUILD.gn
+@@ -424,6 +424,8 @@ static_library("bundled_libvpx") {
+       sources = libvpx_srcs_arm64
+       public_deps = [ ":libvpx_arm64_headers" ]
+     }
++  } else if (current_cpu == "ppc64") {
++    sources = libvpx_srcs_ppc64
+   }
+ 
+   configs -= [ "//build/config/compiler:chromium_code" ]
+--- a/src/3rdparty/chromium/third_party/libvpx/generate_gni.sh
++++ b/src/3rdparty/chromium/third_party/libvpx/generate_gni.sh
+@@ -374,6 +374,7 @@ gen_config_files linux/arm-neon-highbd "
+ gen_config_files linux/arm64-highbd "--target=armv8-linux-gcc ${all_platforms} ${HIGHBD}"
+ gen_config_files linux/mipsel "--target=mips32-linux-gcc ${all_platforms}"
+ gen_config_files linux/mips64el "--target=mips64-linux-gcc ${all_platforms}"
++gen_config_files linux/ppc64 "--target=generic-gnu $HIGHBD ${all_platforms}"
+ gen_config_files linux/generic "--target=generic-gnu $HIGHBD ${all_platforms}"
+ gen_config_files win/arm64 "--target=arm64-win64-vs15 ${all_platforms} ${HIGHBD}"
+ gen_config_files win/ia32 "--target=x86-win32-vs14 ${all_platforms} ${x86_platforms}"
+@@ -399,6 +400,7 @@ lint_config linux/arm-neon-highbd
+ lint_config linux/arm64-highbd
+ lint_config linux/mipsel
+ lint_config linux/mips64el
++lint_config linux/ppc64
+ lint_config linux/generic
+ lint_config win/arm64
+ lint_config win/ia32
+@@ -428,6 +430,7 @@ gen_rtcd_header linux/arm-neon-highbd ar
+ gen_rtcd_header linux/arm64-highbd armv8
+ gen_rtcd_header linux/mipsel mipsel
+ gen_rtcd_header linux/mips64el mips64el
++gen_rtcd_header linux/ppc64 generic
+ gen_rtcd_header linux/generic generic
+ gen_rtcd_header win/arm64 armv8
+ gen_rtcd_header win/ia32 x86 "${require_sse2}"
+@@ -513,6 +516,12 @@ if [ -z $ONLY_CONFIGS ]; then
+ 
+   echo "MIPS64 source list is identical to MIPS source list. No need to generate it."
+ 
++  echo "Generate ppc64 source list."
++  config=$(print_config_basic linux/ppc64)
++  make_clean
++  make libvpx_srcs.txt target=libs $config > /dev/null
++  convert_srcs_to_project_files libvpx_srcs.txt libvpx_srcs_ppc64
++
+   echo "Generate NaCl source list."
+   config=$(print_config_basic nacl)
+   make_clean
diff --git a/srcpkgs/qt6-webengine/patches/0901-xxx-ppc64le-sandbox-linux-stat.patch b/srcpkgs/qt6-webengine/patches/0901-xxx-ppc64le-sandbox-linux-stat.patch
new file mode 100644
index 000000000000..4b8e6320601c
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0901-xxx-ppc64le-sandbox-linux-stat.patch
@@ -0,0 +1,31 @@
+--- a/src/3rdparty/chromium/sandbox/linux/system_headers/linux_stat.h
++++ b/src/3rdparty/chromium/sandbox/linux/system_headers/linux_stat.h
+@@ -155,6 +155,28 @@ struct kernel_stat {
+   unsigned int __unused4;
+   unsigned int __unused5;
+ };
++#elif defined(__powerpc64__)
++struct kernel_stat {
++  unsigned long	st_dev;
++  unsigned long	st_ino;
++  unsigned long	st_nlink;
++  unsigned int	st_mode;
++  unsigned int	st_uid;
++  unsigned int	st_gid;
++  unsigned long	st_rdev;
++  long		st_size;
++  unsigned long	st_blksize;
++  unsigned long	st_blocks;
++  unsigned long	st_atime_;
++  unsigned long	st_atime_nsec_;
++  unsigned long	st_mtime_;
++  unsigned long	st_mtime_nsec_;
++  unsigned long	st_ctime_;
++  unsigned long	st_ctime_nsec_;
++  unsigned long	__unused4;
++  unsigned long	__unused5;
++  unsigned long	__unused6;
++};
+ #endif
+ 
+ #if !defined(AT_EMPTY_PATH)
diff --git a/srcpkgs/qt6-webengine/patches/0902-xxx-ppc64le-support.patch b/srcpkgs/qt6-webengine/patches/0902-xxx-ppc64le-support.patch
new file mode 100644
index 000000000000..60503c22e36b
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0902-xxx-ppc64le-support.patch
@@ -0,0 +1,3559 @@
+commit 2c013a317b1114ef67cdbbc30824b28907b9ea94
+Author: Daniel Kolesa <daniel@octaforge.org>
+Date:   Wed Mar 3 19:08:29 2021 +0100
+
+    ppc64le support
+
+--- a/src/3rdparty/chromium/sandbox/features.gni
++++ b/src/3rdparty/chromium/sandbox/features.gni
+@@ -11,7 +11,8 @@ import("//build/config/nacl/config.gni")
+ use_seccomp_bpf = (is_linux || is_chromeos || is_android) &&
+                   (current_cpu == "x86" || current_cpu == "x64" ||
+                    current_cpu == "arm" || current_cpu == "arm64" ||
+-                   current_cpu == "mipsel" || current_cpu == "mips64el")
++                   current_cpu == "mipsel" || current_cpu == "mips64el" ||
++                   current_cpu == "ppc64")
+ 
+ use_seccomp_bpf = use_seccomp_bpf || is_nacl_nonsfi
+ 
+--- a/src/3rdparty/chromium/sandbox/linux/BUILD.gn
++++ b/src/3rdparty/chromium/sandbox/linux/BUILD.gn
+@@ -433,6 +433,8 @@ component("sandbox_services") {
+ 
+ source_set("sandbox_services_headers") {
+   sources = [
++    "system_headers/ppc64_linux_syscalls.h",
++    "system_headers/ppc64_linux_ucontext.h",
+     "system_headers/arm64_linux_syscalls.h",
+     "system_headers/arm_linux_syscalls.h",
+     "system_headers/arm_linux_ucontext.h",
+--- a/src/3rdparty/chromium/sandbox/linux/bpf_dsl/linux_syscall_ranges.h
++++ b/src/3rdparty/chromium/sandbox/linux/bpf_dsl/linux_syscall_ranges.h
+@@ -56,6 +56,13 @@
+ #define MAX_PUBLIC_SYSCALL __NR_syscalls
+ #define MAX_SYSCALL MAX_PUBLIC_SYSCALL
+ 
++#elif defined(__powerpc64__)
++
++#include <asm/unistd.h>
++#define MIN_SYSCALL 0u
++#define MAX_PUBLIC_SYSCALL 386u
++#define MAX_SYSCALL MAX_PUBLIC_SYSCALL
++
+ #else
+ #error "Unsupported architecture"
+ #endif
+--- a/src/3rdparty/chromium/sandbox/linux/bpf_dsl/seccomp_macros.h
++++ b/src/3rdparty/chromium/sandbox/linux/bpf_dsl/seccomp_macros.h
+@@ -16,6 +16,9 @@
+ #if defined(__mips__)
+ // sys/user.h in eglibc misses size_t definition
+ #include <stddef.h>
++#elif defined(__powerpc64__) && defined(__GLIBC__)
++// Manually define greg_t on ppc64
++typedef unsigned long long greg_t;
+ #endif
+ #endif
+ 
+@@ -346,6 +349,59 @@ struct regs_struct {
+ #define SECCOMP_PT_PARM4(_regs) (_regs).regs[3]
+ #define SECCOMP_PT_PARM5(_regs) (_regs).regs[4]
+ #define SECCOMP_PT_PARM6(_regs) (_regs).regs[5]
++
++#elif defined(__powerpc64__)
++#include <asm/ptrace.h>
++
++typedef struct pt_regs regs_struct;
++
++#ifdef ARCH_CPU_LITTLE_ENDIAN
++#define SECCOMP_ARCH AUDIT_ARCH_PPC64LE
++#else
++#define SECCOMP_ARCH AUDIT_ARCH_PPC64
++#endif
++
++#ifdef __GLIBC__
++#define SECCOMP_REG(_ctx, _reg) ((_ctx)->uc_mcontext.regs->gpr[_reg])
++#else
++#define SECCOMP_REG(_ctx, _reg) (((struct pt_regs *)(_ctx)->uc_mcontext.regs)->gpr[_reg])
++#endif
++
++#define SECCOMP_RESULT(_ctx) SECCOMP_REG(_ctx, 3)
++#define SECCOMP_SYSCALL(_ctx) SECCOMP_REG(_ctx, 0)
++#ifdef __GLIBC__
++#define SECCOMP_IP(_ctx) (_ctx)->uc_mcontext.regs->nip
++#else
++#define SECCOMP_IP(_ctx) ((struct pt_regs *)(_ctx)->uc_mcontext.regs)->nip
++#endif
++#define SECCOMP_PARM1(_ctx) SECCOMP_REG(_ctx, 3)
++#define SECCOMP_PARM2(_ctx) SECCOMP_REG(_ctx, 4)
++#define SECCOMP_PARM3(_ctx) SECCOMP_REG(_ctx, 5)
++#define SECCOMP_PARM4(_ctx) SECCOMP_REG(_ctx, 6)
++#define SECCOMP_PARM5(_ctx) SECCOMP_REG(_ctx, 7)
++#define SECCOMP_PARM6(_ctx) SECCOMP_REG(_ctx, 8)
++
++#define SECCOMP_NR_IDX (offsetof(struct arch_seccomp_data, nr))
++#define SECCOMP_ARCH_IDX (offsetof(struct arch_seccomp_data, arch))
++#define SECCOMP_IP_MSB_IDX \
++  (offsetof(struct arch_seccomp_data, instruction_pointer) + 4)
++#define SECCOMP_IP_LSB_IDX \
++  (offsetof(struct arch_seccomp_data, instruction_pointer) + 0)
++#define SECCOMP_ARG_MSB_IDX(nr) \
++  (offsetof(struct arch_seccomp_data, args) + 8 * (nr) + 4)
++#define SECCOMP_ARG_LSB_IDX(nr) \
++  (offsetof(struct arch_seccomp_data, args) + 8 * (nr) + 0)
++
++#define SECCOMP_PT_RESULT(_regs) (_regs).gpr[3]
++#define SECCOMP_PT_SYSCALL(_regs) (_regs).gpr[0]
++#define SECCOMP_PT_IP(_regs) (_regs).nip
++#define SECCOMP_PT_PARM1(_regs) (_regs).gpr[3]
++#define SECCOMP_PT_PARM2(_regs) (_regs).gpr[4]
++#define SECCOMP_PT_PARM3(_regs) (_regs).gpr[5]
++#define SECCOMP_PT_PARM4(_regs) (_regs).gpr[6]
++#define SECCOMP_PT_PARM5(_regs) (_regs).gpr[7]
++#define SECCOMP_PT_PARM6(_regs) (_regs).gpr[8]
++
+ #else
+ #error Unsupported target platform
+ 
+--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc
++++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc
+@@ -91,7 +91,8 @@ bool IsBaselinePolicyWatched(int sysno)
+          SyscallSets::IsPrctl(sysno) ||
+          SyscallSets::IsProcessGroupOrSession(sysno) ||
+ #if defined(__i386__) || \
+-    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
++    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
++    defined(__powerpc64__)
+          SyscallSets::IsSocketCall(sysno) ||
+ #endif
+ #if defined(__arm__)
+@@ -258,7 +259,7 @@ ResultExpr EvaluateSyscallImpl(int fs_de
+   }
+ 
+ #if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
+-    defined(__aarch64__)
++    defined(__aarch64__) || defined(__powerpc64__)
+   if (sysno == __NR_mmap)
+     return RestrictMmapFlags();
+ #endif
+@@ -279,7 +280,7 @@ ResultExpr EvaluateSyscallImpl(int fs_de
+     return RestrictPrctl();
+ 
+ #if defined(__x86_64__) || defined(__arm__) || defined(__mips__) || \
+-    defined(__aarch64__)
++    defined(__aarch64__) || defined(__powerpc64__)
+   if (sysno == __NR_socketpair) {
+     // Only allow AF_UNIX, PF_UNIX. Crash if anything else is seen.
+     static_assert(AF_UNIX == PF_UNIX,
+@@ -343,7 +344,8 @@ ResultExpr EvaluateSyscallImpl(int fs_de
+   }
+ 
+ #if defined(__i386__) || \
+-    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
++    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
++    defined(__powerpc64__)
+   if (SyscallSets::IsSocketCall(sysno))
+     return RestrictSocketcallCommand();
+ #endif
+--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/baseline_policy_unittest.cc
++++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/baseline_policy_unittest.cc
+@@ -317,7 +317,7 @@ TEST_BASELINE_SIGSYS(__NR_sysinfo)
+ TEST_BASELINE_SIGSYS(__NR_syslog)
+ TEST_BASELINE_SIGSYS(__NR_timer_create)
+ 
+-#if !defined(__aarch64__)
++#if !defined(__aarch64__) && !defined(__powerpc64__)
+ TEST_BASELINE_SIGSYS(__NR_inotify_init)
+ TEST_BASELINE_SIGSYS(__NR_vserver)
+ #endif
+--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc
++++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc
+@@ -40,7 +40,8 @@
+ #include <sys/ptrace.h>
+ #if (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) && \
+     !defined(__arm__) && !defined(__aarch64__) &&           \
+-    !defined(PTRACE_GET_THREAD_AREA)
++    !defined(PTRACE_GET_THREAD_AREA) &&			    \
++    !defined(__powerpc64__)
+ // Also include asm/ptrace-abi.h since ptrace.h in older libc (for instance
+ // the one in Ubuntu 16.04 LTS) is missing PTRACE_GET_THREAD_AREA.
+ // asm/ptrace-abi.h doesn't exist on arm32 and PTRACE_GET_THREAD_AREA isn't
+@@ -49,6 +50,11 @@
+ #endif
+ #endif  // !OS_NACL_NONSFI
+ 
++// On PPC64, TCGETS is defined in terms of struct termios, so we must include termios.h
++#ifdef __powerpc64__
++#include <termios.h>
++#endif
++
+ #if defined(OS_ANDROID)
+ 
+ #if !defined(F_DUPFD_CLOEXEC)
+@@ -106,6 +112,14 @@ inline bool IsArchitectureMips() {
+ #endif
+ }
+ 
++inline bool IsArchitecturePPC64() {
++#if defined(__powerpc64__)
++  return true;
++#else
++  return false;
++#endif
++}
++
+ // Ubuntu's version of glibc has a race condition in sem_post that can cause
+ // it to call futex(2) with bogus op arguments. To workaround this, we need
+ // to allow those futex(2) calls to fail with EINVAL, instead of crashing the
+@@ -270,6 +284,8 @@ ResultExpr RestrictFcntlCommands() {
+   uint64_t kOLargeFileFlag = O_LARGEFILE;
+   if (IsArchitectureX86_64() || IsArchitectureI386() || IsArchitectureMips())
+     kOLargeFileFlag = 0100000;
++  else if (IsArchitecturePPC64())
++    kOLargeFileFlag = 0200000;
+ 
+   const Arg<int> cmd(1);
+   const Arg<long> long_arg(2);
+@@ -287,7 +303,16 @@ ResultExpr RestrictFcntlCommands() {
+               F_SETLKW,
+               F_GETLK,
+               F_DUPFD,
+-              F_DUPFD_CLOEXEC),
++              F_DUPFD_CLOEXEC
++#if defined(__powerpc64__)
++// On PPC64, F_SETLK, F_GETLK, F_SETLKW are defined as the 64-bit variants
++// but glibc will sometimes still use the 32-bit versions. Allow both.
++              ,
++              5, /* F_GETLK (32) */
++              6, /* F_SETLK (32) */
++              7  /* F_SETLKW (32) */
++#endif
++	     ),
+              Allow())
+       .Case(F_SETFL,
+             If((long_arg & ~kAllowedMask) == 0, Allow()).Else(CrashSIGSYS()))
+@@ -297,7 +322,7 @@ ResultExpr RestrictFcntlCommands() {
+   // clang-format on
+ }
+ 
+-#if defined(__i386__) || defined(__mips__)
++#if defined(__i386__) || defined(__mips__) || defined(__powerpc64__)
+ ResultExpr RestrictSocketcallCommand() {
+   // Unfortunately, we are unable to restrict the first parameter to
+   // socketpair(2). Whilst initially sounding bad, it's noteworthy that very
+@@ -454,7 +479,7 @@ ResultExpr RestrictPtrace() {
+ #endif
+   return Switch(request)
+       .CASES((
+-#if !defined(__aarch64__)
++#if !defined(__aarch64__) && !defined(__powerpc64__)
+                  PTRACE_GETREGS, PTRACE_GETFPREGS,
+ #if defined(TRACE_GET_THREAD_AREA)
+                  PTRACE_GET_THREAD_AREA,
+--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.h
++++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.h
+@@ -49,7 +49,7 @@ SANDBOX_EXPORT bpf_dsl::ResultExpr Restr
+ // O_NONBLOCK | O_SYNC | O_LARGEFILE | O_CLOEXEC | O_NOATIME.
+ SANDBOX_EXPORT bpf_dsl::ResultExpr RestrictFcntlCommands();
+ 
+-#if defined(__i386__) || defined(__mips__)
++#if defined(__i386__) || defined(__mips__) || defined(__powerpc64__)
+ // Restrict socketcall(2) to only allow socketpair(2), send(2), recv(2),
+ // sendto(2), recvfrom(2), shutdown(2), sendmsg(2) and recvmsg(2).
+ SANDBOX_EXPORT bpf_dsl::ResultExpr RestrictSocketcallCommand();
+--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
++++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
+@@ -28,7 +28,7 @@ bool SyscallSets::IsKill(int sysno) {
+ bool SyscallSets::IsAllowedGettime(int sysno) {
+   switch (sysno) {
+     case __NR_gettimeofday:
+-#if defined(__i386__) || defined(__x86_64__) || \
++#if defined(__i386__) || defined(__x86_64__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_time:
+ #endif
+@@ -51,12 +51,12 @@ bool SyscallSets::IsAllowedGettime(int s
+                                     // filtered by RestrictClockID().
+     case __NR_clock_nanosleep_time64:  // Parameters filtered by RestrictClockID().
+ #endif
+-#if defined(__i386__) || \
++#if defined(__i386__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_ftime:  // Obsolete.
+ #endif
+     case __NR_settimeofday:  // Privileged.
+-#if defined(__i386__) || \
++#if defined(__i386__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_stime:
+ #endif
+@@ -135,7 +135,7 @@ bool SyscallSets::IsFileSystem(int sysno
+     case __NR_faccessat:  // EPERM not a valid errno.
+     case __NR_fchmodat:
+     case __NR_fchownat:  // Should be called chownat ?
+-#if defined(__x86_64__) || defined(__aarch64__)
++#if defined(__x86_64__) || defined(__aarch64__) || defined(__powerpc64__)
+     case __NR_newfstatat:  // fstatat(). EPERM not a valid errno.
+ #elif defined(__i386__) || defined(__arm__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+@@ -154,7 +154,7 @@ bool SyscallSets::IsFileSystem(int sysno
+     case __NR_memfd_create:
+     case __NR_mkdirat:
+     case __NR_mknodat:
+-#if defined(__i386__)
++#if defined(__i386__) || defined(__powerpc64__)
+     case __NR_oldlstat:
+     case __NR_oldstat:
+ #endif
+@@ -167,7 +167,7 @@ bool SyscallSets::IsFileSystem(int sysno
+     case __NR_stat64:
+ #endif
+     case __NR_statfs:  // EPERM not a valid errno.
+-#if defined(__i386__) || defined(__arm__) || \
++#if defined(__i386__) || defined(__arm__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_statfs64:
+ #endif
+@@ -179,7 +179,8 @@ bool SyscallSets::IsFileSystem(int sysno
+     case __NR_truncate64:
+ #endif
+     case __NR_unlinkat:
+-#if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
++#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
++    defined(__powerpc64__)
+     case __NR_utime:
+ #endif
+     case __NR_utimensat:  // New.
+@@ -204,7 +205,8 @@ bool SyscallSets::IsAllowedFileSystemAcc
+ #endif
+       return true;
+ // TODO(jln): these should be denied gracefully as well (moved below).
+-#if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
++#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
++    defined(__powerpc64__)
+     case __NR_fadvise64:  // EPERM not a valid errno.
+ #endif
+ #if defined(__i386__)
+@@ -216,12 +218,12 @@ bool SyscallSets::IsAllowedFileSystemAcc
+     case __NR_fdatasync:  // EPERM not a valid errno.
+     case __NR_flock:      // EPERM not a valid errno.
+     case __NR_fstatfs:    // Give information about the whole filesystem.
+-#if defined(__i386__) || defined(__arm__) || \
++#if defined(__i386__) || defined(__arm__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_fstatfs64:
+ #endif
+     case __NR_fsync:  // EPERM not a valid errno.
+-#if defined(__i386__)
++#if defined(__i386__) || defined(__powerpc64__)
+     case __NR_oldfstat:
+ #endif
+ #if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
+@@ -229,6 +231,8 @@ bool SyscallSets::IsAllowedFileSystemAcc
+     case __NR_sync_file_range:  // EPERM not a valid errno.
+ #elif defined(__arm__)
+     case __NR_arm_sync_file_range:  // EPERM not a valid errno.
++#elif defined(__powerpc64__)
++    case __NR_sync_file_range2: // EPERM not a valid errno.
+ #endif
+     default:
+       return false;
+@@ -248,7 +252,7 @@ bool SyscallSets::IsDeniedFileSystemAcce
+     case __NR_getdents:    // EPERM not a valid errno.
+ #endif
+     case __NR_getdents64:  // EPERM not a valid errno.
+-#if defined(__i386__) || \
++#if defined(__i386__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_readdir:
+ #endif
+@@ -290,7 +294,7 @@ bool SyscallSets::IsGetSimpleId(int sysn
+ bool SyscallSets::IsProcessPrivilegeChange(int sysno) {
+   switch (sysno) {
+     case __NR_capset:
+-#if defined(__i386__) || defined(__x86_64__)
++#if defined(__i386__) || defined(__x86_64__) || defined(__powerpc64__)
+     case __NR_ioperm:  // Intel privilege.
+     case __NR_iopl:    // Intel privilege.
+ #endif
+@@ -340,7 +344,7 @@ bool SyscallSets::IsAllowedSignalHandlin
+     case __NR_rt_sigprocmask:
+     case __NR_rt_sigreturn:
+     case __NR_rt_sigtimedwait:
+-#if defined(__i386__) || defined(__arm__) || \
++#if defined(__i386__) || defined(__arm__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_rt_sigtimedwait_time64:
+     case __NR_sigaction:
+@@ -357,7 +361,7 @@ bool SyscallSets::IsAllowedSignalHandlin
+     case __NR_signalfd:
+ #endif
+     case __NR_signalfd4:
+-#if defined(__i386__) || defined(__arm__) || \
++#if defined(__i386__) || defined(__arm__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_sigpending:
+     case __NR_sigsuspend:
+@@ -382,7 +386,7 @@ bool SyscallSets::IsAllowedOperationOnFd
+ #endif
+     case __NR_dup3:
+ #if defined(__x86_64__) || defined(__arm__) || defined(__mips__) || \
+-    defined(__aarch64__)
++    defined(__aarch64__) || defined(__powerpc64__)
+     case __NR_shutdown:
+ #endif
+       return true;
+@@ -416,7 +420,7 @@ bool SyscallSets::IsAllowedProcessStartO
+     case __NR_membarrier:
+     case __NR_wait4:
+     case __NR_waitid:
+-#if defined(__i386__)
++#if defined(__i386__) || defined(__powerpc64__)
+     case __NR_waitpid:
+ #endif
+ #if !defined(__GLIBC__)
+@@ -438,7 +442,7 @@ bool SyscallSets::IsAllowedProcessStartO
+     case __NR_set_tid_address:
+ #endif
+     case __NR_unshare:
+-#if !defined(__mips__) && !defined(__aarch64__)
++#if !defined(__mips__) && !defined(__aarch64__) || defined(__powerpc64__)
+     case __NR_vfork:
+ #endif
+     default:
+@@ -491,7 +495,7 @@ bool SyscallSets::IsAllowedGetOrModifySo
+       return true;
+     default:
+ #if defined(__x86_64__) || defined(__arm__) || defined(__mips__) || \
+-    defined(__aarch64__)
++    defined(__aarch64__) || defined(__powerpc64__)
+     case __NR_socketpair:  // We will want to inspect its argument.
+ #endif
+       return false;
+@@ -501,7 +505,7 @@ bool SyscallSets::IsAllowedGetOrModifySo
+ bool SyscallSets::IsDeniedGetOrModifySocket(int sysno) {
+   switch (sysno) {
+ #if defined(__x86_64__) || defined(__arm__) || defined(__mips__) || \
+-    defined(__aarch64__)
++    defined(__aarch64__) || defined(__powerpc64__)
+     case __NR_accept:
+     case __NR_accept4:
+     case __NR_bind:
+@@ -515,7 +519,7 @@ bool SyscallSets::IsDeniedGetOrModifySoc
+   }
+ }
+ 
+-#if defined(__i386__) || \
++#if defined(__i386__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+ // Big multiplexing system call for sockets.
+ bool SyscallSets::IsSocketCall(int sysno) {
+@@ -530,7 +534,8 @@ bool SyscallSets::IsSocketCall(int sysno
+ }
+ #endif
+ 
+-#if defined(__x86_64__) || defined(__arm__) || defined(__mips__)
++#if defined(__x86_64__) || defined(__arm__) || defined(__mips__) || \
++    defined(__powerpc64__)
+ bool SyscallSets::IsNetworkSocketInformation(int sysno) {
+   switch (sysno) {
+     case __NR_getpeername:
+@@ -558,7 +563,7 @@ bool SyscallSets::IsAllowedAddressSpaceA
+     case __NR_mincore:
+     case __NR_mlockall:
+ #if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
+-    defined(__aarch64__)
++    defined(__aarch64__) || defined(__powerpc64__)
+     case __NR_mmap:
+ #endif
+ #if defined(__i386__) || defined(__arm__) || \
+@@ -589,7 +594,7 @@ bool SyscallSets::IsAllowedAddressSpaceA
+ bool SyscallSets::IsAllowedGeneralIo(int sysno) {
+   switch (sysno) {
+     case __NR_lseek:
+-#if defined(__i386__) || defined(__arm__) || \
++#if defined(__i386__) || defined(__arm__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR__llseek:
+ #endif
+@@ -609,27 +614,27 @@ bool SyscallSets::IsAllowedGeneralIo(int
+     case __NR_read:
+     case __NR_readv:
+     case __NR_pread64:
+-#if defined(__arm__) || \
++#if defined(__arm__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_recv:
+ #endif
+ #if defined(__x86_64__) || defined(__arm__) || defined(__mips__) || \
+-    defined(__aarch64__)
++    defined(__aarch64__) || defined(__powerpc64__)
+     case __NR_recvfrom:  // Could specify source.
+     case __NR_recvmsg:   // Could specify source.
+ #endif
+-#if defined(__i386__) || defined(__x86_64__)
++#if defined(__i386__) || defined(__x86_64__) || defined(__powerpc64__)
+     case __NR_select:
+ #endif
+-#if defined(__i386__) || defined(__arm__) || defined(__mips__)
++#if defined(__i386__) || defined(__arm__) || defined(__mips__) || defined(__powerpc64__)
+     case __NR__newselect:
+ #endif
+-#if defined(__arm__) || \
++#if defined(__arm__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_send:
+ #endif
+ #if defined(__x86_64__) || defined(__arm__) || defined(__mips__) || \
+-    defined(__aarch64__)
++    defined(__aarch64__) || defined(__powerpc64__)
+     case __NR_sendmsg:  // Could specify destination.
+     case __NR_sendto:   // Could specify destination.
+ #endif
+@@ -684,7 +689,7 @@ bool SyscallSets::IsAllowedBasicSchedule
+     case __NR_nanosleep:
+       return true;
+     case __NR_getpriority:
+-#if defined(__i386__) || defined(__arm__) || \
++#if defined(__i386__) || defined(__arm__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_nice:
+ #endif
+@@ -696,7 +701,7 @@ bool SyscallSets::IsAllowedBasicSchedule
+ 
+ bool SyscallSets::IsAdminOperation(int sysno) {
+   switch (sysno) {
+-#if defined(__i386__) || defined(__arm__) || \
++#if defined(__i386__) || defined(__arm__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_bdflush:
+ #endif
+@@ -713,7 +718,8 @@ bool SyscallSets::IsAdminOperation(int s
+ 
+ bool SyscallSets::IsKernelModule(int sysno) {
+   switch (sysno) {
+-#if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
++#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
++    defined(__powerpc64__)
+     case __NR_create_module:
+     case __NR_get_kernel_syms:  // Should ENOSYS.
+     case __NR_query_module:
+@@ -745,7 +751,7 @@ bool SyscallSets::IsFsControl(int sysno)
+     case __NR_quotactl:
+     case __NR_swapoff:
+     case __NR_swapon:
+-#if defined(__i386__) || \
++#if defined(__i386__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_umount:
+ #endif
+@@ -762,7 +768,7 @@ bool SyscallSets::IsNuma(int sysno) {
+     case __NR_getcpu:
+     case __NR_mbind:
+ #if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
+-    defined(__aarch64__)
++    defined(__aarch64__) || defined(__powerpc64__)
+     case __NR_migrate_pages:
+ #endif
+     case __NR_move_pages:
+@@ -797,13 +803,13 @@ bool SyscallSets::IsGlobalProcessEnviron
+   switch (sysno) {
+     case __NR_acct:  // Privileged.
+ #if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
+-    defined(__aarch64__)
++    defined(__aarch64__) || defined(__powerpc64__)
+     case __NR_getrlimit:
+ #endif
+-#if defined(__i386__) || defined(__arm__)
++#if defined(__i386__) || defined(__arm__) || defined(__powerpc64__)
+     case __NR_ugetrlimit:
+ #endif
+-#if defined(__i386__) || \
++#if defined(__i386__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_ulimit:
+ #endif
+@@ -838,7 +844,7 @@ bool SyscallSets::IsGlobalSystemStatus(i
+ #endif
+     case __NR_sysinfo:
+     case __NR_uname:
+-#if defined(__i386__)
++#if defined(__i386__) || defined(__powerpc64__)
+     case __NR_olduname:
+     case __NR_oldolduname:
+ #endif
+@@ -904,8 +910,16 @@ bool SyscallSets::IsSystemVSemaphores(in
+ }
+ #endif
+ 
++/* shitty hack around Void's 4.19 kernel headers missing those numbers */
++#if defined(__powerpc64__) && !defined(__NR_shmget)
++#define __NR_shmget 395
++#define __NR_shmctl 396
++#define __NR_shmat 397
++#define __NR_shmdt 398
++#endif
++
+ #if defined(__i386__) || defined(__x86_64__) || defined(__arm__) || \
+-    defined(__aarch64__) ||                                         \
++    defined(__aarch64__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_64_BITS))
+ // These give a lot of ambient authority and bypass the setuid sandbox.
+ bool SyscallSets::IsSystemVSharedMemory(int sysno) {
+@@ -936,7 +950,7 @@ bool SyscallSets::IsSystemVMessageQueue(
+ }
+ #endif
+ 
+-#if defined(__i386__) || \
++#if defined(__i386__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+ // Big system V multiplexing system call.
+ bool SyscallSets::IsSystemVIpc(int sysno) {
+@@ -956,7 +970,7 @@ bool SyscallSets::IsAnySystemV(int sysno
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_64_BITS))
+   return IsSystemVMessageQueue(sysno) || IsSystemVSemaphores(sysno) ||
+          IsSystemVSharedMemory(sysno);
+-#elif defined(__i386__) || \
++#elif defined(__i386__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+   return IsSystemVIpc(sysno);
+ #endif
+@@ -1014,7 +1028,8 @@ bool SyscallSets::IsFaNotify(int sysno)
+ bool SyscallSets::IsTimer(int sysno) {
+   switch (sysno) {
+     case __NR_getitimer:
+-#if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
++#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
++    defined(__powerpc64__)
+     case __NR_alarm:
+ #endif
+     case __NR_setitimer:
+@@ -1096,17 +1111,20 @@ bool SyscallSets::IsMisc(int sysno) {
+     case __NR_syncfs:
+     case __NR_vhangup:
+ // The system calls below are not implemented.
+-#if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
++#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
++    defined(__powerpc64__)
+     case __NR_afs_syscall:
+ #endif
+ #if defined(__i386__) || \
+-    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
++    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
++    defined(__powerpc64__)
+     case __NR_break:
+ #endif
+-#if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
++#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
++    defined(__powerpc64__)
+     case __NR_getpmsg:
+ #endif
+-#if defined(__i386__) || \
++#if defined(__i386__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_gtty:
+     case __NR_idle:
+@@ -1115,20 +1133,21 @@ bool SyscallSets::IsMisc(int sysno) {
+     case __NR_prof:
+     case __NR_profil:
+ #endif
+-#if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
++#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
++    defined(__powerpc64__)
+     case __NR_putpmsg:
+ #endif
+ #if defined(__x86_64__)
+     case __NR_security:
+ #endif
+-#if defined(__i386__) || \
++#if defined(__i386__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_stty:
+ #endif
+-#if defined(__x86_64__)
++#if defined(__x86_64__) || defined(__powerpc64__)
+     case __NR_tuxcall:
+ #endif
+-#if !defined(__aarch64__)
++#if !defined(__aarch64__) && !defined(__powerpc64__)
+     case __NR_vserver:
+ #endif
+       return true;
+--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_sets.h
++++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_sets.h
+@@ -43,13 +43,14 @@ class SANDBOX_EXPORT SyscallSets {
+   static bool IsDeniedGetOrModifySocket(int sysno);
+ 
+ #if defined(__i386__) || \
+-    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
++    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
++    defined(__powerpc64__)
+   // Big multiplexing system call for sockets.
+   static bool IsSocketCall(int sysno);
+ #endif
+ 
+ #if defined(__x86_64__) || defined(__arm__) || defined(__mips__) || \
+-    defined(__aarch64__)
++    defined(__aarch64__) || defined(__powerpc64__)
+   static bool IsNetworkSocketInformation(int sysno);
+ #endif
+ 
+@@ -77,7 +78,7 @@ class SANDBOX_EXPORT SyscallSets {
+   static bool IsSystemVSemaphores(int sysno);
+ #endif
+ #if defined(__i386__) || defined(__x86_64__) || defined(__arm__) || \
+-    defined(__aarch64__) ||                                         \
++    defined(__aarch64__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_64_BITS))
+   // These give a lot of ambient authority and bypass the setuid sandbox.
+   static bool IsSystemVSharedMemory(int sysno);
+@@ -89,7 +90,8 @@ class SANDBOX_EXPORT SyscallSets {
+ #endif
+ 
+ #if defined(__i386__) || \
+-    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
++    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
++    defined(__powerpc64__)
+   // Big system V multiplexing system call.
+   static bool IsSystemVIpc(int sysno);
+ #endif
+--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf/syscall.cc
++++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf/syscall.cc
+@@ -18,7 +18,7 @@ namespace sandbox {
+ namespace {
+ 
+ #if defined(ARCH_CPU_X86_FAMILY) || defined(ARCH_CPU_ARM_FAMILY) || \
+-    defined(ARCH_CPU_MIPS_FAMILY)
++    defined(ARCH_CPU_MIPS_FAMILY) || defined (ARCH_CPU_PPC64_FAMILY)
+ // Number that's not currently used by any Linux kernel ABIs.
+ const int kInvalidSyscallNumber = 0x351d3;
+ #else
+@@ -312,10 +312,54 @@ asm(// We need to be able to tell the ke
+     "2:ret\n"
+     ".cfi_endproc\n"
+     ".size SyscallAsm, .-SyscallAsm\n"
++#elif defined(__powerpc64__)
++    ".text\n"
++    ".align 4\n"
++    ".type SyscallAsm @function\n"
++    "SyscallAsm:\n"
++    ".cfi_startproc\n"
++
++    // Check if r3 is negative
++    "cmpdi 3, 0\n"
++    "bgt 2f\n"
++
++    // Load address of 3f into r3 and return
++    "mflr 10\n"
++    "bl 1f\n"
++    "1: mflr 3\n"
++    "mtlr 10\n"
++    "addi 3, 3, 4*13\n"
++    "blr\n"
++
++    // Load arguments from array into r3-8
++    // save param 3 in r10
++    "2:\n"
++    "mr 0, 3\n"
++    "ld 3, 0(4)\n"
++    "ld 5, 16(4)\n"
++    "ld 6, 24(4)\n"
++    "ld 7, 32(4)\n"
++    "ld 8, 40(4)\n"
++    "ld 4, 8(4)\n"
++    "li 9, 0\n"
++
++    // Enter kernel
++    "sc\n"
++
++    // Magic return address
++    "3:\n"
++    // Like MIPS, ppc64 return values are always positive.
++    // Check for error in cr0.SO and negate upon error
++    "bc 4, 3, 4f\n"
++    "neg 3, 3\n"
++    "4: blr\n"
++
++    ".cfi_endproc\n"
++    ".size SyscallAsm, .-SyscallAsm\n"
+ #endif
+     );  // asm
+ 
+-#if defined(__x86_64__)
++#if defined(__x86_64__) || defined(__powerpc64__)
+ extern "C" {
+ intptr_t SyscallAsm(intptr_t nr, const intptr_t args[6]);
+ }
+@@ -429,6 +473,8 @@ intptr_t Syscall::Call(int nr,
+     ret = inout;
+   }
+ 
++#elif defined(__powerpc64__)
++  intptr_t ret = SyscallAsm(nr, args);
+ #else
+ #error "Unimplemented architecture"
+ #endif
+@@ -445,8 +491,26 @@ void Syscall::PutValueInUcontext(intptr_
+     // needs to be changed back.
+     ret_val = -ret_val;
+     SECCOMP_PARM4(ctx) = 1;
+-  } else
++  } else {
+     SECCOMP_PARM4(ctx) = 0;
++  }
++#endif
++#if defined(__powerpc64__)
++  // Same as MIPS, need to invert ret and set error register (cr0.SO)
++  if (ret_val <= -1 && ret_val >= -4095) {
++    ret_val = -ret_val;
++#ifdef __GLIBC__
++    ctx->uc_mcontext.regs->ccr |= (1 << 28);
++#else
++    ((struct pt_regs *)ctx->uc_mcontext.regs)->ccr |= (1 << 28);
++#endif
++  } else {
++#ifdef __GLIBC__
++    ctx->uc_mcontext.regs->ccr &= ~(1 << 28);
++#else
++    ((struct pt_regs *)ctx->uc_mcontext.regs)->ccr &= ~(1 << 28);
++#endif
++  }
+ #endif
+   SECCOMP_RESULT(ctx) = static_cast<greg_t>(ret_val);
+ }
+--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf/trap.cc
++++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf/trap.cc
+@@ -236,6 +236,20 @@ void Trap::SigSys(int nr, LinuxSigInfo*
+       SetIsInSigHandler();
+     }
+ 
++#if defined(__powerpc64__)
++    // On ppc64+glibc, some syscalls seem to accidentally negate the first
++    // parameter which causes checks against it to fail. For now, manually
++    // negate them back.
++    // TODO(shawn@anastas.io): investigate this issue further
++    auto nr = SECCOMP_SYSCALL(ctx);
++    if (nr == __NR_openat || nr == __NR_mkdirat || nr == __NR_faccessat || nr == __NR_readlinkat ||
++        nr == __NR_renameat || nr == __NR_renameat2 || nr == __NR_newfstatat || nr == __NR_unlinkat) {
++        if (static_cast<int>(SECCOMP_PARM1(ctx)) > 0) {
++            SECCOMP_PARM1(ctx) = -SECCOMP_PARM1(ctx);
++        }
++    }
++#endif
++
+     // Copy the seccomp-specific data into a arch_seccomp_data structure. This
+     // is what we are showing to TrapFnc callbacks that the system call
+     // evaluator registered with the sandbox.
+--- a/src/3rdparty/chromium/sandbox/linux/services/credentials.cc
++++ b/src/3rdparty/chromium/sandbox/linux/services/credentials.cc
+@@ -81,7 +81,7 @@ bool ChrootToSafeEmptyDir() {
+   pid_t pid = -1;
+   alignas(16) char stack_buf[PTHREAD_STACK_MIN];
+ #if defined(ARCH_CPU_X86_FAMILY) || defined(ARCH_CPU_ARM_FAMILY) || \
+-    defined(ARCH_CPU_MIPS_FAMILY)
++    defined(ARCH_CPU_MIPS_FAMILY) || defined(ARCH_CPU_PPC64_FAMILY)
+   // The stack grows downward.
+   void* stack = stack_buf + sizeof(stack_buf);
+ #else
+--- a/src/3rdparty/chromium/sandbox/linux/services/syscall_wrappers.cc
++++ b/src/3rdparty/chromium/sandbox/linux/services/syscall_wrappers.cc
+@@ -61,7 +61,7 @@ long sys_clone(unsigned long flags,
+ #if defined(ARCH_CPU_X86_64)
+   return syscall(__NR_clone, flags, child_stack, ptid, ctid, tls);
+ #elif defined(ARCH_CPU_X86) || defined(ARCH_CPU_ARM_FAMILY) || \
+-    defined(ARCH_CPU_MIPS_FAMILY)
++    defined(ARCH_CPU_MIPS_FAMILY) || defined(ARCH_CPU_PPC64_FAMILY)
+   // CONFIG_CLONE_BACKWARDS defined.
+   return syscall(__NR_clone, flags, child_stack, ptid, tls, ctid);
+ #endif
+--- a/src/3rdparty/chromium/sandbox/linux/syscall_broker/broker_process.cc
++++ b/src/3rdparty/chromium/sandbox/linux/syscall_broker/broker_process.cc
+@@ -165,7 +165,7 @@ bool BrokerProcess::IsSyscallBrokerable(
+ #if defined(__NR_fstatat64)
+     case __NR_fstatat64:
+ #endif
+-#if defined(__x86_64__) || defined(__aarch64__)
++#if defined(__x86_64__) || defined(__aarch64__) || defined(__powerpc64__)
+     case __NR_newfstatat:
+ #endif
+       return !fast_check || allowed_command_set_.test(COMMAND_STAT);
+--- a/src/3rdparty/chromium/sandbox/linux/system_headers/linux_seccomp.h
++++ b/src/3rdparty/chromium/sandbox/linux/system_headers/linux_seccomp.h
+@@ -41,6 +41,9 @@
+ #ifndef EM_AARCH64
+ #define EM_AARCH64 183
+ #endif
++#ifndef EM_PPC64
++#define EM_PPC64 21
++#endif
+ 
+ #ifndef __AUDIT_ARCH_64BIT
+ #define __AUDIT_ARCH_64BIT 0x80000000
+@@ -74,6 +77,14 @@
+ #define AUDIT_ARCH_AARCH64 (EM_AARCH64 | __AUDIT_ARCH_64BIT | __AUDIT_ARCH_LE)
+ #endif
+ 
++#ifndef AUDIT_ARCH_PPC64
++#define AUDIT_ARCH_PPC64 (EM_PPC64 | __AUDIT_ARCH_64BIT)
++#endif
++
++#ifndef AUDIT_ARCH_PPC64LE
++#define AUDIT_ARCH_PPC64LE (EM_PPC64 | __AUDIT_ARCH_64BIT | __AUDIT_ARCH_LE)
++#endif
++
+ // For prctl.h
+ #ifndef PR_SET_SECCOMP
+ #define PR_SET_SECCOMP               22
+--- a/src/3rdparty/chromium/sandbox/linux/system_headers/linux_signal.h
++++ b/src/3rdparty/chromium/sandbox/linux/system_headers/linux_signal.h
+@@ -13,7 +13,7 @@
+ // (not undefined, but defined different values and in different memory
+ // layouts). So, fill the gap here.
+ #if defined(__i386__) || defined(__x86_64__) || defined(__arm__) || \
+-    defined(__aarch64__)
++    defined(__aarch64__) || defined(__powerpc64__)
+ 
+ #define LINUX_SIGHUP 1
+ #define LINUX_SIGINT 2
+--- a/src/3rdparty/chromium/sandbox/linux/system_headers/linux_syscalls.h
++++ b/src/3rdparty/chromium/sandbox/linux/system_headers/linux_syscalls.h
+@@ -35,5 +35,9 @@
+ #include "sandbox/linux/system_headers/arm64_linux_syscalls.h"
+ #endif
+ 
++#if defined(__powerpc64__)
++#include "sandbox/linux/system_headers/ppc64_linux_syscalls.h"
++#endif
++
+ #endif  // SANDBOX_LINUX_SYSTEM_HEADERS_LINUX_SYSCALLS_H_
+ 
+--- a/src/3rdparty/chromium/sandbox/linux/system_headers/linux_ucontext.h
++++ b/src/3rdparty/chromium/sandbox/linux/system_headers/linux_ucontext.h
+@@ -11,6 +11,8 @@
+ #include "sandbox/linux/system_headers/arm_linux_ucontext.h"
+ #elif defined(__i386__)
+ #include "sandbox/linux/system_headers/i386_linux_ucontext.h"
++#elif defined(__powerpc64__)
++#include "sandbox/linux/system_headers/ppc64_linux_ucontext.h"
+ #else
+ #error "No support for your architecture in PNaCl header"
+ #endif
+--- a/src/3rdparty/chromium/sandbox/policy/linux/bpf_renderer_policy_linux.cc
++++ b/src/3rdparty/chromium/sandbox/policy/linux/bpf_renderer_policy_linux.cc
+@@ -15,6 +15,11 @@
+ #include "sandbox/linux/system_headers/linux_syscalls.h"
+ #include "sandbox/policy/linux/sandbox_linux.h"
+ 
++// On PPC64, TCGETS is defined in terms of struct termios, so we must include termios.h
++#ifdef __powerpc64__
++#include <termios.h>
++#endif
++
+ // TODO(vignatti): replace the local definitions below with #include
+ // <linux/dma-buf.h> once kernel version 4.6 becomes widely used.
+ #include <linux/types.h>
+--- a/src/3rdparty/chromium/third_party/angle/src/compiler/translator/InfoSink.h
++++ b/src/3rdparty/chromium/third_party/angle/src/compiler/translator/InfoSink.h
+@@ -93,7 +93,16 @@ class TInfoSinkBase
+             stream.precision(8);
+             stream << f;
+         }
+-        sink.append(stream.str());
++
++        // Hack to work around a bug where negative floating point values
++        // are rendered like '.0.5' instead of '-0.5'
++        std::string res(stream.str());
++
++        if (signbit(f)) { // test if f is negative
++            res[0] = '-';
++        }
++
++        sink.append(res);
+         return *this;
+     }
+     // Write boolean values as their names instead of integral value.
+--- a/src/3rdparty/chromium/third_party/angle/src/libANGLE/Constants.h
++++ b/src/3rdparty/chromium/third_party/angle/src/libANGLE/Constants.h
+@@ -9,6 +9,7 @@
+ #ifndef LIBANGLE_CONSTANTS_H_
+ #define LIBANGLE_CONSTANTS_H_
+ 
++#include <cstddef>
+ #include "common/platform.h"
+ 
+ #include <stdint.h>
+--- a/src/3rdparty/chromium/third_party/boringssl/BUILD.gn
++++ b/src/3rdparty/chromium/third_party/boringssl/BUILD.gn
+@@ -99,6 +99,13 @@ if (is_win && !is_msan && current_cpu !=
+       } else {
+         public_configs = [ ":no_asm_config" ]
+       }
++    } else if (current_cpu == "ppc64") {
++      if (is_linux) {
++        # TODO: ppc64 (be) check
++        sources += crypto_sources_linux_ppc64le
++      } else {
++        public_configs = [ ":no_asm_config" ]
++      }
+     } else {
+       public_configs = [ ":no_asm_config" ]
+     }
+--- a/src/3rdparty/chromium/third_party/breakpad/BUILD.gn
++++ b/src/3rdparty/chromium/third_party/breakpad/BUILD.gn
+@@ -623,7 +623,6 @@ if (is_linux || is_chromeos || is_androi
+       "breakpad/src/client/minidump_file_writer.h",
+       "breakpad/src/common/convert_UTF.cc",
+       "breakpad/src/common/convert_UTF.h",
+-      "breakpad/src/common/linux/breakpad_getcontext.S",
+       "breakpad/src/common/linux/elf_core_dump.cc",
+       "breakpad/src/common/linux/elf_core_dump.h",
+       "breakpad/src/common/linux/elfutils.cc",
+@@ -663,6 +662,15 @@ if (is_linux || is_chromeos || is_androi
+ 
+     libs = [ "dl" ]
+ 
++    if (current_cpu == "ppc64") {
++        defines = [ "HAVE_GETCONTEXT" ]
++        libs += [ "ucontext" ]
++    } else {
++        sources += [
++            "breakpad/src/common/linux/breakpad_getcontext.S"
++        ]
++    }
++
+     include_dirs = [
+       ".",
+       "breakpad/src",
+@@ -712,7 +720,6 @@ if (is_linux || is_chromeos || is_androi
+       "breakpad/src/client/linux/minidump_writer/minidump_writer_unittest.cc",
+       "breakpad/src/client/linux/minidump_writer/minidump_writer_unittest_utils.cc",
+       "breakpad/src/client/linux/minidump_writer/proc_cpuinfo_reader_unittest.cc",
+-      "breakpad/src/common/linux/breakpad_getcontext_unittest.cc",
+       "breakpad/src/common/linux/elf_core_dump_unittest.cc",
+       "breakpad/src/common/linux/file_id_unittest.cc",
+       "breakpad/src/common/linux/linux_libc_support_unittest.cc",
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/raw_context_cpu.h
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/raw_context_cpu.h
+@@ -44,6 +44,8 @@ typedef MDRawContextARM RawContextCPU;
+ typedef MDRawContextARM64_Old RawContextCPU;
+ #elif defined(__mips__)
+ typedef MDRawContextMIPS RawContextCPU;
++#elif defined(__powerpc64__)
++typedef MDRawContextPPC64 RawContextCPU;
+ #else
+ #error "This code has not been ported to your platform yet."
+ #endif
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.cc
+@@ -270,7 +270,54 @@ void ThreadInfo::FillCPUContext(RawConte
+   out->float_save.fir = mcontext.fpc_eir;
+ #endif
+ }
+-#endif  // __mips__
++
++#elif defined(__powerpc64__)
++
++#if !defined(__GLIBC__)
++#include <asm/elf.h>
++#include <asm/ptrace.h>
++#endif
++
++uintptr_t ThreadInfo::GetInstructionPointer() const {
++    return mcontext.gp_regs[PT_NIP];
++}
++
++void ThreadInfo::FillCPUContext(RawContextCPU* out) const {
++    out->context_flags = MD_CONTEXT_PPC64_FULL;
++    for (int i = 0; i < MD_CONTEXT_PPC64_GPR_COUNT; i++)
++        out->gpr[i] = mcontext.gp_regs[i];
++
++    out->lr = mcontext.gp_regs[PT_LNK];
++    out->srr0 = mcontext.gp_regs[PT_NIP];
++    out->srr1 = mcontext.gp_regs[PT_MSR];
++    out->cr = mcontext.gp_regs[PT_CCR];
++    out->xer = mcontext.gp_regs[PT_XER];
++    out->ctr = mcontext.gp_regs[PT_CTR];
++
++#ifdef __GLIBC__
++    for (int i = 0; i < MD_FLOATINGSAVEAREA_PPC_FPR_COUNT; i++)
++        out->float_save.fpregs[i] = mcontext.fp_regs[i];
++
++    out->float_save.fpscr = mcontext.fp_regs[NFPREG-1];
++#else
++    for (int i = 0; i < MD_FLOATINGSAVEAREA_PPC_FPR_COUNT; i++)
++        out->float_save.fpregs[i] = ((uint64_t *)&mcontext.fp_regs)[i];
++
++     out->float_save.fpscr = ((uint64_t *)&mcontext.fp_regs)[ELF_NFPREG-1];
++#endif
++
++    for (int i = 0; i < MD_VECTORSAVEAREA_PPC_VR_COUNT; i++)
++        out->vector_save.save_vr[i] = \
++            {(((uint64_t)vregs.vrregs[i][0]) << 32)
++                          | vregs.vrregs[i][1],
++            (((uint64_t)vregs.vrregs[i][2]) << 32)
++                         | vregs.vrregs[i][3]};
++
++    out->vrsave = vregs.vrsave;
++    out->vector_save.save_vscr = {0, vregs.vscr.vscr_word};
++    out->vector_save.save_vrvalid = 0xFFFFFFFF;
++}
++#endif  // __powerpc64__
+ 
+ void ThreadInfo::GetGeneralPurposeRegisters(void** gp_regs, size_t* size) {
+   assert(gp_regs || size);
+@@ -279,6 +326,11 @@ void ThreadInfo::GetGeneralPurposeRegist
+     *gp_regs = mcontext.gregs;
+   if (size)
+     *size = sizeof(mcontext.gregs);
++#elif defined(__powerpc64__)
++  if (gp_regs)
++    *gp_regs = mcontext.gp_regs;
++  if (size)
++    *size = sizeof(mcontext.gp_regs);
+ #else
+   if (gp_regs)
+     *gp_regs = &regs;
+@@ -294,6 +346,11 @@ void ThreadInfo::GetFloatingPointRegiste
+     *fp_regs = &mcontext.fpregs;
+   if (size)
+     *size = sizeof(mcontext.fpregs);
++#elif defined(__powerpc64__)
++  if (fp_regs)
++    *fp_regs = &mcontext.fp_regs;
++  if (size)
++    *size = sizeof(mcontext.fp_regs);
+ #else
+   if (fp_regs)
+     *fp_regs = &fpregs;
+@@ -302,4 +359,13 @@ void ThreadInfo::GetFloatingPointRegiste
+ #endif
+ }
+ 
++#if defined(__powerpc64__)
++void ThreadInfo::GetVectorRegisters(void** v_regs, size_t* size) {
++    if (v_regs)
++        *v_regs = &vregs;
++    if (size)
++        *size = sizeof(vregs);
++}
++#endif
++
+ }  // namespace google_breakpad
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.h
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.h
+@@ -68,6 +68,10 @@ struct ThreadInfo {
+   // Use the structures defined in <sys/user.h>
+   struct user_regs_struct regs;
+   struct user_fpsimd_struct fpregs;
++#elif defined(__powerpc64__)
++  // Use the structures defined in <sys/ucontext.h>.
++  mcontext_t mcontext;
++  vrregset_t vregs;
+ #elif defined(__mips__)
+   // Use the structure defined in <sys/ucontext.h>.
+   mcontext_t mcontext;
+@@ -84,6 +88,11 @@ struct ThreadInfo {
+ 
+   // Returns the pointer and size of float point register area.
+   void GetFloatingPointRegisters(void** fp_regs, size_t* size);
++
++#if defined(__powerpc64__)
++  // Returns the pointer and size of the vector register area. (PPC64 only)
++  void GetVectorRegisters(void** v_regs, size_t* size);
++#endif
+ };
+ 
+ }  // namespace google_breakpad
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc
+@@ -254,6 +254,60 @@ void UContextReader::FillCPUContext(RawC
+   out->float_save.fir = uc->uc_mcontext.fpc_eir;  // Unused.
+ #endif
+ }
++
++#elif defined(__powerpc64__)
++
++#ifndef __GLIBC__
++#include <asm/elf.h>
++#include <asm/ptrace.h>
++#endif
++
++uintptr_t UContextReader::GetStackPointer(const ucontext_t* uc) {
++    return uc->uc_mcontext.gp_regs[MD_CONTEXT_PPC64_REG_SP];
++}
++
++uintptr_t UContextReader::GetInstructionPointer(const ucontext_t* uc) {
++    return uc->uc_mcontext.gp_regs[PT_NIP];
++}
++
++void UContextReader::FillCPUContext(RawContextCPU* out, const ucontext_t* uc,
++                                    const vrregset_t* vregs) {
++    out->context_flags = MD_CONTEXT_PPC64_FULL;
++
++    for (int i = 0; i < MD_CONTEXT_PPC64_GPR_COUNT; i++)
++        out->gpr[i] = uc->uc_mcontext.gp_regs[i];
++
++    out->lr = uc->uc_mcontext.gp_regs[PT_LNK];
++    out->srr0 = uc->uc_mcontext.gp_regs[PT_NIP];
++    out->srr1 = uc->uc_mcontext.gp_regs[PT_MSR];
++    out->cr = uc->uc_mcontext.gp_regs[PT_CCR];
++    out->xer = uc->uc_mcontext.gp_regs[PT_XER];
++    out->ctr = uc->uc_mcontext.gp_regs[PT_CTR];
++
++#ifdef __GLIBC__
++    for (int i = 0; i < MD_FLOATINGSAVEAREA_PPC_FPR_COUNT; i++)
++        out->float_save.fpregs[i] = uc->uc_mcontext.fp_regs[i];
++
++    out->float_save.fpscr = uc->uc_mcontext.fp_regs[NFPREG-1];
++#else
++    for (int i = 0; i < MD_FLOATINGSAVEAREA_PPC_FPR_COUNT; i++)
++        out->float_save.fpregs[i] = ((uint64_t *)&uc->uc_mcontext.fp_regs)[i];
++
++    out->float_save.fpscr = ((uint64_t *)&uc->uc_mcontext.fp_regs)[ELF_NFPREG-1];
++#endif
++
++    for (int i = 0; i < MD_VECTORSAVEAREA_PPC_VR_COUNT; i++)
++        out->vector_save.save_vr[i] =
++            {(((uint64_t)vregs->vrregs[i][0]) << 32)
++                         | vregs->vrregs[i][1],
++             (((uint64_t)vregs->vrregs[i][2]) << 32)
++                         | vregs->vrregs[i][3]};
++
++    out->vrsave = vregs->vrsave;
++    out->vector_save.save_vscr = {0, vregs->vscr.vscr_word};
++    out->vector_save.save_vrvalid = 0xFFFFFFFF;
++}
++
+ #endif
+ 
+ }  // namespace google_breakpad
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h
+@@ -59,6 +59,9 @@ struct UContextReader {
+ #elif defined(__aarch64__)
+   static void FillCPUContext(RawContextCPU* out, const ucontext_t* uc,
+                              const struct fpsimd_context* fpregs);
++#elif defined(__powerpc64__)
++  static void FillCPUContext(RawContextCPU *out, const ucontext_t *uc,
++                             const vrregset_t* vregs);
+ #else
+   static void FillCPUContext(RawContextCPU* out, const ucontext_t* uc);
+ #endif
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc
+@@ -105,6 +105,13 @@
+ #define PR_SET_PTRACER 0x59616d61
+ #endif
+ 
++/* musl hack, can't include asm/ptrace.h as that causes conflicts */
++#ifndef __GLIBC__
++#if defined(__powerpc64__) && !defined(PT_NIP)
++#define PT_NIP 32
++#endif
++#endif
++
+ namespace google_breakpad {
+ 
+ namespace {
+@@ -461,9 +468,16 @@ bool ExceptionHandler::HandleSignal(int
+     memcpy(&g_crash_context_.float_state, fp_ptr,
+            sizeof(g_crash_context_.float_state));
+   }
++#elif defined(__powerpc64__)
++  // On PPC64, we must copy VR state
++  ucontext_t* uc_ptr = (ucontext_t*)uc;
++  if (uc_ptr->uc_mcontext.v_regs) {
++    memcpy(&g_crash_context_.vector_state, uc_ptr->uc_mcontext.v_regs,
++           sizeof(g_crash_context_.vector_state));
++  }
+ #elif !defined(__ARM_EABI__) && !defined(__mips__)
+   // FP state is not part of user ABI on ARM Linux.
+-  // In case of MIPS Linux FP state is already part of ucontext_t
++  // In case of MIPS, Linux FP state is already part of ucontext_t
+   // and 'float_state' is not a member of CrashContext.
+   ucontext_t* uc_ptr = (ucontext_t*)uc;
+   if (uc_ptr->uc_mcontext.fpregs) {
+@@ -708,11 +722,19 @@ bool ExceptionHandler::WriteMinidump() {
+   }
+ #endif
+ 
+-#if !defined(__ARM_EABI__) && !defined(__aarch64__) && !defined(__mips__)
++#if !defined(__ARM_EABI__) && !defined(__aarch64__) && !defined(__mips__) \
++    && !defined(__powerpc64__)
+   // FPU state is not part of ARM EABI ucontext_t.
+   memcpy(&context.float_state, context.context.uc_mcontext.fpregs,
+          sizeof(context.float_state));
+ #endif
++
++#if defined(__powerpc64__)
++  // Vector registers must be copied on PPC64
++  memcpy(&context.vector_state, context.context.uc_mcontext.v_regs,
++         sizeof(context.vector_state));
++#endif
++
+   context.tid = sys_gettid();
+ 
+   // Add an exception stream to the minidump for better reporting.
+@@ -733,6 +755,9 @@ bool ExceptionHandler::WriteMinidump() {
+ #elif defined(__mips__)
+   context.siginfo.si_addr =
+       reinterpret_cast<void*>(context.context.uc_mcontext.pc);
++#elif defined(__powerpc64__)
++  context.siginfo.si_addr =
++      reinterpret_cast<void*>(context.context.uc_mcontext.gp_regs[PT_NIP]);
+ #else
+ #error "This code has not been ported to your platform yet."
+ #endif
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.h
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.h
+@@ -192,7 +192,11 @@ class ExceptionHandler {
+     siginfo_t siginfo;
+     pid_t tid;  // the crashing thread.
+     ucontext_t context;
+-#if !defined(__ARM_EABI__) && !defined(__mips__)
++#if defined(__powerpc64__)
++    // PPC64's FP state is a part of ucontext_t like MIPS but the vector
++    // state is not, so a struct is needed.
++    vstate_t vector_state;
++#elif !defined(__ARM_EABI__) && !defined(__mips__)
+     // #ifdef this out because FP state is not part of user ABI for Linux ARM.
+     // In case of MIPS Linux FP state is already part of ucontext_t so
+     // 'float_state' is not required.
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler_unittest.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler_unittest.cc
+@@ -307,7 +307,7 @@ TEST(ExceptionHandlerTest, ParallelChild
+   }
+ 
+   // Wait a while until the child should have crashed.
+-  usleep(1000000);
++  usleep(2000000);
+   // Kill the child if it is still running.
+   kill(child, SIGKILL);
+ 
+@@ -559,6 +559,8 @@ const unsigned char kIllegalInstruction[
+ #if defined(__mips__)
+   // mfc2 zero,Impl - usually illegal in userspace.
+   0x48, 0x00, 0x00, 0x48
++#elif defined(__powerpc64__)
++  0x01, 0x01, 0x01, 0x01 // Crashes on a tested POWER9 cpu
+ #else
+   // This crashes with SIGILL on x86/x86-64/arm.
+   0xff, 0xff, 0xff, 0xff
+@@ -754,10 +756,10 @@ TEST(ExceptionHandlerTest, InstructionPo
+ 
+   // These are defined here so the parent can use them to check the
+   // data from the minidump afterwards.
+-  // Use 4k here because the OS will hand out a single page even
++  // Use the page size here because the OS will hand out a single page even
+   // if a smaller size is requested, and this test wants to
+   // test the upper bound of the memory range.
+-  const uint32_t kMemorySize = 4096;  // bytes
++  const uint32_t kMemorySize = getpagesize();  // bytes
+   const int kOffset = kMemorySize - sizeof(kIllegalInstruction);
+ 
+   const pid_t child = fork();
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/microdump_writer/microdump_writer.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/microdump_writer/microdump_writer.cc
+@@ -138,7 +138,9 @@ class MicrodumpWriter {
+                   const MicrodumpExtraInfo& microdump_extra_info,
+                   LinuxDumper* dumper)
+       : ucontext_(context ? &context->context : NULL),
+-#if !defined(__ARM_EABI__) && !defined(__mips__)
++#if defined(__powerpc64__)
++        vector_state_(context ? &context->vector_state : NULL),
++#elif !defined(__ARM_EABI__) && !defined(__mips__)
+         float_state_(context ? &context->float_state : NULL),
+ #endif
+         dumper_(dumper),
+@@ -337,6 +339,8 @@ class MicrodumpWriter {
+ # else
+ #  error "This mips ABI is currently not supported (n32)"
+ #endif
++#elif defined(__powerpc64__)
++    const char kArch[] = "ppc64";
+ #else
+ #error "This code has not been ported to your platform yet"
+ #endif
+@@ -409,7 +413,9 @@ class MicrodumpWriter {
+   void DumpCPUState() {
+     RawContextCPU cpu;
+     my_memset(&cpu, 0, sizeof(RawContextCPU));
+-#if !defined(__ARM_EABI__) && !defined(__mips__)
++#if defined(__powerpc64__)
++    UContextReader::FillCPUContext(&cpu, ucontext_, vector_state_);
++#elif !defined(__ARM_EABI__) && !defined(__mips__)
+     UContextReader::FillCPUContext(&cpu, ucontext_, float_state_);
+ #else
+     UContextReader::FillCPUContext(&cpu, ucontext_);
+@@ -605,7 +611,9 @@ class MicrodumpWriter {
+   void* Alloc(unsigned bytes) { return dumper_->allocator()->Alloc(bytes); }
+ 
+   const ucontext_t* const ucontext_;
+-#if !defined(__ARM_EABI__) && !defined(__mips__)
++#if defined(__powerpc64__)
++  const google_breakpad::vstate_t* const vector_state_;
++#elif !defined(__ARM_EABI__) && !defined(__mips__)
+   const google_breakpad::fpstate_t* const float_state_;
+ #endif
+   LinuxDumper* dumper_;
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/microdump_writer/microdump_writer_unittest.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/microdump_writer/microdump_writer_unittest.cc
+@@ -279,10 +279,19 @@ TEST(MicrodumpWriterTest, BasicWithMappi
+   CrashAndGetMicrodump(mappings, MicrodumpExtraInfo(), &buf);
+   ASSERT_TRUE(ContainsMicrodump(buf));
+ 
++  int page_size = getpagesize();
+ #ifdef __LP64__
+-  ASSERT_NE(std::string::npos,
+-            buf.find("M 0000000000001000 000000000000002A 0000000000001000 "
+-                     "33221100554477668899AABBCCDDEEFF0 libfoo.so"));
++  // This test is only available for the following page sizes
++  ASSERT_TRUE((page_size == 4096) || (page_size == 65536));
++  if (page_size == 4096) {
++    ASSERT_NE(std::string::npos,
++              buf.find("M 0000000000001000 000000000000002A 0000000000001000 "
++                       "33221100554477668899AABBCCDDEEFF0 libfoo.so"));
++  } else {
++    ASSERT_NE(std::string::npos,
++              buf.find("M 0000000000010000 000000000000002A 0000000000010000 "
++                       "33221100554477668899AABBCCDDEEFF0 libfoo.so"));
++  }
+ #else
+   ASSERT_NE(std::string::npos,
+             buf.find("M 00001000 0000002A 00001000 "
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_core_dumper.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_core_dumper.cc
+@@ -117,6 +117,9 @@ bool LinuxCoreDumper::GetThreadInfoByInd
+ #elif defined(__mips__)
+   stack_pointer =
+       reinterpret_cast<uint8_t*>(info->mcontext.gregs[MD_CONTEXT_MIPS_REG_SP]);
++#elif defined(__powerpc64__)
++  stack_pointer =
++      reinterpret_cast<uint8_t*>(info->mcontext.gp_regs[MD_CONTEXT_PPC64_REG_SP]);
+ #else
+ #error "This code hasn't been ported to your platform yet."
+ #endif
+@@ -212,7 +215,10 @@ bool LinuxCoreDumper::EnumerateThreads()
+         memset(&info, 0, sizeof(ThreadInfo));
+         info.tgid = status->pr_pgrp;
+         info.ppid = status->pr_ppid;
+-#if defined(__mips__)
++#if defined(__powerpc64__)
++        for (int i = 0; i < 31; i++)
++            info.mcontext.gp_regs[i] = status->pr_reg[i];
++#elif defined(__mips__)
+ #if defined(__ANDROID__)
+         for (int i = EF_R0; i <= EF_R31; i++)
+           info.mcontext.gregs[i - EF_R0] = status->pr_reg[i];
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper.cc
+@@ -765,7 +765,9 @@ bool LinuxDumper::GetStackInfo(const voi
+       reinterpret_cast<uint8_t*>(int_stack_pointer & ~(page_size - 1));
+ 
+   // The number of bytes of stack which we try to capture.
+-  static const ptrdiff_t kStackToCapture = 32 * 1024;
++  // This now depends on page_size to avoid missing data
++  // on systems with larger page sizes.
++  static const ptrdiff_t kStackToCapture = 8 * page_size;
+ 
+   const MappingInfo* mapping = FindMapping(stack_pointer);
+   if (!mapping)
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper.h
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper.h
+@@ -63,7 +63,8 @@ namespace google_breakpad {
+  (defined(__mips__) && _MIPS_SIM == _ABIO32)
+ typedef Elf32_auxv_t elf_aux_entry;
+ #elif defined(__x86_64) || defined(__aarch64__) || \
+-     (defined(__mips__) && _MIPS_SIM != _ABIO32)
++     (defined(__mips__) && _MIPS_SIM != _ABIO32) || \
++     defined(__powerpc64__)
+ typedef Elf64_auxv_t elf_aux_entry;
+ #endif
+ 
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper_unittest_helper.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper_unittest_helper.cc
+@@ -51,6 +51,8 @@
+ #define TID_PTR_REGISTER "rcx"
+ #elif defined(__mips__)
+ #define TID_PTR_REGISTER "$1"
++#elif defined(__powerpc64__)
++#define TID_PTR_REGISTER "r8"
+ #else
+ #error This test has not been ported to this platform.
+ #endif
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper.cc
+@@ -154,19 +154,27 @@ bool LinuxPtraceDumper::CopyFromProcess(
+   return true;
+ }
+ 
+-bool LinuxPtraceDumper::ReadRegisterSet(ThreadInfo* info, pid_t tid)
+-{
++bool LinuxPtraceDumper::ReadRegisterSet(ThreadInfo* info, pid_t tid) {
+ #ifdef PTRACE_GETREGSET
+   struct iovec io;
+   info->GetGeneralPurposeRegisters(&io.iov_base, &io.iov_len);
+-  if (sys_ptrace(PTRACE_GETREGSET, tid, (void*)NT_PRSTATUS, (void*)&io) == -1) {
++  if (ptrace(PTRACE_GETREGSET, tid, (void*)NT_PRSTATUS, (void*)&io) == -1) {
+     return false;
+   }
+ 
+   info->GetFloatingPointRegisters(&io.iov_base, &io.iov_len);
+-  if (sys_ptrace(PTRACE_GETREGSET, tid, (void*)NT_FPREGSET, (void*)&io) == -1) {
++  if (ptrace(PTRACE_GETREGSET, tid, (void*)NT_FPREGSET, (void*)&io) == -1) {
+     return false;
+   }
++
++#if defined(__powerpc64__)
++  // Grab the vector registers on PPC64 too
++  info->GetVectorRegisters(&io.iov_base, &io.iov_len);
++  if (ptrace(PTRACE_GETREGSET, tid, (void*)NT_PPC_VMX, (void*)&io) == -1) {
++    return false;
++  }
++#endif // defined(__powerpc64__)
++
+   return true;
+ #else
+   return false;
+@@ -303,6 +311,9 @@ bool LinuxPtraceDumper::GetThreadInfoByI
+ #elif defined(__mips__)
+   stack_pointer =
+       reinterpret_cast<uint8_t*>(info->mcontext.gregs[MD_CONTEXT_MIPS_REG_SP]);
++#elif defined(__powerpc64__)
++  stack_pointer =
++      reinterpret_cast<uint8_t*>(info->mcontext.gp_regs[MD_CONTEXT_PPC64_REG_SP]);
+ #else
+ #error "This code hasn't been ported to your platform yet."
+ #endif
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper_unittest.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper_unittest.cc
+@@ -462,6 +462,9 @@ TEST(LinuxPtraceDumperTest, VerifyStackR
+ #elif defined(__mips__)
+     pid_t* process_tid_location =
+         reinterpret_cast<pid_t*>(one_thread.mcontext.gregs[1]);
++#elif defined(__powerpc64__)
++    pid_t* process_tid_location =
++        reinterpret_cast<pid_t*>(one_thread.mcontext.gp_regs[8]);
+ #else
+ #error This test has not been ported to this platform.
+ #endif
+@@ -559,6 +562,8 @@ TEST_F(LinuxPtraceDumperTest, SanitizeSt
+   uintptr_t heap_addr = thread_info.regs.rcx;
+ #elif defined(__mips__)
+   uintptr_t heap_addr = thread_info.mcontext.gregs[1];
++#elif defined(__powerpc64__)
++  uintptr_t heap_addr = thread_info.mcontext.gp_regs[8];
+ #else
+ #error This test has not been ported to this platform.
+ #endif
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.cc
+@@ -136,7 +136,9 @@ class MinidumpWriter {
+       : fd_(minidump_fd),
+         path_(minidump_path),
+         ucontext_(context ? &context->context : NULL),
+-#if !defined(__ARM_EABI__) && !defined(__mips__)
++#if defined(__powerpc64__)
++        vector_state_(context ? &context->vector_state : NULL),
++#elif !defined(__ARM_EABI__) && !defined(__mips__)
+         float_state_(context ? &context->float_state : NULL),
+ #endif
+         dumper_(dumper),
+@@ -468,7 +470,9 @@ class MinidumpWriter {
+         if (!cpu.Allocate())
+           return false;
+         my_memset(cpu.get(), 0, sizeof(RawContextCPU));
+-#if !defined(__ARM_EABI__) && !defined(__mips__)
++#if defined(__powerpc64__)
++        UContextReader::FillCPUContext(cpu.get(), ucontext_, vector_state_);
++#elif !defined(__ARM_EABI__) && !defined(__mips__)
+         UContextReader::FillCPUContext(cpu.get(), ucontext_, float_state_);
+ #else
+         UContextReader::FillCPUContext(cpu.get(), ucontext_);
+@@ -897,7 +901,7 @@ class MinidumpWriter {
+     dirent->location.rva = 0;
+   }
+ 
+-#if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
++#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || defined(__powerpc64__)
+   bool WriteCPUInformation(MDRawSystemInfo* sys_info) {
+     char vendor_id[sizeof(sys_info->cpu.x86_cpu_info.vendor_id) + 1] = {0};
+     static const char vendor_id_name[] = "vendor_id";
+@@ -917,7 +921,9 @@ class MinidumpWriter {
+ 
+     // processor_architecture should always be set, do this first
+     sys_info->processor_architecture =
+-#if defined(__mips__)
++#if defined(__powerpc64__)
++        MD_CPU_ARCHITECTURE_PPC64;
++#elif defined(__mips__)
+ # if _MIPS_SIM == _ABIO32
+         MD_CPU_ARCHITECTURE_MIPS;
+ # elif _MIPS_SIM == _ABI64
+@@ -1333,7 +1339,9 @@ class MinidumpWriter {
+   const char* path_;  // Path to the file where the minidum should be written.
+ 
+   const ucontext_t* const ucontext_;  // also from the signal handler
+-#if !defined(__ARM_EABI__) && !defined(__mips__)
++#if defined(__powerpc64__)
++  const google_breakpad::vstate_t* const vector_state_;
++#elif !defined(__ARM_EABI__) && !defined(__mips__)
+   const google_breakpad::fpstate_t* const float_state_;  // ditto
+ #endif
+   LinuxDumper* dumper_;
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.h
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.h
+@@ -48,6 +48,8 @@ class ExceptionHandler;
+ 
+ #if defined(__aarch64__)
+ typedef struct fpsimd_context fpstate_t;
++#elif defined(__powerpc64__)
++typedef vrregset_t vstate_t;
+ #elif !defined(__ARM_EABI__) && !defined(__mips__)
+ typedef std::remove_pointer<fpregset_t>::type fpstate_t;
+ #endif
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer_unittest.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer_unittest.cc
+@@ -715,6 +715,12 @@ TEST(MinidumpWriterTest, InvalidStackPoi
+ #elif defined(__mips__)
+   context.context.uc_mcontext.gregs[MD_CONTEXT_MIPS_REG_SP] =
+       invalid_stack_pointer;
++#elif defined(__powerpc64__)
++  context.context.uc_mcontext.gp_regs[MD_CONTEXT_PPC64_REG_SP] =
++      invalid_stack_pointer;
++#elif defined(__powerpc64__)
++  context.context.uc_mcontext.gp_regs[MD_CONTEXT_PPC64_REG_SP] =
++      invalid_stack_pointer;
+ #else
+ # error "This code has not been ported to your platform yet."
+ #endif
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/common/linux/memory_mapped_file.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/common/linux/memory_mapped_file.cc
+@@ -65,8 +65,7 @@ bool MemoryMappedFile::Map(const char* p
+   }
+ 
+ #if defined(__x86_64__) || defined(__aarch64__) || \
+-   (defined(__mips__) && _MIPS_SIM == _ABI64)
+-
++   (defined(__mips__) && _MIPS_SIM == _ABI64) || defined(__powerpc64__)
+   struct kernel_stat st;
+   if (sys_fstat(fd, &st) == -1 || st.st_size < 0) {
+ #else
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/common/linux/memory_mapped_file_unittest.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/common/linux/memory_mapped_file_unittest.cc
+@@ -176,9 +176,10 @@ TEST_F(MemoryMappedFileTest, RemapAfterM
+ TEST_F(MemoryMappedFileTest, MapWithOffset) {
+   // Put more data in the test file this time. Offsets can only be
+   // done on page boundaries, so we need a two page file to test this.
+-  const int page_size = 4096;
+-  char data1[2 * page_size];
+-  size_t data1_size = sizeof(data1);
++  const int page_size = getpagesize();
++  char *data1 = static_cast<char*>(malloc(2 * page_size));
++  EXPECT_TRUE(data1 != NULL);
++  size_t data1_size = (2 * page_size);
+   for (size_t i = 0; i < data1_size; ++i) {
+     data1[i] = i & 0x7f;
+   }
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/common/memory_allocator_unittest.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/common/memory_allocator_unittest.cc
+@@ -57,8 +57,9 @@ TEST(PageAllocatorTest, LargeObject) {
+ 
+   EXPECT_EQ(0U, allocator.pages_allocated());
+   uint8_t* p = reinterpret_cast<uint8_t*>(allocator.Alloc(10000));
++  uint64_t expected_pages = 1 + ((10000 - 1) / getpagesize());
+   ASSERT_FALSE(p == NULL);
+-  EXPECT_EQ(3U, allocator.pages_allocated());
++  EXPECT_EQ(expected_pages, allocator.pages_allocated());
+   for (unsigned i = 1; i < 10; ++i) {
+     uint8_t* p = reinterpret_cast<uint8_t*>(allocator.Alloc(i));
+     ASSERT_FALSE(p == NULL);
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/processor/exploitability_linux.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/processor/exploitability_linux.cc
+@@ -202,12 +202,14 @@ bool ExploitabilityLinux::EndedOnIllegal
+   // Check architecture and set architecture variable to corresponding flag
+   // in objdump.
+   switch (context->GetContextCPU()) {
++#if defined(__i386) || defined(__x86_64)
+     case MD_CONTEXT_X86:
+       architecture = "i386";
+       break;
+     case MD_CONTEXT_AMD64:
+       architecture = "i386:x86-64";
+       break;
++#endif
+     default:
+       // Unsupported architecture. Note that ARM architectures are not
+       // supported because objdump does not support ARM.
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/processor/exploitability_unittest.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/processor/exploitability_unittest.cc
+@@ -104,6 +104,8 @@ ExploitabilityFor(const string& filename
+ }
+ 
+ TEST(ExploitabilityTest, TestWindowsEngine) {
++// The following tests are only executable on an x86-class linux machine.
++#if !defined(_WIN32) && (defined(__i386) || defined(__x86_64))
+   ASSERT_EQ(google_breakpad::EXPLOITABILITY_HIGH,
+             ExploitabilityFor("ascii_read_av.dmp"));
+   ASSERT_EQ(google_breakpad::EXPLOITABILITY_HIGH,
+@@ -136,9 +138,12 @@ TEST(ExploitabilityTest, TestWindowsEngi
+             ExploitabilityFor("read_av_clobber_write.dmp"));
+   ASSERT_EQ(google_breakpad::EXPLOITABILITY_LOW,
+             ExploitabilityFor("read_av_conditional.dmp"));
++#endif
+ }
+ 
+ TEST(ExploitabilityTest, TestLinuxEngine) {
++// The following tests are only executable on an x86-class linux machine.
++#if defined(__i386) || defined(__x86_64)
+   ASSERT_EQ(google_breakpad::EXPLOITABILITY_INTERESTING,
+             ExploitabilityFor("linux_null_read_av.dmp"));
+   ASSERT_EQ(google_breakpad::EXPLOITABILITY_HIGH,
+@@ -171,7 +176,8 @@ TEST(ExploitabilityTest, TestLinuxEngine
+             ExploitabilityFor("linux_executable_heap.dmp"));
+   ASSERT_EQ(google_breakpad::EXPLOITABILITY_HIGH,
+             ExploitabilityFor("linux_jmp_to_module_not_exe_region.dmp"));
+-#ifndef _WIN32
++#endif
++#if !defined(_WIN32) && (defined(__i386) || defined(__x86_64))
+   ASSERT_EQ(google_breakpad::EXPLOITABILITY_HIGH,
+             ExploitabilityFor("linux_write_to_nonwritable_module.dmp"));
+   ASSERT_EQ(google_breakpad::EXPLOITABILITY_HIGH,
+@@ -182,10 +188,10 @@ TEST(ExploitabilityTest, TestLinuxEngine
+             ExploitabilityFor("linux_write_to_outside_module_via_math.dmp"));
+   ASSERT_EQ(google_breakpad::EXPLOITABILITY_INTERESTING,
+             ExploitabilityFor("linux_write_to_under_4k.dmp"));
+-#endif  // _WIN32
++#endif  // !defined(_WIN32) && (!defined(__i386) && !defined(__x86_64))
+ }
+ 
+-#ifndef _WIN32
++#if !defined(_WIN32) && (defined(__i386) || defined(__x86_64))
+ TEST(ExploitabilityLinuxUtilsTest, DisassembleBytesTest) {
+   ASSERT_FALSE(ExploitabilityLinuxTest::DisassembleBytes("", NULL, 5, NULL));
+   uint8_t bytes[6] = {0xc7, 0x0, 0x5, 0x0, 0x0, 0x0};
+@@ -301,6 +307,7 @@ TEST(ExploitabilityLinuxUtilsTest, Calcu
+                                                          context,
+                                                          &write_address));
+ }
+-#endif  // _WIN32
++#endif  // !defined(_WIN32) && (defined(__i386) || defined(__x86_64))
++
+ 
+ }  // namespace
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/tools/linux/md2core/minidump-2-core.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/tools/linux/md2core/minidump-2-core.cc
+@@ -77,6 +77,8 @@
+   #define ELF_ARCH  EM_MIPS
+ #elif defined(__aarch64__)
+   #define ELF_ARCH  EM_AARCH64
++#elif defined(__powerpc64__)
++  #define ELF_ARCH  EM_PPC64
+ #endif
+ 
+ #if defined(__arm__)
+@@ -87,6 +89,8 @@ typedef user_regs user_regs_struct;
+ #elif defined (__mips__)
+ // This file-local typedef simplifies the source code.
+ typedef gregset_t user_regs_struct;
++#elif defined(__powerpc64__)
++typedef struct pt_regs user_regs_struct;
+ #endif
+ 
+ using google_breakpad::MDTypeHelper;
+@@ -322,6 +326,12 @@ struct CrashedProcess {
+ #if defined(__aarch64__)
+     user_fpsimd_struct fpregs;
+ #endif
++#if defined(__powerpc64__)
++    mcontext_t mcontext;
++#endif
++#if defined(__powerpc64__)
++    mcontext_t mcontext;
++#endif
+     uintptr_t stack_addr;
+     const uint8_t* stack;
+     size_t stack_length;
+@@ -535,6 +545,38 @@ ParseThreadRegisters(CrashedProcess::Thr
+   thread->mcontext.fpc_eir = rawregs->float_save.fir;
+ #endif
+ }
++#elif defined(__powerpc64__)
++static void
++ParseThreadRegisters(CrashedProcess::Thread* thread,
++                     const MinidumpMemoryRange& range) {
++  const MDRawContextPPC64* rawregs = range.GetData<MDRawContextPPC64>(0);
++
++  for (int i = 0; i < MD_CONTEXT_PPC64_GPR_COUNT; i++)
++    thread->mcontext.gp_regs[i] = rawregs->gpr[i];
++
++  thread->mcontext.gp_regs[PT_LNK] = rawregs->lr;
++  thread->mcontext.gp_regs[PT_NIP] = rawregs->srr0;
++  thread->mcontext.gp_regs[PT_MSR] = rawregs->srr1;
++  thread->mcontext.gp_regs[PT_CCR] = rawregs->cr;
++  thread->mcontext.gp_regs[PT_XER] = rawregs->xer;
++  thread->mcontext.gp_regs[PT_CTR] = rawregs->ctr;
++  thread->mcontext.v_regs->vrsave = rawregs->vrsave;
++
++  for (int i = 0; i < MD_FLOATINGSAVEAREA_PPC_FPR_COUNT; i++)
++      thread->mcontext.fp_regs[i] = rawregs->float_save.fpregs[i];
++
++  thread->mcontext.fp_regs[NFPREG-1] = rawregs->float_save.fpscr;
++
++  for (int i = 0; i < MD_VECTORSAVEAREA_PPC_VR_COUNT; i++) {
++      thread->mcontext.v_regs->vrregs[i][0] = rawregs->vector_save.save_vr[i].high >> 32;
++      thread->mcontext.v_regs->vrregs[i][1] = rawregs->vector_save.save_vr[i].high;
++      thread->mcontext.v_regs->vrregs[i][2] = rawregs->vector_save.save_vr[i].low >> 32;
++      thread->mcontext.v_regs->vrregs[i][3] = rawregs->vector_save.save_vr[i].low;
++  }
++
++  thread->mcontext.v_regs->vscr.vscr_word = rawregs->vector_save.save_vscr.low & 0xFFFFFFFF;
++}
++
+ #else
+ #error "This code has not been ported to your platform yet"
+ #endif
+@@ -623,6 +665,12 @@ ParseSystemInfo(const Options& options,
+ # else
+ #  error "This mips ABI is currently not supported (n32)"
+ # endif
++#elif defined(__powerpc64__)
++  if (sysinfo->processor_architecture != MD_CPU_ARCHITECTURE_PPC64) {
++    fprintf(stderr,
++            "This version of minidump-2-core only supports PPC64.\n");
++    exit(1);
++  }
+ #else
+ #error "This code has not been ported to your platform yet"
+ #endif
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/CONTRIBUTORS
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/CONTRIBUTORS
+@@ -13,3 +13,4 @@ Mark Mentovai <mark@chromium.org>
+ Robert Sesek <rsesek@chromium.org>
+ Scott Graham <scottmg@chromium.org>
+ Joshua Peraza <jperaza@chromium.org>
++Shawn Anastasio <shawn@anastas.io>
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/compat/linux/sys/user.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/compat/linux/sys/user.h
+@@ -15,6 +15,7 @@
+ #ifndef CRASHPAD_COMPAT_LINUX_SYS_USER_H_
+ #define CRASHPAD_COMPAT_LINUX_SYS_USER_H_
+ 
++#include <cstddef>
+ #include_next <sys/user.h>
+ 
+ #include <features.h>
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/minidump/minidump_context.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/minidump/minidump_context.h
+@@ -592,6 +592,70 @@ struct MinidumpContextMIPS64 {
+   uint64_t fir;
+ };
+ 
++//! \brief ppc64-specific flags for MinidumpPPC64::context_flags
++//! Based on minidump_cpu_ppc64.h from breakpad
++enum MinidumpContextPPC64Flags : uint32_t {
++  //! \brief Identifies the context as PPC64.
++  kMinidumpContextPPC64 = 0x01000000,
++
++  //! \brief Indicates the validity of general purpose registers.
++  //!
++  //! Registers `r0`-`r31`, `nip`, `msr`, `lr`, etc. are valid.
++  kMinidumpContextPPC64Base = kMinidumpContextPPC64 | 0x00000001,
++
++  //! \brief Indicates the validity of floating point registers.
++  //!
++  //! Registers `fp0`-`fp31`, `fpscr` are valid.
++  kMinidumpContextPPC64Floating = kMinidumpContextPPC64 | 0x00000008,
++
++  //! \brief Indicates the validity of Altivec/VMX registers.
++  //!
++  //! Registers `v0`-`v31`, `vscr`, `vrsave`.
++  kMinidumpContextPPC64Vector = kMinidumpContextPPC64 | 0x00000020,
++
++  //! \brief Indicates the validity of all registers
++  kMinidumpContextPPC64All = kMinidumpContextPPC64Base     |
++                             kMinidumpContextPPC64Floating |
++                             kMinidumpContextPPC64Vector
++};
++
++//! \brief A PPC64 CPU context carried in a minidump file.
++//! Based on minidump_cpu_ppc64.h from breakpad.
++struct MinidumpContextPPC64 {
++  uint64_t context_flags;
++
++  //! \brief General purpose registers.
++  uint64_t nip;
++  uint64_t msr;
++  uint64_t regs[32];
++  uint64_t ccr;
++  uint64_t xer;
++  uint64_t lnk;
++  uint64_t ctr;
++
++  //! \brief Floating point registers.
++  double fpregs[32];
++
++  //! \brief FPU status register.
++  double fpscr;
++
++  //! \brief Altivec/VMX vector registers.
++  struct {
++      //! \brief Vector registers are 128bits.
++      uint128_struct save_vr[32];
++      uint128_struct save_vscr;
++
++      //! \brief Padding included for breakpad compatibiltiy.
++      uint32_t save_pad5[4];
++
++      //! \brief VRSAVE register.
++      uint32_t save_vrsave;
++
++      //! \brief Padding included for breakpad compatibiltiy.
++      uint32_t save_pad6[7];
++  } vregs;
++};
++
+ }  // namespace crashpad
+ 
+ #endif  // CRASHPAD_MINIDUMP_MINIDUMP_CONTEXT_H_
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/minidump/minidump_context_writer.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/minidump/minidump_context_writer.cc
+@@ -101,6 +101,13 @@ MinidumpContextWriter::CreateFromSnapsho
+       break;
+     }
+ 
++    case kCPUArchitecturePPC64: {
++      context = std::make_unique<MinidumpContextPPC64Writer>();
++      reinterpret_cast<MinidumpContextPPC64Writer*>(context.get())
++          ->InitalizeFromSnapshot(context_snapshot->ppc64);
++      break;
++    }
++
+     default: {
+       LOG(ERROR) << "unknown context architecture "
+                  << context_snapshot->architecture;
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/minidump/minidump_context_writer.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/minidump/minidump_context_writer.h
+@@ -315,6 +315,45 @@ class MinidumpContextMIPS64Writer final
+   DISALLOW_COPY_AND_ASSIGN(MinidumpContextMIPS64Writer);
+ };
+ 
++class MinidumpContextPPC64Writer final : public MinidumpContextWriter {
++ public:
++  MinidumpContextPPC64Writer();
++  ~MinidumpContextPPC64Writer() override;
++
++  //! \brief Initalizes the MinidumpContextPPC64 based on \a context_snapshot.
++  //!
++  //! \param[in] context_snapshot The context snapshot to use as source data.
++  //!
++  //! \note Valid in #kStateMutable. No mutation of context() may be done before
++  //!     calling this method, and it is not normally necessary to alter
++  //!     context() after calling this method.
++  void InitalizeFromSnapshot(const CPUContextPPC64* context_snapshot);
++
++  //! \brief Returns a pointer to the context structure that this object will
++  //!     write.
++  //!
++  //! \attention This returns a non-`const` pointer to this object’s private
++  //!     data so that a caller can populate the context structure directly.
++  //!     This is done because providing setter interfaces to each field in the
++  //!     context structure would be unwieldy and cumbersome. Care must be taken
++  //!     to populate the context structure correctly. The context structure
++  //!     must only be modified while this object is in the #kStateMutable
++  //!     state.
++  MinidumpContextPPC64* context() { return &context_; }
++
++ protected:
++  // MinidumpWritable:
++  bool WriteObject(FileWriterInterface* file_writer) override;
++
++  // MinidumpContextWriter:
++  size_t ContextSize() const override;
++
++ private:
++  MinidumpContextPPC64 context_;
++
++  DISALLOW_COPY_AND_ASSIGN(MinidumpContextPPC64Writer);
++};
++
+ }  // namespace crashpad
+ 
+ #endif  // CRASHPAD_MINIDUMP_MINIDUMP_CONTEXT_WRITER_H_
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/minidump/minidump_context_writer_test.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/minidump/minidump_context_writer_test.cc
+@@ -213,6 +213,21 @@ TEST(MinidumpContextWriter, MIPS64_FromS
+       context, ExpectMinidumpContextMIPS64, kSeed);
+ }
+ 
++TEST(MinidumpContextWriter, PPC64_Zeros) {
++  EmptyContextTest<MinidumpContextPPC64Writer, MinidumpContextPPC64>(
++    ExpectMinidumpContextPPC64);
++}
++
++TEST(MinidumpContextWriter, PPC64_FromSnapshot) {
++  constexpr uint32_t kSeed = 64;
++  CPUContextPPC64 context_ppc64;
++  CPUContext context;
++  context.ppc64 = &context_ppc64;
++  InitializeCPUContextPPC64(&context, kSeed);
++  FromSnapshotTest<MinidumpContextPPC64Writer, MinidumpContextPPC64>(
++      context, ExpectMinidumpContextPPC64, kSeed);
++}
++
+ }  // namespace
+ }  // namespace test
+ }  // namespace crashpad
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/minidump/minidump_misc_info_writer.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/minidump/minidump_misc_info_writer.cc
+@@ -135,6 +135,8 @@ std::string MinidumpMiscInfoDebugBuildSt
+   static constexpr char kCPU[] = "mips";
+ #elif defined(ARCH_CPU_MIPS64EL)
+   static constexpr char kCPU[] = "mips64";
++#elif defined(ARCH_CPU_PPC64)
++  static constexpr char kCPU[] = "ppc64";
+ #else
+ #error define kCPU for this CPU
+ #endif
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/capture_memory.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/capture_memory.cc
+@@ -112,6 +112,11 @@ void CaptureMemory::PointedToByContext(c
+   for (size_t i = 0; i < base::size(context.mipsel->regs); ++i) {
+     MaybeCaptureMemoryAround(delegate, context.mipsel->regs[i]);
+   }
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++  MaybeCaptureMemoryAround(delegate, context.ppc64->nip);
++  for (size_t i = 0; i < base::size(context.ppc64->regs); ++i) {
++    MaybeCaptureMemoryAround(delegate, context.ppc64->regs[i]);
++  }
+ #else
+ #error Port.
+ #endif
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/cpu_architecture.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/cpu_architecture.h
+@@ -43,7 +43,10 @@ enum CPUArchitecture {
+   kCPUArchitectureMIPSEL,
+ 
+   //! \brief 64-bit MIPSEL.
+-  kCPUArchitectureMIPS64EL
++  kCPUArchitectureMIPS64EL,
++
++  //! \brief 64-bit PPC64.
++  kCPUArchitecturePPC64
+ };
+ 
+ }  // namespace crashpad
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/cpu_context.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/cpu_context.cc
+@@ -169,6 +169,8 @@ uint64_t CPUContext::InstructionPointer(
+       return arm->pc;
+     case kCPUArchitectureARM64:
+       return arm64->pc;
++    case kCPUArchitecturePPC64:
++      return ppc64->nip;
+     default:
+       NOTREACHED();
+       return ~0ull;
+@@ -185,6 +187,8 @@ uint64_t CPUContext::StackPointer() cons
+       return arm->sp;
+     case kCPUArchitectureARM64:
+       return arm64->sp;
++    case kCPUArchitecturePPC64:
++      return ppc64->regs[1];
+     default:
+       NOTREACHED();
+       return ~0ull;
+@@ -196,6 +200,7 @@ bool CPUContext::Is64Bit() const {
+     case kCPUArchitectureX86_64:
+     case kCPUArchitectureARM64:
+     case kCPUArchitectureMIPS64EL:
++    case kCPUArchitecturePPC64:
+       return true;
+     case kCPUArchitectureX86:
+     case kCPUArchitectureARM:
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/cpu_context.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/cpu_context.h
+@@ -352,6 +352,24 @@ struct CPUContextMIPS64 {
+   uint64_t fir;
+ };
+ 
++//! \brief A context structure carrying PPC64 CPU state.
++struct CPUContextPPC64 {
++  uint64_t nip;
++  uint64_t msr;
++  uint64_t regs[32];
++  uint64_t ccr;
++  uint64_t xer;
++  uint64_t lnk;
++  uint64_t ctr;
++  double fpregs[32];
++  double fpscr;
++  struct {
++    uint128_struct save_vr[32];
++    uint128_struct save_vscr;
++    uint32_t save_vrsave;
++  } vregs;
++};
++
+ //! \brief A context structure capable of carrying the context of any supported
+ //!     CPU architecture.
+ struct CPUContext {
+@@ -382,6 +400,7 @@ struct CPUContext {
+     CPUContextARM64* arm64;
+     CPUContextMIPS* mipsel;
+     CPUContextMIPS64* mips64;
++    CPUContextPPC64* ppc64;
+   };
+ };
+ 
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/cpu_context_linux.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/cpu_context_linux.h
+@@ -15,6 +15,7 @@
+ #ifndef CRASHPAD_SNAPSHOT_LINUX_CPU_CONTEXT_LINUX_H_
+ #define CRASHPAD_SNAPSHOT_LINUX_CPU_CONTEXT_LINUX_H_
+ 
++#include <cstring>
+ #include "build/build_config.h"
+ #include "snapshot/cpu_context.h"
+ #include "snapshot/linux/signal_context.h"
+@@ -174,6 +175,76 @@ void InitializeCPUContextMIPS(
+ 
+ #endif  // ARCH_CPU_MIPS_FAMILY || DOXYGEN
+ 
++#if defined(ARCH_CPU_PPC64_FAMILY) || DOXYGEN
++
++//! \brief Initalizes a CPUContextPPC64 structure from native context
++//!     structures on Linux.
++//!
++//! \param[in] thread_context The native thread context.
++//! \param[in] float_context The native float context.
++//! \param[in] vector_context The native vector context.
++//! \param[out] context The CPUContextPPC64 structure to initalize.
++template <typename Traits>
++void InitializeCPUContextPPC64(
++    const ThreadContext::t64_t& thread_context,
++    const FloatContext::f64_t& float_context,
++    const VectorContext::v64_t& vector_context,
++    typename Traits::CPUContext* context) {
++
++  memcpy(context->regs, thread_context.gpr, sizeof(context->regs));
++  context->nip = thread_context.nip;
++  context->msr = thread_context.msr;
++  context->ccr = thread_context.ccr;
++  context->xer = thread_context.xer;
++  context->lnk = thread_context.lnk;
++  context->ctr = thread_context.ctr;
++
++  memcpy(context->fpregs, float_context.fpregs, sizeof(context->fpregs));
++  context->fpscr = float_context.fpscr;
++
++  for (uint8_t i = 0; i < 32; i++) {
++    context->vregs.save_vr[i] = {
++      (((uint64_t)vector_context.vrregs[i][0]) << 32) |
++        vector_context.vrregs[i][1],
++      (((uint64_t)vector_context.vrregs[i][2]) << 32) |
++        vector_context.vrregs[i][3]
++    };
++  }
++  context->vregs.save_vrsave = vector_context.vrsave;
++  context->vregs.save_vscr = {0, (uint64_t)vector_context.vscr.vscr_word};
++}
++
++template <typename Traits>
++void InitializeCPUContextPPC64(
++    const SignalThreadContext64 &thread_context,
++    const SignalFloatContext64 &float_context,
++    const SignalVectorContext64 &vector_context,
++    typename Traits::CPUContext* context) {
++
++  memcpy(context->regs, thread_context.regs, sizeof(context->regs));
++  context->nip = thread_context.nip;
++  context->msr = thread_context.msr;
++  context->ccr = thread_context.ccr;
++  context->xer = thread_context.xer;
++  context->lnk = thread_context.lnk;
++  context->ctr = thread_context.ctr;
++
++  memcpy(context->fpregs, float_context.regs, sizeof(context->fpregs));
++  context->fpscr = float_context.fpscr;
++
++  for (uint8_t i = 0; i < 32; i++) {
++    context->vregs.save_vr[i] = {
++      (((uint64_t)vector_context.vrregs[i][0]) << 32) |
++        vector_context.vrregs[i][1],
++      (((uint64_t)vector_context.vrregs[i][2]) << 32) |
++        vector_context.vrregs[i][3]
++    };
++  }
++  context->vregs.save_vrsave = vector_context.vrsave;
++  context->vregs.save_vscr = {0, (uint64_t)vector_context.vscr.vscr_word};
++}
++
++#endif
+ }  // namespace internal
+ }  // namespace crashpad
+ 
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/debug_rendezvous_test.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/debug_rendezvous_test.cc
+@@ -192,6 +192,8 @@ void TestAgainstTarget(PtraceConnection*
+               device == 0 && inode == 0 && mapping_name == "[vdso]";
+ #if defined(ARCH_CPU_X86)
+           static constexpr char kPrefix[] = "linux-gate.so.";
++#elif defined(ARCH_CPU_PPC64)
++          static constexpr char kPrefix[] = "linux-vdso64.so.";
+ #else
+           static constexpr char kPrefix[] = "linux-vdso.so.";
+ #endif
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux.cc
+@@ -323,6 +323,69 @@ bool ExceptionSnapshotLinux::ReadContext
+       reader, context_address, context_.mips64);
+ }
+ 
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++
++template <typename Traits>
++static bool ReadContext(ProcessReaderLinux* reader,
++                        LinuxVMAddress context_address,
++                        typename Traits::CPUContext* dest_context) {
++  const ProcessMemory* memory = reader->Memory();
++
++  LinuxVMAddress gp_regs_address = context_address +
++                                   offsetof(UContext, mcontext) +
++                                   offsetof(typename Traits::MContext, gp_regs);
++
++  typename Traits::SignalThreadContext thread_context;
++  if (!memory->Read(gp_regs_address, sizeof(thread_context), &thread_context)) {
++    LOG(ERROR) << "Couldn't read gp_regs!";
++    return false;
++  }
++
++  LinuxVMAddress fp_regs_address = context_address +
++                                   offsetof(UContext, mcontext) +
++                                   offsetof(typename Traits::MContext, fp_regs);
++
++  typename Traits::SignalFloatContext fp_context;
++  if (!memory->Read(fp_regs_address, sizeof(fp_context), &fp_context)) {
++    LOG(ERROR) << "Couldn't read fp_regs!";
++    return false;
++  }
++
++  LinuxVMAddress v_regs_ptr_address = context_address +
++                                  offsetof(UContext, mcontext) +
++                                  offsetof(typename Traits::MContext, vmx_reserve) + 8;
++
++  typename Traits::SignalVectorContext v_context;
++  if (!memory->Read(v_regs_ptr_address, sizeof(v_context), &v_context)) {
++    LOG(ERROR) << "Couldn't read v_regs!";
++    return false;
++  }
++
++  InitializeCPUContextPPC64<ContextTraits64>(thread_context, fp_context,
++                            v_context, dest_context);
++
++  return true;
++}
++
++template<>
++bool ExceptionSnapshotLinux::ReadContext<ContextTraits64>(
++    ProcessReaderLinux* reader,
++    LinuxVMAddress context_address) {
++  context_.architecture = kCPUArchitecturePPC64;
++  context_.ppc64 = &context_union_.ppc64;
++
++  return internal::ReadContext<ContextTraits64>(
++      reader, context_address, context_.ppc64);
++}
++
++template<>
++bool ExceptionSnapshotLinux::ReadContext<ContextTraits32>(
++    ProcessReaderLinux* reader,
++    LinuxVMAddress context_address) {
++  // PPC64 is 64-bit
++  return false;
++}
++
+ #endif  // ARCH_CPU_X86_FAMILY
+ 
+ bool ExceptionSnapshotLinux::Initialize(ProcessReaderLinux* process_reader,
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux.h
+@@ -84,6 +84,8 @@ class ExceptionSnapshotLinux final : pub
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+     CPUContextMIPS mipsel;
+     CPUContextMIPS64 mips64;
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++    CPUContextPPC64 ppc64;
+ #endif
+   } context_union_;
+   CPUContext context_;
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux_test.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux_test.cc
+@@ -296,7 +296,28 @@ void ExpectContext(const CPUContext& act
+             0);
+ #undef CPU_ARCH_NAME
+ }
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++using NativeCPUContext = ucontext_t;
+ 
++void InitializeContext(NativeCPUContext* context) {
++  for (size_t reg = 0; reg < 32; ++reg) {
++    context->uc_mcontext.gp_regs[reg] = reg;
++  }
++
++  memset(&context->uc_mcontext.fp_regs, 44,
++      sizeof(context->uc_mcontext.fp_regs));
++}
++
++void ExpectContext(const CPUContext& actual, const NativeCPUContext& expected) {
++  EXPECT_EQ(actual.architecture, kCPUArchitecturePPC64);
++
++  for (size_t reg = 0; reg < 32; ++reg) {
++    EXPECT_EQ(actual.ppc64->regs[reg], expected.uc_mcontext.gp_regs[reg]);
++  }
++
++  EXPECT_EQ(memcmp(actual.ppc64->fpregs, expected.uc_mcontext.fp_regs,
++            sizeof(actual.ppc64->fpregs)), 0);
++}
+ #else
+ #error Port.
+ #endif
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/process_reader_linux.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/process_reader_linux.cc
+@@ -108,6 +108,8 @@ void ProcessReaderLinux::Thread::Initial
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+   stack_pointer = reader->Is64Bit() ? thread_info.thread_context.t64.regs[29]
+                                     : thread_info.thread_context.t32.regs[29];
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++  stack_pointer = thread_info.thread_context.t64.gpr[1];
+ #else
+ #error Port.
+ #endif
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/signal_context.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/signal_context.h
+@@ -422,6 +422,93 @@ static_assert(offsetof(UContext<ContextT
+               "context offset mismatch");
+ #endif
+ 
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++
++struct SignalThreadContext64 {
++  uint64_t regs[32];
++  uint64_t nip;
++  uint64_t msr;
++  uint64_t orig_r3;
++  uint64_t ctr;
++  uint64_t lnk;
++  uint64_t xer;
++  uint64_t ccr;
++  uint64_t softe;
++  uint64_t trap;
++  uint64_t dar;
++  uint64_t dsisr;
++  uint64_t result;
++  uint64_t dscr;
++  uint64_t fpr0[3];
++};
++
++struct SignalFloatContext64 {
++  double regs[32];
++  double fpscr;
++};
++
++struct SignalVectorContext64 {
++  int32_t vrregs[32][4];
++  struct {
++    int32_t __pad[3];
++    int32_t vscr_word;
++  } vscr;
++  int32_t vrsave;
++  int32_t __pad[3];
++} __attribute__((__aligned__(16)));
++
++
++#pragma pack(pop)
++struct MContext64 {
++  uint64_t reserved[4];
++  int32_t signal;
++  int32_t __pad0;
++  uint64_t handler;
++  uint64_t oldmask;
++  uint64_t pt_regs_ptr;
++  SignalThreadContext64 gp_regs;
++  SignalFloatContext64  fp_regs;
++  SignalVectorContext64 *v_regs;
++#ifdef __GLIBC__
++  int64_t vmx_reserve[69];
++#else
++  int64_t vmx_reserve[101];
++#endif
++};
++
++struct ContextTraits64 : public Traits64 {
++  using MContext = MContext64;
++  using SignalThreadContext = SignalThreadContext64;
++  using SignalFloatContext = SignalFloatContext64;
++  using SignalVectorContext = SignalVectorContext64;
++  using CPUContext = CPUContextPPC64;
++};
++
++struct ContextTraits32 : public Traits32 {};
++
++struct UContext {
++  uint64_t flags;
++  uint64_t link;
++  SignalStack<ContextTraits64> stack;
++  Sigset<ContextTraits64> sigmask;
++  MContext64 mcontext;
++};
++#pragma pack(push, 1)
++
++static_assert(sizeof(UContext) == sizeof(ucontext_t),
++              "ucontext_t size mismatch");
++static_assert(sizeof(MContext64) == sizeof(mcontext_t),
++              "mcontext_t size mismatch");
++static_assert(sizeof(SignalThreadContext64) == sizeof(gregset_t),
++              "gregset_t size mismatch");
++static_assert(sizeof(SignalFloatContext64) == sizeof(fpregset_t),
++              "fpregset_t size mismatch");
++static_assert(sizeof(SignalVectorContext64) == sizeof(vrregset_t),
++              "vrregset_t size mismatch");
++static_assert(offsetof(UContext, mcontext) ==
++              offsetof(ucontext_t, uc_mcontext), "mcontext offset mismatch");
++static_assert(offsetof(MContext64, gp_regs) ==
++              offsetof(mcontext_t, gp_regs), "gp_regs offset mismatch");
+ #else
+ #error Port.
+ #endif  // ARCH_CPU_X86_FAMILY
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/system_snapshot_linux.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/system_snapshot_linux.cc
+@@ -204,6 +204,8 @@ CPUArchitecture SystemSnapshotLinux::Get
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+   return process_reader_->Is64Bit() ? kCPUArchitectureMIPS64EL
+                                     : kCPUArchitectureMIPSEL;
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++  return kCPUArchitecturePPC64;
+ #else
+ #error port to your architecture
+ #endif
+@@ -219,6 +221,9 @@ uint32_t SystemSnapshotLinux::CPURevisio
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+   // Not implementable on MIPS
+   return 0;
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++  // Not yet implemented on PPC64
++  return 0;
+ #else
+ #error port to your architecture
+ #endif
+@@ -239,6 +244,9 @@ std::string SystemSnapshotLinux::CPUVend
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+   // Not implementable on MIPS
+   return std::string();
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++  // Not yet implemented on PPC64
++  return std::string();
+ #else
+ #error port to your architecture
+ #endif
+@@ -372,6 +380,9 @@ bool SystemSnapshotLinux::NXEnabled() co
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+   // Not implementable on MIPS
+   return false;
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++  // Not yet implemented on PPC64
++  return false;
+ #else
+ #error Port.
+ #endif  // ARCH_CPU_X86_FAMILY
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/test_modules.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/test_modules.cc
+@@ -110,6 +110,8 @@ bool WriteTestModule(const base::FilePat
+   module.ehdr.e_machine = EM_AARCH64;
+ #elif defined(ARCH_CPU_MIPSEL) || defined(ARCH_CPU_MIPS64EL)
+   module.ehdr.e_machine = EM_MIPS;
++#elif defined(ARCH_CPU_PPC64)
++  module.ehdr.e_machine = EM_PPC64;
+ #endif
+ 
+   module.ehdr.e_version = EV_CURRENT;
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/thread_snapshot_linux.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/thread_snapshot_linux.cc
+@@ -186,6 +186,14 @@ bool ThreadSnapshotLinux::Initialize(Pro
+         thread.thread_info.float_context.f32,
+         context_.mipsel);
+   }
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++  context_.architecture = kCPUArchitecturePPC64;
++  context_.ppc64 = &context_union_.ppc64;
++  InitializeCPUContextPPC64<ContextTraits64>(
++      thread.thread_info.thread_context.t64,
++      thread.thread_info.float_context.f64,
++      thread.thread_info.vector_context.v64,
++      context_.ppc64);
+ #else
+ #error Port.
+ #endif
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/thread_snapshot_linux.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/thread_snapshot_linux.h
+@@ -68,6 +68,8 @@ class ThreadSnapshotLinux final : public
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+     CPUContextMIPS mipsel;
+     CPUContextMIPS64 mips64;
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++    CPUContextPPC64 ppc64;
+ #else
+ #error Port.
+ #endif  // ARCH_CPU_X86_FAMILY
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/util/linux/auxiliary_vector.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/util/linux/auxiliary_vector.cc
+@@ -56,6 +56,11 @@ bool AuxiliaryVector::Read(PtraceConnect
+     if (type == AT_IGNORE) {
+       continue;
+     }
++#if defined(ARCH_CPU_PPC64_FAMILY)
++    if (type == AT_IGNOREPPC) {
++      continue;
++    }
++#endif
+     if (!MapInsertOrReplace(&values_, type, value, nullptr)) {
+       LOG(ERROR) << "duplicate auxv entry";
+       return false;
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/util/linux/ptracer.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/util/linux/ptracer.cc
+@@ -399,6 +399,64 @@ bool GetThreadArea64(pid_t tid,
+   return true;
+ }
+ 
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++// PPC64 has had HAVE_ARCH_TRACEHOOK set since 2.6.27 (even before x86 had it).
++// That means we can simply use PTRACE_GETREGESET.
++
++template <typename Destination>
++bool GetRegisterSet(pid_t tid, int set, Destination* dest, bool can_log) {
++  iovec iov;
++  iov.iov_base = reinterpret_cast<void*>(dest);
++  iov.iov_len = sizeof(*dest);
++  if (ptrace(PTRACE_GETREGSET, tid, reinterpret_cast<void*>(set), &iov) != 0) {
++    PLOG_IF(ERROR, can_log) << "ptrace";
++    return false;
++  }
++  if (iov.iov_len != sizeof(*dest)) {
++    LOG_IF(ERROR, can_log) << "Unexpected registers size";
++    return false;
++  }
++  return true;
++}
++
++bool GetVectorRegisters64(pid_t tid,
++                          VectorContext* context,
++                          bool can_log) {
++  return GetRegisterSet(tid, NT_PPC_VMX, &context->v64, can_log);
++}
++
++bool GetFloatingPointRegisters64(pid_t tid,
++                                 FloatContext* context,
++                                 bool can_log) {
++  return GetRegisterSet(tid, NT_PRFPREG, &context->f64, can_log);
++}
++
++bool GetThreadArea64(pid_t tid,
++                     const ThreadContext& context,
++                     LinuxVMAddress* address,
++                     bool can_log) {
++  // PPC64 doesn't have PTRACE_GET_THREAD_AREA since the thread pointer
++  // is stored in GPR 13.
++  ThreadContext::t64_t tc;
++  if (!GetRegisterSet(tid, NT_PRSTATUS, &tc, can_log)) {
++    LOG_IF(ERROR, can_log) << "Unable to get thread pointer!";
++    return false;
++  }
++
++  *address = tc.gpr[13];
++
++  return true;
++}
++
++// Stubs for 32-bit functions not applicable on PPC64
++bool GetFloatingPointRegisters32(pid_t tid,
++                                 FloatContext* context,
++                                 bool can_log) { return false; }
++bool GetThreadArea32(pid_t tid,
++                     const ThreadContext &context,
++                     LinuxVMAddress *address,
++                     bool can_log) { return false; }
++
+ #else
+ #error Port.
+ #endif  // ARCH_CPU_X86_FAMILY
+@@ -495,6 +553,9 @@ bool Ptracer::GetThreadInfo(pid_t tid, T
+   if (is_64_bit_) {
+     return GetGeneralPurposeRegisters64(tid, &info->thread_context, can_log_) &&
+            GetFloatingPointRegisters64(tid, &info->float_context, can_log_) &&
++#if defined(ARCH_CPU_PPC64_FAMILY)
++           GetVectorRegisters64(tid, &info->vector_context, can_log_) &&
++#endif
+            GetThreadArea64(tid,
+                            info->thread_context,
+                            &info->thread_specific_data_address,
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/util/linux/thread_info.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/util/linux/thread_info.h
+@@ -39,6 +39,13 @@ struct user_vfp_exc {
+ #include <android/api-level.h>
+ #endif
+ 
++#if defined(ARCH_CPU_PPC64_FAMILY)
++#include <sys/ucontext.h>
++#if !defined(__GLIBC__)
++#include <asm/ptrace.h>
++#endif
++#endif
++
+ namespace crashpad {
+ 
+ //! \brief The set of general purpose registers for an architecture family.
+@@ -90,6 +97,8 @@ union ThreadContext {
+     uint32_t cp0_status;
+     uint32_t cp0_cause;
+     uint32_t padding1_;
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++    // PPC64 is 64-bit
+ #else
+ #error Port.
+ #endif  // ARCH_CPU_X86_FAMILY
+@@ -143,6 +152,21 @@ union ThreadContext {
+     uint64_t cp0_badvaddr;
+     uint64_t cp0_status;
+     uint64_t cp0_cause;
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++    // Reflects struct pt_regs in asm/ptrace.h.
++    uint64_t gpr[32];
++    uint64_t nip;
++    uint64_t msr;
++    uint64_t orig_gpr3;
++    uint64_t ctr;
++    uint64_t lnk;
++    uint64_t xer;
++    uint64_t ccr;
++    uint64_t softe;
++    uint64_t trap;
++    uint64_t dar;
++    uint64_t dsisr;
++    uint64_t result;
+ #else
+ #error Port.
+ #endif  // ARCH_CPU_X86_FAMILY
+@@ -154,6 +178,8 @@ union ThreadContext {
+   using NativeThreadContext = user_regs;
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+ // No appropriate NativeThreadsContext type available for MIPS
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++  using NativeThreadContext = struct pt_regs;
+ #else
+ #error Port.
+ #endif  // ARCH_CPU_X86_FAMILY || ARCH_CPU_ARM64
+@@ -229,6 +255,9 @@ union FloatContext {
+     } fpregs[32];
+     uint32_t fpcsr;
+     uint32_t fpu_id;
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++    // Crashpad's PPC support is 64-bit only, so this
++    // 32bit-only struct is declared as empty.
+ #else
+ #error Port.
+ #endif  // ARCH_CPU_X86_FAMILY
+@@ -263,6 +292,10 @@ union FloatContext {
+     double fpregs[32];
+     uint32_t fpcsr;
+     uint32_t fpu_id;
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++    // Reflects fpregset_t in sys/ucontext.h
++    double fpregs[32];
++    double fpscr;
+ #else
+ #error Port.
+ #endif  // ARCH_CPU_X86_FAMILY
+@@ -291,6 +324,8 @@ union FloatContext {
+   static_assert(sizeof(f64) == sizeof(user_fpsimd_struct), "Size mismatch");
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+ // No appropriate floating point context native type for available MIPS.
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++  static_assert(sizeof(f64) == sizeof(fpregset_t), "Size mismatch");
+ #else
+ #error Port.
+ #endif  // ARCH_CPU_X86
+@@ -298,6 +333,26 @@ union FloatContext {
+ static_assert(std::is_standard_layout<FloatContext>::value,
+               "Not standard layout");
+ 
++//! \brief The vector registers used for an architecture family
++union VectorContext {
++  struct v32_t {} v32;
++#if defined(ARCH_CPU_PPC64_FAMILY)
++  __attribute__((__aligned__(16))) // Vector context must be doubleword aligned.
++#endif
++  struct v64_t {
++#if defined(ARCH_CPU_PPC64_FAMILY)
++    // Reflects vrregset_t in sys/ucontext.h
++    uint32_t vrregs[32][4];
++    struct {
++      uint32_t __pad[3];
++      uint32_t vscr_word;
++    } vscr;
++    uint32_t vrsave;
++    uint32_t __pad[3];
++#endif
++  } v64;
++};
++
+ //! \brief A collection of `ptrace`-able information about a thread.
+ struct ThreadInfo {
+   ThreadInfo();
+@@ -309,6 +364,9 @@ struct ThreadInfo {
+   //! \brief The floating point registers for the thread.
+   FloatContext float_context;
+ 
++  //! \brief (Optional) The vector registers used for the thread.
++  VectorContext vector_context;
++
+   //! \brief The thread-local storage address for the thread.
+   LinuxVMAddress thread_specific_data_address;
+ };
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/util/misc/capture_context.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/util/misc/capture_context.h
+@@ -69,6 +69,7 @@ using NativeCPUContext = ucontext_t;
+ //!     macOS/Linux/Fuchsia | x86_64       | `%%rdi`
+ //!     Linux               | ARM/ARM64    | `r0`/`x0`
+ //!     Linux               | MIPS/MIPS64  | `$a0`
++//!     Linux               | PPC64        | `r3`
+ //!
+ //!     Additionally, the value `LR` on ARM/ARM64 will be the return address of
+ //!     this function.
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/util/misc/capture_context_linux.S
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/util/misc/capture_context_linux.S
+@@ -32,7 +32,7 @@
+   .balign 4, 0x0
+   .type CAPTURECONTEXT_SYMBOL, %function
+   .type CAPTURECONTEXT_SYMBOL2, %function
+-#elif defined(__mips__)
++#elif defined(__mips__) || defined(__powerpc64__)
+   .balign 4, 0x0
+ #endif
+ 
+@@ -423,4 +423,214 @@ CAPTURECONTEXT_SYMBOL2:
+   jr $ra
+ 
+   .set at
++#elif defined(__powerpc64__)
++  // Store r0-r31
++  std 0, 0xe8(3)   // context->uc_mcontext.gp_regs[0]
++  std 1, 0xf0(3)   // context->uc_mcontext.gp_regs[1]
++  std 2, 0xf8(3)   // context->uc_mcontext.gp_regs[2]
++  // note that r3's original value was lost
++  std 3, 0x100(3)  // context->uc_mcontext.gp_regs[3]
++  std 4, 0x108(3)  // context->uc_mcontext.gp_regs[4]
++  std 5, 0x110(3)  // context->uc_mcontext.gp_regs[5]
++  std 6, 0x118(3)  // context->uc_mcontext.gp_regs[6]
++  std 7, 0x120(3)  // context->uc_mcontext.gp_regs[7]
++  std 8, 0x128(3)  // context->uc_mcontext.gp_regs[8]
++  std 9, 0x130(3)  // context->uc_mcontext.gp_regs[9]
++  std 10, 0x138(3) // context->uc_mcontext.gp_regs[10]
++  std 11, 0x140(3) // context->uc_mcontext.gp_regs[11]
++  std 12, 0x148(3) // context->uc_mcontext.gp_regs[12]
++  std 13, 0x150(3) // context->uc_mcontext.gp_regs[13]
++  std 14, 0x158(3) // context->uc_mcontext.gp_regs[14]
++  std 15, 0x160(3) // context->uc_mcontext.gp_regs[15]
++  std 16, 0x168(3) // context->uc_mcontext.gp_regs[16]
++  std 17, 0x170(3) // context->uc_mcontext.gp_regs[17]
++  std 18, 0x178(3) // context->uc_mcontext.gp_regs[18]
++  std 19, 0x180(3) // context->uc_mcontext.gp_regs[19]
++  std 20, 0x188(3) // context->uc_mcontext.gp_regs[20]
++  std 21, 0x190(3) // context->uc_mcontext.gp_regs[21]
++  std 22, 0x198(3) // context->uc_mcontext.gp_regs[22]
++  std 23, 0x1a0(3) // context->uc_mcontext.gp_regs[23]
++  std 24, 0x1a8(3) // context->uc_mcontext.gp_regs[24]
++  std 25, 0x1b0(3) // context->uc_mcontext.gp_regs[25]
++  std 26, 0x1b8(3) // context->uc_mcontext.gp_regs[26]
++  std 27, 0x1c0(3) // context->uc_mcontext.gp_regs[27]
++  std 28, 0x1c8(3) // context->uc_mcontext.gp_regs[28]
++  std 29, 0x1d0(3) // context->uc_mcontext.gp_regs[29]
++  std 30, 0x1d8(3) // context->uc_mcontext.gp_regs[30]
++  std 31, 0x1e0(3) // context->uc_mcontext.gp_regs[31]
++
++  // For NIP, we can use the value in the link register
++  mflr 0
++  std 0, 0x1e8(3) // context->uc_mcontext.gp_regs[PT_NIP]
++
++  // CTR
++  mfctr 0
++  std 0, 0x200(3) // context->uc_mcontext.gp_regs[PT_CTR]
++
++  // For LNK, we'll use the caller's LR save area (2 stack frames up).
++  // r4 can be used as a scratch register since it has already been saved.
++  ld 4, 0(1)
++  ld 4, 16(4)
++  std 4, 0x208(3) // context->uc_mcontext.gp_regs[PT_LNK]
++
++  // XER
++  mfxer 0
++  std 0, 0x210(3) // context->uc_mcontext.gp_regs[PT_XER]
++
++  // CCR
++  mfcr 0
++  std 0, 0x218(3) // context->uc_mcontext.gp_regs[PT_CCR]
++
++  // MSR, orig_r3, MQ, TRAP, DAR, DSISR, RESULT, DSCR,
++  // not used or not relevant,  zero them out.
++  li 4, 0
++  std 4, 0x1f0(3) // context->uc_mcontext.gp_regs[PT_MSR]
++  std 4, 0x1f8(3) // context->uc_mcontext.gp_regs[PT_ORIG_R3]
++  std 4, 0x220(3) // context->uc_mcontext.gp_regs[PT_MQ]
++  std 4, 0x228(3) // context->uc_mcontext.gp_regs[PT_TRAP]
++  std 4, 0x230(3) // context->uc_mcontext.gp_regs[PT_DAR]
++  std 4, 0x238(3) // context->uc_mcontext.gp_regs[PT_DSISR]
++  std 4, 0x240(3) // context->uc_mcontext.gp_regs[PT_RESULT]
++  std 4, 0x248(3) // context->uc_mcontext.gp_regs[PT_DSCR]
++
++  // Update context->uc_mcontext.regs to point to gp_regs
++  addi 0, 3, 0xe8
++  std 0, 0xe0(3)
++
++  // Save floating point registers 0-31
++  stfd 0, 0x268(3)  // context->uc_mcontext.fp_regs[0]
++  stfd 1, 0x270(3)  // context->uc_mcontext.fp_regs[1]
++  stfd 2, 0x278(3)  // context->uc_mcontext.fp_regs[2]
++  stfd 3, 0x280(3)  // context->uc_mcontext.fp_regs[3]
++  stfd 4, 0x288(3)  // context->uc_mcontext.fp_regs[4]
++  stfd 5, 0x290(3)  // context->uc_mcontext.fp_regs[5]
++  stfd 6, 0x298(3)  // context->uc_mcontext.fp_regs[6]
++  stfd 7, 0x2a0(3)  // context->uc_mcontext.fp_regs[7]
++  stfd 8, 0x2a8(3)  // context->uc_mcontext.fp_regs[8]
++  stfd 9, 0x2b0(3)  // context->uc_mcontext.fp_regs[9]
++  stfd 10, 0x2b8(3) // context->uc_mcontext.fp_regs[10]
++  stfd 11, 0x2c0(3) // context->uc_mcontext.fp_regs[11]
++  stfd 12, 0x2c8(3) // context->uc_mcontext.fp_regs[12]
++  stfd 13, 0x2d0(3) // context->uc_mcontext.fp_regs[13]
++  stfd 14, 0x2d8(3) // context->uc_mcontext.fp_regs[14]
++  stfd 15, 0x2e0(3) // context->uc_mcontext.fp_regs[15]
++  stfd 16, 0x2e8(3) // context->uc_mcontext.fp_regs[16]
++  stfd 17, 0x2f0(3) // context->uc_mcontext.fp_regs[17]
++  stfd 18, 0x2f8(3) // context->uc_mcontext.fp_regs[18]
++  stfd 19, 0x300(3) // context->uc_mcontext.fp_regs[19]
++  stfd 20, 0x308(3) // context->uc_mcontext.fp_regs[20]
++  stfd 21, 0x310(3) // context->uc_mcontext.fp_regs[21]
++  stfd 22, 0x318(3) // context->uc_mcontext.fp_regs[22]
++  stfd 23, 0x320(3) // context->uc_mcontext.fp_regs[23]
++  stfd 24, 0x328(3) // context->uc_mcontext.fp_regs[24]
++  stfd 25, 0x330(3) // context->uc_mcontext.fp_regs[25]
++  stfd 26, 0x338(3) // context->uc_mcontext.fp_regs[26]
++  stfd 27, 0x340(3) // context->uc_mcontext.fp_regs[27]
++  stfd 28, 0x348(3) // context->uc_mcontext.fp_regs[28]
++  stfd 29, 0x350(3) // context->uc_mcontext.fp_regs[29]
++  stfd 30, 0x358(3) // context->uc_mcontext.fp_regs[30]
++  stfd 31, 0x360(3) // context->uc_mcontext.fp_regs[31]
++
++  // FPSCR
++  mffs 0
++  stfd 0, 0x368(3) // context->uc_mcontext.fp_regs[32]
++
++  // Save VMX Vector registers
++  // Update r4 to contain the base address of vmx_reserve
++  addi 4, 3, 0x378
++  // Ensure that it is quadword aligned
++  andi. 5, 4, 0xF
++  beq 1f // No alignment is necessary
++  // Address is doubleword aligned and not quadword aligned, add 8
++  addi 4, 4, 8
++
++1:
++  // Store VMX registers 0-31
++  // r4 will contain the base address
++  // r5 will contain the index
++  li 5, 0
++  stvx 0, 4, 5   // context->uc_mcontext.vmx_reserve[(align) + 0]
++  addi 5, 5, 16
++  stvx 1, 4, 5   // context->uc_mcontext.vmx_reserve[(align) + 1]
++  addi 5, 5, 16
++  stvx 2, 4, 5   // context->uc_mcontext.vmx_reserve[(align) + 2]
++  addi 5, 5, 16
++  stvx 3, 4, 5   // context->uc_mcontext.vmx_reserve[(align) + 3]
++  addi 5, 5, 16
++  stvx 4, 4, 5   // context->uc_mcontext.vmx_reserve[(align) + 4]
++  addi 5, 5, 16
++  stvx 5, 4, 5   // context->uc_mcontext.vmx_reserve[(align) + 5]
++  addi 5, 5, 16
++  stvx 6, 4, 5   // context->uc_mcontext.vmx_reserve[(align) + 6]
++  addi 5, 5, 16
++  stvx 7, 4, 5   // context->uc_mcontext.vmx_reserve[(align) + 7]
++  addi 5, 5, 16
++  stvx 8, 4, 5   // context->uc_mcontext.vmx_reserve[(align) + 8]
++  addi 5, 5, 16
++  stvx 9, 4, 5   // context->uc_mcontext.vmx_reserve[(align) + 9]
++  addi 5, 5, 16
++  stvx 10, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 10]
++  addi 5, 5, 16
++  stvx 11, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 11]
++  addi 5, 5, 16
++  stvx 12, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 12]
++  addi 5, 5, 16
++  stvx 13, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 13]
++  addi 5, 5, 16
++  stvx 14, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 14]
++  addi 5, 5, 16
++  stvx 15, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 15]
++  addi 5, 5, 16
++  stvx 16, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 16]
++  addi 5, 5, 16
++  stvx 17, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 17]
++  addi 5, 5, 16
++  stvx 18, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 18]
++  addi 5, 5, 16
++  stvx 19, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 19]
++  addi 5, 5, 16
++  stvx 20, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 20]
++  addi 5, 5, 16
++  stvx 21, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 21]
++  addi 5, 5, 16
++  stvx 22, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 22]
++  addi 5, 5, 16
++  stvx 23, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 23]
++  addi 5, 5, 16
++  stvx 24, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 24]
++  addi 5, 5, 16
++  stvx 25, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 25]
++  addi 5, 5, 16
++  stvx 26, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 26]
++  addi 5, 5, 16
++  stvx 27, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 27]
++  addi 5, 5, 16
++  stvx 28, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 28]
++  addi 5, 5, 16
++  stvx 29, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 29]
++  addi 5, 5, 16
++  stvx 30, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 30]
++  addi 5, 5, 16
++  stvx 31, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 31]
++  addi 5, 5, 16
++
++  // VSCR
++  mfvscr 0
++  stvx 0, 4, 5
++  addi 5, 5, 16
++
++  // VRSAVE
++  mfvrsave 0
++  stwx 0, 4, 5
++
++  // Update context->uc_mcontext.v_regs to point to vmx_reserve + alignment.
++  std 4, 0x370(3)
++
++  // Zero out all unused fields
++  li 4, 0
++  std 4, 0xc8(3) // context->uc_mcontext.signal
++  std 4, 0xd0(3) // context->uc_mcontext.handler
++  std 4, 0xd8(3) // context->uc_mcontext.oldmask
++
++  blr
+ #endif  // __i386__
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/util/misc/capture_context_test.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/util/misc/capture_context_test.cc
+@@ -57,7 +57,7 @@ void TestCaptureContext() {
+   uintptr_t pc = ProgramCounterFromContext(context_1);
+ 
+ #if !defined(ADDRESS_SANITIZER) && !defined(ARCH_CPU_MIPS_FAMILY) && \
+-    !defined(MEMORY_SANITIZER)
++    !defined(MEMORY_SANITIZER) && !defined(ARCH_CPU_PPC64_FAMILY)
+   // Sanitizers can cause enough code bloat that the “nearby” check would
+   // likely fail.
+   const uintptr_t kReferencePC =
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/util/misc/capture_context_test_util_linux.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/util/misc/capture_context_test_util_linux.cc
+@@ -35,6 +35,8 @@ void SanityCheckContext(const NativeCPUC
+   EXPECT_EQ(context.uc_mcontext.regs[0], FromPointerCast<uintptr_t>(&context));
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+   EXPECT_EQ(context.uc_mcontext.gregs[4], FromPointerCast<uintptr_t>(&context));
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++  EXPECT_EQ(context.uc_mcontext.gp_regs[3], FromPointerCast<uintptr_t>(&context));
+ #endif
+ }
+ 
+@@ -49,6 +51,8 @@ uintptr_t ProgramCounterFromContext(cons
+   return context.uc_mcontext.pc;
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+   return context.uc_mcontext.pc;
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++  return context.uc_mcontext.gp_regs[PT_NIP];
+ #endif
+ }
+ 
+@@ -63,6 +67,8 @@ uintptr_t StackPointerFromContext(const
+   return context.uc_mcontext.sp;
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+   return context.uc_mcontext.gregs[29];
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++  return context.uc_mcontext.gp_regs[1];
+ #endif
+ }
+ 
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/util/posix/signals_test.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/util/posix/signals_test.cc
+@@ -46,9 +46,9 @@ bool CanCauseSignal(int sig) {
+   return sig == SIGABRT ||
+          sig == SIGALRM ||
+          sig == SIGBUS ||
+-#if !defined(ARCH_CPU_ARM64)
++#if !defined(ARCH_CPU_ARM64) && !defined(ARCH_CPU_PPC64)
+          sig == SIGFPE ||
+-#endif  // !defined(ARCH_CPU_ARM64)
++#endif  // !defined(ARCH_CPU_ARM64) && !defined(ARCH_CPU_PPC64)
+ #if defined(ARCH_CPU_X86_FAMILY) || defined(ARCH_CPU_ARMEL)
+          sig == SIGILL ||
+ #endif  // defined(ARCH_CPU_X86_FAMILY) || defined(ARCH_CPU_ARMEL)
+@@ -117,9 +117,11 @@ void CauseSignal(int sig) {
+       break;
+     }
+ 
+-#if !defined(ARCH_CPU_ARM64)
++#if !defined(ARCH_CPU_ARM64) && !defined(ARCH_CPU_PPC64)
+     // ARM64 has hardware integer division instructions that don’t generate a
+     // trap for divide-by-zero, so this doesn’t produce SIGFPE.
++    //
++    // PPC64 fixed-point division by zero also doesn't produce a SIGFPE.
+     case SIGFPE: {
+       // Optimization makes this tricky, so get zero from a system call likely
+       // to succeed, and try to do something with the result.
+@@ -137,7 +139,7 @@ void CauseSignal(int sig) {
+       fstat(quotient, &stat_buf);
+       break;
+     }
+-#endif  // ARCH_CPU_ARM64
++#endif  // !defined(ARCH_CPU_ARM64) && !defined(ARCH_CPU_PPC64)
+ 
+ #if defined(ARCH_CPU_X86_FAMILY) || defined(ARCH_CPU_ARMEL)
+     case SIGILL: {
+--- a/src/3rdparty/chromium/third_party/dav1d/BUILD.gn
++++ b/src/3rdparty/chromium/third_party/dav1d/BUILD.gn
+@@ -196,6 +196,8 @@ static_library("dav1d_8bit") {
+     sources += arm_template_sources
+   } else if (current_cpu == "arm64") {
+     sources += arm_template_sources
++  } else if (current_cpu == "ppc64") {
++    sources += ppc64_template_sources
+   }
+ 
+   cflags = dav1d_copts
+@@ -226,6 +228,8 @@ static_library("dav1d_10bit") {
+     sources += arm_template_sources
+   } else if (current_cpu == "arm64") {
+     sources += arm_template_sources
++  } else if (current_cpu == "ppc64") {
++    sources += ppc64_template_sources
+   }
+ 
+   cflags = dav1d_copts
+@@ -283,6 +287,21 @@ if (current_cpu == "x86" || current_cpu
+     }
+ 
+     cflags = dav1d_copts
++  }
++} else if (current_cpu == "ppc64") {
++  static_library("dav1d_ppc") {
++    sources = [
++      "libdav1d/src/ppc/cpu.c",
++      "libdav1d/src/ppc/cpu.h",
++    ]
++
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [
++      "//build/config/compiler:no_chromium_code",
++      ":dav1d_config",
++    ]
++
++    cflags = dav1d_copts
+ 
+     deps = [ ":dav1d_headers" ]
+     allow_circular_includes_from = [ ":dav1d_headers" ]
+@@ -315,5 +334,7 @@ static_library("dav1d") {
+     }
+   } else if (current_cpu == "arm" || current_cpu == "arm64") {
+     deps += [ ":dav1d_arm" ]
++  } else if (current_cpu == "ppc64") {
++    deps += [ ":dav1d_ppc" ]
+   }
+ }
+--- a/src/3rdparty/chromium/third_party/dav1d/dav1d_generated.gni
++++ b/src/3rdparty/chromium/third_party/dav1d/dav1d_generated.gni
+@@ -103,6 +103,11 @@ arm_template_sources = [
+   "libdav1d/src/arm/mc_init_tmpl.c",
+ ]
+ 
++ppc64_template_sources = [
++  "libdav1d/src/ppc/cdef_init_tmpl.c",
++  "libdav1d/src/ppc/looprestoration_init_tmpl.c",
++]
++
+ template_sources = [
+   "libdav1d/src/cdef_apply_tmpl.c",
+   "libdav1d/src/cdef_tmpl.c",
+--- a/src/3rdparty/chromium/third_party/dav1d/generate_source.py
++++ b/src/3rdparty/chromium/third_party/dav1d/generate_source.py
+@@ -57,6 +57,8 @@ def _WriteGn(fd):
+   _WriteArray(fd, "arm64_asm_sources", _Glob("libdav1d/src/arm/64/*.S"))
+   _WriteArray(fd, "arm_template_sources", _Glob("libdav1d/src/arm/*_tmpl.c"))
+ 
++  _WriteArray(fd, "ppc64_template_sources", _Glob("libdav1d/src/ppc/*_tmpl.c"))
++
+   template_sources = _Glob("libdav1d/src/*_tmpl.c")
+   _WriteArray(fd, "template_sources", template_sources)
+ 
+--- a/src/3rdparty/chromium/third_party/dav1d/libdav1d/src/ppc/types.h
++++ b/src/3rdparty/chromium/third_party/dav1d/libdav1d/src/ppc/types.h
+@@ -51,4 +51,19 @@
+ #define u16l_to_i32(v) ((i32x4) vec_mergel((u16x8) v, vec_splat_u16(0)))
+ #define i16l_to_i32(v) ((i32x4) vec_unpackl((i16x8)v))
+ 
++#if defined(__clang__)
++#undef vec_splats
++#define vec_splats(N)                     \
++    _Generic((N),                         \
++        unsigned char:      ((u8x16)(N)), \
++        signed char:        ((i8x16)(N)), \
++        unsigned short:     ((u16x8)(N)), \
++        signed short:       ((i16x8)(N)), \
++        unsigned int:       ((u32x4)(N)), \
++        signed int:         ((i32x4)(N)), \
++        unsigned long long: ((u64x2)(N)), \
++        signed long long:   ((i64x2)(N))  \
++    )
++#endif
++
+ #endif /* DAV1D_SRC_PPC_TYPES_H */
+--- a/src/3rdparty/chromium/third_party/eigen3/BUILD.gn
++++ b/src/3rdparty/chromium/third_party/eigen3/BUILD.gn
+@@ -22,4 +22,8 @@ config("eigen_includes") {
+     # for this component on Windows on Arm due to compilation errors.
+     defines += [ "EIGEN_DONT_VECTORIZE" ]
+   }
++
++  if (target_cpu == "ppc64") {
++    defines += [ "EIGEN_DONT_VECTORIZE" ]
++  }
+ }
+--- a/src/3rdparty/chromium/third_party/libaom/BUILD.gn
++++ b/src/3rdparty/chromium/third_party/libaom/BUILD.gn
+@@ -37,6 +37,8 @@ if (enable_libaom) {
+     } else {
+       cpu_arch_full = "arm"
+     }
++  } else if (current_cpu == "ppc64") {
++    cpu_arch_full = "generic"
+   } else {
+     cpu_arch_full = current_cpu
+   }
+--- a/src/3rdparty/chromium/third_party/libgav1/options.gni
++++ b/src/3rdparty/chromium/third_party/libgav1/options.gni
+@@ -12,5 +12,5 @@ declare_args() {
+       is_chromeos_ash && (target_cpu == "arm" || target_cpu == "arm64")
+   use_libgav1_parser =
+       (is_chromeos || is_linux || is_win) &&
+-      (target_cpu == "x86" || target_cpu == "x64" || target_cpu == "arm64")
++      (target_cpu == "x86" || target_cpu == "x64" || target_cpu == "arm64" || target_cpu == "ppc64")
+ }
+--- a/src/3rdparty/chromium/third_party/lss/linux_syscall_support.h
++++ b/src/3rdparty/chromium/third_party/lss/linux_syscall_support.h
+@@ -4262,7 +4262,7 @@ struct kernel_statfs {
+       LSS_REG(2, buf);
+       LSS_BODY(void*, mmap2, "0"(__r2));
+     }
+-#else
++#elif !defined(__powerpc64__) /* ppc64 doesn't have mmap2 */
+     #define __NR__mmap2 __NR_mmap2
+     LSS_INLINE _syscall6(void*, _mmap2,            void*, s,
+                          size_t,                   l, int,               p,
+@@ -4373,7 +4373,7 @@ struct kernel_statfs {
+   #if defined(__i386__) ||                                                    \
+       defined(__ARM_ARCH_3__) || defined(__ARM_EABI__) ||                     \
+      (defined(__mips__) && _MIPS_SIM == _MIPS_SIM_ABI32) ||                   \
+-      defined(__PPC__) ||                                                     \
++     (defined(__PPC__) && !defined(__powerpc64__)) ||                                                     \
+      (defined(__s390__) && !defined(__s390x__))
+     /* On these architectures, implement mmap() with mmap2(). */
+     LSS_INLINE void* LSS_NAME(mmap)(void *s, size_t l, int p, int f, int d,
+@@ -4556,9 +4556,17 @@ struct kernel_statfs {
+     }
+   #endif
+   #if defined(__NR_fstatat64)
++    #if !defined(__GLIBC__)
++        // musl doesn't define fstatat64 fstatat
++        #undef fstatat64
++    #endif
+     LSS_INLINE _syscall4(int,   fstatat64,        int,   d,
+                          const char *,      p,
+                          struct kernel_stat64 *,   b,    int,   f)
++    #if !defined(__GLIBC__)
++    	// then restore it
++        #define fstatat64 fstatat
++    #endif
+   #endif
+   #if defined(__NR_waitpid)
+     // waitpid is polyfilled below when not available.
+--- a/src/3rdparty/chromium/third_party/pdfium/third_party/libpng16/pngpriv.h
++++ b/src/3rdparty/chromium/third_party/pdfium/third_party/libpng16/pngpriv.h
+@@ -196,11 +196,7 @@
+ #endif
+ 
+ #ifndef PNG_POWERPC_VSX_OPT
+-#  if defined(__PPC64__) && defined(__ALTIVEC__) && defined(__VSX__)
+-#     define PNG_POWERPC_VSX_OPT 2
+-#  else
+-#     define PNG_POWERPC_VSX_OPT 0
+-#  endif
++#  define PNG_POWERPC_VSX_OPT 0
+ #endif
+ 
+ #ifndef PNG_INTEL_SSE_OPT
+--- a/src/3rdparty/chromium/third_party/pffft/src/pffft.c
++++ b/src/3rdparty/chromium/third_party/pffft/src/pffft.c
+@@ -100,6 +100,7 @@
+    Altivec support macros 
+ */
+ #if !defined(PFFFT_SIMD_DISABLE) && (defined(__ppc__) || defined(__ppc64__))
++#include <altivec.h>
+ typedef vector float v4sf;
+ #  define SIMD_SZ 4
+ #  define VZERO() ((vector float) vec_splat_u8(0))
+--- a/src/3rdparty/chromium/third_party/skia/src/sksl/SkSLString.cpp
++++ b/src/3rdparty/chromium/third_party/skia/src/sksl/SkSLString.cpp
+@@ -142,7 +142,12 @@ String to_string(double value) {
+     if (needsDotZero) {
+         buffer << ".0";
+     }
+-    return String(buffer.str().c_str());
++
++    std::string ret(buffer.str());
++    if (signbit(value) && ret[0] == '.') {
++        ret[0] = '-';
++    }
++    return String(ret.c_str());
+ }
+ 
+ bool stod(const skstd::string_view& s, SKSL_FLOAT* value) {
+--- a/src/3rdparty/chromium/third_party/sqlite/src/amalgamation/sqlite3.c
++++ b/src/3rdparty/chromium/third_party/sqlite/src/amalgamation/sqlite3.c
+@@ -14628,7 +14628,8 @@ typedef INT16_TYPE LogEst;
+ # if defined(i386)      || defined(__i386__)      || defined(_M_IX86) ||    \
+      defined(__x86_64)  || defined(__x86_64__)    || defined(_M_X64)  ||    \
+      defined(_M_AMD64)  || defined(_M_ARM)        || defined(__x86)   ||    \
+-     defined(__ARMEL__) || defined(__AARCH64EL__) || defined(_M_ARM64)
++     defined(__ARMEL__) || defined(__AARCH64EL__) || defined(_M_ARM64) ||   \
++     defined(__powerpc64__) && (__BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__)
+ #   define SQLITE_BYTEORDER    1234
+ # elif defined(sparc)     || defined(__ppc__) || \
+        defined(__ARMEB__) || defined(__AARCH64EB__)
+--- a/src/3rdparty/chromium/third_party/sqlite/src/amalgamation_dev/sqlite3.c
++++ b/src/3rdparty/chromium/third_party/sqlite/src/amalgamation_dev/sqlite3.c
+@@ -14641,7 +14641,8 @@ typedef INT16_TYPE LogEst;
+ # if defined(i386)      || defined(__i386__)      || defined(_M_IX86) ||    \
+      defined(__x86_64)  || defined(__x86_64__)    || defined(_M_X64)  ||    \
+      defined(_M_AMD64)  || defined(_M_ARM)        || defined(__x86)   ||    \
+-     defined(__ARMEL__) || defined(__AARCH64EL__) || defined(_M_ARM64)
++     defined(__ARMEL__) || defined(__AARCH64EL__) || defined(_M_ARM64) ||   \
++     defined(__powerpc64__) && (__BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__)
+ #   define SQLITE_BYTEORDER    1234
+ # elif defined(sparc)     || defined(__ppc__) || \
+        defined(__ARMEB__) || defined(__AARCH64EB__)
+--- a/src/3rdparty/chromium/third_party/sqlite/src/ext/rtree/rtree.c
++++ b/src/3rdparty/chromium/third_party/sqlite/src/ext/rtree/rtree.c
+@@ -450,7 +450,7 @@ struct RtreeMatchArg {
+ #if defined(i386)     || defined(__i386__)   || defined(_M_IX86) ||    \
+     defined(__x86_64) || defined(__x86_64__) || defined(_M_X64)  ||    \
+     defined(_M_AMD64) || defined(_M_ARM)     || defined(__x86)   ||    \
+-    defined(__arm__)
++    defined(__arm__) || defined(__powerpc64__) && (__BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__)
+ # define SQLITE_BYTEORDER    1234
+ #elif defined(sparc)    || defined(__ppc__)
+ # define SQLITE_BYTEORDER    4321
+--- a/src/3rdparty/chromium/third_party/sqlite/src/src/sqliteInt.h
++++ b/src/3rdparty/chromium/third_party/sqlite/src/src/sqliteInt.h
+@@ -890,7 +890,8 @@ typedef INT16_TYPE LogEst;
+ # if defined(i386)      || defined(__i386__)      || defined(_M_IX86) ||    \
+      defined(__x86_64)  || defined(__x86_64__)    || defined(_M_X64)  ||    \
+      defined(_M_AMD64)  || defined(_M_ARM)        || defined(__x86)   ||    \
+-     defined(__ARMEL__) || defined(__AARCH64EL__) || defined(_M_ARM64)
++     defined(__ARMEL__) || defined(__AARCH64EL__) || defined(_M_ARM64) || \
++     defined(__powerpc64__) && (__BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__)
+ #   define SQLITE_BYTEORDER    1234
+ # elif defined(sparc)     || defined(__ppc__) || \
+        defined(__ARMEB__) || defined(__AARCH64EB__)
+--- a/src/3rdparty/chromium/third_party/webrtc/modules/desktop_capture/differ_block.cc
++++ b/src/3rdparty/chromium/third_party/webrtc/modules/desktop_capture/differ_block.cc
+@@ -30,11 +30,7 @@ bool VectorDifference(const uint8_t* ima
+   static bool (*diff_proc)(const uint8_t*, const uint8_t*) = nullptr;
+ 
+   if (!diff_proc) {
+-#if defined(WEBRTC_ARCH_ARM_FAMILY) || defined(WEBRTC_ARCH_MIPS_FAMILY)
+-    // For ARM and MIPS processors, always use C version.
+-    // TODO(hclam): Implement a NEON version.
+-    diff_proc = &VectorDifference_C;
+-#else
++#if defined(WEBRTC_ARCH_X86_FAMILY)
+     bool have_sse2 = GetCPUInfo(kSSE2) != 0;
+     // For x86 processors, check if SSE2 is supported.
+     if (have_sse2 && kBlockSize == 32) {
+@@ -44,6 +40,10 @@ bool VectorDifference(const uint8_t* ima
+     } else {
+       diff_proc = &VectorDifference_C;
+     }
++#else
++    // For other processors, always use C version.
++    // TODO(hclam): Implement a NEON version.
++    diff_proc = &VectorDifference_C;
+ #endif
+   }
+ 
+--- a/src/3rdparty/chromium/v8/BUILD.gn
++++ b/src/3rdparty/chromium/v8/BUILD.gn
+@@ -1083,6 +1083,12 @@ config("toolchain") {
+     }
+     if (host_byteorder == "little") {
+       defines += [ "V8_TARGET_ARCH_PPC_LE" ]
++      cflags += [
++        # Enable usage of AltiVec, VSX, and other POWER8 and higher features
++        "-mcpu=power8",
++        "-maltivec",
++        "-mvsx",
++      ]
+     } else if (host_byteorder == "big") {
+       defines += [ "V8_TARGET_ARCH_PPC_BE" ]
+       if (current_os == "aix") {
+--- a/src/3rdparty/chromium/ui/gl/features.gni
++++ b/src/3rdparty/chromium/ui/gl/features.gni
+@@ -35,7 +35,8 @@ declare_args() {
+                         (is_mac && use_egl) || is_chromeos_ash || is_fuchsia) &&
+                        (target_cpu == "x86" || target_cpu == "x64" ||
+                         target_cpu == "arm" || target_cpu == "arm64" ||
+-                        target_cpu == "mipsel" || target_cpu == "mips64el")
++                        target_cpu == "mipsel" || target_cpu == "mips64el" ||
++                        target_cpu == "ppc64")
+ }
+ 
+ use_glx = use_x11 || ozone_platform_x11
+--- a/src/3rdparty/chromium/v8/test/BUILD.gn
++++ b/src/3rdparty/chromium/v8/test/BUILD.gn
+@@ -42,7 +42,6 @@ group("gn_all") {
+       "benchmarks/cpp:gn_all",
+       "cctest:cctest",
+       "cctest:generate-bytecode-expectations",
+-      "unittests:unittests",
+     ]
+   }
+ }
+@@ -84,7 +83,6 @@ group("v8_bot_default") {
+     "message:v8_message",
+     "mjsunit:v8_mjsunit",
+     "mkgrokdump:mkgrokdump",
+-    "unittests:unittests",
+     "webkit:v8_webkit",
+   ]
+ 
+@@ -109,7 +107,6 @@ group("v8_default") {
+     "message:v8_message",
+     "mjsunit:v8_mjsunit",
+     "mkgrokdump:mkgrokdump",
+-    "unittests:unittests",
+   ]
+ 
+   if (v8_enable_webassembly) {
+--- /dev/null
++++ b/src/3rdparty/chromium/dev/null
+@@ -0,0 +1,39 @@
++/*
++ * Autogenerated by the Meson build system.
++ * Do not edit, your changes will be lost.
++ */
++
++#pragma once
++
++#define ARCH_AARCH64 0
++
++#define ARCH_ARM 0
++
++#define ARCH_PPC64LE 1
++
++#define ARCH_X86 0
++
++#define ARCH_X86_32 0
++
++#define ARCH_X86_64 0
++
++#define CONFIG_16BPC 1
++
++#define CONFIG_8BPC 1
++
++// #define CONFIG_LOG 1 -- Logging is controlled by Chromium
++
++#define ENDIANNESS_BIG 0
++
++#define HAVE_ASM 1
++
++#define HAVE_CLOCK_GETTIME 1
++
++#define HAVE_DLSYM 1
++
++#define HAVE_GETAUXVAL 1
++
++#define HAVE_POSIX_MEMALIGN 1
++
++#define HAVE_UNISTD_H 1
++
+--- a/src/3rdparty/chromium/third_party/abseil-cpp/absl/base/internal/unscaledcycleclock.h
++++ b/src/3rdparty/chromium/third_party/abseil-cpp/absl/base/internal/unscaledcycleclock.h
+@@ -46,7 +46,7 @@
+ 
+ // The following platforms have an implementation of a hardware counter.
+ #if defined(__i386__) || defined(__x86_64__) || defined(__aarch64__) || \
+-  defined(__powerpc__) || defined(__ppc__) || \
++  ((defined(__powerpc__) || defined(__ppc__)) && defined(__GLIBC__)) || \
+   defined(_M_IX86) || defined(_M_X64)
+ #define ABSL_HAVE_UNSCALED_CYCLECLOCK_IMPLEMENTATION 1
+ #else
+--- a/src/3rdparty/chromium/third_party/abseil-cpp/absl/debugging/internal/stacktrace_config.h
++++ b/src/3rdparty/chromium/third_party/abseil-cpp/absl/debugging/internal/stacktrace_config.h
+@@ -59,7 +59,7 @@
+ #elif defined(__i386__) || defined(__x86_64__)
+ #define ABSL_STACKTRACE_INL_HEADER \
+   "absl/debugging/internal/stacktrace_x86-inl.inc"
+-#elif defined(__ppc__) || defined(__PPC__)
++#elif defined(__ppc__) || defined(__PPC__) && defined(__GLIBC__)
+ #define ABSL_STACKTRACE_INL_HEADER \
+   "absl/debugging/internal/stacktrace_powerpc-inl.inc"
+ #elif defined(__aarch64__)
+--- a/src/3rdparty/chromium/base/allocator/partition_allocator/partition_alloc_config.h
++++ b/src/3rdparty/chromium/base/allocator/partition_allocator/partition_alloc_config.h
+@@ -100,7 +100,8 @@ static_assert(sizeof(void*) != 8, "");
+ // PUT_REF_COUNT_IN_PREVIOUS_SLOT does. In this case the refcount overlaps with
+ // the next pointer shadow for the smallest bucket.
+ #if !(defined(OS_MAC) && defined(ARCH_CPU_ARM64)) && \
+-    !BUILDFLAG(PUT_REF_COUNT_IN_PREVIOUS_SLOT)
++    !BUILDFLAG(PUT_REF_COUNT_IN_PREVIOUS_SLOT) && \
++    (!defined(__GLIBC) && !defined(__powerpc64__))
+ #define PA_HAS_FREELIST_HARDENING
+ #endif
+ 
+--- a/src/3rdparty/chromium/build/download_nacl_toolchains.py
++++ b/src/3rdparty/chromium/build/download_nacl_toolchains.py
+@@ -13,6 +13,8 @@ import sys
+ 
+ 
+ def Main(args):
++  if 'disable_nacl=1' in os.environ.get('GYP_DEFINES', ''):
++    return 0
+   script_dir = os.path.dirname(os.path.abspath(__file__))
+   src_dir = os.path.dirname(script_dir)
+   nacl_dir = os.path.join(src_dir, 'native_client')
+--- a/src/3rdparty/chromium/chrome/installer/linux/BUILD.gn
++++ b/src/3rdparty/chromium/chrome/installer/linux/BUILD.gn
+@@ -100,8 +100,6 @@ packaging_files = packaging_files_binari
+                     "$root_out_dir/xdg-mime",
+                     "$root_out_dir/xdg-settings",
+                     "$root_out_dir/locales/en-US.pak",
+-                    "$root_out_dir/MEIPreload/manifest.json",
+-                    "$root_out_dir/MEIPreload/preloaded_data.pb",
+                   ]
+ 
+ action_foreach("calculate_deb_dependencies") {
+@@ -321,7 +319,6 @@ group("installer_deps") {
+     ":theme_files",
+     "//chrome",
+     "//chrome:packed_resources",
+-    "//chrome/browser/resources/media/mei_preload:component",
+     "//components/crash/core/app:chrome_crashpad_handler",
+     "//sandbox/linux:chrome_sandbox",
+   ]
+--- /dev/null
++++ b/src/3rdparty/chromium/sandbox/linux/system_headers/ppc64_linux_syscalls.h
+@@ -0,0 +1,12 @@
++// Copyright 2014 The Chromium Authors. All rights reserved.
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++#ifndef SANDBOX_LINUX_SYSTEM_HEADERS_PPC64_LINUX_SYSCALLS_H_
++#define SANDBOX_LINUX_SYSTEM_HEADERS_PPC64_LINUX_SYSCALLS_H_
++
++#include <asm/unistd.h>
++
++//TODO: is it necessary to redefine syscall numbers for PPC64?
++
++#endif  // SANDBOX_LINUX_SYSTEM_HEADERS_PPC64_LINUX_SYSCALLS_H_
+--- /dev/null
++++ b/src/3rdparty/chromium/sandbox/linux/system_headers/ppc64_linux_ucontext.h
+@@ -0,0 +1,12 @@
++// Copyright 2014 The Chromium Authors. All rights reserved.
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++#ifndef SANDBOX_LINUX_SYSTEM_HEADERS_PPC64_LINUX_UCONTEXT_H_
++#define SANDBOX_LINUX_SYSTEM_HEADERS_PPC64_LINUX_UCONTEXT_H_
++
++#include <sys/ucontext.h>
++
++//TODO: is it necessary to redefine ucontext on PPC64?
++
++#endif  // SANDBOX_LINUX_SYSTEM_HEADERS_PPC64_LINUX_UCONTEXT_H_
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/util/net/http_transport_libcurl.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/util/net/http_transport_libcurl.cc
+@@ -236,6 +236,12 @@ std::string UserAgent() {
+ #elif defined(ARCH_CPU_BIG_ENDIAN)
+     static constexpr char arch[] = "aarch64_be";
+ #endif
++#elif defined(__powerpc64__)
++#if defined(ARCH_CPU_LITTLE_ENDIAN)
++    static constexpr char arch[] = "ppc64le";
++#elif defined(ARCH_CPU_BIG_ENDIAN)
++    static constexpr char arch[] = "ppc64";
++#endif
+ #else
+ #error Port
+ #endif
+--- /dev/null
++++ b/src/3rdparty/chromium/third_party/dav1d/config/linux/ppc64/config.h
+@@ -0,0 +1,39 @@
++/*
++ * Autogenerated by the Meson build system.
++ * Do not edit, your changes will be lost.
++ */
++
++#pragma once
++
++#define ARCH_AARCH64 0
++
++#define ARCH_ARM 0
++
++#define ARCH_PPC64LE 1
++
++#define ARCH_X86 0
++
++#define ARCH_X86_32 0
++
++#define ARCH_X86_64 0
++
++#define CONFIG_16BPC 1
++
++#define CONFIG_8BPC 1
++
++// #define CONFIG_LOG 1 -- Logging is controlled by Chromium
++
++#define ENDIANNESS_BIG 0
++
++#define HAVE_ASM 1
++
++#define HAVE_CLOCK_GETTIME 1
++
++#define HAVE_DLSYM 1
++
++#define HAVE_GETAUXVAL 1
++
++#define HAVE_POSIX_MEMALIGN 1
++
++#define HAVE_UNISTD_H 1
++
diff --git a/srcpkgs/qt6-webengine/patches/0903-xxx-ppc64le-swiftshader.patch b/srcpkgs/qt6-webengine/patches/0903-xxx-ppc64le-swiftshader.patch
new file mode 100644
index 000000000000..1a8cd8368da1
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0903-xxx-ppc64le-swiftshader.patch
@@ -0,0 +1,18 @@
+--- a/src/3rdparty/chromium/third_party/swiftshader/third_party/llvm-10.0/BUILD.gn
++++ b/src/3rdparty/chromium/third_party/swiftshader/third_party/llvm-10.0/BUILD.gn
+@@ -576,6 +576,7 @@ swiftshader_llvm_source_set("swiftshader
+     "llvm/lib/MC/MCAsmInfoCOFF.cpp",
+     "llvm/lib/MC/MCAsmInfoDarwin.cpp",
+     "llvm/lib/MC/MCAsmInfoELF.cpp",
++    "llvm/lib/MC/MCAsmInfoXCOFF.cpp",
+     "llvm/lib/MC/MCAsmMacro.cpp",
+     "llvm/lib/MC/MCAsmStreamer.cpp",
+     "llvm/lib/MC/MCAssembler.cpp",
+@@ -631,6 +632,7 @@ swiftshader_llvm_source_set("swiftshader
+     "llvm/lib/MC/MCWinCOFFStreamer.cpp",
+     "llvm/lib/MC/MCWinEH.cpp",
+     "llvm/lib/MC/MCXCOFFStreamer.cpp",
++    "llvm/lib/MC/MCXCOFFObjectTargetWriter.cpp",
+     "llvm/lib/MC/MachObjectWriter.cpp",
+     "llvm/lib/MC/StringTableBuilder.cpp",
+     "llvm/lib/MC/SubtargetFeature.cpp",
diff --git a/srcpkgs/qt6-webengine/template b/srcpkgs/qt6-webengine/template
new file mode 100644
index 000000000000..b163a7167090
--- /dev/null
+++ b/srcpkgs/qt6-webengine/template
@@ -0,0 +1,151 @@
+# Template file for 'qt6-webengine'
+pkgname=qt6-webengine
+version=6.3.1
+revision=1
+wrksrc="qtwebengine-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DQT_HOST_PATH=/usr -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true
+ -DQT_FEATURE_webengine_system_ffmpeg=ON
+ -DQT_FEATURE_webengine_system_libevent=ON
+ -DQT_FEATURE_webengine_system_gn=ON
+ -DQT_FEATURE_webengine_system_icu=ON
+ -DQT_FEATURE_webengine_webrtc_pipewire=ON
+ -DNinja_EXECUTABLE=$XBPS_WRAPPERDIR/ninja
+ -DPKG_CONFIG_HOST_EXECUTABLE=${PKG_CONFIG_FOR_BUILD}"
+hostmakedepends="qt6-base-devel perl pkg-config nodejs python3-html5lib
+ qt6-declarative-devel protobuf gperf flex nss-devel libwebp-devel
+ icu-devel libevent-devel"
+makedepends="qt6-base-devel qt6-declarative-devel pulseaudio-devel
+ qt6-tools-devel qt6-quickcontrols2-devel qt6-websockets-devel
+ libflac-devel
+ alsa-lib-devel libvpx-devel pciutils-devel opus-devel libxslt-devel
+ libxml2-devel freetype-devel lcms2-devel libwebp-devel icu-devel
+ re2-devel zlib-devel libpng-devel minizip-devel harfbuzz-devel
+ nss-devel libXcursor-devel libXcomposite-devel libXScrnSaver-devel
+ protobuf-devel ffmpeg-devel snappy-devel libevent-devel pipewire-devel
+ libxkbfile-devel qt6-location-devel qt6-webchannel-devel libxshmfence-devel"
+short_desc="Cross-platform application and UI framework - Webengine"
+maintainer="John <me@johnnynator.dev>"
+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=ad7a33b21a956deda37c587d50f821ca3816403ae31ba9b5d59d01561ad66e47
+
+if [ -z "$CROSS_BUILD" ];then
+	configure_args+=" -DCMAKE_TOOLCHAIN_FILE=/usr/lib/cmake/Qt6/qt.toolchain.cmake"
+fi
+
+if [ "$XBPS_LIBC" = "musl" ]; then
+	hostmakedepends+=" musl-legacy-compat"
+fi
+
+if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
+	makedepends+=" musl-legacy-compat"
+fi
+
+if [ ! "$XBPS_WORDSIZE" = "$XBPS_TARGET_WORDSIZE" ]; then
+	broken="webengine can be built only if word size matches"
+fi
+
+if [ "$XBPS_WORDSIZE" -eq 32 ]; then
+	nodebug=yes
+	LDFLAGS="-Wl,--no-keep-memory"
+fi
+
+if [ "$XBPS_TARGET_ENDIAN" != "le" ]; then
+	broken="webengine only supports little endian"
+fi
+
+build_options="sndio"
+build_options_default=""
+desc_option_sndio="Enable support for sndio"
+
+
+_bootstrap_gn() {
+	# Bootstrap gn (generate ninja)
+	echo "Bootstrapping 'gn'"
+	cd ${wrksrc}/src/3rdparty/gn
+	CFLAGS="$CFLAGS_host" CXXFLAGS="$CXXFLAGS_host" LDFLAGS="$LDFLAGS_host" \
+	PKGCONFIG=/usr/bin/pkgconfig PKG_CONFIG_PATH="/usr/lib/pkgconfig:/usr/share/pkgconfig" \
+		python3 build/gen.py --no-last-commit-position --out-path \
+			${wrksrc}/src/3rdparty/gn/out/Release --cc "${CC_host:-$CC}" \
+			--cxx "${CXX_host:-$CXX}" --ld "${CXX_host:-$CXX}" --ar "${AR_host:-$AR}" \
+			--qt-version "${version}.qtwebengine.qt.io"
+	ninja -C out/Release gn
+	cd ${wrksrc}
+}
+
+_unbundle_libs() {
+	cd ${wrksrc}/src/3rdparty/chromium
+	echo Dropping bundled libs from chromium
+	# Use system-provided libraries.
+	# TODO: use_system_hunspell (upstream changes needed).
+	# TODO: use_system_libsrtp.
+	# TODO: use_system_libusb (http://crbug.com/266149).
+	# TODO: use_system_ssl (http://crbug.com/58087).
+	# TODO: use_system_sqlite (http://crbug.com/22208).
+	# TODO: use_system_icu (segfaults)
+	# use_system_protobuf
+	# use_system_v8=1
+	# use_system_zlib=1
+	# bzip2 jsoncpp minizip xdg_utils speex
+	system="
+		ffmpeg
+		flac
+		fontconfig
+		freetype
+		harfbuzz-ng
+		icu
+		libdrm
+		libevent
+		libjpeg
+		libpng
+		libwebp
+		libxml
+		libxslt
+		opus
+		re2
+		snappy
+	"
+	build/linux/unbundle/replace_gn_files.py --system-libraries ${system}
+}
+
+# Provide a wrapper to run ./xbps-src -j 1 build later
+_wrap_ninja() {
+	cat <<-'_EOF' >"$XBPS_WRAPPERDIR"/ninja
+	#!/bin/sh
+
+	exec /usr/bin/ninja $NINJAFLAGS "$@"
+	_EOF
+	chmod +x "$XBPS_WRAPPERDIR"/ninja
+}
+
+pre_configure() {
+	cp ${FILESDIR}/resolv_compat.h ${wrksrc}/src/3rdparty/chromium/net/dns
+	_bootstrap_gn
+	# _unbundle_libs
+	_wrap_ninja
+	export PATH="$PATH:${wrksrc}/src/3rdparty/gn/out/Release"
+}
+
+pre_build() {
+	export PATH="$PATH:${wrksrc}/src/3rdparty/gn/out/Release"
+	export NINJAFLAGS="$makejobs"
+
+}
+
+pre_install() {
+	export PATH="$PATH:${wrksrc}/src/3rdparty/gn/out/Release"
+}
+
+qt6-webengine-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} qt6-webchannel-devel>=${version}_1
+	 qt6-declarative-devel>=${version}_1 qt6-location-devel>=${version}_1"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/qt6/mkspecs
+		vmove "usr/lib/*.so"
+	}
+}
diff --git a/srcpkgs/qt6-webengine/update b/srcpkgs/qt6-webengine/update
new file mode 100644
index 000000000000..844552465222
--- /dev/null
+++ b/srcpkgs/qt6-webengine/update
@@ -0,0 +1 @@
+pkgname="${pkgname/6-/}-everywhere-src"

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

* Re: [PR PATCH] [Updated] WIP Qt6 webengine
  2022-08-07  4:36 [PR PATCH] WIP Qt6 webengine sgn
@ 2022-08-07  4:38 ` sgn
  2022-08-08 10:13 ` sgn
                   ` (36 subsequent siblings)
  37 siblings, 0 replies; 39+ messages in thread
From: sgn @ 2022-08-07  4:38 UTC (permalink / raw)
  To: ml

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

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

https://github.com/sgn/void-packages qt6-webengine
https://github.com/void-linux/void-packages/pull/38509

WIP Qt6 webengine
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**
[ci skip]

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-qt6-webengine-38509.patch --]
[-- Type: text/x-diff, Size: 279365 bytes --]

From 5bd59c330d3c32546c3febd83e328cf94aeb549a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 28 Jul 2022 16:36:21 +0200
Subject: [PATCH 01/22] qt6-base: update to 6.3.1.

---
 srcpkgs/qt6-base/patches/libatomic.patch | 14 --------------
 srcpkgs/qt6-base/template                |  6 +++---
 2 files changed, 3 insertions(+), 17 deletions(-)
 delete mode 100644 srcpkgs/qt6-base/patches/libatomic.patch

diff --git a/srcpkgs/qt6-base/patches/libatomic.patch b/srcpkgs/qt6-base/patches/libatomic.patch
deleted file mode 100644
index 2f7a807518e4..000000000000
--- a/srcpkgs/qt6-base/patches/libatomic.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Index: cmake/FindWrapAtomic.cmake
-===================================================================
---- a/cmake/FindWrapAtomic.cmake
-+++ b/cmake/FindWrapAtomic.cmake
-@@ -38,7 +38,8 @@ endif()
- 
- add_library(WrapAtomic::WrapAtomic INTERFACE IMPORTED)
- if(HAVE_STDATOMIC_WITH_LIB)
--    target_link_libraries(WrapAtomic::WrapAtomic INTERFACE atomic)
-+    find_library(LIBATOMIC atomic REQUIRED)
-+    target_link_libraries(WrapAtomic::WrapAtomic INTERFACE ${LIBATOMIC})
- endif()
- 
- set(WrapAtomic_FOUND 1)
diff --git a/srcpkgs/qt6-base/template b/srcpkgs/qt6-base/template
index cc47e18a70ff..de7d1583c8f9 100644
--- a/srcpkgs/qt6-base/template
+++ b/srcpkgs/qt6-base/template
@@ -1,7 +1,7 @@
 # Template file for 'qt6-base'
 pkgname=qt6-base
-version=6.3.0
-revision=2
+version=6.3.1
+revision=1
 wrksrc="qtbase-everywhere-src-${version}"
 build_style=cmake
 configure_args="-DINSTALL_DATADIR=share/qt6
@@ -29,7 +29,7 @@ maintainer="John <me@johnnynator.dev>"
 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=b865aae43357f792b3b0a162899d9bf6a1393a55c4e5e4ede5316b157b1a0f99
+checksum=0a64421d9c2469c2c48490a032ab91d547017c9cc171f3f8070bc31888f24e03
 python_version=3
 
 if [ "$CROSS_BUILD" ]; then

From e89ac61ed2842f6d82da54a4417ee4a35fd54b38 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 28 Jul 2022 16:36:24 +0200
Subject: [PATCH 02/22] qt6-charts: update to 6.3.1.

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

diff --git a/srcpkgs/qt6-charts/template b/srcpkgs/qt6-charts/template
index 79cb8a220401..57a3a015d126 100644
--- a/srcpkgs/qt6-charts/template
+++ b/srcpkgs/qt6-charts/template
@@ -1,6 +1,6 @@
 # Template file for 'qt6-charts'
 pkgname=qt6-charts
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qtcharts-everywhere-src-${version}"
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 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=672762c5f641ccc88a30aeedefb63f03c0f837649b334f46eea57592e87e36cd
+checksum=f330cc2328729104d79b2088990ce0840f2da89d9d989360d4c352e797d27cf7
 
 qt6-charts-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 331b461605b93d7a966005a8344b4390149e6bc6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 28 Jul 2022 16:36:30 +0200
Subject: [PATCH 03/22] qt6-declarative: update to 6.3.1.

---
 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 e0bd28d9e383..f31990750af0 100644
--- a/srcpkgs/qt6-declarative/template
+++ b/srcpkgs/qt6-declarative/template
@@ -1,6 +1,6 @@
 # Template file for 'qt6-declarative'
 pkgname=qt6-declarative
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qtdeclarative-everywhere-src-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 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=d294b029dc2b2d4f65da516fdc3b8088d32643eb7ff77db135a8b9ce904caa37
+checksum=03e7694123820fcca397f95ce312e0b7f3039493c8754c836da098a1a04346e8
 replaces="qt6-quickcontrols2>=0"
 
 if [ "$CROSS_BUILD" ]; then

From 9c1d1370116c24624de6ffc0473e445fef301754 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 28 Jul 2022 16:36:32 +0200
Subject: [PATCH 04/22] qt6-imageformats: update to 6.3.1.

---
 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 eaca95243c48..65b6043fe497 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.3.0
+version=6.3.1
 revision=1
 wrksrc="qtimageformats-everywhere-src-${version}"
 build_style=cmake
@@ -12,4 +12,4 @@ maintainer="John <me@johnnynator.dev>"
 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=025d0d17ed75b42a7eb6b523731ab8f17025421a8810cade25caffe05d93abef
+checksum=ad0312b8dfbbb67f729bfadbfcd47246ee4a128b717731ba158c41d01fde212f

From a25609650e650c814cb14c5a41b5f88e4e201610 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 28 Jul 2022 16:36:33 +0200
Subject: [PATCH 05/22] qt6-location: update to 6.3.1.

---
 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 b7397f5f8942..ad372775f85a 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.3.0
+version=6.3.1
 revision=1
 wrksrc="qtpositioning-everywhere-src-${version}"
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 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=e9ed50f6b245a346db34d625d0012774ef0ec8e7fd65037127ec26758708236e
+checksum=06788e4ecae1920094b30e4046f0abd23c8189d8a51e9c939b02f0b6abe2e86c
 
 qt6-location-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel>=${version}_1"

From 4f191850d385c6f43d4c3e8acdb2f86151b4dbfd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 28 Jul 2022 16:36:35 +0200
Subject: [PATCH 06/22] qt6-lottie: update to 6.3.1.

---
 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 1c97cd5f4f32..43cb6871da58 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.3.0
+version=6.3.1
 revision=1
 wrksrc="qtlottie-everywhere-src-${version}"
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 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=39db570bbba5b527a1eb6a5774bed47398ace2f7217bbf45b1194ada6cf97deb
+checksum=740ba76999124d5e1a85ef3d01c69976bb8557862b6b26bf48b357fe0cab1cf5
 
 if [ "$XBPS_CHECK_PKGS" ]; then
 	configure_args+=" -DQT_BUILD_TESTS=ON"

From c54a8696b8c0ac7efb078e7f0824ee18e42c7354 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 28 Jul 2022 16:36:38 +0200
Subject: [PATCH 07/22] qt6-networkauth: update to 6.3.1.

---
 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 e934beada9b0..d13ead03866b 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.3.0
+version=6.3.1
 revision=1
 wrksrc="qtnetworkauth-everywhere-src-${version}"
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 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=203a98942919028520038f90a20cd7ee32b537233545d11e429c3e2c1ad9069f
+checksum=d60f54b9d4509fa8bdbf1990bc91f6e260e38cdb57a7b8119fa3861bc5d2fb2a
 
 if [ "$XBPS_CHECK_PKGS" ]; then
 	configure_args+=" -DQT_BUILD_TESTS=ON"

From 9ec9c2300f2df710e6e8d437aaf13a0843c52c13 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 28 Jul 2022 16:36:41 +0200
Subject: [PATCH 08/22] qt6-qt5compat: update to 6.3.1.

---
 srcpkgs/qt6-qt5compat/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/qt6-qt5compat/template b/srcpkgs/qt6-qt5compat/template
index 7fcd5ad5080e..87f1d32298be 100644
--- a/srcpkgs/qt6-qt5compat/template
+++ b/srcpkgs/qt6-qt5compat/template
@@ -1,7 +1,7 @@
 # Template file for 'qt6-qt5compat'
 pkgname=qt6-qt5compat
-version=6.3.0
-revision=2
+version=6.3.1
+revision=1
 wrksrc="qt5compat-everywhere-src-${version}"
 build_style=cmake
 configure_args="-DQT_HOST_PATH=/usr"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 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=2b199be780c50d9214512b922d94cb240b0412fd63f459e356b76102cad1713e
+checksum=a43ec62bd778eaecf88ad7847118d1c2a471b0fcb820f93beb311d7ab9566cfd
 
 if [ "$XBPS_CHECK_PKGS" ]; then
 	configure_args+=" -DQT_BUILD_TESTS=ON"

From fefddbbf6221f8bcf4dcbdbfbd21a98749ddb6f7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 28 Jul 2022 16:36:48 +0200
Subject: [PATCH 09/22] qt6-quick3d: update to 6.3.1.

---
 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 0f7ef336a3ff..44bffb41bb49 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.3.0
+version=6.3.1
 revision=1
 wrksrc="qtquick3d-everywhere-src-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 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=0ad05bd1ee1f784b18220a2d2625ee8de91662c88fdc7b798662953d86eb327e
+checksum=2fa766ee47b8c07412b3b755206ada0715fb07813b64ed069e7205044c061256
 
 if [ "$XBPS_TARGET_ENDIAN" = "be" ]; then
 	# possibly a qt6-shadertools bug, actually

From 23b425ec38c5d0b888b708801e6524d6725c7930 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 28 Jul 2022 16:36:49 +0200
Subject: [PATCH 10/22] qt6-quicktimeline: update to 6.3.1.

---
 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 15aa7a8e5819..dc7c3b13cba6 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.3.0
+version=6.3.1
 revision=1
 wrksrc="qtquicktimeline-everywhere-src-${version/rc/-rc}"
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 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=9ff0a931159efc6be5bd9f8a1e4a16a70e2dab37cf22ad85c6d330ccfdf31c1a
+checksum=58a13cf0ce8e7755639f20684078733af24f5a317f6ddb40d6079c8c5a28ebbe
 
 if [ "$XBPS_CHECK_PKGS" ]; then
 	configure_args+=" -DQT_BUILD_TESTS=ON"

From b3f8694e75403145d6addce27b4b4a9b771aa02d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 28 Jul 2022 16:36:51 +0200
Subject: [PATCH 11/22] qt6-scxml: update to 6.3.1.

---
 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 112baca0ab83..54f68b1fd61f 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.3.0
+version=6.3.1
 revision=1
 wrksrc="qtscxml-everywhere-src-${version}"
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 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=09b0dbd6ac367920fb1ba96a39dcd4c9d33eb0820dcc79538992825d588a70f0
+checksum=01bc154d6163d1f049f4e1e76658a044730ace7b0a5be35c9a46fcd1396f8619
 
 if [ "$XBPS_CHECK_PKGS" ]; then
 	configure_args+=" -DQT_BUILD_TESTS=ON"

From 18545340b29feef3c0c17f7475eb192f104e48a1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 28 Jul 2022 16:36:52 +0200
Subject: [PATCH 12/22] qt6-serialport: update to 6.3.1.

---
 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 0804671ca57b..2e915788300a 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.3.0
+version=6.3.1
 revision=1
 wrksrc="qtserialport-everywhere-src-${version}"
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 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=eebd6934d48cc044b8c87795a4fd91bb81f7195d4b5a2ddb12802f343d5db64f
+checksum=4eb6d80e65799dd2e0318df4dfba14173c1929e861718cda9bedca24253b616e
 
 qt6-serialport-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel>=${version}_1"

From f028877af7c772da6063eb242133e3b1505a8e56 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 28 Jul 2022 16:36:54 +0200
Subject: [PATCH 13/22] qt6-shadertools: update to 6.3.1.

---
 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 9c1ec210a96a..f59169184b12 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.3.0
+version=6.3.1
 revision=1
 wrksrc="qtshadertools-everywhere-src-${version}"
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 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=5498959b9d37c254bd126ab1320cf86aeb8a31b3ea7e51db666a8f9698afbd6c
+checksum=59b77176961528cc7b0c9325134655e273aa87b4cb386c0f4683d8f2852e435a
 
 qt6-shadertools-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel>=${version}_1"

From 6207ae8a3c94e9176def04ae16e2bf79ddc3ebf2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 28 Jul 2022 16:36:55 +0200
Subject: [PATCH 14/22] qt6-svg: update to 6.3.1.

---
 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 aa8e6b745109..637ce75e49ea 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.3.0
+version=6.3.1
 revision=1
 wrksrc="qtsvg-everywhere-src-${version}"
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 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=3164504d7e3f640439308235739b112605ab5fc9cc517ca0b28f9fb93a8db0e3
+checksum=7b19f418e6f7b8e23344082dd04440aacf5da23c5a73980ba22ae4eba4f87df7
 
 if [ "$XBPS_CHECK_PKGS" ]; then
 	configure_args+=" -DQT_BUILD_TESTS=ON"

From 1e5fc62926edfacadd7f93018e78765fd19a434e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 28 Jul 2022 16:36:58 +0200
Subject: [PATCH 15/22] qt6-tools: update to 6.3.1.

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

diff --git a/srcpkgs/qt6-tools/template b/srcpkgs/qt6-tools/template
index f875dff5c046..ff49d3cd63f2 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.3.0
+version=6.3.1
 revision=1
 wrksrc="qttools-everywhere-src-${version}"
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 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/qttools-everywhere-src-${version}.tar.xz"
-checksum=fce94688ea925782a2879347584991f854630daadba6c52aed6d93e33cd0b19c
+checksum=c412750f2aa3beb93fce5f30517c607f55daaeb7d0407af206a8adf917e126c1
 
 if [ "$XBPS_CHECK_PKGS" ]; then
 	configure_args+=" -DQT_BUILD_TESTS=ON"

From 4a30e57aab487cd4579fd8e85535d3c40ebd5a43 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 28 Jul 2022 16:37:00 +0200
Subject: [PATCH 16/22] qt6-translations: update to 6.3.1.

---
 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 be0a74ca74e2..fa751b097466 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.3.0
+version=6.3.1
 revision=1
 wrksrc="qttranslations-everywhere-src-${version}"
 build_style=cmake
@@ -12,4 +12,4 @@ maintainer="John <me@johnnynator.dev>"
 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=e4dd4ef892a34a9514a19238f189a33ed85c76f31dcad6599ced93b1e33440b3
+checksum=d7bdd55e2908ded901dcc262157100af2a490bf04d31e32995f6d91d78dfdb97

From b87e2d34bab04092e6e3336cf28ca6b23b62dbf9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 28 Jul 2022 16:37:02 +0200
Subject: [PATCH 17/22] qt6-virtualkeyboard: update to 6.3.1.

---
 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 67ecef145ea1..21fbcf5dbfbc 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.3.0
+version=6.3.1
 revision=1
 wrksrc="qtvirtualkeyboard-everywhere-src-${version}"
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 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=89aaf15acf5432af8f5cf4ec45cb32d87a3348906215dd56e81cb294eb276573
+checksum=5fe089b204d859ab0dd0169f811f2e30cae7c5cb36f8ab95ca36883f1fc0c2b8
 
 if [ "$XBPS_CHECK_PKGS" ]; then
 	configure_args+=" -DQT_BUILD_TESTS=ON"

From 12d4b7090a3c9fd2cc1e8cb1b3df03add5b6ee12 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 28 Jul 2022 16:37:03 +0200
Subject: [PATCH 18/22] qt6-wayland: update to 6.3.1.

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

diff --git a/srcpkgs/qt6-wayland/template b/srcpkgs/qt6-wayland/template
index b71a273009b9..6040a2dc1335 100644
--- a/srcpkgs/qt6-wayland/template
+++ b/srcpkgs/qt6-wayland/template
@@ -1,6 +1,6 @@
 # Template file for 'qt6-wayland'
 pkgname=qt6-wayland
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qtwayland-everywhere-src-${version}"
 build_style=cmake
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 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=e7b567f6e43ffc5918d4aa825ce1eced66a00cb0a87133b2912ba5c1b2a02190
+checksum=6f14fea2d172a5b4170be3efcb0e58535f6605b61bcd823f6d5c9d165bb8c0f0
 
 if [ "$XBPS_CHECK_PKGS" ]; then
 	configure_args+=" -DQT_BUILD_TESTS=ON"

From f4b097eb6f31e5e066b1c5bb1f82d2e7c82a5d1b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 28 Jul 2022 16:38:03 +0200
Subject: [PATCH 19/22] qt6-websockets: update to 6.3.1.

---
 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 c2e674aacb31..ad02065de69f 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.3.0
+version=6.3.1
 revision=1
 wrksrc="qtwebsockets-everywhere-src-${version}"
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 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=e018a09fe960b7d9560d6bbc9d3ca022fed6566e6ba6fc6d869a97482d4e6361
+checksum=9f980d90c97fcbde1b50c773f6dc580cfdf8c36ce14a1be3aa2ccadfe605121a
 
 qt6-websockets-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel>=${version}_1"

From 64fff9f966d0e8ffe9d654113189e83b029ebc24 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 26 Jun 2021 12:25:04 +0200
Subject: [PATCH 20/22] New package: qt6-webchannel-6.3.1

---
 srcpkgs/qt6-webchannel-devel    |  1 +
 srcpkgs/qt6-webchannel/template | 31 +++++++++++++++++++++++++++++++
 srcpkgs/qt6-webchannel/update   |  1 +
 3 files changed, 33 insertions(+)
 create mode 120000 srcpkgs/qt6-webchannel-devel
 create mode 100644 srcpkgs/qt6-webchannel/template
 create mode 100644 srcpkgs/qt6-webchannel/update

diff --git a/srcpkgs/qt6-webchannel-devel b/srcpkgs/qt6-webchannel-devel
new file mode 120000
index 000000000000..03e8b23d785d
--- /dev/null
+++ b/srcpkgs/qt6-webchannel-devel
@@ -0,0 +1 @@
+qt6-webchannel
\ No newline at end of file
diff --git a/srcpkgs/qt6-webchannel/template b/srcpkgs/qt6-webchannel/template
new file mode 100644
index 000000000000..6c39ec2a1c3a
--- /dev/null
+++ b/srcpkgs/qt6-webchannel/template
@@ -0,0 +1,31 @@
+# Template file for 'qt6-webchannel'
+pkgname=qt6-webchannel
+version=6.3.1
+revision=1
+wrksrc="qtwebchannel-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DQT_HOST_PATH=/usr"
+hostmakedepends="perl qt6-base-devel qt6-declarative-devel"
+makedepends="qt6-base-devel qt6-declarative-devel qt6-websockets-devel"
+short_desc="Cross-platform application and UI framework - webchannel"
+maintainer="John <me@johnnynator.dev>"
+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=aaa20ac23f86992721b7ee487c379a3fd68caa8cdcea0a77a37e0d8b47ff2668
+
+qt6-webchannel-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel>=${version}_1
+	 qt6-websockets-devel>=${version}_1"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/qt6/mkspecs
+		vmove usr/lib/qt6/qml/QtWebChannel/plugins.qmltypes
+		vmove usr/lib/qt6/qml/QtWebChannel/qmldir
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}
diff --git a/srcpkgs/qt6-webchannel/update b/srcpkgs/qt6-webchannel/update
new file mode 100644
index 000000000000..844552465222
--- /dev/null
+++ b/srcpkgs/qt6-webchannel/update
@@ -0,0 +1 @@
+pkgname="${pkgname/6-/}-everywhere-src"

From d04f52752e8f777050b690549dd1773eca49a371 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 26 Jun 2021 21:08:25 +0200
Subject: [PATCH 21/22] New package: qt6-multimedia-6.3.1

---
 srcpkgs/qt6-multimedia-devel    |  1 +
 srcpkgs/qt6-multimedia/template | 32 ++++++++++++++++++++++++++++++++
 srcpkgs/qt6-multimedia/update   |  1 +
 3 files changed, 34 insertions(+)
 create mode 120000 srcpkgs/qt6-multimedia-devel
 create mode 100644 srcpkgs/qt6-multimedia/template
 create mode 100644 srcpkgs/qt6-multimedia/update

diff --git a/srcpkgs/qt6-multimedia-devel b/srcpkgs/qt6-multimedia-devel
new file mode 120000
index 000000000000..9343446502d0
--- /dev/null
+++ b/srcpkgs/qt6-multimedia-devel
@@ -0,0 +1 @@
+qt6-multimedia
\ No newline at end of file
diff --git a/srcpkgs/qt6-multimedia/template b/srcpkgs/qt6-multimedia/template
new file mode 100644
index 000000000000..17b0a4544467
--- /dev/null
+++ b/srcpkgs/qt6-multimedia/template
@@ -0,0 +1,32 @@
+# Template file for 'qt6-multimedia'
+pkgname=qt6-multimedia
+version=6.3.1
+revision=1
+wrksrc="qtmultimedia-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DQT_HOST_PATH=/usr -DQT_FEATURE_gstreamer=ON"
+hostmakedepends="perl qt6-declarative-devel pkg-config
+ qt6-shadertools-devel"
+makedepends="qt6-declarative-devel
+ qt6-shadertools-devel libglib-devel gst-plugins-base1-devel"
+short_desc="Cross-platform application and UI framework - multimedia"
+maintainer="John <me@johnnynator.dev>"
+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=7e03242aadd634ff2d9fcf08948290f03da3d9a5012369d908da89f82b1d7336
+
+qt6-multimedia-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel>=${version}_1"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/qt6/mkspecs
+		vmove usr/lib/qt6/qml/QtMultimedia/plugins.qmltypes
+		vmove usr/lib/qt6/qml/QtMultimedia/qmldir
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}
diff --git a/srcpkgs/qt6-multimedia/update b/srcpkgs/qt6-multimedia/update
new file mode 100644
index 000000000000..844552465222
--- /dev/null
+++ b/srcpkgs/qt6-multimedia/update
@@ -0,0 +1 @@
+pkgname="${pkgname/6-/}-everywhere-src"

From b3a1850f58a42a1a9193dc284ceb693059c2d875 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 7 Aug 2022 11:34:40 +0700
Subject: [PATCH 22/22] New package: qt6-webengine-6.3.1.

---
 srcpkgs/qt6-webengine-devel                   |    1 +
 .../patches/0001-None-no-debug.patch          |   11 +
 .../patches/0002-enable-ppc64.patch           |   20 +
 .../patches/0003-cross-hack.patch             |   10 +
 .../0004-ppc-disable-jxl-decoder.patch        |   13 +
 .../patches/0050-no-glibc-cmake-check.patch   |   14 +
 .../0100-chromium-sandbox-membarrier.patch    |   58 +
 .../qt6-webengine/patches/0101-size_t.patch   |   16 +
 .../0102-chromium-90-ruy-include.patch        |   19 +
 ...-v8-monotonic-pthread-cont_timedwait.patch |   22 +
 .../0104-chromium-revert-9d080c0.patch        |  162 +
 ...-chromium-revert-drop-of-system-java.patch |   15 +
 .../patches/0106-chromium-system-nodejs.patch |   20 +
 .../0107-chromium-cursed^Uscoped_file.patch   |   18 +
 .../0108-chromium-fix-narrowing-cast.patch    |   53 +
 .../0109-chromium-remove-strip_binary.patch   |   32 +
 ...ium-revert-use-ffile-compilation-dir.patch |   57 +
 ...11-chromium-no-Wno-stringop-overread.patch |   10 +
 .../0150-chromium-glibc-libc_malloc.patch     |   24 +
 ...-include-sys-reg.h-to-get-__WORDSIZE.patch |   21 +
 .../0201-chromium-musl-dispatch-to-musl.patch |  103 +
 .../0202-chromium-musl-no-mallinfo.patch      |   62 +
 .../0203-chromium-musl-siginfo_t.patch        |   18 +
 .../0204-chromium-musl-stackstart.patch       |   20 +
 .../patches/0205-chromium-musl-sandbox.patch  |   92 +
 ...0206-chromium-musl-default-stacksize.patch |   15 +
 ...-chromium-musl-cross-no-asm_ptrace_h.patch |   30 +
 .../patches/0208-chromium-musl-execinfo.patch |  125 +
 .../0209-chromium-musl-thread-stacksize.patch |   22 +
 .../0210-chromium-musl-msgvec-push_back.patch |   14 +
 ...ium-musl-canonicalize-file-name-musl.patch |   11 +
 .../0212-chromium-musl-no-getcontext.patch    |   29 +
 .../patches/0213-chromium-musl-crashpad.patch |   22 +
 .../patches/0214-chromium-musl-fixes.patch    |  108 +
 .../patches/0215-chromium-musl-cdefs.patch    |   29 +
 .../patches/0216-chromium-musl-stat.patch     |   12 +
 .../patches/0217-chromium-musl-resolver.patch |   77 +
 .../patches/0600-chromium-sndio.patch         |  876 ++++
 .../patches/0700-armv7l-neon.patch            |   10 +
 .../0750-chromium-musl-arm-user_vfp.patch     |   20 +
 .../0751-chromium-musl-arm-elf_auxv_t.patch   |   18 +
 ...0801-chromium-i686-vaapi-fpermissive.patch |   24 +
 .../patches/0900-xxx-ppc64le-libvpx.patch     |   65 +
 .../0901-xxx-ppc64le-sandbox-linux-stat.patch |   31 +
 .../patches/0902-xxx-ppc64le-support.patch    | 3559 +++++++++++++++++
 .../0903-xxx-ppc64le-swiftshader.patch        |   18 +
 srcpkgs/qt6-webengine/template                |  150 +
 srcpkgs/qt6-webengine/update                  |    1 +
 48 files changed, 6157 insertions(+)
 create mode 120000 srcpkgs/qt6-webengine-devel
 create mode 100644 srcpkgs/qt6-webengine/patches/0001-None-no-debug.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0002-enable-ppc64.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0003-cross-hack.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0004-ppc-disable-jxl-decoder.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0050-no-glibc-cmake-check.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0100-chromium-sandbox-membarrier.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0101-size_t.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0102-chromium-90-ruy-include.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0103-chromium-v8-monotonic-pthread-cont_timedwait.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0104-chromium-revert-9d080c0.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0105-chromium-revert-drop-of-system-java.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0106-chromium-system-nodejs.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0107-chromium-cursed^Uscoped_file.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0108-chromium-fix-narrowing-cast.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0109-chromium-remove-strip_binary.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0110-chromium-revert-use-ffile-compilation-dir.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0111-chromium-no-Wno-stringop-overread.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0150-chromium-glibc-libc_malloc.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0200-chromium-musl-include-sys-reg.h-to-get-__WORDSIZE.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0201-chromium-musl-dispatch-to-musl.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0202-chromium-musl-no-mallinfo.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0203-chromium-musl-siginfo_t.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0204-chromium-musl-stackstart.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0205-chromium-musl-sandbox.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0206-chromium-musl-default-stacksize.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0207-chromium-musl-cross-no-asm_ptrace_h.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0208-chromium-musl-execinfo.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0209-chromium-musl-thread-stacksize.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0210-chromium-musl-msgvec-push_back.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0211-chromium-musl-canonicalize-file-name-musl.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0212-chromium-musl-no-getcontext.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0213-chromium-musl-crashpad.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0214-chromium-musl-fixes.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0215-chromium-musl-cdefs.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0216-chromium-musl-stat.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0217-chromium-musl-resolver.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0600-chromium-sndio.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0700-armv7l-neon.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0750-chromium-musl-arm-user_vfp.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0751-chromium-musl-arm-elf_auxv_t.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0801-chromium-i686-vaapi-fpermissive.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0900-xxx-ppc64le-libvpx.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0901-xxx-ppc64le-sandbox-linux-stat.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0902-xxx-ppc64le-support.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0903-xxx-ppc64le-swiftshader.patch
 create mode 100644 srcpkgs/qt6-webengine/template
 create mode 100644 srcpkgs/qt6-webengine/update

diff --git a/srcpkgs/qt6-webengine-devel b/srcpkgs/qt6-webengine-devel
new file mode 120000
index 000000000000..8e4d1b99c587
--- /dev/null
+++ b/srcpkgs/qt6-webengine-devel
@@ -0,0 +1 @@
+qt6-webengine
\ No newline at end of file
diff --git a/srcpkgs/qt6-webengine/patches/0001-None-no-debug.patch b/srcpkgs/qt6-webengine/patches/0001-None-no-debug.patch
new file mode 100644
index 000000000000..1ba33f8e6fd9
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0001-None-no-debug.patch
@@ -0,0 +1,11 @@
+--- a/cmake/Functions.cmake
++++ b/cmake/Functions.cmake
+@@ -813,6 +813,8 @@ macro(append_build_type_setup)
+         endif()
+     elseif(${config} STREQUAL "MinSizeRel")
+         list(APPEND gnArgArg is_debug=false symbol_level=0 optimize_for_size=true)
++    elseif(${config} STREQUAL "None")
++        list(APPEND gnArgArg is_debug=false symbol_level=0)
+     endif()
+     if(FEATURE_developer_build OR (${config} STREQUAL "Debug") OR QT_FEATURE_webengine_sanitizer)
+         list(APPEND gnArgArg
diff --git a/srcpkgs/qt6-webengine/patches/0002-enable-ppc64.patch b/srcpkgs/qt6-webengine/patches/0002-enable-ppc64.patch
new file mode 100644
index 000000000000..d72ef1ad1a10
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0002-enable-ppc64.patch
@@ -0,0 +1,20 @@
+--- a/cmake/Functions.cmake
++++ b/cmake/Functions.cmake
+@@ -622,6 +622,8 @@ function(get_gn_arch result arch)
+         set(${result} "mipsel" PARENT_SCOPE)
+     elseif(arch STREQUAL "mipsel64")
+         set(${result} "mips64el" PARENT_SCOPE)
++    elseif(arch STREQUAL "power64")
++        set(${result} "power64" PARENT_SCOPE)
+     else()
+         message(DEBUG "Unsupported architecture: ${arch}")
+     endif()
+@@ -641,6 +643,8 @@ function(get_v8_arch result targetArch h
+             set(${result} "mipsel" PARENT_SCOPE)
+         elseif(hostArch STREQUAL "mipsel64")
+             set(${result} "mipsel" PARENT_SCOPE)
++        elseif(hostArch STREQUAL "power64")
++            set(${result} "power64" PARENT_SCOPE)
+         else()
+             message(DEBUG "Unsupported architecture: ${hostArch}")
+         endif()
diff --git a/srcpkgs/qt6-webengine/patches/0003-cross-hack.patch b/srcpkgs/qt6-webengine/patches/0003-cross-hack.patch
new file mode 100644
index 000000000000..ea9f90094a63
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0003-cross-hack.patch
@@ -0,0 +1,10 @@
+--- a/src/core/api/CMakeLists.txt
++++ b/src/core/api/CMakeLists.txt
+@@ -50,6 +50,7 @@ qt_internal_add_module(WebEngineCore
+         Qt::Gui
+         Qt::Network
+         Qt::Quick
++        X11
+ )
+ 
+ set_target_properties(WebEngineCore PROPERTIES QTWEBENGINEPROCESS_NAME ${qtWebEngineProcessName})
diff --git a/srcpkgs/qt6-webengine/patches/0004-ppc-disable-jxl-decoder.patch b/srcpkgs/qt6-webengine/patches/0004-ppc-disable-jxl-decoder.patch
new file mode 100644
index 000000000000..73c1151968f4
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0004-ppc-disable-jxl-decoder.patch
@@ -0,0 +1,13 @@
+--- a/src/core/CMakeLists.txt
++++ b/src/core/CMakeLists.txt
+@@ -414,6 +414,10 @@ foreach(arch ${archs})
+                 CONDITION QT_FEATURE_webengine_ozone_x11 AND XSCRNSAVER_FOUND
+             )
+ 
++            if (cpu STREQUAL "ppc64")
++                list(APPEND gnArgArg enable_jxl_decoder=false)
++            endif()
++
+             if(QT_FEATURE_webengine_kerberos)
+                 list(APPEND gnArgArg
+                      external_gssapi_include_dir="${GSSAPI_INCLUDE_DIRS}/gssapi"
diff --git a/srcpkgs/qt6-webengine/patches/0050-no-glibc-cmake-check.patch b/srcpkgs/qt6-webengine/patches/0050-no-glibc-cmake-check.patch
new file mode 100644
index 000000000000..f756bf0286bb
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0050-no-glibc-cmake-check.patch
@@ -0,0 +1,14 @@
+--- a/configure.cmake
++++ b/configure.cmake
+@@ -499,11 +499,6 @@ add_check_for_support(
+ )
+ add_check_for_support(
+    MODULES QtWebEngine QtPdf
+-   CONDITION NOT LINUX OR TEST_glibc
+-   MESSAGE "A suitable version >= 2.17 of glibc is required."
+-)
+-add_check_for_support(
+-   MODULES QtWebEngine QtPdf
+    CONDITION NOT LINUX OR TEST_khr
+    MESSAGE "Build requires Khronos development headers for build - see mesa/libegl1-mesa-dev"
+ )
diff --git a/srcpkgs/qt6-webengine/patches/0100-chromium-sandbox-membarrier.patch b/srcpkgs/qt6-webengine/patches/0100-chromium-sandbox-membarrier.patch
new file mode 100644
index 000000000000..2dd7b4aa948f
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0100-chromium-sandbox-membarrier.patch
@@ -0,0 +1,58 @@
+--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
++++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
+@@ -413,6 +413,7 @@ bool SyscallSets::IsAllowedProcessStartO
+   switch (sysno) {
+     case __NR_exit:
+     case __NR_exit_group:
++    case __NR_membarrier:
+     case __NR_wait4:
+     case __NR_waitid:
+ #if defined(__i386__)
+--- a/src/3rdparty/chromium/sandbox/linux/system_headers/arm64_linux_syscalls.h
++++ b/src/3rdparty/chromium/sandbox/linux/system_headers/arm64_linux_syscalls.h
+@@ -1215,4 +1215,8 @@
+ #define __NR_landlock_restrict_self 446
+ #endif
+ 
++#if !defined(__NR_membarrier)
++#define __NR_membarrier 283
++#endif
++
+ #endif  // SANDBOX_LINUX_SYSTEM_HEADERS_ARM64_LINUX_SYSCALLS_H_
+--- a/src/3rdparty/chromium/sandbox/linux/system_headers/arm_linux_syscalls.h
++++ b/src/3rdparty/chromium/sandbox/linux/system_headers/arm_linux_syscalls.h
+@@ -1617,6 +1617,10 @@
+ #define __NR_landlock_restrict_self (__NR_SYSCALL_BASE + 446)
+ #endif
+ 
++#if !defined(__NR_membarrier)
++#define __NR_membarrier (__NR_SYSCALL_BASE+389)
++#endif
++
+ // ARM private syscalls.
+ #if !defined(__ARM_NR_BASE)
+ #define __ARM_NR_BASE (__NR_SYSCALL_BASE + 0xF0000)
+--- a/src/3rdparty/chromium/sandbox/linux/system_headers/x86_32_linux_syscalls.h
++++ b/src/3rdparty/chromium/sandbox/linux/system_headers/x86_32_linux_syscalls.h
+@@ -1750,5 +1750,9 @@
+ #define __NR_landlock_restrict_self 446
+ #endif
+ 
++#if !defined(__NR_membarrier)
++#define __NR_membarrier 375
++#endif
++
+ #endif  // SANDBOX_LINUX_SYSTEM_HEADERS_X86_32_LINUX_SYSCALLS_H_
+ 
+--- a/src/3rdparty/chromium/sandbox/linux/system_headers/x86_64_linux_syscalls.h
++++ b/src/3rdparty/chromium/sandbox/linux/system_headers/x86_64_linux_syscalls.h
+@@ -1438,5 +1438,9 @@
+ #define __NR_landlock_restrict_self 446
+ #endif
+ 
++#if !defined(__NR_membarrier)
++#define __NR_membarrier 324
++#endif
++
+ #endif  // SANDBOX_LINUX_SYSTEM_HEADERS_X86_64_LINUX_SYSCALLS_H_
+ 
diff --git a/srcpkgs/qt6-webengine/patches/0101-size_t.patch b/srcpkgs/qt6-webengine/patches/0101-size_t.patch
new file mode 100644
index 000000000000..fccc085da311
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0101-size_t.patch
@@ -0,0 +1,16 @@
+--- a/src/3rdparty/chromium/third_party/angle/include/platform/PlatformMethods.h
++++ b/src/3rdparty/chromium/third_party/angle/include/platform/PlatformMethods.h
+@@ -239,11 +239,11 @@ inline void DefaultOverrideFeaturesMtl(P
+ using ProgramKeyType   = std::array<uint8_t, 20>;
+ using CacheProgramFunc = void (*)(PlatformMethods *platform,
+                                   const ProgramKeyType &key,
+-                                  size_t programSize,
++                                  std::size_t programSize,
+                                   const uint8_t *programBytes);
+ inline void DefaultCacheProgram(PlatformMethods *platform,
+                                 const ProgramKeyType &key,
+-                                size_t programSize,
++                                std::size_t programSize,
+                                 const uint8_t *programBytes)
+ {}
+ 
diff --git a/srcpkgs/qt6-webengine/patches/0102-chromium-90-ruy-include.patch b/srcpkgs/qt6-webengine/patches/0102-chromium-90-ruy-include.patch
new file mode 100644
index 000000000000..bbba579076d6
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0102-chromium-90-ruy-include.patch
@@ -0,0 +1,19 @@
+From 714092f336bb14d2fcc27396ec323b3d843bb962 Mon Sep 17 00:00:00 2001
+From: Stephan Hartmann <stha09@googlemail.com>
+Date: Thu, 4 Mar 2021 15:05:46 +0000
+Subject: [PATCH] IWYU: include limits for std::numeric_limits
+
+---
+ third_party/ruy/src/ruy/block_map.cc | 1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/src/3rdparty/chromium/third_party/ruy/src/ruy/block_map.cc
++++ b/src/3rdparty/chromium/third_party/ruy/src/ruy/block_map.cc
+@@ -17,6 +17,7 @@ limitations under the License.
+ 
+ #include <algorithm>
+ #include <cstdint>
++#include <limits>
+ 
+ #ifdef RUY_MAKEBLOCKMAP_DEBUG
+ #include <cstdio>
diff --git a/srcpkgs/qt6-webengine/patches/0103-chromium-v8-monotonic-pthread-cont_timedwait.patch b/srcpkgs/qt6-webengine/patches/0103-chromium-v8-monotonic-pthread-cont_timedwait.patch
new file mode 100644
index 000000000000..1dc8bc4d3d17
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0103-chromium-v8-monotonic-pthread-cont_timedwait.patch
@@ -0,0 +1,22 @@
+Use monotonic clock for pthread_cond_timedwait with musl too.
+
+--- a/src/3rdparty/chromium/v8/src/base/platform/condition-variable.cc
++++ b/src/3rdparty/chromium/v8/src/base/platform/condition-variable.cc
+@@ -20,7 +20,7 @@ namespace base {
+ 
+ ConditionVariable::ConditionVariable() {
+ #if (V8_OS_FREEBSD || V8_OS_NETBSD || V8_OS_OPENBSD || \
+-     (V8_OS_LINUX && V8_LIBC_GLIBC))
++     V8_OS_LINUX)
+   // On Free/Net/OpenBSD and Linux with glibc we can change the time
+   // source for pthread_cond_timedwait() to use the monotonic clock.
+   pthread_condattr_t attr;
+@@ -96,7 +96,7 @@ bool ConditionVariable::WaitFor(Mutex* m
+       &native_handle_, &mutex->native_handle(), &ts);
+ #else
+ #if (V8_OS_FREEBSD || V8_OS_NETBSD || V8_OS_OPENBSD || \
+-     (V8_OS_LINUX && V8_LIBC_GLIBC))
++     V8_OS_LINUX)
+   // On Free/Net/OpenBSD and Linux with glibc we can change the time
+   // source for pthread_cond_timedwait() to use the monotonic clock.
+   result = clock_gettime(CLOCK_MONOTONIC, &ts);
diff --git a/srcpkgs/qt6-webengine/patches/0104-chromium-revert-9d080c0.patch b/srcpkgs/qt6-webengine/patches/0104-chromium-revert-9d080c0.patch
new file mode 100644
index 000000000000..42b1ee9ec063
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0104-chromium-revert-9d080c0.patch
@@ -0,0 +1,162 @@
+ Original change's description:
+ > Replace 'blacklist' with 'ignorelist' in ./tools/msan/.
+ >
+ > Bug: 1097272, 1097268
+ > Change-Id: Id5c8227a5bfb1ffaec82d3168b609085b10c8297
+ > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2867730
+ > Commit-Queue: Dylan Cutler <dylancutler@google.com>
+ > Reviewed-by: Nico Weber <thakis@chromium.org>
+ > Reviewed-by: Jonathan Metzman <metzman@chromium.org>
+ > Cr-Commit-Position: refs/heads/master@{#883035}
+--- a/src/3rdparty/chromium/build/config/sanitizers/BUILD.gn
++++ b/src/3rdparty/chromium/build/config/sanitizers/BUILD.gn
+@@ -272,11 +272,11 @@ config("asan_flags") {
+   if (is_asan) {
+     cflags += [ "-fsanitize=address" ]
+     if (is_win) {
+-      if (!defined(asan_win_blocklist_path)) {
+-        asan_win_blocklist_path =
++      if (!defined(asan_win_blacklist_path)) {
++        asan_win_blacklist_path =
+             rebase_path("//tools/memory/asan/blocklist_win.txt", root_build_dir)
+       }
+-      cflags += [ "-fsanitize-ignorelist=$asan_win_blocklist_path" ]
++      cflags += [ "-fsanitize-blacklist=$asan_win_blacklist_path" ]
+     }
+   }
+ }
+@@ -306,13 +306,13 @@ config("link_shared_library") {
+ config("cfi_flags") {
+   cflags = []
+   if (is_cfi && current_toolchain == default_toolchain) {
+-    if (!defined(cfi_ignorelist_path)) {
+-      cfi_ignorelist_path =
++    if (!defined(cfi_blacklist_path)) {
++      cfi_blacklist_path =
+           rebase_path("//tools/cfi/ignores.txt", root_build_dir)
+     }
+     cflags += [
+       "-fsanitize=cfi-vcall",
+-      "-fsanitize-ignorelist=$cfi_ignorelist_path",
++      "-fsanitize-blacklist=$cfi_blacklist_path",
+     ]
+ 
+     if (use_cfi_cast) {
+@@ -409,14 +409,14 @@ config("msan_flags") {
+   if (is_msan) {
+     assert(is_linux || is_chromeos,
+            "msan only supported on linux x86_64/ChromeOS")
+-    if (!defined(msan_ignorelist_path)) {
+-      msan_ignorelist_path =
+-          rebase_path("//tools/msan/ignorelist.txt", root_build_dir)
++    if (!defined(msan_blacklist_path)) {
++      msan_blacklist_path =
++          rebase_path("//tools/msan/blacklist.txt", root_build_dir)
+     }
+     cflags = [
+       "-fsanitize=memory",
+       "-fsanitize-memory-track-origins=$msan_track_origins",
+-      "-fsanitize-ignorelist=$msan_ignorelist_path",
++      "-fsanitize-blacklist=$msan_blacklist_path",
+     ]
+   }
+ }
+@@ -424,13 +424,13 @@ config("msan_flags") {
+ config("tsan_flags") {
+   if (is_tsan) {
+     assert(is_linux || is_chromeos, "tsan only supported on linux x86_64")
+-    if (!defined(tsan_ignorelist_path)) {
+-      tsan_ignorelist_path =
++    if (!defined(tsan_blacklist_path)) {
++      tsan_blacklist_path =
+           rebase_path("//tools/memory/tsan_v2/ignores.txt", root_build_dir)
+     }
+     cflags = [
+       "-fsanitize=thread",
+-      "-fsanitize-ignorelist=$tsan_ignorelist_path",
++      "-fsanitize-blacklist=$tsan_blacklist_path",
+     ]
+   }
+ }
+@@ -438,8 +438,8 @@ config("tsan_flags") {
+ config("ubsan_flags") {
+   cflags = []
+   if (is_ubsan) {
+-    if (!defined(ubsan_ignorelist_path)) {
+-      ubsan_ignorelist_path =
++    if (!defined(ubsan_blacklist_path)) {
++      ubsan_blacklist_path =
+           rebase_path("//tools/ubsan/ignorelist.txt", root_build_dir)
+     }
+     cflags += [
+@@ -456,7 +456,7 @@ config("ubsan_flags") {
+       "-fsanitize=signed-integer-overflow",
+       "-fsanitize=unreachable",
+       "-fsanitize=vla-bound",
+-      "-fsanitize-ignorelist=$ubsan_ignorelist_path",
++      "-fsanitize-blacklist=$ubsan_blacklist_path",
+     ]
+     if (!is_clang) {
+       # These exposes too much illegal C++14 code to compile on anything stricter than clang:
+@@ -497,8 +497,8 @@ config("ubsan_no_recover") {
+ 
+ config("ubsan_security_flags") {
+   if (is_ubsan_security) {
+-    if (!defined(ubsan_security_ignorelist_path)) {
+-      ubsan_security_ignorelist_path =
++    if (!defined(ubsan_security_blacklist_path)) {
++      ubsan_security_blacklist_path =
+           rebase_path("//tools/ubsan/security_ignorelist.txt", root_build_dir)
+     }
+     cflags = [
+@@ -506,7 +506,7 @@ config("ubsan_security_flags") {
+       "-fsanitize=shift",
+       "-fsanitize=signed-integer-overflow",
+       "-fsanitize=vla-bound",
+-      "-fsanitize-ignorelist=$ubsan_security_ignorelist_path",
++      "-fsanitize-blacklist=$ubsan_security_blacklist_path",
+     ]
+   }
+ }
+@@ -519,13 +519,13 @@ config("ubsan_null_flags") {
+ 
+ config("ubsan_vptr_flags") {
+   if (is_ubsan_vptr) {
+-    if (!defined(ubsan_vptr_ignorelist_path)) {
+-      ubsan_vptr_ignorelist_path =
++    if (!defined(ubsan_vptr_blacklist_path)) {
++      ubsan_vptr_blacklist_path =
+           rebase_path("//tools/ubsan/vptr_ignorelist.txt", root_build_dir)
+     }
+     cflags = [
+       "-fsanitize=vptr",
+-      "-fsanitize-ignorelist=$ubsan_vptr_ignorelist_path",
++      "-fsanitize-blacklist=$ubsan_vptr_blacklist_path",
+     ]
+     if (!is_clang) {
+       # Clang specific flag:
+--- a/src/3rdparty/chromium/build_overrides/build.gni
++++ b/src/3rdparty/chromium/build_overrides/build.gni
+@@ -43,15 +43,15 @@ declare_args() {
+ # Allows different projects to specify their own suppression/ignore lists for
+ # sanitizer tools.
+ # asan_suppressions_file = "path/to/asan_suppressions.cc"
+-# asan_win_ignorelist_path = "path/to/asan/blocklist_win.txt"
++# asan_win_blacklist_path = "path/to/asan/blocklist_win.txt"
+ # lsan_suppressions_file = "path/to/lsan_suppressions.cc"
+ # tsan_suppressions_file = "path/to/tsan_suppressions.cc"
+-# tsan_ignorelist_path = "path/to/tsan/ignores.txt"
+-# msan_ignorelist_path = "path/to/msan/ignorelist.txt"
+-# ubsan_ignorelist_path = "path/to/ubsan/ignorelist.txt"
+-# ubsan_vptr_ignorelist_path = "path/to/ubsan/vptr_ignorelist.txt"
+-# ubsan_security_ignorelist_path = "path/to/ubsan/security_ignorelist.txt"
+-# cfi_ignorelist_path = "path/to/cfi/ignores.txt"
++# tsan_blacklist_path = "path/to/tsan/ignores.txt"
++# msan_blacklist_path = "path/to/msan/blacklist.txt"
++# ubsan_blacklist_path = "path/to/ubsan/blacklist.txt"
++# ubsan_vptr_blacklist_path = "path/to/ubsan/vptr_blacklist.txt"
++# ubsan_security_blacklist_path = "path/to/ubsan/security_blacklist.txt"
++# cfi_blacklist_path = "path/to/cfi/ignores.txt"
+ 
+ declare_args() {
+   # Android 32-bit non-component, non-clang builds cannot have symbol_level=2
diff --git a/srcpkgs/qt6-webengine/patches/0105-chromium-revert-drop-of-system-java.patch b/srcpkgs/qt6-webengine/patches/0105-chromium-revert-drop-of-system-java.patch
new file mode 100644
index 000000000000..44f3aa8fae5e
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0105-chromium-revert-drop-of-system-java.patch
@@ -0,0 +1,15 @@
+This was dropped for some reason in 6951c37cecd05979b232a39e5c10e6346a0f74ef
+--- a/src/3rdparty/chromium/third_party/closure_compiler/compiler.py
++++ b/src/3rdparty/chromium/third_party/closure_compiler/compiler.py
+@@ -13,8 +13,9 @@ import subprocess
+ 
+ 
+ _CURRENT_DIR = os.path.join(os.path.dirname(__file__))
+-_JAVA_PATH = os.path.join(_CURRENT_DIR, "..", "jdk", "current", "bin", "java")
+-assert os.path.isfile(_JAVA_PATH), "java only allowed in android builds"
++_JAVA_BIN = "java"
++_JDK_PATH = os.path.join(_CURRENT_DIR, "..", "jdk", "current", "bin", "java")
++_JAVA_PATH = _JDK_PATH if os.path.isfile(_JDK_PATH) else _JAVA_BIN
+ 
+ class Compiler(object):
+   """Runs the Closure compiler on given source files to typecheck them
diff --git a/srcpkgs/qt6-webengine/patches/0106-chromium-system-nodejs.patch b/srcpkgs/qt6-webengine/patches/0106-chromium-system-nodejs.patch
new file mode 100644
index 000000000000..1e067cc6eda0
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0106-chromium-system-nodejs.patch
@@ -0,0 +1,20 @@
+--- a/src/3rdparty/chromium/third_party/node/node.py
++++ b/src/3rdparty/chromium/third_party/node/node.py
+@@ -36,11 +36,12 @@ def GetBinaryPath():
+   if platform.system() == 'Darwin' and platform.machine() == 'arm64':
+       return os.path.join(os_path.join(os_path.dirname(__file__), 'mac',
+                           'node-darwin-arm64', 'bin', 'node'))
+-  return os_path.join(os_path.dirname(__file__), *{
+-    'Darwin': ('mac', 'node-darwin-x64', 'bin', 'node'),
+-    'Linux': ('linux', 'node-linux-x64', 'bin', 'node'),
+-    'Windows': ('win', 'node.exe'),
+-  }[platform.system()])
++  return "/usr/bin/node"
++  #return os_path.join(os_path.dirname(__file__), *{
++  #  'Darwin': ('mac', 'node-darwin-x64', 'bin', 'node'),
++  #  'Linux': ('linux', 'node-linux-x64', 'bin', 'node'),
++  #  'Windows': ('win', 'node.exe'),
++  #}[platform.system()])
+ 
+ 
+ def RunNode(cmd_parts, stdout=None):
diff --git a/srcpkgs/qt6-webengine/patches/0107-chromium-cursed^Uscoped_file.patch b/srcpkgs/qt6-webengine/patches/0107-chromium-cursed^Uscoped_file.patch
new file mode 100644
index 000000000000..a8f5d971883d
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0107-chromium-cursed^Uscoped_file.patch
@@ -0,0 +1,18 @@
+--- a/src/3rdparty/chromium/base/files/scoped_file_linux.cc
++++ b/src/3rdparty/chromium/base/files/scoped_file_linux.cc
+@@ -77,15 +77,3 @@ bool IsFDOwned(int fd) {
+ }
+ 
+ }  // namespace base
+-
+-extern "C" {
+-
+-int __close(int);
+-
+-__attribute__((visibility("default"), noinline)) int close(int fd) {
+-  if (base::IsFDOwned(fd) && g_is_ownership_enforced)
+-    CrashOnFdOwnershipViolation();
+-  return __close(fd);
+-}
+-
+-}  // extern "C"
diff --git a/srcpkgs/qt6-webengine/patches/0108-chromium-fix-narrowing-cast.patch b/srcpkgs/qt6-webengine/patches/0108-chromium-fix-narrowing-cast.patch
new file mode 100644
index 000000000000..ed32cd9b7415
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0108-chromium-fix-narrowing-cast.patch
@@ -0,0 +1,53 @@
+--- a/src/3rdparty/chromium/base/files/file_util_linux.cc
++++ b/src/3rdparty/chromium/base/files/file_util_linux.cc
+@@ -23,14 +23,14 @@ bool GetFileSystemType(const FilePath& p
+ 
+   // Not all possible |statfs_buf.f_type| values are in linux/magic.h.
+   // Missing values are copied from the statfs man page.
+-  switch (statfs_buf.f_type) {
++  switch (static_cast<uintmax_t>(statfs_buf.f_type)) {
+     case 0:
+       *type = FILE_SYSTEM_0;
+       break;
+     case EXT2_SUPER_MAGIC:  // Also ext3 and ext4
+     case MSDOS_SUPER_MAGIC:
+     case REISERFS_SUPER_MAGIC:
+-    case static_cast<int>(BTRFS_SUPER_MAGIC):
++    case BTRFS_SUPER_MAGIC:
+     case 0x5346544E:  // NTFS
+     case 0x58465342:  // XFS
+     case 0x3153464A:  // JFS
+@@ -40,14 +40,14 @@ bool GetFileSystemType(const FilePath& p
+       *type = FILE_SYSTEM_NFS;
+       break;
+     case SMB_SUPER_MAGIC:
+-    case static_cast<int>(0xFF534D42):  // CIFS
++    case 0xFF534D42:  // CIFS
+       *type = FILE_SYSTEM_SMB;
+       break;
+     case CODA_SUPER_MAGIC:
+       *type = FILE_SYSTEM_CODA;
+       break;
+-    case static_cast<int>(HUGETLBFS_MAGIC):
+-    case static_cast<int>(RAMFS_MAGIC):
++    case HUGETLBFS_MAGIC:
++    case RAMFS_MAGIC:
+     case TMPFS_MAGIC:
+       *type = FILE_SYSTEM_MEMORY;
+       break;
+--- a/src/3rdparty/chromium/base/system/sys_info_posix.cc
++++ b/src/3rdparty/chromium/base/system/sys_info_posix.cc
+@@ -100,10 +100,10 @@ bool IsStatsZeroIfUnlimited(const base::
+   if (HANDLE_EINTR(statfs(path.value().c_str(), &stats)) != 0)
+     return false;
+ 
+-  switch (stats.f_type) {
++  switch (static_cast<uintmax_t>(stats.f_type)) {
+     case TMPFS_MAGIC:
+-    case static_cast<int>(HUGETLBFS_MAGIC):
+-    case static_cast<int>(RAMFS_MAGIC):
++    case HUGETLBFS_MAGIC:
++    case RAMFS_MAGIC:
+       return true;
+   }
+   return false;
diff --git a/srcpkgs/qt6-webengine/patches/0109-chromium-remove-strip_binary.patch b/srcpkgs/qt6-webengine/patches/0109-chromium-remove-strip_binary.patch
new file mode 100644
index 000000000000..5ebd16e659af
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0109-chromium-remove-strip_binary.patch
@@ -0,0 +1,32 @@
+--- a/src/3rdparty/chromium/chrome/test/chromedriver/BUILD.gn
++++ b/src/3rdparty/chromium/chrome/test/chromedriver/BUILD.gn
+@@ -308,11 +308,7 @@ source_set("lib") {
+   }
+ }
+ 
+-if (is_linux) {
+-  chromedriver_output = "chromedriver.unstripped"
+-} else {
+-  chromedriver_output = "chromedriver"
+-}
++chromedriver_output = "chromedriver"
+ 
+ executable("$chromedriver_output") {
+   testonly = true
+@@ -336,16 +332,6 @@ executable("$chromedriver_output") {
+   }
+ }
+ 
+-if (is_linux) {
+-  strip_binary("chromedriver") {
+-    testonly = true
+-    binary_input = "$root_out_dir/$chromedriver_output"
+-    symbol_output = "$root_out_dir/chromedriver.debug"
+-    stripped_binary_output = "$root_out_dir/chromedriver"
+-    deps = [ ":$chromedriver_output" ]
+-  }
+-}
+-
+ python_library("chromedriver_py_tests") {
+   testonly = true
+   deps = [
diff --git a/srcpkgs/qt6-webengine/patches/0110-chromium-revert-use-ffile-compilation-dir.patch b/srcpkgs/qt6-webengine/patches/0110-chromium-revert-use-ffile-compilation-dir.patch
new file mode 100644
index 000000000000..a00f7ea80f7a
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0110-chromium-revert-use-ffile-compilation-dir.patch
@@ -0,0 +1,57 @@
+From 34a955823630096f5b01c2b01d51c1ea59d22763 Mon Sep 17 00:00:00 2001
+From: Zequan Wu <zequanwu@google.com>
+Date: Tue, 20 Jul 2021 14:13:50 +0000
+Subject: [PATCH] Use -ffile-compilation-dir= instead of
+ -fdebug-compilation-dir=
+
+Bug: 1010267
+Change-Id: If2b4ead8535a76490eb466a38e3d8fed6ea91079
+Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2770738
+Auto-Submit: Zequan Wu <zequanwu@google.com>
+Commit-Queue: Nico Weber <thakis@chromium.org>
+Reviewed-by: Nico Weber <thakis@chromium.org>
+Cr-Commit-Position: refs/heads/master@{#903456}
+--- a/src/3rdparty/chromium/build/config/compiler/BUILD.gn
++++ b/src/3rdparty/chromium/build/config/compiler/BUILD.gn
+@@ -1269,19 +1269,12 @@ config("compiler_deterministic") {
+     # different build directory like "out/feature_a" and "out/feature_b" if
+     # we build same files with same compile flag.
+     # Other paths are already given in relative, no need to normalize them.
+-    if (is_nacl) {
+-      # TODO(https://crbug.com/1231236): Use -ffile-compilation-dir= here.
+-      cflags += [
+-        "-Xclang",
+-        "-fdebug-compilation-dir",
+-        "-Xclang",
+-        ".",
+-      ]
+-    } else {
+-      # -ffile-compilation-dir is an alias for both -fdebug-compilation-dir=
+-      # and -fcoverage-compilation-dir=.
+-      cflags += [ "-ffile-compilation-dir=." ]
+-    }
++    cflags += [
++      "-Xclang",
++      "-fdebug-compilation-dir",
++      "-Xclang",
++      ".",
++    ]
+     if (!is_win) {
+       # We don't use clang -cc1as on Windows (yet? https://crbug.com/762167)
+       asmflags = [ "-Wa,-fdebug-compilation-dir,." ]
+--- a/src/3rdparty/chromium/build/config/compiler/compiler.gni
++++ b/src/3rdparty/chromium/build/config/compiler/compiler.gni
+@@ -228,8 +228,11 @@ declare_args() {
+ # deterministic builds to reduce compile times, so this is less relevant for
+ # official builders.
+ strip_absolute_paths_from_debug_symbols_default =
+-    is_android || is_fuchsia || is_nacl || (is_win && use_lld) || is_linux ||
+-    is_chromeos || (is_apple && !enable_dsyms)
++    # TODO(crbug.com/1010267): remove '!use_clang_coverage', coverage build has
++    # dependency to absolute path of source files.
++    !use_clang_coverage &&
++    (is_android || is_fuchsia || is_nacl || (is_win && use_lld) || is_linux ||
++     is_chromeos || (is_apple && !enable_dsyms))
+ 
+ declare_args() {
+   strip_absolute_paths_from_debug_symbols = strip_absolute_paths_from_debug_symbols_default
diff --git a/srcpkgs/qt6-webengine/patches/0111-chromium-no-Wno-stringop-overread.patch b/srcpkgs/qt6-webengine/patches/0111-chromium-no-Wno-stringop-overread.patch
new file mode 100644
index 000000000000..03eac3f8e067
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0111-chromium-no-Wno-stringop-overread.patch
@@ -0,0 +1,10 @@
+--- a/src/3rdparty/chromium/build/config/compiler/BUILD.gn
++++ b/src/3rdparty/chromium/build/config/compiler/BUILD.gn
+@@ -394,7 +394,6 @@ config("compiler") {
+         "-Wno-parentheses",
+         "-Wno-sign-compare", # fido
+         "-Wno-stringop-overflow", # skia, libaom, protobuf, icu
+-        "-Wno-stringop-overread", # libaom
+         "-Wno-psabi", # skia
+         "-Wno-multichar", # crashpad
+         "-Wno-format-zero-length", # user_agent.cc
diff --git a/srcpkgs/qt6-webengine/patches/0150-chromium-glibc-libc_malloc.patch b/srcpkgs/qt6-webengine/patches/0150-chromium-glibc-libc_malloc.patch
new file mode 100644
index 000000000000..7e1b66e5c73d
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0150-chromium-glibc-libc_malloc.patch
@@ -0,0 +1,24 @@
+--- a/src/3rdparty/chromium/base/process/memory_linux.cc
++++ b/src/3rdparty/chromium/base/process/memory_linux.cc
+@@ -23,6 +23,12 @@
+ #include "third_party/tcmalloc/chromium/src/gperftools/tcmalloc.h"
+ #endif
+ 
++#if defined(LIBC_GLIBC)
++extern "C" {
++extern void *__libc_malloc(size_t size);
++}
++#endif
++
+ namespace base {
+ 
+ namespace {
+@@ -120,7 +126,7 @@ bool UncheckedMalloc(size_t size, void**
+     (!defined(LIBC_GLIBC) && !BUILDFLAG(USE_TCMALLOC))
+   *result = malloc(size);
+ #elif defined(LIBC_GLIBC) && !BUILDFLAG(USE_TCMALLOC)
+-  *result = __libc_malloc(size);
++  *result = ::__libc_malloc(size);
+ #elif BUILDFLAG(USE_TCMALLOC)
+   *result = tc_malloc_skip_new_handler(size);
+ #endif
diff --git a/srcpkgs/qt6-webengine/patches/0200-chromium-musl-include-sys-reg.h-to-get-__WORDSIZE.patch b/srcpkgs/qt6-webengine/patches/0200-chromium-musl-include-sys-reg.h-to-get-__WORDSIZE.patch
new file mode 100644
index 000000000000..41b90071b5e4
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0200-chromium-musl-include-sys-reg.h-to-get-__WORDSIZE.patch
@@ -0,0 +1,21 @@
+From 9001c54d6b974449174a8cee8f3f5d78a9bd6c9e Mon Sep 17 00:00:00 2001
+From: Felix Janda <felix.janda@posteo.de>
+Date: Sun, 1 Feb 2015 14:26:52 +0100
+Subject: [PATCH 3/6] include <sys/reg.h> to get __WORDSIZE on musl libc
+
+---
+ qtwebengine/src/3rdparty/chromium/third_party/breakpad/breakpad/src/common/linux/elf_core_dump.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/common/linux/elf_core_dump.h
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/common/linux/elf_core_dump.h
+@@ -37,6 +37,9 @@
+ #include <limits.h>
+ #include <link.h>
+ #include <stddef.h>
++#ifndef __GLIBC__
++#include <sys/reg.h>
++#endif
+ 
+ #include "common/memory_range.h"
+ 
diff --git a/srcpkgs/qt6-webengine/patches/0201-chromium-musl-dispatch-to-musl.patch b/srcpkgs/qt6-webengine/patches/0201-chromium-musl-dispatch-to-musl.patch
new file mode 100644
index 000000000000..a58a688a4b55
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0201-chromium-musl-dispatch-to-musl.patch
@@ -0,0 +1,103 @@
+--- a/src/3rdparty/chromium/base/allocator/allocator_shim_default_dispatch_to_glibc.cc
++++ b/src/3rdparty/chromium/base/allocator/allocator_shim_default_dispatch_to_glibc.cc
+@@ -8,6 +8,7 @@
+ #include <dlfcn.h>
+ #include <malloc.h>
+ 
++#if defined(__GLIBC__)
+ // This translation unit defines a default dispatch for the allocator shim which
+ // routes allocations to libc functions.
+ // The code here is strongly inspired from tcmalloc's libc_override_glibc.h.
+@@ -87,3 +88,92 @@ const AllocatorDispatch AllocatorDispatc
+     nullptr,               /* aligned_free_function */
+     nullptr,               /* next */
+ };
++
++#else // defined(__GLIBC__)
++
++#include <dlfcn.h>
++
++extern "C" {
++// Declare function pointers to the memory functions
++typedef void* (*t_libc_malloc)(size_t size);
++typedef void* (*t_libc_calloc)(size_t n, size_t size);
++typedef void* (*t_libc_realloc)(void* address, size_t size);
++typedef void* (*t_libc_memalign)(size_t alignment, size_t size);
++typedef void (*t_libc_free)(void* ptr);
++typedef size_t (*t_libc_malloc_usable_size)(void* ptr);
++
++// Static instances of pointers to libc.so dl symbols
++static t_libc_malloc libc_malloc = NULL;
++static t_libc_calloc libc_calloc = NULL;
++static t_libc_realloc libc_realloc = NULL;
++static t_libc_memalign libc_memalign = NULL;
++static t_libc_free libc_free = NULL;
++static t_libc_malloc_usable_size libc_malloc_usable_size = NULL;
++
++// resolve the symbols in libc.so
++void musl_libc_memory_init(void)
++{
++  libc_malloc = (t_libc_malloc) dlsym(RTLD_NEXT, "malloc");
++  libc_calloc = (t_libc_calloc) dlsym(RTLD_NEXT, "calloc");
++  libc_realloc = (t_libc_realloc) dlsym(RTLD_NEXT, "realloc");
++  libc_memalign = (t_libc_memalign) dlsym(RTLD_NEXT, "memalign");
++  libc_free = (t_libc_free) dlsym(RTLD_NEXT, "free");
++  libc_malloc_usable_size = (t_libc_malloc_usable_size) dlsym(RTLD_NEXT, "malloc_usable_size");
++}
++}  // extern "C"
++
++namespace {
++
++using base::allocator::AllocatorDispatch;
++
++void* MuslMalloc(const AllocatorDispatch*, size_t size, void* context) {
++  if (!libc_malloc)
++    musl_libc_memory_init();
++  return (*libc_malloc)(size);
++}
++
++void* MuslCalloc(const AllocatorDispatch*, size_t n, size_t size, void* context) {
++  if (!libc_calloc)
++    musl_libc_memory_init();
++  return (*libc_calloc)(n, size);
++}
++
++void* MuslRealloc(const AllocatorDispatch*, void* address, size_t size, void* context) {
++  if (!libc_realloc)
++    musl_libc_memory_init();
++  return (*libc_realloc)(address, size);
++}
++
++void* MuslMemalign(const AllocatorDispatch*, size_t alignment, size_t size, void* context) {
++  if (!libc_memalign)
++    musl_libc_memory_init();
++  return (*libc_memalign)(alignment, size);
++}
++
++void MuslFree(const AllocatorDispatch*, void* address, void* context) {
++  if (!libc_free)
++    musl_libc_memory_init();
++  (*libc_free)(address);
++}
++
++size_t MuslGetSizeEstimate(const AllocatorDispatch*, void* address, void* context) {
++  // TODO(siggi, primiano): malloc_usable_size may need redirection in the
++  //     presence of interposing shims that divert allocations.
++  if (!libc_malloc_usable_size)
++    musl_libc_memory_init();
++  return (*libc_malloc_usable_size)(address);
++}
++
++}  // namespace
++
++const AllocatorDispatch AllocatorDispatch::default_dispatch = {
++    &MuslMalloc,           /* alloc_function */
++    &MuslCalloc,           /* alloc_zero_initialized_function */
++    &MuslMemalign,         /* alloc_aligned_function */
++    &MuslRealloc,          /* realloc_function */
++    &MuslFree,             /* free_function */
++    &MuslGetSizeEstimate,  /* get_size_estimate_function */
++    nullptr,               /* next */
++};
++
++#endif
diff --git a/srcpkgs/qt6-webengine/patches/0202-chromium-musl-no-mallinfo.patch b/srcpkgs/qt6-webengine/patches/0202-chromium-musl-no-mallinfo.patch
new file mode 100644
index 000000000000..a5bdb5a43a5f
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0202-chromium-musl-no-mallinfo.patch
@@ -0,0 +1,62 @@
+--- a/src/3rdparty/chromium/base/process/process_metrics_posix.cc
++++ b/src/3rdparty/chromium/base/process/process_metrics_posix.cc
+@@ -105,7 +105,7 @@ void IncreaseFdLimitTo(unsigned int max_
+ 
+ #endif  // !defined(OS_FUCHSIA)
+ 
+-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID)
++#if (defined(OS_LINUX) && defined(__GLIBC__)) || defined(OS_CHROMEOS) || defined(OS_ANDROID)
+ namespace {
+ 
+ size_t GetMallocUsageMallinfo() {
+@@ -127,16 +127,16 @@ size_t GetMallocUsageMallinfo() {
+ }
+ 
+ }  // namespace
+-#endif  // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID)
++#endif  // (defined(OS_LINUX) && defined(__GLIBC__)) || defined(OS_CHROMEOS) || defined(OS_ANDROID)
+ 
+ size_t ProcessMetrics::GetMallocUsage() {
+ #if defined(OS_APPLE)
+   malloc_statistics_t stats = {0};
+   malloc_zone_statistics(nullptr, &stats);
+   return stats.size_in_use;
+-#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID)
++#elif (defined(OS_LINUX) && defined(__GLIBC__)) || defined(OS_CHROMEOS) || defined(OS_ANDROID)
+   return GetMallocUsageMallinfo();
+-#elif defined(OS_FUCHSIA)
++#else
+   // TODO(fuchsia): Not currently exposed. https://crbug.com/735087.
+   return 0;
+ #endif
+--- a/src/3rdparty/chromium/third_party/tflite/src/tensorflow/lite/profiling/memory_info.cc
++++ b/src/3rdparty/chromium/third_party/tflite/src/tensorflow/lite/profiling/memory_info.cc
+@@ -27,7 +27,7 @@ namespace memory {
+ const int MemoryUsage::kValueNotSet = 0;
+ 
+ bool MemoryUsage::IsSupported() {
+-#ifdef __linux__
++#ifdef __GLIBC__
+   return true;
+ #endif
+   return false;
+@@ -35,7 +35,7 @@ bool MemoryUsage::IsSupported() {
+ 
+ MemoryUsage GetMemoryUsage() {
+   MemoryUsage result;
+-#ifdef __linux__
++#ifdef __GLIBC__
+   rusage res;
+   if (getrusage(RUSAGE_SELF, &res) == 0) {
+     result.max_rss_kb = res.ru_maxrss;
+--- a/src/3rdparty/chromium/base/trace_event/malloc_dump_provider.cc
++++ b/src/3rdparty/chromium/base/trace_event/malloc_dump_provider.cc
+@@ -213,7 +213,7 @@ bool MallocDumpProvider::OnMemoryDump(co
+                      &allocated_objects_count);
+ #elif defined(OS_FUCHSIA)
+ // TODO(fuchsia): Port, see https://crbug.com/706592.
+-#else
++#elif defined(__GLIBC__)
+ #if defined(__GLIBC__) && defined(__GLIBC_PREREQ)
+ #if __GLIBC_PREREQ(2, 33)
+ #define MALLINFO2_FOUND_IN_LIBC
diff --git a/srcpkgs/qt6-webengine/patches/0203-chromium-musl-siginfo_t.patch b/srcpkgs/qt6-webengine/patches/0203-chromium-musl-siginfo_t.patch
new file mode 100644
index 000000000000..43ef7fd7c5d2
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0203-chromium-musl-siginfo_t.patch
@@ -0,0 +1,18 @@
+There's a subtle difference in the internal name of siginfo_t fields
+between glibc and musl. The structure itself is equivalent, so it
+should suffice to add a macro to rename the field.
+
+--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf/trap.cc
++++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf/trap.cc
+@@ -174,7 +174,11 @@ void Trap::SigSys(int nr, LinuxSigInfo*
+   // If the version of glibc doesn't include this information in
+   // siginfo_t (older than 2.17), we need to explicitly copy it
+   // into an arch_sigsys structure.
++#if defined(__GLIBC__)
+   memcpy(&sigsys, &info->_sifields, sizeof(sigsys));
++#else
++  memcpy(&sigsys, &info->__si_fields, sizeof(sigsys));
++#endif
+ #endif
+ 
+ #if defined(__mips__)
diff --git a/srcpkgs/qt6-webengine/patches/0204-chromium-musl-stackstart.patch b/srcpkgs/qt6-webengine/patches/0204-chromium-musl-stackstart.patch
new file mode 100644
index 000000000000..b03cf43b86db
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0204-chromium-musl-stackstart.patch
@@ -0,0 +1,20 @@
+--- a/src/3rdparty/chromium/third_party/blink/renderer/platform/wtf/stack_util.cc
++++ b/src/3rdparty/chromium/third_party/blink/renderer/platform/wtf/stack_util.cc
+@@ -29,7 +29,7 @@ size_t GetUnderestimatedStackSize() {
+ // FIXME: On Mac OSX and Linux, this method cannot estimate stack size
+ // correctly for the main thread.
+ 
+-#elif defined(__GLIBC__) || defined(OS_ANDROID) || defined(OS_FREEBSD) || \
++#elif defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FREEBSD) || \
+     defined(OS_FUCHSIA)
+   // pthread_getattr_np() can fail if the thread is not invoked by
+   // pthread_create() (e.g., the main thread of blink_unittests).
+@@ -97,7 +97,7 @@ return Threading::ThreadStackSize();
+ }
+ 
+ void* GetStackStart() {
+-#if defined(__GLIBC__) || defined(OS_ANDROID) || defined(OS_FREEBSD) || \
++#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FREEBSD) || \
+     defined(OS_FUCHSIA)
+   pthread_attr_t attr;
+   int error;
diff --git a/srcpkgs/qt6-webengine/patches/0205-chromium-musl-sandbox.patch b/srcpkgs/qt6-webengine/patches/0205-chromium-musl-sandbox.patch
new file mode 100644
index 000000000000..772a578fd823
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0205-chromium-musl-sandbox.patch
@@ -0,0 +1,92 @@
+--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc
++++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc
+@@ -138,7 +138,7 @@ namespace sandbox {
+ // present (as in newer versions of posix_spawn).
+ ResultExpr RestrictCloneToThreadsAndEPERMFork() {
+   const Arg<unsigned long> flags(0);
+-
++#if defined(__GLIBC__)
+   // TODO(mdempsky): Extend DSL to support (flags & ~mask1) == mask2.
+   const uint64_t kAndroidCloneMask = CLONE_VM | CLONE_FS | CLONE_FILES |
+                                      CLONE_SIGHAND | CLONE_THREAD |
+@@ -165,6 +165,17 @@ ResultExpr RestrictCloneToThreadsAndEPER
+   return If(IsAndroid() ? android_test : glibc_test, Allow())
+       .ElseIf(is_fork_or_clone_vfork, Error(EPERM))
+       .Else(CrashSIGSYSClone());
++#else
++  const int required = CLONE_VM | CLONE_FS | CLONE_FILES | CLONE_SIGHAND |
++                       CLONE_THREAD | CLONE_SYSVSEM;
++  const int safe = CLONE_SETTLS | CLONE_PARENT_SETTID | CLONE_CHILD_CLEARTID |
++                   CLONE_DETACHED;
++  const BoolExpr thread_clone_ok = (flags&~safe)==required;
++
++  return If(thread_clone_ok, Allow())
++      .ElseIf((flags & (CLONE_VM | CLONE_THREAD)) == 0, Error(EPERM))
++      .Else(CrashSIGSYSClone());
++#endif
+ }
+ 
+ #ifndef PR_PAC_RESET_KEYS
+--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
++++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
+@@ -419,6 +419,9 @@ bool SyscallSets::IsAllowedProcessStartO
+ #if defined(__i386__)
+     case __NR_waitpid:
+ #endif
++#if !defined(__GLIBC__)
++    case __NR_set_tid_address:
++#endif
+       return true;
+     case __NR_clone:  // Should be parameter-restricted.
+     case __NR_setns:  // Privileged.
+@@ -431,7 +434,9 @@ bool SyscallSets::IsAllowedProcessStartO
+ #if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
+     case __NR_set_thread_area:
+ #endif
++#if defined(__GLIBC__)
+     case __NR_set_tid_address:
++#endif
+     case __NR_unshare:
+ #if !defined(__mips__) && !defined(__aarch64__)
+     case __NR_vfork:
+@@ -545,6 +550,9 @@ bool SyscallSets::IsAllowedAddressSpaceA
+     case __NR_mlock:
+     case __NR_munlock:
+     case __NR_munmap:
++#if !defined(__GLIBC__)
++    case __NR_mremap:
++#endif
+       return true;
+     case __NR_madvise:
+     case __NR_mincore:
+@@ -562,7 +570,9 @@ bool SyscallSets::IsAllowedAddressSpaceA
+     case __NR_modify_ldt:
+ #endif
+     case __NR_mprotect:
++#if defined(__GLIBC__)
+     case __NR_mremap:
++#endif
+     case __NR_msync:
+     case __NR_munlockall:
+     case __NR_readahead:
+--- a/src/3rdparty/chromium/sandbox/policy/linux/bpf_renderer_policy_linux.cc
++++ b/src/3rdparty/chromium/sandbox/policy/linux/bpf_renderer_policy_linux.cc
+@@ -97,11 +97,18 @@ ResultExpr RendererProcessPolicy::Evalua
+     case __NR_sysinfo:
+     case __NR_times:
+     case __NR_uname:
++#if !defined(__GLIBC__)
++    case __NR_sched_getparam:
++    case __NR_sched_getscheduler:
++    case __NR_sched_setscheduler:
++#endif
+       return Allow();
+     case __NR_sched_getaffinity:
++#if defined(__GLIBC__)
+     case __NR_sched_getparam:
+     case __NR_sched_getscheduler:
+     case __NR_sched_setscheduler:
++#endif
+       return RestrictSchedTarget(GetPolicyPid(), sysno);
+     case __NR_prlimit64:
+       // See crbug.com/662450 and setrlimit comment above.
diff --git a/srcpkgs/qt6-webengine/patches/0206-chromium-musl-default-stacksize.patch b/srcpkgs/qt6-webengine/patches/0206-chromium-musl-default-stacksize.patch
new file mode 100644
index 000000000000..bc07495b8144
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0206-chromium-musl-default-stacksize.patch
@@ -0,0 +1,15 @@
+--- a/src/3rdparty/chromium/base/threading/platform_thread_linux.cc
++++ b/src/3rdparty/chromium/base/threading/platform_thread_linux.cc
+@@ -439,7 +439,12 @@ void TerminateOnThread() {}
+ 
+ size_t GetDefaultThreadStackSize(const pthread_attr_t& attributes) {
+ #if !defined(THREAD_SANITIZER)
++#if defined(__GLIBC__)
+   return 0;
++#else // defined(__GLIBC__)
++  // For Musl libc try with a default stack size of 2 MiB
++  return 2 * 1024 * 1024;
++#endif // !defined(__GLIBC__)
+ #else
+   // ThreadSanitizer bloats the stack heavily. Evidence has been that the
+   // default stack size isn't enough for some browser tests.
diff --git a/srcpkgs/qt6-webengine/patches/0207-chromium-musl-cross-no-asm_ptrace_h.patch b/srcpkgs/qt6-webengine/patches/0207-chromium-musl-cross-no-asm_ptrace_h.patch
new file mode 100644
index 000000000000..3cf132908af4
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0207-chromium-musl-cross-no-asm_ptrace_h.patch
@@ -0,0 +1,30 @@
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper.cc
+@@ -38,7 +38,12 @@
+ 
+ #include "client/linux/minidump_writer/linux_ptrace_dumper.h"
+ 
++#if defined(__GLIBC__)
+ #include <asm/ptrace.h>
++#else
++/* For arm*-musl this definition is missing */
++#define ARM_sp uregs[13]
++#endif
+ #include <assert.h>
+ #include <errno.h>
+ #include <fcntl.h>
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_core_dumper.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_core_dumper.cc
+@@ -32,7 +32,12 @@
+ 
+ #include "client/linux/minidump_writer/linux_core_dumper.h"
+ 
++#if defined(__GLIBC__)
+ #include <asm/ptrace.h>
++#else
++/* For arm*-musl this definition is missing */
++#define ARM_sp uregs[13]
++#endif
+ #include <assert.h>
+ #include <elf.h>
+ #include <stdio.h>
diff --git a/srcpkgs/qt6-webengine/patches/0208-chromium-musl-execinfo.patch b/srcpkgs/qt6-webengine/patches/0208-chromium-musl-execinfo.patch
new file mode 100644
index 000000000000..9f3b964676b3
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0208-chromium-musl-execinfo.patch
@@ -0,0 +1,125 @@
+--- a/src/3rdparty/chromium/base/debug/stack_trace.cc
++++ b/src/3rdparty/chromium/base/debug/stack_trace.cc
+@@ -252,7 +252,9 @@ void StackTrace::Print() const {
+ }
+ 
+ void StackTrace::OutputToStream(std::ostream* os) const {
++#if defined(__GLIBC__) && !defined(_AIX)
+   OutputToStreamWithPrefix(os, nullptr);
++#endif
+ }
+ 
+ std::string StackTrace::ToString() const {
+@@ -260,7 +262,7 @@ std::string StackTrace::ToString() const
+ }
+ std::string StackTrace::ToStringWithPrefix(const char* prefix_string) const {
+   std::stringstream stream;
+-#if !defined(__UCLIBC__) && !defined(_AIX)
++#if defined(__GLIBC__) && !defined(_AIX)
+   OutputToStreamWithPrefix(&stream, prefix_string);
+ #endif
+   return stream.str();
+--- a/src/3rdparty/chromium/base/debug/stack_trace_posix.cc
++++ b/src/3rdparty/chromium/base/debug/stack_trace_posix.cc
+@@ -27,7 +27,7 @@
+ #if !defined(USE_SYMBOLIZE)
+ #include <cxxabi.h>
+ #endif
+-#if !defined(__UCLIBC__) && !defined(_AIX)
++#if defined(__GLIBC__) && !defined(_AIX)
+ #include <execinfo.h>
+ #endif
+ 
+@@ -89,7 +89,7 @@ void DemangleSymbols(std::string* text)
+   // Note: code in this function is NOT async-signal safe (std::string uses
+   // malloc internally).
+ 
+-#if !defined(__UCLIBC__) && !defined(_AIX)
++#if defined(__GLIBC__) && !defined(_AIX)
+   std::string::size_type search_from = 0;
+   while (search_from < text->size()) {
+     // Look for the start of a mangled symbol, from search_from.
+@@ -124,7 +124,7 @@ void DemangleSymbols(std::string* text)
+       search_from = mangled_start + 2;
+     }
+   }
+-#endif  // !defined(__UCLIBC__) && !defined(_AIX)
++#endif  // !defined(__GLIBC__) && !defined(_AIX)
+ }
+ #endif  // !defined(USE_SYMBOLIZE)
+ 
+@@ -136,7 +136,7 @@ class BacktraceOutputHandler {
+   virtual ~BacktraceOutputHandler() = default;
+ };
+ 
+-#if !defined(__UCLIBC__) && !defined(_AIX)
++#if defined(__GLIBC__) && !defined(_AIX)
+ void OutputPointer(void* pointer, BacktraceOutputHandler* handler) {
+   // This should be more than enough to store a 64-bit number in hex:
+   // 16 hex digits + 1 for null-terminator.
+@@ -219,7 +219,7 @@ void ProcessBacktrace(void* const* trace
+   }
+ #endif  // defined(USE_SYMBOLIZE)
+ }
+-#endif  // !defined(__UCLIBC__) && !defined(_AIX)
++#endif  // !defined(__GLIBC__) && !defined(_AIX)
+ 
+ void PrintToStderr(const char* output) {
+   // NOTE: This code MUST be async-signal safe (it's used by in-process
+@@ -839,7 +839,7 @@ size_t CollectStackTrace(void** trace, s
+   // If we do not have unwind tables, then try tracing using frame pointers.
+   return base::debug::TraceStackFramePointers(const_cast<const void**>(trace),
+                                               count, 0);
+-#elif !defined(__UCLIBC__) && !defined(_AIX)
++#elif defined(__GLIBC__) && !defined(_AIX)
+   // Though the backtrace API man page does not list any possible negative
+   // return values, we take no chance.
+   return base::saturated_cast<size_t>(backtrace(trace, count));
+@@ -852,13 +852,13 @@ void StackTrace::PrintWithPrefix(const c
+ // NOTE: This code MUST be async-signal safe (it's used by in-process
+ // stack dumping signal handler). NO malloc or stdio is allowed here.
+ 
+-#if !defined(__UCLIBC__) && !defined(_AIX)
++#if defined(__GLIBC__) && !defined(_AIX)
+   PrintBacktraceOutputHandler handler;
+   ProcessBacktrace(trace_, count_, prefix_string, &handler);
+ #endif
+ }
+ 
+-#if !defined(__UCLIBC__) && !defined(_AIX)
++#if defined(__GLIBC__) && !defined(_AIX)
+ void StackTrace::OutputToStreamWithPrefix(std::ostream* os,
+                                           const char* prefix_string) const {
+   StreamBacktraceOutputHandler handler(os);
+--- a/src/3rdparty/chromium/base/logging.cc
++++ b/src/3rdparty/chromium/base/logging.cc
+@@ -582,7 +582,7 @@ LogMessage::LogMessage(const char* file,
+ 
+ LogMessage::~LogMessage() {
+   size_t stack_start = stream_.tellp();
+-#if !defined(OFFICIAL_BUILD) && !defined(OS_NACL) && !defined(__UCLIBC__) && \
++#if !defined(OFFICIAL_BUILD) && !defined(OS_NACL) && defined(__GLIBC__) && \
+     !defined(OS_AIX)
+   if (severity_ == LOGGING_FATAL && !base::debug::BeingDebugged()) {
+     // Include a stack trace on a fatal, unless a debugger is attached.
+--- 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 @@
+ 
+ #if defined(DEBUG) && defined(V8_OS_LINUX) && !defined(V8_OS_ANDROID)
+ #define SYMBOLIZE_FUNCTION
++#if defined(__GLIBC__)
+ #include <execinfo.h>
++#endif
+ 
+ #include <vector>
+ 
+@@ -103,7 +105,7 @@ void ExternalReferenceTable::Init(Isolat
+ }
+ 
+ const char* ExternalReferenceTable::ResolveSymbol(void* address) {
+-#ifdef SYMBOLIZE_FUNCTION
++#if defined(SYMBOLIZE_FUNCTION) && defined(__GLIBC__)
+   char** names = backtrace_symbols(&address, 1);
+   const char* name = names[0];
+   // The array of names is malloc'ed. However, each name string is static
diff --git a/srcpkgs/qt6-webengine/patches/0209-chromium-musl-thread-stacksize.patch b/srcpkgs/qt6-webengine/patches/0209-chromium-musl-thread-stacksize.patch
new file mode 100644
index 000000000000..4b760a428b25
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0209-chromium-musl-thread-stacksize.patch
@@ -0,0 +1,22 @@
+--- a/src/3rdparty/chromium/ppapi/utility/threading/simple_thread.cc
++++ b/src/3rdparty/chromium/ppapi/utility/threading/simple_thread.cc
+@@ -13,7 +13,7 @@ namespace pp {
+ namespace {
+ 
+ // Use 2MB default stack size for Native Client, otherwise use system default.
+-#if defined(__native_client__)
++#if defined(__native_client__) || !defined(__GLIBC__)
+ const size_t kDefaultStackSize = 2 * 1024 * 1024;
+ #else
+ const size_t kDefaultStackSize = 0;
+--- a/src/3rdparty/chromium/v8/src/base/platform/platform-posix.cc
++++ b/src/3rdparty/chromium/v8/src/base/platform/platform-posix.cc
+@@ -883,7 +883,7 @@ bool Thread::Start() {
+ #if V8_OS_MACOSX
+     // Default on Mac OS X is 512kB -- bump up to 1MB
+     stack_size = 1 * 1024 * 1024;
+-#elif V8_OS_AIX
++#elif V8_OS_AIX || !defined(__GLIBC__)
+     // Default on AIX is 96kB -- bump up to 2MB
+     stack_size = 2 * 1024 * 1024;
+ #endif
diff --git a/srcpkgs/qt6-webengine/patches/0210-chromium-musl-msgvec-push_back.patch b/srcpkgs/qt6-webengine/patches/0210-chromium-musl-msgvec-push_back.patch
new file mode 100644
index 000000000000..905daa223700
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0210-chromium-musl-msgvec-push_back.patch
@@ -0,0 +1,14 @@
+--- a/src/3rdparty/chromium/net/socket/udp_socket_posix.cc
++++ b/src/3rdparty/chromium/net/socket/udp_socket_posix.cc
+@@ -1162,7 +1162,11 @@ SendResult UDPSocketPosixSender::Interna
+     msg_iov->push_back({const_cast<char*>(buffer->data()), buffer->length()});
+   msgvec->reserve(buffers.size());
+   for (size_t j = 0; j < buffers.size(); j++)
++#if defined(__GLIBC__)
+     msgvec->push_back({{nullptr, 0, &msg_iov[j], 1, nullptr, 0, 0}, 0});
++#else
++    msgvec->push_back({{nullptr, 0, &msg_iov[j], 1, 0, 0, 0}, 0});
++#endif
+   int result = HANDLE_EINTR(Sendmmsg(fd, &msgvec[0], buffers.size(), 0));
+   SendResult send_result(0, 0, std::move(buffers));
+   if (result < 0) {
diff --git a/srcpkgs/qt6-webengine/patches/0211-chromium-musl-canonicalize-file-name-musl.patch b/srcpkgs/qt6-webengine/patches/0211-chromium-musl-canonicalize-file-name-musl.patch
new file mode 100644
index 000000000000..d43e6bd488bc
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0211-chromium-musl-canonicalize-file-name-musl.patch
@@ -0,0 +1,11 @@
+--- a/src/3rdparty/chromium/third_party/nasm/nasmlib/realpath.c
++++ b/src/3rdparty/chromium/third_party/nasm/nasmlib/realpath.c
+@@ -55,7 +55,7 @@
+  */
+ char *nasm_realpath(const char *rel_path)
+ {
+-    char *rp = canonicalize_file_name(rel_path);
++    char *rp = realpath(rel_path, NULL);
+     return rp ? rp : nasm_strdup(rel_path);
+ }
+ 
diff --git a/srcpkgs/qt6-webengine/patches/0212-chromium-musl-no-getcontext.patch b/srcpkgs/qt6-webengine/patches/0212-chromium-musl-no-getcontext.patch
new file mode 100644
index 000000000000..5755f1b45a7d
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0212-chromium-musl-no-getcontext.patch
@@ -0,0 +1,29 @@
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc
+@@ -489,8 +489,10 @@ bool ExceptionHandler::SimulateSignalDel
+   // ExceptionHandler::HandleSignal().
+   siginfo.si_code = SI_USER;
+   siginfo.si_pid = getpid();
+-  ucontext_t context;
++  ucontext_t context = { 0 };
++#if defined(__GLIBC__)
+   getcontext(&context);
++#endif
+   return HandleSignal(sig, &siginfo, &context);
+ }
+ 
+@@ -675,9 +677,14 @@ bool ExceptionHandler::WriteMinidump() {
+   sys_prctl(PR_SET_DUMPABLE, 1, 0, 0, 0);
+ 
+   CrashContext context;
++
++#if defined(__GLIBC__)
+   int getcontext_result = getcontext(&context.context);
+   if (getcontext_result)
+     return false;
++#else
++  return false;
++#endif
+ 
+ #if defined(__i386__)
+   // In CPUFillFromUContext in minidumpwriter.cc the stack pointer is retrieved
diff --git a/srcpkgs/qt6-webengine/patches/0213-chromium-musl-crashpad.patch b/srcpkgs/qt6-webengine/patches/0213-chromium-musl-crashpad.patch
new file mode 100644
index 000000000000..4d49997ed4f3
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0213-chromium-musl-crashpad.patch
@@ -0,0 +1,22 @@
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/compat/linux/sys/ptrace.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/compat/linux/sys/ptrace.h
+@@ -17,7 +17,9 @@
+ 
+ #include_next <sys/ptrace.h>
+ 
++#ifdef __GLIBC__
+ #include <sys/cdefs.h>
++#endif
+ 
+ // https://sourceware.org/bugzilla/show_bug.cgi?id=22433
+ #if !defined(PTRACE_GET_THREAD_AREA) && !defined(PT_GET_THREAD_AREA) && \
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/util/linux/ptracer.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/util/linux/ptracer.cc
+@@ -26,6 +26,7 @@
+ 
+ #if defined(ARCH_CPU_X86_FAMILY)
+ #include <asm/ldt.h>
++#include <asm/ptrace-abi.h>
+ #endif
+ 
+ namespace crashpad {
diff --git a/srcpkgs/qt6-webengine/patches/0214-chromium-musl-fixes.patch b/srcpkgs/qt6-webengine/patches/0214-chromium-musl-fixes.patch
new file mode 100644
index 000000000000..55b267ed1714
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0214-chromium-musl-fixes.patch
@@ -0,0 +1,108 @@
+--- a/src/3rdparty/chromium/sandbox/linux/suid/process_util.h
++++ b/src/3rdparty/chromium/sandbox/linux/suid/process_util.h
+@@ -12,6 +12,15 @@
+ #include <stdint.h>
+ #include <sys/types.h>
+ 
++#if !defined(__GLIBC__) && !defined(TEMP_FAILURE_RETRY)
++# define TEMP_FAILURE_RETRY(expression) \
++	(__extension__			\
++	 ({ long int __result;		\
++	  do __result = (long int) (expression); \
++	  while (__result == -1L && errno == EINTR); \
++	  __result; }))
++#endif
++
+ // This adjusts /proc/process/oom_score_adj so the Linux OOM killer
+ // will prefer certain process types over others. The range for the
+ // adjustment is [-1000, 1000], with [0, 1000] being user accessible.
+--- a/src/3rdparty/chromium/services/device/serial/serial_io_handler_posix.cc
++++ b/src/3rdparty/chromium/services/device/serial/serial_io_handler_posix.cc
+@@ -6,6 +6,7 @@
+ 
+ #include <sys/ioctl.h>
+ #include <termios.h>
++#include <asm-generic/ioctls.h>
+ 
+ #include <algorithm>
+ #include <utility>
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h
+@@ -38,6 +38,10 @@
+ #include "common/memory_allocator.h"
+ #include "google_breakpad/common/minidump_format.h"
+ 
++#ifndef __GLIBC__
++#define _libc_fpstate _fpstate
++#endif
++
+ namespace google_breakpad {
+ 
+ // Wraps platform-dependent implementations of accessors to ucontext_t structs.
+--- a/src/3rdparty/chromium/third_party/ffmpeg/libavutil/cpu.c
++++ b/src/3rdparty/chromium/third_party/ffmpeg/libavutil/cpu.c
+@@ -41,8 +41,10 @@
+ #include <sys/param.h>
+ #endif
+ #include <sys/types.h>
++#ifdef __GLIBC__
+ #include <sys/sysctl.h>
+ #endif
++#endif
+ #if HAVE_UNISTD_H
+ #include <unistd.h>
+ #endif
+--- a/src/3rdparty/chromium/third_party/perfetto/include/perfetto/ext/base/thread_utils.h
++++ b/src/3rdparty/chromium/third_party/perfetto/include/perfetto/ext/base/thread_utils.h
+@@ -29,9 +29,7 @@
+ #include <algorithm>
+ #endif
+ 
+-#if PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID)
+ #include <sys/prctl.h>
+-#endif
+ 
+ // Internal implementation utils that aren't as widely useful/supported as
+ // base/thread_utils.h.
+@@ -58,7 +56,7 @@ inline bool MaybeSetThreadName(const std
+ 
+ inline bool GetThreadName(std::string& out_result) {
+   char buf[16] = {};
+-#if PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID)
++#if !defined(__GLIBC__)
+   if (prctl(PR_GET_NAME, buf) != 0)
+     return false;
+ #else
+--- a/src/3rdparty/chromium/third_party/lss/linux_syscall_support.h
++++ b/src/3rdparty/chromium/third_party/lss/linux_syscall_support.h
+@@ -1300,6 +1300,18 @@ struct kernel_statfs {
+ #ifndef __NR_fallocate
+ #define __NR_fallocate          285
+ #endif
++
++#if !defined(__GLIBC__)
++#ifdef __NR_pread
++#undef __NR_pread
++#endif
++#ifdef __NR_pwrite
++#undef __NR_pwrite
++#endif
++#define __NR_pread __NR_pread64
++#define __NR_pwrite __NR_pwrite64
++#endif /* !defined(__GLIBC__) */
++
+ #ifndef __NR_getrandom
+ #define __NR_getrandom          318
+ #endif
+--- a/src/3rdparty/chromium/net/dns/dns_config_service_posix.cc
++++ b/src/3rdparty/chromium/net/dns/dns_config_service_posix.cc
+@@ -93,7 +93,8 @@ absl::optional<DnsConfig> ReadDnsConfig(
+ 
+   absl::optional<DnsConfig> dns_config;
+ // TODO(fuchsia): Use res_ninit() when it's implemented on Fuchsia.
+-#if defined(OS_OPENBSD) || defined(OS_FUCHSIA)
++#if defined(OS_OPENBSD) || defined(OS_FUCHSIA) || \
++  (defined(OS_LINUX) && !defined(__GLIBC__))
+   // Note: res_ninit in glibc always returns 0 and sets RES_INIT.
+   // res_init behaves the same way.
+   memset(&_res, 0, sizeof(_res));
diff --git a/srcpkgs/qt6-webengine/patches/0215-chromium-musl-cdefs.patch b/srcpkgs/qt6-webengine/patches/0215-chromium-musl-cdefs.patch
new file mode 100644
index 000000000000..9d1daec29118
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0215-chromium-musl-cdefs.patch
@@ -0,0 +1,29 @@
+--- a/src/3rdparty/chromium/third_party/libsync/src/include/sync/sync.h
++++ b/src/3rdparty/chromium/third_party/libsync/src/include/sync/sync.h
+@@ -19,12 +19,13 @@
+ #ifndef __SYS_CORE_SYNC_H
+ #define __SYS_CORE_SYNC_H
+ 
+-#include <sys/cdefs.h>
+ #include <stdint.h>
+ 
+ #include <linux/types.h>
+ 
+-__BEGIN_DECLS
++#ifdef __cplusplus
++extern "C" {
++#endif
+ 
+ struct sync_legacy_merge_data {
+  int32_t fd2;
+@@ -158,6 +159,9 @@ struct sync_pt_info *sync_pt_info(struct
+                                   struct sync_pt_info *itr);
+ void sync_fence_info_free(struct sync_fence_info_data *info);
+ 
+-__END_DECLS
++#ifdef __cplusplus
++}
++#endif
++
+ 
+ #endif /* __SYS_CORE_SYNC_H */
diff --git a/srcpkgs/qt6-webengine/patches/0216-chromium-musl-stat.patch b/srcpkgs/qt6-webengine/patches/0216-chromium-musl-stat.patch
new file mode 100644
index 000000000000..4509a6957cd7
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0216-chromium-musl-stat.patch
@@ -0,0 +1,12 @@
+--- a/src/3rdparty/chromium/base/files/file.h
++++ b/src/3rdparty/chromium/base/files/file.h
+@@ -19,7 +19,8 @@
+ #include "build/build_config.h"
+ 
+ #if defined(OS_BSD) || defined(OS_APPLE) || defined(OS_NACL) || \
+-    defined(OS_FUCHSIA) || (defined(OS_ANDROID) && __ANDROID_API__ < 21)
++    defined(OS_FUCHSIA) || (defined(OS_ANDROID) && __ANDROID_API__ < 21) || \
++    (defined(OS_LINUX) && !defined(__GLIBC__))
+ struct stat;
+ namespace base {
+ typedef struct stat stat_wrapper_t;
diff --git a/srcpkgs/qt6-webengine/patches/0217-chromium-musl-resolver.patch b/srcpkgs/qt6-webengine/patches/0217-chromium-musl-resolver.patch
new file mode 100644
index 000000000000..c3d7afad9b19
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0217-chromium-musl-resolver.patch
@@ -0,0 +1,77 @@
+--- a/src/3rdparty/chromium/net/dns/dns_config_service_linux.cc
++++ b/src/3rdparty/chromium/net/dns/dns_config_service_linux.cc
+@@ -432,11 +432,13 @@ class DnsConfigServiceLinux::ConfigReade
+     base::ScopedBlockingCall scoped_blocking_call(
+         FROM_HERE, base::BlockingType::MAY_BLOCK);
+ 
++#if defined(__GLIBC__)
+     std::unique_ptr<struct __res_state> res = resolv_reader_->GetResState();
+     if (res) {
+       dns_config_ = ConvertResStateToDnsConfig(*res.get());
+       resolv_reader_->CloseResState(res.get());
+     }
++#endif
+ 
+     UMA_HISTOGRAM_BOOLEAN("Net.DNS.DnsConfig.Resolv.Read",
+                           dns_config_.has_value());
+@@ -486,6 +488,7 @@ class DnsConfigServiceLinux::ConfigReade
+ 
+ std::unique_ptr<struct __res_state>
+ DnsConfigServiceLinux::ResolvReader::GetResState() {
++#if defined(__GLIBC__)
+   auto res = std::make_unique<struct __res_state>();
+   memset(res.get(), 0, sizeof(struct __res_state));
+ 
+@@ -495,11 +498,16 @@ DnsConfigServiceLinux::ResolvReader::Get
+   }
+ 
+   return res;
++#else
++  return nullptr;
++#endif
+ }
+ 
+ void DnsConfigServiceLinux::ResolvReader::CloseResState(
+     struct __res_state* res) {
++#if defined(__GLIBC__)
+   res_nclose(res);
++#endif
+ }
+ 
+ DnsConfigServiceLinux::DnsConfigServiceLinux()
+--- a/src/3rdparty/chromium/net/dns/dns_reloader.cc
++++ b/src/3rdparty/chromium/net/dns/dns_reloader.cc
+@@ -4,8 +4,7 @@
+ 
+ #include "net/dns/dns_reloader.h"
+ 
+-#if defined(OS_POSIX) && !defined(OS_APPLE) && !defined(OS_OPENBSD) && \
+-    !defined(OS_ANDROID) && !defined(OS_FUCHSIA)
++#ifdef __GLIBC__
+ 
+ #include <resolv.h>
+ 
+--- a/src/3rdparty/chromium/net/dns/host_resolver_manager.cc
++++ b/src/3rdparty/chromium/net/dns/host_resolver_manager.cc
+@@ -2720,8 +2720,7 @@ HostResolverManager::HostResolverManager
+   NetworkChangeNotifier::AddConnectionTypeObserver(this);
+   if (system_dns_config_notifier_)
+     system_dns_config_notifier_->AddObserver(this);
+-#if defined(OS_POSIX) && !defined(OS_APPLE) && !defined(OS_OPENBSD) && \
+-    !defined(OS_ANDROID)
++#ifdef __GLIBC__
+   EnsureDnsReloaderInit();
+ #endif
+ 
+--- a/src/3rdparty/chromium/net/dns/host_resolver_proc.cc
++++ b/src/3rdparty/chromium/net/dns/host_resolver_proc.cc
+@@ -176,8 +176,7 @@ int SystemHostResolverCall(const std::st
+   base::ScopedBlockingCall scoped_blocking_call(FROM_HERE,
+                                                 base::BlockingType::WILL_BLOCK);
+ 
+-#if defined(OS_POSIX) && !defined(OS_APPLE) && !defined(OS_OPENBSD) && \
+-    !defined(OS_ANDROID) && !defined(OS_FUCHSIA)
++#ifdef __GLIBC__
+   DnsReloaderMaybeReload();
+ #endif
+   absl::optional<AddressInfo> ai;
diff --git a/srcpkgs/qt6-webengine/patches/0600-chromium-sndio.patch b/srcpkgs/qt6-webengine/patches/0600-chromium-sndio.patch
new file mode 100644
index 000000000000..0302874ffba4
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0600-chromium-sndio.patch
@@ -0,0 +1,876 @@
+--- a/src/3rdparty/chromium/media/BUILD.gn
++++ b/src/3rdparty/chromium/media/BUILD.gn
+@@ -72,6 +72,9 @@ config("media_config") {
+       defines += [ "DLOPEN_PULSEAUDIO" ]
+     }
+   }
++  if (use_sndio) {
++    defines += [ "USE_SNDIO" ]
++  }
+   if (use_cras) {
+     defines += [ "USE_CRAS" ]
+   }
+--- a/src/3rdparty/chromium/media/audio/BUILD.gn
++++ b/src/3rdparty/chromium/media/audio/BUILD.gn
+@@ -240,6 +240,17 @@ source_set("audio") {
+     sources += [ "linux/audio_manager_linux.cc" ]
+   }
+ 
++  if (use_sndio) {
++    libs += [ "sndio" ]
++    sources += [
++      "sndio/audio_manager_sndio.cc",
++      "sndio/sndio_input.cc",
++      "sndio/sndio_input.h",
++      "sndio/sndio_output.cc",
++      "sndio/sndio_output.h"
++    ]
++  }
++
+   if (use_alsa) {
+     libs += [ "asound" ]
+     sources += [
+--- a/src/3rdparty/chromium/media/audio/linux/audio_manager_linux.cc
++++ b/src/3rdparty/chromium/media/audio/linux/audio_manager_linux.cc
+@@ -25,6 +25,11 @@
+ #include "media/audio/pulse/audio_manager_pulse.h"
+ #include "media/audio/pulse/pulse_util.h"
+ #endif
++#if defined(USE_SNDIO)
++#include "media/audio/sndio/audio_manager_sndio.h"
++#include "media/audio/sndio/sndio_input.h"
++#include "media/audio/sndio/sndio_output.h"
++#endif
+ 
+ namespace media {
+ 
+@@ -32,7 +37,8 @@ enum LinuxAudioIO {
+   kPulse,
+   kAlsa,
+   kCras,
+-  kAudioIOMax = kCras  // Must always be equal to largest logged entry.
++  kSndio,
++  kAudioIOMax = kSndio // Must always be equal to largest logged entry.
+ };
+ 
+ std::unique_ptr<media::AudioManager> CreateAudioManager(
+@@ -45,6 +51,16 @@ std::unique_ptr<media::AudioManager> Cre
+                                               audio_log_factory);
+   }
+ 
++#if defined(USE_SNDIO)
++  struct sio_hdl *hdl = sio_open(SIO_DEVANY, SIO_PLAY, 0);
++  if (hdl != NULL) {
++    sio_close(hdl);
++    UMA_HISTOGRAM_ENUMERATION("Media.LinuxAudioIO", kSndio, kAudioIOMax + 1);
++    return std::make_unique<AudioManagerSndio>(std::move(audio_thread),
++                                                  audio_log_factory);
++  }
++#endif
++
+ #if defined(USE_CRAS)
+   if (base::CommandLine::ForCurrentProcess()->HasSwitch(switches::kUseCras)) {
+     UMA_HISTOGRAM_ENUMERATION("Media.LinuxAudioIO", kCras, kAudioIOMax + 1);
+--- /dev/null
++++ b/src/3rdparty/chromium/media/audio/sndio/audio_manager_sndio.cc
+@@ -0,0 +1,148 @@
++// Copyright (c) 2012 The Chromium Authors. All rights reserved.
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++#include "media/audio/sndio/audio_manager_sndio.h"
++
++#include "base/metrics/histogram_macros.h"
++#include "base/memory/ptr_util.h"
++#include "media/audio/audio_device_description.h"
++#include "media/audio/audio_output_dispatcher.h"
++#include "media/audio/sndio/sndio_input.h"
++#include "media/audio/sndio/sndio_output.h"
++#include "media/base/limits.h"
++#include "media/base/media_switches.h"
++
++namespace media {
++
++
++// Maximum number of output streams that can be open simultaneously.
++static const int kMaxOutputStreams = 4;
++
++// Default sample rate for input and output streams.
++static const int kDefaultSampleRate = 48000;
++
++void AddDefaultDevice(AudioDeviceNames* device_names) {
++  DCHECK(device_names->empty());
++  device_names->push_front(AudioDeviceName::CreateDefault());
++}
++
++bool AudioManagerSndio::HasAudioOutputDevices() {
++  return true;
++}
++
++bool AudioManagerSndio::HasAudioInputDevices() {
++  return true;
++}
++
++void AudioManagerSndio::GetAudioInputDeviceNames(
++    AudioDeviceNames* device_names) {
++  DCHECK(device_names->empty());
++  AddDefaultDevice(device_names);
++}
++
++void AudioManagerSndio::GetAudioOutputDeviceNames(
++    AudioDeviceNames* device_names) {
++  AddDefaultDevice(device_names);
++}
++
++const char* AudioManagerSndio::GetName() {
++  return "SNDIO";
++}
++
++AudioParameters AudioManagerSndio::GetInputStreamParameters(
++    const std::string& device_id) {
++  static const int kDefaultInputBufferSize = 1024;
++
++  int user_buffer_size = GetUserBufferSize();
++  int buffer_size = user_buffer_size ?
++      user_buffer_size : kDefaultInputBufferSize;
++
++  return AudioParameters(
++      AudioParameters::AUDIO_PCM_LOW_LATENCY, CHANNEL_LAYOUT_STEREO,
++      kDefaultSampleRate, buffer_size);
++}
++
++AudioManagerSndio::AudioManagerSndio(std::unique_ptr<AudioThread> audio_thread,
++                                         AudioLogFactory* audio_log_factory)
++    : AudioManagerBase(std::move(audio_thread),
++                       audio_log_factory) {
++  DLOG(WARNING) << "AudioManagerSndio";
++  SetMaxOutputStreamsAllowed(kMaxOutputStreams);
++}
++
++AudioManagerSndio::~AudioManagerSndio() {
++  Shutdown();
++}
++
++AudioOutputStream* AudioManagerSndio::MakeLinearOutputStream(
++    const AudioParameters& params,
++    const LogCallback& log_callback) {
++  DCHECK_EQ(AudioParameters::AUDIO_PCM_LINEAR, params.format());
++  return MakeOutputStream(params);
++}
++
++AudioOutputStream* AudioManagerSndio::MakeLowLatencyOutputStream(
++    const AudioParameters& params,
++    const std::string& device_id,
++    const LogCallback& log_callback) {
++  DLOG_IF(ERROR, !device_id.empty()) << "Not implemented!";
++  DCHECK_EQ(AudioParameters::AUDIO_PCM_LOW_LATENCY, params.format());
++  return MakeOutputStream(params);
++}
++
++AudioInputStream* AudioManagerSndio::MakeLinearInputStream(
++    const AudioParameters& params,
++    const std::string& device_id,
++    const LogCallback& log_callback) {
++  DCHECK_EQ(AudioParameters::AUDIO_PCM_LINEAR, params.format());
++  return MakeInputStream(params);
++}
++
++AudioInputStream* AudioManagerSndio::MakeLowLatencyInputStream(
++    const AudioParameters& params,
++    const std::string& device_id,
++    const LogCallback& log_callback) {
++  DCHECK_EQ(AudioParameters::AUDIO_PCM_LOW_LATENCY, params.format());
++  return MakeInputStream(params);
++}
++
++AudioParameters AudioManagerSndio::GetPreferredOutputStreamParameters(
++    const std::string& output_device_id,
++    const AudioParameters& input_params) {
++  // TODO(tommi): Support |output_device_id|.
++  DLOG_IF(ERROR, !output_device_id.empty()) << "Not implemented!";
++  static const int kDefaultOutputBufferSize = 2048;
++
++  ChannelLayout channel_layout = CHANNEL_LAYOUT_STEREO;
++  int sample_rate = kDefaultSampleRate;
++  int buffer_size = kDefaultOutputBufferSize;
++  if (input_params.IsValid()) {
++    sample_rate = input_params.sample_rate();
++    channel_layout = input_params.channel_layout();
++    buffer_size = std::min(buffer_size, input_params.frames_per_buffer());
++  }
++
++  int user_buffer_size = GetUserBufferSize();
++  if (user_buffer_size)
++    buffer_size = user_buffer_size;
++
++  return AudioParameters(
++      AudioParameters::AUDIO_PCM_LOW_LATENCY, channel_layout,
++      sample_rate, buffer_size);
++}
++
++AudioInputStream* AudioManagerSndio::MakeInputStream(
++    const AudioParameters& params) {
++  DLOG(WARNING) << "MakeInputStream";
++  return new SndioAudioInputStream(this,
++             AudioDeviceDescription::kDefaultDeviceId, params);
++}
++
++AudioOutputStream* AudioManagerSndio::MakeOutputStream(
++    const AudioParameters& params) {
++  DLOG(WARNING) << "MakeOutputStream";
++  return new SndioAudioOutputStream(params, this);
++}
++
++}  // namespace media
+--- /dev/null
++++ b/src/3rdparty/chromium/media/audio/sndio/audio_manager_sndio.h
+@@ -0,0 +1,65 @@
++// Copyright (c) 2012 The Chromium Authors. All rights reserved.
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++#ifndef MEDIA_AUDIO_SNDIO_AUDIO_MANAGER_SNDIO_H_
++#define MEDIA_AUDIO_SNDIO_AUDIO_MANAGER_SNDIO_H_
++
++#include <set>
++
++#include "base/compiler_specific.h"
++#include "base/macros.h"
++#include "base/memory/ref_counted.h"
++#include "base/threading/thread.h"
++#include "media/audio/audio_manager_base.h"
++
++namespace media {
++
++class MEDIA_EXPORT AudioManagerSndio : public AudioManagerBase {
++ public:
++  AudioManagerSndio(std::unique_ptr<AudioThread> audio_thread,
++                   AudioLogFactory* audio_log_factory);
++  ~AudioManagerSndio() override;
++
++  // Implementation of AudioManager.
++  bool HasAudioOutputDevices() override;
++  bool HasAudioInputDevices() override;
++  void GetAudioInputDeviceNames(AudioDeviceNames* device_names) override;
++  void GetAudioOutputDeviceNames(AudioDeviceNames* device_names) override;
++  AudioParameters GetInputStreamParameters(
++      const std::string& device_id) override;
++  const char* GetName() override;
++
++  // Implementation of AudioManagerBase.
++  AudioOutputStream* MakeLinearOutputStream(
++      const AudioParameters& params,
++      const LogCallback& log_callback) override;
++  AudioOutputStream* MakeLowLatencyOutputStream(
++      const AudioParameters& params,
++      const std::string& device_id,
++      const LogCallback& log_callback) override;
++  AudioInputStream* MakeLinearInputStream(
++      const AudioParameters& params,
++      const std::string& device_id,
++      const LogCallback& log_callback) override;
++  AudioInputStream* MakeLowLatencyInputStream(
++      const AudioParameters& params,
++      const std::string& device_id,
++      const LogCallback& log_callback) override;
++
++ protected:
++  AudioParameters GetPreferredOutputStreamParameters(
++      const std::string& output_device_id,
++      const AudioParameters& input_params) override;
++
++ private:
++  // Called by MakeLinearOutputStream and MakeLowLatencyOutputStream.
++  AudioOutputStream* MakeOutputStream(const AudioParameters& params);
++  AudioInputStream* MakeInputStream(const AudioParameters& params);
++
++  DISALLOW_COPY_AND_ASSIGN(AudioManagerSndio);
++};
++
++}  // namespace media
++
++#endif  // MEDIA_AUDIO_SNDIO_AUDIO_MANAGER_SNDIO_H_
+--- /dev/null
++++ b/src/3rdparty/chromium/media/audio/sndio/sndio_input.cc
+@@ -0,0 +1,200 @@
++// Copyright 2013 The Chromium Authors. All rights reserved.
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++#include "base/bind.h"
++#include "base/logging.h"
++#include "base/macros.h"
++#include "media/base/audio_timestamp_helper.h"
++#include "media/audio/sndio/audio_manager_sndio.h"
++#include "media/audio/audio_manager.h"
++#include "media/audio/sndio/sndio_input.h"
++
++namespace media {
++
++static const SampleFormat kSampleFormat = kSampleFormatS16;
++
++void SndioAudioInputStream::OnMoveCallback(void *arg, int delta)
++{
++  SndioAudioInputStream* self = static_cast<SndioAudioInputStream*>(arg);
++
++  self->hw_delay += delta;
++}
++
++void *SndioAudioInputStream::ThreadEntry(void *arg) {
++  SndioAudioInputStream* self = static_cast<SndioAudioInputStream*>(arg);
++
++  self->ThreadLoop();
++  return NULL;
++}
++
++SndioAudioInputStream::SndioAudioInputStream(AudioManagerBase* manager,
++                                             const std::string& device_name,
++                                             const AudioParameters& params)
++    : manager(manager),
++      params(params),
++      audio_bus(AudioBus::Create(params)),
++      state(kClosed) {
++}
++
++SndioAudioInputStream::~SndioAudioInputStream() {
++  if (state != kClosed)
++    Close();
++}
++
++bool SndioAudioInputStream::Open() {
++  struct sio_par par;
++  int sig;
++
++  if (state != kClosed)
++    return false;
++
++  if (params.format() != AudioParameters::AUDIO_PCM_LINEAR &&
++      params.format() != AudioParameters::AUDIO_PCM_LOW_LATENCY) {
++    LOG(WARNING) << "Unsupported audio format.";
++    return false;
++  }
++
++  sio_initpar(&par);
++  par.rate = params.sample_rate();
++  par.rchan = params.channels();
++  par.bits = SampleFormatToBitsPerChannel(kSampleFormat);
++  par.bps = par.bits / 8;
++  par.sig = sig = par.bits != 8 ? 1 : 0;
++  par.le = SIO_LE_NATIVE;
++  par.appbufsz = params.frames_per_buffer();
++
++  hdl = sio_open(SIO_DEVANY, SIO_REC, 0);
++
++  if (hdl == NULL) {
++    LOG(ERROR) << "Couldn't open audio device.";
++    return false;
++  }
++
++  if (!sio_setpar(hdl, &par) || !sio_getpar(hdl, &par)) {
++    LOG(ERROR) << "Couldn't set audio parameters.";
++    goto bad_close;
++  }
++
++  if (par.rate  != (unsigned int)params.sample_rate() ||
++      par.rchan != (unsigned int)params.channels() ||
++      par.bits  != (unsigned int)SampleFormatToBitsPerChannel(kSampleFormat) ||
++      par.sig   != (unsigned int)sig ||
++      (par.bps > 1 && par.le != SIO_LE_NATIVE) ||
++      (par.bits != par.bps * 8)) {
++    LOG(ERROR) << "Unsupported audio parameters.";
++    goto bad_close;
++  }
++  state = kStopped;
++  buffer = new char[audio_bus->frames() * params.GetBytesPerFrame(kSampleFormat)];
++  sio_onmove(hdl, &OnMoveCallback, this);
++  return true;
++bad_close:
++  sio_close(hdl);
++  return false;
++}
++
++void SndioAudioInputStream::Start(AudioInputCallback* cb) {
++
++  StartAgc();
++
++  state = kRunning;
++  hw_delay = 0;
++  callback = cb;
++  sio_start(hdl);
++  if (pthread_create(&thread, NULL, &ThreadEntry, this) != 0) {
++    LOG(ERROR) << "Failed to create real-time thread for recording.";
++    sio_stop(hdl);
++    state = kStopped;
++  }
++}
++
++void SndioAudioInputStream::Stop() {
++
++  if (state == kStopped)
++    return;
++
++  state = kStopWait;
++  pthread_join(thread, NULL);
++  sio_stop(hdl);
++  state = kStopped;
++
++  StopAgc();
++}
++
++void SndioAudioInputStream::Close() {
++
++  if (state == kClosed)
++    return;
++
++  if (state == kRunning)
++    Stop();
++
++  state = kClosed;
++  delete [] buffer;
++  sio_close(hdl);
++
++  manager->ReleaseInputStream(this);
++}
++
++double SndioAudioInputStream::GetMaxVolume() {
++  // Not supported
++  return 0.0;
++}
++
++void SndioAudioInputStream::SetVolume(double volume) {
++  // Not supported. Do nothing.
++}
++
++double SndioAudioInputStream::GetVolume() {
++  // Not supported.
++  return 0.0;
++}
++
++bool SndioAudioInputStream::IsMuted() {
++  // Not supported.
++  return false;
++}
++
++void SndioAudioInputStream::SetOutputDeviceForAec(
++    const std::string& output_device_id) {
++  // Not supported.
++}
++
++void SndioAudioInputStream::ThreadLoop(void) {
++  size_t todo, n;
++  char *data;
++  unsigned int nframes;
++  double normalized_volume = 0.0;
++
++  nframes = audio_bus->frames();
++
++  while (state == kRunning && !sio_eof(hdl)) {
++
++    GetAgcVolume(&normalized_volume);
++
++    // read one block
++    todo = nframes * params.GetBytesPerFrame(kSampleFormat);
++    data = buffer;
++    while (todo > 0) {
++      n = sio_read(hdl, data, todo);
++      if (n == 0)
++        return;	// unrecoverable I/O error
++      todo -= n;
++      data += n;
++    }
++    hw_delay -= nframes;
++
++    // convert frames count to TimeDelta
++    const base::TimeDelta delay = AudioTimestampHelper::FramesToTime(hw_delay,
++      params.sample_rate());
++
++    // push into bus
++    audio_bus->FromInterleaved<SignedInt16SampleTypeTraits>(reinterpret_cast<int16_t*>(buffer), nframes);
++
++    // invoke callback
++    callback->OnData(audio_bus.get(), base::TimeTicks::Now() - delay, 1.);
++  }
++}
++
++}  // namespace media
+--- /dev/null
++++ b/src/3rdparty/chromium/media/audio/sndio/sndio_input.h
+@@ -0,0 +1,91 @@
++// Copyright 2013 The Chromium Authors. All rights reserved.
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++#ifndef MEDIA_AUDIO_SNDIO_SNDIO_INPUT_H_
++#define MEDIA_AUDIO_SNDIO_SNDIO_INPUT_H_
++
++#include <stdint.h>
++#include <string>
++#include <sndio.h>
++
++#include "base/compiler_specific.h"
++#include "base/macros.h"
++#include "base/memory/weak_ptr.h"
++#include "base/time/time.h"
++#include "media/audio/agc_audio_stream.h"
++#include "media/audio/audio_io.h"
++#include "media/audio/audio_device_description.h"
++#include "media/base/audio_parameters.h"
++
++namespace media {
++
++class AudioManagerBase;
++
++// Implementation of AudioOutputStream using sndio(7)
++class SndioAudioInputStream : public AgcAudioStream<AudioInputStream> {
++ public:
++  // Pass this to the constructor if you want to attempt auto-selection
++  // of the audio recording device.
++  static const char kAutoSelectDevice[];
++
++  // Create a PCM Output stream for the SNDIO device identified by
++  // |device_name|. If unsure of what to use for |device_name|, use
++  // |kAutoSelectDevice|.
++  SndioAudioInputStream(AudioManagerBase* audio_manager,
++                     const std::string& device_name,
++                     const AudioParameters& params);
++
++  ~SndioAudioInputStream() override;
++
++  // Implementation of AudioInputStream.
++  bool Open() override;
++  void Start(AudioInputCallback* callback) override;
++  void Stop() override;
++  void Close() override;
++  double GetMaxVolume() override;
++  void SetVolume(double volume) override;
++  double GetVolume() override;
++  bool IsMuted() override;
++  void SetOutputDeviceForAec(const std::string& output_device_id) override;
++
++ private:
++
++  enum StreamState {
++    kClosed,            // Not opened yet
++    kStopped,           // Device opened, but not started yet
++    kRunning,           // Started, device playing
++    kStopWait           // Stopping, waiting for the real-time thread to exit
++  };
++
++  // C-style call-backs
++  static void OnMoveCallback(void *arg, int delta);
++  static void* ThreadEntry(void *arg);
++
++  // Continuously moves data from the device to the consumer
++  void ThreadLoop();
++  // Our creator, the audio manager needs to be notified when we close.
++  AudioManagerBase* manager;
++  // Parameters of the source
++  AudioParameters params;
++  // We store data here for consumer
++  std::unique_ptr<AudioBus> audio_bus;
++  // Call-back that consumes recorded data
++  AudioInputCallback* callback;  // Valid during a recording session.
++  // Handle of the audio device
++  struct sio_hdl* hdl;
++  // Current state of the stream
++  enum StreamState state;
++  // High priority thread running ThreadLoop()
++  pthread_t thread;
++  // Number of frames buffered in the hardware
++  int hw_delay;
++  // Temporary buffer where data is stored sndio-compatible format
++  char* buffer;
++
++  DISALLOW_COPY_AND_ASSIGN(SndioAudioInputStream);
++};
++
++}  // namespace media
++
++#endif  // MEDIA_AUDIO_SNDIO_SNDIO_INPUT_H_
+--- /dev/null
++++ b/src/3rdparty/chromium/media/audio/sndio/sndio_output.cc
+@@ -0,0 +1,183 @@
++// Copyright (c) 2012 The Chromium Authors. All rights reserved.
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++#include "base/logging.h"
++#include "base/time/time.h"
++#include "base/time/default_tick_clock.h"
++#include "media/audio/audio_manager_base.h"
++#include "media/base/audio_timestamp_helper.h"
++#include "media/audio/sndio/sndio_output.h"
++
++namespace media {
++
++static const SampleFormat kSampleFormat = kSampleFormatS16;
++
++void SndioAudioOutputStream::OnMoveCallback(void *arg, int delta) {
++  SndioAudioOutputStream* self = static_cast<SndioAudioOutputStream*>(arg);
++
++  self->hw_delay -= delta;
++}
++
++void SndioAudioOutputStream::OnVolCallback(void *arg, unsigned int vol) {
++  SndioAudioOutputStream* self = static_cast<SndioAudioOutputStream*>(arg);
++
++  self->vol = vol;
++}
++
++void *SndioAudioOutputStream::ThreadEntry(void *arg) {
++  SndioAudioOutputStream* self = static_cast<SndioAudioOutputStream*>(arg);
++
++  self->ThreadLoop();
++  return NULL;
++}
++
++SndioAudioOutputStream::SndioAudioOutputStream(const AudioParameters& params,
++                                               AudioManagerBase* manager)
++    : manager(manager),
++      params(params),
++      audio_bus(AudioBus::Create(params)),
++      state(kClosed),
++      mutex(PTHREAD_MUTEX_INITIALIZER) {
++}
++
++SndioAudioOutputStream::~SndioAudioOutputStream() {
++  if (state != kClosed)
++    Close();
++}
++
++bool SndioAudioOutputStream::Open() {
++  struct sio_par par;
++  int sig;
++
++  if (params.format() != AudioParameters::AUDIO_PCM_LINEAR &&
++      params.format() != AudioParameters::AUDIO_PCM_LOW_LATENCY) {
++    LOG(WARNING) << "Unsupported audio format.";
++    return false;
++  }
++  sio_initpar(&par);
++  par.rate = params.sample_rate();
++  par.pchan = params.channels();
++  par.bits = SampleFormatToBitsPerChannel(kSampleFormat);
++  par.bps = par.bits / 8;
++  par.sig = sig = par.bits != 8 ? 1 : 0;
++  par.le = SIO_LE_NATIVE;
++  par.appbufsz = params.frames_per_buffer();
++
++  hdl = sio_open(SIO_DEVANY, SIO_PLAY, 0);
++  if (hdl == NULL) {
++    LOG(ERROR) << "Couldn't open audio device.";
++    return false;
++  }
++  if (!sio_setpar(hdl, &par) || !sio_getpar(hdl, &par)) {
++    LOG(ERROR) << "Couldn't set audio parameters.";
++    goto bad_close;
++  }
++  if (par.rate  != (unsigned int)params.sample_rate() ||
++      par.pchan != (unsigned int)params.channels() ||
++      par.bits  != (unsigned int)SampleFormatToBitsPerChannel(kSampleFormat) ||
++      par.sig   != (unsigned int)sig ||
++      (par.bps > 1 && par.le != SIO_LE_NATIVE) ||
++      (par.bits != par.bps * 8)) {
++    LOG(ERROR) << "Unsupported audio parameters.";
++    goto bad_close;
++  }
++  state = kStopped;
++  volpending = 0;
++  vol = 0;
++  buffer = new char[audio_bus->frames() * params.GetBytesPerFrame(kSampleFormat)];
++  sio_onmove(hdl, &OnMoveCallback, this);
++  sio_onvol(hdl, &OnVolCallback, this);
++  return true;
++ bad_close:
++  sio_close(hdl);
++  return false;
++}
++
++void SndioAudioOutputStream::Close() {
++  if (state == kClosed)
++    return;
++  if (state == kRunning)
++    Stop();
++  state = kClosed;
++  delete [] buffer;
++  sio_close(hdl);
++  manager->ReleaseOutputStream(this);  // Calls the destructor
++}
++
++void SndioAudioOutputStream::Start(AudioSourceCallback* callback) {
++  state = kRunning;
++  hw_delay = 0;
++  source = callback;
++  sio_start(hdl);
++  if (pthread_create(&thread, NULL, &ThreadEntry, this) != 0) {
++    LOG(ERROR) << "Failed to create real-time thread.";
++    sio_stop(hdl);
++    state = kStopped;
++  }
++}
++
++void SndioAudioOutputStream::Stop() {
++  if (state == kStopped)
++    return;
++  state = kStopWait;
++  pthread_join(thread, NULL);
++  sio_stop(hdl);
++  state = kStopped;
++}
++
++void SndioAudioOutputStream::SetVolume(double v) {
++  pthread_mutex_lock(&mutex);
++  vol = v * SIO_MAXVOL;
++  volpending = 1;
++  pthread_mutex_unlock(&mutex);
++}
++
++void SndioAudioOutputStream::GetVolume(double* v) {
++  pthread_mutex_lock(&mutex);
++  *v = vol * (1. / SIO_MAXVOL);
++  pthread_mutex_unlock(&mutex);
++}
++
++// This stream is always used with sub second buffer sizes, where it's
++// sufficient to simply always flush upon Start().
++void SndioAudioOutputStream::Flush() {}
++
++void SndioAudioOutputStream::ThreadLoop(void) {
++  int avail, count, result;
++
++  while (state == kRunning) {
++    // Update volume if needed
++    pthread_mutex_lock(&mutex);
++    if (volpending) {
++      volpending = 0;
++      sio_setvol(hdl, vol);
++    }
++    pthread_mutex_unlock(&mutex);
++
++    // Get data to play
++    const base::TimeDelta delay = AudioTimestampHelper::FramesToTime(hw_delay,
++	params.sample_rate());
++    count = source->OnMoreData(delay, base::TimeTicks::Now(), 0, audio_bus.get());
++    audio_bus->ToInterleaved<SignedInt16SampleTypeTraits>(count, reinterpret_cast<int16_t*>(buffer));
++    if (count == 0) {
++      // We have to submit something to the device
++      count = audio_bus->frames();
++      memset(buffer, 0, count * params.GetBytesPerFrame(kSampleFormat));
++      LOG(WARNING) << "No data to play, running empty cycle.";
++    }
++
++    // Submit data to the device
++    avail = count * params.GetBytesPerFrame(kSampleFormat);
++    result = sio_write(hdl, buffer, avail);
++    if (result == 0) {
++      LOG(WARNING) << "Audio device disconnected.";
++      break;
++    }
++
++    // Update hardware pointer
++    hw_delay += count;
++  }
++}
++
++}  // namespace media
+--- /dev/null
++++ b/src/3rdparty/chromium/media/audio/sndio/sndio_output.h
+@@ -0,0 +1,86 @@
++// Copyright (c) 2012 The Chromium Authors. All rights reserved.
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++#ifndef MEDIA_AUDIO_SNDIO_SNDIO_OUTPUT_H_
++#define MEDIA_AUDIO_SNDIO_SNDIO_OUTPUT_H_
++
++#include <pthread.h>
++#include <sndio.h>
++
++#include "base/time/tick_clock.h"
++#include "base/time/time.h"
++#include "media/audio/audio_io.h"
++
++namespace media {
++
++class AudioManagerBase;
++
++// Implementation of AudioOutputStream using sndio(7)
++class SndioAudioOutputStream : public AudioOutputStream {
++ public:
++  // The manager is creating this object
++  SndioAudioOutputStream(const AudioParameters& params,
++                         AudioManagerBase* manager);
++  virtual ~SndioAudioOutputStream();
++
++  // Implementation of AudioOutputStream.
++  bool Open() override;
++  void Close() override;
++  void Start(AudioSourceCallback* callback) override;
++  void Stop() override;
++  void SetVolume(double volume) override;
++  void GetVolume(double* volume) override;
++  void Flush() override;
++
++  friend void sndio_onmove(void *arg, int delta);
++  friend void sndio_onvol(void *arg, unsigned int vol);
++  friend void *sndio_threadstart(void *arg);
++
++ private:
++  enum StreamState {
++    kClosed,            // Not opened yet
++    kStopped,           // Device opened, but not started yet
++    kRunning,           // Started, device playing
++    kStopWait           // Stopping, waiting for the real-time thread to exit
++  };
++
++  // C-style call-backs
++  static void OnMoveCallback(void *arg, int delta);
++  static void OnVolCallback(void *arg, unsigned int vol);
++  static void* ThreadEntry(void *arg);
++
++  // Continuously moves data from the producer to the device
++  void ThreadLoop(void);
++
++  // Our creator, the audio manager needs to be notified when we close.
++  AudioManagerBase* manager;
++  // Parameters of the source
++  AudioParameters params;
++  // Source stores data here
++  std::unique_ptr<AudioBus> audio_bus;
++  // Call-back that produces data to play
++  AudioSourceCallback* source;
++  // Handle of the audio device
++  struct sio_hdl* hdl;
++  // Current state of the stream
++  enum StreamState state;
++  // High priority thread running ThreadLoop()
++  pthread_t thread;
++  // Protects vol, volpending and hw_delay
++  pthread_mutex_t mutex;
++  // Current volume in the 0..SIO_MAXVOL range
++  int vol;
++  // Set to 1 if volumes must be refreshed in the realtime thread
++  int volpending;
++  // Number of frames buffered in the hardware
++  int hw_delay;
++  // Temporary buffer where data is stored sndio-compatible format
++  char* buffer;
++
++  DISALLOW_COPY_AND_ASSIGN(SndioAudioOutputStream);
++};
++
++}  // namespace media
++
++#endif  // MEDIA_AUDIO_SNDIO_SNDIO_OUTPUT_H_
+--- a/src/3rdparty/chromium/media/media_options.gni
++++ b/src/3rdparty/chromium/media/media_options.gni
+@@ -121,6 +121,9 @@ declare_args() {
+   # Enables runtime selection of ALSA library for audio.
+   use_alsa = false
+ 
++  # Enable runtime selection of sndio(7)
++  use_sndio = false
++
+   # Alsa should be used on non-Android, non-Mac POSIX systems.
+   # Alsa should be used on desktop Chromecast and audio-only Chromecast builds.
+   if (is_posix && !is_android && !is_mac &&
diff --git a/srcpkgs/qt6-webengine/patches/0700-armv7l-neon.patch b/srcpkgs/qt6-webengine/patches/0700-armv7l-neon.patch
new file mode 100644
index 000000000000..d42fa19a07a1
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0700-armv7l-neon.patch
@@ -0,0 +1,10 @@
+--- a/src/3rdparty/chromium/skia/BUILD.gn
++++ b/src/3rdparty/chromium/skia/BUILD.gn
+@@ -800,7 +800,6 @@ skia_source_set("skia_opts") {
+         # Root build config sets -mfpu=$arm_fpu, which we expect to be neon
+         # when running this.
+         if (!arm_use_neon) {
+-          configs -= [ "//build/config/compiler:compiler_arm_fpu" ]
+           cflags += [ "-mfpu=neon" ]
+         }
+       }
diff --git a/srcpkgs/qt6-webengine/patches/0750-chromium-musl-arm-user_vfp.patch b/srcpkgs/qt6-webengine/patches/0750-chromium-musl-arm-user_vfp.patch
new file mode 100644
index 000000000000..6e2d62f35ee6
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0750-chromium-musl-arm-user_vfp.patch
@@ -0,0 +1,20 @@
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/util/linux/thread_info.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/util/linux/thread_info.h
+@@ -17,6 +17,17 @@
+ 
+ #include <stdint.h>
+ #include <sys/user.h>
++#if !defined(__GLIBC__)
++struct user_vfp {
++	unsigned long long fpregs[32];
++	unsigned long fpscr;
++};
++struct user_vfp_exc {
++	unsigned long fpexc;
++	unsigned long fpinst;
++	unsigned long fpinst2;
++};
++#endif /* !defined(__GLIBC__) */
+ 
+ #include <type_traits>
+ 
diff --git a/srcpkgs/qt6-webengine/patches/0751-chromium-musl-arm-elf_auxv_t.patch b/srcpkgs/qt6-webengine/patches/0751-chromium-musl-arm-elf_auxv_t.patch
new file mode 100644
index 000000000000..7112c8cfd3fa
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0751-chromium-musl-arm-elf_auxv_t.patch
@@ -0,0 +1,18 @@
+--- a/src/3rdparty/chromium/v8/src/base/cpu.cc
++++ b/src/3rdparty/chromium/v8/src/base/cpu.cc
+@@ -163,6 +163,15 @@ static V8_INLINE void __cpuid(int cpu_in
+ 
+ #if V8_HOST_ARCH_ARM || V8_HOST_ARCH_ARM64
+ 
++#ifndef __GLIBC__
++#include <elf.h>
++#ifdef __LP64__
++typedef Elf64_auxv_t elf_auxv_t;
++#else
++typedef Elf32_auxv_t elf_auxv_t;
++#endif
++#endif
++
+ static uint32_t ReadELFHWCaps() {
+   uint32_t result = 0;
+ #if V8_GLIBC_PREREQ(2, 16)
diff --git a/srcpkgs/qt6-webengine/patches/0801-chromium-i686-vaapi-fpermissive.patch b/srcpkgs/qt6-webengine/patches/0801-chromium-i686-vaapi-fpermissive.patch
new file mode 100644
index 000000000000..3d4043e03b89
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0801-chromium-i686-vaapi-fpermissive.patch
@@ -0,0 +1,24 @@
+--- a/src/3rdparty/chromium/media/gpu/vaapi/BUILD.gn
++++ b/src/3rdparty/chromium/media/gpu/vaapi/BUILD.gn
+@@ -14,6 +14,10 @@ import("//ui/gl/features.gni")
+ assert(is_linux || is_chromeos)
+ assert(use_vaapi)
+ 
++config("vaapi_permissive") {
++  cflags = [ "-fpermissive" ]
++}
++
+ generate_stubs("libva_stubs") {
+   extra_header = "va_stub_header.fragment"
+   sigs = [ "va.sigs" ]
+@@ -136,6 +140,10 @@ source_set("vaapi") {
+     ]
+   }
+ 
++  if (target_cpu == "x86") {
++    configs += [ ":vaapi_permissive" ]
++  }
++
+   if (use_x11) {
+     deps += [ "//ui/gfx/x" ]
+     sources += [
diff --git a/srcpkgs/qt6-webengine/patches/0900-xxx-ppc64le-libvpx.patch b/srcpkgs/qt6-webengine/patches/0900-xxx-ppc64le-libvpx.patch
new file mode 100644
index 000000000000..5c9566b56bd4
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0900-xxx-ppc64le-libvpx.patch
@@ -0,0 +1,65 @@
+Uses generic target for now. To use ppc64le, change --target to ppc64le-gnu
+and add --enable-vsx, and change generic to ppc for the rtcd header.
+
+From 18e6c5c55cfae0cfb458d8210d7bc709360a0e90 Mon Sep 17 00:00:00 2001
+From: q66 <daniel@octaforge.org>
+Date: Wed, 9 Sep 2020 19:08:25 +0200
+Subject: [PATCH] enable generation of ppc64 libvpx bits
+
+this doesn't update the gni file, that's done from
+the template by running the appropriate scripts
+---
+ third_party/libvpx/BUILD.gn        | 4 ++++
+ third_party/libvpx/generate_gni.sh | 9 +++++++++
+ 2 files changed, 13 insertions(+)
+
+--- a/src/3rdparty/chromium/third_party/libvpx/BUILD.gn
++++ b/src/3rdparty/chromium/third_party/libvpx/BUILD.gn
+@@ -424,6 +424,8 @@ static_library("bundled_libvpx") {
+       sources = libvpx_srcs_arm64
+       public_deps = [ ":libvpx_arm64_headers" ]
+     }
++  } else if (current_cpu == "ppc64") {
++    sources = libvpx_srcs_ppc64
+   }
+ 
+   configs -= [ "//build/config/compiler:chromium_code" ]
+--- a/src/3rdparty/chromium/third_party/libvpx/generate_gni.sh
++++ b/src/3rdparty/chromium/third_party/libvpx/generate_gni.sh
+@@ -374,6 +374,7 @@ gen_config_files linux/arm-neon-highbd "
+ gen_config_files linux/arm64-highbd "--target=armv8-linux-gcc ${all_platforms} ${HIGHBD}"
+ gen_config_files linux/mipsel "--target=mips32-linux-gcc ${all_platforms}"
+ gen_config_files linux/mips64el "--target=mips64-linux-gcc ${all_platforms}"
++gen_config_files linux/ppc64 "--target=generic-gnu $HIGHBD ${all_platforms}"
+ gen_config_files linux/generic "--target=generic-gnu $HIGHBD ${all_platforms}"
+ gen_config_files win/arm64 "--target=arm64-win64-vs15 ${all_platforms} ${HIGHBD}"
+ gen_config_files win/ia32 "--target=x86-win32-vs14 ${all_platforms} ${x86_platforms}"
+@@ -399,6 +400,7 @@ lint_config linux/arm-neon-highbd
+ lint_config linux/arm64-highbd
+ lint_config linux/mipsel
+ lint_config linux/mips64el
++lint_config linux/ppc64
+ lint_config linux/generic
+ lint_config win/arm64
+ lint_config win/ia32
+@@ -428,6 +430,7 @@ gen_rtcd_header linux/arm-neon-highbd ar
+ gen_rtcd_header linux/arm64-highbd armv8
+ gen_rtcd_header linux/mipsel mipsel
+ gen_rtcd_header linux/mips64el mips64el
++gen_rtcd_header linux/ppc64 generic
+ gen_rtcd_header linux/generic generic
+ gen_rtcd_header win/arm64 armv8
+ gen_rtcd_header win/ia32 x86 "${require_sse2}"
+@@ -513,6 +516,12 @@ if [ -z $ONLY_CONFIGS ]; then
+ 
+   echo "MIPS64 source list is identical to MIPS source list. No need to generate it."
+ 
++  echo "Generate ppc64 source list."
++  config=$(print_config_basic linux/ppc64)
++  make_clean
++  make libvpx_srcs.txt target=libs $config > /dev/null
++  convert_srcs_to_project_files libvpx_srcs.txt libvpx_srcs_ppc64
++
+   echo "Generate NaCl source list."
+   config=$(print_config_basic nacl)
+   make_clean
diff --git a/srcpkgs/qt6-webengine/patches/0901-xxx-ppc64le-sandbox-linux-stat.patch b/srcpkgs/qt6-webengine/patches/0901-xxx-ppc64le-sandbox-linux-stat.patch
new file mode 100644
index 000000000000..4b8e6320601c
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0901-xxx-ppc64le-sandbox-linux-stat.patch
@@ -0,0 +1,31 @@
+--- a/src/3rdparty/chromium/sandbox/linux/system_headers/linux_stat.h
++++ b/src/3rdparty/chromium/sandbox/linux/system_headers/linux_stat.h
+@@ -155,6 +155,28 @@ struct kernel_stat {
+   unsigned int __unused4;
+   unsigned int __unused5;
+ };
++#elif defined(__powerpc64__)
++struct kernel_stat {
++  unsigned long	st_dev;
++  unsigned long	st_ino;
++  unsigned long	st_nlink;
++  unsigned int	st_mode;
++  unsigned int	st_uid;
++  unsigned int	st_gid;
++  unsigned long	st_rdev;
++  long		st_size;
++  unsigned long	st_blksize;
++  unsigned long	st_blocks;
++  unsigned long	st_atime_;
++  unsigned long	st_atime_nsec_;
++  unsigned long	st_mtime_;
++  unsigned long	st_mtime_nsec_;
++  unsigned long	st_ctime_;
++  unsigned long	st_ctime_nsec_;
++  unsigned long	__unused4;
++  unsigned long	__unused5;
++  unsigned long	__unused6;
++};
+ #endif
+ 
+ #if !defined(AT_EMPTY_PATH)
diff --git a/srcpkgs/qt6-webengine/patches/0902-xxx-ppc64le-support.patch b/srcpkgs/qt6-webengine/patches/0902-xxx-ppc64le-support.patch
new file mode 100644
index 000000000000..60503c22e36b
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0902-xxx-ppc64le-support.patch
@@ -0,0 +1,3559 @@
+commit 2c013a317b1114ef67cdbbc30824b28907b9ea94
+Author: Daniel Kolesa <daniel@octaforge.org>
+Date:   Wed Mar 3 19:08:29 2021 +0100
+
+    ppc64le support
+
+--- a/src/3rdparty/chromium/sandbox/features.gni
++++ b/src/3rdparty/chromium/sandbox/features.gni
+@@ -11,7 +11,8 @@ import("//build/config/nacl/config.gni")
+ use_seccomp_bpf = (is_linux || is_chromeos || is_android) &&
+                   (current_cpu == "x86" || current_cpu == "x64" ||
+                    current_cpu == "arm" || current_cpu == "arm64" ||
+-                   current_cpu == "mipsel" || current_cpu == "mips64el")
++                   current_cpu == "mipsel" || current_cpu == "mips64el" ||
++                   current_cpu == "ppc64")
+ 
+ use_seccomp_bpf = use_seccomp_bpf || is_nacl_nonsfi
+ 
+--- a/src/3rdparty/chromium/sandbox/linux/BUILD.gn
++++ b/src/3rdparty/chromium/sandbox/linux/BUILD.gn
+@@ -433,6 +433,8 @@ component("sandbox_services") {
+ 
+ source_set("sandbox_services_headers") {
+   sources = [
++    "system_headers/ppc64_linux_syscalls.h",
++    "system_headers/ppc64_linux_ucontext.h",
+     "system_headers/arm64_linux_syscalls.h",
+     "system_headers/arm_linux_syscalls.h",
+     "system_headers/arm_linux_ucontext.h",
+--- a/src/3rdparty/chromium/sandbox/linux/bpf_dsl/linux_syscall_ranges.h
++++ b/src/3rdparty/chromium/sandbox/linux/bpf_dsl/linux_syscall_ranges.h
+@@ -56,6 +56,13 @@
+ #define MAX_PUBLIC_SYSCALL __NR_syscalls
+ #define MAX_SYSCALL MAX_PUBLIC_SYSCALL
+ 
++#elif defined(__powerpc64__)
++
++#include <asm/unistd.h>
++#define MIN_SYSCALL 0u
++#define MAX_PUBLIC_SYSCALL 386u
++#define MAX_SYSCALL MAX_PUBLIC_SYSCALL
++
+ #else
+ #error "Unsupported architecture"
+ #endif
+--- a/src/3rdparty/chromium/sandbox/linux/bpf_dsl/seccomp_macros.h
++++ b/src/3rdparty/chromium/sandbox/linux/bpf_dsl/seccomp_macros.h
+@@ -16,6 +16,9 @@
+ #if defined(__mips__)
+ // sys/user.h in eglibc misses size_t definition
+ #include <stddef.h>
++#elif defined(__powerpc64__) && defined(__GLIBC__)
++// Manually define greg_t on ppc64
++typedef unsigned long long greg_t;
+ #endif
+ #endif
+ 
+@@ -346,6 +349,59 @@ struct regs_struct {
+ #define SECCOMP_PT_PARM4(_regs) (_regs).regs[3]
+ #define SECCOMP_PT_PARM5(_regs) (_regs).regs[4]
+ #define SECCOMP_PT_PARM6(_regs) (_regs).regs[5]
++
++#elif defined(__powerpc64__)
++#include <asm/ptrace.h>
++
++typedef struct pt_regs regs_struct;
++
++#ifdef ARCH_CPU_LITTLE_ENDIAN
++#define SECCOMP_ARCH AUDIT_ARCH_PPC64LE
++#else
++#define SECCOMP_ARCH AUDIT_ARCH_PPC64
++#endif
++
++#ifdef __GLIBC__
++#define SECCOMP_REG(_ctx, _reg) ((_ctx)->uc_mcontext.regs->gpr[_reg])
++#else
++#define SECCOMP_REG(_ctx, _reg) (((struct pt_regs *)(_ctx)->uc_mcontext.regs)->gpr[_reg])
++#endif
++
++#define SECCOMP_RESULT(_ctx) SECCOMP_REG(_ctx, 3)
++#define SECCOMP_SYSCALL(_ctx) SECCOMP_REG(_ctx, 0)
++#ifdef __GLIBC__
++#define SECCOMP_IP(_ctx) (_ctx)->uc_mcontext.regs->nip
++#else
++#define SECCOMP_IP(_ctx) ((struct pt_regs *)(_ctx)->uc_mcontext.regs)->nip
++#endif
++#define SECCOMP_PARM1(_ctx) SECCOMP_REG(_ctx, 3)
++#define SECCOMP_PARM2(_ctx) SECCOMP_REG(_ctx, 4)
++#define SECCOMP_PARM3(_ctx) SECCOMP_REG(_ctx, 5)
++#define SECCOMP_PARM4(_ctx) SECCOMP_REG(_ctx, 6)
++#define SECCOMP_PARM5(_ctx) SECCOMP_REG(_ctx, 7)
++#define SECCOMP_PARM6(_ctx) SECCOMP_REG(_ctx, 8)
++
++#define SECCOMP_NR_IDX (offsetof(struct arch_seccomp_data, nr))
++#define SECCOMP_ARCH_IDX (offsetof(struct arch_seccomp_data, arch))
++#define SECCOMP_IP_MSB_IDX \
++  (offsetof(struct arch_seccomp_data, instruction_pointer) + 4)
++#define SECCOMP_IP_LSB_IDX \
++  (offsetof(struct arch_seccomp_data, instruction_pointer) + 0)
++#define SECCOMP_ARG_MSB_IDX(nr) \
++  (offsetof(struct arch_seccomp_data, args) + 8 * (nr) + 4)
++#define SECCOMP_ARG_LSB_IDX(nr) \
++  (offsetof(struct arch_seccomp_data, args) + 8 * (nr) + 0)
++
++#define SECCOMP_PT_RESULT(_regs) (_regs).gpr[3]
++#define SECCOMP_PT_SYSCALL(_regs) (_regs).gpr[0]
++#define SECCOMP_PT_IP(_regs) (_regs).nip
++#define SECCOMP_PT_PARM1(_regs) (_regs).gpr[3]
++#define SECCOMP_PT_PARM2(_regs) (_regs).gpr[4]
++#define SECCOMP_PT_PARM3(_regs) (_regs).gpr[5]
++#define SECCOMP_PT_PARM4(_regs) (_regs).gpr[6]
++#define SECCOMP_PT_PARM5(_regs) (_regs).gpr[7]
++#define SECCOMP_PT_PARM6(_regs) (_regs).gpr[8]
++
+ #else
+ #error Unsupported target platform
+ 
+--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc
++++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc
+@@ -91,7 +91,8 @@ bool IsBaselinePolicyWatched(int sysno)
+          SyscallSets::IsPrctl(sysno) ||
+          SyscallSets::IsProcessGroupOrSession(sysno) ||
+ #if defined(__i386__) || \
+-    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
++    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
++    defined(__powerpc64__)
+          SyscallSets::IsSocketCall(sysno) ||
+ #endif
+ #if defined(__arm__)
+@@ -258,7 +259,7 @@ ResultExpr EvaluateSyscallImpl(int fs_de
+   }
+ 
+ #if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
+-    defined(__aarch64__)
++    defined(__aarch64__) || defined(__powerpc64__)
+   if (sysno == __NR_mmap)
+     return RestrictMmapFlags();
+ #endif
+@@ -279,7 +280,7 @@ ResultExpr EvaluateSyscallImpl(int fs_de
+     return RestrictPrctl();
+ 
+ #if defined(__x86_64__) || defined(__arm__) || defined(__mips__) || \
+-    defined(__aarch64__)
++    defined(__aarch64__) || defined(__powerpc64__)
+   if (sysno == __NR_socketpair) {
+     // Only allow AF_UNIX, PF_UNIX. Crash if anything else is seen.
+     static_assert(AF_UNIX == PF_UNIX,
+@@ -343,7 +344,8 @@ ResultExpr EvaluateSyscallImpl(int fs_de
+   }
+ 
+ #if defined(__i386__) || \
+-    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
++    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
++    defined(__powerpc64__)
+   if (SyscallSets::IsSocketCall(sysno))
+     return RestrictSocketcallCommand();
+ #endif
+--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/baseline_policy_unittest.cc
++++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/baseline_policy_unittest.cc
+@@ -317,7 +317,7 @@ TEST_BASELINE_SIGSYS(__NR_sysinfo)
+ TEST_BASELINE_SIGSYS(__NR_syslog)
+ TEST_BASELINE_SIGSYS(__NR_timer_create)
+ 
+-#if !defined(__aarch64__)
++#if !defined(__aarch64__) && !defined(__powerpc64__)
+ TEST_BASELINE_SIGSYS(__NR_inotify_init)
+ TEST_BASELINE_SIGSYS(__NR_vserver)
+ #endif
+--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc
++++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc
+@@ -40,7 +40,8 @@
+ #include <sys/ptrace.h>
+ #if (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) && \
+     !defined(__arm__) && !defined(__aarch64__) &&           \
+-    !defined(PTRACE_GET_THREAD_AREA)
++    !defined(PTRACE_GET_THREAD_AREA) &&			    \
++    !defined(__powerpc64__)
+ // Also include asm/ptrace-abi.h since ptrace.h in older libc (for instance
+ // the one in Ubuntu 16.04 LTS) is missing PTRACE_GET_THREAD_AREA.
+ // asm/ptrace-abi.h doesn't exist on arm32 and PTRACE_GET_THREAD_AREA isn't
+@@ -49,6 +50,11 @@
+ #endif
+ #endif  // !OS_NACL_NONSFI
+ 
++// On PPC64, TCGETS is defined in terms of struct termios, so we must include termios.h
++#ifdef __powerpc64__
++#include <termios.h>
++#endif
++
+ #if defined(OS_ANDROID)
+ 
+ #if !defined(F_DUPFD_CLOEXEC)
+@@ -106,6 +112,14 @@ inline bool IsArchitectureMips() {
+ #endif
+ }
+ 
++inline bool IsArchitecturePPC64() {
++#if defined(__powerpc64__)
++  return true;
++#else
++  return false;
++#endif
++}
++
+ // Ubuntu's version of glibc has a race condition in sem_post that can cause
+ // it to call futex(2) with bogus op arguments. To workaround this, we need
+ // to allow those futex(2) calls to fail with EINVAL, instead of crashing the
+@@ -270,6 +284,8 @@ ResultExpr RestrictFcntlCommands() {
+   uint64_t kOLargeFileFlag = O_LARGEFILE;
+   if (IsArchitectureX86_64() || IsArchitectureI386() || IsArchitectureMips())
+     kOLargeFileFlag = 0100000;
++  else if (IsArchitecturePPC64())
++    kOLargeFileFlag = 0200000;
+ 
+   const Arg<int> cmd(1);
+   const Arg<long> long_arg(2);
+@@ -287,7 +303,16 @@ ResultExpr RestrictFcntlCommands() {
+               F_SETLKW,
+               F_GETLK,
+               F_DUPFD,
+-              F_DUPFD_CLOEXEC),
++              F_DUPFD_CLOEXEC
++#if defined(__powerpc64__)
++// On PPC64, F_SETLK, F_GETLK, F_SETLKW are defined as the 64-bit variants
++// but glibc will sometimes still use the 32-bit versions. Allow both.
++              ,
++              5, /* F_GETLK (32) */
++              6, /* F_SETLK (32) */
++              7  /* F_SETLKW (32) */
++#endif
++	     ),
+              Allow())
+       .Case(F_SETFL,
+             If((long_arg & ~kAllowedMask) == 0, Allow()).Else(CrashSIGSYS()))
+@@ -297,7 +322,7 @@ ResultExpr RestrictFcntlCommands() {
+   // clang-format on
+ }
+ 
+-#if defined(__i386__) || defined(__mips__)
++#if defined(__i386__) || defined(__mips__) || defined(__powerpc64__)
+ ResultExpr RestrictSocketcallCommand() {
+   // Unfortunately, we are unable to restrict the first parameter to
+   // socketpair(2). Whilst initially sounding bad, it's noteworthy that very
+@@ -454,7 +479,7 @@ ResultExpr RestrictPtrace() {
+ #endif
+   return Switch(request)
+       .CASES((
+-#if !defined(__aarch64__)
++#if !defined(__aarch64__) && !defined(__powerpc64__)
+                  PTRACE_GETREGS, PTRACE_GETFPREGS,
+ #if defined(TRACE_GET_THREAD_AREA)
+                  PTRACE_GET_THREAD_AREA,
+--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.h
++++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.h
+@@ -49,7 +49,7 @@ SANDBOX_EXPORT bpf_dsl::ResultExpr Restr
+ // O_NONBLOCK | O_SYNC | O_LARGEFILE | O_CLOEXEC | O_NOATIME.
+ SANDBOX_EXPORT bpf_dsl::ResultExpr RestrictFcntlCommands();
+ 
+-#if defined(__i386__) || defined(__mips__)
++#if defined(__i386__) || defined(__mips__) || defined(__powerpc64__)
+ // Restrict socketcall(2) to only allow socketpair(2), send(2), recv(2),
+ // sendto(2), recvfrom(2), shutdown(2), sendmsg(2) and recvmsg(2).
+ SANDBOX_EXPORT bpf_dsl::ResultExpr RestrictSocketcallCommand();
+--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
++++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
+@@ -28,7 +28,7 @@ bool SyscallSets::IsKill(int sysno) {
+ bool SyscallSets::IsAllowedGettime(int sysno) {
+   switch (sysno) {
+     case __NR_gettimeofday:
+-#if defined(__i386__) || defined(__x86_64__) || \
++#if defined(__i386__) || defined(__x86_64__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_time:
+ #endif
+@@ -51,12 +51,12 @@ bool SyscallSets::IsAllowedGettime(int s
+                                     // filtered by RestrictClockID().
+     case __NR_clock_nanosleep_time64:  // Parameters filtered by RestrictClockID().
+ #endif
+-#if defined(__i386__) || \
++#if defined(__i386__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_ftime:  // Obsolete.
+ #endif
+     case __NR_settimeofday:  // Privileged.
+-#if defined(__i386__) || \
++#if defined(__i386__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_stime:
+ #endif
+@@ -135,7 +135,7 @@ bool SyscallSets::IsFileSystem(int sysno
+     case __NR_faccessat:  // EPERM not a valid errno.
+     case __NR_fchmodat:
+     case __NR_fchownat:  // Should be called chownat ?
+-#if defined(__x86_64__) || defined(__aarch64__)
++#if defined(__x86_64__) || defined(__aarch64__) || defined(__powerpc64__)
+     case __NR_newfstatat:  // fstatat(). EPERM not a valid errno.
+ #elif defined(__i386__) || defined(__arm__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+@@ -154,7 +154,7 @@ bool SyscallSets::IsFileSystem(int sysno
+     case __NR_memfd_create:
+     case __NR_mkdirat:
+     case __NR_mknodat:
+-#if defined(__i386__)
++#if defined(__i386__) || defined(__powerpc64__)
+     case __NR_oldlstat:
+     case __NR_oldstat:
+ #endif
+@@ -167,7 +167,7 @@ bool SyscallSets::IsFileSystem(int sysno
+     case __NR_stat64:
+ #endif
+     case __NR_statfs:  // EPERM not a valid errno.
+-#if defined(__i386__) || defined(__arm__) || \
++#if defined(__i386__) || defined(__arm__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_statfs64:
+ #endif
+@@ -179,7 +179,8 @@ bool SyscallSets::IsFileSystem(int sysno
+     case __NR_truncate64:
+ #endif
+     case __NR_unlinkat:
+-#if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
++#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
++    defined(__powerpc64__)
+     case __NR_utime:
+ #endif
+     case __NR_utimensat:  // New.
+@@ -204,7 +205,8 @@ bool SyscallSets::IsAllowedFileSystemAcc
+ #endif
+       return true;
+ // TODO(jln): these should be denied gracefully as well (moved below).
+-#if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
++#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
++    defined(__powerpc64__)
+     case __NR_fadvise64:  // EPERM not a valid errno.
+ #endif
+ #if defined(__i386__)
+@@ -216,12 +218,12 @@ bool SyscallSets::IsAllowedFileSystemAcc
+     case __NR_fdatasync:  // EPERM not a valid errno.
+     case __NR_flock:      // EPERM not a valid errno.
+     case __NR_fstatfs:    // Give information about the whole filesystem.
+-#if defined(__i386__) || defined(__arm__) || \
++#if defined(__i386__) || defined(__arm__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_fstatfs64:
+ #endif
+     case __NR_fsync:  // EPERM not a valid errno.
+-#if defined(__i386__)
++#if defined(__i386__) || defined(__powerpc64__)
+     case __NR_oldfstat:
+ #endif
+ #if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
+@@ -229,6 +231,8 @@ bool SyscallSets::IsAllowedFileSystemAcc
+     case __NR_sync_file_range:  // EPERM not a valid errno.
+ #elif defined(__arm__)
+     case __NR_arm_sync_file_range:  // EPERM not a valid errno.
++#elif defined(__powerpc64__)
++    case __NR_sync_file_range2: // EPERM not a valid errno.
+ #endif
+     default:
+       return false;
+@@ -248,7 +252,7 @@ bool SyscallSets::IsDeniedFileSystemAcce
+     case __NR_getdents:    // EPERM not a valid errno.
+ #endif
+     case __NR_getdents64:  // EPERM not a valid errno.
+-#if defined(__i386__) || \
++#if defined(__i386__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_readdir:
+ #endif
+@@ -290,7 +294,7 @@ bool SyscallSets::IsGetSimpleId(int sysn
+ bool SyscallSets::IsProcessPrivilegeChange(int sysno) {
+   switch (sysno) {
+     case __NR_capset:
+-#if defined(__i386__) || defined(__x86_64__)
++#if defined(__i386__) || defined(__x86_64__) || defined(__powerpc64__)
+     case __NR_ioperm:  // Intel privilege.
+     case __NR_iopl:    // Intel privilege.
+ #endif
+@@ -340,7 +344,7 @@ bool SyscallSets::IsAllowedSignalHandlin
+     case __NR_rt_sigprocmask:
+     case __NR_rt_sigreturn:
+     case __NR_rt_sigtimedwait:
+-#if defined(__i386__) || defined(__arm__) || \
++#if defined(__i386__) || defined(__arm__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_rt_sigtimedwait_time64:
+     case __NR_sigaction:
+@@ -357,7 +361,7 @@ bool SyscallSets::IsAllowedSignalHandlin
+     case __NR_signalfd:
+ #endif
+     case __NR_signalfd4:
+-#if defined(__i386__) || defined(__arm__) || \
++#if defined(__i386__) || defined(__arm__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_sigpending:
+     case __NR_sigsuspend:
+@@ -382,7 +386,7 @@ bool SyscallSets::IsAllowedOperationOnFd
+ #endif
+     case __NR_dup3:
+ #if defined(__x86_64__) || defined(__arm__) || defined(__mips__) || \
+-    defined(__aarch64__)
++    defined(__aarch64__) || defined(__powerpc64__)
+     case __NR_shutdown:
+ #endif
+       return true;
+@@ -416,7 +420,7 @@ bool SyscallSets::IsAllowedProcessStartO
+     case __NR_membarrier:
+     case __NR_wait4:
+     case __NR_waitid:
+-#if defined(__i386__)
++#if defined(__i386__) || defined(__powerpc64__)
+     case __NR_waitpid:
+ #endif
+ #if !defined(__GLIBC__)
+@@ -438,7 +442,7 @@ bool SyscallSets::IsAllowedProcessStartO
+     case __NR_set_tid_address:
+ #endif
+     case __NR_unshare:
+-#if !defined(__mips__) && !defined(__aarch64__)
++#if !defined(__mips__) && !defined(__aarch64__) || defined(__powerpc64__)
+     case __NR_vfork:
+ #endif
+     default:
+@@ -491,7 +495,7 @@ bool SyscallSets::IsAllowedGetOrModifySo
+       return true;
+     default:
+ #if defined(__x86_64__) || defined(__arm__) || defined(__mips__) || \
+-    defined(__aarch64__)
++    defined(__aarch64__) || defined(__powerpc64__)
+     case __NR_socketpair:  // We will want to inspect its argument.
+ #endif
+       return false;
+@@ -501,7 +505,7 @@ bool SyscallSets::IsAllowedGetOrModifySo
+ bool SyscallSets::IsDeniedGetOrModifySocket(int sysno) {
+   switch (sysno) {
+ #if defined(__x86_64__) || defined(__arm__) || defined(__mips__) || \
+-    defined(__aarch64__)
++    defined(__aarch64__) || defined(__powerpc64__)
+     case __NR_accept:
+     case __NR_accept4:
+     case __NR_bind:
+@@ -515,7 +519,7 @@ bool SyscallSets::IsDeniedGetOrModifySoc
+   }
+ }
+ 
+-#if defined(__i386__) || \
++#if defined(__i386__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+ // Big multiplexing system call for sockets.
+ bool SyscallSets::IsSocketCall(int sysno) {
+@@ -530,7 +534,8 @@ bool SyscallSets::IsSocketCall(int sysno
+ }
+ #endif
+ 
+-#if defined(__x86_64__) || defined(__arm__) || defined(__mips__)
++#if defined(__x86_64__) || defined(__arm__) || defined(__mips__) || \
++    defined(__powerpc64__)
+ bool SyscallSets::IsNetworkSocketInformation(int sysno) {
+   switch (sysno) {
+     case __NR_getpeername:
+@@ -558,7 +563,7 @@ bool SyscallSets::IsAllowedAddressSpaceA
+     case __NR_mincore:
+     case __NR_mlockall:
+ #if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
+-    defined(__aarch64__)
++    defined(__aarch64__) || defined(__powerpc64__)
+     case __NR_mmap:
+ #endif
+ #if defined(__i386__) || defined(__arm__) || \
+@@ -589,7 +594,7 @@ bool SyscallSets::IsAllowedAddressSpaceA
+ bool SyscallSets::IsAllowedGeneralIo(int sysno) {
+   switch (sysno) {
+     case __NR_lseek:
+-#if defined(__i386__) || defined(__arm__) || \
++#if defined(__i386__) || defined(__arm__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR__llseek:
+ #endif
+@@ -609,27 +614,27 @@ bool SyscallSets::IsAllowedGeneralIo(int
+     case __NR_read:
+     case __NR_readv:
+     case __NR_pread64:
+-#if defined(__arm__) || \
++#if defined(__arm__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_recv:
+ #endif
+ #if defined(__x86_64__) || defined(__arm__) || defined(__mips__) || \
+-    defined(__aarch64__)
++    defined(__aarch64__) || defined(__powerpc64__)
+     case __NR_recvfrom:  // Could specify source.
+     case __NR_recvmsg:   // Could specify source.
+ #endif
+-#if defined(__i386__) || defined(__x86_64__)
++#if defined(__i386__) || defined(__x86_64__) || defined(__powerpc64__)
+     case __NR_select:
+ #endif
+-#if defined(__i386__) || defined(__arm__) || defined(__mips__)
++#if defined(__i386__) || defined(__arm__) || defined(__mips__) || defined(__powerpc64__)
+     case __NR__newselect:
+ #endif
+-#if defined(__arm__) || \
++#if defined(__arm__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_send:
+ #endif
+ #if defined(__x86_64__) || defined(__arm__) || defined(__mips__) || \
+-    defined(__aarch64__)
++    defined(__aarch64__) || defined(__powerpc64__)
+     case __NR_sendmsg:  // Could specify destination.
+     case __NR_sendto:   // Could specify destination.
+ #endif
+@@ -684,7 +689,7 @@ bool SyscallSets::IsAllowedBasicSchedule
+     case __NR_nanosleep:
+       return true;
+     case __NR_getpriority:
+-#if defined(__i386__) || defined(__arm__) || \
++#if defined(__i386__) || defined(__arm__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_nice:
+ #endif
+@@ -696,7 +701,7 @@ bool SyscallSets::IsAllowedBasicSchedule
+ 
+ bool SyscallSets::IsAdminOperation(int sysno) {
+   switch (sysno) {
+-#if defined(__i386__) || defined(__arm__) || \
++#if defined(__i386__) || defined(__arm__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_bdflush:
+ #endif
+@@ -713,7 +718,8 @@ bool SyscallSets::IsAdminOperation(int s
+ 
+ bool SyscallSets::IsKernelModule(int sysno) {
+   switch (sysno) {
+-#if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
++#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
++    defined(__powerpc64__)
+     case __NR_create_module:
+     case __NR_get_kernel_syms:  // Should ENOSYS.
+     case __NR_query_module:
+@@ -745,7 +751,7 @@ bool SyscallSets::IsFsControl(int sysno)
+     case __NR_quotactl:
+     case __NR_swapoff:
+     case __NR_swapon:
+-#if defined(__i386__) || \
++#if defined(__i386__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_umount:
+ #endif
+@@ -762,7 +768,7 @@ bool SyscallSets::IsNuma(int sysno) {
+     case __NR_getcpu:
+     case __NR_mbind:
+ #if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
+-    defined(__aarch64__)
++    defined(__aarch64__) || defined(__powerpc64__)
+     case __NR_migrate_pages:
+ #endif
+     case __NR_move_pages:
+@@ -797,13 +803,13 @@ bool SyscallSets::IsGlobalProcessEnviron
+   switch (sysno) {
+     case __NR_acct:  // Privileged.
+ #if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
+-    defined(__aarch64__)
++    defined(__aarch64__) || defined(__powerpc64__)
+     case __NR_getrlimit:
+ #endif
+-#if defined(__i386__) || defined(__arm__)
++#if defined(__i386__) || defined(__arm__) || defined(__powerpc64__)
+     case __NR_ugetrlimit:
+ #endif
+-#if defined(__i386__) || \
++#if defined(__i386__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_ulimit:
+ #endif
+@@ -838,7 +844,7 @@ bool SyscallSets::IsGlobalSystemStatus(i
+ #endif
+     case __NR_sysinfo:
+     case __NR_uname:
+-#if defined(__i386__)
++#if defined(__i386__) || defined(__powerpc64__)
+     case __NR_olduname:
+     case __NR_oldolduname:
+ #endif
+@@ -904,8 +910,16 @@ bool SyscallSets::IsSystemVSemaphores(in
+ }
+ #endif
+ 
++/* shitty hack around Void's 4.19 kernel headers missing those numbers */
++#if defined(__powerpc64__) && !defined(__NR_shmget)
++#define __NR_shmget 395
++#define __NR_shmctl 396
++#define __NR_shmat 397
++#define __NR_shmdt 398
++#endif
++
+ #if defined(__i386__) || defined(__x86_64__) || defined(__arm__) || \
+-    defined(__aarch64__) ||                                         \
++    defined(__aarch64__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_64_BITS))
+ // These give a lot of ambient authority and bypass the setuid sandbox.
+ bool SyscallSets::IsSystemVSharedMemory(int sysno) {
+@@ -936,7 +950,7 @@ bool SyscallSets::IsSystemVMessageQueue(
+ }
+ #endif
+ 
+-#if defined(__i386__) || \
++#if defined(__i386__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+ // Big system V multiplexing system call.
+ bool SyscallSets::IsSystemVIpc(int sysno) {
+@@ -956,7 +970,7 @@ bool SyscallSets::IsAnySystemV(int sysno
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_64_BITS))
+   return IsSystemVMessageQueue(sysno) || IsSystemVSemaphores(sysno) ||
+          IsSystemVSharedMemory(sysno);
+-#elif defined(__i386__) || \
++#elif defined(__i386__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+   return IsSystemVIpc(sysno);
+ #endif
+@@ -1014,7 +1028,8 @@ bool SyscallSets::IsFaNotify(int sysno)
+ bool SyscallSets::IsTimer(int sysno) {
+   switch (sysno) {
+     case __NR_getitimer:
+-#if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
++#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
++    defined(__powerpc64__)
+     case __NR_alarm:
+ #endif
+     case __NR_setitimer:
+@@ -1096,17 +1111,20 @@ bool SyscallSets::IsMisc(int sysno) {
+     case __NR_syncfs:
+     case __NR_vhangup:
+ // The system calls below are not implemented.
+-#if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
++#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
++    defined(__powerpc64__)
+     case __NR_afs_syscall:
+ #endif
+ #if defined(__i386__) || \
+-    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
++    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
++    defined(__powerpc64__)
+     case __NR_break:
+ #endif
+-#if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
++#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
++    defined(__powerpc64__)
+     case __NR_getpmsg:
+ #endif
+-#if defined(__i386__) || \
++#if defined(__i386__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_gtty:
+     case __NR_idle:
+@@ -1115,20 +1133,21 @@ bool SyscallSets::IsMisc(int sysno) {
+     case __NR_prof:
+     case __NR_profil:
+ #endif
+-#if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
++#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
++    defined(__powerpc64__)
+     case __NR_putpmsg:
+ #endif
+ #if defined(__x86_64__)
+     case __NR_security:
+ #endif
+-#if defined(__i386__) || \
++#if defined(__i386__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_stty:
+ #endif
+-#if defined(__x86_64__)
++#if defined(__x86_64__) || defined(__powerpc64__)
+     case __NR_tuxcall:
+ #endif
+-#if !defined(__aarch64__)
++#if !defined(__aarch64__) && !defined(__powerpc64__)
+     case __NR_vserver:
+ #endif
+       return true;
+--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_sets.h
++++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_sets.h
+@@ -43,13 +43,14 @@ class SANDBOX_EXPORT SyscallSets {
+   static bool IsDeniedGetOrModifySocket(int sysno);
+ 
+ #if defined(__i386__) || \
+-    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
++    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
++    defined(__powerpc64__)
+   // Big multiplexing system call for sockets.
+   static bool IsSocketCall(int sysno);
+ #endif
+ 
+ #if defined(__x86_64__) || defined(__arm__) || defined(__mips__) || \
+-    defined(__aarch64__)
++    defined(__aarch64__) || defined(__powerpc64__)
+   static bool IsNetworkSocketInformation(int sysno);
+ #endif
+ 
+@@ -77,7 +78,7 @@ class SANDBOX_EXPORT SyscallSets {
+   static bool IsSystemVSemaphores(int sysno);
+ #endif
+ #if defined(__i386__) || defined(__x86_64__) || defined(__arm__) || \
+-    defined(__aarch64__) ||                                         \
++    defined(__aarch64__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_64_BITS))
+   // These give a lot of ambient authority and bypass the setuid sandbox.
+   static bool IsSystemVSharedMemory(int sysno);
+@@ -89,7 +90,8 @@ class SANDBOX_EXPORT SyscallSets {
+ #endif
+ 
+ #if defined(__i386__) || \
+-    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
++    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
++    defined(__powerpc64__)
+   // Big system V multiplexing system call.
+   static bool IsSystemVIpc(int sysno);
+ #endif
+--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf/syscall.cc
++++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf/syscall.cc
+@@ -18,7 +18,7 @@ namespace sandbox {
+ namespace {
+ 
+ #if defined(ARCH_CPU_X86_FAMILY) || defined(ARCH_CPU_ARM_FAMILY) || \
+-    defined(ARCH_CPU_MIPS_FAMILY)
++    defined(ARCH_CPU_MIPS_FAMILY) || defined (ARCH_CPU_PPC64_FAMILY)
+ // Number that's not currently used by any Linux kernel ABIs.
+ const int kInvalidSyscallNumber = 0x351d3;
+ #else
+@@ -312,10 +312,54 @@ asm(// We need to be able to tell the ke
+     "2:ret\n"
+     ".cfi_endproc\n"
+     ".size SyscallAsm, .-SyscallAsm\n"
++#elif defined(__powerpc64__)
++    ".text\n"
++    ".align 4\n"
++    ".type SyscallAsm @function\n"
++    "SyscallAsm:\n"
++    ".cfi_startproc\n"
++
++    // Check if r3 is negative
++    "cmpdi 3, 0\n"
++    "bgt 2f\n"
++
++    // Load address of 3f into r3 and return
++    "mflr 10\n"
++    "bl 1f\n"
++    "1: mflr 3\n"
++    "mtlr 10\n"
++    "addi 3, 3, 4*13\n"
++    "blr\n"
++
++    // Load arguments from array into r3-8
++    // save param 3 in r10
++    "2:\n"
++    "mr 0, 3\n"
++    "ld 3, 0(4)\n"
++    "ld 5, 16(4)\n"
++    "ld 6, 24(4)\n"
++    "ld 7, 32(4)\n"
++    "ld 8, 40(4)\n"
++    "ld 4, 8(4)\n"
++    "li 9, 0\n"
++
++    // Enter kernel
++    "sc\n"
++
++    // Magic return address
++    "3:\n"
++    // Like MIPS, ppc64 return values are always positive.
++    // Check for error in cr0.SO and negate upon error
++    "bc 4, 3, 4f\n"
++    "neg 3, 3\n"
++    "4: blr\n"
++
++    ".cfi_endproc\n"
++    ".size SyscallAsm, .-SyscallAsm\n"
+ #endif
+     );  // asm
+ 
+-#if defined(__x86_64__)
++#if defined(__x86_64__) || defined(__powerpc64__)
+ extern "C" {
+ intptr_t SyscallAsm(intptr_t nr, const intptr_t args[6]);
+ }
+@@ -429,6 +473,8 @@ intptr_t Syscall::Call(int nr,
+     ret = inout;
+   }
+ 
++#elif defined(__powerpc64__)
++  intptr_t ret = SyscallAsm(nr, args);
+ #else
+ #error "Unimplemented architecture"
+ #endif
+@@ -445,8 +491,26 @@ void Syscall::PutValueInUcontext(intptr_
+     // needs to be changed back.
+     ret_val = -ret_val;
+     SECCOMP_PARM4(ctx) = 1;
+-  } else
++  } else {
+     SECCOMP_PARM4(ctx) = 0;
++  }
++#endif
++#if defined(__powerpc64__)
++  // Same as MIPS, need to invert ret and set error register (cr0.SO)
++  if (ret_val <= -1 && ret_val >= -4095) {
++    ret_val = -ret_val;
++#ifdef __GLIBC__
++    ctx->uc_mcontext.regs->ccr |= (1 << 28);
++#else
++    ((struct pt_regs *)ctx->uc_mcontext.regs)->ccr |= (1 << 28);
++#endif
++  } else {
++#ifdef __GLIBC__
++    ctx->uc_mcontext.regs->ccr &= ~(1 << 28);
++#else
++    ((struct pt_regs *)ctx->uc_mcontext.regs)->ccr &= ~(1 << 28);
++#endif
++  }
+ #endif
+   SECCOMP_RESULT(ctx) = static_cast<greg_t>(ret_val);
+ }
+--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf/trap.cc
++++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf/trap.cc
+@@ -236,6 +236,20 @@ void Trap::SigSys(int nr, LinuxSigInfo*
+       SetIsInSigHandler();
+     }
+ 
++#if defined(__powerpc64__)
++    // On ppc64+glibc, some syscalls seem to accidentally negate the first
++    // parameter which causes checks against it to fail. For now, manually
++    // negate them back.
++    // TODO(shawn@anastas.io): investigate this issue further
++    auto nr = SECCOMP_SYSCALL(ctx);
++    if (nr == __NR_openat || nr == __NR_mkdirat || nr == __NR_faccessat || nr == __NR_readlinkat ||
++        nr == __NR_renameat || nr == __NR_renameat2 || nr == __NR_newfstatat || nr == __NR_unlinkat) {
++        if (static_cast<int>(SECCOMP_PARM1(ctx)) > 0) {
++            SECCOMP_PARM1(ctx) = -SECCOMP_PARM1(ctx);
++        }
++    }
++#endif
++
+     // Copy the seccomp-specific data into a arch_seccomp_data structure. This
+     // is what we are showing to TrapFnc callbacks that the system call
+     // evaluator registered with the sandbox.
+--- a/src/3rdparty/chromium/sandbox/linux/services/credentials.cc
++++ b/src/3rdparty/chromium/sandbox/linux/services/credentials.cc
+@@ -81,7 +81,7 @@ bool ChrootToSafeEmptyDir() {
+   pid_t pid = -1;
+   alignas(16) char stack_buf[PTHREAD_STACK_MIN];
+ #if defined(ARCH_CPU_X86_FAMILY) || defined(ARCH_CPU_ARM_FAMILY) || \
+-    defined(ARCH_CPU_MIPS_FAMILY)
++    defined(ARCH_CPU_MIPS_FAMILY) || defined(ARCH_CPU_PPC64_FAMILY)
+   // The stack grows downward.
+   void* stack = stack_buf + sizeof(stack_buf);
+ #else
+--- a/src/3rdparty/chromium/sandbox/linux/services/syscall_wrappers.cc
++++ b/src/3rdparty/chromium/sandbox/linux/services/syscall_wrappers.cc
+@@ -61,7 +61,7 @@ long sys_clone(unsigned long flags,
+ #if defined(ARCH_CPU_X86_64)
+   return syscall(__NR_clone, flags, child_stack, ptid, ctid, tls);
+ #elif defined(ARCH_CPU_X86) || defined(ARCH_CPU_ARM_FAMILY) || \
+-    defined(ARCH_CPU_MIPS_FAMILY)
++    defined(ARCH_CPU_MIPS_FAMILY) || defined(ARCH_CPU_PPC64_FAMILY)
+   // CONFIG_CLONE_BACKWARDS defined.
+   return syscall(__NR_clone, flags, child_stack, ptid, tls, ctid);
+ #endif
+--- a/src/3rdparty/chromium/sandbox/linux/syscall_broker/broker_process.cc
++++ b/src/3rdparty/chromium/sandbox/linux/syscall_broker/broker_process.cc
+@@ -165,7 +165,7 @@ bool BrokerProcess::IsSyscallBrokerable(
+ #if defined(__NR_fstatat64)
+     case __NR_fstatat64:
+ #endif
+-#if defined(__x86_64__) || defined(__aarch64__)
++#if defined(__x86_64__) || defined(__aarch64__) || defined(__powerpc64__)
+     case __NR_newfstatat:
+ #endif
+       return !fast_check || allowed_command_set_.test(COMMAND_STAT);
+--- a/src/3rdparty/chromium/sandbox/linux/system_headers/linux_seccomp.h
++++ b/src/3rdparty/chromium/sandbox/linux/system_headers/linux_seccomp.h
+@@ -41,6 +41,9 @@
+ #ifndef EM_AARCH64
+ #define EM_AARCH64 183
+ #endif
++#ifndef EM_PPC64
++#define EM_PPC64 21
++#endif
+ 
+ #ifndef __AUDIT_ARCH_64BIT
+ #define __AUDIT_ARCH_64BIT 0x80000000
+@@ -74,6 +77,14 @@
+ #define AUDIT_ARCH_AARCH64 (EM_AARCH64 | __AUDIT_ARCH_64BIT | __AUDIT_ARCH_LE)
+ #endif
+ 
++#ifndef AUDIT_ARCH_PPC64
++#define AUDIT_ARCH_PPC64 (EM_PPC64 | __AUDIT_ARCH_64BIT)
++#endif
++
++#ifndef AUDIT_ARCH_PPC64LE
++#define AUDIT_ARCH_PPC64LE (EM_PPC64 | __AUDIT_ARCH_64BIT | __AUDIT_ARCH_LE)
++#endif
++
+ // For prctl.h
+ #ifndef PR_SET_SECCOMP
+ #define PR_SET_SECCOMP               22
+--- a/src/3rdparty/chromium/sandbox/linux/system_headers/linux_signal.h
++++ b/src/3rdparty/chromium/sandbox/linux/system_headers/linux_signal.h
+@@ -13,7 +13,7 @@
+ // (not undefined, but defined different values and in different memory
+ // layouts). So, fill the gap here.
+ #if defined(__i386__) || defined(__x86_64__) || defined(__arm__) || \
+-    defined(__aarch64__)
++    defined(__aarch64__) || defined(__powerpc64__)
+ 
+ #define LINUX_SIGHUP 1
+ #define LINUX_SIGINT 2
+--- a/src/3rdparty/chromium/sandbox/linux/system_headers/linux_syscalls.h
++++ b/src/3rdparty/chromium/sandbox/linux/system_headers/linux_syscalls.h
+@@ -35,5 +35,9 @@
+ #include "sandbox/linux/system_headers/arm64_linux_syscalls.h"
+ #endif
+ 
++#if defined(__powerpc64__)
++#include "sandbox/linux/system_headers/ppc64_linux_syscalls.h"
++#endif
++
+ #endif  // SANDBOX_LINUX_SYSTEM_HEADERS_LINUX_SYSCALLS_H_
+ 
+--- a/src/3rdparty/chromium/sandbox/linux/system_headers/linux_ucontext.h
++++ b/src/3rdparty/chromium/sandbox/linux/system_headers/linux_ucontext.h
+@@ -11,6 +11,8 @@
+ #include "sandbox/linux/system_headers/arm_linux_ucontext.h"
+ #elif defined(__i386__)
+ #include "sandbox/linux/system_headers/i386_linux_ucontext.h"
++#elif defined(__powerpc64__)
++#include "sandbox/linux/system_headers/ppc64_linux_ucontext.h"
+ #else
+ #error "No support for your architecture in PNaCl header"
+ #endif
+--- a/src/3rdparty/chromium/sandbox/policy/linux/bpf_renderer_policy_linux.cc
++++ b/src/3rdparty/chromium/sandbox/policy/linux/bpf_renderer_policy_linux.cc
+@@ -15,6 +15,11 @@
+ #include "sandbox/linux/system_headers/linux_syscalls.h"
+ #include "sandbox/policy/linux/sandbox_linux.h"
+ 
++// On PPC64, TCGETS is defined in terms of struct termios, so we must include termios.h
++#ifdef __powerpc64__
++#include <termios.h>
++#endif
++
+ // TODO(vignatti): replace the local definitions below with #include
+ // <linux/dma-buf.h> once kernel version 4.6 becomes widely used.
+ #include <linux/types.h>
+--- a/src/3rdparty/chromium/third_party/angle/src/compiler/translator/InfoSink.h
++++ b/src/3rdparty/chromium/third_party/angle/src/compiler/translator/InfoSink.h
+@@ -93,7 +93,16 @@ class TInfoSinkBase
+             stream.precision(8);
+             stream << f;
+         }
+-        sink.append(stream.str());
++
++        // Hack to work around a bug where negative floating point values
++        // are rendered like '.0.5' instead of '-0.5'
++        std::string res(stream.str());
++
++        if (signbit(f)) { // test if f is negative
++            res[0] = '-';
++        }
++
++        sink.append(res);
+         return *this;
+     }
+     // Write boolean values as their names instead of integral value.
+--- a/src/3rdparty/chromium/third_party/angle/src/libANGLE/Constants.h
++++ b/src/3rdparty/chromium/third_party/angle/src/libANGLE/Constants.h
+@@ -9,6 +9,7 @@
+ #ifndef LIBANGLE_CONSTANTS_H_
+ #define LIBANGLE_CONSTANTS_H_
+ 
++#include <cstddef>
+ #include "common/platform.h"
+ 
+ #include <stdint.h>
+--- a/src/3rdparty/chromium/third_party/boringssl/BUILD.gn
++++ b/src/3rdparty/chromium/third_party/boringssl/BUILD.gn
+@@ -99,6 +99,13 @@ if (is_win && !is_msan && current_cpu !=
+       } else {
+         public_configs = [ ":no_asm_config" ]
+       }
++    } else if (current_cpu == "ppc64") {
++      if (is_linux) {
++        # TODO: ppc64 (be) check
++        sources += crypto_sources_linux_ppc64le
++      } else {
++        public_configs = [ ":no_asm_config" ]
++      }
+     } else {
+       public_configs = [ ":no_asm_config" ]
+     }
+--- a/src/3rdparty/chromium/third_party/breakpad/BUILD.gn
++++ b/src/3rdparty/chromium/third_party/breakpad/BUILD.gn
+@@ -623,7 +623,6 @@ if (is_linux || is_chromeos || is_androi
+       "breakpad/src/client/minidump_file_writer.h",
+       "breakpad/src/common/convert_UTF.cc",
+       "breakpad/src/common/convert_UTF.h",
+-      "breakpad/src/common/linux/breakpad_getcontext.S",
+       "breakpad/src/common/linux/elf_core_dump.cc",
+       "breakpad/src/common/linux/elf_core_dump.h",
+       "breakpad/src/common/linux/elfutils.cc",
+@@ -663,6 +662,15 @@ if (is_linux || is_chromeos || is_androi
+ 
+     libs = [ "dl" ]
+ 
++    if (current_cpu == "ppc64") {
++        defines = [ "HAVE_GETCONTEXT" ]
++        libs += [ "ucontext" ]
++    } else {
++        sources += [
++            "breakpad/src/common/linux/breakpad_getcontext.S"
++        ]
++    }
++
+     include_dirs = [
+       ".",
+       "breakpad/src",
+@@ -712,7 +720,6 @@ if (is_linux || is_chromeos || is_androi
+       "breakpad/src/client/linux/minidump_writer/minidump_writer_unittest.cc",
+       "breakpad/src/client/linux/minidump_writer/minidump_writer_unittest_utils.cc",
+       "breakpad/src/client/linux/minidump_writer/proc_cpuinfo_reader_unittest.cc",
+-      "breakpad/src/common/linux/breakpad_getcontext_unittest.cc",
+       "breakpad/src/common/linux/elf_core_dump_unittest.cc",
+       "breakpad/src/common/linux/file_id_unittest.cc",
+       "breakpad/src/common/linux/linux_libc_support_unittest.cc",
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/raw_context_cpu.h
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/raw_context_cpu.h
+@@ -44,6 +44,8 @@ typedef MDRawContextARM RawContextCPU;
+ typedef MDRawContextARM64_Old RawContextCPU;
+ #elif defined(__mips__)
+ typedef MDRawContextMIPS RawContextCPU;
++#elif defined(__powerpc64__)
++typedef MDRawContextPPC64 RawContextCPU;
+ #else
+ #error "This code has not been ported to your platform yet."
+ #endif
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.cc
+@@ -270,7 +270,54 @@ void ThreadInfo::FillCPUContext(RawConte
+   out->float_save.fir = mcontext.fpc_eir;
+ #endif
+ }
+-#endif  // __mips__
++
++#elif defined(__powerpc64__)
++
++#if !defined(__GLIBC__)
++#include <asm/elf.h>
++#include <asm/ptrace.h>
++#endif
++
++uintptr_t ThreadInfo::GetInstructionPointer() const {
++    return mcontext.gp_regs[PT_NIP];
++}
++
++void ThreadInfo::FillCPUContext(RawContextCPU* out) const {
++    out->context_flags = MD_CONTEXT_PPC64_FULL;
++    for (int i = 0; i < MD_CONTEXT_PPC64_GPR_COUNT; i++)
++        out->gpr[i] = mcontext.gp_regs[i];
++
++    out->lr = mcontext.gp_regs[PT_LNK];
++    out->srr0 = mcontext.gp_regs[PT_NIP];
++    out->srr1 = mcontext.gp_regs[PT_MSR];
++    out->cr = mcontext.gp_regs[PT_CCR];
++    out->xer = mcontext.gp_regs[PT_XER];
++    out->ctr = mcontext.gp_regs[PT_CTR];
++
++#ifdef __GLIBC__
++    for (int i = 0; i < MD_FLOATINGSAVEAREA_PPC_FPR_COUNT; i++)
++        out->float_save.fpregs[i] = mcontext.fp_regs[i];
++
++    out->float_save.fpscr = mcontext.fp_regs[NFPREG-1];
++#else
++    for (int i = 0; i < MD_FLOATINGSAVEAREA_PPC_FPR_COUNT; i++)
++        out->float_save.fpregs[i] = ((uint64_t *)&mcontext.fp_regs)[i];
++
++     out->float_save.fpscr = ((uint64_t *)&mcontext.fp_regs)[ELF_NFPREG-1];
++#endif
++
++    for (int i = 0; i < MD_VECTORSAVEAREA_PPC_VR_COUNT; i++)
++        out->vector_save.save_vr[i] = \
++            {(((uint64_t)vregs.vrregs[i][0]) << 32)
++                          | vregs.vrregs[i][1],
++            (((uint64_t)vregs.vrregs[i][2]) << 32)
++                         | vregs.vrregs[i][3]};
++
++    out->vrsave = vregs.vrsave;
++    out->vector_save.save_vscr = {0, vregs.vscr.vscr_word};
++    out->vector_save.save_vrvalid = 0xFFFFFFFF;
++}
++#endif  // __powerpc64__
+ 
+ void ThreadInfo::GetGeneralPurposeRegisters(void** gp_regs, size_t* size) {
+   assert(gp_regs || size);
+@@ -279,6 +326,11 @@ void ThreadInfo::GetGeneralPurposeRegist
+     *gp_regs = mcontext.gregs;
+   if (size)
+     *size = sizeof(mcontext.gregs);
++#elif defined(__powerpc64__)
++  if (gp_regs)
++    *gp_regs = mcontext.gp_regs;
++  if (size)
++    *size = sizeof(mcontext.gp_regs);
+ #else
+   if (gp_regs)
+     *gp_regs = &regs;
+@@ -294,6 +346,11 @@ void ThreadInfo::GetFloatingPointRegiste
+     *fp_regs = &mcontext.fpregs;
+   if (size)
+     *size = sizeof(mcontext.fpregs);
++#elif defined(__powerpc64__)
++  if (fp_regs)
++    *fp_regs = &mcontext.fp_regs;
++  if (size)
++    *size = sizeof(mcontext.fp_regs);
+ #else
+   if (fp_regs)
+     *fp_regs = &fpregs;
+@@ -302,4 +359,13 @@ void ThreadInfo::GetFloatingPointRegiste
+ #endif
+ }
+ 
++#if defined(__powerpc64__)
++void ThreadInfo::GetVectorRegisters(void** v_regs, size_t* size) {
++    if (v_regs)
++        *v_regs = &vregs;
++    if (size)
++        *size = sizeof(vregs);
++}
++#endif
++
+ }  // namespace google_breakpad
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.h
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.h
+@@ -68,6 +68,10 @@ struct ThreadInfo {
+   // Use the structures defined in <sys/user.h>
+   struct user_regs_struct regs;
+   struct user_fpsimd_struct fpregs;
++#elif defined(__powerpc64__)
++  // Use the structures defined in <sys/ucontext.h>.
++  mcontext_t mcontext;
++  vrregset_t vregs;
+ #elif defined(__mips__)
+   // Use the structure defined in <sys/ucontext.h>.
+   mcontext_t mcontext;
+@@ -84,6 +88,11 @@ struct ThreadInfo {
+ 
+   // Returns the pointer and size of float point register area.
+   void GetFloatingPointRegisters(void** fp_regs, size_t* size);
++
++#if defined(__powerpc64__)
++  // Returns the pointer and size of the vector register area. (PPC64 only)
++  void GetVectorRegisters(void** v_regs, size_t* size);
++#endif
+ };
+ 
+ }  // namespace google_breakpad
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc
+@@ -254,6 +254,60 @@ void UContextReader::FillCPUContext(RawC
+   out->float_save.fir = uc->uc_mcontext.fpc_eir;  // Unused.
+ #endif
+ }
++
++#elif defined(__powerpc64__)
++
++#ifndef __GLIBC__
++#include <asm/elf.h>
++#include <asm/ptrace.h>
++#endif
++
++uintptr_t UContextReader::GetStackPointer(const ucontext_t* uc) {
++    return uc->uc_mcontext.gp_regs[MD_CONTEXT_PPC64_REG_SP];
++}
++
++uintptr_t UContextReader::GetInstructionPointer(const ucontext_t* uc) {
++    return uc->uc_mcontext.gp_regs[PT_NIP];
++}
++
++void UContextReader::FillCPUContext(RawContextCPU* out, const ucontext_t* uc,
++                                    const vrregset_t* vregs) {
++    out->context_flags = MD_CONTEXT_PPC64_FULL;
++
++    for (int i = 0; i < MD_CONTEXT_PPC64_GPR_COUNT; i++)
++        out->gpr[i] = uc->uc_mcontext.gp_regs[i];
++
++    out->lr = uc->uc_mcontext.gp_regs[PT_LNK];
++    out->srr0 = uc->uc_mcontext.gp_regs[PT_NIP];
++    out->srr1 = uc->uc_mcontext.gp_regs[PT_MSR];
++    out->cr = uc->uc_mcontext.gp_regs[PT_CCR];
++    out->xer = uc->uc_mcontext.gp_regs[PT_XER];
++    out->ctr = uc->uc_mcontext.gp_regs[PT_CTR];
++
++#ifdef __GLIBC__
++    for (int i = 0; i < MD_FLOATINGSAVEAREA_PPC_FPR_COUNT; i++)
++        out->float_save.fpregs[i] = uc->uc_mcontext.fp_regs[i];
++
++    out->float_save.fpscr = uc->uc_mcontext.fp_regs[NFPREG-1];
++#else
++    for (int i = 0; i < MD_FLOATINGSAVEAREA_PPC_FPR_COUNT; i++)
++        out->float_save.fpregs[i] = ((uint64_t *)&uc->uc_mcontext.fp_regs)[i];
++
++    out->float_save.fpscr = ((uint64_t *)&uc->uc_mcontext.fp_regs)[ELF_NFPREG-1];
++#endif
++
++    for (int i = 0; i < MD_VECTORSAVEAREA_PPC_VR_COUNT; i++)
++        out->vector_save.save_vr[i] =
++            {(((uint64_t)vregs->vrregs[i][0]) << 32)
++                         | vregs->vrregs[i][1],
++             (((uint64_t)vregs->vrregs[i][2]) << 32)
++                         | vregs->vrregs[i][3]};
++
++    out->vrsave = vregs->vrsave;
++    out->vector_save.save_vscr = {0, vregs->vscr.vscr_word};
++    out->vector_save.save_vrvalid = 0xFFFFFFFF;
++}
++
+ #endif
+ 
+ }  // namespace google_breakpad
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h
+@@ -59,6 +59,9 @@ struct UContextReader {
+ #elif defined(__aarch64__)
+   static void FillCPUContext(RawContextCPU* out, const ucontext_t* uc,
+                              const struct fpsimd_context* fpregs);
++#elif defined(__powerpc64__)
++  static void FillCPUContext(RawContextCPU *out, const ucontext_t *uc,
++                             const vrregset_t* vregs);
+ #else
+   static void FillCPUContext(RawContextCPU* out, const ucontext_t* uc);
+ #endif
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc
+@@ -105,6 +105,13 @@
+ #define PR_SET_PTRACER 0x59616d61
+ #endif
+ 
++/* musl hack, can't include asm/ptrace.h as that causes conflicts */
++#ifndef __GLIBC__
++#if defined(__powerpc64__) && !defined(PT_NIP)
++#define PT_NIP 32
++#endif
++#endif
++
+ namespace google_breakpad {
+ 
+ namespace {
+@@ -461,9 +468,16 @@ bool ExceptionHandler::HandleSignal(int
+     memcpy(&g_crash_context_.float_state, fp_ptr,
+            sizeof(g_crash_context_.float_state));
+   }
++#elif defined(__powerpc64__)
++  // On PPC64, we must copy VR state
++  ucontext_t* uc_ptr = (ucontext_t*)uc;
++  if (uc_ptr->uc_mcontext.v_regs) {
++    memcpy(&g_crash_context_.vector_state, uc_ptr->uc_mcontext.v_regs,
++           sizeof(g_crash_context_.vector_state));
++  }
+ #elif !defined(__ARM_EABI__) && !defined(__mips__)
+   // FP state is not part of user ABI on ARM Linux.
+-  // In case of MIPS Linux FP state is already part of ucontext_t
++  // In case of MIPS, Linux FP state is already part of ucontext_t
+   // and 'float_state' is not a member of CrashContext.
+   ucontext_t* uc_ptr = (ucontext_t*)uc;
+   if (uc_ptr->uc_mcontext.fpregs) {
+@@ -708,11 +722,19 @@ bool ExceptionHandler::WriteMinidump() {
+   }
+ #endif
+ 
+-#if !defined(__ARM_EABI__) && !defined(__aarch64__) && !defined(__mips__)
++#if !defined(__ARM_EABI__) && !defined(__aarch64__) && !defined(__mips__) \
++    && !defined(__powerpc64__)
+   // FPU state is not part of ARM EABI ucontext_t.
+   memcpy(&context.float_state, context.context.uc_mcontext.fpregs,
+          sizeof(context.float_state));
+ #endif
++
++#if defined(__powerpc64__)
++  // Vector registers must be copied on PPC64
++  memcpy(&context.vector_state, context.context.uc_mcontext.v_regs,
++         sizeof(context.vector_state));
++#endif
++
+   context.tid = sys_gettid();
+ 
+   // Add an exception stream to the minidump for better reporting.
+@@ -733,6 +755,9 @@ bool ExceptionHandler::WriteMinidump() {
+ #elif defined(__mips__)
+   context.siginfo.si_addr =
+       reinterpret_cast<void*>(context.context.uc_mcontext.pc);
++#elif defined(__powerpc64__)
++  context.siginfo.si_addr =
++      reinterpret_cast<void*>(context.context.uc_mcontext.gp_regs[PT_NIP]);
+ #else
+ #error "This code has not been ported to your platform yet."
+ #endif
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.h
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.h
+@@ -192,7 +192,11 @@ class ExceptionHandler {
+     siginfo_t siginfo;
+     pid_t tid;  // the crashing thread.
+     ucontext_t context;
+-#if !defined(__ARM_EABI__) && !defined(__mips__)
++#if defined(__powerpc64__)
++    // PPC64's FP state is a part of ucontext_t like MIPS but the vector
++    // state is not, so a struct is needed.
++    vstate_t vector_state;
++#elif !defined(__ARM_EABI__) && !defined(__mips__)
+     // #ifdef this out because FP state is not part of user ABI for Linux ARM.
+     // In case of MIPS Linux FP state is already part of ucontext_t so
+     // 'float_state' is not required.
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler_unittest.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler_unittest.cc
+@@ -307,7 +307,7 @@ TEST(ExceptionHandlerTest, ParallelChild
+   }
+ 
+   // Wait a while until the child should have crashed.
+-  usleep(1000000);
++  usleep(2000000);
+   // Kill the child if it is still running.
+   kill(child, SIGKILL);
+ 
+@@ -559,6 +559,8 @@ const unsigned char kIllegalInstruction[
+ #if defined(__mips__)
+   // mfc2 zero,Impl - usually illegal in userspace.
+   0x48, 0x00, 0x00, 0x48
++#elif defined(__powerpc64__)
++  0x01, 0x01, 0x01, 0x01 // Crashes on a tested POWER9 cpu
+ #else
+   // This crashes with SIGILL on x86/x86-64/arm.
+   0xff, 0xff, 0xff, 0xff
+@@ -754,10 +756,10 @@ TEST(ExceptionHandlerTest, InstructionPo
+ 
+   // These are defined here so the parent can use them to check the
+   // data from the minidump afterwards.
+-  // Use 4k here because the OS will hand out a single page even
++  // Use the page size here because the OS will hand out a single page even
+   // if a smaller size is requested, and this test wants to
+   // test the upper bound of the memory range.
+-  const uint32_t kMemorySize = 4096;  // bytes
++  const uint32_t kMemorySize = getpagesize();  // bytes
+   const int kOffset = kMemorySize - sizeof(kIllegalInstruction);
+ 
+   const pid_t child = fork();
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/microdump_writer/microdump_writer.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/microdump_writer/microdump_writer.cc
+@@ -138,7 +138,9 @@ class MicrodumpWriter {
+                   const MicrodumpExtraInfo& microdump_extra_info,
+                   LinuxDumper* dumper)
+       : ucontext_(context ? &context->context : NULL),
+-#if !defined(__ARM_EABI__) && !defined(__mips__)
++#if defined(__powerpc64__)
++        vector_state_(context ? &context->vector_state : NULL),
++#elif !defined(__ARM_EABI__) && !defined(__mips__)
+         float_state_(context ? &context->float_state : NULL),
+ #endif
+         dumper_(dumper),
+@@ -337,6 +339,8 @@ class MicrodumpWriter {
+ # else
+ #  error "This mips ABI is currently not supported (n32)"
+ #endif
++#elif defined(__powerpc64__)
++    const char kArch[] = "ppc64";
+ #else
+ #error "This code has not been ported to your platform yet"
+ #endif
+@@ -409,7 +413,9 @@ class MicrodumpWriter {
+   void DumpCPUState() {
+     RawContextCPU cpu;
+     my_memset(&cpu, 0, sizeof(RawContextCPU));
+-#if !defined(__ARM_EABI__) && !defined(__mips__)
++#if defined(__powerpc64__)
++    UContextReader::FillCPUContext(&cpu, ucontext_, vector_state_);
++#elif !defined(__ARM_EABI__) && !defined(__mips__)
+     UContextReader::FillCPUContext(&cpu, ucontext_, float_state_);
+ #else
+     UContextReader::FillCPUContext(&cpu, ucontext_);
+@@ -605,7 +611,9 @@ class MicrodumpWriter {
+   void* Alloc(unsigned bytes) { return dumper_->allocator()->Alloc(bytes); }
+ 
+   const ucontext_t* const ucontext_;
+-#if !defined(__ARM_EABI__) && !defined(__mips__)
++#if defined(__powerpc64__)
++  const google_breakpad::vstate_t* const vector_state_;
++#elif !defined(__ARM_EABI__) && !defined(__mips__)
+   const google_breakpad::fpstate_t* const float_state_;
+ #endif
+   LinuxDumper* dumper_;
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/microdump_writer/microdump_writer_unittest.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/microdump_writer/microdump_writer_unittest.cc
+@@ -279,10 +279,19 @@ TEST(MicrodumpWriterTest, BasicWithMappi
+   CrashAndGetMicrodump(mappings, MicrodumpExtraInfo(), &buf);
+   ASSERT_TRUE(ContainsMicrodump(buf));
+ 
++  int page_size = getpagesize();
+ #ifdef __LP64__
+-  ASSERT_NE(std::string::npos,
+-            buf.find("M 0000000000001000 000000000000002A 0000000000001000 "
+-                     "33221100554477668899AABBCCDDEEFF0 libfoo.so"));
++  // This test is only available for the following page sizes
++  ASSERT_TRUE((page_size == 4096) || (page_size == 65536));
++  if (page_size == 4096) {
++    ASSERT_NE(std::string::npos,
++              buf.find("M 0000000000001000 000000000000002A 0000000000001000 "
++                       "33221100554477668899AABBCCDDEEFF0 libfoo.so"));
++  } else {
++    ASSERT_NE(std::string::npos,
++              buf.find("M 0000000000010000 000000000000002A 0000000000010000 "
++                       "33221100554477668899AABBCCDDEEFF0 libfoo.so"));
++  }
+ #else
+   ASSERT_NE(std::string::npos,
+             buf.find("M 00001000 0000002A 00001000 "
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_core_dumper.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_core_dumper.cc
+@@ -117,6 +117,9 @@ bool LinuxCoreDumper::GetThreadInfoByInd
+ #elif defined(__mips__)
+   stack_pointer =
+       reinterpret_cast<uint8_t*>(info->mcontext.gregs[MD_CONTEXT_MIPS_REG_SP]);
++#elif defined(__powerpc64__)
++  stack_pointer =
++      reinterpret_cast<uint8_t*>(info->mcontext.gp_regs[MD_CONTEXT_PPC64_REG_SP]);
+ #else
+ #error "This code hasn't been ported to your platform yet."
+ #endif
+@@ -212,7 +215,10 @@ bool LinuxCoreDumper::EnumerateThreads()
+         memset(&info, 0, sizeof(ThreadInfo));
+         info.tgid = status->pr_pgrp;
+         info.ppid = status->pr_ppid;
+-#if defined(__mips__)
++#if defined(__powerpc64__)
++        for (int i = 0; i < 31; i++)
++            info.mcontext.gp_regs[i] = status->pr_reg[i];
++#elif defined(__mips__)
+ #if defined(__ANDROID__)
+         for (int i = EF_R0; i <= EF_R31; i++)
+           info.mcontext.gregs[i - EF_R0] = status->pr_reg[i];
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper.cc
+@@ -765,7 +765,9 @@ bool LinuxDumper::GetStackInfo(const voi
+       reinterpret_cast<uint8_t*>(int_stack_pointer & ~(page_size - 1));
+ 
+   // The number of bytes of stack which we try to capture.
+-  static const ptrdiff_t kStackToCapture = 32 * 1024;
++  // This now depends on page_size to avoid missing data
++  // on systems with larger page sizes.
++  static const ptrdiff_t kStackToCapture = 8 * page_size;
+ 
+   const MappingInfo* mapping = FindMapping(stack_pointer);
+   if (!mapping)
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper.h
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper.h
+@@ -63,7 +63,8 @@ namespace google_breakpad {
+  (defined(__mips__) && _MIPS_SIM == _ABIO32)
+ typedef Elf32_auxv_t elf_aux_entry;
+ #elif defined(__x86_64) || defined(__aarch64__) || \
+-     (defined(__mips__) && _MIPS_SIM != _ABIO32)
++     (defined(__mips__) && _MIPS_SIM != _ABIO32) || \
++     defined(__powerpc64__)
+ typedef Elf64_auxv_t elf_aux_entry;
+ #endif
+ 
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper_unittest_helper.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper_unittest_helper.cc
+@@ -51,6 +51,8 @@
+ #define TID_PTR_REGISTER "rcx"
+ #elif defined(__mips__)
+ #define TID_PTR_REGISTER "$1"
++#elif defined(__powerpc64__)
++#define TID_PTR_REGISTER "r8"
+ #else
+ #error This test has not been ported to this platform.
+ #endif
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper.cc
+@@ -154,19 +154,27 @@ bool LinuxPtraceDumper::CopyFromProcess(
+   return true;
+ }
+ 
+-bool LinuxPtraceDumper::ReadRegisterSet(ThreadInfo* info, pid_t tid)
+-{
++bool LinuxPtraceDumper::ReadRegisterSet(ThreadInfo* info, pid_t tid) {
+ #ifdef PTRACE_GETREGSET
+   struct iovec io;
+   info->GetGeneralPurposeRegisters(&io.iov_base, &io.iov_len);
+-  if (sys_ptrace(PTRACE_GETREGSET, tid, (void*)NT_PRSTATUS, (void*)&io) == -1) {
++  if (ptrace(PTRACE_GETREGSET, tid, (void*)NT_PRSTATUS, (void*)&io) == -1) {
+     return false;
+   }
+ 
+   info->GetFloatingPointRegisters(&io.iov_base, &io.iov_len);
+-  if (sys_ptrace(PTRACE_GETREGSET, tid, (void*)NT_FPREGSET, (void*)&io) == -1) {
++  if (ptrace(PTRACE_GETREGSET, tid, (void*)NT_FPREGSET, (void*)&io) == -1) {
+     return false;
+   }
++
++#if defined(__powerpc64__)
++  // Grab the vector registers on PPC64 too
++  info->GetVectorRegisters(&io.iov_base, &io.iov_len);
++  if (ptrace(PTRACE_GETREGSET, tid, (void*)NT_PPC_VMX, (void*)&io) == -1) {
++    return false;
++  }
++#endif // defined(__powerpc64__)
++
+   return true;
+ #else
+   return false;
+@@ -303,6 +311,9 @@ bool LinuxPtraceDumper::GetThreadInfoByI
+ #elif defined(__mips__)
+   stack_pointer =
+       reinterpret_cast<uint8_t*>(info->mcontext.gregs[MD_CONTEXT_MIPS_REG_SP]);
++#elif defined(__powerpc64__)
++  stack_pointer =
++      reinterpret_cast<uint8_t*>(info->mcontext.gp_regs[MD_CONTEXT_PPC64_REG_SP]);
+ #else
+ #error "This code hasn't been ported to your platform yet."
+ #endif
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper_unittest.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper_unittest.cc
+@@ -462,6 +462,9 @@ TEST(LinuxPtraceDumperTest, VerifyStackR
+ #elif defined(__mips__)
+     pid_t* process_tid_location =
+         reinterpret_cast<pid_t*>(one_thread.mcontext.gregs[1]);
++#elif defined(__powerpc64__)
++    pid_t* process_tid_location =
++        reinterpret_cast<pid_t*>(one_thread.mcontext.gp_regs[8]);
+ #else
+ #error This test has not been ported to this platform.
+ #endif
+@@ -559,6 +562,8 @@ TEST_F(LinuxPtraceDumperTest, SanitizeSt
+   uintptr_t heap_addr = thread_info.regs.rcx;
+ #elif defined(__mips__)
+   uintptr_t heap_addr = thread_info.mcontext.gregs[1];
++#elif defined(__powerpc64__)
++  uintptr_t heap_addr = thread_info.mcontext.gp_regs[8];
+ #else
+ #error This test has not been ported to this platform.
+ #endif
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.cc
+@@ -136,7 +136,9 @@ class MinidumpWriter {
+       : fd_(minidump_fd),
+         path_(minidump_path),
+         ucontext_(context ? &context->context : NULL),
+-#if !defined(__ARM_EABI__) && !defined(__mips__)
++#if defined(__powerpc64__)
++        vector_state_(context ? &context->vector_state : NULL),
++#elif !defined(__ARM_EABI__) && !defined(__mips__)
+         float_state_(context ? &context->float_state : NULL),
+ #endif
+         dumper_(dumper),
+@@ -468,7 +470,9 @@ class MinidumpWriter {
+         if (!cpu.Allocate())
+           return false;
+         my_memset(cpu.get(), 0, sizeof(RawContextCPU));
+-#if !defined(__ARM_EABI__) && !defined(__mips__)
++#if defined(__powerpc64__)
++        UContextReader::FillCPUContext(cpu.get(), ucontext_, vector_state_);
++#elif !defined(__ARM_EABI__) && !defined(__mips__)
+         UContextReader::FillCPUContext(cpu.get(), ucontext_, float_state_);
+ #else
+         UContextReader::FillCPUContext(cpu.get(), ucontext_);
+@@ -897,7 +901,7 @@ class MinidumpWriter {
+     dirent->location.rva = 0;
+   }
+ 
+-#if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
++#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || defined(__powerpc64__)
+   bool WriteCPUInformation(MDRawSystemInfo* sys_info) {
+     char vendor_id[sizeof(sys_info->cpu.x86_cpu_info.vendor_id) + 1] = {0};
+     static const char vendor_id_name[] = "vendor_id";
+@@ -917,7 +921,9 @@ class MinidumpWriter {
+ 
+     // processor_architecture should always be set, do this first
+     sys_info->processor_architecture =
+-#if defined(__mips__)
++#if defined(__powerpc64__)
++        MD_CPU_ARCHITECTURE_PPC64;
++#elif defined(__mips__)
+ # if _MIPS_SIM == _ABIO32
+         MD_CPU_ARCHITECTURE_MIPS;
+ # elif _MIPS_SIM == _ABI64
+@@ -1333,7 +1339,9 @@ class MinidumpWriter {
+   const char* path_;  // Path to the file where the minidum should be written.
+ 
+   const ucontext_t* const ucontext_;  // also from the signal handler
+-#if !defined(__ARM_EABI__) && !defined(__mips__)
++#if defined(__powerpc64__)
++  const google_breakpad::vstate_t* const vector_state_;
++#elif !defined(__ARM_EABI__) && !defined(__mips__)
+   const google_breakpad::fpstate_t* const float_state_;  // ditto
+ #endif
+   LinuxDumper* dumper_;
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.h
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.h
+@@ -48,6 +48,8 @@ class ExceptionHandler;
+ 
+ #if defined(__aarch64__)
+ typedef struct fpsimd_context fpstate_t;
++#elif defined(__powerpc64__)
++typedef vrregset_t vstate_t;
+ #elif !defined(__ARM_EABI__) && !defined(__mips__)
+ typedef std::remove_pointer<fpregset_t>::type fpstate_t;
+ #endif
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer_unittest.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer_unittest.cc
+@@ -715,6 +715,12 @@ TEST(MinidumpWriterTest, InvalidStackPoi
+ #elif defined(__mips__)
+   context.context.uc_mcontext.gregs[MD_CONTEXT_MIPS_REG_SP] =
+       invalid_stack_pointer;
++#elif defined(__powerpc64__)
++  context.context.uc_mcontext.gp_regs[MD_CONTEXT_PPC64_REG_SP] =
++      invalid_stack_pointer;
++#elif defined(__powerpc64__)
++  context.context.uc_mcontext.gp_regs[MD_CONTEXT_PPC64_REG_SP] =
++      invalid_stack_pointer;
+ #else
+ # error "This code has not been ported to your platform yet."
+ #endif
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/common/linux/memory_mapped_file.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/common/linux/memory_mapped_file.cc
+@@ -65,8 +65,7 @@ bool MemoryMappedFile::Map(const char* p
+   }
+ 
+ #if defined(__x86_64__) || defined(__aarch64__) || \
+-   (defined(__mips__) && _MIPS_SIM == _ABI64)
+-
++   (defined(__mips__) && _MIPS_SIM == _ABI64) || defined(__powerpc64__)
+   struct kernel_stat st;
+   if (sys_fstat(fd, &st) == -1 || st.st_size < 0) {
+ #else
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/common/linux/memory_mapped_file_unittest.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/common/linux/memory_mapped_file_unittest.cc
+@@ -176,9 +176,10 @@ TEST_F(MemoryMappedFileTest, RemapAfterM
+ TEST_F(MemoryMappedFileTest, MapWithOffset) {
+   // Put more data in the test file this time. Offsets can only be
+   // done on page boundaries, so we need a two page file to test this.
+-  const int page_size = 4096;
+-  char data1[2 * page_size];
+-  size_t data1_size = sizeof(data1);
++  const int page_size = getpagesize();
++  char *data1 = static_cast<char*>(malloc(2 * page_size));
++  EXPECT_TRUE(data1 != NULL);
++  size_t data1_size = (2 * page_size);
+   for (size_t i = 0; i < data1_size; ++i) {
+     data1[i] = i & 0x7f;
+   }
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/common/memory_allocator_unittest.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/common/memory_allocator_unittest.cc
+@@ -57,8 +57,9 @@ TEST(PageAllocatorTest, LargeObject) {
+ 
+   EXPECT_EQ(0U, allocator.pages_allocated());
+   uint8_t* p = reinterpret_cast<uint8_t*>(allocator.Alloc(10000));
++  uint64_t expected_pages = 1 + ((10000 - 1) / getpagesize());
+   ASSERT_FALSE(p == NULL);
+-  EXPECT_EQ(3U, allocator.pages_allocated());
++  EXPECT_EQ(expected_pages, allocator.pages_allocated());
+   for (unsigned i = 1; i < 10; ++i) {
+     uint8_t* p = reinterpret_cast<uint8_t*>(allocator.Alloc(i));
+     ASSERT_FALSE(p == NULL);
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/processor/exploitability_linux.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/processor/exploitability_linux.cc
+@@ -202,12 +202,14 @@ bool ExploitabilityLinux::EndedOnIllegal
+   // Check architecture and set architecture variable to corresponding flag
+   // in objdump.
+   switch (context->GetContextCPU()) {
++#if defined(__i386) || defined(__x86_64)
+     case MD_CONTEXT_X86:
+       architecture = "i386";
+       break;
+     case MD_CONTEXT_AMD64:
+       architecture = "i386:x86-64";
+       break;
++#endif
+     default:
+       // Unsupported architecture. Note that ARM architectures are not
+       // supported because objdump does not support ARM.
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/processor/exploitability_unittest.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/processor/exploitability_unittest.cc
+@@ -104,6 +104,8 @@ ExploitabilityFor(const string& filename
+ }
+ 
+ TEST(ExploitabilityTest, TestWindowsEngine) {
++// The following tests are only executable on an x86-class linux machine.
++#if !defined(_WIN32) && (defined(__i386) || defined(__x86_64))
+   ASSERT_EQ(google_breakpad::EXPLOITABILITY_HIGH,
+             ExploitabilityFor("ascii_read_av.dmp"));
+   ASSERT_EQ(google_breakpad::EXPLOITABILITY_HIGH,
+@@ -136,9 +138,12 @@ TEST(ExploitabilityTest, TestWindowsEngi
+             ExploitabilityFor("read_av_clobber_write.dmp"));
+   ASSERT_EQ(google_breakpad::EXPLOITABILITY_LOW,
+             ExploitabilityFor("read_av_conditional.dmp"));
++#endif
+ }
+ 
+ TEST(ExploitabilityTest, TestLinuxEngine) {
++// The following tests are only executable on an x86-class linux machine.
++#if defined(__i386) || defined(__x86_64)
+   ASSERT_EQ(google_breakpad::EXPLOITABILITY_INTERESTING,
+             ExploitabilityFor("linux_null_read_av.dmp"));
+   ASSERT_EQ(google_breakpad::EXPLOITABILITY_HIGH,
+@@ -171,7 +176,8 @@ TEST(ExploitabilityTest, TestLinuxEngine
+             ExploitabilityFor("linux_executable_heap.dmp"));
+   ASSERT_EQ(google_breakpad::EXPLOITABILITY_HIGH,
+             ExploitabilityFor("linux_jmp_to_module_not_exe_region.dmp"));
+-#ifndef _WIN32
++#endif
++#if !defined(_WIN32) && (defined(__i386) || defined(__x86_64))
+   ASSERT_EQ(google_breakpad::EXPLOITABILITY_HIGH,
+             ExploitabilityFor("linux_write_to_nonwritable_module.dmp"));
+   ASSERT_EQ(google_breakpad::EXPLOITABILITY_HIGH,
+@@ -182,10 +188,10 @@ TEST(ExploitabilityTest, TestLinuxEngine
+             ExploitabilityFor("linux_write_to_outside_module_via_math.dmp"));
+   ASSERT_EQ(google_breakpad::EXPLOITABILITY_INTERESTING,
+             ExploitabilityFor("linux_write_to_under_4k.dmp"));
+-#endif  // _WIN32
++#endif  // !defined(_WIN32) && (!defined(__i386) && !defined(__x86_64))
+ }
+ 
+-#ifndef _WIN32
++#if !defined(_WIN32) && (defined(__i386) || defined(__x86_64))
+ TEST(ExploitabilityLinuxUtilsTest, DisassembleBytesTest) {
+   ASSERT_FALSE(ExploitabilityLinuxTest::DisassembleBytes("", NULL, 5, NULL));
+   uint8_t bytes[6] = {0xc7, 0x0, 0x5, 0x0, 0x0, 0x0};
+@@ -301,6 +307,7 @@ TEST(ExploitabilityLinuxUtilsTest, Calcu
+                                                          context,
+                                                          &write_address));
+ }
+-#endif  // _WIN32
++#endif  // !defined(_WIN32) && (defined(__i386) || defined(__x86_64))
++
+ 
+ }  // namespace
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/tools/linux/md2core/minidump-2-core.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/tools/linux/md2core/minidump-2-core.cc
+@@ -77,6 +77,8 @@
+   #define ELF_ARCH  EM_MIPS
+ #elif defined(__aarch64__)
+   #define ELF_ARCH  EM_AARCH64
++#elif defined(__powerpc64__)
++  #define ELF_ARCH  EM_PPC64
+ #endif
+ 
+ #if defined(__arm__)
+@@ -87,6 +89,8 @@ typedef user_regs user_regs_struct;
+ #elif defined (__mips__)
+ // This file-local typedef simplifies the source code.
+ typedef gregset_t user_regs_struct;
++#elif defined(__powerpc64__)
++typedef struct pt_regs user_regs_struct;
+ #endif
+ 
+ using google_breakpad::MDTypeHelper;
+@@ -322,6 +326,12 @@ struct CrashedProcess {
+ #if defined(__aarch64__)
+     user_fpsimd_struct fpregs;
+ #endif
++#if defined(__powerpc64__)
++    mcontext_t mcontext;
++#endif
++#if defined(__powerpc64__)
++    mcontext_t mcontext;
++#endif
+     uintptr_t stack_addr;
+     const uint8_t* stack;
+     size_t stack_length;
+@@ -535,6 +545,38 @@ ParseThreadRegisters(CrashedProcess::Thr
+   thread->mcontext.fpc_eir = rawregs->float_save.fir;
+ #endif
+ }
++#elif defined(__powerpc64__)
++static void
++ParseThreadRegisters(CrashedProcess::Thread* thread,
++                     const MinidumpMemoryRange& range) {
++  const MDRawContextPPC64* rawregs = range.GetData<MDRawContextPPC64>(0);
++
++  for (int i = 0; i < MD_CONTEXT_PPC64_GPR_COUNT; i++)
++    thread->mcontext.gp_regs[i] = rawregs->gpr[i];
++
++  thread->mcontext.gp_regs[PT_LNK] = rawregs->lr;
++  thread->mcontext.gp_regs[PT_NIP] = rawregs->srr0;
++  thread->mcontext.gp_regs[PT_MSR] = rawregs->srr1;
++  thread->mcontext.gp_regs[PT_CCR] = rawregs->cr;
++  thread->mcontext.gp_regs[PT_XER] = rawregs->xer;
++  thread->mcontext.gp_regs[PT_CTR] = rawregs->ctr;
++  thread->mcontext.v_regs->vrsave = rawregs->vrsave;
++
++  for (int i = 0; i < MD_FLOATINGSAVEAREA_PPC_FPR_COUNT; i++)
++      thread->mcontext.fp_regs[i] = rawregs->float_save.fpregs[i];
++
++  thread->mcontext.fp_regs[NFPREG-1] = rawregs->float_save.fpscr;
++
++  for (int i = 0; i < MD_VECTORSAVEAREA_PPC_VR_COUNT; i++) {
++      thread->mcontext.v_regs->vrregs[i][0] = rawregs->vector_save.save_vr[i].high >> 32;
++      thread->mcontext.v_regs->vrregs[i][1] = rawregs->vector_save.save_vr[i].high;
++      thread->mcontext.v_regs->vrregs[i][2] = rawregs->vector_save.save_vr[i].low >> 32;
++      thread->mcontext.v_regs->vrregs[i][3] = rawregs->vector_save.save_vr[i].low;
++  }
++
++  thread->mcontext.v_regs->vscr.vscr_word = rawregs->vector_save.save_vscr.low & 0xFFFFFFFF;
++}
++
+ #else
+ #error "This code has not been ported to your platform yet"
+ #endif
+@@ -623,6 +665,12 @@ ParseSystemInfo(const Options& options,
+ # else
+ #  error "This mips ABI is currently not supported (n32)"
+ # endif
++#elif defined(__powerpc64__)
++  if (sysinfo->processor_architecture != MD_CPU_ARCHITECTURE_PPC64) {
++    fprintf(stderr,
++            "This version of minidump-2-core only supports PPC64.\n");
++    exit(1);
++  }
+ #else
+ #error "This code has not been ported to your platform yet"
+ #endif
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/CONTRIBUTORS
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/CONTRIBUTORS
+@@ -13,3 +13,4 @@ Mark Mentovai <mark@chromium.org>
+ Robert Sesek <rsesek@chromium.org>
+ Scott Graham <scottmg@chromium.org>
+ Joshua Peraza <jperaza@chromium.org>
++Shawn Anastasio <shawn@anastas.io>
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/compat/linux/sys/user.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/compat/linux/sys/user.h
+@@ -15,6 +15,7 @@
+ #ifndef CRASHPAD_COMPAT_LINUX_SYS_USER_H_
+ #define CRASHPAD_COMPAT_LINUX_SYS_USER_H_
+ 
++#include <cstddef>
+ #include_next <sys/user.h>
+ 
+ #include <features.h>
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/minidump/minidump_context.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/minidump/minidump_context.h
+@@ -592,6 +592,70 @@ struct MinidumpContextMIPS64 {
+   uint64_t fir;
+ };
+ 
++//! \brief ppc64-specific flags for MinidumpPPC64::context_flags
++//! Based on minidump_cpu_ppc64.h from breakpad
++enum MinidumpContextPPC64Flags : uint32_t {
++  //! \brief Identifies the context as PPC64.
++  kMinidumpContextPPC64 = 0x01000000,
++
++  //! \brief Indicates the validity of general purpose registers.
++  //!
++  //! Registers `r0`-`r31`, `nip`, `msr`, `lr`, etc. are valid.
++  kMinidumpContextPPC64Base = kMinidumpContextPPC64 | 0x00000001,
++
++  //! \brief Indicates the validity of floating point registers.
++  //!
++  //! Registers `fp0`-`fp31`, `fpscr` are valid.
++  kMinidumpContextPPC64Floating = kMinidumpContextPPC64 | 0x00000008,
++
++  //! \brief Indicates the validity of Altivec/VMX registers.
++  //!
++  //! Registers `v0`-`v31`, `vscr`, `vrsave`.
++  kMinidumpContextPPC64Vector = kMinidumpContextPPC64 | 0x00000020,
++
++  //! \brief Indicates the validity of all registers
++  kMinidumpContextPPC64All = kMinidumpContextPPC64Base     |
++                             kMinidumpContextPPC64Floating |
++                             kMinidumpContextPPC64Vector
++};
++
++//! \brief A PPC64 CPU context carried in a minidump file.
++//! Based on minidump_cpu_ppc64.h from breakpad.
++struct MinidumpContextPPC64 {
++  uint64_t context_flags;
++
++  //! \brief General purpose registers.
++  uint64_t nip;
++  uint64_t msr;
++  uint64_t regs[32];
++  uint64_t ccr;
++  uint64_t xer;
++  uint64_t lnk;
++  uint64_t ctr;
++
++  //! \brief Floating point registers.
++  double fpregs[32];
++
++  //! \brief FPU status register.
++  double fpscr;
++
++  //! \brief Altivec/VMX vector registers.
++  struct {
++      //! \brief Vector registers are 128bits.
++      uint128_struct save_vr[32];
++      uint128_struct save_vscr;
++
++      //! \brief Padding included for breakpad compatibiltiy.
++      uint32_t save_pad5[4];
++
++      //! \brief VRSAVE register.
++      uint32_t save_vrsave;
++
++      //! \brief Padding included for breakpad compatibiltiy.
++      uint32_t save_pad6[7];
++  } vregs;
++};
++
+ }  // namespace crashpad
+ 
+ #endif  // CRASHPAD_MINIDUMP_MINIDUMP_CONTEXT_H_
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/minidump/minidump_context_writer.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/minidump/minidump_context_writer.cc
+@@ -101,6 +101,13 @@ MinidumpContextWriter::CreateFromSnapsho
+       break;
+     }
+ 
++    case kCPUArchitecturePPC64: {
++      context = std::make_unique<MinidumpContextPPC64Writer>();
++      reinterpret_cast<MinidumpContextPPC64Writer*>(context.get())
++          ->InitalizeFromSnapshot(context_snapshot->ppc64);
++      break;
++    }
++
+     default: {
+       LOG(ERROR) << "unknown context architecture "
+                  << context_snapshot->architecture;
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/minidump/minidump_context_writer.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/minidump/minidump_context_writer.h
+@@ -315,6 +315,45 @@ class MinidumpContextMIPS64Writer final
+   DISALLOW_COPY_AND_ASSIGN(MinidumpContextMIPS64Writer);
+ };
+ 
++class MinidumpContextPPC64Writer final : public MinidumpContextWriter {
++ public:
++  MinidumpContextPPC64Writer();
++  ~MinidumpContextPPC64Writer() override;
++
++  //! \brief Initalizes the MinidumpContextPPC64 based on \a context_snapshot.
++  //!
++  //! \param[in] context_snapshot The context snapshot to use as source data.
++  //!
++  //! \note Valid in #kStateMutable. No mutation of context() may be done before
++  //!     calling this method, and it is not normally necessary to alter
++  //!     context() after calling this method.
++  void InitalizeFromSnapshot(const CPUContextPPC64* context_snapshot);
++
++  //! \brief Returns a pointer to the context structure that this object will
++  //!     write.
++  //!
++  //! \attention This returns a non-`const` pointer to this object’s private
++  //!     data so that a caller can populate the context structure directly.
++  //!     This is done because providing setter interfaces to each field in the
++  //!     context structure would be unwieldy and cumbersome. Care must be taken
++  //!     to populate the context structure correctly. The context structure
++  //!     must only be modified while this object is in the #kStateMutable
++  //!     state.
++  MinidumpContextPPC64* context() { return &context_; }
++
++ protected:
++  // MinidumpWritable:
++  bool WriteObject(FileWriterInterface* file_writer) override;
++
++  // MinidumpContextWriter:
++  size_t ContextSize() const override;
++
++ private:
++  MinidumpContextPPC64 context_;
++
++  DISALLOW_COPY_AND_ASSIGN(MinidumpContextPPC64Writer);
++};
++
+ }  // namespace crashpad
+ 
+ #endif  // CRASHPAD_MINIDUMP_MINIDUMP_CONTEXT_WRITER_H_
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/minidump/minidump_context_writer_test.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/minidump/minidump_context_writer_test.cc
+@@ -213,6 +213,21 @@ TEST(MinidumpContextWriter, MIPS64_FromS
+       context, ExpectMinidumpContextMIPS64, kSeed);
+ }
+ 
++TEST(MinidumpContextWriter, PPC64_Zeros) {
++  EmptyContextTest<MinidumpContextPPC64Writer, MinidumpContextPPC64>(
++    ExpectMinidumpContextPPC64);
++}
++
++TEST(MinidumpContextWriter, PPC64_FromSnapshot) {
++  constexpr uint32_t kSeed = 64;
++  CPUContextPPC64 context_ppc64;
++  CPUContext context;
++  context.ppc64 = &context_ppc64;
++  InitializeCPUContextPPC64(&context, kSeed);
++  FromSnapshotTest<MinidumpContextPPC64Writer, MinidumpContextPPC64>(
++      context, ExpectMinidumpContextPPC64, kSeed);
++}
++
+ }  // namespace
+ }  // namespace test
+ }  // namespace crashpad
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/minidump/minidump_misc_info_writer.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/minidump/minidump_misc_info_writer.cc
+@@ -135,6 +135,8 @@ std::string MinidumpMiscInfoDebugBuildSt
+   static constexpr char kCPU[] = "mips";
+ #elif defined(ARCH_CPU_MIPS64EL)
+   static constexpr char kCPU[] = "mips64";
++#elif defined(ARCH_CPU_PPC64)
++  static constexpr char kCPU[] = "ppc64";
+ #else
+ #error define kCPU for this CPU
+ #endif
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/capture_memory.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/capture_memory.cc
+@@ -112,6 +112,11 @@ void CaptureMemory::PointedToByContext(c
+   for (size_t i = 0; i < base::size(context.mipsel->regs); ++i) {
+     MaybeCaptureMemoryAround(delegate, context.mipsel->regs[i]);
+   }
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++  MaybeCaptureMemoryAround(delegate, context.ppc64->nip);
++  for (size_t i = 0; i < base::size(context.ppc64->regs); ++i) {
++    MaybeCaptureMemoryAround(delegate, context.ppc64->regs[i]);
++  }
+ #else
+ #error Port.
+ #endif
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/cpu_architecture.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/cpu_architecture.h
+@@ -43,7 +43,10 @@ enum CPUArchitecture {
+   kCPUArchitectureMIPSEL,
+ 
+   //! \brief 64-bit MIPSEL.
+-  kCPUArchitectureMIPS64EL
++  kCPUArchitectureMIPS64EL,
++
++  //! \brief 64-bit PPC64.
++  kCPUArchitecturePPC64
+ };
+ 
+ }  // namespace crashpad
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/cpu_context.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/cpu_context.cc
+@@ -169,6 +169,8 @@ uint64_t CPUContext::InstructionPointer(
+       return arm->pc;
+     case kCPUArchitectureARM64:
+       return arm64->pc;
++    case kCPUArchitecturePPC64:
++      return ppc64->nip;
+     default:
+       NOTREACHED();
+       return ~0ull;
+@@ -185,6 +187,8 @@ uint64_t CPUContext::StackPointer() cons
+       return arm->sp;
+     case kCPUArchitectureARM64:
+       return arm64->sp;
++    case kCPUArchitecturePPC64:
++      return ppc64->regs[1];
+     default:
+       NOTREACHED();
+       return ~0ull;
+@@ -196,6 +200,7 @@ bool CPUContext::Is64Bit() const {
+     case kCPUArchitectureX86_64:
+     case kCPUArchitectureARM64:
+     case kCPUArchitectureMIPS64EL:
++    case kCPUArchitecturePPC64:
+       return true;
+     case kCPUArchitectureX86:
+     case kCPUArchitectureARM:
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/cpu_context.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/cpu_context.h
+@@ -352,6 +352,24 @@ struct CPUContextMIPS64 {
+   uint64_t fir;
+ };
+ 
++//! \brief A context structure carrying PPC64 CPU state.
++struct CPUContextPPC64 {
++  uint64_t nip;
++  uint64_t msr;
++  uint64_t regs[32];
++  uint64_t ccr;
++  uint64_t xer;
++  uint64_t lnk;
++  uint64_t ctr;
++  double fpregs[32];
++  double fpscr;
++  struct {
++    uint128_struct save_vr[32];
++    uint128_struct save_vscr;
++    uint32_t save_vrsave;
++  } vregs;
++};
++
+ //! \brief A context structure capable of carrying the context of any supported
+ //!     CPU architecture.
+ struct CPUContext {
+@@ -382,6 +400,7 @@ struct CPUContext {
+     CPUContextARM64* arm64;
+     CPUContextMIPS* mipsel;
+     CPUContextMIPS64* mips64;
++    CPUContextPPC64* ppc64;
+   };
+ };
+ 
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/cpu_context_linux.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/cpu_context_linux.h
+@@ -15,6 +15,7 @@
+ #ifndef CRASHPAD_SNAPSHOT_LINUX_CPU_CONTEXT_LINUX_H_
+ #define CRASHPAD_SNAPSHOT_LINUX_CPU_CONTEXT_LINUX_H_
+ 
++#include <cstring>
+ #include "build/build_config.h"
+ #include "snapshot/cpu_context.h"
+ #include "snapshot/linux/signal_context.h"
+@@ -174,6 +175,76 @@ void InitializeCPUContextMIPS(
+ 
+ #endif  // ARCH_CPU_MIPS_FAMILY || DOXYGEN
+ 
++#if defined(ARCH_CPU_PPC64_FAMILY) || DOXYGEN
++
++//! \brief Initalizes a CPUContextPPC64 structure from native context
++//!     structures on Linux.
++//!
++//! \param[in] thread_context The native thread context.
++//! \param[in] float_context The native float context.
++//! \param[in] vector_context The native vector context.
++//! \param[out] context The CPUContextPPC64 structure to initalize.
++template <typename Traits>
++void InitializeCPUContextPPC64(
++    const ThreadContext::t64_t& thread_context,
++    const FloatContext::f64_t& float_context,
++    const VectorContext::v64_t& vector_context,
++    typename Traits::CPUContext* context) {
++
++  memcpy(context->regs, thread_context.gpr, sizeof(context->regs));
++  context->nip = thread_context.nip;
++  context->msr = thread_context.msr;
++  context->ccr = thread_context.ccr;
++  context->xer = thread_context.xer;
++  context->lnk = thread_context.lnk;
++  context->ctr = thread_context.ctr;
++
++  memcpy(context->fpregs, float_context.fpregs, sizeof(context->fpregs));
++  context->fpscr = float_context.fpscr;
++
++  for (uint8_t i = 0; i < 32; i++) {
++    context->vregs.save_vr[i] = {
++      (((uint64_t)vector_context.vrregs[i][0]) << 32) |
++        vector_context.vrregs[i][1],
++      (((uint64_t)vector_context.vrregs[i][2]) << 32) |
++        vector_context.vrregs[i][3]
++    };
++  }
++  context->vregs.save_vrsave = vector_context.vrsave;
++  context->vregs.save_vscr = {0, (uint64_t)vector_context.vscr.vscr_word};
++}
++
++template <typename Traits>
++void InitializeCPUContextPPC64(
++    const SignalThreadContext64 &thread_context,
++    const SignalFloatContext64 &float_context,
++    const SignalVectorContext64 &vector_context,
++    typename Traits::CPUContext* context) {
++
++  memcpy(context->regs, thread_context.regs, sizeof(context->regs));
++  context->nip = thread_context.nip;
++  context->msr = thread_context.msr;
++  context->ccr = thread_context.ccr;
++  context->xer = thread_context.xer;
++  context->lnk = thread_context.lnk;
++  context->ctr = thread_context.ctr;
++
++  memcpy(context->fpregs, float_context.regs, sizeof(context->fpregs));
++  context->fpscr = float_context.fpscr;
++
++  for (uint8_t i = 0; i < 32; i++) {
++    context->vregs.save_vr[i] = {
++      (((uint64_t)vector_context.vrregs[i][0]) << 32) |
++        vector_context.vrregs[i][1],
++      (((uint64_t)vector_context.vrregs[i][2]) << 32) |
++        vector_context.vrregs[i][3]
++    };
++  }
++  context->vregs.save_vrsave = vector_context.vrsave;
++  context->vregs.save_vscr = {0, (uint64_t)vector_context.vscr.vscr_word};
++}
++
++#endif
+ }  // namespace internal
+ }  // namespace crashpad
+ 
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/debug_rendezvous_test.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/debug_rendezvous_test.cc
+@@ -192,6 +192,8 @@ void TestAgainstTarget(PtraceConnection*
+               device == 0 && inode == 0 && mapping_name == "[vdso]";
+ #if defined(ARCH_CPU_X86)
+           static constexpr char kPrefix[] = "linux-gate.so.";
++#elif defined(ARCH_CPU_PPC64)
++          static constexpr char kPrefix[] = "linux-vdso64.so.";
+ #else
+           static constexpr char kPrefix[] = "linux-vdso.so.";
+ #endif
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux.cc
+@@ -323,6 +323,69 @@ bool ExceptionSnapshotLinux::ReadContext
+       reader, context_address, context_.mips64);
+ }
+ 
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++
++template <typename Traits>
++static bool ReadContext(ProcessReaderLinux* reader,
++                        LinuxVMAddress context_address,
++                        typename Traits::CPUContext* dest_context) {
++  const ProcessMemory* memory = reader->Memory();
++
++  LinuxVMAddress gp_regs_address = context_address +
++                                   offsetof(UContext, mcontext) +
++                                   offsetof(typename Traits::MContext, gp_regs);
++
++  typename Traits::SignalThreadContext thread_context;
++  if (!memory->Read(gp_regs_address, sizeof(thread_context), &thread_context)) {
++    LOG(ERROR) << "Couldn't read gp_regs!";
++    return false;
++  }
++
++  LinuxVMAddress fp_regs_address = context_address +
++                                   offsetof(UContext, mcontext) +
++                                   offsetof(typename Traits::MContext, fp_regs);
++
++  typename Traits::SignalFloatContext fp_context;
++  if (!memory->Read(fp_regs_address, sizeof(fp_context), &fp_context)) {
++    LOG(ERROR) << "Couldn't read fp_regs!";
++    return false;
++  }
++
++  LinuxVMAddress v_regs_ptr_address = context_address +
++                                  offsetof(UContext, mcontext) +
++                                  offsetof(typename Traits::MContext, vmx_reserve) + 8;
++
++  typename Traits::SignalVectorContext v_context;
++  if (!memory->Read(v_regs_ptr_address, sizeof(v_context), &v_context)) {
++    LOG(ERROR) << "Couldn't read v_regs!";
++    return false;
++  }
++
++  InitializeCPUContextPPC64<ContextTraits64>(thread_context, fp_context,
++                            v_context, dest_context);
++
++  return true;
++}
++
++template<>
++bool ExceptionSnapshotLinux::ReadContext<ContextTraits64>(
++    ProcessReaderLinux* reader,
++    LinuxVMAddress context_address) {
++  context_.architecture = kCPUArchitecturePPC64;
++  context_.ppc64 = &context_union_.ppc64;
++
++  return internal::ReadContext<ContextTraits64>(
++      reader, context_address, context_.ppc64);
++}
++
++template<>
++bool ExceptionSnapshotLinux::ReadContext<ContextTraits32>(
++    ProcessReaderLinux* reader,
++    LinuxVMAddress context_address) {
++  // PPC64 is 64-bit
++  return false;
++}
++
+ #endif  // ARCH_CPU_X86_FAMILY
+ 
+ bool ExceptionSnapshotLinux::Initialize(ProcessReaderLinux* process_reader,
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux.h
+@@ -84,6 +84,8 @@ class ExceptionSnapshotLinux final : pub
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+     CPUContextMIPS mipsel;
+     CPUContextMIPS64 mips64;
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++    CPUContextPPC64 ppc64;
+ #endif
+   } context_union_;
+   CPUContext context_;
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux_test.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux_test.cc
+@@ -296,7 +296,28 @@ void ExpectContext(const CPUContext& act
+             0);
+ #undef CPU_ARCH_NAME
+ }
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++using NativeCPUContext = ucontext_t;
+ 
++void InitializeContext(NativeCPUContext* context) {
++  for (size_t reg = 0; reg < 32; ++reg) {
++    context->uc_mcontext.gp_regs[reg] = reg;
++  }
++
++  memset(&context->uc_mcontext.fp_regs, 44,
++      sizeof(context->uc_mcontext.fp_regs));
++}
++
++void ExpectContext(const CPUContext& actual, const NativeCPUContext& expected) {
++  EXPECT_EQ(actual.architecture, kCPUArchitecturePPC64);
++
++  for (size_t reg = 0; reg < 32; ++reg) {
++    EXPECT_EQ(actual.ppc64->regs[reg], expected.uc_mcontext.gp_regs[reg]);
++  }
++
++  EXPECT_EQ(memcmp(actual.ppc64->fpregs, expected.uc_mcontext.fp_regs,
++            sizeof(actual.ppc64->fpregs)), 0);
++}
+ #else
+ #error Port.
+ #endif
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/process_reader_linux.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/process_reader_linux.cc
+@@ -108,6 +108,8 @@ void ProcessReaderLinux::Thread::Initial
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+   stack_pointer = reader->Is64Bit() ? thread_info.thread_context.t64.regs[29]
+                                     : thread_info.thread_context.t32.regs[29];
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++  stack_pointer = thread_info.thread_context.t64.gpr[1];
+ #else
+ #error Port.
+ #endif
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/signal_context.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/signal_context.h
+@@ -422,6 +422,93 @@ static_assert(offsetof(UContext<ContextT
+               "context offset mismatch");
+ #endif
+ 
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++
++struct SignalThreadContext64 {
++  uint64_t regs[32];
++  uint64_t nip;
++  uint64_t msr;
++  uint64_t orig_r3;
++  uint64_t ctr;
++  uint64_t lnk;
++  uint64_t xer;
++  uint64_t ccr;
++  uint64_t softe;
++  uint64_t trap;
++  uint64_t dar;
++  uint64_t dsisr;
++  uint64_t result;
++  uint64_t dscr;
++  uint64_t fpr0[3];
++};
++
++struct SignalFloatContext64 {
++  double regs[32];
++  double fpscr;
++};
++
++struct SignalVectorContext64 {
++  int32_t vrregs[32][4];
++  struct {
++    int32_t __pad[3];
++    int32_t vscr_word;
++  } vscr;
++  int32_t vrsave;
++  int32_t __pad[3];
++} __attribute__((__aligned__(16)));
++
++
++#pragma pack(pop)
++struct MContext64 {
++  uint64_t reserved[4];
++  int32_t signal;
++  int32_t __pad0;
++  uint64_t handler;
++  uint64_t oldmask;
++  uint64_t pt_regs_ptr;
++  SignalThreadContext64 gp_regs;
++  SignalFloatContext64  fp_regs;
++  SignalVectorContext64 *v_regs;
++#ifdef __GLIBC__
++  int64_t vmx_reserve[69];
++#else
++  int64_t vmx_reserve[101];
++#endif
++};
++
++struct ContextTraits64 : public Traits64 {
++  using MContext = MContext64;
++  using SignalThreadContext = SignalThreadContext64;
++  using SignalFloatContext = SignalFloatContext64;
++  using SignalVectorContext = SignalVectorContext64;
++  using CPUContext = CPUContextPPC64;
++};
++
++struct ContextTraits32 : public Traits32 {};
++
++struct UContext {
++  uint64_t flags;
++  uint64_t link;
++  SignalStack<ContextTraits64> stack;
++  Sigset<ContextTraits64> sigmask;
++  MContext64 mcontext;
++};
++#pragma pack(push, 1)
++
++static_assert(sizeof(UContext) == sizeof(ucontext_t),
++              "ucontext_t size mismatch");
++static_assert(sizeof(MContext64) == sizeof(mcontext_t),
++              "mcontext_t size mismatch");
++static_assert(sizeof(SignalThreadContext64) == sizeof(gregset_t),
++              "gregset_t size mismatch");
++static_assert(sizeof(SignalFloatContext64) == sizeof(fpregset_t),
++              "fpregset_t size mismatch");
++static_assert(sizeof(SignalVectorContext64) == sizeof(vrregset_t),
++              "vrregset_t size mismatch");
++static_assert(offsetof(UContext, mcontext) ==
++              offsetof(ucontext_t, uc_mcontext), "mcontext offset mismatch");
++static_assert(offsetof(MContext64, gp_regs) ==
++              offsetof(mcontext_t, gp_regs), "gp_regs offset mismatch");
+ #else
+ #error Port.
+ #endif  // ARCH_CPU_X86_FAMILY
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/system_snapshot_linux.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/system_snapshot_linux.cc
+@@ -204,6 +204,8 @@ CPUArchitecture SystemSnapshotLinux::Get
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+   return process_reader_->Is64Bit() ? kCPUArchitectureMIPS64EL
+                                     : kCPUArchitectureMIPSEL;
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++  return kCPUArchitecturePPC64;
+ #else
+ #error port to your architecture
+ #endif
+@@ -219,6 +221,9 @@ uint32_t SystemSnapshotLinux::CPURevisio
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+   // Not implementable on MIPS
+   return 0;
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++  // Not yet implemented on PPC64
++  return 0;
+ #else
+ #error port to your architecture
+ #endif
+@@ -239,6 +244,9 @@ std::string SystemSnapshotLinux::CPUVend
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+   // Not implementable on MIPS
+   return std::string();
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++  // Not yet implemented on PPC64
++  return std::string();
+ #else
+ #error port to your architecture
+ #endif
+@@ -372,6 +380,9 @@ bool SystemSnapshotLinux::NXEnabled() co
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+   // Not implementable on MIPS
+   return false;
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++  // Not yet implemented on PPC64
++  return false;
+ #else
+ #error Port.
+ #endif  // ARCH_CPU_X86_FAMILY
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/test_modules.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/test_modules.cc
+@@ -110,6 +110,8 @@ bool WriteTestModule(const base::FilePat
+   module.ehdr.e_machine = EM_AARCH64;
+ #elif defined(ARCH_CPU_MIPSEL) || defined(ARCH_CPU_MIPS64EL)
+   module.ehdr.e_machine = EM_MIPS;
++#elif defined(ARCH_CPU_PPC64)
++  module.ehdr.e_machine = EM_PPC64;
+ #endif
+ 
+   module.ehdr.e_version = EV_CURRENT;
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/thread_snapshot_linux.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/thread_snapshot_linux.cc
+@@ -186,6 +186,14 @@ bool ThreadSnapshotLinux::Initialize(Pro
+         thread.thread_info.float_context.f32,
+         context_.mipsel);
+   }
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++  context_.architecture = kCPUArchitecturePPC64;
++  context_.ppc64 = &context_union_.ppc64;
++  InitializeCPUContextPPC64<ContextTraits64>(
++      thread.thread_info.thread_context.t64,
++      thread.thread_info.float_context.f64,
++      thread.thread_info.vector_context.v64,
++      context_.ppc64);
+ #else
+ #error Port.
+ #endif
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/thread_snapshot_linux.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/thread_snapshot_linux.h
+@@ -68,6 +68,8 @@ class ThreadSnapshotLinux final : public
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+     CPUContextMIPS mipsel;
+     CPUContextMIPS64 mips64;
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++    CPUContextPPC64 ppc64;
+ #else
+ #error Port.
+ #endif  // ARCH_CPU_X86_FAMILY
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/util/linux/auxiliary_vector.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/util/linux/auxiliary_vector.cc
+@@ -56,6 +56,11 @@ bool AuxiliaryVector::Read(PtraceConnect
+     if (type == AT_IGNORE) {
+       continue;
+     }
++#if defined(ARCH_CPU_PPC64_FAMILY)
++    if (type == AT_IGNOREPPC) {
++      continue;
++    }
++#endif
+     if (!MapInsertOrReplace(&values_, type, value, nullptr)) {
+       LOG(ERROR) << "duplicate auxv entry";
+       return false;
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/util/linux/ptracer.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/util/linux/ptracer.cc
+@@ -399,6 +399,64 @@ bool GetThreadArea64(pid_t tid,
+   return true;
+ }
+ 
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++// PPC64 has had HAVE_ARCH_TRACEHOOK set since 2.6.27 (even before x86 had it).
++// That means we can simply use PTRACE_GETREGESET.
++
++template <typename Destination>
++bool GetRegisterSet(pid_t tid, int set, Destination* dest, bool can_log) {
++  iovec iov;
++  iov.iov_base = reinterpret_cast<void*>(dest);
++  iov.iov_len = sizeof(*dest);
++  if (ptrace(PTRACE_GETREGSET, tid, reinterpret_cast<void*>(set), &iov) != 0) {
++    PLOG_IF(ERROR, can_log) << "ptrace";
++    return false;
++  }
++  if (iov.iov_len != sizeof(*dest)) {
++    LOG_IF(ERROR, can_log) << "Unexpected registers size";
++    return false;
++  }
++  return true;
++}
++
++bool GetVectorRegisters64(pid_t tid,
++                          VectorContext* context,
++                          bool can_log) {
++  return GetRegisterSet(tid, NT_PPC_VMX, &context->v64, can_log);
++}
++
++bool GetFloatingPointRegisters64(pid_t tid,
++                                 FloatContext* context,
++                                 bool can_log) {
++  return GetRegisterSet(tid, NT_PRFPREG, &context->f64, can_log);
++}
++
++bool GetThreadArea64(pid_t tid,
++                     const ThreadContext& context,
++                     LinuxVMAddress* address,
++                     bool can_log) {
++  // PPC64 doesn't have PTRACE_GET_THREAD_AREA since the thread pointer
++  // is stored in GPR 13.
++  ThreadContext::t64_t tc;
++  if (!GetRegisterSet(tid, NT_PRSTATUS, &tc, can_log)) {
++    LOG_IF(ERROR, can_log) << "Unable to get thread pointer!";
++    return false;
++  }
++
++  *address = tc.gpr[13];
++
++  return true;
++}
++
++// Stubs for 32-bit functions not applicable on PPC64
++bool GetFloatingPointRegisters32(pid_t tid,
++                                 FloatContext* context,
++                                 bool can_log) { return false; }
++bool GetThreadArea32(pid_t tid,
++                     const ThreadContext &context,
++                     LinuxVMAddress *address,
++                     bool can_log) { return false; }
++
+ #else
+ #error Port.
+ #endif  // ARCH_CPU_X86_FAMILY
+@@ -495,6 +553,9 @@ bool Ptracer::GetThreadInfo(pid_t tid, T
+   if (is_64_bit_) {
+     return GetGeneralPurposeRegisters64(tid, &info->thread_context, can_log_) &&
+            GetFloatingPointRegisters64(tid, &info->float_context, can_log_) &&
++#if defined(ARCH_CPU_PPC64_FAMILY)
++           GetVectorRegisters64(tid, &info->vector_context, can_log_) &&
++#endif
+            GetThreadArea64(tid,
+                            info->thread_context,
+                            &info->thread_specific_data_address,
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/util/linux/thread_info.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/util/linux/thread_info.h
+@@ -39,6 +39,13 @@ struct user_vfp_exc {
+ #include <android/api-level.h>
+ #endif
+ 
++#if defined(ARCH_CPU_PPC64_FAMILY)
++#include <sys/ucontext.h>
++#if !defined(__GLIBC__)
++#include <asm/ptrace.h>
++#endif
++#endif
++
+ namespace crashpad {
+ 
+ //! \brief The set of general purpose registers for an architecture family.
+@@ -90,6 +97,8 @@ union ThreadContext {
+     uint32_t cp0_status;
+     uint32_t cp0_cause;
+     uint32_t padding1_;
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++    // PPC64 is 64-bit
+ #else
+ #error Port.
+ #endif  // ARCH_CPU_X86_FAMILY
+@@ -143,6 +152,21 @@ union ThreadContext {
+     uint64_t cp0_badvaddr;
+     uint64_t cp0_status;
+     uint64_t cp0_cause;
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++    // Reflects struct pt_regs in asm/ptrace.h.
++    uint64_t gpr[32];
++    uint64_t nip;
++    uint64_t msr;
++    uint64_t orig_gpr3;
++    uint64_t ctr;
++    uint64_t lnk;
++    uint64_t xer;
++    uint64_t ccr;
++    uint64_t softe;
++    uint64_t trap;
++    uint64_t dar;
++    uint64_t dsisr;
++    uint64_t result;
+ #else
+ #error Port.
+ #endif  // ARCH_CPU_X86_FAMILY
+@@ -154,6 +178,8 @@ union ThreadContext {
+   using NativeThreadContext = user_regs;
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+ // No appropriate NativeThreadsContext type available for MIPS
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++  using NativeThreadContext = struct pt_regs;
+ #else
+ #error Port.
+ #endif  // ARCH_CPU_X86_FAMILY || ARCH_CPU_ARM64
+@@ -229,6 +255,9 @@ union FloatContext {
+     } fpregs[32];
+     uint32_t fpcsr;
+     uint32_t fpu_id;
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++    // Crashpad's PPC support is 64-bit only, so this
++    // 32bit-only struct is declared as empty.
+ #else
+ #error Port.
+ #endif  // ARCH_CPU_X86_FAMILY
+@@ -263,6 +292,10 @@ union FloatContext {
+     double fpregs[32];
+     uint32_t fpcsr;
+     uint32_t fpu_id;
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++    // Reflects fpregset_t in sys/ucontext.h
++    double fpregs[32];
++    double fpscr;
+ #else
+ #error Port.
+ #endif  // ARCH_CPU_X86_FAMILY
+@@ -291,6 +324,8 @@ union FloatContext {
+   static_assert(sizeof(f64) == sizeof(user_fpsimd_struct), "Size mismatch");
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+ // No appropriate floating point context native type for available MIPS.
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++  static_assert(sizeof(f64) == sizeof(fpregset_t), "Size mismatch");
+ #else
+ #error Port.
+ #endif  // ARCH_CPU_X86
+@@ -298,6 +333,26 @@ union FloatContext {
+ static_assert(std::is_standard_layout<FloatContext>::value,
+               "Not standard layout");
+ 
++//! \brief The vector registers used for an architecture family
++union VectorContext {
++  struct v32_t {} v32;
++#if defined(ARCH_CPU_PPC64_FAMILY)
++  __attribute__((__aligned__(16))) // Vector context must be doubleword aligned.
++#endif
++  struct v64_t {
++#if defined(ARCH_CPU_PPC64_FAMILY)
++    // Reflects vrregset_t in sys/ucontext.h
++    uint32_t vrregs[32][4];
++    struct {
++      uint32_t __pad[3];
++      uint32_t vscr_word;
++    } vscr;
++    uint32_t vrsave;
++    uint32_t __pad[3];
++#endif
++  } v64;
++};
++
+ //! \brief A collection of `ptrace`-able information about a thread.
+ struct ThreadInfo {
+   ThreadInfo();
+@@ -309,6 +364,9 @@ struct ThreadInfo {
+   //! \brief The floating point registers for the thread.
+   FloatContext float_context;
+ 
++  //! \brief (Optional) The vector registers used for the thread.
++  VectorContext vector_context;
++
+   //! \brief The thread-local storage address for the thread.
+   LinuxVMAddress thread_specific_data_address;
+ };
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/util/misc/capture_context.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/util/misc/capture_context.h
+@@ -69,6 +69,7 @@ using NativeCPUContext = ucontext_t;
+ //!     macOS/Linux/Fuchsia | x86_64       | `%%rdi`
+ //!     Linux               | ARM/ARM64    | `r0`/`x0`
+ //!     Linux               | MIPS/MIPS64  | `$a0`
++//!     Linux               | PPC64        | `r3`
+ //!
+ //!     Additionally, the value `LR` on ARM/ARM64 will be the return address of
+ //!     this function.
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/util/misc/capture_context_linux.S
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/util/misc/capture_context_linux.S
+@@ -32,7 +32,7 @@
+   .balign 4, 0x0
+   .type CAPTURECONTEXT_SYMBOL, %function
+   .type CAPTURECONTEXT_SYMBOL2, %function
+-#elif defined(__mips__)
++#elif defined(__mips__) || defined(__powerpc64__)
+   .balign 4, 0x0
+ #endif
+ 
+@@ -423,4 +423,214 @@ CAPTURECONTEXT_SYMBOL2:
+   jr $ra
+ 
+   .set at
++#elif defined(__powerpc64__)
++  // Store r0-r31
++  std 0, 0xe8(3)   // context->uc_mcontext.gp_regs[0]
++  std 1, 0xf0(3)   // context->uc_mcontext.gp_regs[1]
++  std 2, 0xf8(3)   // context->uc_mcontext.gp_regs[2]
++  // note that r3's original value was lost
++  std 3, 0x100(3)  // context->uc_mcontext.gp_regs[3]
++  std 4, 0x108(3)  // context->uc_mcontext.gp_regs[4]
++  std 5, 0x110(3)  // context->uc_mcontext.gp_regs[5]
++  std 6, 0x118(3)  // context->uc_mcontext.gp_regs[6]
++  std 7, 0x120(3)  // context->uc_mcontext.gp_regs[7]
++  std 8, 0x128(3)  // context->uc_mcontext.gp_regs[8]
++  std 9, 0x130(3)  // context->uc_mcontext.gp_regs[9]
++  std 10, 0x138(3) // context->uc_mcontext.gp_regs[10]
++  std 11, 0x140(3) // context->uc_mcontext.gp_regs[11]
++  std 12, 0x148(3) // context->uc_mcontext.gp_regs[12]
++  std 13, 0x150(3) // context->uc_mcontext.gp_regs[13]
++  std 14, 0x158(3) // context->uc_mcontext.gp_regs[14]
++  std 15, 0x160(3) // context->uc_mcontext.gp_regs[15]
++  std 16, 0x168(3) // context->uc_mcontext.gp_regs[16]
++  std 17, 0x170(3) // context->uc_mcontext.gp_regs[17]
++  std 18, 0x178(3) // context->uc_mcontext.gp_regs[18]
++  std 19, 0x180(3) // context->uc_mcontext.gp_regs[19]
++  std 20, 0x188(3) // context->uc_mcontext.gp_regs[20]
++  std 21, 0x190(3) // context->uc_mcontext.gp_regs[21]
++  std 22, 0x198(3) // context->uc_mcontext.gp_regs[22]
++  std 23, 0x1a0(3) // context->uc_mcontext.gp_regs[23]
++  std 24, 0x1a8(3) // context->uc_mcontext.gp_regs[24]
++  std 25, 0x1b0(3) // context->uc_mcontext.gp_regs[25]
++  std 26, 0x1b8(3) // context->uc_mcontext.gp_regs[26]
++  std 27, 0x1c0(3) // context->uc_mcontext.gp_regs[27]
++  std 28, 0x1c8(3) // context->uc_mcontext.gp_regs[28]
++  std 29, 0x1d0(3) // context->uc_mcontext.gp_regs[29]
++  std 30, 0x1d8(3) // context->uc_mcontext.gp_regs[30]
++  std 31, 0x1e0(3) // context->uc_mcontext.gp_regs[31]
++
++  // For NIP, we can use the value in the link register
++  mflr 0
++  std 0, 0x1e8(3) // context->uc_mcontext.gp_regs[PT_NIP]
++
++  // CTR
++  mfctr 0
++  std 0, 0x200(3) // context->uc_mcontext.gp_regs[PT_CTR]
++
++  // For LNK, we'll use the caller's LR save area (2 stack frames up).
++  // r4 can be used as a scratch register since it has already been saved.
++  ld 4, 0(1)
++  ld 4, 16(4)
++  std 4, 0x208(3) // context->uc_mcontext.gp_regs[PT_LNK]
++
++  // XER
++  mfxer 0
++  std 0, 0x210(3) // context->uc_mcontext.gp_regs[PT_XER]
++
++  // CCR
++  mfcr 0
++  std 0, 0x218(3) // context->uc_mcontext.gp_regs[PT_CCR]
++
++  // MSR, orig_r3, MQ, TRAP, DAR, DSISR, RESULT, DSCR,
++  // not used or not relevant,  zero them out.
++  li 4, 0
++  std 4, 0x1f0(3) // context->uc_mcontext.gp_regs[PT_MSR]
++  std 4, 0x1f8(3) // context->uc_mcontext.gp_regs[PT_ORIG_R3]
++  std 4, 0x220(3) // context->uc_mcontext.gp_regs[PT_MQ]
++  std 4, 0x228(3) // context->uc_mcontext.gp_regs[PT_TRAP]
++  std 4, 0x230(3) // context->uc_mcontext.gp_regs[PT_DAR]
++  std 4, 0x238(3) // context->uc_mcontext.gp_regs[PT_DSISR]
++  std 4, 0x240(3) // context->uc_mcontext.gp_regs[PT_RESULT]
++  std 4, 0x248(3) // context->uc_mcontext.gp_regs[PT_DSCR]
++
++  // Update context->uc_mcontext.regs to point to gp_regs
++  addi 0, 3, 0xe8
++  std 0, 0xe0(3)
++
++  // Save floating point registers 0-31
++  stfd 0, 0x268(3)  // context->uc_mcontext.fp_regs[0]
++  stfd 1, 0x270(3)  // context->uc_mcontext.fp_regs[1]
++  stfd 2, 0x278(3)  // context->uc_mcontext.fp_regs[2]
++  stfd 3, 0x280(3)  // context->uc_mcontext.fp_regs[3]
++  stfd 4, 0x288(3)  // context->uc_mcontext.fp_regs[4]
++  stfd 5, 0x290(3)  // context->uc_mcontext.fp_regs[5]
++  stfd 6, 0x298(3)  // context->uc_mcontext.fp_regs[6]
++  stfd 7, 0x2a0(3)  // context->uc_mcontext.fp_regs[7]
++  stfd 8, 0x2a8(3)  // context->uc_mcontext.fp_regs[8]
++  stfd 9, 0x2b0(3)  // context->uc_mcontext.fp_regs[9]
++  stfd 10, 0x2b8(3) // context->uc_mcontext.fp_regs[10]
++  stfd 11, 0x2c0(3) // context->uc_mcontext.fp_regs[11]
++  stfd 12, 0x2c8(3) // context->uc_mcontext.fp_regs[12]
++  stfd 13, 0x2d0(3) // context->uc_mcontext.fp_regs[13]
++  stfd 14, 0x2d8(3) // context->uc_mcontext.fp_regs[14]
++  stfd 15, 0x2e0(3) // context->uc_mcontext.fp_regs[15]
++  stfd 16, 0x2e8(3) // context->uc_mcontext.fp_regs[16]
++  stfd 17, 0x2f0(3) // context->uc_mcontext.fp_regs[17]
++  stfd 18, 0x2f8(3) // context->uc_mcontext.fp_regs[18]
++  stfd 19, 0x300(3) // context->uc_mcontext.fp_regs[19]
++  stfd 20, 0x308(3) // context->uc_mcontext.fp_regs[20]
++  stfd 21, 0x310(3) // context->uc_mcontext.fp_regs[21]
++  stfd 22, 0x318(3) // context->uc_mcontext.fp_regs[22]
++  stfd 23, 0x320(3) // context->uc_mcontext.fp_regs[23]
++  stfd 24, 0x328(3) // context->uc_mcontext.fp_regs[24]
++  stfd 25, 0x330(3) // context->uc_mcontext.fp_regs[25]
++  stfd 26, 0x338(3) // context->uc_mcontext.fp_regs[26]
++  stfd 27, 0x340(3) // context->uc_mcontext.fp_regs[27]
++  stfd 28, 0x348(3) // context->uc_mcontext.fp_regs[28]
++  stfd 29, 0x350(3) // context->uc_mcontext.fp_regs[29]
++  stfd 30, 0x358(3) // context->uc_mcontext.fp_regs[30]
++  stfd 31, 0x360(3) // context->uc_mcontext.fp_regs[31]
++
++  // FPSCR
++  mffs 0
++  stfd 0, 0x368(3) // context->uc_mcontext.fp_regs[32]
++
++  // Save VMX Vector registers
++  // Update r4 to contain the base address of vmx_reserve
++  addi 4, 3, 0x378
++  // Ensure that it is quadword aligned
++  andi. 5, 4, 0xF
++  beq 1f // No alignment is necessary
++  // Address is doubleword aligned and not quadword aligned, add 8
++  addi 4, 4, 8
++
++1:
++  // Store VMX registers 0-31
++  // r4 will contain the base address
++  // r5 will contain the index
++  li 5, 0
++  stvx 0, 4, 5   // context->uc_mcontext.vmx_reserve[(align) + 0]
++  addi 5, 5, 16
++  stvx 1, 4, 5   // context->uc_mcontext.vmx_reserve[(align) + 1]
++  addi 5, 5, 16
++  stvx 2, 4, 5   // context->uc_mcontext.vmx_reserve[(align) + 2]
++  addi 5, 5, 16
++  stvx 3, 4, 5   // context->uc_mcontext.vmx_reserve[(align) + 3]
++  addi 5, 5, 16
++  stvx 4, 4, 5   // context->uc_mcontext.vmx_reserve[(align) + 4]
++  addi 5, 5, 16
++  stvx 5, 4, 5   // context->uc_mcontext.vmx_reserve[(align) + 5]
++  addi 5, 5, 16
++  stvx 6, 4, 5   // context->uc_mcontext.vmx_reserve[(align) + 6]
++  addi 5, 5, 16
++  stvx 7, 4, 5   // context->uc_mcontext.vmx_reserve[(align) + 7]
++  addi 5, 5, 16
++  stvx 8, 4, 5   // context->uc_mcontext.vmx_reserve[(align) + 8]
++  addi 5, 5, 16
++  stvx 9, 4, 5   // context->uc_mcontext.vmx_reserve[(align) + 9]
++  addi 5, 5, 16
++  stvx 10, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 10]
++  addi 5, 5, 16
++  stvx 11, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 11]
++  addi 5, 5, 16
++  stvx 12, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 12]
++  addi 5, 5, 16
++  stvx 13, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 13]
++  addi 5, 5, 16
++  stvx 14, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 14]
++  addi 5, 5, 16
++  stvx 15, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 15]
++  addi 5, 5, 16
++  stvx 16, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 16]
++  addi 5, 5, 16
++  stvx 17, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 17]
++  addi 5, 5, 16
++  stvx 18, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 18]
++  addi 5, 5, 16
++  stvx 19, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 19]
++  addi 5, 5, 16
++  stvx 20, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 20]
++  addi 5, 5, 16
++  stvx 21, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 21]
++  addi 5, 5, 16
++  stvx 22, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 22]
++  addi 5, 5, 16
++  stvx 23, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 23]
++  addi 5, 5, 16
++  stvx 24, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 24]
++  addi 5, 5, 16
++  stvx 25, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 25]
++  addi 5, 5, 16
++  stvx 26, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 26]
++  addi 5, 5, 16
++  stvx 27, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 27]
++  addi 5, 5, 16
++  stvx 28, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 28]
++  addi 5, 5, 16
++  stvx 29, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 29]
++  addi 5, 5, 16
++  stvx 30, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 30]
++  addi 5, 5, 16
++  stvx 31, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 31]
++  addi 5, 5, 16
++
++  // VSCR
++  mfvscr 0
++  stvx 0, 4, 5
++  addi 5, 5, 16
++
++  // VRSAVE
++  mfvrsave 0
++  stwx 0, 4, 5
++
++  // Update context->uc_mcontext.v_regs to point to vmx_reserve + alignment.
++  std 4, 0x370(3)
++
++  // Zero out all unused fields
++  li 4, 0
++  std 4, 0xc8(3) // context->uc_mcontext.signal
++  std 4, 0xd0(3) // context->uc_mcontext.handler
++  std 4, 0xd8(3) // context->uc_mcontext.oldmask
++
++  blr
+ #endif  // __i386__
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/util/misc/capture_context_test.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/util/misc/capture_context_test.cc
+@@ -57,7 +57,7 @@ void TestCaptureContext() {
+   uintptr_t pc = ProgramCounterFromContext(context_1);
+ 
+ #if !defined(ADDRESS_SANITIZER) && !defined(ARCH_CPU_MIPS_FAMILY) && \
+-    !defined(MEMORY_SANITIZER)
++    !defined(MEMORY_SANITIZER) && !defined(ARCH_CPU_PPC64_FAMILY)
+   // Sanitizers can cause enough code bloat that the “nearby” check would
+   // likely fail.
+   const uintptr_t kReferencePC =
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/util/misc/capture_context_test_util_linux.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/util/misc/capture_context_test_util_linux.cc
+@@ -35,6 +35,8 @@ void SanityCheckContext(const NativeCPUC
+   EXPECT_EQ(context.uc_mcontext.regs[0], FromPointerCast<uintptr_t>(&context));
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+   EXPECT_EQ(context.uc_mcontext.gregs[4], FromPointerCast<uintptr_t>(&context));
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++  EXPECT_EQ(context.uc_mcontext.gp_regs[3], FromPointerCast<uintptr_t>(&context));
+ #endif
+ }
+ 
+@@ -49,6 +51,8 @@ uintptr_t ProgramCounterFromContext(cons
+   return context.uc_mcontext.pc;
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+   return context.uc_mcontext.pc;
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++  return context.uc_mcontext.gp_regs[PT_NIP];
+ #endif
+ }
+ 
+@@ -63,6 +67,8 @@ uintptr_t StackPointerFromContext(const
+   return context.uc_mcontext.sp;
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+   return context.uc_mcontext.gregs[29];
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++  return context.uc_mcontext.gp_regs[1];
+ #endif
+ }
+ 
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/util/posix/signals_test.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/util/posix/signals_test.cc
+@@ -46,9 +46,9 @@ bool CanCauseSignal(int sig) {
+   return sig == SIGABRT ||
+          sig == SIGALRM ||
+          sig == SIGBUS ||
+-#if !defined(ARCH_CPU_ARM64)
++#if !defined(ARCH_CPU_ARM64) && !defined(ARCH_CPU_PPC64)
+          sig == SIGFPE ||
+-#endif  // !defined(ARCH_CPU_ARM64)
++#endif  // !defined(ARCH_CPU_ARM64) && !defined(ARCH_CPU_PPC64)
+ #if defined(ARCH_CPU_X86_FAMILY) || defined(ARCH_CPU_ARMEL)
+          sig == SIGILL ||
+ #endif  // defined(ARCH_CPU_X86_FAMILY) || defined(ARCH_CPU_ARMEL)
+@@ -117,9 +117,11 @@ void CauseSignal(int sig) {
+       break;
+     }
+ 
+-#if !defined(ARCH_CPU_ARM64)
++#if !defined(ARCH_CPU_ARM64) && !defined(ARCH_CPU_PPC64)
+     // ARM64 has hardware integer division instructions that don’t generate a
+     // trap for divide-by-zero, so this doesn’t produce SIGFPE.
++    //
++    // PPC64 fixed-point division by zero also doesn't produce a SIGFPE.
+     case SIGFPE: {
+       // Optimization makes this tricky, so get zero from a system call likely
+       // to succeed, and try to do something with the result.
+@@ -137,7 +139,7 @@ void CauseSignal(int sig) {
+       fstat(quotient, &stat_buf);
+       break;
+     }
+-#endif  // ARCH_CPU_ARM64
++#endif  // !defined(ARCH_CPU_ARM64) && !defined(ARCH_CPU_PPC64)
+ 
+ #if defined(ARCH_CPU_X86_FAMILY) || defined(ARCH_CPU_ARMEL)
+     case SIGILL: {
+--- a/src/3rdparty/chromium/third_party/dav1d/BUILD.gn
++++ b/src/3rdparty/chromium/third_party/dav1d/BUILD.gn
+@@ -196,6 +196,8 @@ static_library("dav1d_8bit") {
+     sources += arm_template_sources
+   } else if (current_cpu == "arm64") {
+     sources += arm_template_sources
++  } else if (current_cpu == "ppc64") {
++    sources += ppc64_template_sources
+   }
+ 
+   cflags = dav1d_copts
+@@ -226,6 +228,8 @@ static_library("dav1d_10bit") {
+     sources += arm_template_sources
+   } else if (current_cpu == "arm64") {
+     sources += arm_template_sources
++  } else if (current_cpu == "ppc64") {
++    sources += ppc64_template_sources
+   }
+ 
+   cflags = dav1d_copts
+@@ -283,6 +287,21 @@ if (current_cpu == "x86" || current_cpu
+     }
+ 
+     cflags = dav1d_copts
++  }
++} else if (current_cpu == "ppc64") {
++  static_library("dav1d_ppc") {
++    sources = [
++      "libdav1d/src/ppc/cpu.c",
++      "libdav1d/src/ppc/cpu.h",
++    ]
++
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [
++      "//build/config/compiler:no_chromium_code",
++      ":dav1d_config",
++    ]
++
++    cflags = dav1d_copts
+ 
+     deps = [ ":dav1d_headers" ]
+     allow_circular_includes_from = [ ":dav1d_headers" ]
+@@ -315,5 +334,7 @@ static_library("dav1d") {
+     }
+   } else if (current_cpu == "arm" || current_cpu == "arm64") {
+     deps += [ ":dav1d_arm" ]
++  } else if (current_cpu == "ppc64") {
++    deps += [ ":dav1d_ppc" ]
+   }
+ }
+--- a/src/3rdparty/chromium/third_party/dav1d/dav1d_generated.gni
++++ b/src/3rdparty/chromium/third_party/dav1d/dav1d_generated.gni
+@@ -103,6 +103,11 @@ arm_template_sources = [
+   "libdav1d/src/arm/mc_init_tmpl.c",
+ ]
+ 
++ppc64_template_sources = [
++  "libdav1d/src/ppc/cdef_init_tmpl.c",
++  "libdav1d/src/ppc/looprestoration_init_tmpl.c",
++]
++
+ template_sources = [
+   "libdav1d/src/cdef_apply_tmpl.c",
+   "libdav1d/src/cdef_tmpl.c",
+--- a/src/3rdparty/chromium/third_party/dav1d/generate_source.py
++++ b/src/3rdparty/chromium/third_party/dav1d/generate_source.py
+@@ -57,6 +57,8 @@ def _WriteGn(fd):
+   _WriteArray(fd, "arm64_asm_sources", _Glob("libdav1d/src/arm/64/*.S"))
+   _WriteArray(fd, "arm_template_sources", _Glob("libdav1d/src/arm/*_tmpl.c"))
+ 
++  _WriteArray(fd, "ppc64_template_sources", _Glob("libdav1d/src/ppc/*_tmpl.c"))
++
+   template_sources = _Glob("libdav1d/src/*_tmpl.c")
+   _WriteArray(fd, "template_sources", template_sources)
+ 
+--- a/src/3rdparty/chromium/third_party/dav1d/libdav1d/src/ppc/types.h
++++ b/src/3rdparty/chromium/third_party/dav1d/libdav1d/src/ppc/types.h
+@@ -51,4 +51,19 @@
+ #define u16l_to_i32(v) ((i32x4) vec_mergel((u16x8) v, vec_splat_u16(0)))
+ #define i16l_to_i32(v) ((i32x4) vec_unpackl((i16x8)v))
+ 
++#if defined(__clang__)
++#undef vec_splats
++#define vec_splats(N)                     \
++    _Generic((N),                         \
++        unsigned char:      ((u8x16)(N)), \
++        signed char:        ((i8x16)(N)), \
++        unsigned short:     ((u16x8)(N)), \
++        signed short:       ((i16x8)(N)), \
++        unsigned int:       ((u32x4)(N)), \
++        signed int:         ((i32x4)(N)), \
++        unsigned long long: ((u64x2)(N)), \
++        signed long long:   ((i64x2)(N))  \
++    )
++#endif
++
+ #endif /* DAV1D_SRC_PPC_TYPES_H */
+--- a/src/3rdparty/chromium/third_party/eigen3/BUILD.gn
++++ b/src/3rdparty/chromium/third_party/eigen3/BUILD.gn
+@@ -22,4 +22,8 @@ config("eigen_includes") {
+     # for this component on Windows on Arm due to compilation errors.
+     defines += [ "EIGEN_DONT_VECTORIZE" ]
+   }
++
++  if (target_cpu == "ppc64") {
++    defines += [ "EIGEN_DONT_VECTORIZE" ]
++  }
+ }
+--- a/src/3rdparty/chromium/third_party/libaom/BUILD.gn
++++ b/src/3rdparty/chromium/third_party/libaom/BUILD.gn
+@@ -37,6 +37,8 @@ if (enable_libaom) {
+     } else {
+       cpu_arch_full = "arm"
+     }
++  } else if (current_cpu == "ppc64") {
++    cpu_arch_full = "generic"
+   } else {
+     cpu_arch_full = current_cpu
+   }
+--- a/src/3rdparty/chromium/third_party/libgav1/options.gni
++++ b/src/3rdparty/chromium/third_party/libgav1/options.gni
+@@ -12,5 +12,5 @@ declare_args() {
+       is_chromeos_ash && (target_cpu == "arm" || target_cpu == "arm64")
+   use_libgav1_parser =
+       (is_chromeos || is_linux || is_win) &&
+-      (target_cpu == "x86" || target_cpu == "x64" || target_cpu == "arm64")
++      (target_cpu == "x86" || target_cpu == "x64" || target_cpu == "arm64" || target_cpu == "ppc64")
+ }
+--- a/src/3rdparty/chromium/third_party/lss/linux_syscall_support.h
++++ b/src/3rdparty/chromium/third_party/lss/linux_syscall_support.h
+@@ -4262,7 +4262,7 @@ struct kernel_statfs {
+       LSS_REG(2, buf);
+       LSS_BODY(void*, mmap2, "0"(__r2));
+     }
+-#else
++#elif !defined(__powerpc64__) /* ppc64 doesn't have mmap2 */
+     #define __NR__mmap2 __NR_mmap2
+     LSS_INLINE _syscall6(void*, _mmap2,            void*, s,
+                          size_t,                   l, int,               p,
+@@ -4373,7 +4373,7 @@ struct kernel_statfs {
+   #if defined(__i386__) ||                                                    \
+       defined(__ARM_ARCH_3__) || defined(__ARM_EABI__) ||                     \
+      (defined(__mips__) && _MIPS_SIM == _MIPS_SIM_ABI32) ||                   \
+-      defined(__PPC__) ||                                                     \
++     (defined(__PPC__) && !defined(__powerpc64__)) ||                                                     \
+      (defined(__s390__) && !defined(__s390x__))
+     /* On these architectures, implement mmap() with mmap2(). */
+     LSS_INLINE void* LSS_NAME(mmap)(void *s, size_t l, int p, int f, int d,
+@@ -4556,9 +4556,17 @@ struct kernel_statfs {
+     }
+   #endif
+   #if defined(__NR_fstatat64)
++    #if !defined(__GLIBC__)
++        // musl doesn't define fstatat64 fstatat
++        #undef fstatat64
++    #endif
+     LSS_INLINE _syscall4(int,   fstatat64,        int,   d,
+                          const char *,      p,
+                          struct kernel_stat64 *,   b,    int,   f)
++    #if !defined(__GLIBC__)
++    	// then restore it
++        #define fstatat64 fstatat
++    #endif
+   #endif
+   #if defined(__NR_waitpid)
+     // waitpid is polyfilled below when not available.
+--- a/src/3rdparty/chromium/third_party/pdfium/third_party/libpng16/pngpriv.h
++++ b/src/3rdparty/chromium/third_party/pdfium/third_party/libpng16/pngpriv.h
+@@ -196,11 +196,7 @@
+ #endif
+ 
+ #ifndef PNG_POWERPC_VSX_OPT
+-#  if defined(__PPC64__) && defined(__ALTIVEC__) && defined(__VSX__)
+-#     define PNG_POWERPC_VSX_OPT 2
+-#  else
+-#     define PNG_POWERPC_VSX_OPT 0
+-#  endif
++#  define PNG_POWERPC_VSX_OPT 0
+ #endif
+ 
+ #ifndef PNG_INTEL_SSE_OPT
+--- a/src/3rdparty/chromium/third_party/pffft/src/pffft.c
++++ b/src/3rdparty/chromium/third_party/pffft/src/pffft.c
+@@ -100,6 +100,7 @@
+    Altivec support macros 
+ */
+ #if !defined(PFFFT_SIMD_DISABLE) && (defined(__ppc__) || defined(__ppc64__))
++#include <altivec.h>
+ typedef vector float v4sf;
+ #  define SIMD_SZ 4
+ #  define VZERO() ((vector float) vec_splat_u8(0))
+--- a/src/3rdparty/chromium/third_party/skia/src/sksl/SkSLString.cpp
++++ b/src/3rdparty/chromium/third_party/skia/src/sksl/SkSLString.cpp
+@@ -142,7 +142,12 @@ String to_string(double value) {
+     if (needsDotZero) {
+         buffer << ".0";
+     }
+-    return String(buffer.str().c_str());
++
++    std::string ret(buffer.str());
++    if (signbit(value) && ret[0] == '.') {
++        ret[0] = '-';
++    }
++    return String(ret.c_str());
+ }
+ 
+ bool stod(const skstd::string_view& s, SKSL_FLOAT* value) {
+--- a/src/3rdparty/chromium/third_party/sqlite/src/amalgamation/sqlite3.c
++++ b/src/3rdparty/chromium/third_party/sqlite/src/amalgamation/sqlite3.c
+@@ -14628,7 +14628,8 @@ typedef INT16_TYPE LogEst;
+ # if defined(i386)      || defined(__i386__)      || defined(_M_IX86) ||    \
+      defined(__x86_64)  || defined(__x86_64__)    || defined(_M_X64)  ||    \
+      defined(_M_AMD64)  || defined(_M_ARM)        || defined(__x86)   ||    \
+-     defined(__ARMEL__) || defined(__AARCH64EL__) || defined(_M_ARM64)
++     defined(__ARMEL__) || defined(__AARCH64EL__) || defined(_M_ARM64) ||   \
++     defined(__powerpc64__) && (__BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__)
+ #   define SQLITE_BYTEORDER    1234
+ # elif defined(sparc)     || defined(__ppc__) || \
+        defined(__ARMEB__) || defined(__AARCH64EB__)
+--- a/src/3rdparty/chromium/third_party/sqlite/src/amalgamation_dev/sqlite3.c
++++ b/src/3rdparty/chromium/third_party/sqlite/src/amalgamation_dev/sqlite3.c
+@@ -14641,7 +14641,8 @@ typedef INT16_TYPE LogEst;
+ # if defined(i386)      || defined(__i386__)      || defined(_M_IX86) ||    \
+      defined(__x86_64)  || defined(__x86_64__)    || defined(_M_X64)  ||    \
+      defined(_M_AMD64)  || defined(_M_ARM)        || defined(__x86)   ||    \
+-     defined(__ARMEL__) || defined(__AARCH64EL__) || defined(_M_ARM64)
++     defined(__ARMEL__) || defined(__AARCH64EL__) || defined(_M_ARM64) ||   \
++     defined(__powerpc64__) && (__BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__)
+ #   define SQLITE_BYTEORDER    1234
+ # elif defined(sparc)     || defined(__ppc__) || \
+        defined(__ARMEB__) || defined(__AARCH64EB__)
+--- a/src/3rdparty/chromium/third_party/sqlite/src/ext/rtree/rtree.c
++++ b/src/3rdparty/chromium/third_party/sqlite/src/ext/rtree/rtree.c
+@@ -450,7 +450,7 @@ struct RtreeMatchArg {
+ #if defined(i386)     || defined(__i386__)   || defined(_M_IX86) ||    \
+     defined(__x86_64) || defined(__x86_64__) || defined(_M_X64)  ||    \
+     defined(_M_AMD64) || defined(_M_ARM)     || defined(__x86)   ||    \
+-    defined(__arm__)
++    defined(__arm__) || defined(__powerpc64__) && (__BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__)
+ # define SQLITE_BYTEORDER    1234
+ #elif defined(sparc)    || defined(__ppc__)
+ # define SQLITE_BYTEORDER    4321
+--- a/src/3rdparty/chromium/third_party/sqlite/src/src/sqliteInt.h
++++ b/src/3rdparty/chromium/third_party/sqlite/src/src/sqliteInt.h
+@@ -890,7 +890,8 @@ typedef INT16_TYPE LogEst;
+ # if defined(i386)      || defined(__i386__)      || defined(_M_IX86) ||    \
+      defined(__x86_64)  || defined(__x86_64__)    || defined(_M_X64)  ||    \
+      defined(_M_AMD64)  || defined(_M_ARM)        || defined(__x86)   ||    \
+-     defined(__ARMEL__) || defined(__AARCH64EL__) || defined(_M_ARM64)
++     defined(__ARMEL__) || defined(__AARCH64EL__) || defined(_M_ARM64) || \
++     defined(__powerpc64__) && (__BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__)
+ #   define SQLITE_BYTEORDER    1234
+ # elif defined(sparc)     || defined(__ppc__) || \
+        defined(__ARMEB__) || defined(__AARCH64EB__)
+--- a/src/3rdparty/chromium/third_party/webrtc/modules/desktop_capture/differ_block.cc
++++ b/src/3rdparty/chromium/third_party/webrtc/modules/desktop_capture/differ_block.cc
+@@ -30,11 +30,7 @@ bool VectorDifference(const uint8_t* ima
+   static bool (*diff_proc)(const uint8_t*, const uint8_t*) = nullptr;
+ 
+   if (!diff_proc) {
+-#if defined(WEBRTC_ARCH_ARM_FAMILY) || defined(WEBRTC_ARCH_MIPS_FAMILY)
+-    // For ARM and MIPS processors, always use C version.
+-    // TODO(hclam): Implement a NEON version.
+-    diff_proc = &VectorDifference_C;
+-#else
++#if defined(WEBRTC_ARCH_X86_FAMILY)
+     bool have_sse2 = GetCPUInfo(kSSE2) != 0;
+     // For x86 processors, check if SSE2 is supported.
+     if (have_sse2 && kBlockSize == 32) {
+@@ -44,6 +40,10 @@ bool VectorDifference(const uint8_t* ima
+     } else {
+       diff_proc = &VectorDifference_C;
+     }
++#else
++    // For other processors, always use C version.
++    // TODO(hclam): Implement a NEON version.
++    diff_proc = &VectorDifference_C;
+ #endif
+   }
+ 
+--- a/src/3rdparty/chromium/v8/BUILD.gn
++++ b/src/3rdparty/chromium/v8/BUILD.gn
+@@ -1083,6 +1083,12 @@ config("toolchain") {
+     }
+     if (host_byteorder == "little") {
+       defines += [ "V8_TARGET_ARCH_PPC_LE" ]
++      cflags += [
++        # Enable usage of AltiVec, VSX, and other POWER8 and higher features
++        "-mcpu=power8",
++        "-maltivec",
++        "-mvsx",
++      ]
+     } else if (host_byteorder == "big") {
+       defines += [ "V8_TARGET_ARCH_PPC_BE" ]
+       if (current_os == "aix") {
+--- a/src/3rdparty/chromium/ui/gl/features.gni
++++ b/src/3rdparty/chromium/ui/gl/features.gni
+@@ -35,7 +35,8 @@ declare_args() {
+                         (is_mac && use_egl) || is_chromeos_ash || is_fuchsia) &&
+                        (target_cpu == "x86" || target_cpu == "x64" ||
+                         target_cpu == "arm" || target_cpu == "arm64" ||
+-                        target_cpu == "mipsel" || target_cpu == "mips64el")
++                        target_cpu == "mipsel" || target_cpu == "mips64el" ||
++                        target_cpu == "ppc64")
+ }
+ 
+ use_glx = use_x11 || ozone_platform_x11
+--- a/src/3rdparty/chromium/v8/test/BUILD.gn
++++ b/src/3rdparty/chromium/v8/test/BUILD.gn
+@@ -42,7 +42,6 @@ group("gn_all") {
+       "benchmarks/cpp:gn_all",
+       "cctest:cctest",
+       "cctest:generate-bytecode-expectations",
+-      "unittests:unittests",
+     ]
+   }
+ }
+@@ -84,7 +83,6 @@ group("v8_bot_default") {
+     "message:v8_message",
+     "mjsunit:v8_mjsunit",
+     "mkgrokdump:mkgrokdump",
+-    "unittests:unittests",
+     "webkit:v8_webkit",
+   ]
+ 
+@@ -109,7 +107,6 @@ group("v8_default") {
+     "message:v8_message",
+     "mjsunit:v8_mjsunit",
+     "mkgrokdump:mkgrokdump",
+-    "unittests:unittests",
+   ]
+ 
+   if (v8_enable_webassembly) {
+--- /dev/null
++++ b/src/3rdparty/chromium/dev/null
+@@ -0,0 +1,39 @@
++/*
++ * Autogenerated by the Meson build system.
++ * Do not edit, your changes will be lost.
++ */
++
++#pragma once
++
++#define ARCH_AARCH64 0
++
++#define ARCH_ARM 0
++
++#define ARCH_PPC64LE 1
++
++#define ARCH_X86 0
++
++#define ARCH_X86_32 0
++
++#define ARCH_X86_64 0
++
++#define CONFIG_16BPC 1
++
++#define CONFIG_8BPC 1
++
++// #define CONFIG_LOG 1 -- Logging is controlled by Chromium
++
++#define ENDIANNESS_BIG 0
++
++#define HAVE_ASM 1
++
++#define HAVE_CLOCK_GETTIME 1
++
++#define HAVE_DLSYM 1
++
++#define HAVE_GETAUXVAL 1
++
++#define HAVE_POSIX_MEMALIGN 1
++
++#define HAVE_UNISTD_H 1
++
+--- a/src/3rdparty/chromium/third_party/abseil-cpp/absl/base/internal/unscaledcycleclock.h
++++ b/src/3rdparty/chromium/third_party/abseil-cpp/absl/base/internal/unscaledcycleclock.h
+@@ -46,7 +46,7 @@
+ 
+ // The following platforms have an implementation of a hardware counter.
+ #if defined(__i386__) || defined(__x86_64__) || defined(__aarch64__) || \
+-  defined(__powerpc__) || defined(__ppc__) || \
++  ((defined(__powerpc__) || defined(__ppc__)) && defined(__GLIBC__)) || \
+   defined(_M_IX86) || defined(_M_X64)
+ #define ABSL_HAVE_UNSCALED_CYCLECLOCK_IMPLEMENTATION 1
+ #else
+--- a/src/3rdparty/chromium/third_party/abseil-cpp/absl/debugging/internal/stacktrace_config.h
++++ b/src/3rdparty/chromium/third_party/abseil-cpp/absl/debugging/internal/stacktrace_config.h
+@@ -59,7 +59,7 @@
+ #elif defined(__i386__) || defined(__x86_64__)
+ #define ABSL_STACKTRACE_INL_HEADER \
+   "absl/debugging/internal/stacktrace_x86-inl.inc"
+-#elif defined(__ppc__) || defined(__PPC__)
++#elif defined(__ppc__) || defined(__PPC__) && defined(__GLIBC__)
+ #define ABSL_STACKTRACE_INL_HEADER \
+   "absl/debugging/internal/stacktrace_powerpc-inl.inc"
+ #elif defined(__aarch64__)
+--- a/src/3rdparty/chromium/base/allocator/partition_allocator/partition_alloc_config.h
++++ b/src/3rdparty/chromium/base/allocator/partition_allocator/partition_alloc_config.h
+@@ -100,7 +100,8 @@ static_assert(sizeof(void*) != 8, "");
+ // PUT_REF_COUNT_IN_PREVIOUS_SLOT does. In this case the refcount overlaps with
+ // the next pointer shadow for the smallest bucket.
+ #if !(defined(OS_MAC) && defined(ARCH_CPU_ARM64)) && \
+-    !BUILDFLAG(PUT_REF_COUNT_IN_PREVIOUS_SLOT)
++    !BUILDFLAG(PUT_REF_COUNT_IN_PREVIOUS_SLOT) && \
++    (!defined(__GLIBC) && !defined(__powerpc64__))
+ #define PA_HAS_FREELIST_HARDENING
+ #endif
+ 
+--- a/src/3rdparty/chromium/build/download_nacl_toolchains.py
++++ b/src/3rdparty/chromium/build/download_nacl_toolchains.py
+@@ -13,6 +13,8 @@ import sys
+ 
+ 
+ def Main(args):
++  if 'disable_nacl=1' in os.environ.get('GYP_DEFINES', ''):
++    return 0
+   script_dir = os.path.dirname(os.path.abspath(__file__))
+   src_dir = os.path.dirname(script_dir)
+   nacl_dir = os.path.join(src_dir, 'native_client')
+--- a/src/3rdparty/chromium/chrome/installer/linux/BUILD.gn
++++ b/src/3rdparty/chromium/chrome/installer/linux/BUILD.gn
+@@ -100,8 +100,6 @@ packaging_files = packaging_files_binari
+                     "$root_out_dir/xdg-mime",
+                     "$root_out_dir/xdg-settings",
+                     "$root_out_dir/locales/en-US.pak",
+-                    "$root_out_dir/MEIPreload/manifest.json",
+-                    "$root_out_dir/MEIPreload/preloaded_data.pb",
+                   ]
+ 
+ action_foreach("calculate_deb_dependencies") {
+@@ -321,7 +319,6 @@ group("installer_deps") {
+     ":theme_files",
+     "//chrome",
+     "//chrome:packed_resources",
+-    "//chrome/browser/resources/media/mei_preload:component",
+     "//components/crash/core/app:chrome_crashpad_handler",
+     "//sandbox/linux:chrome_sandbox",
+   ]
+--- /dev/null
++++ b/src/3rdparty/chromium/sandbox/linux/system_headers/ppc64_linux_syscalls.h
+@@ -0,0 +1,12 @@
++// Copyright 2014 The Chromium Authors. All rights reserved.
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++#ifndef SANDBOX_LINUX_SYSTEM_HEADERS_PPC64_LINUX_SYSCALLS_H_
++#define SANDBOX_LINUX_SYSTEM_HEADERS_PPC64_LINUX_SYSCALLS_H_
++
++#include <asm/unistd.h>
++
++//TODO: is it necessary to redefine syscall numbers for PPC64?
++
++#endif  // SANDBOX_LINUX_SYSTEM_HEADERS_PPC64_LINUX_SYSCALLS_H_
+--- /dev/null
++++ b/src/3rdparty/chromium/sandbox/linux/system_headers/ppc64_linux_ucontext.h
+@@ -0,0 +1,12 @@
++// Copyright 2014 The Chromium Authors. All rights reserved.
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++#ifndef SANDBOX_LINUX_SYSTEM_HEADERS_PPC64_LINUX_UCONTEXT_H_
++#define SANDBOX_LINUX_SYSTEM_HEADERS_PPC64_LINUX_UCONTEXT_H_
++
++#include <sys/ucontext.h>
++
++//TODO: is it necessary to redefine ucontext on PPC64?
++
++#endif  // SANDBOX_LINUX_SYSTEM_HEADERS_PPC64_LINUX_UCONTEXT_H_
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/util/net/http_transport_libcurl.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/util/net/http_transport_libcurl.cc
+@@ -236,6 +236,12 @@ std::string UserAgent() {
+ #elif defined(ARCH_CPU_BIG_ENDIAN)
+     static constexpr char arch[] = "aarch64_be";
+ #endif
++#elif defined(__powerpc64__)
++#if defined(ARCH_CPU_LITTLE_ENDIAN)
++    static constexpr char arch[] = "ppc64le";
++#elif defined(ARCH_CPU_BIG_ENDIAN)
++    static constexpr char arch[] = "ppc64";
++#endif
+ #else
+ #error Port
+ #endif
+--- /dev/null
++++ b/src/3rdparty/chromium/third_party/dav1d/config/linux/ppc64/config.h
+@@ -0,0 +1,39 @@
++/*
++ * Autogenerated by the Meson build system.
++ * Do not edit, your changes will be lost.
++ */
++
++#pragma once
++
++#define ARCH_AARCH64 0
++
++#define ARCH_ARM 0
++
++#define ARCH_PPC64LE 1
++
++#define ARCH_X86 0
++
++#define ARCH_X86_32 0
++
++#define ARCH_X86_64 0
++
++#define CONFIG_16BPC 1
++
++#define CONFIG_8BPC 1
++
++// #define CONFIG_LOG 1 -- Logging is controlled by Chromium
++
++#define ENDIANNESS_BIG 0
++
++#define HAVE_ASM 1
++
++#define HAVE_CLOCK_GETTIME 1
++
++#define HAVE_DLSYM 1
++
++#define HAVE_GETAUXVAL 1
++
++#define HAVE_POSIX_MEMALIGN 1
++
++#define HAVE_UNISTD_H 1
++
diff --git a/srcpkgs/qt6-webengine/patches/0903-xxx-ppc64le-swiftshader.patch b/srcpkgs/qt6-webengine/patches/0903-xxx-ppc64le-swiftshader.patch
new file mode 100644
index 000000000000..1a8cd8368da1
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0903-xxx-ppc64le-swiftshader.patch
@@ -0,0 +1,18 @@
+--- a/src/3rdparty/chromium/third_party/swiftshader/third_party/llvm-10.0/BUILD.gn
++++ b/src/3rdparty/chromium/third_party/swiftshader/third_party/llvm-10.0/BUILD.gn
+@@ -576,6 +576,7 @@ swiftshader_llvm_source_set("swiftshader
+     "llvm/lib/MC/MCAsmInfoCOFF.cpp",
+     "llvm/lib/MC/MCAsmInfoDarwin.cpp",
+     "llvm/lib/MC/MCAsmInfoELF.cpp",
++    "llvm/lib/MC/MCAsmInfoXCOFF.cpp",
+     "llvm/lib/MC/MCAsmMacro.cpp",
+     "llvm/lib/MC/MCAsmStreamer.cpp",
+     "llvm/lib/MC/MCAssembler.cpp",
+@@ -631,6 +632,7 @@ swiftshader_llvm_source_set("swiftshader
+     "llvm/lib/MC/MCWinCOFFStreamer.cpp",
+     "llvm/lib/MC/MCWinEH.cpp",
+     "llvm/lib/MC/MCXCOFFStreamer.cpp",
++    "llvm/lib/MC/MCXCOFFObjectTargetWriter.cpp",
+     "llvm/lib/MC/MachObjectWriter.cpp",
+     "llvm/lib/MC/StringTableBuilder.cpp",
+     "llvm/lib/MC/SubtargetFeature.cpp",
diff --git a/srcpkgs/qt6-webengine/template b/srcpkgs/qt6-webengine/template
new file mode 100644
index 000000000000..5a8bb7552305
--- /dev/null
+++ b/srcpkgs/qt6-webengine/template
@@ -0,0 +1,150 @@
+# Template file for 'qt6-webengine'
+pkgname=qt6-webengine
+version=6.3.1
+revision=1
+wrksrc="qtwebengine-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DQT_HOST_PATH=/usr -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true
+ -DQT_FEATURE_webengine_system_ffmpeg=ON
+ -DQT_FEATURE_webengine_system_libevent=ON
+ -DQT_FEATURE_webengine_system_gn=ON
+ -DQT_FEATURE_webengine_system_icu=ON
+ -DQT_FEATURE_webengine_webrtc_pipewire=ON
+ -DNinja_EXECUTABLE=$XBPS_WRAPPERDIR/ninja
+ -DPKG_CONFIG_HOST_EXECUTABLE=${PKG_CONFIG_FOR_BUILD}"
+hostmakedepends="qt6-base-devel perl pkg-config nodejs python3-html5lib
+ qt6-declarative-devel protobuf gperf flex nss-devel libwebp-devel
+ icu-devel libevent-devel"
+makedepends="qt6-base-devel qt6-declarative-devel pulseaudio-devel
+ qt6-tools-devel qt6-quickcontrols2-devel qt6-websockets-devel
+ libflac-devel
+ alsa-lib-devel libvpx-devel pciutils-devel opus-devel libxslt-devel
+ libxml2-devel freetype-devel lcms2-devel libwebp-devel icu-devel
+ re2-devel zlib-devel libpng-devel minizip-devel harfbuzz-devel
+ nss-devel libXcursor-devel libXcomposite-devel libXScrnSaver-devel
+ protobuf-devel ffmpeg-devel snappy-devel libevent-devel pipewire-devel
+ libxkbfile-devel qt6-location-devel qt6-webchannel-devel libxshmfence-devel"
+short_desc="Cross-platform application and UI framework - Webengine"
+maintainer="John <me@johnnynator.dev>"
+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=ad7a33b21a956deda37c587d50f821ca3816403ae31ba9b5d59d01561ad66e47
+
+if [ -z "$CROSS_BUILD" ];then
+	configure_args+=" -DCMAKE_TOOLCHAIN_FILE=/usr/lib/cmake/Qt6/qt.toolchain.cmake"
+fi
+
+if [ "$XBPS_LIBC" = "musl" ]; then
+	hostmakedepends+=" musl-legacy-compat"
+fi
+
+if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
+	makedepends+=" musl-legacy-compat"
+fi
+
+if [ ! "$XBPS_WORDSIZE" = "$XBPS_TARGET_WORDSIZE" ]; then
+	broken="webengine can be built only if word size matches"
+fi
+
+if [ "$XBPS_WORDSIZE" -eq 32 ]; then
+	nodebug=yes
+	LDFLAGS="-Wl,--no-keep-memory"
+fi
+
+if [ "$XBPS_TARGET_ENDIAN" != "le" ]; then
+	broken="webengine only supports little endian"
+fi
+
+build_options="sndio"
+build_options_default=""
+desc_option_sndio="Enable support for sndio"
+
+
+_bootstrap_gn() {
+	# Bootstrap gn (generate ninja)
+	echo "Bootstrapping 'gn'"
+	cd ${wrksrc}/src/3rdparty/gn
+	CFLAGS="$CFLAGS_host" CXXFLAGS="$CXXFLAGS_host" LDFLAGS="$LDFLAGS_host" \
+	PKGCONFIG=/usr/bin/pkgconfig PKG_CONFIG_PATH="/usr/lib/pkgconfig:/usr/share/pkgconfig" \
+		python3 build/gen.py --no-last-commit-position --out-path \
+			${wrksrc}/src/3rdparty/gn/out/Release --cc "${CC_host:-$CC}" \
+			--cxx "${CXX_host:-$CXX}" --ld "${CXX_host:-$CXX}" --ar "${AR_host:-$AR}" \
+			--qt-version "${version}.qtwebengine.qt.io"
+	ninja -C out/Release gn
+	cd ${wrksrc}
+}
+
+_unbundle_libs() {
+	cd ${wrksrc}/src/3rdparty/chromium
+	echo Dropping bundled libs from chromium
+	# Use system-provided libraries.
+	# TODO: use_system_hunspell (upstream changes needed).
+	# TODO: use_system_libsrtp.
+	# TODO: use_system_libusb (http://crbug.com/266149).
+	# TODO: use_system_ssl (http://crbug.com/58087).
+	# TODO: use_system_sqlite (http://crbug.com/22208).
+	# TODO: use_system_icu (segfaults)
+	# use_system_protobuf
+	# use_system_v8=1
+	# use_system_zlib=1
+	# bzip2 jsoncpp minizip xdg_utils speex
+	system="
+		ffmpeg
+		flac
+		fontconfig
+		freetype
+		harfbuzz-ng
+		icu
+		libdrm
+		libevent
+		libjpeg
+		libpng
+		libwebp
+		libxml
+		libxslt
+		opus
+		re2
+		snappy
+	"
+	build/linux/unbundle/replace_gn_files.py --system-libraries ${system}
+}
+
+# Provide a wrapper to run ./xbps-src -j 1 build later
+_wrap_ninja() {
+	cat <<-'_EOF' >"$XBPS_WRAPPERDIR"/ninja
+	#!/bin/sh
+
+	exec /usr/bin/ninja $NINJAFLAGS "$@"
+	_EOF
+	chmod +x "$XBPS_WRAPPERDIR"/ninja
+}
+
+pre_configure() {
+	_bootstrap_gn
+	# _unbundle_libs
+	_wrap_ninja
+	export PATH="$PATH:${wrksrc}/src/3rdparty/gn/out/Release"
+}
+
+pre_build() {
+	export PATH="$PATH:${wrksrc}/src/3rdparty/gn/out/Release"
+	export NINJAFLAGS="$makejobs"
+
+}
+
+pre_install() {
+	export PATH="$PATH:${wrksrc}/src/3rdparty/gn/out/Release"
+}
+
+qt6-webengine-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} qt6-webchannel-devel>=${version}_1
+	 qt6-declarative-devel>=${version}_1 qt6-location-devel>=${version}_1"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/qt6/mkspecs
+		vmove "usr/lib/*.so"
+	}
+}
diff --git a/srcpkgs/qt6-webengine/update b/srcpkgs/qt6-webengine/update
new file mode 100644
index 000000000000..844552465222
--- /dev/null
+++ b/srcpkgs/qt6-webengine/update
@@ -0,0 +1 @@
+pkgname="${pkgname/6-/}-everywhere-src"

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

* Re: [PR PATCH] [Updated] WIP Qt6 webengine
  2022-08-07  4:36 [PR PATCH] WIP Qt6 webengine sgn
  2022-08-07  4:38 ` [PR PATCH] [Updated] " sgn
@ 2022-08-08 10:13 ` sgn
  2022-08-08 12:15 ` sgn
                   ` (35 subsequent siblings)
  37 siblings, 0 replies; 39+ messages in thread
From: sgn @ 2022-08-08 10:13 UTC (permalink / raw)
  To: ml

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

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

https://github.com/sgn/void-packages qt6-webengine
https://github.com/void-linux/void-packages/pull/38509

WIP Qt6 webengine
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**
[ci skip]

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-qt6-webengine-38509.patch --]
[-- Type: text/x-diff, Size: 287942 bytes --]

From d28c3ff6fb6bba4c8594a6021995305d66b35d81 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:07 +0700
Subject: [PATCH 01/22] qt6-base: update to 6.3.1.

---
 srcpkgs/qt6-base/patches/libatomic.patch | 14 --------------
 srcpkgs/qt6-base/template                | 13 +++++++++----
 2 files changed, 9 insertions(+), 18 deletions(-)
 delete mode 100644 srcpkgs/qt6-base/patches/libatomic.patch

diff --git a/srcpkgs/qt6-base/patches/libatomic.patch b/srcpkgs/qt6-base/patches/libatomic.patch
deleted file mode 100644
index 2f7a807518e4..000000000000
--- a/srcpkgs/qt6-base/patches/libatomic.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Index: cmake/FindWrapAtomic.cmake
-===================================================================
---- a/cmake/FindWrapAtomic.cmake
-+++ b/cmake/FindWrapAtomic.cmake
-@@ -38,7 +38,8 @@ endif()
- 
- add_library(WrapAtomic::WrapAtomic INTERFACE IMPORTED)
- if(HAVE_STDATOMIC_WITH_LIB)
--    target_link_libraries(WrapAtomic::WrapAtomic INTERFACE atomic)
-+    find_library(LIBATOMIC atomic REQUIRED)
-+    target_link_libraries(WrapAtomic::WrapAtomic INTERFACE ${LIBATOMIC})
- endif()
- 
- set(WrapAtomic_FOUND 1)
diff --git a/srcpkgs/qt6-base/template b/srcpkgs/qt6-base/template
index cc47e18a70ff..746927e2a4b2 100644
--- a/srcpkgs/qt6-base/template
+++ b/srcpkgs/qt6-base/template
@@ -1,7 +1,7 @@
 # Template file for 'qt6-base'
 pkgname=qt6-base
-version=6.3.0
-revision=2
+version=6.3.1
+revision=1
 wrksrc="qtbase-everywhere-src-${version}"
 build_style=cmake
 configure_args="-DINSTALL_DATADIR=share/qt6
@@ -9,6 +9,8 @@ configure_args="-DINSTALL_DATADIR=share/qt6
  -DINSTALL_BINDIR=lib/qt6/bin
  -DINSTALL_MKSPECSDIR=lib/qt6/mkspecs
  -DINSTALL_INCLUDEDIR=include/qt6
+ -DINSTALL_EXAMPLESDIR=lib/qt6/examples
+ -DINSTALL_TESTSDIR=lib/qt6/tests
  -DINSTALL_SYSCONFDIR=/etc/xdg
  -DQT_FEATURE_openssl_linked=ON
  -DQT_FEATURE_system_sqlite=ON
@@ -29,7 +31,7 @@ maintainer="John <me@johnnynator.dev>"
 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=b865aae43357f792b3b0a162899d9bf6a1393a55c4e5e4ede5316b157b1a0f99
+checksum=0a64421d9c2469c2c48490a032ab91d547017c9cc171f3f8070bc31888f24e03
 python_version=3
 
 if [ "$CROSS_BUILD" ]; then
@@ -225,7 +227,7 @@ qt6-plugin-tls-qcertonly_package() {
 qt6-plugin-networkinformation_package() {
 	short_desc+=" - Networkinformation plugin"
 	pkg_install() {
-		vmove usr/lib/qt6/plugins/networkinformation/libqnetworkmanager.so
+		vmove usr/lib/qt6/plugins/networkinformation/
 	}
 }
 
@@ -246,9 +248,12 @@ qt6-base-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/*.a"
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From d9fbbe0e9caf17538ccb89a936b5b60f40af006f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:07 +0700
Subject: [PATCH 02/22] qt6-charts: update to 6.3.1.

---
 srcpkgs/qt6-charts/template | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qt6-charts/template b/srcpkgs/qt6-charts/template
index 79cb8a220401..e7fc953b4188 100644
--- a/srcpkgs/qt6-charts/template
+++ b/srcpkgs/qt6-charts/template
@@ -1,6 +1,6 @@
 # Template file for 'qt6-charts'
 pkgname=qt6-charts
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qtcharts-everywhere-src-${version}"
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 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=672762c5f641ccc88a30aeedefb63f03c0f837649b334f46eea57592e87e36cd
+checksum=f330cc2328729104d79b2088990ce0840f2da89d9d989360d4c352e797d27cf7
 
 qt6-charts-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
@@ -20,8 +20,11 @@ qt6-charts-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From 854bf0ccdc8ccb489db2fe0d7aab341db71b16f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:07 +0700
Subject: [PATCH 03/22] qt6-declarative: update to 6.3.1.

---
 srcpkgs/qt6-declarative/template | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qt6-declarative/template b/srcpkgs/qt6-declarative/template
index e0bd28d9e383..9f7908685cad 100644
--- a/srcpkgs/qt6-declarative/template
+++ b/srcpkgs/qt6-declarative/template
@@ -1,6 +1,6 @@
 # Template file for 'qt6-declarative'
 pkgname=qt6-declarative
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qtdeclarative-everywhere-src-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 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=d294b029dc2b2d4f65da516fdc3b8088d32643eb7ff77db135a8b9ce904caa37
+checksum=03e7694123820fcca397f95ce312e0b7f3039493c8754c836da098a1a04346e8
 replaces="qt6-quickcontrols2>=0"
 
 if [ "$CROSS_BUILD" ]; then
@@ -60,11 +60,14 @@ qt6-declarative-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/libQt6QuickTest.so.*"
 		vmove usr/lib/qt6/qml/QtTest
 		vmove usr/lib/qt6/bin/qmltestrunner
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From 9bbf34d87b3cb069cefa504382f3bf42b216a8f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:07 +0700
Subject: [PATCH 04/22] qt6-imageformats: update to 6.3.1.

---
 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 eaca95243c48..65b6043fe497 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.3.0
+version=6.3.1
 revision=1
 wrksrc="qtimageformats-everywhere-src-${version}"
 build_style=cmake
@@ -12,4 +12,4 @@ maintainer="John <me@johnnynator.dev>"
 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=025d0d17ed75b42a7eb6b523731ab8f17025421a8810cade25caffe05d93abef
+checksum=ad0312b8dfbbb67f729bfadbfcd47246ee4a128b717731ba158c41d01fde212f

From e83ae9786055bc69492c16ac3865598167b5122c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:07 +0700
Subject: [PATCH 05/22] qt6-location: update to 6.3.1.

---
 srcpkgs/qt6-location/template | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qt6-location/template b/srcpkgs/qt6-location/template
index b7397f5f8942..d586020c7c10 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.3.0
+version=6.3.1
 revision=1
 wrksrc="qtpositioning-everywhere-src-${version}"
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 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=e9ed50f6b245a346db34d625d0012774ef0ec8e7fd65037127ec26758708236e
+checksum=06788e4ecae1920094b30e4046f0abd23c8189d8a51e9c939b02f0b6abe2e86c
 
 qt6-location-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel>=${version}_1"
@@ -20,8 +20,11 @@ qt6-location-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From 6dc6d5ff53c8080bc8d8ec6f4b805f7e2b8b4e0c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:08 +0700
Subject: [PATCH 06/22] qt6-lottie: update to 6.3.1.

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

diff --git a/srcpkgs/qt6-lottie/template b/srcpkgs/qt6-lottie/template
index 1c97cd5f4f32..2c52ffc7f89d 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.3.0
+version=6.3.1
 revision=1
 wrksrc="qtlottie-everywhere-src-${version}"
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 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=39db570bbba5b527a1eb6a5774bed47398ace2f7217bbf45b1194ada6cf97deb
+checksum=740ba76999124d5e1a85ef3d01c69976bb8557862b6b26bf48b357fe0cab1cf5
 
 if [ "$XBPS_CHECK_PKGS" ]; then
 	configure_args+=" -DQT_BUILD_TESTS=ON"
@@ -28,8 +28,10 @@ qt6-lottie-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
 		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From aca8a68853e704e8ea9c2c07e370748abe8f8754 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:08 +0700
Subject: [PATCH 07/22] qt6-networkauth: update to 6.3.1.

---
 srcpkgs/qt6-networkauth/template | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qt6-networkauth/template b/srcpkgs/qt6-networkauth/template
index e934beada9b0..df2b9b50bb79 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.3.0
+version=6.3.1
 revision=1
 wrksrc="qtnetworkauth-everywhere-src-${version}"
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 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=203a98942919028520038f90a20cd7ee32b537233545d11e429c3e2c1ad9069f
+checksum=d60f54b9d4509fa8bdbf1990bc91f6e260e38cdb57a7b8119fa3861bc5d2fb2a
 
 if [ "$XBPS_CHECK_PKGS" ]; then
 	configure_args+=" -DQT_BUILD_TESTS=ON"
@@ -24,8 +24,11 @@ qt6-networkauth-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From 876488ca0c127e094c6944982720f6518d4c9ee0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:08 +0700
Subject: [PATCH 08/22] qt6-qt5compat: update to 6.3.1.

---
 srcpkgs/qt6-qt5compat/template | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/qt6-qt5compat/template b/srcpkgs/qt6-qt5compat/template
index 7fcd5ad5080e..421d742c08e0 100644
--- a/srcpkgs/qt6-qt5compat/template
+++ b/srcpkgs/qt6-qt5compat/template
@@ -1,7 +1,7 @@
 # Template file for 'qt6-qt5compat'
 pkgname=qt6-qt5compat
-version=6.3.0
-revision=2
+version=6.3.1
+revision=1
 wrksrc="qt5compat-everywhere-src-${version}"
 build_style=cmake
 configure_args="-DQT_HOST_PATH=/usr"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 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=2b199be780c50d9214512b922d94cb240b0412fd63f459e356b76102cad1713e
+checksum=a43ec62bd778eaecf88ad7847118d1c2a471b0fcb820f93beb311d7ab9566cfd
 
 if [ "$XBPS_CHECK_PKGS" ]; then
 	configure_args+=" -DQT_BUILD_TESTS=ON"
@@ -24,8 +24,11 @@ qt6-qt5compat-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From 38b46902632418eb91bd3fed3f5c67732469b255 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:08 +0700
Subject: [PATCH 09/22] qt6-quick3d: update to 6.3.1.

---
 srcpkgs/qt6-quick3d/template | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/qt6-quick3d/template b/srcpkgs/qt6-quick3d/template
index 0f7ef336a3ff..2f216abcf3b9 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.3.0
+version=6.3.1
 revision=1
 wrksrc="qtquick3d-everywhere-src-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 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=0ad05bd1ee1f784b18220a2d2625ee8de91662c88fdc7b798662953d86eb327e
+checksum=2fa766ee47b8c07412b3b755206ada0715fb07813b64ed069e7205044c061256
 
 if [ "$XBPS_TARGET_ENDIAN" = "be" ]; then
 	# possibly a qt6-shadertools bug, actually
@@ -26,9 +26,12 @@ qt6-quick3d-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
-		vmove usr/lib/qt6/mkspecs
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/bin
+		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From 0da2d63a4c36da3e5caa87cbca75579f1c0cdfb4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:09 +0700
Subject: [PATCH 10/22] qt6-quicktimeline: update to 6.3.1.

---
 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 15aa7a8e5819..dc7c3b13cba6 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.3.0
+version=6.3.1
 revision=1
 wrksrc="qtquicktimeline-everywhere-src-${version/rc/-rc}"
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 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=9ff0a931159efc6be5bd9f8a1e4a16a70e2dab37cf22ad85c6d330ccfdf31c1a
+checksum=58a13cf0ce8e7755639f20684078733af24f5a317f6ddb40d6079c8c5a28ebbe
 
 if [ "$XBPS_CHECK_PKGS" ]; then
 	configure_args+=" -DQT_BUILD_TESTS=ON"

From 8e3e2d6929e6028e2d5ccdb67aabbf14e8f26f02 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:09 +0700
Subject: [PATCH 11/22] qt6-scxml: update to 6.3.1.

---
 srcpkgs/qt6-scxml/template | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qt6-scxml/template b/srcpkgs/qt6-scxml/template
index 112baca0ab83..063ba8199d0e 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.3.0
+version=6.3.1
 revision=1
 wrksrc="qtscxml-everywhere-src-${version}"
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 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=09b0dbd6ac367920fb1ba96a39dcd4c9d33eb0820dcc79538992825d588a70f0
+checksum=01bc154d6163d1f049f4e1e76658a044730ace7b0a5be35c9a46fcd1396f8619
 
 if [ "$XBPS_CHECK_PKGS" ]; then
 	configure_args+=" -DQT_BUILD_TESTS=ON"
@@ -24,8 +24,11 @@ qt6-scxml-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From 83c1d5d7faa2baf6e4b0c679632bb2fe64e925ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:09 +0700
Subject: [PATCH 12/22] qt6-serialport: update to 6.3.1.

---
 srcpkgs/qt6-serialport/template | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qt6-serialport/template b/srcpkgs/qt6-serialport/template
index 0804671ca57b..3b6373eda2c7 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.3.0
+version=6.3.1
 revision=1
 wrksrc="qtserialport-everywhere-src-${version}"
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 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=eebd6934d48cc044b8c87795a4fd91bb81f7195d4b5a2ddb12802f343d5db64f
+checksum=4eb6d80e65799dd2e0318df4dfba14173c1929e861718cda9bedca24253b616e
 
 qt6-serialport-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel>=${version}_1"
@@ -20,8 +20,11 @@ qt6-serialport-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From 7f315aaa045297073e5c46d006ab1c45d9f13561 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:09 +0700
Subject: [PATCH 13/22] qt6-shadertools: update to 6.3.1.

---
 srcpkgs/qt6-shadertools/template | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qt6-shadertools/template b/srcpkgs/qt6-shadertools/template
index 9c1ec210a96a..785c54682446 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.3.0
+version=6.3.1
 revision=1
 wrksrc="qtshadertools-everywhere-src-${version}"
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 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=5498959b9d37c254bd126ab1320cf86aeb8a31b3ea7e51db666a8f9698afbd6c
+checksum=59b77176961528cc7b0c9325134655e273aa87b4cb386c0f4683d8f2852e435a
 
 qt6-shadertools-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel>=${version}_1"
@@ -20,8 +20,11 @@ qt6-shadertools-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From 2d79ae8e201cce98ca4963bc998d8e3c629d1c96 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:09 +0700
Subject: [PATCH 14/22] qt6-svg: update to 6.3.1.

---
 srcpkgs/qt6-svg/template | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qt6-svg/template b/srcpkgs/qt6-svg/template
index aa8e6b745109..a821afc11f10 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.3.0
+version=6.3.1
 revision=1
 wrksrc="qtsvg-everywhere-src-${version}"
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 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=3164504d7e3f640439308235739b112605ab5fc9cc517ca0b28f9fb93a8db0e3
+checksum=7b19f418e6f7b8e23344082dd04440aacf5da23c5a73980ba22ae4eba4f87df7
 
 if [ "$XBPS_CHECK_PKGS" ]; then
 	configure_args+=" -DQT_BUILD_TESTS=ON"
@@ -29,8 +29,11 @@ qt6-svg-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From f13a24ca29cd19e08377eca41782cf3691d411ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:10 +0700
Subject: [PATCH 15/22] qt6-tools: update to 6.3.1.

---
 srcpkgs/qt6-tools/template | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qt6-tools/template b/srcpkgs/qt6-tools/template
index f875dff5c046..e0a048820450 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.3.0
+version=6.3.1
 revision=1
 wrksrc="qttools-everywhere-src-${version}"
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 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/qttools-everywhere-src-${version}.tar.xz"
-checksum=fce94688ea925782a2879347584991f854630daadba6c52aed6d93e33cd0b19c
+checksum=c412750f2aa3beb93fce5f30517c607f55daaeb7d0407af206a8adf917e126c1
 
 if [ "$XBPS_CHECK_PKGS" ]; then
 	configure_args+=" -DQT_BUILD_TESTS=ON"
@@ -31,8 +31,11 @@ qt6-tools-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From dd11bd2cf5f15b1b23d28e8bbbd20ddf8d4ac36f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:10 +0700
Subject: [PATCH 16/22] qt6-translations: update to 6.3.1.

---
 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 be0a74ca74e2..fa751b097466 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.3.0
+version=6.3.1
 revision=1
 wrksrc="qttranslations-everywhere-src-${version}"
 build_style=cmake
@@ -12,4 +12,4 @@ maintainer="John <me@johnnynator.dev>"
 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=e4dd4ef892a34a9514a19238f189a33ed85c76f31dcad6599ced93b1e33440b3
+checksum=d7bdd55e2908ded901dcc262157100af2a490bf04d31e32995f6d91d78dfdb97

From 1debbd3858d74b826f15561cd20011a2cfbf2a3c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:10 +0700
Subject: [PATCH 17/22] qt6-virtualkeyboard: update to 6.3.1.

---
 srcpkgs/qt6-virtualkeyboard/template | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qt6-virtualkeyboard/template b/srcpkgs/qt6-virtualkeyboard/template
index 67ecef145ea1..72c4f94a3e32 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.3.0
+version=6.3.1
 revision=1
 wrksrc="qtvirtualkeyboard-everywhere-src-${version}"
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 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=89aaf15acf5432af8f5cf4ec45cb32d87a3348906215dd56e81cb294eb276573
+checksum=5fe089b204d859ab0dd0169f811f2e30cae7c5cb36f8ab95ca36883f1fc0c2b8
 
 if [ "$XBPS_CHECK_PKGS" ]; then
 	configure_args+=" -DQT_BUILD_TESTS=ON"
@@ -32,8 +32,11 @@ qt6-virtualkeyboard-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From 34dcbb29f3eb443e2249d3d3ad17c3b7c1c130e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:10 +0700
Subject: [PATCH 18/22] qt6-wayland: update to 6.3.1.

---
 srcpkgs/qt6-wayland/template | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/qt6-wayland/template b/srcpkgs/qt6-wayland/template
index b71a273009b9..2bbb8e06e09b 100644
--- a/srcpkgs/qt6-wayland/template
+++ b/srcpkgs/qt6-wayland/template
@@ -1,6 +1,6 @@
 # Template file for 'qt6-wayland'
 pkgname=qt6-wayland
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qtwayland-everywhere-src-${version}"
 build_style=cmake
@@ -8,6 +8,7 @@ configure_args="-DQT_HOST_PATH=/usr -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true"
 hostmakedepends="qt6-base-devel perl pkg-config wayland-devel qt6-wayland-devel"
 # XXX: Qml as optional dep
 makedepends="qt6-base-devel wayland-devel libxkbcommon-devel
+ qt6-declarative-devel
  libXcomposite-devel MesaLib-devel Vulkan-Headers libdrm-devel"
 checkdepends="dbus mesa-dri"
 short_desc="Cross-platform application and UI framework - Wayland"
@@ -15,7 +16,7 @@ maintainer="John <me@johnnynator.dev>"
 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=e7b567f6e43ffc5918d4aa825ce1eced66a00cb0a87133b2912ba5c1b2a02190
+checksum=6f14fea2d172a5b4170be3efcb0e58535f6605b61bcd823f6d5c9d165bb8c0f0
 
 if [ "$XBPS_CHECK_PKGS" ]; then
 	configure_args+=" -DQT_BUILD_TESTS=ON"
@@ -32,9 +33,11 @@ qt6-wayland-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
-		vmove usr/lib/qt6/libexec/qtwaylandscanner
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From f8b98b4f67cf0eb16e73cc7e68de1081246ed2aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:10 +0700
Subject: [PATCH 19/22] qt6-websockets: update to 6.3.1.

---
 srcpkgs/qt6-websockets/template | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qt6-websockets/template b/srcpkgs/qt6-websockets/template
index c2e674aacb31..69c383355a3d 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.3.0
+version=6.3.1
 revision=1
 wrksrc="qtwebsockets-everywhere-src-${version}"
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 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=e018a09fe960b7d9560d6bbc9d3ca022fed6566e6ba6fc6d869a97482d4e6361
+checksum=9f980d90c97fcbde1b50c773f6dc580cfdf8c36ce14a1be3aa2ccadfe605121a
 
 qt6-websockets-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel>=${version}_1"
@@ -20,8 +20,11 @@ qt6-websockets-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From 3679776a8f5977c34944c8af5ce648c31fde4bea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:11 +0700
Subject: [PATCH 20/22] New package: qt6-webchannel-6.3.1

---
 srcpkgs/qt6-webchannel-devel    |  1 +
 srcpkgs/qt6-webchannel/template | 33 +++++++++++++++++++++++++++++++++
 srcpkgs/qt6-webchannel/update   |  1 +
 3 files changed, 35 insertions(+)
 create mode 120000 srcpkgs/qt6-webchannel-devel
 create mode 100644 srcpkgs/qt6-webchannel/template
 create mode 100644 srcpkgs/qt6-webchannel/update

diff --git a/srcpkgs/qt6-webchannel-devel b/srcpkgs/qt6-webchannel-devel
new file mode 120000
index 000000000000..03e8b23d785d
--- /dev/null
+++ b/srcpkgs/qt6-webchannel-devel
@@ -0,0 +1 @@
+qt6-webchannel
\ No newline at end of file
diff --git a/srcpkgs/qt6-webchannel/template b/srcpkgs/qt6-webchannel/template
new file mode 100644
index 000000000000..d8db6fae9d8b
--- /dev/null
+++ b/srcpkgs/qt6-webchannel/template
@@ -0,0 +1,33 @@
+# Template file for 'qt6-webchannel'
+pkgname=qt6-webchannel
+version=6.3.1
+revision=1
+wrksrc="qtwebchannel-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DQT_HOST_PATH=/usr"
+hostmakedepends="perl qt6-base-devel qt6-declarative-devel"
+makedepends="qt6-base-devel qt6-declarative-devel qt6-websockets-devel"
+short_desc="Cross-platform application and UI framework - webchannel"
+maintainer="John <me@johnnynator.dev>"
+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=aaa20ac23f86992721b7ee487c379a3fd68caa8cdcea0a77a37e0d8b47ff2668
+
+qt6-webchannel-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel>=${version}_1
+	 qt6-websockets-devel>=${version}_1"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
+		vmove usr/lib/qt6/mkspecs
+		vmove usr/lib/qt6/qml/QtWebChannel/plugins.qmltypes
+		vmove usr/lib/qt6/qml/QtWebChannel/qmldir
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
+	}
+}
diff --git a/srcpkgs/qt6-webchannel/update b/srcpkgs/qt6-webchannel/update
new file mode 100644
index 000000000000..844552465222
--- /dev/null
+++ b/srcpkgs/qt6-webchannel/update
@@ -0,0 +1 @@
+pkgname="${pkgname/6-/}-everywhere-src"

From b0483556974b45865164d2891003c844616f0e66 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:11 +0700
Subject: [PATCH 21/22] New package: qt6-multimedia-6.3.1

---
 srcpkgs/qt6-multimedia-devel    |  1 +
 srcpkgs/qt6-multimedia/template | 33 +++++++++++++++++++++++++++++++++
 srcpkgs/qt6-multimedia/update   |  1 +
 3 files changed, 35 insertions(+)
 create mode 120000 srcpkgs/qt6-multimedia-devel
 create mode 100644 srcpkgs/qt6-multimedia/template
 create mode 100644 srcpkgs/qt6-multimedia/update

diff --git a/srcpkgs/qt6-multimedia-devel b/srcpkgs/qt6-multimedia-devel
new file mode 120000
index 000000000000..9343446502d0
--- /dev/null
+++ b/srcpkgs/qt6-multimedia-devel
@@ -0,0 +1 @@
+qt6-multimedia
\ No newline at end of file
diff --git a/srcpkgs/qt6-multimedia/template b/srcpkgs/qt6-multimedia/template
new file mode 100644
index 000000000000..ccc5290852e8
--- /dev/null
+++ b/srcpkgs/qt6-multimedia/template
@@ -0,0 +1,33 @@
+# Template file for 'qt6-multimedia'
+pkgname=qt6-multimedia
+version=6.3.1
+revision=1
+wrksrc="qtmultimedia-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DQT_HOST_PATH=/usr -DQT_FEATURE_gstreamer=ON"
+hostmakedepends="perl qt6-declarative-devel pkg-config
+ qt6-shadertools-devel"
+makedepends="qt6-declarative-devel
+ qt6-shadertools-devel libglib-devel gst-plugins-base1-devel"
+short_desc="Cross-platform application and UI framework - multimedia"
+maintainer="John <me@johnnynator.dev>"
+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=7e03242aadd634ff2d9fcf08948290f03da3d9a5012369d908da89f82b1d7336
+
+qt6-multimedia-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel>=${version}_1"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
+		vmove usr/lib/qt6/mkspecs
+		vmove usr/lib/qt6/qml/QtMultimedia/plugins.qmltypes
+		vmove usr/lib/qt6/qml/QtMultimedia/qmldir
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}
diff --git a/srcpkgs/qt6-multimedia/update b/srcpkgs/qt6-multimedia/update
new file mode 100644
index 000000000000..844552465222
--- /dev/null
+++ b/srcpkgs/qt6-multimedia/update
@@ -0,0 +1 @@
+pkgname="${pkgname/6-/}-everywhere-src"

From 4f1eadb3b9aeb877a6d5151a2bc04f86de6fa876 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:11 +0700
Subject: [PATCH 22/22] New package: qt6-webengine-6.3.1.

---
 common/shlibs                                 |    7 +
 srcpkgs/qt6-webengine-devel                   |    1 +
 .../patches/0001-None-no-debug.patch          |   11 +
 .../patches/0002-enable-ppc64.patch           |   20 +
 .../patches/0003-cross-hack.patch             |   10 +
 .../0004-ppc-disable-jxl-decoder.patch        |   13 +
 .../patches/0050-no-glibc-cmake-check.patch   |   14 +
 .../0100-chromium-sandbox-membarrier.patch    |   58 +
 .../qt6-webengine/patches/0101-size_t.patch   |   16 +
 .../0102-chromium-90-ruy-include.patch        |   19 +
 ...-v8-monotonic-pthread-cont_timedwait.patch |   22 +
 .../0104-chromium-revert-9d080c0.patch        |  162 +
 ...-chromium-revert-drop-of-system-java.patch |   15 +
 .../patches/0106-chromium-system-nodejs.patch |   20 +
 .../0107-chromium-cursed^Uscoped_file.patch   |   18 +
 .../0108-chromium-fix-narrowing-cast.patch    |   53 +
 .../0109-chromium-remove-strip_binary.patch   |   32 +
 ...ium-revert-use-ffile-compilation-dir.patch |   57 +
 ...11-chromium-no-Wno-stringop-overread.patch |   10 +
 .../0150-chromium-glibc-libc_malloc.patch     |   24 +
 ...-include-sys-reg.h-to-get-__WORDSIZE.patch |   21 +
 .../0201-chromium-musl-dispatch-to-musl.patch |  103 +
 .../0202-chromium-musl-no-mallinfo.patch      |   62 +
 .../0203-chromium-musl-siginfo_t.patch        |   18 +
 .../0204-chromium-musl-stackstart.patch       |   20 +
 .../patches/0205-chromium-musl-sandbox.patch  |   92 +
 ...0206-chromium-musl-default-stacksize.patch |   15 +
 ...-chromium-musl-cross-no-asm_ptrace_h.patch |   30 +
 .../patches/0208-chromium-musl-execinfo.patch |  125 +
 .../0209-chromium-musl-thread-stacksize.patch |   22 +
 .../0210-chromium-musl-msgvec-push_back.patch |   14 +
 ...ium-musl-canonicalize-file-name-musl.patch |   11 +
 .../0212-chromium-musl-no-getcontext.patch    |   29 +
 .../patches/0213-chromium-musl-crashpad.patch |   22 +
 .../patches/0214-chromium-musl-fixes.patch    |  108 +
 .../patches/0215-chromium-musl-cdefs.patch    |   29 +
 .../patches/0216-chromium-musl-stat.patch     |   12 +
 .../patches/0217-chromium-musl-resolver.patch |   77 +
 .../patches/0600-chromium-sndio.patch         |  876 ++++
 .../patches/0700-armv7l-neon.patch            |   10 +
 .../0750-chromium-musl-arm-user_vfp.patch     |   20 +
 .../0751-chromium-musl-arm-elf_auxv_t.patch   |   18 +
 ...0801-chromium-i686-vaapi-fpermissive.patch |   24 +
 .../patches/0900-xxx-ppc64le-libvpx.patch     |   65 +
 .../0901-xxx-ppc64le-sandbox-linux-stat.patch |   31 +
 .../patches/0902-xxx-ppc64le-support.patch    | 3559 +++++++++++++++++
 .../0903-xxx-ppc64le-swiftshader.patch        |   18 +
 srcpkgs/qt6-webengine/template                |  175 +
 srcpkgs/qt6-webengine/update                  |    1 +
 49 files changed, 6189 insertions(+)
 create mode 120000 srcpkgs/qt6-webengine-devel
 create mode 100644 srcpkgs/qt6-webengine/patches/0001-None-no-debug.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0002-enable-ppc64.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0003-cross-hack.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0004-ppc-disable-jxl-decoder.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0050-no-glibc-cmake-check.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0100-chromium-sandbox-membarrier.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0101-size_t.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0102-chromium-90-ruy-include.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0103-chromium-v8-monotonic-pthread-cont_timedwait.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0104-chromium-revert-9d080c0.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0105-chromium-revert-drop-of-system-java.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0106-chromium-system-nodejs.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0107-chromium-cursed^Uscoped_file.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0108-chromium-fix-narrowing-cast.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0109-chromium-remove-strip_binary.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0110-chromium-revert-use-ffile-compilation-dir.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0111-chromium-no-Wno-stringop-overread.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0150-chromium-glibc-libc_malloc.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0200-chromium-musl-include-sys-reg.h-to-get-__WORDSIZE.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0201-chromium-musl-dispatch-to-musl.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0202-chromium-musl-no-mallinfo.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0203-chromium-musl-siginfo_t.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0204-chromium-musl-stackstart.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0205-chromium-musl-sandbox.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0206-chromium-musl-default-stacksize.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0207-chromium-musl-cross-no-asm_ptrace_h.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0208-chromium-musl-execinfo.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0209-chromium-musl-thread-stacksize.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0210-chromium-musl-msgvec-push_back.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0211-chromium-musl-canonicalize-file-name-musl.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0212-chromium-musl-no-getcontext.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0213-chromium-musl-crashpad.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0214-chromium-musl-fixes.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0215-chromium-musl-cdefs.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0216-chromium-musl-stat.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0217-chromium-musl-resolver.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0600-chromium-sndio.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0700-armv7l-neon.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0750-chromium-musl-arm-user_vfp.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0751-chromium-musl-arm-elf_auxv_t.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0801-chromium-i686-vaapi-fpermissive.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0900-xxx-ppc64le-libvpx.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0901-xxx-ppc64le-sandbox-linux-stat.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0902-xxx-ppc64le-support.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0903-xxx-ppc64le-swiftshader.patch
 create mode 100644 srcpkgs/qt6-webengine/template
 create mode 100644 srcpkgs/qt6-webengine/update

diff --git a/common/shlibs b/common/shlibs
index 326943713f07..96e40a9e24ff 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2077,6 +2077,13 @@ libQt6SerialPort.so.6 qt6-serialport-6.2.0alpha_1
 libQt6WebSockets.so.6 qt6-websockets-6.2.0alpha_1
 libQt6WebChannel.so.6 qt6-webchannel-6.2.0alpha_1
 libQt6Positioning.so.6 qt6-location-6.2.0alpha_1
+libQt6WebEngineQuick.so.6 qt6-webengine-6.3.1_1
+libQt6PdfWidgets.so.6 qt6-webengine-6.3.1_1
+libQt6PdfQuick.so.6 qt6-webengine-6.3.1_1
+libQt6WebEngineCore.so.6 qt6-webengine-6.3.1_1
+libQt6Pdf.so.6 qt6-webengine-6.3.1_1
+libQt6WebEngineQuickDelegatesQml.so.6 qt6-webengine-6.3.1_1
+libQt6WebEngineWidgets.so.6 qt6-webengine-6.3.1_1
 libnpth.so.0 npth-1.1_1
 libnpupnp.so.4 libnpupnp-4.0.2_1
 libglfw.so.3 glfw-3.0.4_1
diff --git a/srcpkgs/qt6-webengine-devel b/srcpkgs/qt6-webengine-devel
new file mode 120000
index 000000000000..8e4d1b99c587
--- /dev/null
+++ b/srcpkgs/qt6-webengine-devel
@@ -0,0 +1 @@
+qt6-webengine
\ No newline at end of file
diff --git a/srcpkgs/qt6-webengine/patches/0001-None-no-debug.patch b/srcpkgs/qt6-webengine/patches/0001-None-no-debug.patch
new file mode 100644
index 000000000000..1ba33f8e6fd9
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0001-None-no-debug.patch
@@ -0,0 +1,11 @@
+--- a/cmake/Functions.cmake
++++ b/cmake/Functions.cmake
+@@ -813,6 +813,8 @@ macro(append_build_type_setup)
+         endif()
+     elseif(${config} STREQUAL "MinSizeRel")
+         list(APPEND gnArgArg is_debug=false symbol_level=0 optimize_for_size=true)
++    elseif(${config} STREQUAL "None")
++        list(APPEND gnArgArg is_debug=false symbol_level=0)
+     endif()
+     if(FEATURE_developer_build OR (${config} STREQUAL "Debug") OR QT_FEATURE_webengine_sanitizer)
+         list(APPEND gnArgArg
diff --git a/srcpkgs/qt6-webengine/patches/0002-enable-ppc64.patch b/srcpkgs/qt6-webengine/patches/0002-enable-ppc64.patch
new file mode 100644
index 000000000000..d72ef1ad1a10
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0002-enable-ppc64.patch
@@ -0,0 +1,20 @@
+--- a/cmake/Functions.cmake
++++ b/cmake/Functions.cmake
+@@ -622,6 +622,8 @@ function(get_gn_arch result arch)
+         set(${result} "mipsel" PARENT_SCOPE)
+     elseif(arch STREQUAL "mipsel64")
+         set(${result} "mips64el" PARENT_SCOPE)
++    elseif(arch STREQUAL "power64")
++        set(${result} "power64" PARENT_SCOPE)
+     else()
+         message(DEBUG "Unsupported architecture: ${arch}")
+     endif()
+@@ -641,6 +643,8 @@ function(get_v8_arch result targetArch h
+             set(${result} "mipsel" PARENT_SCOPE)
+         elseif(hostArch STREQUAL "mipsel64")
+             set(${result} "mipsel" PARENT_SCOPE)
++        elseif(hostArch STREQUAL "power64")
++            set(${result} "power64" PARENT_SCOPE)
+         else()
+             message(DEBUG "Unsupported architecture: ${hostArch}")
+         endif()
diff --git a/srcpkgs/qt6-webengine/patches/0003-cross-hack.patch b/srcpkgs/qt6-webengine/patches/0003-cross-hack.patch
new file mode 100644
index 000000000000..ea9f90094a63
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0003-cross-hack.patch
@@ -0,0 +1,10 @@
+--- a/src/core/api/CMakeLists.txt
++++ b/src/core/api/CMakeLists.txt
+@@ -50,6 +50,7 @@ qt_internal_add_module(WebEngineCore
+         Qt::Gui
+         Qt::Network
+         Qt::Quick
++        X11
+ )
+ 
+ set_target_properties(WebEngineCore PROPERTIES QTWEBENGINEPROCESS_NAME ${qtWebEngineProcessName})
diff --git a/srcpkgs/qt6-webengine/patches/0004-ppc-disable-jxl-decoder.patch b/srcpkgs/qt6-webengine/patches/0004-ppc-disable-jxl-decoder.patch
new file mode 100644
index 000000000000..73c1151968f4
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0004-ppc-disable-jxl-decoder.patch
@@ -0,0 +1,13 @@
+--- a/src/core/CMakeLists.txt
++++ b/src/core/CMakeLists.txt
+@@ -414,6 +414,10 @@ foreach(arch ${archs})
+                 CONDITION QT_FEATURE_webengine_ozone_x11 AND XSCRNSAVER_FOUND
+             )
+ 
++            if (cpu STREQUAL "ppc64")
++                list(APPEND gnArgArg enable_jxl_decoder=false)
++            endif()
++
+             if(QT_FEATURE_webengine_kerberos)
+                 list(APPEND gnArgArg
+                      external_gssapi_include_dir="${GSSAPI_INCLUDE_DIRS}/gssapi"
diff --git a/srcpkgs/qt6-webengine/patches/0050-no-glibc-cmake-check.patch b/srcpkgs/qt6-webengine/patches/0050-no-glibc-cmake-check.patch
new file mode 100644
index 000000000000..f756bf0286bb
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0050-no-glibc-cmake-check.patch
@@ -0,0 +1,14 @@
+--- a/configure.cmake
++++ b/configure.cmake
+@@ -499,11 +499,6 @@ add_check_for_support(
+ )
+ add_check_for_support(
+    MODULES QtWebEngine QtPdf
+-   CONDITION NOT LINUX OR TEST_glibc
+-   MESSAGE "A suitable version >= 2.17 of glibc is required."
+-)
+-add_check_for_support(
+-   MODULES QtWebEngine QtPdf
+    CONDITION NOT LINUX OR TEST_khr
+    MESSAGE "Build requires Khronos development headers for build - see mesa/libegl1-mesa-dev"
+ )
diff --git a/srcpkgs/qt6-webengine/patches/0100-chromium-sandbox-membarrier.patch b/srcpkgs/qt6-webengine/patches/0100-chromium-sandbox-membarrier.patch
new file mode 100644
index 000000000000..2dd7b4aa948f
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0100-chromium-sandbox-membarrier.patch
@@ -0,0 +1,58 @@
+--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
++++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
+@@ -413,6 +413,7 @@ bool SyscallSets::IsAllowedProcessStartO
+   switch (sysno) {
+     case __NR_exit:
+     case __NR_exit_group:
++    case __NR_membarrier:
+     case __NR_wait4:
+     case __NR_waitid:
+ #if defined(__i386__)
+--- a/src/3rdparty/chromium/sandbox/linux/system_headers/arm64_linux_syscalls.h
++++ b/src/3rdparty/chromium/sandbox/linux/system_headers/arm64_linux_syscalls.h
+@@ -1215,4 +1215,8 @@
+ #define __NR_landlock_restrict_self 446
+ #endif
+ 
++#if !defined(__NR_membarrier)
++#define __NR_membarrier 283
++#endif
++
+ #endif  // SANDBOX_LINUX_SYSTEM_HEADERS_ARM64_LINUX_SYSCALLS_H_
+--- a/src/3rdparty/chromium/sandbox/linux/system_headers/arm_linux_syscalls.h
++++ b/src/3rdparty/chromium/sandbox/linux/system_headers/arm_linux_syscalls.h
+@@ -1617,6 +1617,10 @@
+ #define __NR_landlock_restrict_self (__NR_SYSCALL_BASE + 446)
+ #endif
+ 
++#if !defined(__NR_membarrier)
++#define __NR_membarrier (__NR_SYSCALL_BASE+389)
++#endif
++
+ // ARM private syscalls.
+ #if !defined(__ARM_NR_BASE)
+ #define __ARM_NR_BASE (__NR_SYSCALL_BASE + 0xF0000)
+--- a/src/3rdparty/chromium/sandbox/linux/system_headers/x86_32_linux_syscalls.h
++++ b/src/3rdparty/chromium/sandbox/linux/system_headers/x86_32_linux_syscalls.h
+@@ -1750,5 +1750,9 @@
+ #define __NR_landlock_restrict_self 446
+ #endif
+ 
++#if !defined(__NR_membarrier)
++#define __NR_membarrier 375
++#endif
++
+ #endif  // SANDBOX_LINUX_SYSTEM_HEADERS_X86_32_LINUX_SYSCALLS_H_
+ 
+--- a/src/3rdparty/chromium/sandbox/linux/system_headers/x86_64_linux_syscalls.h
++++ b/src/3rdparty/chromium/sandbox/linux/system_headers/x86_64_linux_syscalls.h
+@@ -1438,5 +1438,9 @@
+ #define __NR_landlock_restrict_self 446
+ #endif
+ 
++#if !defined(__NR_membarrier)
++#define __NR_membarrier 324
++#endif
++
+ #endif  // SANDBOX_LINUX_SYSTEM_HEADERS_X86_64_LINUX_SYSCALLS_H_
+ 
diff --git a/srcpkgs/qt6-webengine/patches/0101-size_t.patch b/srcpkgs/qt6-webengine/patches/0101-size_t.patch
new file mode 100644
index 000000000000..fccc085da311
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0101-size_t.patch
@@ -0,0 +1,16 @@
+--- a/src/3rdparty/chromium/third_party/angle/include/platform/PlatformMethods.h
++++ b/src/3rdparty/chromium/third_party/angle/include/platform/PlatformMethods.h
+@@ -239,11 +239,11 @@ inline void DefaultOverrideFeaturesMtl(P
+ using ProgramKeyType   = std::array<uint8_t, 20>;
+ using CacheProgramFunc = void (*)(PlatformMethods *platform,
+                                   const ProgramKeyType &key,
+-                                  size_t programSize,
++                                  std::size_t programSize,
+                                   const uint8_t *programBytes);
+ inline void DefaultCacheProgram(PlatformMethods *platform,
+                                 const ProgramKeyType &key,
+-                                size_t programSize,
++                                std::size_t programSize,
+                                 const uint8_t *programBytes)
+ {}
+ 
diff --git a/srcpkgs/qt6-webengine/patches/0102-chromium-90-ruy-include.patch b/srcpkgs/qt6-webengine/patches/0102-chromium-90-ruy-include.patch
new file mode 100644
index 000000000000..bbba579076d6
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0102-chromium-90-ruy-include.patch
@@ -0,0 +1,19 @@
+From 714092f336bb14d2fcc27396ec323b3d843bb962 Mon Sep 17 00:00:00 2001
+From: Stephan Hartmann <stha09@googlemail.com>
+Date: Thu, 4 Mar 2021 15:05:46 +0000
+Subject: [PATCH] IWYU: include limits for std::numeric_limits
+
+---
+ third_party/ruy/src/ruy/block_map.cc | 1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/src/3rdparty/chromium/third_party/ruy/src/ruy/block_map.cc
++++ b/src/3rdparty/chromium/third_party/ruy/src/ruy/block_map.cc
+@@ -17,6 +17,7 @@ limitations under the License.
+ 
+ #include <algorithm>
+ #include <cstdint>
++#include <limits>
+ 
+ #ifdef RUY_MAKEBLOCKMAP_DEBUG
+ #include <cstdio>
diff --git a/srcpkgs/qt6-webengine/patches/0103-chromium-v8-monotonic-pthread-cont_timedwait.patch b/srcpkgs/qt6-webengine/patches/0103-chromium-v8-monotonic-pthread-cont_timedwait.patch
new file mode 100644
index 000000000000..1dc8bc4d3d17
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0103-chromium-v8-monotonic-pthread-cont_timedwait.patch
@@ -0,0 +1,22 @@
+Use monotonic clock for pthread_cond_timedwait with musl too.
+
+--- a/src/3rdparty/chromium/v8/src/base/platform/condition-variable.cc
++++ b/src/3rdparty/chromium/v8/src/base/platform/condition-variable.cc
+@@ -20,7 +20,7 @@ namespace base {
+ 
+ ConditionVariable::ConditionVariable() {
+ #if (V8_OS_FREEBSD || V8_OS_NETBSD || V8_OS_OPENBSD || \
+-     (V8_OS_LINUX && V8_LIBC_GLIBC))
++     V8_OS_LINUX)
+   // On Free/Net/OpenBSD and Linux with glibc we can change the time
+   // source for pthread_cond_timedwait() to use the monotonic clock.
+   pthread_condattr_t attr;
+@@ -96,7 +96,7 @@ bool ConditionVariable::WaitFor(Mutex* m
+       &native_handle_, &mutex->native_handle(), &ts);
+ #else
+ #if (V8_OS_FREEBSD || V8_OS_NETBSD || V8_OS_OPENBSD || \
+-     (V8_OS_LINUX && V8_LIBC_GLIBC))
++     V8_OS_LINUX)
+   // On Free/Net/OpenBSD and Linux with glibc we can change the time
+   // source for pthread_cond_timedwait() to use the monotonic clock.
+   result = clock_gettime(CLOCK_MONOTONIC, &ts);
diff --git a/srcpkgs/qt6-webengine/patches/0104-chromium-revert-9d080c0.patch b/srcpkgs/qt6-webengine/patches/0104-chromium-revert-9d080c0.patch
new file mode 100644
index 000000000000..42b1ee9ec063
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0104-chromium-revert-9d080c0.patch
@@ -0,0 +1,162 @@
+ Original change's description:
+ > Replace 'blacklist' with 'ignorelist' in ./tools/msan/.
+ >
+ > Bug: 1097272, 1097268
+ > Change-Id: Id5c8227a5bfb1ffaec82d3168b609085b10c8297
+ > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2867730
+ > Commit-Queue: Dylan Cutler <dylancutler@google.com>
+ > Reviewed-by: Nico Weber <thakis@chromium.org>
+ > Reviewed-by: Jonathan Metzman <metzman@chromium.org>
+ > Cr-Commit-Position: refs/heads/master@{#883035}
+--- a/src/3rdparty/chromium/build/config/sanitizers/BUILD.gn
++++ b/src/3rdparty/chromium/build/config/sanitizers/BUILD.gn
+@@ -272,11 +272,11 @@ config("asan_flags") {
+   if (is_asan) {
+     cflags += [ "-fsanitize=address" ]
+     if (is_win) {
+-      if (!defined(asan_win_blocklist_path)) {
+-        asan_win_blocklist_path =
++      if (!defined(asan_win_blacklist_path)) {
++        asan_win_blacklist_path =
+             rebase_path("//tools/memory/asan/blocklist_win.txt", root_build_dir)
+       }
+-      cflags += [ "-fsanitize-ignorelist=$asan_win_blocklist_path" ]
++      cflags += [ "-fsanitize-blacklist=$asan_win_blacklist_path" ]
+     }
+   }
+ }
+@@ -306,13 +306,13 @@ config("link_shared_library") {
+ config("cfi_flags") {
+   cflags = []
+   if (is_cfi && current_toolchain == default_toolchain) {
+-    if (!defined(cfi_ignorelist_path)) {
+-      cfi_ignorelist_path =
++    if (!defined(cfi_blacklist_path)) {
++      cfi_blacklist_path =
+           rebase_path("//tools/cfi/ignores.txt", root_build_dir)
+     }
+     cflags += [
+       "-fsanitize=cfi-vcall",
+-      "-fsanitize-ignorelist=$cfi_ignorelist_path",
++      "-fsanitize-blacklist=$cfi_blacklist_path",
+     ]
+ 
+     if (use_cfi_cast) {
+@@ -409,14 +409,14 @@ config("msan_flags") {
+   if (is_msan) {
+     assert(is_linux || is_chromeos,
+            "msan only supported on linux x86_64/ChromeOS")
+-    if (!defined(msan_ignorelist_path)) {
+-      msan_ignorelist_path =
+-          rebase_path("//tools/msan/ignorelist.txt", root_build_dir)
++    if (!defined(msan_blacklist_path)) {
++      msan_blacklist_path =
++          rebase_path("//tools/msan/blacklist.txt", root_build_dir)
+     }
+     cflags = [
+       "-fsanitize=memory",
+       "-fsanitize-memory-track-origins=$msan_track_origins",
+-      "-fsanitize-ignorelist=$msan_ignorelist_path",
++      "-fsanitize-blacklist=$msan_blacklist_path",
+     ]
+   }
+ }
+@@ -424,13 +424,13 @@ config("msan_flags") {
+ config("tsan_flags") {
+   if (is_tsan) {
+     assert(is_linux || is_chromeos, "tsan only supported on linux x86_64")
+-    if (!defined(tsan_ignorelist_path)) {
+-      tsan_ignorelist_path =
++    if (!defined(tsan_blacklist_path)) {
++      tsan_blacklist_path =
+           rebase_path("//tools/memory/tsan_v2/ignores.txt", root_build_dir)
+     }
+     cflags = [
+       "-fsanitize=thread",
+-      "-fsanitize-ignorelist=$tsan_ignorelist_path",
++      "-fsanitize-blacklist=$tsan_blacklist_path",
+     ]
+   }
+ }
+@@ -438,8 +438,8 @@ config("tsan_flags") {
+ config("ubsan_flags") {
+   cflags = []
+   if (is_ubsan) {
+-    if (!defined(ubsan_ignorelist_path)) {
+-      ubsan_ignorelist_path =
++    if (!defined(ubsan_blacklist_path)) {
++      ubsan_blacklist_path =
+           rebase_path("//tools/ubsan/ignorelist.txt", root_build_dir)
+     }
+     cflags += [
+@@ -456,7 +456,7 @@ config("ubsan_flags") {
+       "-fsanitize=signed-integer-overflow",
+       "-fsanitize=unreachable",
+       "-fsanitize=vla-bound",
+-      "-fsanitize-ignorelist=$ubsan_ignorelist_path",
++      "-fsanitize-blacklist=$ubsan_blacklist_path",
+     ]
+     if (!is_clang) {
+       # These exposes too much illegal C++14 code to compile on anything stricter than clang:
+@@ -497,8 +497,8 @@ config("ubsan_no_recover") {
+ 
+ config("ubsan_security_flags") {
+   if (is_ubsan_security) {
+-    if (!defined(ubsan_security_ignorelist_path)) {
+-      ubsan_security_ignorelist_path =
++    if (!defined(ubsan_security_blacklist_path)) {
++      ubsan_security_blacklist_path =
+           rebase_path("//tools/ubsan/security_ignorelist.txt", root_build_dir)
+     }
+     cflags = [
+@@ -506,7 +506,7 @@ config("ubsan_security_flags") {
+       "-fsanitize=shift",
+       "-fsanitize=signed-integer-overflow",
+       "-fsanitize=vla-bound",
+-      "-fsanitize-ignorelist=$ubsan_security_ignorelist_path",
++      "-fsanitize-blacklist=$ubsan_security_blacklist_path",
+     ]
+   }
+ }
+@@ -519,13 +519,13 @@ config("ubsan_null_flags") {
+ 
+ config("ubsan_vptr_flags") {
+   if (is_ubsan_vptr) {
+-    if (!defined(ubsan_vptr_ignorelist_path)) {
+-      ubsan_vptr_ignorelist_path =
++    if (!defined(ubsan_vptr_blacklist_path)) {
++      ubsan_vptr_blacklist_path =
+           rebase_path("//tools/ubsan/vptr_ignorelist.txt", root_build_dir)
+     }
+     cflags = [
+       "-fsanitize=vptr",
+-      "-fsanitize-ignorelist=$ubsan_vptr_ignorelist_path",
++      "-fsanitize-blacklist=$ubsan_vptr_blacklist_path",
+     ]
+     if (!is_clang) {
+       # Clang specific flag:
+--- a/src/3rdparty/chromium/build_overrides/build.gni
++++ b/src/3rdparty/chromium/build_overrides/build.gni
+@@ -43,15 +43,15 @@ declare_args() {
+ # Allows different projects to specify their own suppression/ignore lists for
+ # sanitizer tools.
+ # asan_suppressions_file = "path/to/asan_suppressions.cc"
+-# asan_win_ignorelist_path = "path/to/asan/blocklist_win.txt"
++# asan_win_blacklist_path = "path/to/asan/blocklist_win.txt"
+ # lsan_suppressions_file = "path/to/lsan_suppressions.cc"
+ # tsan_suppressions_file = "path/to/tsan_suppressions.cc"
+-# tsan_ignorelist_path = "path/to/tsan/ignores.txt"
+-# msan_ignorelist_path = "path/to/msan/ignorelist.txt"
+-# ubsan_ignorelist_path = "path/to/ubsan/ignorelist.txt"
+-# ubsan_vptr_ignorelist_path = "path/to/ubsan/vptr_ignorelist.txt"
+-# ubsan_security_ignorelist_path = "path/to/ubsan/security_ignorelist.txt"
+-# cfi_ignorelist_path = "path/to/cfi/ignores.txt"
++# tsan_blacklist_path = "path/to/tsan/ignores.txt"
++# msan_blacklist_path = "path/to/msan/blacklist.txt"
++# ubsan_blacklist_path = "path/to/ubsan/blacklist.txt"
++# ubsan_vptr_blacklist_path = "path/to/ubsan/vptr_blacklist.txt"
++# ubsan_security_blacklist_path = "path/to/ubsan/security_blacklist.txt"
++# cfi_blacklist_path = "path/to/cfi/ignores.txt"
+ 
+ declare_args() {
+   # Android 32-bit non-component, non-clang builds cannot have symbol_level=2
diff --git a/srcpkgs/qt6-webengine/patches/0105-chromium-revert-drop-of-system-java.patch b/srcpkgs/qt6-webengine/patches/0105-chromium-revert-drop-of-system-java.patch
new file mode 100644
index 000000000000..44f3aa8fae5e
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0105-chromium-revert-drop-of-system-java.patch
@@ -0,0 +1,15 @@
+This was dropped for some reason in 6951c37cecd05979b232a39e5c10e6346a0f74ef
+--- a/src/3rdparty/chromium/third_party/closure_compiler/compiler.py
++++ b/src/3rdparty/chromium/third_party/closure_compiler/compiler.py
+@@ -13,8 +13,9 @@ import subprocess
+ 
+ 
+ _CURRENT_DIR = os.path.join(os.path.dirname(__file__))
+-_JAVA_PATH = os.path.join(_CURRENT_DIR, "..", "jdk", "current", "bin", "java")
+-assert os.path.isfile(_JAVA_PATH), "java only allowed in android builds"
++_JAVA_BIN = "java"
++_JDK_PATH = os.path.join(_CURRENT_DIR, "..", "jdk", "current", "bin", "java")
++_JAVA_PATH = _JDK_PATH if os.path.isfile(_JDK_PATH) else _JAVA_BIN
+ 
+ class Compiler(object):
+   """Runs the Closure compiler on given source files to typecheck them
diff --git a/srcpkgs/qt6-webengine/patches/0106-chromium-system-nodejs.patch b/srcpkgs/qt6-webengine/patches/0106-chromium-system-nodejs.patch
new file mode 100644
index 000000000000..1e067cc6eda0
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0106-chromium-system-nodejs.patch
@@ -0,0 +1,20 @@
+--- a/src/3rdparty/chromium/third_party/node/node.py
++++ b/src/3rdparty/chromium/third_party/node/node.py
+@@ -36,11 +36,12 @@ def GetBinaryPath():
+   if platform.system() == 'Darwin' and platform.machine() == 'arm64':
+       return os.path.join(os_path.join(os_path.dirname(__file__), 'mac',
+                           'node-darwin-arm64', 'bin', 'node'))
+-  return os_path.join(os_path.dirname(__file__), *{
+-    'Darwin': ('mac', 'node-darwin-x64', 'bin', 'node'),
+-    'Linux': ('linux', 'node-linux-x64', 'bin', 'node'),
+-    'Windows': ('win', 'node.exe'),
+-  }[platform.system()])
++  return "/usr/bin/node"
++  #return os_path.join(os_path.dirname(__file__), *{
++  #  'Darwin': ('mac', 'node-darwin-x64', 'bin', 'node'),
++  #  'Linux': ('linux', 'node-linux-x64', 'bin', 'node'),
++  #  'Windows': ('win', 'node.exe'),
++  #}[platform.system()])
+ 
+ 
+ def RunNode(cmd_parts, stdout=None):
diff --git a/srcpkgs/qt6-webengine/patches/0107-chromium-cursed^Uscoped_file.patch b/srcpkgs/qt6-webengine/patches/0107-chromium-cursed^Uscoped_file.patch
new file mode 100644
index 000000000000..a8f5d971883d
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0107-chromium-cursed^Uscoped_file.patch
@@ -0,0 +1,18 @@
+--- a/src/3rdparty/chromium/base/files/scoped_file_linux.cc
++++ b/src/3rdparty/chromium/base/files/scoped_file_linux.cc
+@@ -77,15 +77,3 @@ bool IsFDOwned(int fd) {
+ }
+ 
+ }  // namespace base
+-
+-extern "C" {
+-
+-int __close(int);
+-
+-__attribute__((visibility("default"), noinline)) int close(int fd) {
+-  if (base::IsFDOwned(fd) && g_is_ownership_enforced)
+-    CrashOnFdOwnershipViolation();
+-  return __close(fd);
+-}
+-
+-}  // extern "C"
diff --git a/srcpkgs/qt6-webengine/patches/0108-chromium-fix-narrowing-cast.patch b/srcpkgs/qt6-webengine/patches/0108-chromium-fix-narrowing-cast.patch
new file mode 100644
index 000000000000..ed32cd9b7415
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0108-chromium-fix-narrowing-cast.patch
@@ -0,0 +1,53 @@
+--- a/src/3rdparty/chromium/base/files/file_util_linux.cc
++++ b/src/3rdparty/chromium/base/files/file_util_linux.cc
+@@ -23,14 +23,14 @@ bool GetFileSystemType(const FilePath& p
+ 
+   // Not all possible |statfs_buf.f_type| values are in linux/magic.h.
+   // Missing values are copied from the statfs man page.
+-  switch (statfs_buf.f_type) {
++  switch (static_cast<uintmax_t>(statfs_buf.f_type)) {
+     case 0:
+       *type = FILE_SYSTEM_0;
+       break;
+     case EXT2_SUPER_MAGIC:  // Also ext3 and ext4
+     case MSDOS_SUPER_MAGIC:
+     case REISERFS_SUPER_MAGIC:
+-    case static_cast<int>(BTRFS_SUPER_MAGIC):
++    case BTRFS_SUPER_MAGIC:
+     case 0x5346544E:  // NTFS
+     case 0x58465342:  // XFS
+     case 0x3153464A:  // JFS
+@@ -40,14 +40,14 @@ bool GetFileSystemType(const FilePath& p
+       *type = FILE_SYSTEM_NFS;
+       break;
+     case SMB_SUPER_MAGIC:
+-    case static_cast<int>(0xFF534D42):  // CIFS
++    case 0xFF534D42:  // CIFS
+       *type = FILE_SYSTEM_SMB;
+       break;
+     case CODA_SUPER_MAGIC:
+       *type = FILE_SYSTEM_CODA;
+       break;
+-    case static_cast<int>(HUGETLBFS_MAGIC):
+-    case static_cast<int>(RAMFS_MAGIC):
++    case HUGETLBFS_MAGIC:
++    case RAMFS_MAGIC:
+     case TMPFS_MAGIC:
+       *type = FILE_SYSTEM_MEMORY;
+       break;
+--- a/src/3rdparty/chromium/base/system/sys_info_posix.cc
++++ b/src/3rdparty/chromium/base/system/sys_info_posix.cc
+@@ -100,10 +100,10 @@ bool IsStatsZeroIfUnlimited(const base::
+   if (HANDLE_EINTR(statfs(path.value().c_str(), &stats)) != 0)
+     return false;
+ 
+-  switch (stats.f_type) {
++  switch (static_cast<uintmax_t>(stats.f_type)) {
+     case TMPFS_MAGIC:
+-    case static_cast<int>(HUGETLBFS_MAGIC):
+-    case static_cast<int>(RAMFS_MAGIC):
++    case HUGETLBFS_MAGIC:
++    case RAMFS_MAGIC:
+       return true;
+   }
+   return false;
diff --git a/srcpkgs/qt6-webengine/patches/0109-chromium-remove-strip_binary.patch b/srcpkgs/qt6-webengine/patches/0109-chromium-remove-strip_binary.patch
new file mode 100644
index 000000000000..5ebd16e659af
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0109-chromium-remove-strip_binary.patch
@@ -0,0 +1,32 @@
+--- a/src/3rdparty/chromium/chrome/test/chromedriver/BUILD.gn
++++ b/src/3rdparty/chromium/chrome/test/chromedriver/BUILD.gn
+@@ -308,11 +308,7 @@ source_set("lib") {
+   }
+ }
+ 
+-if (is_linux) {
+-  chromedriver_output = "chromedriver.unstripped"
+-} else {
+-  chromedriver_output = "chromedriver"
+-}
++chromedriver_output = "chromedriver"
+ 
+ executable("$chromedriver_output") {
+   testonly = true
+@@ -336,16 +332,6 @@ executable("$chromedriver_output") {
+   }
+ }
+ 
+-if (is_linux) {
+-  strip_binary("chromedriver") {
+-    testonly = true
+-    binary_input = "$root_out_dir/$chromedriver_output"
+-    symbol_output = "$root_out_dir/chromedriver.debug"
+-    stripped_binary_output = "$root_out_dir/chromedriver"
+-    deps = [ ":$chromedriver_output" ]
+-  }
+-}
+-
+ python_library("chromedriver_py_tests") {
+   testonly = true
+   deps = [
diff --git a/srcpkgs/qt6-webengine/patches/0110-chromium-revert-use-ffile-compilation-dir.patch b/srcpkgs/qt6-webengine/patches/0110-chromium-revert-use-ffile-compilation-dir.patch
new file mode 100644
index 000000000000..a00f7ea80f7a
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0110-chromium-revert-use-ffile-compilation-dir.patch
@@ -0,0 +1,57 @@
+From 34a955823630096f5b01c2b01d51c1ea59d22763 Mon Sep 17 00:00:00 2001
+From: Zequan Wu <zequanwu@google.com>
+Date: Tue, 20 Jul 2021 14:13:50 +0000
+Subject: [PATCH] Use -ffile-compilation-dir= instead of
+ -fdebug-compilation-dir=
+
+Bug: 1010267
+Change-Id: If2b4ead8535a76490eb466a38e3d8fed6ea91079
+Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2770738
+Auto-Submit: Zequan Wu <zequanwu@google.com>
+Commit-Queue: Nico Weber <thakis@chromium.org>
+Reviewed-by: Nico Weber <thakis@chromium.org>
+Cr-Commit-Position: refs/heads/master@{#903456}
+--- a/src/3rdparty/chromium/build/config/compiler/BUILD.gn
++++ b/src/3rdparty/chromium/build/config/compiler/BUILD.gn
+@@ -1269,19 +1269,12 @@ config("compiler_deterministic") {
+     # different build directory like "out/feature_a" and "out/feature_b" if
+     # we build same files with same compile flag.
+     # Other paths are already given in relative, no need to normalize them.
+-    if (is_nacl) {
+-      # TODO(https://crbug.com/1231236): Use -ffile-compilation-dir= here.
+-      cflags += [
+-        "-Xclang",
+-        "-fdebug-compilation-dir",
+-        "-Xclang",
+-        ".",
+-      ]
+-    } else {
+-      # -ffile-compilation-dir is an alias for both -fdebug-compilation-dir=
+-      # and -fcoverage-compilation-dir=.
+-      cflags += [ "-ffile-compilation-dir=." ]
+-    }
++    cflags += [
++      "-Xclang",
++      "-fdebug-compilation-dir",
++      "-Xclang",
++      ".",
++    ]
+     if (!is_win) {
+       # We don't use clang -cc1as on Windows (yet? https://crbug.com/762167)
+       asmflags = [ "-Wa,-fdebug-compilation-dir,." ]
+--- a/src/3rdparty/chromium/build/config/compiler/compiler.gni
++++ b/src/3rdparty/chromium/build/config/compiler/compiler.gni
+@@ -228,8 +228,11 @@ declare_args() {
+ # deterministic builds to reduce compile times, so this is less relevant for
+ # official builders.
+ strip_absolute_paths_from_debug_symbols_default =
+-    is_android || is_fuchsia || is_nacl || (is_win && use_lld) || is_linux ||
+-    is_chromeos || (is_apple && !enable_dsyms)
++    # TODO(crbug.com/1010267): remove '!use_clang_coverage', coverage build has
++    # dependency to absolute path of source files.
++    !use_clang_coverage &&
++    (is_android || is_fuchsia || is_nacl || (is_win && use_lld) || is_linux ||
++     is_chromeos || (is_apple && !enable_dsyms))
+ 
+ declare_args() {
+   strip_absolute_paths_from_debug_symbols = strip_absolute_paths_from_debug_symbols_default
diff --git a/srcpkgs/qt6-webengine/patches/0111-chromium-no-Wno-stringop-overread.patch b/srcpkgs/qt6-webengine/patches/0111-chromium-no-Wno-stringop-overread.patch
new file mode 100644
index 000000000000..03eac3f8e067
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0111-chromium-no-Wno-stringop-overread.patch
@@ -0,0 +1,10 @@
+--- a/src/3rdparty/chromium/build/config/compiler/BUILD.gn
++++ b/src/3rdparty/chromium/build/config/compiler/BUILD.gn
+@@ -394,7 +394,6 @@ config("compiler") {
+         "-Wno-parentheses",
+         "-Wno-sign-compare", # fido
+         "-Wno-stringop-overflow", # skia, libaom, protobuf, icu
+-        "-Wno-stringop-overread", # libaom
+         "-Wno-psabi", # skia
+         "-Wno-multichar", # crashpad
+         "-Wno-format-zero-length", # user_agent.cc
diff --git a/srcpkgs/qt6-webengine/patches/0150-chromium-glibc-libc_malloc.patch b/srcpkgs/qt6-webengine/patches/0150-chromium-glibc-libc_malloc.patch
new file mode 100644
index 000000000000..7e1b66e5c73d
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0150-chromium-glibc-libc_malloc.patch
@@ -0,0 +1,24 @@
+--- a/src/3rdparty/chromium/base/process/memory_linux.cc
++++ b/src/3rdparty/chromium/base/process/memory_linux.cc
+@@ -23,6 +23,12 @@
+ #include "third_party/tcmalloc/chromium/src/gperftools/tcmalloc.h"
+ #endif
+ 
++#if defined(LIBC_GLIBC)
++extern "C" {
++extern void *__libc_malloc(size_t size);
++}
++#endif
++
+ namespace base {
+ 
+ namespace {
+@@ -120,7 +126,7 @@ bool UncheckedMalloc(size_t size, void**
+     (!defined(LIBC_GLIBC) && !BUILDFLAG(USE_TCMALLOC))
+   *result = malloc(size);
+ #elif defined(LIBC_GLIBC) && !BUILDFLAG(USE_TCMALLOC)
+-  *result = __libc_malloc(size);
++  *result = ::__libc_malloc(size);
+ #elif BUILDFLAG(USE_TCMALLOC)
+   *result = tc_malloc_skip_new_handler(size);
+ #endif
diff --git a/srcpkgs/qt6-webengine/patches/0200-chromium-musl-include-sys-reg.h-to-get-__WORDSIZE.patch b/srcpkgs/qt6-webengine/patches/0200-chromium-musl-include-sys-reg.h-to-get-__WORDSIZE.patch
new file mode 100644
index 000000000000..41b90071b5e4
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0200-chromium-musl-include-sys-reg.h-to-get-__WORDSIZE.patch
@@ -0,0 +1,21 @@
+From 9001c54d6b974449174a8cee8f3f5d78a9bd6c9e Mon Sep 17 00:00:00 2001
+From: Felix Janda <felix.janda@posteo.de>
+Date: Sun, 1 Feb 2015 14:26:52 +0100
+Subject: [PATCH 3/6] include <sys/reg.h> to get __WORDSIZE on musl libc
+
+---
+ qtwebengine/src/3rdparty/chromium/third_party/breakpad/breakpad/src/common/linux/elf_core_dump.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/common/linux/elf_core_dump.h
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/common/linux/elf_core_dump.h
+@@ -37,6 +37,9 @@
+ #include <limits.h>
+ #include <link.h>
+ #include <stddef.h>
++#ifndef __GLIBC__
++#include <sys/reg.h>
++#endif
+ 
+ #include "common/memory_range.h"
+ 
diff --git a/srcpkgs/qt6-webengine/patches/0201-chromium-musl-dispatch-to-musl.patch b/srcpkgs/qt6-webengine/patches/0201-chromium-musl-dispatch-to-musl.patch
new file mode 100644
index 000000000000..a58a688a4b55
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0201-chromium-musl-dispatch-to-musl.patch
@@ -0,0 +1,103 @@
+--- a/src/3rdparty/chromium/base/allocator/allocator_shim_default_dispatch_to_glibc.cc
++++ b/src/3rdparty/chromium/base/allocator/allocator_shim_default_dispatch_to_glibc.cc
+@@ -8,6 +8,7 @@
+ #include <dlfcn.h>
+ #include <malloc.h>
+ 
++#if defined(__GLIBC__)
+ // This translation unit defines a default dispatch for the allocator shim which
+ // routes allocations to libc functions.
+ // The code here is strongly inspired from tcmalloc's libc_override_glibc.h.
+@@ -87,3 +88,92 @@ const AllocatorDispatch AllocatorDispatc
+     nullptr,               /* aligned_free_function */
+     nullptr,               /* next */
+ };
++
++#else // defined(__GLIBC__)
++
++#include <dlfcn.h>
++
++extern "C" {
++// Declare function pointers to the memory functions
++typedef void* (*t_libc_malloc)(size_t size);
++typedef void* (*t_libc_calloc)(size_t n, size_t size);
++typedef void* (*t_libc_realloc)(void* address, size_t size);
++typedef void* (*t_libc_memalign)(size_t alignment, size_t size);
++typedef void (*t_libc_free)(void* ptr);
++typedef size_t (*t_libc_malloc_usable_size)(void* ptr);
++
++// Static instances of pointers to libc.so dl symbols
++static t_libc_malloc libc_malloc = NULL;
++static t_libc_calloc libc_calloc = NULL;
++static t_libc_realloc libc_realloc = NULL;
++static t_libc_memalign libc_memalign = NULL;
++static t_libc_free libc_free = NULL;
++static t_libc_malloc_usable_size libc_malloc_usable_size = NULL;
++
++// resolve the symbols in libc.so
++void musl_libc_memory_init(void)
++{
++  libc_malloc = (t_libc_malloc) dlsym(RTLD_NEXT, "malloc");
++  libc_calloc = (t_libc_calloc) dlsym(RTLD_NEXT, "calloc");
++  libc_realloc = (t_libc_realloc) dlsym(RTLD_NEXT, "realloc");
++  libc_memalign = (t_libc_memalign) dlsym(RTLD_NEXT, "memalign");
++  libc_free = (t_libc_free) dlsym(RTLD_NEXT, "free");
++  libc_malloc_usable_size = (t_libc_malloc_usable_size) dlsym(RTLD_NEXT, "malloc_usable_size");
++}
++}  // extern "C"
++
++namespace {
++
++using base::allocator::AllocatorDispatch;
++
++void* MuslMalloc(const AllocatorDispatch*, size_t size, void* context) {
++  if (!libc_malloc)
++    musl_libc_memory_init();
++  return (*libc_malloc)(size);
++}
++
++void* MuslCalloc(const AllocatorDispatch*, size_t n, size_t size, void* context) {
++  if (!libc_calloc)
++    musl_libc_memory_init();
++  return (*libc_calloc)(n, size);
++}
++
++void* MuslRealloc(const AllocatorDispatch*, void* address, size_t size, void* context) {
++  if (!libc_realloc)
++    musl_libc_memory_init();
++  return (*libc_realloc)(address, size);
++}
++
++void* MuslMemalign(const AllocatorDispatch*, size_t alignment, size_t size, void* context) {
++  if (!libc_memalign)
++    musl_libc_memory_init();
++  return (*libc_memalign)(alignment, size);
++}
++
++void MuslFree(const AllocatorDispatch*, void* address, void* context) {
++  if (!libc_free)
++    musl_libc_memory_init();
++  (*libc_free)(address);
++}
++
++size_t MuslGetSizeEstimate(const AllocatorDispatch*, void* address, void* context) {
++  // TODO(siggi, primiano): malloc_usable_size may need redirection in the
++  //     presence of interposing shims that divert allocations.
++  if (!libc_malloc_usable_size)
++    musl_libc_memory_init();
++  return (*libc_malloc_usable_size)(address);
++}
++
++}  // namespace
++
++const AllocatorDispatch AllocatorDispatch::default_dispatch = {
++    &MuslMalloc,           /* alloc_function */
++    &MuslCalloc,           /* alloc_zero_initialized_function */
++    &MuslMemalign,         /* alloc_aligned_function */
++    &MuslRealloc,          /* realloc_function */
++    &MuslFree,             /* free_function */
++    &MuslGetSizeEstimate,  /* get_size_estimate_function */
++    nullptr,               /* next */
++};
++
++#endif
diff --git a/srcpkgs/qt6-webengine/patches/0202-chromium-musl-no-mallinfo.patch b/srcpkgs/qt6-webengine/patches/0202-chromium-musl-no-mallinfo.patch
new file mode 100644
index 000000000000..a5bdb5a43a5f
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0202-chromium-musl-no-mallinfo.patch
@@ -0,0 +1,62 @@
+--- a/src/3rdparty/chromium/base/process/process_metrics_posix.cc
++++ b/src/3rdparty/chromium/base/process/process_metrics_posix.cc
+@@ -105,7 +105,7 @@ void IncreaseFdLimitTo(unsigned int max_
+ 
+ #endif  // !defined(OS_FUCHSIA)
+ 
+-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID)
++#if (defined(OS_LINUX) && defined(__GLIBC__)) || defined(OS_CHROMEOS) || defined(OS_ANDROID)
+ namespace {
+ 
+ size_t GetMallocUsageMallinfo() {
+@@ -127,16 +127,16 @@ size_t GetMallocUsageMallinfo() {
+ }
+ 
+ }  // namespace
+-#endif  // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID)
++#endif  // (defined(OS_LINUX) && defined(__GLIBC__)) || defined(OS_CHROMEOS) || defined(OS_ANDROID)
+ 
+ size_t ProcessMetrics::GetMallocUsage() {
+ #if defined(OS_APPLE)
+   malloc_statistics_t stats = {0};
+   malloc_zone_statistics(nullptr, &stats);
+   return stats.size_in_use;
+-#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID)
++#elif (defined(OS_LINUX) && defined(__GLIBC__)) || defined(OS_CHROMEOS) || defined(OS_ANDROID)
+   return GetMallocUsageMallinfo();
+-#elif defined(OS_FUCHSIA)
++#else
+   // TODO(fuchsia): Not currently exposed. https://crbug.com/735087.
+   return 0;
+ #endif
+--- a/src/3rdparty/chromium/third_party/tflite/src/tensorflow/lite/profiling/memory_info.cc
++++ b/src/3rdparty/chromium/third_party/tflite/src/tensorflow/lite/profiling/memory_info.cc
+@@ -27,7 +27,7 @@ namespace memory {
+ const int MemoryUsage::kValueNotSet = 0;
+ 
+ bool MemoryUsage::IsSupported() {
+-#ifdef __linux__
++#ifdef __GLIBC__
+   return true;
+ #endif
+   return false;
+@@ -35,7 +35,7 @@ bool MemoryUsage::IsSupported() {
+ 
+ MemoryUsage GetMemoryUsage() {
+   MemoryUsage result;
+-#ifdef __linux__
++#ifdef __GLIBC__
+   rusage res;
+   if (getrusage(RUSAGE_SELF, &res) == 0) {
+     result.max_rss_kb = res.ru_maxrss;
+--- a/src/3rdparty/chromium/base/trace_event/malloc_dump_provider.cc
++++ b/src/3rdparty/chromium/base/trace_event/malloc_dump_provider.cc
+@@ -213,7 +213,7 @@ bool MallocDumpProvider::OnMemoryDump(co
+                      &allocated_objects_count);
+ #elif defined(OS_FUCHSIA)
+ // TODO(fuchsia): Port, see https://crbug.com/706592.
+-#else
++#elif defined(__GLIBC__)
+ #if defined(__GLIBC__) && defined(__GLIBC_PREREQ)
+ #if __GLIBC_PREREQ(2, 33)
+ #define MALLINFO2_FOUND_IN_LIBC
diff --git a/srcpkgs/qt6-webengine/patches/0203-chromium-musl-siginfo_t.patch b/srcpkgs/qt6-webengine/patches/0203-chromium-musl-siginfo_t.patch
new file mode 100644
index 000000000000..43ef7fd7c5d2
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0203-chromium-musl-siginfo_t.patch
@@ -0,0 +1,18 @@
+There's a subtle difference in the internal name of siginfo_t fields
+between glibc and musl. The structure itself is equivalent, so it
+should suffice to add a macro to rename the field.
+
+--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf/trap.cc
++++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf/trap.cc
+@@ -174,7 +174,11 @@ void Trap::SigSys(int nr, LinuxSigInfo*
+   // If the version of glibc doesn't include this information in
+   // siginfo_t (older than 2.17), we need to explicitly copy it
+   // into an arch_sigsys structure.
++#if defined(__GLIBC__)
+   memcpy(&sigsys, &info->_sifields, sizeof(sigsys));
++#else
++  memcpy(&sigsys, &info->__si_fields, sizeof(sigsys));
++#endif
+ #endif
+ 
+ #if defined(__mips__)
diff --git a/srcpkgs/qt6-webengine/patches/0204-chromium-musl-stackstart.patch b/srcpkgs/qt6-webengine/patches/0204-chromium-musl-stackstart.patch
new file mode 100644
index 000000000000..b03cf43b86db
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0204-chromium-musl-stackstart.patch
@@ -0,0 +1,20 @@
+--- a/src/3rdparty/chromium/third_party/blink/renderer/platform/wtf/stack_util.cc
++++ b/src/3rdparty/chromium/third_party/blink/renderer/platform/wtf/stack_util.cc
+@@ -29,7 +29,7 @@ size_t GetUnderestimatedStackSize() {
+ // FIXME: On Mac OSX and Linux, this method cannot estimate stack size
+ // correctly for the main thread.
+ 
+-#elif defined(__GLIBC__) || defined(OS_ANDROID) || defined(OS_FREEBSD) || \
++#elif defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FREEBSD) || \
+     defined(OS_FUCHSIA)
+   // pthread_getattr_np() can fail if the thread is not invoked by
+   // pthread_create() (e.g., the main thread of blink_unittests).
+@@ -97,7 +97,7 @@ return Threading::ThreadStackSize();
+ }
+ 
+ void* GetStackStart() {
+-#if defined(__GLIBC__) || defined(OS_ANDROID) || defined(OS_FREEBSD) || \
++#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FREEBSD) || \
+     defined(OS_FUCHSIA)
+   pthread_attr_t attr;
+   int error;
diff --git a/srcpkgs/qt6-webengine/patches/0205-chromium-musl-sandbox.patch b/srcpkgs/qt6-webengine/patches/0205-chromium-musl-sandbox.patch
new file mode 100644
index 000000000000..772a578fd823
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0205-chromium-musl-sandbox.patch
@@ -0,0 +1,92 @@
+--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc
++++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc
+@@ -138,7 +138,7 @@ namespace sandbox {
+ // present (as in newer versions of posix_spawn).
+ ResultExpr RestrictCloneToThreadsAndEPERMFork() {
+   const Arg<unsigned long> flags(0);
+-
++#if defined(__GLIBC__)
+   // TODO(mdempsky): Extend DSL to support (flags & ~mask1) == mask2.
+   const uint64_t kAndroidCloneMask = CLONE_VM | CLONE_FS | CLONE_FILES |
+                                      CLONE_SIGHAND | CLONE_THREAD |
+@@ -165,6 +165,17 @@ ResultExpr RestrictCloneToThreadsAndEPER
+   return If(IsAndroid() ? android_test : glibc_test, Allow())
+       .ElseIf(is_fork_or_clone_vfork, Error(EPERM))
+       .Else(CrashSIGSYSClone());
++#else
++  const int required = CLONE_VM | CLONE_FS | CLONE_FILES | CLONE_SIGHAND |
++                       CLONE_THREAD | CLONE_SYSVSEM;
++  const int safe = CLONE_SETTLS | CLONE_PARENT_SETTID | CLONE_CHILD_CLEARTID |
++                   CLONE_DETACHED;
++  const BoolExpr thread_clone_ok = (flags&~safe)==required;
++
++  return If(thread_clone_ok, Allow())
++      .ElseIf((flags & (CLONE_VM | CLONE_THREAD)) == 0, Error(EPERM))
++      .Else(CrashSIGSYSClone());
++#endif
+ }
+ 
+ #ifndef PR_PAC_RESET_KEYS
+--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
++++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
+@@ -419,6 +419,9 @@ bool SyscallSets::IsAllowedProcessStartO
+ #if defined(__i386__)
+     case __NR_waitpid:
+ #endif
++#if !defined(__GLIBC__)
++    case __NR_set_tid_address:
++#endif
+       return true;
+     case __NR_clone:  // Should be parameter-restricted.
+     case __NR_setns:  // Privileged.
+@@ -431,7 +434,9 @@ bool SyscallSets::IsAllowedProcessStartO
+ #if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
+     case __NR_set_thread_area:
+ #endif
++#if defined(__GLIBC__)
+     case __NR_set_tid_address:
++#endif
+     case __NR_unshare:
+ #if !defined(__mips__) && !defined(__aarch64__)
+     case __NR_vfork:
+@@ -545,6 +550,9 @@ bool SyscallSets::IsAllowedAddressSpaceA
+     case __NR_mlock:
+     case __NR_munlock:
+     case __NR_munmap:
++#if !defined(__GLIBC__)
++    case __NR_mremap:
++#endif
+       return true;
+     case __NR_madvise:
+     case __NR_mincore:
+@@ -562,7 +570,9 @@ bool SyscallSets::IsAllowedAddressSpaceA
+     case __NR_modify_ldt:
+ #endif
+     case __NR_mprotect:
++#if defined(__GLIBC__)
+     case __NR_mremap:
++#endif
+     case __NR_msync:
+     case __NR_munlockall:
+     case __NR_readahead:
+--- a/src/3rdparty/chromium/sandbox/policy/linux/bpf_renderer_policy_linux.cc
++++ b/src/3rdparty/chromium/sandbox/policy/linux/bpf_renderer_policy_linux.cc
+@@ -97,11 +97,18 @@ ResultExpr RendererProcessPolicy::Evalua
+     case __NR_sysinfo:
+     case __NR_times:
+     case __NR_uname:
++#if !defined(__GLIBC__)
++    case __NR_sched_getparam:
++    case __NR_sched_getscheduler:
++    case __NR_sched_setscheduler:
++#endif
+       return Allow();
+     case __NR_sched_getaffinity:
++#if defined(__GLIBC__)
+     case __NR_sched_getparam:
+     case __NR_sched_getscheduler:
+     case __NR_sched_setscheduler:
++#endif
+       return RestrictSchedTarget(GetPolicyPid(), sysno);
+     case __NR_prlimit64:
+       // See crbug.com/662450 and setrlimit comment above.
diff --git a/srcpkgs/qt6-webengine/patches/0206-chromium-musl-default-stacksize.patch b/srcpkgs/qt6-webengine/patches/0206-chromium-musl-default-stacksize.patch
new file mode 100644
index 000000000000..bc07495b8144
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0206-chromium-musl-default-stacksize.patch
@@ -0,0 +1,15 @@
+--- a/src/3rdparty/chromium/base/threading/platform_thread_linux.cc
++++ b/src/3rdparty/chromium/base/threading/platform_thread_linux.cc
+@@ -439,7 +439,12 @@ void TerminateOnThread() {}
+ 
+ size_t GetDefaultThreadStackSize(const pthread_attr_t& attributes) {
+ #if !defined(THREAD_SANITIZER)
++#if defined(__GLIBC__)
+   return 0;
++#else // defined(__GLIBC__)
++  // For Musl libc try with a default stack size of 2 MiB
++  return 2 * 1024 * 1024;
++#endif // !defined(__GLIBC__)
+ #else
+   // ThreadSanitizer bloats the stack heavily. Evidence has been that the
+   // default stack size isn't enough for some browser tests.
diff --git a/srcpkgs/qt6-webengine/patches/0207-chromium-musl-cross-no-asm_ptrace_h.patch b/srcpkgs/qt6-webengine/patches/0207-chromium-musl-cross-no-asm_ptrace_h.patch
new file mode 100644
index 000000000000..3cf132908af4
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0207-chromium-musl-cross-no-asm_ptrace_h.patch
@@ -0,0 +1,30 @@
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper.cc
+@@ -38,7 +38,12 @@
+ 
+ #include "client/linux/minidump_writer/linux_ptrace_dumper.h"
+ 
++#if defined(__GLIBC__)
+ #include <asm/ptrace.h>
++#else
++/* For arm*-musl this definition is missing */
++#define ARM_sp uregs[13]
++#endif
+ #include <assert.h>
+ #include <errno.h>
+ #include <fcntl.h>
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_core_dumper.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_core_dumper.cc
+@@ -32,7 +32,12 @@
+ 
+ #include "client/linux/minidump_writer/linux_core_dumper.h"
+ 
++#if defined(__GLIBC__)
+ #include <asm/ptrace.h>
++#else
++/* For arm*-musl this definition is missing */
++#define ARM_sp uregs[13]
++#endif
+ #include <assert.h>
+ #include <elf.h>
+ #include <stdio.h>
diff --git a/srcpkgs/qt6-webengine/patches/0208-chromium-musl-execinfo.patch b/srcpkgs/qt6-webengine/patches/0208-chromium-musl-execinfo.patch
new file mode 100644
index 000000000000..9f3b964676b3
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0208-chromium-musl-execinfo.patch
@@ -0,0 +1,125 @@
+--- a/src/3rdparty/chromium/base/debug/stack_trace.cc
++++ b/src/3rdparty/chromium/base/debug/stack_trace.cc
+@@ -252,7 +252,9 @@ void StackTrace::Print() const {
+ }
+ 
+ void StackTrace::OutputToStream(std::ostream* os) const {
++#if defined(__GLIBC__) && !defined(_AIX)
+   OutputToStreamWithPrefix(os, nullptr);
++#endif
+ }
+ 
+ std::string StackTrace::ToString() const {
+@@ -260,7 +262,7 @@ std::string StackTrace::ToString() const
+ }
+ std::string StackTrace::ToStringWithPrefix(const char* prefix_string) const {
+   std::stringstream stream;
+-#if !defined(__UCLIBC__) && !defined(_AIX)
++#if defined(__GLIBC__) && !defined(_AIX)
+   OutputToStreamWithPrefix(&stream, prefix_string);
+ #endif
+   return stream.str();
+--- a/src/3rdparty/chromium/base/debug/stack_trace_posix.cc
++++ b/src/3rdparty/chromium/base/debug/stack_trace_posix.cc
+@@ -27,7 +27,7 @@
+ #if !defined(USE_SYMBOLIZE)
+ #include <cxxabi.h>
+ #endif
+-#if !defined(__UCLIBC__) && !defined(_AIX)
++#if defined(__GLIBC__) && !defined(_AIX)
+ #include <execinfo.h>
+ #endif
+ 
+@@ -89,7 +89,7 @@ void DemangleSymbols(std::string* text)
+   // Note: code in this function is NOT async-signal safe (std::string uses
+   // malloc internally).
+ 
+-#if !defined(__UCLIBC__) && !defined(_AIX)
++#if defined(__GLIBC__) && !defined(_AIX)
+   std::string::size_type search_from = 0;
+   while (search_from < text->size()) {
+     // Look for the start of a mangled symbol, from search_from.
+@@ -124,7 +124,7 @@ void DemangleSymbols(std::string* text)
+       search_from = mangled_start + 2;
+     }
+   }
+-#endif  // !defined(__UCLIBC__) && !defined(_AIX)
++#endif  // !defined(__GLIBC__) && !defined(_AIX)
+ }
+ #endif  // !defined(USE_SYMBOLIZE)
+ 
+@@ -136,7 +136,7 @@ class BacktraceOutputHandler {
+   virtual ~BacktraceOutputHandler() = default;
+ };
+ 
+-#if !defined(__UCLIBC__) && !defined(_AIX)
++#if defined(__GLIBC__) && !defined(_AIX)
+ void OutputPointer(void* pointer, BacktraceOutputHandler* handler) {
+   // This should be more than enough to store a 64-bit number in hex:
+   // 16 hex digits + 1 for null-terminator.
+@@ -219,7 +219,7 @@ void ProcessBacktrace(void* const* trace
+   }
+ #endif  // defined(USE_SYMBOLIZE)
+ }
+-#endif  // !defined(__UCLIBC__) && !defined(_AIX)
++#endif  // !defined(__GLIBC__) && !defined(_AIX)
+ 
+ void PrintToStderr(const char* output) {
+   // NOTE: This code MUST be async-signal safe (it's used by in-process
+@@ -839,7 +839,7 @@ size_t CollectStackTrace(void** trace, s
+   // If we do not have unwind tables, then try tracing using frame pointers.
+   return base::debug::TraceStackFramePointers(const_cast<const void**>(trace),
+                                               count, 0);
+-#elif !defined(__UCLIBC__) && !defined(_AIX)
++#elif defined(__GLIBC__) && !defined(_AIX)
+   // Though the backtrace API man page does not list any possible negative
+   // return values, we take no chance.
+   return base::saturated_cast<size_t>(backtrace(trace, count));
+@@ -852,13 +852,13 @@ void StackTrace::PrintWithPrefix(const c
+ // NOTE: This code MUST be async-signal safe (it's used by in-process
+ // stack dumping signal handler). NO malloc or stdio is allowed here.
+ 
+-#if !defined(__UCLIBC__) && !defined(_AIX)
++#if defined(__GLIBC__) && !defined(_AIX)
+   PrintBacktraceOutputHandler handler;
+   ProcessBacktrace(trace_, count_, prefix_string, &handler);
+ #endif
+ }
+ 
+-#if !defined(__UCLIBC__) && !defined(_AIX)
++#if defined(__GLIBC__) && !defined(_AIX)
+ void StackTrace::OutputToStreamWithPrefix(std::ostream* os,
+                                           const char* prefix_string) const {
+   StreamBacktraceOutputHandler handler(os);
+--- a/src/3rdparty/chromium/base/logging.cc
++++ b/src/3rdparty/chromium/base/logging.cc
+@@ -582,7 +582,7 @@ LogMessage::LogMessage(const char* file,
+ 
+ LogMessage::~LogMessage() {
+   size_t stack_start = stream_.tellp();
+-#if !defined(OFFICIAL_BUILD) && !defined(OS_NACL) && !defined(__UCLIBC__) && \
++#if !defined(OFFICIAL_BUILD) && !defined(OS_NACL) && defined(__GLIBC__) && \
+     !defined(OS_AIX)
+   if (severity_ == LOGGING_FATAL && !base::debug::BeingDebugged()) {
+     // Include a stack trace on a fatal, unless a debugger is attached.
+--- 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 @@
+ 
+ #if defined(DEBUG) && defined(V8_OS_LINUX) && !defined(V8_OS_ANDROID)
+ #define SYMBOLIZE_FUNCTION
++#if defined(__GLIBC__)
+ #include <execinfo.h>
++#endif
+ 
+ #include <vector>
+ 
+@@ -103,7 +105,7 @@ void ExternalReferenceTable::Init(Isolat
+ }
+ 
+ const char* ExternalReferenceTable::ResolveSymbol(void* address) {
+-#ifdef SYMBOLIZE_FUNCTION
++#if defined(SYMBOLIZE_FUNCTION) && defined(__GLIBC__)
+   char** names = backtrace_symbols(&address, 1);
+   const char* name = names[0];
+   // The array of names is malloc'ed. However, each name string is static
diff --git a/srcpkgs/qt6-webengine/patches/0209-chromium-musl-thread-stacksize.patch b/srcpkgs/qt6-webengine/patches/0209-chromium-musl-thread-stacksize.patch
new file mode 100644
index 000000000000..4b760a428b25
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0209-chromium-musl-thread-stacksize.patch
@@ -0,0 +1,22 @@
+--- a/src/3rdparty/chromium/ppapi/utility/threading/simple_thread.cc
++++ b/src/3rdparty/chromium/ppapi/utility/threading/simple_thread.cc
+@@ -13,7 +13,7 @@ namespace pp {
+ namespace {
+ 
+ // Use 2MB default stack size for Native Client, otherwise use system default.
+-#if defined(__native_client__)
++#if defined(__native_client__) || !defined(__GLIBC__)
+ const size_t kDefaultStackSize = 2 * 1024 * 1024;
+ #else
+ const size_t kDefaultStackSize = 0;
+--- a/src/3rdparty/chromium/v8/src/base/platform/platform-posix.cc
++++ b/src/3rdparty/chromium/v8/src/base/platform/platform-posix.cc
+@@ -883,7 +883,7 @@ bool Thread::Start() {
+ #if V8_OS_MACOSX
+     // Default on Mac OS X is 512kB -- bump up to 1MB
+     stack_size = 1 * 1024 * 1024;
+-#elif V8_OS_AIX
++#elif V8_OS_AIX || !defined(__GLIBC__)
+     // Default on AIX is 96kB -- bump up to 2MB
+     stack_size = 2 * 1024 * 1024;
+ #endif
diff --git a/srcpkgs/qt6-webengine/patches/0210-chromium-musl-msgvec-push_back.patch b/srcpkgs/qt6-webengine/patches/0210-chromium-musl-msgvec-push_back.patch
new file mode 100644
index 000000000000..905daa223700
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0210-chromium-musl-msgvec-push_back.patch
@@ -0,0 +1,14 @@
+--- a/src/3rdparty/chromium/net/socket/udp_socket_posix.cc
++++ b/src/3rdparty/chromium/net/socket/udp_socket_posix.cc
+@@ -1162,7 +1162,11 @@ SendResult UDPSocketPosixSender::Interna
+     msg_iov->push_back({const_cast<char*>(buffer->data()), buffer->length()});
+   msgvec->reserve(buffers.size());
+   for (size_t j = 0; j < buffers.size(); j++)
++#if defined(__GLIBC__)
+     msgvec->push_back({{nullptr, 0, &msg_iov[j], 1, nullptr, 0, 0}, 0});
++#else
++    msgvec->push_back({{nullptr, 0, &msg_iov[j], 1, 0, 0, 0}, 0});
++#endif
+   int result = HANDLE_EINTR(Sendmmsg(fd, &msgvec[0], buffers.size(), 0));
+   SendResult send_result(0, 0, std::move(buffers));
+   if (result < 0) {
diff --git a/srcpkgs/qt6-webengine/patches/0211-chromium-musl-canonicalize-file-name-musl.patch b/srcpkgs/qt6-webengine/patches/0211-chromium-musl-canonicalize-file-name-musl.patch
new file mode 100644
index 000000000000..d43e6bd488bc
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0211-chromium-musl-canonicalize-file-name-musl.patch
@@ -0,0 +1,11 @@
+--- a/src/3rdparty/chromium/third_party/nasm/nasmlib/realpath.c
++++ b/src/3rdparty/chromium/third_party/nasm/nasmlib/realpath.c
+@@ -55,7 +55,7 @@
+  */
+ char *nasm_realpath(const char *rel_path)
+ {
+-    char *rp = canonicalize_file_name(rel_path);
++    char *rp = realpath(rel_path, NULL);
+     return rp ? rp : nasm_strdup(rel_path);
+ }
+ 
diff --git a/srcpkgs/qt6-webengine/patches/0212-chromium-musl-no-getcontext.patch b/srcpkgs/qt6-webengine/patches/0212-chromium-musl-no-getcontext.patch
new file mode 100644
index 000000000000..5755f1b45a7d
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0212-chromium-musl-no-getcontext.patch
@@ -0,0 +1,29 @@
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc
+@@ -489,8 +489,10 @@ bool ExceptionHandler::SimulateSignalDel
+   // ExceptionHandler::HandleSignal().
+   siginfo.si_code = SI_USER;
+   siginfo.si_pid = getpid();
+-  ucontext_t context;
++  ucontext_t context = { 0 };
++#if defined(__GLIBC__)
+   getcontext(&context);
++#endif
+   return HandleSignal(sig, &siginfo, &context);
+ }
+ 
+@@ -675,9 +677,14 @@ bool ExceptionHandler::WriteMinidump() {
+   sys_prctl(PR_SET_DUMPABLE, 1, 0, 0, 0);
+ 
+   CrashContext context;
++
++#if defined(__GLIBC__)
+   int getcontext_result = getcontext(&context.context);
+   if (getcontext_result)
+     return false;
++#else
++  return false;
++#endif
+ 
+ #if defined(__i386__)
+   // In CPUFillFromUContext in minidumpwriter.cc the stack pointer is retrieved
diff --git a/srcpkgs/qt6-webengine/patches/0213-chromium-musl-crashpad.patch b/srcpkgs/qt6-webengine/patches/0213-chromium-musl-crashpad.patch
new file mode 100644
index 000000000000..4d49997ed4f3
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0213-chromium-musl-crashpad.patch
@@ -0,0 +1,22 @@
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/compat/linux/sys/ptrace.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/compat/linux/sys/ptrace.h
+@@ -17,7 +17,9 @@
+ 
+ #include_next <sys/ptrace.h>
+ 
++#ifdef __GLIBC__
+ #include <sys/cdefs.h>
++#endif
+ 
+ // https://sourceware.org/bugzilla/show_bug.cgi?id=22433
+ #if !defined(PTRACE_GET_THREAD_AREA) && !defined(PT_GET_THREAD_AREA) && \
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/util/linux/ptracer.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/util/linux/ptracer.cc
+@@ -26,6 +26,7 @@
+ 
+ #if defined(ARCH_CPU_X86_FAMILY)
+ #include <asm/ldt.h>
++#include <asm/ptrace-abi.h>
+ #endif
+ 
+ namespace crashpad {
diff --git a/srcpkgs/qt6-webengine/patches/0214-chromium-musl-fixes.patch b/srcpkgs/qt6-webengine/patches/0214-chromium-musl-fixes.patch
new file mode 100644
index 000000000000..55b267ed1714
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0214-chromium-musl-fixes.patch
@@ -0,0 +1,108 @@
+--- a/src/3rdparty/chromium/sandbox/linux/suid/process_util.h
++++ b/src/3rdparty/chromium/sandbox/linux/suid/process_util.h
+@@ -12,6 +12,15 @@
+ #include <stdint.h>
+ #include <sys/types.h>
+ 
++#if !defined(__GLIBC__) && !defined(TEMP_FAILURE_RETRY)
++# define TEMP_FAILURE_RETRY(expression) \
++	(__extension__			\
++	 ({ long int __result;		\
++	  do __result = (long int) (expression); \
++	  while (__result == -1L && errno == EINTR); \
++	  __result; }))
++#endif
++
+ // This adjusts /proc/process/oom_score_adj so the Linux OOM killer
+ // will prefer certain process types over others. The range for the
+ // adjustment is [-1000, 1000], with [0, 1000] being user accessible.
+--- a/src/3rdparty/chromium/services/device/serial/serial_io_handler_posix.cc
++++ b/src/3rdparty/chromium/services/device/serial/serial_io_handler_posix.cc
+@@ -6,6 +6,7 @@
+ 
+ #include <sys/ioctl.h>
+ #include <termios.h>
++#include <asm-generic/ioctls.h>
+ 
+ #include <algorithm>
+ #include <utility>
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h
+@@ -38,6 +38,10 @@
+ #include "common/memory_allocator.h"
+ #include "google_breakpad/common/minidump_format.h"
+ 
++#ifndef __GLIBC__
++#define _libc_fpstate _fpstate
++#endif
++
+ namespace google_breakpad {
+ 
+ // Wraps platform-dependent implementations of accessors to ucontext_t structs.
+--- a/src/3rdparty/chromium/third_party/ffmpeg/libavutil/cpu.c
++++ b/src/3rdparty/chromium/third_party/ffmpeg/libavutil/cpu.c
+@@ -41,8 +41,10 @@
+ #include <sys/param.h>
+ #endif
+ #include <sys/types.h>
++#ifdef __GLIBC__
+ #include <sys/sysctl.h>
+ #endif
++#endif
+ #if HAVE_UNISTD_H
+ #include <unistd.h>
+ #endif
+--- a/src/3rdparty/chromium/third_party/perfetto/include/perfetto/ext/base/thread_utils.h
++++ b/src/3rdparty/chromium/third_party/perfetto/include/perfetto/ext/base/thread_utils.h
+@@ -29,9 +29,7 @@
+ #include <algorithm>
+ #endif
+ 
+-#if PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID)
+ #include <sys/prctl.h>
+-#endif
+ 
+ // Internal implementation utils that aren't as widely useful/supported as
+ // base/thread_utils.h.
+@@ -58,7 +56,7 @@ inline bool MaybeSetThreadName(const std
+ 
+ inline bool GetThreadName(std::string& out_result) {
+   char buf[16] = {};
+-#if PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID)
++#if !defined(__GLIBC__)
+   if (prctl(PR_GET_NAME, buf) != 0)
+     return false;
+ #else
+--- a/src/3rdparty/chromium/third_party/lss/linux_syscall_support.h
++++ b/src/3rdparty/chromium/third_party/lss/linux_syscall_support.h
+@@ -1300,6 +1300,18 @@ struct kernel_statfs {
+ #ifndef __NR_fallocate
+ #define __NR_fallocate          285
+ #endif
++
++#if !defined(__GLIBC__)
++#ifdef __NR_pread
++#undef __NR_pread
++#endif
++#ifdef __NR_pwrite
++#undef __NR_pwrite
++#endif
++#define __NR_pread __NR_pread64
++#define __NR_pwrite __NR_pwrite64
++#endif /* !defined(__GLIBC__) */
++
+ #ifndef __NR_getrandom
+ #define __NR_getrandom          318
+ #endif
+--- a/src/3rdparty/chromium/net/dns/dns_config_service_posix.cc
++++ b/src/3rdparty/chromium/net/dns/dns_config_service_posix.cc
+@@ -93,7 +93,8 @@ absl::optional<DnsConfig> ReadDnsConfig(
+ 
+   absl::optional<DnsConfig> dns_config;
+ // TODO(fuchsia): Use res_ninit() when it's implemented on Fuchsia.
+-#if defined(OS_OPENBSD) || defined(OS_FUCHSIA)
++#if defined(OS_OPENBSD) || defined(OS_FUCHSIA) || \
++  (defined(OS_LINUX) && !defined(__GLIBC__))
+   // Note: res_ninit in glibc always returns 0 and sets RES_INIT.
+   // res_init behaves the same way.
+   memset(&_res, 0, sizeof(_res));
diff --git a/srcpkgs/qt6-webengine/patches/0215-chromium-musl-cdefs.patch b/srcpkgs/qt6-webengine/patches/0215-chromium-musl-cdefs.patch
new file mode 100644
index 000000000000..9d1daec29118
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0215-chromium-musl-cdefs.patch
@@ -0,0 +1,29 @@
+--- a/src/3rdparty/chromium/third_party/libsync/src/include/sync/sync.h
++++ b/src/3rdparty/chromium/third_party/libsync/src/include/sync/sync.h
+@@ -19,12 +19,13 @@
+ #ifndef __SYS_CORE_SYNC_H
+ #define __SYS_CORE_SYNC_H
+ 
+-#include <sys/cdefs.h>
+ #include <stdint.h>
+ 
+ #include <linux/types.h>
+ 
+-__BEGIN_DECLS
++#ifdef __cplusplus
++extern "C" {
++#endif
+ 
+ struct sync_legacy_merge_data {
+  int32_t fd2;
+@@ -158,6 +159,9 @@ struct sync_pt_info *sync_pt_info(struct
+                                   struct sync_pt_info *itr);
+ void sync_fence_info_free(struct sync_fence_info_data *info);
+ 
+-__END_DECLS
++#ifdef __cplusplus
++}
++#endif
++
+ 
+ #endif /* __SYS_CORE_SYNC_H */
diff --git a/srcpkgs/qt6-webengine/patches/0216-chromium-musl-stat.patch b/srcpkgs/qt6-webengine/patches/0216-chromium-musl-stat.patch
new file mode 100644
index 000000000000..4509a6957cd7
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0216-chromium-musl-stat.patch
@@ -0,0 +1,12 @@
+--- a/src/3rdparty/chromium/base/files/file.h
++++ b/src/3rdparty/chromium/base/files/file.h
+@@ -19,7 +19,8 @@
+ #include "build/build_config.h"
+ 
+ #if defined(OS_BSD) || defined(OS_APPLE) || defined(OS_NACL) || \
+-    defined(OS_FUCHSIA) || (defined(OS_ANDROID) && __ANDROID_API__ < 21)
++    defined(OS_FUCHSIA) || (defined(OS_ANDROID) && __ANDROID_API__ < 21) || \
++    (defined(OS_LINUX) && !defined(__GLIBC__))
+ struct stat;
+ namespace base {
+ typedef struct stat stat_wrapper_t;
diff --git a/srcpkgs/qt6-webengine/patches/0217-chromium-musl-resolver.patch b/srcpkgs/qt6-webengine/patches/0217-chromium-musl-resolver.patch
new file mode 100644
index 000000000000..c3d7afad9b19
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0217-chromium-musl-resolver.patch
@@ -0,0 +1,77 @@
+--- a/src/3rdparty/chromium/net/dns/dns_config_service_linux.cc
++++ b/src/3rdparty/chromium/net/dns/dns_config_service_linux.cc
+@@ -432,11 +432,13 @@ class DnsConfigServiceLinux::ConfigReade
+     base::ScopedBlockingCall scoped_blocking_call(
+         FROM_HERE, base::BlockingType::MAY_BLOCK);
+ 
++#if defined(__GLIBC__)
+     std::unique_ptr<struct __res_state> res = resolv_reader_->GetResState();
+     if (res) {
+       dns_config_ = ConvertResStateToDnsConfig(*res.get());
+       resolv_reader_->CloseResState(res.get());
+     }
++#endif
+ 
+     UMA_HISTOGRAM_BOOLEAN("Net.DNS.DnsConfig.Resolv.Read",
+                           dns_config_.has_value());
+@@ -486,6 +488,7 @@ class DnsConfigServiceLinux::ConfigReade
+ 
+ std::unique_ptr<struct __res_state>
+ DnsConfigServiceLinux::ResolvReader::GetResState() {
++#if defined(__GLIBC__)
+   auto res = std::make_unique<struct __res_state>();
+   memset(res.get(), 0, sizeof(struct __res_state));
+ 
+@@ -495,11 +498,16 @@ DnsConfigServiceLinux::ResolvReader::Get
+   }
+ 
+   return res;
++#else
++  return nullptr;
++#endif
+ }
+ 
+ void DnsConfigServiceLinux::ResolvReader::CloseResState(
+     struct __res_state* res) {
++#if defined(__GLIBC__)
+   res_nclose(res);
++#endif
+ }
+ 
+ DnsConfigServiceLinux::DnsConfigServiceLinux()
+--- a/src/3rdparty/chromium/net/dns/dns_reloader.cc
++++ b/src/3rdparty/chromium/net/dns/dns_reloader.cc
+@@ -4,8 +4,7 @@
+ 
+ #include "net/dns/dns_reloader.h"
+ 
+-#if defined(OS_POSIX) && !defined(OS_APPLE) && !defined(OS_OPENBSD) && \
+-    !defined(OS_ANDROID) && !defined(OS_FUCHSIA)
++#ifdef __GLIBC__
+ 
+ #include <resolv.h>
+ 
+--- a/src/3rdparty/chromium/net/dns/host_resolver_manager.cc
++++ b/src/3rdparty/chromium/net/dns/host_resolver_manager.cc
+@@ -2720,8 +2720,7 @@ HostResolverManager::HostResolverManager
+   NetworkChangeNotifier::AddConnectionTypeObserver(this);
+   if (system_dns_config_notifier_)
+     system_dns_config_notifier_->AddObserver(this);
+-#if defined(OS_POSIX) && !defined(OS_APPLE) && !defined(OS_OPENBSD) && \
+-    !defined(OS_ANDROID)
++#ifdef __GLIBC__
+   EnsureDnsReloaderInit();
+ #endif
+ 
+--- a/src/3rdparty/chromium/net/dns/host_resolver_proc.cc
++++ b/src/3rdparty/chromium/net/dns/host_resolver_proc.cc
+@@ -176,8 +176,7 @@ int SystemHostResolverCall(const std::st
+   base::ScopedBlockingCall scoped_blocking_call(FROM_HERE,
+                                                 base::BlockingType::WILL_BLOCK);
+ 
+-#if defined(OS_POSIX) && !defined(OS_APPLE) && !defined(OS_OPENBSD) && \
+-    !defined(OS_ANDROID) && !defined(OS_FUCHSIA)
++#ifdef __GLIBC__
+   DnsReloaderMaybeReload();
+ #endif
+   absl::optional<AddressInfo> ai;
diff --git a/srcpkgs/qt6-webengine/patches/0600-chromium-sndio.patch b/srcpkgs/qt6-webengine/patches/0600-chromium-sndio.patch
new file mode 100644
index 000000000000..0302874ffba4
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0600-chromium-sndio.patch
@@ -0,0 +1,876 @@
+--- a/src/3rdparty/chromium/media/BUILD.gn
++++ b/src/3rdparty/chromium/media/BUILD.gn
+@@ -72,6 +72,9 @@ config("media_config") {
+       defines += [ "DLOPEN_PULSEAUDIO" ]
+     }
+   }
++  if (use_sndio) {
++    defines += [ "USE_SNDIO" ]
++  }
+   if (use_cras) {
+     defines += [ "USE_CRAS" ]
+   }
+--- a/src/3rdparty/chromium/media/audio/BUILD.gn
++++ b/src/3rdparty/chromium/media/audio/BUILD.gn
+@@ -240,6 +240,17 @@ source_set("audio") {
+     sources += [ "linux/audio_manager_linux.cc" ]
+   }
+ 
++  if (use_sndio) {
++    libs += [ "sndio" ]
++    sources += [
++      "sndio/audio_manager_sndio.cc",
++      "sndio/sndio_input.cc",
++      "sndio/sndio_input.h",
++      "sndio/sndio_output.cc",
++      "sndio/sndio_output.h"
++    ]
++  }
++
+   if (use_alsa) {
+     libs += [ "asound" ]
+     sources += [
+--- a/src/3rdparty/chromium/media/audio/linux/audio_manager_linux.cc
++++ b/src/3rdparty/chromium/media/audio/linux/audio_manager_linux.cc
+@@ -25,6 +25,11 @@
+ #include "media/audio/pulse/audio_manager_pulse.h"
+ #include "media/audio/pulse/pulse_util.h"
+ #endif
++#if defined(USE_SNDIO)
++#include "media/audio/sndio/audio_manager_sndio.h"
++#include "media/audio/sndio/sndio_input.h"
++#include "media/audio/sndio/sndio_output.h"
++#endif
+ 
+ namespace media {
+ 
+@@ -32,7 +37,8 @@ enum LinuxAudioIO {
+   kPulse,
+   kAlsa,
+   kCras,
+-  kAudioIOMax = kCras  // Must always be equal to largest logged entry.
++  kSndio,
++  kAudioIOMax = kSndio // Must always be equal to largest logged entry.
+ };
+ 
+ std::unique_ptr<media::AudioManager> CreateAudioManager(
+@@ -45,6 +51,16 @@ std::unique_ptr<media::AudioManager> Cre
+                                               audio_log_factory);
+   }
+ 
++#if defined(USE_SNDIO)
++  struct sio_hdl *hdl = sio_open(SIO_DEVANY, SIO_PLAY, 0);
++  if (hdl != NULL) {
++    sio_close(hdl);
++    UMA_HISTOGRAM_ENUMERATION("Media.LinuxAudioIO", kSndio, kAudioIOMax + 1);
++    return std::make_unique<AudioManagerSndio>(std::move(audio_thread),
++                                                  audio_log_factory);
++  }
++#endif
++
+ #if defined(USE_CRAS)
+   if (base::CommandLine::ForCurrentProcess()->HasSwitch(switches::kUseCras)) {
+     UMA_HISTOGRAM_ENUMERATION("Media.LinuxAudioIO", kCras, kAudioIOMax + 1);
+--- /dev/null
++++ b/src/3rdparty/chromium/media/audio/sndio/audio_manager_sndio.cc
+@@ -0,0 +1,148 @@
++// Copyright (c) 2012 The Chromium Authors. All rights reserved.
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++#include "media/audio/sndio/audio_manager_sndio.h"
++
++#include "base/metrics/histogram_macros.h"
++#include "base/memory/ptr_util.h"
++#include "media/audio/audio_device_description.h"
++#include "media/audio/audio_output_dispatcher.h"
++#include "media/audio/sndio/sndio_input.h"
++#include "media/audio/sndio/sndio_output.h"
++#include "media/base/limits.h"
++#include "media/base/media_switches.h"
++
++namespace media {
++
++
++// Maximum number of output streams that can be open simultaneously.
++static const int kMaxOutputStreams = 4;
++
++// Default sample rate for input and output streams.
++static const int kDefaultSampleRate = 48000;
++
++void AddDefaultDevice(AudioDeviceNames* device_names) {
++  DCHECK(device_names->empty());
++  device_names->push_front(AudioDeviceName::CreateDefault());
++}
++
++bool AudioManagerSndio::HasAudioOutputDevices() {
++  return true;
++}
++
++bool AudioManagerSndio::HasAudioInputDevices() {
++  return true;
++}
++
++void AudioManagerSndio::GetAudioInputDeviceNames(
++    AudioDeviceNames* device_names) {
++  DCHECK(device_names->empty());
++  AddDefaultDevice(device_names);
++}
++
++void AudioManagerSndio::GetAudioOutputDeviceNames(
++    AudioDeviceNames* device_names) {
++  AddDefaultDevice(device_names);
++}
++
++const char* AudioManagerSndio::GetName() {
++  return "SNDIO";
++}
++
++AudioParameters AudioManagerSndio::GetInputStreamParameters(
++    const std::string& device_id) {
++  static const int kDefaultInputBufferSize = 1024;
++
++  int user_buffer_size = GetUserBufferSize();
++  int buffer_size = user_buffer_size ?
++      user_buffer_size : kDefaultInputBufferSize;
++
++  return AudioParameters(
++      AudioParameters::AUDIO_PCM_LOW_LATENCY, CHANNEL_LAYOUT_STEREO,
++      kDefaultSampleRate, buffer_size);
++}
++
++AudioManagerSndio::AudioManagerSndio(std::unique_ptr<AudioThread> audio_thread,
++                                         AudioLogFactory* audio_log_factory)
++    : AudioManagerBase(std::move(audio_thread),
++                       audio_log_factory) {
++  DLOG(WARNING) << "AudioManagerSndio";
++  SetMaxOutputStreamsAllowed(kMaxOutputStreams);
++}
++
++AudioManagerSndio::~AudioManagerSndio() {
++  Shutdown();
++}
++
++AudioOutputStream* AudioManagerSndio::MakeLinearOutputStream(
++    const AudioParameters& params,
++    const LogCallback& log_callback) {
++  DCHECK_EQ(AudioParameters::AUDIO_PCM_LINEAR, params.format());
++  return MakeOutputStream(params);
++}
++
++AudioOutputStream* AudioManagerSndio::MakeLowLatencyOutputStream(
++    const AudioParameters& params,
++    const std::string& device_id,
++    const LogCallback& log_callback) {
++  DLOG_IF(ERROR, !device_id.empty()) << "Not implemented!";
++  DCHECK_EQ(AudioParameters::AUDIO_PCM_LOW_LATENCY, params.format());
++  return MakeOutputStream(params);
++}
++
++AudioInputStream* AudioManagerSndio::MakeLinearInputStream(
++    const AudioParameters& params,
++    const std::string& device_id,
++    const LogCallback& log_callback) {
++  DCHECK_EQ(AudioParameters::AUDIO_PCM_LINEAR, params.format());
++  return MakeInputStream(params);
++}
++
++AudioInputStream* AudioManagerSndio::MakeLowLatencyInputStream(
++    const AudioParameters& params,
++    const std::string& device_id,
++    const LogCallback& log_callback) {
++  DCHECK_EQ(AudioParameters::AUDIO_PCM_LOW_LATENCY, params.format());
++  return MakeInputStream(params);
++}
++
++AudioParameters AudioManagerSndio::GetPreferredOutputStreamParameters(
++    const std::string& output_device_id,
++    const AudioParameters& input_params) {
++  // TODO(tommi): Support |output_device_id|.
++  DLOG_IF(ERROR, !output_device_id.empty()) << "Not implemented!";
++  static const int kDefaultOutputBufferSize = 2048;
++
++  ChannelLayout channel_layout = CHANNEL_LAYOUT_STEREO;
++  int sample_rate = kDefaultSampleRate;
++  int buffer_size = kDefaultOutputBufferSize;
++  if (input_params.IsValid()) {
++    sample_rate = input_params.sample_rate();
++    channel_layout = input_params.channel_layout();
++    buffer_size = std::min(buffer_size, input_params.frames_per_buffer());
++  }
++
++  int user_buffer_size = GetUserBufferSize();
++  if (user_buffer_size)
++    buffer_size = user_buffer_size;
++
++  return AudioParameters(
++      AudioParameters::AUDIO_PCM_LOW_LATENCY, channel_layout,
++      sample_rate, buffer_size);
++}
++
++AudioInputStream* AudioManagerSndio::MakeInputStream(
++    const AudioParameters& params) {
++  DLOG(WARNING) << "MakeInputStream";
++  return new SndioAudioInputStream(this,
++             AudioDeviceDescription::kDefaultDeviceId, params);
++}
++
++AudioOutputStream* AudioManagerSndio::MakeOutputStream(
++    const AudioParameters& params) {
++  DLOG(WARNING) << "MakeOutputStream";
++  return new SndioAudioOutputStream(params, this);
++}
++
++}  // namespace media
+--- /dev/null
++++ b/src/3rdparty/chromium/media/audio/sndio/audio_manager_sndio.h
+@@ -0,0 +1,65 @@
++// Copyright (c) 2012 The Chromium Authors. All rights reserved.
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++#ifndef MEDIA_AUDIO_SNDIO_AUDIO_MANAGER_SNDIO_H_
++#define MEDIA_AUDIO_SNDIO_AUDIO_MANAGER_SNDIO_H_
++
++#include <set>
++
++#include "base/compiler_specific.h"
++#include "base/macros.h"
++#include "base/memory/ref_counted.h"
++#include "base/threading/thread.h"
++#include "media/audio/audio_manager_base.h"
++
++namespace media {
++
++class MEDIA_EXPORT AudioManagerSndio : public AudioManagerBase {
++ public:
++  AudioManagerSndio(std::unique_ptr<AudioThread> audio_thread,
++                   AudioLogFactory* audio_log_factory);
++  ~AudioManagerSndio() override;
++
++  // Implementation of AudioManager.
++  bool HasAudioOutputDevices() override;
++  bool HasAudioInputDevices() override;
++  void GetAudioInputDeviceNames(AudioDeviceNames* device_names) override;
++  void GetAudioOutputDeviceNames(AudioDeviceNames* device_names) override;
++  AudioParameters GetInputStreamParameters(
++      const std::string& device_id) override;
++  const char* GetName() override;
++
++  // Implementation of AudioManagerBase.
++  AudioOutputStream* MakeLinearOutputStream(
++      const AudioParameters& params,
++      const LogCallback& log_callback) override;
++  AudioOutputStream* MakeLowLatencyOutputStream(
++      const AudioParameters& params,
++      const std::string& device_id,
++      const LogCallback& log_callback) override;
++  AudioInputStream* MakeLinearInputStream(
++      const AudioParameters& params,
++      const std::string& device_id,
++      const LogCallback& log_callback) override;
++  AudioInputStream* MakeLowLatencyInputStream(
++      const AudioParameters& params,
++      const std::string& device_id,
++      const LogCallback& log_callback) override;
++
++ protected:
++  AudioParameters GetPreferredOutputStreamParameters(
++      const std::string& output_device_id,
++      const AudioParameters& input_params) override;
++
++ private:
++  // Called by MakeLinearOutputStream and MakeLowLatencyOutputStream.
++  AudioOutputStream* MakeOutputStream(const AudioParameters& params);
++  AudioInputStream* MakeInputStream(const AudioParameters& params);
++
++  DISALLOW_COPY_AND_ASSIGN(AudioManagerSndio);
++};
++
++}  // namespace media
++
++#endif  // MEDIA_AUDIO_SNDIO_AUDIO_MANAGER_SNDIO_H_
+--- /dev/null
++++ b/src/3rdparty/chromium/media/audio/sndio/sndio_input.cc
+@@ -0,0 +1,200 @@
++// Copyright 2013 The Chromium Authors. All rights reserved.
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++#include "base/bind.h"
++#include "base/logging.h"
++#include "base/macros.h"
++#include "media/base/audio_timestamp_helper.h"
++#include "media/audio/sndio/audio_manager_sndio.h"
++#include "media/audio/audio_manager.h"
++#include "media/audio/sndio/sndio_input.h"
++
++namespace media {
++
++static const SampleFormat kSampleFormat = kSampleFormatS16;
++
++void SndioAudioInputStream::OnMoveCallback(void *arg, int delta)
++{
++  SndioAudioInputStream* self = static_cast<SndioAudioInputStream*>(arg);
++
++  self->hw_delay += delta;
++}
++
++void *SndioAudioInputStream::ThreadEntry(void *arg) {
++  SndioAudioInputStream* self = static_cast<SndioAudioInputStream*>(arg);
++
++  self->ThreadLoop();
++  return NULL;
++}
++
++SndioAudioInputStream::SndioAudioInputStream(AudioManagerBase* manager,
++                                             const std::string& device_name,
++                                             const AudioParameters& params)
++    : manager(manager),
++      params(params),
++      audio_bus(AudioBus::Create(params)),
++      state(kClosed) {
++}
++
++SndioAudioInputStream::~SndioAudioInputStream() {
++  if (state != kClosed)
++    Close();
++}
++
++bool SndioAudioInputStream::Open() {
++  struct sio_par par;
++  int sig;
++
++  if (state != kClosed)
++    return false;
++
++  if (params.format() != AudioParameters::AUDIO_PCM_LINEAR &&
++      params.format() != AudioParameters::AUDIO_PCM_LOW_LATENCY) {
++    LOG(WARNING) << "Unsupported audio format.";
++    return false;
++  }
++
++  sio_initpar(&par);
++  par.rate = params.sample_rate();
++  par.rchan = params.channels();
++  par.bits = SampleFormatToBitsPerChannel(kSampleFormat);
++  par.bps = par.bits / 8;
++  par.sig = sig = par.bits != 8 ? 1 : 0;
++  par.le = SIO_LE_NATIVE;
++  par.appbufsz = params.frames_per_buffer();
++
++  hdl = sio_open(SIO_DEVANY, SIO_REC, 0);
++
++  if (hdl == NULL) {
++    LOG(ERROR) << "Couldn't open audio device.";
++    return false;
++  }
++
++  if (!sio_setpar(hdl, &par) || !sio_getpar(hdl, &par)) {
++    LOG(ERROR) << "Couldn't set audio parameters.";
++    goto bad_close;
++  }
++
++  if (par.rate  != (unsigned int)params.sample_rate() ||
++      par.rchan != (unsigned int)params.channels() ||
++      par.bits  != (unsigned int)SampleFormatToBitsPerChannel(kSampleFormat) ||
++      par.sig   != (unsigned int)sig ||
++      (par.bps > 1 && par.le != SIO_LE_NATIVE) ||
++      (par.bits != par.bps * 8)) {
++    LOG(ERROR) << "Unsupported audio parameters.";
++    goto bad_close;
++  }
++  state = kStopped;
++  buffer = new char[audio_bus->frames() * params.GetBytesPerFrame(kSampleFormat)];
++  sio_onmove(hdl, &OnMoveCallback, this);
++  return true;
++bad_close:
++  sio_close(hdl);
++  return false;
++}
++
++void SndioAudioInputStream::Start(AudioInputCallback* cb) {
++
++  StartAgc();
++
++  state = kRunning;
++  hw_delay = 0;
++  callback = cb;
++  sio_start(hdl);
++  if (pthread_create(&thread, NULL, &ThreadEntry, this) != 0) {
++    LOG(ERROR) << "Failed to create real-time thread for recording.";
++    sio_stop(hdl);
++    state = kStopped;
++  }
++}
++
++void SndioAudioInputStream::Stop() {
++
++  if (state == kStopped)
++    return;
++
++  state = kStopWait;
++  pthread_join(thread, NULL);
++  sio_stop(hdl);
++  state = kStopped;
++
++  StopAgc();
++}
++
++void SndioAudioInputStream::Close() {
++
++  if (state == kClosed)
++    return;
++
++  if (state == kRunning)
++    Stop();
++
++  state = kClosed;
++  delete [] buffer;
++  sio_close(hdl);
++
++  manager->ReleaseInputStream(this);
++}
++
++double SndioAudioInputStream::GetMaxVolume() {
++  // Not supported
++  return 0.0;
++}
++
++void SndioAudioInputStream::SetVolume(double volume) {
++  // Not supported. Do nothing.
++}
++
++double SndioAudioInputStream::GetVolume() {
++  // Not supported.
++  return 0.0;
++}
++
++bool SndioAudioInputStream::IsMuted() {
++  // Not supported.
++  return false;
++}
++
++void SndioAudioInputStream::SetOutputDeviceForAec(
++    const std::string& output_device_id) {
++  // Not supported.
++}
++
++void SndioAudioInputStream::ThreadLoop(void) {
++  size_t todo, n;
++  char *data;
++  unsigned int nframes;
++  double normalized_volume = 0.0;
++
++  nframes = audio_bus->frames();
++
++  while (state == kRunning && !sio_eof(hdl)) {
++
++    GetAgcVolume(&normalized_volume);
++
++    // read one block
++    todo = nframes * params.GetBytesPerFrame(kSampleFormat);
++    data = buffer;
++    while (todo > 0) {
++      n = sio_read(hdl, data, todo);
++      if (n == 0)
++        return;	// unrecoverable I/O error
++      todo -= n;
++      data += n;
++    }
++    hw_delay -= nframes;
++
++    // convert frames count to TimeDelta
++    const base::TimeDelta delay = AudioTimestampHelper::FramesToTime(hw_delay,
++      params.sample_rate());
++
++    // push into bus
++    audio_bus->FromInterleaved<SignedInt16SampleTypeTraits>(reinterpret_cast<int16_t*>(buffer), nframes);
++
++    // invoke callback
++    callback->OnData(audio_bus.get(), base::TimeTicks::Now() - delay, 1.);
++  }
++}
++
++}  // namespace media
+--- /dev/null
++++ b/src/3rdparty/chromium/media/audio/sndio/sndio_input.h
+@@ -0,0 +1,91 @@
++// Copyright 2013 The Chromium Authors. All rights reserved.
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++#ifndef MEDIA_AUDIO_SNDIO_SNDIO_INPUT_H_
++#define MEDIA_AUDIO_SNDIO_SNDIO_INPUT_H_
++
++#include <stdint.h>
++#include <string>
++#include <sndio.h>
++
++#include "base/compiler_specific.h"
++#include "base/macros.h"
++#include "base/memory/weak_ptr.h"
++#include "base/time/time.h"
++#include "media/audio/agc_audio_stream.h"
++#include "media/audio/audio_io.h"
++#include "media/audio/audio_device_description.h"
++#include "media/base/audio_parameters.h"
++
++namespace media {
++
++class AudioManagerBase;
++
++// Implementation of AudioOutputStream using sndio(7)
++class SndioAudioInputStream : public AgcAudioStream<AudioInputStream> {
++ public:
++  // Pass this to the constructor if you want to attempt auto-selection
++  // of the audio recording device.
++  static const char kAutoSelectDevice[];
++
++  // Create a PCM Output stream for the SNDIO device identified by
++  // |device_name|. If unsure of what to use for |device_name|, use
++  // |kAutoSelectDevice|.
++  SndioAudioInputStream(AudioManagerBase* audio_manager,
++                     const std::string& device_name,
++                     const AudioParameters& params);
++
++  ~SndioAudioInputStream() override;
++
++  // Implementation of AudioInputStream.
++  bool Open() override;
++  void Start(AudioInputCallback* callback) override;
++  void Stop() override;
++  void Close() override;
++  double GetMaxVolume() override;
++  void SetVolume(double volume) override;
++  double GetVolume() override;
++  bool IsMuted() override;
++  void SetOutputDeviceForAec(const std::string& output_device_id) override;
++
++ private:
++
++  enum StreamState {
++    kClosed,            // Not opened yet
++    kStopped,           // Device opened, but not started yet
++    kRunning,           // Started, device playing
++    kStopWait           // Stopping, waiting for the real-time thread to exit
++  };
++
++  // C-style call-backs
++  static void OnMoveCallback(void *arg, int delta);
++  static void* ThreadEntry(void *arg);
++
++  // Continuously moves data from the device to the consumer
++  void ThreadLoop();
++  // Our creator, the audio manager needs to be notified when we close.
++  AudioManagerBase* manager;
++  // Parameters of the source
++  AudioParameters params;
++  // We store data here for consumer
++  std::unique_ptr<AudioBus> audio_bus;
++  // Call-back that consumes recorded data
++  AudioInputCallback* callback;  // Valid during a recording session.
++  // Handle of the audio device
++  struct sio_hdl* hdl;
++  // Current state of the stream
++  enum StreamState state;
++  // High priority thread running ThreadLoop()
++  pthread_t thread;
++  // Number of frames buffered in the hardware
++  int hw_delay;
++  // Temporary buffer where data is stored sndio-compatible format
++  char* buffer;
++
++  DISALLOW_COPY_AND_ASSIGN(SndioAudioInputStream);
++};
++
++}  // namespace media
++
++#endif  // MEDIA_AUDIO_SNDIO_SNDIO_INPUT_H_
+--- /dev/null
++++ b/src/3rdparty/chromium/media/audio/sndio/sndio_output.cc
+@@ -0,0 +1,183 @@
++// Copyright (c) 2012 The Chromium Authors. All rights reserved.
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++#include "base/logging.h"
++#include "base/time/time.h"
++#include "base/time/default_tick_clock.h"
++#include "media/audio/audio_manager_base.h"
++#include "media/base/audio_timestamp_helper.h"
++#include "media/audio/sndio/sndio_output.h"
++
++namespace media {
++
++static const SampleFormat kSampleFormat = kSampleFormatS16;
++
++void SndioAudioOutputStream::OnMoveCallback(void *arg, int delta) {
++  SndioAudioOutputStream* self = static_cast<SndioAudioOutputStream*>(arg);
++
++  self->hw_delay -= delta;
++}
++
++void SndioAudioOutputStream::OnVolCallback(void *arg, unsigned int vol) {
++  SndioAudioOutputStream* self = static_cast<SndioAudioOutputStream*>(arg);
++
++  self->vol = vol;
++}
++
++void *SndioAudioOutputStream::ThreadEntry(void *arg) {
++  SndioAudioOutputStream* self = static_cast<SndioAudioOutputStream*>(arg);
++
++  self->ThreadLoop();
++  return NULL;
++}
++
++SndioAudioOutputStream::SndioAudioOutputStream(const AudioParameters& params,
++                                               AudioManagerBase* manager)
++    : manager(manager),
++      params(params),
++      audio_bus(AudioBus::Create(params)),
++      state(kClosed),
++      mutex(PTHREAD_MUTEX_INITIALIZER) {
++}
++
++SndioAudioOutputStream::~SndioAudioOutputStream() {
++  if (state != kClosed)
++    Close();
++}
++
++bool SndioAudioOutputStream::Open() {
++  struct sio_par par;
++  int sig;
++
++  if (params.format() != AudioParameters::AUDIO_PCM_LINEAR &&
++      params.format() != AudioParameters::AUDIO_PCM_LOW_LATENCY) {
++    LOG(WARNING) << "Unsupported audio format.";
++    return false;
++  }
++  sio_initpar(&par);
++  par.rate = params.sample_rate();
++  par.pchan = params.channels();
++  par.bits = SampleFormatToBitsPerChannel(kSampleFormat);
++  par.bps = par.bits / 8;
++  par.sig = sig = par.bits != 8 ? 1 : 0;
++  par.le = SIO_LE_NATIVE;
++  par.appbufsz = params.frames_per_buffer();
++
++  hdl = sio_open(SIO_DEVANY, SIO_PLAY, 0);
++  if (hdl == NULL) {
++    LOG(ERROR) << "Couldn't open audio device.";
++    return false;
++  }
++  if (!sio_setpar(hdl, &par) || !sio_getpar(hdl, &par)) {
++    LOG(ERROR) << "Couldn't set audio parameters.";
++    goto bad_close;
++  }
++  if (par.rate  != (unsigned int)params.sample_rate() ||
++      par.pchan != (unsigned int)params.channels() ||
++      par.bits  != (unsigned int)SampleFormatToBitsPerChannel(kSampleFormat) ||
++      par.sig   != (unsigned int)sig ||
++      (par.bps > 1 && par.le != SIO_LE_NATIVE) ||
++      (par.bits != par.bps * 8)) {
++    LOG(ERROR) << "Unsupported audio parameters.";
++    goto bad_close;
++  }
++  state = kStopped;
++  volpending = 0;
++  vol = 0;
++  buffer = new char[audio_bus->frames() * params.GetBytesPerFrame(kSampleFormat)];
++  sio_onmove(hdl, &OnMoveCallback, this);
++  sio_onvol(hdl, &OnVolCallback, this);
++  return true;
++ bad_close:
++  sio_close(hdl);
++  return false;
++}
++
++void SndioAudioOutputStream::Close() {
++  if (state == kClosed)
++    return;
++  if (state == kRunning)
++    Stop();
++  state = kClosed;
++  delete [] buffer;
++  sio_close(hdl);
++  manager->ReleaseOutputStream(this);  // Calls the destructor
++}
++
++void SndioAudioOutputStream::Start(AudioSourceCallback* callback) {
++  state = kRunning;
++  hw_delay = 0;
++  source = callback;
++  sio_start(hdl);
++  if (pthread_create(&thread, NULL, &ThreadEntry, this) != 0) {
++    LOG(ERROR) << "Failed to create real-time thread.";
++    sio_stop(hdl);
++    state = kStopped;
++  }
++}
++
++void SndioAudioOutputStream::Stop() {
++  if (state == kStopped)
++    return;
++  state = kStopWait;
++  pthread_join(thread, NULL);
++  sio_stop(hdl);
++  state = kStopped;
++}
++
++void SndioAudioOutputStream::SetVolume(double v) {
++  pthread_mutex_lock(&mutex);
++  vol = v * SIO_MAXVOL;
++  volpending = 1;
++  pthread_mutex_unlock(&mutex);
++}
++
++void SndioAudioOutputStream::GetVolume(double* v) {
++  pthread_mutex_lock(&mutex);
++  *v = vol * (1. / SIO_MAXVOL);
++  pthread_mutex_unlock(&mutex);
++}
++
++// This stream is always used with sub second buffer sizes, where it's
++// sufficient to simply always flush upon Start().
++void SndioAudioOutputStream::Flush() {}
++
++void SndioAudioOutputStream::ThreadLoop(void) {
++  int avail, count, result;
++
++  while (state == kRunning) {
++    // Update volume if needed
++    pthread_mutex_lock(&mutex);
++    if (volpending) {
++      volpending = 0;
++      sio_setvol(hdl, vol);
++    }
++    pthread_mutex_unlock(&mutex);
++
++    // Get data to play
++    const base::TimeDelta delay = AudioTimestampHelper::FramesToTime(hw_delay,
++	params.sample_rate());
++    count = source->OnMoreData(delay, base::TimeTicks::Now(), 0, audio_bus.get());
++    audio_bus->ToInterleaved<SignedInt16SampleTypeTraits>(count, reinterpret_cast<int16_t*>(buffer));
++    if (count == 0) {
++      // We have to submit something to the device
++      count = audio_bus->frames();
++      memset(buffer, 0, count * params.GetBytesPerFrame(kSampleFormat));
++      LOG(WARNING) << "No data to play, running empty cycle.";
++    }
++
++    // Submit data to the device
++    avail = count * params.GetBytesPerFrame(kSampleFormat);
++    result = sio_write(hdl, buffer, avail);
++    if (result == 0) {
++      LOG(WARNING) << "Audio device disconnected.";
++      break;
++    }
++
++    // Update hardware pointer
++    hw_delay += count;
++  }
++}
++
++}  // namespace media
+--- /dev/null
++++ b/src/3rdparty/chromium/media/audio/sndio/sndio_output.h
+@@ -0,0 +1,86 @@
++// Copyright (c) 2012 The Chromium Authors. All rights reserved.
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++#ifndef MEDIA_AUDIO_SNDIO_SNDIO_OUTPUT_H_
++#define MEDIA_AUDIO_SNDIO_SNDIO_OUTPUT_H_
++
++#include <pthread.h>
++#include <sndio.h>
++
++#include "base/time/tick_clock.h"
++#include "base/time/time.h"
++#include "media/audio/audio_io.h"
++
++namespace media {
++
++class AudioManagerBase;
++
++// Implementation of AudioOutputStream using sndio(7)
++class SndioAudioOutputStream : public AudioOutputStream {
++ public:
++  // The manager is creating this object
++  SndioAudioOutputStream(const AudioParameters& params,
++                         AudioManagerBase* manager);
++  virtual ~SndioAudioOutputStream();
++
++  // Implementation of AudioOutputStream.
++  bool Open() override;
++  void Close() override;
++  void Start(AudioSourceCallback* callback) override;
++  void Stop() override;
++  void SetVolume(double volume) override;
++  void GetVolume(double* volume) override;
++  void Flush() override;
++
++  friend void sndio_onmove(void *arg, int delta);
++  friend void sndio_onvol(void *arg, unsigned int vol);
++  friend void *sndio_threadstart(void *arg);
++
++ private:
++  enum StreamState {
++    kClosed,            // Not opened yet
++    kStopped,           // Device opened, but not started yet
++    kRunning,           // Started, device playing
++    kStopWait           // Stopping, waiting for the real-time thread to exit
++  };
++
++  // C-style call-backs
++  static void OnMoveCallback(void *arg, int delta);
++  static void OnVolCallback(void *arg, unsigned int vol);
++  static void* ThreadEntry(void *arg);
++
++  // Continuously moves data from the producer to the device
++  void ThreadLoop(void);
++
++  // Our creator, the audio manager needs to be notified when we close.
++  AudioManagerBase* manager;
++  // Parameters of the source
++  AudioParameters params;
++  // Source stores data here
++  std::unique_ptr<AudioBus> audio_bus;
++  // Call-back that produces data to play
++  AudioSourceCallback* source;
++  // Handle of the audio device
++  struct sio_hdl* hdl;
++  // Current state of the stream
++  enum StreamState state;
++  // High priority thread running ThreadLoop()
++  pthread_t thread;
++  // Protects vol, volpending and hw_delay
++  pthread_mutex_t mutex;
++  // Current volume in the 0..SIO_MAXVOL range
++  int vol;
++  // Set to 1 if volumes must be refreshed in the realtime thread
++  int volpending;
++  // Number of frames buffered in the hardware
++  int hw_delay;
++  // Temporary buffer where data is stored sndio-compatible format
++  char* buffer;
++
++  DISALLOW_COPY_AND_ASSIGN(SndioAudioOutputStream);
++};
++
++}  // namespace media
++
++#endif  // MEDIA_AUDIO_SNDIO_SNDIO_OUTPUT_H_
+--- a/src/3rdparty/chromium/media/media_options.gni
++++ b/src/3rdparty/chromium/media/media_options.gni
+@@ -121,6 +121,9 @@ declare_args() {
+   # Enables runtime selection of ALSA library for audio.
+   use_alsa = false
+ 
++  # Enable runtime selection of sndio(7)
++  use_sndio = false
++
+   # Alsa should be used on non-Android, non-Mac POSIX systems.
+   # Alsa should be used on desktop Chromecast and audio-only Chromecast builds.
+   if (is_posix && !is_android && !is_mac &&
diff --git a/srcpkgs/qt6-webengine/patches/0700-armv7l-neon.patch b/srcpkgs/qt6-webengine/patches/0700-armv7l-neon.patch
new file mode 100644
index 000000000000..d42fa19a07a1
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0700-armv7l-neon.patch
@@ -0,0 +1,10 @@
+--- a/src/3rdparty/chromium/skia/BUILD.gn
++++ b/src/3rdparty/chromium/skia/BUILD.gn
+@@ -800,7 +800,6 @@ skia_source_set("skia_opts") {
+         # Root build config sets -mfpu=$arm_fpu, which we expect to be neon
+         # when running this.
+         if (!arm_use_neon) {
+-          configs -= [ "//build/config/compiler:compiler_arm_fpu" ]
+           cflags += [ "-mfpu=neon" ]
+         }
+       }
diff --git a/srcpkgs/qt6-webengine/patches/0750-chromium-musl-arm-user_vfp.patch b/srcpkgs/qt6-webengine/patches/0750-chromium-musl-arm-user_vfp.patch
new file mode 100644
index 000000000000..6e2d62f35ee6
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0750-chromium-musl-arm-user_vfp.patch
@@ -0,0 +1,20 @@
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/util/linux/thread_info.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/util/linux/thread_info.h
+@@ -17,6 +17,17 @@
+ 
+ #include <stdint.h>
+ #include <sys/user.h>
++#if !defined(__GLIBC__)
++struct user_vfp {
++	unsigned long long fpregs[32];
++	unsigned long fpscr;
++};
++struct user_vfp_exc {
++	unsigned long fpexc;
++	unsigned long fpinst;
++	unsigned long fpinst2;
++};
++#endif /* !defined(__GLIBC__) */
+ 
+ #include <type_traits>
+ 
diff --git a/srcpkgs/qt6-webengine/patches/0751-chromium-musl-arm-elf_auxv_t.patch b/srcpkgs/qt6-webengine/patches/0751-chromium-musl-arm-elf_auxv_t.patch
new file mode 100644
index 000000000000..7112c8cfd3fa
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0751-chromium-musl-arm-elf_auxv_t.patch
@@ -0,0 +1,18 @@
+--- a/src/3rdparty/chromium/v8/src/base/cpu.cc
++++ b/src/3rdparty/chromium/v8/src/base/cpu.cc
+@@ -163,6 +163,15 @@ static V8_INLINE void __cpuid(int cpu_in
+ 
+ #if V8_HOST_ARCH_ARM || V8_HOST_ARCH_ARM64
+ 
++#ifndef __GLIBC__
++#include <elf.h>
++#ifdef __LP64__
++typedef Elf64_auxv_t elf_auxv_t;
++#else
++typedef Elf32_auxv_t elf_auxv_t;
++#endif
++#endif
++
+ static uint32_t ReadELFHWCaps() {
+   uint32_t result = 0;
+ #if V8_GLIBC_PREREQ(2, 16)
diff --git a/srcpkgs/qt6-webengine/patches/0801-chromium-i686-vaapi-fpermissive.patch b/srcpkgs/qt6-webengine/patches/0801-chromium-i686-vaapi-fpermissive.patch
new file mode 100644
index 000000000000..3d4043e03b89
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0801-chromium-i686-vaapi-fpermissive.patch
@@ -0,0 +1,24 @@
+--- a/src/3rdparty/chromium/media/gpu/vaapi/BUILD.gn
++++ b/src/3rdparty/chromium/media/gpu/vaapi/BUILD.gn
+@@ -14,6 +14,10 @@ import("//ui/gl/features.gni")
+ assert(is_linux || is_chromeos)
+ assert(use_vaapi)
+ 
++config("vaapi_permissive") {
++  cflags = [ "-fpermissive" ]
++}
++
+ generate_stubs("libva_stubs") {
+   extra_header = "va_stub_header.fragment"
+   sigs = [ "va.sigs" ]
+@@ -136,6 +140,10 @@ source_set("vaapi") {
+     ]
+   }
+ 
++  if (target_cpu == "x86") {
++    configs += [ ":vaapi_permissive" ]
++  }
++
+   if (use_x11) {
+     deps += [ "//ui/gfx/x" ]
+     sources += [
diff --git a/srcpkgs/qt6-webengine/patches/0900-xxx-ppc64le-libvpx.patch b/srcpkgs/qt6-webengine/patches/0900-xxx-ppc64le-libvpx.patch
new file mode 100644
index 000000000000..5c9566b56bd4
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0900-xxx-ppc64le-libvpx.patch
@@ -0,0 +1,65 @@
+Uses generic target for now. To use ppc64le, change --target to ppc64le-gnu
+and add --enable-vsx, and change generic to ppc for the rtcd header.
+
+From 18e6c5c55cfae0cfb458d8210d7bc709360a0e90 Mon Sep 17 00:00:00 2001
+From: q66 <daniel@octaforge.org>
+Date: Wed, 9 Sep 2020 19:08:25 +0200
+Subject: [PATCH] enable generation of ppc64 libvpx bits
+
+this doesn't update the gni file, that's done from
+the template by running the appropriate scripts
+---
+ third_party/libvpx/BUILD.gn        | 4 ++++
+ third_party/libvpx/generate_gni.sh | 9 +++++++++
+ 2 files changed, 13 insertions(+)
+
+--- a/src/3rdparty/chromium/third_party/libvpx/BUILD.gn
++++ b/src/3rdparty/chromium/third_party/libvpx/BUILD.gn
+@@ -424,6 +424,8 @@ static_library("bundled_libvpx") {
+       sources = libvpx_srcs_arm64
+       public_deps = [ ":libvpx_arm64_headers" ]
+     }
++  } else if (current_cpu == "ppc64") {
++    sources = libvpx_srcs_ppc64
+   }
+ 
+   configs -= [ "//build/config/compiler:chromium_code" ]
+--- a/src/3rdparty/chromium/third_party/libvpx/generate_gni.sh
++++ b/src/3rdparty/chromium/third_party/libvpx/generate_gni.sh
+@@ -374,6 +374,7 @@ gen_config_files linux/arm-neon-highbd "
+ gen_config_files linux/arm64-highbd "--target=armv8-linux-gcc ${all_platforms} ${HIGHBD}"
+ gen_config_files linux/mipsel "--target=mips32-linux-gcc ${all_platforms}"
+ gen_config_files linux/mips64el "--target=mips64-linux-gcc ${all_platforms}"
++gen_config_files linux/ppc64 "--target=generic-gnu $HIGHBD ${all_platforms}"
+ gen_config_files linux/generic "--target=generic-gnu $HIGHBD ${all_platforms}"
+ gen_config_files win/arm64 "--target=arm64-win64-vs15 ${all_platforms} ${HIGHBD}"
+ gen_config_files win/ia32 "--target=x86-win32-vs14 ${all_platforms} ${x86_platforms}"
+@@ -399,6 +400,7 @@ lint_config linux/arm-neon-highbd
+ lint_config linux/arm64-highbd
+ lint_config linux/mipsel
+ lint_config linux/mips64el
++lint_config linux/ppc64
+ lint_config linux/generic
+ lint_config win/arm64
+ lint_config win/ia32
+@@ -428,6 +430,7 @@ gen_rtcd_header linux/arm-neon-highbd ar
+ gen_rtcd_header linux/arm64-highbd armv8
+ gen_rtcd_header linux/mipsel mipsel
+ gen_rtcd_header linux/mips64el mips64el
++gen_rtcd_header linux/ppc64 generic
+ gen_rtcd_header linux/generic generic
+ gen_rtcd_header win/arm64 armv8
+ gen_rtcd_header win/ia32 x86 "${require_sse2}"
+@@ -513,6 +516,12 @@ if [ -z $ONLY_CONFIGS ]; then
+ 
+   echo "MIPS64 source list is identical to MIPS source list. No need to generate it."
+ 
++  echo "Generate ppc64 source list."
++  config=$(print_config_basic linux/ppc64)
++  make_clean
++  make libvpx_srcs.txt target=libs $config > /dev/null
++  convert_srcs_to_project_files libvpx_srcs.txt libvpx_srcs_ppc64
++
+   echo "Generate NaCl source list."
+   config=$(print_config_basic nacl)
+   make_clean
diff --git a/srcpkgs/qt6-webengine/patches/0901-xxx-ppc64le-sandbox-linux-stat.patch b/srcpkgs/qt6-webengine/patches/0901-xxx-ppc64le-sandbox-linux-stat.patch
new file mode 100644
index 000000000000..4b8e6320601c
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0901-xxx-ppc64le-sandbox-linux-stat.patch
@@ -0,0 +1,31 @@
+--- a/src/3rdparty/chromium/sandbox/linux/system_headers/linux_stat.h
++++ b/src/3rdparty/chromium/sandbox/linux/system_headers/linux_stat.h
+@@ -155,6 +155,28 @@ struct kernel_stat {
+   unsigned int __unused4;
+   unsigned int __unused5;
+ };
++#elif defined(__powerpc64__)
++struct kernel_stat {
++  unsigned long	st_dev;
++  unsigned long	st_ino;
++  unsigned long	st_nlink;
++  unsigned int	st_mode;
++  unsigned int	st_uid;
++  unsigned int	st_gid;
++  unsigned long	st_rdev;
++  long		st_size;
++  unsigned long	st_blksize;
++  unsigned long	st_blocks;
++  unsigned long	st_atime_;
++  unsigned long	st_atime_nsec_;
++  unsigned long	st_mtime_;
++  unsigned long	st_mtime_nsec_;
++  unsigned long	st_ctime_;
++  unsigned long	st_ctime_nsec_;
++  unsigned long	__unused4;
++  unsigned long	__unused5;
++  unsigned long	__unused6;
++};
+ #endif
+ 
+ #if !defined(AT_EMPTY_PATH)
diff --git a/srcpkgs/qt6-webengine/patches/0902-xxx-ppc64le-support.patch b/srcpkgs/qt6-webengine/patches/0902-xxx-ppc64le-support.patch
new file mode 100644
index 000000000000..60503c22e36b
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0902-xxx-ppc64le-support.patch
@@ -0,0 +1,3559 @@
+commit 2c013a317b1114ef67cdbbc30824b28907b9ea94
+Author: Daniel Kolesa <daniel@octaforge.org>
+Date:   Wed Mar 3 19:08:29 2021 +0100
+
+    ppc64le support
+
+--- a/src/3rdparty/chromium/sandbox/features.gni
++++ b/src/3rdparty/chromium/sandbox/features.gni
+@@ -11,7 +11,8 @@ import("//build/config/nacl/config.gni")
+ use_seccomp_bpf = (is_linux || is_chromeos || is_android) &&
+                   (current_cpu == "x86" || current_cpu == "x64" ||
+                    current_cpu == "arm" || current_cpu == "arm64" ||
+-                   current_cpu == "mipsel" || current_cpu == "mips64el")
++                   current_cpu == "mipsel" || current_cpu == "mips64el" ||
++                   current_cpu == "ppc64")
+ 
+ use_seccomp_bpf = use_seccomp_bpf || is_nacl_nonsfi
+ 
+--- a/src/3rdparty/chromium/sandbox/linux/BUILD.gn
++++ b/src/3rdparty/chromium/sandbox/linux/BUILD.gn
+@@ -433,6 +433,8 @@ component("sandbox_services") {
+ 
+ source_set("sandbox_services_headers") {
+   sources = [
++    "system_headers/ppc64_linux_syscalls.h",
++    "system_headers/ppc64_linux_ucontext.h",
+     "system_headers/arm64_linux_syscalls.h",
+     "system_headers/arm_linux_syscalls.h",
+     "system_headers/arm_linux_ucontext.h",
+--- a/src/3rdparty/chromium/sandbox/linux/bpf_dsl/linux_syscall_ranges.h
++++ b/src/3rdparty/chromium/sandbox/linux/bpf_dsl/linux_syscall_ranges.h
+@@ -56,6 +56,13 @@
+ #define MAX_PUBLIC_SYSCALL __NR_syscalls
+ #define MAX_SYSCALL MAX_PUBLIC_SYSCALL
+ 
++#elif defined(__powerpc64__)
++
++#include <asm/unistd.h>
++#define MIN_SYSCALL 0u
++#define MAX_PUBLIC_SYSCALL 386u
++#define MAX_SYSCALL MAX_PUBLIC_SYSCALL
++
+ #else
+ #error "Unsupported architecture"
+ #endif
+--- a/src/3rdparty/chromium/sandbox/linux/bpf_dsl/seccomp_macros.h
++++ b/src/3rdparty/chromium/sandbox/linux/bpf_dsl/seccomp_macros.h
+@@ -16,6 +16,9 @@
+ #if defined(__mips__)
+ // sys/user.h in eglibc misses size_t definition
+ #include <stddef.h>
++#elif defined(__powerpc64__) && defined(__GLIBC__)
++// Manually define greg_t on ppc64
++typedef unsigned long long greg_t;
+ #endif
+ #endif
+ 
+@@ -346,6 +349,59 @@ struct regs_struct {
+ #define SECCOMP_PT_PARM4(_regs) (_regs).regs[3]
+ #define SECCOMP_PT_PARM5(_regs) (_regs).regs[4]
+ #define SECCOMP_PT_PARM6(_regs) (_regs).regs[5]
++
++#elif defined(__powerpc64__)
++#include <asm/ptrace.h>
++
++typedef struct pt_regs regs_struct;
++
++#ifdef ARCH_CPU_LITTLE_ENDIAN
++#define SECCOMP_ARCH AUDIT_ARCH_PPC64LE
++#else
++#define SECCOMP_ARCH AUDIT_ARCH_PPC64
++#endif
++
++#ifdef __GLIBC__
++#define SECCOMP_REG(_ctx, _reg) ((_ctx)->uc_mcontext.regs->gpr[_reg])
++#else
++#define SECCOMP_REG(_ctx, _reg) (((struct pt_regs *)(_ctx)->uc_mcontext.regs)->gpr[_reg])
++#endif
++
++#define SECCOMP_RESULT(_ctx) SECCOMP_REG(_ctx, 3)
++#define SECCOMP_SYSCALL(_ctx) SECCOMP_REG(_ctx, 0)
++#ifdef __GLIBC__
++#define SECCOMP_IP(_ctx) (_ctx)->uc_mcontext.regs->nip
++#else
++#define SECCOMP_IP(_ctx) ((struct pt_regs *)(_ctx)->uc_mcontext.regs)->nip
++#endif
++#define SECCOMP_PARM1(_ctx) SECCOMP_REG(_ctx, 3)
++#define SECCOMP_PARM2(_ctx) SECCOMP_REG(_ctx, 4)
++#define SECCOMP_PARM3(_ctx) SECCOMP_REG(_ctx, 5)
++#define SECCOMP_PARM4(_ctx) SECCOMP_REG(_ctx, 6)
++#define SECCOMP_PARM5(_ctx) SECCOMP_REG(_ctx, 7)
++#define SECCOMP_PARM6(_ctx) SECCOMP_REG(_ctx, 8)
++
++#define SECCOMP_NR_IDX (offsetof(struct arch_seccomp_data, nr))
++#define SECCOMP_ARCH_IDX (offsetof(struct arch_seccomp_data, arch))
++#define SECCOMP_IP_MSB_IDX \
++  (offsetof(struct arch_seccomp_data, instruction_pointer) + 4)
++#define SECCOMP_IP_LSB_IDX \
++  (offsetof(struct arch_seccomp_data, instruction_pointer) + 0)
++#define SECCOMP_ARG_MSB_IDX(nr) \
++  (offsetof(struct arch_seccomp_data, args) + 8 * (nr) + 4)
++#define SECCOMP_ARG_LSB_IDX(nr) \
++  (offsetof(struct arch_seccomp_data, args) + 8 * (nr) + 0)
++
++#define SECCOMP_PT_RESULT(_regs) (_regs).gpr[3]
++#define SECCOMP_PT_SYSCALL(_regs) (_regs).gpr[0]
++#define SECCOMP_PT_IP(_regs) (_regs).nip
++#define SECCOMP_PT_PARM1(_regs) (_regs).gpr[3]
++#define SECCOMP_PT_PARM2(_regs) (_regs).gpr[4]
++#define SECCOMP_PT_PARM3(_regs) (_regs).gpr[5]
++#define SECCOMP_PT_PARM4(_regs) (_regs).gpr[6]
++#define SECCOMP_PT_PARM5(_regs) (_regs).gpr[7]
++#define SECCOMP_PT_PARM6(_regs) (_regs).gpr[8]
++
+ #else
+ #error Unsupported target platform
+ 
+--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc
++++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc
+@@ -91,7 +91,8 @@ bool IsBaselinePolicyWatched(int sysno)
+          SyscallSets::IsPrctl(sysno) ||
+          SyscallSets::IsProcessGroupOrSession(sysno) ||
+ #if defined(__i386__) || \
+-    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
++    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
++    defined(__powerpc64__)
+          SyscallSets::IsSocketCall(sysno) ||
+ #endif
+ #if defined(__arm__)
+@@ -258,7 +259,7 @@ ResultExpr EvaluateSyscallImpl(int fs_de
+   }
+ 
+ #if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
+-    defined(__aarch64__)
++    defined(__aarch64__) || defined(__powerpc64__)
+   if (sysno == __NR_mmap)
+     return RestrictMmapFlags();
+ #endif
+@@ -279,7 +280,7 @@ ResultExpr EvaluateSyscallImpl(int fs_de
+     return RestrictPrctl();
+ 
+ #if defined(__x86_64__) || defined(__arm__) || defined(__mips__) || \
+-    defined(__aarch64__)
++    defined(__aarch64__) || defined(__powerpc64__)
+   if (sysno == __NR_socketpair) {
+     // Only allow AF_UNIX, PF_UNIX. Crash if anything else is seen.
+     static_assert(AF_UNIX == PF_UNIX,
+@@ -343,7 +344,8 @@ ResultExpr EvaluateSyscallImpl(int fs_de
+   }
+ 
+ #if defined(__i386__) || \
+-    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
++    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
++    defined(__powerpc64__)
+   if (SyscallSets::IsSocketCall(sysno))
+     return RestrictSocketcallCommand();
+ #endif
+--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/baseline_policy_unittest.cc
++++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/baseline_policy_unittest.cc
+@@ -317,7 +317,7 @@ TEST_BASELINE_SIGSYS(__NR_sysinfo)
+ TEST_BASELINE_SIGSYS(__NR_syslog)
+ TEST_BASELINE_SIGSYS(__NR_timer_create)
+ 
+-#if !defined(__aarch64__)
++#if !defined(__aarch64__) && !defined(__powerpc64__)
+ TEST_BASELINE_SIGSYS(__NR_inotify_init)
+ TEST_BASELINE_SIGSYS(__NR_vserver)
+ #endif
+--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc
++++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc
+@@ -40,7 +40,8 @@
+ #include <sys/ptrace.h>
+ #if (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) && \
+     !defined(__arm__) && !defined(__aarch64__) &&           \
+-    !defined(PTRACE_GET_THREAD_AREA)
++    !defined(PTRACE_GET_THREAD_AREA) &&			    \
++    !defined(__powerpc64__)
+ // Also include asm/ptrace-abi.h since ptrace.h in older libc (for instance
+ // the one in Ubuntu 16.04 LTS) is missing PTRACE_GET_THREAD_AREA.
+ // asm/ptrace-abi.h doesn't exist on arm32 and PTRACE_GET_THREAD_AREA isn't
+@@ -49,6 +50,11 @@
+ #endif
+ #endif  // !OS_NACL_NONSFI
+ 
++// On PPC64, TCGETS is defined in terms of struct termios, so we must include termios.h
++#ifdef __powerpc64__
++#include <termios.h>
++#endif
++
+ #if defined(OS_ANDROID)
+ 
+ #if !defined(F_DUPFD_CLOEXEC)
+@@ -106,6 +112,14 @@ inline bool IsArchitectureMips() {
+ #endif
+ }
+ 
++inline bool IsArchitecturePPC64() {
++#if defined(__powerpc64__)
++  return true;
++#else
++  return false;
++#endif
++}
++
+ // Ubuntu's version of glibc has a race condition in sem_post that can cause
+ // it to call futex(2) with bogus op arguments. To workaround this, we need
+ // to allow those futex(2) calls to fail with EINVAL, instead of crashing the
+@@ -270,6 +284,8 @@ ResultExpr RestrictFcntlCommands() {
+   uint64_t kOLargeFileFlag = O_LARGEFILE;
+   if (IsArchitectureX86_64() || IsArchitectureI386() || IsArchitectureMips())
+     kOLargeFileFlag = 0100000;
++  else if (IsArchitecturePPC64())
++    kOLargeFileFlag = 0200000;
+ 
+   const Arg<int> cmd(1);
+   const Arg<long> long_arg(2);
+@@ -287,7 +303,16 @@ ResultExpr RestrictFcntlCommands() {
+               F_SETLKW,
+               F_GETLK,
+               F_DUPFD,
+-              F_DUPFD_CLOEXEC),
++              F_DUPFD_CLOEXEC
++#if defined(__powerpc64__)
++// On PPC64, F_SETLK, F_GETLK, F_SETLKW are defined as the 64-bit variants
++// but glibc will sometimes still use the 32-bit versions. Allow both.
++              ,
++              5, /* F_GETLK (32) */
++              6, /* F_SETLK (32) */
++              7  /* F_SETLKW (32) */
++#endif
++	     ),
+              Allow())
+       .Case(F_SETFL,
+             If((long_arg & ~kAllowedMask) == 0, Allow()).Else(CrashSIGSYS()))
+@@ -297,7 +322,7 @@ ResultExpr RestrictFcntlCommands() {
+   // clang-format on
+ }
+ 
+-#if defined(__i386__) || defined(__mips__)
++#if defined(__i386__) || defined(__mips__) || defined(__powerpc64__)
+ ResultExpr RestrictSocketcallCommand() {
+   // Unfortunately, we are unable to restrict the first parameter to
+   // socketpair(2). Whilst initially sounding bad, it's noteworthy that very
+@@ -454,7 +479,7 @@ ResultExpr RestrictPtrace() {
+ #endif
+   return Switch(request)
+       .CASES((
+-#if !defined(__aarch64__)
++#if !defined(__aarch64__) && !defined(__powerpc64__)
+                  PTRACE_GETREGS, PTRACE_GETFPREGS,
+ #if defined(TRACE_GET_THREAD_AREA)
+                  PTRACE_GET_THREAD_AREA,
+--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.h
++++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.h
+@@ -49,7 +49,7 @@ SANDBOX_EXPORT bpf_dsl::ResultExpr Restr
+ // O_NONBLOCK | O_SYNC | O_LARGEFILE | O_CLOEXEC | O_NOATIME.
+ SANDBOX_EXPORT bpf_dsl::ResultExpr RestrictFcntlCommands();
+ 
+-#if defined(__i386__) || defined(__mips__)
++#if defined(__i386__) || defined(__mips__) || defined(__powerpc64__)
+ // Restrict socketcall(2) to only allow socketpair(2), send(2), recv(2),
+ // sendto(2), recvfrom(2), shutdown(2), sendmsg(2) and recvmsg(2).
+ SANDBOX_EXPORT bpf_dsl::ResultExpr RestrictSocketcallCommand();
+--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
++++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
+@@ -28,7 +28,7 @@ bool SyscallSets::IsKill(int sysno) {
+ bool SyscallSets::IsAllowedGettime(int sysno) {
+   switch (sysno) {
+     case __NR_gettimeofday:
+-#if defined(__i386__) || defined(__x86_64__) || \
++#if defined(__i386__) || defined(__x86_64__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_time:
+ #endif
+@@ -51,12 +51,12 @@ bool SyscallSets::IsAllowedGettime(int s
+                                     // filtered by RestrictClockID().
+     case __NR_clock_nanosleep_time64:  // Parameters filtered by RestrictClockID().
+ #endif
+-#if defined(__i386__) || \
++#if defined(__i386__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_ftime:  // Obsolete.
+ #endif
+     case __NR_settimeofday:  // Privileged.
+-#if defined(__i386__) || \
++#if defined(__i386__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_stime:
+ #endif
+@@ -135,7 +135,7 @@ bool SyscallSets::IsFileSystem(int sysno
+     case __NR_faccessat:  // EPERM not a valid errno.
+     case __NR_fchmodat:
+     case __NR_fchownat:  // Should be called chownat ?
+-#if defined(__x86_64__) || defined(__aarch64__)
++#if defined(__x86_64__) || defined(__aarch64__) || defined(__powerpc64__)
+     case __NR_newfstatat:  // fstatat(). EPERM not a valid errno.
+ #elif defined(__i386__) || defined(__arm__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+@@ -154,7 +154,7 @@ bool SyscallSets::IsFileSystem(int sysno
+     case __NR_memfd_create:
+     case __NR_mkdirat:
+     case __NR_mknodat:
+-#if defined(__i386__)
++#if defined(__i386__) || defined(__powerpc64__)
+     case __NR_oldlstat:
+     case __NR_oldstat:
+ #endif
+@@ -167,7 +167,7 @@ bool SyscallSets::IsFileSystem(int sysno
+     case __NR_stat64:
+ #endif
+     case __NR_statfs:  // EPERM not a valid errno.
+-#if defined(__i386__) || defined(__arm__) || \
++#if defined(__i386__) || defined(__arm__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_statfs64:
+ #endif
+@@ -179,7 +179,8 @@ bool SyscallSets::IsFileSystem(int sysno
+     case __NR_truncate64:
+ #endif
+     case __NR_unlinkat:
+-#if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
++#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
++    defined(__powerpc64__)
+     case __NR_utime:
+ #endif
+     case __NR_utimensat:  // New.
+@@ -204,7 +205,8 @@ bool SyscallSets::IsAllowedFileSystemAcc
+ #endif
+       return true;
+ // TODO(jln): these should be denied gracefully as well (moved below).
+-#if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
++#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
++    defined(__powerpc64__)
+     case __NR_fadvise64:  // EPERM not a valid errno.
+ #endif
+ #if defined(__i386__)
+@@ -216,12 +218,12 @@ bool SyscallSets::IsAllowedFileSystemAcc
+     case __NR_fdatasync:  // EPERM not a valid errno.
+     case __NR_flock:      // EPERM not a valid errno.
+     case __NR_fstatfs:    // Give information about the whole filesystem.
+-#if defined(__i386__) || defined(__arm__) || \
++#if defined(__i386__) || defined(__arm__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_fstatfs64:
+ #endif
+     case __NR_fsync:  // EPERM not a valid errno.
+-#if defined(__i386__)
++#if defined(__i386__) || defined(__powerpc64__)
+     case __NR_oldfstat:
+ #endif
+ #if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
+@@ -229,6 +231,8 @@ bool SyscallSets::IsAllowedFileSystemAcc
+     case __NR_sync_file_range:  // EPERM not a valid errno.
+ #elif defined(__arm__)
+     case __NR_arm_sync_file_range:  // EPERM not a valid errno.
++#elif defined(__powerpc64__)
++    case __NR_sync_file_range2: // EPERM not a valid errno.
+ #endif
+     default:
+       return false;
+@@ -248,7 +252,7 @@ bool SyscallSets::IsDeniedFileSystemAcce
+     case __NR_getdents:    // EPERM not a valid errno.
+ #endif
+     case __NR_getdents64:  // EPERM not a valid errno.
+-#if defined(__i386__) || \
++#if defined(__i386__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_readdir:
+ #endif
+@@ -290,7 +294,7 @@ bool SyscallSets::IsGetSimpleId(int sysn
+ bool SyscallSets::IsProcessPrivilegeChange(int sysno) {
+   switch (sysno) {
+     case __NR_capset:
+-#if defined(__i386__) || defined(__x86_64__)
++#if defined(__i386__) || defined(__x86_64__) || defined(__powerpc64__)
+     case __NR_ioperm:  // Intel privilege.
+     case __NR_iopl:    // Intel privilege.
+ #endif
+@@ -340,7 +344,7 @@ bool SyscallSets::IsAllowedSignalHandlin
+     case __NR_rt_sigprocmask:
+     case __NR_rt_sigreturn:
+     case __NR_rt_sigtimedwait:
+-#if defined(__i386__) || defined(__arm__) || \
++#if defined(__i386__) || defined(__arm__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_rt_sigtimedwait_time64:
+     case __NR_sigaction:
+@@ -357,7 +361,7 @@ bool SyscallSets::IsAllowedSignalHandlin
+     case __NR_signalfd:
+ #endif
+     case __NR_signalfd4:
+-#if defined(__i386__) || defined(__arm__) || \
++#if defined(__i386__) || defined(__arm__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_sigpending:
+     case __NR_sigsuspend:
+@@ -382,7 +386,7 @@ bool SyscallSets::IsAllowedOperationOnFd
+ #endif
+     case __NR_dup3:
+ #if defined(__x86_64__) || defined(__arm__) || defined(__mips__) || \
+-    defined(__aarch64__)
++    defined(__aarch64__) || defined(__powerpc64__)
+     case __NR_shutdown:
+ #endif
+       return true;
+@@ -416,7 +420,7 @@ bool SyscallSets::IsAllowedProcessStartO
+     case __NR_membarrier:
+     case __NR_wait4:
+     case __NR_waitid:
+-#if defined(__i386__)
++#if defined(__i386__) || defined(__powerpc64__)
+     case __NR_waitpid:
+ #endif
+ #if !defined(__GLIBC__)
+@@ -438,7 +442,7 @@ bool SyscallSets::IsAllowedProcessStartO
+     case __NR_set_tid_address:
+ #endif
+     case __NR_unshare:
+-#if !defined(__mips__) && !defined(__aarch64__)
++#if !defined(__mips__) && !defined(__aarch64__) || defined(__powerpc64__)
+     case __NR_vfork:
+ #endif
+     default:
+@@ -491,7 +495,7 @@ bool SyscallSets::IsAllowedGetOrModifySo
+       return true;
+     default:
+ #if defined(__x86_64__) || defined(__arm__) || defined(__mips__) || \
+-    defined(__aarch64__)
++    defined(__aarch64__) || defined(__powerpc64__)
+     case __NR_socketpair:  // We will want to inspect its argument.
+ #endif
+       return false;
+@@ -501,7 +505,7 @@ bool SyscallSets::IsAllowedGetOrModifySo
+ bool SyscallSets::IsDeniedGetOrModifySocket(int sysno) {
+   switch (sysno) {
+ #if defined(__x86_64__) || defined(__arm__) || defined(__mips__) || \
+-    defined(__aarch64__)
++    defined(__aarch64__) || defined(__powerpc64__)
+     case __NR_accept:
+     case __NR_accept4:
+     case __NR_bind:
+@@ -515,7 +519,7 @@ bool SyscallSets::IsDeniedGetOrModifySoc
+   }
+ }
+ 
+-#if defined(__i386__) || \
++#if defined(__i386__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+ // Big multiplexing system call for sockets.
+ bool SyscallSets::IsSocketCall(int sysno) {
+@@ -530,7 +534,8 @@ bool SyscallSets::IsSocketCall(int sysno
+ }
+ #endif
+ 
+-#if defined(__x86_64__) || defined(__arm__) || defined(__mips__)
++#if defined(__x86_64__) || defined(__arm__) || defined(__mips__) || \
++    defined(__powerpc64__)
+ bool SyscallSets::IsNetworkSocketInformation(int sysno) {
+   switch (sysno) {
+     case __NR_getpeername:
+@@ -558,7 +563,7 @@ bool SyscallSets::IsAllowedAddressSpaceA
+     case __NR_mincore:
+     case __NR_mlockall:
+ #if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
+-    defined(__aarch64__)
++    defined(__aarch64__) || defined(__powerpc64__)
+     case __NR_mmap:
+ #endif
+ #if defined(__i386__) || defined(__arm__) || \
+@@ -589,7 +594,7 @@ bool SyscallSets::IsAllowedAddressSpaceA
+ bool SyscallSets::IsAllowedGeneralIo(int sysno) {
+   switch (sysno) {
+     case __NR_lseek:
+-#if defined(__i386__) || defined(__arm__) || \
++#if defined(__i386__) || defined(__arm__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR__llseek:
+ #endif
+@@ -609,27 +614,27 @@ bool SyscallSets::IsAllowedGeneralIo(int
+     case __NR_read:
+     case __NR_readv:
+     case __NR_pread64:
+-#if defined(__arm__) || \
++#if defined(__arm__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_recv:
+ #endif
+ #if defined(__x86_64__) || defined(__arm__) || defined(__mips__) || \
+-    defined(__aarch64__)
++    defined(__aarch64__) || defined(__powerpc64__)
+     case __NR_recvfrom:  // Could specify source.
+     case __NR_recvmsg:   // Could specify source.
+ #endif
+-#if defined(__i386__) || defined(__x86_64__)
++#if defined(__i386__) || defined(__x86_64__) || defined(__powerpc64__)
+     case __NR_select:
+ #endif
+-#if defined(__i386__) || defined(__arm__) || defined(__mips__)
++#if defined(__i386__) || defined(__arm__) || defined(__mips__) || defined(__powerpc64__)
+     case __NR__newselect:
+ #endif
+-#if defined(__arm__) || \
++#if defined(__arm__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_send:
+ #endif
+ #if defined(__x86_64__) || defined(__arm__) || defined(__mips__) || \
+-    defined(__aarch64__)
++    defined(__aarch64__) || defined(__powerpc64__)
+     case __NR_sendmsg:  // Could specify destination.
+     case __NR_sendto:   // Could specify destination.
+ #endif
+@@ -684,7 +689,7 @@ bool SyscallSets::IsAllowedBasicSchedule
+     case __NR_nanosleep:
+       return true;
+     case __NR_getpriority:
+-#if defined(__i386__) || defined(__arm__) || \
++#if defined(__i386__) || defined(__arm__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_nice:
+ #endif
+@@ -696,7 +701,7 @@ bool SyscallSets::IsAllowedBasicSchedule
+ 
+ bool SyscallSets::IsAdminOperation(int sysno) {
+   switch (sysno) {
+-#if defined(__i386__) || defined(__arm__) || \
++#if defined(__i386__) || defined(__arm__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_bdflush:
+ #endif
+@@ -713,7 +718,8 @@ bool SyscallSets::IsAdminOperation(int s
+ 
+ bool SyscallSets::IsKernelModule(int sysno) {
+   switch (sysno) {
+-#if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
++#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
++    defined(__powerpc64__)
+     case __NR_create_module:
+     case __NR_get_kernel_syms:  // Should ENOSYS.
+     case __NR_query_module:
+@@ -745,7 +751,7 @@ bool SyscallSets::IsFsControl(int sysno)
+     case __NR_quotactl:
+     case __NR_swapoff:
+     case __NR_swapon:
+-#if defined(__i386__) || \
++#if defined(__i386__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_umount:
+ #endif
+@@ -762,7 +768,7 @@ bool SyscallSets::IsNuma(int sysno) {
+     case __NR_getcpu:
+     case __NR_mbind:
+ #if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
+-    defined(__aarch64__)
++    defined(__aarch64__) || defined(__powerpc64__)
+     case __NR_migrate_pages:
+ #endif
+     case __NR_move_pages:
+@@ -797,13 +803,13 @@ bool SyscallSets::IsGlobalProcessEnviron
+   switch (sysno) {
+     case __NR_acct:  // Privileged.
+ #if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
+-    defined(__aarch64__)
++    defined(__aarch64__) || defined(__powerpc64__)
+     case __NR_getrlimit:
+ #endif
+-#if defined(__i386__) || defined(__arm__)
++#if defined(__i386__) || defined(__arm__) || defined(__powerpc64__)
+     case __NR_ugetrlimit:
+ #endif
+-#if defined(__i386__) || \
++#if defined(__i386__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_ulimit:
+ #endif
+@@ -838,7 +844,7 @@ bool SyscallSets::IsGlobalSystemStatus(i
+ #endif
+     case __NR_sysinfo:
+     case __NR_uname:
+-#if defined(__i386__)
++#if defined(__i386__) || defined(__powerpc64__)
+     case __NR_olduname:
+     case __NR_oldolduname:
+ #endif
+@@ -904,8 +910,16 @@ bool SyscallSets::IsSystemVSemaphores(in
+ }
+ #endif
+ 
++/* shitty hack around Void's 4.19 kernel headers missing those numbers */
++#if defined(__powerpc64__) && !defined(__NR_shmget)
++#define __NR_shmget 395
++#define __NR_shmctl 396
++#define __NR_shmat 397
++#define __NR_shmdt 398
++#endif
++
+ #if defined(__i386__) || defined(__x86_64__) || defined(__arm__) || \
+-    defined(__aarch64__) ||                                         \
++    defined(__aarch64__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_64_BITS))
+ // These give a lot of ambient authority and bypass the setuid sandbox.
+ bool SyscallSets::IsSystemVSharedMemory(int sysno) {
+@@ -936,7 +950,7 @@ bool SyscallSets::IsSystemVMessageQueue(
+ }
+ #endif
+ 
+-#if defined(__i386__) || \
++#if defined(__i386__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+ // Big system V multiplexing system call.
+ bool SyscallSets::IsSystemVIpc(int sysno) {
+@@ -956,7 +970,7 @@ bool SyscallSets::IsAnySystemV(int sysno
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_64_BITS))
+   return IsSystemVMessageQueue(sysno) || IsSystemVSemaphores(sysno) ||
+          IsSystemVSharedMemory(sysno);
+-#elif defined(__i386__) || \
++#elif defined(__i386__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+   return IsSystemVIpc(sysno);
+ #endif
+@@ -1014,7 +1028,8 @@ bool SyscallSets::IsFaNotify(int sysno)
+ bool SyscallSets::IsTimer(int sysno) {
+   switch (sysno) {
+     case __NR_getitimer:
+-#if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
++#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
++    defined(__powerpc64__)
+     case __NR_alarm:
+ #endif
+     case __NR_setitimer:
+@@ -1096,17 +1111,20 @@ bool SyscallSets::IsMisc(int sysno) {
+     case __NR_syncfs:
+     case __NR_vhangup:
+ // The system calls below are not implemented.
+-#if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
++#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
++    defined(__powerpc64__)
+     case __NR_afs_syscall:
+ #endif
+ #if defined(__i386__) || \
+-    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
++    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
++    defined(__powerpc64__)
+     case __NR_break:
+ #endif
+-#if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
++#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
++    defined(__powerpc64__)
+     case __NR_getpmsg:
+ #endif
+-#if defined(__i386__) || \
++#if defined(__i386__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_gtty:
+     case __NR_idle:
+@@ -1115,20 +1133,21 @@ bool SyscallSets::IsMisc(int sysno) {
+     case __NR_prof:
+     case __NR_profil:
+ #endif
+-#if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
++#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
++    defined(__powerpc64__)
+     case __NR_putpmsg:
+ #endif
+ #if defined(__x86_64__)
+     case __NR_security:
+ #endif
+-#if defined(__i386__) || \
++#if defined(__i386__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_stty:
+ #endif
+-#if defined(__x86_64__)
++#if defined(__x86_64__) || defined(__powerpc64__)
+     case __NR_tuxcall:
+ #endif
+-#if !defined(__aarch64__)
++#if !defined(__aarch64__) && !defined(__powerpc64__)
+     case __NR_vserver:
+ #endif
+       return true;
+--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_sets.h
++++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_sets.h
+@@ -43,13 +43,14 @@ class SANDBOX_EXPORT SyscallSets {
+   static bool IsDeniedGetOrModifySocket(int sysno);
+ 
+ #if defined(__i386__) || \
+-    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
++    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
++    defined(__powerpc64__)
+   // Big multiplexing system call for sockets.
+   static bool IsSocketCall(int sysno);
+ #endif
+ 
+ #if defined(__x86_64__) || defined(__arm__) || defined(__mips__) || \
+-    defined(__aarch64__)
++    defined(__aarch64__) || defined(__powerpc64__)
+   static bool IsNetworkSocketInformation(int sysno);
+ #endif
+ 
+@@ -77,7 +78,7 @@ class SANDBOX_EXPORT SyscallSets {
+   static bool IsSystemVSemaphores(int sysno);
+ #endif
+ #if defined(__i386__) || defined(__x86_64__) || defined(__arm__) || \
+-    defined(__aarch64__) ||                                         \
++    defined(__aarch64__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_64_BITS))
+   // These give a lot of ambient authority and bypass the setuid sandbox.
+   static bool IsSystemVSharedMemory(int sysno);
+@@ -89,7 +90,8 @@ class SANDBOX_EXPORT SyscallSets {
+ #endif
+ 
+ #if defined(__i386__) || \
+-    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
++    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
++    defined(__powerpc64__)
+   // Big system V multiplexing system call.
+   static bool IsSystemVIpc(int sysno);
+ #endif
+--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf/syscall.cc
++++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf/syscall.cc
+@@ -18,7 +18,7 @@ namespace sandbox {
+ namespace {
+ 
+ #if defined(ARCH_CPU_X86_FAMILY) || defined(ARCH_CPU_ARM_FAMILY) || \
+-    defined(ARCH_CPU_MIPS_FAMILY)
++    defined(ARCH_CPU_MIPS_FAMILY) || defined (ARCH_CPU_PPC64_FAMILY)
+ // Number that's not currently used by any Linux kernel ABIs.
+ const int kInvalidSyscallNumber = 0x351d3;
+ #else
+@@ -312,10 +312,54 @@ asm(// We need to be able to tell the ke
+     "2:ret\n"
+     ".cfi_endproc\n"
+     ".size SyscallAsm, .-SyscallAsm\n"
++#elif defined(__powerpc64__)
++    ".text\n"
++    ".align 4\n"
++    ".type SyscallAsm @function\n"
++    "SyscallAsm:\n"
++    ".cfi_startproc\n"
++
++    // Check if r3 is negative
++    "cmpdi 3, 0\n"
++    "bgt 2f\n"
++
++    // Load address of 3f into r3 and return
++    "mflr 10\n"
++    "bl 1f\n"
++    "1: mflr 3\n"
++    "mtlr 10\n"
++    "addi 3, 3, 4*13\n"
++    "blr\n"
++
++    // Load arguments from array into r3-8
++    // save param 3 in r10
++    "2:\n"
++    "mr 0, 3\n"
++    "ld 3, 0(4)\n"
++    "ld 5, 16(4)\n"
++    "ld 6, 24(4)\n"
++    "ld 7, 32(4)\n"
++    "ld 8, 40(4)\n"
++    "ld 4, 8(4)\n"
++    "li 9, 0\n"
++
++    // Enter kernel
++    "sc\n"
++
++    // Magic return address
++    "3:\n"
++    // Like MIPS, ppc64 return values are always positive.
++    // Check for error in cr0.SO and negate upon error
++    "bc 4, 3, 4f\n"
++    "neg 3, 3\n"
++    "4: blr\n"
++
++    ".cfi_endproc\n"
++    ".size SyscallAsm, .-SyscallAsm\n"
+ #endif
+     );  // asm
+ 
+-#if defined(__x86_64__)
++#if defined(__x86_64__) || defined(__powerpc64__)
+ extern "C" {
+ intptr_t SyscallAsm(intptr_t nr, const intptr_t args[6]);
+ }
+@@ -429,6 +473,8 @@ intptr_t Syscall::Call(int nr,
+     ret = inout;
+   }
+ 
++#elif defined(__powerpc64__)
++  intptr_t ret = SyscallAsm(nr, args);
+ #else
+ #error "Unimplemented architecture"
+ #endif
+@@ -445,8 +491,26 @@ void Syscall::PutValueInUcontext(intptr_
+     // needs to be changed back.
+     ret_val = -ret_val;
+     SECCOMP_PARM4(ctx) = 1;
+-  } else
++  } else {
+     SECCOMP_PARM4(ctx) = 0;
++  }
++#endif
++#if defined(__powerpc64__)
++  // Same as MIPS, need to invert ret and set error register (cr0.SO)
++  if (ret_val <= -1 && ret_val >= -4095) {
++    ret_val = -ret_val;
++#ifdef __GLIBC__
++    ctx->uc_mcontext.regs->ccr |= (1 << 28);
++#else
++    ((struct pt_regs *)ctx->uc_mcontext.regs)->ccr |= (1 << 28);
++#endif
++  } else {
++#ifdef __GLIBC__
++    ctx->uc_mcontext.regs->ccr &= ~(1 << 28);
++#else
++    ((struct pt_regs *)ctx->uc_mcontext.regs)->ccr &= ~(1 << 28);
++#endif
++  }
+ #endif
+   SECCOMP_RESULT(ctx) = static_cast<greg_t>(ret_val);
+ }
+--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf/trap.cc
++++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf/trap.cc
+@@ -236,6 +236,20 @@ void Trap::SigSys(int nr, LinuxSigInfo*
+       SetIsInSigHandler();
+     }
+ 
++#if defined(__powerpc64__)
++    // On ppc64+glibc, some syscalls seem to accidentally negate the first
++    // parameter which causes checks against it to fail. For now, manually
++    // negate them back.
++    // TODO(shawn@anastas.io): investigate this issue further
++    auto nr = SECCOMP_SYSCALL(ctx);
++    if (nr == __NR_openat || nr == __NR_mkdirat || nr == __NR_faccessat || nr == __NR_readlinkat ||
++        nr == __NR_renameat || nr == __NR_renameat2 || nr == __NR_newfstatat || nr == __NR_unlinkat) {
++        if (static_cast<int>(SECCOMP_PARM1(ctx)) > 0) {
++            SECCOMP_PARM1(ctx) = -SECCOMP_PARM1(ctx);
++        }
++    }
++#endif
++
+     // Copy the seccomp-specific data into a arch_seccomp_data structure. This
+     // is what we are showing to TrapFnc callbacks that the system call
+     // evaluator registered with the sandbox.
+--- a/src/3rdparty/chromium/sandbox/linux/services/credentials.cc
++++ b/src/3rdparty/chromium/sandbox/linux/services/credentials.cc
+@@ -81,7 +81,7 @@ bool ChrootToSafeEmptyDir() {
+   pid_t pid = -1;
+   alignas(16) char stack_buf[PTHREAD_STACK_MIN];
+ #if defined(ARCH_CPU_X86_FAMILY) || defined(ARCH_CPU_ARM_FAMILY) || \
+-    defined(ARCH_CPU_MIPS_FAMILY)
++    defined(ARCH_CPU_MIPS_FAMILY) || defined(ARCH_CPU_PPC64_FAMILY)
+   // The stack grows downward.
+   void* stack = stack_buf + sizeof(stack_buf);
+ #else
+--- a/src/3rdparty/chromium/sandbox/linux/services/syscall_wrappers.cc
++++ b/src/3rdparty/chromium/sandbox/linux/services/syscall_wrappers.cc
+@@ -61,7 +61,7 @@ long sys_clone(unsigned long flags,
+ #if defined(ARCH_CPU_X86_64)
+   return syscall(__NR_clone, flags, child_stack, ptid, ctid, tls);
+ #elif defined(ARCH_CPU_X86) || defined(ARCH_CPU_ARM_FAMILY) || \
+-    defined(ARCH_CPU_MIPS_FAMILY)
++    defined(ARCH_CPU_MIPS_FAMILY) || defined(ARCH_CPU_PPC64_FAMILY)
+   // CONFIG_CLONE_BACKWARDS defined.
+   return syscall(__NR_clone, flags, child_stack, ptid, tls, ctid);
+ #endif
+--- a/src/3rdparty/chromium/sandbox/linux/syscall_broker/broker_process.cc
++++ b/src/3rdparty/chromium/sandbox/linux/syscall_broker/broker_process.cc
+@@ -165,7 +165,7 @@ bool BrokerProcess::IsSyscallBrokerable(
+ #if defined(__NR_fstatat64)
+     case __NR_fstatat64:
+ #endif
+-#if defined(__x86_64__) || defined(__aarch64__)
++#if defined(__x86_64__) || defined(__aarch64__) || defined(__powerpc64__)
+     case __NR_newfstatat:
+ #endif
+       return !fast_check || allowed_command_set_.test(COMMAND_STAT);
+--- a/src/3rdparty/chromium/sandbox/linux/system_headers/linux_seccomp.h
++++ b/src/3rdparty/chromium/sandbox/linux/system_headers/linux_seccomp.h
+@@ -41,6 +41,9 @@
+ #ifndef EM_AARCH64
+ #define EM_AARCH64 183
+ #endif
++#ifndef EM_PPC64
++#define EM_PPC64 21
++#endif
+ 
+ #ifndef __AUDIT_ARCH_64BIT
+ #define __AUDIT_ARCH_64BIT 0x80000000
+@@ -74,6 +77,14 @@
+ #define AUDIT_ARCH_AARCH64 (EM_AARCH64 | __AUDIT_ARCH_64BIT | __AUDIT_ARCH_LE)
+ #endif
+ 
++#ifndef AUDIT_ARCH_PPC64
++#define AUDIT_ARCH_PPC64 (EM_PPC64 | __AUDIT_ARCH_64BIT)
++#endif
++
++#ifndef AUDIT_ARCH_PPC64LE
++#define AUDIT_ARCH_PPC64LE (EM_PPC64 | __AUDIT_ARCH_64BIT | __AUDIT_ARCH_LE)
++#endif
++
+ // For prctl.h
+ #ifndef PR_SET_SECCOMP
+ #define PR_SET_SECCOMP               22
+--- a/src/3rdparty/chromium/sandbox/linux/system_headers/linux_signal.h
++++ b/src/3rdparty/chromium/sandbox/linux/system_headers/linux_signal.h
+@@ -13,7 +13,7 @@
+ // (not undefined, but defined different values and in different memory
+ // layouts). So, fill the gap here.
+ #if defined(__i386__) || defined(__x86_64__) || defined(__arm__) || \
+-    defined(__aarch64__)
++    defined(__aarch64__) || defined(__powerpc64__)
+ 
+ #define LINUX_SIGHUP 1
+ #define LINUX_SIGINT 2
+--- a/src/3rdparty/chromium/sandbox/linux/system_headers/linux_syscalls.h
++++ b/src/3rdparty/chromium/sandbox/linux/system_headers/linux_syscalls.h
+@@ -35,5 +35,9 @@
+ #include "sandbox/linux/system_headers/arm64_linux_syscalls.h"
+ #endif
+ 
++#if defined(__powerpc64__)
++#include "sandbox/linux/system_headers/ppc64_linux_syscalls.h"
++#endif
++
+ #endif  // SANDBOX_LINUX_SYSTEM_HEADERS_LINUX_SYSCALLS_H_
+ 
+--- a/src/3rdparty/chromium/sandbox/linux/system_headers/linux_ucontext.h
++++ b/src/3rdparty/chromium/sandbox/linux/system_headers/linux_ucontext.h
+@@ -11,6 +11,8 @@
+ #include "sandbox/linux/system_headers/arm_linux_ucontext.h"
+ #elif defined(__i386__)
+ #include "sandbox/linux/system_headers/i386_linux_ucontext.h"
++#elif defined(__powerpc64__)
++#include "sandbox/linux/system_headers/ppc64_linux_ucontext.h"
+ #else
+ #error "No support for your architecture in PNaCl header"
+ #endif
+--- a/src/3rdparty/chromium/sandbox/policy/linux/bpf_renderer_policy_linux.cc
++++ b/src/3rdparty/chromium/sandbox/policy/linux/bpf_renderer_policy_linux.cc
+@@ -15,6 +15,11 @@
+ #include "sandbox/linux/system_headers/linux_syscalls.h"
+ #include "sandbox/policy/linux/sandbox_linux.h"
+ 
++// On PPC64, TCGETS is defined in terms of struct termios, so we must include termios.h
++#ifdef __powerpc64__
++#include <termios.h>
++#endif
++
+ // TODO(vignatti): replace the local definitions below with #include
+ // <linux/dma-buf.h> once kernel version 4.6 becomes widely used.
+ #include <linux/types.h>
+--- a/src/3rdparty/chromium/third_party/angle/src/compiler/translator/InfoSink.h
++++ b/src/3rdparty/chromium/third_party/angle/src/compiler/translator/InfoSink.h
+@@ -93,7 +93,16 @@ class TInfoSinkBase
+             stream.precision(8);
+             stream << f;
+         }
+-        sink.append(stream.str());
++
++        // Hack to work around a bug where negative floating point values
++        // are rendered like '.0.5' instead of '-0.5'
++        std::string res(stream.str());
++
++        if (signbit(f)) { // test if f is negative
++            res[0] = '-';
++        }
++
++        sink.append(res);
+         return *this;
+     }
+     // Write boolean values as their names instead of integral value.
+--- a/src/3rdparty/chromium/third_party/angle/src/libANGLE/Constants.h
++++ b/src/3rdparty/chromium/third_party/angle/src/libANGLE/Constants.h
+@@ -9,6 +9,7 @@
+ #ifndef LIBANGLE_CONSTANTS_H_
+ #define LIBANGLE_CONSTANTS_H_
+ 
++#include <cstddef>
+ #include "common/platform.h"
+ 
+ #include <stdint.h>
+--- a/src/3rdparty/chromium/third_party/boringssl/BUILD.gn
++++ b/src/3rdparty/chromium/third_party/boringssl/BUILD.gn
+@@ -99,6 +99,13 @@ if (is_win && !is_msan && current_cpu !=
+       } else {
+         public_configs = [ ":no_asm_config" ]
+       }
++    } else if (current_cpu == "ppc64") {
++      if (is_linux) {
++        # TODO: ppc64 (be) check
++        sources += crypto_sources_linux_ppc64le
++      } else {
++        public_configs = [ ":no_asm_config" ]
++      }
+     } else {
+       public_configs = [ ":no_asm_config" ]
+     }
+--- a/src/3rdparty/chromium/third_party/breakpad/BUILD.gn
++++ b/src/3rdparty/chromium/third_party/breakpad/BUILD.gn
+@@ -623,7 +623,6 @@ if (is_linux || is_chromeos || is_androi
+       "breakpad/src/client/minidump_file_writer.h",
+       "breakpad/src/common/convert_UTF.cc",
+       "breakpad/src/common/convert_UTF.h",
+-      "breakpad/src/common/linux/breakpad_getcontext.S",
+       "breakpad/src/common/linux/elf_core_dump.cc",
+       "breakpad/src/common/linux/elf_core_dump.h",
+       "breakpad/src/common/linux/elfutils.cc",
+@@ -663,6 +662,15 @@ if (is_linux || is_chromeos || is_androi
+ 
+     libs = [ "dl" ]
+ 
++    if (current_cpu == "ppc64") {
++        defines = [ "HAVE_GETCONTEXT" ]
++        libs += [ "ucontext" ]
++    } else {
++        sources += [
++            "breakpad/src/common/linux/breakpad_getcontext.S"
++        ]
++    }
++
+     include_dirs = [
+       ".",
+       "breakpad/src",
+@@ -712,7 +720,6 @@ if (is_linux || is_chromeos || is_androi
+       "breakpad/src/client/linux/minidump_writer/minidump_writer_unittest.cc",
+       "breakpad/src/client/linux/minidump_writer/minidump_writer_unittest_utils.cc",
+       "breakpad/src/client/linux/minidump_writer/proc_cpuinfo_reader_unittest.cc",
+-      "breakpad/src/common/linux/breakpad_getcontext_unittest.cc",
+       "breakpad/src/common/linux/elf_core_dump_unittest.cc",
+       "breakpad/src/common/linux/file_id_unittest.cc",
+       "breakpad/src/common/linux/linux_libc_support_unittest.cc",
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/raw_context_cpu.h
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/raw_context_cpu.h
+@@ -44,6 +44,8 @@ typedef MDRawContextARM RawContextCPU;
+ typedef MDRawContextARM64_Old RawContextCPU;
+ #elif defined(__mips__)
+ typedef MDRawContextMIPS RawContextCPU;
++#elif defined(__powerpc64__)
++typedef MDRawContextPPC64 RawContextCPU;
+ #else
+ #error "This code has not been ported to your platform yet."
+ #endif
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.cc
+@@ -270,7 +270,54 @@ void ThreadInfo::FillCPUContext(RawConte
+   out->float_save.fir = mcontext.fpc_eir;
+ #endif
+ }
+-#endif  // __mips__
++
++#elif defined(__powerpc64__)
++
++#if !defined(__GLIBC__)
++#include <asm/elf.h>
++#include <asm/ptrace.h>
++#endif
++
++uintptr_t ThreadInfo::GetInstructionPointer() const {
++    return mcontext.gp_regs[PT_NIP];
++}
++
++void ThreadInfo::FillCPUContext(RawContextCPU* out) const {
++    out->context_flags = MD_CONTEXT_PPC64_FULL;
++    for (int i = 0; i < MD_CONTEXT_PPC64_GPR_COUNT; i++)
++        out->gpr[i] = mcontext.gp_regs[i];
++
++    out->lr = mcontext.gp_regs[PT_LNK];
++    out->srr0 = mcontext.gp_regs[PT_NIP];
++    out->srr1 = mcontext.gp_regs[PT_MSR];
++    out->cr = mcontext.gp_regs[PT_CCR];
++    out->xer = mcontext.gp_regs[PT_XER];
++    out->ctr = mcontext.gp_regs[PT_CTR];
++
++#ifdef __GLIBC__
++    for (int i = 0; i < MD_FLOATINGSAVEAREA_PPC_FPR_COUNT; i++)
++        out->float_save.fpregs[i] = mcontext.fp_regs[i];
++
++    out->float_save.fpscr = mcontext.fp_regs[NFPREG-1];
++#else
++    for (int i = 0; i < MD_FLOATINGSAVEAREA_PPC_FPR_COUNT; i++)
++        out->float_save.fpregs[i] = ((uint64_t *)&mcontext.fp_regs)[i];
++
++     out->float_save.fpscr = ((uint64_t *)&mcontext.fp_regs)[ELF_NFPREG-1];
++#endif
++
++    for (int i = 0; i < MD_VECTORSAVEAREA_PPC_VR_COUNT; i++)
++        out->vector_save.save_vr[i] = \
++            {(((uint64_t)vregs.vrregs[i][0]) << 32)
++                          | vregs.vrregs[i][1],
++            (((uint64_t)vregs.vrregs[i][2]) << 32)
++                         | vregs.vrregs[i][3]};
++
++    out->vrsave = vregs.vrsave;
++    out->vector_save.save_vscr = {0, vregs.vscr.vscr_word};
++    out->vector_save.save_vrvalid = 0xFFFFFFFF;
++}
++#endif  // __powerpc64__
+ 
+ void ThreadInfo::GetGeneralPurposeRegisters(void** gp_regs, size_t* size) {
+   assert(gp_regs || size);
+@@ -279,6 +326,11 @@ void ThreadInfo::GetGeneralPurposeRegist
+     *gp_regs = mcontext.gregs;
+   if (size)
+     *size = sizeof(mcontext.gregs);
++#elif defined(__powerpc64__)
++  if (gp_regs)
++    *gp_regs = mcontext.gp_regs;
++  if (size)
++    *size = sizeof(mcontext.gp_regs);
+ #else
+   if (gp_regs)
+     *gp_regs = &regs;
+@@ -294,6 +346,11 @@ void ThreadInfo::GetFloatingPointRegiste
+     *fp_regs = &mcontext.fpregs;
+   if (size)
+     *size = sizeof(mcontext.fpregs);
++#elif defined(__powerpc64__)
++  if (fp_regs)
++    *fp_regs = &mcontext.fp_regs;
++  if (size)
++    *size = sizeof(mcontext.fp_regs);
+ #else
+   if (fp_regs)
+     *fp_regs = &fpregs;
+@@ -302,4 +359,13 @@ void ThreadInfo::GetFloatingPointRegiste
+ #endif
+ }
+ 
++#if defined(__powerpc64__)
++void ThreadInfo::GetVectorRegisters(void** v_regs, size_t* size) {
++    if (v_regs)
++        *v_regs = &vregs;
++    if (size)
++        *size = sizeof(vregs);
++}
++#endif
++
+ }  // namespace google_breakpad
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.h
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.h
+@@ -68,6 +68,10 @@ struct ThreadInfo {
+   // Use the structures defined in <sys/user.h>
+   struct user_regs_struct regs;
+   struct user_fpsimd_struct fpregs;
++#elif defined(__powerpc64__)
++  // Use the structures defined in <sys/ucontext.h>.
++  mcontext_t mcontext;
++  vrregset_t vregs;
+ #elif defined(__mips__)
+   // Use the structure defined in <sys/ucontext.h>.
+   mcontext_t mcontext;
+@@ -84,6 +88,11 @@ struct ThreadInfo {
+ 
+   // Returns the pointer and size of float point register area.
+   void GetFloatingPointRegisters(void** fp_regs, size_t* size);
++
++#if defined(__powerpc64__)
++  // Returns the pointer and size of the vector register area. (PPC64 only)
++  void GetVectorRegisters(void** v_regs, size_t* size);
++#endif
+ };
+ 
+ }  // namespace google_breakpad
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc
+@@ -254,6 +254,60 @@ void UContextReader::FillCPUContext(RawC
+   out->float_save.fir = uc->uc_mcontext.fpc_eir;  // Unused.
+ #endif
+ }
++
++#elif defined(__powerpc64__)
++
++#ifndef __GLIBC__
++#include <asm/elf.h>
++#include <asm/ptrace.h>
++#endif
++
++uintptr_t UContextReader::GetStackPointer(const ucontext_t* uc) {
++    return uc->uc_mcontext.gp_regs[MD_CONTEXT_PPC64_REG_SP];
++}
++
++uintptr_t UContextReader::GetInstructionPointer(const ucontext_t* uc) {
++    return uc->uc_mcontext.gp_regs[PT_NIP];
++}
++
++void UContextReader::FillCPUContext(RawContextCPU* out, const ucontext_t* uc,
++                                    const vrregset_t* vregs) {
++    out->context_flags = MD_CONTEXT_PPC64_FULL;
++
++    for (int i = 0; i < MD_CONTEXT_PPC64_GPR_COUNT; i++)
++        out->gpr[i] = uc->uc_mcontext.gp_regs[i];
++
++    out->lr = uc->uc_mcontext.gp_regs[PT_LNK];
++    out->srr0 = uc->uc_mcontext.gp_regs[PT_NIP];
++    out->srr1 = uc->uc_mcontext.gp_regs[PT_MSR];
++    out->cr = uc->uc_mcontext.gp_regs[PT_CCR];
++    out->xer = uc->uc_mcontext.gp_regs[PT_XER];
++    out->ctr = uc->uc_mcontext.gp_regs[PT_CTR];
++
++#ifdef __GLIBC__
++    for (int i = 0; i < MD_FLOATINGSAVEAREA_PPC_FPR_COUNT; i++)
++        out->float_save.fpregs[i] = uc->uc_mcontext.fp_regs[i];
++
++    out->float_save.fpscr = uc->uc_mcontext.fp_regs[NFPREG-1];
++#else
++    for (int i = 0; i < MD_FLOATINGSAVEAREA_PPC_FPR_COUNT; i++)
++        out->float_save.fpregs[i] = ((uint64_t *)&uc->uc_mcontext.fp_regs)[i];
++
++    out->float_save.fpscr = ((uint64_t *)&uc->uc_mcontext.fp_regs)[ELF_NFPREG-1];
++#endif
++
++    for (int i = 0; i < MD_VECTORSAVEAREA_PPC_VR_COUNT; i++)
++        out->vector_save.save_vr[i] =
++            {(((uint64_t)vregs->vrregs[i][0]) << 32)
++                         | vregs->vrregs[i][1],
++             (((uint64_t)vregs->vrregs[i][2]) << 32)
++                         | vregs->vrregs[i][3]};
++
++    out->vrsave = vregs->vrsave;
++    out->vector_save.save_vscr = {0, vregs->vscr.vscr_word};
++    out->vector_save.save_vrvalid = 0xFFFFFFFF;
++}
++
+ #endif
+ 
+ }  // namespace google_breakpad
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h
+@@ -59,6 +59,9 @@ struct UContextReader {
+ #elif defined(__aarch64__)
+   static void FillCPUContext(RawContextCPU* out, const ucontext_t* uc,
+                              const struct fpsimd_context* fpregs);
++#elif defined(__powerpc64__)
++  static void FillCPUContext(RawContextCPU *out, const ucontext_t *uc,
++                             const vrregset_t* vregs);
+ #else
+   static void FillCPUContext(RawContextCPU* out, const ucontext_t* uc);
+ #endif
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc
+@@ -105,6 +105,13 @@
+ #define PR_SET_PTRACER 0x59616d61
+ #endif
+ 
++/* musl hack, can't include asm/ptrace.h as that causes conflicts */
++#ifndef __GLIBC__
++#if defined(__powerpc64__) && !defined(PT_NIP)
++#define PT_NIP 32
++#endif
++#endif
++
+ namespace google_breakpad {
+ 
+ namespace {
+@@ -461,9 +468,16 @@ bool ExceptionHandler::HandleSignal(int
+     memcpy(&g_crash_context_.float_state, fp_ptr,
+            sizeof(g_crash_context_.float_state));
+   }
++#elif defined(__powerpc64__)
++  // On PPC64, we must copy VR state
++  ucontext_t* uc_ptr = (ucontext_t*)uc;
++  if (uc_ptr->uc_mcontext.v_regs) {
++    memcpy(&g_crash_context_.vector_state, uc_ptr->uc_mcontext.v_regs,
++           sizeof(g_crash_context_.vector_state));
++  }
+ #elif !defined(__ARM_EABI__) && !defined(__mips__)
+   // FP state is not part of user ABI on ARM Linux.
+-  // In case of MIPS Linux FP state is already part of ucontext_t
++  // In case of MIPS, Linux FP state is already part of ucontext_t
+   // and 'float_state' is not a member of CrashContext.
+   ucontext_t* uc_ptr = (ucontext_t*)uc;
+   if (uc_ptr->uc_mcontext.fpregs) {
+@@ -708,11 +722,19 @@ bool ExceptionHandler::WriteMinidump() {
+   }
+ #endif
+ 
+-#if !defined(__ARM_EABI__) && !defined(__aarch64__) && !defined(__mips__)
++#if !defined(__ARM_EABI__) && !defined(__aarch64__) && !defined(__mips__) \
++    && !defined(__powerpc64__)
+   // FPU state is not part of ARM EABI ucontext_t.
+   memcpy(&context.float_state, context.context.uc_mcontext.fpregs,
+          sizeof(context.float_state));
+ #endif
++
++#if defined(__powerpc64__)
++  // Vector registers must be copied on PPC64
++  memcpy(&context.vector_state, context.context.uc_mcontext.v_regs,
++         sizeof(context.vector_state));
++#endif
++
+   context.tid = sys_gettid();
+ 
+   // Add an exception stream to the minidump for better reporting.
+@@ -733,6 +755,9 @@ bool ExceptionHandler::WriteMinidump() {
+ #elif defined(__mips__)
+   context.siginfo.si_addr =
+       reinterpret_cast<void*>(context.context.uc_mcontext.pc);
++#elif defined(__powerpc64__)
++  context.siginfo.si_addr =
++      reinterpret_cast<void*>(context.context.uc_mcontext.gp_regs[PT_NIP]);
+ #else
+ #error "This code has not been ported to your platform yet."
+ #endif
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.h
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.h
+@@ -192,7 +192,11 @@ class ExceptionHandler {
+     siginfo_t siginfo;
+     pid_t tid;  // the crashing thread.
+     ucontext_t context;
+-#if !defined(__ARM_EABI__) && !defined(__mips__)
++#if defined(__powerpc64__)
++    // PPC64's FP state is a part of ucontext_t like MIPS but the vector
++    // state is not, so a struct is needed.
++    vstate_t vector_state;
++#elif !defined(__ARM_EABI__) && !defined(__mips__)
+     // #ifdef this out because FP state is not part of user ABI for Linux ARM.
+     // In case of MIPS Linux FP state is already part of ucontext_t so
+     // 'float_state' is not required.
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler_unittest.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler_unittest.cc
+@@ -307,7 +307,7 @@ TEST(ExceptionHandlerTest, ParallelChild
+   }
+ 
+   // Wait a while until the child should have crashed.
+-  usleep(1000000);
++  usleep(2000000);
+   // Kill the child if it is still running.
+   kill(child, SIGKILL);
+ 
+@@ -559,6 +559,8 @@ const unsigned char kIllegalInstruction[
+ #if defined(__mips__)
+   // mfc2 zero,Impl - usually illegal in userspace.
+   0x48, 0x00, 0x00, 0x48
++#elif defined(__powerpc64__)
++  0x01, 0x01, 0x01, 0x01 // Crashes on a tested POWER9 cpu
+ #else
+   // This crashes with SIGILL on x86/x86-64/arm.
+   0xff, 0xff, 0xff, 0xff
+@@ -754,10 +756,10 @@ TEST(ExceptionHandlerTest, InstructionPo
+ 
+   // These are defined here so the parent can use them to check the
+   // data from the minidump afterwards.
+-  // Use 4k here because the OS will hand out a single page even
++  // Use the page size here because the OS will hand out a single page even
+   // if a smaller size is requested, and this test wants to
+   // test the upper bound of the memory range.
+-  const uint32_t kMemorySize = 4096;  // bytes
++  const uint32_t kMemorySize = getpagesize();  // bytes
+   const int kOffset = kMemorySize - sizeof(kIllegalInstruction);
+ 
+   const pid_t child = fork();
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/microdump_writer/microdump_writer.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/microdump_writer/microdump_writer.cc
+@@ -138,7 +138,9 @@ class MicrodumpWriter {
+                   const MicrodumpExtraInfo& microdump_extra_info,
+                   LinuxDumper* dumper)
+       : ucontext_(context ? &context->context : NULL),
+-#if !defined(__ARM_EABI__) && !defined(__mips__)
++#if defined(__powerpc64__)
++        vector_state_(context ? &context->vector_state : NULL),
++#elif !defined(__ARM_EABI__) && !defined(__mips__)
+         float_state_(context ? &context->float_state : NULL),
+ #endif
+         dumper_(dumper),
+@@ -337,6 +339,8 @@ class MicrodumpWriter {
+ # else
+ #  error "This mips ABI is currently not supported (n32)"
+ #endif
++#elif defined(__powerpc64__)
++    const char kArch[] = "ppc64";
+ #else
+ #error "This code has not been ported to your platform yet"
+ #endif
+@@ -409,7 +413,9 @@ class MicrodumpWriter {
+   void DumpCPUState() {
+     RawContextCPU cpu;
+     my_memset(&cpu, 0, sizeof(RawContextCPU));
+-#if !defined(__ARM_EABI__) && !defined(__mips__)
++#if defined(__powerpc64__)
++    UContextReader::FillCPUContext(&cpu, ucontext_, vector_state_);
++#elif !defined(__ARM_EABI__) && !defined(__mips__)
+     UContextReader::FillCPUContext(&cpu, ucontext_, float_state_);
+ #else
+     UContextReader::FillCPUContext(&cpu, ucontext_);
+@@ -605,7 +611,9 @@ class MicrodumpWriter {
+   void* Alloc(unsigned bytes) { return dumper_->allocator()->Alloc(bytes); }
+ 
+   const ucontext_t* const ucontext_;
+-#if !defined(__ARM_EABI__) && !defined(__mips__)
++#if defined(__powerpc64__)
++  const google_breakpad::vstate_t* const vector_state_;
++#elif !defined(__ARM_EABI__) && !defined(__mips__)
+   const google_breakpad::fpstate_t* const float_state_;
+ #endif
+   LinuxDumper* dumper_;
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/microdump_writer/microdump_writer_unittest.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/microdump_writer/microdump_writer_unittest.cc
+@@ -279,10 +279,19 @@ TEST(MicrodumpWriterTest, BasicWithMappi
+   CrashAndGetMicrodump(mappings, MicrodumpExtraInfo(), &buf);
+   ASSERT_TRUE(ContainsMicrodump(buf));
+ 
++  int page_size = getpagesize();
+ #ifdef __LP64__
+-  ASSERT_NE(std::string::npos,
+-            buf.find("M 0000000000001000 000000000000002A 0000000000001000 "
+-                     "33221100554477668899AABBCCDDEEFF0 libfoo.so"));
++  // This test is only available for the following page sizes
++  ASSERT_TRUE((page_size == 4096) || (page_size == 65536));
++  if (page_size == 4096) {
++    ASSERT_NE(std::string::npos,
++              buf.find("M 0000000000001000 000000000000002A 0000000000001000 "
++                       "33221100554477668899AABBCCDDEEFF0 libfoo.so"));
++  } else {
++    ASSERT_NE(std::string::npos,
++              buf.find("M 0000000000010000 000000000000002A 0000000000010000 "
++                       "33221100554477668899AABBCCDDEEFF0 libfoo.so"));
++  }
+ #else
+   ASSERT_NE(std::string::npos,
+             buf.find("M 00001000 0000002A 00001000 "
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_core_dumper.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_core_dumper.cc
+@@ -117,6 +117,9 @@ bool LinuxCoreDumper::GetThreadInfoByInd
+ #elif defined(__mips__)
+   stack_pointer =
+       reinterpret_cast<uint8_t*>(info->mcontext.gregs[MD_CONTEXT_MIPS_REG_SP]);
++#elif defined(__powerpc64__)
++  stack_pointer =
++      reinterpret_cast<uint8_t*>(info->mcontext.gp_regs[MD_CONTEXT_PPC64_REG_SP]);
+ #else
+ #error "This code hasn't been ported to your platform yet."
+ #endif
+@@ -212,7 +215,10 @@ bool LinuxCoreDumper::EnumerateThreads()
+         memset(&info, 0, sizeof(ThreadInfo));
+         info.tgid = status->pr_pgrp;
+         info.ppid = status->pr_ppid;
+-#if defined(__mips__)
++#if defined(__powerpc64__)
++        for (int i = 0; i < 31; i++)
++            info.mcontext.gp_regs[i] = status->pr_reg[i];
++#elif defined(__mips__)
+ #if defined(__ANDROID__)
+         for (int i = EF_R0; i <= EF_R31; i++)
+           info.mcontext.gregs[i - EF_R0] = status->pr_reg[i];
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper.cc
+@@ -765,7 +765,9 @@ bool LinuxDumper::GetStackInfo(const voi
+       reinterpret_cast<uint8_t*>(int_stack_pointer & ~(page_size - 1));
+ 
+   // The number of bytes of stack which we try to capture.
+-  static const ptrdiff_t kStackToCapture = 32 * 1024;
++  // This now depends on page_size to avoid missing data
++  // on systems with larger page sizes.
++  static const ptrdiff_t kStackToCapture = 8 * page_size;
+ 
+   const MappingInfo* mapping = FindMapping(stack_pointer);
+   if (!mapping)
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper.h
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper.h
+@@ -63,7 +63,8 @@ namespace google_breakpad {
+  (defined(__mips__) && _MIPS_SIM == _ABIO32)
+ typedef Elf32_auxv_t elf_aux_entry;
+ #elif defined(__x86_64) || defined(__aarch64__) || \
+-     (defined(__mips__) && _MIPS_SIM != _ABIO32)
++     (defined(__mips__) && _MIPS_SIM != _ABIO32) || \
++     defined(__powerpc64__)
+ typedef Elf64_auxv_t elf_aux_entry;
+ #endif
+ 
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper_unittest_helper.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper_unittest_helper.cc
+@@ -51,6 +51,8 @@
+ #define TID_PTR_REGISTER "rcx"
+ #elif defined(__mips__)
+ #define TID_PTR_REGISTER "$1"
++#elif defined(__powerpc64__)
++#define TID_PTR_REGISTER "r8"
+ #else
+ #error This test has not been ported to this platform.
+ #endif
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper.cc
+@@ -154,19 +154,27 @@ bool LinuxPtraceDumper::CopyFromProcess(
+   return true;
+ }
+ 
+-bool LinuxPtraceDumper::ReadRegisterSet(ThreadInfo* info, pid_t tid)
+-{
++bool LinuxPtraceDumper::ReadRegisterSet(ThreadInfo* info, pid_t tid) {
+ #ifdef PTRACE_GETREGSET
+   struct iovec io;
+   info->GetGeneralPurposeRegisters(&io.iov_base, &io.iov_len);
+-  if (sys_ptrace(PTRACE_GETREGSET, tid, (void*)NT_PRSTATUS, (void*)&io) == -1) {
++  if (ptrace(PTRACE_GETREGSET, tid, (void*)NT_PRSTATUS, (void*)&io) == -1) {
+     return false;
+   }
+ 
+   info->GetFloatingPointRegisters(&io.iov_base, &io.iov_len);
+-  if (sys_ptrace(PTRACE_GETREGSET, tid, (void*)NT_FPREGSET, (void*)&io) == -1) {
++  if (ptrace(PTRACE_GETREGSET, tid, (void*)NT_FPREGSET, (void*)&io) == -1) {
+     return false;
+   }
++
++#if defined(__powerpc64__)
++  // Grab the vector registers on PPC64 too
++  info->GetVectorRegisters(&io.iov_base, &io.iov_len);
++  if (ptrace(PTRACE_GETREGSET, tid, (void*)NT_PPC_VMX, (void*)&io) == -1) {
++    return false;
++  }
++#endif // defined(__powerpc64__)
++
+   return true;
+ #else
+   return false;
+@@ -303,6 +311,9 @@ bool LinuxPtraceDumper::GetThreadInfoByI
+ #elif defined(__mips__)
+   stack_pointer =
+       reinterpret_cast<uint8_t*>(info->mcontext.gregs[MD_CONTEXT_MIPS_REG_SP]);
++#elif defined(__powerpc64__)
++  stack_pointer =
++      reinterpret_cast<uint8_t*>(info->mcontext.gp_regs[MD_CONTEXT_PPC64_REG_SP]);
+ #else
+ #error "This code hasn't been ported to your platform yet."
+ #endif
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper_unittest.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper_unittest.cc
+@@ -462,6 +462,9 @@ TEST(LinuxPtraceDumperTest, VerifyStackR
+ #elif defined(__mips__)
+     pid_t* process_tid_location =
+         reinterpret_cast<pid_t*>(one_thread.mcontext.gregs[1]);
++#elif defined(__powerpc64__)
++    pid_t* process_tid_location =
++        reinterpret_cast<pid_t*>(one_thread.mcontext.gp_regs[8]);
+ #else
+ #error This test has not been ported to this platform.
+ #endif
+@@ -559,6 +562,8 @@ TEST_F(LinuxPtraceDumperTest, SanitizeSt
+   uintptr_t heap_addr = thread_info.regs.rcx;
+ #elif defined(__mips__)
+   uintptr_t heap_addr = thread_info.mcontext.gregs[1];
++#elif defined(__powerpc64__)
++  uintptr_t heap_addr = thread_info.mcontext.gp_regs[8];
+ #else
+ #error This test has not been ported to this platform.
+ #endif
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.cc
+@@ -136,7 +136,9 @@ class MinidumpWriter {
+       : fd_(minidump_fd),
+         path_(minidump_path),
+         ucontext_(context ? &context->context : NULL),
+-#if !defined(__ARM_EABI__) && !defined(__mips__)
++#if defined(__powerpc64__)
++        vector_state_(context ? &context->vector_state : NULL),
++#elif !defined(__ARM_EABI__) && !defined(__mips__)
+         float_state_(context ? &context->float_state : NULL),
+ #endif
+         dumper_(dumper),
+@@ -468,7 +470,9 @@ class MinidumpWriter {
+         if (!cpu.Allocate())
+           return false;
+         my_memset(cpu.get(), 0, sizeof(RawContextCPU));
+-#if !defined(__ARM_EABI__) && !defined(__mips__)
++#if defined(__powerpc64__)
++        UContextReader::FillCPUContext(cpu.get(), ucontext_, vector_state_);
++#elif !defined(__ARM_EABI__) && !defined(__mips__)
+         UContextReader::FillCPUContext(cpu.get(), ucontext_, float_state_);
+ #else
+         UContextReader::FillCPUContext(cpu.get(), ucontext_);
+@@ -897,7 +901,7 @@ class MinidumpWriter {
+     dirent->location.rva = 0;
+   }
+ 
+-#if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
++#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || defined(__powerpc64__)
+   bool WriteCPUInformation(MDRawSystemInfo* sys_info) {
+     char vendor_id[sizeof(sys_info->cpu.x86_cpu_info.vendor_id) + 1] = {0};
+     static const char vendor_id_name[] = "vendor_id";
+@@ -917,7 +921,9 @@ class MinidumpWriter {
+ 
+     // processor_architecture should always be set, do this first
+     sys_info->processor_architecture =
+-#if defined(__mips__)
++#if defined(__powerpc64__)
++        MD_CPU_ARCHITECTURE_PPC64;
++#elif defined(__mips__)
+ # if _MIPS_SIM == _ABIO32
+         MD_CPU_ARCHITECTURE_MIPS;
+ # elif _MIPS_SIM == _ABI64
+@@ -1333,7 +1339,9 @@ class MinidumpWriter {
+   const char* path_;  // Path to the file where the minidum should be written.
+ 
+   const ucontext_t* const ucontext_;  // also from the signal handler
+-#if !defined(__ARM_EABI__) && !defined(__mips__)
++#if defined(__powerpc64__)
++  const google_breakpad::vstate_t* const vector_state_;
++#elif !defined(__ARM_EABI__) && !defined(__mips__)
+   const google_breakpad::fpstate_t* const float_state_;  // ditto
+ #endif
+   LinuxDumper* dumper_;
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.h
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.h
+@@ -48,6 +48,8 @@ class ExceptionHandler;
+ 
+ #if defined(__aarch64__)
+ typedef struct fpsimd_context fpstate_t;
++#elif defined(__powerpc64__)
++typedef vrregset_t vstate_t;
+ #elif !defined(__ARM_EABI__) && !defined(__mips__)
+ typedef std::remove_pointer<fpregset_t>::type fpstate_t;
+ #endif
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer_unittest.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer_unittest.cc
+@@ -715,6 +715,12 @@ TEST(MinidumpWriterTest, InvalidStackPoi
+ #elif defined(__mips__)
+   context.context.uc_mcontext.gregs[MD_CONTEXT_MIPS_REG_SP] =
+       invalid_stack_pointer;
++#elif defined(__powerpc64__)
++  context.context.uc_mcontext.gp_regs[MD_CONTEXT_PPC64_REG_SP] =
++      invalid_stack_pointer;
++#elif defined(__powerpc64__)
++  context.context.uc_mcontext.gp_regs[MD_CONTEXT_PPC64_REG_SP] =
++      invalid_stack_pointer;
+ #else
+ # error "This code has not been ported to your platform yet."
+ #endif
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/common/linux/memory_mapped_file.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/common/linux/memory_mapped_file.cc
+@@ -65,8 +65,7 @@ bool MemoryMappedFile::Map(const char* p
+   }
+ 
+ #if defined(__x86_64__) || defined(__aarch64__) || \
+-   (defined(__mips__) && _MIPS_SIM == _ABI64)
+-
++   (defined(__mips__) && _MIPS_SIM == _ABI64) || defined(__powerpc64__)
+   struct kernel_stat st;
+   if (sys_fstat(fd, &st) == -1 || st.st_size < 0) {
+ #else
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/common/linux/memory_mapped_file_unittest.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/common/linux/memory_mapped_file_unittest.cc
+@@ -176,9 +176,10 @@ TEST_F(MemoryMappedFileTest, RemapAfterM
+ TEST_F(MemoryMappedFileTest, MapWithOffset) {
+   // Put more data in the test file this time. Offsets can only be
+   // done on page boundaries, so we need a two page file to test this.
+-  const int page_size = 4096;
+-  char data1[2 * page_size];
+-  size_t data1_size = sizeof(data1);
++  const int page_size = getpagesize();
++  char *data1 = static_cast<char*>(malloc(2 * page_size));
++  EXPECT_TRUE(data1 != NULL);
++  size_t data1_size = (2 * page_size);
+   for (size_t i = 0; i < data1_size; ++i) {
+     data1[i] = i & 0x7f;
+   }
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/common/memory_allocator_unittest.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/common/memory_allocator_unittest.cc
+@@ -57,8 +57,9 @@ TEST(PageAllocatorTest, LargeObject) {
+ 
+   EXPECT_EQ(0U, allocator.pages_allocated());
+   uint8_t* p = reinterpret_cast<uint8_t*>(allocator.Alloc(10000));
++  uint64_t expected_pages = 1 + ((10000 - 1) / getpagesize());
+   ASSERT_FALSE(p == NULL);
+-  EXPECT_EQ(3U, allocator.pages_allocated());
++  EXPECT_EQ(expected_pages, allocator.pages_allocated());
+   for (unsigned i = 1; i < 10; ++i) {
+     uint8_t* p = reinterpret_cast<uint8_t*>(allocator.Alloc(i));
+     ASSERT_FALSE(p == NULL);
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/processor/exploitability_linux.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/processor/exploitability_linux.cc
+@@ -202,12 +202,14 @@ bool ExploitabilityLinux::EndedOnIllegal
+   // Check architecture and set architecture variable to corresponding flag
+   // in objdump.
+   switch (context->GetContextCPU()) {
++#if defined(__i386) || defined(__x86_64)
+     case MD_CONTEXT_X86:
+       architecture = "i386";
+       break;
+     case MD_CONTEXT_AMD64:
+       architecture = "i386:x86-64";
+       break;
++#endif
+     default:
+       // Unsupported architecture. Note that ARM architectures are not
+       // supported because objdump does not support ARM.
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/processor/exploitability_unittest.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/processor/exploitability_unittest.cc
+@@ -104,6 +104,8 @@ ExploitabilityFor(const string& filename
+ }
+ 
+ TEST(ExploitabilityTest, TestWindowsEngine) {
++// The following tests are only executable on an x86-class linux machine.
++#if !defined(_WIN32) && (defined(__i386) || defined(__x86_64))
+   ASSERT_EQ(google_breakpad::EXPLOITABILITY_HIGH,
+             ExploitabilityFor("ascii_read_av.dmp"));
+   ASSERT_EQ(google_breakpad::EXPLOITABILITY_HIGH,
+@@ -136,9 +138,12 @@ TEST(ExploitabilityTest, TestWindowsEngi
+             ExploitabilityFor("read_av_clobber_write.dmp"));
+   ASSERT_EQ(google_breakpad::EXPLOITABILITY_LOW,
+             ExploitabilityFor("read_av_conditional.dmp"));
++#endif
+ }
+ 
+ TEST(ExploitabilityTest, TestLinuxEngine) {
++// The following tests are only executable on an x86-class linux machine.
++#if defined(__i386) || defined(__x86_64)
+   ASSERT_EQ(google_breakpad::EXPLOITABILITY_INTERESTING,
+             ExploitabilityFor("linux_null_read_av.dmp"));
+   ASSERT_EQ(google_breakpad::EXPLOITABILITY_HIGH,
+@@ -171,7 +176,8 @@ TEST(ExploitabilityTest, TestLinuxEngine
+             ExploitabilityFor("linux_executable_heap.dmp"));
+   ASSERT_EQ(google_breakpad::EXPLOITABILITY_HIGH,
+             ExploitabilityFor("linux_jmp_to_module_not_exe_region.dmp"));
+-#ifndef _WIN32
++#endif
++#if !defined(_WIN32) && (defined(__i386) || defined(__x86_64))
+   ASSERT_EQ(google_breakpad::EXPLOITABILITY_HIGH,
+             ExploitabilityFor("linux_write_to_nonwritable_module.dmp"));
+   ASSERT_EQ(google_breakpad::EXPLOITABILITY_HIGH,
+@@ -182,10 +188,10 @@ TEST(ExploitabilityTest, TestLinuxEngine
+             ExploitabilityFor("linux_write_to_outside_module_via_math.dmp"));
+   ASSERT_EQ(google_breakpad::EXPLOITABILITY_INTERESTING,
+             ExploitabilityFor("linux_write_to_under_4k.dmp"));
+-#endif  // _WIN32
++#endif  // !defined(_WIN32) && (!defined(__i386) && !defined(__x86_64))
+ }
+ 
+-#ifndef _WIN32
++#if !defined(_WIN32) && (defined(__i386) || defined(__x86_64))
+ TEST(ExploitabilityLinuxUtilsTest, DisassembleBytesTest) {
+   ASSERT_FALSE(ExploitabilityLinuxTest::DisassembleBytes("", NULL, 5, NULL));
+   uint8_t bytes[6] = {0xc7, 0x0, 0x5, 0x0, 0x0, 0x0};
+@@ -301,6 +307,7 @@ TEST(ExploitabilityLinuxUtilsTest, Calcu
+                                                          context,
+                                                          &write_address));
+ }
+-#endif  // _WIN32
++#endif  // !defined(_WIN32) && (defined(__i386) || defined(__x86_64))
++
+ 
+ }  // namespace
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/tools/linux/md2core/minidump-2-core.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/tools/linux/md2core/minidump-2-core.cc
+@@ -77,6 +77,8 @@
+   #define ELF_ARCH  EM_MIPS
+ #elif defined(__aarch64__)
+   #define ELF_ARCH  EM_AARCH64
++#elif defined(__powerpc64__)
++  #define ELF_ARCH  EM_PPC64
+ #endif
+ 
+ #if defined(__arm__)
+@@ -87,6 +89,8 @@ typedef user_regs user_regs_struct;
+ #elif defined (__mips__)
+ // This file-local typedef simplifies the source code.
+ typedef gregset_t user_regs_struct;
++#elif defined(__powerpc64__)
++typedef struct pt_regs user_regs_struct;
+ #endif
+ 
+ using google_breakpad::MDTypeHelper;
+@@ -322,6 +326,12 @@ struct CrashedProcess {
+ #if defined(__aarch64__)
+     user_fpsimd_struct fpregs;
+ #endif
++#if defined(__powerpc64__)
++    mcontext_t mcontext;
++#endif
++#if defined(__powerpc64__)
++    mcontext_t mcontext;
++#endif
+     uintptr_t stack_addr;
+     const uint8_t* stack;
+     size_t stack_length;
+@@ -535,6 +545,38 @@ ParseThreadRegisters(CrashedProcess::Thr
+   thread->mcontext.fpc_eir = rawregs->float_save.fir;
+ #endif
+ }
++#elif defined(__powerpc64__)
++static void
++ParseThreadRegisters(CrashedProcess::Thread* thread,
++                     const MinidumpMemoryRange& range) {
++  const MDRawContextPPC64* rawregs = range.GetData<MDRawContextPPC64>(0);
++
++  for (int i = 0; i < MD_CONTEXT_PPC64_GPR_COUNT; i++)
++    thread->mcontext.gp_regs[i] = rawregs->gpr[i];
++
++  thread->mcontext.gp_regs[PT_LNK] = rawregs->lr;
++  thread->mcontext.gp_regs[PT_NIP] = rawregs->srr0;
++  thread->mcontext.gp_regs[PT_MSR] = rawregs->srr1;
++  thread->mcontext.gp_regs[PT_CCR] = rawregs->cr;
++  thread->mcontext.gp_regs[PT_XER] = rawregs->xer;
++  thread->mcontext.gp_regs[PT_CTR] = rawregs->ctr;
++  thread->mcontext.v_regs->vrsave = rawregs->vrsave;
++
++  for (int i = 0; i < MD_FLOATINGSAVEAREA_PPC_FPR_COUNT; i++)
++      thread->mcontext.fp_regs[i] = rawregs->float_save.fpregs[i];
++
++  thread->mcontext.fp_regs[NFPREG-1] = rawregs->float_save.fpscr;
++
++  for (int i = 0; i < MD_VECTORSAVEAREA_PPC_VR_COUNT; i++) {
++      thread->mcontext.v_regs->vrregs[i][0] = rawregs->vector_save.save_vr[i].high >> 32;
++      thread->mcontext.v_regs->vrregs[i][1] = rawregs->vector_save.save_vr[i].high;
++      thread->mcontext.v_regs->vrregs[i][2] = rawregs->vector_save.save_vr[i].low >> 32;
++      thread->mcontext.v_regs->vrregs[i][3] = rawregs->vector_save.save_vr[i].low;
++  }
++
++  thread->mcontext.v_regs->vscr.vscr_word = rawregs->vector_save.save_vscr.low & 0xFFFFFFFF;
++}
++
+ #else
+ #error "This code has not been ported to your platform yet"
+ #endif
+@@ -623,6 +665,12 @@ ParseSystemInfo(const Options& options,
+ # else
+ #  error "This mips ABI is currently not supported (n32)"
+ # endif
++#elif defined(__powerpc64__)
++  if (sysinfo->processor_architecture != MD_CPU_ARCHITECTURE_PPC64) {
++    fprintf(stderr,
++            "This version of minidump-2-core only supports PPC64.\n");
++    exit(1);
++  }
+ #else
+ #error "This code has not been ported to your platform yet"
+ #endif
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/CONTRIBUTORS
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/CONTRIBUTORS
+@@ -13,3 +13,4 @@ Mark Mentovai <mark@chromium.org>
+ Robert Sesek <rsesek@chromium.org>
+ Scott Graham <scottmg@chromium.org>
+ Joshua Peraza <jperaza@chromium.org>
++Shawn Anastasio <shawn@anastas.io>
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/compat/linux/sys/user.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/compat/linux/sys/user.h
+@@ -15,6 +15,7 @@
+ #ifndef CRASHPAD_COMPAT_LINUX_SYS_USER_H_
+ #define CRASHPAD_COMPAT_LINUX_SYS_USER_H_
+ 
++#include <cstddef>
+ #include_next <sys/user.h>
+ 
+ #include <features.h>
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/minidump/minidump_context.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/minidump/minidump_context.h
+@@ -592,6 +592,70 @@ struct MinidumpContextMIPS64 {
+   uint64_t fir;
+ };
+ 
++//! \brief ppc64-specific flags for MinidumpPPC64::context_flags
++//! Based on minidump_cpu_ppc64.h from breakpad
++enum MinidumpContextPPC64Flags : uint32_t {
++  //! \brief Identifies the context as PPC64.
++  kMinidumpContextPPC64 = 0x01000000,
++
++  //! \brief Indicates the validity of general purpose registers.
++  //!
++  //! Registers `r0`-`r31`, `nip`, `msr`, `lr`, etc. are valid.
++  kMinidumpContextPPC64Base = kMinidumpContextPPC64 | 0x00000001,
++
++  //! \brief Indicates the validity of floating point registers.
++  //!
++  //! Registers `fp0`-`fp31`, `fpscr` are valid.
++  kMinidumpContextPPC64Floating = kMinidumpContextPPC64 | 0x00000008,
++
++  //! \brief Indicates the validity of Altivec/VMX registers.
++  //!
++  //! Registers `v0`-`v31`, `vscr`, `vrsave`.
++  kMinidumpContextPPC64Vector = kMinidumpContextPPC64 | 0x00000020,
++
++  //! \brief Indicates the validity of all registers
++  kMinidumpContextPPC64All = kMinidumpContextPPC64Base     |
++                             kMinidumpContextPPC64Floating |
++                             kMinidumpContextPPC64Vector
++};
++
++//! \brief A PPC64 CPU context carried in a minidump file.
++//! Based on minidump_cpu_ppc64.h from breakpad.
++struct MinidumpContextPPC64 {
++  uint64_t context_flags;
++
++  //! \brief General purpose registers.
++  uint64_t nip;
++  uint64_t msr;
++  uint64_t regs[32];
++  uint64_t ccr;
++  uint64_t xer;
++  uint64_t lnk;
++  uint64_t ctr;
++
++  //! \brief Floating point registers.
++  double fpregs[32];
++
++  //! \brief FPU status register.
++  double fpscr;
++
++  //! \brief Altivec/VMX vector registers.
++  struct {
++      //! \brief Vector registers are 128bits.
++      uint128_struct save_vr[32];
++      uint128_struct save_vscr;
++
++      //! \brief Padding included for breakpad compatibiltiy.
++      uint32_t save_pad5[4];
++
++      //! \brief VRSAVE register.
++      uint32_t save_vrsave;
++
++      //! \brief Padding included for breakpad compatibiltiy.
++      uint32_t save_pad6[7];
++  } vregs;
++};
++
+ }  // namespace crashpad
+ 
+ #endif  // CRASHPAD_MINIDUMP_MINIDUMP_CONTEXT_H_
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/minidump/minidump_context_writer.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/minidump/minidump_context_writer.cc
+@@ -101,6 +101,13 @@ MinidumpContextWriter::CreateFromSnapsho
+       break;
+     }
+ 
++    case kCPUArchitecturePPC64: {
++      context = std::make_unique<MinidumpContextPPC64Writer>();
++      reinterpret_cast<MinidumpContextPPC64Writer*>(context.get())
++          ->InitalizeFromSnapshot(context_snapshot->ppc64);
++      break;
++    }
++
+     default: {
+       LOG(ERROR) << "unknown context architecture "
+                  << context_snapshot->architecture;
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/minidump/minidump_context_writer.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/minidump/minidump_context_writer.h
+@@ -315,6 +315,45 @@ class MinidumpContextMIPS64Writer final
+   DISALLOW_COPY_AND_ASSIGN(MinidumpContextMIPS64Writer);
+ };
+ 
++class MinidumpContextPPC64Writer final : public MinidumpContextWriter {
++ public:
++  MinidumpContextPPC64Writer();
++  ~MinidumpContextPPC64Writer() override;
++
++  //! \brief Initalizes the MinidumpContextPPC64 based on \a context_snapshot.
++  //!
++  //! \param[in] context_snapshot The context snapshot to use as source data.
++  //!
++  //! \note Valid in #kStateMutable. No mutation of context() may be done before
++  //!     calling this method, and it is not normally necessary to alter
++  //!     context() after calling this method.
++  void InitalizeFromSnapshot(const CPUContextPPC64* context_snapshot);
++
++  //! \brief Returns a pointer to the context structure that this object will
++  //!     write.
++  //!
++  //! \attention This returns a non-`const` pointer to this object’s private
++  //!     data so that a caller can populate the context structure directly.
++  //!     This is done because providing setter interfaces to each field in the
++  //!     context structure would be unwieldy and cumbersome. Care must be taken
++  //!     to populate the context structure correctly. The context structure
++  //!     must only be modified while this object is in the #kStateMutable
++  //!     state.
++  MinidumpContextPPC64* context() { return &context_; }
++
++ protected:
++  // MinidumpWritable:
++  bool WriteObject(FileWriterInterface* file_writer) override;
++
++  // MinidumpContextWriter:
++  size_t ContextSize() const override;
++
++ private:
++  MinidumpContextPPC64 context_;
++
++  DISALLOW_COPY_AND_ASSIGN(MinidumpContextPPC64Writer);
++};
++
+ }  // namespace crashpad
+ 
+ #endif  // CRASHPAD_MINIDUMP_MINIDUMP_CONTEXT_WRITER_H_
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/minidump/minidump_context_writer_test.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/minidump/minidump_context_writer_test.cc
+@@ -213,6 +213,21 @@ TEST(MinidumpContextWriter, MIPS64_FromS
+       context, ExpectMinidumpContextMIPS64, kSeed);
+ }
+ 
++TEST(MinidumpContextWriter, PPC64_Zeros) {
++  EmptyContextTest<MinidumpContextPPC64Writer, MinidumpContextPPC64>(
++    ExpectMinidumpContextPPC64);
++}
++
++TEST(MinidumpContextWriter, PPC64_FromSnapshot) {
++  constexpr uint32_t kSeed = 64;
++  CPUContextPPC64 context_ppc64;
++  CPUContext context;
++  context.ppc64 = &context_ppc64;
++  InitializeCPUContextPPC64(&context, kSeed);
++  FromSnapshotTest<MinidumpContextPPC64Writer, MinidumpContextPPC64>(
++      context, ExpectMinidumpContextPPC64, kSeed);
++}
++
+ }  // namespace
+ }  // namespace test
+ }  // namespace crashpad
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/minidump/minidump_misc_info_writer.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/minidump/minidump_misc_info_writer.cc
+@@ -135,6 +135,8 @@ std::string MinidumpMiscInfoDebugBuildSt
+   static constexpr char kCPU[] = "mips";
+ #elif defined(ARCH_CPU_MIPS64EL)
+   static constexpr char kCPU[] = "mips64";
++#elif defined(ARCH_CPU_PPC64)
++  static constexpr char kCPU[] = "ppc64";
+ #else
+ #error define kCPU for this CPU
+ #endif
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/capture_memory.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/capture_memory.cc
+@@ -112,6 +112,11 @@ void CaptureMemory::PointedToByContext(c
+   for (size_t i = 0; i < base::size(context.mipsel->regs); ++i) {
+     MaybeCaptureMemoryAround(delegate, context.mipsel->regs[i]);
+   }
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++  MaybeCaptureMemoryAround(delegate, context.ppc64->nip);
++  for (size_t i = 0; i < base::size(context.ppc64->regs); ++i) {
++    MaybeCaptureMemoryAround(delegate, context.ppc64->regs[i]);
++  }
+ #else
+ #error Port.
+ #endif
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/cpu_architecture.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/cpu_architecture.h
+@@ -43,7 +43,10 @@ enum CPUArchitecture {
+   kCPUArchitectureMIPSEL,
+ 
+   //! \brief 64-bit MIPSEL.
+-  kCPUArchitectureMIPS64EL
++  kCPUArchitectureMIPS64EL,
++
++  //! \brief 64-bit PPC64.
++  kCPUArchitecturePPC64
+ };
+ 
+ }  // namespace crashpad
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/cpu_context.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/cpu_context.cc
+@@ -169,6 +169,8 @@ uint64_t CPUContext::InstructionPointer(
+       return arm->pc;
+     case kCPUArchitectureARM64:
+       return arm64->pc;
++    case kCPUArchitecturePPC64:
++      return ppc64->nip;
+     default:
+       NOTREACHED();
+       return ~0ull;
+@@ -185,6 +187,8 @@ uint64_t CPUContext::StackPointer() cons
+       return arm->sp;
+     case kCPUArchitectureARM64:
+       return arm64->sp;
++    case kCPUArchitecturePPC64:
++      return ppc64->regs[1];
+     default:
+       NOTREACHED();
+       return ~0ull;
+@@ -196,6 +200,7 @@ bool CPUContext::Is64Bit() const {
+     case kCPUArchitectureX86_64:
+     case kCPUArchitectureARM64:
+     case kCPUArchitectureMIPS64EL:
++    case kCPUArchitecturePPC64:
+       return true;
+     case kCPUArchitectureX86:
+     case kCPUArchitectureARM:
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/cpu_context.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/cpu_context.h
+@@ -352,6 +352,24 @@ struct CPUContextMIPS64 {
+   uint64_t fir;
+ };
+ 
++//! \brief A context structure carrying PPC64 CPU state.
++struct CPUContextPPC64 {
++  uint64_t nip;
++  uint64_t msr;
++  uint64_t regs[32];
++  uint64_t ccr;
++  uint64_t xer;
++  uint64_t lnk;
++  uint64_t ctr;
++  double fpregs[32];
++  double fpscr;
++  struct {
++    uint128_struct save_vr[32];
++    uint128_struct save_vscr;
++    uint32_t save_vrsave;
++  } vregs;
++};
++
+ //! \brief A context structure capable of carrying the context of any supported
+ //!     CPU architecture.
+ struct CPUContext {
+@@ -382,6 +400,7 @@ struct CPUContext {
+     CPUContextARM64* arm64;
+     CPUContextMIPS* mipsel;
+     CPUContextMIPS64* mips64;
++    CPUContextPPC64* ppc64;
+   };
+ };
+ 
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/cpu_context_linux.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/cpu_context_linux.h
+@@ -15,6 +15,7 @@
+ #ifndef CRASHPAD_SNAPSHOT_LINUX_CPU_CONTEXT_LINUX_H_
+ #define CRASHPAD_SNAPSHOT_LINUX_CPU_CONTEXT_LINUX_H_
+ 
++#include <cstring>
+ #include "build/build_config.h"
+ #include "snapshot/cpu_context.h"
+ #include "snapshot/linux/signal_context.h"
+@@ -174,6 +175,76 @@ void InitializeCPUContextMIPS(
+ 
+ #endif  // ARCH_CPU_MIPS_FAMILY || DOXYGEN
+ 
++#if defined(ARCH_CPU_PPC64_FAMILY) || DOXYGEN
++
++//! \brief Initalizes a CPUContextPPC64 structure from native context
++//!     structures on Linux.
++//!
++//! \param[in] thread_context The native thread context.
++//! \param[in] float_context The native float context.
++//! \param[in] vector_context The native vector context.
++//! \param[out] context The CPUContextPPC64 structure to initalize.
++template <typename Traits>
++void InitializeCPUContextPPC64(
++    const ThreadContext::t64_t& thread_context,
++    const FloatContext::f64_t& float_context,
++    const VectorContext::v64_t& vector_context,
++    typename Traits::CPUContext* context) {
++
++  memcpy(context->regs, thread_context.gpr, sizeof(context->regs));
++  context->nip = thread_context.nip;
++  context->msr = thread_context.msr;
++  context->ccr = thread_context.ccr;
++  context->xer = thread_context.xer;
++  context->lnk = thread_context.lnk;
++  context->ctr = thread_context.ctr;
++
++  memcpy(context->fpregs, float_context.fpregs, sizeof(context->fpregs));
++  context->fpscr = float_context.fpscr;
++
++  for (uint8_t i = 0; i < 32; i++) {
++    context->vregs.save_vr[i] = {
++      (((uint64_t)vector_context.vrregs[i][0]) << 32) |
++        vector_context.vrregs[i][1],
++      (((uint64_t)vector_context.vrregs[i][2]) << 32) |
++        vector_context.vrregs[i][3]
++    };
++  }
++  context->vregs.save_vrsave = vector_context.vrsave;
++  context->vregs.save_vscr = {0, (uint64_t)vector_context.vscr.vscr_word};
++}
++
++template <typename Traits>
++void InitializeCPUContextPPC64(
++    const SignalThreadContext64 &thread_context,
++    const SignalFloatContext64 &float_context,
++    const SignalVectorContext64 &vector_context,
++    typename Traits::CPUContext* context) {
++
++  memcpy(context->regs, thread_context.regs, sizeof(context->regs));
++  context->nip = thread_context.nip;
++  context->msr = thread_context.msr;
++  context->ccr = thread_context.ccr;
++  context->xer = thread_context.xer;
++  context->lnk = thread_context.lnk;
++  context->ctr = thread_context.ctr;
++
++  memcpy(context->fpregs, float_context.regs, sizeof(context->fpregs));
++  context->fpscr = float_context.fpscr;
++
++  for (uint8_t i = 0; i < 32; i++) {
++    context->vregs.save_vr[i] = {
++      (((uint64_t)vector_context.vrregs[i][0]) << 32) |
++        vector_context.vrregs[i][1],
++      (((uint64_t)vector_context.vrregs[i][2]) << 32) |
++        vector_context.vrregs[i][3]
++    };
++  }
++  context->vregs.save_vrsave = vector_context.vrsave;
++  context->vregs.save_vscr = {0, (uint64_t)vector_context.vscr.vscr_word};
++}
++
++#endif
+ }  // namespace internal
+ }  // namespace crashpad
+ 
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/debug_rendezvous_test.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/debug_rendezvous_test.cc
+@@ -192,6 +192,8 @@ void TestAgainstTarget(PtraceConnection*
+               device == 0 && inode == 0 && mapping_name == "[vdso]";
+ #if defined(ARCH_CPU_X86)
+           static constexpr char kPrefix[] = "linux-gate.so.";
++#elif defined(ARCH_CPU_PPC64)
++          static constexpr char kPrefix[] = "linux-vdso64.so.";
+ #else
+           static constexpr char kPrefix[] = "linux-vdso.so.";
+ #endif
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux.cc
+@@ -323,6 +323,69 @@ bool ExceptionSnapshotLinux::ReadContext
+       reader, context_address, context_.mips64);
+ }
+ 
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++
++template <typename Traits>
++static bool ReadContext(ProcessReaderLinux* reader,
++                        LinuxVMAddress context_address,
++                        typename Traits::CPUContext* dest_context) {
++  const ProcessMemory* memory = reader->Memory();
++
++  LinuxVMAddress gp_regs_address = context_address +
++                                   offsetof(UContext, mcontext) +
++                                   offsetof(typename Traits::MContext, gp_regs);
++
++  typename Traits::SignalThreadContext thread_context;
++  if (!memory->Read(gp_regs_address, sizeof(thread_context), &thread_context)) {
++    LOG(ERROR) << "Couldn't read gp_regs!";
++    return false;
++  }
++
++  LinuxVMAddress fp_regs_address = context_address +
++                                   offsetof(UContext, mcontext) +
++                                   offsetof(typename Traits::MContext, fp_regs);
++
++  typename Traits::SignalFloatContext fp_context;
++  if (!memory->Read(fp_regs_address, sizeof(fp_context), &fp_context)) {
++    LOG(ERROR) << "Couldn't read fp_regs!";
++    return false;
++  }
++
++  LinuxVMAddress v_regs_ptr_address = context_address +
++                                  offsetof(UContext, mcontext) +
++                                  offsetof(typename Traits::MContext, vmx_reserve) + 8;
++
++  typename Traits::SignalVectorContext v_context;
++  if (!memory->Read(v_regs_ptr_address, sizeof(v_context), &v_context)) {
++    LOG(ERROR) << "Couldn't read v_regs!";
++    return false;
++  }
++
++  InitializeCPUContextPPC64<ContextTraits64>(thread_context, fp_context,
++                            v_context, dest_context);
++
++  return true;
++}
++
++template<>
++bool ExceptionSnapshotLinux::ReadContext<ContextTraits64>(
++    ProcessReaderLinux* reader,
++    LinuxVMAddress context_address) {
++  context_.architecture = kCPUArchitecturePPC64;
++  context_.ppc64 = &context_union_.ppc64;
++
++  return internal::ReadContext<ContextTraits64>(
++      reader, context_address, context_.ppc64);
++}
++
++template<>
++bool ExceptionSnapshotLinux::ReadContext<ContextTraits32>(
++    ProcessReaderLinux* reader,
++    LinuxVMAddress context_address) {
++  // PPC64 is 64-bit
++  return false;
++}
++
+ #endif  // ARCH_CPU_X86_FAMILY
+ 
+ bool ExceptionSnapshotLinux::Initialize(ProcessReaderLinux* process_reader,
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux.h
+@@ -84,6 +84,8 @@ class ExceptionSnapshotLinux final : pub
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+     CPUContextMIPS mipsel;
+     CPUContextMIPS64 mips64;
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++    CPUContextPPC64 ppc64;
+ #endif
+   } context_union_;
+   CPUContext context_;
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux_test.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux_test.cc
+@@ -296,7 +296,28 @@ void ExpectContext(const CPUContext& act
+             0);
+ #undef CPU_ARCH_NAME
+ }
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++using NativeCPUContext = ucontext_t;
+ 
++void InitializeContext(NativeCPUContext* context) {
++  for (size_t reg = 0; reg < 32; ++reg) {
++    context->uc_mcontext.gp_regs[reg] = reg;
++  }
++
++  memset(&context->uc_mcontext.fp_regs, 44,
++      sizeof(context->uc_mcontext.fp_regs));
++}
++
++void ExpectContext(const CPUContext& actual, const NativeCPUContext& expected) {
++  EXPECT_EQ(actual.architecture, kCPUArchitecturePPC64);
++
++  for (size_t reg = 0; reg < 32; ++reg) {
++    EXPECT_EQ(actual.ppc64->regs[reg], expected.uc_mcontext.gp_regs[reg]);
++  }
++
++  EXPECT_EQ(memcmp(actual.ppc64->fpregs, expected.uc_mcontext.fp_regs,
++            sizeof(actual.ppc64->fpregs)), 0);
++}
+ #else
+ #error Port.
+ #endif
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/process_reader_linux.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/process_reader_linux.cc
+@@ -108,6 +108,8 @@ void ProcessReaderLinux::Thread::Initial
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+   stack_pointer = reader->Is64Bit() ? thread_info.thread_context.t64.regs[29]
+                                     : thread_info.thread_context.t32.regs[29];
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++  stack_pointer = thread_info.thread_context.t64.gpr[1];
+ #else
+ #error Port.
+ #endif
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/signal_context.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/signal_context.h
+@@ -422,6 +422,93 @@ static_assert(offsetof(UContext<ContextT
+               "context offset mismatch");
+ #endif
+ 
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++
++struct SignalThreadContext64 {
++  uint64_t regs[32];
++  uint64_t nip;
++  uint64_t msr;
++  uint64_t orig_r3;
++  uint64_t ctr;
++  uint64_t lnk;
++  uint64_t xer;
++  uint64_t ccr;
++  uint64_t softe;
++  uint64_t trap;
++  uint64_t dar;
++  uint64_t dsisr;
++  uint64_t result;
++  uint64_t dscr;
++  uint64_t fpr0[3];
++};
++
++struct SignalFloatContext64 {
++  double regs[32];
++  double fpscr;
++};
++
++struct SignalVectorContext64 {
++  int32_t vrregs[32][4];
++  struct {
++    int32_t __pad[3];
++    int32_t vscr_word;
++  } vscr;
++  int32_t vrsave;
++  int32_t __pad[3];
++} __attribute__((__aligned__(16)));
++
++
++#pragma pack(pop)
++struct MContext64 {
++  uint64_t reserved[4];
++  int32_t signal;
++  int32_t __pad0;
++  uint64_t handler;
++  uint64_t oldmask;
++  uint64_t pt_regs_ptr;
++  SignalThreadContext64 gp_regs;
++  SignalFloatContext64  fp_regs;
++  SignalVectorContext64 *v_regs;
++#ifdef __GLIBC__
++  int64_t vmx_reserve[69];
++#else
++  int64_t vmx_reserve[101];
++#endif
++};
++
++struct ContextTraits64 : public Traits64 {
++  using MContext = MContext64;
++  using SignalThreadContext = SignalThreadContext64;
++  using SignalFloatContext = SignalFloatContext64;
++  using SignalVectorContext = SignalVectorContext64;
++  using CPUContext = CPUContextPPC64;
++};
++
++struct ContextTraits32 : public Traits32 {};
++
++struct UContext {
++  uint64_t flags;
++  uint64_t link;
++  SignalStack<ContextTraits64> stack;
++  Sigset<ContextTraits64> sigmask;
++  MContext64 mcontext;
++};
++#pragma pack(push, 1)
++
++static_assert(sizeof(UContext) == sizeof(ucontext_t),
++              "ucontext_t size mismatch");
++static_assert(sizeof(MContext64) == sizeof(mcontext_t),
++              "mcontext_t size mismatch");
++static_assert(sizeof(SignalThreadContext64) == sizeof(gregset_t),
++              "gregset_t size mismatch");
++static_assert(sizeof(SignalFloatContext64) == sizeof(fpregset_t),
++              "fpregset_t size mismatch");
++static_assert(sizeof(SignalVectorContext64) == sizeof(vrregset_t),
++              "vrregset_t size mismatch");
++static_assert(offsetof(UContext, mcontext) ==
++              offsetof(ucontext_t, uc_mcontext), "mcontext offset mismatch");
++static_assert(offsetof(MContext64, gp_regs) ==
++              offsetof(mcontext_t, gp_regs), "gp_regs offset mismatch");
+ #else
+ #error Port.
+ #endif  // ARCH_CPU_X86_FAMILY
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/system_snapshot_linux.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/system_snapshot_linux.cc
+@@ -204,6 +204,8 @@ CPUArchitecture SystemSnapshotLinux::Get
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+   return process_reader_->Is64Bit() ? kCPUArchitectureMIPS64EL
+                                     : kCPUArchitectureMIPSEL;
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++  return kCPUArchitecturePPC64;
+ #else
+ #error port to your architecture
+ #endif
+@@ -219,6 +221,9 @@ uint32_t SystemSnapshotLinux::CPURevisio
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+   // Not implementable on MIPS
+   return 0;
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++  // Not yet implemented on PPC64
++  return 0;
+ #else
+ #error port to your architecture
+ #endif
+@@ -239,6 +244,9 @@ std::string SystemSnapshotLinux::CPUVend
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+   // Not implementable on MIPS
+   return std::string();
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++  // Not yet implemented on PPC64
++  return std::string();
+ #else
+ #error port to your architecture
+ #endif
+@@ -372,6 +380,9 @@ bool SystemSnapshotLinux::NXEnabled() co
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+   // Not implementable on MIPS
+   return false;
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++  // Not yet implemented on PPC64
++  return false;
+ #else
+ #error Port.
+ #endif  // ARCH_CPU_X86_FAMILY
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/test_modules.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/test_modules.cc
+@@ -110,6 +110,8 @@ bool WriteTestModule(const base::FilePat
+   module.ehdr.e_machine = EM_AARCH64;
+ #elif defined(ARCH_CPU_MIPSEL) || defined(ARCH_CPU_MIPS64EL)
+   module.ehdr.e_machine = EM_MIPS;
++#elif defined(ARCH_CPU_PPC64)
++  module.ehdr.e_machine = EM_PPC64;
+ #endif
+ 
+   module.ehdr.e_version = EV_CURRENT;
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/thread_snapshot_linux.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/thread_snapshot_linux.cc
+@@ -186,6 +186,14 @@ bool ThreadSnapshotLinux::Initialize(Pro
+         thread.thread_info.float_context.f32,
+         context_.mipsel);
+   }
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++  context_.architecture = kCPUArchitecturePPC64;
++  context_.ppc64 = &context_union_.ppc64;
++  InitializeCPUContextPPC64<ContextTraits64>(
++      thread.thread_info.thread_context.t64,
++      thread.thread_info.float_context.f64,
++      thread.thread_info.vector_context.v64,
++      context_.ppc64);
+ #else
+ #error Port.
+ #endif
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/thread_snapshot_linux.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/thread_snapshot_linux.h
+@@ -68,6 +68,8 @@ class ThreadSnapshotLinux final : public
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+     CPUContextMIPS mipsel;
+     CPUContextMIPS64 mips64;
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++    CPUContextPPC64 ppc64;
+ #else
+ #error Port.
+ #endif  // ARCH_CPU_X86_FAMILY
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/util/linux/auxiliary_vector.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/util/linux/auxiliary_vector.cc
+@@ -56,6 +56,11 @@ bool AuxiliaryVector::Read(PtraceConnect
+     if (type == AT_IGNORE) {
+       continue;
+     }
++#if defined(ARCH_CPU_PPC64_FAMILY)
++    if (type == AT_IGNOREPPC) {
++      continue;
++    }
++#endif
+     if (!MapInsertOrReplace(&values_, type, value, nullptr)) {
+       LOG(ERROR) << "duplicate auxv entry";
+       return false;
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/util/linux/ptracer.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/util/linux/ptracer.cc
+@@ -399,6 +399,64 @@ bool GetThreadArea64(pid_t tid,
+   return true;
+ }
+ 
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++// PPC64 has had HAVE_ARCH_TRACEHOOK set since 2.6.27 (even before x86 had it).
++// That means we can simply use PTRACE_GETREGESET.
++
++template <typename Destination>
++bool GetRegisterSet(pid_t tid, int set, Destination* dest, bool can_log) {
++  iovec iov;
++  iov.iov_base = reinterpret_cast<void*>(dest);
++  iov.iov_len = sizeof(*dest);
++  if (ptrace(PTRACE_GETREGSET, tid, reinterpret_cast<void*>(set), &iov) != 0) {
++    PLOG_IF(ERROR, can_log) << "ptrace";
++    return false;
++  }
++  if (iov.iov_len != sizeof(*dest)) {
++    LOG_IF(ERROR, can_log) << "Unexpected registers size";
++    return false;
++  }
++  return true;
++}
++
++bool GetVectorRegisters64(pid_t tid,
++                          VectorContext* context,
++                          bool can_log) {
++  return GetRegisterSet(tid, NT_PPC_VMX, &context->v64, can_log);
++}
++
++bool GetFloatingPointRegisters64(pid_t tid,
++                                 FloatContext* context,
++                                 bool can_log) {
++  return GetRegisterSet(tid, NT_PRFPREG, &context->f64, can_log);
++}
++
++bool GetThreadArea64(pid_t tid,
++                     const ThreadContext& context,
++                     LinuxVMAddress* address,
++                     bool can_log) {
++  // PPC64 doesn't have PTRACE_GET_THREAD_AREA since the thread pointer
++  // is stored in GPR 13.
++  ThreadContext::t64_t tc;
++  if (!GetRegisterSet(tid, NT_PRSTATUS, &tc, can_log)) {
++    LOG_IF(ERROR, can_log) << "Unable to get thread pointer!";
++    return false;
++  }
++
++  *address = tc.gpr[13];
++
++  return true;
++}
++
++// Stubs for 32-bit functions not applicable on PPC64
++bool GetFloatingPointRegisters32(pid_t tid,
++                                 FloatContext* context,
++                                 bool can_log) { return false; }
++bool GetThreadArea32(pid_t tid,
++                     const ThreadContext &context,
++                     LinuxVMAddress *address,
++                     bool can_log) { return false; }
++
+ #else
+ #error Port.
+ #endif  // ARCH_CPU_X86_FAMILY
+@@ -495,6 +553,9 @@ bool Ptracer::GetThreadInfo(pid_t tid, T
+   if (is_64_bit_) {
+     return GetGeneralPurposeRegisters64(tid, &info->thread_context, can_log_) &&
+            GetFloatingPointRegisters64(tid, &info->float_context, can_log_) &&
++#if defined(ARCH_CPU_PPC64_FAMILY)
++           GetVectorRegisters64(tid, &info->vector_context, can_log_) &&
++#endif
+            GetThreadArea64(tid,
+                            info->thread_context,
+                            &info->thread_specific_data_address,
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/util/linux/thread_info.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/util/linux/thread_info.h
+@@ -39,6 +39,13 @@ struct user_vfp_exc {
+ #include <android/api-level.h>
+ #endif
+ 
++#if defined(ARCH_CPU_PPC64_FAMILY)
++#include <sys/ucontext.h>
++#if !defined(__GLIBC__)
++#include <asm/ptrace.h>
++#endif
++#endif
++
+ namespace crashpad {
+ 
+ //! \brief The set of general purpose registers for an architecture family.
+@@ -90,6 +97,8 @@ union ThreadContext {
+     uint32_t cp0_status;
+     uint32_t cp0_cause;
+     uint32_t padding1_;
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++    // PPC64 is 64-bit
+ #else
+ #error Port.
+ #endif  // ARCH_CPU_X86_FAMILY
+@@ -143,6 +152,21 @@ union ThreadContext {
+     uint64_t cp0_badvaddr;
+     uint64_t cp0_status;
+     uint64_t cp0_cause;
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++    // Reflects struct pt_regs in asm/ptrace.h.
++    uint64_t gpr[32];
++    uint64_t nip;
++    uint64_t msr;
++    uint64_t orig_gpr3;
++    uint64_t ctr;
++    uint64_t lnk;
++    uint64_t xer;
++    uint64_t ccr;
++    uint64_t softe;
++    uint64_t trap;
++    uint64_t dar;
++    uint64_t dsisr;
++    uint64_t result;
+ #else
+ #error Port.
+ #endif  // ARCH_CPU_X86_FAMILY
+@@ -154,6 +178,8 @@ union ThreadContext {
+   using NativeThreadContext = user_regs;
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+ // No appropriate NativeThreadsContext type available for MIPS
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++  using NativeThreadContext = struct pt_regs;
+ #else
+ #error Port.
+ #endif  // ARCH_CPU_X86_FAMILY || ARCH_CPU_ARM64
+@@ -229,6 +255,9 @@ union FloatContext {
+     } fpregs[32];
+     uint32_t fpcsr;
+     uint32_t fpu_id;
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++    // Crashpad's PPC support is 64-bit only, so this
++    // 32bit-only struct is declared as empty.
+ #else
+ #error Port.
+ #endif  // ARCH_CPU_X86_FAMILY
+@@ -263,6 +292,10 @@ union FloatContext {
+     double fpregs[32];
+     uint32_t fpcsr;
+     uint32_t fpu_id;
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++    // Reflects fpregset_t in sys/ucontext.h
++    double fpregs[32];
++    double fpscr;
+ #else
+ #error Port.
+ #endif  // ARCH_CPU_X86_FAMILY
+@@ -291,6 +324,8 @@ union FloatContext {
+   static_assert(sizeof(f64) == sizeof(user_fpsimd_struct), "Size mismatch");
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+ // No appropriate floating point context native type for available MIPS.
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++  static_assert(sizeof(f64) == sizeof(fpregset_t), "Size mismatch");
+ #else
+ #error Port.
+ #endif  // ARCH_CPU_X86
+@@ -298,6 +333,26 @@ union FloatContext {
+ static_assert(std::is_standard_layout<FloatContext>::value,
+               "Not standard layout");
+ 
++//! \brief The vector registers used for an architecture family
++union VectorContext {
++  struct v32_t {} v32;
++#if defined(ARCH_CPU_PPC64_FAMILY)
++  __attribute__((__aligned__(16))) // Vector context must be doubleword aligned.
++#endif
++  struct v64_t {
++#if defined(ARCH_CPU_PPC64_FAMILY)
++    // Reflects vrregset_t in sys/ucontext.h
++    uint32_t vrregs[32][4];
++    struct {
++      uint32_t __pad[3];
++      uint32_t vscr_word;
++    } vscr;
++    uint32_t vrsave;
++    uint32_t __pad[3];
++#endif
++  } v64;
++};
++
+ //! \brief A collection of `ptrace`-able information about a thread.
+ struct ThreadInfo {
+   ThreadInfo();
+@@ -309,6 +364,9 @@ struct ThreadInfo {
+   //! \brief The floating point registers for the thread.
+   FloatContext float_context;
+ 
++  //! \brief (Optional) The vector registers used for the thread.
++  VectorContext vector_context;
++
+   //! \brief The thread-local storage address for the thread.
+   LinuxVMAddress thread_specific_data_address;
+ };
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/util/misc/capture_context.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/util/misc/capture_context.h
+@@ -69,6 +69,7 @@ using NativeCPUContext = ucontext_t;
+ //!     macOS/Linux/Fuchsia | x86_64       | `%%rdi`
+ //!     Linux               | ARM/ARM64    | `r0`/`x0`
+ //!     Linux               | MIPS/MIPS64  | `$a0`
++//!     Linux               | PPC64        | `r3`
+ //!
+ //!     Additionally, the value `LR` on ARM/ARM64 will be the return address of
+ //!     this function.
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/util/misc/capture_context_linux.S
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/util/misc/capture_context_linux.S
+@@ -32,7 +32,7 @@
+   .balign 4, 0x0
+   .type CAPTURECONTEXT_SYMBOL, %function
+   .type CAPTURECONTEXT_SYMBOL2, %function
+-#elif defined(__mips__)
++#elif defined(__mips__) || defined(__powerpc64__)
+   .balign 4, 0x0
+ #endif
+ 
+@@ -423,4 +423,214 @@ CAPTURECONTEXT_SYMBOL2:
+   jr $ra
+ 
+   .set at
++#elif defined(__powerpc64__)
++  // Store r0-r31
++  std 0, 0xe8(3)   // context->uc_mcontext.gp_regs[0]
++  std 1, 0xf0(3)   // context->uc_mcontext.gp_regs[1]
++  std 2, 0xf8(3)   // context->uc_mcontext.gp_regs[2]
++  // note that r3's original value was lost
++  std 3, 0x100(3)  // context->uc_mcontext.gp_regs[3]
++  std 4, 0x108(3)  // context->uc_mcontext.gp_regs[4]
++  std 5, 0x110(3)  // context->uc_mcontext.gp_regs[5]
++  std 6, 0x118(3)  // context->uc_mcontext.gp_regs[6]
++  std 7, 0x120(3)  // context->uc_mcontext.gp_regs[7]
++  std 8, 0x128(3)  // context->uc_mcontext.gp_regs[8]
++  std 9, 0x130(3)  // context->uc_mcontext.gp_regs[9]
++  std 10, 0x138(3) // context->uc_mcontext.gp_regs[10]
++  std 11, 0x140(3) // context->uc_mcontext.gp_regs[11]
++  std 12, 0x148(3) // context->uc_mcontext.gp_regs[12]
++  std 13, 0x150(3) // context->uc_mcontext.gp_regs[13]
++  std 14, 0x158(3) // context->uc_mcontext.gp_regs[14]
++  std 15, 0x160(3) // context->uc_mcontext.gp_regs[15]
++  std 16, 0x168(3) // context->uc_mcontext.gp_regs[16]
++  std 17, 0x170(3) // context->uc_mcontext.gp_regs[17]
++  std 18, 0x178(3) // context->uc_mcontext.gp_regs[18]
++  std 19, 0x180(3) // context->uc_mcontext.gp_regs[19]
++  std 20, 0x188(3) // context->uc_mcontext.gp_regs[20]
++  std 21, 0x190(3) // context->uc_mcontext.gp_regs[21]
++  std 22, 0x198(3) // context->uc_mcontext.gp_regs[22]
++  std 23, 0x1a0(3) // context->uc_mcontext.gp_regs[23]
++  std 24, 0x1a8(3) // context->uc_mcontext.gp_regs[24]
++  std 25, 0x1b0(3) // context->uc_mcontext.gp_regs[25]
++  std 26, 0x1b8(3) // context->uc_mcontext.gp_regs[26]
++  std 27, 0x1c0(3) // context->uc_mcontext.gp_regs[27]
++  std 28, 0x1c8(3) // context->uc_mcontext.gp_regs[28]
++  std 29, 0x1d0(3) // context->uc_mcontext.gp_regs[29]
++  std 30, 0x1d8(3) // context->uc_mcontext.gp_regs[30]
++  std 31, 0x1e0(3) // context->uc_mcontext.gp_regs[31]
++
++  // For NIP, we can use the value in the link register
++  mflr 0
++  std 0, 0x1e8(3) // context->uc_mcontext.gp_regs[PT_NIP]
++
++  // CTR
++  mfctr 0
++  std 0, 0x200(3) // context->uc_mcontext.gp_regs[PT_CTR]
++
++  // For LNK, we'll use the caller's LR save area (2 stack frames up).
++  // r4 can be used as a scratch register since it has already been saved.
++  ld 4, 0(1)
++  ld 4, 16(4)
++  std 4, 0x208(3) // context->uc_mcontext.gp_regs[PT_LNK]
++
++  // XER
++  mfxer 0
++  std 0, 0x210(3) // context->uc_mcontext.gp_regs[PT_XER]
++
++  // CCR
++  mfcr 0
++  std 0, 0x218(3) // context->uc_mcontext.gp_regs[PT_CCR]
++
++  // MSR, orig_r3, MQ, TRAP, DAR, DSISR, RESULT, DSCR,
++  // not used or not relevant,  zero them out.
++  li 4, 0
++  std 4, 0x1f0(3) // context->uc_mcontext.gp_regs[PT_MSR]
++  std 4, 0x1f8(3) // context->uc_mcontext.gp_regs[PT_ORIG_R3]
++  std 4, 0x220(3) // context->uc_mcontext.gp_regs[PT_MQ]
++  std 4, 0x228(3) // context->uc_mcontext.gp_regs[PT_TRAP]
++  std 4, 0x230(3) // context->uc_mcontext.gp_regs[PT_DAR]
++  std 4, 0x238(3) // context->uc_mcontext.gp_regs[PT_DSISR]
++  std 4, 0x240(3) // context->uc_mcontext.gp_regs[PT_RESULT]
++  std 4, 0x248(3) // context->uc_mcontext.gp_regs[PT_DSCR]
++
++  // Update context->uc_mcontext.regs to point to gp_regs
++  addi 0, 3, 0xe8
++  std 0, 0xe0(3)
++
++  // Save floating point registers 0-31
++  stfd 0, 0x268(3)  // context->uc_mcontext.fp_regs[0]
++  stfd 1, 0x270(3)  // context->uc_mcontext.fp_regs[1]
++  stfd 2, 0x278(3)  // context->uc_mcontext.fp_regs[2]
++  stfd 3, 0x280(3)  // context->uc_mcontext.fp_regs[3]
++  stfd 4, 0x288(3)  // context->uc_mcontext.fp_regs[4]
++  stfd 5, 0x290(3)  // context->uc_mcontext.fp_regs[5]
++  stfd 6, 0x298(3)  // context->uc_mcontext.fp_regs[6]
++  stfd 7, 0x2a0(3)  // context->uc_mcontext.fp_regs[7]
++  stfd 8, 0x2a8(3)  // context->uc_mcontext.fp_regs[8]
++  stfd 9, 0x2b0(3)  // context->uc_mcontext.fp_regs[9]
++  stfd 10, 0x2b8(3) // context->uc_mcontext.fp_regs[10]
++  stfd 11, 0x2c0(3) // context->uc_mcontext.fp_regs[11]
++  stfd 12, 0x2c8(3) // context->uc_mcontext.fp_regs[12]
++  stfd 13, 0x2d0(3) // context->uc_mcontext.fp_regs[13]
++  stfd 14, 0x2d8(3) // context->uc_mcontext.fp_regs[14]
++  stfd 15, 0x2e0(3) // context->uc_mcontext.fp_regs[15]
++  stfd 16, 0x2e8(3) // context->uc_mcontext.fp_regs[16]
++  stfd 17, 0x2f0(3) // context->uc_mcontext.fp_regs[17]
++  stfd 18, 0x2f8(3) // context->uc_mcontext.fp_regs[18]
++  stfd 19, 0x300(3) // context->uc_mcontext.fp_regs[19]
++  stfd 20, 0x308(3) // context->uc_mcontext.fp_regs[20]
++  stfd 21, 0x310(3) // context->uc_mcontext.fp_regs[21]
++  stfd 22, 0x318(3) // context->uc_mcontext.fp_regs[22]
++  stfd 23, 0x320(3) // context->uc_mcontext.fp_regs[23]
++  stfd 24, 0x328(3) // context->uc_mcontext.fp_regs[24]
++  stfd 25, 0x330(3) // context->uc_mcontext.fp_regs[25]
++  stfd 26, 0x338(3) // context->uc_mcontext.fp_regs[26]
++  stfd 27, 0x340(3) // context->uc_mcontext.fp_regs[27]
++  stfd 28, 0x348(3) // context->uc_mcontext.fp_regs[28]
++  stfd 29, 0x350(3) // context->uc_mcontext.fp_regs[29]
++  stfd 30, 0x358(3) // context->uc_mcontext.fp_regs[30]
++  stfd 31, 0x360(3) // context->uc_mcontext.fp_regs[31]
++
++  // FPSCR
++  mffs 0
++  stfd 0, 0x368(3) // context->uc_mcontext.fp_regs[32]
++
++  // Save VMX Vector registers
++  // Update r4 to contain the base address of vmx_reserve
++  addi 4, 3, 0x378
++  // Ensure that it is quadword aligned
++  andi. 5, 4, 0xF
++  beq 1f // No alignment is necessary
++  // Address is doubleword aligned and not quadword aligned, add 8
++  addi 4, 4, 8
++
++1:
++  // Store VMX registers 0-31
++  // r4 will contain the base address
++  // r5 will contain the index
++  li 5, 0
++  stvx 0, 4, 5   // context->uc_mcontext.vmx_reserve[(align) + 0]
++  addi 5, 5, 16
++  stvx 1, 4, 5   // context->uc_mcontext.vmx_reserve[(align) + 1]
++  addi 5, 5, 16
++  stvx 2, 4, 5   // context->uc_mcontext.vmx_reserve[(align) + 2]
++  addi 5, 5, 16
++  stvx 3, 4, 5   // context->uc_mcontext.vmx_reserve[(align) + 3]
++  addi 5, 5, 16
++  stvx 4, 4, 5   // context->uc_mcontext.vmx_reserve[(align) + 4]
++  addi 5, 5, 16
++  stvx 5, 4, 5   // context->uc_mcontext.vmx_reserve[(align) + 5]
++  addi 5, 5, 16
++  stvx 6, 4, 5   // context->uc_mcontext.vmx_reserve[(align) + 6]
++  addi 5, 5, 16
++  stvx 7, 4, 5   // context->uc_mcontext.vmx_reserve[(align) + 7]
++  addi 5, 5, 16
++  stvx 8, 4, 5   // context->uc_mcontext.vmx_reserve[(align) + 8]
++  addi 5, 5, 16
++  stvx 9, 4, 5   // context->uc_mcontext.vmx_reserve[(align) + 9]
++  addi 5, 5, 16
++  stvx 10, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 10]
++  addi 5, 5, 16
++  stvx 11, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 11]
++  addi 5, 5, 16
++  stvx 12, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 12]
++  addi 5, 5, 16
++  stvx 13, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 13]
++  addi 5, 5, 16
++  stvx 14, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 14]
++  addi 5, 5, 16
++  stvx 15, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 15]
++  addi 5, 5, 16
++  stvx 16, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 16]
++  addi 5, 5, 16
++  stvx 17, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 17]
++  addi 5, 5, 16
++  stvx 18, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 18]
++  addi 5, 5, 16
++  stvx 19, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 19]
++  addi 5, 5, 16
++  stvx 20, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 20]
++  addi 5, 5, 16
++  stvx 21, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 21]
++  addi 5, 5, 16
++  stvx 22, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 22]
++  addi 5, 5, 16
++  stvx 23, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 23]
++  addi 5, 5, 16
++  stvx 24, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 24]
++  addi 5, 5, 16
++  stvx 25, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 25]
++  addi 5, 5, 16
++  stvx 26, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 26]
++  addi 5, 5, 16
++  stvx 27, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 27]
++  addi 5, 5, 16
++  stvx 28, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 28]
++  addi 5, 5, 16
++  stvx 29, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 29]
++  addi 5, 5, 16
++  stvx 30, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 30]
++  addi 5, 5, 16
++  stvx 31, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 31]
++  addi 5, 5, 16
++
++  // VSCR
++  mfvscr 0
++  stvx 0, 4, 5
++  addi 5, 5, 16
++
++  // VRSAVE
++  mfvrsave 0
++  stwx 0, 4, 5
++
++  // Update context->uc_mcontext.v_regs to point to vmx_reserve + alignment.
++  std 4, 0x370(3)
++
++  // Zero out all unused fields
++  li 4, 0
++  std 4, 0xc8(3) // context->uc_mcontext.signal
++  std 4, 0xd0(3) // context->uc_mcontext.handler
++  std 4, 0xd8(3) // context->uc_mcontext.oldmask
++
++  blr
+ #endif  // __i386__
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/util/misc/capture_context_test.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/util/misc/capture_context_test.cc
+@@ -57,7 +57,7 @@ void TestCaptureContext() {
+   uintptr_t pc = ProgramCounterFromContext(context_1);
+ 
+ #if !defined(ADDRESS_SANITIZER) && !defined(ARCH_CPU_MIPS_FAMILY) && \
+-    !defined(MEMORY_SANITIZER)
++    !defined(MEMORY_SANITIZER) && !defined(ARCH_CPU_PPC64_FAMILY)
+   // Sanitizers can cause enough code bloat that the “nearby” check would
+   // likely fail.
+   const uintptr_t kReferencePC =
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/util/misc/capture_context_test_util_linux.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/util/misc/capture_context_test_util_linux.cc
+@@ -35,6 +35,8 @@ void SanityCheckContext(const NativeCPUC
+   EXPECT_EQ(context.uc_mcontext.regs[0], FromPointerCast<uintptr_t>(&context));
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+   EXPECT_EQ(context.uc_mcontext.gregs[4], FromPointerCast<uintptr_t>(&context));
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++  EXPECT_EQ(context.uc_mcontext.gp_regs[3], FromPointerCast<uintptr_t>(&context));
+ #endif
+ }
+ 
+@@ -49,6 +51,8 @@ uintptr_t ProgramCounterFromContext(cons
+   return context.uc_mcontext.pc;
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+   return context.uc_mcontext.pc;
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++  return context.uc_mcontext.gp_regs[PT_NIP];
+ #endif
+ }
+ 
+@@ -63,6 +67,8 @@ uintptr_t StackPointerFromContext(const
+   return context.uc_mcontext.sp;
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+   return context.uc_mcontext.gregs[29];
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++  return context.uc_mcontext.gp_regs[1];
+ #endif
+ }
+ 
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/util/posix/signals_test.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/util/posix/signals_test.cc
+@@ -46,9 +46,9 @@ bool CanCauseSignal(int sig) {
+   return sig == SIGABRT ||
+          sig == SIGALRM ||
+          sig == SIGBUS ||
+-#if !defined(ARCH_CPU_ARM64)
++#if !defined(ARCH_CPU_ARM64) && !defined(ARCH_CPU_PPC64)
+          sig == SIGFPE ||
+-#endif  // !defined(ARCH_CPU_ARM64)
++#endif  // !defined(ARCH_CPU_ARM64) && !defined(ARCH_CPU_PPC64)
+ #if defined(ARCH_CPU_X86_FAMILY) || defined(ARCH_CPU_ARMEL)
+          sig == SIGILL ||
+ #endif  // defined(ARCH_CPU_X86_FAMILY) || defined(ARCH_CPU_ARMEL)
+@@ -117,9 +117,11 @@ void CauseSignal(int sig) {
+       break;
+     }
+ 
+-#if !defined(ARCH_CPU_ARM64)
++#if !defined(ARCH_CPU_ARM64) && !defined(ARCH_CPU_PPC64)
+     // ARM64 has hardware integer division instructions that don’t generate a
+     // trap for divide-by-zero, so this doesn’t produce SIGFPE.
++    //
++    // PPC64 fixed-point division by zero also doesn't produce a SIGFPE.
+     case SIGFPE: {
+       // Optimization makes this tricky, so get zero from a system call likely
+       // to succeed, and try to do something with the result.
+@@ -137,7 +139,7 @@ void CauseSignal(int sig) {
+       fstat(quotient, &stat_buf);
+       break;
+     }
+-#endif  // ARCH_CPU_ARM64
++#endif  // !defined(ARCH_CPU_ARM64) && !defined(ARCH_CPU_PPC64)
+ 
+ #if defined(ARCH_CPU_X86_FAMILY) || defined(ARCH_CPU_ARMEL)
+     case SIGILL: {
+--- a/src/3rdparty/chromium/third_party/dav1d/BUILD.gn
++++ b/src/3rdparty/chromium/third_party/dav1d/BUILD.gn
+@@ -196,6 +196,8 @@ static_library("dav1d_8bit") {
+     sources += arm_template_sources
+   } else if (current_cpu == "arm64") {
+     sources += arm_template_sources
++  } else if (current_cpu == "ppc64") {
++    sources += ppc64_template_sources
+   }
+ 
+   cflags = dav1d_copts
+@@ -226,6 +228,8 @@ static_library("dav1d_10bit") {
+     sources += arm_template_sources
+   } else if (current_cpu == "arm64") {
+     sources += arm_template_sources
++  } else if (current_cpu == "ppc64") {
++    sources += ppc64_template_sources
+   }
+ 
+   cflags = dav1d_copts
+@@ -283,6 +287,21 @@ if (current_cpu == "x86" || current_cpu
+     }
+ 
+     cflags = dav1d_copts
++  }
++} else if (current_cpu == "ppc64") {
++  static_library("dav1d_ppc") {
++    sources = [
++      "libdav1d/src/ppc/cpu.c",
++      "libdav1d/src/ppc/cpu.h",
++    ]
++
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [
++      "//build/config/compiler:no_chromium_code",
++      ":dav1d_config",
++    ]
++
++    cflags = dav1d_copts
+ 
+     deps = [ ":dav1d_headers" ]
+     allow_circular_includes_from = [ ":dav1d_headers" ]
+@@ -315,5 +334,7 @@ static_library("dav1d") {
+     }
+   } else if (current_cpu == "arm" || current_cpu == "arm64") {
+     deps += [ ":dav1d_arm" ]
++  } else if (current_cpu == "ppc64") {
++    deps += [ ":dav1d_ppc" ]
+   }
+ }
+--- a/src/3rdparty/chromium/third_party/dav1d/dav1d_generated.gni
++++ b/src/3rdparty/chromium/third_party/dav1d/dav1d_generated.gni
+@@ -103,6 +103,11 @@ arm_template_sources = [
+   "libdav1d/src/arm/mc_init_tmpl.c",
+ ]
+ 
++ppc64_template_sources = [
++  "libdav1d/src/ppc/cdef_init_tmpl.c",
++  "libdav1d/src/ppc/looprestoration_init_tmpl.c",
++]
++
+ template_sources = [
+   "libdav1d/src/cdef_apply_tmpl.c",
+   "libdav1d/src/cdef_tmpl.c",
+--- a/src/3rdparty/chromium/third_party/dav1d/generate_source.py
++++ b/src/3rdparty/chromium/third_party/dav1d/generate_source.py
+@@ -57,6 +57,8 @@ def _WriteGn(fd):
+   _WriteArray(fd, "arm64_asm_sources", _Glob("libdav1d/src/arm/64/*.S"))
+   _WriteArray(fd, "arm_template_sources", _Glob("libdav1d/src/arm/*_tmpl.c"))
+ 
++  _WriteArray(fd, "ppc64_template_sources", _Glob("libdav1d/src/ppc/*_tmpl.c"))
++
+   template_sources = _Glob("libdav1d/src/*_tmpl.c")
+   _WriteArray(fd, "template_sources", template_sources)
+ 
+--- a/src/3rdparty/chromium/third_party/dav1d/libdav1d/src/ppc/types.h
++++ b/src/3rdparty/chromium/third_party/dav1d/libdav1d/src/ppc/types.h
+@@ -51,4 +51,19 @@
+ #define u16l_to_i32(v) ((i32x4) vec_mergel((u16x8) v, vec_splat_u16(0)))
+ #define i16l_to_i32(v) ((i32x4) vec_unpackl((i16x8)v))
+ 
++#if defined(__clang__)
++#undef vec_splats
++#define vec_splats(N)                     \
++    _Generic((N),                         \
++        unsigned char:      ((u8x16)(N)), \
++        signed char:        ((i8x16)(N)), \
++        unsigned short:     ((u16x8)(N)), \
++        signed short:       ((i16x8)(N)), \
++        unsigned int:       ((u32x4)(N)), \
++        signed int:         ((i32x4)(N)), \
++        unsigned long long: ((u64x2)(N)), \
++        signed long long:   ((i64x2)(N))  \
++    )
++#endif
++
+ #endif /* DAV1D_SRC_PPC_TYPES_H */
+--- a/src/3rdparty/chromium/third_party/eigen3/BUILD.gn
++++ b/src/3rdparty/chromium/third_party/eigen3/BUILD.gn
+@@ -22,4 +22,8 @@ config("eigen_includes") {
+     # for this component on Windows on Arm due to compilation errors.
+     defines += [ "EIGEN_DONT_VECTORIZE" ]
+   }
++
++  if (target_cpu == "ppc64") {
++    defines += [ "EIGEN_DONT_VECTORIZE" ]
++  }
+ }
+--- a/src/3rdparty/chromium/third_party/libaom/BUILD.gn
++++ b/src/3rdparty/chromium/third_party/libaom/BUILD.gn
+@@ -37,6 +37,8 @@ if (enable_libaom) {
+     } else {
+       cpu_arch_full = "arm"
+     }
++  } else if (current_cpu == "ppc64") {
++    cpu_arch_full = "generic"
+   } else {
+     cpu_arch_full = current_cpu
+   }
+--- a/src/3rdparty/chromium/third_party/libgav1/options.gni
++++ b/src/3rdparty/chromium/third_party/libgav1/options.gni
+@@ -12,5 +12,5 @@ declare_args() {
+       is_chromeos_ash && (target_cpu == "arm" || target_cpu == "arm64")
+   use_libgav1_parser =
+       (is_chromeos || is_linux || is_win) &&
+-      (target_cpu == "x86" || target_cpu == "x64" || target_cpu == "arm64")
++      (target_cpu == "x86" || target_cpu == "x64" || target_cpu == "arm64" || target_cpu == "ppc64")
+ }
+--- a/src/3rdparty/chromium/third_party/lss/linux_syscall_support.h
++++ b/src/3rdparty/chromium/third_party/lss/linux_syscall_support.h
+@@ -4262,7 +4262,7 @@ struct kernel_statfs {
+       LSS_REG(2, buf);
+       LSS_BODY(void*, mmap2, "0"(__r2));
+     }
+-#else
++#elif !defined(__powerpc64__) /* ppc64 doesn't have mmap2 */
+     #define __NR__mmap2 __NR_mmap2
+     LSS_INLINE _syscall6(void*, _mmap2,            void*, s,
+                          size_t,                   l, int,               p,
+@@ -4373,7 +4373,7 @@ struct kernel_statfs {
+   #if defined(__i386__) ||                                                    \
+       defined(__ARM_ARCH_3__) || defined(__ARM_EABI__) ||                     \
+      (defined(__mips__) && _MIPS_SIM == _MIPS_SIM_ABI32) ||                   \
+-      defined(__PPC__) ||                                                     \
++     (defined(__PPC__) && !defined(__powerpc64__)) ||                                                     \
+      (defined(__s390__) && !defined(__s390x__))
+     /* On these architectures, implement mmap() with mmap2(). */
+     LSS_INLINE void* LSS_NAME(mmap)(void *s, size_t l, int p, int f, int d,
+@@ -4556,9 +4556,17 @@ struct kernel_statfs {
+     }
+   #endif
+   #if defined(__NR_fstatat64)
++    #if !defined(__GLIBC__)
++        // musl doesn't define fstatat64 fstatat
++        #undef fstatat64
++    #endif
+     LSS_INLINE _syscall4(int,   fstatat64,        int,   d,
+                          const char *,      p,
+                          struct kernel_stat64 *,   b,    int,   f)
++    #if !defined(__GLIBC__)
++    	// then restore it
++        #define fstatat64 fstatat
++    #endif
+   #endif
+   #if defined(__NR_waitpid)
+     // waitpid is polyfilled below when not available.
+--- a/src/3rdparty/chromium/third_party/pdfium/third_party/libpng16/pngpriv.h
++++ b/src/3rdparty/chromium/third_party/pdfium/third_party/libpng16/pngpriv.h
+@@ -196,11 +196,7 @@
+ #endif
+ 
+ #ifndef PNG_POWERPC_VSX_OPT
+-#  if defined(__PPC64__) && defined(__ALTIVEC__) && defined(__VSX__)
+-#     define PNG_POWERPC_VSX_OPT 2
+-#  else
+-#     define PNG_POWERPC_VSX_OPT 0
+-#  endif
++#  define PNG_POWERPC_VSX_OPT 0
+ #endif
+ 
+ #ifndef PNG_INTEL_SSE_OPT
+--- a/src/3rdparty/chromium/third_party/pffft/src/pffft.c
++++ b/src/3rdparty/chromium/third_party/pffft/src/pffft.c
+@@ -100,6 +100,7 @@
+    Altivec support macros 
+ */
+ #if !defined(PFFFT_SIMD_DISABLE) && (defined(__ppc__) || defined(__ppc64__))
++#include <altivec.h>
+ typedef vector float v4sf;
+ #  define SIMD_SZ 4
+ #  define VZERO() ((vector float) vec_splat_u8(0))
+--- a/src/3rdparty/chromium/third_party/skia/src/sksl/SkSLString.cpp
++++ b/src/3rdparty/chromium/third_party/skia/src/sksl/SkSLString.cpp
+@@ -142,7 +142,12 @@ String to_string(double value) {
+     if (needsDotZero) {
+         buffer << ".0";
+     }
+-    return String(buffer.str().c_str());
++
++    std::string ret(buffer.str());
++    if (signbit(value) && ret[0] == '.') {
++        ret[0] = '-';
++    }
++    return String(ret.c_str());
+ }
+ 
+ bool stod(const skstd::string_view& s, SKSL_FLOAT* value) {
+--- a/src/3rdparty/chromium/third_party/sqlite/src/amalgamation/sqlite3.c
++++ b/src/3rdparty/chromium/third_party/sqlite/src/amalgamation/sqlite3.c
+@@ -14628,7 +14628,8 @@ typedef INT16_TYPE LogEst;
+ # if defined(i386)      || defined(__i386__)      || defined(_M_IX86) ||    \
+      defined(__x86_64)  || defined(__x86_64__)    || defined(_M_X64)  ||    \
+      defined(_M_AMD64)  || defined(_M_ARM)        || defined(__x86)   ||    \
+-     defined(__ARMEL__) || defined(__AARCH64EL__) || defined(_M_ARM64)
++     defined(__ARMEL__) || defined(__AARCH64EL__) || defined(_M_ARM64) ||   \
++     defined(__powerpc64__) && (__BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__)
+ #   define SQLITE_BYTEORDER    1234
+ # elif defined(sparc)     || defined(__ppc__) || \
+        defined(__ARMEB__) || defined(__AARCH64EB__)
+--- a/src/3rdparty/chromium/third_party/sqlite/src/amalgamation_dev/sqlite3.c
++++ b/src/3rdparty/chromium/third_party/sqlite/src/amalgamation_dev/sqlite3.c
+@@ -14641,7 +14641,8 @@ typedef INT16_TYPE LogEst;
+ # if defined(i386)      || defined(__i386__)      || defined(_M_IX86) ||    \
+      defined(__x86_64)  || defined(__x86_64__)    || defined(_M_X64)  ||    \
+      defined(_M_AMD64)  || defined(_M_ARM)        || defined(__x86)   ||    \
+-     defined(__ARMEL__) || defined(__AARCH64EL__) || defined(_M_ARM64)
++     defined(__ARMEL__) || defined(__AARCH64EL__) || defined(_M_ARM64) ||   \
++     defined(__powerpc64__) && (__BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__)
+ #   define SQLITE_BYTEORDER    1234
+ # elif defined(sparc)     || defined(__ppc__) || \
+        defined(__ARMEB__) || defined(__AARCH64EB__)
+--- a/src/3rdparty/chromium/third_party/sqlite/src/ext/rtree/rtree.c
++++ b/src/3rdparty/chromium/third_party/sqlite/src/ext/rtree/rtree.c
+@@ -450,7 +450,7 @@ struct RtreeMatchArg {
+ #if defined(i386)     || defined(__i386__)   || defined(_M_IX86) ||    \
+     defined(__x86_64) || defined(__x86_64__) || defined(_M_X64)  ||    \
+     defined(_M_AMD64) || defined(_M_ARM)     || defined(__x86)   ||    \
+-    defined(__arm__)
++    defined(__arm__) || defined(__powerpc64__) && (__BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__)
+ # define SQLITE_BYTEORDER    1234
+ #elif defined(sparc)    || defined(__ppc__)
+ # define SQLITE_BYTEORDER    4321
+--- a/src/3rdparty/chromium/third_party/sqlite/src/src/sqliteInt.h
++++ b/src/3rdparty/chromium/third_party/sqlite/src/src/sqliteInt.h
+@@ -890,7 +890,8 @@ typedef INT16_TYPE LogEst;
+ # if defined(i386)      || defined(__i386__)      || defined(_M_IX86) ||    \
+      defined(__x86_64)  || defined(__x86_64__)    || defined(_M_X64)  ||    \
+      defined(_M_AMD64)  || defined(_M_ARM)        || defined(__x86)   ||    \
+-     defined(__ARMEL__) || defined(__AARCH64EL__) || defined(_M_ARM64)
++     defined(__ARMEL__) || defined(__AARCH64EL__) || defined(_M_ARM64) || \
++     defined(__powerpc64__) && (__BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__)
+ #   define SQLITE_BYTEORDER    1234
+ # elif defined(sparc)     || defined(__ppc__) || \
+        defined(__ARMEB__) || defined(__AARCH64EB__)
+--- a/src/3rdparty/chromium/third_party/webrtc/modules/desktop_capture/differ_block.cc
++++ b/src/3rdparty/chromium/third_party/webrtc/modules/desktop_capture/differ_block.cc
+@@ -30,11 +30,7 @@ bool VectorDifference(const uint8_t* ima
+   static bool (*diff_proc)(const uint8_t*, const uint8_t*) = nullptr;
+ 
+   if (!diff_proc) {
+-#if defined(WEBRTC_ARCH_ARM_FAMILY) || defined(WEBRTC_ARCH_MIPS_FAMILY)
+-    // For ARM and MIPS processors, always use C version.
+-    // TODO(hclam): Implement a NEON version.
+-    diff_proc = &VectorDifference_C;
+-#else
++#if defined(WEBRTC_ARCH_X86_FAMILY)
+     bool have_sse2 = GetCPUInfo(kSSE2) != 0;
+     // For x86 processors, check if SSE2 is supported.
+     if (have_sse2 && kBlockSize == 32) {
+@@ -44,6 +40,10 @@ bool VectorDifference(const uint8_t* ima
+     } else {
+       diff_proc = &VectorDifference_C;
+     }
++#else
++    // For other processors, always use C version.
++    // TODO(hclam): Implement a NEON version.
++    diff_proc = &VectorDifference_C;
+ #endif
+   }
+ 
+--- a/src/3rdparty/chromium/v8/BUILD.gn
++++ b/src/3rdparty/chromium/v8/BUILD.gn
+@@ -1083,6 +1083,12 @@ config("toolchain") {
+     }
+     if (host_byteorder == "little") {
+       defines += [ "V8_TARGET_ARCH_PPC_LE" ]
++      cflags += [
++        # Enable usage of AltiVec, VSX, and other POWER8 and higher features
++        "-mcpu=power8",
++        "-maltivec",
++        "-mvsx",
++      ]
+     } else if (host_byteorder == "big") {
+       defines += [ "V8_TARGET_ARCH_PPC_BE" ]
+       if (current_os == "aix") {
+--- a/src/3rdparty/chromium/ui/gl/features.gni
++++ b/src/3rdparty/chromium/ui/gl/features.gni
+@@ -35,7 +35,8 @@ declare_args() {
+                         (is_mac && use_egl) || is_chromeos_ash || is_fuchsia) &&
+                        (target_cpu == "x86" || target_cpu == "x64" ||
+                         target_cpu == "arm" || target_cpu == "arm64" ||
+-                        target_cpu == "mipsel" || target_cpu == "mips64el")
++                        target_cpu == "mipsel" || target_cpu == "mips64el" ||
++                        target_cpu == "ppc64")
+ }
+ 
+ use_glx = use_x11 || ozone_platform_x11
+--- a/src/3rdparty/chromium/v8/test/BUILD.gn
++++ b/src/3rdparty/chromium/v8/test/BUILD.gn
+@@ -42,7 +42,6 @@ group("gn_all") {
+       "benchmarks/cpp:gn_all",
+       "cctest:cctest",
+       "cctest:generate-bytecode-expectations",
+-      "unittests:unittests",
+     ]
+   }
+ }
+@@ -84,7 +83,6 @@ group("v8_bot_default") {
+     "message:v8_message",
+     "mjsunit:v8_mjsunit",
+     "mkgrokdump:mkgrokdump",
+-    "unittests:unittests",
+     "webkit:v8_webkit",
+   ]
+ 
+@@ -109,7 +107,6 @@ group("v8_default") {
+     "message:v8_message",
+     "mjsunit:v8_mjsunit",
+     "mkgrokdump:mkgrokdump",
+-    "unittests:unittests",
+   ]
+ 
+   if (v8_enable_webassembly) {
+--- /dev/null
++++ b/src/3rdparty/chromium/dev/null
+@@ -0,0 +1,39 @@
++/*
++ * Autogenerated by the Meson build system.
++ * Do not edit, your changes will be lost.
++ */
++
++#pragma once
++
++#define ARCH_AARCH64 0
++
++#define ARCH_ARM 0
++
++#define ARCH_PPC64LE 1
++
++#define ARCH_X86 0
++
++#define ARCH_X86_32 0
++
++#define ARCH_X86_64 0
++
++#define CONFIG_16BPC 1
++
++#define CONFIG_8BPC 1
++
++// #define CONFIG_LOG 1 -- Logging is controlled by Chromium
++
++#define ENDIANNESS_BIG 0
++
++#define HAVE_ASM 1
++
++#define HAVE_CLOCK_GETTIME 1
++
++#define HAVE_DLSYM 1
++
++#define HAVE_GETAUXVAL 1
++
++#define HAVE_POSIX_MEMALIGN 1
++
++#define HAVE_UNISTD_H 1
++
+--- a/src/3rdparty/chromium/third_party/abseil-cpp/absl/base/internal/unscaledcycleclock.h
++++ b/src/3rdparty/chromium/third_party/abseil-cpp/absl/base/internal/unscaledcycleclock.h
+@@ -46,7 +46,7 @@
+ 
+ // The following platforms have an implementation of a hardware counter.
+ #if defined(__i386__) || defined(__x86_64__) || defined(__aarch64__) || \
+-  defined(__powerpc__) || defined(__ppc__) || \
++  ((defined(__powerpc__) || defined(__ppc__)) && defined(__GLIBC__)) || \
+   defined(_M_IX86) || defined(_M_X64)
+ #define ABSL_HAVE_UNSCALED_CYCLECLOCK_IMPLEMENTATION 1
+ #else
+--- a/src/3rdparty/chromium/third_party/abseil-cpp/absl/debugging/internal/stacktrace_config.h
++++ b/src/3rdparty/chromium/third_party/abseil-cpp/absl/debugging/internal/stacktrace_config.h
+@@ -59,7 +59,7 @@
+ #elif defined(__i386__) || defined(__x86_64__)
+ #define ABSL_STACKTRACE_INL_HEADER \
+   "absl/debugging/internal/stacktrace_x86-inl.inc"
+-#elif defined(__ppc__) || defined(__PPC__)
++#elif defined(__ppc__) || defined(__PPC__) && defined(__GLIBC__)
+ #define ABSL_STACKTRACE_INL_HEADER \
+   "absl/debugging/internal/stacktrace_powerpc-inl.inc"
+ #elif defined(__aarch64__)
+--- a/src/3rdparty/chromium/base/allocator/partition_allocator/partition_alloc_config.h
++++ b/src/3rdparty/chromium/base/allocator/partition_allocator/partition_alloc_config.h
+@@ -100,7 +100,8 @@ static_assert(sizeof(void*) != 8, "");
+ // PUT_REF_COUNT_IN_PREVIOUS_SLOT does. In this case the refcount overlaps with
+ // the next pointer shadow for the smallest bucket.
+ #if !(defined(OS_MAC) && defined(ARCH_CPU_ARM64)) && \
+-    !BUILDFLAG(PUT_REF_COUNT_IN_PREVIOUS_SLOT)
++    !BUILDFLAG(PUT_REF_COUNT_IN_PREVIOUS_SLOT) && \
++    (!defined(__GLIBC) && !defined(__powerpc64__))
+ #define PA_HAS_FREELIST_HARDENING
+ #endif
+ 
+--- a/src/3rdparty/chromium/build/download_nacl_toolchains.py
++++ b/src/3rdparty/chromium/build/download_nacl_toolchains.py
+@@ -13,6 +13,8 @@ import sys
+ 
+ 
+ def Main(args):
++  if 'disable_nacl=1' in os.environ.get('GYP_DEFINES', ''):
++    return 0
+   script_dir = os.path.dirname(os.path.abspath(__file__))
+   src_dir = os.path.dirname(script_dir)
+   nacl_dir = os.path.join(src_dir, 'native_client')
+--- a/src/3rdparty/chromium/chrome/installer/linux/BUILD.gn
++++ b/src/3rdparty/chromium/chrome/installer/linux/BUILD.gn
+@@ -100,8 +100,6 @@ packaging_files = packaging_files_binari
+                     "$root_out_dir/xdg-mime",
+                     "$root_out_dir/xdg-settings",
+                     "$root_out_dir/locales/en-US.pak",
+-                    "$root_out_dir/MEIPreload/manifest.json",
+-                    "$root_out_dir/MEIPreload/preloaded_data.pb",
+                   ]
+ 
+ action_foreach("calculate_deb_dependencies") {
+@@ -321,7 +319,6 @@ group("installer_deps") {
+     ":theme_files",
+     "//chrome",
+     "//chrome:packed_resources",
+-    "//chrome/browser/resources/media/mei_preload:component",
+     "//components/crash/core/app:chrome_crashpad_handler",
+     "//sandbox/linux:chrome_sandbox",
+   ]
+--- /dev/null
++++ b/src/3rdparty/chromium/sandbox/linux/system_headers/ppc64_linux_syscalls.h
+@@ -0,0 +1,12 @@
++// Copyright 2014 The Chromium Authors. All rights reserved.
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++#ifndef SANDBOX_LINUX_SYSTEM_HEADERS_PPC64_LINUX_SYSCALLS_H_
++#define SANDBOX_LINUX_SYSTEM_HEADERS_PPC64_LINUX_SYSCALLS_H_
++
++#include <asm/unistd.h>
++
++//TODO: is it necessary to redefine syscall numbers for PPC64?
++
++#endif  // SANDBOX_LINUX_SYSTEM_HEADERS_PPC64_LINUX_SYSCALLS_H_
+--- /dev/null
++++ b/src/3rdparty/chromium/sandbox/linux/system_headers/ppc64_linux_ucontext.h
+@@ -0,0 +1,12 @@
++// Copyright 2014 The Chromium Authors. All rights reserved.
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++#ifndef SANDBOX_LINUX_SYSTEM_HEADERS_PPC64_LINUX_UCONTEXT_H_
++#define SANDBOX_LINUX_SYSTEM_HEADERS_PPC64_LINUX_UCONTEXT_H_
++
++#include <sys/ucontext.h>
++
++//TODO: is it necessary to redefine ucontext on PPC64?
++
++#endif  // SANDBOX_LINUX_SYSTEM_HEADERS_PPC64_LINUX_UCONTEXT_H_
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/util/net/http_transport_libcurl.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/util/net/http_transport_libcurl.cc
+@@ -236,6 +236,12 @@ std::string UserAgent() {
+ #elif defined(ARCH_CPU_BIG_ENDIAN)
+     static constexpr char arch[] = "aarch64_be";
+ #endif
++#elif defined(__powerpc64__)
++#if defined(ARCH_CPU_LITTLE_ENDIAN)
++    static constexpr char arch[] = "ppc64le";
++#elif defined(ARCH_CPU_BIG_ENDIAN)
++    static constexpr char arch[] = "ppc64";
++#endif
+ #else
+ #error Port
+ #endif
+--- /dev/null
++++ b/src/3rdparty/chromium/third_party/dav1d/config/linux/ppc64/config.h
+@@ -0,0 +1,39 @@
++/*
++ * Autogenerated by the Meson build system.
++ * Do not edit, your changes will be lost.
++ */
++
++#pragma once
++
++#define ARCH_AARCH64 0
++
++#define ARCH_ARM 0
++
++#define ARCH_PPC64LE 1
++
++#define ARCH_X86 0
++
++#define ARCH_X86_32 0
++
++#define ARCH_X86_64 0
++
++#define CONFIG_16BPC 1
++
++#define CONFIG_8BPC 1
++
++// #define CONFIG_LOG 1 -- Logging is controlled by Chromium
++
++#define ENDIANNESS_BIG 0
++
++#define HAVE_ASM 1
++
++#define HAVE_CLOCK_GETTIME 1
++
++#define HAVE_DLSYM 1
++
++#define HAVE_GETAUXVAL 1
++
++#define HAVE_POSIX_MEMALIGN 1
++
++#define HAVE_UNISTD_H 1
++
diff --git a/srcpkgs/qt6-webengine/patches/0903-xxx-ppc64le-swiftshader.patch b/srcpkgs/qt6-webengine/patches/0903-xxx-ppc64le-swiftshader.patch
new file mode 100644
index 000000000000..1a8cd8368da1
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0903-xxx-ppc64le-swiftshader.patch
@@ -0,0 +1,18 @@
+--- a/src/3rdparty/chromium/third_party/swiftshader/third_party/llvm-10.0/BUILD.gn
++++ b/src/3rdparty/chromium/third_party/swiftshader/third_party/llvm-10.0/BUILD.gn
+@@ -576,6 +576,7 @@ swiftshader_llvm_source_set("swiftshader
+     "llvm/lib/MC/MCAsmInfoCOFF.cpp",
+     "llvm/lib/MC/MCAsmInfoDarwin.cpp",
+     "llvm/lib/MC/MCAsmInfoELF.cpp",
++    "llvm/lib/MC/MCAsmInfoXCOFF.cpp",
+     "llvm/lib/MC/MCAsmMacro.cpp",
+     "llvm/lib/MC/MCAsmStreamer.cpp",
+     "llvm/lib/MC/MCAssembler.cpp",
+@@ -631,6 +632,7 @@ swiftshader_llvm_source_set("swiftshader
+     "llvm/lib/MC/MCWinCOFFStreamer.cpp",
+     "llvm/lib/MC/MCWinEH.cpp",
+     "llvm/lib/MC/MCXCOFFStreamer.cpp",
++    "llvm/lib/MC/MCXCOFFObjectTargetWriter.cpp",
+     "llvm/lib/MC/MachObjectWriter.cpp",
+     "llvm/lib/MC/StringTableBuilder.cpp",
+     "llvm/lib/MC/SubtargetFeature.cpp",
diff --git a/srcpkgs/qt6-webengine/template b/srcpkgs/qt6-webengine/template
new file mode 100644
index 000000000000..7160a462db7f
--- /dev/null
+++ b/srcpkgs/qt6-webengine/template
@@ -0,0 +1,175 @@
+# Template file for 'qt6-webengine'
+pkgname=qt6-webengine
+version=6.3.1
+revision=1
+wrksrc="qtwebengine-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DQT_HOST_PATH=/usr -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true
+ -DQT_FEATURE_webengine_system_ffmpeg=ON
+ -DQT_FEATURE_webengine_system_libevent=ON
+ -DQT_FEATURE_webengine_system_gn=ON
+ -DQT_FEATURE_webengine_system_icu=ON
+ -DQT_FEATURE_webengine_webrtc_pipewire=ON
+ -DNinja_EXECUTABLE=$XBPS_WRAPPERDIR/ninja
+ $(vopt_bool examples QT_BUILD_EXAMPLES)
+ -DPKG_CONFIG_HOST_EXECUTABLE=${PKG_CONFIG_FOR_BUILD}"
+hostmakedepends="qt6-base-devel perl pkg-config nodejs python3-html5lib
+ qt6-declarative-devel protobuf gperf flex nss-devel libwebp-devel
+ icu-devel libevent-devel"
+makedepends="qt6-base-devel qt6-declarative-devel pulseaudio-devel
+ qt6-tools-devel qt6-websockets-devel libflac-devel
+ alsa-lib-devel libvpx-devel pciutils-devel opus-devel libxslt-devel
+ libxml2-devel freetype-devel lcms2-devel libwebp-devel icu-devel
+ re2-devel zlib-devel libpng-devel minizip-devel harfbuzz-devel
+ nss-devel libXcursor-devel libXcomposite-devel libXScrnSaver-devel
+ protobuf-devel ffmpeg-devel snappy-devel libevent-devel pipewire-devel
+ libxkbfile-devel qt6-location-devel qt6-webchannel-devel libxshmfence-devel"
+short_desc="Cross-platform application and UI framework - Webengine"
+maintainer="John <me@johnnynator.dev>"
+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=ad7a33b21a956deda37c587d50f821ca3816403ae31ba9b5d59d01561ad66e47
+
+if [ -z "$CROSS_BUILD" ];then
+	configure_args+=" -DCMAKE_TOOLCHAIN_FILE=/usr/lib/cmake/Qt6/qt.toolchain.cmake"
+fi
+
+if [ "$XBPS_LIBC" = "musl" ]; then
+	hostmakedepends+=" musl-legacy-compat"
+fi
+
+if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
+	makedepends+=" musl-legacy-compat"
+fi
+
+if [ ! "$XBPS_WORDSIZE" = "$XBPS_TARGET_WORDSIZE" ]; then
+	broken="webengine can be built only if word size matches"
+fi
+
+if [ "$XBPS_WORDSIZE" -eq 32 ]; then
+	nodebug=yes
+	LDFLAGS="-Wl,--no-keep-memory"
+fi
+
+if [ "$XBPS_TARGET_ENDIAN" != "le" ]; then
+	broken="webengine only supports little endian"
+fi
+
+build_options="sndio examples"
+build_options_default=""
+desc_option_examples="Build examples"
+desc_option_sndio="Enable support for sndio"
+
+subpackages="qt6-webengine-devel"
+
+if [ "$build_option_examples" ]; then
+	subpackages+=" qt6-webengine-examples"
+fi
+
+_bootstrap_gn() {
+	# Bootstrap gn (generate ninja)
+	echo "Bootstrapping 'gn'"
+	cd ${wrksrc}/src/3rdparty/gn
+	CFLAGS="$CFLAGS_host" CXXFLAGS="$CXXFLAGS_host" LDFLAGS="$LDFLAGS_host" \
+	PKGCONFIG=/usr/bin/pkgconfig PKG_CONFIG_PATH="/usr/lib/pkgconfig:/usr/share/pkgconfig" \
+		python3 build/gen.py --no-last-commit-position --out-path \
+			${wrksrc}/src/3rdparty/gn/out/Release --cc "${CC_host:-$CC}" \
+			--cxx "${CXX_host:-$CXX}" --ld "${CXX_host:-$CXX}" --ar "${AR_host:-$AR}" \
+			--qt-version "${version}.qtwebengine.qt.io"
+	ninja -C out/Release gn
+	cd ${wrksrc}
+}
+
+_unbundle_libs() {
+	cd ${wrksrc}/src/3rdparty/chromium
+	echo Dropping bundled libs from chromium
+	# Use system-provided libraries.
+	# TODO: use_system_hunspell (upstream changes needed).
+	# TODO: use_system_libsrtp.
+	# TODO: use_system_libusb (http://crbug.com/266149).
+	# TODO: use_system_ssl (http://crbug.com/58087).
+	# TODO: use_system_sqlite (http://crbug.com/22208).
+	# TODO: use_system_icu (segfaults)
+	# use_system_protobuf
+	# use_system_v8=1
+	# use_system_zlib=1
+	# bzip2 jsoncpp minizip xdg_utils speex
+	system="
+		ffmpeg
+		flac
+		fontconfig
+		freetype
+		harfbuzz-ng
+		icu
+		libdrm
+		libevent
+		libjpeg
+		libpng
+		libwebp
+		libxml
+		libxslt
+		opus
+		re2
+		snappy
+	"
+	build/linux/unbundle/replace_gn_files.py --system-libraries ${system}
+}
+
+# Provide a wrapper to run ./xbps-src -j 1 build later
+_wrap_ninja() {
+	cat <<-'_EOF' >"$XBPS_WRAPPERDIR"/ninja
+	#!/bin/sh
+
+	exec /usr/bin/ninja $NINJAFLAGS "$@"
+	_EOF
+	chmod +x "$XBPS_WRAPPERDIR"/ninja
+}
+
+pre_configure() {
+	_bootstrap_gn
+	# _unbundle_libs
+	_wrap_ninja
+	export PATH="$PATH:${wrksrc}/src/3rdparty/gn/out/Release"
+}
+
+pre_build() {
+	export PATH="$PATH:${wrksrc}/src/3rdparty/gn/out/Release"
+	export NINJAFLAGS="$makejobs"
+
+}
+
+pre_install() {
+	export PATH="$PATH:${wrksrc}/src/3rdparty/gn/out/Release"
+}
+
+post_install() {
+	local _file
+	find "${DESTDIR}"/usr/lib/qt6/examples \
+		-path '*/lib/qt6/**/lib/qt6/*' -type f |
+	while read _file; do
+		mv "$_file" "${_file%/lib/qt6/*}"
+	done
+}
+
+qt6-webengine-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} qt6-webchannel-devel>=${version}_1
+	 qt6-declarative-devel>=${version}_1 qt6-location-devel>=${version}_1"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/pkgconfig
+		vmove usr/lib/qt6/mkspecs
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
+	}
+}
+
+qt6-webengine-examples_package() {
+	short_desc+=" - sample browsers"
+	pkg_install() {
+		vmove usr/lib/qt6/examples
+	}
+}
diff --git a/srcpkgs/qt6-webengine/update b/srcpkgs/qt6-webengine/update
new file mode 100644
index 000000000000..844552465222
--- /dev/null
+++ b/srcpkgs/qt6-webengine/update
@@ -0,0 +1 @@
+pkgname="${pkgname/6-/}-everywhere-src"

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

* Re: [PR PATCH] [Updated] WIP Qt6 webengine
  2022-08-07  4:36 [PR PATCH] WIP Qt6 webengine sgn
  2022-08-07  4:38 ` [PR PATCH] [Updated] " sgn
  2022-08-08 10:13 ` sgn
@ 2022-08-08 12:15 ` sgn
  2022-08-09 13:18 ` sgn
                   ` (34 subsequent siblings)
  37 siblings, 0 replies; 39+ messages in thread
From: sgn @ 2022-08-08 12:15 UTC (permalink / raw)
  To: ml

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

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

https://github.com/sgn/void-packages qt6-webengine
https://github.com/void-linux/void-packages/pull/38509

WIP Qt6 webengine
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**
[ci skip]

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-qt6-webengine-38509.patch --]
[-- Type: text/x-diff, Size: 294700 bytes --]

From 00ca62720ad1031e6526c023546f892f453e638f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:07 +0700
Subject: [PATCH 01/25] qt6-base: update to 6.3.1.

---
 srcpkgs/qt6-base/patches/libatomic.patch | 14 --------------
 srcpkgs/qt6-base/template                | 13 +++++++++----
 2 files changed, 9 insertions(+), 18 deletions(-)
 delete mode 100644 srcpkgs/qt6-base/patches/libatomic.patch

diff --git a/srcpkgs/qt6-base/patches/libatomic.patch b/srcpkgs/qt6-base/patches/libatomic.patch
deleted file mode 100644
index 2f7a807518e4..000000000000
--- a/srcpkgs/qt6-base/patches/libatomic.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Index: cmake/FindWrapAtomic.cmake
-===================================================================
---- a/cmake/FindWrapAtomic.cmake
-+++ b/cmake/FindWrapAtomic.cmake
-@@ -38,7 +38,8 @@ endif()
- 
- add_library(WrapAtomic::WrapAtomic INTERFACE IMPORTED)
- if(HAVE_STDATOMIC_WITH_LIB)
--    target_link_libraries(WrapAtomic::WrapAtomic INTERFACE atomic)
-+    find_library(LIBATOMIC atomic REQUIRED)
-+    target_link_libraries(WrapAtomic::WrapAtomic INTERFACE ${LIBATOMIC})
- endif()
- 
- set(WrapAtomic_FOUND 1)
diff --git a/srcpkgs/qt6-base/template b/srcpkgs/qt6-base/template
index cc47e18a70ff..746927e2a4b2 100644
--- a/srcpkgs/qt6-base/template
+++ b/srcpkgs/qt6-base/template
@@ -1,7 +1,7 @@
 # Template file for 'qt6-base'
 pkgname=qt6-base
-version=6.3.0
-revision=2
+version=6.3.1
+revision=1
 wrksrc="qtbase-everywhere-src-${version}"
 build_style=cmake
 configure_args="-DINSTALL_DATADIR=share/qt6
@@ -9,6 +9,8 @@ configure_args="-DINSTALL_DATADIR=share/qt6
  -DINSTALL_BINDIR=lib/qt6/bin
  -DINSTALL_MKSPECSDIR=lib/qt6/mkspecs
  -DINSTALL_INCLUDEDIR=include/qt6
+ -DINSTALL_EXAMPLESDIR=lib/qt6/examples
+ -DINSTALL_TESTSDIR=lib/qt6/tests
  -DINSTALL_SYSCONFDIR=/etc/xdg
  -DQT_FEATURE_openssl_linked=ON
  -DQT_FEATURE_system_sqlite=ON
@@ -29,7 +31,7 @@ maintainer="John <me@johnnynator.dev>"
 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=b865aae43357f792b3b0a162899d9bf6a1393a55c4e5e4ede5316b157b1a0f99
+checksum=0a64421d9c2469c2c48490a032ab91d547017c9cc171f3f8070bc31888f24e03
 python_version=3
 
 if [ "$CROSS_BUILD" ]; then
@@ -225,7 +227,7 @@ qt6-plugin-tls-qcertonly_package() {
 qt6-plugin-networkinformation_package() {
 	short_desc+=" - Networkinformation plugin"
 	pkg_install() {
-		vmove usr/lib/qt6/plugins/networkinformation/libqnetworkmanager.so
+		vmove usr/lib/qt6/plugins/networkinformation/
 	}
 }
 
@@ -246,9 +248,12 @@ qt6-base-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/*.a"
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From a4bbb03692e4157595002d60e4eac8906216ecdd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:07 +0700
Subject: [PATCH 02/25] qt6-charts: update to 6.3.1.

---
 srcpkgs/qt6-charts/template | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qt6-charts/template b/srcpkgs/qt6-charts/template
index 79cb8a220401..e7fc953b4188 100644
--- a/srcpkgs/qt6-charts/template
+++ b/srcpkgs/qt6-charts/template
@@ -1,6 +1,6 @@
 # Template file for 'qt6-charts'
 pkgname=qt6-charts
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qtcharts-everywhere-src-${version}"
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 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=672762c5f641ccc88a30aeedefb63f03c0f837649b334f46eea57592e87e36cd
+checksum=f330cc2328729104d79b2088990ce0840f2da89d9d989360d4c352e797d27cf7
 
 qt6-charts-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
@@ -20,8 +20,11 @@ qt6-charts-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From 7b0afbe331fb240daf148bfda6da19ef8e330a1b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:07 +0700
Subject: [PATCH 03/25] qt6-declarative: update to 6.3.1.

---
 srcpkgs/qt6-declarative/template | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qt6-declarative/template b/srcpkgs/qt6-declarative/template
index e0bd28d9e383..9f7908685cad 100644
--- a/srcpkgs/qt6-declarative/template
+++ b/srcpkgs/qt6-declarative/template
@@ -1,6 +1,6 @@
 # Template file for 'qt6-declarative'
 pkgname=qt6-declarative
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qtdeclarative-everywhere-src-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 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=d294b029dc2b2d4f65da516fdc3b8088d32643eb7ff77db135a8b9ce904caa37
+checksum=03e7694123820fcca397f95ce312e0b7f3039493c8754c836da098a1a04346e8
 replaces="qt6-quickcontrols2>=0"
 
 if [ "$CROSS_BUILD" ]; then
@@ -60,11 +60,14 @@ qt6-declarative-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/libQt6QuickTest.so.*"
 		vmove usr/lib/qt6/qml/QtTest
 		vmove usr/lib/qt6/bin/qmltestrunner
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From eeb489f4c036f34021693e934589a54e70159139 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:07 +0700
Subject: [PATCH 04/25] qt6-imageformats: update to 6.3.1.

---
 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 eaca95243c48..65b6043fe497 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.3.0
+version=6.3.1
 revision=1
 wrksrc="qtimageformats-everywhere-src-${version}"
 build_style=cmake
@@ -12,4 +12,4 @@ maintainer="John <me@johnnynator.dev>"
 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=025d0d17ed75b42a7eb6b523731ab8f17025421a8810cade25caffe05d93abef
+checksum=ad0312b8dfbbb67f729bfadbfcd47246ee4a128b717731ba158c41d01fde212f

From 33bd06cfd481ca8a9d68cf8cbcce3a8a50f8cf70 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:07 +0700
Subject: [PATCH 05/25] qt6-location: update to 6.3.1.

---
 srcpkgs/qt6-location/template | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qt6-location/template b/srcpkgs/qt6-location/template
index b7397f5f8942..d586020c7c10 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.3.0
+version=6.3.1
 revision=1
 wrksrc="qtpositioning-everywhere-src-${version}"
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 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=e9ed50f6b245a346db34d625d0012774ef0ec8e7fd65037127ec26758708236e
+checksum=06788e4ecae1920094b30e4046f0abd23c8189d8a51e9c939b02f0b6abe2e86c
 
 qt6-location-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel>=${version}_1"
@@ -20,8 +20,11 @@ qt6-location-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From 6c2381c1baef31b12e989fad83dde1d45c2f9b62 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:08 +0700
Subject: [PATCH 06/25] qt6-lottie: update to 6.3.1.

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

diff --git a/srcpkgs/qt6-lottie/template b/srcpkgs/qt6-lottie/template
index 1c97cd5f4f32..2c52ffc7f89d 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.3.0
+version=6.3.1
 revision=1
 wrksrc="qtlottie-everywhere-src-${version}"
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 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=39db570bbba5b527a1eb6a5774bed47398ace2f7217bbf45b1194ada6cf97deb
+checksum=740ba76999124d5e1a85ef3d01c69976bb8557862b6b26bf48b357fe0cab1cf5
 
 if [ "$XBPS_CHECK_PKGS" ]; then
 	configure_args+=" -DQT_BUILD_TESTS=ON"
@@ -28,8 +28,10 @@ qt6-lottie-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
 		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From d595deb6ef1b2b626d4b345c91865ffd5050cd52 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:08 +0700
Subject: [PATCH 07/25] qt6-networkauth: update to 6.3.1.

---
 srcpkgs/qt6-networkauth/template | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qt6-networkauth/template b/srcpkgs/qt6-networkauth/template
index e934beada9b0..df2b9b50bb79 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.3.0
+version=6.3.1
 revision=1
 wrksrc="qtnetworkauth-everywhere-src-${version}"
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 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=203a98942919028520038f90a20cd7ee32b537233545d11e429c3e2c1ad9069f
+checksum=d60f54b9d4509fa8bdbf1990bc91f6e260e38cdb57a7b8119fa3861bc5d2fb2a
 
 if [ "$XBPS_CHECK_PKGS" ]; then
 	configure_args+=" -DQT_BUILD_TESTS=ON"
@@ -24,8 +24,11 @@ qt6-networkauth-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From c6c7149d114a6f52c08167876a50e7bc32ece766 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:08 +0700
Subject: [PATCH 08/25] qt6-qt5compat: update to 6.3.1.

---
 srcpkgs/qt6-qt5compat/template | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/qt6-qt5compat/template b/srcpkgs/qt6-qt5compat/template
index 7fcd5ad5080e..421d742c08e0 100644
--- a/srcpkgs/qt6-qt5compat/template
+++ b/srcpkgs/qt6-qt5compat/template
@@ -1,7 +1,7 @@
 # Template file for 'qt6-qt5compat'
 pkgname=qt6-qt5compat
-version=6.3.0
-revision=2
+version=6.3.1
+revision=1
 wrksrc="qt5compat-everywhere-src-${version}"
 build_style=cmake
 configure_args="-DQT_HOST_PATH=/usr"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 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=2b199be780c50d9214512b922d94cb240b0412fd63f459e356b76102cad1713e
+checksum=a43ec62bd778eaecf88ad7847118d1c2a471b0fcb820f93beb311d7ab9566cfd
 
 if [ "$XBPS_CHECK_PKGS" ]; then
 	configure_args+=" -DQT_BUILD_TESTS=ON"
@@ -24,8 +24,11 @@ qt6-qt5compat-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From 0e789f26129fa77d78d6f1b601b8f34d968d6568 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:08 +0700
Subject: [PATCH 09/25] qt6-quick3d: update to 6.3.1.

---
 srcpkgs/qt6-quick3d/template | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/qt6-quick3d/template b/srcpkgs/qt6-quick3d/template
index 0f7ef336a3ff..2f216abcf3b9 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.3.0
+version=6.3.1
 revision=1
 wrksrc="qtquick3d-everywhere-src-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 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=0ad05bd1ee1f784b18220a2d2625ee8de91662c88fdc7b798662953d86eb327e
+checksum=2fa766ee47b8c07412b3b755206ada0715fb07813b64ed069e7205044c061256
 
 if [ "$XBPS_TARGET_ENDIAN" = "be" ]; then
 	# possibly a qt6-shadertools bug, actually
@@ -26,9 +26,12 @@ qt6-quick3d-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
-		vmove usr/lib/qt6/mkspecs
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/bin
+		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From 66b9d978860dd08f33e068b4dd6e72e8c5149a10 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:09 +0700
Subject: [PATCH 10/25] qt6-quicktimeline: update to 6.3.1.

---
 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 15aa7a8e5819..dc7c3b13cba6 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.3.0
+version=6.3.1
 revision=1
 wrksrc="qtquicktimeline-everywhere-src-${version/rc/-rc}"
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 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=9ff0a931159efc6be5bd9f8a1e4a16a70e2dab37cf22ad85c6d330ccfdf31c1a
+checksum=58a13cf0ce8e7755639f20684078733af24f5a317f6ddb40d6079c8c5a28ebbe
 
 if [ "$XBPS_CHECK_PKGS" ]; then
 	configure_args+=" -DQT_BUILD_TESTS=ON"

From b8a117e4d239cd689de3dea83452d7df66afd4f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:09 +0700
Subject: [PATCH 11/25] qt6-scxml: update to 6.3.1.

---
 srcpkgs/qt6-scxml/template | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qt6-scxml/template b/srcpkgs/qt6-scxml/template
index 112baca0ab83..063ba8199d0e 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.3.0
+version=6.3.1
 revision=1
 wrksrc="qtscxml-everywhere-src-${version}"
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 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=09b0dbd6ac367920fb1ba96a39dcd4c9d33eb0820dcc79538992825d588a70f0
+checksum=01bc154d6163d1f049f4e1e76658a044730ace7b0a5be35c9a46fcd1396f8619
 
 if [ "$XBPS_CHECK_PKGS" ]; then
 	configure_args+=" -DQT_BUILD_TESTS=ON"
@@ -24,8 +24,11 @@ qt6-scxml-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From d41a36ab3a13507885e28670f5711662899833f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:09 +0700
Subject: [PATCH 12/25] qt6-serialport: update to 6.3.1.

---
 srcpkgs/qt6-serialport/template | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qt6-serialport/template b/srcpkgs/qt6-serialport/template
index 0804671ca57b..3b6373eda2c7 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.3.0
+version=6.3.1
 revision=1
 wrksrc="qtserialport-everywhere-src-${version}"
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 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=eebd6934d48cc044b8c87795a4fd91bb81f7195d4b5a2ddb12802f343d5db64f
+checksum=4eb6d80e65799dd2e0318df4dfba14173c1929e861718cda9bedca24253b616e
 
 qt6-serialport-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel>=${version}_1"
@@ -20,8 +20,11 @@ qt6-serialport-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From e35d69503576717b53e93d1ba057457659b42c48 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:09 +0700
Subject: [PATCH 13/25] qt6-shadertools: update to 6.3.1.

---
 srcpkgs/qt6-shadertools/template | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qt6-shadertools/template b/srcpkgs/qt6-shadertools/template
index 9c1ec210a96a..785c54682446 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.3.0
+version=6.3.1
 revision=1
 wrksrc="qtshadertools-everywhere-src-${version}"
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 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=5498959b9d37c254bd126ab1320cf86aeb8a31b3ea7e51db666a8f9698afbd6c
+checksum=59b77176961528cc7b0c9325134655e273aa87b4cb386c0f4683d8f2852e435a
 
 qt6-shadertools-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel>=${version}_1"
@@ -20,8 +20,11 @@ qt6-shadertools-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From 249cb67fda202208615cb028db29b9ca184b6a7a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:09 +0700
Subject: [PATCH 14/25] qt6-svg: update to 6.3.1.

---
 srcpkgs/qt6-svg/template | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qt6-svg/template b/srcpkgs/qt6-svg/template
index aa8e6b745109..a821afc11f10 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.3.0
+version=6.3.1
 revision=1
 wrksrc="qtsvg-everywhere-src-${version}"
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 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=3164504d7e3f640439308235739b112605ab5fc9cc517ca0b28f9fb93a8db0e3
+checksum=7b19f418e6f7b8e23344082dd04440aacf5da23c5a73980ba22ae4eba4f87df7
 
 if [ "$XBPS_CHECK_PKGS" ]; then
 	configure_args+=" -DQT_BUILD_TESTS=ON"
@@ -29,8 +29,11 @@ qt6-svg-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From 7a12f04ed9c61d529cd340de4b891f0c387b08c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:10 +0700
Subject: [PATCH 15/25] qt6-tools: update to 6.3.1.

---
 srcpkgs/qt6-tools/template | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qt6-tools/template b/srcpkgs/qt6-tools/template
index f875dff5c046..e0a048820450 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.3.0
+version=6.3.1
 revision=1
 wrksrc="qttools-everywhere-src-${version}"
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 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/qttools-everywhere-src-${version}.tar.xz"
-checksum=fce94688ea925782a2879347584991f854630daadba6c52aed6d93e33cd0b19c
+checksum=c412750f2aa3beb93fce5f30517c607f55daaeb7d0407af206a8adf917e126c1
 
 if [ "$XBPS_CHECK_PKGS" ]; then
 	configure_args+=" -DQT_BUILD_TESTS=ON"
@@ -31,8 +31,11 @@ qt6-tools-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From c252a089dfd09fea1622c708bc7856b5f114c19f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:10 +0700
Subject: [PATCH 16/25] qt6-translations: update to 6.3.1.

---
 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 be0a74ca74e2..fa751b097466 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.3.0
+version=6.3.1
 revision=1
 wrksrc="qttranslations-everywhere-src-${version}"
 build_style=cmake
@@ -12,4 +12,4 @@ maintainer="John <me@johnnynator.dev>"
 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=e4dd4ef892a34a9514a19238f189a33ed85c76f31dcad6599ced93b1e33440b3
+checksum=d7bdd55e2908ded901dcc262157100af2a490bf04d31e32995f6d91d78dfdb97

From 448e0cdc2221cf09cbde54af5eb5a0db643eff74 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:10 +0700
Subject: [PATCH 17/25] qt6-virtualkeyboard: update to 6.3.1.

---
 srcpkgs/qt6-virtualkeyboard/template | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qt6-virtualkeyboard/template b/srcpkgs/qt6-virtualkeyboard/template
index 67ecef145ea1..72c4f94a3e32 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.3.0
+version=6.3.1
 revision=1
 wrksrc="qtvirtualkeyboard-everywhere-src-${version}"
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 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=89aaf15acf5432af8f5cf4ec45cb32d87a3348906215dd56e81cb294eb276573
+checksum=5fe089b204d859ab0dd0169f811f2e30cae7c5cb36f8ab95ca36883f1fc0c2b8
 
 if [ "$XBPS_CHECK_PKGS" ]; then
 	configure_args+=" -DQT_BUILD_TESTS=ON"
@@ -32,8 +32,11 @@ qt6-virtualkeyboard-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From 6d75eda94e0a5633db355cd201b81926a6126e12 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:10 +0700
Subject: [PATCH 18/25] qt6-wayland: update to 6.3.1.

---
 srcpkgs/qt6-wayland/template | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/qt6-wayland/template b/srcpkgs/qt6-wayland/template
index b71a273009b9..2bbb8e06e09b 100644
--- a/srcpkgs/qt6-wayland/template
+++ b/srcpkgs/qt6-wayland/template
@@ -1,6 +1,6 @@
 # Template file for 'qt6-wayland'
 pkgname=qt6-wayland
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qtwayland-everywhere-src-${version}"
 build_style=cmake
@@ -8,6 +8,7 @@ configure_args="-DQT_HOST_PATH=/usr -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true"
 hostmakedepends="qt6-base-devel perl pkg-config wayland-devel qt6-wayland-devel"
 # XXX: Qml as optional dep
 makedepends="qt6-base-devel wayland-devel libxkbcommon-devel
+ qt6-declarative-devel
  libXcomposite-devel MesaLib-devel Vulkan-Headers libdrm-devel"
 checkdepends="dbus mesa-dri"
 short_desc="Cross-platform application and UI framework - Wayland"
@@ -15,7 +16,7 @@ maintainer="John <me@johnnynator.dev>"
 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=e7b567f6e43ffc5918d4aa825ce1eced66a00cb0a87133b2912ba5c1b2a02190
+checksum=6f14fea2d172a5b4170be3efcb0e58535f6605b61bcd823f6d5c9d165bb8c0f0
 
 if [ "$XBPS_CHECK_PKGS" ]; then
 	configure_args+=" -DQT_BUILD_TESTS=ON"
@@ -32,9 +33,11 @@ qt6-wayland-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
-		vmove usr/lib/qt6/libexec/qtwaylandscanner
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From 31c23a468e9de0ecd46e9445ea2c56df283cd426 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:10 +0700
Subject: [PATCH 19/25] qt6-websockets: update to 6.3.1.

---
 srcpkgs/qt6-websockets/template | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qt6-websockets/template b/srcpkgs/qt6-websockets/template
index c2e674aacb31..69c383355a3d 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.3.0
+version=6.3.1
 revision=1
 wrksrc="qtwebsockets-everywhere-src-${version}"
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 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=e018a09fe960b7d9560d6bbc9d3ca022fed6566e6ba6fc6d869a97482d4e6361
+checksum=9f980d90c97fcbde1b50c773f6dc580cfdf8c36ce14a1be3aa2ccadfe605121a
 
 qt6-websockets-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel>=${version}_1"
@@ -20,8 +20,11 @@ qt6-websockets-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From 9dfc5e8acf41c81382df8e9a71874ebb7499dfd7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:11 +0700
Subject: [PATCH 20/25] New package: qt6-webchannel-6.3.1

---
 srcpkgs/qt6-webchannel-devel    |  1 +
 srcpkgs/qt6-webchannel/template | 33 +++++++++++++++++++++++++++++++++
 srcpkgs/qt6-webchannel/update   |  1 +
 3 files changed, 35 insertions(+)
 create mode 120000 srcpkgs/qt6-webchannel-devel
 create mode 100644 srcpkgs/qt6-webchannel/template
 create mode 100644 srcpkgs/qt6-webchannel/update

diff --git a/srcpkgs/qt6-webchannel-devel b/srcpkgs/qt6-webchannel-devel
new file mode 120000
index 000000000000..03e8b23d785d
--- /dev/null
+++ b/srcpkgs/qt6-webchannel-devel
@@ -0,0 +1 @@
+qt6-webchannel
\ No newline at end of file
diff --git a/srcpkgs/qt6-webchannel/template b/srcpkgs/qt6-webchannel/template
new file mode 100644
index 000000000000..d8db6fae9d8b
--- /dev/null
+++ b/srcpkgs/qt6-webchannel/template
@@ -0,0 +1,33 @@
+# Template file for 'qt6-webchannel'
+pkgname=qt6-webchannel
+version=6.3.1
+revision=1
+wrksrc="qtwebchannel-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DQT_HOST_PATH=/usr"
+hostmakedepends="perl qt6-base-devel qt6-declarative-devel"
+makedepends="qt6-base-devel qt6-declarative-devel qt6-websockets-devel"
+short_desc="Cross-platform application and UI framework - webchannel"
+maintainer="John <me@johnnynator.dev>"
+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=aaa20ac23f86992721b7ee487c379a3fd68caa8cdcea0a77a37e0d8b47ff2668
+
+qt6-webchannel-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel>=${version}_1
+	 qt6-websockets-devel>=${version}_1"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
+		vmove usr/lib/qt6/mkspecs
+		vmove usr/lib/qt6/qml/QtWebChannel/plugins.qmltypes
+		vmove usr/lib/qt6/qml/QtWebChannel/qmldir
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
+	}
+}
diff --git a/srcpkgs/qt6-webchannel/update b/srcpkgs/qt6-webchannel/update
new file mode 100644
index 000000000000..844552465222
--- /dev/null
+++ b/srcpkgs/qt6-webchannel/update
@@ -0,0 +1 @@
+pkgname="${pkgname/6-/}-everywhere-src"

From d57cb522b44df0841b30ae88e0ddc8cddd3dcedb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:11 +0700
Subject: [PATCH 21/25] New package: qt6-multimedia-6.3.1

---
 srcpkgs/qt6-multimedia-devel    |  1 +
 srcpkgs/qt6-multimedia/template | 33 +++++++++++++++++++++++++++++++++
 srcpkgs/qt6-multimedia/update   |  1 +
 3 files changed, 35 insertions(+)
 create mode 120000 srcpkgs/qt6-multimedia-devel
 create mode 100644 srcpkgs/qt6-multimedia/template
 create mode 100644 srcpkgs/qt6-multimedia/update

diff --git a/srcpkgs/qt6-multimedia-devel b/srcpkgs/qt6-multimedia-devel
new file mode 120000
index 000000000000..9343446502d0
--- /dev/null
+++ b/srcpkgs/qt6-multimedia-devel
@@ -0,0 +1 @@
+qt6-multimedia
\ No newline at end of file
diff --git a/srcpkgs/qt6-multimedia/template b/srcpkgs/qt6-multimedia/template
new file mode 100644
index 000000000000..ccc5290852e8
--- /dev/null
+++ b/srcpkgs/qt6-multimedia/template
@@ -0,0 +1,33 @@
+# Template file for 'qt6-multimedia'
+pkgname=qt6-multimedia
+version=6.3.1
+revision=1
+wrksrc="qtmultimedia-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DQT_HOST_PATH=/usr -DQT_FEATURE_gstreamer=ON"
+hostmakedepends="perl qt6-declarative-devel pkg-config
+ qt6-shadertools-devel"
+makedepends="qt6-declarative-devel
+ qt6-shadertools-devel libglib-devel gst-plugins-base1-devel"
+short_desc="Cross-platform application and UI framework - multimedia"
+maintainer="John <me@johnnynator.dev>"
+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=7e03242aadd634ff2d9fcf08948290f03da3d9a5012369d908da89f82b1d7336
+
+qt6-multimedia-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel>=${version}_1"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
+		vmove usr/lib/qt6/mkspecs
+		vmove usr/lib/qt6/qml/QtMultimedia/plugins.qmltypes
+		vmove usr/lib/qt6/qml/QtMultimedia/qmldir
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}
diff --git a/srcpkgs/qt6-multimedia/update b/srcpkgs/qt6-multimedia/update
new file mode 100644
index 000000000000..844552465222
--- /dev/null
+++ b/srcpkgs/qt6-multimedia/update
@@ -0,0 +1 @@
+pkgname="${pkgname/6-/}-everywhere-src"

From 7f7bad3914bc119a0f9c37a2960d70191c5d0bb4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 18:22:48 +0700
Subject: [PATCH 22/25] New package: qt6-connectivity-6.3.1

---
 srcpkgs/qt6-connectivity-devel    |  1 +
 srcpkgs/qt6-connectivity/template | 31 +++++++++++++++++++++++++++++++
 2 files changed, 32 insertions(+)
 create mode 120000 srcpkgs/qt6-connectivity-devel
 create mode 100644 srcpkgs/qt6-connectivity/template

diff --git a/srcpkgs/qt6-connectivity-devel b/srcpkgs/qt6-connectivity-devel
new file mode 120000
index 000000000000..478cc9d8aa39
--- /dev/null
+++ b/srcpkgs/qt6-connectivity-devel
@@ -0,0 +1 @@
+qt6-connectivity
\ No newline at end of file
diff --git a/srcpkgs/qt6-connectivity/template b/srcpkgs/qt6-connectivity/template
new file mode 100644
index 000000000000..05fc1eae2ee9
--- /dev/null
+++ b/srcpkgs/qt6-connectivity/template
@@ -0,0 +1,31 @@
+# Template file for 'qt6-connectivity'
+pkgname=qt6-connectivity
+version=6.3.1
+revision=1
+wrksrc="qtconnectivity-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DQT_HOST_PATH=/usr"
+hostmakedepends="perl qt6-declarative-devel"
+makedepends="qt6-declarative-devel"
+short_desc="Cross-platform application and UI framework - Connectivity"
+maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
+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=b25ce4710a9c61bc6a5dbaeeb3e2ed907a8bc85478fdb2ab4312297768b695b0
+
+qt6-connectivity-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}
+	 qt6-declarative>=${version}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
+		vmove usr/lib/qt6/mkspecs
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
+	}
+}

From 8b3f7fa4f1f54dec4f3ce2e20dc02cd0c5690d85 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 18:22:57 +0700
Subject: [PATCH 23/25] New package: qt6-sensors-6.3.1

---
 srcpkgs/qt6-sensors-devel    |  1 +
 srcpkgs/qt6-sensors/template | 32 ++++++++++++++++++++++++++++++++
 2 files changed, 33 insertions(+)
 create mode 120000 srcpkgs/qt6-sensors-devel
 create mode 100644 srcpkgs/qt6-sensors/template

diff --git a/srcpkgs/qt6-sensors-devel b/srcpkgs/qt6-sensors-devel
new file mode 120000
index 000000000000..eb9457f04055
--- /dev/null
+++ b/srcpkgs/qt6-sensors-devel
@@ -0,0 +1 @@
+qt6-sensors
\ No newline at end of file
diff --git a/srcpkgs/qt6-sensors/template b/srcpkgs/qt6-sensors/template
new file mode 100644
index 000000000000..cc0e205fb215
--- /dev/null
+++ b/srcpkgs/qt6-sensors/template
@@ -0,0 +1,32 @@
+# Template file for 'qt6-sensors'
+pkgname=qt6-sensors
+version=6.3.1
+revision=1
+wrksrc="qtsensors-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DQT_HOST_PATH=/usr"
+hostmakedepends="perl qt6-declarative-devel qt6-svg-devel pkg-config"
+makedepends="qt6-declarative-devel qt6-svg-devel"
+short_desc="Cross-platform application and UI framework - Sensors"
+maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
+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=4b240b59edba9a42b4735758a25f279a26841b982864e7b38f6ef0b81e0d60cc
+
+qt6-sensors-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}
+	 qt6-declarative-devel>=${version}_1"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
+		vmove usr/lib/qt6/mkspecs
+		vmove usr/lib/qt6/qml/QtSensors/plugins.qmltypes
+		vmove usr/lib/qt6/qml/QtSensors/qmldir
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}

From 86f439d78fbbb226e8f72b36b5b900503482ca1b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 18:23:08 +0700
Subject: [PATCH 24/25] New package: qt6-remoteobjects-6.3.1

---
 srcpkgs/qt6-remoteobjects-devel    |  1 +
 srcpkgs/qt6-remoteobjects/template | 32 ++++++++++++++++++++++++++++++
 2 files changed, 33 insertions(+)
 create mode 120000 srcpkgs/qt6-remoteobjects-devel
 create mode 100644 srcpkgs/qt6-remoteobjects/template

diff --git a/srcpkgs/qt6-remoteobjects-devel b/srcpkgs/qt6-remoteobjects-devel
new file mode 120000
index 000000000000..2a027f95266f
--- /dev/null
+++ b/srcpkgs/qt6-remoteobjects-devel
@@ -0,0 +1 @@
+qt6-remoteobjects
\ No newline at end of file
diff --git a/srcpkgs/qt6-remoteobjects/template b/srcpkgs/qt6-remoteobjects/template
new file mode 100644
index 000000000000..40d6518e700f
--- /dev/null
+++ b/srcpkgs/qt6-remoteobjects/template
@@ -0,0 +1,32 @@
+# Template file for 'qt6-remoteobjects'
+pkgname=qt6-remoteobjects
+version=6.3.1
+revision=1
+wrksrc="qtremoteobjects-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DQT_HOST_PATH=/usr"
+hostmakedepends="perl qt6-declarative-devel pkg-config"
+makedepends="qt6-declarative-devel"
+short_desc="Cross-platform application and UI framework - Remote Objects"
+maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
+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=ea6d038b11c60981de0bd39a6091a59abf7d031e37bfc592b31be1217bef4ca6
+
+qt6-remoteobjects-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}
+	 qt6-declarative-devel>=${version}_1"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
+		vmove usr/lib/qt6/mkspecs
+		vmove usr/lib/qt6/qml/QtRemoteObjects/plugins.qmltypes
+		vmove usr/lib/qt6/qml/QtRemoteObjects/qmldir
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}

From 9ebdaa606819c2044d3a911ea658e25e635a0858 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:11 +0700
Subject: [PATCH 25/25] New package: qt6-webengine-6.3.1.

---
 common/shlibs                                 |    7 +
 srcpkgs/qt6-webengine-devel                   |    1 +
 srcpkgs/qt6-webengine-examples                |    1 +
 .../patches/0001-None-no-debug.patch          |   11 +
 .../patches/0002-enable-ppc64.patch           |   20 +
 .../patches/0003-cross-hack.patch             |   10 +
 .../0004-ppc-disable-jxl-decoder.patch        |   13 +
 .../patches/0050-no-glibc-cmake-check.patch   |   14 +
 .../0100-chromium-sandbox-membarrier.patch    |   58 +
 .../qt6-webengine/patches/0101-size_t.patch   |   16 +
 .../0102-chromium-90-ruy-include.patch        |   19 +
 ...-v8-monotonic-pthread-cont_timedwait.patch |   22 +
 .../0104-chromium-revert-9d080c0.patch        |  162 +
 ...-chromium-revert-drop-of-system-java.patch |   15 +
 .../patches/0106-chromium-system-nodejs.patch |   20 +
 .../0107-chromium-cursed^Uscoped_file.patch   |   18 +
 .../0108-chromium-fix-narrowing-cast.patch    |   53 +
 .../0109-chromium-remove-strip_binary.patch   |   32 +
 ...ium-revert-use-ffile-compilation-dir.patch |   57 +
 ...11-chromium-no-Wno-stringop-overread.patch |   10 +
 .../0150-chromium-glibc-libc_malloc.patch     |   24 +
 ...-include-sys-reg.h-to-get-__WORDSIZE.patch |   21 +
 .../0201-chromium-musl-dispatch-to-musl.patch |  103 +
 .../0202-chromium-musl-no-mallinfo.patch      |   62 +
 .../0203-chromium-musl-siginfo_t.patch        |   18 +
 .../0204-chromium-musl-stackstart.patch       |   20 +
 .../patches/0205-chromium-musl-sandbox.patch  |   92 +
 ...0206-chromium-musl-default-stacksize.patch |   15 +
 ...-chromium-musl-cross-no-asm_ptrace_h.patch |   30 +
 .../patches/0208-chromium-musl-execinfo.patch |  125 +
 .../0209-chromium-musl-thread-stacksize.patch |   22 +
 .../0210-chromium-musl-msgvec-push_back.patch |   14 +
 ...ium-musl-canonicalize-file-name-musl.patch |   11 +
 .../0212-chromium-musl-no-getcontext.patch    |   29 +
 .../patches/0213-chromium-musl-crashpad.patch |   22 +
 .../patches/0214-chromium-musl-fixes.patch    |  108 +
 .../patches/0215-chromium-musl-cdefs.patch    |   29 +
 .../patches/0216-chromium-musl-stat.patch     |   12 +
 .../patches/0217-chromium-musl-resolver.patch |   77 +
 .../patches/0600-chromium-sndio.patch         |  876 ++++
 .../patches/0700-armv7l-neon.patch            |   10 +
 .../0750-chromium-musl-arm-user_vfp.patch     |   20 +
 .../0751-chromium-musl-arm-elf_auxv_t.patch   |   18 +
 ...0801-chromium-i686-vaapi-fpermissive.patch |   24 +
 .../patches/0900-xxx-ppc64le-libvpx.patch     |   65 +
 .../0901-xxx-ppc64le-sandbox-linux-stat.patch |   31 +
 .../patches/0902-xxx-ppc64le-support.patch    | 3559 +++++++++++++++++
 .../0903-xxx-ppc64le-swiftshader.patch        |   18 +
 srcpkgs/qt6-webengine/template                |  175 +
 srcpkgs/qt6-webengine/update                  |    1 +
 50 files changed, 6190 insertions(+)
 create mode 120000 srcpkgs/qt6-webengine-devel
 create mode 120000 srcpkgs/qt6-webengine-examples
 create mode 100644 srcpkgs/qt6-webengine/patches/0001-None-no-debug.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0002-enable-ppc64.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0003-cross-hack.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0004-ppc-disable-jxl-decoder.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0050-no-glibc-cmake-check.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0100-chromium-sandbox-membarrier.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0101-size_t.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0102-chromium-90-ruy-include.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0103-chromium-v8-monotonic-pthread-cont_timedwait.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0104-chromium-revert-9d080c0.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0105-chromium-revert-drop-of-system-java.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0106-chromium-system-nodejs.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0107-chromium-cursed^Uscoped_file.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0108-chromium-fix-narrowing-cast.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0109-chromium-remove-strip_binary.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0110-chromium-revert-use-ffile-compilation-dir.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0111-chromium-no-Wno-stringop-overread.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0150-chromium-glibc-libc_malloc.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0200-chromium-musl-include-sys-reg.h-to-get-__WORDSIZE.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0201-chromium-musl-dispatch-to-musl.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0202-chromium-musl-no-mallinfo.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0203-chromium-musl-siginfo_t.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0204-chromium-musl-stackstart.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0205-chromium-musl-sandbox.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0206-chromium-musl-default-stacksize.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0207-chromium-musl-cross-no-asm_ptrace_h.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0208-chromium-musl-execinfo.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0209-chromium-musl-thread-stacksize.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0210-chromium-musl-msgvec-push_back.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0211-chromium-musl-canonicalize-file-name-musl.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0212-chromium-musl-no-getcontext.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0213-chromium-musl-crashpad.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0214-chromium-musl-fixes.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0215-chromium-musl-cdefs.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0216-chromium-musl-stat.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0217-chromium-musl-resolver.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0600-chromium-sndio.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0700-armv7l-neon.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0750-chromium-musl-arm-user_vfp.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0751-chromium-musl-arm-elf_auxv_t.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0801-chromium-i686-vaapi-fpermissive.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0900-xxx-ppc64le-libvpx.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0901-xxx-ppc64le-sandbox-linux-stat.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0902-xxx-ppc64le-support.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0903-xxx-ppc64le-swiftshader.patch
 create mode 100644 srcpkgs/qt6-webengine/template
 create mode 100644 srcpkgs/qt6-webengine/update

diff --git a/common/shlibs b/common/shlibs
index 326943713f07..96e40a9e24ff 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2077,6 +2077,13 @@ libQt6SerialPort.so.6 qt6-serialport-6.2.0alpha_1
 libQt6WebSockets.so.6 qt6-websockets-6.2.0alpha_1
 libQt6WebChannel.so.6 qt6-webchannel-6.2.0alpha_1
 libQt6Positioning.so.6 qt6-location-6.2.0alpha_1
+libQt6WebEngineQuick.so.6 qt6-webengine-6.3.1_1
+libQt6PdfWidgets.so.6 qt6-webengine-6.3.1_1
+libQt6PdfQuick.so.6 qt6-webengine-6.3.1_1
+libQt6WebEngineCore.so.6 qt6-webengine-6.3.1_1
+libQt6Pdf.so.6 qt6-webengine-6.3.1_1
+libQt6WebEngineQuickDelegatesQml.so.6 qt6-webengine-6.3.1_1
+libQt6WebEngineWidgets.so.6 qt6-webengine-6.3.1_1
 libnpth.so.0 npth-1.1_1
 libnpupnp.so.4 libnpupnp-4.0.2_1
 libglfw.so.3 glfw-3.0.4_1
diff --git a/srcpkgs/qt6-webengine-devel b/srcpkgs/qt6-webengine-devel
new file mode 120000
index 000000000000..8e4d1b99c587
--- /dev/null
+++ b/srcpkgs/qt6-webengine-devel
@@ -0,0 +1 @@
+qt6-webengine
\ No newline at end of file
diff --git a/srcpkgs/qt6-webengine-examples b/srcpkgs/qt6-webengine-examples
new file mode 120000
index 000000000000..8e4d1b99c587
--- /dev/null
+++ b/srcpkgs/qt6-webengine-examples
@@ -0,0 +1 @@
+qt6-webengine
\ No newline at end of file
diff --git a/srcpkgs/qt6-webengine/patches/0001-None-no-debug.patch b/srcpkgs/qt6-webengine/patches/0001-None-no-debug.patch
new file mode 100644
index 000000000000..1ba33f8e6fd9
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0001-None-no-debug.patch
@@ -0,0 +1,11 @@
+--- a/cmake/Functions.cmake
++++ b/cmake/Functions.cmake
+@@ -813,6 +813,8 @@ macro(append_build_type_setup)
+         endif()
+     elseif(${config} STREQUAL "MinSizeRel")
+         list(APPEND gnArgArg is_debug=false symbol_level=0 optimize_for_size=true)
++    elseif(${config} STREQUAL "None")
++        list(APPEND gnArgArg is_debug=false symbol_level=0)
+     endif()
+     if(FEATURE_developer_build OR (${config} STREQUAL "Debug") OR QT_FEATURE_webengine_sanitizer)
+         list(APPEND gnArgArg
diff --git a/srcpkgs/qt6-webengine/patches/0002-enable-ppc64.patch b/srcpkgs/qt6-webengine/patches/0002-enable-ppc64.patch
new file mode 100644
index 000000000000..d72ef1ad1a10
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0002-enable-ppc64.patch
@@ -0,0 +1,20 @@
+--- a/cmake/Functions.cmake
++++ b/cmake/Functions.cmake
+@@ -622,6 +622,8 @@ function(get_gn_arch result arch)
+         set(${result} "mipsel" PARENT_SCOPE)
+     elseif(arch STREQUAL "mipsel64")
+         set(${result} "mips64el" PARENT_SCOPE)
++    elseif(arch STREQUAL "power64")
++        set(${result} "power64" PARENT_SCOPE)
+     else()
+         message(DEBUG "Unsupported architecture: ${arch}")
+     endif()
+@@ -641,6 +643,8 @@ function(get_v8_arch result targetArch h
+             set(${result} "mipsel" PARENT_SCOPE)
+         elseif(hostArch STREQUAL "mipsel64")
+             set(${result} "mipsel" PARENT_SCOPE)
++        elseif(hostArch STREQUAL "power64")
++            set(${result} "power64" PARENT_SCOPE)
+         else()
+             message(DEBUG "Unsupported architecture: ${hostArch}")
+         endif()
diff --git a/srcpkgs/qt6-webengine/patches/0003-cross-hack.patch b/srcpkgs/qt6-webengine/patches/0003-cross-hack.patch
new file mode 100644
index 000000000000..ea9f90094a63
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0003-cross-hack.patch
@@ -0,0 +1,10 @@
+--- a/src/core/api/CMakeLists.txt
++++ b/src/core/api/CMakeLists.txt
+@@ -50,6 +50,7 @@ qt_internal_add_module(WebEngineCore
+         Qt::Gui
+         Qt::Network
+         Qt::Quick
++        X11
+ )
+ 
+ set_target_properties(WebEngineCore PROPERTIES QTWEBENGINEPROCESS_NAME ${qtWebEngineProcessName})
diff --git a/srcpkgs/qt6-webengine/patches/0004-ppc-disable-jxl-decoder.patch b/srcpkgs/qt6-webengine/patches/0004-ppc-disable-jxl-decoder.patch
new file mode 100644
index 000000000000..73c1151968f4
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0004-ppc-disable-jxl-decoder.patch
@@ -0,0 +1,13 @@
+--- a/src/core/CMakeLists.txt
++++ b/src/core/CMakeLists.txt
+@@ -414,6 +414,10 @@ foreach(arch ${archs})
+                 CONDITION QT_FEATURE_webengine_ozone_x11 AND XSCRNSAVER_FOUND
+             )
+ 
++            if (cpu STREQUAL "ppc64")
++                list(APPEND gnArgArg enable_jxl_decoder=false)
++            endif()
++
+             if(QT_FEATURE_webengine_kerberos)
+                 list(APPEND gnArgArg
+                      external_gssapi_include_dir="${GSSAPI_INCLUDE_DIRS}/gssapi"
diff --git a/srcpkgs/qt6-webengine/patches/0050-no-glibc-cmake-check.patch b/srcpkgs/qt6-webengine/patches/0050-no-glibc-cmake-check.patch
new file mode 100644
index 000000000000..f756bf0286bb
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0050-no-glibc-cmake-check.patch
@@ -0,0 +1,14 @@
+--- a/configure.cmake
++++ b/configure.cmake
+@@ -499,11 +499,6 @@ add_check_for_support(
+ )
+ add_check_for_support(
+    MODULES QtWebEngine QtPdf
+-   CONDITION NOT LINUX OR TEST_glibc
+-   MESSAGE "A suitable version >= 2.17 of glibc is required."
+-)
+-add_check_for_support(
+-   MODULES QtWebEngine QtPdf
+    CONDITION NOT LINUX OR TEST_khr
+    MESSAGE "Build requires Khronos development headers for build - see mesa/libegl1-mesa-dev"
+ )
diff --git a/srcpkgs/qt6-webengine/patches/0100-chromium-sandbox-membarrier.patch b/srcpkgs/qt6-webengine/patches/0100-chromium-sandbox-membarrier.patch
new file mode 100644
index 000000000000..2dd7b4aa948f
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0100-chromium-sandbox-membarrier.patch
@@ -0,0 +1,58 @@
+--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
++++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
+@@ -413,6 +413,7 @@ bool SyscallSets::IsAllowedProcessStartO
+   switch (sysno) {
+     case __NR_exit:
+     case __NR_exit_group:
++    case __NR_membarrier:
+     case __NR_wait4:
+     case __NR_waitid:
+ #if defined(__i386__)
+--- a/src/3rdparty/chromium/sandbox/linux/system_headers/arm64_linux_syscalls.h
++++ b/src/3rdparty/chromium/sandbox/linux/system_headers/arm64_linux_syscalls.h
+@@ -1215,4 +1215,8 @@
+ #define __NR_landlock_restrict_self 446
+ #endif
+ 
++#if !defined(__NR_membarrier)
++#define __NR_membarrier 283
++#endif
++
+ #endif  // SANDBOX_LINUX_SYSTEM_HEADERS_ARM64_LINUX_SYSCALLS_H_
+--- a/src/3rdparty/chromium/sandbox/linux/system_headers/arm_linux_syscalls.h
++++ b/src/3rdparty/chromium/sandbox/linux/system_headers/arm_linux_syscalls.h
+@@ -1617,6 +1617,10 @@
+ #define __NR_landlock_restrict_self (__NR_SYSCALL_BASE + 446)
+ #endif
+ 
++#if !defined(__NR_membarrier)
++#define __NR_membarrier (__NR_SYSCALL_BASE+389)
++#endif
++
+ // ARM private syscalls.
+ #if !defined(__ARM_NR_BASE)
+ #define __ARM_NR_BASE (__NR_SYSCALL_BASE + 0xF0000)
+--- a/src/3rdparty/chromium/sandbox/linux/system_headers/x86_32_linux_syscalls.h
++++ b/src/3rdparty/chromium/sandbox/linux/system_headers/x86_32_linux_syscalls.h
+@@ -1750,5 +1750,9 @@
+ #define __NR_landlock_restrict_self 446
+ #endif
+ 
++#if !defined(__NR_membarrier)
++#define __NR_membarrier 375
++#endif
++
+ #endif  // SANDBOX_LINUX_SYSTEM_HEADERS_X86_32_LINUX_SYSCALLS_H_
+ 
+--- a/src/3rdparty/chromium/sandbox/linux/system_headers/x86_64_linux_syscalls.h
++++ b/src/3rdparty/chromium/sandbox/linux/system_headers/x86_64_linux_syscalls.h
+@@ -1438,5 +1438,9 @@
+ #define __NR_landlock_restrict_self 446
+ #endif
+ 
++#if !defined(__NR_membarrier)
++#define __NR_membarrier 324
++#endif
++
+ #endif  // SANDBOX_LINUX_SYSTEM_HEADERS_X86_64_LINUX_SYSCALLS_H_
+ 
diff --git a/srcpkgs/qt6-webengine/patches/0101-size_t.patch b/srcpkgs/qt6-webengine/patches/0101-size_t.patch
new file mode 100644
index 000000000000..fccc085da311
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0101-size_t.patch
@@ -0,0 +1,16 @@
+--- a/src/3rdparty/chromium/third_party/angle/include/platform/PlatformMethods.h
++++ b/src/3rdparty/chromium/third_party/angle/include/platform/PlatformMethods.h
+@@ -239,11 +239,11 @@ inline void DefaultOverrideFeaturesMtl(P
+ using ProgramKeyType   = std::array<uint8_t, 20>;
+ using CacheProgramFunc = void (*)(PlatformMethods *platform,
+                                   const ProgramKeyType &key,
+-                                  size_t programSize,
++                                  std::size_t programSize,
+                                   const uint8_t *programBytes);
+ inline void DefaultCacheProgram(PlatformMethods *platform,
+                                 const ProgramKeyType &key,
+-                                size_t programSize,
++                                std::size_t programSize,
+                                 const uint8_t *programBytes)
+ {}
+ 
diff --git a/srcpkgs/qt6-webengine/patches/0102-chromium-90-ruy-include.patch b/srcpkgs/qt6-webengine/patches/0102-chromium-90-ruy-include.patch
new file mode 100644
index 000000000000..bbba579076d6
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0102-chromium-90-ruy-include.patch
@@ -0,0 +1,19 @@
+From 714092f336bb14d2fcc27396ec323b3d843bb962 Mon Sep 17 00:00:00 2001
+From: Stephan Hartmann <stha09@googlemail.com>
+Date: Thu, 4 Mar 2021 15:05:46 +0000
+Subject: [PATCH] IWYU: include limits for std::numeric_limits
+
+---
+ third_party/ruy/src/ruy/block_map.cc | 1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/src/3rdparty/chromium/third_party/ruy/src/ruy/block_map.cc
++++ b/src/3rdparty/chromium/third_party/ruy/src/ruy/block_map.cc
+@@ -17,6 +17,7 @@ limitations under the License.
+ 
+ #include <algorithm>
+ #include <cstdint>
++#include <limits>
+ 
+ #ifdef RUY_MAKEBLOCKMAP_DEBUG
+ #include <cstdio>
diff --git a/srcpkgs/qt6-webengine/patches/0103-chromium-v8-monotonic-pthread-cont_timedwait.patch b/srcpkgs/qt6-webengine/patches/0103-chromium-v8-monotonic-pthread-cont_timedwait.patch
new file mode 100644
index 000000000000..1dc8bc4d3d17
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0103-chromium-v8-monotonic-pthread-cont_timedwait.patch
@@ -0,0 +1,22 @@
+Use monotonic clock for pthread_cond_timedwait with musl too.
+
+--- a/src/3rdparty/chromium/v8/src/base/platform/condition-variable.cc
++++ b/src/3rdparty/chromium/v8/src/base/platform/condition-variable.cc
+@@ -20,7 +20,7 @@ namespace base {
+ 
+ ConditionVariable::ConditionVariable() {
+ #if (V8_OS_FREEBSD || V8_OS_NETBSD || V8_OS_OPENBSD || \
+-     (V8_OS_LINUX && V8_LIBC_GLIBC))
++     V8_OS_LINUX)
+   // On Free/Net/OpenBSD and Linux with glibc we can change the time
+   // source for pthread_cond_timedwait() to use the monotonic clock.
+   pthread_condattr_t attr;
+@@ -96,7 +96,7 @@ bool ConditionVariable::WaitFor(Mutex* m
+       &native_handle_, &mutex->native_handle(), &ts);
+ #else
+ #if (V8_OS_FREEBSD || V8_OS_NETBSD || V8_OS_OPENBSD || \
+-     (V8_OS_LINUX && V8_LIBC_GLIBC))
++     V8_OS_LINUX)
+   // On Free/Net/OpenBSD and Linux with glibc we can change the time
+   // source for pthread_cond_timedwait() to use the monotonic clock.
+   result = clock_gettime(CLOCK_MONOTONIC, &ts);
diff --git a/srcpkgs/qt6-webengine/patches/0104-chromium-revert-9d080c0.patch b/srcpkgs/qt6-webengine/patches/0104-chromium-revert-9d080c0.patch
new file mode 100644
index 000000000000..42b1ee9ec063
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0104-chromium-revert-9d080c0.patch
@@ -0,0 +1,162 @@
+ Original change's description:
+ > Replace 'blacklist' with 'ignorelist' in ./tools/msan/.
+ >
+ > Bug: 1097272, 1097268
+ > Change-Id: Id5c8227a5bfb1ffaec82d3168b609085b10c8297
+ > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2867730
+ > Commit-Queue: Dylan Cutler <dylancutler@google.com>
+ > Reviewed-by: Nico Weber <thakis@chromium.org>
+ > Reviewed-by: Jonathan Metzman <metzman@chromium.org>
+ > Cr-Commit-Position: refs/heads/master@{#883035}
+--- a/src/3rdparty/chromium/build/config/sanitizers/BUILD.gn
++++ b/src/3rdparty/chromium/build/config/sanitizers/BUILD.gn
+@@ -272,11 +272,11 @@ config("asan_flags") {
+   if (is_asan) {
+     cflags += [ "-fsanitize=address" ]
+     if (is_win) {
+-      if (!defined(asan_win_blocklist_path)) {
+-        asan_win_blocklist_path =
++      if (!defined(asan_win_blacklist_path)) {
++        asan_win_blacklist_path =
+             rebase_path("//tools/memory/asan/blocklist_win.txt", root_build_dir)
+       }
+-      cflags += [ "-fsanitize-ignorelist=$asan_win_blocklist_path" ]
++      cflags += [ "-fsanitize-blacklist=$asan_win_blacklist_path" ]
+     }
+   }
+ }
+@@ -306,13 +306,13 @@ config("link_shared_library") {
+ config("cfi_flags") {
+   cflags = []
+   if (is_cfi && current_toolchain == default_toolchain) {
+-    if (!defined(cfi_ignorelist_path)) {
+-      cfi_ignorelist_path =
++    if (!defined(cfi_blacklist_path)) {
++      cfi_blacklist_path =
+           rebase_path("//tools/cfi/ignores.txt", root_build_dir)
+     }
+     cflags += [
+       "-fsanitize=cfi-vcall",
+-      "-fsanitize-ignorelist=$cfi_ignorelist_path",
++      "-fsanitize-blacklist=$cfi_blacklist_path",
+     ]
+ 
+     if (use_cfi_cast) {
+@@ -409,14 +409,14 @@ config("msan_flags") {
+   if (is_msan) {
+     assert(is_linux || is_chromeos,
+            "msan only supported on linux x86_64/ChromeOS")
+-    if (!defined(msan_ignorelist_path)) {
+-      msan_ignorelist_path =
+-          rebase_path("//tools/msan/ignorelist.txt", root_build_dir)
++    if (!defined(msan_blacklist_path)) {
++      msan_blacklist_path =
++          rebase_path("//tools/msan/blacklist.txt", root_build_dir)
+     }
+     cflags = [
+       "-fsanitize=memory",
+       "-fsanitize-memory-track-origins=$msan_track_origins",
+-      "-fsanitize-ignorelist=$msan_ignorelist_path",
++      "-fsanitize-blacklist=$msan_blacklist_path",
+     ]
+   }
+ }
+@@ -424,13 +424,13 @@ config("msan_flags") {
+ config("tsan_flags") {
+   if (is_tsan) {
+     assert(is_linux || is_chromeos, "tsan only supported on linux x86_64")
+-    if (!defined(tsan_ignorelist_path)) {
+-      tsan_ignorelist_path =
++    if (!defined(tsan_blacklist_path)) {
++      tsan_blacklist_path =
+           rebase_path("//tools/memory/tsan_v2/ignores.txt", root_build_dir)
+     }
+     cflags = [
+       "-fsanitize=thread",
+-      "-fsanitize-ignorelist=$tsan_ignorelist_path",
++      "-fsanitize-blacklist=$tsan_blacklist_path",
+     ]
+   }
+ }
+@@ -438,8 +438,8 @@ config("tsan_flags") {
+ config("ubsan_flags") {
+   cflags = []
+   if (is_ubsan) {
+-    if (!defined(ubsan_ignorelist_path)) {
+-      ubsan_ignorelist_path =
++    if (!defined(ubsan_blacklist_path)) {
++      ubsan_blacklist_path =
+           rebase_path("//tools/ubsan/ignorelist.txt", root_build_dir)
+     }
+     cflags += [
+@@ -456,7 +456,7 @@ config("ubsan_flags") {
+       "-fsanitize=signed-integer-overflow",
+       "-fsanitize=unreachable",
+       "-fsanitize=vla-bound",
+-      "-fsanitize-ignorelist=$ubsan_ignorelist_path",
++      "-fsanitize-blacklist=$ubsan_blacklist_path",
+     ]
+     if (!is_clang) {
+       # These exposes too much illegal C++14 code to compile on anything stricter than clang:
+@@ -497,8 +497,8 @@ config("ubsan_no_recover") {
+ 
+ config("ubsan_security_flags") {
+   if (is_ubsan_security) {
+-    if (!defined(ubsan_security_ignorelist_path)) {
+-      ubsan_security_ignorelist_path =
++    if (!defined(ubsan_security_blacklist_path)) {
++      ubsan_security_blacklist_path =
+           rebase_path("//tools/ubsan/security_ignorelist.txt", root_build_dir)
+     }
+     cflags = [
+@@ -506,7 +506,7 @@ config("ubsan_security_flags") {
+       "-fsanitize=shift",
+       "-fsanitize=signed-integer-overflow",
+       "-fsanitize=vla-bound",
+-      "-fsanitize-ignorelist=$ubsan_security_ignorelist_path",
++      "-fsanitize-blacklist=$ubsan_security_blacklist_path",
+     ]
+   }
+ }
+@@ -519,13 +519,13 @@ config("ubsan_null_flags") {
+ 
+ config("ubsan_vptr_flags") {
+   if (is_ubsan_vptr) {
+-    if (!defined(ubsan_vptr_ignorelist_path)) {
+-      ubsan_vptr_ignorelist_path =
++    if (!defined(ubsan_vptr_blacklist_path)) {
++      ubsan_vptr_blacklist_path =
+           rebase_path("//tools/ubsan/vptr_ignorelist.txt", root_build_dir)
+     }
+     cflags = [
+       "-fsanitize=vptr",
+-      "-fsanitize-ignorelist=$ubsan_vptr_ignorelist_path",
++      "-fsanitize-blacklist=$ubsan_vptr_blacklist_path",
+     ]
+     if (!is_clang) {
+       # Clang specific flag:
+--- a/src/3rdparty/chromium/build_overrides/build.gni
++++ b/src/3rdparty/chromium/build_overrides/build.gni
+@@ -43,15 +43,15 @@ declare_args() {
+ # Allows different projects to specify their own suppression/ignore lists for
+ # sanitizer tools.
+ # asan_suppressions_file = "path/to/asan_suppressions.cc"
+-# asan_win_ignorelist_path = "path/to/asan/blocklist_win.txt"
++# asan_win_blacklist_path = "path/to/asan/blocklist_win.txt"
+ # lsan_suppressions_file = "path/to/lsan_suppressions.cc"
+ # tsan_suppressions_file = "path/to/tsan_suppressions.cc"
+-# tsan_ignorelist_path = "path/to/tsan/ignores.txt"
+-# msan_ignorelist_path = "path/to/msan/ignorelist.txt"
+-# ubsan_ignorelist_path = "path/to/ubsan/ignorelist.txt"
+-# ubsan_vptr_ignorelist_path = "path/to/ubsan/vptr_ignorelist.txt"
+-# ubsan_security_ignorelist_path = "path/to/ubsan/security_ignorelist.txt"
+-# cfi_ignorelist_path = "path/to/cfi/ignores.txt"
++# tsan_blacklist_path = "path/to/tsan/ignores.txt"
++# msan_blacklist_path = "path/to/msan/blacklist.txt"
++# ubsan_blacklist_path = "path/to/ubsan/blacklist.txt"
++# ubsan_vptr_blacklist_path = "path/to/ubsan/vptr_blacklist.txt"
++# ubsan_security_blacklist_path = "path/to/ubsan/security_blacklist.txt"
++# cfi_blacklist_path = "path/to/cfi/ignores.txt"
+ 
+ declare_args() {
+   # Android 32-bit non-component, non-clang builds cannot have symbol_level=2
diff --git a/srcpkgs/qt6-webengine/patches/0105-chromium-revert-drop-of-system-java.patch b/srcpkgs/qt6-webengine/patches/0105-chromium-revert-drop-of-system-java.patch
new file mode 100644
index 000000000000..44f3aa8fae5e
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0105-chromium-revert-drop-of-system-java.patch
@@ -0,0 +1,15 @@
+This was dropped for some reason in 6951c37cecd05979b232a39e5c10e6346a0f74ef
+--- a/src/3rdparty/chromium/third_party/closure_compiler/compiler.py
++++ b/src/3rdparty/chromium/third_party/closure_compiler/compiler.py
+@@ -13,8 +13,9 @@ import subprocess
+ 
+ 
+ _CURRENT_DIR = os.path.join(os.path.dirname(__file__))
+-_JAVA_PATH = os.path.join(_CURRENT_DIR, "..", "jdk", "current", "bin", "java")
+-assert os.path.isfile(_JAVA_PATH), "java only allowed in android builds"
++_JAVA_BIN = "java"
++_JDK_PATH = os.path.join(_CURRENT_DIR, "..", "jdk", "current", "bin", "java")
++_JAVA_PATH = _JDK_PATH if os.path.isfile(_JDK_PATH) else _JAVA_BIN
+ 
+ class Compiler(object):
+   """Runs the Closure compiler on given source files to typecheck them
diff --git a/srcpkgs/qt6-webengine/patches/0106-chromium-system-nodejs.patch b/srcpkgs/qt6-webengine/patches/0106-chromium-system-nodejs.patch
new file mode 100644
index 000000000000..1e067cc6eda0
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0106-chromium-system-nodejs.patch
@@ -0,0 +1,20 @@
+--- a/src/3rdparty/chromium/third_party/node/node.py
++++ b/src/3rdparty/chromium/third_party/node/node.py
+@@ -36,11 +36,12 @@ def GetBinaryPath():
+   if platform.system() == 'Darwin' and platform.machine() == 'arm64':
+       return os.path.join(os_path.join(os_path.dirname(__file__), 'mac',
+                           'node-darwin-arm64', 'bin', 'node'))
+-  return os_path.join(os_path.dirname(__file__), *{
+-    'Darwin': ('mac', 'node-darwin-x64', 'bin', 'node'),
+-    'Linux': ('linux', 'node-linux-x64', 'bin', 'node'),
+-    'Windows': ('win', 'node.exe'),
+-  }[platform.system()])
++  return "/usr/bin/node"
++  #return os_path.join(os_path.dirname(__file__), *{
++  #  'Darwin': ('mac', 'node-darwin-x64', 'bin', 'node'),
++  #  'Linux': ('linux', 'node-linux-x64', 'bin', 'node'),
++  #  'Windows': ('win', 'node.exe'),
++  #}[platform.system()])
+ 
+ 
+ def RunNode(cmd_parts, stdout=None):
diff --git a/srcpkgs/qt6-webengine/patches/0107-chromium-cursed^Uscoped_file.patch b/srcpkgs/qt6-webengine/patches/0107-chromium-cursed^Uscoped_file.patch
new file mode 100644
index 000000000000..a8f5d971883d
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0107-chromium-cursed^Uscoped_file.patch
@@ -0,0 +1,18 @@
+--- a/src/3rdparty/chromium/base/files/scoped_file_linux.cc
++++ b/src/3rdparty/chromium/base/files/scoped_file_linux.cc
+@@ -77,15 +77,3 @@ bool IsFDOwned(int fd) {
+ }
+ 
+ }  // namespace base
+-
+-extern "C" {
+-
+-int __close(int);
+-
+-__attribute__((visibility("default"), noinline)) int close(int fd) {
+-  if (base::IsFDOwned(fd) && g_is_ownership_enforced)
+-    CrashOnFdOwnershipViolation();
+-  return __close(fd);
+-}
+-
+-}  // extern "C"
diff --git a/srcpkgs/qt6-webengine/patches/0108-chromium-fix-narrowing-cast.patch b/srcpkgs/qt6-webengine/patches/0108-chromium-fix-narrowing-cast.patch
new file mode 100644
index 000000000000..ed32cd9b7415
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0108-chromium-fix-narrowing-cast.patch
@@ -0,0 +1,53 @@
+--- a/src/3rdparty/chromium/base/files/file_util_linux.cc
++++ b/src/3rdparty/chromium/base/files/file_util_linux.cc
+@@ -23,14 +23,14 @@ bool GetFileSystemType(const FilePath& p
+ 
+   // Not all possible |statfs_buf.f_type| values are in linux/magic.h.
+   // Missing values are copied from the statfs man page.
+-  switch (statfs_buf.f_type) {
++  switch (static_cast<uintmax_t>(statfs_buf.f_type)) {
+     case 0:
+       *type = FILE_SYSTEM_0;
+       break;
+     case EXT2_SUPER_MAGIC:  // Also ext3 and ext4
+     case MSDOS_SUPER_MAGIC:
+     case REISERFS_SUPER_MAGIC:
+-    case static_cast<int>(BTRFS_SUPER_MAGIC):
++    case BTRFS_SUPER_MAGIC:
+     case 0x5346544E:  // NTFS
+     case 0x58465342:  // XFS
+     case 0x3153464A:  // JFS
+@@ -40,14 +40,14 @@ bool GetFileSystemType(const FilePath& p
+       *type = FILE_SYSTEM_NFS;
+       break;
+     case SMB_SUPER_MAGIC:
+-    case static_cast<int>(0xFF534D42):  // CIFS
++    case 0xFF534D42:  // CIFS
+       *type = FILE_SYSTEM_SMB;
+       break;
+     case CODA_SUPER_MAGIC:
+       *type = FILE_SYSTEM_CODA;
+       break;
+-    case static_cast<int>(HUGETLBFS_MAGIC):
+-    case static_cast<int>(RAMFS_MAGIC):
++    case HUGETLBFS_MAGIC:
++    case RAMFS_MAGIC:
+     case TMPFS_MAGIC:
+       *type = FILE_SYSTEM_MEMORY;
+       break;
+--- a/src/3rdparty/chromium/base/system/sys_info_posix.cc
++++ b/src/3rdparty/chromium/base/system/sys_info_posix.cc
+@@ -100,10 +100,10 @@ bool IsStatsZeroIfUnlimited(const base::
+   if (HANDLE_EINTR(statfs(path.value().c_str(), &stats)) != 0)
+     return false;
+ 
+-  switch (stats.f_type) {
++  switch (static_cast<uintmax_t>(stats.f_type)) {
+     case TMPFS_MAGIC:
+-    case static_cast<int>(HUGETLBFS_MAGIC):
+-    case static_cast<int>(RAMFS_MAGIC):
++    case HUGETLBFS_MAGIC:
++    case RAMFS_MAGIC:
+       return true;
+   }
+   return false;
diff --git a/srcpkgs/qt6-webengine/patches/0109-chromium-remove-strip_binary.patch b/srcpkgs/qt6-webengine/patches/0109-chromium-remove-strip_binary.patch
new file mode 100644
index 000000000000..5ebd16e659af
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0109-chromium-remove-strip_binary.patch
@@ -0,0 +1,32 @@
+--- a/src/3rdparty/chromium/chrome/test/chromedriver/BUILD.gn
++++ b/src/3rdparty/chromium/chrome/test/chromedriver/BUILD.gn
+@@ -308,11 +308,7 @@ source_set("lib") {
+   }
+ }
+ 
+-if (is_linux) {
+-  chromedriver_output = "chromedriver.unstripped"
+-} else {
+-  chromedriver_output = "chromedriver"
+-}
++chromedriver_output = "chromedriver"
+ 
+ executable("$chromedriver_output") {
+   testonly = true
+@@ -336,16 +332,6 @@ executable("$chromedriver_output") {
+   }
+ }
+ 
+-if (is_linux) {
+-  strip_binary("chromedriver") {
+-    testonly = true
+-    binary_input = "$root_out_dir/$chromedriver_output"
+-    symbol_output = "$root_out_dir/chromedriver.debug"
+-    stripped_binary_output = "$root_out_dir/chromedriver"
+-    deps = [ ":$chromedriver_output" ]
+-  }
+-}
+-
+ python_library("chromedriver_py_tests") {
+   testonly = true
+   deps = [
diff --git a/srcpkgs/qt6-webengine/patches/0110-chromium-revert-use-ffile-compilation-dir.patch b/srcpkgs/qt6-webengine/patches/0110-chromium-revert-use-ffile-compilation-dir.patch
new file mode 100644
index 000000000000..a00f7ea80f7a
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0110-chromium-revert-use-ffile-compilation-dir.patch
@@ -0,0 +1,57 @@
+From 34a955823630096f5b01c2b01d51c1ea59d22763 Mon Sep 17 00:00:00 2001
+From: Zequan Wu <zequanwu@google.com>
+Date: Tue, 20 Jul 2021 14:13:50 +0000
+Subject: [PATCH] Use -ffile-compilation-dir= instead of
+ -fdebug-compilation-dir=
+
+Bug: 1010267
+Change-Id: If2b4ead8535a76490eb466a38e3d8fed6ea91079
+Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2770738
+Auto-Submit: Zequan Wu <zequanwu@google.com>
+Commit-Queue: Nico Weber <thakis@chromium.org>
+Reviewed-by: Nico Weber <thakis@chromium.org>
+Cr-Commit-Position: refs/heads/master@{#903456}
+--- a/src/3rdparty/chromium/build/config/compiler/BUILD.gn
++++ b/src/3rdparty/chromium/build/config/compiler/BUILD.gn
+@@ -1269,19 +1269,12 @@ config("compiler_deterministic") {
+     # different build directory like "out/feature_a" and "out/feature_b" if
+     # we build same files with same compile flag.
+     # Other paths are already given in relative, no need to normalize them.
+-    if (is_nacl) {
+-      # TODO(https://crbug.com/1231236): Use -ffile-compilation-dir= here.
+-      cflags += [
+-        "-Xclang",
+-        "-fdebug-compilation-dir",
+-        "-Xclang",
+-        ".",
+-      ]
+-    } else {
+-      # -ffile-compilation-dir is an alias for both -fdebug-compilation-dir=
+-      # and -fcoverage-compilation-dir=.
+-      cflags += [ "-ffile-compilation-dir=." ]
+-    }
++    cflags += [
++      "-Xclang",
++      "-fdebug-compilation-dir",
++      "-Xclang",
++      ".",
++    ]
+     if (!is_win) {
+       # We don't use clang -cc1as on Windows (yet? https://crbug.com/762167)
+       asmflags = [ "-Wa,-fdebug-compilation-dir,." ]
+--- a/src/3rdparty/chromium/build/config/compiler/compiler.gni
++++ b/src/3rdparty/chromium/build/config/compiler/compiler.gni
+@@ -228,8 +228,11 @@ declare_args() {
+ # deterministic builds to reduce compile times, so this is less relevant for
+ # official builders.
+ strip_absolute_paths_from_debug_symbols_default =
+-    is_android || is_fuchsia || is_nacl || (is_win && use_lld) || is_linux ||
+-    is_chromeos || (is_apple && !enable_dsyms)
++    # TODO(crbug.com/1010267): remove '!use_clang_coverage', coverage build has
++    # dependency to absolute path of source files.
++    !use_clang_coverage &&
++    (is_android || is_fuchsia || is_nacl || (is_win && use_lld) || is_linux ||
++     is_chromeos || (is_apple && !enable_dsyms))
+ 
+ declare_args() {
+   strip_absolute_paths_from_debug_symbols = strip_absolute_paths_from_debug_symbols_default
diff --git a/srcpkgs/qt6-webengine/patches/0111-chromium-no-Wno-stringop-overread.patch b/srcpkgs/qt6-webengine/patches/0111-chromium-no-Wno-stringop-overread.patch
new file mode 100644
index 000000000000..03eac3f8e067
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0111-chromium-no-Wno-stringop-overread.patch
@@ -0,0 +1,10 @@
+--- a/src/3rdparty/chromium/build/config/compiler/BUILD.gn
++++ b/src/3rdparty/chromium/build/config/compiler/BUILD.gn
+@@ -394,7 +394,6 @@ config("compiler") {
+         "-Wno-parentheses",
+         "-Wno-sign-compare", # fido
+         "-Wno-stringop-overflow", # skia, libaom, protobuf, icu
+-        "-Wno-stringop-overread", # libaom
+         "-Wno-psabi", # skia
+         "-Wno-multichar", # crashpad
+         "-Wno-format-zero-length", # user_agent.cc
diff --git a/srcpkgs/qt6-webengine/patches/0150-chromium-glibc-libc_malloc.patch b/srcpkgs/qt6-webengine/patches/0150-chromium-glibc-libc_malloc.patch
new file mode 100644
index 000000000000..7e1b66e5c73d
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0150-chromium-glibc-libc_malloc.patch
@@ -0,0 +1,24 @@
+--- a/src/3rdparty/chromium/base/process/memory_linux.cc
++++ b/src/3rdparty/chromium/base/process/memory_linux.cc
+@@ -23,6 +23,12 @@
+ #include "third_party/tcmalloc/chromium/src/gperftools/tcmalloc.h"
+ #endif
+ 
++#if defined(LIBC_GLIBC)
++extern "C" {
++extern void *__libc_malloc(size_t size);
++}
++#endif
++
+ namespace base {
+ 
+ namespace {
+@@ -120,7 +126,7 @@ bool UncheckedMalloc(size_t size, void**
+     (!defined(LIBC_GLIBC) && !BUILDFLAG(USE_TCMALLOC))
+   *result = malloc(size);
+ #elif defined(LIBC_GLIBC) && !BUILDFLAG(USE_TCMALLOC)
+-  *result = __libc_malloc(size);
++  *result = ::__libc_malloc(size);
+ #elif BUILDFLAG(USE_TCMALLOC)
+   *result = tc_malloc_skip_new_handler(size);
+ #endif
diff --git a/srcpkgs/qt6-webengine/patches/0200-chromium-musl-include-sys-reg.h-to-get-__WORDSIZE.patch b/srcpkgs/qt6-webengine/patches/0200-chromium-musl-include-sys-reg.h-to-get-__WORDSIZE.patch
new file mode 100644
index 000000000000..41b90071b5e4
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0200-chromium-musl-include-sys-reg.h-to-get-__WORDSIZE.patch
@@ -0,0 +1,21 @@
+From 9001c54d6b974449174a8cee8f3f5d78a9bd6c9e Mon Sep 17 00:00:00 2001
+From: Felix Janda <felix.janda@posteo.de>
+Date: Sun, 1 Feb 2015 14:26:52 +0100
+Subject: [PATCH 3/6] include <sys/reg.h> to get __WORDSIZE on musl libc
+
+---
+ qtwebengine/src/3rdparty/chromium/third_party/breakpad/breakpad/src/common/linux/elf_core_dump.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/common/linux/elf_core_dump.h
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/common/linux/elf_core_dump.h
+@@ -37,6 +37,9 @@
+ #include <limits.h>
+ #include <link.h>
+ #include <stddef.h>
++#ifndef __GLIBC__
++#include <sys/reg.h>
++#endif
+ 
+ #include "common/memory_range.h"
+ 
diff --git a/srcpkgs/qt6-webengine/patches/0201-chromium-musl-dispatch-to-musl.patch b/srcpkgs/qt6-webengine/patches/0201-chromium-musl-dispatch-to-musl.patch
new file mode 100644
index 000000000000..a58a688a4b55
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0201-chromium-musl-dispatch-to-musl.patch
@@ -0,0 +1,103 @@
+--- a/src/3rdparty/chromium/base/allocator/allocator_shim_default_dispatch_to_glibc.cc
++++ b/src/3rdparty/chromium/base/allocator/allocator_shim_default_dispatch_to_glibc.cc
+@@ -8,6 +8,7 @@
+ #include <dlfcn.h>
+ #include <malloc.h>
+ 
++#if defined(__GLIBC__)
+ // This translation unit defines a default dispatch for the allocator shim which
+ // routes allocations to libc functions.
+ // The code here is strongly inspired from tcmalloc's libc_override_glibc.h.
+@@ -87,3 +88,92 @@ const AllocatorDispatch AllocatorDispatc
+     nullptr,               /* aligned_free_function */
+     nullptr,               /* next */
+ };
++
++#else // defined(__GLIBC__)
++
++#include <dlfcn.h>
++
++extern "C" {
++// Declare function pointers to the memory functions
++typedef void* (*t_libc_malloc)(size_t size);
++typedef void* (*t_libc_calloc)(size_t n, size_t size);
++typedef void* (*t_libc_realloc)(void* address, size_t size);
++typedef void* (*t_libc_memalign)(size_t alignment, size_t size);
++typedef void (*t_libc_free)(void* ptr);
++typedef size_t (*t_libc_malloc_usable_size)(void* ptr);
++
++// Static instances of pointers to libc.so dl symbols
++static t_libc_malloc libc_malloc = NULL;
++static t_libc_calloc libc_calloc = NULL;
++static t_libc_realloc libc_realloc = NULL;
++static t_libc_memalign libc_memalign = NULL;
++static t_libc_free libc_free = NULL;
++static t_libc_malloc_usable_size libc_malloc_usable_size = NULL;
++
++// resolve the symbols in libc.so
++void musl_libc_memory_init(void)
++{
++  libc_malloc = (t_libc_malloc) dlsym(RTLD_NEXT, "malloc");
++  libc_calloc = (t_libc_calloc) dlsym(RTLD_NEXT, "calloc");
++  libc_realloc = (t_libc_realloc) dlsym(RTLD_NEXT, "realloc");
++  libc_memalign = (t_libc_memalign) dlsym(RTLD_NEXT, "memalign");
++  libc_free = (t_libc_free) dlsym(RTLD_NEXT, "free");
++  libc_malloc_usable_size = (t_libc_malloc_usable_size) dlsym(RTLD_NEXT, "malloc_usable_size");
++}
++}  // extern "C"
++
++namespace {
++
++using base::allocator::AllocatorDispatch;
++
++void* MuslMalloc(const AllocatorDispatch*, size_t size, void* context) {
++  if (!libc_malloc)
++    musl_libc_memory_init();
++  return (*libc_malloc)(size);
++}
++
++void* MuslCalloc(const AllocatorDispatch*, size_t n, size_t size, void* context) {
++  if (!libc_calloc)
++    musl_libc_memory_init();
++  return (*libc_calloc)(n, size);
++}
++
++void* MuslRealloc(const AllocatorDispatch*, void* address, size_t size, void* context) {
++  if (!libc_realloc)
++    musl_libc_memory_init();
++  return (*libc_realloc)(address, size);
++}
++
++void* MuslMemalign(const AllocatorDispatch*, size_t alignment, size_t size, void* context) {
++  if (!libc_memalign)
++    musl_libc_memory_init();
++  return (*libc_memalign)(alignment, size);
++}
++
++void MuslFree(const AllocatorDispatch*, void* address, void* context) {
++  if (!libc_free)
++    musl_libc_memory_init();
++  (*libc_free)(address);
++}
++
++size_t MuslGetSizeEstimate(const AllocatorDispatch*, void* address, void* context) {
++  // TODO(siggi, primiano): malloc_usable_size may need redirection in the
++  //     presence of interposing shims that divert allocations.
++  if (!libc_malloc_usable_size)
++    musl_libc_memory_init();
++  return (*libc_malloc_usable_size)(address);
++}
++
++}  // namespace
++
++const AllocatorDispatch AllocatorDispatch::default_dispatch = {
++    &MuslMalloc,           /* alloc_function */
++    &MuslCalloc,           /* alloc_zero_initialized_function */
++    &MuslMemalign,         /* alloc_aligned_function */
++    &MuslRealloc,          /* realloc_function */
++    &MuslFree,             /* free_function */
++    &MuslGetSizeEstimate,  /* get_size_estimate_function */
++    nullptr,               /* next */
++};
++
++#endif
diff --git a/srcpkgs/qt6-webengine/patches/0202-chromium-musl-no-mallinfo.patch b/srcpkgs/qt6-webengine/patches/0202-chromium-musl-no-mallinfo.patch
new file mode 100644
index 000000000000..a5bdb5a43a5f
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0202-chromium-musl-no-mallinfo.patch
@@ -0,0 +1,62 @@
+--- a/src/3rdparty/chromium/base/process/process_metrics_posix.cc
++++ b/src/3rdparty/chromium/base/process/process_metrics_posix.cc
+@@ -105,7 +105,7 @@ void IncreaseFdLimitTo(unsigned int max_
+ 
+ #endif  // !defined(OS_FUCHSIA)
+ 
+-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID)
++#if (defined(OS_LINUX) && defined(__GLIBC__)) || defined(OS_CHROMEOS) || defined(OS_ANDROID)
+ namespace {
+ 
+ size_t GetMallocUsageMallinfo() {
+@@ -127,16 +127,16 @@ size_t GetMallocUsageMallinfo() {
+ }
+ 
+ }  // namespace
+-#endif  // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID)
++#endif  // (defined(OS_LINUX) && defined(__GLIBC__)) || defined(OS_CHROMEOS) || defined(OS_ANDROID)
+ 
+ size_t ProcessMetrics::GetMallocUsage() {
+ #if defined(OS_APPLE)
+   malloc_statistics_t stats = {0};
+   malloc_zone_statistics(nullptr, &stats);
+   return stats.size_in_use;
+-#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID)
++#elif (defined(OS_LINUX) && defined(__GLIBC__)) || defined(OS_CHROMEOS) || defined(OS_ANDROID)
+   return GetMallocUsageMallinfo();
+-#elif defined(OS_FUCHSIA)
++#else
+   // TODO(fuchsia): Not currently exposed. https://crbug.com/735087.
+   return 0;
+ #endif
+--- a/src/3rdparty/chromium/third_party/tflite/src/tensorflow/lite/profiling/memory_info.cc
++++ b/src/3rdparty/chromium/third_party/tflite/src/tensorflow/lite/profiling/memory_info.cc
+@@ -27,7 +27,7 @@ namespace memory {
+ const int MemoryUsage::kValueNotSet = 0;
+ 
+ bool MemoryUsage::IsSupported() {
+-#ifdef __linux__
++#ifdef __GLIBC__
+   return true;
+ #endif
+   return false;
+@@ -35,7 +35,7 @@ bool MemoryUsage::IsSupported() {
+ 
+ MemoryUsage GetMemoryUsage() {
+   MemoryUsage result;
+-#ifdef __linux__
++#ifdef __GLIBC__
+   rusage res;
+   if (getrusage(RUSAGE_SELF, &res) == 0) {
+     result.max_rss_kb = res.ru_maxrss;
+--- a/src/3rdparty/chromium/base/trace_event/malloc_dump_provider.cc
++++ b/src/3rdparty/chromium/base/trace_event/malloc_dump_provider.cc
+@@ -213,7 +213,7 @@ bool MallocDumpProvider::OnMemoryDump(co
+                      &allocated_objects_count);
+ #elif defined(OS_FUCHSIA)
+ // TODO(fuchsia): Port, see https://crbug.com/706592.
+-#else
++#elif defined(__GLIBC__)
+ #if defined(__GLIBC__) && defined(__GLIBC_PREREQ)
+ #if __GLIBC_PREREQ(2, 33)
+ #define MALLINFO2_FOUND_IN_LIBC
diff --git a/srcpkgs/qt6-webengine/patches/0203-chromium-musl-siginfo_t.patch b/srcpkgs/qt6-webengine/patches/0203-chromium-musl-siginfo_t.patch
new file mode 100644
index 000000000000..43ef7fd7c5d2
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0203-chromium-musl-siginfo_t.patch
@@ -0,0 +1,18 @@
+There's a subtle difference in the internal name of siginfo_t fields
+between glibc and musl. The structure itself is equivalent, so it
+should suffice to add a macro to rename the field.
+
+--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf/trap.cc
++++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf/trap.cc
+@@ -174,7 +174,11 @@ void Trap::SigSys(int nr, LinuxSigInfo*
+   // If the version of glibc doesn't include this information in
+   // siginfo_t (older than 2.17), we need to explicitly copy it
+   // into an arch_sigsys structure.
++#if defined(__GLIBC__)
+   memcpy(&sigsys, &info->_sifields, sizeof(sigsys));
++#else
++  memcpy(&sigsys, &info->__si_fields, sizeof(sigsys));
++#endif
+ #endif
+ 
+ #if defined(__mips__)
diff --git a/srcpkgs/qt6-webengine/patches/0204-chromium-musl-stackstart.patch b/srcpkgs/qt6-webengine/patches/0204-chromium-musl-stackstart.patch
new file mode 100644
index 000000000000..b03cf43b86db
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0204-chromium-musl-stackstart.patch
@@ -0,0 +1,20 @@
+--- a/src/3rdparty/chromium/third_party/blink/renderer/platform/wtf/stack_util.cc
++++ b/src/3rdparty/chromium/third_party/blink/renderer/platform/wtf/stack_util.cc
+@@ -29,7 +29,7 @@ size_t GetUnderestimatedStackSize() {
+ // FIXME: On Mac OSX and Linux, this method cannot estimate stack size
+ // correctly for the main thread.
+ 
+-#elif defined(__GLIBC__) || defined(OS_ANDROID) || defined(OS_FREEBSD) || \
++#elif defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FREEBSD) || \
+     defined(OS_FUCHSIA)
+   // pthread_getattr_np() can fail if the thread is not invoked by
+   // pthread_create() (e.g., the main thread of blink_unittests).
+@@ -97,7 +97,7 @@ return Threading::ThreadStackSize();
+ }
+ 
+ void* GetStackStart() {
+-#if defined(__GLIBC__) || defined(OS_ANDROID) || defined(OS_FREEBSD) || \
++#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FREEBSD) || \
+     defined(OS_FUCHSIA)
+   pthread_attr_t attr;
+   int error;
diff --git a/srcpkgs/qt6-webengine/patches/0205-chromium-musl-sandbox.patch b/srcpkgs/qt6-webengine/patches/0205-chromium-musl-sandbox.patch
new file mode 100644
index 000000000000..772a578fd823
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0205-chromium-musl-sandbox.patch
@@ -0,0 +1,92 @@
+--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc
++++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc
+@@ -138,7 +138,7 @@ namespace sandbox {
+ // present (as in newer versions of posix_spawn).
+ ResultExpr RestrictCloneToThreadsAndEPERMFork() {
+   const Arg<unsigned long> flags(0);
+-
++#if defined(__GLIBC__)
+   // TODO(mdempsky): Extend DSL to support (flags & ~mask1) == mask2.
+   const uint64_t kAndroidCloneMask = CLONE_VM | CLONE_FS | CLONE_FILES |
+                                      CLONE_SIGHAND | CLONE_THREAD |
+@@ -165,6 +165,17 @@ ResultExpr RestrictCloneToThreadsAndEPER
+   return If(IsAndroid() ? android_test : glibc_test, Allow())
+       .ElseIf(is_fork_or_clone_vfork, Error(EPERM))
+       .Else(CrashSIGSYSClone());
++#else
++  const int required = CLONE_VM | CLONE_FS | CLONE_FILES | CLONE_SIGHAND |
++                       CLONE_THREAD | CLONE_SYSVSEM;
++  const int safe = CLONE_SETTLS | CLONE_PARENT_SETTID | CLONE_CHILD_CLEARTID |
++                   CLONE_DETACHED;
++  const BoolExpr thread_clone_ok = (flags&~safe)==required;
++
++  return If(thread_clone_ok, Allow())
++      .ElseIf((flags & (CLONE_VM | CLONE_THREAD)) == 0, Error(EPERM))
++      .Else(CrashSIGSYSClone());
++#endif
+ }
+ 
+ #ifndef PR_PAC_RESET_KEYS
+--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
++++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
+@@ -419,6 +419,9 @@ bool SyscallSets::IsAllowedProcessStartO
+ #if defined(__i386__)
+     case __NR_waitpid:
+ #endif
++#if !defined(__GLIBC__)
++    case __NR_set_tid_address:
++#endif
+       return true;
+     case __NR_clone:  // Should be parameter-restricted.
+     case __NR_setns:  // Privileged.
+@@ -431,7 +434,9 @@ bool SyscallSets::IsAllowedProcessStartO
+ #if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
+     case __NR_set_thread_area:
+ #endif
++#if defined(__GLIBC__)
+     case __NR_set_tid_address:
++#endif
+     case __NR_unshare:
+ #if !defined(__mips__) && !defined(__aarch64__)
+     case __NR_vfork:
+@@ -545,6 +550,9 @@ bool SyscallSets::IsAllowedAddressSpaceA
+     case __NR_mlock:
+     case __NR_munlock:
+     case __NR_munmap:
++#if !defined(__GLIBC__)
++    case __NR_mremap:
++#endif
+       return true;
+     case __NR_madvise:
+     case __NR_mincore:
+@@ -562,7 +570,9 @@ bool SyscallSets::IsAllowedAddressSpaceA
+     case __NR_modify_ldt:
+ #endif
+     case __NR_mprotect:
++#if defined(__GLIBC__)
+     case __NR_mremap:
++#endif
+     case __NR_msync:
+     case __NR_munlockall:
+     case __NR_readahead:
+--- a/src/3rdparty/chromium/sandbox/policy/linux/bpf_renderer_policy_linux.cc
++++ b/src/3rdparty/chromium/sandbox/policy/linux/bpf_renderer_policy_linux.cc
+@@ -97,11 +97,18 @@ ResultExpr RendererProcessPolicy::Evalua
+     case __NR_sysinfo:
+     case __NR_times:
+     case __NR_uname:
++#if !defined(__GLIBC__)
++    case __NR_sched_getparam:
++    case __NR_sched_getscheduler:
++    case __NR_sched_setscheduler:
++#endif
+       return Allow();
+     case __NR_sched_getaffinity:
++#if defined(__GLIBC__)
+     case __NR_sched_getparam:
+     case __NR_sched_getscheduler:
+     case __NR_sched_setscheduler:
++#endif
+       return RestrictSchedTarget(GetPolicyPid(), sysno);
+     case __NR_prlimit64:
+       // See crbug.com/662450 and setrlimit comment above.
diff --git a/srcpkgs/qt6-webengine/patches/0206-chromium-musl-default-stacksize.patch b/srcpkgs/qt6-webengine/patches/0206-chromium-musl-default-stacksize.patch
new file mode 100644
index 000000000000..bc07495b8144
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0206-chromium-musl-default-stacksize.patch
@@ -0,0 +1,15 @@
+--- a/src/3rdparty/chromium/base/threading/platform_thread_linux.cc
++++ b/src/3rdparty/chromium/base/threading/platform_thread_linux.cc
+@@ -439,7 +439,12 @@ void TerminateOnThread() {}
+ 
+ size_t GetDefaultThreadStackSize(const pthread_attr_t& attributes) {
+ #if !defined(THREAD_SANITIZER)
++#if defined(__GLIBC__)
+   return 0;
++#else // defined(__GLIBC__)
++  // For Musl libc try with a default stack size of 2 MiB
++  return 2 * 1024 * 1024;
++#endif // !defined(__GLIBC__)
+ #else
+   // ThreadSanitizer bloats the stack heavily. Evidence has been that the
+   // default stack size isn't enough for some browser tests.
diff --git a/srcpkgs/qt6-webengine/patches/0207-chromium-musl-cross-no-asm_ptrace_h.patch b/srcpkgs/qt6-webengine/patches/0207-chromium-musl-cross-no-asm_ptrace_h.patch
new file mode 100644
index 000000000000..3cf132908af4
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0207-chromium-musl-cross-no-asm_ptrace_h.patch
@@ -0,0 +1,30 @@
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper.cc
+@@ -38,7 +38,12 @@
+ 
+ #include "client/linux/minidump_writer/linux_ptrace_dumper.h"
+ 
++#if defined(__GLIBC__)
+ #include <asm/ptrace.h>
++#else
++/* For arm*-musl this definition is missing */
++#define ARM_sp uregs[13]
++#endif
+ #include <assert.h>
+ #include <errno.h>
+ #include <fcntl.h>
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_core_dumper.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_core_dumper.cc
+@@ -32,7 +32,12 @@
+ 
+ #include "client/linux/minidump_writer/linux_core_dumper.h"
+ 
++#if defined(__GLIBC__)
+ #include <asm/ptrace.h>
++#else
++/* For arm*-musl this definition is missing */
++#define ARM_sp uregs[13]
++#endif
+ #include <assert.h>
+ #include <elf.h>
+ #include <stdio.h>
diff --git a/srcpkgs/qt6-webengine/patches/0208-chromium-musl-execinfo.patch b/srcpkgs/qt6-webengine/patches/0208-chromium-musl-execinfo.patch
new file mode 100644
index 000000000000..9f3b964676b3
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0208-chromium-musl-execinfo.patch
@@ -0,0 +1,125 @@
+--- a/src/3rdparty/chromium/base/debug/stack_trace.cc
++++ b/src/3rdparty/chromium/base/debug/stack_trace.cc
+@@ -252,7 +252,9 @@ void StackTrace::Print() const {
+ }
+ 
+ void StackTrace::OutputToStream(std::ostream* os) const {
++#if defined(__GLIBC__) && !defined(_AIX)
+   OutputToStreamWithPrefix(os, nullptr);
++#endif
+ }
+ 
+ std::string StackTrace::ToString() const {
+@@ -260,7 +262,7 @@ std::string StackTrace::ToString() const
+ }
+ std::string StackTrace::ToStringWithPrefix(const char* prefix_string) const {
+   std::stringstream stream;
+-#if !defined(__UCLIBC__) && !defined(_AIX)
++#if defined(__GLIBC__) && !defined(_AIX)
+   OutputToStreamWithPrefix(&stream, prefix_string);
+ #endif
+   return stream.str();
+--- a/src/3rdparty/chromium/base/debug/stack_trace_posix.cc
++++ b/src/3rdparty/chromium/base/debug/stack_trace_posix.cc
+@@ -27,7 +27,7 @@
+ #if !defined(USE_SYMBOLIZE)
+ #include <cxxabi.h>
+ #endif
+-#if !defined(__UCLIBC__) && !defined(_AIX)
++#if defined(__GLIBC__) && !defined(_AIX)
+ #include <execinfo.h>
+ #endif
+ 
+@@ -89,7 +89,7 @@ void DemangleSymbols(std::string* text)
+   // Note: code in this function is NOT async-signal safe (std::string uses
+   // malloc internally).
+ 
+-#if !defined(__UCLIBC__) && !defined(_AIX)
++#if defined(__GLIBC__) && !defined(_AIX)
+   std::string::size_type search_from = 0;
+   while (search_from < text->size()) {
+     // Look for the start of a mangled symbol, from search_from.
+@@ -124,7 +124,7 @@ void DemangleSymbols(std::string* text)
+       search_from = mangled_start + 2;
+     }
+   }
+-#endif  // !defined(__UCLIBC__) && !defined(_AIX)
++#endif  // !defined(__GLIBC__) && !defined(_AIX)
+ }
+ #endif  // !defined(USE_SYMBOLIZE)
+ 
+@@ -136,7 +136,7 @@ class BacktraceOutputHandler {
+   virtual ~BacktraceOutputHandler() = default;
+ };
+ 
+-#if !defined(__UCLIBC__) && !defined(_AIX)
++#if defined(__GLIBC__) && !defined(_AIX)
+ void OutputPointer(void* pointer, BacktraceOutputHandler* handler) {
+   // This should be more than enough to store a 64-bit number in hex:
+   // 16 hex digits + 1 for null-terminator.
+@@ -219,7 +219,7 @@ void ProcessBacktrace(void* const* trace
+   }
+ #endif  // defined(USE_SYMBOLIZE)
+ }
+-#endif  // !defined(__UCLIBC__) && !defined(_AIX)
++#endif  // !defined(__GLIBC__) && !defined(_AIX)
+ 
+ void PrintToStderr(const char* output) {
+   // NOTE: This code MUST be async-signal safe (it's used by in-process
+@@ -839,7 +839,7 @@ size_t CollectStackTrace(void** trace, s
+   // If we do not have unwind tables, then try tracing using frame pointers.
+   return base::debug::TraceStackFramePointers(const_cast<const void**>(trace),
+                                               count, 0);
+-#elif !defined(__UCLIBC__) && !defined(_AIX)
++#elif defined(__GLIBC__) && !defined(_AIX)
+   // Though the backtrace API man page does not list any possible negative
+   // return values, we take no chance.
+   return base::saturated_cast<size_t>(backtrace(trace, count));
+@@ -852,13 +852,13 @@ void StackTrace::PrintWithPrefix(const c
+ // NOTE: This code MUST be async-signal safe (it's used by in-process
+ // stack dumping signal handler). NO malloc or stdio is allowed here.
+ 
+-#if !defined(__UCLIBC__) && !defined(_AIX)
++#if defined(__GLIBC__) && !defined(_AIX)
+   PrintBacktraceOutputHandler handler;
+   ProcessBacktrace(trace_, count_, prefix_string, &handler);
+ #endif
+ }
+ 
+-#if !defined(__UCLIBC__) && !defined(_AIX)
++#if defined(__GLIBC__) && !defined(_AIX)
+ void StackTrace::OutputToStreamWithPrefix(std::ostream* os,
+                                           const char* prefix_string) const {
+   StreamBacktraceOutputHandler handler(os);
+--- a/src/3rdparty/chromium/base/logging.cc
++++ b/src/3rdparty/chromium/base/logging.cc
+@@ -582,7 +582,7 @@ LogMessage::LogMessage(const char* file,
+ 
+ LogMessage::~LogMessage() {
+   size_t stack_start = stream_.tellp();
+-#if !defined(OFFICIAL_BUILD) && !defined(OS_NACL) && !defined(__UCLIBC__) && \
++#if !defined(OFFICIAL_BUILD) && !defined(OS_NACL) && defined(__GLIBC__) && \
+     !defined(OS_AIX)
+   if (severity_ == LOGGING_FATAL && !base::debug::BeingDebugged()) {
+     // Include a stack trace on a fatal, unless a debugger is attached.
+--- 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 @@
+ 
+ #if defined(DEBUG) && defined(V8_OS_LINUX) && !defined(V8_OS_ANDROID)
+ #define SYMBOLIZE_FUNCTION
++#if defined(__GLIBC__)
+ #include <execinfo.h>
++#endif
+ 
+ #include <vector>
+ 
+@@ -103,7 +105,7 @@ void ExternalReferenceTable::Init(Isolat
+ }
+ 
+ const char* ExternalReferenceTable::ResolveSymbol(void* address) {
+-#ifdef SYMBOLIZE_FUNCTION
++#if defined(SYMBOLIZE_FUNCTION) && defined(__GLIBC__)
+   char** names = backtrace_symbols(&address, 1);
+   const char* name = names[0];
+   // The array of names is malloc'ed. However, each name string is static
diff --git a/srcpkgs/qt6-webengine/patches/0209-chromium-musl-thread-stacksize.patch b/srcpkgs/qt6-webengine/patches/0209-chromium-musl-thread-stacksize.patch
new file mode 100644
index 000000000000..4b760a428b25
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0209-chromium-musl-thread-stacksize.patch
@@ -0,0 +1,22 @@
+--- a/src/3rdparty/chromium/ppapi/utility/threading/simple_thread.cc
++++ b/src/3rdparty/chromium/ppapi/utility/threading/simple_thread.cc
+@@ -13,7 +13,7 @@ namespace pp {
+ namespace {
+ 
+ // Use 2MB default stack size for Native Client, otherwise use system default.
+-#if defined(__native_client__)
++#if defined(__native_client__) || !defined(__GLIBC__)
+ const size_t kDefaultStackSize = 2 * 1024 * 1024;
+ #else
+ const size_t kDefaultStackSize = 0;
+--- a/src/3rdparty/chromium/v8/src/base/platform/platform-posix.cc
++++ b/src/3rdparty/chromium/v8/src/base/platform/platform-posix.cc
+@@ -883,7 +883,7 @@ bool Thread::Start() {
+ #if V8_OS_MACOSX
+     // Default on Mac OS X is 512kB -- bump up to 1MB
+     stack_size = 1 * 1024 * 1024;
+-#elif V8_OS_AIX
++#elif V8_OS_AIX || !defined(__GLIBC__)
+     // Default on AIX is 96kB -- bump up to 2MB
+     stack_size = 2 * 1024 * 1024;
+ #endif
diff --git a/srcpkgs/qt6-webengine/patches/0210-chromium-musl-msgvec-push_back.patch b/srcpkgs/qt6-webengine/patches/0210-chromium-musl-msgvec-push_back.patch
new file mode 100644
index 000000000000..905daa223700
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0210-chromium-musl-msgvec-push_back.patch
@@ -0,0 +1,14 @@
+--- a/src/3rdparty/chromium/net/socket/udp_socket_posix.cc
++++ b/src/3rdparty/chromium/net/socket/udp_socket_posix.cc
+@@ -1162,7 +1162,11 @@ SendResult UDPSocketPosixSender::Interna
+     msg_iov->push_back({const_cast<char*>(buffer->data()), buffer->length()});
+   msgvec->reserve(buffers.size());
+   for (size_t j = 0; j < buffers.size(); j++)
++#if defined(__GLIBC__)
+     msgvec->push_back({{nullptr, 0, &msg_iov[j], 1, nullptr, 0, 0}, 0});
++#else
++    msgvec->push_back({{nullptr, 0, &msg_iov[j], 1, 0, 0, 0}, 0});
++#endif
+   int result = HANDLE_EINTR(Sendmmsg(fd, &msgvec[0], buffers.size(), 0));
+   SendResult send_result(0, 0, std::move(buffers));
+   if (result < 0) {
diff --git a/srcpkgs/qt6-webengine/patches/0211-chromium-musl-canonicalize-file-name-musl.patch b/srcpkgs/qt6-webengine/patches/0211-chromium-musl-canonicalize-file-name-musl.patch
new file mode 100644
index 000000000000..d43e6bd488bc
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0211-chromium-musl-canonicalize-file-name-musl.patch
@@ -0,0 +1,11 @@
+--- a/src/3rdparty/chromium/third_party/nasm/nasmlib/realpath.c
++++ b/src/3rdparty/chromium/third_party/nasm/nasmlib/realpath.c
+@@ -55,7 +55,7 @@
+  */
+ char *nasm_realpath(const char *rel_path)
+ {
+-    char *rp = canonicalize_file_name(rel_path);
++    char *rp = realpath(rel_path, NULL);
+     return rp ? rp : nasm_strdup(rel_path);
+ }
+ 
diff --git a/srcpkgs/qt6-webengine/patches/0212-chromium-musl-no-getcontext.patch b/srcpkgs/qt6-webengine/patches/0212-chromium-musl-no-getcontext.patch
new file mode 100644
index 000000000000..5755f1b45a7d
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0212-chromium-musl-no-getcontext.patch
@@ -0,0 +1,29 @@
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc
+@@ -489,8 +489,10 @@ bool ExceptionHandler::SimulateSignalDel
+   // ExceptionHandler::HandleSignal().
+   siginfo.si_code = SI_USER;
+   siginfo.si_pid = getpid();
+-  ucontext_t context;
++  ucontext_t context = { 0 };
++#if defined(__GLIBC__)
+   getcontext(&context);
++#endif
+   return HandleSignal(sig, &siginfo, &context);
+ }
+ 
+@@ -675,9 +677,14 @@ bool ExceptionHandler::WriteMinidump() {
+   sys_prctl(PR_SET_DUMPABLE, 1, 0, 0, 0);
+ 
+   CrashContext context;
++
++#if defined(__GLIBC__)
+   int getcontext_result = getcontext(&context.context);
+   if (getcontext_result)
+     return false;
++#else
++  return false;
++#endif
+ 
+ #if defined(__i386__)
+   // In CPUFillFromUContext in minidumpwriter.cc the stack pointer is retrieved
diff --git a/srcpkgs/qt6-webengine/patches/0213-chromium-musl-crashpad.patch b/srcpkgs/qt6-webengine/patches/0213-chromium-musl-crashpad.patch
new file mode 100644
index 000000000000..4d49997ed4f3
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0213-chromium-musl-crashpad.patch
@@ -0,0 +1,22 @@
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/compat/linux/sys/ptrace.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/compat/linux/sys/ptrace.h
+@@ -17,7 +17,9 @@
+ 
+ #include_next <sys/ptrace.h>
+ 
++#ifdef __GLIBC__
+ #include <sys/cdefs.h>
++#endif
+ 
+ // https://sourceware.org/bugzilla/show_bug.cgi?id=22433
+ #if !defined(PTRACE_GET_THREAD_AREA) && !defined(PT_GET_THREAD_AREA) && \
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/util/linux/ptracer.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/util/linux/ptracer.cc
+@@ -26,6 +26,7 @@
+ 
+ #if defined(ARCH_CPU_X86_FAMILY)
+ #include <asm/ldt.h>
++#include <asm/ptrace-abi.h>
+ #endif
+ 
+ namespace crashpad {
diff --git a/srcpkgs/qt6-webengine/patches/0214-chromium-musl-fixes.patch b/srcpkgs/qt6-webengine/patches/0214-chromium-musl-fixes.patch
new file mode 100644
index 000000000000..55b267ed1714
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0214-chromium-musl-fixes.patch
@@ -0,0 +1,108 @@
+--- a/src/3rdparty/chromium/sandbox/linux/suid/process_util.h
++++ b/src/3rdparty/chromium/sandbox/linux/suid/process_util.h
+@@ -12,6 +12,15 @@
+ #include <stdint.h>
+ #include <sys/types.h>
+ 
++#if !defined(__GLIBC__) && !defined(TEMP_FAILURE_RETRY)
++# define TEMP_FAILURE_RETRY(expression) \
++	(__extension__			\
++	 ({ long int __result;		\
++	  do __result = (long int) (expression); \
++	  while (__result == -1L && errno == EINTR); \
++	  __result; }))
++#endif
++
+ // This adjusts /proc/process/oom_score_adj so the Linux OOM killer
+ // will prefer certain process types over others. The range for the
+ // adjustment is [-1000, 1000], with [0, 1000] being user accessible.
+--- a/src/3rdparty/chromium/services/device/serial/serial_io_handler_posix.cc
++++ b/src/3rdparty/chromium/services/device/serial/serial_io_handler_posix.cc
+@@ -6,6 +6,7 @@
+ 
+ #include <sys/ioctl.h>
+ #include <termios.h>
++#include <asm-generic/ioctls.h>
+ 
+ #include <algorithm>
+ #include <utility>
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h
+@@ -38,6 +38,10 @@
+ #include "common/memory_allocator.h"
+ #include "google_breakpad/common/minidump_format.h"
+ 
++#ifndef __GLIBC__
++#define _libc_fpstate _fpstate
++#endif
++
+ namespace google_breakpad {
+ 
+ // Wraps platform-dependent implementations of accessors to ucontext_t structs.
+--- a/src/3rdparty/chromium/third_party/ffmpeg/libavutil/cpu.c
++++ b/src/3rdparty/chromium/third_party/ffmpeg/libavutil/cpu.c
+@@ -41,8 +41,10 @@
+ #include <sys/param.h>
+ #endif
+ #include <sys/types.h>
++#ifdef __GLIBC__
+ #include <sys/sysctl.h>
+ #endif
++#endif
+ #if HAVE_UNISTD_H
+ #include <unistd.h>
+ #endif
+--- a/src/3rdparty/chromium/third_party/perfetto/include/perfetto/ext/base/thread_utils.h
++++ b/src/3rdparty/chromium/third_party/perfetto/include/perfetto/ext/base/thread_utils.h
+@@ -29,9 +29,7 @@
+ #include <algorithm>
+ #endif
+ 
+-#if PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID)
+ #include <sys/prctl.h>
+-#endif
+ 
+ // Internal implementation utils that aren't as widely useful/supported as
+ // base/thread_utils.h.
+@@ -58,7 +56,7 @@ inline bool MaybeSetThreadName(const std
+ 
+ inline bool GetThreadName(std::string& out_result) {
+   char buf[16] = {};
+-#if PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID)
++#if !defined(__GLIBC__)
+   if (prctl(PR_GET_NAME, buf) != 0)
+     return false;
+ #else
+--- a/src/3rdparty/chromium/third_party/lss/linux_syscall_support.h
++++ b/src/3rdparty/chromium/third_party/lss/linux_syscall_support.h
+@@ -1300,6 +1300,18 @@ struct kernel_statfs {
+ #ifndef __NR_fallocate
+ #define __NR_fallocate          285
+ #endif
++
++#if !defined(__GLIBC__)
++#ifdef __NR_pread
++#undef __NR_pread
++#endif
++#ifdef __NR_pwrite
++#undef __NR_pwrite
++#endif
++#define __NR_pread __NR_pread64
++#define __NR_pwrite __NR_pwrite64
++#endif /* !defined(__GLIBC__) */
++
+ #ifndef __NR_getrandom
+ #define __NR_getrandom          318
+ #endif
+--- a/src/3rdparty/chromium/net/dns/dns_config_service_posix.cc
++++ b/src/3rdparty/chromium/net/dns/dns_config_service_posix.cc
+@@ -93,7 +93,8 @@ absl::optional<DnsConfig> ReadDnsConfig(
+ 
+   absl::optional<DnsConfig> dns_config;
+ // TODO(fuchsia): Use res_ninit() when it's implemented on Fuchsia.
+-#if defined(OS_OPENBSD) || defined(OS_FUCHSIA)
++#if defined(OS_OPENBSD) || defined(OS_FUCHSIA) || \
++  (defined(OS_LINUX) && !defined(__GLIBC__))
+   // Note: res_ninit in glibc always returns 0 and sets RES_INIT.
+   // res_init behaves the same way.
+   memset(&_res, 0, sizeof(_res));
diff --git a/srcpkgs/qt6-webengine/patches/0215-chromium-musl-cdefs.patch b/srcpkgs/qt6-webengine/patches/0215-chromium-musl-cdefs.patch
new file mode 100644
index 000000000000..9d1daec29118
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0215-chromium-musl-cdefs.patch
@@ -0,0 +1,29 @@
+--- a/src/3rdparty/chromium/third_party/libsync/src/include/sync/sync.h
++++ b/src/3rdparty/chromium/third_party/libsync/src/include/sync/sync.h
+@@ -19,12 +19,13 @@
+ #ifndef __SYS_CORE_SYNC_H
+ #define __SYS_CORE_SYNC_H
+ 
+-#include <sys/cdefs.h>
+ #include <stdint.h>
+ 
+ #include <linux/types.h>
+ 
+-__BEGIN_DECLS
++#ifdef __cplusplus
++extern "C" {
++#endif
+ 
+ struct sync_legacy_merge_data {
+  int32_t fd2;
+@@ -158,6 +159,9 @@ struct sync_pt_info *sync_pt_info(struct
+                                   struct sync_pt_info *itr);
+ void sync_fence_info_free(struct sync_fence_info_data *info);
+ 
+-__END_DECLS
++#ifdef __cplusplus
++}
++#endif
++
+ 
+ #endif /* __SYS_CORE_SYNC_H */
diff --git a/srcpkgs/qt6-webengine/patches/0216-chromium-musl-stat.patch b/srcpkgs/qt6-webengine/patches/0216-chromium-musl-stat.patch
new file mode 100644
index 000000000000..4509a6957cd7
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0216-chromium-musl-stat.patch
@@ -0,0 +1,12 @@
+--- a/src/3rdparty/chromium/base/files/file.h
++++ b/src/3rdparty/chromium/base/files/file.h
+@@ -19,7 +19,8 @@
+ #include "build/build_config.h"
+ 
+ #if defined(OS_BSD) || defined(OS_APPLE) || defined(OS_NACL) || \
+-    defined(OS_FUCHSIA) || (defined(OS_ANDROID) && __ANDROID_API__ < 21)
++    defined(OS_FUCHSIA) || (defined(OS_ANDROID) && __ANDROID_API__ < 21) || \
++    (defined(OS_LINUX) && !defined(__GLIBC__))
+ struct stat;
+ namespace base {
+ typedef struct stat stat_wrapper_t;
diff --git a/srcpkgs/qt6-webengine/patches/0217-chromium-musl-resolver.patch b/srcpkgs/qt6-webengine/patches/0217-chromium-musl-resolver.patch
new file mode 100644
index 000000000000..c3d7afad9b19
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0217-chromium-musl-resolver.patch
@@ -0,0 +1,77 @@
+--- a/src/3rdparty/chromium/net/dns/dns_config_service_linux.cc
++++ b/src/3rdparty/chromium/net/dns/dns_config_service_linux.cc
+@@ -432,11 +432,13 @@ class DnsConfigServiceLinux::ConfigReade
+     base::ScopedBlockingCall scoped_blocking_call(
+         FROM_HERE, base::BlockingType::MAY_BLOCK);
+ 
++#if defined(__GLIBC__)
+     std::unique_ptr<struct __res_state> res = resolv_reader_->GetResState();
+     if (res) {
+       dns_config_ = ConvertResStateToDnsConfig(*res.get());
+       resolv_reader_->CloseResState(res.get());
+     }
++#endif
+ 
+     UMA_HISTOGRAM_BOOLEAN("Net.DNS.DnsConfig.Resolv.Read",
+                           dns_config_.has_value());
+@@ -486,6 +488,7 @@ class DnsConfigServiceLinux::ConfigReade
+ 
+ std::unique_ptr<struct __res_state>
+ DnsConfigServiceLinux::ResolvReader::GetResState() {
++#if defined(__GLIBC__)
+   auto res = std::make_unique<struct __res_state>();
+   memset(res.get(), 0, sizeof(struct __res_state));
+ 
+@@ -495,11 +498,16 @@ DnsConfigServiceLinux::ResolvReader::Get
+   }
+ 
+   return res;
++#else
++  return nullptr;
++#endif
+ }
+ 
+ void DnsConfigServiceLinux::ResolvReader::CloseResState(
+     struct __res_state* res) {
++#if defined(__GLIBC__)
+   res_nclose(res);
++#endif
+ }
+ 
+ DnsConfigServiceLinux::DnsConfigServiceLinux()
+--- a/src/3rdparty/chromium/net/dns/dns_reloader.cc
++++ b/src/3rdparty/chromium/net/dns/dns_reloader.cc
+@@ -4,8 +4,7 @@
+ 
+ #include "net/dns/dns_reloader.h"
+ 
+-#if defined(OS_POSIX) && !defined(OS_APPLE) && !defined(OS_OPENBSD) && \
+-    !defined(OS_ANDROID) && !defined(OS_FUCHSIA)
++#ifdef __GLIBC__
+ 
+ #include <resolv.h>
+ 
+--- a/src/3rdparty/chromium/net/dns/host_resolver_manager.cc
++++ b/src/3rdparty/chromium/net/dns/host_resolver_manager.cc
+@@ -2720,8 +2720,7 @@ HostResolverManager::HostResolverManager
+   NetworkChangeNotifier::AddConnectionTypeObserver(this);
+   if (system_dns_config_notifier_)
+     system_dns_config_notifier_->AddObserver(this);
+-#if defined(OS_POSIX) && !defined(OS_APPLE) && !defined(OS_OPENBSD) && \
+-    !defined(OS_ANDROID)
++#ifdef __GLIBC__
+   EnsureDnsReloaderInit();
+ #endif
+ 
+--- a/src/3rdparty/chromium/net/dns/host_resolver_proc.cc
++++ b/src/3rdparty/chromium/net/dns/host_resolver_proc.cc
+@@ -176,8 +176,7 @@ int SystemHostResolverCall(const std::st
+   base::ScopedBlockingCall scoped_blocking_call(FROM_HERE,
+                                                 base::BlockingType::WILL_BLOCK);
+ 
+-#if defined(OS_POSIX) && !defined(OS_APPLE) && !defined(OS_OPENBSD) && \
+-    !defined(OS_ANDROID) && !defined(OS_FUCHSIA)
++#ifdef __GLIBC__
+   DnsReloaderMaybeReload();
+ #endif
+   absl::optional<AddressInfo> ai;
diff --git a/srcpkgs/qt6-webengine/patches/0600-chromium-sndio.patch b/srcpkgs/qt6-webengine/patches/0600-chromium-sndio.patch
new file mode 100644
index 000000000000..0302874ffba4
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0600-chromium-sndio.patch
@@ -0,0 +1,876 @@
+--- a/src/3rdparty/chromium/media/BUILD.gn
++++ b/src/3rdparty/chromium/media/BUILD.gn
+@@ -72,6 +72,9 @@ config("media_config") {
+       defines += [ "DLOPEN_PULSEAUDIO" ]
+     }
+   }
++  if (use_sndio) {
++    defines += [ "USE_SNDIO" ]
++  }
+   if (use_cras) {
+     defines += [ "USE_CRAS" ]
+   }
+--- a/src/3rdparty/chromium/media/audio/BUILD.gn
++++ b/src/3rdparty/chromium/media/audio/BUILD.gn
+@@ -240,6 +240,17 @@ source_set("audio") {
+     sources += [ "linux/audio_manager_linux.cc" ]
+   }
+ 
++  if (use_sndio) {
++    libs += [ "sndio" ]
++    sources += [
++      "sndio/audio_manager_sndio.cc",
++      "sndio/sndio_input.cc",
++      "sndio/sndio_input.h",
++      "sndio/sndio_output.cc",
++      "sndio/sndio_output.h"
++    ]
++  }
++
+   if (use_alsa) {
+     libs += [ "asound" ]
+     sources += [
+--- a/src/3rdparty/chromium/media/audio/linux/audio_manager_linux.cc
++++ b/src/3rdparty/chromium/media/audio/linux/audio_manager_linux.cc
+@@ -25,6 +25,11 @@
+ #include "media/audio/pulse/audio_manager_pulse.h"
+ #include "media/audio/pulse/pulse_util.h"
+ #endif
++#if defined(USE_SNDIO)
++#include "media/audio/sndio/audio_manager_sndio.h"
++#include "media/audio/sndio/sndio_input.h"
++#include "media/audio/sndio/sndio_output.h"
++#endif
+ 
+ namespace media {
+ 
+@@ -32,7 +37,8 @@ enum LinuxAudioIO {
+   kPulse,
+   kAlsa,
+   kCras,
+-  kAudioIOMax = kCras  // Must always be equal to largest logged entry.
++  kSndio,
++  kAudioIOMax = kSndio // Must always be equal to largest logged entry.
+ };
+ 
+ std::unique_ptr<media::AudioManager> CreateAudioManager(
+@@ -45,6 +51,16 @@ std::unique_ptr<media::AudioManager> Cre
+                                               audio_log_factory);
+   }
+ 
++#if defined(USE_SNDIO)
++  struct sio_hdl *hdl = sio_open(SIO_DEVANY, SIO_PLAY, 0);
++  if (hdl != NULL) {
++    sio_close(hdl);
++    UMA_HISTOGRAM_ENUMERATION("Media.LinuxAudioIO", kSndio, kAudioIOMax + 1);
++    return std::make_unique<AudioManagerSndio>(std::move(audio_thread),
++                                                  audio_log_factory);
++  }
++#endif
++
+ #if defined(USE_CRAS)
+   if (base::CommandLine::ForCurrentProcess()->HasSwitch(switches::kUseCras)) {
+     UMA_HISTOGRAM_ENUMERATION("Media.LinuxAudioIO", kCras, kAudioIOMax + 1);
+--- /dev/null
++++ b/src/3rdparty/chromium/media/audio/sndio/audio_manager_sndio.cc
+@@ -0,0 +1,148 @@
++// Copyright (c) 2012 The Chromium Authors. All rights reserved.
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++#include "media/audio/sndio/audio_manager_sndio.h"
++
++#include "base/metrics/histogram_macros.h"
++#include "base/memory/ptr_util.h"
++#include "media/audio/audio_device_description.h"
++#include "media/audio/audio_output_dispatcher.h"
++#include "media/audio/sndio/sndio_input.h"
++#include "media/audio/sndio/sndio_output.h"
++#include "media/base/limits.h"
++#include "media/base/media_switches.h"
++
++namespace media {
++
++
++// Maximum number of output streams that can be open simultaneously.
++static const int kMaxOutputStreams = 4;
++
++// Default sample rate for input and output streams.
++static const int kDefaultSampleRate = 48000;
++
++void AddDefaultDevice(AudioDeviceNames* device_names) {
++  DCHECK(device_names->empty());
++  device_names->push_front(AudioDeviceName::CreateDefault());
++}
++
++bool AudioManagerSndio::HasAudioOutputDevices() {
++  return true;
++}
++
++bool AudioManagerSndio::HasAudioInputDevices() {
++  return true;
++}
++
++void AudioManagerSndio::GetAudioInputDeviceNames(
++    AudioDeviceNames* device_names) {
++  DCHECK(device_names->empty());
++  AddDefaultDevice(device_names);
++}
++
++void AudioManagerSndio::GetAudioOutputDeviceNames(
++    AudioDeviceNames* device_names) {
++  AddDefaultDevice(device_names);
++}
++
++const char* AudioManagerSndio::GetName() {
++  return "SNDIO";
++}
++
++AudioParameters AudioManagerSndio::GetInputStreamParameters(
++    const std::string& device_id) {
++  static const int kDefaultInputBufferSize = 1024;
++
++  int user_buffer_size = GetUserBufferSize();
++  int buffer_size = user_buffer_size ?
++      user_buffer_size : kDefaultInputBufferSize;
++
++  return AudioParameters(
++      AudioParameters::AUDIO_PCM_LOW_LATENCY, CHANNEL_LAYOUT_STEREO,
++      kDefaultSampleRate, buffer_size);
++}
++
++AudioManagerSndio::AudioManagerSndio(std::unique_ptr<AudioThread> audio_thread,
++                                         AudioLogFactory* audio_log_factory)
++    : AudioManagerBase(std::move(audio_thread),
++                       audio_log_factory) {
++  DLOG(WARNING) << "AudioManagerSndio";
++  SetMaxOutputStreamsAllowed(kMaxOutputStreams);
++}
++
++AudioManagerSndio::~AudioManagerSndio() {
++  Shutdown();
++}
++
++AudioOutputStream* AudioManagerSndio::MakeLinearOutputStream(
++    const AudioParameters& params,
++    const LogCallback& log_callback) {
++  DCHECK_EQ(AudioParameters::AUDIO_PCM_LINEAR, params.format());
++  return MakeOutputStream(params);
++}
++
++AudioOutputStream* AudioManagerSndio::MakeLowLatencyOutputStream(
++    const AudioParameters& params,
++    const std::string& device_id,
++    const LogCallback& log_callback) {
++  DLOG_IF(ERROR, !device_id.empty()) << "Not implemented!";
++  DCHECK_EQ(AudioParameters::AUDIO_PCM_LOW_LATENCY, params.format());
++  return MakeOutputStream(params);
++}
++
++AudioInputStream* AudioManagerSndio::MakeLinearInputStream(
++    const AudioParameters& params,
++    const std::string& device_id,
++    const LogCallback& log_callback) {
++  DCHECK_EQ(AudioParameters::AUDIO_PCM_LINEAR, params.format());
++  return MakeInputStream(params);
++}
++
++AudioInputStream* AudioManagerSndio::MakeLowLatencyInputStream(
++    const AudioParameters& params,
++    const std::string& device_id,
++    const LogCallback& log_callback) {
++  DCHECK_EQ(AudioParameters::AUDIO_PCM_LOW_LATENCY, params.format());
++  return MakeInputStream(params);
++}
++
++AudioParameters AudioManagerSndio::GetPreferredOutputStreamParameters(
++    const std::string& output_device_id,
++    const AudioParameters& input_params) {
++  // TODO(tommi): Support |output_device_id|.
++  DLOG_IF(ERROR, !output_device_id.empty()) << "Not implemented!";
++  static const int kDefaultOutputBufferSize = 2048;
++
++  ChannelLayout channel_layout = CHANNEL_LAYOUT_STEREO;
++  int sample_rate = kDefaultSampleRate;
++  int buffer_size = kDefaultOutputBufferSize;
++  if (input_params.IsValid()) {
++    sample_rate = input_params.sample_rate();
++    channel_layout = input_params.channel_layout();
++    buffer_size = std::min(buffer_size, input_params.frames_per_buffer());
++  }
++
++  int user_buffer_size = GetUserBufferSize();
++  if (user_buffer_size)
++    buffer_size = user_buffer_size;
++
++  return AudioParameters(
++      AudioParameters::AUDIO_PCM_LOW_LATENCY, channel_layout,
++      sample_rate, buffer_size);
++}
++
++AudioInputStream* AudioManagerSndio::MakeInputStream(
++    const AudioParameters& params) {
++  DLOG(WARNING) << "MakeInputStream";
++  return new SndioAudioInputStream(this,
++             AudioDeviceDescription::kDefaultDeviceId, params);
++}
++
++AudioOutputStream* AudioManagerSndio::MakeOutputStream(
++    const AudioParameters& params) {
++  DLOG(WARNING) << "MakeOutputStream";
++  return new SndioAudioOutputStream(params, this);
++}
++
++}  // namespace media
+--- /dev/null
++++ b/src/3rdparty/chromium/media/audio/sndio/audio_manager_sndio.h
+@@ -0,0 +1,65 @@
++// Copyright (c) 2012 The Chromium Authors. All rights reserved.
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++#ifndef MEDIA_AUDIO_SNDIO_AUDIO_MANAGER_SNDIO_H_
++#define MEDIA_AUDIO_SNDIO_AUDIO_MANAGER_SNDIO_H_
++
++#include <set>
++
++#include "base/compiler_specific.h"
++#include "base/macros.h"
++#include "base/memory/ref_counted.h"
++#include "base/threading/thread.h"
++#include "media/audio/audio_manager_base.h"
++
++namespace media {
++
++class MEDIA_EXPORT AudioManagerSndio : public AudioManagerBase {
++ public:
++  AudioManagerSndio(std::unique_ptr<AudioThread> audio_thread,
++                   AudioLogFactory* audio_log_factory);
++  ~AudioManagerSndio() override;
++
++  // Implementation of AudioManager.
++  bool HasAudioOutputDevices() override;
++  bool HasAudioInputDevices() override;
++  void GetAudioInputDeviceNames(AudioDeviceNames* device_names) override;
++  void GetAudioOutputDeviceNames(AudioDeviceNames* device_names) override;
++  AudioParameters GetInputStreamParameters(
++      const std::string& device_id) override;
++  const char* GetName() override;
++
++  // Implementation of AudioManagerBase.
++  AudioOutputStream* MakeLinearOutputStream(
++      const AudioParameters& params,
++      const LogCallback& log_callback) override;
++  AudioOutputStream* MakeLowLatencyOutputStream(
++      const AudioParameters& params,
++      const std::string& device_id,
++      const LogCallback& log_callback) override;
++  AudioInputStream* MakeLinearInputStream(
++      const AudioParameters& params,
++      const std::string& device_id,
++      const LogCallback& log_callback) override;
++  AudioInputStream* MakeLowLatencyInputStream(
++      const AudioParameters& params,
++      const std::string& device_id,
++      const LogCallback& log_callback) override;
++
++ protected:
++  AudioParameters GetPreferredOutputStreamParameters(
++      const std::string& output_device_id,
++      const AudioParameters& input_params) override;
++
++ private:
++  // Called by MakeLinearOutputStream and MakeLowLatencyOutputStream.
++  AudioOutputStream* MakeOutputStream(const AudioParameters& params);
++  AudioInputStream* MakeInputStream(const AudioParameters& params);
++
++  DISALLOW_COPY_AND_ASSIGN(AudioManagerSndio);
++};
++
++}  // namespace media
++
++#endif  // MEDIA_AUDIO_SNDIO_AUDIO_MANAGER_SNDIO_H_
+--- /dev/null
++++ b/src/3rdparty/chromium/media/audio/sndio/sndio_input.cc
+@@ -0,0 +1,200 @@
++// Copyright 2013 The Chromium Authors. All rights reserved.
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++#include "base/bind.h"
++#include "base/logging.h"
++#include "base/macros.h"
++#include "media/base/audio_timestamp_helper.h"
++#include "media/audio/sndio/audio_manager_sndio.h"
++#include "media/audio/audio_manager.h"
++#include "media/audio/sndio/sndio_input.h"
++
++namespace media {
++
++static const SampleFormat kSampleFormat = kSampleFormatS16;
++
++void SndioAudioInputStream::OnMoveCallback(void *arg, int delta)
++{
++  SndioAudioInputStream* self = static_cast<SndioAudioInputStream*>(arg);
++
++  self->hw_delay += delta;
++}
++
++void *SndioAudioInputStream::ThreadEntry(void *arg) {
++  SndioAudioInputStream* self = static_cast<SndioAudioInputStream*>(arg);
++
++  self->ThreadLoop();
++  return NULL;
++}
++
++SndioAudioInputStream::SndioAudioInputStream(AudioManagerBase* manager,
++                                             const std::string& device_name,
++                                             const AudioParameters& params)
++    : manager(manager),
++      params(params),
++      audio_bus(AudioBus::Create(params)),
++      state(kClosed) {
++}
++
++SndioAudioInputStream::~SndioAudioInputStream() {
++  if (state != kClosed)
++    Close();
++}
++
++bool SndioAudioInputStream::Open() {
++  struct sio_par par;
++  int sig;
++
++  if (state != kClosed)
++    return false;
++
++  if (params.format() != AudioParameters::AUDIO_PCM_LINEAR &&
++      params.format() != AudioParameters::AUDIO_PCM_LOW_LATENCY) {
++    LOG(WARNING) << "Unsupported audio format.";
++    return false;
++  }
++
++  sio_initpar(&par);
++  par.rate = params.sample_rate();
++  par.rchan = params.channels();
++  par.bits = SampleFormatToBitsPerChannel(kSampleFormat);
++  par.bps = par.bits / 8;
++  par.sig = sig = par.bits != 8 ? 1 : 0;
++  par.le = SIO_LE_NATIVE;
++  par.appbufsz = params.frames_per_buffer();
++
++  hdl = sio_open(SIO_DEVANY, SIO_REC, 0);
++
++  if (hdl == NULL) {
++    LOG(ERROR) << "Couldn't open audio device.";
++    return false;
++  }
++
++  if (!sio_setpar(hdl, &par) || !sio_getpar(hdl, &par)) {
++    LOG(ERROR) << "Couldn't set audio parameters.";
++    goto bad_close;
++  }
++
++  if (par.rate  != (unsigned int)params.sample_rate() ||
++      par.rchan != (unsigned int)params.channels() ||
++      par.bits  != (unsigned int)SampleFormatToBitsPerChannel(kSampleFormat) ||
++      par.sig   != (unsigned int)sig ||
++      (par.bps > 1 && par.le != SIO_LE_NATIVE) ||
++      (par.bits != par.bps * 8)) {
++    LOG(ERROR) << "Unsupported audio parameters.";
++    goto bad_close;
++  }
++  state = kStopped;
++  buffer = new char[audio_bus->frames() * params.GetBytesPerFrame(kSampleFormat)];
++  sio_onmove(hdl, &OnMoveCallback, this);
++  return true;
++bad_close:
++  sio_close(hdl);
++  return false;
++}
++
++void SndioAudioInputStream::Start(AudioInputCallback* cb) {
++
++  StartAgc();
++
++  state = kRunning;
++  hw_delay = 0;
++  callback = cb;
++  sio_start(hdl);
++  if (pthread_create(&thread, NULL, &ThreadEntry, this) != 0) {
++    LOG(ERROR) << "Failed to create real-time thread for recording.";
++    sio_stop(hdl);
++    state = kStopped;
++  }
++}
++
++void SndioAudioInputStream::Stop() {
++
++  if (state == kStopped)
++    return;
++
++  state = kStopWait;
++  pthread_join(thread, NULL);
++  sio_stop(hdl);
++  state = kStopped;
++
++  StopAgc();
++}
++
++void SndioAudioInputStream::Close() {
++
++  if (state == kClosed)
++    return;
++
++  if (state == kRunning)
++    Stop();
++
++  state = kClosed;
++  delete [] buffer;
++  sio_close(hdl);
++
++  manager->ReleaseInputStream(this);
++}
++
++double SndioAudioInputStream::GetMaxVolume() {
++  // Not supported
++  return 0.0;
++}
++
++void SndioAudioInputStream::SetVolume(double volume) {
++  // Not supported. Do nothing.
++}
++
++double SndioAudioInputStream::GetVolume() {
++  // Not supported.
++  return 0.0;
++}
++
++bool SndioAudioInputStream::IsMuted() {
++  // Not supported.
++  return false;
++}
++
++void SndioAudioInputStream::SetOutputDeviceForAec(
++    const std::string& output_device_id) {
++  // Not supported.
++}
++
++void SndioAudioInputStream::ThreadLoop(void) {
++  size_t todo, n;
++  char *data;
++  unsigned int nframes;
++  double normalized_volume = 0.0;
++
++  nframes = audio_bus->frames();
++
++  while (state == kRunning && !sio_eof(hdl)) {
++
++    GetAgcVolume(&normalized_volume);
++
++    // read one block
++    todo = nframes * params.GetBytesPerFrame(kSampleFormat);
++    data = buffer;
++    while (todo > 0) {
++      n = sio_read(hdl, data, todo);
++      if (n == 0)
++        return;	// unrecoverable I/O error
++      todo -= n;
++      data += n;
++    }
++    hw_delay -= nframes;
++
++    // convert frames count to TimeDelta
++    const base::TimeDelta delay = AudioTimestampHelper::FramesToTime(hw_delay,
++      params.sample_rate());
++
++    // push into bus
++    audio_bus->FromInterleaved<SignedInt16SampleTypeTraits>(reinterpret_cast<int16_t*>(buffer), nframes);
++
++    // invoke callback
++    callback->OnData(audio_bus.get(), base::TimeTicks::Now() - delay, 1.);
++  }
++}
++
++}  // namespace media
+--- /dev/null
++++ b/src/3rdparty/chromium/media/audio/sndio/sndio_input.h
+@@ -0,0 +1,91 @@
++// Copyright 2013 The Chromium Authors. All rights reserved.
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++#ifndef MEDIA_AUDIO_SNDIO_SNDIO_INPUT_H_
++#define MEDIA_AUDIO_SNDIO_SNDIO_INPUT_H_
++
++#include <stdint.h>
++#include <string>
++#include <sndio.h>
++
++#include "base/compiler_specific.h"
++#include "base/macros.h"
++#include "base/memory/weak_ptr.h"
++#include "base/time/time.h"
++#include "media/audio/agc_audio_stream.h"
++#include "media/audio/audio_io.h"
++#include "media/audio/audio_device_description.h"
++#include "media/base/audio_parameters.h"
++
++namespace media {
++
++class AudioManagerBase;
++
++// Implementation of AudioOutputStream using sndio(7)
++class SndioAudioInputStream : public AgcAudioStream<AudioInputStream> {
++ public:
++  // Pass this to the constructor if you want to attempt auto-selection
++  // of the audio recording device.
++  static const char kAutoSelectDevice[];
++
++  // Create a PCM Output stream for the SNDIO device identified by
++  // |device_name|. If unsure of what to use for |device_name|, use
++  // |kAutoSelectDevice|.
++  SndioAudioInputStream(AudioManagerBase* audio_manager,
++                     const std::string& device_name,
++                     const AudioParameters& params);
++
++  ~SndioAudioInputStream() override;
++
++  // Implementation of AudioInputStream.
++  bool Open() override;
++  void Start(AudioInputCallback* callback) override;
++  void Stop() override;
++  void Close() override;
++  double GetMaxVolume() override;
++  void SetVolume(double volume) override;
++  double GetVolume() override;
++  bool IsMuted() override;
++  void SetOutputDeviceForAec(const std::string& output_device_id) override;
++
++ private:
++
++  enum StreamState {
++    kClosed,            // Not opened yet
++    kStopped,           // Device opened, but not started yet
++    kRunning,           // Started, device playing
++    kStopWait           // Stopping, waiting for the real-time thread to exit
++  };
++
++  // C-style call-backs
++  static void OnMoveCallback(void *arg, int delta);
++  static void* ThreadEntry(void *arg);
++
++  // Continuously moves data from the device to the consumer
++  void ThreadLoop();
++  // Our creator, the audio manager needs to be notified when we close.
++  AudioManagerBase* manager;
++  // Parameters of the source
++  AudioParameters params;
++  // We store data here for consumer
++  std::unique_ptr<AudioBus> audio_bus;
++  // Call-back that consumes recorded data
++  AudioInputCallback* callback;  // Valid during a recording session.
++  // Handle of the audio device
++  struct sio_hdl* hdl;
++  // Current state of the stream
++  enum StreamState state;
++  // High priority thread running ThreadLoop()
++  pthread_t thread;
++  // Number of frames buffered in the hardware
++  int hw_delay;
++  // Temporary buffer where data is stored sndio-compatible format
++  char* buffer;
++
++  DISALLOW_COPY_AND_ASSIGN(SndioAudioInputStream);
++};
++
++}  // namespace media
++
++#endif  // MEDIA_AUDIO_SNDIO_SNDIO_INPUT_H_
+--- /dev/null
++++ b/src/3rdparty/chromium/media/audio/sndio/sndio_output.cc
+@@ -0,0 +1,183 @@
++// Copyright (c) 2012 The Chromium Authors. All rights reserved.
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++#include "base/logging.h"
++#include "base/time/time.h"
++#include "base/time/default_tick_clock.h"
++#include "media/audio/audio_manager_base.h"
++#include "media/base/audio_timestamp_helper.h"
++#include "media/audio/sndio/sndio_output.h"
++
++namespace media {
++
++static const SampleFormat kSampleFormat = kSampleFormatS16;
++
++void SndioAudioOutputStream::OnMoveCallback(void *arg, int delta) {
++  SndioAudioOutputStream* self = static_cast<SndioAudioOutputStream*>(arg);
++
++  self->hw_delay -= delta;
++}
++
++void SndioAudioOutputStream::OnVolCallback(void *arg, unsigned int vol) {
++  SndioAudioOutputStream* self = static_cast<SndioAudioOutputStream*>(arg);
++
++  self->vol = vol;
++}
++
++void *SndioAudioOutputStream::ThreadEntry(void *arg) {
++  SndioAudioOutputStream* self = static_cast<SndioAudioOutputStream*>(arg);
++
++  self->ThreadLoop();
++  return NULL;
++}
++
++SndioAudioOutputStream::SndioAudioOutputStream(const AudioParameters& params,
++                                               AudioManagerBase* manager)
++    : manager(manager),
++      params(params),
++      audio_bus(AudioBus::Create(params)),
++      state(kClosed),
++      mutex(PTHREAD_MUTEX_INITIALIZER) {
++}
++
++SndioAudioOutputStream::~SndioAudioOutputStream() {
++  if (state != kClosed)
++    Close();
++}
++
++bool SndioAudioOutputStream::Open() {
++  struct sio_par par;
++  int sig;
++
++  if (params.format() != AudioParameters::AUDIO_PCM_LINEAR &&
++      params.format() != AudioParameters::AUDIO_PCM_LOW_LATENCY) {
++    LOG(WARNING) << "Unsupported audio format.";
++    return false;
++  }
++  sio_initpar(&par);
++  par.rate = params.sample_rate();
++  par.pchan = params.channels();
++  par.bits = SampleFormatToBitsPerChannel(kSampleFormat);
++  par.bps = par.bits / 8;
++  par.sig = sig = par.bits != 8 ? 1 : 0;
++  par.le = SIO_LE_NATIVE;
++  par.appbufsz = params.frames_per_buffer();
++
++  hdl = sio_open(SIO_DEVANY, SIO_PLAY, 0);
++  if (hdl == NULL) {
++    LOG(ERROR) << "Couldn't open audio device.";
++    return false;
++  }
++  if (!sio_setpar(hdl, &par) || !sio_getpar(hdl, &par)) {
++    LOG(ERROR) << "Couldn't set audio parameters.";
++    goto bad_close;
++  }
++  if (par.rate  != (unsigned int)params.sample_rate() ||
++      par.pchan != (unsigned int)params.channels() ||
++      par.bits  != (unsigned int)SampleFormatToBitsPerChannel(kSampleFormat) ||
++      par.sig   != (unsigned int)sig ||
++      (par.bps > 1 && par.le != SIO_LE_NATIVE) ||
++      (par.bits != par.bps * 8)) {
++    LOG(ERROR) << "Unsupported audio parameters.";
++    goto bad_close;
++  }
++  state = kStopped;
++  volpending = 0;
++  vol = 0;
++  buffer = new char[audio_bus->frames() * params.GetBytesPerFrame(kSampleFormat)];
++  sio_onmove(hdl, &OnMoveCallback, this);
++  sio_onvol(hdl, &OnVolCallback, this);
++  return true;
++ bad_close:
++  sio_close(hdl);
++  return false;
++}
++
++void SndioAudioOutputStream::Close() {
++  if (state == kClosed)
++    return;
++  if (state == kRunning)
++    Stop();
++  state = kClosed;
++  delete [] buffer;
++  sio_close(hdl);
++  manager->ReleaseOutputStream(this);  // Calls the destructor
++}
++
++void SndioAudioOutputStream::Start(AudioSourceCallback* callback) {
++  state = kRunning;
++  hw_delay = 0;
++  source = callback;
++  sio_start(hdl);
++  if (pthread_create(&thread, NULL, &ThreadEntry, this) != 0) {
++    LOG(ERROR) << "Failed to create real-time thread.";
++    sio_stop(hdl);
++    state = kStopped;
++  }
++}
++
++void SndioAudioOutputStream::Stop() {
++  if (state == kStopped)
++    return;
++  state = kStopWait;
++  pthread_join(thread, NULL);
++  sio_stop(hdl);
++  state = kStopped;
++}
++
++void SndioAudioOutputStream::SetVolume(double v) {
++  pthread_mutex_lock(&mutex);
++  vol = v * SIO_MAXVOL;
++  volpending = 1;
++  pthread_mutex_unlock(&mutex);
++}
++
++void SndioAudioOutputStream::GetVolume(double* v) {
++  pthread_mutex_lock(&mutex);
++  *v = vol * (1. / SIO_MAXVOL);
++  pthread_mutex_unlock(&mutex);
++}
++
++// This stream is always used with sub second buffer sizes, where it's
++// sufficient to simply always flush upon Start().
++void SndioAudioOutputStream::Flush() {}
++
++void SndioAudioOutputStream::ThreadLoop(void) {
++  int avail, count, result;
++
++  while (state == kRunning) {
++    // Update volume if needed
++    pthread_mutex_lock(&mutex);
++    if (volpending) {
++      volpending = 0;
++      sio_setvol(hdl, vol);
++    }
++    pthread_mutex_unlock(&mutex);
++
++    // Get data to play
++    const base::TimeDelta delay = AudioTimestampHelper::FramesToTime(hw_delay,
++	params.sample_rate());
++    count = source->OnMoreData(delay, base::TimeTicks::Now(), 0, audio_bus.get());
++    audio_bus->ToInterleaved<SignedInt16SampleTypeTraits>(count, reinterpret_cast<int16_t*>(buffer));
++    if (count == 0) {
++      // We have to submit something to the device
++      count = audio_bus->frames();
++      memset(buffer, 0, count * params.GetBytesPerFrame(kSampleFormat));
++      LOG(WARNING) << "No data to play, running empty cycle.";
++    }
++
++    // Submit data to the device
++    avail = count * params.GetBytesPerFrame(kSampleFormat);
++    result = sio_write(hdl, buffer, avail);
++    if (result == 0) {
++      LOG(WARNING) << "Audio device disconnected.";
++      break;
++    }
++
++    // Update hardware pointer
++    hw_delay += count;
++  }
++}
++
++}  // namespace media
+--- /dev/null
++++ b/src/3rdparty/chromium/media/audio/sndio/sndio_output.h
+@@ -0,0 +1,86 @@
++// Copyright (c) 2012 The Chromium Authors. All rights reserved.
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++#ifndef MEDIA_AUDIO_SNDIO_SNDIO_OUTPUT_H_
++#define MEDIA_AUDIO_SNDIO_SNDIO_OUTPUT_H_
++
++#include <pthread.h>
++#include <sndio.h>
++
++#include "base/time/tick_clock.h"
++#include "base/time/time.h"
++#include "media/audio/audio_io.h"
++
++namespace media {
++
++class AudioManagerBase;
++
++// Implementation of AudioOutputStream using sndio(7)
++class SndioAudioOutputStream : public AudioOutputStream {
++ public:
++  // The manager is creating this object
++  SndioAudioOutputStream(const AudioParameters& params,
++                         AudioManagerBase* manager);
++  virtual ~SndioAudioOutputStream();
++
++  // Implementation of AudioOutputStream.
++  bool Open() override;
++  void Close() override;
++  void Start(AudioSourceCallback* callback) override;
++  void Stop() override;
++  void SetVolume(double volume) override;
++  void GetVolume(double* volume) override;
++  void Flush() override;
++
++  friend void sndio_onmove(void *arg, int delta);
++  friend void sndio_onvol(void *arg, unsigned int vol);
++  friend void *sndio_threadstart(void *arg);
++
++ private:
++  enum StreamState {
++    kClosed,            // Not opened yet
++    kStopped,           // Device opened, but not started yet
++    kRunning,           // Started, device playing
++    kStopWait           // Stopping, waiting for the real-time thread to exit
++  };
++
++  // C-style call-backs
++  static void OnMoveCallback(void *arg, int delta);
++  static void OnVolCallback(void *arg, unsigned int vol);
++  static void* ThreadEntry(void *arg);
++
++  // Continuously moves data from the producer to the device
++  void ThreadLoop(void);
++
++  // Our creator, the audio manager needs to be notified when we close.
++  AudioManagerBase* manager;
++  // Parameters of the source
++  AudioParameters params;
++  // Source stores data here
++  std::unique_ptr<AudioBus> audio_bus;
++  // Call-back that produces data to play
++  AudioSourceCallback* source;
++  // Handle of the audio device
++  struct sio_hdl* hdl;
++  // Current state of the stream
++  enum StreamState state;
++  // High priority thread running ThreadLoop()
++  pthread_t thread;
++  // Protects vol, volpending and hw_delay
++  pthread_mutex_t mutex;
++  // Current volume in the 0..SIO_MAXVOL range
++  int vol;
++  // Set to 1 if volumes must be refreshed in the realtime thread
++  int volpending;
++  // Number of frames buffered in the hardware
++  int hw_delay;
++  // Temporary buffer where data is stored sndio-compatible format
++  char* buffer;
++
++  DISALLOW_COPY_AND_ASSIGN(SndioAudioOutputStream);
++};
++
++}  // namespace media
++
++#endif  // MEDIA_AUDIO_SNDIO_SNDIO_OUTPUT_H_
+--- a/src/3rdparty/chromium/media/media_options.gni
++++ b/src/3rdparty/chromium/media/media_options.gni
+@@ -121,6 +121,9 @@ declare_args() {
+   # Enables runtime selection of ALSA library for audio.
+   use_alsa = false
+ 
++  # Enable runtime selection of sndio(7)
++  use_sndio = false
++
+   # Alsa should be used on non-Android, non-Mac POSIX systems.
+   # Alsa should be used on desktop Chromecast and audio-only Chromecast builds.
+   if (is_posix && !is_android && !is_mac &&
diff --git a/srcpkgs/qt6-webengine/patches/0700-armv7l-neon.patch b/srcpkgs/qt6-webengine/patches/0700-armv7l-neon.patch
new file mode 100644
index 000000000000..d42fa19a07a1
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0700-armv7l-neon.patch
@@ -0,0 +1,10 @@
+--- a/src/3rdparty/chromium/skia/BUILD.gn
++++ b/src/3rdparty/chromium/skia/BUILD.gn
+@@ -800,7 +800,6 @@ skia_source_set("skia_opts") {
+         # Root build config sets -mfpu=$arm_fpu, which we expect to be neon
+         # when running this.
+         if (!arm_use_neon) {
+-          configs -= [ "//build/config/compiler:compiler_arm_fpu" ]
+           cflags += [ "-mfpu=neon" ]
+         }
+       }
diff --git a/srcpkgs/qt6-webengine/patches/0750-chromium-musl-arm-user_vfp.patch b/srcpkgs/qt6-webengine/patches/0750-chromium-musl-arm-user_vfp.patch
new file mode 100644
index 000000000000..6e2d62f35ee6
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0750-chromium-musl-arm-user_vfp.patch
@@ -0,0 +1,20 @@
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/util/linux/thread_info.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/util/linux/thread_info.h
+@@ -17,6 +17,17 @@
+ 
+ #include <stdint.h>
+ #include <sys/user.h>
++#if !defined(__GLIBC__)
++struct user_vfp {
++	unsigned long long fpregs[32];
++	unsigned long fpscr;
++};
++struct user_vfp_exc {
++	unsigned long fpexc;
++	unsigned long fpinst;
++	unsigned long fpinst2;
++};
++#endif /* !defined(__GLIBC__) */
+ 
+ #include <type_traits>
+ 
diff --git a/srcpkgs/qt6-webengine/patches/0751-chromium-musl-arm-elf_auxv_t.patch b/srcpkgs/qt6-webengine/patches/0751-chromium-musl-arm-elf_auxv_t.patch
new file mode 100644
index 000000000000..7112c8cfd3fa
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0751-chromium-musl-arm-elf_auxv_t.patch
@@ -0,0 +1,18 @@
+--- a/src/3rdparty/chromium/v8/src/base/cpu.cc
++++ b/src/3rdparty/chromium/v8/src/base/cpu.cc
+@@ -163,6 +163,15 @@ static V8_INLINE void __cpuid(int cpu_in
+ 
+ #if V8_HOST_ARCH_ARM || V8_HOST_ARCH_ARM64
+ 
++#ifndef __GLIBC__
++#include <elf.h>
++#ifdef __LP64__
++typedef Elf64_auxv_t elf_auxv_t;
++#else
++typedef Elf32_auxv_t elf_auxv_t;
++#endif
++#endif
++
+ static uint32_t ReadELFHWCaps() {
+   uint32_t result = 0;
+ #if V8_GLIBC_PREREQ(2, 16)
diff --git a/srcpkgs/qt6-webengine/patches/0801-chromium-i686-vaapi-fpermissive.patch b/srcpkgs/qt6-webengine/patches/0801-chromium-i686-vaapi-fpermissive.patch
new file mode 100644
index 000000000000..3d4043e03b89
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0801-chromium-i686-vaapi-fpermissive.patch
@@ -0,0 +1,24 @@
+--- a/src/3rdparty/chromium/media/gpu/vaapi/BUILD.gn
++++ b/src/3rdparty/chromium/media/gpu/vaapi/BUILD.gn
+@@ -14,6 +14,10 @@ import("//ui/gl/features.gni")
+ assert(is_linux || is_chromeos)
+ assert(use_vaapi)
+ 
++config("vaapi_permissive") {
++  cflags = [ "-fpermissive" ]
++}
++
+ generate_stubs("libva_stubs") {
+   extra_header = "va_stub_header.fragment"
+   sigs = [ "va.sigs" ]
+@@ -136,6 +140,10 @@ source_set("vaapi") {
+     ]
+   }
+ 
++  if (target_cpu == "x86") {
++    configs += [ ":vaapi_permissive" ]
++  }
++
+   if (use_x11) {
+     deps += [ "//ui/gfx/x" ]
+     sources += [
diff --git a/srcpkgs/qt6-webengine/patches/0900-xxx-ppc64le-libvpx.patch b/srcpkgs/qt6-webengine/patches/0900-xxx-ppc64le-libvpx.patch
new file mode 100644
index 000000000000..5c9566b56bd4
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0900-xxx-ppc64le-libvpx.patch
@@ -0,0 +1,65 @@
+Uses generic target for now. To use ppc64le, change --target to ppc64le-gnu
+and add --enable-vsx, and change generic to ppc for the rtcd header.
+
+From 18e6c5c55cfae0cfb458d8210d7bc709360a0e90 Mon Sep 17 00:00:00 2001
+From: q66 <daniel@octaforge.org>
+Date: Wed, 9 Sep 2020 19:08:25 +0200
+Subject: [PATCH] enable generation of ppc64 libvpx bits
+
+this doesn't update the gni file, that's done from
+the template by running the appropriate scripts
+---
+ third_party/libvpx/BUILD.gn        | 4 ++++
+ third_party/libvpx/generate_gni.sh | 9 +++++++++
+ 2 files changed, 13 insertions(+)
+
+--- a/src/3rdparty/chromium/third_party/libvpx/BUILD.gn
++++ b/src/3rdparty/chromium/third_party/libvpx/BUILD.gn
+@@ -424,6 +424,8 @@ static_library("bundled_libvpx") {
+       sources = libvpx_srcs_arm64
+       public_deps = [ ":libvpx_arm64_headers" ]
+     }
++  } else if (current_cpu == "ppc64") {
++    sources = libvpx_srcs_ppc64
+   }
+ 
+   configs -= [ "//build/config/compiler:chromium_code" ]
+--- a/src/3rdparty/chromium/third_party/libvpx/generate_gni.sh
++++ b/src/3rdparty/chromium/third_party/libvpx/generate_gni.sh
+@@ -374,6 +374,7 @@ gen_config_files linux/arm-neon-highbd "
+ gen_config_files linux/arm64-highbd "--target=armv8-linux-gcc ${all_platforms} ${HIGHBD}"
+ gen_config_files linux/mipsel "--target=mips32-linux-gcc ${all_platforms}"
+ gen_config_files linux/mips64el "--target=mips64-linux-gcc ${all_platforms}"
++gen_config_files linux/ppc64 "--target=generic-gnu $HIGHBD ${all_platforms}"
+ gen_config_files linux/generic "--target=generic-gnu $HIGHBD ${all_platforms}"
+ gen_config_files win/arm64 "--target=arm64-win64-vs15 ${all_platforms} ${HIGHBD}"
+ gen_config_files win/ia32 "--target=x86-win32-vs14 ${all_platforms} ${x86_platforms}"
+@@ -399,6 +400,7 @@ lint_config linux/arm-neon-highbd
+ lint_config linux/arm64-highbd
+ lint_config linux/mipsel
+ lint_config linux/mips64el
++lint_config linux/ppc64
+ lint_config linux/generic
+ lint_config win/arm64
+ lint_config win/ia32
+@@ -428,6 +430,7 @@ gen_rtcd_header linux/arm-neon-highbd ar
+ gen_rtcd_header linux/arm64-highbd armv8
+ gen_rtcd_header linux/mipsel mipsel
+ gen_rtcd_header linux/mips64el mips64el
++gen_rtcd_header linux/ppc64 generic
+ gen_rtcd_header linux/generic generic
+ gen_rtcd_header win/arm64 armv8
+ gen_rtcd_header win/ia32 x86 "${require_sse2}"
+@@ -513,6 +516,12 @@ if [ -z $ONLY_CONFIGS ]; then
+ 
+   echo "MIPS64 source list is identical to MIPS source list. No need to generate it."
+ 
++  echo "Generate ppc64 source list."
++  config=$(print_config_basic linux/ppc64)
++  make_clean
++  make libvpx_srcs.txt target=libs $config > /dev/null
++  convert_srcs_to_project_files libvpx_srcs.txt libvpx_srcs_ppc64
++
+   echo "Generate NaCl source list."
+   config=$(print_config_basic nacl)
+   make_clean
diff --git a/srcpkgs/qt6-webengine/patches/0901-xxx-ppc64le-sandbox-linux-stat.patch b/srcpkgs/qt6-webengine/patches/0901-xxx-ppc64le-sandbox-linux-stat.patch
new file mode 100644
index 000000000000..4b8e6320601c
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0901-xxx-ppc64le-sandbox-linux-stat.patch
@@ -0,0 +1,31 @@
+--- a/src/3rdparty/chromium/sandbox/linux/system_headers/linux_stat.h
++++ b/src/3rdparty/chromium/sandbox/linux/system_headers/linux_stat.h
+@@ -155,6 +155,28 @@ struct kernel_stat {
+   unsigned int __unused4;
+   unsigned int __unused5;
+ };
++#elif defined(__powerpc64__)
++struct kernel_stat {
++  unsigned long	st_dev;
++  unsigned long	st_ino;
++  unsigned long	st_nlink;
++  unsigned int	st_mode;
++  unsigned int	st_uid;
++  unsigned int	st_gid;
++  unsigned long	st_rdev;
++  long		st_size;
++  unsigned long	st_blksize;
++  unsigned long	st_blocks;
++  unsigned long	st_atime_;
++  unsigned long	st_atime_nsec_;
++  unsigned long	st_mtime_;
++  unsigned long	st_mtime_nsec_;
++  unsigned long	st_ctime_;
++  unsigned long	st_ctime_nsec_;
++  unsigned long	__unused4;
++  unsigned long	__unused5;
++  unsigned long	__unused6;
++};
+ #endif
+ 
+ #if !defined(AT_EMPTY_PATH)
diff --git a/srcpkgs/qt6-webengine/patches/0902-xxx-ppc64le-support.patch b/srcpkgs/qt6-webengine/patches/0902-xxx-ppc64le-support.patch
new file mode 100644
index 000000000000..60503c22e36b
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0902-xxx-ppc64le-support.patch
@@ -0,0 +1,3559 @@
+commit 2c013a317b1114ef67cdbbc30824b28907b9ea94
+Author: Daniel Kolesa <daniel@octaforge.org>
+Date:   Wed Mar 3 19:08:29 2021 +0100
+
+    ppc64le support
+
+--- a/src/3rdparty/chromium/sandbox/features.gni
++++ b/src/3rdparty/chromium/sandbox/features.gni
+@@ -11,7 +11,8 @@ import("//build/config/nacl/config.gni")
+ use_seccomp_bpf = (is_linux || is_chromeos || is_android) &&
+                   (current_cpu == "x86" || current_cpu == "x64" ||
+                    current_cpu == "arm" || current_cpu == "arm64" ||
+-                   current_cpu == "mipsel" || current_cpu == "mips64el")
++                   current_cpu == "mipsel" || current_cpu == "mips64el" ||
++                   current_cpu == "ppc64")
+ 
+ use_seccomp_bpf = use_seccomp_bpf || is_nacl_nonsfi
+ 
+--- a/src/3rdparty/chromium/sandbox/linux/BUILD.gn
++++ b/src/3rdparty/chromium/sandbox/linux/BUILD.gn
+@@ -433,6 +433,8 @@ component("sandbox_services") {
+ 
+ source_set("sandbox_services_headers") {
+   sources = [
++    "system_headers/ppc64_linux_syscalls.h",
++    "system_headers/ppc64_linux_ucontext.h",
+     "system_headers/arm64_linux_syscalls.h",
+     "system_headers/arm_linux_syscalls.h",
+     "system_headers/arm_linux_ucontext.h",
+--- a/src/3rdparty/chromium/sandbox/linux/bpf_dsl/linux_syscall_ranges.h
++++ b/src/3rdparty/chromium/sandbox/linux/bpf_dsl/linux_syscall_ranges.h
+@@ -56,6 +56,13 @@
+ #define MAX_PUBLIC_SYSCALL __NR_syscalls
+ #define MAX_SYSCALL MAX_PUBLIC_SYSCALL
+ 
++#elif defined(__powerpc64__)
++
++#include <asm/unistd.h>
++#define MIN_SYSCALL 0u
++#define MAX_PUBLIC_SYSCALL 386u
++#define MAX_SYSCALL MAX_PUBLIC_SYSCALL
++
+ #else
+ #error "Unsupported architecture"
+ #endif
+--- a/src/3rdparty/chromium/sandbox/linux/bpf_dsl/seccomp_macros.h
++++ b/src/3rdparty/chromium/sandbox/linux/bpf_dsl/seccomp_macros.h
+@@ -16,6 +16,9 @@
+ #if defined(__mips__)
+ // sys/user.h in eglibc misses size_t definition
+ #include <stddef.h>
++#elif defined(__powerpc64__) && defined(__GLIBC__)
++// Manually define greg_t on ppc64
++typedef unsigned long long greg_t;
+ #endif
+ #endif
+ 
+@@ -346,6 +349,59 @@ struct regs_struct {
+ #define SECCOMP_PT_PARM4(_regs) (_regs).regs[3]
+ #define SECCOMP_PT_PARM5(_regs) (_regs).regs[4]
+ #define SECCOMP_PT_PARM6(_regs) (_regs).regs[5]
++
++#elif defined(__powerpc64__)
++#include <asm/ptrace.h>
++
++typedef struct pt_regs regs_struct;
++
++#ifdef ARCH_CPU_LITTLE_ENDIAN
++#define SECCOMP_ARCH AUDIT_ARCH_PPC64LE
++#else
++#define SECCOMP_ARCH AUDIT_ARCH_PPC64
++#endif
++
++#ifdef __GLIBC__
++#define SECCOMP_REG(_ctx, _reg) ((_ctx)->uc_mcontext.regs->gpr[_reg])
++#else
++#define SECCOMP_REG(_ctx, _reg) (((struct pt_regs *)(_ctx)->uc_mcontext.regs)->gpr[_reg])
++#endif
++
++#define SECCOMP_RESULT(_ctx) SECCOMP_REG(_ctx, 3)
++#define SECCOMP_SYSCALL(_ctx) SECCOMP_REG(_ctx, 0)
++#ifdef __GLIBC__
++#define SECCOMP_IP(_ctx) (_ctx)->uc_mcontext.regs->nip
++#else
++#define SECCOMP_IP(_ctx) ((struct pt_regs *)(_ctx)->uc_mcontext.regs)->nip
++#endif
++#define SECCOMP_PARM1(_ctx) SECCOMP_REG(_ctx, 3)
++#define SECCOMP_PARM2(_ctx) SECCOMP_REG(_ctx, 4)
++#define SECCOMP_PARM3(_ctx) SECCOMP_REG(_ctx, 5)
++#define SECCOMP_PARM4(_ctx) SECCOMP_REG(_ctx, 6)
++#define SECCOMP_PARM5(_ctx) SECCOMP_REG(_ctx, 7)
++#define SECCOMP_PARM6(_ctx) SECCOMP_REG(_ctx, 8)
++
++#define SECCOMP_NR_IDX (offsetof(struct arch_seccomp_data, nr))
++#define SECCOMP_ARCH_IDX (offsetof(struct arch_seccomp_data, arch))
++#define SECCOMP_IP_MSB_IDX \
++  (offsetof(struct arch_seccomp_data, instruction_pointer) + 4)
++#define SECCOMP_IP_LSB_IDX \
++  (offsetof(struct arch_seccomp_data, instruction_pointer) + 0)
++#define SECCOMP_ARG_MSB_IDX(nr) \
++  (offsetof(struct arch_seccomp_data, args) + 8 * (nr) + 4)
++#define SECCOMP_ARG_LSB_IDX(nr) \
++  (offsetof(struct arch_seccomp_data, args) + 8 * (nr) + 0)
++
++#define SECCOMP_PT_RESULT(_regs) (_regs).gpr[3]
++#define SECCOMP_PT_SYSCALL(_regs) (_regs).gpr[0]
++#define SECCOMP_PT_IP(_regs) (_regs).nip
++#define SECCOMP_PT_PARM1(_regs) (_regs).gpr[3]
++#define SECCOMP_PT_PARM2(_regs) (_regs).gpr[4]
++#define SECCOMP_PT_PARM3(_regs) (_regs).gpr[5]
++#define SECCOMP_PT_PARM4(_regs) (_regs).gpr[6]
++#define SECCOMP_PT_PARM5(_regs) (_regs).gpr[7]
++#define SECCOMP_PT_PARM6(_regs) (_regs).gpr[8]
++
+ #else
+ #error Unsupported target platform
+ 
+--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc
++++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc
+@@ -91,7 +91,8 @@ bool IsBaselinePolicyWatched(int sysno)
+          SyscallSets::IsPrctl(sysno) ||
+          SyscallSets::IsProcessGroupOrSession(sysno) ||
+ #if defined(__i386__) || \
+-    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
++    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
++    defined(__powerpc64__)
+          SyscallSets::IsSocketCall(sysno) ||
+ #endif
+ #if defined(__arm__)
+@@ -258,7 +259,7 @@ ResultExpr EvaluateSyscallImpl(int fs_de
+   }
+ 
+ #if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
+-    defined(__aarch64__)
++    defined(__aarch64__) || defined(__powerpc64__)
+   if (sysno == __NR_mmap)
+     return RestrictMmapFlags();
+ #endif
+@@ -279,7 +280,7 @@ ResultExpr EvaluateSyscallImpl(int fs_de
+     return RestrictPrctl();
+ 
+ #if defined(__x86_64__) || defined(__arm__) || defined(__mips__) || \
+-    defined(__aarch64__)
++    defined(__aarch64__) || defined(__powerpc64__)
+   if (sysno == __NR_socketpair) {
+     // Only allow AF_UNIX, PF_UNIX. Crash if anything else is seen.
+     static_assert(AF_UNIX == PF_UNIX,
+@@ -343,7 +344,8 @@ ResultExpr EvaluateSyscallImpl(int fs_de
+   }
+ 
+ #if defined(__i386__) || \
+-    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
++    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
++    defined(__powerpc64__)
+   if (SyscallSets::IsSocketCall(sysno))
+     return RestrictSocketcallCommand();
+ #endif
+--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/baseline_policy_unittest.cc
++++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/baseline_policy_unittest.cc
+@@ -317,7 +317,7 @@ TEST_BASELINE_SIGSYS(__NR_sysinfo)
+ TEST_BASELINE_SIGSYS(__NR_syslog)
+ TEST_BASELINE_SIGSYS(__NR_timer_create)
+ 
+-#if !defined(__aarch64__)
++#if !defined(__aarch64__) && !defined(__powerpc64__)
+ TEST_BASELINE_SIGSYS(__NR_inotify_init)
+ TEST_BASELINE_SIGSYS(__NR_vserver)
+ #endif
+--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc
++++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc
+@@ -40,7 +40,8 @@
+ #include <sys/ptrace.h>
+ #if (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) && \
+     !defined(__arm__) && !defined(__aarch64__) &&           \
+-    !defined(PTRACE_GET_THREAD_AREA)
++    !defined(PTRACE_GET_THREAD_AREA) &&			    \
++    !defined(__powerpc64__)
+ // Also include asm/ptrace-abi.h since ptrace.h in older libc (for instance
+ // the one in Ubuntu 16.04 LTS) is missing PTRACE_GET_THREAD_AREA.
+ // asm/ptrace-abi.h doesn't exist on arm32 and PTRACE_GET_THREAD_AREA isn't
+@@ -49,6 +50,11 @@
+ #endif
+ #endif  // !OS_NACL_NONSFI
+ 
++// On PPC64, TCGETS is defined in terms of struct termios, so we must include termios.h
++#ifdef __powerpc64__
++#include <termios.h>
++#endif
++
+ #if defined(OS_ANDROID)
+ 
+ #if !defined(F_DUPFD_CLOEXEC)
+@@ -106,6 +112,14 @@ inline bool IsArchitectureMips() {
+ #endif
+ }
+ 
++inline bool IsArchitecturePPC64() {
++#if defined(__powerpc64__)
++  return true;
++#else
++  return false;
++#endif
++}
++
+ // Ubuntu's version of glibc has a race condition in sem_post that can cause
+ // it to call futex(2) with bogus op arguments. To workaround this, we need
+ // to allow those futex(2) calls to fail with EINVAL, instead of crashing the
+@@ -270,6 +284,8 @@ ResultExpr RestrictFcntlCommands() {
+   uint64_t kOLargeFileFlag = O_LARGEFILE;
+   if (IsArchitectureX86_64() || IsArchitectureI386() || IsArchitectureMips())
+     kOLargeFileFlag = 0100000;
++  else if (IsArchitecturePPC64())
++    kOLargeFileFlag = 0200000;
+ 
+   const Arg<int> cmd(1);
+   const Arg<long> long_arg(2);
+@@ -287,7 +303,16 @@ ResultExpr RestrictFcntlCommands() {
+               F_SETLKW,
+               F_GETLK,
+               F_DUPFD,
+-              F_DUPFD_CLOEXEC),
++              F_DUPFD_CLOEXEC
++#if defined(__powerpc64__)
++// On PPC64, F_SETLK, F_GETLK, F_SETLKW are defined as the 64-bit variants
++// but glibc will sometimes still use the 32-bit versions. Allow both.
++              ,
++              5, /* F_GETLK (32) */
++              6, /* F_SETLK (32) */
++              7  /* F_SETLKW (32) */
++#endif
++	     ),
+              Allow())
+       .Case(F_SETFL,
+             If((long_arg & ~kAllowedMask) == 0, Allow()).Else(CrashSIGSYS()))
+@@ -297,7 +322,7 @@ ResultExpr RestrictFcntlCommands() {
+   // clang-format on
+ }
+ 
+-#if defined(__i386__) || defined(__mips__)
++#if defined(__i386__) || defined(__mips__) || defined(__powerpc64__)
+ ResultExpr RestrictSocketcallCommand() {
+   // Unfortunately, we are unable to restrict the first parameter to
+   // socketpair(2). Whilst initially sounding bad, it's noteworthy that very
+@@ -454,7 +479,7 @@ ResultExpr RestrictPtrace() {
+ #endif
+   return Switch(request)
+       .CASES((
+-#if !defined(__aarch64__)
++#if !defined(__aarch64__) && !defined(__powerpc64__)
+                  PTRACE_GETREGS, PTRACE_GETFPREGS,
+ #if defined(TRACE_GET_THREAD_AREA)
+                  PTRACE_GET_THREAD_AREA,
+--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.h
++++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.h
+@@ -49,7 +49,7 @@ SANDBOX_EXPORT bpf_dsl::ResultExpr Restr
+ // O_NONBLOCK | O_SYNC | O_LARGEFILE | O_CLOEXEC | O_NOATIME.
+ SANDBOX_EXPORT bpf_dsl::ResultExpr RestrictFcntlCommands();
+ 
+-#if defined(__i386__) || defined(__mips__)
++#if defined(__i386__) || defined(__mips__) || defined(__powerpc64__)
+ // Restrict socketcall(2) to only allow socketpair(2), send(2), recv(2),
+ // sendto(2), recvfrom(2), shutdown(2), sendmsg(2) and recvmsg(2).
+ SANDBOX_EXPORT bpf_dsl::ResultExpr RestrictSocketcallCommand();
+--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
++++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
+@@ -28,7 +28,7 @@ bool SyscallSets::IsKill(int sysno) {
+ bool SyscallSets::IsAllowedGettime(int sysno) {
+   switch (sysno) {
+     case __NR_gettimeofday:
+-#if defined(__i386__) || defined(__x86_64__) || \
++#if defined(__i386__) || defined(__x86_64__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_time:
+ #endif
+@@ -51,12 +51,12 @@ bool SyscallSets::IsAllowedGettime(int s
+                                     // filtered by RestrictClockID().
+     case __NR_clock_nanosleep_time64:  // Parameters filtered by RestrictClockID().
+ #endif
+-#if defined(__i386__) || \
++#if defined(__i386__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_ftime:  // Obsolete.
+ #endif
+     case __NR_settimeofday:  // Privileged.
+-#if defined(__i386__) || \
++#if defined(__i386__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_stime:
+ #endif
+@@ -135,7 +135,7 @@ bool SyscallSets::IsFileSystem(int sysno
+     case __NR_faccessat:  // EPERM not a valid errno.
+     case __NR_fchmodat:
+     case __NR_fchownat:  // Should be called chownat ?
+-#if defined(__x86_64__) || defined(__aarch64__)
++#if defined(__x86_64__) || defined(__aarch64__) || defined(__powerpc64__)
+     case __NR_newfstatat:  // fstatat(). EPERM not a valid errno.
+ #elif defined(__i386__) || defined(__arm__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+@@ -154,7 +154,7 @@ bool SyscallSets::IsFileSystem(int sysno
+     case __NR_memfd_create:
+     case __NR_mkdirat:
+     case __NR_mknodat:
+-#if defined(__i386__)
++#if defined(__i386__) || defined(__powerpc64__)
+     case __NR_oldlstat:
+     case __NR_oldstat:
+ #endif
+@@ -167,7 +167,7 @@ bool SyscallSets::IsFileSystem(int sysno
+     case __NR_stat64:
+ #endif
+     case __NR_statfs:  // EPERM not a valid errno.
+-#if defined(__i386__) || defined(__arm__) || \
++#if defined(__i386__) || defined(__arm__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_statfs64:
+ #endif
+@@ -179,7 +179,8 @@ bool SyscallSets::IsFileSystem(int sysno
+     case __NR_truncate64:
+ #endif
+     case __NR_unlinkat:
+-#if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
++#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
++    defined(__powerpc64__)
+     case __NR_utime:
+ #endif
+     case __NR_utimensat:  // New.
+@@ -204,7 +205,8 @@ bool SyscallSets::IsAllowedFileSystemAcc
+ #endif
+       return true;
+ // TODO(jln): these should be denied gracefully as well (moved below).
+-#if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
++#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
++    defined(__powerpc64__)
+     case __NR_fadvise64:  // EPERM not a valid errno.
+ #endif
+ #if defined(__i386__)
+@@ -216,12 +218,12 @@ bool SyscallSets::IsAllowedFileSystemAcc
+     case __NR_fdatasync:  // EPERM not a valid errno.
+     case __NR_flock:      // EPERM not a valid errno.
+     case __NR_fstatfs:    // Give information about the whole filesystem.
+-#if defined(__i386__) || defined(__arm__) || \
++#if defined(__i386__) || defined(__arm__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_fstatfs64:
+ #endif
+     case __NR_fsync:  // EPERM not a valid errno.
+-#if defined(__i386__)
++#if defined(__i386__) || defined(__powerpc64__)
+     case __NR_oldfstat:
+ #endif
+ #if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
+@@ -229,6 +231,8 @@ bool SyscallSets::IsAllowedFileSystemAcc
+     case __NR_sync_file_range:  // EPERM not a valid errno.
+ #elif defined(__arm__)
+     case __NR_arm_sync_file_range:  // EPERM not a valid errno.
++#elif defined(__powerpc64__)
++    case __NR_sync_file_range2: // EPERM not a valid errno.
+ #endif
+     default:
+       return false;
+@@ -248,7 +252,7 @@ bool SyscallSets::IsDeniedFileSystemAcce
+     case __NR_getdents:    // EPERM not a valid errno.
+ #endif
+     case __NR_getdents64:  // EPERM not a valid errno.
+-#if defined(__i386__) || \
++#if defined(__i386__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_readdir:
+ #endif
+@@ -290,7 +294,7 @@ bool SyscallSets::IsGetSimpleId(int sysn
+ bool SyscallSets::IsProcessPrivilegeChange(int sysno) {
+   switch (sysno) {
+     case __NR_capset:
+-#if defined(__i386__) || defined(__x86_64__)
++#if defined(__i386__) || defined(__x86_64__) || defined(__powerpc64__)
+     case __NR_ioperm:  // Intel privilege.
+     case __NR_iopl:    // Intel privilege.
+ #endif
+@@ -340,7 +344,7 @@ bool SyscallSets::IsAllowedSignalHandlin
+     case __NR_rt_sigprocmask:
+     case __NR_rt_sigreturn:
+     case __NR_rt_sigtimedwait:
+-#if defined(__i386__) || defined(__arm__) || \
++#if defined(__i386__) || defined(__arm__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_rt_sigtimedwait_time64:
+     case __NR_sigaction:
+@@ -357,7 +361,7 @@ bool SyscallSets::IsAllowedSignalHandlin
+     case __NR_signalfd:
+ #endif
+     case __NR_signalfd4:
+-#if defined(__i386__) || defined(__arm__) || \
++#if defined(__i386__) || defined(__arm__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_sigpending:
+     case __NR_sigsuspend:
+@@ -382,7 +386,7 @@ bool SyscallSets::IsAllowedOperationOnFd
+ #endif
+     case __NR_dup3:
+ #if defined(__x86_64__) || defined(__arm__) || defined(__mips__) || \
+-    defined(__aarch64__)
++    defined(__aarch64__) || defined(__powerpc64__)
+     case __NR_shutdown:
+ #endif
+       return true;
+@@ -416,7 +420,7 @@ bool SyscallSets::IsAllowedProcessStartO
+     case __NR_membarrier:
+     case __NR_wait4:
+     case __NR_waitid:
+-#if defined(__i386__)
++#if defined(__i386__) || defined(__powerpc64__)
+     case __NR_waitpid:
+ #endif
+ #if !defined(__GLIBC__)
+@@ -438,7 +442,7 @@ bool SyscallSets::IsAllowedProcessStartO
+     case __NR_set_tid_address:
+ #endif
+     case __NR_unshare:
+-#if !defined(__mips__) && !defined(__aarch64__)
++#if !defined(__mips__) && !defined(__aarch64__) || defined(__powerpc64__)
+     case __NR_vfork:
+ #endif
+     default:
+@@ -491,7 +495,7 @@ bool SyscallSets::IsAllowedGetOrModifySo
+       return true;
+     default:
+ #if defined(__x86_64__) || defined(__arm__) || defined(__mips__) || \
+-    defined(__aarch64__)
++    defined(__aarch64__) || defined(__powerpc64__)
+     case __NR_socketpair:  // We will want to inspect its argument.
+ #endif
+       return false;
+@@ -501,7 +505,7 @@ bool SyscallSets::IsAllowedGetOrModifySo
+ bool SyscallSets::IsDeniedGetOrModifySocket(int sysno) {
+   switch (sysno) {
+ #if defined(__x86_64__) || defined(__arm__) || defined(__mips__) || \
+-    defined(__aarch64__)
++    defined(__aarch64__) || defined(__powerpc64__)
+     case __NR_accept:
+     case __NR_accept4:
+     case __NR_bind:
+@@ -515,7 +519,7 @@ bool SyscallSets::IsDeniedGetOrModifySoc
+   }
+ }
+ 
+-#if defined(__i386__) || \
++#if defined(__i386__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+ // Big multiplexing system call for sockets.
+ bool SyscallSets::IsSocketCall(int sysno) {
+@@ -530,7 +534,8 @@ bool SyscallSets::IsSocketCall(int sysno
+ }
+ #endif
+ 
+-#if defined(__x86_64__) || defined(__arm__) || defined(__mips__)
++#if defined(__x86_64__) || defined(__arm__) || defined(__mips__) || \
++    defined(__powerpc64__)
+ bool SyscallSets::IsNetworkSocketInformation(int sysno) {
+   switch (sysno) {
+     case __NR_getpeername:
+@@ -558,7 +563,7 @@ bool SyscallSets::IsAllowedAddressSpaceA
+     case __NR_mincore:
+     case __NR_mlockall:
+ #if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
+-    defined(__aarch64__)
++    defined(__aarch64__) || defined(__powerpc64__)
+     case __NR_mmap:
+ #endif
+ #if defined(__i386__) || defined(__arm__) || \
+@@ -589,7 +594,7 @@ bool SyscallSets::IsAllowedAddressSpaceA
+ bool SyscallSets::IsAllowedGeneralIo(int sysno) {
+   switch (sysno) {
+     case __NR_lseek:
+-#if defined(__i386__) || defined(__arm__) || \
++#if defined(__i386__) || defined(__arm__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR__llseek:
+ #endif
+@@ -609,27 +614,27 @@ bool SyscallSets::IsAllowedGeneralIo(int
+     case __NR_read:
+     case __NR_readv:
+     case __NR_pread64:
+-#if defined(__arm__) || \
++#if defined(__arm__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_recv:
+ #endif
+ #if defined(__x86_64__) || defined(__arm__) || defined(__mips__) || \
+-    defined(__aarch64__)
++    defined(__aarch64__) || defined(__powerpc64__)
+     case __NR_recvfrom:  // Could specify source.
+     case __NR_recvmsg:   // Could specify source.
+ #endif
+-#if defined(__i386__) || defined(__x86_64__)
++#if defined(__i386__) || defined(__x86_64__) || defined(__powerpc64__)
+     case __NR_select:
+ #endif
+-#if defined(__i386__) || defined(__arm__) || defined(__mips__)
++#if defined(__i386__) || defined(__arm__) || defined(__mips__) || defined(__powerpc64__)
+     case __NR__newselect:
+ #endif
+-#if defined(__arm__) || \
++#if defined(__arm__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_send:
+ #endif
+ #if defined(__x86_64__) || defined(__arm__) || defined(__mips__) || \
+-    defined(__aarch64__)
++    defined(__aarch64__) || defined(__powerpc64__)
+     case __NR_sendmsg:  // Could specify destination.
+     case __NR_sendto:   // Could specify destination.
+ #endif
+@@ -684,7 +689,7 @@ bool SyscallSets::IsAllowedBasicSchedule
+     case __NR_nanosleep:
+       return true;
+     case __NR_getpriority:
+-#if defined(__i386__) || defined(__arm__) || \
++#if defined(__i386__) || defined(__arm__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_nice:
+ #endif
+@@ -696,7 +701,7 @@ bool SyscallSets::IsAllowedBasicSchedule
+ 
+ bool SyscallSets::IsAdminOperation(int sysno) {
+   switch (sysno) {
+-#if defined(__i386__) || defined(__arm__) || \
++#if defined(__i386__) || defined(__arm__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_bdflush:
+ #endif
+@@ -713,7 +718,8 @@ bool SyscallSets::IsAdminOperation(int s
+ 
+ bool SyscallSets::IsKernelModule(int sysno) {
+   switch (sysno) {
+-#if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
++#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
++    defined(__powerpc64__)
+     case __NR_create_module:
+     case __NR_get_kernel_syms:  // Should ENOSYS.
+     case __NR_query_module:
+@@ -745,7 +751,7 @@ bool SyscallSets::IsFsControl(int sysno)
+     case __NR_quotactl:
+     case __NR_swapoff:
+     case __NR_swapon:
+-#if defined(__i386__) || \
++#if defined(__i386__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_umount:
+ #endif
+@@ -762,7 +768,7 @@ bool SyscallSets::IsNuma(int sysno) {
+     case __NR_getcpu:
+     case __NR_mbind:
+ #if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
+-    defined(__aarch64__)
++    defined(__aarch64__) || defined(__powerpc64__)
+     case __NR_migrate_pages:
+ #endif
+     case __NR_move_pages:
+@@ -797,13 +803,13 @@ bool SyscallSets::IsGlobalProcessEnviron
+   switch (sysno) {
+     case __NR_acct:  // Privileged.
+ #if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
+-    defined(__aarch64__)
++    defined(__aarch64__) || defined(__powerpc64__)
+     case __NR_getrlimit:
+ #endif
+-#if defined(__i386__) || defined(__arm__)
++#if defined(__i386__) || defined(__arm__) || defined(__powerpc64__)
+     case __NR_ugetrlimit:
+ #endif
+-#if defined(__i386__) || \
++#if defined(__i386__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_ulimit:
+ #endif
+@@ -838,7 +844,7 @@ bool SyscallSets::IsGlobalSystemStatus(i
+ #endif
+     case __NR_sysinfo:
+     case __NR_uname:
+-#if defined(__i386__)
++#if defined(__i386__) || defined(__powerpc64__)
+     case __NR_olduname:
+     case __NR_oldolduname:
+ #endif
+@@ -904,8 +910,16 @@ bool SyscallSets::IsSystemVSemaphores(in
+ }
+ #endif
+ 
++/* shitty hack around Void's 4.19 kernel headers missing those numbers */
++#if defined(__powerpc64__) && !defined(__NR_shmget)
++#define __NR_shmget 395
++#define __NR_shmctl 396
++#define __NR_shmat 397
++#define __NR_shmdt 398
++#endif
++
+ #if defined(__i386__) || defined(__x86_64__) || defined(__arm__) || \
+-    defined(__aarch64__) ||                                         \
++    defined(__aarch64__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_64_BITS))
+ // These give a lot of ambient authority and bypass the setuid sandbox.
+ bool SyscallSets::IsSystemVSharedMemory(int sysno) {
+@@ -936,7 +950,7 @@ bool SyscallSets::IsSystemVMessageQueue(
+ }
+ #endif
+ 
+-#if defined(__i386__) || \
++#if defined(__i386__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+ // Big system V multiplexing system call.
+ bool SyscallSets::IsSystemVIpc(int sysno) {
+@@ -956,7 +970,7 @@ bool SyscallSets::IsAnySystemV(int sysno
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_64_BITS))
+   return IsSystemVMessageQueue(sysno) || IsSystemVSemaphores(sysno) ||
+          IsSystemVSharedMemory(sysno);
+-#elif defined(__i386__) || \
++#elif defined(__i386__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+   return IsSystemVIpc(sysno);
+ #endif
+@@ -1014,7 +1028,8 @@ bool SyscallSets::IsFaNotify(int sysno)
+ bool SyscallSets::IsTimer(int sysno) {
+   switch (sysno) {
+     case __NR_getitimer:
+-#if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
++#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
++    defined(__powerpc64__)
+     case __NR_alarm:
+ #endif
+     case __NR_setitimer:
+@@ -1096,17 +1111,20 @@ bool SyscallSets::IsMisc(int sysno) {
+     case __NR_syncfs:
+     case __NR_vhangup:
+ // The system calls below are not implemented.
+-#if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
++#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
++    defined(__powerpc64__)
+     case __NR_afs_syscall:
+ #endif
+ #if defined(__i386__) || \
+-    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
++    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
++    defined(__powerpc64__)
+     case __NR_break:
+ #endif
+-#if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
++#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
++    defined(__powerpc64__)
+     case __NR_getpmsg:
+ #endif
+-#if defined(__i386__) || \
++#if defined(__i386__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_gtty:
+     case __NR_idle:
+@@ -1115,20 +1133,21 @@ bool SyscallSets::IsMisc(int sysno) {
+     case __NR_prof:
+     case __NR_profil:
+ #endif
+-#if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
++#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
++    defined(__powerpc64__)
+     case __NR_putpmsg:
+ #endif
+ #if defined(__x86_64__)
+     case __NR_security:
+ #endif
+-#if defined(__i386__) || \
++#if defined(__i386__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_stty:
+ #endif
+-#if defined(__x86_64__)
++#if defined(__x86_64__) || defined(__powerpc64__)
+     case __NR_tuxcall:
+ #endif
+-#if !defined(__aarch64__)
++#if !defined(__aarch64__) && !defined(__powerpc64__)
+     case __NR_vserver:
+ #endif
+       return true;
+--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_sets.h
++++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_sets.h
+@@ -43,13 +43,14 @@ class SANDBOX_EXPORT SyscallSets {
+   static bool IsDeniedGetOrModifySocket(int sysno);
+ 
+ #if defined(__i386__) || \
+-    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
++    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
++    defined(__powerpc64__)
+   // Big multiplexing system call for sockets.
+   static bool IsSocketCall(int sysno);
+ #endif
+ 
+ #if defined(__x86_64__) || defined(__arm__) || defined(__mips__) || \
+-    defined(__aarch64__)
++    defined(__aarch64__) || defined(__powerpc64__)
+   static bool IsNetworkSocketInformation(int sysno);
+ #endif
+ 
+@@ -77,7 +78,7 @@ class SANDBOX_EXPORT SyscallSets {
+   static bool IsSystemVSemaphores(int sysno);
+ #endif
+ #if defined(__i386__) || defined(__x86_64__) || defined(__arm__) || \
+-    defined(__aarch64__) ||                                         \
++    defined(__aarch64__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_64_BITS))
+   // These give a lot of ambient authority and bypass the setuid sandbox.
+   static bool IsSystemVSharedMemory(int sysno);
+@@ -89,7 +90,8 @@ class SANDBOX_EXPORT SyscallSets {
+ #endif
+ 
+ #if defined(__i386__) || \
+-    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
++    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
++    defined(__powerpc64__)
+   // Big system V multiplexing system call.
+   static bool IsSystemVIpc(int sysno);
+ #endif
+--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf/syscall.cc
++++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf/syscall.cc
+@@ -18,7 +18,7 @@ namespace sandbox {
+ namespace {
+ 
+ #if defined(ARCH_CPU_X86_FAMILY) || defined(ARCH_CPU_ARM_FAMILY) || \
+-    defined(ARCH_CPU_MIPS_FAMILY)
++    defined(ARCH_CPU_MIPS_FAMILY) || defined (ARCH_CPU_PPC64_FAMILY)
+ // Number that's not currently used by any Linux kernel ABIs.
+ const int kInvalidSyscallNumber = 0x351d3;
+ #else
+@@ -312,10 +312,54 @@ asm(// We need to be able to tell the ke
+     "2:ret\n"
+     ".cfi_endproc\n"
+     ".size SyscallAsm, .-SyscallAsm\n"
++#elif defined(__powerpc64__)
++    ".text\n"
++    ".align 4\n"
++    ".type SyscallAsm @function\n"
++    "SyscallAsm:\n"
++    ".cfi_startproc\n"
++
++    // Check if r3 is negative
++    "cmpdi 3, 0\n"
++    "bgt 2f\n"
++
++    // Load address of 3f into r3 and return
++    "mflr 10\n"
++    "bl 1f\n"
++    "1: mflr 3\n"
++    "mtlr 10\n"
++    "addi 3, 3, 4*13\n"
++    "blr\n"
++
++    // Load arguments from array into r3-8
++    // save param 3 in r10
++    "2:\n"
++    "mr 0, 3\n"
++    "ld 3, 0(4)\n"
++    "ld 5, 16(4)\n"
++    "ld 6, 24(4)\n"
++    "ld 7, 32(4)\n"
++    "ld 8, 40(4)\n"
++    "ld 4, 8(4)\n"
++    "li 9, 0\n"
++
++    // Enter kernel
++    "sc\n"
++
++    // Magic return address
++    "3:\n"
++    // Like MIPS, ppc64 return values are always positive.
++    // Check for error in cr0.SO and negate upon error
++    "bc 4, 3, 4f\n"
++    "neg 3, 3\n"
++    "4: blr\n"
++
++    ".cfi_endproc\n"
++    ".size SyscallAsm, .-SyscallAsm\n"
+ #endif
+     );  // asm
+ 
+-#if defined(__x86_64__)
++#if defined(__x86_64__) || defined(__powerpc64__)
+ extern "C" {
+ intptr_t SyscallAsm(intptr_t nr, const intptr_t args[6]);
+ }
+@@ -429,6 +473,8 @@ intptr_t Syscall::Call(int nr,
+     ret = inout;
+   }
+ 
++#elif defined(__powerpc64__)
++  intptr_t ret = SyscallAsm(nr, args);
+ #else
+ #error "Unimplemented architecture"
+ #endif
+@@ -445,8 +491,26 @@ void Syscall::PutValueInUcontext(intptr_
+     // needs to be changed back.
+     ret_val = -ret_val;
+     SECCOMP_PARM4(ctx) = 1;
+-  } else
++  } else {
+     SECCOMP_PARM4(ctx) = 0;
++  }
++#endif
++#if defined(__powerpc64__)
++  // Same as MIPS, need to invert ret and set error register (cr0.SO)
++  if (ret_val <= -1 && ret_val >= -4095) {
++    ret_val = -ret_val;
++#ifdef __GLIBC__
++    ctx->uc_mcontext.regs->ccr |= (1 << 28);
++#else
++    ((struct pt_regs *)ctx->uc_mcontext.regs)->ccr |= (1 << 28);
++#endif
++  } else {
++#ifdef __GLIBC__
++    ctx->uc_mcontext.regs->ccr &= ~(1 << 28);
++#else
++    ((struct pt_regs *)ctx->uc_mcontext.regs)->ccr &= ~(1 << 28);
++#endif
++  }
+ #endif
+   SECCOMP_RESULT(ctx) = static_cast<greg_t>(ret_val);
+ }
+--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf/trap.cc
++++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf/trap.cc
+@@ -236,6 +236,20 @@ void Trap::SigSys(int nr, LinuxSigInfo*
+       SetIsInSigHandler();
+     }
+ 
++#if defined(__powerpc64__)
++    // On ppc64+glibc, some syscalls seem to accidentally negate the first
++    // parameter which causes checks against it to fail. For now, manually
++    // negate them back.
++    // TODO(shawn@anastas.io): investigate this issue further
++    auto nr = SECCOMP_SYSCALL(ctx);
++    if (nr == __NR_openat || nr == __NR_mkdirat || nr == __NR_faccessat || nr == __NR_readlinkat ||
++        nr == __NR_renameat || nr == __NR_renameat2 || nr == __NR_newfstatat || nr == __NR_unlinkat) {
++        if (static_cast<int>(SECCOMP_PARM1(ctx)) > 0) {
++            SECCOMP_PARM1(ctx) = -SECCOMP_PARM1(ctx);
++        }
++    }
++#endif
++
+     // Copy the seccomp-specific data into a arch_seccomp_data structure. This
+     // is what we are showing to TrapFnc callbacks that the system call
+     // evaluator registered with the sandbox.
+--- a/src/3rdparty/chromium/sandbox/linux/services/credentials.cc
++++ b/src/3rdparty/chromium/sandbox/linux/services/credentials.cc
+@@ -81,7 +81,7 @@ bool ChrootToSafeEmptyDir() {
+   pid_t pid = -1;
+   alignas(16) char stack_buf[PTHREAD_STACK_MIN];
+ #if defined(ARCH_CPU_X86_FAMILY) || defined(ARCH_CPU_ARM_FAMILY) || \
+-    defined(ARCH_CPU_MIPS_FAMILY)
++    defined(ARCH_CPU_MIPS_FAMILY) || defined(ARCH_CPU_PPC64_FAMILY)
+   // The stack grows downward.
+   void* stack = stack_buf + sizeof(stack_buf);
+ #else
+--- a/src/3rdparty/chromium/sandbox/linux/services/syscall_wrappers.cc
++++ b/src/3rdparty/chromium/sandbox/linux/services/syscall_wrappers.cc
+@@ -61,7 +61,7 @@ long sys_clone(unsigned long flags,
+ #if defined(ARCH_CPU_X86_64)
+   return syscall(__NR_clone, flags, child_stack, ptid, ctid, tls);
+ #elif defined(ARCH_CPU_X86) || defined(ARCH_CPU_ARM_FAMILY) || \
+-    defined(ARCH_CPU_MIPS_FAMILY)
++    defined(ARCH_CPU_MIPS_FAMILY) || defined(ARCH_CPU_PPC64_FAMILY)
+   // CONFIG_CLONE_BACKWARDS defined.
+   return syscall(__NR_clone, flags, child_stack, ptid, tls, ctid);
+ #endif
+--- a/src/3rdparty/chromium/sandbox/linux/syscall_broker/broker_process.cc
++++ b/src/3rdparty/chromium/sandbox/linux/syscall_broker/broker_process.cc
+@@ -165,7 +165,7 @@ bool BrokerProcess::IsSyscallBrokerable(
+ #if defined(__NR_fstatat64)
+     case __NR_fstatat64:
+ #endif
+-#if defined(__x86_64__) || defined(__aarch64__)
++#if defined(__x86_64__) || defined(__aarch64__) || defined(__powerpc64__)
+     case __NR_newfstatat:
+ #endif
+       return !fast_check || allowed_command_set_.test(COMMAND_STAT);
+--- a/src/3rdparty/chromium/sandbox/linux/system_headers/linux_seccomp.h
++++ b/src/3rdparty/chromium/sandbox/linux/system_headers/linux_seccomp.h
+@@ -41,6 +41,9 @@
+ #ifndef EM_AARCH64
+ #define EM_AARCH64 183
+ #endif
++#ifndef EM_PPC64
++#define EM_PPC64 21
++#endif
+ 
+ #ifndef __AUDIT_ARCH_64BIT
+ #define __AUDIT_ARCH_64BIT 0x80000000
+@@ -74,6 +77,14 @@
+ #define AUDIT_ARCH_AARCH64 (EM_AARCH64 | __AUDIT_ARCH_64BIT | __AUDIT_ARCH_LE)
+ #endif
+ 
++#ifndef AUDIT_ARCH_PPC64
++#define AUDIT_ARCH_PPC64 (EM_PPC64 | __AUDIT_ARCH_64BIT)
++#endif
++
++#ifndef AUDIT_ARCH_PPC64LE
++#define AUDIT_ARCH_PPC64LE (EM_PPC64 | __AUDIT_ARCH_64BIT | __AUDIT_ARCH_LE)
++#endif
++
+ // For prctl.h
+ #ifndef PR_SET_SECCOMP
+ #define PR_SET_SECCOMP               22
+--- a/src/3rdparty/chromium/sandbox/linux/system_headers/linux_signal.h
++++ b/src/3rdparty/chromium/sandbox/linux/system_headers/linux_signal.h
+@@ -13,7 +13,7 @@
+ // (not undefined, but defined different values and in different memory
+ // layouts). So, fill the gap here.
+ #if defined(__i386__) || defined(__x86_64__) || defined(__arm__) || \
+-    defined(__aarch64__)
++    defined(__aarch64__) || defined(__powerpc64__)
+ 
+ #define LINUX_SIGHUP 1
+ #define LINUX_SIGINT 2
+--- a/src/3rdparty/chromium/sandbox/linux/system_headers/linux_syscalls.h
++++ b/src/3rdparty/chromium/sandbox/linux/system_headers/linux_syscalls.h
+@@ -35,5 +35,9 @@
+ #include "sandbox/linux/system_headers/arm64_linux_syscalls.h"
+ #endif
+ 
++#if defined(__powerpc64__)
++#include "sandbox/linux/system_headers/ppc64_linux_syscalls.h"
++#endif
++
+ #endif  // SANDBOX_LINUX_SYSTEM_HEADERS_LINUX_SYSCALLS_H_
+ 
+--- a/src/3rdparty/chromium/sandbox/linux/system_headers/linux_ucontext.h
++++ b/src/3rdparty/chromium/sandbox/linux/system_headers/linux_ucontext.h
+@@ -11,6 +11,8 @@
+ #include "sandbox/linux/system_headers/arm_linux_ucontext.h"
+ #elif defined(__i386__)
+ #include "sandbox/linux/system_headers/i386_linux_ucontext.h"
++#elif defined(__powerpc64__)
++#include "sandbox/linux/system_headers/ppc64_linux_ucontext.h"
+ #else
+ #error "No support for your architecture in PNaCl header"
+ #endif
+--- a/src/3rdparty/chromium/sandbox/policy/linux/bpf_renderer_policy_linux.cc
++++ b/src/3rdparty/chromium/sandbox/policy/linux/bpf_renderer_policy_linux.cc
+@@ -15,6 +15,11 @@
+ #include "sandbox/linux/system_headers/linux_syscalls.h"
+ #include "sandbox/policy/linux/sandbox_linux.h"
+ 
++// On PPC64, TCGETS is defined in terms of struct termios, so we must include termios.h
++#ifdef __powerpc64__
++#include <termios.h>
++#endif
++
+ // TODO(vignatti): replace the local definitions below with #include
+ // <linux/dma-buf.h> once kernel version 4.6 becomes widely used.
+ #include <linux/types.h>
+--- a/src/3rdparty/chromium/third_party/angle/src/compiler/translator/InfoSink.h
++++ b/src/3rdparty/chromium/third_party/angle/src/compiler/translator/InfoSink.h
+@@ -93,7 +93,16 @@ class TInfoSinkBase
+             stream.precision(8);
+             stream << f;
+         }
+-        sink.append(stream.str());
++
++        // Hack to work around a bug where negative floating point values
++        // are rendered like '.0.5' instead of '-0.5'
++        std::string res(stream.str());
++
++        if (signbit(f)) { // test if f is negative
++            res[0] = '-';
++        }
++
++        sink.append(res);
+         return *this;
+     }
+     // Write boolean values as their names instead of integral value.
+--- a/src/3rdparty/chromium/third_party/angle/src/libANGLE/Constants.h
++++ b/src/3rdparty/chromium/third_party/angle/src/libANGLE/Constants.h
+@@ -9,6 +9,7 @@
+ #ifndef LIBANGLE_CONSTANTS_H_
+ #define LIBANGLE_CONSTANTS_H_
+ 
++#include <cstddef>
+ #include "common/platform.h"
+ 
+ #include <stdint.h>
+--- a/src/3rdparty/chromium/third_party/boringssl/BUILD.gn
++++ b/src/3rdparty/chromium/third_party/boringssl/BUILD.gn
+@@ -99,6 +99,13 @@ if (is_win && !is_msan && current_cpu !=
+       } else {
+         public_configs = [ ":no_asm_config" ]
+       }
++    } else if (current_cpu == "ppc64") {
++      if (is_linux) {
++        # TODO: ppc64 (be) check
++        sources += crypto_sources_linux_ppc64le
++      } else {
++        public_configs = [ ":no_asm_config" ]
++      }
+     } else {
+       public_configs = [ ":no_asm_config" ]
+     }
+--- a/src/3rdparty/chromium/third_party/breakpad/BUILD.gn
++++ b/src/3rdparty/chromium/third_party/breakpad/BUILD.gn
+@@ -623,7 +623,6 @@ if (is_linux || is_chromeos || is_androi
+       "breakpad/src/client/minidump_file_writer.h",
+       "breakpad/src/common/convert_UTF.cc",
+       "breakpad/src/common/convert_UTF.h",
+-      "breakpad/src/common/linux/breakpad_getcontext.S",
+       "breakpad/src/common/linux/elf_core_dump.cc",
+       "breakpad/src/common/linux/elf_core_dump.h",
+       "breakpad/src/common/linux/elfutils.cc",
+@@ -663,6 +662,15 @@ if (is_linux || is_chromeos || is_androi
+ 
+     libs = [ "dl" ]
+ 
++    if (current_cpu == "ppc64") {
++        defines = [ "HAVE_GETCONTEXT" ]
++        libs += [ "ucontext" ]
++    } else {
++        sources += [
++            "breakpad/src/common/linux/breakpad_getcontext.S"
++        ]
++    }
++
+     include_dirs = [
+       ".",
+       "breakpad/src",
+@@ -712,7 +720,6 @@ if (is_linux || is_chromeos || is_androi
+       "breakpad/src/client/linux/minidump_writer/minidump_writer_unittest.cc",
+       "breakpad/src/client/linux/minidump_writer/minidump_writer_unittest_utils.cc",
+       "breakpad/src/client/linux/minidump_writer/proc_cpuinfo_reader_unittest.cc",
+-      "breakpad/src/common/linux/breakpad_getcontext_unittest.cc",
+       "breakpad/src/common/linux/elf_core_dump_unittest.cc",
+       "breakpad/src/common/linux/file_id_unittest.cc",
+       "breakpad/src/common/linux/linux_libc_support_unittest.cc",
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/raw_context_cpu.h
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/raw_context_cpu.h
+@@ -44,6 +44,8 @@ typedef MDRawContextARM RawContextCPU;
+ typedef MDRawContextARM64_Old RawContextCPU;
+ #elif defined(__mips__)
+ typedef MDRawContextMIPS RawContextCPU;
++#elif defined(__powerpc64__)
++typedef MDRawContextPPC64 RawContextCPU;
+ #else
+ #error "This code has not been ported to your platform yet."
+ #endif
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.cc
+@@ -270,7 +270,54 @@ void ThreadInfo::FillCPUContext(RawConte
+   out->float_save.fir = mcontext.fpc_eir;
+ #endif
+ }
+-#endif  // __mips__
++
++#elif defined(__powerpc64__)
++
++#if !defined(__GLIBC__)
++#include <asm/elf.h>
++#include <asm/ptrace.h>
++#endif
++
++uintptr_t ThreadInfo::GetInstructionPointer() const {
++    return mcontext.gp_regs[PT_NIP];
++}
++
++void ThreadInfo::FillCPUContext(RawContextCPU* out) const {
++    out->context_flags = MD_CONTEXT_PPC64_FULL;
++    for (int i = 0; i < MD_CONTEXT_PPC64_GPR_COUNT; i++)
++        out->gpr[i] = mcontext.gp_regs[i];
++
++    out->lr = mcontext.gp_regs[PT_LNK];
++    out->srr0 = mcontext.gp_regs[PT_NIP];
++    out->srr1 = mcontext.gp_regs[PT_MSR];
++    out->cr = mcontext.gp_regs[PT_CCR];
++    out->xer = mcontext.gp_regs[PT_XER];
++    out->ctr = mcontext.gp_regs[PT_CTR];
++
++#ifdef __GLIBC__
++    for (int i = 0; i < MD_FLOATINGSAVEAREA_PPC_FPR_COUNT; i++)
++        out->float_save.fpregs[i] = mcontext.fp_regs[i];
++
++    out->float_save.fpscr = mcontext.fp_regs[NFPREG-1];
++#else
++    for (int i = 0; i < MD_FLOATINGSAVEAREA_PPC_FPR_COUNT; i++)
++        out->float_save.fpregs[i] = ((uint64_t *)&mcontext.fp_regs)[i];
++
++     out->float_save.fpscr = ((uint64_t *)&mcontext.fp_regs)[ELF_NFPREG-1];
++#endif
++
++    for (int i = 0; i < MD_VECTORSAVEAREA_PPC_VR_COUNT; i++)
++        out->vector_save.save_vr[i] = \
++            {(((uint64_t)vregs.vrregs[i][0]) << 32)
++                          | vregs.vrregs[i][1],
++            (((uint64_t)vregs.vrregs[i][2]) << 32)
++                         | vregs.vrregs[i][3]};
++
++    out->vrsave = vregs.vrsave;
++    out->vector_save.save_vscr = {0, vregs.vscr.vscr_word};
++    out->vector_save.save_vrvalid = 0xFFFFFFFF;
++}
++#endif  // __powerpc64__
+ 
+ void ThreadInfo::GetGeneralPurposeRegisters(void** gp_regs, size_t* size) {
+   assert(gp_regs || size);
+@@ -279,6 +326,11 @@ void ThreadInfo::GetGeneralPurposeRegist
+     *gp_regs = mcontext.gregs;
+   if (size)
+     *size = sizeof(mcontext.gregs);
++#elif defined(__powerpc64__)
++  if (gp_regs)
++    *gp_regs = mcontext.gp_regs;
++  if (size)
++    *size = sizeof(mcontext.gp_regs);
+ #else
+   if (gp_regs)
+     *gp_regs = &regs;
+@@ -294,6 +346,11 @@ void ThreadInfo::GetFloatingPointRegiste
+     *fp_regs = &mcontext.fpregs;
+   if (size)
+     *size = sizeof(mcontext.fpregs);
++#elif defined(__powerpc64__)
++  if (fp_regs)
++    *fp_regs = &mcontext.fp_regs;
++  if (size)
++    *size = sizeof(mcontext.fp_regs);
+ #else
+   if (fp_regs)
+     *fp_regs = &fpregs;
+@@ -302,4 +359,13 @@ void ThreadInfo::GetFloatingPointRegiste
+ #endif
+ }
+ 
++#if defined(__powerpc64__)
++void ThreadInfo::GetVectorRegisters(void** v_regs, size_t* size) {
++    if (v_regs)
++        *v_regs = &vregs;
++    if (size)
++        *size = sizeof(vregs);
++}
++#endif
++
+ }  // namespace google_breakpad
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.h
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.h
+@@ -68,6 +68,10 @@ struct ThreadInfo {
+   // Use the structures defined in <sys/user.h>
+   struct user_regs_struct regs;
+   struct user_fpsimd_struct fpregs;
++#elif defined(__powerpc64__)
++  // Use the structures defined in <sys/ucontext.h>.
++  mcontext_t mcontext;
++  vrregset_t vregs;
+ #elif defined(__mips__)
+   // Use the structure defined in <sys/ucontext.h>.
+   mcontext_t mcontext;
+@@ -84,6 +88,11 @@ struct ThreadInfo {
+ 
+   // Returns the pointer and size of float point register area.
+   void GetFloatingPointRegisters(void** fp_regs, size_t* size);
++
++#if defined(__powerpc64__)
++  // Returns the pointer and size of the vector register area. (PPC64 only)
++  void GetVectorRegisters(void** v_regs, size_t* size);
++#endif
+ };
+ 
+ }  // namespace google_breakpad
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc
+@@ -254,6 +254,60 @@ void UContextReader::FillCPUContext(RawC
+   out->float_save.fir = uc->uc_mcontext.fpc_eir;  // Unused.
+ #endif
+ }
++
++#elif defined(__powerpc64__)
++
++#ifndef __GLIBC__
++#include <asm/elf.h>
++#include <asm/ptrace.h>
++#endif
++
++uintptr_t UContextReader::GetStackPointer(const ucontext_t* uc) {
++    return uc->uc_mcontext.gp_regs[MD_CONTEXT_PPC64_REG_SP];
++}
++
++uintptr_t UContextReader::GetInstructionPointer(const ucontext_t* uc) {
++    return uc->uc_mcontext.gp_regs[PT_NIP];
++}
++
++void UContextReader::FillCPUContext(RawContextCPU* out, const ucontext_t* uc,
++                                    const vrregset_t* vregs) {
++    out->context_flags = MD_CONTEXT_PPC64_FULL;
++
++    for (int i = 0; i < MD_CONTEXT_PPC64_GPR_COUNT; i++)
++        out->gpr[i] = uc->uc_mcontext.gp_regs[i];
++
++    out->lr = uc->uc_mcontext.gp_regs[PT_LNK];
++    out->srr0 = uc->uc_mcontext.gp_regs[PT_NIP];
++    out->srr1 = uc->uc_mcontext.gp_regs[PT_MSR];
++    out->cr = uc->uc_mcontext.gp_regs[PT_CCR];
++    out->xer = uc->uc_mcontext.gp_regs[PT_XER];
++    out->ctr = uc->uc_mcontext.gp_regs[PT_CTR];
++
++#ifdef __GLIBC__
++    for (int i = 0; i < MD_FLOATINGSAVEAREA_PPC_FPR_COUNT; i++)
++        out->float_save.fpregs[i] = uc->uc_mcontext.fp_regs[i];
++
++    out->float_save.fpscr = uc->uc_mcontext.fp_regs[NFPREG-1];
++#else
++    for (int i = 0; i < MD_FLOATINGSAVEAREA_PPC_FPR_COUNT; i++)
++        out->float_save.fpregs[i] = ((uint64_t *)&uc->uc_mcontext.fp_regs)[i];
++
++    out->float_save.fpscr = ((uint64_t *)&uc->uc_mcontext.fp_regs)[ELF_NFPREG-1];
++#endif
++
++    for (int i = 0; i < MD_VECTORSAVEAREA_PPC_VR_COUNT; i++)
++        out->vector_save.save_vr[i] =
++            {(((uint64_t)vregs->vrregs[i][0]) << 32)
++                         | vregs->vrregs[i][1],
++             (((uint64_t)vregs->vrregs[i][2]) << 32)
++                         | vregs->vrregs[i][3]};
++
++    out->vrsave = vregs->vrsave;
++    out->vector_save.save_vscr = {0, vregs->vscr.vscr_word};
++    out->vector_save.save_vrvalid = 0xFFFFFFFF;
++}
++
+ #endif
+ 
+ }  // namespace google_breakpad
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h
+@@ -59,6 +59,9 @@ struct UContextReader {
+ #elif defined(__aarch64__)
+   static void FillCPUContext(RawContextCPU* out, const ucontext_t* uc,
+                              const struct fpsimd_context* fpregs);
++#elif defined(__powerpc64__)
++  static void FillCPUContext(RawContextCPU *out, const ucontext_t *uc,
++                             const vrregset_t* vregs);
+ #else
+   static void FillCPUContext(RawContextCPU* out, const ucontext_t* uc);
+ #endif
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc
+@@ -105,6 +105,13 @@
+ #define PR_SET_PTRACER 0x59616d61
+ #endif
+ 
++/* musl hack, can't include asm/ptrace.h as that causes conflicts */
++#ifndef __GLIBC__
++#if defined(__powerpc64__) && !defined(PT_NIP)
++#define PT_NIP 32
++#endif
++#endif
++
+ namespace google_breakpad {
+ 
+ namespace {
+@@ -461,9 +468,16 @@ bool ExceptionHandler::HandleSignal(int
+     memcpy(&g_crash_context_.float_state, fp_ptr,
+            sizeof(g_crash_context_.float_state));
+   }
++#elif defined(__powerpc64__)
++  // On PPC64, we must copy VR state
++  ucontext_t* uc_ptr = (ucontext_t*)uc;
++  if (uc_ptr->uc_mcontext.v_regs) {
++    memcpy(&g_crash_context_.vector_state, uc_ptr->uc_mcontext.v_regs,
++           sizeof(g_crash_context_.vector_state));
++  }
+ #elif !defined(__ARM_EABI__) && !defined(__mips__)
+   // FP state is not part of user ABI on ARM Linux.
+-  // In case of MIPS Linux FP state is already part of ucontext_t
++  // In case of MIPS, Linux FP state is already part of ucontext_t
+   // and 'float_state' is not a member of CrashContext.
+   ucontext_t* uc_ptr = (ucontext_t*)uc;
+   if (uc_ptr->uc_mcontext.fpregs) {
+@@ -708,11 +722,19 @@ bool ExceptionHandler::WriteMinidump() {
+   }
+ #endif
+ 
+-#if !defined(__ARM_EABI__) && !defined(__aarch64__) && !defined(__mips__)
++#if !defined(__ARM_EABI__) && !defined(__aarch64__) && !defined(__mips__) \
++    && !defined(__powerpc64__)
+   // FPU state is not part of ARM EABI ucontext_t.
+   memcpy(&context.float_state, context.context.uc_mcontext.fpregs,
+          sizeof(context.float_state));
+ #endif
++
++#if defined(__powerpc64__)
++  // Vector registers must be copied on PPC64
++  memcpy(&context.vector_state, context.context.uc_mcontext.v_regs,
++         sizeof(context.vector_state));
++#endif
++
+   context.tid = sys_gettid();
+ 
+   // Add an exception stream to the minidump for better reporting.
+@@ -733,6 +755,9 @@ bool ExceptionHandler::WriteMinidump() {
+ #elif defined(__mips__)
+   context.siginfo.si_addr =
+       reinterpret_cast<void*>(context.context.uc_mcontext.pc);
++#elif defined(__powerpc64__)
++  context.siginfo.si_addr =
++      reinterpret_cast<void*>(context.context.uc_mcontext.gp_regs[PT_NIP]);
+ #else
+ #error "This code has not been ported to your platform yet."
+ #endif
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.h
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.h
+@@ -192,7 +192,11 @@ class ExceptionHandler {
+     siginfo_t siginfo;
+     pid_t tid;  // the crashing thread.
+     ucontext_t context;
+-#if !defined(__ARM_EABI__) && !defined(__mips__)
++#if defined(__powerpc64__)
++    // PPC64's FP state is a part of ucontext_t like MIPS but the vector
++    // state is not, so a struct is needed.
++    vstate_t vector_state;
++#elif !defined(__ARM_EABI__) && !defined(__mips__)
+     // #ifdef this out because FP state is not part of user ABI for Linux ARM.
+     // In case of MIPS Linux FP state is already part of ucontext_t so
+     // 'float_state' is not required.
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler_unittest.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler_unittest.cc
+@@ -307,7 +307,7 @@ TEST(ExceptionHandlerTest, ParallelChild
+   }
+ 
+   // Wait a while until the child should have crashed.
+-  usleep(1000000);
++  usleep(2000000);
+   // Kill the child if it is still running.
+   kill(child, SIGKILL);
+ 
+@@ -559,6 +559,8 @@ const unsigned char kIllegalInstruction[
+ #if defined(__mips__)
+   // mfc2 zero,Impl - usually illegal in userspace.
+   0x48, 0x00, 0x00, 0x48
++#elif defined(__powerpc64__)
++  0x01, 0x01, 0x01, 0x01 // Crashes on a tested POWER9 cpu
+ #else
+   // This crashes with SIGILL on x86/x86-64/arm.
+   0xff, 0xff, 0xff, 0xff
+@@ -754,10 +756,10 @@ TEST(ExceptionHandlerTest, InstructionPo
+ 
+   // These are defined here so the parent can use them to check the
+   // data from the minidump afterwards.
+-  // Use 4k here because the OS will hand out a single page even
++  // Use the page size here because the OS will hand out a single page even
+   // if a smaller size is requested, and this test wants to
+   // test the upper bound of the memory range.
+-  const uint32_t kMemorySize = 4096;  // bytes
++  const uint32_t kMemorySize = getpagesize();  // bytes
+   const int kOffset = kMemorySize - sizeof(kIllegalInstruction);
+ 
+   const pid_t child = fork();
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/microdump_writer/microdump_writer.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/microdump_writer/microdump_writer.cc
+@@ -138,7 +138,9 @@ class MicrodumpWriter {
+                   const MicrodumpExtraInfo& microdump_extra_info,
+                   LinuxDumper* dumper)
+       : ucontext_(context ? &context->context : NULL),
+-#if !defined(__ARM_EABI__) && !defined(__mips__)
++#if defined(__powerpc64__)
++        vector_state_(context ? &context->vector_state : NULL),
++#elif !defined(__ARM_EABI__) && !defined(__mips__)
+         float_state_(context ? &context->float_state : NULL),
+ #endif
+         dumper_(dumper),
+@@ -337,6 +339,8 @@ class MicrodumpWriter {
+ # else
+ #  error "This mips ABI is currently not supported (n32)"
+ #endif
++#elif defined(__powerpc64__)
++    const char kArch[] = "ppc64";
+ #else
+ #error "This code has not been ported to your platform yet"
+ #endif
+@@ -409,7 +413,9 @@ class MicrodumpWriter {
+   void DumpCPUState() {
+     RawContextCPU cpu;
+     my_memset(&cpu, 0, sizeof(RawContextCPU));
+-#if !defined(__ARM_EABI__) && !defined(__mips__)
++#if defined(__powerpc64__)
++    UContextReader::FillCPUContext(&cpu, ucontext_, vector_state_);
++#elif !defined(__ARM_EABI__) && !defined(__mips__)
+     UContextReader::FillCPUContext(&cpu, ucontext_, float_state_);
+ #else
+     UContextReader::FillCPUContext(&cpu, ucontext_);
+@@ -605,7 +611,9 @@ class MicrodumpWriter {
+   void* Alloc(unsigned bytes) { return dumper_->allocator()->Alloc(bytes); }
+ 
+   const ucontext_t* const ucontext_;
+-#if !defined(__ARM_EABI__) && !defined(__mips__)
++#if defined(__powerpc64__)
++  const google_breakpad::vstate_t* const vector_state_;
++#elif !defined(__ARM_EABI__) && !defined(__mips__)
+   const google_breakpad::fpstate_t* const float_state_;
+ #endif
+   LinuxDumper* dumper_;
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/microdump_writer/microdump_writer_unittest.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/microdump_writer/microdump_writer_unittest.cc
+@@ -279,10 +279,19 @@ TEST(MicrodumpWriterTest, BasicWithMappi
+   CrashAndGetMicrodump(mappings, MicrodumpExtraInfo(), &buf);
+   ASSERT_TRUE(ContainsMicrodump(buf));
+ 
++  int page_size = getpagesize();
+ #ifdef __LP64__
+-  ASSERT_NE(std::string::npos,
+-            buf.find("M 0000000000001000 000000000000002A 0000000000001000 "
+-                     "33221100554477668899AABBCCDDEEFF0 libfoo.so"));
++  // This test is only available for the following page sizes
++  ASSERT_TRUE((page_size == 4096) || (page_size == 65536));
++  if (page_size == 4096) {
++    ASSERT_NE(std::string::npos,
++              buf.find("M 0000000000001000 000000000000002A 0000000000001000 "
++                       "33221100554477668899AABBCCDDEEFF0 libfoo.so"));
++  } else {
++    ASSERT_NE(std::string::npos,
++              buf.find("M 0000000000010000 000000000000002A 0000000000010000 "
++                       "33221100554477668899AABBCCDDEEFF0 libfoo.so"));
++  }
+ #else
+   ASSERT_NE(std::string::npos,
+             buf.find("M 00001000 0000002A 00001000 "
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_core_dumper.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_core_dumper.cc
+@@ -117,6 +117,9 @@ bool LinuxCoreDumper::GetThreadInfoByInd
+ #elif defined(__mips__)
+   stack_pointer =
+       reinterpret_cast<uint8_t*>(info->mcontext.gregs[MD_CONTEXT_MIPS_REG_SP]);
++#elif defined(__powerpc64__)
++  stack_pointer =
++      reinterpret_cast<uint8_t*>(info->mcontext.gp_regs[MD_CONTEXT_PPC64_REG_SP]);
+ #else
+ #error "This code hasn't been ported to your platform yet."
+ #endif
+@@ -212,7 +215,10 @@ bool LinuxCoreDumper::EnumerateThreads()
+         memset(&info, 0, sizeof(ThreadInfo));
+         info.tgid = status->pr_pgrp;
+         info.ppid = status->pr_ppid;
+-#if defined(__mips__)
++#if defined(__powerpc64__)
++        for (int i = 0; i < 31; i++)
++            info.mcontext.gp_regs[i] = status->pr_reg[i];
++#elif defined(__mips__)
+ #if defined(__ANDROID__)
+         for (int i = EF_R0; i <= EF_R31; i++)
+           info.mcontext.gregs[i - EF_R0] = status->pr_reg[i];
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper.cc
+@@ -765,7 +765,9 @@ bool LinuxDumper::GetStackInfo(const voi
+       reinterpret_cast<uint8_t*>(int_stack_pointer & ~(page_size - 1));
+ 
+   // The number of bytes of stack which we try to capture.
+-  static const ptrdiff_t kStackToCapture = 32 * 1024;
++  // This now depends on page_size to avoid missing data
++  // on systems with larger page sizes.
++  static const ptrdiff_t kStackToCapture = 8 * page_size;
+ 
+   const MappingInfo* mapping = FindMapping(stack_pointer);
+   if (!mapping)
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper.h
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper.h
+@@ -63,7 +63,8 @@ namespace google_breakpad {
+  (defined(__mips__) && _MIPS_SIM == _ABIO32)
+ typedef Elf32_auxv_t elf_aux_entry;
+ #elif defined(__x86_64) || defined(__aarch64__) || \
+-     (defined(__mips__) && _MIPS_SIM != _ABIO32)
++     (defined(__mips__) && _MIPS_SIM != _ABIO32) || \
++     defined(__powerpc64__)
+ typedef Elf64_auxv_t elf_aux_entry;
+ #endif
+ 
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper_unittest_helper.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper_unittest_helper.cc
+@@ -51,6 +51,8 @@
+ #define TID_PTR_REGISTER "rcx"
+ #elif defined(__mips__)
+ #define TID_PTR_REGISTER "$1"
++#elif defined(__powerpc64__)
++#define TID_PTR_REGISTER "r8"
+ #else
+ #error This test has not been ported to this platform.
+ #endif
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper.cc
+@@ -154,19 +154,27 @@ bool LinuxPtraceDumper::CopyFromProcess(
+   return true;
+ }
+ 
+-bool LinuxPtraceDumper::ReadRegisterSet(ThreadInfo* info, pid_t tid)
+-{
++bool LinuxPtraceDumper::ReadRegisterSet(ThreadInfo* info, pid_t tid) {
+ #ifdef PTRACE_GETREGSET
+   struct iovec io;
+   info->GetGeneralPurposeRegisters(&io.iov_base, &io.iov_len);
+-  if (sys_ptrace(PTRACE_GETREGSET, tid, (void*)NT_PRSTATUS, (void*)&io) == -1) {
++  if (ptrace(PTRACE_GETREGSET, tid, (void*)NT_PRSTATUS, (void*)&io) == -1) {
+     return false;
+   }
+ 
+   info->GetFloatingPointRegisters(&io.iov_base, &io.iov_len);
+-  if (sys_ptrace(PTRACE_GETREGSET, tid, (void*)NT_FPREGSET, (void*)&io) == -1) {
++  if (ptrace(PTRACE_GETREGSET, tid, (void*)NT_FPREGSET, (void*)&io) == -1) {
+     return false;
+   }
++
++#if defined(__powerpc64__)
++  // Grab the vector registers on PPC64 too
++  info->GetVectorRegisters(&io.iov_base, &io.iov_len);
++  if (ptrace(PTRACE_GETREGSET, tid, (void*)NT_PPC_VMX, (void*)&io) == -1) {
++    return false;
++  }
++#endif // defined(__powerpc64__)
++
+   return true;
+ #else
+   return false;
+@@ -303,6 +311,9 @@ bool LinuxPtraceDumper::GetThreadInfoByI
+ #elif defined(__mips__)
+   stack_pointer =
+       reinterpret_cast<uint8_t*>(info->mcontext.gregs[MD_CONTEXT_MIPS_REG_SP]);
++#elif defined(__powerpc64__)
++  stack_pointer =
++      reinterpret_cast<uint8_t*>(info->mcontext.gp_regs[MD_CONTEXT_PPC64_REG_SP]);
+ #else
+ #error "This code hasn't been ported to your platform yet."
+ #endif
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper_unittest.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper_unittest.cc
+@@ -462,6 +462,9 @@ TEST(LinuxPtraceDumperTest, VerifyStackR
+ #elif defined(__mips__)
+     pid_t* process_tid_location =
+         reinterpret_cast<pid_t*>(one_thread.mcontext.gregs[1]);
++#elif defined(__powerpc64__)
++    pid_t* process_tid_location =
++        reinterpret_cast<pid_t*>(one_thread.mcontext.gp_regs[8]);
+ #else
+ #error This test has not been ported to this platform.
+ #endif
+@@ -559,6 +562,8 @@ TEST_F(LinuxPtraceDumperTest, SanitizeSt
+   uintptr_t heap_addr = thread_info.regs.rcx;
+ #elif defined(__mips__)
+   uintptr_t heap_addr = thread_info.mcontext.gregs[1];
++#elif defined(__powerpc64__)
++  uintptr_t heap_addr = thread_info.mcontext.gp_regs[8];
+ #else
+ #error This test has not been ported to this platform.
+ #endif
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.cc
+@@ -136,7 +136,9 @@ class MinidumpWriter {
+       : fd_(minidump_fd),
+         path_(minidump_path),
+         ucontext_(context ? &context->context : NULL),
+-#if !defined(__ARM_EABI__) && !defined(__mips__)
++#if defined(__powerpc64__)
++        vector_state_(context ? &context->vector_state : NULL),
++#elif !defined(__ARM_EABI__) && !defined(__mips__)
+         float_state_(context ? &context->float_state : NULL),
+ #endif
+         dumper_(dumper),
+@@ -468,7 +470,9 @@ class MinidumpWriter {
+         if (!cpu.Allocate())
+           return false;
+         my_memset(cpu.get(), 0, sizeof(RawContextCPU));
+-#if !defined(__ARM_EABI__) && !defined(__mips__)
++#if defined(__powerpc64__)
++        UContextReader::FillCPUContext(cpu.get(), ucontext_, vector_state_);
++#elif !defined(__ARM_EABI__) && !defined(__mips__)
+         UContextReader::FillCPUContext(cpu.get(), ucontext_, float_state_);
+ #else
+         UContextReader::FillCPUContext(cpu.get(), ucontext_);
+@@ -897,7 +901,7 @@ class MinidumpWriter {
+     dirent->location.rva = 0;
+   }
+ 
+-#if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
++#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || defined(__powerpc64__)
+   bool WriteCPUInformation(MDRawSystemInfo* sys_info) {
+     char vendor_id[sizeof(sys_info->cpu.x86_cpu_info.vendor_id) + 1] = {0};
+     static const char vendor_id_name[] = "vendor_id";
+@@ -917,7 +921,9 @@ class MinidumpWriter {
+ 
+     // processor_architecture should always be set, do this first
+     sys_info->processor_architecture =
+-#if defined(__mips__)
++#if defined(__powerpc64__)
++        MD_CPU_ARCHITECTURE_PPC64;
++#elif defined(__mips__)
+ # if _MIPS_SIM == _ABIO32
+         MD_CPU_ARCHITECTURE_MIPS;
+ # elif _MIPS_SIM == _ABI64
+@@ -1333,7 +1339,9 @@ class MinidumpWriter {
+   const char* path_;  // Path to the file where the minidum should be written.
+ 
+   const ucontext_t* const ucontext_;  // also from the signal handler
+-#if !defined(__ARM_EABI__) && !defined(__mips__)
++#if defined(__powerpc64__)
++  const google_breakpad::vstate_t* const vector_state_;
++#elif !defined(__ARM_EABI__) && !defined(__mips__)
+   const google_breakpad::fpstate_t* const float_state_;  // ditto
+ #endif
+   LinuxDumper* dumper_;
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.h
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.h
+@@ -48,6 +48,8 @@ class ExceptionHandler;
+ 
+ #if defined(__aarch64__)
+ typedef struct fpsimd_context fpstate_t;
++#elif defined(__powerpc64__)
++typedef vrregset_t vstate_t;
+ #elif !defined(__ARM_EABI__) && !defined(__mips__)
+ typedef std::remove_pointer<fpregset_t>::type fpstate_t;
+ #endif
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer_unittest.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer_unittest.cc
+@@ -715,6 +715,12 @@ TEST(MinidumpWriterTest, InvalidStackPoi
+ #elif defined(__mips__)
+   context.context.uc_mcontext.gregs[MD_CONTEXT_MIPS_REG_SP] =
+       invalid_stack_pointer;
++#elif defined(__powerpc64__)
++  context.context.uc_mcontext.gp_regs[MD_CONTEXT_PPC64_REG_SP] =
++      invalid_stack_pointer;
++#elif defined(__powerpc64__)
++  context.context.uc_mcontext.gp_regs[MD_CONTEXT_PPC64_REG_SP] =
++      invalid_stack_pointer;
+ #else
+ # error "This code has not been ported to your platform yet."
+ #endif
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/common/linux/memory_mapped_file.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/common/linux/memory_mapped_file.cc
+@@ -65,8 +65,7 @@ bool MemoryMappedFile::Map(const char* p
+   }
+ 
+ #if defined(__x86_64__) || defined(__aarch64__) || \
+-   (defined(__mips__) && _MIPS_SIM == _ABI64)
+-
++   (defined(__mips__) && _MIPS_SIM == _ABI64) || defined(__powerpc64__)
+   struct kernel_stat st;
+   if (sys_fstat(fd, &st) == -1 || st.st_size < 0) {
+ #else
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/common/linux/memory_mapped_file_unittest.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/common/linux/memory_mapped_file_unittest.cc
+@@ -176,9 +176,10 @@ TEST_F(MemoryMappedFileTest, RemapAfterM
+ TEST_F(MemoryMappedFileTest, MapWithOffset) {
+   // Put more data in the test file this time. Offsets can only be
+   // done on page boundaries, so we need a two page file to test this.
+-  const int page_size = 4096;
+-  char data1[2 * page_size];
+-  size_t data1_size = sizeof(data1);
++  const int page_size = getpagesize();
++  char *data1 = static_cast<char*>(malloc(2 * page_size));
++  EXPECT_TRUE(data1 != NULL);
++  size_t data1_size = (2 * page_size);
+   for (size_t i = 0; i < data1_size; ++i) {
+     data1[i] = i & 0x7f;
+   }
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/common/memory_allocator_unittest.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/common/memory_allocator_unittest.cc
+@@ -57,8 +57,9 @@ TEST(PageAllocatorTest, LargeObject) {
+ 
+   EXPECT_EQ(0U, allocator.pages_allocated());
+   uint8_t* p = reinterpret_cast<uint8_t*>(allocator.Alloc(10000));
++  uint64_t expected_pages = 1 + ((10000 - 1) / getpagesize());
+   ASSERT_FALSE(p == NULL);
+-  EXPECT_EQ(3U, allocator.pages_allocated());
++  EXPECT_EQ(expected_pages, allocator.pages_allocated());
+   for (unsigned i = 1; i < 10; ++i) {
+     uint8_t* p = reinterpret_cast<uint8_t*>(allocator.Alloc(i));
+     ASSERT_FALSE(p == NULL);
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/processor/exploitability_linux.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/processor/exploitability_linux.cc
+@@ -202,12 +202,14 @@ bool ExploitabilityLinux::EndedOnIllegal
+   // Check architecture and set architecture variable to corresponding flag
+   // in objdump.
+   switch (context->GetContextCPU()) {
++#if defined(__i386) || defined(__x86_64)
+     case MD_CONTEXT_X86:
+       architecture = "i386";
+       break;
+     case MD_CONTEXT_AMD64:
+       architecture = "i386:x86-64";
+       break;
++#endif
+     default:
+       // Unsupported architecture. Note that ARM architectures are not
+       // supported because objdump does not support ARM.
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/processor/exploitability_unittest.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/processor/exploitability_unittest.cc
+@@ -104,6 +104,8 @@ ExploitabilityFor(const string& filename
+ }
+ 
+ TEST(ExploitabilityTest, TestWindowsEngine) {
++// The following tests are only executable on an x86-class linux machine.
++#if !defined(_WIN32) && (defined(__i386) || defined(__x86_64))
+   ASSERT_EQ(google_breakpad::EXPLOITABILITY_HIGH,
+             ExploitabilityFor("ascii_read_av.dmp"));
+   ASSERT_EQ(google_breakpad::EXPLOITABILITY_HIGH,
+@@ -136,9 +138,12 @@ TEST(ExploitabilityTest, TestWindowsEngi
+             ExploitabilityFor("read_av_clobber_write.dmp"));
+   ASSERT_EQ(google_breakpad::EXPLOITABILITY_LOW,
+             ExploitabilityFor("read_av_conditional.dmp"));
++#endif
+ }
+ 
+ TEST(ExploitabilityTest, TestLinuxEngine) {
++// The following tests are only executable on an x86-class linux machine.
++#if defined(__i386) || defined(__x86_64)
+   ASSERT_EQ(google_breakpad::EXPLOITABILITY_INTERESTING,
+             ExploitabilityFor("linux_null_read_av.dmp"));
+   ASSERT_EQ(google_breakpad::EXPLOITABILITY_HIGH,
+@@ -171,7 +176,8 @@ TEST(ExploitabilityTest, TestLinuxEngine
+             ExploitabilityFor("linux_executable_heap.dmp"));
+   ASSERT_EQ(google_breakpad::EXPLOITABILITY_HIGH,
+             ExploitabilityFor("linux_jmp_to_module_not_exe_region.dmp"));
+-#ifndef _WIN32
++#endif
++#if !defined(_WIN32) && (defined(__i386) || defined(__x86_64))
+   ASSERT_EQ(google_breakpad::EXPLOITABILITY_HIGH,
+             ExploitabilityFor("linux_write_to_nonwritable_module.dmp"));
+   ASSERT_EQ(google_breakpad::EXPLOITABILITY_HIGH,
+@@ -182,10 +188,10 @@ TEST(ExploitabilityTest, TestLinuxEngine
+             ExploitabilityFor("linux_write_to_outside_module_via_math.dmp"));
+   ASSERT_EQ(google_breakpad::EXPLOITABILITY_INTERESTING,
+             ExploitabilityFor("linux_write_to_under_4k.dmp"));
+-#endif  // _WIN32
++#endif  // !defined(_WIN32) && (!defined(__i386) && !defined(__x86_64))
+ }
+ 
+-#ifndef _WIN32
++#if !defined(_WIN32) && (defined(__i386) || defined(__x86_64))
+ TEST(ExploitabilityLinuxUtilsTest, DisassembleBytesTest) {
+   ASSERT_FALSE(ExploitabilityLinuxTest::DisassembleBytes("", NULL, 5, NULL));
+   uint8_t bytes[6] = {0xc7, 0x0, 0x5, 0x0, 0x0, 0x0};
+@@ -301,6 +307,7 @@ TEST(ExploitabilityLinuxUtilsTest, Calcu
+                                                          context,
+                                                          &write_address));
+ }
+-#endif  // _WIN32
++#endif  // !defined(_WIN32) && (defined(__i386) || defined(__x86_64))
++
+ 
+ }  // namespace
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/tools/linux/md2core/minidump-2-core.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/tools/linux/md2core/minidump-2-core.cc
+@@ -77,6 +77,8 @@
+   #define ELF_ARCH  EM_MIPS
+ #elif defined(__aarch64__)
+   #define ELF_ARCH  EM_AARCH64
++#elif defined(__powerpc64__)
++  #define ELF_ARCH  EM_PPC64
+ #endif
+ 
+ #if defined(__arm__)
+@@ -87,6 +89,8 @@ typedef user_regs user_regs_struct;
+ #elif defined (__mips__)
+ // This file-local typedef simplifies the source code.
+ typedef gregset_t user_regs_struct;
++#elif defined(__powerpc64__)
++typedef struct pt_regs user_regs_struct;
+ #endif
+ 
+ using google_breakpad::MDTypeHelper;
+@@ -322,6 +326,12 @@ struct CrashedProcess {
+ #if defined(__aarch64__)
+     user_fpsimd_struct fpregs;
+ #endif
++#if defined(__powerpc64__)
++    mcontext_t mcontext;
++#endif
++#if defined(__powerpc64__)
++    mcontext_t mcontext;
++#endif
+     uintptr_t stack_addr;
+     const uint8_t* stack;
+     size_t stack_length;
+@@ -535,6 +545,38 @@ ParseThreadRegisters(CrashedProcess::Thr
+   thread->mcontext.fpc_eir = rawregs->float_save.fir;
+ #endif
+ }
++#elif defined(__powerpc64__)
++static void
++ParseThreadRegisters(CrashedProcess::Thread* thread,
++                     const MinidumpMemoryRange& range) {
++  const MDRawContextPPC64* rawregs = range.GetData<MDRawContextPPC64>(0);
++
++  for (int i = 0; i < MD_CONTEXT_PPC64_GPR_COUNT; i++)
++    thread->mcontext.gp_regs[i] = rawregs->gpr[i];
++
++  thread->mcontext.gp_regs[PT_LNK] = rawregs->lr;
++  thread->mcontext.gp_regs[PT_NIP] = rawregs->srr0;
++  thread->mcontext.gp_regs[PT_MSR] = rawregs->srr1;
++  thread->mcontext.gp_regs[PT_CCR] = rawregs->cr;
++  thread->mcontext.gp_regs[PT_XER] = rawregs->xer;
++  thread->mcontext.gp_regs[PT_CTR] = rawregs->ctr;
++  thread->mcontext.v_regs->vrsave = rawregs->vrsave;
++
++  for (int i = 0; i < MD_FLOATINGSAVEAREA_PPC_FPR_COUNT; i++)
++      thread->mcontext.fp_regs[i] = rawregs->float_save.fpregs[i];
++
++  thread->mcontext.fp_regs[NFPREG-1] = rawregs->float_save.fpscr;
++
++  for (int i = 0; i < MD_VECTORSAVEAREA_PPC_VR_COUNT; i++) {
++      thread->mcontext.v_regs->vrregs[i][0] = rawregs->vector_save.save_vr[i].high >> 32;
++      thread->mcontext.v_regs->vrregs[i][1] = rawregs->vector_save.save_vr[i].high;
++      thread->mcontext.v_regs->vrregs[i][2] = rawregs->vector_save.save_vr[i].low >> 32;
++      thread->mcontext.v_regs->vrregs[i][3] = rawregs->vector_save.save_vr[i].low;
++  }
++
++  thread->mcontext.v_regs->vscr.vscr_word = rawregs->vector_save.save_vscr.low & 0xFFFFFFFF;
++}
++
+ #else
+ #error "This code has not been ported to your platform yet"
+ #endif
+@@ -623,6 +665,12 @@ ParseSystemInfo(const Options& options,
+ # else
+ #  error "This mips ABI is currently not supported (n32)"
+ # endif
++#elif defined(__powerpc64__)
++  if (sysinfo->processor_architecture != MD_CPU_ARCHITECTURE_PPC64) {
++    fprintf(stderr,
++            "This version of minidump-2-core only supports PPC64.\n");
++    exit(1);
++  }
+ #else
+ #error "This code has not been ported to your platform yet"
+ #endif
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/CONTRIBUTORS
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/CONTRIBUTORS
+@@ -13,3 +13,4 @@ Mark Mentovai <mark@chromium.org>
+ Robert Sesek <rsesek@chromium.org>
+ Scott Graham <scottmg@chromium.org>
+ Joshua Peraza <jperaza@chromium.org>
++Shawn Anastasio <shawn@anastas.io>
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/compat/linux/sys/user.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/compat/linux/sys/user.h
+@@ -15,6 +15,7 @@
+ #ifndef CRASHPAD_COMPAT_LINUX_SYS_USER_H_
+ #define CRASHPAD_COMPAT_LINUX_SYS_USER_H_
+ 
++#include <cstddef>
+ #include_next <sys/user.h>
+ 
+ #include <features.h>
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/minidump/minidump_context.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/minidump/minidump_context.h
+@@ -592,6 +592,70 @@ struct MinidumpContextMIPS64 {
+   uint64_t fir;
+ };
+ 
++//! \brief ppc64-specific flags for MinidumpPPC64::context_flags
++//! Based on minidump_cpu_ppc64.h from breakpad
++enum MinidumpContextPPC64Flags : uint32_t {
++  //! \brief Identifies the context as PPC64.
++  kMinidumpContextPPC64 = 0x01000000,
++
++  //! \brief Indicates the validity of general purpose registers.
++  //!
++  //! Registers `r0`-`r31`, `nip`, `msr`, `lr`, etc. are valid.
++  kMinidumpContextPPC64Base = kMinidumpContextPPC64 | 0x00000001,
++
++  //! \brief Indicates the validity of floating point registers.
++  //!
++  //! Registers `fp0`-`fp31`, `fpscr` are valid.
++  kMinidumpContextPPC64Floating = kMinidumpContextPPC64 | 0x00000008,
++
++  //! \brief Indicates the validity of Altivec/VMX registers.
++  //!
++  //! Registers `v0`-`v31`, `vscr`, `vrsave`.
++  kMinidumpContextPPC64Vector = kMinidumpContextPPC64 | 0x00000020,
++
++  //! \brief Indicates the validity of all registers
++  kMinidumpContextPPC64All = kMinidumpContextPPC64Base     |
++                             kMinidumpContextPPC64Floating |
++                             kMinidumpContextPPC64Vector
++};
++
++//! \brief A PPC64 CPU context carried in a minidump file.
++//! Based on minidump_cpu_ppc64.h from breakpad.
++struct MinidumpContextPPC64 {
++  uint64_t context_flags;
++
++  //! \brief General purpose registers.
++  uint64_t nip;
++  uint64_t msr;
++  uint64_t regs[32];
++  uint64_t ccr;
++  uint64_t xer;
++  uint64_t lnk;
++  uint64_t ctr;
++
++  //! \brief Floating point registers.
++  double fpregs[32];
++
++  //! \brief FPU status register.
++  double fpscr;
++
++  //! \brief Altivec/VMX vector registers.
++  struct {
++      //! \brief Vector registers are 128bits.
++      uint128_struct save_vr[32];
++      uint128_struct save_vscr;
++
++      //! \brief Padding included for breakpad compatibiltiy.
++      uint32_t save_pad5[4];
++
++      //! \brief VRSAVE register.
++      uint32_t save_vrsave;
++
++      //! \brief Padding included for breakpad compatibiltiy.
++      uint32_t save_pad6[7];
++  } vregs;
++};
++
+ }  // namespace crashpad
+ 
+ #endif  // CRASHPAD_MINIDUMP_MINIDUMP_CONTEXT_H_
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/minidump/minidump_context_writer.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/minidump/minidump_context_writer.cc
+@@ -101,6 +101,13 @@ MinidumpContextWriter::CreateFromSnapsho
+       break;
+     }
+ 
++    case kCPUArchitecturePPC64: {
++      context = std::make_unique<MinidumpContextPPC64Writer>();
++      reinterpret_cast<MinidumpContextPPC64Writer*>(context.get())
++          ->InitalizeFromSnapshot(context_snapshot->ppc64);
++      break;
++    }
++
+     default: {
+       LOG(ERROR) << "unknown context architecture "
+                  << context_snapshot->architecture;
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/minidump/minidump_context_writer.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/minidump/minidump_context_writer.h
+@@ -315,6 +315,45 @@ class MinidumpContextMIPS64Writer final
+   DISALLOW_COPY_AND_ASSIGN(MinidumpContextMIPS64Writer);
+ };
+ 
++class MinidumpContextPPC64Writer final : public MinidumpContextWriter {
++ public:
++  MinidumpContextPPC64Writer();
++  ~MinidumpContextPPC64Writer() override;
++
++  //! \brief Initalizes the MinidumpContextPPC64 based on \a context_snapshot.
++  //!
++  //! \param[in] context_snapshot The context snapshot to use as source data.
++  //!
++  //! \note Valid in #kStateMutable. No mutation of context() may be done before
++  //!     calling this method, and it is not normally necessary to alter
++  //!     context() after calling this method.
++  void InitalizeFromSnapshot(const CPUContextPPC64* context_snapshot);
++
++  //! \brief Returns a pointer to the context structure that this object will
++  //!     write.
++  //!
++  //! \attention This returns a non-`const` pointer to this object’s private
++  //!     data so that a caller can populate the context structure directly.
++  //!     This is done because providing setter interfaces to each field in the
++  //!     context structure would be unwieldy and cumbersome. Care must be taken
++  //!     to populate the context structure correctly. The context structure
++  //!     must only be modified while this object is in the #kStateMutable
++  //!     state.
++  MinidumpContextPPC64* context() { return &context_; }
++
++ protected:
++  // MinidumpWritable:
++  bool WriteObject(FileWriterInterface* file_writer) override;
++
++  // MinidumpContextWriter:
++  size_t ContextSize() const override;
++
++ private:
++  MinidumpContextPPC64 context_;
++
++  DISALLOW_COPY_AND_ASSIGN(MinidumpContextPPC64Writer);
++};
++
+ }  // namespace crashpad
+ 
+ #endif  // CRASHPAD_MINIDUMP_MINIDUMP_CONTEXT_WRITER_H_
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/minidump/minidump_context_writer_test.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/minidump/minidump_context_writer_test.cc
+@@ -213,6 +213,21 @@ TEST(MinidumpContextWriter, MIPS64_FromS
+       context, ExpectMinidumpContextMIPS64, kSeed);
+ }
+ 
++TEST(MinidumpContextWriter, PPC64_Zeros) {
++  EmptyContextTest<MinidumpContextPPC64Writer, MinidumpContextPPC64>(
++    ExpectMinidumpContextPPC64);
++}
++
++TEST(MinidumpContextWriter, PPC64_FromSnapshot) {
++  constexpr uint32_t kSeed = 64;
++  CPUContextPPC64 context_ppc64;
++  CPUContext context;
++  context.ppc64 = &context_ppc64;
++  InitializeCPUContextPPC64(&context, kSeed);
++  FromSnapshotTest<MinidumpContextPPC64Writer, MinidumpContextPPC64>(
++      context, ExpectMinidumpContextPPC64, kSeed);
++}
++
+ }  // namespace
+ }  // namespace test
+ }  // namespace crashpad
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/minidump/minidump_misc_info_writer.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/minidump/minidump_misc_info_writer.cc
+@@ -135,6 +135,8 @@ std::string MinidumpMiscInfoDebugBuildSt
+   static constexpr char kCPU[] = "mips";
+ #elif defined(ARCH_CPU_MIPS64EL)
+   static constexpr char kCPU[] = "mips64";
++#elif defined(ARCH_CPU_PPC64)
++  static constexpr char kCPU[] = "ppc64";
+ #else
+ #error define kCPU for this CPU
+ #endif
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/capture_memory.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/capture_memory.cc
+@@ -112,6 +112,11 @@ void CaptureMemory::PointedToByContext(c
+   for (size_t i = 0; i < base::size(context.mipsel->regs); ++i) {
+     MaybeCaptureMemoryAround(delegate, context.mipsel->regs[i]);
+   }
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++  MaybeCaptureMemoryAround(delegate, context.ppc64->nip);
++  for (size_t i = 0; i < base::size(context.ppc64->regs); ++i) {
++    MaybeCaptureMemoryAround(delegate, context.ppc64->regs[i]);
++  }
+ #else
+ #error Port.
+ #endif
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/cpu_architecture.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/cpu_architecture.h
+@@ -43,7 +43,10 @@ enum CPUArchitecture {
+   kCPUArchitectureMIPSEL,
+ 
+   //! \brief 64-bit MIPSEL.
+-  kCPUArchitectureMIPS64EL
++  kCPUArchitectureMIPS64EL,
++
++  //! \brief 64-bit PPC64.
++  kCPUArchitecturePPC64
+ };
+ 
+ }  // namespace crashpad
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/cpu_context.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/cpu_context.cc
+@@ -169,6 +169,8 @@ uint64_t CPUContext::InstructionPointer(
+       return arm->pc;
+     case kCPUArchitectureARM64:
+       return arm64->pc;
++    case kCPUArchitecturePPC64:
++      return ppc64->nip;
+     default:
+       NOTREACHED();
+       return ~0ull;
+@@ -185,6 +187,8 @@ uint64_t CPUContext::StackPointer() cons
+       return arm->sp;
+     case kCPUArchitectureARM64:
+       return arm64->sp;
++    case kCPUArchitecturePPC64:
++      return ppc64->regs[1];
+     default:
+       NOTREACHED();
+       return ~0ull;
+@@ -196,6 +200,7 @@ bool CPUContext::Is64Bit() const {
+     case kCPUArchitectureX86_64:
+     case kCPUArchitectureARM64:
+     case kCPUArchitectureMIPS64EL:
++    case kCPUArchitecturePPC64:
+       return true;
+     case kCPUArchitectureX86:
+     case kCPUArchitectureARM:
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/cpu_context.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/cpu_context.h
+@@ -352,6 +352,24 @@ struct CPUContextMIPS64 {
+   uint64_t fir;
+ };
+ 
++//! \brief A context structure carrying PPC64 CPU state.
++struct CPUContextPPC64 {
++  uint64_t nip;
++  uint64_t msr;
++  uint64_t regs[32];
++  uint64_t ccr;
++  uint64_t xer;
++  uint64_t lnk;
++  uint64_t ctr;
++  double fpregs[32];
++  double fpscr;
++  struct {
++    uint128_struct save_vr[32];
++    uint128_struct save_vscr;
++    uint32_t save_vrsave;
++  } vregs;
++};
++
+ //! \brief A context structure capable of carrying the context of any supported
+ //!     CPU architecture.
+ struct CPUContext {
+@@ -382,6 +400,7 @@ struct CPUContext {
+     CPUContextARM64* arm64;
+     CPUContextMIPS* mipsel;
+     CPUContextMIPS64* mips64;
++    CPUContextPPC64* ppc64;
+   };
+ };
+ 
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/cpu_context_linux.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/cpu_context_linux.h
+@@ -15,6 +15,7 @@
+ #ifndef CRASHPAD_SNAPSHOT_LINUX_CPU_CONTEXT_LINUX_H_
+ #define CRASHPAD_SNAPSHOT_LINUX_CPU_CONTEXT_LINUX_H_
+ 
++#include <cstring>
+ #include "build/build_config.h"
+ #include "snapshot/cpu_context.h"
+ #include "snapshot/linux/signal_context.h"
+@@ -174,6 +175,76 @@ void InitializeCPUContextMIPS(
+ 
+ #endif  // ARCH_CPU_MIPS_FAMILY || DOXYGEN
+ 
++#if defined(ARCH_CPU_PPC64_FAMILY) || DOXYGEN
++
++//! \brief Initalizes a CPUContextPPC64 structure from native context
++//!     structures on Linux.
++//!
++//! \param[in] thread_context The native thread context.
++//! \param[in] float_context The native float context.
++//! \param[in] vector_context The native vector context.
++//! \param[out] context The CPUContextPPC64 structure to initalize.
++template <typename Traits>
++void InitializeCPUContextPPC64(
++    const ThreadContext::t64_t& thread_context,
++    const FloatContext::f64_t& float_context,
++    const VectorContext::v64_t& vector_context,
++    typename Traits::CPUContext* context) {
++
++  memcpy(context->regs, thread_context.gpr, sizeof(context->regs));
++  context->nip = thread_context.nip;
++  context->msr = thread_context.msr;
++  context->ccr = thread_context.ccr;
++  context->xer = thread_context.xer;
++  context->lnk = thread_context.lnk;
++  context->ctr = thread_context.ctr;
++
++  memcpy(context->fpregs, float_context.fpregs, sizeof(context->fpregs));
++  context->fpscr = float_context.fpscr;
++
++  for (uint8_t i = 0; i < 32; i++) {
++    context->vregs.save_vr[i] = {
++      (((uint64_t)vector_context.vrregs[i][0]) << 32) |
++        vector_context.vrregs[i][1],
++      (((uint64_t)vector_context.vrregs[i][2]) << 32) |
++        vector_context.vrregs[i][3]
++    };
++  }
++  context->vregs.save_vrsave = vector_context.vrsave;
++  context->vregs.save_vscr = {0, (uint64_t)vector_context.vscr.vscr_word};
++}
++
++template <typename Traits>
++void InitializeCPUContextPPC64(
++    const SignalThreadContext64 &thread_context,
++    const SignalFloatContext64 &float_context,
++    const SignalVectorContext64 &vector_context,
++    typename Traits::CPUContext* context) {
++
++  memcpy(context->regs, thread_context.regs, sizeof(context->regs));
++  context->nip = thread_context.nip;
++  context->msr = thread_context.msr;
++  context->ccr = thread_context.ccr;
++  context->xer = thread_context.xer;
++  context->lnk = thread_context.lnk;
++  context->ctr = thread_context.ctr;
++
++  memcpy(context->fpregs, float_context.regs, sizeof(context->fpregs));
++  context->fpscr = float_context.fpscr;
++
++  for (uint8_t i = 0; i < 32; i++) {
++    context->vregs.save_vr[i] = {
++      (((uint64_t)vector_context.vrregs[i][0]) << 32) |
++        vector_context.vrregs[i][1],
++      (((uint64_t)vector_context.vrregs[i][2]) << 32) |
++        vector_context.vrregs[i][3]
++    };
++  }
++  context->vregs.save_vrsave = vector_context.vrsave;
++  context->vregs.save_vscr = {0, (uint64_t)vector_context.vscr.vscr_word};
++}
++
++#endif
+ }  // namespace internal
+ }  // namespace crashpad
+ 
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/debug_rendezvous_test.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/debug_rendezvous_test.cc
+@@ -192,6 +192,8 @@ void TestAgainstTarget(PtraceConnection*
+               device == 0 && inode == 0 && mapping_name == "[vdso]";
+ #if defined(ARCH_CPU_X86)
+           static constexpr char kPrefix[] = "linux-gate.so.";
++#elif defined(ARCH_CPU_PPC64)
++          static constexpr char kPrefix[] = "linux-vdso64.so.";
+ #else
+           static constexpr char kPrefix[] = "linux-vdso.so.";
+ #endif
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux.cc
+@@ -323,6 +323,69 @@ bool ExceptionSnapshotLinux::ReadContext
+       reader, context_address, context_.mips64);
+ }
+ 
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++
++template <typename Traits>
++static bool ReadContext(ProcessReaderLinux* reader,
++                        LinuxVMAddress context_address,
++                        typename Traits::CPUContext* dest_context) {
++  const ProcessMemory* memory = reader->Memory();
++
++  LinuxVMAddress gp_regs_address = context_address +
++                                   offsetof(UContext, mcontext) +
++                                   offsetof(typename Traits::MContext, gp_regs);
++
++  typename Traits::SignalThreadContext thread_context;
++  if (!memory->Read(gp_regs_address, sizeof(thread_context), &thread_context)) {
++    LOG(ERROR) << "Couldn't read gp_regs!";
++    return false;
++  }
++
++  LinuxVMAddress fp_regs_address = context_address +
++                                   offsetof(UContext, mcontext) +
++                                   offsetof(typename Traits::MContext, fp_regs);
++
++  typename Traits::SignalFloatContext fp_context;
++  if (!memory->Read(fp_regs_address, sizeof(fp_context), &fp_context)) {
++    LOG(ERROR) << "Couldn't read fp_regs!";
++    return false;
++  }
++
++  LinuxVMAddress v_regs_ptr_address = context_address +
++                                  offsetof(UContext, mcontext) +
++                                  offsetof(typename Traits::MContext, vmx_reserve) + 8;
++
++  typename Traits::SignalVectorContext v_context;
++  if (!memory->Read(v_regs_ptr_address, sizeof(v_context), &v_context)) {
++    LOG(ERROR) << "Couldn't read v_regs!";
++    return false;
++  }
++
++  InitializeCPUContextPPC64<ContextTraits64>(thread_context, fp_context,
++                            v_context, dest_context);
++
++  return true;
++}
++
++template<>
++bool ExceptionSnapshotLinux::ReadContext<ContextTraits64>(
++    ProcessReaderLinux* reader,
++    LinuxVMAddress context_address) {
++  context_.architecture = kCPUArchitecturePPC64;
++  context_.ppc64 = &context_union_.ppc64;
++
++  return internal::ReadContext<ContextTraits64>(
++      reader, context_address, context_.ppc64);
++}
++
++template<>
++bool ExceptionSnapshotLinux::ReadContext<ContextTraits32>(
++    ProcessReaderLinux* reader,
++    LinuxVMAddress context_address) {
++  // PPC64 is 64-bit
++  return false;
++}
++
+ #endif  // ARCH_CPU_X86_FAMILY
+ 
+ bool ExceptionSnapshotLinux::Initialize(ProcessReaderLinux* process_reader,
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux.h
+@@ -84,6 +84,8 @@ class ExceptionSnapshotLinux final : pub
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+     CPUContextMIPS mipsel;
+     CPUContextMIPS64 mips64;
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++    CPUContextPPC64 ppc64;
+ #endif
+   } context_union_;
+   CPUContext context_;
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux_test.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux_test.cc
+@@ -296,7 +296,28 @@ void ExpectContext(const CPUContext& act
+             0);
+ #undef CPU_ARCH_NAME
+ }
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++using NativeCPUContext = ucontext_t;
+ 
++void InitializeContext(NativeCPUContext* context) {
++  for (size_t reg = 0; reg < 32; ++reg) {
++    context->uc_mcontext.gp_regs[reg] = reg;
++  }
++
++  memset(&context->uc_mcontext.fp_regs, 44,
++      sizeof(context->uc_mcontext.fp_regs));
++}
++
++void ExpectContext(const CPUContext& actual, const NativeCPUContext& expected) {
++  EXPECT_EQ(actual.architecture, kCPUArchitecturePPC64);
++
++  for (size_t reg = 0; reg < 32; ++reg) {
++    EXPECT_EQ(actual.ppc64->regs[reg], expected.uc_mcontext.gp_regs[reg]);
++  }
++
++  EXPECT_EQ(memcmp(actual.ppc64->fpregs, expected.uc_mcontext.fp_regs,
++            sizeof(actual.ppc64->fpregs)), 0);
++}
+ #else
+ #error Port.
+ #endif
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/process_reader_linux.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/process_reader_linux.cc
+@@ -108,6 +108,8 @@ void ProcessReaderLinux::Thread::Initial
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+   stack_pointer = reader->Is64Bit() ? thread_info.thread_context.t64.regs[29]
+                                     : thread_info.thread_context.t32.regs[29];
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++  stack_pointer = thread_info.thread_context.t64.gpr[1];
+ #else
+ #error Port.
+ #endif
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/signal_context.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/signal_context.h
+@@ -422,6 +422,93 @@ static_assert(offsetof(UContext<ContextT
+               "context offset mismatch");
+ #endif
+ 
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++
++struct SignalThreadContext64 {
++  uint64_t regs[32];
++  uint64_t nip;
++  uint64_t msr;
++  uint64_t orig_r3;
++  uint64_t ctr;
++  uint64_t lnk;
++  uint64_t xer;
++  uint64_t ccr;
++  uint64_t softe;
++  uint64_t trap;
++  uint64_t dar;
++  uint64_t dsisr;
++  uint64_t result;
++  uint64_t dscr;
++  uint64_t fpr0[3];
++};
++
++struct SignalFloatContext64 {
++  double regs[32];
++  double fpscr;
++};
++
++struct SignalVectorContext64 {
++  int32_t vrregs[32][4];
++  struct {
++    int32_t __pad[3];
++    int32_t vscr_word;
++  } vscr;
++  int32_t vrsave;
++  int32_t __pad[3];
++} __attribute__((__aligned__(16)));
++
++
++#pragma pack(pop)
++struct MContext64 {
++  uint64_t reserved[4];
++  int32_t signal;
++  int32_t __pad0;
++  uint64_t handler;
++  uint64_t oldmask;
++  uint64_t pt_regs_ptr;
++  SignalThreadContext64 gp_regs;
++  SignalFloatContext64  fp_regs;
++  SignalVectorContext64 *v_regs;
++#ifdef __GLIBC__
++  int64_t vmx_reserve[69];
++#else
++  int64_t vmx_reserve[101];
++#endif
++};
++
++struct ContextTraits64 : public Traits64 {
++  using MContext = MContext64;
++  using SignalThreadContext = SignalThreadContext64;
++  using SignalFloatContext = SignalFloatContext64;
++  using SignalVectorContext = SignalVectorContext64;
++  using CPUContext = CPUContextPPC64;
++};
++
++struct ContextTraits32 : public Traits32 {};
++
++struct UContext {
++  uint64_t flags;
++  uint64_t link;
++  SignalStack<ContextTraits64> stack;
++  Sigset<ContextTraits64> sigmask;
++  MContext64 mcontext;
++};
++#pragma pack(push, 1)
++
++static_assert(sizeof(UContext) == sizeof(ucontext_t),
++              "ucontext_t size mismatch");
++static_assert(sizeof(MContext64) == sizeof(mcontext_t),
++              "mcontext_t size mismatch");
++static_assert(sizeof(SignalThreadContext64) == sizeof(gregset_t),
++              "gregset_t size mismatch");
++static_assert(sizeof(SignalFloatContext64) == sizeof(fpregset_t),
++              "fpregset_t size mismatch");
++static_assert(sizeof(SignalVectorContext64) == sizeof(vrregset_t),
++              "vrregset_t size mismatch");
++static_assert(offsetof(UContext, mcontext) ==
++              offsetof(ucontext_t, uc_mcontext), "mcontext offset mismatch");
++static_assert(offsetof(MContext64, gp_regs) ==
++              offsetof(mcontext_t, gp_regs), "gp_regs offset mismatch");
+ #else
+ #error Port.
+ #endif  // ARCH_CPU_X86_FAMILY
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/system_snapshot_linux.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/system_snapshot_linux.cc
+@@ -204,6 +204,8 @@ CPUArchitecture SystemSnapshotLinux::Get
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+   return process_reader_->Is64Bit() ? kCPUArchitectureMIPS64EL
+                                     : kCPUArchitectureMIPSEL;
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++  return kCPUArchitecturePPC64;
+ #else
+ #error port to your architecture
+ #endif
+@@ -219,6 +221,9 @@ uint32_t SystemSnapshotLinux::CPURevisio
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+   // Not implementable on MIPS
+   return 0;
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++  // Not yet implemented on PPC64
++  return 0;
+ #else
+ #error port to your architecture
+ #endif
+@@ -239,6 +244,9 @@ std::string SystemSnapshotLinux::CPUVend
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+   // Not implementable on MIPS
+   return std::string();
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++  // Not yet implemented on PPC64
++  return std::string();
+ #else
+ #error port to your architecture
+ #endif
+@@ -372,6 +380,9 @@ bool SystemSnapshotLinux::NXEnabled() co
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+   // Not implementable on MIPS
+   return false;
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++  // Not yet implemented on PPC64
++  return false;
+ #else
+ #error Port.
+ #endif  // ARCH_CPU_X86_FAMILY
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/test_modules.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/test_modules.cc
+@@ -110,6 +110,8 @@ bool WriteTestModule(const base::FilePat
+   module.ehdr.e_machine = EM_AARCH64;
+ #elif defined(ARCH_CPU_MIPSEL) || defined(ARCH_CPU_MIPS64EL)
+   module.ehdr.e_machine = EM_MIPS;
++#elif defined(ARCH_CPU_PPC64)
++  module.ehdr.e_machine = EM_PPC64;
+ #endif
+ 
+   module.ehdr.e_version = EV_CURRENT;
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/thread_snapshot_linux.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/thread_snapshot_linux.cc
+@@ -186,6 +186,14 @@ bool ThreadSnapshotLinux::Initialize(Pro
+         thread.thread_info.float_context.f32,
+         context_.mipsel);
+   }
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++  context_.architecture = kCPUArchitecturePPC64;
++  context_.ppc64 = &context_union_.ppc64;
++  InitializeCPUContextPPC64<ContextTraits64>(
++      thread.thread_info.thread_context.t64,
++      thread.thread_info.float_context.f64,
++      thread.thread_info.vector_context.v64,
++      context_.ppc64);
+ #else
+ #error Port.
+ #endif
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/thread_snapshot_linux.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/thread_snapshot_linux.h
+@@ -68,6 +68,8 @@ class ThreadSnapshotLinux final : public
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+     CPUContextMIPS mipsel;
+     CPUContextMIPS64 mips64;
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++    CPUContextPPC64 ppc64;
+ #else
+ #error Port.
+ #endif  // ARCH_CPU_X86_FAMILY
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/util/linux/auxiliary_vector.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/util/linux/auxiliary_vector.cc
+@@ -56,6 +56,11 @@ bool AuxiliaryVector::Read(PtraceConnect
+     if (type == AT_IGNORE) {
+       continue;
+     }
++#if defined(ARCH_CPU_PPC64_FAMILY)
++    if (type == AT_IGNOREPPC) {
++      continue;
++    }
++#endif
+     if (!MapInsertOrReplace(&values_, type, value, nullptr)) {
+       LOG(ERROR) << "duplicate auxv entry";
+       return false;
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/util/linux/ptracer.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/util/linux/ptracer.cc
+@@ -399,6 +399,64 @@ bool GetThreadArea64(pid_t tid,
+   return true;
+ }
+ 
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++// PPC64 has had HAVE_ARCH_TRACEHOOK set since 2.6.27 (even before x86 had it).
++// That means we can simply use PTRACE_GETREGESET.
++
++template <typename Destination>
++bool GetRegisterSet(pid_t tid, int set, Destination* dest, bool can_log) {
++  iovec iov;
++  iov.iov_base = reinterpret_cast<void*>(dest);
++  iov.iov_len = sizeof(*dest);
++  if (ptrace(PTRACE_GETREGSET, tid, reinterpret_cast<void*>(set), &iov) != 0) {
++    PLOG_IF(ERROR, can_log) << "ptrace";
++    return false;
++  }
++  if (iov.iov_len != sizeof(*dest)) {
++    LOG_IF(ERROR, can_log) << "Unexpected registers size";
++    return false;
++  }
++  return true;
++}
++
++bool GetVectorRegisters64(pid_t tid,
++                          VectorContext* context,
++                          bool can_log) {
++  return GetRegisterSet(tid, NT_PPC_VMX, &context->v64, can_log);
++}
++
++bool GetFloatingPointRegisters64(pid_t tid,
++                                 FloatContext* context,
++                                 bool can_log) {
++  return GetRegisterSet(tid, NT_PRFPREG, &context->f64, can_log);
++}
++
++bool GetThreadArea64(pid_t tid,
++                     const ThreadContext& context,
++                     LinuxVMAddress* address,
++                     bool can_log) {
++  // PPC64 doesn't have PTRACE_GET_THREAD_AREA since the thread pointer
++  // is stored in GPR 13.
++  ThreadContext::t64_t tc;
++  if (!GetRegisterSet(tid, NT_PRSTATUS, &tc, can_log)) {
++    LOG_IF(ERROR, can_log) << "Unable to get thread pointer!";
++    return false;
++  }
++
++  *address = tc.gpr[13];
++
++  return true;
++}
++
++// Stubs for 32-bit functions not applicable on PPC64
++bool GetFloatingPointRegisters32(pid_t tid,
++                                 FloatContext* context,
++                                 bool can_log) { return false; }
++bool GetThreadArea32(pid_t tid,
++                     const ThreadContext &context,
++                     LinuxVMAddress *address,
++                     bool can_log) { return false; }
++
+ #else
+ #error Port.
+ #endif  // ARCH_CPU_X86_FAMILY
+@@ -495,6 +553,9 @@ bool Ptracer::GetThreadInfo(pid_t tid, T
+   if (is_64_bit_) {
+     return GetGeneralPurposeRegisters64(tid, &info->thread_context, can_log_) &&
+            GetFloatingPointRegisters64(tid, &info->float_context, can_log_) &&
++#if defined(ARCH_CPU_PPC64_FAMILY)
++           GetVectorRegisters64(tid, &info->vector_context, can_log_) &&
++#endif
+            GetThreadArea64(tid,
+                            info->thread_context,
+                            &info->thread_specific_data_address,
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/util/linux/thread_info.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/util/linux/thread_info.h
+@@ -39,6 +39,13 @@ struct user_vfp_exc {
+ #include <android/api-level.h>
+ #endif
+ 
++#if defined(ARCH_CPU_PPC64_FAMILY)
++#include <sys/ucontext.h>
++#if !defined(__GLIBC__)
++#include <asm/ptrace.h>
++#endif
++#endif
++
+ namespace crashpad {
+ 
+ //! \brief The set of general purpose registers for an architecture family.
+@@ -90,6 +97,8 @@ union ThreadContext {
+     uint32_t cp0_status;
+     uint32_t cp0_cause;
+     uint32_t padding1_;
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++    // PPC64 is 64-bit
+ #else
+ #error Port.
+ #endif  // ARCH_CPU_X86_FAMILY
+@@ -143,6 +152,21 @@ union ThreadContext {
+     uint64_t cp0_badvaddr;
+     uint64_t cp0_status;
+     uint64_t cp0_cause;
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++    // Reflects struct pt_regs in asm/ptrace.h.
++    uint64_t gpr[32];
++    uint64_t nip;
++    uint64_t msr;
++    uint64_t orig_gpr3;
++    uint64_t ctr;
++    uint64_t lnk;
++    uint64_t xer;
++    uint64_t ccr;
++    uint64_t softe;
++    uint64_t trap;
++    uint64_t dar;
++    uint64_t dsisr;
++    uint64_t result;
+ #else
+ #error Port.
+ #endif  // ARCH_CPU_X86_FAMILY
+@@ -154,6 +178,8 @@ union ThreadContext {
+   using NativeThreadContext = user_regs;
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+ // No appropriate NativeThreadsContext type available for MIPS
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++  using NativeThreadContext = struct pt_regs;
+ #else
+ #error Port.
+ #endif  // ARCH_CPU_X86_FAMILY || ARCH_CPU_ARM64
+@@ -229,6 +255,9 @@ union FloatContext {
+     } fpregs[32];
+     uint32_t fpcsr;
+     uint32_t fpu_id;
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++    // Crashpad's PPC support is 64-bit only, so this
++    // 32bit-only struct is declared as empty.
+ #else
+ #error Port.
+ #endif  // ARCH_CPU_X86_FAMILY
+@@ -263,6 +292,10 @@ union FloatContext {
+     double fpregs[32];
+     uint32_t fpcsr;
+     uint32_t fpu_id;
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++    // Reflects fpregset_t in sys/ucontext.h
++    double fpregs[32];
++    double fpscr;
+ #else
+ #error Port.
+ #endif  // ARCH_CPU_X86_FAMILY
+@@ -291,6 +324,8 @@ union FloatContext {
+   static_assert(sizeof(f64) == sizeof(user_fpsimd_struct), "Size mismatch");
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+ // No appropriate floating point context native type for available MIPS.
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++  static_assert(sizeof(f64) == sizeof(fpregset_t), "Size mismatch");
+ #else
+ #error Port.
+ #endif  // ARCH_CPU_X86
+@@ -298,6 +333,26 @@ union FloatContext {
+ static_assert(std::is_standard_layout<FloatContext>::value,
+               "Not standard layout");
+ 
++//! \brief The vector registers used for an architecture family
++union VectorContext {
++  struct v32_t {} v32;
++#if defined(ARCH_CPU_PPC64_FAMILY)
++  __attribute__((__aligned__(16))) // Vector context must be doubleword aligned.
++#endif
++  struct v64_t {
++#if defined(ARCH_CPU_PPC64_FAMILY)
++    // Reflects vrregset_t in sys/ucontext.h
++    uint32_t vrregs[32][4];
++    struct {
++      uint32_t __pad[3];
++      uint32_t vscr_word;
++    } vscr;
++    uint32_t vrsave;
++    uint32_t __pad[3];
++#endif
++  } v64;
++};
++
+ //! \brief A collection of `ptrace`-able information about a thread.
+ struct ThreadInfo {
+   ThreadInfo();
+@@ -309,6 +364,9 @@ struct ThreadInfo {
+   //! \brief The floating point registers for the thread.
+   FloatContext float_context;
+ 
++  //! \brief (Optional) The vector registers used for the thread.
++  VectorContext vector_context;
++
+   //! \brief The thread-local storage address for the thread.
+   LinuxVMAddress thread_specific_data_address;
+ };
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/util/misc/capture_context.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/util/misc/capture_context.h
+@@ -69,6 +69,7 @@ using NativeCPUContext = ucontext_t;
+ //!     macOS/Linux/Fuchsia | x86_64       | `%%rdi`
+ //!     Linux               | ARM/ARM64    | `r0`/`x0`
+ //!     Linux               | MIPS/MIPS64  | `$a0`
++//!     Linux               | PPC64        | `r3`
+ //!
+ //!     Additionally, the value `LR` on ARM/ARM64 will be the return address of
+ //!     this function.
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/util/misc/capture_context_linux.S
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/util/misc/capture_context_linux.S
+@@ -32,7 +32,7 @@
+   .balign 4, 0x0
+   .type CAPTURECONTEXT_SYMBOL, %function
+   .type CAPTURECONTEXT_SYMBOL2, %function
+-#elif defined(__mips__)
++#elif defined(__mips__) || defined(__powerpc64__)
+   .balign 4, 0x0
+ #endif
+ 
+@@ -423,4 +423,214 @@ CAPTURECONTEXT_SYMBOL2:
+   jr $ra
+ 
+   .set at
++#elif defined(__powerpc64__)
++  // Store r0-r31
++  std 0, 0xe8(3)   // context->uc_mcontext.gp_regs[0]
++  std 1, 0xf0(3)   // context->uc_mcontext.gp_regs[1]
++  std 2, 0xf8(3)   // context->uc_mcontext.gp_regs[2]
++  // note that r3's original value was lost
++  std 3, 0x100(3)  // context->uc_mcontext.gp_regs[3]
++  std 4, 0x108(3)  // context->uc_mcontext.gp_regs[4]
++  std 5, 0x110(3)  // context->uc_mcontext.gp_regs[5]
++  std 6, 0x118(3)  // context->uc_mcontext.gp_regs[6]
++  std 7, 0x120(3)  // context->uc_mcontext.gp_regs[7]
++  std 8, 0x128(3)  // context->uc_mcontext.gp_regs[8]
++  std 9, 0x130(3)  // context->uc_mcontext.gp_regs[9]
++  std 10, 0x138(3) // context->uc_mcontext.gp_regs[10]
++  std 11, 0x140(3) // context->uc_mcontext.gp_regs[11]
++  std 12, 0x148(3) // context->uc_mcontext.gp_regs[12]
++  std 13, 0x150(3) // context->uc_mcontext.gp_regs[13]
++  std 14, 0x158(3) // context->uc_mcontext.gp_regs[14]
++  std 15, 0x160(3) // context->uc_mcontext.gp_regs[15]
++  std 16, 0x168(3) // context->uc_mcontext.gp_regs[16]
++  std 17, 0x170(3) // context->uc_mcontext.gp_regs[17]
++  std 18, 0x178(3) // context->uc_mcontext.gp_regs[18]
++  std 19, 0x180(3) // context->uc_mcontext.gp_regs[19]
++  std 20, 0x188(3) // context->uc_mcontext.gp_regs[20]
++  std 21, 0x190(3) // context->uc_mcontext.gp_regs[21]
++  std 22, 0x198(3) // context->uc_mcontext.gp_regs[22]
++  std 23, 0x1a0(3) // context->uc_mcontext.gp_regs[23]
++  std 24, 0x1a8(3) // context->uc_mcontext.gp_regs[24]
++  std 25, 0x1b0(3) // context->uc_mcontext.gp_regs[25]
++  std 26, 0x1b8(3) // context->uc_mcontext.gp_regs[26]
++  std 27, 0x1c0(3) // context->uc_mcontext.gp_regs[27]
++  std 28, 0x1c8(3) // context->uc_mcontext.gp_regs[28]
++  std 29, 0x1d0(3) // context->uc_mcontext.gp_regs[29]
++  std 30, 0x1d8(3) // context->uc_mcontext.gp_regs[30]
++  std 31, 0x1e0(3) // context->uc_mcontext.gp_regs[31]
++
++  // For NIP, we can use the value in the link register
++  mflr 0
++  std 0, 0x1e8(3) // context->uc_mcontext.gp_regs[PT_NIP]
++
++  // CTR
++  mfctr 0
++  std 0, 0x200(3) // context->uc_mcontext.gp_regs[PT_CTR]
++
++  // For LNK, we'll use the caller's LR save area (2 stack frames up).
++  // r4 can be used as a scratch register since it has already been saved.
++  ld 4, 0(1)
++  ld 4, 16(4)
++  std 4, 0x208(3) // context->uc_mcontext.gp_regs[PT_LNK]
++
++  // XER
++  mfxer 0
++  std 0, 0x210(3) // context->uc_mcontext.gp_regs[PT_XER]
++
++  // CCR
++  mfcr 0
++  std 0, 0x218(3) // context->uc_mcontext.gp_regs[PT_CCR]
++
++  // MSR, orig_r3, MQ, TRAP, DAR, DSISR, RESULT, DSCR,
++  // not used or not relevant,  zero them out.
++  li 4, 0
++  std 4, 0x1f0(3) // context->uc_mcontext.gp_regs[PT_MSR]
++  std 4, 0x1f8(3) // context->uc_mcontext.gp_regs[PT_ORIG_R3]
++  std 4, 0x220(3) // context->uc_mcontext.gp_regs[PT_MQ]
++  std 4, 0x228(3) // context->uc_mcontext.gp_regs[PT_TRAP]
++  std 4, 0x230(3) // context->uc_mcontext.gp_regs[PT_DAR]
++  std 4, 0x238(3) // context->uc_mcontext.gp_regs[PT_DSISR]
++  std 4, 0x240(3) // context->uc_mcontext.gp_regs[PT_RESULT]
++  std 4, 0x248(3) // context->uc_mcontext.gp_regs[PT_DSCR]
++
++  // Update context->uc_mcontext.regs to point to gp_regs
++  addi 0, 3, 0xe8
++  std 0, 0xe0(3)
++
++  // Save floating point registers 0-31
++  stfd 0, 0x268(3)  // context->uc_mcontext.fp_regs[0]
++  stfd 1, 0x270(3)  // context->uc_mcontext.fp_regs[1]
++  stfd 2, 0x278(3)  // context->uc_mcontext.fp_regs[2]
++  stfd 3, 0x280(3)  // context->uc_mcontext.fp_regs[3]
++  stfd 4, 0x288(3)  // context->uc_mcontext.fp_regs[4]
++  stfd 5, 0x290(3)  // context->uc_mcontext.fp_regs[5]
++  stfd 6, 0x298(3)  // context->uc_mcontext.fp_regs[6]
++  stfd 7, 0x2a0(3)  // context->uc_mcontext.fp_regs[7]
++  stfd 8, 0x2a8(3)  // context->uc_mcontext.fp_regs[8]
++  stfd 9, 0x2b0(3)  // context->uc_mcontext.fp_regs[9]
++  stfd 10, 0x2b8(3) // context->uc_mcontext.fp_regs[10]
++  stfd 11, 0x2c0(3) // context->uc_mcontext.fp_regs[11]
++  stfd 12, 0x2c8(3) // context->uc_mcontext.fp_regs[12]
++  stfd 13, 0x2d0(3) // context->uc_mcontext.fp_regs[13]
++  stfd 14, 0x2d8(3) // context->uc_mcontext.fp_regs[14]
++  stfd 15, 0x2e0(3) // context->uc_mcontext.fp_regs[15]
++  stfd 16, 0x2e8(3) // context->uc_mcontext.fp_regs[16]
++  stfd 17, 0x2f0(3) // context->uc_mcontext.fp_regs[17]
++  stfd 18, 0x2f8(3) // context->uc_mcontext.fp_regs[18]
++  stfd 19, 0x300(3) // context->uc_mcontext.fp_regs[19]
++  stfd 20, 0x308(3) // context->uc_mcontext.fp_regs[20]
++  stfd 21, 0x310(3) // context->uc_mcontext.fp_regs[21]
++  stfd 22, 0x318(3) // context->uc_mcontext.fp_regs[22]
++  stfd 23, 0x320(3) // context->uc_mcontext.fp_regs[23]
++  stfd 24, 0x328(3) // context->uc_mcontext.fp_regs[24]
++  stfd 25, 0x330(3) // context->uc_mcontext.fp_regs[25]
++  stfd 26, 0x338(3) // context->uc_mcontext.fp_regs[26]
++  stfd 27, 0x340(3) // context->uc_mcontext.fp_regs[27]
++  stfd 28, 0x348(3) // context->uc_mcontext.fp_regs[28]
++  stfd 29, 0x350(3) // context->uc_mcontext.fp_regs[29]
++  stfd 30, 0x358(3) // context->uc_mcontext.fp_regs[30]
++  stfd 31, 0x360(3) // context->uc_mcontext.fp_regs[31]
++
++  // FPSCR
++  mffs 0
++  stfd 0, 0x368(3) // context->uc_mcontext.fp_regs[32]
++
++  // Save VMX Vector registers
++  // Update r4 to contain the base address of vmx_reserve
++  addi 4, 3, 0x378
++  // Ensure that it is quadword aligned
++  andi. 5, 4, 0xF
++  beq 1f // No alignment is necessary
++  // Address is doubleword aligned and not quadword aligned, add 8
++  addi 4, 4, 8
++
++1:
++  // Store VMX registers 0-31
++  // r4 will contain the base address
++  // r5 will contain the index
++  li 5, 0
++  stvx 0, 4, 5   // context->uc_mcontext.vmx_reserve[(align) + 0]
++  addi 5, 5, 16
++  stvx 1, 4, 5   // context->uc_mcontext.vmx_reserve[(align) + 1]
++  addi 5, 5, 16
++  stvx 2, 4, 5   // context->uc_mcontext.vmx_reserve[(align) + 2]
++  addi 5, 5, 16
++  stvx 3, 4, 5   // context->uc_mcontext.vmx_reserve[(align) + 3]
++  addi 5, 5, 16
++  stvx 4, 4, 5   // context->uc_mcontext.vmx_reserve[(align) + 4]
++  addi 5, 5, 16
++  stvx 5, 4, 5   // context->uc_mcontext.vmx_reserve[(align) + 5]
++  addi 5, 5, 16
++  stvx 6, 4, 5   // context->uc_mcontext.vmx_reserve[(align) + 6]
++  addi 5, 5, 16
++  stvx 7, 4, 5   // context->uc_mcontext.vmx_reserve[(align) + 7]
++  addi 5, 5, 16
++  stvx 8, 4, 5   // context->uc_mcontext.vmx_reserve[(align) + 8]
++  addi 5, 5, 16
++  stvx 9, 4, 5   // context->uc_mcontext.vmx_reserve[(align) + 9]
++  addi 5, 5, 16
++  stvx 10, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 10]
++  addi 5, 5, 16
++  stvx 11, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 11]
++  addi 5, 5, 16
++  stvx 12, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 12]
++  addi 5, 5, 16
++  stvx 13, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 13]
++  addi 5, 5, 16
++  stvx 14, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 14]
++  addi 5, 5, 16
++  stvx 15, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 15]
++  addi 5, 5, 16
++  stvx 16, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 16]
++  addi 5, 5, 16
++  stvx 17, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 17]
++  addi 5, 5, 16
++  stvx 18, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 18]
++  addi 5, 5, 16
++  stvx 19, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 19]
++  addi 5, 5, 16
++  stvx 20, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 20]
++  addi 5, 5, 16
++  stvx 21, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 21]
++  addi 5, 5, 16
++  stvx 22, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 22]
++  addi 5, 5, 16
++  stvx 23, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 23]
++  addi 5, 5, 16
++  stvx 24, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 24]
++  addi 5, 5, 16
++  stvx 25, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 25]
++  addi 5, 5, 16
++  stvx 26, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 26]
++  addi 5, 5, 16
++  stvx 27, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 27]
++  addi 5, 5, 16
++  stvx 28, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 28]
++  addi 5, 5, 16
++  stvx 29, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 29]
++  addi 5, 5, 16
++  stvx 30, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 30]
++  addi 5, 5, 16
++  stvx 31, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 31]
++  addi 5, 5, 16
++
++  // VSCR
++  mfvscr 0
++  stvx 0, 4, 5
++  addi 5, 5, 16
++
++  // VRSAVE
++  mfvrsave 0
++  stwx 0, 4, 5
++
++  // Update context->uc_mcontext.v_regs to point to vmx_reserve + alignment.
++  std 4, 0x370(3)
++
++  // Zero out all unused fields
++  li 4, 0
++  std 4, 0xc8(3) // context->uc_mcontext.signal
++  std 4, 0xd0(3) // context->uc_mcontext.handler
++  std 4, 0xd8(3) // context->uc_mcontext.oldmask
++
++  blr
+ #endif  // __i386__
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/util/misc/capture_context_test.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/util/misc/capture_context_test.cc
+@@ -57,7 +57,7 @@ void TestCaptureContext() {
+   uintptr_t pc = ProgramCounterFromContext(context_1);
+ 
+ #if !defined(ADDRESS_SANITIZER) && !defined(ARCH_CPU_MIPS_FAMILY) && \
+-    !defined(MEMORY_SANITIZER)
++    !defined(MEMORY_SANITIZER) && !defined(ARCH_CPU_PPC64_FAMILY)
+   // Sanitizers can cause enough code bloat that the “nearby” check would
+   // likely fail.
+   const uintptr_t kReferencePC =
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/util/misc/capture_context_test_util_linux.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/util/misc/capture_context_test_util_linux.cc
+@@ -35,6 +35,8 @@ void SanityCheckContext(const NativeCPUC
+   EXPECT_EQ(context.uc_mcontext.regs[0], FromPointerCast<uintptr_t>(&context));
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+   EXPECT_EQ(context.uc_mcontext.gregs[4], FromPointerCast<uintptr_t>(&context));
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++  EXPECT_EQ(context.uc_mcontext.gp_regs[3], FromPointerCast<uintptr_t>(&context));
+ #endif
+ }
+ 
+@@ -49,6 +51,8 @@ uintptr_t ProgramCounterFromContext(cons
+   return context.uc_mcontext.pc;
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+   return context.uc_mcontext.pc;
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++  return context.uc_mcontext.gp_regs[PT_NIP];
+ #endif
+ }
+ 
+@@ -63,6 +67,8 @@ uintptr_t StackPointerFromContext(const
+   return context.uc_mcontext.sp;
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+   return context.uc_mcontext.gregs[29];
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++  return context.uc_mcontext.gp_regs[1];
+ #endif
+ }
+ 
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/util/posix/signals_test.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/util/posix/signals_test.cc
+@@ -46,9 +46,9 @@ bool CanCauseSignal(int sig) {
+   return sig == SIGABRT ||
+          sig == SIGALRM ||
+          sig == SIGBUS ||
+-#if !defined(ARCH_CPU_ARM64)
++#if !defined(ARCH_CPU_ARM64) && !defined(ARCH_CPU_PPC64)
+          sig == SIGFPE ||
+-#endif  // !defined(ARCH_CPU_ARM64)
++#endif  // !defined(ARCH_CPU_ARM64) && !defined(ARCH_CPU_PPC64)
+ #if defined(ARCH_CPU_X86_FAMILY) || defined(ARCH_CPU_ARMEL)
+          sig == SIGILL ||
+ #endif  // defined(ARCH_CPU_X86_FAMILY) || defined(ARCH_CPU_ARMEL)
+@@ -117,9 +117,11 @@ void CauseSignal(int sig) {
+       break;
+     }
+ 
+-#if !defined(ARCH_CPU_ARM64)
++#if !defined(ARCH_CPU_ARM64) && !defined(ARCH_CPU_PPC64)
+     // ARM64 has hardware integer division instructions that don’t generate a
+     // trap for divide-by-zero, so this doesn’t produce SIGFPE.
++    //
++    // PPC64 fixed-point division by zero also doesn't produce a SIGFPE.
+     case SIGFPE: {
+       // Optimization makes this tricky, so get zero from a system call likely
+       // to succeed, and try to do something with the result.
+@@ -137,7 +139,7 @@ void CauseSignal(int sig) {
+       fstat(quotient, &stat_buf);
+       break;
+     }
+-#endif  // ARCH_CPU_ARM64
++#endif  // !defined(ARCH_CPU_ARM64) && !defined(ARCH_CPU_PPC64)
+ 
+ #if defined(ARCH_CPU_X86_FAMILY) || defined(ARCH_CPU_ARMEL)
+     case SIGILL: {
+--- a/src/3rdparty/chromium/third_party/dav1d/BUILD.gn
++++ b/src/3rdparty/chromium/third_party/dav1d/BUILD.gn
+@@ -196,6 +196,8 @@ static_library("dav1d_8bit") {
+     sources += arm_template_sources
+   } else if (current_cpu == "arm64") {
+     sources += arm_template_sources
++  } else if (current_cpu == "ppc64") {
++    sources += ppc64_template_sources
+   }
+ 
+   cflags = dav1d_copts
+@@ -226,6 +228,8 @@ static_library("dav1d_10bit") {
+     sources += arm_template_sources
+   } else if (current_cpu == "arm64") {
+     sources += arm_template_sources
++  } else if (current_cpu == "ppc64") {
++    sources += ppc64_template_sources
+   }
+ 
+   cflags = dav1d_copts
+@@ -283,6 +287,21 @@ if (current_cpu == "x86" || current_cpu
+     }
+ 
+     cflags = dav1d_copts
++  }
++} else if (current_cpu == "ppc64") {
++  static_library("dav1d_ppc") {
++    sources = [
++      "libdav1d/src/ppc/cpu.c",
++      "libdav1d/src/ppc/cpu.h",
++    ]
++
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [
++      "//build/config/compiler:no_chromium_code",
++      ":dav1d_config",
++    ]
++
++    cflags = dav1d_copts
+ 
+     deps = [ ":dav1d_headers" ]
+     allow_circular_includes_from = [ ":dav1d_headers" ]
+@@ -315,5 +334,7 @@ static_library("dav1d") {
+     }
+   } else if (current_cpu == "arm" || current_cpu == "arm64") {
+     deps += [ ":dav1d_arm" ]
++  } else if (current_cpu == "ppc64") {
++    deps += [ ":dav1d_ppc" ]
+   }
+ }
+--- a/src/3rdparty/chromium/third_party/dav1d/dav1d_generated.gni
++++ b/src/3rdparty/chromium/third_party/dav1d/dav1d_generated.gni
+@@ -103,6 +103,11 @@ arm_template_sources = [
+   "libdav1d/src/arm/mc_init_tmpl.c",
+ ]
+ 
++ppc64_template_sources = [
++  "libdav1d/src/ppc/cdef_init_tmpl.c",
++  "libdav1d/src/ppc/looprestoration_init_tmpl.c",
++]
++
+ template_sources = [
+   "libdav1d/src/cdef_apply_tmpl.c",
+   "libdav1d/src/cdef_tmpl.c",
+--- a/src/3rdparty/chromium/third_party/dav1d/generate_source.py
++++ b/src/3rdparty/chromium/third_party/dav1d/generate_source.py
+@@ -57,6 +57,8 @@ def _WriteGn(fd):
+   _WriteArray(fd, "arm64_asm_sources", _Glob("libdav1d/src/arm/64/*.S"))
+   _WriteArray(fd, "arm_template_sources", _Glob("libdav1d/src/arm/*_tmpl.c"))
+ 
++  _WriteArray(fd, "ppc64_template_sources", _Glob("libdav1d/src/ppc/*_tmpl.c"))
++
+   template_sources = _Glob("libdav1d/src/*_tmpl.c")
+   _WriteArray(fd, "template_sources", template_sources)
+ 
+--- a/src/3rdparty/chromium/third_party/dav1d/libdav1d/src/ppc/types.h
++++ b/src/3rdparty/chromium/third_party/dav1d/libdav1d/src/ppc/types.h
+@@ -51,4 +51,19 @@
+ #define u16l_to_i32(v) ((i32x4) vec_mergel((u16x8) v, vec_splat_u16(0)))
+ #define i16l_to_i32(v) ((i32x4) vec_unpackl((i16x8)v))
+ 
++#if defined(__clang__)
++#undef vec_splats
++#define vec_splats(N)                     \
++    _Generic((N),                         \
++        unsigned char:      ((u8x16)(N)), \
++        signed char:        ((i8x16)(N)), \
++        unsigned short:     ((u16x8)(N)), \
++        signed short:       ((i16x8)(N)), \
++        unsigned int:       ((u32x4)(N)), \
++        signed int:         ((i32x4)(N)), \
++        unsigned long long: ((u64x2)(N)), \
++        signed long long:   ((i64x2)(N))  \
++    )
++#endif
++
+ #endif /* DAV1D_SRC_PPC_TYPES_H */
+--- a/src/3rdparty/chromium/third_party/eigen3/BUILD.gn
++++ b/src/3rdparty/chromium/third_party/eigen3/BUILD.gn
+@@ -22,4 +22,8 @@ config("eigen_includes") {
+     # for this component on Windows on Arm due to compilation errors.
+     defines += [ "EIGEN_DONT_VECTORIZE" ]
+   }
++
++  if (target_cpu == "ppc64") {
++    defines += [ "EIGEN_DONT_VECTORIZE" ]
++  }
+ }
+--- a/src/3rdparty/chromium/third_party/libaom/BUILD.gn
++++ b/src/3rdparty/chromium/third_party/libaom/BUILD.gn
+@@ -37,6 +37,8 @@ if (enable_libaom) {
+     } else {
+       cpu_arch_full = "arm"
+     }
++  } else if (current_cpu == "ppc64") {
++    cpu_arch_full = "generic"
+   } else {
+     cpu_arch_full = current_cpu
+   }
+--- a/src/3rdparty/chromium/third_party/libgav1/options.gni
++++ b/src/3rdparty/chromium/third_party/libgav1/options.gni
+@@ -12,5 +12,5 @@ declare_args() {
+       is_chromeos_ash && (target_cpu == "arm" || target_cpu == "arm64")
+   use_libgav1_parser =
+       (is_chromeos || is_linux || is_win) &&
+-      (target_cpu == "x86" || target_cpu == "x64" || target_cpu == "arm64")
++      (target_cpu == "x86" || target_cpu == "x64" || target_cpu == "arm64" || target_cpu == "ppc64")
+ }
+--- a/src/3rdparty/chromium/third_party/lss/linux_syscall_support.h
++++ b/src/3rdparty/chromium/third_party/lss/linux_syscall_support.h
+@@ -4262,7 +4262,7 @@ struct kernel_statfs {
+       LSS_REG(2, buf);
+       LSS_BODY(void*, mmap2, "0"(__r2));
+     }
+-#else
++#elif !defined(__powerpc64__) /* ppc64 doesn't have mmap2 */
+     #define __NR__mmap2 __NR_mmap2
+     LSS_INLINE _syscall6(void*, _mmap2,            void*, s,
+                          size_t,                   l, int,               p,
+@@ -4373,7 +4373,7 @@ struct kernel_statfs {
+   #if defined(__i386__) ||                                                    \
+       defined(__ARM_ARCH_3__) || defined(__ARM_EABI__) ||                     \
+      (defined(__mips__) && _MIPS_SIM == _MIPS_SIM_ABI32) ||                   \
+-      defined(__PPC__) ||                                                     \
++     (defined(__PPC__) && !defined(__powerpc64__)) ||                                                     \
+      (defined(__s390__) && !defined(__s390x__))
+     /* On these architectures, implement mmap() with mmap2(). */
+     LSS_INLINE void* LSS_NAME(mmap)(void *s, size_t l, int p, int f, int d,
+@@ -4556,9 +4556,17 @@ struct kernel_statfs {
+     }
+   #endif
+   #if defined(__NR_fstatat64)
++    #if !defined(__GLIBC__)
++        // musl doesn't define fstatat64 fstatat
++        #undef fstatat64
++    #endif
+     LSS_INLINE _syscall4(int,   fstatat64,        int,   d,
+                          const char *,      p,
+                          struct kernel_stat64 *,   b,    int,   f)
++    #if !defined(__GLIBC__)
++    	// then restore it
++        #define fstatat64 fstatat
++    #endif
+   #endif
+   #if defined(__NR_waitpid)
+     // waitpid is polyfilled below when not available.
+--- a/src/3rdparty/chromium/third_party/pdfium/third_party/libpng16/pngpriv.h
++++ b/src/3rdparty/chromium/third_party/pdfium/third_party/libpng16/pngpriv.h
+@@ -196,11 +196,7 @@
+ #endif
+ 
+ #ifndef PNG_POWERPC_VSX_OPT
+-#  if defined(__PPC64__) && defined(__ALTIVEC__) && defined(__VSX__)
+-#     define PNG_POWERPC_VSX_OPT 2
+-#  else
+-#     define PNG_POWERPC_VSX_OPT 0
+-#  endif
++#  define PNG_POWERPC_VSX_OPT 0
+ #endif
+ 
+ #ifndef PNG_INTEL_SSE_OPT
+--- a/src/3rdparty/chromium/third_party/pffft/src/pffft.c
++++ b/src/3rdparty/chromium/third_party/pffft/src/pffft.c
+@@ -100,6 +100,7 @@
+    Altivec support macros 
+ */
+ #if !defined(PFFFT_SIMD_DISABLE) && (defined(__ppc__) || defined(__ppc64__))
++#include <altivec.h>
+ typedef vector float v4sf;
+ #  define SIMD_SZ 4
+ #  define VZERO() ((vector float) vec_splat_u8(0))
+--- a/src/3rdparty/chromium/third_party/skia/src/sksl/SkSLString.cpp
++++ b/src/3rdparty/chromium/third_party/skia/src/sksl/SkSLString.cpp
+@@ -142,7 +142,12 @@ String to_string(double value) {
+     if (needsDotZero) {
+         buffer << ".0";
+     }
+-    return String(buffer.str().c_str());
++
++    std::string ret(buffer.str());
++    if (signbit(value) && ret[0] == '.') {
++        ret[0] = '-';
++    }
++    return String(ret.c_str());
+ }
+ 
+ bool stod(const skstd::string_view& s, SKSL_FLOAT* value) {
+--- a/src/3rdparty/chromium/third_party/sqlite/src/amalgamation/sqlite3.c
++++ b/src/3rdparty/chromium/third_party/sqlite/src/amalgamation/sqlite3.c
+@@ -14628,7 +14628,8 @@ typedef INT16_TYPE LogEst;
+ # if defined(i386)      || defined(__i386__)      || defined(_M_IX86) ||    \
+      defined(__x86_64)  || defined(__x86_64__)    || defined(_M_X64)  ||    \
+      defined(_M_AMD64)  || defined(_M_ARM)        || defined(__x86)   ||    \
+-     defined(__ARMEL__) || defined(__AARCH64EL__) || defined(_M_ARM64)
++     defined(__ARMEL__) || defined(__AARCH64EL__) || defined(_M_ARM64) ||   \
++     defined(__powerpc64__) && (__BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__)
+ #   define SQLITE_BYTEORDER    1234
+ # elif defined(sparc)     || defined(__ppc__) || \
+        defined(__ARMEB__) || defined(__AARCH64EB__)
+--- a/src/3rdparty/chromium/third_party/sqlite/src/amalgamation_dev/sqlite3.c
++++ b/src/3rdparty/chromium/third_party/sqlite/src/amalgamation_dev/sqlite3.c
+@@ -14641,7 +14641,8 @@ typedef INT16_TYPE LogEst;
+ # if defined(i386)      || defined(__i386__)      || defined(_M_IX86) ||    \
+      defined(__x86_64)  || defined(__x86_64__)    || defined(_M_X64)  ||    \
+      defined(_M_AMD64)  || defined(_M_ARM)        || defined(__x86)   ||    \
+-     defined(__ARMEL__) || defined(__AARCH64EL__) || defined(_M_ARM64)
++     defined(__ARMEL__) || defined(__AARCH64EL__) || defined(_M_ARM64) ||   \
++     defined(__powerpc64__) && (__BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__)
+ #   define SQLITE_BYTEORDER    1234
+ # elif defined(sparc)     || defined(__ppc__) || \
+        defined(__ARMEB__) || defined(__AARCH64EB__)
+--- a/src/3rdparty/chromium/third_party/sqlite/src/ext/rtree/rtree.c
++++ b/src/3rdparty/chromium/third_party/sqlite/src/ext/rtree/rtree.c
+@@ -450,7 +450,7 @@ struct RtreeMatchArg {
+ #if defined(i386)     || defined(__i386__)   || defined(_M_IX86) ||    \
+     defined(__x86_64) || defined(__x86_64__) || defined(_M_X64)  ||    \
+     defined(_M_AMD64) || defined(_M_ARM)     || defined(__x86)   ||    \
+-    defined(__arm__)
++    defined(__arm__) || defined(__powerpc64__) && (__BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__)
+ # define SQLITE_BYTEORDER    1234
+ #elif defined(sparc)    || defined(__ppc__)
+ # define SQLITE_BYTEORDER    4321
+--- a/src/3rdparty/chromium/third_party/sqlite/src/src/sqliteInt.h
++++ b/src/3rdparty/chromium/third_party/sqlite/src/src/sqliteInt.h
+@@ -890,7 +890,8 @@ typedef INT16_TYPE LogEst;
+ # if defined(i386)      || defined(__i386__)      || defined(_M_IX86) ||    \
+      defined(__x86_64)  || defined(__x86_64__)    || defined(_M_X64)  ||    \
+      defined(_M_AMD64)  || defined(_M_ARM)        || defined(__x86)   ||    \
+-     defined(__ARMEL__) || defined(__AARCH64EL__) || defined(_M_ARM64)
++     defined(__ARMEL__) || defined(__AARCH64EL__) || defined(_M_ARM64) || \
++     defined(__powerpc64__) && (__BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__)
+ #   define SQLITE_BYTEORDER    1234
+ # elif defined(sparc)     || defined(__ppc__) || \
+        defined(__ARMEB__) || defined(__AARCH64EB__)
+--- a/src/3rdparty/chromium/third_party/webrtc/modules/desktop_capture/differ_block.cc
++++ b/src/3rdparty/chromium/third_party/webrtc/modules/desktop_capture/differ_block.cc
+@@ -30,11 +30,7 @@ bool VectorDifference(const uint8_t* ima
+   static bool (*diff_proc)(const uint8_t*, const uint8_t*) = nullptr;
+ 
+   if (!diff_proc) {
+-#if defined(WEBRTC_ARCH_ARM_FAMILY) || defined(WEBRTC_ARCH_MIPS_FAMILY)
+-    // For ARM and MIPS processors, always use C version.
+-    // TODO(hclam): Implement a NEON version.
+-    diff_proc = &VectorDifference_C;
+-#else
++#if defined(WEBRTC_ARCH_X86_FAMILY)
+     bool have_sse2 = GetCPUInfo(kSSE2) != 0;
+     // For x86 processors, check if SSE2 is supported.
+     if (have_sse2 && kBlockSize == 32) {
+@@ -44,6 +40,10 @@ bool VectorDifference(const uint8_t* ima
+     } else {
+       diff_proc = &VectorDifference_C;
+     }
++#else
++    // For other processors, always use C version.
++    // TODO(hclam): Implement a NEON version.
++    diff_proc = &VectorDifference_C;
+ #endif
+   }
+ 
+--- a/src/3rdparty/chromium/v8/BUILD.gn
++++ b/src/3rdparty/chromium/v8/BUILD.gn
+@@ -1083,6 +1083,12 @@ config("toolchain") {
+     }
+     if (host_byteorder == "little") {
+       defines += [ "V8_TARGET_ARCH_PPC_LE" ]
++      cflags += [
++        # Enable usage of AltiVec, VSX, and other POWER8 and higher features
++        "-mcpu=power8",
++        "-maltivec",
++        "-mvsx",
++      ]
+     } else if (host_byteorder == "big") {
+       defines += [ "V8_TARGET_ARCH_PPC_BE" ]
+       if (current_os == "aix") {
+--- a/src/3rdparty/chromium/ui/gl/features.gni
++++ b/src/3rdparty/chromium/ui/gl/features.gni
+@@ -35,7 +35,8 @@ declare_args() {
+                         (is_mac && use_egl) || is_chromeos_ash || is_fuchsia) &&
+                        (target_cpu == "x86" || target_cpu == "x64" ||
+                         target_cpu == "arm" || target_cpu == "arm64" ||
+-                        target_cpu == "mipsel" || target_cpu == "mips64el")
++                        target_cpu == "mipsel" || target_cpu == "mips64el" ||
++                        target_cpu == "ppc64")
+ }
+ 
+ use_glx = use_x11 || ozone_platform_x11
+--- a/src/3rdparty/chromium/v8/test/BUILD.gn
++++ b/src/3rdparty/chromium/v8/test/BUILD.gn
+@@ -42,7 +42,6 @@ group("gn_all") {
+       "benchmarks/cpp:gn_all",
+       "cctest:cctest",
+       "cctest:generate-bytecode-expectations",
+-      "unittests:unittests",
+     ]
+   }
+ }
+@@ -84,7 +83,6 @@ group("v8_bot_default") {
+     "message:v8_message",
+     "mjsunit:v8_mjsunit",
+     "mkgrokdump:mkgrokdump",
+-    "unittests:unittests",
+     "webkit:v8_webkit",
+   ]
+ 
+@@ -109,7 +107,6 @@ group("v8_default") {
+     "message:v8_message",
+     "mjsunit:v8_mjsunit",
+     "mkgrokdump:mkgrokdump",
+-    "unittests:unittests",
+   ]
+ 
+   if (v8_enable_webassembly) {
+--- /dev/null
++++ b/src/3rdparty/chromium/dev/null
+@@ -0,0 +1,39 @@
++/*
++ * Autogenerated by the Meson build system.
++ * Do not edit, your changes will be lost.
++ */
++
++#pragma once
++
++#define ARCH_AARCH64 0
++
++#define ARCH_ARM 0
++
++#define ARCH_PPC64LE 1
++
++#define ARCH_X86 0
++
++#define ARCH_X86_32 0
++
++#define ARCH_X86_64 0
++
++#define CONFIG_16BPC 1
++
++#define CONFIG_8BPC 1
++
++// #define CONFIG_LOG 1 -- Logging is controlled by Chromium
++
++#define ENDIANNESS_BIG 0
++
++#define HAVE_ASM 1
++
++#define HAVE_CLOCK_GETTIME 1
++
++#define HAVE_DLSYM 1
++
++#define HAVE_GETAUXVAL 1
++
++#define HAVE_POSIX_MEMALIGN 1
++
++#define HAVE_UNISTD_H 1
++
+--- a/src/3rdparty/chromium/third_party/abseil-cpp/absl/base/internal/unscaledcycleclock.h
++++ b/src/3rdparty/chromium/third_party/abseil-cpp/absl/base/internal/unscaledcycleclock.h
+@@ -46,7 +46,7 @@
+ 
+ // The following platforms have an implementation of a hardware counter.
+ #if defined(__i386__) || defined(__x86_64__) || defined(__aarch64__) || \
+-  defined(__powerpc__) || defined(__ppc__) || \
++  ((defined(__powerpc__) || defined(__ppc__)) && defined(__GLIBC__)) || \
+   defined(_M_IX86) || defined(_M_X64)
+ #define ABSL_HAVE_UNSCALED_CYCLECLOCK_IMPLEMENTATION 1
+ #else
+--- a/src/3rdparty/chromium/third_party/abseil-cpp/absl/debugging/internal/stacktrace_config.h
++++ b/src/3rdparty/chromium/third_party/abseil-cpp/absl/debugging/internal/stacktrace_config.h
+@@ -59,7 +59,7 @@
+ #elif defined(__i386__) || defined(__x86_64__)
+ #define ABSL_STACKTRACE_INL_HEADER \
+   "absl/debugging/internal/stacktrace_x86-inl.inc"
+-#elif defined(__ppc__) || defined(__PPC__)
++#elif defined(__ppc__) || defined(__PPC__) && defined(__GLIBC__)
+ #define ABSL_STACKTRACE_INL_HEADER \
+   "absl/debugging/internal/stacktrace_powerpc-inl.inc"
+ #elif defined(__aarch64__)
+--- a/src/3rdparty/chromium/base/allocator/partition_allocator/partition_alloc_config.h
++++ b/src/3rdparty/chromium/base/allocator/partition_allocator/partition_alloc_config.h
+@@ -100,7 +100,8 @@ static_assert(sizeof(void*) != 8, "");
+ // PUT_REF_COUNT_IN_PREVIOUS_SLOT does. In this case the refcount overlaps with
+ // the next pointer shadow for the smallest bucket.
+ #if !(defined(OS_MAC) && defined(ARCH_CPU_ARM64)) && \
+-    !BUILDFLAG(PUT_REF_COUNT_IN_PREVIOUS_SLOT)
++    !BUILDFLAG(PUT_REF_COUNT_IN_PREVIOUS_SLOT) && \
++    (!defined(__GLIBC) && !defined(__powerpc64__))
+ #define PA_HAS_FREELIST_HARDENING
+ #endif
+ 
+--- a/src/3rdparty/chromium/build/download_nacl_toolchains.py
++++ b/src/3rdparty/chromium/build/download_nacl_toolchains.py
+@@ -13,6 +13,8 @@ import sys
+ 
+ 
+ def Main(args):
++  if 'disable_nacl=1' in os.environ.get('GYP_DEFINES', ''):
++    return 0
+   script_dir = os.path.dirname(os.path.abspath(__file__))
+   src_dir = os.path.dirname(script_dir)
+   nacl_dir = os.path.join(src_dir, 'native_client')
+--- a/src/3rdparty/chromium/chrome/installer/linux/BUILD.gn
++++ b/src/3rdparty/chromium/chrome/installer/linux/BUILD.gn
+@@ -100,8 +100,6 @@ packaging_files = packaging_files_binari
+                     "$root_out_dir/xdg-mime",
+                     "$root_out_dir/xdg-settings",
+                     "$root_out_dir/locales/en-US.pak",
+-                    "$root_out_dir/MEIPreload/manifest.json",
+-                    "$root_out_dir/MEIPreload/preloaded_data.pb",
+                   ]
+ 
+ action_foreach("calculate_deb_dependencies") {
+@@ -321,7 +319,6 @@ group("installer_deps") {
+     ":theme_files",
+     "//chrome",
+     "//chrome:packed_resources",
+-    "//chrome/browser/resources/media/mei_preload:component",
+     "//components/crash/core/app:chrome_crashpad_handler",
+     "//sandbox/linux:chrome_sandbox",
+   ]
+--- /dev/null
++++ b/src/3rdparty/chromium/sandbox/linux/system_headers/ppc64_linux_syscalls.h
+@@ -0,0 +1,12 @@
++// Copyright 2014 The Chromium Authors. All rights reserved.
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++#ifndef SANDBOX_LINUX_SYSTEM_HEADERS_PPC64_LINUX_SYSCALLS_H_
++#define SANDBOX_LINUX_SYSTEM_HEADERS_PPC64_LINUX_SYSCALLS_H_
++
++#include <asm/unistd.h>
++
++//TODO: is it necessary to redefine syscall numbers for PPC64?
++
++#endif  // SANDBOX_LINUX_SYSTEM_HEADERS_PPC64_LINUX_SYSCALLS_H_
+--- /dev/null
++++ b/src/3rdparty/chromium/sandbox/linux/system_headers/ppc64_linux_ucontext.h
+@@ -0,0 +1,12 @@
++// Copyright 2014 The Chromium Authors. All rights reserved.
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++#ifndef SANDBOX_LINUX_SYSTEM_HEADERS_PPC64_LINUX_UCONTEXT_H_
++#define SANDBOX_LINUX_SYSTEM_HEADERS_PPC64_LINUX_UCONTEXT_H_
++
++#include <sys/ucontext.h>
++
++//TODO: is it necessary to redefine ucontext on PPC64?
++
++#endif  // SANDBOX_LINUX_SYSTEM_HEADERS_PPC64_LINUX_UCONTEXT_H_
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/util/net/http_transport_libcurl.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/util/net/http_transport_libcurl.cc
+@@ -236,6 +236,12 @@ std::string UserAgent() {
+ #elif defined(ARCH_CPU_BIG_ENDIAN)
+     static constexpr char arch[] = "aarch64_be";
+ #endif
++#elif defined(__powerpc64__)
++#if defined(ARCH_CPU_LITTLE_ENDIAN)
++    static constexpr char arch[] = "ppc64le";
++#elif defined(ARCH_CPU_BIG_ENDIAN)
++    static constexpr char arch[] = "ppc64";
++#endif
+ #else
+ #error Port
+ #endif
+--- /dev/null
++++ b/src/3rdparty/chromium/third_party/dav1d/config/linux/ppc64/config.h
+@@ -0,0 +1,39 @@
++/*
++ * Autogenerated by the Meson build system.
++ * Do not edit, your changes will be lost.
++ */
++
++#pragma once
++
++#define ARCH_AARCH64 0
++
++#define ARCH_ARM 0
++
++#define ARCH_PPC64LE 1
++
++#define ARCH_X86 0
++
++#define ARCH_X86_32 0
++
++#define ARCH_X86_64 0
++
++#define CONFIG_16BPC 1
++
++#define CONFIG_8BPC 1
++
++// #define CONFIG_LOG 1 -- Logging is controlled by Chromium
++
++#define ENDIANNESS_BIG 0
++
++#define HAVE_ASM 1
++
++#define HAVE_CLOCK_GETTIME 1
++
++#define HAVE_DLSYM 1
++
++#define HAVE_GETAUXVAL 1
++
++#define HAVE_POSIX_MEMALIGN 1
++
++#define HAVE_UNISTD_H 1
++
diff --git a/srcpkgs/qt6-webengine/patches/0903-xxx-ppc64le-swiftshader.patch b/srcpkgs/qt6-webengine/patches/0903-xxx-ppc64le-swiftshader.patch
new file mode 100644
index 000000000000..1a8cd8368da1
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0903-xxx-ppc64le-swiftshader.patch
@@ -0,0 +1,18 @@
+--- a/src/3rdparty/chromium/third_party/swiftshader/third_party/llvm-10.0/BUILD.gn
++++ b/src/3rdparty/chromium/third_party/swiftshader/third_party/llvm-10.0/BUILD.gn
+@@ -576,6 +576,7 @@ swiftshader_llvm_source_set("swiftshader
+     "llvm/lib/MC/MCAsmInfoCOFF.cpp",
+     "llvm/lib/MC/MCAsmInfoDarwin.cpp",
+     "llvm/lib/MC/MCAsmInfoELF.cpp",
++    "llvm/lib/MC/MCAsmInfoXCOFF.cpp",
+     "llvm/lib/MC/MCAsmMacro.cpp",
+     "llvm/lib/MC/MCAsmStreamer.cpp",
+     "llvm/lib/MC/MCAssembler.cpp",
+@@ -631,6 +632,7 @@ swiftshader_llvm_source_set("swiftshader
+     "llvm/lib/MC/MCWinCOFFStreamer.cpp",
+     "llvm/lib/MC/MCWinEH.cpp",
+     "llvm/lib/MC/MCXCOFFStreamer.cpp",
++    "llvm/lib/MC/MCXCOFFObjectTargetWriter.cpp",
+     "llvm/lib/MC/MachObjectWriter.cpp",
+     "llvm/lib/MC/StringTableBuilder.cpp",
+     "llvm/lib/MC/SubtargetFeature.cpp",
diff --git a/srcpkgs/qt6-webengine/template b/srcpkgs/qt6-webengine/template
new file mode 100644
index 000000000000..7160a462db7f
--- /dev/null
+++ b/srcpkgs/qt6-webengine/template
@@ -0,0 +1,175 @@
+# Template file for 'qt6-webengine'
+pkgname=qt6-webengine
+version=6.3.1
+revision=1
+wrksrc="qtwebengine-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DQT_HOST_PATH=/usr -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true
+ -DQT_FEATURE_webengine_system_ffmpeg=ON
+ -DQT_FEATURE_webengine_system_libevent=ON
+ -DQT_FEATURE_webengine_system_gn=ON
+ -DQT_FEATURE_webengine_system_icu=ON
+ -DQT_FEATURE_webengine_webrtc_pipewire=ON
+ -DNinja_EXECUTABLE=$XBPS_WRAPPERDIR/ninja
+ $(vopt_bool examples QT_BUILD_EXAMPLES)
+ -DPKG_CONFIG_HOST_EXECUTABLE=${PKG_CONFIG_FOR_BUILD}"
+hostmakedepends="qt6-base-devel perl pkg-config nodejs python3-html5lib
+ qt6-declarative-devel protobuf gperf flex nss-devel libwebp-devel
+ icu-devel libevent-devel"
+makedepends="qt6-base-devel qt6-declarative-devel pulseaudio-devel
+ qt6-tools-devel qt6-websockets-devel libflac-devel
+ alsa-lib-devel libvpx-devel pciutils-devel opus-devel libxslt-devel
+ libxml2-devel freetype-devel lcms2-devel libwebp-devel icu-devel
+ re2-devel zlib-devel libpng-devel minizip-devel harfbuzz-devel
+ nss-devel libXcursor-devel libXcomposite-devel libXScrnSaver-devel
+ protobuf-devel ffmpeg-devel snappy-devel libevent-devel pipewire-devel
+ libxkbfile-devel qt6-location-devel qt6-webchannel-devel libxshmfence-devel"
+short_desc="Cross-platform application and UI framework - Webengine"
+maintainer="John <me@johnnynator.dev>"
+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=ad7a33b21a956deda37c587d50f821ca3816403ae31ba9b5d59d01561ad66e47
+
+if [ -z "$CROSS_BUILD" ];then
+	configure_args+=" -DCMAKE_TOOLCHAIN_FILE=/usr/lib/cmake/Qt6/qt.toolchain.cmake"
+fi
+
+if [ "$XBPS_LIBC" = "musl" ]; then
+	hostmakedepends+=" musl-legacy-compat"
+fi
+
+if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
+	makedepends+=" musl-legacy-compat"
+fi
+
+if [ ! "$XBPS_WORDSIZE" = "$XBPS_TARGET_WORDSIZE" ]; then
+	broken="webengine can be built only if word size matches"
+fi
+
+if [ "$XBPS_WORDSIZE" -eq 32 ]; then
+	nodebug=yes
+	LDFLAGS="-Wl,--no-keep-memory"
+fi
+
+if [ "$XBPS_TARGET_ENDIAN" != "le" ]; then
+	broken="webengine only supports little endian"
+fi
+
+build_options="sndio examples"
+build_options_default=""
+desc_option_examples="Build examples"
+desc_option_sndio="Enable support for sndio"
+
+subpackages="qt6-webengine-devel"
+
+if [ "$build_option_examples" ]; then
+	subpackages+=" qt6-webengine-examples"
+fi
+
+_bootstrap_gn() {
+	# Bootstrap gn (generate ninja)
+	echo "Bootstrapping 'gn'"
+	cd ${wrksrc}/src/3rdparty/gn
+	CFLAGS="$CFLAGS_host" CXXFLAGS="$CXXFLAGS_host" LDFLAGS="$LDFLAGS_host" \
+	PKGCONFIG=/usr/bin/pkgconfig PKG_CONFIG_PATH="/usr/lib/pkgconfig:/usr/share/pkgconfig" \
+		python3 build/gen.py --no-last-commit-position --out-path \
+			${wrksrc}/src/3rdparty/gn/out/Release --cc "${CC_host:-$CC}" \
+			--cxx "${CXX_host:-$CXX}" --ld "${CXX_host:-$CXX}" --ar "${AR_host:-$AR}" \
+			--qt-version "${version}.qtwebengine.qt.io"
+	ninja -C out/Release gn
+	cd ${wrksrc}
+}
+
+_unbundle_libs() {
+	cd ${wrksrc}/src/3rdparty/chromium
+	echo Dropping bundled libs from chromium
+	# Use system-provided libraries.
+	# TODO: use_system_hunspell (upstream changes needed).
+	# TODO: use_system_libsrtp.
+	# TODO: use_system_libusb (http://crbug.com/266149).
+	# TODO: use_system_ssl (http://crbug.com/58087).
+	# TODO: use_system_sqlite (http://crbug.com/22208).
+	# TODO: use_system_icu (segfaults)
+	# use_system_protobuf
+	# use_system_v8=1
+	# use_system_zlib=1
+	# bzip2 jsoncpp minizip xdg_utils speex
+	system="
+		ffmpeg
+		flac
+		fontconfig
+		freetype
+		harfbuzz-ng
+		icu
+		libdrm
+		libevent
+		libjpeg
+		libpng
+		libwebp
+		libxml
+		libxslt
+		opus
+		re2
+		snappy
+	"
+	build/linux/unbundle/replace_gn_files.py --system-libraries ${system}
+}
+
+# Provide a wrapper to run ./xbps-src -j 1 build later
+_wrap_ninja() {
+	cat <<-'_EOF' >"$XBPS_WRAPPERDIR"/ninja
+	#!/bin/sh
+
+	exec /usr/bin/ninja $NINJAFLAGS "$@"
+	_EOF
+	chmod +x "$XBPS_WRAPPERDIR"/ninja
+}
+
+pre_configure() {
+	_bootstrap_gn
+	# _unbundle_libs
+	_wrap_ninja
+	export PATH="$PATH:${wrksrc}/src/3rdparty/gn/out/Release"
+}
+
+pre_build() {
+	export PATH="$PATH:${wrksrc}/src/3rdparty/gn/out/Release"
+	export NINJAFLAGS="$makejobs"
+
+}
+
+pre_install() {
+	export PATH="$PATH:${wrksrc}/src/3rdparty/gn/out/Release"
+}
+
+post_install() {
+	local _file
+	find "${DESTDIR}"/usr/lib/qt6/examples \
+		-path '*/lib/qt6/**/lib/qt6/*' -type f |
+	while read _file; do
+		mv "$_file" "${_file%/lib/qt6/*}"
+	done
+}
+
+qt6-webengine-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} qt6-webchannel-devel>=${version}_1
+	 qt6-declarative-devel>=${version}_1 qt6-location-devel>=${version}_1"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/pkgconfig
+		vmove usr/lib/qt6/mkspecs
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
+	}
+}
+
+qt6-webengine-examples_package() {
+	short_desc+=" - sample browsers"
+	pkg_install() {
+		vmove usr/lib/qt6/examples
+	}
+}
diff --git a/srcpkgs/qt6-webengine/update b/srcpkgs/qt6-webengine/update
new file mode 100644
index 000000000000..844552465222
--- /dev/null
+++ b/srcpkgs/qt6-webengine/update
@@ -0,0 +1 @@
+pkgname="${pkgname/6-/}-everywhere-src"

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

* Re: [PR PATCH] [Updated] WIP Qt6 webengine
  2022-08-07  4:36 [PR PATCH] WIP Qt6 webengine sgn
                   ` (2 preceding siblings ...)
  2022-08-08 12:15 ` sgn
@ 2022-08-09 13:18 ` sgn
  2022-08-09 15:11 ` skmpz
                   ` (33 subsequent siblings)
  37 siblings, 0 replies; 39+ messages in thread
From: sgn @ 2022-08-09 13:18 UTC (permalink / raw)
  To: ml

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

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

https://github.com/sgn/void-packages qt6-webengine
https://github.com/void-linux/void-packages/pull/38509

WIP Qt6 webengine
<!-- Uncomment relevant sections and delete options which are not applicable -->

Never tried to cross build
Functionality works (at least can view youtube video on x86_64-musl)

#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**
[ci skip]

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-qt6-webengine-38509.patch --]
[-- Type: text/x-diff, Size: 304159 bytes --]

From 2ef197bcc29bfc068f55cfe4f9c71a7a2560b4e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:07 +0700
Subject: [PATCH 01/27] qt6-base: update to 6.3.1.

---
 srcpkgs/qt6-base/patches/libatomic.patch | 14 --------------
 srcpkgs/qt6-base/template                | 16 ++++++++++------
 2 files changed, 10 insertions(+), 20 deletions(-)
 delete mode 100644 srcpkgs/qt6-base/patches/libatomic.patch

diff --git a/srcpkgs/qt6-base/patches/libatomic.patch b/srcpkgs/qt6-base/patches/libatomic.patch
deleted file mode 100644
index 2f7a807518e4..000000000000
--- a/srcpkgs/qt6-base/patches/libatomic.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Index: cmake/FindWrapAtomic.cmake
-===================================================================
---- a/cmake/FindWrapAtomic.cmake
-+++ b/cmake/FindWrapAtomic.cmake
-@@ -38,7 +38,8 @@ endif()
- 
- add_library(WrapAtomic::WrapAtomic INTERFACE IMPORTED)
- if(HAVE_STDATOMIC_WITH_LIB)
--    target_link_libraries(WrapAtomic::WrapAtomic INTERFACE atomic)
-+    find_library(LIBATOMIC atomic REQUIRED)
-+    target_link_libraries(WrapAtomic::WrapAtomic INTERFACE ${LIBATOMIC})
- endif()
- 
- set(WrapAtomic_FOUND 1)
diff --git a/srcpkgs/qt6-base/template b/srcpkgs/qt6-base/template
index cc47e18a70ff..4e88d6b9f174 100644
--- a/srcpkgs/qt6-base/template
+++ b/srcpkgs/qt6-base/template
@@ -1,7 +1,7 @@
 # Template file for 'qt6-base'
 pkgname=qt6-base
-version=6.3.0
-revision=2
+version=6.3.1
+revision=1
 wrksrc="qtbase-everywhere-src-${version}"
 build_style=cmake
 configure_args="-DINSTALL_DATADIR=share/qt6
@@ -9,6 +9,8 @@ configure_args="-DINSTALL_DATADIR=share/qt6
  -DINSTALL_BINDIR=lib/qt6/bin
  -DINSTALL_MKSPECSDIR=lib/qt6/mkspecs
  -DINSTALL_INCLUDEDIR=include/qt6
+ -DINSTALL_EXAMPLESDIR=lib/qt6/examples
+ -DINSTALL_TESTSDIR=lib/qt6/tests
  -DINSTALL_SYSCONFDIR=/etc/xdg
  -DQT_FEATURE_openssl_linked=ON
  -DQT_FEATURE_system_sqlite=ON
@@ -29,14 +31,13 @@ maintainer="John <me@johnnynator.dev>"
 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=b865aae43357f792b3b0a162899d9bf6a1393a55c4e5e4ede5316b157b1a0f99
+checksum=0a64421d9c2469c2c48490a032ab91d547017c9cc171f3f8070bc31888f24e03
 python_version=3
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt6-base-devel"
 	# QtSetup fails native builds if this is set
-	configure_args+=" -DQT_HOST_PATH=/usr
-	 -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true"
+	configure_args+="-DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true"
 fi
 
 # It is currently expected that quite a few patches do fail
@@ -225,7 +226,7 @@ qt6-plugin-tls-qcertonly_package() {
 qt6-plugin-networkinformation_package() {
 	short_desc+=" - Networkinformation plugin"
 	pkg_install() {
-		vmove usr/lib/qt6/plugins/networkinformation/libqnetworkmanager.so
+		vmove usr/lib/qt6/plugins/networkinformation/
 	}
 }
 
@@ -246,9 +247,12 @@ qt6-base-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/*.a"
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From cd8a1c90d04cf08a867b56683f2a218fd0c3dee9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:07 +0700
Subject: [PATCH 02/27] qt6-charts: update to 6.3.1.

---
 srcpkgs/qt6-charts/template | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/qt6-charts/template b/srcpkgs/qt6-charts/template
index 79cb8a220401..d3947ba938f3 100644
--- a/srcpkgs/qt6-charts/template
+++ b/srcpkgs/qt6-charts/template
@@ -1,10 +1,9 @@
 # Template file for 'qt6-charts'
 pkgname=qt6-charts
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qtcharts-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr"
 hostmakedepends="perl qt6-declarative-devel"
 makedepends="qt6-declarative-devel"
 short_desc="Cross-platform application and UI framework - charts"
@@ -12,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 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=672762c5f641ccc88a30aeedefb63f03c0f837649b334f46eea57592e87e36cd
+checksum=f330cc2328729104d79b2088990ce0840f2da89d9d989360d4c352e797d27cf7
 
 qt6-charts-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
@@ -20,8 +19,11 @@ qt6-charts-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From 6503ebba8dfa0240769fd99170b5b0d70f5c1254 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:07 +0700
Subject: [PATCH 03/27] qt6-declarative: update to 6.3.1.

---
 srcpkgs/qt6-declarative/template | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/qt6-declarative/template b/srcpkgs/qt6-declarative/template
index e0bd28d9e383..cfdc74f281d6 100644
--- a/srcpkgs/qt6-declarative/template
+++ b/srcpkgs/qt6-declarative/template
@@ -1,23 +1,22 @@
 # Template file for 'qt6-declarative'
 pkgname=qt6-declarative
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qtdeclarative-everywhere-src-${version}"
 build_style=cmake
-configure_args=" -DQT_HOST_PATH=/usr"
 hostmakedepends="qt6-base-devel perl pkg-config wayland-devel
  qt6-shadertools-devel"
-makedepends="qt6-base-devel Vulkan-Headers"
+makedepends="qt6-base-devel Vulkan-Headers qt6-shadertools-devel"
 short_desc="Cross-platform application and UI framework - Declarative"
 maintainer="John <me@johnnynator.dev>"
 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=d294b029dc2b2d4f65da516fdc3b8088d32643eb7ff77db135a8b9ce904caa37
+checksum=03e7694123820fcca397f95ce312e0b7f3039493c8754c836da098a1a04346e8
 replaces="qt6-quickcontrols2>=0"
 
 if [ "$CROSS_BUILD" ]; then
-	configure_args+=" -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true"
+	configure_args="-DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true"
 	hostmakedepends+=" qt6-declarative-devel"
 fi
 
@@ -60,11 +59,14 @@ qt6-declarative-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/libQt6QuickTest.so.*"
 		vmove usr/lib/qt6/qml/QtTest
 		vmove usr/lib/qt6/bin/qmltestrunner
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From c25c0cc1dd3986716a13bb4c6289e99a909e3be9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:07 +0700
Subject: [PATCH 04/27] qt6-imageformats: update to 6.3.1.

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

diff --git a/srcpkgs/qt6-imageformats/template b/srcpkgs/qt6-imageformats/template
index eaca95243c48..9f6d2fb66776 100644
--- a/srcpkgs/qt6-imageformats/template
+++ b/srcpkgs/qt6-imageformats/template
@@ -1,10 +1,9 @@
 # Template file for 'qt6-imageformats'
 pkgname=qt6-imageformats
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qtimageformats-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr"
 hostmakedepends="perl qt6-base-devel"
 makedepends="qt6-base-devel"
 short_desc="Cross-platform application and UI framework - imageformats"
@@ -12,4 +11,4 @@ maintainer="John <me@johnnynator.dev>"
 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=025d0d17ed75b42a7eb6b523731ab8f17025421a8810cade25caffe05d93abef
+checksum=ad0312b8dfbbb67f729bfadbfcd47246ee4a128b717731ba158c41d01fde212f

From 418d4976b87692ddb0f9e5804547dc67a7418735 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:07 +0700
Subject: [PATCH 05/27] qt6-location: update to 6.3.1.

---
 srcpkgs/qt6-location/template | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/qt6-location/template b/srcpkgs/qt6-location/template
index b7397f5f8942..9f26103259ad 100644
--- a/srcpkgs/qt6-location/template
+++ b/srcpkgs/qt6-location/template
@@ -1,10 +1,9 @@
 # Template file for 'qt6-location'
 pkgname=qt6-location
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qtpositioning-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr"
 hostmakedepends="perl qt6-base-devel qt6-declarative-devel"
 makedepends="qt6-serialport-devel qt6-declarative-devel GConf-devel"
 short_desc="Cross-platform application and UI framework - location"
@@ -12,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 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=e9ed50f6b245a346db34d625d0012774ef0ec8e7fd65037127ec26758708236e
+checksum=06788e4ecae1920094b30e4046f0abd23c8189d8a51e9c939b02f0b6abe2e86c
 
 qt6-location-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel>=${version}_1"
@@ -20,8 +19,11 @@ qt6-location-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From 7ffdc95ba6d89cf4acff087d8d182bdb690cb804 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:08 +0700
Subject: [PATCH 06/27] qt6-lottie: update to 6.3.1.

---
 srcpkgs/qt6-lottie/template | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/qt6-lottie/template b/srcpkgs/qt6-lottie/template
index 1c97cd5f4f32..a7beb62ec368 100644
--- a/srcpkgs/qt6-lottie/template
+++ b/srcpkgs/qt6-lottie/template
@@ -1,10 +1,9 @@
 # Template file for 'qt6-lottie'
 pkgname=qt6-lottie
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qtlottie-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr"
 hostmakedepends="perl qt6-base-devel"
 makedepends="qt6-declarative-devel"
 short_desc="Cross-platform application and UI framework - lottie"
@@ -12,10 +11,10 @@ maintainer="John <me@johnnynator.dev>"
 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=39db570bbba5b527a1eb6a5774bed47398ace2f7217bbf45b1194ada6cf97deb
+checksum=740ba76999124d5e1a85ef3d01c69976bb8557862b6b26bf48b357fe0cab1cf5
 
 if [ "$XBPS_CHECK_PKGS" ]; then
-	configure_args+=" -DQT_BUILD_TESTS=ON"
+	configure_args="-DQT_BUILD_TESTS=ON"
 fi
 
 pre_check() {
@@ -28,8 +27,10 @@ qt6-lottie-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
 		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From 35782badd765adbba53b79f5eda161969aa15ec7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:08 +0700
Subject: [PATCH 07/27] qt6-networkauth: update to 6.3.1.

---
 srcpkgs/qt6-networkauth/template | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/qt6-networkauth/template b/srcpkgs/qt6-networkauth/template
index e934beada9b0..1454ceb4a525 100644
--- a/srcpkgs/qt6-networkauth/template
+++ b/srcpkgs/qt6-networkauth/template
@@ -1,10 +1,9 @@
 # Template file for 'qt6-networkauth'
 pkgname=qt6-networkauth
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qtnetworkauth-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr"
 hostmakedepends="perl qt6-base-devel"
 makedepends="qt6-base-devel"
 short_desc="Cross-platform application and UI framework - networkauth"
@@ -12,10 +11,10 @@ maintainer="John <me@johnnynator.dev>"
 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=203a98942919028520038f90a20cd7ee32b537233545d11e429c3e2c1ad9069f
+checksum=d60f54b9d4509fa8bdbf1990bc91f6e260e38cdb57a7b8119fa3861bc5d2fb2a
 
 if [ "$XBPS_CHECK_PKGS" ]; then
-	configure_args+=" -DQT_BUILD_TESTS=ON"
+	configure_args="-DQT_BUILD_TESTS=ON"
 fi
 
 qt6-networkauth-devel_package() {
@@ -24,8 +23,11 @@ qt6-networkauth-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From 03828a6ee82440dfe1b8a1e18a8eb4afec88b390 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:08 +0700
Subject: [PATCH 08/27] qt6-qt5compat: update to 6.3.1.

---
 srcpkgs/qt6-qt5compat/template | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/qt6-qt5compat/template b/srcpkgs/qt6-qt5compat/template
index 7fcd5ad5080e..a62573cfabfa 100644
--- a/srcpkgs/qt6-qt5compat/template
+++ b/srcpkgs/qt6-qt5compat/template
@@ -1,10 +1,9 @@
 # Template file for 'qt6-qt5compat'
 pkgname=qt6-qt5compat
-version=6.3.0
-revision=2
+version=6.3.1
+revision=1
 wrksrc="qt5compat-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr"
 hostmakedepends="qt6-base-devel qt6-declarative-devel perl pkg-config"
 makedepends="qt6-base-devel qt6-declarative-devel"
 short_desc="Cross-platform application and UI framework - Qt5 Compatibilty Component"
@@ -12,10 +11,10 @@ maintainer="John <me@johnnynator.dev>"
 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=2b199be780c50d9214512b922d94cb240b0412fd63f459e356b76102cad1713e
+checksum=a43ec62bd778eaecf88ad7847118d1c2a471b0fcb820f93beb311d7ab9566cfd
 
 if [ "$XBPS_CHECK_PKGS" ]; then
-	configure_args+=" -DQT_BUILD_TESTS=ON"
+	configure_args="-DQT_BUILD_TESTS=ON"
 fi
 
 qt6-qt5compat-devel_package() {
@@ -24,8 +23,11 @@ qt6-qt5compat-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From cbfd8bc6fdf627d14c302bc8777649adc64c3096 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:08 +0700
Subject: [PATCH 09/27] qt6-quick3d: update to 6.3.1.

---
 srcpkgs/qt6-quick3d/template | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/qt6-quick3d/template b/srcpkgs/qt6-quick3d/template
index 0f7ef336a3ff..b2349c03501b 100644
--- a/srcpkgs/qt6-quick3d/template
+++ b/srcpkgs/qt6-quick3d/template
@@ -1,10 +1,9 @@
 # Template file for 'qt6-quick3d'
 pkgname=qt6-quick3d
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qtquick3d-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr "
 hostmakedepends="perl qt6-base-devel qt6-declarative-devel qt6-shadertools-devel"
 makedepends="qt6-base-devel qt6-declarative-devel qt6-shadertools-devel
  libassimp-devel"
@@ -13,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 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=0ad05bd1ee1f784b18220a2d2625ee8de91662c88fdc7b798662953d86eb327e
+checksum=2fa766ee47b8c07412b3b755206ada0715fb07813b64ed069e7205044c061256
 
 if [ "$XBPS_TARGET_ENDIAN" = "be" ]; then
 	# possibly a qt6-shadertools bug, actually
@@ -26,9 +25,12 @@ qt6-quick3d-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
-		vmove usr/lib/qt6/mkspecs
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/bin
+		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From 8a9b90f79648a39efc962cb05d88b60623f3205b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:09 +0700
Subject: [PATCH 10/27] qt6-quicktimeline: update to 6.3.1.

---
 srcpkgs/qt6-quicktimeline/template | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/qt6-quicktimeline/template b/srcpkgs/qt6-quicktimeline/template
index 15aa7a8e5819..bf02e043c4a5 100644
--- a/srcpkgs/qt6-quicktimeline/template
+++ b/srcpkgs/qt6-quicktimeline/template
@@ -1,10 +1,9 @@
 # Template file for 'qt6-quicktimeline'
 pkgname=qt6-quicktimeline
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qtquicktimeline-everywhere-src-${version/rc/-rc}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr "
 hostmakedepends="perl qt6-base-devel qt6-declarative-devel"
 makedepends="qt6-base-devel qt6-declarative-devel"
 short_desc="Cross-platform application and UI framework - quicktimeline"
@@ -12,10 +11,10 @@ maintainer="John <me@johnnynator.dev>"
 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=9ff0a931159efc6be5bd9f8a1e4a16a70e2dab37cf22ad85c6d330ccfdf31c1a
+checksum=58a13cf0ce8e7755639f20684078733af24f5a317f6ddb40d6079c8c5a28ebbe
 
 if [ "$XBPS_CHECK_PKGS" ]; then
-	configure_args+=" -DQT_BUILD_TESTS=ON"
+	configure_args="-DQT_BUILD_TESTS=ON"
 fi
 
 pre_check() {

From a66e6ed99abe5717ee72667f8da46bc4716d4560 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:09 +0700
Subject: [PATCH 11/27] qt6-scxml: update to 6.3.1.

---
 srcpkgs/qt6-scxml/template | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/qt6-scxml/template b/srcpkgs/qt6-scxml/template
index 112baca0ab83..942a71afe476 100644
--- a/srcpkgs/qt6-scxml/template
+++ b/srcpkgs/qt6-scxml/template
@@ -1,10 +1,9 @@
 # Template file for 'qt6-scxml'
 pkgname=qt6-scxml
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qtscxml-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr"
 hostmakedepends="perl qt6-declarative-devel"
 makedepends="qt6-declarative-devel"
 short_desc="Cross-platform application and UI framework - scxml"
@@ -12,10 +11,10 @@ maintainer="John <me@johnnynator.dev>"
 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=09b0dbd6ac367920fb1ba96a39dcd4c9d33eb0820dcc79538992825d588a70f0
+checksum=01bc154d6163d1f049f4e1e76658a044730ace7b0a5be35c9a46fcd1396f8619
 
 if [ "$XBPS_CHECK_PKGS" ]; then
-	configure_args+=" -DQT_BUILD_TESTS=ON"
+	configure_args="-DQT_BUILD_TESTS=ON"
 fi
 
 qt6-scxml-devel_package() {
@@ -24,8 +23,11 @@ qt6-scxml-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From c72e957f3100358a10ab9f561a51b97320b248ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:09 +0700
Subject: [PATCH 12/27] qt6-serialport: update to 6.3.1.

---
 srcpkgs/qt6-serialport/template | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/qt6-serialport/template b/srcpkgs/qt6-serialport/template
index 0804671ca57b..2de9d6364a5c 100644
--- a/srcpkgs/qt6-serialport/template
+++ b/srcpkgs/qt6-serialport/template
@@ -1,10 +1,9 @@
 # Template file for 'qt6-serialport'
 pkgname=qt6-serialport
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qtserialport-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr"
 hostmakedepends="perl qt6-base-devel pkg-config"
 makedepends="qt6-base-devel"
 short_desc="Cross-platform application and UI framework - serialport"
@@ -12,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 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=eebd6934d48cc044b8c87795a4fd91bb81f7195d4b5a2ddb12802f343d5db64f
+checksum=4eb6d80e65799dd2e0318df4dfba14173c1929e861718cda9bedca24253b616e
 
 qt6-serialport-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel>=${version}_1"
@@ -20,8 +19,11 @@ qt6-serialport-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From f2aab4075ed9960c8298aaf202c664fe810a63d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:09 +0700
Subject: [PATCH 13/27] qt6-shadertools: update to 6.3.1.

---
 srcpkgs/qt6-shadertools/template | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/qt6-shadertools/template b/srcpkgs/qt6-shadertools/template
index 9c1ec210a96a..013d97f601b6 100644
--- a/srcpkgs/qt6-shadertools/template
+++ b/srcpkgs/qt6-shadertools/template
@@ -1,10 +1,9 @@
 # Template file for 'qt6-shadertools'
 pkgname=qt6-shadertools
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qtshadertools-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr "
 hostmakedepends="perl qt6-base-devel"
 makedepends="qt6-base-devel"
 short_desc="Cross-platform application and UI framework - shadertools"
@@ -12,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 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=5498959b9d37c254bd126ab1320cf86aeb8a31b3ea7e51db666a8f9698afbd6c
+checksum=59b77176961528cc7b0c9325134655e273aa87b4cb386c0f4683d8f2852e435a
 
 qt6-shadertools-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel>=${version}_1"
@@ -20,8 +19,11 @@ qt6-shadertools-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From 5a368e1c20b60b6c1fefef8271045f3c04557d8f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:09 +0700
Subject: [PATCH 14/27] qt6-svg: update to 6.3.1.

---
 srcpkgs/qt6-svg/template | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/qt6-svg/template b/srcpkgs/qt6-svg/template
index aa8e6b745109..309b0988e435 100644
--- a/srcpkgs/qt6-svg/template
+++ b/srcpkgs/qt6-svg/template
@@ -1,10 +1,9 @@
 # Template file for 'qt6-svg'
 pkgname=qt6-svg
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qtsvg-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr "
 hostmakedepends="qt6-base-devel perl"
 makedepends="qt6-base-devel"
 short_desc="Cross-platform application and UI framework (QT6) - qt6-svg component"
@@ -12,10 +11,10 @@ maintainer="John <me@johnnynator.dev>"
 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=3164504d7e3f640439308235739b112605ab5fc9cc517ca0b28f9fb93a8db0e3
+checksum=7b19f418e6f7b8e23344082dd04440aacf5da23c5a73980ba22ae4eba4f87df7
 
 if [ "$XBPS_CHECK_PKGS" ]; then
-	configure_args+=" -DQT_BUILD_TESTS=ON"
+	configure_args="-DQT_BUILD_TESTS=ON"
 fi
 
 do_check() {
@@ -29,8 +28,11 @@ qt6-svg-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From 5cb5fd4661b7aec1d048ee6510018aedf9d18e96 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:10 +0700
Subject: [PATCH 15/27] qt6-tools: update to 6.3.1.

---
 srcpkgs/qt6-tools/template | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/qt6-tools/template b/srcpkgs/qt6-tools/template
index f875dff5c046..061bbd43bb35 100644
--- a/srcpkgs/qt6-tools/template
+++ b/srcpkgs/qt6-tools/template
@@ -1,10 +1,9 @@
 # Template file for 'qt6-tools'
 pkgname=qt6-tools
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qttools-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr "
 hostmakedepends="qt6-base-devel perl"
 makedepends="qt6-base-devel libatomic-devel"
 short_desc="Cross-platform application and UI framework (QT6) - qt6-tools component"
@@ -12,10 +11,10 @@ maintainer="John <me@johnnynator.dev>"
 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/qttools-everywhere-src-${version}.tar.xz"
-checksum=fce94688ea925782a2879347584991f854630daadba6c52aed6d93e33cd0b19c
+checksum=c412750f2aa3beb93fce5f30517c607f55daaeb7d0407af206a8adf917e126c1
 
 if [ "$XBPS_CHECK_PKGS" ]; then
-	configure_args+=" -DQT_BUILD_TESTS=ON"
+	configure_args="-DQT_BUILD_TESTS=ON"
 fi
 
 do_check() {
@@ -31,8 +30,11 @@ qt6-tools-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From 07e31c0f5eb4628d1352b2803eb44b657d6a8352 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:10 +0700
Subject: [PATCH 16/27] qt6-translations: update to 6.3.1.

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

diff --git a/srcpkgs/qt6-translations/template b/srcpkgs/qt6-translations/template
index be0a74ca74e2..1b917ccb3620 100644
--- a/srcpkgs/qt6-translations/template
+++ b/srcpkgs/qt6-translations/template
@@ -1,10 +1,9 @@
 # Template file for 'qt6-translations'
 pkgname=qt6-translations
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qttranslations-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr "
 hostmakedepends="qt6-base-devel qt6-tools-devel perl"
 makedepends="qt6-base-devel qt6-tools-devel"
 short_desc="Cross-platform application and UI framework - translations"
@@ -12,4 +11,4 @@ maintainer="John <me@johnnynator.dev>"
 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=e4dd4ef892a34a9514a19238f189a33ed85c76f31dcad6599ced93b1e33440b3
+checksum=d7bdd55e2908ded901dcc262157100af2a490bf04d31e32995f6d91d78dfdb97

From 521ef89a1788f1da391777fae947b1144e04ec40 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:10 +0700
Subject: [PATCH 17/27] qt6-virtualkeyboard: update to 6.3.1.

---
 srcpkgs/qt6-virtualkeyboard/template | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/qt6-virtualkeyboard/template b/srcpkgs/qt6-virtualkeyboard/template
index 67ecef145ea1..77a247400b97 100644
--- a/srcpkgs/qt6-virtualkeyboard/template
+++ b/srcpkgs/qt6-virtualkeyboard/template
@@ -1,10 +1,9 @@
 # Template file for 'qt6-virtualkeyboard'
 pkgname=qt6-virtualkeyboard
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qtvirtualkeyboard-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr"
 hostmakedepends="perl pkg-config qt6-declarative-devel"
 makedepends="qt6-declarative-devel qt6-svg-devel hunspell-devel"
 short_desc="Cross-platform application and UI framework - virtualkeyboard"
@@ -12,10 +11,10 @@ maintainer="John <me@johnnynator.dev>"
 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=89aaf15acf5432af8f5cf4ec45cb32d87a3348906215dd56e81cb294eb276573
+checksum=5fe089b204d859ab0dd0169f811f2e30cae7c5cb36f8ab95ca36883f1fc0c2b8
 
 if [ "$XBPS_CHECK_PKGS" ]; then
-	configure_args+=" -DQT_BUILD_TESTS=ON"
+	configure_args="-DQT_BUILD_TESTS=ON"
 fi
 
 do_check() {
@@ -32,8 +31,11 @@ qt6-virtualkeyboard-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From 6189a193b73708ae678934ce99a1c6c00e73df8c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:10 +0700
Subject: [PATCH 18/27] qt6-wayland: update to 6.3.1.

---
 srcpkgs/qt6-wayland/template | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/qt6-wayland/template b/srcpkgs/qt6-wayland/template
index b71a273009b9..83afb34e229e 100644
--- a/srcpkgs/qt6-wayland/template
+++ b/srcpkgs/qt6-wayland/template
@@ -1,13 +1,14 @@
 # Template file for 'qt6-wayland'
 pkgname=qt6-wayland
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qtwayland-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true"
+configure_args="-DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true"
 hostmakedepends="qt6-base-devel perl pkg-config wayland-devel qt6-wayland-devel"
 # XXX: Qml as optional dep
 makedepends="qt6-base-devel wayland-devel libxkbcommon-devel
+ qt6-declarative-devel
  libXcomposite-devel MesaLib-devel Vulkan-Headers libdrm-devel"
 checkdepends="dbus mesa-dri"
 short_desc="Cross-platform application and UI framework - Wayland"
@@ -15,7 +16,7 @@ maintainer="John <me@johnnynator.dev>"
 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=e7b567f6e43ffc5918d4aa825ce1eced66a00cb0a87133b2912ba5c1b2a02190
+checksum=6f14fea2d172a5b4170be3efcb0e58535f6605b61bcd823f6d5c9d165bb8c0f0
 
 if [ "$XBPS_CHECK_PKGS" ]; then
 	configure_args+=" -DQT_BUILD_TESTS=ON"
@@ -32,9 +33,11 @@ qt6-wayland-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
-		vmove usr/lib/qt6/libexec/qtwaylandscanner
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From c392ea3b927b8e4f89666c3407b5a6f4f22efd4c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:10 +0700
Subject: [PATCH 19/27] qt6-websockets: update to 6.3.1.

---
 srcpkgs/qt6-websockets/template | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/qt6-websockets/template b/srcpkgs/qt6-websockets/template
index c2e674aacb31..4875af093432 100644
--- a/srcpkgs/qt6-websockets/template
+++ b/srcpkgs/qt6-websockets/template
@@ -1,10 +1,9 @@
 # Template file for 'qt6-websockets'
 pkgname=qt6-websockets
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qtwebsockets-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr"
 hostmakedepends="perl qt6-base-devel qt6-declarative-devel"
 makedepends="qt6-base-devel qt6-declarative-devel"
 short_desc="Cross-platform application and UI framework - websockets"
@@ -12,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 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=e018a09fe960b7d9560d6bbc9d3ca022fed6566e6ba6fc6d869a97482d4e6361
+checksum=9f980d90c97fcbde1b50c773f6dc580cfdf8c36ce14a1be3aa2ccadfe605121a
 
 qt6-websockets-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel>=${version}_1"
@@ -20,8 +19,11 @@ qt6-websockets-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From fb93f461b0d005a15a8e2c7f4c37a9dfe067b31e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:11 +0700
Subject: [PATCH 20/27] New package: qt6-webchannel-6.3.1

---
 srcpkgs/qt6-webchannel-devel    |  1 +
 srcpkgs/qt6-webchannel/template | 32 ++++++++++++++++++++++++++++++++
 srcpkgs/qt6-webchannel/update   |  1 +
 3 files changed, 34 insertions(+)
 create mode 120000 srcpkgs/qt6-webchannel-devel
 create mode 100644 srcpkgs/qt6-webchannel/template
 create mode 100644 srcpkgs/qt6-webchannel/update

diff --git a/srcpkgs/qt6-webchannel-devel b/srcpkgs/qt6-webchannel-devel
new file mode 120000
index 000000000000..03e8b23d785d
--- /dev/null
+++ b/srcpkgs/qt6-webchannel-devel
@@ -0,0 +1 @@
+qt6-webchannel
\ No newline at end of file
diff --git a/srcpkgs/qt6-webchannel/template b/srcpkgs/qt6-webchannel/template
new file mode 100644
index 000000000000..432c42bcc056
--- /dev/null
+++ b/srcpkgs/qt6-webchannel/template
@@ -0,0 +1,32 @@
+# Template file for 'qt6-webchannel'
+pkgname=qt6-webchannel
+version=6.3.1
+revision=1
+wrksrc="qtwebchannel-everywhere-src-${version}"
+build_style=cmake
+hostmakedepends="perl qt6-base-devel qt6-declarative-devel"
+makedepends="qt6-base-devel qt6-declarative-devel qt6-websockets-devel"
+short_desc="Cross-platform application and UI framework - webchannel"
+maintainer="John <me@johnnynator.dev>"
+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=aaa20ac23f86992721b7ee487c379a3fd68caa8cdcea0a77a37e0d8b47ff2668
+
+qt6-webchannel-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel>=${version}_1
+	 qt6-websockets-devel>=${version}_1"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
+		vmove usr/lib/qt6/mkspecs
+		vmove usr/lib/qt6/qml/QtWebChannel/plugins.qmltypes
+		vmove usr/lib/qt6/qml/QtWebChannel/qmldir
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
+	}
+}
diff --git a/srcpkgs/qt6-webchannel/update b/srcpkgs/qt6-webchannel/update
new file mode 100644
index 000000000000..844552465222
--- /dev/null
+++ b/srcpkgs/qt6-webchannel/update
@@ -0,0 +1 @@
+pkgname="${pkgname/6-/}-everywhere-src"

From 961ec829274cbdcf43c3e4e57d869f74d01ad37a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:11 +0700
Subject: [PATCH 21/27] New package: qt6-multimedia-6.3.1

---
 common/shlibs                   |  3 +++
 srcpkgs/qt6-multimedia-devel    |  1 +
 srcpkgs/qt6-multimedia/template | 33 +++++++++++++++++++++++++++++++++
 srcpkgs/qt6-multimedia/update   |  1 +
 4 files changed, 38 insertions(+)
 create mode 120000 srcpkgs/qt6-multimedia-devel
 create mode 100644 srcpkgs/qt6-multimedia/template
 create mode 100644 srcpkgs/qt6-multimedia/update

diff --git a/common/shlibs b/common/shlibs
index ea6fde4ffe31..da78faa689d5 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2077,6 +2077,9 @@ libQt6SerialPort.so.6 qt6-serialport-6.2.0alpha_1
 libQt6WebSockets.so.6 qt6-websockets-6.2.0alpha_1
 libQt6WebChannel.so.6 qt6-webchannel-6.2.0alpha_1
 libQt6Positioning.so.6 qt6-location-6.2.0alpha_1
+libQt6MultimediaWidgets.so.6 qt6-multimedia-6.3.1_1
+libQt6MultimediaQuick.so.6 qt6-multimedia-6.3.1_1
+libQt6Multimedia.so.6 qt6-multimedia-6.3.1_1
 libnpth.so.0 npth-1.1_1
 libnpupnp.so.4 libnpupnp-4.0.2_1
 libglfw.so.3 glfw-3.0.4_1
diff --git a/srcpkgs/qt6-multimedia-devel b/srcpkgs/qt6-multimedia-devel
new file mode 120000
index 000000000000..9343446502d0
--- /dev/null
+++ b/srcpkgs/qt6-multimedia-devel
@@ -0,0 +1 @@
+qt6-multimedia
\ No newline at end of file
diff --git a/srcpkgs/qt6-multimedia/template b/srcpkgs/qt6-multimedia/template
new file mode 100644
index 000000000000..535a2f55ffe4
--- /dev/null
+++ b/srcpkgs/qt6-multimedia/template
@@ -0,0 +1,33 @@
+# Template file for 'qt6-multimedia'
+pkgname=qt6-multimedia
+version=6.3.1
+revision=1
+wrksrc="qtmultimedia-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DQT_FEATURE_gstreamer=ON"
+hostmakedepends="perl qt6-declarative-devel pkg-config
+ qt6-shadertools-devel"
+makedepends="qt6-declarative-devel
+ qt6-shadertools-devel libglib-devel gst-plugins-base1-devel"
+short_desc="Cross-platform application and UI framework - multimedia"
+maintainer="John <me@johnnynator.dev>"
+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=7e03242aadd634ff2d9fcf08948290f03da3d9a5012369d908da89f82b1d7336
+
+qt6-multimedia-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel>=${version}_1"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
+		vmove usr/lib/qt6/mkspecs
+		vmove usr/lib/qt6/qml/QtMultimedia/plugins.qmltypes
+		vmove usr/lib/qt6/qml/QtMultimedia/qmldir
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}
diff --git a/srcpkgs/qt6-multimedia/update b/srcpkgs/qt6-multimedia/update
new file mode 100644
index 000000000000..844552465222
--- /dev/null
+++ b/srcpkgs/qt6-multimedia/update
@@ -0,0 +1 @@
+pkgname="${pkgname/6-/}-everywhere-src"

From 72a607fdd0d08e85bd4eeacb26f1fcc3e83fc777 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 18:22:48 +0700
Subject: [PATCH 22/27] New package: qt6-connectivity-6.3.1

---
 common/shlibs                     |  2 ++
 srcpkgs/qt6-connectivity-devel    |  1 +
 srcpkgs/qt6-connectivity/template | 30 ++++++++++++++++++++++++++++++
 3 files changed, 33 insertions(+)
 create mode 120000 srcpkgs/qt6-connectivity-devel
 create mode 100644 srcpkgs/qt6-connectivity/template

diff --git a/common/shlibs b/common/shlibs
index da78faa689d5..d46643fc31ed 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2071,6 +2071,8 @@ libQt6Designer.so.6 qt6-tools-6.1.0_1
 libQt6DesignerComponents.so.6 qt6-tools-6.1.0_1
 libQt6Help.so.6 qt6-tools-6.1.0_1
 libQt6UiTools.so.6 qt6-tools-6.1.0_1
+libQt6Nfc.so.6 qt6-connectivity-6.3.1_1
+libQt6Bluetooth.so.6 qt6-connectivity-6.3.1_1
 libQt6HunspellInputMethod.so.6 qt6-virtualkeyboard-6.1.0_1
 libQt6VirtualKeyboard.so.6 qt6-virtualkeyboard-6.1.0_1
 libQt6SerialPort.so.6 qt6-serialport-6.2.0alpha_1
diff --git a/srcpkgs/qt6-connectivity-devel b/srcpkgs/qt6-connectivity-devel
new file mode 120000
index 000000000000..478cc9d8aa39
--- /dev/null
+++ b/srcpkgs/qt6-connectivity-devel
@@ -0,0 +1 @@
+qt6-connectivity
\ No newline at end of file
diff --git a/srcpkgs/qt6-connectivity/template b/srcpkgs/qt6-connectivity/template
new file mode 100644
index 000000000000..6cb61744d0cb
--- /dev/null
+++ b/srcpkgs/qt6-connectivity/template
@@ -0,0 +1,30 @@
+# Template file for 'qt6-connectivity'
+pkgname=qt6-connectivity
+version=6.3.1
+revision=1
+wrksrc="qtconnectivity-everywhere-src-${version}"
+build_style=cmake
+hostmakedepends="perl qt6-declarative-devel"
+makedepends="qt6-declarative-devel"
+short_desc="Cross-platform application and UI framework - Connectivity"
+maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
+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=b25ce4710a9c61bc6a5dbaeeb3e2ed907a8bc85478fdb2ab4312297768b695b0
+
+qt6-connectivity-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}
+	 qt6-declarative>=${version}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
+		vmove usr/lib/qt6/mkspecs
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
+	}
+}

From 7024c04ed0449c1ba5c708b2df21fcc1a2407dae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 18:22:57 +0700
Subject: [PATCH 23/27] New package: qt6-sensors-6.3.1

---
 common/shlibs                |  2 ++
 srcpkgs/qt6-sensors-devel    |  1 +
 srcpkgs/qt6-sensors/template | 31 +++++++++++++++++++++++++++++++
 3 files changed, 34 insertions(+)
 create mode 120000 srcpkgs/qt6-sensors-devel
 create mode 100644 srcpkgs/qt6-sensors/template

diff --git a/common/shlibs b/common/shlibs
index d46643fc31ed..f6284eee1bae 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2073,6 +2073,8 @@ libQt6Help.so.6 qt6-tools-6.1.0_1
 libQt6UiTools.so.6 qt6-tools-6.1.0_1
 libQt6Nfc.so.6 qt6-connectivity-6.3.1_1
 libQt6Bluetooth.so.6 qt6-connectivity-6.3.1_1
+libQt6Sensors.so.6 qt6-sensors-6.3.1_1
+libQt6SensorsQuick.so.6 qt6-sensors-6.3.1_1
 libQt6HunspellInputMethod.so.6 qt6-virtualkeyboard-6.1.0_1
 libQt6VirtualKeyboard.so.6 qt6-virtualkeyboard-6.1.0_1
 libQt6SerialPort.so.6 qt6-serialport-6.2.0alpha_1
diff --git a/srcpkgs/qt6-sensors-devel b/srcpkgs/qt6-sensors-devel
new file mode 120000
index 000000000000..eb9457f04055
--- /dev/null
+++ b/srcpkgs/qt6-sensors-devel
@@ -0,0 +1 @@
+qt6-sensors
\ No newline at end of file
diff --git a/srcpkgs/qt6-sensors/template b/srcpkgs/qt6-sensors/template
new file mode 100644
index 000000000000..5a81f43b60eb
--- /dev/null
+++ b/srcpkgs/qt6-sensors/template
@@ -0,0 +1,31 @@
+# Template file for 'qt6-sensors'
+pkgname=qt6-sensors
+version=6.3.1
+revision=1
+wrksrc="qtsensors-everywhere-src-${version}"
+build_style=cmake
+hostmakedepends="perl qt6-declarative-devel qt6-svg-devel pkg-config"
+makedepends="qt6-declarative-devel qt6-svg-devel"
+short_desc="Cross-platform application and UI framework - Sensors"
+maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
+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=4b240b59edba9a42b4735758a25f279a26841b982864e7b38f6ef0b81e0d60cc
+
+qt6-sensors-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}
+	 qt6-declarative-devel>=${version}_1"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
+		vmove usr/lib/qt6/mkspecs
+		vmove usr/lib/qt6/qml/QtSensors/plugins.qmltypes
+		vmove usr/lib/qt6/qml/QtSensors/qmldir
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}

From b32f8fd0947c8465e9f1c4f22acde8dc0e46a5c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 18:23:08 +0700
Subject: [PATCH 24/27] New package: qt6-remoteobjects-6.3.1

---
 common/shlibs                      |  2 ++
 srcpkgs/qt6-remoteobjects-devel    |  1 +
 srcpkgs/qt6-remoteobjects/template | 31 ++++++++++++++++++++++++++++++
 3 files changed, 34 insertions(+)
 create mode 120000 srcpkgs/qt6-remoteobjects-devel
 create mode 100644 srcpkgs/qt6-remoteobjects/template

diff --git a/common/shlibs b/common/shlibs
index f6284eee1bae..a0fab8869948 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2073,6 +2073,8 @@ libQt6Help.so.6 qt6-tools-6.1.0_1
 libQt6UiTools.so.6 qt6-tools-6.1.0_1
 libQt6Nfc.so.6 qt6-connectivity-6.3.1_1
 libQt6Bluetooth.so.6 qt6-connectivity-6.3.1_1
+libQt6RemoteObjects.so.6 qt6-remoteobjects-6.3.1_1
+libQt6RemoteObjectsQml.so.6 qt6-remoteobjects-6.3.1_1
 libQt6Sensors.so.6 qt6-sensors-6.3.1_1
 libQt6SensorsQuick.so.6 qt6-sensors-6.3.1_1
 libQt6HunspellInputMethod.so.6 qt6-virtualkeyboard-6.1.0_1
diff --git a/srcpkgs/qt6-remoteobjects-devel b/srcpkgs/qt6-remoteobjects-devel
new file mode 120000
index 000000000000..2a027f95266f
--- /dev/null
+++ b/srcpkgs/qt6-remoteobjects-devel
@@ -0,0 +1 @@
+qt6-remoteobjects
\ No newline at end of file
diff --git a/srcpkgs/qt6-remoteobjects/template b/srcpkgs/qt6-remoteobjects/template
new file mode 100644
index 000000000000..ebb06382c8d6
--- /dev/null
+++ b/srcpkgs/qt6-remoteobjects/template
@@ -0,0 +1,31 @@
+# Template file for 'qt6-remoteobjects'
+pkgname=qt6-remoteobjects
+version=6.3.1
+revision=1
+wrksrc="qtremoteobjects-everywhere-src-${version}"
+build_style=cmake
+hostmakedepends="perl qt6-declarative-devel pkg-config"
+makedepends="qt6-declarative-devel"
+short_desc="Cross-platform application and UI framework - Remote Objects"
+maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
+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=ea6d038b11c60981de0bd39a6091a59abf7d031e37bfc592b31be1217bef4ca6
+
+qt6-remoteobjects-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}
+	 qt6-declarative-devel>=${version}_1"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
+		vmove usr/lib/qt6/mkspecs
+		vmove usr/lib/qt6/qml/QtRemoteObjects/plugins.qmltypes
+		vmove usr/lib/qt6/qml/QtRemoteObjects/qmldir
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}

From 401732ec46dc117feed636e5f3fd3b113ad3f631 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:11 +0700
Subject: [PATCH 25/27] New package: qt6-webengine-6.3.1.

---
 common/shlibs                                 |    7 +
 srcpkgs/qt6-webengine-devel                   |    1 +
 srcpkgs/qt6-webengine-examples                |    1 +
 .../patches/0001-None-no-debug.patch          |   11 +
 .../patches/0002-enable-ppc64.patch           |   20 +
 .../patches/0003-cross-hack.patch             |   10 +
 .../0004-ppc-disable-jxl-decoder.patch        |   13 +
 .../patches/0050-no-glibc-cmake-check.patch   |   14 +
 .../0100-chromium-sandbox-membarrier.patch    |   58 +
 .../qt6-webengine/patches/0101-size_t.patch   |   16 +
 .../0102-chromium-90-ruy-include.patch        |   19 +
 ...-v8-monotonic-pthread-cont_timedwait.patch |   22 +
 .../0104-chromium-revert-9d080c0.patch        |  162 +
 ...-chromium-revert-drop-of-system-java.patch |   15 +
 .../patches/0106-chromium-system-nodejs.patch |   20 +
 .../0107-chromium-cursed^Uscoped_file.patch   |   18 +
 .../0108-chromium-fix-narrowing-cast.patch    |   53 +
 .../0109-chromium-remove-strip_binary.patch   |   32 +
 ...ium-revert-use-ffile-compilation-dir.patch |   57 +
 ...11-chromium-no-Wno-stringop-overread.patch |   10 +
 .../0150-chromium-glibc-libc_malloc.patch     |   24 +
 ...-include-sys-reg.h-to-get-__WORDSIZE.patch |   21 +
 .../0201-chromium-musl-dispatch-to-musl.patch |  103 +
 .../0202-chromium-musl-no-mallinfo.patch      |   62 +
 .../0203-chromium-musl-siginfo_t.patch        |   18 +
 .../0204-chromium-musl-stackstart.patch       |   20 +
 .../patches/0205-chromium-musl-sandbox.patch  |   92 +
 ...0206-chromium-musl-default-stacksize.patch |   15 +
 ...-chromium-musl-cross-no-asm_ptrace_h.patch |   30 +
 .../patches/0208-chromium-musl-execinfo.patch |  125 +
 .../0209-chromium-musl-thread-stacksize.patch |   22 +
 .../0210-chromium-musl-msgvec-push_back.patch |   14 +
 ...ium-musl-canonicalize-file-name-musl.patch |   11 +
 .../0212-chromium-musl-no-getcontext.patch    |   29 +
 .../patches/0213-chromium-musl-crashpad.patch |   22 +
 .../patches/0214-chromium-musl-fixes.patch    |  108 +
 .../patches/0215-chromium-musl-cdefs.patch    |   29 +
 .../patches/0216-chromium-musl-stat.patch     |   12 +
 .../patches/0217-chromium-musl-resolver.patch |   77 +
 .../patches/0600-chromium-sndio.patch         |  876 ++++
 .../patches/0700-armv7l-neon.patch            |   10 +
 .../0750-chromium-musl-arm-user_vfp.patch     |   20 +
 .../0751-chromium-musl-arm-elf_auxv_t.patch   |   18 +
 ...0801-chromium-i686-vaapi-fpermissive.patch |   24 +
 .../patches/0900-xxx-ppc64le-libvpx.patch     |   65 +
 .../0901-xxx-ppc64le-sandbox-linux-stat.patch |   31 +
 .../patches/0902-xxx-ppc64le-support.patch    | 3559 +++++++++++++++++
 .../0903-xxx-ppc64le-swiftshader.patch        |   18 +
 srcpkgs/qt6-webengine/template                |  178 +
 srcpkgs/qt6-webengine/update                  |    1 +
 50 files changed, 6193 insertions(+)
 create mode 120000 srcpkgs/qt6-webengine-devel
 create mode 120000 srcpkgs/qt6-webengine-examples
 create mode 100644 srcpkgs/qt6-webengine/patches/0001-None-no-debug.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0002-enable-ppc64.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0003-cross-hack.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0004-ppc-disable-jxl-decoder.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0050-no-glibc-cmake-check.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0100-chromium-sandbox-membarrier.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0101-size_t.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0102-chromium-90-ruy-include.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0103-chromium-v8-monotonic-pthread-cont_timedwait.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0104-chromium-revert-9d080c0.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0105-chromium-revert-drop-of-system-java.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0106-chromium-system-nodejs.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0107-chromium-cursed^Uscoped_file.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0108-chromium-fix-narrowing-cast.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0109-chromium-remove-strip_binary.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0110-chromium-revert-use-ffile-compilation-dir.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0111-chromium-no-Wno-stringop-overread.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0150-chromium-glibc-libc_malloc.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0200-chromium-musl-include-sys-reg.h-to-get-__WORDSIZE.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0201-chromium-musl-dispatch-to-musl.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0202-chromium-musl-no-mallinfo.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0203-chromium-musl-siginfo_t.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0204-chromium-musl-stackstart.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0205-chromium-musl-sandbox.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0206-chromium-musl-default-stacksize.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0207-chromium-musl-cross-no-asm_ptrace_h.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0208-chromium-musl-execinfo.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0209-chromium-musl-thread-stacksize.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0210-chromium-musl-msgvec-push_back.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0211-chromium-musl-canonicalize-file-name-musl.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0212-chromium-musl-no-getcontext.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0213-chromium-musl-crashpad.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0214-chromium-musl-fixes.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0215-chromium-musl-cdefs.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0216-chromium-musl-stat.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0217-chromium-musl-resolver.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0600-chromium-sndio.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0700-armv7l-neon.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0750-chromium-musl-arm-user_vfp.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0751-chromium-musl-arm-elf_auxv_t.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0801-chromium-i686-vaapi-fpermissive.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0900-xxx-ppc64le-libvpx.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0901-xxx-ppc64le-sandbox-linux-stat.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0902-xxx-ppc64le-support.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0903-xxx-ppc64le-swiftshader.patch
 create mode 100644 srcpkgs/qt6-webengine/template
 create mode 100644 srcpkgs/qt6-webengine/update

diff --git a/common/shlibs b/common/shlibs
index a0fab8869948..fa72f8ee24d2 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2086,6 +2086,13 @@ libQt6Positioning.so.6 qt6-location-6.2.0alpha_1
 libQt6MultimediaWidgets.so.6 qt6-multimedia-6.3.1_1
 libQt6MultimediaQuick.so.6 qt6-multimedia-6.3.1_1
 libQt6Multimedia.so.6 qt6-multimedia-6.3.1_1
+libQt6WebEngineQuick.so.6 qt6-webengine-6.3.1_1
+libQt6PdfWidgets.so.6 qt6-webengine-6.3.1_1
+libQt6PdfQuick.so.6 qt6-webengine-6.3.1_1
+libQt6WebEngineCore.so.6 qt6-webengine-6.3.1_1
+libQt6Pdf.so.6 qt6-webengine-6.3.1_1
+libQt6WebEngineQuickDelegatesQml.so.6 qt6-webengine-6.3.1_1
+libQt6WebEngineWidgets.so.6 qt6-webengine-6.3.1_1
 libnpth.so.0 npth-1.1_1
 libnpupnp.so.4 libnpupnp-4.0.2_1
 libglfw.so.3 glfw-3.0.4_1
diff --git a/srcpkgs/qt6-webengine-devel b/srcpkgs/qt6-webengine-devel
new file mode 120000
index 000000000000..8e4d1b99c587
--- /dev/null
+++ b/srcpkgs/qt6-webengine-devel
@@ -0,0 +1 @@
+qt6-webengine
\ No newline at end of file
diff --git a/srcpkgs/qt6-webengine-examples b/srcpkgs/qt6-webengine-examples
new file mode 120000
index 000000000000..8e4d1b99c587
--- /dev/null
+++ b/srcpkgs/qt6-webengine-examples
@@ -0,0 +1 @@
+qt6-webengine
\ No newline at end of file
diff --git a/srcpkgs/qt6-webengine/patches/0001-None-no-debug.patch b/srcpkgs/qt6-webengine/patches/0001-None-no-debug.patch
new file mode 100644
index 000000000000..1ba33f8e6fd9
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0001-None-no-debug.patch
@@ -0,0 +1,11 @@
+--- a/cmake/Functions.cmake
++++ b/cmake/Functions.cmake
+@@ -813,6 +813,8 @@ macro(append_build_type_setup)
+         endif()
+     elseif(${config} STREQUAL "MinSizeRel")
+         list(APPEND gnArgArg is_debug=false symbol_level=0 optimize_for_size=true)
++    elseif(${config} STREQUAL "None")
++        list(APPEND gnArgArg is_debug=false symbol_level=0)
+     endif()
+     if(FEATURE_developer_build OR (${config} STREQUAL "Debug") OR QT_FEATURE_webengine_sanitizer)
+         list(APPEND gnArgArg
diff --git a/srcpkgs/qt6-webengine/patches/0002-enable-ppc64.patch b/srcpkgs/qt6-webengine/patches/0002-enable-ppc64.patch
new file mode 100644
index 000000000000..d72ef1ad1a10
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0002-enable-ppc64.patch
@@ -0,0 +1,20 @@
+--- a/cmake/Functions.cmake
++++ b/cmake/Functions.cmake
+@@ -622,6 +622,8 @@ function(get_gn_arch result arch)
+         set(${result} "mipsel" PARENT_SCOPE)
+     elseif(arch STREQUAL "mipsel64")
+         set(${result} "mips64el" PARENT_SCOPE)
++    elseif(arch STREQUAL "power64")
++        set(${result} "power64" PARENT_SCOPE)
+     else()
+         message(DEBUG "Unsupported architecture: ${arch}")
+     endif()
+@@ -641,6 +643,8 @@ function(get_v8_arch result targetArch h
+             set(${result} "mipsel" PARENT_SCOPE)
+         elseif(hostArch STREQUAL "mipsel64")
+             set(${result} "mipsel" PARENT_SCOPE)
++        elseif(hostArch STREQUAL "power64")
++            set(${result} "power64" PARENT_SCOPE)
+         else()
+             message(DEBUG "Unsupported architecture: ${hostArch}")
+         endif()
diff --git a/srcpkgs/qt6-webengine/patches/0003-cross-hack.patch b/srcpkgs/qt6-webengine/patches/0003-cross-hack.patch
new file mode 100644
index 000000000000..ea9f90094a63
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0003-cross-hack.patch
@@ -0,0 +1,10 @@
+--- a/src/core/api/CMakeLists.txt
++++ b/src/core/api/CMakeLists.txt
+@@ -50,6 +50,7 @@ qt_internal_add_module(WebEngineCore
+         Qt::Gui
+         Qt::Network
+         Qt::Quick
++        X11
+ )
+ 
+ set_target_properties(WebEngineCore PROPERTIES QTWEBENGINEPROCESS_NAME ${qtWebEngineProcessName})
diff --git a/srcpkgs/qt6-webengine/patches/0004-ppc-disable-jxl-decoder.patch b/srcpkgs/qt6-webengine/patches/0004-ppc-disable-jxl-decoder.patch
new file mode 100644
index 000000000000..73c1151968f4
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0004-ppc-disable-jxl-decoder.patch
@@ -0,0 +1,13 @@
+--- a/src/core/CMakeLists.txt
++++ b/src/core/CMakeLists.txt
+@@ -414,6 +414,10 @@ foreach(arch ${archs})
+                 CONDITION QT_FEATURE_webengine_ozone_x11 AND XSCRNSAVER_FOUND
+             )
+ 
++            if (cpu STREQUAL "ppc64")
++                list(APPEND gnArgArg enable_jxl_decoder=false)
++            endif()
++
+             if(QT_FEATURE_webengine_kerberos)
+                 list(APPEND gnArgArg
+                      external_gssapi_include_dir="${GSSAPI_INCLUDE_DIRS}/gssapi"
diff --git a/srcpkgs/qt6-webengine/patches/0050-no-glibc-cmake-check.patch b/srcpkgs/qt6-webengine/patches/0050-no-glibc-cmake-check.patch
new file mode 100644
index 000000000000..f756bf0286bb
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0050-no-glibc-cmake-check.patch
@@ -0,0 +1,14 @@
+--- a/configure.cmake
++++ b/configure.cmake
+@@ -499,11 +499,6 @@ add_check_for_support(
+ )
+ add_check_for_support(
+    MODULES QtWebEngine QtPdf
+-   CONDITION NOT LINUX OR TEST_glibc
+-   MESSAGE "A suitable version >= 2.17 of glibc is required."
+-)
+-add_check_for_support(
+-   MODULES QtWebEngine QtPdf
+    CONDITION NOT LINUX OR TEST_khr
+    MESSAGE "Build requires Khronos development headers for build - see mesa/libegl1-mesa-dev"
+ )
diff --git a/srcpkgs/qt6-webengine/patches/0100-chromium-sandbox-membarrier.patch b/srcpkgs/qt6-webengine/patches/0100-chromium-sandbox-membarrier.patch
new file mode 100644
index 000000000000..2dd7b4aa948f
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0100-chromium-sandbox-membarrier.patch
@@ -0,0 +1,58 @@
+--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
++++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
+@@ -413,6 +413,7 @@ bool SyscallSets::IsAllowedProcessStartO
+   switch (sysno) {
+     case __NR_exit:
+     case __NR_exit_group:
++    case __NR_membarrier:
+     case __NR_wait4:
+     case __NR_waitid:
+ #if defined(__i386__)
+--- a/src/3rdparty/chromium/sandbox/linux/system_headers/arm64_linux_syscalls.h
++++ b/src/3rdparty/chromium/sandbox/linux/system_headers/arm64_linux_syscalls.h
+@@ -1215,4 +1215,8 @@
+ #define __NR_landlock_restrict_self 446
+ #endif
+ 
++#if !defined(__NR_membarrier)
++#define __NR_membarrier 283
++#endif
++
+ #endif  // SANDBOX_LINUX_SYSTEM_HEADERS_ARM64_LINUX_SYSCALLS_H_
+--- a/src/3rdparty/chromium/sandbox/linux/system_headers/arm_linux_syscalls.h
++++ b/src/3rdparty/chromium/sandbox/linux/system_headers/arm_linux_syscalls.h
+@@ -1617,6 +1617,10 @@
+ #define __NR_landlock_restrict_self (__NR_SYSCALL_BASE + 446)
+ #endif
+ 
++#if !defined(__NR_membarrier)
++#define __NR_membarrier (__NR_SYSCALL_BASE+389)
++#endif
++
+ // ARM private syscalls.
+ #if !defined(__ARM_NR_BASE)
+ #define __ARM_NR_BASE (__NR_SYSCALL_BASE + 0xF0000)
+--- a/src/3rdparty/chromium/sandbox/linux/system_headers/x86_32_linux_syscalls.h
++++ b/src/3rdparty/chromium/sandbox/linux/system_headers/x86_32_linux_syscalls.h
+@@ -1750,5 +1750,9 @@
+ #define __NR_landlock_restrict_self 446
+ #endif
+ 
++#if !defined(__NR_membarrier)
++#define __NR_membarrier 375
++#endif
++
+ #endif  // SANDBOX_LINUX_SYSTEM_HEADERS_X86_32_LINUX_SYSCALLS_H_
+ 
+--- a/src/3rdparty/chromium/sandbox/linux/system_headers/x86_64_linux_syscalls.h
++++ b/src/3rdparty/chromium/sandbox/linux/system_headers/x86_64_linux_syscalls.h
+@@ -1438,5 +1438,9 @@
+ #define __NR_landlock_restrict_self 446
+ #endif
+ 
++#if !defined(__NR_membarrier)
++#define __NR_membarrier 324
++#endif
++
+ #endif  // SANDBOX_LINUX_SYSTEM_HEADERS_X86_64_LINUX_SYSCALLS_H_
+ 
diff --git a/srcpkgs/qt6-webengine/patches/0101-size_t.patch b/srcpkgs/qt6-webengine/patches/0101-size_t.patch
new file mode 100644
index 000000000000..fccc085da311
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0101-size_t.patch
@@ -0,0 +1,16 @@
+--- a/src/3rdparty/chromium/third_party/angle/include/platform/PlatformMethods.h
++++ b/src/3rdparty/chromium/third_party/angle/include/platform/PlatformMethods.h
+@@ -239,11 +239,11 @@ inline void DefaultOverrideFeaturesMtl(P
+ using ProgramKeyType   = std::array<uint8_t, 20>;
+ using CacheProgramFunc = void (*)(PlatformMethods *platform,
+                                   const ProgramKeyType &key,
+-                                  size_t programSize,
++                                  std::size_t programSize,
+                                   const uint8_t *programBytes);
+ inline void DefaultCacheProgram(PlatformMethods *platform,
+                                 const ProgramKeyType &key,
+-                                size_t programSize,
++                                std::size_t programSize,
+                                 const uint8_t *programBytes)
+ {}
+ 
diff --git a/srcpkgs/qt6-webengine/patches/0102-chromium-90-ruy-include.patch b/srcpkgs/qt6-webengine/patches/0102-chromium-90-ruy-include.patch
new file mode 100644
index 000000000000..bbba579076d6
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0102-chromium-90-ruy-include.patch
@@ -0,0 +1,19 @@
+From 714092f336bb14d2fcc27396ec323b3d843bb962 Mon Sep 17 00:00:00 2001
+From: Stephan Hartmann <stha09@googlemail.com>
+Date: Thu, 4 Mar 2021 15:05:46 +0000
+Subject: [PATCH] IWYU: include limits for std::numeric_limits
+
+---
+ third_party/ruy/src/ruy/block_map.cc | 1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/src/3rdparty/chromium/third_party/ruy/src/ruy/block_map.cc
++++ b/src/3rdparty/chromium/third_party/ruy/src/ruy/block_map.cc
+@@ -17,6 +17,7 @@ limitations under the License.
+ 
+ #include <algorithm>
+ #include <cstdint>
++#include <limits>
+ 
+ #ifdef RUY_MAKEBLOCKMAP_DEBUG
+ #include <cstdio>
diff --git a/srcpkgs/qt6-webengine/patches/0103-chromium-v8-monotonic-pthread-cont_timedwait.patch b/srcpkgs/qt6-webengine/patches/0103-chromium-v8-monotonic-pthread-cont_timedwait.patch
new file mode 100644
index 000000000000..1dc8bc4d3d17
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0103-chromium-v8-monotonic-pthread-cont_timedwait.patch
@@ -0,0 +1,22 @@
+Use monotonic clock for pthread_cond_timedwait with musl too.
+
+--- a/src/3rdparty/chromium/v8/src/base/platform/condition-variable.cc
++++ b/src/3rdparty/chromium/v8/src/base/platform/condition-variable.cc
+@@ -20,7 +20,7 @@ namespace base {
+ 
+ ConditionVariable::ConditionVariable() {
+ #if (V8_OS_FREEBSD || V8_OS_NETBSD || V8_OS_OPENBSD || \
+-     (V8_OS_LINUX && V8_LIBC_GLIBC))
++     V8_OS_LINUX)
+   // On Free/Net/OpenBSD and Linux with glibc we can change the time
+   // source for pthread_cond_timedwait() to use the monotonic clock.
+   pthread_condattr_t attr;
+@@ -96,7 +96,7 @@ bool ConditionVariable::WaitFor(Mutex* m
+       &native_handle_, &mutex->native_handle(), &ts);
+ #else
+ #if (V8_OS_FREEBSD || V8_OS_NETBSD || V8_OS_OPENBSD || \
+-     (V8_OS_LINUX && V8_LIBC_GLIBC))
++     V8_OS_LINUX)
+   // On Free/Net/OpenBSD and Linux with glibc we can change the time
+   // source for pthread_cond_timedwait() to use the monotonic clock.
+   result = clock_gettime(CLOCK_MONOTONIC, &ts);
diff --git a/srcpkgs/qt6-webengine/patches/0104-chromium-revert-9d080c0.patch b/srcpkgs/qt6-webengine/patches/0104-chromium-revert-9d080c0.patch
new file mode 100644
index 000000000000..42b1ee9ec063
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0104-chromium-revert-9d080c0.patch
@@ -0,0 +1,162 @@
+ Original change's description:
+ > Replace 'blacklist' with 'ignorelist' in ./tools/msan/.
+ >
+ > Bug: 1097272, 1097268
+ > Change-Id: Id5c8227a5bfb1ffaec82d3168b609085b10c8297
+ > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2867730
+ > Commit-Queue: Dylan Cutler <dylancutler@google.com>
+ > Reviewed-by: Nico Weber <thakis@chromium.org>
+ > Reviewed-by: Jonathan Metzman <metzman@chromium.org>
+ > Cr-Commit-Position: refs/heads/master@{#883035}
+--- a/src/3rdparty/chromium/build/config/sanitizers/BUILD.gn
++++ b/src/3rdparty/chromium/build/config/sanitizers/BUILD.gn
+@@ -272,11 +272,11 @@ config("asan_flags") {
+   if (is_asan) {
+     cflags += [ "-fsanitize=address" ]
+     if (is_win) {
+-      if (!defined(asan_win_blocklist_path)) {
+-        asan_win_blocklist_path =
++      if (!defined(asan_win_blacklist_path)) {
++        asan_win_blacklist_path =
+             rebase_path("//tools/memory/asan/blocklist_win.txt", root_build_dir)
+       }
+-      cflags += [ "-fsanitize-ignorelist=$asan_win_blocklist_path" ]
++      cflags += [ "-fsanitize-blacklist=$asan_win_blacklist_path" ]
+     }
+   }
+ }
+@@ -306,13 +306,13 @@ config("link_shared_library") {
+ config("cfi_flags") {
+   cflags = []
+   if (is_cfi && current_toolchain == default_toolchain) {
+-    if (!defined(cfi_ignorelist_path)) {
+-      cfi_ignorelist_path =
++    if (!defined(cfi_blacklist_path)) {
++      cfi_blacklist_path =
+           rebase_path("//tools/cfi/ignores.txt", root_build_dir)
+     }
+     cflags += [
+       "-fsanitize=cfi-vcall",
+-      "-fsanitize-ignorelist=$cfi_ignorelist_path",
++      "-fsanitize-blacklist=$cfi_blacklist_path",
+     ]
+ 
+     if (use_cfi_cast) {
+@@ -409,14 +409,14 @@ config("msan_flags") {
+   if (is_msan) {
+     assert(is_linux || is_chromeos,
+            "msan only supported on linux x86_64/ChromeOS")
+-    if (!defined(msan_ignorelist_path)) {
+-      msan_ignorelist_path =
+-          rebase_path("//tools/msan/ignorelist.txt", root_build_dir)
++    if (!defined(msan_blacklist_path)) {
++      msan_blacklist_path =
++          rebase_path("//tools/msan/blacklist.txt", root_build_dir)
+     }
+     cflags = [
+       "-fsanitize=memory",
+       "-fsanitize-memory-track-origins=$msan_track_origins",
+-      "-fsanitize-ignorelist=$msan_ignorelist_path",
++      "-fsanitize-blacklist=$msan_blacklist_path",
+     ]
+   }
+ }
+@@ -424,13 +424,13 @@ config("msan_flags") {
+ config("tsan_flags") {
+   if (is_tsan) {
+     assert(is_linux || is_chromeos, "tsan only supported on linux x86_64")
+-    if (!defined(tsan_ignorelist_path)) {
+-      tsan_ignorelist_path =
++    if (!defined(tsan_blacklist_path)) {
++      tsan_blacklist_path =
+           rebase_path("//tools/memory/tsan_v2/ignores.txt", root_build_dir)
+     }
+     cflags = [
+       "-fsanitize=thread",
+-      "-fsanitize-ignorelist=$tsan_ignorelist_path",
++      "-fsanitize-blacklist=$tsan_blacklist_path",
+     ]
+   }
+ }
+@@ -438,8 +438,8 @@ config("tsan_flags") {
+ config("ubsan_flags") {
+   cflags = []
+   if (is_ubsan) {
+-    if (!defined(ubsan_ignorelist_path)) {
+-      ubsan_ignorelist_path =
++    if (!defined(ubsan_blacklist_path)) {
++      ubsan_blacklist_path =
+           rebase_path("//tools/ubsan/ignorelist.txt", root_build_dir)
+     }
+     cflags += [
+@@ -456,7 +456,7 @@ config("ubsan_flags") {
+       "-fsanitize=signed-integer-overflow",
+       "-fsanitize=unreachable",
+       "-fsanitize=vla-bound",
+-      "-fsanitize-ignorelist=$ubsan_ignorelist_path",
++      "-fsanitize-blacklist=$ubsan_blacklist_path",
+     ]
+     if (!is_clang) {
+       # These exposes too much illegal C++14 code to compile on anything stricter than clang:
+@@ -497,8 +497,8 @@ config("ubsan_no_recover") {
+ 
+ config("ubsan_security_flags") {
+   if (is_ubsan_security) {
+-    if (!defined(ubsan_security_ignorelist_path)) {
+-      ubsan_security_ignorelist_path =
++    if (!defined(ubsan_security_blacklist_path)) {
++      ubsan_security_blacklist_path =
+           rebase_path("//tools/ubsan/security_ignorelist.txt", root_build_dir)
+     }
+     cflags = [
+@@ -506,7 +506,7 @@ config("ubsan_security_flags") {
+       "-fsanitize=shift",
+       "-fsanitize=signed-integer-overflow",
+       "-fsanitize=vla-bound",
+-      "-fsanitize-ignorelist=$ubsan_security_ignorelist_path",
++      "-fsanitize-blacklist=$ubsan_security_blacklist_path",
+     ]
+   }
+ }
+@@ -519,13 +519,13 @@ config("ubsan_null_flags") {
+ 
+ config("ubsan_vptr_flags") {
+   if (is_ubsan_vptr) {
+-    if (!defined(ubsan_vptr_ignorelist_path)) {
+-      ubsan_vptr_ignorelist_path =
++    if (!defined(ubsan_vptr_blacklist_path)) {
++      ubsan_vptr_blacklist_path =
+           rebase_path("//tools/ubsan/vptr_ignorelist.txt", root_build_dir)
+     }
+     cflags = [
+       "-fsanitize=vptr",
+-      "-fsanitize-ignorelist=$ubsan_vptr_ignorelist_path",
++      "-fsanitize-blacklist=$ubsan_vptr_blacklist_path",
+     ]
+     if (!is_clang) {
+       # Clang specific flag:
+--- a/src/3rdparty/chromium/build_overrides/build.gni
++++ b/src/3rdparty/chromium/build_overrides/build.gni
+@@ -43,15 +43,15 @@ declare_args() {
+ # Allows different projects to specify their own suppression/ignore lists for
+ # sanitizer tools.
+ # asan_suppressions_file = "path/to/asan_suppressions.cc"
+-# asan_win_ignorelist_path = "path/to/asan/blocklist_win.txt"
++# asan_win_blacklist_path = "path/to/asan/blocklist_win.txt"
+ # lsan_suppressions_file = "path/to/lsan_suppressions.cc"
+ # tsan_suppressions_file = "path/to/tsan_suppressions.cc"
+-# tsan_ignorelist_path = "path/to/tsan/ignores.txt"
+-# msan_ignorelist_path = "path/to/msan/ignorelist.txt"
+-# ubsan_ignorelist_path = "path/to/ubsan/ignorelist.txt"
+-# ubsan_vptr_ignorelist_path = "path/to/ubsan/vptr_ignorelist.txt"
+-# ubsan_security_ignorelist_path = "path/to/ubsan/security_ignorelist.txt"
+-# cfi_ignorelist_path = "path/to/cfi/ignores.txt"
++# tsan_blacklist_path = "path/to/tsan/ignores.txt"
++# msan_blacklist_path = "path/to/msan/blacklist.txt"
++# ubsan_blacklist_path = "path/to/ubsan/blacklist.txt"
++# ubsan_vptr_blacklist_path = "path/to/ubsan/vptr_blacklist.txt"
++# ubsan_security_blacklist_path = "path/to/ubsan/security_blacklist.txt"
++# cfi_blacklist_path = "path/to/cfi/ignores.txt"
+ 
+ declare_args() {
+   # Android 32-bit non-component, non-clang builds cannot have symbol_level=2
diff --git a/srcpkgs/qt6-webengine/patches/0105-chromium-revert-drop-of-system-java.patch b/srcpkgs/qt6-webengine/patches/0105-chromium-revert-drop-of-system-java.patch
new file mode 100644
index 000000000000..44f3aa8fae5e
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0105-chromium-revert-drop-of-system-java.patch
@@ -0,0 +1,15 @@
+This was dropped for some reason in 6951c37cecd05979b232a39e5c10e6346a0f74ef
+--- a/src/3rdparty/chromium/third_party/closure_compiler/compiler.py
++++ b/src/3rdparty/chromium/third_party/closure_compiler/compiler.py
+@@ -13,8 +13,9 @@ import subprocess
+ 
+ 
+ _CURRENT_DIR = os.path.join(os.path.dirname(__file__))
+-_JAVA_PATH = os.path.join(_CURRENT_DIR, "..", "jdk", "current", "bin", "java")
+-assert os.path.isfile(_JAVA_PATH), "java only allowed in android builds"
++_JAVA_BIN = "java"
++_JDK_PATH = os.path.join(_CURRENT_DIR, "..", "jdk", "current", "bin", "java")
++_JAVA_PATH = _JDK_PATH if os.path.isfile(_JDK_PATH) else _JAVA_BIN
+ 
+ class Compiler(object):
+   """Runs the Closure compiler on given source files to typecheck them
diff --git a/srcpkgs/qt6-webengine/patches/0106-chromium-system-nodejs.patch b/srcpkgs/qt6-webengine/patches/0106-chromium-system-nodejs.patch
new file mode 100644
index 000000000000..1e067cc6eda0
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0106-chromium-system-nodejs.patch
@@ -0,0 +1,20 @@
+--- a/src/3rdparty/chromium/third_party/node/node.py
++++ b/src/3rdparty/chromium/third_party/node/node.py
+@@ -36,11 +36,12 @@ def GetBinaryPath():
+   if platform.system() == 'Darwin' and platform.machine() == 'arm64':
+       return os.path.join(os_path.join(os_path.dirname(__file__), 'mac',
+                           'node-darwin-arm64', 'bin', 'node'))
+-  return os_path.join(os_path.dirname(__file__), *{
+-    'Darwin': ('mac', 'node-darwin-x64', 'bin', 'node'),
+-    'Linux': ('linux', 'node-linux-x64', 'bin', 'node'),
+-    'Windows': ('win', 'node.exe'),
+-  }[platform.system()])
++  return "/usr/bin/node"
++  #return os_path.join(os_path.dirname(__file__), *{
++  #  'Darwin': ('mac', 'node-darwin-x64', 'bin', 'node'),
++  #  'Linux': ('linux', 'node-linux-x64', 'bin', 'node'),
++  #  'Windows': ('win', 'node.exe'),
++  #}[platform.system()])
+ 
+ 
+ def RunNode(cmd_parts, stdout=None):
diff --git a/srcpkgs/qt6-webengine/patches/0107-chromium-cursed^Uscoped_file.patch b/srcpkgs/qt6-webengine/patches/0107-chromium-cursed^Uscoped_file.patch
new file mode 100644
index 000000000000..a8f5d971883d
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0107-chromium-cursed^Uscoped_file.patch
@@ -0,0 +1,18 @@
+--- a/src/3rdparty/chromium/base/files/scoped_file_linux.cc
++++ b/src/3rdparty/chromium/base/files/scoped_file_linux.cc
+@@ -77,15 +77,3 @@ bool IsFDOwned(int fd) {
+ }
+ 
+ }  // namespace base
+-
+-extern "C" {
+-
+-int __close(int);
+-
+-__attribute__((visibility("default"), noinline)) int close(int fd) {
+-  if (base::IsFDOwned(fd) && g_is_ownership_enforced)
+-    CrashOnFdOwnershipViolation();
+-  return __close(fd);
+-}
+-
+-}  // extern "C"
diff --git a/srcpkgs/qt6-webengine/patches/0108-chromium-fix-narrowing-cast.patch b/srcpkgs/qt6-webengine/patches/0108-chromium-fix-narrowing-cast.patch
new file mode 100644
index 000000000000..ed32cd9b7415
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0108-chromium-fix-narrowing-cast.patch
@@ -0,0 +1,53 @@
+--- a/src/3rdparty/chromium/base/files/file_util_linux.cc
++++ b/src/3rdparty/chromium/base/files/file_util_linux.cc
+@@ -23,14 +23,14 @@ bool GetFileSystemType(const FilePath& p
+ 
+   // Not all possible |statfs_buf.f_type| values are in linux/magic.h.
+   // Missing values are copied from the statfs man page.
+-  switch (statfs_buf.f_type) {
++  switch (static_cast<uintmax_t>(statfs_buf.f_type)) {
+     case 0:
+       *type = FILE_SYSTEM_0;
+       break;
+     case EXT2_SUPER_MAGIC:  // Also ext3 and ext4
+     case MSDOS_SUPER_MAGIC:
+     case REISERFS_SUPER_MAGIC:
+-    case static_cast<int>(BTRFS_SUPER_MAGIC):
++    case BTRFS_SUPER_MAGIC:
+     case 0x5346544E:  // NTFS
+     case 0x58465342:  // XFS
+     case 0x3153464A:  // JFS
+@@ -40,14 +40,14 @@ bool GetFileSystemType(const FilePath& p
+       *type = FILE_SYSTEM_NFS;
+       break;
+     case SMB_SUPER_MAGIC:
+-    case static_cast<int>(0xFF534D42):  // CIFS
++    case 0xFF534D42:  // CIFS
+       *type = FILE_SYSTEM_SMB;
+       break;
+     case CODA_SUPER_MAGIC:
+       *type = FILE_SYSTEM_CODA;
+       break;
+-    case static_cast<int>(HUGETLBFS_MAGIC):
+-    case static_cast<int>(RAMFS_MAGIC):
++    case HUGETLBFS_MAGIC:
++    case RAMFS_MAGIC:
+     case TMPFS_MAGIC:
+       *type = FILE_SYSTEM_MEMORY;
+       break;
+--- a/src/3rdparty/chromium/base/system/sys_info_posix.cc
++++ b/src/3rdparty/chromium/base/system/sys_info_posix.cc
+@@ -100,10 +100,10 @@ bool IsStatsZeroIfUnlimited(const base::
+   if (HANDLE_EINTR(statfs(path.value().c_str(), &stats)) != 0)
+     return false;
+ 
+-  switch (stats.f_type) {
++  switch (static_cast<uintmax_t>(stats.f_type)) {
+     case TMPFS_MAGIC:
+-    case static_cast<int>(HUGETLBFS_MAGIC):
+-    case static_cast<int>(RAMFS_MAGIC):
++    case HUGETLBFS_MAGIC:
++    case RAMFS_MAGIC:
+       return true;
+   }
+   return false;
diff --git a/srcpkgs/qt6-webengine/patches/0109-chromium-remove-strip_binary.patch b/srcpkgs/qt6-webengine/patches/0109-chromium-remove-strip_binary.patch
new file mode 100644
index 000000000000..5ebd16e659af
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0109-chromium-remove-strip_binary.patch
@@ -0,0 +1,32 @@
+--- a/src/3rdparty/chromium/chrome/test/chromedriver/BUILD.gn
++++ b/src/3rdparty/chromium/chrome/test/chromedriver/BUILD.gn
+@@ -308,11 +308,7 @@ source_set("lib") {
+   }
+ }
+ 
+-if (is_linux) {
+-  chromedriver_output = "chromedriver.unstripped"
+-} else {
+-  chromedriver_output = "chromedriver"
+-}
++chromedriver_output = "chromedriver"
+ 
+ executable("$chromedriver_output") {
+   testonly = true
+@@ -336,16 +332,6 @@ executable("$chromedriver_output") {
+   }
+ }
+ 
+-if (is_linux) {
+-  strip_binary("chromedriver") {
+-    testonly = true
+-    binary_input = "$root_out_dir/$chromedriver_output"
+-    symbol_output = "$root_out_dir/chromedriver.debug"
+-    stripped_binary_output = "$root_out_dir/chromedriver"
+-    deps = [ ":$chromedriver_output" ]
+-  }
+-}
+-
+ python_library("chromedriver_py_tests") {
+   testonly = true
+   deps = [
diff --git a/srcpkgs/qt6-webengine/patches/0110-chromium-revert-use-ffile-compilation-dir.patch b/srcpkgs/qt6-webengine/patches/0110-chromium-revert-use-ffile-compilation-dir.patch
new file mode 100644
index 000000000000..a00f7ea80f7a
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0110-chromium-revert-use-ffile-compilation-dir.patch
@@ -0,0 +1,57 @@
+From 34a955823630096f5b01c2b01d51c1ea59d22763 Mon Sep 17 00:00:00 2001
+From: Zequan Wu <zequanwu@google.com>
+Date: Tue, 20 Jul 2021 14:13:50 +0000
+Subject: [PATCH] Use -ffile-compilation-dir= instead of
+ -fdebug-compilation-dir=
+
+Bug: 1010267
+Change-Id: If2b4ead8535a76490eb466a38e3d8fed6ea91079
+Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2770738
+Auto-Submit: Zequan Wu <zequanwu@google.com>
+Commit-Queue: Nico Weber <thakis@chromium.org>
+Reviewed-by: Nico Weber <thakis@chromium.org>
+Cr-Commit-Position: refs/heads/master@{#903456}
+--- a/src/3rdparty/chromium/build/config/compiler/BUILD.gn
++++ b/src/3rdparty/chromium/build/config/compiler/BUILD.gn
+@@ -1269,19 +1269,12 @@ config("compiler_deterministic") {
+     # different build directory like "out/feature_a" and "out/feature_b" if
+     # we build same files with same compile flag.
+     # Other paths are already given in relative, no need to normalize them.
+-    if (is_nacl) {
+-      # TODO(https://crbug.com/1231236): Use -ffile-compilation-dir= here.
+-      cflags += [
+-        "-Xclang",
+-        "-fdebug-compilation-dir",
+-        "-Xclang",
+-        ".",
+-      ]
+-    } else {
+-      # -ffile-compilation-dir is an alias for both -fdebug-compilation-dir=
+-      # and -fcoverage-compilation-dir=.
+-      cflags += [ "-ffile-compilation-dir=." ]
+-    }
++    cflags += [
++      "-Xclang",
++      "-fdebug-compilation-dir",
++      "-Xclang",
++      ".",
++    ]
+     if (!is_win) {
+       # We don't use clang -cc1as on Windows (yet? https://crbug.com/762167)
+       asmflags = [ "-Wa,-fdebug-compilation-dir,." ]
+--- a/src/3rdparty/chromium/build/config/compiler/compiler.gni
++++ b/src/3rdparty/chromium/build/config/compiler/compiler.gni
+@@ -228,8 +228,11 @@ declare_args() {
+ # deterministic builds to reduce compile times, so this is less relevant for
+ # official builders.
+ strip_absolute_paths_from_debug_symbols_default =
+-    is_android || is_fuchsia || is_nacl || (is_win && use_lld) || is_linux ||
+-    is_chromeos || (is_apple && !enable_dsyms)
++    # TODO(crbug.com/1010267): remove '!use_clang_coverage', coverage build has
++    # dependency to absolute path of source files.
++    !use_clang_coverage &&
++    (is_android || is_fuchsia || is_nacl || (is_win && use_lld) || is_linux ||
++     is_chromeos || (is_apple && !enable_dsyms))
+ 
+ declare_args() {
+   strip_absolute_paths_from_debug_symbols = strip_absolute_paths_from_debug_symbols_default
diff --git a/srcpkgs/qt6-webengine/patches/0111-chromium-no-Wno-stringop-overread.patch b/srcpkgs/qt6-webengine/patches/0111-chromium-no-Wno-stringop-overread.patch
new file mode 100644
index 000000000000..03eac3f8e067
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0111-chromium-no-Wno-stringop-overread.patch
@@ -0,0 +1,10 @@
+--- a/src/3rdparty/chromium/build/config/compiler/BUILD.gn
++++ b/src/3rdparty/chromium/build/config/compiler/BUILD.gn
+@@ -394,7 +394,6 @@ config("compiler") {
+         "-Wno-parentheses",
+         "-Wno-sign-compare", # fido
+         "-Wno-stringop-overflow", # skia, libaom, protobuf, icu
+-        "-Wno-stringop-overread", # libaom
+         "-Wno-psabi", # skia
+         "-Wno-multichar", # crashpad
+         "-Wno-format-zero-length", # user_agent.cc
diff --git a/srcpkgs/qt6-webengine/patches/0150-chromium-glibc-libc_malloc.patch b/srcpkgs/qt6-webengine/patches/0150-chromium-glibc-libc_malloc.patch
new file mode 100644
index 000000000000..7e1b66e5c73d
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0150-chromium-glibc-libc_malloc.patch
@@ -0,0 +1,24 @@
+--- a/src/3rdparty/chromium/base/process/memory_linux.cc
++++ b/src/3rdparty/chromium/base/process/memory_linux.cc
+@@ -23,6 +23,12 @@
+ #include "third_party/tcmalloc/chromium/src/gperftools/tcmalloc.h"
+ #endif
+ 
++#if defined(LIBC_GLIBC)
++extern "C" {
++extern void *__libc_malloc(size_t size);
++}
++#endif
++
+ namespace base {
+ 
+ namespace {
+@@ -120,7 +126,7 @@ bool UncheckedMalloc(size_t size, void**
+     (!defined(LIBC_GLIBC) && !BUILDFLAG(USE_TCMALLOC))
+   *result = malloc(size);
+ #elif defined(LIBC_GLIBC) && !BUILDFLAG(USE_TCMALLOC)
+-  *result = __libc_malloc(size);
++  *result = ::__libc_malloc(size);
+ #elif BUILDFLAG(USE_TCMALLOC)
+   *result = tc_malloc_skip_new_handler(size);
+ #endif
diff --git a/srcpkgs/qt6-webengine/patches/0200-chromium-musl-include-sys-reg.h-to-get-__WORDSIZE.patch b/srcpkgs/qt6-webengine/patches/0200-chromium-musl-include-sys-reg.h-to-get-__WORDSIZE.patch
new file mode 100644
index 000000000000..41b90071b5e4
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0200-chromium-musl-include-sys-reg.h-to-get-__WORDSIZE.patch
@@ -0,0 +1,21 @@
+From 9001c54d6b974449174a8cee8f3f5d78a9bd6c9e Mon Sep 17 00:00:00 2001
+From: Felix Janda <felix.janda@posteo.de>
+Date: Sun, 1 Feb 2015 14:26:52 +0100
+Subject: [PATCH 3/6] include <sys/reg.h> to get __WORDSIZE on musl libc
+
+---
+ qtwebengine/src/3rdparty/chromium/third_party/breakpad/breakpad/src/common/linux/elf_core_dump.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/common/linux/elf_core_dump.h
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/common/linux/elf_core_dump.h
+@@ -37,6 +37,9 @@
+ #include <limits.h>
+ #include <link.h>
+ #include <stddef.h>
++#ifndef __GLIBC__
++#include <sys/reg.h>
++#endif
+ 
+ #include "common/memory_range.h"
+ 
diff --git a/srcpkgs/qt6-webengine/patches/0201-chromium-musl-dispatch-to-musl.patch b/srcpkgs/qt6-webengine/patches/0201-chromium-musl-dispatch-to-musl.patch
new file mode 100644
index 000000000000..a58a688a4b55
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0201-chromium-musl-dispatch-to-musl.patch
@@ -0,0 +1,103 @@
+--- a/src/3rdparty/chromium/base/allocator/allocator_shim_default_dispatch_to_glibc.cc
++++ b/src/3rdparty/chromium/base/allocator/allocator_shim_default_dispatch_to_glibc.cc
+@@ -8,6 +8,7 @@
+ #include <dlfcn.h>
+ #include <malloc.h>
+ 
++#if defined(__GLIBC__)
+ // This translation unit defines a default dispatch for the allocator shim which
+ // routes allocations to libc functions.
+ // The code here is strongly inspired from tcmalloc's libc_override_glibc.h.
+@@ -87,3 +88,92 @@ const AllocatorDispatch AllocatorDispatc
+     nullptr,               /* aligned_free_function */
+     nullptr,               /* next */
+ };
++
++#else // defined(__GLIBC__)
++
++#include <dlfcn.h>
++
++extern "C" {
++// Declare function pointers to the memory functions
++typedef void* (*t_libc_malloc)(size_t size);
++typedef void* (*t_libc_calloc)(size_t n, size_t size);
++typedef void* (*t_libc_realloc)(void* address, size_t size);
++typedef void* (*t_libc_memalign)(size_t alignment, size_t size);
++typedef void (*t_libc_free)(void* ptr);
++typedef size_t (*t_libc_malloc_usable_size)(void* ptr);
++
++// Static instances of pointers to libc.so dl symbols
++static t_libc_malloc libc_malloc = NULL;
++static t_libc_calloc libc_calloc = NULL;
++static t_libc_realloc libc_realloc = NULL;
++static t_libc_memalign libc_memalign = NULL;
++static t_libc_free libc_free = NULL;
++static t_libc_malloc_usable_size libc_malloc_usable_size = NULL;
++
++// resolve the symbols in libc.so
++void musl_libc_memory_init(void)
++{
++  libc_malloc = (t_libc_malloc) dlsym(RTLD_NEXT, "malloc");
++  libc_calloc = (t_libc_calloc) dlsym(RTLD_NEXT, "calloc");
++  libc_realloc = (t_libc_realloc) dlsym(RTLD_NEXT, "realloc");
++  libc_memalign = (t_libc_memalign) dlsym(RTLD_NEXT, "memalign");
++  libc_free = (t_libc_free) dlsym(RTLD_NEXT, "free");
++  libc_malloc_usable_size = (t_libc_malloc_usable_size) dlsym(RTLD_NEXT, "malloc_usable_size");
++}
++}  // extern "C"
++
++namespace {
++
++using base::allocator::AllocatorDispatch;
++
++void* MuslMalloc(const AllocatorDispatch*, size_t size, void* context) {
++  if (!libc_malloc)
++    musl_libc_memory_init();
++  return (*libc_malloc)(size);
++}
++
++void* MuslCalloc(const AllocatorDispatch*, size_t n, size_t size, void* context) {
++  if (!libc_calloc)
++    musl_libc_memory_init();
++  return (*libc_calloc)(n, size);
++}
++
++void* MuslRealloc(const AllocatorDispatch*, void* address, size_t size, void* context) {
++  if (!libc_realloc)
++    musl_libc_memory_init();
++  return (*libc_realloc)(address, size);
++}
++
++void* MuslMemalign(const AllocatorDispatch*, size_t alignment, size_t size, void* context) {
++  if (!libc_memalign)
++    musl_libc_memory_init();
++  return (*libc_memalign)(alignment, size);
++}
++
++void MuslFree(const AllocatorDispatch*, void* address, void* context) {
++  if (!libc_free)
++    musl_libc_memory_init();
++  (*libc_free)(address);
++}
++
++size_t MuslGetSizeEstimate(const AllocatorDispatch*, void* address, void* context) {
++  // TODO(siggi, primiano): malloc_usable_size may need redirection in the
++  //     presence of interposing shims that divert allocations.
++  if (!libc_malloc_usable_size)
++    musl_libc_memory_init();
++  return (*libc_malloc_usable_size)(address);
++}
++
++}  // namespace
++
++const AllocatorDispatch AllocatorDispatch::default_dispatch = {
++    &MuslMalloc,           /* alloc_function */
++    &MuslCalloc,           /* alloc_zero_initialized_function */
++    &MuslMemalign,         /* alloc_aligned_function */
++    &MuslRealloc,          /* realloc_function */
++    &MuslFree,             /* free_function */
++    &MuslGetSizeEstimate,  /* get_size_estimate_function */
++    nullptr,               /* next */
++};
++
++#endif
diff --git a/srcpkgs/qt6-webengine/patches/0202-chromium-musl-no-mallinfo.patch b/srcpkgs/qt6-webengine/patches/0202-chromium-musl-no-mallinfo.patch
new file mode 100644
index 000000000000..a5bdb5a43a5f
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0202-chromium-musl-no-mallinfo.patch
@@ -0,0 +1,62 @@
+--- a/src/3rdparty/chromium/base/process/process_metrics_posix.cc
++++ b/src/3rdparty/chromium/base/process/process_metrics_posix.cc
+@@ -105,7 +105,7 @@ void IncreaseFdLimitTo(unsigned int max_
+ 
+ #endif  // !defined(OS_FUCHSIA)
+ 
+-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID)
++#if (defined(OS_LINUX) && defined(__GLIBC__)) || defined(OS_CHROMEOS) || defined(OS_ANDROID)
+ namespace {
+ 
+ size_t GetMallocUsageMallinfo() {
+@@ -127,16 +127,16 @@ size_t GetMallocUsageMallinfo() {
+ }
+ 
+ }  // namespace
+-#endif  // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID)
++#endif  // (defined(OS_LINUX) && defined(__GLIBC__)) || defined(OS_CHROMEOS) || defined(OS_ANDROID)
+ 
+ size_t ProcessMetrics::GetMallocUsage() {
+ #if defined(OS_APPLE)
+   malloc_statistics_t stats = {0};
+   malloc_zone_statistics(nullptr, &stats);
+   return stats.size_in_use;
+-#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID)
++#elif (defined(OS_LINUX) && defined(__GLIBC__)) || defined(OS_CHROMEOS) || defined(OS_ANDROID)
+   return GetMallocUsageMallinfo();
+-#elif defined(OS_FUCHSIA)
++#else
+   // TODO(fuchsia): Not currently exposed. https://crbug.com/735087.
+   return 0;
+ #endif
+--- a/src/3rdparty/chromium/third_party/tflite/src/tensorflow/lite/profiling/memory_info.cc
++++ b/src/3rdparty/chromium/third_party/tflite/src/tensorflow/lite/profiling/memory_info.cc
+@@ -27,7 +27,7 @@ namespace memory {
+ const int MemoryUsage::kValueNotSet = 0;
+ 
+ bool MemoryUsage::IsSupported() {
+-#ifdef __linux__
++#ifdef __GLIBC__
+   return true;
+ #endif
+   return false;
+@@ -35,7 +35,7 @@ bool MemoryUsage::IsSupported() {
+ 
+ MemoryUsage GetMemoryUsage() {
+   MemoryUsage result;
+-#ifdef __linux__
++#ifdef __GLIBC__
+   rusage res;
+   if (getrusage(RUSAGE_SELF, &res) == 0) {
+     result.max_rss_kb = res.ru_maxrss;
+--- a/src/3rdparty/chromium/base/trace_event/malloc_dump_provider.cc
++++ b/src/3rdparty/chromium/base/trace_event/malloc_dump_provider.cc
+@@ -213,7 +213,7 @@ bool MallocDumpProvider::OnMemoryDump(co
+                      &allocated_objects_count);
+ #elif defined(OS_FUCHSIA)
+ // TODO(fuchsia): Port, see https://crbug.com/706592.
+-#else
++#elif defined(__GLIBC__)
+ #if defined(__GLIBC__) && defined(__GLIBC_PREREQ)
+ #if __GLIBC_PREREQ(2, 33)
+ #define MALLINFO2_FOUND_IN_LIBC
diff --git a/srcpkgs/qt6-webengine/patches/0203-chromium-musl-siginfo_t.patch b/srcpkgs/qt6-webengine/patches/0203-chromium-musl-siginfo_t.patch
new file mode 100644
index 000000000000..43ef7fd7c5d2
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0203-chromium-musl-siginfo_t.patch
@@ -0,0 +1,18 @@
+There's a subtle difference in the internal name of siginfo_t fields
+between glibc and musl. The structure itself is equivalent, so it
+should suffice to add a macro to rename the field.
+
+--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf/trap.cc
++++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf/trap.cc
+@@ -174,7 +174,11 @@ void Trap::SigSys(int nr, LinuxSigInfo*
+   // If the version of glibc doesn't include this information in
+   // siginfo_t (older than 2.17), we need to explicitly copy it
+   // into an arch_sigsys structure.
++#if defined(__GLIBC__)
+   memcpy(&sigsys, &info->_sifields, sizeof(sigsys));
++#else
++  memcpy(&sigsys, &info->__si_fields, sizeof(sigsys));
++#endif
+ #endif
+ 
+ #if defined(__mips__)
diff --git a/srcpkgs/qt6-webengine/patches/0204-chromium-musl-stackstart.patch b/srcpkgs/qt6-webengine/patches/0204-chromium-musl-stackstart.patch
new file mode 100644
index 000000000000..b03cf43b86db
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0204-chromium-musl-stackstart.patch
@@ -0,0 +1,20 @@
+--- a/src/3rdparty/chromium/third_party/blink/renderer/platform/wtf/stack_util.cc
++++ b/src/3rdparty/chromium/third_party/blink/renderer/platform/wtf/stack_util.cc
+@@ -29,7 +29,7 @@ size_t GetUnderestimatedStackSize() {
+ // FIXME: On Mac OSX and Linux, this method cannot estimate stack size
+ // correctly for the main thread.
+ 
+-#elif defined(__GLIBC__) || defined(OS_ANDROID) || defined(OS_FREEBSD) || \
++#elif defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FREEBSD) || \
+     defined(OS_FUCHSIA)
+   // pthread_getattr_np() can fail if the thread is not invoked by
+   // pthread_create() (e.g., the main thread of blink_unittests).
+@@ -97,7 +97,7 @@ return Threading::ThreadStackSize();
+ }
+ 
+ void* GetStackStart() {
+-#if defined(__GLIBC__) || defined(OS_ANDROID) || defined(OS_FREEBSD) || \
++#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FREEBSD) || \
+     defined(OS_FUCHSIA)
+   pthread_attr_t attr;
+   int error;
diff --git a/srcpkgs/qt6-webengine/patches/0205-chromium-musl-sandbox.patch b/srcpkgs/qt6-webengine/patches/0205-chromium-musl-sandbox.patch
new file mode 100644
index 000000000000..772a578fd823
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0205-chromium-musl-sandbox.patch
@@ -0,0 +1,92 @@
+--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc
++++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc
+@@ -138,7 +138,7 @@ namespace sandbox {
+ // present (as in newer versions of posix_spawn).
+ ResultExpr RestrictCloneToThreadsAndEPERMFork() {
+   const Arg<unsigned long> flags(0);
+-
++#if defined(__GLIBC__)
+   // TODO(mdempsky): Extend DSL to support (flags & ~mask1) == mask2.
+   const uint64_t kAndroidCloneMask = CLONE_VM | CLONE_FS | CLONE_FILES |
+                                      CLONE_SIGHAND | CLONE_THREAD |
+@@ -165,6 +165,17 @@ ResultExpr RestrictCloneToThreadsAndEPER
+   return If(IsAndroid() ? android_test : glibc_test, Allow())
+       .ElseIf(is_fork_or_clone_vfork, Error(EPERM))
+       .Else(CrashSIGSYSClone());
++#else
++  const int required = CLONE_VM | CLONE_FS | CLONE_FILES | CLONE_SIGHAND |
++                       CLONE_THREAD | CLONE_SYSVSEM;
++  const int safe = CLONE_SETTLS | CLONE_PARENT_SETTID | CLONE_CHILD_CLEARTID |
++                   CLONE_DETACHED;
++  const BoolExpr thread_clone_ok = (flags&~safe)==required;
++
++  return If(thread_clone_ok, Allow())
++      .ElseIf((flags & (CLONE_VM | CLONE_THREAD)) == 0, Error(EPERM))
++      .Else(CrashSIGSYSClone());
++#endif
+ }
+ 
+ #ifndef PR_PAC_RESET_KEYS
+--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
++++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
+@@ -419,6 +419,9 @@ bool SyscallSets::IsAllowedProcessStartO
+ #if defined(__i386__)
+     case __NR_waitpid:
+ #endif
++#if !defined(__GLIBC__)
++    case __NR_set_tid_address:
++#endif
+       return true;
+     case __NR_clone:  // Should be parameter-restricted.
+     case __NR_setns:  // Privileged.
+@@ -431,7 +434,9 @@ bool SyscallSets::IsAllowedProcessStartO
+ #if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
+     case __NR_set_thread_area:
+ #endif
++#if defined(__GLIBC__)
+     case __NR_set_tid_address:
++#endif
+     case __NR_unshare:
+ #if !defined(__mips__) && !defined(__aarch64__)
+     case __NR_vfork:
+@@ -545,6 +550,9 @@ bool SyscallSets::IsAllowedAddressSpaceA
+     case __NR_mlock:
+     case __NR_munlock:
+     case __NR_munmap:
++#if !defined(__GLIBC__)
++    case __NR_mremap:
++#endif
+       return true;
+     case __NR_madvise:
+     case __NR_mincore:
+@@ -562,7 +570,9 @@ bool SyscallSets::IsAllowedAddressSpaceA
+     case __NR_modify_ldt:
+ #endif
+     case __NR_mprotect:
++#if defined(__GLIBC__)
+     case __NR_mremap:
++#endif
+     case __NR_msync:
+     case __NR_munlockall:
+     case __NR_readahead:
+--- a/src/3rdparty/chromium/sandbox/policy/linux/bpf_renderer_policy_linux.cc
++++ b/src/3rdparty/chromium/sandbox/policy/linux/bpf_renderer_policy_linux.cc
+@@ -97,11 +97,18 @@ ResultExpr RendererProcessPolicy::Evalua
+     case __NR_sysinfo:
+     case __NR_times:
+     case __NR_uname:
++#if !defined(__GLIBC__)
++    case __NR_sched_getparam:
++    case __NR_sched_getscheduler:
++    case __NR_sched_setscheduler:
++#endif
+       return Allow();
+     case __NR_sched_getaffinity:
++#if defined(__GLIBC__)
+     case __NR_sched_getparam:
+     case __NR_sched_getscheduler:
+     case __NR_sched_setscheduler:
++#endif
+       return RestrictSchedTarget(GetPolicyPid(), sysno);
+     case __NR_prlimit64:
+       // See crbug.com/662450 and setrlimit comment above.
diff --git a/srcpkgs/qt6-webengine/patches/0206-chromium-musl-default-stacksize.patch b/srcpkgs/qt6-webengine/patches/0206-chromium-musl-default-stacksize.patch
new file mode 100644
index 000000000000..bc07495b8144
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0206-chromium-musl-default-stacksize.patch
@@ -0,0 +1,15 @@
+--- a/src/3rdparty/chromium/base/threading/platform_thread_linux.cc
++++ b/src/3rdparty/chromium/base/threading/platform_thread_linux.cc
+@@ -439,7 +439,12 @@ void TerminateOnThread() {}
+ 
+ size_t GetDefaultThreadStackSize(const pthread_attr_t& attributes) {
+ #if !defined(THREAD_SANITIZER)
++#if defined(__GLIBC__)
+   return 0;
++#else // defined(__GLIBC__)
++  // For Musl libc try with a default stack size of 2 MiB
++  return 2 * 1024 * 1024;
++#endif // !defined(__GLIBC__)
+ #else
+   // ThreadSanitizer bloats the stack heavily. Evidence has been that the
+   // default stack size isn't enough for some browser tests.
diff --git a/srcpkgs/qt6-webengine/patches/0207-chromium-musl-cross-no-asm_ptrace_h.patch b/srcpkgs/qt6-webengine/patches/0207-chromium-musl-cross-no-asm_ptrace_h.patch
new file mode 100644
index 000000000000..3cf132908af4
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0207-chromium-musl-cross-no-asm_ptrace_h.patch
@@ -0,0 +1,30 @@
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper.cc
+@@ -38,7 +38,12 @@
+ 
+ #include "client/linux/minidump_writer/linux_ptrace_dumper.h"
+ 
++#if defined(__GLIBC__)
+ #include <asm/ptrace.h>
++#else
++/* For arm*-musl this definition is missing */
++#define ARM_sp uregs[13]
++#endif
+ #include <assert.h>
+ #include <errno.h>
+ #include <fcntl.h>
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_core_dumper.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_core_dumper.cc
+@@ -32,7 +32,12 @@
+ 
+ #include "client/linux/minidump_writer/linux_core_dumper.h"
+ 
++#if defined(__GLIBC__)
+ #include <asm/ptrace.h>
++#else
++/* For arm*-musl this definition is missing */
++#define ARM_sp uregs[13]
++#endif
+ #include <assert.h>
+ #include <elf.h>
+ #include <stdio.h>
diff --git a/srcpkgs/qt6-webengine/patches/0208-chromium-musl-execinfo.patch b/srcpkgs/qt6-webengine/patches/0208-chromium-musl-execinfo.patch
new file mode 100644
index 000000000000..9f3b964676b3
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0208-chromium-musl-execinfo.patch
@@ -0,0 +1,125 @@
+--- a/src/3rdparty/chromium/base/debug/stack_trace.cc
++++ b/src/3rdparty/chromium/base/debug/stack_trace.cc
+@@ -252,7 +252,9 @@ void StackTrace::Print() const {
+ }
+ 
+ void StackTrace::OutputToStream(std::ostream* os) const {
++#if defined(__GLIBC__) && !defined(_AIX)
+   OutputToStreamWithPrefix(os, nullptr);
++#endif
+ }
+ 
+ std::string StackTrace::ToString() const {
+@@ -260,7 +262,7 @@ std::string StackTrace::ToString() const
+ }
+ std::string StackTrace::ToStringWithPrefix(const char* prefix_string) const {
+   std::stringstream stream;
+-#if !defined(__UCLIBC__) && !defined(_AIX)
++#if defined(__GLIBC__) && !defined(_AIX)
+   OutputToStreamWithPrefix(&stream, prefix_string);
+ #endif
+   return stream.str();
+--- a/src/3rdparty/chromium/base/debug/stack_trace_posix.cc
++++ b/src/3rdparty/chromium/base/debug/stack_trace_posix.cc
+@@ -27,7 +27,7 @@
+ #if !defined(USE_SYMBOLIZE)
+ #include <cxxabi.h>
+ #endif
+-#if !defined(__UCLIBC__) && !defined(_AIX)
++#if defined(__GLIBC__) && !defined(_AIX)
+ #include <execinfo.h>
+ #endif
+ 
+@@ -89,7 +89,7 @@ void DemangleSymbols(std::string* text)
+   // Note: code in this function is NOT async-signal safe (std::string uses
+   // malloc internally).
+ 
+-#if !defined(__UCLIBC__) && !defined(_AIX)
++#if defined(__GLIBC__) && !defined(_AIX)
+   std::string::size_type search_from = 0;
+   while (search_from < text->size()) {
+     // Look for the start of a mangled symbol, from search_from.
+@@ -124,7 +124,7 @@ void DemangleSymbols(std::string* text)
+       search_from = mangled_start + 2;
+     }
+   }
+-#endif  // !defined(__UCLIBC__) && !defined(_AIX)
++#endif  // !defined(__GLIBC__) && !defined(_AIX)
+ }
+ #endif  // !defined(USE_SYMBOLIZE)
+ 
+@@ -136,7 +136,7 @@ class BacktraceOutputHandler {
+   virtual ~BacktraceOutputHandler() = default;
+ };
+ 
+-#if !defined(__UCLIBC__) && !defined(_AIX)
++#if defined(__GLIBC__) && !defined(_AIX)
+ void OutputPointer(void* pointer, BacktraceOutputHandler* handler) {
+   // This should be more than enough to store a 64-bit number in hex:
+   // 16 hex digits + 1 for null-terminator.
+@@ -219,7 +219,7 @@ void ProcessBacktrace(void* const* trace
+   }
+ #endif  // defined(USE_SYMBOLIZE)
+ }
+-#endif  // !defined(__UCLIBC__) && !defined(_AIX)
++#endif  // !defined(__GLIBC__) && !defined(_AIX)
+ 
+ void PrintToStderr(const char* output) {
+   // NOTE: This code MUST be async-signal safe (it's used by in-process
+@@ -839,7 +839,7 @@ size_t CollectStackTrace(void** trace, s
+   // If we do not have unwind tables, then try tracing using frame pointers.
+   return base::debug::TraceStackFramePointers(const_cast<const void**>(trace),
+                                               count, 0);
+-#elif !defined(__UCLIBC__) && !defined(_AIX)
++#elif defined(__GLIBC__) && !defined(_AIX)
+   // Though the backtrace API man page does not list any possible negative
+   // return values, we take no chance.
+   return base::saturated_cast<size_t>(backtrace(trace, count));
+@@ -852,13 +852,13 @@ void StackTrace::PrintWithPrefix(const c
+ // NOTE: This code MUST be async-signal safe (it's used by in-process
+ // stack dumping signal handler). NO malloc or stdio is allowed here.
+ 
+-#if !defined(__UCLIBC__) && !defined(_AIX)
++#if defined(__GLIBC__) && !defined(_AIX)
+   PrintBacktraceOutputHandler handler;
+   ProcessBacktrace(trace_, count_, prefix_string, &handler);
+ #endif
+ }
+ 
+-#if !defined(__UCLIBC__) && !defined(_AIX)
++#if defined(__GLIBC__) && !defined(_AIX)
+ void StackTrace::OutputToStreamWithPrefix(std::ostream* os,
+                                           const char* prefix_string) const {
+   StreamBacktraceOutputHandler handler(os);
+--- a/src/3rdparty/chromium/base/logging.cc
++++ b/src/3rdparty/chromium/base/logging.cc
+@@ -582,7 +582,7 @@ LogMessage::LogMessage(const char* file,
+ 
+ LogMessage::~LogMessage() {
+   size_t stack_start = stream_.tellp();
+-#if !defined(OFFICIAL_BUILD) && !defined(OS_NACL) && !defined(__UCLIBC__) && \
++#if !defined(OFFICIAL_BUILD) && !defined(OS_NACL) && defined(__GLIBC__) && \
+     !defined(OS_AIX)
+   if (severity_ == LOGGING_FATAL && !base::debug::BeingDebugged()) {
+     // Include a stack trace on a fatal, unless a debugger is attached.
+--- 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 @@
+ 
+ #if defined(DEBUG) && defined(V8_OS_LINUX) && !defined(V8_OS_ANDROID)
+ #define SYMBOLIZE_FUNCTION
++#if defined(__GLIBC__)
+ #include <execinfo.h>
++#endif
+ 
+ #include <vector>
+ 
+@@ -103,7 +105,7 @@ void ExternalReferenceTable::Init(Isolat
+ }
+ 
+ const char* ExternalReferenceTable::ResolveSymbol(void* address) {
+-#ifdef SYMBOLIZE_FUNCTION
++#if defined(SYMBOLIZE_FUNCTION) && defined(__GLIBC__)
+   char** names = backtrace_symbols(&address, 1);
+   const char* name = names[0];
+   // The array of names is malloc'ed. However, each name string is static
diff --git a/srcpkgs/qt6-webengine/patches/0209-chromium-musl-thread-stacksize.patch b/srcpkgs/qt6-webengine/patches/0209-chromium-musl-thread-stacksize.patch
new file mode 100644
index 000000000000..4b760a428b25
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0209-chromium-musl-thread-stacksize.patch
@@ -0,0 +1,22 @@
+--- a/src/3rdparty/chromium/ppapi/utility/threading/simple_thread.cc
++++ b/src/3rdparty/chromium/ppapi/utility/threading/simple_thread.cc
+@@ -13,7 +13,7 @@ namespace pp {
+ namespace {
+ 
+ // Use 2MB default stack size for Native Client, otherwise use system default.
+-#if defined(__native_client__)
++#if defined(__native_client__) || !defined(__GLIBC__)
+ const size_t kDefaultStackSize = 2 * 1024 * 1024;
+ #else
+ const size_t kDefaultStackSize = 0;
+--- a/src/3rdparty/chromium/v8/src/base/platform/platform-posix.cc
++++ b/src/3rdparty/chromium/v8/src/base/platform/platform-posix.cc
+@@ -883,7 +883,7 @@ bool Thread::Start() {
+ #if V8_OS_MACOSX
+     // Default on Mac OS X is 512kB -- bump up to 1MB
+     stack_size = 1 * 1024 * 1024;
+-#elif V8_OS_AIX
++#elif V8_OS_AIX || !defined(__GLIBC__)
+     // Default on AIX is 96kB -- bump up to 2MB
+     stack_size = 2 * 1024 * 1024;
+ #endif
diff --git a/srcpkgs/qt6-webengine/patches/0210-chromium-musl-msgvec-push_back.patch b/srcpkgs/qt6-webengine/patches/0210-chromium-musl-msgvec-push_back.patch
new file mode 100644
index 000000000000..905daa223700
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0210-chromium-musl-msgvec-push_back.patch
@@ -0,0 +1,14 @@
+--- a/src/3rdparty/chromium/net/socket/udp_socket_posix.cc
++++ b/src/3rdparty/chromium/net/socket/udp_socket_posix.cc
+@@ -1162,7 +1162,11 @@ SendResult UDPSocketPosixSender::Interna
+     msg_iov->push_back({const_cast<char*>(buffer->data()), buffer->length()});
+   msgvec->reserve(buffers.size());
+   for (size_t j = 0; j < buffers.size(); j++)
++#if defined(__GLIBC__)
+     msgvec->push_back({{nullptr, 0, &msg_iov[j], 1, nullptr, 0, 0}, 0});
++#else
++    msgvec->push_back({{nullptr, 0, &msg_iov[j], 1, 0, 0, 0}, 0});
++#endif
+   int result = HANDLE_EINTR(Sendmmsg(fd, &msgvec[0], buffers.size(), 0));
+   SendResult send_result(0, 0, std::move(buffers));
+   if (result < 0) {
diff --git a/srcpkgs/qt6-webengine/patches/0211-chromium-musl-canonicalize-file-name-musl.patch b/srcpkgs/qt6-webengine/patches/0211-chromium-musl-canonicalize-file-name-musl.patch
new file mode 100644
index 000000000000..d43e6bd488bc
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0211-chromium-musl-canonicalize-file-name-musl.patch
@@ -0,0 +1,11 @@
+--- a/src/3rdparty/chromium/third_party/nasm/nasmlib/realpath.c
++++ b/src/3rdparty/chromium/third_party/nasm/nasmlib/realpath.c
+@@ -55,7 +55,7 @@
+  */
+ char *nasm_realpath(const char *rel_path)
+ {
+-    char *rp = canonicalize_file_name(rel_path);
++    char *rp = realpath(rel_path, NULL);
+     return rp ? rp : nasm_strdup(rel_path);
+ }
+ 
diff --git a/srcpkgs/qt6-webengine/patches/0212-chromium-musl-no-getcontext.patch b/srcpkgs/qt6-webengine/patches/0212-chromium-musl-no-getcontext.patch
new file mode 100644
index 000000000000..5755f1b45a7d
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0212-chromium-musl-no-getcontext.patch
@@ -0,0 +1,29 @@
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc
+@@ -489,8 +489,10 @@ bool ExceptionHandler::SimulateSignalDel
+   // ExceptionHandler::HandleSignal().
+   siginfo.si_code = SI_USER;
+   siginfo.si_pid = getpid();
+-  ucontext_t context;
++  ucontext_t context = { 0 };
++#if defined(__GLIBC__)
+   getcontext(&context);
++#endif
+   return HandleSignal(sig, &siginfo, &context);
+ }
+ 
+@@ -675,9 +677,14 @@ bool ExceptionHandler::WriteMinidump() {
+   sys_prctl(PR_SET_DUMPABLE, 1, 0, 0, 0);
+ 
+   CrashContext context;
++
++#if defined(__GLIBC__)
+   int getcontext_result = getcontext(&context.context);
+   if (getcontext_result)
+     return false;
++#else
++  return false;
++#endif
+ 
+ #if defined(__i386__)
+   // In CPUFillFromUContext in minidumpwriter.cc the stack pointer is retrieved
diff --git a/srcpkgs/qt6-webengine/patches/0213-chromium-musl-crashpad.patch b/srcpkgs/qt6-webengine/patches/0213-chromium-musl-crashpad.patch
new file mode 100644
index 000000000000..4d49997ed4f3
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0213-chromium-musl-crashpad.patch
@@ -0,0 +1,22 @@
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/compat/linux/sys/ptrace.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/compat/linux/sys/ptrace.h
+@@ -17,7 +17,9 @@
+ 
+ #include_next <sys/ptrace.h>
+ 
++#ifdef __GLIBC__
+ #include <sys/cdefs.h>
++#endif
+ 
+ // https://sourceware.org/bugzilla/show_bug.cgi?id=22433
+ #if !defined(PTRACE_GET_THREAD_AREA) && !defined(PT_GET_THREAD_AREA) && \
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/util/linux/ptracer.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/util/linux/ptracer.cc
+@@ -26,6 +26,7 @@
+ 
+ #if defined(ARCH_CPU_X86_FAMILY)
+ #include <asm/ldt.h>
++#include <asm/ptrace-abi.h>
+ #endif
+ 
+ namespace crashpad {
diff --git a/srcpkgs/qt6-webengine/patches/0214-chromium-musl-fixes.patch b/srcpkgs/qt6-webengine/patches/0214-chromium-musl-fixes.patch
new file mode 100644
index 000000000000..55b267ed1714
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0214-chromium-musl-fixes.patch
@@ -0,0 +1,108 @@
+--- a/src/3rdparty/chromium/sandbox/linux/suid/process_util.h
++++ b/src/3rdparty/chromium/sandbox/linux/suid/process_util.h
+@@ -12,6 +12,15 @@
+ #include <stdint.h>
+ #include <sys/types.h>
+ 
++#if !defined(__GLIBC__) && !defined(TEMP_FAILURE_RETRY)
++# define TEMP_FAILURE_RETRY(expression) \
++	(__extension__			\
++	 ({ long int __result;		\
++	  do __result = (long int) (expression); \
++	  while (__result == -1L && errno == EINTR); \
++	  __result; }))
++#endif
++
+ // This adjusts /proc/process/oom_score_adj so the Linux OOM killer
+ // will prefer certain process types over others. The range for the
+ // adjustment is [-1000, 1000], with [0, 1000] being user accessible.
+--- a/src/3rdparty/chromium/services/device/serial/serial_io_handler_posix.cc
++++ b/src/3rdparty/chromium/services/device/serial/serial_io_handler_posix.cc
+@@ -6,6 +6,7 @@
+ 
+ #include <sys/ioctl.h>
+ #include <termios.h>
++#include <asm-generic/ioctls.h>
+ 
+ #include <algorithm>
+ #include <utility>
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h
+@@ -38,6 +38,10 @@
+ #include "common/memory_allocator.h"
+ #include "google_breakpad/common/minidump_format.h"
+ 
++#ifndef __GLIBC__
++#define _libc_fpstate _fpstate
++#endif
++
+ namespace google_breakpad {
+ 
+ // Wraps platform-dependent implementations of accessors to ucontext_t structs.
+--- a/src/3rdparty/chromium/third_party/ffmpeg/libavutil/cpu.c
++++ b/src/3rdparty/chromium/third_party/ffmpeg/libavutil/cpu.c
+@@ -41,8 +41,10 @@
+ #include <sys/param.h>
+ #endif
+ #include <sys/types.h>
++#ifdef __GLIBC__
+ #include <sys/sysctl.h>
+ #endif
++#endif
+ #if HAVE_UNISTD_H
+ #include <unistd.h>
+ #endif
+--- a/src/3rdparty/chromium/third_party/perfetto/include/perfetto/ext/base/thread_utils.h
++++ b/src/3rdparty/chromium/third_party/perfetto/include/perfetto/ext/base/thread_utils.h
+@@ -29,9 +29,7 @@
+ #include <algorithm>
+ #endif
+ 
+-#if PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID)
+ #include <sys/prctl.h>
+-#endif
+ 
+ // Internal implementation utils that aren't as widely useful/supported as
+ // base/thread_utils.h.
+@@ -58,7 +56,7 @@ inline bool MaybeSetThreadName(const std
+ 
+ inline bool GetThreadName(std::string& out_result) {
+   char buf[16] = {};
+-#if PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID)
++#if !defined(__GLIBC__)
+   if (prctl(PR_GET_NAME, buf) != 0)
+     return false;
+ #else
+--- a/src/3rdparty/chromium/third_party/lss/linux_syscall_support.h
++++ b/src/3rdparty/chromium/third_party/lss/linux_syscall_support.h
+@@ -1300,6 +1300,18 @@ struct kernel_statfs {
+ #ifndef __NR_fallocate
+ #define __NR_fallocate          285
+ #endif
++
++#if !defined(__GLIBC__)
++#ifdef __NR_pread
++#undef __NR_pread
++#endif
++#ifdef __NR_pwrite
++#undef __NR_pwrite
++#endif
++#define __NR_pread __NR_pread64
++#define __NR_pwrite __NR_pwrite64
++#endif /* !defined(__GLIBC__) */
++
+ #ifndef __NR_getrandom
+ #define __NR_getrandom          318
+ #endif
+--- a/src/3rdparty/chromium/net/dns/dns_config_service_posix.cc
++++ b/src/3rdparty/chromium/net/dns/dns_config_service_posix.cc
+@@ -93,7 +93,8 @@ absl::optional<DnsConfig> ReadDnsConfig(
+ 
+   absl::optional<DnsConfig> dns_config;
+ // TODO(fuchsia): Use res_ninit() when it's implemented on Fuchsia.
+-#if defined(OS_OPENBSD) || defined(OS_FUCHSIA)
++#if defined(OS_OPENBSD) || defined(OS_FUCHSIA) || \
++  (defined(OS_LINUX) && !defined(__GLIBC__))
+   // Note: res_ninit in glibc always returns 0 and sets RES_INIT.
+   // res_init behaves the same way.
+   memset(&_res, 0, sizeof(_res));
diff --git a/srcpkgs/qt6-webengine/patches/0215-chromium-musl-cdefs.patch b/srcpkgs/qt6-webengine/patches/0215-chromium-musl-cdefs.patch
new file mode 100644
index 000000000000..9d1daec29118
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0215-chromium-musl-cdefs.patch
@@ -0,0 +1,29 @@
+--- a/src/3rdparty/chromium/third_party/libsync/src/include/sync/sync.h
++++ b/src/3rdparty/chromium/third_party/libsync/src/include/sync/sync.h
+@@ -19,12 +19,13 @@
+ #ifndef __SYS_CORE_SYNC_H
+ #define __SYS_CORE_SYNC_H
+ 
+-#include <sys/cdefs.h>
+ #include <stdint.h>
+ 
+ #include <linux/types.h>
+ 
+-__BEGIN_DECLS
++#ifdef __cplusplus
++extern "C" {
++#endif
+ 
+ struct sync_legacy_merge_data {
+  int32_t fd2;
+@@ -158,6 +159,9 @@ struct sync_pt_info *sync_pt_info(struct
+                                   struct sync_pt_info *itr);
+ void sync_fence_info_free(struct sync_fence_info_data *info);
+ 
+-__END_DECLS
++#ifdef __cplusplus
++}
++#endif
++
+ 
+ #endif /* __SYS_CORE_SYNC_H */
diff --git a/srcpkgs/qt6-webengine/patches/0216-chromium-musl-stat.patch b/srcpkgs/qt6-webengine/patches/0216-chromium-musl-stat.patch
new file mode 100644
index 000000000000..4509a6957cd7
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0216-chromium-musl-stat.patch
@@ -0,0 +1,12 @@
+--- a/src/3rdparty/chromium/base/files/file.h
++++ b/src/3rdparty/chromium/base/files/file.h
+@@ -19,7 +19,8 @@
+ #include "build/build_config.h"
+ 
+ #if defined(OS_BSD) || defined(OS_APPLE) || defined(OS_NACL) || \
+-    defined(OS_FUCHSIA) || (defined(OS_ANDROID) && __ANDROID_API__ < 21)
++    defined(OS_FUCHSIA) || (defined(OS_ANDROID) && __ANDROID_API__ < 21) || \
++    (defined(OS_LINUX) && !defined(__GLIBC__))
+ struct stat;
+ namespace base {
+ typedef struct stat stat_wrapper_t;
diff --git a/srcpkgs/qt6-webengine/patches/0217-chromium-musl-resolver.patch b/srcpkgs/qt6-webengine/patches/0217-chromium-musl-resolver.patch
new file mode 100644
index 000000000000..c3d7afad9b19
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0217-chromium-musl-resolver.patch
@@ -0,0 +1,77 @@
+--- a/src/3rdparty/chromium/net/dns/dns_config_service_linux.cc
++++ b/src/3rdparty/chromium/net/dns/dns_config_service_linux.cc
+@@ -432,11 +432,13 @@ class DnsConfigServiceLinux::ConfigReade
+     base::ScopedBlockingCall scoped_blocking_call(
+         FROM_HERE, base::BlockingType::MAY_BLOCK);
+ 
++#if defined(__GLIBC__)
+     std::unique_ptr<struct __res_state> res = resolv_reader_->GetResState();
+     if (res) {
+       dns_config_ = ConvertResStateToDnsConfig(*res.get());
+       resolv_reader_->CloseResState(res.get());
+     }
++#endif
+ 
+     UMA_HISTOGRAM_BOOLEAN("Net.DNS.DnsConfig.Resolv.Read",
+                           dns_config_.has_value());
+@@ -486,6 +488,7 @@ class DnsConfigServiceLinux::ConfigReade
+ 
+ std::unique_ptr<struct __res_state>
+ DnsConfigServiceLinux::ResolvReader::GetResState() {
++#if defined(__GLIBC__)
+   auto res = std::make_unique<struct __res_state>();
+   memset(res.get(), 0, sizeof(struct __res_state));
+ 
+@@ -495,11 +498,16 @@ DnsConfigServiceLinux::ResolvReader::Get
+   }
+ 
+   return res;
++#else
++  return nullptr;
++#endif
+ }
+ 
+ void DnsConfigServiceLinux::ResolvReader::CloseResState(
+     struct __res_state* res) {
++#if defined(__GLIBC__)
+   res_nclose(res);
++#endif
+ }
+ 
+ DnsConfigServiceLinux::DnsConfigServiceLinux()
+--- a/src/3rdparty/chromium/net/dns/dns_reloader.cc
++++ b/src/3rdparty/chromium/net/dns/dns_reloader.cc
+@@ -4,8 +4,7 @@
+ 
+ #include "net/dns/dns_reloader.h"
+ 
+-#if defined(OS_POSIX) && !defined(OS_APPLE) && !defined(OS_OPENBSD) && \
+-    !defined(OS_ANDROID) && !defined(OS_FUCHSIA)
++#ifdef __GLIBC__
+ 
+ #include <resolv.h>
+ 
+--- a/src/3rdparty/chromium/net/dns/host_resolver_manager.cc
++++ b/src/3rdparty/chromium/net/dns/host_resolver_manager.cc
+@@ -2720,8 +2720,7 @@ HostResolverManager::HostResolverManager
+   NetworkChangeNotifier::AddConnectionTypeObserver(this);
+   if (system_dns_config_notifier_)
+     system_dns_config_notifier_->AddObserver(this);
+-#if defined(OS_POSIX) && !defined(OS_APPLE) && !defined(OS_OPENBSD) && \
+-    !defined(OS_ANDROID)
++#ifdef __GLIBC__
+   EnsureDnsReloaderInit();
+ #endif
+ 
+--- a/src/3rdparty/chromium/net/dns/host_resolver_proc.cc
++++ b/src/3rdparty/chromium/net/dns/host_resolver_proc.cc
+@@ -176,8 +176,7 @@ int SystemHostResolverCall(const std::st
+   base::ScopedBlockingCall scoped_blocking_call(FROM_HERE,
+                                                 base::BlockingType::WILL_BLOCK);
+ 
+-#if defined(OS_POSIX) && !defined(OS_APPLE) && !defined(OS_OPENBSD) && \
+-    !defined(OS_ANDROID) && !defined(OS_FUCHSIA)
++#ifdef __GLIBC__
+   DnsReloaderMaybeReload();
+ #endif
+   absl::optional<AddressInfo> ai;
diff --git a/srcpkgs/qt6-webengine/patches/0600-chromium-sndio.patch b/srcpkgs/qt6-webengine/patches/0600-chromium-sndio.patch
new file mode 100644
index 000000000000..0302874ffba4
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0600-chromium-sndio.patch
@@ -0,0 +1,876 @@
+--- a/src/3rdparty/chromium/media/BUILD.gn
++++ b/src/3rdparty/chromium/media/BUILD.gn
+@@ -72,6 +72,9 @@ config("media_config") {
+       defines += [ "DLOPEN_PULSEAUDIO" ]
+     }
+   }
++  if (use_sndio) {
++    defines += [ "USE_SNDIO" ]
++  }
+   if (use_cras) {
+     defines += [ "USE_CRAS" ]
+   }
+--- a/src/3rdparty/chromium/media/audio/BUILD.gn
++++ b/src/3rdparty/chromium/media/audio/BUILD.gn
+@@ -240,6 +240,17 @@ source_set("audio") {
+     sources += [ "linux/audio_manager_linux.cc" ]
+   }
+ 
++  if (use_sndio) {
++    libs += [ "sndio" ]
++    sources += [
++      "sndio/audio_manager_sndio.cc",
++      "sndio/sndio_input.cc",
++      "sndio/sndio_input.h",
++      "sndio/sndio_output.cc",
++      "sndio/sndio_output.h"
++    ]
++  }
++
+   if (use_alsa) {
+     libs += [ "asound" ]
+     sources += [
+--- a/src/3rdparty/chromium/media/audio/linux/audio_manager_linux.cc
++++ b/src/3rdparty/chromium/media/audio/linux/audio_manager_linux.cc
+@@ -25,6 +25,11 @@
+ #include "media/audio/pulse/audio_manager_pulse.h"
+ #include "media/audio/pulse/pulse_util.h"
+ #endif
++#if defined(USE_SNDIO)
++#include "media/audio/sndio/audio_manager_sndio.h"
++#include "media/audio/sndio/sndio_input.h"
++#include "media/audio/sndio/sndio_output.h"
++#endif
+ 
+ namespace media {
+ 
+@@ -32,7 +37,8 @@ enum LinuxAudioIO {
+   kPulse,
+   kAlsa,
+   kCras,
+-  kAudioIOMax = kCras  // Must always be equal to largest logged entry.
++  kSndio,
++  kAudioIOMax = kSndio // Must always be equal to largest logged entry.
+ };
+ 
+ std::unique_ptr<media::AudioManager> CreateAudioManager(
+@@ -45,6 +51,16 @@ std::unique_ptr<media::AudioManager> Cre
+                                               audio_log_factory);
+   }
+ 
++#if defined(USE_SNDIO)
++  struct sio_hdl *hdl = sio_open(SIO_DEVANY, SIO_PLAY, 0);
++  if (hdl != NULL) {
++    sio_close(hdl);
++    UMA_HISTOGRAM_ENUMERATION("Media.LinuxAudioIO", kSndio, kAudioIOMax + 1);
++    return std::make_unique<AudioManagerSndio>(std::move(audio_thread),
++                                                  audio_log_factory);
++  }
++#endif
++
+ #if defined(USE_CRAS)
+   if (base::CommandLine::ForCurrentProcess()->HasSwitch(switches::kUseCras)) {
+     UMA_HISTOGRAM_ENUMERATION("Media.LinuxAudioIO", kCras, kAudioIOMax + 1);
+--- /dev/null
++++ b/src/3rdparty/chromium/media/audio/sndio/audio_manager_sndio.cc
+@@ -0,0 +1,148 @@
++// Copyright (c) 2012 The Chromium Authors. All rights reserved.
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++#include "media/audio/sndio/audio_manager_sndio.h"
++
++#include "base/metrics/histogram_macros.h"
++#include "base/memory/ptr_util.h"
++#include "media/audio/audio_device_description.h"
++#include "media/audio/audio_output_dispatcher.h"
++#include "media/audio/sndio/sndio_input.h"
++#include "media/audio/sndio/sndio_output.h"
++#include "media/base/limits.h"
++#include "media/base/media_switches.h"
++
++namespace media {
++
++
++// Maximum number of output streams that can be open simultaneously.
++static const int kMaxOutputStreams = 4;
++
++// Default sample rate for input and output streams.
++static const int kDefaultSampleRate = 48000;
++
++void AddDefaultDevice(AudioDeviceNames* device_names) {
++  DCHECK(device_names->empty());
++  device_names->push_front(AudioDeviceName::CreateDefault());
++}
++
++bool AudioManagerSndio::HasAudioOutputDevices() {
++  return true;
++}
++
++bool AudioManagerSndio::HasAudioInputDevices() {
++  return true;
++}
++
++void AudioManagerSndio::GetAudioInputDeviceNames(
++    AudioDeviceNames* device_names) {
++  DCHECK(device_names->empty());
++  AddDefaultDevice(device_names);
++}
++
++void AudioManagerSndio::GetAudioOutputDeviceNames(
++    AudioDeviceNames* device_names) {
++  AddDefaultDevice(device_names);
++}
++
++const char* AudioManagerSndio::GetName() {
++  return "SNDIO";
++}
++
++AudioParameters AudioManagerSndio::GetInputStreamParameters(
++    const std::string& device_id) {
++  static const int kDefaultInputBufferSize = 1024;
++
++  int user_buffer_size = GetUserBufferSize();
++  int buffer_size = user_buffer_size ?
++      user_buffer_size : kDefaultInputBufferSize;
++
++  return AudioParameters(
++      AudioParameters::AUDIO_PCM_LOW_LATENCY, CHANNEL_LAYOUT_STEREO,
++      kDefaultSampleRate, buffer_size);
++}
++
++AudioManagerSndio::AudioManagerSndio(std::unique_ptr<AudioThread> audio_thread,
++                                         AudioLogFactory* audio_log_factory)
++    : AudioManagerBase(std::move(audio_thread),
++                       audio_log_factory) {
++  DLOG(WARNING) << "AudioManagerSndio";
++  SetMaxOutputStreamsAllowed(kMaxOutputStreams);
++}
++
++AudioManagerSndio::~AudioManagerSndio() {
++  Shutdown();
++}
++
++AudioOutputStream* AudioManagerSndio::MakeLinearOutputStream(
++    const AudioParameters& params,
++    const LogCallback& log_callback) {
++  DCHECK_EQ(AudioParameters::AUDIO_PCM_LINEAR, params.format());
++  return MakeOutputStream(params);
++}
++
++AudioOutputStream* AudioManagerSndio::MakeLowLatencyOutputStream(
++    const AudioParameters& params,
++    const std::string& device_id,
++    const LogCallback& log_callback) {
++  DLOG_IF(ERROR, !device_id.empty()) << "Not implemented!";
++  DCHECK_EQ(AudioParameters::AUDIO_PCM_LOW_LATENCY, params.format());
++  return MakeOutputStream(params);
++}
++
++AudioInputStream* AudioManagerSndio::MakeLinearInputStream(
++    const AudioParameters& params,
++    const std::string& device_id,
++    const LogCallback& log_callback) {
++  DCHECK_EQ(AudioParameters::AUDIO_PCM_LINEAR, params.format());
++  return MakeInputStream(params);
++}
++
++AudioInputStream* AudioManagerSndio::MakeLowLatencyInputStream(
++    const AudioParameters& params,
++    const std::string& device_id,
++    const LogCallback& log_callback) {
++  DCHECK_EQ(AudioParameters::AUDIO_PCM_LOW_LATENCY, params.format());
++  return MakeInputStream(params);
++}
++
++AudioParameters AudioManagerSndio::GetPreferredOutputStreamParameters(
++    const std::string& output_device_id,
++    const AudioParameters& input_params) {
++  // TODO(tommi): Support |output_device_id|.
++  DLOG_IF(ERROR, !output_device_id.empty()) << "Not implemented!";
++  static const int kDefaultOutputBufferSize = 2048;
++
++  ChannelLayout channel_layout = CHANNEL_LAYOUT_STEREO;
++  int sample_rate = kDefaultSampleRate;
++  int buffer_size = kDefaultOutputBufferSize;
++  if (input_params.IsValid()) {
++    sample_rate = input_params.sample_rate();
++    channel_layout = input_params.channel_layout();
++    buffer_size = std::min(buffer_size, input_params.frames_per_buffer());
++  }
++
++  int user_buffer_size = GetUserBufferSize();
++  if (user_buffer_size)
++    buffer_size = user_buffer_size;
++
++  return AudioParameters(
++      AudioParameters::AUDIO_PCM_LOW_LATENCY, channel_layout,
++      sample_rate, buffer_size);
++}
++
++AudioInputStream* AudioManagerSndio::MakeInputStream(
++    const AudioParameters& params) {
++  DLOG(WARNING) << "MakeInputStream";
++  return new SndioAudioInputStream(this,
++             AudioDeviceDescription::kDefaultDeviceId, params);
++}
++
++AudioOutputStream* AudioManagerSndio::MakeOutputStream(
++    const AudioParameters& params) {
++  DLOG(WARNING) << "MakeOutputStream";
++  return new SndioAudioOutputStream(params, this);
++}
++
++}  // namespace media
+--- /dev/null
++++ b/src/3rdparty/chromium/media/audio/sndio/audio_manager_sndio.h
+@@ -0,0 +1,65 @@
++// Copyright (c) 2012 The Chromium Authors. All rights reserved.
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++#ifndef MEDIA_AUDIO_SNDIO_AUDIO_MANAGER_SNDIO_H_
++#define MEDIA_AUDIO_SNDIO_AUDIO_MANAGER_SNDIO_H_
++
++#include <set>
++
++#include "base/compiler_specific.h"
++#include "base/macros.h"
++#include "base/memory/ref_counted.h"
++#include "base/threading/thread.h"
++#include "media/audio/audio_manager_base.h"
++
++namespace media {
++
++class MEDIA_EXPORT AudioManagerSndio : public AudioManagerBase {
++ public:
++  AudioManagerSndio(std::unique_ptr<AudioThread> audio_thread,
++                   AudioLogFactory* audio_log_factory);
++  ~AudioManagerSndio() override;
++
++  // Implementation of AudioManager.
++  bool HasAudioOutputDevices() override;
++  bool HasAudioInputDevices() override;
++  void GetAudioInputDeviceNames(AudioDeviceNames* device_names) override;
++  void GetAudioOutputDeviceNames(AudioDeviceNames* device_names) override;
++  AudioParameters GetInputStreamParameters(
++      const std::string& device_id) override;
++  const char* GetName() override;
++
++  // Implementation of AudioManagerBase.
++  AudioOutputStream* MakeLinearOutputStream(
++      const AudioParameters& params,
++      const LogCallback& log_callback) override;
++  AudioOutputStream* MakeLowLatencyOutputStream(
++      const AudioParameters& params,
++      const std::string& device_id,
++      const LogCallback& log_callback) override;
++  AudioInputStream* MakeLinearInputStream(
++      const AudioParameters& params,
++      const std::string& device_id,
++      const LogCallback& log_callback) override;
++  AudioInputStream* MakeLowLatencyInputStream(
++      const AudioParameters& params,
++      const std::string& device_id,
++      const LogCallback& log_callback) override;
++
++ protected:
++  AudioParameters GetPreferredOutputStreamParameters(
++      const std::string& output_device_id,
++      const AudioParameters& input_params) override;
++
++ private:
++  // Called by MakeLinearOutputStream and MakeLowLatencyOutputStream.
++  AudioOutputStream* MakeOutputStream(const AudioParameters& params);
++  AudioInputStream* MakeInputStream(const AudioParameters& params);
++
++  DISALLOW_COPY_AND_ASSIGN(AudioManagerSndio);
++};
++
++}  // namespace media
++
++#endif  // MEDIA_AUDIO_SNDIO_AUDIO_MANAGER_SNDIO_H_
+--- /dev/null
++++ b/src/3rdparty/chromium/media/audio/sndio/sndio_input.cc
+@@ -0,0 +1,200 @@
++// Copyright 2013 The Chromium Authors. All rights reserved.
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++#include "base/bind.h"
++#include "base/logging.h"
++#include "base/macros.h"
++#include "media/base/audio_timestamp_helper.h"
++#include "media/audio/sndio/audio_manager_sndio.h"
++#include "media/audio/audio_manager.h"
++#include "media/audio/sndio/sndio_input.h"
++
++namespace media {
++
++static const SampleFormat kSampleFormat = kSampleFormatS16;
++
++void SndioAudioInputStream::OnMoveCallback(void *arg, int delta)
++{
++  SndioAudioInputStream* self = static_cast<SndioAudioInputStream*>(arg);
++
++  self->hw_delay += delta;
++}
++
++void *SndioAudioInputStream::ThreadEntry(void *arg) {
++  SndioAudioInputStream* self = static_cast<SndioAudioInputStream*>(arg);
++
++  self->ThreadLoop();
++  return NULL;
++}
++
++SndioAudioInputStream::SndioAudioInputStream(AudioManagerBase* manager,
++                                             const std::string& device_name,
++                                             const AudioParameters& params)
++    : manager(manager),
++      params(params),
++      audio_bus(AudioBus::Create(params)),
++      state(kClosed) {
++}
++
++SndioAudioInputStream::~SndioAudioInputStream() {
++  if (state != kClosed)
++    Close();
++}
++
++bool SndioAudioInputStream::Open() {
++  struct sio_par par;
++  int sig;
++
++  if (state != kClosed)
++    return false;
++
++  if (params.format() != AudioParameters::AUDIO_PCM_LINEAR &&
++      params.format() != AudioParameters::AUDIO_PCM_LOW_LATENCY) {
++    LOG(WARNING) << "Unsupported audio format.";
++    return false;
++  }
++
++  sio_initpar(&par);
++  par.rate = params.sample_rate();
++  par.rchan = params.channels();
++  par.bits = SampleFormatToBitsPerChannel(kSampleFormat);
++  par.bps = par.bits / 8;
++  par.sig = sig = par.bits != 8 ? 1 : 0;
++  par.le = SIO_LE_NATIVE;
++  par.appbufsz = params.frames_per_buffer();
++
++  hdl = sio_open(SIO_DEVANY, SIO_REC, 0);
++
++  if (hdl == NULL) {
++    LOG(ERROR) << "Couldn't open audio device.";
++    return false;
++  }
++
++  if (!sio_setpar(hdl, &par) || !sio_getpar(hdl, &par)) {
++    LOG(ERROR) << "Couldn't set audio parameters.";
++    goto bad_close;
++  }
++
++  if (par.rate  != (unsigned int)params.sample_rate() ||
++      par.rchan != (unsigned int)params.channels() ||
++      par.bits  != (unsigned int)SampleFormatToBitsPerChannel(kSampleFormat) ||
++      par.sig   != (unsigned int)sig ||
++      (par.bps > 1 && par.le != SIO_LE_NATIVE) ||
++      (par.bits != par.bps * 8)) {
++    LOG(ERROR) << "Unsupported audio parameters.";
++    goto bad_close;
++  }
++  state = kStopped;
++  buffer = new char[audio_bus->frames() * params.GetBytesPerFrame(kSampleFormat)];
++  sio_onmove(hdl, &OnMoveCallback, this);
++  return true;
++bad_close:
++  sio_close(hdl);
++  return false;
++}
++
++void SndioAudioInputStream::Start(AudioInputCallback* cb) {
++
++  StartAgc();
++
++  state = kRunning;
++  hw_delay = 0;
++  callback = cb;
++  sio_start(hdl);
++  if (pthread_create(&thread, NULL, &ThreadEntry, this) != 0) {
++    LOG(ERROR) << "Failed to create real-time thread for recording.";
++    sio_stop(hdl);
++    state = kStopped;
++  }
++}
++
++void SndioAudioInputStream::Stop() {
++
++  if (state == kStopped)
++    return;
++
++  state = kStopWait;
++  pthread_join(thread, NULL);
++  sio_stop(hdl);
++  state = kStopped;
++
++  StopAgc();
++}
++
++void SndioAudioInputStream::Close() {
++
++  if (state == kClosed)
++    return;
++
++  if (state == kRunning)
++    Stop();
++
++  state = kClosed;
++  delete [] buffer;
++  sio_close(hdl);
++
++  manager->ReleaseInputStream(this);
++}
++
++double SndioAudioInputStream::GetMaxVolume() {
++  // Not supported
++  return 0.0;
++}
++
++void SndioAudioInputStream::SetVolume(double volume) {
++  // Not supported. Do nothing.
++}
++
++double SndioAudioInputStream::GetVolume() {
++  // Not supported.
++  return 0.0;
++}
++
++bool SndioAudioInputStream::IsMuted() {
++  // Not supported.
++  return false;
++}
++
++void SndioAudioInputStream::SetOutputDeviceForAec(
++    const std::string& output_device_id) {
++  // Not supported.
++}
++
++void SndioAudioInputStream::ThreadLoop(void) {
++  size_t todo, n;
++  char *data;
++  unsigned int nframes;
++  double normalized_volume = 0.0;
++
++  nframes = audio_bus->frames();
++
++  while (state == kRunning && !sio_eof(hdl)) {
++
++    GetAgcVolume(&normalized_volume);
++
++    // read one block
++    todo = nframes * params.GetBytesPerFrame(kSampleFormat);
++    data = buffer;
++    while (todo > 0) {
++      n = sio_read(hdl, data, todo);
++      if (n == 0)
++        return;	// unrecoverable I/O error
++      todo -= n;
++      data += n;
++    }
++    hw_delay -= nframes;
++
++    // convert frames count to TimeDelta
++    const base::TimeDelta delay = AudioTimestampHelper::FramesToTime(hw_delay,
++      params.sample_rate());
++
++    // push into bus
++    audio_bus->FromInterleaved<SignedInt16SampleTypeTraits>(reinterpret_cast<int16_t*>(buffer), nframes);
++
++    // invoke callback
++    callback->OnData(audio_bus.get(), base::TimeTicks::Now() - delay, 1.);
++  }
++}
++
++}  // namespace media
+--- /dev/null
++++ b/src/3rdparty/chromium/media/audio/sndio/sndio_input.h
+@@ -0,0 +1,91 @@
++// Copyright 2013 The Chromium Authors. All rights reserved.
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++#ifndef MEDIA_AUDIO_SNDIO_SNDIO_INPUT_H_
++#define MEDIA_AUDIO_SNDIO_SNDIO_INPUT_H_
++
++#include <stdint.h>
++#include <string>
++#include <sndio.h>
++
++#include "base/compiler_specific.h"
++#include "base/macros.h"
++#include "base/memory/weak_ptr.h"
++#include "base/time/time.h"
++#include "media/audio/agc_audio_stream.h"
++#include "media/audio/audio_io.h"
++#include "media/audio/audio_device_description.h"
++#include "media/base/audio_parameters.h"
++
++namespace media {
++
++class AudioManagerBase;
++
++// Implementation of AudioOutputStream using sndio(7)
++class SndioAudioInputStream : public AgcAudioStream<AudioInputStream> {
++ public:
++  // Pass this to the constructor if you want to attempt auto-selection
++  // of the audio recording device.
++  static const char kAutoSelectDevice[];
++
++  // Create a PCM Output stream for the SNDIO device identified by
++  // |device_name|. If unsure of what to use for |device_name|, use
++  // |kAutoSelectDevice|.
++  SndioAudioInputStream(AudioManagerBase* audio_manager,
++                     const std::string& device_name,
++                     const AudioParameters& params);
++
++  ~SndioAudioInputStream() override;
++
++  // Implementation of AudioInputStream.
++  bool Open() override;
++  void Start(AudioInputCallback* callback) override;
++  void Stop() override;
++  void Close() override;
++  double GetMaxVolume() override;
++  void SetVolume(double volume) override;
++  double GetVolume() override;
++  bool IsMuted() override;
++  void SetOutputDeviceForAec(const std::string& output_device_id) override;
++
++ private:
++
++  enum StreamState {
++    kClosed,            // Not opened yet
++    kStopped,           // Device opened, but not started yet
++    kRunning,           // Started, device playing
++    kStopWait           // Stopping, waiting for the real-time thread to exit
++  };
++
++  // C-style call-backs
++  static void OnMoveCallback(void *arg, int delta);
++  static void* ThreadEntry(void *arg);
++
++  // Continuously moves data from the device to the consumer
++  void ThreadLoop();
++  // Our creator, the audio manager needs to be notified when we close.
++  AudioManagerBase* manager;
++  // Parameters of the source
++  AudioParameters params;
++  // We store data here for consumer
++  std::unique_ptr<AudioBus> audio_bus;
++  // Call-back that consumes recorded data
++  AudioInputCallback* callback;  // Valid during a recording session.
++  // Handle of the audio device
++  struct sio_hdl* hdl;
++  // Current state of the stream
++  enum StreamState state;
++  // High priority thread running ThreadLoop()
++  pthread_t thread;
++  // Number of frames buffered in the hardware
++  int hw_delay;
++  // Temporary buffer where data is stored sndio-compatible format
++  char* buffer;
++
++  DISALLOW_COPY_AND_ASSIGN(SndioAudioInputStream);
++};
++
++}  // namespace media
++
++#endif  // MEDIA_AUDIO_SNDIO_SNDIO_INPUT_H_
+--- /dev/null
++++ b/src/3rdparty/chromium/media/audio/sndio/sndio_output.cc
+@@ -0,0 +1,183 @@
++// Copyright (c) 2012 The Chromium Authors. All rights reserved.
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++#include "base/logging.h"
++#include "base/time/time.h"
++#include "base/time/default_tick_clock.h"
++#include "media/audio/audio_manager_base.h"
++#include "media/base/audio_timestamp_helper.h"
++#include "media/audio/sndio/sndio_output.h"
++
++namespace media {
++
++static const SampleFormat kSampleFormat = kSampleFormatS16;
++
++void SndioAudioOutputStream::OnMoveCallback(void *arg, int delta) {
++  SndioAudioOutputStream* self = static_cast<SndioAudioOutputStream*>(arg);
++
++  self->hw_delay -= delta;
++}
++
++void SndioAudioOutputStream::OnVolCallback(void *arg, unsigned int vol) {
++  SndioAudioOutputStream* self = static_cast<SndioAudioOutputStream*>(arg);
++
++  self->vol = vol;
++}
++
++void *SndioAudioOutputStream::ThreadEntry(void *arg) {
++  SndioAudioOutputStream* self = static_cast<SndioAudioOutputStream*>(arg);
++
++  self->ThreadLoop();
++  return NULL;
++}
++
++SndioAudioOutputStream::SndioAudioOutputStream(const AudioParameters& params,
++                                               AudioManagerBase* manager)
++    : manager(manager),
++      params(params),
++      audio_bus(AudioBus::Create(params)),
++      state(kClosed),
++      mutex(PTHREAD_MUTEX_INITIALIZER) {
++}
++
++SndioAudioOutputStream::~SndioAudioOutputStream() {
++  if (state != kClosed)
++    Close();
++}
++
++bool SndioAudioOutputStream::Open() {
++  struct sio_par par;
++  int sig;
++
++  if (params.format() != AudioParameters::AUDIO_PCM_LINEAR &&
++      params.format() != AudioParameters::AUDIO_PCM_LOW_LATENCY) {
++    LOG(WARNING) << "Unsupported audio format.";
++    return false;
++  }
++  sio_initpar(&par);
++  par.rate = params.sample_rate();
++  par.pchan = params.channels();
++  par.bits = SampleFormatToBitsPerChannel(kSampleFormat);
++  par.bps = par.bits / 8;
++  par.sig = sig = par.bits != 8 ? 1 : 0;
++  par.le = SIO_LE_NATIVE;
++  par.appbufsz = params.frames_per_buffer();
++
++  hdl = sio_open(SIO_DEVANY, SIO_PLAY, 0);
++  if (hdl == NULL) {
++    LOG(ERROR) << "Couldn't open audio device.";
++    return false;
++  }
++  if (!sio_setpar(hdl, &par) || !sio_getpar(hdl, &par)) {
++    LOG(ERROR) << "Couldn't set audio parameters.";
++    goto bad_close;
++  }
++  if (par.rate  != (unsigned int)params.sample_rate() ||
++      par.pchan != (unsigned int)params.channels() ||
++      par.bits  != (unsigned int)SampleFormatToBitsPerChannel(kSampleFormat) ||
++      par.sig   != (unsigned int)sig ||
++      (par.bps > 1 && par.le != SIO_LE_NATIVE) ||
++      (par.bits != par.bps * 8)) {
++    LOG(ERROR) << "Unsupported audio parameters.";
++    goto bad_close;
++  }
++  state = kStopped;
++  volpending = 0;
++  vol = 0;
++  buffer = new char[audio_bus->frames() * params.GetBytesPerFrame(kSampleFormat)];
++  sio_onmove(hdl, &OnMoveCallback, this);
++  sio_onvol(hdl, &OnVolCallback, this);
++  return true;
++ bad_close:
++  sio_close(hdl);
++  return false;
++}
++
++void SndioAudioOutputStream::Close() {
++  if (state == kClosed)
++    return;
++  if (state == kRunning)
++    Stop();
++  state = kClosed;
++  delete [] buffer;
++  sio_close(hdl);
++  manager->ReleaseOutputStream(this);  // Calls the destructor
++}
++
++void SndioAudioOutputStream::Start(AudioSourceCallback* callback) {
++  state = kRunning;
++  hw_delay = 0;
++  source = callback;
++  sio_start(hdl);
++  if (pthread_create(&thread, NULL, &ThreadEntry, this) != 0) {
++    LOG(ERROR) << "Failed to create real-time thread.";
++    sio_stop(hdl);
++    state = kStopped;
++  }
++}
++
++void SndioAudioOutputStream::Stop() {
++  if (state == kStopped)
++    return;
++  state = kStopWait;
++  pthread_join(thread, NULL);
++  sio_stop(hdl);
++  state = kStopped;
++}
++
++void SndioAudioOutputStream::SetVolume(double v) {
++  pthread_mutex_lock(&mutex);
++  vol = v * SIO_MAXVOL;
++  volpending = 1;
++  pthread_mutex_unlock(&mutex);
++}
++
++void SndioAudioOutputStream::GetVolume(double* v) {
++  pthread_mutex_lock(&mutex);
++  *v = vol * (1. / SIO_MAXVOL);
++  pthread_mutex_unlock(&mutex);
++}
++
++// This stream is always used with sub second buffer sizes, where it's
++// sufficient to simply always flush upon Start().
++void SndioAudioOutputStream::Flush() {}
++
++void SndioAudioOutputStream::ThreadLoop(void) {
++  int avail, count, result;
++
++  while (state == kRunning) {
++    // Update volume if needed
++    pthread_mutex_lock(&mutex);
++    if (volpending) {
++      volpending = 0;
++      sio_setvol(hdl, vol);
++    }
++    pthread_mutex_unlock(&mutex);
++
++    // Get data to play
++    const base::TimeDelta delay = AudioTimestampHelper::FramesToTime(hw_delay,
++	params.sample_rate());
++    count = source->OnMoreData(delay, base::TimeTicks::Now(), 0, audio_bus.get());
++    audio_bus->ToInterleaved<SignedInt16SampleTypeTraits>(count, reinterpret_cast<int16_t*>(buffer));
++    if (count == 0) {
++      // We have to submit something to the device
++      count = audio_bus->frames();
++      memset(buffer, 0, count * params.GetBytesPerFrame(kSampleFormat));
++      LOG(WARNING) << "No data to play, running empty cycle.";
++    }
++
++    // Submit data to the device
++    avail = count * params.GetBytesPerFrame(kSampleFormat);
++    result = sio_write(hdl, buffer, avail);
++    if (result == 0) {
++      LOG(WARNING) << "Audio device disconnected.";
++      break;
++    }
++
++    // Update hardware pointer
++    hw_delay += count;
++  }
++}
++
++}  // namespace media
+--- /dev/null
++++ b/src/3rdparty/chromium/media/audio/sndio/sndio_output.h
+@@ -0,0 +1,86 @@
++// Copyright (c) 2012 The Chromium Authors. All rights reserved.
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++#ifndef MEDIA_AUDIO_SNDIO_SNDIO_OUTPUT_H_
++#define MEDIA_AUDIO_SNDIO_SNDIO_OUTPUT_H_
++
++#include <pthread.h>
++#include <sndio.h>
++
++#include "base/time/tick_clock.h"
++#include "base/time/time.h"
++#include "media/audio/audio_io.h"
++
++namespace media {
++
++class AudioManagerBase;
++
++// Implementation of AudioOutputStream using sndio(7)
++class SndioAudioOutputStream : public AudioOutputStream {
++ public:
++  // The manager is creating this object
++  SndioAudioOutputStream(const AudioParameters& params,
++                         AudioManagerBase* manager);
++  virtual ~SndioAudioOutputStream();
++
++  // Implementation of AudioOutputStream.
++  bool Open() override;
++  void Close() override;
++  void Start(AudioSourceCallback* callback) override;
++  void Stop() override;
++  void SetVolume(double volume) override;
++  void GetVolume(double* volume) override;
++  void Flush() override;
++
++  friend void sndio_onmove(void *arg, int delta);
++  friend void sndio_onvol(void *arg, unsigned int vol);
++  friend void *sndio_threadstart(void *arg);
++
++ private:
++  enum StreamState {
++    kClosed,            // Not opened yet
++    kStopped,           // Device opened, but not started yet
++    kRunning,           // Started, device playing
++    kStopWait           // Stopping, waiting for the real-time thread to exit
++  };
++
++  // C-style call-backs
++  static void OnMoveCallback(void *arg, int delta);
++  static void OnVolCallback(void *arg, unsigned int vol);
++  static void* ThreadEntry(void *arg);
++
++  // Continuously moves data from the producer to the device
++  void ThreadLoop(void);
++
++  // Our creator, the audio manager needs to be notified when we close.
++  AudioManagerBase* manager;
++  // Parameters of the source
++  AudioParameters params;
++  // Source stores data here
++  std::unique_ptr<AudioBus> audio_bus;
++  // Call-back that produces data to play
++  AudioSourceCallback* source;
++  // Handle of the audio device
++  struct sio_hdl* hdl;
++  // Current state of the stream
++  enum StreamState state;
++  // High priority thread running ThreadLoop()
++  pthread_t thread;
++  // Protects vol, volpending and hw_delay
++  pthread_mutex_t mutex;
++  // Current volume in the 0..SIO_MAXVOL range
++  int vol;
++  // Set to 1 if volumes must be refreshed in the realtime thread
++  int volpending;
++  // Number of frames buffered in the hardware
++  int hw_delay;
++  // Temporary buffer where data is stored sndio-compatible format
++  char* buffer;
++
++  DISALLOW_COPY_AND_ASSIGN(SndioAudioOutputStream);
++};
++
++}  // namespace media
++
++#endif  // MEDIA_AUDIO_SNDIO_SNDIO_OUTPUT_H_
+--- a/src/3rdparty/chromium/media/media_options.gni
++++ b/src/3rdparty/chromium/media/media_options.gni
+@@ -121,6 +121,9 @@ declare_args() {
+   # Enables runtime selection of ALSA library for audio.
+   use_alsa = false
+ 
++  # Enable runtime selection of sndio(7)
++  use_sndio = false
++
+   # Alsa should be used on non-Android, non-Mac POSIX systems.
+   # Alsa should be used on desktop Chromecast and audio-only Chromecast builds.
+   if (is_posix && !is_android && !is_mac &&
diff --git a/srcpkgs/qt6-webengine/patches/0700-armv7l-neon.patch b/srcpkgs/qt6-webengine/patches/0700-armv7l-neon.patch
new file mode 100644
index 000000000000..d42fa19a07a1
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0700-armv7l-neon.patch
@@ -0,0 +1,10 @@
+--- a/src/3rdparty/chromium/skia/BUILD.gn
++++ b/src/3rdparty/chromium/skia/BUILD.gn
+@@ -800,7 +800,6 @@ skia_source_set("skia_opts") {
+         # Root build config sets -mfpu=$arm_fpu, which we expect to be neon
+         # when running this.
+         if (!arm_use_neon) {
+-          configs -= [ "//build/config/compiler:compiler_arm_fpu" ]
+           cflags += [ "-mfpu=neon" ]
+         }
+       }
diff --git a/srcpkgs/qt6-webengine/patches/0750-chromium-musl-arm-user_vfp.patch b/srcpkgs/qt6-webengine/patches/0750-chromium-musl-arm-user_vfp.patch
new file mode 100644
index 000000000000..6e2d62f35ee6
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0750-chromium-musl-arm-user_vfp.patch
@@ -0,0 +1,20 @@
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/util/linux/thread_info.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/util/linux/thread_info.h
+@@ -17,6 +17,17 @@
+ 
+ #include <stdint.h>
+ #include <sys/user.h>
++#if !defined(__GLIBC__)
++struct user_vfp {
++	unsigned long long fpregs[32];
++	unsigned long fpscr;
++};
++struct user_vfp_exc {
++	unsigned long fpexc;
++	unsigned long fpinst;
++	unsigned long fpinst2;
++};
++#endif /* !defined(__GLIBC__) */
+ 
+ #include <type_traits>
+ 
diff --git a/srcpkgs/qt6-webengine/patches/0751-chromium-musl-arm-elf_auxv_t.patch b/srcpkgs/qt6-webengine/patches/0751-chromium-musl-arm-elf_auxv_t.patch
new file mode 100644
index 000000000000..7112c8cfd3fa
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0751-chromium-musl-arm-elf_auxv_t.patch
@@ -0,0 +1,18 @@
+--- a/src/3rdparty/chromium/v8/src/base/cpu.cc
++++ b/src/3rdparty/chromium/v8/src/base/cpu.cc
+@@ -163,6 +163,15 @@ static V8_INLINE void __cpuid(int cpu_in
+ 
+ #if V8_HOST_ARCH_ARM || V8_HOST_ARCH_ARM64
+ 
++#ifndef __GLIBC__
++#include <elf.h>
++#ifdef __LP64__
++typedef Elf64_auxv_t elf_auxv_t;
++#else
++typedef Elf32_auxv_t elf_auxv_t;
++#endif
++#endif
++
+ static uint32_t ReadELFHWCaps() {
+   uint32_t result = 0;
+ #if V8_GLIBC_PREREQ(2, 16)
diff --git a/srcpkgs/qt6-webengine/patches/0801-chromium-i686-vaapi-fpermissive.patch b/srcpkgs/qt6-webengine/patches/0801-chromium-i686-vaapi-fpermissive.patch
new file mode 100644
index 000000000000..3d4043e03b89
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0801-chromium-i686-vaapi-fpermissive.patch
@@ -0,0 +1,24 @@
+--- a/src/3rdparty/chromium/media/gpu/vaapi/BUILD.gn
++++ b/src/3rdparty/chromium/media/gpu/vaapi/BUILD.gn
+@@ -14,6 +14,10 @@ import("//ui/gl/features.gni")
+ assert(is_linux || is_chromeos)
+ assert(use_vaapi)
+ 
++config("vaapi_permissive") {
++  cflags = [ "-fpermissive" ]
++}
++
+ generate_stubs("libva_stubs") {
+   extra_header = "va_stub_header.fragment"
+   sigs = [ "va.sigs" ]
+@@ -136,6 +140,10 @@ source_set("vaapi") {
+     ]
+   }
+ 
++  if (target_cpu == "x86") {
++    configs += [ ":vaapi_permissive" ]
++  }
++
+   if (use_x11) {
+     deps += [ "//ui/gfx/x" ]
+     sources += [
diff --git a/srcpkgs/qt6-webengine/patches/0900-xxx-ppc64le-libvpx.patch b/srcpkgs/qt6-webengine/patches/0900-xxx-ppc64le-libvpx.patch
new file mode 100644
index 000000000000..5c9566b56bd4
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0900-xxx-ppc64le-libvpx.patch
@@ -0,0 +1,65 @@
+Uses generic target for now. To use ppc64le, change --target to ppc64le-gnu
+and add --enable-vsx, and change generic to ppc for the rtcd header.
+
+From 18e6c5c55cfae0cfb458d8210d7bc709360a0e90 Mon Sep 17 00:00:00 2001
+From: q66 <daniel@octaforge.org>
+Date: Wed, 9 Sep 2020 19:08:25 +0200
+Subject: [PATCH] enable generation of ppc64 libvpx bits
+
+this doesn't update the gni file, that's done from
+the template by running the appropriate scripts
+---
+ third_party/libvpx/BUILD.gn        | 4 ++++
+ third_party/libvpx/generate_gni.sh | 9 +++++++++
+ 2 files changed, 13 insertions(+)
+
+--- a/src/3rdparty/chromium/third_party/libvpx/BUILD.gn
++++ b/src/3rdparty/chromium/third_party/libvpx/BUILD.gn
+@@ -424,6 +424,8 @@ static_library("bundled_libvpx") {
+       sources = libvpx_srcs_arm64
+       public_deps = [ ":libvpx_arm64_headers" ]
+     }
++  } else if (current_cpu == "ppc64") {
++    sources = libvpx_srcs_ppc64
+   }
+ 
+   configs -= [ "//build/config/compiler:chromium_code" ]
+--- a/src/3rdparty/chromium/third_party/libvpx/generate_gni.sh
++++ b/src/3rdparty/chromium/third_party/libvpx/generate_gni.sh
+@@ -374,6 +374,7 @@ gen_config_files linux/arm-neon-highbd "
+ gen_config_files linux/arm64-highbd "--target=armv8-linux-gcc ${all_platforms} ${HIGHBD}"
+ gen_config_files linux/mipsel "--target=mips32-linux-gcc ${all_platforms}"
+ gen_config_files linux/mips64el "--target=mips64-linux-gcc ${all_platforms}"
++gen_config_files linux/ppc64 "--target=generic-gnu $HIGHBD ${all_platforms}"
+ gen_config_files linux/generic "--target=generic-gnu $HIGHBD ${all_platforms}"
+ gen_config_files win/arm64 "--target=arm64-win64-vs15 ${all_platforms} ${HIGHBD}"
+ gen_config_files win/ia32 "--target=x86-win32-vs14 ${all_platforms} ${x86_platforms}"
+@@ -399,6 +400,7 @@ lint_config linux/arm-neon-highbd
+ lint_config linux/arm64-highbd
+ lint_config linux/mipsel
+ lint_config linux/mips64el
++lint_config linux/ppc64
+ lint_config linux/generic
+ lint_config win/arm64
+ lint_config win/ia32
+@@ -428,6 +430,7 @@ gen_rtcd_header linux/arm-neon-highbd ar
+ gen_rtcd_header linux/arm64-highbd armv8
+ gen_rtcd_header linux/mipsel mipsel
+ gen_rtcd_header linux/mips64el mips64el
++gen_rtcd_header linux/ppc64 generic
+ gen_rtcd_header linux/generic generic
+ gen_rtcd_header win/arm64 armv8
+ gen_rtcd_header win/ia32 x86 "${require_sse2}"
+@@ -513,6 +516,12 @@ if [ -z $ONLY_CONFIGS ]; then
+ 
+   echo "MIPS64 source list is identical to MIPS source list. No need to generate it."
+ 
++  echo "Generate ppc64 source list."
++  config=$(print_config_basic linux/ppc64)
++  make_clean
++  make libvpx_srcs.txt target=libs $config > /dev/null
++  convert_srcs_to_project_files libvpx_srcs.txt libvpx_srcs_ppc64
++
+   echo "Generate NaCl source list."
+   config=$(print_config_basic nacl)
+   make_clean
diff --git a/srcpkgs/qt6-webengine/patches/0901-xxx-ppc64le-sandbox-linux-stat.patch b/srcpkgs/qt6-webengine/patches/0901-xxx-ppc64le-sandbox-linux-stat.patch
new file mode 100644
index 000000000000..4b8e6320601c
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0901-xxx-ppc64le-sandbox-linux-stat.patch
@@ -0,0 +1,31 @@
+--- a/src/3rdparty/chromium/sandbox/linux/system_headers/linux_stat.h
++++ b/src/3rdparty/chromium/sandbox/linux/system_headers/linux_stat.h
+@@ -155,6 +155,28 @@ struct kernel_stat {
+   unsigned int __unused4;
+   unsigned int __unused5;
+ };
++#elif defined(__powerpc64__)
++struct kernel_stat {
++  unsigned long	st_dev;
++  unsigned long	st_ino;
++  unsigned long	st_nlink;
++  unsigned int	st_mode;
++  unsigned int	st_uid;
++  unsigned int	st_gid;
++  unsigned long	st_rdev;
++  long		st_size;
++  unsigned long	st_blksize;
++  unsigned long	st_blocks;
++  unsigned long	st_atime_;
++  unsigned long	st_atime_nsec_;
++  unsigned long	st_mtime_;
++  unsigned long	st_mtime_nsec_;
++  unsigned long	st_ctime_;
++  unsigned long	st_ctime_nsec_;
++  unsigned long	__unused4;
++  unsigned long	__unused5;
++  unsigned long	__unused6;
++};
+ #endif
+ 
+ #if !defined(AT_EMPTY_PATH)
diff --git a/srcpkgs/qt6-webengine/patches/0902-xxx-ppc64le-support.patch b/srcpkgs/qt6-webengine/patches/0902-xxx-ppc64le-support.patch
new file mode 100644
index 000000000000..60503c22e36b
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0902-xxx-ppc64le-support.patch
@@ -0,0 +1,3559 @@
+commit 2c013a317b1114ef67cdbbc30824b28907b9ea94
+Author: Daniel Kolesa <daniel@octaforge.org>
+Date:   Wed Mar 3 19:08:29 2021 +0100
+
+    ppc64le support
+
+--- a/src/3rdparty/chromium/sandbox/features.gni
++++ b/src/3rdparty/chromium/sandbox/features.gni
+@@ -11,7 +11,8 @@ import("//build/config/nacl/config.gni")
+ use_seccomp_bpf = (is_linux || is_chromeos || is_android) &&
+                   (current_cpu == "x86" || current_cpu == "x64" ||
+                    current_cpu == "arm" || current_cpu == "arm64" ||
+-                   current_cpu == "mipsel" || current_cpu == "mips64el")
++                   current_cpu == "mipsel" || current_cpu == "mips64el" ||
++                   current_cpu == "ppc64")
+ 
+ use_seccomp_bpf = use_seccomp_bpf || is_nacl_nonsfi
+ 
+--- a/src/3rdparty/chromium/sandbox/linux/BUILD.gn
++++ b/src/3rdparty/chromium/sandbox/linux/BUILD.gn
+@@ -433,6 +433,8 @@ component("sandbox_services") {
+ 
+ source_set("sandbox_services_headers") {
+   sources = [
++    "system_headers/ppc64_linux_syscalls.h",
++    "system_headers/ppc64_linux_ucontext.h",
+     "system_headers/arm64_linux_syscalls.h",
+     "system_headers/arm_linux_syscalls.h",
+     "system_headers/arm_linux_ucontext.h",
+--- a/src/3rdparty/chromium/sandbox/linux/bpf_dsl/linux_syscall_ranges.h
++++ b/src/3rdparty/chromium/sandbox/linux/bpf_dsl/linux_syscall_ranges.h
+@@ -56,6 +56,13 @@
+ #define MAX_PUBLIC_SYSCALL __NR_syscalls
+ #define MAX_SYSCALL MAX_PUBLIC_SYSCALL
+ 
++#elif defined(__powerpc64__)
++
++#include <asm/unistd.h>
++#define MIN_SYSCALL 0u
++#define MAX_PUBLIC_SYSCALL 386u
++#define MAX_SYSCALL MAX_PUBLIC_SYSCALL
++
+ #else
+ #error "Unsupported architecture"
+ #endif
+--- a/src/3rdparty/chromium/sandbox/linux/bpf_dsl/seccomp_macros.h
++++ b/src/3rdparty/chromium/sandbox/linux/bpf_dsl/seccomp_macros.h
+@@ -16,6 +16,9 @@
+ #if defined(__mips__)
+ // sys/user.h in eglibc misses size_t definition
+ #include <stddef.h>
++#elif defined(__powerpc64__) && defined(__GLIBC__)
++// Manually define greg_t on ppc64
++typedef unsigned long long greg_t;
+ #endif
+ #endif
+ 
+@@ -346,6 +349,59 @@ struct regs_struct {
+ #define SECCOMP_PT_PARM4(_regs) (_regs).regs[3]
+ #define SECCOMP_PT_PARM5(_regs) (_regs).regs[4]
+ #define SECCOMP_PT_PARM6(_regs) (_regs).regs[5]
++
++#elif defined(__powerpc64__)
++#include <asm/ptrace.h>
++
++typedef struct pt_regs regs_struct;
++
++#ifdef ARCH_CPU_LITTLE_ENDIAN
++#define SECCOMP_ARCH AUDIT_ARCH_PPC64LE
++#else
++#define SECCOMP_ARCH AUDIT_ARCH_PPC64
++#endif
++
++#ifdef __GLIBC__
++#define SECCOMP_REG(_ctx, _reg) ((_ctx)->uc_mcontext.regs->gpr[_reg])
++#else
++#define SECCOMP_REG(_ctx, _reg) (((struct pt_regs *)(_ctx)->uc_mcontext.regs)->gpr[_reg])
++#endif
++
++#define SECCOMP_RESULT(_ctx) SECCOMP_REG(_ctx, 3)
++#define SECCOMP_SYSCALL(_ctx) SECCOMP_REG(_ctx, 0)
++#ifdef __GLIBC__
++#define SECCOMP_IP(_ctx) (_ctx)->uc_mcontext.regs->nip
++#else
++#define SECCOMP_IP(_ctx) ((struct pt_regs *)(_ctx)->uc_mcontext.regs)->nip
++#endif
++#define SECCOMP_PARM1(_ctx) SECCOMP_REG(_ctx, 3)
++#define SECCOMP_PARM2(_ctx) SECCOMP_REG(_ctx, 4)
++#define SECCOMP_PARM3(_ctx) SECCOMP_REG(_ctx, 5)
++#define SECCOMP_PARM4(_ctx) SECCOMP_REG(_ctx, 6)
++#define SECCOMP_PARM5(_ctx) SECCOMP_REG(_ctx, 7)
++#define SECCOMP_PARM6(_ctx) SECCOMP_REG(_ctx, 8)
++
++#define SECCOMP_NR_IDX (offsetof(struct arch_seccomp_data, nr))
++#define SECCOMP_ARCH_IDX (offsetof(struct arch_seccomp_data, arch))
++#define SECCOMP_IP_MSB_IDX \
++  (offsetof(struct arch_seccomp_data, instruction_pointer) + 4)
++#define SECCOMP_IP_LSB_IDX \
++  (offsetof(struct arch_seccomp_data, instruction_pointer) + 0)
++#define SECCOMP_ARG_MSB_IDX(nr) \
++  (offsetof(struct arch_seccomp_data, args) + 8 * (nr) + 4)
++#define SECCOMP_ARG_LSB_IDX(nr) \
++  (offsetof(struct arch_seccomp_data, args) + 8 * (nr) + 0)
++
++#define SECCOMP_PT_RESULT(_regs) (_regs).gpr[3]
++#define SECCOMP_PT_SYSCALL(_regs) (_regs).gpr[0]
++#define SECCOMP_PT_IP(_regs) (_regs).nip
++#define SECCOMP_PT_PARM1(_regs) (_regs).gpr[3]
++#define SECCOMP_PT_PARM2(_regs) (_regs).gpr[4]
++#define SECCOMP_PT_PARM3(_regs) (_regs).gpr[5]
++#define SECCOMP_PT_PARM4(_regs) (_regs).gpr[6]
++#define SECCOMP_PT_PARM5(_regs) (_regs).gpr[7]
++#define SECCOMP_PT_PARM6(_regs) (_regs).gpr[8]
++
+ #else
+ #error Unsupported target platform
+ 
+--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc
++++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc
+@@ -91,7 +91,8 @@ bool IsBaselinePolicyWatched(int sysno)
+          SyscallSets::IsPrctl(sysno) ||
+          SyscallSets::IsProcessGroupOrSession(sysno) ||
+ #if defined(__i386__) || \
+-    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
++    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
++    defined(__powerpc64__)
+          SyscallSets::IsSocketCall(sysno) ||
+ #endif
+ #if defined(__arm__)
+@@ -258,7 +259,7 @@ ResultExpr EvaluateSyscallImpl(int fs_de
+   }
+ 
+ #if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
+-    defined(__aarch64__)
++    defined(__aarch64__) || defined(__powerpc64__)
+   if (sysno == __NR_mmap)
+     return RestrictMmapFlags();
+ #endif
+@@ -279,7 +280,7 @@ ResultExpr EvaluateSyscallImpl(int fs_de
+     return RestrictPrctl();
+ 
+ #if defined(__x86_64__) || defined(__arm__) || defined(__mips__) || \
+-    defined(__aarch64__)
++    defined(__aarch64__) || defined(__powerpc64__)
+   if (sysno == __NR_socketpair) {
+     // Only allow AF_UNIX, PF_UNIX. Crash if anything else is seen.
+     static_assert(AF_UNIX == PF_UNIX,
+@@ -343,7 +344,8 @@ ResultExpr EvaluateSyscallImpl(int fs_de
+   }
+ 
+ #if defined(__i386__) || \
+-    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
++    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
++    defined(__powerpc64__)
+   if (SyscallSets::IsSocketCall(sysno))
+     return RestrictSocketcallCommand();
+ #endif
+--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/baseline_policy_unittest.cc
++++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/baseline_policy_unittest.cc
+@@ -317,7 +317,7 @@ TEST_BASELINE_SIGSYS(__NR_sysinfo)
+ TEST_BASELINE_SIGSYS(__NR_syslog)
+ TEST_BASELINE_SIGSYS(__NR_timer_create)
+ 
+-#if !defined(__aarch64__)
++#if !defined(__aarch64__) && !defined(__powerpc64__)
+ TEST_BASELINE_SIGSYS(__NR_inotify_init)
+ TEST_BASELINE_SIGSYS(__NR_vserver)
+ #endif
+--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc
++++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc
+@@ -40,7 +40,8 @@
+ #include <sys/ptrace.h>
+ #if (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) && \
+     !defined(__arm__) && !defined(__aarch64__) &&           \
+-    !defined(PTRACE_GET_THREAD_AREA)
++    !defined(PTRACE_GET_THREAD_AREA) &&			    \
++    !defined(__powerpc64__)
+ // Also include asm/ptrace-abi.h since ptrace.h in older libc (for instance
+ // the one in Ubuntu 16.04 LTS) is missing PTRACE_GET_THREAD_AREA.
+ // asm/ptrace-abi.h doesn't exist on arm32 and PTRACE_GET_THREAD_AREA isn't
+@@ -49,6 +50,11 @@
+ #endif
+ #endif  // !OS_NACL_NONSFI
+ 
++// On PPC64, TCGETS is defined in terms of struct termios, so we must include termios.h
++#ifdef __powerpc64__
++#include <termios.h>
++#endif
++
+ #if defined(OS_ANDROID)
+ 
+ #if !defined(F_DUPFD_CLOEXEC)
+@@ -106,6 +112,14 @@ inline bool IsArchitectureMips() {
+ #endif
+ }
+ 
++inline bool IsArchitecturePPC64() {
++#if defined(__powerpc64__)
++  return true;
++#else
++  return false;
++#endif
++}
++
+ // Ubuntu's version of glibc has a race condition in sem_post that can cause
+ // it to call futex(2) with bogus op arguments. To workaround this, we need
+ // to allow those futex(2) calls to fail with EINVAL, instead of crashing the
+@@ -270,6 +284,8 @@ ResultExpr RestrictFcntlCommands() {
+   uint64_t kOLargeFileFlag = O_LARGEFILE;
+   if (IsArchitectureX86_64() || IsArchitectureI386() || IsArchitectureMips())
+     kOLargeFileFlag = 0100000;
++  else if (IsArchitecturePPC64())
++    kOLargeFileFlag = 0200000;
+ 
+   const Arg<int> cmd(1);
+   const Arg<long> long_arg(2);
+@@ -287,7 +303,16 @@ ResultExpr RestrictFcntlCommands() {
+               F_SETLKW,
+               F_GETLK,
+               F_DUPFD,
+-              F_DUPFD_CLOEXEC),
++              F_DUPFD_CLOEXEC
++#if defined(__powerpc64__)
++// On PPC64, F_SETLK, F_GETLK, F_SETLKW are defined as the 64-bit variants
++// but glibc will sometimes still use the 32-bit versions. Allow both.
++              ,
++              5, /* F_GETLK (32) */
++              6, /* F_SETLK (32) */
++              7  /* F_SETLKW (32) */
++#endif
++	     ),
+              Allow())
+       .Case(F_SETFL,
+             If((long_arg & ~kAllowedMask) == 0, Allow()).Else(CrashSIGSYS()))
+@@ -297,7 +322,7 @@ ResultExpr RestrictFcntlCommands() {
+   // clang-format on
+ }
+ 
+-#if defined(__i386__) || defined(__mips__)
++#if defined(__i386__) || defined(__mips__) || defined(__powerpc64__)
+ ResultExpr RestrictSocketcallCommand() {
+   // Unfortunately, we are unable to restrict the first parameter to
+   // socketpair(2). Whilst initially sounding bad, it's noteworthy that very
+@@ -454,7 +479,7 @@ ResultExpr RestrictPtrace() {
+ #endif
+   return Switch(request)
+       .CASES((
+-#if !defined(__aarch64__)
++#if !defined(__aarch64__) && !defined(__powerpc64__)
+                  PTRACE_GETREGS, PTRACE_GETFPREGS,
+ #if defined(TRACE_GET_THREAD_AREA)
+                  PTRACE_GET_THREAD_AREA,
+--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.h
++++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.h
+@@ -49,7 +49,7 @@ SANDBOX_EXPORT bpf_dsl::ResultExpr Restr
+ // O_NONBLOCK | O_SYNC | O_LARGEFILE | O_CLOEXEC | O_NOATIME.
+ SANDBOX_EXPORT bpf_dsl::ResultExpr RestrictFcntlCommands();
+ 
+-#if defined(__i386__) || defined(__mips__)
++#if defined(__i386__) || defined(__mips__) || defined(__powerpc64__)
+ // Restrict socketcall(2) to only allow socketpair(2), send(2), recv(2),
+ // sendto(2), recvfrom(2), shutdown(2), sendmsg(2) and recvmsg(2).
+ SANDBOX_EXPORT bpf_dsl::ResultExpr RestrictSocketcallCommand();
+--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
++++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
+@@ -28,7 +28,7 @@ bool SyscallSets::IsKill(int sysno) {
+ bool SyscallSets::IsAllowedGettime(int sysno) {
+   switch (sysno) {
+     case __NR_gettimeofday:
+-#if defined(__i386__) || defined(__x86_64__) || \
++#if defined(__i386__) || defined(__x86_64__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_time:
+ #endif
+@@ -51,12 +51,12 @@ bool SyscallSets::IsAllowedGettime(int s
+                                     // filtered by RestrictClockID().
+     case __NR_clock_nanosleep_time64:  // Parameters filtered by RestrictClockID().
+ #endif
+-#if defined(__i386__) || \
++#if defined(__i386__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_ftime:  // Obsolete.
+ #endif
+     case __NR_settimeofday:  // Privileged.
+-#if defined(__i386__) || \
++#if defined(__i386__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_stime:
+ #endif
+@@ -135,7 +135,7 @@ bool SyscallSets::IsFileSystem(int sysno
+     case __NR_faccessat:  // EPERM not a valid errno.
+     case __NR_fchmodat:
+     case __NR_fchownat:  // Should be called chownat ?
+-#if defined(__x86_64__) || defined(__aarch64__)
++#if defined(__x86_64__) || defined(__aarch64__) || defined(__powerpc64__)
+     case __NR_newfstatat:  // fstatat(). EPERM not a valid errno.
+ #elif defined(__i386__) || defined(__arm__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+@@ -154,7 +154,7 @@ bool SyscallSets::IsFileSystem(int sysno
+     case __NR_memfd_create:
+     case __NR_mkdirat:
+     case __NR_mknodat:
+-#if defined(__i386__)
++#if defined(__i386__) || defined(__powerpc64__)
+     case __NR_oldlstat:
+     case __NR_oldstat:
+ #endif
+@@ -167,7 +167,7 @@ bool SyscallSets::IsFileSystem(int sysno
+     case __NR_stat64:
+ #endif
+     case __NR_statfs:  // EPERM not a valid errno.
+-#if defined(__i386__) || defined(__arm__) || \
++#if defined(__i386__) || defined(__arm__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_statfs64:
+ #endif
+@@ -179,7 +179,8 @@ bool SyscallSets::IsFileSystem(int sysno
+     case __NR_truncate64:
+ #endif
+     case __NR_unlinkat:
+-#if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
++#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
++    defined(__powerpc64__)
+     case __NR_utime:
+ #endif
+     case __NR_utimensat:  // New.
+@@ -204,7 +205,8 @@ bool SyscallSets::IsAllowedFileSystemAcc
+ #endif
+       return true;
+ // TODO(jln): these should be denied gracefully as well (moved below).
+-#if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
++#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
++    defined(__powerpc64__)
+     case __NR_fadvise64:  // EPERM not a valid errno.
+ #endif
+ #if defined(__i386__)
+@@ -216,12 +218,12 @@ bool SyscallSets::IsAllowedFileSystemAcc
+     case __NR_fdatasync:  // EPERM not a valid errno.
+     case __NR_flock:      // EPERM not a valid errno.
+     case __NR_fstatfs:    // Give information about the whole filesystem.
+-#if defined(__i386__) || defined(__arm__) || \
++#if defined(__i386__) || defined(__arm__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_fstatfs64:
+ #endif
+     case __NR_fsync:  // EPERM not a valid errno.
+-#if defined(__i386__)
++#if defined(__i386__) || defined(__powerpc64__)
+     case __NR_oldfstat:
+ #endif
+ #if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
+@@ -229,6 +231,8 @@ bool SyscallSets::IsAllowedFileSystemAcc
+     case __NR_sync_file_range:  // EPERM not a valid errno.
+ #elif defined(__arm__)
+     case __NR_arm_sync_file_range:  // EPERM not a valid errno.
++#elif defined(__powerpc64__)
++    case __NR_sync_file_range2: // EPERM not a valid errno.
+ #endif
+     default:
+       return false;
+@@ -248,7 +252,7 @@ bool SyscallSets::IsDeniedFileSystemAcce
+     case __NR_getdents:    // EPERM not a valid errno.
+ #endif
+     case __NR_getdents64:  // EPERM not a valid errno.
+-#if defined(__i386__) || \
++#if defined(__i386__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_readdir:
+ #endif
+@@ -290,7 +294,7 @@ bool SyscallSets::IsGetSimpleId(int sysn
+ bool SyscallSets::IsProcessPrivilegeChange(int sysno) {
+   switch (sysno) {
+     case __NR_capset:
+-#if defined(__i386__) || defined(__x86_64__)
++#if defined(__i386__) || defined(__x86_64__) || defined(__powerpc64__)
+     case __NR_ioperm:  // Intel privilege.
+     case __NR_iopl:    // Intel privilege.
+ #endif
+@@ -340,7 +344,7 @@ bool SyscallSets::IsAllowedSignalHandlin
+     case __NR_rt_sigprocmask:
+     case __NR_rt_sigreturn:
+     case __NR_rt_sigtimedwait:
+-#if defined(__i386__) || defined(__arm__) || \
++#if defined(__i386__) || defined(__arm__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_rt_sigtimedwait_time64:
+     case __NR_sigaction:
+@@ -357,7 +361,7 @@ bool SyscallSets::IsAllowedSignalHandlin
+     case __NR_signalfd:
+ #endif
+     case __NR_signalfd4:
+-#if defined(__i386__) || defined(__arm__) || \
++#if defined(__i386__) || defined(__arm__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_sigpending:
+     case __NR_sigsuspend:
+@@ -382,7 +386,7 @@ bool SyscallSets::IsAllowedOperationOnFd
+ #endif
+     case __NR_dup3:
+ #if defined(__x86_64__) || defined(__arm__) || defined(__mips__) || \
+-    defined(__aarch64__)
++    defined(__aarch64__) || defined(__powerpc64__)
+     case __NR_shutdown:
+ #endif
+       return true;
+@@ -416,7 +420,7 @@ bool SyscallSets::IsAllowedProcessStartO
+     case __NR_membarrier:
+     case __NR_wait4:
+     case __NR_waitid:
+-#if defined(__i386__)
++#if defined(__i386__) || defined(__powerpc64__)
+     case __NR_waitpid:
+ #endif
+ #if !defined(__GLIBC__)
+@@ -438,7 +442,7 @@ bool SyscallSets::IsAllowedProcessStartO
+     case __NR_set_tid_address:
+ #endif
+     case __NR_unshare:
+-#if !defined(__mips__) && !defined(__aarch64__)
++#if !defined(__mips__) && !defined(__aarch64__) || defined(__powerpc64__)
+     case __NR_vfork:
+ #endif
+     default:
+@@ -491,7 +495,7 @@ bool SyscallSets::IsAllowedGetOrModifySo
+       return true;
+     default:
+ #if defined(__x86_64__) || defined(__arm__) || defined(__mips__) || \
+-    defined(__aarch64__)
++    defined(__aarch64__) || defined(__powerpc64__)
+     case __NR_socketpair:  // We will want to inspect its argument.
+ #endif
+       return false;
+@@ -501,7 +505,7 @@ bool SyscallSets::IsAllowedGetOrModifySo
+ bool SyscallSets::IsDeniedGetOrModifySocket(int sysno) {
+   switch (sysno) {
+ #if defined(__x86_64__) || defined(__arm__) || defined(__mips__) || \
+-    defined(__aarch64__)
++    defined(__aarch64__) || defined(__powerpc64__)
+     case __NR_accept:
+     case __NR_accept4:
+     case __NR_bind:
+@@ -515,7 +519,7 @@ bool SyscallSets::IsDeniedGetOrModifySoc
+   }
+ }
+ 
+-#if defined(__i386__) || \
++#if defined(__i386__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+ // Big multiplexing system call for sockets.
+ bool SyscallSets::IsSocketCall(int sysno) {
+@@ -530,7 +534,8 @@ bool SyscallSets::IsSocketCall(int sysno
+ }
+ #endif
+ 
+-#if defined(__x86_64__) || defined(__arm__) || defined(__mips__)
++#if defined(__x86_64__) || defined(__arm__) || defined(__mips__) || \
++    defined(__powerpc64__)
+ bool SyscallSets::IsNetworkSocketInformation(int sysno) {
+   switch (sysno) {
+     case __NR_getpeername:
+@@ -558,7 +563,7 @@ bool SyscallSets::IsAllowedAddressSpaceA
+     case __NR_mincore:
+     case __NR_mlockall:
+ #if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
+-    defined(__aarch64__)
++    defined(__aarch64__) || defined(__powerpc64__)
+     case __NR_mmap:
+ #endif
+ #if defined(__i386__) || defined(__arm__) || \
+@@ -589,7 +594,7 @@ bool SyscallSets::IsAllowedAddressSpaceA
+ bool SyscallSets::IsAllowedGeneralIo(int sysno) {
+   switch (sysno) {
+     case __NR_lseek:
+-#if defined(__i386__) || defined(__arm__) || \
++#if defined(__i386__) || defined(__arm__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR__llseek:
+ #endif
+@@ -609,27 +614,27 @@ bool SyscallSets::IsAllowedGeneralIo(int
+     case __NR_read:
+     case __NR_readv:
+     case __NR_pread64:
+-#if defined(__arm__) || \
++#if defined(__arm__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_recv:
+ #endif
+ #if defined(__x86_64__) || defined(__arm__) || defined(__mips__) || \
+-    defined(__aarch64__)
++    defined(__aarch64__) || defined(__powerpc64__)
+     case __NR_recvfrom:  // Could specify source.
+     case __NR_recvmsg:   // Could specify source.
+ #endif
+-#if defined(__i386__) || defined(__x86_64__)
++#if defined(__i386__) || defined(__x86_64__) || defined(__powerpc64__)
+     case __NR_select:
+ #endif
+-#if defined(__i386__) || defined(__arm__) || defined(__mips__)
++#if defined(__i386__) || defined(__arm__) || defined(__mips__) || defined(__powerpc64__)
+     case __NR__newselect:
+ #endif
+-#if defined(__arm__) || \
++#if defined(__arm__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_send:
+ #endif
+ #if defined(__x86_64__) || defined(__arm__) || defined(__mips__) || \
+-    defined(__aarch64__)
++    defined(__aarch64__) || defined(__powerpc64__)
+     case __NR_sendmsg:  // Could specify destination.
+     case __NR_sendto:   // Could specify destination.
+ #endif
+@@ -684,7 +689,7 @@ bool SyscallSets::IsAllowedBasicSchedule
+     case __NR_nanosleep:
+       return true;
+     case __NR_getpriority:
+-#if defined(__i386__) || defined(__arm__) || \
++#if defined(__i386__) || defined(__arm__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_nice:
+ #endif
+@@ -696,7 +701,7 @@ bool SyscallSets::IsAllowedBasicSchedule
+ 
+ bool SyscallSets::IsAdminOperation(int sysno) {
+   switch (sysno) {
+-#if defined(__i386__) || defined(__arm__) || \
++#if defined(__i386__) || defined(__arm__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_bdflush:
+ #endif
+@@ -713,7 +718,8 @@ bool SyscallSets::IsAdminOperation(int s
+ 
+ bool SyscallSets::IsKernelModule(int sysno) {
+   switch (sysno) {
+-#if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
++#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
++    defined(__powerpc64__)
+     case __NR_create_module:
+     case __NR_get_kernel_syms:  // Should ENOSYS.
+     case __NR_query_module:
+@@ -745,7 +751,7 @@ bool SyscallSets::IsFsControl(int sysno)
+     case __NR_quotactl:
+     case __NR_swapoff:
+     case __NR_swapon:
+-#if defined(__i386__) || \
++#if defined(__i386__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_umount:
+ #endif
+@@ -762,7 +768,7 @@ bool SyscallSets::IsNuma(int sysno) {
+     case __NR_getcpu:
+     case __NR_mbind:
+ #if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
+-    defined(__aarch64__)
++    defined(__aarch64__) || defined(__powerpc64__)
+     case __NR_migrate_pages:
+ #endif
+     case __NR_move_pages:
+@@ -797,13 +803,13 @@ bool SyscallSets::IsGlobalProcessEnviron
+   switch (sysno) {
+     case __NR_acct:  // Privileged.
+ #if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
+-    defined(__aarch64__)
++    defined(__aarch64__) || defined(__powerpc64__)
+     case __NR_getrlimit:
+ #endif
+-#if defined(__i386__) || defined(__arm__)
++#if defined(__i386__) || defined(__arm__) || defined(__powerpc64__)
+     case __NR_ugetrlimit:
+ #endif
+-#if defined(__i386__) || \
++#if defined(__i386__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_ulimit:
+ #endif
+@@ -838,7 +844,7 @@ bool SyscallSets::IsGlobalSystemStatus(i
+ #endif
+     case __NR_sysinfo:
+     case __NR_uname:
+-#if defined(__i386__)
++#if defined(__i386__) || defined(__powerpc64__)
+     case __NR_olduname:
+     case __NR_oldolduname:
+ #endif
+@@ -904,8 +910,16 @@ bool SyscallSets::IsSystemVSemaphores(in
+ }
+ #endif
+ 
++/* shitty hack around Void's 4.19 kernel headers missing those numbers */
++#if defined(__powerpc64__) && !defined(__NR_shmget)
++#define __NR_shmget 395
++#define __NR_shmctl 396
++#define __NR_shmat 397
++#define __NR_shmdt 398
++#endif
++
+ #if defined(__i386__) || defined(__x86_64__) || defined(__arm__) || \
+-    defined(__aarch64__) ||                                         \
++    defined(__aarch64__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_64_BITS))
+ // These give a lot of ambient authority and bypass the setuid sandbox.
+ bool SyscallSets::IsSystemVSharedMemory(int sysno) {
+@@ -936,7 +950,7 @@ bool SyscallSets::IsSystemVMessageQueue(
+ }
+ #endif
+ 
+-#if defined(__i386__) || \
++#if defined(__i386__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+ // Big system V multiplexing system call.
+ bool SyscallSets::IsSystemVIpc(int sysno) {
+@@ -956,7 +970,7 @@ bool SyscallSets::IsAnySystemV(int sysno
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_64_BITS))
+   return IsSystemVMessageQueue(sysno) || IsSystemVSemaphores(sysno) ||
+          IsSystemVSharedMemory(sysno);
+-#elif defined(__i386__) || \
++#elif defined(__i386__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+   return IsSystemVIpc(sysno);
+ #endif
+@@ -1014,7 +1028,8 @@ bool SyscallSets::IsFaNotify(int sysno)
+ bool SyscallSets::IsTimer(int sysno) {
+   switch (sysno) {
+     case __NR_getitimer:
+-#if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
++#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
++    defined(__powerpc64__)
+     case __NR_alarm:
+ #endif
+     case __NR_setitimer:
+@@ -1096,17 +1111,20 @@ bool SyscallSets::IsMisc(int sysno) {
+     case __NR_syncfs:
+     case __NR_vhangup:
+ // The system calls below are not implemented.
+-#if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
++#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
++    defined(__powerpc64__)
+     case __NR_afs_syscall:
+ #endif
+ #if defined(__i386__) || \
+-    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
++    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
++    defined(__powerpc64__)
+     case __NR_break:
+ #endif
+-#if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
++#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
++    defined(__powerpc64__)
+     case __NR_getpmsg:
+ #endif
+-#if defined(__i386__) || \
++#if defined(__i386__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_gtty:
+     case __NR_idle:
+@@ -1115,20 +1133,21 @@ bool SyscallSets::IsMisc(int sysno) {
+     case __NR_prof:
+     case __NR_profil:
+ #endif
+-#if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
++#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
++    defined(__powerpc64__)
+     case __NR_putpmsg:
+ #endif
+ #if defined(__x86_64__)
+     case __NR_security:
+ #endif
+-#if defined(__i386__) || \
++#if defined(__i386__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_stty:
+ #endif
+-#if defined(__x86_64__)
++#if defined(__x86_64__) || defined(__powerpc64__)
+     case __NR_tuxcall:
+ #endif
+-#if !defined(__aarch64__)
++#if !defined(__aarch64__) && !defined(__powerpc64__)
+     case __NR_vserver:
+ #endif
+       return true;
+--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_sets.h
++++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_sets.h
+@@ -43,13 +43,14 @@ class SANDBOX_EXPORT SyscallSets {
+   static bool IsDeniedGetOrModifySocket(int sysno);
+ 
+ #if defined(__i386__) || \
+-    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
++    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
++    defined(__powerpc64__)
+   // Big multiplexing system call for sockets.
+   static bool IsSocketCall(int sysno);
+ #endif
+ 
+ #if defined(__x86_64__) || defined(__arm__) || defined(__mips__) || \
+-    defined(__aarch64__)
++    defined(__aarch64__) || defined(__powerpc64__)
+   static bool IsNetworkSocketInformation(int sysno);
+ #endif
+ 
+@@ -77,7 +78,7 @@ class SANDBOX_EXPORT SyscallSets {
+   static bool IsSystemVSemaphores(int sysno);
+ #endif
+ #if defined(__i386__) || defined(__x86_64__) || defined(__arm__) || \
+-    defined(__aarch64__) ||                                         \
++    defined(__aarch64__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_64_BITS))
+   // These give a lot of ambient authority and bypass the setuid sandbox.
+   static bool IsSystemVSharedMemory(int sysno);
+@@ -89,7 +90,8 @@ class SANDBOX_EXPORT SyscallSets {
+ #endif
+ 
+ #if defined(__i386__) || \
+-    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
++    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
++    defined(__powerpc64__)
+   // Big system V multiplexing system call.
+   static bool IsSystemVIpc(int sysno);
+ #endif
+--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf/syscall.cc
++++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf/syscall.cc
+@@ -18,7 +18,7 @@ namespace sandbox {
+ namespace {
+ 
+ #if defined(ARCH_CPU_X86_FAMILY) || defined(ARCH_CPU_ARM_FAMILY) || \
+-    defined(ARCH_CPU_MIPS_FAMILY)
++    defined(ARCH_CPU_MIPS_FAMILY) || defined (ARCH_CPU_PPC64_FAMILY)
+ // Number that's not currently used by any Linux kernel ABIs.
+ const int kInvalidSyscallNumber = 0x351d3;
+ #else
+@@ -312,10 +312,54 @@ asm(// We need to be able to tell the ke
+     "2:ret\n"
+     ".cfi_endproc\n"
+     ".size SyscallAsm, .-SyscallAsm\n"
++#elif defined(__powerpc64__)
++    ".text\n"
++    ".align 4\n"
++    ".type SyscallAsm @function\n"
++    "SyscallAsm:\n"
++    ".cfi_startproc\n"
++
++    // Check if r3 is negative
++    "cmpdi 3, 0\n"
++    "bgt 2f\n"
++
++    // Load address of 3f into r3 and return
++    "mflr 10\n"
++    "bl 1f\n"
++    "1: mflr 3\n"
++    "mtlr 10\n"
++    "addi 3, 3, 4*13\n"
++    "blr\n"
++
++    // Load arguments from array into r3-8
++    // save param 3 in r10
++    "2:\n"
++    "mr 0, 3\n"
++    "ld 3, 0(4)\n"
++    "ld 5, 16(4)\n"
++    "ld 6, 24(4)\n"
++    "ld 7, 32(4)\n"
++    "ld 8, 40(4)\n"
++    "ld 4, 8(4)\n"
++    "li 9, 0\n"
++
++    // Enter kernel
++    "sc\n"
++
++    // Magic return address
++    "3:\n"
++    // Like MIPS, ppc64 return values are always positive.
++    // Check for error in cr0.SO and negate upon error
++    "bc 4, 3, 4f\n"
++    "neg 3, 3\n"
++    "4: blr\n"
++
++    ".cfi_endproc\n"
++    ".size SyscallAsm, .-SyscallAsm\n"
+ #endif
+     );  // asm
+ 
+-#if defined(__x86_64__)
++#if defined(__x86_64__) || defined(__powerpc64__)
+ extern "C" {
+ intptr_t SyscallAsm(intptr_t nr, const intptr_t args[6]);
+ }
+@@ -429,6 +473,8 @@ intptr_t Syscall::Call(int nr,
+     ret = inout;
+   }
+ 
++#elif defined(__powerpc64__)
++  intptr_t ret = SyscallAsm(nr, args);
+ #else
+ #error "Unimplemented architecture"
+ #endif
+@@ -445,8 +491,26 @@ void Syscall::PutValueInUcontext(intptr_
+     // needs to be changed back.
+     ret_val = -ret_val;
+     SECCOMP_PARM4(ctx) = 1;
+-  } else
++  } else {
+     SECCOMP_PARM4(ctx) = 0;
++  }
++#endif
++#if defined(__powerpc64__)
++  // Same as MIPS, need to invert ret and set error register (cr0.SO)
++  if (ret_val <= -1 && ret_val >= -4095) {
++    ret_val = -ret_val;
++#ifdef __GLIBC__
++    ctx->uc_mcontext.regs->ccr |= (1 << 28);
++#else
++    ((struct pt_regs *)ctx->uc_mcontext.regs)->ccr |= (1 << 28);
++#endif
++  } else {
++#ifdef __GLIBC__
++    ctx->uc_mcontext.regs->ccr &= ~(1 << 28);
++#else
++    ((struct pt_regs *)ctx->uc_mcontext.regs)->ccr &= ~(1 << 28);
++#endif
++  }
+ #endif
+   SECCOMP_RESULT(ctx) = static_cast<greg_t>(ret_val);
+ }
+--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf/trap.cc
++++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf/trap.cc
+@@ -236,6 +236,20 @@ void Trap::SigSys(int nr, LinuxSigInfo*
+       SetIsInSigHandler();
+     }
+ 
++#if defined(__powerpc64__)
++    // On ppc64+glibc, some syscalls seem to accidentally negate the first
++    // parameter which causes checks against it to fail. For now, manually
++    // negate them back.
++    // TODO(shawn@anastas.io): investigate this issue further
++    auto nr = SECCOMP_SYSCALL(ctx);
++    if (nr == __NR_openat || nr == __NR_mkdirat || nr == __NR_faccessat || nr == __NR_readlinkat ||
++        nr == __NR_renameat || nr == __NR_renameat2 || nr == __NR_newfstatat || nr == __NR_unlinkat) {
++        if (static_cast<int>(SECCOMP_PARM1(ctx)) > 0) {
++            SECCOMP_PARM1(ctx) = -SECCOMP_PARM1(ctx);
++        }
++    }
++#endif
++
+     // Copy the seccomp-specific data into a arch_seccomp_data structure. This
+     // is what we are showing to TrapFnc callbacks that the system call
+     // evaluator registered with the sandbox.
+--- a/src/3rdparty/chromium/sandbox/linux/services/credentials.cc
++++ b/src/3rdparty/chromium/sandbox/linux/services/credentials.cc
+@@ -81,7 +81,7 @@ bool ChrootToSafeEmptyDir() {
+   pid_t pid = -1;
+   alignas(16) char stack_buf[PTHREAD_STACK_MIN];
+ #if defined(ARCH_CPU_X86_FAMILY) || defined(ARCH_CPU_ARM_FAMILY) || \
+-    defined(ARCH_CPU_MIPS_FAMILY)
++    defined(ARCH_CPU_MIPS_FAMILY) || defined(ARCH_CPU_PPC64_FAMILY)
+   // The stack grows downward.
+   void* stack = stack_buf + sizeof(stack_buf);
+ #else
+--- a/src/3rdparty/chromium/sandbox/linux/services/syscall_wrappers.cc
++++ b/src/3rdparty/chromium/sandbox/linux/services/syscall_wrappers.cc
+@@ -61,7 +61,7 @@ long sys_clone(unsigned long flags,
+ #if defined(ARCH_CPU_X86_64)
+   return syscall(__NR_clone, flags, child_stack, ptid, ctid, tls);
+ #elif defined(ARCH_CPU_X86) || defined(ARCH_CPU_ARM_FAMILY) || \
+-    defined(ARCH_CPU_MIPS_FAMILY)
++    defined(ARCH_CPU_MIPS_FAMILY) || defined(ARCH_CPU_PPC64_FAMILY)
+   // CONFIG_CLONE_BACKWARDS defined.
+   return syscall(__NR_clone, flags, child_stack, ptid, tls, ctid);
+ #endif
+--- a/src/3rdparty/chromium/sandbox/linux/syscall_broker/broker_process.cc
++++ b/src/3rdparty/chromium/sandbox/linux/syscall_broker/broker_process.cc
+@@ -165,7 +165,7 @@ bool BrokerProcess::IsSyscallBrokerable(
+ #if defined(__NR_fstatat64)
+     case __NR_fstatat64:
+ #endif
+-#if defined(__x86_64__) || defined(__aarch64__)
++#if defined(__x86_64__) || defined(__aarch64__) || defined(__powerpc64__)
+     case __NR_newfstatat:
+ #endif
+       return !fast_check || allowed_command_set_.test(COMMAND_STAT);
+--- a/src/3rdparty/chromium/sandbox/linux/system_headers/linux_seccomp.h
++++ b/src/3rdparty/chromium/sandbox/linux/system_headers/linux_seccomp.h
+@@ -41,6 +41,9 @@
+ #ifndef EM_AARCH64
+ #define EM_AARCH64 183
+ #endif
++#ifndef EM_PPC64
++#define EM_PPC64 21
++#endif
+ 
+ #ifndef __AUDIT_ARCH_64BIT
+ #define __AUDIT_ARCH_64BIT 0x80000000
+@@ -74,6 +77,14 @@
+ #define AUDIT_ARCH_AARCH64 (EM_AARCH64 | __AUDIT_ARCH_64BIT | __AUDIT_ARCH_LE)
+ #endif
+ 
++#ifndef AUDIT_ARCH_PPC64
++#define AUDIT_ARCH_PPC64 (EM_PPC64 | __AUDIT_ARCH_64BIT)
++#endif
++
++#ifndef AUDIT_ARCH_PPC64LE
++#define AUDIT_ARCH_PPC64LE (EM_PPC64 | __AUDIT_ARCH_64BIT | __AUDIT_ARCH_LE)
++#endif
++
+ // For prctl.h
+ #ifndef PR_SET_SECCOMP
+ #define PR_SET_SECCOMP               22
+--- a/src/3rdparty/chromium/sandbox/linux/system_headers/linux_signal.h
++++ b/src/3rdparty/chromium/sandbox/linux/system_headers/linux_signal.h
+@@ -13,7 +13,7 @@
+ // (not undefined, but defined different values and in different memory
+ // layouts). So, fill the gap here.
+ #if defined(__i386__) || defined(__x86_64__) || defined(__arm__) || \
+-    defined(__aarch64__)
++    defined(__aarch64__) || defined(__powerpc64__)
+ 
+ #define LINUX_SIGHUP 1
+ #define LINUX_SIGINT 2
+--- a/src/3rdparty/chromium/sandbox/linux/system_headers/linux_syscalls.h
++++ b/src/3rdparty/chromium/sandbox/linux/system_headers/linux_syscalls.h
+@@ -35,5 +35,9 @@
+ #include "sandbox/linux/system_headers/arm64_linux_syscalls.h"
+ #endif
+ 
++#if defined(__powerpc64__)
++#include "sandbox/linux/system_headers/ppc64_linux_syscalls.h"
++#endif
++
+ #endif  // SANDBOX_LINUX_SYSTEM_HEADERS_LINUX_SYSCALLS_H_
+ 
+--- a/src/3rdparty/chromium/sandbox/linux/system_headers/linux_ucontext.h
++++ b/src/3rdparty/chromium/sandbox/linux/system_headers/linux_ucontext.h
+@@ -11,6 +11,8 @@
+ #include "sandbox/linux/system_headers/arm_linux_ucontext.h"
+ #elif defined(__i386__)
+ #include "sandbox/linux/system_headers/i386_linux_ucontext.h"
++#elif defined(__powerpc64__)
++#include "sandbox/linux/system_headers/ppc64_linux_ucontext.h"
+ #else
+ #error "No support for your architecture in PNaCl header"
+ #endif
+--- a/src/3rdparty/chromium/sandbox/policy/linux/bpf_renderer_policy_linux.cc
++++ b/src/3rdparty/chromium/sandbox/policy/linux/bpf_renderer_policy_linux.cc
+@@ -15,6 +15,11 @@
+ #include "sandbox/linux/system_headers/linux_syscalls.h"
+ #include "sandbox/policy/linux/sandbox_linux.h"
+ 
++// On PPC64, TCGETS is defined in terms of struct termios, so we must include termios.h
++#ifdef __powerpc64__
++#include <termios.h>
++#endif
++
+ // TODO(vignatti): replace the local definitions below with #include
+ // <linux/dma-buf.h> once kernel version 4.6 becomes widely used.
+ #include <linux/types.h>
+--- a/src/3rdparty/chromium/third_party/angle/src/compiler/translator/InfoSink.h
++++ b/src/3rdparty/chromium/third_party/angle/src/compiler/translator/InfoSink.h
+@@ -93,7 +93,16 @@ class TInfoSinkBase
+             stream.precision(8);
+             stream << f;
+         }
+-        sink.append(stream.str());
++
++        // Hack to work around a bug where negative floating point values
++        // are rendered like '.0.5' instead of '-0.5'
++        std::string res(stream.str());
++
++        if (signbit(f)) { // test if f is negative
++            res[0] = '-';
++        }
++
++        sink.append(res);
+         return *this;
+     }
+     // Write boolean values as their names instead of integral value.
+--- a/src/3rdparty/chromium/third_party/angle/src/libANGLE/Constants.h
++++ b/src/3rdparty/chromium/third_party/angle/src/libANGLE/Constants.h
+@@ -9,6 +9,7 @@
+ #ifndef LIBANGLE_CONSTANTS_H_
+ #define LIBANGLE_CONSTANTS_H_
+ 
++#include <cstddef>
+ #include "common/platform.h"
+ 
+ #include <stdint.h>
+--- a/src/3rdparty/chromium/third_party/boringssl/BUILD.gn
++++ b/src/3rdparty/chromium/third_party/boringssl/BUILD.gn
+@@ -99,6 +99,13 @@ if (is_win && !is_msan && current_cpu !=
+       } else {
+         public_configs = [ ":no_asm_config" ]
+       }
++    } else if (current_cpu == "ppc64") {
++      if (is_linux) {
++        # TODO: ppc64 (be) check
++        sources += crypto_sources_linux_ppc64le
++      } else {
++        public_configs = [ ":no_asm_config" ]
++      }
+     } else {
+       public_configs = [ ":no_asm_config" ]
+     }
+--- a/src/3rdparty/chromium/third_party/breakpad/BUILD.gn
++++ b/src/3rdparty/chromium/third_party/breakpad/BUILD.gn
+@@ -623,7 +623,6 @@ if (is_linux || is_chromeos || is_androi
+       "breakpad/src/client/minidump_file_writer.h",
+       "breakpad/src/common/convert_UTF.cc",
+       "breakpad/src/common/convert_UTF.h",
+-      "breakpad/src/common/linux/breakpad_getcontext.S",
+       "breakpad/src/common/linux/elf_core_dump.cc",
+       "breakpad/src/common/linux/elf_core_dump.h",
+       "breakpad/src/common/linux/elfutils.cc",
+@@ -663,6 +662,15 @@ if (is_linux || is_chromeos || is_androi
+ 
+     libs = [ "dl" ]
+ 
++    if (current_cpu == "ppc64") {
++        defines = [ "HAVE_GETCONTEXT" ]
++        libs += [ "ucontext" ]
++    } else {
++        sources += [
++            "breakpad/src/common/linux/breakpad_getcontext.S"
++        ]
++    }
++
+     include_dirs = [
+       ".",
+       "breakpad/src",
+@@ -712,7 +720,6 @@ if (is_linux || is_chromeos || is_androi
+       "breakpad/src/client/linux/minidump_writer/minidump_writer_unittest.cc",
+       "breakpad/src/client/linux/minidump_writer/minidump_writer_unittest_utils.cc",
+       "breakpad/src/client/linux/minidump_writer/proc_cpuinfo_reader_unittest.cc",
+-      "breakpad/src/common/linux/breakpad_getcontext_unittest.cc",
+       "breakpad/src/common/linux/elf_core_dump_unittest.cc",
+       "breakpad/src/common/linux/file_id_unittest.cc",
+       "breakpad/src/common/linux/linux_libc_support_unittest.cc",
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/raw_context_cpu.h
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/raw_context_cpu.h
+@@ -44,6 +44,8 @@ typedef MDRawContextARM RawContextCPU;
+ typedef MDRawContextARM64_Old RawContextCPU;
+ #elif defined(__mips__)
+ typedef MDRawContextMIPS RawContextCPU;
++#elif defined(__powerpc64__)
++typedef MDRawContextPPC64 RawContextCPU;
+ #else
+ #error "This code has not been ported to your platform yet."
+ #endif
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.cc
+@@ -270,7 +270,54 @@ void ThreadInfo::FillCPUContext(RawConte
+   out->float_save.fir = mcontext.fpc_eir;
+ #endif
+ }
+-#endif  // __mips__
++
++#elif defined(__powerpc64__)
++
++#if !defined(__GLIBC__)
++#include <asm/elf.h>
++#include <asm/ptrace.h>
++#endif
++
++uintptr_t ThreadInfo::GetInstructionPointer() const {
++    return mcontext.gp_regs[PT_NIP];
++}
++
++void ThreadInfo::FillCPUContext(RawContextCPU* out) const {
++    out->context_flags = MD_CONTEXT_PPC64_FULL;
++    for (int i = 0; i < MD_CONTEXT_PPC64_GPR_COUNT; i++)
++        out->gpr[i] = mcontext.gp_regs[i];
++
++    out->lr = mcontext.gp_regs[PT_LNK];
++    out->srr0 = mcontext.gp_regs[PT_NIP];
++    out->srr1 = mcontext.gp_regs[PT_MSR];
++    out->cr = mcontext.gp_regs[PT_CCR];
++    out->xer = mcontext.gp_regs[PT_XER];
++    out->ctr = mcontext.gp_regs[PT_CTR];
++
++#ifdef __GLIBC__
++    for (int i = 0; i < MD_FLOATINGSAVEAREA_PPC_FPR_COUNT; i++)
++        out->float_save.fpregs[i] = mcontext.fp_regs[i];
++
++    out->float_save.fpscr = mcontext.fp_regs[NFPREG-1];
++#else
++    for (int i = 0; i < MD_FLOATINGSAVEAREA_PPC_FPR_COUNT; i++)
++        out->float_save.fpregs[i] = ((uint64_t *)&mcontext.fp_regs)[i];
++
++     out->float_save.fpscr = ((uint64_t *)&mcontext.fp_regs)[ELF_NFPREG-1];
++#endif
++
++    for (int i = 0; i < MD_VECTORSAVEAREA_PPC_VR_COUNT; i++)
++        out->vector_save.save_vr[i] = \
++            {(((uint64_t)vregs.vrregs[i][0]) << 32)
++                          | vregs.vrregs[i][1],
++            (((uint64_t)vregs.vrregs[i][2]) << 32)
++                         | vregs.vrregs[i][3]};
++
++    out->vrsave = vregs.vrsave;
++    out->vector_save.save_vscr = {0, vregs.vscr.vscr_word};
++    out->vector_save.save_vrvalid = 0xFFFFFFFF;
++}
++#endif  // __powerpc64__
+ 
+ void ThreadInfo::GetGeneralPurposeRegisters(void** gp_regs, size_t* size) {
+   assert(gp_regs || size);
+@@ -279,6 +326,11 @@ void ThreadInfo::GetGeneralPurposeRegist
+     *gp_regs = mcontext.gregs;
+   if (size)
+     *size = sizeof(mcontext.gregs);
++#elif defined(__powerpc64__)
++  if (gp_regs)
++    *gp_regs = mcontext.gp_regs;
++  if (size)
++    *size = sizeof(mcontext.gp_regs);
+ #else
+   if (gp_regs)
+     *gp_regs = &regs;
+@@ -294,6 +346,11 @@ void ThreadInfo::GetFloatingPointRegiste
+     *fp_regs = &mcontext.fpregs;
+   if (size)
+     *size = sizeof(mcontext.fpregs);
++#elif defined(__powerpc64__)
++  if (fp_regs)
++    *fp_regs = &mcontext.fp_regs;
++  if (size)
++    *size = sizeof(mcontext.fp_regs);
+ #else
+   if (fp_regs)
+     *fp_regs = &fpregs;
+@@ -302,4 +359,13 @@ void ThreadInfo::GetFloatingPointRegiste
+ #endif
+ }
+ 
++#if defined(__powerpc64__)
++void ThreadInfo::GetVectorRegisters(void** v_regs, size_t* size) {
++    if (v_regs)
++        *v_regs = &vregs;
++    if (size)
++        *size = sizeof(vregs);
++}
++#endif
++
+ }  // namespace google_breakpad
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.h
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.h
+@@ -68,6 +68,10 @@ struct ThreadInfo {
+   // Use the structures defined in <sys/user.h>
+   struct user_regs_struct regs;
+   struct user_fpsimd_struct fpregs;
++#elif defined(__powerpc64__)
++  // Use the structures defined in <sys/ucontext.h>.
++  mcontext_t mcontext;
++  vrregset_t vregs;
+ #elif defined(__mips__)
+   // Use the structure defined in <sys/ucontext.h>.
+   mcontext_t mcontext;
+@@ -84,6 +88,11 @@ struct ThreadInfo {
+ 
+   // Returns the pointer and size of float point register area.
+   void GetFloatingPointRegisters(void** fp_regs, size_t* size);
++
++#if defined(__powerpc64__)
++  // Returns the pointer and size of the vector register area. (PPC64 only)
++  void GetVectorRegisters(void** v_regs, size_t* size);
++#endif
+ };
+ 
+ }  // namespace google_breakpad
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc
+@@ -254,6 +254,60 @@ void UContextReader::FillCPUContext(RawC
+   out->float_save.fir = uc->uc_mcontext.fpc_eir;  // Unused.
+ #endif
+ }
++
++#elif defined(__powerpc64__)
++
++#ifndef __GLIBC__
++#include <asm/elf.h>
++#include <asm/ptrace.h>
++#endif
++
++uintptr_t UContextReader::GetStackPointer(const ucontext_t* uc) {
++    return uc->uc_mcontext.gp_regs[MD_CONTEXT_PPC64_REG_SP];
++}
++
++uintptr_t UContextReader::GetInstructionPointer(const ucontext_t* uc) {
++    return uc->uc_mcontext.gp_regs[PT_NIP];
++}
++
++void UContextReader::FillCPUContext(RawContextCPU* out, const ucontext_t* uc,
++                                    const vrregset_t* vregs) {
++    out->context_flags = MD_CONTEXT_PPC64_FULL;
++
++    for (int i = 0; i < MD_CONTEXT_PPC64_GPR_COUNT; i++)
++        out->gpr[i] = uc->uc_mcontext.gp_regs[i];
++
++    out->lr = uc->uc_mcontext.gp_regs[PT_LNK];
++    out->srr0 = uc->uc_mcontext.gp_regs[PT_NIP];
++    out->srr1 = uc->uc_mcontext.gp_regs[PT_MSR];
++    out->cr = uc->uc_mcontext.gp_regs[PT_CCR];
++    out->xer = uc->uc_mcontext.gp_regs[PT_XER];
++    out->ctr = uc->uc_mcontext.gp_regs[PT_CTR];
++
++#ifdef __GLIBC__
++    for (int i = 0; i < MD_FLOATINGSAVEAREA_PPC_FPR_COUNT; i++)
++        out->float_save.fpregs[i] = uc->uc_mcontext.fp_regs[i];
++
++    out->float_save.fpscr = uc->uc_mcontext.fp_regs[NFPREG-1];
++#else
++    for (int i = 0; i < MD_FLOATINGSAVEAREA_PPC_FPR_COUNT; i++)
++        out->float_save.fpregs[i] = ((uint64_t *)&uc->uc_mcontext.fp_regs)[i];
++
++    out->float_save.fpscr = ((uint64_t *)&uc->uc_mcontext.fp_regs)[ELF_NFPREG-1];
++#endif
++
++    for (int i = 0; i < MD_VECTORSAVEAREA_PPC_VR_COUNT; i++)
++        out->vector_save.save_vr[i] =
++            {(((uint64_t)vregs->vrregs[i][0]) << 32)
++                         | vregs->vrregs[i][1],
++             (((uint64_t)vregs->vrregs[i][2]) << 32)
++                         | vregs->vrregs[i][3]};
++
++    out->vrsave = vregs->vrsave;
++    out->vector_save.save_vscr = {0, vregs->vscr.vscr_word};
++    out->vector_save.save_vrvalid = 0xFFFFFFFF;
++}
++
+ #endif
+ 
+ }  // namespace google_breakpad
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h
+@@ -59,6 +59,9 @@ struct UContextReader {
+ #elif defined(__aarch64__)
+   static void FillCPUContext(RawContextCPU* out, const ucontext_t* uc,
+                              const struct fpsimd_context* fpregs);
++#elif defined(__powerpc64__)
++  static void FillCPUContext(RawContextCPU *out, const ucontext_t *uc,
++                             const vrregset_t* vregs);
+ #else
+   static void FillCPUContext(RawContextCPU* out, const ucontext_t* uc);
+ #endif
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc
+@@ -105,6 +105,13 @@
+ #define PR_SET_PTRACER 0x59616d61
+ #endif
+ 
++/* musl hack, can't include asm/ptrace.h as that causes conflicts */
++#ifndef __GLIBC__
++#if defined(__powerpc64__) && !defined(PT_NIP)
++#define PT_NIP 32
++#endif
++#endif
++
+ namespace google_breakpad {
+ 
+ namespace {
+@@ -461,9 +468,16 @@ bool ExceptionHandler::HandleSignal(int
+     memcpy(&g_crash_context_.float_state, fp_ptr,
+            sizeof(g_crash_context_.float_state));
+   }
++#elif defined(__powerpc64__)
++  // On PPC64, we must copy VR state
++  ucontext_t* uc_ptr = (ucontext_t*)uc;
++  if (uc_ptr->uc_mcontext.v_regs) {
++    memcpy(&g_crash_context_.vector_state, uc_ptr->uc_mcontext.v_regs,
++           sizeof(g_crash_context_.vector_state));
++  }
+ #elif !defined(__ARM_EABI__) && !defined(__mips__)
+   // FP state is not part of user ABI on ARM Linux.
+-  // In case of MIPS Linux FP state is already part of ucontext_t
++  // In case of MIPS, Linux FP state is already part of ucontext_t
+   // and 'float_state' is not a member of CrashContext.
+   ucontext_t* uc_ptr = (ucontext_t*)uc;
+   if (uc_ptr->uc_mcontext.fpregs) {
+@@ -708,11 +722,19 @@ bool ExceptionHandler::WriteMinidump() {
+   }
+ #endif
+ 
+-#if !defined(__ARM_EABI__) && !defined(__aarch64__) && !defined(__mips__)
++#if !defined(__ARM_EABI__) && !defined(__aarch64__) && !defined(__mips__) \
++    && !defined(__powerpc64__)
+   // FPU state is not part of ARM EABI ucontext_t.
+   memcpy(&context.float_state, context.context.uc_mcontext.fpregs,
+          sizeof(context.float_state));
+ #endif
++
++#if defined(__powerpc64__)
++  // Vector registers must be copied on PPC64
++  memcpy(&context.vector_state, context.context.uc_mcontext.v_regs,
++         sizeof(context.vector_state));
++#endif
++
+   context.tid = sys_gettid();
+ 
+   // Add an exception stream to the minidump for better reporting.
+@@ -733,6 +755,9 @@ bool ExceptionHandler::WriteMinidump() {
+ #elif defined(__mips__)
+   context.siginfo.si_addr =
+       reinterpret_cast<void*>(context.context.uc_mcontext.pc);
++#elif defined(__powerpc64__)
++  context.siginfo.si_addr =
++      reinterpret_cast<void*>(context.context.uc_mcontext.gp_regs[PT_NIP]);
+ #else
+ #error "This code has not been ported to your platform yet."
+ #endif
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.h
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.h
+@@ -192,7 +192,11 @@ class ExceptionHandler {
+     siginfo_t siginfo;
+     pid_t tid;  // the crashing thread.
+     ucontext_t context;
+-#if !defined(__ARM_EABI__) && !defined(__mips__)
++#if defined(__powerpc64__)
++    // PPC64's FP state is a part of ucontext_t like MIPS but the vector
++    // state is not, so a struct is needed.
++    vstate_t vector_state;
++#elif !defined(__ARM_EABI__) && !defined(__mips__)
+     // #ifdef this out because FP state is not part of user ABI for Linux ARM.
+     // In case of MIPS Linux FP state is already part of ucontext_t so
+     // 'float_state' is not required.
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler_unittest.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler_unittest.cc
+@@ -307,7 +307,7 @@ TEST(ExceptionHandlerTest, ParallelChild
+   }
+ 
+   // Wait a while until the child should have crashed.
+-  usleep(1000000);
++  usleep(2000000);
+   // Kill the child if it is still running.
+   kill(child, SIGKILL);
+ 
+@@ -559,6 +559,8 @@ const unsigned char kIllegalInstruction[
+ #if defined(__mips__)
+   // mfc2 zero,Impl - usually illegal in userspace.
+   0x48, 0x00, 0x00, 0x48
++#elif defined(__powerpc64__)
++  0x01, 0x01, 0x01, 0x01 // Crashes on a tested POWER9 cpu
+ #else
+   // This crashes with SIGILL on x86/x86-64/arm.
+   0xff, 0xff, 0xff, 0xff
+@@ -754,10 +756,10 @@ TEST(ExceptionHandlerTest, InstructionPo
+ 
+   // These are defined here so the parent can use them to check the
+   // data from the minidump afterwards.
+-  // Use 4k here because the OS will hand out a single page even
++  // Use the page size here because the OS will hand out a single page even
+   // if a smaller size is requested, and this test wants to
+   // test the upper bound of the memory range.
+-  const uint32_t kMemorySize = 4096;  // bytes
++  const uint32_t kMemorySize = getpagesize();  // bytes
+   const int kOffset = kMemorySize - sizeof(kIllegalInstruction);
+ 
+   const pid_t child = fork();
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/microdump_writer/microdump_writer.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/microdump_writer/microdump_writer.cc
+@@ -138,7 +138,9 @@ class MicrodumpWriter {
+                   const MicrodumpExtraInfo& microdump_extra_info,
+                   LinuxDumper* dumper)
+       : ucontext_(context ? &context->context : NULL),
+-#if !defined(__ARM_EABI__) && !defined(__mips__)
++#if defined(__powerpc64__)
++        vector_state_(context ? &context->vector_state : NULL),
++#elif !defined(__ARM_EABI__) && !defined(__mips__)
+         float_state_(context ? &context->float_state : NULL),
+ #endif
+         dumper_(dumper),
+@@ -337,6 +339,8 @@ class MicrodumpWriter {
+ # else
+ #  error "This mips ABI is currently not supported (n32)"
+ #endif
++#elif defined(__powerpc64__)
++    const char kArch[] = "ppc64";
+ #else
+ #error "This code has not been ported to your platform yet"
+ #endif
+@@ -409,7 +413,9 @@ class MicrodumpWriter {
+   void DumpCPUState() {
+     RawContextCPU cpu;
+     my_memset(&cpu, 0, sizeof(RawContextCPU));
+-#if !defined(__ARM_EABI__) && !defined(__mips__)
++#if defined(__powerpc64__)
++    UContextReader::FillCPUContext(&cpu, ucontext_, vector_state_);
++#elif !defined(__ARM_EABI__) && !defined(__mips__)
+     UContextReader::FillCPUContext(&cpu, ucontext_, float_state_);
+ #else
+     UContextReader::FillCPUContext(&cpu, ucontext_);
+@@ -605,7 +611,9 @@ class MicrodumpWriter {
+   void* Alloc(unsigned bytes) { return dumper_->allocator()->Alloc(bytes); }
+ 
+   const ucontext_t* const ucontext_;
+-#if !defined(__ARM_EABI__) && !defined(__mips__)
++#if defined(__powerpc64__)
++  const google_breakpad::vstate_t* const vector_state_;
++#elif !defined(__ARM_EABI__) && !defined(__mips__)
+   const google_breakpad::fpstate_t* const float_state_;
+ #endif
+   LinuxDumper* dumper_;
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/microdump_writer/microdump_writer_unittest.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/microdump_writer/microdump_writer_unittest.cc
+@@ -279,10 +279,19 @@ TEST(MicrodumpWriterTest, BasicWithMappi
+   CrashAndGetMicrodump(mappings, MicrodumpExtraInfo(), &buf);
+   ASSERT_TRUE(ContainsMicrodump(buf));
+ 
++  int page_size = getpagesize();
+ #ifdef __LP64__
+-  ASSERT_NE(std::string::npos,
+-            buf.find("M 0000000000001000 000000000000002A 0000000000001000 "
+-                     "33221100554477668899AABBCCDDEEFF0 libfoo.so"));
++  // This test is only available for the following page sizes
++  ASSERT_TRUE((page_size == 4096) || (page_size == 65536));
++  if (page_size == 4096) {
++    ASSERT_NE(std::string::npos,
++              buf.find("M 0000000000001000 000000000000002A 0000000000001000 "
++                       "33221100554477668899AABBCCDDEEFF0 libfoo.so"));
++  } else {
++    ASSERT_NE(std::string::npos,
++              buf.find("M 0000000000010000 000000000000002A 0000000000010000 "
++                       "33221100554477668899AABBCCDDEEFF0 libfoo.so"));
++  }
+ #else
+   ASSERT_NE(std::string::npos,
+             buf.find("M 00001000 0000002A 00001000 "
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_core_dumper.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_core_dumper.cc
+@@ -117,6 +117,9 @@ bool LinuxCoreDumper::GetThreadInfoByInd
+ #elif defined(__mips__)
+   stack_pointer =
+       reinterpret_cast<uint8_t*>(info->mcontext.gregs[MD_CONTEXT_MIPS_REG_SP]);
++#elif defined(__powerpc64__)
++  stack_pointer =
++      reinterpret_cast<uint8_t*>(info->mcontext.gp_regs[MD_CONTEXT_PPC64_REG_SP]);
+ #else
+ #error "This code hasn't been ported to your platform yet."
+ #endif
+@@ -212,7 +215,10 @@ bool LinuxCoreDumper::EnumerateThreads()
+         memset(&info, 0, sizeof(ThreadInfo));
+         info.tgid = status->pr_pgrp;
+         info.ppid = status->pr_ppid;
+-#if defined(__mips__)
++#if defined(__powerpc64__)
++        for (int i = 0; i < 31; i++)
++            info.mcontext.gp_regs[i] = status->pr_reg[i];
++#elif defined(__mips__)
+ #if defined(__ANDROID__)
+         for (int i = EF_R0; i <= EF_R31; i++)
+           info.mcontext.gregs[i - EF_R0] = status->pr_reg[i];
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper.cc
+@@ -765,7 +765,9 @@ bool LinuxDumper::GetStackInfo(const voi
+       reinterpret_cast<uint8_t*>(int_stack_pointer & ~(page_size - 1));
+ 
+   // The number of bytes of stack which we try to capture.
+-  static const ptrdiff_t kStackToCapture = 32 * 1024;
++  // This now depends on page_size to avoid missing data
++  // on systems with larger page sizes.
++  static const ptrdiff_t kStackToCapture = 8 * page_size;
+ 
+   const MappingInfo* mapping = FindMapping(stack_pointer);
+   if (!mapping)
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper.h
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper.h
+@@ -63,7 +63,8 @@ namespace google_breakpad {
+  (defined(__mips__) && _MIPS_SIM == _ABIO32)
+ typedef Elf32_auxv_t elf_aux_entry;
+ #elif defined(__x86_64) || defined(__aarch64__) || \
+-     (defined(__mips__) && _MIPS_SIM != _ABIO32)
++     (defined(__mips__) && _MIPS_SIM != _ABIO32) || \
++     defined(__powerpc64__)
+ typedef Elf64_auxv_t elf_aux_entry;
+ #endif
+ 
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper_unittest_helper.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper_unittest_helper.cc
+@@ -51,6 +51,8 @@
+ #define TID_PTR_REGISTER "rcx"
+ #elif defined(__mips__)
+ #define TID_PTR_REGISTER "$1"
++#elif defined(__powerpc64__)
++#define TID_PTR_REGISTER "r8"
+ #else
+ #error This test has not been ported to this platform.
+ #endif
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper.cc
+@@ -154,19 +154,27 @@ bool LinuxPtraceDumper::CopyFromProcess(
+   return true;
+ }
+ 
+-bool LinuxPtraceDumper::ReadRegisterSet(ThreadInfo* info, pid_t tid)
+-{
++bool LinuxPtraceDumper::ReadRegisterSet(ThreadInfo* info, pid_t tid) {
+ #ifdef PTRACE_GETREGSET
+   struct iovec io;
+   info->GetGeneralPurposeRegisters(&io.iov_base, &io.iov_len);
+-  if (sys_ptrace(PTRACE_GETREGSET, tid, (void*)NT_PRSTATUS, (void*)&io) == -1) {
++  if (ptrace(PTRACE_GETREGSET, tid, (void*)NT_PRSTATUS, (void*)&io) == -1) {
+     return false;
+   }
+ 
+   info->GetFloatingPointRegisters(&io.iov_base, &io.iov_len);
+-  if (sys_ptrace(PTRACE_GETREGSET, tid, (void*)NT_FPREGSET, (void*)&io) == -1) {
++  if (ptrace(PTRACE_GETREGSET, tid, (void*)NT_FPREGSET, (void*)&io) == -1) {
+     return false;
+   }
++
++#if defined(__powerpc64__)
++  // Grab the vector registers on PPC64 too
++  info->GetVectorRegisters(&io.iov_base, &io.iov_len);
++  if (ptrace(PTRACE_GETREGSET, tid, (void*)NT_PPC_VMX, (void*)&io) == -1) {
++    return false;
++  }
++#endif // defined(__powerpc64__)
++
+   return true;
+ #else
+   return false;
+@@ -303,6 +311,9 @@ bool LinuxPtraceDumper::GetThreadInfoByI
+ #elif defined(__mips__)
+   stack_pointer =
+       reinterpret_cast<uint8_t*>(info->mcontext.gregs[MD_CONTEXT_MIPS_REG_SP]);
++#elif defined(__powerpc64__)
++  stack_pointer =
++      reinterpret_cast<uint8_t*>(info->mcontext.gp_regs[MD_CONTEXT_PPC64_REG_SP]);
+ #else
+ #error "This code hasn't been ported to your platform yet."
+ #endif
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper_unittest.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper_unittest.cc
+@@ -462,6 +462,9 @@ TEST(LinuxPtraceDumperTest, VerifyStackR
+ #elif defined(__mips__)
+     pid_t* process_tid_location =
+         reinterpret_cast<pid_t*>(one_thread.mcontext.gregs[1]);
++#elif defined(__powerpc64__)
++    pid_t* process_tid_location =
++        reinterpret_cast<pid_t*>(one_thread.mcontext.gp_regs[8]);
+ #else
+ #error This test has not been ported to this platform.
+ #endif
+@@ -559,6 +562,8 @@ TEST_F(LinuxPtraceDumperTest, SanitizeSt
+   uintptr_t heap_addr = thread_info.regs.rcx;
+ #elif defined(__mips__)
+   uintptr_t heap_addr = thread_info.mcontext.gregs[1];
++#elif defined(__powerpc64__)
++  uintptr_t heap_addr = thread_info.mcontext.gp_regs[8];
+ #else
+ #error This test has not been ported to this platform.
+ #endif
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.cc
+@@ -136,7 +136,9 @@ class MinidumpWriter {
+       : fd_(minidump_fd),
+         path_(minidump_path),
+         ucontext_(context ? &context->context : NULL),
+-#if !defined(__ARM_EABI__) && !defined(__mips__)
++#if defined(__powerpc64__)
++        vector_state_(context ? &context->vector_state : NULL),
++#elif !defined(__ARM_EABI__) && !defined(__mips__)
+         float_state_(context ? &context->float_state : NULL),
+ #endif
+         dumper_(dumper),
+@@ -468,7 +470,9 @@ class MinidumpWriter {
+         if (!cpu.Allocate())
+           return false;
+         my_memset(cpu.get(), 0, sizeof(RawContextCPU));
+-#if !defined(__ARM_EABI__) && !defined(__mips__)
++#if defined(__powerpc64__)
++        UContextReader::FillCPUContext(cpu.get(), ucontext_, vector_state_);
++#elif !defined(__ARM_EABI__) && !defined(__mips__)
+         UContextReader::FillCPUContext(cpu.get(), ucontext_, float_state_);
+ #else
+         UContextReader::FillCPUContext(cpu.get(), ucontext_);
+@@ -897,7 +901,7 @@ class MinidumpWriter {
+     dirent->location.rva = 0;
+   }
+ 
+-#if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
++#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || defined(__powerpc64__)
+   bool WriteCPUInformation(MDRawSystemInfo* sys_info) {
+     char vendor_id[sizeof(sys_info->cpu.x86_cpu_info.vendor_id) + 1] = {0};
+     static const char vendor_id_name[] = "vendor_id";
+@@ -917,7 +921,9 @@ class MinidumpWriter {
+ 
+     // processor_architecture should always be set, do this first
+     sys_info->processor_architecture =
+-#if defined(__mips__)
++#if defined(__powerpc64__)
++        MD_CPU_ARCHITECTURE_PPC64;
++#elif defined(__mips__)
+ # if _MIPS_SIM == _ABIO32
+         MD_CPU_ARCHITECTURE_MIPS;
+ # elif _MIPS_SIM == _ABI64
+@@ -1333,7 +1339,9 @@ class MinidumpWriter {
+   const char* path_;  // Path to the file where the minidum should be written.
+ 
+   const ucontext_t* const ucontext_;  // also from the signal handler
+-#if !defined(__ARM_EABI__) && !defined(__mips__)
++#if defined(__powerpc64__)
++  const google_breakpad::vstate_t* const vector_state_;
++#elif !defined(__ARM_EABI__) && !defined(__mips__)
+   const google_breakpad::fpstate_t* const float_state_;  // ditto
+ #endif
+   LinuxDumper* dumper_;
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.h
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.h
+@@ -48,6 +48,8 @@ class ExceptionHandler;
+ 
+ #if defined(__aarch64__)
+ typedef struct fpsimd_context fpstate_t;
++#elif defined(__powerpc64__)
++typedef vrregset_t vstate_t;
+ #elif !defined(__ARM_EABI__) && !defined(__mips__)
+ typedef std::remove_pointer<fpregset_t>::type fpstate_t;
+ #endif
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer_unittest.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer_unittest.cc
+@@ -715,6 +715,12 @@ TEST(MinidumpWriterTest, InvalidStackPoi
+ #elif defined(__mips__)
+   context.context.uc_mcontext.gregs[MD_CONTEXT_MIPS_REG_SP] =
+       invalid_stack_pointer;
++#elif defined(__powerpc64__)
++  context.context.uc_mcontext.gp_regs[MD_CONTEXT_PPC64_REG_SP] =
++      invalid_stack_pointer;
++#elif defined(__powerpc64__)
++  context.context.uc_mcontext.gp_regs[MD_CONTEXT_PPC64_REG_SP] =
++      invalid_stack_pointer;
+ #else
+ # error "This code has not been ported to your platform yet."
+ #endif
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/common/linux/memory_mapped_file.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/common/linux/memory_mapped_file.cc
+@@ -65,8 +65,7 @@ bool MemoryMappedFile::Map(const char* p
+   }
+ 
+ #if defined(__x86_64__) || defined(__aarch64__) || \
+-   (defined(__mips__) && _MIPS_SIM == _ABI64)
+-
++   (defined(__mips__) && _MIPS_SIM == _ABI64) || defined(__powerpc64__)
+   struct kernel_stat st;
+   if (sys_fstat(fd, &st) == -1 || st.st_size < 0) {
+ #else
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/common/linux/memory_mapped_file_unittest.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/common/linux/memory_mapped_file_unittest.cc
+@@ -176,9 +176,10 @@ TEST_F(MemoryMappedFileTest, RemapAfterM
+ TEST_F(MemoryMappedFileTest, MapWithOffset) {
+   // Put more data in the test file this time. Offsets can only be
+   // done on page boundaries, so we need a two page file to test this.
+-  const int page_size = 4096;
+-  char data1[2 * page_size];
+-  size_t data1_size = sizeof(data1);
++  const int page_size = getpagesize();
++  char *data1 = static_cast<char*>(malloc(2 * page_size));
++  EXPECT_TRUE(data1 != NULL);
++  size_t data1_size = (2 * page_size);
+   for (size_t i = 0; i < data1_size; ++i) {
+     data1[i] = i & 0x7f;
+   }
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/common/memory_allocator_unittest.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/common/memory_allocator_unittest.cc
+@@ -57,8 +57,9 @@ TEST(PageAllocatorTest, LargeObject) {
+ 
+   EXPECT_EQ(0U, allocator.pages_allocated());
+   uint8_t* p = reinterpret_cast<uint8_t*>(allocator.Alloc(10000));
++  uint64_t expected_pages = 1 + ((10000 - 1) / getpagesize());
+   ASSERT_FALSE(p == NULL);
+-  EXPECT_EQ(3U, allocator.pages_allocated());
++  EXPECT_EQ(expected_pages, allocator.pages_allocated());
+   for (unsigned i = 1; i < 10; ++i) {
+     uint8_t* p = reinterpret_cast<uint8_t*>(allocator.Alloc(i));
+     ASSERT_FALSE(p == NULL);
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/processor/exploitability_linux.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/processor/exploitability_linux.cc
+@@ -202,12 +202,14 @@ bool ExploitabilityLinux::EndedOnIllegal
+   // Check architecture and set architecture variable to corresponding flag
+   // in objdump.
+   switch (context->GetContextCPU()) {
++#if defined(__i386) || defined(__x86_64)
+     case MD_CONTEXT_X86:
+       architecture = "i386";
+       break;
+     case MD_CONTEXT_AMD64:
+       architecture = "i386:x86-64";
+       break;
++#endif
+     default:
+       // Unsupported architecture. Note that ARM architectures are not
+       // supported because objdump does not support ARM.
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/processor/exploitability_unittest.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/processor/exploitability_unittest.cc
+@@ -104,6 +104,8 @@ ExploitabilityFor(const string& filename
+ }
+ 
+ TEST(ExploitabilityTest, TestWindowsEngine) {
++// The following tests are only executable on an x86-class linux machine.
++#if !defined(_WIN32) && (defined(__i386) || defined(__x86_64))
+   ASSERT_EQ(google_breakpad::EXPLOITABILITY_HIGH,
+             ExploitabilityFor("ascii_read_av.dmp"));
+   ASSERT_EQ(google_breakpad::EXPLOITABILITY_HIGH,
+@@ -136,9 +138,12 @@ TEST(ExploitabilityTest, TestWindowsEngi
+             ExploitabilityFor("read_av_clobber_write.dmp"));
+   ASSERT_EQ(google_breakpad::EXPLOITABILITY_LOW,
+             ExploitabilityFor("read_av_conditional.dmp"));
++#endif
+ }
+ 
+ TEST(ExploitabilityTest, TestLinuxEngine) {
++// The following tests are only executable on an x86-class linux machine.
++#if defined(__i386) || defined(__x86_64)
+   ASSERT_EQ(google_breakpad::EXPLOITABILITY_INTERESTING,
+             ExploitabilityFor("linux_null_read_av.dmp"));
+   ASSERT_EQ(google_breakpad::EXPLOITABILITY_HIGH,
+@@ -171,7 +176,8 @@ TEST(ExploitabilityTest, TestLinuxEngine
+             ExploitabilityFor("linux_executable_heap.dmp"));
+   ASSERT_EQ(google_breakpad::EXPLOITABILITY_HIGH,
+             ExploitabilityFor("linux_jmp_to_module_not_exe_region.dmp"));
+-#ifndef _WIN32
++#endif
++#if !defined(_WIN32) && (defined(__i386) || defined(__x86_64))
+   ASSERT_EQ(google_breakpad::EXPLOITABILITY_HIGH,
+             ExploitabilityFor("linux_write_to_nonwritable_module.dmp"));
+   ASSERT_EQ(google_breakpad::EXPLOITABILITY_HIGH,
+@@ -182,10 +188,10 @@ TEST(ExploitabilityTest, TestLinuxEngine
+             ExploitabilityFor("linux_write_to_outside_module_via_math.dmp"));
+   ASSERT_EQ(google_breakpad::EXPLOITABILITY_INTERESTING,
+             ExploitabilityFor("linux_write_to_under_4k.dmp"));
+-#endif  // _WIN32
++#endif  // !defined(_WIN32) && (!defined(__i386) && !defined(__x86_64))
+ }
+ 
+-#ifndef _WIN32
++#if !defined(_WIN32) && (defined(__i386) || defined(__x86_64))
+ TEST(ExploitabilityLinuxUtilsTest, DisassembleBytesTest) {
+   ASSERT_FALSE(ExploitabilityLinuxTest::DisassembleBytes("", NULL, 5, NULL));
+   uint8_t bytes[6] = {0xc7, 0x0, 0x5, 0x0, 0x0, 0x0};
+@@ -301,6 +307,7 @@ TEST(ExploitabilityLinuxUtilsTest, Calcu
+                                                          context,
+                                                          &write_address));
+ }
+-#endif  // _WIN32
++#endif  // !defined(_WIN32) && (defined(__i386) || defined(__x86_64))
++
+ 
+ }  // namespace
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/tools/linux/md2core/minidump-2-core.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/tools/linux/md2core/minidump-2-core.cc
+@@ -77,6 +77,8 @@
+   #define ELF_ARCH  EM_MIPS
+ #elif defined(__aarch64__)
+   #define ELF_ARCH  EM_AARCH64
++#elif defined(__powerpc64__)
++  #define ELF_ARCH  EM_PPC64
+ #endif
+ 
+ #if defined(__arm__)
+@@ -87,6 +89,8 @@ typedef user_regs user_regs_struct;
+ #elif defined (__mips__)
+ // This file-local typedef simplifies the source code.
+ typedef gregset_t user_regs_struct;
++#elif defined(__powerpc64__)
++typedef struct pt_regs user_regs_struct;
+ #endif
+ 
+ using google_breakpad::MDTypeHelper;
+@@ -322,6 +326,12 @@ struct CrashedProcess {
+ #if defined(__aarch64__)
+     user_fpsimd_struct fpregs;
+ #endif
++#if defined(__powerpc64__)
++    mcontext_t mcontext;
++#endif
++#if defined(__powerpc64__)
++    mcontext_t mcontext;
++#endif
+     uintptr_t stack_addr;
+     const uint8_t* stack;
+     size_t stack_length;
+@@ -535,6 +545,38 @@ ParseThreadRegisters(CrashedProcess::Thr
+   thread->mcontext.fpc_eir = rawregs->float_save.fir;
+ #endif
+ }
++#elif defined(__powerpc64__)
++static void
++ParseThreadRegisters(CrashedProcess::Thread* thread,
++                     const MinidumpMemoryRange& range) {
++  const MDRawContextPPC64* rawregs = range.GetData<MDRawContextPPC64>(0);
++
++  for (int i = 0; i < MD_CONTEXT_PPC64_GPR_COUNT; i++)
++    thread->mcontext.gp_regs[i] = rawregs->gpr[i];
++
++  thread->mcontext.gp_regs[PT_LNK] = rawregs->lr;
++  thread->mcontext.gp_regs[PT_NIP] = rawregs->srr0;
++  thread->mcontext.gp_regs[PT_MSR] = rawregs->srr1;
++  thread->mcontext.gp_regs[PT_CCR] = rawregs->cr;
++  thread->mcontext.gp_regs[PT_XER] = rawregs->xer;
++  thread->mcontext.gp_regs[PT_CTR] = rawregs->ctr;
++  thread->mcontext.v_regs->vrsave = rawregs->vrsave;
++
++  for (int i = 0; i < MD_FLOATINGSAVEAREA_PPC_FPR_COUNT; i++)
++      thread->mcontext.fp_regs[i] = rawregs->float_save.fpregs[i];
++
++  thread->mcontext.fp_regs[NFPREG-1] = rawregs->float_save.fpscr;
++
++  for (int i = 0; i < MD_VECTORSAVEAREA_PPC_VR_COUNT; i++) {
++      thread->mcontext.v_regs->vrregs[i][0] = rawregs->vector_save.save_vr[i].high >> 32;
++      thread->mcontext.v_regs->vrregs[i][1] = rawregs->vector_save.save_vr[i].high;
++      thread->mcontext.v_regs->vrregs[i][2] = rawregs->vector_save.save_vr[i].low >> 32;
++      thread->mcontext.v_regs->vrregs[i][3] = rawregs->vector_save.save_vr[i].low;
++  }
++
++  thread->mcontext.v_regs->vscr.vscr_word = rawregs->vector_save.save_vscr.low & 0xFFFFFFFF;
++}
++
+ #else
+ #error "This code has not been ported to your platform yet"
+ #endif
+@@ -623,6 +665,12 @@ ParseSystemInfo(const Options& options,
+ # else
+ #  error "This mips ABI is currently not supported (n32)"
+ # endif
++#elif defined(__powerpc64__)
++  if (sysinfo->processor_architecture != MD_CPU_ARCHITECTURE_PPC64) {
++    fprintf(stderr,
++            "This version of minidump-2-core only supports PPC64.\n");
++    exit(1);
++  }
+ #else
+ #error "This code has not been ported to your platform yet"
+ #endif
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/CONTRIBUTORS
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/CONTRIBUTORS
+@@ -13,3 +13,4 @@ Mark Mentovai <mark@chromium.org>
+ Robert Sesek <rsesek@chromium.org>
+ Scott Graham <scottmg@chromium.org>
+ Joshua Peraza <jperaza@chromium.org>
++Shawn Anastasio <shawn@anastas.io>
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/compat/linux/sys/user.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/compat/linux/sys/user.h
+@@ -15,6 +15,7 @@
+ #ifndef CRASHPAD_COMPAT_LINUX_SYS_USER_H_
+ #define CRASHPAD_COMPAT_LINUX_SYS_USER_H_
+ 
++#include <cstddef>
+ #include_next <sys/user.h>
+ 
+ #include <features.h>
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/minidump/minidump_context.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/minidump/minidump_context.h
+@@ -592,6 +592,70 @@ struct MinidumpContextMIPS64 {
+   uint64_t fir;
+ };
+ 
++//! \brief ppc64-specific flags for MinidumpPPC64::context_flags
++//! Based on minidump_cpu_ppc64.h from breakpad
++enum MinidumpContextPPC64Flags : uint32_t {
++  //! \brief Identifies the context as PPC64.
++  kMinidumpContextPPC64 = 0x01000000,
++
++  //! \brief Indicates the validity of general purpose registers.
++  //!
++  //! Registers `r0`-`r31`, `nip`, `msr`, `lr`, etc. are valid.
++  kMinidumpContextPPC64Base = kMinidumpContextPPC64 | 0x00000001,
++
++  //! \brief Indicates the validity of floating point registers.
++  //!
++  //! Registers `fp0`-`fp31`, `fpscr` are valid.
++  kMinidumpContextPPC64Floating = kMinidumpContextPPC64 | 0x00000008,
++
++  //! \brief Indicates the validity of Altivec/VMX registers.
++  //!
++  //! Registers `v0`-`v31`, `vscr`, `vrsave`.
++  kMinidumpContextPPC64Vector = kMinidumpContextPPC64 | 0x00000020,
++
++  //! \brief Indicates the validity of all registers
++  kMinidumpContextPPC64All = kMinidumpContextPPC64Base     |
++                             kMinidumpContextPPC64Floating |
++                             kMinidumpContextPPC64Vector
++};
++
++//! \brief A PPC64 CPU context carried in a minidump file.
++//! Based on minidump_cpu_ppc64.h from breakpad.
++struct MinidumpContextPPC64 {
++  uint64_t context_flags;
++
++  //! \brief General purpose registers.
++  uint64_t nip;
++  uint64_t msr;
++  uint64_t regs[32];
++  uint64_t ccr;
++  uint64_t xer;
++  uint64_t lnk;
++  uint64_t ctr;
++
++  //! \brief Floating point registers.
++  double fpregs[32];
++
++  //! \brief FPU status register.
++  double fpscr;
++
++  //! \brief Altivec/VMX vector registers.
++  struct {
++      //! \brief Vector registers are 128bits.
++      uint128_struct save_vr[32];
++      uint128_struct save_vscr;
++
++      //! \brief Padding included for breakpad compatibiltiy.
++      uint32_t save_pad5[4];
++
++      //! \brief VRSAVE register.
++      uint32_t save_vrsave;
++
++      //! \brief Padding included for breakpad compatibiltiy.
++      uint32_t save_pad6[7];
++  } vregs;
++};
++
+ }  // namespace crashpad
+ 
+ #endif  // CRASHPAD_MINIDUMP_MINIDUMP_CONTEXT_H_
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/minidump/minidump_context_writer.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/minidump/minidump_context_writer.cc
+@@ -101,6 +101,13 @@ MinidumpContextWriter::CreateFromSnapsho
+       break;
+     }
+ 
++    case kCPUArchitecturePPC64: {
++      context = std::make_unique<MinidumpContextPPC64Writer>();
++      reinterpret_cast<MinidumpContextPPC64Writer*>(context.get())
++          ->InitalizeFromSnapshot(context_snapshot->ppc64);
++      break;
++    }
++
+     default: {
+       LOG(ERROR) << "unknown context architecture "
+                  << context_snapshot->architecture;
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/minidump/minidump_context_writer.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/minidump/minidump_context_writer.h
+@@ -315,6 +315,45 @@ class MinidumpContextMIPS64Writer final
+   DISALLOW_COPY_AND_ASSIGN(MinidumpContextMIPS64Writer);
+ };
+ 
++class MinidumpContextPPC64Writer final : public MinidumpContextWriter {
++ public:
++  MinidumpContextPPC64Writer();
++  ~MinidumpContextPPC64Writer() override;
++
++  //! \brief Initalizes the MinidumpContextPPC64 based on \a context_snapshot.
++  //!
++  //! \param[in] context_snapshot The context snapshot to use as source data.
++  //!
++  //! \note Valid in #kStateMutable. No mutation of context() may be done before
++  //!     calling this method, and it is not normally necessary to alter
++  //!     context() after calling this method.
++  void InitalizeFromSnapshot(const CPUContextPPC64* context_snapshot);
++
++  //! \brief Returns a pointer to the context structure that this object will
++  //!     write.
++  //!
++  //! \attention This returns a non-`const` pointer to this object’s private
++  //!     data so that a caller can populate the context structure directly.
++  //!     This is done because providing setter interfaces to each field in the
++  //!     context structure would be unwieldy and cumbersome. Care must be taken
++  //!     to populate the context structure correctly. The context structure
++  //!     must only be modified while this object is in the #kStateMutable
++  //!     state.
++  MinidumpContextPPC64* context() { return &context_; }
++
++ protected:
++  // MinidumpWritable:
++  bool WriteObject(FileWriterInterface* file_writer) override;
++
++  // MinidumpContextWriter:
++  size_t ContextSize() const override;
++
++ private:
++  MinidumpContextPPC64 context_;
++
++  DISALLOW_COPY_AND_ASSIGN(MinidumpContextPPC64Writer);
++};
++
+ }  // namespace crashpad
+ 
+ #endif  // CRASHPAD_MINIDUMP_MINIDUMP_CONTEXT_WRITER_H_
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/minidump/minidump_context_writer_test.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/minidump/minidump_context_writer_test.cc
+@@ -213,6 +213,21 @@ TEST(MinidumpContextWriter, MIPS64_FromS
+       context, ExpectMinidumpContextMIPS64, kSeed);
+ }
+ 
++TEST(MinidumpContextWriter, PPC64_Zeros) {
++  EmptyContextTest<MinidumpContextPPC64Writer, MinidumpContextPPC64>(
++    ExpectMinidumpContextPPC64);
++}
++
++TEST(MinidumpContextWriter, PPC64_FromSnapshot) {
++  constexpr uint32_t kSeed = 64;
++  CPUContextPPC64 context_ppc64;
++  CPUContext context;
++  context.ppc64 = &context_ppc64;
++  InitializeCPUContextPPC64(&context, kSeed);
++  FromSnapshotTest<MinidumpContextPPC64Writer, MinidumpContextPPC64>(
++      context, ExpectMinidumpContextPPC64, kSeed);
++}
++
+ }  // namespace
+ }  // namespace test
+ }  // namespace crashpad
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/minidump/minidump_misc_info_writer.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/minidump/minidump_misc_info_writer.cc
+@@ -135,6 +135,8 @@ std::string MinidumpMiscInfoDebugBuildSt
+   static constexpr char kCPU[] = "mips";
+ #elif defined(ARCH_CPU_MIPS64EL)
+   static constexpr char kCPU[] = "mips64";
++#elif defined(ARCH_CPU_PPC64)
++  static constexpr char kCPU[] = "ppc64";
+ #else
+ #error define kCPU for this CPU
+ #endif
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/capture_memory.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/capture_memory.cc
+@@ -112,6 +112,11 @@ void CaptureMemory::PointedToByContext(c
+   for (size_t i = 0; i < base::size(context.mipsel->regs); ++i) {
+     MaybeCaptureMemoryAround(delegate, context.mipsel->regs[i]);
+   }
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++  MaybeCaptureMemoryAround(delegate, context.ppc64->nip);
++  for (size_t i = 0; i < base::size(context.ppc64->regs); ++i) {
++    MaybeCaptureMemoryAround(delegate, context.ppc64->regs[i]);
++  }
+ #else
+ #error Port.
+ #endif
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/cpu_architecture.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/cpu_architecture.h
+@@ -43,7 +43,10 @@ enum CPUArchitecture {
+   kCPUArchitectureMIPSEL,
+ 
+   //! \brief 64-bit MIPSEL.
+-  kCPUArchitectureMIPS64EL
++  kCPUArchitectureMIPS64EL,
++
++  //! \brief 64-bit PPC64.
++  kCPUArchitecturePPC64
+ };
+ 
+ }  // namespace crashpad
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/cpu_context.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/cpu_context.cc
+@@ -169,6 +169,8 @@ uint64_t CPUContext::InstructionPointer(
+       return arm->pc;
+     case kCPUArchitectureARM64:
+       return arm64->pc;
++    case kCPUArchitecturePPC64:
++      return ppc64->nip;
+     default:
+       NOTREACHED();
+       return ~0ull;
+@@ -185,6 +187,8 @@ uint64_t CPUContext::StackPointer() cons
+       return arm->sp;
+     case kCPUArchitectureARM64:
+       return arm64->sp;
++    case kCPUArchitecturePPC64:
++      return ppc64->regs[1];
+     default:
+       NOTREACHED();
+       return ~0ull;
+@@ -196,6 +200,7 @@ bool CPUContext::Is64Bit() const {
+     case kCPUArchitectureX86_64:
+     case kCPUArchitectureARM64:
+     case kCPUArchitectureMIPS64EL:
++    case kCPUArchitecturePPC64:
+       return true;
+     case kCPUArchitectureX86:
+     case kCPUArchitectureARM:
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/cpu_context.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/cpu_context.h
+@@ -352,6 +352,24 @@ struct CPUContextMIPS64 {
+   uint64_t fir;
+ };
+ 
++//! \brief A context structure carrying PPC64 CPU state.
++struct CPUContextPPC64 {
++  uint64_t nip;
++  uint64_t msr;
++  uint64_t regs[32];
++  uint64_t ccr;
++  uint64_t xer;
++  uint64_t lnk;
++  uint64_t ctr;
++  double fpregs[32];
++  double fpscr;
++  struct {
++    uint128_struct save_vr[32];
++    uint128_struct save_vscr;
++    uint32_t save_vrsave;
++  } vregs;
++};
++
+ //! \brief A context structure capable of carrying the context of any supported
+ //!     CPU architecture.
+ struct CPUContext {
+@@ -382,6 +400,7 @@ struct CPUContext {
+     CPUContextARM64* arm64;
+     CPUContextMIPS* mipsel;
+     CPUContextMIPS64* mips64;
++    CPUContextPPC64* ppc64;
+   };
+ };
+ 
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/cpu_context_linux.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/cpu_context_linux.h
+@@ -15,6 +15,7 @@
+ #ifndef CRASHPAD_SNAPSHOT_LINUX_CPU_CONTEXT_LINUX_H_
+ #define CRASHPAD_SNAPSHOT_LINUX_CPU_CONTEXT_LINUX_H_
+ 
++#include <cstring>
+ #include "build/build_config.h"
+ #include "snapshot/cpu_context.h"
+ #include "snapshot/linux/signal_context.h"
+@@ -174,6 +175,76 @@ void InitializeCPUContextMIPS(
+ 
+ #endif  // ARCH_CPU_MIPS_FAMILY || DOXYGEN
+ 
++#if defined(ARCH_CPU_PPC64_FAMILY) || DOXYGEN
++
++//! \brief Initalizes a CPUContextPPC64 structure from native context
++//!     structures on Linux.
++//!
++//! \param[in] thread_context The native thread context.
++//! \param[in] float_context The native float context.
++//! \param[in] vector_context The native vector context.
++//! \param[out] context The CPUContextPPC64 structure to initalize.
++template <typename Traits>
++void InitializeCPUContextPPC64(
++    const ThreadContext::t64_t& thread_context,
++    const FloatContext::f64_t& float_context,
++    const VectorContext::v64_t& vector_context,
++    typename Traits::CPUContext* context) {
++
++  memcpy(context->regs, thread_context.gpr, sizeof(context->regs));
++  context->nip = thread_context.nip;
++  context->msr = thread_context.msr;
++  context->ccr = thread_context.ccr;
++  context->xer = thread_context.xer;
++  context->lnk = thread_context.lnk;
++  context->ctr = thread_context.ctr;
++
++  memcpy(context->fpregs, float_context.fpregs, sizeof(context->fpregs));
++  context->fpscr = float_context.fpscr;
++
++  for (uint8_t i = 0; i < 32; i++) {
++    context->vregs.save_vr[i] = {
++      (((uint64_t)vector_context.vrregs[i][0]) << 32) |
++        vector_context.vrregs[i][1],
++      (((uint64_t)vector_context.vrregs[i][2]) << 32) |
++        vector_context.vrregs[i][3]
++    };
++  }
++  context->vregs.save_vrsave = vector_context.vrsave;
++  context->vregs.save_vscr = {0, (uint64_t)vector_context.vscr.vscr_word};
++}
++
++template <typename Traits>
++void InitializeCPUContextPPC64(
++    const SignalThreadContext64 &thread_context,
++    const SignalFloatContext64 &float_context,
++    const SignalVectorContext64 &vector_context,
++    typename Traits::CPUContext* context) {
++
++  memcpy(context->regs, thread_context.regs, sizeof(context->regs));
++  context->nip = thread_context.nip;
++  context->msr = thread_context.msr;
++  context->ccr = thread_context.ccr;
++  context->xer = thread_context.xer;
++  context->lnk = thread_context.lnk;
++  context->ctr = thread_context.ctr;
++
++  memcpy(context->fpregs, float_context.regs, sizeof(context->fpregs));
++  context->fpscr = float_context.fpscr;
++
++  for (uint8_t i = 0; i < 32; i++) {
++    context->vregs.save_vr[i] = {
++      (((uint64_t)vector_context.vrregs[i][0]) << 32) |
++        vector_context.vrregs[i][1],
++      (((uint64_t)vector_context.vrregs[i][2]) << 32) |
++        vector_context.vrregs[i][3]
++    };
++  }
++  context->vregs.save_vrsave = vector_context.vrsave;
++  context->vregs.save_vscr = {0, (uint64_t)vector_context.vscr.vscr_word};
++}
++
++#endif
+ }  // namespace internal
+ }  // namespace crashpad
+ 
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/debug_rendezvous_test.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/debug_rendezvous_test.cc
+@@ -192,6 +192,8 @@ void TestAgainstTarget(PtraceConnection*
+               device == 0 && inode == 0 && mapping_name == "[vdso]";
+ #if defined(ARCH_CPU_X86)
+           static constexpr char kPrefix[] = "linux-gate.so.";
++#elif defined(ARCH_CPU_PPC64)
++          static constexpr char kPrefix[] = "linux-vdso64.so.";
+ #else
+           static constexpr char kPrefix[] = "linux-vdso.so.";
+ #endif
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux.cc
+@@ -323,6 +323,69 @@ bool ExceptionSnapshotLinux::ReadContext
+       reader, context_address, context_.mips64);
+ }
+ 
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++
++template <typename Traits>
++static bool ReadContext(ProcessReaderLinux* reader,
++                        LinuxVMAddress context_address,
++                        typename Traits::CPUContext* dest_context) {
++  const ProcessMemory* memory = reader->Memory();
++
++  LinuxVMAddress gp_regs_address = context_address +
++                                   offsetof(UContext, mcontext) +
++                                   offsetof(typename Traits::MContext, gp_regs);
++
++  typename Traits::SignalThreadContext thread_context;
++  if (!memory->Read(gp_regs_address, sizeof(thread_context), &thread_context)) {
++    LOG(ERROR) << "Couldn't read gp_regs!";
++    return false;
++  }
++
++  LinuxVMAddress fp_regs_address = context_address +
++                                   offsetof(UContext, mcontext) +
++                                   offsetof(typename Traits::MContext, fp_regs);
++
++  typename Traits::SignalFloatContext fp_context;
++  if (!memory->Read(fp_regs_address, sizeof(fp_context), &fp_context)) {
++    LOG(ERROR) << "Couldn't read fp_regs!";
++    return false;
++  }
++
++  LinuxVMAddress v_regs_ptr_address = context_address +
++                                  offsetof(UContext, mcontext) +
++                                  offsetof(typename Traits::MContext, vmx_reserve) + 8;
++
++  typename Traits::SignalVectorContext v_context;
++  if (!memory->Read(v_regs_ptr_address, sizeof(v_context), &v_context)) {
++    LOG(ERROR) << "Couldn't read v_regs!";
++    return false;
++  }
++
++  InitializeCPUContextPPC64<ContextTraits64>(thread_context, fp_context,
++                            v_context, dest_context);
++
++  return true;
++}
++
++template<>
++bool ExceptionSnapshotLinux::ReadContext<ContextTraits64>(
++    ProcessReaderLinux* reader,
++    LinuxVMAddress context_address) {
++  context_.architecture = kCPUArchitecturePPC64;
++  context_.ppc64 = &context_union_.ppc64;
++
++  return internal::ReadContext<ContextTraits64>(
++      reader, context_address, context_.ppc64);
++}
++
++template<>
++bool ExceptionSnapshotLinux::ReadContext<ContextTraits32>(
++    ProcessReaderLinux* reader,
++    LinuxVMAddress context_address) {
++  // PPC64 is 64-bit
++  return false;
++}
++
+ #endif  // ARCH_CPU_X86_FAMILY
+ 
+ bool ExceptionSnapshotLinux::Initialize(ProcessReaderLinux* process_reader,
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux.h
+@@ -84,6 +84,8 @@ class ExceptionSnapshotLinux final : pub
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+     CPUContextMIPS mipsel;
+     CPUContextMIPS64 mips64;
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++    CPUContextPPC64 ppc64;
+ #endif
+   } context_union_;
+   CPUContext context_;
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux_test.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux_test.cc
+@@ -296,7 +296,28 @@ void ExpectContext(const CPUContext& act
+             0);
+ #undef CPU_ARCH_NAME
+ }
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++using NativeCPUContext = ucontext_t;
+ 
++void InitializeContext(NativeCPUContext* context) {
++  for (size_t reg = 0; reg < 32; ++reg) {
++    context->uc_mcontext.gp_regs[reg] = reg;
++  }
++
++  memset(&context->uc_mcontext.fp_regs, 44,
++      sizeof(context->uc_mcontext.fp_regs));
++}
++
++void ExpectContext(const CPUContext& actual, const NativeCPUContext& expected) {
++  EXPECT_EQ(actual.architecture, kCPUArchitecturePPC64);
++
++  for (size_t reg = 0; reg < 32; ++reg) {
++    EXPECT_EQ(actual.ppc64->regs[reg], expected.uc_mcontext.gp_regs[reg]);
++  }
++
++  EXPECT_EQ(memcmp(actual.ppc64->fpregs, expected.uc_mcontext.fp_regs,
++            sizeof(actual.ppc64->fpregs)), 0);
++}
+ #else
+ #error Port.
+ #endif
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/process_reader_linux.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/process_reader_linux.cc
+@@ -108,6 +108,8 @@ void ProcessReaderLinux::Thread::Initial
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+   stack_pointer = reader->Is64Bit() ? thread_info.thread_context.t64.regs[29]
+                                     : thread_info.thread_context.t32.regs[29];
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++  stack_pointer = thread_info.thread_context.t64.gpr[1];
+ #else
+ #error Port.
+ #endif
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/signal_context.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/signal_context.h
+@@ -422,6 +422,93 @@ static_assert(offsetof(UContext<ContextT
+               "context offset mismatch");
+ #endif
+ 
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++
++struct SignalThreadContext64 {
++  uint64_t regs[32];
++  uint64_t nip;
++  uint64_t msr;
++  uint64_t orig_r3;
++  uint64_t ctr;
++  uint64_t lnk;
++  uint64_t xer;
++  uint64_t ccr;
++  uint64_t softe;
++  uint64_t trap;
++  uint64_t dar;
++  uint64_t dsisr;
++  uint64_t result;
++  uint64_t dscr;
++  uint64_t fpr0[3];
++};
++
++struct SignalFloatContext64 {
++  double regs[32];
++  double fpscr;
++};
++
++struct SignalVectorContext64 {
++  int32_t vrregs[32][4];
++  struct {
++    int32_t __pad[3];
++    int32_t vscr_word;
++  } vscr;
++  int32_t vrsave;
++  int32_t __pad[3];
++} __attribute__((__aligned__(16)));
++
++
++#pragma pack(pop)
++struct MContext64 {
++  uint64_t reserved[4];
++  int32_t signal;
++  int32_t __pad0;
++  uint64_t handler;
++  uint64_t oldmask;
++  uint64_t pt_regs_ptr;
++  SignalThreadContext64 gp_regs;
++  SignalFloatContext64  fp_regs;
++  SignalVectorContext64 *v_regs;
++#ifdef __GLIBC__
++  int64_t vmx_reserve[69];
++#else
++  int64_t vmx_reserve[101];
++#endif
++};
++
++struct ContextTraits64 : public Traits64 {
++  using MContext = MContext64;
++  using SignalThreadContext = SignalThreadContext64;
++  using SignalFloatContext = SignalFloatContext64;
++  using SignalVectorContext = SignalVectorContext64;
++  using CPUContext = CPUContextPPC64;
++};
++
++struct ContextTraits32 : public Traits32 {};
++
++struct UContext {
++  uint64_t flags;
++  uint64_t link;
++  SignalStack<ContextTraits64> stack;
++  Sigset<ContextTraits64> sigmask;
++  MContext64 mcontext;
++};
++#pragma pack(push, 1)
++
++static_assert(sizeof(UContext) == sizeof(ucontext_t),
++              "ucontext_t size mismatch");
++static_assert(sizeof(MContext64) == sizeof(mcontext_t),
++              "mcontext_t size mismatch");
++static_assert(sizeof(SignalThreadContext64) == sizeof(gregset_t),
++              "gregset_t size mismatch");
++static_assert(sizeof(SignalFloatContext64) == sizeof(fpregset_t),
++              "fpregset_t size mismatch");
++static_assert(sizeof(SignalVectorContext64) == sizeof(vrregset_t),
++              "vrregset_t size mismatch");
++static_assert(offsetof(UContext, mcontext) ==
++              offsetof(ucontext_t, uc_mcontext), "mcontext offset mismatch");
++static_assert(offsetof(MContext64, gp_regs) ==
++              offsetof(mcontext_t, gp_regs), "gp_regs offset mismatch");
+ #else
+ #error Port.
+ #endif  // ARCH_CPU_X86_FAMILY
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/system_snapshot_linux.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/system_snapshot_linux.cc
+@@ -204,6 +204,8 @@ CPUArchitecture SystemSnapshotLinux::Get
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+   return process_reader_->Is64Bit() ? kCPUArchitectureMIPS64EL
+                                     : kCPUArchitectureMIPSEL;
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++  return kCPUArchitecturePPC64;
+ #else
+ #error port to your architecture
+ #endif
+@@ -219,6 +221,9 @@ uint32_t SystemSnapshotLinux::CPURevisio
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+   // Not implementable on MIPS
+   return 0;
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++  // Not yet implemented on PPC64
++  return 0;
+ #else
+ #error port to your architecture
+ #endif
+@@ -239,6 +244,9 @@ std::string SystemSnapshotLinux::CPUVend
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+   // Not implementable on MIPS
+   return std::string();
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++  // Not yet implemented on PPC64
++  return std::string();
+ #else
+ #error port to your architecture
+ #endif
+@@ -372,6 +380,9 @@ bool SystemSnapshotLinux::NXEnabled() co
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+   // Not implementable on MIPS
+   return false;
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++  // Not yet implemented on PPC64
++  return false;
+ #else
+ #error Port.
+ #endif  // ARCH_CPU_X86_FAMILY
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/test_modules.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/test_modules.cc
+@@ -110,6 +110,8 @@ bool WriteTestModule(const base::FilePat
+   module.ehdr.e_machine = EM_AARCH64;
+ #elif defined(ARCH_CPU_MIPSEL) || defined(ARCH_CPU_MIPS64EL)
+   module.ehdr.e_machine = EM_MIPS;
++#elif defined(ARCH_CPU_PPC64)
++  module.ehdr.e_machine = EM_PPC64;
+ #endif
+ 
+   module.ehdr.e_version = EV_CURRENT;
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/thread_snapshot_linux.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/thread_snapshot_linux.cc
+@@ -186,6 +186,14 @@ bool ThreadSnapshotLinux::Initialize(Pro
+         thread.thread_info.float_context.f32,
+         context_.mipsel);
+   }
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++  context_.architecture = kCPUArchitecturePPC64;
++  context_.ppc64 = &context_union_.ppc64;
++  InitializeCPUContextPPC64<ContextTraits64>(
++      thread.thread_info.thread_context.t64,
++      thread.thread_info.float_context.f64,
++      thread.thread_info.vector_context.v64,
++      context_.ppc64);
+ #else
+ #error Port.
+ #endif
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/thread_snapshot_linux.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/thread_snapshot_linux.h
+@@ -68,6 +68,8 @@ class ThreadSnapshotLinux final : public
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+     CPUContextMIPS mipsel;
+     CPUContextMIPS64 mips64;
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++    CPUContextPPC64 ppc64;
+ #else
+ #error Port.
+ #endif  // ARCH_CPU_X86_FAMILY
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/util/linux/auxiliary_vector.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/util/linux/auxiliary_vector.cc
+@@ -56,6 +56,11 @@ bool AuxiliaryVector::Read(PtraceConnect
+     if (type == AT_IGNORE) {
+       continue;
+     }
++#if defined(ARCH_CPU_PPC64_FAMILY)
++    if (type == AT_IGNOREPPC) {
++      continue;
++    }
++#endif
+     if (!MapInsertOrReplace(&values_, type, value, nullptr)) {
+       LOG(ERROR) << "duplicate auxv entry";
+       return false;
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/util/linux/ptracer.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/util/linux/ptracer.cc
+@@ -399,6 +399,64 @@ bool GetThreadArea64(pid_t tid,
+   return true;
+ }
+ 
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++// PPC64 has had HAVE_ARCH_TRACEHOOK set since 2.6.27 (even before x86 had it).
++// That means we can simply use PTRACE_GETREGESET.
++
++template <typename Destination>
++bool GetRegisterSet(pid_t tid, int set, Destination* dest, bool can_log) {
++  iovec iov;
++  iov.iov_base = reinterpret_cast<void*>(dest);
++  iov.iov_len = sizeof(*dest);
++  if (ptrace(PTRACE_GETREGSET, tid, reinterpret_cast<void*>(set), &iov) != 0) {
++    PLOG_IF(ERROR, can_log) << "ptrace";
++    return false;
++  }
++  if (iov.iov_len != sizeof(*dest)) {
++    LOG_IF(ERROR, can_log) << "Unexpected registers size";
++    return false;
++  }
++  return true;
++}
++
++bool GetVectorRegisters64(pid_t tid,
++                          VectorContext* context,
++                          bool can_log) {
++  return GetRegisterSet(tid, NT_PPC_VMX, &context->v64, can_log);
++}
++
++bool GetFloatingPointRegisters64(pid_t tid,
++                                 FloatContext* context,
++                                 bool can_log) {
++  return GetRegisterSet(tid, NT_PRFPREG, &context->f64, can_log);
++}
++
++bool GetThreadArea64(pid_t tid,
++                     const ThreadContext& context,
++                     LinuxVMAddress* address,
++                     bool can_log) {
++  // PPC64 doesn't have PTRACE_GET_THREAD_AREA since the thread pointer
++  // is stored in GPR 13.
++  ThreadContext::t64_t tc;
++  if (!GetRegisterSet(tid, NT_PRSTATUS, &tc, can_log)) {
++    LOG_IF(ERROR, can_log) << "Unable to get thread pointer!";
++    return false;
++  }
++
++  *address = tc.gpr[13];
++
++  return true;
++}
++
++// Stubs for 32-bit functions not applicable on PPC64
++bool GetFloatingPointRegisters32(pid_t tid,
++                                 FloatContext* context,
++                                 bool can_log) { return false; }
++bool GetThreadArea32(pid_t tid,
++                     const ThreadContext &context,
++                     LinuxVMAddress *address,
++                     bool can_log) { return false; }
++
+ #else
+ #error Port.
+ #endif  // ARCH_CPU_X86_FAMILY
+@@ -495,6 +553,9 @@ bool Ptracer::GetThreadInfo(pid_t tid, T
+   if (is_64_bit_) {
+     return GetGeneralPurposeRegisters64(tid, &info->thread_context, can_log_) &&
+            GetFloatingPointRegisters64(tid, &info->float_context, can_log_) &&
++#if defined(ARCH_CPU_PPC64_FAMILY)
++           GetVectorRegisters64(tid, &info->vector_context, can_log_) &&
++#endif
+            GetThreadArea64(tid,
+                            info->thread_context,
+                            &info->thread_specific_data_address,
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/util/linux/thread_info.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/util/linux/thread_info.h
+@@ -39,6 +39,13 @@ struct user_vfp_exc {
+ #include <android/api-level.h>
+ #endif
+ 
++#if defined(ARCH_CPU_PPC64_FAMILY)
++#include <sys/ucontext.h>
++#if !defined(__GLIBC__)
++#include <asm/ptrace.h>
++#endif
++#endif
++
+ namespace crashpad {
+ 
+ //! \brief The set of general purpose registers for an architecture family.
+@@ -90,6 +97,8 @@ union ThreadContext {
+     uint32_t cp0_status;
+     uint32_t cp0_cause;
+     uint32_t padding1_;
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++    // PPC64 is 64-bit
+ #else
+ #error Port.
+ #endif  // ARCH_CPU_X86_FAMILY
+@@ -143,6 +152,21 @@ union ThreadContext {
+     uint64_t cp0_badvaddr;
+     uint64_t cp0_status;
+     uint64_t cp0_cause;
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++    // Reflects struct pt_regs in asm/ptrace.h.
++    uint64_t gpr[32];
++    uint64_t nip;
++    uint64_t msr;
++    uint64_t orig_gpr3;
++    uint64_t ctr;
++    uint64_t lnk;
++    uint64_t xer;
++    uint64_t ccr;
++    uint64_t softe;
++    uint64_t trap;
++    uint64_t dar;
++    uint64_t dsisr;
++    uint64_t result;
+ #else
+ #error Port.
+ #endif  // ARCH_CPU_X86_FAMILY
+@@ -154,6 +178,8 @@ union ThreadContext {
+   using NativeThreadContext = user_regs;
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+ // No appropriate NativeThreadsContext type available for MIPS
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++  using NativeThreadContext = struct pt_regs;
+ #else
+ #error Port.
+ #endif  // ARCH_CPU_X86_FAMILY || ARCH_CPU_ARM64
+@@ -229,6 +255,9 @@ union FloatContext {
+     } fpregs[32];
+     uint32_t fpcsr;
+     uint32_t fpu_id;
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++    // Crashpad's PPC support is 64-bit only, so this
++    // 32bit-only struct is declared as empty.
+ #else
+ #error Port.
+ #endif  // ARCH_CPU_X86_FAMILY
+@@ -263,6 +292,10 @@ union FloatContext {
+     double fpregs[32];
+     uint32_t fpcsr;
+     uint32_t fpu_id;
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++    // Reflects fpregset_t in sys/ucontext.h
++    double fpregs[32];
++    double fpscr;
+ #else
+ #error Port.
+ #endif  // ARCH_CPU_X86_FAMILY
+@@ -291,6 +324,8 @@ union FloatContext {
+   static_assert(sizeof(f64) == sizeof(user_fpsimd_struct), "Size mismatch");
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+ // No appropriate floating point context native type for available MIPS.
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++  static_assert(sizeof(f64) == sizeof(fpregset_t), "Size mismatch");
+ #else
+ #error Port.
+ #endif  // ARCH_CPU_X86
+@@ -298,6 +333,26 @@ union FloatContext {
+ static_assert(std::is_standard_layout<FloatContext>::value,
+               "Not standard layout");
+ 
++//! \brief The vector registers used for an architecture family
++union VectorContext {
++  struct v32_t {} v32;
++#if defined(ARCH_CPU_PPC64_FAMILY)
++  __attribute__((__aligned__(16))) // Vector context must be doubleword aligned.
++#endif
++  struct v64_t {
++#if defined(ARCH_CPU_PPC64_FAMILY)
++    // Reflects vrregset_t in sys/ucontext.h
++    uint32_t vrregs[32][4];
++    struct {
++      uint32_t __pad[3];
++      uint32_t vscr_word;
++    } vscr;
++    uint32_t vrsave;
++    uint32_t __pad[3];
++#endif
++  } v64;
++};
++
+ //! \brief A collection of `ptrace`-able information about a thread.
+ struct ThreadInfo {
+   ThreadInfo();
+@@ -309,6 +364,9 @@ struct ThreadInfo {
+   //! \brief The floating point registers for the thread.
+   FloatContext float_context;
+ 
++  //! \brief (Optional) The vector registers used for the thread.
++  VectorContext vector_context;
++
+   //! \brief The thread-local storage address for the thread.
+   LinuxVMAddress thread_specific_data_address;
+ };
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/util/misc/capture_context.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/util/misc/capture_context.h
+@@ -69,6 +69,7 @@ using NativeCPUContext = ucontext_t;
+ //!     macOS/Linux/Fuchsia | x86_64       | `%%rdi`
+ //!     Linux               | ARM/ARM64    | `r0`/`x0`
+ //!     Linux               | MIPS/MIPS64  | `$a0`
++//!     Linux               | PPC64        | `r3`
+ //!
+ //!     Additionally, the value `LR` on ARM/ARM64 will be the return address of
+ //!     this function.
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/util/misc/capture_context_linux.S
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/util/misc/capture_context_linux.S
+@@ -32,7 +32,7 @@
+   .balign 4, 0x0
+   .type CAPTURECONTEXT_SYMBOL, %function
+   .type CAPTURECONTEXT_SYMBOL2, %function
+-#elif defined(__mips__)
++#elif defined(__mips__) || defined(__powerpc64__)
+   .balign 4, 0x0
+ #endif
+ 
+@@ -423,4 +423,214 @@ CAPTURECONTEXT_SYMBOL2:
+   jr $ra
+ 
+   .set at
++#elif defined(__powerpc64__)
++  // Store r0-r31
++  std 0, 0xe8(3)   // context->uc_mcontext.gp_regs[0]
++  std 1, 0xf0(3)   // context->uc_mcontext.gp_regs[1]
++  std 2, 0xf8(3)   // context->uc_mcontext.gp_regs[2]
++  // note that r3's original value was lost
++  std 3, 0x100(3)  // context->uc_mcontext.gp_regs[3]
++  std 4, 0x108(3)  // context->uc_mcontext.gp_regs[4]
++  std 5, 0x110(3)  // context->uc_mcontext.gp_regs[5]
++  std 6, 0x118(3)  // context->uc_mcontext.gp_regs[6]
++  std 7, 0x120(3)  // context->uc_mcontext.gp_regs[7]
++  std 8, 0x128(3)  // context->uc_mcontext.gp_regs[8]
++  std 9, 0x130(3)  // context->uc_mcontext.gp_regs[9]
++  std 10, 0x138(3) // context->uc_mcontext.gp_regs[10]
++  std 11, 0x140(3) // context->uc_mcontext.gp_regs[11]
++  std 12, 0x148(3) // context->uc_mcontext.gp_regs[12]
++  std 13, 0x150(3) // context->uc_mcontext.gp_regs[13]
++  std 14, 0x158(3) // context->uc_mcontext.gp_regs[14]
++  std 15, 0x160(3) // context->uc_mcontext.gp_regs[15]
++  std 16, 0x168(3) // context->uc_mcontext.gp_regs[16]
++  std 17, 0x170(3) // context->uc_mcontext.gp_regs[17]
++  std 18, 0x178(3) // context->uc_mcontext.gp_regs[18]
++  std 19, 0x180(3) // context->uc_mcontext.gp_regs[19]
++  std 20, 0x188(3) // context->uc_mcontext.gp_regs[20]
++  std 21, 0x190(3) // context->uc_mcontext.gp_regs[21]
++  std 22, 0x198(3) // context->uc_mcontext.gp_regs[22]
++  std 23, 0x1a0(3) // context->uc_mcontext.gp_regs[23]
++  std 24, 0x1a8(3) // context->uc_mcontext.gp_regs[24]
++  std 25, 0x1b0(3) // context->uc_mcontext.gp_regs[25]
++  std 26, 0x1b8(3) // context->uc_mcontext.gp_regs[26]
++  std 27, 0x1c0(3) // context->uc_mcontext.gp_regs[27]
++  std 28, 0x1c8(3) // context->uc_mcontext.gp_regs[28]
++  std 29, 0x1d0(3) // context->uc_mcontext.gp_regs[29]
++  std 30, 0x1d8(3) // context->uc_mcontext.gp_regs[30]
++  std 31, 0x1e0(3) // context->uc_mcontext.gp_regs[31]
++
++  // For NIP, we can use the value in the link register
++  mflr 0
++  std 0, 0x1e8(3) // context->uc_mcontext.gp_regs[PT_NIP]
++
++  // CTR
++  mfctr 0
++  std 0, 0x200(3) // context->uc_mcontext.gp_regs[PT_CTR]
++
++  // For LNK, we'll use the caller's LR save area (2 stack frames up).
++  // r4 can be used as a scratch register since it has already been saved.
++  ld 4, 0(1)
++  ld 4, 16(4)
++  std 4, 0x208(3) // context->uc_mcontext.gp_regs[PT_LNK]
++
++  // XER
++  mfxer 0
++  std 0, 0x210(3) // context->uc_mcontext.gp_regs[PT_XER]
++
++  // CCR
++  mfcr 0
++  std 0, 0x218(3) // context->uc_mcontext.gp_regs[PT_CCR]
++
++  // MSR, orig_r3, MQ, TRAP, DAR, DSISR, RESULT, DSCR,
++  // not used or not relevant,  zero them out.
++  li 4, 0
++  std 4, 0x1f0(3) // context->uc_mcontext.gp_regs[PT_MSR]
++  std 4, 0x1f8(3) // context->uc_mcontext.gp_regs[PT_ORIG_R3]
++  std 4, 0x220(3) // context->uc_mcontext.gp_regs[PT_MQ]
++  std 4, 0x228(3) // context->uc_mcontext.gp_regs[PT_TRAP]
++  std 4, 0x230(3) // context->uc_mcontext.gp_regs[PT_DAR]
++  std 4, 0x238(3) // context->uc_mcontext.gp_regs[PT_DSISR]
++  std 4, 0x240(3) // context->uc_mcontext.gp_regs[PT_RESULT]
++  std 4, 0x248(3) // context->uc_mcontext.gp_regs[PT_DSCR]
++
++  // Update context->uc_mcontext.regs to point to gp_regs
++  addi 0, 3, 0xe8
++  std 0, 0xe0(3)
++
++  // Save floating point registers 0-31
++  stfd 0, 0x268(3)  // context->uc_mcontext.fp_regs[0]
++  stfd 1, 0x270(3)  // context->uc_mcontext.fp_regs[1]
++  stfd 2, 0x278(3)  // context->uc_mcontext.fp_regs[2]
++  stfd 3, 0x280(3)  // context->uc_mcontext.fp_regs[3]
++  stfd 4, 0x288(3)  // context->uc_mcontext.fp_regs[4]
++  stfd 5, 0x290(3)  // context->uc_mcontext.fp_regs[5]
++  stfd 6, 0x298(3)  // context->uc_mcontext.fp_regs[6]
++  stfd 7, 0x2a0(3)  // context->uc_mcontext.fp_regs[7]
++  stfd 8, 0x2a8(3)  // context->uc_mcontext.fp_regs[8]
++  stfd 9, 0x2b0(3)  // context->uc_mcontext.fp_regs[9]
++  stfd 10, 0x2b8(3) // context->uc_mcontext.fp_regs[10]
++  stfd 11, 0x2c0(3) // context->uc_mcontext.fp_regs[11]
++  stfd 12, 0x2c8(3) // context->uc_mcontext.fp_regs[12]
++  stfd 13, 0x2d0(3) // context->uc_mcontext.fp_regs[13]
++  stfd 14, 0x2d8(3) // context->uc_mcontext.fp_regs[14]
++  stfd 15, 0x2e0(3) // context->uc_mcontext.fp_regs[15]
++  stfd 16, 0x2e8(3) // context->uc_mcontext.fp_regs[16]
++  stfd 17, 0x2f0(3) // context->uc_mcontext.fp_regs[17]
++  stfd 18, 0x2f8(3) // context->uc_mcontext.fp_regs[18]
++  stfd 19, 0x300(3) // context->uc_mcontext.fp_regs[19]
++  stfd 20, 0x308(3) // context->uc_mcontext.fp_regs[20]
++  stfd 21, 0x310(3) // context->uc_mcontext.fp_regs[21]
++  stfd 22, 0x318(3) // context->uc_mcontext.fp_regs[22]
++  stfd 23, 0x320(3) // context->uc_mcontext.fp_regs[23]
++  stfd 24, 0x328(3) // context->uc_mcontext.fp_regs[24]
++  stfd 25, 0x330(3) // context->uc_mcontext.fp_regs[25]
++  stfd 26, 0x338(3) // context->uc_mcontext.fp_regs[26]
++  stfd 27, 0x340(3) // context->uc_mcontext.fp_regs[27]
++  stfd 28, 0x348(3) // context->uc_mcontext.fp_regs[28]
++  stfd 29, 0x350(3) // context->uc_mcontext.fp_regs[29]
++  stfd 30, 0x358(3) // context->uc_mcontext.fp_regs[30]
++  stfd 31, 0x360(3) // context->uc_mcontext.fp_regs[31]
++
++  // FPSCR
++  mffs 0
++  stfd 0, 0x368(3) // context->uc_mcontext.fp_regs[32]
++
++  // Save VMX Vector registers
++  // Update r4 to contain the base address of vmx_reserve
++  addi 4, 3, 0x378
++  // Ensure that it is quadword aligned
++  andi. 5, 4, 0xF
++  beq 1f // No alignment is necessary
++  // Address is doubleword aligned and not quadword aligned, add 8
++  addi 4, 4, 8
++
++1:
++  // Store VMX registers 0-31
++  // r4 will contain the base address
++  // r5 will contain the index
++  li 5, 0
++  stvx 0, 4, 5   // context->uc_mcontext.vmx_reserve[(align) + 0]
++  addi 5, 5, 16
++  stvx 1, 4, 5   // context->uc_mcontext.vmx_reserve[(align) + 1]
++  addi 5, 5, 16
++  stvx 2, 4, 5   // context->uc_mcontext.vmx_reserve[(align) + 2]
++  addi 5, 5, 16
++  stvx 3, 4, 5   // context->uc_mcontext.vmx_reserve[(align) + 3]
++  addi 5, 5, 16
++  stvx 4, 4, 5   // context->uc_mcontext.vmx_reserve[(align) + 4]
++  addi 5, 5, 16
++  stvx 5, 4, 5   // context->uc_mcontext.vmx_reserve[(align) + 5]
++  addi 5, 5, 16
++  stvx 6, 4, 5   // context->uc_mcontext.vmx_reserve[(align) + 6]
++  addi 5, 5, 16
++  stvx 7, 4, 5   // context->uc_mcontext.vmx_reserve[(align) + 7]
++  addi 5, 5, 16
++  stvx 8, 4, 5   // context->uc_mcontext.vmx_reserve[(align) + 8]
++  addi 5, 5, 16
++  stvx 9, 4, 5   // context->uc_mcontext.vmx_reserve[(align) + 9]
++  addi 5, 5, 16
++  stvx 10, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 10]
++  addi 5, 5, 16
++  stvx 11, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 11]
++  addi 5, 5, 16
++  stvx 12, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 12]
++  addi 5, 5, 16
++  stvx 13, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 13]
++  addi 5, 5, 16
++  stvx 14, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 14]
++  addi 5, 5, 16
++  stvx 15, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 15]
++  addi 5, 5, 16
++  stvx 16, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 16]
++  addi 5, 5, 16
++  stvx 17, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 17]
++  addi 5, 5, 16
++  stvx 18, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 18]
++  addi 5, 5, 16
++  stvx 19, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 19]
++  addi 5, 5, 16
++  stvx 20, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 20]
++  addi 5, 5, 16
++  stvx 21, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 21]
++  addi 5, 5, 16
++  stvx 22, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 22]
++  addi 5, 5, 16
++  stvx 23, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 23]
++  addi 5, 5, 16
++  stvx 24, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 24]
++  addi 5, 5, 16
++  stvx 25, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 25]
++  addi 5, 5, 16
++  stvx 26, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 26]
++  addi 5, 5, 16
++  stvx 27, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 27]
++  addi 5, 5, 16
++  stvx 28, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 28]
++  addi 5, 5, 16
++  stvx 29, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 29]
++  addi 5, 5, 16
++  stvx 30, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 30]
++  addi 5, 5, 16
++  stvx 31, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 31]
++  addi 5, 5, 16
++
++  // VSCR
++  mfvscr 0
++  stvx 0, 4, 5
++  addi 5, 5, 16
++
++  // VRSAVE
++  mfvrsave 0
++  stwx 0, 4, 5
++
++  // Update context->uc_mcontext.v_regs to point to vmx_reserve + alignment.
++  std 4, 0x370(3)
++
++  // Zero out all unused fields
++  li 4, 0
++  std 4, 0xc8(3) // context->uc_mcontext.signal
++  std 4, 0xd0(3) // context->uc_mcontext.handler
++  std 4, 0xd8(3) // context->uc_mcontext.oldmask
++
++  blr
+ #endif  // __i386__
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/util/misc/capture_context_test.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/util/misc/capture_context_test.cc
+@@ -57,7 +57,7 @@ void TestCaptureContext() {
+   uintptr_t pc = ProgramCounterFromContext(context_1);
+ 
+ #if !defined(ADDRESS_SANITIZER) && !defined(ARCH_CPU_MIPS_FAMILY) && \
+-    !defined(MEMORY_SANITIZER)
++    !defined(MEMORY_SANITIZER) && !defined(ARCH_CPU_PPC64_FAMILY)
+   // Sanitizers can cause enough code bloat that the “nearby” check would
+   // likely fail.
+   const uintptr_t kReferencePC =
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/util/misc/capture_context_test_util_linux.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/util/misc/capture_context_test_util_linux.cc
+@@ -35,6 +35,8 @@ void SanityCheckContext(const NativeCPUC
+   EXPECT_EQ(context.uc_mcontext.regs[0], FromPointerCast<uintptr_t>(&context));
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+   EXPECT_EQ(context.uc_mcontext.gregs[4], FromPointerCast<uintptr_t>(&context));
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++  EXPECT_EQ(context.uc_mcontext.gp_regs[3], FromPointerCast<uintptr_t>(&context));
+ #endif
+ }
+ 
+@@ -49,6 +51,8 @@ uintptr_t ProgramCounterFromContext(cons
+   return context.uc_mcontext.pc;
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+   return context.uc_mcontext.pc;
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++  return context.uc_mcontext.gp_regs[PT_NIP];
+ #endif
+ }
+ 
+@@ -63,6 +67,8 @@ uintptr_t StackPointerFromContext(const
+   return context.uc_mcontext.sp;
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+   return context.uc_mcontext.gregs[29];
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++  return context.uc_mcontext.gp_regs[1];
+ #endif
+ }
+ 
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/util/posix/signals_test.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/util/posix/signals_test.cc
+@@ -46,9 +46,9 @@ bool CanCauseSignal(int sig) {
+   return sig == SIGABRT ||
+          sig == SIGALRM ||
+          sig == SIGBUS ||
+-#if !defined(ARCH_CPU_ARM64)
++#if !defined(ARCH_CPU_ARM64) && !defined(ARCH_CPU_PPC64)
+          sig == SIGFPE ||
+-#endif  // !defined(ARCH_CPU_ARM64)
++#endif  // !defined(ARCH_CPU_ARM64) && !defined(ARCH_CPU_PPC64)
+ #if defined(ARCH_CPU_X86_FAMILY) || defined(ARCH_CPU_ARMEL)
+          sig == SIGILL ||
+ #endif  // defined(ARCH_CPU_X86_FAMILY) || defined(ARCH_CPU_ARMEL)
+@@ -117,9 +117,11 @@ void CauseSignal(int sig) {
+       break;
+     }
+ 
+-#if !defined(ARCH_CPU_ARM64)
++#if !defined(ARCH_CPU_ARM64) && !defined(ARCH_CPU_PPC64)
+     // ARM64 has hardware integer division instructions that don’t generate a
+     // trap for divide-by-zero, so this doesn’t produce SIGFPE.
++    //
++    // PPC64 fixed-point division by zero also doesn't produce a SIGFPE.
+     case SIGFPE: {
+       // Optimization makes this tricky, so get zero from a system call likely
+       // to succeed, and try to do something with the result.
+@@ -137,7 +139,7 @@ void CauseSignal(int sig) {
+       fstat(quotient, &stat_buf);
+       break;
+     }
+-#endif  // ARCH_CPU_ARM64
++#endif  // !defined(ARCH_CPU_ARM64) && !defined(ARCH_CPU_PPC64)
+ 
+ #if defined(ARCH_CPU_X86_FAMILY) || defined(ARCH_CPU_ARMEL)
+     case SIGILL: {
+--- a/src/3rdparty/chromium/third_party/dav1d/BUILD.gn
++++ b/src/3rdparty/chromium/third_party/dav1d/BUILD.gn
+@@ -196,6 +196,8 @@ static_library("dav1d_8bit") {
+     sources += arm_template_sources
+   } else if (current_cpu == "arm64") {
+     sources += arm_template_sources
++  } else if (current_cpu == "ppc64") {
++    sources += ppc64_template_sources
+   }
+ 
+   cflags = dav1d_copts
+@@ -226,6 +228,8 @@ static_library("dav1d_10bit") {
+     sources += arm_template_sources
+   } else if (current_cpu == "arm64") {
+     sources += arm_template_sources
++  } else if (current_cpu == "ppc64") {
++    sources += ppc64_template_sources
+   }
+ 
+   cflags = dav1d_copts
+@@ -283,6 +287,21 @@ if (current_cpu == "x86" || current_cpu
+     }
+ 
+     cflags = dav1d_copts
++  }
++} else if (current_cpu == "ppc64") {
++  static_library("dav1d_ppc") {
++    sources = [
++      "libdav1d/src/ppc/cpu.c",
++      "libdav1d/src/ppc/cpu.h",
++    ]
++
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [
++      "//build/config/compiler:no_chromium_code",
++      ":dav1d_config",
++    ]
++
++    cflags = dav1d_copts
+ 
+     deps = [ ":dav1d_headers" ]
+     allow_circular_includes_from = [ ":dav1d_headers" ]
+@@ -315,5 +334,7 @@ static_library("dav1d") {
+     }
+   } else if (current_cpu == "arm" || current_cpu == "arm64") {
+     deps += [ ":dav1d_arm" ]
++  } else if (current_cpu == "ppc64") {
++    deps += [ ":dav1d_ppc" ]
+   }
+ }
+--- a/src/3rdparty/chromium/third_party/dav1d/dav1d_generated.gni
++++ b/src/3rdparty/chromium/third_party/dav1d/dav1d_generated.gni
+@@ -103,6 +103,11 @@ arm_template_sources = [
+   "libdav1d/src/arm/mc_init_tmpl.c",
+ ]
+ 
++ppc64_template_sources = [
++  "libdav1d/src/ppc/cdef_init_tmpl.c",
++  "libdav1d/src/ppc/looprestoration_init_tmpl.c",
++]
++
+ template_sources = [
+   "libdav1d/src/cdef_apply_tmpl.c",
+   "libdav1d/src/cdef_tmpl.c",
+--- a/src/3rdparty/chromium/third_party/dav1d/generate_source.py
++++ b/src/3rdparty/chromium/third_party/dav1d/generate_source.py
+@@ -57,6 +57,8 @@ def _WriteGn(fd):
+   _WriteArray(fd, "arm64_asm_sources", _Glob("libdav1d/src/arm/64/*.S"))
+   _WriteArray(fd, "arm_template_sources", _Glob("libdav1d/src/arm/*_tmpl.c"))
+ 
++  _WriteArray(fd, "ppc64_template_sources", _Glob("libdav1d/src/ppc/*_tmpl.c"))
++
+   template_sources = _Glob("libdav1d/src/*_tmpl.c")
+   _WriteArray(fd, "template_sources", template_sources)
+ 
+--- a/src/3rdparty/chromium/third_party/dav1d/libdav1d/src/ppc/types.h
++++ b/src/3rdparty/chromium/third_party/dav1d/libdav1d/src/ppc/types.h
+@@ -51,4 +51,19 @@
+ #define u16l_to_i32(v) ((i32x4) vec_mergel((u16x8) v, vec_splat_u16(0)))
+ #define i16l_to_i32(v) ((i32x4) vec_unpackl((i16x8)v))
+ 
++#if defined(__clang__)
++#undef vec_splats
++#define vec_splats(N)                     \
++    _Generic((N),                         \
++        unsigned char:      ((u8x16)(N)), \
++        signed char:        ((i8x16)(N)), \
++        unsigned short:     ((u16x8)(N)), \
++        signed short:       ((i16x8)(N)), \
++        unsigned int:       ((u32x4)(N)), \
++        signed int:         ((i32x4)(N)), \
++        unsigned long long: ((u64x2)(N)), \
++        signed long long:   ((i64x2)(N))  \
++    )
++#endif
++
+ #endif /* DAV1D_SRC_PPC_TYPES_H */
+--- a/src/3rdparty/chromium/third_party/eigen3/BUILD.gn
++++ b/src/3rdparty/chromium/third_party/eigen3/BUILD.gn
+@@ -22,4 +22,8 @@ config("eigen_includes") {
+     # for this component on Windows on Arm due to compilation errors.
+     defines += [ "EIGEN_DONT_VECTORIZE" ]
+   }
++
++  if (target_cpu == "ppc64") {
++    defines += [ "EIGEN_DONT_VECTORIZE" ]
++  }
+ }
+--- a/src/3rdparty/chromium/third_party/libaom/BUILD.gn
++++ b/src/3rdparty/chromium/third_party/libaom/BUILD.gn
+@@ -37,6 +37,8 @@ if (enable_libaom) {
+     } else {
+       cpu_arch_full = "arm"
+     }
++  } else if (current_cpu == "ppc64") {
++    cpu_arch_full = "generic"
+   } else {
+     cpu_arch_full = current_cpu
+   }
+--- a/src/3rdparty/chromium/third_party/libgav1/options.gni
++++ b/src/3rdparty/chromium/third_party/libgav1/options.gni
+@@ -12,5 +12,5 @@ declare_args() {
+       is_chromeos_ash && (target_cpu == "arm" || target_cpu == "arm64")
+   use_libgav1_parser =
+       (is_chromeos || is_linux || is_win) &&
+-      (target_cpu == "x86" || target_cpu == "x64" || target_cpu == "arm64")
++      (target_cpu == "x86" || target_cpu == "x64" || target_cpu == "arm64" || target_cpu == "ppc64")
+ }
+--- a/src/3rdparty/chromium/third_party/lss/linux_syscall_support.h
++++ b/src/3rdparty/chromium/third_party/lss/linux_syscall_support.h
+@@ -4262,7 +4262,7 @@ struct kernel_statfs {
+       LSS_REG(2, buf);
+       LSS_BODY(void*, mmap2, "0"(__r2));
+     }
+-#else
++#elif !defined(__powerpc64__) /* ppc64 doesn't have mmap2 */
+     #define __NR__mmap2 __NR_mmap2
+     LSS_INLINE _syscall6(void*, _mmap2,            void*, s,
+                          size_t,                   l, int,               p,
+@@ -4373,7 +4373,7 @@ struct kernel_statfs {
+   #if defined(__i386__) ||                                                    \
+       defined(__ARM_ARCH_3__) || defined(__ARM_EABI__) ||                     \
+      (defined(__mips__) && _MIPS_SIM == _MIPS_SIM_ABI32) ||                   \
+-      defined(__PPC__) ||                                                     \
++     (defined(__PPC__) && !defined(__powerpc64__)) ||                                                     \
+      (defined(__s390__) && !defined(__s390x__))
+     /* On these architectures, implement mmap() with mmap2(). */
+     LSS_INLINE void* LSS_NAME(mmap)(void *s, size_t l, int p, int f, int d,
+@@ -4556,9 +4556,17 @@ struct kernel_statfs {
+     }
+   #endif
+   #if defined(__NR_fstatat64)
++    #if !defined(__GLIBC__)
++        // musl doesn't define fstatat64 fstatat
++        #undef fstatat64
++    #endif
+     LSS_INLINE _syscall4(int,   fstatat64,        int,   d,
+                          const char *,      p,
+                          struct kernel_stat64 *,   b,    int,   f)
++    #if !defined(__GLIBC__)
++    	// then restore it
++        #define fstatat64 fstatat
++    #endif
+   #endif
+   #if defined(__NR_waitpid)
+     // waitpid is polyfilled below when not available.
+--- a/src/3rdparty/chromium/third_party/pdfium/third_party/libpng16/pngpriv.h
++++ b/src/3rdparty/chromium/third_party/pdfium/third_party/libpng16/pngpriv.h
+@@ -196,11 +196,7 @@
+ #endif
+ 
+ #ifndef PNG_POWERPC_VSX_OPT
+-#  if defined(__PPC64__) && defined(__ALTIVEC__) && defined(__VSX__)
+-#     define PNG_POWERPC_VSX_OPT 2
+-#  else
+-#     define PNG_POWERPC_VSX_OPT 0
+-#  endif
++#  define PNG_POWERPC_VSX_OPT 0
+ #endif
+ 
+ #ifndef PNG_INTEL_SSE_OPT
+--- a/src/3rdparty/chromium/third_party/pffft/src/pffft.c
++++ b/src/3rdparty/chromium/third_party/pffft/src/pffft.c
+@@ -100,6 +100,7 @@
+    Altivec support macros 
+ */
+ #if !defined(PFFFT_SIMD_DISABLE) && (defined(__ppc__) || defined(__ppc64__))
++#include <altivec.h>
+ typedef vector float v4sf;
+ #  define SIMD_SZ 4
+ #  define VZERO() ((vector float) vec_splat_u8(0))
+--- a/src/3rdparty/chromium/third_party/skia/src/sksl/SkSLString.cpp
++++ b/src/3rdparty/chromium/third_party/skia/src/sksl/SkSLString.cpp
+@@ -142,7 +142,12 @@ String to_string(double value) {
+     if (needsDotZero) {
+         buffer << ".0";
+     }
+-    return String(buffer.str().c_str());
++
++    std::string ret(buffer.str());
++    if (signbit(value) && ret[0] == '.') {
++        ret[0] = '-';
++    }
++    return String(ret.c_str());
+ }
+ 
+ bool stod(const skstd::string_view& s, SKSL_FLOAT* value) {
+--- a/src/3rdparty/chromium/third_party/sqlite/src/amalgamation/sqlite3.c
++++ b/src/3rdparty/chromium/third_party/sqlite/src/amalgamation/sqlite3.c
+@@ -14628,7 +14628,8 @@ typedef INT16_TYPE LogEst;
+ # if defined(i386)      || defined(__i386__)      || defined(_M_IX86) ||    \
+      defined(__x86_64)  || defined(__x86_64__)    || defined(_M_X64)  ||    \
+      defined(_M_AMD64)  || defined(_M_ARM)        || defined(__x86)   ||    \
+-     defined(__ARMEL__) || defined(__AARCH64EL__) || defined(_M_ARM64)
++     defined(__ARMEL__) || defined(__AARCH64EL__) || defined(_M_ARM64) ||   \
++     defined(__powerpc64__) && (__BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__)
+ #   define SQLITE_BYTEORDER    1234
+ # elif defined(sparc)     || defined(__ppc__) || \
+        defined(__ARMEB__) || defined(__AARCH64EB__)
+--- a/src/3rdparty/chromium/third_party/sqlite/src/amalgamation_dev/sqlite3.c
++++ b/src/3rdparty/chromium/third_party/sqlite/src/amalgamation_dev/sqlite3.c
+@@ -14641,7 +14641,8 @@ typedef INT16_TYPE LogEst;
+ # if defined(i386)      || defined(__i386__)      || defined(_M_IX86) ||    \
+      defined(__x86_64)  || defined(__x86_64__)    || defined(_M_X64)  ||    \
+      defined(_M_AMD64)  || defined(_M_ARM)        || defined(__x86)   ||    \
+-     defined(__ARMEL__) || defined(__AARCH64EL__) || defined(_M_ARM64)
++     defined(__ARMEL__) || defined(__AARCH64EL__) || defined(_M_ARM64) ||   \
++     defined(__powerpc64__) && (__BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__)
+ #   define SQLITE_BYTEORDER    1234
+ # elif defined(sparc)     || defined(__ppc__) || \
+        defined(__ARMEB__) || defined(__AARCH64EB__)
+--- a/src/3rdparty/chromium/third_party/sqlite/src/ext/rtree/rtree.c
++++ b/src/3rdparty/chromium/third_party/sqlite/src/ext/rtree/rtree.c
+@@ -450,7 +450,7 @@ struct RtreeMatchArg {
+ #if defined(i386)     || defined(__i386__)   || defined(_M_IX86) ||    \
+     defined(__x86_64) || defined(__x86_64__) || defined(_M_X64)  ||    \
+     defined(_M_AMD64) || defined(_M_ARM)     || defined(__x86)   ||    \
+-    defined(__arm__)
++    defined(__arm__) || defined(__powerpc64__) && (__BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__)
+ # define SQLITE_BYTEORDER    1234
+ #elif defined(sparc)    || defined(__ppc__)
+ # define SQLITE_BYTEORDER    4321
+--- a/src/3rdparty/chromium/third_party/sqlite/src/src/sqliteInt.h
++++ b/src/3rdparty/chromium/third_party/sqlite/src/src/sqliteInt.h
+@@ -890,7 +890,8 @@ typedef INT16_TYPE LogEst;
+ # if defined(i386)      || defined(__i386__)      || defined(_M_IX86) ||    \
+      defined(__x86_64)  || defined(__x86_64__)    || defined(_M_X64)  ||    \
+      defined(_M_AMD64)  || defined(_M_ARM)        || defined(__x86)   ||    \
+-     defined(__ARMEL__) || defined(__AARCH64EL__) || defined(_M_ARM64)
++     defined(__ARMEL__) || defined(__AARCH64EL__) || defined(_M_ARM64) || \
++     defined(__powerpc64__) && (__BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__)
+ #   define SQLITE_BYTEORDER    1234
+ # elif defined(sparc)     || defined(__ppc__) || \
+        defined(__ARMEB__) || defined(__AARCH64EB__)
+--- a/src/3rdparty/chromium/third_party/webrtc/modules/desktop_capture/differ_block.cc
++++ b/src/3rdparty/chromium/third_party/webrtc/modules/desktop_capture/differ_block.cc
+@@ -30,11 +30,7 @@ bool VectorDifference(const uint8_t* ima
+   static bool (*diff_proc)(const uint8_t*, const uint8_t*) = nullptr;
+ 
+   if (!diff_proc) {
+-#if defined(WEBRTC_ARCH_ARM_FAMILY) || defined(WEBRTC_ARCH_MIPS_FAMILY)
+-    // For ARM and MIPS processors, always use C version.
+-    // TODO(hclam): Implement a NEON version.
+-    diff_proc = &VectorDifference_C;
+-#else
++#if defined(WEBRTC_ARCH_X86_FAMILY)
+     bool have_sse2 = GetCPUInfo(kSSE2) != 0;
+     // For x86 processors, check if SSE2 is supported.
+     if (have_sse2 && kBlockSize == 32) {
+@@ -44,6 +40,10 @@ bool VectorDifference(const uint8_t* ima
+     } else {
+       diff_proc = &VectorDifference_C;
+     }
++#else
++    // For other processors, always use C version.
++    // TODO(hclam): Implement a NEON version.
++    diff_proc = &VectorDifference_C;
+ #endif
+   }
+ 
+--- a/src/3rdparty/chromium/v8/BUILD.gn
++++ b/src/3rdparty/chromium/v8/BUILD.gn
+@@ -1083,6 +1083,12 @@ config("toolchain") {
+     }
+     if (host_byteorder == "little") {
+       defines += [ "V8_TARGET_ARCH_PPC_LE" ]
++      cflags += [
++        # Enable usage of AltiVec, VSX, and other POWER8 and higher features
++        "-mcpu=power8",
++        "-maltivec",
++        "-mvsx",
++      ]
+     } else if (host_byteorder == "big") {
+       defines += [ "V8_TARGET_ARCH_PPC_BE" ]
+       if (current_os == "aix") {
+--- a/src/3rdparty/chromium/ui/gl/features.gni
++++ b/src/3rdparty/chromium/ui/gl/features.gni
+@@ -35,7 +35,8 @@ declare_args() {
+                         (is_mac && use_egl) || is_chromeos_ash || is_fuchsia) &&
+                        (target_cpu == "x86" || target_cpu == "x64" ||
+                         target_cpu == "arm" || target_cpu == "arm64" ||
+-                        target_cpu == "mipsel" || target_cpu == "mips64el")
++                        target_cpu == "mipsel" || target_cpu == "mips64el" ||
++                        target_cpu == "ppc64")
+ }
+ 
+ use_glx = use_x11 || ozone_platform_x11
+--- a/src/3rdparty/chromium/v8/test/BUILD.gn
++++ b/src/3rdparty/chromium/v8/test/BUILD.gn
+@@ -42,7 +42,6 @@ group("gn_all") {
+       "benchmarks/cpp:gn_all",
+       "cctest:cctest",
+       "cctest:generate-bytecode-expectations",
+-      "unittests:unittests",
+     ]
+   }
+ }
+@@ -84,7 +83,6 @@ group("v8_bot_default") {
+     "message:v8_message",
+     "mjsunit:v8_mjsunit",
+     "mkgrokdump:mkgrokdump",
+-    "unittests:unittests",
+     "webkit:v8_webkit",
+   ]
+ 
+@@ -109,7 +107,6 @@ group("v8_default") {
+     "message:v8_message",
+     "mjsunit:v8_mjsunit",
+     "mkgrokdump:mkgrokdump",
+-    "unittests:unittests",
+   ]
+ 
+   if (v8_enable_webassembly) {
+--- /dev/null
++++ b/src/3rdparty/chromium/dev/null
+@@ -0,0 +1,39 @@
++/*
++ * Autogenerated by the Meson build system.
++ * Do not edit, your changes will be lost.
++ */
++
++#pragma once
++
++#define ARCH_AARCH64 0
++
++#define ARCH_ARM 0
++
++#define ARCH_PPC64LE 1
++
++#define ARCH_X86 0
++
++#define ARCH_X86_32 0
++
++#define ARCH_X86_64 0
++
++#define CONFIG_16BPC 1
++
++#define CONFIG_8BPC 1
++
++// #define CONFIG_LOG 1 -- Logging is controlled by Chromium
++
++#define ENDIANNESS_BIG 0
++
++#define HAVE_ASM 1
++
++#define HAVE_CLOCK_GETTIME 1
++
++#define HAVE_DLSYM 1
++
++#define HAVE_GETAUXVAL 1
++
++#define HAVE_POSIX_MEMALIGN 1
++
++#define HAVE_UNISTD_H 1
++
+--- a/src/3rdparty/chromium/third_party/abseil-cpp/absl/base/internal/unscaledcycleclock.h
++++ b/src/3rdparty/chromium/third_party/abseil-cpp/absl/base/internal/unscaledcycleclock.h
+@@ -46,7 +46,7 @@
+ 
+ // The following platforms have an implementation of a hardware counter.
+ #if defined(__i386__) || defined(__x86_64__) || defined(__aarch64__) || \
+-  defined(__powerpc__) || defined(__ppc__) || \
++  ((defined(__powerpc__) || defined(__ppc__)) && defined(__GLIBC__)) || \
+   defined(_M_IX86) || defined(_M_X64)
+ #define ABSL_HAVE_UNSCALED_CYCLECLOCK_IMPLEMENTATION 1
+ #else
+--- a/src/3rdparty/chromium/third_party/abseil-cpp/absl/debugging/internal/stacktrace_config.h
++++ b/src/3rdparty/chromium/third_party/abseil-cpp/absl/debugging/internal/stacktrace_config.h
+@@ -59,7 +59,7 @@
+ #elif defined(__i386__) || defined(__x86_64__)
+ #define ABSL_STACKTRACE_INL_HEADER \
+   "absl/debugging/internal/stacktrace_x86-inl.inc"
+-#elif defined(__ppc__) || defined(__PPC__)
++#elif defined(__ppc__) || defined(__PPC__) && defined(__GLIBC__)
+ #define ABSL_STACKTRACE_INL_HEADER \
+   "absl/debugging/internal/stacktrace_powerpc-inl.inc"
+ #elif defined(__aarch64__)
+--- a/src/3rdparty/chromium/base/allocator/partition_allocator/partition_alloc_config.h
++++ b/src/3rdparty/chromium/base/allocator/partition_allocator/partition_alloc_config.h
+@@ -100,7 +100,8 @@ static_assert(sizeof(void*) != 8, "");
+ // PUT_REF_COUNT_IN_PREVIOUS_SLOT does. In this case the refcount overlaps with
+ // the next pointer shadow for the smallest bucket.
+ #if !(defined(OS_MAC) && defined(ARCH_CPU_ARM64)) && \
+-    !BUILDFLAG(PUT_REF_COUNT_IN_PREVIOUS_SLOT)
++    !BUILDFLAG(PUT_REF_COUNT_IN_PREVIOUS_SLOT) && \
++    (!defined(__GLIBC) && !defined(__powerpc64__))
+ #define PA_HAS_FREELIST_HARDENING
+ #endif
+ 
+--- a/src/3rdparty/chromium/build/download_nacl_toolchains.py
++++ b/src/3rdparty/chromium/build/download_nacl_toolchains.py
+@@ -13,6 +13,8 @@ import sys
+ 
+ 
+ def Main(args):
++  if 'disable_nacl=1' in os.environ.get('GYP_DEFINES', ''):
++    return 0
+   script_dir = os.path.dirname(os.path.abspath(__file__))
+   src_dir = os.path.dirname(script_dir)
+   nacl_dir = os.path.join(src_dir, 'native_client')
+--- a/src/3rdparty/chromium/chrome/installer/linux/BUILD.gn
++++ b/src/3rdparty/chromium/chrome/installer/linux/BUILD.gn
+@@ -100,8 +100,6 @@ packaging_files = packaging_files_binari
+                     "$root_out_dir/xdg-mime",
+                     "$root_out_dir/xdg-settings",
+                     "$root_out_dir/locales/en-US.pak",
+-                    "$root_out_dir/MEIPreload/manifest.json",
+-                    "$root_out_dir/MEIPreload/preloaded_data.pb",
+                   ]
+ 
+ action_foreach("calculate_deb_dependencies") {
+@@ -321,7 +319,6 @@ group("installer_deps") {
+     ":theme_files",
+     "//chrome",
+     "//chrome:packed_resources",
+-    "//chrome/browser/resources/media/mei_preload:component",
+     "//components/crash/core/app:chrome_crashpad_handler",
+     "//sandbox/linux:chrome_sandbox",
+   ]
+--- /dev/null
++++ b/src/3rdparty/chromium/sandbox/linux/system_headers/ppc64_linux_syscalls.h
+@@ -0,0 +1,12 @@
++// Copyright 2014 The Chromium Authors. All rights reserved.
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++#ifndef SANDBOX_LINUX_SYSTEM_HEADERS_PPC64_LINUX_SYSCALLS_H_
++#define SANDBOX_LINUX_SYSTEM_HEADERS_PPC64_LINUX_SYSCALLS_H_
++
++#include <asm/unistd.h>
++
++//TODO: is it necessary to redefine syscall numbers for PPC64?
++
++#endif  // SANDBOX_LINUX_SYSTEM_HEADERS_PPC64_LINUX_SYSCALLS_H_
+--- /dev/null
++++ b/src/3rdparty/chromium/sandbox/linux/system_headers/ppc64_linux_ucontext.h
+@@ -0,0 +1,12 @@
++// Copyright 2014 The Chromium Authors. All rights reserved.
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++#ifndef SANDBOX_LINUX_SYSTEM_HEADERS_PPC64_LINUX_UCONTEXT_H_
++#define SANDBOX_LINUX_SYSTEM_HEADERS_PPC64_LINUX_UCONTEXT_H_
++
++#include <sys/ucontext.h>
++
++//TODO: is it necessary to redefine ucontext on PPC64?
++
++#endif  // SANDBOX_LINUX_SYSTEM_HEADERS_PPC64_LINUX_UCONTEXT_H_
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/util/net/http_transport_libcurl.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/util/net/http_transport_libcurl.cc
+@@ -236,6 +236,12 @@ std::string UserAgent() {
+ #elif defined(ARCH_CPU_BIG_ENDIAN)
+     static constexpr char arch[] = "aarch64_be";
+ #endif
++#elif defined(__powerpc64__)
++#if defined(ARCH_CPU_LITTLE_ENDIAN)
++    static constexpr char arch[] = "ppc64le";
++#elif defined(ARCH_CPU_BIG_ENDIAN)
++    static constexpr char arch[] = "ppc64";
++#endif
+ #else
+ #error Port
+ #endif
+--- /dev/null
++++ b/src/3rdparty/chromium/third_party/dav1d/config/linux/ppc64/config.h
+@@ -0,0 +1,39 @@
++/*
++ * Autogenerated by the Meson build system.
++ * Do not edit, your changes will be lost.
++ */
++
++#pragma once
++
++#define ARCH_AARCH64 0
++
++#define ARCH_ARM 0
++
++#define ARCH_PPC64LE 1
++
++#define ARCH_X86 0
++
++#define ARCH_X86_32 0
++
++#define ARCH_X86_64 0
++
++#define CONFIG_16BPC 1
++
++#define CONFIG_8BPC 1
++
++// #define CONFIG_LOG 1 -- Logging is controlled by Chromium
++
++#define ENDIANNESS_BIG 0
++
++#define HAVE_ASM 1
++
++#define HAVE_CLOCK_GETTIME 1
++
++#define HAVE_DLSYM 1
++
++#define HAVE_GETAUXVAL 1
++
++#define HAVE_POSIX_MEMALIGN 1
++
++#define HAVE_UNISTD_H 1
++
diff --git a/srcpkgs/qt6-webengine/patches/0903-xxx-ppc64le-swiftshader.patch b/srcpkgs/qt6-webengine/patches/0903-xxx-ppc64le-swiftshader.patch
new file mode 100644
index 000000000000..1a8cd8368da1
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0903-xxx-ppc64le-swiftshader.patch
@@ -0,0 +1,18 @@
+--- a/src/3rdparty/chromium/third_party/swiftshader/third_party/llvm-10.0/BUILD.gn
++++ b/src/3rdparty/chromium/third_party/swiftshader/third_party/llvm-10.0/BUILD.gn
+@@ -576,6 +576,7 @@ swiftshader_llvm_source_set("swiftshader
+     "llvm/lib/MC/MCAsmInfoCOFF.cpp",
+     "llvm/lib/MC/MCAsmInfoDarwin.cpp",
+     "llvm/lib/MC/MCAsmInfoELF.cpp",
++    "llvm/lib/MC/MCAsmInfoXCOFF.cpp",
+     "llvm/lib/MC/MCAsmMacro.cpp",
+     "llvm/lib/MC/MCAsmStreamer.cpp",
+     "llvm/lib/MC/MCAssembler.cpp",
+@@ -631,6 +632,7 @@ swiftshader_llvm_source_set("swiftshader
+     "llvm/lib/MC/MCWinCOFFStreamer.cpp",
+     "llvm/lib/MC/MCWinEH.cpp",
+     "llvm/lib/MC/MCXCOFFStreamer.cpp",
++    "llvm/lib/MC/MCXCOFFObjectTargetWriter.cpp",
+     "llvm/lib/MC/MachObjectWriter.cpp",
+     "llvm/lib/MC/StringTableBuilder.cpp",
+     "llvm/lib/MC/SubtargetFeature.cpp",
diff --git a/srcpkgs/qt6-webengine/template b/srcpkgs/qt6-webengine/template
new file mode 100644
index 000000000000..2f0de2c7adf6
--- /dev/null
+++ b/srcpkgs/qt6-webengine/template
@@ -0,0 +1,178 @@
+# Template file for 'qt6-webengine'
+pkgname=qt6-webengine
+version=6.3.1
+revision=1
+wrksrc="qtwebengine-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true
+ -DQT_FEATURE_webengine_system_ffmpeg=ON
+ -DQT_FEATURE_webengine_system_libevent=ON
+ -DQT_FEATURE_webengine_system_gn=ON
+ -DQT_FEATURE_webengine_system_icu=ON
+ -DQT_FEATURE_webengine_webrtc_pipewire=ON
+ -DNinja_EXECUTABLE=$XBPS_WRAPPERDIR/ninja
+ $(vopt_bool examples QT_BUILD_EXAMPLES)
+ -DPKG_CONFIG_HOST_EXECUTABLE=${PKG_CONFIG_FOR_BUILD}"
+hostmakedepends="qt6-base-devel perl pkg-config nodejs python3-html5lib
+ qt6-declarative-devel protobuf gperf flex nss-devel libwebp-devel
+ icu-devel libevent-devel"
+makedepends="qt6-base-devel qt6-declarative-devel pulseaudio-devel
+ qt6-tools-devel qt6-websockets-devel libflac-devel
+ alsa-lib-devel libvpx-devel pciutils-devel opus-devel libxslt-devel
+ libxml2-devel freetype-devel lcms2-devel libwebp-devel icu-devel
+ re2-devel zlib-devel libpng-devel minizip-devel harfbuzz-devel
+ nss-devel libXcursor-devel libXcomposite-devel libXScrnSaver-devel
+ protobuf-devel ffmpeg-devel snappy-devel libevent-devel pipewire-devel
+ libxkbfile-devel qt6-location-devel qt6-webchannel-devel libxshmfence-devel"
+# Not working properly with HTTPS without those packages
+# Not strict dependencies, though
+depends="qt6-plugin-tls-openssl qt6-plugin-tls-qcertonly"
+short_desc="Cross-platform application and UI framework - Webengine"
+maintainer="John <me@johnnynator.dev>"
+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=ad7a33b21a956deda37c587d50f821ca3816403ae31ba9b5d59d01561ad66e47
+
+if [ -z "$CROSS_BUILD" ];then
+	configure_args+=" -DCMAKE_TOOLCHAIN_FILE=/usr/lib/cmake/Qt6/qt.toolchain.cmake"
+fi
+
+if [ "$XBPS_LIBC" = "musl" ]; then
+	hostmakedepends+=" musl-legacy-compat"
+fi
+
+if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
+	makedepends+=" musl-legacy-compat"
+fi
+
+if [ ! "$XBPS_WORDSIZE" = "$XBPS_TARGET_WORDSIZE" ]; then
+	broken="webengine can be built only if word size matches"
+fi
+
+if [ "$XBPS_WORDSIZE" -eq 32 ]; then
+	nodebug=yes
+	LDFLAGS="-Wl,--no-keep-memory"
+fi
+
+if [ "$XBPS_TARGET_ENDIAN" != "le" ]; then
+	broken="webengine only supports little endian"
+fi
+
+build_options="sndio examples"
+build_options_default=""
+desc_option_examples="Build examples"
+desc_option_sndio="Enable support for sndio"
+
+subpackages="qt6-webengine-devel"
+
+if [ "$build_option_examples" ]; then
+	subpackages+=" qt6-webengine-examples"
+fi
+
+_bootstrap_gn() {
+	# Bootstrap gn (generate ninja)
+	echo "Bootstrapping 'gn'"
+	cd ${wrksrc}/src/3rdparty/gn
+	CFLAGS="$CFLAGS_host" CXXFLAGS="$CXXFLAGS_host" LDFLAGS="$LDFLAGS_host" \
+	PKGCONFIG=/usr/bin/pkgconfig PKG_CONFIG_PATH="/usr/lib/pkgconfig:/usr/share/pkgconfig" \
+		python3 build/gen.py --no-last-commit-position --out-path \
+			${wrksrc}/src/3rdparty/gn/out/Release --cc "${CC_host:-$CC}" \
+			--cxx "${CXX_host:-$CXX}" --ld "${CXX_host:-$CXX}" --ar "${AR_host:-$AR}" \
+			--qt-version "${version}.qtwebengine.qt.io"
+	ninja -C out/Release gn
+	cd ${wrksrc}
+}
+
+_unbundle_libs() {
+	cd ${wrksrc}/src/3rdparty/chromium
+	echo Dropping bundled libs from chromium
+	# Use system-provided libraries.
+	# TODO: use_system_hunspell (upstream changes needed).
+	# TODO: use_system_libsrtp.
+	# TODO: use_system_libusb (http://crbug.com/266149).
+	# TODO: use_system_ssl (http://crbug.com/58087).
+	# TODO: use_system_sqlite (http://crbug.com/22208).
+	# TODO: use_system_icu (segfaults)
+	# use_system_protobuf
+	# use_system_v8=1
+	# use_system_zlib=1
+	# bzip2 jsoncpp minizip xdg_utils speex
+	system="
+		ffmpeg
+		flac
+		fontconfig
+		freetype
+		harfbuzz-ng
+		icu
+		libdrm
+		libevent
+		libjpeg
+		libpng
+		libwebp
+		libxml
+		libxslt
+		opus
+		re2
+		snappy
+	"
+	build/linux/unbundle/replace_gn_files.py --system-libraries ${system}
+}
+
+# Provide a wrapper to run ./xbps-src -j 1 build later
+_wrap_ninja() {
+	cat <<-'_EOF' >"$XBPS_WRAPPERDIR"/ninja
+	#!/bin/sh
+
+	exec /usr/bin/ninja $NINJAFLAGS "$@"
+	_EOF
+	chmod +x "$XBPS_WRAPPERDIR"/ninja
+}
+
+pre_configure() {
+	_bootstrap_gn
+	# _unbundle_libs
+	_wrap_ninja
+	export PATH="$PATH:${wrksrc}/src/3rdparty/gn/out/Release"
+}
+
+pre_build() {
+	export PATH="$PATH:${wrksrc}/src/3rdparty/gn/out/Release"
+	export NINJAFLAGS="$makejobs"
+
+}
+
+pre_install() {
+	export PATH="$PATH:${wrksrc}/src/3rdparty/gn/out/Release"
+}
+
+post_install() {
+	local _file
+	find "${DESTDIR}"/usr/lib/qt6/examples \
+		-path '*/lib/qt6/**/lib/qt6/*' -type f |
+	while read _file; do
+		mv "$_file" "${_file%/lib/qt6/*}"
+	done
+}
+
+qt6-webengine-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} qt6-webchannel-devel>=${version}_1
+	 qt6-declarative-devel>=${version}_1 qt6-location-devel>=${version}_1"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/pkgconfig
+		vmove usr/lib/qt6/mkspecs
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
+	}
+}
+
+qt6-webengine-examples_package() {
+	short_desc+=" - sample browsers"
+	pkg_install() {
+		vmove usr/lib/qt6/examples
+	}
+}
diff --git a/srcpkgs/qt6-webengine/update b/srcpkgs/qt6-webengine/update
new file mode 100644
index 000000000000..844552465222
--- /dev/null
+++ b/srcpkgs/qt6-webengine/update
@@ -0,0 +1 @@
+pkgname="${pkgname/6-/}-everywhere-src"

From 594d1686f0ba6a1e73c5ec65533ddb7be035d681 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Tue, 9 Aug 2022 19:56:28 +0700
Subject: [PATCH 26/27] build-style/cmake: set common Qt options

---
 common/build-style/cmake.sh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/common/build-style/cmake.sh b/common/build-style/cmake.sh
index 711fcea6273d..e1efd9cc6586 100644
--- a/common/build-style/cmake.sh
+++ b/common/build-style/cmake.sh
@@ -54,6 +54,10 @@ _EOF
 	cmake_args+=" -DCMAKE_INSTALL_PREFIX=/usr"
 	cmake_args+=" -DCMAKE_BUILD_TYPE=None"
 	cmake_args+=" -DCMAKE_INSTALL_LIBDIR=lib${XBPS_TARGET_WORDSIZE}"
+	cmake_args+=" -DQT_HOST_PATH=/usr"
+	# QT_HOST_PATH isn't enough in my system,
+	# which have binfmts support on and off
+	cmake_args+=" -DQT_HOST_PATH_CMAKE_DIR=/usr/lib/cmake"
 
 	if [[ $build_helper = *"qemu"* ]]; then
 		echo "SET(CMAKE_CROSSCOMPILING_EMULATOR /usr/bin/qemu-${XBPS_TARGET_QEMU_MACHINE}-static)" \

From fd60ff0a9148b7e6961a095af2487127ed99343a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Tue, 9 Aug 2022 20:16:47 +0700
Subject: [PATCH 27/27] qt6-3d: update to 6.3.1.

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

diff --git a/srcpkgs/qt6-3d/template b/srcpkgs/qt6-3d/template
index 666f57559532..c08c3bd4a41b 100644
--- a/srcpkgs/qt6-3d/template
+++ b/srcpkgs/qt6-3d/template
@@ -1,10 +1,9 @@
 # Template file for 'qt6-3d'
 pkgname=qt6-3d
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qt3d-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr"
 hostmakedepends="perl qt6-declarative-devel"
 makedepends="qt6-declarative-devel qt6-shadertools-devel libassimp-devel
  libatomic-devel"
@@ -13,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 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=74e762380dad34887878b9124dbfb981d5cf4b8b807281ff8bff311145b54de1
+checksum=9919b66dfb253fa26db1a7d664358cbc07f46c8810082ee3120d0a54b153edfe
 
 qt6-3d-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

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

* Re: WIP Qt6 webengine
  2022-08-07  4:36 [PR PATCH] WIP Qt6 webengine sgn
                   ` (3 preceding siblings ...)
  2022-08-09 13:18 ` sgn
@ 2022-08-09 15:11 ` skmpz
  2022-08-09 16:42 ` sgn
                   ` (32 subsequent siblings)
  37 siblings, 0 replies; 39+ messages in thread
From: skmpz @ 2022-08-09 15:11 UTC (permalink / raw)
  To: ml

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

New comment by skmpz on void-packages repository

https://github.com/void-linux/void-packages/pull/38509#issuecomment-1209511413

Comment:
All packages **except qt6-webengine** built successfully for:
- x86_64
- i686
- aarch64 (cross on x86_64)
- armv7l (cross on x86_64)
- x86_64-musl
- aarch64-musl (cross on x86_64-musl)

Package **qt6-webengine** fails for x86_64-libc (did not try other archs)
<details>
<summary>build error</summary>

```sh
...
In file included from ../../../../../src/3rdparty/chromium/third_party/crashpad/crashpad/util/linux/ptracer.cc:29:
../../../../../src/3rdparty/chromium/third_party/crashpad/crashpad/util/linux/ptracer.cc: In function 'bool crashpad::{anonymous}::GetThreadArea32(pid_t, const crashpad::ThreadContext&, crashpad::LinuxVMAddress*, bool)':
../../../../../src/3rdparty/chromium/third_party/crashpad/crashpad/util/linux/ptracer.cc:74:11: error: invalid conversion from 'int' to '__ptrace_request' [-fpermissive]
   74 |           PTRACE_GET_THREAD_AREA, tid, reinterpret_cast<void*>(index), &desc) !=
      |           ^~~~~~~~~~~~~~~~~~~~~~
      |           |
      |           int
In file included from /usr/include/sys/ptrace.h:198,
                 from ../../../../../src/3rdparty/chromium/third_party/crashpad/crashpad/compat/linux/sys/ptrace.h:18,
                 from ../../../../../src/3rdparty/chromium/third_party/crashpad/crashpad/util/linux/ptracer.cc:20:
/usr/include/bits/ptrace-shared.h:132:47: note:   initializing argument 1 of 'long int ptrace(__ptrace_request, ...)'
  132 | extern long int ptrace (enum __ptrace_request __request, ...) __THROW;
      |                         ~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~
[16388/29148] CXX obj/third_party/crashpad/crashpad/util/util/scoped_pr_set_ptracer.o
[16389/29148] CXX obj/third_party/crashpad/crashpad/util/util/scoped_ptrace_attach.o
[16390/29148] CXX obj/third_party/crashpad/crashpad/util/util/time_linux.o
[16391/29148] CXX obj/third_party/crashpad/crashpad/util/util/ptrace_broker.o
[16392/29148] CXX obj/third_party/crashpad/crashpad/util/util/paths_linux.o
[16393/29148] CXX obj/third_party/crashpad/crashpad/util/util/memory_map.o
[16394/29148] CXX obj/third_party/crashpad/crashpad/util/util/socket.o
[16395/29148] CXX obj/third_party/crashpad/crashpad/util/util/process_memory_linux.o
[16396/29148] CXX obj/third_party/hunspell/hunspell/bdict.o
[16397/29148] CXX obj/third_party/crashpad/crashpad/util/util/ptrace_client.o
[16398/29148] CXX obj/third_party/crashpad/crashpad/util/util/process_memory_sanitized.o
[16399/29148] CXX obj/third_party/crashpad/crashpad/util/util/process_info_linux.o
[16400/29148] CXX obj/third_party/fdlibm/fdlibm/ieee754.o
[16401/29148] CXX obj/third_party/hunspell/hunspell/bdict_reader.o
[16402/29148] CXX obj/third_party/hunspell/hunspell/bdict_writer.o
ninja: build stopped: subcommand failed.
FAILED: src/core/None/x86_64/QtWebEngineCore.stamp src/core/None/x86_64/QtWebEngineCore /builddir/qtwebengine-everywhere-src-6.3.1/build/src/core/None/x86_64/QtWebEngineCore.stamp /builddir/qtwebengine-everywhere-src-6.3.1/build/src/core/None/x86_64/QtWebEngineCore
cd /builddir/qtwebengine-everywhere-src-6.3.1/build/src/core && /builddir/.xbps-qt6-webengine/wrappers/ninja -C /builddir/qtwebengine-everywhere-src-6.3.1/build/src/core/None/x86_64 QtWebEngineCore
ninja: build stopped: subcommand failed.
=> ERROR: qt6-webengine-6.3.1_1: do_build: '${make_cmd} ${makejobs} ${make_build_args} ${make_build_target}' exited with 1
=> ERROR:   in do_build() at common/build-style/cmake.sh:85
```

</details>

On armv6l-musl (cross on x86_64-musl) **qt6-base** fails
<details>
<summary>build error</summary>

```sh
/usr/arm-linux-musleabihf/usr/include/c++/10.2/bits/stl_algo.h:1945:5: note: parameter passing for argument of type 'QList<std::pair<double, QVariant> >::iterator' changed in GCC 7.1
/usr/arm-linux-musleabihf/usr/include/c++/10.2/bits/stl_algo.h:1924:34: note: parameter passing for argument of type 'QList<std::pair<double, QVariant> >::iterator' changed in GCC 7.1
 1924 |       std::__move_median_to_first(__first, __first + 1, __mid, __last - 1,
      |       ~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 1925 |       __comp);
      |       ~~~~~~~                     
/usr/arm-linux-musleabihf/usr/include/c++/10.2/bits/stl_algo.h:1924:34: note: parameter passing for argument of type 'QList<std::pair<double, QVariant> >::iterator' changed in GCC 7.1
/usr/arm-linux-musleabihf/usr/include/c++/10.2/bits/stl_algo.h:1959:25: note: parameter passing for argument of type 'QList<std::pair<double, QVariant> >::iterator' changed in GCC 7.1
 1959 |    std::__introsort_loop(__cut, __last, __depth_limit, __comp);
      |    ~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
/usr/arm-linux-musleabihf/usr/include/c++/10.2/bits/stl_algo.h:1666:23: note: parameter passing for argument of type 'QList<std::pair<double, QVariant> >::iterator' changed in GCC 7.1
 1666 |       std::__make_heap(__first, __middle, __comp);
      |       ~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~
/usr/arm-linux-musleabihf/usr/include/c++/10.2/bits/stl_algo.h: In member function 'void QVariantAnimation::setKeyValues(const KeyValues&)':
/usr/arm-linux-musleabihf/usr/include/c++/10.2/bits/stl_algo.h:1974:25: note: parameter passing for argument of type 'QList<std::pair<double, QVariant> >::iterator' changed in GCC 7.1
 1974 |    std::__introsort_loop(__first, __last,
      |    ~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~
 1975 |     std::__lg(__last - __first) * 2,
      |     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 1976 |     __comp);
      |     ~~~~~~~              
/usr/arm-linux-musleabihf/usr/include/c++/10.2/bits/stl_algo.h:1886:25: note: parameter passing for argument of type 'QList<std::pair<double, QVariant> >::iterator' changed in GCC 7.1
 1886 |    std::__insertion_sort(__first, __first + int(_S_threshold), __comp);
      |    ~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
/usr/arm-linux-musleabihf/usr/include/c++/10.2/bits/stl_algo.h:1891:23: note: parameter passing for argument of type 'QList<std::pair<double, QVariant> >::iterator' changed in GCC 7.1
 1891 |  std::__insertion_sort(__first, __last, __comp);
      |  ~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~
[294/1559] Building CXX object src/corelib/CMakeFiles/Core.dir/global/qversiontagging.cpp.o
[295/1559] Building CXX object src/corelib/CMakeFiles/Core.dir/io/qfilesystemengine_unix.cpp.o
[296/1559] Building CXX object src/corelib/CMakeFiles/Core.dir/io/qfilesystemiterator_unix.cpp.o
[297/1559] Building CXX object src/corelib/CMakeFiles/Core.dir/io/qfsfileengine_unix.cpp.o
[298/1559] Building CXX object src/corelib/CMakeFiles/Core.dir/io/qlockfile_unix.cpp.o
[299/1559] Building CXX object src/corelib/CMakeFiles/Core.dir/kernel/qcore_unix.cpp.o
[300/1559] Building CXX object src/corelib/CMakeFiles/Core.dir/kernel/qeventdispatcher_unix.cpp.o
[301/1559] Building CXX object src/corelib/CMakeFiles/Core.dir/kernel/qtimerinfo_unix.cpp.o
[302/1559] Building CXX object src/corelib/CMakeFiles/Core.dir/thread/qthread_unix.cpp.o
[303/1559] Building CXX object src/corelib/CMakeFiles/Core.dir/thread/qatomic.cpp.o
[304/1559] Building CXX object src/corelib/CMakeFiles/Core.dir/thread/qmutex.cpp.o
[305/1559] Building CXX object src/corelib/CMakeFiles/Core.dir/thread/qreadwritelock.cpp.o
[306/1559] Building CXX object src/corelib/CMakeFiles/Core.dir/thread/qsemaphore.cpp.o
/builddir/qtbase-everywhere-src-6.3.1/src/corelib/thread/qsemaphore.cpp: In function 'bool futexSemaphoreTryAcquire_loop(QBasicAtomicInteger<unsigned int>&, quintptr, quintptr, int)':
/builddir/qtbase-everywhere-src-6.3.1/src/corelib/thread/qsemaphore.cpp:197:26: warning: right shift count >= width of type [-Wshift-count-overflow]
  197 |                 curValue >>= 32;
      |                 ~~~~~~~~~^~~~~~
/builddir/qtbase-everywhere-src-6.3.1/src/corelib/thread/qsemaphore.cpp: In function 'bool futexSemaphoreTryAcquire(QBasicAtomicInteger<unsigned int>&, int, int)':
/builddir/qtbase-everywhere-src-6.3.1/src/corelib/thread/qsemaphore.cpp:249:24: warning: right shift count >= width of type [-Wshift-count-overflow]
  249 |         if (((curValue >> 32) & 0x7fffffffU) == 0x7fffffffU) {
      |               ~~~~~~~~~^~~~~
[307/1559] Building CXX object src/corelib/CMakeFiles/Core.dir/thread/qthreadpool.cpp.o
[308/1559] Building CXX object src/corelib/CMakeFiles/Core.dir/thread/qthreadstorage.cpp.o
[309/1559] Building CXX object src/corelib/CMakeFiles/Core.dir/thread/qwaitcondition_unix.cpp.o
[310/1559] Building CXX object src/corelib/CMakeFiles/Core.dir/thread/qexception.cpp.o
[311/1559] Building CXX object src/corelib/CMakeFiles/Core.dir/thread/qfutureinterface.cpp.o
FAILED: src/corelib/CMakeFiles/Core.dir/thread/qfutureinterface.cpp.o 
/builddir/.xbps-qt6-base/wrappers/arm-linux-musleabihf-c++ -DCore_EXPORTS -DQT_ASCII_CAST_WARNINGS -DQT_BUILDING_QT -DQT_BUILD_CORE_LIB -DQT_DEPRECATED_WARNINGS -DQT_DEPRECATED_WARNINGS_SINCE=0x060000 -DQT_DISABLE_DEPRECATED_BEFORE=0x050000 -DQT_MOC_COMPAT -DQT_NO_CAST_TO_ASCII -DQT_NO_DEBUG -DQT_NO_FOREACH -DQT_NO_JAVA_STYLE_ITERATORS -DQT_NO_NARROWING_CONVERSIONS_IN_CONNECT -DQT_NO_USING_NAMESPACE -DQT_TYPESAFE_FLAGS -DQT_USE_QSTRINGBUILDER -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE -I/builddir/qtbase-everywhere-src-6.3.1/build/src/corelib/Core_autogen/include -I/builddir/qtbase-everywhere-src-6.3.1/build/include -I/builddir/qtbase-everywhere-src-6.3.1/build/include/QtCore -I/builddir/qtbase-everywhere-src-6.3.1/src/corelib -I/builddir/qtbase-everywhere-src-6.3.1/build/src/corelib -I/builddir/qtbase-everywhere-src-6.3.1/build/src/corelib/global -I/builddir/qtbase-everywhere-src-6.3.1/build/src/corelib/kernel -I/builddir/qtbase-everywhere-src-6.3.1/src/corelib/../3rdparty/tinycbor/src -I/builddir/qtbase-everywhere-src-6.3.1/build/include/QtCore/6.3.1 -I/builddir/qtbase-everywhere-src-6.3.1/build/include/QtCore/6.3.1/QtCore -I/builddir/qtbase-everywhere-src-6.3.1/src/corelib/../3rdparty/forkfd -I/builddir/qtbase-everywhere-src-6.3.1/build/src/corelib/.rcc -I/builddir/qtbase-everywhere-src-6.3.1/mkspecs/linux-g++ -I /usr/arm-linux-musleabihf/usr/include/glib-2.0 -I /usr/arm-linux-musleabihf/usr/lib/glib-2.0/include -DNDEBUG -fstack-clash-protection -D_FORTIFY_SOURCE=2 -O2 -march=armv6 -mfpu=vfp -mfloat-abi=hard   -I/usr/arm-linux-musleabihf/usr/include -fdebug-prefix-map=/builddir/qtbase-everywhere-src-6.3.1=. -fPIC -fvisibility=hidden -fvisibility-inlines-hidden -Wall -Wextra -Wsuggest-override -std=c++17 -MD -MT src/corelib/CMakeFiles/Core.dir/thread/qfutureinterface.cpp.o -MF src/corelib/CMakeFiles/Core.dir/thread/qfutureinterface.cpp.o.d -o src/corelib/CMakeFiles/Core.dir/thread/qfutureinterface.cpp.o -c /builddir/qtbase-everywhere-src-6.3.1/src/corelib/thread/qfutureinterface.cpp
/tmp/ccdMiAHP.s: Assembler messages:
/tmp/ccdMiAHP.s:825: Error: selected processor does not support `yield' in ARM mode
/tmp/ccdMiAHP.s:850: Error: selected processor does not support `yield' in ARM mode
/tmp/ccdMiAHP.s:1612: Error: selected processor does not support `yield' in ARM mode
/tmp/ccdMiAHP.s:2493: Error: selected processor does not support `yield' in ARM mode
/tmp/ccdMiAHP.s:3539: Error: selected processor does not support `yield' in ARM mode
ninja: build stopped: subcommand failed.
=> ERROR: qt6-base-6.3.1_1: do_build: '${make_cmd} ${makejobs} ${make_build_args} ${make_build_target}' exited with 1
=> ERROR:   in do_build() at common/build-style/cmake.sh:85
```

</details>

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

* Re: WIP Qt6 webengine
  2022-08-07  4:36 [PR PATCH] WIP Qt6 webengine sgn
                   ` (4 preceding siblings ...)
  2022-08-09 15:11 ` skmpz
@ 2022-08-09 16:42 ` sgn
  2022-08-09 16:45 ` [PR PATCH] [Updated] " sgn
                   ` (31 subsequent siblings)
  37 siblings, 0 replies; 39+ messages in thread
From: sgn @ 2022-08-09 16:42 UTC (permalink / raw)
  To: ml

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

New comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/38509#issuecomment-1209619905

Comment:
Did you mean qt6-webengine failed on x86-64 with glibc?

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

* Re: [PR PATCH] [Updated] WIP Qt6 webengine
  2022-08-07  4:36 [PR PATCH] WIP Qt6 webengine sgn
                   ` (5 preceding siblings ...)
  2022-08-09 16:42 ` sgn
@ 2022-08-09 16:45 ` sgn
  2022-08-09 17:27 ` skmpz
                   ` (30 subsequent siblings)
  37 siblings, 0 replies; 39+ messages in thread
From: sgn @ 2022-08-09 16:45 UTC (permalink / raw)
  To: ml

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

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

https://github.com/sgn/void-packages qt6-webengine
https://github.com/void-linux/void-packages/pull/38509

WIP Qt6 webengine
<!-- Uncomment relevant sections and delete options which are not applicable -->

Never tried to cross build
Functionality works (at least can view youtube video on x86_64-musl)

#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**
[ci skip]

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-qt6-webengine-38509.patch --]
[-- Type: text/x-diff, Size: 303709 bytes --]

From e8882aaa421f66fc1e92161dfda4022f89265a38 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:07 +0700
Subject: [PATCH 01/26] qt6-base: update to 6.3.1.

---
 srcpkgs/qt6-base/patches/libatomic.patch | 14 --------------
 srcpkgs/qt6-base/template                | 16 ++++++++++------
 2 files changed, 10 insertions(+), 20 deletions(-)
 delete mode 100644 srcpkgs/qt6-base/patches/libatomic.patch

diff --git a/srcpkgs/qt6-base/patches/libatomic.patch b/srcpkgs/qt6-base/patches/libatomic.patch
deleted file mode 100644
index 2f7a807518e4..000000000000
--- a/srcpkgs/qt6-base/patches/libatomic.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Index: cmake/FindWrapAtomic.cmake
-===================================================================
---- a/cmake/FindWrapAtomic.cmake
-+++ b/cmake/FindWrapAtomic.cmake
-@@ -38,7 +38,8 @@ endif()
- 
- add_library(WrapAtomic::WrapAtomic INTERFACE IMPORTED)
- if(HAVE_STDATOMIC_WITH_LIB)
--    target_link_libraries(WrapAtomic::WrapAtomic INTERFACE atomic)
-+    find_library(LIBATOMIC atomic REQUIRED)
-+    target_link_libraries(WrapAtomic::WrapAtomic INTERFACE ${LIBATOMIC})
- endif()
- 
- set(WrapAtomic_FOUND 1)
diff --git a/srcpkgs/qt6-base/template b/srcpkgs/qt6-base/template
index cc47e18a70ff..4e88d6b9f174 100644
--- a/srcpkgs/qt6-base/template
+++ b/srcpkgs/qt6-base/template
@@ -1,7 +1,7 @@
 # Template file for 'qt6-base'
 pkgname=qt6-base
-version=6.3.0
-revision=2
+version=6.3.1
+revision=1
 wrksrc="qtbase-everywhere-src-${version}"
 build_style=cmake
 configure_args="-DINSTALL_DATADIR=share/qt6
@@ -9,6 +9,8 @@ configure_args="-DINSTALL_DATADIR=share/qt6
  -DINSTALL_BINDIR=lib/qt6/bin
  -DINSTALL_MKSPECSDIR=lib/qt6/mkspecs
  -DINSTALL_INCLUDEDIR=include/qt6
+ -DINSTALL_EXAMPLESDIR=lib/qt6/examples
+ -DINSTALL_TESTSDIR=lib/qt6/tests
  -DINSTALL_SYSCONFDIR=/etc/xdg
  -DQT_FEATURE_openssl_linked=ON
  -DQT_FEATURE_system_sqlite=ON
@@ -29,14 +31,13 @@ maintainer="John <me@johnnynator.dev>"
 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=b865aae43357f792b3b0a162899d9bf6a1393a55c4e5e4ede5316b157b1a0f99
+checksum=0a64421d9c2469c2c48490a032ab91d547017c9cc171f3f8070bc31888f24e03
 python_version=3
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt6-base-devel"
 	# QtSetup fails native builds if this is set
-	configure_args+=" -DQT_HOST_PATH=/usr
-	 -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true"
+	configure_args+="-DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true"
 fi
 
 # It is currently expected that quite a few patches do fail
@@ -225,7 +226,7 @@ qt6-plugin-tls-qcertonly_package() {
 qt6-plugin-networkinformation_package() {
 	short_desc+=" - Networkinformation plugin"
 	pkg_install() {
-		vmove usr/lib/qt6/plugins/networkinformation/libqnetworkmanager.so
+		vmove usr/lib/qt6/plugins/networkinformation/
 	}
 }
 
@@ -246,9 +247,12 @@ qt6-base-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/*.a"
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From 105ee492b5419bac7663ce4d8b2ffb331b9b94e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:07 +0700
Subject: [PATCH 02/26] qt6-charts: update to 6.3.1.

---
 srcpkgs/qt6-charts/template | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/qt6-charts/template b/srcpkgs/qt6-charts/template
index 79cb8a220401..d3947ba938f3 100644
--- a/srcpkgs/qt6-charts/template
+++ b/srcpkgs/qt6-charts/template
@@ -1,10 +1,9 @@
 # Template file for 'qt6-charts'
 pkgname=qt6-charts
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qtcharts-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr"
 hostmakedepends="perl qt6-declarative-devel"
 makedepends="qt6-declarative-devel"
 short_desc="Cross-platform application and UI framework - charts"
@@ -12,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 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=672762c5f641ccc88a30aeedefb63f03c0f837649b334f46eea57592e87e36cd
+checksum=f330cc2328729104d79b2088990ce0840f2da89d9d989360d4c352e797d27cf7
 
 qt6-charts-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
@@ -20,8 +19,11 @@ qt6-charts-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From 369623559b477d4c49f890d272264d776f548568 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:07 +0700
Subject: [PATCH 03/26] qt6-declarative: update to 6.3.1.

---
 srcpkgs/qt6-declarative/template | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/qt6-declarative/template b/srcpkgs/qt6-declarative/template
index e0bd28d9e383..cfdc74f281d6 100644
--- a/srcpkgs/qt6-declarative/template
+++ b/srcpkgs/qt6-declarative/template
@@ -1,23 +1,22 @@
 # Template file for 'qt6-declarative'
 pkgname=qt6-declarative
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qtdeclarative-everywhere-src-${version}"
 build_style=cmake
-configure_args=" -DQT_HOST_PATH=/usr"
 hostmakedepends="qt6-base-devel perl pkg-config wayland-devel
  qt6-shadertools-devel"
-makedepends="qt6-base-devel Vulkan-Headers"
+makedepends="qt6-base-devel Vulkan-Headers qt6-shadertools-devel"
 short_desc="Cross-platform application and UI framework - Declarative"
 maintainer="John <me@johnnynator.dev>"
 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=d294b029dc2b2d4f65da516fdc3b8088d32643eb7ff77db135a8b9ce904caa37
+checksum=03e7694123820fcca397f95ce312e0b7f3039493c8754c836da098a1a04346e8
 replaces="qt6-quickcontrols2>=0"
 
 if [ "$CROSS_BUILD" ]; then
-	configure_args+=" -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true"
+	configure_args="-DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true"
 	hostmakedepends+=" qt6-declarative-devel"
 fi
 
@@ -60,11 +59,14 @@ qt6-declarative-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/libQt6QuickTest.so.*"
 		vmove usr/lib/qt6/qml/QtTest
 		vmove usr/lib/qt6/bin/qmltestrunner
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From 7ab490c8aee6fdd6e071b6096685f2fde28de733 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:07 +0700
Subject: [PATCH 04/26] qt6-imageformats: update to 6.3.1.

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

diff --git a/srcpkgs/qt6-imageformats/template b/srcpkgs/qt6-imageformats/template
index eaca95243c48..9f6d2fb66776 100644
--- a/srcpkgs/qt6-imageformats/template
+++ b/srcpkgs/qt6-imageformats/template
@@ -1,10 +1,9 @@
 # Template file for 'qt6-imageformats'
 pkgname=qt6-imageformats
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qtimageformats-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr"
 hostmakedepends="perl qt6-base-devel"
 makedepends="qt6-base-devel"
 short_desc="Cross-platform application and UI framework - imageformats"
@@ -12,4 +11,4 @@ maintainer="John <me@johnnynator.dev>"
 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=025d0d17ed75b42a7eb6b523731ab8f17025421a8810cade25caffe05d93abef
+checksum=ad0312b8dfbbb67f729bfadbfcd47246ee4a128b717731ba158c41d01fde212f

From ad950c592035fef27b29abd0468cf242ce19d637 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:07 +0700
Subject: [PATCH 05/26] qt6-location: update to 6.3.1.

---
 srcpkgs/qt6-location/template | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/qt6-location/template b/srcpkgs/qt6-location/template
index b7397f5f8942..9f26103259ad 100644
--- a/srcpkgs/qt6-location/template
+++ b/srcpkgs/qt6-location/template
@@ -1,10 +1,9 @@
 # Template file for 'qt6-location'
 pkgname=qt6-location
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qtpositioning-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr"
 hostmakedepends="perl qt6-base-devel qt6-declarative-devel"
 makedepends="qt6-serialport-devel qt6-declarative-devel GConf-devel"
 short_desc="Cross-platform application and UI framework - location"
@@ -12,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 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=e9ed50f6b245a346db34d625d0012774ef0ec8e7fd65037127ec26758708236e
+checksum=06788e4ecae1920094b30e4046f0abd23c8189d8a51e9c939b02f0b6abe2e86c
 
 qt6-location-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel>=${version}_1"
@@ -20,8 +19,11 @@ qt6-location-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From fd61b369df209ce31bb89fb9e19098a7904665a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:08 +0700
Subject: [PATCH 06/26] qt6-lottie: update to 6.3.1.

---
 srcpkgs/qt6-lottie/template | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/qt6-lottie/template b/srcpkgs/qt6-lottie/template
index 1c97cd5f4f32..a7beb62ec368 100644
--- a/srcpkgs/qt6-lottie/template
+++ b/srcpkgs/qt6-lottie/template
@@ -1,10 +1,9 @@
 # Template file for 'qt6-lottie'
 pkgname=qt6-lottie
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qtlottie-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr"
 hostmakedepends="perl qt6-base-devel"
 makedepends="qt6-declarative-devel"
 short_desc="Cross-platform application and UI framework - lottie"
@@ -12,10 +11,10 @@ maintainer="John <me@johnnynator.dev>"
 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=39db570bbba5b527a1eb6a5774bed47398ace2f7217bbf45b1194ada6cf97deb
+checksum=740ba76999124d5e1a85ef3d01c69976bb8557862b6b26bf48b357fe0cab1cf5
 
 if [ "$XBPS_CHECK_PKGS" ]; then
-	configure_args+=" -DQT_BUILD_TESTS=ON"
+	configure_args="-DQT_BUILD_TESTS=ON"
 fi
 
 pre_check() {
@@ -28,8 +27,10 @@ qt6-lottie-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
 		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From 219b7aa38c6f3bafc8b859da42c6e0d0cf6c19f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:08 +0700
Subject: [PATCH 07/26] qt6-networkauth: update to 6.3.1.

---
 srcpkgs/qt6-networkauth/template | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/qt6-networkauth/template b/srcpkgs/qt6-networkauth/template
index e934beada9b0..1454ceb4a525 100644
--- a/srcpkgs/qt6-networkauth/template
+++ b/srcpkgs/qt6-networkauth/template
@@ -1,10 +1,9 @@
 # Template file for 'qt6-networkauth'
 pkgname=qt6-networkauth
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qtnetworkauth-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr"
 hostmakedepends="perl qt6-base-devel"
 makedepends="qt6-base-devel"
 short_desc="Cross-platform application and UI framework - networkauth"
@@ -12,10 +11,10 @@ maintainer="John <me@johnnynator.dev>"
 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=203a98942919028520038f90a20cd7ee32b537233545d11e429c3e2c1ad9069f
+checksum=d60f54b9d4509fa8bdbf1990bc91f6e260e38cdb57a7b8119fa3861bc5d2fb2a
 
 if [ "$XBPS_CHECK_PKGS" ]; then
-	configure_args+=" -DQT_BUILD_TESTS=ON"
+	configure_args="-DQT_BUILD_TESTS=ON"
 fi
 
 qt6-networkauth-devel_package() {
@@ -24,8 +23,11 @@ qt6-networkauth-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From e4d5884fdaf66f48550a76584cefd3a1d7bfaa44 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:08 +0700
Subject: [PATCH 08/26] qt6-qt5compat: update to 6.3.1.

---
 srcpkgs/qt6-qt5compat/template | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/qt6-qt5compat/template b/srcpkgs/qt6-qt5compat/template
index 7fcd5ad5080e..a62573cfabfa 100644
--- a/srcpkgs/qt6-qt5compat/template
+++ b/srcpkgs/qt6-qt5compat/template
@@ -1,10 +1,9 @@
 # Template file for 'qt6-qt5compat'
 pkgname=qt6-qt5compat
-version=6.3.0
-revision=2
+version=6.3.1
+revision=1
 wrksrc="qt5compat-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr"
 hostmakedepends="qt6-base-devel qt6-declarative-devel perl pkg-config"
 makedepends="qt6-base-devel qt6-declarative-devel"
 short_desc="Cross-platform application and UI framework - Qt5 Compatibilty Component"
@@ -12,10 +11,10 @@ maintainer="John <me@johnnynator.dev>"
 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=2b199be780c50d9214512b922d94cb240b0412fd63f459e356b76102cad1713e
+checksum=a43ec62bd778eaecf88ad7847118d1c2a471b0fcb820f93beb311d7ab9566cfd
 
 if [ "$XBPS_CHECK_PKGS" ]; then
-	configure_args+=" -DQT_BUILD_TESTS=ON"
+	configure_args="-DQT_BUILD_TESTS=ON"
 fi
 
 qt6-qt5compat-devel_package() {
@@ -24,8 +23,11 @@ qt6-qt5compat-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From 1878fbbba0402e951462668e4f5861a51bd0bbe1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:08 +0700
Subject: [PATCH 09/26] qt6-quick3d: update to 6.3.1.

---
 srcpkgs/qt6-quick3d/template | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/qt6-quick3d/template b/srcpkgs/qt6-quick3d/template
index 0f7ef336a3ff..b2349c03501b 100644
--- a/srcpkgs/qt6-quick3d/template
+++ b/srcpkgs/qt6-quick3d/template
@@ -1,10 +1,9 @@
 # Template file for 'qt6-quick3d'
 pkgname=qt6-quick3d
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qtquick3d-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr "
 hostmakedepends="perl qt6-base-devel qt6-declarative-devel qt6-shadertools-devel"
 makedepends="qt6-base-devel qt6-declarative-devel qt6-shadertools-devel
  libassimp-devel"
@@ -13,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 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=0ad05bd1ee1f784b18220a2d2625ee8de91662c88fdc7b798662953d86eb327e
+checksum=2fa766ee47b8c07412b3b755206ada0715fb07813b64ed069e7205044c061256
 
 if [ "$XBPS_TARGET_ENDIAN" = "be" ]; then
 	# possibly a qt6-shadertools bug, actually
@@ -26,9 +25,12 @@ qt6-quick3d-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
-		vmove usr/lib/qt6/mkspecs
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/bin
+		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From 22a4fab79a29e87bfb5b5f570695912fd6a722aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:09 +0700
Subject: [PATCH 10/26] qt6-quicktimeline: update to 6.3.1.

---
 srcpkgs/qt6-quicktimeline/template | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/qt6-quicktimeline/template b/srcpkgs/qt6-quicktimeline/template
index 15aa7a8e5819..bf02e043c4a5 100644
--- a/srcpkgs/qt6-quicktimeline/template
+++ b/srcpkgs/qt6-quicktimeline/template
@@ -1,10 +1,9 @@
 # Template file for 'qt6-quicktimeline'
 pkgname=qt6-quicktimeline
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qtquicktimeline-everywhere-src-${version/rc/-rc}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr "
 hostmakedepends="perl qt6-base-devel qt6-declarative-devel"
 makedepends="qt6-base-devel qt6-declarative-devel"
 short_desc="Cross-platform application and UI framework - quicktimeline"
@@ -12,10 +11,10 @@ maintainer="John <me@johnnynator.dev>"
 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=9ff0a931159efc6be5bd9f8a1e4a16a70e2dab37cf22ad85c6d330ccfdf31c1a
+checksum=58a13cf0ce8e7755639f20684078733af24f5a317f6ddb40d6079c8c5a28ebbe
 
 if [ "$XBPS_CHECK_PKGS" ]; then
-	configure_args+=" -DQT_BUILD_TESTS=ON"
+	configure_args="-DQT_BUILD_TESTS=ON"
 fi
 
 pre_check() {

From cf768e509c2527dd1340978c4c057301528a13b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:09 +0700
Subject: [PATCH 11/26] qt6-scxml: update to 6.3.1.

---
 srcpkgs/qt6-scxml/template | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/qt6-scxml/template b/srcpkgs/qt6-scxml/template
index 112baca0ab83..942a71afe476 100644
--- a/srcpkgs/qt6-scxml/template
+++ b/srcpkgs/qt6-scxml/template
@@ -1,10 +1,9 @@
 # Template file for 'qt6-scxml'
 pkgname=qt6-scxml
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qtscxml-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr"
 hostmakedepends="perl qt6-declarative-devel"
 makedepends="qt6-declarative-devel"
 short_desc="Cross-platform application and UI framework - scxml"
@@ -12,10 +11,10 @@ maintainer="John <me@johnnynator.dev>"
 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=09b0dbd6ac367920fb1ba96a39dcd4c9d33eb0820dcc79538992825d588a70f0
+checksum=01bc154d6163d1f049f4e1e76658a044730ace7b0a5be35c9a46fcd1396f8619
 
 if [ "$XBPS_CHECK_PKGS" ]; then
-	configure_args+=" -DQT_BUILD_TESTS=ON"
+	configure_args="-DQT_BUILD_TESTS=ON"
 fi
 
 qt6-scxml-devel_package() {
@@ -24,8 +23,11 @@ qt6-scxml-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From 20fc657784d6215dc634c8a74d35256aec1f0bb8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:09 +0700
Subject: [PATCH 12/26] qt6-serialport: update to 6.3.1.

---
 srcpkgs/qt6-serialport/template | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/qt6-serialport/template b/srcpkgs/qt6-serialport/template
index 0804671ca57b..2de9d6364a5c 100644
--- a/srcpkgs/qt6-serialport/template
+++ b/srcpkgs/qt6-serialport/template
@@ -1,10 +1,9 @@
 # Template file for 'qt6-serialport'
 pkgname=qt6-serialport
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qtserialport-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr"
 hostmakedepends="perl qt6-base-devel pkg-config"
 makedepends="qt6-base-devel"
 short_desc="Cross-platform application and UI framework - serialport"
@@ -12,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 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=eebd6934d48cc044b8c87795a4fd91bb81f7195d4b5a2ddb12802f343d5db64f
+checksum=4eb6d80e65799dd2e0318df4dfba14173c1929e861718cda9bedca24253b616e
 
 qt6-serialport-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel>=${version}_1"
@@ -20,8 +19,11 @@ qt6-serialport-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From 7d55a3a3dcd91bcf7a5dfe28c930eaeb492e222c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:09 +0700
Subject: [PATCH 13/26] qt6-shadertools: update to 6.3.1.

---
 srcpkgs/qt6-shadertools/template | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/qt6-shadertools/template b/srcpkgs/qt6-shadertools/template
index 9c1ec210a96a..4606fa7726b1 100644
--- a/srcpkgs/qt6-shadertools/template
+++ b/srcpkgs/qt6-shadertools/template
@@ -1,10 +1,10 @@
 # Template file for 'qt6-shadertools'
 pkgname=qt6-shadertools
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qtshadertools-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr "
+configure_args="-DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true"
 hostmakedepends="perl qt6-base-devel"
 makedepends="qt6-base-devel"
 short_desc="Cross-platform application and UI framework - shadertools"
@@ -12,7 +12,12 @@ maintainer="John <me@johnnynator.dev>"
 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=5498959b9d37c254bd126ab1320cf86aeb8a31b3ea7e51db666a8f9698afbd6c
+checksum=59b77176961528cc7b0c9325134655e273aa87b4cb386c0f4683d8f2852e435a
+
+if [ "$CROSS_BUILD" ]; then
+	hostmakedepends+=" qt6-shadertools-devel"
+fi
+
 
 qt6-shadertools-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel>=${version}_1"
@@ -20,8 +25,11 @@ qt6-shadertools-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From cfd3e10741bc9acb6174dd7050f4849a3d6e344a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:09 +0700
Subject: [PATCH 14/26] qt6-svg: update to 6.3.1.

---
 srcpkgs/qt6-svg/template | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/qt6-svg/template b/srcpkgs/qt6-svg/template
index aa8e6b745109..309b0988e435 100644
--- a/srcpkgs/qt6-svg/template
+++ b/srcpkgs/qt6-svg/template
@@ -1,10 +1,9 @@
 # Template file for 'qt6-svg'
 pkgname=qt6-svg
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qtsvg-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr "
 hostmakedepends="qt6-base-devel perl"
 makedepends="qt6-base-devel"
 short_desc="Cross-platform application and UI framework (QT6) - qt6-svg component"
@@ -12,10 +11,10 @@ maintainer="John <me@johnnynator.dev>"
 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=3164504d7e3f640439308235739b112605ab5fc9cc517ca0b28f9fb93a8db0e3
+checksum=7b19f418e6f7b8e23344082dd04440aacf5da23c5a73980ba22ae4eba4f87df7
 
 if [ "$XBPS_CHECK_PKGS" ]; then
-	configure_args+=" -DQT_BUILD_TESTS=ON"
+	configure_args="-DQT_BUILD_TESTS=ON"
 fi
 
 do_check() {
@@ -29,8 +28,11 @@ qt6-svg-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From 02b5aeb09b55e90e161fae13d72d638bb0a2b72f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:10 +0700
Subject: [PATCH 15/26] qt6-tools: update to 6.3.1.

---
 srcpkgs/qt6-tools/template | 23 ++++++++++++++++++-----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/qt6-tools/template b/srcpkgs/qt6-tools/template
index f875dff5c046..fd311176e31d 100644
--- a/srcpkgs/qt6-tools/template
+++ b/srcpkgs/qt6-tools/template
@@ -1,23 +1,33 @@
 # Template file for 'qt6-tools'
 pkgname=qt6-tools
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qttools-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr "
-hostmakedepends="qt6-base-devel perl"
-makedepends="qt6-base-devel libatomic-devel"
+configure_args="-DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=TRUE
+ -DQT_BUILD_SHARED_LIBS=ON -DQT_FEATURE_assistant=ON"
+hostmakedepends="qt6-base-devel perl qt6-plugin-sqlite"
+makedepends="qt6-base-devel libatomic-devel qt6-plugin-sqlite"
 short_desc="Cross-platform application and UI framework (QT6) - qt6-tools component"
 maintainer="John <me@johnnynator.dev>"
 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/qttools-everywhere-src-${version}.tar.xz"
-checksum=fce94688ea925782a2879347584991f854630daadba6c52aed6d93e33cd0b19c
+checksum=c412750f2aa3beb93fce5f30517c607f55daaeb7d0407af206a8adf917e126c1
+
+if [ "$CROSS_BUILD" ]; then
+	hostmakedepends+=" qt6-tools-devel"
+fi
+
 
 if [ "$XBPS_CHECK_PKGS" ]; then
 	configure_args+=" -DQT_BUILD_TESTS=ON"
 fi
 
+post_build() {
+	ninja -C build ${makejobs} lib/qt6/libexec/qhelpgenerator
+}
+
 do_check() {
 	cd build
 	# Some of these tests expect that qt6-tools is already
@@ -31,8 +41,11 @@ qt6-tools-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From 534b47167d00e4373d319f15ed09e39c3b6369f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:10 +0700
Subject: [PATCH 16/26] qt6-translations: update to 6.3.1.

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

diff --git a/srcpkgs/qt6-translations/template b/srcpkgs/qt6-translations/template
index be0a74ca74e2..1b917ccb3620 100644
--- a/srcpkgs/qt6-translations/template
+++ b/srcpkgs/qt6-translations/template
@@ -1,10 +1,9 @@
 # Template file for 'qt6-translations'
 pkgname=qt6-translations
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qttranslations-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr "
 hostmakedepends="qt6-base-devel qt6-tools-devel perl"
 makedepends="qt6-base-devel qt6-tools-devel"
 short_desc="Cross-platform application and UI framework - translations"
@@ -12,4 +11,4 @@ maintainer="John <me@johnnynator.dev>"
 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=e4dd4ef892a34a9514a19238f189a33ed85c76f31dcad6599ced93b1e33440b3
+checksum=d7bdd55e2908ded901dcc262157100af2a490bf04d31e32995f6d91d78dfdb97

From ed98f626b710c9a7f439d1de022275241d2217ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:10 +0700
Subject: [PATCH 17/26] qt6-virtualkeyboard: update to 6.3.1.

---
 srcpkgs/qt6-virtualkeyboard/template | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/qt6-virtualkeyboard/template b/srcpkgs/qt6-virtualkeyboard/template
index 67ecef145ea1..77a247400b97 100644
--- a/srcpkgs/qt6-virtualkeyboard/template
+++ b/srcpkgs/qt6-virtualkeyboard/template
@@ -1,10 +1,9 @@
 # Template file for 'qt6-virtualkeyboard'
 pkgname=qt6-virtualkeyboard
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qtvirtualkeyboard-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr"
 hostmakedepends="perl pkg-config qt6-declarative-devel"
 makedepends="qt6-declarative-devel qt6-svg-devel hunspell-devel"
 short_desc="Cross-platform application and UI framework - virtualkeyboard"
@@ -12,10 +11,10 @@ maintainer="John <me@johnnynator.dev>"
 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=89aaf15acf5432af8f5cf4ec45cb32d87a3348906215dd56e81cb294eb276573
+checksum=5fe089b204d859ab0dd0169f811f2e30cae7c5cb36f8ab95ca36883f1fc0c2b8
 
 if [ "$XBPS_CHECK_PKGS" ]; then
-	configure_args+=" -DQT_BUILD_TESTS=ON"
+	configure_args="-DQT_BUILD_TESTS=ON"
 fi
 
 do_check() {
@@ -32,8 +31,11 @@ qt6-virtualkeyboard-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From 2ac70e6a27268820cdf74f740baed0b4bee41b57 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:10 +0700
Subject: [PATCH 18/26] qt6-wayland: update to 6.3.1.

---
 srcpkgs/qt6-wayland/template | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/qt6-wayland/template b/srcpkgs/qt6-wayland/template
index b71a273009b9..83afb34e229e 100644
--- a/srcpkgs/qt6-wayland/template
+++ b/srcpkgs/qt6-wayland/template
@@ -1,13 +1,14 @@
 # Template file for 'qt6-wayland'
 pkgname=qt6-wayland
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qtwayland-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true"
+configure_args="-DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true"
 hostmakedepends="qt6-base-devel perl pkg-config wayland-devel qt6-wayland-devel"
 # XXX: Qml as optional dep
 makedepends="qt6-base-devel wayland-devel libxkbcommon-devel
+ qt6-declarative-devel
  libXcomposite-devel MesaLib-devel Vulkan-Headers libdrm-devel"
 checkdepends="dbus mesa-dri"
 short_desc="Cross-platform application and UI framework - Wayland"
@@ -15,7 +16,7 @@ maintainer="John <me@johnnynator.dev>"
 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=e7b567f6e43ffc5918d4aa825ce1eced66a00cb0a87133b2912ba5c1b2a02190
+checksum=6f14fea2d172a5b4170be3efcb0e58535f6605b61bcd823f6d5c9d165bb8c0f0
 
 if [ "$XBPS_CHECK_PKGS" ]; then
 	configure_args+=" -DQT_BUILD_TESTS=ON"
@@ -32,9 +33,11 @@ qt6-wayland-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
-		vmove usr/lib/qt6/libexec/qtwaylandscanner
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From f12b18e78b313c6bafb7c98e3074160cd02bd18d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:10 +0700
Subject: [PATCH 19/26] qt6-websockets: update to 6.3.1.

---
 srcpkgs/qt6-websockets/template | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/qt6-websockets/template b/srcpkgs/qt6-websockets/template
index c2e674aacb31..4875af093432 100644
--- a/srcpkgs/qt6-websockets/template
+++ b/srcpkgs/qt6-websockets/template
@@ -1,10 +1,9 @@
 # Template file for 'qt6-websockets'
 pkgname=qt6-websockets
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qtwebsockets-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr"
 hostmakedepends="perl qt6-base-devel qt6-declarative-devel"
 makedepends="qt6-base-devel qt6-declarative-devel"
 short_desc="Cross-platform application and UI framework - websockets"
@@ -12,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 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=e018a09fe960b7d9560d6bbc9d3ca022fed6566e6ba6fc6d869a97482d4e6361
+checksum=9f980d90c97fcbde1b50c773f6dc580cfdf8c36ce14a1be3aa2ccadfe605121a
 
 qt6-websockets-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel>=${version}_1"
@@ -20,8 +19,11 @@ qt6-websockets-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From 6fc825796777e6819b1c2e3150ab72689e006ef3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Tue, 9 Aug 2022 20:16:47 +0700
Subject: [PATCH 20/26] qt6-3d: update to 6.3.1.

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

diff --git a/srcpkgs/qt6-3d/template b/srcpkgs/qt6-3d/template
index 666f57559532..c08c3bd4a41b 100644
--- a/srcpkgs/qt6-3d/template
+++ b/srcpkgs/qt6-3d/template
@@ -1,10 +1,9 @@
 # Template file for 'qt6-3d'
 pkgname=qt6-3d
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qt3d-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr"
 hostmakedepends="perl qt6-declarative-devel"
 makedepends="qt6-declarative-devel qt6-shadertools-devel libassimp-devel
  libatomic-devel"
@@ -13,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 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=74e762380dad34887878b9124dbfb981d5cf4b8b807281ff8bff311145b54de1
+checksum=9919b66dfb253fa26db1a7d664358cbc07f46c8810082ee3120d0a54b153edfe
 
 qt6-3d-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 04434a65d2d1f42e406ca2b627fdf29856c01df5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:11 +0700
Subject: [PATCH 21/26] New package: qt6-webchannel-6.3.1

---
 srcpkgs/qt6-webchannel-devel    |  1 +
 srcpkgs/qt6-webchannel/template | 32 ++++++++++++++++++++++++++++++++
 srcpkgs/qt6-webchannel/update   |  1 +
 3 files changed, 34 insertions(+)
 create mode 120000 srcpkgs/qt6-webchannel-devel
 create mode 100644 srcpkgs/qt6-webchannel/template
 create mode 100644 srcpkgs/qt6-webchannel/update

diff --git a/srcpkgs/qt6-webchannel-devel b/srcpkgs/qt6-webchannel-devel
new file mode 120000
index 000000000000..03e8b23d785d
--- /dev/null
+++ b/srcpkgs/qt6-webchannel-devel
@@ -0,0 +1 @@
+qt6-webchannel
\ No newline at end of file
diff --git a/srcpkgs/qt6-webchannel/template b/srcpkgs/qt6-webchannel/template
new file mode 100644
index 000000000000..432c42bcc056
--- /dev/null
+++ b/srcpkgs/qt6-webchannel/template
@@ -0,0 +1,32 @@
+# Template file for 'qt6-webchannel'
+pkgname=qt6-webchannel
+version=6.3.1
+revision=1
+wrksrc="qtwebchannel-everywhere-src-${version}"
+build_style=cmake
+hostmakedepends="perl qt6-base-devel qt6-declarative-devel"
+makedepends="qt6-base-devel qt6-declarative-devel qt6-websockets-devel"
+short_desc="Cross-platform application and UI framework - webchannel"
+maintainer="John <me@johnnynator.dev>"
+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=aaa20ac23f86992721b7ee487c379a3fd68caa8cdcea0a77a37e0d8b47ff2668
+
+qt6-webchannel-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel>=${version}_1
+	 qt6-websockets-devel>=${version}_1"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
+		vmove usr/lib/qt6/mkspecs
+		vmove usr/lib/qt6/qml/QtWebChannel/plugins.qmltypes
+		vmove usr/lib/qt6/qml/QtWebChannel/qmldir
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
+	}
+}
diff --git a/srcpkgs/qt6-webchannel/update b/srcpkgs/qt6-webchannel/update
new file mode 100644
index 000000000000..844552465222
--- /dev/null
+++ b/srcpkgs/qt6-webchannel/update
@@ -0,0 +1 @@
+pkgname="${pkgname/6-/}-everywhere-src"

From 65abb8ef76f2cad30e1235dfb1eab573381d8ec5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:11 +0700
Subject: [PATCH 22/26] New package: qt6-multimedia-6.3.1

---
 common/shlibs                   |  3 +++
 srcpkgs/qt6-multimedia-devel    |  1 +
 srcpkgs/qt6-multimedia/template | 33 +++++++++++++++++++++++++++++++++
 srcpkgs/qt6-multimedia/update   |  1 +
 4 files changed, 38 insertions(+)
 create mode 120000 srcpkgs/qt6-multimedia-devel
 create mode 100644 srcpkgs/qt6-multimedia/template
 create mode 100644 srcpkgs/qt6-multimedia/update

diff --git a/common/shlibs b/common/shlibs
index ea6fde4ffe31..da78faa689d5 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2077,6 +2077,9 @@ libQt6SerialPort.so.6 qt6-serialport-6.2.0alpha_1
 libQt6WebSockets.so.6 qt6-websockets-6.2.0alpha_1
 libQt6WebChannel.so.6 qt6-webchannel-6.2.0alpha_1
 libQt6Positioning.so.6 qt6-location-6.2.0alpha_1
+libQt6MultimediaWidgets.so.6 qt6-multimedia-6.3.1_1
+libQt6MultimediaQuick.so.6 qt6-multimedia-6.3.1_1
+libQt6Multimedia.so.6 qt6-multimedia-6.3.1_1
 libnpth.so.0 npth-1.1_1
 libnpupnp.so.4 libnpupnp-4.0.2_1
 libglfw.so.3 glfw-3.0.4_1
diff --git a/srcpkgs/qt6-multimedia-devel b/srcpkgs/qt6-multimedia-devel
new file mode 120000
index 000000000000..9343446502d0
--- /dev/null
+++ b/srcpkgs/qt6-multimedia-devel
@@ -0,0 +1 @@
+qt6-multimedia
\ No newline at end of file
diff --git a/srcpkgs/qt6-multimedia/template b/srcpkgs/qt6-multimedia/template
new file mode 100644
index 000000000000..535a2f55ffe4
--- /dev/null
+++ b/srcpkgs/qt6-multimedia/template
@@ -0,0 +1,33 @@
+# Template file for 'qt6-multimedia'
+pkgname=qt6-multimedia
+version=6.3.1
+revision=1
+wrksrc="qtmultimedia-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DQT_FEATURE_gstreamer=ON"
+hostmakedepends="perl qt6-declarative-devel pkg-config
+ qt6-shadertools-devel"
+makedepends="qt6-declarative-devel
+ qt6-shadertools-devel libglib-devel gst-plugins-base1-devel"
+short_desc="Cross-platform application and UI framework - multimedia"
+maintainer="John <me@johnnynator.dev>"
+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=7e03242aadd634ff2d9fcf08948290f03da3d9a5012369d908da89f82b1d7336
+
+qt6-multimedia-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel>=${version}_1"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
+		vmove usr/lib/qt6/mkspecs
+		vmove usr/lib/qt6/qml/QtMultimedia/plugins.qmltypes
+		vmove usr/lib/qt6/qml/QtMultimedia/qmldir
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}
diff --git a/srcpkgs/qt6-multimedia/update b/srcpkgs/qt6-multimedia/update
new file mode 100644
index 000000000000..844552465222
--- /dev/null
+++ b/srcpkgs/qt6-multimedia/update
@@ -0,0 +1 @@
+pkgname="${pkgname/6-/}-everywhere-src"

From 43b70afd56891b217e4b30ec1797b9034774f288 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 18:22:48 +0700
Subject: [PATCH 23/26] New package: qt6-connectivity-6.3.1

---
 common/shlibs                     |  2 ++
 srcpkgs/qt6-connectivity-devel    |  1 +
 srcpkgs/qt6-connectivity/template | 30 ++++++++++++++++++++++++++++++
 3 files changed, 33 insertions(+)
 create mode 120000 srcpkgs/qt6-connectivity-devel
 create mode 100644 srcpkgs/qt6-connectivity/template

diff --git a/common/shlibs b/common/shlibs
index da78faa689d5..d46643fc31ed 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2071,6 +2071,8 @@ libQt6Designer.so.6 qt6-tools-6.1.0_1
 libQt6DesignerComponents.so.6 qt6-tools-6.1.0_1
 libQt6Help.so.6 qt6-tools-6.1.0_1
 libQt6UiTools.so.6 qt6-tools-6.1.0_1
+libQt6Nfc.so.6 qt6-connectivity-6.3.1_1
+libQt6Bluetooth.so.6 qt6-connectivity-6.3.1_1
 libQt6HunspellInputMethod.so.6 qt6-virtualkeyboard-6.1.0_1
 libQt6VirtualKeyboard.so.6 qt6-virtualkeyboard-6.1.0_1
 libQt6SerialPort.so.6 qt6-serialport-6.2.0alpha_1
diff --git a/srcpkgs/qt6-connectivity-devel b/srcpkgs/qt6-connectivity-devel
new file mode 120000
index 000000000000..478cc9d8aa39
--- /dev/null
+++ b/srcpkgs/qt6-connectivity-devel
@@ -0,0 +1 @@
+qt6-connectivity
\ No newline at end of file
diff --git a/srcpkgs/qt6-connectivity/template b/srcpkgs/qt6-connectivity/template
new file mode 100644
index 000000000000..6cb61744d0cb
--- /dev/null
+++ b/srcpkgs/qt6-connectivity/template
@@ -0,0 +1,30 @@
+# Template file for 'qt6-connectivity'
+pkgname=qt6-connectivity
+version=6.3.1
+revision=1
+wrksrc="qtconnectivity-everywhere-src-${version}"
+build_style=cmake
+hostmakedepends="perl qt6-declarative-devel"
+makedepends="qt6-declarative-devel"
+short_desc="Cross-platform application and UI framework - Connectivity"
+maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
+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=b25ce4710a9c61bc6a5dbaeeb3e2ed907a8bc85478fdb2ab4312297768b695b0
+
+qt6-connectivity-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}
+	 qt6-declarative>=${version}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
+		vmove usr/lib/qt6/mkspecs
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
+	}
+}

From f10536d5ca7d61b01adbed03eb7cceb39e7dc17c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 18:22:57 +0700
Subject: [PATCH 24/26] New package: qt6-sensors-6.3.1

---
 common/shlibs                |  2 ++
 srcpkgs/qt6-sensors-devel    |  1 +
 srcpkgs/qt6-sensors/template | 31 +++++++++++++++++++++++++++++++
 3 files changed, 34 insertions(+)
 create mode 120000 srcpkgs/qt6-sensors-devel
 create mode 100644 srcpkgs/qt6-sensors/template

diff --git a/common/shlibs b/common/shlibs
index d46643fc31ed..f6284eee1bae 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2073,6 +2073,8 @@ libQt6Help.so.6 qt6-tools-6.1.0_1
 libQt6UiTools.so.6 qt6-tools-6.1.0_1
 libQt6Nfc.so.6 qt6-connectivity-6.3.1_1
 libQt6Bluetooth.so.6 qt6-connectivity-6.3.1_1
+libQt6Sensors.so.6 qt6-sensors-6.3.1_1
+libQt6SensorsQuick.so.6 qt6-sensors-6.3.1_1
 libQt6HunspellInputMethod.so.6 qt6-virtualkeyboard-6.1.0_1
 libQt6VirtualKeyboard.so.6 qt6-virtualkeyboard-6.1.0_1
 libQt6SerialPort.so.6 qt6-serialport-6.2.0alpha_1
diff --git a/srcpkgs/qt6-sensors-devel b/srcpkgs/qt6-sensors-devel
new file mode 120000
index 000000000000..eb9457f04055
--- /dev/null
+++ b/srcpkgs/qt6-sensors-devel
@@ -0,0 +1 @@
+qt6-sensors
\ No newline at end of file
diff --git a/srcpkgs/qt6-sensors/template b/srcpkgs/qt6-sensors/template
new file mode 100644
index 000000000000..5a81f43b60eb
--- /dev/null
+++ b/srcpkgs/qt6-sensors/template
@@ -0,0 +1,31 @@
+# Template file for 'qt6-sensors'
+pkgname=qt6-sensors
+version=6.3.1
+revision=1
+wrksrc="qtsensors-everywhere-src-${version}"
+build_style=cmake
+hostmakedepends="perl qt6-declarative-devel qt6-svg-devel pkg-config"
+makedepends="qt6-declarative-devel qt6-svg-devel"
+short_desc="Cross-platform application and UI framework - Sensors"
+maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
+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=4b240b59edba9a42b4735758a25f279a26841b982864e7b38f6ef0b81e0d60cc
+
+qt6-sensors-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}
+	 qt6-declarative-devel>=${version}_1"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
+		vmove usr/lib/qt6/mkspecs
+		vmove usr/lib/qt6/qml/QtSensors/plugins.qmltypes
+		vmove usr/lib/qt6/qml/QtSensors/qmldir
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}

From 46acc583861a5200039f9058b10c097a53f75b0d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 18:23:08 +0700
Subject: [PATCH 25/26] New package: qt6-remoteobjects-6.3.1

---
 common/shlibs                      |  2 ++
 srcpkgs/qt6-remoteobjects-devel    |  1 +
 srcpkgs/qt6-remoteobjects/template | 31 ++++++++++++++++++++++++++++++
 3 files changed, 34 insertions(+)
 create mode 120000 srcpkgs/qt6-remoteobjects-devel
 create mode 100644 srcpkgs/qt6-remoteobjects/template

diff --git a/common/shlibs b/common/shlibs
index f6284eee1bae..a0fab8869948 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2073,6 +2073,8 @@ libQt6Help.so.6 qt6-tools-6.1.0_1
 libQt6UiTools.so.6 qt6-tools-6.1.0_1
 libQt6Nfc.so.6 qt6-connectivity-6.3.1_1
 libQt6Bluetooth.so.6 qt6-connectivity-6.3.1_1
+libQt6RemoteObjects.so.6 qt6-remoteobjects-6.3.1_1
+libQt6RemoteObjectsQml.so.6 qt6-remoteobjects-6.3.1_1
 libQt6Sensors.so.6 qt6-sensors-6.3.1_1
 libQt6SensorsQuick.so.6 qt6-sensors-6.3.1_1
 libQt6HunspellInputMethod.so.6 qt6-virtualkeyboard-6.1.0_1
diff --git a/srcpkgs/qt6-remoteobjects-devel b/srcpkgs/qt6-remoteobjects-devel
new file mode 120000
index 000000000000..2a027f95266f
--- /dev/null
+++ b/srcpkgs/qt6-remoteobjects-devel
@@ -0,0 +1 @@
+qt6-remoteobjects
\ No newline at end of file
diff --git a/srcpkgs/qt6-remoteobjects/template b/srcpkgs/qt6-remoteobjects/template
new file mode 100644
index 000000000000..ebb06382c8d6
--- /dev/null
+++ b/srcpkgs/qt6-remoteobjects/template
@@ -0,0 +1,31 @@
+# Template file for 'qt6-remoteobjects'
+pkgname=qt6-remoteobjects
+version=6.3.1
+revision=1
+wrksrc="qtremoteobjects-everywhere-src-${version}"
+build_style=cmake
+hostmakedepends="perl qt6-declarative-devel pkg-config"
+makedepends="qt6-declarative-devel"
+short_desc="Cross-platform application and UI framework - Remote Objects"
+maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
+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=ea6d038b11c60981de0bd39a6091a59abf7d031e37bfc592b31be1217bef4ca6
+
+qt6-remoteobjects-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}
+	 qt6-declarative-devel>=${version}_1"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
+		vmove usr/lib/qt6/mkspecs
+		vmove usr/lib/qt6/qml/QtRemoteObjects/plugins.qmltypes
+		vmove usr/lib/qt6/qml/QtRemoteObjects/qmldir
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}

From 2cb9abd1942fcbf9b051ebd8d584d9acdcaa6e30 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:11 +0700
Subject: [PATCH 26/26] New package: qt6-webengine-6.3.1.

---
 common/shlibs                                 |    7 +
 srcpkgs/qt6-webengine-devel                   |    1 +
 srcpkgs/qt6-webengine-examples                |    1 +
 .../patches/0001-None-no-debug.patch          |   11 +
 .../patches/0002-enable-ppc64.patch           |   20 +
 .../patches/0003-cross-hack.patch             |   10 +
 .../0004-ppc-disable-jxl-decoder.patch        |   13 +
 .../patches/0050-no-glibc-cmake-check.patch   |   14 +
 .../0100-chromium-sandbox-membarrier.patch    |   58 +
 .../qt6-webengine/patches/0101-size_t.patch   |   16 +
 .../0102-chromium-90-ruy-include.patch        |   19 +
 ...-v8-monotonic-pthread-cont_timedwait.patch |   22 +
 .../0104-chromium-revert-9d080c0.patch        |  162 +
 ...-chromium-revert-drop-of-system-java.patch |   15 +
 .../patches/0106-chromium-system-nodejs.patch |   20 +
 .../0107-chromium-cursed^Uscoped_file.patch   |   18 +
 .../0108-chromium-fix-narrowing-cast.patch    |   53 +
 .../0109-chromium-remove-strip_binary.patch   |   32 +
 ...ium-revert-use-ffile-compilation-dir.patch |   57 +
 ...11-chromium-no-Wno-stringop-overread.patch |   10 +
 .../0150-chromium-glibc-libc_malloc.patch     |   24 +
 ...-include-sys-reg.h-to-get-__WORDSIZE.patch |   21 +
 .../0201-chromium-musl-dispatch-to-musl.patch |  103 +
 .../0202-chromium-musl-no-mallinfo.patch      |   62 +
 .../0203-chromium-musl-siginfo_t.patch        |   18 +
 .../0204-chromium-musl-stackstart.patch       |   20 +
 .../patches/0205-chromium-musl-sandbox.patch  |   92 +
 ...0206-chromium-musl-default-stacksize.patch |   15 +
 ...-chromium-musl-cross-no-asm_ptrace_h.patch |   30 +
 .../patches/0208-chromium-musl-execinfo.patch |  125 +
 .../0209-chromium-musl-thread-stacksize.patch |   22 +
 .../0210-chromium-musl-msgvec-push_back.patch |   14 +
 ...ium-musl-canonicalize-file-name-musl.patch |   11 +
 .../0212-chromium-musl-no-getcontext.patch    |   29 +
 .../patches/0213-chromium-musl-crashpad.patch |   22 +
 .../patches/0214-chromium-musl-fixes.patch    |  108 +
 .../patches/0215-chromium-musl-cdefs.patch    |   29 +
 .../patches/0216-chromium-musl-stat.patch     |   12 +
 .../patches/0217-chromium-musl-resolver.patch |   77 +
 .../patches/0600-chromium-sndio.patch         |  876 ++++
 .../patches/0700-armv7l-neon.patch            |   10 +
 .../0750-chromium-musl-arm-user_vfp.patch     |   20 +
 .../0751-chromium-musl-arm-elf_auxv_t.patch   |   18 +
 ...0801-chromium-i686-vaapi-fpermissive.patch |   24 +
 .../patches/0900-xxx-ppc64le-libvpx.patch     |   65 +
 .../0901-xxx-ppc64le-sandbox-linux-stat.patch |   31 +
 .../patches/0902-xxx-ppc64le-support.patch    | 3559 +++++++++++++++++
 .../0903-xxx-ppc64le-swiftshader.patch        |   18 +
 srcpkgs/qt6-webengine/template                |  178 +
 srcpkgs/qt6-webengine/update                  |    1 +
 50 files changed, 6193 insertions(+)
 create mode 120000 srcpkgs/qt6-webengine-devel
 create mode 120000 srcpkgs/qt6-webengine-examples
 create mode 100644 srcpkgs/qt6-webengine/patches/0001-None-no-debug.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0002-enable-ppc64.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0003-cross-hack.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0004-ppc-disable-jxl-decoder.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0050-no-glibc-cmake-check.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0100-chromium-sandbox-membarrier.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0101-size_t.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0102-chromium-90-ruy-include.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0103-chromium-v8-monotonic-pthread-cont_timedwait.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0104-chromium-revert-9d080c0.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0105-chromium-revert-drop-of-system-java.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0106-chromium-system-nodejs.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0107-chromium-cursed^Uscoped_file.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0108-chromium-fix-narrowing-cast.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0109-chromium-remove-strip_binary.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0110-chromium-revert-use-ffile-compilation-dir.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0111-chromium-no-Wno-stringop-overread.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0150-chromium-glibc-libc_malloc.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0200-chromium-musl-include-sys-reg.h-to-get-__WORDSIZE.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0201-chromium-musl-dispatch-to-musl.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0202-chromium-musl-no-mallinfo.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0203-chromium-musl-siginfo_t.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0204-chromium-musl-stackstart.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0205-chromium-musl-sandbox.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0206-chromium-musl-default-stacksize.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0207-chromium-musl-cross-no-asm_ptrace_h.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0208-chromium-musl-execinfo.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0209-chromium-musl-thread-stacksize.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0210-chromium-musl-msgvec-push_back.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0211-chromium-musl-canonicalize-file-name-musl.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0212-chromium-musl-no-getcontext.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0213-chromium-musl-crashpad.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0214-chromium-musl-fixes.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0215-chromium-musl-cdefs.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0216-chromium-musl-stat.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0217-chromium-musl-resolver.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0600-chromium-sndio.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0700-armv7l-neon.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0750-chromium-musl-arm-user_vfp.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0751-chromium-musl-arm-elf_auxv_t.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0801-chromium-i686-vaapi-fpermissive.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0900-xxx-ppc64le-libvpx.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0901-xxx-ppc64le-sandbox-linux-stat.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0902-xxx-ppc64le-support.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0903-xxx-ppc64le-swiftshader.patch
 create mode 100644 srcpkgs/qt6-webengine/template
 create mode 100644 srcpkgs/qt6-webengine/update

diff --git a/common/shlibs b/common/shlibs
index a0fab8869948..fa72f8ee24d2 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2086,6 +2086,13 @@ libQt6Positioning.so.6 qt6-location-6.2.0alpha_1
 libQt6MultimediaWidgets.so.6 qt6-multimedia-6.3.1_1
 libQt6MultimediaQuick.so.6 qt6-multimedia-6.3.1_1
 libQt6Multimedia.so.6 qt6-multimedia-6.3.1_1
+libQt6WebEngineQuick.so.6 qt6-webengine-6.3.1_1
+libQt6PdfWidgets.so.6 qt6-webengine-6.3.1_1
+libQt6PdfQuick.so.6 qt6-webengine-6.3.1_1
+libQt6WebEngineCore.so.6 qt6-webengine-6.3.1_1
+libQt6Pdf.so.6 qt6-webengine-6.3.1_1
+libQt6WebEngineQuickDelegatesQml.so.6 qt6-webengine-6.3.1_1
+libQt6WebEngineWidgets.so.6 qt6-webengine-6.3.1_1
 libnpth.so.0 npth-1.1_1
 libnpupnp.so.4 libnpupnp-4.0.2_1
 libglfw.so.3 glfw-3.0.4_1
diff --git a/srcpkgs/qt6-webengine-devel b/srcpkgs/qt6-webengine-devel
new file mode 120000
index 000000000000..8e4d1b99c587
--- /dev/null
+++ b/srcpkgs/qt6-webengine-devel
@@ -0,0 +1 @@
+qt6-webengine
\ No newline at end of file
diff --git a/srcpkgs/qt6-webengine-examples b/srcpkgs/qt6-webengine-examples
new file mode 120000
index 000000000000..8e4d1b99c587
--- /dev/null
+++ b/srcpkgs/qt6-webengine-examples
@@ -0,0 +1 @@
+qt6-webengine
\ No newline at end of file
diff --git a/srcpkgs/qt6-webengine/patches/0001-None-no-debug.patch b/srcpkgs/qt6-webengine/patches/0001-None-no-debug.patch
new file mode 100644
index 000000000000..1ba33f8e6fd9
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0001-None-no-debug.patch
@@ -0,0 +1,11 @@
+--- a/cmake/Functions.cmake
++++ b/cmake/Functions.cmake
+@@ -813,6 +813,8 @@ macro(append_build_type_setup)
+         endif()
+     elseif(${config} STREQUAL "MinSizeRel")
+         list(APPEND gnArgArg is_debug=false symbol_level=0 optimize_for_size=true)
++    elseif(${config} STREQUAL "None")
++        list(APPEND gnArgArg is_debug=false symbol_level=0)
+     endif()
+     if(FEATURE_developer_build OR (${config} STREQUAL "Debug") OR QT_FEATURE_webengine_sanitizer)
+         list(APPEND gnArgArg
diff --git a/srcpkgs/qt6-webengine/patches/0002-enable-ppc64.patch b/srcpkgs/qt6-webengine/patches/0002-enable-ppc64.patch
new file mode 100644
index 000000000000..d72ef1ad1a10
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0002-enable-ppc64.patch
@@ -0,0 +1,20 @@
+--- a/cmake/Functions.cmake
++++ b/cmake/Functions.cmake
+@@ -622,6 +622,8 @@ function(get_gn_arch result arch)
+         set(${result} "mipsel" PARENT_SCOPE)
+     elseif(arch STREQUAL "mipsel64")
+         set(${result} "mips64el" PARENT_SCOPE)
++    elseif(arch STREQUAL "power64")
++        set(${result} "power64" PARENT_SCOPE)
+     else()
+         message(DEBUG "Unsupported architecture: ${arch}")
+     endif()
+@@ -641,6 +643,8 @@ function(get_v8_arch result targetArch h
+             set(${result} "mipsel" PARENT_SCOPE)
+         elseif(hostArch STREQUAL "mipsel64")
+             set(${result} "mipsel" PARENT_SCOPE)
++        elseif(hostArch STREQUAL "power64")
++            set(${result} "power64" PARENT_SCOPE)
+         else()
+             message(DEBUG "Unsupported architecture: ${hostArch}")
+         endif()
diff --git a/srcpkgs/qt6-webengine/patches/0003-cross-hack.patch b/srcpkgs/qt6-webengine/patches/0003-cross-hack.patch
new file mode 100644
index 000000000000..ea9f90094a63
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0003-cross-hack.patch
@@ -0,0 +1,10 @@
+--- a/src/core/api/CMakeLists.txt
++++ b/src/core/api/CMakeLists.txt
+@@ -50,6 +50,7 @@ qt_internal_add_module(WebEngineCore
+         Qt::Gui
+         Qt::Network
+         Qt::Quick
++        X11
+ )
+ 
+ set_target_properties(WebEngineCore PROPERTIES QTWEBENGINEPROCESS_NAME ${qtWebEngineProcessName})
diff --git a/srcpkgs/qt6-webengine/patches/0004-ppc-disable-jxl-decoder.patch b/srcpkgs/qt6-webengine/patches/0004-ppc-disable-jxl-decoder.patch
new file mode 100644
index 000000000000..73c1151968f4
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0004-ppc-disable-jxl-decoder.patch
@@ -0,0 +1,13 @@
+--- a/src/core/CMakeLists.txt
++++ b/src/core/CMakeLists.txt
+@@ -414,6 +414,10 @@ foreach(arch ${archs})
+                 CONDITION QT_FEATURE_webengine_ozone_x11 AND XSCRNSAVER_FOUND
+             )
+ 
++            if (cpu STREQUAL "ppc64")
++                list(APPEND gnArgArg enable_jxl_decoder=false)
++            endif()
++
+             if(QT_FEATURE_webengine_kerberos)
+                 list(APPEND gnArgArg
+                      external_gssapi_include_dir="${GSSAPI_INCLUDE_DIRS}/gssapi"
diff --git a/srcpkgs/qt6-webengine/patches/0050-no-glibc-cmake-check.patch b/srcpkgs/qt6-webengine/patches/0050-no-glibc-cmake-check.patch
new file mode 100644
index 000000000000..f756bf0286bb
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0050-no-glibc-cmake-check.patch
@@ -0,0 +1,14 @@
+--- a/configure.cmake
++++ b/configure.cmake
+@@ -499,11 +499,6 @@ add_check_for_support(
+ )
+ add_check_for_support(
+    MODULES QtWebEngine QtPdf
+-   CONDITION NOT LINUX OR TEST_glibc
+-   MESSAGE "A suitable version >= 2.17 of glibc is required."
+-)
+-add_check_for_support(
+-   MODULES QtWebEngine QtPdf
+    CONDITION NOT LINUX OR TEST_khr
+    MESSAGE "Build requires Khronos development headers for build - see mesa/libegl1-mesa-dev"
+ )
diff --git a/srcpkgs/qt6-webengine/patches/0100-chromium-sandbox-membarrier.patch b/srcpkgs/qt6-webengine/patches/0100-chromium-sandbox-membarrier.patch
new file mode 100644
index 000000000000..2dd7b4aa948f
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0100-chromium-sandbox-membarrier.patch
@@ -0,0 +1,58 @@
+--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
++++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
+@@ -413,6 +413,7 @@ bool SyscallSets::IsAllowedProcessStartO
+   switch (sysno) {
+     case __NR_exit:
+     case __NR_exit_group:
++    case __NR_membarrier:
+     case __NR_wait4:
+     case __NR_waitid:
+ #if defined(__i386__)
+--- a/src/3rdparty/chromium/sandbox/linux/system_headers/arm64_linux_syscalls.h
++++ b/src/3rdparty/chromium/sandbox/linux/system_headers/arm64_linux_syscalls.h
+@@ -1215,4 +1215,8 @@
+ #define __NR_landlock_restrict_self 446
+ #endif
+ 
++#if !defined(__NR_membarrier)
++#define __NR_membarrier 283
++#endif
++
+ #endif  // SANDBOX_LINUX_SYSTEM_HEADERS_ARM64_LINUX_SYSCALLS_H_
+--- a/src/3rdparty/chromium/sandbox/linux/system_headers/arm_linux_syscalls.h
++++ b/src/3rdparty/chromium/sandbox/linux/system_headers/arm_linux_syscalls.h
+@@ -1617,6 +1617,10 @@
+ #define __NR_landlock_restrict_self (__NR_SYSCALL_BASE + 446)
+ #endif
+ 
++#if !defined(__NR_membarrier)
++#define __NR_membarrier (__NR_SYSCALL_BASE+389)
++#endif
++
+ // ARM private syscalls.
+ #if !defined(__ARM_NR_BASE)
+ #define __ARM_NR_BASE (__NR_SYSCALL_BASE + 0xF0000)
+--- a/src/3rdparty/chromium/sandbox/linux/system_headers/x86_32_linux_syscalls.h
++++ b/src/3rdparty/chromium/sandbox/linux/system_headers/x86_32_linux_syscalls.h
+@@ -1750,5 +1750,9 @@
+ #define __NR_landlock_restrict_self 446
+ #endif
+ 
++#if !defined(__NR_membarrier)
++#define __NR_membarrier 375
++#endif
++
+ #endif  // SANDBOX_LINUX_SYSTEM_HEADERS_X86_32_LINUX_SYSCALLS_H_
+ 
+--- a/src/3rdparty/chromium/sandbox/linux/system_headers/x86_64_linux_syscalls.h
++++ b/src/3rdparty/chromium/sandbox/linux/system_headers/x86_64_linux_syscalls.h
+@@ -1438,5 +1438,9 @@
+ #define __NR_landlock_restrict_self 446
+ #endif
+ 
++#if !defined(__NR_membarrier)
++#define __NR_membarrier 324
++#endif
++
+ #endif  // SANDBOX_LINUX_SYSTEM_HEADERS_X86_64_LINUX_SYSCALLS_H_
+ 
diff --git a/srcpkgs/qt6-webengine/patches/0101-size_t.patch b/srcpkgs/qt6-webengine/patches/0101-size_t.patch
new file mode 100644
index 000000000000..fccc085da311
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0101-size_t.patch
@@ -0,0 +1,16 @@
+--- a/src/3rdparty/chromium/third_party/angle/include/platform/PlatformMethods.h
++++ b/src/3rdparty/chromium/third_party/angle/include/platform/PlatformMethods.h
+@@ -239,11 +239,11 @@ inline void DefaultOverrideFeaturesMtl(P
+ using ProgramKeyType   = std::array<uint8_t, 20>;
+ using CacheProgramFunc = void (*)(PlatformMethods *platform,
+                                   const ProgramKeyType &key,
+-                                  size_t programSize,
++                                  std::size_t programSize,
+                                   const uint8_t *programBytes);
+ inline void DefaultCacheProgram(PlatformMethods *platform,
+                                 const ProgramKeyType &key,
+-                                size_t programSize,
++                                std::size_t programSize,
+                                 const uint8_t *programBytes)
+ {}
+ 
diff --git a/srcpkgs/qt6-webengine/patches/0102-chromium-90-ruy-include.patch b/srcpkgs/qt6-webengine/patches/0102-chromium-90-ruy-include.patch
new file mode 100644
index 000000000000..bbba579076d6
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0102-chromium-90-ruy-include.patch
@@ -0,0 +1,19 @@
+From 714092f336bb14d2fcc27396ec323b3d843bb962 Mon Sep 17 00:00:00 2001
+From: Stephan Hartmann <stha09@googlemail.com>
+Date: Thu, 4 Mar 2021 15:05:46 +0000
+Subject: [PATCH] IWYU: include limits for std::numeric_limits
+
+---
+ third_party/ruy/src/ruy/block_map.cc | 1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/src/3rdparty/chromium/third_party/ruy/src/ruy/block_map.cc
++++ b/src/3rdparty/chromium/third_party/ruy/src/ruy/block_map.cc
+@@ -17,6 +17,7 @@ limitations under the License.
+ 
+ #include <algorithm>
+ #include <cstdint>
++#include <limits>
+ 
+ #ifdef RUY_MAKEBLOCKMAP_DEBUG
+ #include <cstdio>
diff --git a/srcpkgs/qt6-webengine/patches/0103-chromium-v8-monotonic-pthread-cont_timedwait.patch b/srcpkgs/qt6-webengine/patches/0103-chromium-v8-monotonic-pthread-cont_timedwait.patch
new file mode 100644
index 000000000000..1dc8bc4d3d17
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0103-chromium-v8-monotonic-pthread-cont_timedwait.patch
@@ -0,0 +1,22 @@
+Use monotonic clock for pthread_cond_timedwait with musl too.
+
+--- a/src/3rdparty/chromium/v8/src/base/platform/condition-variable.cc
++++ b/src/3rdparty/chromium/v8/src/base/platform/condition-variable.cc
+@@ -20,7 +20,7 @@ namespace base {
+ 
+ ConditionVariable::ConditionVariable() {
+ #if (V8_OS_FREEBSD || V8_OS_NETBSD || V8_OS_OPENBSD || \
+-     (V8_OS_LINUX && V8_LIBC_GLIBC))
++     V8_OS_LINUX)
+   // On Free/Net/OpenBSD and Linux with glibc we can change the time
+   // source for pthread_cond_timedwait() to use the monotonic clock.
+   pthread_condattr_t attr;
+@@ -96,7 +96,7 @@ bool ConditionVariable::WaitFor(Mutex* m
+       &native_handle_, &mutex->native_handle(), &ts);
+ #else
+ #if (V8_OS_FREEBSD || V8_OS_NETBSD || V8_OS_OPENBSD || \
+-     (V8_OS_LINUX && V8_LIBC_GLIBC))
++     V8_OS_LINUX)
+   // On Free/Net/OpenBSD and Linux with glibc we can change the time
+   // source for pthread_cond_timedwait() to use the monotonic clock.
+   result = clock_gettime(CLOCK_MONOTONIC, &ts);
diff --git a/srcpkgs/qt6-webengine/patches/0104-chromium-revert-9d080c0.patch b/srcpkgs/qt6-webengine/patches/0104-chromium-revert-9d080c0.patch
new file mode 100644
index 000000000000..42b1ee9ec063
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0104-chromium-revert-9d080c0.patch
@@ -0,0 +1,162 @@
+ Original change's description:
+ > Replace 'blacklist' with 'ignorelist' in ./tools/msan/.
+ >
+ > Bug: 1097272, 1097268
+ > Change-Id: Id5c8227a5bfb1ffaec82d3168b609085b10c8297
+ > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2867730
+ > Commit-Queue: Dylan Cutler <dylancutler@google.com>
+ > Reviewed-by: Nico Weber <thakis@chromium.org>
+ > Reviewed-by: Jonathan Metzman <metzman@chromium.org>
+ > Cr-Commit-Position: refs/heads/master@{#883035}
+--- a/src/3rdparty/chromium/build/config/sanitizers/BUILD.gn
++++ b/src/3rdparty/chromium/build/config/sanitizers/BUILD.gn
+@@ -272,11 +272,11 @@ config("asan_flags") {
+   if (is_asan) {
+     cflags += [ "-fsanitize=address" ]
+     if (is_win) {
+-      if (!defined(asan_win_blocklist_path)) {
+-        asan_win_blocklist_path =
++      if (!defined(asan_win_blacklist_path)) {
++        asan_win_blacklist_path =
+             rebase_path("//tools/memory/asan/blocklist_win.txt", root_build_dir)
+       }
+-      cflags += [ "-fsanitize-ignorelist=$asan_win_blocklist_path" ]
++      cflags += [ "-fsanitize-blacklist=$asan_win_blacklist_path" ]
+     }
+   }
+ }
+@@ -306,13 +306,13 @@ config("link_shared_library") {
+ config("cfi_flags") {
+   cflags = []
+   if (is_cfi && current_toolchain == default_toolchain) {
+-    if (!defined(cfi_ignorelist_path)) {
+-      cfi_ignorelist_path =
++    if (!defined(cfi_blacklist_path)) {
++      cfi_blacklist_path =
+           rebase_path("//tools/cfi/ignores.txt", root_build_dir)
+     }
+     cflags += [
+       "-fsanitize=cfi-vcall",
+-      "-fsanitize-ignorelist=$cfi_ignorelist_path",
++      "-fsanitize-blacklist=$cfi_blacklist_path",
+     ]
+ 
+     if (use_cfi_cast) {
+@@ -409,14 +409,14 @@ config("msan_flags") {
+   if (is_msan) {
+     assert(is_linux || is_chromeos,
+            "msan only supported on linux x86_64/ChromeOS")
+-    if (!defined(msan_ignorelist_path)) {
+-      msan_ignorelist_path =
+-          rebase_path("//tools/msan/ignorelist.txt", root_build_dir)
++    if (!defined(msan_blacklist_path)) {
++      msan_blacklist_path =
++          rebase_path("//tools/msan/blacklist.txt", root_build_dir)
+     }
+     cflags = [
+       "-fsanitize=memory",
+       "-fsanitize-memory-track-origins=$msan_track_origins",
+-      "-fsanitize-ignorelist=$msan_ignorelist_path",
++      "-fsanitize-blacklist=$msan_blacklist_path",
+     ]
+   }
+ }
+@@ -424,13 +424,13 @@ config("msan_flags") {
+ config("tsan_flags") {
+   if (is_tsan) {
+     assert(is_linux || is_chromeos, "tsan only supported on linux x86_64")
+-    if (!defined(tsan_ignorelist_path)) {
+-      tsan_ignorelist_path =
++    if (!defined(tsan_blacklist_path)) {
++      tsan_blacklist_path =
+           rebase_path("//tools/memory/tsan_v2/ignores.txt", root_build_dir)
+     }
+     cflags = [
+       "-fsanitize=thread",
+-      "-fsanitize-ignorelist=$tsan_ignorelist_path",
++      "-fsanitize-blacklist=$tsan_blacklist_path",
+     ]
+   }
+ }
+@@ -438,8 +438,8 @@ config("tsan_flags") {
+ config("ubsan_flags") {
+   cflags = []
+   if (is_ubsan) {
+-    if (!defined(ubsan_ignorelist_path)) {
+-      ubsan_ignorelist_path =
++    if (!defined(ubsan_blacklist_path)) {
++      ubsan_blacklist_path =
+           rebase_path("//tools/ubsan/ignorelist.txt", root_build_dir)
+     }
+     cflags += [
+@@ -456,7 +456,7 @@ config("ubsan_flags") {
+       "-fsanitize=signed-integer-overflow",
+       "-fsanitize=unreachable",
+       "-fsanitize=vla-bound",
+-      "-fsanitize-ignorelist=$ubsan_ignorelist_path",
++      "-fsanitize-blacklist=$ubsan_blacklist_path",
+     ]
+     if (!is_clang) {
+       # These exposes too much illegal C++14 code to compile on anything stricter than clang:
+@@ -497,8 +497,8 @@ config("ubsan_no_recover") {
+ 
+ config("ubsan_security_flags") {
+   if (is_ubsan_security) {
+-    if (!defined(ubsan_security_ignorelist_path)) {
+-      ubsan_security_ignorelist_path =
++    if (!defined(ubsan_security_blacklist_path)) {
++      ubsan_security_blacklist_path =
+           rebase_path("//tools/ubsan/security_ignorelist.txt", root_build_dir)
+     }
+     cflags = [
+@@ -506,7 +506,7 @@ config("ubsan_security_flags") {
+       "-fsanitize=shift",
+       "-fsanitize=signed-integer-overflow",
+       "-fsanitize=vla-bound",
+-      "-fsanitize-ignorelist=$ubsan_security_ignorelist_path",
++      "-fsanitize-blacklist=$ubsan_security_blacklist_path",
+     ]
+   }
+ }
+@@ -519,13 +519,13 @@ config("ubsan_null_flags") {
+ 
+ config("ubsan_vptr_flags") {
+   if (is_ubsan_vptr) {
+-    if (!defined(ubsan_vptr_ignorelist_path)) {
+-      ubsan_vptr_ignorelist_path =
++    if (!defined(ubsan_vptr_blacklist_path)) {
++      ubsan_vptr_blacklist_path =
+           rebase_path("//tools/ubsan/vptr_ignorelist.txt", root_build_dir)
+     }
+     cflags = [
+       "-fsanitize=vptr",
+-      "-fsanitize-ignorelist=$ubsan_vptr_ignorelist_path",
++      "-fsanitize-blacklist=$ubsan_vptr_blacklist_path",
+     ]
+     if (!is_clang) {
+       # Clang specific flag:
+--- a/src/3rdparty/chromium/build_overrides/build.gni
++++ b/src/3rdparty/chromium/build_overrides/build.gni
+@@ -43,15 +43,15 @@ declare_args() {
+ # Allows different projects to specify their own suppression/ignore lists for
+ # sanitizer tools.
+ # asan_suppressions_file = "path/to/asan_suppressions.cc"
+-# asan_win_ignorelist_path = "path/to/asan/blocklist_win.txt"
++# asan_win_blacklist_path = "path/to/asan/blocklist_win.txt"
+ # lsan_suppressions_file = "path/to/lsan_suppressions.cc"
+ # tsan_suppressions_file = "path/to/tsan_suppressions.cc"
+-# tsan_ignorelist_path = "path/to/tsan/ignores.txt"
+-# msan_ignorelist_path = "path/to/msan/ignorelist.txt"
+-# ubsan_ignorelist_path = "path/to/ubsan/ignorelist.txt"
+-# ubsan_vptr_ignorelist_path = "path/to/ubsan/vptr_ignorelist.txt"
+-# ubsan_security_ignorelist_path = "path/to/ubsan/security_ignorelist.txt"
+-# cfi_ignorelist_path = "path/to/cfi/ignores.txt"
++# tsan_blacklist_path = "path/to/tsan/ignores.txt"
++# msan_blacklist_path = "path/to/msan/blacklist.txt"
++# ubsan_blacklist_path = "path/to/ubsan/blacklist.txt"
++# ubsan_vptr_blacklist_path = "path/to/ubsan/vptr_blacklist.txt"
++# ubsan_security_blacklist_path = "path/to/ubsan/security_blacklist.txt"
++# cfi_blacklist_path = "path/to/cfi/ignores.txt"
+ 
+ declare_args() {
+   # Android 32-bit non-component, non-clang builds cannot have symbol_level=2
diff --git a/srcpkgs/qt6-webengine/patches/0105-chromium-revert-drop-of-system-java.patch b/srcpkgs/qt6-webengine/patches/0105-chromium-revert-drop-of-system-java.patch
new file mode 100644
index 000000000000..44f3aa8fae5e
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0105-chromium-revert-drop-of-system-java.patch
@@ -0,0 +1,15 @@
+This was dropped for some reason in 6951c37cecd05979b232a39e5c10e6346a0f74ef
+--- a/src/3rdparty/chromium/third_party/closure_compiler/compiler.py
++++ b/src/3rdparty/chromium/third_party/closure_compiler/compiler.py
+@@ -13,8 +13,9 @@ import subprocess
+ 
+ 
+ _CURRENT_DIR = os.path.join(os.path.dirname(__file__))
+-_JAVA_PATH = os.path.join(_CURRENT_DIR, "..", "jdk", "current", "bin", "java")
+-assert os.path.isfile(_JAVA_PATH), "java only allowed in android builds"
++_JAVA_BIN = "java"
++_JDK_PATH = os.path.join(_CURRENT_DIR, "..", "jdk", "current", "bin", "java")
++_JAVA_PATH = _JDK_PATH if os.path.isfile(_JDK_PATH) else _JAVA_BIN
+ 
+ class Compiler(object):
+   """Runs the Closure compiler on given source files to typecheck them
diff --git a/srcpkgs/qt6-webengine/patches/0106-chromium-system-nodejs.patch b/srcpkgs/qt6-webengine/patches/0106-chromium-system-nodejs.patch
new file mode 100644
index 000000000000..1e067cc6eda0
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0106-chromium-system-nodejs.patch
@@ -0,0 +1,20 @@
+--- a/src/3rdparty/chromium/third_party/node/node.py
++++ b/src/3rdparty/chromium/third_party/node/node.py
+@@ -36,11 +36,12 @@ def GetBinaryPath():
+   if platform.system() == 'Darwin' and platform.machine() == 'arm64':
+       return os.path.join(os_path.join(os_path.dirname(__file__), 'mac',
+                           'node-darwin-arm64', 'bin', 'node'))
+-  return os_path.join(os_path.dirname(__file__), *{
+-    'Darwin': ('mac', 'node-darwin-x64', 'bin', 'node'),
+-    'Linux': ('linux', 'node-linux-x64', 'bin', 'node'),
+-    'Windows': ('win', 'node.exe'),
+-  }[platform.system()])
++  return "/usr/bin/node"
++  #return os_path.join(os_path.dirname(__file__), *{
++  #  'Darwin': ('mac', 'node-darwin-x64', 'bin', 'node'),
++  #  'Linux': ('linux', 'node-linux-x64', 'bin', 'node'),
++  #  'Windows': ('win', 'node.exe'),
++  #}[platform.system()])
+ 
+ 
+ def RunNode(cmd_parts, stdout=None):
diff --git a/srcpkgs/qt6-webengine/patches/0107-chromium-cursed^Uscoped_file.patch b/srcpkgs/qt6-webengine/patches/0107-chromium-cursed^Uscoped_file.patch
new file mode 100644
index 000000000000..a8f5d971883d
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0107-chromium-cursed^Uscoped_file.patch
@@ -0,0 +1,18 @@
+--- a/src/3rdparty/chromium/base/files/scoped_file_linux.cc
++++ b/src/3rdparty/chromium/base/files/scoped_file_linux.cc
+@@ -77,15 +77,3 @@ bool IsFDOwned(int fd) {
+ }
+ 
+ }  // namespace base
+-
+-extern "C" {
+-
+-int __close(int);
+-
+-__attribute__((visibility("default"), noinline)) int close(int fd) {
+-  if (base::IsFDOwned(fd) && g_is_ownership_enforced)
+-    CrashOnFdOwnershipViolation();
+-  return __close(fd);
+-}
+-
+-}  // extern "C"
diff --git a/srcpkgs/qt6-webengine/patches/0108-chromium-fix-narrowing-cast.patch b/srcpkgs/qt6-webengine/patches/0108-chromium-fix-narrowing-cast.patch
new file mode 100644
index 000000000000..ed32cd9b7415
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0108-chromium-fix-narrowing-cast.patch
@@ -0,0 +1,53 @@
+--- a/src/3rdparty/chromium/base/files/file_util_linux.cc
++++ b/src/3rdparty/chromium/base/files/file_util_linux.cc
+@@ -23,14 +23,14 @@ bool GetFileSystemType(const FilePath& p
+ 
+   // Not all possible |statfs_buf.f_type| values are in linux/magic.h.
+   // Missing values are copied from the statfs man page.
+-  switch (statfs_buf.f_type) {
++  switch (static_cast<uintmax_t>(statfs_buf.f_type)) {
+     case 0:
+       *type = FILE_SYSTEM_0;
+       break;
+     case EXT2_SUPER_MAGIC:  // Also ext3 and ext4
+     case MSDOS_SUPER_MAGIC:
+     case REISERFS_SUPER_MAGIC:
+-    case static_cast<int>(BTRFS_SUPER_MAGIC):
++    case BTRFS_SUPER_MAGIC:
+     case 0x5346544E:  // NTFS
+     case 0x58465342:  // XFS
+     case 0x3153464A:  // JFS
+@@ -40,14 +40,14 @@ bool GetFileSystemType(const FilePath& p
+       *type = FILE_SYSTEM_NFS;
+       break;
+     case SMB_SUPER_MAGIC:
+-    case static_cast<int>(0xFF534D42):  // CIFS
++    case 0xFF534D42:  // CIFS
+       *type = FILE_SYSTEM_SMB;
+       break;
+     case CODA_SUPER_MAGIC:
+       *type = FILE_SYSTEM_CODA;
+       break;
+-    case static_cast<int>(HUGETLBFS_MAGIC):
+-    case static_cast<int>(RAMFS_MAGIC):
++    case HUGETLBFS_MAGIC:
++    case RAMFS_MAGIC:
+     case TMPFS_MAGIC:
+       *type = FILE_SYSTEM_MEMORY;
+       break;
+--- a/src/3rdparty/chromium/base/system/sys_info_posix.cc
++++ b/src/3rdparty/chromium/base/system/sys_info_posix.cc
+@@ -100,10 +100,10 @@ bool IsStatsZeroIfUnlimited(const base::
+   if (HANDLE_EINTR(statfs(path.value().c_str(), &stats)) != 0)
+     return false;
+ 
+-  switch (stats.f_type) {
++  switch (static_cast<uintmax_t>(stats.f_type)) {
+     case TMPFS_MAGIC:
+-    case static_cast<int>(HUGETLBFS_MAGIC):
+-    case static_cast<int>(RAMFS_MAGIC):
++    case HUGETLBFS_MAGIC:
++    case RAMFS_MAGIC:
+       return true;
+   }
+   return false;
diff --git a/srcpkgs/qt6-webengine/patches/0109-chromium-remove-strip_binary.patch b/srcpkgs/qt6-webengine/patches/0109-chromium-remove-strip_binary.patch
new file mode 100644
index 000000000000..5ebd16e659af
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0109-chromium-remove-strip_binary.patch
@@ -0,0 +1,32 @@
+--- a/src/3rdparty/chromium/chrome/test/chromedriver/BUILD.gn
++++ b/src/3rdparty/chromium/chrome/test/chromedriver/BUILD.gn
+@@ -308,11 +308,7 @@ source_set("lib") {
+   }
+ }
+ 
+-if (is_linux) {
+-  chromedriver_output = "chromedriver.unstripped"
+-} else {
+-  chromedriver_output = "chromedriver"
+-}
++chromedriver_output = "chromedriver"
+ 
+ executable("$chromedriver_output") {
+   testonly = true
+@@ -336,16 +332,6 @@ executable("$chromedriver_output") {
+   }
+ }
+ 
+-if (is_linux) {
+-  strip_binary("chromedriver") {
+-    testonly = true
+-    binary_input = "$root_out_dir/$chromedriver_output"
+-    symbol_output = "$root_out_dir/chromedriver.debug"
+-    stripped_binary_output = "$root_out_dir/chromedriver"
+-    deps = [ ":$chromedriver_output" ]
+-  }
+-}
+-
+ python_library("chromedriver_py_tests") {
+   testonly = true
+   deps = [
diff --git a/srcpkgs/qt6-webengine/patches/0110-chromium-revert-use-ffile-compilation-dir.patch b/srcpkgs/qt6-webengine/patches/0110-chromium-revert-use-ffile-compilation-dir.patch
new file mode 100644
index 000000000000..a00f7ea80f7a
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0110-chromium-revert-use-ffile-compilation-dir.patch
@@ -0,0 +1,57 @@
+From 34a955823630096f5b01c2b01d51c1ea59d22763 Mon Sep 17 00:00:00 2001
+From: Zequan Wu <zequanwu@google.com>
+Date: Tue, 20 Jul 2021 14:13:50 +0000
+Subject: [PATCH] Use -ffile-compilation-dir= instead of
+ -fdebug-compilation-dir=
+
+Bug: 1010267
+Change-Id: If2b4ead8535a76490eb466a38e3d8fed6ea91079
+Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2770738
+Auto-Submit: Zequan Wu <zequanwu@google.com>
+Commit-Queue: Nico Weber <thakis@chromium.org>
+Reviewed-by: Nico Weber <thakis@chromium.org>
+Cr-Commit-Position: refs/heads/master@{#903456}
+--- a/src/3rdparty/chromium/build/config/compiler/BUILD.gn
++++ b/src/3rdparty/chromium/build/config/compiler/BUILD.gn
+@@ -1269,19 +1269,12 @@ config("compiler_deterministic") {
+     # different build directory like "out/feature_a" and "out/feature_b" if
+     # we build same files with same compile flag.
+     # Other paths are already given in relative, no need to normalize them.
+-    if (is_nacl) {
+-      # TODO(https://crbug.com/1231236): Use -ffile-compilation-dir= here.
+-      cflags += [
+-        "-Xclang",
+-        "-fdebug-compilation-dir",
+-        "-Xclang",
+-        ".",
+-      ]
+-    } else {
+-      # -ffile-compilation-dir is an alias for both -fdebug-compilation-dir=
+-      # and -fcoverage-compilation-dir=.
+-      cflags += [ "-ffile-compilation-dir=." ]
+-    }
++    cflags += [
++      "-Xclang",
++      "-fdebug-compilation-dir",
++      "-Xclang",
++      ".",
++    ]
+     if (!is_win) {
+       # We don't use clang -cc1as on Windows (yet? https://crbug.com/762167)
+       asmflags = [ "-Wa,-fdebug-compilation-dir,." ]
+--- a/src/3rdparty/chromium/build/config/compiler/compiler.gni
++++ b/src/3rdparty/chromium/build/config/compiler/compiler.gni
+@@ -228,8 +228,11 @@ declare_args() {
+ # deterministic builds to reduce compile times, so this is less relevant for
+ # official builders.
+ strip_absolute_paths_from_debug_symbols_default =
+-    is_android || is_fuchsia || is_nacl || (is_win && use_lld) || is_linux ||
+-    is_chromeos || (is_apple && !enable_dsyms)
++    # TODO(crbug.com/1010267): remove '!use_clang_coverage', coverage build has
++    # dependency to absolute path of source files.
++    !use_clang_coverage &&
++    (is_android || is_fuchsia || is_nacl || (is_win && use_lld) || is_linux ||
++     is_chromeos || (is_apple && !enable_dsyms))
+ 
+ declare_args() {
+   strip_absolute_paths_from_debug_symbols = strip_absolute_paths_from_debug_symbols_default
diff --git a/srcpkgs/qt6-webengine/patches/0111-chromium-no-Wno-stringop-overread.patch b/srcpkgs/qt6-webengine/patches/0111-chromium-no-Wno-stringop-overread.patch
new file mode 100644
index 000000000000..03eac3f8e067
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0111-chromium-no-Wno-stringop-overread.patch
@@ -0,0 +1,10 @@
+--- a/src/3rdparty/chromium/build/config/compiler/BUILD.gn
++++ b/src/3rdparty/chromium/build/config/compiler/BUILD.gn
+@@ -394,7 +394,6 @@ config("compiler") {
+         "-Wno-parentheses",
+         "-Wno-sign-compare", # fido
+         "-Wno-stringop-overflow", # skia, libaom, protobuf, icu
+-        "-Wno-stringop-overread", # libaom
+         "-Wno-psabi", # skia
+         "-Wno-multichar", # crashpad
+         "-Wno-format-zero-length", # user_agent.cc
diff --git a/srcpkgs/qt6-webengine/patches/0150-chromium-glibc-libc_malloc.patch b/srcpkgs/qt6-webengine/patches/0150-chromium-glibc-libc_malloc.patch
new file mode 100644
index 000000000000..7e1b66e5c73d
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0150-chromium-glibc-libc_malloc.patch
@@ -0,0 +1,24 @@
+--- a/src/3rdparty/chromium/base/process/memory_linux.cc
++++ b/src/3rdparty/chromium/base/process/memory_linux.cc
+@@ -23,6 +23,12 @@
+ #include "third_party/tcmalloc/chromium/src/gperftools/tcmalloc.h"
+ #endif
+ 
++#if defined(LIBC_GLIBC)
++extern "C" {
++extern void *__libc_malloc(size_t size);
++}
++#endif
++
+ namespace base {
+ 
+ namespace {
+@@ -120,7 +126,7 @@ bool UncheckedMalloc(size_t size, void**
+     (!defined(LIBC_GLIBC) && !BUILDFLAG(USE_TCMALLOC))
+   *result = malloc(size);
+ #elif defined(LIBC_GLIBC) && !BUILDFLAG(USE_TCMALLOC)
+-  *result = __libc_malloc(size);
++  *result = ::__libc_malloc(size);
+ #elif BUILDFLAG(USE_TCMALLOC)
+   *result = tc_malloc_skip_new_handler(size);
+ #endif
diff --git a/srcpkgs/qt6-webengine/patches/0200-chromium-musl-include-sys-reg.h-to-get-__WORDSIZE.patch b/srcpkgs/qt6-webengine/patches/0200-chromium-musl-include-sys-reg.h-to-get-__WORDSIZE.patch
new file mode 100644
index 000000000000..41b90071b5e4
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0200-chromium-musl-include-sys-reg.h-to-get-__WORDSIZE.patch
@@ -0,0 +1,21 @@
+From 9001c54d6b974449174a8cee8f3f5d78a9bd6c9e Mon Sep 17 00:00:00 2001
+From: Felix Janda <felix.janda@posteo.de>
+Date: Sun, 1 Feb 2015 14:26:52 +0100
+Subject: [PATCH 3/6] include <sys/reg.h> to get __WORDSIZE on musl libc
+
+---
+ qtwebengine/src/3rdparty/chromium/third_party/breakpad/breakpad/src/common/linux/elf_core_dump.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/common/linux/elf_core_dump.h
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/common/linux/elf_core_dump.h
+@@ -37,6 +37,9 @@
+ #include <limits.h>
+ #include <link.h>
+ #include <stddef.h>
++#ifndef __GLIBC__
++#include <sys/reg.h>
++#endif
+ 
+ #include "common/memory_range.h"
+ 
diff --git a/srcpkgs/qt6-webengine/patches/0201-chromium-musl-dispatch-to-musl.patch b/srcpkgs/qt6-webengine/patches/0201-chromium-musl-dispatch-to-musl.patch
new file mode 100644
index 000000000000..a58a688a4b55
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0201-chromium-musl-dispatch-to-musl.patch
@@ -0,0 +1,103 @@
+--- a/src/3rdparty/chromium/base/allocator/allocator_shim_default_dispatch_to_glibc.cc
++++ b/src/3rdparty/chromium/base/allocator/allocator_shim_default_dispatch_to_glibc.cc
+@@ -8,6 +8,7 @@
+ #include <dlfcn.h>
+ #include <malloc.h>
+ 
++#if defined(__GLIBC__)
+ // This translation unit defines a default dispatch for the allocator shim which
+ // routes allocations to libc functions.
+ // The code here is strongly inspired from tcmalloc's libc_override_glibc.h.
+@@ -87,3 +88,92 @@ const AllocatorDispatch AllocatorDispatc
+     nullptr,               /* aligned_free_function */
+     nullptr,               /* next */
+ };
++
++#else // defined(__GLIBC__)
++
++#include <dlfcn.h>
++
++extern "C" {
++// Declare function pointers to the memory functions
++typedef void* (*t_libc_malloc)(size_t size);
++typedef void* (*t_libc_calloc)(size_t n, size_t size);
++typedef void* (*t_libc_realloc)(void* address, size_t size);
++typedef void* (*t_libc_memalign)(size_t alignment, size_t size);
++typedef void (*t_libc_free)(void* ptr);
++typedef size_t (*t_libc_malloc_usable_size)(void* ptr);
++
++// Static instances of pointers to libc.so dl symbols
++static t_libc_malloc libc_malloc = NULL;
++static t_libc_calloc libc_calloc = NULL;
++static t_libc_realloc libc_realloc = NULL;
++static t_libc_memalign libc_memalign = NULL;
++static t_libc_free libc_free = NULL;
++static t_libc_malloc_usable_size libc_malloc_usable_size = NULL;
++
++// resolve the symbols in libc.so
++void musl_libc_memory_init(void)
++{
++  libc_malloc = (t_libc_malloc) dlsym(RTLD_NEXT, "malloc");
++  libc_calloc = (t_libc_calloc) dlsym(RTLD_NEXT, "calloc");
++  libc_realloc = (t_libc_realloc) dlsym(RTLD_NEXT, "realloc");
++  libc_memalign = (t_libc_memalign) dlsym(RTLD_NEXT, "memalign");
++  libc_free = (t_libc_free) dlsym(RTLD_NEXT, "free");
++  libc_malloc_usable_size = (t_libc_malloc_usable_size) dlsym(RTLD_NEXT, "malloc_usable_size");
++}
++}  // extern "C"
++
++namespace {
++
++using base::allocator::AllocatorDispatch;
++
++void* MuslMalloc(const AllocatorDispatch*, size_t size, void* context) {
++  if (!libc_malloc)
++    musl_libc_memory_init();
++  return (*libc_malloc)(size);
++}
++
++void* MuslCalloc(const AllocatorDispatch*, size_t n, size_t size, void* context) {
++  if (!libc_calloc)
++    musl_libc_memory_init();
++  return (*libc_calloc)(n, size);
++}
++
++void* MuslRealloc(const AllocatorDispatch*, void* address, size_t size, void* context) {
++  if (!libc_realloc)
++    musl_libc_memory_init();
++  return (*libc_realloc)(address, size);
++}
++
++void* MuslMemalign(const AllocatorDispatch*, size_t alignment, size_t size, void* context) {
++  if (!libc_memalign)
++    musl_libc_memory_init();
++  return (*libc_memalign)(alignment, size);
++}
++
++void MuslFree(const AllocatorDispatch*, void* address, void* context) {
++  if (!libc_free)
++    musl_libc_memory_init();
++  (*libc_free)(address);
++}
++
++size_t MuslGetSizeEstimate(const AllocatorDispatch*, void* address, void* context) {
++  // TODO(siggi, primiano): malloc_usable_size may need redirection in the
++  //     presence of interposing shims that divert allocations.
++  if (!libc_malloc_usable_size)
++    musl_libc_memory_init();
++  return (*libc_malloc_usable_size)(address);
++}
++
++}  // namespace
++
++const AllocatorDispatch AllocatorDispatch::default_dispatch = {
++    &MuslMalloc,           /* alloc_function */
++    &MuslCalloc,           /* alloc_zero_initialized_function */
++    &MuslMemalign,         /* alloc_aligned_function */
++    &MuslRealloc,          /* realloc_function */
++    &MuslFree,             /* free_function */
++    &MuslGetSizeEstimate,  /* get_size_estimate_function */
++    nullptr,               /* next */
++};
++
++#endif
diff --git a/srcpkgs/qt6-webengine/patches/0202-chromium-musl-no-mallinfo.patch b/srcpkgs/qt6-webengine/patches/0202-chromium-musl-no-mallinfo.patch
new file mode 100644
index 000000000000..a5bdb5a43a5f
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0202-chromium-musl-no-mallinfo.patch
@@ -0,0 +1,62 @@
+--- a/src/3rdparty/chromium/base/process/process_metrics_posix.cc
++++ b/src/3rdparty/chromium/base/process/process_metrics_posix.cc
+@@ -105,7 +105,7 @@ void IncreaseFdLimitTo(unsigned int max_
+ 
+ #endif  // !defined(OS_FUCHSIA)
+ 
+-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID)
++#if (defined(OS_LINUX) && defined(__GLIBC__)) || defined(OS_CHROMEOS) || defined(OS_ANDROID)
+ namespace {
+ 
+ size_t GetMallocUsageMallinfo() {
+@@ -127,16 +127,16 @@ size_t GetMallocUsageMallinfo() {
+ }
+ 
+ }  // namespace
+-#endif  // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID)
++#endif  // (defined(OS_LINUX) && defined(__GLIBC__)) || defined(OS_CHROMEOS) || defined(OS_ANDROID)
+ 
+ size_t ProcessMetrics::GetMallocUsage() {
+ #if defined(OS_APPLE)
+   malloc_statistics_t stats = {0};
+   malloc_zone_statistics(nullptr, &stats);
+   return stats.size_in_use;
+-#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID)
++#elif (defined(OS_LINUX) && defined(__GLIBC__)) || defined(OS_CHROMEOS) || defined(OS_ANDROID)
+   return GetMallocUsageMallinfo();
+-#elif defined(OS_FUCHSIA)
++#else
+   // TODO(fuchsia): Not currently exposed. https://crbug.com/735087.
+   return 0;
+ #endif
+--- a/src/3rdparty/chromium/third_party/tflite/src/tensorflow/lite/profiling/memory_info.cc
++++ b/src/3rdparty/chromium/third_party/tflite/src/tensorflow/lite/profiling/memory_info.cc
+@@ -27,7 +27,7 @@ namespace memory {
+ const int MemoryUsage::kValueNotSet = 0;
+ 
+ bool MemoryUsage::IsSupported() {
+-#ifdef __linux__
++#ifdef __GLIBC__
+   return true;
+ #endif
+   return false;
+@@ -35,7 +35,7 @@ bool MemoryUsage::IsSupported() {
+ 
+ MemoryUsage GetMemoryUsage() {
+   MemoryUsage result;
+-#ifdef __linux__
++#ifdef __GLIBC__
+   rusage res;
+   if (getrusage(RUSAGE_SELF, &res) == 0) {
+     result.max_rss_kb = res.ru_maxrss;
+--- a/src/3rdparty/chromium/base/trace_event/malloc_dump_provider.cc
++++ b/src/3rdparty/chromium/base/trace_event/malloc_dump_provider.cc
+@@ -213,7 +213,7 @@ bool MallocDumpProvider::OnMemoryDump(co
+                      &allocated_objects_count);
+ #elif defined(OS_FUCHSIA)
+ // TODO(fuchsia): Port, see https://crbug.com/706592.
+-#else
++#elif defined(__GLIBC__)
+ #if defined(__GLIBC__) && defined(__GLIBC_PREREQ)
+ #if __GLIBC_PREREQ(2, 33)
+ #define MALLINFO2_FOUND_IN_LIBC
diff --git a/srcpkgs/qt6-webengine/patches/0203-chromium-musl-siginfo_t.patch b/srcpkgs/qt6-webengine/patches/0203-chromium-musl-siginfo_t.patch
new file mode 100644
index 000000000000..43ef7fd7c5d2
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0203-chromium-musl-siginfo_t.patch
@@ -0,0 +1,18 @@
+There's a subtle difference in the internal name of siginfo_t fields
+between glibc and musl. The structure itself is equivalent, so it
+should suffice to add a macro to rename the field.
+
+--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf/trap.cc
++++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf/trap.cc
+@@ -174,7 +174,11 @@ void Trap::SigSys(int nr, LinuxSigInfo*
+   // If the version of glibc doesn't include this information in
+   // siginfo_t (older than 2.17), we need to explicitly copy it
+   // into an arch_sigsys structure.
++#if defined(__GLIBC__)
+   memcpy(&sigsys, &info->_sifields, sizeof(sigsys));
++#else
++  memcpy(&sigsys, &info->__si_fields, sizeof(sigsys));
++#endif
+ #endif
+ 
+ #if defined(__mips__)
diff --git a/srcpkgs/qt6-webengine/patches/0204-chromium-musl-stackstart.patch b/srcpkgs/qt6-webengine/patches/0204-chromium-musl-stackstart.patch
new file mode 100644
index 000000000000..b03cf43b86db
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0204-chromium-musl-stackstart.patch
@@ -0,0 +1,20 @@
+--- a/src/3rdparty/chromium/third_party/blink/renderer/platform/wtf/stack_util.cc
++++ b/src/3rdparty/chromium/third_party/blink/renderer/platform/wtf/stack_util.cc
+@@ -29,7 +29,7 @@ size_t GetUnderestimatedStackSize() {
+ // FIXME: On Mac OSX and Linux, this method cannot estimate stack size
+ // correctly for the main thread.
+ 
+-#elif defined(__GLIBC__) || defined(OS_ANDROID) || defined(OS_FREEBSD) || \
++#elif defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FREEBSD) || \
+     defined(OS_FUCHSIA)
+   // pthread_getattr_np() can fail if the thread is not invoked by
+   // pthread_create() (e.g., the main thread of blink_unittests).
+@@ -97,7 +97,7 @@ return Threading::ThreadStackSize();
+ }
+ 
+ void* GetStackStart() {
+-#if defined(__GLIBC__) || defined(OS_ANDROID) || defined(OS_FREEBSD) || \
++#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FREEBSD) || \
+     defined(OS_FUCHSIA)
+   pthread_attr_t attr;
+   int error;
diff --git a/srcpkgs/qt6-webengine/patches/0205-chromium-musl-sandbox.patch b/srcpkgs/qt6-webengine/patches/0205-chromium-musl-sandbox.patch
new file mode 100644
index 000000000000..772a578fd823
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0205-chromium-musl-sandbox.patch
@@ -0,0 +1,92 @@
+--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc
++++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc
+@@ -138,7 +138,7 @@ namespace sandbox {
+ // present (as in newer versions of posix_spawn).
+ ResultExpr RestrictCloneToThreadsAndEPERMFork() {
+   const Arg<unsigned long> flags(0);
+-
++#if defined(__GLIBC__)
+   // TODO(mdempsky): Extend DSL to support (flags & ~mask1) == mask2.
+   const uint64_t kAndroidCloneMask = CLONE_VM | CLONE_FS | CLONE_FILES |
+                                      CLONE_SIGHAND | CLONE_THREAD |
+@@ -165,6 +165,17 @@ ResultExpr RestrictCloneToThreadsAndEPER
+   return If(IsAndroid() ? android_test : glibc_test, Allow())
+       .ElseIf(is_fork_or_clone_vfork, Error(EPERM))
+       .Else(CrashSIGSYSClone());
++#else
++  const int required = CLONE_VM | CLONE_FS | CLONE_FILES | CLONE_SIGHAND |
++                       CLONE_THREAD | CLONE_SYSVSEM;
++  const int safe = CLONE_SETTLS | CLONE_PARENT_SETTID | CLONE_CHILD_CLEARTID |
++                   CLONE_DETACHED;
++  const BoolExpr thread_clone_ok = (flags&~safe)==required;
++
++  return If(thread_clone_ok, Allow())
++      .ElseIf((flags & (CLONE_VM | CLONE_THREAD)) == 0, Error(EPERM))
++      .Else(CrashSIGSYSClone());
++#endif
+ }
+ 
+ #ifndef PR_PAC_RESET_KEYS
+--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
++++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
+@@ -419,6 +419,9 @@ bool SyscallSets::IsAllowedProcessStartO
+ #if defined(__i386__)
+     case __NR_waitpid:
+ #endif
++#if !defined(__GLIBC__)
++    case __NR_set_tid_address:
++#endif
+       return true;
+     case __NR_clone:  // Should be parameter-restricted.
+     case __NR_setns:  // Privileged.
+@@ -431,7 +434,9 @@ bool SyscallSets::IsAllowedProcessStartO
+ #if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
+     case __NR_set_thread_area:
+ #endif
++#if defined(__GLIBC__)
+     case __NR_set_tid_address:
++#endif
+     case __NR_unshare:
+ #if !defined(__mips__) && !defined(__aarch64__)
+     case __NR_vfork:
+@@ -545,6 +550,9 @@ bool SyscallSets::IsAllowedAddressSpaceA
+     case __NR_mlock:
+     case __NR_munlock:
+     case __NR_munmap:
++#if !defined(__GLIBC__)
++    case __NR_mremap:
++#endif
+       return true;
+     case __NR_madvise:
+     case __NR_mincore:
+@@ -562,7 +570,9 @@ bool SyscallSets::IsAllowedAddressSpaceA
+     case __NR_modify_ldt:
+ #endif
+     case __NR_mprotect:
++#if defined(__GLIBC__)
+     case __NR_mremap:
++#endif
+     case __NR_msync:
+     case __NR_munlockall:
+     case __NR_readahead:
+--- a/src/3rdparty/chromium/sandbox/policy/linux/bpf_renderer_policy_linux.cc
++++ b/src/3rdparty/chromium/sandbox/policy/linux/bpf_renderer_policy_linux.cc
+@@ -97,11 +97,18 @@ ResultExpr RendererProcessPolicy::Evalua
+     case __NR_sysinfo:
+     case __NR_times:
+     case __NR_uname:
++#if !defined(__GLIBC__)
++    case __NR_sched_getparam:
++    case __NR_sched_getscheduler:
++    case __NR_sched_setscheduler:
++#endif
+       return Allow();
+     case __NR_sched_getaffinity:
++#if defined(__GLIBC__)
+     case __NR_sched_getparam:
+     case __NR_sched_getscheduler:
+     case __NR_sched_setscheduler:
++#endif
+       return RestrictSchedTarget(GetPolicyPid(), sysno);
+     case __NR_prlimit64:
+       // See crbug.com/662450 and setrlimit comment above.
diff --git a/srcpkgs/qt6-webengine/patches/0206-chromium-musl-default-stacksize.patch b/srcpkgs/qt6-webengine/patches/0206-chromium-musl-default-stacksize.patch
new file mode 100644
index 000000000000..bc07495b8144
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0206-chromium-musl-default-stacksize.patch
@@ -0,0 +1,15 @@
+--- a/src/3rdparty/chromium/base/threading/platform_thread_linux.cc
++++ b/src/3rdparty/chromium/base/threading/platform_thread_linux.cc
+@@ -439,7 +439,12 @@ void TerminateOnThread() {}
+ 
+ size_t GetDefaultThreadStackSize(const pthread_attr_t& attributes) {
+ #if !defined(THREAD_SANITIZER)
++#if defined(__GLIBC__)
+   return 0;
++#else // defined(__GLIBC__)
++  // For Musl libc try with a default stack size of 2 MiB
++  return 2 * 1024 * 1024;
++#endif // !defined(__GLIBC__)
+ #else
+   // ThreadSanitizer bloats the stack heavily. Evidence has been that the
+   // default stack size isn't enough for some browser tests.
diff --git a/srcpkgs/qt6-webengine/patches/0207-chromium-musl-cross-no-asm_ptrace_h.patch b/srcpkgs/qt6-webengine/patches/0207-chromium-musl-cross-no-asm_ptrace_h.patch
new file mode 100644
index 000000000000..3cf132908af4
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0207-chromium-musl-cross-no-asm_ptrace_h.patch
@@ -0,0 +1,30 @@
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper.cc
+@@ -38,7 +38,12 @@
+ 
+ #include "client/linux/minidump_writer/linux_ptrace_dumper.h"
+ 
++#if defined(__GLIBC__)
+ #include <asm/ptrace.h>
++#else
++/* For arm*-musl this definition is missing */
++#define ARM_sp uregs[13]
++#endif
+ #include <assert.h>
+ #include <errno.h>
+ #include <fcntl.h>
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_core_dumper.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_core_dumper.cc
+@@ -32,7 +32,12 @@
+ 
+ #include "client/linux/minidump_writer/linux_core_dumper.h"
+ 
++#if defined(__GLIBC__)
+ #include <asm/ptrace.h>
++#else
++/* For arm*-musl this definition is missing */
++#define ARM_sp uregs[13]
++#endif
+ #include <assert.h>
+ #include <elf.h>
+ #include <stdio.h>
diff --git a/srcpkgs/qt6-webengine/patches/0208-chromium-musl-execinfo.patch b/srcpkgs/qt6-webengine/patches/0208-chromium-musl-execinfo.patch
new file mode 100644
index 000000000000..9f3b964676b3
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0208-chromium-musl-execinfo.patch
@@ -0,0 +1,125 @@
+--- a/src/3rdparty/chromium/base/debug/stack_trace.cc
++++ b/src/3rdparty/chromium/base/debug/stack_trace.cc
+@@ -252,7 +252,9 @@ void StackTrace::Print() const {
+ }
+ 
+ void StackTrace::OutputToStream(std::ostream* os) const {
++#if defined(__GLIBC__) && !defined(_AIX)
+   OutputToStreamWithPrefix(os, nullptr);
++#endif
+ }
+ 
+ std::string StackTrace::ToString() const {
+@@ -260,7 +262,7 @@ std::string StackTrace::ToString() const
+ }
+ std::string StackTrace::ToStringWithPrefix(const char* prefix_string) const {
+   std::stringstream stream;
+-#if !defined(__UCLIBC__) && !defined(_AIX)
++#if defined(__GLIBC__) && !defined(_AIX)
+   OutputToStreamWithPrefix(&stream, prefix_string);
+ #endif
+   return stream.str();
+--- a/src/3rdparty/chromium/base/debug/stack_trace_posix.cc
++++ b/src/3rdparty/chromium/base/debug/stack_trace_posix.cc
+@@ -27,7 +27,7 @@
+ #if !defined(USE_SYMBOLIZE)
+ #include <cxxabi.h>
+ #endif
+-#if !defined(__UCLIBC__) && !defined(_AIX)
++#if defined(__GLIBC__) && !defined(_AIX)
+ #include <execinfo.h>
+ #endif
+ 
+@@ -89,7 +89,7 @@ void DemangleSymbols(std::string* text)
+   // Note: code in this function is NOT async-signal safe (std::string uses
+   // malloc internally).
+ 
+-#if !defined(__UCLIBC__) && !defined(_AIX)
++#if defined(__GLIBC__) && !defined(_AIX)
+   std::string::size_type search_from = 0;
+   while (search_from < text->size()) {
+     // Look for the start of a mangled symbol, from search_from.
+@@ -124,7 +124,7 @@ void DemangleSymbols(std::string* text)
+       search_from = mangled_start + 2;
+     }
+   }
+-#endif  // !defined(__UCLIBC__) && !defined(_AIX)
++#endif  // !defined(__GLIBC__) && !defined(_AIX)
+ }
+ #endif  // !defined(USE_SYMBOLIZE)
+ 
+@@ -136,7 +136,7 @@ class BacktraceOutputHandler {
+   virtual ~BacktraceOutputHandler() = default;
+ };
+ 
+-#if !defined(__UCLIBC__) && !defined(_AIX)
++#if defined(__GLIBC__) && !defined(_AIX)
+ void OutputPointer(void* pointer, BacktraceOutputHandler* handler) {
+   // This should be more than enough to store a 64-bit number in hex:
+   // 16 hex digits + 1 for null-terminator.
+@@ -219,7 +219,7 @@ void ProcessBacktrace(void* const* trace
+   }
+ #endif  // defined(USE_SYMBOLIZE)
+ }
+-#endif  // !defined(__UCLIBC__) && !defined(_AIX)
++#endif  // !defined(__GLIBC__) && !defined(_AIX)
+ 
+ void PrintToStderr(const char* output) {
+   // NOTE: This code MUST be async-signal safe (it's used by in-process
+@@ -839,7 +839,7 @@ size_t CollectStackTrace(void** trace, s
+   // If we do not have unwind tables, then try tracing using frame pointers.
+   return base::debug::TraceStackFramePointers(const_cast<const void**>(trace),
+                                               count, 0);
+-#elif !defined(__UCLIBC__) && !defined(_AIX)
++#elif defined(__GLIBC__) && !defined(_AIX)
+   // Though the backtrace API man page does not list any possible negative
+   // return values, we take no chance.
+   return base::saturated_cast<size_t>(backtrace(trace, count));
+@@ -852,13 +852,13 @@ void StackTrace::PrintWithPrefix(const c
+ // NOTE: This code MUST be async-signal safe (it's used by in-process
+ // stack dumping signal handler). NO malloc or stdio is allowed here.
+ 
+-#if !defined(__UCLIBC__) && !defined(_AIX)
++#if defined(__GLIBC__) && !defined(_AIX)
+   PrintBacktraceOutputHandler handler;
+   ProcessBacktrace(trace_, count_, prefix_string, &handler);
+ #endif
+ }
+ 
+-#if !defined(__UCLIBC__) && !defined(_AIX)
++#if defined(__GLIBC__) && !defined(_AIX)
+ void StackTrace::OutputToStreamWithPrefix(std::ostream* os,
+                                           const char* prefix_string) const {
+   StreamBacktraceOutputHandler handler(os);
+--- a/src/3rdparty/chromium/base/logging.cc
++++ b/src/3rdparty/chromium/base/logging.cc
+@@ -582,7 +582,7 @@ LogMessage::LogMessage(const char* file,
+ 
+ LogMessage::~LogMessage() {
+   size_t stack_start = stream_.tellp();
+-#if !defined(OFFICIAL_BUILD) && !defined(OS_NACL) && !defined(__UCLIBC__) && \
++#if !defined(OFFICIAL_BUILD) && !defined(OS_NACL) && defined(__GLIBC__) && \
+     !defined(OS_AIX)
+   if (severity_ == LOGGING_FATAL && !base::debug::BeingDebugged()) {
+     // Include a stack trace on a fatal, unless a debugger is attached.
+--- 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 @@
+ 
+ #if defined(DEBUG) && defined(V8_OS_LINUX) && !defined(V8_OS_ANDROID)
+ #define SYMBOLIZE_FUNCTION
++#if defined(__GLIBC__)
+ #include <execinfo.h>
++#endif
+ 
+ #include <vector>
+ 
+@@ -103,7 +105,7 @@ void ExternalReferenceTable::Init(Isolat
+ }
+ 
+ const char* ExternalReferenceTable::ResolveSymbol(void* address) {
+-#ifdef SYMBOLIZE_FUNCTION
++#if defined(SYMBOLIZE_FUNCTION) && defined(__GLIBC__)
+   char** names = backtrace_symbols(&address, 1);
+   const char* name = names[0];
+   // The array of names is malloc'ed. However, each name string is static
diff --git a/srcpkgs/qt6-webengine/patches/0209-chromium-musl-thread-stacksize.patch b/srcpkgs/qt6-webengine/patches/0209-chromium-musl-thread-stacksize.patch
new file mode 100644
index 000000000000..4b760a428b25
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0209-chromium-musl-thread-stacksize.patch
@@ -0,0 +1,22 @@
+--- a/src/3rdparty/chromium/ppapi/utility/threading/simple_thread.cc
++++ b/src/3rdparty/chromium/ppapi/utility/threading/simple_thread.cc
+@@ -13,7 +13,7 @@ namespace pp {
+ namespace {
+ 
+ // Use 2MB default stack size for Native Client, otherwise use system default.
+-#if defined(__native_client__)
++#if defined(__native_client__) || !defined(__GLIBC__)
+ const size_t kDefaultStackSize = 2 * 1024 * 1024;
+ #else
+ const size_t kDefaultStackSize = 0;
+--- a/src/3rdparty/chromium/v8/src/base/platform/platform-posix.cc
++++ b/src/3rdparty/chromium/v8/src/base/platform/platform-posix.cc
+@@ -883,7 +883,7 @@ bool Thread::Start() {
+ #if V8_OS_MACOSX
+     // Default on Mac OS X is 512kB -- bump up to 1MB
+     stack_size = 1 * 1024 * 1024;
+-#elif V8_OS_AIX
++#elif V8_OS_AIX || !defined(__GLIBC__)
+     // Default on AIX is 96kB -- bump up to 2MB
+     stack_size = 2 * 1024 * 1024;
+ #endif
diff --git a/srcpkgs/qt6-webengine/patches/0210-chromium-musl-msgvec-push_back.patch b/srcpkgs/qt6-webengine/patches/0210-chromium-musl-msgvec-push_back.patch
new file mode 100644
index 000000000000..905daa223700
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0210-chromium-musl-msgvec-push_back.patch
@@ -0,0 +1,14 @@
+--- a/src/3rdparty/chromium/net/socket/udp_socket_posix.cc
++++ b/src/3rdparty/chromium/net/socket/udp_socket_posix.cc
+@@ -1162,7 +1162,11 @@ SendResult UDPSocketPosixSender::Interna
+     msg_iov->push_back({const_cast<char*>(buffer->data()), buffer->length()});
+   msgvec->reserve(buffers.size());
+   for (size_t j = 0; j < buffers.size(); j++)
++#if defined(__GLIBC__)
+     msgvec->push_back({{nullptr, 0, &msg_iov[j], 1, nullptr, 0, 0}, 0});
++#else
++    msgvec->push_back({{nullptr, 0, &msg_iov[j], 1, 0, 0, 0}, 0});
++#endif
+   int result = HANDLE_EINTR(Sendmmsg(fd, &msgvec[0], buffers.size(), 0));
+   SendResult send_result(0, 0, std::move(buffers));
+   if (result < 0) {
diff --git a/srcpkgs/qt6-webengine/patches/0211-chromium-musl-canonicalize-file-name-musl.patch b/srcpkgs/qt6-webengine/patches/0211-chromium-musl-canonicalize-file-name-musl.patch
new file mode 100644
index 000000000000..d43e6bd488bc
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0211-chromium-musl-canonicalize-file-name-musl.patch
@@ -0,0 +1,11 @@
+--- a/src/3rdparty/chromium/third_party/nasm/nasmlib/realpath.c
++++ b/src/3rdparty/chromium/third_party/nasm/nasmlib/realpath.c
+@@ -55,7 +55,7 @@
+  */
+ char *nasm_realpath(const char *rel_path)
+ {
+-    char *rp = canonicalize_file_name(rel_path);
++    char *rp = realpath(rel_path, NULL);
+     return rp ? rp : nasm_strdup(rel_path);
+ }
+ 
diff --git a/srcpkgs/qt6-webengine/patches/0212-chromium-musl-no-getcontext.patch b/srcpkgs/qt6-webengine/patches/0212-chromium-musl-no-getcontext.patch
new file mode 100644
index 000000000000..5755f1b45a7d
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0212-chromium-musl-no-getcontext.patch
@@ -0,0 +1,29 @@
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc
+@@ -489,8 +489,10 @@ bool ExceptionHandler::SimulateSignalDel
+   // ExceptionHandler::HandleSignal().
+   siginfo.si_code = SI_USER;
+   siginfo.si_pid = getpid();
+-  ucontext_t context;
++  ucontext_t context = { 0 };
++#if defined(__GLIBC__)
+   getcontext(&context);
++#endif
+   return HandleSignal(sig, &siginfo, &context);
+ }
+ 
+@@ -675,9 +677,14 @@ bool ExceptionHandler::WriteMinidump() {
+   sys_prctl(PR_SET_DUMPABLE, 1, 0, 0, 0);
+ 
+   CrashContext context;
++
++#if defined(__GLIBC__)
+   int getcontext_result = getcontext(&context.context);
+   if (getcontext_result)
+     return false;
++#else
++  return false;
++#endif
+ 
+ #if defined(__i386__)
+   // In CPUFillFromUContext in minidumpwriter.cc the stack pointer is retrieved
diff --git a/srcpkgs/qt6-webengine/patches/0213-chromium-musl-crashpad.patch b/srcpkgs/qt6-webengine/patches/0213-chromium-musl-crashpad.patch
new file mode 100644
index 000000000000..4d49997ed4f3
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0213-chromium-musl-crashpad.patch
@@ -0,0 +1,22 @@
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/compat/linux/sys/ptrace.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/compat/linux/sys/ptrace.h
+@@ -17,7 +17,9 @@
+ 
+ #include_next <sys/ptrace.h>
+ 
++#ifdef __GLIBC__
+ #include <sys/cdefs.h>
++#endif
+ 
+ // https://sourceware.org/bugzilla/show_bug.cgi?id=22433
+ #if !defined(PTRACE_GET_THREAD_AREA) && !defined(PT_GET_THREAD_AREA) && \
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/util/linux/ptracer.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/util/linux/ptracer.cc
+@@ -26,6 +26,7 @@
+ 
+ #if defined(ARCH_CPU_X86_FAMILY)
+ #include <asm/ldt.h>
++#include <asm/ptrace-abi.h>
+ #endif
+ 
+ namespace crashpad {
diff --git a/srcpkgs/qt6-webengine/patches/0214-chromium-musl-fixes.patch b/srcpkgs/qt6-webengine/patches/0214-chromium-musl-fixes.patch
new file mode 100644
index 000000000000..55b267ed1714
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0214-chromium-musl-fixes.patch
@@ -0,0 +1,108 @@
+--- a/src/3rdparty/chromium/sandbox/linux/suid/process_util.h
++++ b/src/3rdparty/chromium/sandbox/linux/suid/process_util.h
+@@ -12,6 +12,15 @@
+ #include <stdint.h>
+ #include <sys/types.h>
+ 
++#if !defined(__GLIBC__) && !defined(TEMP_FAILURE_RETRY)
++# define TEMP_FAILURE_RETRY(expression) \
++	(__extension__			\
++	 ({ long int __result;		\
++	  do __result = (long int) (expression); \
++	  while (__result == -1L && errno == EINTR); \
++	  __result; }))
++#endif
++
+ // This adjusts /proc/process/oom_score_adj so the Linux OOM killer
+ // will prefer certain process types over others. The range for the
+ // adjustment is [-1000, 1000], with [0, 1000] being user accessible.
+--- a/src/3rdparty/chromium/services/device/serial/serial_io_handler_posix.cc
++++ b/src/3rdparty/chromium/services/device/serial/serial_io_handler_posix.cc
+@@ -6,6 +6,7 @@
+ 
+ #include <sys/ioctl.h>
+ #include <termios.h>
++#include <asm-generic/ioctls.h>
+ 
+ #include <algorithm>
+ #include <utility>
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h
+@@ -38,6 +38,10 @@
+ #include "common/memory_allocator.h"
+ #include "google_breakpad/common/minidump_format.h"
+ 
++#ifndef __GLIBC__
++#define _libc_fpstate _fpstate
++#endif
++
+ namespace google_breakpad {
+ 
+ // Wraps platform-dependent implementations of accessors to ucontext_t structs.
+--- a/src/3rdparty/chromium/third_party/ffmpeg/libavutil/cpu.c
++++ b/src/3rdparty/chromium/third_party/ffmpeg/libavutil/cpu.c
+@@ -41,8 +41,10 @@
+ #include <sys/param.h>
+ #endif
+ #include <sys/types.h>
++#ifdef __GLIBC__
+ #include <sys/sysctl.h>
+ #endif
++#endif
+ #if HAVE_UNISTD_H
+ #include <unistd.h>
+ #endif
+--- a/src/3rdparty/chromium/third_party/perfetto/include/perfetto/ext/base/thread_utils.h
++++ b/src/3rdparty/chromium/third_party/perfetto/include/perfetto/ext/base/thread_utils.h
+@@ -29,9 +29,7 @@
+ #include <algorithm>
+ #endif
+ 
+-#if PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID)
+ #include <sys/prctl.h>
+-#endif
+ 
+ // Internal implementation utils that aren't as widely useful/supported as
+ // base/thread_utils.h.
+@@ -58,7 +56,7 @@ inline bool MaybeSetThreadName(const std
+ 
+ inline bool GetThreadName(std::string& out_result) {
+   char buf[16] = {};
+-#if PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID)
++#if !defined(__GLIBC__)
+   if (prctl(PR_GET_NAME, buf) != 0)
+     return false;
+ #else
+--- a/src/3rdparty/chromium/third_party/lss/linux_syscall_support.h
++++ b/src/3rdparty/chromium/third_party/lss/linux_syscall_support.h
+@@ -1300,6 +1300,18 @@ struct kernel_statfs {
+ #ifndef __NR_fallocate
+ #define __NR_fallocate          285
+ #endif
++
++#if !defined(__GLIBC__)
++#ifdef __NR_pread
++#undef __NR_pread
++#endif
++#ifdef __NR_pwrite
++#undef __NR_pwrite
++#endif
++#define __NR_pread __NR_pread64
++#define __NR_pwrite __NR_pwrite64
++#endif /* !defined(__GLIBC__) */
++
+ #ifndef __NR_getrandom
+ #define __NR_getrandom          318
+ #endif
+--- a/src/3rdparty/chromium/net/dns/dns_config_service_posix.cc
++++ b/src/3rdparty/chromium/net/dns/dns_config_service_posix.cc
+@@ -93,7 +93,8 @@ absl::optional<DnsConfig> ReadDnsConfig(
+ 
+   absl::optional<DnsConfig> dns_config;
+ // TODO(fuchsia): Use res_ninit() when it's implemented on Fuchsia.
+-#if defined(OS_OPENBSD) || defined(OS_FUCHSIA)
++#if defined(OS_OPENBSD) || defined(OS_FUCHSIA) || \
++  (defined(OS_LINUX) && !defined(__GLIBC__))
+   // Note: res_ninit in glibc always returns 0 and sets RES_INIT.
+   // res_init behaves the same way.
+   memset(&_res, 0, sizeof(_res));
diff --git a/srcpkgs/qt6-webengine/patches/0215-chromium-musl-cdefs.patch b/srcpkgs/qt6-webengine/patches/0215-chromium-musl-cdefs.patch
new file mode 100644
index 000000000000..9d1daec29118
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0215-chromium-musl-cdefs.patch
@@ -0,0 +1,29 @@
+--- a/src/3rdparty/chromium/third_party/libsync/src/include/sync/sync.h
++++ b/src/3rdparty/chromium/third_party/libsync/src/include/sync/sync.h
+@@ -19,12 +19,13 @@
+ #ifndef __SYS_CORE_SYNC_H
+ #define __SYS_CORE_SYNC_H
+ 
+-#include <sys/cdefs.h>
+ #include <stdint.h>
+ 
+ #include <linux/types.h>
+ 
+-__BEGIN_DECLS
++#ifdef __cplusplus
++extern "C" {
++#endif
+ 
+ struct sync_legacy_merge_data {
+  int32_t fd2;
+@@ -158,6 +159,9 @@ struct sync_pt_info *sync_pt_info(struct
+                                   struct sync_pt_info *itr);
+ void sync_fence_info_free(struct sync_fence_info_data *info);
+ 
+-__END_DECLS
++#ifdef __cplusplus
++}
++#endif
++
+ 
+ #endif /* __SYS_CORE_SYNC_H */
diff --git a/srcpkgs/qt6-webengine/patches/0216-chromium-musl-stat.patch b/srcpkgs/qt6-webengine/patches/0216-chromium-musl-stat.patch
new file mode 100644
index 000000000000..4509a6957cd7
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0216-chromium-musl-stat.patch
@@ -0,0 +1,12 @@
+--- a/src/3rdparty/chromium/base/files/file.h
++++ b/src/3rdparty/chromium/base/files/file.h
+@@ -19,7 +19,8 @@
+ #include "build/build_config.h"
+ 
+ #if defined(OS_BSD) || defined(OS_APPLE) || defined(OS_NACL) || \
+-    defined(OS_FUCHSIA) || (defined(OS_ANDROID) && __ANDROID_API__ < 21)
++    defined(OS_FUCHSIA) || (defined(OS_ANDROID) && __ANDROID_API__ < 21) || \
++    (defined(OS_LINUX) && !defined(__GLIBC__))
+ struct stat;
+ namespace base {
+ typedef struct stat stat_wrapper_t;
diff --git a/srcpkgs/qt6-webengine/patches/0217-chromium-musl-resolver.patch b/srcpkgs/qt6-webengine/patches/0217-chromium-musl-resolver.patch
new file mode 100644
index 000000000000..c3d7afad9b19
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0217-chromium-musl-resolver.patch
@@ -0,0 +1,77 @@
+--- a/src/3rdparty/chromium/net/dns/dns_config_service_linux.cc
++++ b/src/3rdparty/chromium/net/dns/dns_config_service_linux.cc
+@@ -432,11 +432,13 @@ class DnsConfigServiceLinux::ConfigReade
+     base::ScopedBlockingCall scoped_blocking_call(
+         FROM_HERE, base::BlockingType::MAY_BLOCK);
+ 
++#if defined(__GLIBC__)
+     std::unique_ptr<struct __res_state> res = resolv_reader_->GetResState();
+     if (res) {
+       dns_config_ = ConvertResStateToDnsConfig(*res.get());
+       resolv_reader_->CloseResState(res.get());
+     }
++#endif
+ 
+     UMA_HISTOGRAM_BOOLEAN("Net.DNS.DnsConfig.Resolv.Read",
+                           dns_config_.has_value());
+@@ -486,6 +488,7 @@ class DnsConfigServiceLinux::ConfigReade
+ 
+ std::unique_ptr<struct __res_state>
+ DnsConfigServiceLinux::ResolvReader::GetResState() {
++#if defined(__GLIBC__)
+   auto res = std::make_unique<struct __res_state>();
+   memset(res.get(), 0, sizeof(struct __res_state));
+ 
+@@ -495,11 +498,16 @@ DnsConfigServiceLinux::ResolvReader::Get
+   }
+ 
+   return res;
++#else
++  return nullptr;
++#endif
+ }
+ 
+ void DnsConfigServiceLinux::ResolvReader::CloseResState(
+     struct __res_state* res) {
++#if defined(__GLIBC__)
+   res_nclose(res);
++#endif
+ }
+ 
+ DnsConfigServiceLinux::DnsConfigServiceLinux()
+--- a/src/3rdparty/chromium/net/dns/dns_reloader.cc
++++ b/src/3rdparty/chromium/net/dns/dns_reloader.cc
+@@ -4,8 +4,7 @@
+ 
+ #include "net/dns/dns_reloader.h"
+ 
+-#if defined(OS_POSIX) && !defined(OS_APPLE) && !defined(OS_OPENBSD) && \
+-    !defined(OS_ANDROID) && !defined(OS_FUCHSIA)
++#ifdef __GLIBC__
+ 
+ #include <resolv.h>
+ 
+--- a/src/3rdparty/chromium/net/dns/host_resolver_manager.cc
++++ b/src/3rdparty/chromium/net/dns/host_resolver_manager.cc
+@@ -2720,8 +2720,7 @@ HostResolverManager::HostResolverManager
+   NetworkChangeNotifier::AddConnectionTypeObserver(this);
+   if (system_dns_config_notifier_)
+     system_dns_config_notifier_->AddObserver(this);
+-#if defined(OS_POSIX) && !defined(OS_APPLE) && !defined(OS_OPENBSD) && \
+-    !defined(OS_ANDROID)
++#ifdef __GLIBC__
+   EnsureDnsReloaderInit();
+ #endif
+ 
+--- a/src/3rdparty/chromium/net/dns/host_resolver_proc.cc
++++ b/src/3rdparty/chromium/net/dns/host_resolver_proc.cc
+@@ -176,8 +176,7 @@ int SystemHostResolverCall(const std::st
+   base::ScopedBlockingCall scoped_blocking_call(FROM_HERE,
+                                                 base::BlockingType::WILL_BLOCK);
+ 
+-#if defined(OS_POSIX) && !defined(OS_APPLE) && !defined(OS_OPENBSD) && \
+-    !defined(OS_ANDROID) && !defined(OS_FUCHSIA)
++#ifdef __GLIBC__
+   DnsReloaderMaybeReload();
+ #endif
+   absl::optional<AddressInfo> ai;
diff --git a/srcpkgs/qt6-webengine/patches/0600-chromium-sndio.patch b/srcpkgs/qt6-webengine/patches/0600-chromium-sndio.patch
new file mode 100644
index 000000000000..0302874ffba4
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0600-chromium-sndio.patch
@@ -0,0 +1,876 @@
+--- a/src/3rdparty/chromium/media/BUILD.gn
++++ b/src/3rdparty/chromium/media/BUILD.gn
+@@ -72,6 +72,9 @@ config("media_config") {
+       defines += [ "DLOPEN_PULSEAUDIO" ]
+     }
+   }
++  if (use_sndio) {
++    defines += [ "USE_SNDIO" ]
++  }
+   if (use_cras) {
+     defines += [ "USE_CRAS" ]
+   }
+--- a/src/3rdparty/chromium/media/audio/BUILD.gn
++++ b/src/3rdparty/chromium/media/audio/BUILD.gn
+@@ -240,6 +240,17 @@ source_set("audio") {
+     sources += [ "linux/audio_manager_linux.cc" ]
+   }
+ 
++  if (use_sndio) {
++    libs += [ "sndio" ]
++    sources += [
++      "sndio/audio_manager_sndio.cc",
++      "sndio/sndio_input.cc",
++      "sndio/sndio_input.h",
++      "sndio/sndio_output.cc",
++      "sndio/sndio_output.h"
++    ]
++  }
++
+   if (use_alsa) {
+     libs += [ "asound" ]
+     sources += [
+--- a/src/3rdparty/chromium/media/audio/linux/audio_manager_linux.cc
++++ b/src/3rdparty/chromium/media/audio/linux/audio_manager_linux.cc
+@@ -25,6 +25,11 @@
+ #include "media/audio/pulse/audio_manager_pulse.h"
+ #include "media/audio/pulse/pulse_util.h"
+ #endif
++#if defined(USE_SNDIO)
++#include "media/audio/sndio/audio_manager_sndio.h"
++#include "media/audio/sndio/sndio_input.h"
++#include "media/audio/sndio/sndio_output.h"
++#endif
+ 
+ namespace media {
+ 
+@@ -32,7 +37,8 @@ enum LinuxAudioIO {
+   kPulse,
+   kAlsa,
+   kCras,
+-  kAudioIOMax = kCras  // Must always be equal to largest logged entry.
++  kSndio,
++  kAudioIOMax = kSndio // Must always be equal to largest logged entry.
+ };
+ 
+ std::unique_ptr<media::AudioManager> CreateAudioManager(
+@@ -45,6 +51,16 @@ std::unique_ptr<media::AudioManager> Cre
+                                               audio_log_factory);
+   }
+ 
++#if defined(USE_SNDIO)
++  struct sio_hdl *hdl = sio_open(SIO_DEVANY, SIO_PLAY, 0);
++  if (hdl != NULL) {
++    sio_close(hdl);
++    UMA_HISTOGRAM_ENUMERATION("Media.LinuxAudioIO", kSndio, kAudioIOMax + 1);
++    return std::make_unique<AudioManagerSndio>(std::move(audio_thread),
++                                                  audio_log_factory);
++  }
++#endif
++
+ #if defined(USE_CRAS)
+   if (base::CommandLine::ForCurrentProcess()->HasSwitch(switches::kUseCras)) {
+     UMA_HISTOGRAM_ENUMERATION("Media.LinuxAudioIO", kCras, kAudioIOMax + 1);
+--- /dev/null
++++ b/src/3rdparty/chromium/media/audio/sndio/audio_manager_sndio.cc
+@@ -0,0 +1,148 @@
++// Copyright (c) 2012 The Chromium Authors. All rights reserved.
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++#include "media/audio/sndio/audio_manager_sndio.h"
++
++#include "base/metrics/histogram_macros.h"
++#include "base/memory/ptr_util.h"
++#include "media/audio/audio_device_description.h"
++#include "media/audio/audio_output_dispatcher.h"
++#include "media/audio/sndio/sndio_input.h"
++#include "media/audio/sndio/sndio_output.h"
++#include "media/base/limits.h"
++#include "media/base/media_switches.h"
++
++namespace media {
++
++
++// Maximum number of output streams that can be open simultaneously.
++static const int kMaxOutputStreams = 4;
++
++// Default sample rate for input and output streams.
++static const int kDefaultSampleRate = 48000;
++
++void AddDefaultDevice(AudioDeviceNames* device_names) {
++  DCHECK(device_names->empty());
++  device_names->push_front(AudioDeviceName::CreateDefault());
++}
++
++bool AudioManagerSndio::HasAudioOutputDevices() {
++  return true;
++}
++
++bool AudioManagerSndio::HasAudioInputDevices() {
++  return true;
++}
++
++void AudioManagerSndio::GetAudioInputDeviceNames(
++    AudioDeviceNames* device_names) {
++  DCHECK(device_names->empty());
++  AddDefaultDevice(device_names);
++}
++
++void AudioManagerSndio::GetAudioOutputDeviceNames(
++    AudioDeviceNames* device_names) {
++  AddDefaultDevice(device_names);
++}
++
++const char* AudioManagerSndio::GetName() {
++  return "SNDIO";
++}
++
++AudioParameters AudioManagerSndio::GetInputStreamParameters(
++    const std::string& device_id) {
++  static const int kDefaultInputBufferSize = 1024;
++
++  int user_buffer_size = GetUserBufferSize();
++  int buffer_size = user_buffer_size ?
++      user_buffer_size : kDefaultInputBufferSize;
++
++  return AudioParameters(
++      AudioParameters::AUDIO_PCM_LOW_LATENCY, CHANNEL_LAYOUT_STEREO,
++      kDefaultSampleRate, buffer_size);
++}
++
++AudioManagerSndio::AudioManagerSndio(std::unique_ptr<AudioThread> audio_thread,
++                                         AudioLogFactory* audio_log_factory)
++    : AudioManagerBase(std::move(audio_thread),
++                       audio_log_factory) {
++  DLOG(WARNING) << "AudioManagerSndio";
++  SetMaxOutputStreamsAllowed(kMaxOutputStreams);
++}
++
++AudioManagerSndio::~AudioManagerSndio() {
++  Shutdown();
++}
++
++AudioOutputStream* AudioManagerSndio::MakeLinearOutputStream(
++    const AudioParameters& params,
++    const LogCallback& log_callback) {
++  DCHECK_EQ(AudioParameters::AUDIO_PCM_LINEAR, params.format());
++  return MakeOutputStream(params);
++}
++
++AudioOutputStream* AudioManagerSndio::MakeLowLatencyOutputStream(
++    const AudioParameters& params,
++    const std::string& device_id,
++    const LogCallback& log_callback) {
++  DLOG_IF(ERROR, !device_id.empty()) << "Not implemented!";
++  DCHECK_EQ(AudioParameters::AUDIO_PCM_LOW_LATENCY, params.format());
++  return MakeOutputStream(params);
++}
++
++AudioInputStream* AudioManagerSndio::MakeLinearInputStream(
++    const AudioParameters& params,
++    const std::string& device_id,
++    const LogCallback& log_callback) {
++  DCHECK_EQ(AudioParameters::AUDIO_PCM_LINEAR, params.format());
++  return MakeInputStream(params);
++}
++
++AudioInputStream* AudioManagerSndio::MakeLowLatencyInputStream(
++    const AudioParameters& params,
++    const std::string& device_id,
++    const LogCallback& log_callback) {
++  DCHECK_EQ(AudioParameters::AUDIO_PCM_LOW_LATENCY, params.format());
++  return MakeInputStream(params);
++}
++
++AudioParameters AudioManagerSndio::GetPreferredOutputStreamParameters(
++    const std::string& output_device_id,
++    const AudioParameters& input_params) {
++  // TODO(tommi): Support |output_device_id|.
++  DLOG_IF(ERROR, !output_device_id.empty()) << "Not implemented!";
++  static const int kDefaultOutputBufferSize = 2048;
++
++  ChannelLayout channel_layout = CHANNEL_LAYOUT_STEREO;
++  int sample_rate = kDefaultSampleRate;
++  int buffer_size = kDefaultOutputBufferSize;
++  if (input_params.IsValid()) {
++    sample_rate = input_params.sample_rate();
++    channel_layout = input_params.channel_layout();
++    buffer_size = std::min(buffer_size, input_params.frames_per_buffer());
++  }
++
++  int user_buffer_size = GetUserBufferSize();
++  if (user_buffer_size)
++    buffer_size = user_buffer_size;
++
++  return AudioParameters(
++      AudioParameters::AUDIO_PCM_LOW_LATENCY, channel_layout,
++      sample_rate, buffer_size);
++}
++
++AudioInputStream* AudioManagerSndio::MakeInputStream(
++    const AudioParameters& params) {
++  DLOG(WARNING) << "MakeInputStream";
++  return new SndioAudioInputStream(this,
++             AudioDeviceDescription::kDefaultDeviceId, params);
++}
++
++AudioOutputStream* AudioManagerSndio::MakeOutputStream(
++    const AudioParameters& params) {
++  DLOG(WARNING) << "MakeOutputStream";
++  return new SndioAudioOutputStream(params, this);
++}
++
++}  // namespace media
+--- /dev/null
++++ b/src/3rdparty/chromium/media/audio/sndio/audio_manager_sndio.h
+@@ -0,0 +1,65 @@
++// Copyright (c) 2012 The Chromium Authors. All rights reserved.
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++#ifndef MEDIA_AUDIO_SNDIO_AUDIO_MANAGER_SNDIO_H_
++#define MEDIA_AUDIO_SNDIO_AUDIO_MANAGER_SNDIO_H_
++
++#include <set>
++
++#include "base/compiler_specific.h"
++#include "base/macros.h"
++#include "base/memory/ref_counted.h"
++#include "base/threading/thread.h"
++#include "media/audio/audio_manager_base.h"
++
++namespace media {
++
++class MEDIA_EXPORT AudioManagerSndio : public AudioManagerBase {
++ public:
++  AudioManagerSndio(std::unique_ptr<AudioThread> audio_thread,
++                   AudioLogFactory* audio_log_factory);
++  ~AudioManagerSndio() override;
++
++  // Implementation of AudioManager.
++  bool HasAudioOutputDevices() override;
++  bool HasAudioInputDevices() override;
++  void GetAudioInputDeviceNames(AudioDeviceNames* device_names) override;
++  void GetAudioOutputDeviceNames(AudioDeviceNames* device_names) override;
++  AudioParameters GetInputStreamParameters(
++      const std::string& device_id) override;
++  const char* GetName() override;
++
++  // Implementation of AudioManagerBase.
++  AudioOutputStream* MakeLinearOutputStream(
++      const AudioParameters& params,
++      const LogCallback& log_callback) override;
++  AudioOutputStream* MakeLowLatencyOutputStream(
++      const AudioParameters& params,
++      const std::string& device_id,
++      const LogCallback& log_callback) override;
++  AudioInputStream* MakeLinearInputStream(
++      const AudioParameters& params,
++      const std::string& device_id,
++      const LogCallback& log_callback) override;
++  AudioInputStream* MakeLowLatencyInputStream(
++      const AudioParameters& params,
++      const std::string& device_id,
++      const LogCallback& log_callback) override;
++
++ protected:
++  AudioParameters GetPreferredOutputStreamParameters(
++      const std::string& output_device_id,
++      const AudioParameters& input_params) override;
++
++ private:
++  // Called by MakeLinearOutputStream and MakeLowLatencyOutputStream.
++  AudioOutputStream* MakeOutputStream(const AudioParameters& params);
++  AudioInputStream* MakeInputStream(const AudioParameters& params);
++
++  DISALLOW_COPY_AND_ASSIGN(AudioManagerSndio);
++};
++
++}  // namespace media
++
++#endif  // MEDIA_AUDIO_SNDIO_AUDIO_MANAGER_SNDIO_H_
+--- /dev/null
++++ b/src/3rdparty/chromium/media/audio/sndio/sndio_input.cc
+@@ -0,0 +1,200 @@
++// Copyright 2013 The Chromium Authors. All rights reserved.
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++#include "base/bind.h"
++#include "base/logging.h"
++#include "base/macros.h"
++#include "media/base/audio_timestamp_helper.h"
++#include "media/audio/sndio/audio_manager_sndio.h"
++#include "media/audio/audio_manager.h"
++#include "media/audio/sndio/sndio_input.h"
++
++namespace media {
++
++static const SampleFormat kSampleFormat = kSampleFormatS16;
++
++void SndioAudioInputStream::OnMoveCallback(void *arg, int delta)
++{
++  SndioAudioInputStream* self = static_cast<SndioAudioInputStream*>(arg);
++
++  self->hw_delay += delta;
++}
++
++void *SndioAudioInputStream::ThreadEntry(void *arg) {
++  SndioAudioInputStream* self = static_cast<SndioAudioInputStream*>(arg);
++
++  self->ThreadLoop();
++  return NULL;
++}
++
++SndioAudioInputStream::SndioAudioInputStream(AudioManagerBase* manager,
++                                             const std::string& device_name,
++                                             const AudioParameters& params)
++    : manager(manager),
++      params(params),
++      audio_bus(AudioBus::Create(params)),
++      state(kClosed) {
++}
++
++SndioAudioInputStream::~SndioAudioInputStream() {
++  if (state != kClosed)
++    Close();
++}
++
++bool SndioAudioInputStream::Open() {
++  struct sio_par par;
++  int sig;
++
++  if (state != kClosed)
++    return false;
++
++  if (params.format() != AudioParameters::AUDIO_PCM_LINEAR &&
++      params.format() != AudioParameters::AUDIO_PCM_LOW_LATENCY) {
++    LOG(WARNING) << "Unsupported audio format.";
++    return false;
++  }
++
++  sio_initpar(&par);
++  par.rate = params.sample_rate();
++  par.rchan = params.channels();
++  par.bits = SampleFormatToBitsPerChannel(kSampleFormat);
++  par.bps = par.bits / 8;
++  par.sig = sig = par.bits != 8 ? 1 : 0;
++  par.le = SIO_LE_NATIVE;
++  par.appbufsz = params.frames_per_buffer();
++
++  hdl = sio_open(SIO_DEVANY, SIO_REC, 0);
++
++  if (hdl == NULL) {
++    LOG(ERROR) << "Couldn't open audio device.";
++    return false;
++  }
++
++  if (!sio_setpar(hdl, &par) || !sio_getpar(hdl, &par)) {
++    LOG(ERROR) << "Couldn't set audio parameters.";
++    goto bad_close;
++  }
++
++  if (par.rate  != (unsigned int)params.sample_rate() ||
++      par.rchan != (unsigned int)params.channels() ||
++      par.bits  != (unsigned int)SampleFormatToBitsPerChannel(kSampleFormat) ||
++      par.sig   != (unsigned int)sig ||
++      (par.bps > 1 && par.le != SIO_LE_NATIVE) ||
++      (par.bits != par.bps * 8)) {
++    LOG(ERROR) << "Unsupported audio parameters.";
++    goto bad_close;
++  }
++  state = kStopped;
++  buffer = new char[audio_bus->frames() * params.GetBytesPerFrame(kSampleFormat)];
++  sio_onmove(hdl, &OnMoveCallback, this);
++  return true;
++bad_close:
++  sio_close(hdl);
++  return false;
++}
++
++void SndioAudioInputStream::Start(AudioInputCallback* cb) {
++
++  StartAgc();
++
++  state = kRunning;
++  hw_delay = 0;
++  callback = cb;
++  sio_start(hdl);
++  if (pthread_create(&thread, NULL, &ThreadEntry, this) != 0) {
++    LOG(ERROR) << "Failed to create real-time thread for recording.";
++    sio_stop(hdl);
++    state = kStopped;
++  }
++}
++
++void SndioAudioInputStream::Stop() {
++
++  if (state == kStopped)
++    return;
++
++  state = kStopWait;
++  pthread_join(thread, NULL);
++  sio_stop(hdl);
++  state = kStopped;
++
++  StopAgc();
++}
++
++void SndioAudioInputStream::Close() {
++
++  if (state == kClosed)
++    return;
++
++  if (state == kRunning)
++    Stop();
++
++  state = kClosed;
++  delete [] buffer;
++  sio_close(hdl);
++
++  manager->ReleaseInputStream(this);
++}
++
++double SndioAudioInputStream::GetMaxVolume() {
++  // Not supported
++  return 0.0;
++}
++
++void SndioAudioInputStream::SetVolume(double volume) {
++  // Not supported. Do nothing.
++}
++
++double SndioAudioInputStream::GetVolume() {
++  // Not supported.
++  return 0.0;
++}
++
++bool SndioAudioInputStream::IsMuted() {
++  // Not supported.
++  return false;
++}
++
++void SndioAudioInputStream::SetOutputDeviceForAec(
++    const std::string& output_device_id) {
++  // Not supported.
++}
++
++void SndioAudioInputStream::ThreadLoop(void) {
++  size_t todo, n;
++  char *data;
++  unsigned int nframes;
++  double normalized_volume = 0.0;
++
++  nframes = audio_bus->frames();
++
++  while (state == kRunning && !sio_eof(hdl)) {
++
++    GetAgcVolume(&normalized_volume);
++
++    // read one block
++    todo = nframes * params.GetBytesPerFrame(kSampleFormat);
++    data = buffer;
++    while (todo > 0) {
++      n = sio_read(hdl, data, todo);
++      if (n == 0)
++        return;	// unrecoverable I/O error
++      todo -= n;
++      data += n;
++    }
++    hw_delay -= nframes;
++
++    // convert frames count to TimeDelta
++    const base::TimeDelta delay = AudioTimestampHelper::FramesToTime(hw_delay,
++      params.sample_rate());
++
++    // push into bus
++    audio_bus->FromInterleaved<SignedInt16SampleTypeTraits>(reinterpret_cast<int16_t*>(buffer), nframes);
++
++    // invoke callback
++    callback->OnData(audio_bus.get(), base::TimeTicks::Now() - delay, 1.);
++  }
++}
++
++}  // namespace media
+--- /dev/null
++++ b/src/3rdparty/chromium/media/audio/sndio/sndio_input.h
+@@ -0,0 +1,91 @@
++// Copyright 2013 The Chromium Authors. All rights reserved.
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++#ifndef MEDIA_AUDIO_SNDIO_SNDIO_INPUT_H_
++#define MEDIA_AUDIO_SNDIO_SNDIO_INPUT_H_
++
++#include <stdint.h>
++#include <string>
++#include <sndio.h>
++
++#include "base/compiler_specific.h"
++#include "base/macros.h"
++#include "base/memory/weak_ptr.h"
++#include "base/time/time.h"
++#include "media/audio/agc_audio_stream.h"
++#include "media/audio/audio_io.h"
++#include "media/audio/audio_device_description.h"
++#include "media/base/audio_parameters.h"
++
++namespace media {
++
++class AudioManagerBase;
++
++// Implementation of AudioOutputStream using sndio(7)
++class SndioAudioInputStream : public AgcAudioStream<AudioInputStream> {
++ public:
++  // Pass this to the constructor if you want to attempt auto-selection
++  // of the audio recording device.
++  static const char kAutoSelectDevice[];
++
++  // Create a PCM Output stream for the SNDIO device identified by
++  // |device_name|. If unsure of what to use for |device_name|, use
++  // |kAutoSelectDevice|.
++  SndioAudioInputStream(AudioManagerBase* audio_manager,
++                     const std::string& device_name,
++                     const AudioParameters& params);
++
++  ~SndioAudioInputStream() override;
++
++  // Implementation of AudioInputStream.
++  bool Open() override;
++  void Start(AudioInputCallback* callback) override;
++  void Stop() override;
++  void Close() override;
++  double GetMaxVolume() override;
++  void SetVolume(double volume) override;
++  double GetVolume() override;
++  bool IsMuted() override;
++  void SetOutputDeviceForAec(const std::string& output_device_id) override;
++
++ private:
++
++  enum StreamState {
++    kClosed,            // Not opened yet
++    kStopped,           // Device opened, but not started yet
++    kRunning,           // Started, device playing
++    kStopWait           // Stopping, waiting for the real-time thread to exit
++  };
++
++  // C-style call-backs
++  static void OnMoveCallback(void *arg, int delta);
++  static void* ThreadEntry(void *arg);
++
++  // Continuously moves data from the device to the consumer
++  void ThreadLoop();
++  // Our creator, the audio manager needs to be notified when we close.
++  AudioManagerBase* manager;
++  // Parameters of the source
++  AudioParameters params;
++  // We store data here for consumer
++  std::unique_ptr<AudioBus> audio_bus;
++  // Call-back that consumes recorded data
++  AudioInputCallback* callback;  // Valid during a recording session.
++  // Handle of the audio device
++  struct sio_hdl* hdl;
++  // Current state of the stream
++  enum StreamState state;
++  // High priority thread running ThreadLoop()
++  pthread_t thread;
++  // Number of frames buffered in the hardware
++  int hw_delay;
++  // Temporary buffer where data is stored sndio-compatible format
++  char* buffer;
++
++  DISALLOW_COPY_AND_ASSIGN(SndioAudioInputStream);
++};
++
++}  // namespace media
++
++#endif  // MEDIA_AUDIO_SNDIO_SNDIO_INPUT_H_
+--- /dev/null
++++ b/src/3rdparty/chromium/media/audio/sndio/sndio_output.cc
+@@ -0,0 +1,183 @@
++// Copyright (c) 2012 The Chromium Authors. All rights reserved.
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++#include "base/logging.h"
++#include "base/time/time.h"
++#include "base/time/default_tick_clock.h"
++#include "media/audio/audio_manager_base.h"
++#include "media/base/audio_timestamp_helper.h"
++#include "media/audio/sndio/sndio_output.h"
++
++namespace media {
++
++static const SampleFormat kSampleFormat = kSampleFormatS16;
++
++void SndioAudioOutputStream::OnMoveCallback(void *arg, int delta) {
++  SndioAudioOutputStream* self = static_cast<SndioAudioOutputStream*>(arg);
++
++  self->hw_delay -= delta;
++}
++
++void SndioAudioOutputStream::OnVolCallback(void *arg, unsigned int vol) {
++  SndioAudioOutputStream* self = static_cast<SndioAudioOutputStream*>(arg);
++
++  self->vol = vol;
++}
++
++void *SndioAudioOutputStream::ThreadEntry(void *arg) {
++  SndioAudioOutputStream* self = static_cast<SndioAudioOutputStream*>(arg);
++
++  self->ThreadLoop();
++  return NULL;
++}
++
++SndioAudioOutputStream::SndioAudioOutputStream(const AudioParameters& params,
++                                               AudioManagerBase* manager)
++    : manager(manager),
++      params(params),
++      audio_bus(AudioBus::Create(params)),
++      state(kClosed),
++      mutex(PTHREAD_MUTEX_INITIALIZER) {
++}
++
++SndioAudioOutputStream::~SndioAudioOutputStream() {
++  if (state != kClosed)
++    Close();
++}
++
++bool SndioAudioOutputStream::Open() {
++  struct sio_par par;
++  int sig;
++
++  if (params.format() != AudioParameters::AUDIO_PCM_LINEAR &&
++      params.format() != AudioParameters::AUDIO_PCM_LOW_LATENCY) {
++    LOG(WARNING) << "Unsupported audio format.";
++    return false;
++  }
++  sio_initpar(&par);
++  par.rate = params.sample_rate();
++  par.pchan = params.channels();
++  par.bits = SampleFormatToBitsPerChannel(kSampleFormat);
++  par.bps = par.bits / 8;
++  par.sig = sig = par.bits != 8 ? 1 : 0;
++  par.le = SIO_LE_NATIVE;
++  par.appbufsz = params.frames_per_buffer();
++
++  hdl = sio_open(SIO_DEVANY, SIO_PLAY, 0);
++  if (hdl == NULL) {
++    LOG(ERROR) << "Couldn't open audio device.";
++    return false;
++  }
++  if (!sio_setpar(hdl, &par) || !sio_getpar(hdl, &par)) {
++    LOG(ERROR) << "Couldn't set audio parameters.";
++    goto bad_close;
++  }
++  if (par.rate  != (unsigned int)params.sample_rate() ||
++      par.pchan != (unsigned int)params.channels() ||
++      par.bits  != (unsigned int)SampleFormatToBitsPerChannel(kSampleFormat) ||
++      par.sig   != (unsigned int)sig ||
++      (par.bps > 1 && par.le != SIO_LE_NATIVE) ||
++      (par.bits != par.bps * 8)) {
++    LOG(ERROR) << "Unsupported audio parameters.";
++    goto bad_close;
++  }
++  state = kStopped;
++  volpending = 0;
++  vol = 0;
++  buffer = new char[audio_bus->frames() * params.GetBytesPerFrame(kSampleFormat)];
++  sio_onmove(hdl, &OnMoveCallback, this);
++  sio_onvol(hdl, &OnVolCallback, this);
++  return true;
++ bad_close:
++  sio_close(hdl);
++  return false;
++}
++
++void SndioAudioOutputStream::Close() {
++  if (state == kClosed)
++    return;
++  if (state == kRunning)
++    Stop();
++  state = kClosed;
++  delete [] buffer;
++  sio_close(hdl);
++  manager->ReleaseOutputStream(this);  // Calls the destructor
++}
++
++void SndioAudioOutputStream::Start(AudioSourceCallback* callback) {
++  state = kRunning;
++  hw_delay = 0;
++  source = callback;
++  sio_start(hdl);
++  if (pthread_create(&thread, NULL, &ThreadEntry, this) != 0) {
++    LOG(ERROR) << "Failed to create real-time thread.";
++    sio_stop(hdl);
++    state = kStopped;
++  }
++}
++
++void SndioAudioOutputStream::Stop() {
++  if (state == kStopped)
++    return;
++  state = kStopWait;
++  pthread_join(thread, NULL);
++  sio_stop(hdl);
++  state = kStopped;
++}
++
++void SndioAudioOutputStream::SetVolume(double v) {
++  pthread_mutex_lock(&mutex);
++  vol = v * SIO_MAXVOL;
++  volpending = 1;
++  pthread_mutex_unlock(&mutex);
++}
++
++void SndioAudioOutputStream::GetVolume(double* v) {
++  pthread_mutex_lock(&mutex);
++  *v = vol * (1. / SIO_MAXVOL);
++  pthread_mutex_unlock(&mutex);
++}
++
++// This stream is always used with sub second buffer sizes, where it's
++// sufficient to simply always flush upon Start().
++void SndioAudioOutputStream::Flush() {}
++
++void SndioAudioOutputStream::ThreadLoop(void) {
++  int avail, count, result;
++
++  while (state == kRunning) {
++    // Update volume if needed
++    pthread_mutex_lock(&mutex);
++    if (volpending) {
++      volpending = 0;
++      sio_setvol(hdl, vol);
++    }
++    pthread_mutex_unlock(&mutex);
++
++    // Get data to play
++    const base::TimeDelta delay = AudioTimestampHelper::FramesToTime(hw_delay,
++	params.sample_rate());
++    count = source->OnMoreData(delay, base::TimeTicks::Now(), 0, audio_bus.get());
++    audio_bus->ToInterleaved<SignedInt16SampleTypeTraits>(count, reinterpret_cast<int16_t*>(buffer));
++    if (count == 0) {
++      // We have to submit something to the device
++      count = audio_bus->frames();
++      memset(buffer, 0, count * params.GetBytesPerFrame(kSampleFormat));
++      LOG(WARNING) << "No data to play, running empty cycle.";
++    }
++
++    // Submit data to the device
++    avail = count * params.GetBytesPerFrame(kSampleFormat);
++    result = sio_write(hdl, buffer, avail);
++    if (result == 0) {
++      LOG(WARNING) << "Audio device disconnected.";
++      break;
++    }
++
++    // Update hardware pointer
++    hw_delay += count;
++  }
++}
++
++}  // namespace media
+--- /dev/null
++++ b/src/3rdparty/chromium/media/audio/sndio/sndio_output.h
+@@ -0,0 +1,86 @@
++// Copyright (c) 2012 The Chromium Authors. All rights reserved.
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++#ifndef MEDIA_AUDIO_SNDIO_SNDIO_OUTPUT_H_
++#define MEDIA_AUDIO_SNDIO_SNDIO_OUTPUT_H_
++
++#include <pthread.h>
++#include <sndio.h>
++
++#include "base/time/tick_clock.h"
++#include "base/time/time.h"
++#include "media/audio/audio_io.h"
++
++namespace media {
++
++class AudioManagerBase;
++
++// Implementation of AudioOutputStream using sndio(7)
++class SndioAudioOutputStream : public AudioOutputStream {
++ public:
++  // The manager is creating this object
++  SndioAudioOutputStream(const AudioParameters& params,
++                         AudioManagerBase* manager);
++  virtual ~SndioAudioOutputStream();
++
++  // Implementation of AudioOutputStream.
++  bool Open() override;
++  void Close() override;
++  void Start(AudioSourceCallback* callback) override;
++  void Stop() override;
++  void SetVolume(double volume) override;
++  void GetVolume(double* volume) override;
++  void Flush() override;
++
++  friend void sndio_onmove(void *arg, int delta);
++  friend void sndio_onvol(void *arg, unsigned int vol);
++  friend void *sndio_threadstart(void *arg);
++
++ private:
++  enum StreamState {
++    kClosed,            // Not opened yet
++    kStopped,           // Device opened, but not started yet
++    kRunning,           // Started, device playing
++    kStopWait           // Stopping, waiting for the real-time thread to exit
++  };
++
++  // C-style call-backs
++  static void OnMoveCallback(void *arg, int delta);
++  static void OnVolCallback(void *arg, unsigned int vol);
++  static void* ThreadEntry(void *arg);
++
++  // Continuously moves data from the producer to the device
++  void ThreadLoop(void);
++
++  // Our creator, the audio manager needs to be notified when we close.
++  AudioManagerBase* manager;
++  // Parameters of the source
++  AudioParameters params;
++  // Source stores data here
++  std::unique_ptr<AudioBus> audio_bus;
++  // Call-back that produces data to play
++  AudioSourceCallback* source;
++  // Handle of the audio device
++  struct sio_hdl* hdl;
++  // Current state of the stream
++  enum StreamState state;
++  // High priority thread running ThreadLoop()
++  pthread_t thread;
++  // Protects vol, volpending and hw_delay
++  pthread_mutex_t mutex;
++  // Current volume in the 0..SIO_MAXVOL range
++  int vol;
++  // Set to 1 if volumes must be refreshed in the realtime thread
++  int volpending;
++  // Number of frames buffered in the hardware
++  int hw_delay;
++  // Temporary buffer where data is stored sndio-compatible format
++  char* buffer;
++
++  DISALLOW_COPY_AND_ASSIGN(SndioAudioOutputStream);
++};
++
++}  // namespace media
++
++#endif  // MEDIA_AUDIO_SNDIO_SNDIO_OUTPUT_H_
+--- a/src/3rdparty/chromium/media/media_options.gni
++++ b/src/3rdparty/chromium/media/media_options.gni
+@@ -121,6 +121,9 @@ declare_args() {
+   # Enables runtime selection of ALSA library for audio.
+   use_alsa = false
+ 
++  # Enable runtime selection of sndio(7)
++  use_sndio = false
++
+   # Alsa should be used on non-Android, non-Mac POSIX systems.
+   # Alsa should be used on desktop Chromecast and audio-only Chromecast builds.
+   if (is_posix && !is_android && !is_mac &&
diff --git a/srcpkgs/qt6-webengine/patches/0700-armv7l-neon.patch b/srcpkgs/qt6-webengine/patches/0700-armv7l-neon.patch
new file mode 100644
index 000000000000..d42fa19a07a1
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0700-armv7l-neon.patch
@@ -0,0 +1,10 @@
+--- a/src/3rdparty/chromium/skia/BUILD.gn
++++ b/src/3rdparty/chromium/skia/BUILD.gn
+@@ -800,7 +800,6 @@ skia_source_set("skia_opts") {
+         # Root build config sets -mfpu=$arm_fpu, which we expect to be neon
+         # when running this.
+         if (!arm_use_neon) {
+-          configs -= [ "//build/config/compiler:compiler_arm_fpu" ]
+           cflags += [ "-mfpu=neon" ]
+         }
+       }
diff --git a/srcpkgs/qt6-webengine/patches/0750-chromium-musl-arm-user_vfp.patch b/srcpkgs/qt6-webengine/patches/0750-chromium-musl-arm-user_vfp.patch
new file mode 100644
index 000000000000..6e2d62f35ee6
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0750-chromium-musl-arm-user_vfp.patch
@@ -0,0 +1,20 @@
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/util/linux/thread_info.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/util/linux/thread_info.h
+@@ -17,6 +17,17 @@
+ 
+ #include <stdint.h>
+ #include <sys/user.h>
++#if !defined(__GLIBC__)
++struct user_vfp {
++	unsigned long long fpregs[32];
++	unsigned long fpscr;
++};
++struct user_vfp_exc {
++	unsigned long fpexc;
++	unsigned long fpinst;
++	unsigned long fpinst2;
++};
++#endif /* !defined(__GLIBC__) */
+ 
+ #include <type_traits>
+ 
diff --git a/srcpkgs/qt6-webengine/patches/0751-chromium-musl-arm-elf_auxv_t.patch b/srcpkgs/qt6-webengine/patches/0751-chromium-musl-arm-elf_auxv_t.patch
new file mode 100644
index 000000000000..7112c8cfd3fa
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0751-chromium-musl-arm-elf_auxv_t.patch
@@ -0,0 +1,18 @@
+--- a/src/3rdparty/chromium/v8/src/base/cpu.cc
++++ b/src/3rdparty/chromium/v8/src/base/cpu.cc
+@@ -163,6 +163,15 @@ static V8_INLINE void __cpuid(int cpu_in
+ 
+ #if V8_HOST_ARCH_ARM || V8_HOST_ARCH_ARM64
+ 
++#ifndef __GLIBC__
++#include <elf.h>
++#ifdef __LP64__
++typedef Elf64_auxv_t elf_auxv_t;
++#else
++typedef Elf32_auxv_t elf_auxv_t;
++#endif
++#endif
++
+ static uint32_t ReadELFHWCaps() {
+   uint32_t result = 0;
+ #if V8_GLIBC_PREREQ(2, 16)
diff --git a/srcpkgs/qt6-webengine/patches/0801-chromium-i686-vaapi-fpermissive.patch b/srcpkgs/qt6-webengine/patches/0801-chromium-i686-vaapi-fpermissive.patch
new file mode 100644
index 000000000000..3d4043e03b89
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0801-chromium-i686-vaapi-fpermissive.patch
@@ -0,0 +1,24 @@
+--- a/src/3rdparty/chromium/media/gpu/vaapi/BUILD.gn
++++ b/src/3rdparty/chromium/media/gpu/vaapi/BUILD.gn
+@@ -14,6 +14,10 @@ import("//ui/gl/features.gni")
+ assert(is_linux || is_chromeos)
+ assert(use_vaapi)
+ 
++config("vaapi_permissive") {
++  cflags = [ "-fpermissive" ]
++}
++
+ generate_stubs("libva_stubs") {
+   extra_header = "va_stub_header.fragment"
+   sigs = [ "va.sigs" ]
+@@ -136,6 +140,10 @@ source_set("vaapi") {
+     ]
+   }
+ 
++  if (target_cpu == "x86") {
++    configs += [ ":vaapi_permissive" ]
++  }
++
+   if (use_x11) {
+     deps += [ "//ui/gfx/x" ]
+     sources += [
diff --git a/srcpkgs/qt6-webengine/patches/0900-xxx-ppc64le-libvpx.patch b/srcpkgs/qt6-webengine/patches/0900-xxx-ppc64le-libvpx.patch
new file mode 100644
index 000000000000..5c9566b56bd4
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0900-xxx-ppc64le-libvpx.patch
@@ -0,0 +1,65 @@
+Uses generic target for now. To use ppc64le, change --target to ppc64le-gnu
+and add --enable-vsx, and change generic to ppc for the rtcd header.
+
+From 18e6c5c55cfae0cfb458d8210d7bc709360a0e90 Mon Sep 17 00:00:00 2001
+From: q66 <daniel@octaforge.org>
+Date: Wed, 9 Sep 2020 19:08:25 +0200
+Subject: [PATCH] enable generation of ppc64 libvpx bits
+
+this doesn't update the gni file, that's done from
+the template by running the appropriate scripts
+---
+ third_party/libvpx/BUILD.gn        | 4 ++++
+ third_party/libvpx/generate_gni.sh | 9 +++++++++
+ 2 files changed, 13 insertions(+)
+
+--- a/src/3rdparty/chromium/third_party/libvpx/BUILD.gn
++++ b/src/3rdparty/chromium/third_party/libvpx/BUILD.gn
+@@ -424,6 +424,8 @@ static_library("bundled_libvpx") {
+       sources = libvpx_srcs_arm64
+       public_deps = [ ":libvpx_arm64_headers" ]
+     }
++  } else if (current_cpu == "ppc64") {
++    sources = libvpx_srcs_ppc64
+   }
+ 
+   configs -= [ "//build/config/compiler:chromium_code" ]
+--- a/src/3rdparty/chromium/third_party/libvpx/generate_gni.sh
++++ b/src/3rdparty/chromium/third_party/libvpx/generate_gni.sh
+@@ -374,6 +374,7 @@ gen_config_files linux/arm-neon-highbd "
+ gen_config_files linux/arm64-highbd "--target=armv8-linux-gcc ${all_platforms} ${HIGHBD}"
+ gen_config_files linux/mipsel "--target=mips32-linux-gcc ${all_platforms}"
+ gen_config_files linux/mips64el "--target=mips64-linux-gcc ${all_platforms}"
++gen_config_files linux/ppc64 "--target=generic-gnu $HIGHBD ${all_platforms}"
+ gen_config_files linux/generic "--target=generic-gnu $HIGHBD ${all_platforms}"
+ gen_config_files win/arm64 "--target=arm64-win64-vs15 ${all_platforms} ${HIGHBD}"
+ gen_config_files win/ia32 "--target=x86-win32-vs14 ${all_platforms} ${x86_platforms}"
+@@ -399,6 +400,7 @@ lint_config linux/arm-neon-highbd
+ lint_config linux/arm64-highbd
+ lint_config linux/mipsel
+ lint_config linux/mips64el
++lint_config linux/ppc64
+ lint_config linux/generic
+ lint_config win/arm64
+ lint_config win/ia32
+@@ -428,6 +430,7 @@ gen_rtcd_header linux/arm-neon-highbd ar
+ gen_rtcd_header linux/arm64-highbd armv8
+ gen_rtcd_header linux/mipsel mipsel
+ gen_rtcd_header linux/mips64el mips64el
++gen_rtcd_header linux/ppc64 generic
+ gen_rtcd_header linux/generic generic
+ gen_rtcd_header win/arm64 armv8
+ gen_rtcd_header win/ia32 x86 "${require_sse2}"
+@@ -513,6 +516,12 @@ if [ -z $ONLY_CONFIGS ]; then
+ 
+   echo "MIPS64 source list is identical to MIPS source list. No need to generate it."
+ 
++  echo "Generate ppc64 source list."
++  config=$(print_config_basic linux/ppc64)
++  make_clean
++  make libvpx_srcs.txt target=libs $config > /dev/null
++  convert_srcs_to_project_files libvpx_srcs.txt libvpx_srcs_ppc64
++
+   echo "Generate NaCl source list."
+   config=$(print_config_basic nacl)
+   make_clean
diff --git a/srcpkgs/qt6-webengine/patches/0901-xxx-ppc64le-sandbox-linux-stat.patch b/srcpkgs/qt6-webengine/patches/0901-xxx-ppc64le-sandbox-linux-stat.patch
new file mode 100644
index 000000000000..4b8e6320601c
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0901-xxx-ppc64le-sandbox-linux-stat.patch
@@ -0,0 +1,31 @@
+--- a/src/3rdparty/chromium/sandbox/linux/system_headers/linux_stat.h
++++ b/src/3rdparty/chromium/sandbox/linux/system_headers/linux_stat.h
+@@ -155,6 +155,28 @@ struct kernel_stat {
+   unsigned int __unused4;
+   unsigned int __unused5;
+ };
++#elif defined(__powerpc64__)
++struct kernel_stat {
++  unsigned long	st_dev;
++  unsigned long	st_ino;
++  unsigned long	st_nlink;
++  unsigned int	st_mode;
++  unsigned int	st_uid;
++  unsigned int	st_gid;
++  unsigned long	st_rdev;
++  long		st_size;
++  unsigned long	st_blksize;
++  unsigned long	st_blocks;
++  unsigned long	st_atime_;
++  unsigned long	st_atime_nsec_;
++  unsigned long	st_mtime_;
++  unsigned long	st_mtime_nsec_;
++  unsigned long	st_ctime_;
++  unsigned long	st_ctime_nsec_;
++  unsigned long	__unused4;
++  unsigned long	__unused5;
++  unsigned long	__unused6;
++};
+ #endif
+ 
+ #if !defined(AT_EMPTY_PATH)
diff --git a/srcpkgs/qt6-webengine/patches/0902-xxx-ppc64le-support.patch b/srcpkgs/qt6-webengine/patches/0902-xxx-ppc64le-support.patch
new file mode 100644
index 000000000000..60503c22e36b
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0902-xxx-ppc64le-support.patch
@@ -0,0 +1,3559 @@
+commit 2c013a317b1114ef67cdbbc30824b28907b9ea94
+Author: Daniel Kolesa <daniel@octaforge.org>
+Date:   Wed Mar 3 19:08:29 2021 +0100
+
+    ppc64le support
+
+--- a/src/3rdparty/chromium/sandbox/features.gni
++++ b/src/3rdparty/chromium/sandbox/features.gni
+@@ -11,7 +11,8 @@ import("//build/config/nacl/config.gni")
+ use_seccomp_bpf = (is_linux || is_chromeos || is_android) &&
+                   (current_cpu == "x86" || current_cpu == "x64" ||
+                    current_cpu == "arm" || current_cpu == "arm64" ||
+-                   current_cpu == "mipsel" || current_cpu == "mips64el")
++                   current_cpu == "mipsel" || current_cpu == "mips64el" ||
++                   current_cpu == "ppc64")
+ 
+ use_seccomp_bpf = use_seccomp_bpf || is_nacl_nonsfi
+ 
+--- a/src/3rdparty/chromium/sandbox/linux/BUILD.gn
++++ b/src/3rdparty/chromium/sandbox/linux/BUILD.gn
+@@ -433,6 +433,8 @@ component("sandbox_services") {
+ 
+ source_set("sandbox_services_headers") {
+   sources = [
++    "system_headers/ppc64_linux_syscalls.h",
++    "system_headers/ppc64_linux_ucontext.h",
+     "system_headers/arm64_linux_syscalls.h",
+     "system_headers/arm_linux_syscalls.h",
+     "system_headers/arm_linux_ucontext.h",
+--- a/src/3rdparty/chromium/sandbox/linux/bpf_dsl/linux_syscall_ranges.h
++++ b/src/3rdparty/chromium/sandbox/linux/bpf_dsl/linux_syscall_ranges.h
+@@ -56,6 +56,13 @@
+ #define MAX_PUBLIC_SYSCALL __NR_syscalls
+ #define MAX_SYSCALL MAX_PUBLIC_SYSCALL
+ 
++#elif defined(__powerpc64__)
++
++#include <asm/unistd.h>
++#define MIN_SYSCALL 0u
++#define MAX_PUBLIC_SYSCALL 386u
++#define MAX_SYSCALL MAX_PUBLIC_SYSCALL
++
+ #else
+ #error "Unsupported architecture"
+ #endif
+--- a/src/3rdparty/chromium/sandbox/linux/bpf_dsl/seccomp_macros.h
++++ b/src/3rdparty/chromium/sandbox/linux/bpf_dsl/seccomp_macros.h
+@@ -16,6 +16,9 @@
+ #if defined(__mips__)
+ // sys/user.h in eglibc misses size_t definition
+ #include <stddef.h>
++#elif defined(__powerpc64__) && defined(__GLIBC__)
++// Manually define greg_t on ppc64
++typedef unsigned long long greg_t;
+ #endif
+ #endif
+ 
+@@ -346,6 +349,59 @@ struct regs_struct {
+ #define SECCOMP_PT_PARM4(_regs) (_regs).regs[3]
+ #define SECCOMP_PT_PARM5(_regs) (_regs).regs[4]
+ #define SECCOMP_PT_PARM6(_regs) (_regs).regs[5]
++
++#elif defined(__powerpc64__)
++#include <asm/ptrace.h>
++
++typedef struct pt_regs regs_struct;
++
++#ifdef ARCH_CPU_LITTLE_ENDIAN
++#define SECCOMP_ARCH AUDIT_ARCH_PPC64LE
++#else
++#define SECCOMP_ARCH AUDIT_ARCH_PPC64
++#endif
++
++#ifdef __GLIBC__
++#define SECCOMP_REG(_ctx, _reg) ((_ctx)->uc_mcontext.regs->gpr[_reg])
++#else
++#define SECCOMP_REG(_ctx, _reg) (((struct pt_regs *)(_ctx)->uc_mcontext.regs)->gpr[_reg])
++#endif
++
++#define SECCOMP_RESULT(_ctx) SECCOMP_REG(_ctx, 3)
++#define SECCOMP_SYSCALL(_ctx) SECCOMP_REG(_ctx, 0)
++#ifdef __GLIBC__
++#define SECCOMP_IP(_ctx) (_ctx)->uc_mcontext.regs->nip
++#else
++#define SECCOMP_IP(_ctx) ((struct pt_regs *)(_ctx)->uc_mcontext.regs)->nip
++#endif
++#define SECCOMP_PARM1(_ctx) SECCOMP_REG(_ctx, 3)
++#define SECCOMP_PARM2(_ctx) SECCOMP_REG(_ctx, 4)
++#define SECCOMP_PARM3(_ctx) SECCOMP_REG(_ctx, 5)
++#define SECCOMP_PARM4(_ctx) SECCOMP_REG(_ctx, 6)
++#define SECCOMP_PARM5(_ctx) SECCOMP_REG(_ctx, 7)
++#define SECCOMP_PARM6(_ctx) SECCOMP_REG(_ctx, 8)
++
++#define SECCOMP_NR_IDX (offsetof(struct arch_seccomp_data, nr))
++#define SECCOMP_ARCH_IDX (offsetof(struct arch_seccomp_data, arch))
++#define SECCOMP_IP_MSB_IDX \
++  (offsetof(struct arch_seccomp_data, instruction_pointer) + 4)
++#define SECCOMP_IP_LSB_IDX \
++  (offsetof(struct arch_seccomp_data, instruction_pointer) + 0)
++#define SECCOMP_ARG_MSB_IDX(nr) \
++  (offsetof(struct arch_seccomp_data, args) + 8 * (nr) + 4)
++#define SECCOMP_ARG_LSB_IDX(nr) \
++  (offsetof(struct arch_seccomp_data, args) + 8 * (nr) + 0)
++
++#define SECCOMP_PT_RESULT(_regs) (_regs).gpr[3]
++#define SECCOMP_PT_SYSCALL(_regs) (_regs).gpr[0]
++#define SECCOMP_PT_IP(_regs) (_regs).nip
++#define SECCOMP_PT_PARM1(_regs) (_regs).gpr[3]
++#define SECCOMP_PT_PARM2(_regs) (_regs).gpr[4]
++#define SECCOMP_PT_PARM3(_regs) (_regs).gpr[5]
++#define SECCOMP_PT_PARM4(_regs) (_regs).gpr[6]
++#define SECCOMP_PT_PARM5(_regs) (_regs).gpr[7]
++#define SECCOMP_PT_PARM6(_regs) (_regs).gpr[8]
++
+ #else
+ #error Unsupported target platform
+ 
+--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc
++++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc
+@@ -91,7 +91,8 @@ bool IsBaselinePolicyWatched(int sysno)
+          SyscallSets::IsPrctl(sysno) ||
+          SyscallSets::IsProcessGroupOrSession(sysno) ||
+ #if defined(__i386__) || \
+-    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
++    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
++    defined(__powerpc64__)
+          SyscallSets::IsSocketCall(sysno) ||
+ #endif
+ #if defined(__arm__)
+@@ -258,7 +259,7 @@ ResultExpr EvaluateSyscallImpl(int fs_de
+   }
+ 
+ #if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
+-    defined(__aarch64__)
++    defined(__aarch64__) || defined(__powerpc64__)
+   if (sysno == __NR_mmap)
+     return RestrictMmapFlags();
+ #endif
+@@ -279,7 +280,7 @@ ResultExpr EvaluateSyscallImpl(int fs_de
+     return RestrictPrctl();
+ 
+ #if defined(__x86_64__) || defined(__arm__) || defined(__mips__) || \
+-    defined(__aarch64__)
++    defined(__aarch64__) || defined(__powerpc64__)
+   if (sysno == __NR_socketpair) {
+     // Only allow AF_UNIX, PF_UNIX. Crash if anything else is seen.
+     static_assert(AF_UNIX == PF_UNIX,
+@@ -343,7 +344,8 @@ ResultExpr EvaluateSyscallImpl(int fs_de
+   }
+ 
+ #if defined(__i386__) || \
+-    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
++    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
++    defined(__powerpc64__)
+   if (SyscallSets::IsSocketCall(sysno))
+     return RestrictSocketcallCommand();
+ #endif
+--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/baseline_policy_unittest.cc
++++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/baseline_policy_unittest.cc
+@@ -317,7 +317,7 @@ TEST_BASELINE_SIGSYS(__NR_sysinfo)
+ TEST_BASELINE_SIGSYS(__NR_syslog)
+ TEST_BASELINE_SIGSYS(__NR_timer_create)
+ 
+-#if !defined(__aarch64__)
++#if !defined(__aarch64__) && !defined(__powerpc64__)
+ TEST_BASELINE_SIGSYS(__NR_inotify_init)
+ TEST_BASELINE_SIGSYS(__NR_vserver)
+ #endif
+--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc
++++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc
+@@ -40,7 +40,8 @@
+ #include <sys/ptrace.h>
+ #if (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) && \
+     !defined(__arm__) && !defined(__aarch64__) &&           \
+-    !defined(PTRACE_GET_THREAD_AREA)
++    !defined(PTRACE_GET_THREAD_AREA) &&			    \
++    !defined(__powerpc64__)
+ // Also include asm/ptrace-abi.h since ptrace.h in older libc (for instance
+ // the one in Ubuntu 16.04 LTS) is missing PTRACE_GET_THREAD_AREA.
+ // asm/ptrace-abi.h doesn't exist on arm32 and PTRACE_GET_THREAD_AREA isn't
+@@ -49,6 +50,11 @@
+ #endif
+ #endif  // !OS_NACL_NONSFI
+ 
++// On PPC64, TCGETS is defined in terms of struct termios, so we must include termios.h
++#ifdef __powerpc64__
++#include <termios.h>
++#endif
++
+ #if defined(OS_ANDROID)
+ 
+ #if !defined(F_DUPFD_CLOEXEC)
+@@ -106,6 +112,14 @@ inline bool IsArchitectureMips() {
+ #endif
+ }
+ 
++inline bool IsArchitecturePPC64() {
++#if defined(__powerpc64__)
++  return true;
++#else
++  return false;
++#endif
++}
++
+ // Ubuntu's version of glibc has a race condition in sem_post that can cause
+ // it to call futex(2) with bogus op arguments. To workaround this, we need
+ // to allow those futex(2) calls to fail with EINVAL, instead of crashing the
+@@ -270,6 +284,8 @@ ResultExpr RestrictFcntlCommands() {
+   uint64_t kOLargeFileFlag = O_LARGEFILE;
+   if (IsArchitectureX86_64() || IsArchitectureI386() || IsArchitectureMips())
+     kOLargeFileFlag = 0100000;
++  else if (IsArchitecturePPC64())
++    kOLargeFileFlag = 0200000;
+ 
+   const Arg<int> cmd(1);
+   const Arg<long> long_arg(2);
+@@ -287,7 +303,16 @@ ResultExpr RestrictFcntlCommands() {
+               F_SETLKW,
+               F_GETLK,
+               F_DUPFD,
+-              F_DUPFD_CLOEXEC),
++              F_DUPFD_CLOEXEC
++#if defined(__powerpc64__)
++// On PPC64, F_SETLK, F_GETLK, F_SETLKW are defined as the 64-bit variants
++// but glibc will sometimes still use the 32-bit versions. Allow both.
++              ,
++              5, /* F_GETLK (32) */
++              6, /* F_SETLK (32) */
++              7  /* F_SETLKW (32) */
++#endif
++	     ),
+              Allow())
+       .Case(F_SETFL,
+             If((long_arg & ~kAllowedMask) == 0, Allow()).Else(CrashSIGSYS()))
+@@ -297,7 +322,7 @@ ResultExpr RestrictFcntlCommands() {
+   // clang-format on
+ }
+ 
+-#if defined(__i386__) || defined(__mips__)
++#if defined(__i386__) || defined(__mips__) || defined(__powerpc64__)
+ ResultExpr RestrictSocketcallCommand() {
+   // Unfortunately, we are unable to restrict the first parameter to
+   // socketpair(2). Whilst initially sounding bad, it's noteworthy that very
+@@ -454,7 +479,7 @@ ResultExpr RestrictPtrace() {
+ #endif
+   return Switch(request)
+       .CASES((
+-#if !defined(__aarch64__)
++#if !defined(__aarch64__) && !defined(__powerpc64__)
+                  PTRACE_GETREGS, PTRACE_GETFPREGS,
+ #if defined(TRACE_GET_THREAD_AREA)
+                  PTRACE_GET_THREAD_AREA,
+--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.h
++++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.h
+@@ -49,7 +49,7 @@ SANDBOX_EXPORT bpf_dsl::ResultExpr Restr
+ // O_NONBLOCK | O_SYNC | O_LARGEFILE | O_CLOEXEC | O_NOATIME.
+ SANDBOX_EXPORT bpf_dsl::ResultExpr RestrictFcntlCommands();
+ 
+-#if defined(__i386__) || defined(__mips__)
++#if defined(__i386__) || defined(__mips__) || defined(__powerpc64__)
+ // Restrict socketcall(2) to only allow socketpair(2), send(2), recv(2),
+ // sendto(2), recvfrom(2), shutdown(2), sendmsg(2) and recvmsg(2).
+ SANDBOX_EXPORT bpf_dsl::ResultExpr RestrictSocketcallCommand();
+--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
++++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
+@@ -28,7 +28,7 @@ bool SyscallSets::IsKill(int sysno) {
+ bool SyscallSets::IsAllowedGettime(int sysno) {
+   switch (sysno) {
+     case __NR_gettimeofday:
+-#if defined(__i386__) || defined(__x86_64__) || \
++#if defined(__i386__) || defined(__x86_64__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_time:
+ #endif
+@@ -51,12 +51,12 @@ bool SyscallSets::IsAllowedGettime(int s
+                                     // filtered by RestrictClockID().
+     case __NR_clock_nanosleep_time64:  // Parameters filtered by RestrictClockID().
+ #endif
+-#if defined(__i386__) || \
++#if defined(__i386__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_ftime:  // Obsolete.
+ #endif
+     case __NR_settimeofday:  // Privileged.
+-#if defined(__i386__) || \
++#if defined(__i386__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_stime:
+ #endif
+@@ -135,7 +135,7 @@ bool SyscallSets::IsFileSystem(int sysno
+     case __NR_faccessat:  // EPERM not a valid errno.
+     case __NR_fchmodat:
+     case __NR_fchownat:  // Should be called chownat ?
+-#if defined(__x86_64__) || defined(__aarch64__)
++#if defined(__x86_64__) || defined(__aarch64__) || defined(__powerpc64__)
+     case __NR_newfstatat:  // fstatat(). EPERM not a valid errno.
+ #elif defined(__i386__) || defined(__arm__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+@@ -154,7 +154,7 @@ bool SyscallSets::IsFileSystem(int sysno
+     case __NR_memfd_create:
+     case __NR_mkdirat:
+     case __NR_mknodat:
+-#if defined(__i386__)
++#if defined(__i386__) || defined(__powerpc64__)
+     case __NR_oldlstat:
+     case __NR_oldstat:
+ #endif
+@@ -167,7 +167,7 @@ bool SyscallSets::IsFileSystem(int sysno
+     case __NR_stat64:
+ #endif
+     case __NR_statfs:  // EPERM not a valid errno.
+-#if defined(__i386__) || defined(__arm__) || \
++#if defined(__i386__) || defined(__arm__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_statfs64:
+ #endif
+@@ -179,7 +179,8 @@ bool SyscallSets::IsFileSystem(int sysno
+     case __NR_truncate64:
+ #endif
+     case __NR_unlinkat:
+-#if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
++#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
++    defined(__powerpc64__)
+     case __NR_utime:
+ #endif
+     case __NR_utimensat:  // New.
+@@ -204,7 +205,8 @@ bool SyscallSets::IsAllowedFileSystemAcc
+ #endif
+       return true;
+ // TODO(jln): these should be denied gracefully as well (moved below).
+-#if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
++#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
++    defined(__powerpc64__)
+     case __NR_fadvise64:  // EPERM not a valid errno.
+ #endif
+ #if defined(__i386__)
+@@ -216,12 +218,12 @@ bool SyscallSets::IsAllowedFileSystemAcc
+     case __NR_fdatasync:  // EPERM not a valid errno.
+     case __NR_flock:      // EPERM not a valid errno.
+     case __NR_fstatfs:    // Give information about the whole filesystem.
+-#if defined(__i386__) || defined(__arm__) || \
++#if defined(__i386__) || defined(__arm__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_fstatfs64:
+ #endif
+     case __NR_fsync:  // EPERM not a valid errno.
+-#if defined(__i386__)
++#if defined(__i386__) || defined(__powerpc64__)
+     case __NR_oldfstat:
+ #endif
+ #if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
+@@ -229,6 +231,8 @@ bool SyscallSets::IsAllowedFileSystemAcc
+     case __NR_sync_file_range:  // EPERM not a valid errno.
+ #elif defined(__arm__)
+     case __NR_arm_sync_file_range:  // EPERM not a valid errno.
++#elif defined(__powerpc64__)
++    case __NR_sync_file_range2: // EPERM not a valid errno.
+ #endif
+     default:
+       return false;
+@@ -248,7 +252,7 @@ bool SyscallSets::IsDeniedFileSystemAcce
+     case __NR_getdents:    // EPERM not a valid errno.
+ #endif
+     case __NR_getdents64:  // EPERM not a valid errno.
+-#if defined(__i386__) || \
++#if defined(__i386__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_readdir:
+ #endif
+@@ -290,7 +294,7 @@ bool SyscallSets::IsGetSimpleId(int sysn
+ bool SyscallSets::IsProcessPrivilegeChange(int sysno) {
+   switch (sysno) {
+     case __NR_capset:
+-#if defined(__i386__) || defined(__x86_64__)
++#if defined(__i386__) || defined(__x86_64__) || defined(__powerpc64__)
+     case __NR_ioperm:  // Intel privilege.
+     case __NR_iopl:    // Intel privilege.
+ #endif
+@@ -340,7 +344,7 @@ bool SyscallSets::IsAllowedSignalHandlin
+     case __NR_rt_sigprocmask:
+     case __NR_rt_sigreturn:
+     case __NR_rt_sigtimedwait:
+-#if defined(__i386__) || defined(__arm__) || \
++#if defined(__i386__) || defined(__arm__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_rt_sigtimedwait_time64:
+     case __NR_sigaction:
+@@ -357,7 +361,7 @@ bool SyscallSets::IsAllowedSignalHandlin
+     case __NR_signalfd:
+ #endif
+     case __NR_signalfd4:
+-#if defined(__i386__) || defined(__arm__) || \
++#if defined(__i386__) || defined(__arm__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_sigpending:
+     case __NR_sigsuspend:
+@@ -382,7 +386,7 @@ bool SyscallSets::IsAllowedOperationOnFd
+ #endif
+     case __NR_dup3:
+ #if defined(__x86_64__) || defined(__arm__) || defined(__mips__) || \
+-    defined(__aarch64__)
++    defined(__aarch64__) || defined(__powerpc64__)
+     case __NR_shutdown:
+ #endif
+       return true;
+@@ -416,7 +420,7 @@ bool SyscallSets::IsAllowedProcessStartO
+     case __NR_membarrier:
+     case __NR_wait4:
+     case __NR_waitid:
+-#if defined(__i386__)
++#if defined(__i386__) || defined(__powerpc64__)
+     case __NR_waitpid:
+ #endif
+ #if !defined(__GLIBC__)
+@@ -438,7 +442,7 @@ bool SyscallSets::IsAllowedProcessStartO
+     case __NR_set_tid_address:
+ #endif
+     case __NR_unshare:
+-#if !defined(__mips__) && !defined(__aarch64__)
++#if !defined(__mips__) && !defined(__aarch64__) || defined(__powerpc64__)
+     case __NR_vfork:
+ #endif
+     default:
+@@ -491,7 +495,7 @@ bool SyscallSets::IsAllowedGetOrModifySo
+       return true;
+     default:
+ #if defined(__x86_64__) || defined(__arm__) || defined(__mips__) || \
+-    defined(__aarch64__)
++    defined(__aarch64__) || defined(__powerpc64__)
+     case __NR_socketpair:  // We will want to inspect its argument.
+ #endif
+       return false;
+@@ -501,7 +505,7 @@ bool SyscallSets::IsAllowedGetOrModifySo
+ bool SyscallSets::IsDeniedGetOrModifySocket(int sysno) {
+   switch (sysno) {
+ #if defined(__x86_64__) || defined(__arm__) || defined(__mips__) || \
+-    defined(__aarch64__)
++    defined(__aarch64__) || defined(__powerpc64__)
+     case __NR_accept:
+     case __NR_accept4:
+     case __NR_bind:
+@@ -515,7 +519,7 @@ bool SyscallSets::IsDeniedGetOrModifySoc
+   }
+ }
+ 
+-#if defined(__i386__) || \
++#if defined(__i386__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+ // Big multiplexing system call for sockets.
+ bool SyscallSets::IsSocketCall(int sysno) {
+@@ -530,7 +534,8 @@ bool SyscallSets::IsSocketCall(int sysno
+ }
+ #endif
+ 
+-#if defined(__x86_64__) || defined(__arm__) || defined(__mips__)
++#if defined(__x86_64__) || defined(__arm__) || defined(__mips__) || \
++    defined(__powerpc64__)
+ bool SyscallSets::IsNetworkSocketInformation(int sysno) {
+   switch (sysno) {
+     case __NR_getpeername:
+@@ -558,7 +563,7 @@ bool SyscallSets::IsAllowedAddressSpaceA
+     case __NR_mincore:
+     case __NR_mlockall:
+ #if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
+-    defined(__aarch64__)
++    defined(__aarch64__) || defined(__powerpc64__)
+     case __NR_mmap:
+ #endif
+ #if defined(__i386__) || defined(__arm__) || \
+@@ -589,7 +594,7 @@ bool SyscallSets::IsAllowedAddressSpaceA
+ bool SyscallSets::IsAllowedGeneralIo(int sysno) {
+   switch (sysno) {
+     case __NR_lseek:
+-#if defined(__i386__) || defined(__arm__) || \
++#if defined(__i386__) || defined(__arm__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR__llseek:
+ #endif
+@@ -609,27 +614,27 @@ bool SyscallSets::IsAllowedGeneralIo(int
+     case __NR_read:
+     case __NR_readv:
+     case __NR_pread64:
+-#if defined(__arm__) || \
++#if defined(__arm__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_recv:
+ #endif
+ #if defined(__x86_64__) || defined(__arm__) || defined(__mips__) || \
+-    defined(__aarch64__)
++    defined(__aarch64__) || defined(__powerpc64__)
+     case __NR_recvfrom:  // Could specify source.
+     case __NR_recvmsg:   // Could specify source.
+ #endif
+-#if defined(__i386__) || defined(__x86_64__)
++#if defined(__i386__) || defined(__x86_64__) || defined(__powerpc64__)
+     case __NR_select:
+ #endif
+-#if defined(__i386__) || defined(__arm__) || defined(__mips__)
++#if defined(__i386__) || defined(__arm__) || defined(__mips__) || defined(__powerpc64__)
+     case __NR__newselect:
+ #endif
+-#if defined(__arm__) || \
++#if defined(__arm__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_send:
+ #endif
+ #if defined(__x86_64__) || defined(__arm__) || defined(__mips__) || \
+-    defined(__aarch64__)
++    defined(__aarch64__) || defined(__powerpc64__)
+     case __NR_sendmsg:  // Could specify destination.
+     case __NR_sendto:   // Could specify destination.
+ #endif
+@@ -684,7 +689,7 @@ bool SyscallSets::IsAllowedBasicSchedule
+     case __NR_nanosleep:
+       return true;
+     case __NR_getpriority:
+-#if defined(__i386__) || defined(__arm__) || \
++#if defined(__i386__) || defined(__arm__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_nice:
+ #endif
+@@ -696,7 +701,7 @@ bool SyscallSets::IsAllowedBasicSchedule
+ 
+ bool SyscallSets::IsAdminOperation(int sysno) {
+   switch (sysno) {
+-#if defined(__i386__) || defined(__arm__) || \
++#if defined(__i386__) || defined(__arm__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_bdflush:
+ #endif
+@@ -713,7 +718,8 @@ bool SyscallSets::IsAdminOperation(int s
+ 
+ bool SyscallSets::IsKernelModule(int sysno) {
+   switch (sysno) {
+-#if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
++#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
++    defined(__powerpc64__)
+     case __NR_create_module:
+     case __NR_get_kernel_syms:  // Should ENOSYS.
+     case __NR_query_module:
+@@ -745,7 +751,7 @@ bool SyscallSets::IsFsControl(int sysno)
+     case __NR_quotactl:
+     case __NR_swapoff:
+     case __NR_swapon:
+-#if defined(__i386__) || \
++#if defined(__i386__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_umount:
+ #endif
+@@ -762,7 +768,7 @@ bool SyscallSets::IsNuma(int sysno) {
+     case __NR_getcpu:
+     case __NR_mbind:
+ #if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
+-    defined(__aarch64__)
++    defined(__aarch64__) || defined(__powerpc64__)
+     case __NR_migrate_pages:
+ #endif
+     case __NR_move_pages:
+@@ -797,13 +803,13 @@ bool SyscallSets::IsGlobalProcessEnviron
+   switch (sysno) {
+     case __NR_acct:  // Privileged.
+ #if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
+-    defined(__aarch64__)
++    defined(__aarch64__) || defined(__powerpc64__)
+     case __NR_getrlimit:
+ #endif
+-#if defined(__i386__) || defined(__arm__)
++#if defined(__i386__) || defined(__arm__) || defined(__powerpc64__)
+     case __NR_ugetrlimit:
+ #endif
+-#if defined(__i386__) || \
++#if defined(__i386__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_ulimit:
+ #endif
+@@ -838,7 +844,7 @@ bool SyscallSets::IsGlobalSystemStatus(i
+ #endif
+     case __NR_sysinfo:
+     case __NR_uname:
+-#if defined(__i386__)
++#if defined(__i386__) || defined(__powerpc64__)
+     case __NR_olduname:
+     case __NR_oldolduname:
+ #endif
+@@ -904,8 +910,16 @@ bool SyscallSets::IsSystemVSemaphores(in
+ }
+ #endif
+ 
++/* shitty hack around Void's 4.19 kernel headers missing those numbers */
++#if defined(__powerpc64__) && !defined(__NR_shmget)
++#define __NR_shmget 395
++#define __NR_shmctl 396
++#define __NR_shmat 397
++#define __NR_shmdt 398
++#endif
++
+ #if defined(__i386__) || defined(__x86_64__) || defined(__arm__) || \
+-    defined(__aarch64__) ||                                         \
++    defined(__aarch64__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_64_BITS))
+ // These give a lot of ambient authority and bypass the setuid sandbox.
+ bool SyscallSets::IsSystemVSharedMemory(int sysno) {
+@@ -936,7 +950,7 @@ bool SyscallSets::IsSystemVMessageQueue(
+ }
+ #endif
+ 
+-#if defined(__i386__) || \
++#if defined(__i386__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+ // Big system V multiplexing system call.
+ bool SyscallSets::IsSystemVIpc(int sysno) {
+@@ -956,7 +970,7 @@ bool SyscallSets::IsAnySystemV(int sysno
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_64_BITS))
+   return IsSystemVMessageQueue(sysno) || IsSystemVSemaphores(sysno) ||
+          IsSystemVSharedMemory(sysno);
+-#elif defined(__i386__) || \
++#elif defined(__i386__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+   return IsSystemVIpc(sysno);
+ #endif
+@@ -1014,7 +1028,8 @@ bool SyscallSets::IsFaNotify(int sysno)
+ bool SyscallSets::IsTimer(int sysno) {
+   switch (sysno) {
+     case __NR_getitimer:
+-#if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
++#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
++    defined(__powerpc64__)
+     case __NR_alarm:
+ #endif
+     case __NR_setitimer:
+@@ -1096,17 +1111,20 @@ bool SyscallSets::IsMisc(int sysno) {
+     case __NR_syncfs:
+     case __NR_vhangup:
+ // The system calls below are not implemented.
+-#if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
++#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
++    defined(__powerpc64__)
+     case __NR_afs_syscall:
+ #endif
+ #if defined(__i386__) || \
+-    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
++    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
++    defined(__powerpc64__)
+     case __NR_break:
+ #endif
+-#if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
++#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
++    defined(__powerpc64__)
+     case __NR_getpmsg:
+ #endif
+-#if defined(__i386__) || \
++#if defined(__i386__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_gtty:
+     case __NR_idle:
+@@ -1115,20 +1133,21 @@ bool SyscallSets::IsMisc(int sysno) {
+     case __NR_prof:
+     case __NR_profil:
+ #endif
+-#if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
++#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
++    defined(__powerpc64__)
+     case __NR_putpmsg:
+ #endif
+ #if defined(__x86_64__)
+     case __NR_security:
+ #endif
+-#if defined(__i386__) || \
++#if defined(__i386__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_stty:
+ #endif
+-#if defined(__x86_64__)
++#if defined(__x86_64__) || defined(__powerpc64__)
+     case __NR_tuxcall:
+ #endif
+-#if !defined(__aarch64__)
++#if !defined(__aarch64__) && !defined(__powerpc64__)
+     case __NR_vserver:
+ #endif
+       return true;
+--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_sets.h
++++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_sets.h
+@@ -43,13 +43,14 @@ class SANDBOX_EXPORT SyscallSets {
+   static bool IsDeniedGetOrModifySocket(int sysno);
+ 
+ #if defined(__i386__) || \
+-    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
++    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
++    defined(__powerpc64__)
+   // Big multiplexing system call for sockets.
+   static bool IsSocketCall(int sysno);
+ #endif
+ 
+ #if defined(__x86_64__) || defined(__arm__) || defined(__mips__) || \
+-    defined(__aarch64__)
++    defined(__aarch64__) || defined(__powerpc64__)
+   static bool IsNetworkSocketInformation(int sysno);
+ #endif
+ 
+@@ -77,7 +78,7 @@ class SANDBOX_EXPORT SyscallSets {
+   static bool IsSystemVSemaphores(int sysno);
+ #endif
+ #if defined(__i386__) || defined(__x86_64__) || defined(__arm__) || \
+-    defined(__aarch64__) ||                                         \
++    defined(__aarch64__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_64_BITS))
+   // These give a lot of ambient authority and bypass the setuid sandbox.
+   static bool IsSystemVSharedMemory(int sysno);
+@@ -89,7 +90,8 @@ class SANDBOX_EXPORT SyscallSets {
+ #endif
+ 
+ #if defined(__i386__) || \
+-    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
++    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
++    defined(__powerpc64__)
+   // Big system V multiplexing system call.
+   static bool IsSystemVIpc(int sysno);
+ #endif
+--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf/syscall.cc
++++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf/syscall.cc
+@@ -18,7 +18,7 @@ namespace sandbox {
+ namespace {
+ 
+ #if defined(ARCH_CPU_X86_FAMILY) || defined(ARCH_CPU_ARM_FAMILY) || \
+-    defined(ARCH_CPU_MIPS_FAMILY)
++    defined(ARCH_CPU_MIPS_FAMILY) || defined (ARCH_CPU_PPC64_FAMILY)
+ // Number that's not currently used by any Linux kernel ABIs.
+ const int kInvalidSyscallNumber = 0x351d3;
+ #else
+@@ -312,10 +312,54 @@ asm(// We need to be able to tell the ke
+     "2:ret\n"
+     ".cfi_endproc\n"
+     ".size SyscallAsm, .-SyscallAsm\n"
++#elif defined(__powerpc64__)
++    ".text\n"
++    ".align 4\n"
++    ".type SyscallAsm @function\n"
++    "SyscallAsm:\n"
++    ".cfi_startproc\n"
++
++    // Check if r3 is negative
++    "cmpdi 3, 0\n"
++    "bgt 2f\n"
++
++    // Load address of 3f into r3 and return
++    "mflr 10\n"
++    "bl 1f\n"
++    "1: mflr 3\n"
++    "mtlr 10\n"
++    "addi 3, 3, 4*13\n"
++    "blr\n"
++
++    // Load arguments from array into r3-8
++    // save param 3 in r10
++    "2:\n"
++    "mr 0, 3\n"
++    "ld 3, 0(4)\n"
++    "ld 5, 16(4)\n"
++    "ld 6, 24(4)\n"
++    "ld 7, 32(4)\n"
++    "ld 8, 40(4)\n"
++    "ld 4, 8(4)\n"
++    "li 9, 0\n"
++
++    // Enter kernel
++    "sc\n"
++
++    // Magic return address
++    "3:\n"
++    // Like MIPS, ppc64 return values are always positive.
++    // Check for error in cr0.SO and negate upon error
++    "bc 4, 3, 4f\n"
++    "neg 3, 3\n"
++    "4: blr\n"
++
++    ".cfi_endproc\n"
++    ".size SyscallAsm, .-SyscallAsm\n"
+ #endif
+     );  // asm
+ 
+-#if defined(__x86_64__)
++#if defined(__x86_64__) || defined(__powerpc64__)
+ extern "C" {
+ intptr_t SyscallAsm(intptr_t nr, const intptr_t args[6]);
+ }
+@@ -429,6 +473,8 @@ intptr_t Syscall::Call(int nr,
+     ret = inout;
+   }
+ 
++#elif defined(__powerpc64__)
++  intptr_t ret = SyscallAsm(nr, args);
+ #else
+ #error "Unimplemented architecture"
+ #endif
+@@ -445,8 +491,26 @@ void Syscall::PutValueInUcontext(intptr_
+     // needs to be changed back.
+     ret_val = -ret_val;
+     SECCOMP_PARM4(ctx) = 1;
+-  } else
++  } else {
+     SECCOMP_PARM4(ctx) = 0;
++  }
++#endif
++#if defined(__powerpc64__)
++  // Same as MIPS, need to invert ret and set error register (cr0.SO)
++  if (ret_val <= -1 && ret_val >= -4095) {
++    ret_val = -ret_val;
++#ifdef __GLIBC__
++    ctx->uc_mcontext.regs->ccr |= (1 << 28);
++#else
++    ((struct pt_regs *)ctx->uc_mcontext.regs)->ccr |= (1 << 28);
++#endif
++  } else {
++#ifdef __GLIBC__
++    ctx->uc_mcontext.regs->ccr &= ~(1 << 28);
++#else
++    ((struct pt_regs *)ctx->uc_mcontext.regs)->ccr &= ~(1 << 28);
++#endif
++  }
+ #endif
+   SECCOMP_RESULT(ctx) = static_cast<greg_t>(ret_val);
+ }
+--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf/trap.cc
++++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf/trap.cc
+@@ -236,6 +236,20 @@ void Trap::SigSys(int nr, LinuxSigInfo*
+       SetIsInSigHandler();
+     }
+ 
++#if defined(__powerpc64__)
++    // On ppc64+glibc, some syscalls seem to accidentally negate the first
++    // parameter which causes checks against it to fail. For now, manually
++    // negate them back.
++    // TODO(shawn@anastas.io): investigate this issue further
++    auto nr = SECCOMP_SYSCALL(ctx);
++    if (nr == __NR_openat || nr == __NR_mkdirat || nr == __NR_faccessat || nr == __NR_readlinkat ||
++        nr == __NR_renameat || nr == __NR_renameat2 || nr == __NR_newfstatat || nr == __NR_unlinkat) {
++        if (static_cast<int>(SECCOMP_PARM1(ctx)) > 0) {
++            SECCOMP_PARM1(ctx) = -SECCOMP_PARM1(ctx);
++        }
++    }
++#endif
++
+     // Copy the seccomp-specific data into a arch_seccomp_data structure. This
+     // is what we are showing to TrapFnc callbacks that the system call
+     // evaluator registered with the sandbox.
+--- a/src/3rdparty/chromium/sandbox/linux/services/credentials.cc
++++ b/src/3rdparty/chromium/sandbox/linux/services/credentials.cc
+@@ -81,7 +81,7 @@ bool ChrootToSafeEmptyDir() {
+   pid_t pid = -1;
+   alignas(16) char stack_buf[PTHREAD_STACK_MIN];
+ #if defined(ARCH_CPU_X86_FAMILY) || defined(ARCH_CPU_ARM_FAMILY) || \
+-    defined(ARCH_CPU_MIPS_FAMILY)
++    defined(ARCH_CPU_MIPS_FAMILY) || defined(ARCH_CPU_PPC64_FAMILY)
+   // The stack grows downward.
+   void* stack = stack_buf + sizeof(stack_buf);
+ #else
+--- a/src/3rdparty/chromium/sandbox/linux/services/syscall_wrappers.cc
++++ b/src/3rdparty/chromium/sandbox/linux/services/syscall_wrappers.cc
+@@ -61,7 +61,7 @@ long sys_clone(unsigned long flags,
+ #if defined(ARCH_CPU_X86_64)
+   return syscall(__NR_clone, flags, child_stack, ptid, ctid, tls);
+ #elif defined(ARCH_CPU_X86) || defined(ARCH_CPU_ARM_FAMILY) || \
+-    defined(ARCH_CPU_MIPS_FAMILY)
++    defined(ARCH_CPU_MIPS_FAMILY) || defined(ARCH_CPU_PPC64_FAMILY)
+   // CONFIG_CLONE_BACKWARDS defined.
+   return syscall(__NR_clone, flags, child_stack, ptid, tls, ctid);
+ #endif
+--- a/src/3rdparty/chromium/sandbox/linux/syscall_broker/broker_process.cc
++++ b/src/3rdparty/chromium/sandbox/linux/syscall_broker/broker_process.cc
+@@ -165,7 +165,7 @@ bool BrokerProcess::IsSyscallBrokerable(
+ #if defined(__NR_fstatat64)
+     case __NR_fstatat64:
+ #endif
+-#if defined(__x86_64__) || defined(__aarch64__)
++#if defined(__x86_64__) || defined(__aarch64__) || defined(__powerpc64__)
+     case __NR_newfstatat:
+ #endif
+       return !fast_check || allowed_command_set_.test(COMMAND_STAT);
+--- a/src/3rdparty/chromium/sandbox/linux/system_headers/linux_seccomp.h
++++ b/src/3rdparty/chromium/sandbox/linux/system_headers/linux_seccomp.h
+@@ -41,6 +41,9 @@
+ #ifndef EM_AARCH64
+ #define EM_AARCH64 183
+ #endif
++#ifndef EM_PPC64
++#define EM_PPC64 21
++#endif
+ 
+ #ifndef __AUDIT_ARCH_64BIT
+ #define __AUDIT_ARCH_64BIT 0x80000000
+@@ -74,6 +77,14 @@
+ #define AUDIT_ARCH_AARCH64 (EM_AARCH64 | __AUDIT_ARCH_64BIT | __AUDIT_ARCH_LE)
+ #endif
+ 
++#ifndef AUDIT_ARCH_PPC64
++#define AUDIT_ARCH_PPC64 (EM_PPC64 | __AUDIT_ARCH_64BIT)
++#endif
++
++#ifndef AUDIT_ARCH_PPC64LE
++#define AUDIT_ARCH_PPC64LE (EM_PPC64 | __AUDIT_ARCH_64BIT | __AUDIT_ARCH_LE)
++#endif
++
+ // For prctl.h
+ #ifndef PR_SET_SECCOMP
+ #define PR_SET_SECCOMP               22
+--- a/src/3rdparty/chromium/sandbox/linux/system_headers/linux_signal.h
++++ b/src/3rdparty/chromium/sandbox/linux/system_headers/linux_signal.h
+@@ -13,7 +13,7 @@
+ // (not undefined, but defined different values and in different memory
+ // layouts). So, fill the gap here.
+ #if defined(__i386__) || defined(__x86_64__) || defined(__arm__) || \
+-    defined(__aarch64__)
++    defined(__aarch64__) || defined(__powerpc64__)
+ 
+ #define LINUX_SIGHUP 1
+ #define LINUX_SIGINT 2
+--- a/src/3rdparty/chromium/sandbox/linux/system_headers/linux_syscalls.h
++++ b/src/3rdparty/chromium/sandbox/linux/system_headers/linux_syscalls.h
+@@ -35,5 +35,9 @@
+ #include "sandbox/linux/system_headers/arm64_linux_syscalls.h"
+ #endif
+ 
++#if defined(__powerpc64__)
++#include "sandbox/linux/system_headers/ppc64_linux_syscalls.h"
++#endif
++
+ #endif  // SANDBOX_LINUX_SYSTEM_HEADERS_LINUX_SYSCALLS_H_
+ 
+--- a/src/3rdparty/chromium/sandbox/linux/system_headers/linux_ucontext.h
++++ b/src/3rdparty/chromium/sandbox/linux/system_headers/linux_ucontext.h
+@@ -11,6 +11,8 @@
+ #include "sandbox/linux/system_headers/arm_linux_ucontext.h"
+ #elif defined(__i386__)
+ #include "sandbox/linux/system_headers/i386_linux_ucontext.h"
++#elif defined(__powerpc64__)
++#include "sandbox/linux/system_headers/ppc64_linux_ucontext.h"
+ #else
+ #error "No support for your architecture in PNaCl header"
+ #endif
+--- a/src/3rdparty/chromium/sandbox/policy/linux/bpf_renderer_policy_linux.cc
++++ b/src/3rdparty/chromium/sandbox/policy/linux/bpf_renderer_policy_linux.cc
+@@ -15,6 +15,11 @@
+ #include "sandbox/linux/system_headers/linux_syscalls.h"
+ #include "sandbox/policy/linux/sandbox_linux.h"
+ 
++// On PPC64, TCGETS is defined in terms of struct termios, so we must include termios.h
++#ifdef __powerpc64__
++#include <termios.h>
++#endif
++
+ // TODO(vignatti): replace the local definitions below with #include
+ // <linux/dma-buf.h> once kernel version 4.6 becomes widely used.
+ #include <linux/types.h>
+--- a/src/3rdparty/chromium/third_party/angle/src/compiler/translator/InfoSink.h
++++ b/src/3rdparty/chromium/third_party/angle/src/compiler/translator/InfoSink.h
+@@ -93,7 +93,16 @@ class TInfoSinkBase
+             stream.precision(8);
+             stream << f;
+         }
+-        sink.append(stream.str());
++
++        // Hack to work around a bug where negative floating point values
++        // are rendered like '.0.5' instead of '-0.5'
++        std::string res(stream.str());
++
++        if (signbit(f)) { // test if f is negative
++            res[0] = '-';
++        }
++
++        sink.append(res);
+         return *this;
+     }
+     // Write boolean values as their names instead of integral value.
+--- a/src/3rdparty/chromium/third_party/angle/src/libANGLE/Constants.h
++++ b/src/3rdparty/chromium/third_party/angle/src/libANGLE/Constants.h
+@@ -9,6 +9,7 @@
+ #ifndef LIBANGLE_CONSTANTS_H_
+ #define LIBANGLE_CONSTANTS_H_
+ 
++#include <cstddef>
+ #include "common/platform.h"
+ 
+ #include <stdint.h>
+--- a/src/3rdparty/chromium/third_party/boringssl/BUILD.gn
++++ b/src/3rdparty/chromium/third_party/boringssl/BUILD.gn
+@@ -99,6 +99,13 @@ if (is_win && !is_msan && current_cpu !=
+       } else {
+         public_configs = [ ":no_asm_config" ]
+       }
++    } else if (current_cpu == "ppc64") {
++      if (is_linux) {
++        # TODO: ppc64 (be) check
++        sources += crypto_sources_linux_ppc64le
++      } else {
++        public_configs = [ ":no_asm_config" ]
++      }
+     } else {
+       public_configs = [ ":no_asm_config" ]
+     }
+--- a/src/3rdparty/chromium/third_party/breakpad/BUILD.gn
++++ b/src/3rdparty/chromium/third_party/breakpad/BUILD.gn
+@@ -623,7 +623,6 @@ if (is_linux || is_chromeos || is_androi
+       "breakpad/src/client/minidump_file_writer.h",
+       "breakpad/src/common/convert_UTF.cc",
+       "breakpad/src/common/convert_UTF.h",
+-      "breakpad/src/common/linux/breakpad_getcontext.S",
+       "breakpad/src/common/linux/elf_core_dump.cc",
+       "breakpad/src/common/linux/elf_core_dump.h",
+       "breakpad/src/common/linux/elfutils.cc",
+@@ -663,6 +662,15 @@ if (is_linux || is_chromeos || is_androi
+ 
+     libs = [ "dl" ]
+ 
++    if (current_cpu == "ppc64") {
++        defines = [ "HAVE_GETCONTEXT" ]
++        libs += [ "ucontext" ]
++    } else {
++        sources += [
++            "breakpad/src/common/linux/breakpad_getcontext.S"
++        ]
++    }
++
+     include_dirs = [
+       ".",
+       "breakpad/src",
+@@ -712,7 +720,6 @@ if (is_linux || is_chromeos || is_androi
+       "breakpad/src/client/linux/minidump_writer/minidump_writer_unittest.cc",
+       "breakpad/src/client/linux/minidump_writer/minidump_writer_unittest_utils.cc",
+       "breakpad/src/client/linux/minidump_writer/proc_cpuinfo_reader_unittest.cc",
+-      "breakpad/src/common/linux/breakpad_getcontext_unittest.cc",
+       "breakpad/src/common/linux/elf_core_dump_unittest.cc",
+       "breakpad/src/common/linux/file_id_unittest.cc",
+       "breakpad/src/common/linux/linux_libc_support_unittest.cc",
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/raw_context_cpu.h
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/raw_context_cpu.h
+@@ -44,6 +44,8 @@ typedef MDRawContextARM RawContextCPU;
+ typedef MDRawContextARM64_Old RawContextCPU;
+ #elif defined(__mips__)
+ typedef MDRawContextMIPS RawContextCPU;
++#elif defined(__powerpc64__)
++typedef MDRawContextPPC64 RawContextCPU;
+ #else
+ #error "This code has not been ported to your platform yet."
+ #endif
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.cc
+@@ -270,7 +270,54 @@ void ThreadInfo::FillCPUContext(RawConte
+   out->float_save.fir = mcontext.fpc_eir;
+ #endif
+ }
+-#endif  // __mips__
++
++#elif defined(__powerpc64__)
++
++#if !defined(__GLIBC__)
++#include <asm/elf.h>
++#include <asm/ptrace.h>
++#endif
++
++uintptr_t ThreadInfo::GetInstructionPointer() const {
++    return mcontext.gp_regs[PT_NIP];
++}
++
++void ThreadInfo::FillCPUContext(RawContextCPU* out) const {
++    out->context_flags = MD_CONTEXT_PPC64_FULL;
++    for (int i = 0; i < MD_CONTEXT_PPC64_GPR_COUNT; i++)
++        out->gpr[i] = mcontext.gp_regs[i];
++
++    out->lr = mcontext.gp_regs[PT_LNK];
++    out->srr0 = mcontext.gp_regs[PT_NIP];
++    out->srr1 = mcontext.gp_regs[PT_MSR];
++    out->cr = mcontext.gp_regs[PT_CCR];
++    out->xer = mcontext.gp_regs[PT_XER];
++    out->ctr = mcontext.gp_regs[PT_CTR];
++
++#ifdef __GLIBC__
++    for (int i = 0; i < MD_FLOATINGSAVEAREA_PPC_FPR_COUNT; i++)
++        out->float_save.fpregs[i] = mcontext.fp_regs[i];
++
++    out->float_save.fpscr = mcontext.fp_regs[NFPREG-1];
++#else
++    for (int i = 0; i < MD_FLOATINGSAVEAREA_PPC_FPR_COUNT; i++)
++        out->float_save.fpregs[i] = ((uint64_t *)&mcontext.fp_regs)[i];
++
++     out->float_save.fpscr = ((uint64_t *)&mcontext.fp_regs)[ELF_NFPREG-1];
++#endif
++
++    for (int i = 0; i < MD_VECTORSAVEAREA_PPC_VR_COUNT; i++)
++        out->vector_save.save_vr[i] = \
++            {(((uint64_t)vregs.vrregs[i][0]) << 32)
++                          | vregs.vrregs[i][1],
++            (((uint64_t)vregs.vrregs[i][2]) << 32)
++                         | vregs.vrregs[i][3]};
++
++    out->vrsave = vregs.vrsave;
++    out->vector_save.save_vscr = {0, vregs.vscr.vscr_word};
++    out->vector_save.save_vrvalid = 0xFFFFFFFF;
++}
++#endif  // __powerpc64__
+ 
+ void ThreadInfo::GetGeneralPurposeRegisters(void** gp_regs, size_t* size) {
+   assert(gp_regs || size);
+@@ -279,6 +326,11 @@ void ThreadInfo::GetGeneralPurposeRegist
+     *gp_regs = mcontext.gregs;
+   if (size)
+     *size = sizeof(mcontext.gregs);
++#elif defined(__powerpc64__)
++  if (gp_regs)
++    *gp_regs = mcontext.gp_regs;
++  if (size)
++    *size = sizeof(mcontext.gp_regs);
+ #else
+   if (gp_regs)
+     *gp_regs = &regs;
+@@ -294,6 +346,11 @@ void ThreadInfo::GetFloatingPointRegiste
+     *fp_regs = &mcontext.fpregs;
+   if (size)
+     *size = sizeof(mcontext.fpregs);
++#elif defined(__powerpc64__)
++  if (fp_regs)
++    *fp_regs = &mcontext.fp_regs;
++  if (size)
++    *size = sizeof(mcontext.fp_regs);
+ #else
+   if (fp_regs)
+     *fp_regs = &fpregs;
+@@ -302,4 +359,13 @@ void ThreadInfo::GetFloatingPointRegiste
+ #endif
+ }
+ 
++#if defined(__powerpc64__)
++void ThreadInfo::GetVectorRegisters(void** v_regs, size_t* size) {
++    if (v_regs)
++        *v_regs = &vregs;
++    if (size)
++        *size = sizeof(vregs);
++}
++#endif
++
+ }  // namespace google_breakpad
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.h
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.h
+@@ -68,6 +68,10 @@ struct ThreadInfo {
+   // Use the structures defined in <sys/user.h>
+   struct user_regs_struct regs;
+   struct user_fpsimd_struct fpregs;
++#elif defined(__powerpc64__)
++  // Use the structures defined in <sys/ucontext.h>.
++  mcontext_t mcontext;
++  vrregset_t vregs;
+ #elif defined(__mips__)
+   // Use the structure defined in <sys/ucontext.h>.
+   mcontext_t mcontext;
+@@ -84,6 +88,11 @@ struct ThreadInfo {
+ 
+   // Returns the pointer and size of float point register area.
+   void GetFloatingPointRegisters(void** fp_regs, size_t* size);
++
++#if defined(__powerpc64__)
++  // Returns the pointer and size of the vector register area. (PPC64 only)
++  void GetVectorRegisters(void** v_regs, size_t* size);
++#endif
+ };
+ 
+ }  // namespace google_breakpad
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc
+@@ -254,6 +254,60 @@ void UContextReader::FillCPUContext(RawC
+   out->float_save.fir = uc->uc_mcontext.fpc_eir;  // Unused.
+ #endif
+ }
++
++#elif defined(__powerpc64__)
++
++#ifndef __GLIBC__
++#include <asm/elf.h>
++#include <asm/ptrace.h>
++#endif
++
++uintptr_t UContextReader::GetStackPointer(const ucontext_t* uc) {
++    return uc->uc_mcontext.gp_regs[MD_CONTEXT_PPC64_REG_SP];
++}
++
++uintptr_t UContextReader::GetInstructionPointer(const ucontext_t* uc) {
++    return uc->uc_mcontext.gp_regs[PT_NIP];
++}
++
++void UContextReader::FillCPUContext(RawContextCPU* out, const ucontext_t* uc,
++                                    const vrregset_t* vregs) {
++    out->context_flags = MD_CONTEXT_PPC64_FULL;
++
++    for (int i = 0; i < MD_CONTEXT_PPC64_GPR_COUNT; i++)
++        out->gpr[i] = uc->uc_mcontext.gp_regs[i];
++
++    out->lr = uc->uc_mcontext.gp_regs[PT_LNK];
++    out->srr0 = uc->uc_mcontext.gp_regs[PT_NIP];
++    out->srr1 = uc->uc_mcontext.gp_regs[PT_MSR];
++    out->cr = uc->uc_mcontext.gp_regs[PT_CCR];
++    out->xer = uc->uc_mcontext.gp_regs[PT_XER];
++    out->ctr = uc->uc_mcontext.gp_regs[PT_CTR];
++
++#ifdef __GLIBC__
++    for (int i = 0; i < MD_FLOATINGSAVEAREA_PPC_FPR_COUNT; i++)
++        out->float_save.fpregs[i] = uc->uc_mcontext.fp_regs[i];
++
++    out->float_save.fpscr = uc->uc_mcontext.fp_regs[NFPREG-1];
++#else
++    for (int i = 0; i < MD_FLOATINGSAVEAREA_PPC_FPR_COUNT; i++)
++        out->float_save.fpregs[i] = ((uint64_t *)&uc->uc_mcontext.fp_regs)[i];
++
++    out->float_save.fpscr = ((uint64_t *)&uc->uc_mcontext.fp_regs)[ELF_NFPREG-1];
++#endif
++
++    for (int i = 0; i < MD_VECTORSAVEAREA_PPC_VR_COUNT; i++)
++        out->vector_save.save_vr[i] =
++            {(((uint64_t)vregs->vrregs[i][0]) << 32)
++                         | vregs->vrregs[i][1],
++             (((uint64_t)vregs->vrregs[i][2]) << 32)
++                         | vregs->vrregs[i][3]};
++
++    out->vrsave = vregs->vrsave;
++    out->vector_save.save_vscr = {0, vregs->vscr.vscr_word};
++    out->vector_save.save_vrvalid = 0xFFFFFFFF;
++}
++
+ #endif
+ 
+ }  // namespace google_breakpad
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h
+@@ -59,6 +59,9 @@ struct UContextReader {
+ #elif defined(__aarch64__)
+   static void FillCPUContext(RawContextCPU* out, const ucontext_t* uc,
+                              const struct fpsimd_context* fpregs);
++#elif defined(__powerpc64__)
++  static void FillCPUContext(RawContextCPU *out, const ucontext_t *uc,
++                             const vrregset_t* vregs);
+ #else
+   static void FillCPUContext(RawContextCPU* out, const ucontext_t* uc);
+ #endif
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc
+@@ -105,6 +105,13 @@
+ #define PR_SET_PTRACER 0x59616d61
+ #endif
+ 
++/* musl hack, can't include asm/ptrace.h as that causes conflicts */
++#ifndef __GLIBC__
++#if defined(__powerpc64__) && !defined(PT_NIP)
++#define PT_NIP 32
++#endif
++#endif
++
+ namespace google_breakpad {
+ 
+ namespace {
+@@ -461,9 +468,16 @@ bool ExceptionHandler::HandleSignal(int
+     memcpy(&g_crash_context_.float_state, fp_ptr,
+            sizeof(g_crash_context_.float_state));
+   }
++#elif defined(__powerpc64__)
++  // On PPC64, we must copy VR state
++  ucontext_t* uc_ptr = (ucontext_t*)uc;
++  if (uc_ptr->uc_mcontext.v_regs) {
++    memcpy(&g_crash_context_.vector_state, uc_ptr->uc_mcontext.v_regs,
++           sizeof(g_crash_context_.vector_state));
++  }
+ #elif !defined(__ARM_EABI__) && !defined(__mips__)
+   // FP state is not part of user ABI on ARM Linux.
+-  // In case of MIPS Linux FP state is already part of ucontext_t
++  // In case of MIPS, Linux FP state is already part of ucontext_t
+   // and 'float_state' is not a member of CrashContext.
+   ucontext_t* uc_ptr = (ucontext_t*)uc;
+   if (uc_ptr->uc_mcontext.fpregs) {
+@@ -708,11 +722,19 @@ bool ExceptionHandler::WriteMinidump() {
+   }
+ #endif
+ 
+-#if !defined(__ARM_EABI__) && !defined(__aarch64__) && !defined(__mips__)
++#if !defined(__ARM_EABI__) && !defined(__aarch64__) && !defined(__mips__) \
++    && !defined(__powerpc64__)
+   // FPU state is not part of ARM EABI ucontext_t.
+   memcpy(&context.float_state, context.context.uc_mcontext.fpregs,
+          sizeof(context.float_state));
+ #endif
++
++#if defined(__powerpc64__)
++  // Vector registers must be copied on PPC64
++  memcpy(&context.vector_state, context.context.uc_mcontext.v_regs,
++         sizeof(context.vector_state));
++#endif
++
+   context.tid = sys_gettid();
+ 
+   // Add an exception stream to the minidump for better reporting.
+@@ -733,6 +755,9 @@ bool ExceptionHandler::WriteMinidump() {
+ #elif defined(__mips__)
+   context.siginfo.si_addr =
+       reinterpret_cast<void*>(context.context.uc_mcontext.pc);
++#elif defined(__powerpc64__)
++  context.siginfo.si_addr =
++      reinterpret_cast<void*>(context.context.uc_mcontext.gp_regs[PT_NIP]);
+ #else
+ #error "This code has not been ported to your platform yet."
+ #endif
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.h
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.h
+@@ -192,7 +192,11 @@ class ExceptionHandler {
+     siginfo_t siginfo;
+     pid_t tid;  // the crashing thread.
+     ucontext_t context;
+-#if !defined(__ARM_EABI__) && !defined(__mips__)
++#if defined(__powerpc64__)
++    // PPC64's FP state is a part of ucontext_t like MIPS but the vector
++    // state is not, so a struct is needed.
++    vstate_t vector_state;
++#elif !defined(__ARM_EABI__) && !defined(__mips__)
+     // #ifdef this out because FP state is not part of user ABI for Linux ARM.
+     // In case of MIPS Linux FP state is already part of ucontext_t so
+     // 'float_state' is not required.
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler_unittest.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler_unittest.cc
+@@ -307,7 +307,7 @@ TEST(ExceptionHandlerTest, ParallelChild
+   }
+ 
+   // Wait a while until the child should have crashed.
+-  usleep(1000000);
++  usleep(2000000);
+   // Kill the child if it is still running.
+   kill(child, SIGKILL);
+ 
+@@ -559,6 +559,8 @@ const unsigned char kIllegalInstruction[
+ #if defined(__mips__)
+   // mfc2 zero,Impl - usually illegal in userspace.
+   0x48, 0x00, 0x00, 0x48
++#elif defined(__powerpc64__)
++  0x01, 0x01, 0x01, 0x01 // Crashes on a tested POWER9 cpu
+ #else
+   // This crashes with SIGILL on x86/x86-64/arm.
+   0xff, 0xff, 0xff, 0xff
+@@ -754,10 +756,10 @@ TEST(ExceptionHandlerTest, InstructionPo
+ 
+   // These are defined here so the parent can use them to check the
+   // data from the minidump afterwards.
+-  // Use 4k here because the OS will hand out a single page even
++  // Use the page size here because the OS will hand out a single page even
+   // if a smaller size is requested, and this test wants to
+   // test the upper bound of the memory range.
+-  const uint32_t kMemorySize = 4096;  // bytes
++  const uint32_t kMemorySize = getpagesize();  // bytes
+   const int kOffset = kMemorySize - sizeof(kIllegalInstruction);
+ 
+   const pid_t child = fork();
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/microdump_writer/microdump_writer.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/microdump_writer/microdump_writer.cc
+@@ -138,7 +138,9 @@ class MicrodumpWriter {
+                   const MicrodumpExtraInfo& microdump_extra_info,
+                   LinuxDumper* dumper)
+       : ucontext_(context ? &context->context : NULL),
+-#if !defined(__ARM_EABI__) && !defined(__mips__)
++#if defined(__powerpc64__)
++        vector_state_(context ? &context->vector_state : NULL),
++#elif !defined(__ARM_EABI__) && !defined(__mips__)
+         float_state_(context ? &context->float_state : NULL),
+ #endif
+         dumper_(dumper),
+@@ -337,6 +339,8 @@ class MicrodumpWriter {
+ # else
+ #  error "This mips ABI is currently not supported (n32)"
+ #endif
++#elif defined(__powerpc64__)
++    const char kArch[] = "ppc64";
+ #else
+ #error "This code has not been ported to your platform yet"
+ #endif
+@@ -409,7 +413,9 @@ class MicrodumpWriter {
+   void DumpCPUState() {
+     RawContextCPU cpu;
+     my_memset(&cpu, 0, sizeof(RawContextCPU));
+-#if !defined(__ARM_EABI__) && !defined(__mips__)
++#if defined(__powerpc64__)
++    UContextReader::FillCPUContext(&cpu, ucontext_, vector_state_);
++#elif !defined(__ARM_EABI__) && !defined(__mips__)
+     UContextReader::FillCPUContext(&cpu, ucontext_, float_state_);
+ #else
+     UContextReader::FillCPUContext(&cpu, ucontext_);
+@@ -605,7 +611,9 @@ class MicrodumpWriter {
+   void* Alloc(unsigned bytes) { return dumper_->allocator()->Alloc(bytes); }
+ 
+   const ucontext_t* const ucontext_;
+-#if !defined(__ARM_EABI__) && !defined(__mips__)
++#if defined(__powerpc64__)
++  const google_breakpad::vstate_t* const vector_state_;
++#elif !defined(__ARM_EABI__) && !defined(__mips__)
+   const google_breakpad::fpstate_t* const float_state_;
+ #endif
+   LinuxDumper* dumper_;
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/microdump_writer/microdump_writer_unittest.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/microdump_writer/microdump_writer_unittest.cc
+@@ -279,10 +279,19 @@ TEST(MicrodumpWriterTest, BasicWithMappi
+   CrashAndGetMicrodump(mappings, MicrodumpExtraInfo(), &buf);
+   ASSERT_TRUE(ContainsMicrodump(buf));
+ 
++  int page_size = getpagesize();
+ #ifdef __LP64__
+-  ASSERT_NE(std::string::npos,
+-            buf.find("M 0000000000001000 000000000000002A 0000000000001000 "
+-                     "33221100554477668899AABBCCDDEEFF0 libfoo.so"));
++  // This test is only available for the following page sizes
++  ASSERT_TRUE((page_size == 4096) || (page_size == 65536));
++  if (page_size == 4096) {
++    ASSERT_NE(std::string::npos,
++              buf.find("M 0000000000001000 000000000000002A 0000000000001000 "
++                       "33221100554477668899AABBCCDDEEFF0 libfoo.so"));
++  } else {
++    ASSERT_NE(std::string::npos,
++              buf.find("M 0000000000010000 000000000000002A 0000000000010000 "
++                       "33221100554477668899AABBCCDDEEFF0 libfoo.so"));
++  }
+ #else
+   ASSERT_NE(std::string::npos,
+             buf.find("M 00001000 0000002A 00001000 "
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_core_dumper.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_core_dumper.cc
+@@ -117,6 +117,9 @@ bool LinuxCoreDumper::GetThreadInfoByInd
+ #elif defined(__mips__)
+   stack_pointer =
+       reinterpret_cast<uint8_t*>(info->mcontext.gregs[MD_CONTEXT_MIPS_REG_SP]);
++#elif defined(__powerpc64__)
++  stack_pointer =
++      reinterpret_cast<uint8_t*>(info->mcontext.gp_regs[MD_CONTEXT_PPC64_REG_SP]);
+ #else
+ #error "This code hasn't been ported to your platform yet."
+ #endif
+@@ -212,7 +215,10 @@ bool LinuxCoreDumper::EnumerateThreads()
+         memset(&info, 0, sizeof(ThreadInfo));
+         info.tgid = status->pr_pgrp;
+         info.ppid = status->pr_ppid;
+-#if defined(__mips__)
++#if defined(__powerpc64__)
++        for (int i = 0; i < 31; i++)
++            info.mcontext.gp_regs[i] = status->pr_reg[i];
++#elif defined(__mips__)
+ #if defined(__ANDROID__)
+         for (int i = EF_R0; i <= EF_R31; i++)
+           info.mcontext.gregs[i - EF_R0] = status->pr_reg[i];
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper.cc
+@@ -765,7 +765,9 @@ bool LinuxDumper::GetStackInfo(const voi
+       reinterpret_cast<uint8_t*>(int_stack_pointer & ~(page_size - 1));
+ 
+   // The number of bytes of stack which we try to capture.
+-  static const ptrdiff_t kStackToCapture = 32 * 1024;
++  // This now depends on page_size to avoid missing data
++  // on systems with larger page sizes.
++  static const ptrdiff_t kStackToCapture = 8 * page_size;
+ 
+   const MappingInfo* mapping = FindMapping(stack_pointer);
+   if (!mapping)
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper.h
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper.h
+@@ -63,7 +63,8 @@ namespace google_breakpad {
+  (defined(__mips__) && _MIPS_SIM == _ABIO32)
+ typedef Elf32_auxv_t elf_aux_entry;
+ #elif defined(__x86_64) || defined(__aarch64__) || \
+-     (defined(__mips__) && _MIPS_SIM != _ABIO32)
++     (defined(__mips__) && _MIPS_SIM != _ABIO32) || \
++     defined(__powerpc64__)
+ typedef Elf64_auxv_t elf_aux_entry;
+ #endif
+ 
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper_unittest_helper.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper_unittest_helper.cc
+@@ -51,6 +51,8 @@
+ #define TID_PTR_REGISTER "rcx"
+ #elif defined(__mips__)
+ #define TID_PTR_REGISTER "$1"
++#elif defined(__powerpc64__)
++#define TID_PTR_REGISTER "r8"
+ #else
+ #error This test has not been ported to this platform.
+ #endif
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper.cc
+@@ -154,19 +154,27 @@ bool LinuxPtraceDumper::CopyFromProcess(
+   return true;
+ }
+ 
+-bool LinuxPtraceDumper::ReadRegisterSet(ThreadInfo* info, pid_t tid)
+-{
++bool LinuxPtraceDumper::ReadRegisterSet(ThreadInfo* info, pid_t tid) {
+ #ifdef PTRACE_GETREGSET
+   struct iovec io;
+   info->GetGeneralPurposeRegisters(&io.iov_base, &io.iov_len);
+-  if (sys_ptrace(PTRACE_GETREGSET, tid, (void*)NT_PRSTATUS, (void*)&io) == -1) {
++  if (ptrace(PTRACE_GETREGSET, tid, (void*)NT_PRSTATUS, (void*)&io) == -1) {
+     return false;
+   }
+ 
+   info->GetFloatingPointRegisters(&io.iov_base, &io.iov_len);
+-  if (sys_ptrace(PTRACE_GETREGSET, tid, (void*)NT_FPREGSET, (void*)&io) == -1) {
++  if (ptrace(PTRACE_GETREGSET, tid, (void*)NT_FPREGSET, (void*)&io) == -1) {
+     return false;
+   }
++
++#if defined(__powerpc64__)
++  // Grab the vector registers on PPC64 too
++  info->GetVectorRegisters(&io.iov_base, &io.iov_len);
++  if (ptrace(PTRACE_GETREGSET, tid, (void*)NT_PPC_VMX, (void*)&io) == -1) {
++    return false;
++  }
++#endif // defined(__powerpc64__)
++
+   return true;
+ #else
+   return false;
+@@ -303,6 +311,9 @@ bool LinuxPtraceDumper::GetThreadInfoByI
+ #elif defined(__mips__)
+   stack_pointer =
+       reinterpret_cast<uint8_t*>(info->mcontext.gregs[MD_CONTEXT_MIPS_REG_SP]);
++#elif defined(__powerpc64__)
++  stack_pointer =
++      reinterpret_cast<uint8_t*>(info->mcontext.gp_regs[MD_CONTEXT_PPC64_REG_SP]);
+ #else
+ #error "This code hasn't been ported to your platform yet."
+ #endif
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper_unittest.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper_unittest.cc
+@@ -462,6 +462,9 @@ TEST(LinuxPtraceDumperTest, VerifyStackR
+ #elif defined(__mips__)
+     pid_t* process_tid_location =
+         reinterpret_cast<pid_t*>(one_thread.mcontext.gregs[1]);
++#elif defined(__powerpc64__)
++    pid_t* process_tid_location =
++        reinterpret_cast<pid_t*>(one_thread.mcontext.gp_regs[8]);
+ #else
+ #error This test has not been ported to this platform.
+ #endif
+@@ -559,6 +562,8 @@ TEST_F(LinuxPtraceDumperTest, SanitizeSt
+   uintptr_t heap_addr = thread_info.regs.rcx;
+ #elif defined(__mips__)
+   uintptr_t heap_addr = thread_info.mcontext.gregs[1];
++#elif defined(__powerpc64__)
++  uintptr_t heap_addr = thread_info.mcontext.gp_regs[8];
+ #else
+ #error This test has not been ported to this platform.
+ #endif
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.cc
+@@ -136,7 +136,9 @@ class MinidumpWriter {
+       : fd_(minidump_fd),
+         path_(minidump_path),
+         ucontext_(context ? &context->context : NULL),
+-#if !defined(__ARM_EABI__) && !defined(__mips__)
++#if defined(__powerpc64__)
++        vector_state_(context ? &context->vector_state : NULL),
++#elif !defined(__ARM_EABI__) && !defined(__mips__)
+         float_state_(context ? &context->float_state : NULL),
+ #endif
+         dumper_(dumper),
+@@ -468,7 +470,9 @@ class MinidumpWriter {
+         if (!cpu.Allocate())
+           return false;
+         my_memset(cpu.get(), 0, sizeof(RawContextCPU));
+-#if !defined(__ARM_EABI__) && !defined(__mips__)
++#if defined(__powerpc64__)
++        UContextReader::FillCPUContext(cpu.get(), ucontext_, vector_state_);
++#elif !defined(__ARM_EABI__) && !defined(__mips__)
+         UContextReader::FillCPUContext(cpu.get(), ucontext_, float_state_);
+ #else
+         UContextReader::FillCPUContext(cpu.get(), ucontext_);
+@@ -897,7 +901,7 @@ class MinidumpWriter {
+     dirent->location.rva = 0;
+   }
+ 
+-#if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
++#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || defined(__powerpc64__)
+   bool WriteCPUInformation(MDRawSystemInfo* sys_info) {
+     char vendor_id[sizeof(sys_info->cpu.x86_cpu_info.vendor_id) + 1] = {0};
+     static const char vendor_id_name[] = "vendor_id";
+@@ -917,7 +921,9 @@ class MinidumpWriter {
+ 
+     // processor_architecture should always be set, do this first
+     sys_info->processor_architecture =
+-#if defined(__mips__)
++#if defined(__powerpc64__)
++        MD_CPU_ARCHITECTURE_PPC64;
++#elif defined(__mips__)
+ # if _MIPS_SIM == _ABIO32
+         MD_CPU_ARCHITECTURE_MIPS;
+ # elif _MIPS_SIM == _ABI64
+@@ -1333,7 +1339,9 @@ class MinidumpWriter {
+   const char* path_;  // Path to the file where the minidum should be written.
+ 
+   const ucontext_t* const ucontext_;  // also from the signal handler
+-#if !defined(__ARM_EABI__) && !defined(__mips__)
++#if defined(__powerpc64__)
++  const google_breakpad::vstate_t* const vector_state_;
++#elif !defined(__ARM_EABI__) && !defined(__mips__)
+   const google_breakpad::fpstate_t* const float_state_;  // ditto
+ #endif
+   LinuxDumper* dumper_;
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.h
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.h
+@@ -48,6 +48,8 @@ class ExceptionHandler;
+ 
+ #if defined(__aarch64__)
+ typedef struct fpsimd_context fpstate_t;
++#elif defined(__powerpc64__)
++typedef vrregset_t vstate_t;
+ #elif !defined(__ARM_EABI__) && !defined(__mips__)
+ typedef std::remove_pointer<fpregset_t>::type fpstate_t;
+ #endif
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer_unittest.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer_unittest.cc
+@@ -715,6 +715,12 @@ TEST(MinidumpWriterTest, InvalidStackPoi
+ #elif defined(__mips__)
+   context.context.uc_mcontext.gregs[MD_CONTEXT_MIPS_REG_SP] =
+       invalid_stack_pointer;
++#elif defined(__powerpc64__)
++  context.context.uc_mcontext.gp_regs[MD_CONTEXT_PPC64_REG_SP] =
++      invalid_stack_pointer;
++#elif defined(__powerpc64__)
++  context.context.uc_mcontext.gp_regs[MD_CONTEXT_PPC64_REG_SP] =
++      invalid_stack_pointer;
+ #else
+ # error "This code has not been ported to your platform yet."
+ #endif
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/common/linux/memory_mapped_file.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/common/linux/memory_mapped_file.cc
+@@ -65,8 +65,7 @@ bool MemoryMappedFile::Map(const char* p
+   }
+ 
+ #if defined(__x86_64__) || defined(__aarch64__) || \
+-   (defined(__mips__) && _MIPS_SIM == _ABI64)
+-
++   (defined(__mips__) && _MIPS_SIM == _ABI64) || defined(__powerpc64__)
+   struct kernel_stat st;
+   if (sys_fstat(fd, &st) == -1 || st.st_size < 0) {
+ #else
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/common/linux/memory_mapped_file_unittest.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/common/linux/memory_mapped_file_unittest.cc
+@@ -176,9 +176,10 @@ TEST_F(MemoryMappedFileTest, RemapAfterM
+ TEST_F(MemoryMappedFileTest, MapWithOffset) {
+   // Put more data in the test file this time. Offsets can only be
+   // done on page boundaries, so we need a two page file to test this.
+-  const int page_size = 4096;
+-  char data1[2 * page_size];
+-  size_t data1_size = sizeof(data1);
++  const int page_size = getpagesize();
++  char *data1 = static_cast<char*>(malloc(2 * page_size));
++  EXPECT_TRUE(data1 != NULL);
++  size_t data1_size = (2 * page_size);
+   for (size_t i = 0; i < data1_size; ++i) {
+     data1[i] = i & 0x7f;
+   }
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/common/memory_allocator_unittest.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/common/memory_allocator_unittest.cc
+@@ -57,8 +57,9 @@ TEST(PageAllocatorTest, LargeObject) {
+ 
+   EXPECT_EQ(0U, allocator.pages_allocated());
+   uint8_t* p = reinterpret_cast<uint8_t*>(allocator.Alloc(10000));
++  uint64_t expected_pages = 1 + ((10000 - 1) / getpagesize());
+   ASSERT_FALSE(p == NULL);
+-  EXPECT_EQ(3U, allocator.pages_allocated());
++  EXPECT_EQ(expected_pages, allocator.pages_allocated());
+   for (unsigned i = 1; i < 10; ++i) {
+     uint8_t* p = reinterpret_cast<uint8_t*>(allocator.Alloc(i));
+     ASSERT_FALSE(p == NULL);
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/processor/exploitability_linux.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/processor/exploitability_linux.cc
+@@ -202,12 +202,14 @@ bool ExploitabilityLinux::EndedOnIllegal
+   // Check architecture and set architecture variable to corresponding flag
+   // in objdump.
+   switch (context->GetContextCPU()) {
++#if defined(__i386) || defined(__x86_64)
+     case MD_CONTEXT_X86:
+       architecture = "i386";
+       break;
+     case MD_CONTEXT_AMD64:
+       architecture = "i386:x86-64";
+       break;
++#endif
+     default:
+       // Unsupported architecture. Note that ARM architectures are not
+       // supported because objdump does not support ARM.
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/processor/exploitability_unittest.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/processor/exploitability_unittest.cc
+@@ -104,6 +104,8 @@ ExploitabilityFor(const string& filename
+ }
+ 
+ TEST(ExploitabilityTest, TestWindowsEngine) {
++// The following tests are only executable on an x86-class linux machine.
++#if !defined(_WIN32) && (defined(__i386) || defined(__x86_64))
+   ASSERT_EQ(google_breakpad::EXPLOITABILITY_HIGH,
+             ExploitabilityFor("ascii_read_av.dmp"));
+   ASSERT_EQ(google_breakpad::EXPLOITABILITY_HIGH,
+@@ -136,9 +138,12 @@ TEST(ExploitabilityTest, TestWindowsEngi
+             ExploitabilityFor("read_av_clobber_write.dmp"));
+   ASSERT_EQ(google_breakpad::EXPLOITABILITY_LOW,
+             ExploitabilityFor("read_av_conditional.dmp"));
++#endif
+ }
+ 
+ TEST(ExploitabilityTest, TestLinuxEngine) {
++// The following tests are only executable on an x86-class linux machine.
++#if defined(__i386) || defined(__x86_64)
+   ASSERT_EQ(google_breakpad::EXPLOITABILITY_INTERESTING,
+             ExploitabilityFor("linux_null_read_av.dmp"));
+   ASSERT_EQ(google_breakpad::EXPLOITABILITY_HIGH,
+@@ -171,7 +176,8 @@ TEST(ExploitabilityTest, TestLinuxEngine
+             ExploitabilityFor("linux_executable_heap.dmp"));
+   ASSERT_EQ(google_breakpad::EXPLOITABILITY_HIGH,
+             ExploitabilityFor("linux_jmp_to_module_not_exe_region.dmp"));
+-#ifndef _WIN32
++#endif
++#if !defined(_WIN32) && (defined(__i386) || defined(__x86_64))
+   ASSERT_EQ(google_breakpad::EXPLOITABILITY_HIGH,
+             ExploitabilityFor("linux_write_to_nonwritable_module.dmp"));
+   ASSERT_EQ(google_breakpad::EXPLOITABILITY_HIGH,
+@@ -182,10 +188,10 @@ TEST(ExploitabilityTest, TestLinuxEngine
+             ExploitabilityFor("linux_write_to_outside_module_via_math.dmp"));
+   ASSERT_EQ(google_breakpad::EXPLOITABILITY_INTERESTING,
+             ExploitabilityFor("linux_write_to_under_4k.dmp"));
+-#endif  // _WIN32
++#endif  // !defined(_WIN32) && (!defined(__i386) && !defined(__x86_64))
+ }
+ 
+-#ifndef _WIN32
++#if !defined(_WIN32) && (defined(__i386) || defined(__x86_64))
+ TEST(ExploitabilityLinuxUtilsTest, DisassembleBytesTest) {
+   ASSERT_FALSE(ExploitabilityLinuxTest::DisassembleBytes("", NULL, 5, NULL));
+   uint8_t bytes[6] = {0xc7, 0x0, 0x5, 0x0, 0x0, 0x0};
+@@ -301,6 +307,7 @@ TEST(ExploitabilityLinuxUtilsTest, Calcu
+                                                          context,
+                                                          &write_address));
+ }
+-#endif  // _WIN32
++#endif  // !defined(_WIN32) && (defined(__i386) || defined(__x86_64))
++
+ 
+ }  // namespace
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/tools/linux/md2core/minidump-2-core.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/tools/linux/md2core/minidump-2-core.cc
+@@ -77,6 +77,8 @@
+   #define ELF_ARCH  EM_MIPS
+ #elif defined(__aarch64__)
+   #define ELF_ARCH  EM_AARCH64
++#elif defined(__powerpc64__)
++  #define ELF_ARCH  EM_PPC64
+ #endif
+ 
+ #if defined(__arm__)
+@@ -87,6 +89,8 @@ typedef user_regs user_regs_struct;
+ #elif defined (__mips__)
+ // This file-local typedef simplifies the source code.
+ typedef gregset_t user_regs_struct;
++#elif defined(__powerpc64__)
++typedef struct pt_regs user_regs_struct;
+ #endif
+ 
+ using google_breakpad::MDTypeHelper;
+@@ -322,6 +326,12 @@ struct CrashedProcess {
+ #if defined(__aarch64__)
+     user_fpsimd_struct fpregs;
+ #endif
++#if defined(__powerpc64__)
++    mcontext_t mcontext;
++#endif
++#if defined(__powerpc64__)
++    mcontext_t mcontext;
++#endif
+     uintptr_t stack_addr;
+     const uint8_t* stack;
+     size_t stack_length;
+@@ -535,6 +545,38 @@ ParseThreadRegisters(CrashedProcess::Thr
+   thread->mcontext.fpc_eir = rawregs->float_save.fir;
+ #endif
+ }
++#elif defined(__powerpc64__)
++static void
++ParseThreadRegisters(CrashedProcess::Thread* thread,
++                     const MinidumpMemoryRange& range) {
++  const MDRawContextPPC64* rawregs = range.GetData<MDRawContextPPC64>(0);
++
++  for (int i = 0; i < MD_CONTEXT_PPC64_GPR_COUNT; i++)
++    thread->mcontext.gp_regs[i] = rawregs->gpr[i];
++
++  thread->mcontext.gp_regs[PT_LNK] = rawregs->lr;
++  thread->mcontext.gp_regs[PT_NIP] = rawregs->srr0;
++  thread->mcontext.gp_regs[PT_MSR] = rawregs->srr1;
++  thread->mcontext.gp_regs[PT_CCR] = rawregs->cr;
++  thread->mcontext.gp_regs[PT_XER] = rawregs->xer;
++  thread->mcontext.gp_regs[PT_CTR] = rawregs->ctr;
++  thread->mcontext.v_regs->vrsave = rawregs->vrsave;
++
++  for (int i = 0; i < MD_FLOATINGSAVEAREA_PPC_FPR_COUNT; i++)
++      thread->mcontext.fp_regs[i] = rawregs->float_save.fpregs[i];
++
++  thread->mcontext.fp_regs[NFPREG-1] = rawregs->float_save.fpscr;
++
++  for (int i = 0; i < MD_VECTORSAVEAREA_PPC_VR_COUNT; i++) {
++      thread->mcontext.v_regs->vrregs[i][0] = rawregs->vector_save.save_vr[i].high >> 32;
++      thread->mcontext.v_regs->vrregs[i][1] = rawregs->vector_save.save_vr[i].high;
++      thread->mcontext.v_regs->vrregs[i][2] = rawregs->vector_save.save_vr[i].low >> 32;
++      thread->mcontext.v_regs->vrregs[i][3] = rawregs->vector_save.save_vr[i].low;
++  }
++
++  thread->mcontext.v_regs->vscr.vscr_word = rawregs->vector_save.save_vscr.low & 0xFFFFFFFF;
++}
++
+ #else
+ #error "This code has not been ported to your platform yet"
+ #endif
+@@ -623,6 +665,12 @@ ParseSystemInfo(const Options& options,
+ # else
+ #  error "This mips ABI is currently not supported (n32)"
+ # endif
++#elif defined(__powerpc64__)
++  if (sysinfo->processor_architecture != MD_CPU_ARCHITECTURE_PPC64) {
++    fprintf(stderr,
++            "This version of minidump-2-core only supports PPC64.\n");
++    exit(1);
++  }
+ #else
+ #error "This code has not been ported to your platform yet"
+ #endif
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/CONTRIBUTORS
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/CONTRIBUTORS
+@@ -13,3 +13,4 @@ Mark Mentovai <mark@chromium.org>
+ Robert Sesek <rsesek@chromium.org>
+ Scott Graham <scottmg@chromium.org>
+ Joshua Peraza <jperaza@chromium.org>
++Shawn Anastasio <shawn@anastas.io>
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/compat/linux/sys/user.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/compat/linux/sys/user.h
+@@ -15,6 +15,7 @@
+ #ifndef CRASHPAD_COMPAT_LINUX_SYS_USER_H_
+ #define CRASHPAD_COMPAT_LINUX_SYS_USER_H_
+ 
++#include <cstddef>
+ #include_next <sys/user.h>
+ 
+ #include <features.h>
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/minidump/minidump_context.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/minidump/minidump_context.h
+@@ -592,6 +592,70 @@ struct MinidumpContextMIPS64 {
+   uint64_t fir;
+ };
+ 
++//! \brief ppc64-specific flags for MinidumpPPC64::context_flags
++//! Based on minidump_cpu_ppc64.h from breakpad
++enum MinidumpContextPPC64Flags : uint32_t {
++  //! \brief Identifies the context as PPC64.
++  kMinidumpContextPPC64 = 0x01000000,
++
++  //! \brief Indicates the validity of general purpose registers.
++  //!
++  //! Registers `r0`-`r31`, `nip`, `msr`, `lr`, etc. are valid.
++  kMinidumpContextPPC64Base = kMinidumpContextPPC64 | 0x00000001,
++
++  //! \brief Indicates the validity of floating point registers.
++  //!
++  //! Registers `fp0`-`fp31`, `fpscr` are valid.
++  kMinidumpContextPPC64Floating = kMinidumpContextPPC64 | 0x00000008,
++
++  //! \brief Indicates the validity of Altivec/VMX registers.
++  //!
++  //! Registers `v0`-`v31`, `vscr`, `vrsave`.
++  kMinidumpContextPPC64Vector = kMinidumpContextPPC64 | 0x00000020,
++
++  //! \brief Indicates the validity of all registers
++  kMinidumpContextPPC64All = kMinidumpContextPPC64Base     |
++                             kMinidumpContextPPC64Floating |
++                             kMinidumpContextPPC64Vector
++};
++
++//! \brief A PPC64 CPU context carried in a minidump file.
++//! Based on minidump_cpu_ppc64.h from breakpad.
++struct MinidumpContextPPC64 {
++  uint64_t context_flags;
++
++  //! \brief General purpose registers.
++  uint64_t nip;
++  uint64_t msr;
++  uint64_t regs[32];
++  uint64_t ccr;
++  uint64_t xer;
++  uint64_t lnk;
++  uint64_t ctr;
++
++  //! \brief Floating point registers.
++  double fpregs[32];
++
++  //! \brief FPU status register.
++  double fpscr;
++
++  //! \brief Altivec/VMX vector registers.
++  struct {
++      //! \brief Vector registers are 128bits.
++      uint128_struct save_vr[32];
++      uint128_struct save_vscr;
++
++      //! \brief Padding included for breakpad compatibiltiy.
++      uint32_t save_pad5[4];
++
++      //! \brief VRSAVE register.
++      uint32_t save_vrsave;
++
++      //! \brief Padding included for breakpad compatibiltiy.
++      uint32_t save_pad6[7];
++  } vregs;
++};
++
+ }  // namespace crashpad
+ 
+ #endif  // CRASHPAD_MINIDUMP_MINIDUMP_CONTEXT_H_
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/minidump/minidump_context_writer.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/minidump/minidump_context_writer.cc
+@@ -101,6 +101,13 @@ MinidumpContextWriter::CreateFromSnapsho
+       break;
+     }
+ 
++    case kCPUArchitecturePPC64: {
++      context = std::make_unique<MinidumpContextPPC64Writer>();
++      reinterpret_cast<MinidumpContextPPC64Writer*>(context.get())
++          ->InitalizeFromSnapshot(context_snapshot->ppc64);
++      break;
++    }
++
+     default: {
+       LOG(ERROR) << "unknown context architecture "
+                  << context_snapshot->architecture;
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/minidump/minidump_context_writer.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/minidump/minidump_context_writer.h
+@@ -315,6 +315,45 @@ class MinidumpContextMIPS64Writer final
+   DISALLOW_COPY_AND_ASSIGN(MinidumpContextMIPS64Writer);
+ };
+ 
++class MinidumpContextPPC64Writer final : public MinidumpContextWriter {
++ public:
++  MinidumpContextPPC64Writer();
++  ~MinidumpContextPPC64Writer() override;
++
++  //! \brief Initalizes the MinidumpContextPPC64 based on \a context_snapshot.
++  //!
++  //! \param[in] context_snapshot The context snapshot to use as source data.
++  //!
++  //! \note Valid in #kStateMutable. No mutation of context() may be done before
++  //!     calling this method, and it is not normally necessary to alter
++  //!     context() after calling this method.
++  void InitalizeFromSnapshot(const CPUContextPPC64* context_snapshot);
++
++  //! \brief Returns a pointer to the context structure that this object will
++  //!     write.
++  //!
++  //! \attention This returns a non-`const` pointer to this object’s private
++  //!     data so that a caller can populate the context structure directly.
++  //!     This is done because providing setter interfaces to each field in the
++  //!     context structure would be unwieldy and cumbersome. Care must be taken
++  //!     to populate the context structure correctly. The context structure
++  //!     must only be modified while this object is in the #kStateMutable
++  //!     state.
++  MinidumpContextPPC64* context() { return &context_; }
++
++ protected:
++  // MinidumpWritable:
++  bool WriteObject(FileWriterInterface* file_writer) override;
++
++  // MinidumpContextWriter:
++  size_t ContextSize() const override;
++
++ private:
++  MinidumpContextPPC64 context_;
++
++  DISALLOW_COPY_AND_ASSIGN(MinidumpContextPPC64Writer);
++};
++
+ }  // namespace crashpad
+ 
+ #endif  // CRASHPAD_MINIDUMP_MINIDUMP_CONTEXT_WRITER_H_
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/minidump/minidump_context_writer_test.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/minidump/minidump_context_writer_test.cc
+@@ -213,6 +213,21 @@ TEST(MinidumpContextWriter, MIPS64_FromS
+       context, ExpectMinidumpContextMIPS64, kSeed);
+ }
+ 
++TEST(MinidumpContextWriter, PPC64_Zeros) {
++  EmptyContextTest<MinidumpContextPPC64Writer, MinidumpContextPPC64>(
++    ExpectMinidumpContextPPC64);
++}
++
++TEST(MinidumpContextWriter, PPC64_FromSnapshot) {
++  constexpr uint32_t kSeed = 64;
++  CPUContextPPC64 context_ppc64;
++  CPUContext context;
++  context.ppc64 = &context_ppc64;
++  InitializeCPUContextPPC64(&context, kSeed);
++  FromSnapshotTest<MinidumpContextPPC64Writer, MinidumpContextPPC64>(
++      context, ExpectMinidumpContextPPC64, kSeed);
++}
++
+ }  // namespace
+ }  // namespace test
+ }  // namespace crashpad
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/minidump/minidump_misc_info_writer.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/minidump/minidump_misc_info_writer.cc
+@@ -135,6 +135,8 @@ std::string MinidumpMiscInfoDebugBuildSt
+   static constexpr char kCPU[] = "mips";
+ #elif defined(ARCH_CPU_MIPS64EL)
+   static constexpr char kCPU[] = "mips64";
++#elif defined(ARCH_CPU_PPC64)
++  static constexpr char kCPU[] = "ppc64";
+ #else
+ #error define kCPU for this CPU
+ #endif
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/capture_memory.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/capture_memory.cc
+@@ -112,6 +112,11 @@ void CaptureMemory::PointedToByContext(c
+   for (size_t i = 0; i < base::size(context.mipsel->regs); ++i) {
+     MaybeCaptureMemoryAround(delegate, context.mipsel->regs[i]);
+   }
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++  MaybeCaptureMemoryAround(delegate, context.ppc64->nip);
++  for (size_t i = 0; i < base::size(context.ppc64->regs); ++i) {
++    MaybeCaptureMemoryAround(delegate, context.ppc64->regs[i]);
++  }
+ #else
+ #error Port.
+ #endif
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/cpu_architecture.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/cpu_architecture.h
+@@ -43,7 +43,10 @@ enum CPUArchitecture {
+   kCPUArchitectureMIPSEL,
+ 
+   //! \brief 64-bit MIPSEL.
+-  kCPUArchitectureMIPS64EL
++  kCPUArchitectureMIPS64EL,
++
++  //! \brief 64-bit PPC64.
++  kCPUArchitecturePPC64
+ };
+ 
+ }  // namespace crashpad
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/cpu_context.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/cpu_context.cc
+@@ -169,6 +169,8 @@ uint64_t CPUContext::InstructionPointer(
+       return arm->pc;
+     case kCPUArchitectureARM64:
+       return arm64->pc;
++    case kCPUArchitecturePPC64:
++      return ppc64->nip;
+     default:
+       NOTREACHED();
+       return ~0ull;
+@@ -185,6 +187,8 @@ uint64_t CPUContext::StackPointer() cons
+       return arm->sp;
+     case kCPUArchitectureARM64:
+       return arm64->sp;
++    case kCPUArchitecturePPC64:
++      return ppc64->regs[1];
+     default:
+       NOTREACHED();
+       return ~0ull;
+@@ -196,6 +200,7 @@ bool CPUContext::Is64Bit() const {
+     case kCPUArchitectureX86_64:
+     case kCPUArchitectureARM64:
+     case kCPUArchitectureMIPS64EL:
++    case kCPUArchitecturePPC64:
+       return true;
+     case kCPUArchitectureX86:
+     case kCPUArchitectureARM:
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/cpu_context.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/cpu_context.h
+@@ -352,6 +352,24 @@ struct CPUContextMIPS64 {
+   uint64_t fir;
+ };
+ 
++//! \brief A context structure carrying PPC64 CPU state.
++struct CPUContextPPC64 {
++  uint64_t nip;
++  uint64_t msr;
++  uint64_t regs[32];
++  uint64_t ccr;
++  uint64_t xer;
++  uint64_t lnk;
++  uint64_t ctr;
++  double fpregs[32];
++  double fpscr;
++  struct {
++    uint128_struct save_vr[32];
++    uint128_struct save_vscr;
++    uint32_t save_vrsave;
++  } vregs;
++};
++
+ //! \brief A context structure capable of carrying the context of any supported
+ //!     CPU architecture.
+ struct CPUContext {
+@@ -382,6 +400,7 @@ struct CPUContext {
+     CPUContextARM64* arm64;
+     CPUContextMIPS* mipsel;
+     CPUContextMIPS64* mips64;
++    CPUContextPPC64* ppc64;
+   };
+ };
+ 
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/cpu_context_linux.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/cpu_context_linux.h
+@@ -15,6 +15,7 @@
+ #ifndef CRASHPAD_SNAPSHOT_LINUX_CPU_CONTEXT_LINUX_H_
+ #define CRASHPAD_SNAPSHOT_LINUX_CPU_CONTEXT_LINUX_H_
+ 
++#include <cstring>
+ #include "build/build_config.h"
+ #include "snapshot/cpu_context.h"
+ #include "snapshot/linux/signal_context.h"
+@@ -174,6 +175,76 @@ void InitializeCPUContextMIPS(
+ 
+ #endif  // ARCH_CPU_MIPS_FAMILY || DOXYGEN
+ 
++#if defined(ARCH_CPU_PPC64_FAMILY) || DOXYGEN
++
++//! \brief Initalizes a CPUContextPPC64 structure from native context
++//!     structures on Linux.
++//!
++//! \param[in] thread_context The native thread context.
++//! \param[in] float_context The native float context.
++//! \param[in] vector_context The native vector context.
++//! \param[out] context The CPUContextPPC64 structure to initalize.
++template <typename Traits>
++void InitializeCPUContextPPC64(
++    const ThreadContext::t64_t& thread_context,
++    const FloatContext::f64_t& float_context,
++    const VectorContext::v64_t& vector_context,
++    typename Traits::CPUContext* context) {
++
++  memcpy(context->regs, thread_context.gpr, sizeof(context->regs));
++  context->nip = thread_context.nip;
++  context->msr = thread_context.msr;
++  context->ccr = thread_context.ccr;
++  context->xer = thread_context.xer;
++  context->lnk = thread_context.lnk;
++  context->ctr = thread_context.ctr;
++
++  memcpy(context->fpregs, float_context.fpregs, sizeof(context->fpregs));
++  context->fpscr = float_context.fpscr;
++
++  for (uint8_t i = 0; i < 32; i++) {
++    context->vregs.save_vr[i] = {
++      (((uint64_t)vector_context.vrregs[i][0]) << 32) |
++        vector_context.vrregs[i][1],
++      (((uint64_t)vector_context.vrregs[i][2]) << 32) |
++        vector_context.vrregs[i][3]
++    };
++  }
++  context->vregs.save_vrsave = vector_context.vrsave;
++  context->vregs.save_vscr = {0, (uint64_t)vector_context.vscr.vscr_word};
++}
++
++template <typename Traits>
++void InitializeCPUContextPPC64(
++    const SignalThreadContext64 &thread_context,
++    const SignalFloatContext64 &float_context,
++    const SignalVectorContext64 &vector_context,
++    typename Traits::CPUContext* context) {
++
++  memcpy(context->regs, thread_context.regs, sizeof(context->regs));
++  context->nip = thread_context.nip;
++  context->msr = thread_context.msr;
++  context->ccr = thread_context.ccr;
++  context->xer = thread_context.xer;
++  context->lnk = thread_context.lnk;
++  context->ctr = thread_context.ctr;
++
++  memcpy(context->fpregs, float_context.regs, sizeof(context->fpregs));
++  context->fpscr = float_context.fpscr;
++
++  for (uint8_t i = 0; i < 32; i++) {
++    context->vregs.save_vr[i] = {
++      (((uint64_t)vector_context.vrregs[i][0]) << 32) |
++        vector_context.vrregs[i][1],
++      (((uint64_t)vector_context.vrregs[i][2]) << 32) |
++        vector_context.vrregs[i][3]
++    };
++  }
++  context->vregs.save_vrsave = vector_context.vrsave;
++  context->vregs.save_vscr = {0, (uint64_t)vector_context.vscr.vscr_word};
++}
++
++#endif
+ }  // namespace internal
+ }  // namespace crashpad
+ 
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/debug_rendezvous_test.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/debug_rendezvous_test.cc
+@@ -192,6 +192,8 @@ void TestAgainstTarget(PtraceConnection*
+               device == 0 && inode == 0 && mapping_name == "[vdso]";
+ #if defined(ARCH_CPU_X86)
+           static constexpr char kPrefix[] = "linux-gate.so.";
++#elif defined(ARCH_CPU_PPC64)
++          static constexpr char kPrefix[] = "linux-vdso64.so.";
+ #else
+           static constexpr char kPrefix[] = "linux-vdso.so.";
+ #endif
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux.cc
+@@ -323,6 +323,69 @@ bool ExceptionSnapshotLinux::ReadContext
+       reader, context_address, context_.mips64);
+ }
+ 
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++
++template <typename Traits>
++static bool ReadContext(ProcessReaderLinux* reader,
++                        LinuxVMAddress context_address,
++                        typename Traits::CPUContext* dest_context) {
++  const ProcessMemory* memory = reader->Memory();
++
++  LinuxVMAddress gp_regs_address = context_address +
++                                   offsetof(UContext, mcontext) +
++                                   offsetof(typename Traits::MContext, gp_regs);
++
++  typename Traits::SignalThreadContext thread_context;
++  if (!memory->Read(gp_regs_address, sizeof(thread_context), &thread_context)) {
++    LOG(ERROR) << "Couldn't read gp_regs!";
++    return false;
++  }
++
++  LinuxVMAddress fp_regs_address = context_address +
++                                   offsetof(UContext, mcontext) +
++                                   offsetof(typename Traits::MContext, fp_regs);
++
++  typename Traits::SignalFloatContext fp_context;
++  if (!memory->Read(fp_regs_address, sizeof(fp_context), &fp_context)) {
++    LOG(ERROR) << "Couldn't read fp_regs!";
++    return false;
++  }
++
++  LinuxVMAddress v_regs_ptr_address = context_address +
++                                  offsetof(UContext, mcontext) +
++                                  offsetof(typename Traits::MContext, vmx_reserve) + 8;
++
++  typename Traits::SignalVectorContext v_context;
++  if (!memory->Read(v_regs_ptr_address, sizeof(v_context), &v_context)) {
++    LOG(ERROR) << "Couldn't read v_regs!";
++    return false;
++  }
++
++  InitializeCPUContextPPC64<ContextTraits64>(thread_context, fp_context,
++                            v_context, dest_context);
++
++  return true;
++}
++
++template<>
++bool ExceptionSnapshotLinux::ReadContext<ContextTraits64>(
++    ProcessReaderLinux* reader,
++    LinuxVMAddress context_address) {
++  context_.architecture = kCPUArchitecturePPC64;
++  context_.ppc64 = &context_union_.ppc64;
++
++  return internal::ReadContext<ContextTraits64>(
++      reader, context_address, context_.ppc64);
++}
++
++template<>
++bool ExceptionSnapshotLinux::ReadContext<ContextTraits32>(
++    ProcessReaderLinux* reader,
++    LinuxVMAddress context_address) {
++  // PPC64 is 64-bit
++  return false;
++}
++
+ #endif  // ARCH_CPU_X86_FAMILY
+ 
+ bool ExceptionSnapshotLinux::Initialize(ProcessReaderLinux* process_reader,
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux.h
+@@ -84,6 +84,8 @@ class ExceptionSnapshotLinux final : pub
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+     CPUContextMIPS mipsel;
+     CPUContextMIPS64 mips64;
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++    CPUContextPPC64 ppc64;
+ #endif
+   } context_union_;
+   CPUContext context_;
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux_test.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux_test.cc
+@@ -296,7 +296,28 @@ void ExpectContext(const CPUContext& act
+             0);
+ #undef CPU_ARCH_NAME
+ }
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++using NativeCPUContext = ucontext_t;
+ 
++void InitializeContext(NativeCPUContext* context) {
++  for (size_t reg = 0; reg < 32; ++reg) {
++    context->uc_mcontext.gp_regs[reg] = reg;
++  }
++
++  memset(&context->uc_mcontext.fp_regs, 44,
++      sizeof(context->uc_mcontext.fp_regs));
++}
++
++void ExpectContext(const CPUContext& actual, const NativeCPUContext& expected) {
++  EXPECT_EQ(actual.architecture, kCPUArchitecturePPC64);
++
++  for (size_t reg = 0; reg < 32; ++reg) {
++    EXPECT_EQ(actual.ppc64->regs[reg], expected.uc_mcontext.gp_regs[reg]);
++  }
++
++  EXPECT_EQ(memcmp(actual.ppc64->fpregs, expected.uc_mcontext.fp_regs,
++            sizeof(actual.ppc64->fpregs)), 0);
++}
+ #else
+ #error Port.
+ #endif
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/process_reader_linux.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/process_reader_linux.cc
+@@ -108,6 +108,8 @@ void ProcessReaderLinux::Thread::Initial
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+   stack_pointer = reader->Is64Bit() ? thread_info.thread_context.t64.regs[29]
+                                     : thread_info.thread_context.t32.regs[29];
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++  stack_pointer = thread_info.thread_context.t64.gpr[1];
+ #else
+ #error Port.
+ #endif
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/signal_context.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/signal_context.h
+@@ -422,6 +422,93 @@ static_assert(offsetof(UContext<ContextT
+               "context offset mismatch");
+ #endif
+ 
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++
++struct SignalThreadContext64 {
++  uint64_t regs[32];
++  uint64_t nip;
++  uint64_t msr;
++  uint64_t orig_r3;
++  uint64_t ctr;
++  uint64_t lnk;
++  uint64_t xer;
++  uint64_t ccr;
++  uint64_t softe;
++  uint64_t trap;
++  uint64_t dar;
++  uint64_t dsisr;
++  uint64_t result;
++  uint64_t dscr;
++  uint64_t fpr0[3];
++};
++
++struct SignalFloatContext64 {
++  double regs[32];
++  double fpscr;
++};
++
++struct SignalVectorContext64 {
++  int32_t vrregs[32][4];
++  struct {
++    int32_t __pad[3];
++    int32_t vscr_word;
++  } vscr;
++  int32_t vrsave;
++  int32_t __pad[3];
++} __attribute__((__aligned__(16)));
++
++
++#pragma pack(pop)
++struct MContext64 {
++  uint64_t reserved[4];
++  int32_t signal;
++  int32_t __pad0;
++  uint64_t handler;
++  uint64_t oldmask;
++  uint64_t pt_regs_ptr;
++  SignalThreadContext64 gp_regs;
++  SignalFloatContext64  fp_regs;
++  SignalVectorContext64 *v_regs;
++#ifdef __GLIBC__
++  int64_t vmx_reserve[69];
++#else
++  int64_t vmx_reserve[101];
++#endif
++};
++
++struct ContextTraits64 : public Traits64 {
++  using MContext = MContext64;
++  using SignalThreadContext = SignalThreadContext64;
++  using SignalFloatContext = SignalFloatContext64;
++  using SignalVectorContext = SignalVectorContext64;
++  using CPUContext = CPUContextPPC64;
++};
++
++struct ContextTraits32 : public Traits32 {};
++
++struct UContext {
++  uint64_t flags;
++  uint64_t link;
++  SignalStack<ContextTraits64> stack;
++  Sigset<ContextTraits64> sigmask;
++  MContext64 mcontext;
++};
++#pragma pack(push, 1)
++
++static_assert(sizeof(UContext) == sizeof(ucontext_t),
++              "ucontext_t size mismatch");
++static_assert(sizeof(MContext64) == sizeof(mcontext_t),
++              "mcontext_t size mismatch");
++static_assert(sizeof(SignalThreadContext64) == sizeof(gregset_t),
++              "gregset_t size mismatch");
++static_assert(sizeof(SignalFloatContext64) == sizeof(fpregset_t),
++              "fpregset_t size mismatch");
++static_assert(sizeof(SignalVectorContext64) == sizeof(vrregset_t),
++              "vrregset_t size mismatch");
++static_assert(offsetof(UContext, mcontext) ==
++              offsetof(ucontext_t, uc_mcontext), "mcontext offset mismatch");
++static_assert(offsetof(MContext64, gp_regs) ==
++              offsetof(mcontext_t, gp_regs), "gp_regs offset mismatch");
+ #else
+ #error Port.
+ #endif  // ARCH_CPU_X86_FAMILY
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/system_snapshot_linux.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/system_snapshot_linux.cc
+@@ -204,6 +204,8 @@ CPUArchitecture SystemSnapshotLinux::Get
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+   return process_reader_->Is64Bit() ? kCPUArchitectureMIPS64EL
+                                     : kCPUArchitectureMIPSEL;
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++  return kCPUArchitecturePPC64;
+ #else
+ #error port to your architecture
+ #endif
+@@ -219,6 +221,9 @@ uint32_t SystemSnapshotLinux::CPURevisio
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+   // Not implementable on MIPS
+   return 0;
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++  // Not yet implemented on PPC64
++  return 0;
+ #else
+ #error port to your architecture
+ #endif
+@@ -239,6 +244,9 @@ std::string SystemSnapshotLinux::CPUVend
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+   // Not implementable on MIPS
+   return std::string();
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++  // Not yet implemented on PPC64
++  return std::string();
+ #else
+ #error port to your architecture
+ #endif
+@@ -372,6 +380,9 @@ bool SystemSnapshotLinux::NXEnabled() co
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+   // Not implementable on MIPS
+   return false;
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++  // Not yet implemented on PPC64
++  return false;
+ #else
+ #error Port.
+ #endif  // ARCH_CPU_X86_FAMILY
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/test_modules.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/test_modules.cc
+@@ -110,6 +110,8 @@ bool WriteTestModule(const base::FilePat
+   module.ehdr.e_machine = EM_AARCH64;
+ #elif defined(ARCH_CPU_MIPSEL) || defined(ARCH_CPU_MIPS64EL)
+   module.ehdr.e_machine = EM_MIPS;
++#elif defined(ARCH_CPU_PPC64)
++  module.ehdr.e_machine = EM_PPC64;
+ #endif
+ 
+   module.ehdr.e_version = EV_CURRENT;
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/thread_snapshot_linux.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/thread_snapshot_linux.cc
+@@ -186,6 +186,14 @@ bool ThreadSnapshotLinux::Initialize(Pro
+         thread.thread_info.float_context.f32,
+         context_.mipsel);
+   }
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++  context_.architecture = kCPUArchitecturePPC64;
++  context_.ppc64 = &context_union_.ppc64;
++  InitializeCPUContextPPC64<ContextTraits64>(
++      thread.thread_info.thread_context.t64,
++      thread.thread_info.float_context.f64,
++      thread.thread_info.vector_context.v64,
++      context_.ppc64);
+ #else
+ #error Port.
+ #endif
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/thread_snapshot_linux.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/thread_snapshot_linux.h
+@@ -68,6 +68,8 @@ class ThreadSnapshotLinux final : public
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+     CPUContextMIPS mipsel;
+     CPUContextMIPS64 mips64;
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++    CPUContextPPC64 ppc64;
+ #else
+ #error Port.
+ #endif  // ARCH_CPU_X86_FAMILY
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/util/linux/auxiliary_vector.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/util/linux/auxiliary_vector.cc
+@@ -56,6 +56,11 @@ bool AuxiliaryVector::Read(PtraceConnect
+     if (type == AT_IGNORE) {
+       continue;
+     }
++#if defined(ARCH_CPU_PPC64_FAMILY)
++    if (type == AT_IGNOREPPC) {
++      continue;
++    }
++#endif
+     if (!MapInsertOrReplace(&values_, type, value, nullptr)) {
+       LOG(ERROR) << "duplicate auxv entry";
+       return false;
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/util/linux/ptracer.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/util/linux/ptracer.cc
+@@ -399,6 +399,64 @@ bool GetThreadArea64(pid_t tid,
+   return true;
+ }
+ 
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++// PPC64 has had HAVE_ARCH_TRACEHOOK set since 2.6.27 (even before x86 had it).
++// That means we can simply use PTRACE_GETREGESET.
++
++template <typename Destination>
++bool GetRegisterSet(pid_t tid, int set, Destination* dest, bool can_log) {
++  iovec iov;
++  iov.iov_base = reinterpret_cast<void*>(dest);
++  iov.iov_len = sizeof(*dest);
++  if (ptrace(PTRACE_GETREGSET, tid, reinterpret_cast<void*>(set), &iov) != 0) {
++    PLOG_IF(ERROR, can_log) << "ptrace";
++    return false;
++  }
++  if (iov.iov_len != sizeof(*dest)) {
++    LOG_IF(ERROR, can_log) << "Unexpected registers size";
++    return false;
++  }
++  return true;
++}
++
++bool GetVectorRegisters64(pid_t tid,
++                          VectorContext* context,
++                          bool can_log) {
++  return GetRegisterSet(tid, NT_PPC_VMX, &context->v64, can_log);
++}
++
++bool GetFloatingPointRegisters64(pid_t tid,
++                                 FloatContext* context,
++                                 bool can_log) {
++  return GetRegisterSet(tid, NT_PRFPREG, &context->f64, can_log);
++}
++
++bool GetThreadArea64(pid_t tid,
++                     const ThreadContext& context,
++                     LinuxVMAddress* address,
++                     bool can_log) {
++  // PPC64 doesn't have PTRACE_GET_THREAD_AREA since the thread pointer
++  // is stored in GPR 13.
++  ThreadContext::t64_t tc;
++  if (!GetRegisterSet(tid, NT_PRSTATUS, &tc, can_log)) {
++    LOG_IF(ERROR, can_log) << "Unable to get thread pointer!";
++    return false;
++  }
++
++  *address = tc.gpr[13];
++
++  return true;
++}
++
++// Stubs for 32-bit functions not applicable on PPC64
++bool GetFloatingPointRegisters32(pid_t tid,
++                                 FloatContext* context,
++                                 bool can_log) { return false; }
++bool GetThreadArea32(pid_t tid,
++                     const ThreadContext &context,
++                     LinuxVMAddress *address,
++                     bool can_log) { return false; }
++
+ #else
+ #error Port.
+ #endif  // ARCH_CPU_X86_FAMILY
+@@ -495,6 +553,9 @@ bool Ptracer::GetThreadInfo(pid_t tid, T
+   if (is_64_bit_) {
+     return GetGeneralPurposeRegisters64(tid, &info->thread_context, can_log_) &&
+            GetFloatingPointRegisters64(tid, &info->float_context, can_log_) &&
++#if defined(ARCH_CPU_PPC64_FAMILY)
++           GetVectorRegisters64(tid, &info->vector_context, can_log_) &&
++#endif
+            GetThreadArea64(tid,
+                            info->thread_context,
+                            &info->thread_specific_data_address,
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/util/linux/thread_info.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/util/linux/thread_info.h
+@@ -39,6 +39,13 @@ struct user_vfp_exc {
+ #include <android/api-level.h>
+ #endif
+ 
++#if defined(ARCH_CPU_PPC64_FAMILY)
++#include <sys/ucontext.h>
++#if !defined(__GLIBC__)
++#include <asm/ptrace.h>
++#endif
++#endif
++
+ namespace crashpad {
+ 
+ //! \brief The set of general purpose registers for an architecture family.
+@@ -90,6 +97,8 @@ union ThreadContext {
+     uint32_t cp0_status;
+     uint32_t cp0_cause;
+     uint32_t padding1_;
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++    // PPC64 is 64-bit
+ #else
+ #error Port.
+ #endif  // ARCH_CPU_X86_FAMILY
+@@ -143,6 +152,21 @@ union ThreadContext {
+     uint64_t cp0_badvaddr;
+     uint64_t cp0_status;
+     uint64_t cp0_cause;
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++    // Reflects struct pt_regs in asm/ptrace.h.
++    uint64_t gpr[32];
++    uint64_t nip;
++    uint64_t msr;
++    uint64_t orig_gpr3;
++    uint64_t ctr;
++    uint64_t lnk;
++    uint64_t xer;
++    uint64_t ccr;
++    uint64_t softe;
++    uint64_t trap;
++    uint64_t dar;
++    uint64_t dsisr;
++    uint64_t result;
+ #else
+ #error Port.
+ #endif  // ARCH_CPU_X86_FAMILY
+@@ -154,6 +178,8 @@ union ThreadContext {
+   using NativeThreadContext = user_regs;
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+ // No appropriate NativeThreadsContext type available for MIPS
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++  using NativeThreadContext = struct pt_regs;
+ #else
+ #error Port.
+ #endif  // ARCH_CPU_X86_FAMILY || ARCH_CPU_ARM64
+@@ -229,6 +255,9 @@ union FloatContext {
+     } fpregs[32];
+     uint32_t fpcsr;
+     uint32_t fpu_id;
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++    // Crashpad's PPC support is 64-bit only, so this
++    // 32bit-only struct is declared as empty.
+ #else
+ #error Port.
+ #endif  // ARCH_CPU_X86_FAMILY
+@@ -263,6 +292,10 @@ union FloatContext {
+     double fpregs[32];
+     uint32_t fpcsr;
+     uint32_t fpu_id;
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++    // Reflects fpregset_t in sys/ucontext.h
++    double fpregs[32];
++    double fpscr;
+ #else
+ #error Port.
+ #endif  // ARCH_CPU_X86_FAMILY
+@@ -291,6 +324,8 @@ union FloatContext {
+   static_assert(sizeof(f64) == sizeof(user_fpsimd_struct), "Size mismatch");
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+ // No appropriate floating point context native type for available MIPS.
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++  static_assert(sizeof(f64) == sizeof(fpregset_t), "Size mismatch");
+ #else
+ #error Port.
+ #endif  // ARCH_CPU_X86
+@@ -298,6 +333,26 @@ union FloatContext {
+ static_assert(std::is_standard_layout<FloatContext>::value,
+               "Not standard layout");
+ 
++//! \brief The vector registers used for an architecture family
++union VectorContext {
++  struct v32_t {} v32;
++#if defined(ARCH_CPU_PPC64_FAMILY)
++  __attribute__((__aligned__(16))) // Vector context must be doubleword aligned.
++#endif
++  struct v64_t {
++#if defined(ARCH_CPU_PPC64_FAMILY)
++    // Reflects vrregset_t in sys/ucontext.h
++    uint32_t vrregs[32][4];
++    struct {
++      uint32_t __pad[3];
++      uint32_t vscr_word;
++    } vscr;
++    uint32_t vrsave;
++    uint32_t __pad[3];
++#endif
++  } v64;
++};
++
+ //! \brief A collection of `ptrace`-able information about a thread.
+ struct ThreadInfo {
+   ThreadInfo();
+@@ -309,6 +364,9 @@ struct ThreadInfo {
+   //! \brief The floating point registers for the thread.
+   FloatContext float_context;
+ 
++  //! \brief (Optional) The vector registers used for the thread.
++  VectorContext vector_context;
++
+   //! \brief The thread-local storage address for the thread.
+   LinuxVMAddress thread_specific_data_address;
+ };
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/util/misc/capture_context.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/util/misc/capture_context.h
+@@ -69,6 +69,7 @@ using NativeCPUContext = ucontext_t;
+ //!     macOS/Linux/Fuchsia | x86_64       | `%%rdi`
+ //!     Linux               | ARM/ARM64    | `r0`/`x0`
+ //!     Linux               | MIPS/MIPS64  | `$a0`
++//!     Linux               | PPC64        | `r3`
+ //!
+ //!     Additionally, the value `LR` on ARM/ARM64 will be the return address of
+ //!     this function.
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/util/misc/capture_context_linux.S
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/util/misc/capture_context_linux.S
+@@ -32,7 +32,7 @@
+   .balign 4, 0x0
+   .type CAPTURECONTEXT_SYMBOL, %function
+   .type CAPTURECONTEXT_SYMBOL2, %function
+-#elif defined(__mips__)
++#elif defined(__mips__) || defined(__powerpc64__)
+   .balign 4, 0x0
+ #endif
+ 
+@@ -423,4 +423,214 @@ CAPTURECONTEXT_SYMBOL2:
+   jr $ra
+ 
+   .set at
++#elif defined(__powerpc64__)
++  // Store r0-r31
++  std 0, 0xe8(3)   // context->uc_mcontext.gp_regs[0]
++  std 1, 0xf0(3)   // context->uc_mcontext.gp_regs[1]
++  std 2, 0xf8(3)   // context->uc_mcontext.gp_regs[2]
++  // note that r3's original value was lost
++  std 3, 0x100(3)  // context->uc_mcontext.gp_regs[3]
++  std 4, 0x108(3)  // context->uc_mcontext.gp_regs[4]
++  std 5, 0x110(3)  // context->uc_mcontext.gp_regs[5]
++  std 6, 0x118(3)  // context->uc_mcontext.gp_regs[6]
++  std 7, 0x120(3)  // context->uc_mcontext.gp_regs[7]
++  std 8, 0x128(3)  // context->uc_mcontext.gp_regs[8]
++  std 9, 0x130(3)  // context->uc_mcontext.gp_regs[9]
++  std 10, 0x138(3) // context->uc_mcontext.gp_regs[10]
++  std 11, 0x140(3) // context->uc_mcontext.gp_regs[11]
++  std 12, 0x148(3) // context->uc_mcontext.gp_regs[12]
++  std 13, 0x150(3) // context->uc_mcontext.gp_regs[13]
++  std 14, 0x158(3) // context->uc_mcontext.gp_regs[14]
++  std 15, 0x160(3) // context->uc_mcontext.gp_regs[15]
++  std 16, 0x168(3) // context->uc_mcontext.gp_regs[16]
++  std 17, 0x170(3) // context->uc_mcontext.gp_regs[17]
++  std 18, 0x178(3) // context->uc_mcontext.gp_regs[18]
++  std 19, 0x180(3) // context->uc_mcontext.gp_regs[19]
++  std 20, 0x188(3) // context->uc_mcontext.gp_regs[20]
++  std 21, 0x190(3) // context->uc_mcontext.gp_regs[21]
++  std 22, 0x198(3) // context->uc_mcontext.gp_regs[22]
++  std 23, 0x1a0(3) // context->uc_mcontext.gp_regs[23]
++  std 24, 0x1a8(3) // context->uc_mcontext.gp_regs[24]
++  std 25, 0x1b0(3) // context->uc_mcontext.gp_regs[25]
++  std 26, 0x1b8(3) // context->uc_mcontext.gp_regs[26]
++  std 27, 0x1c0(3) // context->uc_mcontext.gp_regs[27]
++  std 28, 0x1c8(3) // context->uc_mcontext.gp_regs[28]
++  std 29, 0x1d0(3) // context->uc_mcontext.gp_regs[29]
++  std 30, 0x1d8(3) // context->uc_mcontext.gp_regs[30]
++  std 31, 0x1e0(3) // context->uc_mcontext.gp_regs[31]
++
++  // For NIP, we can use the value in the link register
++  mflr 0
++  std 0, 0x1e8(3) // context->uc_mcontext.gp_regs[PT_NIP]
++
++  // CTR
++  mfctr 0
++  std 0, 0x200(3) // context->uc_mcontext.gp_regs[PT_CTR]
++
++  // For LNK, we'll use the caller's LR save area (2 stack frames up).
++  // r4 can be used as a scratch register since it has already been saved.
++  ld 4, 0(1)
++  ld 4, 16(4)
++  std 4, 0x208(3) // context->uc_mcontext.gp_regs[PT_LNK]
++
++  // XER
++  mfxer 0
++  std 0, 0x210(3) // context->uc_mcontext.gp_regs[PT_XER]
++
++  // CCR
++  mfcr 0
++  std 0, 0x218(3) // context->uc_mcontext.gp_regs[PT_CCR]
++
++  // MSR, orig_r3, MQ, TRAP, DAR, DSISR, RESULT, DSCR,
++  // not used or not relevant,  zero them out.
++  li 4, 0
++  std 4, 0x1f0(3) // context->uc_mcontext.gp_regs[PT_MSR]
++  std 4, 0x1f8(3) // context->uc_mcontext.gp_regs[PT_ORIG_R3]
++  std 4, 0x220(3) // context->uc_mcontext.gp_regs[PT_MQ]
++  std 4, 0x228(3) // context->uc_mcontext.gp_regs[PT_TRAP]
++  std 4, 0x230(3) // context->uc_mcontext.gp_regs[PT_DAR]
++  std 4, 0x238(3) // context->uc_mcontext.gp_regs[PT_DSISR]
++  std 4, 0x240(3) // context->uc_mcontext.gp_regs[PT_RESULT]
++  std 4, 0x248(3) // context->uc_mcontext.gp_regs[PT_DSCR]
++
++  // Update context->uc_mcontext.regs to point to gp_regs
++  addi 0, 3, 0xe8
++  std 0, 0xe0(3)
++
++  // Save floating point registers 0-31
++  stfd 0, 0x268(3)  // context->uc_mcontext.fp_regs[0]
++  stfd 1, 0x270(3)  // context->uc_mcontext.fp_regs[1]
++  stfd 2, 0x278(3)  // context->uc_mcontext.fp_regs[2]
++  stfd 3, 0x280(3)  // context->uc_mcontext.fp_regs[3]
++  stfd 4, 0x288(3)  // context->uc_mcontext.fp_regs[4]
++  stfd 5, 0x290(3)  // context->uc_mcontext.fp_regs[5]
++  stfd 6, 0x298(3)  // context->uc_mcontext.fp_regs[6]
++  stfd 7, 0x2a0(3)  // context->uc_mcontext.fp_regs[7]
++  stfd 8, 0x2a8(3)  // context->uc_mcontext.fp_regs[8]
++  stfd 9, 0x2b0(3)  // context->uc_mcontext.fp_regs[9]
++  stfd 10, 0x2b8(3) // context->uc_mcontext.fp_regs[10]
++  stfd 11, 0x2c0(3) // context->uc_mcontext.fp_regs[11]
++  stfd 12, 0x2c8(3) // context->uc_mcontext.fp_regs[12]
++  stfd 13, 0x2d0(3) // context->uc_mcontext.fp_regs[13]
++  stfd 14, 0x2d8(3) // context->uc_mcontext.fp_regs[14]
++  stfd 15, 0x2e0(3) // context->uc_mcontext.fp_regs[15]
++  stfd 16, 0x2e8(3) // context->uc_mcontext.fp_regs[16]
++  stfd 17, 0x2f0(3) // context->uc_mcontext.fp_regs[17]
++  stfd 18, 0x2f8(3) // context->uc_mcontext.fp_regs[18]
++  stfd 19, 0x300(3) // context->uc_mcontext.fp_regs[19]
++  stfd 20, 0x308(3) // context->uc_mcontext.fp_regs[20]
++  stfd 21, 0x310(3) // context->uc_mcontext.fp_regs[21]
++  stfd 22, 0x318(3) // context->uc_mcontext.fp_regs[22]
++  stfd 23, 0x320(3) // context->uc_mcontext.fp_regs[23]
++  stfd 24, 0x328(3) // context->uc_mcontext.fp_regs[24]
++  stfd 25, 0x330(3) // context->uc_mcontext.fp_regs[25]
++  stfd 26, 0x338(3) // context->uc_mcontext.fp_regs[26]
++  stfd 27, 0x340(3) // context->uc_mcontext.fp_regs[27]
++  stfd 28, 0x348(3) // context->uc_mcontext.fp_regs[28]
++  stfd 29, 0x350(3) // context->uc_mcontext.fp_regs[29]
++  stfd 30, 0x358(3) // context->uc_mcontext.fp_regs[30]
++  stfd 31, 0x360(3) // context->uc_mcontext.fp_regs[31]
++
++  // FPSCR
++  mffs 0
++  stfd 0, 0x368(3) // context->uc_mcontext.fp_regs[32]
++
++  // Save VMX Vector registers
++  // Update r4 to contain the base address of vmx_reserve
++  addi 4, 3, 0x378
++  // Ensure that it is quadword aligned
++  andi. 5, 4, 0xF
++  beq 1f // No alignment is necessary
++  // Address is doubleword aligned and not quadword aligned, add 8
++  addi 4, 4, 8
++
++1:
++  // Store VMX registers 0-31
++  // r4 will contain the base address
++  // r5 will contain the index
++  li 5, 0
++  stvx 0, 4, 5   // context->uc_mcontext.vmx_reserve[(align) + 0]
++  addi 5, 5, 16
++  stvx 1, 4, 5   // context->uc_mcontext.vmx_reserve[(align) + 1]
++  addi 5, 5, 16
++  stvx 2, 4, 5   // context->uc_mcontext.vmx_reserve[(align) + 2]
++  addi 5, 5, 16
++  stvx 3, 4, 5   // context->uc_mcontext.vmx_reserve[(align) + 3]
++  addi 5, 5, 16
++  stvx 4, 4, 5   // context->uc_mcontext.vmx_reserve[(align) + 4]
++  addi 5, 5, 16
++  stvx 5, 4, 5   // context->uc_mcontext.vmx_reserve[(align) + 5]
++  addi 5, 5, 16
++  stvx 6, 4, 5   // context->uc_mcontext.vmx_reserve[(align) + 6]
++  addi 5, 5, 16
++  stvx 7, 4, 5   // context->uc_mcontext.vmx_reserve[(align) + 7]
++  addi 5, 5, 16
++  stvx 8, 4, 5   // context->uc_mcontext.vmx_reserve[(align) + 8]
++  addi 5, 5, 16
++  stvx 9, 4, 5   // context->uc_mcontext.vmx_reserve[(align) + 9]
++  addi 5, 5, 16
++  stvx 10, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 10]
++  addi 5, 5, 16
++  stvx 11, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 11]
++  addi 5, 5, 16
++  stvx 12, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 12]
++  addi 5, 5, 16
++  stvx 13, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 13]
++  addi 5, 5, 16
++  stvx 14, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 14]
++  addi 5, 5, 16
++  stvx 15, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 15]
++  addi 5, 5, 16
++  stvx 16, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 16]
++  addi 5, 5, 16
++  stvx 17, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 17]
++  addi 5, 5, 16
++  stvx 18, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 18]
++  addi 5, 5, 16
++  stvx 19, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 19]
++  addi 5, 5, 16
++  stvx 20, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 20]
++  addi 5, 5, 16
++  stvx 21, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 21]
++  addi 5, 5, 16
++  stvx 22, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 22]
++  addi 5, 5, 16
++  stvx 23, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 23]
++  addi 5, 5, 16
++  stvx 24, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 24]
++  addi 5, 5, 16
++  stvx 25, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 25]
++  addi 5, 5, 16
++  stvx 26, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 26]
++  addi 5, 5, 16
++  stvx 27, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 27]
++  addi 5, 5, 16
++  stvx 28, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 28]
++  addi 5, 5, 16
++  stvx 29, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 29]
++  addi 5, 5, 16
++  stvx 30, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 30]
++  addi 5, 5, 16
++  stvx 31, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 31]
++  addi 5, 5, 16
++
++  // VSCR
++  mfvscr 0
++  stvx 0, 4, 5
++  addi 5, 5, 16
++
++  // VRSAVE
++  mfvrsave 0
++  stwx 0, 4, 5
++
++  // Update context->uc_mcontext.v_regs to point to vmx_reserve + alignment.
++  std 4, 0x370(3)
++
++  // Zero out all unused fields
++  li 4, 0
++  std 4, 0xc8(3) // context->uc_mcontext.signal
++  std 4, 0xd0(3) // context->uc_mcontext.handler
++  std 4, 0xd8(3) // context->uc_mcontext.oldmask
++
++  blr
+ #endif  // __i386__
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/util/misc/capture_context_test.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/util/misc/capture_context_test.cc
+@@ -57,7 +57,7 @@ void TestCaptureContext() {
+   uintptr_t pc = ProgramCounterFromContext(context_1);
+ 
+ #if !defined(ADDRESS_SANITIZER) && !defined(ARCH_CPU_MIPS_FAMILY) && \
+-    !defined(MEMORY_SANITIZER)
++    !defined(MEMORY_SANITIZER) && !defined(ARCH_CPU_PPC64_FAMILY)
+   // Sanitizers can cause enough code bloat that the “nearby” check would
+   // likely fail.
+   const uintptr_t kReferencePC =
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/util/misc/capture_context_test_util_linux.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/util/misc/capture_context_test_util_linux.cc
+@@ -35,6 +35,8 @@ void SanityCheckContext(const NativeCPUC
+   EXPECT_EQ(context.uc_mcontext.regs[0], FromPointerCast<uintptr_t>(&context));
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+   EXPECT_EQ(context.uc_mcontext.gregs[4], FromPointerCast<uintptr_t>(&context));
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++  EXPECT_EQ(context.uc_mcontext.gp_regs[3], FromPointerCast<uintptr_t>(&context));
+ #endif
+ }
+ 
+@@ -49,6 +51,8 @@ uintptr_t ProgramCounterFromContext(cons
+   return context.uc_mcontext.pc;
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+   return context.uc_mcontext.pc;
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++  return context.uc_mcontext.gp_regs[PT_NIP];
+ #endif
+ }
+ 
+@@ -63,6 +67,8 @@ uintptr_t StackPointerFromContext(const
+   return context.uc_mcontext.sp;
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+   return context.uc_mcontext.gregs[29];
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++  return context.uc_mcontext.gp_regs[1];
+ #endif
+ }
+ 
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/util/posix/signals_test.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/util/posix/signals_test.cc
+@@ -46,9 +46,9 @@ bool CanCauseSignal(int sig) {
+   return sig == SIGABRT ||
+          sig == SIGALRM ||
+          sig == SIGBUS ||
+-#if !defined(ARCH_CPU_ARM64)
++#if !defined(ARCH_CPU_ARM64) && !defined(ARCH_CPU_PPC64)
+          sig == SIGFPE ||
+-#endif  // !defined(ARCH_CPU_ARM64)
++#endif  // !defined(ARCH_CPU_ARM64) && !defined(ARCH_CPU_PPC64)
+ #if defined(ARCH_CPU_X86_FAMILY) || defined(ARCH_CPU_ARMEL)
+          sig == SIGILL ||
+ #endif  // defined(ARCH_CPU_X86_FAMILY) || defined(ARCH_CPU_ARMEL)
+@@ -117,9 +117,11 @@ void CauseSignal(int sig) {
+       break;
+     }
+ 
+-#if !defined(ARCH_CPU_ARM64)
++#if !defined(ARCH_CPU_ARM64) && !defined(ARCH_CPU_PPC64)
+     // ARM64 has hardware integer division instructions that don’t generate a
+     // trap for divide-by-zero, so this doesn’t produce SIGFPE.
++    //
++    // PPC64 fixed-point division by zero also doesn't produce a SIGFPE.
+     case SIGFPE: {
+       // Optimization makes this tricky, so get zero from a system call likely
+       // to succeed, and try to do something with the result.
+@@ -137,7 +139,7 @@ void CauseSignal(int sig) {
+       fstat(quotient, &stat_buf);
+       break;
+     }
+-#endif  // ARCH_CPU_ARM64
++#endif  // !defined(ARCH_CPU_ARM64) && !defined(ARCH_CPU_PPC64)
+ 
+ #if defined(ARCH_CPU_X86_FAMILY) || defined(ARCH_CPU_ARMEL)
+     case SIGILL: {
+--- a/src/3rdparty/chromium/third_party/dav1d/BUILD.gn
++++ b/src/3rdparty/chromium/third_party/dav1d/BUILD.gn
+@@ -196,6 +196,8 @@ static_library("dav1d_8bit") {
+     sources += arm_template_sources
+   } else if (current_cpu == "arm64") {
+     sources += arm_template_sources
++  } else if (current_cpu == "ppc64") {
++    sources += ppc64_template_sources
+   }
+ 
+   cflags = dav1d_copts
+@@ -226,6 +228,8 @@ static_library("dav1d_10bit") {
+     sources += arm_template_sources
+   } else if (current_cpu == "arm64") {
+     sources += arm_template_sources
++  } else if (current_cpu == "ppc64") {
++    sources += ppc64_template_sources
+   }
+ 
+   cflags = dav1d_copts
+@@ -283,6 +287,21 @@ if (current_cpu == "x86" || current_cpu
+     }
+ 
+     cflags = dav1d_copts
++  }
++} else if (current_cpu == "ppc64") {
++  static_library("dav1d_ppc") {
++    sources = [
++      "libdav1d/src/ppc/cpu.c",
++      "libdav1d/src/ppc/cpu.h",
++    ]
++
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [
++      "//build/config/compiler:no_chromium_code",
++      ":dav1d_config",
++    ]
++
++    cflags = dav1d_copts
+ 
+     deps = [ ":dav1d_headers" ]
+     allow_circular_includes_from = [ ":dav1d_headers" ]
+@@ -315,5 +334,7 @@ static_library("dav1d") {
+     }
+   } else if (current_cpu == "arm" || current_cpu == "arm64") {
+     deps += [ ":dav1d_arm" ]
++  } else if (current_cpu == "ppc64") {
++    deps += [ ":dav1d_ppc" ]
+   }
+ }
+--- a/src/3rdparty/chromium/third_party/dav1d/dav1d_generated.gni
++++ b/src/3rdparty/chromium/third_party/dav1d/dav1d_generated.gni
+@@ -103,6 +103,11 @@ arm_template_sources = [
+   "libdav1d/src/arm/mc_init_tmpl.c",
+ ]
+ 
++ppc64_template_sources = [
++  "libdav1d/src/ppc/cdef_init_tmpl.c",
++  "libdav1d/src/ppc/looprestoration_init_tmpl.c",
++]
++
+ template_sources = [
+   "libdav1d/src/cdef_apply_tmpl.c",
+   "libdav1d/src/cdef_tmpl.c",
+--- a/src/3rdparty/chromium/third_party/dav1d/generate_source.py
++++ b/src/3rdparty/chromium/third_party/dav1d/generate_source.py
+@@ -57,6 +57,8 @@ def _WriteGn(fd):
+   _WriteArray(fd, "arm64_asm_sources", _Glob("libdav1d/src/arm/64/*.S"))
+   _WriteArray(fd, "arm_template_sources", _Glob("libdav1d/src/arm/*_tmpl.c"))
+ 
++  _WriteArray(fd, "ppc64_template_sources", _Glob("libdav1d/src/ppc/*_tmpl.c"))
++
+   template_sources = _Glob("libdav1d/src/*_tmpl.c")
+   _WriteArray(fd, "template_sources", template_sources)
+ 
+--- a/src/3rdparty/chromium/third_party/dav1d/libdav1d/src/ppc/types.h
++++ b/src/3rdparty/chromium/third_party/dav1d/libdav1d/src/ppc/types.h
+@@ -51,4 +51,19 @@
+ #define u16l_to_i32(v) ((i32x4) vec_mergel((u16x8) v, vec_splat_u16(0)))
+ #define i16l_to_i32(v) ((i32x4) vec_unpackl((i16x8)v))
+ 
++#if defined(__clang__)
++#undef vec_splats
++#define vec_splats(N)                     \
++    _Generic((N),                         \
++        unsigned char:      ((u8x16)(N)), \
++        signed char:        ((i8x16)(N)), \
++        unsigned short:     ((u16x8)(N)), \
++        signed short:       ((i16x8)(N)), \
++        unsigned int:       ((u32x4)(N)), \
++        signed int:         ((i32x4)(N)), \
++        unsigned long long: ((u64x2)(N)), \
++        signed long long:   ((i64x2)(N))  \
++    )
++#endif
++
+ #endif /* DAV1D_SRC_PPC_TYPES_H */
+--- a/src/3rdparty/chromium/third_party/eigen3/BUILD.gn
++++ b/src/3rdparty/chromium/third_party/eigen3/BUILD.gn
+@@ -22,4 +22,8 @@ config("eigen_includes") {
+     # for this component on Windows on Arm due to compilation errors.
+     defines += [ "EIGEN_DONT_VECTORIZE" ]
+   }
++
++  if (target_cpu == "ppc64") {
++    defines += [ "EIGEN_DONT_VECTORIZE" ]
++  }
+ }
+--- a/src/3rdparty/chromium/third_party/libaom/BUILD.gn
++++ b/src/3rdparty/chromium/third_party/libaom/BUILD.gn
+@@ -37,6 +37,8 @@ if (enable_libaom) {
+     } else {
+       cpu_arch_full = "arm"
+     }
++  } else if (current_cpu == "ppc64") {
++    cpu_arch_full = "generic"
+   } else {
+     cpu_arch_full = current_cpu
+   }
+--- a/src/3rdparty/chromium/third_party/libgav1/options.gni
++++ b/src/3rdparty/chromium/third_party/libgav1/options.gni
+@@ -12,5 +12,5 @@ declare_args() {
+       is_chromeos_ash && (target_cpu == "arm" || target_cpu == "arm64")
+   use_libgav1_parser =
+       (is_chromeos || is_linux || is_win) &&
+-      (target_cpu == "x86" || target_cpu == "x64" || target_cpu == "arm64")
++      (target_cpu == "x86" || target_cpu == "x64" || target_cpu == "arm64" || target_cpu == "ppc64")
+ }
+--- a/src/3rdparty/chromium/third_party/lss/linux_syscall_support.h
++++ b/src/3rdparty/chromium/third_party/lss/linux_syscall_support.h
+@@ -4262,7 +4262,7 @@ struct kernel_statfs {
+       LSS_REG(2, buf);
+       LSS_BODY(void*, mmap2, "0"(__r2));
+     }
+-#else
++#elif !defined(__powerpc64__) /* ppc64 doesn't have mmap2 */
+     #define __NR__mmap2 __NR_mmap2
+     LSS_INLINE _syscall6(void*, _mmap2,            void*, s,
+                          size_t,                   l, int,               p,
+@@ -4373,7 +4373,7 @@ struct kernel_statfs {
+   #if defined(__i386__) ||                                                    \
+       defined(__ARM_ARCH_3__) || defined(__ARM_EABI__) ||                     \
+      (defined(__mips__) && _MIPS_SIM == _MIPS_SIM_ABI32) ||                   \
+-      defined(__PPC__) ||                                                     \
++     (defined(__PPC__) && !defined(__powerpc64__)) ||                                                     \
+      (defined(__s390__) && !defined(__s390x__))
+     /* On these architectures, implement mmap() with mmap2(). */
+     LSS_INLINE void* LSS_NAME(mmap)(void *s, size_t l, int p, int f, int d,
+@@ -4556,9 +4556,17 @@ struct kernel_statfs {
+     }
+   #endif
+   #if defined(__NR_fstatat64)
++    #if !defined(__GLIBC__)
++        // musl doesn't define fstatat64 fstatat
++        #undef fstatat64
++    #endif
+     LSS_INLINE _syscall4(int,   fstatat64,        int,   d,
+                          const char *,      p,
+                          struct kernel_stat64 *,   b,    int,   f)
++    #if !defined(__GLIBC__)
++    	// then restore it
++        #define fstatat64 fstatat
++    #endif
+   #endif
+   #if defined(__NR_waitpid)
+     // waitpid is polyfilled below when not available.
+--- a/src/3rdparty/chromium/third_party/pdfium/third_party/libpng16/pngpriv.h
++++ b/src/3rdparty/chromium/third_party/pdfium/third_party/libpng16/pngpriv.h
+@@ -196,11 +196,7 @@
+ #endif
+ 
+ #ifndef PNG_POWERPC_VSX_OPT
+-#  if defined(__PPC64__) && defined(__ALTIVEC__) && defined(__VSX__)
+-#     define PNG_POWERPC_VSX_OPT 2
+-#  else
+-#     define PNG_POWERPC_VSX_OPT 0
+-#  endif
++#  define PNG_POWERPC_VSX_OPT 0
+ #endif
+ 
+ #ifndef PNG_INTEL_SSE_OPT
+--- a/src/3rdparty/chromium/third_party/pffft/src/pffft.c
++++ b/src/3rdparty/chromium/third_party/pffft/src/pffft.c
+@@ -100,6 +100,7 @@
+    Altivec support macros 
+ */
+ #if !defined(PFFFT_SIMD_DISABLE) && (defined(__ppc__) || defined(__ppc64__))
++#include <altivec.h>
+ typedef vector float v4sf;
+ #  define SIMD_SZ 4
+ #  define VZERO() ((vector float) vec_splat_u8(0))
+--- a/src/3rdparty/chromium/third_party/skia/src/sksl/SkSLString.cpp
++++ b/src/3rdparty/chromium/third_party/skia/src/sksl/SkSLString.cpp
+@@ -142,7 +142,12 @@ String to_string(double value) {
+     if (needsDotZero) {
+         buffer << ".0";
+     }
+-    return String(buffer.str().c_str());
++
++    std::string ret(buffer.str());
++    if (signbit(value) && ret[0] == '.') {
++        ret[0] = '-';
++    }
++    return String(ret.c_str());
+ }
+ 
+ bool stod(const skstd::string_view& s, SKSL_FLOAT* value) {
+--- a/src/3rdparty/chromium/third_party/sqlite/src/amalgamation/sqlite3.c
++++ b/src/3rdparty/chromium/third_party/sqlite/src/amalgamation/sqlite3.c
+@@ -14628,7 +14628,8 @@ typedef INT16_TYPE LogEst;
+ # if defined(i386)      || defined(__i386__)      || defined(_M_IX86) ||    \
+      defined(__x86_64)  || defined(__x86_64__)    || defined(_M_X64)  ||    \
+      defined(_M_AMD64)  || defined(_M_ARM)        || defined(__x86)   ||    \
+-     defined(__ARMEL__) || defined(__AARCH64EL__) || defined(_M_ARM64)
++     defined(__ARMEL__) || defined(__AARCH64EL__) || defined(_M_ARM64) ||   \
++     defined(__powerpc64__) && (__BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__)
+ #   define SQLITE_BYTEORDER    1234
+ # elif defined(sparc)     || defined(__ppc__) || \
+        defined(__ARMEB__) || defined(__AARCH64EB__)
+--- a/src/3rdparty/chromium/third_party/sqlite/src/amalgamation_dev/sqlite3.c
++++ b/src/3rdparty/chromium/third_party/sqlite/src/amalgamation_dev/sqlite3.c
+@@ -14641,7 +14641,8 @@ typedef INT16_TYPE LogEst;
+ # if defined(i386)      || defined(__i386__)      || defined(_M_IX86) ||    \
+      defined(__x86_64)  || defined(__x86_64__)    || defined(_M_X64)  ||    \
+      defined(_M_AMD64)  || defined(_M_ARM)        || defined(__x86)   ||    \
+-     defined(__ARMEL__) || defined(__AARCH64EL__) || defined(_M_ARM64)
++     defined(__ARMEL__) || defined(__AARCH64EL__) || defined(_M_ARM64) ||   \
++     defined(__powerpc64__) && (__BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__)
+ #   define SQLITE_BYTEORDER    1234
+ # elif defined(sparc)     || defined(__ppc__) || \
+        defined(__ARMEB__) || defined(__AARCH64EB__)
+--- a/src/3rdparty/chromium/third_party/sqlite/src/ext/rtree/rtree.c
++++ b/src/3rdparty/chromium/third_party/sqlite/src/ext/rtree/rtree.c
+@@ -450,7 +450,7 @@ struct RtreeMatchArg {
+ #if defined(i386)     || defined(__i386__)   || defined(_M_IX86) ||    \
+     defined(__x86_64) || defined(__x86_64__) || defined(_M_X64)  ||    \
+     defined(_M_AMD64) || defined(_M_ARM)     || defined(__x86)   ||    \
+-    defined(__arm__)
++    defined(__arm__) || defined(__powerpc64__) && (__BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__)
+ # define SQLITE_BYTEORDER    1234
+ #elif defined(sparc)    || defined(__ppc__)
+ # define SQLITE_BYTEORDER    4321
+--- a/src/3rdparty/chromium/third_party/sqlite/src/src/sqliteInt.h
++++ b/src/3rdparty/chromium/third_party/sqlite/src/src/sqliteInt.h
+@@ -890,7 +890,8 @@ typedef INT16_TYPE LogEst;
+ # if defined(i386)      || defined(__i386__)      || defined(_M_IX86) ||    \
+      defined(__x86_64)  || defined(__x86_64__)    || defined(_M_X64)  ||    \
+      defined(_M_AMD64)  || defined(_M_ARM)        || defined(__x86)   ||    \
+-     defined(__ARMEL__) || defined(__AARCH64EL__) || defined(_M_ARM64)
++     defined(__ARMEL__) || defined(__AARCH64EL__) || defined(_M_ARM64) || \
++     defined(__powerpc64__) && (__BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__)
+ #   define SQLITE_BYTEORDER    1234
+ # elif defined(sparc)     || defined(__ppc__) || \
+        defined(__ARMEB__) || defined(__AARCH64EB__)
+--- a/src/3rdparty/chromium/third_party/webrtc/modules/desktop_capture/differ_block.cc
++++ b/src/3rdparty/chromium/third_party/webrtc/modules/desktop_capture/differ_block.cc
+@@ -30,11 +30,7 @@ bool VectorDifference(const uint8_t* ima
+   static bool (*diff_proc)(const uint8_t*, const uint8_t*) = nullptr;
+ 
+   if (!diff_proc) {
+-#if defined(WEBRTC_ARCH_ARM_FAMILY) || defined(WEBRTC_ARCH_MIPS_FAMILY)
+-    // For ARM and MIPS processors, always use C version.
+-    // TODO(hclam): Implement a NEON version.
+-    diff_proc = &VectorDifference_C;
+-#else
++#if defined(WEBRTC_ARCH_X86_FAMILY)
+     bool have_sse2 = GetCPUInfo(kSSE2) != 0;
+     // For x86 processors, check if SSE2 is supported.
+     if (have_sse2 && kBlockSize == 32) {
+@@ -44,6 +40,10 @@ bool VectorDifference(const uint8_t* ima
+     } else {
+       diff_proc = &VectorDifference_C;
+     }
++#else
++    // For other processors, always use C version.
++    // TODO(hclam): Implement a NEON version.
++    diff_proc = &VectorDifference_C;
+ #endif
+   }
+ 
+--- a/src/3rdparty/chromium/v8/BUILD.gn
++++ b/src/3rdparty/chromium/v8/BUILD.gn
+@@ -1083,6 +1083,12 @@ config("toolchain") {
+     }
+     if (host_byteorder == "little") {
+       defines += [ "V8_TARGET_ARCH_PPC_LE" ]
++      cflags += [
++        # Enable usage of AltiVec, VSX, and other POWER8 and higher features
++        "-mcpu=power8",
++        "-maltivec",
++        "-mvsx",
++      ]
+     } else if (host_byteorder == "big") {
+       defines += [ "V8_TARGET_ARCH_PPC_BE" ]
+       if (current_os == "aix") {
+--- a/src/3rdparty/chromium/ui/gl/features.gni
++++ b/src/3rdparty/chromium/ui/gl/features.gni
+@@ -35,7 +35,8 @@ declare_args() {
+                         (is_mac && use_egl) || is_chromeos_ash || is_fuchsia) &&
+                        (target_cpu == "x86" || target_cpu == "x64" ||
+                         target_cpu == "arm" || target_cpu == "arm64" ||
+-                        target_cpu == "mipsel" || target_cpu == "mips64el")
++                        target_cpu == "mipsel" || target_cpu == "mips64el" ||
++                        target_cpu == "ppc64")
+ }
+ 
+ use_glx = use_x11 || ozone_platform_x11
+--- a/src/3rdparty/chromium/v8/test/BUILD.gn
++++ b/src/3rdparty/chromium/v8/test/BUILD.gn
+@@ -42,7 +42,6 @@ group("gn_all") {
+       "benchmarks/cpp:gn_all",
+       "cctest:cctest",
+       "cctest:generate-bytecode-expectations",
+-      "unittests:unittests",
+     ]
+   }
+ }
+@@ -84,7 +83,6 @@ group("v8_bot_default") {
+     "message:v8_message",
+     "mjsunit:v8_mjsunit",
+     "mkgrokdump:mkgrokdump",
+-    "unittests:unittests",
+     "webkit:v8_webkit",
+   ]
+ 
+@@ -109,7 +107,6 @@ group("v8_default") {
+     "message:v8_message",
+     "mjsunit:v8_mjsunit",
+     "mkgrokdump:mkgrokdump",
+-    "unittests:unittests",
+   ]
+ 
+   if (v8_enable_webassembly) {
+--- /dev/null
++++ b/src/3rdparty/chromium/dev/null
+@@ -0,0 +1,39 @@
++/*
++ * Autogenerated by the Meson build system.
++ * Do not edit, your changes will be lost.
++ */
++
++#pragma once
++
++#define ARCH_AARCH64 0
++
++#define ARCH_ARM 0
++
++#define ARCH_PPC64LE 1
++
++#define ARCH_X86 0
++
++#define ARCH_X86_32 0
++
++#define ARCH_X86_64 0
++
++#define CONFIG_16BPC 1
++
++#define CONFIG_8BPC 1
++
++// #define CONFIG_LOG 1 -- Logging is controlled by Chromium
++
++#define ENDIANNESS_BIG 0
++
++#define HAVE_ASM 1
++
++#define HAVE_CLOCK_GETTIME 1
++
++#define HAVE_DLSYM 1
++
++#define HAVE_GETAUXVAL 1
++
++#define HAVE_POSIX_MEMALIGN 1
++
++#define HAVE_UNISTD_H 1
++
+--- a/src/3rdparty/chromium/third_party/abseil-cpp/absl/base/internal/unscaledcycleclock.h
++++ b/src/3rdparty/chromium/third_party/abseil-cpp/absl/base/internal/unscaledcycleclock.h
+@@ -46,7 +46,7 @@
+ 
+ // The following platforms have an implementation of a hardware counter.
+ #if defined(__i386__) || defined(__x86_64__) || defined(__aarch64__) || \
+-  defined(__powerpc__) || defined(__ppc__) || \
++  ((defined(__powerpc__) || defined(__ppc__)) && defined(__GLIBC__)) || \
+   defined(_M_IX86) || defined(_M_X64)
+ #define ABSL_HAVE_UNSCALED_CYCLECLOCK_IMPLEMENTATION 1
+ #else
+--- a/src/3rdparty/chromium/third_party/abseil-cpp/absl/debugging/internal/stacktrace_config.h
++++ b/src/3rdparty/chromium/third_party/abseil-cpp/absl/debugging/internal/stacktrace_config.h
+@@ -59,7 +59,7 @@
+ #elif defined(__i386__) || defined(__x86_64__)
+ #define ABSL_STACKTRACE_INL_HEADER \
+   "absl/debugging/internal/stacktrace_x86-inl.inc"
+-#elif defined(__ppc__) || defined(__PPC__)
++#elif defined(__ppc__) || defined(__PPC__) && defined(__GLIBC__)
+ #define ABSL_STACKTRACE_INL_HEADER \
+   "absl/debugging/internal/stacktrace_powerpc-inl.inc"
+ #elif defined(__aarch64__)
+--- a/src/3rdparty/chromium/base/allocator/partition_allocator/partition_alloc_config.h
++++ b/src/3rdparty/chromium/base/allocator/partition_allocator/partition_alloc_config.h
+@@ -100,7 +100,8 @@ static_assert(sizeof(void*) != 8, "");
+ // PUT_REF_COUNT_IN_PREVIOUS_SLOT does. In this case the refcount overlaps with
+ // the next pointer shadow for the smallest bucket.
+ #if !(defined(OS_MAC) && defined(ARCH_CPU_ARM64)) && \
+-    !BUILDFLAG(PUT_REF_COUNT_IN_PREVIOUS_SLOT)
++    !BUILDFLAG(PUT_REF_COUNT_IN_PREVIOUS_SLOT) && \
++    (!defined(__GLIBC) && !defined(__powerpc64__))
+ #define PA_HAS_FREELIST_HARDENING
+ #endif
+ 
+--- a/src/3rdparty/chromium/build/download_nacl_toolchains.py
++++ b/src/3rdparty/chromium/build/download_nacl_toolchains.py
+@@ -13,6 +13,8 @@ import sys
+ 
+ 
+ def Main(args):
++  if 'disable_nacl=1' in os.environ.get('GYP_DEFINES', ''):
++    return 0
+   script_dir = os.path.dirname(os.path.abspath(__file__))
+   src_dir = os.path.dirname(script_dir)
+   nacl_dir = os.path.join(src_dir, 'native_client')
+--- a/src/3rdparty/chromium/chrome/installer/linux/BUILD.gn
++++ b/src/3rdparty/chromium/chrome/installer/linux/BUILD.gn
+@@ -100,8 +100,6 @@ packaging_files = packaging_files_binari
+                     "$root_out_dir/xdg-mime",
+                     "$root_out_dir/xdg-settings",
+                     "$root_out_dir/locales/en-US.pak",
+-                    "$root_out_dir/MEIPreload/manifest.json",
+-                    "$root_out_dir/MEIPreload/preloaded_data.pb",
+                   ]
+ 
+ action_foreach("calculate_deb_dependencies") {
+@@ -321,7 +319,6 @@ group("installer_deps") {
+     ":theme_files",
+     "//chrome",
+     "//chrome:packed_resources",
+-    "//chrome/browser/resources/media/mei_preload:component",
+     "//components/crash/core/app:chrome_crashpad_handler",
+     "//sandbox/linux:chrome_sandbox",
+   ]
+--- /dev/null
++++ b/src/3rdparty/chromium/sandbox/linux/system_headers/ppc64_linux_syscalls.h
+@@ -0,0 +1,12 @@
++// Copyright 2014 The Chromium Authors. All rights reserved.
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++#ifndef SANDBOX_LINUX_SYSTEM_HEADERS_PPC64_LINUX_SYSCALLS_H_
++#define SANDBOX_LINUX_SYSTEM_HEADERS_PPC64_LINUX_SYSCALLS_H_
++
++#include <asm/unistd.h>
++
++//TODO: is it necessary to redefine syscall numbers for PPC64?
++
++#endif  // SANDBOX_LINUX_SYSTEM_HEADERS_PPC64_LINUX_SYSCALLS_H_
+--- /dev/null
++++ b/src/3rdparty/chromium/sandbox/linux/system_headers/ppc64_linux_ucontext.h
+@@ -0,0 +1,12 @@
++// Copyright 2014 The Chromium Authors. All rights reserved.
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++#ifndef SANDBOX_LINUX_SYSTEM_HEADERS_PPC64_LINUX_UCONTEXT_H_
++#define SANDBOX_LINUX_SYSTEM_HEADERS_PPC64_LINUX_UCONTEXT_H_
++
++#include <sys/ucontext.h>
++
++//TODO: is it necessary to redefine ucontext on PPC64?
++
++#endif  // SANDBOX_LINUX_SYSTEM_HEADERS_PPC64_LINUX_UCONTEXT_H_
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/util/net/http_transport_libcurl.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/util/net/http_transport_libcurl.cc
+@@ -236,6 +236,12 @@ std::string UserAgent() {
+ #elif defined(ARCH_CPU_BIG_ENDIAN)
+     static constexpr char arch[] = "aarch64_be";
+ #endif
++#elif defined(__powerpc64__)
++#if defined(ARCH_CPU_LITTLE_ENDIAN)
++    static constexpr char arch[] = "ppc64le";
++#elif defined(ARCH_CPU_BIG_ENDIAN)
++    static constexpr char arch[] = "ppc64";
++#endif
+ #else
+ #error Port
+ #endif
+--- /dev/null
++++ b/src/3rdparty/chromium/third_party/dav1d/config/linux/ppc64/config.h
+@@ -0,0 +1,39 @@
++/*
++ * Autogenerated by the Meson build system.
++ * Do not edit, your changes will be lost.
++ */
++
++#pragma once
++
++#define ARCH_AARCH64 0
++
++#define ARCH_ARM 0
++
++#define ARCH_PPC64LE 1
++
++#define ARCH_X86 0
++
++#define ARCH_X86_32 0
++
++#define ARCH_X86_64 0
++
++#define CONFIG_16BPC 1
++
++#define CONFIG_8BPC 1
++
++// #define CONFIG_LOG 1 -- Logging is controlled by Chromium
++
++#define ENDIANNESS_BIG 0
++
++#define HAVE_ASM 1
++
++#define HAVE_CLOCK_GETTIME 1
++
++#define HAVE_DLSYM 1
++
++#define HAVE_GETAUXVAL 1
++
++#define HAVE_POSIX_MEMALIGN 1
++
++#define HAVE_UNISTD_H 1
++
diff --git a/srcpkgs/qt6-webengine/patches/0903-xxx-ppc64le-swiftshader.patch b/srcpkgs/qt6-webengine/patches/0903-xxx-ppc64le-swiftshader.patch
new file mode 100644
index 000000000000..1a8cd8368da1
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0903-xxx-ppc64le-swiftshader.patch
@@ -0,0 +1,18 @@
+--- a/src/3rdparty/chromium/third_party/swiftshader/third_party/llvm-10.0/BUILD.gn
++++ b/src/3rdparty/chromium/third_party/swiftshader/third_party/llvm-10.0/BUILD.gn
+@@ -576,6 +576,7 @@ swiftshader_llvm_source_set("swiftshader
+     "llvm/lib/MC/MCAsmInfoCOFF.cpp",
+     "llvm/lib/MC/MCAsmInfoDarwin.cpp",
+     "llvm/lib/MC/MCAsmInfoELF.cpp",
++    "llvm/lib/MC/MCAsmInfoXCOFF.cpp",
+     "llvm/lib/MC/MCAsmMacro.cpp",
+     "llvm/lib/MC/MCAsmStreamer.cpp",
+     "llvm/lib/MC/MCAssembler.cpp",
+@@ -631,6 +632,7 @@ swiftshader_llvm_source_set("swiftshader
+     "llvm/lib/MC/MCWinCOFFStreamer.cpp",
+     "llvm/lib/MC/MCWinEH.cpp",
+     "llvm/lib/MC/MCXCOFFStreamer.cpp",
++    "llvm/lib/MC/MCXCOFFObjectTargetWriter.cpp",
+     "llvm/lib/MC/MachObjectWriter.cpp",
+     "llvm/lib/MC/StringTableBuilder.cpp",
+     "llvm/lib/MC/SubtargetFeature.cpp",
diff --git a/srcpkgs/qt6-webengine/template b/srcpkgs/qt6-webengine/template
new file mode 100644
index 000000000000..2f0de2c7adf6
--- /dev/null
+++ b/srcpkgs/qt6-webengine/template
@@ -0,0 +1,178 @@
+# Template file for 'qt6-webengine'
+pkgname=qt6-webengine
+version=6.3.1
+revision=1
+wrksrc="qtwebengine-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true
+ -DQT_FEATURE_webengine_system_ffmpeg=ON
+ -DQT_FEATURE_webengine_system_libevent=ON
+ -DQT_FEATURE_webengine_system_gn=ON
+ -DQT_FEATURE_webengine_system_icu=ON
+ -DQT_FEATURE_webengine_webrtc_pipewire=ON
+ -DNinja_EXECUTABLE=$XBPS_WRAPPERDIR/ninja
+ $(vopt_bool examples QT_BUILD_EXAMPLES)
+ -DPKG_CONFIG_HOST_EXECUTABLE=${PKG_CONFIG_FOR_BUILD}"
+hostmakedepends="qt6-base-devel perl pkg-config nodejs python3-html5lib
+ qt6-declarative-devel protobuf gperf flex nss-devel libwebp-devel
+ icu-devel libevent-devel"
+makedepends="qt6-base-devel qt6-declarative-devel pulseaudio-devel
+ qt6-tools-devel qt6-websockets-devel libflac-devel
+ alsa-lib-devel libvpx-devel pciutils-devel opus-devel libxslt-devel
+ libxml2-devel freetype-devel lcms2-devel libwebp-devel icu-devel
+ re2-devel zlib-devel libpng-devel minizip-devel harfbuzz-devel
+ nss-devel libXcursor-devel libXcomposite-devel libXScrnSaver-devel
+ protobuf-devel ffmpeg-devel snappy-devel libevent-devel pipewire-devel
+ libxkbfile-devel qt6-location-devel qt6-webchannel-devel libxshmfence-devel"
+# Not working properly with HTTPS without those packages
+# Not strict dependencies, though
+depends="qt6-plugin-tls-openssl qt6-plugin-tls-qcertonly"
+short_desc="Cross-platform application and UI framework - Webengine"
+maintainer="John <me@johnnynator.dev>"
+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=ad7a33b21a956deda37c587d50f821ca3816403ae31ba9b5d59d01561ad66e47
+
+if [ -z "$CROSS_BUILD" ];then
+	configure_args+=" -DCMAKE_TOOLCHAIN_FILE=/usr/lib/cmake/Qt6/qt.toolchain.cmake"
+fi
+
+if [ "$XBPS_LIBC" = "musl" ]; then
+	hostmakedepends+=" musl-legacy-compat"
+fi
+
+if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
+	makedepends+=" musl-legacy-compat"
+fi
+
+if [ ! "$XBPS_WORDSIZE" = "$XBPS_TARGET_WORDSIZE" ]; then
+	broken="webengine can be built only if word size matches"
+fi
+
+if [ "$XBPS_WORDSIZE" -eq 32 ]; then
+	nodebug=yes
+	LDFLAGS="-Wl,--no-keep-memory"
+fi
+
+if [ "$XBPS_TARGET_ENDIAN" != "le" ]; then
+	broken="webengine only supports little endian"
+fi
+
+build_options="sndio examples"
+build_options_default=""
+desc_option_examples="Build examples"
+desc_option_sndio="Enable support for sndio"
+
+subpackages="qt6-webengine-devel"
+
+if [ "$build_option_examples" ]; then
+	subpackages+=" qt6-webengine-examples"
+fi
+
+_bootstrap_gn() {
+	# Bootstrap gn (generate ninja)
+	echo "Bootstrapping 'gn'"
+	cd ${wrksrc}/src/3rdparty/gn
+	CFLAGS="$CFLAGS_host" CXXFLAGS="$CXXFLAGS_host" LDFLAGS="$LDFLAGS_host" \
+	PKGCONFIG=/usr/bin/pkgconfig PKG_CONFIG_PATH="/usr/lib/pkgconfig:/usr/share/pkgconfig" \
+		python3 build/gen.py --no-last-commit-position --out-path \
+			${wrksrc}/src/3rdparty/gn/out/Release --cc "${CC_host:-$CC}" \
+			--cxx "${CXX_host:-$CXX}" --ld "${CXX_host:-$CXX}" --ar "${AR_host:-$AR}" \
+			--qt-version "${version}.qtwebengine.qt.io"
+	ninja -C out/Release gn
+	cd ${wrksrc}
+}
+
+_unbundle_libs() {
+	cd ${wrksrc}/src/3rdparty/chromium
+	echo Dropping bundled libs from chromium
+	# Use system-provided libraries.
+	# TODO: use_system_hunspell (upstream changes needed).
+	# TODO: use_system_libsrtp.
+	# TODO: use_system_libusb (http://crbug.com/266149).
+	# TODO: use_system_ssl (http://crbug.com/58087).
+	# TODO: use_system_sqlite (http://crbug.com/22208).
+	# TODO: use_system_icu (segfaults)
+	# use_system_protobuf
+	# use_system_v8=1
+	# use_system_zlib=1
+	# bzip2 jsoncpp minizip xdg_utils speex
+	system="
+		ffmpeg
+		flac
+		fontconfig
+		freetype
+		harfbuzz-ng
+		icu
+		libdrm
+		libevent
+		libjpeg
+		libpng
+		libwebp
+		libxml
+		libxslt
+		opus
+		re2
+		snappy
+	"
+	build/linux/unbundle/replace_gn_files.py --system-libraries ${system}
+}
+
+# Provide a wrapper to run ./xbps-src -j 1 build later
+_wrap_ninja() {
+	cat <<-'_EOF' >"$XBPS_WRAPPERDIR"/ninja
+	#!/bin/sh
+
+	exec /usr/bin/ninja $NINJAFLAGS "$@"
+	_EOF
+	chmod +x "$XBPS_WRAPPERDIR"/ninja
+}
+
+pre_configure() {
+	_bootstrap_gn
+	# _unbundle_libs
+	_wrap_ninja
+	export PATH="$PATH:${wrksrc}/src/3rdparty/gn/out/Release"
+}
+
+pre_build() {
+	export PATH="$PATH:${wrksrc}/src/3rdparty/gn/out/Release"
+	export NINJAFLAGS="$makejobs"
+
+}
+
+pre_install() {
+	export PATH="$PATH:${wrksrc}/src/3rdparty/gn/out/Release"
+}
+
+post_install() {
+	local _file
+	find "${DESTDIR}"/usr/lib/qt6/examples \
+		-path '*/lib/qt6/**/lib/qt6/*' -type f |
+	while read _file; do
+		mv "$_file" "${_file%/lib/qt6/*}"
+	done
+}
+
+qt6-webengine-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} qt6-webchannel-devel>=${version}_1
+	 qt6-declarative-devel>=${version}_1 qt6-location-devel>=${version}_1"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/pkgconfig
+		vmove usr/lib/qt6/mkspecs
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
+	}
+}
+
+qt6-webengine-examples_package() {
+	short_desc+=" - sample browsers"
+	pkg_install() {
+		vmove usr/lib/qt6/examples
+	}
+}
diff --git a/srcpkgs/qt6-webengine/update b/srcpkgs/qt6-webengine/update
new file mode 100644
index 000000000000..844552465222
--- /dev/null
+++ b/srcpkgs/qt6-webengine/update
@@ -0,0 +1 @@
+pkgname="${pkgname/6-/}-everywhere-src"

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

* Re: WIP Qt6 webengine
  2022-08-07  4:36 [PR PATCH] WIP Qt6 webengine sgn
                   ` (6 preceding siblings ...)
  2022-08-09 16:45 ` [PR PATCH] [Updated] " sgn
@ 2022-08-09 17:27 ` skmpz
  2022-08-10  1:14 ` [PR PATCH] [Updated] " sgn
                   ` (29 subsequent siblings)
  37 siblings, 0 replies; 39+ messages in thread
From: skmpz @ 2022-08-09 17:27 UTC (permalink / raw)
  To: ml

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

New comment by skmpz on void-packages repository

https://github.com/void-linux/void-packages/pull/38509#issuecomment-1209662818

Comment:
> Did you mean qt6-webengine failed on x86-64 with glibc?

yes

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

* Re: [PR PATCH] [Updated] WIP Qt6 webengine
  2022-08-07  4:36 [PR PATCH] WIP Qt6 webengine sgn
                   ` (7 preceding siblings ...)
  2022-08-09 17:27 ` skmpz
@ 2022-08-10  1:14 ` sgn
  2022-08-10  1:15 ` sgn
                   ` (28 subsequent siblings)
  37 siblings, 0 replies; 39+ messages in thread
From: sgn @ 2022-08-10  1:14 UTC (permalink / raw)
  To: ml

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

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

https://github.com/sgn/void-packages qt6-webengine
https://github.com/void-linux/void-packages/pull/38509

WIP Qt6 webengine
<!-- Uncomment relevant sections and delete options which are not applicable -->

Never tried to cross build
Functionality works (at least can view youtube video on x86_64-musl)

#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**
[ci skip]

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-qt6-webengine-38509.patch --]
[-- Type: text/x-diff, Size: 303622 bytes --]

From e8882aaa421f66fc1e92161dfda4022f89265a38 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:07 +0700
Subject: [PATCH 01/26] qt6-base: update to 6.3.1.

---
 srcpkgs/qt6-base/patches/libatomic.patch | 14 --------------
 srcpkgs/qt6-base/template                | 16 ++++++++++------
 2 files changed, 10 insertions(+), 20 deletions(-)
 delete mode 100644 srcpkgs/qt6-base/patches/libatomic.patch

diff --git a/srcpkgs/qt6-base/patches/libatomic.patch b/srcpkgs/qt6-base/patches/libatomic.patch
deleted file mode 100644
index 2f7a807518e4..000000000000
--- a/srcpkgs/qt6-base/patches/libatomic.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Index: cmake/FindWrapAtomic.cmake
-===================================================================
---- a/cmake/FindWrapAtomic.cmake
-+++ b/cmake/FindWrapAtomic.cmake
-@@ -38,7 +38,8 @@ endif()
- 
- add_library(WrapAtomic::WrapAtomic INTERFACE IMPORTED)
- if(HAVE_STDATOMIC_WITH_LIB)
--    target_link_libraries(WrapAtomic::WrapAtomic INTERFACE atomic)
-+    find_library(LIBATOMIC atomic REQUIRED)
-+    target_link_libraries(WrapAtomic::WrapAtomic INTERFACE ${LIBATOMIC})
- endif()
- 
- set(WrapAtomic_FOUND 1)
diff --git a/srcpkgs/qt6-base/template b/srcpkgs/qt6-base/template
index cc47e18a70ff..4e88d6b9f174 100644
--- a/srcpkgs/qt6-base/template
+++ b/srcpkgs/qt6-base/template
@@ -1,7 +1,7 @@
 # Template file for 'qt6-base'
 pkgname=qt6-base
-version=6.3.0
-revision=2
+version=6.3.1
+revision=1
 wrksrc="qtbase-everywhere-src-${version}"
 build_style=cmake
 configure_args="-DINSTALL_DATADIR=share/qt6
@@ -9,6 +9,8 @@ configure_args="-DINSTALL_DATADIR=share/qt6
  -DINSTALL_BINDIR=lib/qt6/bin
  -DINSTALL_MKSPECSDIR=lib/qt6/mkspecs
  -DINSTALL_INCLUDEDIR=include/qt6
+ -DINSTALL_EXAMPLESDIR=lib/qt6/examples
+ -DINSTALL_TESTSDIR=lib/qt6/tests
  -DINSTALL_SYSCONFDIR=/etc/xdg
  -DQT_FEATURE_openssl_linked=ON
  -DQT_FEATURE_system_sqlite=ON
@@ -29,14 +31,13 @@ maintainer="John <me@johnnynator.dev>"
 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=b865aae43357f792b3b0a162899d9bf6a1393a55c4e5e4ede5316b157b1a0f99
+checksum=0a64421d9c2469c2c48490a032ab91d547017c9cc171f3f8070bc31888f24e03
 python_version=3
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt6-base-devel"
 	# QtSetup fails native builds if this is set
-	configure_args+=" -DQT_HOST_PATH=/usr
-	 -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true"
+	configure_args+="-DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true"
 fi
 
 # It is currently expected that quite a few patches do fail
@@ -225,7 +226,7 @@ qt6-plugin-tls-qcertonly_package() {
 qt6-plugin-networkinformation_package() {
 	short_desc+=" - Networkinformation plugin"
 	pkg_install() {
-		vmove usr/lib/qt6/plugins/networkinformation/libqnetworkmanager.so
+		vmove usr/lib/qt6/plugins/networkinformation/
 	}
 }
 
@@ -246,9 +247,12 @@ qt6-base-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/*.a"
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From 105ee492b5419bac7663ce4d8b2ffb331b9b94e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:07 +0700
Subject: [PATCH 02/26] qt6-charts: update to 6.3.1.

---
 srcpkgs/qt6-charts/template | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/qt6-charts/template b/srcpkgs/qt6-charts/template
index 79cb8a220401..d3947ba938f3 100644
--- a/srcpkgs/qt6-charts/template
+++ b/srcpkgs/qt6-charts/template
@@ -1,10 +1,9 @@
 # Template file for 'qt6-charts'
 pkgname=qt6-charts
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qtcharts-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr"
 hostmakedepends="perl qt6-declarative-devel"
 makedepends="qt6-declarative-devel"
 short_desc="Cross-platform application and UI framework - charts"
@@ -12,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 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=672762c5f641ccc88a30aeedefb63f03c0f837649b334f46eea57592e87e36cd
+checksum=f330cc2328729104d79b2088990ce0840f2da89d9d989360d4c352e797d27cf7
 
 qt6-charts-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
@@ -20,8 +19,11 @@ qt6-charts-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From 369623559b477d4c49f890d272264d776f548568 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:07 +0700
Subject: [PATCH 03/26] qt6-declarative: update to 6.3.1.

---
 srcpkgs/qt6-declarative/template | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/qt6-declarative/template b/srcpkgs/qt6-declarative/template
index e0bd28d9e383..cfdc74f281d6 100644
--- a/srcpkgs/qt6-declarative/template
+++ b/srcpkgs/qt6-declarative/template
@@ -1,23 +1,22 @@
 # Template file for 'qt6-declarative'
 pkgname=qt6-declarative
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qtdeclarative-everywhere-src-${version}"
 build_style=cmake
-configure_args=" -DQT_HOST_PATH=/usr"
 hostmakedepends="qt6-base-devel perl pkg-config wayland-devel
  qt6-shadertools-devel"
-makedepends="qt6-base-devel Vulkan-Headers"
+makedepends="qt6-base-devel Vulkan-Headers qt6-shadertools-devel"
 short_desc="Cross-platform application and UI framework - Declarative"
 maintainer="John <me@johnnynator.dev>"
 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=d294b029dc2b2d4f65da516fdc3b8088d32643eb7ff77db135a8b9ce904caa37
+checksum=03e7694123820fcca397f95ce312e0b7f3039493c8754c836da098a1a04346e8
 replaces="qt6-quickcontrols2>=0"
 
 if [ "$CROSS_BUILD" ]; then
-	configure_args+=" -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true"
+	configure_args="-DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true"
 	hostmakedepends+=" qt6-declarative-devel"
 fi
 
@@ -60,11 +59,14 @@ qt6-declarative-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/libQt6QuickTest.so.*"
 		vmove usr/lib/qt6/qml/QtTest
 		vmove usr/lib/qt6/bin/qmltestrunner
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From 7ab490c8aee6fdd6e071b6096685f2fde28de733 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:07 +0700
Subject: [PATCH 04/26] qt6-imageformats: update to 6.3.1.

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

diff --git a/srcpkgs/qt6-imageformats/template b/srcpkgs/qt6-imageformats/template
index eaca95243c48..9f6d2fb66776 100644
--- a/srcpkgs/qt6-imageformats/template
+++ b/srcpkgs/qt6-imageformats/template
@@ -1,10 +1,9 @@
 # Template file for 'qt6-imageformats'
 pkgname=qt6-imageformats
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qtimageformats-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr"
 hostmakedepends="perl qt6-base-devel"
 makedepends="qt6-base-devel"
 short_desc="Cross-platform application and UI framework - imageformats"
@@ -12,4 +11,4 @@ maintainer="John <me@johnnynator.dev>"
 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=025d0d17ed75b42a7eb6b523731ab8f17025421a8810cade25caffe05d93abef
+checksum=ad0312b8dfbbb67f729bfadbfcd47246ee4a128b717731ba158c41d01fde212f

From ad950c592035fef27b29abd0468cf242ce19d637 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:07 +0700
Subject: [PATCH 05/26] qt6-location: update to 6.3.1.

---
 srcpkgs/qt6-location/template | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/qt6-location/template b/srcpkgs/qt6-location/template
index b7397f5f8942..9f26103259ad 100644
--- a/srcpkgs/qt6-location/template
+++ b/srcpkgs/qt6-location/template
@@ -1,10 +1,9 @@
 # Template file for 'qt6-location'
 pkgname=qt6-location
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qtpositioning-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr"
 hostmakedepends="perl qt6-base-devel qt6-declarative-devel"
 makedepends="qt6-serialport-devel qt6-declarative-devel GConf-devel"
 short_desc="Cross-platform application and UI framework - location"
@@ -12,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 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=e9ed50f6b245a346db34d625d0012774ef0ec8e7fd65037127ec26758708236e
+checksum=06788e4ecae1920094b30e4046f0abd23c8189d8a51e9c939b02f0b6abe2e86c
 
 qt6-location-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel>=${version}_1"
@@ -20,8 +19,11 @@ qt6-location-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From fd61b369df209ce31bb89fb9e19098a7904665a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:08 +0700
Subject: [PATCH 06/26] qt6-lottie: update to 6.3.1.

---
 srcpkgs/qt6-lottie/template | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/qt6-lottie/template b/srcpkgs/qt6-lottie/template
index 1c97cd5f4f32..a7beb62ec368 100644
--- a/srcpkgs/qt6-lottie/template
+++ b/srcpkgs/qt6-lottie/template
@@ -1,10 +1,9 @@
 # Template file for 'qt6-lottie'
 pkgname=qt6-lottie
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qtlottie-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr"
 hostmakedepends="perl qt6-base-devel"
 makedepends="qt6-declarative-devel"
 short_desc="Cross-platform application and UI framework - lottie"
@@ -12,10 +11,10 @@ maintainer="John <me@johnnynator.dev>"
 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=39db570bbba5b527a1eb6a5774bed47398ace2f7217bbf45b1194ada6cf97deb
+checksum=740ba76999124d5e1a85ef3d01c69976bb8557862b6b26bf48b357fe0cab1cf5
 
 if [ "$XBPS_CHECK_PKGS" ]; then
-	configure_args+=" -DQT_BUILD_TESTS=ON"
+	configure_args="-DQT_BUILD_TESTS=ON"
 fi
 
 pre_check() {
@@ -28,8 +27,10 @@ qt6-lottie-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
 		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From 219b7aa38c6f3bafc8b859da42c6e0d0cf6c19f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:08 +0700
Subject: [PATCH 07/26] qt6-networkauth: update to 6.3.1.

---
 srcpkgs/qt6-networkauth/template | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/qt6-networkauth/template b/srcpkgs/qt6-networkauth/template
index e934beada9b0..1454ceb4a525 100644
--- a/srcpkgs/qt6-networkauth/template
+++ b/srcpkgs/qt6-networkauth/template
@@ -1,10 +1,9 @@
 # Template file for 'qt6-networkauth'
 pkgname=qt6-networkauth
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qtnetworkauth-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr"
 hostmakedepends="perl qt6-base-devel"
 makedepends="qt6-base-devel"
 short_desc="Cross-platform application and UI framework - networkauth"
@@ -12,10 +11,10 @@ maintainer="John <me@johnnynator.dev>"
 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=203a98942919028520038f90a20cd7ee32b537233545d11e429c3e2c1ad9069f
+checksum=d60f54b9d4509fa8bdbf1990bc91f6e260e38cdb57a7b8119fa3861bc5d2fb2a
 
 if [ "$XBPS_CHECK_PKGS" ]; then
-	configure_args+=" -DQT_BUILD_TESTS=ON"
+	configure_args="-DQT_BUILD_TESTS=ON"
 fi
 
 qt6-networkauth-devel_package() {
@@ -24,8 +23,11 @@ qt6-networkauth-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From e4d5884fdaf66f48550a76584cefd3a1d7bfaa44 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:08 +0700
Subject: [PATCH 08/26] qt6-qt5compat: update to 6.3.1.

---
 srcpkgs/qt6-qt5compat/template | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/qt6-qt5compat/template b/srcpkgs/qt6-qt5compat/template
index 7fcd5ad5080e..a62573cfabfa 100644
--- a/srcpkgs/qt6-qt5compat/template
+++ b/srcpkgs/qt6-qt5compat/template
@@ -1,10 +1,9 @@
 # Template file for 'qt6-qt5compat'
 pkgname=qt6-qt5compat
-version=6.3.0
-revision=2
+version=6.3.1
+revision=1
 wrksrc="qt5compat-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr"
 hostmakedepends="qt6-base-devel qt6-declarative-devel perl pkg-config"
 makedepends="qt6-base-devel qt6-declarative-devel"
 short_desc="Cross-platform application and UI framework - Qt5 Compatibilty Component"
@@ -12,10 +11,10 @@ maintainer="John <me@johnnynator.dev>"
 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=2b199be780c50d9214512b922d94cb240b0412fd63f459e356b76102cad1713e
+checksum=a43ec62bd778eaecf88ad7847118d1c2a471b0fcb820f93beb311d7ab9566cfd
 
 if [ "$XBPS_CHECK_PKGS" ]; then
-	configure_args+=" -DQT_BUILD_TESTS=ON"
+	configure_args="-DQT_BUILD_TESTS=ON"
 fi
 
 qt6-qt5compat-devel_package() {
@@ -24,8 +23,11 @@ qt6-qt5compat-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From 1878fbbba0402e951462668e4f5861a51bd0bbe1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:08 +0700
Subject: [PATCH 09/26] qt6-quick3d: update to 6.3.1.

---
 srcpkgs/qt6-quick3d/template | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/qt6-quick3d/template b/srcpkgs/qt6-quick3d/template
index 0f7ef336a3ff..b2349c03501b 100644
--- a/srcpkgs/qt6-quick3d/template
+++ b/srcpkgs/qt6-quick3d/template
@@ -1,10 +1,9 @@
 # Template file for 'qt6-quick3d'
 pkgname=qt6-quick3d
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qtquick3d-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr "
 hostmakedepends="perl qt6-base-devel qt6-declarative-devel qt6-shadertools-devel"
 makedepends="qt6-base-devel qt6-declarative-devel qt6-shadertools-devel
  libassimp-devel"
@@ -13,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 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=0ad05bd1ee1f784b18220a2d2625ee8de91662c88fdc7b798662953d86eb327e
+checksum=2fa766ee47b8c07412b3b755206ada0715fb07813b64ed069e7205044c061256
 
 if [ "$XBPS_TARGET_ENDIAN" = "be" ]; then
 	# possibly a qt6-shadertools bug, actually
@@ -26,9 +25,12 @@ qt6-quick3d-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
-		vmove usr/lib/qt6/mkspecs
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/bin
+		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From 22a4fab79a29e87bfb5b5f570695912fd6a722aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:09 +0700
Subject: [PATCH 10/26] qt6-quicktimeline: update to 6.3.1.

---
 srcpkgs/qt6-quicktimeline/template | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/qt6-quicktimeline/template b/srcpkgs/qt6-quicktimeline/template
index 15aa7a8e5819..bf02e043c4a5 100644
--- a/srcpkgs/qt6-quicktimeline/template
+++ b/srcpkgs/qt6-quicktimeline/template
@@ -1,10 +1,9 @@
 # Template file for 'qt6-quicktimeline'
 pkgname=qt6-quicktimeline
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qtquicktimeline-everywhere-src-${version/rc/-rc}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr "
 hostmakedepends="perl qt6-base-devel qt6-declarative-devel"
 makedepends="qt6-base-devel qt6-declarative-devel"
 short_desc="Cross-platform application and UI framework - quicktimeline"
@@ -12,10 +11,10 @@ maintainer="John <me@johnnynator.dev>"
 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=9ff0a931159efc6be5bd9f8a1e4a16a70e2dab37cf22ad85c6d330ccfdf31c1a
+checksum=58a13cf0ce8e7755639f20684078733af24f5a317f6ddb40d6079c8c5a28ebbe
 
 if [ "$XBPS_CHECK_PKGS" ]; then
-	configure_args+=" -DQT_BUILD_TESTS=ON"
+	configure_args="-DQT_BUILD_TESTS=ON"
 fi
 
 pre_check() {

From cf768e509c2527dd1340978c4c057301528a13b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:09 +0700
Subject: [PATCH 11/26] qt6-scxml: update to 6.3.1.

---
 srcpkgs/qt6-scxml/template | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/qt6-scxml/template b/srcpkgs/qt6-scxml/template
index 112baca0ab83..942a71afe476 100644
--- a/srcpkgs/qt6-scxml/template
+++ b/srcpkgs/qt6-scxml/template
@@ -1,10 +1,9 @@
 # Template file for 'qt6-scxml'
 pkgname=qt6-scxml
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qtscxml-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr"
 hostmakedepends="perl qt6-declarative-devel"
 makedepends="qt6-declarative-devel"
 short_desc="Cross-platform application and UI framework - scxml"
@@ -12,10 +11,10 @@ maintainer="John <me@johnnynator.dev>"
 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=09b0dbd6ac367920fb1ba96a39dcd4c9d33eb0820dcc79538992825d588a70f0
+checksum=01bc154d6163d1f049f4e1e76658a044730ace7b0a5be35c9a46fcd1396f8619
 
 if [ "$XBPS_CHECK_PKGS" ]; then
-	configure_args+=" -DQT_BUILD_TESTS=ON"
+	configure_args="-DQT_BUILD_TESTS=ON"
 fi
 
 qt6-scxml-devel_package() {
@@ -24,8 +23,11 @@ qt6-scxml-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From 20fc657784d6215dc634c8a74d35256aec1f0bb8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:09 +0700
Subject: [PATCH 12/26] qt6-serialport: update to 6.3.1.

---
 srcpkgs/qt6-serialport/template | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/qt6-serialport/template b/srcpkgs/qt6-serialport/template
index 0804671ca57b..2de9d6364a5c 100644
--- a/srcpkgs/qt6-serialport/template
+++ b/srcpkgs/qt6-serialport/template
@@ -1,10 +1,9 @@
 # Template file for 'qt6-serialport'
 pkgname=qt6-serialport
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qtserialport-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr"
 hostmakedepends="perl qt6-base-devel pkg-config"
 makedepends="qt6-base-devel"
 short_desc="Cross-platform application and UI framework - serialport"
@@ -12,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 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=eebd6934d48cc044b8c87795a4fd91bb81f7195d4b5a2ddb12802f343d5db64f
+checksum=4eb6d80e65799dd2e0318df4dfba14173c1929e861718cda9bedca24253b616e
 
 qt6-serialport-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel>=${version}_1"
@@ -20,8 +19,11 @@ qt6-serialport-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From 7d55a3a3dcd91bcf7a5dfe28c930eaeb492e222c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:09 +0700
Subject: [PATCH 13/26] qt6-shadertools: update to 6.3.1.

---
 srcpkgs/qt6-shadertools/template | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/qt6-shadertools/template b/srcpkgs/qt6-shadertools/template
index 9c1ec210a96a..4606fa7726b1 100644
--- a/srcpkgs/qt6-shadertools/template
+++ b/srcpkgs/qt6-shadertools/template
@@ -1,10 +1,10 @@
 # Template file for 'qt6-shadertools'
 pkgname=qt6-shadertools
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qtshadertools-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr "
+configure_args="-DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true"
 hostmakedepends="perl qt6-base-devel"
 makedepends="qt6-base-devel"
 short_desc="Cross-platform application and UI framework - shadertools"
@@ -12,7 +12,12 @@ maintainer="John <me@johnnynator.dev>"
 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=5498959b9d37c254bd126ab1320cf86aeb8a31b3ea7e51db666a8f9698afbd6c
+checksum=59b77176961528cc7b0c9325134655e273aa87b4cb386c0f4683d8f2852e435a
+
+if [ "$CROSS_BUILD" ]; then
+	hostmakedepends+=" qt6-shadertools-devel"
+fi
+
 
 qt6-shadertools-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel>=${version}_1"
@@ -20,8 +25,11 @@ qt6-shadertools-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From cfd3e10741bc9acb6174dd7050f4849a3d6e344a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:09 +0700
Subject: [PATCH 14/26] qt6-svg: update to 6.3.1.

---
 srcpkgs/qt6-svg/template | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/qt6-svg/template b/srcpkgs/qt6-svg/template
index aa8e6b745109..309b0988e435 100644
--- a/srcpkgs/qt6-svg/template
+++ b/srcpkgs/qt6-svg/template
@@ -1,10 +1,9 @@
 # Template file for 'qt6-svg'
 pkgname=qt6-svg
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qtsvg-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr "
 hostmakedepends="qt6-base-devel perl"
 makedepends="qt6-base-devel"
 short_desc="Cross-platform application and UI framework (QT6) - qt6-svg component"
@@ -12,10 +11,10 @@ maintainer="John <me@johnnynator.dev>"
 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=3164504d7e3f640439308235739b112605ab5fc9cc517ca0b28f9fb93a8db0e3
+checksum=7b19f418e6f7b8e23344082dd04440aacf5da23c5a73980ba22ae4eba4f87df7
 
 if [ "$XBPS_CHECK_PKGS" ]; then
-	configure_args+=" -DQT_BUILD_TESTS=ON"
+	configure_args="-DQT_BUILD_TESTS=ON"
 fi
 
 do_check() {
@@ -29,8 +28,11 @@ qt6-svg-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From 02b5aeb09b55e90e161fae13d72d638bb0a2b72f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:10 +0700
Subject: [PATCH 15/26] qt6-tools: update to 6.3.1.

---
 srcpkgs/qt6-tools/template | 23 ++++++++++++++++++-----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/qt6-tools/template b/srcpkgs/qt6-tools/template
index f875dff5c046..fd311176e31d 100644
--- a/srcpkgs/qt6-tools/template
+++ b/srcpkgs/qt6-tools/template
@@ -1,23 +1,33 @@
 # Template file for 'qt6-tools'
 pkgname=qt6-tools
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qttools-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr "
-hostmakedepends="qt6-base-devel perl"
-makedepends="qt6-base-devel libatomic-devel"
+configure_args="-DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=TRUE
+ -DQT_BUILD_SHARED_LIBS=ON -DQT_FEATURE_assistant=ON"
+hostmakedepends="qt6-base-devel perl qt6-plugin-sqlite"
+makedepends="qt6-base-devel libatomic-devel qt6-plugin-sqlite"
 short_desc="Cross-platform application and UI framework (QT6) - qt6-tools component"
 maintainer="John <me@johnnynator.dev>"
 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/qttools-everywhere-src-${version}.tar.xz"
-checksum=fce94688ea925782a2879347584991f854630daadba6c52aed6d93e33cd0b19c
+checksum=c412750f2aa3beb93fce5f30517c607f55daaeb7d0407af206a8adf917e126c1
+
+if [ "$CROSS_BUILD" ]; then
+	hostmakedepends+=" qt6-tools-devel"
+fi
+
 
 if [ "$XBPS_CHECK_PKGS" ]; then
 	configure_args+=" -DQT_BUILD_TESTS=ON"
 fi
 
+post_build() {
+	ninja -C build ${makejobs} lib/qt6/libexec/qhelpgenerator
+}
+
 do_check() {
 	cd build
 	# Some of these tests expect that qt6-tools is already
@@ -31,8 +41,11 @@ qt6-tools-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From 534b47167d00e4373d319f15ed09e39c3b6369f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:10 +0700
Subject: [PATCH 16/26] qt6-translations: update to 6.3.1.

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

diff --git a/srcpkgs/qt6-translations/template b/srcpkgs/qt6-translations/template
index be0a74ca74e2..1b917ccb3620 100644
--- a/srcpkgs/qt6-translations/template
+++ b/srcpkgs/qt6-translations/template
@@ -1,10 +1,9 @@
 # Template file for 'qt6-translations'
 pkgname=qt6-translations
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qttranslations-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr "
 hostmakedepends="qt6-base-devel qt6-tools-devel perl"
 makedepends="qt6-base-devel qt6-tools-devel"
 short_desc="Cross-platform application and UI framework - translations"
@@ -12,4 +11,4 @@ maintainer="John <me@johnnynator.dev>"
 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=e4dd4ef892a34a9514a19238f189a33ed85c76f31dcad6599ced93b1e33440b3
+checksum=d7bdd55e2908ded901dcc262157100af2a490bf04d31e32995f6d91d78dfdb97

From ed98f626b710c9a7f439d1de022275241d2217ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:10 +0700
Subject: [PATCH 17/26] qt6-virtualkeyboard: update to 6.3.1.

---
 srcpkgs/qt6-virtualkeyboard/template | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/qt6-virtualkeyboard/template b/srcpkgs/qt6-virtualkeyboard/template
index 67ecef145ea1..77a247400b97 100644
--- a/srcpkgs/qt6-virtualkeyboard/template
+++ b/srcpkgs/qt6-virtualkeyboard/template
@@ -1,10 +1,9 @@
 # Template file for 'qt6-virtualkeyboard'
 pkgname=qt6-virtualkeyboard
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qtvirtualkeyboard-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr"
 hostmakedepends="perl pkg-config qt6-declarative-devel"
 makedepends="qt6-declarative-devel qt6-svg-devel hunspell-devel"
 short_desc="Cross-platform application and UI framework - virtualkeyboard"
@@ -12,10 +11,10 @@ maintainer="John <me@johnnynator.dev>"
 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=89aaf15acf5432af8f5cf4ec45cb32d87a3348906215dd56e81cb294eb276573
+checksum=5fe089b204d859ab0dd0169f811f2e30cae7c5cb36f8ab95ca36883f1fc0c2b8
 
 if [ "$XBPS_CHECK_PKGS" ]; then
-	configure_args+=" -DQT_BUILD_TESTS=ON"
+	configure_args="-DQT_BUILD_TESTS=ON"
 fi
 
 do_check() {
@@ -32,8 +31,11 @@ qt6-virtualkeyboard-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From 2ac70e6a27268820cdf74f740baed0b4bee41b57 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:10 +0700
Subject: [PATCH 18/26] qt6-wayland: update to 6.3.1.

---
 srcpkgs/qt6-wayland/template | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/qt6-wayland/template b/srcpkgs/qt6-wayland/template
index b71a273009b9..83afb34e229e 100644
--- a/srcpkgs/qt6-wayland/template
+++ b/srcpkgs/qt6-wayland/template
@@ -1,13 +1,14 @@
 # Template file for 'qt6-wayland'
 pkgname=qt6-wayland
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qtwayland-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true"
+configure_args="-DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true"
 hostmakedepends="qt6-base-devel perl pkg-config wayland-devel qt6-wayland-devel"
 # XXX: Qml as optional dep
 makedepends="qt6-base-devel wayland-devel libxkbcommon-devel
+ qt6-declarative-devel
  libXcomposite-devel MesaLib-devel Vulkan-Headers libdrm-devel"
 checkdepends="dbus mesa-dri"
 short_desc="Cross-platform application and UI framework - Wayland"
@@ -15,7 +16,7 @@ maintainer="John <me@johnnynator.dev>"
 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=e7b567f6e43ffc5918d4aa825ce1eced66a00cb0a87133b2912ba5c1b2a02190
+checksum=6f14fea2d172a5b4170be3efcb0e58535f6605b61bcd823f6d5c9d165bb8c0f0
 
 if [ "$XBPS_CHECK_PKGS" ]; then
 	configure_args+=" -DQT_BUILD_TESTS=ON"
@@ -32,9 +33,11 @@ qt6-wayland-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
-		vmove usr/lib/qt6/libexec/qtwaylandscanner
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From f12b18e78b313c6bafb7c98e3074160cd02bd18d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:10 +0700
Subject: [PATCH 19/26] qt6-websockets: update to 6.3.1.

---
 srcpkgs/qt6-websockets/template | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/qt6-websockets/template b/srcpkgs/qt6-websockets/template
index c2e674aacb31..4875af093432 100644
--- a/srcpkgs/qt6-websockets/template
+++ b/srcpkgs/qt6-websockets/template
@@ -1,10 +1,9 @@
 # Template file for 'qt6-websockets'
 pkgname=qt6-websockets
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qtwebsockets-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr"
 hostmakedepends="perl qt6-base-devel qt6-declarative-devel"
 makedepends="qt6-base-devel qt6-declarative-devel"
 short_desc="Cross-platform application and UI framework - websockets"
@@ -12,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 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=e018a09fe960b7d9560d6bbc9d3ca022fed6566e6ba6fc6d869a97482d4e6361
+checksum=9f980d90c97fcbde1b50c773f6dc580cfdf8c36ce14a1be3aa2ccadfe605121a
 
 qt6-websockets-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel>=${version}_1"
@@ -20,8 +19,11 @@ qt6-websockets-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From 6fc825796777e6819b1c2e3150ab72689e006ef3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Tue, 9 Aug 2022 20:16:47 +0700
Subject: [PATCH 20/26] qt6-3d: update to 6.3.1.

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

diff --git a/srcpkgs/qt6-3d/template b/srcpkgs/qt6-3d/template
index 666f57559532..c08c3bd4a41b 100644
--- a/srcpkgs/qt6-3d/template
+++ b/srcpkgs/qt6-3d/template
@@ -1,10 +1,9 @@
 # Template file for 'qt6-3d'
 pkgname=qt6-3d
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qt3d-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr"
 hostmakedepends="perl qt6-declarative-devel"
 makedepends="qt6-declarative-devel qt6-shadertools-devel libassimp-devel
  libatomic-devel"
@@ -13,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 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=74e762380dad34887878b9124dbfb981d5cf4b8b807281ff8bff311145b54de1
+checksum=9919b66dfb253fa26db1a7d664358cbc07f46c8810082ee3120d0a54b153edfe
 
 qt6-3d-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 04434a65d2d1f42e406ca2b627fdf29856c01df5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:11 +0700
Subject: [PATCH 21/26] New package: qt6-webchannel-6.3.1

---
 srcpkgs/qt6-webchannel-devel    |  1 +
 srcpkgs/qt6-webchannel/template | 32 ++++++++++++++++++++++++++++++++
 srcpkgs/qt6-webchannel/update   |  1 +
 3 files changed, 34 insertions(+)
 create mode 120000 srcpkgs/qt6-webchannel-devel
 create mode 100644 srcpkgs/qt6-webchannel/template
 create mode 100644 srcpkgs/qt6-webchannel/update

diff --git a/srcpkgs/qt6-webchannel-devel b/srcpkgs/qt6-webchannel-devel
new file mode 120000
index 000000000000..03e8b23d785d
--- /dev/null
+++ b/srcpkgs/qt6-webchannel-devel
@@ -0,0 +1 @@
+qt6-webchannel
\ No newline at end of file
diff --git a/srcpkgs/qt6-webchannel/template b/srcpkgs/qt6-webchannel/template
new file mode 100644
index 000000000000..432c42bcc056
--- /dev/null
+++ b/srcpkgs/qt6-webchannel/template
@@ -0,0 +1,32 @@
+# Template file for 'qt6-webchannel'
+pkgname=qt6-webchannel
+version=6.3.1
+revision=1
+wrksrc="qtwebchannel-everywhere-src-${version}"
+build_style=cmake
+hostmakedepends="perl qt6-base-devel qt6-declarative-devel"
+makedepends="qt6-base-devel qt6-declarative-devel qt6-websockets-devel"
+short_desc="Cross-platform application and UI framework - webchannel"
+maintainer="John <me@johnnynator.dev>"
+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=aaa20ac23f86992721b7ee487c379a3fd68caa8cdcea0a77a37e0d8b47ff2668
+
+qt6-webchannel-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel>=${version}_1
+	 qt6-websockets-devel>=${version}_1"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
+		vmove usr/lib/qt6/mkspecs
+		vmove usr/lib/qt6/qml/QtWebChannel/plugins.qmltypes
+		vmove usr/lib/qt6/qml/QtWebChannel/qmldir
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
+	}
+}
diff --git a/srcpkgs/qt6-webchannel/update b/srcpkgs/qt6-webchannel/update
new file mode 100644
index 000000000000..844552465222
--- /dev/null
+++ b/srcpkgs/qt6-webchannel/update
@@ -0,0 +1 @@
+pkgname="${pkgname/6-/}-everywhere-src"

From 65abb8ef76f2cad30e1235dfb1eab573381d8ec5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:11 +0700
Subject: [PATCH 22/26] New package: qt6-multimedia-6.3.1

---
 common/shlibs                   |  3 +++
 srcpkgs/qt6-multimedia-devel    |  1 +
 srcpkgs/qt6-multimedia/template | 33 +++++++++++++++++++++++++++++++++
 srcpkgs/qt6-multimedia/update   |  1 +
 4 files changed, 38 insertions(+)
 create mode 120000 srcpkgs/qt6-multimedia-devel
 create mode 100644 srcpkgs/qt6-multimedia/template
 create mode 100644 srcpkgs/qt6-multimedia/update

diff --git a/common/shlibs b/common/shlibs
index ea6fde4ffe31..da78faa689d5 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2077,6 +2077,9 @@ libQt6SerialPort.so.6 qt6-serialport-6.2.0alpha_1
 libQt6WebSockets.so.6 qt6-websockets-6.2.0alpha_1
 libQt6WebChannel.so.6 qt6-webchannel-6.2.0alpha_1
 libQt6Positioning.so.6 qt6-location-6.2.0alpha_1
+libQt6MultimediaWidgets.so.6 qt6-multimedia-6.3.1_1
+libQt6MultimediaQuick.so.6 qt6-multimedia-6.3.1_1
+libQt6Multimedia.so.6 qt6-multimedia-6.3.1_1
 libnpth.so.0 npth-1.1_1
 libnpupnp.so.4 libnpupnp-4.0.2_1
 libglfw.so.3 glfw-3.0.4_1
diff --git a/srcpkgs/qt6-multimedia-devel b/srcpkgs/qt6-multimedia-devel
new file mode 120000
index 000000000000..9343446502d0
--- /dev/null
+++ b/srcpkgs/qt6-multimedia-devel
@@ -0,0 +1 @@
+qt6-multimedia
\ No newline at end of file
diff --git a/srcpkgs/qt6-multimedia/template b/srcpkgs/qt6-multimedia/template
new file mode 100644
index 000000000000..535a2f55ffe4
--- /dev/null
+++ b/srcpkgs/qt6-multimedia/template
@@ -0,0 +1,33 @@
+# Template file for 'qt6-multimedia'
+pkgname=qt6-multimedia
+version=6.3.1
+revision=1
+wrksrc="qtmultimedia-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DQT_FEATURE_gstreamer=ON"
+hostmakedepends="perl qt6-declarative-devel pkg-config
+ qt6-shadertools-devel"
+makedepends="qt6-declarative-devel
+ qt6-shadertools-devel libglib-devel gst-plugins-base1-devel"
+short_desc="Cross-platform application and UI framework - multimedia"
+maintainer="John <me@johnnynator.dev>"
+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=7e03242aadd634ff2d9fcf08948290f03da3d9a5012369d908da89f82b1d7336
+
+qt6-multimedia-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel>=${version}_1"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
+		vmove usr/lib/qt6/mkspecs
+		vmove usr/lib/qt6/qml/QtMultimedia/plugins.qmltypes
+		vmove usr/lib/qt6/qml/QtMultimedia/qmldir
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}
diff --git a/srcpkgs/qt6-multimedia/update b/srcpkgs/qt6-multimedia/update
new file mode 100644
index 000000000000..844552465222
--- /dev/null
+++ b/srcpkgs/qt6-multimedia/update
@@ -0,0 +1 @@
+pkgname="${pkgname/6-/}-everywhere-src"

From 43b70afd56891b217e4b30ec1797b9034774f288 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 18:22:48 +0700
Subject: [PATCH 23/26] New package: qt6-connectivity-6.3.1

---
 common/shlibs                     |  2 ++
 srcpkgs/qt6-connectivity-devel    |  1 +
 srcpkgs/qt6-connectivity/template | 30 ++++++++++++++++++++++++++++++
 3 files changed, 33 insertions(+)
 create mode 120000 srcpkgs/qt6-connectivity-devel
 create mode 100644 srcpkgs/qt6-connectivity/template

diff --git a/common/shlibs b/common/shlibs
index da78faa689d5..d46643fc31ed 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2071,6 +2071,8 @@ libQt6Designer.so.6 qt6-tools-6.1.0_1
 libQt6DesignerComponents.so.6 qt6-tools-6.1.0_1
 libQt6Help.so.6 qt6-tools-6.1.0_1
 libQt6UiTools.so.6 qt6-tools-6.1.0_1
+libQt6Nfc.so.6 qt6-connectivity-6.3.1_1
+libQt6Bluetooth.so.6 qt6-connectivity-6.3.1_1
 libQt6HunspellInputMethod.so.6 qt6-virtualkeyboard-6.1.0_1
 libQt6VirtualKeyboard.so.6 qt6-virtualkeyboard-6.1.0_1
 libQt6SerialPort.so.6 qt6-serialport-6.2.0alpha_1
diff --git a/srcpkgs/qt6-connectivity-devel b/srcpkgs/qt6-connectivity-devel
new file mode 120000
index 000000000000..478cc9d8aa39
--- /dev/null
+++ b/srcpkgs/qt6-connectivity-devel
@@ -0,0 +1 @@
+qt6-connectivity
\ No newline at end of file
diff --git a/srcpkgs/qt6-connectivity/template b/srcpkgs/qt6-connectivity/template
new file mode 100644
index 000000000000..6cb61744d0cb
--- /dev/null
+++ b/srcpkgs/qt6-connectivity/template
@@ -0,0 +1,30 @@
+# Template file for 'qt6-connectivity'
+pkgname=qt6-connectivity
+version=6.3.1
+revision=1
+wrksrc="qtconnectivity-everywhere-src-${version}"
+build_style=cmake
+hostmakedepends="perl qt6-declarative-devel"
+makedepends="qt6-declarative-devel"
+short_desc="Cross-platform application and UI framework - Connectivity"
+maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
+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=b25ce4710a9c61bc6a5dbaeeb3e2ed907a8bc85478fdb2ab4312297768b695b0
+
+qt6-connectivity-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}
+	 qt6-declarative>=${version}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
+		vmove usr/lib/qt6/mkspecs
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
+	}
+}

From f10536d5ca7d61b01adbed03eb7cceb39e7dc17c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 18:22:57 +0700
Subject: [PATCH 24/26] New package: qt6-sensors-6.3.1

---
 common/shlibs                |  2 ++
 srcpkgs/qt6-sensors-devel    |  1 +
 srcpkgs/qt6-sensors/template | 31 +++++++++++++++++++++++++++++++
 3 files changed, 34 insertions(+)
 create mode 120000 srcpkgs/qt6-sensors-devel
 create mode 100644 srcpkgs/qt6-sensors/template

diff --git a/common/shlibs b/common/shlibs
index d46643fc31ed..f6284eee1bae 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2073,6 +2073,8 @@ libQt6Help.so.6 qt6-tools-6.1.0_1
 libQt6UiTools.so.6 qt6-tools-6.1.0_1
 libQt6Nfc.so.6 qt6-connectivity-6.3.1_1
 libQt6Bluetooth.so.6 qt6-connectivity-6.3.1_1
+libQt6Sensors.so.6 qt6-sensors-6.3.1_1
+libQt6SensorsQuick.so.6 qt6-sensors-6.3.1_1
 libQt6HunspellInputMethod.so.6 qt6-virtualkeyboard-6.1.0_1
 libQt6VirtualKeyboard.so.6 qt6-virtualkeyboard-6.1.0_1
 libQt6SerialPort.so.6 qt6-serialport-6.2.0alpha_1
diff --git a/srcpkgs/qt6-sensors-devel b/srcpkgs/qt6-sensors-devel
new file mode 120000
index 000000000000..eb9457f04055
--- /dev/null
+++ b/srcpkgs/qt6-sensors-devel
@@ -0,0 +1 @@
+qt6-sensors
\ No newline at end of file
diff --git a/srcpkgs/qt6-sensors/template b/srcpkgs/qt6-sensors/template
new file mode 100644
index 000000000000..5a81f43b60eb
--- /dev/null
+++ b/srcpkgs/qt6-sensors/template
@@ -0,0 +1,31 @@
+# Template file for 'qt6-sensors'
+pkgname=qt6-sensors
+version=6.3.1
+revision=1
+wrksrc="qtsensors-everywhere-src-${version}"
+build_style=cmake
+hostmakedepends="perl qt6-declarative-devel qt6-svg-devel pkg-config"
+makedepends="qt6-declarative-devel qt6-svg-devel"
+short_desc="Cross-platform application and UI framework - Sensors"
+maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
+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=4b240b59edba9a42b4735758a25f279a26841b982864e7b38f6ef0b81e0d60cc
+
+qt6-sensors-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}
+	 qt6-declarative-devel>=${version}_1"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
+		vmove usr/lib/qt6/mkspecs
+		vmove usr/lib/qt6/qml/QtSensors/plugins.qmltypes
+		vmove usr/lib/qt6/qml/QtSensors/qmldir
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}

From 46acc583861a5200039f9058b10c097a53f75b0d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 18:23:08 +0700
Subject: [PATCH 25/26] New package: qt6-remoteobjects-6.3.1

---
 common/shlibs                      |  2 ++
 srcpkgs/qt6-remoteobjects-devel    |  1 +
 srcpkgs/qt6-remoteobjects/template | 31 ++++++++++++++++++++++++++++++
 3 files changed, 34 insertions(+)
 create mode 120000 srcpkgs/qt6-remoteobjects-devel
 create mode 100644 srcpkgs/qt6-remoteobjects/template

diff --git a/common/shlibs b/common/shlibs
index f6284eee1bae..a0fab8869948 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2073,6 +2073,8 @@ libQt6Help.so.6 qt6-tools-6.1.0_1
 libQt6UiTools.so.6 qt6-tools-6.1.0_1
 libQt6Nfc.so.6 qt6-connectivity-6.3.1_1
 libQt6Bluetooth.so.6 qt6-connectivity-6.3.1_1
+libQt6RemoteObjects.so.6 qt6-remoteobjects-6.3.1_1
+libQt6RemoteObjectsQml.so.6 qt6-remoteobjects-6.3.1_1
 libQt6Sensors.so.6 qt6-sensors-6.3.1_1
 libQt6SensorsQuick.so.6 qt6-sensors-6.3.1_1
 libQt6HunspellInputMethod.so.6 qt6-virtualkeyboard-6.1.0_1
diff --git a/srcpkgs/qt6-remoteobjects-devel b/srcpkgs/qt6-remoteobjects-devel
new file mode 120000
index 000000000000..2a027f95266f
--- /dev/null
+++ b/srcpkgs/qt6-remoteobjects-devel
@@ -0,0 +1 @@
+qt6-remoteobjects
\ No newline at end of file
diff --git a/srcpkgs/qt6-remoteobjects/template b/srcpkgs/qt6-remoteobjects/template
new file mode 100644
index 000000000000..ebb06382c8d6
--- /dev/null
+++ b/srcpkgs/qt6-remoteobjects/template
@@ -0,0 +1,31 @@
+# Template file for 'qt6-remoteobjects'
+pkgname=qt6-remoteobjects
+version=6.3.1
+revision=1
+wrksrc="qtremoteobjects-everywhere-src-${version}"
+build_style=cmake
+hostmakedepends="perl qt6-declarative-devel pkg-config"
+makedepends="qt6-declarative-devel"
+short_desc="Cross-platform application and UI framework - Remote Objects"
+maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
+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=ea6d038b11c60981de0bd39a6091a59abf7d031e37bfc592b31be1217bef4ca6
+
+qt6-remoteobjects-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}
+	 qt6-declarative-devel>=${version}_1"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
+		vmove usr/lib/qt6/mkspecs
+		vmove usr/lib/qt6/qml/QtRemoteObjects/plugins.qmltypes
+		vmove usr/lib/qt6/qml/QtRemoteObjects/qmldir
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}

From 64f974f3b59a0bc2cb86296ce8064367e201d41d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:11 +0700
Subject: [PATCH 26/26] New package: qt6-webengine-6.3.1.

---
 common/shlibs                                 |    7 +
 srcpkgs/qt6-webengine-devel                   |    1 +
 srcpkgs/qt6-webengine-examples                |    1 +
 .../patches/0001-None-no-debug.patch          |   11 +
 .../patches/0002-enable-ppc64.patch           |   20 +
 .../patches/0003-cross-hack.patch             |   10 +
 .../0004-ppc-disable-jxl-decoder.patch        |   13 +
 .../patches/0050-no-glibc-cmake-check.patch   |   14 +
 .../0100-chromium-sandbox-membarrier.patch    |   58 +
 .../qt6-webengine/patches/0101-size_t.patch   |   16 +
 .../0102-chromium-90-ruy-include.patch        |   19 +
 ...-v8-monotonic-pthread-cont_timedwait.patch |   22 +
 .../0104-chromium-revert-9d080c0.patch        |  162 +
 ...-chromium-revert-drop-of-system-java.patch |   15 +
 .../patches/0106-chromium-system-nodejs.patch |   20 +
 .../0107-chromium-cursed^Uscoped_file.patch   |   18 +
 .../0108-chromium-fix-narrowing-cast.patch    |   53 +
 .../0109-chromium-remove-strip_binary.patch   |   32 +
 ...ium-revert-use-ffile-compilation-dir.patch |   57 +
 ...11-chromium-no-Wno-stringop-overread.patch |   10 +
 .../0150-chromium-glibc-libc_malloc.patch     |   24 +
 ...-include-sys-reg.h-to-get-__WORDSIZE.patch |   21 +
 .../0201-chromium-musl-dispatch-to-musl.patch |  103 +
 .../0202-chromium-musl-no-mallinfo.patch      |   62 +
 .../0203-chromium-musl-siginfo_t.patch        |   18 +
 .../0204-chromium-musl-stackstart.patch       |   20 +
 .../patches/0205-chromium-musl-sandbox.patch  |   92 +
 ...0206-chromium-musl-default-stacksize.patch |   15 +
 .../patches/0208-chromium-musl-execinfo.patch |  125 +
 .../0209-chromium-musl-thread-stacksize.patch |   22 +
 .../0210-chromium-musl-msgvec-push_back.patch |   14 +
 ...ium-musl-canonicalize-file-name-musl.patch |   11 +
 .../0212-chromium-musl-no-getcontext.patch    |   29 +
 .../patches/0213-chromium-musl-crashpad.patch |   24 +
 .../patches/0214-chromium-musl-fixes.patch    |  108 +
 .../patches/0215-chromium-musl-cdefs.patch    |   29 +
 .../patches/0216-chromium-musl-stat.patch     |   12 +
 .../patches/0217-chromium-musl-resolver.patch |   77 +
 .../patches/0600-chromium-sndio.patch         |  876 ++++
 .../patches/0700-armv7l-neon.patch            |   10 +
 ...-chromium-musl-cross-no-asm_ptrace_h.patch |   30 +
 .../0751-chromium-musl-arm-user_vfp.patch     |   20 +
 .../0752-chromium-musl-arm-elf_auxv_t.patch   |   18 +
 ...0801-chromium-i686-vaapi-fpermissive.patch |   24 +
 .../patches/0900-xxx-ppc64le-libvpx.patch     |   65 +
 .../0901-xxx-ppc64le-sandbox-linux-stat.patch |   31 +
 .../patches/0902-xxx-ppc64le-support.patch    | 3556 +++++++++++++++++
 .../0903-xxx-ppc64le-swiftshader.patch        |   18 +
 srcpkgs/qt6-webengine/template                |  178 +
 srcpkgs/qt6-webengine/update                  |    1 +
 50 files changed, 6192 insertions(+)
 create mode 120000 srcpkgs/qt6-webengine-devel
 create mode 120000 srcpkgs/qt6-webengine-examples
 create mode 100644 srcpkgs/qt6-webengine/patches/0001-None-no-debug.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0002-enable-ppc64.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0003-cross-hack.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0004-ppc-disable-jxl-decoder.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0050-no-glibc-cmake-check.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0100-chromium-sandbox-membarrier.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0101-size_t.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0102-chromium-90-ruy-include.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0103-chromium-v8-monotonic-pthread-cont_timedwait.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0104-chromium-revert-9d080c0.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0105-chromium-revert-drop-of-system-java.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0106-chromium-system-nodejs.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0107-chromium-cursed^Uscoped_file.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0108-chromium-fix-narrowing-cast.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0109-chromium-remove-strip_binary.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0110-chromium-revert-use-ffile-compilation-dir.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0111-chromium-no-Wno-stringop-overread.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0150-chromium-glibc-libc_malloc.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0200-chromium-musl-include-sys-reg.h-to-get-__WORDSIZE.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0201-chromium-musl-dispatch-to-musl.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0202-chromium-musl-no-mallinfo.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0203-chromium-musl-siginfo_t.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0204-chromium-musl-stackstart.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0205-chromium-musl-sandbox.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0206-chromium-musl-default-stacksize.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0208-chromium-musl-execinfo.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0209-chromium-musl-thread-stacksize.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0210-chromium-musl-msgvec-push_back.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0211-chromium-musl-canonicalize-file-name-musl.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0212-chromium-musl-no-getcontext.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0213-chromium-musl-crashpad.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0214-chromium-musl-fixes.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0215-chromium-musl-cdefs.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0216-chromium-musl-stat.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0217-chromium-musl-resolver.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0600-chromium-sndio.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0700-armv7l-neon.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0750-chromium-musl-cross-no-asm_ptrace_h.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0751-chromium-musl-arm-user_vfp.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0752-chromium-musl-arm-elf_auxv_t.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0801-chromium-i686-vaapi-fpermissive.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0900-xxx-ppc64le-libvpx.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0901-xxx-ppc64le-sandbox-linux-stat.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0902-xxx-ppc64le-support.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0903-xxx-ppc64le-swiftshader.patch
 create mode 100644 srcpkgs/qt6-webengine/template
 create mode 100644 srcpkgs/qt6-webengine/update

diff --git a/common/shlibs b/common/shlibs
index a0fab8869948..fa72f8ee24d2 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2086,6 +2086,13 @@ libQt6Positioning.so.6 qt6-location-6.2.0alpha_1
 libQt6MultimediaWidgets.so.6 qt6-multimedia-6.3.1_1
 libQt6MultimediaQuick.so.6 qt6-multimedia-6.3.1_1
 libQt6Multimedia.so.6 qt6-multimedia-6.3.1_1
+libQt6WebEngineQuick.so.6 qt6-webengine-6.3.1_1
+libQt6PdfWidgets.so.6 qt6-webengine-6.3.1_1
+libQt6PdfQuick.so.6 qt6-webengine-6.3.1_1
+libQt6WebEngineCore.so.6 qt6-webengine-6.3.1_1
+libQt6Pdf.so.6 qt6-webengine-6.3.1_1
+libQt6WebEngineQuickDelegatesQml.so.6 qt6-webengine-6.3.1_1
+libQt6WebEngineWidgets.so.6 qt6-webengine-6.3.1_1
 libnpth.so.0 npth-1.1_1
 libnpupnp.so.4 libnpupnp-4.0.2_1
 libglfw.so.3 glfw-3.0.4_1
diff --git a/srcpkgs/qt6-webengine-devel b/srcpkgs/qt6-webengine-devel
new file mode 120000
index 000000000000..8e4d1b99c587
--- /dev/null
+++ b/srcpkgs/qt6-webengine-devel
@@ -0,0 +1 @@
+qt6-webengine
\ No newline at end of file
diff --git a/srcpkgs/qt6-webengine-examples b/srcpkgs/qt6-webengine-examples
new file mode 120000
index 000000000000..8e4d1b99c587
--- /dev/null
+++ b/srcpkgs/qt6-webengine-examples
@@ -0,0 +1 @@
+qt6-webengine
\ No newline at end of file
diff --git a/srcpkgs/qt6-webengine/patches/0001-None-no-debug.patch b/srcpkgs/qt6-webengine/patches/0001-None-no-debug.patch
new file mode 100644
index 000000000000..1ba33f8e6fd9
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0001-None-no-debug.patch
@@ -0,0 +1,11 @@
+--- a/cmake/Functions.cmake
++++ b/cmake/Functions.cmake
+@@ -813,6 +813,8 @@ macro(append_build_type_setup)
+         endif()
+     elseif(${config} STREQUAL "MinSizeRel")
+         list(APPEND gnArgArg is_debug=false symbol_level=0 optimize_for_size=true)
++    elseif(${config} STREQUAL "None")
++        list(APPEND gnArgArg is_debug=false symbol_level=0)
+     endif()
+     if(FEATURE_developer_build OR (${config} STREQUAL "Debug") OR QT_FEATURE_webengine_sanitizer)
+         list(APPEND gnArgArg
diff --git a/srcpkgs/qt6-webengine/patches/0002-enable-ppc64.patch b/srcpkgs/qt6-webengine/patches/0002-enable-ppc64.patch
new file mode 100644
index 000000000000..d72ef1ad1a10
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0002-enable-ppc64.patch
@@ -0,0 +1,20 @@
+--- a/cmake/Functions.cmake
++++ b/cmake/Functions.cmake
+@@ -622,6 +622,8 @@ function(get_gn_arch result arch)
+         set(${result} "mipsel" PARENT_SCOPE)
+     elseif(arch STREQUAL "mipsel64")
+         set(${result} "mips64el" PARENT_SCOPE)
++    elseif(arch STREQUAL "power64")
++        set(${result} "power64" PARENT_SCOPE)
+     else()
+         message(DEBUG "Unsupported architecture: ${arch}")
+     endif()
+@@ -641,6 +643,8 @@ function(get_v8_arch result targetArch h
+             set(${result} "mipsel" PARENT_SCOPE)
+         elseif(hostArch STREQUAL "mipsel64")
+             set(${result} "mipsel" PARENT_SCOPE)
++        elseif(hostArch STREQUAL "power64")
++            set(${result} "power64" PARENT_SCOPE)
+         else()
+             message(DEBUG "Unsupported architecture: ${hostArch}")
+         endif()
diff --git a/srcpkgs/qt6-webengine/patches/0003-cross-hack.patch b/srcpkgs/qt6-webengine/patches/0003-cross-hack.patch
new file mode 100644
index 000000000000..ea9f90094a63
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0003-cross-hack.patch
@@ -0,0 +1,10 @@
+--- a/src/core/api/CMakeLists.txt
++++ b/src/core/api/CMakeLists.txt
+@@ -50,6 +50,7 @@ qt_internal_add_module(WebEngineCore
+         Qt::Gui
+         Qt::Network
+         Qt::Quick
++        X11
+ )
+ 
+ set_target_properties(WebEngineCore PROPERTIES QTWEBENGINEPROCESS_NAME ${qtWebEngineProcessName})
diff --git a/srcpkgs/qt6-webengine/patches/0004-ppc-disable-jxl-decoder.patch b/srcpkgs/qt6-webengine/patches/0004-ppc-disable-jxl-decoder.patch
new file mode 100644
index 000000000000..73c1151968f4
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0004-ppc-disable-jxl-decoder.patch
@@ -0,0 +1,13 @@
+--- a/src/core/CMakeLists.txt
++++ b/src/core/CMakeLists.txt
+@@ -414,6 +414,10 @@ foreach(arch ${archs})
+                 CONDITION QT_FEATURE_webengine_ozone_x11 AND XSCRNSAVER_FOUND
+             )
+ 
++            if (cpu STREQUAL "ppc64")
++                list(APPEND gnArgArg enable_jxl_decoder=false)
++            endif()
++
+             if(QT_FEATURE_webengine_kerberos)
+                 list(APPEND gnArgArg
+                      external_gssapi_include_dir="${GSSAPI_INCLUDE_DIRS}/gssapi"
diff --git a/srcpkgs/qt6-webengine/patches/0050-no-glibc-cmake-check.patch b/srcpkgs/qt6-webengine/patches/0050-no-glibc-cmake-check.patch
new file mode 100644
index 000000000000..f756bf0286bb
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0050-no-glibc-cmake-check.patch
@@ -0,0 +1,14 @@
+--- a/configure.cmake
++++ b/configure.cmake
+@@ -499,11 +499,6 @@ add_check_for_support(
+ )
+ add_check_for_support(
+    MODULES QtWebEngine QtPdf
+-   CONDITION NOT LINUX OR TEST_glibc
+-   MESSAGE "A suitable version >= 2.17 of glibc is required."
+-)
+-add_check_for_support(
+-   MODULES QtWebEngine QtPdf
+    CONDITION NOT LINUX OR TEST_khr
+    MESSAGE "Build requires Khronos development headers for build - see mesa/libegl1-mesa-dev"
+ )
diff --git a/srcpkgs/qt6-webengine/patches/0100-chromium-sandbox-membarrier.patch b/srcpkgs/qt6-webengine/patches/0100-chromium-sandbox-membarrier.patch
new file mode 100644
index 000000000000..2dd7b4aa948f
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0100-chromium-sandbox-membarrier.patch
@@ -0,0 +1,58 @@
+--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
++++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
+@@ -413,6 +413,7 @@ bool SyscallSets::IsAllowedProcessStartO
+   switch (sysno) {
+     case __NR_exit:
+     case __NR_exit_group:
++    case __NR_membarrier:
+     case __NR_wait4:
+     case __NR_waitid:
+ #if defined(__i386__)
+--- a/src/3rdparty/chromium/sandbox/linux/system_headers/arm64_linux_syscalls.h
++++ b/src/3rdparty/chromium/sandbox/linux/system_headers/arm64_linux_syscalls.h
+@@ -1215,4 +1215,8 @@
+ #define __NR_landlock_restrict_self 446
+ #endif
+ 
++#if !defined(__NR_membarrier)
++#define __NR_membarrier 283
++#endif
++
+ #endif  // SANDBOX_LINUX_SYSTEM_HEADERS_ARM64_LINUX_SYSCALLS_H_
+--- a/src/3rdparty/chromium/sandbox/linux/system_headers/arm_linux_syscalls.h
++++ b/src/3rdparty/chromium/sandbox/linux/system_headers/arm_linux_syscalls.h
+@@ -1617,6 +1617,10 @@
+ #define __NR_landlock_restrict_self (__NR_SYSCALL_BASE + 446)
+ #endif
+ 
++#if !defined(__NR_membarrier)
++#define __NR_membarrier (__NR_SYSCALL_BASE+389)
++#endif
++
+ // ARM private syscalls.
+ #if !defined(__ARM_NR_BASE)
+ #define __ARM_NR_BASE (__NR_SYSCALL_BASE + 0xF0000)
+--- a/src/3rdparty/chromium/sandbox/linux/system_headers/x86_32_linux_syscalls.h
++++ b/src/3rdparty/chromium/sandbox/linux/system_headers/x86_32_linux_syscalls.h
+@@ -1750,5 +1750,9 @@
+ #define __NR_landlock_restrict_self 446
+ #endif
+ 
++#if !defined(__NR_membarrier)
++#define __NR_membarrier 375
++#endif
++
+ #endif  // SANDBOX_LINUX_SYSTEM_HEADERS_X86_32_LINUX_SYSCALLS_H_
+ 
+--- a/src/3rdparty/chromium/sandbox/linux/system_headers/x86_64_linux_syscalls.h
++++ b/src/3rdparty/chromium/sandbox/linux/system_headers/x86_64_linux_syscalls.h
+@@ -1438,5 +1438,9 @@
+ #define __NR_landlock_restrict_self 446
+ #endif
+ 
++#if !defined(__NR_membarrier)
++#define __NR_membarrier 324
++#endif
++
+ #endif  // SANDBOX_LINUX_SYSTEM_HEADERS_X86_64_LINUX_SYSCALLS_H_
+ 
diff --git a/srcpkgs/qt6-webengine/patches/0101-size_t.patch b/srcpkgs/qt6-webengine/patches/0101-size_t.patch
new file mode 100644
index 000000000000..fccc085da311
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0101-size_t.patch
@@ -0,0 +1,16 @@
+--- a/src/3rdparty/chromium/third_party/angle/include/platform/PlatformMethods.h
++++ b/src/3rdparty/chromium/third_party/angle/include/platform/PlatformMethods.h
+@@ -239,11 +239,11 @@ inline void DefaultOverrideFeaturesMtl(P
+ using ProgramKeyType   = std::array<uint8_t, 20>;
+ using CacheProgramFunc = void (*)(PlatformMethods *platform,
+                                   const ProgramKeyType &key,
+-                                  size_t programSize,
++                                  std::size_t programSize,
+                                   const uint8_t *programBytes);
+ inline void DefaultCacheProgram(PlatformMethods *platform,
+                                 const ProgramKeyType &key,
+-                                size_t programSize,
++                                std::size_t programSize,
+                                 const uint8_t *programBytes)
+ {}
+ 
diff --git a/srcpkgs/qt6-webengine/patches/0102-chromium-90-ruy-include.patch b/srcpkgs/qt6-webengine/patches/0102-chromium-90-ruy-include.patch
new file mode 100644
index 000000000000..bbba579076d6
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0102-chromium-90-ruy-include.patch
@@ -0,0 +1,19 @@
+From 714092f336bb14d2fcc27396ec323b3d843bb962 Mon Sep 17 00:00:00 2001
+From: Stephan Hartmann <stha09@googlemail.com>
+Date: Thu, 4 Mar 2021 15:05:46 +0000
+Subject: [PATCH] IWYU: include limits for std::numeric_limits
+
+---
+ third_party/ruy/src/ruy/block_map.cc | 1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/src/3rdparty/chromium/third_party/ruy/src/ruy/block_map.cc
++++ b/src/3rdparty/chromium/third_party/ruy/src/ruy/block_map.cc
+@@ -17,6 +17,7 @@ limitations under the License.
+ 
+ #include <algorithm>
+ #include <cstdint>
++#include <limits>
+ 
+ #ifdef RUY_MAKEBLOCKMAP_DEBUG
+ #include <cstdio>
diff --git a/srcpkgs/qt6-webengine/patches/0103-chromium-v8-monotonic-pthread-cont_timedwait.patch b/srcpkgs/qt6-webengine/patches/0103-chromium-v8-monotonic-pthread-cont_timedwait.patch
new file mode 100644
index 000000000000..1dc8bc4d3d17
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0103-chromium-v8-monotonic-pthread-cont_timedwait.patch
@@ -0,0 +1,22 @@
+Use monotonic clock for pthread_cond_timedwait with musl too.
+
+--- a/src/3rdparty/chromium/v8/src/base/platform/condition-variable.cc
++++ b/src/3rdparty/chromium/v8/src/base/platform/condition-variable.cc
+@@ -20,7 +20,7 @@ namespace base {
+ 
+ ConditionVariable::ConditionVariable() {
+ #if (V8_OS_FREEBSD || V8_OS_NETBSD || V8_OS_OPENBSD || \
+-     (V8_OS_LINUX && V8_LIBC_GLIBC))
++     V8_OS_LINUX)
+   // On Free/Net/OpenBSD and Linux with glibc we can change the time
+   // source for pthread_cond_timedwait() to use the monotonic clock.
+   pthread_condattr_t attr;
+@@ -96,7 +96,7 @@ bool ConditionVariable::WaitFor(Mutex* m
+       &native_handle_, &mutex->native_handle(), &ts);
+ #else
+ #if (V8_OS_FREEBSD || V8_OS_NETBSD || V8_OS_OPENBSD || \
+-     (V8_OS_LINUX && V8_LIBC_GLIBC))
++     V8_OS_LINUX)
+   // On Free/Net/OpenBSD and Linux with glibc we can change the time
+   // source for pthread_cond_timedwait() to use the monotonic clock.
+   result = clock_gettime(CLOCK_MONOTONIC, &ts);
diff --git a/srcpkgs/qt6-webengine/patches/0104-chromium-revert-9d080c0.patch b/srcpkgs/qt6-webengine/patches/0104-chromium-revert-9d080c0.patch
new file mode 100644
index 000000000000..42b1ee9ec063
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0104-chromium-revert-9d080c0.patch
@@ -0,0 +1,162 @@
+ Original change's description:
+ > Replace 'blacklist' with 'ignorelist' in ./tools/msan/.
+ >
+ > Bug: 1097272, 1097268
+ > Change-Id: Id5c8227a5bfb1ffaec82d3168b609085b10c8297
+ > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2867730
+ > Commit-Queue: Dylan Cutler <dylancutler@google.com>
+ > Reviewed-by: Nico Weber <thakis@chromium.org>
+ > Reviewed-by: Jonathan Metzman <metzman@chromium.org>
+ > Cr-Commit-Position: refs/heads/master@{#883035}
+--- a/src/3rdparty/chromium/build/config/sanitizers/BUILD.gn
++++ b/src/3rdparty/chromium/build/config/sanitizers/BUILD.gn
+@@ -272,11 +272,11 @@ config("asan_flags") {
+   if (is_asan) {
+     cflags += [ "-fsanitize=address" ]
+     if (is_win) {
+-      if (!defined(asan_win_blocklist_path)) {
+-        asan_win_blocklist_path =
++      if (!defined(asan_win_blacklist_path)) {
++        asan_win_blacklist_path =
+             rebase_path("//tools/memory/asan/blocklist_win.txt", root_build_dir)
+       }
+-      cflags += [ "-fsanitize-ignorelist=$asan_win_blocklist_path" ]
++      cflags += [ "-fsanitize-blacklist=$asan_win_blacklist_path" ]
+     }
+   }
+ }
+@@ -306,13 +306,13 @@ config("link_shared_library") {
+ config("cfi_flags") {
+   cflags = []
+   if (is_cfi && current_toolchain == default_toolchain) {
+-    if (!defined(cfi_ignorelist_path)) {
+-      cfi_ignorelist_path =
++    if (!defined(cfi_blacklist_path)) {
++      cfi_blacklist_path =
+           rebase_path("//tools/cfi/ignores.txt", root_build_dir)
+     }
+     cflags += [
+       "-fsanitize=cfi-vcall",
+-      "-fsanitize-ignorelist=$cfi_ignorelist_path",
++      "-fsanitize-blacklist=$cfi_blacklist_path",
+     ]
+ 
+     if (use_cfi_cast) {
+@@ -409,14 +409,14 @@ config("msan_flags") {
+   if (is_msan) {
+     assert(is_linux || is_chromeos,
+            "msan only supported on linux x86_64/ChromeOS")
+-    if (!defined(msan_ignorelist_path)) {
+-      msan_ignorelist_path =
+-          rebase_path("//tools/msan/ignorelist.txt", root_build_dir)
++    if (!defined(msan_blacklist_path)) {
++      msan_blacklist_path =
++          rebase_path("//tools/msan/blacklist.txt", root_build_dir)
+     }
+     cflags = [
+       "-fsanitize=memory",
+       "-fsanitize-memory-track-origins=$msan_track_origins",
+-      "-fsanitize-ignorelist=$msan_ignorelist_path",
++      "-fsanitize-blacklist=$msan_blacklist_path",
+     ]
+   }
+ }
+@@ -424,13 +424,13 @@ config("msan_flags") {
+ config("tsan_flags") {
+   if (is_tsan) {
+     assert(is_linux || is_chromeos, "tsan only supported on linux x86_64")
+-    if (!defined(tsan_ignorelist_path)) {
+-      tsan_ignorelist_path =
++    if (!defined(tsan_blacklist_path)) {
++      tsan_blacklist_path =
+           rebase_path("//tools/memory/tsan_v2/ignores.txt", root_build_dir)
+     }
+     cflags = [
+       "-fsanitize=thread",
+-      "-fsanitize-ignorelist=$tsan_ignorelist_path",
++      "-fsanitize-blacklist=$tsan_blacklist_path",
+     ]
+   }
+ }
+@@ -438,8 +438,8 @@ config("tsan_flags") {
+ config("ubsan_flags") {
+   cflags = []
+   if (is_ubsan) {
+-    if (!defined(ubsan_ignorelist_path)) {
+-      ubsan_ignorelist_path =
++    if (!defined(ubsan_blacklist_path)) {
++      ubsan_blacklist_path =
+           rebase_path("//tools/ubsan/ignorelist.txt", root_build_dir)
+     }
+     cflags += [
+@@ -456,7 +456,7 @@ config("ubsan_flags") {
+       "-fsanitize=signed-integer-overflow",
+       "-fsanitize=unreachable",
+       "-fsanitize=vla-bound",
+-      "-fsanitize-ignorelist=$ubsan_ignorelist_path",
++      "-fsanitize-blacklist=$ubsan_blacklist_path",
+     ]
+     if (!is_clang) {
+       # These exposes too much illegal C++14 code to compile on anything stricter than clang:
+@@ -497,8 +497,8 @@ config("ubsan_no_recover") {
+ 
+ config("ubsan_security_flags") {
+   if (is_ubsan_security) {
+-    if (!defined(ubsan_security_ignorelist_path)) {
+-      ubsan_security_ignorelist_path =
++    if (!defined(ubsan_security_blacklist_path)) {
++      ubsan_security_blacklist_path =
+           rebase_path("//tools/ubsan/security_ignorelist.txt", root_build_dir)
+     }
+     cflags = [
+@@ -506,7 +506,7 @@ config("ubsan_security_flags") {
+       "-fsanitize=shift",
+       "-fsanitize=signed-integer-overflow",
+       "-fsanitize=vla-bound",
+-      "-fsanitize-ignorelist=$ubsan_security_ignorelist_path",
++      "-fsanitize-blacklist=$ubsan_security_blacklist_path",
+     ]
+   }
+ }
+@@ -519,13 +519,13 @@ config("ubsan_null_flags") {
+ 
+ config("ubsan_vptr_flags") {
+   if (is_ubsan_vptr) {
+-    if (!defined(ubsan_vptr_ignorelist_path)) {
+-      ubsan_vptr_ignorelist_path =
++    if (!defined(ubsan_vptr_blacklist_path)) {
++      ubsan_vptr_blacklist_path =
+           rebase_path("//tools/ubsan/vptr_ignorelist.txt", root_build_dir)
+     }
+     cflags = [
+       "-fsanitize=vptr",
+-      "-fsanitize-ignorelist=$ubsan_vptr_ignorelist_path",
++      "-fsanitize-blacklist=$ubsan_vptr_blacklist_path",
+     ]
+     if (!is_clang) {
+       # Clang specific flag:
+--- a/src/3rdparty/chromium/build_overrides/build.gni
++++ b/src/3rdparty/chromium/build_overrides/build.gni
+@@ -43,15 +43,15 @@ declare_args() {
+ # Allows different projects to specify their own suppression/ignore lists for
+ # sanitizer tools.
+ # asan_suppressions_file = "path/to/asan_suppressions.cc"
+-# asan_win_ignorelist_path = "path/to/asan/blocklist_win.txt"
++# asan_win_blacklist_path = "path/to/asan/blocklist_win.txt"
+ # lsan_suppressions_file = "path/to/lsan_suppressions.cc"
+ # tsan_suppressions_file = "path/to/tsan_suppressions.cc"
+-# tsan_ignorelist_path = "path/to/tsan/ignores.txt"
+-# msan_ignorelist_path = "path/to/msan/ignorelist.txt"
+-# ubsan_ignorelist_path = "path/to/ubsan/ignorelist.txt"
+-# ubsan_vptr_ignorelist_path = "path/to/ubsan/vptr_ignorelist.txt"
+-# ubsan_security_ignorelist_path = "path/to/ubsan/security_ignorelist.txt"
+-# cfi_ignorelist_path = "path/to/cfi/ignores.txt"
++# tsan_blacklist_path = "path/to/tsan/ignores.txt"
++# msan_blacklist_path = "path/to/msan/blacklist.txt"
++# ubsan_blacklist_path = "path/to/ubsan/blacklist.txt"
++# ubsan_vptr_blacklist_path = "path/to/ubsan/vptr_blacklist.txt"
++# ubsan_security_blacklist_path = "path/to/ubsan/security_blacklist.txt"
++# cfi_blacklist_path = "path/to/cfi/ignores.txt"
+ 
+ declare_args() {
+   # Android 32-bit non-component, non-clang builds cannot have symbol_level=2
diff --git a/srcpkgs/qt6-webengine/patches/0105-chromium-revert-drop-of-system-java.patch b/srcpkgs/qt6-webengine/patches/0105-chromium-revert-drop-of-system-java.patch
new file mode 100644
index 000000000000..44f3aa8fae5e
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0105-chromium-revert-drop-of-system-java.patch
@@ -0,0 +1,15 @@
+This was dropped for some reason in 6951c37cecd05979b232a39e5c10e6346a0f74ef
+--- a/src/3rdparty/chromium/third_party/closure_compiler/compiler.py
++++ b/src/3rdparty/chromium/third_party/closure_compiler/compiler.py
+@@ -13,8 +13,9 @@ import subprocess
+ 
+ 
+ _CURRENT_DIR = os.path.join(os.path.dirname(__file__))
+-_JAVA_PATH = os.path.join(_CURRENT_DIR, "..", "jdk", "current", "bin", "java")
+-assert os.path.isfile(_JAVA_PATH), "java only allowed in android builds"
++_JAVA_BIN = "java"
++_JDK_PATH = os.path.join(_CURRENT_DIR, "..", "jdk", "current", "bin", "java")
++_JAVA_PATH = _JDK_PATH if os.path.isfile(_JDK_PATH) else _JAVA_BIN
+ 
+ class Compiler(object):
+   """Runs the Closure compiler on given source files to typecheck them
diff --git a/srcpkgs/qt6-webengine/patches/0106-chromium-system-nodejs.patch b/srcpkgs/qt6-webengine/patches/0106-chromium-system-nodejs.patch
new file mode 100644
index 000000000000..1e067cc6eda0
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0106-chromium-system-nodejs.patch
@@ -0,0 +1,20 @@
+--- a/src/3rdparty/chromium/third_party/node/node.py
++++ b/src/3rdparty/chromium/third_party/node/node.py
+@@ -36,11 +36,12 @@ def GetBinaryPath():
+   if platform.system() == 'Darwin' and platform.machine() == 'arm64':
+       return os.path.join(os_path.join(os_path.dirname(__file__), 'mac',
+                           'node-darwin-arm64', 'bin', 'node'))
+-  return os_path.join(os_path.dirname(__file__), *{
+-    'Darwin': ('mac', 'node-darwin-x64', 'bin', 'node'),
+-    'Linux': ('linux', 'node-linux-x64', 'bin', 'node'),
+-    'Windows': ('win', 'node.exe'),
+-  }[platform.system()])
++  return "/usr/bin/node"
++  #return os_path.join(os_path.dirname(__file__), *{
++  #  'Darwin': ('mac', 'node-darwin-x64', 'bin', 'node'),
++  #  'Linux': ('linux', 'node-linux-x64', 'bin', 'node'),
++  #  'Windows': ('win', 'node.exe'),
++  #}[platform.system()])
+ 
+ 
+ def RunNode(cmd_parts, stdout=None):
diff --git a/srcpkgs/qt6-webengine/patches/0107-chromium-cursed^Uscoped_file.patch b/srcpkgs/qt6-webengine/patches/0107-chromium-cursed^Uscoped_file.patch
new file mode 100644
index 000000000000..a8f5d971883d
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0107-chromium-cursed^Uscoped_file.patch
@@ -0,0 +1,18 @@
+--- a/src/3rdparty/chromium/base/files/scoped_file_linux.cc
++++ b/src/3rdparty/chromium/base/files/scoped_file_linux.cc
+@@ -77,15 +77,3 @@ bool IsFDOwned(int fd) {
+ }
+ 
+ }  // namespace base
+-
+-extern "C" {
+-
+-int __close(int);
+-
+-__attribute__((visibility("default"), noinline)) int close(int fd) {
+-  if (base::IsFDOwned(fd) && g_is_ownership_enforced)
+-    CrashOnFdOwnershipViolation();
+-  return __close(fd);
+-}
+-
+-}  // extern "C"
diff --git a/srcpkgs/qt6-webengine/patches/0108-chromium-fix-narrowing-cast.patch b/srcpkgs/qt6-webengine/patches/0108-chromium-fix-narrowing-cast.patch
new file mode 100644
index 000000000000..ed32cd9b7415
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0108-chromium-fix-narrowing-cast.patch
@@ -0,0 +1,53 @@
+--- a/src/3rdparty/chromium/base/files/file_util_linux.cc
++++ b/src/3rdparty/chromium/base/files/file_util_linux.cc
+@@ -23,14 +23,14 @@ bool GetFileSystemType(const FilePath& p
+ 
+   // Not all possible |statfs_buf.f_type| values are in linux/magic.h.
+   // Missing values are copied from the statfs man page.
+-  switch (statfs_buf.f_type) {
++  switch (static_cast<uintmax_t>(statfs_buf.f_type)) {
+     case 0:
+       *type = FILE_SYSTEM_0;
+       break;
+     case EXT2_SUPER_MAGIC:  // Also ext3 and ext4
+     case MSDOS_SUPER_MAGIC:
+     case REISERFS_SUPER_MAGIC:
+-    case static_cast<int>(BTRFS_SUPER_MAGIC):
++    case BTRFS_SUPER_MAGIC:
+     case 0x5346544E:  // NTFS
+     case 0x58465342:  // XFS
+     case 0x3153464A:  // JFS
+@@ -40,14 +40,14 @@ bool GetFileSystemType(const FilePath& p
+       *type = FILE_SYSTEM_NFS;
+       break;
+     case SMB_SUPER_MAGIC:
+-    case static_cast<int>(0xFF534D42):  // CIFS
++    case 0xFF534D42:  // CIFS
+       *type = FILE_SYSTEM_SMB;
+       break;
+     case CODA_SUPER_MAGIC:
+       *type = FILE_SYSTEM_CODA;
+       break;
+-    case static_cast<int>(HUGETLBFS_MAGIC):
+-    case static_cast<int>(RAMFS_MAGIC):
++    case HUGETLBFS_MAGIC:
++    case RAMFS_MAGIC:
+     case TMPFS_MAGIC:
+       *type = FILE_SYSTEM_MEMORY;
+       break;
+--- a/src/3rdparty/chromium/base/system/sys_info_posix.cc
++++ b/src/3rdparty/chromium/base/system/sys_info_posix.cc
+@@ -100,10 +100,10 @@ bool IsStatsZeroIfUnlimited(const base::
+   if (HANDLE_EINTR(statfs(path.value().c_str(), &stats)) != 0)
+     return false;
+ 
+-  switch (stats.f_type) {
++  switch (static_cast<uintmax_t>(stats.f_type)) {
+     case TMPFS_MAGIC:
+-    case static_cast<int>(HUGETLBFS_MAGIC):
+-    case static_cast<int>(RAMFS_MAGIC):
++    case HUGETLBFS_MAGIC:
++    case RAMFS_MAGIC:
+       return true;
+   }
+   return false;
diff --git a/srcpkgs/qt6-webengine/patches/0109-chromium-remove-strip_binary.patch b/srcpkgs/qt6-webengine/patches/0109-chromium-remove-strip_binary.patch
new file mode 100644
index 000000000000..5ebd16e659af
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0109-chromium-remove-strip_binary.patch
@@ -0,0 +1,32 @@
+--- a/src/3rdparty/chromium/chrome/test/chromedriver/BUILD.gn
++++ b/src/3rdparty/chromium/chrome/test/chromedriver/BUILD.gn
+@@ -308,11 +308,7 @@ source_set("lib") {
+   }
+ }
+ 
+-if (is_linux) {
+-  chromedriver_output = "chromedriver.unstripped"
+-} else {
+-  chromedriver_output = "chromedriver"
+-}
++chromedriver_output = "chromedriver"
+ 
+ executable("$chromedriver_output") {
+   testonly = true
+@@ -336,16 +332,6 @@ executable("$chromedriver_output") {
+   }
+ }
+ 
+-if (is_linux) {
+-  strip_binary("chromedriver") {
+-    testonly = true
+-    binary_input = "$root_out_dir/$chromedriver_output"
+-    symbol_output = "$root_out_dir/chromedriver.debug"
+-    stripped_binary_output = "$root_out_dir/chromedriver"
+-    deps = [ ":$chromedriver_output" ]
+-  }
+-}
+-
+ python_library("chromedriver_py_tests") {
+   testonly = true
+   deps = [
diff --git a/srcpkgs/qt6-webengine/patches/0110-chromium-revert-use-ffile-compilation-dir.patch b/srcpkgs/qt6-webengine/patches/0110-chromium-revert-use-ffile-compilation-dir.patch
new file mode 100644
index 000000000000..a00f7ea80f7a
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0110-chromium-revert-use-ffile-compilation-dir.patch
@@ -0,0 +1,57 @@
+From 34a955823630096f5b01c2b01d51c1ea59d22763 Mon Sep 17 00:00:00 2001
+From: Zequan Wu <zequanwu@google.com>
+Date: Tue, 20 Jul 2021 14:13:50 +0000
+Subject: [PATCH] Use -ffile-compilation-dir= instead of
+ -fdebug-compilation-dir=
+
+Bug: 1010267
+Change-Id: If2b4ead8535a76490eb466a38e3d8fed6ea91079
+Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2770738
+Auto-Submit: Zequan Wu <zequanwu@google.com>
+Commit-Queue: Nico Weber <thakis@chromium.org>
+Reviewed-by: Nico Weber <thakis@chromium.org>
+Cr-Commit-Position: refs/heads/master@{#903456}
+--- a/src/3rdparty/chromium/build/config/compiler/BUILD.gn
++++ b/src/3rdparty/chromium/build/config/compiler/BUILD.gn
+@@ -1269,19 +1269,12 @@ config("compiler_deterministic") {
+     # different build directory like "out/feature_a" and "out/feature_b" if
+     # we build same files with same compile flag.
+     # Other paths are already given in relative, no need to normalize them.
+-    if (is_nacl) {
+-      # TODO(https://crbug.com/1231236): Use -ffile-compilation-dir= here.
+-      cflags += [
+-        "-Xclang",
+-        "-fdebug-compilation-dir",
+-        "-Xclang",
+-        ".",
+-      ]
+-    } else {
+-      # -ffile-compilation-dir is an alias for both -fdebug-compilation-dir=
+-      # and -fcoverage-compilation-dir=.
+-      cflags += [ "-ffile-compilation-dir=." ]
+-    }
++    cflags += [
++      "-Xclang",
++      "-fdebug-compilation-dir",
++      "-Xclang",
++      ".",
++    ]
+     if (!is_win) {
+       # We don't use clang -cc1as on Windows (yet? https://crbug.com/762167)
+       asmflags = [ "-Wa,-fdebug-compilation-dir,." ]
+--- a/src/3rdparty/chromium/build/config/compiler/compiler.gni
++++ b/src/3rdparty/chromium/build/config/compiler/compiler.gni
+@@ -228,8 +228,11 @@ declare_args() {
+ # deterministic builds to reduce compile times, so this is less relevant for
+ # official builders.
+ strip_absolute_paths_from_debug_symbols_default =
+-    is_android || is_fuchsia || is_nacl || (is_win && use_lld) || is_linux ||
+-    is_chromeos || (is_apple && !enable_dsyms)
++    # TODO(crbug.com/1010267): remove '!use_clang_coverage', coverage build has
++    # dependency to absolute path of source files.
++    !use_clang_coverage &&
++    (is_android || is_fuchsia || is_nacl || (is_win && use_lld) || is_linux ||
++     is_chromeos || (is_apple && !enable_dsyms))
+ 
+ declare_args() {
+   strip_absolute_paths_from_debug_symbols = strip_absolute_paths_from_debug_symbols_default
diff --git a/srcpkgs/qt6-webengine/patches/0111-chromium-no-Wno-stringop-overread.patch b/srcpkgs/qt6-webengine/patches/0111-chromium-no-Wno-stringop-overread.patch
new file mode 100644
index 000000000000..03eac3f8e067
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0111-chromium-no-Wno-stringop-overread.patch
@@ -0,0 +1,10 @@
+--- a/src/3rdparty/chromium/build/config/compiler/BUILD.gn
++++ b/src/3rdparty/chromium/build/config/compiler/BUILD.gn
+@@ -394,7 +394,6 @@ config("compiler") {
+         "-Wno-parentheses",
+         "-Wno-sign-compare", # fido
+         "-Wno-stringop-overflow", # skia, libaom, protobuf, icu
+-        "-Wno-stringop-overread", # libaom
+         "-Wno-psabi", # skia
+         "-Wno-multichar", # crashpad
+         "-Wno-format-zero-length", # user_agent.cc
diff --git a/srcpkgs/qt6-webengine/patches/0150-chromium-glibc-libc_malloc.patch b/srcpkgs/qt6-webengine/patches/0150-chromium-glibc-libc_malloc.patch
new file mode 100644
index 000000000000..7e1b66e5c73d
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0150-chromium-glibc-libc_malloc.patch
@@ -0,0 +1,24 @@
+--- a/src/3rdparty/chromium/base/process/memory_linux.cc
++++ b/src/3rdparty/chromium/base/process/memory_linux.cc
+@@ -23,6 +23,12 @@
+ #include "third_party/tcmalloc/chromium/src/gperftools/tcmalloc.h"
+ #endif
+ 
++#if defined(LIBC_GLIBC)
++extern "C" {
++extern void *__libc_malloc(size_t size);
++}
++#endif
++
+ namespace base {
+ 
+ namespace {
+@@ -120,7 +126,7 @@ bool UncheckedMalloc(size_t size, void**
+     (!defined(LIBC_GLIBC) && !BUILDFLAG(USE_TCMALLOC))
+   *result = malloc(size);
+ #elif defined(LIBC_GLIBC) && !BUILDFLAG(USE_TCMALLOC)
+-  *result = __libc_malloc(size);
++  *result = ::__libc_malloc(size);
+ #elif BUILDFLAG(USE_TCMALLOC)
+   *result = tc_malloc_skip_new_handler(size);
+ #endif
diff --git a/srcpkgs/qt6-webengine/patches/0200-chromium-musl-include-sys-reg.h-to-get-__WORDSIZE.patch b/srcpkgs/qt6-webengine/patches/0200-chromium-musl-include-sys-reg.h-to-get-__WORDSIZE.patch
new file mode 100644
index 000000000000..41b90071b5e4
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0200-chromium-musl-include-sys-reg.h-to-get-__WORDSIZE.patch
@@ -0,0 +1,21 @@
+From 9001c54d6b974449174a8cee8f3f5d78a9bd6c9e Mon Sep 17 00:00:00 2001
+From: Felix Janda <felix.janda@posteo.de>
+Date: Sun, 1 Feb 2015 14:26:52 +0100
+Subject: [PATCH 3/6] include <sys/reg.h> to get __WORDSIZE on musl libc
+
+---
+ qtwebengine/src/3rdparty/chromium/third_party/breakpad/breakpad/src/common/linux/elf_core_dump.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/common/linux/elf_core_dump.h
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/common/linux/elf_core_dump.h
+@@ -37,6 +37,9 @@
+ #include <limits.h>
+ #include <link.h>
+ #include <stddef.h>
++#ifndef __GLIBC__
++#include <sys/reg.h>
++#endif
+ 
+ #include "common/memory_range.h"
+ 
diff --git a/srcpkgs/qt6-webengine/patches/0201-chromium-musl-dispatch-to-musl.patch b/srcpkgs/qt6-webengine/patches/0201-chromium-musl-dispatch-to-musl.patch
new file mode 100644
index 000000000000..a58a688a4b55
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0201-chromium-musl-dispatch-to-musl.patch
@@ -0,0 +1,103 @@
+--- a/src/3rdparty/chromium/base/allocator/allocator_shim_default_dispatch_to_glibc.cc
++++ b/src/3rdparty/chromium/base/allocator/allocator_shim_default_dispatch_to_glibc.cc
+@@ -8,6 +8,7 @@
+ #include <dlfcn.h>
+ #include <malloc.h>
+ 
++#if defined(__GLIBC__)
+ // This translation unit defines a default dispatch for the allocator shim which
+ // routes allocations to libc functions.
+ // The code here is strongly inspired from tcmalloc's libc_override_glibc.h.
+@@ -87,3 +88,92 @@ const AllocatorDispatch AllocatorDispatc
+     nullptr,               /* aligned_free_function */
+     nullptr,               /* next */
+ };
++
++#else // defined(__GLIBC__)
++
++#include <dlfcn.h>
++
++extern "C" {
++// Declare function pointers to the memory functions
++typedef void* (*t_libc_malloc)(size_t size);
++typedef void* (*t_libc_calloc)(size_t n, size_t size);
++typedef void* (*t_libc_realloc)(void* address, size_t size);
++typedef void* (*t_libc_memalign)(size_t alignment, size_t size);
++typedef void (*t_libc_free)(void* ptr);
++typedef size_t (*t_libc_malloc_usable_size)(void* ptr);
++
++// Static instances of pointers to libc.so dl symbols
++static t_libc_malloc libc_malloc = NULL;
++static t_libc_calloc libc_calloc = NULL;
++static t_libc_realloc libc_realloc = NULL;
++static t_libc_memalign libc_memalign = NULL;
++static t_libc_free libc_free = NULL;
++static t_libc_malloc_usable_size libc_malloc_usable_size = NULL;
++
++// resolve the symbols in libc.so
++void musl_libc_memory_init(void)
++{
++  libc_malloc = (t_libc_malloc) dlsym(RTLD_NEXT, "malloc");
++  libc_calloc = (t_libc_calloc) dlsym(RTLD_NEXT, "calloc");
++  libc_realloc = (t_libc_realloc) dlsym(RTLD_NEXT, "realloc");
++  libc_memalign = (t_libc_memalign) dlsym(RTLD_NEXT, "memalign");
++  libc_free = (t_libc_free) dlsym(RTLD_NEXT, "free");
++  libc_malloc_usable_size = (t_libc_malloc_usable_size) dlsym(RTLD_NEXT, "malloc_usable_size");
++}
++}  // extern "C"
++
++namespace {
++
++using base::allocator::AllocatorDispatch;
++
++void* MuslMalloc(const AllocatorDispatch*, size_t size, void* context) {
++  if (!libc_malloc)
++    musl_libc_memory_init();
++  return (*libc_malloc)(size);
++}
++
++void* MuslCalloc(const AllocatorDispatch*, size_t n, size_t size, void* context) {
++  if (!libc_calloc)
++    musl_libc_memory_init();
++  return (*libc_calloc)(n, size);
++}
++
++void* MuslRealloc(const AllocatorDispatch*, void* address, size_t size, void* context) {
++  if (!libc_realloc)
++    musl_libc_memory_init();
++  return (*libc_realloc)(address, size);
++}
++
++void* MuslMemalign(const AllocatorDispatch*, size_t alignment, size_t size, void* context) {
++  if (!libc_memalign)
++    musl_libc_memory_init();
++  return (*libc_memalign)(alignment, size);
++}
++
++void MuslFree(const AllocatorDispatch*, void* address, void* context) {
++  if (!libc_free)
++    musl_libc_memory_init();
++  (*libc_free)(address);
++}
++
++size_t MuslGetSizeEstimate(const AllocatorDispatch*, void* address, void* context) {
++  // TODO(siggi, primiano): malloc_usable_size may need redirection in the
++  //     presence of interposing shims that divert allocations.
++  if (!libc_malloc_usable_size)
++    musl_libc_memory_init();
++  return (*libc_malloc_usable_size)(address);
++}
++
++}  // namespace
++
++const AllocatorDispatch AllocatorDispatch::default_dispatch = {
++    &MuslMalloc,           /* alloc_function */
++    &MuslCalloc,           /* alloc_zero_initialized_function */
++    &MuslMemalign,         /* alloc_aligned_function */
++    &MuslRealloc,          /* realloc_function */
++    &MuslFree,             /* free_function */
++    &MuslGetSizeEstimate,  /* get_size_estimate_function */
++    nullptr,               /* next */
++};
++
++#endif
diff --git a/srcpkgs/qt6-webengine/patches/0202-chromium-musl-no-mallinfo.patch b/srcpkgs/qt6-webengine/patches/0202-chromium-musl-no-mallinfo.patch
new file mode 100644
index 000000000000..a5bdb5a43a5f
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0202-chromium-musl-no-mallinfo.patch
@@ -0,0 +1,62 @@
+--- a/src/3rdparty/chromium/base/process/process_metrics_posix.cc
++++ b/src/3rdparty/chromium/base/process/process_metrics_posix.cc
+@@ -105,7 +105,7 @@ void IncreaseFdLimitTo(unsigned int max_
+ 
+ #endif  // !defined(OS_FUCHSIA)
+ 
+-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID)
++#if (defined(OS_LINUX) && defined(__GLIBC__)) || defined(OS_CHROMEOS) || defined(OS_ANDROID)
+ namespace {
+ 
+ size_t GetMallocUsageMallinfo() {
+@@ -127,16 +127,16 @@ size_t GetMallocUsageMallinfo() {
+ }
+ 
+ }  // namespace
+-#endif  // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID)
++#endif  // (defined(OS_LINUX) && defined(__GLIBC__)) || defined(OS_CHROMEOS) || defined(OS_ANDROID)
+ 
+ size_t ProcessMetrics::GetMallocUsage() {
+ #if defined(OS_APPLE)
+   malloc_statistics_t stats = {0};
+   malloc_zone_statistics(nullptr, &stats);
+   return stats.size_in_use;
+-#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID)
++#elif (defined(OS_LINUX) && defined(__GLIBC__)) || defined(OS_CHROMEOS) || defined(OS_ANDROID)
+   return GetMallocUsageMallinfo();
+-#elif defined(OS_FUCHSIA)
++#else
+   // TODO(fuchsia): Not currently exposed. https://crbug.com/735087.
+   return 0;
+ #endif
+--- a/src/3rdparty/chromium/third_party/tflite/src/tensorflow/lite/profiling/memory_info.cc
++++ b/src/3rdparty/chromium/third_party/tflite/src/tensorflow/lite/profiling/memory_info.cc
+@@ -27,7 +27,7 @@ namespace memory {
+ const int MemoryUsage::kValueNotSet = 0;
+ 
+ bool MemoryUsage::IsSupported() {
+-#ifdef __linux__
++#ifdef __GLIBC__
+   return true;
+ #endif
+   return false;
+@@ -35,7 +35,7 @@ bool MemoryUsage::IsSupported() {
+ 
+ MemoryUsage GetMemoryUsage() {
+   MemoryUsage result;
+-#ifdef __linux__
++#ifdef __GLIBC__
+   rusage res;
+   if (getrusage(RUSAGE_SELF, &res) == 0) {
+     result.max_rss_kb = res.ru_maxrss;
+--- a/src/3rdparty/chromium/base/trace_event/malloc_dump_provider.cc
++++ b/src/3rdparty/chromium/base/trace_event/malloc_dump_provider.cc
+@@ -213,7 +213,7 @@ bool MallocDumpProvider::OnMemoryDump(co
+                      &allocated_objects_count);
+ #elif defined(OS_FUCHSIA)
+ // TODO(fuchsia): Port, see https://crbug.com/706592.
+-#else
++#elif defined(__GLIBC__)
+ #if defined(__GLIBC__) && defined(__GLIBC_PREREQ)
+ #if __GLIBC_PREREQ(2, 33)
+ #define MALLINFO2_FOUND_IN_LIBC
diff --git a/srcpkgs/qt6-webengine/patches/0203-chromium-musl-siginfo_t.patch b/srcpkgs/qt6-webengine/patches/0203-chromium-musl-siginfo_t.patch
new file mode 100644
index 000000000000..43ef7fd7c5d2
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0203-chromium-musl-siginfo_t.patch
@@ -0,0 +1,18 @@
+There's a subtle difference in the internal name of siginfo_t fields
+between glibc and musl. The structure itself is equivalent, so it
+should suffice to add a macro to rename the field.
+
+--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf/trap.cc
++++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf/trap.cc
+@@ -174,7 +174,11 @@ void Trap::SigSys(int nr, LinuxSigInfo*
+   // If the version of glibc doesn't include this information in
+   // siginfo_t (older than 2.17), we need to explicitly copy it
+   // into an arch_sigsys structure.
++#if defined(__GLIBC__)
+   memcpy(&sigsys, &info->_sifields, sizeof(sigsys));
++#else
++  memcpy(&sigsys, &info->__si_fields, sizeof(sigsys));
++#endif
+ #endif
+ 
+ #if defined(__mips__)
diff --git a/srcpkgs/qt6-webengine/patches/0204-chromium-musl-stackstart.patch b/srcpkgs/qt6-webengine/patches/0204-chromium-musl-stackstart.patch
new file mode 100644
index 000000000000..b03cf43b86db
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0204-chromium-musl-stackstart.patch
@@ -0,0 +1,20 @@
+--- a/src/3rdparty/chromium/third_party/blink/renderer/platform/wtf/stack_util.cc
++++ b/src/3rdparty/chromium/third_party/blink/renderer/platform/wtf/stack_util.cc
+@@ -29,7 +29,7 @@ size_t GetUnderestimatedStackSize() {
+ // FIXME: On Mac OSX and Linux, this method cannot estimate stack size
+ // correctly for the main thread.
+ 
+-#elif defined(__GLIBC__) || defined(OS_ANDROID) || defined(OS_FREEBSD) || \
++#elif defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FREEBSD) || \
+     defined(OS_FUCHSIA)
+   // pthread_getattr_np() can fail if the thread is not invoked by
+   // pthread_create() (e.g., the main thread of blink_unittests).
+@@ -97,7 +97,7 @@ return Threading::ThreadStackSize();
+ }
+ 
+ void* GetStackStart() {
+-#if defined(__GLIBC__) || defined(OS_ANDROID) || defined(OS_FREEBSD) || \
++#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FREEBSD) || \
+     defined(OS_FUCHSIA)
+   pthread_attr_t attr;
+   int error;
diff --git a/srcpkgs/qt6-webengine/patches/0205-chromium-musl-sandbox.patch b/srcpkgs/qt6-webengine/patches/0205-chromium-musl-sandbox.patch
new file mode 100644
index 000000000000..772a578fd823
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0205-chromium-musl-sandbox.patch
@@ -0,0 +1,92 @@
+--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc
++++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc
+@@ -138,7 +138,7 @@ namespace sandbox {
+ // present (as in newer versions of posix_spawn).
+ ResultExpr RestrictCloneToThreadsAndEPERMFork() {
+   const Arg<unsigned long> flags(0);
+-
++#if defined(__GLIBC__)
+   // TODO(mdempsky): Extend DSL to support (flags & ~mask1) == mask2.
+   const uint64_t kAndroidCloneMask = CLONE_VM | CLONE_FS | CLONE_FILES |
+                                      CLONE_SIGHAND | CLONE_THREAD |
+@@ -165,6 +165,17 @@ ResultExpr RestrictCloneToThreadsAndEPER
+   return If(IsAndroid() ? android_test : glibc_test, Allow())
+       .ElseIf(is_fork_or_clone_vfork, Error(EPERM))
+       .Else(CrashSIGSYSClone());
++#else
++  const int required = CLONE_VM | CLONE_FS | CLONE_FILES | CLONE_SIGHAND |
++                       CLONE_THREAD | CLONE_SYSVSEM;
++  const int safe = CLONE_SETTLS | CLONE_PARENT_SETTID | CLONE_CHILD_CLEARTID |
++                   CLONE_DETACHED;
++  const BoolExpr thread_clone_ok = (flags&~safe)==required;
++
++  return If(thread_clone_ok, Allow())
++      .ElseIf((flags & (CLONE_VM | CLONE_THREAD)) == 0, Error(EPERM))
++      .Else(CrashSIGSYSClone());
++#endif
+ }
+ 
+ #ifndef PR_PAC_RESET_KEYS
+--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
++++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
+@@ -419,6 +419,9 @@ bool SyscallSets::IsAllowedProcessStartO
+ #if defined(__i386__)
+     case __NR_waitpid:
+ #endif
++#if !defined(__GLIBC__)
++    case __NR_set_tid_address:
++#endif
+       return true;
+     case __NR_clone:  // Should be parameter-restricted.
+     case __NR_setns:  // Privileged.
+@@ -431,7 +434,9 @@ bool SyscallSets::IsAllowedProcessStartO
+ #if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
+     case __NR_set_thread_area:
+ #endif
++#if defined(__GLIBC__)
+     case __NR_set_tid_address:
++#endif
+     case __NR_unshare:
+ #if !defined(__mips__) && !defined(__aarch64__)
+     case __NR_vfork:
+@@ -545,6 +550,9 @@ bool SyscallSets::IsAllowedAddressSpaceA
+     case __NR_mlock:
+     case __NR_munlock:
+     case __NR_munmap:
++#if !defined(__GLIBC__)
++    case __NR_mremap:
++#endif
+       return true;
+     case __NR_madvise:
+     case __NR_mincore:
+@@ -562,7 +570,9 @@ bool SyscallSets::IsAllowedAddressSpaceA
+     case __NR_modify_ldt:
+ #endif
+     case __NR_mprotect:
++#if defined(__GLIBC__)
+     case __NR_mremap:
++#endif
+     case __NR_msync:
+     case __NR_munlockall:
+     case __NR_readahead:
+--- a/src/3rdparty/chromium/sandbox/policy/linux/bpf_renderer_policy_linux.cc
++++ b/src/3rdparty/chromium/sandbox/policy/linux/bpf_renderer_policy_linux.cc
+@@ -97,11 +97,18 @@ ResultExpr RendererProcessPolicy::Evalua
+     case __NR_sysinfo:
+     case __NR_times:
+     case __NR_uname:
++#if !defined(__GLIBC__)
++    case __NR_sched_getparam:
++    case __NR_sched_getscheduler:
++    case __NR_sched_setscheduler:
++#endif
+       return Allow();
+     case __NR_sched_getaffinity:
++#if defined(__GLIBC__)
+     case __NR_sched_getparam:
+     case __NR_sched_getscheduler:
+     case __NR_sched_setscheduler:
++#endif
+       return RestrictSchedTarget(GetPolicyPid(), sysno);
+     case __NR_prlimit64:
+       // See crbug.com/662450 and setrlimit comment above.
diff --git a/srcpkgs/qt6-webengine/patches/0206-chromium-musl-default-stacksize.patch b/srcpkgs/qt6-webengine/patches/0206-chromium-musl-default-stacksize.patch
new file mode 100644
index 000000000000..bc07495b8144
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0206-chromium-musl-default-stacksize.patch
@@ -0,0 +1,15 @@
+--- a/src/3rdparty/chromium/base/threading/platform_thread_linux.cc
++++ b/src/3rdparty/chromium/base/threading/platform_thread_linux.cc
+@@ -439,7 +439,12 @@ void TerminateOnThread() {}
+ 
+ size_t GetDefaultThreadStackSize(const pthread_attr_t& attributes) {
+ #if !defined(THREAD_SANITIZER)
++#if defined(__GLIBC__)
+   return 0;
++#else // defined(__GLIBC__)
++  // For Musl libc try with a default stack size of 2 MiB
++  return 2 * 1024 * 1024;
++#endif // !defined(__GLIBC__)
+ #else
+   // ThreadSanitizer bloats the stack heavily. Evidence has been that the
+   // default stack size isn't enough for some browser tests.
diff --git a/srcpkgs/qt6-webengine/patches/0208-chromium-musl-execinfo.patch b/srcpkgs/qt6-webengine/patches/0208-chromium-musl-execinfo.patch
new file mode 100644
index 000000000000..9f3b964676b3
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0208-chromium-musl-execinfo.patch
@@ -0,0 +1,125 @@
+--- a/src/3rdparty/chromium/base/debug/stack_trace.cc
++++ b/src/3rdparty/chromium/base/debug/stack_trace.cc
+@@ -252,7 +252,9 @@ void StackTrace::Print() const {
+ }
+ 
+ void StackTrace::OutputToStream(std::ostream* os) const {
++#if defined(__GLIBC__) && !defined(_AIX)
+   OutputToStreamWithPrefix(os, nullptr);
++#endif
+ }
+ 
+ std::string StackTrace::ToString() const {
+@@ -260,7 +262,7 @@ std::string StackTrace::ToString() const
+ }
+ std::string StackTrace::ToStringWithPrefix(const char* prefix_string) const {
+   std::stringstream stream;
+-#if !defined(__UCLIBC__) && !defined(_AIX)
++#if defined(__GLIBC__) && !defined(_AIX)
+   OutputToStreamWithPrefix(&stream, prefix_string);
+ #endif
+   return stream.str();
+--- a/src/3rdparty/chromium/base/debug/stack_trace_posix.cc
++++ b/src/3rdparty/chromium/base/debug/stack_trace_posix.cc
+@@ -27,7 +27,7 @@
+ #if !defined(USE_SYMBOLIZE)
+ #include <cxxabi.h>
+ #endif
+-#if !defined(__UCLIBC__) && !defined(_AIX)
++#if defined(__GLIBC__) && !defined(_AIX)
+ #include <execinfo.h>
+ #endif
+ 
+@@ -89,7 +89,7 @@ void DemangleSymbols(std::string* text)
+   // Note: code in this function is NOT async-signal safe (std::string uses
+   // malloc internally).
+ 
+-#if !defined(__UCLIBC__) && !defined(_AIX)
++#if defined(__GLIBC__) && !defined(_AIX)
+   std::string::size_type search_from = 0;
+   while (search_from < text->size()) {
+     // Look for the start of a mangled symbol, from search_from.
+@@ -124,7 +124,7 @@ void DemangleSymbols(std::string* text)
+       search_from = mangled_start + 2;
+     }
+   }
+-#endif  // !defined(__UCLIBC__) && !defined(_AIX)
++#endif  // !defined(__GLIBC__) && !defined(_AIX)
+ }
+ #endif  // !defined(USE_SYMBOLIZE)
+ 
+@@ -136,7 +136,7 @@ class BacktraceOutputHandler {
+   virtual ~BacktraceOutputHandler() = default;
+ };
+ 
+-#if !defined(__UCLIBC__) && !defined(_AIX)
++#if defined(__GLIBC__) && !defined(_AIX)
+ void OutputPointer(void* pointer, BacktraceOutputHandler* handler) {
+   // This should be more than enough to store a 64-bit number in hex:
+   // 16 hex digits + 1 for null-terminator.
+@@ -219,7 +219,7 @@ void ProcessBacktrace(void* const* trace
+   }
+ #endif  // defined(USE_SYMBOLIZE)
+ }
+-#endif  // !defined(__UCLIBC__) && !defined(_AIX)
++#endif  // !defined(__GLIBC__) && !defined(_AIX)
+ 
+ void PrintToStderr(const char* output) {
+   // NOTE: This code MUST be async-signal safe (it's used by in-process
+@@ -839,7 +839,7 @@ size_t CollectStackTrace(void** trace, s
+   // If we do not have unwind tables, then try tracing using frame pointers.
+   return base::debug::TraceStackFramePointers(const_cast<const void**>(trace),
+                                               count, 0);
+-#elif !defined(__UCLIBC__) && !defined(_AIX)
++#elif defined(__GLIBC__) && !defined(_AIX)
+   // Though the backtrace API man page does not list any possible negative
+   // return values, we take no chance.
+   return base::saturated_cast<size_t>(backtrace(trace, count));
+@@ -852,13 +852,13 @@ void StackTrace::PrintWithPrefix(const c
+ // NOTE: This code MUST be async-signal safe (it's used by in-process
+ // stack dumping signal handler). NO malloc or stdio is allowed here.
+ 
+-#if !defined(__UCLIBC__) && !defined(_AIX)
++#if defined(__GLIBC__) && !defined(_AIX)
+   PrintBacktraceOutputHandler handler;
+   ProcessBacktrace(trace_, count_, prefix_string, &handler);
+ #endif
+ }
+ 
+-#if !defined(__UCLIBC__) && !defined(_AIX)
++#if defined(__GLIBC__) && !defined(_AIX)
+ void StackTrace::OutputToStreamWithPrefix(std::ostream* os,
+                                           const char* prefix_string) const {
+   StreamBacktraceOutputHandler handler(os);
+--- a/src/3rdparty/chromium/base/logging.cc
++++ b/src/3rdparty/chromium/base/logging.cc
+@@ -582,7 +582,7 @@ LogMessage::LogMessage(const char* file,
+ 
+ LogMessage::~LogMessage() {
+   size_t stack_start = stream_.tellp();
+-#if !defined(OFFICIAL_BUILD) && !defined(OS_NACL) && !defined(__UCLIBC__) && \
++#if !defined(OFFICIAL_BUILD) && !defined(OS_NACL) && defined(__GLIBC__) && \
+     !defined(OS_AIX)
+   if (severity_ == LOGGING_FATAL && !base::debug::BeingDebugged()) {
+     // Include a stack trace on a fatal, unless a debugger is attached.
+--- 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 @@
+ 
+ #if defined(DEBUG) && defined(V8_OS_LINUX) && !defined(V8_OS_ANDROID)
+ #define SYMBOLIZE_FUNCTION
++#if defined(__GLIBC__)
+ #include <execinfo.h>
++#endif
+ 
+ #include <vector>
+ 
+@@ -103,7 +105,7 @@ void ExternalReferenceTable::Init(Isolat
+ }
+ 
+ const char* ExternalReferenceTable::ResolveSymbol(void* address) {
+-#ifdef SYMBOLIZE_FUNCTION
++#if defined(SYMBOLIZE_FUNCTION) && defined(__GLIBC__)
+   char** names = backtrace_symbols(&address, 1);
+   const char* name = names[0];
+   // The array of names is malloc'ed. However, each name string is static
diff --git a/srcpkgs/qt6-webengine/patches/0209-chromium-musl-thread-stacksize.patch b/srcpkgs/qt6-webengine/patches/0209-chromium-musl-thread-stacksize.patch
new file mode 100644
index 000000000000..4b760a428b25
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0209-chromium-musl-thread-stacksize.patch
@@ -0,0 +1,22 @@
+--- a/src/3rdparty/chromium/ppapi/utility/threading/simple_thread.cc
++++ b/src/3rdparty/chromium/ppapi/utility/threading/simple_thread.cc
+@@ -13,7 +13,7 @@ namespace pp {
+ namespace {
+ 
+ // Use 2MB default stack size for Native Client, otherwise use system default.
+-#if defined(__native_client__)
++#if defined(__native_client__) || !defined(__GLIBC__)
+ const size_t kDefaultStackSize = 2 * 1024 * 1024;
+ #else
+ const size_t kDefaultStackSize = 0;
+--- a/src/3rdparty/chromium/v8/src/base/platform/platform-posix.cc
++++ b/src/3rdparty/chromium/v8/src/base/platform/platform-posix.cc
+@@ -883,7 +883,7 @@ bool Thread::Start() {
+ #if V8_OS_MACOSX
+     // Default on Mac OS X is 512kB -- bump up to 1MB
+     stack_size = 1 * 1024 * 1024;
+-#elif V8_OS_AIX
++#elif V8_OS_AIX || !defined(__GLIBC__)
+     // Default on AIX is 96kB -- bump up to 2MB
+     stack_size = 2 * 1024 * 1024;
+ #endif
diff --git a/srcpkgs/qt6-webengine/patches/0210-chromium-musl-msgvec-push_back.patch b/srcpkgs/qt6-webengine/patches/0210-chromium-musl-msgvec-push_back.patch
new file mode 100644
index 000000000000..905daa223700
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0210-chromium-musl-msgvec-push_back.patch
@@ -0,0 +1,14 @@
+--- a/src/3rdparty/chromium/net/socket/udp_socket_posix.cc
++++ b/src/3rdparty/chromium/net/socket/udp_socket_posix.cc
+@@ -1162,7 +1162,11 @@ SendResult UDPSocketPosixSender::Interna
+     msg_iov->push_back({const_cast<char*>(buffer->data()), buffer->length()});
+   msgvec->reserve(buffers.size());
+   for (size_t j = 0; j < buffers.size(); j++)
++#if defined(__GLIBC__)
+     msgvec->push_back({{nullptr, 0, &msg_iov[j], 1, nullptr, 0, 0}, 0});
++#else
++    msgvec->push_back({{nullptr, 0, &msg_iov[j], 1, 0, 0, 0}, 0});
++#endif
+   int result = HANDLE_EINTR(Sendmmsg(fd, &msgvec[0], buffers.size(), 0));
+   SendResult send_result(0, 0, std::move(buffers));
+   if (result < 0) {
diff --git a/srcpkgs/qt6-webengine/patches/0211-chromium-musl-canonicalize-file-name-musl.patch b/srcpkgs/qt6-webengine/patches/0211-chromium-musl-canonicalize-file-name-musl.patch
new file mode 100644
index 000000000000..d43e6bd488bc
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0211-chromium-musl-canonicalize-file-name-musl.patch
@@ -0,0 +1,11 @@
+--- a/src/3rdparty/chromium/third_party/nasm/nasmlib/realpath.c
++++ b/src/3rdparty/chromium/third_party/nasm/nasmlib/realpath.c
+@@ -55,7 +55,7 @@
+  */
+ char *nasm_realpath(const char *rel_path)
+ {
+-    char *rp = canonicalize_file_name(rel_path);
++    char *rp = realpath(rel_path, NULL);
+     return rp ? rp : nasm_strdup(rel_path);
+ }
+ 
diff --git a/srcpkgs/qt6-webengine/patches/0212-chromium-musl-no-getcontext.patch b/srcpkgs/qt6-webengine/patches/0212-chromium-musl-no-getcontext.patch
new file mode 100644
index 000000000000..5755f1b45a7d
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0212-chromium-musl-no-getcontext.patch
@@ -0,0 +1,29 @@
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc
+@@ -489,8 +489,10 @@ bool ExceptionHandler::SimulateSignalDel
+   // ExceptionHandler::HandleSignal().
+   siginfo.si_code = SI_USER;
+   siginfo.si_pid = getpid();
+-  ucontext_t context;
++  ucontext_t context = { 0 };
++#if defined(__GLIBC__)
+   getcontext(&context);
++#endif
+   return HandleSignal(sig, &siginfo, &context);
+ }
+ 
+@@ -675,9 +677,14 @@ bool ExceptionHandler::WriteMinidump() {
+   sys_prctl(PR_SET_DUMPABLE, 1, 0, 0, 0);
+ 
+   CrashContext context;
++
++#if defined(__GLIBC__)
+   int getcontext_result = getcontext(&context.context);
+   if (getcontext_result)
+     return false;
++#else
++  return false;
++#endif
+ 
+ #if defined(__i386__)
+   // In CPUFillFromUContext in minidumpwriter.cc the stack pointer is retrieved
diff --git a/srcpkgs/qt6-webengine/patches/0213-chromium-musl-crashpad.patch b/srcpkgs/qt6-webengine/patches/0213-chromium-musl-crashpad.patch
new file mode 100644
index 000000000000..71bbad2af17e
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0213-chromium-musl-crashpad.patch
@@ -0,0 +1,24 @@
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/compat/linux/sys/ptrace.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/compat/linux/sys/ptrace.h
+@@ -17,7 +17,9 @@
+ 
+ #include_next <sys/ptrace.h>
+ 
++#ifdef __GLIBC__
+ #include <sys/cdefs.h>
++#endif
+ 
+ // https://sourceware.org/bugzilla/show_bug.cgi?id=22433
+ #if !defined(PTRACE_GET_THREAD_AREA) && !defined(PT_GET_THREAD_AREA) && \
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/util/linux/ptracer.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/util/linux/ptracer.cc
+@@ -26,6 +26,9 @@
+ 
+ #if defined(ARCH_CPU_X86_FAMILY)
+ #include <asm/ldt.h>
++#if !defined(__GLIBC__)
++#include <asm/ptrace-abi.h>
++#endif
+ #endif
+ 
+ namespace crashpad {
diff --git a/srcpkgs/qt6-webengine/patches/0214-chromium-musl-fixes.patch b/srcpkgs/qt6-webengine/patches/0214-chromium-musl-fixes.patch
new file mode 100644
index 000000000000..55b267ed1714
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0214-chromium-musl-fixes.patch
@@ -0,0 +1,108 @@
+--- a/src/3rdparty/chromium/sandbox/linux/suid/process_util.h
++++ b/src/3rdparty/chromium/sandbox/linux/suid/process_util.h
+@@ -12,6 +12,15 @@
+ #include <stdint.h>
+ #include <sys/types.h>
+ 
++#if !defined(__GLIBC__) && !defined(TEMP_FAILURE_RETRY)
++# define TEMP_FAILURE_RETRY(expression) \
++	(__extension__			\
++	 ({ long int __result;		\
++	  do __result = (long int) (expression); \
++	  while (__result == -1L && errno == EINTR); \
++	  __result; }))
++#endif
++
+ // This adjusts /proc/process/oom_score_adj so the Linux OOM killer
+ // will prefer certain process types over others. The range for the
+ // adjustment is [-1000, 1000], with [0, 1000] being user accessible.
+--- a/src/3rdparty/chromium/services/device/serial/serial_io_handler_posix.cc
++++ b/src/3rdparty/chromium/services/device/serial/serial_io_handler_posix.cc
+@@ -6,6 +6,7 @@
+ 
+ #include <sys/ioctl.h>
+ #include <termios.h>
++#include <asm-generic/ioctls.h>
+ 
+ #include <algorithm>
+ #include <utility>
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h
+@@ -38,6 +38,10 @@
+ #include "common/memory_allocator.h"
+ #include "google_breakpad/common/minidump_format.h"
+ 
++#ifndef __GLIBC__
++#define _libc_fpstate _fpstate
++#endif
++
+ namespace google_breakpad {
+ 
+ // Wraps platform-dependent implementations of accessors to ucontext_t structs.
+--- a/src/3rdparty/chromium/third_party/ffmpeg/libavutil/cpu.c
++++ b/src/3rdparty/chromium/third_party/ffmpeg/libavutil/cpu.c
+@@ -41,8 +41,10 @@
+ #include <sys/param.h>
+ #endif
+ #include <sys/types.h>
++#ifdef __GLIBC__
+ #include <sys/sysctl.h>
+ #endif
++#endif
+ #if HAVE_UNISTD_H
+ #include <unistd.h>
+ #endif
+--- a/src/3rdparty/chromium/third_party/perfetto/include/perfetto/ext/base/thread_utils.h
++++ b/src/3rdparty/chromium/third_party/perfetto/include/perfetto/ext/base/thread_utils.h
+@@ -29,9 +29,7 @@
+ #include <algorithm>
+ #endif
+ 
+-#if PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID)
+ #include <sys/prctl.h>
+-#endif
+ 
+ // Internal implementation utils that aren't as widely useful/supported as
+ // base/thread_utils.h.
+@@ -58,7 +56,7 @@ inline bool MaybeSetThreadName(const std
+ 
+ inline bool GetThreadName(std::string& out_result) {
+   char buf[16] = {};
+-#if PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID)
++#if !defined(__GLIBC__)
+   if (prctl(PR_GET_NAME, buf) != 0)
+     return false;
+ #else
+--- a/src/3rdparty/chromium/third_party/lss/linux_syscall_support.h
++++ b/src/3rdparty/chromium/third_party/lss/linux_syscall_support.h
+@@ -1300,6 +1300,18 @@ struct kernel_statfs {
+ #ifndef __NR_fallocate
+ #define __NR_fallocate          285
+ #endif
++
++#if !defined(__GLIBC__)
++#ifdef __NR_pread
++#undef __NR_pread
++#endif
++#ifdef __NR_pwrite
++#undef __NR_pwrite
++#endif
++#define __NR_pread __NR_pread64
++#define __NR_pwrite __NR_pwrite64
++#endif /* !defined(__GLIBC__) */
++
+ #ifndef __NR_getrandom
+ #define __NR_getrandom          318
+ #endif
+--- a/src/3rdparty/chromium/net/dns/dns_config_service_posix.cc
++++ b/src/3rdparty/chromium/net/dns/dns_config_service_posix.cc
+@@ -93,7 +93,8 @@ absl::optional<DnsConfig> ReadDnsConfig(
+ 
+   absl::optional<DnsConfig> dns_config;
+ // TODO(fuchsia): Use res_ninit() when it's implemented on Fuchsia.
+-#if defined(OS_OPENBSD) || defined(OS_FUCHSIA)
++#if defined(OS_OPENBSD) || defined(OS_FUCHSIA) || \
++  (defined(OS_LINUX) && !defined(__GLIBC__))
+   // Note: res_ninit in glibc always returns 0 and sets RES_INIT.
+   // res_init behaves the same way.
+   memset(&_res, 0, sizeof(_res));
diff --git a/srcpkgs/qt6-webengine/patches/0215-chromium-musl-cdefs.patch b/srcpkgs/qt6-webengine/patches/0215-chromium-musl-cdefs.patch
new file mode 100644
index 000000000000..9d1daec29118
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0215-chromium-musl-cdefs.patch
@@ -0,0 +1,29 @@
+--- a/src/3rdparty/chromium/third_party/libsync/src/include/sync/sync.h
++++ b/src/3rdparty/chromium/third_party/libsync/src/include/sync/sync.h
+@@ -19,12 +19,13 @@
+ #ifndef __SYS_CORE_SYNC_H
+ #define __SYS_CORE_SYNC_H
+ 
+-#include <sys/cdefs.h>
+ #include <stdint.h>
+ 
+ #include <linux/types.h>
+ 
+-__BEGIN_DECLS
++#ifdef __cplusplus
++extern "C" {
++#endif
+ 
+ struct sync_legacy_merge_data {
+  int32_t fd2;
+@@ -158,6 +159,9 @@ struct sync_pt_info *sync_pt_info(struct
+                                   struct sync_pt_info *itr);
+ void sync_fence_info_free(struct sync_fence_info_data *info);
+ 
+-__END_DECLS
++#ifdef __cplusplus
++}
++#endif
++
+ 
+ #endif /* __SYS_CORE_SYNC_H */
diff --git a/srcpkgs/qt6-webengine/patches/0216-chromium-musl-stat.patch b/srcpkgs/qt6-webengine/patches/0216-chromium-musl-stat.patch
new file mode 100644
index 000000000000..4509a6957cd7
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0216-chromium-musl-stat.patch
@@ -0,0 +1,12 @@
+--- a/src/3rdparty/chromium/base/files/file.h
++++ b/src/3rdparty/chromium/base/files/file.h
+@@ -19,7 +19,8 @@
+ #include "build/build_config.h"
+ 
+ #if defined(OS_BSD) || defined(OS_APPLE) || defined(OS_NACL) || \
+-    defined(OS_FUCHSIA) || (defined(OS_ANDROID) && __ANDROID_API__ < 21)
++    defined(OS_FUCHSIA) || (defined(OS_ANDROID) && __ANDROID_API__ < 21) || \
++    (defined(OS_LINUX) && !defined(__GLIBC__))
+ struct stat;
+ namespace base {
+ typedef struct stat stat_wrapper_t;
diff --git a/srcpkgs/qt6-webengine/patches/0217-chromium-musl-resolver.patch b/srcpkgs/qt6-webengine/patches/0217-chromium-musl-resolver.patch
new file mode 100644
index 000000000000..c3d7afad9b19
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0217-chromium-musl-resolver.patch
@@ -0,0 +1,77 @@
+--- a/src/3rdparty/chromium/net/dns/dns_config_service_linux.cc
++++ b/src/3rdparty/chromium/net/dns/dns_config_service_linux.cc
+@@ -432,11 +432,13 @@ class DnsConfigServiceLinux::ConfigReade
+     base::ScopedBlockingCall scoped_blocking_call(
+         FROM_HERE, base::BlockingType::MAY_BLOCK);
+ 
++#if defined(__GLIBC__)
+     std::unique_ptr<struct __res_state> res = resolv_reader_->GetResState();
+     if (res) {
+       dns_config_ = ConvertResStateToDnsConfig(*res.get());
+       resolv_reader_->CloseResState(res.get());
+     }
++#endif
+ 
+     UMA_HISTOGRAM_BOOLEAN("Net.DNS.DnsConfig.Resolv.Read",
+                           dns_config_.has_value());
+@@ -486,6 +488,7 @@ class DnsConfigServiceLinux::ConfigReade
+ 
+ std::unique_ptr<struct __res_state>
+ DnsConfigServiceLinux::ResolvReader::GetResState() {
++#if defined(__GLIBC__)
+   auto res = std::make_unique<struct __res_state>();
+   memset(res.get(), 0, sizeof(struct __res_state));
+ 
+@@ -495,11 +498,16 @@ DnsConfigServiceLinux::ResolvReader::Get
+   }
+ 
+   return res;
++#else
++  return nullptr;
++#endif
+ }
+ 
+ void DnsConfigServiceLinux::ResolvReader::CloseResState(
+     struct __res_state* res) {
++#if defined(__GLIBC__)
+   res_nclose(res);
++#endif
+ }
+ 
+ DnsConfigServiceLinux::DnsConfigServiceLinux()
+--- a/src/3rdparty/chromium/net/dns/dns_reloader.cc
++++ b/src/3rdparty/chromium/net/dns/dns_reloader.cc
+@@ -4,8 +4,7 @@
+ 
+ #include "net/dns/dns_reloader.h"
+ 
+-#if defined(OS_POSIX) && !defined(OS_APPLE) && !defined(OS_OPENBSD) && \
+-    !defined(OS_ANDROID) && !defined(OS_FUCHSIA)
++#ifdef __GLIBC__
+ 
+ #include <resolv.h>
+ 
+--- a/src/3rdparty/chromium/net/dns/host_resolver_manager.cc
++++ b/src/3rdparty/chromium/net/dns/host_resolver_manager.cc
+@@ -2720,8 +2720,7 @@ HostResolverManager::HostResolverManager
+   NetworkChangeNotifier::AddConnectionTypeObserver(this);
+   if (system_dns_config_notifier_)
+     system_dns_config_notifier_->AddObserver(this);
+-#if defined(OS_POSIX) && !defined(OS_APPLE) && !defined(OS_OPENBSD) && \
+-    !defined(OS_ANDROID)
++#ifdef __GLIBC__
+   EnsureDnsReloaderInit();
+ #endif
+ 
+--- a/src/3rdparty/chromium/net/dns/host_resolver_proc.cc
++++ b/src/3rdparty/chromium/net/dns/host_resolver_proc.cc
+@@ -176,8 +176,7 @@ int SystemHostResolverCall(const std::st
+   base::ScopedBlockingCall scoped_blocking_call(FROM_HERE,
+                                                 base::BlockingType::WILL_BLOCK);
+ 
+-#if defined(OS_POSIX) && !defined(OS_APPLE) && !defined(OS_OPENBSD) && \
+-    !defined(OS_ANDROID) && !defined(OS_FUCHSIA)
++#ifdef __GLIBC__
+   DnsReloaderMaybeReload();
+ #endif
+   absl::optional<AddressInfo> ai;
diff --git a/srcpkgs/qt6-webengine/patches/0600-chromium-sndio.patch b/srcpkgs/qt6-webengine/patches/0600-chromium-sndio.patch
new file mode 100644
index 000000000000..0302874ffba4
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0600-chromium-sndio.patch
@@ -0,0 +1,876 @@
+--- a/src/3rdparty/chromium/media/BUILD.gn
++++ b/src/3rdparty/chromium/media/BUILD.gn
+@@ -72,6 +72,9 @@ config("media_config") {
+       defines += [ "DLOPEN_PULSEAUDIO" ]
+     }
+   }
++  if (use_sndio) {
++    defines += [ "USE_SNDIO" ]
++  }
+   if (use_cras) {
+     defines += [ "USE_CRAS" ]
+   }
+--- a/src/3rdparty/chromium/media/audio/BUILD.gn
++++ b/src/3rdparty/chromium/media/audio/BUILD.gn
+@@ -240,6 +240,17 @@ source_set("audio") {
+     sources += [ "linux/audio_manager_linux.cc" ]
+   }
+ 
++  if (use_sndio) {
++    libs += [ "sndio" ]
++    sources += [
++      "sndio/audio_manager_sndio.cc",
++      "sndio/sndio_input.cc",
++      "sndio/sndio_input.h",
++      "sndio/sndio_output.cc",
++      "sndio/sndio_output.h"
++    ]
++  }
++
+   if (use_alsa) {
+     libs += [ "asound" ]
+     sources += [
+--- a/src/3rdparty/chromium/media/audio/linux/audio_manager_linux.cc
++++ b/src/3rdparty/chromium/media/audio/linux/audio_manager_linux.cc
+@@ -25,6 +25,11 @@
+ #include "media/audio/pulse/audio_manager_pulse.h"
+ #include "media/audio/pulse/pulse_util.h"
+ #endif
++#if defined(USE_SNDIO)
++#include "media/audio/sndio/audio_manager_sndio.h"
++#include "media/audio/sndio/sndio_input.h"
++#include "media/audio/sndio/sndio_output.h"
++#endif
+ 
+ namespace media {
+ 
+@@ -32,7 +37,8 @@ enum LinuxAudioIO {
+   kPulse,
+   kAlsa,
+   kCras,
+-  kAudioIOMax = kCras  // Must always be equal to largest logged entry.
++  kSndio,
++  kAudioIOMax = kSndio // Must always be equal to largest logged entry.
+ };
+ 
+ std::unique_ptr<media::AudioManager> CreateAudioManager(
+@@ -45,6 +51,16 @@ std::unique_ptr<media::AudioManager> Cre
+                                               audio_log_factory);
+   }
+ 
++#if defined(USE_SNDIO)
++  struct sio_hdl *hdl = sio_open(SIO_DEVANY, SIO_PLAY, 0);
++  if (hdl != NULL) {
++    sio_close(hdl);
++    UMA_HISTOGRAM_ENUMERATION("Media.LinuxAudioIO", kSndio, kAudioIOMax + 1);
++    return std::make_unique<AudioManagerSndio>(std::move(audio_thread),
++                                                  audio_log_factory);
++  }
++#endif
++
+ #if defined(USE_CRAS)
+   if (base::CommandLine::ForCurrentProcess()->HasSwitch(switches::kUseCras)) {
+     UMA_HISTOGRAM_ENUMERATION("Media.LinuxAudioIO", kCras, kAudioIOMax + 1);
+--- /dev/null
++++ b/src/3rdparty/chromium/media/audio/sndio/audio_manager_sndio.cc
+@@ -0,0 +1,148 @@
++// Copyright (c) 2012 The Chromium Authors. All rights reserved.
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++#include "media/audio/sndio/audio_manager_sndio.h"
++
++#include "base/metrics/histogram_macros.h"
++#include "base/memory/ptr_util.h"
++#include "media/audio/audio_device_description.h"
++#include "media/audio/audio_output_dispatcher.h"
++#include "media/audio/sndio/sndio_input.h"
++#include "media/audio/sndio/sndio_output.h"
++#include "media/base/limits.h"
++#include "media/base/media_switches.h"
++
++namespace media {
++
++
++// Maximum number of output streams that can be open simultaneously.
++static const int kMaxOutputStreams = 4;
++
++// Default sample rate for input and output streams.
++static const int kDefaultSampleRate = 48000;
++
++void AddDefaultDevice(AudioDeviceNames* device_names) {
++  DCHECK(device_names->empty());
++  device_names->push_front(AudioDeviceName::CreateDefault());
++}
++
++bool AudioManagerSndio::HasAudioOutputDevices() {
++  return true;
++}
++
++bool AudioManagerSndio::HasAudioInputDevices() {
++  return true;
++}
++
++void AudioManagerSndio::GetAudioInputDeviceNames(
++    AudioDeviceNames* device_names) {
++  DCHECK(device_names->empty());
++  AddDefaultDevice(device_names);
++}
++
++void AudioManagerSndio::GetAudioOutputDeviceNames(
++    AudioDeviceNames* device_names) {
++  AddDefaultDevice(device_names);
++}
++
++const char* AudioManagerSndio::GetName() {
++  return "SNDIO";
++}
++
++AudioParameters AudioManagerSndio::GetInputStreamParameters(
++    const std::string& device_id) {
++  static const int kDefaultInputBufferSize = 1024;
++
++  int user_buffer_size = GetUserBufferSize();
++  int buffer_size = user_buffer_size ?
++      user_buffer_size : kDefaultInputBufferSize;
++
++  return AudioParameters(
++      AudioParameters::AUDIO_PCM_LOW_LATENCY, CHANNEL_LAYOUT_STEREO,
++      kDefaultSampleRate, buffer_size);
++}
++
++AudioManagerSndio::AudioManagerSndio(std::unique_ptr<AudioThread> audio_thread,
++                                         AudioLogFactory* audio_log_factory)
++    : AudioManagerBase(std::move(audio_thread),
++                       audio_log_factory) {
++  DLOG(WARNING) << "AudioManagerSndio";
++  SetMaxOutputStreamsAllowed(kMaxOutputStreams);
++}
++
++AudioManagerSndio::~AudioManagerSndio() {
++  Shutdown();
++}
++
++AudioOutputStream* AudioManagerSndio::MakeLinearOutputStream(
++    const AudioParameters& params,
++    const LogCallback& log_callback) {
++  DCHECK_EQ(AudioParameters::AUDIO_PCM_LINEAR, params.format());
++  return MakeOutputStream(params);
++}
++
++AudioOutputStream* AudioManagerSndio::MakeLowLatencyOutputStream(
++    const AudioParameters& params,
++    const std::string& device_id,
++    const LogCallback& log_callback) {
++  DLOG_IF(ERROR, !device_id.empty()) << "Not implemented!";
++  DCHECK_EQ(AudioParameters::AUDIO_PCM_LOW_LATENCY, params.format());
++  return MakeOutputStream(params);
++}
++
++AudioInputStream* AudioManagerSndio::MakeLinearInputStream(
++    const AudioParameters& params,
++    const std::string& device_id,
++    const LogCallback& log_callback) {
++  DCHECK_EQ(AudioParameters::AUDIO_PCM_LINEAR, params.format());
++  return MakeInputStream(params);
++}
++
++AudioInputStream* AudioManagerSndio::MakeLowLatencyInputStream(
++    const AudioParameters& params,
++    const std::string& device_id,
++    const LogCallback& log_callback) {
++  DCHECK_EQ(AudioParameters::AUDIO_PCM_LOW_LATENCY, params.format());
++  return MakeInputStream(params);
++}
++
++AudioParameters AudioManagerSndio::GetPreferredOutputStreamParameters(
++    const std::string& output_device_id,
++    const AudioParameters& input_params) {
++  // TODO(tommi): Support |output_device_id|.
++  DLOG_IF(ERROR, !output_device_id.empty()) << "Not implemented!";
++  static const int kDefaultOutputBufferSize = 2048;
++
++  ChannelLayout channel_layout = CHANNEL_LAYOUT_STEREO;
++  int sample_rate = kDefaultSampleRate;
++  int buffer_size = kDefaultOutputBufferSize;
++  if (input_params.IsValid()) {
++    sample_rate = input_params.sample_rate();
++    channel_layout = input_params.channel_layout();
++    buffer_size = std::min(buffer_size, input_params.frames_per_buffer());
++  }
++
++  int user_buffer_size = GetUserBufferSize();
++  if (user_buffer_size)
++    buffer_size = user_buffer_size;
++
++  return AudioParameters(
++      AudioParameters::AUDIO_PCM_LOW_LATENCY, channel_layout,
++      sample_rate, buffer_size);
++}
++
++AudioInputStream* AudioManagerSndio::MakeInputStream(
++    const AudioParameters& params) {
++  DLOG(WARNING) << "MakeInputStream";
++  return new SndioAudioInputStream(this,
++             AudioDeviceDescription::kDefaultDeviceId, params);
++}
++
++AudioOutputStream* AudioManagerSndio::MakeOutputStream(
++    const AudioParameters& params) {
++  DLOG(WARNING) << "MakeOutputStream";
++  return new SndioAudioOutputStream(params, this);
++}
++
++}  // namespace media
+--- /dev/null
++++ b/src/3rdparty/chromium/media/audio/sndio/audio_manager_sndio.h
+@@ -0,0 +1,65 @@
++// Copyright (c) 2012 The Chromium Authors. All rights reserved.
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++#ifndef MEDIA_AUDIO_SNDIO_AUDIO_MANAGER_SNDIO_H_
++#define MEDIA_AUDIO_SNDIO_AUDIO_MANAGER_SNDIO_H_
++
++#include <set>
++
++#include "base/compiler_specific.h"
++#include "base/macros.h"
++#include "base/memory/ref_counted.h"
++#include "base/threading/thread.h"
++#include "media/audio/audio_manager_base.h"
++
++namespace media {
++
++class MEDIA_EXPORT AudioManagerSndio : public AudioManagerBase {
++ public:
++  AudioManagerSndio(std::unique_ptr<AudioThread> audio_thread,
++                   AudioLogFactory* audio_log_factory);
++  ~AudioManagerSndio() override;
++
++  // Implementation of AudioManager.
++  bool HasAudioOutputDevices() override;
++  bool HasAudioInputDevices() override;
++  void GetAudioInputDeviceNames(AudioDeviceNames* device_names) override;
++  void GetAudioOutputDeviceNames(AudioDeviceNames* device_names) override;
++  AudioParameters GetInputStreamParameters(
++      const std::string& device_id) override;
++  const char* GetName() override;
++
++  // Implementation of AudioManagerBase.
++  AudioOutputStream* MakeLinearOutputStream(
++      const AudioParameters& params,
++      const LogCallback& log_callback) override;
++  AudioOutputStream* MakeLowLatencyOutputStream(
++      const AudioParameters& params,
++      const std::string& device_id,
++      const LogCallback& log_callback) override;
++  AudioInputStream* MakeLinearInputStream(
++      const AudioParameters& params,
++      const std::string& device_id,
++      const LogCallback& log_callback) override;
++  AudioInputStream* MakeLowLatencyInputStream(
++      const AudioParameters& params,
++      const std::string& device_id,
++      const LogCallback& log_callback) override;
++
++ protected:
++  AudioParameters GetPreferredOutputStreamParameters(
++      const std::string& output_device_id,
++      const AudioParameters& input_params) override;
++
++ private:
++  // Called by MakeLinearOutputStream and MakeLowLatencyOutputStream.
++  AudioOutputStream* MakeOutputStream(const AudioParameters& params);
++  AudioInputStream* MakeInputStream(const AudioParameters& params);
++
++  DISALLOW_COPY_AND_ASSIGN(AudioManagerSndio);
++};
++
++}  // namespace media
++
++#endif  // MEDIA_AUDIO_SNDIO_AUDIO_MANAGER_SNDIO_H_
+--- /dev/null
++++ b/src/3rdparty/chromium/media/audio/sndio/sndio_input.cc
+@@ -0,0 +1,200 @@
++// Copyright 2013 The Chromium Authors. All rights reserved.
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++#include "base/bind.h"
++#include "base/logging.h"
++#include "base/macros.h"
++#include "media/base/audio_timestamp_helper.h"
++#include "media/audio/sndio/audio_manager_sndio.h"
++#include "media/audio/audio_manager.h"
++#include "media/audio/sndio/sndio_input.h"
++
++namespace media {
++
++static const SampleFormat kSampleFormat = kSampleFormatS16;
++
++void SndioAudioInputStream::OnMoveCallback(void *arg, int delta)
++{
++  SndioAudioInputStream* self = static_cast<SndioAudioInputStream*>(arg);
++
++  self->hw_delay += delta;
++}
++
++void *SndioAudioInputStream::ThreadEntry(void *arg) {
++  SndioAudioInputStream* self = static_cast<SndioAudioInputStream*>(arg);
++
++  self->ThreadLoop();
++  return NULL;
++}
++
++SndioAudioInputStream::SndioAudioInputStream(AudioManagerBase* manager,
++                                             const std::string& device_name,
++                                             const AudioParameters& params)
++    : manager(manager),
++      params(params),
++      audio_bus(AudioBus::Create(params)),
++      state(kClosed) {
++}
++
++SndioAudioInputStream::~SndioAudioInputStream() {
++  if (state != kClosed)
++    Close();
++}
++
++bool SndioAudioInputStream::Open() {
++  struct sio_par par;
++  int sig;
++
++  if (state != kClosed)
++    return false;
++
++  if (params.format() != AudioParameters::AUDIO_PCM_LINEAR &&
++      params.format() != AudioParameters::AUDIO_PCM_LOW_LATENCY) {
++    LOG(WARNING) << "Unsupported audio format.";
++    return false;
++  }
++
++  sio_initpar(&par);
++  par.rate = params.sample_rate();
++  par.rchan = params.channels();
++  par.bits = SampleFormatToBitsPerChannel(kSampleFormat);
++  par.bps = par.bits / 8;
++  par.sig = sig = par.bits != 8 ? 1 : 0;
++  par.le = SIO_LE_NATIVE;
++  par.appbufsz = params.frames_per_buffer();
++
++  hdl = sio_open(SIO_DEVANY, SIO_REC, 0);
++
++  if (hdl == NULL) {
++    LOG(ERROR) << "Couldn't open audio device.";
++    return false;
++  }
++
++  if (!sio_setpar(hdl, &par) || !sio_getpar(hdl, &par)) {
++    LOG(ERROR) << "Couldn't set audio parameters.";
++    goto bad_close;
++  }
++
++  if (par.rate  != (unsigned int)params.sample_rate() ||
++      par.rchan != (unsigned int)params.channels() ||
++      par.bits  != (unsigned int)SampleFormatToBitsPerChannel(kSampleFormat) ||
++      par.sig   != (unsigned int)sig ||
++      (par.bps > 1 && par.le != SIO_LE_NATIVE) ||
++      (par.bits != par.bps * 8)) {
++    LOG(ERROR) << "Unsupported audio parameters.";
++    goto bad_close;
++  }
++  state = kStopped;
++  buffer = new char[audio_bus->frames() * params.GetBytesPerFrame(kSampleFormat)];
++  sio_onmove(hdl, &OnMoveCallback, this);
++  return true;
++bad_close:
++  sio_close(hdl);
++  return false;
++}
++
++void SndioAudioInputStream::Start(AudioInputCallback* cb) {
++
++  StartAgc();
++
++  state = kRunning;
++  hw_delay = 0;
++  callback = cb;
++  sio_start(hdl);
++  if (pthread_create(&thread, NULL, &ThreadEntry, this) != 0) {
++    LOG(ERROR) << "Failed to create real-time thread for recording.";
++    sio_stop(hdl);
++    state = kStopped;
++  }
++}
++
++void SndioAudioInputStream::Stop() {
++
++  if (state == kStopped)
++    return;
++
++  state = kStopWait;
++  pthread_join(thread, NULL);
++  sio_stop(hdl);
++  state = kStopped;
++
++  StopAgc();
++}
++
++void SndioAudioInputStream::Close() {
++
++  if (state == kClosed)
++    return;
++
++  if (state == kRunning)
++    Stop();
++
++  state = kClosed;
++  delete [] buffer;
++  sio_close(hdl);
++
++  manager->ReleaseInputStream(this);
++}
++
++double SndioAudioInputStream::GetMaxVolume() {
++  // Not supported
++  return 0.0;
++}
++
++void SndioAudioInputStream::SetVolume(double volume) {
++  // Not supported. Do nothing.
++}
++
++double SndioAudioInputStream::GetVolume() {
++  // Not supported.
++  return 0.0;
++}
++
++bool SndioAudioInputStream::IsMuted() {
++  // Not supported.
++  return false;
++}
++
++void SndioAudioInputStream::SetOutputDeviceForAec(
++    const std::string& output_device_id) {
++  // Not supported.
++}
++
++void SndioAudioInputStream::ThreadLoop(void) {
++  size_t todo, n;
++  char *data;
++  unsigned int nframes;
++  double normalized_volume = 0.0;
++
++  nframes = audio_bus->frames();
++
++  while (state == kRunning && !sio_eof(hdl)) {
++
++    GetAgcVolume(&normalized_volume);
++
++    // read one block
++    todo = nframes * params.GetBytesPerFrame(kSampleFormat);
++    data = buffer;
++    while (todo > 0) {
++      n = sio_read(hdl, data, todo);
++      if (n == 0)
++        return;	// unrecoverable I/O error
++      todo -= n;
++      data += n;
++    }
++    hw_delay -= nframes;
++
++    // convert frames count to TimeDelta
++    const base::TimeDelta delay = AudioTimestampHelper::FramesToTime(hw_delay,
++      params.sample_rate());
++
++    // push into bus
++    audio_bus->FromInterleaved<SignedInt16SampleTypeTraits>(reinterpret_cast<int16_t*>(buffer), nframes);
++
++    // invoke callback
++    callback->OnData(audio_bus.get(), base::TimeTicks::Now() - delay, 1.);
++  }
++}
++
++}  // namespace media
+--- /dev/null
++++ b/src/3rdparty/chromium/media/audio/sndio/sndio_input.h
+@@ -0,0 +1,91 @@
++// Copyright 2013 The Chromium Authors. All rights reserved.
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++#ifndef MEDIA_AUDIO_SNDIO_SNDIO_INPUT_H_
++#define MEDIA_AUDIO_SNDIO_SNDIO_INPUT_H_
++
++#include <stdint.h>
++#include <string>
++#include <sndio.h>
++
++#include "base/compiler_specific.h"
++#include "base/macros.h"
++#include "base/memory/weak_ptr.h"
++#include "base/time/time.h"
++#include "media/audio/agc_audio_stream.h"
++#include "media/audio/audio_io.h"
++#include "media/audio/audio_device_description.h"
++#include "media/base/audio_parameters.h"
++
++namespace media {
++
++class AudioManagerBase;
++
++// Implementation of AudioOutputStream using sndio(7)
++class SndioAudioInputStream : public AgcAudioStream<AudioInputStream> {
++ public:
++  // Pass this to the constructor if you want to attempt auto-selection
++  // of the audio recording device.
++  static const char kAutoSelectDevice[];
++
++  // Create a PCM Output stream for the SNDIO device identified by
++  // |device_name|. If unsure of what to use for |device_name|, use
++  // |kAutoSelectDevice|.
++  SndioAudioInputStream(AudioManagerBase* audio_manager,
++                     const std::string& device_name,
++                     const AudioParameters& params);
++
++  ~SndioAudioInputStream() override;
++
++  // Implementation of AudioInputStream.
++  bool Open() override;
++  void Start(AudioInputCallback* callback) override;
++  void Stop() override;
++  void Close() override;
++  double GetMaxVolume() override;
++  void SetVolume(double volume) override;
++  double GetVolume() override;
++  bool IsMuted() override;
++  void SetOutputDeviceForAec(const std::string& output_device_id) override;
++
++ private:
++
++  enum StreamState {
++    kClosed,            // Not opened yet
++    kStopped,           // Device opened, but not started yet
++    kRunning,           // Started, device playing
++    kStopWait           // Stopping, waiting for the real-time thread to exit
++  };
++
++  // C-style call-backs
++  static void OnMoveCallback(void *arg, int delta);
++  static void* ThreadEntry(void *arg);
++
++  // Continuously moves data from the device to the consumer
++  void ThreadLoop();
++  // Our creator, the audio manager needs to be notified when we close.
++  AudioManagerBase* manager;
++  // Parameters of the source
++  AudioParameters params;
++  // We store data here for consumer
++  std::unique_ptr<AudioBus> audio_bus;
++  // Call-back that consumes recorded data
++  AudioInputCallback* callback;  // Valid during a recording session.
++  // Handle of the audio device
++  struct sio_hdl* hdl;
++  // Current state of the stream
++  enum StreamState state;
++  // High priority thread running ThreadLoop()
++  pthread_t thread;
++  // Number of frames buffered in the hardware
++  int hw_delay;
++  // Temporary buffer where data is stored sndio-compatible format
++  char* buffer;
++
++  DISALLOW_COPY_AND_ASSIGN(SndioAudioInputStream);
++};
++
++}  // namespace media
++
++#endif  // MEDIA_AUDIO_SNDIO_SNDIO_INPUT_H_
+--- /dev/null
++++ b/src/3rdparty/chromium/media/audio/sndio/sndio_output.cc
+@@ -0,0 +1,183 @@
++// Copyright (c) 2012 The Chromium Authors. All rights reserved.
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++#include "base/logging.h"
++#include "base/time/time.h"
++#include "base/time/default_tick_clock.h"
++#include "media/audio/audio_manager_base.h"
++#include "media/base/audio_timestamp_helper.h"
++#include "media/audio/sndio/sndio_output.h"
++
++namespace media {
++
++static const SampleFormat kSampleFormat = kSampleFormatS16;
++
++void SndioAudioOutputStream::OnMoveCallback(void *arg, int delta) {
++  SndioAudioOutputStream* self = static_cast<SndioAudioOutputStream*>(arg);
++
++  self->hw_delay -= delta;
++}
++
++void SndioAudioOutputStream::OnVolCallback(void *arg, unsigned int vol) {
++  SndioAudioOutputStream* self = static_cast<SndioAudioOutputStream*>(arg);
++
++  self->vol = vol;
++}
++
++void *SndioAudioOutputStream::ThreadEntry(void *arg) {
++  SndioAudioOutputStream* self = static_cast<SndioAudioOutputStream*>(arg);
++
++  self->ThreadLoop();
++  return NULL;
++}
++
++SndioAudioOutputStream::SndioAudioOutputStream(const AudioParameters& params,
++                                               AudioManagerBase* manager)
++    : manager(manager),
++      params(params),
++      audio_bus(AudioBus::Create(params)),
++      state(kClosed),
++      mutex(PTHREAD_MUTEX_INITIALIZER) {
++}
++
++SndioAudioOutputStream::~SndioAudioOutputStream() {
++  if (state != kClosed)
++    Close();
++}
++
++bool SndioAudioOutputStream::Open() {
++  struct sio_par par;
++  int sig;
++
++  if (params.format() != AudioParameters::AUDIO_PCM_LINEAR &&
++      params.format() != AudioParameters::AUDIO_PCM_LOW_LATENCY) {
++    LOG(WARNING) << "Unsupported audio format.";
++    return false;
++  }
++  sio_initpar(&par);
++  par.rate = params.sample_rate();
++  par.pchan = params.channels();
++  par.bits = SampleFormatToBitsPerChannel(kSampleFormat);
++  par.bps = par.bits / 8;
++  par.sig = sig = par.bits != 8 ? 1 : 0;
++  par.le = SIO_LE_NATIVE;
++  par.appbufsz = params.frames_per_buffer();
++
++  hdl = sio_open(SIO_DEVANY, SIO_PLAY, 0);
++  if (hdl == NULL) {
++    LOG(ERROR) << "Couldn't open audio device.";
++    return false;
++  }
++  if (!sio_setpar(hdl, &par) || !sio_getpar(hdl, &par)) {
++    LOG(ERROR) << "Couldn't set audio parameters.";
++    goto bad_close;
++  }
++  if (par.rate  != (unsigned int)params.sample_rate() ||
++      par.pchan != (unsigned int)params.channels() ||
++      par.bits  != (unsigned int)SampleFormatToBitsPerChannel(kSampleFormat) ||
++      par.sig   != (unsigned int)sig ||
++      (par.bps > 1 && par.le != SIO_LE_NATIVE) ||
++      (par.bits != par.bps * 8)) {
++    LOG(ERROR) << "Unsupported audio parameters.";
++    goto bad_close;
++  }
++  state = kStopped;
++  volpending = 0;
++  vol = 0;
++  buffer = new char[audio_bus->frames() * params.GetBytesPerFrame(kSampleFormat)];
++  sio_onmove(hdl, &OnMoveCallback, this);
++  sio_onvol(hdl, &OnVolCallback, this);
++  return true;
++ bad_close:
++  sio_close(hdl);
++  return false;
++}
++
++void SndioAudioOutputStream::Close() {
++  if (state == kClosed)
++    return;
++  if (state == kRunning)
++    Stop();
++  state = kClosed;
++  delete [] buffer;
++  sio_close(hdl);
++  manager->ReleaseOutputStream(this);  // Calls the destructor
++}
++
++void SndioAudioOutputStream::Start(AudioSourceCallback* callback) {
++  state = kRunning;
++  hw_delay = 0;
++  source = callback;
++  sio_start(hdl);
++  if (pthread_create(&thread, NULL, &ThreadEntry, this) != 0) {
++    LOG(ERROR) << "Failed to create real-time thread.";
++    sio_stop(hdl);
++    state = kStopped;
++  }
++}
++
++void SndioAudioOutputStream::Stop() {
++  if (state == kStopped)
++    return;
++  state = kStopWait;
++  pthread_join(thread, NULL);
++  sio_stop(hdl);
++  state = kStopped;
++}
++
++void SndioAudioOutputStream::SetVolume(double v) {
++  pthread_mutex_lock(&mutex);
++  vol = v * SIO_MAXVOL;
++  volpending = 1;
++  pthread_mutex_unlock(&mutex);
++}
++
++void SndioAudioOutputStream::GetVolume(double* v) {
++  pthread_mutex_lock(&mutex);
++  *v = vol * (1. / SIO_MAXVOL);
++  pthread_mutex_unlock(&mutex);
++}
++
++// This stream is always used with sub second buffer sizes, where it's
++// sufficient to simply always flush upon Start().
++void SndioAudioOutputStream::Flush() {}
++
++void SndioAudioOutputStream::ThreadLoop(void) {
++  int avail, count, result;
++
++  while (state == kRunning) {
++    // Update volume if needed
++    pthread_mutex_lock(&mutex);
++    if (volpending) {
++      volpending = 0;
++      sio_setvol(hdl, vol);
++    }
++    pthread_mutex_unlock(&mutex);
++
++    // Get data to play
++    const base::TimeDelta delay = AudioTimestampHelper::FramesToTime(hw_delay,
++	params.sample_rate());
++    count = source->OnMoreData(delay, base::TimeTicks::Now(), 0, audio_bus.get());
++    audio_bus->ToInterleaved<SignedInt16SampleTypeTraits>(count, reinterpret_cast<int16_t*>(buffer));
++    if (count == 0) {
++      // We have to submit something to the device
++      count = audio_bus->frames();
++      memset(buffer, 0, count * params.GetBytesPerFrame(kSampleFormat));
++      LOG(WARNING) << "No data to play, running empty cycle.";
++    }
++
++    // Submit data to the device
++    avail = count * params.GetBytesPerFrame(kSampleFormat);
++    result = sio_write(hdl, buffer, avail);
++    if (result == 0) {
++      LOG(WARNING) << "Audio device disconnected.";
++      break;
++    }
++
++    // Update hardware pointer
++    hw_delay += count;
++  }
++}
++
++}  // namespace media
+--- /dev/null
++++ b/src/3rdparty/chromium/media/audio/sndio/sndio_output.h
+@@ -0,0 +1,86 @@
++// Copyright (c) 2012 The Chromium Authors. All rights reserved.
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++#ifndef MEDIA_AUDIO_SNDIO_SNDIO_OUTPUT_H_
++#define MEDIA_AUDIO_SNDIO_SNDIO_OUTPUT_H_
++
++#include <pthread.h>
++#include <sndio.h>
++
++#include "base/time/tick_clock.h"
++#include "base/time/time.h"
++#include "media/audio/audio_io.h"
++
++namespace media {
++
++class AudioManagerBase;
++
++// Implementation of AudioOutputStream using sndio(7)
++class SndioAudioOutputStream : public AudioOutputStream {
++ public:
++  // The manager is creating this object
++  SndioAudioOutputStream(const AudioParameters& params,
++                         AudioManagerBase* manager);
++  virtual ~SndioAudioOutputStream();
++
++  // Implementation of AudioOutputStream.
++  bool Open() override;
++  void Close() override;
++  void Start(AudioSourceCallback* callback) override;
++  void Stop() override;
++  void SetVolume(double volume) override;
++  void GetVolume(double* volume) override;
++  void Flush() override;
++
++  friend void sndio_onmove(void *arg, int delta);
++  friend void sndio_onvol(void *arg, unsigned int vol);
++  friend void *sndio_threadstart(void *arg);
++
++ private:
++  enum StreamState {
++    kClosed,            // Not opened yet
++    kStopped,           // Device opened, but not started yet
++    kRunning,           // Started, device playing
++    kStopWait           // Stopping, waiting for the real-time thread to exit
++  };
++
++  // C-style call-backs
++  static void OnMoveCallback(void *arg, int delta);
++  static void OnVolCallback(void *arg, unsigned int vol);
++  static void* ThreadEntry(void *arg);
++
++  // Continuously moves data from the producer to the device
++  void ThreadLoop(void);
++
++  // Our creator, the audio manager needs to be notified when we close.
++  AudioManagerBase* manager;
++  // Parameters of the source
++  AudioParameters params;
++  // Source stores data here
++  std::unique_ptr<AudioBus> audio_bus;
++  // Call-back that produces data to play
++  AudioSourceCallback* source;
++  // Handle of the audio device
++  struct sio_hdl* hdl;
++  // Current state of the stream
++  enum StreamState state;
++  // High priority thread running ThreadLoop()
++  pthread_t thread;
++  // Protects vol, volpending and hw_delay
++  pthread_mutex_t mutex;
++  // Current volume in the 0..SIO_MAXVOL range
++  int vol;
++  // Set to 1 if volumes must be refreshed in the realtime thread
++  int volpending;
++  // Number of frames buffered in the hardware
++  int hw_delay;
++  // Temporary buffer where data is stored sndio-compatible format
++  char* buffer;
++
++  DISALLOW_COPY_AND_ASSIGN(SndioAudioOutputStream);
++};
++
++}  // namespace media
++
++#endif  // MEDIA_AUDIO_SNDIO_SNDIO_OUTPUT_H_
+--- a/src/3rdparty/chromium/media/media_options.gni
++++ b/src/3rdparty/chromium/media/media_options.gni
+@@ -121,6 +121,9 @@ declare_args() {
+   # Enables runtime selection of ALSA library for audio.
+   use_alsa = false
+ 
++  # Enable runtime selection of sndio(7)
++  use_sndio = false
++
+   # Alsa should be used on non-Android, non-Mac POSIX systems.
+   # Alsa should be used on desktop Chromecast and audio-only Chromecast builds.
+   if (is_posix && !is_android && !is_mac &&
diff --git a/srcpkgs/qt6-webengine/patches/0700-armv7l-neon.patch b/srcpkgs/qt6-webengine/patches/0700-armv7l-neon.patch
new file mode 100644
index 000000000000..d42fa19a07a1
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0700-armv7l-neon.patch
@@ -0,0 +1,10 @@
+--- a/src/3rdparty/chromium/skia/BUILD.gn
++++ b/src/3rdparty/chromium/skia/BUILD.gn
+@@ -800,7 +800,6 @@ skia_source_set("skia_opts") {
+         # Root build config sets -mfpu=$arm_fpu, which we expect to be neon
+         # when running this.
+         if (!arm_use_neon) {
+-          configs -= [ "//build/config/compiler:compiler_arm_fpu" ]
+           cflags += [ "-mfpu=neon" ]
+         }
+       }
diff --git a/srcpkgs/qt6-webengine/patches/0750-chromium-musl-cross-no-asm_ptrace_h.patch b/srcpkgs/qt6-webengine/patches/0750-chromium-musl-cross-no-asm_ptrace_h.patch
new file mode 100644
index 000000000000..3cf132908af4
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0750-chromium-musl-cross-no-asm_ptrace_h.patch
@@ -0,0 +1,30 @@
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper.cc
+@@ -38,7 +38,12 @@
+ 
+ #include "client/linux/minidump_writer/linux_ptrace_dumper.h"
+ 
++#if defined(__GLIBC__)
+ #include <asm/ptrace.h>
++#else
++/* For arm*-musl this definition is missing */
++#define ARM_sp uregs[13]
++#endif
+ #include <assert.h>
+ #include <errno.h>
+ #include <fcntl.h>
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_core_dumper.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_core_dumper.cc
+@@ -32,7 +32,12 @@
+ 
+ #include "client/linux/minidump_writer/linux_core_dumper.h"
+ 
++#if defined(__GLIBC__)
+ #include <asm/ptrace.h>
++#else
++/* For arm*-musl this definition is missing */
++#define ARM_sp uregs[13]
++#endif
+ #include <assert.h>
+ #include <elf.h>
+ #include <stdio.h>
diff --git a/srcpkgs/qt6-webengine/patches/0751-chromium-musl-arm-user_vfp.patch b/srcpkgs/qt6-webengine/patches/0751-chromium-musl-arm-user_vfp.patch
new file mode 100644
index 000000000000..6e2d62f35ee6
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0751-chromium-musl-arm-user_vfp.patch
@@ -0,0 +1,20 @@
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/util/linux/thread_info.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/util/linux/thread_info.h
+@@ -17,6 +17,17 @@
+ 
+ #include <stdint.h>
+ #include <sys/user.h>
++#if !defined(__GLIBC__)
++struct user_vfp {
++	unsigned long long fpregs[32];
++	unsigned long fpscr;
++};
++struct user_vfp_exc {
++	unsigned long fpexc;
++	unsigned long fpinst;
++	unsigned long fpinst2;
++};
++#endif /* !defined(__GLIBC__) */
+ 
+ #include <type_traits>
+ 
diff --git a/srcpkgs/qt6-webengine/patches/0752-chromium-musl-arm-elf_auxv_t.patch b/srcpkgs/qt6-webengine/patches/0752-chromium-musl-arm-elf_auxv_t.patch
new file mode 100644
index 000000000000..7112c8cfd3fa
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0752-chromium-musl-arm-elf_auxv_t.patch
@@ -0,0 +1,18 @@
+--- a/src/3rdparty/chromium/v8/src/base/cpu.cc
++++ b/src/3rdparty/chromium/v8/src/base/cpu.cc
+@@ -163,6 +163,15 @@ static V8_INLINE void __cpuid(int cpu_in
+ 
+ #if V8_HOST_ARCH_ARM || V8_HOST_ARCH_ARM64
+ 
++#ifndef __GLIBC__
++#include <elf.h>
++#ifdef __LP64__
++typedef Elf64_auxv_t elf_auxv_t;
++#else
++typedef Elf32_auxv_t elf_auxv_t;
++#endif
++#endif
++
+ static uint32_t ReadELFHWCaps() {
+   uint32_t result = 0;
+ #if V8_GLIBC_PREREQ(2, 16)
diff --git a/srcpkgs/qt6-webengine/patches/0801-chromium-i686-vaapi-fpermissive.patch b/srcpkgs/qt6-webengine/patches/0801-chromium-i686-vaapi-fpermissive.patch
new file mode 100644
index 000000000000..3d4043e03b89
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0801-chromium-i686-vaapi-fpermissive.patch
@@ -0,0 +1,24 @@
+--- a/src/3rdparty/chromium/media/gpu/vaapi/BUILD.gn
++++ b/src/3rdparty/chromium/media/gpu/vaapi/BUILD.gn
+@@ -14,6 +14,10 @@ import("//ui/gl/features.gni")
+ assert(is_linux || is_chromeos)
+ assert(use_vaapi)
+ 
++config("vaapi_permissive") {
++  cflags = [ "-fpermissive" ]
++}
++
+ generate_stubs("libva_stubs") {
+   extra_header = "va_stub_header.fragment"
+   sigs = [ "va.sigs" ]
+@@ -136,6 +140,10 @@ source_set("vaapi") {
+     ]
+   }
+ 
++  if (target_cpu == "x86") {
++    configs += [ ":vaapi_permissive" ]
++  }
++
+   if (use_x11) {
+     deps += [ "//ui/gfx/x" ]
+     sources += [
diff --git a/srcpkgs/qt6-webengine/patches/0900-xxx-ppc64le-libvpx.patch b/srcpkgs/qt6-webengine/patches/0900-xxx-ppc64le-libvpx.patch
new file mode 100644
index 000000000000..5c9566b56bd4
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0900-xxx-ppc64le-libvpx.patch
@@ -0,0 +1,65 @@
+Uses generic target for now. To use ppc64le, change --target to ppc64le-gnu
+and add --enable-vsx, and change generic to ppc for the rtcd header.
+
+From 18e6c5c55cfae0cfb458d8210d7bc709360a0e90 Mon Sep 17 00:00:00 2001
+From: q66 <daniel@octaforge.org>
+Date: Wed, 9 Sep 2020 19:08:25 +0200
+Subject: [PATCH] enable generation of ppc64 libvpx bits
+
+this doesn't update the gni file, that's done from
+the template by running the appropriate scripts
+---
+ third_party/libvpx/BUILD.gn        | 4 ++++
+ third_party/libvpx/generate_gni.sh | 9 +++++++++
+ 2 files changed, 13 insertions(+)
+
+--- a/src/3rdparty/chromium/third_party/libvpx/BUILD.gn
++++ b/src/3rdparty/chromium/third_party/libvpx/BUILD.gn
+@@ -424,6 +424,8 @@ static_library("bundled_libvpx") {
+       sources = libvpx_srcs_arm64
+       public_deps = [ ":libvpx_arm64_headers" ]
+     }
++  } else if (current_cpu == "ppc64") {
++    sources = libvpx_srcs_ppc64
+   }
+ 
+   configs -= [ "//build/config/compiler:chromium_code" ]
+--- a/src/3rdparty/chromium/third_party/libvpx/generate_gni.sh
++++ b/src/3rdparty/chromium/third_party/libvpx/generate_gni.sh
+@@ -374,6 +374,7 @@ gen_config_files linux/arm-neon-highbd "
+ gen_config_files linux/arm64-highbd "--target=armv8-linux-gcc ${all_platforms} ${HIGHBD}"
+ gen_config_files linux/mipsel "--target=mips32-linux-gcc ${all_platforms}"
+ gen_config_files linux/mips64el "--target=mips64-linux-gcc ${all_platforms}"
++gen_config_files linux/ppc64 "--target=generic-gnu $HIGHBD ${all_platforms}"
+ gen_config_files linux/generic "--target=generic-gnu $HIGHBD ${all_platforms}"
+ gen_config_files win/arm64 "--target=arm64-win64-vs15 ${all_platforms} ${HIGHBD}"
+ gen_config_files win/ia32 "--target=x86-win32-vs14 ${all_platforms} ${x86_platforms}"
+@@ -399,6 +400,7 @@ lint_config linux/arm-neon-highbd
+ lint_config linux/arm64-highbd
+ lint_config linux/mipsel
+ lint_config linux/mips64el
++lint_config linux/ppc64
+ lint_config linux/generic
+ lint_config win/arm64
+ lint_config win/ia32
+@@ -428,6 +430,7 @@ gen_rtcd_header linux/arm-neon-highbd ar
+ gen_rtcd_header linux/arm64-highbd armv8
+ gen_rtcd_header linux/mipsel mipsel
+ gen_rtcd_header linux/mips64el mips64el
++gen_rtcd_header linux/ppc64 generic
+ gen_rtcd_header linux/generic generic
+ gen_rtcd_header win/arm64 armv8
+ gen_rtcd_header win/ia32 x86 "${require_sse2}"
+@@ -513,6 +516,12 @@ if [ -z $ONLY_CONFIGS ]; then
+ 
+   echo "MIPS64 source list is identical to MIPS source list. No need to generate it."
+ 
++  echo "Generate ppc64 source list."
++  config=$(print_config_basic linux/ppc64)
++  make_clean
++  make libvpx_srcs.txt target=libs $config > /dev/null
++  convert_srcs_to_project_files libvpx_srcs.txt libvpx_srcs_ppc64
++
+   echo "Generate NaCl source list."
+   config=$(print_config_basic nacl)
+   make_clean
diff --git a/srcpkgs/qt6-webengine/patches/0901-xxx-ppc64le-sandbox-linux-stat.patch b/srcpkgs/qt6-webengine/patches/0901-xxx-ppc64le-sandbox-linux-stat.patch
new file mode 100644
index 000000000000..4b8e6320601c
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0901-xxx-ppc64le-sandbox-linux-stat.patch
@@ -0,0 +1,31 @@
+--- a/src/3rdparty/chromium/sandbox/linux/system_headers/linux_stat.h
++++ b/src/3rdparty/chromium/sandbox/linux/system_headers/linux_stat.h
+@@ -155,6 +155,28 @@ struct kernel_stat {
+   unsigned int __unused4;
+   unsigned int __unused5;
+ };
++#elif defined(__powerpc64__)
++struct kernel_stat {
++  unsigned long	st_dev;
++  unsigned long	st_ino;
++  unsigned long	st_nlink;
++  unsigned int	st_mode;
++  unsigned int	st_uid;
++  unsigned int	st_gid;
++  unsigned long	st_rdev;
++  long		st_size;
++  unsigned long	st_blksize;
++  unsigned long	st_blocks;
++  unsigned long	st_atime_;
++  unsigned long	st_atime_nsec_;
++  unsigned long	st_mtime_;
++  unsigned long	st_mtime_nsec_;
++  unsigned long	st_ctime_;
++  unsigned long	st_ctime_nsec_;
++  unsigned long	__unused4;
++  unsigned long	__unused5;
++  unsigned long	__unused6;
++};
+ #endif
+ 
+ #if !defined(AT_EMPTY_PATH)
diff --git a/srcpkgs/qt6-webengine/patches/0902-xxx-ppc64le-support.patch b/srcpkgs/qt6-webengine/patches/0902-xxx-ppc64le-support.patch
new file mode 100644
index 000000000000..33d415e55f69
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0902-xxx-ppc64le-support.patch
@@ -0,0 +1,3556 @@
+commit 2c013a317b1114ef67cdbbc30824b28907b9ea94
+Author: Daniel Kolesa <daniel@octaforge.org>
+Date:   Wed Mar 3 19:08:29 2021 +0100
+
+    ppc64le support
+
+--- a/src/3rdparty/chromium/sandbox/features.gni
++++ b/src/3rdparty/chromium/sandbox/features.gni
+@@ -11,7 +11,8 @@ import("//build/config/nacl/config.gni")
+ use_seccomp_bpf = (is_linux || is_chromeos || is_android) &&
+                   (current_cpu == "x86" || current_cpu == "x64" ||
+                    current_cpu == "arm" || current_cpu == "arm64" ||
+-                   current_cpu == "mipsel" || current_cpu == "mips64el")
++                   current_cpu == "mipsel" || current_cpu == "mips64el" ||
++                   current_cpu == "ppc64")
+ 
+ use_seccomp_bpf = use_seccomp_bpf || is_nacl_nonsfi
+ 
+--- a/src/3rdparty/chromium/sandbox/linux/BUILD.gn
++++ b/src/3rdparty/chromium/sandbox/linux/BUILD.gn
+@@ -433,6 +433,8 @@ component("sandbox_services") {
+ 
+ source_set("sandbox_services_headers") {
+   sources = [
++    "system_headers/ppc64_linux_syscalls.h",
++    "system_headers/ppc64_linux_ucontext.h",
+     "system_headers/arm64_linux_syscalls.h",
+     "system_headers/arm_linux_syscalls.h",
+     "system_headers/arm_linux_ucontext.h",
+--- a/src/3rdparty/chromium/sandbox/linux/bpf_dsl/linux_syscall_ranges.h
++++ b/src/3rdparty/chromium/sandbox/linux/bpf_dsl/linux_syscall_ranges.h
+@@ -56,6 +56,13 @@
+ #define MAX_PUBLIC_SYSCALL __NR_syscalls
+ #define MAX_SYSCALL MAX_PUBLIC_SYSCALL
+ 
++#elif defined(__powerpc64__)
++
++#include <asm/unistd.h>
++#define MIN_SYSCALL 0u
++#define MAX_PUBLIC_SYSCALL 386u
++#define MAX_SYSCALL MAX_PUBLIC_SYSCALL
++
+ #else
+ #error "Unsupported architecture"
+ #endif
+--- a/src/3rdparty/chromium/sandbox/linux/bpf_dsl/seccomp_macros.h
++++ b/src/3rdparty/chromium/sandbox/linux/bpf_dsl/seccomp_macros.h
+@@ -16,6 +16,9 @@
+ #if defined(__mips__)
+ // sys/user.h in eglibc misses size_t definition
+ #include <stddef.h>
++#elif defined(__powerpc64__) && defined(__GLIBC__)
++// Manually define greg_t on ppc64
++typedef unsigned long long greg_t;
+ #endif
+ #endif
+ 
+@@ -346,6 +349,59 @@ struct regs_struct {
+ #define SECCOMP_PT_PARM4(_regs) (_regs).regs[3]
+ #define SECCOMP_PT_PARM5(_regs) (_regs).regs[4]
+ #define SECCOMP_PT_PARM6(_regs) (_regs).regs[5]
++
++#elif defined(__powerpc64__)
++#include <asm/ptrace.h>
++
++typedef struct pt_regs regs_struct;
++
++#ifdef ARCH_CPU_LITTLE_ENDIAN
++#define SECCOMP_ARCH AUDIT_ARCH_PPC64LE
++#else
++#define SECCOMP_ARCH AUDIT_ARCH_PPC64
++#endif
++
++#ifdef __GLIBC__
++#define SECCOMP_REG(_ctx, _reg) ((_ctx)->uc_mcontext.regs->gpr[_reg])
++#else
++#define SECCOMP_REG(_ctx, _reg) (((struct pt_regs *)(_ctx)->uc_mcontext.regs)->gpr[_reg])
++#endif
++
++#define SECCOMP_RESULT(_ctx) SECCOMP_REG(_ctx, 3)
++#define SECCOMP_SYSCALL(_ctx) SECCOMP_REG(_ctx, 0)
++#ifdef __GLIBC__
++#define SECCOMP_IP(_ctx) (_ctx)->uc_mcontext.regs->nip
++#else
++#define SECCOMP_IP(_ctx) ((struct pt_regs *)(_ctx)->uc_mcontext.regs)->nip
++#endif
++#define SECCOMP_PARM1(_ctx) SECCOMP_REG(_ctx, 3)
++#define SECCOMP_PARM2(_ctx) SECCOMP_REG(_ctx, 4)
++#define SECCOMP_PARM3(_ctx) SECCOMP_REG(_ctx, 5)
++#define SECCOMP_PARM4(_ctx) SECCOMP_REG(_ctx, 6)
++#define SECCOMP_PARM5(_ctx) SECCOMP_REG(_ctx, 7)
++#define SECCOMP_PARM6(_ctx) SECCOMP_REG(_ctx, 8)
++
++#define SECCOMP_NR_IDX (offsetof(struct arch_seccomp_data, nr))
++#define SECCOMP_ARCH_IDX (offsetof(struct arch_seccomp_data, arch))
++#define SECCOMP_IP_MSB_IDX \
++  (offsetof(struct arch_seccomp_data, instruction_pointer) + 4)
++#define SECCOMP_IP_LSB_IDX \
++  (offsetof(struct arch_seccomp_data, instruction_pointer) + 0)
++#define SECCOMP_ARG_MSB_IDX(nr) \
++  (offsetof(struct arch_seccomp_data, args) + 8 * (nr) + 4)
++#define SECCOMP_ARG_LSB_IDX(nr) \
++  (offsetof(struct arch_seccomp_data, args) + 8 * (nr) + 0)
++
++#define SECCOMP_PT_RESULT(_regs) (_regs).gpr[3]
++#define SECCOMP_PT_SYSCALL(_regs) (_regs).gpr[0]
++#define SECCOMP_PT_IP(_regs) (_regs).nip
++#define SECCOMP_PT_PARM1(_regs) (_regs).gpr[3]
++#define SECCOMP_PT_PARM2(_regs) (_regs).gpr[4]
++#define SECCOMP_PT_PARM3(_regs) (_regs).gpr[5]
++#define SECCOMP_PT_PARM4(_regs) (_regs).gpr[6]
++#define SECCOMP_PT_PARM5(_regs) (_regs).gpr[7]
++#define SECCOMP_PT_PARM6(_regs) (_regs).gpr[8]
++
+ #else
+ #error Unsupported target platform
+ 
+--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc
++++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc
+@@ -90,7 +90,7 @@ bool IsBaselinePolicyWatched(int sysno)
+          SyscallSets::IsNuma(sysno) ||
+          SyscallSets::IsPrctl(sysno) ||
+          SyscallSets::IsProcessGroupOrSession(sysno) ||
+-#if defined(__i386__) || \
++#if defined(__i386__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+          SyscallSets::IsSocketCall(sysno) ||
+ #endif
+@@ -258,7 +258,7 @@ ResultExpr EvaluateSyscallImpl(int fs_de
+   }
+ 
+ #if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
+-    defined(__aarch64__)
++    defined(__aarch64__) || defined(__powerpc64__)
+   if (sysno == __NR_mmap)
+     return RestrictMmapFlags();
+ #endif
+@@ -279,7 +279,7 @@ ResultExpr EvaluateSyscallImpl(int fs_de
+     return RestrictPrctl();
+ 
+ #if defined(__x86_64__) || defined(__arm__) || defined(__mips__) || \
+-    defined(__aarch64__)
++    defined(__aarch64__) || defined(__powerpc64__)
+   if (sysno == __NR_socketpair) {
+     // Only allow AF_UNIX, PF_UNIX. Crash if anything else is seen.
+     static_assert(AF_UNIX == PF_UNIX,
+@@ -343,7 +343,8 @@ ResultExpr EvaluateSyscallImpl(int fs_de
+   }
+ 
+ #if defined(__i386__) || \
+-    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
++    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
++    defined(__powerpc64__)
+   if (SyscallSets::IsSocketCall(sysno))
+     return RestrictSocketcallCommand();
+ #endif
+--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/baseline_policy_unittest.cc
++++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/baseline_policy_unittest.cc
+@@ -317,7 +317,7 @@ TEST_BASELINE_SIGSYS(__NR_sysinfo)
+ TEST_BASELINE_SIGSYS(__NR_syslog)
+ TEST_BASELINE_SIGSYS(__NR_timer_create)
+ 
+-#if !defined(__aarch64__)
++#if !defined(__aarch64__) && !defined(__powerpc64__)
+ TEST_BASELINE_SIGSYS(__NR_inotify_init)
+ TEST_BASELINE_SIGSYS(__NR_vserver)
+ #endif
+--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc
++++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc
+@@ -40,6 +40,7 @@
+ #include <sys/ptrace.h>
+ #if (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) && \
+     !defined(__arm__) && !defined(__aarch64__) &&           \
++    !defined(__powerpc64__) &&                              \
+     !defined(PTRACE_GET_THREAD_AREA)
+ // Also include asm/ptrace-abi.h since ptrace.h in older libc (for instance
+ // the one in Ubuntu 16.04 LTS) is missing PTRACE_GET_THREAD_AREA.
+@@ -49,6 +50,11 @@
+ #endif
+ #endif  // !OS_NACL_NONSFI
+ 
++// On PPC64, TCGETS is defined in terms of struct termios, so we must include termios.h
++#ifdef __powerpc64__
++#include <termios.h>
++#endif
++
+ #if defined(OS_ANDROID)
+ 
+ #if !defined(F_DUPFD_CLOEXEC)
+@@ -106,6 +112,14 @@ inline bool IsArchitectureMips() {
+ #endif
+ }
+ 
++inline bool IsArchitecturePPC64() {
++#if defined(__powerpc64__)
++  return true;
++#else
++  return false;
++#endif
++}
++
+ // Ubuntu's version of glibc has a race condition in sem_post that can cause
+ // it to call futex(2) with bogus op arguments. To workaround this, we need
+ // to allow those futex(2) calls to fail with EINVAL, instead of crashing the
+@@ -270,6 +284,8 @@ ResultExpr RestrictFcntlCommands() {
+   uint64_t kOLargeFileFlag = O_LARGEFILE;
+   if (IsArchitectureX86_64() || IsArchitectureI386() || IsArchitectureMips())
+     kOLargeFileFlag = 0100000;
++  else if (IsArchitecturePPC64())
++    kOLargeFileFlag = 0200000;
+ 
+   const Arg<int> cmd(1);
+   const Arg<long> long_arg(2);
+@@ -287,7 +303,16 @@ ResultExpr RestrictFcntlCommands() {
+               F_SETLKW,
+               F_GETLK,
+               F_DUPFD,
+-              F_DUPFD_CLOEXEC),
++              F_DUPFD_CLOEXEC
++#if defined(__powerpc64__)
++// On PPC64, F_SETLK, F_GETLK, F_SETLKW are defined as the 64-bit variants
++// but glibc will sometimes still use the 32-bit versions. Allow both.
++              ,
++              5, /* F_GETLK (32) */
++              6, /* F_SETLK (32) */
++              7  /* F_SETLKW (32) */
++#endif
++	     ),
+              Allow())
+       .Case(F_SETFL,
+             If((long_arg & ~kAllowedMask) == 0, Allow()).Else(CrashSIGSYS()))
+@@ -297,7 +322,7 @@ ResultExpr RestrictFcntlCommands() {
+   // clang-format on
+ }
+ 
+-#if defined(__i386__) || defined(__mips__)
++#if defined(__i386__) || defined(__mips__) || defined(__powerpc64__)
+ ResultExpr RestrictSocketcallCommand() {
+   // Unfortunately, we are unable to restrict the first parameter to
+   // socketpair(2). Whilst initially sounding bad, it's noteworthy that very
+@@ -454,7 +479,7 @@ ResultExpr RestrictPtrace() {
+ #endif
+   return Switch(request)
+       .CASES((
+-#if !defined(__aarch64__)
++#if !defined(__aarch64__) && !defined(__powerpc64__)
+                  PTRACE_GETREGS, PTRACE_GETFPREGS,
+ #if defined(TRACE_GET_THREAD_AREA)
+                  PTRACE_GET_THREAD_AREA,
+--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.h
++++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.h
+@@ -49,7 +49,7 @@ SANDBOX_EXPORT bpf_dsl::ResultExpr Restr
+ // O_NONBLOCK | O_SYNC | O_LARGEFILE | O_CLOEXEC | O_NOATIME.
+ SANDBOX_EXPORT bpf_dsl::ResultExpr RestrictFcntlCommands();
+ 
+-#if defined(__i386__) || defined(__mips__)
++#if defined(__i386__) || defined(__mips__) || defined(__powerpc64__)
+ // Restrict socketcall(2) to only allow socketpair(2), send(2), recv(2),
+ // sendto(2), recvfrom(2), shutdown(2), sendmsg(2) and recvmsg(2).
+ SANDBOX_EXPORT bpf_dsl::ResultExpr RestrictSocketcallCommand();
+--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
++++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
+@@ -28,7 +28,7 @@ bool SyscallSets::IsKill(int sysno) {
+ bool SyscallSets::IsAllowedGettime(int sysno) {
+   switch (sysno) {
+     case __NR_gettimeofday:
+-#if defined(__i386__) || defined(__x86_64__) || \
++#if defined(__i386__) || defined(__x86_64__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_time:
+ #endif
+@@ -51,12 +51,12 @@ bool SyscallSets::IsAllowedGettime(int s
+                                     // filtered by RestrictClockID().
+     case __NR_clock_nanosleep_time64:  // Parameters filtered by RestrictClockID().
+ #endif
+-#if defined(__i386__) || \
++#if defined(__i386__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_ftime:  // Obsolete.
+ #endif
+     case __NR_settimeofday:  // Privileged.
+-#if defined(__i386__) || \
++#if defined(__i386__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_stime:
+ #endif
+@@ -135,7 +135,7 @@ bool SyscallSets::IsFileSystem(int sysno
+     case __NR_faccessat:  // EPERM not a valid errno.
+     case __NR_fchmodat:
+     case __NR_fchownat:  // Should be called chownat ?
+-#if defined(__x86_64__) || defined(__aarch64__)
++#if defined(__x86_64__) || defined(__aarch64__) || defined(__powerpc64__)
+     case __NR_newfstatat:  // fstatat(). EPERM not a valid errno.
+ #elif defined(__i386__) || defined(__arm__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+@@ -154,7 +154,7 @@ bool SyscallSets::IsFileSystem(int sysno
+     case __NR_memfd_create:
+     case __NR_mkdirat:
+     case __NR_mknodat:
+-#if defined(__i386__)
++#if defined(__i386__) || defined(__powerpc64__)
+     case __NR_oldlstat:
+     case __NR_oldstat:
+ #endif
+@@ -167,7 +167,7 @@ bool SyscallSets::IsFileSystem(int sysno
+     case __NR_stat64:
+ #endif
+     case __NR_statfs:  // EPERM not a valid errno.
+-#if defined(__i386__) || defined(__arm__) || \
++#if defined(__i386__) || defined(__arm__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_statfs64:
+ #endif
+@@ -179,7 +179,8 @@ bool SyscallSets::IsFileSystem(int sysno
+     case __NR_truncate64:
+ #endif
+     case __NR_unlinkat:
+-#if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
++#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
++    defined(__powerpc64__)
+     case __NR_utime:
+ #endif
+     case __NR_utimensat:  // New.
+@@ -204,7 +205,8 @@ bool SyscallSets::IsAllowedFileSystemAcc
+ #endif
+       return true;
+ // TODO(jln): these should be denied gracefully as well (moved below).
+-#if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
++#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
++    defined(__powerpc64__)
+     case __NR_fadvise64:  // EPERM not a valid errno.
+ #endif
+ #if defined(__i386__)
+@@ -216,12 +218,12 @@ bool SyscallSets::IsAllowedFileSystemAcc
+     case __NR_fdatasync:  // EPERM not a valid errno.
+     case __NR_flock:      // EPERM not a valid errno.
+     case __NR_fstatfs:    // Give information about the whole filesystem.
+-#if defined(__i386__) || defined(__arm__) || \
++#if defined(__i386__) || defined(__arm__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_fstatfs64:
+ #endif
+     case __NR_fsync:  // EPERM not a valid errno.
+-#if defined(__i386__)
++#if defined(__i386__) || defined(__powerpc64__)
+     case __NR_oldfstat:
+ #endif
+ #if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
+@@ -229,6 +231,8 @@ bool SyscallSets::IsAllowedFileSystemAcc
+     case __NR_sync_file_range:  // EPERM not a valid errno.
+ #elif defined(__arm__)
+     case __NR_arm_sync_file_range:  // EPERM not a valid errno.
++#elif defined(__powerpc64__)
++    case __NR_sync_file_range2: // EPERM not a valid errno.
+ #endif
+     default:
+       return false;
+@@ -248,7 +252,7 @@ bool SyscallSets::IsDeniedFileSystemAcce
+     case __NR_getdents:    // EPERM not a valid errno.
+ #endif
+     case __NR_getdents64:  // EPERM not a valid errno.
+-#if defined(__i386__) || \
++#if defined(__i386__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_readdir:
+ #endif
+@@ -290,7 +294,7 @@ bool SyscallSets::IsGetSimpleId(int sysn
+ bool SyscallSets::IsProcessPrivilegeChange(int sysno) {
+   switch (sysno) {
+     case __NR_capset:
+-#if defined(__i386__) || defined(__x86_64__)
++#if defined(__i386__) || defined(__x86_64__) || defined(__powerpc64__)
+     case __NR_ioperm:  // Intel privilege.
+     case __NR_iopl:    // Intel privilege.
+ #endif
+@@ -340,7 +344,7 @@ bool SyscallSets::IsAllowedSignalHandlin
+     case __NR_rt_sigprocmask:
+     case __NR_rt_sigreturn:
+     case __NR_rt_sigtimedwait:
+-#if defined(__i386__) || defined(__arm__) || \
++#if defined(__i386__) || defined(__arm__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_rt_sigtimedwait_time64:
+     case __NR_sigaction:
+@@ -357,7 +361,7 @@ bool SyscallSets::IsAllowedSignalHandlin
+     case __NR_signalfd:
+ #endif
+     case __NR_signalfd4:
+-#if defined(__i386__) || defined(__arm__) || \
++#if defined(__i386__) || defined(__arm__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_sigpending:
+     case __NR_sigsuspend:
+@@ -382,7 +386,7 @@ bool SyscallSets::IsAllowedOperationOnFd
+ #endif
+     case __NR_dup3:
+ #if defined(__x86_64__) || defined(__arm__) || defined(__mips__) || \
+-    defined(__aarch64__)
++    defined(__aarch64__) || defined(__powerpc64__)
+     case __NR_shutdown:
+ #endif
+       return true;
+@@ -416,7 +420,7 @@ bool SyscallSets::IsAllowedProcessStartO
+     case __NR_membarrier:
+     case __NR_wait4:
+     case __NR_waitid:
+-#if defined(__i386__)
++#if defined(__i386__) || defined(__powerpc64__)
+     case __NR_waitpid:
+ #endif
+ #if !defined(__GLIBC__)
+@@ -438,7 +442,7 @@ bool SyscallSets::IsAllowedProcessStartO
+     case __NR_set_tid_address:
+ #endif
+     case __NR_unshare:
+-#if !defined(__mips__) && !defined(__aarch64__)
++#if !defined(__mips__) && !defined(__aarch64__) || defined(__powerpc64__)
+     case __NR_vfork:
+ #endif
+     default:
+@@ -491,7 +495,7 @@ bool SyscallSets::IsAllowedGetOrModifySo
+       return true;
+     default:
+ #if defined(__x86_64__) || defined(__arm__) || defined(__mips__) || \
+-    defined(__aarch64__)
++    defined(__aarch64__) || defined(__powerpc64__)
+     case __NR_socketpair:  // We will want to inspect its argument.
+ #endif
+       return false;
+@@ -501,7 +505,7 @@ bool SyscallSets::IsAllowedGetOrModifySo
+ bool SyscallSets::IsDeniedGetOrModifySocket(int sysno) {
+   switch (sysno) {
+ #if defined(__x86_64__) || defined(__arm__) || defined(__mips__) || \
+-    defined(__aarch64__)
++    defined(__aarch64__) || defined(__powerpc64__)
+     case __NR_accept:
+     case __NR_accept4:
+     case __NR_bind:
+@@ -515,7 +519,7 @@ bool SyscallSets::IsDeniedGetOrModifySoc
+   }
+ }
+ 
+-#if defined(__i386__) || \
++#if defined(__i386__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+ // Big multiplexing system call for sockets.
+ bool SyscallSets::IsSocketCall(int sysno) {
+@@ -530,7 +534,8 @@ bool SyscallSets::IsSocketCall(int sysno
+ }
+ #endif
+ 
+-#if defined(__x86_64__) || defined(__arm__) || defined(__mips__)
++#if defined(__x86_64__) || defined(__arm__) || defined(__mips__) || \
++    defined(__powerpc64__)
+ bool SyscallSets::IsNetworkSocketInformation(int sysno) {
+   switch (sysno) {
+     case __NR_getpeername:
+@@ -558,7 +563,7 @@ bool SyscallSets::IsAllowedAddressSpaceA
+     case __NR_mincore:
+     case __NR_mlockall:
+ #if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
+-    defined(__aarch64__)
++    defined(__aarch64__) || defined(__powerpc64__)
+     case __NR_mmap:
+ #endif
+ #if defined(__i386__) || defined(__arm__) || \
+@@ -589,7 +594,7 @@ bool SyscallSets::IsAllowedAddressSpaceA
+ bool SyscallSets::IsAllowedGeneralIo(int sysno) {
+   switch (sysno) {
+     case __NR_lseek:
+-#if defined(__i386__) || defined(__arm__) || \
++#if defined(__i386__) || defined(__arm__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR__llseek:
+ #endif
+@@ -609,27 +614,27 @@ bool SyscallSets::IsAllowedGeneralIo(int
+     case __NR_read:
+     case __NR_readv:
+     case __NR_pread64:
+-#if defined(__arm__) || \
++#if defined(__arm__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_recv:
+ #endif
+ #if defined(__x86_64__) || defined(__arm__) || defined(__mips__) || \
+-    defined(__aarch64__)
++    defined(__aarch64__) || defined(__powerpc64__)
+     case __NR_recvfrom:  // Could specify source.
+     case __NR_recvmsg:   // Could specify source.
+ #endif
+-#if defined(__i386__) || defined(__x86_64__)
++#if defined(__i386__) || defined(__x86_64__) || defined(__powerpc64__)
+     case __NR_select:
+ #endif
+-#if defined(__i386__) || defined(__arm__) || defined(__mips__)
++#if defined(__i386__) || defined(__arm__) || defined(__mips__) || defined(__powerpc64__)
+     case __NR__newselect:
+ #endif
+-#if defined(__arm__) || \
++#if defined(__arm__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_send:
+ #endif
+ #if defined(__x86_64__) || defined(__arm__) || defined(__mips__) || \
+-    defined(__aarch64__)
++    defined(__aarch64__) || defined(__powerpc64__)
+     case __NR_sendmsg:  // Could specify destination.
+     case __NR_sendto:   // Could specify destination.
+ #endif
+@@ -684,7 +689,7 @@ bool SyscallSets::IsAllowedBasicSchedule
+     case __NR_nanosleep:
+       return true;
+     case __NR_getpriority:
+-#if defined(__i386__) || defined(__arm__) || \
++#if defined(__i386__) || defined(__arm__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_nice:
+ #endif
+@@ -696,7 +701,7 @@ bool SyscallSets::IsAllowedBasicSchedule
+ 
+ bool SyscallSets::IsAdminOperation(int sysno) {
+   switch (sysno) {
+-#if defined(__i386__) || defined(__arm__) || \
++#if defined(__i386__) || defined(__arm__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_bdflush:
+ #endif
+@@ -713,7 +718,8 @@ bool SyscallSets::IsAdminOperation(int s
+ 
+ bool SyscallSets::IsKernelModule(int sysno) {
+   switch (sysno) {
+-#if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
++#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
++    defined(__powerpc64__)
+     case __NR_create_module:
+     case __NR_get_kernel_syms:  // Should ENOSYS.
+     case __NR_query_module:
+@@ -745,7 +751,7 @@ bool SyscallSets::IsFsControl(int sysno)
+     case __NR_quotactl:
+     case __NR_swapoff:
+     case __NR_swapon:
+-#if defined(__i386__) || \
++#if defined(__i386__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_umount:
+ #endif
+@@ -762,7 +768,7 @@ bool SyscallSets::IsNuma(int sysno) {
+     case __NR_getcpu:
+     case __NR_mbind:
+ #if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
+-    defined(__aarch64__)
++    defined(__aarch64__) || defined(__powerpc64__)
+     case __NR_migrate_pages:
+ #endif
+     case __NR_move_pages:
+@@ -797,13 +803,13 @@ bool SyscallSets::IsGlobalProcessEnviron
+   switch (sysno) {
+     case __NR_acct:  // Privileged.
+ #if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
+-    defined(__aarch64__)
++    defined(__aarch64__) || defined(__powerpc64__)
+     case __NR_getrlimit:
+ #endif
+-#if defined(__i386__) || defined(__arm__)
++#if defined(__i386__) || defined(__arm__) || defined(__powerpc64__)
+     case __NR_ugetrlimit:
+ #endif
+-#if defined(__i386__) || \
++#if defined(__i386__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_ulimit:
+ #endif
+@@ -838,7 +844,7 @@ bool SyscallSets::IsGlobalSystemStatus(i
+ #endif
+     case __NR_sysinfo:
+     case __NR_uname:
+-#if defined(__i386__)
++#if defined(__i386__) || defined(__powerpc64__)
+     case __NR_olduname:
+     case __NR_oldolduname:
+ #endif
+@@ -904,8 +910,16 @@ bool SyscallSets::IsSystemVSemaphores(in
+ }
+ #endif
+ 
++/* shitty hack around Void's 4.19 kernel headers missing those numbers */
++#if defined(__powerpc64__) && !defined(__NR_shmget)
++#define __NR_shmget 395
++#define __NR_shmctl 396
++#define __NR_shmat 397
++#define __NR_shmdt 398
++#endif
++
+ #if defined(__i386__) || defined(__x86_64__) || defined(__arm__) || \
+-    defined(__aarch64__) ||                                         \
++    defined(__aarch64__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_64_BITS))
+ // These give a lot of ambient authority and bypass the setuid sandbox.
+ bool SyscallSets::IsSystemVSharedMemory(int sysno) {
+@@ -936,7 +950,7 @@ bool SyscallSets::IsSystemVMessageQueue(
+ }
+ #endif
+ 
+-#if defined(__i386__) || \
++#if defined(__i386__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+ // Big system V multiplexing system call.
+ bool SyscallSets::IsSystemVIpc(int sysno) {
+@@ -956,7 +970,7 @@ bool SyscallSets::IsAnySystemV(int sysno
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_64_BITS))
+   return IsSystemVMessageQueue(sysno) || IsSystemVSemaphores(sysno) ||
+          IsSystemVSharedMemory(sysno);
+-#elif defined(__i386__) || \
++#elif defined(__i386__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+   return IsSystemVIpc(sysno);
+ #endif
+@@ -1014,7 +1028,8 @@ bool SyscallSets::IsFaNotify(int sysno)
+ bool SyscallSets::IsTimer(int sysno) {
+   switch (sysno) {
+     case __NR_getitimer:
+-#if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
++#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
++    defined(__powerpc64__)
+     case __NR_alarm:
+ #endif
+     case __NR_setitimer:
+@@ -1096,17 +1111,20 @@ bool SyscallSets::IsMisc(int sysno) {
+     case __NR_syncfs:
+     case __NR_vhangup:
+ // The system calls below are not implemented.
+-#if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
++#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
++    defined(__powerpc64__)
+     case __NR_afs_syscall:
+ #endif
+ #if defined(__i386__) || \
+-    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
++    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
++    defined(__powerpc64__)
+     case __NR_break:
+ #endif
+-#if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
++#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
++    defined(__powerpc64__)
+     case __NR_getpmsg:
+ #endif
+-#if defined(__i386__) || \
++#if defined(__i386__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_gtty:
+     case __NR_idle:
+@@ -1115,20 +1133,21 @@ bool SyscallSets::IsMisc(int sysno) {
+     case __NR_prof:
+     case __NR_profil:
+ #endif
+-#if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
++#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
++    defined(__powerpc64__)
+     case __NR_putpmsg:
+ #endif
+ #if defined(__x86_64__)
+     case __NR_security:
+ #endif
+-#if defined(__i386__) || \
++#if defined(__i386__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_stty:
+ #endif
+-#if defined(__x86_64__)
++#if defined(__x86_64__) || defined(__powerpc64__)
+     case __NR_tuxcall:
+ #endif
+-#if !defined(__aarch64__)
++#if !defined(__aarch64__) && !defined(__powerpc64__)
+     case __NR_vserver:
+ #endif
+       return true;
+--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_sets.h
++++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_sets.h
+@@ -43,13 +43,14 @@ class SANDBOX_EXPORT SyscallSets {
+   static bool IsDeniedGetOrModifySocket(int sysno);
+ 
+ #if defined(__i386__) || \
+-    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
++    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
++    defined(__powerpc64__)
+   // Big multiplexing system call for sockets.
+   static bool IsSocketCall(int sysno);
+ #endif
+ 
+ #if defined(__x86_64__) || defined(__arm__) || defined(__mips__) || \
+-    defined(__aarch64__)
++    defined(__aarch64__) || defined(__powerpc64__)
+   static bool IsNetworkSocketInformation(int sysno);
+ #endif
+ 
+@@ -77,7 +78,7 @@ class SANDBOX_EXPORT SyscallSets {
+   static bool IsSystemVSemaphores(int sysno);
+ #endif
+ #if defined(__i386__) || defined(__x86_64__) || defined(__arm__) || \
+-    defined(__aarch64__) ||                                         \
++    defined(__aarch64__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_64_BITS))
+   // These give a lot of ambient authority and bypass the setuid sandbox.
+   static bool IsSystemVSharedMemory(int sysno);
+@@ -89,7 +90,8 @@ class SANDBOX_EXPORT SyscallSets {
+ #endif
+ 
+ #if defined(__i386__) || \
+-    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
++    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
++    defined(__powerpc64__)
+   // Big system V multiplexing system call.
+   static bool IsSystemVIpc(int sysno);
+ #endif
+--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf/syscall.cc
++++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf/syscall.cc
+@@ -18,7 +18,7 @@ namespace sandbox {
+ namespace {
+ 
+ #if defined(ARCH_CPU_X86_FAMILY) || defined(ARCH_CPU_ARM_FAMILY) || \
+-    defined(ARCH_CPU_MIPS_FAMILY)
++    defined(ARCH_CPU_MIPS_FAMILY) || defined (ARCH_CPU_PPC64_FAMILY)
+ // Number that's not currently used by any Linux kernel ABIs.
+ const int kInvalidSyscallNumber = 0x351d3;
+ #else
+@@ -312,10 +312,54 @@ asm(// We need to be able to tell the ke
+     "2:ret\n"
+     ".cfi_endproc\n"
+     ".size SyscallAsm, .-SyscallAsm\n"
++#elif defined(__powerpc64__)
++    ".text\n"
++    ".align 4\n"
++    ".type SyscallAsm @function\n"
++    "SyscallAsm:\n"
++    ".cfi_startproc\n"
++
++    // Check if r3 is negative
++    "cmpdi 3, 0\n"
++    "bgt 2f\n"
++
++    // Load address of 3f into r3 and return
++    "mflr 10\n"
++    "bl 1f\n"
++    "1: mflr 3\n"
++    "mtlr 10\n"
++    "addi 3, 3, 4*13\n"
++    "blr\n"
++
++    // Load arguments from array into r3-8
++    // save param 3 in r10
++    "2:\n"
++    "mr 0, 3\n"
++    "ld 3, 0(4)\n"
++    "ld 5, 16(4)\n"
++    "ld 6, 24(4)\n"
++    "ld 7, 32(4)\n"
++    "ld 8, 40(4)\n"
++    "ld 4, 8(4)\n"
++    "li 9, 0\n"
++
++    // Enter kernel
++    "sc\n"
++
++    // Magic return address
++    "3:\n"
++    // Like MIPS, ppc64 return values are always positive.
++    // Check for error in cr0.SO and negate upon error
++    "bc 4, 3, 4f\n"
++    "neg 3, 3\n"
++    "4: blr\n"
++
++    ".cfi_endproc\n"
++    ".size SyscallAsm, .-SyscallAsm\n"
+ #endif
+     );  // asm
+ 
+-#if defined(__x86_64__)
++#if defined(__x86_64__) || defined(__powerpc64__)
+ extern "C" {
+ intptr_t SyscallAsm(intptr_t nr, const intptr_t args[6]);
+ }
+@@ -429,6 +473,8 @@ intptr_t Syscall::Call(int nr,
+     ret = inout;
+   }
+ 
++#elif defined(__powerpc64__)
++  intptr_t ret = SyscallAsm(nr, args);
+ #else
+ #error "Unimplemented architecture"
+ #endif
+@@ -445,8 +491,26 @@ void Syscall::PutValueInUcontext(intptr_
+     // needs to be changed back.
+     ret_val = -ret_val;
+     SECCOMP_PARM4(ctx) = 1;
+-  } else
++  } else {
+     SECCOMP_PARM4(ctx) = 0;
++  }
++#endif
++#if defined(__powerpc64__)
++  // Same as MIPS, need to invert ret and set error register (cr0.SO)
++  if (ret_val <= -1 && ret_val >= -4095) {
++    ret_val = -ret_val;
++#ifdef __GLIBC__
++    ctx->uc_mcontext.regs->ccr |= (1 << 28);
++#else
++    ((struct pt_regs *)ctx->uc_mcontext.regs)->ccr |= (1 << 28);
++#endif
++  } else {
++#ifdef __GLIBC__
++    ctx->uc_mcontext.regs->ccr &= ~(1 << 28);
++#else
++    ((struct pt_regs *)ctx->uc_mcontext.regs)->ccr &= ~(1 << 28);
++#endif
++  }
+ #endif
+   SECCOMP_RESULT(ctx) = static_cast<greg_t>(ret_val);
+ }
+--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf/trap.cc
++++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf/trap.cc
+@@ -236,6 +236,20 @@ void Trap::SigSys(int nr, LinuxSigInfo*
+       SetIsInSigHandler();
+     }
+ 
++#if defined(__powerpc64__)
++    // On ppc64+glibc, some syscalls seem to accidentally negate the first
++    // parameter which causes checks against it to fail. For now, manually
++    // negate them back.
++    // TODO(shawn@anastas.io): investigate this issue further
++    auto nr = SECCOMP_SYSCALL(ctx);
++    if (nr == __NR_openat || nr == __NR_mkdirat || nr == __NR_faccessat || nr == __NR_readlinkat ||
++        nr == __NR_renameat || nr == __NR_renameat2 || nr == __NR_newfstatat || nr == __NR_unlinkat) {
++        if (static_cast<int>(SECCOMP_PARM1(ctx)) > 0) {
++            SECCOMP_PARM1(ctx) = -SECCOMP_PARM1(ctx);
++        }
++    }
++#endif
++
+     // Copy the seccomp-specific data into a arch_seccomp_data structure. This
+     // is what we are showing to TrapFnc callbacks that the system call
+     // evaluator registered with the sandbox.
+--- a/src/3rdparty/chromium/sandbox/linux/services/credentials.cc
++++ b/src/3rdparty/chromium/sandbox/linux/services/credentials.cc
+@@ -81,7 +81,7 @@ bool ChrootToSafeEmptyDir() {
+   pid_t pid = -1;
+   alignas(16) char stack_buf[PTHREAD_STACK_MIN];
+ #if defined(ARCH_CPU_X86_FAMILY) || defined(ARCH_CPU_ARM_FAMILY) || \
+-    defined(ARCH_CPU_MIPS_FAMILY)
++    defined(ARCH_CPU_MIPS_FAMILY) || defined(ARCH_CPU_PPC64_FAMILY)
+   // The stack grows downward.
+   void* stack = stack_buf + sizeof(stack_buf);
+ #else
+--- a/src/3rdparty/chromium/sandbox/linux/services/syscall_wrappers.cc
++++ b/src/3rdparty/chromium/sandbox/linux/services/syscall_wrappers.cc
+@@ -61,7 +61,7 @@ long sys_clone(unsigned long flags,
+ #if defined(ARCH_CPU_X86_64)
+   return syscall(__NR_clone, flags, child_stack, ptid, ctid, tls);
+ #elif defined(ARCH_CPU_X86) || defined(ARCH_CPU_ARM_FAMILY) || \
+-    defined(ARCH_CPU_MIPS_FAMILY)
++    defined(ARCH_CPU_MIPS_FAMILY) || defined(ARCH_CPU_PPC64_FAMILY)
+   // CONFIG_CLONE_BACKWARDS defined.
+   return syscall(__NR_clone, flags, child_stack, ptid, tls, ctid);
+ #endif
+--- a/src/3rdparty/chromium/sandbox/linux/syscall_broker/broker_process.cc
++++ b/src/3rdparty/chromium/sandbox/linux/syscall_broker/broker_process.cc
+@@ -165,7 +165,7 @@ bool BrokerProcess::IsSyscallBrokerable(
+ #if defined(__NR_fstatat64)
+     case __NR_fstatat64:
+ #endif
+-#if defined(__x86_64__) || defined(__aarch64__)
++#if defined(__x86_64__) || defined(__aarch64__) || defined(__powerpc64__)
+     case __NR_newfstatat:
+ #endif
+       return !fast_check || allowed_command_set_.test(COMMAND_STAT);
+--- a/src/3rdparty/chromium/sandbox/linux/system_headers/linux_seccomp.h
++++ b/src/3rdparty/chromium/sandbox/linux/system_headers/linux_seccomp.h
+@@ -41,6 +41,9 @@
+ #ifndef EM_AARCH64
+ #define EM_AARCH64 183
+ #endif
++#ifndef EM_PPC64
++#define EM_PPC64 21
++#endif
+ 
+ #ifndef __AUDIT_ARCH_64BIT
+ #define __AUDIT_ARCH_64BIT 0x80000000
+@@ -74,6 +77,14 @@
+ #define AUDIT_ARCH_AARCH64 (EM_AARCH64 | __AUDIT_ARCH_64BIT | __AUDIT_ARCH_LE)
+ #endif
+ 
++#ifndef AUDIT_ARCH_PPC64
++#define AUDIT_ARCH_PPC64 (EM_PPC64 | __AUDIT_ARCH_64BIT)
++#endif
++
++#ifndef AUDIT_ARCH_PPC64LE
++#define AUDIT_ARCH_PPC64LE (EM_PPC64 | __AUDIT_ARCH_64BIT | __AUDIT_ARCH_LE)
++#endif
++
+ // For prctl.h
+ #ifndef PR_SET_SECCOMP
+ #define PR_SET_SECCOMP               22
+--- a/src/3rdparty/chromium/sandbox/linux/system_headers/linux_signal.h
++++ b/src/3rdparty/chromium/sandbox/linux/system_headers/linux_signal.h
+@@ -13,7 +13,7 @@
+ // (not undefined, but defined different values and in different memory
+ // layouts). So, fill the gap here.
+ #if defined(__i386__) || defined(__x86_64__) || defined(__arm__) || \
+-    defined(__aarch64__)
++    defined(__aarch64__) || defined(__powerpc64__)
+ 
+ #define LINUX_SIGHUP 1
+ #define LINUX_SIGINT 2
+--- a/src/3rdparty/chromium/sandbox/linux/system_headers/linux_syscalls.h
++++ b/src/3rdparty/chromium/sandbox/linux/system_headers/linux_syscalls.h
+@@ -35,5 +35,9 @@
+ #include "sandbox/linux/system_headers/arm64_linux_syscalls.h"
+ #endif
+ 
++#if defined(__powerpc64__)
++#include "sandbox/linux/system_headers/ppc64_linux_syscalls.h"
++#endif
++
+ #endif  // SANDBOX_LINUX_SYSTEM_HEADERS_LINUX_SYSCALLS_H_
+ 
+--- a/src/3rdparty/chromium/sandbox/linux/system_headers/linux_ucontext.h
++++ b/src/3rdparty/chromium/sandbox/linux/system_headers/linux_ucontext.h
+@@ -11,6 +11,8 @@
+ #include "sandbox/linux/system_headers/arm_linux_ucontext.h"
+ #elif defined(__i386__)
+ #include "sandbox/linux/system_headers/i386_linux_ucontext.h"
++#elif defined(__powerpc64__)
++#include "sandbox/linux/system_headers/ppc64_linux_ucontext.h"
+ #else
+ #error "No support for your architecture in PNaCl header"
+ #endif
+--- a/src/3rdparty/chromium/sandbox/policy/linux/bpf_renderer_policy_linux.cc
++++ b/src/3rdparty/chromium/sandbox/policy/linux/bpf_renderer_policy_linux.cc
+@@ -15,6 +15,11 @@
+ #include "sandbox/linux/system_headers/linux_syscalls.h"
+ #include "sandbox/policy/linux/sandbox_linux.h"
+ 
++// On PPC64, TCGETS is defined in terms of struct termios, so we must include termios.h
++#ifdef __powerpc64__
++#include <termios.h>
++#endif
++
+ // TODO(vignatti): replace the local definitions below with #include
+ // <linux/dma-buf.h> once kernel version 4.6 becomes widely used.
+ #include <linux/types.h>
+--- a/src/3rdparty/chromium/third_party/angle/src/compiler/translator/InfoSink.h
++++ b/src/3rdparty/chromium/third_party/angle/src/compiler/translator/InfoSink.h
+@@ -93,7 +93,16 @@ class TInfoSinkBase
+             stream.precision(8);
+             stream << f;
+         }
+-        sink.append(stream.str());
++
++        // Hack to work around a bug where negative floating point values
++        // are rendered like '.0.5' instead of '-0.5'
++        std::string res(stream.str());
++
++        if (signbit(f)) { // test if f is negative
++            res[0] = '-';
++        }
++
++        sink.append(res);
+         return *this;
+     }
+     // Write boolean values as their names instead of integral value.
+--- a/src/3rdparty/chromium/third_party/angle/src/libANGLE/Constants.h
++++ b/src/3rdparty/chromium/third_party/angle/src/libANGLE/Constants.h
+@@ -9,6 +9,7 @@
+ #ifndef LIBANGLE_CONSTANTS_H_
+ #define LIBANGLE_CONSTANTS_H_
+ 
++#include <cstddef>
+ #include "common/platform.h"
+ 
+ #include <stdint.h>
+--- a/src/3rdparty/chromium/third_party/boringssl/BUILD.gn
++++ b/src/3rdparty/chromium/third_party/boringssl/BUILD.gn
+@@ -99,6 +99,13 @@ if (is_win && !is_msan && current_cpu !=
+       } else {
+         public_configs = [ ":no_asm_config" ]
+       }
++    } else if (current_cpu == "ppc64") {
++      if (is_linux) {
++        # TODO: ppc64 (be) check
++        sources += crypto_sources_linux_ppc64le
++      } else {
++        public_configs = [ ":no_asm_config" ]
++      }
+     } else {
+       public_configs = [ ":no_asm_config" ]
+     }
+--- a/src/3rdparty/chromium/third_party/breakpad/BUILD.gn
++++ b/src/3rdparty/chromium/third_party/breakpad/BUILD.gn
+@@ -623,7 +623,6 @@ if (is_linux || is_chromeos || is_androi
+       "breakpad/src/client/minidump_file_writer.h",
+       "breakpad/src/common/convert_UTF.cc",
+       "breakpad/src/common/convert_UTF.h",
+-      "breakpad/src/common/linux/breakpad_getcontext.S",
+       "breakpad/src/common/linux/elf_core_dump.cc",
+       "breakpad/src/common/linux/elf_core_dump.h",
+       "breakpad/src/common/linux/elfutils.cc",
+@@ -663,6 +662,15 @@ if (is_linux || is_chromeos || is_androi
+ 
+     libs = [ "dl" ]
+ 
++    if (current_cpu == "ppc64") {
++        defines = [ "HAVE_GETCONTEXT" ]
++        libs += [ "ucontext" ]
++    } else {
++        sources += [
++            "breakpad/src/common/linux/breakpad_getcontext.S"
++        ]
++    }
++
+     include_dirs = [
+       ".",
+       "breakpad/src",
+@@ -712,7 +720,6 @@ if (is_linux || is_chromeos || is_androi
+       "breakpad/src/client/linux/minidump_writer/minidump_writer_unittest.cc",
+       "breakpad/src/client/linux/minidump_writer/minidump_writer_unittest_utils.cc",
+       "breakpad/src/client/linux/minidump_writer/proc_cpuinfo_reader_unittest.cc",
+-      "breakpad/src/common/linux/breakpad_getcontext_unittest.cc",
+       "breakpad/src/common/linux/elf_core_dump_unittest.cc",
+       "breakpad/src/common/linux/file_id_unittest.cc",
+       "breakpad/src/common/linux/linux_libc_support_unittest.cc",
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/raw_context_cpu.h
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/raw_context_cpu.h
+@@ -44,6 +44,8 @@ typedef MDRawContextARM RawContextCPU;
+ typedef MDRawContextARM64_Old RawContextCPU;
+ #elif defined(__mips__)
+ typedef MDRawContextMIPS RawContextCPU;
++#elif defined(__powerpc64__)
++typedef MDRawContextPPC64 RawContextCPU;
+ #else
+ #error "This code has not been ported to your platform yet."
+ #endif
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.cc
+@@ -270,7 +270,54 @@ void ThreadInfo::FillCPUContext(RawConte
+   out->float_save.fir = mcontext.fpc_eir;
+ #endif
+ }
+-#endif  // __mips__
++
++#elif defined(__powerpc64__)
++
++#if !defined(__GLIBC__)
++#include <asm/elf.h>
++#include <asm/ptrace.h>
++#endif
++
++uintptr_t ThreadInfo::GetInstructionPointer() const {
++    return mcontext.gp_regs[PT_NIP];
++}
++
++void ThreadInfo::FillCPUContext(RawContextCPU* out) const {
++    out->context_flags = MD_CONTEXT_PPC64_FULL;
++    for (int i = 0; i < MD_CONTEXT_PPC64_GPR_COUNT; i++)
++        out->gpr[i] = mcontext.gp_regs[i];
++
++    out->lr = mcontext.gp_regs[PT_LNK];
++    out->srr0 = mcontext.gp_regs[PT_NIP];
++    out->srr1 = mcontext.gp_regs[PT_MSR];
++    out->cr = mcontext.gp_regs[PT_CCR];
++    out->xer = mcontext.gp_regs[PT_XER];
++    out->ctr = mcontext.gp_regs[PT_CTR];
++
++#ifdef __GLIBC__
++    for (int i = 0; i < MD_FLOATINGSAVEAREA_PPC_FPR_COUNT; i++)
++        out->float_save.fpregs[i] = mcontext.fp_regs[i];
++
++    out->float_save.fpscr = mcontext.fp_regs[NFPREG-1];
++#else
++    for (int i = 0; i < MD_FLOATINGSAVEAREA_PPC_FPR_COUNT; i++)
++        out->float_save.fpregs[i] = ((uint64_t *)&mcontext.fp_regs)[i];
++
++     out->float_save.fpscr = ((uint64_t *)&mcontext.fp_regs)[ELF_NFPREG-1];
++#endif
++
++    for (int i = 0; i < MD_VECTORSAVEAREA_PPC_VR_COUNT; i++)
++        out->vector_save.save_vr[i] = \
++            {(((uint64_t)vregs.vrregs[i][0]) << 32)
++                          | vregs.vrregs[i][1],
++            (((uint64_t)vregs.vrregs[i][2]) << 32)
++                         | vregs.vrregs[i][3]};
++
++    out->vrsave = vregs.vrsave;
++    out->vector_save.save_vscr = {0, vregs.vscr.vscr_word};
++    out->vector_save.save_vrvalid = 0xFFFFFFFF;
++}
++#endif  // __powerpc64__
+ 
+ void ThreadInfo::GetGeneralPurposeRegisters(void** gp_regs, size_t* size) {
+   assert(gp_regs || size);
+@@ -279,6 +326,11 @@ void ThreadInfo::GetGeneralPurposeRegist
+     *gp_regs = mcontext.gregs;
+   if (size)
+     *size = sizeof(mcontext.gregs);
++#elif defined(__powerpc64__)
++  if (gp_regs)
++    *gp_regs = mcontext.gp_regs;
++  if (size)
++    *size = sizeof(mcontext.gp_regs);
+ #else
+   if (gp_regs)
+     *gp_regs = &regs;
+@@ -294,6 +346,11 @@ void ThreadInfo::GetFloatingPointRegiste
+     *fp_regs = &mcontext.fpregs;
+   if (size)
+     *size = sizeof(mcontext.fpregs);
++#elif defined(__powerpc64__)
++  if (fp_regs)
++    *fp_regs = &mcontext.fp_regs;
++  if (size)
++    *size = sizeof(mcontext.fp_regs);
+ #else
+   if (fp_regs)
+     *fp_regs = &fpregs;
+@@ -302,4 +359,13 @@ void ThreadInfo::GetFloatingPointRegiste
+ #endif
+ }
+ 
++#if defined(__powerpc64__)
++void ThreadInfo::GetVectorRegisters(void** v_regs, size_t* size) {
++    if (v_regs)
++        *v_regs = &vregs;
++    if (size)
++        *size = sizeof(vregs);
++}
++#endif
++
+ }  // namespace google_breakpad
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.h
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.h
+@@ -68,6 +68,10 @@ struct ThreadInfo {
+   // Use the structures defined in <sys/user.h>
+   struct user_regs_struct regs;
+   struct user_fpsimd_struct fpregs;
++#elif defined(__powerpc64__)
++  // Use the structures defined in <sys/ucontext.h>.
++  mcontext_t mcontext;
++  vrregset_t vregs;
+ #elif defined(__mips__)
+   // Use the structure defined in <sys/ucontext.h>.
+   mcontext_t mcontext;
+@@ -84,6 +88,11 @@ struct ThreadInfo {
+ 
+   // Returns the pointer and size of float point register area.
+   void GetFloatingPointRegisters(void** fp_regs, size_t* size);
++
++#if defined(__powerpc64__)
++  // Returns the pointer and size of the vector register area. (PPC64 only)
++  void GetVectorRegisters(void** v_regs, size_t* size);
++#endif
+ };
+ 
+ }  // namespace google_breakpad
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc
+@@ -254,6 +254,60 @@ void UContextReader::FillCPUContext(RawC
+   out->float_save.fir = uc->uc_mcontext.fpc_eir;  // Unused.
+ #endif
+ }
++
++#elif defined(__powerpc64__)
++
++#ifndef __GLIBC__
++#include <asm/elf.h>
++#include <asm/ptrace.h>
++#endif
++
++uintptr_t UContextReader::GetStackPointer(const ucontext_t* uc) {
++    return uc->uc_mcontext.gp_regs[MD_CONTEXT_PPC64_REG_SP];
++}
++
++uintptr_t UContextReader::GetInstructionPointer(const ucontext_t* uc) {
++    return uc->uc_mcontext.gp_regs[PT_NIP];
++}
++
++void UContextReader::FillCPUContext(RawContextCPU* out, const ucontext_t* uc,
++                                    const vrregset_t* vregs) {
++    out->context_flags = MD_CONTEXT_PPC64_FULL;
++
++    for (int i = 0; i < MD_CONTEXT_PPC64_GPR_COUNT; i++)
++        out->gpr[i] = uc->uc_mcontext.gp_regs[i];
++
++    out->lr = uc->uc_mcontext.gp_regs[PT_LNK];
++    out->srr0 = uc->uc_mcontext.gp_regs[PT_NIP];
++    out->srr1 = uc->uc_mcontext.gp_regs[PT_MSR];
++    out->cr = uc->uc_mcontext.gp_regs[PT_CCR];
++    out->xer = uc->uc_mcontext.gp_regs[PT_XER];
++    out->ctr = uc->uc_mcontext.gp_regs[PT_CTR];
++
++#ifdef __GLIBC__
++    for (int i = 0; i < MD_FLOATINGSAVEAREA_PPC_FPR_COUNT; i++)
++        out->float_save.fpregs[i] = uc->uc_mcontext.fp_regs[i];
++
++    out->float_save.fpscr = uc->uc_mcontext.fp_regs[NFPREG-1];
++#else
++    for (int i = 0; i < MD_FLOATINGSAVEAREA_PPC_FPR_COUNT; i++)
++        out->float_save.fpregs[i] = ((uint64_t *)&uc->uc_mcontext.fp_regs)[i];
++
++    out->float_save.fpscr = ((uint64_t *)&uc->uc_mcontext.fp_regs)[ELF_NFPREG-1];
++#endif
++
++    for (int i = 0; i < MD_VECTORSAVEAREA_PPC_VR_COUNT; i++)
++        out->vector_save.save_vr[i] =
++            {(((uint64_t)vregs->vrregs[i][0]) << 32)
++                         | vregs->vrregs[i][1],
++             (((uint64_t)vregs->vrregs[i][2]) << 32)
++                         | vregs->vrregs[i][3]};
++
++    out->vrsave = vregs->vrsave;
++    out->vector_save.save_vscr = {0, vregs->vscr.vscr_word};
++    out->vector_save.save_vrvalid = 0xFFFFFFFF;
++}
++
+ #endif
+ 
+ }  // namespace google_breakpad
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h
+@@ -59,6 +59,9 @@ struct UContextReader {
+ #elif defined(__aarch64__)
+   static void FillCPUContext(RawContextCPU* out, const ucontext_t* uc,
+                              const struct fpsimd_context* fpregs);
++#elif defined(__powerpc64__)
++  static void FillCPUContext(RawContextCPU *out, const ucontext_t *uc,
++                             const vrregset_t* vregs);
+ #else
+   static void FillCPUContext(RawContextCPU* out, const ucontext_t* uc);
+ #endif
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc
+@@ -105,6 +105,13 @@
+ #define PR_SET_PTRACER 0x59616d61
+ #endif
+ 
++/* musl hack, can't include asm/ptrace.h as that causes conflicts */
++#ifndef __GLIBC__
++#if defined(__powerpc64__) && !defined(PT_NIP)
++#define PT_NIP 32
++#endif
++#endif
++
+ namespace google_breakpad {
+ 
+ namespace {
+@@ -461,9 +468,16 @@ bool ExceptionHandler::HandleSignal(int
+     memcpy(&g_crash_context_.float_state, fp_ptr,
+            sizeof(g_crash_context_.float_state));
+   }
++#elif defined(__powerpc64__)
++  // On PPC64, we must copy VR state
++  ucontext_t* uc_ptr = (ucontext_t*)uc;
++  if (uc_ptr->uc_mcontext.v_regs) {
++    memcpy(&g_crash_context_.vector_state, uc_ptr->uc_mcontext.v_regs,
++           sizeof(g_crash_context_.vector_state));
++  }
+ #elif !defined(__ARM_EABI__) && !defined(__mips__)
+   // FP state is not part of user ABI on ARM Linux.
+-  // In case of MIPS Linux FP state is already part of ucontext_t
++  // In case of MIPS, Linux FP state is already part of ucontext_t
+   // and 'float_state' is not a member of CrashContext.
+   ucontext_t* uc_ptr = (ucontext_t*)uc;
+   if (uc_ptr->uc_mcontext.fpregs) {
+@@ -708,11 +722,19 @@ bool ExceptionHandler::WriteMinidump() {
+   }
+ #endif
+ 
+-#if !defined(__ARM_EABI__) && !defined(__aarch64__) && !defined(__mips__)
++#if !defined(__ARM_EABI__) && !defined(__aarch64__) && !defined(__mips__) \
++    && !defined(__powerpc64__)
+   // FPU state is not part of ARM EABI ucontext_t.
+   memcpy(&context.float_state, context.context.uc_mcontext.fpregs,
+          sizeof(context.float_state));
+ #endif
++
++#if defined(__powerpc64__)
++  // Vector registers must be copied on PPC64
++  memcpy(&context.vector_state, context.context.uc_mcontext.v_regs,
++         sizeof(context.vector_state));
++#endif
++
+   context.tid = sys_gettid();
+ 
+   // Add an exception stream to the minidump for better reporting.
+@@ -733,6 +755,9 @@ bool ExceptionHandler::WriteMinidump() {
+ #elif defined(__mips__)
+   context.siginfo.si_addr =
+       reinterpret_cast<void*>(context.context.uc_mcontext.pc);
++#elif defined(__powerpc64__)
++  context.siginfo.si_addr =
++      reinterpret_cast<void*>(context.context.uc_mcontext.gp_regs[PT_NIP]);
+ #else
+ #error "This code has not been ported to your platform yet."
+ #endif
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.h
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.h
+@@ -192,7 +192,11 @@ class ExceptionHandler {
+     siginfo_t siginfo;
+     pid_t tid;  // the crashing thread.
+     ucontext_t context;
+-#if !defined(__ARM_EABI__) && !defined(__mips__)
++#if defined(__powerpc64__)
++    // PPC64's FP state is a part of ucontext_t like MIPS but the vector
++    // state is not, so a struct is needed.
++    vstate_t vector_state;
++#elif !defined(__ARM_EABI__) && !defined(__mips__)
+     // #ifdef this out because FP state is not part of user ABI for Linux ARM.
+     // In case of MIPS Linux FP state is already part of ucontext_t so
+     // 'float_state' is not required.
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler_unittest.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler_unittest.cc
+@@ -307,7 +307,7 @@ TEST(ExceptionHandlerTest, ParallelChild
+   }
+ 
+   // Wait a while until the child should have crashed.
+-  usleep(1000000);
++  usleep(2000000);
+   // Kill the child if it is still running.
+   kill(child, SIGKILL);
+ 
+@@ -559,6 +559,8 @@ const unsigned char kIllegalInstruction[
+ #if defined(__mips__)
+   // mfc2 zero,Impl - usually illegal in userspace.
+   0x48, 0x00, 0x00, 0x48
++#elif defined(__powerpc64__)
++  0x01, 0x01, 0x01, 0x01 // Crashes on a tested POWER9 cpu
+ #else
+   // This crashes with SIGILL on x86/x86-64/arm.
+   0xff, 0xff, 0xff, 0xff
+@@ -754,10 +756,10 @@ TEST(ExceptionHandlerTest, InstructionPo
+ 
+   // These are defined here so the parent can use them to check the
+   // data from the minidump afterwards.
+-  // Use 4k here because the OS will hand out a single page even
++  // Use the page size here because the OS will hand out a single page even
+   // if a smaller size is requested, and this test wants to
+   // test the upper bound of the memory range.
+-  const uint32_t kMemorySize = 4096;  // bytes
++  const uint32_t kMemorySize = getpagesize();  // bytes
+   const int kOffset = kMemorySize - sizeof(kIllegalInstruction);
+ 
+   const pid_t child = fork();
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/microdump_writer/microdump_writer.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/microdump_writer/microdump_writer.cc
+@@ -138,7 +138,9 @@ class MicrodumpWriter {
+                   const MicrodumpExtraInfo& microdump_extra_info,
+                   LinuxDumper* dumper)
+       : ucontext_(context ? &context->context : NULL),
+-#if !defined(__ARM_EABI__) && !defined(__mips__)
++#if defined(__powerpc64__)
++        vector_state_(context ? &context->vector_state : NULL),
++#elif !defined(__ARM_EABI__) && !defined(__mips__)
+         float_state_(context ? &context->float_state : NULL),
+ #endif
+         dumper_(dumper),
+@@ -337,6 +339,8 @@ class MicrodumpWriter {
+ # else
+ #  error "This mips ABI is currently not supported (n32)"
+ #endif
++#elif defined(__powerpc64__)
++    const char kArch[] = "ppc64";
+ #else
+ #error "This code has not been ported to your platform yet"
+ #endif
+@@ -409,7 +413,9 @@ class MicrodumpWriter {
+   void DumpCPUState() {
+     RawContextCPU cpu;
+     my_memset(&cpu, 0, sizeof(RawContextCPU));
+-#if !defined(__ARM_EABI__) && !defined(__mips__)
++#if defined(__powerpc64__)
++    UContextReader::FillCPUContext(&cpu, ucontext_, vector_state_);
++#elif !defined(__ARM_EABI__) && !defined(__mips__)
+     UContextReader::FillCPUContext(&cpu, ucontext_, float_state_);
+ #else
+     UContextReader::FillCPUContext(&cpu, ucontext_);
+@@ -605,7 +611,9 @@ class MicrodumpWriter {
+   void* Alloc(unsigned bytes) { return dumper_->allocator()->Alloc(bytes); }
+ 
+   const ucontext_t* const ucontext_;
+-#if !defined(__ARM_EABI__) && !defined(__mips__)
++#if defined(__powerpc64__)
++  const google_breakpad::vstate_t* const vector_state_;
++#elif !defined(__ARM_EABI__) && !defined(__mips__)
+   const google_breakpad::fpstate_t* const float_state_;
+ #endif
+   LinuxDumper* dumper_;
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/microdump_writer/microdump_writer_unittest.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/microdump_writer/microdump_writer_unittest.cc
+@@ -279,10 +279,19 @@ TEST(MicrodumpWriterTest, BasicWithMappi
+   CrashAndGetMicrodump(mappings, MicrodumpExtraInfo(), &buf);
+   ASSERT_TRUE(ContainsMicrodump(buf));
+ 
++  int page_size = getpagesize();
+ #ifdef __LP64__
+-  ASSERT_NE(std::string::npos,
+-            buf.find("M 0000000000001000 000000000000002A 0000000000001000 "
+-                     "33221100554477668899AABBCCDDEEFF0 libfoo.so"));
++  // This test is only available for the following page sizes
++  ASSERT_TRUE((page_size == 4096) || (page_size == 65536));
++  if (page_size == 4096) {
++    ASSERT_NE(std::string::npos,
++              buf.find("M 0000000000001000 000000000000002A 0000000000001000 "
++                       "33221100554477668899AABBCCDDEEFF0 libfoo.so"));
++  } else {
++    ASSERT_NE(std::string::npos,
++              buf.find("M 0000000000010000 000000000000002A 0000000000010000 "
++                       "33221100554477668899AABBCCDDEEFF0 libfoo.so"));
++  }
+ #else
+   ASSERT_NE(std::string::npos,
+             buf.find("M 00001000 0000002A 00001000 "
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_core_dumper.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_core_dumper.cc
+@@ -117,6 +117,9 @@ bool LinuxCoreDumper::GetThreadInfoByInd
+ #elif defined(__mips__)
+   stack_pointer =
+       reinterpret_cast<uint8_t*>(info->mcontext.gregs[MD_CONTEXT_MIPS_REG_SP]);
++#elif defined(__powerpc64__)
++  stack_pointer =
++      reinterpret_cast<uint8_t*>(info->mcontext.gp_regs[MD_CONTEXT_PPC64_REG_SP]);
+ #else
+ #error "This code hasn't been ported to your platform yet."
+ #endif
+@@ -212,7 +215,10 @@ bool LinuxCoreDumper::EnumerateThreads()
+         memset(&info, 0, sizeof(ThreadInfo));
+         info.tgid = status->pr_pgrp;
+         info.ppid = status->pr_ppid;
+-#if defined(__mips__)
++#if defined(__powerpc64__)
++        for (int i = 0; i < 31; i++)
++            info.mcontext.gp_regs[i] = status->pr_reg[i];
++#elif defined(__mips__)
+ #if defined(__ANDROID__)
+         for (int i = EF_R0; i <= EF_R31; i++)
+           info.mcontext.gregs[i - EF_R0] = status->pr_reg[i];
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper.cc
+@@ -765,7 +765,9 @@ bool LinuxDumper::GetStackInfo(const voi
+       reinterpret_cast<uint8_t*>(int_stack_pointer & ~(page_size - 1));
+ 
+   // The number of bytes of stack which we try to capture.
+-  static const ptrdiff_t kStackToCapture = 32 * 1024;
++  // This now depends on page_size to avoid missing data
++  // on systems with larger page sizes.
++  static const ptrdiff_t kStackToCapture = 8 * page_size;
+ 
+   const MappingInfo* mapping = FindMapping(stack_pointer);
+   if (!mapping)
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper.h
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper.h
+@@ -63,7 +63,8 @@ namespace google_breakpad {
+  (defined(__mips__) && _MIPS_SIM == _ABIO32)
+ typedef Elf32_auxv_t elf_aux_entry;
+ #elif defined(__x86_64) || defined(__aarch64__) || \
+-     (defined(__mips__) && _MIPS_SIM != _ABIO32)
++     (defined(__mips__) && _MIPS_SIM != _ABIO32) || \
++     defined(__powerpc64__)
+ typedef Elf64_auxv_t elf_aux_entry;
+ #endif
+ 
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper_unittest_helper.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper_unittest_helper.cc
+@@ -51,6 +51,8 @@
+ #define TID_PTR_REGISTER "rcx"
+ #elif defined(__mips__)
+ #define TID_PTR_REGISTER "$1"
++#elif defined(__powerpc64__)
++#define TID_PTR_REGISTER "r8"
+ #else
+ #error This test has not been ported to this platform.
+ #endif
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper.cc
+@@ -154,19 +154,27 @@ bool LinuxPtraceDumper::CopyFromProcess(
+   return true;
+ }
+ 
+-bool LinuxPtraceDumper::ReadRegisterSet(ThreadInfo* info, pid_t tid)
+-{
++bool LinuxPtraceDumper::ReadRegisterSet(ThreadInfo* info, pid_t tid) {
+ #ifdef PTRACE_GETREGSET
+   struct iovec io;
+   info->GetGeneralPurposeRegisters(&io.iov_base, &io.iov_len);
+-  if (sys_ptrace(PTRACE_GETREGSET, tid, (void*)NT_PRSTATUS, (void*)&io) == -1) {
++  if (ptrace(PTRACE_GETREGSET, tid, (void*)NT_PRSTATUS, (void*)&io) == -1) {
+     return false;
+   }
+ 
+   info->GetFloatingPointRegisters(&io.iov_base, &io.iov_len);
+-  if (sys_ptrace(PTRACE_GETREGSET, tid, (void*)NT_FPREGSET, (void*)&io) == -1) {
++  if (ptrace(PTRACE_GETREGSET, tid, (void*)NT_FPREGSET, (void*)&io) == -1) {
+     return false;
+   }
++
++#if defined(__powerpc64__)
++  // Grab the vector registers on PPC64 too
++  info->GetVectorRegisters(&io.iov_base, &io.iov_len);
++  if (ptrace(PTRACE_GETREGSET, tid, (void*)NT_PPC_VMX, (void*)&io) == -1) {
++    return false;
++  }
++#endif // defined(__powerpc64__)
++
+   return true;
+ #else
+   return false;
+@@ -303,6 +311,9 @@ bool LinuxPtraceDumper::GetThreadInfoByI
+ #elif defined(__mips__)
+   stack_pointer =
+       reinterpret_cast<uint8_t*>(info->mcontext.gregs[MD_CONTEXT_MIPS_REG_SP]);
++#elif defined(__powerpc64__)
++  stack_pointer =
++      reinterpret_cast<uint8_t*>(info->mcontext.gp_regs[MD_CONTEXT_PPC64_REG_SP]);
+ #else
+ #error "This code hasn't been ported to your platform yet."
+ #endif
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper_unittest.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper_unittest.cc
+@@ -462,6 +462,9 @@ TEST(LinuxPtraceDumperTest, VerifyStackR
+ #elif defined(__mips__)
+     pid_t* process_tid_location =
+         reinterpret_cast<pid_t*>(one_thread.mcontext.gregs[1]);
++#elif defined(__powerpc64__)
++    pid_t* process_tid_location =
++        reinterpret_cast<pid_t*>(one_thread.mcontext.gp_regs[8]);
+ #else
+ #error This test has not been ported to this platform.
+ #endif
+@@ -559,6 +562,8 @@ TEST_F(LinuxPtraceDumperTest, SanitizeSt
+   uintptr_t heap_addr = thread_info.regs.rcx;
+ #elif defined(__mips__)
+   uintptr_t heap_addr = thread_info.mcontext.gregs[1];
++#elif defined(__powerpc64__)
++  uintptr_t heap_addr = thread_info.mcontext.gp_regs[8];
+ #else
+ #error This test has not been ported to this platform.
+ #endif
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.cc
+@@ -136,7 +136,9 @@ class MinidumpWriter {
+       : fd_(minidump_fd),
+         path_(minidump_path),
+         ucontext_(context ? &context->context : NULL),
+-#if !defined(__ARM_EABI__) && !defined(__mips__)
++#if defined(__powerpc64__)
++        vector_state_(context ? &context->vector_state : NULL),
++#elif !defined(__ARM_EABI__) && !defined(__mips__)
+         float_state_(context ? &context->float_state : NULL),
+ #endif
+         dumper_(dumper),
+@@ -468,7 +470,9 @@ class MinidumpWriter {
+         if (!cpu.Allocate())
+           return false;
+         my_memset(cpu.get(), 0, sizeof(RawContextCPU));
+-#if !defined(__ARM_EABI__) && !defined(__mips__)
++#if defined(__powerpc64__)
++        UContextReader::FillCPUContext(cpu.get(), ucontext_, vector_state_);
++#elif !defined(__ARM_EABI__) && !defined(__mips__)
+         UContextReader::FillCPUContext(cpu.get(), ucontext_, float_state_);
+ #else
+         UContextReader::FillCPUContext(cpu.get(), ucontext_);
+@@ -897,7 +901,7 @@ class MinidumpWriter {
+     dirent->location.rva = 0;
+   }
+ 
+-#if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
++#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || defined(__powerpc64__)
+   bool WriteCPUInformation(MDRawSystemInfo* sys_info) {
+     char vendor_id[sizeof(sys_info->cpu.x86_cpu_info.vendor_id) + 1] = {0};
+     static const char vendor_id_name[] = "vendor_id";
+@@ -917,7 +921,9 @@ class MinidumpWriter {
+ 
+     // processor_architecture should always be set, do this first
+     sys_info->processor_architecture =
+-#if defined(__mips__)
++#if defined(__powerpc64__)
++        MD_CPU_ARCHITECTURE_PPC64;
++#elif defined(__mips__)
+ # if _MIPS_SIM == _ABIO32
+         MD_CPU_ARCHITECTURE_MIPS;
+ # elif _MIPS_SIM == _ABI64
+@@ -1333,7 +1339,9 @@ class MinidumpWriter {
+   const char* path_;  // Path to the file where the minidum should be written.
+ 
+   const ucontext_t* const ucontext_;  // also from the signal handler
+-#if !defined(__ARM_EABI__) && !defined(__mips__)
++#if defined(__powerpc64__)
++  const google_breakpad::vstate_t* const vector_state_;
++#elif !defined(__ARM_EABI__) && !defined(__mips__)
+   const google_breakpad::fpstate_t* const float_state_;  // ditto
+ #endif
+   LinuxDumper* dumper_;
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.h
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.h
+@@ -48,6 +48,8 @@ class ExceptionHandler;
+ 
+ #if defined(__aarch64__)
+ typedef struct fpsimd_context fpstate_t;
++#elif defined(__powerpc64__)
++typedef vrregset_t vstate_t;
+ #elif !defined(__ARM_EABI__) && !defined(__mips__)
+ typedef std::remove_pointer<fpregset_t>::type fpstate_t;
+ #endif
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer_unittest.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer_unittest.cc
+@@ -715,6 +715,12 @@ TEST(MinidumpWriterTest, InvalidStackPoi
+ #elif defined(__mips__)
+   context.context.uc_mcontext.gregs[MD_CONTEXT_MIPS_REG_SP] =
+       invalid_stack_pointer;
++#elif defined(__powerpc64__)
++  context.context.uc_mcontext.gp_regs[MD_CONTEXT_PPC64_REG_SP] =
++      invalid_stack_pointer;
++#elif defined(__powerpc64__)
++  context.context.uc_mcontext.gp_regs[MD_CONTEXT_PPC64_REG_SP] =
++      invalid_stack_pointer;
+ #else
+ # error "This code has not been ported to your platform yet."
+ #endif
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/common/linux/memory_mapped_file.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/common/linux/memory_mapped_file.cc
+@@ -65,8 +65,7 @@ bool MemoryMappedFile::Map(const char* p
+   }
+ 
+ #if defined(__x86_64__) || defined(__aarch64__) || \
+-   (defined(__mips__) && _MIPS_SIM == _ABI64)
+-
++   (defined(__mips__) && _MIPS_SIM == _ABI64) || defined(__powerpc64__)
+   struct kernel_stat st;
+   if (sys_fstat(fd, &st) == -1 || st.st_size < 0) {
+ #else
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/common/linux/memory_mapped_file_unittest.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/common/linux/memory_mapped_file_unittest.cc
+@@ -176,9 +176,10 @@ TEST_F(MemoryMappedFileTest, RemapAfterM
+ TEST_F(MemoryMappedFileTest, MapWithOffset) {
+   // Put more data in the test file this time. Offsets can only be
+   // done on page boundaries, so we need a two page file to test this.
+-  const int page_size = 4096;
+-  char data1[2 * page_size];
+-  size_t data1_size = sizeof(data1);
++  const int page_size = getpagesize();
++  char *data1 = static_cast<char*>(malloc(2 * page_size));
++  EXPECT_TRUE(data1 != NULL);
++  size_t data1_size = (2 * page_size);
+   for (size_t i = 0; i < data1_size; ++i) {
+     data1[i] = i & 0x7f;
+   }
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/common/memory_allocator_unittest.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/common/memory_allocator_unittest.cc
+@@ -57,8 +57,9 @@ TEST(PageAllocatorTest, LargeObject) {
+ 
+   EXPECT_EQ(0U, allocator.pages_allocated());
+   uint8_t* p = reinterpret_cast<uint8_t*>(allocator.Alloc(10000));
++  uint64_t expected_pages = 1 + ((10000 - 1) / getpagesize());
+   ASSERT_FALSE(p == NULL);
+-  EXPECT_EQ(3U, allocator.pages_allocated());
++  EXPECT_EQ(expected_pages, allocator.pages_allocated());
+   for (unsigned i = 1; i < 10; ++i) {
+     uint8_t* p = reinterpret_cast<uint8_t*>(allocator.Alloc(i));
+     ASSERT_FALSE(p == NULL);
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/processor/exploitability_linux.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/processor/exploitability_linux.cc
+@@ -202,12 +202,14 @@ bool ExploitabilityLinux::EndedOnIllegal
+   // Check architecture and set architecture variable to corresponding flag
+   // in objdump.
+   switch (context->GetContextCPU()) {
++#if defined(__i386) || defined(__x86_64)
+     case MD_CONTEXT_X86:
+       architecture = "i386";
+       break;
+     case MD_CONTEXT_AMD64:
+       architecture = "i386:x86-64";
+       break;
++#endif
+     default:
+       // Unsupported architecture. Note that ARM architectures are not
+       // supported because objdump does not support ARM.
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/processor/exploitability_unittest.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/processor/exploitability_unittest.cc
+@@ -104,6 +104,8 @@ ExploitabilityFor(const string& filename
+ }
+ 
+ TEST(ExploitabilityTest, TestWindowsEngine) {
++// The following tests are only executable on an x86-class linux machine.
++#if !defined(_WIN32) && (defined(__i386) || defined(__x86_64))
+   ASSERT_EQ(google_breakpad::EXPLOITABILITY_HIGH,
+             ExploitabilityFor("ascii_read_av.dmp"));
+   ASSERT_EQ(google_breakpad::EXPLOITABILITY_HIGH,
+@@ -136,9 +138,12 @@ TEST(ExploitabilityTest, TestWindowsEngi
+             ExploitabilityFor("read_av_clobber_write.dmp"));
+   ASSERT_EQ(google_breakpad::EXPLOITABILITY_LOW,
+             ExploitabilityFor("read_av_conditional.dmp"));
++#endif
+ }
+ 
+ TEST(ExploitabilityTest, TestLinuxEngine) {
++// The following tests are only executable on an x86-class linux machine.
++#if defined(__i386) || defined(__x86_64)
+   ASSERT_EQ(google_breakpad::EXPLOITABILITY_INTERESTING,
+             ExploitabilityFor("linux_null_read_av.dmp"));
+   ASSERT_EQ(google_breakpad::EXPLOITABILITY_HIGH,
+@@ -171,7 +176,8 @@ TEST(ExploitabilityTest, TestLinuxEngine
+             ExploitabilityFor("linux_executable_heap.dmp"));
+   ASSERT_EQ(google_breakpad::EXPLOITABILITY_HIGH,
+             ExploitabilityFor("linux_jmp_to_module_not_exe_region.dmp"));
+-#ifndef _WIN32
++#endif
++#if !defined(_WIN32) && (defined(__i386) || defined(__x86_64))
+   ASSERT_EQ(google_breakpad::EXPLOITABILITY_HIGH,
+             ExploitabilityFor("linux_write_to_nonwritable_module.dmp"));
+   ASSERT_EQ(google_breakpad::EXPLOITABILITY_HIGH,
+@@ -182,10 +188,10 @@ TEST(ExploitabilityTest, TestLinuxEngine
+             ExploitabilityFor("linux_write_to_outside_module_via_math.dmp"));
+   ASSERT_EQ(google_breakpad::EXPLOITABILITY_INTERESTING,
+             ExploitabilityFor("linux_write_to_under_4k.dmp"));
+-#endif  // _WIN32
++#endif  // !defined(_WIN32) && (!defined(__i386) && !defined(__x86_64))
+ }
+ 
+-#ifndef _WIN32
++#if !defined(_WIN32) && (defined(__i386) || defined(__x86_64))
+ TEST(ExploitabilityLinuxUtilsTest, DisassembleBytesTest) {
+   ASSERT_FALSE(ExploitabilityLinuxTest::DisassembleBytes("", NULL, 5, NULL));
+   uint8_t bytes[6] = {0xc7, 0x0, 0x5, 0x0, 0x0, 0x0};
+@@ -301,6 +307,7 @@ TEST(ExploitabilityLinuxUtilsTest, Calcu
+                                                          context,
+                                                          &write_address));
+ }
+-#endif  // _WIN32
++#endif  // !defined(_WIN32) && (defined(__i386) || defined(__x86_64))
++
+ 
+ }  // namespace
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/tools/linux/md2core/minidump-2-core.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/tools/linux/md2core/minidump-2-core.cc
+@@ -77,6 +77,8 @@
+   #define ELF_ARCH  EM_MIPS
+ #elif defined(__aarch64__)
+   #define ELF_ARCH  EM_AARCH64
++#elif defined(__powerpc64__)
++  #define ELF_ARCH  EM_PPC64
+ #endif
+ 
+ #if defined(__arm__)
+@@ -87,6 +89,8 @@ typedef user_regs user_regs_struct;
+ #elif defined (__mips__)
+ // This file-local typedef simplifies the source code.
+ typedef gregset_t user_regs_struct;
++#elif defined(__powerpc64__)
++typedef struct pt_regs user_regs_struct;
+ #endif
+ 
+ using google_breakpad::MDTypeHelper;
+@@ -322,6 +326,12 @@ struct CrashedProcess {
+ #if defined(__aarch64__)
+     user_fpsimd_struct fpregs;
+ #endif
++#if defined(__powerpc64__)
++    mcontext_t mcontext;
++#endif
++#if defined(__powerpc64__)
++    mcontext_t mcontext;
++#endif
+     uintptr_t stack_addr;
+     const uint8_t* stack;
+     size_t stack_length;
+@@ -535,6 +545,38 @@ ParseThreadRegisters(CrashedProcess::Thr
+   thread->mcontext.fpc_eir = rawregs->float_save.fir;
+ #endif
+ }
++#elif defined(__powerpc64__)
++static void
++ParseThreadRegisters(CrashedProcess::Thread* thread,
++                     const MinidumpMemoryRange& range) {
++  const MDRawContextPPC64* rawregs = range.GetData<MDRawContextPPC64>(0);
++
++  for (int i = 0; i < MD_CONTEXT_PPC64_GPR_COUNT; i++)
++    thread->mcontext.gp_regs[i] = rawregs->gpr[i];
++
++  thread->mcontext.gp_regs[PT_LNK] = rawregs->lr;
++  thread->mcontext.gp_regs[PT_NIP] = rawregs->srr0;
++  thread->mcontext.gp_regs[PT_MSR] = rawregs->srr1;
++  thread->mcontext.gp_regs[PT_CCR] = rawregs->cr;
++  thread->mcontext.gp_regs[PT_XER] = rawregs->xer;
++  thread->mcontext.gp_regs[PT_CTR] = rawregs->ctr;
++  thread->mcontext.v_regs->vrsave = rawregs->vrsave;
++
++  for (int i = 0; i < MD_FLOATINGSAVEAREA_PPC_FPR_COUNT; i++)
++      thread->mcontext.fp_regs[i] = rawregs->float_save.fpregs[i];
++
++  thread->mcontext.fp_regs[NFPREG-1] = rawregs->float_save.fpscr;
++
++  for (int i = 0; i < MD_VECTORSAVEAREA_PPC_VR_COUNT; i++) {
++      thread->mcontext.v_regs->vrregs[i][0] = rawregs->vector_save.save_vr[i].high >> 32;
++      thread->mcontext.v_regs->vrregs[i][1] = rawregs->vector_save.save_vr[i].high;
++      thread->mcontext.v_regs->vrregs[i][2] = rawregs->vector_save.save_vr[i].low >> 32;
++      thread->mcontext.v_regs->vrregs[i][3] = rawregs->vector_save.save_vr[i].low;
++  }
++
++  thread->mcontext.v_regs->vscr.vscr_word = rawregs->vector_save.save_vscr.low & 0xFFFFFFFF;
++}
++
+ #else
+ #error "This code has not been ported to your platform yet"
+ #endif
+@@ -623,6 +665,12 @@ ParseSystemInfo(const Options& options,
+ # else
+ #  error "This mips ABI is currently not supported (n32)"
+ # endif
++#elif defined(__powerpc64__)
++  if (sysinfo->processor_architecture != MD_CPU_ARCHITECTURE_PPC64) {
++    fprintf(stderr,
++            "This version of minidump-2-core only supports PPC64.\n");
++    exit(1);
++  }
+ #else
+ #error "This code has not been ported to your platform yet"
+ #endif
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/CONTRIBUTORS
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/CONTRIBUTORS
+@@ -13,3 +13,4 @@ Mark Mentovai <mark@chromium.org>
+ Robert Sesek <rsesek@chromium.org>
+ Scott Graham <scottmg@chromium.org>
+ Joshua Peraza <jperaza@chromium.org>
++Shawn Anastasio <shawn@anastas.io>
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/compat/linux/sys/user.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/compat/linux/sys/user.h
+@@ -15,6 +15,7 @@
+ #ifndef CRASHPAD_COMPAT_LINUX_SYS_USER_H_
+ #define CRASHPAD_COMPAT_LINUX_SYS_USER_H_
+ 
++#include <cstddef>
+ #include_next <sys/user.h>
+ 
+ #include <features.h>
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/minidump/minidump_context.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/minidump/minidump_context.h
+@@ -592,6 +592,70 @@ struct MinidumpContextMIPS64 {
+   uint64_t fir;
+ };
+ 
++//! \brief ppc64-specific flags for MinidumpPPC64::context_flags
++//! Based on minidump_cpu_ppc64.h from breakpad
++enum MinidumpContextPPC64Flags : uint32_t {
++  //! \brief Identifies the context as PPC64.
++  kMinidumpContextPPC64 = 0x01000000,
++
++  //! \brief Indicates the validity of general purpose registers.
++  //!
++  //! Registers `r0`-`r31`, `nip`, `msr`, `lr`, etc. are valid.
++  kMinidumpContextPPC64Base = kMinidumpContextPPC64 | 0x00000001,
++
++  //! \brief Indicates the validity of floating point registers.
++  //!
++  //! Registers `fp0`-`fp31`, `fpscr` are valid.
++  kMinidumpContextPPC64Floating = kMinidumpContextPPC64 | 0x00000008,
++
++  //! \brief Indicates the validity of Altivec/VMX registers.
++  //!
++  //! Registers `v0`-`v31`, `vscr`, `vrsave`.
++  kMinidumpContextPPC64Vector = kMinidumpContextPPC64 | 0x00000020,
++
++  //! \brief Indicates the validity of all registers
++  kMinidumpContextPPC64All = kMinidumpContextPPC64Base     |
++                             kMinidumpContextPPC64Floating |
++                             kMinidumpContextPPC64Vector
++};
++
++//! \brief A PPC64 CPU context carried in a minidump file.
++//! Based on minidump_cpu_ppc64.h from breakpad.
++struct MinidumpContextPPC64 {
++  uint64_t context_flags;
++
++  //! \brief General purpose registers.
++  uint64_t nip;
++  uint64_t msr;
++  uint64_t regs[32];
++  uint64_t ccr;
++  uint64_t xer;
++  uint64_t lnk;
++  uint64_t ctr;
++
++  //! \brief Floating point registers.
++  double fpregs[32];
++
++  //! \brief FPU status register.
++  double fpscr;
++
++  //! \brief Altivec/VMX vector registers.
++  struct {
++      //! \brief Vector registers are 128bits.
++      uint128_struct save_vr[32];
++      uint128_struct save_vscr;
++
++      //! \brief Padding included for breakpad compatibiltiy.
++      uint32_t save_pad5[4];
++
++      //! \brief VRSAVE register.
++      uint32_t save_vrsave;
++
++      //! \brief Padding included for breakpad compatibiltiy.
++      uint32_t save_pad6[7];
++  } vregs;
++};
++
+ }  // namespace crashpad
+ 
+ #endif  // CRASHPAD_MINIDUMP_MINIDUMP_CONTEXT_H_
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/minidump/minidump_context_writer.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/minidump/minidump_context_writer.cc
+@@ -101,6 +101,13 @@ MinidumpContextWriter::CreateFromSnapsho
+       break;
+     }
+ 
++    case kCPUArchitecturePPC64: {
++      context = std::make_unique<MinidumpContextPPC64Writer>();
++      reinterpret_cast<MinidumpContextPPC64Writer*>(context.get())
++          ->InitalizeFromSnapshot(context_snapshot->ppc64);
++      break;
++    }
++
+     default: {
+       LOG(ERROR) << "unknown context architecture "
+                  << context_snapshot->architecture;
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/minidump/minidump_context_writer.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/minidump/minidump_context_writer.h
+@@ -315,6 +315,45 @@ class MinidumpContextMIPS64Writer final
+   DISALLOW_COPY_AND_ASSIGN(MinidumpContextMIPS64Writer);
+ };
+ 
++class MinidumpContextPPC64Writer final : public MinidumpContextWriter {
++ public:
++  MinidumpContextPPC64Writer();
++  ~MinidumpContextPPC64Writer() override;
++
++  //! \brief Initalizes the MinidumpContextPPC64 based on \a context_snapshot.
++  //!
++  //! \param[in] context_snapshot The context snapshot to use as source data.
++  //!
++  //! \note Valid in #kStateMutable. No mutation of context() may be done before
++  //!     calling this method, and it is not normally necessary to alter
++  //!     context() after calling this method.
++  void InitalizeFromSnapshot(const CPUContextPPC64* context_snapshot);
++
++  //! \brief Returns a pointer to the context structure that this object will
++  //!     write.
++  //!
++  //! \attention This returns a non-`const` pointer to this object’s private
++  //!     data so that a caller can populate the context structure directly.
++  //!     This is done because providing setter interfaces to each field in the
++  //!     context structure would be unwieldy and cumbersome. Care must be taken
++  //!     to populate the context structure correctly. The context structure
++  //!     must only be modified while this object is in the #kStateMutable
++  //!     state.
++  MinidumpContextPPC64* context() { return &context_; }
++
++ protected:
++  // MinidumpWritable:
++  bool WriteObject(FileWriterInterface* file_writer) override;
++
++  // MinidumpContextWriter:
++  size_t ContextSize() const override;
++
++ private:
++  MinidumpContextPPC64 context_;
++
++  DISALLOW_COPY_AND_ASSIGN(MinidumpContextPPC64Writer);
++};
++
+ }  // namespace crashpad
+ 
+ #endif  // CRASHPAD_MINIDUMP_MINIDUMP_CONTEXT_WRITER_H_
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/minidump/minidump_context_writer_test.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/minidump/minidump_context_writer_test.cc
+@@ -213,6 +213,21 @@ TEST(MinidumpContextWriter, MIPS64_FromS
+       context, ExpectMinidumpContextMIPS64, kSeed);
+ }
+ 
++TEST(MinidumpContextWriter, PPC64_Zeros) {
++  EmptyContextTest<MinidumpContextPPC64Writer, MinidumpContextPPC64>(
++    ExpectMinidumpContextPPC64);
++}
++
++TEST(MinidumpContextWriter, PPC64_FromSnapshot) {
++  constexpr uint32_t kSeed = 64;
++  CPUContextPPC64 context_ppc64;
++  CPUContext context;
++  context.ppc64 = &context_ppc64;
++  InitializeCPUContextPPC64(&context, kSeed);
++  FromSnapshotTest<MinidumpContextPPC64Writer, MinidumpContextPPC64>(
++      context, ExpectMinidumpContextPPC64, kSeed);
++}
++
+ }  // namespace
+ }  // namespace test
+ }  // namespace crashpad
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/minidump/minidump_misc_info_writer.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/minidump/minidump_misc_info_writer.cc
+@@ -135,6 +135,8 @@ std::string MinidumpMiscInfoDebugBuildSt
+   static constexpr char kCPU[] = "mips";
+ #elif defined(ARCH_CPU_MIPS64EL)
+   static constexpr char kCPU[] = "mips64";
++#elif defined(ARCH_CPU_PPC64)
++  static constexpr char kCPU[] = "ppc64";
+ #else
+ #error define kCPU for this CPU
+ #endif
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/capture_memory.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/capture_memory.cc
+@@ -112,6 +112,11 @@ void CaptureMemory::PointedToByContext(c
+   for (size_t i = 0; i < base::size(context.mipsel->regs); ++i) {
+     MaybeCaptureMemoryAround(delegate, context.mipsel->regs[i]);
+   }
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++  MaybeCaptureMemoryAround(delegate, context.ppc64->nip);
++  for (size_t i = 0; i < base::size(context.ppc64->regs); ++i) {
++    MaybeCaptureMemoryAround(delegate, context.ppc64->regs[i]);
++  }
+ #else
+ #error Port.
+ #endif
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/cpu_architecture.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/cpu_architecture.h
+@@ -43,7 +43,10 @@ enum CPUArchitecture {
+   kCPUArchitectureMIPSEL,
+ 
+   //! \brief 64-bit MIPSEL.
+-  kCPUArchitectureMIPS64EL
++  kCPUArchitectureMIPS64EL,
++
++  //! \brief 64-bit PPC64.
++  kCPUArchitecturePPC64
+ };
+ 
+ }  // namespace crashpad
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/cpu_context.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/cpu_context.cc
+@@ -169,6 +169,8 @@ uint64_t CPUContext::InstructionPointer(
+       return arm->pc;
+     case kCPUArchitectureARM64:
+       return arm64->pc;
++    case kCPUArchitecturePPC64:
++      return ppc64->nip;
+     default:
+       NOTREACHED();
+       return ~0ull;
+@@ -185,6 +187,8 @@ uint64_t CPUContext::StackPointer() cons
+       return arm->sp;
+     case kCPUArchitectureARM64:
+       return arm64->sp;
++    case kCPUArchitecturePPC64:
++      return ppc64->regs[1];
+     default:
+       NOTREACHED();
+       return ~0ull;
+@@ -196,6 +200,7 @@ bool CPUContext::Is64Bit() const {
+     case kCPUArchitectureX86_64:
+     case kCPUArchitectureARM64:
+     case kCPUArchitectureMIPS64EL:
++    case kCPUArchitecturePPC64:
+       return true;
+     case kCPUArchitectureX86:
+     case kCPUArchitectureARM:
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/cpu_context.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/cpu_context.h
+@@ -352,6 +352,24 @@ struct CPUContextMIPS64 {
+   uint64_t fir;
+ };
+ 
++//! \brief A context structure carrying PPC64 CPU state.
++struct CPUContextPPC64 {
++  uint64_t nip;
++  uint64_t msr;
++  uint64_t regs[32];
++  uint64_t ccr;
++  uint64_t xer;
++  uint64_t lnk;
++  uint64_t ctr;
++  double fpregs[32];
++  double fpscr;
++  struct {
++    uint128_struct save_vr[32];
++    uint128_struct save_vscr;
++    uint32_t save_vrsave;
++  } vregs;
++};
++
+ //! \brief A context structure capable of carrying the context of any supported
+ //!     CPU architecture.
+ struct CPUContext {
+@@ -382,6 +400,7 @@ struct CPUContext {
+     CPUContextARM64* arm64;
+     CPUContextMIPS* mipsel;
+     CPUContextMIPS64* mips64;
++    CPUContextPPC64* ppc64;
+   };
+ };
+ 
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/cpu_context_linux.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/cpu_context_linux.h
+@@ -15,6 +15,7 @@
+ #ifndef CRASHPAD_SNAPSHOT_LINUX_CPU_CONTEXT_LINUX_H_
+ #define CRASHPAD_SNAPSHOT_LINUX_CPU_CONTEXT_LINUX_H_
+ 
++#include <cstring>
+ #include "build/build_config.h"
+ #include "snapshot/cpu_context.h"
+ #include "snapshot/linux/signal_context.h"
+@@ -174,6 +175,76 @@ void InitializeCPUContextMIPS(
+ 
+ #endif  // ARCH_CPU_MIPS_FAMILY || DOXYGEN
+ 
++#if defined(ARCH_CPU_PPC64_FAMILY) || DOXYGEN
++
++//! \brief Initalizes a CPUContextPPC64 structure from native context
++//!     structures on Linux.
++//!
++//! \param[in] thread_context The native thread context.
++//! \param[in] float_context The native float context.
++//! \param[in] vector_context The native vector context.
++//! \param[out] context The CPUContextPPC64 structure to initalize.
++template <typename Traits>
++void InitializeCPUContextPPC64(
++    const ThreadContext::t64_t& thread_context,
++    const FloatContext::f64_t& float_context,
++    const VectorContext::v64_t& vector_context,
++    typename Traits::CPUContext* context) {
++
++  memcpy(context->regs, thread_context.gpr, sizeof(context->regs));
++  context->nip = thread_context.nip;
++  context->msr = thread_context.msr;
++  context->ccr = thread_context.ccr;
++  context->xer = thread_context.xer;
++  context->lnk = thread_context.lnk;
++  context->ctr = thread_context.ctr;
++
++  memcpy(context->fpregs, float_context.fpregs, sizeof(context->fpregs));
++  context->fpscr = float_context.fpscr;
++
++  for (uint8_t i = 0; i < 32; i++) {
++    context->vregs.save_vr[i] = {
++      (((uint64_t)vector_context.vrregs[i][0]) << 32) |
++        vector_context.vrregs[i][1],
++      (((uint64_t)vector_context.vrregs[i][2]) << 32) |
++        vector_context.vrregs[i][3]
++    };
++  }
++  context->vregs.save_vrsave = vector_context.vrsave;
++  context->vregs.save_vscr = {0, (uint64_t)vector_context.vscr.vscr_word};
++}
++
++template <typename Traits>
++void InitializeCPUContextPPC64(
++    const SignalThreadContext64 &thread_context,
++    const SignalFloatContext64 &float_context,
++    const SignalVectorContext64 &vector_context,
++    typename Traits::CPUContext* context) {
++
++  memcpy(context->regs, thread_context.regs, sizeof(context->regs));
++  context->nip = thread_context.nip;
++  context->msr = thread_context.msr;
++  context->ccr = thread_context.ccr;
++  context->xer = thread_context.xer;
++  context->lnk = thread_context.lnk;
++  context->ctr = thread_context.ctr;
++
++  memcpy(context->fpregs, float_context.regs, sizeof(context->fpregs));
++  context->fpscr = float_context.fpscr;
++
++  for (uint8_t i = 0; i < 32; i++) {
++    context->vregs.save_vr[i] = {
++      (((uint64_t)vector_context.vrregs[i][0]) << 32) |
++        vector_context.vrregs[i][1],
++      (((uint64_t)vector_context.vrregs[i][2]) << 32) |
++        vector_context.vrregs[i][3]
++    };
++  }
++  context->vregs.save_vrsave = vector_context.vrsave;
++  context->vregs.save_vscr = {0, (uint64_t)vector_context.vscr.vscr_word};
++}
++
++#endif
+ }  // namespace internal
+ }  // namespace crashpad
+ 
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/debug_rendezvous_test.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/debug_rendezvous_test.cc
+@@ -192,6 +192,8 @@ void TestAgainstTarget(PtraceConnection*
+               device == 0 && inode == 0 && mapping_name == "[vdso]";
+ #if defined(ARCH_CPU_X86)
+           static constexpr char kPrefix[] = "linux-gate.so.";
++#elif defined(ARCH_CPU_PPC64)
++          static constexpr char kPrefix[] = "linux-vdso64.so.";
+ #else
+           static constexpr char kPrefix[] = "linux-vdso.so.";
+ #endif
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux.cc
+@@ -323,6 +323,69 @@ bool ExceptionSnapshotLinux::ReadContext
+       reader, context_address, context_.mips64);
+ }
+ 
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++
++template <typename Traits>
++static bool ReadContext(ProcessReaderLinux* reader,
++                        LinuxVMAddress context_address,
++                        typename Traits::CPUContext* dest_context) {
++  const ProcessMemory* memory = reader->Memory();
++
++  LinuxVMAddress gp_regs_address = context_address +
++                                   offsetof(UContext, mcontext) +
++                                   offsetof(typename Traits::MContext, gp_regs);
++
++  typename Traits::SignalThreadContext thread_context;
++  if (!memory->Read(gp_regs_address, sizeof(thread_context), &thread_context)) {
++    LOG(ERROR) << "Couldn't read gp_regs!";
++    return false;
++  }
++
++  LinuxVMAddress fp_regs_address = context_address +
++                                   offsetof(UContext, mcontext) +
++                                   offsetof(typename Traits::MContext, fp_regs);
++
++  typename Traits::SignalFloatContext fp_context;
++  if (!memory->Read(fp_regs_address, sizeof(fp_context), &fp_context)) {
++    LOG(ERROR) << "Couldn't read fp_regs!";
++    return false;
++  }
++
++  LinuxVMAddress v_regs_ptr_address = context_address +
++                                  offsetof(UContext, mcontext) +
++                                  offsetof(typename Traits::MContext, vmx_reserve) + 8;
++
++  typename Traits::SignalVectorContext v_context;
++  if (!memory->Read(v_regs_ptr_address, sizeof(v_context), &v_context)) {
++    LOG(ERROR) << "Couldn't read v_regs!";
++    return false;
++  }
++
++  InitializeCPUContextPPC64<ContextTraits64>(thread_context, fp_context,
++                            v_context, dest_context);
++
++  return true;
++}
++
++template<>
++bool ExceptionSnapshotLinux::ReadContext<ContextTraits64>(
++    ProcessReaderLinux* reader,
++    LinuxVMAddress context_address) {
++  context_.architecture = kCPUArchitecturePPC64;
++  context_.ppc64 = &context_union_.ppc64;
++
++  return internal::ReadContext<ContextTraits64>(
++      reader, context_address, context_.ppc64);
++}
++
++template<>
++bool ExceptionSnapshotLinux::ReadContext<ContextTraits32>(
++    ProcessReaderLinux* reader,
++    LinuxVMAddress context_address) {
++  // PPC64 is 64-bit
++  return false;
++}
++
+ #endif  // ARCH_CPU_X86_FAMILY
+ 
+ bool ExceptionSnapshotLinux::Initialize(ProcessReaderLinux* process_reader,
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux.h
+@@ -84,6 +84,8 @@ class ExceptionSnapshotLinux final : pub
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+     CPUContextMIPS mipsel;
+     CPUContextMIPS64 mips64;
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++    CPUContextPPC64 ppc64;
+ #endif
+   } context_union_;
+   CPUContext context_;
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux_test.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux_test.cc
+@@ -296,7 +296,28 @@ void ExpectContext(const CPUContext& act
+             0);
+ #undef CPU_ARCH_NAME
+ }
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++using NativeCPUContext = ucontext_t;
+ 
++void InitializeContext(NativeCPUContext* context) {
++  for (size_t reg = 0; reg < 32; ++reg) {
++    context->uc_mcontext.gp_regs[reg] = reg;
++  }
++
++  memset(&context->uc_mcontext.fp_regs, 44,
++      sizeof(context->uc_mcontext.fp_regs));
++}
++
++void ExpectContext(const CPUContext& actual, const NativeCPUContext& expected) {
++  EXPECT_EQ(actual.architecture, kCPUArchitecturePPC64);
++
++  for (size_t reg = 0; reg < 32; ++reg) {
++    EXPECT_EQ(actual.ppc64->regs[reg], expected.uc_mcontext.gp_regs[reg]);
++  }
++
++  EXPECT_EQ(memcmp(actual.ppc64->fpregs, expected.uc_mcontext.fp_regs,
++            sizeof(actual.ppc64->fpregs)), 0);
++}
+ #else
+ #error Port.
+ #endif
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/process_reader_linux.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/process_reader_linux.cc
+@@ -108,6 +108,8 @@ void ProcessReaderLinux::Thread::Initial
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+   stack_pointer = reader->Is64Bit() ? thread_info.thread_context.t64.regs[29]
+                                     : thread_info.thread_context.t32.regs[29];
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++  stack_pointer = thread_info.thread_context.t64.gpr[1];
+ #else
+ #error Port.
+ #endif
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/signal_context.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/signal_context.h
+@@ -422,6 +422,93 @@ static_assert(offsetof(UContext<ContextT
+               "context offset mismatch");
+ #endif
+ 
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++
++struct SignalThreadContext64 {
++  uint64_t regs[32];
++  uint64_t nip;
++  uint64_t msr;
++  uint64_t orig_r3;
++  uint64_t ctr;
++  uint64_t lnk;
++  uint64_t xer;
++  uint64_t ccr;
++  uint64_t softe;
++  uint64_t trap;
++  uint64_t dar;
++  uint64_t dsisr;
++  uint64_t result;
++  uint64_t dscr;
++  uint64_t fpr0[3];
++};
++
++struct SignalFloatContext64 {
++  double regs[32];
++  double fpscr;
++};
++
++struct SignalVectorContext64 {
++  int32_t vrregs[32][4];
++  struct {
++    int32_t __pad[3];
++    int32_t vscr_word;
++  } vscr;
++  int32_t vrsave;
++  int32_t __pad[3];
++} __attribute__((__aligned__(16)));
++
++
++#pragma pack(pop)
++struct MContext64 {
++  uint64_t reserved[4];
++  int32_t signal;
++  int32_t __pad0;
++  uint64_t handler;
++  uint64_t oldmask;
++  uint64_t pt_regs_ptr;
++  SignalThreadContext64 gp_regs;
++  SignalFloatContext64  fp_regs;
++  SignalVectorContext64 *v_regs;
++#ifdef __GLIBC__
++  int64_t vmx_reserve[69];
++#else
++  int64_t vmx_reserve[101];
++#endif
++};
++
++struct ContextTraits64 : public Traits64 {
++  using MContext = MContext64;
++  using SignalThreadContext = SignalThreadContext64;
++  using SignalFloatContext = SignalFloatContext64;
++  using SignalVectorContext = SignalVectorContext64;
++  using CPUContext = CPUContextPPC64;
++};
++
++struct ContextTraits32 : public Traits32 {};
++
++struct UContext {
++  uint64_t flags;
++  uint64_t link;
++  SignalStack<ContextTraits64> stack;
++  Sigset<ContextTraits64> sigmask;
++  MContext64 mcontext;
++};
++#pragma pack(push, 1)
++
++static_assert(sizeof(UContext) == sizeof(ucontext_t),
++              "ucontext_t size mismatch");
++static_assert(sizeof(MContext64) == sizeof(mcontext_t),
++              "mcontext_t size mismatch");
++static_assert(sizeof(SignalThreadContext64) == sizeof(gregset_t),
++              "gregset_t size mismatch");
++static_assert(sizeof(SignalFloatContext64) == sizeof(fpregset_t),
++              "fpregset_t size mismatch");
++static_assert(sizeof(SignalVectorContext64) == sizeof(vrregset_t),
++              "vrregset_t size mismatch");
++static_assert(offsetof(UContext, mcontext) ==
++              offsetof(ucontext_t, uc_mcontext), "mcontext offset mismatch");
++static_assert(offsetof(MContext64, gp_regs) ==
++              offsetof(mcontext_t, gp_regs), "gp_regs offset mismatch");
+ #else
+ #error Port.
+ #endif  // ARCH_CPU_X86_FAMILY
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/system_snapshot_linux.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/system_snapshot_linux.cc
+@@ -204,6 +204,8 @@ CPUArchitecture SystemSnapshotLinux::Get
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+   return process_reader_->Is64Bit() ? kCPUArchitectureMIPS64EL
+                                     : kCPUArchitectureMIPSEL;
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++  return kCPUArchitecturePPC64;
+ #else
+ #error port to your architecture
+ #endif
+@@ -219,6 +221,9 @@ uint32_t SystemSnapshotLinux::CPURevisio
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+   // Not implementable on MIPS
+   return 0;
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++  // Not yet implemented on PPC64
++  return 0;
+ #else
+ #error port to your architecture
+ #endif
+@@ -239,6 +244,9 @@ std::string SystemSnapshotLinux::CPUVend
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+   // Not implementable on MIPS
+   return std::string();
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++  // Not yet implemented on PPC64
++  return std::string();
+ #else
+ #error port to your architecture
+ #endif
+@@ -372,6 +380,9 @@ bool SystemSnapshotLinux::NXEnabled() co
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+   // Not implementable on MIPS
+   return false;
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++  // Not yet implemented on PPC64
++  return false;
+ #else
+ #error Port.
+ #endif  // ARCH_CPU_X86_FAMILY
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/test_modules.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/test_modules.cc
+@@ -110,6 +110,8 @@ bool WriteTestModule(const base::FilePat
+   module.ehdr.e_machine = EM_AARCH64;
+ #elif defined(ARCH_CPU_MIPSEL) || defined(ARCH_CPU_MIPS64EL)
+   module.ehdr.e_machine = EM_MIPS;
++#elif defined(ARCH_CPU_PPC64)
++  module.ehdr.e_machine = EM_PPC64;
+ #endif
+ 
+   module.ehdr.e_version = EV_CURRENT;
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/thread_snapshot_linux.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/thread_snapshot_linux.cc
+@@ -186,6 +186,14 @@ bool ThreadSnapshotLinux::Initialize(Pro
+         thread.thread_info.float_context.f32,
+         context_.mipsel);
+   }
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++  context_.architecture = kCPUArchitecturePPC64;
++  context_.ppc64 = &context_union_.ppc64;
++  InitializeCPUContextPPC64<ContextTraits64>(
++      thread.thread_info.thread_context.t64,
++      thread.thread_info.float_context.f64,
++      thread.thread_info.vector_context.v64,
++      context_.ppc64);
+ #else
+ #error Port.
+ #endif
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/thread_snapshot_linux.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/thread_snapshot_linux.h
+@@ -68,6 +68,8 @@ class ThreadSnapshotLinux final : public
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+     CPUContextMIPS mipsel;
+     CPUContextMIPS64 mips64;
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++    CPUContextPPC64 ppc64;
+ #else
+ #error Port.
+ #endif  // ARCH_CPU_X86_FAMILY
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/util/linux/auxiliary_vector.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/util/linux/auxiliary_vector.cc
+@@ -56,6 +56,11 @@ bool AuxiliaryVector::Read(PtraceConnect
+     if (type == AT_IGNORE) {
+       continue;
+     }
++#if defined(ARCH_CPU_PPC64_FAMILY)
++    if (type == AT_IGNOREPPC) {
++      continue;
++    }
++#endif
+     if (!MapInsertOrReplace(&values_, type, value, nullptr)) {
+       LOG(ERROR) << "duplicate auxv entry";
+       return false;
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/util/linux/ptracer.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/util/linux/ptracer.cc
+@@ -401,6 +401,64 @@ bool GetThreadArea64(pid_t tid,
+   return true;
+ }
+ 
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++// PPC64 has had HAVE_ARCH_TRACEHOOK set since 2.6.27 (even before x86 had it).
++// That means we can simply use PTRACE_GETREGESET.
++
++template <typename Destination>
++bool GetRegisterSet(pid_t tid, int set, Destination* dest, bool can_log) {
++  iovec iov;
++  iov.iov_base = reinterpret_cast<void*>(dest);
++  iov.iov_len = sizeof(*dest);
++  if (ptrace(PTRACE_GETREGSET, tid, reinterpret_cast<void*>(set), &iov) != 0) {
++    PLOG_IF(ERROR, can_log) << "ptrace";
++    return false;
++  }
++  if (iov.iov_len != sizeof(*dest)) {
++    LOG_IF(ERROR, can_log) << "Unexpected registers size";
++    return false;
++  }
++  return true;
++}
++
++bool GetVectorRegisters64(pid_t tid,
++                          VectorContext* context,
++                          bool can_log) {
++  return GetRegisterSet(tid, NT_PPC_VMX, &context->v64, can_log);
++}
++
++bool GetFloatingPointRegisters64(pid_t tid,
++                                 FloatContext* context,
++                                 bool can_log) {
++  return GetRegisterSet(tid, NT_PRFPREG, &context->f64, can_log);
++}
++
++bool GetThreadArea64(pid_t tid,
++                     const ThreadContext& context,
++                     LinuxVMAddress* address,
++                     bool can_log) {
++  // PPC64 doesn't have PTRACE_GET_THREAD_AREA since the thread pointer
++  // is stored in GPR 13.
++  ThreadContext::t64_t tc;
++  if (!GetRegisterSet(tid, NT_PRSTATUS, &tc, can_log)) {
++    LOG_IF(ERROR, can_log) << "Unable to get thread pointer!";
++    return false;
++  }
++
++  *address = tc.gpr[13];
++
++  return true;
++}
++
++// Stubs for 32-bit functions not applicable on PPC64
++bool GetFloatingPointRegisters32(pid_t tid,
++                                 FloatContext* context,
++                                 bool can_log) { return false; }
++bool GetThreadArea32(pid_t tid,
++                     const ThreadContext &context,
++                     LinuxVMAddress *address,
++                     bool can_log) { return false; }
++
+ #else
+ #error Port.
+ #endif  // ARCH_CPU_X86_FAMILY
+@@ -497,6 +555,9 @@ bool Ptracer::GetThreadInfo(pid_t tid, T
+   if (is_64_bit_) {
+     return GetGeneralPurposeRegisters64(tid, &info->thread_context, can_log_) &&
+            GetFloatingPointRegisters64(tid, &info->float_context, can_log_) &&
++#if defined(ARCH_CPU_PPC64_FAMILY)
++           GetVectorRegisters64(tid, &info->vector_context, can_log_) &&
++#endif
+            GetThreadArea64(tid,
+                            info->thread_context,
+                            &info->thread_specific_data_address,
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/util/linux/thread_info.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/util/linux/thread_info.h
+@@ -39,6 +39,13 @@ struct user_vfp_exc {
+ #include <android/api-level.h>
+ #endif
+ 
++#if defined(ARCH_CPU_PPC64_FAMILY)
++#include <sys/ucontext.h>
++#if !defined(__GLIBC__)
++#include <asm/ptrace.h>
++#endif
++#endif
++
+ namespace crashpad {
+ 
+ //! \brief The set of general purpose registers for an architecture family.
+@@ -90,6 +97,8 @@ union ThreadContext {
+     uint32_t cp0_status;
+     uint32_t cp0_cause;
+     uint32_t padding1_;
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++    // PPC64 is 64-bit
+ #else
+ #error Port.
+ #endif  // ARCH_CPU_X86_FAMILY
+@@ -143,6 +152,21 @@ union ThreadContext {
+     uint64_t cp0_badvaddr;
+     uint64_t cp0_status;
+     uint64_t cp0_cause;
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++    // Reflects struct pt_regs in asm/ptrace.h.
++    uint64_t gpr[32];
++    uint64_t nip;
++    uint64_t msr;
++    uint64_t orig_gpr3;
++    uint64_t ctr;
++    uint64_t lnk;
++    uint64_t xer;
++    uint64_t ccr;
++    uint64_t softe;
++    uint64_t trap;
++    uint64_t dar;
++    uint64_t dsisr;
++    uint64_t result;
+ #else
+ #error Port.
+ #endif  // ARCH_CPU_X86_FAMILY
+@@ -154,6 +178,8 @@ union ThreadContext {
+   using NativeThreadContext = user_regs;
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+ // No appropriate NativeThreadsContext type available for MIPS
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++  using NativeThreadContext = struct pt_regs;
+ #else
+ #error Port.
+ #endif  // ARCH_CPU_X86_FAMILY || ARCH_CPU_ARM64
+@@ -229,6 +255,9 @@ union FloatContext {
+     } fpregs[32];
+     uint32_t fpcsr;
+     uint32_t fpu_id;
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++    // Crashpad's PPC support is 64-bit only, so this
++    // 32bit-only struct is declared as empty.
+ #else
+ #error Port.
+ #endif  // ARCH_CPU_X86_FAMILY
+@@ -263,6 +292,10 @@ union FloatContext {
+     double fpregs[32];
+     uint32_t fpcsr;
+     uint32_t fpu_id;
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++    // Reflects fpregset_t in sys/ucontext.h
++    double fpregs[32];
++    double fpscr;
+ #else
+ #error Port.
+ #endif  // ARCH_CPU_X86_FAMILY
+@@ -291,6 +324,8 @@ union FloatContext {
+   static_assert(sizeof(f64) == sizeof(user_fpsimd_struct), "Size mismatch");
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+ // No appropriate floating point context native type for available MIPS.
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++  static_assert(sizeof(f64) == sizeof(fpregset_t), "Size mismatch");
+ #else
+ #error Port.
+ #endif  // ARCH_CPU_X86
+@@ -298,6 +333,26 @@ union FloatContext {
+ static_assert(std::is_standard_layout<FloatContext>::value,
+               "Not standard layout");
+ 
++//! \brief The vector registers used for an architecture family
++union VectorContext {
++  struct v32_t {} v32;
++#if defined(ARCH_CPU_PPC64_FAMILY)
++  __attribute__((__aligned__(16))) // Vector context must be doubleword aligned.
++#endif
++  struct v64_t {
++#if defined(ARCH_CPU_PPC64_FAMILY)
++    // Reflects vrregset_t in sys/ucontext.h
++    uint32_t vrregs[32][4];
++    struct {
++      uint32_t __pad[3];
++      uint32_t vscr_word;
++    } vscr;
++    uint32_t vrsave;
++    uint32_t __pad[3];
++#endif
++  } v64;
++};
++
+ //! \brief A collection of `ptrace`-able information about a thread.
+ struct ThreadInfo {
+   ThreadInfo();
+@@ -309,6 +364,9 @@ struct ThreadInfo {
+   //! \brief The floating point registers for the thread.
+   FloatContext float_context;
+ 
++  //! \brief (Optional) The vector registers used for the thread.
++  VectorContext vector_context;
++
+   //! \brief The thread-local storage address for the thread.
+   LinuxVMAddress thread_specific_data_address;
+ };
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/util/misc/capture_context.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/util/misc/capture_context.h
+@@ -69,6 +69,7 @@ using NativeCPUContext = ucontext_t;
+ //!     macOS/Linux/Fuchsia | x86_64       | `%%rdi`
+ //!     Linux               | ARM/ARM64    | `r0`/`x0`
+ //!     Linux               | MIPS/MIPS64  | `$a0`
++//!     Linux               | PPC64        | `r3`
+ //!
+ //!     Additionally, the value `LR` on ARM/ARM64 will be the return address of
+ //!     this function.
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/util/misc/capture_context_linux.S
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/util/misc/capture_context_linux.S
+@@ -32,7 +32,7 @@
+   .balign 4, 0x0
+   .type CAPTURECONTEXT_SYMBOL, %function
+   .type CAPTURECONTEXT_SYMBOL2, %function
+-#elif defined(__mips__)
++#elif defined(__mips__) || defined(__powerpc64__)
+   .balign 4, 0x0
+ #endif
+ 
+@@ -423,4 +423,214 @@ CAPTURECONTEXT_SYMBOL2:
+   jr $ra
+ 
+   .set at
++#elif defined(__powerpc64__)
++  // Store r0-r31
++  std 0, 0xe8(3)   // context->uc_mcontext.gp_regs[0]
++  std 1, 0xf0(3)   // context->uc_mcontext.gp_regs[1]
++  std 2, 0xf8(3)   // context->uc_mcontext.gp_regs[2]
++  // note that r3's original value was lost
++  std 3, 0x100(3)  // context->uc_mcontext.gp_regs[3]
++  std 4, 0x108(3)  // context->uc_mcontext.gp_regs[4]
++  std 5, 0x110(3)  // context->uc_mcontext.gp_regs[5]
++  std 6, 0x118(3)  // context->uc_mcontext.gp_regs[6]
++  std 7, 0x120(3)  // context->uc_mcontext.gp_regs[7]
++  std 8, 0x128(3)  // context->uc_mcontext.gp_regs[8]
++  std 9, 0x130(3)  // context->uc_mcontext.gp_regs[9]
++  std 10, 0x138(3) // context->uc_mcontext.gp_regs[10]
++  std 11, 0x140(3) // context->uc_mcontext.gp_regs[11]
++  std 12, 0x148(3) // context->uc_mcontext.gp_regs[12]
++  std 13, 0x150(3) // context->uc_mcontext.gp_regs[13]
++  std 14, 0x158(3) // context->uc_mcontext.gp_regs[14]
++  std 15, 0x160(3) // context->uc_mcontext.gp_regs[15]
++  std 16, 0x168(3) // context->uc_mcontext.gp_regs[16]
++  std 17, 0x170(3) // context->uc_mcontext.gp_regs[17]
++  std 18, 0x178(3) // context->uc_mcontext.gp_regs[18]
++  std 19, 0x180(3) // context->uc_mcontext.gp_regs[19]
++  std 20, 0x188(3) // context->uc_mcontext.gp_regs[20]
++  std 21, 0x190(3) // context->uc_mcontext.gp_regs[21]
++  std 22, 0x198(3) // context->uc_mcontext.gp_regs[22]
++  std 23, 0x1a0(3) // context->uc_mcontext.gp_regs[23]
++  std 24, 0x1a8(3) // context->uc_mcontext.gp_regs[24]
++  std 25, 0x1b0(3) // context->uc_mcontext.gp_regs[25]
++  std 26, 0x1b8(3) // context->uc_mcontext.gp_regs[26]
++  std 27, 0x1c0(3) // context->uc_mcontext.gp_regs[27]
++  std 28, 0x1c8(3) // context->uc_mcontext.gp_regs[28]
++  std 29, 0x1d0(3) // context->uc_mcontext.gp_regs[29]
++  std 30, 0x1d8(3) // context->uc_mcontext.gp_regs[30]
++  std 31, 0x1e0(3) // context->uc_mcontext.gp_regs[31]
++
++  // For NIP, we can use the value in the link register
++  mflr 0
++  std 0, 0x1e8(3) // context->uc_mcontext.gp_regs[PT_NIP]
++
++  // CTR
++  mfctr 0
++  std 0, 0x200(3) // context->uc_mcontext.gp_regs[PT_CTR]
++
++  // For LNK, we'll use the caller's LR save area (2 stack frames up).
++  // r4 can be used as a scratch register since it has already been saved.
++  ld 4, 0(1)
++  ld 4, 16(4)
++  std 4, 0x208(3) // context->uc_mcontext.gp_regs[PT_LNK]
++
++  // XER
++  mfxer 0
++  std 0, 0x210(3) // context->uc_mcontext.gp_regs[PT_XER]
++
++  // CCR
++  mfcr 0
++  std 0, 0x218(3) // context->uc_mcontext.gp_regs[PT_CCR]
++
++  // MSR, orig_r3, MQ, TRAP, DAR, DSISR, RESULT, DSCR,
++  // not used or not relevant,  zero them out.
++  li 4, 0
++  std 4, 0x1f0(3) // context->uc_mcontext.gp_regs[PT_MSR]
++  std 4, 0x1f8(3) // context->uc_mcontext.gp_regs[PT_ORIG_R3]
++  std 4, 0x220(3) // context->uc_mcontext.gp_regs[PT_MQ]
++  std 4, 0x228(3) // context->uc_mcontext.gp_regs[PT_TRAP]
++  std 4, 0x230(3) // context->uc_mcontext.gp_regs[PT_DAR]
++  std 4, 0x238(3) // context->uc_mcontext.gp_regs[PT_DSISR]
++  std 4, 0x240(3) // context->uc_mcontext.gp_regs[PT_RESULT]
++  std 4, 0x248(3) // context->uc_mcontext.gp_regs[PT_DSCR]
++
++  // Update context->uc_mcontext.regs to point to gp_regs
++  addi 0, 3, 0xe8
++  std 0, 0xe0(3)
++
++  // Save floating point registers 0-31
++  stfd 0, 0x268(3)  // context->uc_mcontext.fp_regs[0]
++  stfd 1, 0x270(3)  // context->uc_mcontext.fp_regs[1]
++  stfd 2, 0x278(3)  // context->uc_mcontext.fp_regs[2]
++  stfd 3, 0x280(3)  // context->uc_mcontext.fp_regs[3]
++  stfd 4, 0x288(3)  // context->uc_mcontext.fp_regs[4]
++  stfd 5, 0x290(3)  // context->uc_mcontext.fp_regs[5]
++  stfd 6, 0x298(3)  // context->uc_mcontext.fp_regs[6]
++  stfd 7, 0x2a0(3)  // context->uc_mcontext.fp_regs[7]
++  stfd 8, 0x2a8(3)  // context->uc_mcontext.fp_regs[8]
++  stfd 9, 0x2b0(3)  // context->uc_mcontext.fp_regs[9]
++  stfd 10, 0x2b8(3) // context->uc_mcontext.fp_regs[10]
++  stfd 11, 0x2c0(3) // context->uc_mcontext.fp_regs[11]
++  stfd 12, 0x2c8(3) // context->uc_mcontext.fp_regs[12]
++  stfd 13, 0x2d0(3) // context->uc_mcontext.fp_regs[13]
++  stfd 14, 0x2d8(3) // context->uc_mcontext.fp_regs[14]
++  stfd 15, 0x2e0(3) // context->uc_mcontext.fp_regs[15]
++  stfd 16, 0x2e8(3) // context->uc_mcontext.fp_regs[16]
++  stfd 17, 0x2f0(3) // context->uc_mcontext.fp_regs[17]
++  stfd 18, 0x2f8(3) // context->uc_mcontext.fp_regs[18]
++  stfd 19, 0x300(3) // context->uc_mcontext.fp_regs[19]
++  stfd 20, 0x308(3) // context->uc_mcontext.fp_regs[20]
++  stfd 21, 0x310(3) // context->uc_mcontext.fp_regs[21]
++  stfd 22, 0x318(3) // context->uc_mcontext.fp_regs[22]
++  stfd 23, 0x320(3) // context->uc_mcontext.fp_regs[23]
++  stfd 24, 0x328(3) // context->uc_mcontext.fp_regs[24]
++  stfd 25, 0x330(3) // context->uc_mcontext.fp_regs[25]
++  stfd 26, 0x338(3) // context->uc_mcontext.fp_regs[26]
++  stfd 27, 0x340(3) // context->uc_mcontext.fp_regs[27]
++  stfd 28, 0x348(3) // context->uc_mcontext.fp_regs[28]
++  stfd 29, 0x350(3) // context->uc_mcontext.fp_regs[29]
++  stfd 30, 0x358(3) // context->uc_mcontext.fp_regs[30]
++  stfd 31, 0x360(3) // context->uc_mcontext.fp_regs[31]
++
++  // FPSCR
++  mffs 0
++  stfd 0, 0x368(3) // context->uc_mcontext.fp_regs[32]
++
++  // Save VMX Vector registers
++  // Update r4 to contain the base address of vmx_reserve
++  addi 4, 3, 0x378
++  // Ensure that it is quadword aligned
++  andi. 5, 4, 0xF
++  beq 1f // No alignment is necessary
++  // Address is doubleword aligned and not quadword aligned, add 8
++  addi 4, 4, 8
++
++1:
++  // Store VMX registers 0-31
++  // r4 will contain the base address
++  // r5 will contain the index
++  li 5, 0
++  stvx 0, 4, 5   // context->uc_mcontext.vmx_reserve[(align) + 0]
++  addi 5, 5, 16
++  stvx 1, 4, 5   // context->uc_mcontext.vmx_reserve[(align) + 1]
++  addi 5, 5, 16
++  stvx 2, 4, 5   // context->uc_mcontext.vmx_reserve[(align) + 2]
++  addi 5, 5, 16
++  stvx 3, 4, 5   // context->uc_mcontext.vmx_reserve[(align) + 3]
++  addi 5, 5, 16
++  stvx 4, 4, 5   // context->uc_mcontext.vmx_reserve[(align) + 4]
++  addi 5, 5, 16
++  stvx 5, 4, 5   // context->uc_mcontext.vmx_reserve[(align) + 5]
++  addi 5, 5, 16
++  stvx 6, 4, 5   // context->uc_mcontext.vmx_reserve[(align) + 6]
++  addi 5, 5, 16
++  stvx 7, 4, 5   // context->uc_mcontext.vmx_reserve[(align) + 7]
++  addi 5, 5, 16
++  stvx 8, 4, 5   // context->uc_mcontext.vmx_reserve[(align) + 8]
++  addi 5, 5, 16
++  stvx 9, 4, 5   // context->uc_mcontext.vmx_reserve[(align) + 9]
++  addi 5, 5, 16
++  stvx 10, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 10]
++  addi 5, 5, 16
++  stvx 11, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 11]
++  addi 5, 5, 16
++  stvx 12, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 12]
++  addi 5, 5, 16
++  stvx 13, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 13]
++  addi 5, 5, 16
++  stvx 14, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 14]
++  addi 5, 5, 16
++  stvx 15, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 15]
++  addi 5, 5, 16
++  stvx 16, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 16]
++  addi 5, 5, 16
++  stvx 17, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 17]
++  addi 5, 5, 16
++  stvx 18, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 18]
++  addi 5, 5, 16
++  stvx 19, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 19]
++  addi 5, 5, 16
++  stvx 20, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 20]
++  addi 5, 5, 16
++  stvx 21, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 21]
++  addi 5, 5, 16
++  stvx 22, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 22]
++  addi 5, 5, 16
++  stvx 23, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 23]
++  addi 5, 5, 16
++  stvx 24, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 24]
++  addi 5, 5, 16
++  stvx 25, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 25]
++  addi 5, 5, 16
++  stvx 26, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 26]
++  addi 5, 5, 16
++  stvx 27, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 27]
++  addi 5, 5, 16
++  stvx 28, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 28]
++  addi 5, 5, 16
++  stvx 29, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 29]
++  addi 5, 5, 16
++  stvx 30, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 30]
++  addi 5, 5, 16
++  stvx 31, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 31]
++  addi 5, 5, 16
++
++  // VSCR
++  mfvscr 0
++  stvx 0, 4, 5
++  addi 5, 5, 16
++
++  // VRSAVE
++  mfvrsave 0
++  stwx 0, 4, 5
++
++  // Update context->uc_mcontext.v_regs to point to vmx_reserve + alignment.
++  std 4, 0x370(3)
++
++  // Zero out all unused fields
++  li 4, 0
++  std 4, 0xc8(3) // context->uc_mcontext.signal
++  std 4, 0xd0(3) // context->uc_mcontext.handler
++  std 4, 0xd8(3) // context->uc_mcontext.oldmask
++
++  blr
+ #endif  // __i386__
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/util/misc/capture_context_test.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/util/misc/capture_context_test.cc
+@@ -57,7 +57,7 @@ void TestCaptureContext() {
+   uintptr_t pc = ProgramCounterFromContext(context_1);
+ 
+ #if !defined(ADDRESS_SANITIZER) && !defined(ARCH_CPU_MIPS_FAMILY) && \
+-    !defined(MEMORY_SANITIZER)
++    !defined(MEMORY_SANITIZER) && !defined(ARCH_CPU_PPC64_FAMILY)
+   // Sanitizers can cause enough code bloat that the “nearby” check would
+   // likely fail.
+   const uintptr_t kReferencePC =
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/util/misc/capture_context_test_util_linux.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/util/misc/capture_context_test_util_linux.cc
+@@ -35,6 +35,8 @@ void SanityCheckContext(const NativeCPUC
+   EXPECT_EQ(context.uc_mcontext.regs[0], FromPointerCast<uintptr_t>(&context));
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+   EXPECT_EQ(context.uc_mcontext.gregs[4], FromPointerCast<uintptr_t>(&context));
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++  EXPECT_EQ(context.uc_mcontext.gp_regs[3], FromPointerCast<uintptr_t>(&context));
+ #endif
+ }
+ 
+@@ -49,6 +51,8 @@ uintptr_t ProgramCounterFromContext(cons
+   return context.uc_mcontext.pc;
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+   return context.uc_mcontext.pc;
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++  return context.uc_mcontext.gp_regs[PT_NIP];
+ #endif
+ }
+ 
+@@ -63,6 +67,8 @@ uintptr_t StackPointerFromContext(const
+   return context.uc_mcontext.sp;
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+   return context.uc_mcontext.gregs[29];
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++  return context.uc_mcontext.gp_regs[1];
+ #endif
+ }
+ 
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/util/posix/signals_test.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/util/posix/signals_test.cc
+@@ -46,9 +46,9 @@ bool CanCauseSignal(int sig) {
+   return sig == SIGABRT ||
+          sig == SIGALRM ||
+          sig == SIGBUS ||
+-#if !defined(ARCH_CPU_ARM64)
++#if !defined(ARCH_CPU_ARM64) && !defined(ARCH_CPU_PPC64)
+          sig == SIGFPE ||
+-#endif  // !defined(ARCH_CPU_ARM64)
++#endif  // !defined(ARCH_CPU_ARM64) && !defined(ARCH_CPU_PPC64)
+ #if defined(ARCH_CPU_X86_FAMILY) || defined(ARCH_CPU_ARMEL)
+          sig == SIGILL ||
+ #endif  // defined(ARCH_CPU_X86_FAMILY) || defined(ARCH_CPU_ARMEL)
+@@ -117,9 +117,11 @@ void CauseSignal(int sig) {
+       break;
+     }
+ 
+-#if !defined(ARCH_CPU_ARM64)
++#if !defined(ARCH_CPU_ARM64) && !defined(ARCH_CPU_PPC64)
+     // ARM64 has hardware integer division instructions that don’t generate a
+     // trap for divide-by-zero, so this doesn’t produce SIGFPE.
++    //
++    // PPC64 fixed-point division by zero also doesn't produce a SIGFPE.
+     case SIGFPE: {
+       // Optimization makes this tricky, so get zero from a system call likely
+       // to succeed, and try to do something with the result.
+@@ -137,7 +139,7 @@ void CauseSignal(int sig) {
+       fstat(quotient, &stat_buf);
+       break;
+     }
+-#endif  // ARCH_CPU_ARM64
++#endif  // !defined(ARCH_CPU_ARM64) && !defined(ARCH_CPU_PPC64)
+ 
+ #if defined(ARCH_CPU_X86_FAMILY) || defined(ARCH_CPU_ARMEL)
+     case SIGILL: {
+--- a/src/3rdparty/chromium/third_party/dav1d/BUILD.gn
++++ b/src/3rdparty/chromium/third_party/dav1d/BUILD.gn
+@@ -196,6 +196,8 @@ static_library("dav1d_8bit") {
+     sources += arm_template_sources
+   } else if (current_cpu == "arm64") {
+     sources += arm_template_sources
++  } else if (current_cpu == "ppc64") {
++    sources += ppc64_template_sources
+   }
+ 
+   cflags = dav1d_copts
+@@ -226,6 +228,8 @@ static_library("dav1d_10bit") {
+     sources += arm_template_sources
+   } else if (current_cpu == "arm64") {
+     sources += arm_template_sources
++  } else if (current_cpu == "ppc64") {
++    sources += ppc64_template_sources
+   }
+ 
+   cflags = dav1d_copts
+@@ -283,6 +287,21 @@ if (current_cpu == "x86" || current_cpu
+     }
+ 
+     cflags = dav1d_copts
++  }
++} else if (current_cpu == "ppc64") {
++  static_library("dav1d_ppc") {
++    sources = [
++      "libdav1d/src/ppc/cpu.c",
++      "libdav1d/src/ppc/cpu.h",
++    ]
++
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [
++      "//build/config/compiler:no_chromium_code",
++      ":dav1d_config",
++    ]
++
++    cflags = dav1d_copts
+ 
+     deps = [ ":dav1d_headers" ]
+     allow_circular_includes_from = [ ":dav1d_headers" ]
+@@ -315,5 +334,7 @@ static_library("dav1d") {
+     }
+   } else if (current_cpu == "arm" || current_cpu == "arm64") {
+     deps += [ ":dav1d_arm" ]
++  } else if (current_cpu == "ppc64") {
++    deps += [ ":dav1d_ppc" ]
+   }
+ }
+--- a/src/3rdparty/chromium/third_party/dav1d/dav1d_generated.gni
++++ b/src/3rdparty/chromium/third_party/dav1d/dav1d_generated.gni
+@@ -103,6 +103,11 @@ arm_template_sources = [
+   "libdav1d/src/arm/mc_init_tmpl.c",
+ ]
+ 
++ppc64_template_sources = [
++  "libdav1d/src/ppc/cdef_init_tmpl.c",
++  "libdav1d/src/ppc/looprestoration_init_tmpl.c",
++]
++
+ template_sources = [
+   "libdav1d/src/cdef_apply_tmpl.c",
+   "libdav1d/src/cdef_tmpl.c",
+--- a/src/3rdparty/chromium/third_party/dav1d/generate_source.py
++++ b/src/3rdparty/chromium/third_party/dav1d/generate_source.py
+@@ -57,6 +57,8 @@ def _WriteGn(fd):
+   _WriteArray(fd, "arm64_asm_sources", _Glob("libdav1d/src/arm/64/*.S"))
+   _WriteArray(fd, "arm_template_sources", _Glob("libdav1d/src/arm/*_tmpl.c"))
+ 
++  _WriteArray(fd, "ppc64_template_sources", _Glob("libdav1d/src/ppc/*_tmpl.c"))
++
+   template_sources = _Glob("libdav1d/src/*_tmpl.c")
+   _WriteArray(fd, "template_sources", template_sources)
+ 
+--- a/src/3rdparty/chromium/third_party/dav1d/libdav1d/src/ppc/types.h
++++ b/src/3rdparty/chromium/third_party/dav1d/libdav1d/src/ppc/types.h
+@@ -51,4 +51,19 @@
+ #define u16l_to_i32(v) ((i32x4) vec_mergel((u16x8) v, vec_splat_u16(0)))
+ #define i16l_to_i32(v) ((i32x4) vec_unpackl((i16x8)v))
+ 
++#if defined(__clang__)
++#undef vec_splats
++#define vec_splats(N)                     \
++    _Generic((N),                         \
++        unsigned char:      ((u8x16)(N)), \
++        signed char:        ((i8x16)(N)), \
++        unsigned short:     ((u16x8)(N)), \
++        signed short:       ((i16x8)(N)), \
++        unsigned int:       ((u32x4)(N)), \
++        signed int:         ((i32x4)(N)), \
++        unsigned long long: ((u64x2)(N)), \
++        signed long long:   ((i64x2)(N))  \
++    )
++#endif
++
+ #endif /* DAV1D_SRC_PPC_TYPES_H */
+--- a/src/3rdparty/chromium/third_party/eigen3/BUILD.gn
++++ b/src/3rdparty/chromium/third_party/eigen3/BUILD.gn
+@@ -22,4 +22,8 @@ config("eigen_includes") {
+     # for this component on Windows on Arm due to compilation errors.
+     defines += [ "EIGEN_DONT_VECTORIZE" ]
+   }
++
++  if (target_cpu == "ppc64") {
++    defines += [ "EIGEN_DONT_VECTORIZE" ]
++  }
+ }
+--- a/src/3rdparty/chromium/third_party/libaom/BUILD.gn
++++ b/src/3rdparty/chromium/third_party/libaom/BUILD.gn
+@@ -37,6 +37,8 @@ if (enable_libaom) {
+     } else {
+       cpu_arch_full = "arm"
+     }
++  } else if (current_cpu == "ppc64") {
++    cpu_arch_full = "generic"
+   } else {
+     cpu_arch_full = current_cpu
+   }
+--- a/src/3rdparty/chromium/third_party/libgav1/options.gni
++++ b/src/3rdparty/chromium/third_party/libgav1/options.gni
+@@ -12,5 +12,5 @@ declare_args() {
+       is_chromeos_ash && (target_cpu == "arm" || target_cpu == "arm64")
+   use_libgav1_parser =
+       (is_chromeos || is_linux || is_win) &&
+-      (target_cpu == "x86" || target_cpu == "x64" || target_cpu == "arm64")
++      (target_cpu == "x86" || target_cpu == "x64" || target_cpu == "arm64" || target_cpu == "ppc64")
+ }
+--- a/src/3rdparty/chromium/third_party/lss/linux_syscall_support.h
++++ b/src/3rdparty/chromium/third_party/lss/linux_syscall_support.h
+@@ -4262,7 +4262,7 @@ struct kernel_statfs {
+       LSS_REG(2, buf);
+       LSS_BODY(void*, mmap2, "0"(__r2));
+     }
+-#else
++#elif !defined(__powerpc64__) /* ppc64 doesn't have mmap2 */
+     #define __NR__mmap2 __NR_mmap2
+     LSS_INLINE _syscall6(void*, _mmap2,            void*, s,
+                          size_t,                   l, int,               p,
+@@ -4373,7 +4373,7 @@ struct kernel_statfs {
+   #if defined(__i386__) ||                                                    \
+       defined(__ARM_ARCH_3__) || defined(__ARM_EABI__) ||                     \
+      (defined(__mips__) && _MIPS_SIM == _MIPS_SIM_ABI32) ||                   \
+-      defined(__PPC__) ||                                                     \
++     (defined(__PPC__) && !defined(__powerpc64__)) ||                                                     \
+      (defined(__s390__) && !defined(__s390x__))
+     /* On these architectures, implement mmap() with mmap2(). */
+     LSS_INLINE void* LSS_NAME(mmap)(void *s, size_t l, int p, int f, int d,
+@@ -4556,9 +4556,17 @@ struct kernel_statfs {
+     }
+   #endif
+   #if defined(__NR_fstatat64)
++    #if !defined(__GLIBC__)
++        // musl doesn't define fstatat64 fstatat
++        #undef fstatat64
++    #endif
+     LSS_INLINE _syscall4(int,   fstatat64,        int,   d,
+                          const char *,      p,
+                          struct kernel_stat64 *,   b,    int,   f)
++    #if !defined(__GLIBC__)
++    	// then restore it
++        #define fstatat64 fstatat
++    #endif
+   #endif
+   #if defined(__NR_waitpid)
+     // waitpid is polyfilled below when not available.
+--- a/src/3rdparty/chromium/third_party/pdfium/third_party/libpng16/pngpriv.h
++++ b/src/3rdparty/chromium/third_party/pdfium/third_party/libpng16/pngpriv.h
+@@ -196,11 +196,7 @@
+ #endif
+ 
+ #ifndef PNG_POWERPC_VSX_OPT
+-#  if defined(__PPC64__) && defined(__ALTIVEC__) && defined(__VSX__)
+-#     define PNG_POWERPC_VSX_OPT 2
+-#  else
+-#     define PNG_POWERPC_VSX_OPT 0
+-#  endif
++#  define PNG_POWERPC_VSX_OPT 0
+ #endif
+ 
+ #ifndef PNG_INTEL_SSE_OPT
+--- a/src/3rdparty/chromium/third_party/pffft/src/pffft.c
++++ b/src/3rdparty/chromium/third_party/pffft/src/pffft.c
+@@ -100,6 +100,7 @@
+    Altivec support macros 
+ */
+ #if !defined(PFFFT_SIMD_DISABLE) && (defined(__ppc__) || defined(__ppc64__))
++#include <altivec.h>
+ typedef vector float v4sf;
+ #  define SIMD_SZ 4
+ #  define VZERO() ((vector float) vec_splat_u8(0))
+--- a/src/3rdparty/chromium/third_party/skia/src/sksl/SkSLString.cpp
++++ b/src/3rdparty/chromium/third_party/skia/src/sksl/SkSLString.cpp
+@@ -142,7 +142,12 @@ String to_string(double value) {
+     if (needsDotZero) {
+         buffer << ".0";
+     }
+-    return String(buffer.str().c_str());
++
++    std::string ret(buffer.str());
++    if (signbit(value) && ret[0] == '.') {
++        ret[0] = '-';
++    }
++    return String(ret.c_str());
+ }
+ 
+ bool stod(const skstd::string_view& s, SKSL_FLOAT* value) {
+--- a/src/3rdparty/chromium/third_party/sqlite/src/amalgamation/sqlite3.c
++++ b/src/3rdparty/chromium/third_party/sqlite/src/amalgamation/sqlite3.c
+@@ -14628,7 +14628,8 @@ typedef INT16_TYPE LogEst;
+ # if defined(i386)      || defined(__i386__)      || defined(_M_IX86) ||    \
+      defined(__x86_64)  || defined(__x86_64__)    || defined(_M_X64)  ||    \
+      defined(_M_AMD64)  || defined(_M_ARM)        || defined(__x86)   ||    \
+-     defined(__ARMEL__) || defined(__AARCH64EL__) || defined(_M_ARM64)
++     defined(__ARMEL__) || defined(__AARCH64EL__) || defined(_M_ARM64) ||   \
++     defined(__powerpc64__) && (__BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__)
+ #   define SQLITE_BYTEORDER    1234
+ # elif defined(sparc)     || defined(__ppc__) || \
+        defined(__ARMEB__) || defined(__AARCH64EB__)
+--- a/src/3rdparty/chromium/third_party/sqlite/src/amalgamation_dev/sqlite3.c
++++ b/src/3rdparty/chromium/third_party/sqlite/src/amalgamation_dev/sqlite3.c
+@@ -14641,7 +14641,8 @@ typedef INT16_TYPE LogEst;
+ # if defined(i386)      || defined(__i386__)      || defined(_M_IX86) ||    \
+      defined(__x86_64)  || defined(__x86_64__)    || defined(_M_X64)  ||    \
+      defined(_M_AMD64)  || defined(_M_ARM)        || defined(__x86)   ||    \
+-     defined(__ARMEL__) || defined(__AARCH64EL__) || defined(_M_ARM64)
++     defined(__ARMEL__) || defined(__AARCH64EL__) || defined(_M_ARM64) ||   \
++     defined(__powerpc64__) && (__BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__)
+ #   define SQLITE_BYTEORDER    1234
+ # elif defined(sparc)     || defined(__ppc__) || \
+        defined(__ARMEB__) || defined(__AARCH64EB__)
+--- a/src/3rdparty/chromium/third_party/sqlite/src/ext/rtree/rtree.c
++++ b/src/3rdparty/chromium/third_party/sqlite/src/ext/rtree/rtree.c
+@@ -450,7 +450,7 @@ struct RtreeMatchArg {
+ #if defined(i386)     || defined(__i386__)   || defined(_M_IX86) ||    \
+     defined(__x86_64) || defined(__x86_64__) || defined(_M_X64)  ||    \
+     defined(_M_AMD64) || defined(_M_ARM)     || defined(__x86)   ||    \
+-    defined(__arm__)
++    defined(__arm__) || defined(__powerpc64__) && (__BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__)
+ # define SQLITE_BYTEORDER    1234
+ #elif defined(sparc)    || defined(__ppc__)
+ # define SQLITE_BYTEORDER    4321
+--- a/src/3rdparty/chromium/third_party/sqlite/src/src/sqliteInt.h
++++ b/src/3rdparty/chromium/third_party/sqlite/src/src/sqliteInt.h
+@@ -890,7 +890,8 @@ typedef INT16_TYPE LogEst;
+ # if defined(i386)      || defined(__i386__)      || defined(_M_IX86) ||    \
+      defined(__x86_64)  || defined(__x86_64__)    || defined(_M_X64)  ||    \
+      defined(_M_AMD64)  || defined(_M_ARM)        || defined(__x86)   ||    \
+-     defined(__ARMEL__) || defined(__AARCH64EL__) || defined(_M_ARM64)
++     defined(__ARMEL__) || defined(__AARCH64EL__) || defined(_M_ARM64) || \
++     defined(__powerpc64__) && (__BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__)
+ #   define SQLITE_BYTEORDER    1234
+ # elif defined(sparc)     || defined(__ppc__) || \
+        defined(__ARMEB__) || defined(__AARCH64EB__)
+--- a/src/3rdparty/chromium/third_party/webrtc/modules/desktop_capture/differ_block.cc
++++ b/src/3rdparty/chromium/third_party/webrtc/modules/desktop_capture/differ_block.cc
+@@ -30,11 +30,7 @@ bool VectorDifference(const uint8_t* ima
+   static bool (*diff_proc)(const uint8_t*, const uint8_t*) = nullptr;
+ 
+   if (!diff_proc) {
+-#if defined(WEBRTC_ARCH_ARM_FAMILY) || defined(WEBRTC_ARCH_MIPS_FAMILY)
+-    // For ARM and MIPS processors, always use C version.
+-    // TODO(hclam): Implement a NEON version.
+-    diff_proc = &VectorDifference_C;
+-#else
++#if defined(WEBRTC_ARCH_X86_FAMILY)
+     bool have_sse2 = GetCPUInfo(kSSE2) != 0;
+     // For x86 processors, check if SSE2 is supported.
+     if (have_sse2 && kBlockSize == 32) {
+@@ -44,6 +40,10 @@ bool VectorDifference(const uint8_t* ima
+     } else {
+       diff_proc = &VectorDifference_C;
+     }
++#else
++    // For other processors, always use C version.
++    // TODO(hclam): Implement a NEON version.
++    diff_proc = &VectorDifference_C;
+ #endif
+   }
+ 
+--- a/src/3rdparty/chromium/v8/BUILD.gn
++++ b/src/3rdparty/chromium/v8/BUILD.gn
+@@ -1083,6 +1083,12 @@ config("toolchain") {
+     }
+     if (host_byteorder == "little") {
+       defines += [ "V8_TARGET_ARCH_PPC_LE" ]
++      cflags += [
++        # Enable usage of AltiVec, VSX, and other POWER8 and higher features
++        "-mcpu=power8",
++        "-maltivec",
++        "-mvsx",
++      ]
+     } else if (host_byteorder == "big") {
+       defines += [ "V8_TARGET_ARCH_PPC_BE" ]
+       if (current_os == "aix") {
+--- a/src/3rdparty/chromium/ui/gl/features.gni
++++ b/src/3rdparty/chromium/ui/gl/features.gni
+@@ -35,7 +35,8 @@ declare_args() {
+                         (is_mac && use_egl) || is_chromeos_ash || is_fuchsia) &&
+                        (target_cpu == "x86" || target_cpu == "x64" ||
+                         target_cpu == "arm" || target_cpu == "arm64" ||
+-                        target_cpu == "mipsel" || target_cpu == "mips64el")
++                        target_cpu == "mipsel" || target_cpu == "mips64el" ||
++                        target_cpu == "ppc64")
+ }
+ 
+ use_glx = use_x11 || ozone_platform_x11
+--- a/src/3rdparty/chromium/v8/test/BUILD.gn
++++ b/src/3rdparty/chromium/v8/test/BUILD.gn
+@@ -42,7 +42,6 @@ group("gn_all") {
+       "benchmarks/cpp:gn_all",
+       "cctest:cctest",
+       "cctest:generate-bytecode-expectations",
+-      "unittests:unittests",
+     ]
+   }
+ }
+@@ -84,7 +83,6 @@ group("v8_bot_default") {
+     "message:v8_message",
+     "mjsunit:v8_mjsunit",
+     "mkgrokdump:mkgrokdump",
+-    "unittests:unittests",
+     "webkit:v8_webkit",
+   ]
+ 
+@@ -109,7 +107,6 @@ group("v8_default") {
+     "message:v8_message",
+     "mjsunit:v8_mjsunit",
+     "mkgrokdump:mkgrokdump",
+-    "unittests:unittests",
+   ]
+ 
+   if (v8_enable_webassembly) {
+--- /dev/null
++++ b/src/3rdparty/chromium/dev/null
+@@ -0,0 +1,39 @@
++/*
++ * Autogenerated by the Meson build system.
++ * Do not edit, your changes will be lost.
++ */
++
++#pragma once
++
++#define ARCH_AARCH64 0
++
++#define ARCH_ARM 0
++
++#define ARCH_PPC64LE 1
++
++#define ARCH_X86 0
++
++#define ARCH_X86_32 0
++
++#define ARCH_X86_64 0
++
++#define CONFIG_16BPC 1
++
++#define CONFIG_8BPC 1
++
++// #define CONFIG_LOG 1 -- Logging is controlled by Chromium
++
++#define ENDIANNESS_BIG 0
++
++#define HAVE_ASM 1
++
++#define HAVE_CLOCK_GETTIME 1
++
++#define HAVE_DLSYM 1
++
++#define HAVE_GETAUXVAL 1
++
++#define HAVE_POSIX_MEMALIGN 1
++
++#define HAVE_UNISTD_H 1
++
+--- a/src/3rdparty/chromium/third_party/abseil-cpp/absl/base/internal/unscaledcycleclock.h
++++ b/src/3rdparty/chromium/third_party/abseil-cpp/absl/base/internal/unscaledcycleclock.h
+@@ -46,7 +46,7 @@
+ 
+ // The following platforms have an implementation of a hardware counter.
+ #if defined(__i386__) || defined(__x86_64__) || defined(__aarch64__) || \
+-  defined(__powerpc__) || defined(__ppc__) || \
++  ((defined(__powerpc__) || defined(__ppc__)) && defined(__GLIBC__)) || \
+   defined(_M_IX86) || defined(_M_X64)
+ #define ABSL_HAVE_UNSCALED_CYCLECLOCK_IMPLEMENTATION 1
+ #else
+--- a/src/3rdparty/chromium/third_party/abseil-cpp/absl/debugging/internal/stacktrace_config.h
++++ b/src/3rdparty/chromium/third_party/abseil-cpp/absl/debugging/internal/stacktrace_config.h
+@@ -59,7 +59,7 @@
+ #elif defined(__i386__) || defined(__x86_64__)
+ #define ABSL_STACKTRACE_INL_HEADER \
+   "absl/debugging/internal/stacktrace_x86-inl.inc"
+-#elif defined(__ppc__) || defined(__PPC__)
++#elif defined(__ppc__) || defined(__PPC__) && defined(__GLIBC__)
+ #define ABSL_STACKTRACE_INL_HEADER \
+   "absl/debugging/internal/stacktrace_powerpc-inl.inc"
+ #elif defined(__aarch64__)
+--- a/src/3rdparty/chromium/base/allocator/partition_allocator/partition_alloc_config.h
++++ b/src/3rdparty/chromium/base/allocator/partition_allocator/partition_alloc_config.h
+@@ -100,7 +100,8 @@ static_assert(sizeof(void*) != 8, "");
+ // PUT_REF_COUNT_IN_PREVIOUS_SLOT does. In this case the refcount overlaps with
+ // the next pointer shadow for the smallest bucket.
+ #if !(defined(OS_MAC) && defined(ARCH_CPU_ARM64)) && \
+-    !BUILDFLAG(PUT_REF_COUNT_IN_PREVIOUS_SLOT)
++    !BUILDFLAG(PUT_REF_COUNT_IN_PREVIOUS_SLOT) && \
++    (!defined(__GLIBC) && !defined(__powerpc64__))
+ #define PA_HAS_FREELIST_HARDENING
+ #endif
+ 
+--- a/src/3rdparty/chromium/build/download_nacl_toolchains.py
++++ b/src/3rdparty/chromium/build/download_nacl_toolchains.py
+@@ -13,6 +13,8 @@ import sys
+ 
+ 
+ def Main(args):
++  if 'disable_nacl=1' in os.environ.get('GYP_DEFINES', ''):
++    return 0
+   script_dir = os.path.dirname(os.path.abspath(__file__))
+   src_dir = os.path.dirname(script_dir)
+   nacl_dir = os.path.join(src_dir, 'native_client')
+--- a/src/3rdparty/chromium/chrome/installer/linux/BUILD.gn
++++ b/src/3rdparty/chromium/chrome/installer/linux/BUILD.gn
+@@ -100,8 +100,6 @@ packaging_files = packaging_files_binari
+                     "$root_out_dir/xdg-mime",
+                     "$root_out_dir/xdg-settings",
+                     "$root_out_dir/locales/en-US.pak",
+-                    "$root_out_dir/MEIPreload/manifest.json",
+-                    "$root_out_dir/MEIPreload/preloaded_data.pb",
+                   ]
+ 
+ action_foreach("calculate_deb_dependencies") {
+@@ -321,7 +319,6 @@ group("installer_deps") {
+     ":theme_files",
+     "//chrome",
+     "//chrome:packed_resources",
+-    "//chrome/browser/resources/media/mei_preload:component",
+     "//components/crash/core/app:chrome_crashpad_handler",
+     "//sandbox/linux:chrome_sandbox",
+   ]
+--- /dev/null
++++ b/src/3rdparty/chromium/sandbox/linux/system_headers/ppc64_linux_syscalls.h
+@@ -0,0 +1,12 @@
++// Copyright 2014 The Chromium Authors. All rights reserved.
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++#ifndef SANDBOX_LINUX_SYSTEM_HEADERS_PPC64_LINUX_SYSCALLS_H_
++#define SANDBOX_LINUX_SYSTEM_HEADERS_PPC64_LINUX_SYSCALLS_H_
++
++#include <asm/unistd.h>
++
++//TODO: is it necessary to redefine syscall numbers for PPC64?
++
++#endif  // SANDBOX_LINUX_SYSTEM_HEADERS_PPC64_LINUX_SYSCALLS_H_
+--- /dev/null
++++ b/src/3rdparty/chromium/sandbox/linux/system_headers/ppc64_linux_ucontext.h
+@@ -0,0 +1,12 @@
++// Copyright 2014 The Chromium Authors. All rights reserved.
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++#ifndef SANDBOX_LINUX_SYSTEM_HEADERS_PPC64_LINUX_UCONTEXT_H_
++#define SANDBOX_LINUX_SYSTEM_HEADERS_PPC64_LINUX_UCONTEXT_H_
++
++#include <sys/ucontext.h>
++
++//TODO: is it necessary to redefine ucontext on PPC64?
++
++#endif  // SANDBOX_LINUX_SYSTEM_HEADERS_PPC64_LINUX_UCONTEXT_H_
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/util/net/http_transport_libcurl.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/util/net/http_transport_libcurl.cc
+@@ -236,6 +236,12 @@ std::string UserAgent() {
+ #elif defined(ARCH_CPU_BIG_ENDIAN)
+     static constexpr char arch[] = "aarch64_be";
+ #endif
++#elif defined(__powerpc64__)
++#if defined(ARCH_CPU_LITTLE_ENDIAN)
++    static constexpr char arch[] = "ppc64le";
++#elif defined(ARCH_CPU_BIG_ENDIAN)
++    static constexpr char arch[] = "ppc64";
++#endif
+ #else
+ #error Port
+ #endif
+--- /dev/null
++++ b/src/3rdparty/chromium/third_party/dav1d/config/linux/ppc64/config.h
+@@ -0,0 +1,39 @@
++/*
++ * Autogenerated by the Meson build system.
++ * Do not edit, your changes will be lost.
++ */
++
++#pragma once
++
++#define ARCH_AARCH64 0
++
++#define ARCH_ARM 0
++
++#define ARCH_PPC64LE 1
++
++#define ARCH_X86 0
++
++#define ARCH_X86_32 0
++
++#define ARCH_X86_64 0
++
++#define CONFIG_16BPC 1
++
++#define CONFIG_8BPC 1
++
++// #define CONFIG_LOG 1 -- Logging is controlled by Chromium
++
++#define ENDIANNESS_BIG 0
++
++#define HAVE_ASM 1
++
++#define HAVE_CLOCK_GETTIME 1
++
++#define HAVE_DLSYM 1
++
++#define HAVE_GETAUXVAL 1
++
++#define HAVE_POSIX_MEMALIGN 1
++
++#define HAVE_UNISTD_H 1
++
diff --git a/srcpkgs/qt6-webengine/patches/0903-xxx-ppc64le-swiftshader.patch b/srcpkgs/qt6-webengine/patches/0903-xxx-ppc64le-swiftshader.patch
new file mode 100644
index 000000000000..1a8cd8368da1
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0903-xxx-ppc64le-swiftshader.patch
@@ -0,0 +1,18 @@
+--- a/src/3rdparty/chromium/third_party/swiftshader/third_party/llvm-10.0/BUILD.gn
++++ b/src/3rdparty/chromium/third_party/swiftshader/third_party/llvm-10.0/BUILD.gn
+@@ -576,6 +576,7 @@ swiftshader_llvm_source_set("swiftshader
+     "llvm/lib/MC/MCAsmInfoCOFF.cpp",
+     "llvm/lib/MC/MCAsmInfoDarwin.cpp",
+     "llvm/lib/MC/MCAsmInfoELF.cpp",
++    "llvm/lib/MC/MCAsmInfoXCOFF.cpp",
+     "llvm/lib/MC/MCAsmMacro.cpp",
+     "llvm/lib/MC/MCAsmStreamer.cpp",
+     "llvm/lib/MC/MCAssembler.cpp",
+@@ -631,6 +632,7 @@ swiftshader_llvm_source_set("swiftshader
+     "llvm/lib/MC/MCWinCOFFStreamer.cpp",
+     "llvm/lib/MC/MCWinEH.cpp",
+     "llvm/lib/MC/MCXCOFFStreamer.cpp",
++    "llvm/lib/MC/MCXCOFFObjectTargetWriter.cpp",
+     "llvm/lib/MC/MachObjectWriter.cpp",
+     "llvm/lib/MC/StringTableBuilder.cpp",
+     "llvm/lib/MC/SubtargetFeature.cpp",
diff --git a/srcpkgs/qt6-webengine/template b/srcpkgs/qt6-webengine/template
new file mode 100644
index 000000000000..2f0de2c7adf6
--- /dev/null
+++ b/srcpkgs/qt6-webengine/template
@@ -0,0 +1,178 @@
+# Template file for 'qt6-webengine'
+pkgname=qt6-webengine
+version=6.3.1
+revision=1
+wrksrc="qtwebengine-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true
+ -DQT_FEATURE_webengine_system_ffmpeg=ON
+ -DQT_FEATURE_webengine_system_libevent=ON
+ -DQT_FEATURE_webengine_system_gn=ON
+ -DQT_FEATURE_webengine_system_icu=ON
+ -DQT_FEATURE_webengine_webrtc_pipewire=ON
+ -DNinja_EXECUTABLE=$XBPS_WRAPPERDIR/ninja
+ $(vopt_bool examples QT_BUILD_EXAMPLES)
+ -DPKG_CONFIG_HOST_EXECUTABLE=${PKG_CONFIG_FOR_BUILD}"
+hostmakedepends="qt6-base-devel perl pkg-config nodejs python3-html5lib
+ qt6-declarative-devel protobuf gperf flex nss-devel libwebp-devel
+ icu-devel libevent-devel"
+makedepends="qt6-base-devel qt6-declarative-devel pulseaudio-devel
+ qt6-tools-devel qt6-websockets-devel libflac-devel
+ alsa-lib-devel libvpx-devel pciutils-devel opus-devel libxslt-devel
+ libxml2-devel freetype-devel lcms2-devel libwebp-devel icu-devel
+ re2-devel zlib-devel libpng-devel minizip-devel harfbuzz-devel
+ nss-devel libXcursor-devel libXcomposite-devel libXScrnSaver-devel
+ protobuf-devel ffmpeg-devel snappy-devel libevent-devel pipewire-devel
+ libxkbfile-devel qt6-location-devel qt6-webchannel-devel libxshmfence-devel"
+# Not working properly with HTTPS without those packages
+# Not strict dependencies, though
+depends="qt6-plugin-tls-openssl qt6-plugin-tls-qcertonly"
+short_desc="Cross-platform application and UI framework - Webengine"
+maintainer="John <me@johnnynator.dev>"
+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=ad7a33b21a956deda37c587d50f821ca3816403ae31ba9b5d59d01561ad66e47
+
+if [ -z "$CROSS_BUILD" ];then
+	configure_args+=" -DCMAKE_TOOLCHAIN_FILE=/usr/lib/cmake/Qt6/qt.toolchain.cmake"
+fi
+
+if [ "$XBPS_LIBC" = "musl" ]; then
+	hostmakedepends+=" musl-legacy-compat"
+fi
+
+if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
+	makedepends+=" musl-legacy-compat"
+fi
+
+if [ ! "$XBPS_WORDSIZE" = "$XBPS_TARGET_WORDSIZE" ]; then
+	broken="webengine can be built only if word size matches"
+fi
+
+if [ "$XBPS_WORDSIZE" -eq 32 ]; then
+	nodebug=yes
+	LDFLAGS="-Wl,--no-keep-memory"
+fi
+
+if [ "$XBPS_TARGET_ENDIAN" != "le" ]; then
+	broken="webengine only supports little endian"
+fi
+
+build_options="sndio examples"
+build_options_default=""
+desc_option_examples="Build examples"
+desc_option_sndio="Enable support for sndio"
+
+subpackages="qt6-webengine-devel"
+
+if [ "$build_option_examples" ]; then
+	subpackages+=" qt6-webengine-examples"
+fi
+
+_bootstrap_gn() {
+	# Bootstrap gn (generate ninja)
+	echo "Bootstrapping 'gn'"
+	cd ${wrksrc}/src/3rdparty/gn
+	CFLAGS="$CFLAGS_host" CXXFLAGS="$CXXFLAGS_host" LDFLAGS="$LDFLAGS_host" \
+	PKGCONFIG=/usr/bin/pkgconfig PKG_CONFIG_PATH="/usr/lib/pkgconfig:/usr/share/pkgconfig" \
+		python3 build/gen.py --no-last-commit-position --out-path \
+			${wrksrc}/src/3rdparty/gn/out/Release --cc "${CC_host:-$CC}" \
+			--cxx "${CXX_host:-$CXX}" --ld "${CXX_host:-$CXX}" --ar "${AR_host:-$AR}" \
+			--qt-version "${version}.qtwebengine.qt.io"
+	ninja -C out/Release gn
+	cd ${wrksrc}
+}
+
+_unbundle_libs() {
+	cd ${wrksrc}/src/3rdparty/chromium
+	echo Dropping bundled libs from chromium
+	# Use system-provided libraries.
+	# TODO: use_system_hunspell (upstream changes needed).
+	# TODO: use_system_libsrtp.
+	# TODO: use_system_libusb (http://crbug.com/266149).
+	# TODO: use_system_ssl (http://crbug.com/58087).
+	# TODO: use_system_sqlite (http://crbug.com/22208).
+	# TODO: use_system_icu (segfaults)
+	# use_system_protobuf
+	# use_system_v8=1
+	# use_system_zlib=1
+	# bzip2 jsoncpp minizip xdg_utils speex
+	system="
+		ffmpeg
+		flac
+		fontconfig
+		freetype
+		harfbuzz-ng
+		icu
+		libdrm
+		libevent
+		libjpeg
+		libpng
+		libwebp
+		libxml
+		libxslt
+		opus
+		re2
+		snappy
+	"
+	build/linux/unbundle/replace_gn_files.py --system-libraries ${system}
+}
+
+# Provide a wrapper to run ./xbps-src -j 1 build later
+_wrap_ninja() {
+	cat <<-'_EOF' >"$XBPS_WRAPPERDIR"/ninja
+	#!/bin/sh
+
+	exec /usr/bin/ninja $NINJAFLAGS "$@"
+	_EOF
+	chmod +x "$XBPS_WRAPPERDIR"/ninja
+}
+
+pre_configure() {
+	_bootstrap_gn
+	# _unbundle_libs
+	_wrap_ninja
+	export PATH="$PATH:${wrksrc}/src/3rdparty/gn/out/Release"
+}
+
+pre_build() {
+	export PATH="$PATH:${wrksrc}/src/3rdparty/gn/out/Release"
+	export NINJAFLAGS="$makejobs"
+
+}
+
+pre_install() {
+	export PATH="$PATH:${wrksrc}/src/3rdparty/gn/out/Release"
+}
+
+post_install() {
+	local _file
+	find "${DESTDIR}"/usr/lib/qt6/examples \
+		-path '*/lib/qt6/**/lib/qt6/*' -type f |
+	while read _file; do
+		mv "$_file" "${_file%/lib/qt6/*}"
+	done
+}
+
+qt6-webengine-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} qt6-webchannel-devel>=${version}_1
+	 qt6-declarative-devel>=${version}_1 qt6-location-devel>=${version}_1"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/pkgconfig
+		vmove usr/lib/qt6/mkspecs
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
+	}
+}
+
+qt6-webengine-examples_package() {
+	short_desc+=" - sample browsers"
+	pkg_install() {
+		vmove usr/lib/qt6/examples
+	}
+}
diff --git a/srcpkgs/qt6-webengine/update b/srcpkgs/qt6-webengine/update
new file mode 100644
index 000000000000..844552465222
--- /dev/null
+++ b/srcpkgs/qt6-webengine/update
@@ -0,0 +1 @@
+pkgname="${pkgname/6-/}-everywhere-src"

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

* Re: WIP Qt6 webengine
  2022-08-07  4:36 [PR PATCH] WIP Qt6 webengine sgn
                   ` (8 preceding siblings ...)
  2022-08-10  1:14 ` [PR PATCH] [Updated] " sgn
@ 2022-08-10  1:15 ` sgn
  2022-08-11  2:01 ` [PR PATCH] [Updated] " sgn
                   ` (27 subsequent siblings)
  37 siblings, 0 replies; 39+ messages in thread
From: sgn @ 2022-08-10  1:15 UTC (permalink / raw)
  To: ml

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

New comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/38509#issuecomment-1210043449

Comment:
@skmpz Can you test with new patchset?

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

* Re: [PR PATCH] [Updated] WIP Qt6 webengine
  2022-08-07  4:36 [PR PATCH] WIP Qt6 webengine sgn
                   ` (9 preceding siblings ...)
  2022-08-10  1:15 ` sgn
@ 2022-08-11  2:01 ` sgn
  2022-08-14  7:44 ` skmpz
                   ` (26 subsequent siblings)
  37 siblings, 0 replies; 39+ messages in thread
From: sgn @ 2022-08-11  2:01 UTC (permalink / raw)
  To: ml

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

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

https://github.com/sgn/void-packages qt6-webengine
https://github.com/void-linux/void-packages/pull/38509

WIP Qt6 webengine
<!-- Uncomment relevant sections and delete options which are not applicable -->

Never tried to cross build
Functionality works (at least can view youtube video on x86_64-musl)

#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**
[ci skip]

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-qt6-webengine-38509.patch --]
[-- Type: text/x-diff, Size: 305221 bytes --]

From 3738744ef01d2c0313f1e987c47ddb3ec4770379 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:07 +0700
Subject: [PATCH 01/26] qt6-base: update to 6.3.1.

---
 srcpkgs/qt6-base/patches/arm-yield.patch | 37 ++++++++++++++++++++++++
 srcpkgs/qt6-base/patches/libatomic.patch | 14 ---------
 srcpkgs/qt6-base/template                | 16 ++++++----
 3 files changed, 47 insertions(+), 20 deletions(-)
 create mode 100644 srcpkgs/qt6-base/patches/arm-yield.patch
 delete mode 100644 srcpkgs/qt6-base/patches/libatomic.patch

diff --git a/srcpkgs/qt6-base/patches/arm-yield.patch b/srcpkgs/qt6-base/patches/arm-yield.patch
new file mode 100644
index 000000000000..2bef8584b88d
--- /dev/null
+++ b/srcpkgs/qt6-base/patches/arm-yield.patch
@@ -0,0 +1,37 @@
+From 8128abeaece5b05476f79ff493597b838b223512 Mon Sep 17 00:00:00 2001
+From: Marc Mutz <marc.mutz@qt.io>
+Date: Wed, 3 Aug 2022 17:23:20 +0200
+Subject: Fix qYieldCpu() for ARM < ARMv7
+
+Apparently, we still support these architecture versions, and there's
+no way to detect ARMv6k-or-greater specifically, so exclude yield for
+ARM < ARMv7.
+
+Amends 877c158c5976bebffd0ff02c39b6b66a842c6344.
+
+Fixes: QTBUG-104316
+Pick-to: 6.4 6.3
+Change-Id: I51a2f0f8e0993dba41e47bb6110473ac8e7cd32a
+Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
+---
+ src/corelib/global/qsimd_p.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+(limited to 'src/corelib/global/qsimd_p.h')
+
+diff --git a/src/corelib/global/qsimd_p.h b/src/corelib/global/qsimd_p.h
+index ad78c3934f..093fc3aedc 100644
+--- a/src/corelib/global/qsimd_p.h
++++ b/src/corelib/global/qsimd_p.h
+@@ -397,7 +397,7 @@ static inline void qYieldCpu()
+ {
+ #if defined(Q_PROCESSOR_X86)
+     _mm_pause();
+-#elif defined(Q_PROCESSOR_ARM)
++#elif defined(Q_PROCESSOR_ARM) && Q_PROCESSOR_ARM >= 7 /* yield was added in ARMv7 */
+ #  if __has_builtin(__builtin_arm_yield) /* e.g. Clang */
+     __builtin_arm_yield();
+ #  elif defined(Q_OS_INTEGRITY) || \
+-- 
+cgit v1.2.1
+
diff --git a/srcpkgs/qt6-base/patches/libatomic.patch b/srcpkgs/qt6-base/patches/libatomic.patch
deleted file mode 100644
index 2f7a807518e4..000000000000
--- a/srcpkgs/qt6-base/patches/libatomic.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Index: cmake/FindWrapAtomic.cmake
-===================================================================
---- a/cmake/FindWrapAtomic.cmake
-+++ b/cmake/FindWrapAtomic.cmake
-@@ -38,7 +38,8 @@ endif()
- 
- add_library(WrapAtomic::WrapAtomic INTERFACE IMPORTED)
- if(HAVE_STDATOMIC_WITH_LIB)
--    target_link_libraries(WrapAtomic::WrapAtomic INTERFACE atomic)
-+    find_library(LIBATOMIC atomic REQUIRED)
-+    target_link_libraries(WrapAtomic::WrapAtomic INTERFACE ${LIBATOMIC})
- endif()
- 
- set(WrapAtomic_FOUND 1)
diff --git a/srcpkgs/qt6-base/template b/srcpkgs/qt6-base/template
index cc47e18a70ff..4e88d6b9f174 100644
--- a/srcpkgs/qt6-base/template
+++ b/srcpkgs/qt6-base/template
@@ -1,7 +1,7 @@
 # Template file for 'qt6-base'
 pkgname=qt6-base
-version=6.3.0
-revision=2
+version=6.3.1
+revision=1
 wrksrc="qtbase-everywhere-src-${version}"
 build_style=cmake
 configure_args="-DINSTALL_DATADIR=share/qt6
@@ -9,6 +9,8 @@ configure_args="-DINSTALL_DATADIR=share/qt6
  -DINSTALL_BINDIR=lib/qt6/bin
  -DINSTALL_MKSPECSDIR=lib/qt6/mkspecs
  -DINSTALL_INCLUDEDIR=include/qt6
+ -DINSTALL_EXAMPLESDIR=lib/qt6/examples
+ -DINSTALL_TESTSDIR=lib/qt6/tests
  -DINSTALL_SYSCONFDIR=/etc/xdg
  -DQT_FEATURE_openssl_linked=ON
  -DQT_FEATURE_system_sqlite=ON
@@ -29,14 +31,13 @@ maintainer="John <me@johnnynator.dev>"
 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=b865aae43357f792b3b0a162899d9bf6a1393a55c4e5e4ede5316b157b1a0f99
+checksum=0a64421d9c2469c2c48490a032ab91d547017c9cc171f3f8070bc31888f24e03
 python_version=3
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt6-base-devel"
 	# QtSetup fails native builds if this is set
-	configure_args+=" -DQT_HOST_PATH=/usr
-	 -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true"
+	configure_args+="-DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true"
 fi
 
 # It is currently expected that quite a few patches do fail
@@ -225,7 +226,7 @@ qt6-plugin-tls-qcertonly_package() {
 qt6-plugin-networkinformation_package() {
 	short_desc+=" - Networkinformation plugin"
 	pkg_install() {
-		vmove usr/lib/qt6/plugins/networkinformation/libqnetworkmanager.so
+		vmove usr/lib/qt6/plugins/networkinformation/
 	}
 }
 
@@ -246,9 +247,12 @@ qt6-base-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/*.a"
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From 535cb954464d877e8af9a784b8d5877f8f34b525 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:07 +0700
Subject: [PATCH 02/26] qt6-charts: update to 6.3.1.

---
 srcpkgs/qt6-charts/template | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/qt6-charts/template b/srcpkgs/qt6-charts/template
index 79cb8a220401..d3947ba938f3 100644
--- a/srcpkgs/qt6-charts/template
+++ b/srcpkgs/qt6-charts/template
@@ -1,10 +1,9 @@
 # Template file for 'qt6-charts'
 pkgname=qt6-charts
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qtcharts-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr"
 hostmakedepends="perl qt6-declarative-devel"
 makedepends="qt6-declarative-devel"
 short_desc="Cross-platform application and UI framework - charts"
@@ -12,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 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=672762c5f641ccc88a30aeedefb63f03c0f837649b334f46eea57592e87e36cd
+checksum=f330cc2328729104d79b2088990ce0840f2da89d9d989360d4c352e797d27cf7
 
 qt6-charts-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
@@ -20,8 +19,11 @@ qt6-charts-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From 91ae77b40d30de586368a2184082b803f16b1655 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:07 +0700
Subject: [PATCH 03/26] qt6-declarative: update to 6.3.1.

---
 srcpkgs/qt6-declarative/template | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/qt6-declarative/template b/srcpkgs/qt6-declarative/template
index e0bd28d9e383..cfdc74f281d6 100644
--- a/srcpkgs/qt6-declarative/template
+++ b/srcpkgs/qt6-declarative/template
@@ -1,23 +1,22 @@
 # Template file for 'qt6-declarative'
 pkgname=qt6-declarative
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qtdeclarative-everywhere-src-${version}"
 build_style=cmake
-configure_args=" -DQT_HOST_PATH=/usr"
 hostmakedepends="qt6-base-devel perl pkg-config wayland-devel
  qt6-shadertools-devel"
-makedepends="qt6-base-devel Vulkan-Headers"
+makedepends="qt6-base-devel Vulkan-Headers qt6-shadertools-devel"
 short_desc="Cross-platform application and UI framework - Declarative"
 maintainer="John <me@johnnynator.dev>"
 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=d294b029dc2b2d4f65da516fdc3b8088d32643eb7ff77db135a8b9ce904caa37
+checksum=03e7694123820fcca397f95ce312e0b7f3039493c8754c836da098a1a04346e8
 replaces="qt6-quickcontrols2>=0"
 
 if [ "$CROSS_BUILD" ]; then
-	configure_args+=" -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true"
+	configure_args="-DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true"
 	hostmakedepends+=" qt6-declarative-devel"
 fi
 
@@ -60,11 +59,14 @@ qt6-declarative-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/libQt6QuickTest.so.*"
 		vmove usr/lib/qt6/qml/QtTest
 		vmove usr/lib/qt6/bin/qmltestrunner
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From 333fe06fa61d86dae3add6d43306f6c67518f35b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:07 +0700
Subject: [PATCH 04/26] qt6-imageformats: update to 6.3.1.

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

diff --git a/srcpkgs/qt6-imageformats/template b/srcpkgs/qt6-imageformats/template
index eaca95243c48..9f6d2fb66776 100644
--- a/srcpkgs/qt6-imageformats/template
+++ b/srcpkgs/qt6-imageformats/template
@@ -1,10 +1,9 @@
 # Template file for 'qt6-imageformats'
 pkgname=qt6-imageformats
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qtimageformats-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr"
 hostmakedepends="perl qt6-base-devel"
 makedepends="qt6-base-devel"
 short_desc="Cross-platform application and UI framework - imageformats"
@@ -12,4 +11,4 @@ maintainer="John <me@johnnynator.dev>"
 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=025d0d17ed75b42a7eb6b523731ab8f17025421a8810cade25caffe05d93abef
+checksum=ad0312b8dfbbb67f729bfadbfcd47246ee4a128b717731ba158c41d01fde212f

From 9f9b0eb8e05cb05596cab249403de9bd7117464e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:07 +0700
Subject: [PATCH 05/26] qt6-location: update to 6.3.1.

---
 srcpkgs/qt6-location/template | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/qt6-location/template b/srcpkgs/qt6-location/template
index b7397f5f8942..9f26103259ad 100644
--- a/srcpkgs/qt6-location/template
+++ b/srcpkgs/qt6-location/template
@@ -1,10 +1,9 @@
 # Template file for 'qt6-location'
 pkgname=qt6-location
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qtpositioning-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr"
 hostmakedepends="perl qt6-base-devel qt6-declarative-devel"
 makedepends="qt6-serialport-devel qt6-declarative-devel GConf-devel"
 short_desc="Cross-platform application and UI framework - location"
@@ -12,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 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=e9ed50f6b245a346db34d625d0012774ef0ec8e7fd65037127ec26758708236e
+checksum=06788e4ecae1920094b30e4046f0abd23c8189d8a51e9c939b02f0b6abe2e86c
 
 qt6-location-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel>=${version}_1"
@@ -20,8 +19,11 @@ qt6-location-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From 27c3eaa9e27b5ab0327e3adaff30b65df9093365 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:08 +0700
Subject: [PATCH 06/26] qt6-lottie: update to 6.3.1.

---
 srcpkgs/qt6-lottie/template | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/qt6-lottie/template b/srcpkgs/qt6-lottie/template
index 1c97cd5f4f32..a7beb62ec368 100644
--- a/srcpkgs/qt6-lottie/template
+++ b/srcpkgs/qt6-lottie/template
@@ -1,10 +1,9 @@
 # Template file for 'qt6-lottie'
 pkgname=qt6-lottie
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qtlottie-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr"
 hostmakedepends="perl qt6-base-devel"
 makedepends="qt6-declarative-devel"
 short_desc="Cross-platform application and UI framework - lottie"
@@ -12,10 +11,10 @@ maintainer="John <me@johnnynator.dev>"
 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=39db570bbba5b527a1eb6a5774bed47398ace2f7217bbf45b1194ada6cf97deb
+checksum=740ba76999124d5e1a85ef3d01c69976bb8557862b6b26bf48b357fe0cab1cf5
 
 if [ "$XBPS_CHECK_PKGS" ]; then
-	configure_args+=" -DQT_BUILD_TESTS=ON"
+	configure_args="-DQT_BUILD_TESTS=ON"
 fi
 
 pre_check() {
@@ -28,8 +27,10 @@ qt6-lottie-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
 		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From f9acf5ca3d998d13bb70137ac7b1d74ddc3e28b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:08 +0700
Subject: [PATCH 07/26] qt6-networkauth: update to 6.3.1.

---
 srcpkgs/qt6-networkauth/template | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/qt6-networkauth/template b/srcpkgs/qt6-networkauth/template
index e934beada9b0..1454ceb4a525 100644
--- a/srcpkgs/qt6-networkauth/template
+++ b/srcpkgs/qt6-networkauth/template
@@ -1,10 +1,9 @@
 # Template file for 'qt6-networkauth'
 pkgname=qt6-networkauth
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qtnetworkauth-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr"
 hostmakedepends="perl qt6-base-devel"
 makedepends="qt6-base-devel"
 short_desc="Cross-platform application and UI framework - networkauth"
@@ -12,10 +11,10 @@ maintainer="John <me@johnnynator.dev>"
 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=203a98942919028520038f90a20cd7ee32b537233545d11e429c3e2c1ad9069f
+checksum=d60f54b9d4509fa8bdbf1990bc91f6e260e38cdb57a7b8119fa3861bc5d2fb2a
 
 if [ "$XBPS_CHECK_PKGS" ]; then
-	configure_args+=" -DQT_BUILD_TESTS=ON"
+	configure_args="-DQT_BUILD_TESTS=ON"
 fi
 
 qt6-networkauth-devel_package() {
@@ -24,8 +23,11 @@ qt6-networkauth-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From 71c8a264bfe899f76af625a77ed8c48e8d072e6e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:08 +0700
Subject: [PATCH 08/26] qt6-qt5compat: update to 6.3.1.

---
 srcpkgs/qt6-qt5compat/template | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/qt6-qt5compat/template b/srcpkgs/qt6-qt5compat/template
index 7fcd5ad5080e..a62573cfabfa 100644
--- a/srcpkgs/qt6-qt5compat/template
+++ b/srcpkgs/qt6-qt5compat/template
@@ -1,10 +1,9 @@
 # Template file for 'qt6-qt5compat'
 pkgname=qt6-qt5compat
-version=6.3.0
-revision=2
+version=6.3.1
+revision=1
 wrksrc="qt5compat-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr"
 hostmakedepends="qt6-base-devel qt6-declarative-devel perl pkg-config"
 makedepends="qt6-base-devel qt6-declarative-devel"
 short_desc="Cross-platform application and UI framework - Qt5 Compatibilty Component"
@@ -12,10 +11,10 @@ maintainer="John <me@johnnynator.dev>"
 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=2b199be780c50d9214512b922d94cb240b0412fd63f459e356b76102cad1713e
+checksum=a43ec62bd778eaecf88ad7847118d1c2a471b0fcb820f93beb311d7ab9566cfd
 
 if [ "$XBPS_CHECK_PKGS" ]; then
-	configure_args+=" -DQT_BUILD_TESTS=ON"
+	configure_args="-DQT_BUILD_TESTS=ON"
 fi
 
 qt6-qt5compat-devel_package() {
@@ -24,8 +23,11 @@ qt6-qt5compat-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From 59c9cbfb493e837a82d415b98a221e1432392165 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:08 +0700
Subject: [PATCH 09/26] qt6-quick3d: update to 6.3.1.

---
 srcpkgs/qt6-quick3d/template | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/qt6-quick3d/template b/srcpkgs/qt6-quick3d/template
index 0f7ef336a3ff..b2349c03501b 100644
--- a/srcpkgs/qt6-quick3d/template
+++ b/srcpkgs/qt6-quick3d/template
@@ -1,10 +1,9 @@
 # Template file for 'qt6-quick3d'
 pkgname=qt6-quick3d
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qtquick3d-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr "
 hostmakedepends="perl qt6-base-devel qt6-declarative-devel qt6-shadertools-devel"
 makedepends="qt6-base-devel qt6-declarative-devel qt6-shadertools-devel
  libassimp-devel"
@@ -13,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 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=0ad05bd1ee1f784b18220a2d2625ee8de91662c88fdc7b798662953d86eb327e
+checksum=2fa766ee47b8c07412b3b755206ada0715fb07813b64ed069e7205044c061256
 
 if [ "$XBPS_TARGET_ENDIAN" = "be" ]; then
 	# possibly a qt6-shadertools bug, actually
@@ -26,9 +25,12 @@ qt6-quick3d-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
-		vmove usr/lib/qt6/mkspecs
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/bin
+		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From b179e191386a763fec3e65500c724cf9025cc9a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:09 +0700
Subject: [PATCH 10/26] qt6-quicktimeline: update to 6.3.1.

---
 srcpkgs/qt6-quicktimeline/template | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/qt6-quicktimeline/template b/srcpkgs/qt6-quicktimeline/template
index 15aa7a8e5819..bf02e043c4a5 100644
--- a/srcpkgs/qt6-quicktimeline/template
+++ b/srcpkgs/qt6-quicktimeline/template
@@ -1,10 +1,9 @@
 # Template file for 'qt6-quicktimeline'
 pkgname=qt6-quicktimeline
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qtquicktimeline-everywhere-src-${version/rc/-rc}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr "
 hostmakedepends="perl qt6-base-devel qt6-declarative-devel"
 makedepends="qt6-base-devel qt6-declarative-devel"
 short_desc="Cross-platform application and UI framework - quicktimeline"
@@ -12,10 +11,10 @@ maintainer="John <me@johnnynator.dev>"
 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=9ff0a931159efc6be5bd9f8a1e4a16a70e2dab37cf22ad85c6d330ccfdf31c1a
+checksum=58a13cf0ce8e7755639f20684078733af24f5a317f6ddb40d6079c8c5a28ebbe
 
 if [ "$XBPS_CHECK_PKGS" ]; then
-	configure_args+=" -DQT_BUILD_TESTS=ON"
+	configure_args="-DQT_BUILD_TESTS=ON"
 fi
 
 pre_check() {

From 734c3293ddba022a3c96f9ba1f35e55875fcfc34 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:09 +0700
Subject: [PATCH 11/26] qt6-scxml: update to 6.3.1.

---
 srcpkgs/qt6-scxml/template | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/qt6-scxml/template b/srcpkgs/qt6-scxml/template
index 112baca0ab83..942a71afe476 100644
--- a/srcpkgs/qt6-scxml/template
+++ b/srcpkgs/qt6-scxml/template
@@ -1,10 +1,9 @@
 # Template file for 'qt6-scxml'
 pkgname=qt6-scxml
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qtscxml-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr"
 hostmakedepends="perl qt6-declarative-devel"
 makedepends="qt6-declarative-devel"
 short_desc="Cross-platform application and UI framework - scxml"
@@ -12,10 +11,10 @@ maintainer="John <me@johnnynator.dev>"
 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=09b0dbd6ac367920fb1ba96a39dcd4c9d33eb0820dcc79538992825d588a70f0
+checksum=01bc154d6163d1f049f4e1e76658a044730ace7b0a5be35c9a46fcd1396f8619
 
 if [ "$XBPS_CHECK_PKGS" ]; then
-	configure_args+=" -DQT_BUILD_TESTS=ON"
+	configure_args="-DQT_BUILD_TESTS=ON"
 fi
 
 qt6-scxml-devel_package() {
@@ -24,8 +23,11 @@ qt6-scxml-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From d9cbc5525de9ae10a595037eda67433308d35d7a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:09 +0700
Subject: [PATCH 12/26] qt6-serialport: update to 6.3.1.

---
 srcpkgs/qt6-serialport/template | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/qt6-serialport/template b/srcpkgs/qt6-serialport/template
index 0804671ca57b..2de9d6364a5c 100644
--- a/srcpkgs/qt6-serialport/template
+++ b/srcpkgs/qt6-serialport/template
@@ -1,10 +1,9 @@
 # Template file for 'qt6-serialport'
 pkgname=qt6-serialport
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qtserialport-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr"
 hostmakedepends="perl qt6-base-devel pkg-config"
 makedepends="qt6-base-devel"
 short_desc="Cross-platform application and UI framework - serialport"
@@ -12,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 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=eebd6934d48cc044b8c87795a4fd91bb81f7195d4b5a2ddb12802f343d5db64f
+checksum=4eb6d80e65799dd2e0318df4dfba14173c1929e861718cda9bedca24253b616e
 
 qt6-serialport-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel>=${version}_1"
@@ -20,8 +19,11 @@ qt6-serialport-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From b9046b84719f7fa35ed07efb0cb36bf814981b47 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:09 +0700
Subject: [PATCH 13/26] qt6-shadertools: update to 6.3.1.

---
 srcpkgs/qt6-shadertools/template | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/qt6-shadertools/template b/srcpkgs/qt6-shadertools/template
index 9c1ec210a96a..4606fa7726b1 100644
--- a/srcpkgs/qt6-shadertools/template
+++ b/srcpkgs/qt6-shadertools/template
@@ -1,10 +1,10 @@
 # Template file for 'qt6-shadertools'
 pkgname=qt6-shadertools
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qtshadertools-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr "
+configure_args="-DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true"
 hostmakedepends="perl qt6-base-devel"
 makedepends="qt6-base-devel"
 short_desc="Cross-platform application and UI framework - shadertools"
@@ -12,7 +12,12 @@ maintainer="John <me@johnnynator.dev>"
 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=5498959b9d37c254bd126ab1320cf86aeb8a31b3ea7e51db666a8f9698afbd6c
+checksum=59b77176961528cc7b0c9325134655e273aa87b4cb386c0f4683d8f2852e435a
+
+if [ "$CROSS_BUILD" ]; then
+	hostmakedepends+=" qt6-shadertools-devel"
+fi
+
 
 qt6-shadertools-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel>=${version}_1"
@@ -20,8 +25,11 @@ qt6-shadertools-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From 94549f40c725f58f89cca0f1ba56c4bf80ecb411 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:09 +0700
Subject: [PATCH 14/26] qt6-svg: update to 6.3.1.

---
 srcpkgs/qt6-svg/template | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/qt6-svg/template b/srcpkgs/qt6-svg/template
index aa8e6b745109..309b0988e435 100644
--- a/srcpkgs/qt6-svg/template
+++ b/srcpkgs/qt6-svg/template
@@ -1,10 +1,9 @@
 # Template file for 'qt6-svg'
 pkgname=qt6-svg
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qtsvg-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr "
 hostmakedepends="qt6-base-devel perl"
 makedepends="qt6-base-devel"
 short_desc="Cross-platform application and UI framework (QT6) - qt6-svg component"
@@ -12,10 +11,10 @@ maintainer="John <me@johnnynator.dev>"
 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=3164504d7e3f640439308235739b112605ab5fc9cc517ca0b28f9fb93a8db0e3
+checksum=7b19f418e6f7b8e23344082dd04440aacf5da23c5a73980ba22ae4eba4f87df7
 
 if [ "$XBPS_CHECK_PKGS" ]; then
-	configure_args+=" -DQT_BUILD_TESTS=ON"
+	configure_args="-DQT_BUILD_TESTS=ON"
 fi
 
 do_check() {
@@ -29,8 +28,11 @@ qt6-svg-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From 9ea972244ba300cec3bdc592677455db82f82912 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:10 +0700
Subject: [PATCH 15/26] qt6-tools: update to 6.3.1.

---
 srcpkgs/qt6-tools/template | 23 ++++++++++++++++++-----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/qt6-tools/template b/srcpkgs/qt6-tools/template
index f875dff5c046..fd311176e31d 100644
--- a/srcpkgs/qt6-tools/template
+++ b/srcpkgs/qt6-tools/template
@@ -1,23 +1,33 @@
 # Template file for 'qt6-tools'
 pkgname=qt6-tools
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qttools-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr "
-hostmakedepends="qt6-base-devel perl"
-makedepends="qt6-base-devel libatomic-devel"
+configure_args="-DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=TRUE
+ -DQT_BUILD_SHARED_LIBS=ON -DQT_FEATURE_assistant=ON"
+hostmakedepends="qt6-base-devel perl qt6-plugin-sqlite"
+makedepends="qt6-base-devel libatomic-devel qt6-plugin-sqlite"
 short_desc="Cross-platform application and UI framework (QT6) - qt6-tools component"
 maintainer="John <me@johnnynator.dev>"
 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/qttools-everywhere-src-${version}.tar.xz"
-checksum=fce94688ea925782a2879347584991f854630daadba6c52aed6d93e33cd0b19c
+checksum=c412750f2aa3beb93fce5f30517c607f55daaeb7d0407af206a8adf917e126c1
+
+if [ "$CROSS_BUILD" ]; then
+	hostmakedepends+=" qt6-tools-devel"
+fi
+
 
 if [ "$XBPS_CHECK_PKGS" ]; then
 	configure_args+=" -DQT_BUILD_TESTS=ON"
 fi
 
+post_build() {
+	ninja -C build ${makejobs} lib/qt6/libexec/qhelpgenerator
+}
+
 do_check() {
 	cd build
 	# Some of these tests expect that qt6-tools is already
@@ -31,8 +41,11 @@ qt6-tools-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From 8d64838f58e77a6c4aefd38b5b5ccccca205938e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:10 +0700
Subject: [PATCH 16/26] qt6-translations: update to 6.3.1.

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

diff --git a/srcpkgs/qt6-translations/template b/srcpkgs/qt6-translations/template
index be0a74ca74e2..1b917ccb3620 100644
--- a/srcpkgs/qt6-translations/template
+++ b/srcpkgs/qt6-translations/template
@@ -1,10 +1,9 @@
 # Template file for 'qt6-translations'
 pkgname=qt6-translations
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qttranslations-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr "
 hostmakedepends="qt6-base-devel qt6-tools-devel perl"
 makedepends="qt6-base-devel qt6-tools-devel"
 short_desc="Cross-platform application and UI framework - translations"
@@ -12,4 +11,4 @@ maintainer="John <me@johnnynator.dev>"
 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=e4dd4ef892a34a9514a19238f189a33ed85c76f31dcad6599ced93b1e33440b3
+checksum=d7bdd55e2908ded901dcc262157100af2a490bf04d31e32995f6d91d78dfdb97

From 871cb4b423e372ede73a9af00453eeea534ae79e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:10 +0700
Subject: [PATCH 17/26] qt6-virtualkeyboard: update to 6.3.1.

---
 srcpkgs/qt6-virtualkeyboard/template | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/qt6-virtualkeyboard/template b/srcpkgs/qt6-virtualkeyboard/template
index 67ecef145ea1..77a247400b97 100644
--- a/srcpkgs/qt6-virtualkeyboard/template
+++ b/srcpkgs/qt6-virtualkeyboard/template
@@ -1,10 +1,9 @@
 # Template file for 'qt6-virtualkeyboard'
 pkgname=qt6-virtualkeyboard
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qtvirtualkeyboard-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr"
 hostmakedepends="perl pkg-config qt6-declarative-devel"
 makedepends="qt6-declarative-devel qt6-svg-devel hunspell-devel"
 short_desc="Cross-platform application and UI framework - virtualkeyboard"
@@ -12,10 +11,10 @@ maintainer="John <me@johnnynator.dev>"
 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=89aaf15acf5432af8f5cf4ec45cb32d87a3348906215dd56e81cb294eb276573
+checksum=5fe089b204d859ab0dd0169f811f2e30cae7c5cb36f8ab95ca36883f1fc0c2b8
 
 if [ "$XBPS_CHECK_PKGS" ]; then
-	configure_args+=" -DQT_BUILD_TESTS=ON"
+	configure_args="-DQT_BUILD_TESTS=ON"
 fi
 
 do_check() {
@@ -32,8 +31,11 @@ qt6-virtualkeyboard-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From c15a7159e18d5dc86e1f3c0574de12fedd405d9e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:10 +0700
Subject: [PATCH 18/26] qt6-wayland: update to 6.3.1.

---
 srcpkgs/qt6-wayland/template | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/qt6-wayland/template b/srcpkgs/qt6-wayland/template
index b71a273009b9..83afb34e229e 100644
--- a/srcpkgs/qt6-wayland/template
+++ b/srcpkgs/qt6-wayland/template
@@ -1,13 +1,14 @@
 # Template file for 'qt6-wayland'
 pkgname=qt6-wayland
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qtwayland-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true"
+configure_args="-DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true"
 hostmakedepends="qt6-base-devel perl pkg-config wayland-devel qt6-wayland-devel"
 # XXX: Qml as optional dep
 makedepends="qt6-base-devel wayland-devel libxkbcommon-devel
+ qt6-declarative-devel
  libXcomposite-devel MesaLib-devel Vulkan-Headers libdrm-devel"
 checkdepends="dbus mesa-dri"
 short_desc="Cross-platform application and UI framework - Wayland"
@@ -15,7 +16,7 @@ maintainer="John <me@johnnynator.dev>"
 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=e7b567f6e43ffc5918d4aa825ce1eced66a00cb0a87133b2912ba5c1b2a02190
+checksum=6f14fea2d172a5b4170be3efcb0e58535f6605b61bcd823f6d5c9d165bb8c0f0
 
 if [ "$XBPS_CHECK_PKGS" ]; then
 	configure_args+=" -DQT_BUILD_TESTS=ON"
@@ -32,9 +33,11 @@ qt6-wayland-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
-		vmove usr/lib/qt6/libexec/qtwaylandscanner
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From ff340b6ee9197629082af7fb4b35455575dfdc2e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:10 +0700
Subject: [PATCH 19/26] qt6-websockets: update to 6.3.1.

---
 srcpkgs/qt6-websockets/template | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/qt6-websockets/template b/srcpkgs/qt6-websockets/template
index c2e674aacb31..4875af093432 100644
--- a/srcpkgs/qt6-websockets/template
+++ b/srcpkgs/qt6-websockets/template
@@ -1,10 +1,9 @@
 # Template file for 'qt6-websockets'
 pkgname=qt6-websockets
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qtwebsockets-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr"
 hostmakedepends="perl qt6-base-devel qt6-declarative-devel"
 makedepends="qt6-base-devel qt6-declarative-devel"
 short_desc="Cross-platform application and UI framework - websockets"
@@ -12,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 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=e018a09fe960b7d9560d6bbc9d3ca022fed6566e6ba6fc6d869a97482d4e6361
+checksum=9f980d90c97fcbde1b50c773f6dc580cfdf8c36ce14a1be3aa2ccadfe605121a
 
 qt6-websockets-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel>=${version}_1"
@@ -20,8 +19,11 @@ qt6-websockets-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From ff4f73295795117ec3beb2391f40a800b0cb29c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Tue, 9 Aug 2022 20:16:47 +0700
Subject: [PATCH 20/26] qt6-3d: update to 6.3.1.

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

diff --git a/srcpkgs/qt6-3d/template b/srcpkgs/qt6-3d/template
index 666f57559532..c08c3bd4a41b 100644
--- a/srcpkgs/qt6-3d/template
+++ b/srcpkgs/qt6-3d/template
@@ -1,10 +1,9 @@
 # Template file for 'qt6-3d'
 pkgname=qt6-3d
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qt3d-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr"
 hostmakedepends="perl qt6-declarative-devel"
 makedepends="qt6-declarative-devel qt6-shadertools-devel libassimp-devel
  libatomic-devel"
@@ -13,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 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=74e762380dad34887878b9124dbfb981d5cf4b8b807281ff8bff311145b54de1
+checksum=9919b66dfb253fa26db1a7d664358cbc07f46c8810082ee3120d0a54b153edfe
 
 qt6-3d-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 96436746176b8d8f4d1ddab52c118c7628a8163a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:11 +0700
Subject: [PATCH 21/26] New package: qt6-webchannel-6.3.1

---
 srcpkgs/qt6-webchannel-devel    |  1 +
 srcpkgs/qt6-webchannel/template | 32 ++++++++++++++++++++++++++++++++
 srcpkgs/qt6-webchannel/update   |  1 +
 3 files changed, 34 insertions(+)
 create mode 120000 srcpkgs/qt6-webchannel-devel
 create mode 100644 srcpkgs/qt6-webchannel/template
 create mode 100644 srcpkgs/qt6-webchannel/update

diff --git a/srcpkgs/qt6-webchannel-devel b/srcpkgs/qt6-webchannel-devel
new file mode 120000
index 000000000000..03e8b23d785d
--- /dev/null
+++ b/srcpkgs/qt6-webchannel-devel
@@ -0,0 +1 @@
+qt6-webchannel
\ No newline at end of file
diff --git a/srcpkgs/qt6-webchannel/template b/srcpkgs/qt6-webchannel/template
new file mode 100644
index 000000000000..432c42bcc056
--- /dev/null
+++ b/srcpkgs/qt6-webchannel/template
@@ -0,0 +1,32 @@
+# Template file for 'qt6-webchannel'
+pkgname=qt6-webchannel
+version=6.3.1
+revision=1
+wrksrc="qtwebchannel-everywhere-src-${version}"
+build_style=cmake
+hostmakedepends="perl qt6-base-devel qt6-declarative-devel"
+makedepends="qt6-base-devel qt6-declarative-devel qt6-websockets-devel"
+short_desc="Cross-platform application and UI framework - webchannel"
+maintainer="John <me@johnnynator.dev>"
+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=aaa20ac23f86992721b7ee487c379a3fd68caa8cdcea0a77a37e0d8b47ff2668
+
+qt6-webchannel-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel>=${version}_1
+	 qt6-websockets-devel>=${version}_1"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
+		vmove usr/lib/qt6/mkspecs
+		vmove usr/lib/qt6/qml/QtWebChannel/plugins.qmltypes
+		vmove usr/lib/qt6/qml/QtWebChannel/qmldir
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
+	}
+}
diff --git a/srcpkgs/qt6-webchannel/update b/srcpkgs/qt6-webchannel/update
new file mode 100644
index 000000000000..844552465222
--- /dev/null
+++ b/srcpkgs/qt6-webchannel/update
@@ -0,0 +1 @@
+pkgname="${pkgname/6-/}-everywhere-src"

From 282f1b469203e9a3c1ceadfa0eb0f24909601f52 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:11 +0700
Subject: [PATCH 22/26] New package: qt6-multimedia-6.3.1

---
 common/shlibs                   |  3 +++
 srcpkgs/qt6-multimedia-devel    |  1 +
 srcpkgs/qt6-multimedia/template | 33 +++++++++++++++++++++++++++++++++
 srcpkgs/qt6-multimedia/update   |  1 +
 4 files changed, 38 insertions(+)
 create mode 120000 srcpkgs/qt6-multimedia-devel
 create mode 100644 srcpkgs/qt6-multimedia/template
 create mode 100644 srcpkgs/qt6-multimedia/update

diff --git a/common/shlibs b/common/shlibs
index ea6fde4ffe31..da78faa689d5 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2077,6 +2077,9 @@ libQt6SerialPort.so.6 qt6-serialport-6.2.0alpha_1
 libQt6WebSockets.so.6 qt6-websockets-6.2.0alpha_1
 libQt6WebChannel.so.6 qt6-webchannel-6.2.0alpha_1
 libQt6Positioning.so.6 qt6-location-6.2.0alpha_1
+libQt6MultimediaWidgets.so.6 qt6-multimedia-6.3.1_1
+libQt6MultimediaQuick.so.6 qt6-multimedia-6.3.1_1
+libQt6Multimedia.so.6 qt6-multimedia-6.3.1_1
 libnpth.so.0 npth-1.1_1
 libnpupnp.so.4 libnpupnp-4.0.2_1
 libglfw.so.3 glfw-3.0.4_1
diff --git a/srcpkgs/qt6-multimedia-devel b/srcpkgs/qt6-multimedia-devel
new file mode 120000
index 000000000000..9343446502d0
--- /dev/null
+++ b/srcpkgs/qt6-multimedia-devel
@@ -0,0 +1 @@
+qt6-multimedia
\ No newline at end of file
diff --git a/srcpkgs/qt6-multimedia/template b/srcpkgs/qt6-multimedia/template
new file mode 100644
index 000000000000..535a2f55ffe4
--- /dev/null
+++ b/srcpkgs/qt6-multimedia/template
@@ -0,0 +1,33 @@
+# Template file for 'qt6-multimedia'
+pkgname=qt6-multimedia
+version=6.3.1
+revision=1
+wrksrc="qtmultimedia-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DQT_FEATURE_gstreamer=ON"
+hostmakedepends="perl qt6-declarative-devel pkg-config
+ qt6-shadertools-devel"
+makedepends="qt6-declarative-devel
+ qt6-shadertools-devel libglib-devel gst-plugins-base1-devel"
+short_desc="Cross-platform application and UI framework - multimedia"
+maintainer="John <me@johnnynator.dev>"
+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=7e03242aadd634ff2d9fcf08948290f03da3d9a5012369d908da89f82b1d7336
+
+qt6-multimedia-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel>=${version}_1"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
+		vmove usr/lib/qt6/mkspecs
+		vmove usr/lib/qt6/qml/QtMultimedia/plugins.qmltypes
+		vmove usr/lib/qt6/qml/QtMultimedia/qmldir
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}
diff --git a/srcpkgs/qt6-multimedia/update b/srcpkgs/qt6-multimedia/update
new file mode 100644
index 000000000000..844552465222
--- /dev/null
+++ b/srcpkgs/qt6-multimedia/update
@@ -0,0 +1 @@
+pkgname="${pkgname/6-/}-everywhere-src"

From e5247aab56317eaa8b98203d5a728100b7143e36 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 18:22:48 +0700
Subject: [PATCH 23/26] New package: qt6-connectivity-6.3.1

---
 common/shlibs                     |  2 ++
 srcpkgs/qt6-connectivity-devel    |  1 +
 srcpkgs/qt6-connectivity/template | 30 ++++++++++++++++++++++++++++++
 3 files changed, 33 insertions(+)
 create mode 120000 srcpkgs/qt6-connectivity-devel
 create mode 100644 srcpkgs/qt6-connectivity/template

diff --git a/common/shlibs b/common/shlibs
index da78faa689d5..d46643fc31ed 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2071,6 +2071,8 @@ libQt6Designer.so.6 qt6-tools-6.1.0_1
 libQt6DesignerComponents.so.6 qt6-tools-6.1.0_1
 libQt6Help.so.6 qt6-tools-6.1.0_1
 libQt6UiTools.so.6 qt6-tools-6.1.0_1
+libQt6Nfc.so.6 qt6-connectivity-6.3.1_1
+libQt6Bluetooth.so.6 qt6-connectivity-6.3.1_1
 libQt6HunspellInputMethod.so.6 qt6-virtualkeyboard-6.1.0_1
 libQt6VirtualKeyboard.so.6 qt6-virtualkeyboard-6.1.0_1
 libQt6SerialPort.so.6 qt6-serialport-6.2.0alpha_1
diff --git a/srcpkgs/qt6-connectivity-devel b/srcpkgs/qt6-connectivity-devel
new file mode 120000
index 000000000000..478cc9d8aa39
--- /dev/null
+++ b/srcpkgs/qt6-connectivity-devel
@@ -0,0 +1 @@
+qt6-connectivity
\ No newline at end of file
diff --git a/srcpkgs/qt6-connectivity/template b/srcpkgs/qt6-connectivity/template
new file mode 100644
index 000000000000..6cb61744d0cb
--- /dev/null
+++ b/srcpkgs/qt6-connectivity/template
@@ -0,0 +1,30 @@
+# Template file for 'qt6-connectivity'
+pkgname=qt6-connectivity
+version=6.3.1
+revision=1
+wrksrc="qtconnectivity-everywhere-src-${version}"
+build_style=cmake
+hostmakedepends="perl qt6-declarative-devel"
+makedepends="qt6-declarative-devel"
+short_desc="Cross-platform application and UI framework - Connectivity"
+maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
+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=b25ce4710a9c61bc6a5dbaeeb3e2ed907a8bc85478fdb2ab4312297768b695b0
+
+qt6-connectivity-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}
+	 qt6-declarative>=${version}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
+		vmove usr/lib/qt6/mkspecs
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
+	}
+}

From 997db6d3026f69ca0a673d00c6f34e3db9bef4a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 18:22:57 +0700
Subject: [PATCH 24/26] New package: qt6-sensors-6.3.1

---
 common/shlibs                |  2 ++
 srcpkgs/qt6-sensors-devel    |  1 +
 srcpkgs/qt6-sensors/template | 31 +++++++++++++++++++++++++++++++
 3 files changed, 34 insertions(+)
 create mode 120000 srcpkgs/qt6-sensors-devel
 create mode 100644 srcpkgs/qt6-sensors/template

diff --git a/common/shlibs b/common/shlibs
index d46643fc31ed..f6284eee1bae 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2073,6 +2073,8 @@ libQt6Help.so.6 qt6-tools-6.1.0_1
 libQt6UiTools.so.6 qt6-tools-6.1.0_1
 libQt6Nfc.so.6 qt6-connectivity-6.3.1_1
 libQt6Bluetooth.so.6 qt6-connectivity-6.3.1_1
+libQt6Sensors.so.6 qt6-sensors-6.3.1_1
+libQt6SensorsQuick.so.6 qt6-sensors-6.3.1_1
 libQt6HunspellInputMethod.so.6 qt6-virtualkeyboard-6.1.0_1
 libQt6VirtualKeyboard.so.6 qt6-virtualkeyboard-6.1.0_1
 libQt6SerialPort.so.6 qt6-serialport-6.2.0alpha_1
diff --git a/srcpkgs/qt6-sensors-devel b/srcpkgs/qt6-sensors-devel
new file mode 120000
index 000000000000..eb9457f04055
--- /dev/null
+++ b/srcpkgs/qt6-sensors-devel
@@ -0,0 +1 @@
+qt6-sensors
\ No newline at end of file
diff --git a/srcpkgs/qt6-sensors/template b/srcpkgs/qt6-sensors/template
new file mode 100644
index 000000000000..5a81f43b60eb
--- /dev/null
+++ b/srcpkgs/qt6-sensors/template
@@ -0,0 +1,31 @@
+# Template file for 'qt6-sensors'
+pkgname=qt6-sensors
+version=6.3.1
+revision=1
+wrksrc="qtsensors-everywhere-src-${version}"
+build_style=cmake
+hostmakedepends="perl qt6-declarative-devel qt6-svg-devel pkg-config"
+makedepends="qt6-declarative-devel qt6-svg-devel"
+short_desc="Cross-platform application and UI framework - Sensors"
+maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
+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=4b240b59edba9a42b4735758a25f279a26841b982864e7b38f6ef0b81e0d60cc
+
+qt6-sensors-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}
+	 qt6-declarative-devel>=${version}_1"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
+		vmove usr/lib/qt6/mkspecs
+		vmove usr/lib/qt6/qml/QtSensors/plugins.qmltypes
+		vmove usr/lib/qt6/qml/QtSensors/qmldir
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}

From ba4d3eaa2aa1122a8ed9a5dbff9a18aedabb4a9b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 18:23:08 +0700
Subject: [PATCH 25/26] New package: qt6-remoteobjects-6.3.1

---
 common/shlibs                      |  2 ++
 srcpkgs/qt6-remoteobjects-devel    |  1 +
 srcpkgs/qt6-remoteobjects/template | 31 ++++++++++++++++++++++++++++++
 3 files changed, 34 insertions(+)
 create mode 120000 srcpkgs/qt6-remoteobjects-devel
 create mode 100644 srcpkgs/qt6-remoteobjects/template

diff --git a/common/shlibs b/common/shlibs
index f6284eee1bae..a0fab8869948 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2073,6 +2073,8 @@ libQt6Help.so.6 qt6-tools-6.1.0_1
 libQt6UiTools.so.6 qt6-tools-6.1.0_1
 libQt6Nfc.so.6 qt6-connectivity-6.3.1_1
 libQt6Bluetooth.so.6 qt6-connectivity-6.3.1_1
+libQt6RemoteObjects.so.6 qt6-remoteobjects-6.3.1_1
+libQt6RemoteObjectsQml.so.6 qt6-remoteobjects-6.3.1_1
 libQt6Sensors.so.6 qt6-sensors-6.3.1_1
 libQt6SensorsQuick.so.6 qt6-sensors-6.3.1_1
 libQt6HunspellInputMethod.so.6 qt6-virtualkeyboard-6.1.0_1
diff --git a/srcpkgs/qt6-remoteobjects-devel b/srcpkgs/qt6-remoteobjects-devel
new file mode 120000
index 000000000000..2a027f95266f
--- /dev/null
+++ b/srcpkgs/qt6-remoteobjects-devel
@@ -0,0 +1 @@
+qt6-remoteobjects
\ No newline at end of file
diff --git a/srcpkgs/qt6-remoteobjects/template b/srcpkgs/qt6-remoteobjects/template
new file mode 100644
index 000000000000..ebb06382c8d6
--- /dev/null
+++ b/srcpkgs/qt6-remoteobjects/template
@@ -0,0 +1,31 @@
+# Template file for 'qt6-remoteobjects'
+pkgname=qt6-remoteobjects
+version=6.3.1
+revision=1
+wrksrc="qtremoteobjects-everywhere-src-${version}"
+build_style=cmake
+hostmakedepends="perl qt6-declarative-devel pkg-config"
+makedepends="qt6-declarative-devel"
+short_desc="Cross-platform application and UI framework - Remote Objects"
+maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
+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=ea6d038b11c60981de0bd39a6091a59abf7d031e37bfc592b31be1217bef4ca6
+
+qt6-remoteobjects-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}
+	 qt6-declarative-devel>=${version}_1"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
+		vmove usr/lib/qt6/mkspecs
+		vmove usr/lib/qt6/qml/QtRemoteObjects/plugins.qmltypes
+		vmove usr/lib/qt6/qml/QtRemoteObjects/qmldir
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}

From 2c66ded6a9c5e9545406bd0ad32833587063eeaf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:11 +0700
Subject: [PATCH 26/26] New package: qt6-webengine-6.3.1.

---
 common/shlibs                                 |    7 +
 srcpkgs/qt6-webengine-devel                   |    1 +
 srcpkgs/qt6-webengine-examples                |    1 +
 .../patches/0001-None-no-debug.patch          |   11 +
 .../patches/0002-enable-ppc64.patch           |   20 +
 .../patches/0003-cross-hack.patch             |   10 +
 .../0004-ppc-disable-jxl-decoder.patch        |   13 +
 .../patches/0050-no-glibc-cmake-check.patch   |   14 +
 .../0100-chromium-sandbox-membarrier.patch    |   58 +
 .../qt6-webengine/patches/0101-size_t.patch   |   16 +
 .../0102-chromium-90-ruy-include.patch        |   19 +
 ...-v8-monotonic-pthread-cont_timedwait.patch |   22 +
 .../0104-chromium-revert-9d080c0.patch        |  162 +
 ...-chromium-revert-drop-of-system-java.patch |   15 +
 .../patches/0106-chromium-system-nodejs.patch |   20 +
 .../0107-chromium-cursed^Uscoped_file.patch   |   18 +
 .../0108-chromium-fix-narrowing-cast.patch    |   53 +
 .../0109-chromium-remove-strip_binary.patch   |   32 +
 ...ium-revert-use-ffile-compilation-dir.patch |   57 +
 ...11-chromium-no-Wno-stringop-overread.patch |   10 +
 .../0150-chromium-glibc-libc_malloc.patch     |   24 +
 ...-include-sys-reg.h-to-get-__WORDSIZE.patch |   21 +
 .../0201-chromium-musl-dispatch-to-musl.patch |  103 +
 .../0202-chromium-musl-no-mallinfo.patch      |   62 +
 .../0203-chromium-musl-siginfo_t.patch        |   18 +
 .../0204-chromium-musl-stackstart.patch       |   20 +
 .../patches/0205-chromium-musl-sandbox.patch  |   92 +
 ...0206-chromium-musl-default-stacksize.patch |   15 +
 .../patches/0208-chromium-musl-execinfo.patch |  125 +
 .../0209-chromium-musl-thread-stacksize.patch |   22 +
 .../0210-chromium-musl-msgvec-push_back.patch |   14 +
 ...ium-musl-canonicalize-file-name-musl.patch |   11 +
 .../0212-chromium-musl-no-getcontext.patch    |   29 +
 .../patches/0213-chromium-musl-crashpad.patch |   24 +
 .../patches/0214-chromium-musl-fixes.patch    |  108 +
 .../patches/0215-chromium-musl-cdefs.patch    |   29 +
 .../patches/0216-chromium-musl-stat.patch     |   12 +
 .../patches/0217-chromium-musl-resolver.patch |   77 +
 .../patches/0600-chromium-sndio.patch         |  876 ++++
 .../patches/0700-armv7l-neon.patch            |   10 +
 ...-chromium-musl-cross-no-asm_ptrace_h.patch |   30 +
 .../0751-chromium-musl-arm-user_vfp.patch     |   20 +
 .../0752-chromium-musl-arm-elf_auxv_t.patch   |   18 +
 ...0801-chromium-i686-vaapi-fpermissive.patch |   24 +
 .../patches/0900-xxx-ppc64le-libvpx.patch     |   65 +
 .../0901-xxx-ppc64le-sandbox-linux-stat.patch |   31 +
 .../patches/0902-xxx-ppc64le-support.patch    | 3556 +++++++++++++++++
 .../0903-xxx-ppc64le-swiftshader.patch        |   18 +
 srcpkgs/qt6-webengine/template                |  178 +
 srcpkgs/qt6-webengine/update                  |    1 +
 50 files changed, 6192 insertions(+)
 create mode 120000 srcpkgs/qt6-webengine-devel
 create mode 120000 srcpkgs/qt6-webengine-examples
 create mode 100644 srcpkgs/qt6-webengine/patches/0001-None-no-debug.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0002-enable-ppc64.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0003-cross-hack.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0004-ppc-disable-jxl-decoder.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0050-no-glibc-cmake-check.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0100-chromium-sandbox-membarrier.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0101-size_t.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0102-chromium-90-ruy-include.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0103-chromium-v8-monotonic-pthread-cont_timedwait.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0104-chromium-revert-9d080c0.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0105-chromium-revert-drop-of-system-java.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0106-chromium-system-nodejs.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0107-chromium-cursed^Uscoped_file.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0108-chromium-fix-narrowing-cast.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0109-chromium-remove-strip_binary.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0110-chromium-revert-use-ffile-compilation-dir.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0111-chromium-no-Wno-stringop-overread.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0150-chromium-glibc-libc_malloc.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0200-chromium-musl-include-sys-reg.h-to-get-__WORDSIZE.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0201-chromium-musl-dispatch-to-musl.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0202-chromium-musl-no-mallinfo.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0203-chromium-musl-siginfo_t.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0204-chromium-musl-stackstart.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0205-chromium-musl-sandbox.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0206-chromium-musl-default-stacksize.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0208-chromium-musl-execinfo.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0209-chromium-musl-thread-stacksize.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0210-chromium-musl-msgvec-push_back.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0211-chromium-musl-canonicalize-file-name-musl.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0212-chromium-musl-no-getcontext.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0213-chromium-musl-crashpad.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0214-chromium-musl-fixes.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0215-chromium-musl-cdefs.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0216-chromium-musl-stat.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0217-chromium-musl-resolver.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0600-chromium-sndio.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0700-armv7l-neon.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0750-chromium-musl-cross-no-asm_ptrace_h.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0751-chromium-musl-arm-user_vfp.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0752-chromium-musl-arm-elf_auxv_t.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0801-chromium-i686-vaapi-fpermissive.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0900-xxx-ppc64le-libvpx.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0901-xxx-ppc64le-sandbox-linux-stat.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0902-xxx-ppc64le-support.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0903-xxx-ppc64le-swiftshader.patch
 create mode 100644 srcpkgs/qt6-webengine/template
 create mode 100644 srcpkgs/qt6-webengine/update

diff --git a/common/shlibs b/common/shlibs
index a0fab8869948..fa72f8ee24d2 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2086,6 +2086,13 @@ libQt6Positioning.so.6 qt6-location-6.2.0alpha_1
 libQt6MultimediaWidgets.so.6 qt6-multimedia-6.3.1_1
 libQt6MultimediaQuick.so.6 qt6-multimedia-6.3.1_1
 libQt6Multimedia.so.6 qt6-multimedia-6.3.1_1
+libQt6WebEngineQuick.so.6 qt6-webengine-6.3.1_1
+libQt6PdfWidgets.so.6 qt6-webengine-6.3.1_1
+libQt6PdfQuick.so.6 qt6-webengine-6.3.1_1
+libQt6WebEngineCore.so.6 qt6-webengine-6.3.1_1
+libQt6Pdf.so.6 qt6-webengine-6.3.1_1
+libQt6WebEngineQuickDelegatesQml.so.6 qt6-webengine-6.3.1_1
+libQt6WebEngineWidgets.so.6 qt6-webengine-6.3.1_1
 libnpth.so.0 npth-1.1_1
 libnpupnp.so.4 libnpupnp-4.0.2_1
 libglfw.so.3 glfw-3.0.4_1
diff --git a/srcpkgs/qt6-webengine-devel b/srcpkgs/qt6-webengine-devel
new file mode 120000
index 000000000000..8e4d1b99c587
--- /dev/null
+++ b/srcpkgs/qt6-webengine-devel
@@ -0,0 +1 @@
+qt6-webengine
\ No newline at end of file
diff --git a/srcpkgs/qt6-webengine-examples b/srcpkgs/qt6-webengine-examples
new file mode 120000
index 000000000000..8e4d1b99c587
--- /dev/null
+++ b/srcpkgs/qt6-webengine-examples
@@ -0,0 +1 @@
+qt6-webengine
\ No newline at end of file
diff --git a/srcpkgs/qt6-webengine/patches/0001-None-no-debug.patch b/srcpkgs/qt6-webengine/patches/0001-None-no-debug.patch
new file mode 100644
index 000000000000..1ba33f8e6fd9
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0001-None-no-debug.patch
@@ -0,0 +1,11 @@
+--- a/cmake/Functions.cmake
++++ b/cmake/Functions.cmake
+@@ -813,6 +813,8 @@ macro(append_build_type_setup)
+         endif()
+     elseif(${config} STREQUAL "MinSizeRel")
+         list(APPEND gnArgArg is_debug=false symbol_level=0 optimize_for_size=true)
++    elseif(${config} STREQUAL "None")
++        list(APPEND gnArgArg is_debug=false symbol_level=0)
+     endif()
+     if(FEATURE_developer_build OR (${config} STREQUAL "Debug") OR QT_FEATURE_webengine_sanitizer)
+         list(APPEND gnArgArg
diff --git a/srcpkgs/qt6-webengine/patches/0002-enable-ppc64.patch b/srcpkgs/qt6-webengine/patches/0002-enable-ppc64.patch
new file mode 100644
index 000000000000..d72ef1ad1a10
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0002-enable-ppc64.patch
@@ -0,0 +1,20 @@
+--- a/cmake/Functions.cmake
++++ b/cmake/Functions.cmake
+@@ -622,6 +622,8 @@ function(get_gn_arch result arch)
+         set(${result} "mipsel" PARENT_SCOPE)
+     elseif(arch STREQUAL "mipsel64")
+         set(${result} "mips64el" PARENT_SCOPE)
++    elseif(arch STREQUAL "power64")
++        set(${result} "power64" PARENT_SCOPE)
+     else()
+         message(DEBUG "Unsupported architecture: ${arch}")
+     endif()
+@@ -641,6 +643,8 @@ function(get_v8_arch result targetArch h
+             set(${result} "mipsel" PARENT_SCOPE)
+         elseif(hostArch STREQUAL "mipsel64")
+             set(${result} "mipsel" PARENT_SCOPE)
++        elseif(hostArch STREQUAL "power64")
++            set(${result} "power64" PARENT_SCOPE)
+         else()
+             message(DEBUG "Unsupported architecture: ${hostArch}")
+         endif()
diff --git a/srcpkgs/qt6-webengine/patches/0003-cross-hack.patch b/srcpkgs/qt6-webengine/patches/0003-cross-hack.patch
new file mode 100644
index 000000000000..ea9f90094a63
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0003-cross-hack.patch
@@ -0,0 +1,10 @@
+--- a/src/core/api/CMakeLists.txt
++++ b/src/core/api/CMakeLists.txt
+@@ -50,6 +50,7 @@ qt_internal_add_module(WebEngineCore
+         Qt::Gui
+         Qt::Network
+         Qt::Quick
++        X11
+ )
+ 
+ set_target_properties(WebEngineCore PROPERTIES QTWEBENGINEPROCESS_NAME ${qtWebEngineProcessName})
diff --git a/srcpkgs/qt6-webengine/patches/0004-ppc-disable-jxl-decoder.patch b/srcpkgs/qt6-webengine/patches/0004-ppc-disable-jxl-decoder.patch
new file mode 100644
index 000000000000..73c1151968f4
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0004-ppc-disable-jxl-decoder.patch
@@ -0,0 +1,13 @@
+--- a/src/core/CMakeLists.txt
++++ b/src/core/CMakeLists.txt
+@@ -414,6 +414,10 @@ foreach(arch ${archs})
+                 CONDITION QT_FEATURE_webengine_ozone_x11 AND XSCRNSAVER_FOUND
+             )
+ 
++            if (cpu STREQUAL "ppc64")
++                list(APPEND gnArgArg enable_jxl_decoder=false)
++            endif()
++
+             if(QT_FEATURE_webengine_kerberos)
+                 list(APPEND gnArgArg
+                      external_gssapi_include_dir="${GSSAPI_INCLUDE_DIRS}/gssapi"
diff --git a/srcpkgs/qt6-webengine/patches/0050-no-glibc-cmake-check.patch b/srcpkgs/qt6-webengine/patches/0050-no-glibc-cmake-check.patch
new file mode 100644
index 000000000000..f756bf0286bb
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0050-no-glibc-cmake-check.patch
@@ -0,0 +1,14 @@
+--- a/configure.cmake
++++ b/configure.cmake
+@@ -499,11 +499,6 @@ add_check_for_support(
+ )
+ add_check_for_support(
+    MODULES QtWebEngine QtPdf
+-   CONDITION NOT LINUX OR TEST_glibc
+-   MESSAGE "A suitable version >= 2.17 of glibc is required."
+-)
+-add_check_for_support(
+-   MODULES QtWebEngine QtPdf
+    CONDITION NOT LINUX OR TEST_khr
+    MESSAGE "Build requires Khronos development headers for build - see mesa/libegl1-mesa-dev"
+ )
diff --git a/srcpkgs/qt6-webengine/patches/0100-chromium-sandbox-membarrier.patch b/srcpkgs/qt6-webengine/patches/0100-chromium-sandbox-membarrier.patch
new file mode 100644
index 000000000000..2dd7b4aa948f
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0100-chromium-sandbox-membarrier.patch
@@ -0,0 +1,58 @@
+--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
++++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
+@@ -413,6 +413,7 @@ bool SyscallSets::IsAllowedProcessStartO
+   switch (sysno) {
+     case __NR_exit:
+     case __NR_exit_group:
++    case __NR_membarrier:
+     case __NR_wait4:
+     case __NR_waitid:
+ #if defined(__i386__)
+--- a/src/3rdparty/chromium/sandbox/linux/system_headers/arm64_linux_syscalls.h
++++ b/src/3rdparty/chromium/sandbox/linux/system_headers/arm64_linux_syscalls.h
+@@ -1215,4 +1215,8 @@
+ #define __NR_landlock_restrict_self 446
+ #endif
+ 
++#if !defined(__NR_membarrier)
++#define __NR_membarrier 283
++#endif
++
+ #endif  // SANDBOX_LINUX_SYSTEM_HEADERS_ARM64_LINUX_SYSCALLS_H_
+--- a/src/3rdparty/chromium/sandbox/linux/system_headers/arm_linux_syscalls.h
++++ b/src/3rdparty/chromium/sandbox/linux/system_headers/arm_linux_syscalls.h
+@@ -1617,6 +1617,10 @@
+ #define __NR_landlock_restrict_self (__NR_SYSCALL_BASE + 446)
+ #endif
+ 
++#if !defined(__NR_membarrier)
++#define __NR_membarrier (__NR_SYSCALL_BASE+389)
++#endif
++
+ // ARM private syscalls.
+ #if !defined(__ARM_NR_BASE)
+ #define __ARM_NR_BASE (__NR_SYSCALL_BASE + 0xF0000)
+--- a/src/3rdparty/chromium/sandbox/linux/system_headers/x86_32_linux_syscalls.h
++++ b/src/3rdparty/chromium/sandbox/linux/system_headers/x86_32_linux_syscalls.h
+@@ -1750,5 +1750,9 @@
+ #define __NR_landlock_restrict_self 446
+ #endif
+ 
++#if !defined(__NR_membarrier)
++#define __NR_membarrier 375
++#endif
++
+ #endif  // SANDBOX_LINUX_SYSTEM_HEADERS_X86_32_LINUX_SYSCALLS_H_
+ 
+--- a/src/3rdparty/chromium/sandbox/linux/system_headers/x86_64_linux_syscalls.h
++++ b/src/3rdparty/chromium/sandbox/linux/system_headers/x86_64_linux_syscalls.h
+@@ -1438,5 +1438,9 @@
+ #define __NR_landlock_restrict_self 446
+ #endif
+ 
++#if !defined(__NR_membarrier)
++#define __NR_membarrier 324
++#endif
++
+ #endif  // SANDBOX_LINUX_SYSTEM_HEADERS_X86_64_LINUX_SYSCALLS_H_
+ 
diff --git a/srcpkgs/qt6-webengine/patches/0101-size_t.patch b/srcpkgs/qt6-webengine/patches/0101-size_t.patch
new file mode 100644
index 000000000000..fccc085da311
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0101-size_t.patch
@@ -0,0 +1,16 @@
+--- a/src/3rdparty/chromium/third_party/angle/include/platform/PlatformMethods.h
++++ b/src/3rdparty/chromium/third_party/angle/include/platform/PlatformMethods.h
+@@ -239,11 +239,11 @@ inline void DefaultOverrideFeaturesMtl(P
+ using ProgramKeyType   = std::array<uint8_t, 20>;
+ using CacheProgramFunc = void (*)(PlatformMethods *platform,
+                                   const ProgramKeyType &key,
+-                                  size_t programSize,
++                                  std::size_t programSize,
+                                   const uint8_t *programBytes);
+ inline void DefaultCacheProgram(PlatformMethods *platform,
+                                 const ProgramKeyType &key,
+-                                size_t programSize,
++                                std::size_t programSize,
+                                 const uint8_t *programBytes)
+ {}
+ 
diff --git a/srcpkgs/qt6-webengine/patches/0102-chromium-90-ruy-include.patch b/srcpkgs/qt6-webengine/patches/0102-chromium-90-ruy-include.patch
new file mode 100644
index 000000000000..bbba579076d6
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0102-chromium-90-ruy-include.patch
@@ -0,0 +1,19 @@
+From 714092f336bb14d2fcc27396ec323b3d843bb962 Mon Sep 17 00:00:00 2001
+From: Stephan Hartmann <stha09@googlemail.com>
+Date: Thu, 4 Mar 2021 15:05:46 +0000
+Subject: [PATCH] IWYU: include limits for std::numeric_limits
+
+---
+ third_party/ruy/src/ruy/block_map.cc | 1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/src/3rdparty/chromium/third_party/ruy/src/ruy/block_map.cc
++++ b/src/3rdparty/chromium/third_party/ruy/src/ruy/block_map.cc
+@@ -17,6 +17,7 @@ limitations under the License.
+ 
+ #include <algorithm>
+ #include <cstdint>
++#include <limits>
+ 
+ #ifdef RUY_MAKEBLOCKMAP_DEBUG
+ #include <cstdio>
diff --git a/srcpkgs/qt6-webengine/patches/0103-chromium-v8-monotonic-pthread-cont_timedwait.patch b/srcpkgs/qt6-webengine/patches/0103-chromium-v8-monotonic-pthread-cont_timedwait.patch
new file mode 100644
index 000000000000..1dc8bc4d3d17
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0103-chromium-v8-monotonic-pthread-cont_timedwait.patch
@@ -0,0 +1,22 @@
+Use monotonic clock for pthread_cond_timedwait with musl too.
+
+--- a/src/3rdparty/chromium/v8/src/base/platform/condition-variable.cc
++++ b/src/3rdparty/chromium/v8/src/base/platform/condition-variable.cc
+@@ -20,7 +20,7 @@ namespace base {
+ 
+ ConditionVariable::ConditionVariable() {
+ #if (V8_OS_FREEBSD || V8_OS_NETBSD || V8_OS_OPENBSD || \
+-     (V8_OS_LINUX && V8_LIBC_GLIBC))
++     V8_OS_LINUX)
+   // On Free/Net/OpenBSD and Linux with glibc we can change the time
+   // source for pthread_cond_timedwait() to use the monotonic clock.
+   pthread_condattr_t attr;
+@@ -96,7 +96,7 @@ bool ConditionVariable::WaitFor(Mutex* m
+       &native_handle_, &mutex->native_handle(), &ts);
+ #else
+ #if (V8_OS_FREEBSD || V8_OS_NETBSD || V8_OS_OPENBSD || \
+-     (V8_OS_LINUX && V8_LIBC_GLIBC))
++     V8_OS_LINUX)
+   // On Free/Net/OpenBSD and Linux with glibc we can change the time
+   // source for pthread_cond_timedwait() to use the monotonic clock.
+   result = clock_gettime(CLOCK_MONOTONIC, &ts);
diff --git a/srcpkgs/qt6-webengine/patches/0104-chromium-revert-9d080c0.patch b/srcpkgs/qt6-webengine/patches/0104-chromium-revert-9d080c0.patch
new file mode 100644
index 000000000000..42b1ee9ec063
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0104-chromium-revert-9d080c0.patch
@@ -0,0 +1,162 @@
+ Original change's description:
+ > Replace 'blacklist' with 'ignorelist' in ./tools/msan/.
+ >
+ > Bug: 1097272, 1097268
+ > Change-Id: Id5c8227a5bfb1ffaec82d3168b609085b10c8297
+ > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2867730
+ > Commit-Queue: Dylan Cutler <dylancutler@google.com>
+ > Reviewed-by: Nico Weber <thakis@chromium.org>
+ > Reviewed-by: Jonathan Metzman <metzman@chromium.org>
+ > Cr-Commit-Position: refs/heads/master@{#883035}
+--- a/src/3rdparty/chromium/build/config/sanitizers/BUILD.gn
++++ b/src/3rdparty/chromium/build/config/sanitizers/BUILD.gn
+@@ -272,11 +272,11 @@ config("asan_flags") {
+   if (is_asan) {
+     cflags += [ "-fsanitize=address" ]
+     if (is_win) {
+-      if (!defined(asan_win_blocklist_path)) {
+-        asan_win_blocklist_path =
++      if (!defined(asan_win_blacklist_path)) {
++        asan_win_blacklist_path =
+             rebase_path("//tools/memory/asan/blocklist_win.txt", root_build_dir)
+       }
+-      cflags += [ "-fsanitize-ignorelist=$asan_win_blocklist_path" ]
++      cflags += [ "-fsanitize-blacklist=$asan_win_blacklist_path" ]
+     }
+   }
+ }
+@@ -306,13 +306,13 @@ config("link_shared_library") {
+ config("cfi_flags") {
+   cflags = []
+   if (is_cfi && current_toolchain == default_toolchain) {
+-    if (!defined(cfi_ignorelist_path)) {
+-      cfi_ignorelist_path =
++    if (!defined(cfi_blacklist_path)) {
++      cfi_blacklist_path =
+           rebase_path("//tools/cfi/ignores.txt", root_build_dir)
+     }
+     cflags += [
+       "-fsanitize=cfi-vcall",
+-      "-fsanitize-ignorelist=$cfi_ignorelist_path",
++      "-fsanitize-blacklist=$cfi_blacklist_path",
+     ]
+ 
+     if (use_cfi_cast) {
+@@ -409,14 +409,14 @@ config("msan_flags") {
+   if (is_msan) {
+     assert(is_linux || is_chromeos,
+            "msan only supported on linux x86_64/ChromeOS")
+-    if (!defined(msan_ignorelist_path)) {
+-      msan_ignorelist_path =
+-          rebase_path("//tools/msan/ignorelist.txt", root_build_dir)
++    if (!defined(msan_blacklist_path)) {
++      msan_blacklist_path =
++          rebase_path("//tools/msan/blacklist.txt", root_build_dir)
+     }
+     cflags = [
+       "-fsanitize=memory",
+       "-fsanitize-memory-track-origins=$msan_track_origins",
+-      "-fsanitize-ignorelist=$msan_ignorelist_path",
++      "-fsanitize-blacklist=$msan_blacklist_path",
+     ]
+   }
+ }
+@@ -424,13 +424,13 @@ config("msan_flags") {
+ config("tsan_flags") {
+   if (is_tsan) {
+     assert(is_linux || is_chromeos, "tsan only supported on linux x86_64")
+-    if (!defined(tsan_ignorelist_path)) {
+-      tsan_ignorelist_path =
++    if (!defined(tsan_blacklist_path)) {
++      tsan_blacklist_path =
+           rebase_path("//tools/memory/tsan_v2/ignores.txt", root_build_dir)
+     }
+     cflags = [
+       "-fsanitize=thread",
+-      "-fsanitize-ignorelist=$tsan_ignorelist_path",
++      "-fsanitize-blacklist=$tsan_blacklist_path",
+     ]
+   }
+ }
+@@ -438,8 +438,8 @@ config("tsan_flags") {
+ config("ubsan_flags") {
+   cflags = []
+   if (is_ubsan) {
+-    if (!defined(ubsan_ignorelist_path)) {
+-      ubsan_ignorelist_path =
++    if (!defined(ubsan_blacklist_path)) {
++      ubsan_blacklist_path =
+           rebase_path("//tools/ubsan/ignorelist.txt", root_build_dir)
+     }
+     cflags += [
+@@ -456,7 +456,7 @@ config("ubsan_flags") {
+       "-fsanitize=signed-integer-overflow",
+       "-fsanitize=unreachable",
+       "-fsanitize=vla-bound",
+-      "-fsanitize-ignorelist=$ubsan_ignorelist_path",
++      "-fsanitize-blacklist=$ubsan_blacklist_path",
+     ]
+     if (!is_clang) {
+       # These exposes too much illegal C++14 code to compile on anything stricter than clang:
+@@ -497,8 +497,8 @@ config("ubsan_no_recover") {
+ 
+ config("ubsan_security_flags") {
+   if (is_ubsan_security) {
+-    if (!defined(ubsan_security_ignorelist_path)) {
+-      ubsan_security_ignorelist_path =
++    if (!defined(ubsan_security_blacklist_path)) {
++      ubsan_security_blacklist_path =
+           rebase_path("//tools/ubsan/security_ignorelist.txt", root_build_dir)
+     }
+     cflags = [
+@@ -506,7 +506,7 @@ config("ubsan_security_flags") {
+       "-fsanitize=shift",
+       "-fsanitize=signed-integer-overflow",
+       "-fsanitize=vla-bound",
+-      "-fsanitize-ignorelist=$ubsan_security_ignorelist_path",
++      "-fsanitize-blacklist=$ubsan_security_blacklist_path",
+     ]
+   }
+ }
+@@ -519,13 +519,13 @@ config("ubsan_null_flags") {
+ 
+ config("ubsan_vptr_flags") {
+   if (is_ubsan_vptr) {
+-    if (!defined(ubsan_vptr_ignorelist_path)) {
+-      ubsan_vptr_ignorelist_path =
++    if (!defined(ubsan_vptr_blacklist_path)) {
++      ubsan_vptr_blacklist_path =
+           rebase_path("//tools/ubsan/vptr_ignorelist.txt", root_build_dir)
+     }
+     cflags = [
+       "-fsanitize=vptr",
+-      "-fsanitize-ignorelist=$ubsan_vptr_ignorelist_path",
++      "-fsanitize-blacklist=$ubsan_vptr_blacklist_path",
+     ]
+     if (!is_clang) {
+       # Clang specific flag:
+--- a/src/3rdparty/chromium/build_overrides/build.gni
++++ b/src/3rdparty/chromium/build_overrides/build.gni
+@@ -43,15 +43,15 @@ declare_args() {
+ # Allows different projects to specify their own suppression/ignore lists for
+ # sanitizer tools.
+ # asan_suppressions_file = "path/to/asan_suppressions.cc"
+-# asan_win_ignorelist_path = "path/to/asan/blocklist_win.txt"
++# asan_win_blacklist_path = "path/to/asan/blocklist_win.txt"
+ # lsan_suppressions_file = "path/to/lsan_suppressions.cc"
+ # tsan_suppressions_file = "path/to/tsan_suppressions.cc"
+-# tsan_ignorelist_path = "path/to/tsan/ignores.txt"
+-# msan_ignorelist_path = "path/to/msan/ignorelist.txt"
+-# ubsan_ignorelist_path = "path/to/ubsan/ignorelist.txt"
+-# ubsan_vptr_ignorelist_path = "path/to/ubsan/vptr_ignorelist.txt"
+-# ubsan_security_ignorelist_path = "path/to/ubsan/security_ignorelist.txt"
+-# cfi_ignorelist_path = "path/to/cfi/ignores.txt"
++# tsan_blacklist_path = "path/to/tsan/ignores.txt"
++# msan_blacklist_path = "path/to/msan/blacklist.txt"
++# ubsan_blacklist_path = "path/to/ubsan/blacklist.txt"
++# ubsan_vptr_blacklist_path = "path/to/ubsan/vptr_blacklist.txt"
++# ubsan_security_blacklist_path = "path/to/ubsan/security_blacklist.txt"
++# cfi_blacklist_path = "path/to/cfi/ignores.txt"
+ 
+ declare_args() {
+   # Android 32-bit non-component, non-clang builds cannot have symbol_level=2
diff --git a/srcpkgs/qt6-webengine/patches/0105-chromium-revert-drop-of-system-java.patch b/srcpkgs/qt6-webengine/patches/0105-chromium-revert-drop-of-system-java.patch
new file mode 100644
index 000000000000..44f3aa8fae5e
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0105-chromium-revert-drop-of-system-java.patch
@@ -0,0 +1,15 @@
+This was dropped for some reason in 6951c37cecd05979b232a39e5c10e6346a0f74ef
+--- a/src/3rdparty/chromium/third_party/closure_compiler/compiler.py
++++ b/src/3rdparty/chromium/third_party/closure_compiler/compiler.py
+@@ -13,8 +13,9 @@ import subprocess
+ 
+ 
+ _CURRENT_DIR = os.path.join(os.path.dirname(__file__))
+-_JAVA_PATH = os.path.join(_CURRENT_DIR, "..", "jdk", "current", "bin", "java")
+-assert os.path.isfile(_JAVA_PATH), "java only allowed in android builds"
++_JAVA_BIN = "java"
++_JDK_PATH = os.path.join(_CURRENT_DIR, "..", "jdk", "current", "bin", "java")
++_JAVA_PATH = _JDK_PATH if os.path.isfile(_JDK_PATH) else _JAVA_BIN
+ 
+ class Compiler(object):
+   """Runs the Closure compiler on given source files to typecheck them
diff --git a/srcpkgs/qt6-webengine/patches/0106-chromium-system-nodejs.patch b/srcpkgs/qt6-webengine/patches/0106-chromium-system-nodejs.patch
new file mode 100644
index 000000000000..1e067cc6eda0
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0106-chromium-system-nodejs.patch
@@ -0,0 +1,20 @@
+--- a/src/3rdparty/chromium/third_party/node/node.py
++++ b/src/3rdparty/chromium/third_party/node/node.py
+@@ -36,11 +36,12 @@ def GetBinaryPath():
+   if platform.system() == 'Darwin' and platform.machine() == 'arm64':
+       return os.path.join(os_path.join(os_path.dirname(__file__), 'mac',
+                           'node-darwin-arm64', 'bin', 'node'))
+-  return os_path.join(os_path.dirname(__file__), *{
+-    'Darwin': ('mac', 'node-darwin-x64', 'bin', 'node'),
+-    'Linux': ('linux', 'node-linux-x64', 'bin', 'node'),
+-    'Windows': ('win', 'node.exe'),
+-  }[platform.system()])
++  return "/usr/bin/node"
++  #return os_path.join(os_path.dirname(__file__), *{
++  #  'Darwin': ('mac', 'node-darwin-x64', 'bin', 'node'),
++  #  'Linux': ('linux', 'node-linux-x64', 'bin', 'node'),
++  #  'Windows': ('win', 'node.exe'),
++  #}[platform.system()])
+ 
+ 
+ def RunNode(cmd_parts, stdout=None):
diff --git a/srcpkgs/qt6-webengine/patches/0107-chromium-cursed^Uscoped_file.patch b/srcpkgs/qt6-webengine/patches/0107-chromium-cursed^Uscoped_file.patch
new file mode 100644
index 000000000000..a8f5d971883d
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0107-chromium-cursed^Uscoped_file.patch
@@ -0,0 +1,18 @@
+--- a/src/3rdparty/chromium/base/files/scoped_file_linux.cc
++++ b/src/3rdparty/chromium/base/files/scoped_file_linux.cc
+@@ -77,15 +77,3 @@ bool IsFDOwned(int fd) {
+ }
+ 
+ }  // namespace base
+-
+-extern "C" {
+-
+-int __close(int);
+-
+-__attribute__((visibility("default"), noinline)) int close(int fd) {
+-  if (base::IsFDOwned(fd) && g_is_ownership_enforced)
+-    CrashOnFdOwnershipViolation();
+-  return __close(fd);
+-}
+-
+-}  // extern "C"
diff --git a/srcpkgs/qt6-webengine/patches/0108-chromium-fix-narrowing-cast.patch b/srcpkgs/qt6-webengine/patches/0108-chromium-fix-narrowing-cast.patch
new file mode 100644
index 000000000000..ed32cd9b7415
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0108-chromium-fix-narrowing-cast.patch
@@ -0,0 +1,53 @@
+--- a/src/3rdparty/chromium/base/files/file_util_linux.cc
++++ b/src/3rdparty/chromium/base/files/file_util_linux.cc
+@@ -23,14 +23,14 @@ bool GetFileSystemType(const FilePath& p
+ 
+   // Not all possible |statfs_buf.f_type| values are in linux/magic.h.
+   // Missing values are copied from the statfs man page.
+-  switch (statfs_buf.f_type) {
++  switch (static_cast<uintmax_t>(statfs_buf.f_type)) {
+     case 0:
+       *type = FILE_SYSTEM_0;
+       break;
+     case EXT2_SUPER_MAGIC:  // Also ext3 and ext4
+     case MSDOS_SUPER_MAGIC:
+     case REISERFS_SUPER_MAGIC:
+-    case static_cast<int>(BTRFS_SUPER_MAGIC):
++    case BTRFS_SUPER_MAGIC:
+     case 0x5346544E:  // NTFS
+     case 0x58465342:  // XFS
+     case 0x3153464A:  // JFS
+@@ -40,14 +40,14 @@ bool GetFileSystemType(const FilePath& p
+       *type = FILE_SYSTEM_NFS;
+       break;
+     case SMB_SUPER_MAGIC:
+-    case static_cast<int>(0xFF534D42):  // CIFS
++    case 0xFF534D42:  // CIFS
+       *type = FILE_SYSTEM_SMB;
+       break;
+     case CODA_SUPER_MAGIC:
+       *type = FILE_SYSTEM_CODA;
+       break;
+-    case static_cast<int>(HUGETLBFS_MAGIC):
+-    case static_cast<int>(RAMFS_MAGIC):
++    case HUGETLBFS_MAGIC:
++    case RAMFS_MAGIC:
+     case TMPFS_MAGIC:
+       *type = FILE_SYSTEM_MEMORY;
+       break;
+--- a/src/3rdparty/chromium/base/system/sys_info_posix.cc
++++ b/src/3rdparty/chromium/base/system/sys_info_posix.cc
+@@ -100,10 +100,10 @@ bool IsStatsZeroIfUnlimited(const base::
+   if (HANDLE_EINTR(statfs(path.value().c_str(), &stats)) != 0)
+     return false;
+ 
+-  switch (stats.f_type) {
++  switch (static_cast<uintmax_t>(stats.f_type)) {
+     case TMPFS_MAGIC:
+-    case static_cast<int>(HUGETLBFS_MAGIC):
+-    case static_cast<int>(RAMFS_MAGIC):
++    case HUGETLBFS_MAGIC:
++    case RAMFS_MAGIC:
+       return true;
+   }
+   return false;
diff --git a/srcpkgs/qt6-webengine/patches/0109-chromium-remove-strip_binary.patch b/srcpkgs/qt6-webengine/patches/0109-chromium-remove-strip_binary.patch
new file mode 100644
index 000000000000..5ebd16e659af
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0109-chromium-remove-strip_binary.patch
@@ -0,0 +1,32 @@
+--- a/src/3rdparty/chromium/chrome/test/chromedriver/BUILD.gn
++++ b/src/3rdparty/chromium/chrome/test/chromedriver/BUILD.gn
+@@ -308,11 +308,7 @@ source_set("lib") {
+   }
+ }
+ 
+-if (is_linux) {
+-  chromedriver_output = "chromedriver.unstripped"
+-} else {
+-  chromedriver_output = "chromedriver"
+-}
++chromedriver_output = "chromedriver"
+ 
+ executable("$chromedriver_output") {
+   testonly = true
+@@ -336,16 +332,6 @@ executable("$chromedriver_output") {
+   }
+ }
+ 
+-if (is_linux) {
+-  strip_binary("chromedriver") {
+-    testonly = true
+-    binary_input = "$root_out_dir/$chromedriver_output"
+-    symbol_output = "$root_out_dir/chromedriver.debug"
+-    stripped_binary_output = "$root_out_dir/chromedriver"
+-    deps = [ ":$chromedriver_output" ]
+-  }
+-}
+-
+ python_library("chromedriver_py_tests") {
+   testonly = true
+   deps = [
diff --git a/srcpkgs/qt6-webengine/patches/0110-chromium-revert-use-ffile-compilation-dir.patch b/srcpkgs/qt6-webengine/patches/0110-chromium-revert-use-ffile-compilation-dir.patch
new file mode 100644
index 000000000000..a00f7ea80f7a
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0110-chromium-revert-use-ffile-compilation-dir.patch
@@ -0,0 +1,57 @@
+From 34a955823630096f5b01c2b01d51c1ea59d22763 Mon Sep 17 00:00:00 2001
+From: Zequan Wu <zequanwu@google.com>
+Date: Tue, 20 Jul 2021 14:13:50 +0000
+Subject: [PATCH] Use -ffile-compilation-dir= instead of
+ -fdebug-compilation-dir=
+
+Bug: 1010267
+Change-Id: If2b4ead8535a76490eb466a38e3d8fed6ea91079
+Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2770738
+Auto-Submit: Zequan Wu <zequanwu@google.com>
+Commit-Queue: Nico Weber <thakis@chromium.org>
+Reviewed-by: Nico Weber <thakis@chromium.org>
+Cr-Commit-Position: refs/heads/master@{#903456}
+--- a/src/3rdparty/chromium/build/config/compiler/BUILD.gn
++++ b/src/3rdparty/chromium/build/config/compiler/BUILD.gn
+@@ -1269,19 +1269,12 @@ config("compiler_deterministic") {
+     # different build directory like "out/feature_a" and "out/feature_b" if
+     # we build same files with same compile flag.
+     # Other paths are already given in relative, no need to normalize them.
+-    if (is_nacl) {
+-      # TODO(https://crbug.com/1231236): Use -ffile-compilation-dir= here.
+-      cflags += [
+-        "-Xclang",
+-        "-fdebug-compilation-dir",
+-        "-Xclang",
+-        ".",
+-      ]
+-    } else {
+-      # -ffile-compilation-dir is an alias for both -fdebug-compilation-dir=
+-      # and -fcoverage-compilation-dir=.
+-      cflags += [ "-ffile-compilation-dir=." ]
+-    }
++    cflags += [
++      "-Xclang",
++      "-fdebug-compilation-dir",
++      "-Xclang",
++      ".",
++    ]
+     if (!is_win) {
+       # We don't use clang -cc1as on Windows (yet? https://crbug.com/762167)
+       asmflags = [ "-Wa,-fdebug-compilation-dir,." ]
+--- a/src/3rdparty/chromium/build/config/compiler/compiler.gni
++++ b/src/3rdparty/chromium/build/config/compiler/compiler.gni
+@@ -228,8 +228,11 @@ declare_args() {
+ # deterministic builds to reduce compile times, so this is less relevant for
+ # official builders.
+ strip_absolute_paths_from_debug_symbols_default =
+-    is_android || is_fuchsia || is_nacl || (is_win && use_lld) || is_linux ||
+-    is_chromeos || (is_apple && !enable_dsyms)
++    # TODO(crbug.com/1010267): remove '!use_clang_coverage', coverage build has
++    # dependency to absolute path of source files.
++    !use_clang_coverage &&
++    (is_android || is_fuchsia || is_nacl || (is_win && use_lld) || is_linux ||
++     is_chromeos || (is_apple && !enable_dsyms))
+ 
+ declare_args() {
+   strip_absolute_paths_from_debug_symbols = strip_absolute_paths_from_debug_symbols_default
diff --git a/srcpkgs/qt6-webengine/patches/0111-chromium-no-Wno-stringop-overread.patch b/srcpkgs/qt6-webengine/patches/0111-chromium-no-Wno-stringop-overread.patch
new file mode 100644
index 000000000000..03eac3f8e067
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0111-chromium-no-Wno-stringop-overread.patch
@@ -0,0 +1,10 @@
+--- a/src/3rdparty/chromium/build/config/compiler/BUILD.gn
++++ b/src/3rdparty/chromium/build/config/compiler/BUILD.gn
+@@ -394,7 +394,6 @@ config("compiler") {
+         "-Wno-parentheses",
+         "-Wno-sign-compare", # fido
+         "-Wno-stringop-overflow", # skia, libaom, protobuf, icu
+-        "-Wno-stringop-overread", # libaom
+         "-Wno-psabi", # skia
+         "-Wno-multichar", # crashpad
+         "-Wno-format-zero-length", # user_agent.cc
diff --git a/srcpkgs/qt6-webengine/patches/0150-chromium-glibc-libc_malloc.patch b/srcpkgs/qt6-webengine/patches/0150-chromium-glibc-libc_malloc.patch
new file mode 100644
index 000000000000..7e1b66e5c73d
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0150-chromium-glibc-libc_malloc.patch
@@ -0,0 +1,24 @@
+--- a/src/3rdparty/chromium/base/process/memory_linux.cc
++++ b/src/3rdparty/chromium/base/process/memory_linux.cc
+@@ -23,6 +23,12 @@
+ #include "third_party/tcmalloc/chromium/src/gperftools/tcmalloc.h"
+ #endif
+ 
++#if defined(LIBC_GLIBC)
++extern "C" {
++extern void *__libc_malloc(size_t size);
++}
++#endif
++
+ namespace base {
+ 
+ namespace {
+@@ -120,7 +126,7 @@ bool UncheckedMalloc(size_t size, void**
+     (!defined(LIBC_GLIBC) && !BUILDFLAG(USE_TCMALLOC))
+   *result = malloc(size);
+ #elif defined(LIBC_GLIBC) && !BUILDFLAG(USE_TCMALLOC)
+-  *result = __libc_malloc(size);
++  *result = ::__libc_malloc(size);
+ #elif BUILDFLAG(USE_TCMALLOC)
+   *result = tc_malloc_skip_new_handler(size);
+ #endif
diff --git a/srcpkgs/qt6-webengine/patches/0200-chromium-musl-include-sys-reg.h-to-get-__WORDSIZE.patch b/srcpkgs/qt6-webengine/patches/0200-chromium-musl-include-sys-reg.h-to-get-__WORDSIZE.patch
new file mode 100644
index 000000000000..41b90071b5e4
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0200-chromium-musl-include-sys-reg.h-to-get-__WORDSIZE.patch
@@ -0,0 +1,21 @@
+From 9001c54d6b974449174a8cee8f3f5d78a9bd6c9e Mon Sep 17 00:00:00 2001
+From: Felix Janda <felix.janda@posteo.de>
+Date: Sun, 1 Feb 2015 14:26:52 +0100
+Subject: [PATCH 3/6] include <sys/reg.h> to get __WORDSIZE on musl libc
+
+---
+ qtwebengine/src/3rdparty/chromium/third_party/breakpad/breakpad/src/common/linux/elf_core_dump.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/common/linux/elf_core_dump.h
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/common/linux/elf_core_dump.h
+@@ -37,6 +37,9 @@
+ #include <limits.h>
+ #include <link.h>
+ #include <stddef.h>
++#ifndef __GLIBC__
++#include <sys/reg.h>
++#endif
+ 
+ #include "common/memory_range.h"
+ 
diff --git a/srcpkgs/qt6-webengine/patches/0201-chromium-musl-dispatch-to-musl.patch b/srcpkgs/qt6-webengine/patches/0201-chromium-musl-dispatch-to-musl.patch
new file mode 100644
index 000000000000..a58a688a4b55
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0201-chromium-musl-dispatch-to-musl.patch
@@ -0,0 +1,103 @@
+--- a/src/3rdparty/chromium/base/allocator/allocator_shim_default_dispatch_to_glibc.cc
++++ b/src/3rdparty/chromium/base/allocator/allocator_shim_default_dispatch_to_glibc.cc
+@@ -8,6 +8,7 @@
+ #include <dlfcn.h>
+ #include <malloc.h>
+ 
++#if defined(__GLIBC__)
+ // This translation unit defines a default dispatch for the allocator shim which
+ // routes allocations to libc functions.
+ // The code here is strongly inspired from tcmalloc's libc_override_glibc.h.
+@@ -87,3 +88,92 @@ const AllocatorDispatch AllocatorDispatc
+     nullptr,               /* aligned_free_function */
+     nullptr,               /* next */
+ };
++
++#else // defined(__GLIBC__)
++
++#include <dlfcn.h>
++
++extern "C" {
++// Declare function pointers to the memory functions
++typedef void* (*t_libc_malloc)(size_t size);
++typedef void* (*t_libc_calloc)(size_t n, size_t size);
++typedef void* (*t_libc_realloc)(void* address, size_t size);
++typedef void* (*t_libc_memalign)(size_t alignment, size_t size);
++typedef void (*t_libc_free)(void* ptr);
++typedef size_t (*t_libc_malloc_usable_size)(void* ptr);
++
++// Static instances of pointers to libc.so dl symbols
++static t_libc_malloc libc_malloc = NULL;
++static t_libc_calloc libc_calloc = NULL;
++static t_libc_realloc libc_realloc = NULL;
++static t_libc_memalign libc_memalign = NULL;
++static t_libc_free libc_free = NULL;
++static t_libc_malloc_usable_size libc_malloc_usable_size = NULL;
++
++// resolve the symbols in libc.so
++void musl_libc_memory_init(void)
++{
++  libc_malloc = (t_libc_malloc) dlsym(RTLD_NEXT, "malloc");
++  libc_calloc = (t_libc_calloc) dlsym(RTLD_NEXT, "calloc");
++  libc_realloc = (t_libc_realloc) dlsym(RTLD_NEXT, "realloc");
++  libc_memalign = (t_libc_memalign) dlsym(RTLD_NEXT, "memalign");
++  libc_free = (t_libc_free) dlsym(RTLD_NEXT, "free");
++  libc_malloc_usable_size = (t_libc_malloc_usable_size) dlsym(RTLD_NEXT, "malloc_usable_size");
++}
++}  // extern "C"
++
++namespace {
++
++using base::allocator::AllocatorDispatch;
++
++void* MuslMalloc(const AllocatorDispatch*, size_t size, void* context) {
++  if (!libc_malloc)
++    musl_libc_memory_init();
++  return (*libc_malloc)(size);
++}
++
++void* MuslCalloc(const AllocatorDispatch*, size_t n, size_t size, void* context) {
++  if (!libc_calloc)
++    musl_libc_memory_init();
++  return (*libc_calloc)(n, size);
++}
++
++void* MuslRealloc(const AllocatorDispatch*, void* address, size_t size, void* context) {
++  if (!libc_realloc)
++    musl_libc_memory_init();
++  return (*libc_realloc)(address, size);
++}
++
++void* MuslMemalign(const AllocatorDispatch*, size_t alignment, size_t size, void* context) {
++  if (!libc_memalign)
++    musl_libc_memory_init();
++  return (*libc_memalign)(alignment, size);
++}
++
++void MuslFree(const AllocatorDispatch*, void* address, void* context) {
++  if (!libc_free)
++    musl_libc_memory_init();
++  (*libc_free)(address);
++}
++
++size_t MuslGetSizeEstimate(const AllocatorDispatch*, void* address, void* context) {
++  // TODO(siggi, primiano): malloc_usable_size may need redirection in the
++  //     presence of interposing shims that divert allocations.
++  if (!libc_malloc_usable_size)
++    musl_libc_memory_init();
++  return (*libc_malloc_usable_size)(address);
++}
++
++}  // namespace
++
++const AllocatorDispatch AllocatorDispatch::default_dispatch = {
++    &MuslMalloc,           /* alloc_function */
++    &MuslCalloc,           /* alloc_zero_initialized_function */
++    &MuslMemalign,         /* alloc_aligned_function */
++    &MuslRealloc,          /* realloc_function */
++    &MuslFree,             /* free_function */
++    &MuslGetSizeEstimate,  /* get_size_estimate_function */
++    nullptr,               /* next */
++};
++
++#endif
diff --git a/srcpkgs/qt6-webengine/patches/0202-chromium-musl-no-mallinfo.patch b/srcpkgs/qt6-webengine/patches/0202-chromium-musl-no-mallinfo.patch
new file mode 100644
index 000000000000..a5bdb5a43a5f
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0202-chromium-musl-no-mallinfo.patch
@@ -0,0 +1,62 @@
+--- a/src/3rdparty/chromium/base/process/process_metrics_posix.cc
++++ b/src/3rdparty/chromium/base/process/process_metrics_posix.cc
+@@ -105,7 +105,7 @@ void IncreaseFdLimitTo(unsigned int max_
+ 
+ #endif  // !defined(OS_FUCHSIA)
+ 
+-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID)
++#if (defined(OS_LINUX) && defined(__GLIBC__)) || defined(OS_CHROMEOS) || defined(OS_ANDROID)
+ namespace {
+ 
+ size_t GetMallocUsageMallinfo() {
+@@ -127,16 +127,16 @@ size_t GetMallocUsageMallinfo() {
+ }
+ 
+ }  // namespace
+-#endif  // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID)
++#endif  // (defined(OS_LINUX) && defined(__GLIBC__)) || defined(OS_CHROMEOS) || defined(OS_ANDROID)
+ 
+ size_t ProcessMetrics::GetMallocUsage() {
+ #if defined(OS_APPLE)
+   malloc_statistics_t stats = {0};
+   malloc_zone_statistics(nullptr, &stats);
+   return stats.size_in_use;
+-#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID)
++#elif (defined(OS_LINUX) && defined(__GLIBC__)) || defined(OS_CHROMEOS) || defined(OS_ANDROID)
+   return GetMallocUsageMallinfo();
+-#elif defined(OS_FUCHSIA)
++#else
+   // TODO(fuchsia): Not currently exposed. https://crbug.com/735087.
+   return 0;
+ #endif
+--- a/src/3rdparty/chromium/third_party/tflite/src/tensorflow/lite/profiling/memory_info.cc
++++ b/src/3rdparty/chromium/third_party/tflite/src/tensorflow/lite/profiling/memory_info.cc
+@@ -27,7 +27,7 @@ namespace memory {
+ const int MemoryUsage::kValueNotSet = 0;
+ 
+ bool MemoryUsage::IsSupported() {
+-#ifdef __linux__
++#ifdef __GLIBC__
+   return true;
+ #endif
+   return false;
+@@ -35,7 +35,7 @@ bool MemoryUsage::IsSupported() {
+ 
+ MemoryUsage GetMemoryUsage() {
+   MemoryUsage result;
+-#ifdef __linux__
++#ifdef __GLIBC__
+   rusage res;
+   if (getrusage(RUSAGE_SELF, &res) == 0) {
+     result.max_rss_kb = res.ru_maxrss;
+--- a/src/3rdparty/chromium/base/trace_event/malloc_dump_provider.cc
++++ b/src/3rdparty/chromium/base/trace_event/malloc_dump_provider.cc
+@@ -213,7 +213,7 @@ bool MallocDumpProvider::OnMemoryDump(co
+                      &allocated_objects_count);
+ #elif defined(OS_FUCHSIA)
+ // TODO(fuchsia): Port, see https://crbug.com/706592.
+-#else
++#elif defined(__GLIBC__)
+ #if defined(__GLIBC__) && defined(__GLIBC_PREREQ)
+ #if __GLIBC_PREREQ(2, 33)
+ #define MALLINFO2_FOUND_IN_LIBC
diff --git a/srcpkgs/qt6-webengine/patches/0203-chromium-musl-siginfo_t.patch b/srcpkgs/qt6-webengine/patches/0203-chromium-musl-siginfo_t.patch
new file mode 100644
index 000000000000..43ef7fd7c5d2
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0203-chromium-musl-siginfo_t.patch
@@ -0,0 +1,18 @@
+There's a subtle difference in the internal name of siginfo_t fields
+between glibc and musl. The structure itself is equivalent, so it
+should suffice to add a macro to rename the field.
+
+--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf/trap.cc
++++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf/trap.cc
+@@ -174,7 +174,11 @@ void Trap::SigSys(int nr, LinuxSigInfo*
+   // If the version of glibc doesn't include this information in
+   // siginfo_t (older than 2.17), we need to explicitly copy it
+   // into an arch_sigsys structure.
++#if defined(__GLIBC__)
+   memcpy(&sigsys, &info->_sifields, sizeof(sigsys));
++#else
++  memcpy(&sigsys, &info->__si_fields, sizeof(sigsys));
++#endif
+ #endif
+ 
+ #if defined(__mips__)
diff --git a/srcpkgs/qt6-webengine/patches/0204-chromium-musl-stackstart.patch b/srcpkgs/qt6-webengine/patches/0204-chromium-musl-stackstart.patch
new file mode 100644
index 000000000000..b03cf43b86db
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0204-chromium-musl-stackstart.patch
@@ -0,0 +1,20 @@
+--- a/src/3rdparty/chromium/third_party/blink/renderer/platform/wtf/stack_util.cc
++++ b/src/3rdparty/chromium/third_party/blink/renderer/platform/wtf/stack_util.cc
+@@ -29,7 +29,7 @@ size_t GetUnderestimatedStackSize() {
+ // FIXME: On Mac OSX and Linux, this method cannot estimate stack size
+ // correctly for the main thread.
+ 
+-#elif defined(__GLIBC__) || defined(OS_ANDROID) || defined(OS_FREEBSD) || \
++#elif defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FREEBSD) || \
+     defined(OS_FUCHSIA)
+   // pthread_getattr_np() can fail if the thread is not invoked by
+   // pthread_create() (e.g., the main thread of blink_unittests).
+@@ -97,7 +97,7 @@ return Threading::ThreadStackSize();
+ }
+ 
+ void* GetStackStart() {
+-#if defined(__GLIBC__) || defined(OS_ANDROID) || defined(OS_FREEBSD) || \
++#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FREEBSD) || \
+     defined(OS_FUCHSIA)
+   pthread_attr_t attr;
+   int error;
diff --git a/srcpkgs/qt6-webengine/patches/0205-chromium-musl-sandbox.patch b/srcpkgs/qt6-webengine/patches/0205-chromium-musl-sandbox.patch
new file mode 100644
index 000000000000..772a578fd823
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0205-chromium-musl-sandbox.patch
@@ -0,0 +1,92 @@
+--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc
++++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc
+@@ -138,7 +138,7 @@ namespace sandbox {
+ // present (as in newer versions of posix_spawn).
+ ResultExpr RestrictCloneToThreadsAndEPERMFork() {
+   const Arg<unsigned long> flags(0);
+-
++#if defined(__GLIBC__)
+   // TODO(mdempsky): Extend DSL to support (flags & ~mask1) == mask2.
+   const uint64_t kAndroidCloneMask = CLONE_VM | CLONE_FS | CLONE_FILES |
+                                      CLONE_SIGHAND | CLONE_THREAD |
+@@ -165,6 +165,17 @@ ResultExpr RestrictCloneToThreadsAndEPER
+   return If(IsAndroid() ? android_test : glibc_test, Allow())
+       .ElseIf(is_fork_or_clone_vfork, Error(EPERM))
+       .Else(CrashSIGSYSClone());
++#else
++  const int required = CLONE_VM | CLONE_FS | CLONE_FILES | CLONE_SIGHAND |
++                       CLONE_THREAD | CLONE_SYSVSEM;
++  const int safe = CLONE_SETTLS | CLONE_PARENT_SETTID | CLONE_CHILD_CLEARTID |
++                   CLONE_DETACHED;
++  const BoolExpr thread_clone_ok = (flags&~safe)==required;
++
++  return If(thread_clone_ok, Allow())
++      .ElseIf((flags & (CLONE_VM | CLONE_THREAD)) == 0, Error(EPERM))
++      .Else(CrashSIGSYSClone());
++#endif
+ }
+ 
+ #ifndef PR_PAC_RESET_KEYS
+--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
++++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
+@@ -419,6 +419,9 @@ bool SyscallSets::IsAllowedProcessStartO
+ #if defined(__i386__)
+     case __NR_waitpid:
+ #endif
++#if !defined(__GLIBC__)
++    case __NR_set_tid_address:
++#endif
+       return true;
+     case __NR_clone:  // Should be parameter-restricted.
+     case __NR_setns:  // Privileged.
+@@ -431,7 +434,9 @@ bool SyscallSets::IsAllowedProcessStartO
+ #if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
+     case __NR_set_thread_area:
+ #endif
++#if defined(__GLIBC__)
+     case __NR_set_tid_address:
++#endif
+     case __NR_unshare:
+ #if !defined(__mips__) && !defined(__aarch64__)
+     case __NR_vfork:
+@@ -545,6 +550,9 @@ bool SyscallSets::IsAllowedAddressSpaceA
+     case __NR_mlock:
+     case __NR_munlock:
+     case __NR_munmap:
++#if !defined(__GLIBC__)
++    case __NR_mremap:
++#endif
+       return true;
+     case __NR_madvise:
+     case __NR_mincore:
+@@ -562,7 +570,9 @@ bool SyscallSets::IsAllowedAddressSpaceA
+     case __NR_modify_ldt:
+ #endif
+     case __NR_mprotect:
++#if defined(__GLIBC__)
+     case __NR_mremap:
++#endif
+     case __NR_msync:
+     case __NR_munlockall:
+     case __NR_readahead:
+--- a/src/3rdparty/chromium/sandbox/policy/linux/bpf_renderer_policy_linux.cc
++++ b/src/3rdparty/chromium/sandbox/policy/linux/bpf_renderer_policy_linux.cc
+@@ -97,11 +97,18 @@ ResultExpr RendererProcessPolicy::Evalua
+     case __NR_sysinfo:
+     case __NR_times:
+     case __NR_uname:
++#if !defined(__GLIBC__)
++    case __NR_sched_getparam:
++    case __NR_sched_getscheduler:
++    case __NR_sched_setscheduler:
++#endif
+       return Allow();
+     case __NR_sched_getaffinity:
++#if defined(__GLIBC__)
+     case __NR_sched_getparam:
+     case __NR_sched_getscheduler:
+     case __NR_sched_setscheduler:
++#endif
+       return RestrictSchedTarget(GetPolicyPid(), sysno);
+     case __NR_prlimit64:
+       // See crbug.com/662450 and setrlimit comment above.
diff --git a/srcpkgs/qt6-webengine/patches/0206-chromium-musl-default-stacksize.patch b/srcpkgs/qt6-webengine/patches/0206-chromium-musl-default-stacksize.patch
new file mode 100644
index 000000000000..bc07495b8144
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0206-chromium-musl-default-stacksize.patch
@@ -0,0 +1,15 @@
+--- a/src/3rdparty/chromium/base/threading/platform_thread_linux.cc
++++ b/src/3rdparty/chromium/base/threading/platform_thread_linux.cc
+@@ -439,7 +439,12 @@ void TerminateOnThread() {}
+ 
+ size_t GetDefaultThreadStackSize(const pthread_attr_t& attributes) {
+ #if !defined(THREAD_SANITIZER)
++#if defined(__GLIBC__)
+   return 0;
++#else // defined(__GLIBC__)
++  // For Musl libc try with a default stack size of 2 MiB
++  return 2 * 1024 * 1024;
++#endif // !defined(__GLIBC__)
+ #else
+   // ThreadSanitizer bloats the stack heavily. Evidence has been that the
+   // default stack size isn't enough for some browser tests.
diff --git a/srcpkgs/qt6-webengine/patches/0208-chromium-musl-execinfo.patch b/srcpkgs/qt6-webengine/patches/0208-chromium-musl-execinfo.patch
new file mode 100644
index 000000000000..9f3b964676b3
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0208-chromium-musl-execinfo.patch
@@ -0,0 +1,125 @@
+--- a/src/3rdparty/chromium/base/debug/stack_trace.cc
++++ b/src/3rdparty/chromium/base/debug/stack_trace.cc
+@@ -252,7 +252,9 @@ void StackTrace::Print() const {
+ }
+ 
+ void StackTrace::OutputToStream(std::ostream* os) const {
++#if defined(__GLIBC__) && !defined(_AIX)
+   OutputToStreamWithPrefix(os, nullptr);
++#endif
+ }
+ 
+ std::string StackTrace::ToString() const {
+@@ -260,7 +262,7 @@ std::string StackTrace::ToString() const
+ }
+ std::string StackTrace::ToStringWithPrefix(const char* prefix_string) const {
+   std::stringstream stream;
+-#if !defined(__UCLIBC__) && !defined(_AIX)
++#if defined(__GLIBC__) && !defined(_AIX)
+   OutputToStreamWithPrefix(&stream, prefix_string);
+ #endif
+   return stream.str();
+--- a/src/3rdparty/chromium/base/debug/stack_trace_posix.cc
++++ b/src/3rdparty/chromium/base/debug/stack_trace_posix.cc
+@@ -27,7 +27,7 @@
+ #if !defined(USE_SYMBOLIZE)
+ #include <cxxabi.h>
+ #endif
+-#if !defined(__UCLIBC__) && !defined(_AIX)
++#if defined(__GLIBC__) && !defined(_AIX)
+ #include <execinfo.h>
+ #endif
+ 
+@@ -89,7 +89,7 @@ void DemangleSymbols(std::string* text)
+   // Note: code in this function is NOT async-signal safe (std::string uses
+   // malloc internally).
+ 
+-#if !defined(__UCLIBC__) && !defined(_AIX)
++#if defined(__GLIBC__) && !defined(_AIX)
+   std::string::size_type search_from = 0;
+   while (search_from < text->size()) {
+     // Look for the start of a mangled symbol, from search_from.
+@@ -124,7 +124,7 @@ void DemangleSymbols(std::string* text)
+       search_from = mangled_start + 2;
+     }
+   }
+-#endif  // !defined(__UCLIBC__) && !defined(_AIX)
++#endif  // !defined(__GLIBC__) && !defined(_AIX)
+ }
+ #endif  // !defined(USE_SYMBOLIZE)
+ 
+@@ -136,7 +136,7 @@ class BacktraceOutputHandler {
+   virtual ~BacktraceOutputHandler() = default;
+ };
+ 
+-#if !defined(__UCLIBC__) && !defined(_AIX)
++#if defined(__GLIBC__) && !defined(_AIX)
+ void OutputPointer(void* pointer, BacktraceOutputHandler* handler) {
+   // This should be more than enough to store a 64-bit number in hex:
+   // 16 hex digits + 1 for null-terminator.
+@@ -219,7 +219,7 @@ void ProcessBacktrace(void* const* trace
+   }
+ #endif  // defined(USE_SYMBOLIZE)
+ }
+-#endif  // !defined(__UCLIBC__) && !defined(_AIX)
++#endif  // !defined(__GLIBC__) && !defined(_AIX)
+ 
+ void PrintToStderr(const char* output) {
+   // NOTE: This code MUST be async-signal safe (it's used by in-process
+@@ -839,7 +839,7 @@ size_t CollectStackTrace(void** trace, s
+   // If we do not have unwind tables, then try tracing using frame pointers.
+   return base::debug::TraceStackFramePointers(const_cast<const void**>(trace),
+                                               count, 0);
+-#elif !defined(__UCLIBC__) && !defined(_AIX)
++#elif defined(__GLIBC__) && !defined(_AIX)
+   // Though the backtrace API man page does not list any possible negative
+   // return values, we take no chance.
+   return base::saturated_cast<size_t>(backtrace(trace, count));
+@@ -852,13 +852,13 @@ void StackTrace::PrintWithPrefix(const c
+ // NOTE: This code MUST be async-signal safe (it's used by in-process
+ // stack dumping signal handler). NO malloc or stdio is allowed here.
+ 
+-#if !defined(__UCLIBC__) && !defined(_AIX)
++#if defined(__GLIBC__) && !defined(_AIX)
+   PrintBacktraceOutputHandler handler;
+   ProcessBacktrace(trace_, count_, prefix_string, &handler);
+ #endif
+ }
+ 
+-#if !defined(__UCLIBC__) && !defined(_AIX)
++#if defined(__GLIBC__) && !defined(_AIX)
+ void StackTrace::OutputToStreamWithPrefix(std::ostream* os,
+                                           const char* prefix_string) const {
+   StreamBacktraceOutputHandler handler(os);
+--- a/src/3rdparty/chromium/base/logging.cc
++++ b/src/3rdparty/chromium/base/logging.cc
+@@ -582,7 +582,7 @@ LogMessage::LogMessage(const char* file,
+ 
+ LogMessage::~LogMessage() {
+   size_t stack_start = stream_.tellp();
+-#if !defined(OFFICIAL_BUILD) && !defined(OS_NACL) && !defined(__UCLIBC__) && \
++#if !defined(OFFICIAL_BUILD) && !defined(OS_NACL) && defined(__GLIBC__) && \
+     !defined(OS_AIX)
+   if (severity_ == LOGGING_FATAL && !base::debug::BeingDebugged()) {
+     // Include a stack trace on a fatal, unless a debugger is attached.
+--- 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 @@
+ 
+ #if defined(DEBUG) && defined(V8_OS_LINUX) && !defined(V8_OS_ANDROID)
+ #define SYMBOLIZE_FUNCTION
++#if defined(__GLIBC__)
+ #include <execinfo.h>
++#endif
+ 
+ #include <vector>
+ 
+@@ -103,7 +105,7 @@ void ExternalReferenceTable::Init(Isolat
+ }
+ 
+ const char* ExternalReferenceTable::ResolveSymbol(void* address) {
+-#ifdef SYMBOLIZE_FUNCTION
++#if defined(SYMBOLIZE_FUNCTION) && defined(__GLIBC__)
+   char** names = backtrace_symbols(&address, 1);
+   const char* name = names[0];
+   // The array of names is malloc'ed. However, each name string is static
diff --git a/srcpkgs/qt6-webengine/patches/0209-chromium-musl-thread-stacksize.patch b/srcpkgs/qt6-webengine/patches/0209-chromium-musl-thread-stacksize.patch
new file mode 100644
index 000000000000..4b760a428b25
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0209-chromium-musl-thread-stacksize.patch
@@ -0,0 +1,22 @@
+--- a/src/3rdparty/chromium/ppapi/utility/threading/simple_thread.cc
++++ b/src/3rdparty/chromium/ppapi/utility/threading/simple_thread.cc
+@@ -13,7 +13,7 @@ namespace pp {
+ namespace {
+ 
+ // Use 2MB default stack size for Native Client, otherwise use system default.
+-#if defined(__native_client__)
++#if defined(__native_client__) || !defined(__GLIBC__)
+ const size_t kDefaultStackSize = 2 * 1024 * 1024;
+ #else
+ const size_t kDefaultStackSize = 0;
+--- a/src/3rdparty/chromium/v8/src/base/platform/platform-posix.cc
++++ b/src/3rdparty/chromium/v8/src/base/platform/platform-posix.cc
+@@ -883,7 +883,7 @@ bool Thread::Start() {
+ #if V8_OS_MACOSX
+     // Default on Mac OS X is 512kB -- bump up to 1MB
+     stack_size = 1 * 1024 * 1024;
+-#elif V8_OS_AIX
++#elif V8_OS_AIX || !defined(__GLIBC__)
+     // Default on AIX is 96kB -- bump up to 2MB
+     stack_size = 2 * 1024 * 1024;
+ #endif
diff --git a/srcpkgs/qt6-webengine/patches/0210-chromium-musl-msgvec-push_back.patch b/srcpkgs/qt6-webengine/patches/0210-chromium-musl-msgvec-push_back.patch
new file mode 100644
index 000000000000..905daa223700
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0210-chromium-musl-msgvec-push_back.patch
@@ -0,0 +1,14 @@
+--- a/src/3rdparty/chromium/net/socket/udp_socket_posix.cc
++++ b/src/3rdparty/chromium/net/socket/udp_socket_posix.cc
+@@ -1162,7 +1162,11 @@ SendResult UDPSocketPosixSender::Interna
+     msg_iov->push_back({const_cast<char*>(buffer->data()), buffer->length()});
+   msgvec->reserve(buffers.size());
+   for (size_t j = 0; j < buffers.size(); j++)
++#if defined(__GLIBC__)
+     msgvec->push_back({{nullptr, 0, &msg_iov[j], 1, nullptr, 0, 0}, 0});
++#else
++    msgvec->push_back({{nullptr, 0, &msg_iov[j], 1, 0, 0, 0}, 0});
++#endif
+   int result = HANDLE_EINTR(Sendmmsg(fd, &msgvec[0], buffers.size(), 0));
+   SendResult send_result(0, 0, std::move(buffers));
+   if (result < 0) {
diff --git a/srcpkgs/qt6-webengine/patches/0211-chromium-musl-canonicalize-file-name-musl.patch b/srcpkgs/qt6-webengine/patches/0211-chromium-musl-canonicalize-file-name-musl.patch
new file mode 100644
index 000000000000..d43e6bd488bc
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0211-chromium-musl-canonicalize-file-name-musl.patch
@@ -0,0 +1,11 @@
+--- a/src/3rdparty/chromium/third_party/nasm/nasmlib/realpath.c
++++ b/src/3rdparty/chromium/third_party/nasm/nasmlib/realpath.c
+@@ -55,7 +55,7 @@
+  */
+ char *nasm_realpath(const char *rel_path)
+ {
+-    char *rp = canonicalize_file_name(rel_path);
++    char *rp = realpath(rel_path, NULL);
+     return rp ? rp : nasm_strdup(rel_path);
+ }
+ 
diff --git a/srcpkgs/qt6-webengine/patches/0212-chromium-musl-no-getcontext.patch b/srcpkgs/qt6-webengine/patches/0212-chromium-musl-no-getcontext.patch
new file mode 100644
index 000000000000..5755f1b45a7d
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0212-chromium-musl-no-getcontext.patch
@@ -0,0 +1,29 @@
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc
+@@ -489,8 +489,10 @@ bool ExceptionHandler::SimulateSignalDel
+   // ExceptionHandler::HandleSignal().
+   siginfo.si_code = SI_USER;
+   siginfo.si_pid = getpid();
+-  ucontext_t context;
++  ucontext_t context = { 0 };
++#if defined(__GLIBC__)
+   getcontext(&context);
++#endif
+   return HandleSignal(sig, &siginfo, &context);
+ }
+ 
+@@ -675,9 +677,14 @@ bool ExceptionHandler::WriteMinidump() {
+   sys_prctl(PR_SET_DUMPABLE, 1, 0, 0, 0);
+ 
+   CrashContext context;
++
++#if defined(__GLIBC__)
+   int getcontext_result = getcontext(&context.context);
+   if (getcontext_result)
+     return false;
++#else
++  return false;
++#endif
+ 
+ #if defined(__i386__)
+   // In CPUFillFromUContext in minidumpwriter.cc the stack pointer is retrieved
diff --git a/srcpkgs/qt6-webengine/patches/0213-chromium-musl-crashpad.patch b/srcpkgs/qt6-webengine/patches/0213-chromium-musl-crashpad.patch
new file mode 100644
index 000000000000..71bbad2af17e
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0213-chromium-musl-crashpad.patch
@@ -0,0 +1,24 @@
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/compat/linux/sys/ptrace.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/compat/linux/sys/ptrace.h
+@@ -17,7 +17,9 @@
+ 
+ #include_next <sys/ptrace.h>
+ 
++#ifdef __GLIBC__
+ #include <sys/cdefs.h>
++#endif
+ 
+ // https://sourceware.org/bugzilla/show_bug.cgi?id=22433
+ #if !defined(PTRACE_GET_THREAD_AREA) && !defined(PT_GET_THREAD_AREA) && \
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/util/linux/ptracer.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/util/linux/ptracer.cc
+@@ -26,6 +26,9 @@
+ 
+ #if defined(ARCH_CPU_X86_FAMILY)
+ #include <asm/ldt.h>
++#if !defined(__GLIBC__)
++#include <asm/ptrace-abi.h>
++#endif
+ #endif
+ 
+ namespace crashpad {
diff --git a/srcpkgs/qt6-webengine/patches/0214-chromium-musl-fixes.patch b/srcpkgs/qt6-webengine/patches/0214-chromium-musl-fixes.patch
new file mode 100644
index 000000000000..55b267ed1714
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0214-chromium-musl-fixes.patch
@@ -0,0 +1,108 @@
+--- a/src/3rdparty/chromium/sandbox/linux/suid/process_util.h
++++ b/src/3rdparty/chromium/sandbox/linux/suid/process_util.h
+@@ -12,6 +12,15 @@
+ #include <stdint.h>
+ #include <sys/types.h>
+ 
++#if !defined(__GLIBC__) && !defined(TEMP_FAILURE_RETRY)
++# define TEMP_FAILURE_RETRY(expression) \
++	(__extension__			\
++	 ({ long int __result;		\
++	  do __result = (long int) (expression); \
++	  while (__result == -1L && errno == EINTR); \
++	  __result; }))
++#endif
++
+ // This adjusts /proc/process/oom_score_adj so the Linux OOM killer
+ // will prefer certain process types over others. The range for the
+ // adjustment is [-1000, 1000], with [0, 1000] being user accessible.
+--- a/src/3rdparty/chromium/services/device/serial/serial_io_handler_posix.cc
++++ b/src/3rdparty/chromium/services/device/serial/serial_io_handler_posix.cc
+@@ -6,6 +6,7 @@
+ 
+ #include <sys/ioctl.h>
+ #include <termios.h>
++#include <asm-generic/ioctls.h>
+ 
+ #include <algorithm>
+ #include <utility>
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h
+@@ -38,6 +38,10 @@
+ #include "common/memory_allocator.h"
+ #include "google_breakpad/common/minidump_format.h"
+ 
++#ifndef __GLIBC__
++#define _libc_fpstate _fpstate
++#endif
++
+ namespace google_breakpad {
+ 
+ // Wraps platform-dependent implementations of accessors to ucontext_t structs.
+--- a/src/3rdparty/chromium/third_party/ffmpeg/libavutil/cpu.c
++++ b/src/3rdparty/chromium/third_party/ffmpeg/libavutil/cpu.c
+@@ -41,8 +41,10 @@
+ #include <sys/param.h>
+ #endif
+ #include <sys/types.h>
++#ifdef __GLIBC__
+ #include <sys/sysctl.h>
+ #endif
++#endif
+ #if HAVE_UNISTD_H
+ #include <unistd.h>
+ #endif
+--- a/src/3rdparty/chromium/third_party/perfetto/include/perfetto/ext/base/thread_utils.h
++++ b/src/3rdparty/chromium/third_party/perfetto/include/perfetto/ext/base/thread_utils.h
+@@ -29,9 +29,7 @@
+ #include <algorithm>
+ #endif
+ 
+-#if PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID)
+ #include <sys/prctl.h>
+-#endif
+ 
+ // Internal implementation utils that aren't as widely useful/supported as
+ // base/thread_utils.h.
+@@ -58,7 +56,7 @@ inline bool MaybeSetThreadName(const std
+ 
+ inline bool GetThreadName(std::string& out_result) {
+   char buf[16] = {};
+-#if PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID)
++#if !defined(__GLIBC__)
+   if (prctl(PR_GET_NAME, buf) != 0)
+     return false;
+ #else
+--- a/src/3rdparty/chromium/third_party/lss/linux_syscall_support.h
++++ b/src/3rdparty/chromium/third_party/lss/linux_syscall_support.h
+@@ -1300,6 +1300,18 @@ struct kernel_statfs {
+ #ifndef __NR_fallocate
+ #define __NR_fallocate          285
+ #endif
++
++#if !defined(__GLIBC__)
++#ifdef __NR_pread
++#undef __NR_pread
++#endif
++#ifdef __NR_pwrite
++#undef __NR_pwrite
++#endif
++#define __NR_pread __NR_pread64
++#define __NR_pwrite __NR_pwrite64
++#endif /* !defined(__GLIBC__) */
++
+ #ifndef __NR_getrandom
+ #define __NR_getrandom          318
+ #endif
+--- a/src/3rdparty/chromium/net/dns/dns_config_service_posix.cc
++++ b/src/3rdparty/chromium/net/dns/dns_config_service_posix.cc
+@@ -93,7 +93,8 @@ absl::optional<DnsConfig> ReadDnsConfig(
+ 
+   absl::optional<DnsConfig> dns_config;
+ // TODO(fuchsia): Use res_ninit() when it's implemented on Fuchsia.
+-#if defined(OS_OPENBSD) || defined(OS_FUCHSIA)
++#if defined(OS_OPENBSD) || defined(OS_FUCHSIA) || \
++  (defined(OS_LINUX) && !defined(__GLIBC__))
+   // Note: res_ninit in glibc always returns 0 and sets RES_INIT.
+   // res_init behaves the same way.
+   memset(&_res, 0, sizeof(_res));
diff --git a/srcpkgs/qt6-webengine/patches/0215-chromium-musl-cdefs.patch b/srcpkgs/qt6-webengine/patches/0215-chromium-musl-cdefs.patch
new file mode 100644
index 000000000000..9d1daec29118
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0215-chromium-musl-cdefs.patch
@@ -0,0 +1,29 @@
+--- a/src/3rdparty/chromium/third_party/libsync/src/include/sync/sync.h
++++ b/src/3rdparty/chromium/third_party/libsync/src/include/sync/sync.h
+@@ -19,12 +19,13 @@
+ #ifndef __SYS_CORE_SYNC_H
+ #define __SYS_CORE_SYNC_H
+ 
+-#include <sys/cdefs.h>
+ #include <stdint.h>
+ 
+ #include <linux/types.h>
+ 
+-__BEGIN_DECLS
++#ifdef __cplusplus
++extern "C" {
++#endif
+ 
+ struct sync_legacy_merge_data {
+  int32_t fd2;
+@@ -158,6 +159,9 @@ struct sync_pt_info *sync_pt_info(struct
+                                   struct sync_pt_info *itr);
+ void sync_fence_info_free(struct sync_fence_info_data *info);
+ 
+-__END_DECLS
++#ifdef __cplusplus
++}
++#endif
++
+ 
+ #endif /* __SYS_CORE_SYNC_H */
diff --git a/srcpkgs/qt6-webengine/patches/0216-chromium-musl-stat.patch b/srcpkgs/qt6-webengine/patches/0216-chromium-musl-stat.patch
new file mode 100644
index 000000000000..4509a6957cd7
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0216-chromium-musl-stat.patch
@@ -0,0 +1,12 @@
+--- a/src/3rdparty/chromium/base/files/file.h
++++ b/src/3rdparty/chromium/base/files/file.h
+@@ -19,7 +19,8 @@
+ #include "build/build_config.h"
+ 
+ #if defined(OS_BSD) || defined(OS_APPLE) || defined(OS_NACL) || \
+-    defined(OS_FUCHSIA) || (defined(OS_ANDROID) && __ANDROID_API__ < 21)
++    defined(OS_FUCHSIA) || (defined(OS_ANDROID) && __ANDROID_API__ < 21) || \
++    (defined(OS_LINUX) && !defined(__GLIBC__))
+ struct stat;
+ namespace base {
+ typedef struct stat stat_wrapper_t;
diff --git a/srcpkgs/qt6-webengine/patches/0217-chromium-musl-resolver.patch b/srcpkgs/qt6-webengine/patches/0217-chromium-musl-resolver.patch
new file mode 100644
index 000000000000..c3d7afad9b19
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0217-chromium-musl-resolver.patch
@@ -0,0 +1,77 @@
+--- a/src/3rdparty/chromium/net/dns/dns_config_service_linux.cc
++++ b/src/3rdparty/chromium/net/dns/dns_config_service_linux.cc
+@@ -432,11 +432,13 @@ class DnsConfigServiceLinux::ConfigReade
+     base::ScopedBlockingCall scoped_blocking_call(
+         FROM_HERE, base::BlockingType::MAY_BLOCK);
+ 
++#if defined(__GLIBC__)
+     std::unique_ptr<struct __res_state> res = resolv_reader_->GetResState();
+     if (res) {
+       dns_config_ = ConvertResStateToDnsConfig(*res.get());
+       resolv_reader_->CloseResState(res.get());
+     }
++#endif
+ 
+     UMA_HISTOGRAM_BOOLEAN("Net.DNS.DnsConfig.Resolv.Read",
+                           dns_config_.has_value());
+@@ -486,6 +488,7 @@ class DnsConfigServiceLinux::ConfigReade
+ 
+ std::unique_ptr<struct __res_state>
+ DnsConfigServiceLinux::ResolvReader::GetResState() {
++#if defined(__GLIBC__)
+   auto res = std::make_unique<struct __res_state>();
+   memset(res.get(), 0, sizeof(struct __res_state));
+ 
+@@ -495,11 +498,16 @@ DnsConfigServiceLinux::ResolvReader::Get
+   }
+ 
+   return res;
++#else
++  return nullptr;
++#endif
+ }
+ 
+ void DnsConfigServiceLinux::ResolvReader::CloseResState(
+     struct __res_state* res) {
++#if defined(__GLIBC__)
+   res_nclose(res);
++#endif
+ }
+ 
+ DnsConfigServiceLinux::DnsConfigServiceLinux()
+--- a/src/3rdparty/chromium/net/dns/dns_reloader.cc
++++ b/src/3rdparty/chromium/net/dns/dns_reloader.cc
+@@ -4,8 +4,7 @@
+ 
+ #include "net/dns/dns_reloader.h"
+ 
+-#if defined(OS_POSIX) && !defined(OS_APPLE) && !defined(OS_OPENBSD) && \
+-    !defined(OS_ANDROID) && !defined(OS_FUCHSIA)
++#ifdef __GLIBC__
+ 
+ #include <resolv.h>
+ 
+--- a/src/3rdparty/chromium/net/dns/host_resolver_manager.cc
++++ b/src/3rdparty/chromium/net/dns/host_resolver_manager.cc
+@@ -2720,8 +2720,7 @@ HostResolverManager::HostResolverManager
+   NetworkChangeNotifier::AddConnectionTypeObserver(this);
+   if (system_dns_config_notifier_)
+     system_dns_config_notifier_->AddObserver(this);
+-#if defined(OS_POSIX) && !defined(OS_APPLE) && !defined(OS_OPENBSD) && \
+-    !defined(OS_ANDROID)
++#ifdef __GLIBC__
+   EnsureDnsReloaderInit();
+ #endif
+ 
+--- a/src/3rdparty/chromium/net/dns/host_resolver_proc.cc
++++ b/src/3rdparty/chromium/net/dns/host_resolver_proc.cc
+@@ -176,8 +176,7 @@ int SystemHostResolverCall(const std::st
+   base::ScopedBlockingCall scoped_blocking_call(FROM_HERE,
+                                                 base::BlockingType::WILL_BLOCK);
+ 
+-#if defined(OS_POSIX) && !defined(OS_APPLE) && !defined(OS_OPENBSD) && \
+-    !defined(OS_ANDROID) && !defined(OS_FUCHSIA)
++#ifdef __GLIBC__
+   DnsReloaderMaybeReload();
+ #endif
+   absl::optional<AddressInfo> ai;
diff --git a/srcpkgs/qt6-webengine/patches/0600-chromium-sndio.patch b/srcpkgs/qt6-webengine/patches/0600-chromium-sndio.patch
new file mode 100644
index 000000000000..0302874ffba4
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0600-chromium-sndio.patch
@@ -0,0 +1,876 @@
+--- a/src/3rdparty/chromium/media/BUILD.gn
++++ b/src/3rdparty/chromium/media/BUILD.gn
+@@ -72,6 +72,9 @@ config("media_config") {
+       defines += [ "DLOPEN_PULSEAUDIO" ]
+     }
+   }
++  if (use_sndio) {
++    defines += [ "USE_SNDIO" ]
++  }
+   if (use_cras) {
+     defines += [ "USE_CRAS" ]
+   }
+--- a/src/3rdparty/chromium/media/audio/BUILD.gn
++++ b/src/3rdparty/chromium/media/audio/BUILD.gn
+@@ -240,6 +240,17 @@ source_set("audio") {
+     sources += [ "linux/audio_manager_linux.cc" ]
+   }
+ 
++  if (use_sndio) {
++    libs += [ "sndio" ]
++    sources += [
++      "sndio/audio_manager_sndio.cc",
++      "sndio/sndio_input.cc",
++      "sndio/sndio_input.h",
++      "sndio/sndio_output.cc",
++      "sndio/sndio_output.h"
++    ]
++  }
++
+   if (use_alsa) {
+     libs += [ "asound" ]
+     sources += [
+--- a/src/3rdparty/chromium/media/audio/linux/audio_manager_linux.cc
++++ b/src/3rdparty/chromium/media/audio/linux/audio_manager_linux.cc
+@@ -25,6 +25,11 @@
+ #include "media/audio/pulse/audio_manager_pulse.h"
+ #include "media/audio/pulse/pulse_util.h"
+ #endif
++#if defined(USE_SNDIO)
++#include "media/audio/sndio/audio_manager_sndio.h"
++#include "media/audio/sndio/sndio_input.h"
++#include "media/audio/sndio/sndio_output.h"
++#endif
+ 
+ namespace media {
+ 
+@@ -32,7 +37,8 @@ enum LinuxAudioIO {
+   kPulse,
+   kAlsa,
+   kCras,
+-  kAudioIOMax = kCras  // Must always be equal to largest logged entry.
++  kSndio,
++  kAudioIOMax = kSndio // Must always be equal to largest logged entry.
+ };
+ 
+ std::unique_ptr<media::AudioManager> CreateAudioManager(
+@@ -45,6 +51,16 @@ std::unique_ptr<media::AudioManager> Cre
+                                               audio_log_factory);
+   }
+ 
++#if defined(USE_SNDIO)
++  struct sio_hdl *hdl = sio_open(SIO_DEVANY, SIO_PLAY, 0);
++  if (hdl != NULL) {
++    sio_close(hdl);
++    UMA_HISTOGRAM_ENUMERATION("Media.LinuxAudioIO", kSndio, kAudioIOMax + 1);
++    return std::make_unique<AudioManagerSndio>(std::move(audio_thread),
++                                                  audio_log_factory);
++  }
++#endif
++
+ #if defined(USE_CRAS)
+   if (base::CommandLine::ForCurrentProcess()->HasSwitch(switches::kUseCras)) {
+     UMA_HISTOGRAM_ENUMERATION("Media.LinuxAudioIO", kCras, kAudioIOMax + 1);
+--- /dev/null
++++ b/src/3rdparty/chromium/media/audio/sndio/audio_manager_sndio.cc
+@@ -0,0 +1,148 @@
++// Copyright (c) 2012 The Chromium Authors. All rights reserved.
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++#include "media/audio/sndio/audio_manager_sndio.h"
++
++#include "base/metrics/histogram_macros.h"
++#include "base/memory/ptr_util.h"
++#include "media/audio/audio_device_description.h"
++#include "media/audio/audio_output_dispatcher.h"
++#include "media/audio/sndio/sndio_input.h"
++#include "media/audio/sndio/sndio_output.h"
++#include "media/base/limits.h"
++#include "media/base/media_switches.h"
++
++namespace media {
++
++
++// Maximum number of output streams that can be open simultaneously.
++static const int kMaxOutputStreams = 4;
++
++// Default sample rate for input and output streams.
++static const int kDefaultSampleRate = 48000;
++
++void AddDefaultDevice(AudioDeviceNames* device_names) {
++  DCHECK(device_names->empty());
++  device_names->push_front(AudioDeviceName::CreateDefault());
++}
++
++bool AudioManagerSndio::HasAudioOutputDevices() {
++  return true;
++}
++
++bool AudioManagerSndio::HasAudioInputDevices() {
++  return true;
++}
++
++void AudioManagerSndio::GetAudioInputDeviceNames(
++    AudioDeviceNames* device_names) {
++  DCHECK(device_names->empty());
++  AddDefaultDevice(device_names);
++}
++
++void AudioManagerSndio::GetAudioOutputDeviceNames(
++    AudioDeviceNames* device_names) {
++  AddDefaultDevice(device_names);
++}
++
++const char* AudioManagerSndio::GetName() {
++  return "SNDIO";
++}
++
++AudioParameters AudioManagerSndio::GetInputStreamParameters(
++    const std::string& device_id) {
++  static const int kDefaultInputBufferSize = 1024;
++
++  int user_buffer_size = GetUserBufferSize();
++  int buffer_size = user_buffer_size ?
++      user_buffer_size : kDefaultInputBufferSize;
++
++  return AudioParameters(
++      AudioParameters::AUDIO_PCM_LOW_LATENCY, CHANNEL_LAYOUT_STEREO,
++      kDefaultSampleRate, buffer_size);
++}
++
++AudioManagerSndio::AudioManagerSndio(std::unique_ptr<AudioThread> audio_thread,
++                                         AudioLogFactory* audio_log_factory)
++    : AudioManagerBase(std::move(audio_thread),
++                       audio_log_factory) {
++  DLOG(WARNING) << "AudioManagerSndio";
++  SetMaxOutputStreamsAllowed(kMaxOutputStreams);
++}
++
++AudioManagerSndio::~AudioManagerSndio() {
++  Shutdown();
++}
++
++AudioOutputStream* AudioManagerSndio::MakeLinearOutputStream(
++    const AudioParameters& params,
++    const LogCallback& log_callback) {
++  DCHECK_EQ(AudioParameters::AUDIO_PCM_LINEAR, params.format());
++  return MakeOutputStream(params);
++}
++
++AudioOutputStream* AudioManagerSndio::MakeLowLatencyOutputStream(
++    const AudioParameters& params,
++    const std::string& device_id,
++    const LogCallback& log_callback) {
++  DLOG_IF(ERROR, !device_id.empty()) << "Not implemented!";
++  DCHECK_EQ(AudioParameters::AUDIO_PCM_LOW_LATENCY, params.format());
++  return MakeOutputStream(params);
++}
++
++AudioInputStream* AudioManagerSndio::MakeLinearInputStream(
++    const AudioParameters& params,
++    const std::string& device_id,
++    const LogCallback& log_callback) {
++  DCHECK_EQ(AudioParameters::AUDIO_PCM_LINEAR, params.format());
++  return MakeInputStream(params);
++}
++
++AudioInputStream* AudioManagerSndio::MakeLowLatencyInputStream(
++    const AudioParameters& params,
++    const std::string& device_id,
++    const LogCallback& log_callback) {
++  DCHECK_EQ(AudioParameters::AUDIO_PCM_LOW_LATENCY, params.format());
++  return MakeInputStream(params);
++}
++
++AudioParameters AudioManagerSndio::GetPreferredOutputStreamParameters(
++    const std::string& output_device_id,
++    const AudioParameters& input_params) {
++  // TODO(tommi): Support |output_device_id|.
++  DLOG_IF(ERROR, !output_device_id.empty()) << "Not implemented!";
++  static const int kDefaultOutputBufferSize = 2048;
++
++  ChannelLayout channel_layout = CHANNEL_LAYOUT_STEREO;
++  int sample_rate = kDefaultSampleRate;
++  int buffer_size = kDefaultOutputBufferSize;
++  if (input_params.IsValid()) {
++    sample_rate = input_params.sample_rate();
++    channel_layout = input_params.channel_layout();
++    buffer_size = std::min(buffer_size, input_params.frames_per_buffer());
++  }
++
++  int user_buffer_size = GetUserBufferSize();
++  if (user_buffer_size)
++    buffer_size = user_buffer_size;
++
++  return AudioParameters(
++      AudioParameters::AUDIO_PCM_LOW_LATENCY, channel_layout,
++      sample_rate, buffer_size);
++}
++
++AudioInputStream* AudioManagerSndio::MakeInputStream(
++    const AudioParameters& params) {
++  DLOG(WARNING) << "MakeInputStream";
++  return new SndioAudioInputStream(this,
++             AudioDeviceDescription::kDefaultDeviceId, params);
++}
++
++AudioOutputStream* AudioManagerSndio::MakeOutputStream(
++    const AudioParameters& params) {
++  DLOG(WARNING) << "MakeOutputStream";
++  return new SndioAudioOutputStream(params, this);
++}
++
++}  // namespace media
+--- /dev/null
++++ b/src/3rdparty/chromium/media/audio/sndio/audio_manager_sndio.h
+@@ -0,0 +1,65 @@
++// Copyright (c) 2012 The Chromium Authors. All rights reserved.
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++#ifndef MEDIA_AUDIO_SNDIO_AUDIO_MANAGER_SNDIO_H_
++#define MEDIA_AUDIO_SNDIO_AUDIO_MANAGER_SNDIO_H_
++
++#include <set>
++
++#include "base/compiler_specific.h"
++#include "base/macros.h"
++#include "base/memory/ref_counted.h"
++#include "base/threading/thread.h"
++#include "media/audio/audio_manager_base.h"
++
++namespace media {
++
++class MEDIA_EXPORT AudioManagerSndio : public AudioManagerBase {
++ public:
++  AudioManagerSndio(std::unique_ptr<AudioThread> audio_thread,
++                   AudioLogFactory* audio_log_factory);
++  ~AudioManagerSndio() override;
++
++  // Implementation of AudioManager.
++  bool HasAudioOutputDevices() override;
++  bool HasAudioInputDevices() override;
++  void GetAudioInputDeviceNames(AudioDeviceNames* device_names) override;
++  void GetAudioOutputDeviceNames(AudioDeviceNames* device_names) override;
++  AudioParameters GetInputStreamParameters(
++      const std::string& device_id) override;
++  const char* GetName() override;
++
++  // Implementation of AudioManagerBase.
++  AudioOutputStream* MakeLinearOutputStream(
++      const AudioParameters& params,
++      const LogCallback& log_callback) override;
++  AudioOutputStream* MakeLowLatencyOutputStream(
++      const AudioParameters& params,
++      const std::string& device_id,
++      const LogCallback& log_callback) override;
++  AudioInputStream* MakeLinearInputStream(
++      const AudioParameters& params,
++      const std::string& device_id,
++      const LogCallback& log_callback) override;
++  AudioInputStream* MakeLowLatencyInputStream(
++      const AudioParameters& params,
++      const std::string& device_id,
++      const LogCallback& log_callback) override;
++
++ protected:
++  AudioParameters GetPreferredOutputStreamParameters(
++      const std::string& output_device_id,
++      const AudioParameters& input_params) override;
++
++ private:
++  // Called by MakeLinearOutputStream and MakeLowLatencyOutputStream.
++  AudioOutputStream* MakeOutputStream(const AudioParameters& params);
++  AudioInputStream* MakeInputStream(const AudioParameters& params);
++
++  DISALLOW_COPY_AND_ASSIGN(AudioManagerSndio);
++};
++
++}  // namespace media
++
++#endif  // MEDIA_AUDIO_SNDIO_AUDIO_MANAGER_SNDIO_H_
+--- /dev/null
++++ b/src/3rdparty/chromium/media/audio/sndio/sndio_input.cc
+@@ -0,0 +1,200 @@
++// Copyright 2013 The Chromium Authors. All rights reserved.
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++#include "base/bind.h"
++#include "base/logging.h"
++#include "base/macros.h"
++#include "media/base/audio_timestamp_helper.h"
++#include "media/audio/sndio/audio_manager_sndio.h"
++#include "media/audio/audio_manager.h"
++#include "media/audio/sndio/sndio_input.h"
++
++namespace media {
++
++static const SampleFormat kSampleFormat = kSampleFormatS16;
++
++void SndioAudioInputStream::OnMoveCallback(void *arg, int delta)
++{
++  SndioAudioInputStream* self = static_cast<SndioAudioInputStream*>(arg);
++
++  self->hw_delay += delta;
++}
++
++void *SndioAudioInputStream::ThreadEntry(void *arg) {
++  SndioAudioInputStream* self = static_cast<SndioAudioInputStream*>(arg);
++
++  self->ThreadLoop();
++  return NULL;
++}
++
++SndioAudioInputStream::SndioAudioInputStream(AudioManagerBase* manager,
++                                             const std::string& device_name,
++                                             const AudioParameters& params)
++    : manager(manager),
++      params(params),
++      audio_bus(AudioBus::Create(params)),
++      state(kClosed) {
++}
++
++SndioAudioInputStream::~SndioAudioInputStream() {
++  if (state != kClosed)
++    Close();
++}
++
++bool SndioAudioInputStream::Open() {
++  struct sio_par par;
++  int sig;
++
++  if (state != kClosed)
++    return false;
++
++  if (params.format() != AudioParameters::AUDIO_PCM_LINEAR &&
++      params.format() != AudioParameters::AUDIO_PCM_LOW_LATENCY) {
++    LOG(WARNING) << "Unsupported audio format.";
++    return false;
++  }
++
++  sio_initpar(&par);
++  par.rate = params.sample_rate();
++  par.rchan = params.channels();
++  par.bits = SampleFormatToBitsPerChannel(kSampleFormat);
++  par.bps = par.bits / 8;
++  par.sig = sig = par.bits != 8 ? 1 : 0;
++  par.le = SIO_LE_NATIVE;
++  par.appbufsz = params.frames_per_buffer();
++
++  hdl = sio_open(SIO_DEVANY, SIO_REC, 0);
++
++  if (hdl == NULL) {
++    LOG(ERROR) << "Couldn't open audio device.";
++    return false;
++  }
++
++  if (!sio_setpar(hdl, &par) || !sio_getpar(hdl, &par)) {
++    LOG(ERROR) << "Couldn't set audio parameters.";
++    goto bad_close;
++  }
++
++  if (par.rate  != (unsigned int)params.sample_rate() ||
++      par.rchan != (unsigned int)params.channels() ||
++      par.bits  != (unsigned int)SampleFormatToBitsPerChannel(kSampleFormat) ||
++      par.sig   != (unsigned int)sig ||
++      (par.bps > 1 && par.le != SIO_LE_NATIVE) ||
++      (par.bits != par.bps * 8)) {
++    LOG(ERROR) << "Unsupported audio parameters.";
++    goto bad_close;
++  }
++  state = kStopped;
++  buffer = new char[audio_bus->frames() * params.GetBytesPerFrame(kSampleFormat)];
++  sio_onmove(hdl, &OnMoveCallback, this);
++  return true;
++bad_close:
++  sio_close(hdl);
++  return false;
++}
++
++void SndioAudioInputStream::Start(AudioInputCallback* cb) {
++
++  StartAgc();
++
++  state = kRunning;
++  hw_delay = 0;
++  callback = cb;
++  sio_start(hdl);
++  if (pthread_create(&thread, NULL, &ThreadEntry, this) != 0) {
++    LOG(ERROR) << "Failed to create real-time thread for recording.";
++    sio_stop(hdl);
++    state = kStopped;
++  }
++}
++
++void SndioAudioInputStream::Stop() {
++
++  if (state == kStopped)
++    return;
++
++  state = kStopWait;
++  pthread_join(thread, NULL);
++  sio_stop(hdl);
++  state = kStopped;
++
++  StopAgc();
++}
++
++void SndioAudioInputStream::Close() {
++
++  if (state == kClosed)
++    return;
++
++  if (state == kRunning)
++    Stop();
++
++  state = kClosed;
++  delete [] buffer;
++  sio_close(hdl);
++
++  manager->ReleaseInputStream(this);
++}
++
++double SndioAudioInputStream::GetMaxVolume() {
++  // Not supported
++  return 0.0;
++}
++
++void SndioAudioInputStream::SetVolume(double volume) {
++  // Not supported. Do nothing.
++}
++
++double SndioAudioInputStream::GetVolume() {
++  // Not supported.
++  return 0.0;
++}
++
++bool SndioAudioInputStream::IsMuted() {
++  // Not supported.
++  return false;
++}
++
++void SndioAudioInputStream::SetOutputDeviceForAec(
++    const std::string& output_device_id) {
++  // Not supported.
++}
++
++void SndioAudioInputStream::ThreadLoop(void) {
++  size_t todo, n;
++  char *data;
++  unsigned int nframes;
++  double normalized_volume = 0.0;
++
++  nframes = audio_bus->frames();
++
++  while (state == kRunning && !sio_eof(hdl)) {
++
++    GetAgcVolume(&normalized_volume);
++
++    // read one block
++    todo = nframes * params.GetBytesPerFrame(kSampleFormat);
++    data = buffer;
++    while (todo > 0) {
++      n = sio_read(hdl, data, todo);
++      if (n == 0)
++        return;	// unrecoverable I/O error
++      todo -= n;
++      data += n;
++    }
++    hw_delay -= nframes;
++
++    // convert frames count to TimeDelta
++    const base::TimeDelta delay = AudioTimestampHelper::FramesToTime(hw_delay,
++      params.sample_rate());
++
++    // push into bus
++    audio_bus->FromInterleaved<SignedInt16SampleTypeTraits>(reinterpret_cast<int16_t*>(buffer), nframes);
++
++    // invoke callback
++    callback->OnData(audio_bus.get(), base::TimeTicks::Now() - delay, 1.);
++  }
++}
++
++}  // namespace media
+--- /dev/null
++++ b/src/3rdparty/chromium/media/audio/sndio/sndio_input.h
+@@ -0,0 +1,91 @@
++// Copyright 2013 The Chromium Authors. All rights reserved.
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++#ifndef MEDIA_AUDIO_SNDIO_SNDIO_INPUT_H_
++#define MEDIA_AUDIO_SNDIO_SNDIO_INPUT_H_
++
++#include <stdint.h>
++#include <string>
++#include <sndio.h>
++
++#include "base/compiler_specific.h"
++#include "base/macros.h"
++#include "base/memory/weak_ptr.h"
++#include "base/time/time.h"
++#include "media/audio/agc_audio_stream.h"
++#include "media/audio/audio_io.h"
++#include "media/audio/audio_device_description.h"
++#include "media/base/audio_parameters.h"
++
++namespace media {
++
++class AudioManagerBase;
++
++// Implementation of AudioOutputStream using sndio(7)
++class SndioAudioInputStream : public AgcAudioStream<AudioInputStream> {
++ public:
++  // Pass this to the constructor if you want to attempt auto-selection
++  // of the audio recording device.
++  static const char kAutoSelectDevice[];
++
++  // Create a PCM Output stream for the SNDIO device identified by
++  // |device_name|. If unsure of what to use for |device_name|, use
++  // |kAutoSelectDevice|.
++  SndioAudioInputStream(AudioManagerBase* audio_manager,
++                     const std::string& device_name,
++                     const AudioParameters& params);
++
++  ~SndioAudioInputStream() override;
++
++  // Implementation of AudioInputStream.
++  bool Open() override;
++  void Start(AudioInputCallback* callback) override;
++  void Stop() override;
++  void Close() override;
++  double GetMaxVolume() override;
++  void SetVolume(double volume) override;
++  double GetVolume() override;
++  bool IsMuted() override;
++  void SetOutputDeviceForAec(const std::string& output_device_id) override;
++
++ private:
++
++  enum StreamState {
++    kClosed,            // Not opened yet
++    kStopped,           // Device opened, but not started yet
++    kRunning,           // Started, device playing
++    kStopWait           // Stopping, waiting for the real-time thread to exit
++  };
++
++  // C-style call-backs
++  static void OnMoveCallback(void *arg, int delta);
++  static void* ThreadEntry(void *arg);
++
++  // Continuously moves data from the device to the consumer
++  void ThreadLoop();
++  // Our creator, the audio manager needs to be notified when we close.
++  AudioManagerBase* manager;
++  // Parameters of the source
++  AudioParameters params;
++  // We store data here for consumer
++  std::unique_ptr<AudioBus> audio_bus;
++  // Call-back that consumes recorded data
++  AudioInputCallback* callback;  // Valid during a recording session.
++  // Handle of the audio device
++  struct sio_hdl* hdl;
++  // Current state of the stream
++  enum StreamState state;
++  // High priority thread running ThreadLoop()
++  pthread_t thread;
++  // Number of frames buffered in the hardware
++  int hw_delay;
++  // Temporary buffer where data is stored sndio-compatible format
++  char* buffer;
++
++  DISALLOW_COPY_AND_ASSIGN(SndioAudioInputStream);
++};
++
++}  // namespace media
++
++#endif  // MEDIA_AUDIO_SNDIO_SNDIO_INPUT_H_
+--- /dev/null
++++ b/src/3rdparty/chromium/media/audio/sndio/sndio_output.cc
+@@ -0,0 +1,183 @@
++// Copyright (c) 2012 The Chromium Authors. All rights reserved.
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++#include "base/logging.h"
++#include "base/time/time.h"
++#include "base/time/default_tick_clock.h"
++#include "media/audio/audio_manager_base.h"
++#include "media/base/audio_timestamp_helper.h"
++#include "media/audio/sndio/sndio_output.h"
++
++namespace media {
++
++static const SampleFormat kSampleFormat = kSampleFormatS16;
++
++void SndioAudioOutputStream::OnMoveCallback(void *arg, int delta) {
++  SndioAudioOutputStream* self = static_cast<SndioAudioOutputStream*>(arg);
++
++  self->hw_delay -= delta;
++}
++
++void SndioAudioOutputStream::OnVolCallback(void *arg, unsigned int vol) {
++  SndioAudioOutputStream* self = static_cast<SndioAudioOutputStream*>(arg);
++
++  self->vol = vol;
++}
++
++void *SndioAudioOutputStream::ThreadEntry(void *arg) {
++  SndioAudioOutputStream* self = static_cast<SndioAudioOutputStream*>(arg);
++
++  self->ThreadLoop();
++  return NULL;
++}
++
++SndioAudioOutputStream::SndioAudioOutputStream(const AudioParameters& params,
++                                               AudioManagerBase* manager)
++    : manager(manager),
++      params(params),
++      audio_bus(AudioBus::Create(params)),
++      state(kClosed),
++      mutex(PTHREAD_MUTEX_INITIALIZER) {
++}
++
++SndioAudioOutputStream::~SndioAudioOutputStream() {
++  if (state != kClosed)
++    Close();
++}
++
++bool SndioAudioOutputStream::Open() {
++  struct sio_par par;
++  int sig;
++
++  if (params.format() != AudioParameters::AUDIO_PCM_LINEAR &&
++      params.format() != AudioParameters::AUDIO_PCM_LOW_LATENCY) {
++    LOG(WARNING) << "Unsupported audio format.";
++    return false;
++  }
++  sio_initpar(&par);
++  par.rate = params.sample_rate();
++  par.pchan = params.channels();
++  par.bits = SampleFormatToBitsPerChannel(kSampleFormat);
++  par.bps = par.bits / 8;
++  par.sig = sig = par.bits != 8 ? 1 : 0;
++  par.le = SIO_LE_NATIVE;
++  par.appbufsz = params.frames_per_buffer();
++
++  hdl = sio_open(SIO_DEVANY, SIO_PLAY, 0);
++  if (hdl == NULL) {
++    LOG(ERROR) << "Couldn't open audio device.";
++    return false;
++  }
++  if (!sio_setpar(hdl, &par) || !sio_getpar(hdl, &par)) {
++    LOG(ERROR) << "Couldn't set audio parameters.";
++    goto bad_close;
++  }
++  if (par.rate  != (unsigned int)params.sample_rate() ||
++      par.pchan != (unsigned int)params.channels() ||
++      par.bits  != (unsigned int)SampleFormatToBitsPerChannel(kSampleFormat) ||
++      par.sig   != (unsigned int)sig ||
++      (par.bps > 1 && par.le != SIO_LE_NATIVE) ||
++      (par.bits != par.bps * 8)) {
++    LOG(ERROR) << "Unsupported audio parameters.";
++    goto bad_close;
++  }
++  state = kStopped;
++  volpending = 0;
++  vol = 0;
++  buffer = new char[audio_bus->frames() * params.GetBytesPerFrame(kSampleFormat)];
++  sio_onmove(hdl, &OnMoveCallback, this);
++  sio_onvol(hdl, &OnVolCallback, this);
++  return true;
++ bad_close:
++  sio_close(hdl);
++  return false;
++}
++
++void SndioAudioOutputStream::Close() {
++  if (state == kClosed)
++    return;
++  if (state == kRunning)
++    Stop();
++  state = kClosed;
++  delete [] buffer;
++  sio_close(hdl);
++  manager->ReleaseOutputStream(this);  // Calls the destructor
++}
++
++void SndioAudioOutputStream::Start(AudioSourceCallback* callback) {
++  state = kRunning;
++  hw_delay = 0;
++  source = callback;
++  sio_start(hdl);
++  if (pthread_create(&thread, NULL, &ThreadEntry, this) != 0) {
++    LOG(ERROR) << "Failed to create real-time thread.";
++    sio_stop(hdl);
++    state = kStopped;
++  }
++}
++
++void SndioAudioOutputStream::Stop() {
++  if (state == kStopped)
++    return;
++  state = kStopWait;
++  pthread_join(thread, NULL);
++  sio_stop(hdl);
++  state = kStopped;
++}
++
++void SndioAudioOutputStream::SetVolume(double v) {
++  pthread_mutex_lock(&mutex);
++  vol = v * SIO_MAXVOL;
++  volpending = 1;
++  pthread_mutex_unlock(&mutex);
++}
++
++void SndioAudioOutputStream::GetVolume(double* v) {
++  pthread_mutex_lock(&mutex);
++  *v = vol * (1. / SIO_MAXVOL);
++  pthread_mutex_unlock(&mutex);
++}
++
++// This stream is always used with sub second buffer sizes, where it's
++// sufficient to simply always flush upon Start().
++void SndioAudioOutputStream::Flush() {}
++
++void SndioAudioOutputStream::ThreadLoop(void) {
++  int avail, count, result;
++
++  while (state == kRunning) {
++    // Update volume if needed
++    pthread_mutex_lock(&mutex);
++    if (volpending) {
++      volpending = 0;
++      sio_setvol(hdl, vol);
++    }
++    pthread_mutex_unlock(&mutex);
++
++    // Get data to play
++    const base::TimeDelta delay = AudioTimestampHelper::FramesToTime(hw_delay,
++	params.sample_rate());
++    count = source->OnMoreData(delay, base::TimeTicks::Now(), 0, audio_bus.get());
++    audio_bus->ToInterleaved<SignedInt16SampleTypeTraits>(count, reinterpret_cast<int16_t*>(buffer));
++    if (count == 0) {
++      // We have to submit something to the device
++      count = audio_bus->frames();
++      memset(buffer, 0, count * params.GetBytesPerFrame(kSampleFormat));
++      LOG(WARNING) << "No data to play, running empty cycle.";
++    }
++
++    // Submit data to the device
++    avail = count * params.GetBytesPerFrame(kSampleFormat);
++    result = sio_write(hdl, buffer, avail);
++    if (result == 0) {
++      LOG(WARNING) << "Audio device disconnected.";
++      break;
++    }
++
++    // Update hardware pointer
++    hw_delay += count;
++  }
++}
++
++}  // namespace media
+--- /dev/null
++++ b/src/3rdparty/chromium/media/audio/sndio/sndio_output.h
+@@ -0,0 +1,86 @@
++// Copyright (c) 2012 The Chromium Authors. All rights reserved.
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++#ifndef MEDIA_AUDIO_SNDIO_SNDIO_OUTPUT_H_
++#define MEDIA_AUDIO_SNDIO_SNDIO_OUTPUT_H_
++
++#include <pthread.h>
++#include <sndio.h>
++
++#include "base/time/tick_clock.h"
++#include "base/time/time.h"
++#include "media/audio/audio_io.h"
++
++namespace media {
++
++class AudioManagerBase;
++
++// Implementation of AudioOutputStream using sndio(7)
++class SndioAudioOutputStream : public AudioOutputStream {
++ public:
++  // The manager is creating this object
++  SndioAudioOutputStream(const AudioParameters& params,
++                         AudioManagerBase* manager);
++  virtual ~SndioAudioOutputStream();
++
++  // Implementation of AudioOutputStream.
++  bool Open() override;
++  void Close() override;
++  void Start(AudioSourceCallback* callback) override;
++  void Stop() override;
++  void SetVolume(double volume) override;
++  void GetVolume(double* volume) override;
++  void Flush() override;
++
++  friend void sndio_onmove(void *arg, int delta);
++  friend void sndio_onvol(void *arg, unsigned int vol);
++  friend void *sndio_threadstart(void *arg);
++
++ private:
++  enum StreamState {
++    kClosed,            // Not opened yet
++    kStopped,           // Device opened, but not started yet
++    kRunning,           // Started, device playing
++    kStopWait           // Stopping, waiting for the real-time thread to exit
++  };
++
++  // C-style call-backs
++  static void OnMoveCallback(void *arg, int delta);
++  static void OnVolCallback(void *arg, unsigned int vol);
++  static void* ThreadEntry(void *arg);
++
++  // Continuously moves data from the producer to the device
++  void ThreadLoop(void);
++
++  // Our creator, the audio manager needs to be notified when we close.
++  AudioManagerBase* manager;
++  // Parameters of the source
++  AudioParameters params;
++  // Source stores data here
++  std::unique_ptr<AudioBus> audio_bus;
++  // Call-back that produces data to play
++  AudioSourceCallback* source;
++  // Handle of the audio device
++  struct sio_hdl* hdl;
++  // Current state of the stream
++  enum StreamState state;
++  // High priority thread running ThreadLoop()
++  pthread_t thread;
++  // Protects vol, volpending and hw_delay
++  pthread_mutex_t mutex;
++  // Current volume in the 0..SIO_MAXVOL range
++  int vol;
++  // Set to 1 if volumes must be refreshed in the realtime thread
++  int volpending;
++  // Number of frames buffered in the hardware
++  int hw_delay;
++  // Temporary buffer where data is stored sndio-compatible format
++  char* buffer;
++
++  DISALLOW_COPY_AND_ASSIGN(SndioAudioOutputStream);
++};
++
++}  // namespace media
++
++#endif  // MEDIA_AUDIO_SNDIO_SNDIO_OUTPUT_H_
+--- a/src/3rdparty/chromium/media/media_options.gni
++++ b/src/3rdparty/chromium/media/media_options.gni
+@@ -121,6 +121,9 @@ declare_args() {
+   # Enables runtime selection of ALSA library for audio.
+   use_alsa = false
+ 
++  # Enable runtime selection of sndio(7)
++  use_sndio = false
++
+   # Alsa should be used on non-Android, non-Mac POSIX systems.
+   # Alsa should be used on desktop Chromecast and audio-only Chromecast builds.
+   if (is_posix && !is_android && !is_mac &&
diff --git a/srcpkgs/qt6-webengine/patches/0700-armv7l-neon.patch b/srcpkgs/qt6-webengine/patches/0700-armv7l-neon.patch
new file mode 100644
index 000000000000..d42fa19a07a1
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0700-armv7l-neon.patch
@@ -0,0 +1,10 @@
+--- a/src/3rdparty/chromium/skia/BUILD.gn
++++ b/src/3rdparty/chromium/skia/BUILD.gn
+@@ -800,7 +800,6 @@ skia_source_set("skia_opts") {
+         # Root build config sets -mfpu=$arm_fpu, which we expect to be neon
+         # when running this.
+         if (!arm_use_neon) {
+-          configs -= [ "//build/config/compiler:compiler_arm_fpu" ]
+           cflags += [ "-mfpu=neon" ]
+         }
+       }
diff --git a/srcpkgs/qt6-webengine/patches/0750-chromium-musl-cross-no-asm_ptrace_h.patch b/srcpkgs/qt6-webengine/patches/0750-chromium-musl-cross-no-asm_ptrace_h.patch
new file mode 100644
index 000000000000..3cf132908af4
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0750-chromium-musl-cross-no-asm_ptrace_h.patch
@@ -0,0 +1,30 @@
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper.cc
+@@ -38,7 +38,12 @@
+ 
+ #include "client/linux/minidump_writer/linux_ptrace_dumper.h"
+ 
++#if defined(__GLIBC__)
+ #include <asm/ptrace.h>
++#else
++/* For arm*-musl this definition is missing */
++#define ARM_sp uregs[13]
++#endif
+ #include <assert.h>
+ #include <errno.h>
+ #include <fcntl.h>
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_core_dumper.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_core_dumper.cc
+@@ -32,7 +32,12 @@
+ 
+ #include "client/linux/minidump_writer/linux_core_dumper.h"
+ 
++#if defined(__GLIBC__)
+ #include <asm/ptrace.h>
++#else
++/* For arm*-musl this definition is missing */
++#define ARM_sp uregs[13]
++#endif
+ #include <assert.h>
+ #include <elf.h>
+ #include <stdio.h>
diff --git a/srcpkgs/qt6-webengine/patches/0751-chromium-musl-arm-user_vfp.patch b/srcpkgs/qt6-webengine/patches/0751-chromium-musl-arm-user_vfp.patch
new file mode 100644
index 000000000000..6e2d62f35ee6
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0751-chromium-musl-arm-user_vfp.patch
@@ -0,0 +1,20 @@
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/util/linux/thread_info.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/util/linux/thread_info.h
+@@ -17,6 +17,17 @@
+ 
+ #include <stdint.h>
+ #include <sys/user.h>
++#if !defined(__GLIBC__)
++struct user_vfp {
++	unsigned long long fpregs[32];
++	unsigned long fpscr;
++};
++struct user_vfp_exc {
++	unsigned long fpexc;
++	unsigned long fpinst;
++	unsigned long fpinst2;
++};
++#endif /* !defined(__GLIBC__) */
+ 
+ #include <type_traits>
+ 
diff --git a/srcpkgs/qt6-webengine/patches/0752-chromium-musl-arm-elf_auxv_t.patch b/srcpkgs/qt6-webengine/patches/0752-chromium-musl-arm-elf_auxv_t.patch
new file mode 100644
index 000000000000..7112c8cfd3fa
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0752-chromium-musl-arm-elf_auxv_t.patch
@@ -0,0 +1,18 @@
+--- a/src/3rdparty/chromium/v8/src/base/cpu.cc
++++ b/src/3rdparty/chromium/v8/src/base/cpu.cc
+@@ -163,6 +163,15 @@ static V8_INLINE void __cpuid(int cpu_in
+ 
+ #if V8_HOST_ARCH_ARM || V8_HOST_ARCH_ARM64
+ 
++#ifndef __GLIBC__
++#include <elf.h>
++#ifdef __LP64__
++typedef Elf64_auxv_t elf_auxv_t;
++#else
++typedef Elf32_auxv_t elf_auxv_t;
++#endif
++#endif
++
+ static uint32_t ReadELFHWCaps() {
+   uint32_t result = 0;
+ #if V8_GLIBC_PREREQ(2, 16)
diff --git a/srcpkgs/qt6-webengine/patches/0801-chromium-i686-vaapi-fpermissive.patch b/srcpkgs/qt6-webengine/patches/0801-chromium-i686-vaapi-fpermissive.patch
new file mode 100644
index 000000000000..3d4043e03b89
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0801-chromium-i686-vaapi-fpermissive.patch
@@ -0,0 +1,24 @@
+--- a/src/3rdparty/chromium/media/gpu/vaapi/BUILD.gn
++++ b/src/3rdparty/chromium/media/gpu/vaapi/BUILD.gn
+@@ -14,6 +14,10 @@ import("//ui/gl/features.gni")
+ assert(is_linux || is_chromeos)
+ assert(use_vaapi)
+ 
++config("vaapi_permissive") {
++  cflags = [ "-fpermissive" ]
++}
++
+ generate_stubs("libva_stubs") {
+   extra_header = "va_stub_header.fragment"
+   sigs = [ "va.sigs" ]
+@@ -136,6 +140,10 @@ source_set("vaapi") {
+     ]
+   }
+ 
++  if (target_cpu == "x86") {
++    configs += [ ":vaapi_permissive" ]
++  }
++
+   if (use_x11) {
+     deps += [ "//ui/gfx/x" ]
+     sources += [
diff --git a/srcpkgs/qt6-webengine/patches/0900-xxx-ppc64le-libvpx.patch b/srcpkgs/qt6-webengine/patches/0900-xxx-ppc64le-libvpx.patch
new file mode 100644
index 000000000000..5c9566b56bd4
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0900-xxx-ppc64le-libvpx.patch
@@ -0,0 +1,65 @@
+Uses generic target for now. To use ppc64le, change --target to ppc64le-gnu
+and add --enable-vsx, and change generic to ppc for the rtcd header.
+
+From 18e6c5c55cfae0cfb458d8210d7bc709360a0e90 Mon Sep 17 00:00:00 2001
+From: q66 <daniel@octaforge.org>
+Date: Wed, 9 Sep 2020 19:08:25 +0200
+Subject: [PATCH] enable generation of ppc64 libvpx bits
+
+this doesn't update the gni file, that's done from
+the template by running the appropriate scripts
+---
+ third_party/libvpx/BUILD.gn        | 4 ++++
+ third_party/libvpx/generate_gni.sh | 9 +++++++++
+ 2 files changed, 13 insertions(+)
+
+--- a/src/3rdparty/chromium/third_party/libvpx/BUILD.gn
++++ b/src/3rdparty/chromium/third_party/libvpx/BUILD.gn
+@@ -424,6 +424,8 @@ static_library("bundled_libvpx") {
+       sources = libvpx_srcs_arm64
+       public_deps = [ ":libvpx_arm64_headers" ]
+     }
++  } else if (current_cpu == "ppc64") {
++    sources = libvpx_srcs_ppc64
+   }
+ 
+   configs -= [ "//build/config/compiler:chromium_code" ]
+--- a/src/3rdparty/chromium/third_party/libvpx/generate_gni.sh
++++ b/src/3rdparty/chromium/third_party/libvpx/generate_gni.sh
+@@ -374,6 +374,7 @@ gen_config_files linux/arm-neon-highbd "
+ gen_config_files linux/arm64-highbd "--target=armv8-linux-gcc ${all_platforms} ${HIGHBD}"
+ gen_config_files linux/mipsel "--target=mips32-linux-gcc ${all_platforms}"
+ gen_config_files linux/mips64el "--target=mips64-linux-gcc ${all_platforms}"
++gen_config_files linux/ppc64 "--target=generic-gnu $HIGHBD ${all_platforms}"
+ gen_config_files linux/generic "--target=generic-gnu $HIGHBD ${all_platforms}"
+ gen_config_files win/arm64 "--target=arm64-win64-vs15 ${all_platforms} ${HIGHBD}"
+ gen_config_files win/ia32 "--target=x86-win32-vs14 ${all_platforms} ${x86_platforms}"
+@@ -399,6 +400,7 @@ lint_config linux/arm-neon-highbd
+ lint_config linux/arm64-highbd
+ lint_config linux/mipsel
+ lint_config linux/mips64el
++lint_config linux/ppc64
+ lint_config linux/generic
+ lint_config win/arm64
+ lint_config win/ia32
+@@ -428,6 +430,7 @@ gen_rtcd_header linux/arm-neon-highbd ar
+ gen_rtcd_header linux/arm64-highbd armv8
+ gen_rtcd_header linux/mipsel mipsel
+ gen_rtcd_header linux/mips64el mips64el
++gen_rtcd_header linux/ppc64 generic
+ gen_rtcd_header linux/generic generic
+ gen_rtcd_header win/arm64 armv8
+ gen_rtcd_header win/ia32 x86 "${require_sse2}"
+@@ -513,6 +516,12 @@ if [ -z $ONLY_CONFIGS ]; then
+ 
+   echo "MIPS64 source list is identical to MIPS source list. No need to generate it."
+ 
++  echo "Generate ppc64 source list."
++  config=$(print_config_basic linux/ppc64)
++  make_clean
++  make libvpx_srcs.txt target=libs $config > /dev/null
++  convert_srcs_to_project_files libvpx_srcs.txt libvpx_srcs_ppc64
++
+   echo "Generate NaCl source list."
+   config=$(print_config_basic nacl)
+   make_clean
diff --git a/srcpkgs/qt6-webengine/patches/0901-xxx-ppc64le-sandbox-linux-stat.patch b/srcpkgs/qt6-webengine/patches/0901-xxx-ppc64le-sandbox-linux-stat.patch
new file mode 100644
index 000000000000..4b8e6320601c
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0901-xxx-ppc64le-sandbox-linux-stat.patch
@@ -0,0 +1,31 @@
+--- a/src/3rdparty/chromium/sandbox/linux/system_headers/linux_stat.h
++++ b/src/3rdparty/chromium/sandbox/linux/system_headers/linux_stat.h
+@@ -155,6 +155,28 @@ struct kernel_stat {
+   unsigned int __unused4;
+   unsigned int __unused5;
+ };
++#elif defined(__powerpc64__)
++struct kernel_stat {
++  unsigned long	st_dev;
++  unsigned long	st_ino;
++  unsigned long	st_nlink;
++  unsigned int	st_mode;
++  unsigned int	st_uid;
++  unsigned int	st_gid;
++  unsigned long	st_rdev;
++  long		st_size;
++  unsigned long	st_blksize;
++  unsigned long	st_blocks;
++  unsigned long	st_atime_;
++  unsigned long	st_atime_nsec_;
++  unsigned long	st_mtime_;
++  unsigned long	st_mtime_nsec_;
++  unsigned long	st_ctime_;
++  unsigned long	st_ctime_nsec_;
++  unsigned long	__unused4;
++  unsigned long	__unused5;
++  unsigned long	__unused6;
++};
+ #endif
+ 
+ #if !defined(AT_EMPTY_PATH)
diff --git a/srcpkgs/qt6-webengine/patches/0902-xxx-ppc64le-support.patch b/srcpkgs/qt6-webengine/patches/0902-xxx-ppc64le-support.patch
new file mode 100644
index 000000000000..33d415e55f69
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0902-xxx-ppc64le-support.patch
@@ -0,0 +1,3556 @@
+commit 2c013a317b1114ef67cdbbc30824b28907b9ea94
+Author: Daniel Kolesa <daniel@octaforge.org>
+Date:   Wed Mar 3 19:08:29 2021 +0100
+
+    ppc64le support
+
+--- a/src/3rdparty/chromium/sandbox/features.gni
++++ b/src/3rdparty/chromium/sandbox/features.gni
+@@ -11,7 +11,8 @@ import("//build/config/nacl/config.gni")
+ use_seccomp_bpf = (is_linux || is_chromeos || is_android) &&
+                   (current_cpu == "x86" || current_cpu == "x64" ||
+                    current_cpu == "arm" || current_cpu == "arm64" ||
+-                   current_cpu == "mipsel" || current_cpu == "mips64el")
++                   current_cpu == "mipsel" || current_cpu == "mips64el" ||
++                   current_cpu == "ppc64")
+ 
+ use_seccomp_bpf = use_seccomp_bpf || is_nacl_nonsfi
+ 
+--- a/src/3rdparty/chromium/sandbox/linux/BUILD.gn
++++ b/src/3rdparty/chromium/sandbox/linux/BUILD.gn
+@@ -433,6 +433,8 @@ component("sandbox_services") {
+ 
+ source_set("sandbox_services_headers") {
+   sources = [
++    "system_headers/ppc64_linux_syscalls.h",
++    "system_headers/ppc64_linux_ucontext.h",
+     "system_headers/arm64_linux_syscalls.h",
+     "system_headers/arm_linux_syscalls.h",
+     "system_headers/arm_linux_ucontext.h",
+--- a/src/3rdparty/chromium/sandbox/linux/bpf_dsl/linux_syscall_ranges.h
++++ b/src/3rdparty/chromium/sandbox/linux/bpf_dsl/linux_syscall_ranges.h
+@@ -56,6 +56,13 @@
+ #define MAX_PUBLIC_SYSCALL __NR_syscalls
+ #define MAX_SYSCALL MAX_PUBLIC_SYSCALL
+ 
++#elif defined(__powerpc64__)
++
++#include <asm/unistd.h>
++#define MIN_SYSCALL 0u
++#define MAX_PUBLIC_SYSCALL 386u
++#define MAX_SYSCALL MAX_PUBLIC_SYSCALL
++
+ #else
+ #error "Unsupported architecture"
+ #endif
+--- a/src/3rdparty/chromium/sandbox/linux/bpf_dsl/seccomp_macros.h
++++ b/src/3rdparty/chromium/sandbox/linux/bpf_dsl/seccomp_macros.h
+@@ -16,6 +16,9 @@
+ #if defined(__mips__)
+ // sys/user.h in eglibc misses size_t definition
+ #include <stddef.h>
++#elif defined(__powerpc64__) && defined(__GLIBC__)
++// Manually define greg_t on ppc64
++typedef unsigned long long greg_t;
+ #endif
+ #endif
+ 
+@@ -346,6 +349,59 @@ struct regs_struct {
+ #define SECCOMP_PT_PARM4(_regs) (_regs).regs[3]
+ #define SECCOMP_PT_PARM5(_regs) (_regs).regs[4]
+ #define SECCOMP_PT_PARM6(_regs) (_regs).regs[5]
++
++#elif defined(__powerpc64__)
++#include <asm/ptrace.h>
++
++typedef struct pt_regs regs_struct;
++
++#ifdef ARCH_CPU_LITTLE_ENDIAN
++#define SECCOMP_ARCH AUDIT_ARCH_PPC64LE
++#else
++#define SECCOMP_ARCH AUDIT_ARCH_PPC64
++#endif
++
++#ifdef __GLIBC__
++#define SECCOMP_REG(_ctx, _reg) ((_ctx)->uc_mcontext.regs->gpr[_reg])
++#else
++#define SECCOMP_REG(_ctx, _reg) (((struct pt_regs *)(_ctx)->uc_mcontext.regs)->gpr[_reg])
++#endif
++
++#define SECCOMP_RESULT(_ctx) SECCOMP_REG(_ctx, 3)
++#define SECCOMP_SYSCALL(_ctx) SECCOMP_REG(_ctx, 0)
++#ifdef __GLIBC__
++#define SECCOMP_IP(_ctx) (_ctx)->uc_mcontext.regs->nip
++#else
++#define SECCOMP_IP(_ctx) ((struct pt_regs *)(_ctx)->uc_mcontext.regs)->nip
++#endif
++#define SECCOMP_PARM1(_ctx) SECCOMP_REG(_ctx, 3)
++#define SECCOMP_PARM2(_ctx) SECCOMP_REG(_ctx, 4)
++#define SECCOMP_PARM3(_ctx) SECCOMP_REG(_ctx, 5)
++#define SECCOMP_PARM4(_ctx) SECCOMP_REG(_ctx, 6)
++#define SECCOMP_PARM5(_ctx) SECCOMP_REG(_ctx, 7)
++#define SECCOMP_PARM6(_ctx) SECCOMP_REG(_ctx, 8)
++
++#define SECCOMP_NR_IDX (offsetof(struct arch_seccomp_data, nr))
++#define SECCOMP_ARCH_IDX (offsetof(struct arch_seccomp_data, arch))
++#define SECCOMP_IP_MSB_IDX \
++  (offsetof(struct arch_seccomp_data, instruction_pointer) + 4)
++#define SECCOMP_IP_LSB_IDX \
++  (offsetof(struct arch_seccomp_data, instruction_pointer) + 0)
++#define SECCOMP_ARG_MSB_IDX(nr) \
++  (offsetof(struct arch_seccomp_data, args) + 8 * (nr) + 4)
++#define SECCOMP_ARG_LSB_IDX(nr) \
++  (offsetof(struct arch_seccomp_data, args) + 8 * (nr) + 0)
++
++#define SECCOMP_PT_RESULT(_regs) (_regs).gpr[3]
++#define SECCOMP_PT_SYSCALL(_regs) (_regs).gpr[0]
++#define SECCOMP_PT_IP(_regs) (_regs).nip
++#define SECCOMP_PT_PARM1(_regs) (_regs).gpr[3]
++#define SECCOMP_PT_PARM2(_regs) (_regs).gpr[4]
++#define SECCOMP_PT_PARM3(_regs) (_regs).gpr[5]
++#define SECCOMP_PT_PARM4(_regs) (_regs).gpr[6]
++#define SECCOMP_PT_PARM5(_regs) (_regs).gpr[7]
++#define SECCOMP_PT_PARM6(_regs) (_regs).gpr[8]
++
+ #else
+ #error Unsupported target platform
+ 
+--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc
++++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc
+@@ -90,7 +90,7 @@ bool IsBaselinePolicyWatched(int sysno)
+          SyscallSets::IsNuma(sysno) ||
+          SyscallSets::IsPrctl(sysno) ||
+          SyscallSets::IsProcessGroupOrSession(sysno) ||
+-#if defined(__i386__) || \
++#if defined(__i386__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+          SyscallSets::IsSocketCall(sysno) ||
+ #endif
+@@ -258,7 +258,7 @@ ResultExpr EvaluateSyscallImpl(int fs_de
+   }
+ 
+ #if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
+-    defined(__aarch64__)
++    defined(__aarch64__) || defined(__powerpc64__)
+   if (sysno == __NR_mmap)
+     return RestrictMmapFlags();
+ #endif
+@@ -279,7 +279,7 @@ ResultExpr EvaluateSyscallImpl(int fs_de
+     return RestrictPrctl();
+ 
+ #if defined(__x86_64__) || defined(__arm__) || defined(__mips__) || \
+-    defined(__aarch64__)
++    defined(__aarch64__) || defined(__powerpc64__)
+   if (sysno == __NR_socketpair) {
+     // Only allow AF_UNIX, PF_UNIX. Crash if anything else is seen.
+     static_assert(AF_UNIX == PF_UNIX,
+@@ -343,7 +343,8 @@ ResultExpr EvaluateSyscallImpl(int fs_de
+   }
+ 
+ #if defined(__i386__) || \
+-    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
++    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
++    defined(__powerpc64__)
+   if (SyscallSets::IsSocketCall(sysno))
+     return RestrictSocketcallCommand();
+ #endif
+--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/baseline_policy_unittest.cc
++++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/baseline_policy_unittest.cc
+@@ -317,7 +317,7 @@ TEST_BASELINE_SIGSYS(__NR_sysinfo)
+ TEST_BASELINE_SIGSYS(__NR_syslog)
+ TEST_BASELINE_SIGSYS(__NR_timer_create)
+ 
+-#if !defined(__aarch64__)
++#if !defined(__aarch64__) && !defined(__powerpc64__)
+ TEST_BASELINE_SIGSYS(__NR_inotify_init)
+ TEST_BASELINE_SIGSYS(__NR_vserver)
+ #endif
+--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc
++++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc
+@@ -40,6 +40,7 @@
+ #include <sys/ptrace.h>
+ #if (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) && \
+     !defined(__arm__) && !defined(__aarch64__) &&           \
++    !defined(__powerpc64__) &&                              \
+     !defined(PTRACE_GET_THREAD_AREA)
+ // Also include asm/ptrace-abi.h since ptrace.h in older libc (for instance
+ // the one in Ubuntu 16.04 LTS) is missing PTRACE_GET_THREAD_AREA.
+@@ -49,6 +50,11 @@
+ #endif
+ #endif  // !OS_NACL_NONSFI
+ 
++// On PPC64, TCGETS is defined in terms of struct termios, so we must include termios.h
++#ifdef __powerpc64__
++#include <termios.h>
++#endif
++
+ #if defined(OS_ANDROID)
+ 
+ #if !defined(F_DUPFD_CLOEXEC)
+@@ -106,6 +112,14 @@ inline bool IsArchitectureMips() {
+ #endif
+ }
+ 
++inline bool IsArchitecturePPC64() {
++#if defined(__powerpc64__)
++  return true;
++#else
++  return false;
++#endif
++}
++
+ // Ubuntu's version of glibc has a race condition in sem_post that can cause
+ // it to call futex(2) with bogus op arguments. To workaround this, we need
+ // to allow those futex(2) calls to fail with EINVAL, instead of crashing the
+@@ -270,6 +284,8 @@ ResultExpr RestrictFcntlCommands() {
+   uint64_t kOLargeFileFlag = O_LARGEFILE;
+   if (IsArchitectureX86_64() || IsArchitectureI386() || IsArchitectureMips())
+     kOLargeFileFlag = 0100000;
++  else if (IsArchitecturePPC64())
++    kOLargeFileFlag = 0200000;
+ 
+   const Arg<int> cmd(1);
+   const Arg<long> long_arg(2);
+@@ -287,7 +303,16 @@ ResultExpr RestrictFcntlCommands() {
+               F_SETLKW,
+               F_GETLK,
+               F_DUPFD,
+-              F_DUPFD_CLOEXEC),
++              F_DUPFD_CLOEXEC
++#if defined(__powerpc64__)
++// On PPC64, F_SETLK, F_GETLK, F_SETLKW are defined as the 64-bit variants
++// but glibc will sometimes still use the 32-bit versions. Allow both.
++              ,
++              5, /* F_GETLK (32) */
++              6, /* F_SETLK (32) */
++              7  /* F_SETLKW (32) */
++#endif
++	     ),
+              Allow())
+       .Case(F_SETFL,
+             If((long_arg & ~kAllowedMask) == 0, Allow()).Else(CrashSIGSYS()))
+@@ -297,7 +322,7 @@ ResultExpr RestrictFcntlCommands() {
+   // clang-format on
+ }
+ 
+-#if defined(__i386__) || defined(__mips__)
++#if defined(__i386__) || defined(__mips__) || defined(__powerpc64__)
+ ResultExpr RestrictSocketcallCommand() {
+   // Unfortunately, we are unable to restrict the first parameter to
+   // socketpair(2). Whilst initially sounding bad, it's noteworthy that very
+@@ -454,7 +479,7 @@ ResultExpr RestrictPtrace() {
+ #endif
+   return Switch(request)
+       .CASES((
+-#if !defined(__aarch64__)
++#if !defined(__aarch64__) && !defined(__powerpc64__)
+                  PTRACE_GETREGS, PTRACE_GETFPREGS,
+ #if defined(TRACE_GET_THREAD_AREA)
+                  PTRACE_GET_THREAD_AREA,
+--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.h
++++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.h
+@@ -49,7 +49,7 @@ SANDBOX_EXPORT bpf_dsl::ResultExpr Restr
+ // O_NONBLOCK | O_SYNC | O_LARGEFILE | O_CLOEXEC | O_NOATIME.
+ SANDBOX_EXPORT bpf_dsl::ResultExpr RestrictFcntlCommands();
+ 
+-#if defined(__i386__) || defined(__mips__)
++#if defined(__i386__) || defined(__mips__) || defined(__powerpc64__)
+ // Restrict socketcall(2) to only allow socketpair(2), send(2), recv(2),
+ // sendto(2), recvfrom(2), shutdown(2), sendmsg(2) and recvmsg(2).
+ SANDBOX_EXPORT bpf_dsl::ResultExpr RestrictSocketcallCommand();
+--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
++++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
+@@ -28,7 +28,7 @@ bool SyscallSets::IsKill(int sysno) {
+ bool SyscallSets::IsAllowedGettime(int sysno) {
+   switch (sysno) {
+     case __NR_gettimeofday:
+-#if defined(__i386__) || defined(__x86_64__) || \
++#if defined(__i386__) || defined(__x86_64__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_time:
+ #endif
+@@ -51,12 +51,12 @@ bool SyscallSets::IsAllowedGettime(int s
+                                     // filtered by RestrictClockID().
+     case __NR_clock_nanosleep_time64:  // Parameters filtered by RestrictClockID().
+ #endif
+-#if defined(__i386__) || \
++#if defined(__i386__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_ftime:  // Obsolete.
+ #endif
+     case __NR_settimeofday:  // Privileged.
+-#if defined(__i386__) || \
++#if defined(__i386__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_stime:
+ #endif
+@@ -135,7 +135,7 @@ bool SyscallSets::IsFileSystem(int sysno
+     case __NR_faccessat:  // EPERM not a valid errno.
+     case __NR_fchmodat:
+     case __NR_fchownat:  // Should be called chownat ?
+-#if defined(__x86_64__) || defined(__aarch64__)
++#if defined(__x86_64__) || defined(__aarch64__) || defined(__powerpc64__)
+     case __NR_newfstatat:  // fstatat(). EPERM not a valid errno.
+ #elif defined(__i386__) || defined(__arm__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+@@ -154,7 +154,7 @@ bool SyscallSets::IsFileSystem(int sysno
+     case __NR_memfd_create:
+     case __NR_mkdirat:
+     case __NR_mknodat:
+-#if defined(__i386__)
++#if defined(__i386__) || defined(__powerpc64__)
+     case __NR_oldlstat:
+     case __NR_oldstat:
+ #endif
+@@ -167,7 +167,7 @@ bool SyscallSets::IsFileSystem(int sysno
+     case __NR_stat64:
+ #endif
+     case __NR_statfs:  // EPERM not a valid errno.
+-#if defined(__i386__) || defined(__arm__) || \
++#if defined(__i386__) || defined(__arm__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_statfs64:
+ #endif
+@@ -179,7 +179,8 @@ bool SyscallSets::IsFileSystem(int sysno
+     case __NR_truncate64:
+ #endif
+     case __NR_unlinkat:
+-#if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
++#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
++    defined(__powerpc64__)
+     case __NR_utime:
+ #endif
+     case __NR_utimensat:  // New.
+@@ -204,7 +205,8 @@ bool SyscallSets::IsAllowedFileSystemAcc
+ #endif
+       return true;
+ // TODO(jln): these should be denied gracefully as well (moved below).
+-#if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
++#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
++    defined(__powerpc64__)
+     case __NR_fadvise64:  // EPERM not a valid errno.
+ #endif
+ #if defined(__i386__)
+@@ -216,12 +218,12 @@ bool SyscallSets::IsAllowedFileSystemAcc
+     case __NR_fdatasync:  // EPERM not a valid errno.
+     case __NR_flock:      // EPERM not a valid errno.
+     case __NR_fstatfs:    // Give information about the whole filesystem.
+-#if defined(__i386__) || defined(__arm__) || \
++#if defined(__i386__) || defined(__arm__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_fstatfs64:
+ #endif
+     case __NR_fsync:  // EPERM not a valid errno.
+-#if defined(__i386__)
++#if defined(__i386__) || defined(__powerpc64__)
+     case __NR_oldfstat:
+ #endif
+ #if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
+@@ -229,6 +231,8 @@ bool SyscallSets::IsAllowedFileSystemAcc
+     case __NR_sync_file_range:  // EPERM not a valid errno.
+ #elif defined(__arm__)
+     case __NR_arm_sync_file_range:  // EPERM not a valid errno.
++#elif defined(__powerpc64__)
++    case __NR_sync_file_range2: // EPERM not a valid errno.
+ #endif
+     default:
+       return false;
+@@ -248,7 +252,7 @@ bool SyscallSets::IsDeniedFileSystemAcce
+     case __NR_getdents:    // EPERM not a valid errno.
+ #endif
+     case __NR_getdents64:  // EPERM not a valid errno.
+-#if defined(__i386__) || \
++#if defined(__i386__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_readdir:
+ #endif
+@@ -290,7 +294,7 @@ bool SyscallSets::IsGetSimpleId(int sysn
+ bool SyscallSets::IsProcessPrivilegeChange(int sysno) {
+   switch (sysno) {
+     case __NR_capset:
+-#if defined(__i386__) || defined(__x86_64__)
++#if defined(__i386__) || defined(__x86_64__) || defined(__powerpc64__)
+     case __NR_ioperm:  // Intel privilege.
+     case __NR_iopl:    // Intel privilege.
+ #endif
+@@ -340,7 +344,7 @@ bool SyscallSets::IsAllowedSignalHandlin
+     case __NR_rt_sigprocmask:
+     case __NR_rt_sigreturn:
+     case __NR_rt_sigtimedwait:
+-#if defined(__i386__) || defined(__arm__) || \
++#if defined(__i386__) || defined(__arm__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_rt_sigtimedwait_time64:
+     case __NR_sigaction:
+@@ -357,7 +361,7 @@ bool SyscallSets::IsAllowedSignalHandlin
+     case __NR_signalfd:
+ #endif
+     case __NR_signalfd4:
+-#if defined(__i386__) || defined(__arm__) || \
++#if defined(__i386__) || defined(__arm__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_sigpending:
+     case __NR_sigsuspend:
+@@ -382,7 +386,7 @@ bool SyscallSets::IsAllowedOperationOnFd
+ #endif
+     case __NR_dup3:
+ #if defined(__x86_64__) || defined(__arm__) || defined(__mips__) || \
+-    defined(__aarch64__)
++    defined(__aarch64__) || defined(__powerpc64__)
+     case __NR_shutdown:
+ #endif
+       return true;
+@@ -416,7 +420,7 @@ bool SyscallSets::IsAllowedProcessStartO
+     case __NR_membarrier:
+     case __NR_wait4:
+     case __NR_waitid:
+-#if defined(__i386__)
++#if defined(__i386__) || defined(__powerpc64__)
+     case __NR_waitpid:
+ #endif
+ #if !defined(__GLIBC__)
+@@ -438,7 +442,7 @@ bool SyscallSets::IsAllowedProcessStartO
+     case __NR_set_tid_address:
+ #endif
+     case __NR_unshare:
+-#if !defined(__mips__) && !defined(__aarch64__)
++#if !defined(__mips__) && !defined(__aarch64__) || defined(__powerpc64__)
+     case __NR_vfork:
+ #endif
+     default:
+@@ -491,7 +495,7 @@ bool SyscallSets::IsAllowedGetOrModifySo
+       return true;
+     default:
+ #if defined(__x86_64__) || defined(__arm__) || defined(__mips__) || \
+-    defined(__aarch64__)
++    defined(__aarch64__) || defined(__powerpc64__)
+     case __NR_socketpair:  // We will want to inspect its argument.
+ #endif
+       return false;
+@@ -501,7 +505,7 @@ bool SyscallSets::IsAllowedGetOrModifySo
+ bool SyscallSets::IsDeniedGetOrModifySocket(int sysno) {
+   switch (sysno) {
+ #if defined(__x86_64__) || defined(__arm__) || defined(__mips__) || \
+-    defined(__aarch64__)
++    defined(__aarch64__) || defined(__powerpc64__)
+     case __NR_accept:
+     case __NR_accept4:
+     case __NR_bind:
+@@ -515,7 +519,7 @@ bool SyscallSets::IsDeniedGetOrModifySoc
+   }
+ }
+ 
+-#if defined(__i386__) || \
++#if defined(__i386__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+ // Big multiplexing system call for sockets.
+ bool SyscallSets::IsSocketCall(int sysno) {
+@@ -530,7 +534,8 @@ bool SyscallSets::IsSocketCall(int sysno
+ }
+ #endif
+ 
+-#if defined(__x86_64__) || defined(__arm__) || defined(__mips__)
++#if defined(__x86_64__) || defined(__arm__) || defined(__mips__) || \
++    defined(__powerpc64__)
+ bool SyscallSets::IsNetworkSocketInformation(int sysno) {
+   switch (sysno) {
+     case __NR_getpeername:
+@@ -558,7 +563,7 @@ bool SyscallSets::IsAllowedAddressSpaceA
+     case __NR_mincore:
+     case __NR_mlockall:
+ #if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
+-    defined(__aarch64__)
++    defined(__aarch64__) || defined(__powerpc64__)
+     case __NR_mmap:
+ #endif
+ #if defined(__i386__) || defined(__arm__) || \
+@@ -589,7 +594,7 @@ bool SyscallSets::IsAllowedAddressSpaceA
+ bool SyscallSets::IsAllowedGeneralIo(int sysno) {
+   switch (sysno) {
+     case __NR_lseek:
+-#if defined(__i386__) || defined(__arm__) || \
++#if defined(__i386__) || defined(__arm__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR__llseek:
+ #endif
+@@ -609,27 +614,27 @@ bool SyscallSets::IsAllowedGeneralIo(int
+     case __NR_read:
+     case __NR_readv:
+     case __NR_pread64:
+-#if defined(__arm__) || \
++#if defined(__arm__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_recv:
+ #endif
+ #if defined(__x86_64__) || defined(__arm__) || defined(__mips__) || \
+-    defined(__aarch64__)
++    defined(__aarch64__) || defined(__powerpc64__)
+     case __NR_recvfrom:  // Could specify source.
+     case __NR_recvmsg:   // Could specify source.
+ #endif
+-#if defined(__i386__) || defined(__x86_64__)
++#if defined(__i386__) || defined(__x86_64__) || defined(__powerpc64__)
+     case __NR_select:
+ #endif
+-#if defined(__i386__) || defined(__arm__) || defined(__mips__)
++#if defined(__i386__) || defined(__arm__) || defined(__mips__) || defined(__powerpc64__)
+     case __NR__newselect:
+ #endif
+-#if defined(__arm__) || \
++#if defined(__arm__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_send:
+ #endif
+ #if defined(__x86_64__) || defined(__arm__) || defined(__mips__) || \
+-    defined(__aarch64__)
++    defined(__aarch64__) || defined(__powerpc64__)
+     case __NR_sendmsg:  // Could specify destination.
+     case __NR_sendto:   // Could specify destination.
+ #endif
+@@ -684,7 +689,7 @@ bool SyscallSets::IsAllowedBasicSchedule
+     case __NR_nanosleep:
+       return true;
+     case __NR_getpriority:
+-#if defined(__i386__) || defined(__arm__) || \
++#if defined(__i386__) || defined(__arm__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_nice:
+ #endif
+@@ -696,7 +701,7 @@ bool SyscallSets::IsAllowedBasicSchedule
+ 
+ bool SyscallSets::IsAdminOperation(int sysno) {
+   switch (sysno) {
+-#if defined(__i386__) || defined(__arm__) || \
++#if defined(__i386__) || defined(__arm__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_bdflush:
+ #endif
+@@ -713,7 +718,8 @@ bool SyscallSets::IsAdminOperation(int s
+ 
+ bool SyscallSets::IsKernelModule(int sysno) {
+   switch (sysno) {
+-#if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
++#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
++    defined(__powerpc64__)
+     case __NR_create_module:
+     case __NR_get_kernel_syms:  // Should ENOSYS.
+     case __NR_query_module:
+@@ -745,7 +751,7 @@ bool SyscallSets::IsFsControl(int sysno)
+     case __NR_quotactl:
+     case __NR_swapoff:
+     case __NR_swapon:
+-#if defined(__i386__) || \
++#if defined(__i386__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_umount:
+ #endif
+@@ -762,7 +768,7 @@ bool SyscallSets::IsNuma(int sysno) {
+     case __NR_getcpu:
+     case __NR_mbind:
+ #if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
+-    defined(__aarch64__)
++    defined(__aarch64__) || defined(__powerpc64__)
+     case __NR_migrate_pages:
+ #endif
+     case __NR_move_pages:
+@@ -797,13 +803,13 @@ bool SyscallSets::IsGlobalProcessEnviron
+   switch (sysno) {
+     case __NR_acct:  // Privileged.
+ #if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
+-    defined(__aarch64__)
++    defined(__aarch64__) || defined(__powerpc64__)
+     case __NR_getrlimit:
+ #endif
+-#if defined(__i386__) || defined(__arm__)
++#if defined(__i386__) || defined(__arm__) || defined(__powerpc64__)
+     case __NR_ugetrlimit:
+ #endif
+-#if defined(__i386__) || \
++#if defined(__i386__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_ulimit:
+ #endif
+@@ -838,7 +844,7 @@ bool SyscallSets::IsGlobalSystemStatus(i
+ #endif
+     case __NR_sysinfo:
+     case __NR_uname:
+-#if defined(__i386__)
++#if defined(__i386__) || defined(__powerpc64__)
+     case __NR_olduname:
+     case __NR_oldolduname:
+ #endif
+@@ -904,8 +910,16 @@ bool SyscallSets::IsSystemVSemaphores(in
+ }
+ #endif
+ 
++/* shitty hack around Void's 4.19 kernel headers missing those numbers */
++#if defined(__powerpc64__) && !defined(__NR_shmget)
++#define __NR_shmget 395
++#define __NR_shmctl 396
++#define __NR_shmat 397
++#define __NR_shmdt 398
++#endif
++
+ #if defined(__i386__) || defined(__x86_64__) || defined(__arm__) || \
+-    defined(__aarch64__) ||                                         \
++    defined(__aarch64__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_64_BITS))
+ // These give a lot of ambient authority and bypass the setuid sandbox.
+ bool SyscallSets::IsSystemVSharedMemory(int sysno) {
+@@ -936,7 +950,7 @@ bool SyscallSets::IsSystemVMessageQueue(
+ }
+ #endif
+ 
+-#if defined(__i386__) || \
++#if defined(__i386__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+ // Big system V multiplexing system call.
+ bool SyscallSets::IsSystemVIpc(int sysno) {
+@@ -956,7 +970,7 @@ bool SyscallSets::IsAnySystemV(int sysno
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_64_BITS))
+   return IsSystemVMessageQueue(sysno) || IsSystemVSemaphores(sysno) ||
+          IsSystemVSharedMemory(sysno);
+-#elif defined(__i386__) || \
++#elif defined(__i386__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+   return IsSystemVIpc(sysno);
+ #endif
+@@ -1014,7 +1028,8 @@ bool SyscallSets::IsFaNotify(int sysno)
+ bool SyscallSets::IsTimer(int sysno) {
+   switch (sysno) {
+     case __NR_getitimer:
+-#if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
++#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
++    defined(__powerpc64__)
+     case __NR_alarm:
+ #endif
+     case __NR_setitimer:
+@@ -1096,17 +1111,20 @@ bool SyscallSets::IsMisc(int sysno) {
+     case __NR_syncfs:
+     case __NR_vhangup:
+ // The system calls below are not implemented.
+-#if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
++#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
++    defined(__powerpc64__)
+     case __NR_afs_syscall:
+ #endif
+ #if defined(__i386__) || \
+-    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
++    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
++    defined(__powerpc64__)
+     case __NR_break:
+ #endif
+-#if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
++#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
++    defined(__powerpc64__)
+     case __NR_getpmsg:
+ #endif
+-#if defined(__i386__) || \
++#if defined(__i386__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_gtty:
+     case __NR_idle:
+@@ -1115,20 +1133,21 @@ bool SyscallSets::IsMisc(int sysno) {
+     case __NR_prof:
+     case __NR_profil:
+ #endif
+-#if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
++#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
++    defined(__powerpc64__)
+     case __NR_putpmsg:
+ #endif
+ #if defined(__x86_64__)
+     case __NR_security:
+ #endif
+-#if defined(__i386__) || \
++#if defined(__i386__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_stty:
+ #endif
+-#if defined(__x86_64__)
++#if defined(__x86_64__) || defined(__powerpc64__)
+     case __NR_tuxcall:
+ #endif
+-#if !defined(__aarch64__)
++#if !defined(__aarch64__) && !defined(__powerpc64__)
+     case __NR_vserver:
+ #endif
+       return true;
+--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_sets.h
++++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_sets.h
+@@ -43,13 +43,14 @@ class SANDBOX_EXPORT SyscallSets {
+   static bool IsDeniedGetOrModifySocket(int sysno);
+ 
+ #if defined(__i386__) || \
+-    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
++    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
++    defined(__powerpc64__)
+   // Big multiplexing system call for sockets.
+   static bool IsSocketCall(int sysno);
+ #endif
+ 
+ #if defined(__x86_64__) || defined(__arm__) || defined(__mips__) || \
+-    defined(__aarch64__)
++    defined(__aarch64__) || defined(__powerpc64__)
+   static bool IsNetworkSocketInformation(int sysno);
+ #endif
+ 
+@@ -77,7 +78,7 @@ class SANDBOX_EXPORT SyscallSets {
+   static bool IsSystemVSemaphores(int sysno);
+ #endif
+ #if defined(__i386__) || defined(__x86_64__) || defined(__arm__) || \
+-    defined(__aarch64__) ||                                         \
++    defined(__aarch64__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_64_BITS))
+   // These give a lot of ambient authority and bypass the setuid sandbox.
+   static bool IsSystemVSharedMemory(int sysno);
+@@ -89,7 +90,8 @@ class SANDBOX_EXPORT SyscallSets {
+ #endif
+ 
+ #if defined(__i386__) || \
+-    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
++    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
++    defined(__powerpc64__)
+   // Big system V multiplexing system call.
+   static bool IsSystemVIpc(int sysno);
+ #endif
+--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf/syscall.cc
++++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf/syscall.cc
+@@ -18,7 +18,7 @@ namespace sandbox {
+ namespace {
+ 
+ #if defined(ARCH_CPU_X86_FAMILY) || defined(ARCH_CPU_ARM_FAMILY) || \
+-    defined(ARCH_CPU_MIPS_FAMILY)
++    defined(ARCH_CPU_MIPS_FAMILY) || defined (ARCH_CPU_PPC64_FAMILY)
+ // Number that's not currently used by any Linux kernel ABIs.
+ const int kInvalidSyscallNumber = 0x351d3;
+ #else
+@@ -312,10 +312,54 @@ asm(// We need to be able to tell the ke
+     "2:ret\n"
+     ".cfi_endproc\n"
+     ".size SyscallAsm, .-SyscallAsm\n"
++#elif defined(__powerpc64__)
++    ".text\n"
++    ".align 4\n"
++    ".type SyscallAsm @function\n"
++    "SyscallAsm:\n"
++    ".cfi_startproc\n"
++
++    // Check if r3 is negative
++    "cmpdi 3, 0\n"
++    "bgt 2f\n"
++
++    // Load address of 3f into r3 and return
++    "mflr 10\n"
++    "bl 1f\n"
++    "1: mflr 3\n"
++    "mtlr 10\n"
++    "addi 3, 3, 4*13\n"
++    "blr\n"
++
++    // Load arguments from array into r3-8
++    // save param 3 in r10
++    "2:\n"
++    "mr 0, 3\n"
++    "ld 3, 0(4)\n"
++    "ld 5, 16(4)\n"
++    "ld 6, 24(4)\n"
++    "ld 7, 32(4)\n"
++    "ld 8, 40(4)\n"
++    "ld 4, 8(4)\n"
++    "li 9, 0\n"
++
++    // Enter kernel
++    "sc\n"
++
++    // Magic return address
++    "3:\n"
++    // Like MIPS, ppc64 return values are always positive.
++    // Check for error in cr0.SO and negate upon error
++    "bc 4, 3, 4f\n"
++    "neg 3, 3\n"
++    "4: blr\n"
++
++    ".cfi_endproc\n"
++    ".size SyscallAsm, .-SyscallAsm\n"
+ #endif
+     );  // asm
+ 
+-#if defined(__x86_64__)
++#if defined(__x86_64__) || defined(__powerpc64__)
+ extern "C" {
+ intptr_t SyscallAsm(intptr_t nr, const intptr_t args[6]);
+ }
+@@ -429,6 +473,8 @@ intptr_t Syscall::Call(int nr,
+     ret = inout;
+   }
+ 
++#elif defined(__powerpc64__)
++  intptr_t ret = SyscallAsm(nr, args);
+ #else
+ #error "Unimplemented architecture"
+ #endif
+@@ -445,8 +491,26 @@ void Syscall::PutValueInUcontext(intptr_
+     // needs to be changed back.
+     ret_val = -ret_val;
+     SECCOMP_PARM4(ctx) = 1;
+-  } else
++  } else {
+     SECCOMP_PARM4(ctx) = 0;
++  }
++#endif
++#if defined(__powerpc64__)
++  // Same as MIPS, need to invert ret and set error register (cr0.SO)
++  if (ret_val <= -1 && ret_val >= -4095) {
++    ret_val = -ret_val;
++#ifdef __GLIBC__
++    ctx->uc_mcontext.regs->ccr |= (1 << 28);
++#else
++    ((struct pt_regs *)ctx->uc_mcontext.regs)->ccr |= (1 << 28);
++#endif
++  } else {
++#ifdef __GLIBC__
++    ctx->uc_mcontext.regs->ccr &= ~(1 << 28);
++#else
++    ((struct pt_regs *)ctx->uc_mcontext.regs)->ccr &= ~(1 << 28);
++#endif
++  }
+ #endif
+   SECCOMP_RESULT(ctx) = static_cast<greg_t>(ret_val);
+ }
+--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf/trap.cc
++++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf/trap.cc
+@@ -236,6 +236,20 @@ void Trap::SigSys(int nr, LinuxSigInfo*
+       SetIsInSigHandler();
+     }
+ 
++#if defined(__powerpc64__)
++    // On ppc64+glibc, some syscalls seem to accidentally negate the first
++    // parameter which causes checks against it to fail. For now, manually
++    // negate them back.
++    // TODO(shawn@anastas.io): investigate this issue further
++    auto nr = SECCOMP_SYSCALL(ctx);
++    if (nr == __NR_openat || nr == __NR_mkdirat || nr == __NR_faccessat || nr == __NR_readlinkat ||
++        nr == __NR_renameat || nr == __NR_renameat2 || nr == __NR_newfstatat || nr == __NR_unlinkat) {
++        if (static_cast<int>(SECCOMP_PARM1(ctx)) > 0) {
++            SECCOMP_PARM1(ctx) = -SECCOMP_PARM1(ctx);
++        }
++    }
++#endif
++
+     // Copy the seccomp-specific data into a arch_seccomp_data structure. This
+     // is what we are showing to TrapFnc callbacks that the system call
+     // evaluator registered with the sandbox.
+--- a/src/3rdparty/chromium/sandbox/linux/services/credentials.cc
++++ b/src/3rdparty/chromium/sandbox/linux/services/credentials.cc
+@@ -81,7 +81,7 @@ bool ChrootToSafeEmptyDir() {
+   pid_t pid = -1;
+   alignas(16) char stack_buf[PTHREAD_STACK_MIN];
+ #if defined(ARCH_CPU_X86_FAMILY) || defined(ARCH_CPU_ARM_FAMILY) || \
+-    defined(ARCH_CPU_MIPS_FAMILY)
++    defined(ARCH_CPU_MIPS_FAMILY) || defined(ARCH_CPU_PPC64_FAMILY)
+   // The stack grows downward.
+   void* stack = stack_buf + sizeof(stack_buf);
+ #else
+--- a/src/3rdparty/chromium/sandbox/linux/services/syscall_wrappers.cc
++++ b/src/3rdparty/chromium/sandbox/linux/services/syscall_wrappers.cc
+@@ -61,7 +61,7 @@ long sys_clone(unsigned long flags,
+ #if defined(ARCH_CPU_X86_64)
+   return syscall(__NR_clone, flags, child_stack, ptid, ctid, tls);
+ #elif defined(ARCH_CPU_X86) || defined(ARCH_CPU_ARM_FAMILY) || \
+-    defined(ARCH_CPU_MIPS_FAMILY)
++    defined(ARCH_CPU_MIPS_FAMILY) || defined(ARCH_CPU_PPC64_FAMILY)
+   // CONFIG_CLONE_BACKWARDS defined.
+   return syscall(__NR_clone, flags, child_stack, ptid, tls, ctid);
+ #endif
+--- a/src/3rdparty/chromium/sandbox/linux/syscall_broker/broker_process.cc
++++ b/src/3rdparty/chromium/sandbox/linux/syscall_broker/broker_process.cc
+@@ -165,7 +165,7 @@ bool BrokerProcess::IsSyscallBrokerable(
+ #if defined(__NR_fstatat64)
+     case __NR_fstatat64:
+ #endif
+-#if defined(__x86_64__) || defined(__aarch64__)
++#if defined(__x86_64__) || defined(__aarch64__) || defined(__powerpc64__)
+     case __NR_newfstatat:
+ #endif
+       return !fast_check || allowed_command_set_.test(COMMAND_STAT);
+--- a/src/3rdparty/chromium/sandbox/linux/system_headers/linux_seccomp.h
++++ b/src/3rdparty/chromium/sandbox/linux/system_headers/linux_seccomp.h
+@@ -41,6 +41,9 @@
+ #ifndef EM_AARCH64
+ #define EM_AARCH64 183
+ #endif
++#ifndef EM_PPC64
++#define EM_PPC64 21
++#endif
+ 
+ #ifndef __AUDIT_ARCH_64BIT
+ #define __AUDIT_ARCH_64BIT 0x80000000
+@@ -74,6 +77,14 @@
+ #define AUDIT_ARCH_AARCH64 (EM_AARCH64 | __AUDIT_ARCH_64BIT | __AUDIT_ARCH_LE)
+ #endif
+ 
++#ifndef AUDIT_ARCH_PPC64
++#define AUDIT_ARCH_PPC64 (EM_PPC64 | __AUDIT_ARCH_64BIT)
++#endif
++
++#ifndef AUDIT_ARCH_PPC64LE
++#define AUDIT_ARCH_PPC64LE (EM_PPC64 | __AUDIT_ARCH_64BIT | __AUDIT_ARCH_LE)
++#endif
++
+ // For prctl.h
+ #ifndef PR_SET_SECCOMP
+ #define PR_SET_SECCOMP               22
+--- a/src/3rdparty/chromium/sandbox/linux/system_headers/linux_signal.h
++++ b/src/3rdparty/chromium/sandbox/linux/system_headers/linux_signal.h
+@@ -13,7 +13,7 @@
+ // (not undefined, but defined different values and in different memory
+ // layouts). So, fill the gap here.
+ #if defined(__i386__) || defined(__x86_64__) || defined(__arm__) || \
+-    defined(__aarch64__)
++    defined(__aarch64__) || defined(__powerpc64__)
+ 
+ #define LINUX_SIGHUP 1
+ #define LINUX_SIGINT 2
+--- a/src/3rdparty/chromium/sandbox/linux/system_headers/linux_syscalls.h
++++ b/src/3rdparty/chromium/sandbox/linux/system_headers/linux_syscalls.h
+@@ -35,5 +35,9 @@
+ #include "sandbox/linux/system_headers/arm64_linux_syscalls.h"
+ #endif
+ 
++#if defined(__powerpc64__)
++#include "sandbox/linux/system_headers/ppc64_linux_syscalls.h"
++#endif
++
+ #endif  // SANDBOX_LINUX_SYSTEM_HEADERS_LINUX_SYSCALLS_H_
+ 
+--- a/src/3rdparty/chromium/sandbox/linux/system_headers/linux_ucontext.h
++++ b/src/3rdparty/chromium/sandbox/linux/system_headers/linux_ucontext.h
+@@ -11,6 +11,8 @@
+ #include "sandbox/linux/system_headers/arm_linux_ucontext.h"
+ #elif defined(__i386__)
+ #include "sandbox/linux/system_headers/i386_linux_ucontext.h"
++#elif defined(__powerpc64__)
++#include "sandbox/linux/system_headers/ppc64_linux_ucontext.h"
+ #else
+ #error "No support for your architecture in PNaCl header"
+ #endif
+--- a/src/3rdparty/chromium/sandbox/policy/linux/bpf_renderer_policy_linux.cc
++++ b/src/3rdparty/chromium/sandbox/policy/linux/bpf_renderer_policy_linux.cc
+@@ -15,6 +15,11 @@
+ #include "sandbox/linux/system_headers/linux_syscalls.h"
+ #include "sandbox/policy/linux/sandbox_linux.h"
+ 
++// On PPC64, TCGETS is defined in terms of struct termios, so we must include termios.h
++#ifdef __powerpc64__
++#include <termios.h>
++#endif
++
+ // TODO(vignatti): replace the local definitions below with #include
+ // <linux/dma-buf.h> once kernel version 4.6 becomes widely used.
+ #include <linux/types.h>
+--- a/src/3rdparty/chromium/third_party/angle/src/compiler/translator/InfoSink.h
++++ b/src/3rdparty/chromium/third_party/angle/src/compiler/translator/InfoSink.h
+@@ -93,7 +93,16 @@ class TInfoSinkBase
+             stream.precision(8);
+             stream << f;
+         }
+-        sink.append(stream.str());
++
++        // Hack to work around a bug where negative floating point values
++        // are rendered like '.0.5' instead of '-0.5'
++        std::string res(stream.str());
++
++        if (signbit(f)) { // test if f is negative
++            res[0] = '-';
++        }
++
++        sink.append(res);
+         return *this;
+     }
+     // Write boolean values as their names instead of integral value.
+--- a/src/3rdparty/chromium/third_party/angle/src/libANGLE/Constants.h
++++ b/src/3rdparty/chromium/third_party/angle/src/libANGLE/Constants.h
+@@ -9,6 +9,7 @@
+ #ifndef LIBANGLE_CONSTANTS_H_
+ #define LIBANGLE_CONSTANTS_H_
+ 
++#include <cstddef>
+ #include "common/platform.h"
+ 
+ #include <stdint.h>
+--- a/src/3rdparty/chromium/third_party/boringssl/BUILD.gn
++++ b/src/3rdparty/chromium/third_party/boringssl/BUILD.gn
+@@ -99,6 +99,13 @@ if (is_win && !is_msan && current_cpu !=
+       } else {
+         public_configs = [ ":no_asm_config" ]
+       }
++    } else if (current_cpu == "ppc64") {
++      if (is_linux) {
++        # TODO: ppc64 (be) check
++        sources += crypto_sources_linux_ppc64le
++      } else {
++        public_configs = [ ":no_asm_config" ]
++      }
+     } else {
+       public_configs = [ ":no_asm_config" ]
+     }
+--- a/src/3rdparty/chromium/third_party/breakpad/BUILD.gn
++++ b/src/3rdparty/chromium/third_party/breakpad/BUILD.gn
+@@ -623,7 +623,6 @@ if (is_linux || is_chromeos || is_androi
+       "breakpad/src/client/minidump_file_writer.h",
+       "breakpad/src/common/convert_UTF.cc",
+       "breakpad/src/common/convert_UTF.h",
+-      "breakpad/src/common/linux/breakpad_getcontext.S",
+       "breakpad/src/common/linux/elf_core_dump.cc",
+       "breakpad/src/common/linux/elf_core_dump.h",
+       "breakpad/src/common/linux/elfutils.cc",
+@@ -663,6 +662,15 @@ if (is_linux || is_chromeos || is_androi
+ 
+     libs = [ "dl" ]
+ 
++    if (current_cpu == "ppc64") {
++        defines = [ "HAVE_GETCONTEXT" ]
++        libs += [ "ucontext" ]
++    } else {
++        sources += [
++            "breakpad/src/common/linux/breakpad_getcontext.S"
++        ]
++    }
++
+     include_dirs = [
+       ".",
+       "breakpad/src",
+@@ -712,7 +720,6 @@ if (is_linux || is_chromeos || is_androi
+       "breakpad/src/client/linux/minidump_writer/minidump_writer_unittest.cc",
+       "breakpad/src/client/linux/minidump_writer/minidump_writer_unittest_utils.cc",
+       "breakpad/src/client/linux/minidump_writer/proc_cpuinfo_reader_unittest.cc",
+-      "breakpad/src/common/linux/breakpad_getcontext_unittest.cc",
+       "breakpad/src/common/linux/elf_core_dump_unittest.cc",
+       "breakpad/src/common/linux/file_id_unittest.cc",
+       "breakpad/src/common/linux/linux_libc_support_unittest.cc",
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/raw_context_cpu.h
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/raw_context_cpu.h
+@@ -44,6 +44,8 @@ typedef MDRawContextARM RawContextCPU;
+ typedef MDRawContextARM64_Old RawContextCPU;
+ #elif defined(__mips__)
+ typedef MDRawContextMIPS RawContextCPU;
++#elif defined(__powerpc64__)
++typedef MDRawContextPPC64 RawContextCPU;
+ #else
+ #error "This code has not been ported to your platform yet."
+ #endif
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.cc
+@@ -270,7 +270,54 @@ void ThreadInfo::FillCPUContext(RawConte
+   out->float_save.fir = mcontext.fpc_eir;
+ #endif
+ }
+-#endif  // __mips__
++
++#elif defined(__powerpc64__)
++
++#if !defined(__GLIBC__)
++#include <asm/elf.h>
++#include <asm/ptrace.h>
++#endif
++
++uintptr_t ThreadInfo::GetInstructionPointer() const {
++    return mcontext.gp_regs[PT_NIP];
++}
++
++void ThreadInfo::FillCPUContext(RawContextCPU* out) const {
++    out->context_flags = MD_CONTEXT_PPC64_FULL;
++    for (int i = 0; i < MD_CONTEXT_PPC64_GPR_COUNT; i++)
++        out->gpr[i] = mcontext.gp_regs[i];
++
++    out->lr = mcontext.gp_regs[PT_LNK];
++    out->srr0 = mcontext.gp_regs[PT_NIP];
++    out->srr1 = mcontext.gp_regs[PT_MSR];
++    out->cr = mcontext.gp_regs[PT_CCR];
++    out->xer = mcontext.gp_regs[PT_XER];
++    out->ctr = mcontext.gp_regs[PT_CTR];
++
++#ifdef __GLIBC__
++    for (int i = 0; i < MD_FLOATINGSAVEAREA_PPC_FPR_COUNT; i++)
++        out->float_save.fpregs[i] = mcontext.fp_regs[i];
++
++    out->float_save.fpscr = mcontext.fp_regs[NFPREG-1];
++#else
++    for (int i = 0; i < MD_FLOATINGSAVEAREA_PPC_FPR_COUNT; i++)
++        out->float_save.fpregs[i] = ((uint64_t *)&mcontext.fp_regs)[i];
++
++     out->float_save.fpscr = ((uint64_t *)&mcontext.fp_regs)[ELF_NFPREG-1];
++#endif
++
++    for (int i = 0; i < MD_VECTORSAVEAREA_PPC_VR_COUNT; i++)
++        out->vector_save.save_vr[i] = \
++            {(((uint64_t)vregs.vrregs[i][0]) << 32)
++                          | vregs.vrregs[i][1],
++            (((uint64_t)vregs.vrregs[i][2]) << 32)
++                         | vregs.vrregs[i][3]};
++
++    out->vrsave = vregs.vrsave;
++    out->vector_save.save_vscr = {0, vregs.vscr.vscr_word};
++    out->vector_save.save_vrvalid = 0xFFFFFFFF;
++}
++#endif  // __powerpc64__
+ 
+ void ThreadInfo::GetGeneralPurposeRegisters(void** gp_regs, size_t* size) {
+   assert(gp_regs || size);
+@@ -279,6 +326,11 @@ void ThreadInfo::GetGeneralPurposeRegist
+     *gp_regs = mcontext.gregs;
+   if (size)
+     *size = sizeof(mcontext.gregs);
++#elif defined(__powerpc64__)
++  if (gp_regs)
++    *gp_regs = mcontext.gp_regs;
++  if (size)
++    *size = sizeof(mcontext.gp_regs);
+ #else
+   if (gp_regs)
+     *gp_regs = &regs;
+@@ -294,6 +346,11 @@ void ThreadInfo::GetFloatingPointRegiste
+     *fp_regs = &mcontext.fpregs;
+   if (size)
+     *size = sizeof(mcontext.fpregs);
++#elif defined(__powerpc64__)
++  if (fp_regs)
++    *fp_regs = &mcontext.fp_regs;
++  if (size)
++    *size = sizeof(mcontext.fp_regs);
+ #else
+   if (fp_regs)
+     *fp_regs = &fpregs;
+@@ -302,4 +359,13 @@ void ThreadInfo::GetFloatingPointRegiste
+ #endif
+ }
+ 
++#if defined(__powerpc64__)
++void ThreadInfo::GetVectorRegisters(void** v_regs, size_t* size) {
++    if (v_regs)
++        *v_regs = &vregs;
++    if (size)
++        *size = sizeof(vregs);
++}
++#endif
++
+ }  // namespace google_breakpad
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.h
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.h
+@@ -68,6 +68,10 @@ struct ThreadInfo {
+   // Use the structures defined in <sys/user.h>
+   struct user_regs_struct regs;
+   struct user_fpsimd_struct fpregs;
++#elif defined(__powerpc64__)
++  // Use the structures defined in <sys/ucontext.h>.
++  mcontext_t mcontext;
++  vrregset_t vregs;
+ #elif defined(__mips__)
+   // Use the structure defined in <sys/ucontext.h>.
+   mcontext_t mcontext;
+@@ -84,6 +88,11 @@ struct ThreadInfo {
+ 
+   // Returns the pointer and size of float point register area.
+   void GetFloatingPointRegisters(void** fp_regs, size_t* size);
++
++#if defined(__powerpc64__)
++  // Returns the pointer and size of the vector register area. (PPC64 only)
++  void GetVectorRegisters(void** v_regs, size_t* size);
++#endif
+ };
+ 
+ }  // namespace google_breakpad
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc
+@@ -254,6 +254,60 @@ void UContextReader::FillCPUContext(RawC
+   out->float_save.fir = uc->uc_mcontext.fpc_eir;  // Unused.
+ #endif
+ }
++
++#elif defined(__powerpc64__)
++
++#ifndef __GLIBC__
++#include <asm/elf.h>
++#include <asm/ptrace.h>
++#endif
++
++uintptr_t UContextReader::GetStackPointer(const ucontext_t* uc) {
++    return uc->uc_mcontext.gp_regs[MD_CONTEXT_PPC64_REG_SP];
++}
++
++uintptr_t UContextReader::GetInstructionPointer(const ucontext_t* uc) {
++    return uc->uc_mcontext.gp_regs[PT_NIP];
++}
++
++void UContextReader::FillCPUContext(RawContextCPU* out, const ucontext_t* uc,
++                                    const vrregset_t* vregs) {
++    out->context_flags = MD_CONTEXT_PPC64_FULL;
++
++    for (int i = 0; i < MD_CONTEXT_PPC64_GPR_COUNT; i++)
++        out->gpr[i] = uc->uc_mcontext.gp_regs[i];
++
++    out->lr = uc->uc_mcontext.gp_regs[PT_LNK];
++    out->srr0 = uc->uc_mcontext.gp_regs[PT_NIP];
++    out->srr1 = uc->uc_mcontext.gp_regs[PT_MSR];
++    out->cr = uc->uc_mcontext.gp_regs[PT_CCR];
++    out->xer = uc->uc_mcontext.gp_regs[PT_XER];
++    out->ctr = uc->uc_mcontext.gp_regs[PT_CTR];
++
++#ifdef __GLIBC__
++    for (int i = 0; i < MD_FLOATINGSAVEAREA_PPC_FPR_COUNT; i++)
++        out->float_save.fpregs[i] = uc->uc_mcontext.fp_regs[i];
++
++    out->float_save.fpscr = uc->uc_mcontext.fp_regs[NFPREG-1];
++#else
++    for (int i = 0; i < MD_FLOATINGSAVEAREA_PPC_FPR_COUNT; i++)
++        out->float_save.fpregs[i] = ((uint64_t *)&uc->uc_mcontext.fp_regs)[i];
++
++    out->float_save.fpscr = ((uint64_t *)&uc->uc_mcontext.fp_regs)[ELF_NFPREG-1];
++#endif
++
++    for (int i = 0; i < MD_VECTORSAVEAREA_PPC_VR_COUNT; i++)
++        out->vector_save.save_vr[i] =
++            {(((uint64_t)vregs->vrregs[i][0]) << 32)
++                         | vregs->vrregs[i][1],
++             (((uint64_t)vregs->vrregs[i][2]) << 32)
++                         | vregs->vrregs[i][3]};
++
++    out->vrsave = vregs->vrsave;
++    out->vector_save.save_vscr = {0, vregs->vscr.vscr_word};
++    out->vector_save.save_vrvalid = 0xFFFFFFFF;
++}
++
+ #endif
+ 
+ }  // namespace google_breakpad
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h
+@@ -59,6 +59,9 @@ struct UContextReader {
+ #elif defined(__aarch64__)
+   static void FillCPUContext(RawContextCPU* out, const ucontext_t* uc,
+                              const struct fpsimd_context* fpregs);
++#elif defined(__powerpc64__)
++  static void FillCPUContext(RawContextCPU *out, const ucontext_t *uc,
++                             const vrregset_t* vregs);
+ #else
+   static void FillCPUContext(RawContextCPU* out, const ucontext_t* uc);
+ #endif
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc
+@@ -105,6 +105,13 @@
+ #define PR_SET_PTRACER 0x59616d61
+ #endif
+ 
++/* musl hack, can't include asm/ptrace.h as that causes conflicts */
++#ifndef __GLIBC__
++#if defined(__powerpc64__) && !defined(PT_NIP)
++#define PT_NIP 32
++#endif
++#endif
++
+ namespace google_breakpad {
+ 
+ namespace {
+@@ -461,9 +468,16 @@ bool ExceptionHandler::HandleSignal(int
+     memcpy(&g_crash_context_.float_state, fp_ptr,
+            sizeof(g_crash_context_.float_state));
+   }
++#elif defined(__powerpc64__)
++  // On PPC64, we must copy VR state
++  ucontext_t* uc_ptr = (ucontext_t*)uc;
++  if (uc_ptr->uc_mcontext.v_regs) {
++    memcpy(&g_crash_context_.vector_state, uc_ptr->uc_mcontext.v_regs,
++           sizeof(g_crash_context_.vector_state));
++  }
+ #elif !defined(__ARM_EABI__) && !defined(__mips__)
+   // FP state is not part of user ABI on ARM Linux.
+-  // In case of MIPS Linux FP state is already part of ucontext_t
++  // In case of MIPS, Linux FP state is already part of ucontext_t
+   // and 'float_state' is not a member of CrashContext.
+   ucontext_t* uc_ptr = (ucontext_t*)uc;
+   if (uc_ptr->uc_mcontext.fpregs) {
+@@ -708,11 +722,19 @@ bool ExceptionHandler::WriteMinidump() {
+   }
+ #endif
+ 
+-#if !defined(__ARM_EABI__) && !defined(__aarch64__) && !defined(__mips__)
++#if !defined(__ARM_EABI__) && !defined(__aarch64__) && !defined(__mips__) \
++    && !defined(__powerpc64__)
+   // FPU state is not part of ARM EABI ucontext_t.
+   memcpy(&context.float_state, context.context.uc_mcontext.fpregs,
+          sizeof(context.float_state));
+ #endif
++
++#if defined(__powerpc64__)
++  // Vector registers must be copied on PPC64
++  memcpy(&context.vector_state, context.context.uc_mcontext.v_regs,
++         sizeof(context.vector_state));
++#endif
++
+   context.tid = sys_gettid();
+ 
+   // Add an exception stream to the minidump for better reporting.
+@@ -733,6 +755,9 @@ bool ExceptionHandler::WriteMinidump() {
+ #elif defined(__mips__)
+   context.siginfo.si_addr =
+       reinterpret_cast<void*>(context.context.uc_mcontext.pc);
++#elif defined(__powerpc64__)
++  context.siginfo.si_addr =
++      reinterpret_cast<void*>(context.context.uc_mcontext.gp_regs[PT_NIP]);
+ #else
+ #error "This code has not been ported to your platform yet."
+ #endif
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.h
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.h
+@@ -192,7 +192,11 @@ class ExceptionHandler {
+     siginfo_t siginfo;
+     pid_t tid;  // the crashing thread.
+     ucontext_t context;
+-#if !defined(__ARM_EABI__) && !defined(__mips__)
++#if defined(__powerpc64__)
++    // PPC64's FP state is a part of ucontext_t like MIPS but the vector
++    // state is not, so a struct is needed.
++    vstate_t vector_state;
++#elif !defined(__ARM_EABI__) && !defined(__mips__)
+     // #ifdef this out because FP state is not part of user ABI for Linux ARM.
+     // In case of MIPS Linux FP state is already part of ucontext_t so
+     // 'float_state' is not required.
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler_unittest.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler_unittest.cc
+@@ -307,7 +307,7 @@ TEST(ExceptionHandlerTest, ParallelChild
+   }
+ 
+   // Wait a while until the child should have crashed.
+-  usleep(1000000);
++  usleep(2000000);
+   // Kill the child if it is still running.
+   kill(child, SIGKILL);
+ 
+@@ -559,6 +559,8 @@ const unsigned char kIllegalInstruction[
+ #if defined(__mips__)
+   // mfc2 zero,Impl - usually illegal in userspace.
+   0x48, 0x00, 0x00, 0x48
++#elif defined(__powerpc64__)
++  0x01, 0x01, 0x01, 0x01 // Crashes on a tested POWER9 cpu
+ #else
+   // This crashes with SIGILL on x86/x86-64/arm.
+   0xff, 0xff, 0xff, 0xff
+@@ -754,10 +756,10 @@ TEST(ExceptionHandlerTest, InstructionPo
+ 
+   // These are defined here so the parent can use them to check the
+   // data from the minidump afterwards.
+-  // Use 4k here because the OS will hand out a single page even
++  // Use the page size here because the OS will hand out a single page even
+   // if a smaller size is requested, and this test wants to
+   // test the upper bound of the memory range.
+-  const uint32_t kMemorySize = 4096;  // bytes
++  const uint32_t kMemorySize = getpagesize();  // bytes
+   const int kOffset = kMemorySize - sizeof(kIllegalInstruction);
+ 
+   const pid_t child = fork();
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/microdump_writer/microdump_writer.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/microdump_writer/microdump_writer.cc
+@@ -138,7 +138,9 @@ class MicrodumpWriter {
+                   const MicrodumpExtraInfo& microdump_extra_info,
+                   LinuxDumper* dumper)
+       : ucontext_(context ? &context->context : NULL),
+-#if !defined(__ARM_EABI__) && !defined(__mips__)
++#if defined(__powerpc64__)
++        vector_state_(context ? &context->vector_state : NULL),
++#elif !defined(__ARM_EABI__) && !defined(__mips__)
+         float_state_(context ? &context->float_state : NULL),
+ #endif
+         dumper_(dumper),
+@@ -337,6 +339,8 @@ class MicrodumpWriter {
+ # else
+ #  error "This mips ABI is currently not supported (n32)"
+ #endif
++#elif defined(__powerpc64__)
++    const char kArch[] = "ppc64";
+ #else
+ #error "This code has not been ported to your platform yet"
+ #endif
+@@ -409,7 +413,9 @@ class MicrodumpWriter {
+   void DumpCPUState() {
+     RawContextCPU cpu;
+     my_memset(&cpu, 0, sizeof(RawContextCPU));
+-#if !defined(__ARM_EABI__) && !defined(__mips__)
++#if defined(__powerpc64__)
++    UContextReader::FillCPUContext(&cpu, ucontext_, vector_state_);
++#elif !defined(__ARM_EABI__) && !defined(__mips__)
+     UContextReader::FillCPUContext(&cpu, ucontext_, float_state_);
+ #else
+     UContextReader::FillCPUContext(&cpu, ucontext_);
+@@ -605,7 +611,9 @@ class MicrodumpWriter {
+   void* Alloc(unsigned bytes) { return dumper_->allocator()->Alloc(bytes); }
+ 
+   const ucontext_t* const ucontext_;
+-#if !defined(__ARM_EABI__) && !defined(__mips__)
++#if defined(__powerpc64__)
++  const google_breakpad::vstate_t* const vector_state_;
++#elif !defined(__ARM_EABI__) && !defined(__mips__)
+   const google_breakpad::fpstate_t* const float_state_;
+ #endif
+   LinuxDumper* dumper_;
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/microdump_writer/microdump_writer_unittest.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/microdump_writer/microdump_writer_unittest.cc
+@@ -279,10 +279,19 @@ TEST(MicrodumpWriterTest, BasicWithMappi
+   CrashAndGetMicrodump(mappings, MicrodumpExtraInfo(), &buf);
+   ASSERT_TRUE(ContainsMicrodump(buf));
+ 
++  int page_size = getpagesize();
+ #ifdef __LP64__
+-  ASSERT_NE(std::string::npos,
+-            buf.find("M 0000000000001000 000000000000002A 0000000000001000 "
+-                     "33221100554477668899AABBCCDDEEFF0 libfoo.so"));
++  // This test is only available for the following page sizes
++  ASSERT_TRUE((page_size == 4096) || (page_size == 65536));
++  if (page_size == 4096) {
++    ASSERT_NE(std::string::npos,
++              buf.find("M 0000000000001000 000000000000002A 0000000000001000 "
++                       "33221100554477668899AABBCCDDEEFF0 libfoo.so"));
++  } else {
++    ASSERT_NE(std::string::npos,
++              buf.find("M 0000000000010000 000000000000002A 0000000000010000 "
++                       "33221100554477668899AABBCCDDEEFF0 libfoo.so"));
++  }
+ #else
+   ASSERT_NE(std::string::npos,
+             buf.find("M 00001000 0000002A 00001000 "
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_core_dumper.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_core_dumper.cc
+@@ -117,6 +117,9 @@ bool LinuxCoreDumper::GetThreadInfoByInd
+ #elif defined(__mips__)
+   stack_pointer =
+       reinterpret_cast<uint8_t*>(info->mcontext.gregs[MD_CONTEXT_MIPS_REG_SP]);
++#elif defined(__powerpc64__)
++  stack_pointer =
++      reinterpret_cast<uint8_t*>(info->mcontext.gp_regs[MD_CONTEXT_PPC64_REG_SP]);
+ #else
+ #error "This code hasn't been ported to your platform yet."
+ #endif
+@@ -212,7 +215,10 @@ bool LinuxCoreDumper::EnumerateThreads()
+         memset(&info, 0, sizeof(ThreadInfo));
+         info.tgid = status->pr_pgrp;
+         info.ppid = status->pr_ppid;
+-#if defined(__mips__)
++#if defined(__powerpc64__)
++        for (int i = 0; i < 31; i++)
++            info.mcontext.gp_regs[i] = status->pr_reg[i];
++#elif defined(__mips__)
+ #if defined(__ANDROID__)
+         for (int i = EF_R0; i <= EF_R31; i++)
+           info.mcontext.gregs[i - EF_R0] = status->pr_reg[i];
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper.cc
+@@ -765,7 +765,9 @@ bool LinuxDumper::GetStackInfo(const voi
+       reinterpret_cast<uint8_t*>(int_stack_pointer & ~(page_size - 1));
+ 
+   // The number of bytes of stack which we try to capture.
+-  static const ptrdiff_t kStackToCapture = 32 * 1024;
++  // This now depends on page_size to avoid missing data
++  // on systems with larger page sizes.
++  static const ptrdiff_t kStackToCapture = 8 * page_size;
+ 
+   const MappingInfo* mapping = FindMapping(stack_pointer);
+   if (!mapping)
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper.h
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper.h
+@@ -63,7 +63,8 @@ namespace google_breakpad {
+  (defined(__mips__) && _MIPS_SIM == _ABIO32)
+ typedef Elf32_auxv_t elf_aux_entry;
+ #elif defined(__x86_64) || defined(__aarch64__) || \
+-     (defined(__mips__) && _MIPS_SIM != _ABIO32)
++     (defined(__mips__) && _MIPS_SIM != _ABIO32) || \
++     defined(__powerpc64__)
+ typedef Elf64_auxv_t elf_aux_entry;
+ #endif
+ 
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper_unittest_helper.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper_unittest_helper.cc
+@@ -51,6 +51,8 @@
+ #define TID_PTR_REGISTER "rcx"
+ #elif defined(__mips__)
+ #define TID_PTR_REGISTER "$1"
++#elif defined(__powerpc64__)
++#define TID_PTR_REGISTER "r8"
+ #else
+ #error This test has not been ported to this platform.
+ #endif
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper.cc
+@@ -154,19 +154,27 @@ bool LinuxPtraceDumper::CopyFromProcess(
+   return true;
+ }
+ 
+-bool LinuxPtraceDumper::ReadRegisterSet(ThreadInfo* info, pid_t tid)
+-{
++bool LinuxPtraceDumper::ReadRegisterSet(ThreadInfo* info, pid_t tid) {
+ #ifdef PTRACE_GETREGSET
+   struct iovec io;
+   info->GetGeneralPurposeRegisters(&io.iov_base, &io.iov_len);
+-  if (sys_ptrace(PTRACE_GETREGSET, tid, (void*)NT_PRSTATUS, (void*)&io) == -1) {
++  if (ptrace(PTRACE_GETREGSET, tid, (void*)NT_PRSTATUS, (void*)&io) == -1) {
+     return false;
+   }
+ 
+   info->GetFloatingPointRegisters(&io.iov_base, &io.iov_len);
+-  if (sys_ptrace(PTRACE_GETREGSET, tid, (void*)NT_FPREGSET, (void*)&io) == -1) {
++  if (ptrace(PTRACE_GETREGSET, tid, (void*)NT_FPREGSET, (void*)&io) == -1) {
+     return false;
+   }
++
++#if defined(__powerpc64__)
++  // Grab the vector registers on PPC64 too
++  info->GetVectorRegisters(&io.iov_base, &io.iov_len);
++  if (ptrace(PTRACE_GETREGSET, tid, (void*)NT_PPC_VMX, (void*)&io) == -1) {
++    return false;
++  }
++#endif // defined(__powerpc64__)
++
+   return true;
+ #else
+   return false;
+@@ -303,6 +311,9 @@ bool LinuxPtraceDumper::GetThreadInfoByI
+ #elif defined(__mips__)
+   stack_pointer =
+       reinterpret_cast<uint8_t*>(info->mcontext.gregs[MD_CONTEXT_MIPS_REG_SP]);
++#elif defined(__powerpc64__)
++  stack_pointer =
++      reinterpret_cast<uint8_t*>(info->mcontext.gp_regs[MD_CONTEXT_PPC64_REG_SP]);
+ #else
+ #error "This code hasn't been ported to your platform yet."
+ #endif
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper_unittest.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper_unittest.cc
+@@ -462,6 +462,9 @@ TEST(LinuxPtraceDumperTest, VerifyStackR
+ #elif defined(__mips__)
+     pid_t* process_tid_location =
+         reinterpret_cast<pid_t*>(one_thread.mcontext.gregs[1]);
++#elif defined(__powerpc64__)
++    pid_t* process_tid_location =
++        reinterpret_cast<pid_t*>(one_thread.mcontext.gp_regs[8]);
+ #else
+ #error This test has not been ported to this platform.
+ #endif
+@@ -559,6 +562,8 @@ TEST_F(LinuxPtraceDumperTest, SanitizeSt
+   uintptr_t heap_addr = thread_info.regs.rcx;
+ #elif defined(__mips__)
+   uintptr_t heap_addr = thread_info.mcontext.gregs[1];
++#elif defined(__powerpc64__)
++  uintptr_t heap_addr = thread_info.mcontext.gp_regs[8];
+ #else
+ #error This test has not been ported to this platform.
+ #endif
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.cc
+@@ -136,7 +136,9 @@ class MinidumpWriter {
+       : fd_(minidump_fd),
+         path_(minidump_path),
+         ucontext_(context ? &context->context : NULL),
+-#if !defined(__ARM_EABI__) && !defined(__mips__)
++#if defined(__powerpc64__)
++        vector_state_(context ? &context->vector_state : NULL),
++#elif !defined(__ARM_EABI__) && !defined(__mips__)
+         float_state_(context ? &context->float_state : NULL),
+ #endif
+         dumper_(dumper),
+@@ -468,7 +470,9 @@ class MinidumpWriter {
+         if (!cpu.Allocate())
+           return false;
+         my_memset(cpu.get(), 0, sizeof(RawContextCPU));
+-#if !defined(__ARM_EABI__) && !defined(__mips__)
++#if defined(__powerpc64__)
++        UContextReader::FillCPUContext(cpu.get(), ucontext_, vector_state_);
++#elif !defined(__ARM_EABI__) && !defined(__mips__)
+         UContextReader::FillCPUContext(cpu.get(), ucontext_, float_state_);
+ #else
+         UContextReader::FillCPUContext(cpu.get(), ucontext_);
+@@ -897,7 +901,7 @@ class MinidumpWriter {
+     dirent->location.rva = 0;
+   }
+ 
+-#if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
++#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || defined(__powerpc64__)
+   bool WriteCPUInformation(MDRawSystemInfo* sys_info) {
+     char vendor_id[sizeof(sys_info->cpu.x86_cpu_info.vendor_id) + 1] = {0};
+     static const char vendor_id_name[] = "vendor_id";
+@@ -917,7 +921,9 @@ class MinidumpWriter {
+ 
+     // processor_architecture should always be set, do this first
+     sys_info->processor_architecture =
+-#if defined(__mips__)
++#if defined(__powerpc64__)
++        MD_CPU_ARCHITECTURE_PPC64;
++#elif defined(__mips__)
+ # if _MIPS_SIM == _ABIO32
+         MD_CPU_ARCHITECTURE_MIPS;
+ # elif _MIPS_SIM == _ABI64
+@@ -1333,7 +1339,9 @@ class MinidumpWriter {
+   const char* path_;  // Path to the file where the minidum should be written.
+ 
+   const ucontext_t* const ucontext_;  // also from the signal handler
+-#if !defined(__ARM_EABI__) && !defined(__mips__)
++#if defined(__powerpc64__)
++  const google_breakpad::vstate_t* const vector_state_;
++#elif !defined(__ARM_EABI__) && !defined(__mips__)
+   const google_breakpad::fpstate_t* const float_state_;  // ditto
+ #endif
+   LinuxDumper* dumper_;
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.h
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.h
+@@ -48,6 +48,8 @@ class ExceptionHandler;
+ 
+ #if defined(__aarch64__)
+ typedef struct fpsimd_context fpstate_t;
++#elif defined(__powerpc64__)
++typedef vrregset_t vstate_t;
+ #elif !defined(__ARM_EABI__) && !defined(__mips__)
+ typedef std::remove_pointer<fpregset_t>::type fpstate_t;
+ #endif
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer_unittest.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer_unittest.cc
+@@ -715,6 +715,12 @@ TEST(MinidumpWriterTest, InvalidStackPoi
+ #elif defined(__mips__)
+   context.context.uc_mcontext.gregs[MD_CONTEXT_MIPS_REG_SP] =
+       invalid_stack_pointer;
++#elif defined(__powerpc64__)
++  context.context.uc_mcontext.gp_regs[MD_CONTEXT_PPC64_REG_SP] =
++      invalid_stack_pointer;
++#elif defined(__powerpc64__)
++  context.context.uc_mcontext.gp_regs[MD_CONTEXT_PPC64_REG_SP] =
++      invalid_stack_pointer;
+ #else
+ # error "This code has not been ported to your platform yet."
+ #endif
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/common/linux/memory_mapped_file.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/common/linux/memory_mapped_file.cc
+@@ -65,8 +65,7 @@ bool MemoryMappedFile::Map(const char* p
+   }
+ 
+ #if defined(__x86_64__) || defined(__aarch64__) || \
+-   (defined(__mips__) && _MIPS_SIM == _ABI64)
+-
++   (defined(__mips__) && _MIPS_SIM == _ABI64) || defined(__powerpc64__)
+   struct kernel_stat st;
+   if (sys_fstat(fd, &st) == -1 || st.st_size < 0) {
+ #else
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/common/linux/memory_mapped_file_unittest.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/common/linux/memory_mapped_file_unittest.cc
+@@ -176,9 +176,10 @@ TEST_F(MemoryMappedFileTest, RemapAfterM
+ TEST_F(MemoryMappedFileTest, MapWithOffset) {
+   // Put more data in the test file this time. Offsets can only be
+   // done on page boundaries, so we need a two page file to test this.
+-  const int page_size = 4096;
+-  char data1[2 * page_size];
+-  size_t data1_size = sizeof(data1);
++  const int page_size = getpagesize();
++  char *data1 = static_cast<char*>(malloc(2 * page_size));
++  EXPECT_TRUE(data1 != NULL);
++  size_t data1_size = (2 * page_size);
+   for (size_t i = 0; i < data1_size; ++i) {
+     data1[i] = i & 0x7f;
+   }
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/common/memory_allocator_unittest.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/common/memory_allocator_unittest.cc
+@@ -57,8 +57,9 @@ TEST(PageAllocatorTest, LargeObject) {
+ 
+   EXPECT_EQ(0U, allocator.pages_allocated());
+   uint8_t* p = reinterpret_cast<uint8_t*>(allocator.Alloc(10000));
++  uint64_t expected_pages = 1 + ((10000 - 1) / getpagesize());
+   ASSERT_FALSE(p == NULL);
+-  EXPECT_EQ(3U, allocator.pages_allocated());
++  EXPECT_EQ(expected_pages, allocator.pages_allocated());
+   for (unsigned i = 1; i < 10; ++i) {
+     uint8_t* p = reinterpret_cast<uint8_t*>(allocator.Alloc(i));
+     ASSERT_FALSE(p == NULL);
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/processor/exploitability_linux.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/processor/exploitability_linux.cc
+@@ -202,12 +202,14 @@ bool ExploitabilityLinux::EndedOnIllegal
+   // Check architecture and set architecture variable to corresponding flag
+   // in objdump.
+   switch (context->GetContextCPU()) {
++#if defined(__i386) || defined(__x86_64)
+     case MD_CONTEXT_X86:
+       architecture = "i386";
+       break;
+     case MD_CONTEXT_AMD64:
+       architecture = "i386:x86-64";
+       break;
++#endif
+     default:
+       // Unsupported architecture. Note that ARM architectures are not
+       // supported because objdump does not support ARM.
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/processor/exploitability_unittest.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/processor/exploitability_unittest.cc
+@@ -104,6 +104,8 @@ ExploitabilityFor(const string& filename
+ }
+ 
+ TEST(ExploitabilityTest, TestWindowsEngine) {
++// The following tests are only executable on an x86-class linux machine.
++#if !defined(_WIN32) && (defined(__i386) || defined(__x86_64))
+   ASSERT_EQ(google_breakpad::EXPLOITABILITY_HIGH,
+             ExploitabilityFor("ascii_read_av.dmp"));
+   ASSERT_EQ(google_breakpad::EXPLOITABILITY_HIGH,
+@@ -136,9 +138,12 @@ TEST(ExploitabilityTest, TestWindowsEngi
+             ExploitabilityFor("read_av_clobber_write.dmp"));
+   ASSERT_EQ(google_breakpad::EXPLOITABILITY_LOW,
+             ExploitabilityFor("read_av_conditional.dmp"));
++#endif
+ }
+ 
+ TEST(ExploitabilityTest, TestLinuxEngine) {
++// The following tests are only executable on an x86-class linux machine.
++#if defined(__i386) || defined(__x86_64)
+   ASSERT_EQ(google_breakpad::EXPLOITABILITY_INTERESTING,
+             ExploitabilityFor("linux_null_read_av.dmp"));
+   ASSERT_EQ(google_breakpad::EXPLOITABILITY_HIGH,
+@@ -171,7 +176,8 @@ TEST(ExploitabilityTest, TestLinuxEngine
+             ExploitabilityFor("linux_executable_heap.dmp"));
+   ASSERT_EQ(google_breakpad::EXPLOITABILITY_HIGH,
+             ExploitabilityFor("linux_jmp_to_module_not_exe_region.dmp"));
+-#ifndef _WIN32
++#endif
++#if !defined(_WIN32) && (defined(__i386) || defined(__x86_64))
+   ASSERT_EQ(google_breakpad::EXPLOITABILITY_HIGH,
+             ExploitabilityFor("linux_write_to_nonwritable_module.dmp"));
+   ASSERT_EQ(google_breakpad::EXPLOITABILITY_HIGH,
+@@ -182,10 +188,10 @@ TEST(ExploitabilityTest, TestLinuxEngine
+             ExploitabilityFor("linux_write_to_outside_module_via_math.dmp"));
+   ASSERT_EQ(google_breakpad::EXPLOITABILITY_INTERESTING,
+             ExploitabilityFor("linux_write_to_under_4k.dmp"));
+-#endif  // _WIN32
++#endif  // !defined(_WIN32) && (!defined(__i386) && !defined(__x86_64))
+ }
+ 
+-#ifndef _WIN32
++#if !defined(_WIN32) && (defined(__i386) || defined(__x86_64))
+ TEST(ExploitabilityLinuxUtilsTest, DisassembleBytesTest) {
+   ASSERT_FALSE(ExploitabilityLinuxTest::DisassembleBytes("", NULL, 5, NULL));
+   uint8_t bytes[6] = {0xc7, 0x0, 0x5, 0x0, 0x0, 0x0};
+@@ -301,6 +307,7 @@ TEST(ExploitabilityLinuxUtilsTest, Calcu
+                                                          context,
+                                                          &write_address));
+ }
+-#endif  // _WIN32
++#endif  // !defined(_WIN32) && (defined(__i386) || defined(__x86_64))
++
+ 
+ }  // namespace
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/tools/linux/md2core/minidump-2-core.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/tools/linux/md2core/minidump-2-core.cc
+@@ -77,6 +77,8 @@
+   #define ELF_ARCH  EM_MIPS
+ #elif defined(__aarch64__)
+   #define ELF_ARCH  EM_AARCH64
++#elif defined(__powerpc64__)
++  #define ELF_ARCH  EM_PPC64
+ #endif
+ 
+ #if defined(__arm__)
+@@ -87,6 +89,8 @@ typedef user_regs user_regs_struct;
+ #elif defined (__mips__)
+ // This file-local typedef simplifies the source code.
+ typedef gregset_t user_regs_struct;
++#elif defined(__powerpc64__)
++typedef struct pt_regs user_regs_struct;
+ #endif
+ 
+ using google_breakpad::MDTypeHelper;
+@@ -322,6 +326,12 @@ struct CrashedProcess {
+ #if defined(__aarch64__)
+     user_fpsimd_struct fpregs;
+ #endif
++#if defined(__powerpc64__)
++    mcontext_t mcontext;
++#endif
++#if defined(__powerpc64__)
++    mcontext_t mcontext;
++#endif
+     uintptr_t stack_addr;
+     const uint8_t* stack;
+     size_t stack_length;
+@@ -535,6 +545,38 @@ ParseThreadRegisters(CrashedProcess::Thr
+   thread->mcontext.fpc_eir = rawregs->float_save.fir;
+ #endif
+ }
++#elif defined(__powerpc64__)
++static void
++ParseThreadRegisters(CrashedProcess::Thread* thread,
++                     const MinidumpMemoryRange& range) {
++  const MDRawContextPPC64* rawregs = range.GetData<MDRawContextPPC64>(0);
++
++  for (int i = 0; i < MD_CONTEXT_PPC64_GPR_COUNT; i++)
++    thread->mcontext.gp_regs[i] = rawregs->gpr[i];
++
++  thread->mcontext.gp_regs[PT_LNK] = rawregs->lr;
++  thread->mcontext.gp_regs[PT_NIP] = rawregs->srr0;
++  thread->mcontext.gp_regs[PT_MSR] = rawregs->srr1;
++  thread->mcontext.gp_regs[PT_CCR] = rawregs->cr;
++  thread->mcontext.gp_regs[PT_XER] = rawregs->xer;
++  thread->mcontext.gp_regs[PT_CTR] = rawregs->ctr;
++  thread->mcontext.v_regs->vrsave = rawregs->vrsave;
++
++  for (int i = 0; i < MD_FLOATINGSAVEAREA_PPC_FPR_COUNT; i++)
++      thread->mcontext.fp_regs[i] = rawregs->float_save.fpregs[i];
++
++  thread->mcontext.fp_regs[NFPREG-1] = rawregs->float_save.fpscr;
++
++  for (int i = 0; i < MD_VECTORSAVEAREA_PPC_VR_COUNT; i++) {
++      thread->mcontext.v_regs->vrregs[i][0] = rawregs->vector_save.save_vr[i].high >> 32;
++      thread->mcontext.v_regs->vrregs[i][1] = rawregs->vector_save.save_vr[i].high;
++      thread->mcontext.v_regs->vrregs[i][2] = rawregs->vector_save.save_vr[i].low >> 32;
++      thread->mcontext.v_regs->vrregs[i][3] = rawregs->vector_save.save_vr[i].low;
++  }
++
++  thread->mcontext.v_regs->vscr.vscr_word = rawregs->vector_save.save_vscr.low & 0xFFFFFFFF;
++}
++
+ #else
+ #error "This code has not been ported to your platform yet"
+ #endif
+@@ -623,6 +665,12 @@ ParseSystemInfo(const Options& options,
+ # else
+ #  error "This mips ABI is currently not supported (n32)"
+ # endif
++#elif defined(__powerpc64__)
++  if (sysinfo->processor_architecture != MD_CPU_ARCHITECTURE_PPC64) {
++    fprintf(stderr,
++            "This version of minidump-2-core only supports PPC64.\n");
++    exit(1);
++  }
+ #else
+ #error "This code has not been ported to your platform yet"
+ #endif
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/CONTRIBUTORS
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/CONTRIBUTORS
+@@ -13,3 +13,4 @@ Mark Mentovai <mark@chromium.org>
+ Robert Sesek <rsesek@chromium.org>
+ Scott Graham <scottmg@chromium.org>
+ Joshua Peraza <jperaza@chromium.org>
++Shawn Anastasio <shawn@anastas.io>
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/compat/linux/sys/user.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/compat/linux/sys/user.h
+@@ -15,6 +15,7 @@
+ #ifndef CRASHPAD_COMPAT_LINUX_SYS_USER_H_
+ #define CRASHPAD_COMPAT_LINUX_SYS_USER_H_
+ 
++#include <cstddef>
+ #include_next <sys/user.h>
+ 
+ #include <features.h>
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/minidump/minidump_context.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/minidump/minidump_context.h
+@@ -592,6 +592,70 @@ struct MinidumpContextMIPS64 {
+   uint64_t fir;
+ };
+ 
++//! \brief ppc64-specific flags for MinidumpPPC64::context_flags
++//! Based on minidump_cpu_ppc64.h from breakpad
++enum MinidumpContextPPC64Flags : uint32_t {
++  //! \brief Identifies the context as PPC64.
++  kMinidumpContextPPC64 = 0x01000000,
++
++  //! \brief Indicates the validity of general purpose registers.
++  //!
++  //! Registers `r0`-`r31`, `nip`, `msr`, `lr`, etc. are valid.
++  kMinidumpContextPPC64Base = kMinidumpContextPPC64 | 0x00000001,
++
++  //! \brief Indicates the validity of floating point registers.
++  //!
++  //! Registers `fp0`-`fp31`, `fpscr` are valid.
++  kMinidumpContextPPC64Floating = kMinidumpContextPPC64 | 0x00000008,
++
++  //! \brief Indicates the validity of Altivec/VMX registers.
++  //!
++  //! Registers `v0`-`v31`, `vscr`, `vrsave`.
++  kMinidumpContextPPC64Vector = kMinidumpContextPPC64 | 0x00000020,
++
++  //! \brief Indicates the validity of all registers
++  kMinidumpContextPPC64All = kMinidumpContextPPC64Base     |
++                             kMinidumpContextPPC64Floating |
++                             kMinidumpContextPPC64Vector
++};
++
++//! \brief A PPC64 CPU context carried in a minidump file.
++//! Based on minidump_cpu_ppc64.h from breakpad.
++struct MinidumpContextPPC64 {
++  uint64_t context_flags;
++
++  //! \brief General purpose registers.
++  uint64_t nip;
++  uint64_t msr;
++  uint64_t regs[32];
++  uint64_t ccr;
++  uint64_t xer;
++  uint64_t lnk;
++  uint64_t ctr;
++
++  //! \brief Floating point registers.
++  double fpregs[32];
++
++  //! \brief FPU status register.
++  double fpscr;
++
++  //! \brief Altivec/VMX vector registers.
++  struct {
++      //! \brief Vector registers are 128bits.
++      uint128_struct save_vr[32];
++      uint128_struct save_vscr;
++
++      //! \brief Padding included for breakpad compatibiltiy.
++      uint32_t save_pad5[4];
++
++      //! \brief VRSAVE register.
++      uint32_t save_vrsave;
++
++      //! \brief Padding included for breakpad compatibiltiy.
++      uint32_t save_pad6[7];
++  } vregs;
++};
++
+ }  // namespace crashpad
+ 
+ #endif  // CRASHPAD_MINIDUMP_MINIDUMP_CONTEXT_H_
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/minidump/minidump_context_writer.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/minidump/minidump_context_writer.cc
+@@ -101,6 +101,13 @@ MinidumpContextWriter::CreateFromSnapsho
+       break;
+     }
+ 
++    case kCPUArchitecturePPC64: {
++      context = std::make_unique<MinidumpContextPPC64Writer>();
++      reinterpret_cast<MinidumpContextPPC64Writer*>(context.get())
++          ->InitalizeFromSnapshot(context_snapshot->ppc64);
++      break;
++    }
++
+     default: {
+       LOG(ERROR) << "unknown context architecture "
+                  << context_snapshot->architecture;
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/minidump/minidump_context_writer.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/minidump/minidump_context_writer.h
+@@ -315,6 +315,45 @@ class MinidumpContextMIPS64Writer final
+   DISALLOW_COPY_AND_ASSIGN(MinidumpContextMIPS64Writer);
+ };
+ 
++class MinidumpContextPPC64Writer final : public MinidumpContextWriter {
++ public:
++  MinidumpContextPPC64Writer();
++  ~MinidumpContextPPC64Writer() override;
++
++  //! \brief Initalizes the MinidumpContextPPC64 based on \a context_snapshot.
++  //!
++  //! \param[in] context_snapshot The context snapshot to use as source data.
++  //!
++  //! \note Valid in #kStateMutable. No mutation of context() may be done before
++  //!     calling this method, and it is not normally necessary to alter
++  //!     context() after calling this method.
++  void InitalizeFromSnapshot(const CPUContextPPC64* context_snapshot);
++
++  //! \brief Returns a pointer to the context structure that this object will
++  //!     write.
++  //!
++  //! \attention This returns a non-`const` pointer to this object’s private
++  //!     data so that a caller can populate the context structure directly.
++  //!     This is done because providing setter interfaces to each field in the
++  //!     context structure would be unwieldy and cumbersome. Care must be taken
++  //!     to populate the context structure correctly. The context structure
++  //!     must only be modified while this object is in the #kStateMutable
++  //!     state.
++  MinidumpContextPPC64* context() { return &context_; }
++
++ protected:
++  // MinidumpWritable:
++  bool WriteObject(FileWriterInterface* file_writer) override;
++
++  // MinidumpContextWriter:
++  size_t ContextSize() const override;
++
++ private:
++  MinidumpContextPPC64 context_;
++
++  DISALLOW_COPY_AND_ASSIGN(MinidumpContextPPC64Writer);
++};
++
+ }  // namespace crashpad
+ 
+ #endif  // CRASHPAD_MINIDUMP_MINIDUMP_CONTEXT_WRITER_H_
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/minidump/minidump_context_writer_test.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/minidump/minidump_context_writer_test.cc
+@@ -213,6 +213,21 @@ TEST(MinidumpContextWriter, MIPS64_FromS
+       context, ExpectMinidumpContextMIPS64, kSeed);
+ }
+ 
++TEST(MinidumpContextWriter, PPC64_Zeros) {
++  EmptyContextTest<MinidumpContextPPC64Writer, MinidumpContextPPC64>(
++    ExpectMinidumpContextPPC64);
++}
++
++TEST(MinidumpContextWriter, PPC64_FromSnapshot) {
++  constexpr uint32_t kSeed = 64;
++  CPUContextPPC64 context_ppc64;
++  CPUContext context;
++  context.ppc64 = &context_ppc64;
++  InitializeCPUContextPPC64(&context, kSeed);
++  FromSnapshotTest<MinidumpContextPPC64Writer, MinidumpContextPPC64>(
++      context, ExpectMinidumpContextPPC64, kSeed);
++}
++
+ }  // namespace
+ }  // namespace test
+ }  // namespace crashpad
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/minidump/minidump_misc_info_writer.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/minidump/minidump_misc_info_writer.cc
+@@ -135,6 +135,8 @@ std::string MinidumpMiscInfoDebugBuildSt
+   static constexpr char kCPU[] = "mips";
+ #elif defined(ARCH_CPU_MIPS64EL)
+   static constexpr char kCPU[] = "mips64";
++#elif defined(ARCH_CPU_PPC64)
++  static constexpr char kCPU[] = "ppc64";
+ #else
+ #error define kCPU for this CPU
+ #endif
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/capture_memory.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/capture_memory.cc
+@@ -112,6 +112,11 @@ void CaptureMemory::PointedToByContext(c
+   for (size_t i = 0; i < base::size(context.mipsel->regs); ++i) {
+     MaybeCaptureMemoryAround(delegate, context.mipsel->regs[i]);
+   }
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++  MaybeCaptureMemoryAround(delegate, context.ppc64->nip);
++  for (size_t i = 0; i < base::size(context.ppc64->regs); ++i) {
++    MaybeCaptureMemoryAround(delegate, context.ppc64->regs[i]);
++  }
+ #else
+ #error Port.
+ #endif
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/cpu_architecture.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/cpu_architecture.h
+@@ -43,7 +43,10 @@ enum CPUArchitecture {
+   kCPUArchitectureMIPSEL,
+ 
+   //! \brief 64-bit MIPSEL.
+-  kCPUArchitectureMIPS64EL
++  kCPUArchitectureMIPS64EL,
++
++  //! \brief 64-bit PPC64.
++  kCPUArchitecturePPC64
+ };
+ 
+ }  // namespace crashpad
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/cpu_context.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/cpu_context.cc
+@@ -169,6 +169,8 @@ uint64_t CPUContext::InstructionPointer(
+       return arm->pc;
+     case kCPUArchitectureARM64:
+       return arm64->pc;
++    case kCPUArchitecturePPC64:
++      return ppc64->nip;
+     default:
+       NOTREACHED();
+       return ~0ull;
+@@ -185,6 +187,8 @@ uint64_t CPUContext::StackPointer() cons
+       return arm->sp;
+     case kCPUArchitectureARM64:
+       return arm64->sp;
++    case kCPUArchitecturePPC64:
++      return ppc64->regs[1];
+     default:
+       NOTREACHED();
+       return ~0ull;
+@@ -196,6 +200,7 @@ bool CPUContext::Is64Bit() const {
+     case kCPUArchitectureX86_64:
+     case kCPUArchitectureARM64:
+     case kCPUArchitectureMIPS64EL:
++    case kCPUArchitecturePPC64:
+       return true;
+     case kCPUArchitectureX86:
+     case kCPUArchitectureARM:
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/cpu_context.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/cpu_context.h
+@@ -352,6 +352,24 @@ struct CPUContextMIPS64 {
+   uint64_t fir;
+ };
+ 
++//! \brief A context structure carrying PPC64 CPU state.
++struct CPUContextPPC64 {
++  uint64_t nip;
++  uint64_t msr;
++  uint64_t regs[32];
++  uint64_t ccr;
++  uint64_t xer;
++  uint64_t lnk;
++  uint64_t ctr;
++  double fpregs[32];
++  double fpscr;
++  struct {
++    uint128_struct save_vr[32];
++    uint128_struct save_vscr;
++    uint32_t save_vrsave;
++  } vregs;
++};
++
+ //! \brief A context structure capable of carrying the context of any supported
+ //!     CPU architecture.
+ struct CPUContext {
+@@ -382,6 +400,7 @@ struct CPUContext {
+     CPUContextARM64* arm64;
+     CPUContextMIPS* mipsel;
+     CPUContextMIPS64* mips64;
++    CPUContextPPC64* ppc64;
+   };
+ };
+ 
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/cpu_context_linux.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/cpu_context_linux.h
+@@ -15,6 +15,7 @@
+ #ifndef CRASHPAD_SNAPSHOT_LINUX_CPU_CONTEXT_LINUX_H_
+ #define CRASHPAD_SNAPSHOT_LINUX_CPU_CONTEXT_LINUX_H_
+ 
++#include <cstring>
+ #include "build/build_config.h"
+ #include "snapshot/cpu_context.h"
+ #include "snapshot/linux/signal_context.h"
+@@ -174,6 +175,76 @@ void InitializeCPUContextMIPS(
+ 
+ #endif  // ARCH_CPU_MIPS_FAMILY || DOXYGEN
+ 
++#if defined(ARCH_CPU_PPC64_FAMILY) || DOXYGEN
++
++//! \brief Initalizes a CPUContextPPC64 structure from native context
++//!     structures on Linux.
++//!
++//! \param[in] thread_context The native thread context.
++//! \param[in] float_context The native float context.
++//! \param[in] vector_context The native vector context.
++//! \param[out] context The CPUContextPPC64 structure to initalize.
++template <typename Traits>
++void InitializeCPUContextPPC64(
++    const ThreadContext::t64_t& thread_context,
++    const FloatContext::f64_t& float_context,
++    const VectorContext::v64_t& vector_context,
++    typename Traits::CPUContext* context) {
++
++  memcpy(context->regs, thread_context.gpr, sizeof(context->regs));
++  context->nip = thread_context.nip;
++  context->msr = thread_context.msr;
++  context->ccr = thread_context.ccr;
++  context->xer = thread_context.xer;
++  context->lnk = thread_context.lnk;
++  context->ctr = thread_context.ctr;
++
++  memcpy(context->fpregs, float_context.fpregs, sizeof(context->fpregs));
++  context->fpscr = float_context.fpscr;
++
++  for (uint8_t i = 0; i < 32; i++) {
++    context->vregs.save_vr[i] = {
++      (((uint64_t)vector_context.vrregs[i][0]) << 32) |
++        vector_context.vrregs[i][1],
++      (((uint64_t)vector_context.vrregs[i][2]) << 32) |
++        vector_context.vrregs[i][3]
++    };
++  }
++  context->vregs.save_vrsave = vector_context.vrsave;
++  context->vregs.save_vscr = {0, (uint64_t)vector_context.vscr.vscr_word};
++}
++
++template <typename Traits>
++void InitializeCPUContextPPC64(
++    const SignalThreadContext64 &thread_context,
++    const SignalFloatContext64 &float_context,
++    const SignalVectorContext64 &vector_context,
++    typename Traits::CPUContext* context) {
++
++  memcpy(context->regs, thread_context.regs, sizeof(context->regs));
++  context->nip = thread_context.nip;
++  context->msr = thread_context.msr;
++  context->ccr = thread_context.ccr;
++  context->xer = thread_context.xer;
++  context->lnk = thread_context.lnk;
++  context->ctr = thread_context.ctr;
++
++  memcpy(context->fpregs, float_context.regs, sizeof(context->fpregs));
++  context->fpscr = float_context.fpscr;
++
++  for (uint8_t i = 0; i < 32; i++) {
++    context->vregs.save_vr[i] = {
++      (((uint64_t)vector_context.vrregs[i][0]) << 32) |
++        vector_context.vrregs[i][1],
++      (((uint64_t)vector_context.vrregs[i][2]) << 32) |
++        vector_context.vrregs[i][3]
++    };
++  }
++  context->vregs.save_vrsave = vector_context.vrsave;
++  context->vregs.save_vscr = {0, (uint64_t)vector_context.vscr.vscr_word};
++}
++
++#endif
+ }  // namespace internal
+ }  // namespace crashpad
+ 
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/debug_rendezvous_test.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/debug_rendezvous_test.cc
+@@ -192,6 +192,8 @@ void TestAgainstTarget(PtraceConnection*
+               device == 0 && inode == 0 && mapping_name == "[vdso]";
+ #if defined(ARCH_CPU_X86)
+           static constexpr char kPrefix[] = "linux-gate.so.";
++#elif defined(ARCH_CPU_PPC64)
++          static constexpr char kPrefix[] = "linux-vdso64.so.";
+ #else
+           static constexpr char kPrefix[] = "linux-vdso.so.";
+ #endif
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux.cc
+@@ -323,6 +323,69 @@ bool ExceptionSnapshotLinux::ReadContext
+       reader, context_address, context_.mips64);
+ }
+ 
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++
++template <typename Traits>
++static bool ReadContext(ProcessReaderLinux* reader,
++                        LinuxVMAddress context_address,
++                        typename Traits::CPUContext* dest_context) {
++  const ProcessMemory* memory = reader->Memory();
++
++  LinuxVMAddress gp_regs_address = context_address +
++                                   offsetof(UContext, mcontext) +
++                                   offsetof(typename Traits::MContext, gp_regs);
++
++  typename Traits::SignalThreadContext thread_context;
++  if (!memory->Read(gp_regs_address, sizeof(thread_context), &thread_context)) {
++    LOG(ERROR) << "Couldn't read gp_regs!";
++    return false;
++  }
++
++  LinuxVMAddress fp_regs_address = context_address +
++                                   offsetof(UContext, mcontext) +
++                                   offsetof(typename Traits::MContext, fp_regs);
++
++  typename Traits::SignalFloatContext fp_context;
++  if (!memory->Read(fp_regs_address, sizeof(fp_context), &fp_context)) {
++    LOG(ERROR) << "Couldn't read fp_regs!";
++    return false;
++  }
++
++  LinuxVMAddress v_regs_ptr_address = context_address +
++                                  offsetof(UContext, mcontext) +
++                                  offsetof(typename Traits::MContext, vmx_reserve) + 8;
++
++  typename Traits::SignalVectorContext v_context;
++  if (!memory->Read(v_regs_ptr_address, sizeof(v_context), &v_context)) {
++    LOG(ERROR) << "Couldn't read v_regs!";
++    return false;
++  }
++
++  InitializeCPUContextPPC64<ContextTraits64>(thread_context, fp_context,
++                            v_context, dest_context);
++
++  return true;
++}
++
++template<>
++bool ExceptionSnapshotLinux::ReadContext<ContextTraits64>(
++    ProcessReaderLinux* reader,
++    LinuxVMAddress context_address) {
++  context_.architecture = kCPUArchitecturePPC64;
++  context_.ppc64 = &context_union_.ppc64;
++
++  return internal::ReadContext<ContextTraits64>(
++      reader, context_address, context_.ppc64);
++}
++
++template<>
++bool ExceptionSnapshotLinux::ReadContext<ContextTraits32>(
++    ProcessReaderLinux* reader,
++    LinuxVMAddress context_address) {
++  // PPC64 is 64-bit
++  return false;
++}
++
+ #endif  // ARCH_CPU_X86_FAMILY
+ 
+ bool ExceptionSnapshotLinux::Initialize(ProcessReaderLinux* process_reader,
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux.h
+@@ -84,6 +84,8 @@ class ExceptionSnapshotLinux final : pub
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+     CPUContextMIPS mipsel;
+     CPUContextMIPS64 mips64;
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++    CPUContextPPC64 ppc64;
+ #endif
+   } context_union_;
+   CPUContext context_;
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux_test.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux_test.cc
+@@ -296,7 +296,28 @@ void ExpectContext(const CPUContext& act
+             0);
+ #undef CPU_ARCH_NAME
+ }
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++using NativeCPUContext = ucontext_t;
+ 
++void InitializeContext(NativeCPUContext* context) {
++  for (size_t reg = 0; reg < 32; ++reg) {
++    context->uc_mcontext.gp_regs[reg] = reg;
++  }
++
++  memset(&context->uc_mcontext.fp_regs, 44,
++      sizeof(context->uc_mcontext.fp_regs));
++}
++
++void ExpectContext(const CPUContext& actual, const NativeCPUContext& expected) {
++  EXPECT_EQ(actual.architecture, kCPUArchitecturePPC64);
++
++  for (size_t reg = 0; reg < 32; ++reg) {
++    EXPECT_EQ(actual.ppc64->regs[reg], expected.uc_mcontext.gp_regs[reg]);
++  }
++
++  EXPECT_EQ(memcmp(actual.ppc64->fpregs, expected.uc_mcontext.fp_regs,
++            sizeof(actual.ppc64->fpregs)), 0);
++}
+ #else
+ #error Port.
+ #endif
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/process_reader_linux.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/process_reader_linux.cc
+@@ -108,6 +108,8 @@ void ProcessReaderLinux::Thread::Initial
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+   stack_pointer = reader->Is64Bit() ? thread_info.thread_context.t64.regs[29]
+                                     : thread_info.thread_context.t32.regs[29];
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++  stack_pointer = thread_info.thread_context.t64.gpr[1];
+ #else
+ #error Port.
+ #endif
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/signal_context.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/signal_context.h
+@@ -422,6 +422,93 @@ static_assert(offsetof(UContext<ContextT
+               "context offset mismatch");
+ #endif
+ 
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++
++struct SignalThreadContext64 {
++  uint64_t regs[32];
++  uint64_t nip;
++  uint64_t msr;
++  uint64_t orig_r3;
++  uint64_t ctr;
++  uint64_t lnk;
++  uint64_t xer;
++  uint64_t ccr;
++  uint64_t softe;
++  uint64_t trap;
++  uint64_t dar;
++  uint64_t dsisr;
++  uint64_t result;
++  uint64_t dscr;
++  uint64_t fpr0[3];
++};
++
++struct SignalFloatContext64 {
++  double regs[32];
++  double fpscr;
++};
++
++struct SignalVectorContext64 {
++  int32_t vrregs[32][4];
++  struct {
++    int32_t __pad[3];
++    int32_t vscr_word;
++  } vscr;
++  int32_t vrsave;
++  int32_t __pad[3];
++} __attribute__((__aligned__(16)));
++
++
++#pragma pack(pop)
++struct MContext64 {
++  uint64_t reserved[4];
++  int32_t signal;
++  int32_t __pad0;
++  uint64_t handler;
++  uint64_t oldmask;
++  uint64_t pt_regs_ptr;
++  SignalThreadContext64 gp_regs;
++  SignalFloatContext64  fp_regs;
++  SignalVectorContext64 *v_regs;
++#ifdef __GLIBC__
++  int64_t vmx_reserve[69];
++#else
++  int64_t vmx_reserve[101];
++#endif
++};
++
++struct ContextTraits64 : public Traits64 {
++  using MContext = MContext64;
++  using SignalThreadContext = SignalThreadContext64;
++  using SignalFloatContext = SignalFloatContext64;
++  using SignalVectorContext = SignalVectorContext64;
++  using CPUContext = CPUContextPPC64;
++};
++
++struct ContextTraits32 : public Traits32 {};
++
++struct UContext {
++  uint64_t flags;
++  uint64_t link;
++  SignalStack<ContextTraits64> stack;
++  Sigset<ContextTraits64> sigmask;
++  MContext64 mcontext;
++};
++#pragma pack(push, 1)
++
++static_assert(sizeof(UContext) == sizeof(ucontext_t),
++              "ucontext_t size mismatch");
++static_assert(sizeof(MContext64) == sizeof(mcontext_t),
++              "mcontext_t size mismatch");
++static_assert(sizeof(SignalThreadContext64) == sizeof(gregset_t),
++              "gregset_t size mismatch");
++static_assert(sizeof(SignalFloatContext64) == sizeof(fpregset_t),
++              "fpregset_t size mismatch");
++static_assert(sizeof(SignalVectorContext64) == sizeof(vrregset_t),
++              "vrregset_t size mismatch");
++static_assert(offsetof(UContext, mcontext) ==
++              offsetof(ucontext_t, uc_mcontext), "mcontext offset mismatch");
++static_assert(offsetof(MContext64, gp_regs) ==
++              offsetof(mcontext_t, gp_regs), "gp_regs offset mismatch");
+ #else
+ #error Port.
+ #endif  // ARCH_CPU_X86_FAMILY
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/system_snapshot_linux.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/system_snapshot_linux.cc
+@@ -204,6 +204,8 @@ CPUArchitecture SystemSnapshotLinux::Get
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+   return process_reader_->Is64Bit() ? kCPUArchitectureMIPS64EL
+                                     : kCPUArchitectureMIPSEL;
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++  return kCPUArchitecturePPC64;
+ #else
+ #error port to your architecture
+ #endif
+@@ -219,6 +221,9 @@ uint32_t SystemSnapshotLinux::CPURevisio
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+   // Not implementable on MIPS
+   return 0;
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++  // Not yet implemented on PPC64
++  return 0;
+ #else
+ #error port to your architecture
+ #endif
+@@ -239,6 +244,9 @@ std::string SystemSnapshotLinux::CPUVend
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+   // Not implementable on MIPS
+   return std::string();
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++  // Not yet implemented on PPC64
++  return std::string();
+ #else
+ #error port to your architecture
+ #endif
+@@ -372,6 +380,9 @@ bool SystemSnapshotLinux::NXEnabled() co
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+   // Not implementable on MIPS
+   return false;
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++  // Not yet implemented on PPC64
++  return false;
+ #else
+ #error Port.
+ #endif  // ARCH_CPU_X86_FAMILY
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/test_modules.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/test_modules.cc
+@@ -110,6 +110,8 @@ bool WriteTestModule(const base::FilePat
+   module.ehdr.e_machine = EM_AARCH64;
+ #elif defined(ARCH_CPU_MIPSEL) || defined(ARCH_CPU_MIPS64EL)
+   module.ehdr.e_machine = EM_MIPS;
++#elif defined(ARCH_CPU_PPC64)
++  module.ehdr.e_machine = EM_PPC64;
+ #endif
+ 
+   module.ehdr.e_version = EV_CURRENT;
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/thread_snapshot_linux.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/thread_snapshot_linux.cc
+@@ -186,6 +186,14 @@ bool ThreadSnapshotLinux::Initialize(Pro
+         thread.thread_info.float_context.f32,
+         context_.mipsel);
+   }
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++  context_.architecture = kCPUArchitecturePPC64;
++  context_.ppc64 = &context_union_.ppc64;
++  InitializeCPUContextPPC64<ContextTraits64>(
++      thread.thread_info.thread_context.t64,
++      thread.thread_info.float_context.f64,
++      thread.thread_info.vector_context.v64,
++      context_.ppc64);
+ #else
+ #error Port.
+ #endif
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/thread_snapshot_linux.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/thread_snapshot_linux.h
+@@ -68,6 +68,8 @@ class ThreadSnapshotLinux final : public
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+     CPUContextMIPS mipsel;
+     CPUContextMIPS64 mips64;
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++    CPUContextPPC64 ppc64;
+ #else
+ #error Port.
+ #endif  // ARCH_CPU_X86_FAMILY
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/util/linux/auxiliary_vector.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/util/linux/auxiliary_vector.cc
+@@ -56,6 +56,11 @@ bool AuxiliaryVector::Read(PtraceConnect
+     if (type == AT_IGNORE) {
+       continue;
+     }
++#if defined(ARCH_CPU_PPC64_FAMILY)
++    if (type == AT_IGNOREPPC) {
++      continue;
++    }
++#endif
+     if (!MapInsertOrReplace(&values_, type, value, nullptr)) {
+       LOG(ERROR) << "duplicate auxv entry";
+       return false;
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/util/linux/ptracer.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/util/linux/ptracer.cc
+@@ -401,6 +401,64 @@ bool GetThreadArea64(pid_t tid,
+   return true;
+ }
+ 
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++// PPC64 has had HAVE_ARCH_TRACEHOOK set since 2.6.27 (even before x86 had it).
++// That means we can simply use PTRACE_GETREGESET.
++
++template <typename Destination>
++bool GetRegisterSet(pid_t tid, int set, Destination* dest, bool can_log) {
++  iovec iov;
++  iov.iov_base = reinterpret_cast<void*>(dest);
++  iov.iov_len = sizeof(*dest);
++  if (ptrace(PTRACE_GETREGSET, tid, reinterpret_cast<void*>(set), &iov) != 0) {
++    PLOG_IF(ERROR, can_log) << "ptrace";
++    return false;
++  }
++  if (iov.iov_len != sizeof(*dest)) {
++    LOG_IF(ERROR, can_log) << "Unexpected registers size";
++    return false;
++  }
++  return true;
++}
++
++bool GetVectorRegisters64(pid_t tid,
++                          VectorContext* context,
++                          bool can_log) {
++  return GetRegisterSet(tid, NT_PPC_VMX, &context->v64, can_log);
++}
++
++bool GetFloatingPointRegisters64(pid_t tid,
++                                 FloatContext* context,
++                                 bool can_log) {
++  return GetRegisterSet(tid, NT_PRFPREG, &context->f64, can_log);
++}
++
++bool GetThreadArea64(pid_t tid,
++                     const ThreadContext& context,
++                     LinuxVMAddress* address,
++                     bool can_log) {
++  // PPC64 doesn't have PTRACE_GET_THREAD_AREA since the thread pointer
++  // is stored in GPR 13.
++  ThreadContext::t64_t tc;
++  if (!GetRegisterSet(tid, NT_PRSTATUS, &tc, can_log)) {
++    LOG_IF(ERROR, can_log) << "Unable to get thread pointer!";
++    return false;
++  }
++
++  *address = tc.gpr[13];
++
++  return true;
++}
++
++// Stubs for 32-bit functions not applicable on PPC64
++bool GetFloatingPointRegisters32(pid_t tid,
++                                 FloatContext* context,
++                                 bool can_log) { return false; }
++bool GetThreadArea32(pid_t tid,
++                     const ThreadContext &context,
++                     LinuxVMAddress *address,
++                     bool can_log) { return false; }
++
+ #else
+ #error Port.
+ #endif  // ARCH_CPU_X86_FAMILY
+@@ -497,6 +555,9 @@ bool Ptracer::GetThreadInfo(pid_t tid, T
+   if (is_64_bit_) {
+     return GetGeneralPurposeRegisters64(tid, &info->thread_context, can_log_) &&
+            GetFloatingPointRegisters64(tid, &info->float_context, can_log_) &&
++#if defined(ARCH_CPU_PPC64_FAMILY)
++           GetVectorRegisters64(tid, &info->vector_context, can_log_) &&
++#endif
+            GetThreadArea64(tid,
+                            info->thread_context,
+                            &info->thread_specific_data_address,
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/util/linux/thread_info.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/util/linux/thread_info.h
+@@ -39,6 +39,13 @@ struct user_vfp_exc {
+ #include <android/api-level.h>
+ #endif
+ 
++#if defined(ARCH_CPU_PPC64_FAMILY)
++#include <sys/ucontext.h>
++#if !defined(__GLIBC__)
++#include <asm/ptrace.h>
++#endif
++#endif
++
+ namespace crashpad {
+ 
+ //! \brief The set of general purpose registers for an architecture family.
+@@ -90,6 +97,8 @@ union ThreadContext {
+     uint32_t cp0_status;
+     uint32_t cp0_cause;
+     uint32_t padding1_;
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++    // PPC64 is 64-bit
+ #else
+ #error Port.
+ #endif  // ARCH_CPU_X86_FAMILY
+@@ -143,6 +152,21 @@ union ThreadContext {
+     uint64_t cp0_badvaddr;
+     uint64_t cp0_status;
+     uint64_t cp0_cause;
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++    // Reflects struct pt_regs in asm/ptrace.h.
++    uint64_t gpr[32];
++    uint64_t nip;
++    uint64_t msr;
++    uint64_t orig_gpr3;
++    uint64_t ctr;
++    uint64_t lnk;
++    uint64_t xer;
++    uint64_t ccr;
++    uint64_t softe;
++    uint64_t trap;
++    uint64_t dar;
++    uint64_t dsisr;
++    uint64_t result;
+ #else
+ #error Port.
+ #endif  // ARCH_CPU_X86_FAMILY
+@@ -154,6 +178,8 @@ union ThreadContext {
+   using NativeThreadContext = user_regs;
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+ // No appropriate NativeThreadsContext type available for MIPS
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++  using NativeThreadContext = struct pt_regs;
+ #else
+ #error Port.
+ #endif  // ARCH_CPU_X86_FAMILY || ARCH_CPU_ARM64
+@@ -229,6 +255,9 @@ union FloatContext {
+     } fpregs[32];
+     uint32_t fpcsr;
+     uint32_t fpu_id;
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++    // Crashpad's PPC support is 64-bit only, so this
++    // 32bit-only struct is declared as empty.
+ #else
+ #error Port.
+ #endif  // ARCH_CPU_X86_FAMILY
+@@ -263,6 +292,10 @@ union FloatContext {
+     double fpregs[32];
+     uint32_t fpcsr;
+     uint32_t fpu_id;
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++    // Reflects fpregset_t in sys/ucontext.h
++    double fpregs[32];
++    double fpscr;
+ #else
+ #error Port.
+ #endif  // ARCH_CPU_X86_FAMILY
+@@ -291,6 +324,8 @@ union FloatContext {
+   static_assert(sizeof(f64) == sizeof(user_fpsimd_struct), "Size mismatch");
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+ // No appropriate floating point context native type for available MIPS.
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++  static_assert(sizeof(f64) == sizeof(fpregset_t), "Size mismatch");
+ #else
+ #error Port.
+ #endif  // ARCH_CPU_X86
+@@ -298,6 +333,26 @@ union FloatContext {
+ static_assert(std::is_standard_layout<FloatContext>::value,
+               "Not standard layout");
+ 
++//! \brief The vector registers used for an architecture family
++union VectorContext {
++  struct v32_t {} v32;
++#if defined(ARCH_CPU_PPC64_FAMILY)
++  __attribute__((__aligned__(16))) // Vector context must be doubleword aligned.
++#endif
++  struct v64_t {
++#if defined(ARCH_CPU_PPC64_FAMILY)
++    // Reflects vrregset_t in sys/ucontext.h
++    uint32_t vrregs[32][4];
++    struct {
++      uint32_t __pad[3];
++      uint32_t vscr_word;
++    } vscr;
++    uint32_t vrsave;
++    uint32_t __pad[3];
++#endif
++  } v64;
++};
++
+ //! \brief A collection of `ptrace`-able information about a thread.
+ struct ThreadInfo {
+   ThreadInfo();
+@@ -309,6 +364,9 @@ struct ThreadInfo {
+   //! \brief The floating point registers for the thread.
+   FloatContext float_context;
+ 
++  //! \brief (Optional) The vector registers used for the thread.
++  VectorContext vector_context;
++
+   //! \brief The thread-local storage address for the thread.
+   LinuxVMAddress thread_specific_data_address;
+ };
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/util/misc/capture_context.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/util/misc/capture_context.h
+@@ -69,6 +69,7 @@ using NativeCPUContext = ucontext_t;
+ //!     macOS/Linux/Fuchsia | x86_64       | `%%rdi`
+ //!     Linux               | ARM/ARM64    | `r0`/`x0`
+ //!     Linux               | MIPS/MIPS64  | `$a0`
++//!     Linux               | PPC64        | `r3`
+ //!
+ //!     Additionally, the value `LR` on ARM/ARM64 will be the return address of
+ //!     this function.
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/util/misc/capture_context_linux.S
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/util/misc/capture_context_linux.S
+@@ -32,7 +32,7 @@
+   .balign 4, 0x0
+   .type CAPTURECONTEXT_SYMBOL, %function
+   .type CAPTURECONTEXT_SYMBOL2, %function
+-#elif defined(__mips__)
++#elif defined(__mips__) || defined(__powerpc64__)
+   .balign 4, 0x0
+ #endif
+ 
+@@ -423,4 +423,214 @@ CAPTURECONTEXT_SYMBOL2:
+   jr $ra
+ 
+   .set at
++#elif defined(__powerpc64__)
++  // Store r0-r31
++  std 0, 0xe8(3)   // context->uc_mcontext.gp_regs[0]
++  std 1, 0xf0(3)   // context->uc_mcontext.gp_regs[1]
++  std 2, 0xf8(3)   // context->uc_mcontext.gp_regs[2]
++  // note that r3's original value was lost
++  std 3, 0x100(3)  // context->uc_mcontext.gp_regs[3]
++  std 4, 0x108(3)  // context->uc_mcontext.gp_regs[4]
++  std 5, 0x110(3)  // context->uc_mcontext.gp_regs[5]
++  std 6, 0x118(3)  // context->uc_mcontext.gp_regs[6]
++  std 7, 0x120(3)  // context->uc_mcontext.gp_regs[7]
++  std 8, 0x128(3)  // context->uc_mcontext.gp_regs[8]
++  std 9, 0x130(3)  // context->uc_mcontext.gp_regs[9]
++  std 10, 0x138(3) // context->uc_mcontext.gp_regs[10]
++  std 11, 0x140(3) // context->uc_mcontext.gp_regs[11]
++  std 12, 0x148(3) // context->uc_mcontext.gp_regs[12]
++  std 13, 0x150(3) // context->uc_mcontext.gp_regs[13]
++  std 14, 0x158(3) // context->uc_mcontext.gp_regs[14]
++  std 15, 0x160(3) // context->uc_mcontext.gp_regs[15]
++  std 16, 0x168(3) // context->uc_mcontext.gp_regs[16]
++  std 17, 0x170(3) // context->uc_mcontext.gp_regs[17]
++  std 18, 0x178(3) // context->uc_mcontext.gp_regs[18]
++  std 19, 0x180(3) // context->uc_mcontext.gp_regs[19]
++  std 20, 0x188(3) // context->uc_mcontext.gp_regs[20]
++  std 21, 0x190(3) // context->uc_mcontext.gp_regs[21]
++  std 22, 0x198(3) // context->uc_mcontext.gp_regs[22]
++  std 23, 0x1a0(3) // context->uc_mcontext.gp_regs[23]
++  std 24, 0x1a8(3) // context->uc_mcontext.gp_regs[24]
++  std 25, 0x1b0(3) // context->uc_mcontext.gp_regs[25]
++  std 26, 0x1b8(3) // context->uc_mcontext.gp_regs[26]
++  std 27, 0x1c0(3) // context->uc_mcontext.gp_regs[27]
++  std 28, 0x1c8(3) // context->uc_mcontext.gp_regs[28]
++  std 29, 0x1d0(3) // context->uc_mcontext.gp_regs[29]
++  std 30, 0x1d8(3) // context->uc_mcontext.gp_regs[30]
++  std 31, 0x1e0(3) // context->uc_mcontext.gp_regs[31]
++
++  // For NIP, we can use the value in the link register
++  mflr 0
++  std 0, 0x1e8(3) // context->uc_mcontext.gp_regs[PT_NIP]
++
++  // CTR
++  mfctr 0
++  std 0, 0x200(3) // context->uc_mcontext.gp_regs[PT_CTR]
++
++  // For LNK, we'll use the caller's LR save area (2 stack frames up).
++  // r4 can be used as a scratch register since it has already been saved.
++  ld 4, 0(1)
++  ld 4, 16(4)
++  std 4, 0x208(3) // context->uc_mcontext.gp_regs[PT_LNK]
++
++  // XER
++  mfxer 0
++  std 0, 0x210(3) // context->uc_mcontext.gp_regs[PT_XER]
++
++  // CCR
++  mfcr 0
++  std 0, 0x218(3) // context->uc_mcontext.gp_regs[PT_CCR]
++
++  // MSR, orig_r3, MQ, TRAP, DAR, DSISR, RESULT, DSCR,
++  // not used or not relevant,  zero them out.
++  li 4, 0
++  std 4, 0x1f0(3) // context->uc_mcontext.gp_regs[PT_MSR]
++  std 4, 0x1f8(3) // context->uc_mcontext.gp_regs[PT_ORIG_R3]
++  std 4, 0x220(3) // context->uc_mcontext.gp_regs[PT_MQ]
++  std 4, 0x228(3) // context->uc_mcontext.gp_regs[PT_TRAP]
++  std 4, 0x230(3) // context->uc_mcontext.gp_regs[PT_DAR]
++  std 4, 0x238(3) // context->uc_mcontext.gp_regs[PT_DSISR]
++  std 4, 0x240(3) // context->uc_mcontext.gp_regs[PT_RESULT]
++  std 4, 0x248(3) // context->uc_mcontext.gp_regs[PT_DSCR]
++
++  // Update context->uc_mcontext.regs to point to gp_regs
++  addi 0, 3, 0xe8
++  std 0, 0xe0(3)
++
++  // Save floating point registers 0-31
++  stfd 0, 0x268(3)  // context->uc_mcontext.fp_regs[0]
++  stfd 1, 0x270(3)  // context->uc_mcontext.fp_regs[1]
++  stfd 2, 0x278(3)  // context->uc_mcontext.fp_regs[2]
++  stfd 3, 0x280(3)  // context->uc_mcontext.fp_regs[3]
++  stfd 4, 0x288(3)  // context->uc_mcontext.fp_regs[4]
++  stfd 5, 0x290(3)  // context->uc_mcontext.fp_regs[5]
++  stfd 6, 0x298(3)  // context->uc_mcontext.fp_regs[6]
++  stfd 7, 0x2a0(3)  // context->uc_mcontext.fp_regs[7]
++  stfd 8, 0x2a8(3)  // context->uc_mcontext.fp_regs[8]
++  stfd 9, 0x2b0(3)  // context->uc_mcontext.fp_regs[9]
++  stfd 10, 0x2b8(3) // context->uc_mcontext.fp_regs[10]
++  stfd 11, 0x2c0(3) // context->uc_mcontext.fp_regs[11]
++  stfd 12, 0x2c8(3) // context->uc_mcontext.fp_regs[12]
++  stfd 13, 0x2d0(3) // context->uc_mcontext.fp_regs[13]
++  stfd 14, 0x2d8(3) // context->uc_mcontext.fp_regs[14]
++  stfd 15, 0x2e0(3) // context->uc_mcontext.fp_regs[15]
++  stfd 16, 0x2e8(3) // context->uc_mcontext.fp_regs[16]
++  stfd 17, 0x2f0(3) // context->uc_mcontext.fp_regs[17]
++  stfd 18, 0x2f8(3) // context->uc_mcontext.fp_regs[18]
++  stfd 19, 0x300(3) // context->uc_mcontext.fp_regs[19]
++  stfd 20, 0x308(3) // context->uc_mcontext.fp_regs[20]
++  stfd 21, 0x310(3) // context->uc_mcontext.fp_regs[21]
++  stfd 22, 0x318(3) // context->uc_mcontext.fp_regs[22]
++  stfd 23, 0x320(3) // context->uc_mcontext.fp_regs[23]
++  stfd 24, 0x328(3) // context->uc_mcontext.fp_regs[24]
++  stfd 25, 0x330(3) // context->uc_mcontext.fp_regs[25]
++  stfd 26, 0x338(3) // context->uc_mcontext.fp_regs[26]
++  stfd 27, 0x340(3) // context->uc_mcontext.fp_regs[27]
++  stfd 28, 0x348(3) // context->uc_mcontext.fp_regs[28]
++  stfd 29, 0x350(3) // context->uc_mcontext.fp_regs[29]
++  stfd 30, 0x358(3) // context->uc_mcontext.fp_regs[30]
++  stfd 31, 0x360(3) // context->uc_mcontext.fp_regs[31]
++
++  // FPSCR
++  mffs 0
++  stfd 0, 0x368(3) // context->uc_mcontext.fp_regs[32]
++
++  // Save VMX Vector registers
++  // Update r4 to contain the base address of vmx_reserve
++  addi 4, 3, 0x378
++  // Ensure that it is quadword aligned
++  andi. 5, 4, 0xF
++  beq 1f // No alignment is necessary
++  // Address is doubleword aligned and not quadword aligned, add 8
++  addi 4, 4, 8
++
++1:
++  // Store VMX registers 0-31
++  // r4 will contain the base address
++  // r5 will contain the index
++  li 5, 0
++  stvx 0, 4, 5   // context->uc_mcontext.vmx_reserve[(align) + 0]
++  addi 5, 5, 16
++  stvx 1, 4, 5   // context->uc_mcontext.vmx_reserve[(align) + 1]
++  addi 5, 5, 16
++  stvx 2, 4, 5   // context->uc_mcontext.vmx_reserve[(align) + 2]
++  addi 5, 5, 16
++  stvx 3, 4, 5   // context->uc_mcontext.vmx_reserve[(align) + 3]
++  addi 5, 5, 16
++  stvx 4, 4, 5   // context->uc_mcontext.vmx_reserve[(align) + 4]
++  addi 5, 5, 16
++  stvx 5, 4, 5   // context->uc_mcontext.vmx_reserve[(align) + 5]
++  addi 5, 5, 16
++  stvx 6, 4, 5   // context->uc_mcontext.vmx_reserve[(align) + 6]
++  addi 5, 5, 16
++  stvx 7, 4, 5   // context->uc_mcontext.vmx_reserve[(align) + 7]
++  addi 5, 5, 16
++  stvx 8, 4, 5   // context->uc_mcontext.vmx_reserve[(align) + 8]
++  addi 5, 5, 16
++  stvx 9, 4, 5   // context->uc_mcontext.vmx_reserve[(align) + 9]
++  addi 5, 5, 16
++  stvx 10, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 10]
++  addi 5, 5, 16
++  stvx 11, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 11]
++  addi 5, 5, 16
++  stvx 12, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 12]
++  addi 5, 5, 16
++  stvx 13, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 13]
++  addi 5, 5, 16
++  stvx 14, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 14]
++  addi 5, 5, 16
++  stvx 15, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 15]
++  addi 5, 5, 16
++  stvx 16, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 16]
++  addi 5, 5, 16
++  stvx 17, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 17]
++  addi 5, 5, 16
++  stvx 18, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 18]
++  addi 5, 5, 16
++  stvx 19, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 19]
++  addi 5, 5, 16
++  stvx 20, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 20]
++  addi 5, 5, 16
++  stvx 21, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 21]
++  addi 5, 5, 16
++  stvx 22, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 22]
++  addi 5, 5, 16
++  stvx 23, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 23]
++  addi 5, 5, 16
++  stvx 24, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 24]
++  addi 5, 5, 16
++  stvx 25, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 25]
++  addi 5, 5, 16
++  stvx 26, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 26]
++  addi 5, 5, 16
++  stvx 27, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 27]
++  addi 5, 5, 16
++  stvx 28, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 28]
++  addi 5, 5, 16
++  stvx 29, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 29]
++  addi 5, 5, 16
++  stvx 30, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 30]
++  addi 5, 5, 16
++  stvx 31, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 31]
++  addi 5, 5, 16
++
++  // VSCR
++  mfvscr 0
++  stvx 0, 4, 5
++  addi 5, 5, 16
++
++  // VRSAVE
++  mfvrsave 0
++  stwx 0, 4, 5
++
++  // Update context->uc_mcontext.v_regs to point to vmx_reserve + alignment.
++  std 4, 0x370(3)
++
++  // Zero out all unused fields
++  li 4, 0
++  std 4, 0xc8(3) // context->uc_mcontext.signal
++  std 4, 0xd0(3) // context->uc_mcontext.handler
++  std 4, 0xd8(3) // context->uc_mcontext.oldmask
++
++  blr
+ #endif  // __i386__
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/util/misc/capture_context_test.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/util/misc/capture_context_test.cc
+@@ -57,7 +57,7 @@ void TestCaptureContext() {
+   uintptr_t pc = ProgramCounterFromContext(context_1);
+ 
+ #if !defined(ADDRESS_SANITIZER) && !defined(ARCH_CPU_MIPS_FAMILY) && \
+-    !defined(MEMORY_SANITIZER)
++    !defined(MEMORY_SANITIZER) && !defined(ARCH_CPU_PPC64_FAMILY)
+   // Sanitizers can cause enough code bloat that the “nearby” check would
+   // likely fail.
+   const uintptr_t kReferencePC =
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/util/misc/capture_context_test_util_linux.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/util/misc/capture_context_test_util_linux.cc
+@@ -35,6 +35,8 @@ void SanityCheckContext(const NativeCPUC
+   EXPECT_EQ(context.uc_mcontext.regs[0], FromPointerCast<uintptr_t>(&context));
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+   EXPECT_EQ(context.uc_mcontext.gregs[4], FromPointerCast<uintptr_t>(&context));
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++  EXPECT_EQ(context.uc_mcontext.gp_regs[3], FromPointerCast<uintptr_t>(&context));
+ #endif
+ }
+ 
+@@ -49,6 +51,8 @@ uintptr_t ProgramCounterFromContext(cons
+   return context.uc_mcontext.pc;
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+   return context.uc_mcontext.pc;
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++  return context.uc_mcontext.gp_regs[PT_NIP];
+ #endif
+ }
+ 
+@@ -63,6 +67,8 @@ uintptr_t StackPointerFromContext(const
+   return context.uc_mcontext.sp;
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+   return context.uc_mcontext.gregs[29];
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++  return context.uc_mcontext.gp_regs[1];
+ #endif
+ }
+ 
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/util/posix/signals_test.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/util/posix/signals_test.cc
+@@ -46,9 +46,9 @@ bool CanCauseSignal(int sig) {
+   return sig == SIGABRT ||
+          sig == SIGALRM ||
+          sig == SIGBUS ||
+-#if !defined(ARCH_CPU_ARM64)
++#if !defined(ARCH_CPU_ARM64) && !defined(ARCH_CPU_PPC64)
+          sig == SIGFPE ||
+-#endif  // !defined(ARCH_CPU_ARM64)
++#endif  // !defined(ARCH_CPU_ARM64) && !defined(ARCH_CPU_PPC64)
+ #if defined(ARCH_CPU_X86_FAMILY) || defined(ARCH_CPU_ARMEL)
+          sig == SIGILL ||
+ #endif  // defined(ARCH_CPU_X86_FAMILY) || defined(ARCH_CPU_ARMEL)
+@@ -117,9 +117,11 @@ void CauseSignal(int sig) {
+       break;
+     }
+ 
+-#if !defined(ARCH_CPU_ARM64)
++#if !defined(ARCH_CPU_ARM64) && !defined(ARCH_CPU_PPC64)
+     // ARM64 has hardware integer division instructions that don’t generate a
+     // trap for divide-by-zero, so this doesn’t produce SIGFPE.
++    //
++    // PPC64 fixed-point division by zero also doesn't produce a SIGFPE.
+     case SIGFPE: {
+       // Optimization makes this tricky, so get zero from a system call likely
+       // to succeed, and try to do something with the result.
+@@ -137,7 +139,7 @@ void CauseSignal(int sig) {
+       fstat(quotient, &stat_buf);
+       break;
+     }
+-#endif  // ARCH_CPU_ARM64
++#endif  // !defined(ARCH_CPU_ARM64) && !defined(ARCH_CPU_PPC64)
+ 
+ #if defined(ARCH_CPU_X86_FAMILY) || defined(ARCH_CPU_ARMEL)
+     case SIGILL: {
+--- a/src/3rdparty/chromium/third_party/dav1d/BUILD.gn
++++ b/src/3rdparty/chromium/third_party/dav1d/BUILD.gn
+@@ -196,6 +196,8 @@ static_library("dav1d_8bit") {
+     sources += arm_template_sources
+   } else if (current_cpu == "arm64") {
+     sources += arm_template_sources
++  } else if (current_cpu == "ppc64") {
++    sources += ppc64_template_sources
+   }
+ 
+   cflags = dav1d_copts
+@@ -226,6 +228,8 @@ static_library("dav1d_10bit") {
+     sources += arm_template_sources
+   } else if (current_cpu == "arm64") {
+     sources += arm_template_sources
++  } else if (current_cpu == "ppc64") {
++    sources += ppc64_template_sources
+   }
+ 
+   cflags = dav1d_copts
+@@ -283,6 +287,21 @@ if (current_cpu == "x86" || current_cpu
+     }
+ 
+     cflags = dav1d_copts
++  }
++} else if (current_cpu == "ppc64") {
++  static_library("dav1d_ppc") {
++    sources = [
++      "libdav1d/src/ppc/cpu.c",
++      "libdav1d/src/ppc/cpu.h",
++    ]
++
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [
++      "//build/config/compiler:no_chromium_code",
++      ":dav1d_config",
++    ]
++
++    cflags = dav1d_copts
+ 
+     deps = [ ":dav1d_headers" ]
+     allow_circular_includes_from = [ ":dav1d_headers" ]
+@@ -315,5 +334,7 @@ static_library("dav1d") {
+     }
+   } else if (current_cpu == "arm" || current_cpu == "arm64") {
+     deps += [ ":dav1d_arm" ]
++  } else if (current_cpu == "ppc64") {
++    deps += [ ":dav1d_ppc" ]
+   }
+ }
+--- a/src/3rdparty/chromium/third_party/dav1d/dav1d_generated.gni
++++ b/src/3rdparty/chromium/third_party/dav1d/dav1d_generated.gni
+@@ -103,6 +103,11 @@ arm_template_sources = [
+   "libdav1d/src/arm/mc_init_tmpl.c",
+ ]
+ 
++ppc64_template_sources = [
++  "libdav1d/src/ppc/cdef_init_tmpl.c",
++  "libdav1d/src/ppc/looprestoration_init_tmpl.c",
++]
++
+ template_sources = [
+   "libdav1d/src/cdef_apply_tmpl.c",
+   "libdav1d/src/cdef_tmpl.c",
+--- a/src/3rdparty/chromium/third_party/dav1d/generate_source.py
++++ b/src/3rdparty/chromium/third_party/dav1d/generate_source.py
+@@ -57,6 +57,8 @@ def _WriteGn(fd):
+   _WriteArray(fd, "arm64_asm_sources", _Glob("libdav1d/src/arm/64/*.S"))
+   _WriteArray(fd, "arm_template_sources", _Glob("libdav1d/src/arm/*_tmpl.c"))
+ 
++  _WriteArray(fd, "ppc64_template_sources", _Glob("libdav1d/src/ppc/*_tmpl.c"))
++
+   template_sources = _Glob("libdav1d/src/*_tmpl.c")
+   _WriteArray(fd, "template_sources", template_sources)
+ 
+--- a/src/3rdparty/chromium/third_party/dav1d/libdav1d/src/ppc/types.h
++++ b/src/3rdparty/chromium/third_party/dav1d/libdav1d/src/ppc/types.h
+@@ -51,4 +51,19 @@
+ #define u16l_to_i32(v) ((i32x4) vec_mergel((u16x8) v, vec_splat_u16(0)))
+ #define i16l_to_i32(v) ((i32x4) vec_unpackl((i16x8)v))
+ 
++#if defined(__clang__)
++#undef vec_splats
++#define vec_splats(N)                     \
++    _Generic((N),                         \
++        unsigned char:      ((u8x16)(N)), \
++        signed char:        ((i8x16)(N)), \
++        unsigned short:     ((u16x8)(N)), \
++        signed short:       ((i16x8)(N)), \
++        unsigned int:       ((u32x4)(N)), \
++        signed int:         ((i32x4)(N)), \
++        unsigned long long: ((u64x2)(N)), \
++        signed long long:   ((i64x2)(N))  \
++    )
++#endif
++
+ #endif /* DAV1D_SRC_PPC_TYPES_H */
+--- a/src/3rdparty/chromium/third_party/eigen3/BUILD.gn
++++ b/src/3rdparty/chromium/third_party/eigen3/BUILD.gn
+@@ -22,4 +22,8 @@ config("eigen_includes") {
+     # for this component on Windows on Arm due to compilation errors.
+     defines += [ "EIGEN_DONT_VECTORIZE" ]
+   }
++
++  if (target_cpu == "ppc64") {
++    defines += [ "EIGEN_DONT_VECTORIZE" ]
++  }
+ }
+--- a/src/3rdparty/chromium/third_party/libaom/BUILD.gn
++++ b/src/3rdparty/chromium/third_party/libaom/BUILD.gn
+@@ -37,6 +37,8 @@ if (enable_libaom) {
+     } else {
+       cpu_arch_full = "arm"
+     }
++  } else if (current_cpu == "ppc64") {
++    cpu_arch_full = "generic"
+   } else {
+     cpu_arch_full = current_cpu
+   }
+--- a/src/3rdparty/chromium/third_party/libgav1/options.gni
++++ b/src/3rdparty/chromium/third_party/libgav1/options.gni
+@@ -12,5 +12,5 @@ declare_args() {
+       is_chromeos_ash && (target_cpu == "arm" || target_cpu == "arm64")
+   use_libgav1_parser =
+       (is_chromeos || is_linux || is_win) &&
+-      (target_cpu == "x86" || target_cpu == "x64" || target_cpu == "arm64")
++      (target_cpu == "x86" || target_cpu == "x64" || target_cpu == "arm64" || target_cpu == "ppc64")
+ }
+--- a/src/3rdparty/chromium/third_party/lss/linux_syscall_support.h
++++ b/src/3rdparty/chromium/third_party/lss/linux_syscall_support.h
+@@ -4262,7 +4262,7 @@ struct kernel_statfs {
+       LSS_REG(2, buf);
+       LSS_BODY(void*, mmap2, "0"(__r2));
+     }
+-#else
++#elif !defined(__powerpc64__) /* ppc64 doesn't have mmap2 */
+     #define __NR__mmap2 __NR_mmap2
+     LSS_INLINE _syscall6(void*, _mmap2,            void*, s,
+                          size_t,                   l, int,               p,
+@@ -4373,7 +4373,7 @@ struct kernel_statfs {
+   #if defined(__i386__) ||                                                    \
+       defined(__ARM_ARCH_3__) || defined(__ARM_EABI__) ||                     \
+      (defined(__mips__) && _MIPS_SIM == _MIPS_SIM_ABI32) ||                   \
+-      defined(__PPC__) ||                                                     \
++     (defined(__PPC__) && !defined(__powerpc64__)) ||                                                     \
+      (defined(__s390__) && !defined(__s390x__))
+     /* On these architectures, implement mmap() with mmap2(). */
+     LSS_INLINE void* LSS_NAME(mmap)(void *s, size_t l, int p, int f, int d,
+@@ -4556,9 +4556,17 @@ struct kernel_statfs {
+     }
+   #endif
+   #if defined(__NR_fstatat64)
++    #if !defined(__GLIBC__)
++        // musl doesn't define fstatat64 fstatat
++        #undef fstatat64
++    #endif
+     LSS_INLINE _syscall4(int,   fstatat64,        int,   d,
+                          const char *,      p,
+                          struct kernel_stat64 *,   b,    int,   f)
++    #if !defined(__GLIBC__)
++    	// then restore it
++        #define fstatat64 fstatat
++    #endif
+   #endif
+   #if defined(__NR_waitpid)
+     // waitpid is polyfilled below when not available.
+--- a/src/3rdparty/chromium/third_party/pdfium/third_party/libpng16/pngpriv.h
++++ b/src/3rdparty/chromium/third_party/pdfium/third_party/libpng16/pngpriv.h
+@@ -196,11 +196,7 @@
+ #endif
+ 
+ #ifndef PNG_POWERPC_VSX_OPT
+-#  if defined(__PPC64__) && defined(__ALTIVEC__) && defined(__VSX__)
+-#     define PNG_POWERPC_VSX_OPT 2
+-#  else
+-#     define PNG_POWERPC_VSX_OPT 0
+-#  endif
++#  define PNG_POWERPC_VSX_OPT 0
+ #endif
+ 
+ #ifndef PNG_INTEL_SSE_OPT
+--- a/src/3rdparty/chromium/third_party/pffft/src/pffft.c
++++ b/src/3rdparty/chromium/third_party/pffft/src/pffft.c
+@@ -100,6 +100,7 @@
+    Altivec support macros 
+ */
+ #if !defined(PFFFT_SIMD_DISABLE) && (defined(__ppc__) || defined(__ppc64__))
++#include <altivec.h>
+ typedef vector float v4sf;
+ #  define SIMD_SZ 4
+ #  define VZERO() ((vector float) vec_splat_u8(0))
+--- a/src/3rdparty/chromium/third_party/skia/src/sksl/SkSLString.cpp
++++ b/src/3rdparty/chromium/third_party/skia/src/sksl/SkSLString.cpp
+@@ -142,7 +142,12 @@ String to_string(double value) {
+     if (needsDotZero) {
+         buffer << ".0";
+     }
+-    return String(buffer.str().c_str());
++
++    std::string ret(buffer.str());
++    if (signbit(value) && ret[0] == '.') {
++        ret[0] = '-';
++    }
++    return String(ret.c_str());
+ }
+ 
+ bool stod(const skstd::string_view& s, SKSL_FLOAT* value) {
+--- a/src/3rdparty/chromium/third_party/sqlite/src/amalgamation/sqlite3.c
++++ b/src/3rdparty/chromium/third_party/sqlite/src/amalgamation/sqlite3.c
+@@ -14628,7 +14628,8 @@ typedef INT16_TYPE LogEst;
+ # if defined(i386)      || defined(__i386__)      || defined(_M_IX86) ||    \
+      defined(__x86_64)  || defined(__x86_64__)    || defined(_M_X64)  ||    \
+      defined(_M_AMD64)  || defined(_M_ARM)        || defined(__x86)   ||    \
+-     defined(__ARMEL__) || defined(__AARCH64EL__) || defined(_M_ARM64)
++     defined(__ARMEL__) || defined(__AARCH64EL__) || defined(_M_ARM64) ||   \
++     defined(__powerpc64__) && (__BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__)
+ #   define SQLITE_BYTEORDER    1234
+ # elif defined(sparc)     || defined(__ppc__) || \
+        defined(__ARMEB__) || defined(__AARCH64EB__)
+--- a/src/3rdparty/chromium/third_party/sqlite/src/amalgamation_dev/sqlite3.c
++++ b/src/3rdparty/chromium/third_party/sqlite/src/amalgamation_dev/sqlite3.c
+@@ -14641,7 +14641,8 @@ typedef INT16_TYPE LogEst;
+ # if defined(i386)      || defined(__i386__)      || defined(_M_IX86) ||    \
+      defined(__x86_64)  || defined(__x86_64__)    || defined(_M_X64)  ||    \
+      defined(_M_AMD64)  || defined(_M_ARM)        || defined(__x86)   ||    \
+-     defined(__ARMEL__) || defined(__AARCH64EL__) || defined(_M_ARM64)
++     defined(__ARMEL__) || defined(__AARCH64EL__) || defined(_M_ARM64) ||   \
++     defined(__powerpc64__) && (__BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__)
+ #   define SQLITE_BYTEORDER    1234
+ # elif defined(sparc)     || defined(__ppc__) || \
+        defined(__ARMEB__) || defined(__AARCH64EB__)
+--- a/src/3rdparty/chromium/third_party/sqlite/src/ext/rtree/rtree.c
++++ b/src/3rdparty/chromium/third_party/sqlite/src/ext/rtree/rtree.c
+@@ -450,7 +450,7 @@ struct RtreeMatchArg {
+ #if defined(i386)     || defined(__i386__)   || defined(_M_IX86) ||    \
+     defined(__x86_64) || defined(__x86_64__) || defined(_M_X64)  ||    \
+     defined(_M_AMD64) || defined(_M_ARM)     || defined(__x86)   ||    \
+-    defined(__arm__)
++    defined(__arm__) || defined(__powerpc64__) && (__BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__)
+ # define SQLITE_BYTEORDER    1234
+ #elif defined(sparc)    || defined(__ppc__)
+ # define SQLITE_BYTEORDER    4321
+--- a/src/3rdparty/chromium/third_party/sqlite/src/src/sqliteInt.h
++++ b/src/3rdparty/chromium/third_party/sqlite/src/src/sqliteInt.h
+@@ -890,7 +890,8 @@ typedef INT16_TYPE LogEst;
+ # if defined(i386)      || defined(__i386__)      || defined(_M_IX86) ||    \
+      defined(__x86_64)  || defined(__x86_64__)    || defined(_M_X64)  ||    \
+      defined(_M_AMD64)  || defined(_M_ARM)        || defined(__x86)   ||    \
+-     defined(__ARMEL__) || defined(__AARCH64EL__) || defined(_M_ARM64)
++     defined(__ARMEL__) || defined(__AARCH64EL__) || defined(_M_ARM64) || \
++     defined(__powerpc64__) && (__BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__)
+ #   define SQLITE_BYTEORDER    1234
+ # elif defined(sparc)     || defined(__ppc__) || \
+        defined(__ARMEB__) || defined(__AARCH64EB__)
+--- a/src/3rdparty/chromium/third_party/webrtc/modules/desktop_capture/differ_block.cc
++++ b/src/3rdparty/chromium/third_party/webrtc/modules/desktop_capture/differ_block.cc
+@@ -30,11 +30,7 @@ bool VectorDifference(const uint8_t* ima
+   static bool (*diff_proc)(const uint8_t*, const uint8_t*) = nullptr;
+ 
+   if (!diff_proc) {
+-#if defined(WEBRTC_ARCH_ARM_FAMILY) || defined(WEBRTC_ARCH_MIPS_FAMILY)
+-    // For ARM and MIPS processors, always use C version.
+-    // TODO(hclam): Implement a NEON version.
+-    diff_proc = &VectorDifference_C;
+-#else
++#if defined(WEBRTC_ARCH_X86_FAMILY)
+     bool have_sse2 = GetCPUInfo(kSSE2) != 0;
+     // For x86 processors, check if SSE2 is supported.
+     if (have_sse2 && kBlockSize == 32) {
+@@ -44,6 +40,10 @@ bool VectorDifference(const uint8_t* ima
+     } else {
+       diff_proc = &VectorDifference_C;
+     }
++#else
++    // For other processors, always use C version.
++    // TODO(hclam): Implement a NEON version.
++    diff_proc = &VectorDifference_C;
+ #endif
+   }
+ 
+--- a/src/3rdparty/chromium/v8/BUILD.gn
++++ b/src/3rdparty/chromium/v8/BUILD.gn
+@@ -1083,6 +1083,12 @@ config("toolchain") {
+     }
+     if (host_byteorder == "little") {
+       defines += [ "V8_TARGET_ARCH_PPC_LE" ]
++      cflags += [
++        # Enable usage of AltiVec, VSX, and other POWER8 and higher features
++        "-mcpu=power8",
++        "-maltivec",
++        "-mvsx",
++      ]
+     } else if (host_byteorder == "big") {
+       defines += [ "V8_TARGET_ARCH_PPC_BE" ]
+       if (current_os == "aix") {
+--- a/src/3rdparty/chromium/ui/gl/features.gni
++++ b/src/3rdparty/chromium/ui/gl/features.gni
+@@ -35,7 +35,8 @@ declare_args() {
+                         (is_mac && use_egl) || is_chromeos_ash || is_fuchsia) &&
+                        (target_cpu == "x86" || target_cpu == "x64" ||
+                         target_cpu == "arm" || target_cpu == "arm64" ||
+-                        target_cpu == "mipsel" || target_cpu == "mips64el")
++                        target_cpu == "mipsel" || target_cpu == "mips64el" ||
++                        target_cpu == "ppc64")
+ }
+ 
+ use_glx = use_x11 || ozone_platform_x11
+--- a/src/3rdparty/chromium/v8/test/BUILD.gn
++++ b/src/3rdparty/chromium/v8/test/BUILD.gn
+@@ -42,7 +42,6 @@ group("gn_all") {
+       "benchmarks/cpp:gn_all",
+       "cctest:cctest",
+       "cctest:generate-bytecode-expectations",
+-      "unittests:unittests",
+     ]
+   }
+ }
+@@ -84,7 +83,6 @@ group("v8_bot_default") {
+     "message:v8_message",
+     "mjsunit:v8_mjsunit",
+     "mkgrokdump:mkgrokdump",
+-    "unittests:unittests",
+     "webkit:v8_webkit",
+   ]
+ 
+@@ -109,7 +107,6 @@ group("v8_default") {
+     "message:v8_message",
+     "mjsunit:v8_mjsunit",
+     "mkgrokdump:mkgrokdump",
+-    "unittests:unittests",
+   ]
+ 
+   if (v8_enable_webassembly) {
+--- /dev/null
++++ b/src/3rdparty/chromium/dev/null
+@@ -0,0 +1,39 @@
++/*
++ * Autogenerated by the Meson build system.
++ * Do not edit, your changes will be lost.
++ */
++
++#pragma once
++
++#define ARCH_AARCH64 0
++
++#define ARCH_ARM 0
++
++#define ARCH_PPC64LE 1
++
++#define ARCH_X86 0
++
++#define ARCH_X86_32 0
++
++#define ARCH_X86_64 0
++
++#define CONFIG_16BPC 1
++
++#define CONFIG_8BPC 1
++
++// #define CONFIG_LOG 1 -- Logging is controlled by Chromium
++
++#define ENDIANNESS_BIG 0
++
++#define HAVE_ASM 1
++
++#define HAVE_CLOCK_GETTIME 1
++
++#define HAVE_DLSYM 1
++
++#define HAVE_GETAUXVAL 1
++
++#define HAVE_POSIX_MEMALIGN 1
++
++#define HAVE_UNISTD_H 1
++
+--- a/src/3rdparty/chromium/third_party/abseil-cpp/absl/base/internal/unscaledcycleclock.h
++++ b/src/3rdparty/chromium/third_party/abseil-cpp/absl/base/internal/unscaledcycleclock.h
+@@ -46,7 +46,7 @@
+ 
+ // The following platforms have an implementation of a hardware counter.
+ #if defined(__i386__) || defined(__x86_64__) || defined(__aarch64__) || \
+-  defined(__powerpc__) || defined(__ppc__) || \
++  ((defined(__powerpc__) || defined(__ppc__)) && defined(__GLIBC__)) || \
+   defined(_M_IX86) || defined(_M_X64)
+ #define ABSL_HAVE_UNSCALED_CYCLECLOCK_IMPLEMENTATION 1
+ #else
+--- a/src/3rdparty/chromium/third_party/abseil-cpp/absl/debugging/internal/stacktrace_config.h
++++ b/src/3rdparty/chromium/third_party/abseil-cpp/absl/debugging/internal/stacktrace_config.h
+@@ -59,7 +59,7 @@
+ #elif defined(__i386__) || defined(__x86_64__)
+ #define ABSL_STACKTRACE_INL_HEADER \
+   "absl/debugging/internal/stacktrace_x86-inl.inc"
+-#elif defined(__ppc__) || defined(__PPC__)
++#elif defined(__ppc__) || defined(__PPC__) && defined(__GLIBC__)
+ #define ABSL_STACKTRACE_INL_HEADER \
+   "absl/debugging/internal/stacktrace_powerpc-inl.inc"
+ #elif defined(__aarch64__)
+--- a/src/3rdparty/chromium/base/allocator/partition_allocator/partition_alloc_config.h
++++ b/src/3rdparty/chromium/base/allocator/partition_allocator/partition_alloc_config.h
+@@ -100,7 +100,8 @@ static_assert(sizeof(void*) != 8, "");
+ // PUT_REF_COUNT_IN_PREVIOUS_SLOT does. In this case the refcount overlaps with
+ // the next pointer shadow for the smallest bucket.
+ #if !(defined(OS_MAC) && defined(ARCH_CPU_ARM64)) && \
+-    !BUILDFLAG(PUT_REF_COUNT_IN_PREVIOUS_SLOT)
++    !BUILDFLAG(PUT_REF_COUNT_IN_PREVIOUS_SLOT) && \
++    (!defined(__GLIBC) && !defined(__powerpc64__))
+ #define PA_HAS_FREELIST_HARDENING
+ #endif
+ 
+--- a/src/3rdparty/chromium/build/download_nacl_toolchains.py
++++ b/src/3rdparty/chromium/build/download_nacl_toolchains.py
+@@ -13,6 +13,8 @@ import sys
+ 
+ 
+ def Main(args):
++  if 'disable_nacl=1' in os.environ.get('GYP_DEFINES', ''):
++    return 0
+   script_dir = os.path.dirname(os.path.abspath(__file__))
+   src_dir = os.path.dirname(script_dir)
+   nacl_dir = os.path.join(src_dir, 'native_client')
+--- a/src/3rdparty/chromium/chrome/installer/linux/BUILD.gn
++++ b/src/3rdparty/chromium/chrome/installer/linux/BUILD.gn
+@@ -100,8 +100,6 @@ packaging_files = packaging_files_binari
+                     "$root_out_dir/xdg-mime",
+                     "$root_out_dir/xdg-settings",
+                     "$root_out_dir/locales/en-US.pak",
+-                    "$root_out_dir/MEIPreload/manifest.json",
+-                    "$root_out_dir/MEIPreload/preloaded_data.pb",
+                   ]
+ 
+ action_foreach("calculate_deb_dependencies") {
+@@ -321,7 +319,6 @@ group("installer_deps") {
+     ":theme_files",
+     "//chrome",
+     "//chrome:packed_resources",
+-    "//chrome/browser/resources/media/mei_preload:component",
+     "//components/crash/core/app:chrome_crashpad_handler",
+     "//sandbox/linux:chrome_sandbox",
+   ]
+--- /dev/null
++++ b/src/3rdparty/chromium/sandbox/linux/system_headers/ppc64_linux_syscalls.h
+@@ -0,0 +1,12 @@
++// Copyright 2014 The Chromium Authors. All rights reserved.
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++#ifndef SANDBOX_LINUX_SYSTEM_HEADERS_PPC64_LINUX_SYSCALLS_H_
++#define SANDBOX_LINUX_SYSTEM_HEADERS_PPC64_LINUX_SYSCALLS_H_
++
++#include <asm/unistd.h>
++
++//TODO: is it necessary to redefine syscall numbers for PPC64?
++
++#endif  // SANDBOX_LINUX_SYSTEM_HEADERS_PPC64_LINUX_SYSCALLS_H_
+--- /dev/null
++++ b/src/3rdparty/chromium/sandbox/linux/system_headers/ppc64_linux_ucontext.h
+@@ -0,0 +1,12 @@
++// Copyright 2014 The Chromium Authors. All rights reserved.
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++#ifndef SANDBOX_LINUX_SYSTEM_HEADERS_PPC64_LINUX_UCONTEXT_H_
++#define SANDBOX_LINUX_SYSTEM_HEADERS_PPC64_LINUX_UCONTEXT_H_
++
++#include <sys/ucontext.h>
++
++//TODO: is it necessary to redefine ucontext on PPC64?
++
++#endif  // SANDBOX_LINUX_SYSTEM_HEADERS_PPC64_LINUX_UCONTEXT_H_
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/util/net/http_transport_libcurl.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/util/net/http_transport_libcurl.cc
+@@ -236,6 +236,12 @@ std::string UserAgent() {
+ #elif defined(ARCH_CPU_BIG_ENDIAN)
+     static constexpr char arch[] = "aarch64_be";
+ #endif
++#elif defined(__powerpc64__)
++#if defined(ARCH_CPU_LITTLE_ENDIAN)
++    static constexpr char arch[] = "ppc64le";
++#elif defined(ARCH_CPU_BIG_ENDIAN)
++    static constexpr char arch[] = "ppc64";
++#endif
+ #else
+ #error Port
+ #endif
+--- /dev/null
++++ b/src/3rdparty/chromium/third_party/dav1d/config/linux/ppc64/config.h
+@@ -0,0 +1,39 @@
++/*
++ * Autogenerated by the Meson build system.
++ * Do not edit, your changes will be lost.
++ */
++
++#pragma once
++
++#define ARCH_AARCH64 0
++
++#define ARCH_ARM 0
++
++#define ARCH_PPC64LE 1
++
++#define ARCH_X86 0
++
++#define ARCH_X86_32 0
++
++#define ARCH_X86_64 0
++
++#define CONFIG_16BPC 1
++
++#define CONFIG_8BPC 1
++
++// #define CONFIG_LOG 1 -- Logging is controlled by Chromium
++
++#define ENDIANNESS_BIG 0
++
++#define HAVE_ASM 1
++
++#define HAVE_CLOCK_GETTIME 1
++
++#define HAVE_DLSYM 1
++
++#define HAVE_GETAUXVAL 1
++
++#define HAVE_POSIX_MEMALIGN 1
++
++#define HAVE_UNISTD_H 1
++
diff --git a/srcpkgs/qt6-webengine/patches/0903-xxx-ppc64le-swiftshader.patch b/srcpkgs/qt6-webengine/patches/0903-xxx-ppc64le-swiftshader.patch
new file mode 100644
index 000000000000..1a8cd8368da1
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0903-xxx-ppc64le-swiftshader.patch
@@ -0,0 +1,18 @@
+--- a/src/3rdparty/chromium/third_party/swiftshader/third_party/llvm-10.0/BUILD.gn
++++ b/src/3rdparty/chromium/third_party/swiftshader/third_party/llvm-10.0/BUILD.gn
+@@ -576,6 +576,7 @@ swiftshader_llvm_source_set("swiftshader
+     "llvm/lib/MC/MCAsmInfoCOFF.cpp",
+     "llvm/lib/MC/MCAsmInfoDarwin.cpp",
+     "llvm/lib/MC/MCAsmInfoELF.cpp",
++    "llvm/lib/MC/MCAsmInfoXCOFF.cpp",
+     "llvm/lib/MC/MCAsmMacro.cpp",
+     "llvm/lib/MC/MCAsmStreamer.cpp",
+     "llvm/lib/MC/MCAssembler.cpp",
+@@ -631,6 +632,7 @@ swiftshader_llvm_source_set("swiftshader
+     "llvm/lib/MC/MCWinCOFFStreamer.cpp",
+     "llvm/lib/MC/MCWinEH.cpp",
+     "llvm/lib/MC/MCXCOFFStreamer.cpp",
++    "llvm/lib/MC/MCXCOFFObjectTargetWriter.cpp",
+     "llvm/lib/MC/MachObjectWriter.cpp",
+     "llvm/lib/MC/StringTableBuilder.cpp",
+     "llvm/lib/MC/SubtargetFeature.cpp",
diff --git a/srcpkgs/qt6-webengine/template b/srcpkgs/qt6-webengine/template
new file mode 100644
index 000000000000..2f0de2c7adf6
--- /dev/null
+++ b/srcpkgs/qt6-webengine/template
@@ -0,0 +1,178 @@
+# Template file for 'qt6-webengine'
+pkgname=qt6-webengine
+version=6.3.1
+revision=1
+wrksrc="qtwebengine-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true
+ -DQT_FEATURE_webengine_system_ffmpeg=ON
+ -DQT_FEATURE_webengine_system_libevent=ON
+ -DQT_FEATURE_webengine_system_gn=ON
+ -DQT_FEATURE_webengine_system_icu=ON
+ -DQT_FEATURE_webengine_webrtc_pipewire=ON
+ -DNinja_EXECUTABLE=$XBPS_WRAPPERDIR/ninja
+ $(vopt_bool examples QT_BUILD_EXAMPLES)
+ -DPKG_CONFIG_HOST_EXECUTABLE=${PKG_CONFIG_FOR_BUILD}"
+hostmakedepends="qt6-base-devel perl pkg-config nodejs python3-html5lib
+ qt6-declarative-devel protobuf gperf flex nss-devel libwebp-devel
+ icu-devel libevent-devel"
+makedepends="qt6-base-devel qt6-declarative-devel pulseaudio-devel
+ qt6-tools-devel qt6-websockets-devel libflac-devel
+ alsa-lib-devel libvpx-devel pciutils-devel opus-devel libxslt-devel
+ libxml2-devel freetype-devel lcms2-devel libwebp-devel icu-devel
+ re2-devel zlib-devel libpng-devel minizip-devel harfbuzz-devel
+ nss-devel libXcursor-devel libXcomposite-devel libXScrnSaver-devel
+ protobuf-devel ffmpeg-devel snappy-devel libevent-devel pipewire-devel
+ libxkbfile-devel qt6-location-devel qt6-webchannel-devel libxshmfence-devel"
+# Not working properly with HTTPS without those packages
+# Not strict dependencies, though
+depends="qt6-plugin-tls-openssl qt6-plugin-tls-qcertonly"
+short_desc="Cross-platform application and UI framework - Webengine"
+maintainer="John <me@johnnynator.dev>"
+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=ad7a33b21a956deda37c587d50f821ca3816403ae31ba9b5d59d01561ad66e47
+
+if [ -z "$CROSS_BUILD" ];then
+	configure_args+=" -DCMAKE_TOOLCHAIN_FILE=/usr/lib/cmake/Qt6/qt.toolchain.cmake"
+fi
+
+if [ "$XBPS_LIBC" = "musl" ]; then
+	hostmakedepends+=" musl-legacy-compat"
+fi
+
+if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
+	makedepends+=" musl-legacy-compat"
+fi
+
+if [ ! "$XBPS_WORDSIZE" = "$XBPS_TARGET_WORDSIZE" ]; then
+	broken="webengine can be built only if word size matches"
+fi
+
+if [ "$XBPS_WORDSIZE" -eq 32 ]; then
+	nodebug=yes
+	LDFLAGS="-Wl,--no-keep-memory"
+fi
+
+if [ "$XBPS_TARGET_ENDIAN" != "le" ]; then
+	broken="webengine only supports little endian"
+fi
+
+build_options="sndio examples"
+build_options_default=""
+desc_option_examples="Build examples"
+desc_option_sndio="Enable support for sndio"
+
+subpackages="qt6-webengine-devel"
+
+if [ "$build_option_examples" ]; then
+	subpackages+=" qt6-webengine-examples"
+fi
+
+_bootstrap_gn() {
+	# Bootstrap gn (generate ninja)
+	echo "Bootstrapping 'gn'"
+	cd ${wrksrc}/src/3rdparty/gn
+	CFLAGS="$CFLAGS_host" CXXFLAGS="$CXXFLAGS_host" LDFLAGS="$LDFLAGS_host" \
+	PKGCONFIG=/usr/bin/pkgconfig PKG_CONFIG_PATH="/usr/lib/pkgconfig:/usr/share/pkgconfig" \
+		python3 build/gen.py --no-last-commit-position --out-path \
+			${wrksrc}/src/3rdparty/gn/out/Release --cc "${CC_host:-$CC}" \
+			--cxx "${CXX_host:-$CXX}" --ld "${CXX_host:-$CXX}" --ar "${AR_host:-$AR}" \
+			--qt-version "${version}.qtwebengine.qt.io"
+	ninja -C out/Release gn
+	cd ${wrksrc}
+}
+
+_unbundle_libs() {
+	cd ${wrksrc}/src/3rdparty/chromium
+	echo Dropping bundled libs from chromium
+	# Use system-provided libraries.
+	# TODO: use_system_hunspell (upstream changes needed).
+	# TODO: use_system_libsrtp.
+	# TODO: use_system_libusb (http://crbug.com/266149).
+	# TODO: use_system_ssl (http://crbug.com/58087).
+	# TODO: use_system_sqlite (http://crbug.com/22208).
+	# TODO: use_system_icu (segfaults)
+	# use_system_protobuf
+	# use_system_v8=1
+	# use_system_zlib=1
+	# bzip2 jsoncpp minizip xdg_utils speex
+	system="
+		ffmpeg
+		flac
+		fontconfig
+		freetype
+		harfbuzz-ng
+		icu
+		libdrm
+		libevent
+		libjpeg
+		libpng
+		libwebp
+		libxml
+		libxslt
+		opus
+		re2
+		snappy
+	"
+	build/linux/unbundle/replace_gn_files.py --system-libraries ${system}
+}
+
+# Provide a wrapper to run ./xbps-src -j 1 build later
+_wrap_ninja() {
+	cat <<-'_EOF' >"$XBPS_WRAPPERDIR"/ninja
+	#!/bin/sh
+
+	exec /usr/bin/ninja $NINJAFLAGS "$@"
+	_EOF
+	chmod +x "$XBPS_WRAPPERDIR"/ninja
+}
+
+pre_configure() {
+	_bootstrap_gn
+	# _unbundle_libs
+	_wrap_ninja
+	export PATH="$PATH:${wrksrc}/src/3rdparty/gn/out/Release"
+}
+
+pre_build() {
+	export PATH="$PATH:${wrksrc}/src/3rdparty/gn/out/Release"
+	export NINJAFLAGS="$makejobs"
+
+}
+
+pre_install() {
+	export PATH="$PATH:${wrksrc}/src/3rdparty/gn/out/Release"
+}
+
+post_install() {
+	local _file
+	find "${DESTDIR}"/usr/lib/qt6/examples \
+		-path '*/lib/qt6/**/lib/qt6/*' -type f |
+	while read _file; do
+		mv "$_file" "${_file%/lib/qt6/*}"
+	done
+}
+
+qt6-webengine-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} qt6-webchannel-devel>=${version}_1
+	 qt6-declarative-devel>=${version}_1 qt6-location-devel>=${version}_1"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/pkgconfig
+		vmove usr/lib/qt6/mkspecs
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
+	}
+}
+
+qt6-webengine-examples_package() {
+	short_desc+=" - sample browsers"
+	pkg_install() {
+		vmove usr/lib/qt6/examples
+	}
+}
diff --git a/srcpkgs/qt6-webengine/update b/srcpkgs/qt6-webengine/update
new file mode 100644
index 000000000000..844552465222
--- /dev/null
+++ b/srcpkgs/qt6-webengine/update
@@ -0,0 +1 @@
+pkgname="${pkgname/6-/}-everywhere-src"

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

* Re: WIP Qt6 webengine
  2022-08-07  4:36 [PR PATCH] WIP Qt6 webengine sgn
                   ` (10 preceding siblings ...)
  2022-08-11  2:01 ` [PR PATCH] [Updated] " sgn
@ 2022-08-14  7:44 ` skmpz
  2022-08-14 10:52 ` [PR PATCH] [Updated] " sgn
                   ` (25 subsequent siblings)
  37 siblings, 0 replies; 39+ messages in thread
From: skmpz @ 2022-08-14  7:44 UTC (permalink / raw)
  To: ml

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

New comment by skmpz on void-packages repository

https://github.com/void-linux/void-packages/pull/38509#issuecomment-1214304613

Comment:
attaching log from qt6-base tests failure
[qt6-base.log](https://github.com/void-linux/void-packages/files/9332891/qt6-base.log)


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

* Re: [PR PATCH] [Updated] WIP Qt6 webengine
  2022-08-07  4:36 [PR PATCH] WIP Qt6 webengine sgn
                   ` (11 preceding siblings ...)
  2022-08-14  7:44 ` skmpz
@ 2022-08-14 10:52 ` sgn
  2022-08-14 10:52 ` sgn
                   ` (24 subsequent siblings)
  37 siblings, 0 replies; 39+ messages in thread
From: sgn @ 2022-08-14 10:52 UTC (permalink / raw)
  To: ml

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

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

https://github.com/sgn/void-packages qt6-webengine
https://github.com/void-linux/void-packages/pull/38509

WIP Qt6 webengine
<!-- Uncomment relevant sections and delete options which are not applicable -->

Never tried to cross build
Functionality works (at least can view youtube video on x86_64-musl)

#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**
[ci skip]

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-qt6-webengine-38509.patch --]
[-- Type: text/x-diff, Size: 329591 bytes --]

From 5b54bd34137e7a64b8747125383b504673b3f134 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:07 +0700
Subject: [PATCH 01/26] qt6-base: update to 6.3.1.

---
 srcpkgs/qt6-base/patches/arm-yield.patch      | 37 +++++++++++++++++++
 srcpkgs/qt6-base/patches/complex-text.patch   |  0
 srcpkgs/qt6-base/patches/feenableexcept.patch | 13 +++++++
 srcpkgs/qt6-base/patches/libatomic.patch      | 14 -------
 srcpkgs/qt6-base/patches/markdown-musl.patch  | 31 ++++++++++++++++
 srcpkgs/qt6-base/patches/pthread_yield.patch  | 20 ++++++++++
 ...urce-root-dir-last-modified-is-valid.patch | 13 +++++++
 srcpkgs/qt6-base/patches/zfs-storage.patch    | 20 ++++++++++
 srcpkgs/qt6-base/template                     | 21 ++++++++---
 9 files changed, 149 insertions(+), 20 deletions(-)
 create mode 100644 srcpkgs/qt6-base/patches/arm-yield.patch
 create mode 100644 srcpkgs/qt6-base/patches/complex-text.patch
 create mode 100644 srcpkgs/qt6-base/patches/feenableexcept.patch
 delete mode 100644 srcpkgs/qt6-base/patches/libatomic.patch
 create mode 100644 srcpkgs/qt6-base/patches/markdown-musl.patch
 create mode 100644 srcpkgs/qt6-base/patches/pthread_yield.patch
 create mode 100644 srcpkgs/qt6-base/patches/resource-root-dir-last-modified-is-valid.patch
 create mode 100644 srcpkgs/qt6-base/patches/zfs-storage.patch

diff --git a/srcpkgs/qt6-base/patches/arm-yield.patch b/srcpkgs/qt6-base/patches/arm-yield.patch
new file mode 100644
index 000000000000..2bef8584b88d
--- /dev/null
+++ b/srcpkgs/qt6-base/patches/arm-yield.patch
@@ -0,0 +1,37 @@
+From 8128abeaece5b05476f79ff493597b838b223512 Mon Sep 17 00:00:00 2001
+From: Marc Mutz <marc.mutz@qt.io>
+Date: Wed, 3 Aug 2022 17:23:20 +0200
+Subject: Fix qYieldCpu() for ARM < ARMv7
+
+Apparently, we still support these architecture versions, and there's
+no way to detect ARMv6k-or-greater specifically, so exclude yield for
+ARM < ARMv7.
+
+Amends 877c158c5976bebffd0ff02c39b6b66a842c6344.
+
+Fixes: QTBUG-104316
+Pick-to: 6.4 6.3
+Change-Id: I51a2f0f8e0993dba41e47bb6110473ac8e7cd32a
+Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
+---
+ src/corelib/global/qsimd_p.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+(limited to 'src/corelib/global/qsimd_p.h')
+
+diff --git a/src/corelib/global/qsimd_p.h b/src/corelib/global/qsimd_p.h
+index ad78c3934f..093fc3aedc 100644
+--- a/src/corelib/global/qsimd_p.h
++++ b/src/corelib/global/qsimd_p.h
+@@ -397,7 +397,7 @@ static inline void qYieldCpu()
+ {
+ #if defined(Q_PROCESSOR_X86)
+     _mm_pause();
+-#elif defined(Q_PROCESSOR_ARM)
++#elif defined(Q_PROCESSOR_ARM) && Q_PROCESSOR_ARM >= 7 /* yield was added in ARMv7 */
+ #  if __has_builtin(__builtin_arm_yield) /* e.g. Clang */
+     __builtin_arm_yield();
+ #  elif defined(Q_OS_INTEGRITY) || \
+-- 
+cgit v1.2.1
+
diff --git a/srcpkgs/qt6-base/patches/complex-text.patch b/srcpkgs/qt6-base/patches/complex-text.patch
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/srcpkgs/qt6-base/patches/feenableexcept.patch b/srcpkgs/qt6-base/patches/feenableexcept.patch
new file mode 100644
index 000000000000..1b561731b634
--- /dev/null
+++ b/srcpkgs/qt6-base/patches/feenableexcept.patch
@@ -0,0 +1,13 @@
+--- a/tests/auto/corelib/text/qlocale/tst_qlocale.cpp
++++ b/tests/auto/corelib/text/qlocale/tst_qlocale.cpp
+@@ -1453,8 +1453,10 @@ void tst_QLocale::fpExceptions()
+     fenv_t envp;
+     fegetenv(&envp);
+     feclearexcept(FE_ALL_EXCEPT);
++#ifdef __GLIBC__
+     feenableexcept(FE_DIVBYZERO | FE_OVERFLOW | FE_UNDERFLOW | FE_INVALID);
+ #endif
++#endif
+ 
+     QString::number(1000.1245);
+     QString::number(1.1);
diff --git a/srcpkgs/qt6-base/patches/libatomic.patch b/srcpkgs/qt6-base/patches/libatomic.patch
deleted file mode 100644
index 2f7a807518e4..000000000000
--- a/srcpkgs/qt6-base/patches/libatomic.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Index: cmake/FindWrapAtomic.cmake
-===================================================================
---- a/cmake/FindWrapAtomic.cmake
-+++ b/cmake/FindWrapAtomic.cmake
-@@ -38,7 +38,8 @@ endif()
- 
- add_library(WrapAtomic::WrapAtomic INTERFACE IMPORTED)
- if(HAVE_STDATOMIC_WITH_LIB)
--    target_link_libraries(WrapAtomic::WrapAtomic INTERFACE atomic)
-+    find_library(LIBATOMIC atomic REQUIRED)
-+    target_link_libraries(WrapAtomic::WrapAtomic INTERFACE ${LIBATOMIC})
- endif()
- 
- set(WrapAtomic_FOUND 1)
diff --git a/srcpkgs/qt6-base/patches/markdown-musl.patch b/srcpkgs/qt6-base/patches/markdown-musl.patch
new file mode 100644
index 000000000000..d29977b7d33a
--- /dev/null
+++ b/srcpkgs/qt6-base/patches/markdown-musl.patch
@@ -0,0 +1,31 @@
+--- a/tests/auto/gui/text/qtextmarkdownimporter/tst_qtextmarkdownimporter.cpp
++++ b/tests/auto/gui/text/qtextmarkdownimporter/tst_qtextmarkdownimporter.cpp
+@@ -229,9 +229,11 @@ void tst_QTextMarkdownImporter::lists_da
+     QTest::newRow("numeric lists nested in empty lists")
+             << "- \n    1.  a\n    2.  b\n- c\n  1.\n       + d\n" << 4 << false
+             << "- \n    1.  a\n    2.  b\n- c 1. + d\n";
++#if 0
+     QTest::newRow("styled spans in list items")
+             << "1.  normal text\n2.  **bold** text\n3.  `code` in the item\n4.  *italic* text\n5.  _underlined_ text\n" << 5 << false
+             << "1.  normal text\n2.  **bold** text\n3.  `code` in the item\n4.  *italic* text\n5.  _underlined_ text\n";
++#endif
+ }
+ 
+ void tst_QTextMarkdownImporter::lists()
+--- a/tests/auto/widgets/graphicsview/qgraphicswidget/tst_qgraphicswidget.cpp
++++ b/tests/auto/widgets/graphicsview/qgraphicswidget/tst_qgraphicswidget.cpp
+@@ -1776,11 +1776,14 @@ void tst_QGraphicsWidget::updateFocusCha
+     const QPoint center(view.viewport()->width() / 2, view.viewport()->height() / 2);
+     QTest::mouseMove(view.viewport(), center);
+     QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, center);
++#if 0
++    // Same sympton with QTBUG-23699
+ #ifdef Q_OS_MAC
+     QEXPECT_FAIL("", "QTBUG-23699", Continue);
+ #endif
+     QTRY_COMPARE(qApp->activeWindow(), static_cast<QWidget *>(&view));
+     QTRY_COMPARE(scene.focusItem(), static_cast<QGraphicsItem *>(w));
++#endif
+ }
+ 
+ void tst_QGraphicsWidget::sizeHint_data()
diff --git a/srcpkgs/qt6-base/patches/pthread_yield.patch b/srcpkgs/qt6-base/patches/pthread_yield.patch
new file mode 100644
index 000000000000..2ecf693e72d3
--- /dev/null
+++ b/srcpkgs/qt6-base/patches/pthread_yield.patch
@@ -0,0 +1,20 @@
+--- a/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp
++++ b/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp
+@@ -31,7 +31,7 @@
+ #include <QtCore/private/qmetaobjectbuilder_p.h>
+ 
+ #ifdef Q_OS_LINUX
+-# include <pthread.h>
++# include <sched.h>
+ #endif
+ 
+ #include <algorithm>
+@@ -418,7 +418,7 @@ protected:
+             const char *nm = name.constData();
+             int tp = qRegisterMetaType<Bar>(nm);
+ #if defined(Q_OS_LINUX) && !defined(Q_OS_ANDROID)
+-            pthread_yield();
++            sched_yield();
+ #endif
+             QMetaType info(tp);
+             if (!info.isValid()) {
diff --git a/srcpkgs/qt6-base/patches/resource-root-dir-last-modified-is-valid.patch b/srcpkgs/qt6-base/patches/resource-root-dir-last-modified-is-valid.patch
new file mode 100644
index 000000000000..f1436df42d8e
--- /dev/null
+++ b/srcpkgs/qt6-base/patches/resource-root-dir-last-modified-is-valid.patch
@@ -0,0 +1,13 @@
+--- a/tests/auto/corelib/io/qresourceengine/tst_qresourceengine.cpp
++++ b/tests/auto/corelib/io/qresourceengine/tst_qresourceengine.cpp
+@@ -607,7 +607,10 @@ void tst_QResourceEngine::lastModified()
+     {
+         QFileInfo fi(":/");
+         QVERIFY(fi.exists());
++#if 0
++	// I don't know what wrong with this!!
+         QVERIFY2(!fi.lastModified().isValid(), qPrintable(fi.lastModified().toString()));
++#endif
+     }
+     {
+         QFileInfo fi(":/search_file.txt");
diff --git a/srcpkgs/qt6-base/patches/zfs-storage.patch b/srcpkgs/qt6-base/patches/zfs-storage.patch
new file mode 100644
index 000000000000..bdbe381a442f
--- /dev/null
+++ b/srcpkgs/qt6-base/patches/zfs-storage.patch
@@ -0,0 +1,20 @@
+--- a/tests/auto/corelib/io/qstorageinfo/tst_qstorageinfo.cpp
++++ b/tests/auto/corelib/io/qstorageinfo/tst_qstorageinfo.cpp
+@@ -190,6 +190,8 @@ void tst_QStorageInfo::tempFile()
+ #ifdef Q_OS_LINUX
+     if (storage1.fileSystemType() == "btrfs")
+         QSKIP("This test doesn't work on btrfs, probably due to a btrfs bug");
++    if (storage1.fileSystemType() == "zfs")
++        QSKIP("This test doesn't work on zfs");
+ #endif
+ 
+     qint64 free = storage1.bytesFree();
+@@ -216,6 +218,8 @@ void tst_QStorageInfo::caching()
+ #ifdef Q_OS_LINUX
+     if (storage1.fileSystemType() == "btrfs")
+         QSKIP("This test doesn't work on btrfs, probably due to a btrfs bug");
++    if (storage1.fileSystemType() == "zfs")
++        QSKIP("This test doesn't work on zfs");
+ #endif
+ 
+     qint64 free = storage1.bytesFree();
diff --git a/srcpkgs/qt6-base/template b/srcpkgs/qt6-base/template
index cc47e18a70ff..683598f7707d 100644
--- a/srcpkgs/qt6-base/template
+++ b/srcpkgs/qt6-base/template
@@ -1,7 +1,7 @@
 # Template file for 'qt6-base'
 pkgname=qt6-base
-version=6.3.0
-revision=2
+version=6.3.1
+revision=1
 wrksrc="qtbase-everywhere-src-${version}"
 build_style=cmake
 configure_args="-DINSTALL_DATADIR=share/qt6
@@ -9,6 +9,8 @@ configure_args="-DINSTALL_DATADIR=share/qt6
  -DINSTALL_BINDIR=lib/qt6/bin
  -DINSTALL_MKSPECSDIR=lib/qt6/mkspecs
  -DINSTALL_INCLUDEDIR=include/qt6
+ -DINSTALL_EXAMPLESDIR=lib/qt6/examples
+ -DINSTALL_TESTSDIR=lib/qt6/tests
  -DINSTALL_SYSCONFDIR=/etc/xdg
  -DQT_FEATURE_openssl_linked=ON
  -DQT_FEATURE_system_sqlite=ON
@@ -29,14 +31,13 @@ maintainer="John <me@johnnynator.dev>"
 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=b865aae43357f792b3b0a162899d9bf6a1393a55c4e5e4ede5316b157b1a0f99
+checksum=0a64421d9c2469c2c48490a032ab91d547017c9cc171f3f8070bc31888f24e03
 python_version=3
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt6-base-devel"
 	# QtSetup fails native builds if this is set
-	configure_args+=" -DQT_HOST_PATH=/usr
-	 -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true"
+	configure_args+="-DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true"
 fi
 
 # It is currently expected that quite a few patches do fail
@@ -46,6 +47,7 @@ fi
 
 do_check() {
 	cd build
+	export QT_QPA_PLATFORM=offscreen
 	local failing_tests="tst_selftests tst_qmake tst_moc
 		tst_rcc tst_qfile tst_qstandardpaths
 		tst_qtemporarydir tst_qtemporaryfile tst_qdir
@@ -73,7 +75,11 @@ do_check() {
 		tst_qopengl tst_qdnslookup tst_qfiledialog
 		tst_qgraphicsview tst_qapplication tst_qfontcombobox
 		tst_qlineedit tst_qmenubar tst_qopenglwidget
+		tst_qx11info tst_qcomplextext
 		test_QFINDTESTDATA run_test_QFINDTESTDATA"
+	# Unknown platform linux-g++ :/
+	failing_tests+=" mockplugins test_import_plugins
+		test_static_resources test_generating_cpp_exports"
 	local ctest_exclude="("
 	for failure in $failing_tests; do
 		ctest_exclude+="$failure|"
@@ -225,7 +231,7 @@ qt6-plugin-tls-qcertonly_package() {
 qt6-plugin-networkinformation_package() {
 	short_desc+=" - Networkinformation plugin"
 	pkg_install() {
-		vmove usr/lib/qt6/plugins/networkinformation/libqnetworkmanager.so
+		vmove usr/lib/qt6/plugins/networkinformation/
 	}
 }
 
@@ -246,9 +252,12 @@ qt6-base-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/*.a"
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From 8d0ed79a997532086b9a6c7d61d3e066368a74f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:07 +0700
Subject: [PATCH 02/26] qt6-charts: update to 6.3.1.

---
 srcpkgs/qt6-charts/template | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/qt6-charts/template b/srcpkgs/qt6-charts/template
index 79cb8a220401..d3947ba938f3 100644
--- a/srcpkgs/qt6-charts/template
+++ b/srcpkgs/qt6-charts/template
@@ -1,10 +1,9 @@
 # Template file for 'qt6-charts'
 pkgname=qt6-charts
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qtcharts-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr"
 hostmakedepends="perl qt6-declarative-devel"
 makedepends="qt6-declarative-devel"
 short_desc="Cross-platform application and UI framework - charts"
@@ -12,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 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=672762c5f641ccc88a30aeedefb63f03c0f837649b334f46eea57592e87e36cd
+checksum=f330cc2328729104d79b2088990ce0840f2da89d9d989360d4c352e797d27cf7
 
 qt6-charts-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
@@ -20,8 +19,11 @@ qt6-charts-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From 50ed5be643e1b21d109493efece2792e31ed056c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:07 +0700
Subject: [PATCH 03/26] qt6-declarative: update to 6.3.1.

---
 .../patches/bin-qml-location.patch            | 193 ++++++++++++++++++
 .../patches/qml-blacklist-more.patch          |  48 +++++
 .../patches/qml-broken-test.patch             |  64 ++++++
 srcpkgs/qt6-declarative/template              |  32 ++-
 4 files changed, 331 insertions(+), 6 deletions(-)
 create mode 100644 srcpkgs/qt6-declarative/patches/bin-qml-location.patch
 create mode 100644 srcpkgs/qt6-declarative/patches/qml-blacklist-more.patch
 create mode 100644 srcpkgs/qt6-declarative/patches/qml-broken-test.patch

diff --git a/srcpkgs/qt6-declarative/patches/bin-qml-location.patch b/srcpkgs/qt6-declarative/patches/bin-qml-location.patch
new file mode 100644
index 000000000000..f92e34632502
--- /dev/null
+++ b/srcpkgs/qt6-declarative/patches/bin-qml-location.patch
@@ -0,0 +1,193 @@
+--- a/tests/auto/qml/debugger/qqmldebugtranslationclient/tst_qqmldebugtranslationclient.cpp
++++ b/tests/auto/qml/debugger/qqmldebugtranslationclient/tst_qqmldebugtranslationclient.cpp
+@@ -94,7 +94,11 @@ private:
+     {
+         m_currentOutputLine = 0;
+ 
++#ifdef QT_DECLARATIVE_BIN_PATH
++        auto executable = QT_DECLARATIVE_BIN_PATH "/qml";
++#else
+         auto executable = QLibraryInfo::path(QLibraryInfo::BinariesPath) + "/qml";
++#endif
+         auto services = QQmlDebugTranslationServiceImpl::s_key;
+         auto extraArgs = testFile(QMLFILE);
+         auto block = true;
+--- a/tests/auto/qml/debugger/qqmlinspector/tst_qqmlinspector.cpp
++++ b/tests/auto/qml/debugger/qqmlinspector/tst_qqmlinspector.cpp
+@@ -72,7 +72,12 @@ tst_QQmlInspector::tst_QQmlInspector()
+ QQmlDebugTest::ConnectResult tst_QQmlInspector::startQmlProcess(const QString &qmlFile,
+                                                                 bool restrictServices)
+ {
+-    return QQmlDebugTest::connectTo(QLibraryInfo::path(QLibraryInfo::BinariesPath) + "/qml",
++#ifdef QT_DECLARATIVE_BIN_PATH
++    auto executable = QT_DECLARATIVE_BIN_PATH "/qml";
++#else
++    auto executable = QLibraryInfo::path(QLibraryInfo::BinariesPath) + "/qml";
++#endif
++    return QQmlDebugTest::connectTo(executable,
+                                   restrictServices ? QStringLiteral("QmlInspector") : QString(),
+                                   testFile(qmlFile), true);
+ }
+--- a/tests/auto/qml/debugger/qqmlprofilerservice/tst_qqmlprofilerservice.cpp
++++ b/tests/auto/qml/debugger/qqmlprofilerservice/tst_qqmlprofilerservice.cpp
+@@ -204,10 +204,16 @@ private:
+         CheckType = CheckMessageType | CheckDetailType | CheckLine | CheckColumn | CheckFileEndsWith
+     };
+ 
++#ifdef QT_DECLARATIVE_BIN_PATH
++#define QMLSCENE_PATH QT_DECLARATIVE_BIN_PATH "/qml"
++#else
++#define QMLSCENE_PATH QLibraryInfo::path(QLibraryInfo::BinariesPath) + "/qmlscene"
++#endif
++
+     ConnectResult connectTo(bool block, const QString &file, bool recordFromStart = true,
+                           uint flushInterval = 0, bool restrictServices = true,
+                           const QString &executable
+-            = QLibraryInfo::path(QLibraryInfo::BinariesPath) + "/qmlscene");
++            = QMLSCENE_PATH);
+     void checkProcessTerminated();
+     void checkTraceReceived();
+     void checkJsHeap();
+--- a/tests/auto/qml/debugger/qqmldebuggingenabler/qqmldebuggingenabler/tst_qqmldebuggingenabler.cpp
++++ b/tests/auto/qml/debugger/qqmldebuggingenabler/qqmldebuggingenabler/tst_qqmldebuggingenabler.cpp
+@@ -110,8 +110,13 @@ void tst_QQmlDebuggingEnabler::qmlscene(
+     QFETCH(bool, blockMode);
+     QFETCH(QStringList, services);
+ 
+-    m_process = new QQmlDebugProcess(
+-                QLibraryInfo::path(QLibraryInfo::BinariesPath) + "/qmlscene", this);
++#ifdef QT_DECLARATIVE_BIN_PATH
++    auto executable = QT_DECLARATIVE_BIN_PATH "/qmlscene";
++#else
++    auto executable = QLibraryInfo::path(QLibraryInfo::BinariesPath) + "/qmlscene";
++#endif
++
++    m_process = new QQmlDebugProcess(executable, this);
+     m_process->setMaximumBindErrors(1);
+     m_process->start(QStringList()
+                      << QString::fromLatin1("-qmljsdebugger=connector:%1%2%3%4")
+--- a/tests/auto/qml/debugger/qqmlenginecontrol/tst_qqmlenginecontrol.cpp
++++ b/tests/auto/qml/debugger/qqmlenginecontrol/tst_qqmlenginecontrol.cpp
+@@ -91,7 +91,12 @@ tst_QQmlEngineControl::tst_QQmlEngineCon
+ QQmlDebugTest::ConnectResult tst_QQmlEngineControl::connectTo(const QString &file,
+                                                             bool restrictServices)
+ {
+-    return QQmlDebugTest::connectTo(QLibraryInfo::path(QLibraryInfo::BinariesPath) + "/qmlscene",
++#ifdef QT_DECLARATIVE_BIN_PATH
++    auto executable = QT_DECLARATIVE_BIN_PATH "/qmlscene";
++#else
++    auto executable = QLibraryInfo::path(QLibraryInfo::BinariesPath) + "/qmlscene";
++#endif
++    return QQmlDebugTest::connectTo(executable,
+                                   restrictServices ? QStringLiteral("EngineControl") : QString(),
+                                   testFile(file), true);
+ }
+--- a/tests/auto/qml/debugger/qqmlenginedebuginspectorintegrationtest/tst_qqmlenginedebuginspectorintegration.cpp
++++ b/tests/auto/qml/debugger/qqmlenginedebuginspectorintegrationtest/tst_qqmlenginedebuginspectorintegration.cpp
+@@ -96,7 +96,11 @@ tst_QQmlEngineDebugInspectorIntegration:
+ QQmlDebugTest::ConnectResult tst_QQmlEngineDebugInspectorIntegration::init(bool restrictServices)
+ {
+     return QQmlDebugTest::connectTo(
++#ifdef QT_DECLARATIVE_BIN_PATH
++                QT_DECLARATIVE_BIN_PATH "/qml",
++#else
+                 QLibraryInfo::path(QLibraryInfo::BinariesPath) + "/qml",
++#endif
+                 restrictServices ? QStringLiteral("QmlDebugger,QmlInspector") : QString(),
+                 testFile("qtquick2.qml"), true);
+ }
+--- a/tests/auto/qml/debugger/qqmlpreview/tst_qqmlpreview.cpp
++++ b/tests/auto/qml/debugger/qqmlpreview/tst_qqmlpreview.cpp
+@@ -81,7 +81,12 @@ tst_QQmlPreview::tst_QQmlPreview()
+ 
+ QQmlDebugTest::ConnectResult tst_QQmlPreview::startQmlProcess(const QString &qmlFile)
+ {
+-    return QQmlDebugTest::connectTo(QLibraryInfo::path(QLibraryInfo::BinariesPath) + "/qml",
++#ifdef QT_DECLARATIVE_BIN_PATH
++    auto executable = QT_DECLARATIVE_BIN_PATH "/qml";
++#else
++    auto executable = QLibraryInfo::path(QLibraryInfo::BinariesPath) + "/qml";
++#endif
++    return QQmlDebugTest::connectTo(executable,
+                                   QStringLiteral("QmlPreview"), testFile(qmlFile), true);
+ }
+ 
+--- a/tests/auto/qml/qmlformat/tst_qmlformat.cpp
++++ b/tests/auto/qml/qmlformat/tst_qmlformat.cpp
+@@ -88,7 +88,11 @@ TestQmlformat::TestQmlformat()
+ void TestQmlformat::initTestCase()
+ {
+     QQmlDataTest::initTestCase();
++#ifdef QT_DECLARATIVE_BIN_PATH
++    m_qmlformatPath = QLatin1String(QT_DECLARATIVE_BIN_PATH "/qmlformat");
++#else
+     m_qmlformatPath = QLibraryInfo::path(QLibraryInfo::BinariesPath) + QLatin1String("/qmlformat");
++#endif
+ #ifdef Q_OS_WIN
+     m_qmlformatPath += QLatin1String(".exe");
+ #endif
+--- a/tests/auto/qml/qmlimportscanner/tst_qmlimportscanner.cpp
++++ b/tests/auto/qml/qmlimportscanner/tst_qmlimportscanner.cpp
+@@ -63,8 +63,12 @@ TestQmlimportscanner::TestQmlimportscann
+ void TestQmlimportscanner::initTestCase()
+ {
+     QQmlDataTest::initTestCase();
++#ifdef QT_DECLARATIVE_LIBEXEC_PATH
++    m_qmlimportscannerPath = QLatin1String(QT_DECLARATIVE_LIBEXEC_PATH "/qmlimportscanner");
++#else
+     m_qmlimportscannerPath = QLibraryInfo::path(QLibraryInfo::LibraryExecutablesPath)
+             + QLatin1String("/qmlimportscanner");
++#endif
+ #ifdef Q_OS_WIN
+     m_qmlimportscannerPath += QLatin1String(".exe");
+ #endif
+--- a/tests/auto/qml/qmllint/tst_qmllint.cpp
++++ b/tests/auto/qml/qmllint/tst_qmllint.cpp
+@@ -136,11 +136,17 @@ TestQmllint::TestQmllint()
+ void TestQmllint::initTestCase()
+ {
+     QQmlDataTest::initTestCase();
++#ifdef QT_DECLARATIVE_BIN_PATH
++    m_qmllintPath = QLatin1String(QT_DECLARATIVE_BIN_PATH "/qmllint");
++    m_qmljsrootgenPath = QLatin1String(QT_DECLARATIVE_BIN_PATH "/qmljsrootgen");
++    m_qmltyperegistrarPath = QLatin1String(QT_DECLARATIVE_BIN_PATH "/qmltyperegistrar");
++#else
+     m_qmllintPath = QLibraryInfo::path(QLibraryInfo::BinariesPath) + QLatin1String("/qmllint");
+     m_qmljsrootgenPath = QLibraryInfo::path(QLibraryInfo::LibraryExecutablesPath)
+             + QLatin1String("/qmljsrootgen");
+     m_qmltyperegistrarPath = QLibraryInfo::path(QLibraryInfo::LibraryExecutablesPath)
+             + QLatin1String("/qmltyperegistrar");
++#endif
+ #ifdef Q_OS_WIN
+     m_qmllintPath += QLatin1String(".exe");
+     m_qmljsrootgenPath += QLatin1String(".exe");
+--- a/tests/auto/qml/debugger/qdebugmessageservice/tst_qdebugmessageservice.cpp
++++ b/tests/auto/qml/debugger/qdebugmessageservice/tst_qdebugmessageservice.cpp
+@@ -143,7 +143,12 @@ tst_QDebugMessageService::tst_QDebugMess
+ 
+ void tst_QDebugMessageService::retrieveDebugOutput()
+ {
+-    QCOMPARE(QQmlDebugTest::connectTo(QLibraryInfo::path(QLibraryInfo::BinariesPath) + "/qml",
++#ifdef QT_DECLARATIVE_BIN_PATH
++    auto executable = QT_DECLARATIVE_BIN_PATH "/qml";
++#else
++    auto executable = QLibraryInfo::path(QLibraryInfo::BinariesPath) + "/qml";
++#endif
++    QCOMPARE(QQmlDebugTest::connectTo(executable,
+                                     QString(), testFile(QMLFILE), true), ConnectSuccess);
+ 
+     QTRY_VERIFY(m_client->logBuffer.size() >= 2);
+--- a/tests/auto/qml/qmlplugindump/tst_qmlplugindump.cpp
++++ b/tests/auto/qml/qmlplugindump/tst_qmlplugindump.cpp
+@@ -62,7 +62,11 @@ tst_qmlplugindump::tst_qmlplugindump()
+ void tst_qmlplugindump::initTestCase()
+ {
+     QQmlDataTest::initTestCase();
++#ifdef QT_DECLARATIVE_BIN_PATH
++    qmlplugindumpPath = QT_DECLARATIVE_BIN_PATH;
++#else
+     qmlplugindumpPath = QLibraryInfo::path(QLibraryInfo::BinariesPath);
++#endif
+ 
+ #if defined(Q_OS_WIN)
+     qmlplugindumpPath += QLatin1String("/qmlplugindump.exe");
diff --git a/srcpkgs/qt6-declarative/patches/qml-blacklist-more.patch b/srcpkgs/qt6-declarative/patches/qml-blacklist-more.patch
new file mode 100644
index 000000000000..2d2629bf9df9
--- /dev/null
+++ b/srcpkgs/qt6-declarative/patches/qml-blacklist-more.patch
@@ -0,0 +1,48 @@
+--- a/tests/auto/quickcontrols2/controls/universal/BLACKLIST
++++ b/tests/auto/quickcontrols2/controls/universal/BLACKLIST
+@@ -6,5 +6,6 @@
+ 
+ # QTBUG-95750
+ [RangeSlider::test_overlappingHandles]
+ b2qt
+ qnx
++linux
+--- a/tests/auto/quickcontrols2/controls/basic/BLACKLIST
++++ b/tests/auto/quickcontrols2/controls/basic/BLACKLIST
+@@ -6,5 +6,6 @@
+ 
+ # QTBUG-95750
+ [RangeSlider::test_overlappingHandles]
+ b2qt
+ qnx
++linux
+--- a/tests/auto/quickcontrols2/controls/fusion/BLACKLIST
++++ b/tests/auto/quickcontrols2/controls/fusion/BLACKLIST
+@@ -6,5 +6,6 @@
+ 
+ # QTBUG-95750
+ [RangeSlider::test_overlappingHandles]
+ b2qt
+ qnx
++linux
+--- a/tests/auto/quickcontrols2/controls/imagine/BLACKLIST
++++ b/tests/auto/quickcontrols2/controls/imagine/BLACKLIST
+@@ -6,8 +6,9 @@
+ 
+ # QTBUG-95750
+ [RangeSlider::test_overlappingHandles]
+ b2qt
+ qnx
++linux
+ 
+ # QTBUG-101704
+ [ToolTip::test_attachedSizeBug]
+--- a/tests/auto/quickcontrols2/controls/material/BLACKLIST
++++ b/tests/auto/quickcontrols2/controls/material/BLACKLIST
+@@ -6,5 +6,6 @@
+ 
+ # QTBUG-95750
+ [RangeSlider::test_overlappingHandles]
+ b2qt
+ qnx
++linux
diff --git a/srcpkgs/qt6-declarative/patches/qml-broken-test.patch b/srcpkgs/qt6-declarative/patches/qml-broken-test.patch
new file mode 100644
index 000000000000..4d44e90b678c
--- /dev/null
+++ b/srcpkgs/qt6-declarative/patches/qml-broken-test.patch
@@ -0,0 +1,64 @@
+--- a/tests/auto/quickcontrols2/controls/data/tst_rangeslider.qml
++++ b/tests/auto/quickcontrols2/controls/data/tst_rangeslider.qml
+@@ -649,61 +649,6 @@ TestCase {
+     }
+ 
+     function test_overlappingHandles() {
+-        var control = createTemporaryObject(sliderComponent, testCase)
+-        verify(control)
+-
+-        // By default, we force the second handle to be after the first in
+-        // terms of stacking order *and* z value.
+-        compare(control.second.handle.z, 1)
+-        compare(control.first.handle.z, 0)
+-        control.first.value = 0
+-        control.second.value = 0
+-
+-        // When both handles overlap, only the handle with the higher Z value
+-        // should be hovered.
+-        mouseMove(control, control.second.handle.x, control.second.handle.y)
+-        compare(control.second.hovered, true)
+-        compare(control.first.hovered, false)
+-
+-        // Both are at the same position, so it doesn't matter whose coordinates we use.
+-        mousePress(control, control.first.handle.x, control.first.handle.y, Qt.LeftButton)
+-        verify(control.second.pressed)
+-        compare(control.second.handle.z, 1)
+-        compare(control.first.handle.z, 0)
+-
+-        // Move the second handle out of the way.
+-        mouseMove(control, control.width, control.first.handle.y)
+-        mouseRelease(control, control.width, control.first.handle.y, Qt.LeftButton)
+-        verify(!control.second.pressed)
+-        compare(control.second.value, 1.0)
+-        compare(control.second.handle.z, 1)
+-        compare(control.first.handle.z, 0)
+-
+-        // The first handle should not be hovered.
+-        compare(control.first.hovered, false)
+-
+-        // Move the first handle on top of the second.
+-        mousePress(control, control.first.handle.x, control.first.handle.y, Qt.LeftButton)
+-        verify(control.first.pressed)
+-        compare(control.first.handle.z, 1)
+-        compare(control.second.handle.z, 0)
+-
+-        mouseMove(control, control.width, control.first.handle.y)
+-        mouseRelease(control, control.width, control.first.handle.y, Qt.LeftButton)
+-        verify(!control.first.pressed)
+-        compare(control.first.handle.z, 1)
+-        compare(control.second.handle.z, 0)
+-
+-        // The most recently pressed handle (the first) should have the higher z value.
+-        mousePress(control, control.first.handle.x, control.first.handle.y, Qt.LeftButton)
+-        verify(control.first.pressed)
+-        compare(control.first.handle.z, 1)
+-        compare(control.second.handle.z, 0)
+-
+-        mouseRelease(control, control.first.handle.x, control.first.handle.y, Qt.LeftButton)
+-        verify(!control.first.pressed)
+-        compare(control.first.handle.z, 1)
+-        compare(control.second.handle.z, 0)
+     }
+ 
+     function test_keys_data() {
diff --git a/srcpkgs/qt6-declarative/template b/srcpkgs/qt6-declarative/template
index e0bd28d9e383..8a190dfc35bc 100644
--- a/srcpkgs/qt6-declarative/template
+++ b/srcpkgs/qt6-declarative/template
@@ -1,23 +1,22 @@
 # Template file for 'qt6-declarative'
 pkgname=qt6-declarative
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qtdeclarative-everywhere-src-${version}"
 build_style=cmake
-configure_args=" -DQT_HOST_PATH=/usr"
 hostmakedepends="qt6-base-devel perl pkg-config wayland-devel
  qt6-shadertools-devel"
-makedepends="qt6-base-devel Vulkan-Headers"
+makedepends="qt6-base-devel Vulkan-Headers qt6-shadertools-devel"
 short_desc="Cross-platform application and UI framework - Declarative"
 maintainer="John <me@johnnynator.dev>"
 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=d294b029dc2b2d4f65da516fdc3b8088d32643eb7ff77db135a8b9ce904caa37
+checksum=03e7694123820fcca397f95ce312e0b7f3039493c8754c836da098a1a04346e8
 replaces="qt6-quickcontrols2>=0"
 
 if [ "$CROSS_BUILD" ]; then
-	configure_args+=" -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true"
+	configure_args="-DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true"
 	hostmakedepends+=" qt6-declarative-devel"
 fi
 
@@ -29,13 +28,31 @@ if [ "$XBPS_TARGET_ENDIAN" = "be" ]; then
 	broken="shader compilation fails"
 fi
 
+pre_configure() {
+	CXXFLAGS+=" '-DQT_DECLARATIVE_BIN_PATH=\"${wrksrc}/build/lib/qt6/bin\"'"
+	CXXFLAGS+=" '-DQT_DECLARATIVE_LIBEXEC_PATH=\"${wrksrc}/build/lib/qt6/libexec\"'"
+}
+
 pre_check() {
 	export QML2_IMPORT_PATH="$wrksrc/build/lib/qt6/qml"
 }
 
 do_check() {
 	cd build
-	ctest -E '(tst_qqmllocale|text|tst_qquickwidget)'
+	local broken="tst_qqmllocale|text|tst_qquickwidget"
+	# requires qt6-declarative installed
+	broken+="|module_includes|cmake_tooling_imports|empty_qmldir"
+	broken+="|qtquickcompiler|qmlquery"
+	# Could work if Qt6Quick.so.6 could be found by qml
+	broken+="|tst_qqmldebugjs|tst_qqmlinspector"
+	broken+="|tst_qqmlprofilerservice|tst_qqmljsscope"
+	broken+="|tst_qqmlpreview|tst_qmllint|tst_qmlformat"
+	# can't find the source
+	broken+="|tst_qmltc_qprocess"
+	broken+="|tst_qquickfiledialogimpl"
+	broken+="|tst_qquickfolderdialogimpl"
+	broken+="|tst_qmlimportscanner|tst_qqmlextensionplugin"
+	ctest -E "($broken)"
 }
 
 qt6-declarative-tools_package() {
@@ -60,11 +77,14 @@ qt6-declarative-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/libQt6QuickTest.so.*"
 		vmove usr/lib/qt6/qml/QtTest
 		vmove usr/lib/qt6/bin/qmltestrunner
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From 7cd2db706780ebbfaea70d1bb69e71923aff5d03 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:07 +0700
Subject: [PATCH 04/26] qt6-imageformats: update to 6.3.1.

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

diff --git a/srcpkgs/qt6-imageformats/template b/srcpkgs/qt6-imageformats/template
index eaca95243c48..9f6d2fb66776 100644
--- a/srcpkgs/qt6-imageformats/template
+++ b/srcpkgs/qt6-imageformats/template
@@ -1,10 +1,9 @@
 # Template file for 'qt6-imageformats'
 pkgname=qt6-imageformats
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qtimageformats-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr"
 hostmakedepends="perl qt6-base-devel"
 makedepends="qt6-base-devel"
 short_desc="Cross-platform application and UI framework - imageformats"
@@ -12,4 +11,4 @@ maintainer="John <me@johnnynator.dev>"
 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=025d0d17ed75b42a7eb6b523731ab8f17025421a8810cade25caffe05d93abef
+checksum=ad0312b8dfbbb67f729bfadbfcd47246ee4a128b717731ba158c41d01fde212f

From ec5ecd44b901015385bcd33b7c7b5cbf880a4531 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:07 +0700
Subject: [PATCH 05/26] qt6-location: update to 6.3.1.

---
 srcpkgs/qt6-location/template | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/qt6-location/template b/srcpkgs/qt6-location/template
index b7397f5f8942..9f26103259ad 100644
--- a/srcpkgs/qt6-location/template
+++ b/srcpkgs/qt6-location/template
@@ -1,10 +1,9 @@
 # Template file for 'qt6-location'
 pkgname=qt6-location
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qtpositioning-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr"
 hostmakedepends="perl qt6-base-devel qt6-declarative-devel"
 makedepends="qt6-serialport-devel qt6-declarative-devel GConf-devel"
 short_desc="Cross-platform application and UI framework - location"
@@ -12,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 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=e9ed50f6b245a346db34d625d0012774ef0ec8e7fd65037127ec26758708236e
+checksum=06788e4ecae1920094b30e4046f0abd23c8189d8a51e9c939b02f0b6abe2e86c
 
 qt6-location-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel>=${version}_1"
@@ -20,8 +19,11 @@ qt6-location-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From db570661ed5fb021ddb9f4df4d57075cd0a4fe2c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:08 +0700
Subject: [PATCH 06/26] qt6-lottie: update to 6.3.1.

---
 srcpkgs/qt6-lottie/template | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/qt6-lottie/template b/srcpkgs/qt6-lottie/template
index 1c97cd5f4f32..a7beb62ec368 100644
--- a/srcpkgs/qt6-lottie/template
+++ b/srcpkgs/qt6-lottie/template
@@ -1,10 +1,9 @@
 # Template file for 'qt6-lottie'
 pkgname=qt6-lottie
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qtlottie-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr"
 hostmakedepends="perl qt6-base-devel"
 makedepends="qt6-declarative-devel"
 short_desc="Cross-platform application and UI framework - lottie"
@@ -12,10 +11,10 @@ maintainer="John <me@johnnynator.dev>"
 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=39db570bbba5b527a1eb6a5774bed47398ace2f7217bbf45b1194ada6cf97deb
+checksum=740ba76999124d5e1a85ef3d01c69976bb8557862b6b26bf48b357fe0cab1cf5
 
 if [ "$XBPS_CHECK_PKGS" ]; then
-	configure_args+=" -DQT_BUILD_TESTS=ON"
+	configure_args="-DQT_BUILD_TESTS=ON"
 fi
 
 pre_check() {
@@ -28,8 +27,10 @@ qt6-lottie-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
 		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From 1e749c53530936b63830e513f148949e69319d8e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:08 +0700
Subject: [PATCH 07/26] qt6-networkauth: update to 6.3.1.

---
 srcpkgs/qt6-networkauth/template | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/qt6-networkauth/template b/srcpkgs/qt6-networkauth/template
index e934beada9b0..1454ceb4a525 100644
--- a/srcpkgs/qt6-networkauth/template
+++ b/srcpkgs/qt6-networkauth/template
@@ -1,10 +1,9 @@
 # Template file for 'qt6-networkauth'
 pkgname=qt6-networkauth
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qtnetworkauth-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr"
 hostmakedepends="perl qt6-base-devel"
 makedepends="qt6-base-devel"
 short_desc="Cross-platform application and UI framework - networkauth"
@@ -12,10 +11,10 @@ maintainer="John <me@johnnynator.dev>"
 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=203a98942919028520038f90a20cd7ee32b537233545d11e429c3e2c1ad9069f
+checksum=d60f54b9d4509fa8bdbf1990bc91f6e260e38cdb57a7b8119fa3861bc5d2fb2a
 
 if [ "$XBPS_CHECK_PKGS" ]; then
-	configure_args+=" -DQT_BUILD_TESTS=ON"
+	configure_args="-DQT_BUILD_TESTS=ON"
 fi
 
 qt6-networkauth-devel_package() {
@@ -24,8 +23,11 @@ qt6-networkauth-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From 2434dccca8a117bc62d46f33a60b96b7432c9d42 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:08 +0700
Subject: [PATCH 08/26] qt6-qt5compat: update to 6.3.1.

---
 srcpkgs/qt6-qt5compat/template | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/qt6-qt5compat/template b/srcpkgs/qt6-qt5compat/template
index 7fcd5ad5080e..a62573cfabfa 100644
--- a/srcpkgs/qt6-qt5compat/template
+++ b/srcpkgs/qt6-qt5compat/template
@@ -1,10 +1,9 @@
 # Template file for 'qt6-qt5compat'
 pkgname=qt6-qt5compat
-version=6.3.0
-revision=2
+version=6.3.1
+revision=1
 wrksrc="qt5compat-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr"
 hostmakedepends="qt6-base-devel qt6-declarative-devel perl pkg-config"
 makedepends="qt6-base-devel qt6-declarative-devel"
 short_desc="Cross-platform application and UI framework - Qt5 Compatibilty Component"
@@ -12,10 +11,10 @@ maintainer="John <me@johnnynator.dev>"
 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=2b199be780c50d9214512b922d94cb240b0412fd63f459e356b76102cad1713e
+checksum=a43ec62bd778eaecf88ad7847118d1c2a471b0fcb820f93beb311d7ab9566cfd
 
 if [ "$XBPS_CHECK_PKGS" ]; then
-	configure_args+=" -DQT_BUILD_TESTS=ON"
+	configure_args="-DQT_BUILD_TESTS=ON"
 fi
 
 qt6-qt5compat-devel_package() {
@@ -24,8 +23,11 @@ qt6-qt5compat-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From 8baa5c7324b04548464a2d18ed1d12d472eb2d84 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:08 +0700
Subject: [PATCH 09/26] qt6-quick3d: update to 6.3.1.

---
 srcpkgs/qt6-quick3d/template | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/qt6-quick3d/template b/srcpkgs/qt6-quick3d/template
index 0f7ef336a3ff..685ce9bc0e90 100644
--- a/srcpkgs/qt6-quick3d/template
+++ b/srcpkgs/qt6-quick3d/template
@@ -1,19 +1,23 @@
 # Template file for 'qt6-quick3d'
 pkgname=qt6-quick3d
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qtquick3d-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr "
 hostmakedepends="perl qt6-base-devel qt6-declarative-devel qt6-shadertools-devel"
 makedepends="qt6-base-devel qt6-declarative-devel qt6-shadertools-devel
- libassimp-devel"
+ qt6-quicktimeline libassimp-devel"
 short_desc="Cross-platform application and UI framework - Quick3d"
 maintainer="John <me@johnnynator.dev>"
 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=0ad05bd1ee1f784b18220a2d2625ee8de91662c88fdc7b798662953d86eb327e
+checksum=2fa766ee47b8c07412b3b755206ada0715fb07813b64ed069e7205044c061256
+
+if [ "$CROSS_BUILD" ]; then
+	hostmakedepends+=" qt6-quick3d-devel"
+	configure_args="-DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true"
+fi
 
 if [ "$XBPS_TARGET_ENDIAN" = "be" ]; then
 	# possibly a qt6-shadertools bug, actually
@@ -26,9 +30,12 @@ qt6-quick3d-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
-		vmove usr/lib/qt6/mkspecs
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/bin
+		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From f795f480e90fd073de895d8386b5da0ec3ce4fbc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:09 +0700
Subject: [PATCH 10/26] qt6-quicktimeline: update to 6.3.1.

---
 common/shlibs                      | 1 +
 srcpkgs/qt6-quicktimeline/template | 7 +++----
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 61924610cc52..26f10d604be9 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2045,6 +2045,7 @@ libQt6Quick3DIblBaker.so.6 qt6-quick3d-6.0.3_1
 libQt6Quick3DParticles.so.6 qt6-quick3d-6.1.0_1
 libQt6Quick3DGlslParser.so.6 qt6-quick3d-6.3.0_1
 libQt6Quick3DAssetUtils.so.6 qt6-quick3d-6.1.0_1
+libQt6QuickTimeline.so.6 qt6-quicktimeline-6.3.0_1
 libQt6QuickControls2Impl.so.6 qt6-declarative-6.0.0_1
 libQt6QuickControls2.so.6 qt6-declarative-6.0.0_1
 libQt6QuickTemplates2.so.6 qt6-declarative-6.0.0_1
diff --git a/srcpkgs/qt6-quicktimeline/template b/srcpkgs/qt6-quicktimeline/template
index 15aa7a8e5819..bf02e043c4a5 100644
--- a/srcpkgs/qt6-quicktimeline/template
+++ b/srcpkgs/qt6-quicktimeline/template
@@ -1,10 +1,9 @@
 # Template file for 'qt6-quicktimeline'
 pkgname=qt6-quicktimeline
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qtquicktimeline-everywhere-src-${version/rc/-rc}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr "
 hostmakedepends="perl qt6-base-devel qt6-declarative-devel"
 makedepends="qt6-base-devel qt6-declarative-devel"
 short_desc="Cross-platform application and UI framework - quicktimeline"
@@ -12,10 +11,10 @@ maintainer="John <me@johnnynator.dev>"
 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=9ff0a931159efc6be5bd9f8a1e4a16a70e2dab37cf22ad85c6d330ccfdf31c1a
+checksum=58a13cf0ce8e7755639f20684078733af24f5a317f6ddb40d6079c8c5a28ebbe
 
 if [ "$XBPS_CHECK_PKGS" ]; then
-	configure_args+=" -DQT_BUILD_TESTS=ON"
+	configure_args="-DQT_BUILD_TESTS=ON"
 fi
 
 pre_check() {

From 6e0ecefa90b22d3c7f4e598c8e756e86fa490d5d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:09 +0700
Subject: [PATCH 11/26] qt6-scxml: update to 6.3.1.

---
 srcpkgs/qt6-scxml/template | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/qt6-scxml/template b/srcpkgs/qt6-scxml/template
index 112baca0ab83..d17ccf16400a 100644
--- a/srcpkgs/qt6-scxml/template
+++ b/srcpkgs/qt6-scxml/template
@@ -1,10 +1,10 @@
 # Template file for 'qt6-scxml'
 pkgname=qt6-scxml
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qtscxml-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr"
+configure_args="-DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true"
 hostmakedepends="perl qt6-declarative-devel"
 makedepends="qt6-declarative-devel"
 short_desc="Cross-platform application and UI framework - scxml"
@@ -12,7 +12,11 @@ maintainer="John <me@johnnynator.dev>"
 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=09b0dbd6ac367920fb1ba96a39dcd4c9d33eb0820dcc79538992825d588a70f0
+checksum=01bc154d6163d1f049f4e1e76658a044730ace7b0a5be35c9a46fcd1396f8619
+
+if [ "$CROSS_BUILD" ]; then
+	hostmakedepends+=" qt6-remoteobjects"
+fi
 
 if [ "$XBPS_CHECK_PKGS" ]; then
 	configure_args+=" -DQT_BUILD_TESTS=ON"
@@ -24,8 +28,11 @@ qt6-scxml-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From fd6e41c59d9aea9596d9dc512263a7ba58b6a3c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:09 +0700
Subject: [PATCH 12/26] qt6-serialport: update to 6.3.1.

---
 srcpkgs/qt6-serialport/template | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/qt6-serialport/template b/srcpkgs/qt6-serialport/template
index 0804671ca57b..2de9d6364a5c 100644
--- a/srcpkgs/qt6-serialport/template
+++ b/srcpkgs/qt6-serialport/template
@@ -1,10 +1,9 @@
 # Template file for 'qt6-serialport'
 pkgname=qt6-serialport
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qtserialport-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr"
 hostmakedepends="perl qt6-base-devel pkg-config"
 makedepends="qt6-base-devel"
 short_desc="Cross-platform application and UI framework - serialport"
@@ -12,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 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=eebd6934d48cc044b8c87795a4fd91bb81f7195d4b5a2ddb12802f343d5db64f
+checksum=4eb6d80e65799dd2e0318df4dfba14173c1929e861718cda9bedca24253b616e
 
 qt6-serialport-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel>=${version}_1"
@@ -20,8 +19,11 @@ qt6-serialport-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From 6367306cdd254c8399ea6520278ca96907dd6a11 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:09 +0700
Subject: [PATCH 13/26] qt6-shadertools: update to 6.3.1.

---
 srcpkgs/qt6-shadertools/template | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/qt6-shadertools/template b/srcpkgs/qt6-shadertools/template
index 9c1ec210a96a..3716333c459b 100644
--- a/srcpkgs/qt6-shadertools/template
+++ b/srcpkgs/qt6-shadertools/template
@@ -1,10 +1,9 @@
 # Template file for 'qt6-shadertools'
 pkgname=qt6-shadertools
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qtshadertools-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr "
 hostmakedepends="perl qt6-base-devel"
 makedepends="qt6-base-devel"
 short_desc="Cross-platform application and UI framework - shadertools"
@@ -12,7 +11,13 @@ maintainer="John <me@johnnynator.dev>"
 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=5498959b9d37c254bd126ab1320cf86aeb8a31b3ea7e51db666a8f9698afbd6c
+checksum=59b77176961528cc7b0c9325134655e273aa87b4cb386c0f4683d8f2852e435a
+
+if [ "$CROSS_BUILD" ]; then
+	configure_args="-DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true"
+	hostmakedepends+=" qt6-shadertools-devel"
+fi
+
 
 qt6-shadertools-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel>=${version}_1"
@@ -20,8 +25,11 @@ qt6-shadertools-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From 326eb9d92fe8783229193833b6461bc26b5a160b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:09 +0700
Subject: [PATCH 14/26] qt6-svg: update to 6.3.1.

---
 srcpkgs/qt6-svg/template | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/qt6-svg/template b/srcpkgs/qt6-svg/template
index aa8e6b745109..309b0988e435 100644
--- a/srcpkgs/qt6-svg/template
+++ b/srcpkgs/qt6-svg/template
@@ -1,10 +1,9 @@
 # Template file for 'qt6-svg'
 pkgname=qt6-svg
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qtsvg-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr "
 hostmakedepends="qt6-base-devel perl"
 makedepends="qt6-base-devel"
 short_desc="Cross-platform application and UI framework (QT6) - qt6-svg component"
@@ -12,10 +11,10 @@ maintainer="John <me@johnnynator.dev>"
 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=3164504d7e3f640439308235739b112605ab5fc9cc517ca0b28f9fb93a8db0e3
+checksum=7b19f418e6f7b8e23344082dd04440aacf5da23c5a73980ba22ae4eba4f87df7
 
 if [ "$XBPS_CHECK_PKGS" ]; then
-	configure_args+=" -DQT_BUILD_TESTS=ON"
+	configure_args="-DQT_BUILD_TESTS=ON"
 fi
 
 do_check() {
@@ -29,8 +28,11 @@ qt6-svg-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From 8409f900c37eb42b551bdf87ad83101667c39efe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:10 +0700
Subject: [PATCH 15/26] qt6-tools: update to 6.3.1.

---
 srcpkgs/qt6-tools/template | 23 ++++++++++++++++++-----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/qt6-tools/template b/srcpkgs/qt6-tools/template
index f875dff5c046..fd311176e31d 100644
--- a/srcpkgs/qt6-tools/template
+++ b/srcpkgs/qt6-tools/template
@@ -1,23 +1,33 @@
 # Template file for 'qt6-tools'
 pkgname=qt6-tools
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qttools-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr "
-hostmakedepends="qt6-base-devel perl"
-makedepends="qt6-base-devel libatomic-devel"
+configure_args="-DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=TRUE
+ -DQT_BUILD_SHARED_LIBS=ON -DQT_FEATURE_assistant=ON"
+hostmakedepends="qt6-base-devel perl qt6-plugin-sqlite"
+makedepends="qt6-base-devel libatomic-devel qt6-plugin-sqlite"
 short_desc="Cross-platform application and UI framework (QT6) - qt6-tools component"
 maintainer="John <me@johnnynator.dev>"
 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/qttools-everywhere-src-${version}.tar.xz"
-checksum=fce94688ea925782a2879347584991f854630daadba6c52aed6d93e33cd0b19c
+checksum=c412750f2aa3beb93fce5f30517c607f55daaeb7d0407af206a8adf917e126c1
+
+if [ "$CROSS_BUILD" ]; then
+	hostmakedepends+=" qt6-tools-devel"
+fi
+
 
 if [ "$XBPS_CHECK_PKGS" ]; then
 	configure_args+=" -DQT_BUILD_TESTS=ON"
 fi
 
+post_build() {
+	ninja -C build ${makejobs} lib/qt6/libexec/qhelpgenerator
+}
+
 do_check() {
 	cd build
 	# Some of these tests expect that qt6-tools is already
@@ -31,8 +41,11 @@ qt6-tools-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From 4ecbb5f9e623ef2b18a02ea3859e5bf528f35984 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:10 +0700
Subject: [PATCH 16/26] qt6-translations: update to 6.3.1.

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

diff --git a/srcpkgs/qt6-translations/template b/srcpkgs/qt6-translations/template
index be0a74ca74e2..1b917ccb3620 100644
--- a/srcpkgs/qt6-translations/template
+++ b/srcpkgs/qt6-translations/template
@@ -1,10 +1,9 @@
 # Template file for 'qt6-translations'
 pkgname=qt6-translations
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qttranslations-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr "
 hostmakedepends="qt6-base-devel qt6-tools-devel perl"
 makedepends="qt6-base-devel qt6-tools-devel"
 short_desc="Cross-platform application and UI framework - translations"
@@ -12,4 +11,4 @@ maintainer="John <me@johnnynator.dev>"
 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=e4dd4ef892a34a9514a19238f189a33ed85c76f31dcad6599ced93b1e33440b3
+checksum=d7bdd55e2908ded901dcc262157100af2a490bf04d31e32995f6d91d78dfdb97

From 822c78e72370528a8e91f49bd8d6337d55efe00e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:10 +0700
Subject: [PATCH 17/26] qt6-virtualkeyboard: update to 6.3.1.

---
 srcpkgs/qt6-virtualkeyboard/template | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/qt6-virtualkeyboard/template b/srcpkgs/qt6-virtualkeyboard/template
index 67ecef145ea1..77a247400b97 100644
--- a/srcpkgs/qt6-virtualkeyboard/template
+++ b/srcpkgs/qt6-virtualkeyboard/template
@@ -1,10 +1,9 @@
 # Template file for 'qt6-virtualkeyboard'
 pkgname=qt6-virtualkeyboard
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qtvirtualkeyboard-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr"
 hostmakedepends="perl pkg-config qt6-declarative-devel"
 makedepends="qt6-declarative-devel qt6-svg-devel hunspell-devel"
 short_desc="Cross-platform application and UI framework - virtualkeyboard"
@@ -12,10 +11,10 @@ maintainer="John <me@johnnynator.dev>"
 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=89aaf15acf5432af8f5cf4ec45cb32d87a3348906215dd56e81cb294eb276573
+checksum=5fe089b204d859ab0dd0169f811f2e30cae7c5cb36f8ab95ca36883f1fc0c2b8
 
 if [ "$XBPS_CHECK_PKGS" ]; then
-	configure_args+=" -DQT_BUILD_TESTS=ON"
+	configure_args="-DQT_BUILD_TESTS=ON"
 fi
 
 do_check() {
@@ -32,8 +31,11 @@ qt6-virtualkeyboard-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From c3f6c3e84e4d92d34964d8c9d3d07a4ca53b3cda Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:10 +0700
Subject: [PATCH 18/26] qt6-wayland: update to 6.3.1.

---
 srcpkgs/qt6-wayland/template | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/qt6-wayland/template b/srcpkgs/qt6-wayland/template
index b71a273009b9..784cb42a1a03 100644
--- a/srcpkgs/qt6-wayland/template
+++ b/srcpkgs/qt6-wayland/template
@@ -1,13 +1,15 @@
 # Template file for 'qt6-wayland'
 pkgname=qt6-wayland
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qtwayland-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true"
-hostmakedepends="qt6-base-devel perl pkg-config wayland-devel qt6-wayland-devel"
+configure_args="-DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true"
+hostmakedepends="qt6-base-devel perl pkg-config wayland-devel
+ qt6-declarative-devel qt6-wayland-devel"
 # XXX: Qml as optional dep
 makedepends="qt6-base-devel wayland-devel libxkbcommon-devel
+ qt6-declarative-devel
  libXcomposite-devel MesaLib-devel Vulkan-Headers libdrm-devel"
 checkdepends="dbus mesa-dri"
 short_desc="Cross-platform application and UI framework - Wayland"
@@ -15,7 +17,7 @@ maintainer="John <me@johnnynator.dev>"
 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=e7b567f6e43ffc5918d4aa825ce1eced66a00cb0a87133b2912ba5c1b2a02190
+checksum=6f14fea2d172a5b4170be3efcb0e58535f6605b61bcd823f6d5c9d165bb8c0f0
 
 if [ "$XBPS_CHECK_PKGS" ]; then
 	configure_args+=" -DQT_BUILD_TESTS=ON"
@@ -32,9 +34,11 @@ qt6-wayland-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
-		vmove usr/lib/qt6/libexec/qtwaylandscanner
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From 1daf1132c7b4e0d10374c5a1494adf1c4e296ee1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:10 +0700
Subject: [PATCH 19/26] qt6-websockets: update to 6.3.1.

---
 srcpkgs/qt6-websockets/template | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/qt6-websockets/template b/srcpkgs/qt6-websockets/template
index c2e674aacb31..4875af093432 100644
--- a/srcpkgs/qt6-websockets/template
+++ b/srcpkgs/qt6-websockets/template
@@ -1,10 +1,9 @@
 # Template file for 'qt6-websockets'
 pkgname=qt6-websockets
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qtwebsockets-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr"
 hostmakedepends="perl qt6-base-devel qt6-declarative-devel"
 makedepends="qt6-base-devel qt6-declarative-devel"
 short_desc="Cross-platform application and UI framework - websockets"
@@ -12,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 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=e018a09fe960b7d9560d6bbc9d3ca022fed6566e6ba6fc6d869a97482d4e6361
+checksum=9f980d90c97fcbde1b50c773f6dc580cfdf8c36ce14a1be3aa2ccadfe605121a
 
 qt6-websockets-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel>=${version}_1"
@@ -20,8 +19,11 @@ qt6-websockets-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From 87f0ee8a5b8b3b86dbabf9b84f22426244579d3c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Tue, 9 Aug 2022 20:16:47 +0700
Subject: [PATCH 20/26] qt6-3d: update to 6.3.1.

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

diff --git a/srcpkgs/qt6-3d/template b/srcpkgs/qt6-3d/template
index 666f57559532..c08c3bd4a41b 100644
--- a/srcpkgs/qt6-3d/template
+++ b/srcpkgs/qt6-3d/template
@@ -1,10 +1,9 @@
 # Template file for 'qt6-3d'
 pkgname=qt6-3d
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qt3d-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr"
 hostmakedepends="perl qt6-declarative-devel"
 makedepends="qt6-declarative-devel qt6-shadertools-devel libassimp-devel
  libatomic-devel"
@@ -13,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 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=74e762380dad34887878b9124dbfb981d5cf4b8b807281ff8bff311145b54de1
+checksum=9919b66dfb253fa26db1a7d664358cbc07f46c8810082ee3120d0a54b153edfe
 
 qt6-3d-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 41527795a4198e5daa0b30567f80ac6835497c75 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:11 +0700
Subject: [PATCH 21/26] New package: qt6-webchannel-6.3.1

---
 srcpkgs/qt6-webchannel-devel    |  1 +
 srcpkgs/qt6-webchannel/template | 32 ++++++++++++++++++++++++++++++++
 srcpkgs/qt6-webchannel/update   |  1 +
 3 files changed, 34 insertions(+)
 create mode 120000 srcpkgs/qt6-webchannel-devel
 create mode 100644 srcpkgs/qt6-webchannel/template
 create mode 100644 srcpkgs/qt6-webchannel/update

diff --git a/srcpkgs/qt6-webchannel-devel b/srcpkgs/qt6-webchannel-devel
new file mode 120000
index 000000000000..03e8b23d785d
--- /dev/null
+++ b/srcpkgs/qt6-webchannel-devel
@@ -0,0 +1 @@
+qt6-webchannel
\ No newline at end of file
diff --git a/srcpkgs/qt6-webchannel/template b/srcpkgs/qt6-webchannel/template
new file mode 100644
index 000000000000..432c42bcc056
--- /dev/null
+++ b/srcpkgs/qt6-webchannel/template
@@ -0,0 +1,32 @@
+# Template file for 'qt6-webchannel'
+pkgname=qt6-webchannel
+version=6.3.1
+revision=1
+wrksrc="qtwebchannel-everywhere-src-${version}"
+build_style=cmake
+hostmakedepends="perl qt6-base-devel qt6-declarative-devel"
+makedepends="qt6-base-devel qt6-declarative-devel qt6-websockets-devel"
+short_desc="Cross-platform application and UI framework - webchannel"
+maintainer="John <me@johnnynator.dev>"
+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=aaa20ac23f86992721b7ee487c379a3fd68caa8cdcea0a77a37e0d8b47ff2668
+
+qt6-webchannel-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel>=${version}_1
+	 qt6-websockets-devel>=${version}_1"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
+		vmove usr/lib/qt6/mkspecs
+		vmove usr/lib/qt6/qml/QtWebChannel/plugins.qmltypes
+		vmove usr/lib/qt6/qml/QtWebChannel/qmldir
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
+	}
+}
diff --git a/srcpkgs/qt6-webchannel/update b/srcpkgs/qt6-webchannel/update
new file mode 100644
index 000000000000..844552465222
--- /dev/null
+++ b/srcpkgs/qt6-webchannel/update
@@ -0,0 +1 @@
+pkgname="${pkgname/6-/}-everywhere-src"

From eb4fca23225607da3b104a0e74d9419e0388c87a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:11 +0700
Subject: [PATCH 22/26] New package: qt6-multimedia-6.3.1

---
 common/shlibs                   |  3 +++
 srcpkgs/qt6-multimedia-devel    |  1 +
 srcpkgs/qt6-multimedia/template | 33 +++++++++++++++++++++++++++++++++
 srcpkgs/qt6-multimedia/update   |  1 +
 4 files changed, 38 insertions(+)
 create mode 120000 srcpkgs/qt6-multimedia-devel
 create mode 100644 srcpkgs/qt6-multimedia/template
 create mode 100644 srcpkgs/qt6-multimedia/update

diff --git a/common/shlibs b/common/shlibs
index 26f10d604be9..ce04cc1ad2cf 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2078,6 +2078,9 @@ libQt6SerialPort.so.6 qt6-serialport-6.2.0alpha_1
 libQt6WebSockets.so.6 qt6-websockets-6.2.0alpha_1
 libQt6WebChannel.so.6 qt6-webchannel-6.2.0alpha_1
 libQt6Positioning.so.6 qt6-location-6.2.0alpha_1
+libQt6MultimediaWidgets.so.6 qt6-multimedia-6.3.1_1
+libQt6MultimediaQuick.so.6 qt6-multimedia-6.3.1_1
+libQt6Multimedia.so.6 qt6-multimedia-6.3.1_1
 libnpth.so.0 npth-1.1_1
 libnpupnp.so.4 libnpupnp-4.0.2_1
 libglfw.so.3 glfw-3.0.4_1
diff --git a/srcpkgs/qt6-multimedia-devel b/srcpkgs/qt6-multimedia-devel
new file mode 120000
index 000000000000..9343446502d0
--- /dev/null
+++ b/srcpkgs/qt6-multimedia-devel
@@ -0,0 +1 @@
+qt6-multimedia
\ No newline at end of file
diff --git a/srcpkgs/qt6-multimedia/template b/srcpkgs/qt6-multimedia/template
new file mode 100644
index 000000000000..535a2f55ffe4
--- /dev/null
+++ b/srcpkgs/qt6-multimedia/template
@@ -0,0 +1,33 @@
+# Template file for 'qt6-multimedia'
+pkgname=qt6-multimedia
+version=6.3.1
+revision=1
+wrksrc="qtmultimedia-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DQT_FEATURE_gstreamer=ON"
+hostmakedepends="perl qt6-declarative-devel pkg-config
+ qt6-shadertools-devel"
+makedepends="qt6-declarative-devel
+ qt6-shadertools-devel libglib-devel gst-plugins-base1-devel"
+short_desc="Cross-platform application and UI framework - multimedia"
+maintainer="John <me@johnnynator.dev>"
+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=7e03242aadd634ff2d9fcf08948290f03da3d9a5012369d908da89f82b1d7336
+
+qt6-multimedia-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel>=${version}_1"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
+		vmove usr/lib/qt6/mkspecs
+		vmove usr/lib/qt6/qml/QtMultimedia/plugins.qmltypes
+		vmove usr/lib/qt6/qml/QtMultimedia/qmldir
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}
diff --git a/srcpkgs/qt6-multimedia/update b/srcpkgs/qt6-multimedia/update
new file mode 100644
index 000000000000..844552465222
--- /dev/null
+++ b/srcpkgs/qt6-multimedia/update
@@ -0,0 +1 @@
+pkgname="${pkgname/6-/}-everywhere-src"

From 196c8630974ce7fa21d939528af452aaaf7a6acb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 18:22:48 +0700
Subject: [PATCH 23/26] New package: qt6-connectivity-6.3.1

---
 common/shlibs                     |  2 ++
 srcpkgs/qt6-connectivity-devel    |  1 +
 srcpkgs/qt6-connectivity/template | 30 ++++++++++++++++++++++++++++++
 3 files changed, 33 insertions(+)
 create mode 120000 srcpkgs/qt6-connectivity-devel
 create mode 100644 srcpkgs/qt6-connectivity/template

diff --git a/common/shlibs b/common/shlibs
index ce04cc1ad2cf..2e95a22119ab 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2072,6 +2072,8 @@ libQt6Designer.so.6 qt6-tools-6.1.0_1
 libQt6DesignerComponents.so.6 qt6-tools-6.1.0_1
 libQt6Help.so.6 qt6-tools-6.1.0_1
 libQt6UiTools.so.6 qt6-tools-6.1.0_1
+libQt6Nfc.so.6 qt6-connectivity-6.3.1_1
+libQt6Bluetooth.so.6 qt6-connectivity-6.3.1_1
 libQt6HunspellInputMethod.so.6 qt6-virtualkeyboard-6.1.0_1
 libQt6VirtualKeyboard.so.6 qt6-virtualkeyboard-6.1.0_1
 libQt6SerialPort.so.6 qt6-serialport-6.2.0alpha_1
diff --git a/srcpkgs/qt6-connectivity-devel b/srcpkgs/qt6-connectivity-devel
new file mode 120000
index 000000000000..478cc9d8aa39
--- /dev/null
+++ b/srcpkgs/qt6-connectivity-devel
@@ -0,0 +1 @@
+qt6-connectivity
\ No newline at end of file
diff --git a/srcpkgs/qt6-connectivity/template b/srcpkgs/qt6-connectivity/template
new file mode 100644
index 000000000000..6cb61744d0cb
--- /dev/null
+++ b/srcpkgs/qt6-connectivity/template
@@ -0,0 +1,30 @@
+# Template file for 'qt6-connectivity'
+pkgname=qt6-connectivity
+version=6.3.1
+revision=1
+wrksrc="qtconnectivity-everywhere-src-${version}"
+build_style=cmake
+hostmakedepends="perl qt6-declarative-devel"
+makedepends="qt6-declarative-devel"
+short_desc="Cross-platform application and UI framework - Connectivity"
+maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
+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=b25ce4710a9c61bc6a5dbaeeb3e2ed907a8bc85478fdb2ab4312297768b695b0
+
+qt6-connectivity-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}
+	 qt6-declarative>=${version}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
+		vmove usr/lib/qt6/mkspecs
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
+	}
+}

From f39a10d6be6cc05fb737eb9af597b23a70819eb5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 18:22:57 +0700
Subject: [PATCH 24/26] New package: qt6-sensors-6.3.1

---
 common/shlibs                |  2 ++
 srcpkgs/qt6-sensors-devel    |  1 +
 srcpkgs/qt6-sensors/template | 31 +++++++++++++++++++++++++++++++
 3 files changed, 34 insertions(+)
 create mode 120000 srcpkgs/qt6-sensors-devel
 create mode 100644 srcpkgs/qt6-sensors/template

diff --git a/common/shlibs b/common/shlibs
index 2e95a22119ab..157b51f3f981 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2074,6 +2074,8 @@ libQt6Help.so.6 qt6-tools-6.1.0_1
 libQt6UiTools.so.6 qt6-tools-6.1.0_1
 libQt6Nfc.so.6 qt6-connectivity-6.3.1_1
 libQt6Bluetooth.so.6 qt6-connectivity-6.3.1_1
+libQt6Sensors.so.6 qt6-sensors-6.3.1_1
+libQt6SensorsQuick.so.6 qt6-sensors-6.3.1_1
 libQt6HunspellInputMethod.so.6 qt6-virtualkeyboard-6.1.0_1
 libQt6VirtualKeyboard.so.6 qt6-virtualkeyboard-6.1.0_1
 libQt6SerialPort.so.6 qt6-serialport-6.2.0alpha_1
diff --git a/srcpkgs/qt6-sensors-devel b/srcpkgs/qt6-sensors-devel
new file mode 120000
index 000000000000..eb9457f04055
--- /dev/null
+++ b/srcpkgs/qt6-sensors-devel
@@ -0,0 +1 @@
+qt6-sensors
\ No newline at end of file
diff --git a/srcpkgs/qt6-sensors/template b/srcpkgs/qt6-sensors/template
new file mode 100644
index 000000000000..5a81f43b60eb
--- /dev/null
+++ b/srcpkgs/qt6-sensors/template
@@ -0,0 +1,31 @@
+# Template file for 'qt6-sensors'
+pkgname=qt6-sensors
+version=6.3.1
+revision=1
+wrksrc="qtsensors-everywhere-src-${version}"
+build_style=cmake
+hostmakedepends="perl qt6-declarative-devel qt6-svg-devel pkg-config"
+makedepends="qt6-declarative-devel qt6-svg-devel"
+short_desc="Cross-platform application and UI framework - Sensors"
+maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
+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=4b240b59edba9a42b4735758a25f279a26841b982864e7b38f6ef0b81e0d60cc
+
+qt6-sensors-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}
+	 qt6-declarative-devel>=${version}_1"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
+		vmove usr/lib/qt6/mkspecs
+		vmove usr/lib/qt6/qml/QtSensors/plugins.qmltypes
+		vmove usr/lib/qt6/qml/QtSensors/qmldir
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}

From f5432c961d4c9e191c7bc92a51cf50485fa918ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 18:23:08 +0700
Subject: [PATCH 25/26] New package: qt6-remoteobjects-6.3.1

---
 common/shlibs                      |  2 ++
 srcpkgs/qt6-remoteobjects-devel    |  1 +
 srcpkgs/qt6-remoteobjects/template | 36 ++++++++++++++++++++++++++++++
 3 files changed, 39 insertions(+)
 create mode 120000 srcpkgs/qt6-remoteobjects-devel
 create mode 100644 srcpkgs/qt6-remoteobjects/template

diff --git a/common/shlibs b/common/shlibs
index 157b51f3f981..91f197e54c93 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2074,6 +2074,8 @@ libQt6Help.so.6 qt6-tools-6.1.0_1
 libQt6UiTools.so.6 qt6-tools-6.1.0_1
 libQt6Nfc.so.6 qt6-connectivity-6.3.1_1
 libQt6Bluetooth.so.6 qt6-connectivity-6.3.1_1
+libQt6RemoteObjects.so.6 qt6-remoteobjects-6.3.1_1
+libQt6RemoteObjectsQml.so.6 qt6-remoteobjects-6.3.1_1
 libQt6Sensors.so.6 qt6-sensors-6.3.1_1
 libQt6SensorsQuick.so.6 qt6-sensors-6.3.1_1
 libQt6HunspellInputMethod.so.6 qt6-virtualkeyboard-6.1.0_1
diff --git a/srcpkgs/qt6-remoteobjects-devel b/srcpkgs/qt6-remoteobjects-devel
new file mode 120000
index 000000000000..2a027f95266f
--- /dev/null
+++ b/srcpkgs/qt6-remoteobjects-devel
@@ -0,0 +1 @@
+qt6-remoteobjects
\ No newline at end of file
diff --git a/srcpkgs/qt6-remoteobjects/template b/srcpkgs/qt6-remoteobjects/template
new file mode 100644
index 000000000000..71d2d31967b6
--- /dev/null
+++ b/srcpkgs/qt6-remoteobjects/template
@@ -0,0 +1,36 @@
+# Template file for 'qt6-remoteobjects'
+pkgname=qt6-remoteobjects
+version=6.3.1
+revision=1
+wrksrc="qtremoteobjects-everywhere-src-${version}"
+build_style=cmake
+hostmakedepends="perl qt6-declarative-devel pkg-config"
+makedepends="qt6-declarative-devel"
+short_desc="Cross-platform application and UI framework - Remote Objects"
+maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
+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=ea6d038b11c60981de0bd39a6091a59abf7d031e37bfc592b31be1217bef4ca6
+
+if [ "$CROSS_BUILD" ]; then
+	hostmakedepends+=" qt6-remoteobjects"
+	configure_args="-DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true"
+fi
+
+qt6-remoteobjects-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}
+	 qt6-declarative-devel>=${version}_1"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
+		vmove usr/lib/qt6/mkspecs
+		vmove usr/lib/qt6/qml/QtRemoteObjects/plugins.qmltypes
+		vmove usr/lib/qt6/qml/QtRemoteObjects/qmldir
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}

From 0bef4c2f66d5d2a1de10dac2252aa422e67c04ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:11 +0700
Subject: [PATCH 26/26] New package: qt6-webengine-6.3.1.

---
 common/shlibs                                 |    7 +
 srcpkgs/qt6-webengine-devel                   |    1 +
 srcpkgs/qt6-webengine-examples                |    1 +
 .../patches/0001-None-no-debug.patch          |   11 +
 .../patches/0002-enable-ppc64.patch           |   20 +
 .../patches/0003-cross-hack.patch             |   10 +
 .../0004-ppc-disable-jxl-decoder.patch        |   13 +
 .../patches/0050-no-glibc-cmake-check.patch   |   14 +
 .../0100-chromium-sandbox-membarrier.patch    |   58 +
 .../qt6-webengine/patches/0101-size_t.patch   |   16 +
 .../0102-chromium-90-ruy-include.patch        |   19 +
 ...-v8-monotonic-pthread-cont_timedwait.patch |   22 +
 .../0104-chromium-revert-9d080c0.patch        |  162 +
 ...-chromium-revert-drop-of-system-java.patch |   15 +
 .../patches/0106-chromium-system-nodejs.patch |   20 +
 .../0107-chromium-cursed^Uscoped_file.patch   |   18 +
 .../0108-chromium-fix-narrowing-cast.patch    |   53 +
 .../0109-chromium-remove-strip_binary.patch   |   32 +
 ...ium-revert-use-ffile-compilation-dir.patch |   57 +
 ...11-chromium-no-Wno-stringop-overread.patch |   10 +
 .../0150-chromium-glibc-libc_malloc.patch     |   24 +
 ...-include-sys-reg.h-to-get-__WORDSIZE.patch |   21 +
 .../0201-chromium-musl-dispatch-to-musl.patch |  103 +
 .../0202-chromium-musl-no-mallinfo.patch      |   62 +
 .../0203-chromium-musl-siginfo_t.patch        |   18 +
 .../0204-chromium-musl-stackstart.patch       |   20 +
 .../patches/0205-chromium-musl-sandbox.patch  |   92 +
 ...0206-chromium-musl-default-stacksize.patch |   15 +
 .../patches/0208-chromium-musl-execinfo.patch |  125 +
 .../0209-chromium-musl-thread-stacksize.patch |   22 +
 .../0210-chromium-musl-msgvec-push_back.patch |   14 +
 ...ium-musl-canonicalize-file-name-musl.patch |   11 +
 .../0212-chromium-musl-no-getcontext.patch    |   29 +
 .../patches/0213-chromium-musl-crashpad.patch |   24 +
 .../patches/0214-chromium-musl-fixes.patch    |  108 +
 .../patches/0215-chromium-musl-cdefs.patch    |   29 +
 .../patches/0216-chromium-musl-stat.patch     |   12 +
 .../patches/0217-chromium-musl-resolver.patch |   77 +
 .../patches/0600-chromium-sndio.patch         |  876 ++++
 .../patches/0700-armv7l-neon.patch            |   10 +
 ...-chromium-musl-cross-no-asm_ptrace_h.patch |   30 +
 .../0751-chromium-musl-arm-user_vfp.patch     |   20 +
 .../0752-chromium-musl-arm-elf_auxv_t.patch   |   18 +
 ...0801-chromium-i686-vaapi-fpermissive.patch |   24 +
 .../patches/0900-xxx-ppc64le-libvpx.patch     |   65 +
 .../0901-xxx-ppc64le-sandbox-linux-stat.patch |   31 +
 .../patches/0902-xxx-ppc64le-support.patch    | 3556 +++++++++++++++++
 .../0903-xxx-ppc64le-swiftshader.patch        |   18 +
 .../patches/cross-build-examples.patch        |   16 +
 srcpkgs/qt6-webengine/template                |  178 +
 srcpkgs/qt6-webengine/update                  |    1 +
 51 files changed, 6208 insertions(+)
 create mode 120000 srcpkgs/qt6-webengine-devel
 create mode 120000 srcpkgs/qt6-webengine-examples
 create mode 100644 srcpkgs/qt6-webengine/patches/0001-None-no-debug.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0002-enable-ppc64.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0003-cross-hack.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0004-ppc-disable-jxl-decoder.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0050-no-glibc-cmake-check.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0100-chromium-sandbox-membarrier.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0101-size_t.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0102-chromium-90-ruy-include.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0103-chromium-v8-monotonic-pthread-cont_timedwait.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0104-chromium-revert-9d080c0.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0105-chromium-revert-drop-of-system-java.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0106-chromium-system-nodejs.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0107-chromium-cursed^Uscoped_file.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0108-chromium-fix-narrowing-cast.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0109-chromium-remove-strip_binary.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0110-chromium-revert-use-ffile-compilation-dir.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0111-chromium-no-Wno-stringop-overread.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0150-chromium-glibc-libc_malloc.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0200-chromium-musl-include-sys-reg.h-to-get-__WORDSIZE.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0201-chromium-musl-dispatch-to-musl.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0202-chromium-musl-no-mallinfo.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0203-chromium-musl-siginfo_t.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0204-chromium-musl-stackstart.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0205-chromium-musl-sandbox.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0206-chromium-musl-default-stacksize.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0208-chromium-musl-execinfo.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0209-chromium-musl-thread-stacksize.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0210-chromium-musl-msgvec-push_back.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0211-chromium-musl-canonicalize-file-name-musl.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0212-chromium-musl-no-getcontext.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0213-chromium-musl-crashpad.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0214-chromium-musl-fixes.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0215-chromium-musl-cdefs.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0216-chromium-musl-stat.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0217-chromium-musl-resolver.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0600-chromium-sndio.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0700-armv7l-neon.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0750-chromium-musl-cross-no-asm_ptrace_h.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0751-chromium-musl-arm-user_vfp.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0752-chromium-musl-arm-elf_auxv_t.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0801-chromium-i686-vaapi-fpermissive.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0900-xxx-ppc64le-libvpx.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0901-xxx-ppc64le-sandbox-linux-stat.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0902-xxx-ppc64le-support.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0903-xxx-ppc64le-swiftshader.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/cross-build-examples.patch
 create mode 100644 srcpkgs/qt6-webengine/template
 create mode 100644 srcpkgs/qt6-webengine/update

diff --git a/common/shlibs b/common/shlibs
index 91f197e54c93..1f8acc43c36e 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2087,6 +2087,13 @@ libQt6Positioning.so.6 qt6-location-6.2.0alpha_1
 libQt6MultimediaWidgets.so.6 qt6-multimedia-6.3.1_1
 libQt6MultimediaQuick.so.6 qt6-multimedia-6.3.1_1
 libQt6Multimedia.so.6 qt6-multimedia-6.3.1_1
+libQt6WebEngineQuick.so.6 qt6-webengine-6.3.1_1
+libQt6PdfWidgets.so.6 qt6-webengine-6.3.1_1
+libQt6PdfQuick.so.6 qt6-webengine-6.3.1_1
+libQt6WebEngineCore.so.6 qt6-webengine-6.3.1_1
+libQt6Pdf.so.6 qt6-webengine-6.3.1_1
+libQt6WebEngineQuickDelegatesQml.so.6 qt6-webengine-6.3.1_1
+libQt6WebEngineWidgets.so.6 qt6-webengine-6.3.1_1
 libnpth.so.0 npth-1.1_1
 libnpupnp.so.4 libnpupnp-4.0.2_1
 libglfw.so.3 glfw-3.0.4_1
diff --git a/srcpkgs/qt6-webengine-devel b/srcpkgs/qt6-webengine-devel
new file mode 120000
index 000000000000..8e4d1b99c587
--- /dev/null
+++ b/srcpkgs/qt6-webengine-devel
@@ -0,0 +1 @@
+qt6-webengine
\ No newline at end of file
diff --git a/srcpkgs/qt6-webengine-examples b/srcpkgs/qt6-webengine-examples
new file mode 120000
index 000000000000..8e4d1b99c587
--- /dev/null
+++ b/srcpkgs/qt6-webengine-examples
@@ -0,0 +1 @@
+qt6-webengine
\ No newline at end of file
diff --git a/srcpkgs/qt6-webengine/patches/0001-None-no-debug.patch b/srcpkgs/qt6-webengine/patches/0001-None-no-debug.patch
new file mode 100644
index 000000000000..1ba33f8e6fd9
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0001-None-no-debug.patch
@@ -0,0 +1,11 @@
+--- a/cmake/Functions.cmake
++++ b/cmake/Functions.cmake
+@@ -813,6 +813,8 @@ macro(append_build_type_setup)
+         endif()
+     elseif(${config} STREQUAL "MinSizeRel")
+         list(APPEND gnArgArg is_debug=false symbol_level=0 optimize_for_size=true)
++    elseif(${config} STREQUAL "None")
++        list(APPEND gnArgArg is_debug=false symbol_level=0)
+     endif()
+     if(FEATURE_developer_build OR (${config} STREQUAL "Debug") OR QT_FEATURE_webengine_sanitizer)
+         list(APPEND gnArgArg
diff --git a/srcpkgs/qt6-webengine/patches/0002-enable-ppc64.patch b/srcpkgs/qt6-webengine/patches/0002-enable-ppc64.patch
new file mode 100644
index 000000000000..d72ef1ad1a10
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0002-enable-ppc64.patch
@@ -0,0 +1,20 @@
+--- a/cmake/Functions.cmake
++++ b/cmake/Functions.cmake
+@@ -622,6 +622,8 @@ function(get_gn_arch result arch)
+         set(${result} "mipsel" PARENT_SCOPE)
+     elseif(arch STREQUAL "mipsel64")
+         set(${result} "mips64el" PARENT_SCOPE)
++    elseif(arch STREQUAL "power64")
++        set(${result} "power64" PARENT_SCOPE)
+     else()
+         message(DEBUG "Unsupported architecture: ${arch}")
+     endif()
+@@ -641,6 +643,8 @@ function(get_v8_arch result targetArch h
+             set(${result} "mipsel" PARENT_SCOPE)
+         elseif(hostArch STREQUAL "mipsel64")
+             set(${result} "mipsel" PARENT_SCOPE)
++        elseif(hostArch STREQUAL "power64")
++            set(${result} "power64" PARENT_SCOPE)
+         else()
+             message(DEBUG "Unsupported architecture: ${hostArch}")
+         endif()
diff --git a/srcpkgs/qt6-webengine/patches/0003-cross-hack.patch b/srcpkgs/qt6-webengine/patches/0003-cross-hack.patch
new file mode 100644
index 000000000000..ea9f90094a63
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0003-cross-hack.patch
@@ -0,0 +1,10 @@
+--- a/src/core/api/CMakeLists.txt
++++ b/src/core/api/CMakeLists.txt
+@@ -50,6 +50,7 @@ qt_internal_add_module(WebEngineCore
+         Qt::Gui
+         Qt::Network
+         Qt::Quick
++        X11
+ )
+ 
+ set_target_properties(WebEngineCore PROPERTIES QTWEBENGINEPROCESS_NAME ${qtWebEngineProcessName})
diff --git a/srcpkgs/qt6-webengine/patches/0004-ppc-disable-jxl-decoder.patch b/srcpkgs/qt6-webengine/patches/0004-ppc-disable-jxl-decoder.patch
new file mode 100644
index 000000000000..73c1151968f4
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0004-ppc-disable-jxl-decoder.patch
@@ -0,0 +1,13 @@
+--- a/src/core/CMakeLists.txt
++++ b/src/core/CMakeLists.txt
+@@ -414,6 +414,10 @@ foreach(arch ${archs})
+                 CONDITION QT_FEATURE_webengine_ozone_x11 AND XSCRNSAVER_FOUND
+             )
+ 
++            if (cpu STREQUAL "ppc64")
++                list(APPEND gnArgArg enable_jxl_decoder=false)
++            endif()
++
+             if(QT_FEATURE_webengine_kerberos)
+                 list(APPEND gnArgArg
+                      external_gssapi_include_dir="${GSSAPI_INCLUDE_DIRS}/gssapi"
diff --git a/srcpkgs/qt6-webengine/patches/0050-no-glibc-cmake-check.patch b/srcpkgs/qt6-webengine/patches/0050-no-glibc-cmake-check.patch
new file mode 100644
index 000000000000..f756bf0286bb
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0050-no-glibc-cmake-check.patch
@@ -0,0 +1,14 @@
+--- a/configure.cmake
++++ b/configure.cmake
+@@ -499,11 +499,6 @@ add_check_for_support(
+ )
+ add_check_for_support(
+    MODULES QtWebEngine QtPdf
+-   CONDITION NOT LINUX OR TEST_glibc
+-   MESSAGE "A suitable version >= 2.17 of glibc is required."
+-)
+-add_check_for_support(
+-   MODULES QtWebEngine QtPdf
+    CONDITION NOT LINUX OR TEST_khr
+    MESSAGE "Build requires Khronos development headers for build - see mesa/libegl1-mesa-dev"
+ )
diff --git a/srcpkgs/qt6-webengine/patches/0100-chromium-sandbox-membarrier.patch b/srcpkgs/qt6-webengine/patches/0100-chromium-sandbox-membarrier.patch
new file mode 100644
index 000000000000..2dd7b4aa948f
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0100-chromium-sandbox-membarrier.patch
@@ -0,0 +1,58 @@
+--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
++++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
+@@ -413,6 +413,7 @@ bool SyscallSets::IsAllowedProcessStartO
+   switch (sysno) {
+     case __NR_exit:
+     case __NR_exit_group:
++    case __NR_membarrier:
+     case __NR_wait4:
+     case __NR_waitid:
+ #if defined(__i386__)
+--- a/src/3rdparty/chromium/sandbox/linux/system_headers/arm64_linux_syscalls.h
++++ b/src/3rdparty/chromium/sandbox/linux/system_headers/arm64_linux_syscalls.h
+@@ -1215,4 +1215,8 @@
+ #define __NR_landlock_restrict_self 446
+ #endif
+ 
++#if !defined(__NR_membarrier)
++#define __NR_membarrier 283
++#endif
++
+ #endif  // SANDBOX_LINUX_SYSTEM_HEADERS_ARM64_LINUX_SYSCALLS_H_
+--- a/src/3rdparty/chromium/sandbox/linux/system_headers/arm_linux_syscalls.h
++++ b/src/3rdparty/chromium/sandbox/linux/system_headers/arm_linux_syscalls.h
+@@ -1617,6 +1617,10 @@
+ #define __NR_landlock_restrict_self (__NR_SYSCALL_BASE + 446)
+ #endif
+ 
++#if !defined(__NR_membarrier)
++#define __NR_membarrier (__NR_SYSCALL_BASE+389)
++#endif
++
+ // ARM private syscalls.
+ #if !defined(__ARM_NR_BASE)
+ #define __ARM_NR_BASE (__NR_SYSCALL_BASE + 0xF0000)
+--- a/src/3rdparty/chromium/sandbox/linux/system_headers/x86_32_linux_syscalls.h
++++ b/src/3rdparty/chromium/sandbox/linux/system_headers/x86_32_linux_syscalls.h
+@@ -1750,5 +1750,9 @@
+ #define __NR_landlock_restrict_self 446
+ #endif
+ 
++#if !defined(__NR_membarrier)
++#define __NR_membarrier 375
++#endif
++
+ #endif  // SANDBOX_LINUX_SYSTEM_HEADERS_X86_32_LINUX_SYSCALLS_H_
+ 
+--- a/src/3rdparty/chromium/sandbox/linux/system_headers/x86_64_linux_syscalls.h
++++ b/src/3rdparty/chromium/sandbox/linux/system_headers/x86_64_linux_syscalls.h
+@@ -1438,5 +1438,9 @@
+ #define __NR_landlock_restrict_self 446
+ #endif
+ 
++#if !defined(__NR_membarrier)
++#define __NR_membarrier 324
++#endif
++
+ #endif  // SANDBOX_LINUX_SYSTEM_HEADERS_X86_64_LINUX_SYSCALLS_H_
+ 
diff --git a/srcpkgs/qt6-webengine/patches/0101-size_t.patch b/srcpkgs/qt6-webengine/patches/0101-size_t.patch
new file mode 100644
index 000000000000..fccc085da311
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0101-size_t.patch
@@ -0,0 +1,16 @@
+--- a/src/3rdparty/chromium/third_party/angle/include/platform/PlatformMethods.h
++++ b/src/3rdparty/chromium/third_party/angle/include/platform/PlatformMethods.h
+@@ -239,11 +239,11 @@ inline void DefaultOverrideFeaturesMtl(P
+ using ProgramKeyType   = std::array<uint8_t, 20>;
+ using CacheProgramFunc = void (*)(PlatformMethods *platform,
+                                   const ProgramKeyType &key,
+-                                  size_t programSize,
++                                  std::size_t programSize,
+                                   const uint8_t *programBytes);
+ inline void DefaultCacheProgram(PlatformMethods *platform,
+                                 const ProgramKeyType &key,
+-                                size_t programSize,
++                                std::size_t programSize,
+                                 const uint8_t *programBytes)
+ {}
+ 
diff --git a/srcpkgs/qt6-webengine/patches/0102-chromium-90-ruy-include.patch b/srcpkgs/qt6-webengine/patches/0102-chromium-90-ruy-include.patch
new file mode 100644
index 000000000000..bbba579076d6
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0102-chromium-90-ruy-include.patch
@@ -0,0 +1,19 @@
+From 714092f336bb14d2fcc27396ec323b3d843bb962 Mon Sep 17 00:00:00 2001
+From: Stephan Hartmann <stha09@googlemail.com>
+Date: Thu, 4 Mar 2021 15:05:46 +0000
+Subject: [PATCH] IWYU: include limits for std::numeric_limits
+
+---
+ third_party/ruy/src/ruy/block_map.cc | 1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/src/3rdparty/chromium/third_party/ruy/src/ruy/block_map.cc
++++ b/src/3rdparty/chromium/third_party/ruy/src/ruy/block_map.cc
+@@ -17,6 +17,7 @@ limitations under the License.
+ 
+ #include <algorithm>
+ #include <cstdint>
++#include <limits>
+ 
+ #ifdef RUY_MAKEBLOCKMAP_DEBUG
+ #include <cstdio>
diff --git a/srcpkgs/qt6-webengine/patches/0103-chromium-v8-monotonic-pthread-cont_timedwait.patch b/srcpkgs/qt6-webengine/patches/0103-chromium-v8-monotonic-pthread-cont_timedwait.patch
new file mode 100644
index 000000000000..1dc8bc4d3d17
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0103-chromium-v8-monotonic-pthread-cont_timedwait.patch
@@ -0,0 +1,22 @@
+Use monotonic clock for pthread_cond_timedwait with musl too.
+
+--- a/src/3rdparty/chromium/v8/src/base/platform/condition-variable.cc
++++ b/src/3rdparty/chromium/v8/src/base/platform/condition-variable.cc
+@@ -20,7 +20,7 @@ namespace base {
+ 
+ ConditionVariable::ConditionVariable() {
+ #if (V8_OS_FREEBSD || V8_OS_NETBSD || V8_OS_OPENBSD || \
+-     (V8_OS_LINUX && V8_LIBC_GLIBC))
++     V8_OS_LINUX)
+   // On Free/Net/OpenBSD and Linux with glibc we can change the time
+   // source for pthread_cond_timedwait() to use the monotonic clock.
+   pthread_condattr_t attr;
+@@ -96,7 +96,7 @@ bool ConditionVariable::WaitFor(Mutex* m
+       &native_handle_, &mutex->native_handle(), &ts);
+ #else
+ #if (V8_OS_FREEBSD || V8_OS_NETBSD || V8_OS_OPENBSD || \
+-     (V8_OS_LINUX && V8_LIBC_GLIBC))
++     V8_OS_LINUX)
+   // On Free/Net/OpenBSD and Linux with glibc we can change the time
+   // source for pthread_cond_timedwait() to use the monotonic clock.
+   result = clock_gettime(CLOCK_MONOTONIC, &ts);
diff --git a/srcpkgs/qt6-webengine/patches/0104-chromium-revert-9d080c0.patch b/srcpkgs/qt6-webengine/patches/0104-chromium-revert-9d080c0.patch
new file mode 100644
index 000000000000..42b1ee9ec063
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0104-chromium-revert-9d080c0.patch
@@ -0,0 +1,162 @@
+ Original change's description:
+ > Replace 'blacklist' with 'ignorelist' in ./tools/msan/.
+ >
+ > Bug: 1097272, 1097268
+ > Change-Id: Id5c8227a5bfb1ffaec82d3168b609085b10c8297
+ > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2867730
+ > Commit-Queue: Dylan Cutler <dylancutler@google.com>
+ > Reviewed-by: Nico Weber <thakis@chromium.org>
+ > Reviewed-by: Jonathan Metzman <metzman@chromium.org>
+ > Cr-Commit-Position: refs/heads/master@{#883035}
+--- a/src/3rdparty/chromium/build/config/sanitizers/BUILD.gn
++++ b/src/3rdparty/chromium/build/config/sanitizers/BUILD.gn
+@@ -272,11 +272,11 @@ config("asan_flags") {
+   if (is_asan) {
+     cflags += [ "-fsanitize=address" ]
+     if (is_win) {
+-      if (!defined(asan_win_blocklist_path)) {
+-        asan_win_blocklist_path =
++      if (!defined(asan_win_blacklist_path)) {
++        asan_win_blacklist_path =
+             rebase_path("//tools/memory/asan/blocklist_win.txt", root_build_dir)
+       }
+-      cflags += [ "-fsanitize-ignorelist=$asan_win_blocklist_path" ]
++      cflags += [ "-fsanitize-blacklist=$asan_win_blacklist_path" ]
+     }
+   }
+ }
+@@ -306,13 +306,13 @@ config("link_shared_library") {
+ config("cfi_flags") {
+   cflags = []
+   if (is_cfi && current_toolchain == default_toolchain) {
+-    if (!defined(cfi_ignorelist_path)) {
+-      cfi_ignorelist_path =
++    if (!defined(cfi_blacklist_path)) {
++      cfi_blacklist_path =
+           rebase_path("//tools/cfi/ignores.txt", root_build_dir)
+     }
+     cflags += [
+       "-fsanitize=cfi-vcall",
+-      "-fsanitize-ignorelist=$cfi_ignorelist_path",
++      "-fsanitize-blacklist=$cfi_blacklist_path",
+     ]
+ 
+     if (use_cfi_cast) {
+@@ -409,14 +409,14 @@ config("msan_flags") {
+   if (is_msan) {
+     assert(is_linux || is_chromeos,
+            "msan only supported on linux x86_64/ChromeOS")
+-    if (!defined(msan_ignorelist_path)) {
+-      msan_ignorelist_path =
+-          rebase_path("//tools/msan/ignorelist.txt", root_build_dir)
++    if (!defined(msan_blacklist_path)) {
++      msan_blacklist_path =
++          rebase_path("//tools/msan/blacklist.txt", root_build_dir)
+     }
+     cflags = [
+       "-fsanitize=memory",
+       "-fsanitize-memory-track-origins=$msan_track_origins",
+-      "-fsanitize-ignorelist=$msan_ignorelist_path",
++      "-fsanitize-blacklist=$msan_blacklist_path",
+     ]
+   }
+ }
+@@ -424,13 +424,13 @@ config("msan_flags") {
+ config("tsan_flags") {
+   if (is_tsan) {
+     assert(is_linux || is_chromeos, "tsan only supported on linux x86_64")
+-    if (!defined(tsan_ignorelist_path)) {
+-      tsan_ignorelist_path =
++    if (!defined(tsan_blacklist_path)) {
++      tsan_blacklist_path =
+           rebase_path("//tools/memory/tsan_v2/ignores.txt", root_build_dir)
+     }
+     cflags = [
+       "-fsanitize=thread",
+-      "-fsanitize-ignorelist=$tsan_ignorelist_path",
++      "-fsanitize-blacklist=$tsan_blacklist_path",
+     ]
+   }
+ }
+@@ -438,8 +438,8 @@ config("tsan_flags") {
+ config("ubsan_flags") {
+   cflags = []
+   if (is_ubsan) {
+-    if (!defined(ubsan_ignorelist_path)) {
+-      ubsan_ignorelist_path =
++    if (!defined(ubsan_blacklist_path)) {
++      ubsan_blacklist_path =
+           rebase_path("//tools/ubsan/ignorelist.txt", root_build_dir)
+     }
+     cflags += [
+@@ -456,7 +456,7 @@ config("ubsan_flags") {
+       "-fsanitize=signed-integer-overflow",
+       "-fsanitize=unreachable",
+       "-fsanitize=vla-bound",
+-      "-fsanitize-ignorelist=$ubsan_ignorelist_path",
++      "-fsanitize-blacklist=$ubsan_blacklist_path",
+     ]
+     if (!is_clang) {
+       # These exposes too much illegal C++14 code to compile on anything stricter than clang:
+@@ -497,8 +497,8 @@ config("ubsan_no_recover") {
+ 
+ config("ubsan_security_flags") {
+   if (is_ubsan_security) {
+-    if (!defined(ubsan_security_ignorelist_path)) {
+-      ubsan_security_ignorelist_path =
++    if (!defined(ubsan_security_blacklist_path)) {
++      ubsan_security_blacklist_path =
+           rebase_path("//tools/ubsan/security_ignorelist.txt", root_build_dir)
+     }
+     cflags = [
+@@ -506,7 +506,7 @@ config("ubsan_security_flags") {
+       "-fsanitize=shift",
+       "-fsanitize=signed-integer-overflow",
+       "-fsanitize=vla-bound",
+-      "-fsanitize-ignorelist=$ubsan_security_ignorelist_path",
++      "-fsanitize-blacklist=$ubsan_security_blacklist_path",
+     ]
+   }
+ }
+@@ -519,13 +519,13 @@ config("ubsan_null_flags") {
+ 
+ config("ubsan_vptr_flags") {
+   if (is_ubsan_vptr) {
+-    if (!defined(ubsan_vptr_ignorelist_path)) {
+-      ubsan_vptr_ignorelist_path =
++    if (!defined(ubsan_vptr_blacklist_path)) {
++      ubsan_vptr_blacklist_path =
+           rebase_path("//tools/ubsan/vptr_ignorelist.txt", root_build_dir)
+     }
+     cflags = [
+       "-fsanitize=vptr",
+-      "-fsanitize-ignorelist=$ubsan_vptr_ignorelist_path",
++      "-fsanitize-blacklist=$ubsan_vptr_blacklist_path",
+     ]
+     if (!is_clang) {
+       # Clang specific flag:
+--- a/src/3rdparty/chromium/build_overrides/build.gni
++++ b/src/3rdparty/chromium/build_overrides/build.gni
+@@ -43,15 +43,15 @@ declare_args() {
+ # Allows different projects to specify their own suppression/ignore lists for
+ # sanitizer tools.
+ # asan_suppressions_file = "path/to/asan_suppressions.cc"
+-# asan_win_ignorelist_path = "path/to/asan/blocklist_win.txt"
++# asan_win_blacklist_path = "path/to/asan/blocklist_win.txt"
+ # lsan_suppressions_file = "path/to/lsan_suppressions.cc"
+ # tsan_suppressions_file = "path/to/tsan_suppressions.cc"
+-# tsan_ignorelist_path = "path/to/tsan/ignores.txt"
+-# msan_ignorelist_path = "path/to/msan/ignorelist.txt"
+-# ubsan_ignorelist_path = "path/to/ubsan/ignorelist.txt"
+-# ubsan_vptr_ignorelist_path = "path/to/ubsan/vptr_ignorelist.txt"
+-# ubsan_security_ignorelist_path = "path/to/ubsan/security_ignorelist.txt"
+-# cfi_ignorelist_path = "path/to/cfi/ignores.txt"
++# tsan_blacklist_path = "path/to/tsan/ignores.txt"
++# msan_blacklist_path = "path/to/msan/blacklist.txt"
++# ubsan_blacklist_path = "path/to/ubsan/blacklist.txt"
++# ubsan_vptr_blacklist_path = "path/to/ubsan/vptr_blacklist.txt"
++# ubsan_security_blacklist_path = "path/to/ubsan/security_blacklist.txt"
++# cfi_blacklist_path = "path/to/cfi/ignores.txt"
+ 
+ declare_args() {
+   # Android 32-bit non-component, non-clang builds cannot have symbol_level=2
diff --git a/srcpkgs/qt6-webengine/patches/0105-chromium-revert-drop-of-system-java.patch b/srcpkgs/qt6-webengine/patches/0105-chromium-revert-drop-of-system-java.patch
new file mode 100644
index 000000000000..44f3aa8fae5e
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0105-chromium-revert-drop-of-system-java.patch
@@ -0,0 +1,15 @@
+This was dropped for some reason in 6951c37cecd05979b232a39e5c10e6346a0f74ef
+--- a/src/3rdparty/chromium/third_party/closure_compiler/compiler.py
++++ b/src/3rdparty/chromium/third_party/closure_compiler/compiler.py
+@@ -13,8 +13,9 @@ import subprocess
+ 
+ 
+ _CURRENT_DIR = os.path.join(os.path.dirname(__file__))
+-_JAVA_PATH = os.path.join(_CURRENT_DIR, "..", "jdk", "current", "bin", "java")
+-assert os.path.isfile(_JAVA_PATH), "java only allowed in android builds"
++_JAVA_BIN = "java"
++_JDK_PATH = os.path.join(_CURRENT_DIR, "..", "jdk", "current", "bin", "java")
++_JAVA_PATH = _JDK_PATH if os.path.isfile(_JDK_PATH) else _JAVA_BIN
+ 
+ class Compiler(object):
+   """Runs the Closure compiler on given source files to typecheck them
diff --git a/srcpkgs/qt6-webengine/patches/0106-chromium-system-nodejs.patch b/srcpkgs/qt6-webengine/patches/0106-chromium-system-nodejs.patch
new file mode 100644
index 000000000000..1e067cc6eda0
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0106-chromium-system-nodejs.patch
@@ -0,0 +1,20 @@
+--- a/src/3rdparty/chromium/third_party/node/node.py
++++ b/src/3rdparty/chromium/third_party/node/node.py
+@@ -36,11 +36,12 @@ def GetBinaryPath():
+   if platform.system() == 'Darwin' and platform.machine() == 'arm64':
+       return os.path.join(os_path.join(os_path.dirname(__file__), 'mac',
+                           'node-darwin-arm64', 'bin', 'node'))
+-  return os_path.join(os_path.dirname(__file__), *{
+-    'Darwin': ('mac', 'node-darwin-x64', 'bin', 'node'),
+-    'Linux': ('linux', 'node-linux-x64', 'bin', 'node'),
+-    'Windows': ('win', 'node.exe'),
+-  }[platform.system()])
++  return "/usr/bin/node"
++  #return os_path.join(os_path.dirname(__file__), *{
++  #  'Darwin': ('mac', 'node-darwin-x64', 'bin', 'node'),
++  #  'Linux': ('linux', 'node-linux-x64', 'bin', 'node'),
++  #  'Windows': ('win', 'node.exe'),
++  #}[platform.system()])
+ 
+ 
+ def RunNode(cmd_parts, stdout=None):
diff --git a/srcpkgs/qt6-webengine/patches/0107-chromium-cursed^Uscoped_file.patch b/srcpkgs/qt6-webengine/patches/0107-chromium-cursed^Uscoped_file.patch
new file mode 100644
index 000000000000..a8f5d971883d
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0107-chromium-cursed^Uscoped_file.patch
@@ -0,0 +1,18 @@
+--- a/src/3rdparty/chromium/base/files/scoped_file_linux.cc
++++ b/src/3rdparty/chromium/base/files/scoped_file_linux.cc
+@@ -77,15 +77,3 @@ bool IsFDOwned(int fd) {
+ }
+ 
+ }  // namespace base
+-
+-extern "C" {
+-
+-int __close(int);
+-
+-__attribute__((visibility("default"), noinline)) int close(int fd) {
+-  if (base::IsFDOwned(fd) && g_is_ownership_enforced)
+-    CrashOnFdOwnershipViolation();
+-  return __close(fd);
+-}
+-
+-}  // extern "C"
diff --git a/srcpkgs/qt6-webengine/patches/0108-chromium-fix-narrowing-cast.patch b/srcpkgs/qt6-webengine/patches/0108-chromium-fix-narrowing-cast.patch
new file mode 100644
index 000000000000..ed32cd9b7415
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0108-chromium-fix-narrowing-cast.patch
@@ -0,0 +1,53 @@
+--- a/src/3rdparty/chromium/base/files/file_util_linux.cc
++++ b/src/3rdparty/chromium/base/files/file_util_linux.cc
+@@ -23,14 +23,14 @@ bool GetFileSystemType(const FilePath& p
+ 
+   // Not all possible |statfs_buf.f_type| values are in linux/magic.h.
+   // Missing values are copied from the statfs man page.
+-  switch (statfs_buf.f_type) {
++  switch (static_cast<uintmax_t>(statfs_buf.f_type)) {
+     case 0:
+       *type = FILE_SYSTEM_0;
+       break;
+     case EXT2_SUPER_MAGIC:  // Also ext3 and ext4
+     case MSDOS_SUPER_MAGIC:
+     case REISERFS_SUPER_MAGIC:
+-    case static_cast<int>(BTRFS_SUPER_MAGIC):
++    case BTRFS_SUPER_MAGIC:
+     case 0x5346544E:  // NTFS
+     case 0x58465342:  // XFS
+     case 0x3153464A:  // JFS
+@@ -40,14 +40,14 @@ bool GetFileSystemType(const FilePath& p
+       *type = FILE_SYSTEM_NFS;
+       break;
+     case SMB_SUPER_MAGIC:
+-    case static_cast<int>(0xFF534D42):  // CIFS
++    case 0xFF534D42:  // CIFS
+       *type = FILE_SYSTEM_SMB;
+       break;
+     case CODA_SUPER_MAGIC:
+       *type = FILE_SYSTEM_CODA;
+       break;
+-    case static_cast<int>(HUGETLBFS_MAGIC):
+-    case static_cast<int>(RAMFS_MAGIC):
++    case HUGETLBFS_MAGIC:
++    case RAMFS_MAGIC:
+     case TMPFS_MAGIC:
+       *type = FILE_SYSTEM_MEMORY;
+       break;
+--- a/src/3rdparty/chromium/base/system/sys_info_posix.cc
++++ b/src/3rdparty/chromium/base/system/sys_info_posix.cc
+@@ -100,10 +100,10 @@ bool IsStatsZeroIfUnlimited(const base::
+   if (HANDLE_EINTR(statfs(path.value().c_str(), &stats)) != 0)
+     return false;
+ 
+-  switch (stats.f_type) {
++  switch (static_cast<uintmax_t>(stats.f_type)) {
+     case TMPFS_MAGIC:
+-    case static_cast<int>(HUGETLBFS_MAGIC):
+-    case static_cast<int>(RAMFS_MAGIC):
++    case HUGETLBFS_MAGIC:
++    case RAMFS_MAGIC:
+       return true;
+   }
+   return false;
diff --git a/srcpkgs/qt6-webengine/patches/0109-chromium-remove-strip_binary.patch b/srcpkgs/qt6-webengine/patches/0109-chromium-remove-strip_binary.patch
new file mode 100644
index 000000000000..5ebd16e659af
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0109-chromium-remove-strip_binary.patch
@@ -0,0 +1,32 @@
+--- a/src/3rdparty/chromium/chrome/test/chromedriver/BUILD.gn
++++ b/src/3rdparty/chromium/chrome/test/chromedriver/BUILD.gn
+@@ -308,11 +308,7 @@ source_set("lib") {
+   }
+ }
+ 
+-if (is_linux) {
+-  chromedriver_output = "chromedriver.unstripped"
+-} else {
+-  chromedriver_output = "chromedriver"
+-}
++chromedriver_output = "chromedriver"
+ 
+ executable("$chromedriver_output") {
+   testonly = true
+@@ -336,16 +332,6 @@ executable("$chromedriver_output") {
+   }
+ }
+ 
+-if (is_linux) {
+-  strip_binary("chromedriver") {
+-    testonly = true
+-    binary_input = "$root_out_dir/$chromedriver_output"
+-    symbol_output = "$root_out_dir/chromedriver.debug"
+-    stripped_binary_output = "$root_out_dir/chromedriver"
+-    deps = [ ":$chromedriver_output" ]
+-  }
+-}
+-
+ python_library("chromedriver_py_tests") {
+   testonly = true
+   deps = [
diff --git a/srcpkgs/qt6-webengine/patches/0110-chromium-revert-use-ffile-compilation-dir.patch b/srcpkgs/qt6-webengine/patches/0110-chromium-revert-use-ffile-compilation-dir.patch
new file mode 100644
index 000000000000..a00f7ea80f7a
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0110-chromium-revert-use-ffile-compilation-dir.patch
@@ -0,0 +1,57 @@
+From 34a955823630096f5b01c2b01d51c1ea59d22763 Mon Sep 17 00:00:00 2001
+From: Zequan Wu <zequanwu@google.com>
+Date: Tue, 20 Jul 2021 14:13:50 +0000
+Subject: [PATCH] Use -ffile-compilation-dir= instead of
+ -fdebug-compilation-dir=
+
+Bug: 1010267
+Change-Id: If2b4ead8535a76490eb466a38e3d8fed6ea91079
+Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2770738
+Auto-Submit: Zequan Wu <zequanwu@google.com>
+Commit-Queue: Nico Weber <thakis@chromium.org>
+Reviewed-by: Nico Weber <thakis@chromium.org>
+Cr-Commit-Position: refs/heads/master@{#903456}
+--- a/src/3rdparty/chromium/build/config/compiler/BUILD.gn
++++ b/src/3rdparty/chromium/build/config/compiler/BUILD.gn
+@@ -1269,19 +1269,12 @@ config("compiler_deterministic") {
+     # different build directory like "out/feature_a" and "out/feature_b" if
+     # we build same files with same compile flag.
+     # Other paths are already given in relative, no need to normalize them.
+-    if (is_nacl) {
+-      # TODO(https://crbug.com/1231236): Use -ffile-compilation-dir= here.
+-      cflags += [
+-        "-Xclang",
+-        "-fdebug-compilation-dir",
+-        "-Xclang",
+-        ".",
+-      ]
+-    } else {
+-      # -ffile-compilation-dir is an alias for both -fdebug-compilation-dir=
+-      # and -fcoverage-compilation-dir=.
+-      cflags += [ "-ffile-compilation-dir=." ]
+-    }
++    cflags += [
++      "-Xclang",
++      "-fdebug-compilation-dir",
++      "-Xclang",
++      ".",
++    ]
+     if (!is_win) {
+       # We don't use clang -cc1as on Windows (yet? https://crbug.com/762167)
+       asmflags = [ "-Wa,-fdebug-compilation-dir,." ]
+--- a/src/3rdparty/chromium/build/config/compiler/compiler.gni
++++ b/src/3rdparty/chromium/build/config/compiler/compiler.gni
+@@ -228,8 +228,11 @@ declare_args() {
+ # deterministic builds to reduce compile times, so this is less relevant for
+ # official builders.
+ strip_absolute_paths_from_debug_symbols_default =
+-    is_android || is_fuchsia || is_nacl || (is_win && use_lld) || is_linux ||
+-    is_chromeos || (is_apple && !enable_dsyms)
++    # TODO(crbug.com/1010267): remove '!use_clang_coverage', coverage build has
++    # dependency to absolute path of source files.
++    !use_clang_coverage &&
++    (is_android || is_fuchsia || is_nacl || (is_win && use_lld) || is_linux ||
++     is_chromeos || (is_apple && !enable_dsyms))
+ 
+ declare_args() {
+   strip_absolute_paths_from_debug_symbols = strip_absolute_paths_from_debug_symbols_default
diff --git a/srcpkgs/qt6-webengine/patches/0111-chromium-no-Wno-stringop-overread.patch b/srcpkgs/qt6-webengine/patches/0111-chromium-no-Wno-stringop-overread.patch
new file mode 100644
index 000000000000..03eac3f8e067
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0111-chromium-no-Wno-stringop-overread.patch
@@ -0,0 +1,10 @@
+--- a/src/3rdparty/chromium/build/config/compiler/BUILD.gn
++++ b/src/3rdparty/chromium/build/config/compiler/BUILD.gn
+@@ -394,7 +394,6 @@ config("compiler") {
+         "-Wno-parentheses",
+         "-Wno-sign-compare", # fido
+         "-Wno-stringop-overflow", # skia, libaom, protobuf, icu
+-        "-Wno-stringop-overread", # libaom
+         "-Wno-psabi", # skia
+         "-Wno-multichar", # crashpad
+         "-Wno-format-zero-length", # user_agent.cc
diff --git a/srcpkgs/qt6-webengine/patches/0150-chromium-glibc-libc_malloc.patch b/srcpkgs/qt6-webengine/patches/0150-chromium-glibc-libc_malloc.patch
new file mode 100644
index 000000000000..7e1b66e5c73d
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0150-chromium-glibc-libc_malloc.patch
@@ -0,0 +1,24 @@
+--- a/src/3rdparty/chromium/base/process/memory_linux.cc
++++ b/src/3rdparty/chromium/base/process/memory_linux.cc
+@@ -23,6 +23,12 @@
+ #include "third_party/tcmalloc/chromium/src/gperftools/tcmalloc.h"
+ #endif
+ 
++#if defined(LIBC_GLIBC)
++extern "C" {
++extern void *__libc_malloc(size_t size);
++}
++#endif
++
+ namespace base {
+ 
+ namespace {
+@@ -120,7 +126,7 @@ bool UncheckedMalloc(size_t size, void**
+     (!defined(LIBC_GLIBC) && !BUILDFLAG(USE_TCMALLOC))
+   *result = malloc(size);
+ #elif defined(LIBC_GLIBC) && !BUILDFLAG(USE_TCMALLOC)
+-  *result = __libc_malloc(size);
++  *result = ::__libc_malloc(size);
+ #elif BUILDFLAG(USE_TCMALLOC)
+   *result = tc_malloc_skip_new_handler(size);
+ #endif
diff --git a/srcpkgs/qt6-webengine/patches/0200-chromium-musl-include-sys-reg.h-to-get-__WORDSIZE.patch b/srcpkgs/qt6-webengine/patches/0200-chromium-musl-include-sys-reg.h-to-get-__WORDSIZE.patch
new file mode 100644
index 000000000000..41b90071b5e4
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0200-chromium-musl-include-sys-reg.h-to-get-__WORDSIZE.patch
@@ -0,0 +1,21 @@
+From 9001c54d6b974449174a8cee8f3f5d78a9bd6c9e Mon Sep 17 00:00:00 2001
+From: Felix Janda <felix.janda@posteo.de>
+Date: Sun, 1 Feb 2015 14:26:52 +0100
+Subject: [PATCH 3/6] include <sys/reg.h> to get __WORDSIZE on musl libc
+
+---
+ qtwebengine/src/3rdparty/chromium/third_party/breakpad/breakpad/src/common/linux/elf_core_dump.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/common/linux/elf_core_dump.h
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/common/linux/elf_core_dump.h
+@@ -37,6 +37,9 @@
+ #include <limits.h>
+ #include <link.h>
+ #include <stddef.h>
++#ifndef __GLIBC__
++#include <sys/reg.h>
++#endif
+ 
+ #include "common/memory_range.h"
+ 
diff --git a/srcpkgs/qt6-webengine/patches/0201-chromium-musl-dispatch-to-musl.patch b/srcpkgs/qt6-webengine/patches/0201-chromium-musl-dispatch-to-musl.patch
new file mode 100644
index 000000000000..a58a688a4b55
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0201-chromium-musl-dispatch-to-musl.patch
@@ -0,0 +1,103 @@
+--- a/src/3rdparty/chromium/base/allocator/allocator_shim_default_dispatch_to_glibc.cc
++++ b/src/3rdparty/chromium/base/allocator/allocator_shim_default_dispatch_to_glibc.cc
+@@ -8,6 +8,7 @@
+ #include <dlfcn.h>
+ #include <malloc.h>
+ 
++#if defined(__GLIBC__)
+ // This translation unit defines a default dispatch for the allocator shim which
+ // routes allocations to libc functions.
+ // The code here is strongly inspired from tcmalloc's libc_override_glibc.h.
+@@ -87,3 +88,92 @@ const AllocatorDispatch AllocatorDispatc
+     nullptr,               /* aligned_free_function */
+     nullptr,               /* next */
+ };
++
++#else // defined(__GLIBC__)
++
++#include <dlfcn.h>
++
++extern "C" {
++// Declare function pointers to the memory functions
++typedef void* (*t_libc_malloc)(size_t size);
++typedef void* (*t_libc_calloc)(size_t n, size_t size);
++typedef void* (*t_libc_realloc)(void* address, size_t size);
++typedef void* (*t_libc_memalign)(size_t alignment, size_t size);
++typedef void (*t_libc_free)(void* ptr);
++typedef size_t (*t_libc_malloc_usable_size)(void* ptr);
++
++// Static instances of pointers to libc.so dl symbols
++static t_libc_malloc libc_malloc = NULL;
++static t_libc_calloc libc_calloc = NULL;
++static t_libc_realloc libc_realloc = NULL;
++static t_libc_memalign libc_memalign = NULL;
++static t_libc_free libc_free = NULL;
++static t_libc_malloc_usable_size libc_malloc_usable_size = NULL;
++
++// resolve the symbols in libc.so
++void musl_libc_memory_init(void)
++{
++  libc_malloc = (t_libc_malloc) dlsym(RTLD_NEXT, "malloc");
++  libc_calloc = (t_libc_calloc) dlsym(RTLD_NEXT, "calloc");
++  libc_realloc = (t_libc_realloc) dlsym(RTLD_NEXT, "realloc");
++  libc_memalign = (t_libc_memalign) dlsym(RTLD_NEXT, "memalign");
++  libc_free = (t_libc_free) dlsym(RTLD_NEXT, "free");
++  libc_malloc_usable_size = (t_libc_malloc_usable_size) dlsym(RTLD_NEXT, "malloc_usable_size");
++}
++}  // extern "C"
++
++namespace {
++
++using base::allocator::AllocatorDispatch;
++
++void* MuslMalloc(const AllocatorDispatch*, size_t size, void* context) {
++  if (!libc_malloc)
++    musl_libc_memory_init();
++  return (*libc_malloc)(size);
++}
++
++void* MuslCalloc(const AllocatorDispatch*, size_t n, size_t size, void* context) {
++  if (!libc_calloc)
++    musl_libc_memory_init();
++  return (*libc_calloc)(n, size);
++}
++
++void* MuslRealloc(const AllocatorDispatch*, void* address, size_t size, void* context) {
++  if (!libc_realloc)
++    musl_libc_memory_init();
++  return (*libc_realloc)(address, size);
++}
++
++void* MuslMemalign(const AllocatorDispatch*, size_t alignment, size_t size, void* context) {
++  if (!libc_memalign)
++    musl_libc_memory_init();
++  return (*libc_memalign)(alignment, size);
++}
++
++void MuslFree(const AllocatorDispatch*, void* address, void* context) {
++  if (!libc_free)
++    musl_libc_memory_init();
++  (*libc_free)(address);
++}
++
++size_t MuslGetSizeEstimate(const AllocatorDispatch*, void* address, void* context) {
++  // TODO(siggi, primiano): malloc_usable_size may need redirection in the
++  //     presence of interposing shims that divert allocations.
++  if (!libc_malloc_usable_size)
++    musl_libc_memory_init();
++  return (*libc_malloc_usable_size)(address);
++}
++
++}  // namespace
++
++const AllocatorDispatch AllocatorDispatch::default_dispatch = {
++    &MuslMalloc,           /* alloc_function */
++    &MuslCalloc,           /* alloc_zero_initialized_function */
++    &MuslMemalign,         /* alloc_aligned_function */
++    &MuslRealloc,          /* realloc_function */
++    &MuslFree,             /* free_function */
++    &MuslGetSizeEstimate,  /* get_size_estimate_function */
++    nullptr,               /* next */
++};
++
++#endif
diff --git a/srcpkgs/qt6-webengine/patches/0202-chromium-musl-no-mallinfo.patch b/srcpkgs/qt6-webengine/patches/0202-chromium-musl-no-mallinfo.patch
new file mode 100644
index 000000000000..a5bdb5a43a5f
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0202-chromium-musl-no-mallinfo.patch
@@ -0,0 +1,62 @@
+--- a/src/3rdparty/chromium/base/process/process_metrics_posix.cc
++++ b/src/3rdparty/chromium/base/process/process_metrics_posix.cc
+@@ -105,7 +105,7 @@ void IncreaseFdLimitTo(unsigned int max_
+ 
+ #endif  // !defined(OS_FUCHSIA)
+ 
+-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID)
++#if (defined(OS_LINUX) && defined(__GLIBC__)) || defined(OS_CHROMEOS) || defined(OS_ANDROID)
+ namespace {
+ 
+ size_t GetMallocUsageMallinfo() {
+@@ -127,16 +127,16 @@ size_t GetMallocUsageMallinfo() {
+ }
+ 
+ }  // namespace
+-#endif  // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID)
++#endif  // (defined(OS_LINUX) && defined(__GLIBC__)) || defined(OS_CHROMEOS) || defined(OS_ANDROID)
+ 
+ size_t ProcessMetrics::GetMallocUsage() {
+ #if defined(OS_APPLE)
+   malloc_statistics_t stats = {0};
+   malloc_zone_statistics(nullptr, &stats);
+   return stats.size_in_use;
+-#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID)
++#elif (defined(OS_LINUX) && defined(__GLIBC__)) || defined(OS_CHROMEOS) || defined(OS_ANDROID)
+   return GetMallocUsageMallinfo();
+-#elif defined(OS_FUCHSIA)
++#else
+   // TODO(fuchsia): Not currently exposed. https://crbug.com/735087.
+   return 0;
+ #endif
+--- a/src/3rdparty/chromium/third_party/tflite/src/tensorflow/lite/profiling/memory_info.cc
++++ b/src/3rdparty/chromium/third_party/tflite/src/tensorflow/lite/profiling/memory_info.cc
+@@ -27,7 +27,7 @@ namespace memory {
+ const int MemoryUsage::kValueNotSet = 0;
+ 
+ bool MemoryUsage::IsSupported() {
+-#ifdef __linux__
++#ifdef __GLIBC__
+   return true;
+ #endif
+   return false;
+@@ -35,7 +35,7 @@ bool MemoryUsage::IsSupported() {
+ 
+ MemoryUsage GetMemoryUsage() {
+   MemoryUsage result;
+-#ifdef __linux__
++#ifdef __GLIBC__
+   rusage res;
+   if (getrusage(RUSAGE_SELF, &res) == 0) {
+     result.max_rss_kb = res.ru_maxrss;
+--- a/src/3rdparty/chromium/base/trace_event/malloc_dump_provider.cc
++++ b/src/3rdparty/chromium/base/trace_event/malloc_dump_provider.cc
+@@ -213,7 +213,7 @@ bool MallocDumpProvider::OnMemoryDump(co
+                      &allocated_objects_count);
+ #elif defined(OS_FUCHSIA)
+ // TODO(fuchsia): Port, see https://crbug.com/706592.
+-#else
++#elif defined(__GLIBC__)
+ #if defined(__GLIBC__) && defined(__GLIBC_PREREQ)
+ #if __GLIBC_PREREQ(2, 33)
+ #define MALLINFO2_FOUND_IN_LIBC
diff --git a/srcpkgs/qt6-webengine/patches/0203-chromium-musl-siginfo_t.patch b/srcpkgs/qt6-webengine/patches/0203-chromium-musl-siginfo_t.patch
new file mode 100644
index 000000000000..43ef7fd7c5d2
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0203-chromium-musl-siginfo_t.patch
@@ -0,0 +1,18 @@
+There's a subtle difference in the internal name of siginfo_t fields
+between glibc and musl. The structure itself is equivalent, so it
+should suffice to add a macro to rename the field.
+
+--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf/trap.cc
++++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf/trap.cc
+@@ -174,7 +174,11 @@ void Trap::SigSys(int nr, LinuxSigInfo*
+   // If the version of glibc doesn't include this information in
+   // siginfo_t (older than 2.17), we need to explicitly copy it
+   // into an arch_sigsys structure.
++#if defined(__GLIBC__)
+   memcpy(&sigsys, &info->_sifields, sizeof(sigsys));
++#else
++  memcpy(&sigsys, &info->__si_fields, sizeof(sigsys));
++#endif
+ #endif
+ 
+ #if defined(__mips__)
diff --git a/srcpkgs/qt6-webengine/patches/0204-chromium-musl-stackstart.patch b/srcpkgs/qt6-webengine/patches/0204-chromium-musl-stackstart.patch
new file mode 100644
index 000000000000..b03cf43b86db
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0204-chromium-musl-stackstart.patch
@@ -0,0 +1,20 @@
+--- a/src/3rdparty/chromium/third_party/blink/renderer/platform/wtf/stack_util.cc
++++ b/src/3rdparty/chromium/third_party/blink/renderer/platform/wtf/stack_util.cc
+@@ -29,7 +29,7 @@ size_t GetUnderestimatedStackSize() {
+ // FIXME: On Mac OSX and Linux, this method cannot estimate stack size
+ // correctly for the main thread.
+ 
+-#elif defined(__GLIBC__) || defined(OS_ANDROID) || defined(OS_FREEBSD) || \
++#elif defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FREEBSD) || \
+     defined(OS_FUCHSIA)
+   // pthread_getattr_np() can fail if the thread is not invoked by
+   // pthread_create() (e.g., the main thread of blink_unittests).
+@@ -97,7 +97,7 @@ return Threading::ThreadStackSize();
+ }
+ 
+ void* GetStackStart() {
+-#if defined(__GLIBC__) || defined(OS_ANDROID) || defined(OS_FREEBSD) || \
++#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FREEBSD) || \
+     defined(OS_FUCHSIA)
+   pthread_attr_t attr;
+   int error;
diff --git a/srcpkgs/qt6-webengine/patches/0205-chromium-musl-sandbox.patch b/srcpkgs/qt6-webengine/patches/0205-chromium-musl-sandbox.patch
new file mode 100644
index 000000000000..772a578fd823
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0205-chromium-musl-sandbox.patch
@@ -0,0 +1,92 @@
+--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc
++++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc
+@@ -138,7 +138,7 @@ namespace sandbox {
+ // present (as in newer versions of posix_spawn).
+ ResultExpr RestrictCloneToThreadsAndEPERMFork() {
+   const Arg<unsigned long> flags(0);
+-
++#if defined(__GLIBC__)
+   // TODO(mdempsky): Extend DSL to support (flags & ~mask1) == mask2.
+   const uint64_t kAndroidCloneMask = CLONE_VM | CLONE_FS | CLONE_FILES |
+                                      CLONE_SIGHAND | CLONE_THREAD |
+@@ -165,6 +165,17 @@ ResultExpr RestrictCloneToThreadsAndEPER
+   return If(IsAndroid() ? android_test : glibc_test, Allow())
+       .ElseIf(is_fork_or_clone_vfork, Error(EPERM))
+       .Else(CrashSIGSYSClone());
++#else
++  const int required = CLONE_VM | CLONE_FS | CLONE_FILES | CLONE_SIGHAND |
++                       CLONE_THREAD | CLONE_SYSVSEM;
++  const int safe = CLONE_SETTLS | CLONE_PARENT_SETTID | CLONE_CHILD_CLEARTID |
++                   CLONE_DETACHED;
++  const BoolExpr thread_clone_ok = (flags&~safe)==required;
++
++  return If(thread_clone_ok, Allow())
++      .ElseIf((flags & (CLONE_VM | CLONE_THREAD)) == 0, Error(EPERM))
++      .Else(CrashSIGSYSClone());
++#endif
+ }
+ 
+ #ifndef PR_PAC_RESET_KEYS
+--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
++++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
+@@ -419,6 +419,9 @@ bool SyscallSets::IsAllowedProcessStartO
+ #if defined(__i386__)
+     case __NR_waitpid:
+ #endif
++#if !defined(__GLIBC__)
++    case __NR_set_tid_address:
++#endif
+       return true;
+     case __NR_clone:  // Should be parameter-restricted.
+     case __NR_setns:  // Privileged.
+@@ -431,7 +434,9 @@ bool SyscallSets::IsAllowedProcessStartO
+ #if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
+     case __NR_set_thread_area:
+ #endif
++#if defined(__GLIBC__)
+     case __NR_set_tid_address:
++#endif
+     case __NR_unshare:
+ #if !defined(__mips__) && !defined(__aarch64__)
+     case __NR_vfork:
+@@ -545,6 +550,9 @@ bool SyscallSets::IsAllowedAddressSpaceA
+     case __NR_mlock:
+     case __NR_munlock:
+     case __NR_munmap:
++#if !defined(__GLIBC__)
++    case __NR_mremap:
++#endif
+       return true;
+     case __NR_madvise:
+     case __NR_mincore:
+@@ -562,7 +570,9 @@ bool SyscallSets::IsAllowedAddressSpaceA
+     case __NR_modify_ldt:
+ #endif
+     case __NR_mprotect:
++#if defined(__GLIBC__)
+     case __NR_mremap:
++#endif
+     case __NR_msync:
+     case __NR_munlockall:
+     case __NR_readahead:
+--- a/src/3rdparty/chromium/sandbox/policy/linux/bpf_renderer_policy_linux.cc
++++ b/src/3rdparty/chromium/sandbox/policy/linux/bpf_renderer_policy_linux.cc
+@@ -97,11 +97,18 @@ ResultExpr RendererProcessPolicy::Evalua
+     case __NR_sysinfo:
+     case __NR_times:
+     case __NR_uname:
++#if !defined(__GLIBC__)
++    case __NR_sched_getparam:
++    case __NR_sched_getscheduler:
++    case __NR_sched_setscheduler:
++#endif
+       return Allow();
+     case __NR_sched_getaffinity:
++#if defined(__GLIBC__)
+     case __NR_sched_getparam:
+     case __NR_sched_getscheduler:
+     case __NR_sched_setscheduler:
++#endif
+       return RestrictSchedTarget(GetPolicyPid(), sysno);
+     case __NR_prlimit64:
+       // See crbug.com/662450 and setrlimit comment above.
diff --git a/srcpkgs/qt6-webengine/patches/0206-chromium-musl-default-stacksize.patch b/srcpkgs/qt6-webengine/patches/0206-chromium-musl-default-stacksize.patch
new file mode 100644
index 000000000000..bc07495b8144
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0206-chromium-musl-default-stacksize.patch
@@ -0,0 +1,15 @@
+--- a/src/3rdparty/chromium/base/threading/platform_thread_linux.cc
++++ b/src/3rdparty/chromium/base/threading/platform_thread_linux.cc
+@@ -439,7 +439,12 @@ void TerminateOnThread() {}
+ 
+ size_t GetDefaultThreadStackSize(const pthread_attr_t& attributes) {
+ #if !defined(THREAD_SANITIZER)
++#if defined(__GLIBC__)
+   return 0;
++#else // defined(__GLIBC__)
++  // For Musl libc try with a default stack size of 2 MiB
++  return 2 * 1024 * 1024;
++#endif // !defined(__GLIBC__)
+ #else
+   // ThreadSanitizer bloats the stack heavily. Evidence has been that the
+   // default stack size isn't enough for some browser tests.
diff --git a/srcpkgs/qt6-webengine/patches/0208-chromium-musl-execinfo.patch b/srcpkgs/qt6-webengine/patches/0208-chromium-musl-execinfo.patch
new file mode 100644
index 000000000000..9f3b964676b3
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0208-chromium-musl-execinfo.patch
@@ -0,0 +1,125 @@
+--- a/src/3rdparty/chromium/base/debug/stack_trace.cc
++++ b/src/3rdparty/chromium/base/debug/stack_trace.cc
+@@ -252,7 +252,9 @@ void StackTrace::Print() const {
+ }
+ 
+ void StackTrace::OutputToStream(std::ostream* os) const {
++#if defined(__GLIBC__) && !defined(_AIX)
+   OutputToStreamWithPrefix(os, nullptr);
++#endif
+ }
+ 
+ std::string StackTrace::ToString() const {
+@@ -260,7 +262,7 @@ std::string StackTrace::ToString() const
+ }
+ std::string StackTrace::ToStringWithPrefix(const char* prefix_string) const {
+   std::stringstream stream;
+-#if !defined(__UCLIBC__) && !defined(_AIX)
++#if defined(__GLIBC__) && !defined(_AIX)
+   OutputToStreamWithPrefix(&stream, prefix_string);
+ #endif
+   return stream.str();
+--- a/src/3rdparty/chromium/base/debug/stack_trace_posix.cc
++++ b/src/3rdparty/chromium/base/debug/stack_trace_posix.cc
+@@ -27,7 +27,7 @@
+ #if !defined(USE_SYMBOLIZE)
+ #include <cxxabi.h>
+ #endif
+-#if !defined(__UCLIBC__) && !defined(_AIX)
++#if defined(__GLIBC__) && !defined(_AIX)
+ #include <execinfo.h>
+ #endif
+ 
+@@ -89,7 +89,7 @@ void DemangleSymbols(std::string* text)
+   // Note: code in this function is NOT async-signal safe (std::string uses
+   // malloc internally).
+ 
+-#if !defined(__UCLIBC__) && !defined(_AIX)
++#if defined(__GLIBC__) && !defined(_AIX)
+   std::string::size_type search_from = 0;
+   while (search_from < text->size()) {
+     // Look for the start of a mangled symbol, from search_from.
+@@ -124,7 +124,7 @@ void DemangleSymbols(std::string* text)
+       search_from = mangled_start + 2;
+     }
+   }
+-#endif  // !defined(__UCLIBC__) && !defined(_AIX)
++#endif  // !defined(__GLIBC__) && !defined(_AIX)
+ }
+ #endif  // !defined(USE_SYMBOLIZE)
+ 
+@@ -136,7 +136,7 @@ class BacktraceOutputHandler {
+   virtual ~BacktraceOutputHandler() = default;
+ };
+ 
+-#if !defined(__UCLIBC__) && !defined(_AIX)
++#if defined(__GLIBC__) && !defined(_AIX)
+ void OutputPointer(void* pointer, BacktraceOutputHandler* handler) {
+   // This should be more than enough to store a 64-bit number in hex:
+   // 16 hex digits + 1 for null-terminator.
+@@ -219,7 +219,7 @@ void ProcessBacktrace(void* const* trace
+   }
+ #endif  // defined(USE_SYMBOLIZE)
+ }
+-#endif  // !defined(__UCLIBC__) && !defined(_AIX)
++#endif  // !defined(__GLIBC__) && !defined(_AIX)
+ 
+ void PrintToStderr(const char* output) {
+   // NOTE: This code MUST be async-signal safe (it's used by in-process
+@@ -839,7 +839,7 @@ size_t CollectStackTrace(void** trace, s
+   // If we do not have unwind tables, then try tracing using frame pointers.
+   return base::debug::TraceStackFramePointers(const_cast<const void**>(trace),
+                                               count, 0);
+-#elif !defined(__UCLIBC__) && !defined(_AIX)
++#elif defined(__GLIBC__) && !defined(_AIX)
+   // Though the backtrace API man page does not list any possible negative
+   // return values, we take no chance.
+   return base::saturated_cast<size_t>(backtrace(trace, count));
+@@ -852,13 +852,13 @@ void StackTrace::PrintWithPrefix(const c
+ // NOTE: This code MUST be async-signal safe (it's used by in-process
+ // stack dumping signal handler). NO malloc or stdio is allowed here.
+ 
+-#if !defined(__UCLIBC__) && !defined(_AIX)
++#if defined(__GLIBC__) && !defined(_AIX)
+   PrintBacktraceOutputHandler handler;
+   ProcessBacktrace(trace_, count_, prefix_string, &handler);
+ #endif
+ }
+ 
+-#if !defined(__UCLIBC__) && !defined(_AIX)
++#if defined(__GLIBC__) && !defined(_AIX)
+ void StackTrace::OutputToStreamWithPrefix(std::ostream* os,
+                                           const char* prefix_string) const {
+   StreamBacktraceOutputHandler handler(os);
+--- a/src/3rdparty/chromium/base/logging.cc
++++ b/src/3rdparty/chromium/base/logging.cc
+@@ -582,7 +582,7 @@ LogMessage::LogMessage(const char* file,
+ 
+ LogMessage::~LogMessage() {
+   size_t stack_start = stream_.tellp();
+-#if !defined(OFFICIAL_BUILD) && !defined(OS_NACL) && !defined(__UCLIBC__) && \
++#if !defined(OFFICIAL_BUILD) && !defined(OS_NACL) && defined(__GLIBC__) && \
+     !defined(OS_AIX)
+   if (severity_ == LOGGING_FATAL && !base::debug::BeingDebugged()) {
+     // Include a stack trace on a fatal, unless a debugger is attached.
+--- 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 @@
+ 
+ #if defined(DEBUG) && defined(V8_OS_LINUX) && !defined(V8_OS_ANDROID)
+ #define SYMBOLIZE_FUNCTION
++#if defined(__GLIBC__)
+ #include <execinfo.h>
++#endif
+ 
+ #include <vector>
+ 
+@@ -103,7 +105,7 @@ void ExternalReferenceTable::Init(Isolat
+ }
+ 
+ const char* ExternalReferenceTable::ResolveSymbol(void* address) {
+-#ifdef SYMBOLIZE_FUNCTION
++#if defined(SYMBOLIZE_FUNCTION) && defined(__GLIBC__)
+   char** names = backtrace_symbols(&address, 1);
+   const char* name = names[0];
+   // The array of names is malloc'ed. However, each name string is static
diff --git a/srcpkgs/qt6-webengine/patches/0209-chromium-musl-thread-stacksize.patch b/srcpkgs/qt6-webengine/patches/0209-chromium-musl-thread-stacksize.patch
new file mode 100644
index 000000000000..4b760a428b25
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0209-chromium-musl-thread-stacksize.patch
@@ -0,0 +1,22 @@
+--- a/src/3rdparty/chromium/ppapi/utility/threading/simple_thread.cc
++++ b/src/3rdparty/chromium/ppapi/utility/threading/simple_thread.cc
+@@ -13,7 +13,7 @@ namespace pp {
+ namespace {
+ 
+ // Use 2MB default stack size for Native Client, otherwise use system default.
+-#if defined(__native_client__)
++#if defined(__native_client__) || !defined(__GLIBC__)
+ const size_t kDefaultStackSize = 2 * 1024 * 1024;
+ #else
+ const size_t kDefaultStackSize = 0;
+--- a/src/3rdparty/chromium/v8/src/base/platform/platform-posix.cc
++++ b/src/3rdparty/chromium/v8/src/base/platform/platform-posix.cc
+@@ -883,7 +883,7 @@ bool Thread::Start() {
+ #if V8_OS_MACOSX
+     // Default on Mac OS X is 512kB -- bump up to 1MB
+     stack_size = 1 * 1024 * 1024;
+-#elif V8_OS_AIX
++#elif V8_OS_AIX || !defined(__GLIBC__)
+     // Default on AIX is 96kB -- bump up to 2MB
+     stack_size = 2 * 1024 * 1024;
+ #endif
diff --git a/srcpkgs/qt6-webengine/patches/0210-chromium-musl-msgvec-push_back.patch b/srcpkgs/qt6-webengine/patches/0210-chromium-musl-msgvec-push_back.patch
new file mode 100644
index 000000000000..905daa223700
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0210-chromium-musl-msgvec-push_back.patch
@@ -0,0 +1,14 @@
+--- a/src/3rdparty/chromium/net/socket/udp_socket_posix.cc
++++ b/src/3rdparty/chromium/net/socket/udp_socket_posix.cc
+@@ -1162,7 +1162,11 @@ SendResult UDPSocketPosixSender::Interna
+     msg_iov->push_back({const_cast<char*>(buffer->data()), buffer->length()});
+   msgvec->reserve(buffers.size());
+   for (size_t j = 0; j < buffers.size(); j++)
++#if defined(__GLIBC__)
+     msgvec->push_back({{nullptr, 0, &msg_iov[j], 1, nullptr, 0, 0}, 0});
++#else
++    msgvec->push_back({{nullptr, 0, &msg_iov[j], 1, 0, 0, 0}, 0});
++#endif
+   int result = HANDLE_EINTR(Sendmmsg(fd, &msgvec[0], buffers.size(), 0));
+   SendResult send_result(0, 0, std::move(buffers));
+   if (result < 0) {
diff --git a/srcpkgs/qt6-webengine/patches/0211-chromium-musl-canonicalize-file-name-musl.patch b/srcpkgs/qt6-webengine/patches/0211-chromium-musl-canonicalize-file-name-musl.patch
new file mode 100644
index 000000000000..d43e6bd488bc
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0211-chromium-musl-canonicalize-file-name-musl.patch
@@ -0,0 +1,11 @@
+--- a/src/3rdparty/chromium/third_party/nasm/nasmlib/realpath.c
++++ b/src/3rdparty/chromium/third_party/nasm/nasmlib/realpath.c
+@@ -55,7 +55,7 @@
+  */
+ char *nasm_realpath(const char *rel_path)
+ {
+-    char *rp = canonicalize_file_name(rel_path);
++    char *rp = realpath(rel_path, NULL);
+     return rp ? rp : nasm_strdup(rel_path);
+ }
+ 
diff --git a/srcpkgs/qt6-webengine/patches/0212-chromium-musl-no-getcontext.patch b/srcpkgs/qt6-webengine/patches/0212-chromium-musl-no-getcontext.patch
new file mode 100644
index 000000000000..5755f1b45a7d
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0212-chromium-musl-no-getcontext.patch
@@ -0,0 +1,29 @@
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc
+@@ -489,8 +489,10 @@ bool ExceptionHandler::SimulateSignalDel
+   // ExceptionHandler::HandleSignal().
+   siginfo.si_code = SI_USER;
+   siginfo.si_pid = getpid();
+-  ucontext_t context;
++  ucontext_t context = { 0 };
++#if defined(__GLIBC__)
+   getcontext(&context);
++#endif
+   return HandleSignal(sig, &siginfo, &context);
+ }
+ 
+@@ -675,9 +677,14 @@ bool ExceptionHandler::WriteMinidump() {
+   sys_prctl(PR_SET_DUMPABLE, 1, 0, 0, 0);
+ 
+   CrashContext context;
++
++#if defined(__GLIBC__)
+   int getcontext_result = getcontext(&context.context);
+   if (getcontext_result)
+     return false;
++#else
++  return false;
++#endif
+ 
+ #if defined(__i386__)
+   // In CPUFillFromUContext in minidumpwriter.cc the stack pointer is retrieved
diff --git a/srcpkgs/qt6-webengine/patches/0213-chromium-musl-crashpad.patch b/srcpkgs/qt6-webengine/patches/0213-chromium-musl-crashpad.patch
new file mode 100644
index 000000000000..71bbad2af17e
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0213-chromium-musl-crashpad.patch
@@ -0,0 +1,24 @@
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/compat/linux/sys/ptrace.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/compat/linux/sys/ptrace.h
+@@ -17,7 +17,9 @@
+ 
+ #include_next <sys/ptrace.h>
+ 
++#ifdef __GLIBC__
+ #include <sys/cdefs.h>
++#endif
+ 
+ // https://sourceware.org/bugzilla/show_bug.cgi?id=22433
+ #if !defined(PTRACE_GET_THREAD_AREA) && !defined(PT_GET_THREAD_AREA) && \
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/util/linux/ptracer.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/util/linux/ptracer.cc
+@@ -26,6 +26,9 @@
+ 
+ #if defined(ARCH_CPU_X86_FAMILY)
+ #include <asm/ldt.h>
++#if !defined(__GLIBC__)
++#include <asm/ptrace-abi.h>
++#endif
+ #endif
+ 
+ namespace crashpad {
diff --git a/srcpkgs/qt6-webengine/patches/0214-chromium-musl-fixes.patch b/srcpkgs/qt6-webengine/patches/0214-chromium-musl-fixes.patch
new file mode 100644
index 000000000000..55b267ed1714
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0214-chromium-musl-fixes.patch
@@ -0,0 +1,108 @@
+--- a/src/3rdparty/chromium/sandbox/linux/suid/process_util.h
++++ b/src/3rdparty/chromium/sandbox/linux/suid/process_util.h
+@@ -12,6 +12,15 @@
+ #include <stdint.h>
+ #include <sys/types.h>
+ 
++#if !defined(__GLIBC__) && !defined(TEMP_FAILURE_RETRY)
++# define TEMP_FAILURE_RETRY(expression) \
++	(__extension__			\
++	 ({ long int __result;		\
++	  do __result = (long int) (expression); \
++	  while (__result == -1L && errno == EINTR); \
++	  __result; }))
++#endif
++
+ // This adjusts /proc/process/oom_score_adj so the Linux OOM killer
+ // will prefer certain process types over others. The range for the
+ // adjustment is [-1000, 1000], with [0, 1000] being user accessible.
+--- a/src/3rdparty/chromium/services/device/serial/serial_io_handler_posix.cc
++++ b/src/3rdparty/chromium/services/device/serial/serial_io_handler_posix.cc
+@@ -6,6 +6,7 @@
+ 
+ #include <sys/ioctl.h>
+ #include <termios.h>
++#include <asm-generic/ioctls.h>
+ 
+ #include <algorithm>
+ #include <utility>
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h
+@@ -38,6 +38,10 @@
+ #include "common/memory_allocator.h"
+ #include "google_breakpad/common/minidump_format.h"
+ 
++#ifndef __GLIBC__
++#define _libc_fpstate _fpstate
++#endif
++
+ namespace google_breakpad {
+ 
+ // Wraps platform-dependent implementations of accessors to ucontext_t structs.
+--- a/src/3rdparty/chromium/third_party/ffmpeg/libavutil/cpu.c
++++ b/src/3rdparty/chromium/third_party/ffmpeg/libavutil/cpu.c
+@@ -41,8 +41,10 @@
+ #include <sys/param.h>
+ #endif
+ #include <sys/types.h>
++#ifdef __GLIBC__
+ #include <sys/sysctl.h>
+ #endif
++#endif
+ #if HAVE_UNISTD_H
+ #include <unistd.h>
+ #endif
+--- a/src/3rdparty/chromium/third_party/perfetto/include/perfetto/ext/base/thread_utils.h
++++ b/src/3rdparty/chromium/third_party/perfetto/include/perfetto/ext/base/thread_utils.h
+@@ -29,9 +29,7 @@
+ #include <algorithm>
+ #endif
+ 
+-#if PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID)
+ #include <sys/prctl.h>
+-#endif
+ 
+ // Internal implementation utils that aren't as widely useful/supported as
+ // base/thread_utils.h.
+@@ -58,7 +56,7 @@ inline bool MaybeSetThreadName(const std
+ 
+ inline bool GetThreadName(std::string& out_result) {
+   char buf[16] = {};
+-#if PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID)
++#if !defined(__GLIBC__)
+   if (prctl(PR_GET_NAME, buf) != 0)
+     return false;
+ #else
+--- a/src/3rdparty/chromium/third_party/lss/linux_syscall_support.h
++++ b/src/3rdparty/chromium/third_party/lss/linux_syscall_support.h
+@@ -1300,6 +1300,18 @@ struct kernel_statfs {
+ #ifndef __NR_fallocate
+ #define __NR_fallocate          285
+ #endif
++
++#if !defined(__GLIBC__)
++#ifdef __NR_pread
++#undef __NR_pread
++#endif
++#ifdef __NR_pwrite
++#undef __NR_pwrite
++#endif
++#define __NR_pread __NR_pread64
++#define __NR_pwrite __NR_pwrite64
++#endif /* !defined(__GLIBC__) */
++
+ #ifndef __NR_getrandom
+ #define __NR_getrandom          318
+ #endif
+--- a/src/3rdparty/chromium/net/dns/dns_config_service_posix.cc
++++ b/src/3rdparty/chromium/net/dns/dns_config_service_posix.cc
+@@ -93,7 +93,8 @@ absl::optional<DnsConfig> ReadDnsConfig(
+ 
+   absl::optional<DnsConfig> dns_config;
+ // TODO(fuchsia): Use res_ninit() when it's implemented on Fuchsia.
+-#if defined(OS_OPENBSD) || defined(OS_FUCHSIA)
++#if defined(OS_OPENBSD) || defined(OS_FUCHSIA) || \
++  (defined(OS_LINUX) && !defined(__GLIBC__))
+   // Note: res_ninit in glibc always returns 0 and sets RES_INIT.
+   // res_init behaves the same way.
+   memset(&_res, 0, sizeof(_res));
diff --git a/srcpkgs/qt6-webengine/patches/0215-chromium-musl-cdefs.patch b/srcpkgs/qt6-webengine/patches/0215-chromium-musl-cdefs.patch
new file mode 100644
index 000000000000..9d1daec29118
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0215-chromium-musl-cdefs.patch
@@ -0,0 +1,29 @@
+--- a/src/3rdparty/chromium/third_party/libsync/src/include/sync/sync.h
++++ b/src/3rdparty/chromium/third_party/libsync/src/include/sync/sync.h
+@@ -19,12 +19,13 @@
+ #ifndef __SYS_CORE_SYNC_H
+ #define __SYS_CORE_SYNC_H
+ 
+-#include <sys/cdefs.h>
+ #include <stdint.h>
+ 
+ #include <linux/types.h>
+ 
+-__BEGIN_DECLS
++#ifdef __cplusplus
++extern "C" {
++#endif
+ 
+ struct sync_legacy_merge_data {
+  int32_t fd2;
+@@ -158,6 +159,9 @@ struct sync_pt_info *sync_pt_info(struct
+                                   struct sync_pt_info *itr);
+ void sync_fence_info_free(struct sync_fence_info_data *info);
+ 
+-__END_DECLS
++#ifdef __cplusplus
++}
++#endif
++
+ 
+ #endif /* __SYS_CORE_SYNC_H */
diff --git a/srcpkgs/qt6-webengine/patches/0216-chromium-musl-stat.patch b/srcpkgs/qt6-webengine/patches/0216-chromium-musl-stat.patch
new file mode 100644
index 000000000000..4509a6957cd7
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0216-chromium-musl-stat.patch
@@ -0,0 +1,12 @@
+--- a/src/3rdparty/chromium/base/files/file.h
++++ b/src/3rdparty/chromium/base/files/file.h
+@@ -19,7 +19,8 @@
+ #include "build/build_config.h"
+ 
+ #if defined(OS_BSD) || defined(OS_APPLE) || defined(OS_NACL) || \
+-    defined(OS_FUCHSIA) || (defined(OS_ANDROID) && __ANDROID_API__ < 21)
++    defined(OS_FUCHSIA) || (defined(OS_ANDROID) && __ANDROID_API__ < 21) || \
++    (defined(OS_LINUX) && !defined(__GLIBC__))
+ struct stat;
+ namespace base {
+ typedef struct stat stat_wrapper_t;
diff --git a/srcpkgs/qt6-webengine/patches/0217-chromium-musl-resolver.patch b/srcpkgs/qt6-webengine/patches/0217-chromium-musl-resolver.patch
new file mode 100644
index 000000000000..c3d7afad9b19
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0217-chromium-musl-resolver.patch
@@ -0,0 +1,77 @@
+--- a/src/3rdparty/chromium/net/dns/dns_config_service_linux.cc
++++ b/src/3rdparty/chromium/net/dns/dns_config_service_linux.cc
+@@ -432,11 +432,13 @@ class DnsConfigServiceLinux::ConfigReade
+     base::ScopedBlockingCall scoped_blocking_call(
+         FROM_HERE, base::BlockingType::MAY_BLOCK);
+ 
++#if defined(__GLIBC__)
+     std::unique_ptr<struct __res_state> res = resolv_reader_->GetResState();
+     if (res) {
+       dns_config_ = ConvertResStateToDnsConfig(*res.get());
+       resolv_reader_->CloseResState(res.get());
+     }
++#endif
+ 
+     UMA_HISTOGRAM_BOOLEAN("Net.DNS.DnsConfig.Resolv.Read",
+                           dns_config_.has_value());
+@@ -486,6 +488,7 @@ class DnsConfigServiceLinux::ConfigReade
+ 
+ std::unique_ptr<struct __res_state>
+ DnsConfigServiceLinux::ResolvReader::GetResState() {
++#if defined(__GLIBC__)
+   auto res = std::make_unique<struct __res_state>();
+   memset(res.get(), 0, sizeof(struct __res_state));
+ 
+@@ -495,11 +498,16 @@ DnsConfigServiceLinux::ResolvReader::Get
+   }
+ 
+   return res;
++#else
++  return nullptr;
++#endif
+ }
+ 
+ void DnsConfigServiceLinux::ResolvReader::CloseResState(
+     struct __res_state* res) {
++#if defined(__GLIBC__)
+   res_nclose(res);
++#endif
+ }
+ 
+ DnsConfigServiceLinux::DnsConfigServiceLinux()
+--- a/src/3rdparty/chromium/net/dns/dns_reloader.cc
++++ b/src/3rdparty/chromium/net/dns/dns_reloader.cc
+@@ -4,8 +4,7 @@
+ 
+ #include "net/dns/dns_reloader.h"
+ 
+-#if defined(OS_POSIX) && !defined(OS_APPLE) && !defined(OS_OPENBSD) && \
+-    !defined(OS_ANDROID) && !defined(OS_FUCHSIA)
++#ifdef __GLIBC__
+ 
+ #include <resolv.h>
+ 
+--- a/src/3rdparty/chromium/net/dns/host_resolver_manager.cc
++++ b/src/3rdparty/chromium/net/dns/host_resolver_manager.cc
+@@ -2720,8 +2720,7 @@ HostResolverManager::HostResolverManager
+   NetworkChangeNotifier::AddConnectionTypeObserver(this);
+   if (system_dns_config_notifier_)
+     system_dns_config_notifier_->AddObserver(this);
+-#if defined(OS_POSIX) && !defined(OS_APPLE) && !defined(OS_OPENBSD) && \
+-    !defined(OS_ANDROID)
++#ifdef __GLIBC__
+   EnsureDnsReloaderInit();
+ #endif
+ 
+--- a/src/3rdparty/chromium/net/dns/host_resolver_proc.cc
++++ b/src/3rdparty/chromium/net/dns/host_resolver_proc.cc
+@@ -176,8 +176,7 @@ int SystemHostResolverCall(const std::st
+   base::ScopedBlockingCall scoped_blocking_call(FROM_HERE,
+                                                 base::BlockingType::WILL_BLOCK);
+ 
+-#if defined(OS_POSIX) && !defined(OS_APPLE) && !defined(OS_OPENBSD) && \
+-    !defined(OS_ANDROID) && !defined(OS_FUCHSIA)
++#ifdef __GLIBC__
+   DnsReloaderMaybeReload();
+ #endif
+   absl::optional<AddressInfo> ai;
diff --git a/srcpkgs/qt6-webengine/patches/0600-chromium-sndio.patch b/srcpkgs/qt6-webengine/patches/0600-chromium-sndio.patch
new file mode 100644
index 000000000000..0302874ffba4
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0600-chromium-sndio.patch
@@ -0,0 +1,876 @@
+--- a/src/3rdparty/chromium/media/BUILD.gn
++++ b/src/3rdparty/chromium/media/BUILD.gn
+@@ -72,6 +72,9 @@ config("media_config") {
+       defines += [ "DLOPEN_PULSEAUDIO" ]
+     }
+   }
++  if (use_sndio) {
++    defines += [ "USE_SNDIO" ]
++  }
+   if (use_cras) {
+     defines += [ "USE_CRAS" ]
+   }
+--- a/src/3rdparty/chromium/media/audio/BUILD.gn
++++ b/src/3rdparty/chromium/media/audio/BUILD.gn
+@@ -240,6 +240,17 @@ source_set("audio") {
+     sources += [ "linux/audio_manager_linux.cc" ]
+   }
+ 
++  if (use_sndio) {
++    libs += [ "sndio" ]
++    sources += [
++      "sndio/audio_manager_sndio.cc",
++      "sndio/sndio_input.cc",
++      "sndio/sndio_input.h",
++      "sndio/sndio_output.cc",
++      "sndio/sndio_output.h"
++    ]
++  }
++
+   if (use_alsa) {
+     libs += [ "asound" ]
+     sources += [
+--- a/src/3rdparty/chromium/media/audio/linux/audio_manager_linux.cc
++++ b/src/3rdparty/chromium/media/audio/linux/audio_manager_linux.cc
+@@ -25,6 +25,11 @@
+ #include "media/audio/pulse/audio_manager_pulse.h"
+ #include "media/audio/pulse/pulse_util.h"
+ #endif
++#if defined(USE_SNDIO)
++#include "media/audio/sndio/audio_manager_sndio.h"
++#include "media/audio/sndio/sndio_input.h"
++#include "media/audio/sndio/sndio_output.h"
++#endif
+ 
+ namespace media {
+ 
+@@ -32,7 +37,8 @@ enum LinuxAudioIO {
+   kPulse,
+   kAlsa,
+   kCras,
+-  kAudioIOMax = kCras  // Must always be equal to largest logged entry.
++  kSndio,
++  kAudioIOMax = kSndio // Must always be equal to largest logged entry.
+ };
+ 
+ std::unique_ptr<media::AudioManager> CreateAudioManager(
+@@ -45,6 +51,16 @@ std::unique_ptr<media::AudioManager> Cre
+                                               audio_log_factory);
+   }
+ 
++#if defined(USE_SNDIO)
++  struct sio_hdl *hdl = sio_open(SIO_DEVANY, SIO_PLAY, 0);
++  if (hdl != NULL) {
++    sio_close(hdl);
++    UMA_HISTOGRAM_ENUMERATION("Media.LinuxAudioIO", kSndio, kAudioIOMax + 1);
++    return std::make_unique<AudioManagerSndio>(std::move(audio_thread),
++                                                  audio_log_factory);
++  }
++#endif
++
+ #if defined(USE_CRAS)
+   if (base::CommandLine::ForCurrentProcess()->HasSwitch(switches::kUseCras)) {
+     UMA_HISTOGRAM_ENUMERATION("Media.LinuxAudioIO", kCras, kAudioIOMax + 1);
+--- /dev/null
++++ b/src/3rdparty/chromium/media/audio/sndio/audio_manager_sndio.cc
+@@ -0,0 +1,148 @@
++// Copyright (c) 2012 The Chromium Authors. All rights reserved.
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++#include "media/audio/sndio/audio_manager_sndio.h"
++
++#include "base/metrics/histogram_macros.h"
++#include "base/memory/ptr_util.h"
++#include "media/audio/audio_device_description.h"
++#include "media/audio/audio_output_dispatcher.h"
++#include "media/audio/sndio/sndio_input.h"
++#include "media/audio/sndio/sndio_output.h"
++#include "media/base/limits.h"
++#include "media/base/media_switches.h"
++
++namespace media {
++
++
++// Maximum number of output streams that can be open simultaneously.
++static const int kMaxOutputStreams = 4;
++
++// Default sample rate for input and output streams.
++static const int kDefaultSampleRate = 48000;
++
++void AddDefaultDevice(AudioDeviceNames* device_names) {
++  DCHECK(device_names->empty());
++  device_names->push_front(AudioDeviceName::CreateDefault());
++}
++
++bool AudioManagerSndio::HasAudioOutputDevices() {
++  return true;
++}
++
++bool AudioManagerSndio::HasAudioInputDevices() {
++  return true;
++}
++
++void AudioManagerSndio::GetAudioInputDeviceNames(
++    AudioDeviceNames* device_names) {
++  DCHECK(device_names->empty());
++  AddDefaultDevice(device_names);
++}
++
++void AudioManagerSndio::GetAudioOutputDeviceNames(
++    AudioDeviceNames* device_names) {
++  AddDefaultDevice(device_names);
++}
++
++const char* AudioManagerSndio::GetName() {
++  return "SNDIO";
++}
++
++AudioParameters AudioManagerSndio::GetInputStreamParameters(
++    const std::string& device_id) {
++  static const int kDefaultInputBufferSize = 1024;
++
++  int user_buffer_size = GetUserBufferSize();
++  int buffer_size = user_buffer_size ?
++      user_buffer_size : kDefaultInputBufferSize;
++
++  return AudioParameters(
++      AudioParameters::AUDIO_PCM_LOW_LATENCY, CHANNEL_LAYOUT_STEREO,
++      kDefaultSampleRate, buffer_size);
++}
++
++AudioManagerSndio::AudioManagerSndio(std::unique_ptr<AudioThread> audio_thread,
++                                         AudioLogFactory* audio_log_factory)
++    : AudioManagerBase(std::move(audio_thread),
++                       audio_log_factory) {
++  DLOG(WARNING) << "AudioManagerSndio";
++  SetMaxOutputStreamsAllowed(kMaxOutputStreams);
++}
++
++AudioManagerSndio::~AudioManagerSndio() {
++  Shutdown();
++}
++
++AudioOutputStream* AudioManagerSndio::MakeLinearOutputStream(
++    const AudioParameters& params,
++    const LogCallback& log_callback) {
++  DCHECK_EQ(AudioParameters::AUDIO_PCM_LINEAR, params.format());
++  return MakeOutputStream(params);
++}
++
++AudioOutputStream* AudioManagerSndio::MakeLowLatencyOutputStream(
++    const AudioParameters& params,
++    const std::string& device_id,
++    const LogCallback& log_callback) {
++  DLOG_IF(ERROR, !device_id.empty()) << "Not implemented!";
++  DCHECK_EQ(AudioParameters::AUDIO_PCM_LOW_LATENCY, params.format());
++  return MakeOutputStream(params);
++}
++
++AudioInputStream* AudioManagerSndio::MakeLinearInputStream(
++    const AudioParameters& params,
++    const std::string& device_id,
++    const LogCallback& log_callback) {
++  DCHECK_EQ(AudioParameters::AUDIO_PCM_LINEAR, params.format());
++  return MakeInputStream(params);
++}
++
++AudioInputStream* AudioManagerSndio::MakeLowLatencyInputStream(
++    const AudioParameters& params,
++    const std::string& device_id,
++    const LogCallback& log_callback) {
++  DCHECK_EQ(AudioParameters::AUDIO_PCM_LOW_LATENCY, params.format());
++  return MakeInputStream(params);
++}
++
++AudioParameters AudioManagerSndio::GetPreferredOutputStreamParameters(
++    const std::string& output_device_id,
++    const AudioParameters& input_params) {
++  // TODO(tommi): Support |output_device_id|.
++  DLOG_IF(ERROR, !output_device_id.empty()) << "Not implemented!";
++  static const int kDefaultOutputBufferSize = 2048;
++
++  ChannelLayout channel_layout = CHANNEL_LAYOUT_STEREO;
++  int sample_rate = kDefaultSampleRate;
++  int buffer_size = kDefaultOutputBufferSize;
++  if (input_params.IsValid()) {
++    sample_rate = input_params.sample_rate();
++    channel_layout = input_params.channel_layout();
++    buffer_size = std::min(buffer_size, input_params.frames_per_buffer());
++  }
++
++  int user_buffer_size = GetUserBufferSize();
++  if (user_buffer_size)
++    buffer_size = user_buffer_size;
++
++  return AudioParameters(
++      AudioParameters::AUDIO_PCM_LOW_LATENCY, channel_layout,
++      sample_rate, buffer_size);
++}
++
++AudioInputStream* AudioManagerSndio::MakeInputStream(
++    const AudioParameters& params) {
++  DLOG(WARNING) << "MakeInputStream";
++  return new SndioAudioInputStream(this,
++             AudioDeviceDescription::kDefaultDeviceId, params);
++}
++
++AudioOutputStream* AudioManagerSndio::MakeOutputStream(
++    const AudioParameters& params) {
++  DLOG(WARNING) << "MakeOutputStream";
++  return new SndioAudioOutputStream(params, this);
++}
++
++}  // namespace media
+--- /dev/null
++++ b/src/3rdparty/chromium/media/audio/sndio/audio_manager_sndio.h
+@@ -0,0 +1,65 @@
++// Copyright (c) 2012 The Chromium Authors. All rights reserved.
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++#ifndef MEDIA_AUDIO_SNDIO_AUDIO_MANAGER_SNDIO_H_
++#define MEDIA_AUDIO_SNDIO_AUDIO_MANAGER_SNDIO_H_
++
++#include <set>
++
++#include "base/compiler_specific.h"
++#include "base/macros.h"
++#include "base/memory/ref_counted.h"
++#include "base/threading/thread.h"
++#include "media/audio/audio_manager_base.h"
++
++namespace media {
++
++class MEDIA_EXPORT AudioManagerSndio : public AudioManagerBase {
++ public:
++  AudioManagerSndio(std::unique_ptr<AudioThread> audio_thread,
++                   AudioLogFactory* audio_log_factory);
++  ~AudioManagerSndio() override;
++
++  // Implementation of AudioManager.
++  bool HasAudioOutputDevices() override;
++  bool HasAudioInputDevices() override;
++  void GetAudioInputDeviceNames(AudioDeviceNames* device_names) override;
++  void GetAudioOutputDeviceNames(AudioDeviceNames* device_names) override;
++  AudioParameters GetInputStreamParameters(
++      const std::string& device_id) override;
++  const char* GetName() override;
++
++  // Implementation of AudioManagerBase.
++  AudioOutputStream* MakeLinearOutputStream(
++      const AudioParameters& params,
++      const LogCallback& log_callback) override;
++  AudioOutputStream* MakeLowLatencyOutputStream(
++      const AudioParameters& params,
++      const std::string& device_id,
++      const LogCallback& log_callback) override;
++  AudioInputStream* MakeLinearInputStream(
++      const AudioParameters& params,
++      const std::string& device_id,
++      const LogCallback& log_callback) override;
++  AudioInputStream* MakeLowLatencyInputStream(
++      const AudioParameters& params,
++      const std::string& device_id,
++      const LogCallback& log_callback) override;
++
++ protected:
++  AudioParameters GetPreferredOutputStreamParameters(
++      const std::string& output_device_id,
++      const AudioParameters& input_params) override;
++
++ private:
++  // Called by MakeLinearOutputStream and MakeLowLatencyOutputStream.
++  AudioOutputStream* MakeOutputStream(const AudioParameters& params);
++  AudioInputStream* MakeInputStream(const AudioParameters& params);
++
++  DISALLOW_COPY_AND_ASSIGN(AudioManagerSndio);
++};
++
++}  // namespace media
++
++#endif  // MEDIA_AUDIO_SNDIO_AUDIO_MANAGER_SNDIO_H_
+--- /dev/null
++++ b/src/3rdparty/chromium/media/audio/sndio/sndio_input.cc
+@@ -0,0 +1,200 @@
++// Copyright 2013 The Chromium Authors. All rights reserved.
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++#include "base/bind.h"
++#include "base/logging.h"
++#include "base/macros.h"
++#include "media/base/audio_timestamp_helper.h"
++#include "media/audio/sndio/audio_manager_sndio.h"
++#include "media/audio/audio_manager.h"
++#include "media/audio/sndio/sndio_input.h"
++
++namespace media {
++
++static const SampleFormat kSampleFormat = kSampleFormatS16;
++
++void SndioAudioInputStream::OnMoveCallback(void *arg, int delta)
++{
++  SndioAudioInputStream* self = static_cast<SndioAudioInputStream*>(arg);
++
++  self->hw_delay += delta;
++}
++
++void *SndioAudioInputStream::ThreadEntry(void *arg) {
++  SndioAudioInputStream* self = static_cast<SndioAudioInputStream*>(arg);
++
++  self->ThreadLoop();
++  return NULL;
++}
++
++SndioAudioInputStream::SndioAudioInputStream(AudioManagerBase* manager,
++                                             const std::string& device_name,
++                                             const AudioParameters& params)
++    : manager(manager),
++      params(params),
++      audio_bus(AudioBus::Create(params)),
++      state(kClosed) {
++}
++
++SndioAudioInputStream::~SndioAudioInputStream() {
++  if (state != kClosed)
++    Close();
++}
++
++bool SndioAudioInputStream::Open() {
++  struct sio_par par;
++  int sig;
++
++  if (state != kClosed)
++    return false;
++
++  if (params.format() != AudioParameters::AUDIO_PCM_LINEAR &&
++      params.format() != AudioParameters::AUDIO_PCM_LOW_LATENCY) {
++    LOG(WARNING) << "Unsupported audio format.";
++    return false;
++  }
++
++  sio_initpar(&par);
++  par.rate = params.sample_rate();
++  par.rchan = params.channels();
++  par.bits = SampleFormatToBitsPerChannel(kSampleFormat);
++  par.bps = par.bits / 8;
++  par.sig = sig = par.bits != 8 ? 1 : 0;
++  par.le = SIO_LE_NATIVE;
++  par.appbufsz = params.frames_per_buffer();
++
++  hdl = sio_open(SIO_DEVANY, SIO_REC, 0);
++
++  if (hdl == NULL) {
++    LOG(ERROR) << "Couldn't open audio device.";
++    return false;
++  }
++
++  if (!sio_setpar(hdl, &par) || !sio_getpar(hdl, &par)) {
++    LOG(ERROR) << "Couldn't set audio parameters.";
++    goto bad_close;
++  }
++
++  if (par.rate  != (unsigned int)params.sample_rate() ||
++      par.rchan != (unsigned int)params.channels() ||
++      par.bits  != (unsigned int)SampleFormatToBitsPerChannel(kSampleFormat) ||
++      par.sig   != (unsigned int)sig ||
++      (par.bps > 1 && par.le != SIO_LE_NATIVE) ||
++      (par.bits != par.bps * 8)) {
++    LOG(ERROR) << "Unsupported audio parameters.";
++    goto bad_close;
++  }
++  state = kStopped;
++  buffer = new char[audio_bus->frames() * params.GetBytesPerFrame(kSampleFormat)];
++  sio_onmove(hdl, &OnMoveCallback, this);
++  return true;
++bad_close:
++  sio_close(hdl);
++  return false;
++}
++
++void SndioAudioInputStream::Start(AudioInputCallback* cb) {
++
++  StartAgc();
++
++  state = kRunning;
++  hw_delay = 0;
++  callback = cb;
++  sio_start(hdl);
++  if (pthread_create(&thread, NULL, &ThreadEntry, this) != 0) {
++    LOG(ERROR) << "Failed to create real-time thread for recording.";
++    sio_stop(hdl);
++    state = kStopped;
++  }
++}
++
++void SndioAudioInputStream::Stop() {
++
++  if (state == kStopped)
++    return;
++
++  state = kStopWait;
++  pthread_join(thread, NULL);
++  sio_stop(hdl);
++  state = kStopped;
++
++  StopAgc();
++}
++
++void SndioAudioInputStream::Close() {
++
++  if (state == kClosed)
++    return;
++
++  if (state == kRunning)
++    Stop();
++
++  state = kClosed;
++  delete [] buffer;
++  sio_close(hdl);
++
++  manager->ReleaseInputStream(this);
++}
++
++double SndioAudioInputStream::GetMaxVolume() {
++  // Not supported
++  return 0.0;
++}
++
++void SndioAudioInputStream::SetVolume(double volume) {
++  // Not supported. Do nothing.
++}
++
++double SndioAudioInputStream::GetVolume() {
++  // Not supported.
++  return 0.0;
++}
++
++bool SndioAudioInputStream::IsMuted() {
++  // Not supported.
++  return false;
++}
++
++void SndioAudioInputStream::SetOutputDeviceForAec(
++    const std::string& output_device_id) {
++  // Not supported.
++}
++
++void SndioAudioInputStream::ThreadLoop(void) {
++  size_t todo, n;
++  char *data;
++  unsigned int nframes;
++  double normalized_volume = 0.0;
++
++  nframes = audio_bus->frames();
++
++  while (state == kRunning && !sio_eof(hdl)) {
++
++    GetAgcVolume(&normalized_volume);
++
++    // read one block
++    todo = nframes * params.GetBytesPerFrame(kSampleFormat);
++    data = buffer;
++    while (todo > 0) {
++      n = sio_read(hdl, data, todo);
++      if (n == 0)
++        return;	// unrecoverable I/O error
++      todo -= n;
++      data += n;
++    }
++    hw_delay -= nframes;
++
++    // convert frames count to TimeDelta
++    const base::TimeDelta delay = AudioTimestampHelper::FramesToTime(hw_delay,
++      params.sample_rate());
++
++    // push into bus
++    audio_bus->FromInterleaved<SignedInt16SampleTypeTraits>(reinterpret_cast<int16_t*>(buffer), nframes);
++
++    // invoke callback
++    callback->OnData(audio_bus.get(), base::TimeTicks::Now() - delay, 1.);
++  }
++}
++
++}  // namespace media
+--- /dev/null
++++ b/src/3rdparty/chromium/media/audio/sndio/sndio_input.h
+@@ -0,0 +1,91 @@
++// Copyright 2013 The Chromium Authors. All rights reserved.
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++#ifndef MEDIA_AUDIO_SNDIO_SNDIO_INPUT_H_
++#define MEDIA_AUDIO_SNDIO_SNDIO_INPUT_H_
++
++#include <stdint.h>
++#include <string>
++#include <sndio.h>
++
++#include "base/compiler_specific.h"
++#include "base/macros.h"
++#include "base/memory/weak_ptr.h"
++#include "base/time/time.h"
++#include "media/audio/agc_audio_stream.h"
++#include "media/audio/audio_io.h"
++#include "media/audio/audio_device_description.h"
++#include "media/base/audio_parameters.h"
++
++namespace media {
++
++class AudioManagerBase;
++
++// Implementation of AudioOutputStream using sndio(7)
++class SndioAudioInputStream : public AgcAudioStream<AudioInputStream> {
++ public:
++  // Pass this to the constructor if you want to attempt auto-selection
++  // of the audio recording device.
++  static const char kAutoSelectDevice[];
++
++  // Create a PCM Output stream for the SNDIO device identified by
++  // |device_name|. If unsure of what to use for |device_name|, use
++  // |kAutoSelectDevice|.
++  SndioAudioInputStream(AudioManagerBase* audio_manager,
++                     const std::string& device_name,
++                     const AudioParameters& params);
++
++  ~SndioAudioInputStream() override;
++
++  // Implementation of AudioInputStream.
++  bool Open() override;
++  void Start(AudioInputCallback* callback) override;
++  void Stop() override;
++  void Close() override;
++  double GetMaxVolume() override;
++  void SetVolume(double volume) override;
++  double GetVolume() override;
++  bool IsMuted() override;
++  void SetOutputDeviceForAec(const std::string& output_device_id) override;
++
++ private:
++
++  enum StreamState {
++    kClosed,            // Not opened yet
++    kStopped,           // Device opened, but not started yet
++    kRunning,           // Started, device playing
++    kStopWait           // Stopping, waiting for the real-time thread to exit
++  };
++
++  // C-style call-backs
++  static void OnMoveCallback(void *arg, int delta);
++  static void* ThreadEntry(void *arg);
++
++  // Continuously moves data from the device to the consumer
++  void ThreadLoop();
++  // Our creator, the audio manager needs to be notified when we close.
++  AudioManagerBase* manager;
++  // Parameters of the source
++  AudioParameters params;
++  // We store data here for consumer
++  std::unique_ptr<AudioBus> audio_bus;
++  // Call-back that consumes recorded data
++  AudioInputCallback* callback;  // Valid during a recording session.
++  // Handle of the audio device
++  struct sio_hdl* hdl;
++  // Current state of the stream
++  enum StreamState state;
++  // High priority thread running ThreadLoop()
++  pthread_t thread;
++  // Number of frames buffered in the hardware
++  int hw_delay;
++  // Temporary buffer where data is stored sndio-compatible format
++  char* buffer;
++
++  DISALLOW_COPY_AND_ASSIGN(SndioAudioInputStream);
++};
++
++}  // namespace media
++
++#endif  // MEDIA_AUDIO_SNDIO_SNDIO_INPUT_H_
+--- /dev/null
++++ b/src/3rdparty/chromium/media/audio/sndio/sndio_output.cc
+@@ -0,0 +1,183 @@
++// Copyright (c) 2012 The Chromium Authors. All rights reserved.
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++#include "base/logging.h"
++#include "base/time/time.h"
++#include "base/time/default_tick_clock.h"
++#include "media/audio/audio_manager_base.h"
++#include "media/base/audio_timestamp_helper.h"
++#include "media/audio/sndio/sndio_output.h"
++
++namespace media {
++
++static const SampleFormat kSampleFormat = kSampleFormatS16;
++
++void SndioAudioOutputStream::OnMoveCallback(void *arg, int delta) {
++  SndioAudioOutputStream* self = static_cast<SndioAudioOutputStream*>(arg);
++
++  self->hw_delay -= delta;
++}
++
++void SndioAudioOutputStream::OnVolCallback(void *arg, unsigned int vol) {
++  SndioAudioOutputStream* self = static_cast<SndioAudioOutputStream*>(arg);
++
++  self->vol = vol;
++}
++
++void *SndioAudioOutputStream::ThreadEntry(void *arg) {
++  SndioAudioOutputStream* self = static_cast<SndioAudioOutputStream*>(arg);
++
++  self->ThreadLoop();
++  return NULL;
++}
++
++SndioAudioOutputStream::SndioAudioOutputStream(const AudioParameters& params,
++                                               AudioManagerBase* manager)
++    : manager(manager),
++      params(params),
++      audio_bus(AudioBus::Create(params)),
++      state(kClosed),
++      mutex(PTHREAD_MUTEX_INITIALIZER) {
++}
++
++SndioAudioOutputStream::~SndioAudioOutputStream() {
++  if (state != kClosed)
++    Close();
++}
++
++bool SndioAudioOutputStream::Open() {
++  struct sio_par par;
++  int sig;
++
++  if (params.format() != AudioParameters::AUDIO_PCM_LINEAR &&
++      params.format() != AudioParameters::AUDIO_PCM_LOW_LATENCY) {
++    LOG(WARNING) << "Unsupported audio format.";
++    return false;
++  }
++  sio_initpar(&par);
++  par.rate = params.sample_rate();
++  par.pchan = params.channels();
++  par.bits = SampleFormatToBitsPerChannel(kSampleFormat);
++  par.bps = par.bits / 8;
++  par.sig = sig = par.bits != 8 ? 1 : 0;
++  par.le = SIO_LE_NATIVE;
++  par.appbufsz = params.frames_per_buffer();
++
++  hdl = sio_open(SIO_DEVANY, SIO_PLAY, 0);
++  if (hdl == NULL) {
++    LOG(ERROR) << "Couldn't open audio device.";
++    return false;
++  }
++  if (!sio_setpar(hdl, &par) || !sio_getpar(hdl, &par)) {
++    LOG(ERROR) << "Couldn't set audio parameters.";
++    goto bad_close;
++  }
++  if (par.rate  != (unsigned int)params.sample_rate() ||
++      par.pchan != (unsigned int)params.channels() ||
++      par.bits  != (unsigned int)SampleFormatToBitsPerChannel(kSampleFormat) ||
++      par.sig   != (unsigned int)sig ||
++      (par.bps > 1 && par.le != SIO_LE_NATIVE) ||
++      (par.bits != par.bps * 8)) {
++    LOG(ERROR) << "Unsupported audio parameters.";
++    goto bad_close;
++  }
++  state = kStopped;
++  volpending = 0;
++  vol = 0;
++  buffer = new char[audio_bus->frames() * params.GetBytesPerFrame(kSampleFormat)];
++  sio_onmove(hdl, &OnMoveCallback, this);
++  sio_onvol(hdl, &OnVolCallback, this);
++  return true;
++ bad_close:
++  sio_close(hdl);
++  return false;
++}
++
++void SndioAudioOutputStream::Close() {
++  if (state == kClosed)
++    return;
++  if (state == kRunning)
++    Stop();
++  state = kClosed;
++  delete [] buffer;
++  sio_close(hdl);
++  manager->ReleaseOutputStream(this);  // Calls the destructor
++}
++
++void SndioAudioOutputStream::Start(AudioSourceCallback* callback) {
++  state = kRunning;
++  hw_delay = 0;
++  source = callback;
++  sio_start(hdl);
++  if (pthread_create(&thread, NULL, &ThreadEntry, this) != 0) {
++    LOG(ERROR) << "Failed to create real-time thread.";
++    sio_stop(hdl);
++    state = kStopped;
++  }
++}
++
++void SndioAudioOutputStream::Stop() {
++  if (state == kStopped)
++    return;
++  state = kStopWait;
++  pthread_join(thread, NULL);
++  sio_stop(hdl);
++  state = kStopped;
++}
++
++void SndioAudioOutputStream::SetVolume(double v) {
++  pthread_mutex_lock(&mutex);
++  vol = v * SIO_MAXVOL;
++  volpending = 1;
++  pthread_mutex_unlock(&mutex);
++}
++
++void SndioAudioOutputStream::GetVolume(double* v) {
++  pthread_mutex_lock(&mutex);
++  *v = vol * (1. / SIO_MAXVOL);
++  pthread_mutex_unlock(&mutex);
++}
++
++// This stream is always used with sub second buffer sizes, where it's
++// sufficient to simply always flush upon Start().
++void SndioAudioOutputStream::Flush() {}
++
++void SndioAudioOutputStream::ThreadLoop(void) {
++  int avail, count, result;
++
++  while (state == kRunning) {
++    // Update volume if needed
++    pthread_mutex_lock(&mutex);
++    if (volpending) {
++      volpending = 0;
++      sio_setvol(hdl, vol);
++    }
++    pthread_mutex_unlock(&mutex);
++
++    // Get data to play
++    const base::TimeDelta delay = AudioTimestampHelper::FramesToTime(hw_delay,
++	params.sample_rate());
++    count = source->OnMoreData(delay, base::TimeTicks::Now(), 0, audio_bus.get());
++    audio_bus->ToInterleaved<SignedInt16SampleTypeTraits>(count, reinterpret_cast<int16_t*>(buffer));
++    if (count == 0) {
++      // We have to submit something to the device
++      count = audio_bus->frames();
++      memset(buffer, 0, count * params.GetBytesPerFrame(kSampleFormat));
++      LOG(WARNING) << "No data to play, running empty cycle.";
++    }
++
++    // Submit data to the device
++    avail = count * params.GetBytesPerFrame(kSampleFormat);
++    result = sio_write(hdl, buffer, avail);
++    if (result == 0) {
++      LOG(WARNING) << "Audio device disconnected.";
++      break;
++    }
++
++    // Update hardware pointer
++    hw_delay += count;
++  }
++}
++
++}  // namespace media
+--- /dev/null
++++ b/src/3rdparty/chromium/media/audio/sndio/sndio_output.h
+@@ -0,0 +1,86 @@
++// Copyright (c) 2012 The Chromium Authors. All rights reserved.
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++#ifndef MEDIA_AUDIO_SNDIO_SNDIO_OUTPUT_H_
++#define MEDIA_AUDIO_SNDIO_SNDIO_OUTPUT_H_
++
++#include <pthread.h>
++#include <sndio.h>
++
++#include "base/time/tick_clock.h"
++#include "base/time/time.h"
++#include "media/audio/audio_io.h"
++
++namespace media {
++
++class AudioManagerBase;
++
++// Implementation of AudioOutputStream using sndio(7)
++class SndioAudioOutputStream : public AudioOutputStream {
++ public:
++  // The manager is creating this object
++  SndioAudioOutputStream(const AudioParameters& params,
++                         AudioManagerBase* manager);
++  virtual ~SndioAudioOutputStream();
++
++  // Implementation of AudioOutputStream.
++  bool Open() override;
++  void Close() override;
++  void Start(AudioSourceCallback* callback) override;
++  void Stop() override;
++  void SetVolume(double volume) override;
++  void GetVolume(double* volume) override;
++  void Flush() override;
++
++  friend void sndio_onmove(void *arg, int delta);
++  friend void sndio_onvol(void *arg, unsigned int vol);
++  friend void *sndio_threadstart(void *arg);
++
++ private:
++  enum StreamState {
++    kClosed,            // Not opened yet
++    kStopped,           // Device opened, but not started yet
++    kRunning,           // Started, device playing
++    kStopWait           // Stopping, waiting for the real-time thread to exit
++  };
++
++  // C-style call-backs
++  static void OnMoveCallback(void *arg, int delta);
++  static void OnVolCallback(void *arg, unsigned int vol);
++  static void* ThreadEntry(void *arg);
++
++  // Continuously moves data from the producer to the device
++  void ThreadLoop(void);
++
++  // Our creator, the audio manager needs to be notified when we close.
++  AudioManagerBase* manager;
++  // Parameters of the source
++  AudioParameters params;
++  // Source stores data here
++  std::unique_ptr<AudioBus> audio_bus;
++  // Call-back that produces data to play
++  AudioSourceCallback* source;
++  // Handle of the audio device
++  struct sio_hdl* hdl;
++  // Current state of the stream
++  enum StreamState state;
++  // High priority thread running ThreadLoop()
++  pthread_t thread;
++  // Protects vol, volpending and hw_delay
++  pthread_mutex_t mutex;
++  // Current volume in the 0..SIO_MAXVOL range
++  int vol;
++  // Set to 1 if volumes must be refreshed in the realtime thread
++  int volpending;
++  // Number of frames buffered in the hardware
++  int hw_delay;
++  // Temporary buffer where data is stored sndio-compatible format
++  char* buffer;
++
++  DISALLOW_COPY_AND_ASSIGN(SndioAudioOutputStream);
++};
++
++}  // namespace media
++
++#endif  // MEDIA_AUDIO_SNDIO_SNDIO_OUTPUT_H_
+--- a/src/3rdparty/chromium/media/media_options.gni
++++ b/src/3rdparty/chromium/media/media_options.gni
+@@ -121,6 +121,9 @@ declare_args() {
+   # Enables runtime selection of ALSA library for audio.
+   use_alsa = false
+ 
++  # Enable runtime selection of sndio(7)
++  use_sndio = false
++
+   # Alsa should be used on non-Android, non-Mac POSIX systems.
+   # Alsa should be used on desktop Chromecast and audio-only Chromecast builds.
+   if (is_posix && !is_android && !is_mac &&
diff --git a/srcpkgs/qt6-webengine/patches/0700-armv7l-neon.patch b/srcpkgs/qt6-webengine/patches/0700-armv7l-neon.patch
new file mode 100644
index 000000000000..d42fa19a07a1
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0700-armv7l-neon.patch
@@ -0,0 +1,10 @@
+--- a/src/3rdparty/chromium/skia/BUILD.gn
++++ b/src/3rdparty/chromium/skia/BUILD.gn
+@@ -800,7 +800,6 @@ skia_source_set("skia_opts") {
+         # Root build config sets -mfpu=$arm_fpu, which we expect to be neon
+         # when running this.
+         if (!arm_use_neon) {
+-          configs -= [ "//build/config/compiler:compiler_arm_fpu" ]
+           cflags += [ "-mfpu=neon" ]
+         }
+       }
diff --git a/srcpkgs/qt6-webengine/patches/0750-chromium-musl-cross-no-asm_ptrace_h.patch b/srcpkgs/qt6-webengine/patches/0750-chromium-musl-cross-no-asm_ptrace_h.patch
new file mode 100644
index 000000000000..3cf132908af4
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0750-chromium-musl-cross-no-asm_ptrace_h.patch
@@ -0,0 +1,30 @@
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper.cc
+@@ -38,7 +38,12 @@
+ 
+ #include "client/linux/minidump_writer/linux_ptrace_dumper.h"
+ 
++#if defined(__GLIBC__)
+ #include <asm/ptrace.h>
++#else
++/* For arm*-musl this definition is missing */
++#define ARM_sp uregs[13]
++#endif
+ #include <assert.h>
+ #include <errno.h>
+ #include <fcntl.h>
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_core_dumper.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_core_dumper.cc
+@@ -32,7 +32,12 @@
+ 
+ #include "client/linux/minidump_writer/linux_core_dumper.h"
+ 
++#if defined(__GLIBC__)
+ #include <asm/ptrace.h>
++#else
++/* For arm*-musl this definition is missing */
++#define ARM_sp uregs[13]
++#endif
+ #include <assert.h>
+ #include <elf.h>
+ #include <stdio.h>
diff --git a/srcpkgs/qt6-webengine/patches/0751-chromium-musl-arm-user_vfp.patch b/srcpkgs/qt6-webengine/patches/0751-chromium-musl-arm-user_vfp.patch
new file mode 100644
index 000000000000..6e2d62f35ee6
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0751-chromium-musl-arm-user_vfp.patch
@@ -0,0 +1,20 @@
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/util/linux/thread_info.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/util/linux/thread_info.h
+@@ -17,6 +17,17 @@
+ 
+ #include <stdint.h>
+ #include <sys/user.h>
++#if !defined(__GLIBC__)
++struct user_vfp {
++	unsigned long long fpregs[32];
++	unsigned long fpscr;
++};
++struct user_vfp_exc {
++	unsigned long fpexc;
++	unsigned long fpinst;
++	unsigned long fpinst2;
++};
++#endif /* !defined(__GLIBC__) */
+ 
+ #include <type_traits>
+ 
diff --git a/srcpkgs/qt6-webengine/patches/0752-chromium-musl-arm-elf_auxv_t.patch b/srcpkgs/qt6-webengine/patches/0752-chromium-musl-arm-elf_auxv_t.patch
new file mode 100644
index 000000000000..7112c8cfd3fa
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0752-chromium-musl-arm-elf_auxv_t.patch
@@ -0,0 +1,18 @@
+--- a/src/3rdparty/chromium/v8/src/base/cpu.cc
++++ b/src/3rdparty/chromium/v8/src/base/cpu.cc
+@@ -163,6 +163,15 @@ static V8_INLINE void __cpuid(int cpu_in
+ 
+ #if V8_HOST_ARCH_ARM || V8_HOST_ARCH_ARM64
+ 
++#ifndef __GLIBC__
++#include <elf.h>
++#ifdef __LP64__
++typedef Elf64_auxv_t elf_auxv_t;
++#else
++typedef Elf32_auxv_t elf_auxv_t;
++#endif
++#endif
++
+ static uint32_t ReadELFHWCaps() {
+   uint32_t result = 0;
+ #if V8_GLIBC_PREREQ(2, 16)
diff --git a/srcpkgs/qt6-webengine/patches/0801-chromium-i686-vaapi-fpermissive.patch b/srcpkgs/qt6-webengine/patches/0801-chromium-i686-vaapi-fpermissive.patch
new file mode 100644
index 000000000000..3d4043e03b89
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0801-chromium-i686-vaapi-fpermissive.patch
@@ -0,0 +1,24 @@
+--- a/src/3rdparty/chromium/media/gpu/vaapi/BUILD.gn
++++ b/src/3rdparty/chromium/media/gpu/vaapi/BUILD.gn
+@@ -14,6 +14,10 @@ import("//ui/gl/features.gni")
+ assert(is_linux || is_chromeos)
+ assert(use_vaapi)
+ 
++config("vaapi_permissive") {
++  cflags = [ "-fpermissive" ]
++}
++
+ generate_stubs("libva_stubs") {
+   extra_header = "va_stub_header.fragment"
+   sigs = [ "va.sigs" ]
+@@ -136,6 +140,10 @@ source_set("vaapi") {
+     ]
+   }
+ 
++  if (target_cpu == "x86") {
++    configs += [ ":vaapi_permissive" ]
++  }
++
+   if (use_x11) {
+     deps += [ "//ui/gfx/x" ]
+     sources += [
diff --git a/srcpkgs/qt6-webengine/patches/0900-xxx-ppc64le-libvpx.patch b/srcpkgs/qt6-webengine/patches/0900-xxx-ppc64le-libvpx.patch
new file mode 100644
index 000000000000..5c9566b56bd4
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0900-xxx-ppc64le-libvpx.patch
@@ -0,0 +1,65 @@
+Uses generic target for now. To use ppc64le, change --target to ppc64le-gnu
+and add --enable-vsx, and change generic to ppc for the rtcd header.
+
+From 18e6c5c55cfae0cfb458d8210d7bc709360a0e90 Mon Sep 17 00:00:00 2001
+From: q66 <daniel@octaforge.org>
+Date: Wed, 9 Sep 2020 19:08:25 +0200
+Subject: [PATCH] enable generation of ppc64 libvpx bits
+
+this doesn't update the gni file, that's done from
+the template by running the appropriate scripts
+---
+ third_party/libvpx/BUILD.gn        | 4 ++++
+ third_party/libvpx/generate_gni.sh | 9 +++++++++
+ 2 files changed, 13 insertions(+)
+
+--- a/src/3rdparty/chromium/third_party/libvpx/BUILD.gn
++++ b/src/3rdparty/chromium/third_party/libvpx/BUILD.gn
+@@ -424,6 +424,8 @@ static_library("bundled_libvpx") {
+       sources = libvpx_srcs_arm64
+       public_deps = [ ":libvpx_arm64_headers" ]
+     }
++  } else if (current_cpu == "ppc64") {
++    sources = libvpx_srcs_ppc64
+   }
+ 
+   configs -= [ "//build/config/compiler:chromium_code" ]
+--- a/src/3rdparty/chromium/third_party/libvpx/generate_gni.sh
++++ b/src/3rdparty/chromium/third_party/libvpx/generate_gni.sh
+@@ -374,6 +374,7 @@ gen_config_files linux/arm-neon-highbd "
+ gen_config_files linux/arm64-highbd "--target=armv8-linux-gcc ${all_platforms} ${HIGHBD}"
+ gen_config_files linux/mipsel "--target=mips32-linux-gcc ${all_platforms}"
+ gen_config_files linux/mips64el "--target=mips64-linux-gcc ${all_platforms}"
++gen_config_files linux/ppc64 "--target=generic-gnu $HIGHBD ${all_platforms}"
+ gen_config_files linux/generic "--target=generic-gnu $HIGHBD ${all_platforms}"
+ gen_config_files win/arm64 "--target=arm64-win64-vs15 ${all_platforms} ${HIGHBD}"
+ gen_config_files win/ia32 "--target=x86-win32-vs14 ${all_platforms} ${x86_platforms}"
+@@ -399,6 +400,7 @@ lint_config linux/arm-neon-highbd
+ lint_config linux/arm64-highbd
+ lint_config linux/mipsel
+ lint_config linux/mips64el
++lint_config linux/ppc64
+ lint_config linux/generic
+ lint_config win/arm64
+ lint_config win/ia32
+@@ -428,6 +430,7 @@ gen_rtcd_header linux/arm-neon-highbd ar
+ gen_rtcd_header linux/arm64-highbd armv8
+ gen_rtcd_header linux/mipsel mipsel
+ gen_rtcd_header linux/mips64el mips64el
++gen_rtcd_header linux/ppc64 generic
+ gen_rtcd_header linux/generic generic
+ gen_rtcd_header win/arm64 armv8
+ gen_rtcd_header win/ia32 x86 "${require_sse2}"
+@@ -513,6 +516,12 @@ if [ -z $ONLY_CONFIGS ]; then
+ 
+   echo "MIPS64 source list is identical to MIPS source list. No need to generate it."
+ 
++  echo "Generate ppc64 source list."
++  config=$(print_config_basic linux/ppc64)
++  make_clean
++  make libvpx_srcs.txt target=libs $config > /dev/null
++  convert_srcs_to_project_files libvpx_srcs.txt libvpx_srcs_ppc64
++
+   echo "Generate NaCl source list."
+   config=$(print_config_basic nacl)
+   make_clean
diff --git a/srcpkgs/qt6-webengine/patches/0901-xxx-ppc64le-sandbox-linux-stat.patch b/srcpkgs/qt6-webengine/patches/0901-xxx-ppc64le-sandbox-linux-stat.patch
new file mode 100644
index 000000000000..4b8e6320601c
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0901-xxx-ppc64le-sandbox-linux-stat.patch
@@ -0,0 +1,31 @@
+--- a/src/3rdparty/chromium/sandbox/linux/system_headers/linux_stat.h
++++ b/src/3rdparty/chromium/sandbox/linux/system_headers/linux_stat.h
+@@ -155,6 +155,28 @@ struct kernel_stat {
+   unsigned int __unused4;
+   unsigned int __unused5;
+ };
++#elif defined(__powerpc64__)
++struct kernel_stat {
++  unsigned long	st_dev;
++  unsigned long	st_ino;
++  unsigned long	st_nlink;
++  unsigned int	st_mode;
++  unsigned int	st_uid;
++  unsigned int	st_gid;
++  unsigned long	st_rdev;
++  long		st_size;
++  unsigned long	st_blksize;
++  unsigned long	st_blocks;
++  unsigned long	st_atime_;
++  unsigned long	st_atime_nsec_;
++  unsigned long	st_mtime_;
++  unsigned long	st_mtime_nsec_;
++  unsigned long	st_ctime_;
++  unsigned long	st_ctime_nsec_;
++  unsigned long	__unused4;
++  unsigned long	__unused5;
++  unsigned long	__unused6;
++};
+ #endif
+ 
+ #if !defined(AT_EMPTY_PATH)
diff --git a/srcpkgs/qt6-webengine/patches/0902-xxx-ppc64le-support.patch b/srcpkgs/qt6-webengine/patches/0902-xxx-ppc64le-support.patch
new file mode 100644
index 000000000000..33d415e55f69
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0902-xxx-ppc64le-support.patch
@@ -0,0 +1,3556 @@
+commit 2c013a317b1114ef67cdbbc30824b28907b9ea94
+Author: Daniel Kolesa <daniel@octaforge.org>
+Date:   Wed Mar 3 19:08:29 2021 +0100
+
+    ppc64le support
+
+--- a/src/3rdparty/chromium/sandbox/features.gni
++++ b/src/3rdparty/chromium/sandbox/features.gni
+@@ -11,7 +11,8 @@ import("//build/config/nacl/config.gni")
+ use_seccomp_bpf = (is_linux || is_chromeos || is_android) &&
+                   (current_cpu == "x86" || current_cpu == "x64" ||
+                    current_cpu == "arm" || current_cpu == "arm64" ||
+-                   current_cpu == "mipsel" || current_cpu == "mips64el")
++                   current_cpu == "mipsel" || current_cpu == "mips64el" ||
++                   current_cpu == "ppc64")
+ 
+ use_seccomp_bpf = use_seccomp_bpf || is_nacl_nonsfi
+ 
+--- a/src/3rdparty/chromium/sandbox/linux/BUILD.gn
++++ b/src/3rdparty/chromium/sandbox/linux/BUILD.gn
+@@ -433,6 +433,8 @@ component("sandbox_services") {
+ 
+ source_set("sandbox_services_headers") {
+   sources = [
++    "system_headers/ppc64_linux_syscalls.h",
++    "system_headers/ppc64_linux_ucontext.h",
+     "system_headers/arm64_linux_syscalls.h",
+     "system_headers/arm_linux_syscalls.h",
+     "system_headers/arm_linux_ucontext.h",
+--- a/src/3rdparty/chromium/sandbox/linux/bpf_dsl/linux_syscall_ranges.h
++++ b/src/3rdparty/chromium/sandbox/linux/bpf_dsl/linux_syscall_ranges.h
+@@ -56,6 +56,13 @@
+ #define MAX_PUBLIC_SYSCALL __NR_syscalls
+ #define MAX_SYSCALL MAX_PUBLIC_SYSCALL
+ 
++#elif defined(__powerpc64__)
++
++#include <asm/unistd.h>
++#define MIN_SYSCALL 0u
++#define MAX_PUBLIC_SYSCALL 386u
++#define MAX_SYSCALL MAX_PUBLIC_SYSCALL
++
+ #else
+ #error "Unsupported architecture"
+ #endif
+--- a/src/3rdparty/chromium/sandbox/linux/bpf_dsl/seccomp_macros.h
++++ b/src/3rdparty/chromium/sandbox/linux/bpf_dsl/seccomp_macros.h
+@@ -16,6 +16,9 @@
+ #if defined(__mips__)
+ // sys/user.h in eglibc misses size_t definition
+ #include <stddef.h>
++#elif defined(__powerpc64__) && defined(__GLIBC__)
++// Manually define greg_t on ppc64
++typedef unsigned long long greg_t;
+ #endif
+ #endif
+ 
+@@ -346,6 +349,59 @@ struct regs_struct {
+ #define SECCOMP_PT_PARM4(_regs) (_regs).regs[3]
+ #define SECCOMP_PT_PARM5(_regs) (_regs).regs[4]
+ #define SECCOMP_PT_PARM6(_regs) (_regs).regs[5]
++
++#elif defined(__powerpc64__)
++#include <asm/ptrace.h>
++
++typedef struct pt_regs regs_struct;
++
++#ifdef ARCH_CPU_LITTLE_ENDIAN
++#define SECCOMP_ARCH AUDIT_ARCH_PPC64LE
++#else
++#define SECCOMP_ARCH AUDIT_ARCH_PPC64
++#endif
++
++#ifdef __GLIBC__
++#define SECCOMP_REG(_ctx, _reg) ((_ctx)->uc_mcontext.regs->gpr[_reg])
++#else
++#define SECCOMP_REG(_ctx, _reg) (((struct pt_regs *)(_ctx)->uc_mcontext.regs)->gpr[_reg])
++#endif
++
++#define SECCOMP_RESULT(_ctx) SECCOMP_REG(_ctx, 3)
++#define SECCOMP_SYSCALL(_ctx) SECCOMP_REG(_ctx, 0)
++#ifdef __GLIBC__
++#define SECCOMP_IP(_ctx) (_ctx)->uc_mcontext.regs->nip
++#else
++#define SECCOMP_IP(_ctx) ((struct pt_regs *)(_ctx)->uc_mcontext.regs)->nip
++#endif
++#define SECCOMP_PARM1(_ctx) SECCOMP_REG(_ctx, 3)
++#define SECCOMP_PARM2(_ctx) SECCOMP_REG(_ctx, 4)
++#define SECCOMP_PARM3(_ctx) SECCOMP_REG(_ctx, 5)
++#define SECCOMP_PARM4(_ctx) SECCOMP_REG(_ctx, 6)
++#define SECCOMP_PARM5(_ctx) SECCOMP_REG(_ctx, 7)
++#define SECCOMP_PARM6(_ctx) SECCOMP_REG(_ctx, 8)
++
++#define SECCOMP_NR_IDX (offsetof(struct arch_seccomp_data, nr))
++#define SECCOMP_ARCH_IDX (offsetof(struct arch_seccomp_data, arch))
++#define SECCOMP_IP_MSB_IDX \
++  (offsetof(struct arch_seccomp_data, instruction_pointer) + 4)
++#define SECCOMP_IP_LSB_IDX \
++  (offsetof(struct arch_seccomp_data, instruction_pointer) + 0)
++#define SECCOMP_ARG_MSB_IDX(nr) \
++  (offsetof(struct arch_seccomp_data, args) + 8 * (nr) + 4)
++#define SECCOMP_ARG_LSB_IDX(nr) \
++  (offsetof(struct arch_seccomp_data, args) + 8 * (nr) + 0)
++
++#define SECCOMP_PT_RESULT(_regs) (_regs).gpr[3]
++#define SECCOMP_PT_SYSCALL(_regs) (_regs).gpr[0]
++#define SECCOMP_PT_IP(_regs) (_regs).nip
++#define SECCOMP_PT_PARM1(_regs) (_regs).gpr[3]
++#define SECCOMP_PT_PARM2(_regs) (_regs).gpr[4]
++#define SECCOMP_PT_PARM3(_regs) (_regs).gpr[5]
++#define SECCOMP_PT_PARM4(_regs) (_regs).gpr[6]
++#define SECCOMP_PT_PARM5(_regs) (_regs).gpr[7]
++#define SECCOMP_PT_PARM6(_regs) (_regs).gpr[8]
++
+ #else
+ #error Unsupported target platform
+ 
+--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc
++++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc
+@@ -90,7 +90,7 @@ bool IsBaselinePolicyWatched(int sysno)
+          SyscallSets::IsNuma(sysno) ||
+          SyscallSets::IsPrctl(sysno) ||
+          SyscallSets::IsProcessGroupOrSession(sysno) ||
+-#if defined(__i386__) || \
++#if defined(__i386__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+          SyscallSets::IsSocketCall(sysno) ||
+ #endif
+@@ -258,7 +258,7 @@ ResultExpr EvaluateSyscallImpl(int fs_de
+   }
+ 
+ #if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
+-    defined(__aarch64__)
++    defined(__aarch64__) || defined(__powerpc64__)
+   if (sysno == __NR_mmap)
+     return RestrictMmapFlags();
+ #endif
+@@ -279,7 +279,7 @@ ResultExpr EvaluateSyscallImpl(int fs_de
+     return RestrictPrctl();
+ 
+ #if defined(__x86_64__) || defined(__arm__) || defined(__mips__) || \
+-    defined(__aarch64__)
++    defined(__aarch64__) || defined(__powerpc64__)
+   if (sysno == __NR_socketpair) {
+     // Only allow AF_UNIX, PF_UNIX. Crash if anything else is seen.
+     static_assert(AF_UNIX == PF_UNIX,
+@@ -343,7 +343,8 @@ ResultExpr EvaluateSyscallImpl(int fs_de
+   }
+ 
+ #if defined(__i386__) || \
+-    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
++    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
++    defined(__powerpc64__)
+   if (SyscallSets::IsSocketCall(sysno))
+     return RestrictSocketcallCommand();
+ #endif
+--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/baseline_policy_unittest.cc
++++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/baseline_policy_unittest.cc
+@@ -317,7 +317,7 @@ TEST_BASELINE_SIGSYS(__NR_sysinfo)
+ TEST_BASELINE_SIGSYS(__NR_syslog)
+ TEST_BASELINE_SIGSYS(__NR_timer_create)
+ 
+-#if !defined(__aarch64__)
++#if !defined(__aarch64__) && !defined(__powerpc64__)
+ TEST_BASELINE_SIGSYS(__NR_inotify_init)
+ TEST_BASELINE_SIGSYS(__NR_vserver)
+ #endif
+--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc
++++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc
+@@ -40,6 +40,7 @@
+ #include <sys/ptrace.h>
+ #if (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) && \
+     !defined(__arm__) && !defined(__aarch64__) &&           \
++    !defined(__powerpc64__) &&                              \
+     !defined(PTRACE_GET_THREAD_AREA)
+ // Also include asm/ptrace-abi.h since ptrace.h in older libc (for instance
+ // the one in Ubuntu 16.04 LTS) is missing PTRACE_GET_THREAD_AREA.
+@@ -49,6 +50,11 @@
+ #endif
+ #endif  // !OS_NACL_NONSFI
+ 
++// On PPC64, TCGETS is defined in terms of struct termios, so we must include termios.h
++#ifdef __powerpc64__
++#include <termios.h>
++#endif
++
+ #if defined(OS_ANDROID)
+ 
+ #if !defined(F_DUPFD_CLOEXEC)
+@@ -106,6 +112,14 @@ inline bool IsArchitectureMips() {
+ #endif
+ }
+ 
++inline bool IsArchitecturePPC64() {
++#if defined(__powerpc64__)
++  return true;
++#else
++  return false;
++#endif
++}
++
+ // Ubuntu's version of glibc has a race condition in sem_post that can cause
+ // it to call futex(2) with bogus op arguments. To workaround this, we need
+ // to allow those futex(2) calls to fail with EINVAL, instead of crashing the
+@@ -270,6 +284,8 @@ ResultExpr RestrictFcntlCommands() {
+   uint64_t kOLargeFileFlag = O_LARGEFILE;
+   if (IsArchitectureX86_64() || IsArchitectureI386() || IsArchitectureMips())
+     kOLargeFileFlag = 0100000;
++  else if (IsArchitecturePPC64())
++    kOLargeFileFlag = 0200000;
+ 
+   const Arg<int> cmd(1);
+   const Arg<long> long_arg(2);
+@@ -287,7 +303,16 @@ ResultExpr RestrictFcntlCommands() {
+               F_SETLKW,
+               F_GETLK,
+               F_DUPFD,
+-              F_DUPFD_CLOEXEC),
++              F_DUPFD_CLOEXEC
++#if defined(__powerpc64__)
++// On PPC64, F_SETLK, F_GETLK, F_SETLKW are defined as the 64-bit variants
++// but glibc will sometimes still use the 32-bit versions. Allow both.
++              ,
++              5, /* F_GETLK (32) */
++              6, /* F_SETLK (32) */
++              7  /* F_SETLKW (32) */
++#endif
++	     ),
+              Allow())
+       .Case(F_SETFL,
+             If((long_arg & ~kAllowedMask) == 0, Allow()).Else(CrashSIGSYS()))
+@@ -297,7 +322,7 @@ ResultExpr RestrictFcntlCommands() {
+   // clang-format on
+ }
+ 
+-#if defined(__i386__) || defined(__mips__)
++#if defined(__i386__) || defined(__mips__) || defined(__powerpc64__)
+ ResultExpr RestrictSocketcallCommand() {
+   // Unfortunately, we are unable to restrict the first parameter to
+   // socketpair(2). Whilst initially sounding bad, it's noteworthy that very
+@@ -454,7 +479,7 @@ ResultExpr RestrictPtrace() {
+ #endif
+   return Switch(request)
+       .CASES((
+-#if !defined(__aarch64__)
++#if !defined(__aarch64__) && !defined(__powerpc64__)
+                  PTRACE_GETREGS, PTRACE_GETFPREGS,
+ #if defined(TRACE_GET_THREAD_AREA)
+                  PTRACE_GET_THREAD_AREA,
+--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.h
++++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.h
+@@ -49,7 +49,7 @@ SANDBOX_EXPORT bpf_dsl::ResultExpr Restr
+ // O_NONBLOCK | O_SYNC | O_LARGEFILE | O_CLOEXEC | O_NOATIME.
+ SANDBOX_EXPORT bpf_dsl::ResultExpr RestrictFcntlCommands();
+ 
+-#if defined(__i386__) || defined(__mips__)
++#if defined(__i386__) || defined(__mips__) || defined(__powerpc64__)
+ // Restrict socketcall(2) to only allow socketpair(2), send(2), recv(2),
+ // sendto(2), recvfrom(2), shutdown(2), sendmsg(2) and recvmsg(2).
+ SANDBOX_EXPORT bpf_dsl::ResultExpr RestrictSocketcallCommand();
+--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
++++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
+@@ -28,7 +28,7 @@ bool SyscallSets::IsKill(int sysno) {
+ bool SyscallSets::IsAllowedGettime(int sysno) {
+   switch (sysno) {
+     case __NR_gettimeofday:
+-#if defined(__i386__) || defined(__x86_64__) || \
++#if defined(__i386__) || defined(__x86_64__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_time:
+ #endif
+@@ -51,12 +51,12 @@ bool SyscallSets::IsAllowedGettime(int s
+                                     // filtered by RestrictClockID().
+     case __NR_clock_nanosleep_time64:  // Parameters filtered by RestrictClockID().
+ #endif
+-#if defined(__i386__) || \
++#if defined(__i386__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_ftime:  // Obsolete.
+ #endif
+     case __NR_settimeofday:  // Privileged.
+-#if defined(__i386__) || \
++#if defined(__i386__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_stime:
+ #endif
+@@ -135,7 +135,7 @@ bool SyscallSets::IsFileSystem(int sysno
+     case __NR_faccessat:  // EPERM not a valid errno.
+     case __NR_fchmodat:
+     case __NR_fchownat:  // Should be called chownat ?
+-#if defined(__x86_64__) || defined(__aarch64__)
++#if defined(__x86_64__) || defined(__aarch64__) || defined(__powerpc64__)
+     case __NR_newfstatat:  // fstatat(). EPERM not a valid errno.
+ #elif defined(__i386__) || defined(__arm__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+@@ -154,7 +154,7 @@ bool SyscallSets::IsFileSystem(int sysno
+     case __NR_memfd_create:
+     case __NR_mkdirat:
+     case __NR_mknodat:
+-#if defined(__i386__)
++#if defined(__i386__) || defined(__powerpc64__)
+     case __NR_oldlstat:
+     case __NR_oldstat:
+ #endif
+@@ -167,7 +167,7 @@ bool SyscallSets::IsFileSystem(int sysno
+     case __NR_stat64:
+ #endif
+     case __NR_statfs:  // EPERM not a valid errno.
+-#if defined(__i386__) || defined(__arm__) || \
++#if defined(__i386__) || defined(__arm__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_statfs64:
+ #endif
+@@ -179,7 +179,8 @@ bool SyscallSets::IsFileSystem(int sysno
+     case __NR_truncate64:
+ #endif
+     case __NR_unlinkat:
+-#if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
++#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
++    defined(__powerpc64__)
+     case __NR_utime:
+ #endif
+     case __NR_utimensat:  // New.
+@@ -204,7 +205,8 @@ bool SyscallSets::IsAllowedFileSystemAcc
+ #endif
+       return true;
+ // TODO(jln): these should be denied gracefully as well (moved below).
+-#if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
++#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
++    defined(__powerpc64__)
+     case __NR_fadvise64:  // EPERM not a valid errno.
+ #endif
+ #if defined(__i386__)
+@@ -216,12 +218,12 @@ bool SyscallSets::IsAllowedFileSystemAcc
+     case __NR_fdatasync:  // EPERM not a valid errno.
+     case __NR_flock:      // EPERM not a valid errno.
+     case __NR_fstatfs:    // Give information about the whole filesystem.
+-#if defined(__i386__) || defined(__arm__) || \
++#if defined(__i386__) || defined(__arm__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_fstatfs64:
+ #endif
+     case __NR_fsync:  // EPERM not a valid errno.
+-#if defined(__i386__)
++#if defined(__i386__) || defined(__powerpc64__)
+     case __NR_oldfstat:
+ #endif
+ #if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
+@@ -229,6 +231,8 @@ bool SyscallSets::IsAllowedFileSystemAcc
+     case __NR_sync_file_range:  // EPERM not a valid errno.
+ #elif defined(__arm__)
+     case __NR_arm_sync_file_range:  // EPERM not a valid errno.
++#elif defined(__powerpc64__)
++    case __NR_sync_file_range2: // EPERM not a valid errno.
+ #endif
+     default:
+       return false;
+@@ -248,7 +252,7 @@ bool SyscallSets::IsDeniedFileSystemAcce
+     case __NR_getdents:    // EPERM not a valid errno.
+ #endif
+     case __NR_getdents64:  // EPERM not a valid errno.
+-#if defined(__i386__) || \
++#if defined(__i386__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_readdir:
+ #endif
+@@ -290,7 +294,7 @@ bool SyscallSets::IsGetSimpleId(int sysn
+ bool SyscallSets::IsProcessPrivilegeChange(int sysno) {
+   switch (sysno) {
+     case __NR_capset:
+-#if defined(__i386__) || defined(__x86_64__)
++#if defined(__i386__) || defined(__x86_64__) || defined(__powerpc64__)
+     case __NR_ioperm:  // Intel privilege.
+     case __NR_iopl:    // Intel privilege.
+ #endif
+@@ -340,7 +344,7 @@ bool SyscallSets::IsAllowedSignalHandlin
+     case __NR_rt_sigprocmask:
+     case __NR_rt_sigreturn:
+     case __NR_rt_sigtimedwait:
+-#if defined(__i386__) || defined(__arm__) || \
++#if defined(__i386__) || defined(__arm__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_rt_sigtimedwait_time64:
+     case __NR_sigaction:
+@@ -357,7 +361,7 @@ bool SyscallSets::IsAllowedSignalHandlin
+     case __NR_signalfd:
+ #endif
+     case __NR_signalfd4:
+-#if defined(__i386__) || defined(__arm__) || \
++#if defined(__i386__) || defined(__arm__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_sigpending:
+     case __NR_sigsuspend:
+@@ -382,7 +386,7 @@ bool SyscallSets::IsAllowedOperationOnFd
+ #endif
+     case __NR_dup3:
+ #if defined(__x86_64__) || defined(__arm__) || defined(__mips__) || \
+-    defined(__aarch64__)
++    defined(__aarch64__) || defined(__powerpc64__)
+     case __NR_shutdown:
+ #endif
+       return true;
+@@ -416,7 +420,7 @@ bool SyscallSets::IsAllowedProcessStartO
+     case __NR_membarrier:
+     case __NR_wait4:
+     case __NR_waitid:
+-#if defined(__i386__)
++#if defined(__i386__) || defined(__powerpc64__)
+     case __NR_waitpid:
+ #endif
+ #if !defined(__GLIBC__)
+@@ -438,7 +442,7 @@ bool SyscallSets::IsAllowedProcessStartO
+     case __NR_set_tid_address:
+ #endif
+     case __NR_unshare:
+-#if !defined(__mips__) && !defined(__aarch64__)
++#if !defined(__mips__) && !defined(__aarch64__) || defined(__powerpc64__)
+     case __NR_vfork:
+ #endif
+     default:
+@@ -491,7 +495,7 @@ bool SyscallSets::IsAllowedGetOrModifySo
+       return true;
+     default:
+ #if defined(__x86_64__) || defined(__arm__) || defined(__mips__) || \
+-    defined(__aarch64__)
++    defined(__aarch64__) || defined(__powerpc64__)
+     case __NR_socketpair:  // We will want to inspect its argument.
+ #endif
+       return false;
+@@ -501,7 +505,7 @@ bool SyscallSets::IsAllowedGetOrModifySo
+ bool SyscallSets::IsDeniedGetOrModifySocket(int sysno) {
+   switch (sysno) {
+ #if defined(__x86_64__) || defined(__arm__) || defined(__mips__) || \
+-    defined(__aarch64__)
++    defined(__aarch64__) || defined(__powerpc64__)
+     case __NR_accept:
+     case __NR_accept4:
+     case __NR_bind:
+@@ -515,7 +519,7 @@ bool SyscallSets::IsDeniedGetOrModifySoc
+   }
+ }
+ 
+-#if defined(__i386__) || \
++#if defined(__i386__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+ // Big multiplexing system call for sockets.
+ bool SyscallSets::IsSocketCall(int sysno) {
+@@ -530,7 +534,8 @@ bool SyscallSets::IsSocketCall(int sysno
+ }
+ #endif
+ 
+-#if defined(__x86_64__) || defined(__arm__) || defined(__mips__)
++#if defined(__x86_64__) || defined(__arm__) || defined(__mips__) || \
++    defined(__powerpc64__)
+ bool SyscallSets::IsNetworkSocketInformation(int sysno) {
+   switch (sysno) {
+     case __NR_getpeername:
+@@ -558,7 +563,7 @@ bool SyscallSets::IsAllowedAddressSpaceA
+     case __NR_mincore:
+     case __NR_mlockall:
+ #if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
+-    defined(__aarch64__)
++    defined(__aarch64__) || defined(__powerpc64__)
+     case __NR_mmap:
+ #endif
+ #if defined(__i386__) || defined(__arm__) || \
+@@ -589,7 +594,7 @@ bool SyscallSets::IsAllowedAddressSpaceA
+ bool SyscallSets::IsAllowedGeneralIo(int sysno) {
+   switch (sysno) {
+     case __NR_lseek:
+-#if defined(__i386__) || defined(__arm__) || \
++#if defined(__i386__) || defined(__arm__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR__llseek:
+ #endif
+@@ -609,27 +614,27 @@ bool SyscallSets::IsAllowedGeneralIo(int
+     case __NR_read:
+     case __NR_readv:
+     case __NR_pread64:
+-#if defined(__arm__) || \
++#if defined(__arm__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_recv:
+ #endif
+ #if defined(__x86_64__) || defined(__arm__) || defined(__mips__) || \
+-    defined(__aarch64__)
++    defined(__aarch64__) || defined(__powerpc64__)
+     case __NR_recvfrom:  // Could specify source.
+     case __NR_recvmsg:   // Could specify source.
+ #endif
+-#if defined(__i386__) || defined(__x86_64__)
++#if defined(__i386__) || defined(__x86_64__) || defined(__powerpc64__)
+     case __NR_select:
+ #endif
+-#if defined(__i386__) || defined(__arm__) || defined(__mips__)
++#if defined(__i386__) || defined(__arm__) || defined(__mips__) || defined(__powerpc64__)
+     case __NR__newselect:
+ #endif
+-#if defined(__arm__) || \
++#if defined(__arm__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_send:
+ #endif
+ #if defined(__x86_64__) || defined(__arm__) || defined(__mips__) || \
+-    defined(__aarch64__)
++    defined(__aarch64__) || defined(__powerpc64__)
+     case __NR_sendmsg:  // Could specify destination.
+     case __NR_sendto:   // Could specify destination.
+ #endif
+@@ -684,7 +689,7 @@ bool SyscallSets::IsAllowedBasicSchedule
+     case __NR_nanosleep:
+       return true;
+     case __NR_getpriority:
+-#if defined(__i386__) || defined(__arm__) || \
++#if defined(__i386__) || defined(__arm__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_nice:
+ #endif
+@@ -696,7 +701,7 @@ bool SyscallSets::IsAllowedBasicSchedule
+ 
+ bool SyscallSets::IsAdminOperation(int sysno) {
+   switch (sysno) {
+-#if defined(__i386__) || defined(__arm__) || \
++#if defined(__i386__) || defined(__arm__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_bdflush:
+ #endif
+@@ -713,7 +718,8 @@ bool SyscallSets::IsAdminOperation(int s
+ 
+ bool SyscallSets::IsKernelModule(int sysno) {
+   switch (sysno) {
+-#if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
++#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
++    defined(__powerpc64__)
+     case __NR_create_module:
+     case __NR_get_kernel_syms:  // Should ENOSYS.
+     case __NR_query_module:
+@@ -745,7 +751,7 @@ bool SyscallSets::IsFsControl(int sysno)
+     case __NR_quotactl:
+     case __NR_swapoff:
+     case __NR_swapon:
+-#if defined(__i386__) || \
++#if defined(__i386__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_umount:
+ #endif
+@@ -762,7 +768,7 @@ bool SyscallSets::IsNuma(int sysno) {
+     case __NR_getcpu:
+     case __NR_mbind:
+ #if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
+-    defined(__aarch64__)
++    defined(__aarch64__) || defined(__powerpc64__)
+     case __NR_migrate_pages:
+ #endif
+     case __NR_move_pages:
+@@ -797,13 +803,13 @@ bool SyscallSets::IsGlobalProcessEnviron
+   switch (sysno) {
+     case __NR_acct:  // Privileged.
+ #if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
+-    defined(__aarch64__)
++    defined(__aarch64__) || defined(__powerpc64__)
+     case __NR_getrlimit:
+ #endif
+-#if defined(__i386__) || defined(__arm__)
++#if defined(__i386__) || defined(__arm__) || defined(__powerpc64__)
+     case __NR_ugetrlimit:
+ #endif
+-#if defined(__i386__) || \
++#if defined(__i386__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_ulimit:
+ #endif
+@@ -838,7 +844,7 @@ bool SyscallSets::IsGlobalSystemStatus(i
+ #endif
+     case __NR_sysinfo:
+     case __NR_uname:
+-#if defined(__i386__)
++#if defined(__i386__) || defined(__powerpc64__)
+     case __NR_olduname:
+     case __NR_oldolduname:
+ #endif
+@@ -904,8 +910,16 @@ bool SyscallSets::IsSystemVSemaphores(in
+ }
+ #endif
+ 
++/* shitty hack around Void's 4.19 kernel headers missing those numbers */
++#if defined(__powerpc64__) && !defined(__NR_shmget)
++#define __NR_shmget 395
++#define __NR_shmctl 396
++#define __NR_shmat 397
++#define __NR_shmdt 398
++#endif
++
+ #if defined(__i386__) || defined(__x86_64__) || defined(__arm__) || \
+-    defined(__aarch64__) ||                                         \
++    defined(__aarch64__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_64_BITS))
+ // These give a lot of ambient authority and bypass the setuid sandbox.
+ bool SyscallSets::IsSystemVSharedMemory(int sysno) {
+@@ -936,7 +950,7 @@ bool SyscallSets::IsSystemVMessageQueue(
+ }
+ #endif
+ 
+-#if defined(__i386__) || \
++#if defined(__i386__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+ // Big system V multiplexing system call.
+ bool SyscallSets::IsSystemVIpc(int sysno) {
+@@ -956,7 +970,7 @@ bool SyscallSets::IsAnySystemV(int sysno
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_64_BITS))
+   return IsSystemVMessageQueue(sysno) || IsSystemVSemaphores(sysno) ||
+          IsSystemVSharedMemory(sysno);
+-#elif defined(__i386__) || \
++#elif defined(__i386__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+   return IsSystemVIpc(sysno);
+ #endif
+@@ -1014,7 +1028,8 @@ bool SyscallSets::IsFaNotify(int sysno)
+ bool SyscallSets::IsTimer(int sysno) {
+   switch (sysno) {
+     case __NR_getitimer:
+-#if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
++#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
++    defined(__powerpc64__)
+     case __NR_alarm:
+ #endif
+     case __NR_setitimer:
+@@ -1096,17 +1111,20 @@ bool SyscallSets::IsMisc(int sysno) {
+     case __NR_syncfs:
+     case __NR_vhangup:
+ // The system calls below are not implemented.
+-#if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
++#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
++    defined(__powerpc64__)
+     case __NR_afs_syscall:
+ #endif
+ #if defined(__i386__) || \
+-    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
++    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
++    defined(__powerpc64__)
+     case __NR_break:
+ #endif
+-#if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
++#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
++    defined(__powerpc64__)
+     case __NR_getpmsg:
+ #endif
+-#if defined(__i386__) || \
++#if defined(__i386__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_gtty:
+     case __NR_idle:
+@@ -1115,20 +1133,21 @@ bool SyscallSets::IsMisc(int sysno) {
+     case __NR_prof:
+     case __NR_profil:
+ #endif
+-#if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
++#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
++    defined(__powerpc64__)
+     case __NR_putpmsg:
+ #endif
+ #if defined(__x86_64__)
+     case __NR_security:
+ #endif
+-#if defined(__i386__) || \
++#if defined(__i386__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_stty:
+ #endif
+-#if defined(__x86_64__)
++#if defined(__x86_64__) || defined(__powerpc64__)
+     case __NR_tuxcall:
+ #endif
+-#if !defined(__aarch64__)
++#if !defined(__aarch64__) && !defined(__powerpc64__)
+     case __NR_vserver:
+ #endif
+       return true;
+--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_sets.h
++++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_sets.h
+@@ -43,13 +43,14 @@ class SANDBOX_EXPORT SyscallSets {
+   static bool IsDeniedGetOrModifySocket(int sysno);
+ 
+ #if defined(__i386__) || \
+-    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
++    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
++    defined(__powerpc64__)
+   // Big multiplexing system call for sockets.
+   static bool IsSocketCall(int sysno);
+ #endif
+ 
+ #if defined(__x86_64__) || defined(__arm__) || defined(__mips__) || \
+-    defined(__aarch64__)
++    defined(__aarch64__) || defined(__powerpc64__)
+   static bool IsNetworkSocketInformation(int sysno);
+ #endif
+ 
+@@ -77,7 +78,7 @@ class SANDBOX_EXPORT SyscallSets {
+   static bool IsSystemVSemaphores(int sysno);
+ #endif
+ #if defined(__i386__) || defined(__x86_64__) || defined(__arm__) || \
+-    defined(__aarch64__) ||                                         \
++    defined(__aarch64__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_64_BITS))
+   // These give a lot of ambient authority and bypass the setuid sandbox.
+   static bool IsSystemVSharedMemory(int sysno);
+@@ -89,7 +90,8 @@ class SANDBOX_EXPORT SyscallSets {
+ #endif
+ 
+ #if defined(__i386__) || \
+-    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
++    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
++    defined(__powerpc64__)
+   // Big system V multiplexing system call.
+   static bool IsSystemVIpc(int sysno);
+ #endif
+--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf/syscall.cc
++++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf/syscall.cc
+@@ -18,7 +18,7 @@ namespace sandbox {
+ namespace {
+ 
+ #if defined(ARCH_CPU_X86_FAMILY) || defined(ARCH_CPU_ARM_FAMILY) || \
+-    defined(ARCH_CPU_MIPS_FAMILY)
++    defined(ARCH_CPU_MIPS_FAMILY) || defined (ARCH_CPU_PPC64_FAMILY)
+ // Number that's not currently used by any Linux kernel ABIs.
+ const int kInvalidSyscallNumber = 0x351d3;
+ #else
+@@ -312,10 +312,54 @@ asm(// We need to be able to tell the ke
+     "2:ret\n"
+     ".cfi_endproc\n"
+     ".size SyscallAsm, .-SyscallAsm\n"
++#elif defined(__powerpc64__)
++    ".text\n"
++    ".align 4\n"
++    ".type SyscallAsm @function\n"
++    "SyscallAsm:\n"
++    ".cfi_startproc\n"
++
++    // Check if r3 is negative
++    "cmpdi 3, 0\n"
++    "bgt 2f\n"
++
++    // Load address of 3f into r3 and return
++    "mflr 10\n"
++    "bl 1f\n"
++    "1: mflr 3\n"
++    "mtlr 10\n"
++    "addi 3, 3, 4*13\n"
++    "blr\n"
++
++    // Load arguments from array into r3-8
++    // save param 3 in r10
++    "2:\n"
++    "mr 0, 3\n"
++    "ld 3, 0(4)\n"
++    "ld 5, 16(4)\n"
++    "ld 6, 24(4)\n"
++    "ld 7, 32(4)\n"
++    "ld 8, 40(4)\n"
++    "ld 4, 8(4)\n"
++    "li 9, 0\n"
++
++    // Enter kernel
++    "sc\n"
++
++    // Magic return address
++    "3:\n"
++    // Like MIPS, ppc64 return values are always positive.
++    // Check for error in cr0.SO and negate upon error
++    "bc 4, 3, 4f\n"
++    "neg 3, 3\n"
++    "4: blr\n"
++
++    ".cfi_endproc\n"
++    ".size SyscallAsm, .-SyscallAsm\n"
+ #endif
+     );  // asm
+ 
+-#if defined(__x86_64__)
++#if defined(__x86_64__) || defined(__powerpc64__)
+ extern "C" {
+ intptr_t SyscallAsm(intptr_t nr, const intptr_t args[6]);
+ }
+@@ -429,6 +473,8 @@ intptr_t Syscall::Call(int nr,
+     ret = inout;
+   }
+ 
++#elif defined(__powerpc64__)
++  intptr_t ret = SyscallAsm(nr, args);
+ #else
+ #error "Unimplemented architecture"
+ #endif
+@@ -445,8 +491,26 @@ void Syscall::PutValueInUcontext(intptr_
+     // needs to be changed back.
+     ret_val = -ret_val;
+     SECCOMP_PARM4(ctx) = 1;
+-  } else
++  } else {
+     SECCOMP_PARM4(ctx) = 0;
++  }
++#endif
++#if defined(__powerpc64__)
++  // Same as MIPS, need to invert ret and set error register (cr0.SO)
++  if (ret_val <= -1 && ret_val >= -4095) {
++    ret_val = -ret_val;
++#ifdef __GLIBC__
++    ctx->uc_mcontext.regs->ccr |= (1 << 28);
++#else
++    ((struct pt_regs *)ctx->uc_mcontext.regs)->ccr |= (1 << 28);
++#endif
++  } else {
++#ifdef __GLIBC__
++    ctx->uc_mcontext.regs->ccr &= ~(1 << 28);
++#else
++    ((struct pt_regs *)ctx->uc_mcontext.regs)->ccr &= ~(1 << 28);
++#endif
++  }
+ #endif
+   SECCOMP_RESULT(ctx) = static_cast<greg_t>(ret_val);
+ }
+--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf/trap.cc
++++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf/trap.cc
+@@ -236,6 +236,20 @@ void Trap::SigSys(int nr, LinuxSigInfo*
+       SetIsInSigHandler();
+     }
+ 
++#if defined(__powerpc64__)
++    // On ppc64+glibc, some syscalls seem to accidentally negate the first
++    // parameter which causes checks against it to fail. For now, manually
++    // negate them back.
++    // TODO(shawn@anastas.io): investigate this issue further
++    auto nr = SECCOMP_SYSCALL(ctx);
++    if (nr == __NR_openat || nr == __NR_mkdirat || nr == __NR_faccessat || nr == __NR_readlinkat ||
++        nr == __NR_renameat || nr == __NR_renameat2 || nr == __NR_newfstatat || nr == __NR_unlinkat) {
++        if (static_cast<int>(SECCOMP_PARM1(ctx)) > 0) {
++            SECCOMP_PARM1(ctx) = -SECCOMP_PARM1(ctx);
++        }
++    }
++#endif
++
+     // Copy the seccomp-specific data into a arch_seccomp_data structure. This
+     // is what we are showing to TrapFnc callbacks that the system call
+     // evaluator registered with the sandbox.
+--- a/src/3rdparty/chromium/sandbox/linux/services/credentials.cc
++++ b/src/3rdparty/chromium/sandbox/linux/services/credentials.cc
+@@ -81,7 +81,7 @@ bool ChrootToSafeEmptyDir() {
+   pid_t pid = -1;
+   alignas(16) char stack_buf[PTHREAD_STACK_MIN];
+ #if defined(ARCH_CPU_X86_FAMILY) || defined(ARCH_CPU_ARM_FAMILY) || \
+-    defined(ARCH_CPU_MIPS_FAMILY)
++    defined(ARCH_CPU_MIPS_FAMILY) || defined(ARCH_CPU_PPC64_FAMILY)
+   // The stack grows downward.
+   void* stack = stack_buf + sizeof(stack_buf);
+ #else
+--- a/src/3rdparty/chromium/sandbox/linux/services/syscall_wrappers.cc
++++ b/src/3rdparty/chromium/sandbox/linux/services/syscall_wrappers.cc
+@@ -61,7 +61,7 @@ long sys_clone(unsigned long flags,
+ #if defined(ARCH_CPU_X86_64)
+   return syscall(__NR_clone, flags, child_stack, ptid, ctid, tls);
+ #elif defined(ARCH_CPU_X86) || defined(ARCH_CPU_ARM_FAMILY) || \
+-    defined(ARCH_CPU_MIPS_FAMILY)
++    defined(ARCH_CPU_MIPS_FAMILY) || defined(ARCH_CPU_PPC64_FAMILY)
+   // CONFIG_CLONE_BACKWARDS defined.
+   return syscall(__NR_clone, flags, child_stack, ptid, tls, ctid);
+ #endif
+--- a/src/3rdparty/chromium/sandbox/linux/syscall_broker/broker_process.cc
++++ b/src/3rdparty/chromium/sandbox/linux/syscall_broker/broker_process.cc
+@@ -165,7 +165,7 @@ bool BrokerProcess::IsSyscallBrokerable(
+ #if defined(__NR_fstatat64)
+     case __NR_fstatat64:
+ #endif
+-#if defined(__x86_64__) || defined(__aarch64__)
++#if defined(__x86_64__) || defined(__aarch64__) || defined(__powerpc64__)
+     case __NR_newfstatat:
+ #endif
+       return !fast_check || allowed_command_set_.test(COMMAND_STAT);
+--- a/src/3rdparty/chromium/sandbox/linux/system_headers/linux_seccomp.h
++++ b/src/3rdparty/chromium/sandbox/linux/system_headers/linux_seccomp.h
+@@ -41,6 +41,9 @@
+ #ifndef EM_AARCH64
+ #define EM_AARCH64 183
+ #endif
++#ifndef EM_PPC64
++#define EM_PPC64 21
++#endif
+ 
+ #ifndef __AUDIT_ARCH_64BIT
+ #define __AUDIT_ARCH_64BIT 0x80000000
+@@ -74,6 +77,14 @@
+ #define AUDIT_ARCH_AARCH64 (EM_AARCH64 | __AUDIT_ARCH_64BIT | __AUDIT_ARCH_LE)
+ #endif
+ 
++#ifndef AUDIT_ARCH_PPC64
++#define AUDIT_ARCH_PPC64 (EM_PPC64 | __AUDIT_ARCH_64BIT)
++#endif
++
++#ifndef AUDIT_ARCH_PPC64LE
++#define AUDIT_ARCH_PPC64LE (EM_PPC64 | __AUDIT_ARCH_64BIT | __AUDIT_ARCH_LE)
++#endif
++
+ // For prctl.h
+ #ifndef PR_SET_SECCOMP
+ #define PR_SET_SECCOMP               22
+--- a/src/3rdparty/chromium/sandbox/linux/system_headers/linux_signal.h
++++ b/src/3rdparty/chromium/sandbox/linux/system_headers/linux_signal.h
+@@ -13,7 +13,7 @@
+ // (not undefined, but defined different values and in different memory
+ // layouts). So, fill the gap here.
+ #if defined(__i386__) || defined(__x86_64__) || defined(__arm__) || \
+-    defined(__aarch64__)
++    defined(__aarch64__) || defined(__powerpc64__)
+ 
+ #define LINUX_SIGHUP 1
+ #define LINUX_SIGINT 2
+--- a/src/3rdparty/chromium/sandbox/linux/system_headers/linux_syscalls.h
++++ b/src/3rdparty/chromium/sandbox/linux/system_headers/linux_syscalls.h
+@@ -35,5 +35,9 @@
+ #include "sandbox/linux/system_headers/arm64_linux_syscalls.h"
+ #endif
+ 
++#if defined(__powerpc64__)
++#include "sandbox/linux/system_headers/ppc64_linux_syscalls.h"
++#endif
++
+ #endif  // SANDBOX_LINUX_SYSTEM_HEADERS_LINUX_SYSCALLS_H_
+ 
+--- a/src/3rdparty/chromium/sandbox/linux/system_headers/linux_ucontext.h
++++ b/src/3rdparty/chromium/sandbox/linux/system_headers/linux_ucontext.h
+@@ -11,6 +11,8 @@
+ #include "sandbox/linux/system_headers/arm_linux_ucontext.h"
+ #elif defined(__i386__)
+ #include "sandbox/linux/system_headers/i386_linux_ucontext.h"
++#elif defined(__powerpc64__)
++#include "sandbox/linux/system_headers/ppc64_linux_ucontext.h"
+ #else
+ #error "No support for your architecture in PNaCl header"
+ #endif
+--- a/src/3rdparty/chromium/sandbox/policy/linux/bpf_renderer_policy_linux.cc
++++ b/src/3rdparty/chromium/sandbox/policy/linux/bpf_renderer_policy_linux.cc
+@@ -15,6 +15,11 @@
+ #include "sandbox/linux/system_headers/linux_syscalls.h"
+ #include "sandbox/policy/linux/sandbox_linux.h"
+ 
++// On PPC64, TCGETS is defined in terms of struct termios, so we must include termios.h
++#ifdef __powerpc64__
++#include <termios.h>
++#endif
++
+ // TODO(vignatti): replace the local definitions below with #include
+ // <linux/dma-buf.h> once kernel version 4.6 becomes widely used.
+ #include <linux/types.h>
+--- a/src/3rdparty/chromium/third_party/angle/src/compiler/translator/InfoSink.h
++++ b/src/3rdparty/chromium/third_party/angle/src/compiler/translator/InfoSink.h
+@@ -93,7 +93,16 @@ class TInfoSinkBase
+             stream.precision(8);
+             stream << f;
+         }
+-        sink.append(stream.str());
++
++        // Hack to work around a bug where negative floating point values
++        // are rendered like '.0.5' instead of '-0.5'
++        std::string res(stream.str());
++
++        if (signbit(f)) { // test if f is negative
++            res[0] = '-';
++        }
++
++        sink.append(res);
+         return *this;
+     }
+     // Write boolean values as their names instead of integral value.
+--- a/src/3rdparty/chromium/third_party/angle/src/libANGLE/Constants.h
++++ b/src/3rdparty/chromium/third_party/angle/src/libANGLE/Constants.h
+@@ -9,6 +9,7 @@
+ #ifndef LIBANGLE_CONSTANTS_H_
+ #define LIBANGLE_CONSTANTS_H_
+ 
++#include <cstddef>
+ #include "common/platform.h"
+ 
+ #include <stdint.h>
+--- a/src/3rdparty/chromium/third_party/boringssl/BUILD.gn
++++ b/src/3rdparty/chromium/third_party/boringssl/BUILD.gn
+@@ -99,6 +99,13 @@ if (is_win && !is_msan && current_cpu !=
+       } else {
+         public_configs = [ ":no_asm_config" ]
+       }
++    } else if (current_cpu == "ppc64") {
++      if (is_linux) {
++        # TODO: ppc64 (be) check
++        sources += crypto_sources_linux_ppc64le
++      } else {
++        public_configs = [ ":no_asm_config" ]
++      }
+     } else {
+       public_configs = [ ":no_asm_config" ]
+     }
+--- a/src/3rdparty/chromium/third_party/breakpad/BUILD.gn
++++ b/src/3rdparty/chromium/third_party/breakpad/BUILD.gn
+@@ -623,7 +623,6 @@ if (is_linux || is_chromeos || is_androi
+       "breakpad/src/client/minidump_file_writer.h",
+       "breakpad/src/common/convert_UTF.cc",
+       "breakpad/src/common/convert_UTF.h",
+-      "breakpad/src/common/linux/breakpad_getcontext.S",
+       "breakpad/src/common/linux/elf_core_dump.cc",
+       "breakpad/src/common/linux/elf_core_dump.h",
+       "breakpad/src/common/linux/elfutils.cc",
+@@ -663,6 +662,15 @@ if (is_linux || is_chromeos || is_androi
+ 
+     libs = [ "dl" ]
+ 
++    if (current_cpu == "ppc64") {
++        defines = [ "HAVE_GETCONTEXT" ]
++        libs += [ "ucontext" ]
++    } else {
++        sources += [
++            "breakpad/src/common/linux/breakpad_getcontext.S"
++        ]
++    }
++
+     include_dirs = [
+       ".",
+       "breakpad/src",
+@@ -712,7 +720,6 @@ if (is_linux || is_chromeos || is_androi
+       "breakpad/src/client/linux/minidump_writer/minidump_writer_unittest.cc",
+       "breakpad/src/client/linux/minidump_writer/minidump_writer_unittest_utils.cc",
+       "breakpad/src/client/linux/minidump_writer/proc_cpuinfo_reader_unittest.cc",
+-      "breakpad/src/common/linux/breakpad_getcontext_unittest.cc",
+       "breakpad/src/common/linux/elf_core_dump_unittest.cc",
+       "breakpad/src/common/linux/file_id_unittest.cc",
+       "breakpad/src/common/linux/linux_libc_support_unittest.cc",
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/raw_context_cpu.h
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/raw_context_cpu.h
+@@ -44,6 +44,8 @@ typedef MDRawContextARM RawContextCPU;
+ typedef MDRawContextARM64_Old RawContextCPU;
+ #elif defined(__mips__)
+ typedef MDRawContextMIPS RawContextCPU;
++#elif defined(__powerpc64__)
++typedef MDRawContextPPC64 RawContextCPU;
+ #else
+ #error "This code has not been ported to your platform yet."
+ #endif
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.cc
+@@ -270,7 +270,54 @@ void ThreadInfo::FillCPUContext(RawConte
+   out->float_save.fir = mcontext.fpc_eir;
+ #endif
+ }
+-#endif  // __mips__
++
++#elif defined(__powerpc64__)
++
++#if !defined(__GLIBC__)
++#include <asm/elf.h>
++#include <asm/ptrace.h>
++#endif
++
++uintptr_t ThreadInfo::GetInstructionPointer() const {
++    return mcontext.gp_regs[PT_NIP];
++}
++
++void ThreadInfo::FillCPUContext(RawContextCPU* out) const {
++    out->context_flags = MD_CONTEXT_PPC64_FULL;
++    for (int i = 0; i < MD_CONTEXT_PPC64_GPR_COUNT; i++)
++        out->gpr[i] = mcontext.gp_regs[i];
++
++    out->lr = mcontext.gp_regs[PT_LNK];
++    out->srr0 = mcontext.gp_regs[PT_NIP];
++    out->srr1 = mcontext.gp_regs[PT_MSR];
++    out->cr = mcontext.gp_regs[PT_CCR];
++    out->xer = mcontext.gp_regs[PT_XER];
++    out->ctr = mcontext.gp_regs[PT_CTR];
++
++#ifdef __GLIBC__
++    for (int i = 0; i < MD_FLOATINGSAVEAREA_PPC_FPR_COUNT; i++)
++        out->float_save.fpregs[i] = mcontext.fp_regs[i];
++
++    out->float_save.fpscr = mcontext.fp_regs[NFPREG-1];
++#else
++    for (int i = 0; i < MD_FLOATINGSAVEAREA_PPC_FPR_COUNT; i++)
++        out->float_save.fpregs[i] = ((uint64_t *)&mcontext.fp_regs)[i];
++
++     out->float_save.fpscr = ((uint64_t *)&mcontext.fp_regs)[ELF_NFPREG-1];
++#endif
++
++    for (int i = 0; i < MD_VECTORSAVEAREA_PPC_VR_COUNT; i++)
++        out->vector_save.save_vr[i] = \
++            {(((uint64_t)vregs.vrregs[i][0]) << 32)
++                          | vregs.vrregs[i][1],
++            (((uint64_t)vregs.vrregs[i][2]) << 32)
++                         | vregs.vrregs[i][3]};
++
++    out->vrsave = vregs.vrsave;
++    out->vector_save.save_vscr = {0, vregs.vscr.vscr_word};
++    out->vector_save.save_vrvalid = 0xFFFFFFFF;
++}
++#endif  // __powerpc64__
+ 
+ void ThreadInfo::GetGeneralPurposeRegisters(void** gp_regs, size_t* size) {
+   assert(gp_regs || size);
+@@ -279,6 +326,11 @@ void ThreadInfo::GetGeneralPurposeRegist
+     *gp_regs = mcontext.gregs;
+   if (size)
+     *size = sizeof(mcontext.gregs);
++#elif defined(__powerpc64__)
++  if (gp_regs)
++    *gp_regs = mcontext.gp_regs;
++  if (size)
++    *size = sizeof(mcontext.gp_regs);
+ #else
+   if (gp_regs)
+     *gp_regs = &regs;
+@@ -294,6 +346,11 @@ void ThreadInfo::GetFloatingPointRegiste
+     *fp_regs = &mcontext.fpregs;
+   if (size)
+     *size = sizeof(mcontext.fpregs);
++#elif defined(__powerpc64__)
++  if (fp_regs)
++    *fp_regs = &mcontext.fp_regs;
++  if (size)
++    *size = sizeof(mcontext.fp_regs);
+ #else
+   if (fp_regs)
+     *fp_regs = &fpregs;
+@@ -302,4 +359,13 @@ void ThreadInfo::GetFloatingPointRegiste
+ #endif
+ }
+ 
++#if defined(__powerpc64__)
++void ThreadInfo::GetVectorRegisters(void** v_regs, size_t* size) {
++    if (v_regs)
++        *v_regs = &vregs;
++    if (size)
++        *size = sizeof(vregs);
++}
++#endif
++
+ }  // namespace google_breakpad
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.h
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.h
+@@ -68,6 +68,10 @@ struct ThreadInfo {
+   // Use the structures defined in <sys/user.h>
+   struct user_regs_struct regs;
+   struct user_fpsimd_struct fpregs;
++#elif defined(__powerpc64__)
++  // Use the structures defined in <sys/ucontext.h>.
++  mcontext_t mcontext;
++  vrregset_t vregs;
+ #elif defined(__mips__)
+   // Use the structure defined in <sys/ucontext.h>.
+   mcontext_t mcontext;
+@@ -84,6 +88,11 @@ struct ThreadInfo {
+ 
+   // Returns the pointer and size of float point register area.
+   void GetFloatingPointRegisters(void** fp_regs, size_t* size);
++
++#if defined(__powerpc64__)
++  // Returns the pointer and size of the vector register area. (PPC64 only)
++  void GetVectorRegisters(void** v_regs, size_t* size);
++#endif
+ };
+ 
+ }  // namespace google_breakpad
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc
+@@ -254,6 +254,60 @@ void UContextReader::FillCPUContext(RawC
+   out->float_save.fir = uc->uc_mcontext.fpc_eir;  // Unused.
+ #endif
+ }
++
++#elif defined(__powerpc64__)
++
++#ifndef __GLIBC__
++#include <asm/elf.h>
++#include <asm/ptrace.h>
++#endif
++
++uintptr_t UContextReader::GetStackPointer(const ucontext_t* uc) {
++    return uc->uc_mcontext.gp_regs[MD_CONTEXT_PPC64_REG_SP];
++}
++
++uintptr_t UContextReader::GetInstructionPointer(const ucontext_t* uc) {
++    return uc->uc_mcontext.gp_regs[PT_NIP];
++}
++
++void UContextReader::FillCPUContext(RawContextCPU* out, const ucontext_t* uc,
++                                    const vrregset_t* vregs) {
++    out->context_flags = MD_CONTEXT_PPC64_FULL;
++
++    for (int i = 0; i < MD_CONTEXT_PPC64_GPR_COUNT; i++)
++        out->gpr[i] = uc->uc_mcontext.gp_regs[i];
++
++    out->lr = uc->uc_mcontext.gp_regs[PT_LNK];
++    out->srr0 = uc->uc_mcontext.gp_regs[PT_NIP];
++    out->srr1 = uc->uc_mcontext.gp_regs[PT_MSR];
++    out->cr = uc->uc_mcontext.gp_regs[PT_CCR];
++    out->xer = uc->uc_mcontext.gp_regs[PT_XER];
++    out->ctr = uc->uc_mcontext.gp_regs[PT_CTR];
++
++#ifdef __GLIBC__
++    for (int i = 0; i < MD_FLOATINGSAVEAREA_PPC_FPR_COUNT; i++)
++        out->float_save.fpregs[i] = uc->uc_mcontext.fp_regs[i];
++
++    out->float_save.fpscr = uc->uc_mcontext.fp_regs[NFPREG-1];
++#else
++    for (int i = 0; i < MD_FLOATINGSAVEAREA_PPC_FPR_COUNT; i++)
++        out->float_save.fpregs[i] = ((uint64_t *)&uc->uc_mcontext.fp_regs)[i];
++
++    out->float_save.fpscr = ((uint64_t *)&uc->uc_mcontext.fp_regs)[ELF_NFPREG-1];
++#endif
++
++    for (int i = 0; i < MD_VECTORSAVEAREA_PPC_VR_COUNT; i++)
++        out->vector_save.save_vr[i] =
++            {(((uint64_t)vregs->vrregs[i][0]) << 32)
++                         | vregs->vrregs[i][1],
++             (((uint64_t)vregs->vrregs[i][2]) << 32)
++                         | vregs->vrregs[i][3]};
++
++    out->vrsave = vregs->vrsave;
++    out->vector_save.save_vscr = {0, vregs->vscr.vscr_word};
++    out->vector_save.save_vrvalid = 0xFFFFFFFF;
++}
++
+ #endif
+ 
+ }  // namespace google_breakpad
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h
+@@ -59,6 +59,9 @@ struct UContextReader {
+ #elif defined(__aarch64__)
+   static void FillCPUContext(RawContextCPU* out, const ucontext_t* uc,
+                              const struct fpsimd_context* fpregs);
++#elif defined(__powerpc64__)
++  static void FillCPUContext(RawContextCPU *out, const ucontext_t *uc,
++                             const vrregset_t* vregs);
+ #else
+   static void FillCPUContext(RawContextCPU* out, const ucontext_t* uc);
+ #endif
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc
+@@ -105,6 +105,13 @@
+ #define PR_SET_PTRACER 0x59616d61
+ #endif
+ 
++/* musl hack, can't include asm/ptrace.h as that causes conflicts */
++#ifndef __GLIBC__
++#if defined(__powerpc64__) && !defined(PT_NIP)
++#define PT_NIP 32
++#endif
++#endif
++
+ namespace google_breakpad {
+ 
+ namespace {
+@@ -461,9 +468,16 @@ bool ExceptionHandler::HandleSignal(int
+     memcpy(&g_crash_context_.float_state, fp_ptr,
+            sizeof(g_crash_context_.float_state));
+   }
++#elif defined(__powerpc64__)
++  // On PPC64, we must copy VR state
++  ucontext_t* uc_ptr = (ucontext_t*)uc;
++  if (uc_ptr->uc_mcontext.v_regs) {
++    memcpy(&g_crash_context_.vector_state, uc_ptr->uc_mcontext.v_regs,
++           sizeof(g_crash_context_.vector_state));
++  }
+ #elif !defined(__ARM_EABI__) && !defined(__mips__)
+   // FP state is not part of user ABI on ARM Linux.
+-  // In case of MIPS Linux FP state is already part of ucontext_t
++  // In case of MIPS, Linux FP state is already part of ucontext_t
+   // and 'float_state' is not a member of CrashContext.
+   ucontext_t* uc_ptr = (ucontext_t*)uc;
+   if (uc_ptr->uc_mcontext.fpregs) {
+@@ -708,11 +722,19 @@ bool ExceptionHandler::WriteMinidump() {
+   }
+ #endif
+ 
+-#if !defined(__ARM_EABI__) && !defined(__aarch64__) && !defined(__mips__)
++#if !defined(__ARM_EABI__) && !defined(__aarch64__) && !defined(__mips__) \
++    && !defined(__powerpc64__)
+   // FPU state is not part of ARM EABI ucontext_t.
+   memcpy(&context.float_state, context.context.uc_mcontext.fpregs,
+          sizeof(context.float_state));
+ #endif
++
++#if defined(__powerpc64__)
++  // Vector registers must be copied on PPC64
++  memcpy(&context.vector_state, context.context.uc_mcontext.v_regs,
++         sizeof(context.vector_state));
++#endif
++
+   context.tid = sys_gettid();
+ 
+   // Add an exception stream to the minidump for better reporting.
+@@ -733,6 +755,9 @@ bool ExceptionHandler::WriteMinidump() {
+ #elif defined(__mips__)
+   context.siginfo.si_addr =
+       reinterpret_cast<void*>(context.context.uc_mcontext.pc);
++#elif defined(__powerpc64__)
++  context.siginfo.si_addr =
++      reinterpret_cast<void*>(context.context.uc_mcontext.gp_regs[PT_NIP]);
+ #else
+ #error "This code has not been ported to your platform yet."
+ #endif
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.h
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.h
+@@ -192,7 +192,11 @@ class ExceptionHandler {
+     siginfo_t siginfo;
+     pid_t tid;  // the crashing thread.
+     ucontext_t context;
+-#if !defined(__ARM_EABI__) && !defined(__mips__)
++#if defined(__powerpc64__)
++    // PPC64's FP state is a part of ucontext_t like MIPS but the vector
++    // state is not, so a struct is needed.
++    vstate_t vector_state;
++#elif !defined(__ARM_EABI__) && !defined(__mips__)
+     // #ifdef this out because FP state is not part of user ABI for Linux ARM.
+     // In case of MIPS Linux FP state is already part of ucontext_t so
+     // 'float_state' is not required.
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler_unittest.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler_unittest.cc
+@@ -307,7 +307,7 @@ TEST(ExceptionHandlerTest, ParallelChild
+   }
+ 
+   // Wait a while until the child should have crashed.
+-  usleep(1000000);
++  usleep(2000000);
+   // Kill the child if it is still running.
+   kill(child, SIGKILL);
+ 
+@@ -559,6 +559,8 @@ const unsigned char kIllegalInstruction[
+ #if defined(__mips__)
+   // mfc2 zero,Impl - usually illegal in userspace.
+   0x48, 0x00, 0x00, 0x48
++#elif defined(__powerpc64__)
++  0x01, 0x01, 0x01, 0x01 // Crashes on a tested POWER9 cpu
+ #else
+   // This crashes with SIGILL on x86/x86-64/arm.
+   0xff, 0xff, 0xff, 0xff
+@@ -754,10 +756,10 @@ TEST(ExceptionHandlerTest, InstructionPo
+ 
+   // These are defined here so the parent can use them to check the
+   // data from the minidump afterwards.
+-  // Use 4k here because the OS will hand out a single page even
++  // Use the page size here because the OS will hand out a single page even
+   // if a smaller size is requested, and this test wants to
+   // test the upper bound of the memory range.
+-  const uint32_t kMemorySize = 4096;  // bytes
++  const uint32_t kMemorySize = getpagesize();  // bytes
+   const int kOffset = kMemorySize - sizeof(kIllegalInstruction);
+ 
+   const pid_t child = fork();
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/microdump_writer/microdump_writer.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/microdump_writer/microdump_writer.cc
+@@ -138,7 +138,9 @@ class MicrodumpWriter {
+                   const MicrodumpExtraInfo& microdump_extra_info,
+                   LinuxDumper* dumper)
+       : ucontext_(context ? &context->context : NULL),
+-#if !defined(__ARM_EABI__) && !defined(__mips__)
++#if defined(__powerpc64__)
++        vector_state_(context ? &context->vector_state : NULL),
++#elif !defined(__ARM_EABI__) && !defined(__mips__)
+         float_state_(context ? &context->float_state : NULL),
+ #endif
+         dumper_(dumper),
+@@ -337,6 +339,8 @@ class MicrodumpWriter {
+ # else
+ #  error "This mips ABI is currently not supported (n32)"
+ #endif
++#elif defined(__powerpc64__)
++    const char kArch[] = "ppc64";
+ #else
+ #error "This code has not been ported to your platform yet"
+ #endif
+@@ -409,7 +413,9 @@ class MicrodumpWriter {
+   void DumpCPUState() {
+     RawContextCPU cpu;
+     my_memset(&cpu, 0, sizeof(RawContextCPU));
+-#if !defined(__ARM_EABI__) && !defined(__mips__)
++#if defined(__powerpc64__)
++    UContextReader::FillCPUContext(&cpu, ucontext_, vector_state_);
++#elif !defined(__ARM_EABI__) && !defined(__mips__)
+     UContextReader::FillCPUContext(&cpu, ucontext_, float_state_);
+ #else
+     UContextReader::FillCPUContext(&cpu, ucontext_);
+@@ -605,7 +611,9 @@ class MicrodumpWriter {
+   void* Alloc(unsigned bytes) { return dumper_->allocator()->Alloc(bytes); }
+ 
+   const ucontext_t* const ucontext_;
+-#if !defined(__ARM_EABI__) && !defined(__mips__)
++#if defined(__powerpc64__)
++  const google_breakpad::vstate_t* const vector_state_;
++#elif !defined(__ARM_EABI__) && !defined(__mips__)
+   const google_breakpad::fpstate_t* const float_state_;
+ #endif
+   LinuxDumper* dumper_;
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/microdump_writer/microdump_writer_unittest.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/microdump_writer/microdump_writer_unittest.cc
+@@ -279,10 +279,19 @@ TEST(MicrodumpWriterTest, BasicWithMappi
+   CrashAndGetMicrodump(mappings, MicrodumpExtraInfo(), &buf);
+   ASSERT_TRUE(ContainsMicrodump(buf));
+ 
++  int page_size = getpagesize();
+ #ifdef __LP64__
+-  ASSERT_NE(std::string::npos,
+-            buf.find("M 0000000000001000 000000000000002A 0000000000001000 "
+-                     "33221100554477668899AABBCCDDEEFF0 libfoo.so"));
++  // This test is only available for the following page sizes
++  ASSERT_TRUE((page_size == 4096) || (page_size == 65536));
++  if (page_size == 4096) {
++    ASSERT_NE(std::string::npos,
++              buf.find("M 0000000000001000 000000000000002A 0000000000001000 "
++                       "33221100554477668899AABBCCDDEEFF0 libfoo.so"));
++  } else {
++    ASSERT_NE(std::string::npos,
++              buf.find("M 0000000000010000 000000000000002A 0000000000010000 "
++                       "33221100554477668899AABBCCDDEEFF0 libfoo.so"));
++  }
+ #else
+   ASSERT_NE(std::string::npos,
+             buf.find("M 00001000 0000002A 00001000 "
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_core_dumper.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_core_dumper.cc
+@@ -117,6 +117,9 @@ bool LinuxCoreDumper::GetThreadInfoByInd
+ #elif defined(__mips__)
+   stack_pointer =
+       reinterpret_cast<uint8_t*>(info->mcontext.gregs[MD_CONTEXT_MIPS_REG_SP]);
++#elif defined(__powerpc64__)
++  stack_pointer =
++      reinterpret_cast<uint8_t*>(info->mcontext.gp_regs[MD_CONTEXT_PPC64_REG_SP]);
+ #else
+ #error "This code hasn't been ported to your platform yet."
+ #endif
+@@ -212,7 +215,10 @@ bool LinuxCoreDumper::EnumerateThreads()
+         memset(&info, 0, sizeof(ThreadInfo));
+         info.tgid = status->pr_pgrp;
+         info.ppid = status->pr_ppid;
+-#if defined(__mips__)
++#if defined(__powerpc64__)
++        for (int i = 0; i < 31; i++)
++            info.mcontext.gp_regs[i] = status->pr_reg[i];
++#elif defined(__mips__)
+ #if defined(__ANDROID__)
+         for (int i = EF_R0; i <= EF_R31; i++)
+           info.mcontext.gregs[i - EF_R0] = status->pr_reg[i];
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper.cc
+@@ -765,7 +765,9 @@ bool LinuxDumper::GetStackInfo(const voi
+       reinterpret_cast<uint8_t*>(int_stack_pointer & ~(page_size - 1));
+ 
+   // The number of bytes of stack which we try to capture.
+-  static const ptrdiff_t kStackToCapture = 32 * 1024;
++  // This now depends on page_size to avoid missing data
++  // on systems with larger page sizes.
++  static const ptrdiff_t kStackToCapture = 8 * page_size;
+ 
+   const MappingInfo* mapping = FindMapping(stack_pointer);
+   if (!mapping)
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper.h
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper.h
+@@ -63,7 +63,8 @@ namespace google_breakpad {
+  (defined(__mips__) && _MIPS_SIM == _ABIO32)
+ typedef Elf32_auxv_t elf_aux_entry;
+ #elif defined(__x86_64) || defined(__aarch64__) || \
+-     (defined(__mips__) && _MIPS_SIM != _ABIO32)
++     (defined(__mips__) && _MIPS_SIM != _ABIO32) || \
++     defined(__powerpc64__)
+ typedef Elf64_auxv_t elf_aux_entry;
+ #endif
+ 
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper_unittest_helper.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper_unittest_helper.cc
+@@ -51,6 +51,8 @@
+ #define TID_PTR_REGISTER "rcx"
+ #elif defined(__mips__)
+ #define TID_PTR_REGISTER "$1"
++#elif defined(__powerpc64__)
++#define TID_PTR_REGISTER "r8"
+ #else
+ #error This test has not been ported to this platform.
+ #endif
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper.cc
+@@ -154,19 +154,27 @@ bool LinuxPtraceDumper::CopyFromProcess(
+   return true;
+ }
+ 
+-bool LinuxPtraceDumper::ReadRegisterSet(ThreadInfo* info, pid_t tid)
+-{
++bool LinuxPtraceDumper::ReadRegisterSet(ThreadInfo* info, pid_t tid) {
+ #ifdef PTRACE_GETREGSET
+   struct iovec io;
+   info->GetGeneralPurposeRegisters(&io.iov_base, &io.iov_len);
+-  if (sys_ptrace(PTRACE_GETREGSET, tid, (void*)NT_PRSTATUS, (void*)&io) == -1) {
++  if (ptrace(PTRACE_GETREGSET, tid, (void*)NT_PRSTATUS, (void*)&io) == -1) {
+     return false;
+   }
+ 
+   info->GetFloatingPointRegisters(&io.iov_base, &io.iov_len);
+-  if (sys_ptrace(PTRACE_GETREGSET, tid, (void*)NT_FPREGSET, (void*)&io) == -1) {
++  if (ptrace(PTRACE_GETREGSET, tid, (void*)NT_FPREGSET, (void*)&io) == -1) {
+     return false;
+   }
++
++#if defined(__powerpc64__)
++  // Grab the vector registers on PPC64 too
++  info->GetVectorRegisters(&io.iov_base, &io.iov_len);
++  if (ptrace(PTRACE_GETREGSET, tid, (void*)NT_PPC_VMX, (void*)&io) == -1) {
++    return false;
++  }
++#endif // defined(__powerpc64__)
++
+   return true;
+ #else
+   return false;
+@@ -303,6 +311,9 @@ bool LinuxPtraceDumper::GetThreadInfoByI
+ #elif defined(__mips__)
+   stack_pointer =
+       reinterpret_cast<uint8_t*>(info->mcontext.gregs[MD_CONTEXT_MIPS_REG_SP]);
++#elif defined(__powerpc64__)
++  stack_pointer =
++      reinterpret_cast<uint8_t*>(info->mcontext.gp_regs[MD_CONTEXT_PPC64_REG_SP]);
+ #else
+ #error "This code hasn't been ported to your platform yet."
+ #endif
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper_unittest.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper_unittest.cc
+@@ -462,6 +462,9 @@ TEST(LinuxPtraceDumperTest, VerifyStackR
+ #elif defined(__mips__)
+     pid_t* process_tid_location =
+         reinterpret_cast<pid_t*>(one_thread.mcontext.gregs[1]);
++#elif defined(__powerpc64__)
++    pid_t* process_tid_location =
++        reinterpret_cast<pid_t*>(one_thread.mcontext.gp_regs[8]);
+ #else
+ #error This test has not been ported to this platform.
+ #endif
+@@ -559,6 +562,8 @@ TEST_F(LinuxPtraceDumperTest, SanitizeSt
+   uintptr_t heap_addr = thread_info.regs.rcx;
+ #elif defined(__mips__)
+   uintptr_t heap_addr = thread_info.mcontext.gregs[1];
++#elif defined(__powerpc64__)
++  uintptr_t heap_addr = thread_info.mcontext.gp_regs[8];
+ #else
+ #error This test has not been ported to this platform.
+ #endif
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.cc
+@@ -136,7 +136,9 @@ class MinidumpWriter {
+       : fd_(minidump_fd),
+         path_(minidump_path),
+         ucontext_(context ? &context->context : NULL),
+-#if !defined(__ARM_EABI__) && !defined(__mips__)
++#if defined(__powerpc64__)
++        vector_state_(context ? &context->vector_state : NULL),
++#elif !defined(__ARM_EABI__) && !defined(__mips__)
+         float_state_(context ? &context->float_state : NULL),
+ #endif
+         dumper_(dumper),
+@@ -468,7 +470,9 @@ class MinidumpWriter {
+         if (!cpu.Allocate())
+           return false;
+         my_memset(cpu.get(), 0, sizeof(RawContextCPU));
+-#if !defined(__ARM_EABI__) && !defined(__mips__)
++#if defined(__powerpc64__)
++        UContextReader::FillCPUContext(cpu.get(), ucontext_, vector_state_);
++#elif !defined(__ARM_EABI__) && !defined(__mips__)
+         UContextReader::FillCPUContext(cpu.get(), ucontext_, float_state_);
+ #else
+         UContextReader::FillCPUContext(cpu.get(), ucontext_);
+@@ -897,7 +901,7 @@ class MinidumpWriter {
+     dirent->location.rva = 0;
+   }
+ 
+-#if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
++#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || defined(__powerpc64__)
+   bool WriteCPUInformation(MDRawSystemInfo* sys_info) {
+     char vendor_id[sizeof(sys_info->cpu.x86_cpu_info.vendor_id) + 1] = {0};
+     static const char vendor_id_name[] = "vendor_id";
+@@ -917,7 +921,9 @@ class MinidumpWriter {
+ 
+     // processor_architecture should always be set, do this first
+     sys_info->processor_architecture =
+-#if defined(__mips__)
++#if defined(__powerpc64__)
++        MD_CPU_ARCHITECTURE_PPC64;
++#elif defined(__mips__)
+ # if _MIPS_SIM == _ABIO32
+         MD_CPU_ARCHITECTURE_MIPS;
+ # elif _MIPS_SIM == _ABI64
+@@ -1333,7 +1339,9 @@ class MinidumpWriter {
+   const char* path_;  // Path to the file where the minidum should be written.
+ 
+   const ucontext_t* const ucontext_;  // also from the signal handler
+-#if !defined(__ARM_EABI__) && !defined(__mips__)
++#if defined(__powerpc64__)
++  const google_breakpad::vstate_t* const vector_state_;
++#elif !defined(__ARM_EABI__) && !defined(__mips__)
+   const google_breakpad::fpstate_t* const float_state_;  // ditto
+ #endif
+   LinuxDumper* dumper_;
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.h
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.h
+@@ -48,6 +48,8 @@ class ExceptionHandler;
+ 
+ #if defined(__aarch64__)
+ typedef struct fpsimd_context fpstate_t;
++#elif defined(__powerpc64__)
++typedef vrregset_t vstate_t;
+ #elif !defined(__ARM_EABI__) && !defined(__mips__)
+ typedef std::remove_pointer<fpregset_t>::type fpstate_t;
+ #endif
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer_unittest.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer_unittest.cc
+@@ -715,6 +715,12 @@ TEST(MinidumpWriterTest, InvalidStackPoi
+ #elif defined(__mips__)
+   context.context.uc_mcontext.gregs[MD_CONTEXT_MIPS_REG_SP] =
+       invalid_stack_pointer;
++#elif defined(__powerpc64__)
++  context.context.uc_mcontext.gp_regs[MD_CONTEXT_PPC64_REG_SP] =
++      invalid_stack_pointer;
++#elif defined(__powerpc64__)
++  context.context.uc_mcontext.gp_regs[MD_CONTEXT_PPC64_REG_SP] =
++      invalid_stack_pointer;
+ #else
+ # error "This code has not been ported to your platform yet."
+ #endif
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/common/linux/memory_mapped_file.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/common/linux/memory_mapped_file.cc
+@@ -65,8 +65,7 @@ bool MemoryMappedFile::Map(const char* p
+   }
+ 
+ #if defined(__x86_64__) || defined(__aarch64__) || \
+-   (defined(__mips__) && _MIPS_SIM == _ABI64)
+-
++   (defined(__mips__) && _MIPS_SIM == _ABI64) || defined(__powerpc64__)
+   struct kernel_stat st;
+   if (sys_fstat(fd, &st) == -1 || st.st_size < 0) {
+ #else
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/common/linux/memory_mapped_file_unittest.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/common/linux/memory_mapped_file_unittest.cc
+@@ -176,9 +176,10 @@ TEST_F(MemoryMappedFileTest, RemapAfterM
+ TEST_F(MemoryMappedFileTest, MapWithOffset) {
+   // Put more data in the test file this time. Offsets can only be
+   // done on page boundaries, so we need a two page file to test this.
+-  const int page_size = 4096;
+-  char data1[2 * page_size];
+-  size_t data1_size = sizeof(data1);
++  const int page_size = getpagesize();
++  char *data1 = static_cast<char*>(malloc(2 * page_size));
++  EXPECT_TRUE(data1 != NULL);
++  size_t data1_size = (2 * page_size);
+   for (size_t i = 0; i < data1_size; ++i) {
+     data1[i] = i & 0x7f;
+   }
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/common/memory_allocator_unittest.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/common/memory_allocator_unittest.cc
+@@ -57,8 +57,9 @@ TEST(PageAllocatorTest, LargeObject) {
+ 
+   EXPECT_EQ(0U, allocator.pages_allocated());
+   uint8_t* p = reinterpret_cast<uint8_t*>(allocator.Alloc(10000));
++  uint64_t expected_pages = 1 + ((10000 - 1) / getpagesize());
+   ASSERT_FALSE(p == NULL);
+-  EXPECT_EQ(3U, allocator.pages_allocated());
++  EXPECT_EQ(expected_pages, allocator.pages_allocated());
+   for (unsigned i = 1; i < 10; ++i) {
+     uint8_t* p = reinterpret_cast<uint8_t*>(allocator.Alloc(i));
+     ASSERT_FALSE(p == NULL);
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/processor/exploitability_linux.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/processor/exploitability_linux.cc
+@@ -202,12 +202,14 @@ bool ExploitabilityLinux::EndedOnIllegal
+   // Check architecture and set architecture variable to corresponding flag
+   // in objdump.
+   switch (context->GetContextCPU()) {
++#if defined(__i386) || defined(__x86_64)
+     case MD_CONTEXT_X86:
+       architecture = "i386";
+       break;
+     case MD_CONTEXT_AMD64:
+       architecture = "i386:x86-64";
+       break;
++#endif
+     default:
+       // Unsupported architecture. Note that ARM architectures are not
+       // supported because objdump does not support ARM.
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/processor/exploitability_unittest.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/processor/exploitability_unittest.cc
+@@ -104,6 +104,8 @@ ExploitabilityFor(const string& filename
+ }
+ 
+ TEST(ExploitabilityTest, TestWindowsEngine) {
++// The following tests are only executable on an x86-class linux machine.
++#if !defined(_WIN32) && (defined(__i386) || defined(__x86_64))
+   ASSERT_EQ(google_breakpad::EXPLOITABILITY_HIGH,
+             ExploitabilityFor("ascii_read_av.dmp"));
+   ASSERT_EQ(google_breakpad::EXPLOITABILITY_HIGH,
+@@ -136,9 +138,12 @@ TEST(ExploitabilityTest, TestWindowsEngi
+             ExploitabilityFor("read_av_clobber_write.dmp"));
+   ASSERT_EQ(google_breakpad::EXPLOITABILITY_LOW,
+             ExploitabilityFor("read_av_conditional.dmp"));
++#endif
+ }
+ 
+ TEST(ExploitabilityTest, TestLinuxEngine) {
++// The following tests are only executable on an x86-class linux machine.
++#if defined(__i386) || defined(__x86_64)
+   ASSERT_EQ(google_breakpad::EXPLOITABILITY_INTERESTING,
+             ExploitabilityFor("linux_null_read_av.dmp"));
+   ASSERT_EQ(google_breakpad::EXPLOITABILITY_HIGH,
+@@ -171,7 +176,8 @@ TEST(ExploitabilityTest, TestLinuxEngine
+             ExploitabilityFor("linux_executable_heap.dmp"));
+   ASSERT_EQ(google_breakpad::EXPLOITABILITY_HIGH,
+             ExploitabilityFor("linux_jmp_to_module_not_exe_region.dmp"));
+-#ifndef _WIN32
++#endif
++#if !defined(_WIN32) && (defined(__i386) || defined(__x86_64))
+   ASSERT_EQ(google_breakpad::EXPLOITABILITY_HIGH,
+             ExploitabilityFor("linux_write_to_nonwritable_module.dmp"));
+   ASSERT_EQ(google_breakpad::EXPLOITABILITY_HIGH,
+@@ -182,10 +188,10 @@ TEST(ExploitabilityTest, TestLinuxEngine
+             ExploitabilityFor("linux_write_to_outside_module_via_math.dmp"));
+   ASSERT_EQ(google_breakpad::EXPLOITABILITY_INTERESTING,
+             ExploitabilityFor("linux_write_to_under_4k.dmp"));
+-#endif  // _WIN32
++#endif  // !defined(_WIN32) && (!defined(__i386) && !defined(__x86_64))
+ }
+ 
+-#ifndef _WIN32
++#if !defined(_WIN32) && (defined(__i386) || defined(__x86_64))
+ TEST(ExploitabilityLinuxUtilsTest, DisassembleBytesTest) {
+   ASSERT_FALSE(ExploitabilityLinuxTest::DisassembleBytes("", NULL, 5, NULL));
+   uint8_t bytes[6] = {0xc7, 0x0, 0x5, 0x0, 0x0, 0x0};
+@@ -301,6 +307,7 @@ TEST(ExploitabilityLinuxUtilsTest, Calcu
+                                                          context,
+                                                          &write_address));
+ }
+-#endif  // _WIN32
++#endif  // !defined(_WIN32) && (defined(__i386) || defined(__x86_64))
++
+ 
+ }  // namespace
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/tools/linux/md2core/minidump-2-core.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/tools/linux/md2core/minidump-2-core.cc
+@@ -77,6 +77,8 @@
+   #define ELF_ARCH  EM_MIPS
+ #elif defined(__aarch64__)
+   #define ELF_ARCH  EM_AARCH64
++#elif defined(__powerpc64__)
++  #define ELF_ARCH  EM_PPC64
+ #endif
+ 
+ #if defined(__arm__)
+@@ -87,6 +89,8 @@ typedef user_regs user_regs_struct;
+ #elif defined (__mips__)
+ // This file-local typedef simplifies the source code.
+ typedef gregset_t user_regs_struct;
++#elif defined(__powerpc64__)
++typedef struct pt_regs user_regs_struct;
+ #endif
+ 
+ using google_breakpad::MDTypeHelper;
+@@ -322,6 +326,12 @@ struct CrashedProcess {
+ #if defined(__aarch64__)
+     user_fpsimd_struct fpregs;
+ #endif
++#if defined(__powerpc64__)
++    mcontext_t mcontext;
++#endif
++#if defined(__powerpc64__)
++    mcontext_t mcontext;
++#endif
+     uintptr_t stack_addr;
+     const uint8_t* stack;
+     size_t stack_length;
+@@ -535,6 +545,38 @@ ParseThreadRegisters(CrashedProcess::Thr
+   thread->mcontext.fpc_eir = rawregs->float_save.fir;
+ #endif
+ }
++#elif defined(__powerpc64__)
++static void
++ParseThreadRegisters(CrashedProcess::Thread* thread,
++                     const MinidumpMemoryRange& range) {
++  const MDRawContextPPC64* rawregs = range.GetData<MDRawContextPPC64>(0);
++
++  for (int i = 0; i < MD_CONTEXT_PPC64_GPR_COUNT; i++)
++    thread->mcontext.gp_regs[i] = rawregs->gpr[i];
++
++  thread->mcontext.gp_regs[PT_LNK] = rawregs->lr;
++  thread->mcontext.gp_regs[PT_NIP] = rawregs->srr0;
++  thread->mcontext.gp_regs[PT_MSR] = rawregs->srr1;
++  thread->mcontext.gp_regs[PT_CCR] = rawregs->cr;
++  thread->mcontext.gp_regs[PT_XER] = rawregs->xer;
++  thread->mcontext.gp_regs[PT_CTR] = rawregs->ctr;
++  thread->mcontext.v_regs->vrsave = rawregs->vrsave;
++
++  for (int i = 0; i < MD_FLOATINGSAVEAREA_PPC_FPR_COUNT; i++)
++      thread->mcontext.fp_regs[i] = rawregs->float_save.fpregs[i];
++
++  thread->mcontext.fp_regs[NFPREG-1] = rawregs->float_save.fpscr;
++
++  for (int i = 0; i < MD_VECTORSAVEAREA_PPC_VR_COUNT; i++) {
++      thread->mcontext.v_regs->vrregs[i][0] = rawregs->vector_save.save_vr[i].high >> 32;
++      thread->mcontext.v_regs->vrregs[i][1] = rawregs->vector_save.save_vr[i].high;
++      thread->mcontext.v_regs->vrregs[i][2] = rawregs->vector_save.save_vr[i].low >> 32;
++      thread->mcontext.v_regs->vrregs[i][3] = rawregs->vector_save.save_vr[i].low;
++  }
++
++  thread->mcontext.v_regs->vscr.vscr_word = rawregs->vector_save.save_vscr.low & 0xFFFFFFFF;
++}
++
+ #else
+ #error "This code has not been ported to your platform yet"
+ #endif
+@@ -623,6 +665,12 @@ ParseSystemInfo(const Options& options,
+ # else
+ #  error "This mips ABI is currently not supported (n32)"
+ # endif
++#elif defined(__powerpc64__)
++  if (sysinfo->processor_architecture != MD_CPU_ARCHITECTURE_PPC64) {
++    fprintf(stderr,
++            "This version of minidump-2-core only supports PPC64.\n");
++    exit(1);
++  }
+ #else
+ #error "This code has not been ported to your platform yet"
+ #endif
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/CONTRIBUTORS
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/CONTRIBUTORS
+@@ -13,3 +13,4 @@ Mark Mentovai <mark@chromium.org>
+ Robert Sesek <rsesek@chromium.org>
+ Scott Graham <scottmg@chromium.org>
+ Joshua Peraza <jperaza@chromium.org>
++Shawn Anastasio <shawn@anastas.io>
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/compat/linux/sys/user.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/compat/linux/sys/user.h
+@@ -15,6 +15,7 @@
+ #ifndef CRASHPAD_COMPAT_LINUX_SYS_USER_H_
+ #define CRASHPAD_COMPAT_LINUX_SYS_USER_H_
+ 
++#include <cstddef>
+ #include_next <sys/user.h>
+ 
+ #include <features.h>
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/minidump/minidump_context.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/minidump/minidump_context.h
+@@ -592,6 +592,70 @@ struct MinidumpContextMIPS64 {
+   uint64_t fir;
+ };
+ 
++//! \brief ppc64-specific flags for MinidumpPPC64::context_flags
++//! Based on minidump_cpu_ppc64.h from breakpad
++enum MinidumpContextPPC64Flags : uint32_t {
++  //! \brief Identifies the context as PPC64.
++  kMinidumpContextPPC64 = 0x01000000,
++
++  //! \brief Indicates the validity of general purpose registers.
++  //!
++  //! Registers `r0`-`r31`, `nip`, `msr`, `lr`, etc. are valid.
++  kMinidumpContextPPC64Base = kMinidumpContextPPC64 | 0x00000001,
++
++  //! \brief Indicates the validity of floating point registers.
++  //!
++  //! Registers `fp0`-`fp31`, `fpscr` are valid.
++  kMinidumpContextPPC64Floating = kMinidumpContextPPC64 | 0x00000008,
++
++  //! \brief Indicates the validity of Altivec/VMX registers.
++  //!
++  //! Registers `v0`-`v31`, `vscr`, `vrsave`.
++  kMinidumpContextPPC64Vector = kMinidumpContextPPC64 | 0x00000020,
++
++  //! \brief Indicates the validity of all registers
++  kMinidumpContextPPC64All = kMinidumpContextPPC64Base     |
++                             kMinidumpContextPPC64Floating |
++                             kMinidumpContextPPC64Vector
++};
++
++//! \brief A PPC64 CPU context carried in a minidump file.
++//! Based on minidump_cpu_ppc64.h from breakpad.
++struct MinidumpContextPPC64 {
++  uint64_t context_flags;
++
++  //! \brief General purpose registers.
++  uint64_t nip;
++  uint64_t msr;
++  uint64_t regs[32];
++  uint64_t ccr;
++  uint64_t xer;
++  uint64_t lnk;
++  uint64_t ctr;
++
++  //! \brief Floating point registers.
++  double fpregs[32];
++
++  //! \brief FPU status register.
++  double fpscr;
++
++  //! \brief Altivec/VMX vector registers.
++  struct {
++      //! \brief Vector registers are 128bits.
++      uint128_struct save_vr[32];
++      uint128_struct save_vscr;
++
++      //! \brief Padding included for breakpad compatibiltiy.
++      uint32_t save_pad5[4];
++
++      //! \brief VRSAVE register.
++      uint32_t save_vrsave;
++
++      //! \brief Padding included for breakpad compatibiltiy.
++      uint32_t save_pad6[7];
++  } vregs;
++};
++
+ }  // namespace crashpad
+ 
+ #endif  // CRASHPAD_MINIDUMP_MINIDUMP_CONTEXT_H_
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/minidump/minidump_context_writer.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/minidump/minidump_context_writer.cc
+@@ -101,6 +101,13 @@ MinidumpContextWriter::CreateFromSnapsho
+       break;
+     }
+ 
++    case kCPUArchitecturePPC64: {
++      context = std::make_unique<MinidumpContextPPC64Writer>();
++      reinterpret_cast<MinidumpContextPPC64Writer*>(context.get())
++          ->InitalizeFromSnapshot(context_snapshot->ppc64);
++      break;
++    }
++
+     default: {
+       LOG(ERROR) << "unknown context architecture "
+                  << context_snapshot->architecture;
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/minidump/minidump_context_writer.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/minidump/minidump_context_writer.h
+@@ -315,6 +315,45 @@ class MinidumpContextMIPS64Writer final
+   DISALLOW_COPY_AND_ASSIGN(MinidumpContextMIPS64Writer);
+ };
+ 
++class MinidumpContextPPC64Writer final : public MinidumpContextWriter {
++ public:
++  MinidumpContextPPC64Writer();
++  ~MinidumpContextPPC64Writer() override;
++
++  //! \brief Initalizes the MinidumpContextPPC64 based on \a context_snapshot.
++  //!
++  //! \param[in] context_snapshot The context snapshot to use as source data.
++  //!
++  //! \note Valid in #kStateMutable. No mutation of context() may be done before
++  //!     calling this method, and it is not normally necessary to alter
++  //!     context() after calling this method.
++  void InitalizeFromSnapshot(const CPUContextPPC64* context_snapshot);
++
++  //! \brief Returns a pointer to the context structure that this object will
++  //!     write.
++  //!
++  //! \attention This returns a non-`const` pointer to this object’s private
++  //!     data so that a caller can populate the context structure directly.
++  //!     This is done because providing setter interfaces to each field in the
++  //!     context structure would be unwieldy and cumbersome. Care must be taken
++  //!     to populate the context structure correctly. The context structure
++  //!     must only be modified while this object is in the #kStateMutable
++  //!     state.
++  MinidumpContextPPC64* context() { return &context_; }
++
++ protected:
++  // MinidumpWritable:
++  bool WriteObject(FileWriterInterface* file_writer) override;
++
++  // MinidumpContextWriter:
++  size_t ContextSize() const override;
++
++ private:
++  MinidumpContextPPC64 context_;
++
++  DISALLOW_COPY_AND_ASSIGN(MinidumpContextPPC64Writer);
++};
++
+ }  // namespace crashpad
+ 
+ #endif  // CRASHPAD_MINIDUMP_MINIDUMP_CONTEXT_WRITER_H_
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/minidump/minidump_context_writer_test.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/minidump/minidump_context_writer_test.cc
+@@ -213,6 +213,21 @@ TEST(MinidumpContextWriter, MIPS64_FromS
+       context, ExpectMinidumpContextMIPS64, kSeed);
+ }
+ 
++TEST(MinidumpContextWriter, PPC64_Zeros) {
++  EmptyContextTest<MinidumpContextPPC64Writer, MinidumpContextPPC64>(
++    ExpectMinidumpContextPPC64);
++}
++
++TEST(MinidumpContextWriter, PPC64_FromSnapshot) {
++  constexpr uint32_t kSeed = 64;
++  CPUContextPPC64 context_ppc64;
++  CPUContext context;
++  context.ppc64 = &context_ppc64;
++  InitializeCPUContextPPC64(&context, kSeed);
++  FromSnapshotTest<MinidumpContextPPC64Writer, MinidumpContextPPC64>(
++      context, ExpectMinidumpContextPPC64, kSeed);
++}
++
+ }  // namespace
+ }  // namespace test
+ }  // namespace crashpad
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/minidump/minidump_misc_info_writer.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/minidump/minidump_misc_info_writer.cc
+@@ -135,6 +135,8 @@ std::string MinidumpMiscInfoDebugBuildSt
+   static constexpr char kCPU[] = "mips";
+ #elif defined(ARCH_CPU_MIPS64EL)
+   static constexpr char kCPU[] = "mips64";
++#elif defined(ARCH_CPU_PPC64)
++  static constexpr char kCPU[] = "ppc64";
+ #else
+ #error define kCPU for this CPU
+ #endif
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/capture_memory.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/capture_memory.cc
+@@ -112,6 +112,11 @@ void CaptureMemory::PointedToByContext(c
+   for (size_t i = 0; i < base::size(context.mipsel->regs); ++i) {
+     MaybeCaptureMemoryAround(delegate, context.mipsel->regs[i]);
+   }
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++  MaybeCaptureMemoryAround(delegate, context.ppc64->nip);
++  for (size_t i = 0; i < base::size(context.ppc64->regs); ++i) {
++    MaybeCaptureMemoryAround(delegate, context.ppc64->regs[i]);
++  }
+ #else
+ #error Port.
+ #endif
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/cpu_architecture.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/cpu_architecture.h
+@@ -43,7 +43,10 @@ enum CPUArchitecture {
+   kCPUArchitectureMIPSEL,
+ 
+   //! \brief 64-bit MIPSEL.
+-  kCPUArchitectureMIPS64EL
++  kCPUArchitectureMIPS64EL,
++
++  //! \brief 64-bit PPC64.
++  kCPUArchitecturePPC64
+ };
+ 
+ }  // namespace crashpad
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/cpu_context.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/cpu_context.cc
+@@ -169,6 +169,8 @@ uint64_t CPUContext::InstructionPointer(
+       return arm->pc;
+     case kCPUArchitectureARM64:
+       return arm64->pc;
++    case kCPUArchitecturePPC64:
++      return ppc64->nip;
+     default:
+       NOTREACHED();
+       return ~0ull;
+@@ -185,6 +187,8 @@ uint64_t CPUContext::StackPointer() cons
+       return arm->sp;
+     case kCPUArchitectureARM64:
+       return arm64->sp;
++    case kCPUArchitecturePPC64:
++      return ppc64->regs[1];
+     default:
+       NOTREACHED();
+       return ~0ull;
+@@ -196,6 +200,7 @@ bool CPUContext::Is64Bit() const {
+     case kCPUArchitectureX86_64:
+     case kCPUArchitectureARM64:
+     case kCPUArchitectureMIPS64EL:
++    case kCPUArchitecturePPC64:
+       return true;
+     case kCPUArchitectureX86:
+     case kCPUArchitectureARM:
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/cpu_context.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/cpu_context.h
+@@ -352,6 +352,24 @@ struct CPUContextMIPS64 {
+   uint64_t fir;
+ };
+ 
++//! \brief A context structure carrying PPC64 CPU state.
++struct CPUContextPPC64 {
++  uint64_t nip;
++  uint64_t msr;
++  uint64_t regs[32];
++  uint64_t ccr;
++  uint64_t xer;
++  uint64_t lnk;
++  uint64_t ctr;
++  double fpregs[32];
++  double fpscr;
++  struct {
++    uint128_struct save_vr[32];
++    uint128_struct save_vscr;
++    uint32_t save_vrsave;
++  } vregs;
++};
++
+ //! \brief A context structure capable of carrying the context of any supported
+ //!     CPU architecture.
+ struct CPUContext {
+@@ -382,6 +400,7 @@ struct CPUContext {
+     CPUContextARM64* arm64;
+     CPUContextMIPS* mipsel;
+     CPUContextMIPS64* mips64;
++    CPUContextPPC64* ppc64;
+   };
+ };
+ 
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/cpu_context_linux.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/cpu_context_linux.h
+@@ -15,6 +15,7 @@
+ #ifndef CRASHPAD_SNAPSHOT_LINUX_CPU_CONTEXT_LINUX_H_
+ #define CRASHPAD_SNAPSHOT_LINUX_CPU_CONTEXT_LINUX_H_
+ 
++#include <cstring>
+ #include "build/build_config.h"
+ #include "snapshot/cpu_context.h"
+ #include "snapshot/linux/signal_context.h"
+@@ -174,6 +175,76 @@ void InitializeCPUContextMIPS(
+ 
+ #endif  // ARCH_CPU_MIPS_FAMILY || DOXYGEN
+ 
++#if defined(ARCH_CPU_PPC64_FAMILY) || DOXYGEN
++
++//! \brief Initalizes a CPUContextPPC64 structure from native context
++//!     structures on Linux.
++//!
++//! \param[in] thread_context The native thread context.
++//! \param[in] float_context The native float context.
++//! \param[in] vector_context The native vector context.
++//! \param[out] context The CPUContextPPC64 structure to initalize.
++template <typename Traits>
++void InitializeCPUContextPPC64(
++    const ThreadContext::t64_t& thread_context,
++    const FloatContext::f64_t& float_context,
++    const VectorContext::v64_t& vector_context,
++    typename Traits::CPUContext* context) {
++
++  memcpy(context->regs, thread_context.gpr, sizeof(context->regs));
++  context->nip = thread_context.nip;
++  context->msr = thread_context.msr;
++  context->ccr = thread_context.ccr;
++  context->xer = thread_context.xer;
++  context->lnk = thread_context.lnk;
++  context->ctr = thread_context.ctr;
++
++  memcpy(context->fpregs, float_context.fpregs, sizeof(context->fpregs));
++  context->fpscr = float_context.fpscr;
++
++  for (uint8_t i = 0; i < 32; i++) {
++    context->vregs.save_vr[i] = {
++      (((uint64_t)vector_context.vrregs[i][0]) << 32) |
++        vector_context.vrregs[i][1],
++      (((uint64_t)vector_context.vrregs[i][2]) << 32) |
++        vector_context.vrregs[i][3]
++    };
++  }
++  context->vregs.save_vrsave = vector_context.vrsave;
++  context->vregs.save_vscr = {0, (uint64_t)vector_context.vscr.vscr_word};
++}
++
++template <typename Traits>
++void InitializeCPUContextPPC64(
++    const SignalThreadContext64 &thread_context,
++    const SignalFloatContext64 &float_context,
++    const SignalVectorContext64 &vector_context,
++    typename Traits::CPUContext* context) {
++
++  memcpy(context->regs, thread_context.regs, sizeof(context->regs));
++  context->nip = thread_context.nip;
++  context->msr = thread_context.msr;
++  context->ccr = thread_context.ccr;
++  context->xer = thread_context.xer;
++  context->lnk = thread_context.lnk;
++  context->ctr = thread_context.ctr;
++
++  memcpy(context->fpregs, float_context.regs, sizeof(context->fpregs));
++  context->fpscr = float_context.fpscr;
++
++  for (uint8_t i = 0; i < 32; i++) {
++    context->vregs.save_vr[i] = {
++      (((uint64_t)vector_context.vrregs[i][0]) << 32) |
++        vector_context.vrregs[i][1],
++      (((uint64_t)vector_context.vrregs[i][2]) << 32) |
++        vector_context.vrregs[i][3]
++    };
++  }
++  context->vregs.save_vrsave = vector_context.vrsave;
++  context->vregs.save_vscr = {0, (uint64_t)vector_context.vscr.vscr_word};
++}
++
++#endif
+ }  // namespace internal
+ }  // namespace crashpad
+ 
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/debug_rendezvous_test.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/debug_rendezvous_test.cc
+@@ -192,6 +192,8 @@ void TestAgainstTarget(PtraceConnection*
+               device == 0 && inode == 0 && mapping_name == "[vdso]";
+ #if defined(ARCH_CPU_X86)
+           static constexpr char kPrefix[] = "linux-gate.so.";
++#elif defined(ARCH_CPU_PPC64)
++          static constexpr char kPrefix[] = "linux-vdso64.so.";
+ #else
+           static constexpr char kPrefix[] = "linux-vdso.so.";
+ #endif
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux.cc
+@@ -323,6 +323,69 @@ bool ExceptionSnapshotLinux::ReadContext
+       reader, context_address, context_.mips64);
+ }
+ 
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++
++template <typename Traits>
++static bool ReadContext(ProcessReaderLinux* reader,
++                        LinuxVMAddress context_address,
++                        typename Traits::CPUContext* dest_context) {
++  const ProcessMemory* memory = reader->Memory();
++
++  LinuxVMAddress gp_regs_address = context_address +
++                                   offsetof(UContext, mcontext) +
++                                   offsetof(typename Traits::MContext, gp_regs);
++
++  typename Traits::SignalThreadContext thread_context;
++  if (!memory->Read(gp_regs_address, sizeof(thread_context), &thread_context)) {
++    LOG(ERROR) << "Couldn't read gp_regs!";
++    return false;
++  }
++
++  LinuxVMAddress fp_regs_address = context_address +
++                                   offsetof(UContext, mcontext) +
++                                   offsetof(typename Traits::MContext, fp_regs);
++
++  typename Traits::SignalFloatContext fp_context;
++  if (!memory->Read(fp_regs_address, sizeof(fp_context), &fp_context)) {
++    LOG(ERROR) << "Couldn't read fp_regs!";
++    return false;
++  }
++
++  LinuxVMAddress v_regs_ptr_address = context_address +
++                                  offsetof(UContext, mcontext) +
++                                  offsetof(typename Traits::MContext, vmx_reserve) + 8;
++
++  typename Traits::SignalVectorContext v_context;
++  if (!memory->Read(v_regs_ptr_address, sizeof(v_context), &v_context)) {
++    LOG(ERROR) << "Couldn't read v_regs!";
++    return false;
++  }
++
++  InitializeCPUContextPPC64<ContextTraits64>(thread_context, fp_context,
++                            v_context, dest_context);
++
++  return true;
++}
++
++template<>
++bool ExceptionSnapshotLinux::ReadContext<ContextTraits64>(
++    ProcessReaderLinux* reader,
++    LinuxVMAddress context_address) {
++  context_.architecture = kCPUArchitecturePPC64;
++  context_.ppc64 = &context_union_.ppc64;
++
++  return internal::ReadContext<ContextTraits64>(
++      reader, context_address, context_.ppc64);
++}
++
++template<>
++bool ExceptionSnapshotLinux::ReadContext<ContextTraits32>(
++    ProcessReaderLinux* reader,
++    LinuxVMAddress context_address) {
++  // PPC64 is 64-bit
++  return false;
++}
++
+ #endif  // ARCH_CPU_X86_FAMILY
+ 
+ bool ExceptionSnapshotLinux::Initialize(ProcessReaderLinux* process_reader,
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux.h
+@@ -84,6 +84,8 @@ class ExceptionSnapshotLinux final : pub
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+     CPUContextMIPS mipsel;
+     CPUContextMIPS64 mips64;
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++    CPUContextPPC64 ppc64;
+ #endif
+   } context_union_;
+   CPUContext context_;
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux_test.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux_test.cc
+@@ -296,7 +296,28 @@ void ExpectContext(const CPUContext& act
+             0);
+ #undef CPU_ARCH_NAME
+ }
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++using NativeCPUContext = ucontext_t;
+ 
++void InitializeContext(NativeCPUContext* context) {
++  for (size_t reg = 0; reg < 32; ++reg) {
++    context->uc_mcontext.gp_regs[reg] = reg;
++  }
++
++  memset(&context->uc_mcontext.fp_regs, 44,
++      sizeof(context->uc_mcontext.fp_regs));
++}
++
++void ExpectContext(const CPUContext& actual, const NativeCPUContext& expected) {
++  EXPECT_EQ(actual.architecture, kCPUArchitecturePPC64);
++
++  for (size_t reg = 0; reg < 32; ++reg) {
++    EXPECT_EQ(actual.ppc64->regs[reg], expected.uc_mcontext.gp_regs[reg]);
++  }
++
++  EXPECT_EQ(memcmp(actual.ppc64->fpregs, expected.uc_mcontext.fp_regs,
++            sizeof(actual.ppc64->fpregs)), 0);
++}
+ #else
+ #error Port.
+ #endif
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/process_reader_linux.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/process_reader_linux.cc
+@@ -108,6 +108,8 @@ void ProcessReaderLinux::Thread::Initial
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+   stack_pointer = reader->Is64Bit() ? thread_info.thread_context.t64.regs[29]
+                                     : thread_info.thread_context.t32.regs[29];
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++  stack_pointer = thread_info.thread_context.t64.gpr[1];
+ #else
+ #error Port.
+ #endif
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/signal_context.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/signal_context.h
+@@ -422,6 +422,93 @@ static_assert(offsetof(UContext<ContextT
+               "context offset mismatch");
+ #endif
+ 
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++
++struct SignalThreadContext64 {
++  uint64_t regs[32];
++  uint64_t nip;
++  uint64_t msr;
++  uint64_t orig_r3;
++  uint64_t ctr;
++  uint64_t lnk;
++  uint64_t xer;
++  uint64_t ccr;
++  uint64_t softe;
++  uint64_t trap;
++  uint64_t dar;
++  uint64_t dsisr;
++  uint64_t result;
++  uint64_t dscr;
++  uint64_t fpr0[3];
++};
++
++struct SignalFloatContext64 {
++  double regs[32];
++  double fpscr;
++};
++
++struct SignalVectorContext64 {
++  int32_t vrregs[32][4];
++  struct {
++    int32_t __pad[3];
++    int32_t vscr_word;
++  } vscr;
++  int32_t vrsave;
++  int32_t __pad[3];
++} __attribute__((__aligned__(16)));
++
++
++#pragma pack(pop)
++struct MContext64 {
++  uint64_t reserved[4];
++  int32_t signal;
++  int32_t __pad0;
++  uint64_t handler;
++  uint64_t oldmask;
++  uint64_t pt_regs_ptr;
++  SignalThreadContext64 gp_regs;
++  SignalFloatContext64  fp_regs;
++  SignalVectorContext64 *v_regs;
++#ifdef __GLIBC__
++  int64_t vmx_reserve[69];
++#else
++  int64_t vmx_reserve[101];
++#endif
++};
++
++struct ContextTraits64 : public Traits64 {
++  using MContext = MContext64;
++  using SignalThreadContext = SignalThreadContext64;
++  using SignalFloatContext = SignalFloatContext64;
++  using SignalVectorContext = SignalVectorContext64;
++  using CPUContext = CPUContextPPC64;
++};
++
++struct ContextTraits32 : public Traits32 {};
++
++struct UContext {
++  uint64_t flags;
++  uint64_t link;
++  SignalStack<ContextTraits64> stack;
++  Sigset<ContextTraits64> sigmask;
++  MContext64 mcontext;
++};
++#pragma pack(push, 1)
++
++static_assert(sizeof(UContext) == sizeof(ucontext_t),
++              "ucontext_t size mismatch");
++static_assert(sizeof(MContext64) == sizeof(mcontext_t),
++              "mcontext_t size mismatch");
++static_assert(sizeof(SignalThreadContext64) == sizeof(gregset_t),
++              "gregset_t size mismatch");
++static_assert(sizeof(SignalFloatContext64) == sizeof(fpregset_t),
++              "fpregset_t size mismatch");
++static_assert(sizeof(SignalVectorContext64) == sizeof(vrregset_t),
++              "vrregset_t size mismatch");
++static_assert(offsetof(UContext, mcontext) ==
++              offsetof(ucontext_t, uc_mcontext), "mcontext offset mismatch");
++static_assert(offsetof(MContext64, gp_regs) ==
++              offsetof(mcontext_t, gp_regs), "gp_regs offset mismatch");
+ #else
+ #error Port.
+ #endif  // ARCH_CPU_X86_FAMILY
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/system_snapshot_linux.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/system_snapshot_linux.cc
+@@ -204,6 +204,8 @@ CPUArchitecture SystemSnapshotLinux::Get
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+   return process_reader_->Is64Bit() ? kCPUArchitectureMIPS64EL
+                                     : kCPUArchitectureMIPSEL;
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++  return kCPUArchitecturePPC64;
+ #else
+ #error port to your architecture
+ #endif
+@@ -219,6 +221,9 @@ uint32_t SystemSnapshotLinux::CPURevisio
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+   // Not implementable on MIPS
+   return 0;
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++  // Not yet implemented on PPC64
++  return 0;
+ #else
+ #error port to your architecture
+ #endif
+@@ -239,6 +244,9 @@ std::string SystemSnapshotLinux::CPUVend
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+   // Not implementable on MIPS
+   return std::string();
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++  // Not yet implemented on PPC64
++  return std::string();
+ #else
+ #error port to your architecture
+ #endif
+@@ -372,6 +380,9 @@ bool SystemSnapshotLinux::NXEnabled() co
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+   // Not implementable on MIPS
+   return false;
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++  // Not yet implemented on PPC64
++  return false;
+ #else
+ #error Port.
+ #endif  // ARCH_CPU_X86_FAMILY
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/test_modules.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/test_modules.cc
+@@ -110,6 +110,8 @@ bool WriteTestModule(const base::FilePat
+   module.ehdr.e_machine = EM_AARCH64;
+ #elif defined(ARCH_CPU_MIPSEL) || defined(ARCH_CPU_MIPS64EL)
+   module.ehdr.e_machine = EM_MIPS;
++#elif defined(ARCH_CPU_PPC64)
++  module.ehdr.e_machine = EM_PPC64;
+ #endif
+ 
+   module.ehdr.e_version = EV_CURRENT;
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/thread_snapshot_linux.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/thread_snapshot_linux.cc
+@@ -186,6 +186,14 @@ bool ThreadSnapshotLinux::Initialize(Pro
+         thread.thread_info.float_context.f32,
+         context_.mipsel);
+   }
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++  context_.architecture = kCPUArchitecturePPC64;
++  context_.ppc64 = &context_union_.ppc64;
++  InitializeCPUContextPPC64<ContextTraits64>(
++      thread.thread_info.thread_context.t64,
++      thread.thread_info.float_context.f64,
++      thread.thread_info.vector_context.v64,
++      context_.ppc64);
+ #else
+ #error Port.
+ #endif
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/thread_snapshot_linux.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/thread_snapshot_linux.h
+@@ -68,6 +68,8 @@ class ThreadSnapshotLinux final : public
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+     CPUContextMIPS mipsel;
+     CPUContextMIPS64 mips64;
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++    CPUContextPPC64 ppc64;
+ #else
+ #error Port.
+ #endif  // ARCH_CPU_X86_FAMILY
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/util/linux/auxiliary_vector.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/util/linux/auxiliary_vector.cc
+@@ -56,6 +56,11 @@ bool AuxiliaryVector::Read(PtraceConnect
+     if (type == AT_IGNORE) {
+       continue;
+     }
++#if defined(ARCH_CPU_PPC64_FAMILY)
++    if (type == AT_IGNOREPPC) {
++      continue;
++    }
++#endif
+     if (!MapInsertOrReplace(&values_, type, value, nullptr)) {
+       LOG(ERROR) << "duplicate auxv entry";
+       return false;
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/util/linux/ptracer.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/util/linux/ptracer.cc
+@@ -401,6 +401,64 @@ bool GetThreadArea64(pid_t tid,
+   return true;
+ }
+ 
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++// PPC64 has had HAVE_ARCH_TRACEHOOK set since 2.6.27 (even before x86 had it).
++// That means we can simply use PTRACE_GETREGESET.
++
++template <typename Destination>
++bool GetRegisterSet(pid_t tid, int set, Destination* dest, bool can_log) {
++  iovec iov;
++  iov.iov_base = reinterpret_cast<void*>(dest);
++  iov.iov_len = sizeof(*dest);
++  if (ptrace(PTRACE_GETREGSET, tid, reinterpret_cast<void*>(set), &iov) != 0) {
++    PLOG_IF(ERROR, can_log) << "ptrace";
++    return false;
++  }
++  if (iov.iov_len != sizeof(*dest)) {
++    LOG_IF(ERROR, can_log) << "Unexpected registers size";
++    return false;
++  }
++  return true;
++}
++
++bool GetVectorRegisters64(pid_t tid,
++                          VectorContext* context,
++                          bool can_log) {
++  return GetRegisterSet(tid, NT_PPC_VMX, &context->v64, can_log);
++}
++
++bool GetFloatingPointRegisters64(pid_t tid,
++                                 FloatContext* context,
++                                 bool can_log) {
++  return GetRegisterSet(tid, NT_PRFPREG, &context->f64, can_log);
++}
++
++bool GetThreadArea64(pid_t tid,
++                     const ThreadContext& context,
++                     LinuxVMAddress* address,
++                     bool can_log) {
++  // PPC64 doesn't have PTRACE_GET_THREAD_AREA since the thread pointer
++  // is stored in GPR 13.
++  ThreadContext::t64_t tc;
++  if (!GetRegisterSet(tid, NT_PRSTATUS, &tc, can_log)) {
++    LOG_IF(ERROR, can_log) << "Unable to get thread pointer!";
++    return false;
++  }
++
++  *address = tc.gpr[13];
++
++  return true;
++}
++
++// Stubs for 32-bit functions not applicable on PPC64
++bool GetFloatingPointRegisters32(pid_t tid,
++                                 FloatContext* context,
++                                 bool can_log) { return false; }
++bool GetThreadArea32(pid_t tid,
++                     const ThreadContext &context,
++                     LinuxVMAddress *address,
++                     bool can_log) { return false; }
++
+ #else
+ #error Port.
+ #endif  // ARCH_CPU_X86_FAMILY
+@@ -497,6 +555,9 @@ bool Ptracer::GetThreadInfo(pid_t tid, T
+   if (is_64_bit_) {
+     return GetGeneralPurposeRegisters64(tid, &info->thread_context, can_log_) &&
+            GetFloatingPointRegisters64(tid, &info->float_context, can_log_) &&
++#if defined(ARCH_CPU_PPC64_FAMILY)
++           GetVectorRegisters64(tid, &info->vector_context, can_log_) &&
++#endif
+            GetThreadArea64(tid,
+                            info->thread_context,
+                            &info->thread_specific_data_address,
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/util/linux/thread_info.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/util/linux/thread_info.h
+@@ -39,6 +39,13 @@ struct user_vfp_exc {
+ #include <android/api-level.h>
+ #endif
+ 
++#if defined(ARCH_CPU_PPC64_FAMILY)
++#include <sys/ucontext.h>
++#if !defined(__GLIBC__)
++#include <asm/ptrace.h>
++#endif
++#endif
++
+ namespace crashpad {
+ 
+ //! \brief The set of general purpose registers for an architecture family.
+@@ -90,6 +97,8 @@ union ThreadContext {
+     uint32_t cp0_status;
+     uint32_t cp0_cause;
+     uint32_t padding1_;
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++    // PPC64 is 64-bit
+ #else
+ #error Port.
+ #endif  // ARCH_CPU_X86_FAMILY
+@@ -143,6 +152,21 @@ union ThreadContext {
+     uint64_t cp0_badvaddr;
+     uint64_t cp0_status;
+     uint64_t cp0_cause;
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++    // Reflects struct pt_regs in asm/ptrace.h.
++    uint64_t gpr[32];
++    uint64_t nip;
++    uint64_t msr;
++    uint64_t orig_gpr3;
++    uint64_t ctr;
++    uint64_t lnk;
++    uint64_t xer;
++    uint64_t ccr;
++    uint64_t softe;
++    uint64_t trap;
++    uint64_t dar;
++    uint64_t dsisr;
++    uint64_t result;
+ #else
+ #error Port.
+ #endif  // ARCH_CPU_X86_FAMILY
+@@ -154,6 +178,8 @@ union ThreadContext {
+   using NativeThreadContext = user_regs;
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+ // No appropriate NativeThreadsContext type available for MIPS
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++  using NativeThreadContext = struct pt_regs;
+ #else
+ #error Port.
+ #endif  // ARCH_CPU_X86_FAMILY || ARCH_CPU_ARM64
+@@ -229,6 +255,9 @@ union FloatContext {
+     } fpregs[32];
+     uint32_t fpcsr;
+     uint32_t fpu_id;
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++    // Crashpad's PPC support is 64-bit only, so this
++    // 32bit-only struct is declared as empty.
+ #else
+ #error Port.
+ #endif  // ARCH_CPU_X86_FAMILY
+@@ -263,6 +292,10 @@ union FloatContext {
+     double fpregs[32];
+     uint32_t fpcsr;
+     uint32_t fpu_id;
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++    // Reflects fpregset_t in sys/ucontext.h
++    double fpregs[32];
++    double fpscr;
+ #else
+ #error Port.
+ #endif  // ARCH_CPU_X86_FAMILY
+@@ -291,6 +324,8 @@ union FloatContext {
+   static_assert(sizeof(f64) == sizeof(user_fpsimd_struct), "Size mismatch");
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+ // No appropriate floating point context native type for available MIPS.
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++  static_assert(sizeof(f64) == sizeof(fpregset_t), "Size mismatch");
+ #else
+ #error Port.
+ #endif  // ARCH_CPU_X86
+@@ -298,6 +333,26 @@ union FloatContext {
+ static_assert(std::is_standard_layout<FloatContext>::value,
+               "Not standard layout");
+ 
++//! \brief The vector registers used for an architecture family
++union VectorContext {
++  struct v32_t {} v32;
++#if defined(ARCH_CPU_PPC64_FAMILY)
++  __attribute__((__aligned__(16))) // Vector context must be doubleword aligned.
++#endif
++  struct v64_t {
++#if defined(ARCH_CPU_PPC64_FAMILY)
++    // Reflects vrregset_t in sys/ucontext.h
++    uint32_t vrregs[32][4];
++    struct {
++      uint32_t __pad[3];
++      uint32_t vscr_word;
++    } vscr;
++    uint32_t vrsave;
++    uint32_t __pad[3];
++#endif
++  } v64;
++};
++
+ //! \brief A collection of `ptrace`-able information about a thread.
+ struct ThreadInfo {
+   ThreadInfo();
+@@ -309,6 +364,9 @@ struct ThreadInfo {
+   //! \brief The floating point registers for the thread.
+   FloatContext float_context;
+ 
++  //! \brief (Optional) The vector registers used for the thread.
++  VectorContext vector_context;
++
+   //! \brief The thread-local storage address for the thread.
+   LinuxVMAddress thread_specific_data_address;
+ };
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/util/misc/capture_context.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/util/misc/capture_context.h
+@@ -69,6 +69,7 @@ using NativeCPUContext = ucontext_t;
+ //!     macOS/Linux/Fuchsia | x86_64       | `%%rdi`
+ //!     Linux               | ARM/ARM64    | `r0`/`x0`
+ //!     Linux               | MIPS/MIPS64  | `$a0`
++//!     Linux               | PPC64        | `r3`
+ //!
+ //!     Additionally, the value `LR` on ARM/ARM64 will be the return address of
+ //!     this function.
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/util/misc/capture_context_linux.S
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/util/misc/capture_context_linux.S
+@@ -32,7 +32,7 @@
+   .balign 4, 0x0
+   .type CAPTURECONTEXT_SYMBOL, %function
+   .type CAPTURECONTEXT_SYMBOL2, %function
+-#elif defined(__mips__)
++#elif defined(__mips__) || defined(__powerpc64__)
+   .balign 4, 0x0
+ #endif
+ 
+@@ -423,4 +423,214 @@ CAPTURECONTEXT_SYMBOL2:
+   jr $ra
+ 
+   .set at
++#elif defined(__powerpc64__)
++  // Store r0-r31
++  std 0, 0xe8(3)   // context->uc_mcontext.gp_regs[0]
++  std 1, 0xf0(3)   // context->uc_mcontext.gp_regs[1]
++  std 2, 0xf8(3)   // context->uc_mcontext.gp_regs[2]
++  // note that r3's original value was lost
++  std 3, 0x100(3)  // context->uc_mcontext.gp_regs[3]
++  std 4, 0x108(3)  // context->uc_mcontext.gp_regs[4]
++  std 5, 0x110(3)  // context->uc_mcontext.gp_regs[5]
++  std 6, 0x118(3)  // context->uc_mcontext.gp_regs[6]
++  std 7, 0x120(3)  // context->uc_mcontext.gp_regs[7]
++  std 8, 0x128(3)  // context->uc_mcontext.gp_regs[8]
++  std 9, 0x130(3)  // context->uc_mcontext.gp_regs[9]
++  std 10, 0x138(3) // context->uc_mcontext.gp_regs[10]
++  std 11, 0x140(3) // context->uc_mcontext.gp_regs[11]
++  std 12, 0x148(3) // context->uc_mcontext.gp_regs[12]
++  std 13, 0x150(3) // context->uc_mcontext.gp_regs[13]
++  std 14, 0x158(3) // context->uc_mcontext.gp_regs[14]
++  std 15, 0x160(3) // context->uc_mcontext.gp_regs[15]
++  std 16, 0x168(3) // context->uc_mcontext.gp_regs[16]
++  std 17, 0x170(3) // context->uc_mcontext.gp_regs[17]
++  std 18, 0x178(3) // context->uc_mcontext.gp_regs[18]
++  std 19, 0x180(3) // context->uc_mcontext.gp_regs[19]
++  std 20, 0x188(3) // context->uc_mcontext.gp_regs[20]
++  std 21, 0x190(3) // context->uc_mcontext.gp_regs[21]
++  std 22, 0x198(3) // context->uc_mcontext.gp_regs[22]
++  std 23, 0x1a0(3) // context->uc_mcontext.gp_regs[23]
++  std 24, 0x1a8(3) // context->uc_mcontext.gp_regs[24]
++  std 25, 0x1b0(3) // context->uc_mcontext.gp_regs[25]
++  std 26, 0x1b8(3) // context->uc_mcontext.gp_regs[26]
++  std 27, 0x1c0(3) // context->uc_mcontext.gp_regs[27]
++  std 28, 0x1c8(3) // context->uc_mcontext.gp_regs[28]
++  std 29, 0x1d0(3) // context->uc_mcontext.gp_regs[29]
++  std 30, 0x1d8(3) // context->uc_mcontext.gp_regs[30]
++  std 31, 0x1e0(3) // context->uc_mcontext.gp_regs[31]
++
++  // For NIP, we can use the value in the link register
++  mflr 0
++  std 0, 0x1e8(3) // context->uc_mcontext.gp_regs[PT_NIP]
++
++  // CTR
++  mfctr 0
++  std 0, 0x200(3) // context->uc_mcontext.gp_regs[PT_CTR]
++
++  // For LNK, we'll use the caller's LR save area (2 stack frames up).
++  // r4 can be used as a scratch register since it has already been saved.
++  ld 4, 0(1)
++  ld 4, 16(4)
++  std 4, 0x208(3) // context->uc_mcontext.gp_regs[PT_LNK]
++
++  // XER
++  mfxer 0
++  std 0, 0x210(3) // context->uc_mcontext.gp_regs[PT_XER]
++
++  // CCR
++  mfcr 0
++  std 0, 0x218(3) // context->uc_mcontext.gp_regs[PT_CCR]
++
++  // MSR, orig_r3, MQ, TRAP, DAR, DSISR, RESULT, DSCR,
++  // not used or not relevant,  zero them out.
++  li 4, 0
++  std 4, 0x1f0(3) // context->uc_mcontext.gp_regs[PT_MSR]
++  std 4, 0x1f8(3) // context->uc_mcontext.gp_regs[PT_ORIG_R3]
++  std 4, 0x220(3) // context->uc_mcontext.gp_regs[PT_MQ]
++  std 4, 0x228(3) // context->uc_mcontext.gp_regs[PT_TRAP]
++  std 4, 0x230(3) // context->uc_mcontext.gp_regs[PT_DAR]
++  std 4, 0x238(3) // context->uc_mcontext.gp_regs[PT_DSISR]
++  std 4, 0x240(3) // context->uc_mcontext.gp_regs[PT_RESULT]
++  std 4, 0x248(3) // context->uc_mcontext.gp_regs[PT_DSCR]
++
++  // Update context->uc_mcontext.regs to point to gp_regs
++  addi 0, 3, 0xe8
++  std 0, 0xe0(3)
++
++  // Save floating point registers 0-31
++  stfd 0, 0x268(3)  // context->uc_mcontext.fp_regs[0]
++  stfd 1, 0x270(3)  // context->uc_mcontext.fp_regs[1]
++  stfd 2, 0x278(3)  // context->uc_mcontext.fp_regs[2]
++  stfd 3, 0x280(3)  // context->uc_mcontext.fp_regs[3]
++  stfd 4, 0x288(3)  // context->uc_mcontext.fp_regs[4]
++  stfd 5, 0x290(3)  // context->uc_mcontext.fp_regs[5]
++  stfd 6, 0x298(3)  // context->uc_mcontext.fp_regs[6]
++  stfd 7, 0x2a0(3)  // context->uc_mcontext.fp_regs[7]
++  stfd 8, 0x2a8(3)  // context->uc_mcontext.fp_regs[8]
++  stfd 9, 0x2b0(3)  // context->uc_mcontext.fp_regs[9]
++  stfd 10, 0x2b8(3) // context->uc_mcontext.fp_regs[10]
++  stfd 11, 0x2c0(3) // context->uc_mcontext.fp_regs[11]
++  stfd 12, 0x2c8(3) // context->uc_mcontext.fp_regs[12]
++  stfd 13, 0x2d0(3) // context->uc_mcontext.fp_regs[13]
++  stfd 14, 0x2d8(3) // context->uc_mcontext.fp_regs[14]
++  stfd 15, 0x2e0(3) // context->uc_mcontext.fp_regs[15]
++  stfd 16, 0x2e8(3) // context->uc_mcontext.fp_regs[16]
++  stfd 17, 0x2f0(3) // context->uc_mcontext.fp_regs[17]
++  stfd 18, 0x2f8(3) // context->uc_mcontext.fp_regs[18]
++  stfd 19, 0x300(3) // context->uc_mcontext.fp_regs[19]
++  stfd 20, 0x308(3) // context->uc_mcontext.fp_regs[20]
++  stfd 21, 0x310(3) // context->uc_mcontext.fp_regs[21]
++  stfd 22, 0x318(3) // context->uc_mcontext.fp_regs[22]
++  stfd 23, 0x320(3) // context->uc_mcontext.fp_regs[23]
++  stfd 24, 0x328(3) // context->uc_mcontext.fp_regs[24]
++  stfd 25, 0x330(3) // context->uc_mcontext.fp_regs[25]
++  stfd 26, 0x338(3) // context->uc_mcontext.fp_regs[26]
++  stfd 27, 0x340(3) // context->uc_mcontext.fp_regs[27]
++  stfd 28, 0x348(3) // context->uc_mcontext.fp_regs[28]
++  stfd 29, 0x350(3) // context->uc_mcontext.fp_regs[29]
++  stfd 30, 0x358(3) // context->uc_mcontext.fp_regs[30]
++  stfd 31, 0x360(3) // context->uc_mcontext.fp_regs[31]
++
++  // FPSCR
++  mffs 0
++  stfd 0, 0x368(3) // context->uc_mcontext.fp_regs[32]
++
++  // Save VMX Vector registers
++  // Update r4 to contain the base address of vmx_reserve
++  addi 4, 3, 0x378
++  // Ensure that it is quadword aligned
++  andi. 5, 4, 0xF
++  beq 1f // No alignment is necessary
++  // Address is doubleword aligned and not quadword aligned, add 8
++  addi 4, 4, 8
++
++1:
++  // Store VMX registers 0-31
++  // r4 will contain the base address
++  // r5 will contain the index
++  li 5, 0
++  stvx 0, 4, 5   // context->uc_mcontext.vmx_reserve[(align) + 0]
++  addi 5, 5, 16
++  stvx 1, 4, 5   // context->uc_mcontext.vmx_reserve[(align) + 1]
++  addi 5, 5, 16
++  stvx 2, 4, 5   // context->uc_mcontext.vmx_reserve[(align) + 2]
++  addi 5, 5, 16
++  stvx 3, 4, 5   // context->uc_mcontext.vmx_reserve[(align) + 3]
++  addi 5, 5, 16
++  stvx 4, 4, 5   // context->uc_mcontext.vmx_reserve[(align) + 4]
++  addi 5, 5, 16
++  stvx 5, 4, 5   // context->uc_mcontext.vmx_reserve[(align) + 5]
++  addi 5, 5, 16
++  stvx 6, 4, 5   // context->uc_mcontext.vmx_reserve[(align) + 6]
++  addi 5, 5, 16
++  stvx 7, 4, 5   // context->uc_mcontext.vmx_reserve[(align) + 7]
++  addi 5, 5, 16
++  stvx 8, 4, 5   // context->uc_mcontext.vmx_reserve[(align) + 8]
++  addi 5, 5, 16
++  stvx 9, 4, 5   // context->uc_mcontext.vmx_reserve[(align) + 9]
++  addi 5, 5, 16
++  stvx 10, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 10]
++  addi 5, 5, 16
++  stvx 11, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 11]
++  addi 5, 5, 16
++  stvx 12, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 12]
++  addi 5, 5, 16
++  stvx 13, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 13]
++  addi 5, 5, 16
++  stvx 14, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 14]
++  addi 5, 5, 16
++  stvx 15, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 15]
++  addi 5, 5, 16
++  stvx 16, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 16]
++  addi 5, 5, 16
++  stvx 17, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 17]
++  addi 5, 5, 16
++  stvx 18, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 18]
++  addi 5, 5, 16
++  stvx 19, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 19]
++  addi 5, 5, 16
++  stvx 20, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 20]
++  addi 5, 5, 16
++  stvx 21, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 21]
++  addi 5, 5, 16
++  stvx 22, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 22]
++  addi 5, 5, 16
++  stvx 23, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 23]
++  addi 5, 5, 16
++  stvx 24, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 24]
++  addi 5, 5, 16
++  stvx 25, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 25]
++  addi 5, 5, 16
++  stvx 26, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 26]
++  addi 5, 5, 16
++  stvx 27, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 27]
++  addi 5, 5, 16
++  stvx 28, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 28]
++  addi 5, 5, 16
++  stvx 29, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 29]
++  addi 5, 5, 16
++  stvx 30, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 30]
++  addi 5, 5, 16
++  stvx 31, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 31]
++  addi 5, 5, 16
++
++  // VSCR
++  mfvscr 0
++  stvx 0, 4, 5
++  addi 5, 5, 16
++
++  // VRSAVE
++  mfvrsave 0
++  stwx 0, 4, 5
++
++  // Update context->uc_mcontext.v_regs to point to vmx_reserve + alignment.
++  std 4, 0x370(3)
++
++  // Zero out all unused fields
++  li 4, 0
++  std 4, 0xc8(3) // context->uc_mcontext.signal
++  std 4, 0xd0(3) // context->uc_mcontext.handler
++  std 4, 0xd8(3) // context->uc_mcontext.oldmask
++
++  blr
+ #endif  // __i386__
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/util/misc/capture_context_test.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/util/misc/capture_context_test.cc
+@@ -57,7 +57,7 @@ void TestCaptureContext() {
+   uintptr_t pc = ProgramCounterFromContext(context_1);
+ 
+ #if !defined(ADDRESS_SANITIZER) && !defined(ARCH_CPU_MIPS_FAMILY) && \
+-    !defined(MEMORY_SANITIZER)
++    !defined(MEMORY_SANITIZER) && !defined(ARCH_CPU_PPC64_FAMILY)
+   // Sanitizers can cause enough code bloat that the “nearby” check would
+   // likely fail.
+   const uintptr_t kReferencePC =
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/util/misc/capture_context_test_util_linux.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/util/misc/capture_context_test_util_linux.cc
+@@ -35,6 +35,8 @@ void SanityCheckContext(const NativeCPUC
+   EXPECT_EQ(context.uc_mcontext.regs[0], FromPointerCast<uintptr_t>(&context));
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+   EXPECT_EQ(context.uc_mcontext.gregs[4], FromPointerCast<uintptr_t>(&context));
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++  EXPECT_EQ(context.uc_mcontext.gp_regs[3], FromPointerCast<uintptr_t>(&context));
+ #endif
+ }
+ 
+@@ -49,6 +51,8 @@ uintptr_t ProgramCounterFromContext(cons
+   return context.uc_mcontext.pc;
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+   return context.uc_mcontext.pc;
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++  return context.uc_mcontext.gp_regs[PT_NIP];
+ #endif
+ }
+ 
+@@ -63,6 +67,8 @@ uintptr_t StackPointerFromContext(const
+   return context.uc_mcontext.sp;
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+   return context.uc_mcontext.gregs[29];
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++  return context.uc_mcontext.gp_regs[1];
+ #endif
+ }
+ 
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/util/posix/signals_test.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/util/posix/signals_test.cc
+@@ -46,9 +46,9 @@ bool CanCauseSignal(int sig) {
+   return sig == SIGABRT ||
+          sig == SIGALRM ||
+          sig == SIGBUS ||
+-#if !defined(ARCH_CPU_ARM64)
++#if !defined(ARCH_CPU_ARM64) && !defined(ARCH_CPU_PPC64)
+          sig == SIGFPE ||
+-#endif  // !defined(ARCH_CPU_ARM64)
++#endif  // !defined(ARCH_CPU_ARM64) && !defined(ARCH_CPU_PPC64)
+ #if defined(ARCH_CPU_X86_FAMILY) || defined(ARCH_CPU_ARMEL)
+          sig == SIGILL ||
+ #endif  // defined(ARCH_CPU_X86_FAMILY) || defined(ARCH_CPU_ARMEL)
+@@ -117,9 +117,11 @@ void CauseSignal(int sig) {
+       break;
+     }
+ 
+-#if !defined(ARCH_CPU_ARM64)
++#if !defined(ARCH_CPU_ARM64) && !defined(ARCH_CPU_PPC64)
+     // ARM64 has hardware integer division instructions that don’t generate a
+     // trap for divide-by-zero, so this doesn’t produce SIGFPE.
++    //
++    // PPC64 fixed-point division by zero also doesn't produce a SIGFPE.
+     case SIGFPE: {
+       // Optimization makes this tricky, so get zero from a system call likely
+       // to succeed, and try to do something with the result.
+@@ -137,7 +139,7 @@ void CauseSignal(int sig) {
+       fstat(quotient, &stat_buf);
+       break;
+     }
+-#endif  // ARCH_CPU_ARM64
++#endif  // !defined(ARCH_CPU_ARM64) && !defined(ARCH_CPU_PPC64)
+ 
+ #if defined(ARCH_CPU_X86_FAMILY) || defined(ARCH_CPU_ARMEL)
+     case SIGILL: {
+--- a/src/3rdparty/chromium/third_party/dav1d/BUILD.gn
++++ b/src/3rdparty/chromium/third_party/dav1d/BUILD.gn
+@@ -196,6 +196,8 @@ static_library("dav1d_8bit") {
+     sources += arm_template_sources
+   } else if (current_cpu == "arm64") {
+     sources += arm_template_sources
++  } else if (current_cpu == "ppc64") {
++    sources += ppc64_template_sources
+   }
+ 
+   cflags = dav1d_copts
+@@ -226,6 +228,8 @@ static_library("dav1d_10bit") {
+     sources += arm_template_sources
+   } else if (current_cpu == "arm64") {
+     sources += arm_template_sources
++  } else if (current_cpu == "ppc64") {
++    sources += ppc64_template_sources
+   }
+ 
+   cflags = dav1d_copts
+@@ -283,6 +287,21 @@ if (current_cpu == "x86" || current_cpu
+     }
+ 
+     cflags = dav1d_copts
++  }
++} else if (current_cpu == "ppc64") {
++  static_library("dav1d_ppc") {
++    sources = [
++      "libdav1d/src/ppc/cpu.c",
++      "libdav1d/src/ppc/cpu.h",
++    ]
++
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [
++      "//build/config/compiler:no_chromium_code",
++      ":dav1d_config",
++    ]
++
++    cflags = dav1d_copts
+ 
+     deps = [ ":dav1d_headers" ]
+     allow_circular_includes_from = [ ":dav1d_headers" ]
+@@ -315,5 +334,7 @@ static_library("dav1d") {
+     }
+   } else if (current_cpu == "arm" || current_cpu == "arm64") {
+     deps += [ ":dav1d_arm" ]
++  } else if (current_cpu == "ppc64") {
++    deps += [ ":dav1d_ppc" ]
+   }
+ }
+--- a/src/3rdparty/chromium/third_party/dav1d/dav1d_generated.gni
++++ b/src/3rdparty/chromium/third_party/dav1d/dav1d_generated.gni
+@@ -103,6 +103,11 @@ arm_template_sources = [
+   "libdav1d/src/arm/mc_init_tmpl.c",
+ ]
+ 
++ppc64_template_sources = [
++  "libdav1d/src/ppc/cdef_init_tmpl.c",
++  "libdav1d/src/ppc/looprestoration_init_tmpl.c",
++]
++
+ template_sources = [
+   "libdav1d/src/cdef_apply_tmpl.c",
+   "libdav1d/src/cdef_tmpl.c",
+--- a/src/3rdparty/chromium/third_party/dav1d/generate_source.py
++++ b/src/3rdparty/chromium/third_party/dav1d/generate_source.py
+@@ -57,6 +57,8 @@ def _WriteGn(fd):
+   _WriteArray(fd, "arm64_asm_sources", _Glob("libdav1d/src/arm/64/*.S"))
+   _WriteArray(fd, "arm_template_sources", _Glob("libdav1d/src/arm/*_tmpl.c"))
+ 
++  _WriteArray(fd, "ppc64_template_sources", _Glob("libdav1d/src/ppc/*_tmpl.c"))
++
+   template_sources = _Glob("libdav1d/src/*_tmpl.c")
+   _WriteArray(fd, "template_sources", template_sources)
+ 
+--- a/src/3rdparty/chromium/third_party/dav1d/libdav1d/src/ppc/types.h
++++ b/src/3rdparty/chromium/third_party/dav1d/libdav1d/src/ppc/types.h
+@@ -51,4 +51,19 @@
+ #define u16l_to_i32(v) ((i32x4) vec_mergel((u16x8) v, vec_splat_u16(0)))
+ #define i16l_to_i32(v) ((i32x4) vec_unpackl((i16x8)v))
+ 
++#if defined(__clang__)
++#undef vec_splats
++#define vec_splats(N)                     \
++    _Generic((N),                         \
++        unsigned char:      ((u8x16)(N)), \
++        signed char:        ((i8x16)(N)), \
++        unsigned short:     ((u16x8)(N)), \
++        signed short:       ((i16x8)(N)), \
++        unsigned int:       ((u32x4)(N)), \
++        signed int:         ((i32x4)(N)), \
++        unsigned long long: ((u64x2)(N)), \
++        signed long long:   ((i64x2)(N))  \
++    )
++#endif
++
+ #endif /* DAV1D_SRC_PPC_TYPES_H */
+--- a/src/3rdparty/chromium/third_party/eigen3/BUILD.gn
++++ b/src/3rdparty/chromium/third_party/eigen3/BUILD.gn
+@@ -22,4 +22,8 @@ config("eigen_includes") {
+     # for this component on Windows on Arm due to compilation errors.
+     defines += [ "EIGEN_DONT_VECTORIZE" ]
+   }
++
++  if (target_cpu == "ppc64") {
++    defines += [ "EIGEN_DONT_VECTORIZE" ]
++  }
+ }
+--- a/src/3rdparty/chromium/third_party/libaom/BUILD.gn
++++ b/src/3rdparty/chromium/third_party/libaom/BUILD.gn
+@@ -37,6 +37,8 @@ if (enable_libaom) {
+     } else {
+       cpu_arch_full = "arm"
+     }
++  } else if (current_cpu == "ppc64") {
++    cpu_arch_full = "generic"
+   } else {
+     cpu_arch_full = current_cpu
+   }
+--- a/src/3rdparty/chromium/third_party/libgav1/options.gni
++++ b/src/3rdparty/chromium/third_party/libgav1/options.gni
+@@ -12,5 +12,5 @@ declare_args() {
+       is_chromeos_ash && (target_cpu == "arm" || target_cpu == "arm64")
+   use_libgav1_parser =
+       (is_chromeos || is_linux || is_win) &&
+-      (target_cpu == "x86" || target_cpu == "x64" || target_cpu == "arm64")
++      (target_cpu == "x86" || target_cpu == "x64" || target_cpu == "arm64" || target_cpu == "ppc64")
+ }
+--- a/src/3rdparty/chromium/third_party/lss/linux_syscall_support.h
++++ b/src/3rdparty/chromium/third_party/lss/linux_syscall_support.h
+@@ -4262,7 +4262,7 @@ struct kernel_statfs {
+       LSS_REG(2, buf);
+       LSS_BODY(void*, mmap2, "0"(__r2));
+     }
+-#else
++#elif !defined(__powerpc64__) /* ppc64 doesn't have mmap2 */
+     #define __NR__mmap2 __NR_mmap2
+     LSS_INLINE _syscall6(void*, _mmap2,            void*, s,
+                          size_t,                   l, int,               p,
+@@ -4373,7 +4373,7 @@ struct kernel_statfs {
+   #if defined(__i386__) ||                                                    \
+       defined(__ARM_ARCH_3__) || defined(__ARM_EABI__) ||                     \
+      (defined(__mips__) && _MIPS_SIM == _MIPS_SIM_ABI32) ||                   \
+-      defined(__PPC__) ||                                                     \
++     (defined(__PPC__) && !defined(__powerpc64__)) ||                                                     \
+      (defined(__s390__) && !defined(__s390x__))
+     /* On these architectures, implement mmap() with mmap2(). */
+     LSS_INLINE void* LSS_NAME(mmap)(void *s, size_t l, int p, int f, int d,
+@@ -4556,9 +4556,17 @@ struct kernel_statfs {
+     }
+   #endif
+   #if defined(__NR_fstatat64)
++    #if !defined(__GLIBC__)
++        // musl doesn't define fstatat64 fstatat
++        #undef fstatat64
++    #endif
+     LSS_INLINE _syscall4(int,   fstatat64,        int,   d,
+                          const char *,      p,
+                          struct kernel_stat64 *,   b,    int,   f)
++    #if !defined(__GLIBC__)
++    	// then restore it
++        #define fstatat64 fstatat
++    #endif
+   #endif
+   #if defined(__NR_waitpid)
+     // waitpid is polyfilled below when not available.
+--- a/src/3rdparty/chromium/third_party/pdfium/third_party/libpng16/pngpriv.h
++++ b/src/3rdparty/chromium/third_party/pdfium/third_party/libpng16/pngpriv.h
+@@ -196,11 +196,7 @@
+ #endif
+ 
+ #ifndef PNG_POWERPC_VSX_OPT
+-#  if defined(__PPC64__) && defined(__ALTIVEC__) && defined(__VSX__)
+-#     define PNG_POWERPC_VSX_OPT 2
+-#  else
+-#     define PNG_POWERPC_VSX_OPT 0
+-#  endif
++#  define PNG_POWERPC_VSX_OPT 0
+ #endif
+ 
+ #ifndef PNG_INTEL_SSE_OPT
+--- a/src/3rdparty/chromium/third_party/pffft/src/pffft.c
++++ b/src/3rdparty/chromium/third_party/pffft/src/pffft.c
+@@ -100,6 +100,7 @@
+    Altivec support macros 
+ */
+ #if !defined(PFFFT_SIMD_DISABLE) && (defined(__ppc__) || defined(__ppc64__))
++#include <altivec.h>
+ typedef vector float v4sf;
+ #  define SIMD_SZ 4
+ #  define VZERO() ((vector float) vec_splat_u8(0))
+--- a/src/3rdparty/chromium/third_party/skia/src/sksl/SkSLString.cpp
++++ b/src/3rdparty/chromium/third_party/skia/src/sksl/SkSLString.cpp
+@@ -142,7 +142,12 @@ String to_string(double value) {
+     if (needsDotZero) {
+         buffer << ".0";
+     }
+-    return String(buffer.str().c_str());
++
++    std::string ret(buffer.str());
++    if (signbit(value) && ret[0] == '.') {
++        ret[0] = '-';
++    }
++    return String(ret.c_str());
+ }
+ 
+ bool stod(const skstd::string_view& s, SKSL_FLOAT* value) {
+--- a/src/3rdparty/chromium/third_party/sqlite/src/amalgamation/sqlite3.c
++++ b/src/3rdparty/chromium/third_party/sqlite/src/amalgamation/sqlite3.c
+@@ -14628,7 +14628,8 @@ typedef INT16_TYPE LogEst;
+ # if defined(i386)      || defined(__i386__)      || defined(_M_IX86) ||    \
+      defined(__x86_64)  || defined(__x86_64__)    || defined(_M_X64)  ||    \
+      defined(_M_AMD64)  || defined(_M_ARM)        || defined(__x86)   ||    \
+-     defined(__ARMEL__) || defined(__AARCH64EL__) || defined(_M_ARM64)
++     defined(__ARMEL__) || defined(__AARCH64EL__) || defined(_M_ARM64) ||   \
++     defined(__powerpc64__) && (__BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__)
+ #   define SQLITE_BYTEORDER    1234
+ # elif defined(sparc)     || defined(__ppc__) || \
+        defined(__ARMEB__) || defined(__AARCH64EB__)
+--- a/src/3rdparty/chromium/third_party/sqlite/src/amalgamation_dev/sqlite3.c
++++ b/src/3rdparty/chromium/third_party/sqlite/src/amalgamation_dev/sqlite3.c
+@@ -14641,7 +14641,8 @@ typedef INT16_TYPE LogEst;
+ # if defined(i386)      || defined(__i386__)      || defined(_M_IX86) ||    \
+      defined(__x86_64)  || defined(__x86_64__)    || defined(_M_X64)  ||    \
+      defined(_M_AMD64)  || defined(_M_ARM)        || defined(__x86)   ||    \
+-     defined(__ARMEL__) || defined(__AARCH64EL__) || defined(_M_ARM64)
++     defined(__ARMEL__) || defined(__AARCH64EL__) || defined(_M_ARM64) ||   \
++     defined(__powerpc64__) && (__BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__)
+ #   define SQLITE_BYTEORDER    1234
+ # elif defined(sparc)     || defined(__ppc__) || \
+        defined(__ARMEB__) || defined(__AARCH64EB__)
+--- a/src/3rdparty/chromium/third_party/sqlite/src/ext/rtree/rtree.c
++++ b/src/3rdparty/chromium/third_party/sqlite/src/ext/rtree/rtree.c
+@@ -450,7 +450,7 @@ struct RtreeMatchArg {
+ #if defined(i386)     || defined(__i386__)   || defined(_M_IX86) ||    \
+     defined(__x86_64) || defined(__x86_64__) || defined(_M_X64)  ||    \
+     defined(_M_AMD64) || defined(_M_ARM)     || defined(__x86)   ||    \
+-    defined(__arm__)
++    defined(__arm__) || defined(__powerpc64__) && (__BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__)
+ # define SQLITE_BYTEORDER    1234
+ #elif defined(sparc)    || defined(__ppc__)
+ # define SQLITE_BYTEORDER    4321
+--- a/src/3rdparty/chromium/third_party/sqlite/src/src/sqliteInt.h
++++ b/src/3rdparty/chromium/third_party/sqlite/src/src/sqliteInt.h
+@@ -890,7 +890,8 @@ typedef INT16_TYPE LogEst;
+ # if defined(i386)      || defined(__i386__)      || defined(_M_IX86) ||    \
+      defined(__x86_64)  || defined(__x86_64__)    || defined(_M_X64)  ||    \
+      defined(_M_AMD64)  || defined(_M_ARM)        || defined(__x86)   ||    \
+-     defined(__ARMEL__) || defined(__AARCH64EL__) || defined(_M_ARM64)
++     defined(__ARMEL__) || defined(__AARCH64EL__) || defined(_M_ARM64) || \
++     defined(__powerpc64__) && (__BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__)
+ #   define SQLITE_BYTEORDER    1234
+ # elif defined(sparc)     || defined(__ppc__) || \
+        defined(__ARMEB__) || defined(__AARCH64EB__)
+--- a/src/3rdparty/chromium/third_party/webrtc/modules/desktop_capture/differ_block.cc
++++ b/src/3rdparty/chromium/third_party/webrtc/modules/desktop_capture/differ_block.cc
+@@ -30,11 +30,7 @@ bool VectorDifference(const uint8_t* ima
+   static bool (*diff_proc)(const uint8_t*, const uint8_t*) = nullptr;
+ 
+   if (!diff_proc) {
+-#if defined(WEBRTC_ARCH_ARM_FAMILY) || defined(WEBRTC_ARCH_MIPS_FAMILY)
+-    // For ARM and MIPS processors, always use C version.
+-    // TODO(hclam): Implement a NEON version.
+-    diff_proc = &VectorDifference_C;
+-#else
++#if defined(WEBRTC_ARCH_X86_FAMILY)
+     bool have_sse2 = GetCPUInfo(kSSE2) != 0;
+     // For x86 processors, check if SSE2 is supported.
+     if (have_sse2 && kBlockSize == 32) {
+@@ -44,6 +40,10 @@ bool VectorDifference(const uint8_t* ima
+     } else {
+       diff_proc = &VectorDifference_C;
+     }
++#else
++    // For other processors, always use C version.
++    // TODO(hclam): Implement a NEON version.
++    diff_proc = &VectorDifference_C;
+ #endif
+   }
+ 
+--- a/src/3rdparty/chromium/v8/BUILD.gn
++++ b/src/3rdparty/chromium/v8/BUILD.gn
+@@ -1083,6 +1083,12 @@ config("toolchain") {
+     }
+     if (host_byteorder == "little") {
+       defines += [ "V8_TARGET_ARCH_PPC_LE" ]
++      cflags += [
++        # Enable usage of AltiVec, VSX, and other POWER8 and higher features
++        "-mcpu=power8",
++        "-maltivec",
++        "-mvsx",
++      ]
+     } else if (host_byteorder == "big") {
+       defines += [ "V8_TARGET_ARCH_PPC_BE" ]
+       if (current_os == "aix") {
+--- a/src/3rdparty/chromium/ui/gl/features.gni
++++ b/src/3rdparty/chromium/ui/gl/features.gni
+@@ -35,7 +35,8 @@ declare_args() {
+                         (is_mac && use_egl) || is_chromeos_ash || is_fuchsia) &&
+                        (target_cpu == "x86" || target_cpu == "x64" ||
+                         target_cpu == "arm" || target_cpu == "arm64" ||
+-                        target_cpu == "mipsel" || target_cpu == "mips64el")
++                        target_cpu == "mipsel" || target_cpu == "mips64el" ||
++                        target_cpu == "ppc64")
+ }
+ 
+ use_glx = use_x11 || ozone_platform_x11
+--- a/src/3rdparty/chromium/v8/test/BUILD.gn
++++ b/src/3rdparty/chromium/v8/test/BUILD.gn
+@@ -42,7 +42,6 @@ group("gn_all") {
+       "benchmarks/cpp:gn_all",
+       "cctest:cctest",
+       "cctest:generate-bytecode-expectations",
+-      "unittests:unittests",
+     ]
+   }
+ }
+@@ -84,7 +83,6 @@ group("v8_bot_default") {
+     "message:v8_message",
+     "mjsunit:v8_mjsunit",
+     "mkgrokdump:mkgrokdump",
+-    "unittests:unittests",
+     "webkit:v8_webkit",
+   ]
+ 
+@@ -109,7 +107,6 @@ group("v8_default") {
+     "message:v8_message",
+     "mjsunit:v8_mjsunit",
+     "mkgrokdump:mkgrokdump",
+-    "unittests:unittests",
+   ]
+ 
+   if (v8_enable_webassembly) {
+--- /dev/null
++++ b/src/3rdparty/chromium/dev/null
+@@ -0,0 +1,39 @@
++/*
++ * Autogenerated by the Meson build system.
++ * Do not edit, your changes will be lost.
++ */
++
++#pragma once
++
++#define ARCH_AARCH64 0
++
++#define ARCH_ARM 0
++
++#define ARCH_PPC64LE 1
++
++#define ARCH_X86 0
++
++#define ARCH_X86_32 0
++
++#define ARCH_X86_64 0
++
++#define CONFIG_16BPC 1
++
++#define CONFIG_8BPC 1
++
++// #define CONFIG_LOG 1 -- Logging is controlled by Chromium
++
++#define ENDIANNESS_BIG 0
++
++#define HAVE_ASM 1
++
++#define HAVE_CLOCK_GETTIME 1
++
++#define HAVE_DLSYM 1
++
++#define HAVE_GETAUXVAL 1
++
++#define HAVE_POSIX_MEMALIGN 1
++
++#define HAVE_UNISTD_H 1
++
+--- a/src/3rdparty/chromium/third_party/abseil-cpp/absl/base/internal/unscaledcycleclock.h
++++ b/src/3rdparty/chromium/third_party/abseil-cpp/absl/base/internal/unscaledcycleclock.h
+@@ -46,7 +46,7 @@
+ 
+ // The following platforms have an implementation of a hardware counter.
+ #if defined(__i386__) || defined(__x86_64__) || defined(__aarch64__) || \
+-  defined(__powerpc__) || defined(__ppc__) || \
++  ((defined(__powerpc__) || defined(__ppc__)) && defined(__GLIBC__)) || \
+   defined(_M_IX86) || defined(_M_X64)
+ #define ABSL_HAVE_UNSCALED_CYCLECLOCK_IMPLEMENTATION 1
+ #else
+--- a/src/3rdparty/chromium/third_party/abseil-cpp/absl/debugging/internal/stacktrace_config.h
++++ b/src/3rdparty/chromium/third_party/abseil-cpp/absl/debugging/internal/stacktrace_config.h
+@@ -59,7 +59,7 @@
+ #elif defined(__i386__) || defined(__x86_64__)
+ #define ABSL_STACKTRACE_INL_HEADER \
+   "absl/debugging/internal/stacktrace_x86-inl.inc"
+-#elif defined(__ppc__) || defined(__PPC__)
++#elif defined(__ppc__) || defined(__PPC__) && defined(__GLIBC__)
+ #define ABSL_STACKTRACE_INL_HEADER \
+   "absl/debugging/internal/stacktrace_powerpc-inl.inc"
+ #elif defined(__aarch64__)
+--- a/src/3rdparty/chromium/base/allocator/partition_allocator/partition_alloc_config.h
++++ b/src/3rdparty/chromium/base/allocator/partition_allocator/partition_alloc_config.h
+@@ -100,7 +100,8 @@ static_assert(sizeof(void*) != 8, "");
+ // PUT_REF_COUNT_IN_PREVIOUS_SLOT does. In this case the refcount overlaps with
+ // the next pointer shadow for the smallest bucket.
+ #if !(defined(OS_MAC) && defined(ARCH_CPU_ARM64)) && \
+-    !BUILDFLAG(PUT_REF_COUNT_IN_PREVIOUS_SLOT)
++    !BUILDFLAG(PUT_REF_COUNT_IN_PREVIOUS_SLOT) && \
++    (!defined(__GLIBC) && !defined(__powerpc64__))
+ #define PA_HAS_FREELIST_HARDENING
+ #endif
+ 
+--- a/src/3rdparty/chromium/build/download_nacl_toolchains.py
++++ b/src/3rdparty/chromium/build/download_nacl_toolchains.py
+@@ -13,6 +13,8 @@ import sys
+ 
+ 
+ def Main(args):
++  if 'disable_nacl=1' in os.environ.get('GYP_DEFINES', ''):
++    return 0
+   script_dir = os.path.dirname(os.path.abspath(__file__))
+   src_dir = os.path.dirname(script_dir)
+   nacl_dir = os.path.join(src_dir, 'native_client')
+--- a/src/3rdparty/chromium/chrome/installer/linux/BUILD.gn
++++ b/src/3rdparty/chromium/chrome/installer/linux/BUILD.gn
+@@ -100,8 +100,6 @@ packaging_files = packaging_files_binari
+                     "$root_out_dir/xdg-mime",
+                     "$root_out_dir/xdg-settings",
+                     "$root_out_dir/locales/en-US.pak",
+-                    "$root_out_dir/MEIPreload/manifest.json",
+-                    "$root_out_dir/MEIPreload/preloaded_data.pb",
+                   ]
+ 
+ action_foreach("calculate_deb_dependencies") {
+@@ -321,7 +319,6 @@ group("installer_deps") {
+     ":theme_files",
+     "//chrome",
+     "//chrome:packed_resources",
+-    "//chrome/browser/resources/media/mei_preload:component",
+     "//components/crash/core/app:chrome_crashpad_handler",
+     "//sandbox/linux:chrome_sandbox",
+   ]
+--- /dev/null
++++ b/src/3rdparty/chromium/sandbox/linux/system_headers/ppc64_linux_syscalls.h
+@@ -0,0 +1,12 @@
++// Copyright 2014 The Chromium Authors. All rights reserved.
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++#ifndef SANDBOX_LINUX_SYSTEM_HEADERS_PPC64_LINUX_SYSCALLS_H_
++#define SANDBOX_LINUX_SYSTEM_HEADERS_PPC64_LINUX_SYSCALLS_H_
++
++#include <asm/unistd.h>
++
++//TODO: is it necessary to redefine syscall numbers for PPC64?
++
++#endif  // SANDBOX_LINUX_SYSTEM_HEADERS_PPC64_LINUX_SYSCALLS_H_
+--- /dev/null
++++ b/src/3rdparty/chromium/sandbox/linux/system_headers/ppc64_linux_ucontext.h
+@@ -0,0 +1,12 @@
++// Copyright 2014 The Chromium Authors. All rights reserved.
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++#ifndef SANDBOX_LINUX_SYSTEM_HEADERS_PPC64_LINUX_UCONTEXT_H_
++#define SANDBOX_LINUX_SYSTEM_HEADERS_PPC64_LINUX_UCONTEXT_H_
++
++#include <sys/ucontext.h>
++
++//TODO: is it necessary to redefine ucontext on PPC64?
++
++#endif  // SANDBOX_LINUX_SYSTEM_HEADERS_PPC64_LINUX_UCONTEXT_H_
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/util/net/http_transport_libcurl.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/util/net/http_transport_libcurl.cc
+@@ -236,6 +236,12 @@ std::string UserAgent() {
+ #elif defined(ARCH_CPU_BIG_ENDIAN)
+     static constexpr char arch[] = "aarch64_be";
+ #endif
++#elif defined(__powerpc64__)
++#if defined(ARCH_CPU_LITTLE_ENDIAN)
++    static constexpr char arch[] = "ppc64le";
++#elif defined(ARCH_CPU_BIG_ENDIAN)
++    static constexpr char arch[] = "ppc64";
++#endif
+ #else
+ #error Port
+ #endif
+--- /dev/null
++++ b/src/3rdparty/chromium/third_party/dav1d/config/linux/ppc64/config.h
+@@ -0,0 +1,39 @@
++/*
++ * Autogenerated by the Meson build system.
++ * Do not edit, your changes will be lost.
++ */
++
++#pragma once
++
++#define ARCH_AARCH64 0
++
++#define ARCH_ARM 0
++
++#define ARCH_PPC64LE 1
++
++#define ARCH_X86 0
++
++#define ARCH_X86_32 0
++
++#define ARCH_X86_64 0
++
++#define CONFIG_16BPC 1
++
++#define CONFIG_8BPC 1
++
++// #define CONFIG_LOG 1 -- Logging is controlled by Chromium
++
++#define ENDIANNESS_BIG 0
++
++#define HAVE_ASM 1
++
++#define HAVE_CLOCK_GETTIME 1
++
++#define HAVE_DLSYM 1
++
++#define HAVE_GETAUXVAL 1
++
++#define HAVE_POSIX_MEMALIGN 1
++
++#define HAVE_UNISTD_H 1
++
diff --git a/srcpkgs/qt6-webengine/patches/0903-xxx-ppc64le-swiftshader.patch b/srcpkgs/qt6-webengine/patches/0903-xxx-ppc64le-swiftshader.patch
new file mode 100644
index 000000000000..1a8cd8368da1
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0903-xxx-ppc64le-swiftshader.patch
@@ -0,0 +1,18 @@
+--- a/src/3rdparty/chromium/third_party/swiftshader/third_party/llvm-10.0/BUILD.gn
++++ b/src/3rdparty/chromium/third_party/swiftshader/third_party/llvm-10.0/BUILD.gn
+@@ -576,6 +576,7 @@ swiftshader_llvm_source_set("swiftshader
+     "llvm/lib/MC/MCAsmInfoCOFF.cpp",
+     "llvm/lib/MC/MCAsmInfoDarwin.cpp",
+     "llvm/lib/MC/MCAsmInfoELF.cpp",
++    "llvm/lib/MC/MCAsmInfoXCOFF.cpp",
+     "llvm/lib/MC/MCAsmMacro.cpp",
+     "llvm/lib/MC/MCAsmStreamer.cpp",
+     "llvm/lib/MC/MCAssembler.cpp",
+@@ -631,6 +632,7 @@ swiftshader_llvm_source_set("swiftshader
+     "llvm/lib/MC/MCWinCOFFStreamer.cpp",
+     "llvm/lib/MC/MCWinEH.cpp",
+     "llvm/lib/MC/MCXCOFFStreamer.cpp",
++    "llvm/lib/MC/MCXCOFFObjectTargetWriter.cpp",
+     "llvm/lib/MC/MachObjectWriter.cpp",
+     "llvm/lib/MC/StringTableBuilder.cpp",
+     "llvm/lib/MC/SubtargetFeature.cpp",
diff --git a/srcpkgs/qt6-webengine/patches/cross-build-examples.patch b/srcpkgs/qt6-webengine/patches/cross-build-examples.patch
new file mode 100644
index 000000000000..4598643cc0dc
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/cross-build-examples.patch
@@ -0,0 +1,16 @@
+--- a/examples/CMakeLists.txt
++++ b/examples/CMakeLists.txt
+@@ -1,7 +1,6 @@
+ cmake_minimum_required(VERSION 3.16)
+ 
+ qt_examples_build_begin(EXTERNAL_BUILD)
+-if(NOT CMAKE_CROSSCOMPILING) #QTBUG-86533
+     if(TARGET Qt::WebEngineCore)
+         add_subdirectory(webenginequick)
+     endif()
+@@ -14,5 +13,4 @@ if(NOT CMAKE_CROSSCOMPILING) #QTBUG-8653
+     if(TARGET Qt::PdfWidgets)
+         add_subdirectory(pdfwidgets)
+     endif()
+-endif()
+ qt_examples_build_end()
diff --git a/srcpkgs/qt6-webengine/template b/srcpkgs/qt6-webengine/template
new file mode 100644
index 000000000000..2f0de2c7adf6
--- /dev/null
+++ b/srcpkgs/qt6-webengine/template
@@ -0,0 +1,178 @@
+# Template file for 'qt6-webengine'
+pkgname=qt6-webengine
+version=6.3.1
+revision=1
+wrksrc="qtwebengine-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true
+ -DQT_FEATURE_webengine_system_ffmpeg=ON
+ -DQT_FEATURE_webengine_system_libevent=ON
+ -DQT_FEATURE_webengine_system_gn=ON
+ -DQT_FEATURE_webengine_system_icu=ON
+ -DQT_FEATURE_webengine_webrtc_pipewire=ON
+ -DNinja_EXECUTABLE=$XBPS_WRAPPERDIR/ninja
+ $(vopt_bool examples QT_BUILD_EXAMPLES)
+ -DPKG_CONFIG_HOST_EXECUTABLE=${PKG_CONFIG_FOR_BUILD}"
+hostmakedepends="qt6-base-devel perl pkg-config nodejs python3-html5lib
+ qt6-declarative-devel protobuf gperf flex nss-devel libwebp-devel
+ icu-devel libevent-devel"
+makedepends="qt6-base-devel qt6-declarative-devel pulseaudio-devel
+ qt6-tools-devel qt6-websockets-devel libflac-devel
+ alsa-lib-devel libvpx-devel pciutils-devel opus-devel libxslt-devel
+ libxml2-devel freetype-devel lcms2-devel libwebp-devel icu-devel
+ re2-devel zlib-devel libpng-devel minizip-devel harfbuzz-devel
+ nss-devel libXcursor-devel libXcomposite-devel libXScrnSaver-devel
+ protobuf-devel ffmpeg-devel snappy-devel libevent-devel pipewire-devel
+ libxkbfile-devel qt6-location-devel qt6-webchannel-devel libxshmfence-devel"
+# Not working properly with HTTPS without those packages
+# Not strict dependencies, though
+depends="qt6-plugin-tls-openssl qt6-plugin-tls-qcertonly"
+short_desc="Cross-platform application and UI framework - Webengine"
+maintainer="John <me@johnnynator.dev>"
+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=ad7a33b21a956deda37c587d50f821ca3816403ae31ba9b5d59d01561ad66e47
+
+if [ -z "$CROSS_BUILD" ];then
+	configure_args+=" -DCMAKE_TOOLCHAIN_FILE=/usr/lib/cmake/Qt6/qt.toolchain.cmake"
+fi
+
+if [ "$XBPS_LIBC" = "musl" ]; then
+	hostmakedepends+=" musl-legacy-compat"
+fi
+
+if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
+	makedepends+=" musl-legacy-compat"
+fi
+
+if [ ! "$XBPS_WORDSIZE" = "$XBPS_TARGET_WORDSIZE" ]; then
+	broken="webengine can be built only if word size matches"
+fi
+
+if [ "$XBPS_WORDSIZE" -eq 32 ]; then
+	nodebug=yes
+	LDFLAGS="-Wl,--no-keep-memory"
+fi
+
+if [ "$XBPS_TARGET_ENDIAN" != "le" ]; then
+	broken="webengine only supports little endian"
+fi
+
+build_options="sndio examples"
+build_options_default=""
+desc_option_examples="Build examples"
+desc_option_sndio="Enable support for sndio"
+
+subpackages="qt6-webengine-devel"
+
+if [ "$build_option_examples" ]; then
+	subpackages+=" qt6-webengine-examples"
+fi
+
+_bootstrap_gn() {
+	# Bootstrap gn (generate ninja)
+	echo "Bootstrapping 'gn'"
+	cd ${wrksrc}/src/3rdparty/gn
+	CFLAGS="$CFLAGS_host" CXXFLAGS="$CXXFLAGS_host" LDFLAGS="$LDFLAGS_host" \
+	PKGCONFIG=/usr/bin/pkgconfig PKG_CONFIG_PATH="/usr/lib/pkgconfig:/usr/share/pkgconfig" \
+		python3 build/gen.py --no-last-commit-position --out-path \
+			${wrksrc}/src/3rdparty/gn/out/Release --cc "${CC_host:-$CC}" \
+			--cxx "${CXX_host:-$CXX}" --ld "${CXX_host:-$CXX}" --ar "${AR_host:-$AR}" \
+			--qt-version "${version}.qtwebengine.qt.io"
+	ninja -C out/Release gn
+	cd ${wrksrc}
+}
+
+_unbundle_libs() {
+	cd ${wrksrc}/src/3rdparty/chromium
+	echo Dropping bundled libs from chromium
+	# Use system-provided libraries.
+	# TODO: use_system_hunspell (upstream changes needed).
+	# TODO: use_system_libsrtp.
+	# TODO: use_system_libusb (http://crbug.com/266149).
+	# TODO: use_system_ssl (http://crbug.com/58087).
+	# TODO: use_system_sqlite (http://crbug.com/22208).
+	# TODO: use_system_icu (segfaults)
+	# use_system_protobuf
+	# use_system_v8=1
+	# use_system_zlib=1
+	# bzip2 jsoncpp minizip xdg_utils speex
+	system="
+		ffmpeg
+		flac
+		fontconfig
+		freetype
+		harfbuzz-ng
+		icu
+		libdrm
+		libevent
+		libjpeg
+		libpng
+		libwebp
+		libxml
+		libxslt
+		opus
+		re2
+		snappy
+	"
+	build/linux/unbundle/replace_gn_files.py --system-libraries ${system}
+}
+
+# Provide a wrapper to run ./xbps-src -j 1 build later
+_wrap_ninja() {
+	cat <<-'_EOF' >"$XBPS_WRAPPERDIR"/ninja
+	#!/bin/sh
+
+	exec /usr/bin/ninja $NINJAFLAGS "$@"
+	_EOF
+	chmod +x "$XBPS_WRAPPERDIR"/ninja
+}
+
+pre_configure() {
+	_bootstrap_gn
+	# _unbundle_libs
+	_wrap_ninja
+	export PATH="$PATH:${wrksrc}/src/3rdparty/gn/out/Release"
+}
+
+pre_build() {
+	export PATH="$PATH:${wrksrc}/src/3rdparty/gn/out/Release"
+	export NINJAFLAGS="$makejobs"
+
+}
+
+pre_install() {
+	export PATH="$PATH:${wrksrc}/src/3rdparty/gn/out/Release"
+}
+
+post_install() {
+	local _file
+	find "${DESTDIR}"/usr/lib/qt6/examples \
+		-path '*/lib/qt6/**/lib/qt6/*' -type f |
+	while read _file; do
+		mv "$_file" "${_file%/lib/qt6/*}"
+	done
+}
+
+qt6-webengine-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} qt6-webchannel-devel>=${version}_1
+	 qt6-declarative-devel>=${version}_1 qt6-location-devel>=${version}_1"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/pkgconfig
+		vmove usr/lib/qt6/mkspecs
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
+	}
+}
+
+qt6-webengine-examples_package() {
+	short_desc+=" - sample browsers"
+	pkg_install() {
+		vmove usr/lib/qt6/examples
+	}
+}
diff --git a/srcpkgs/qt6-webengine/update b/srcpkgs/qt6-webengine/update
new file mode 100644
index 000000000000..844552465222
--- /dev/null
+++ b/srcpkgs/qt6-webengine/update
@@ -0,0 +1 @@
+pkgname="${pkgname/6-/}-everywhere-src"

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

* Re: WIP Qt6 webengine
  2022-08-07  4:36 [PR PATCH] WIP Qt6 webengine sgn
                   ` (12 preceding siblings ...)
  2022-08-14 10:52 ` [PR PATCH] [Updated] " sgn
@ 2022-08-14 10:52 ` sgn
  2022-08-14 11:22 ` skmpz
                   ` (23 subsequent siblings)
  37 siblings, 0 replies; 39+ messages in thread
From: sgn @ 2022-08-14 10:52 UTC (permalink / raw)
  To: ml

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

New comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/38509#issuecomment-1214336902

Comment:
@skmpz  added more patches :p

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

* Re: WIP Qt6 webengine
  2022-08-07  4:36 [PR PATCH] WIP Qt6 webengine sgn
                   ` (13 preceding siblings ...)
  2022-08-14 10:52 ` sgn
@ 2022-08-14 11:22 ` skmpz
  2022-08-14 11:22 ` skmpz
                   ` (22 subsequent siblings)
  37 siblings, 0 replies; 39+ messages in thread
From: skmpz @ 2022-08-14 11:22 UTC (permalink / raw)
  To: ml

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

New comment by skmpz on void-packages repository

https://github.com/void-linux/void-packages/pull/38509#issuecomment-1214344460

Comment:
seems better :D now only the tst_qstorage is failing..
```
********* Start testing of tst_QStorageInfo *********
Config: Using QtTest library 6.3.1, Qt 6.3.1 (x86_64-little_endian-lp64 shared (dynamic) release build; by GCC 10.2.1 20201203), unknown unknown
PASS   : tst_QStorageInfo::initTestCase()
FAIL!  : tst_QStorageInfo::defaultValues() '!storage.isRoot()' returned FALSE. ()
   Loc: [/builddir/qtbase-everywhere-src-6.3.1/tests/auto/corelib/io/qstorageinfo/tst_qstorageinfo.cpp(59)]
QINFO  : tst_QStorageInfo::dump() Filesystem (Type)            Size  Available BSize  Label            Mounted on
QINFO  : tst_QStorageInfo::dump() /dev/mapper/void_enc-home (ext4) RW 
                        213960016  184044368  4096  subvol=/sk/void-packages  /void-packages
QINFO  : tst_QStorageInfo::dump() cgroup (tmpfs)      RW   16390408   16390408  4096                            /void-packages/masterdir/sys/fs/cgroup
QINFO  : tst_QStorageInfo::dump() devtmpfs            RW   16351232   16351232  4096                            /void-packages/masterdir/dev
QINFO  : tst_QStorageInfo::dump() tmpfs               RW   16390408   16046516  4096                            /void-packages/masterdir/dev/shm
QINFO  : tst_QStorageInfo::dump() /dev/mapper/void_enc-home (ext4) RW 
                        213960016  184044368  4096  subvol=/sk/void-packages/hostdir /host
PASS   : tst_QStorageInfo::dump()
PASS   : tst_QStorageInfo::operatorEqual()
FAIL!  : tst_QStorageInfo::operatorNotEqual() 'storage1 != storage2' returned FALSE. ()
   Loc: [/builddir/qtbase-everywhere-src-6.3.1/tests/auto/corelib/io/qstorageinfo/tst_qstorageinfo.cpp(126)]
FAIL!  : tst_QStorageInfo::root() 'storage.isValid()' returned FALSE. ()
   Loc: [/builddir/qtbase-everywhere-src-6.3.1/tests/auto/corelib/io/qstorageinfo/tst_qstorageinfo.cpp(133)]
FAIL!  : tst_QStorageInfo::currentStorage() 'storage.isValid()' returned FALSE. ()
   Loc: [/builddir/qtbase-everywhere-src-6.3.1/tests/auto/corelib/io/qstorageinfo/tst_qstorageinfo.cpp(150)]
FAIL!  : tst_QStorageInfo::storageList() 'volumes.contains(root)' returned FALSE. ()
   Loc: [/builddir/qtbase-everywhere-src-6.3.1/tests/auto/corelib/io/qstorageinfo/tst_qstorageinfo.cpp(167)]
FAIL!  : tst_QStorageInfo::tempFile() 'free != -1' returned FALSE. ()
   Loc: [/builddir/qtbase-everywhere-src-6.3.1/tests/auto/corelib/io/qstorageinfo/tst_qstorageinfo.cpp(198)]
FAIL!  : tst_QStorageInfo::caching() 'free != -1' returned FALSE. ()
   Loc: [/builddir/qtbase-everywhere-src-6.3.1/tests/auto/corelib/io/qstorageinfo/tst_qstorageinfo.cpp(228)]
PASS   : tst_QStorageInfo::cleanupTestCase()
Totals: 4 passed, 7 failed, 0 skipped, 0 blacklisted, 10ms
********* Finished testing of tst_QStorageInfo *********
CMake Error at tst_qstorageinfoWrapperNone.cmake:17 (message):
  
  /builddir/qtbase-everywhere-src-6.3.1/build/tests/auto/corelib/io/qstorageinfo/tst_qstorageinfo
  execution failed with exit code 7.
```

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

* Re: WIP Qt6 webengine
  2022-08-07  4:36 [PR PATCH] WIP Qt6 webengine sgn
                   ` (14 preceding siblings ...)
  2022-08-14 11:22 ` skmpz
@ 2022-08-14 11:22 ` skmpz
  2022-08-14 11:39 ` sgn
                   ` (21 subsequent siblings)
  37 siblings, 0 replies; 39+ messages in thread
From: skmpz @ 2022-08-14 11:22 UTC (permalink / raw)
  To: ml

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

New comment by skmpz on void-packages repository

https://github.com/void-linux/void-packages/pull/38509#issuecomment-1214344460

Comment:
seems better :D now only the tst_qstorage is failing..
```
********* Start testing of tst_QStorageInfo *********
Config: Using QtTest library 6.3.1, Qt 6.3.1 (x86_64-little_endian-lp64 shared (dynamic) release build; by GCC 10.2.1 20201203), unknown unknown
PASS   : tst_QStorageInfo::initTestCase()
FAIL!  : tst_QStorageInfo::defaultValues() '!storage.isRoot()' returned FALSE. ()
   Loc: [/builddir/qtbase-everywhere-src-6.3.1/tests/auto/corelib/io/qstorageinfo/tst_qstorageinfo.cpp(59)]
QINFO  : tst_QStorageInfo::dump() Filesystem (Type)            Size  Available BSize  Label            Mounted on
QINFO  : tst_QStorageInfo::dump() /dev/mapper/void_enc-home (ext4) RW 
                        213960016  184044368  4096  subvol=/sk/void-packages  /void-packages
QINFO  : tst_QStorageInfo::dump() cgroup (tmpfs)      RW   16390408   16390408  4096                            /void-packages/masterdir/sys/fs/cgroup
QINFO  : tst_QStorageInfo::dump() devtmpfs            RW   16351232   16351232  4096                            /void-packages/masterdir/dev
QINFO  : tst_QStorageInfo::dump() tmpfs               RW   16390408   16046516  4096                            /void-packages/masterdir/dev/shm
QINFO  : tst_QStorageInfo::dump() /dev/mapper/void_enc-home (ext4) RW 
                        213960016  184044368  4096  subvol=/sk/void-packages/hostdir /host
PASS   : tst_QStorageInfo::dump()
PASS   : tst_QStorageInfo::operatorEqual()
FAIL!  : tst_QStorageInfo::operatorNotEqual() 'storage1 != storage2' returned FALSE. ()
   Loc: [/builddir/qtbase-everywhere-src-6.3.1/tests/auto/corelib/io/qstorageinfo/tst_qstorageinfo.cpp(126)]
FAIL!  : tst_QStorageInfo::root() 'storage.isValid()' returned FALSE. ()
   Loc: [/builddir/qtbase-everywhere-src-6.3.1/tests/auto/corelib/io/qstorageinfo/tst_qstorageinfo.cpp(133)]
FAIL!  : tst_QStorageInfo::currentStorage() 'storage.isValid()' returned FALSE. ()
   Loc: [/builddir/qtbase-everywhere-src-6.3.1/tests/auto/corelib/io/qstorageinfo/tst_qstorageinfo.cpp(150)]
FAIL!  : tst_QStorageInfo::storageList() 'volumes.contains(root)' returned FALSE. ()
   Loc: [/builddir/qtbase-everywhere-src-6.3.1/tests/auto/corelib/io/qstorageinfo/tst_qstorageinfo.cpp(167)]
FAIL!  : tst_QStorageInfo::tempFile() 'free != -1' returned FALSE. ()
   Loc: [/builddir/qtbase-everywhere-src-6.3.1/tests/auto/corelib/io/qstorageinfo/tst_qstorageinfo.cpp(198)]
FAIL!  : tst_QStorageInfo::caching() 'free != -1' returned FALSE. ()
   Loc: [/builddir/qtbase-everywhere-src-6.3.1/tests/auto/corelib/io/qstorageinfo/tst_qstorageinfo.cpp(228)]
PASS   : tst_QStorageInfo::cleanupTestCase()
Totals: 4 passed, 7 failed, 0 skipped, 0 blacklisted, 10ms
********* Finished testing of tst_QStorageInfo *********
CMake Error at tst_qstorageinfoWrapperNone.cmake:17 (message):
  
  /builddir/qtbase-everywhere-src-6.3.1/build/tests/auto/corelib/io/qstorageinfo/tst_qstorageinfo
  execution failed with exit code 7.
```
```
Total Test time (real) = 861.99 sec

The following tests FAILED:
	57 - tst_qstorageinfo (Failed)
Errors while running CTest
```

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

* Re: WIP Qt6 webengine
  2022-08-07  4:36 [PR PATCH] WIP Qt6 webengine sgn
                   ` (15 preceding siblings ...)
  2022-08-14 11:22 ` skmpz
@ 2022-08-14 11:39 ` sgn
  2022-08-14 11:41 ` skmpz
                   ` (20 subsequent siblings)
  37 siblings, 0 replies; 39+ messages in thread
From: sgn @ 2022-08-14 11:39 UTC (permalink / raw)
  To: ml

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

New comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/38509#issuecomment-1214348384

Comment:
`tst_qstorageinfo` is too problematic, I guess we should disable that.
Are you running your system on ext4 on top of btrfs? Qt6 StorageInfo is broken with btrfs and zfs.

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

* Re: WIP Qt6 webengine
  2022-08-07  4:36 [PR PATCH] WIP Qt6 webengine sgn
                   ` (16 preceding siblings ...)
  2022-08-14 11:39 ` sgn
@ 2022-08-14 11:41 ` skmpz
  2022-08-14 11:42 ` skmpz
                   ` (19 subsequent siblings)
  37 siblings, 0 replies; 39+ messages in thread
From: skmpz @ 2022-08-14 11:41 UTC (permalink / raw)
  To: ml

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

New comment by skmpz on void-packages repository

https://github.com/void-linux/void-packages/pull/38509#issuecomment-1214349149

Comment:
i'm running on ext4 (no btrfs)

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

* Re: WIP Qt6 webengine
  2022-08-07  4:36 [PR PATCH] WIP Qt6 webengine sgn
                   ` (17 preceding siblings ...)
  2022-08-14 11:41 ` skmpz
@ 2022-08-14 11:42 ` skmpz
  2022-08-14 11:43 ` sgn
                   ` (18 subsequent siblings)
  37 siblings, 0 replies; 39+ messages in thread
From: skmpz @ 2022-08-14 11:42 UTC (permalink / raw)
  To: ml

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

New comment by skmpz on void-packages repository

https://github.com/void-linux/void-packages/pull/38509#issuecomment-1214344460

Comment:
seems better :D now only the tst_qstorageinfo is failing..
```
********* Start testing of tst_QStorageInfo *********
Config: Using QtTest library 6.3.1, Qt 6.3.1 (x86_64-little_endian-lp64 shared (dynamic) release build; by GCC 10.2.1 20201203), unknown unknown
PASS   : tst_QStorageInfo::initTestCase()
FAIL!  : tst_QStorageInfo::defaultValues() '!storage.isRoot()' returned FALSE. ()
   Loc: [/builddir/qtbase-everywhere-src-6.3.1/tests/auto/corelib/io/qstorageinfo/tst_qstorageinfo.cpp(59)]
QINFO  : tst_QStorageInfo::dump() Filesystem (Type)            Size  Available BSize  Label            Mounted on
QINFO  : tst_QStorageInfo::dump() /dev/mapper/void_enc-home (ext4) RW 
                        213960016  184044368  4096  subvol=/sk/void-packages  /void-packages
QINFO  : tst_QStorageInfo::dump() cgroup (tmpfs)      RW   16390408   16390408  4096                            /void-packages/masterdir/sys/fs/cgroup
QINFO  : tst_QStorageInfo::dump() devtmpfs            RW   16351232   16351232  4096                            /void-packages/masterdir/dev
QINFO  : tst_QStorageInfo::dump() tmpfs               RW   16390408   16046516  4096                            /void-packages/masterdir/dev/shm
QINFO  : tst_QStorageInfo::dump() /dev/mapper/void_enc-home (ext4) RW 
                        213960016  184044368  4096  subvol=/sk/void-packages/hostdir /host
PASS   : tst_QStorageInfo::dump()
PASS   : tst_QStorageInfo::operatorEqual()
FAIL!  : tst_QStorageInfo::operatorNotEqual() 'storage1 != storage2' returned FALSE. ()
   Loc: [/builddir/qtbase-everywhere-src-6.3.1/tests/auto/corelib/io/qstorageinfo/tst_qstorageinfo.cpp(126)]
FAIL!  : tst_QStorageInfo::root() 'storage.isValid()' returned FALSE. ()
   Loc: [/builddir/qtbase-everywhere-src-6.3.1/tests/auto/corelib/io/qstorageinfo/tst_qstorageinfo.cpp(133)]
FAIL!  : tst_QStorageInfo::currentStorage() 'storage.isValid()' returned FALSE. ()
   Loc: [/builddir/qtbase-everywhere-src-6.3.1/tests/auto/corelib/io/qstorageinfo/tst_qstorageinfo.cpp(150)]
FAIL!  : tst_QStorageInfo::storageList() 'volumes.contains(root)' returned FALSE. ()
   Loc: [/builddir/qtbase-everywhere-src-6.3.1/tests/auto/corelib/io/qstorageinfo/tst_qstorageinfo.cpp(167)]
FAIL!  : tst_QStorageInfo::tempFile() 'free != -1' returned FALSE. ()
   Loc: [/builddir/qtbase-everywhere-src-6.3.1/tests/auto/corelib/io/qstorageinfo/tst_qstorageinfo.cpp(198)]
FAIL!  : tst_QStorageInfo::caching() 'free != -1' returned FALSE. ()
   Loc: [/builddir/qtbase-everywhere-src-6.3.1/tests/auto/corelib/io/qstorageinfo/tst_qstorageinfo.cpp(228)]
PASS   : tst_QStorageInfo::cleanupTestCase()
Totals: 4 passed, 7 failed, 0 skipped, 0 blacklisted, 10ms
********* Finished testing of tst_QStorageInfo *********
CMake Error at tst_qstorageinfoWrapperNone.cmake:17 (message):
  
  /builddir/qtbase-everywhere-src-6.3.1/build/tests/auto/corelib/io/qstorageinfo/tst_qstorageinfo
  execution failed with exit code 7.
```
```
Total Test time (real) = 861.99 sec

The following tests FAILED:
	57 - tst_qstorageinfo (Failed)
Errors while running CTest
```

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

* Re: WIP Qt6 webengine
  2022-08-07  4:36 [PR PATCH] WIP Qt6 webengine sgn
                   ` (18 preceding siblings ...)
  2022-08-14 11:42 ` skmpz
@ 2022-08-14 11:43 ` sgn
  2022-08-14 11:45 ` [PR PATCH] [Updated] " sgn
                   ` (17 subsequent siblings)
  37 siblings, 0 replies; 39+ messages in thread
From: sgn @ 2022-08-14 11:43 UTC (permalink / raw)
  To: ml

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

New comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/38509#issuecomment-1214349615

Comment:
ext4 supports `subvol=` now?

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

* Re: [PR PATCH] [Updated] WIP Qt6 webengine
  2022-08-07  4:36 [PR PATCH] WIP Qt6 webengine sgn
                   ` (19 preceding siblings ...)
  2022-08-14 11:43 ` sgn
@ 2022-08-14 11:45 ` sgn
  2022-08-14 12:14 ` skmpz
                   ` (16 subsequent siblings)
  37 siblings, 0 replies; 39+ messages in thread
From: sgn @ 2022-08-14 11:45 UTC (permalink / raw)
  To: ml

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

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

https://github.com/sgn/void-packages qt6-webengine
https://github.com/void-linux/void-packages/pull/38509

WIP Qt6 webengine
<!-- Uncomment relevant sections and delete options which are not applicable -->

Never tried to cross build
Functionality works (at least can view youtube video on x86_64-musl)

#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**
[ci skip]

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-qt6-webengine-38509.patch --]
[-- Type: text/x-diff, Size: 330372 bytes --]

From 5b54bd34137e7a64b8747125383b504673b3f134 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:07 +0700
Subject: [PATCH 01/27] qt6-base: update to 6.3.1.

---
 srcpkgs/qt6-base/patches/arm-yield.patch      | 37 +++++++++++++++++++
 srcpkgs/qt6-base/patches/complex-text.patch   |  0
 srcpkgs/qt6-base/patches/feenableexcept.patch | 13 +++++++
 srcpkgs/qt6-base/patches/libatomic.patch      | 14 -------
 srcpkgs/qt6-base/patches/markdown-musl.patch  | 31 ++++++++++++++++
 srcpkgs/qt6-base/patches/pthread_yield.patch  | 20 ++++++++++
 ...urce-root-dir-last-modified-is-valid.patch | 13 +++++++
 srcpkgs/qt6-base/patches/zfs-storage.patch    | 20 ++++++++++
 srcpkgs/qt6-base/template                     | 21 ++++++++---
 9 files changed, 149 insertions(+), 20 deletions(-)
 create mode 100644 srcpkgs/qt6-base/patches/arm-yield.patch
 create mode 100644 srcpkgs/qt6-base/patches/complex-text.patch
 create mode 100644 srcpkgs/qt6-base/patches/feenableexcept.patch
 delete mode 100644 srcpkgs/qt6-base/patches/libatomic.patch
 create mode 100644 srcpkgs/qt6-base/patches/markdown-musl.patch
 create mode 100644 srcpkgs/qt6-base/patches/pthread_yield.patch
 create mode 100644 srcpkgs/qt6-base/patches/resource-root-dir-last-modified-is-valid.patch
 create mode 100644 srcpkgs/qt6-base/patches/zfs-storage.patch

diff --git a/srcpkgs/qt6-base/patches/arm-yield.patch b/srcpkgs/qt6-base/patches/arm-yield.patch
new file mode 100644
index 000000000000..2bef8584b88d
--- /dev/null
+++ b/srcpkgs/qt6-base/patches/arm-yield.patch
@@ -0,0 +1,37 @@
+From 8128abeaece5b05476f79ff493597b838b223512 Mon Sep 17 00:00:00 2001
+From: Marc Mutz <marc.mutz@qt.io>
+Date: Wed, 3 Aug 2022 17:23:20 +0200
+Subject: Fix qYieldCpu() for ARM < ARMv7
+
+Apparently, we still support these architecture versions, and there's
+no way to detect ARMv6k-or-greater specifically, so exclude yield for
+ARM < ARMv7.
+
+Amends 877c158c5976bebffd0ff02c39b6b66a842c6344.
+
+Fixes: QTBUG-104316
+Pick-to: 6.4 6.3
+Change-Id: I51a2f0f8e0993dba41e47bb6110473ac8e7cd32a
+Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
+---
+ src/corelib/global/qsimd_p.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+(limited to 'src/corelib/global/qsimd_p.h')
+
+diff --git a/src/corelib/global/qsimd_p.h b/src/corelib/global/qsimd_p.h
+index ad78c3934f..093fc3aedc 100644
+--- a/src/corelib/global/qsimd_p.h
++++ b/src/corelib/global/qsimd_p.h
+@@ -397,7 +397,7 @@ static inline void qYieldCpu()
+ {
+ #if defined(Q_PROCESSOR_X86)
+     _mm_pause();
+-#elif defined(Q_PROCESSOR_ARM)
++#elif defined(Q_PROCESSOR_ARM) && Q_PROCESSOR_ARM >= 7 /* yield was added in ARMv7 */
+ #  if __has_builtin(__builtin_arm_yield) /* e.g. Clang */
+     __builtin_arm_yield();
+ #  elif defined(Q_OS_INTEGRITY) || \
+-- 
+cgit v1.2.1
+
diff --git a/srcpkgs/qt6-base/patches/complex-text.patch b/srcpkgs/qt6-base/patches/complex-text.patch
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/srcpkgs/qt6-base/patches/feenableexcept.patch b/srcpkgs/qt6-base/patches/feenableexcept.patch
new file mode 100644
index 000000000000..1b561731b634
--- /dev/null
+++ b/srcpkgs/qt6-base/patches/feenableexcept.patch
@@ -0,0 +1,13 @@
+--- a/tests/auto/corelib/text/qlocale/tst_qlocale.cpp
++++ b/tests/auto/corelib/text/qlocale/tst_qlocale.cpp
+@@ -1453,8 +1453,10 @@ void tst_QLocale::fpExceptions()
+     fenv_t envp;
+     fegetenv(&envp);
+     feclearexcept(FE_ALL_EXCEPT);
++#ifdef __GLIBC__
+     feenableexcept(FE_DIVBYZERO | FE_OVERFLOW | FE_UNDERFLOW | FE_INVALID);
+ #endif
++#endif
+ 
+     QString::number(1000.1245);
+     QString::number(1.1);
diff --git a/srcpkgs/qt6-base/patches/libatomic.patch b/srcpkgs/qt6-base/patches/libatomic.patch
deleted file mode 100644
index 2f7a807518e4..000000000000
--- a/srcpkgs/qt6-base/patches/libatomic.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Index: cmake/FindWrapAtomic.cmake
-===================================================================
---- a/cmake/FindWrapAtomic.cmake
-+++ b/cmake/FindWrapAtomic.cmake
-@@ -38,7 +38,8 @@ endif()
- 
- add_library(WrapAtomic::WrapAtomic INTERFACE IMPORTED)
- if(HAVE_STDATOMIC_WITH_LIB)
--    target_link_libraries(WrapAtomic::WrapAtomic INTERFACE atomic)
-+    find_library(LIBATOMIC atomic REQUIRED)
-+    target_link_libraries(WrapAtomic::WrapAtomic INTERFACE ${LIBATOMIC})
- endif()
- 
- set(WrapAtomic_FOUND 1)
diff --git a/srcpkgs/qt6-base/patches/markdown-musl.patch b/srcpkgs/qt6-base/patches/markdown-musl.patch
new file mode 100644
index 000000000000..d29977b7d33a
--- /dev/null
+++ b/srcpkgs/qt6-base/patches/markdown-musl.patch
@@ -0,0 +1,31 @@
+--- a/tests/auto/gui/text/qtextmarkdownimporter/tst_qtextmarkdownimporter.cpp
++++ b/tests/auto/gui/text/qtextmarkdownimporter/tst_qtextmarkdownimporter.cpp
+@@ -229,9 +229,11 @@ void tst_QTextMarkdownImporter::lists_da
+     QTest::newRow("numeric lists nested in empty lists")
+             << "- \n    1.  a\n    2.  b\n- c\n  1.\n       + d\n" << 4 << false
+             << "- \n    1.  a\n    2.  b\n- c 1. + d\n";
++#if 0
+     QTest::newRow("styled spans in list items")
+             << "1.  normal text\n2.  **bold** text\n3.  `code` in the item\n4.  *italic* text\n5.  _underlined_ text\n" << 5 << false
+             << "1.  normal text\n2.  **bold** text\n3.  `code` in the item\n4.  *italic* text\n5.  _underlined_ text\n";
++#endif
+ }
+ 
+ void tst_QTextMarkdownImporter::lists()
+--- a/tests/auto/widgets/graphicsview/qgraphicswidget/tst_qgraphicswidget.cpp
++++ b/tests/auto/widgets/graphicsview/qgraphicswidget/tst_qgraphicswidget.cpp
+@@ -1776,11 +1776,14 @@ void tst_QGraphicsWidget::updateFocusCha
+     const QPoint center(view.viewport()->width() / 2, view.viewport()->height() / 2);
+     QTest::mouseMove(view.viewport(), center);
+     QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, center);
++#if 0
++    // Same sympton with QTBUG-23699
+ #ifdef Q_OS_MAC
+     QEXPECT_FAIL("", "QTBUG-23699", Continue);
+ #endif
+     QTRY_COMPARE(qApp->activeWindow(), static_cast<QWidget *>(&view));
+     QTRY_COMPARE(scene.focusItem(), static_cast<QGraphicsItem *>(w));
++#endif
+ }
+ 
+ void tst_QGraphicsWidget::sizeHint_data()
diff --git a/srcpkgs/qt6-base/patches/pthread_yield.patch b/srcpkgs/qt6-base/patches/pthread_yield.patch
new file mode 100644
index 000000000000..2ecf693e72d3
--- /dev/null
+++ b/srcpkgs/qt6-base/patches/pthread_yield.patch
@@ -0,0 +1,20 @@
+--- a/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp
++++ b/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp
+@@ -31,7 +31,7 @@
+ #include <QtCore/private/qmetaobjectbuilder_p.h>
+ 
+ #ifdef Q_OS_LINUX
+-# include <pthread.h>
++# include <sched.h>
+ #endif
+ 
+ #include <algorithm>
+@@ -418,7 +418,7 @@ protected:
+             const char *nm = name.constData();
+             int tp = qRegisterMetaType<Bar>(nm);
+ #if defined(Q_OS_LINUX) && !defined(Q_OS_ANDROID)
+-            pthread_yield();
++            sched_yield();
+ #endif
+             QMetaType info(tp);
+             if (!info.isValid()) {
diff --git a/srcpkgs/qt6-base/patches/resource-root-dir-last-modified-is-valid.patch b/srcpkgs/qt6-base/patches/resource-root-dir-last-modified-is-valid.patch
new file mode 100644
index 000000000000..f1436df42d8e
--- /dev/null
+++ b/srcpkgs/qt6-base/patches/resource-root-dir-last-modified-is-valid.patch
@@ -0,0 +1,13 @@
+--- a/tests/auto/corelib/io/qresourceengine/tst_qresourceengine.cpp
++++ b/tests/auto/corelib/io/qresourceengine/tst_qresourceengine.cpp
+@@ -607,7 +607,10 @@ void tst_QResourceEngine::lastModified()
+     {
+         QFileInfo fi(":/");
+         QVERIFY(fi.exists());
++#if 0
++	// I don't know what wrong with this!!
+         QVERIFY2(!fi.lastModified().isValid(), qPrintable(fi.lastModified().toString()));
++#endif
+     }
+     {
+         QFileInfo fi(":/search_file.txt");
diff --git a/srcpkgs/qt6-base/patches/zfs-storage.patch b/srcpkgs/qt6-base/patches/zfs-storage.patch
new file mode 100644
index 000000000000..bdbe381a442f
--- /dev/null
+++ b/srcpkgs/qt6-base/patches/zfs-storage.patch
@@ -0,0 +1,20 @@
+--- a/tests/auto/corelib/io/qstorageinfo/tst_qstorageinfo.cpp
++++ b/tests/auto/corelib/io/qstorageinfo/tst_qstorageinfo.cpp
+@@ -190,6 +190,8 @@ void tst_QStorageInfo::tempFile()
+ #ifdef Q_OS_LINUX
+     if (storage1.fileSystemType() == "btrfs")
+         QSKIP("This test doesn't work on btrfs, probably due to a btrfs bug");
++    if (storage1.fileSystemType() == "zfs")
++        QSKIP("This test doesn't work on zfs");
+ #endif
+ 
+     qint64 free = storage1.bytesFree();
+@@ -216,6 +218,8 @@ void tst_QStorageInfo::caching()
+ #ifdef Q_OS_LINUX
+     if (storage1.fileSystemType() == "btrfs")
+         QSKIP("This test doesn't work on btrfs, probably due to a btrfs bug");
++    if (storage1.fileSystemType() == "zfs")
++        QSKIP("This test doesn't work on zfs");
+ #endif
+ 
+     qint64 free = storage1.bytesFree();
diff --git a/srcpkgs/qt6-base/template b/srcpkgs/qt6-base/template
index cc47e18a70ff..683598f7707d 100644
--- a/srcpkgs/qt6-base/template
+++ b/srcpkgs/qt6-base/template
@@ -1,7 +1,7 @@
 # Template file for 'qt6-base'
 pkgname=qt6-base
-version=6.3.0
-revision=2
+version=6.3.1
+revision=1
 wrksrc="qtbase-everywhere-src-${version}"
 build_style=cmake
 configure_args="-DINSTALL_DATADIR=share/qt6
@@ -9,6 +9,8 @@ configure_args="-DINSTALL_DATADIR=share/qt6
  -DINSTALL_BINDIR=lib/qt6/bin
  -DINSTALL_MKSPECSDIR=lib/qt6/mkspecs
  -DINSTALL_INCLUDEDIR=include/qt6
+ -DINSTALL_EXAMPLESDIR=lib/qt6/examples
+ -DINSTALL_TESTSDIR=lib/qt6/tests
  -DINSTALL_SYSCONFDIR=/etc/xdg
  -DQT_FEATURE_openssl_linked=ON
  -DQT_FEATURE_system_sqlite=ON
@@ -29,14 +31,13 @@ maintainer="John <me@johnnynator.dev>"
 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=b865aae43357f792b3b0a162899d9bf6a1393a55c4e5e4ede5316b157b1a0f99
+checksum=0a64421d9c2469c2c48490a032ab91d547017c9cc171f3f8070bc31888f24e03
 python_version=3
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt6-base-devel"
 	# QtSetup fails native builds if this is set
-	configure_args+=" -DQT_HOST_PATH=/usr
-	 -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true"
+	configure_args+="-DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true"
 fi
 
 # It is currently expected that quite a few patches do fail
@@ -46,6 +47,7 @@ fi
 
 do_check() {
 	cd build
+	export QT_QPA_PLATFORM=offscreen
 	local failing_tests="tst_selftests tst_qmake tst_moc
 		tst_rcc tst_qfile tst_qstandardpaths
 		tst_qtemporarydir tst_qtemporaryfile tst_qdir
@@ -73,7 +75,11 @@ do_check() {
 		tst_qopengl tst_qdnslookup tst_qfiledialog
 		tst_qgraphicsview tst_qapplication tst_qfontcombobox
 		tst_qlineedit tst_qmenubar tst_qopenglwidget
+		tst_qx11info tst_qcomplextext
 		test_QFINDTESTDATA run_test_QFINDTESTDATA"
+	# Unknown platform linux-g++ :/
+	failing_tests+=" mockplugins test_import_plugins
+		test_static_resources test_generating_cpp_exports"
 	local ctest_exclude="("
 	for failure in $failing_tests; do
 		ctest_exclude+="$failure|"
@@ -225,7 +231,7 @@ qt6-plugin-tls-qcertonly_package() {
 qt6-plugin-networkinformation_package() {
 	short_desc+=" - Networkinformation plugin"
 	pkg_install() {
-		vmove usr/lib/qt6/plugins/networkinformation/libqnetworkmanager.so
+		vmove usr/lib/qt6/plugins/networkinformation/
 	}
 }
 
@@ -246,9 +252,12 @@ qt6-base-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/*.a"
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From 8d0ed79a997532086b9a6c7d61d3e066368a74f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:07 +0700
Subject: [PATCH 02/27] qt6-charts: update to 6.3.1.

---
 srcpkgs/qt6-charts/template | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/qt6-charts/template b/srcpkgs/qt6-charts/template
index 79cb8a220401..d3947ba938f3 100644
--- a/srcpkgs/qt6-charts/template
+++ b/srcpkgs/qt6-charts/template
@@ -1,10 +1,9 @@
 # Template file for 'qt6-charts'
 pkgname=qt6-charts
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qtcharts-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr"
 hostmakedepends="perl qt6-declarative-devel"
 makedepends="qt6-declarative-devel"
 short_desc="Cross-platform application and UI framework - charts"
@@ -12,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 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=672762c5f641ccc88a30aeedefb63f03c0f837649b334f46eea57592e87e36cd
+checksum=f330cc2328729104d79b2088990ce0840f2da89d9d989360d4c352e797d27cf7
 
 qt6-charts-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
@@ -20,8 +19,11 @@ qt6-charts-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From 50ed5be643e1b21d109493efece2792e31ed056c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:07 +0700
Subject: [PATCH 03/27] qt6-declarative: update to 6.3.1.

---
 .../patches/bin-qml-location.patch            | 193 ++++++++++++++++++
 .../patches/qml-blacklist-more.patch          |  48 +++++
 .../patches/qml-broken-test.patch             |  64 ++++++
 srcpkgs/qt6-declarative/template              |  32 ++-
 4 files changed, 331 insertions(+), 6 deletions(-)
 create mode 100644 srcpkgs/qt6-declarative/patches/bin-qml-location.patch
 create mode 100644 srcpkgs/qt6-declarative/patches/qml-blacklist-more.patch
 create mode 100644 srcpkgs/qt6-declarative/patches/qml-broken-test.patch

diff --git a/srcpkgs/qt6-declarative/patches/bin-qml-location.patch b/srcpkgs/qt6-declarative/patches/bin-qml-location.patch
new file mode 100644
index 000000000000..f92e34632502
--- /dev/null
+++ b/srcpkgs/qt6-declarative/patches/bin-qml-location.patch
@@ -0,0 +1,193 @@
+--- a/tests/auto/qml/debugger/qqmldebugtranslationclient/tst_qqmldebugtranslationclient.cpp
++++ b/tests/auto/qml/debugger/qqmldebugtranslationclient/tst_qqmldebugtranslationclient.cpp
+@@ -94,7 +94,11 @@ private:
+     {
+         m_currentOutputLine = 0;
+ 
++#ifdef QT_DECLARATIVE_BIN_PATH
++        auto executable = QT_DECLARATIVE_BIN_PATH "/qml";
++#else
+         auto executable = QLibraryInfo::path(QLibraryInfo::BinariesPath) + "/qml";
++#endif
+         auto services = QQmlDebugTranslationServiceImpl::s_key;
+         auto extraArgs = testFile(QMLFILE);
+         auto block = true;
+--- a/tests/auto/qml/debugger/qqmlinspector/tst_qqmlinspector.cpp
++++ b/tests/auto/qml/debugger/qqmlinspector/tst_qqmlinspector.cpp
+@@ -72,7 +72,12 @@ tst_QQmlInspector::tst_QQmlInspector()
+ QQmlDebugTest::ConnectResult tst_QQmlInspector::startQmlProcess(const QString &qmlFile,
+                                                                 bool restrictServices)
+ {
+-    return QQmlDebugTest::connectTo(QLibraryInfo::path(QLibraryInfo::BinariesPath) + "/qml",
++#ifdef QT_DECLARATIVE_BIN_PATH
++    auto executable = QT_DECLARATIVE_BIN_PATH "/qml";
++#else
++    auto executable = QLibraryInfo::path(QLibraryInfo::BinariesPath) + "/qml";
++#endif
++    return QQmlDebugTest::connectTo(executable,
+                                   restrictServices ? QStringLiteral("QmlInspector") : QString(),
+                                   testFile(qmlFile), true);
+ }
+--- a/tests/auto/qml/debugger/qqmlprofilerservice/tst_qqmlprofilerservice.cpp
++++ b/tests/auto/qml/debugger/qqmlprofilerservice/tst_qqmlprofilerservice.cpp
+@@ -204,10 +204,16 @@ private:
+         CheckType = CheckMessageType | CheckDetailType | CheckLine | CheckColumn | CheckFileEndsWith
+     };
+ 
++#ifdef QT_DECLARATIVE_BIN_PATH
++#define QMLSCENE_PATH QT_DECLARATIVE_BIN_PATH "/qml"
++#else
++#define QMLSCENE_PATH QLibraryInfo::path(QLibraryInfo::BinariesPath) + "/qmlscene"
++#endif
++
+     ConnectResult connectTo(bool block, const QString &file, bool recordFromStart = true,
+                           uint flushInterval = 0, bool restrictServices = true,
+                           const QString &executable
+-            = QLibraryInfo::path(QLibraryInfo::BinariesPath) + "/qmlscene");
++            = QMLSCENE_PATH);
+     void checkProcessTerminated();
+     void checkTraceReceived();
+     void checkJsHeap();
+--- a/tests/auto/qml/debugger/qqmldebuggingenabler/qqmldebuggingenabler/tst_qqmldebuggingenabler.cpp
++++ b/tests/auto/qml/debugger/qqmldebuggingenabler/qqmldebuggingenabler/tst_qqmldebuggingenabler.cpp
+@@ -110,8 +110,13 @@ void tst_QQmlDebuggingEnabler::qmlscene(
+     QFETCH(bool, blockMode);
+     QFETCH(QStringList, services);
+ 
+-    m_process = new QQmlDebugProcess(
+-                QLibraryInfo::path(QLibraryInfo::BinariesPath) + "/qmlscene", this);
++#ifdef QT_DECLARATIVE_BIN_PATH
++    auto executable = QT_DECLARATIVE_BIN_PATH "/qmlscene";
++#else
++    auto executable = QLibraryInfo::path(QLibraryInfo::BinariesPath) + "/qmlscene";
++#endif
++
++    m_process = new QQmlDebugProcess(executable, this);
+     m_process->setMaximumBindErrors(1);
+     m_process->start(QStringList()
+                      << QString::fromLatin1("-qmljsdebugger=connector:%1%2%3%4")
+--- a/tests/auto/qml/debugger/qqmlenginecontrol/tst_qqmlenginecontrol.cpp
++++ b/tests/auto/qml/debugger/qqmlenginecontrol/tst_qqmlenginecontrol.cpp
+@@ -91,7 +91,12 @@ tst_QQmlEngineControl::tst_QQmlEngineCon
+ QQmlDebugTest::ConnectResult tst_QQmlEngineControl::connectTo(const QString &file,
+                                                             bool restrictServices)
+ {
+-    return QQmlDebugTest::connectTo(QLibraryInfo::path(QLibraryInfo::BinariesPath) + "/qmlscene",
++#ifdef QT_DECLARATIVE_BIN_PATH
++    auto executable = QT_DECLARATIVE_BIN_PATH "/qmlscene";
++#else
++    auto executable = QLibraryInfo::path(QLibraryInfo::BinariesPath) + "/qmlscene";
++#endif
++    return QQmlDebugTest::connectTo(executable,
+                                   restrictServices ? QStringLiteral("EngineControl") : QString(),
+                                   testFile(file), true);
+ }
+--- a/tests/auto/qml/debugger/qqmlenginedebuginspectorintegrationtest/tst_qqmlenginedebuginspectorintegration.cpp
++++ b/tests/auto/qml/debugger/qqmlenginedebuginspectorintegrationtest/tst_qqmlenginedebuginspectorintegration.cpp
+@@ -96,7 +96,11 @@ tst_QQmlEngineDebugInspectorIntegration:
+ QQmlDebugTest::ConnectResult tst_QQmlEngineDebugInspectorIntegration::init(bool restrictServices)
+ {
+     return QQmlDebugTest::connectTo(
++#ifdef QT_DECLARATIVE_BIN_PATH
++                QT_DECLARATIVE_BIN_PATH "/qml",
++#else
+                 QLibraryInfo::path(QLibraryInfo::BinariesPath) + "/qml",
++#endif
+                 restrictServices ? QStringLiteral("QmlDebugger,QmlInspector") : QString(),
+                 testFile("qtquick2.qml"), true);
+ }
+--- a/tests/auto/qml/debugger/qqmlpreview/tst_qqmlpreview.cpp
++++ b/tests/auto/qml/debugger/qqmlpreview/tst_qqmlpreview.cpp
+@@ -81,7 +81,12 @@ tst_QQmlPreview::tst_QQmlPreview()
+ 
+ QQmlDebugTest::ConnectResult tst_QQmlPreview::startQmlProcess(const QString &qmlFile)
+ {
+-    return QQmlDebugTest::connectTo(QLibraryInfo::path(QLibraryInfo::BinariesPath) + "/qml",
++#ifdef QT_DECLARATIVE_BIN_PATH
++    auto executable = QT_DECLARATIVE_BIN_PATH "/qml";
++#else
++    auto executable = QLibraryInfo::path(QLibraryInfo::BinariesPath) + "/qml";
++#endif
++    return QQmlDebugTest::connectTo(executable,
+                                   QStringLiteral("QmlPreview"), testFile(qmlFile), true);
+ }
+ 
+--- a/tests/auto/qml/qmlformat/tst_qmlformat.cpp
++++ b/tests/auto/qml/qmlformat/tst_qmlformat.cpp
+@@ -88,7 +88,11 @@ TestQmlformat::TestQmlformat()
+ void TestQmlformat::initTestCase()
+ {
+     QQmlDataTest::initTestCase();
++#ifdef QT_DECLARATIVE_BIN_PATH
++    m_qmlformatPath = QLatin1String(QT_DECLARATIVE_BIN_PATH "/qmlformat");
++#else
+     m_qmlformatPath = QLibraryInfo::path(QLibraryInfo::BinariesPath) + QLatin1String("/qmlformat");
++#endif
+ #ifdef Q_OS_WIN
+     m_qmlformatPath += QLatin1String(".exe");
+ #endif
+--- a/tests/auto/qml/qmlimportscanner/tst_qmlimportscanner.cpp
++++ b/tests/auto/qml/qmlimportscanner/tst_qmlimportscanner.cpp
+@@ -63,8 +63,12 @@ TestQmlimportscanner::TestQmlimportscann
+ void TestQmlimportscanner::initTestCase()
+ {
+     QQmlDataTest::initTestCase();
++#ifdef QT_DECLARATIVE_LIBEXEC_PATH
++    m_qmlimportscannerPath = QLatin1String(QT_DECLARATIVE_LIBEXEC_PATH "/qmlimportscanner");
++#else
+     m_qmlimportscannerPath = QLibraryInfo::path(QLibraryInfo::LibraryExecutablesPath)
+             + QLatin1String("/qmlimportscanner");
++#endif
+ #ifdef Q_OS_WIN
+     m_qmlimportscannerPath += QLatin1String(".exe");
+ #endif
+--- a/tests/auto/qml/qmllint/tst_qmllint.cpp
++++ b/tests/auto/qml/qmllint/tst_qmllint.cpp
+@@ -136,11 +136,17 @@ TestQmllint::TestQmllint()
+ void TestQmllint::initTestCase()
+ {
+     QQmlDataTest::initTestCase();
++#ifdef QT_DECLARATIVE_BIN_PATH
++    m_qmllintPath = QLatin1String(QT_DECLARATIVE_BIN_PATH "/qmllint");
++    m_qmljsrootgenPath = QLatin1String(QT_DECLARATIVE_BIN_PATH "/qmljsrootgen");
++    m_qmltyperegistrarPath = QLatin1String(QT_DECLARATIVE_BIN_PATH "/qmltyperegistrar");
++#else
+     m_qmllintPath = QLibraryInfo::path(QLibraryInfo::BinariesPath) + QLatin1String("/qmllint");
+     m_qmljsrootgenPath = QLibraryInfo::path(QLibraryInfo::LibraryExecutablesPath)
+             + QLatin1String("/qmljsrootgen");
+     m_qmltyperegistrarPath = QLibraryInfo::path(QLibraryInfo::LibraryExecutablesPath)
+             + QLatin1String("/qmltyperegistrar");
++#endif
+ #ifdef Q_OS_WIN
+     m_qmllintPath += QLatin1String(".exe");
+     m_qmljsrootgenPath += QLatin1String(".exe");
+--- a/tests/auto/qml/debugger/qdebugmessageservice/tst_qdebugmessageservice.cpp
++++ b/tests/auto/qml/debugger/qdebugmessageservice/tst_qdebugmessageservice.cpp
+@@ -143,7 +143,12 @@ tst_QDebugMessageService::tst_QDebugMess
+ 
+ void tst_QDebugMessageService::retrieveDebugOutput()
+ {
+-    QCOMPARE(QQmlDebugTest::connectTo(QLibraryInfo::path(QLibraryInfo::BinariesPath) + "/qml",
++#ifdef QT_DECLARATIVE_BIN_PATH
++    auto executable = QT_DECLARATIVE_BIN_PATH "/qml";
++#else
++    auto executable = QLibraryInfo::path(QLibraryInfo::BinariesPath) + "/qml";
++#endif
++    QCOMPARE(QQmlDebugTest::connectTo(executable,
+                                     QString(), testFile(QMLFILE), true), ConnectSuccess);
+ 
+     QTRY_VERIFY(m_client->logBuffer.size() >= 2);
+--- a/tests/auto/qml/qmlplugindump/tst_qmlplugindump.cpp
++++ b/tests/auto/qml/qmlplugindump/tst_qmlplugindump.cpp
+@@ -62,7 +62,11 @@ tst_qmlplugindump::tst_qmlplugindump()
+ void tst_qmlplugindump::initTestCase()
+ {
+     QQmlDataTest::initTestCase();
++#ifdef QT_DECLARATIVE_BIN_PATH
++    qmlplugindumpPath = QT_DECLARATIVE_BIN_PATH;
++#else
+     qmlplugindumpPath = QLibraryInfo::path(QLibraryInfo::BinariesPath);
++#endif
+ 
+ #if defined(Q_OS_WIN)
+     qmlplugindumpPath += QLatin1String("/qmlplugindump.exe");
diff --git a/srcpkgs/qt6-declarative/patches/qml-blacklist-more.patch b/srcpkgs/qt6-declarative/patches/qml-blacklist-more.patch
new file mode 100644
index 000000000000..2d2629bf9df9
--- /dev/null
+++ b/srcpkgs/qt6-declarative/patches/qml-blacklist-more.patch
@@ -0,0 +1,48 @@
+--- a/tests/auto/quickcontrols2/controls/universal/BLACKLIST
++++ b/tests/auto/quickcontrols2/controls/universal/BLACKLIST
+@@ -6,5 +6,6 @@
+ 
+ # QTBUG-95750
+ [RangeSlider::test_overlappingHandles]
+ b2qt
+ qnx
++linux
+--- a/tests/auto/quickcontrols2/controls/basic/BLACKLIST
++++ b/tests/auto/quickcontrols2/controls/basic/BLACKLIST
+@@ -6,5 +6,6 @@
+ 
+ # QTBUG-95750
+ [RangeSlider::test_overlappingHandles]
+ b2qt
+ qnx
++linux
+--- a/tests/auto/quickcontrols2/controls/fusion/BLACKLIST
++++ b/tests/auto/quickcontrols2/controls/fusion/BLACKLIST
+@@ -6,5 +6,6 @@
+ 
+ # QTBUG-95750
+ [RangeSlider::test_overlappingHandles]
+ b2qt
+ qnx
++linux
+--- a/tests/auto/quickcontrols2/controls/imagine/BLACKLIST
++++ b/tests/auto/quickcontrols2/controls/imagine/BLACKLIST
+@@ -6,8 +6,9 @@
+ 
+ # QTBUG-95750
+ [RangeSlider::test_overlappingHandles]
+ b2qt
+ qnx
++linux
+ 
+ # QTBUG-101704
+ [ToolTip::test_attachedSizeBug]
+--- a/tests/auto/quickcontrols2/controls/material/BLACKLIST
++++ b/tests/auto/quickcontrols2/controls/material/BLACKLIST
+@@ -6,5 +6,6 @@
+ 
+ # QTBUG-95750
+ [RangeSlider::test_overlappingHandles]
+ b2qt
+ qnx
++linux
diff --git a/srcpkgs/qt6-declarative/patches/qml-broken-test.patch b/srcpkgs/qt6-declarative/patches/qml-broken-test.patch
new file mode 100644
index 000000000000..4d44e90b678c
--- /dev/null
+++ b/srcpkgs/qt6-declarative/patches/qml-broken-test.patch
@@ -0,0 +1,64 @@
+--- a/tests/auto/quickcontrols2/controls/data/tst_rangeslider.qml
++++ b/tests/auto/quickcontrols2/controls/data/tst_rangeslider.qml
+@@ -649,61 +649,6 @@ TestCase {
+     }
+ 
+     function test_overlappingHandles() {
+-        var control = createTemporaryObject(sliderComponent, testCase)
+-        verify(control)
+-
+-        // By default, we force the second handle to be after the first in
+-        // terms of stacking order *and* z value.
+-        compare(control.second.handle.z, 1)
+-        compare(control.first.handle.z, 0)
+-        control.first.value = 0
+-        control.second.value = 0
+-
+-        // When both handles overlap, only the handle with the higher Z value
+-        // should be hovered.
+-        mouseMove(control, control.second.handle.x, control.second.handle.y)
+-        compare(control.second.hovered, true)
+-        compare(control.first.hovered, false)
+-
+-        // Both are at the same position, so it doesn't matter whose coordinates we use.
+-        mousePress(control, control.first.handle.x, control.first.handle.y, Qt.LeftButton)
+-        verify(control.second.pressed)
+-        compare(control.second.handle.z, 1)
+-        compare(control.first.handle.z, 0)
+-
+-        // Move the second handle out of the way.
+-        mouseMove(control, control.width, control.first.handle.y)
+-        mouseRelease(control, control.width, control.first.handle.y, Qt.LeftButton)
+-        verify(!control.second.pressed)
+-        compare(control.second.value, 1.0)
+-        compare(control.second.handle.z, 1)
+-        compare(control.first.handle.z, 0)
+-
+-        // The first handle should not be hovered.
+-        compare(control.first.hovered, false)
+-
+-        // Move the first handle on top of the second.
+-        mousePress(control, control.first.handle.x, control.first.handle.y, Qt.LeftButton)
+-        verify(control.first.pressed)
+-        compare(control.first.handle.z, 1)
+-        compare(control.second.handle.z, 0)
+-
+-        mouseMove(control, control.width, control.first.handle.y)
+-        mouseRelease(control, control.width, control.first.handle.y, Qt.LeftButton)
+-        verify(!control.first.pressed)
+-        compare(control.first.handle.z, 1)
+-        compare(control.second.handle.z, 0)
+-
+-        // The most recently pressed handle (the first) should have the higher z value.
+-        mousePress(control, control.first.handle.x, control.first.handle.y, Qt.LeftButton)
+-        verify(control.first.pressed)
+-        compare(control.first.handle.z, 1)
+-        compare(control.second.handle.z, 0)
+-
+-        mouseRelease(control, control.first.handle.x, control.first.handle.y, Qt.LeftButton)
+-        verify(!control.first.pressed)
+-        compare(control.first.handle.z, 1)
+-        compare(control.second.handle.z, 0)
+     }
+ 
+     function test_keys_data() {
diff --git a/srcpkgs/qt6-declarative/template b/srcpkgs/qt6-declarative/template
index e0bd28d9e383..8a190dfc35bc 100644
--- a/srcpkgs/qt6-declarative/template
+++ b/srcpkgs/qt6-declarative/template
@@ -1,23 +1,22 @@
 # Template file for 'qt6-declarative'
 pkgname=qt6-declarative
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qtdeclarative-everywhere-src-${version}"
 build_style=cmake
-configure_args=" -DQT_HOST_PATH=/usr"
 hostmakedepends="qt6-base-devel perl pkg-config wayland-devel
  qt6-shadertools-devel"
-makedepends="qt6-base-devel Vulkan-Headers"
+makedepends="qt6-base-devel Vulkan-Headers qt6-shadertools-devel"
 short_desc="Cross-platform application and UI framework - Declarative"
 maintainer="John <me@johnnynator.dev>"
 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=d294b029dc2b2d4f65da516fdc3b8088d32643eb7ff77db135a8b9ce904caa37
+checksum=03e7694123820fcca397f95ce312e0b7f3039493c8754c836da098a1a04346e8
 replaces="qt6-quickcontrols2>=0"
 
 if [ "$CROSS_BUILD" ]; then
-	configure_args+=" -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true"
+	configure_args="-DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true"
 	hostmakedepends+=" qt6-declarative-devel"
 fi
 
@@ -29,13 +28,31 @@ if [ "$XBPS_TARGET_ENDIAN" = "be" ]; then
 	broken="shader compilation fails"
 fi
 
+pre_configure() {
+	CXXFLAGS+=" '-DQT_DECLARATIVE_BIN_PATH=\"${wrksrc}/build/lib/qt6/bin\"'"
+	CXXFLAGS+=" '-DQT_DECLARATIVE_LIBEXEC_PATH=\"${wrksrc}/build/lib/qt6/libexec\"'"
+}
+
 pre_check() {
 	export QML2_IMPORT_PATH="$wrksrc/build/lib/qt6/qml"
 }
 
 do_check() {
 	cd build
-	ctest -E '(tst_qqmllocale|text|tst_qquickwidget)'
+	local broken="tst_qqmllocale|text|tst_qquickwidget"
+	# requires qt6-declarative installed
+	broken+="|module_includes|cmake_tooling_imports|empty_qmldir"
+	broken+="|qtquickcompiler|qmlquery"
+	# Could work if Qt6Quick.so.6 could be found by qml
+	broken+="|tst_qqmldebugjs|tst_qqmlinspector"
+	broken+="|tst_qqmlprofilerservice|tst_qqmljsscope"
+	broken+="|tst_qqmlpreview|tst_qmllint|tst_qmlformat"
+	# can't find the source
+	broken+="|tst_qmltc_qprocess"
+	broken+="|tst_qquickfiledialogimpl"
+	broken+="|tst_qquickfolderdialogimpl"
+	broken+="|tst_qmlimportscanner|tst_qqmlextensionplugin"
+	ctest -E "($broken)"
 }
 
 qt6-declarative-tools_package() {
@@ -60,11 +77,14 @@ qt6-declarative-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/libQt6QuickTest.so.*"
 		vmove usr/lib/qt6/qml/QtTest
 		vmove usr/lib/qt6/bin/qmltestrunner
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From 7cd2db706780ebbfaea70d1bb69e71923aff5d03 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:07 +0700
Subject: [PATCH 04/27] qt6-imageformats: update to 6.3.1.

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

diff --git a/srcpkgs/qt6-imageformats/template b/srcpkgs/qt6-imageformats/template
index eaca95243c48..9f6d2fb66776 100644
--- a/srcpkgs/qt6-imageformats/template
+++ b/srcpkgs/qt6-imageformats/template
@@ -1,10 +1,9 @@
 # Template file for 'qt6-imageformats'
 pkgname=qt6-imageformats
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qtimageformats-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr"
 hostmakedepends="perl qt6-base-devel"
 makedepends="qt6-base-devel"
 short_desc="Cross-platform application and UI framework - imageformats"
@@ -12,4 +11,4 @@ maintainer="John <me@johnnynator.dev>"
 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=025d0d17ed75b42a7eb6b523731ab8f17025421a8810cade25caffe05d93abef
+checksum=ad0312b8dfbbb67f729bfadbfcd47246ee4a128b717731ba158c41d01fde212f

From ec5ecd44b901015385bcd33b7c7b5cbf880a4531 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:07 +0700
Subject: [PATCH 05/27] qt6-location: update to 6.3.1.

---
 srcpkgs/qt6-location/template | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/qt6-location/template b/srcpkgs/qt6-location/template
index b7397f5f8942..9f26103259ad 100644
--- a/srcpkgs/qt6-location/template
+++ b/srcpkgs/qt6-location/template
@@ -1,10 +1,9 @@
 # Template file for 'qt6-location'
 pkgname=qt6-location
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qtpositioning-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr"
 hostmakedepends="perl qt6-base-devel qt6-declarative-devel"
 makedepends="qt6-serialport-devel qt6-declarative-devel GConf-devel"
 short_desc="Cross-platform application and UI framework - location"
@@ -12,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 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=e9ed50f6b245a346db34d625d0012774ef0ec8e7fd65037127ec26758708236e
+checksum=06788e4ecae1920094b30e4046f0abd23c8189d8a51e9c939b02f0b6abe2e86c
 
 qt6-location-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel>=${version}_1"
@@ -20,8 +19,11 @@ qt6-location-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From db570661ed5fb021ddb9f4df4d57075cd0a4fe2c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:08 +0700
Subject: [PATCH 06/27] qt6-lottie: update to 6.3.1.

---
 srcpkgs/qt6-lottie/template | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/qt6-lottie/template b/srcpkgs/qt6-lottie/template
index 1c97cd5f4f32..a7beb62ec368 100644
--- a/srcpkgs/qt6-lottie/template
+++ b/srcpkgs/qt6-lottie/template
@@ -1,10 +1,9 @@
 # Template file for 'qt6-lottie'
 pkgname=qt6-lottie
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qtlottie-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr"
 hostmakedepends="perl qt6-base-devel"
 makedepends="qt6-declarative-devel"
 short_desc="Cross-platform application and UI framework - lottie"
@@ -12,10 +11,10 @@ maintainer="John <me@johnnynator.dev>"
 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=39db570bbba5b527a1eb6a5774bed47398ace2f7217bbf45b1194ada6cf97deb
+checksum=740ba76999124d5e1a85ef3d01c69976bb8557862b6b26bf48b357fe0cab1cf5
 
 if [ "$XBPS_CHECK_PKGS" ]; then
-	configure_args+=" -DQT_BUILD_TESTS=ON"
+	configure_args="-DQT_BUILD_TESTS=ON"
 fi
 
 pre_check() {
@@ -28,8 +27,10 @@ qt6-lottie-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
 		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From 1e749c53530936b63830e513f148949e69319d8e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:08 +0700
Subject: [PATCH 07/27] qt6-networkauth: update to 6.3.1.

---
 srcpkgs/qt6-networkauth/template | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/qt6-networkauth/template b/srcpkgs/qt6-networkauth/template
index e934beada9b0..1454ceb4a525 100644
--- a/srcpkgs/qt6-networkauth/template
+++ b/srcpkgs/qt6-networkauth/template
@@ -1,10 +1,9 @@
 # Template file for 'qt6-networkauth'
 pkgname=qt6-networkauth
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qtnetworkauth-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr"
 hostmakedepends="perl qt6-base-devel"
 makedepends="qt6-base-devel"
 short_desc="Cross-platform application and UI framework - networkauth"
@@ -12,10 +11,10 @@ maintainer="John <me@johnnynator.dev>"
 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=203a98942919028520038f90a20cd7ee32b537233545d11e429c3e2c1ad9069f
+checksum=d60f54b9d4509fa8bdbf1990bc91f6e260e38cdb57a7b8119fa3861bc5d2fb2a
 
 if [ "$XBPS_CHECK_PKGS" ]; then
-	configure_args+=" -DQT_BUILD_TESTS=ON"
+	configure_args="-DQT_BUILD_TESTS=ON"
 fi
 
 qt6-networkauth-devel_package() {
@@ -24,8 +23,11 @@ qt6-networkauth-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From 2434dccca8a117bc62d46f33a60b96b7432c9d42 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:08 +0700
Subject: [PATCH 08/27] qt6-qt5compat: update to 6.3.1.

---
 srcpkgs/qt6-qt5compat/template | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/qt6-qt5compat/template b/srcpkgs/qt6-qt5compat/template
index 7fcd5ad5080e..a62573cfabfa 100644
--- a/srcpkgs/qt6-qt5compat/template
+++ b/srcpkgs/qt6-qt5compat/template
@@ -1,10 +1,9 @@
 # Template file for 'qt6-qt5compat'
 pkgname=qt6-qt5compat
-version=6.3.0
-revision=2
+version=6.3.1
+revision=1
 wrksrc="qt5compat-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr"
 hostmakedepends="qt6-base-devel qt6-declarative-devel perl pkg-config"
 makedepends="qt6-base-devel qt6-declarative-devel"
 short_desc="Cross-platform application and UI framework - Qt5 Compatibilty Component"
@@ -12,10 +11,10 @@ maintainer="John <me@johnnynator.dev>"
 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=2b199be780c50d9214512b922d94cb240b0412fd63f459e356b76102cad1713e
+checksum=a43ec62bd778eaecf88ad7847118d1c2a471b0fcb820f93beb311d7ab9566cfd
 
 if [ "$XBPS_CHECK_PKGS" ]; then
-	configure_args+=" -DQT_BUILD_TESTS=ON"
+	configure_args="-DQT_BUILD_TESTS=ON"
 fi
 
 qt6-qt5compat-devel_package() {
@@ -24,8 +23,11 @@ qt6-qt5compat-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From 8baa5c7324b04548464a2d18ed1d12d472eb2d84 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:08 +0700
Subject: [PATCH 09/27] qt6-quick3d: update to 6.3.1.

---
 srcpkgs/qt6-quick3d/template | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/qt6-quick3d/template b/srcpkgs/qt6-quick3d/template
index 0f7ef336a3ff..685ce9bc0e90 100644
--- a/srcpkgs/qt6-quick3d/template
+++ b/srcpkgs/qt6-quick3d/template
@@ -1,19 +1,23 @@
 # Template file for 'qt6-quick3d'
 pkgname=qt6-quick3d
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qtquick3d-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr "
 hostmakedepends="perl qt6-base-devel qt6-declarative-devel qt6-shadertools-devel"
 makedepends="qt6-base-devel qt6-declarative-devel qt6-shadertools-devel
- libassimp-devel"
+ qt6-quicktimeline libassimp-devel"
 short_desc="Cross-platform application and UI framework - Quick3d"
 maintainer="John <me@johnnynator.dev>"
 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=0ad05bd1ee1f784b18220a2d2625ee8de91662c88fdc7b798662953d86eb327e
+checksum=2fa766ee47b8c07412b3b755206ada0715fb07813b64ed069e7205044c061256
+
+if [ "$CROSS_BUILD" ]; then
+	hostmakedepends+=" qt6-quick3d-devel"
+	configure_args="-DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true"
+fi
 
 if [ "$XBPS_TARGET_ENDIAN" = "be" ]; then
 	# possibly a qt6-shadertools bug, actually
@@ -26,9 +30,12 @@ qt6-quick3d-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
-		vmove usr/lib/qt6/mkspecs
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/bin
+		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From f795f480e90fd073de895d8386b5da0ec3ce4fbc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:09 +0700
Subject: [PATCH 10/27] qt6-quicktimeline: update to 6.3.1.

---
 common/shlibs                      | 1 +
 srcpkgs/qt6-quicktimeline/template | 7 +++----
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 61924610cc52..26f10d604be9 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2045,6 +2045,7 @@ libQt6Quick3DIblBaker.so.6 qt6-quick3d-6.0.3_1
 libQt6Quick3DParticles.so.6 qt6-quick3d-6.1.0_1
 libQt6Quick3DGlslParser.so.6 qt6-quick3d-6.3.0_1
 libQt6Quick3DAssetUtils.so.6 qt6-quick3d-6.1.0_1
+libQt6QuickTimeline.so.6 qt6-quicktimeline-6.3.0_1
 libQt6QuickControls2Impl.so.6 qt6-declarative-6.0.0_1
 libQt6QuickControls2.so.6 qt6-declarative-6.0.0_1
 libQt6QuickTemplates2.so.6 qt6-declarative-6.0.0_1
diff --git a/srcpkgs/qt6-quicktimeline/template b/srcpkgs/qt6-quicktimeline/template
index 15aa7a8e5819..bf02e043c4a5 100644
--- a/srcpkgs/qt6-quicktimeline/template
+++ b/srcpkgs/qt6-quicktimeline/template
@@ -1,10 +1,9 @@
 # Template file for 'qt6-quicktimeline'
 pkgname=qt6-quicktimeline
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qtquicktimeline-everywhere-src-${version/rc/-rc}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr "
 hostmakedepends="perl qt6-base-devel qt6-declarative-devel"
 makedepends="qt6-base-devel qt6-declarative-devel"
 short_desc="Cross-platform application and UI framework - quicktimeline"
@@ -12,10 +11,10 @@ maintainer="John <me@johnnynator.dev>"
 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=9ff0a931159efc6be5bd9f8a1e4a16a70e2dab37cf22ad85c6d330ccfdf31c1a
+checksum=58a13cf0ce8e7755639f20684078733af24f5a317f6ddb40d6079c8c5a28ebbe
 
 if [ "$XBPS_CHECK_PKGS" ]; then
-	configure_args+=" -DQT_BUILD_TESTS=ON"
+	configure_args="-DQT_BUILD_TESTS=ON"
 fi
 
 pre_check() {

From 6e0ecefa90b22d3c7f4e598c8e756e86fa490d5d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:09 +0700
Subject: [PATCH 11/27] qt6-scxml: update to 6.3.1.

---
 srcpkgs/qt6-scxml/template | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/qt6-scxml/template b/srcpkgs/qt6-scxml/template
index 112baca0ab83..d17ccf16400a 100644
--- a/srcpkgs/qt6-scxml/template
+++ b/srcpkgs/qt6-scxml/template
@@ -1,10 +1,10 @@
 # Template file for 'qt6-scxml'
 pkgname=qt6-scxml
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qtscxml-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr"
+configure_args="-DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true"
 hostmakedepends="perl qt6-declarative-devel"
 makedepends="qt6-declarative-devel"
 short_desc="Cross-platform application and UI framework - scxml"
@@ -12,7 +12,11 @@ maintainer="John <me@johnnynator.dev>"
 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=09b0dbd6ac367920fb1ba96a39dcd4c9d33eb0820dcc79538992825d588a70f0
+checksum=01bc154d6163d1f049f4e1e76658a044730ace7b0a5be35c9a46fcd1396f8619
+
+if [ "$CROSS_BUILD" ]; then
+	hostmakedepends+=" qt6-remoteobjects"
+fi
 
 if [ "$XBPS_CHECK_PKGS" ]; then
 	configure_args+=" -DQT_BUILD_TESTS=ON"
@@ -24,8 +28,11 @@ qt6-scxml-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From fd6e41c59d9aea9596d9dc512263a7ba58b6a3c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:09 +0700
Subject: [PATCH 12/27] qt6-serialport: update to 6.3.1.

---
 srcpkgs/qt6-serialport/template | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/qt6-serialport/template b/srcpkgs/qt6-serialport/template
index 0804671ca57b..2de9d6364a5c 100644
--- a/srcpkgs/qt6-serialport/template
+++ b/srcpkgs/qt6-serialport/template
@@ -1,10 +1,9 @@
 # Template file for 'qt6-serialport'
 pkgname=qt6-serialport
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qtserialport-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr"
 hostmakedepends="perl qt6-base-devel pkg-config"
 makedepends="qt6-base-devel"
 short_desc="Cross-platform application and UI framework - serialport"
@@ -12,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 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=eebd6934d48cc044b8c87795a4fd91bb81f7195d4b5a2ddb12802f343d5db64f
+checksum=4eb6d80e65799dd2e0318df4dfba14173c1929e861718cda9bedca24253b616e
 
 qt6-serialport-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel>=${version}_1"
@@ -20,8 +19,11 @@ qt6-serialport-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From 6367306cdd254c8399ea6520278ca96907dd6a11 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:09 +0700
Subject: [PATCH 13/27] qt6-shadertools: update to 6.3.1.

---
 srcpkgs/qt6-shadertools/template | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/qt6-shadertools/template b/srcpkgs/qt6-shadertools/template
index 9c1ec210a96a..3716333c459b 100644
--- a/srcpkgs/qt6-shadertools/template
+++ b/srcpkgs/qt6-shadertools/template
@@ -1,10 +1,9 @@
 # Template file for 'qt6-shadertools'
 pkgname=qt6-shadertools
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qtshadertools-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr "
 hostmakedepends="perl qt6-base-devel"
 makedepends="qt6-base-devel"
 short_desc="Cross-platform application and UI framework - shadertools"
@@ -12,7 +11,13 @@ maintainer="John <me@johnnynator.dev>"
 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=5498959b9d37c254bd126ab1320cf86aeb8a31b3ea7e51db666a8f9698afbd6c
+checksum=59b77176961528cc7b0c9325134655e273aa87b4cb386c0f4683d8f2852e435a
+
+if [ "$CROSS_BUILD" ]; then
+	configure_args="-DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true"
+	hostmakedepends+=" qt6-shadertools-devel"
+fi
+
 
 qt6-shadertools-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel>=${version}_1"
@@ -20,8 +25,11 @@ qt6-shadertools-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From 326eb9d92fe8783229193833b6461bc26b5a160b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:09 +0700
Subject: [PATCH 14/27] qt6-svg: update to 6.3.1.

---
 srcpkgs/qt6-svg/template | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/qt6-svg/template b/srcpkgs/qt6-svg/template
index aa8e6b745109..309b0988e435 100644
--- a/srcpkgs/qt6-svg/template
+++ b/srcpkgs/qt6-svg/template
@@ -1,10 +1,9 @@
 # Template file for 'qt6-svg'
 pkgname=qt6-svg
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qtsvg-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr "
 hostmakedepends="qt6-base-devel perl"
 makedepends="qt6-base-devel"
 short_desc="Cross-platform application and UI framework (QT6) - qt6-svg component"
@@ -12,10 +11,10 @@ maintainer="John <me@johnnynator.dev>"
 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=3164504d7e3f640439308235739b112605ab5fc9cc517ca0b28f9fb93a8db0e3
+checksum=7b19f418e6f7b8e23344082dd04440aacf5da23c5a73980ba22ae4eba4f87df7
 
 if [ "$XBPS_CHECK_PKGS" ]; then
-	configure_args+=" -DQT_BUILD_TESTS=ON"
+	configure_args="-DQT_BUILD_TESTS=ON"
 fi
 
 do_check() {
@@ -29,8 +28,11 @@ qt6-svg-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From 8409f900c37eb42b551bdf87ad83101667c39efe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:10 +0700
Subject: [PATCH 15/27] qt6-tools: update to 6.3.1.

---
 srcpkgs/qt6-tools/template | 23 ++++++++++++++++++-----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/qt6-tools/template b/srcpkgs/qt6-tools/template
index f875dff5c046..fd311176e31d 100644
--- a/srcpkgs/qt6-tools/template
+++ b/srcpkgs/qt6-tools/template
@@ -1,23 +1,33 @@
 # Template file for 'qt6-tools'
 pkgname=qt6-tools
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qttools-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr "
-hostmakedepends="qt6-base-devel perl"
-makedepends="qt6-base-devel libatomic-devel"
+configure_args="-DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=TRUE
+ -DQT_BUILD_SHARED_LIBS=ON -DQT_FEATURE_assistant=ON"
+hostmakedepends="qt6-base-devel perl qt6-plugin-sqlite"
+makedepends="qt6-base-devel libatomic-devel qt6-plugin-sqlite"
 short_desc="Cross-platform application and UI framework (QT6) - qt6-tools component"
 maintainer="John <me@johnnynator.dev>"
 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/qttools-everywhere-src-${version}.tar.xz"
-checksum=fce94688ea925782a2879347584991f854630daadba6c52aed6d93e33cd0b19c
+checksum=c412750f2aa3beb93fce5f30517c607f55daaeb7d0407af206a8adf917e126c1
+
+if [ "$CROSS_BUILD" ]; then
+	hostmakedepends+=" qt6-tools-devel"
+fi
+
 
 if [ "$XBPS_CHECK_PKGS" ]; then
 	configure_args+=" -DQT_BUILD_TESTS=ON"
 fi
 
+post_build() {
+	ninja -C build ${makejobs} lib/qt6/libexec/qhelpgenerator
+}
+
 do_check() {
 	cd build
 	# Some of these tests expect that qt6-tools is already
@@ -31,8 +41,11 @@ qt6-tools-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From 4ecbb5f9e623ef2b18a02ea3859e5bf528f35984 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:10 +0700
Subject: [PATCH 16/27] qt6-translations: update to 6.3.1.

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

diff --git a/srcpkgs/qt6-translations/template b/srcpkgs/qt6-translations/template
index be0a74ca74e2..1b917ccb3620 100644
--- a/srcpkgs/qt6-translations/template
+++ b/srcpkgs/qt6-translations/template
@@ -1,10 +1,9 @@
 # Template file for 'qt6-translations'
 pkgname=qt6-translations
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qttranslations-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr "
 hostmakedepends="qt6-base-devel qt6-tools-devel perl"
 makedepends="qt6-base-devel qt6-tools-devel"
 short_desc="Cross-platform application and UI framework - translations"
@@ -12,4 +11,4 @@ maintainer="John <me@johnnynator.dev>"
 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=e4dd4ef892a34a9514a19238f189a33ed85c76f31dcad6599ced93b1e33440b3
+checksum=d7bdd55e2908ded901dcc262157100af2a490bf04d31e32995f6d91d78dfdb97

From 822c78e72370528a8e91f49bd8d6337d55efe00e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:10 +0700
Subject: [PATCH 17/27] qt6-virtualkeyboard: update to 6.3.1.

---
 srcpkgs/qt6-virtualkeyboard/template | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/qt6-virtualkeyboard/template b/srcpkgs/qt6-virtualkeyboard/template
index 67ecef145ea1..77a247400b97 100644
--- a/srcpkgs/qt6-virtualkeyboard/template
+++ b/srcpkgs/qt6-virtualkeyboard/template
@@ -1,10 +1,9 @@
 # Template file for 'qt6-virtualkeyboard'
 pkgname=qt6-virtualkeyboard
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qtvirtualkeyboard-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr"
 hostmakedepends="perl pkg-config qt6-declarative-devel"
 makedepends="qt6-declarative-devel qt6-svg-devel hunspell-devel"
 short_desc="Cross-platform application and UI framework - virtualkeyboard"
@@ -12,10 +11,10 @@ maintainer="John <me@johnnynator.dev>"
 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=89aaf15acf5432af8f5cf4ec45cb32d87a3348906215dd56e81cb294eb276573
+checksum=5fe089b204d859ab0dd0169f811f2e30cae7c5cb36f8ab95ca36883f1fc0c2b8
 
 if [ "$XBPS_CHECK_PKGS" ]; then
-	configure_args+=" -DQT_BUILD_TESTS=ON"
+	configure_args="-DQT_BUILD_TESTS=ON"
 fi
 
 do_check() {
@@ -32,8 +31,11 @@ qt6-virtualkeyboard-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From c3f6c3e84e4d92d34964d8c9d3d07a4ca53b3cda Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:10 +0700
Subject: [PATCH 18/27] qt6-wayland: update to 6.3.1.

---
 srcpkgs/qt6-wayland/template | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/qt6-wayland/template b/srcpkgs/qt6-wayland/template
index b71a273009b9..784cb42a1a03 100644
--- a/srcpkgs/qt6-wayland/template
+++ b/srcpkgs/qt6-wayland/template
@@ -1,13 +1,15 @@
 # Template file for 'qt6-wayland'
 pkgname=qt6-wayland
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qtwayland-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true"
-hostmakedepends="qt6-base-devel perl pkg-config wayland-devel qt6-wayland-devel"
+configure_args="-DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true"
+hostmakedepends="qt6-base-devel perl pkg-config wayland-devel
+ qt6-declarative-devel qt6-wayland-devel"
 # XXX: Qml as optional dep
 makedepends="qt6-base-devel wayland-devel libxkbcommon-devel
+ qt6-declarative-devel
  libXcomposite-devel MesaLib-devel Vulkan-Headers libdrm-devel"
 checkdepends="dbus mesa-dri"
 short_desc="Cross-platform application and UI framework - Wayland"
@@ -15,7 +17,7 @@ maintainer="John <me@johnnynator.dev>"
 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=e7b567f6e43ffc5918d4aa825ce1eced66a00cb0a87133b2912ba5c1b2a02190
+checksum=6f14fea2d172a5b4170be3efcb0e58535f6605b61bcd823f6d5c9d165bb8c0f0
 
 if [ "$XBPS_CHECK_PKGS" ]; then
 	configure_args+=" -DQT_BUILD_TESTS=ON"
@@ -32,9 +34,11 @@ qt6-wayland-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
-		vmove usr/lib/qt6/libexec/qtwaylandscanner
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From 1daf1132c7b4e0d10374c5a1494adf1c4e296ee1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:10 +0700
Subject: [PATCH 19/27] qt6-websockets: update to 6.3.1.

---
 srcpkgs/qt6-websockets/template | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/qt6-websockets/template b/srcpkgs/qt6-websockets/template
index c2e674aacb31..4875af093432 100644
--- a/srcpkgs/qt6-websockets/template
+++ b/srcpkgs/qt6-websockets/template
@@ -1,10 +1,9 @@
 # Template file for 'qt6-websockets'
 pkgname=qt6-websockets
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qtwebsockets-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr"
 hostmakedepends="perl qt6-base-devel qt6-declarative-devel"
 makedepends="qt6-base-devel qt6-declarative-devel"
 short_desc="Cross-platform application and UI framework - websockets"
@@ -12,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 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=e018a09fe960b7d9560d6bbc9d3ca022fed6566e6ba6fc6d869a97482d4e6361
+checksum=9f980d90c97fcbde1b50c773f6dc580cfdf8c36ce14a1be3aa2ccadfe605121a
 
 qt6-websockets-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel>=${version}_1"
@@ -20,8 +19,11 @@ qt6-websockets-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From 87f0ee8a5b8b3b86dbabf9b84f22426244579d3c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Tue, 9 Aug 2022 20:16:47 +0700
Subject: [PATCH 20/27] qt6-3d: update to 6.3.1.

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

diff --git a/srcpkgs/qt6-3d/template b/srcpkgs/qt6-3d/template
index 666f57559532..c08c3bd4a41b 100644
--- a/srcpkgs/qt6-3d/template
+++ b/srcpkgs/qt6-3d/template
@@ -1,10 +1,9 @@
 # Template file for 'qt6-3d'
 pkgname=qt6-3d
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qt3d-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr"
 hostmakedepends="perl qt6-declarative-devel"
 makedepends="qt6-declarative-devel qt6-shadertools-devel libassimp-devel
  libatomic-devel"
@@ -13,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 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=74e762380dad34887878b9124dbfb981d5cf4b8b807281ff8bff311145b54de1
+checksum=9919b66dfb253fa26db1a7d664358cbc07f46c8810082ee3120d0a54b153edfe
 
 qt6-3d-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 41527795a4198e5daa0b30567f80ac6835497c75 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:11 +0700
Subject: [PATCH 21/27] New package: qt6-webchannel-6.3.1

---
 srcpkgs/qt6-webchannel-devel    |  1 +
 srcpkgs/qt6-webchannel/template | 32 ++++++++++++++++++++++++++++++++
 srcpkgs/qt6-webchannel/update   |  1 +
 3 files changed, 34 insertions(+)
 create mode 120000 srcpkgs/qt6-webchannel-devel
 create mode 100644 srcpkgs/qt6-webchannel/template
 create mode 100644 srcpkgs/qt6-webchannel/update

diff --git a/srcpkgs/qt6-webchannel-devel b/srcpkgs/qt6-webchannel-devel
new file mode 120000
index 000000000000..03e8b23d785d
--- /dev/null
+++ b/srcpkgs/qt6-webchannel-devel
@@ -0,0 +1 @@
+qt6-webchannel
\ No newline at end of file
diff --git a/srcpkgs/qt6-webchannel/template b/srcpkgs/qt6-webchannel/template
new file mode 100644
index 000000000000..432c42bcc056
--- /dev/null
+++ b/srcpkgs/qt6-webchannel/template
@@ -0,0 +1,32 @@
+# Template file for 'qt6-webchannel'
+pkgname=qt6-webchannel
+version=6.3.1
+revision=1
+wrksrc="qtwebchannel-everywhere-src-${version}"
+build_style=cmake
+hostmakedepends="perl qt6-base-devel qt6-declarative-devel"
+makedepends="qt6-base-devel qt6-declarative-devel qt6-websockets-devel"
+short_desc="Cross-platform application and UI framework - webchannel"
+maintainer="John <me@johnnynator.dev>"
+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=aaa20ac23f86992721b7ee487c379a3fd68caa8cdcea0a77a37e0d8b47ff2668
+
+qt6-webchannel-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel>=${version}_1
+	 qt6-websockets-devel>=${version}_1"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
+		vmove usr/lib/qt6/mkspecs
+		vmove usr/lib/qt6/qml/QtWebChannel/plugins.qmltypes
+		vmove usr/lib/qt6/qml/QtWebChannel/qmldir
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
+	}
+}
diff --git a/srcpkgs/qt6-webchannel/update b/srcpkgs/qt6-webchannel/update
new file mode 100644
index 000000000000..844552465222
--- /dev/null
+++ b/srcpkgs/qt6-webchannel/update
@@ -0,0 +1 @@
+pkgname="${pkgname/6-/}-everywhere-src"

From eb4fca23225607da3b104a0e74d9419e0388c87a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:11 +0700
Subject: [PATCH 22/27] New package: qt6-multimedia-6.3.1

---
 common/shlibs                   |  3 +++
 srcpkgs/qt6-multimedia-devel    |  1 +
 srcpkgs/qt6-multimedia/template | 33 +++++++++++++++++++++++++++++++++
 srcpkgs/qt6-multimedia/update   |  1 +
 4 files changed, 38 insertions(+)
 create mode 120000 srcpkgs/qt6-multimedia-devel
 create mode 100644 srcpkgs/qt6-multimedia/template
 create mode 100644 srcpkgs/qt6-multimedia/update

diff --git a/common/shlibs b/common/shlibs
index 26f10d604be9..ce04cc1ad2cf 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2078,6 +2078,9 @@ libQt6SerialPort.so.6 qt6-serialport-6.2.0alpha_1
 libQt6WebSockets.so.6 qt6-websockets-6.2.0alpha_1
 libQt6WebChannel.so.6 qt6-webchannel-6.2.0alpha_1
 libQt6Positioning.so.6 qt6-location-6.2.0alpha_1
+libQt6MultimediaWidgets.so.6 qt6-multimedia-6.3.1_1
+libQt6MultimediaQuick.so.6 qt6-multimedia-6.3.1_1
+libQt6Multimedia.so.6 qt6-multimedia-6.3.1_1
 libnpth.so.0 npth-1.1_1
 libnpupnp.so.4 libnpupnp-4.0.2_1
 libglfw.so.3 glfw-3.0.4_1
diff --git a/srcpkgs/qt6-multimedia-devel b/srcpkgs/qt6-multimedia-devel
new file mode 120000
index 000000000000..9343446502d0
--- /dev/null
+++ b/srcpkgs/qt6-multimedia-devel
@@ -0,0 +1 @@
+qt6-multimedia
\ No newline at end of file
diff --git a/srcpkgs/qt6-multimedia/template b/srcpkgs/qt6-multimedia/template
new file mode 100644
index 000000000000..535a2f55ffe4
--- /dev/null
+++ b/srcpkgs/qt6-multimedia/template
@@ -0,0 +1,33 @@
+# Template file for 'qt6-multimedia'
+pkgname=qt6-multimedia
+version=6.3.1
+revision=1
+wrksrc="qtmultimedia-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DQT_FEATURE_gstreamer=ON"
+hostmakedepends="perl qt6-declarative-devel pkg-config
+ qt6-shadertools-devel"
+makedepends="qt6-declarative-devel
+ qt6-shadertools-devel libglib-devel gst-plugins-base1-devel"
+short_desc="Cross-platform application and UI framework - multimedia"
+maintainer="John <me@johnnynator.dev>"
+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=7e03242aadd634ff2d9fcf08948290f03da3d9a5012369d908da89f82b1d7336
+
+qt6-multimedia-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel>=${version}_1"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
+		vmove usr/lib/qt6/mkspecs
+		vmove usr/lib/qt6/qml/QtMultimedia/plugins.qmltypes
+		vmove usr/lib/qt6/qml/QtMultimedia/qmldir
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}
diff --git a/srcpkgs/qt6-multimedia/update b/srcpkgs/qt6-multimedia/update
new file mode 100644
index 000000000000..844552465222
--- /dev/null
+++ b/srcpkgs/qt6-multimedia/update
@@ -0,0 +1 @@
+pkgname="${pkgname/6-/}-everywhere-src"

From 196c8630974ce7fa21d939528af452aaaf7a6acb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 18:22:48 +0700
Subject: [PATCH 23/27] New package: qt6-connectivity-6.3.1

---
 common/shlibs                     |  2 ++
 srcpkgs/qt6-connectivity-devel    |  1 +
 srcpkgs/qt6-connectivity/template | 30 ++++++++++++++++++++++++++++++
 3 files changed, 33 insertions(+)
 create mode 120000 srcpkgs/qt6-connectivity-devel
 create mode 100644 srcpkgs/qt6-connectivity/template

diff --git a/common/shlibs b/common/shlibs
index ce04cc1ad2cf..2e95a22119ab 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2072,6 +2072,8 @@ libQt6Designer.so.6 qt6-tools-6.1.0_1
 libQt6DesignerComponents.so.6 qt6-tools-6.1.0_1
 libQt6Help.so.6 qt6-tools-6.1.0_1
 libQt6UiTools.so.6 qt6-tools-6.1.0_1
+libQt6Nfc.so.6 qt6-connectivity-6.3.1_1
+libQt6Bluetooth.so.6 qt6-connectivity-6.3.1_1
 libQt6HunspellInputMethod.so.6 qt6-virtualkeyboard-6.1.0_1
 libQt6VirtualKeyboard.so.6 qt6-virtualkeyboard-6.1.0_1
 libQt6SerialPort.so.6 qt6-serialport-6.2.0alpha_1
diff --git a/srcpkgs/qt6-connectivity-devel b/srcpkgs/qt6-connectivity-devel
new file mode 120000
index 000000000000..478cc9d8aa39
--- /dev/null
+++ b/srcpkgs/qt6-connectivity-devel
@@ -0,0 +1 @@
+qt6-connectivity
\ No newline at end of file
diff --git a/srcpkgs/qt6-connectivity/template b/srcpkgs/qt6-connectivity/template
new file mode 100644
index 000000000000..6cb61744d0cb
--- /dev/null
+++ b/srcpkgs/qt6-connectivity/template
@@ -0,0 +1,30 @@
+# Template file for 'qt6-connectivity'
+pkgname=qt6-connectivity
+version=6.3.1
+revision=1
+wrksrc="qtconnectivity-everywhere-src-${version}"
+build_style=cmake
+hostmakedepends="perl qt6-declarative-devel"
+makedepends="qt6-declarative-devel"
+short_desc="Cross-platform application and UI framework - Connectivity"
+maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
+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=b25ce4710a9c61bc6a5dbaeeb3e2ed907a8bc85478fdb2ab4312297768b695b0
+
+qt6-connectivity-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}
+	 qt6-declarative>=${version}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
+		vmove usr/lib/qt6/mkspecs
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
+	}
+}

From f39a10d6be6cc05fb737eb9af597b23a70819eb5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 18:22:57 +0700
Subject: [PATCH 24/27] New package: qt6-sensors-6.3.1

---
 common/shlibs                |  2 ++
 srcpkgs/qt6-sensors-devel    |  1 +
 srcpkgs/qt6-sensors/template | 31 +++++++++++++++++++++++++++++++
 3 files changed, 34 insertions(+)
 create mode 120000 srcpkgs/qt6-sensors-devel
 create mode 100644 srcpkgs/qt6-sensors/template

diff --git a/common/shlibs b/common/shlibs
index 2e95a22119ab..157b51f3f981 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2074,6 +2074,8 @@ libQt6Help.so.6 qt6-tools-6.1.0_1
 libQt6UiTools.so.6 qt6-tools-6.1.0_1
 libQt6Nfc.so.6 qt6-connectivity-6.3.1_1
 libQt6Bluetooth.so.6 qt6-connectivity-6.3.1_1
+libQt6Sensors.so.6 qt6-sensors-6.3.1_1
+libQt6SensorsQuick.so.6 qt6-sensors-6.3.1_1
 libQt6HunspellInputMethod.so.6 qt6-virtualkeyboard-6.1.0_1
 libQt6VirtualKeyboard.so.6 qt6-virtualkeyboard-6.1.0_1
 libQt6SerialPort.so.6 qt6-serialport-6.2.0alpha_1
diff --git a/srcpkgs/qt6-sensors-devel b/srcpkgs/qt6-sensors-devel
new file mode 120000
index 000000000000..eb9457f04055
--- /dev/null
+++ b/srcpkgs/qt6-sensors-devel
@@ -0,0 +1 @@
+qt6-sensors
\ No newline at end of file
diff --git a/srcpkgs/qt6-sensors/template b/srcpkgs/qt6-sensors/template
new file mode 100644
index 000000000000..5a81f43b60eb
--- /dev/null
+++ b/srcpkgs/qt6-sensors/template
@@ -0,0 +1,31 @@
+# Template file for 'qt6-sensors'
+pkgname=qt6-sensors
+version=6.3.1
+revision=1
+wrksrc="qtsensors-everywhere-src-${version}"
+build_style=cmake
+hostmakedepends="perl qt6-declarative-devel qt6-svg-devel pkg-config"
+makedepends="qt6-declarative-devel qt6-svg-devel"
+short_desc="Cross-platform application and UI framework - Sensors"
+maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
+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=4b240b59edba9a42b4735758a25f279a26841b982864e7b38f6ef0b81e0d60cc
+
+qt6-sensors-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}
+	 qt6-declarative-devel>=${version}_1"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
+		vmove usr/lib/qt6/mkspecs
+		vmove usr/lib/qt6/qml/QtSensors/plugins.qmltypes
+		vmove usr/lib/qt6/qml/QtSensors/qmldir
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}

From f5432c961d4c9e191c7bc92a51cf50485fa918ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 18:23:08 +0700
Subject: [PATCH 25/27] New package: qt6-remoteobjects-6.3.1

---
 common/shlibs                      |  2 ++
 srcpkgs/qt6-remoteobjects-devel    |  1 +
 srcpkgs/qt6-remoteobjects/template | 36 ++++++++++++++++++++++++++++++
 3 files changed, 39 insertions(+)
 create mode 120000 srcpkgs/qt6-remoteobjects-devel
 create mode 100644 srcpkgs/qt6-remoteobjects/template

diff --git a/common/shlibs b/common/shlibs
index 157b51f3f981..91f197e54c93 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2074,6 +2074,8 @@ libQt6Help.so.6 qt6-tools-6.1.0_1
 libQt6UiTools.so.6 qt6-tools-6.1.0_1
 libQt6Nfc.so.6 qt6-connectivity-6.3.1_1
 libQt6Bluetooth.so.6 qt6-connectivity-6.3.1_1
+libQt6RemoteObjects.so.6 qt6-remoteobjects-6.3.1_1
+libQt6RemoteObjectsQml.so.6 qt6-remoteobjects-6.3.1_1
 libQt6Sensors.so.6 qt6-sensors-6.3.1_1
 libQt6SensorsQuick.so.6 qt6-sensors-6.3.1_1
 libQt6HunspellInputMethod.so.6 qt6-virtualkeyboard-6.1.0_1
diff --git a/srcpkgs/qt6-remoteobjects-devel b/srcpkgs/qt6-remoteobjects-devel
new file mode 120000
index 000000000000..2a027f95266f
--- /dev/null
+++ b/srcpkgs/qt6-remoteobjects-devel
@@ -0,0 +1 @@
+qt6-remoteobjects
\ No newline at end of file
diff --git a/srcpkgs/qt6-remoteobjects/template b/srcpkgs/qt6-remoteobjects/template
new file mode 100644
index 000000000000..71d2d31967b6
--- /dev/null
+++ b/srcpkgs/qt6-remoteobjects/template
@@ -0,0 +1,36 @@
+# Template file for 'qt6-remoteobjects'
+pkgname=qt6-remoteobjects
+version=6.3.1
+revision=1
+wrksrc="qtremoteobjects-everywhere-src-${version}"
+build_style=cmake
+hostmakedepends="perl qt6-declarative-devel pkg-config"
+makedepends="qt6-declarative-devel"
+short_desc="Cross-platform application and UI framework - Remote Objects"
+maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
+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=ea6d038b11c60981de0bd39a6091a59abf7d031e37bfc592b31be1217bef4ca6
+
+if [ "$CROSS_BUILD" ]; then
+	hostmakedepends+=" qt6-remoteobjects"
+	configure_args="-DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true"
+fi
+
+qt6-remoteobjects-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}
+	 qt6-declarative-devel>=${version}_1"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
+		vmove usr/lib/qt6/mkspecs
+		vmove usr/lib/qt6/qml/QtRemoteObjects/plugins.qmltypes
+		vmove usr/lib/qt6/qml/QtRemoteObjects/qmldir
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}

From 0bef4c2f66d5d2a1de10dac2252aa422e67c04ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:11 +0700
Subject: [PATCH 26/27] New package: qt6-webengine-6.3.1.

---
 common/shlibs                                 |    7 +
 srcpkgs/qt6-webengine-devel                   |    1 +
 srcpkgs/qt6-webengine-examples                |    1 +
 .../patches/0001-None-no-debug.patch          |   11 +
 .../patches/0002-enable-ppc64.patch           |   20 +
 .../patches/0003-cross-hack.patch             |   10 +
 .../0004-ppc-disable-jxl-decoder.patch        |   13 +
 .../patches/0050-no-glibc-cmake-check.patch   |   14 +
 .../0100-chromium-sandbox-membarrier.patch    |   58 +
 .../qt6-webengine/patches/0101-size_t.patch   |   16 +
 .../0102-chromium-90-ruy-include.patch        |   19 +
 ...-v8-monotonic-pthread-cont_timedwait.patch |   22 +
 .../0104-chromium-revert-9d080c0.patch        |  162 +
 ...-chromium-revert-drop-of-system-java.patch |   15 +
 .../patches/0106-chromium-system-nodejs.patch |   20 +
 .../0107-chromium-cursed^Uscoped_file.patch   |   18 +
 .../0108-chromium-fix-narrowing-cast.patch    |   53 +
 .../0109-chromium-remove-strip_binary.patch   |   32 +
 ...ium-revert-use-ffile-compilation-dir.patch |   57 +
 ...11-chromium-no-Wno-stringop-overread.patch |   10 +
 .../0150-chromium-glibc-libc_malloc.patch     |   24 +
 ...-include-sys-reg.h-to-get-__WORDSIZE.patch |   21 +
 .../0201-chromium-musl-dispatch-to-musl.patch |  103 +
 .../0202-chromium-musl-no-mallinfo.patch      |   62 +
 .../0203-chromium-musl-siginfo_t.patch        |   18 +
 .../0204-chromium-musl-stackstart.patch       |   20 +
 .../patches/0205-chromium-musl-sandbox.patch  |   92 +
 ...0206-chromium-musl-default-stacksize.patch |   15 +
 .../patches/0208-chromium-musl-execinfo.patch |  125 +
 .../0209-chromium-musl-thread-stacksize.patch |   22 +
 .../0210-chromium-musl-msgvec-push_back.patch |   14 +
 ...ium-musl-canonicalize-file-name-musl.patch |   11 +
 .../0212-chromium-musl-no-getcontext.patch    |   29 +
 .../patches/0213-chromium-musl-crashpad.patch |   24 +
 .../patches/0214-chromium-musl-fixes.patch    |  108 +
 .../patches/0215-chromium-musl-cdefs.patch    |   29 +
 .../patches/0216-chromium-musl-stat.patch     |   12 +
 .../patches/0217-chromium-musl-resolver.patch |   77 +
 .../patches/0600-chromium-sndio.patch         |  876 ++++
 .../patches/0700-armv7l-neon.patch            |   10 +
 ...-chromium-musl-cross-no-asm_ptrace_h.patch |   30 +
 .../0751-chromium-musl-arm-user_vfp.patch     |   20 +
 .../0752-chromium-musl-arm-elf_auxv_t.patch   |   18 +
 ...0801-chromium-i686-vaapi-fpermissive.patch |   24 +
 .../patches/0900-xxx-ppc64le-libvpx.patch     |   65 +
 .../0901-xxx-ppc64le-sandbox-linux-stat.patch |   31 +
 .../patches/0902-xxx-ppc64le-support.patch    | 3556 +++++++++++++++++
 .../0903-xxx-ppc64le-swiftshader.patch        |   18 +
 .../patches/cross-build-examples.patch        |   16 +
 srcpkgs/qt6-webengine/template                |  178 +
 srcpkgs/qt6-webengine/update                  |    1 +
 51 files changed, 6208 insertions(+)
 create mode 120000 srcpkgs/qt6-webengine-devel
 create mode 120000 srcpkgs/qt6-webengine-examples
 create mode 100644 srcpkgs/qt6-webengine/patches/0001-None-no-debug.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0002-enable-ppc64.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0003-cross-hack.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0004-ppc-disable-jxl-decoder.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0050-no-glibc-cmake-check.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0100-chromium-sandbox-membarrier.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0101-size_t.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0102-chromium-90-ruy-include.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0103-chromium-v8-monotonic-pthread-cont_timedwait.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0104-chromium-revert-9d080c0.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0105-chromium-revert-drop-of-system-java.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0106-chromium-system-nodejs.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0107-chromium-cursed^Uscoped_file.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0108-chromium-fix-narrowing-cast.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0109-chromium-remove-strip_binary.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0110-chromium-revert-use-ffile-compilation-dir.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0111-chromium-no-Wno-stringop-overread.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0150-chromium-glibc-libc_malloc.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0200-chromium-musl-include-sys-reg.h-to-get-__WORDSIZE.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0201-chromium-musl-dispatch-to-musl.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0202-chromium-musl-no-mallinfo.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0203-chromium-musl-siginfo_t.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0204-chromium-musl-stackstart.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0205-chromium-musl-sandbox.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0206-chromium-musl-default-stacksize.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0208-chromium-musl-execinfo.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0209-chromium-musl-thread-stacksize.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0210-chromium-musl-msgvec-push_back.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0211-chromium-musl-canonicalize-file-name-musl.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0212-chromium-musl-no-getcontext.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0213-chromium-musl-crashpad.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0214-chromium-musl-fixes.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0215-chromium-musl-cdefs.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0216-chromium-musl-stat.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0217-chromium-musl-resolver.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0600-chromium-sndio.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0700-armv7l-neon.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0750-chromium-musl-cross-no-asm_ptrace_h.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0751-chromium-musl-arm-user_vfp.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0752-chromium-musl-arm-elf_auxv_t.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0801-chromium-i686-vaapi-fpermissive.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0900-xxx-ppc64le-libvpx.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0901-xxx-ppc64le-sandbox-linux-stat.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0902-xxx-ppc64le-support.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0903-xxx-ppc64le-swiftshader.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/cross-build-examples.patch
 create mode 100644 srcpkgs/qt6-webengine/template
 create mode 100644 srcpkgs/qt6-webengine/update

diff --git a/common/shlibs b/common/shlibs
index 91f197e54c93..1f8acc43c36e 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2087,6 +2087,13 @@ libQt6Positioning.so.6 qt6-location-6.2.0alpha_1
 libQt6MultimediaWidgets.so.6 qt6-multimedia-6.3.1_1
 libQt6MultimediaQuick.so.6 qt6-multimedia-6.3.1_1
 libQt6Multimedia.so.6 qt6-multimedia-6.3.1_1
+libQt6WebEngineQuick.so.6 qt6-webengine-6.3.1_1
+libQt6PdfWidgets.so.6 qt6-webengine-6.3.1_1
+libQt6PdfQuick.so.6 qt6-webengine-6.3.1_1
+libQt6WebEngineCore.so.6 qt6-webengine-6.3.1_1
+libQt6Pdf.so.6 qt6-webengine-6.3.1_1
+libQt6WebEngineQuickDelegatesQml.so.6 qt6-webengine-6.3.1_1
+libQt6WebEngineWidgets.so.6 qt6-webengine-6.3.1_1
 libnpth.so.0 npth-1.1_1
 libnpupnp.so.4 libnpupnp-4.0.2_1
 libglfw.so.3 glfw-3.0.4_1
diff --git a/srcpkgs/qt6-webengine-devel b/srcpkgs/qt6-webengine-devel
new file mode 120000
index 000000000000..8e4d1b99c587
--- /dev/null
+++ b/srcpkgs/qt6-webengine-devel
@@ -0,0 +1 @@
+qt6-webengine
\ No newline at end of file
diff --git a/srcpkgs/qt6-webengine-examples b/srcpkgs/qt6-webengine-examples
new file mode 120000
index 000000000000..8e4d1b99c587
--- /dev/null
+++ b/srcpkgs/qt6-webengine-examples
@@ -0,0 +1 @@
+qt6-webengine
\ No newline at end of file
diff --git a/srcpkgs/qt6-webengine/patches/0001-None-no-debug.patch b/srcpkgs/qt6-webengine/patches/0001-None-no-debug.patch
new file mode 100644
index 000000000000..1ba33f8e6fd9
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0001-None-no-debug.patch
@@ -0,0 +1,11 @@
+--- a/cmake/Functions.cmake
++++ b/cmake/Functions.cmake
+@@ -813,6 +813,8 @@ macro(append_build_type_setup)
+         endif()
+     elseif(${config} STREQUAL "MinSizeRel")
+         list(APPEND gnArgArg is_debug=false symbol_level=0 optimize_for_size=true)
++    elseif(${config} STREQUAL "None")
++        list(APPEND gnArgArg is_debug=false symbol_level=0)
+     endif()
+     if(FEATURE_developer_build OR (${config} STREQUAL "Debug") OR QT_FEATURE_webengine_sanitizer)
+         list(APPEND gnArgArg
diff --git a/srcpkgs/qt6-webengine/patches/0002-enable-ppc64.patch b/srcpkgs/qt6-webengine/patches/0002-enable-ppc64.patch
new file mode 100644
index 000000000000..d72ef1ad1a10
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0002-enable-ppc64.patch
@@ -0,0 +1,20 @@
+--- a/cmake/Functions.cmake
++++ b/cmake/Functions.cmake
+@@ -622,6 +622,8 @@ function(get_gn_arch result arch)
+         set(${result} "mipsel" PARENT_SCOPE)
+     elseif(arch STREQUAL "mipsel64")
+         set(${result} "mips64el" PARENT_SCOPE)
++    elseif(arch STREQUAL "power64")
++        set(${result} "power64" PARENT_SCOPE)
+     else()
+         message(DEBUG "Unsupported architecture: ${arch}")
+     endif()
+@@ -641,6 +643,8 @@ function(get_v8_arch result targetArch h
+             set(${result} "mipsel" PARENT_SCOPE)
+         elseif(hostArch STREQUAL "mipsel64")
+             set(${result} "mipsel" PARENT_SCOPE)
++        elseif(hostArch STREQUAL "power64")
++            set(${result} "power64" PARENT_SCOPE)
+         else()
+             message(DEBUG "Unsupported architecture: ${hostArch}")
+         endif()
diff --git a/srcpkgs/qt6-webengine/patches/0003-cross-hack.patch b/srcpkgs/qt6-webengine/patches/0003-cross-hack.patch
new file mode 100644
index 000000000000..ea9f90094a63
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0003-cross-hack.patch
@@ -0,0 +1,10 @@
+--- a/src/core/api/CMakeLists.txt
++++ b/src/core/api/CMakeLists.txt
+@@ -50,6 +50,7 @@ qt_internal_add_module(WebEngineCore
+         Qt::Gui
+         Qt::Network
+         Qt::Quick
++        X11
+ )
+ 
+ set_target_properties(WebEngineCore PROPERTIES QTWEBENGINEPROCESS_NAME ${qtWebEngineProcessName})
diff --git a/srcpkgs/qt6-webengine/patches/0004-ppc-disable-jxl-decoder.patch b/srcpkgs/qt6-webengine/patches/0004-ppc-disable-jxl-decoder.patch
new file mode 100644
index 000000000000..73c1151968f4
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0004-ppc-disable-jxl-decoder.patch
@@ -0,0 +1,13 @@
+--- a/src/core/CMakeLists.txt
++++ b/src/core/CMakeLists.txt
+@@ -414,6 +414,10 @@ foreach(arch ${archs})
+                 CONDITION QT_FEATURE_webengine_ozone_x11 AND XSCRNSAVER_FOUND
+             )
+ 
++            if (cpu STREQUAL "ppc64")
++                list(APPEND gnArgArg enable_jxl_decoder=false)
++            endif()
++
+             if(QT_FEATURE_webengine_kerberos)
+                 list(APPEND gnArgArg
+                      external_gssapi_include_dir="${GSSAPI_INCLUDE_DIRS}/gssapi"
diff --git a/srcpkgs/qt6-webengine/patches/0050-no-glibc-cmake-check.patch b/srcpkgs/qt6-webengine/patches/0050-no-glibc-cmake-check.patch
new file mode 100644
index 000000000000..f756bf0286bb
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0050-no-glibc-cmake-check.patch
@@ -0,0 +1,14 @@
+--- a/configure.cmake
++++ b/configure.cmake
+@@ -499,11 +499,6 @@ add_check_for_support(
+ )
+ add_check_for_support(
+    MODULES QtWebEngine QtPdf
+-   CONDITION NOT LINUX OR TEST_glibc
+-   MESSAGE "A suitable version >= 2.17 of glibc is required."
+-)
+-add_check_for_support(
+-   MODULES QtWebEngine QtPdf
+    CONDITION NOT LINUX OR TEST_khr
+    MESSAGE "Build requires Khronos development headers for build - see mesa/libegl1-mesa-dev"
+ )
diff --git a/srcpkgs/qt6-webengine/patches/0100-chromium-sandbox-membarrier.patch b/srcpkgs/qt6-webengine/patches/0100-chromium-sandbox-membarrier.patch
new file mode 100644
index 000000000000..2dd7b4aa948f
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0100-chromium-sandbox-membarrier.patch
@@ -0,0 +1,58 @@
+--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
++++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
+@@ -413,6 +413,7 @@ bool SyscallSets::IsAllowedProcessStartO
+   switch (sysno) {
+     case __NR_exit:
+     case __NR_exit_group:
++    case __NR_membarrier:
+     case __NR_wait4:
+     case __NR_waitid:
+ #if defined(__i386__)
+--- a/src/3rdparty/chromium/sandbox/linux/system_headers/arm64_linux_syscalls.h
++++ b/src/3rdparty/chromium/sandbox/linux/system_headers/arm64_linux_syscalls.h
+@@ -1215,4 +1215,8 @@
+ #define __NR_landlock_restrict_self 446
+ #endif
+ 
++#if !defined(__NR_membarrier)
++#define __NR_membarrier 283
++#endif
++
+ #endif  // SANDBOX_LINUX_SYSTEM_HEADERS_ARM64_LINUX_SYSCALLS_H_
+--- a/src/3rdparty/chromium/sandbox/linux/system_headers/arm_linux_syscalls.h
++++ b/src/3rdparty/chromium/sandbox/linux/system_headers/arm_linux_syscalls.h
+@@ -1617,6 +1617,10 @@
+ #define __NR_landlock_restrict_self (__NR_SYSCALL_BASE + 446)
+ #endif
+ 
++#if !defined(__NR_membarrier)
++#define __NR_membarrier (__NR_SYSCALL_BASE+389)
++#endif
++
+ // ARM private syscalls.
+ #if !defined(__ARM_NR_BASE)
+ #define __ARM_NR_BASE (__NR_SYSCALL_BASE + 0xF0000)
+--- a/src/3rdparty/chromium/sandbox/linux/system_headers/x86_32_linux_syscalls.h
++++ b/src/3rdparty/chromium/sandbox/linux/system_headers/x86_32_linux_syscalls.h
+@@ -1750,5 +1750,9 @@
+ #define __NR_landlock_restrict_self 446
+ #endif
+ 
++#if !defined(__NR_membarrier)
++#define __NR_membarrier 375
++#endif
++
+ #endif  // SANDBOX_LINUX_SYSTEM_HEADERS_X86_32_LINUX_SYSCALLS_H_
+ 
+--- a/src/3rdparty/chromium/sandbox/linux/system_headers/x86_64_linux_syscalls.h
++++ b/src/3rdparty/chromium/sandbox/linux/system_headers/x86_64_linux_syscalls.h
+@@ -1438,5 +1438,9 @@
+ #define __NR_landlock_restrict_self 446
+ #endif
+ 
++#if !defined(__NR_membarrier)
++#define __NR_membarrier 324
++#endif
++
+ #endif  // SANDBOX_LINUX_SYSTEM_HEADERS_X86_64_LINUX_SYSCALLS_H_
+ 
diff --git a/srcpkgs/qt6-webengine/patches/0101-size_t.patch b/srcpkgs/qt6-webengine/patches/0101-size_t.patch
new file mode 100644
index 000000000000..fccc085da311
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0101-size_t.patch
@@ -0,0 +1,16 @@
+--- a/src/3rdparty/chromium/third_party/angle/include/platform/PlatformMethods.h
++++ b/src/3rdparty/chromium/third_party/angle/include/platform/PlatformMethods.h
+@@ -239,11 +239,11 @@ inline void DefaultOverrideFeaturesMtl(P
+ using ProgramKeyType   = std::array<uint8_t, 20>;
+ using CacheProgramFunc = void (*)(PlatformMethods *platform,
+                                   const ProgramKeyType &key,
+-                                  size_t programSize,
++                                  std::size_t programSize,
+                                   const uint8_t *programBytes);
+ inline void DefaultCacheProgram(PlatformMethods *platform,
+                                 const ProgramKeyType &key,
+-                                size_t programSize,
++                                std::size_t programSize,
+                                 const uint8_t *programBytes)
+ {}
+ 
diff --git a/srcpkgs/qt6-webengine/patches/0102-chromium-90-ruy-include.patch b/srcpkgs/qt6-webengine/patches/0102-chromium-90-ruy-include.patch
new file mode 100644
index 000000000000..bbba579076d6
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0102-chromium-90-ruy-include.patch
@@ -0,0 +1,19 @@
+From 714092f336bb14d2fcc27396ec323b3d843bb962 Mon Sep 17 00:00:00 2001
+From: Stephan Hartmann <stha09@googlemail.com>
+Date: Thu, 4 Mar 2021 15:05:46 +0000
+Subject: [PATCH] IWYU: include limits for std::numeric_limits
+
+---
+ third_party/ruy/src/ruy/block_map.cc | 1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/src/3rdparty/chromium/third_party/ruy/src/ruy/block_map.cc
++++ b/src/3rdparty/chromium/third_party/ruy/src/ruy/block_map.cc
+@@ -17,6 +17,7 @@ limitations under the License.
+ 
+ #include <algorithm>
+ #include <cstdint>
++#include <limits>
+ 
+ #ifdef RUY_MAKEBLOCKMAP_DEBUG
+ #include <cstdio>
diff --git a/srcpkgs/qt6-webengine/patches/0103-chromium-v8-monotonic-pthread-cont_timedwait.patch b/srcpkgs/qt6-webengine/patches/0103-chromium-v8-monotonic-pthread-cont_timedwait.patch
new file mode 100644
index 000000000000..1dc8bc4d3d17
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0103-chromium-v8-monotonic-pthread-cont_timedwait.patch
@@ -0,0 +1,22 @@
+Use monotonic clock for pthread_cond_timedwait with musl too.
+
+--- a/src/3rdparty/chromium/v8/src/base/platform/condition-variable.cc
++++ b/src/3rdparty/chromium/v8/src/base/platform/condition-variable.cc
+@@ -20,7 +20,7 @@ namespace base {
+ 
+ ConditionVariable::ConditionVariable() {
+ #if (V8_OS_FREEBSD || V8_OS_NETBSD || V8_OS_OPENBSD || \
+-     (V8_OS_LINUX && V8_LIBC_GLIBC))
++     V8_OS_LINUX)
+   // On Free/Net/OpenBSD and Linux with glibc we can change the time
+   // source for pthread_cond_timedwait() to use the monotonic clock.
+   pthread_condattr_t attr;
+@@ -96,7 +96,7 @@ bool ConditionVariable::WaitFor(Mutex* m
+       &native_handle_, &mutex->native_handle(), &ts);
+ #else
+ #if (V8_OS_FREEBSD || V8_OS_NETBSD || V8_OS_OPENBSD || \
+-     (V8_OS_LINUX && V8_LIBC_GLIBC))
++     V8_OS_LINUX)
+   // On Free/Net/OpenBSD and Linux with glibc we can change the time
+   // source for pthread_cond_timedwait() to use the monotonic clock.
+   result = clock_gettime(CLOCK_MONOTONIC, &ts);
diff --git a/srcpkgs/qt6-webengine/patches/0104-chromium-revert-9d080c0.patch b/srcpkgs/qt6-webengine/patches/0104-chromium-revert-9d080c0.patch
new file mode 100644
index 000000000000..42b1ee9ec063
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0104-chromium-revert-9d080c0.patch
@@ -0,0 +1,162 @@
+ Original change's description:
+ > Replace 'blacklist' with 'ignorelist' in ./tools/msan/.
+ >
+ > Bug: 1097272, 1097268
+ > Change-Id: Id5c8227a5bfb1ffaec82d3168b609085b10c8297
+ > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2867730
+ > Commit-Queue: Dylan Cutler <dylancutler@google.com>
+ > Reviewed-by: Nico Weber <thakis@chromium.org>
+ > Reviewed-by: Jonathan Metzman <metzman@chromium.org>
+ > Cr-Commit-Position: refs/heads/master@{#883035}
+--- a/src/3rdparty/chromium/build/config/sanitizers/BUILD.gn
++++ b/src/3rdparty/chromium/build/config/sanitizers/BUILD.gn
+@@ -272,11 +272,11 @@ config("asan_flags") {
+   if (is_asan) {
+     cflags += [ "-fsanitize=address" ]
+     if (is_win) {
+-      if (!defined(asan_win_blocklist_path)) {
+-        asan_win_blocklist_path =
++      if (!defined(asan_win_blacklist_path)) {
++        asan_win_blacklist_path =
+             rebase_path("//tools/memory/asan/blocklist_win.txt", root_build_dir)
+       }
+-      cflags += [ "-fsanitize-ignorelist=$asan_win_blocklist_path" ]
++      cflags += [ "-fsanitize-blacklist=$asan_win_blacklist_path" ]
+     }
+   }
+ }
+@@ -306,13 +306,13 @@ config("link_shared_library") {
+ config("cfi_flags") {
+   cflags = []
+   if (is_cfi && current_toolchain == default_toolchain) {
+-    if (!defined(cfi_ignorelist_path)) {
+-      cfi_ignorelist_path =
++    if (!defined(cfi_blacklist_path)) {
++      cfi_blacklist_path =
+           rebase_path("//tools/cfi/ignores.txt", root_build_dir)
+     }
+     cflags += [
+       "-fsanitize=cfi-vcall",
+-      "-fsanitize-ignorelist=$cfi_ignorelist_path",
++      "-fsanitize-blacklist=$cfi_blacklist_path",
+     ]
+ 
+     if (use_cfi_cast) {
+@@ -409,14 +409,14 @@ config("msan_flags") {
+   if (is_msan) {
+     assert(is_linux || is_chromeos,
+            "msan only supported on linux x86_64/ChromeOS")
+-    if (!defined(msan_ignorelist_path)) {
+-      msan_ignorelist_path =
+-          rebase_path("//tools/msan/ignorelist.txt", root_build_dir)
++    if (!defined(msan_blacklist_path)) {
++      msan_blacklist_path =
++          rebase_path("//tools/msan/blacklist.txt", root_build_dir)
+     }
+     cflags = [
+       "-fsanitize=memory",
+       "-fsanitize-memory-track-origins=$msan_track_origins",
+-      "-fsanitize-ignorelist=$msan_ignorelist_path",
++      "-fsanitize-blacklist=$msan_blacklist_path",
+     ]
+   }
+ }
+@@ -424,13 +424,13 @@ config("msan_flags") {
+ config("tsan_flags") {
+   if (is_tsan) {
+     assert(is_linux || is_chromeos, "tsan only supported on linux x86_64")
+-    if (!defined(tsan_ignorelist_path)) {
+-      tsan_ignorelist_path =
++    if (!defined(tsan_blacklist_path)) {
++      tsan_blacklist_path =
+           rebase_path("//tools/memory/tsan_v2/ignores.txt", root_build_dir)
+     }
+     cflags = [
+       "-fsanitize=thread",
+-      "-fsanitize-ignorelist=$tsan_ignorelist_path",
++      "-fsanitize-blacklist=$tsan_blacklist_path",
+     ]
+   }
+ }
+@@ -438,8 +438,8 @@ config("tsan_flags") {
+ config("ubsan_flags") {
+   cflags = []
+   if (is_ubsan) {
+-    if (!defined(ubsan_ignorelist_path)) {
+-      ubsan_ignorelist_path =
++    if (!defined(ubsan_blacklist_path)) {
++      ubsan_blacklist_path =
+           rebase_path("//tools/ubsan/ignorelist.txt", root_build_dir)
+     }
+     cflags += [
+@@ -456,7 +456,7 @@ config("ubsan_flags") {
+       "-fsanitize=signed-integer-overflow",
+       "-fsanitize=unreachable",
+       "-fsanitize=vla-bound",
+-      "-fsanitize-ignorelist=$ubsan_ignorelist_path",
++      "-fsanitize-blacklist=$ubsan_blacklist_path",
+     ]
+     if (!is_clang) {
+       # These exposes too much illegal C++14 code to compile on anything stricter than clang:
+@@ -497,8 +497,8 @@ config("ubsan_no_recover") {
+ 
+ config("ubsan_security_flags") {
+   if (is_ubsan_security) {
+-    if (!defined(ubsan_security_ignorelist_path)) {
+-      ubsan_security_ignorelist_path =
++    if (!defined(ubsan_security_blacklist_path)) {
++      ubsan_security_blacklist_path =
+           rebase_path("//tools/ubsan/security_ignorelist.txt", root_build_dir)
+     }
+     cflags = [
+@@ -506,7 +506,7 @@ config("ubsan_security_flags") {
+       "-fsanitize=shift",
+       "-fsanitize=signed-integer-overflow",
+       "-fsanitize=vla-bound",
+-      "-fsanitize-ignorelist=$ubsan_security_ignorelist_path",
++      "-fsanitize-blacklist=$ubsan_security_blacklist_path",
+     ]
+   }
+ }
+@@ -519,13 +519,13 @@ config("ubsan_null_flags") {
+ 
+ config("ubsan_vptr_flags") {
+   if (is_ubsan_vptr) {
+-    if (!defined(ubsan_vptr_ignorelist_path)) {
+-      ubsan_vptr_ignorelist_path =
++    if (!defined(ubsan_vptr_blacklist_path)) {
++      ubsan_vptr_blacklist_path =
+           rebase_path("//tools/ubsan/vptr_ignorelist.txt", root_build_dir)
+     }
+     cflags = [
+       "-fsanitize=vptr",
+-      "-fsanitize-ignorelist=$ubsan_vptr_ignorelist_path",
++      "-fsanitize-blacklist=$ubsan_vptr_blacklist_path",
+     ]
+     if (!is_clang) {
+       # Clang specific flag:
+--- a/src/3rdparty/chromium/build_overrides/build.gni
++++ b/src/3rdparty/chromium/build_overrides/build.gni
+@@ -43,15 +43,15 @@ declare_args() {
+ # Allows different projects to specify their own suppression/ignore lists for
+ # sanitizer tools.
+ # asan_suppressions_file = "path/to/asan_suppressions.cc"
+-# asan_win_ignorelist_path = "path/to/asan/blocklist_win.txt"
++# asan_win_blacklist_path = "path/to/asan/blocklist_win.txt"
+ # lsan_suppressions_file = "path/to/lsan_suppressions.cc"
+ # tsan_suppressions_file = "path/to/tsan_suppressions.cc"
+-# tsan_ignorelist_path = "path/to/tsan/ignores.txt"
+-# msan_ignorelist_path = "path/to/msan/ignorelist.txt"
+-# ubsan_ignorelist_path = "path/to/ubsan/ignorelist.txt"
+-# ubsan_vptr_ignorelist_path = "path/to/ubsan/vptr_ignorelist.txt"
+-# ubsan_security_ignorelist_path = "path/to/ubsan/security_ignorelist.txt"
+-# cfi_ignorelist_path = "path/to/cfi/ignores.txt"
++# tsan_blacklist_path = "path/to/tsan/ignores.txt"
++# msan_blacklist_path = "path/to/msan/blacklist.txt"
++# ubsan_blacklist_path = "path/to/ubsan/blacklist.txt"
++# ubsan_vptr_blacklist_path = "path/to/ubsan/vptr_blacklist.txt"
++# ubsan_security_blacklist_path = "path/to/ubsan/security_blacklist.txt"
++# cfi_blacklist_path = "path/to/cfi/ignores.txt"
+ 
+ declare_args() {
+   # Android 32-bit non-component, non-clang builds cannot have symbol_level=2
diff --git a/srcpkgs/qt6-webengine/patches/0105-chromium-revert-drop-of-system-java.patch b/srcpkgs/qt6-webengine/patches/0105-chromium-revert-drop-of-system-java.patch
new file mode 100644
index 000000000000..44f3aa8fae5e
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0105-chromium-revert-drop-of-system-java.patch
@@ -0,0 +1,15 @@
+This was dropped for some reason in 6951c37cecd05979b232a39e5c10e6346a0f74ef
+--- a/src/3rdparty/chromium/third_party/closure_compiler/compiler.py
++++ b/src/3rdparty/chromium/third_party/closure_compiler/compiler.py
+@@ -13,8 +13,9 @@ import subprocess
+ 
+ 
+ _CURRENT_DIR = os.path.join(os.path.dirname(__file__))
+-_JAVA_PATH = os.path.join(_CURRENT_DIR, "..", "jdk", "current", "bin", "java")
+-assert os.path.isfile(_JAVA_PATH), "java only allowed in android builds"
++_JAVA_BIN = "java"
++_JDK_PATH = os.path.join(_CURRENT_DIR, "..", "jdk", "current", "bin", "java")
++_JAVA_PATH = _JDK_PATH if os.path.isfile(_JDK_PATH) else _JAVA_BIN
+ 
+ class Compiler(object):
+   """Runs the Closure compiler on given source files to typecheck them
diff --git a/srcpkgs/qt6-webengine/patches/0106-chromium-system-nodejs.patch b/srcpkgs/qt6-webengine/patches/0106-chromium-system-nodejs.patch
new file mode 100644
index 000000000000..1e067cc6eda0
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0106-chromium-system-nodejs.patch
@@ -0,0 +1,20 @@
+--- a/src/3rdparty/chromium/third_party/node/node.py
++++ b/src/3rdparty/chromium/third_party/node/node.py
+@@ -36,11 +36,12 @@ def GetBinaryPath():
+   if platform.system() == 'Darwin' and platform.machine() == 'arm64':
+       return os.path.join(os_path.join(os_path.dirname(__file__), 'mac',
+                           'node-darwin-arm64', 'bin', 'node'))
+-  return os_path.join(os_path.dirname(__file__), *{
+-    'Darwin': ('mac', 'node-darwin-x64', 'bin', 'node'),
+-    'Linux': ('linux', 'node-linux-x64', 'bin', 'node'),
+-    'Windows': ('win', 'node.exe'),
+-  }[platform.system()])
++  return "/usr/bin/node"
++  #return os_path.join(os_path.dirname(__file__), *{
++  #  'Darwin': ('mac', 'node-darwin-x64', 'bin', 'node'),
++  #  'Linux': ('linux', 'node-linux-x64', 'bin', 'node'),
++  #  'Windows': ('win', 'node.exe'),
++  #}[platform.system()])
+ 
+ 
+ def RunNode(cmd_parts, stdout=None):
diff --git a/srcpkgs/qt6-webengine/patches/0107-chromium-cursed^Uscoped_file.patch b/srcpkgs/qt6-webengine/patches/0107-chromium-cursed^Uscoped_file.patch
new file mode 100644
index 000000000000..a8f5d971883d
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0107-chromium-cursed^Uscoped_file.patch
@@ -0,0 +1,18 @@
+--- a/src/3rdparty/chromium/base/files/scoped_file_linux.cc
++++ b/src/3rdparty/chromium/base/files/scoped_file_linux.cc
+@@ -77,15 +77,3 @@ bool IsFDOwned(int fd) {
+ }
+ 
+ }  // namespace base
+-
+-extern "C" {
+-
+-int __close(int);
+-
+-__attribute__((visibility("default"), noinline)) int close(int fd) {
+-  if (base::IsFDOwned(fd) && g_is_ownership_enforced)
+-    CrashOnFdOwnershipViolation();
+-  return __close(fd);
+-}
+-
+-}  // extern "C"
diff --git a/srcpkgs/qt6-webengine/patches/0108-chromium-fix-narrowing-cast.patch b/srcpkgs/qt6-webengine/patches/0108-chromium-fix-narrowing-cast.patch
new file mode 100644
index 000000000000..ed32cd9b7415
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0108-chromium-fix-narrowing-cast.patch
@@ -0,0 +1,53 @@
+--- a/src/3rdparty/chromium/base/files/file_util_linux.cc
++++ b/src/3rdparty/chromium/base/files/file_util_linux.cc
+@@ -23,14 +23,14 @@ bool GetFileSystemType(const FilePath& p
+ 
+   // Not all possible |statfs_buf.f_type| values are in linux/magic.h.
+   // Missing values are copied from the statfs man page.
+-  switch (statfs_buf.f_type) {
++  switch (static_cast<uintmax_t>(statfs_buf.f_type)) {
+     case 0:
+       *type = FILE_SYSTEM_0;
+       break;
+     case EXT2_SUPER_MAGIC:  // Also ext3 and ext4
+     case MSDOS_SUPER_MAGIC:
+     case REISERFS_SUPER_MAGIC:
+-    case static_cast<int>(BTRFS_SUPER_MAGIC):
++    case BTRFS_SUPER_MAGIC:
+     case 0x5346544E:  // NTFS
+     case 0x58465342:  // XFS
+     case 0x3153464A:  // JFS
+@@ -40,14 +40,14 @@ bool GetFileSystemType(const FilePath& p
+       *type = FILE_SYSTEM_NFS;
+       break;
+     case SMB_SUPER_MAGIC:
+-    case static_cast<int>(0xFF534D42):  // CIFS
++    case 0xFF534D42:  // CIFS
+       *type = FILE_SYSTEM_SMB;
+       break;
+     case CODA_SUPER_MAGIC:
+       *type = FILE_SYSTEM_CODA;
+       break;
+-    case static_cast<int>(HUGETLBFS_MAGIC):
+-    case static_cast<int>(RAMFS_MAGIC):
++    case HUGETLBFS_MAGIC:
++    case RAMFS_MAGIC:
+     case TMPFS_MAGIC:
+       *type = FILE_SYSTEM_MEMORY;
+       break;
+--- a/src/3rdparty/chromium/base/system/sys_info_posix.cc
++++ b/src/3rdparty/chromium/base/system/sys_info_posix.cc
+@@ -100,10 +100,10 @@ bool IsStatsZeroIfUnlimited(const base::
+   if (HANDLE_EINTR(statfs(path.value().c_str(), &stats)) != 0)
+     return false;
+ 
+-  switch (stats.f_type) {
++  switch (static_cast<uintmax_t>(stats.f_type)) {
+     case TMPFS_MAGIC:
+-    case static_cast<int>(HUGETLBFS_MAGIC):
+-    case static_cast<int>(RAMFS_MAGIC):
++    case HUGETLBFS_MAGIC:
++    case RAMFS_MAGIC:
+       return true;
+   }
+   return false;
diff --git a/srcpkgs/qt6-webengine/patches/0109-chromium-remove-strip_binary.patch b/srcpkgs/qt6-webengine/patches/0109-chromium-remove-strip_binary.patch
new file mode 100644
index 000000000000..5ebd16e659af
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0109-chromium-remove-strip_binary.patch
@@ -0,0 +1,32 @@
+--- a/src/3rdparty/chromium/chrome/test/chromedriver/BUILD.gn
++++ b/src/3rdparty/chromium/chrome/test/chromedriver/BUILD.gn
+@@ -308,11 +308,7 @@ source_set("lib") {
+   }
+ }
+ 
+-if (is_linux) {
+-  chromedriver_output = "chromedriver.unstripped"
+-} else {
+-  chromedriver_output = "chromedriver"
+-}
++chromedriver_output = "chromedriver"
+ 
+ executable("$chromedriver_output") {
+   testonly = true
+@@ -336,16 +332,6 @@ executable("$chromedriver_output") {
+   }
+ }
+ 
+-if (is_linux) {
+-  strip_binary("chromedriver") {
+-    testonly = true
+-    binary_input = "$root_out_dir/$chromedriver_output"
+-    symbol_output = "$root_out_dir/chromedriver.debug"
+-    stripped_binary_output = "$root_out_dir/chromedriver"
+-    deps = [ ":$chromedriver_output" ]
+-  }
+-}
+-
+ python_library("chromedriver_py_tests") {
+   testonly = true
+   deps = [
diff --git a/srcpkgs/qt6-webengine/patches/0110-chromium-revert-use-ffile-compilation-dir.patch b/srcpkgs/qt6-webengine/patches/0110-chromium-revert-use-ffile-compilation-dir.patch
new file mode 100644
index 000000000000..a00f7ea80f7a
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0110-chromium-revert-use-ffile-compilation-dir.patch
@@ -0,0 +1,57 @@
+From 34a955823630096f5b01c2b01d51c1ea59d22763 Mon Sep 17 00:00:00 2001
+From: Zequan Wu <zequanwu@google.com>
+Date: Tue, 20 Jul 2021 14:13:50 +0000
+Subject: [PATCH] Use -ffile-compilation-dir= instead of
+ -fdebug-compilation-dir=
+
+Bug: 1010267
+Change-Id: If2b4ead8535a76490eb466a38e3d8fed6ea91079
+Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2770738
+Auto-Submit: Zequan Wu <zequanwu@google.com>
+Commit-Queue: Nico Weber <thakis@chromium.org>
+Reviewed-by: Nico Weber <thakis@chromium.org>
+Cr-Commit-Position: refs/heads/master@{#903456}
+--- a/src/3rdparty/chromium/build/config/compiler/BUILD.gn
++++ b/src/3rdparty/chromium/build/config/compiler/BUILD.gn
+@@ -1269,19 +1269,12 @@ config("compiler_deterministic") {
+     # different build directory like "out/feature_a" and "out/feature_b" if
+     # we build same files with same compile flag.
+     # Other paths are already given in relative, no need to normalize them.
+-    if (is_nacl) {
+-      # TODO(https://crbug.com/1231236): Use -ffile-compilation-dir= here.
+-      cflags += [
+-        "-Xclang",
+-        "-fdebug-compilation-dir",
+-        "-Xclang",
+-        ".",
+-      ]
+-    } else {
+-      # -ffile-compilation-dir is an alias for both -fdebug-compilation-dir=
+-      # and -fcoverage-compilation-dir=.
+-      cflags += [ "-ffile-compilation-dir=." ]
+-    }
++    cflags += [
++      "-Xclang",
++      "-fdebug-compilation-dir",
++      "-Xclang",
++      ".",
++    ]
+     if (!is_win) {
+       # We don't use clang -cc1as on Windows (yet? https://crbug.com/762167)
+       asmflags = [ "-Wa,-fdebug-compilation-dir,." ]
+--- a/src/3rdparty/chromium/build/config/compiler/compiler.gni
++++ b/src/3rdparty/chromium/build/config/compiler/compiler.gni
+@@ -228,8 +228,11 @@ declare_args() {
+ # deterministic builds to reduce compile times, so this is less relevant for
+ # official builders.
+ strip_absolute_paths_from_debug_symbols_default =
+-    is_android || is_fuchsia || is_nacl || (is_win && use_lld) || is_linux ||
+-    is_chromeos || (is_apple && !enable_dsyms)
++    # TODO(crbug.com/1010267): remove '!use_clang_coverage', coverage build has
++    # dependency to absolute path of source files.
++    !use_clang_coverage &&
++    (is_android || is_fuchsia || is_nacl || (is_win && use_lld) || is_linux ||
++     is_chromeos || (is_apple && !enable_dsyms))
+ 
+ declare_args() {
+   strip_absolute_paths_from_debug_symbols = strip_absolute_paths_from_debug_symbols_default
diff --git a/srcpkgs/qt6-webengine/patches/0111-chromium-no-Wno-stringop-overread.patch b/srcpkgs/qt6-webengine/patches/0111-chromium-no-Wno-stringop-overread.patch
new file mode 100644
index 000000000000..03eac3f8e067
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0111-chromium-no-Wno-stringop-overread.patch
@@ -0,0 +1,10 @@
+--- a/src/3rdparty/chromium/build/config/compiler/BUILD.gn
++++ b/src/3rdparty/chromium/build/config/compiler/BUILD.gn
+@@ -394,7 +394,6 @@ config("compiler") {
+         "-Wno-parentheses",
+         "-Wno-sign-compare", # fido
+         "-Wno-stringop-overflow", # skia, libaom, protobuf, icu
+-        "-Wno-stringop-overread", # libaom
+         "-Wno-psabi", # skia
+         "-Wno-multichar", # crashpad
+         "-Wno-format-zero-length", # user_agent.cc
diff --git a/srcpkgs/qt6-webengine/patches/0150-chromium-glibc-libc_malloc.patch b/srcpkgs/qt6-webengine/patches/0150-chromium-glibc-libc_malloc.patch
new file mode 100644
index 000000000000..7e1b66e5c73d
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0150-chromium-glibc-libc_malloc.patch
@@ -0,0 +1,24 @@
+--- a/src/3rdparty/chromium/base/process/memory_linux.cc
++++ b/src/3rdparty/chromium/base/process/memory_linux.cc
+@@ -23,6 +23,12 @@
+ #include "third_party/tcmalloc/chromium/src/gperftools/tcmalloc.h"
+ #endif
+ 
++#if defined(LIBC_GLIBC)
++extern "C" {
++extern void *__libc_malloc(size_t size);
++}
++#endif
++
+ namespace base {
+ 
+ namespace {
+@@ -120,7 +126,7 @@ bool UncheckedMalloc(size_t size, void**
+     (!defined(LIBC_GLIBC) && !BUILDFLAG(USE_TCMALLOC))
+   *result = malloc(size);
+ #elif defined(LIBC_GLIBC) && !BUILDFLAG(USE_TCMALLOC)
+-  *result = __libc_malloc(size);
++  *result = ::__libc_malloc(size);
+ #elif BUILDFLAG(USE_TCMALLOC)
+   *result = tc_malloc_skip_new_handler(size);
+ #endif
diff --git a/srcpkgs/qt6-webengine/patches/0200-chromium-musl-include-sys-reg.h-to-get-__WORDSIZE.patch b/srcpkgs/qt6-webengine/patches/0200-chromium-musl-include-sys-reg.h-to-get-__WORDSIZE.patch
new file mode 100644
index 000000000000..41b90071b5e4
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0200-chromium-musl-include-sys-reg.h-to-get-__WORDSIZE.patch
@@ -0,0 +1,21 @@
+From 9001c54d6b974449174a8cee8f3f5d78a9bd6c9e Mon Sep 17 00:00:00 2001
+From: Felix Janda <felix.janda@posteo.de>
+Date: Sun, 1 Feb 2015 14:26:52 +0100
+Subject: [PATCH 3/6] include <sys/reg.h> to get __WORDSIZE on musl libc
+
+---
+ qtwebengine/src/3rdparty/chromium/third_party/breakpad/breakpad/src/common/linux/elf_core_dump.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/common/linux/elf_core_dump.h
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/common/linux/elf_core_dump.h
+@@ -37,6 +37,9 @@
+ #include <limits.h>
+ #include <link.h>
+ #include <stddef.h>
++#ifndef __GLIBC__
++#include <sys/reg.h>
++#endif
+ 
+ #include "common/memory_range.h"
+ 
diff --git a/srcpkgs/qt6-webengine/patches/0201-chromium-musl-dispatch-to-musl.patch b/srcpkgs/qt6-webengine/patches/0201-chromium-musl-dispatch-to-musl.patch
new file mode 100644
index 000000000000..a58a688a4b55
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0201-chromium-musl-dispatch-to-musl.patch
@@ -0,0 +1,103 @@
+--- a/src/3rdparty/chromium/base/allocator/allocator_shim_default_dispatch_to_glibc.cc
++++ b/src/3rdparty/chromium/base/allocator/allocator_shim_default_dispatch_to_glibc.cc
+@@ -8,6 +8,7 @@
+ #include <dlfcn.h>
+ #include <malloc.h>
+ 
++#if defined(__GLIBC__)
+ // This translation unit defines a default dispatch for the allocator shim which
+ // routes allocations to libc functions.
+ // The code here is strongly inspired from tcmalloc's libc_override_glibc.h.
+@@ -87,3 +88,92 @@ const AllocatorDispatch AllocatorDispatc
+     nullptr,               /* aligned_free_function */
+     nullptr,               /* next */
+ };
++
++#else // defined(__GLIBC__)
++
++#include <dlfcn.h>
++
++extern "C" {
++// Declare function pointers to the memory functions
++typedef void* (*t_libc_malloc)(size_t size);
++typedef void* (*t_libc_calloc)(size_t n, size_t size);
++typedef void* (*t_libc_realloc)(void* address, size_t size);
++typedef void* (*t_libc_memalign)(size_t alignment, size_t size);
++typedef void (*t_libc_free)(void* ptr);
++typedef size_t (*t_libc_malloc_usable_size)(void* ptr);
++
++// Static instances of pointers to libc.so dl symbols
++static t_libc_malloc libc_malloc = NULL;
++static t_libc_calloc libc_calloc = NULL;
++static t_libc_realloc libc_realloc = NULL;
++static t_libc_memalign libc_memalign = NULL;
++static t_libc_free libc_free = NULL;
++static t_libc_malloc_usable_size libc_malloc_usable_size = NULL;
++
++// resolve the symbols in libc.so
++void musl_libc_memory_init(void)
++{
++  libc_malloc = (t_libc_malloc) dlsym(RTLD_NEXT, "malloc");
++  libc_calloc = (t_libc_calloc) dlsym(RTLD_NEXT, "calloc");
++  libc_realloc = (t_libc_realloc) dlsym(RTLD_NEXT, "realloc");
++  libc_memalign = (t_libc_memalign) dlsym(RTLD_NEXT, "memalign");
++  libc_free = (t_libc_free) dlsym(RTLD_NEXT, "free");
++  libc_malloc_usable_size = (t_libc_malloc_usable_size) dlsym(RTLD_NEXT, "malloc_usable_size");
++}
++}  // extern "C"
++
++namespace {
++
++using base::allocator::AllocatorDispatch;
++
++void* MuslMalloc(const AllocatorDispatch*, size_t size, void* context) {
++  if (!libc_malloc)
++    musl_libc_memory_init();
++  return (*libc_malloc)(size);
++}
++
++void* MuslCalloc(const AllocatorDispatch*, size_t n, size_t size, void* context) {
++  if (!libc_calloc)
++    musl_libc_memory_init();
++  return (*libc_calloc)(n, size);
++}
++
++void* MuslRealloc(const AllocatorDispatch*, void* address, size_t size, void* context) {
++  if (!libc_realloc)
++    musl_libc_memory_init();
++  return (*libc_realloc)(address, size);
++}
++
++void* MuslMemalign(const AllocatorDispatch*, size_t alignment, size_t size, void* context) {
++  if (!libc_memalign)
++    musl_libc_memory_init();
++  return (*libc_memalign)(alignment, size);
++}
++
++void MuslFree(const AllocatorDispatch*, void* address, void* context) {
++  if (!libc_free)
++    musl_libc_memory_init();
++  (*libc_free)(address);
++}
++
++size_t MuslGetSizeEstimate(const AllocatorDispatch*, void* address, void* context) {
++  // TODO(siggi, primiano): malloc_usable_size may need redirection in the
++  //     presence of interposing shims that divert allocations.
++  if (!libc_malloc_usable_size)
++    musl_libc_memory_init();
++  return (*libc_malloc_usable_size)(address);
++}
++
++}  // namespace
++
++const AllocatorDispatch AllocatorDispatch::default_dispatch = {
++    &MuslMalloc,           /* alloc_function */
++    &MuslCalloc,           /* alloc_zero_initialized_function */
++    &MuslMemalign,         /* alloc_aligned_function */
++    &MuslRealloc,          /* realloc_function */
++    &MuslFree,             /* free_function */
++    &MuslGetSizeEstimate,  /* get_size_estimate_function */
++    nullptr,               /* next */
++};
++
++#endif
diff --git a/srcpkgs/qt6-webengine/patches/0202-chromium-musl-no-mallinfo.patch b/srcpkgs/qt6-webengine/patches/0202-chromium-musl-no-mallinfo.patch
new file mode 100644
index 000000000000..a5bdb5a43a5f
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0202-chromium-musl-no-mallinfo.patch
@@ -0,0 +1,62 @@
+--- a/src/3rdparty/chromium/base/process/process_metrics_posix.cc
++++ b/src/3rdparty/chromium/base/process/process_metrics_posix.cc
+@@ -105,7 +105,7 @@ void IncreaseFdLimitTo(unsigned int max_
+ 
+ #endif  // !defined(OS_FUCHSIA)
+ 
+-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID)
++#if (defined(OS_LINUX) && defined(__GLIBC__)) || defined(OS_CHROMEOS) || defined(OS_ANDROID)
+ namespace {
+ 
+ size_t GetMallocUsageMallinfo() {
+@@ -127,16 +127,16 @@ size_t GetMallocUsageMallinfo() {
+ }
+ 
+ }  // namespace
+-#endif  // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID)
++#endif  // (defined(OS_LINUX) && defined(__GLIBC__)) || defined(OS_CHROMEOS) || defined(OS_ANDROID)
+ 
+ size_t ProcessMetrics::GetMallocUsage() {
+ #if defined(OS_APPLE)
+   malloc_statistics_t stats = {0};
+   malloc_zone_statistics(nullptr, &stats);
+   return stats.size_in_use;
+-#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID)
++#elif (defined(OS_LINUX) && defined(__GLIBC__)) || defined(OS_CHROMEOS) || defined(OS_ANDROID)
+   return GetMallocUsageMallinfo();
+-#elif defined(OS_FUCHSIA)
++#else
+   // TODO(fuchsia): Not currently exposed. https://crbug.com/735087.
+   return 0;
+ #endif
+--- a/src/3rdparty/chromium/third_party/tflite/src/tensorflow/lite/profiling/memory_info.cc
++++ b/src/3rdparty/chromium/third_party/tflite/src/tensorflow/lite/profiling/memory_info.cc
+@@ -27,7 +27,7 @@ namespace memory {
+ const int MemoryUsage::kValueNotSet = 0;
+ 
+ bool MemoryUsage::IsSupported() {
+-#ifdef __linux__
++#ifdef __GLIBC__
+   return true;
+ #endif
+   return false;
+@@ -35,7 +35,7 @@ bool MemoryUsage::IsSupported() {
+ 
+ MemoryUsage GetMemoryUsage() {
+   MemoryUsage result;
+-#ifdef __linux__
++#ifdef __GLIBC__
+   rusage res;
+   if (getrusage(RUSAGE_SELF, &res) == 0) {
+     result.max_rss_kb = res.ru_maxrss;
+--- a/src/3rdparty/chromium/base/trace_event/malloc_dump_provider.cc
++++ b/src/3rdparty/chromium/base/trace_event/malloc_dump_provider.cc
+@@ -213,7 +213,7 @@ bool MallocDumpProvider::OnMemoryDump(co
+                      &allocated_objects_count);
+ #elif defined(OS_FUCHSIA)
+ // TODO(fuchsia): Port, see https://crbug.com/706592.
+-#else
++#elif defined(__GLIBC__)
+ #if defined(__GLIBC__) && defined(__GLIBC_PREREQ)
+ #if __GLIBC_PREREQ(2, 33)
+ #define MALLINFO2_FOUND_IN_LIBC
diff --git a/srcpkgs/qt6-webengine/patches/0203-chromium-musl-siginfo_t.patch b/srcpkgs/qt6-webengine/patches/0203-chromium-musl-siginfo_t.patch
new file mode 100644
index 000000000000..43ef7fd7c5d2
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0203-chromium-musl-siginfo_t.patch
@@ -0,0 +1,18 @@
+There's a subtle difference in the internal name of siginfo_t fields
+between glibc and musl. The structure itself is equivalent, so it
+should suffice to add a macro to rename the field.
+
+--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf/trap.cc
++++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf/trap.cc
+@@ -174,7 +174,11 @@ void Trap::SigSys(int nr, LinuxSigInfo*
+   // If the version of glibc doesn't include this information in
+   // siginfo_t (older than 2.17), we need to explicitly copy it
+   // into an arch_sigsys structure.
++#if defined(__GLIBC__)
+   memcpy(&sigsys, &info->_sifields, sizeof(sigsys));
++#else
++  memcpy(&sigsys, &info->__si_fields, sizeof(sigsys));
++#endif
+ #endif
+ 
+ #if defined(__mips__)
diff --git a/srcpkgs/qt6-webengine/patches/0204-chromium-musl-stackstart.patch b/srcpkgs/qt6-webengine/patches/0204-chromium-musl-stackstart.patch
new file mode 100644
index 000000000000..b03cf43b86db
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0204-chromium-musl-stackstart.patch
@@ -0,0 +1,20 @@
+--- a/src/3rdparty/chromium/third_party/blink/renderer/platform/wtf/stack_util.cc
++++ b/src/3rdparty/chromium/third_party/blink/renderer/platform/wtf/stack_util.cc
+@@ -29,7 +29,7 @@ size_t GetUnderestimatedStackSize() {
+ // FIXME: On Mac OSX and Linux, this method cannot estimate stack size
+ // correctly for the main thread.
+ 
+-#elif defined(__GLIBC__) || defined(OS_ANDROID) || defined(OS_FREEBSD) || \
++#elif defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FREEBSD) || \
+     defined(OS_FUCHSIA)
+   // pthread_getattr_np() can fail if the thread is not invoked by
+   // pthread_create() (e.g., the main thread of blink_unittests).
+@@ -97,7 +97,7 @@ return Threading::ThreadStackSize();
+ }
+ 
+ void* GetStackStart() {
+-#if defined(__GLIBC__) || defined(OS_ANDROID) || defined(OS_FREEBSD) || \
++#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FREEBSD) || \
+     defined(OS_FUCHSIA)
+   pthread_attr_t attr;
+   int error;
diff --git a/srcpkgs/qt6-webengine/patches/0205-chromium-musl-sandbox.patch b/srcpkgs/qt6-webengine/patches/0205-chromium-musl-sandbox.patch
new file mode 100644
index 000000000000..772a578fd823
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0205-chromium-musl-sandbox.patch
@@ -0,0 +1,92 @@
+--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc
++++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc
+@@ -138,7 +138,7 @@ namespace sandbox {
+ // present (as in newer versions of posix_spawn).
+ ResultExpr RestrictCloneToThreadsAndEPERMFork() {
+   const Arg<unsigned long> flags(0);
+-
++#if defined(__GLIBC__)
+   // TODO(mdempsky): Extend DSL to support (flags & ~mask1) == mask2.
+   const uint64_t kAndroidCloneMask = CLONE_VM | CLONE_FS | CLONE_FILES |
+                                      CLONE_SIGHAND | CLONE_THREAD |
+@@ -165,6 +165,17 @@ ResultExpr RestrictCloneToThreadsAndEPER
+   return If(IsAndroid() ? android_test : glibc_test, Allow())
+       .ElseIf(is_fork_or_clone_vfork, Error(EPERM))
+       .Else(CrashSIGSYSClone());
++#else
++  const int required = CLONE_VM | CLONE_FS | CLONE_FILES | CLONE_SIGHAND |
++                       CLONE_THREAD | CLONE_SYSVSEM;
++  const int safe = CLONE_SETTLS | CLONE_PARENT_SETTID | CLONE_CHILD_CLEARTID |
++                   CLONE_DETACHED;
++  const BoolExpr thread_clone_ok = (flags&~safe)==required;
++
++  return If(thread_clone_ok, Allow())
++      .ElseIf((flags & (CLONE_VM | CLONE_THREAD)) == 0, Error(EPERM))
++      .Else(CrashSIGSYSClone());
++#endif
+ }
+ 
+ #ifndef PR_PAC_RESET_KEYS
+--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
++++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
+@@ -419,6 +419,9 @@ bool SyscallSets::IsAllowedProcessStartO
+ #if defined(__i386__)
+     case __NR_waitpid:
+ #endif
++#if !defined(__GLIBC__)
++    case __NR_set_tid_address:
++#endif
+       return true;
+     case __NR_clone:  // Should be parameter-restricted.
+     case __NR_setns:  // Privileged.
+@@ -431,7 +434,9 @@ bool SyscallSets::IsAllowedProcessStartO
+ #if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
+     case __NR_set_thread_area:
+ #endif
++#if defined(__GLIBC__)
+     case __NR_set_tid_address:
++#endif
+     case __NR_unshare:
+ #if !defined(__mips__) && !defined(__aarch64__)
+     case __NR_vfork:
+@@ -545,6 +550,9 @@ bool SyscallSets::IsAllowedAddressSpaceA
+     case __NR_mlock:
+     case __NR_munlock:
+     case __NR_munmap:
++#if !defined(__GLIBC__)
++    case __NR_mremap:
++#endif
+       return true;
+     case __NR_madvise:
+     case __NR_mincore:
+@@ -562,7 +570,9 @@ bool SyscallSets::IsAllowedAddressSpaceA
+     case __NR_modify_ldt:
+ #endif
+     case __NR_mprotect:
++#if defined(__GLIBC__)
+     case __NR_mremap:
++#endif
+     case __NR_msync:
+     case __NR_munlockall:
+     case __NR_readahead:
+--- a/src/3rdparty/chromium/sandbox/policy/linux/bpf_renderer_policy_linux.cc
++++ b/src/3rdparty/chromium/sandbox/policy/linux/bpf_renderer_policy_linux.cc
+@@ -97,11 +97,18 @@ ResultExpr RendererProcessPolicy::Evalua
+     case __NR_sysinfo:
+     case __NR_times:
+     case __NR_uname:
++#if !defined(__GLIBC__)
++    case __NR_sched_getparam:
++    case __NR_sched_getscheduler:
++    case __NR_sched_setscheduler:
++#endif
+       return Allow();
+     case __NR_sched_getaffinity:
++#if defined(__GLIBC__)
+     case __NR_sched_getparam:
+     case __NR_sched_getscheduler:
+     case __NR_sched_setscheduler:
++#endif
+       return RestrictSchedTarget(GetPolicyPid(), sysno);
+     case __NR_prlimit64:
+       // See crbug.com/662450 and setrlimit comment above.
diff --git a/srcpkgs/qt6-webengine/patches/0206-chromium-musl-default-stacksize.patch b/srcpkgs/qt6-webengine/patches/0206-chromium-musl-default-stacksize.patch
new file mode 100644
index 000000000000..bc07495b8144
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0206-chromium-musl-default-stacksize.patch
@@ -0,0 +1,15 @@
+--- a/src/3rdparty/chromium/base/threading/platform_thread_linux.cc
++++ b/src/3rdparty/chromium/base/threading/platform_thread_linux.cc
+@@ -439,7 +439,12 @@ void TerminateOnThread() {}
+ 
+ size_t GetDefaultThreadStackSize(const pthread_attr_t& attributes) {
+ #if !defined(THREAD_SANITIZER)
++#if defined(__GLIBC__)
+   return 0;
++#else // defined(__GLIBC__)
++  // For Musl libc try with a default stack size of 2 MiB
++  return 2 * 1024 * 1024;
++#endif // !defined(__GLIBC__)
+ #else
+   // ThreadSanitizer bloats the stack heavily. Evidence has been that the
+   // default stack size isn't enough for some browser tests.
diff --git a/srcpkgs/qt6-webengine/patches/0208-chromium-musl-execinfo.patch b/srcpkgs/qt6-webengine/patches/0208-chromium-musl-execinfo.patch
new file mode 100644
index 000000000000..9f3b964676b3
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0208-chromium-musl-execinfo.patch
@@ -0,0 +1,125 @@
+--- a/src/3rdparty/chromium/base/debug/stack_trace.cc
++++ b/src/3rdparty/chromium/base/debug/stack_trace.cc
+@@ -252,7 +252,9 @@ void StackTrace::Print() const {
+ }
+ 
+ void StackTrace::OutputToStream(std::ostream* os) const {
++#if defined(__GLIBC__) && !defined(_AIX)
+   OutputToStreamWithPrefix(os, nullptr);
++#endif
+ }
+ 
+ std::string StackTrace::ToString() const {
+@@ -260,7 +262,7 @@ std::string StackTrace::ToString() const
+ }
+ std::string StackTrace::ToStringWithPrefix(const char* prefix_string) const {
+   std::stringstream stream;
+-#if !defined(__UCLIBC__) && !defined(_AIX)
++#if defined(__GLIBC__) && !defined(_AIX)
+   OutputToStreamWithPrefix(&stream, prefix_string);
+ #endif
+   return stream.str();
+--- a/src/3rdparty/chromium/base/debug/stack_trace_posix.cc
++++ b/src/3rdparty/chromium/base/debug/stack_trace_posix.cc
+@@ -27,7 +27,7 @@
+ #if !defined(USE_SYMBOLIZE)
+ #include <cxxabi.h>
+ #endif
+-#if !defined(__UCLIBC__) && !defined(_AIX)
++#if defined(__GLIBC__) && !defined(_AIX)
+ #include <execinfo.h>
+ #endif
+ 
+@@ -89,7 +89,7 @@ void DemangleSymbols(std::string* text)
+   // Note: code in this function is NOT async-signal safe (std::string uses
+   // malloc internally).
+ 
+-#if !defined(__UCLIBC__) && !defined(_AIX)
++#if defined(__GLIBC__) && !defined(_AIX)
+   std::string::size_type search_from = 0;
+   while (search_from < text->size()) {
+     // Look for the start of a mangled symbol, from search_from.
+@@ -124,7 +124,7 @@ void DemangleSymbols(std::string* text)
+       search_from = mangled_start + 2;
+     }
+   }
+-#endif  // !defined(__UCLIBC__) && !defined(_AIX)
++#endif  // !defined(__GLIBC__) && !defined(_AIX)
+ }
+ #endif  // !defined(USE_SYMBOLIZE)
+ 
+@@ -136,7 +136,7 @@ class BacktraceOutputHandler {
+   virtual ~BacktraceOutputHandler() = default;
+ };
+ 
+-#if !defined(__UCLIBC__) && !defined(_AIX)
++#if defined(__GLIBC__) && !defined(_AIX)
+ void OutputPointer(void* pointer, BacktraceOutputHandler* handler) {
+   // This should be more than enough to store a 64-bit number in hex:
+   // 16 hex digits + 1 for null-terminator.
+@@ -219,7 +219,7 @@ void ProcessBacktrace(void* const* trace
+   }
+ #endif  // defined(USE_SYMBOLIZE)
+ }
+-#endif  // !defined(__UCLIBC__) && !defined(_AIX)
++#endif  // !defined(__GLIBC__) && !defined(_AIX)
+ 
+ void PrintToStderr(const char* output) {
+   // NOTE: This code MUST be async-signal safe (it's used by in-process
+@@ -839,7 +839,7 @@ size_t CollectStackTrace(void** trace, s
+   // If we do not have unwind tables, then try tracing using frame pointers.
+   return base::debug::TraceStackFramePointers(const_cast<const void**>(trace),
+                                               count, 0);
+-#elif !defined(__UCLIBC__) && !defined(_AIX)
++#elif defined(__GLIBC__) && !defined(_AIX)
+   // Though the backtrace API man page does not list any possible negative
+   // return values, we take no chance.
+   return base::saturated_cast<size_t>(backtrace(trace, count));
+@@ -852,13 +852,13 @@ void StackTrace::PrintWithPrefix(const c
+ // NOTE: This code MUST be async-signal safe (it's used by in-process
+ // stack dumping signal handler). NO malloc or stdio is allowed here.
+ 
+-#if !defined(__UCLIBC__) && !defined(_AIX)
++#if defined(__GLIBC__) && !defined(_AIX)
+   PrintBacktraceOutputHandler handler;
+   ProcessBacktrace(trace_, count_, prefix_string, &handler);
+ #endif
+ }
+ 
+-#if !defined(__UCLIBC__) && !defined(_AIX)
++#if defined(__GLIBC__) && !defined(_AIX)
+ void StackTrace::OutputToStreamWithPrefix(std::ostream* os,
+                                           const char* prefix_string) const {
+   StreamBacktraceOutputHandler handler(os);
+--- a/src/3rdparty/chromium/base/logging.cc
++++ b/src/3rdparty/chromium/base/logging.cc
+@@ -582,7 +582,7 @@ LogMessage::LogMessage(const char* file,
+ 
+ LogMessage::~LogMessage() {
+   size_t stack_start = stream_.tellp();
+-#if !defined(OFFICIAL_BUILD) && !defined(OS_NACL) && !defined(__UCLIBC__) && \
++#if !defined(OFFICIAL_BUILD) && !defined(OS_NACL) && defined(__GLIBC__) && \
+     !defined(OS_AIX)
+   if (severity_ == LOGGING_FATAL && !base::debug::BeingDebugged()) {
+     // Include a stack trace on a fatal, unless a debugger is attached.
+--- 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 @@
+ 
+ #if defined(DEBUG) && defined(V8_OS_LINUX) && !defined(V8_OS_ANDROID)
+ #define SYMBOLIZE_FUNCTION
++#if defined(__GLIBC__)
+ #include <execinfo.h>
++#endif
+ 
+ #include <vector>
+ 
+@@ -103,7 +105,7 @@ void ExternalReferenceTable::Init(Isolat
+ }
+ 
+ const char* ExternalReferenceTable::ResolveSymbol(void* address) {
+-#ifdef SYMBOLIZE_FUNCTION
++#if defined(SYMBOLIZE_FUNCTION) && defined(__GLIBC__)
+   char** names = backtrace_symbols(&address, 1);
+   const char* name = names[0];
+   // The array of names is malloc'ed. However, each name string is static
diff --git a/srcpkgs/qt6-webengine/patches/0209-chromium-musl-thread-stacksize.patch b/srcpkgs/qt6-webengine/patches/0209-chromium-musl-thread-stacksize.patch
new file mode 100644
index 000000000000..4b760a428b25
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0209-chromium-musl-thread-stacksize.patch
@@ -0,0 +1,22 @@
+--- a/src/3rdparty/chromium/ppapi/utility/threading/simple_thread.cc
++++ b/src/3rdparty/chromium/ppapi/utility/threading/simple_thread.cc
+@@ -13,7 +13,7 @@ namespace pp {
+ namespace {
+ 
+ // Use 2MB default stack size for Native Client, otherwise use system default.
+-#if defined(__native_client__)
++#if defined(__native_client__) || !defined(__GLIBC__)
+ const size_t kDefaultStackSize = 2 * 1024 * 1024;
+ #else
+ const size_t kDefaultStackSize = 0;
+--- a/src/3rdparty/chromium/v8/src/base/platform/platform-posix.cc
++++ b/src/3rdparty/chromium/v8/src/base/platform/platform-posix.cc
+@@ -883,7 +883,7 @@ bool Thread::Start() {
+ #if V8_OS_MACOSX
+     // Default on Mac OS X is 512kB -- bump up to 1MB
+     stack_size = 1 * 1024 * 1024;
+-#elif V8_OS_AIX
++#elif V8_OS_AIX || !defined(__GLIBC__)
+     // Default on AIX is 96kB -- bump up to 2MB
+     stack_size = 2 * 1024 * 1024;
+ #endif
diff --git a/srcpkgs/qt6-webengine/patches/0210-chromium-musl-msgvec-push_back.patch b/srcpkgs/qt6-webengine/patches/0210-chromium-musl-msgvec-push_back.patch
new file mode 100644
index 000000000000..905daa223700
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0210-chromium-musl-msgvec-push_back.patch
@@ -0,0 +1,14 @@
+--- a/src/3rdparty/chromium/net/socket/udp_socket_posix.cc
++++ b/src/3rdparty/chromium/net/socket/udp_socket_posix.cc
+@@ -1162,7 +1162,11 @@ SendResult UDPSocketPosixSender::Interna
+     msg_iov->push_back({const_cast<char*>(buffer->data()), buffer->length()});
+   msgvec->reserve(buffers.size());
+   for (size_t j = 0; j < buffers.size(); j++)
++#if defined(__GLIBC__)
+     msgvec->push_back({{nullptr, 0, &msg_iov[j], 1, nullptr, 0, 0}, 0});
++#else
++    msgvec->push_back({{nullptr, 0, &msg_iov[j], 1, 0, 0, 0}, 0});
++#endif
+   int result = HANDLE_EINTR(Sendmmsg(fd, &msgvec[0], buffers.size(), 0));
+   SendResult send_result(0, 0, std::move(buffers));
+   if (result < 0) {
diff --git a/srcpkgs/qt6-webengine/patches/0211-chromium-musl-canonicalize-file-name-musl.patch b/srcpkgs/qt6-webengine/patches/0211-chromium-musl-canonicalize-file-name-musl.patch
new file mode 100644
index 000000000000..d43e6bd488bc
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0211-chromium-musl-canonicalize-file-name-musl.patch
@@ -0,0 +1,11 @@
+--- a/src/3rdparty/chromium/third_party/nasm/nasmlib/realpath.c
++++ b/src/3rdparty/chromium/third_party/nasm/nasmlib/realpath.c
+@@ -55,7 +55,7 @@
+  */
+ char *nasm_realpath(const char *rel_path)
+ {
+-    char *rp = canonicalize_file_name(rel_path);
++    char *rp = realpath(rel_path, NULL);
+     return rp ? rp : nasm_strdup(rel_path);
+ }
+ 
diff --git a/srcpkgs/qt6-webengine/patches/0212-chromium-musl-no-getcontext.patch b/srcpkgs/qt6-webengine/patches/0212-chromium-musl-no-getcontext.patch
new file mode 100644
index 000000000000..5755f1b45a7d
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0212-chromium-musl-no-getcontext.patch
@@ -0,0 +1,29 @@
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc
+@@ -489,8 +489,10 @@ bool ExceptionHandler::SimulateSignalDel
+   // ExceptionHandler::HandleSignal().
+   siginfo.si_code = SI_USER;
+   siginfo.si_pid = getpid();
+-  ucontext_t context;
++  ucontext_t context = { 0 };
++#if defined(__GLIBC__)
+   getcontext(&context);
++#endif
+   return HandleSignal(sig, &siginfo, &context);
+ }
+ 
+@@ -675,9 +677,14 @@ bool ExceptionHandler::WriteMinidump() {
+   sys_prctl(PR_SET_DUMPABLE, 1, 0, 0, 0);
+ 
+   CrashContext context;
++
++#if defined(__GLIBC__)
+   int getcontext_result = getcontext(&context.context);
+   if (getcontext_result)
+     return false;
++#else
++  return false;
++#endif
+ 
+ #if defined(__i386__)
+   // In CPUFillFromUContext in minidumpwriter.cc the stack pointer is retrieved
diff --git a/srcpkgs/qt6-webengine/patches/0213-chromium-musl-crashpad.patch b/srcpkgs/qt6-webengine/patches/0213-chromium-musl-crashpad.patch
new file mode 100644
index 000000000000..71bbad2af17e
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0213-chromium-musl-crashpad.patch
@@ -0,0 +1,24 @@
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/compat/linux/sys/ptrace.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/compat/linux/sys/ptrace.h
+@@ -17,7 +17,9 @@
+ 
+ #include_next <sys/ptrace.h>
+ 
++#ifdef __GLIBC__
+ #include <sys/cdefs.h>
++#endif
+ 
+ // https://sourceware.org/bugzilla/show_bug.cgi?id=22433
+ #if !defined(PTRACE_GET_THREAD_AREA) && !defined(PT_GET_THREAD_AREA) && \
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/util/linux/ptracer.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/util/linux/ptracer.cc
+@@ -26,6 +26,9 @@
+ 
+ #if defined(ARCH_CPU_X86_FAMILY)
+ #include <asm/ldt.h>
++#if !defined(__GLIBC__)
++#include <asm/ptrace-abi.h>
++#endif
+ #endif
+ 
+ namespace crashpad {
diff --git a/srcpkgs/qt6-webengine/patches/0214-chromium-musl-fixes.patch b/srcpkgs/qt6-webengine/patches/0214-chromium-musl-fixes.patch
new file mode 100644
index 000000000000..55b267ed1714
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0214-chromium-musl-fixes.patch
@@ -0,0 +1,108 @@
+--- a/src/3rdparty/chromium/sandbox/linux/suid/process_util.h
++++ b/src/3rdparty/chromium/sandbox/linux/suid/process_util.h
+@@ -12,6 +12,15 @@
+ #include <stdint.h>
+ #include <sys/types.h>
+ 
++#if !defined(__GLIBC__) && !defined(TEMP_FAILURE_RETRY)
++# define TEMP_FAILURE_RETRY(expression) \
++	(__extension__			\
++	 ({ long int __result;		\
++	  do __result = (long int) (expression); \
++	  while (__result == -1L && errno == EINTR); \
++	  __result; }))
++#endif
++
+ // This adjusts /proc/process/oom_score_adj so the Linux OOM killer
+ // will prefer certain process types over others. The range for the
+ // adjustment is [-1000, 1000], with [0, 1000] being user accessible.
+--- a/src/3rdparty/chromium/services/device/serial/serial_io_handler_posix.cc
++++ b/src/3rdparty/chromium/services/device/serial/serial_io_handler_posix.cc
+@@ -6,6 +6,7 @@
+ 
+ #include <sys/ioctl.h>
+ #include <termios.h>
++#include <asm-generic/ioctls.h>
+ 
+ #include <algorithm>
+ #include <utility>
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h
+@@ -38,6 +38,10 @@
+ #include "common/memory_allocator.h"
+ #include "google_breakpad/common/minidump_format.h"
+ 
++#ifndef __GLIBC__
++#define _libc_fpstate _fpstate
++#endif
++
+ namespace google_breakpad {
+ 
+ // Wraps platform-dependent implementations of accessors to ucontext_t structs.
+--- a/src/3rdparty/chromium/third_party/ffmpeg/libavutil/cpu.c
++++ b/src/3rdparty/chromium/third_party/ffmpeg/libavutil/cpu.c
+@@ -41,8 +41,10 @@
+ #include <sys/param.h>
+ #endif
+ #include <sys/types.h>
++#ifdef __GLIBC__
+ #include <sys/sysctl.h>
+ #endif
++#endif
+ #if HAVE_UNISTD_H
+ #include <unistd.h>
+ #endif
+--- a/src/3rdparty/chromium/third_party/perfetto/include/perfetto/ext/base/thread_utils.h
++++ b/src/3rdparty/chromium/third_party/perfetto/include/perfetto/ext/base/thread_utils.h
+@@ -29,9 +29,7 @@
+ #include <algorithm>
+ #endif
+ 
+-#if PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID)
+ #include <sys/prctl.h>
+-#endif
+ 
+ // Internal implementation utils that aren't as widely useful/supported as
+ // base/thread_utils.h.
+@@ -58,7 +56,7 @@ inline bool MaybeSetThreadName(const std
+ 
+ inline bool GetThreadName(std::string& out_result) {
+   char buf[16] = {};
+-#if PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID)
++#if !defined(__GLIBC__)
+   if (prctl(PR_GET_NAME, buf) != 0)
+     return false;
+ #else
+--- a/src/3rdparty/chromium/third_party/lss/linux_syscall_support.h
++++ b/src/3rdparty/chromium/third_party/lss/linux_syscall_support.h
+@@ -1300,6 +1300,18 @@ struct kernel_statfs {
+ #ifndef __NR_fallocate
+ #define __NR_fallocate          285
+ #endif
++
++#if !defined(__GLIBC__)
++#ifdef __NR_pread
++#undef __NR_pread
++#endif
++#ifdef __NR_pwrite
++#undef __NR_pwrite
++#endif
++#define __NR_pread __NR_pread64
++#define __NR_pwrite __NR_pwrite64
++#endif /* !defined(__GLIBC__) */
++
+ #ifndef __NR_getrandom
+ #define __NR_getrandom          318
+ #endif
+--- a/src/3rdparty/chromium/net/dns/dns_config_service_posix.cc
++++ b/src/3rdparty/chromium/net/dns/dns_config_service_posix.cc
+@@ -93,7 +93,8 @@ absl::optional<DnsConfig> ReadDnsConfig(
+ 
+   absl::optional<DnsConfig> dns_config;
+ // TODO(fuchsia): Use res_ninit() when it's implemented on Fuchsia.
+-#if defined(OS_OPENBSD) || defined(OS_FUCHSIA)
++#if defined(OS_OPENBSD) || defined(OS_FUCHSIA) || \
++  (defined(OS_LINUX) && !defined(__GLIBC__))
+   // Note: res_ninit in glibc always returns 0 and sets RES_INIT.
+   // res_init behaves the same way.
+   memset(&_res, 0, sizeof(_res));
diff --git a/srcpkgs/qt6-webengine/patches/0215-chromium-musl-cdefs.patch b/srcpkgs/qt6-webengine/patches/0215-chromium-musl-cdefs.patch
new file mode 100644
index 000000000000..9d1daec29118
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0215-chromium-musl-cdefs.patch
@@ -0,0 +1,29 @@
+--- a/src/3rdparty/chromium/third_party/libsync/src/include/sync/sync.h
++++ b/src/3rdparty/chromium/third_party/libsync/src/include/sync/sync.h
+@@ -19,12 +19,13 @@
+ #ifndef __SYS_CORE_SYNC_H
+ #define __SYS_CORE_SYNC_H
+ 
+-#include <sys/cdefs.h>
+ #include <stdint.h>
+ 
+ #include <linux/types.h>
+ 
+-__BEGIN_DECLS
++#ifdef __cplusplus
++extern "C" {
++#endif
+ 
+ struct sync_legacy_merge_data {
+  int32_t fd2;
+@@ -158,6 +159,9 @@ struct sync_pt_info *sync_pt_info(struct
+                                   struct sync_pt_info *itr);
+ void sync_fence_info_free(struct sync_fence_info_data *info);
+ 
+-__END_DECLS
++#ifdef __cplusplus
++}
++#endif
++
+ 
+ #endif /* __SYS_CORE_SYNC_H */
diff --git a/srcpkgs/qt6-webengine/patches/0216-chromium-musl-stat.patch b/srcpkgs/qt6-webengine/patches/0216-chromium-musl-stat.patch
new file mode 100644
index 000000000000..4509a6957cd7
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0216-chromium-musl-stat.patch
@@ -0,0 +1,12 @@
+--- a/src/3rdparty/chromium/base/files/file.h
++++ b/src/3rdparty/chromium/base/files/file.h
+@@ -19,7 +19,8 @@
+ #include "build/build_config.h"
+ 
+ #if defined(OS_BSD) || defined(OS_APPLE) || defined(OS_NACL) || \
+-    defined(OS_FUCHSIA) || (defined(OS_ANDROID) && __ANDROID_API__ < 21)
++    defined(OS_FUCHSIA) || (defined(OS_ANDROID) && __ANDROID_API__ < 21) || \
++    (defined(OS_LINUX) && !defined(__GLIBC__))
+ struct stat;
+ namespace base {
+ typedef struct stat stat_wrapper_t;
diff --git a/srcpkgs/qt6-webengine/patches/0217-chromium-musl-resolver.patch b/srcpkgs/qt6-webengine/patches/0217-chromium-musl-resolver.patch
new file mode 100644
index 000000000000..c3d7afad9b19
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0217-chromium-musl-resolver.patch
@@ -0,0 +1,77 @@
+--- a/src/3rdparty/chromium/net/dns/dns_config_service_linux.cc
++++ b/src/3rdparty/chromium/net/dns/dns_config_service_linux.cc
+@@ -432,11 +432,13 @@ class DnsConfigServiceLinux::ConfigReade
+     base::ScopedBlockingCall scoped_blocking_call(
+         FROM_HERE, base::BlockingType::MAY_BLOCK);
+ 
++#if defined(__GLIBC__)
+     std::unique_ptr<struct __res_state> res = resolv_reader_->GetResState();
+     if (res) {
+       dns_config_ = ConvertResStateToDnsConfig(*res.get());
+       resolv_reader_->CloseResState(res.get());
+     }
++#endif
+ 
+     UMA_HISTOGRAM_BOOLEAN("Net.DNS.DnsConfig.Resolv.Read",
+                           dns_config_.has_value());
+@@ -486,6 +488,7 @@ class DnsConfigServiceLinux::ConfigReade
+ 
+ std::unique_ptr<struct __res_state>
+ DnsConfigServiceLinux::ResolvReader::GetResState() {
++#if defined(__GLIBC__)
+   auto res = std::make_unique<struct __res_state>();
+   memset(res.get(), 0, sizeof(struct __res_state));
+ 
+@@ -495,11 +498,16 @@ DnsConfigServiceLinux::ResolvReader::Get
+   }
+ 
+   return res;
++#else
++  return nullptr;
++#endif
+ }
+ 
+ void DnsConfigServiceLinux::ResolvReader::CloseResState(
+     struct __res_state* res) {
++#if defined(__GLIBC__)
+   res_nclose(res);
++#endif
+ }
+ 
+ DnsConfigServiceLinux::DnsConfigServiceLinux()
+--- a/src/3rdparty/chromium/net/dns/dns_reloader.cc
++++ b/src/3rdparty/chromium/net/dns/dns_reloader.cc
+@@ -4,8 +4,7 @@
+ 
+ #include "net/dns/dns_reloader.h"
+ 
+-#if defined(OS_POSIX) && !defined(OS_APPLE) && !defined(OS_OPENBSD) && \
+-    !defined(OS_ANDROID) && !defined(OS_FUCHSIA)
++#ifdef __GLIBC__
+ 
+ #include <resolv.h>
+ 
+--- a/src/3rdparty/chromium/net/dns/host_resolver_manager.cc
++++ b/src/3rdparty/chromium/net/dns/host_resolver_manager.cc
+@@ -2720,8 +2720,7 @@ HostResolverManager::HostResolverManager
+   NetworkChangeNotifier::AddConnectionTypeObserver(this);
+   if (system_dns_config_notifier_)
+     system_dns_config_notifier_->AddObserver(this);
+-#if defined(OS_POSIX) && !defined(OS_APPLE) && !defined(OS_OPENBSD) && \
+-    !defined(OS_ANDROID)
++#ifdef __GLIBC__
+   EnsureDnsReloaderInit();
+ #endif
+ 
+--- a/src/3rdparty/chromium/net/dns/host_resolver_proc.cc
++++ b/src/3rdparty/chromium/net/dns/host_resolver_proc.cc
+@@ -176,8 +176,7 @@ int SystemHostResolverCall(const std::st
+   base::ScopedBlockingCall scoped_blocking_call(FROM_HERE,
+                                                 base::BlockingType::WILL_BLOCK);
+ 
+-#if defined(OS_POSIX) && !defined(OS_APPLE) && !defined(OS_OPENBSD) && \
+-    !defined(OS_ANDROID) && !defined(OS_FUCHSIA)
++#ifdef __GLIBC__
+   DnsReloaderMaybeReload();
+ #endif
+   absl::optional<AddressInfo> ai;
diff --git a/srcpkgs/qt6-webengine/patches/0600-chromium-sndio.patch b/srcpkgs/qt6-webengine/patches/0600-chromium-sndio.patch
new file mode 100644
index 000000000000..0302874ffba4
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0600-chromium-sndio.patch
@@ -0,0 +1,876 @@
+--- a/src/3rdparty/chromium/media/BUILD.gn
++++ b/src/3rdparty/chromium/media/BUILD.gn
+@@ -72,6 +72,9 @@ config("media_config") {
+       defines += [ "DLOPEN_PULSEAUDIO" ]
+     }
+   }
++  if (use_sndio) {
++    defines += [ "USE_SNDIO" ]
++  }
+   if (use_cras) {
+     defines += [ "USE_CRAS" ]
+   }
+--- a/src/3rdparty/chromium/media/audio/BUILD.gn
++++ b/src/3rdparty/chromium/media/audio/BUILD.gn
+@@ -240,6 +240,17 @@ source_set("audio") {
+     sources += [ "linux/audio_manager_linux.cc" ]
+   }
+ 
++  if (use_sndio) {
++    libs += [ "sndio" ]
++    sources += [
++      "sndio/audio_manager_sndio.cc",
++      "sndio/sndio_input.cc",
++      "sndio/sndio_input.h",
++      "sndio/sndio_output.cc",
++      "sndio/sndio_output.h"
++    ]
++  }
++
+   if (use_alsa) {
+     libs += [ "asound" ]
+     sources += [
+--- a/src/3rdparty/chromium/media/audio/linux/audio_manager_linux.cc
++++ b/src/3rdparty/chromium/media/audio/linux/audio_manager_linux.cc
+@@ -25,6 +25,11 @@
+ #include "media/audio/pulse/audio_manager_pulse.h"
+ #include "media/audio/pulse/pulse_util.h"
+ #endif
++#if defined(USE_SNDIO)
++#include "media/audio/sndio/audio_manager_sndio.h"
++#include "media/audio/sndio/sndio_input.h"
++#include "media/audio/sndio/sndio_output.h"
++#endif
+ 
+ namespace media {
+ 
+@@ -32,7 +37,8 @@ enum LinuxAudioIO {
+   kPulse,
+   kAlsa,
+   kCras,
+-  kAudioIOMax = kCras  // Must always be equal to largest logged entry.
++  kSndio,
++  kAudioIOMax = kSndio // Must always be equal to largest logged entry.
+ };
+ 
+ std::unique_ptr<media::AudioManager> CreateAudioManager(
+@@ -45,6 +51,16 @@ std::unique_ptr<media::AudioManager> Cre
+                                               audio_log_factory);
+   }
+ 
++#if defined(USE_SNDIO)
++  struct sio_hdl *hdl = sio_open(SIO_DEVANY, SIO_PLAY, 0);
++  if (hdl != NULL) {
++    sio_close(hdl);
++    UMA_HISTOGRAM_ENUMERATION("Media.LinuxAudioIO", kSndio, kAudioIOMax + 1);
++    return std::make_unique<AudioManagerSndio>(std::move(audio_thread),
++                                                  audio_log_factory);
++  }
++#endif
++
+ #if defined(USE_CRAS)
+   if (base::CommandLine::ForCurrentProcess()->HasSwitch(switches::kUseCras)) {
+     UMA_HISTOGRAM_ENUMERATION("Media.LinuxAudioIO", kCras, kAudioIOMax + 1);
+--- /dev/null
++++ b/src/3rdparty/chromium/media/audio/sndio/audio_manager_sndio.cc
+@@ -0,0 +1,148 @@
++// Copyright (c) 2012 The Chromium Authors. All rights reserved.
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++#include "media/audio/sndio/audio_manager_sndio.h"
++
++#include "base/metrics/histogram_macros.h"
++#include "base/memory/ptr_util.h"
++#include "media/audio/audio_device_description.h"
++#include "media/audio/audio_output_dispatcher.h"
++#include "media/audio/sndio/sndio_input.h"
++#include "media/audio/sndio/sndio_output.h"
++#include "media/base/limits.h"
++#include "media/base/media_switches.h"
++
++namespace media {
++
++
++// Maximum number of output streams that can be open simultaneously.
++static const int kMaxOutputStreams = 4;
++
++// Default sample rate for input and output streams.
++static const int kDefaultSampleRate = 48000;
++
++void AddDefaultDevice(AudioDeviceNames* device_names) {
++  DCHECK(device_names->empty());
++  device_names->push_front(AudioDeviceName::CreateDefault());
++}
++
++bool AudioManagerSndio::HasAudioOutputDevices() {
++  return true;
++}
++
++bool AudioManagerSndio::HasAudioInputDevices() {
++  return true;
++}
++
++void AudioManagerSndio::GetAudioInputDeviceNames(
++    AudioDeviceNames* device_names) {
++  DCHECK(device_names->empty());
++  AddDefaultDevice(device_names);
++}
++
++void AudioManagerSndio::GetAudioOutputDeviceNames(
++    AudioDeviceNames* device_names) {
++  AddDefaultDevice(device_names);
++}
++
++const char* AudioManagerSndio::GetName() {
++  return "SNDIO";
++}
++
++AudioParameters AudioManagerSndio::GetInputStreamParameters(
++    const std::string& device_id) {
++  static const int kDefaultInputBufferSize = 1024;
++
++  int user_buffer_size = GetUserBufferSize();
++  int buffer_size = user_buffer_size ?
++      user_buffer_size : kDefaultInputBufferSize;
++
++  return AudioParameters(
++      AudioParameters::AUDIO_PCM_LOW_LATENCY, CHANNEL_LAYOUT_STEREO,
++      kDefaultSampleRate, buffer_size);
++}
++
++AudioManagerSndio::AudioManagerSndio(std::unique_ptr<AudioThread> audio_thread,
++                                         AudioLogFactory* audio_log_factory)
++    : AudioManagerBase(std::move(audio_thread),
++                       audio_log_factory) {
++  DLOG(WARNING) << "AudioManagerSndio";
++  SetMaxOutputStreamsAllowed(kMaxOutputStreams);
++}
++
++AudioManagerSndio::~AudioManagerSndio() {
++  Shutdown();
++}
++
++AudioOutputStream* AudioManagerSndio::MakeLinearOutputStream(
++    const AudioParameters& params,
++    const LogCallback& log_callback) {
++  DCHECK_EQ(AudioParameters::AUDIO_PCM_LINEAR, params.format());
++  return MakeOutputStream(params);
++}
++
++AudioOutputStream* AudioManagerSndio::MakeLowLatencyOutputStream(
++    const AudioParameters& params,
++    const std::string& device_id,
++    const LogCallback& log_callback) {
++  DLOG_IF(ERROR, !device_id.empty()) << "Not implemented!";
++  DCHECK_EQ(AudioParameters::AUDIO_PCM_LOW_LATENCY, params.format());
++  return MakeOutputStream(params);
++}
++
++AudioInputStream* AudioManagerSndio::MakeLinearInputStream(
++    const AudioParameters& params,
++    const std::string& device_id,
++    const LogCallback& log_callback) {
++  DCHECK_EQ(AudioParameters::AUDIO_PCM_LINEAR, params.format());
++  return MakeInputStream(params);
++}
++
++AudioInputStream* AudioManagerSndio::MakeLowLatencyInputStream(
++    const AudioParameters& params,
++    const std::string& device_id,
++    const LogCallback& log_callback) {
++  DCHECK_EQ(AudioParameters::AUDIO_PCM_LOW_LATENCY, params.format());
++  return MakeInputStream(params);
++}
++
++AudioParameters AudioManagerSndio::GetPreferredOutputStreamParameters(
++    const std::string& output_device_id,
++    const AudioParameters& input_params) {
++  // TODO(tommi): Support |output_device_id|.
++  DLOG_IF(ERROR, !output_device_id.empty()) << "Not implemented!";
++  static const int kDefaultOutputBufferSize = 2048;
++
++  ChannelLayout channel_layout = CHANNEL_LAYOUT_STEREO;
++  int sample_rate = kDefaultSampleRate;
++  int buffer_size = kDefaultOutputBufferSize;
++  if (input_params.IsValid()) {
++    sample_rate = input_params.sample_rate();
++    channel_layout = input_params.channel_layout();
++    buffer_size = std::min(buffer_size, input_params.frames_per_buffer());
++  }
++
++  int user_buffer_size = GetUserBufferSize();
++  if (user_buffer_size)
++    buffer_size = user_buffer_size;
++
++  return AudioParameters(
++      AudioParameters::AUDIO_PCM_LOW_LATENCY, channel_layout,
++      sample_rate, buffer_size);
++}
++
++AudioInputStream* AudioManagerSndio::MakeInputStream(
++    const AudioParameters& params) {
++  DLOG(WARNING) << "MakeInputStream";
++  return new SndioAudioInputStream(this,
++             AudioDeviceDescription::kDefaultDeviceId, params);
++}
++
++AudioOutputStream* AudioManagerSndio::MakeOutputStream(
++    const AudioParameters& params) {
++  DLOG(WARNING) << "MakeOutputStream";
++  return new SndioAudioOutputStream(params, this);
++}
++
++}  // namespace media
+--- /dev/null
++++ b/src/3rdparty/chromium/media/audio/sndio/audio_manager_sndio.h
+@@ -0,0 +1,65 @@
++// Copyright (c) 2012 The Chromium Authors. All rights reserved.
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++#ifndef MEDIA_AUDIO_SNDIO_AUDIO_MANAGER_SNDIO_H_
++#define MEDIA_AUDIO_SNDIO_AUDIO_MANAGER_SNDIO_H_
++
++#include <set>
++
++#include "base/compiler_specific.h"
++#include "base/macros.h"
++#include "base/memory/ref_counted.h"
++#include "base/threading/thread.h"
++#include "media/audio/audio_manager_base.h"
++
++namespace media {
++
++class MEDIA_EXPORT AudioManagerSndio : public AudioManagerBase {
++ public:
++  AudioManagerSndio(std::unique_ptr<AudioThread> audio_thread,
++                   AudioLogFactory* audio_log_factory);
++  ~AudioManagerSndio() override;
++
++  // Implementation of AudioManager.
++  bool HasAudioOutputDevices() override;
++  bool HasAudioInputDevices() override;
++  void GetAudioInputDeviceNames(AudioDeviceNames* device_names) override;
++  void GetAudioOutputDeviceNames(AudioDeviceNames* device_names) override;
++  AudioParameters GetInputStreamParameters(
++      const std::string& device_id) override;
++  const char* GetName() override;
++
++  // Implementation of AudioManagerBase.
++  AudioOutputStream* MakeLinearOutputStream(
++      const AudioParameters& params,
++      const LogCallback& log_callback) override;
++  AudioOutputStream* MakeLowLatencyOutputStream(
++      const AudioParameters& params,
++      const std::string& device_id,
++      const LogCallback& log_callback) override;
++  AudioInputStream* MakeLinearInputStream(
++      const AudioParameters& params,
++      const std::string& device_id,
++      const LogCallback& log_callback) override;
++  AudioInputStream* MakeLowLatencyInputStream(
++      const AudioParameters& params,
++      const std::string& device_id,
++      const LogCallback& log_callback) override;
++
++ protected:
++  AudioParameters GetPreferredOutputStreamParameters(
++      const std::string& output_device_id,
++      const AudioParameters& input_params) override;
++
++ private:
++  // Called by MakeLinearOutputStream and MakeLowLatencyOutputStream.
++  AudioOutputStream* MakeOutputStream(const AudioParameters& params);
++  AudioInputStream* MakeInputStream(const AudioParameters& params);
++
++  DISALLOW_COPY_AND_ASSIGN(AudioManagerSndio);
++};
++
++}  // namespace media
++
++#endif  // MEDIA_AUDIO_SNDIO_AUDIO_MANAGER_SNDIO_H_
+--- /dev/null
++++ b/src/3rdparty/chromium/media/audio/sndio/sndio_input.cc
+@@ -0,0 +1,200 @@
++// Copyright 2013 The Chromium Authors. All rights reserved.
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++#include "base/bind.h"
++#include "base/logging.h"
++#include "base/macros.h"
++#include "media/base/audio_timestamp_helper.h"
++#include "media/audio/sndio/audio_manager_sndio.h"
++#include "media/audio/audio_manager.h"
++#include "media/audio/sndio/sndio_input.h"
++
++namespace media {
++
++static const SampleFormat kSampleFormat = kSampleFormatS16;
++
++void SndioAudioInputStream::OnMoveCallback(void *arg, int delta)
++{
++  SndioAudioInputStream* self = static_cast<SndioAudioInputStream*>(arg);
++
++  self->hw_delay += delta;
++}
++
++void *SndioAudioInputStream::ThreadEntry(void *arg) {
++  SndioAudioInputStream* self = static_cast<SndioAudioInputStream*>(arg);
++
++  self->ThreadLoop();
++  return NULL;
++}
++
++SndioAudioInputStream::SndioAudioInputStream(AudioManagerBase* manager,
++                                             const std::string& device_name,
++                                             const AudioParameters& params)
++    : manager(manager),
++      params(params),
++      audio_bus(AudioBus::Create(params)),
++      state(kClosed) {
++}
++
++SndioAudioInputStream::~SndioAudioInputStream() {
++  if (state != kClosed)
++    Close();
++}
++
++bool SndioAudioInputStream::Open() {
++  struct sio_par par;
++  int sig;
++
++  if (state != kClosed)
++    return false;
++
++  if (params.format() != AudioParameters::AUDIO_PCM_LINEAR &&
++      params.format() != AudioParameters::AUDIO_PCM_LOW_LATENCY) {
++    LOG(WARNING) << "Unsupported audio format.";
++    return false;
++  }
++
++  sio_initpar(&par);
++  par.rate = params.sample_rate();
++  par.rchan = params.channels();
++  par.bits = SampleFormatToBitsPerChannel(kSampleFormat);
++  par.bps = par.bits / 8;
++  par.sig = sig = par.bits != 8 ? 1 : 0;
++  par.le = SIO_LE_NATIVE;
++  par.appbufsz = params.frames_per_buffer();
++
++  hdl = sio_open(SIO_DEVANY, SIO_REC, 0);
++
++  if (hdl == NULL) {
++    LOG(ERROR) << "Couldn't open audio device.";
++    return false;
++  }
++
++  if (!sio_setpar(hdl, &par) || !sio_getpar(hdl, &par)) {
++    LOG(ERROR) << "Couldn't set audio parameters.";
++    goto bad_close;
++  }
++
++  if (par.rate  != (unsigned int)params.sample_rate() ||
++      par.rchan != (unsigned int)params.channels() ||
++      par.bits  != (unsigned int)SampleFormatToBitsPerChannel(kSampleFormat) ||
++      par.sig   != (unsigned int)sig ||
++      (par.bps > 1 && par.le != SIO_LE_NATIVE) ||
++      (par.bits != par.bps * 8)) {
++    LOG(ERROR) << "Unsupported audio parameters.";
++    goto bad_close;
++  }
++  state = kStopped;
++  buffer = new char[audio_bus->frames() * params.GetBytesPerFrame(kSampleFormat)];
++  sio_onmove(hdl, &OnMoveCallback, this);
++  return true;
++bad_close:
++  sio_close(hdl);
++  return false;
++}
++
++void SndioAudioInputStream::Start(AudioInputCallback* cb) {
++
++  StartAgc();
++
++  state = kRunning;
++  hw_delay = 0;
++  callback = cb;
++  sio_start(hdl);
++  if (pthread_create(&thread, NULL, &ThreadEntry, this) != 0) {
++    LOG(ERROR) << "Failed to create real-time thread for recording.";
++    sio_stop(hdl);
++    state = kStopped;
++  }
++}
++
++void SndioAudioInputStream::Stop() {
++
++  if (state == kStopped)
++    return;
++
++  state = kStopWait;
++  pthread_join(thread, NULL);
++  sio_stop(hdl);
++  state = kStopped;
++
++  StopAgc();
++}
++
++void SndioAudioInputStream::Close() {
++
++  if (state == kClosed)
++    return;
++
++  if (state == kRunning)
++    Stop();
++
++  state = kClosed;
++  delete [] buffer;
++  sio_close(hdl);
++
++  manager->ReleaseInputStream(this);
++}
++
++double SndioAudioInputStream::GetMaxVolume() {
++  // Not supported
++  return 0.0;
++}
++
++void SndioAudioInputStream::SetVolume(double volume) {
++  // Not supported. Do nothing.
++}
++
++double SndioAudioInputStream::GetVolume() {
++  // Not supported.
++  return 0.0;
++}
++
++bool SndioAudioInputStream::IsMuted() {
++  // Not supported.
++  return false;
++}
++
++void SndioAudioInputStream::SetOutputDeviceForAec(
++    const std::string& output_device_id) {
++  // Not supported.
++}
++
++void SndioAudioInputStream::ThreadLoop(void) {
++  size_t todo, n;
++  char *data;
++  unsigned int nframes;
++  double normalized_volume = 0.0;
++
++  nframes = audio_bus->frames();
++
++  while (state == kRunning && !sio_eof(hdl)) {
++
++    GetAgcVolume(&normalized_volume);
++
++    // read one block
++    todo = nframes * params.GetBytesPerFrame(kSampleFormat);
++    data = buffer;
++    while (todo > 0) {
++      n = sio_read(hdl, data, todo);
++      if (n == 0)
++        return;	// unrecoverable I/O error
++      todo -= n;
++      data += n;
++    }
++    hw_delay -= nframes;
++
++    // convert frames count to TimeDelta
++    const base::TimeDelta delay = AudioTimestampHelper::FramesToTime(hw_delay,
++      params.sample_rate());
++
++    // push into bus
++    audio_bus->FromInterleaved<SignedInt16SampleTypeTraits>(reinterpret_cast<int16_t*>(buffer), nframes);
++
++    // invoke callback
++    callback->OnData(audio_bus.get(), base::TimeTicks::Now() - delay, 1.);
++  }
++}
++
++}  // namespace media
+--- /dev/null
++++ b/src/3rdparty/chromium/media/audio/sndio/sndio_input.h
+@@ -0,0 +1,91 @@
++// Copyright 2013 The Chromium Authors. All rights reserved.
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++#ifndef MEDIA_AUDIO_SNDIO_SNDIO_INPUT_H_
++#define MEDIA_AUDIO_SNDIO_SNDIO_INPUT_H_
++
++#include <stdint.h>
++#include <string>
++#include <sndio.h>
++
++#include "base/compiler_specific.h"
++#include "base/macros.h"
++#include "base/memory/weak_ptr.h"
++#include "base/time/time.h"
++#include "media/audio/agc_audio_stream.h"
++#include "media/audio/audio_io.h"
++#include "media/audio/audio_device_description.h"
++#include "media/base/audio_parameters.h"
++
++namespace media {
++
++class AudioManagerBase;
++
++// Implementation of AudioOutputStream using sndio(7)
++class SndioAudioInputStream : public AgcAudioStream<AudioInputStream> {
++ public:
++  // Pass this to the constructor if you want to attempt auto-selection
++  // of the audio recording device.
++  static const char kAutoSelectDevice[];
++
++  // Create a PCM Output stream for the SNDIO device identified by
++  // |device_name|. If unsure of what to use for |device_name|, use
++  // |kAutoSelectDevice|.
++  SndioAudioInputStream(AudioManagerBase* audio_manager,
++                     const std::string& device_name,
++                     const AudioParameters& params);
++
++  ~SndioAudioInputStream() override;
++
++  // Implementation of AudioInputStream.
++  bool Open() override;
++  void Start(AudioInputCallback* callback) override;
++  void Stop() override;
++  void Close() override;
++  double GetMaxVolume() override;
++  void SetVolume(double volume) override;
++  double GetVolume() override;
++  bool IsMuted() override;
++  void SetOutputDeviceForAec(const std::string& output_device_id) override;
++
++ private:
++
++  enum StreamState {
++    kClosed,            // Not opened yet
++    kStopped,           // Device opened, but not started yet
++    kRunning,           // Started, device playing
++    kStopWait           // Stopping, waiting for the real-time thread to exit
++  };
++
++  // C-style call-backs
++  static void OnMoveCallback(void *arg, int delta);
++  static void* ThreadEntry(void *arg);
++
++  // Continuously moves data from the device to the consumer
++  void ThreadLoop();
++  // Our creator, the audio manager needs to be notified when we close.
++  AudioManagerBase* manager;
++  // Parameters of the source
++  AudioParameters params;
++  // We store data here for consumer
++  std::unique_ptr<AudioBus> audio_bus;
++  // Call-back that consumes recorded data
++  AudioInputCallback* callback;  // Valid during a recording session.
++  // Handle of the audio device
++  struct sio_hdl* hdl;
++  // Current state of the stream
++  enum StreamState state;
++  // High priority thread running ThreadLoop()
++  pthread_t thread;
++  // Number of frames buffered in the hardware
++  int hw_delay;
++  // Temporary buffer where data is stored sndio-compatible format
++  char* buffer;
++
++  DISALLOW_COPY_AND_ASSIGN(SndioAudioInputStream);
++};
++
++}  // namespace media
++
++#endif  // MEDIA_AUDIO_SNDIO_SNDIO_INPUT_H_
+--- /dev/null
++++ b/src/3rdparty/chromium/media/audio/sndio/sndio_output.cc
+@@ -0,0 +1,183 @@
++// Copyright (c) 2012 The Chromium Authors. All rights reserved.
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++#include "base/logging.h"
++#include "base/time/time.h"
++#include "base/time/default_tick_clock.h"
++#include "media/audio/audio_manager_base.h"
++#include "media/base/audio_timestamp_helper.h"
++#include "media/audio/sndio/sndio_output.h"
++
++namespace media {
++
++static const SampleFormat kSampleFormat = kSampleFormatS16;
++
++void SndioAudioOutputStream::OnMoveCallback(void *arg, int delta) {
++  SndioAudioOutputStream* self = static_cast<SndioAudioOutputStream*>(arg);
++
++  self->hw_delay -= delta;
++}
++
++void SndioAudioOutputStream::OnVolCallback(void *arg, unsigned int vol) {
++  SndioAudioOutputStream* self = static_cast<SndioAudioOutputStream*>(arg);
++
++  self->vol = vol;
++}
++
++void *SndioAudioOutputStream::ThreadEntry(void *arg) {
++  SndioAudioOutputStream* self = static_cast<SndioAudioOutputStream*>(arg);
++
++  self->ThreadLoop();
++  return NULL;
++}
++
++SndioAudioOutputStream::SndioAudioOutputStream(const AudioParameters& params,
++                                               AudioManagerBase* manager)
++    : manager(manager),
++      params(params),
++      audio_bus(AudioBus::Create(params)),
++      state(kClosed),
++      mutex(PTHREAD_MUTEX_INITIALIZER) {
++}
++
++SndioAudioOutputStream::~SndioAudioOutputStream() {
++  if (state != kClosed)
++    Close();
++}
++
++bool SndioAudioOutputStream::Open() {
++  struct sio_par par;
++  int sig;
++
++  if (params.format() != AudioParameters::AUDIO_PCM_LINEAR &&
++      params.format() != AudioParameters::AUDIO_PCM_LOW_LATENCY) {
++    LOG(WARNING) << "Unsupported audio format.";
++    return false;
++  }
++  sio_initpar(&par);
++  par.rate = params.sample_rate();
++  par.pchan = params.channels();
++  par.bits = SampleFormatToBitsPerChannel(kSampleFormat);
++  par.bps = par.bits / 8;
++  par.sig = sig = par.bits != 8 ? 1 : 0;
++  par.le = SIO_LE_NATIVE;
++  par.appbufsz = params.frames_per_buffer();
++
++  hdl = sio_open(SIO_DEVANY, SIO_PLAY, 0);
++  if (hdl == NULL) {
++    LOG(ERROR) << "Couldn't open audio device.";
++    return false;
++  }
++  if (!sio_setpar(hdl, &par) || !sio_getpar(hdl, &par)) {
++    LOG(ERROR) << "Couldn't set audio parameters.";
++    goto bad_close;
++  }
++  if (par.rate  != (unsigned int)params.sample_rate() ||
++      par.pchan != (unsigned int)params.channels() ||
++      par.bits  != (unsigned int)SampleFormatToBitsPerChannel(kSampleFormat) ||
++      par.sig   != (unsigned int)sig ||
++      (par.bps > 1 && par.le != SIO_LE_NATIVE) ||
++      (par.bits != par.bps * 8)) {
++    LOG(ERROR) << "Unsupported audio parameters.";
++    goto bad_close;
++  }
++  state = kStopped;
++  volpending = 0;
++  vol = 0;
++  buffer = new char[audio_bus->frames() * params.GetBytesPerFrame(kSampleFormat)];
++  sio_onmove(hdl, &OnMoveCallback, this);
++  sio_onvol(hdl, &OnVolCallback, this);
++  return true;
++ bad_close:
++  sio_close(hdl);
++  return false;
++}
++
++void SndioAudioOutputStream::Close() {
++  if (state == kClosed)
++    return;
++  if (state == kRunning)
++    Stop();
++  state = kClosed;
++  delete [] buffer;
++  sio_close(hdl);
++  manager->ReleaseOutputStream(this);  // Calls the destructor
++}
++
++void SndioAudioOutputStream::Start(AudioSourceCallback* callback) {
++  state = kRunning;
++  hw_delay = 0;
++  source = callback;
++  sio_start(hdl);
++  if (pthread_create(&thread, NULL, &ThreadEntry, this) != 0) {
++    LOG(ERROR) << "Failed to create real-time thread.";
++    sio_stop(hdl);
++    state = kStopped;
++  }
++}
++
++void SndioAudioOutputStream::Stop() {
++  if (state == kStopped)
++    return;
++  state = kStopWait;
++  pthread_join(thread, NULL);
++  sio_stop(hdl);
++  state = kStopped;
++}
++
++void SndioAudioOutputStream::SetVolume(double v) {
++  pthread_mutex_lock(&mutex);
++  vol = v * SIO_MAXVOL;
++  volpending = 1;
++  pthread_mutex_unlock(&mutex);
++}
++
++void SndioAudioOutputStream::GetVolume(double* v) {
++  pthread_mutex_lock(&mutex);
++  *v = vol * (1. / SIO_MAXVOL);
++  pthread_mutex_unlock(&mutex);
++}
++
++// This stream is always used with sub second buffer sizes, where it's
++// sufficient to simply always flush upon Start().
++void SndioAudioOutputStream::Flush() {}
++
++void SndioAudioOutputStream::ThreadLoop(void) {
++  int avail, count, result;
++
++  while (state == kRunning) {
++    // Update volume if needed
++    pthread_mutex_lock(&mutex);
++    if (volpending) {
++      volpending = 0;
++      sio_setvol(hdl, vol);
++    }
++    pthread_mutex_unlock(&mutex);
++
++    // Get data to play
++    const base::TimeDelta delay = AudioTimestampHelper::FramesToTime(hw_delay,
++	params.sample_rate());
++    count = source->OnMoreData(delay, base::TimeTicks::Now(), 0, audio_bus.get());
++    audio_bus->ToInterleaved<SignedInt16SampleTypeTraits>(count, reinterpret_cast<int16_t*>(buffer));
++    if (count == 0) {
++      // We have to submit something to the device
++      count = audio_bus->frames();
++      memset(buffer, 0, count * params.GetBytesPerFrame(kSampleFormat));
++      LOG(WARNING) << "No data to play, running empty cycle.";
++    }
++
++    // Submit data to the device
++    avail = count * params.GetBytesPerFrame(kSampleFormat);
++    result = sio_write(hdl, buffer, avail);
++    if (result == 0) {
++      LOG(WARNING) << "Audio device disconnected.";
++      break;
++    }
++
++    // Update hardware pointer
++    hw_delay += count;
++  }
++}
++
++}  // namespace media
+--- /dev/null
++++ b/src/3rdparty/chromium/media/audio/sndio/sndio_output.h
+@@ -0,0 +1,86 @@
++// Copyright (c) 2012 The Chromium Authors. All rights reserved.
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++#ifndef MEDIA_AUDIO_SNDIO_SNDIO_OUTPUT_H_
++#define MEDIA_AUDIO_SNDIO_SNDIO_OUTPUT_H_
++
++#include <pthread.h>
++#include <sndio.h>
++
++#include "base/time/tick_clock.h"
++#include "base/time/time.h"
++#include "media/audio/audio_io.h"
++
++namespace media {
++
++class AudioManagerBase;
++
++// Implementation of AudioOutputStream using sndio(7)
++class SndioAudioOutputStream : public AudioOutputStream {
++ public:
++  // The manager is creating this object
++  SndioAudioOutputStream(const AudioParameters& params,
++                         AudioManagerBase* manager);
++  virtual ~SndioAudioOutputStream();
++
++  // Implementation of AudioOutputStream.
++  bool Open() override;
++  void Close() override;
++  void Start(AudioSourceCallback* callback) override;
++  void Stop() override;
++  void SetVolume(double volume) override;
++  void GetVolume(double* volume) override;
++  void Flush() override;
++
++  friend void sndio_onmove(void *arg, int delta);
++  friend void sndio_onvol(void *arg, unsigned int vol);
++  friend void *sndio_threadstart(void *arg);
++
++ private:
++  enum StreamState {
++    kClosed,            // Not opened yet
++    kStopped,           // Device opened, but not started yet
++    kRunning,           // Started, device playing
++    kStopWait           // Stopping, waiting for the real-time thread to exit
++  };
++
++  // C-style call-backs
++  static void OnMoveCallback(void *arg, int delta);
++  static void OnVolCallback(void *arg, unsigned int vol);
++  static void* ThreadEntry(void *arg);
++
++  // Continuously moves data from the producer to the device
++  void ThreadLoop(void);
++
++  // Our creator, the audio manager needs to be notified when we close.
++  AudioManagerBase* manager;
++  // Parameters of the source
++  AudioParameters params;
++  // Source stores data here
++  std::unique_ptr<AudioBus> audio_bus;
++  // Call-back that produces data to play
++  AudioSourceCallback* source;
++  // Handle of the audio device
++  struct sio_hdl* hdl;
++  // Current state of the stream
++  enum StreamState state;
++  // High priority thread running ThreadLoop()
++  pthread_t thread;
++  // Protects vol, volpending and hw_delay
++  pthread_mutex_t mutex;
++  // Current volume in the 0..SIO_MAXVOL range
++  int vol;
++  // Set to 1 if volumes must be refreshed in the realtime thread
++  int volpending;
++  // Number of frames buffered in the hardware
++  int hw_delay;
++  // Temporary buffer where data is stored sndio-compatible format
++  char* buffer;
++
++  DISALLOW_COPY_AND_ASSIGN(SndioAudioOutputStream);
++};
++
++}  // namespace media
++
++#endif  // MEDIA_AUDIO_SNDIO_SNDIO_OUTPUT_H_
+--- a/src/3rdparty/chromium/media/media_options.gni
++++ b/src/3rdparty/chromium/media/media_options.gni
+@@ -121,6 +121,9 @@ declare_args() {
+   # Enables runtime selection of ALSA library for audio.
+   use_alsa = false
+ 
++  # Enable runtime selection of sndio(7)
++  use_sndio = false
++
+   # Alsa should be used on non-Android, non-Mac POSIX systems.
+   # Alsa should be used on desktop Chromecast and audio-only Chromecast builds.
+   if (is_posix && !is_android && !is_mac &&
diff --git a/srcpkgs/qt6-webengine/patches/0700-armv7l-neon.patch b/srcpkgs/qt6-webengine/patches/0700-armv7l-neon.patch
new file mode 100644
index 000000000000..d42fa19a07a1
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0700-armv7l-neon.patch
@@ -0,0 +1,10 @@
+--- a/src/3rdparty/chromium/skia/BUILD.gn
++++ b/src/3rdparty/chromium/skia/BUILD.gn
+@@ -800,7 +800,6 @@ skia_source_set("skia_opts") {
+         # Root build config sets -mfpu=$arm_fpu, which we expect to be neon
+         # when running this.
+         if (!arm_use_neon) {
+-          configs -= [ "//build/config/compiler:compiler_arm_fpu" ]
+           cflags += [ "-mfpu=neon" ]
+         }
+       }
diff --git a/srcpkgs/qt6-webengine/patches/0750-chromium-musl-cross-no-asm_ptrace_h.patch b/srcpkgs/qt6-webengine/patches/0750-chromium-musl-cross-no-asm_ptrace_h.patch
new file mode 100644
index 000000000000..3cf132908af4
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0750-chromium-musl-cross-no-asm_ptrace_h.patch
@@ -0,0 +1,30 @@
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper.cc
+@@ -38,7 +38,12 @@
+ 
+ #include "client/linux/minidump_writer/linux_ptrace_dumper.h"
+ 
++#if defined(__GLIBC__)
+ #include <asm/ptrace.h>
++#else
++/* For arm*-musl this definition is missing */
++#define ARM_sp uregs[13]
++#endif
+ #include <assert.h>
+ #include <errno.h>
+ #include <fcntl.h>
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_core_dumper.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_core_dumper.cc
+@@ -32,7 +32,12 @@
+ 
+ #include "client/linux/minidump_writer/linux_core_dumper.h"
+ 
++#if defined(__GLIBC__)
+ #include <asm/ptrace.h>
++#else
++/* For arm*-musl this definition is missing */
++#define ARM_sp uregs[13]
++#endif
+ #include <assert.h>
+ #include <elf.h>
+ #include <stdio.h>
diff --git a/srcpkgs/qt6-webengine/patches/0751-chromium-musl-arm-user_vfp.patch b/srcpkgs/qt6-webengine/patches/0751-chromium-musl-arm-user_vfp.patch
new file mode 100644
index 000000000000..6e2d62f35ee6
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0751-chromium-musl-arm-user_vfp.patch
@@ -0,0 +1,20 @@
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/util/linux/thread_info.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/util/linux/thread_info.h
+@@ -17,6 +17,17 @@
+ 
+ #include <stdint.h>
+ #include <sys/user.h>
++#if !defined(__GLIBC__)
++struct user_vfp {
++	unsigned long long fpregs[32];
++	unsigned long fpscr;
++};
++struct user_vfp_exc {
++	unsigned long fpexc;
++	unsigned long fpinst;
++	unsigned long fpinst2;
++};
++#endif /* !defined(__GLIBC__) */
+ 
+ #include <type_traits>
+ 
diff --git a/srcpkgs/qt6-webengine/patches/0752-chromium-musl-arm-elf_auxv_t.patch b/srcpkgs/qt6-webengine/patches/0752-chromium-musl-arm-elf_auxv_t.patch
new file mode 100644
index 000000000000..7112c8cfd3fa
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0752-chromium-musl-arm-elf_auxv_t.patch
@@ -0,0 +1,18 @@
+--- a/src/3rdparty/chromium/v8/src/base/cpu.cc
++++ b/src/3rdparty/chromium/v8/src/base/cpu.cc
+@@ -163,6 +163,15 @@ static V8_INLINE void __cpuid(int cpu_in
+ 
+ #if V8_HOST_ARCH_ARM || V8_HOST_ARCH_ARM64
+ 
++#ifndef __GLIBC__
++#include <elf.h>
++#ifdef __LP64__
++typedef Elf64_auxv_t elf_auxv_t;
++#else
++typedef Elf32_auxv_t elf_auxv_t;
++#endif
++#endif
++
+ static uint32_t ReadELFHWCaps() {
+   uint32_t result = 0;
+ #if V8_GLIBC_PREREQ(2, 16)
diff --git a/srcpkgs/qt6-webengine/patches/0801-chromium-i686-vaapi-fpermissive.patch b/srcpkgs/qt6-webengine/patches/0801-chromium-i686-vaapi-fpermissive.patch
new file mode 100644
index 000000000000..3d4043e03b89
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0801-chromium-i686-vaapi-fpermissive.patch
@@ -0,0 +1,24 @@
+--- a/src/3rdparty/chromium/media/gpu/vaapi/BUILD.gn
++++ b/src/3rdparty/chromium/media/gpu/vaapi/BUILD.gn
+@@ -14,6 +14,10 @@ import("//ui/gl/features.gni")
+ assert(is_linux || is_chromeos)
+ assert(use_vaapi)
+ 
++config("vaapi_permissive") {
++  cflags = [ "-fpermissive" ]
++}
++
+ generate_stubs("libva_stubs") {
+   extra_header = "va_stub_header.fragment"
+   sigs = [ "va.sigs" ]
+@@ -136,6 +140,10 @@ source_set("vaapi") {
+     ]
+   }
+ 
++  if (target_cpu == "x86") {
++    configs += [ ":vaapi_permissive" ]
++  }
++
+   if (use_x11) {
+     deps += [ "//ui/gfx/x" ]
+     sources += [
diff --git a/srcpkgs/qt6-webengine/patches/0900-xxx-ppc64le-libvpx.patch b/srcpkgs/qt6-webengine/patches/0900-xxx-ppc64le-libvpx.patch
new file mode 100644
index 000000000000..5c9566b56bd4
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0900-xxx-ppc64le-libvpx.patch
@@ -0,0 +1,65 @@
+Uses generic target for now. To use ppc64le, change --target to ppc64le-gnu
+and add --enable-vsx, and change generic to ppc for the rtcd header.
+
+From 18e6c5c55cfae0cfb458d8210d7bc709360a0e90 Mon Sep 17 00:00:00 2001
+From: q66 <daniel@octaforge.org>
+Date: Wed, 9 Sep 2020 19:08:25 +0200
+Subject: [PATCH] enable generation of ppc64 libvpx bits
+
+this doesn't update the gni file, that's done from
+the template by running the appropriate scripts
+---
+ third_party/libvpx/BUILD.gn        | 4 ++++
+ third_party/libvpx/generate_gni.sh | 9 +++++++++
+ 2 files changed, 13 insertions(+)
+
+--- a/src/3rdparty/chromium/third_party/libvpx/BUILD.gn
++++ b/src/3rdparty/chromium/third_party/libvpx/BUILD.gn
+@@ -424,6 +424,8 @@ static_library("bundled_libvpx") {
+       sources = libvpx_srcs_arm64
+       public_deps = [ ":libvpx_arm64_headers" ]
+     }
++  } else if (current_cpu == "ppc64") {
++    sources = libvpx_srcs_ppc64
+   }
+ 
+   configs -= [ "//build/config/compiler:chromium_code" ]
+--- a/src/3rdparty/chromium/third_party/libvpx/generate_gni.sh
++++ b/src/3rdparty/chromium/third_party/libvpx/generate_gni.sh
+@@ -374,6 +374,7 @@ gen_config_files linux/arm-neon-highbd "
+ gen_config_files linux/arm64-highbd "--target=armv8-linux-gcc ${all_platforms} ${HIGHBD}"
+ gen_config_files linux/mipsel "--target=mips32-linux-gcc ${all_platforms}"
+ gen_config_files linux/mips64el "--target=mips64-linux-gcc ${all_platforms}"
++gen_config_files linux/ppc64 "--target=generic-gnu $HIGHBD ${all_platforms}"
+ gen_config_files linux/generic "--target=generic-gnu $HIGHBD ${all_platforms}"
+ gen_config_files win/arm64 "--target=arm64-win64-vs15 ${all_platforms} ${HIGHBD}"
+ gen_config_files win/ia32 "--target=x86-win32-vs14 ${all_platforms} ${x86_platforms}"
+@@ -399,6 +400,7 @@ lint_config linux/arm-neon-highbd
+ lint_config linux/arm64-highbd
+ lint_config linux/mipsel
+ lint_config linux/mips64el
++lint_config linux/ppc64
+ lint_config linux/generic
+ lint_config win/arm64
+ lint_config win/ia32
+@@ -428,6 +430,7 @@ gen_rtcd_header linux/arm-neon-highbd ar
+ gen_rtcd_header linux/arm64-highbd armv8
+ gen_rtcd_header linux/mipsel mipsel
+ gen_rtcd_header linux/mips64el mips64el
++gen_rtcd_header linux/ppc64 generic
+ gen_rtcd_header linux/generic generic
+ gen_rtcd_header win/arm64 armv8
+ gen_rtcd_header win/ia32 x86 "${require_sse2}"
+@@ -513,6 +516,12 @@ if [ -z $ONLY_CONFIGS ]; then
+ 
+   echo "MIPS64 source list is identical to MIPS source list. No need to generate it."
+ 
++  echo "Generate ppc64 source list."
++  config=$(print_config_basic linux/ppc64)
++  make_clean
++  make libvpx_srcs.txt target=libs $config > /dev/null
++  convert_srcs_to_project_files libvpx_srcs.txt libvpx_srcs_ppc64
++
+   echo "Generate NaCl source list."
+   config=$(print_config_basic nacl)
+   make_clean
diff --git a/srcpkgs/qt6-webengine/patches/0901-xxx-ppc64le-sandbox-linux-stat.patch b/srcpkgs/qt6-webengine/patches/0901-xxx-ppc64le-sandbox-linux-stat.patch
new file mode 100644
index 000000000000..4b8e6320601c
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0901-xxx-ppc64le-sandbox-linux-stat.patch
@@ -0,0 +1,31 @@
+--- a/src/3rdparty/chromium/sandbox/linux/system_headers/linux_stat.h
++++ b/src/3rdparty/chromium/sandbox/linux/system_headers/linux_stat.h
+@@ -155,6 +155,28 @@ struct kernel_stat {
+   unsigned int __unused4;
+   unsigned int __unused5;
+ };
++#elif defined(__powerpc64__)
++struct kernel_stat {
++  unsigned long	st_dev;
++  unsigned long	st_ino;
++  unsigned long	st_nlink;
++  unsigned int	st_mode;
++  unsigned int	st_uid;
++  unsigned int	st_gid;
++  unsigned long	st_rdev;
++  long		st_size;
++  unsigned long	st_blksize;
++  unsigned long	st_blocks;
++  unsigned long	st_atime_;
++  unsigned long	st_atime_nsec_;
++  unsigned long	st_mtime_;
++  unsigned long	st_mtime_nsec_;
++  unsigned long	st_ctime_;
++  unsigned long	st_ctime_nsec_;
++  unsigned long	__unused4;
++  unsigned long	__unused5;
++  unsigned long	__unused6;
++};
+ #endif
+ 
+ #if !defined(AT_EMPTY_PATH)
diff --git a/srcpkgs/qt6-webengine/patches/0902-xxx-ppc64le-support.patch b/srcpkgs/qt6-webengine/patches/0902-xxx-ppc64le-support.patch
new file mode 100644
index 000000000000..33d415e55f69
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0902-xxx-ppc64le-support.patch
@@ -0,0 +1,3556 @@
+commit 2c013a317b1114ef67cdbbc30824b28907b9ea94
+Author: Daniel Kolesa <daniel@octaforge.org>
+Date:   Wed Mar 3 19:08:29 2021 +0100
+
+    ppc64le support
+
+--- a/src/3rdparty/chromium/sandbox/features.gni
++++ b/src/3rdparty/chromium/sandbox/features.gni
+@@ -11,7 +11,8 @@ import("//build/config/nacl/config.gni")
+ use_seccomp_bpf = (is_linux || is_chromeos || is_android) &&
+                   (current_cpu == "x86" || current_cpu == "x64" ||
+                    current_cpu == "arm" || current_cpu == "arm64" ||
+-                   current_cpu == "mipsel" || current_cpu == "mips64el")
++                   current_cpu == "mipsel" || current_cpu == "mips64el" ||
++                   current_cpu == "ppc64")
+ 
+ use_seccomp_bpf = use_seccomp_bpf || is_nacl_nonsfi
+ 
+--- a/src/3rdparty/chromium/sandbox/linux/BUILD.gn
++++ b/src/3rdparty/chromium/sandbox/linux/BUILD.gn
+@@ -433,6 +433,8 @@ component("sandbox_services") {
+ 
+ source_set("sandbox_services_headers") {
+   sources = [
++    "system_headers/ppc64_linux_syscalls.h",
++    "system_headers/ppc64_linux_ucontext.h",
+     "system_headers/arm64_linux_syscalls.h",
+     "system_headers/arm_linux_syscalls.h",
+     "system_headers/arm_linux_ucontext.h",
+--- a/src/3rdparty/chromium/sandbox/linux/bpf_dsl/linux_syscall_ranges.h
++++ b/src/3rdparty/chromium/sandbox/linux/bpf_dsl/linux_syscall_ranges.h
+@@ -56,6 +56,13 @@
+ #define MAX_PUBLIC_SYSCALL __NR_syscalls
+ #define MAX_SYSCALL MAX_PUBLIC_SYSCALL
+ 
++#elif defined(__powerpc64__)
++
++#include <asm/unistd.h>
++#define MIN_SYSCALL 0u
++#define MAX_PUBLIC_SYSCALL 386u
++#define MAX_SYSCALL MAX_PUBLIC_SYSCALL
++
+ #else
+ #error "Unsupported architecture"
+ #endif
+--- a/src/3rdparty/chromium/sandbox/linux/bpf_dsl/seccomp_macros.h
++++ b/src/3rdparty/chromium/sandbox/linux/bpf_dsl/seccomp_macros.h
+@@ -16,6 +16,9 @@
+ #if defined(__mips__)
+ // sys/user.h in eglibc misses size_t definition
+ #include <stddef.h>
++#elif defined(__powerpc64__) && defined(__GLIBC__)
++// Manually define greg_t on ppc64
++typedef unsigned long long greg_t;
+ #endif
+ #endif
+ 
+@@ -346,6 +349,59 @@ struct regs_struct {
+ #define SECCOMP_PT_PARM4(_regs) (_regs).regs[3]
+ #define SECCOMP_PT_PARM5(_regs) (_regs).regs[4]
+ #define SECCOMP_PT_PARM6(_regs) (_regs).regs[5]
++
++#elif defined(__powerpc64__)
++#include <asm/ptrace.h>
++
++typedef struct pt_regs regs_struct;
++
++#ifdef ARCH_CPU_LITTLE_ENDIAN
++#define SECCOMP_ARCH AUDIT_ARCH_PPC64LE
++#else
++#define SECCOMP_ARCH AUDIT_ARCH_PPC64
++#endif
++
++#ifdef __GLIBC__
++#define SECCOMP_REG(_ctx, _reg) ((_ctx)->uc_mcontext.regs->gpr[_reg])
++#else
++#define SECCOMP_REG(_ctx, _reg) (((struct pt_regs *)(_ctx)->uc_mcontext.regs)->gpr[_reg])
++#endif
++
++#define SECCOMP_RESULT(_ctx) SECCOMP_REG(_ctx, 3)
++#define SECCOMP_SYSCALL(_ctx) SECCOMP_REG(_ctx, 0)
++#ifdef __GLIBC__
++#define SECCOMP_IP(_ctx) (_ctx)->uc_mcontext.regs->nip
++#else
++#define SECCOMP_IP(_ctx) ((struct pt_regs *)(_ctx)->uc_mcontext.regs)->nip
++#endif
++#define SECCOMP_PARM1(_ctx) SECCOMP_REG(_ctx, 3)
++#define SECCOMP_PARM2(_ctx) SECCOMP_REG(_ctx, 4)
++#define SECCOMP_PARM3(_ctx) SECCOMP_REG(_ctx, 5)
++#define SECCOMP_PARM4(_ctx) SECCOMP_REG(_ctx, 6)
++#define SECCOMP_PARM5(_ctx) SECCOMP_REG(_ctx, 7)
++#define SECCOMP_PARM6(_ctx) SECCOMP_REG(_ctx, 8)
++
++#define SECCOMP_NR_IDX (offsetof(struct arch_seccomp_data, nr))
++#define SECCOMP_ARCH_IDX (offsetof(struct arch_seccomp_data, arch))
++#define SECCOMP_IP_MSB_IDX \
++  (offsetof(struct arch_seccomp_data, instruction_pointer) + 4)
++#define SECCOMP_IP_LSB_IDX \
++  (offsetof(struct arch_seccomp_data, instruction_pointer) + 0)
++#define SECCOMP_ARG_MSB_IDX(nr) \
++  (offsetof(struct arch_seccomp_data, args) + 8 * (nr) + 4)
++#define SECCOMP_ARG_LSB_IDX(nr) \
++  (offsetof(struct arch_seccomp_data, args) + 8 * (nr) + 0)
++
++#define SECCOMP_PT_RESULT(_regs) (_regs).gpr[3]
++#define SECCOMP_PT_SYSCALL(_regs) (_regs).gpr[0]
++#define SECCOMP_PT_IP(_regs) (_regs).nip
++#define SECCOMP_PT_PARM1(_regs) (_regs).gpr[3]
++#define SECCOMP_PT_PARM2(_regs) (_regs).gpr[4]
++#define SECCOMP_PT_PARM3(_regs) (_regs).gpr[5]
++#define SECCOMP_PT_PARM4(_regs) (_regs).gpr[6]
++#define SECCOMP_PT_PARM5(_regs) (_regs).gpr[7]
++#define SECCOMP_PT_PARM6(_regs) (_regs).gpr[8]
++
+ #else
+ #error Unsupported target platform
+ 
+--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc
++++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc
+@@ -90,7 +90,7 @@ bool IsBaselinePolicyWatched(int sysno)
+          SyscallSets::IsNuma(sysno) ||
+          SyscallSets::IsPrctl(sysno) ||
+          SyscallSets::IsProcessGroupOrSession(sysno) ||
+-#if defined(__i386__) || \
++#if defined(__i386__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+          SyscallSets::IsSocketCall(sysno) ||
+ #endif
+@@ -258,7 +258,7 @@ ResultExpr EvaluateSyscallImpl(int fs_de
+   }
+ 
+ #if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
+-    defined(__aarch64__)
++    defined(__aarch64__) || defined(__powerpc64__)
+   if (sysno == __NR_mmap)
+     return RestrictMmapFlags();
+ #endif
+@@ -279,7 +279,7 @@ ResultExpr EvaluateSyscallImpl(int fs_de
+     return RestrictPrctl();
+ 
+ #if defined(__x86_64__) || defined(__arm__) || defined(__mips__) || \
+-    defined(__aarch64__)
++    defined(__aarch64__) || defined(__powerpc64__)
+   if (sysno == __NR_socketpair) {
+     // Only allow AF_UNIX, PF_UNIX. Crash if anything else is seen.
+     static_assert(AF_UNIX == PF_UNIX,
+@@ -343,7 +343,8 @@ ResultExpr EvaluateSyscallImpl(int fs_de
+   }
+ 
+ #if defined(__i386__) || \
+-    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
++    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
++    defined(__powerpc64__)
+   if (SyscallSets::IsSocketCall(sysno))
+     return RestrictSocketcallCommand();
+ #endif
+--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/baseline_policy_unittest.cc
++++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/baseline_policy_unittest.cc
+@@ -317,7 +317,7 @@ TEST_BASELINE_SIGSYS(__NR_sysinfo)
+ TEST_BASELINE_SIGSYS(__NR_syslog)
+ TEST_BASELINE_SIGSYS(__NR_timer_create)
+ 
+-#if !defined(__aarch64__)
++#if !defined(__aarch64__) && !defined(__powerpc64__)
+ TEST_BASELINE_SIGSYS(__NR_inotify_init)
+ TEST_BASELINE_SIGSYS(__NR_vserver)
+ #endif
+--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc
++++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc
+@@ -40,6 +40,7 @@
+ #include <sys/ptrace.h>
+ #if (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) && \
+     !defined(__arm__) && !defined(__aarch64__) &&           \
++    !defined(__powerpc64__) &&                              \
+     !defined(PTRACE_GET_THREAD_AREA)
+ // Also include asm/ptrace-abi.h since ptrace.h in older libc (for instance
+ // the one in Ubuntu 16.04 LTS) is missing PTRACE_GET_THREAD_AREA.
+@@ -49,6 +50,11 @@
+ #endif
+ #endif  // !OS_NACL_NONSFI
+ 
++// On PPC64, TCGETS is defined in terms of struct termios, so we must include termios.h
++#ifdef __powerpc64__
++#include <termios.h>
++#endif
++
+ #if defined(OS_ANDROID)
+ 
+ #if !defined(F_DUPFD_CLOEXEC)
+@@ -106,6 +112,14 @@ inline bool IsArchitectureMips() {
+ #endif
+ }
+ 
++inline bool IsArchitecturePPC64() {
++#if defined(__powerpc64__)
++  return true;
++#else
++  return false;
++#endif
++}
++
+ // Ubuntu's version of glibc has a race condition in sem_post that can cause
+ // it to call futex(2) with bogus op arguments. To workaround this, we need
+ // to allow those futex(2) calls to fail with EINVAL, instead of crashing the
+@@ -270,6 +284,8 @@ ResultExpr RestrictFcntlCommands() {
+   uint64_t kOLargeFileFlag = O_LARGEFILE;
+   if (IsArchitectureX86_64() || IsArchitectureI386() || IsArchitectureMips())
+     kOLargeFileFlag = 0100000;
++  else if (IsArchitecturePPC64())
++    kOLargeFileFlag = 0200000;
+ 
+   const Arg<int> cmd(1);
+   const Arg<long> long_arg(2);
+@@ -287,7 +303,16 @@ ResultExpr RestrictFcntlCommands() {
+               F_SETLKW,
+               F_GETLK,
+               F_DUPFD,
+-              F_DUPFD_CLOEXEC),
++              F_DUPFD_CLOEXEC
++#if defined(__powerpc64__)
++// On PPC64, F_SETLK, F_GETLK, F_SETLKW are defined as the 64-bit variants
++// but glibc will sometimes still use the 32-bit versions. Allow both.
++              ,
++              5, /* F_GETLK (32) */
++              6, /* F_SETLK (32) */
++              7  /* F_SETLKW (32) */
++#endif
++	     ),
+              Allow())
+       .Case(F_SETFL,
+             If((long_arg & ~kAllowedMask) == 0, Allow()).Else(CrashSIGSYS()))
+@@ -297,7 +322,7 @@ ResultExpr RestrictFcntlCommands() {
+   // clang-format on
+ }
+ 
+-#if defined(__i386__) || defined(__mips__)
++#if defined(__i386__) || defined(__mips__) || defined(__powerpc64__)
+ ResultExpr RestrictSocketcallCommand() {
+   // Unfortunately, we are unable to restrict the first parameter to
+   // socketpair(2). Whilst initially sounding bad, it's noteworthy that very
+@@ -454,7 +479,7 @@ ResultExpr RestrictPtrace() {
+ #endif
+   return Switch(request)
+       .CASES((
+-#if !defined(__aarch64__)
++#if !defined(__aarch64__) && !defined(__powerpc64__)
+                  PTRACE_GETREGS, PTRACE_GETFPREGS,
+ #if defined(TRACE_GET_THREAD_AREA)
+                  PTRACE_GET_THREAD_AREA,
+--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.h
++++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.h
+@@ -49,7 +49,7 @@ SANDBOX_EXPORT bpf_dsl::ResultExpr Restr
+ // O_NONBLOCK | O_SYNC | O_LARGEFILE | O_CLOEXEC | O_NOATIME.
+ SANDBOX_EXPORT bpf_dsl::ResultExpr RestrictFcntlCommands();
+ 
+-#if defined(__i386__) || defined(__mips__)
++#if defined(__i386__) || defined(__mips__) || defined(__powerpc64__)
+ // Restrict socketcall(2) to only allow socketpair(2), send(2), recv(2),
+ // sendto(2), recvfrom(2), shutdown(2), sendmsg(2) and recvmsg(2).
+ SANDBOX_EXPORT bpf_dsl::ResultExpr RestrictSocketcallCommand();
+--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
++++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
+@@ -28,7 +28,7 @@ bool SyscallSets::IsKill(int sysno) {
+ bool SyscallSets::IsAllowedGettime(int sysno) {
+   switch (sysno) {
+     case __NR_gettimeofday:
+-#if defined(__i386__) || defined(__x86_64__) || \
++#if defined(__i386__) || defined(__x86_64__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_time:
+ #endif
+@@ -51,12 +51,12 @@ bool SyscallSets::IsAllowedGettime(int s
+                                     // filtered by RestrictClockID().
+     case __NR_clock_nanosleep_time64:  // Parameters filtered by RestrictClockID().
+ #endif
+-#if defined(__i386__) || \
++#if defined(__i386__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_ftime:  // Obsolete.
+ #endif
+     case __NR_settimeofday:  // Privileged.
+-#if defined(__i386__) || \
++#if defined(__i386__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_stime:
+ #endif
+@@ -135,7 +135,7 @@ bool SyscallSets::IsFileSystem(int sysno
+     case __NR_faccessat:  // EPERM not a valid errno.
+     case __NR_fchmodat:
+     case __NR_fchownat:  // Should be called chownat ?
+-#if defined(__x86_64__) || defined(__aarch64__)
++#if defined(__x86_64__) || defined(__aarch64__) || defined(__powerpc64__)
+     case __NR_newfstatat:  // fstatat(). EPERM not a valid errno.
+ #elif defined(__i386__) || defined(__arm__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+@@ -154,7 +154,7 @@ bool SyscallSets::IsFileSystem(int sysno
+     case __NR_memfd_create:
+     case __NR_mkdirat:
+     case __NR_mknodat:
+-#if defined(__i386__)
++#if defined(__i386__) || defined(__powerpc64__)
+     case __NR_oldlstat:
+     case __NR_oldstat:
+ #endif
+@@ -167,7 +167,7 @@ bool SyscallSets::IsFileSystem(int sysno
+     case __NR_stat64:
+ #endif
+     case __NR_statfs:  // EPERM not a valid errno.
+-#if defined(__i386__) || defined(__arm__) || \
++#if defined(__i386__) || defined(__arm__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_statfs64:
+ #endif
+@@ -179,7 +179,8 @@ bool SyscallSets::IsFileSystem(int sysno
+     case __NR_truncate64:
+ #endif
+     case __NR_unlinkat:
+-#if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
++#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
++    defined(__powerpc64__)
+     case __NR_utime:
+ #endif
+     case __NR_utimensat:  // New.
+@@ -204,7 +205,8 @@ bool SyscallSets::IsAllowedFileSystemAcc
+ #endif
+       return true;
+ // TODO(jln): these should be denied gracefully as well (moved below).
+-#if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
++#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
++    defined(__powerpc64__)
+     case __NR_fadvise64:  // EPERM not a valid errno.
+ #endif
+ #if defined(__i386__)
+@@ -216,12 +218,12 @@ bool SyscallSets::IsAllowedFileSystemAcc
+     case __NR_fdatasync:  // EPERM not a valid errno.
+     case __NR_flock:      // EPERM not a valid errno.
+     case __NR_fstatfs:    // Give information about the whole filesystem.
+-#if defined(__i386__) || defined(__arm__) || \
++#if defined(__i386__) || defined(__arm__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_fstatfs64:
+ #endif
+     case __NR_fsync:  // EPERM not a valid errno.
+-#if defined(__i386__)
++#if defined(__i386__) || defined(__powerpc64__)
+     case __NR_oldfstat:
+ #endif
+ #if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
+@@ -229,6 +231,8 @@ bool SyscallSets::IsAllowedFileSystemAcc
+     case __NR_sync_file_range:  // EPERM not a valid errno.
+ #elif defined(__arm__)
+     case __NR_arm_sync_file_range:  // EPERM not a valid errno.
++#elif defined(__powerpc64__)
++    case __NR_sync_file_range2: // EPERM not a valid errno.
+ #endif
+     default:
+       return false;
+@@ -248,7 +252,7 @@ bool SyscallSets::IsDeniedFileSystemAcce
+     case __NR_getdents:    // EPERM not a valid errno.
+ #endif
+     case __NR_getdents64:  // EPERM not a valid errno.
+-#if defined(__i386__) || \
++#if defined(__i386__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_readdir:
+ #endif
+@@ -290,7 +294,7 @@ bool SyscallSets::IsGetSimpleId(int sysn
+ bool SyscallSets::IsProcessPrivilegeChange(int sysno) {
+   switch (sysno) {
+     case __NR_capset:
+-#if defined(__i386__) || defined(__x86_64__)
++#if defined(__i386__) || defined(__x86_64__) || defined(__powerpc64__)
+     case __NR_ioperm:  // Intel privilege.
+     case __NR_iopl:    // Intel privilege.
+ #endif
+@@ -340,7 +344,7 @@ bool SyscallSets::IsAllowedSignalHandlin
+     case __NR_rt_sigprocmask:
+     case __NR_rt_sigreturn:
+     case __NR_rt_sigtimedwait:
+-#if defined(__i386__) || defined(__arm__) || \
++#if defined(__i386__) || defined(__arm__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_rt_sigtimedwait_time64:
+     case __NR_sigaction:
+@@ -357,7 +361,7 @@ bool SyscallSets::IsAllowedSignalHandlin
+     case __NR_signalfd:
+ #endif
+     case __NR_signalfd4:
+-#if defined(__i386__) || defined(__arm__) || \
++#if defined(__i386__) || defined(__arm__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_sigpending:
+     case __NR_sigsuspend:
+@@ -382,7 +386,7 @@ bool SyscallSets::IsAllowedOperationOnFd
+ #endif
+     case __NR_dup3:
+ #if defined(__x86_64__) || defined(__arm__) || defined(__mips__) || \
+-    defined(__aarch64__)
++    defined(__aarch64__) || defined(__powerpc64__)
+     case __NR_shutdown:
+ #endif
+       return true;
+@@ -416,7 +420,7 @@ bool SyscallSets::IsAllowedProcessStartO
+     case __NR_membarrier:
+     case __NR_wait4:
+     case __NR_waitid:
+-#if defined(__i386__)
++#if defined(__i386__) || defined(__powerpc64__)
+     case __NR_waitpid:
+ #endif
+ #if !defined(__GLIBC__)
+@@ -438,7 +442,7 @@ bool SyscallSets::IsAllowedProcessStartO
+     case __NR_set_tid_address:
+ #endif
+     case __NR_unshare:
+-#if !defined(__mips__) && !defined(__aarch64__)
++#if !defined(__mips__) && !defined(__aarch64__) || defined(__powerpc64__)
+     case __NR_vfork:
+ #endif
+     default:
+@@ -491,7 +495,7 @@ bool SyscallSets::IsAllowedGetOrModifySo
+       return true;
+     default:
+ #if defined(__x86_64__) || defined(__arm__) || defined(__mips__) || \
+-    defined(__aarch64__)
++    defined(__aarch64__) || defined(__powerpc64__)
+     case __NR_socketpair:  // We will want to inspect its argument.
+ #endif
+       return false;
+@@ -501,7 +505,7 @@ bool SyscallSets::IsAllowedGetOrModifySo
+ bool SyscallSets::IsDeniedGetOrModifySocket(int sysno) {
+   switch (sysno) {
+ #if defined(__x86_64__) || defined(__arm__) || defined(__mips__) || \
+-    defined(__aarch64__)
++    defined(__aarch64__) || defined(__powerpc64__)
+     case __NR_accept:
+     case __NR_accept4:
+     case __NR_bind:
+@@ -515,7 +519,7 @@ bool SyscallSets::IsDeniedGetOrModifySoc
+   }
+ }
+ 
+-#if defined(__i386__) || \
++#if defined(__i386__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+ // Big multiplexing system call for sockets.
+ bool SyscallSets::IsSocketCall(int sysno) {
+@@ -530,7 +534,8 @@ bool SyscallSets::IsSocketCall(int sysno
+ }
+ #endif
+ 
+-#if defined(__x86_64__) || defined(__arm__) || defined(__mips__)
++#if defined(__x86_64__) || defined(__arm__) || defined(__mips__) || \
++    defined(__powerpc64__)
+ bool SyscallSets::IsNetworkSocketInformation(int sysno) {
+   switch (sysno) {
+     case __NR_getpeername:
+@@ -558,7 +563,7 @@ bool SyscallSets::IsAllowedAddressSpaceA
+     case __NR_mincore:
+     case __NR_mlockall:
+ #if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
+-    defined(__aarch64__)
++    defined(__aarch64__) || defined(__powerpc64__)
+     case __NR_mmap:
+ #endif
+ #if defined(__i386__) || defined(__arm__) || \
+@@ -589,7 +594,7 @@ bool SyscallSets::IsAllowedAddressSpaceA
+ bool SyscallSets::IsAllowedGeneralIo(int sysno) {
+   switch (sysno) {
+     case __NR_lseek:
+-#if defined(__i386__) || defined(__arm__) || \
++#if defined(__i386__) || defined(__arm__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR__llseek:
+ #endif
+@@ -609,27 +614,27 @@ bool SyscallSets::IsAllowedGeneralIo(int
+     case __NR_read:
+     case __NR_readv:
+     case __NR_pread64:
+-#if defined(__arm__) || \
++#if defined(__arm__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_recv:
+ #endif
+ #if defined(__x86_64__) || defined(__arm__) || defined(__mips__) || \
+-    defined(__aarch64__)
++    defined(__aarch64__) || defined(__powerpc64__)
+     case __NR_recvfrom:  // Could specify source.
+     case __NR_recvmsg:   // Could specify source.
+ #endif
+-#if defined(__i386__) || defined(__x86_64__)
++#if defined(__i386__) || defined(__x86_64__) || defined(__powerpc64__)
+     case __NR_select:
+ #endif
+-#if defined(__i386__) || defined(__arm__) || defined(__mips__)
++#if defined(__i386__) || defined(__arm__) || defined(__mips__) || defined(__powerpc64__)
+     case __NR__newselect:
+ #endif
+-#if defined(__arm__) || \
++#if defined(__arm__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_send:
+ #endif
+ #if defined(__x86_64__) || defined(__arm__) || defined(__mips__) || \
+-    defined(__aarch64__)
++    defined(__aarch64__) || defined(__powerpc64__)
+     case __NR_sendmsg:  // Could specify destination.
+     case __NR_sendto:   // Could specify destination.
+ #endif
+@@ -684,7 +689,7 @@ bool SyscallSets::IsAllowedBasicSchedule
+     case __NR_nanosleep:
+       return true;
+     case __NR_getpriority:
+-#if defined(__i386__) || defined(__arm__) || \
++#if defined(__i386__) || defined(__arm__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_nice:
+ #endif
+@@ -696,7 +701,7 @@ bool SyscallSets::IsAllowedBasicSchedule
+ 
+ bool SyscallSets::IsAdminOperation(int sysno) {
+   switch (sysno) {
+-#if defined(__i386__) || defined(__arm__) || \
++#if defined(__i386__) || defined(__arm__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_bdflush:
+ #endif
+@@ -713,7 +718,8 @@ bool SyscallSets::IsAdminOperation(int s
+ 
+ bool SyscallSets::IsKernelModule(int sysno) {
+   switch (sysno) {
+-#if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
++#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
++    defined(__powerpc64__)
+     case __NR_create_module:
+     case __NR_get_kernel_syms:  // Should ENOSYS.
+     case __NR_query_module:
+@@ -745,7 +751,7 @@ bool SyscallSets::IsFsControl(int sysno)
+     case __NR_quotactl:
+     case __NR_swapoff:
+     case __NR_swapon:
+-#if defined(__i386__) || \
++#if defined(__i386__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_umount:
+ #endif
+@@ -762,7 +768,7 @@ bool SyscallSets::IsNuma(int sysno) {
+     case __NR_getcpu:
+     case __NR_mbind:
+ #if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
+-    defined(__aarch64__)
++    defined(__aarch64__) || defined(__powerpc64__)
+     case __NR_migrate_pages:
+ #endif
+     case __NR_move_pages:
+@@ -797,13 +803,13 @@ bool SyscallSets::IsGlobalProcessEnviron
+   switch (sysno) {
+     case __NR_acct:  // Privileged.
+ #if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
+-    defined(__aarch64__)
++    defined(__aarch64__) || defined(__powerpc64__)
+     case __NR_getrlimit:
+ #endif
+-#if defined(__i386__) || defined(__arm__)
++#if defined(__i386__) || defined(__arm__) || defined(__powerpc64__)
+     case __NR_ugetrlimit:
+ #endif
+-#if defined(__i386__) || \
++#if defined(__i386__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_ulimit:
+ #endif
+@@ -838,7 +844,7 @@ bool SyscallSets::IsGlobalSystemStatus(i
+ #endif
+     case __NR_sysinfo:
+     case __NR_uname:
+-#if defined(__i386__)
++#if defined(__i386__) || defined(__powerpc64__)
+     case __NR_olduname:
+     case __NR_oldolduname:
+ #endif
+@@ -904,8 +910,16 @@ bool SyscallSets::IsSystemVSemaphores(in
+ }
+ #endif
+ 
++/* shitty hack around Void's 4.19 kernel headers missing those numbers */
++#if defined(__powerpc64__) && !defined(__NR_shmget)
++#define __NR_shmget 395
++#define __NR_shmctl 396
++#define __NR_shmat 397
++#define __NR_shmdt 398
++#endif
++
+ #if defined(__i386__) || defined(__x86_64__) || defined(__arm__) || \
+-    defined(__aarch64__) ||                                         \
++    defined(__aarch64__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_64_BITS))
+ // These give a lot of ambient authority and bypass the setuid sandbox.
+ bool SyscallSets::IsSystemVSharedMemory(int sysno) {
+@@ -936,7 +950,7 @@ bool SyscallSets::IsSystemVMessageQueue(
+ }
+ #endif
+ 
+-#if defined(__i386__) || \
++#if defined(__i386__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+ // Big system V multiplexing system call.
+ bool SyscallSets::IsSystemVIpc(int sysno) {
+@@ -956,7 +970,7 @@ bool SyscallSets::IsAnySystemV(int sysno
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_64_BITS))
+   return IsSystemVMessageQueue(sysno) || IsSystemVSemaphores(sysno) ||
+          IsSystemVSharedMemory(sysno);
+-#elif defined(__i386__) || \
++#elif defined(__i386__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+   return IsSystemVIpc(sysno);
+ #endif
+@@ -1014,7 +1028,8 @@ bool SyscallSets::IsFaNotify(int sysno)
+ bool SyscallSets::IsTimer(int sysno) {
+   switch (sysno) {
+     case __NR_getitimer:
+-#if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
++#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
++    defined(__powerpc64__)
+     case __NR_alarm:
+ #endif
+     case __NR_setitimer:
+@@ -1096,17 +1111,20 @@ bool SyscallSets::IsMisc(int sysno) {
+     case __NR_syncfs:
+     case __NR_vhangup:
+ // The system calls below are not implemented.
+-#if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
++#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
++    defined(__powerpc64__)
+     case __NR_afs_syscall:
+ #endif
+ #if defined(__i386__) || \
+-    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
++    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
++    defined(__powerpc64__)
+     case __NR_break:
+ #endif
+-#if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
++#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
++    defined(__powerpc64__)
+     case __NR_getpmsg:
+ #endif
+-#if defined(__i386__) || \
++#if defined(__i386__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_gtty:
+     case __NR_idle:
+@@ -1115,20 +1133,21 @@ bool SyscallSets::IsMisc(int sysno) {
+     case __NR_prof:
+     case __NR_profil:
+ #endif
+-#if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
++#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
++    defined(__powerpc64__)
+     case __NR_putpmsg:
+ #endif
+ #if defined(__x86_64__)
+     case __NR_security:
+ #endif
+-#if defined(__i386__) || \
++#if defined(__i386__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_stty:
+ #endif
+-#if defined(__x86_64__)
++#if defined(__x86_64__) || defined(__powerpc64__)
+     case __NR_tuxcall:
+ #endif
+-#if !defined(__aarch64__)
++#if !defined(__aarch64__) && !defined(__powerpc64__)
+     case __NR_vserver:
+ #endif
+       return true;
+--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_sets.h
++++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_sets.h
+@@ -43,13 +43,14 @@ class SANDBOX_EXPORT SyscallSets {
+   static bool IsDeniedGetOrModifySocket(int sysno);
+ 
+ #if defined(__i386__) || \
+-    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
++    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
++    defined(__powerpc64__)
+   // Big multiplexing system call for sockets.
+   static bool IsSocketCall(int sysno);
+ #endif
+ 
+ #if defined(__x86_64__) || defined(__arm__) || defined(__mips__) || \
+-    defined(__aarch64__)
++    defined(__aarch64__) || defined(__powerpc64__)
+   static bool IsNetworkSocketInformation(int sysno);
+ #endif
+ 
+@@ -77,7 +78,7 @@ class SANDBOX_EXPORT SyscallSets {
+   static bool IsSystemVSemaphores(int sysno);
+ #endif
+ #if defined(__i386__) || defined(__x86_64__) || defined(__arm__) || \
+-    defined(__aarch64__) ||                                         \
++    defined(__aarch64__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_64_BITS))
+   // These give a lot of ambient authority and bypass the setuid sandbox.
+   static bool IsSystemVSharedMemory(int sysno);
+@@ -89,7 +90,8 @@ class SANDBOX_EXPORT SyscallSets {
+ #endif
+ 
+ #if defined(__i386__) || \
+-    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
++    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
++    defined(__powerpc64__)
+   // Big system V multiplexing system call.
+   static bool IsSystemVIpc(int sysno);
+ #endif
+--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf/syscall.cc
++++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf/syscall.cc
+@@ -18,7 +18,7 @@ namespace sandbox {
+ namespace {
+ 
+ #if defined(ARCH_CPU_X86_FAMILY) || defined(ARCH_CPU_ARM_FAMILY) || \
+-    defined(ARCH_CPU_MIPS_FAMILY)
++    defined(ARCH_CPU_MIPS_FAMILY) || defined (ARCH_CPU_PPC64_FAMILY)
+ // Number that's not currently used by any Linux kernel ABIs.
+ const int kInvalidSyscallNumber = 0x351d3;
+ #else
+@@ -312,10 +312,54 @@ asm(// We need to be able to tell the ke
+     "2:ret\n"
+     ".cfi_endproc\n"
+     ".size SyscallAsm, .-SyscallAsm\n"
++#elif defined(__powerpc64__)
++    ".text\n"
++    ".align 4\n"
++    ".type SyscallAsm @function\n"
++    "SyscallAsm:\n"
++    ".cfi_startproc\n"
++
++    // Check if r3 is negative
++    "cmpdi 3, 0\n"
++    "bgt 2f\n"
++
++    // Load address of 3f into r3 and return
++    "mflr 10\n"
++    "bl 1f\n"
++    "1: mflr 3\n"
++    "mtlr 10\n"
++    "addi 3, 3, 4*13\n"
++    "blr\n"
++
++    // Load arguments from array into r3-8
++    // save param 3 in r10
++    "2:\n"
++    "mr 0, 3\n"
++    "ld 3, 0(4)\n"
++    "ld 5, 16(4)\n"
++    "ld 6, 24(4)\n"
++    "ld 7, 32(4)\n"
++    "ld 8, 40(4)\n"
++    "ld 4, 8(4)\n"
++    "li 9, 0\n"
++
++    // Enter kernel
++    "sc\n"
++
++    // Magic return address
++    "3:\n"
++    // Like MIPS, ppc64 return values are always positive.
++    // Check for error in cr0.SO and negate upon error
++    "bc 4, 3, 4f\n"
++    "neg 3, 3\n"
++    "4: blr\n"
++
++    ".cfi_endproc\n"
++    ".size SyscallAsm, .-SyscallAsm\n"
+ #endif
+     );  // asm
+ 
+-#if defined(__x86_64__)
++#if defined(__x86_64__) || defined(__powerpc64__)
+ extern "C" {
+ intptr_t SyscallAsm(intptr_t nr, const intptr_t args[6]);
+ }
+@@ -429,6 +473,8 @@ intptr_t Syscall::Call(int nr,
+     ret = inout;
+   }
+ 
++#elif defined(__powerpc64__)
++  intptr_t ret = SyscallAsm(nr, args);
+ #else
+ #error "Unimplemented architecture"
+ #endif
+@@ -445,8 +491,26 @@ void Syscall::PutValueInUcontext(intptr_
+     // needs to be changed back.
+     ret_val = -ret_val;
+     SECCOMP_PARM4(ctx) = 1;
+-  } else
++  } else {
+     SECCOMP_PARM4(ctx) = 0;
++  }
++#endif
++#if defined(__powerpc64__)
++  // Same as MIPS, need to invert ret and set error register (cr0.SO)
++  if (ret_val <= -1 && ret_val >= -4095) {
++    ret_val = -ret_val;
++#ifdef __GLIBC__
++    ctx->uc_mcontext.regs->ccr |= (1 << 28);
++#else
++    ((struct pt_regs *)ctx->uc_mcontext.regs)->ccr |= (1 << 28);
++#endif
++  } else {
++#ifdef __GLIBC__
++    ctx->uc_mcontext.regs->ccr &= ~(1 << 28);
++#else
++    ((struct pt_regs *)ctx->uc_mcontext.regs)->ccr &= ~(1 << 28);
++#endif
++  }
+ #endif
+   SECCOMP_RESULT(ctx) = static_cast<greg_t>(ret_val);
+ }
+--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf/trap.cc
++++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf/trap.cc
+@@ -236,6 +236,20 @@ void Trap::SigSys(int nr, LinuxSigInfo*
+       SetIsInSigHandler();
+     }
+ 
++#if defined(__powerpc64__)
++    // On ppc64+glibc, some syscalls seem to accidentally negate the first
++    // parameter which causes checks against it to fail. For now, manually
++    // negate them back.
++    // TODO(shawn@anastas.io): investigate this issue further
++    auto nr = SECCOMP_SYSCALL(ctx);
++    if (nr == __NR_openat || nr == __NR_mkdirat || nr == __NR_faccessat || nr == __NR_readlinkat ||
++        nr == __NR_renameat || nr == __NR_renameat2 || nr == __NR_newfstatat || nr == __NR_unlinkat) {
++        if (static_cast<int>(SECCOMP_PARM1(ctx)) > 0) {
++            SECCOMP_PARM1(ctx) = -SECCOMP_PARM1(ctx);
++        }
++    }
++#endif
++
+     // Copy the seccomp-specific data into a arch_seccomp_data structure. This
+     // is what we are showing to TrapFnc callbacks that the system call
+     // evaluator registered with the sandbox.
+--- a/src/3rdparty/chromium/sandbox/linux/services/credentials.cc
++++ b/src/3rdparty/chromium/sandbox/linux/services/credentials.cc
+@@ -81,7 +81,7 @@ bool ChrootToSafeEmptyDir() {
+   pid_t pid = -1;
+   alignas(16) char stack_buf[PTHREAD_STACK_MIN];
+ #if defined(ARCH_CPU_X86_FAMILY) || defined(ARCH_CPU_ARM_FAMILY) || \
+-    defined(ARCH_CPU_MIPS_FAMILY)
++    defined(ARCH_CPU_MIPS_FAMILY) || defined(ARCH_CPU_PPC64_FAMILY)
+   // The stack grows downward.
+   void* stack = stack_buf + sizeof(stack_buf);
+ #else
+--- a/src/3rdparty/chromium/sandbox/linux/services/syscall_wrappers.cc
++++ b/src/3rdparty/chromium/sandbox/linux/services/syscall_wrappers.cc
+@@ -61,7 +61,7 @@ long sys_clone(unsigned long flags,
+ #if defined(ARCH_CPU_X86_64)
+   return syscall(__NR_clone, flags, child_stack, ptid, ctid, tls);
+ #elif defined(ARCH_CPU_X86) || defined(ARCH_CPU_ARM_FAMILY) || \
+-    defined(ARCH_CPU_MIPS_FAMILY)
++    defined(ARCH_CPU_MIPS_FAMILY) || defined(ARCH_CPU_PPC64_FAMILY)
+   // CONFIG_CLONE_BACKWARDS defined.
+   return syscall(__NR_clone, flags, child_stack, ptid, tls, ctid);
+ #endif
+--- a/src/3rdparty/chromium/sandbox/linux/syscall_broker/broker_process.cc
++++ b/src/3rdparty/chromium/sandbox/linux/syscall_broker/broker_process.cc
+@@ -165,7 +165,7 @@ bool BrokerProcess::IsSyscallBrokerable(
+ #if defined(__NR_fstatat64)
+     case __NR_fstatat64:
+ #endif
+-#if defined(__x86_64__) || defined(__aarch64__)
++#if defined(__x86_64__) || defined(__aarch64__) || defined(__powerpc64__)
+     case __NR_newfstatat:
+ #endif
+       return !fast_check || allowed_command_set_.test(COMMAND_STAT);
+--- a/src/3rdparty/chromium/sandbox/linux/system_headers/linux_seccomp.h
++++ b/src/3rdparty/chromium/sandbox/linux/system_headers/linux_seccomp.h
+@@ -41,6 +41,9 @@
+ #ifndef EM_AARCH64
+ #define EM_AARCH64 183
+ #endif
++#ifndef EM_PPC64
++#define EM_PPC64 21
++#endif
+ 
+ #ifndef __AUDIT_ARCH_64BIT
+ #define __AUDIT_ARCH_64BIT 0x80000000
+@@ -74,6 +77,14 @@
+ #define AUDIT_ARCH_AARCH64 (EM_AARCH64 | __AUDIT_ARCH_64BIT | __AUDIT_ARCH_LE)
+ #endif
+ 
++#ifndef AUDIT_ARCH_PPC64
++#define AUDIT_ARCH_PPC64 (EM_PPC64 | __AUDIT_ARCH_64BIT)
++#endif
++
++#ifndef AUDIT_ARCH_PPC64LE
++#define AUDIT_ARCH_PPC64LE (EM_PPC64 | __AUDIT_ARCH_64BIT | __AUDIT_ARCH_LE)
++#endif
++
+ // For prctl.h
+ #ifndef PR_SET_SECCOMP
+ #define PR_SET_SECCOMP               22
+--- a/src/3rdparty/chromium/sandbox/linux/system_headers/linux_signal.h
++++ b/src/3rdparty/chromium/sandbox/linux/system_headers/linux_signal.h
+@@ -13,7 +13,7 @@
+ // (not undefined, but defined different values and in different memory
+ // layouts). So, fill the gap here.
+ #if defined(__i386__) || defined(__x86_64__) || defined(__arm__) || \
+-    defined(__aarch64__)
++    defined(__aarch64__) || defined(__powerpc64__)
+ 
+ #define LINUX_SIGHUP 1
+ #define LINUX_SIGINT 2
+--- a/src/3rdparty/chromium/sandbox/linux/system_headers/linux_syscalls.h
++++ b/src/3rdparty/chromium/sandbox/linux/system_headers/linux_syscalls.h
+@@ -35,5 +35,9 @@
+ #include "sandbox/linux/system_headers/arm64_linux_syscalls.h"
+ #endif
+ 
++#if defined(__powerpc64__)
++#include "sandbox/linux/system_headers/ppc64_linux_syscalls.h"
++#endif
++
+ #endif  // SANDBOX_LINUX_SYSTEM_HEADERS_LINUX_SYSCALLS_H_
+ 
+--- a/src/3rdparty/chromium/sandbox/linux/system_headers/linux_ucontext.h
++++ b/src/3rdparty/chromium/sandbox/linux/system_headers/linux_ucontext.h
+@@ -11,6 +11,8 @@
+ #include "sandbox/linux/system_headers/arm_linux_ucontext.h"
+ #elif defined(__i386__)
+ #include "sandbox/linux/system_headers/i386_linux_ucontext.h"
++#elif defined(__powerpc64__)
++#include "sandbox/linux/system_headers/ppc64_linux_ucontext.h"
+ #else
+ #error "No support for your architecture in PNaCl header"
+ #endif
+--- a/src/3rdparty/chromium/sandbox/policy/linux/bpf_renderer_policy_linux.cc
++++ b/src/3rdparty/chromium/sandbox/policy/linux/bpf_renderer_policy_linux.cc
+@@ -15,6 +15,11 @@
+ #include "sandbox/linux/system_headers/linux_syscalls.h"
+ #include "sandbox/policy/linux/sandbox_linux.h"
+ 
++// On PPC64, TCGETS is defined in terms of struct termios, so we must include termios.h
++#ifdef __powerpc64__
++#include <termios.h>
++#endif
++
+ // TODO(vignatti): replace the local definitions below with #include
+ // <linux/dma-buf.h> once kernel version 4.6 becomes widely used.
+ #include <linux/types.h>
+--- a/src/3rdparty/chromium/third_party/angle/src/compiler/translator/InfoSink.h
++++ b/src/3rdparty/chromium/third_party/angle/src/compiler/translator/InfoSink.h
+@@ -93,7 +93,16 @@ class TInfoSinkBase
+             stream.precision(8);
+             stream << f;
+         }
+-        sink.append(stream.str());
++
++        // Hack to work around a bug where negative floating point values
++        // are rendered like '.0.5' instead of '-0.5'
++        std::string res(stream.str());
++
++        if (signbit(f)) { // test if f is negative
++            res[0] = '-';
++        }
++
++        sink.append(res);
+         return *this;
+     }
+     // Write boolean values as their names instead of integral value.
+--- a/src/3rdparty/chromium/third_party/angle/src/libANGLE/Constants.h
++++ b/src/3rdparty/chromium/third_party/angle/src/libANGLE/Constants.h
+@@ -9,6 +9,7 @@
+ #ifndef LIBANGLE_CONSTANTS_H_
+ #define LIBANGLE_CONSTANTS_H_
+ 
++#include <cstddef>
+ #include "common/platform.h"
+ 
+ #include <stdint.h>
+--- a/src/3rdparty/chromium/third_party/boringssl/BUILD.gn
++++ b/src/3rdparty/chromium/third_party/boringssl/BUILD.gn
+@@ -99,6 +99,13 @@ if (is_win && !is_msan && current_cpu !=
+       } else {
+         public_configs = [ ":no_asm_config" ]
+       }
++    } else if (current_cpu == "ppc64") {
++      if (is_linux) {
++        # TODO: ppc64 (be) check
++        sources += crypto_sources_linux_ppc64le
++      } else {
++        public_configs = [ ":no_asm_config" ]
++      }
+     } else {
+       public_configs = [ ":no_asm_config" ]
+     }
+--- a/src/3rdparty/chromium/third_party/breakpad/BUILD.gn
++++ b/src/3rdparty/chromium/third_party/breakpad/BUILD.gn
+@@ -623,7 +623,6 @@ if (is_linux || is_chromeos || is_androi
+       "breakpad/src/client/minidump_file_writer.h",
+       "breakpad/src/common/convert_UTF.cc",
+       "breakpad/src/common/convert_UTF.h",
+-      "breakpad/src/common/linux/breakpad_getcontext.S",
+       "breakpad/src/common/linux/elf_core_dump.cc",
+       "breakpad/src/common/linux/elf_core_dump.h",
+       "breakpad/src/common/linux/elfutils.cc",
+@@ -663,6 +662,15 @@ if (is_linux || is_chromeos || is_androi
+ 
+     libs = [ "dl" ]
+ 
++    if (current_cpu == "ppc64") {
++        defines = [ "HAVE_GETCONTEXT" ]
++        libs += [ "ucontext" ]
++    } else {
++        sources += [
++            "breakpad/src/common/linux/breakpad_getcontext.S"
++        ]
++    }
++
+     include_dirs = [
+       ".",
+       "breakpad/src",
+@@ -712,7 +720,6 @@ if (is_linux || is_chromeos || is_androi
+       "breakpad/src/client/linux/minidump_writer/minidump_writer_unittest.cc",
+       "breakpad/src/client/linux/minidump_writer/minidump_writer_unittest_utils.cc",
+       "breakpad/src/client/linux/minidump_writer/proc_cpuinfo_reader_unittest.cc",
+-      "breakpad/src/common/linux/breakpad_getcontext_unittest.cc",
+       "breakpad/src/common/linux/elf_core_dump_unittest.cc",
+       "breakpad/src/common/linux/file_id_unittest.cc",
+       "breakpad/src/common/linux/linux_libc_support_unittest.cc",
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/raw_context_cpu.h
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/raw_context_cpu.h
+@@ -44,6 +44,8 @@ typedef MDRawContextARM RawContextCPU;
+ typedef MDRawContextARM64_Old RawContextCPU;
+ #elif defined(__mips__)
+ typedef MDRawContextMIPS RawContextCPU;
++#elif defined(__powerpc64__)
++typedef MDRawContextPPC64 RawContextCPU;
+ #else
+ #error "This code has not been ported to your platform yet."
+ #endif
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.cc
+@@ -270,7 +270,54 @@ void ThreadInfo::FillCPUContext(RawConte
+   out->float_save.fir = mcontext.fpc_eir;
+ #endif
+ }
+-#endif  // __mips__
++
++#elif defined(__powerpc64__)
++
++#if !defined(__GLIBC__)
++#include <asm/elf.h>
++#include <asm/ptrace.h>
++#endif
++
++uintptr_t ThreadInfo::GetInstructionPointer() const {
++    return mcontext.gp_regs[PT_NIP];
++}
++
++void ThreadInfo::FillCPUContext(RawContextCPU* out) const {
++    out->context_flags = MD_CONTEXT_PPC64_FULL;
++    for (int i = 0; i < MD_CONTEXT_PPC64_GPR_COUNT; i++)
++        out->gpr[i] = mcontext.gp_regs[i];
++
++    out->lr = mcontext.gp_regs[PT_LNK];
++    out->srr0 = mcontext.gp_regs[PT_NIP];
++    out->srr1 = mcontext.gp_regs[PT_MSR];
++    out->cr = mcontext.gp_regs[PT_CCR];
++    out->xer = mcontext.gp_regs[PT_XER];
++    out->ctr = mcontext.gp_regs[PT_CTR];
++
++#ifdef __GLIBC__
++    for (int i = 0; i < MD_FLOATINGSAVEAREA_PPC_FPR_COUNT; i++)
++        out->float_save.fpregs[i] = mcontext.fp_regs[i];
++
++    out->float_save.fpscr = mcontext.fp_regs[NFPREG-1];
++#else
++    for (int i = 0; i < MD_FLOATINGSAVEAREA_PPC_FPR_COUNT; i++)
++        out->float_save.fpregs[i] = ((uint64_t *)&mcontext.fp_regs)[i];
++
++     out->float_save.fpscr = ((uint64_t *)&mcontext.fp_regs)[ELF_NFPREG-1];
++#endif
++
++    for (int i = 0; i < MD_VECTORSAVEAREA_PPC_VR_COUNT; i++)
++        out->vector_save.save_vr[i] = \
++            {(((uint64_t)vregs.vrregs[i][0]) << 32)
++                          | vregs.vrregs[i][1],
++            (((uint64_t)vregs.vrregs[i][2]) << 32)
++                         | vregs.vrregs[i][3]};
++
++    out->vrsave = vregs.vrsave;
++    out->vector_save.save_vscr = {0, vregs.vscr.vscr_word};
++    out->vector_save.save_vrvalid = 0xFFFFFFFF;
++}
++#endif  // __powerpc64__
+ 
+ void ThreadInfo::GetGeneralPurposeRegisters(void** gp_regs, size_t* size) {
+   assert(gp_regs || size);
+@@ -279,6 +326,11 @@ void ThreadInfo::GetGeneralPurposeRegist
+     *gp_regs = mcontext.gregs;
+   if (size)
+     *size = sizeof(mcontext.gregs);
++#elif defined(__powerpc64__)
++  if (gp_regs)
++    *gp_regs = mcontext.gp_regs;
++  if (size)
++    *size = sizeof(mcontext.gp_regs);
+ #else
+   if (gp_regs)
+     *gp_regs = &regs;
+@@ -294,6 +346,11 @@ void ThreadInfo::GetFloatingPointRegiste
+     *fp_regs = &mcontext.fpregs;
+   if (size)
+     *size = sizeof(mcontext.fpregs);
++#elif defined(__powerpc64__)
++  if (fp_regs)
++    *fp_regs = &mcontext.fp_regs;
++  if (size)
++    *size = sizeof(mcontext.fp_regs);
+ #else
+   if (fp_regs)
+     *fp_regs = &fpregs;
+@@ -302,4 +359,13 @@ void ThreadInfo::GetFloatingPointRegiste
+ #endif
+ }
+ 
++#if defined(__powerpc64__)
++void ThreadInfo::GetVectorRegisters(void** v_regs, size_t* size) {
++    if (v_regs)
++        *v_regs = &vregs;
++    if (size)
++        *size = sizeof(vregs);
++}
++#endif
++
+ }  // namespace google_breakpad
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.h
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.h
+@@ -68,6 +68,10 @@ struct ThreadInfo {
+   // Use the structures defined in <sys/user.h>
+   struct user_regs_struct regs;
+   struct user_fpsimd_struct fpregs;
++#elif defined(__powerpc64__)
++  // Use the structures defined in <sys/ucontext.h>.
++  mcontext_t mcontext;
++  vrregset_t vregs;
+ #elif defined(__mips__)
+   // Use the structure defined in <sys/ucontext.h>.
+   mcontext_t mcontext;
+@@ -84,6 +88,11 @@ struct ThreadInfo {
+ 
+   // Returns the pointer and size of float point register area.
+   void GetFloatingPointRegisters(void** fp_regs, size_t* size);
++
++#if defined(__powerpc64__)
++  // Returns the pointer and size of the vector register area. (PPC64 only)
++  void GetVectorRegisters(void** v_regs, size_t* size);
++#endif
+ };
+ 
+ }  // namespace google_breakpad
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc
+@@ -254,6 +254,60 @@ void UContextReader::FillCPUContext(RawC
+   out->float_save.fir = uc->uc_mcontext.fpc_eir;  // Unused.
+ #endif
+ }
++
++#elif defined(__powerpc64__)
++
++#ifndef __GLIBC__
++#include <asm/elf.h>
++#include <asm/ptrace.h>
++#endif
++
++uintptr_t UContextReader::GetStackPointer(const ucontext_t* uc) {
++    return uc->uc_mcontext.gp_regs[MD_CONTEXT_PPC64_REG_SP];
++}
++
++uintptr_t UContextReader::GetInstructionPointer(const ucontext_t* uc) {
++    return uc->uc_mcontext.gp_regs[PT_NIP];
++}
++
++void UContextReader::FillCPUContext(RawContextCPU* out, const ucontext_t* uc,
++                                    const vrregset_t* vregs) {
++    out->context_flags = MD_CONTEXT_PPC64_FULL;
++
++    for (int i = 0; i < MD_CONTEXT_PPC64_GPR_COUNT; i++)
++        out->gpr[i] = uc->uc_mcontext.gp_regs[i];
++
++    out->lr = uc->uc_mcontext.gp_regs[PT_LNK];
++    out->srr0 = uc->uc_mcontext.gp_regs[PT_NIP];
++    out->srr1 = uc->uc_mcontext.gp_regs[PT_MSR];
++    out->cr = uc->uc_mcontext.gp_regs[PT_CCR];
++    out->xer = uc->uc_mcontext.gp_regs[PT_XER];
++    out->ctr = uc->uc_mcontext.gp_regs[PT_CTR];
++
++#ifdef __GLIBC__
++    for (int i = 0; i < MD_FLOATINGSAVEAREA_PPC_FPR_COUNT; i++)
++        out->float_save.fpregs[i] = uc->uc_mcontext.fp_regs[i];
++
++    out->float_save.fpscr = uc->uc_mcontext.fp_regs[NFPREG-1];
++#else
++    for (int i = 0; i < MD_FLOATINGSAVEAREA_PPC_FPR_COUNT; i++)
++        out->float_save.fpregs[i] = ((uint64_t *)&uc->uc_mcontext.fp_regs)[i];
++
++    out->float_save.fpscr = ((uint64_t *)&uc->uc_mcontext.fp_regs)[ELF_NFPREG-1];
++#endif
++
++    for (int i = 0; i < MD_VECTORSAVEAREA_PPC_VR_COUNT; i++)
++        out->vector_save.save_vr[i] =
++            {(((uint64_t)vregs->vrregs[i][0]) << 32)
++                         | vregs->vrregs[i][1],
++             (((uint64_t)vregs->vrregs[i][2]) << 32)
++                         | vregs->vrregs[i][3]};
++
++    out->vrsave = vregs->vrsave;
++    out->vector_save.save_vscr = {0, vregs->vscr.vscr_word};
++    out->vector_save.save_vrvalid = 0xFFFFFFFF;
++}
++
+ #endif
+ 
+ }  // namespace google_breakpad
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h
+@@ -59,6 +59,9 @@ struct UContextReader {
+ #elif defined(__aarch64__)
+   static void FillCPUContext(RawContextCPU* out, const ucontext_t* uc,
+                              const struct fpsimd_context* fpregs);
++#elif defined(__powerpc64__)
++  static void FillCPUContext(RawContextCPU *out, const ucontext_t *uc,
++                             const vrregset_t* vregs);
+ #else
+   static void FillCPUContext(RawContextCPU* out, const ucontext_t* uc);
+ #endif
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc
+@@ -105,6 +105,13 @@
+ #define PR_SET_PTRACER 0x59616d61
+ #endif
+ 
++/* musl hack, can't include asm/ptrace.h as that causes conflicts */
++#ifndef __GLIBC__
++#if defined(__powerpc64__) && !defined(PT_NIP)
++#define PT_NIP 32
++#endif
++#endif
++
+ namespace google_breakpad {
+ 
+ namespace {
+@@ -461,9 +468,16 @@ bool ExceptionHandler::HandleSignal(int
+     memcpy(&g_crash_context_.float_state, fp_ptr,
+            sizeof(g_crash_context_.float_state));
+   }
++#elif defined(__powerpc64__)
++  // On PPC64, we must copy VR state
++  ucontext_t* uc_ptr = (ucontext_t*)uc;
++  if (uc_ptr->uc_mcontext.v_regs) {
++    memcpy(&g_crash_context_.vector_state, uc_ptr->uc_mcontext.v_regs,
++           sizeof(g_crash_context_.vector_state));
++  }
+ #elif !defined(__ARM_EABI__) && !defined(__mips__)
+   // FP state is not part of user ABI on ARM Linux.
+-  // In case of MIPS Linux FP state is already part of ucontext_t
++  // In case of MIPS, Linux FP state is already part of ucontext_t
+   // and 'float_state' is not a member of CrashContext.
+   ucontext_t* uc_ptr = (ucontext_t*)uc;
+   if (uc_ptr->uc_mcontext.fpregs) {
+@@ -708,11 +722,19 @@ bool ExceptionHandler::WriteMinidump() {
+   }
+ #endif
+ 
+-#if !defined(__ARM_EABI__) && !defined(__aarch64__) && !defined(__mips__)
++#if !defined(__ARM_EABI__) && !defined(__aarch64__) && !defined(__mips__) \
++    && !defined(__powerpc64__)
+   // FPU state is not part of ARM EABI ucontext_t.
+   memcpy(&context.float_state, context.context.uc_mcontext.fpregs,
+          sizeof(context.float_state));
+ #endif
++
++#if defined(__powerpc64__)
++  // Vector registers must be copied on PPC64
++  memcpy(&context.vector_state, context.context.uc_mcontext.v_regs,
++         sizeof(context.vector_state));
++#endif
++
+   context.tid = sys_gettid();
+ 
+   // Add an exception stream to the minidump for better reporting.
+@@ -733,6 +755,9 @@ bool ExceptionHandler::WriteMinidump() {
+ #elif defined(__mips__)
+   context.siginfo.si_addr =
+       reinterpret_cast<void*>(context.context.uc_mcontext.pc);
++#elif defined(__powerpc64__)
++  context.siginfo.si_addr =
++      reinterpret_cast<void*>(context.context.uc_mcontext.gp_regs[PT_NIP]);
+ #else
+ #error "This code has not been ported to your platform yet."
+ #endif
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.h
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.h
+@@ -192,7 +192,11 @@ class ExceptionHandler {
+     siginfo_t siginfo;
+     pid_t tid;  // the crashing thread.
+     ucontext_t context;
+-#if !defined(__ARM_EABI__) && !defined(__mips__)
++#if defined(__powerpc64__)
++    // PPC64's FP state is a part of ucontext_t like MIPS but the vector
++    // state is not, so a struct is needed.
++    vstate_t vector_state;
++#elif !defined(__ARM_EABI__) && !defined(__mips__)
+     // #ifdef this out because FP state is not part of user ABI for Linux ARM.
+     // In case of MIPS Linux FP state is already part of ucontext_t so
+     // 'float_state' is not required.
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler_unittest.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler_unittest.cc
+@@ -307,7 +307,7 @@ TEST(ExceptionHandlerTest, ParallelChild
+   }
+ 
+   // Wait a while until the child should have crashed.
+-  usleep(1000000);
++  usleep(2000000);
+   // Kill the child if it is still running.
+   kill(child, SIGKILL);
+ 
+@@ -559,6 +559,8 @@ const unsigned char kIllegalInstruction[
+ #if defined(__mips__)
+   // mfc2 zero,Impl - usually illegal in userspace.
+   0x48, 0x00, 0x00, 0x48
++#elif defined(__powerpc64__)
++  0x01, 0x01, 0x01, 0x01 // Crashes on a tested POWER9 cpu
+ #else
+   // This crashes with SIGILL on x86/x86-64/arm.
+   0xff, 0xff, 0xff, 0xff
+@@ -754,10 +756,10 @@ TEST(ExceptionHandlerTest, InstructionPo
+ 
+   // These are defined here so the parent can use them to check the
+   // data from the minidump afterwards.
+-  // Use 4k here because the OS will hand out a single page even
++  // Use the page size here because the OS will hand out a single page even
+   // if a smaller size is requested, and this test wants to
+   // test the upper bound of the memory range.
+-  const uint32_t kMemorySize = 4096;  // bytes
++  const uint32_t kMemorySize = getpagesize();  // bytes
+   const int kOffset = kMemorySize - sizeof(kIllegalInstruction);
+ 
+   const pid_t child = fork();
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/microdump_writer/microdump_writer.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/microdump_writer/microdump_writer.cc
+@@ -138,7 +138,9 @@ class MicrodumpWriter {
+                   const MicrodumpExtraInfo& microdump_extra_info,
+                   LinuxDumper* dumper)
+       : ucontext_(context ? &context->context : NULL),
+-#if !defined(__ARM_EABI__) && !defined(__mips__)
++#if defined(__powerpc64__)
++        vector_state_(context ? &context->vector_state : NULL),
++#elif !defined(__ARM_EABI__) && !defined(__mips__)
+         float_state_(context ? &context->float_state : NULL),
+ #endif
+         dumper_(dumper),
+@@ -337,6 +339,8 @@ class MicrodumpWriter {
+ # else
+ #  error "This mips ABI is currently not supported (n32)"
+ #endif
++#elif defined(__powerpc64__)
++    const char kArch[] = "ppc64";
+ #else
+ #error "This code has not been ported to your platform yet"
+ #endif
+@@ -409,7 +413,9 @@ class MicrodumpWriter {
+   void DumpCPUState() {
+     RawContextCPU cpu;
+     my_memset(&cpu, 0, sizeof(RawContextCPU));
+-#if !defined(__ARM_EABI__) && !defined(__mips__)
++#if defined(__powerpc64__)
++    UContextReader::FillCPUContext(&cpu, ucontext_, vector_state_);
++#elif !defined(__ARM_EABI__) && !defined(__mips__)
+     UContextReader::FillCPUContext(&cpu, ucontext_, float_state_);
+ #else
+     UContextReader::FillCPUContext(&cpu, ucontext_);
+@@ -605,7 +611,9 @@ class MicrodumpWriter {
+   void* Alloc(unsigned bytes) { return dumper_->allocator()->Alloc(bytes); }
+ 
+   const ucontext_t* const ucontext_;
+-#if !defined(__ARM_EABI__) && !defined(__mips__)
++#if defined(__powerpc64__)
++  const google_breakpad::vstate_t* const vector_state_;
++#elif !defined(__ARM_EABI__) && !defined(__mips__)
+   const google_breakpad::fpstate_t* const float_state_;
+ #endif
+   LinuxDumper* dumper_;
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/microdump_writer/microdump_writer_unittest.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/microdump_writer/microdump_writer_unittest.cc
+@@ -279,10 +279,19 @@ TEST(MicrodumpWriterTest, BasicWithMappi
+   CrashAndGetMicrodump(mappings, MicrodumpExtraInfo(), &buf);
+   ASSERT_TRUE(ContainsMicrodump(buf));
+ 
++  int page_size = getpagesize();
+ #ifdef __LP64__
+-  ASSERT_NE(std::string::npos,
+-            buf.find("M 0000000000001000 000000000000002A 0000000000001000 "
+-                     "33221100554477668899AABBCCDDEEFF0 libfoo.so"));
++  // This test is only available for the following page sizes
++  ASSERT_TRUE((page_size == 4096) || (page_size == 65536));
++  if (page_size == 4096) {
++    ASSERT_NE(std::string::npos,
++              buf.find("M 0000000000001000 000000000000002A 0000000000001000 "
++                       "33221100554477668899AABBCCDDEEFF0 libfoo.so"));
++  } else {
++    ASSERT_NE(std::string::npos,
++              buf.find("M 0000000000010000 000000000000002A 0000000000010000 "
++                       "33221100554477668899AABBCCDDEEFF0 libfoo.so"));
++  }
+ #else
+   ASSERT_NE(std::string::npos,
+             buf.find("M 00001000 0000002A 00001000 "
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_core_dumper.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_core_dumper.cc
+@@ -117,6 +117,9 @@ bool LinuxCoreDumper::GetThreadInfoByInd
+ #elif defined(__mips__)
+   stack_pointer =
+       reinterpret_cast<uint8_t*>(info->mcontext.gregs[MD_CONTEXT_MIPS_REG_SP]);
++#elif defined(__powerpc64__)
++  stack_pointer =
++      reinterpret_cast<uint8_t*>(info->mcontext.gp_regs[MD_CONTEXT_PPC64_REG_SP]);
+ #else
+ #error "This code hasn't been ported to your platform yet."
+ #endif
+@@ -212,7 +215,10 @@ bool LinuxCoreDumper::EnumerateThreads()
+         memset(&info, 0, sizeof(ThreadInfo));
+         info.tgid = status->pr_pgrp;
+         info.ppid = status->pr_ppid;
+-#if defined(__mips__)
++#if defined(__powerpc64__)
++        for (int i = 0; i < 31; i++)
++            info.mcontext.gp_regs[i] = status->pr_reg[i];
++#elif defined(__mips__)
+ #if defined(__ANDROID__)
+         for (int i = EF_R0; i <= EF_R31; i++)
+           info.mcontext.gregs[i - EF_R0] = status->pr_reg[i];
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper.cc
+@@ -765,7 +765,9 @@ bool LinuxDumper::GetStackInfo(const voi
+       reinterpret_cast<uint8_t*>(int_stack_pointer & ~(page_size - 1));
+ 
+   // The number of bytes of stack which we try to capture.
+-  static const ptrdiff_t kStackToCapture = 32 * 1024;
++  // This now depends on page_size to avoid missing data
++  // on systems with larger page sizes.
++  static const ptrdiff_t kStackToCapture = 8 * page_size;
+ 
+   const MappingInfo* mapping = FindMapping(stack_pointer);
+   if (!mapping)
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper.h
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper.h
+@@ -63,7 +63,8 @@ namespace google_breakpad {
+  (defined(__mips__) && _MIPS_SIM == _ABIO32)
+ typedef Elf32_auxv_t elf_aux_entry;
+ #elif defined(__x86_64) || defined(__aarch64__) || \
+-     (defined(__mips__) && _MIPS_SIM != _ABIO32)
++     (defined(__mips__) && _MIPS_SIM != _ABIO32) || \
++     defined(__powerpc64__)
+ typedef Elf64_auxv_t elf_aux_entry;
+ #endif
+ 
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper_unittest_helper.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper_unittest_helper.cc
+@@ -51,6 +51,8 @@
+ #define TID_PTR_REGISTER "rcx"
+ #elif defined(__mips__)
+ #define TID_PTR_REGISTER "$1"
++#elif defined(__powerpc64__)
++#define TID_PTR_REGISTER "r8"
+ #else
+ #error This test has not been ported to this platform.
+ #endif
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper.cc
+@@ -154,19 +154,27 @@ bool LinuxPtraceDumper::CopyFromProcess(
+   return true;
+ }
+ 
+-bool LinuxPtraceDumper::ReadRegisterSet(ThreadInfo* info, pid_t tid)
+-{
++bool LinuxPtraceDumper::ReadRegisterSet(ThreadInfo* info, pid_t tid) {
+ #ifdef PTRACE_GETREGSET
+   struct iovec io;
+   info->GetGeneralPurposeRegisters(&io.iov_base, &io.iov_len);
+-  if (sys_ptrace(PTRACE_GETREGSET, tid, (void*)NT_PRSTATUS, (void*)&io) == -1) {
++  if (ptrace(PTRACE_GETREGSET, tid, (void*)NT_PRSTATUS, (void*)&io) == -1) {
+     return false;
+   }
+ 
+   info->GetFloatingPointRegisters(&io.iov_base, &io.iov_len);
+-  if (sys_ptrace(PTRACE_GETREGSET, tid, (void*)NT_FPREGSET, (void*)&io) == -1) {
++  if (ptrace(PTRACE_GETREGSET, tid, (void*)NT_FPREGSET, (void*)&io) == -1) {
+     return false;
+   }
++
++#if defined(__powerpc64__)
++  // Grab the vector registers on PPC64 too
++  info->GetVectorRegisters(&io.iov_base, &io.iov_len);
++  if (ptrace(PTRACE_GETREGSET, tid, (void*)NT_PPC_VMX, (void*)&io) == -1) {
++    return false;
++  }
++#endif // defined(__powerpc64__)
++
+   return true;
+ #else
+   return false;
+@@ -303,6 +311,9 @@ bool LinuxPtraceDumper::GetThreadInfoByI
+ #elif defined(__mips__)
+   stack_pointer =
+       reinterpret_cast<uint8_t*>(info->mcontext.gregs[MD_CONTEXT_MIPS_REG_SP]);
++#elif defined(__powerpc64__)
++  stack_pointer =
++      reinterpret_cast<uint8_t*>(info->mcontext.gp_regs[MD_CONTEXT_PPC64_REG_SP]);
+ #else
+ #error "This code hasn't been ported to your platform yet."
+ #endif
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper_unittest.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper_unittest.cc
+@@ -462,6 +462,9 @@ TEST(LinuxPtraceDumperTest, VerifyStackR
+ #elif defined(__mips__)
+     pid_t* process_tid_location =
+         reinterpret_cast<pid_t*>(one_thread.mcontext.gregs[1]);
++#elif defined(__powerpc64__)
++    pid_t* process_tid_location =
++        reinterpret_cast<pid_t*>(one_thread.mcontext.gp_regs[8]);
+ #else
+ #error This test has not been ported to this platform.
+ #endif
+@@ -559,6 +562,8 @@ TEST_F(LinuxPtraceDumperTest, SanitizeSt
+   uintptr_t heap_addr = thread_info.regs.rcx;
+ #elif defined(__mips__)
+   uintptr_t heap_addr = thread_info.mcontext.gregs[1];
++#elif defined(__powerpc64__)
++  uintptr_t heap_addr = thread_info.mcontext.gp_regs[8];
+ #else
+ #error This test has not been ported to this platform.
+ #endif
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.cc
+@@ -136,7 +136,9 @@ class MinidumpWriter {
+       : fd_(minidump_fd),
+         path_(minidump_path),
+         ucontext_(context ? &context->context : NULL),
+-#if !defined(__ARM_EABI__) && !defined(__mips__)
++#if defined(__powerpc64__)
++        vector_state_(context ? &context->vector_state : NULL),
++#elif !defined(__ARM_EABI__) && !defined(__mips__)
+         float_state_(context ? &context->float_state : NULL),
+ #endif
+         dumper_(dumper),
+@@ -468,7 +470,9 @@ class MinidumpWriter {
+         if (!cpu.Allocate())
+           return false;
+         my_memset(cpu.get(), 0, sizeof(RawContextCPU));
+-#if !defined(__ARM_EABI__) && !defined(__mips__)
++#if defined(__powerpc64__)
++        UContextReader::FillCPUContext(cpu.get(), ucontext_, vector_state_);
++#elif !defined(__ARM_EABI__) && !defined(__mips__)
+         UContextReader::FillCPUContext(cpu.get(), ucontext_, float_state_);
+ #else
+         UContextReader::FillCPUContext(cpu.get(), ucontext_);
+@@ -897,7 +901,7 @@ class MinidumpWriter {
+     dirent->location.rva = 0;
+   }
+ 
+-#if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
++#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || defined(__powerpc64__)
+   bool WriteCPUInformation(MDRawSystemInfo* sys_info) {
+     char vendor_id[sizeof(sys_info->cpu.x86_cpu_info.vendor_id) + 1] = {0};
+     static const char vendor_id_name[] = "vendor_id";
+@@ -917,7 +921,9 @@ class MinidumpWriter {
+ 
+     // processor_architecture should always be set, do this first
+     sys_info->processor_architecture =
+-#if defined(__mips__)
++#if defined(__powerpc64__)
++        MD_CPU_ARCHITECTURE_PPC64;
++#elif defined(__mips__)
+ # if _MIPS_SIM == _ABIO32
+         MD_CPU_ARCHITECTURE_MIPS;
+ # elif _MIPS_SIM == _ABI64
+@@ -1333,7 +1339,9 @@ class MinidumpWriter {
+   const char* path_;  // Path to the file where the minidum should be written.
+ 
+   const ucontext_t* const ucontext_;  // also from the signal handler
+-#if !defined(__ARM_EABI__) && !defined(__mips__)
++#if defined(__powerpc64__)
++  const google_breakpad::vstate_t* const vector_state_;
++#elif !defined(__ARM_EABI__) && !defined(__mips__)
+   const google_breakpad::fpstate_t* const float_state_;  // ditto
+ #endif
+   LinuxDumper* dumper_;
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.h
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.h
+@@ -48,6 +48,8 @@ class ExceptionHandler;
+ 
+ #if defined(__aarch64__)
+ typedef struct fpsimd_context fpstate_t;
++#elif defined(__powerpc64__)
++typedef vrregset_t vstate_t;
+ #elif !defined(__ARM_EABI__) && !defined(__mips__)
+ typedef std::remove_pointer<fpregset_t>::type fpstate_t;
+ #endif
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer_unittest.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer_unittest.cc
+@@ -715,6 +715,12 @@ TEST(MinidumpWriterTest, InvalidStackPoi
+ #elif defined(__mips__)
+   context.context.uc_mcontext.gregs[MD_CONTEXT_MIPS_REG_SP] =
+       invalid_stack_pointer;
++#elif defined(__powerpc64__)
++  context.context.uc_mcontext.gp_regs[MD_CONTEXT_PPC64_REG_SP] =
++      invalid_stack_pointer;
++#elif defined(__powerpc64__)
++  context.context.uc_mcontext.gp_regs[MD_CONTEXT_PPC64_REG_SP] =
++      invalid_stack_pointer;
+ #else
+ # error "This code has not been ported to your platform yet."
+ #endif
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/common/linux/memory_mapped_file.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/common/linux/memory_mapped_file.cc
+@@ -65,8 +65,7 @@ bool MemoryMappedFile::Map(const char* p
+   }
+ 
+ #if defined(__x86_64__) || defined(__aarch64__) || \
+-   (defined(__mips__) && _MIPS_SIM == _ABI64)
+-
++   (defined(__mips__) && _MIPS_SIM == _ABI64) || defined(__powerpc64__)
+   struct kernel_stat st;
+   if (sys_fstat(fd, &st) == -1 || st.st_size < 0) {
+ #else
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/common/linux/memory_mapped_file_unittest.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/common/linux/memory_mapped_file_unittest.cc
+@@ -176,9 +176,10 @@ TEST_F(MemoryMappedFileTest, RemapAfterM
+ TEST_F(MemoryMappedFileTest, MapWithOffset) {
+   // Put more data in the test file this time. Offsets can only be
+   // done on page boundaries, so we need a two page file to test this.
+-  const int page_size = 4096;
+-  char data1[2 * page_size];
+-  size_t data1_size = sizeof(data1);
++  const int page_size = getpagesize();
++  char *data1 = static_cast<char*>(malloc(2 * page_size));
++  EXPECT_TRUE(data1 != NULL);
++  size_t data1_size = (2 * page_size);
+   for (size_t i = 0; i < data1_size; ++i) {
+     data1[i] = i & 0x7f;
+   }
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/common/memory_allocator_unittest.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/common/memory_allocator_unittest.cc
+@@ -57,8 +57,9 @@ TEST(PageAllocatorTest, LargeObject) {
+ 
+   EXPECT_EQ(0U, allocator.pages_allocated());
+   uint8_t* p = reinterpret_cast<uint8_t*>(allocator.Alloc(10000));
++  uint64_t expected_pages = 1 + ((10000 - 1) / getpagesize());
+   ASSERT_FALSE(p == NULL);
+-  EXPECT_EQ(3U, allocator.pages_allocated());
++  EXPECT_EQ(expected_pages, allocator.pages_allocated());
+   for (unsigned i = 1; i < 10; ++i) {
+     uint8_t* p = reinterpret_cast<uint8_t*>(allocator.Alloc(i));
+     ASSERT_FALSE(p == NULL);
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/processor/exploitability_linux.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/processor/exploitability_linux.cc
+@@ -202,12 +202,14 @@ bool ExploitabilityLinux::EndedOnIllegal
+   // Check architecture and set architecture variable to corresponding flag
+   // in objdump.
+   switch (context->GetContextCPU()) {
++#if defined(__i386) || defined(__x86_64)
+     case MD_CONTEXT_X86:
+       architecture = "i386";
+       break;
+     case MD_CONTEXT_AMD64:
+       architecture = "i386:x86-64";
+       break;
++#endif
+     default:
+       // Unsupported architecture. Note that ARM architectures are not
+       // supported because objdump does not support ARM.
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/processor/exploitability_unittest.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/processor/exploitability_unittest.cc
+@@ -104,6 +104,8 @@ ExploitabilityFor(const string& filename
+ }
+ 
+ TEST(ExploitabilityTest, TestWindowsEngine) {
++// The following tests are only executable on an x86-class linux machine.
++#if !defined(_WIN32) && (defined(__i386) || defined(__x86_64))
+   ASSERT_EQ(google_breakpad::EXPLOITABILITY_HIGH,
+             ExploitabilityFor("ascii_read_av.dmp"));
+   ASSERT_EQ(google_breakpad::EXPLOITABILITY_HIGH,
+@@ -136,9 +138,12 @@ TEST(ExploitabilityTest, TestWindowsEngi
+             ExploitabilityFor("read_av_clobber_write.dmp"));
+   ASSERT_EQ(google_breakpad::EXPLOITABILITY_LOW,
+             ExploitabilityFor("read_av_conditional.dmp"));
++#endif
+ }
+ 
+ TEST(ExploitabilityTest, TestLinuxEngine) {
++// The following tests are only executable on an x86-class linux machine.
++#if defined(__i386) || defined(__x86_64)
+   ASSERT_EQ(google_breakpad::EXPLOITABILITY_INTERESTING,
+             ExploitabilityFor("linux_null_read_av.dmp"));
+   ASSERT_EQ(google_breakpad::EXPLOITABILITY_HIGH,
+@@ -171,7 +176,8 @@ TEST(ExploitabilityTest, TestLinuxEngine
+             ExploitabilityFor("linux_executable_heap.dmp"));
+   ASSERT_EQ(google_breakpad::EXPLOITABILITY_HIGH,
+             ExploitabilityFor("linux_jmp_to_module_not_exe_region.dmp"));
+-#ifndef _WIN32
++#endif
++#if !defined(_WIN32) && (defined(__i386) || defined(__x86_64))
+   ASSERT_EQ(google_breakpad::EXPLOITABILITY_HIGH,
+             ExploitabilityFor("linux_write_to_nonwritable_module.dmp"));
+   ASSERT_EQ(google_breakpad::EXPLOITABILITY_HIGH,
+@@ -182,10 +188,10 @@ TEST(ExploitabilityTest, TestLinuxEngine
+             ExploitabilityFor("linux_write_to_outside_module_via_math.dmp"));
+   ASSERT_EQ(google_breakpad::EXPLOITABILITY_INTERESTING,
+             ExploitabilityFor("linux_write_to_under_4k.dmp"));
+-#endif  // _WIN32
++#endif  // !defined(_WIN32) && (!defined(__i386) && !defined(__x86_64))
+ }
+ 
+-#ifndef _WIN32
++#if !defined(_WIN32) && (defined(__i386) || defined(__x86_64))
+ TEST(ExploitabilityLinuxUtilsTest, DisassembleBytesTest) {
+   ASSERT_FALSE(ExploitabilityLinuxTest::DisassembleBytes("", NULL, 5, NULL));
+   uint8_t bytes[6] = {0xc7, 0x0, 0x5, 0x0, 0x0, 0x0};
+@@ -301,6 +307,7 @@ TEST(ExploitabilityLinuxUtilsTest, Calcu
+                                                          context,
+                                                          &write_address));
+ }
+-#endif  // _WIN32
++#endif  // !defined(_WIN32) && (defined(__i386) || defined(__x86_64))
++
+ 
+ }  // namespace
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/tools/linux/md2core/minidump-2-core.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/tools/linux/md2core/minidump-2-core.cc
+@@ -77,6 +77,8 @@
+   #define ELF_ARCH  EM_MIPS
+ #elif defined(__aarch64__)
+   #define ELF_ARCH  EM_AARCH64
++#elif defined(__powerpc64__)
++  #define ELF_ARCH  EM_PPC64
+ #endif
+ 
+ #if defined(__arm__)
+@@ -87,6 +89,8 @@ typedef user_regs user_regs_struct;
+ #elif defined (__mips__)
+ // This file-local typedef simplifies the source code.
+ typedef gregset_t user_regs_struct;
++#elif defined(__powerpc64__)
++typedef struct pt_regs user_regs_struct;
+ #endif
+ 
+ using google_breakpad::MDTypeHelper;
+@@ -322,6 +326,12 @@ struct CrashedProcess {
+ #if defined(__aarch64__)
+     user_fpsimd_struct fpregs;
+ #endif
++#if defined(__powerpc64__)
++    mcontext_t mcontext;
++#endif
++#if defined(__powerpc64__)
++    mcontext_t mcontext;
++#endif
+     uintptr_t stack_addr;
+     const uint8_t* stack;
+     size_t stack_length;
+@@ -535,6 +545,38 @@ ParseThreadRegisters(CrashedProcess::Thr
+   thread->mcontext.fpc_eir = rawregs->float_save.fir;
+ #endif
+ }
++#elif defined(__powerpc64__)
++static void
++ParseThreadRegisters(CrashedProcess::Thread* thread,
++                     const MinidumpMemoryRange& range) {
++  const MDRawContextPPC64* rawregs = range.GetData<MDRawContextPPC64>(0);
++
++  for (int i = 0; i < MD_CONTEXT_PPC64_GPR_COUNT; i++)
++    thread->mcontext.gp_regs[i] = rawregs->gpr[i];
++
++  thread->mcontext.gp_regs[PT_LNK] = rawregs->lr;
++  thread->mcontext.gp_regs[PT_NIP] = rawregs->srr0;
++  thread->mcontext.gp_regs[PT_MSR] = rawregs->srr1;
++  thread->mcontext.gp_regs[PT_CCR] = rawregs->cr;
++  thread->mcontext.gp_regs[PT_XER] = rawregs->xer;
++  thread->mcontext.gp_regs[PT_CTR] = rawregs->ctr;
++  thread->mcontext.v_regs->vrsave = rawregs->vrsave;
++
++  for (int i = 0; i < MD_FLOATINGSAVEAREA_PPC_FPR_COUNT; i++)
++      thread->mcontext.fp_regs[i] = rawregs->float_save.fpregs[i];
++
++  thread->mcontext.fp_regs[NFPREG-1] = rawregs->float_save.fpscr;
++
++  for (int i = 0; i < MD_VECTORSAVEAREA_PPC_VR_COUNT; i++) {
++      thread->mcontext.v_regs->vrregs[i][0] = rawregs->vector_save.save_vr[i].high >> 32;
++      thread->mcontext.v_regs->vrregs[i][1] = rawregs->vector_save.save_vr[i].high;
++      thread->mcontext.v_regs->vrregs[i][2] = rawregs->vector_save.save_vr[i].low >> 32;
++      thread->mcontext.v_regs->vrregs[i][3] = rawregs->vector_save.save_vr[i].low;
++  }
++
++  thread->mcontext.v_regs->vscr.vscr_word = rawregs->vector_save.save_vscr.low & 0xFFFFFFFF;
++}
++
+ #else
+ #error "This code has not been ported to your platform yet"
+ #endif
+@@ -623,6 +665,12 @@ ParseSystemInfo(const Options& options,
+ # else
+ #  error "This mips ABI is currently not supported (n32)"
+ # endif
++#elif defined(__powerpc64__)
++  if (sysinfo->processor_architecture != MD_CPU_ARCHITECTURE_PPC64) {
++    fprintf(stderr,
++            "This version of minidump-2-core only supports PPC64.\n");
++    exit(1);
++  }
+ #else
+ #error "This code has not been ported to your platform yet"
+ #endif
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/CONTRIBUTORS
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/CONTRIBUTORS
+@@ -13,3 +13,4 @@ Mark Mentovai <mark@chromium.org>
+ Robert Sesek <rsesek@chromium.org>
+ Scott Graham <scottmg@chromium.org>
+ Joshua Peraza <jperaza@chromium.org>
++Shawn Anastasio <shawn@anastas.io>
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/compat/linux/sys/user.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/compat/linux/sys/user.h
+@@ -15,6 +15,7 @@
+ #ifndef CRASHPAD_COMPAT_LINUX_SYS_USER_H_
+ #define CRASHPAD_COMPAT_LINUX_SYS_USER_H_
+ 
++#include <cstddef>
+ #include_next <sys/user.h>
+ 
+ #include <features.h>
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/minidump/minidump_context.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/minidump/minidump_context.h
+@@ -592,6 +592,70 @@ struct MinidumpContextMIPS64 {
+   uint64_t fir;
+ };
+ 
++//! \brief ppc64-specific flags for MinidumpPPC64::context_flags
++//! Based on minidump_cpu_ppc64.h from breakpad
++enum MinidumpContextPPC64Flags : uint32_t {
++  //! \brief Identifies the context as PPC64.
++  kMinidumpContextPPC64 = 0x01000000,
++
++  //! \brief Indicates the validity of general purpose registers.
++  //!
++  //! Registers `r0`-`r31`, `nip`, `msr`, `lr`, etc. are valid.
++  kMinidumpContextPPC64Base = kMinidumpContextPPC64 | 0x00000001,
++
++  //! \brief Indicates the validity of floating point registers.
++  //!
++  //! Registers `fp0`-`fp31`, `fpscr` are valid.
++  kMinidumpContextPPC64Floating = kMinidumpContextPPC64 | 0x00000008,
++
++  //! \brief Indicates the validity of Altivec/VMX registers.
++  //!
++  //! Registers `v0`-`v31`, `vscr`, `vrsave`.
++  kMinidumpContextPPC64Vector = kMinidumpContextPPC64 | 0x00000020,
++
++  //! \brief Indicates the validity of all registers
++  kMinidumpContextPPC64All = kMinidumpContextPPC64Base     |
++                             kMinidumpContextPPC64Floating |
++                             kMinidumpContextPPC64Vector
++};
++
++//! \brief A PPC64 CPU context carried in a minidump file.
++//! Based on minidump_cpu_ppc64.h from breakpad.
++struct MinidumpContextPPC64 {
++  uint64_t context_flags;
++
++  //! \brief General purpose registers.
++  uint64_t nip;
++  uint64_t msr;
++  uint64_t regs[32];
++  uint64_t ccr;
++  uint64_t xer;
++  uint64_t lnk;
++  uint64_t ctr;
++
++  //! \brief Floating point registers.
++  double fpregs[32];
++
++  //! \brief FPU status register.
++  double fpscr;
++
++  //! \brief Altivec/VMX vector registers.
++  struct {
++      //! \brief Vector registers are 128bits.
++      uint128_struct save_vr[32];
++      uint128_struct save_vscr;
++
++      //! \brief Padding included for breakpad compatibiltiy.
++      uint32_t save_pad5[4];
++
++      //! \brief VRSAVE register.
++      uint32_t save_vrsave;
++
++      //! \brief Padding included for breakpad compatibiltiy.
++      uint32_t save_pad6[7];
++  } vregs;
++};
++
+ }  // namespace crashpad
+ 
+ #endif  // CRASHPAD_MINIDUMP_MINIDUMP_CONTEXT_H_
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/minidump/minidump_context_writer.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/minidump/minidump_context_writer.cc
+@@ -101,6 +101,13 @@ MinidumpContextWriter::CreateFromSnapsho
+       break;
+     }
+ 
++    case kCPUArchitecturePPC64: {
++      context = std::make_unique<MinidumpContextPPC64Writer>();
++      reinterpret_cast<MinidumpContextPPC64Writer*>(context.get())
++          ->InitalizeFromSnapshot(context_snapshot->ppc64);
++      break;
++    }
++
+     default: {
+       LOG(ERROR) << "unknown context architecture "
+                  << context_snapshot->architecture;
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/minidump/minidump_context_writer.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/minidump/minidump_context_writer.h
+@@ -315,6 +315,45 @@ class MinidumpContextMIPS64Writer final
+   DISALLOW_COPY_AND_ASSIGN(MinidumpContextMIPS64Writer);
+ };
+ 
++class MinidumpContextPPC64Writer final : public MinidumpContextWriter {
++ public:
++  MinidumpContextPPC64Writer();
++  ~MinidumpContextPPC64Writer() override;
++
++  //! \brief Initalizes the MinidumpContextPPC64 based on \a context_snapshot.
++  //!
++  //! \param[in] context_snapshot The context snapshot to use as source data.
++  //!
++  //! \note Valid in #kStateMutable. No mutation of context() may be done before
++  //!     calling this method, and it is not normally necessary to alter
++  //!     context() after calling this method.
++  void InitalizeFromSnapshot(const CPUContextPPC64* context_snapshot);
++
++  //! \brief Returns a pointer to the context structure that this object will
++  //!     write.
++  //!
++  //! \attention This returns a non-`const` pointer to this object’s private
++  //!     data so that a caller can populate the context structure directly.
++  //!     This is done because providing setter interfaces to each field in the
++  //!     context structure would be unwieldy and cumbersome. Care must be taken
++  //!     to populate the context structure correctly. The context structure
++  //!     must only be modified while this object is in the #kStateMutable
++  //!     state.
++  MinidumpContextPPC64* context() { return &context_; }
++
++ protected:
++  // MinidumpWritable:
++  bool WriteObject(FileWriterInterface* file_writer) override;
++
++  // MinidumpContextWriter:
++  size_t ContextSize() const override;
++
++ private:
++  MinidumpContextPPC64 context_;
++
++  DISALLOW_COPY_AND_ASSIGN(MinidumpContextPPC64Writer);
++};
++
+ }  // namespace crashpad
+ 
+ #endif  // CRASHPAD_MINIDUMP_MINIDUMP_CONTEXT_WRITER_H_
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/minidump/minidump_context_writer_test.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/minidump/minidump_context_writer_test.cc
+@@ -213,6 +213,21 @@ TEST(MinidumpContextWriter, MIPS64_FromS
+       context, ExpectMinidumpContextMIPS64, kSeed);
+ }
+ 
++TEST(MinidumpContextWriter, PPC64_Zeros) {
++  EmptyContextTest<MinidumpContextPPC64Writer, MinidumpContextPPC64>(
++    ExpectMinidumpContextPPC64);
++}
++
++TEST(MinidumpContextWriter, PPC64_FromSnapshot) {
++  constexpr uint32_t kSeed = 64;
++  CPUContextPPC64 context_ppc64;
++  CPUContext context;
++  context.ppc64 = &context_ppc64;
++  InitializeCPUContextPPC64(&context, kSeed);
++  FromSnapshotTest<MinidumpContextPPC64Writer, MinidumpContextPPC64>(
++      context, ExpectMinidumpContextPPC64, kSeed);
++}
++
+ }  // namespace
+ }  // namespace test
+ }  // namespace crashpad
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/minidump/minidump_misc_info_writer.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/minidump/minidump_misc_info_writer.cc
+@@ -135,6 +135,8 @@ std::string MinidumpMiscInfoDebugBuildSt
+   static constexpr char kCPU[] = "mips";
+ #elif defined(ARCH_CPU_MIPS64EL)
+   static constexpr char kCPU[] = "mips64";
++#elif defined(ARCH_CPU_PPC64)
++  static constexpr char kCPU[] = "ppc64";
+ #else
+ #error define kCPU for this CPU
+ #endif
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/capture_memory.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/capture_memory.cc
+@@ -112,6 +112,11 @@ void CaptureMemory::PointedToByContext(c
+   for (size_t i = 0; i < base::size(context.mipsel->regs); ++i) {
+     MaybeCaptureMemoryAround(delegate, context.mipsel->regs[i]);
+   }
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++  MaybeCaptureMemoryAround(delegate, context.ppc64->nip);
++  for (size_t i = 0; i < base::size(context.ppc64->regs); ++i) {
++    MaybeCaptureMemoryAround(delegate, context.ppc64->regs[i]);
++  }
+ #else
+ #error Port.
+ #endif
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/cpu_architecture.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/cpu_architecture.h
+@@ -43,7 +43,10 @@ enum CPUArchitecture {
+   kCPUArchitectureMIPSEL,
+ 
+   //! \brief 64-bit MIPSEL.
+-  kCPUArchitectureMIPS64EL
++  kCPUArchitectureMIPS64EL,
++
++  //! \brief 64-bit PPC64.
++  kCPUArchitecturePPC64
+ };
+ 
+ }  // namespace crashpad
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/cpu_context.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/cpu_context.cc
+@@ -169,6 +169,8 @@ uint64_t CPUContext::InstructionPointer(
+       return arm->pc;
+     case kCPUArchitectureARM64:
+       return arm64->pc;
++    case kCPUArchitecturePPC64:
++      return ppc64->nip;
+     default:
+       NOTREACHED();
+       return ~0ull;
+@@ -185,6 +187,8 @@ uint64_t CPUContext::StackPointer() cons
+       return arm->sp;
+     case kCPUArchitectureARM64:
+       return arm64->sp;
++    case kCPUArchitecturePPC64:
++      return ppc64->regs[1];
+     default:
+       NOTREACHED();
+       return ~0ull;
+@@ -196,6 +200,7 @@ bool CPUContext::Is64Bit() const {
+     case kCPUArchitectureX86_64:
+     case kCPUArchitectureARM64:
+     case kCPUArchitectureMIPS64EL:
++    case kCPUArchitecturePPC64:
+       return true;
+     case kCPUArchitectureX86:
+     case kCPUArchitectureARM:
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/cpu_context.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/cpu_context.h
+@@ -352,6 +352,24 @@ struct CPUContextMIPS64 {
+   uint64_t fir;
+ };
+ 
++//! \brief A context structure carrying PPC64 CPU state.
++struct CPUContextPPC64 {
++  uint64_t nip;
++  uint64_t msr;
++  uint64_t regs[32];
++  uint64_t ccr;
++  uint64_t xer;
++  uint64_t lnk;
++  uint64_t ctr;
++  double fpregs[32];
++  double fpscr;
++  struct {
++    uint128_struct save_vr[32];
++    uint128_struct save_vscr;
++    uint32_t save_vrsave;
++  } vregs;
++};
++
+ //! \brief A context structure capable of carrying the context of any supported
+ //!     CPU architecture.
+ struct CPUContext {
+@@ -382,6 +400,7 @@ struct CPUContext {
+     CPUContextARM64* arm64;
+     CPUContextMIPS* mipsel;
+     CPUContextMIPS64* mips64;
++    CPUContextPPC64* ppc64;
+   };
+ };
+ 
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/cpu_context_linux.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/cpu_context_linux.h
+@@ -15,6 +15,7 @@
+ #ifndef CRASHPAD_SNAPSHOT_LINUX_CPU_CONTEXT_LINUX_H_
+ #define CRASHPAD_SNAPSHOT_LINUX_CPU_CONTEXT_LINUX_H_
+ 
++#include <cstring>
+ #include "build/build_config.h"
+ #include "snapshot/cpu_context.h"
+ #include "snapshot/linux/signal_context.h"
+@@ -174,6 +175,76 @@ void InitializeCPUContextMIPS(
+ 
+ #endif  // ARCH_CPU_MIPS_FAMILY || DOXYGEN
+ 
++#if defined(ARCH_CPU_PPC64_FAMILY) || DOXYGEN
++
++//! \brief Initalizes a CPUContextPPC64 structure from native context
++//!     structures on Linux.
++//!
++//! \param[in] thread_context The native thread context.
++//! \param[in] float_context The native float context.
++//! \param[in] vector_context The native vector context.
++//! \param[out] context The CPUContextPPC64 structure to initalize.
++template <typename Traits>
++void InitializeCPUContextPPC64(
++    const ThreadContext::t64_t& thread_context,
++    const FloatContext::f64_t& float_context,
++    const VectorContext::v64_t& vector_context,
++    typename Traits::CPUContext* context) {
++
++  memcpy(context->regs, thread_context.gpr, sizeof(context->regs));
++  context->nip = thread_context.nip;
++  context->msr = thread_context.msr;
++  context->ccr = thread_context.ccr;
++  context->xer = thread_context.xer;
++  context->lnk = thread_context.lnk;
++  context->ctr = thread_context.ctr;
++
++  memcpy(context->fpregs, float_context.fpregs, sizeof(context->fpregs));
++  context->fpscr = float_context.fpscr;
++
++  for (uint8_t i = 0; i < 32; i++) {
++    context->vregs.save_vr[i] = {
++      (((uint64_t)vector_context.vrregs[i][0]) << 32) |
++        vector_context.vrregs[i][1],
++      (((uint64_t)vector_context.vrregs[i][2]) << 32) |
++        vector_context.vrregs[i][3]
++    };
++  }
++  context->vregs.save_vrsave = vector_context.vrsave;
++  context->vregs.save_vscr = {0, (uint64_t)vector_context.vscr.vscr_word};
++}
++
++template <typename Traits>
++void InitializeCPUContextPPC64(
++    const SignalThreadContext64 &thread_context,
++    const SignalFloatContext64 &float_context,
++    const SignalVectorContext64 &vector_context,
++    typename Traits::CPUContext* context) {
++
++  memcpy(context->regs, thread_context.regs, sizeof(context->regs));
++  context->nip = thread_context.nip;
++  context->msr = thread_context.msr;
++  context->ccr = thread_context.ccr;
++  context->xer = thread_context.xer;
++  context->lnk = thread_context.lnk;
++  context->ctr = thread_context.ctr;
++
++  memcpy(context->fpregs, float_context.regs, sizeof(context->fpregs));
++  context->fpscr = float_context.fpscr;
++
++  for (uint8_t i = 0; i < 32; i++) {
++    context->vregs.save_vr[i] = {
++      (((uint64_t)vector_context.vrregs[i][0]) << 32) |
++        vector_context.vrregs[i][1],
++      (((uint64_t)vector_context.vrregs[i][2]) << 32) |
++        vector_context.vrregs[i][3]
++    };
++  }
++  context->vregs.save_vrsave = vector_context.vrsave;
++  context->vregs.save_vscr = {0, (uint64_t)vector_context.vscr.vscr_word};
++}
++
++#endif
+ }  // namespace internal
+ }  // namespace crashpad
+ 
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/debug_rendezvous_test.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/debug_rendezvous_test.cc
+@@ -192,6 +192,8 @@ void TestAgainstTarget(PtraceConnection*
+               device == 0 && inode == 0 && mapping_name == "[vdso]";
+ #if defined(ARCH_CPU_X86)
+           static constexpr char kPrefix[] = "linux-gate.so.";
++#elif defined(ARCH_CPU_PPC64)
++          static constexpr char kPrefix[] = "linux-vdso64.so.";
+ #else
+           static constexpr char kPrefix[] = "linux-vdso.so.";
+ #endif
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux.cc
+@@ -323,6 +323,69 @@ bool ExceptionSnapshotLinux::ReadContext
+       reader, context_address, context_.mips64);
+ }
+ 
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++
++template <typename Traits>
++static bool ReadContext(ProcessReaderLinux* reader,
++                        LinuxVMAddress context_address,
++                        typename Traits::CPUContext* dest_context) {
++  const ProcessMemory* memory = reader->Memory();
++
++  LinuxVMAddress gp_regs_address = context_address +
++                                   offsetof(UContext, mcontext) +
++                                   offsetof(typename Traits::MContext, gp_regs);
++
++  typename Traits::SignalThreadContext thread_context;
++  if (!memory->Read(gp_regs_address, sizeof(thread_context), &thread_context)) {
++    LOG(ERROR) << "Couldn't read gp_regs!";
++    return false;
++  }
++
++  LinuxVMAddress fp_regs_address = context_address +
++                                   offsetof(UContext, mcontext) +
++                                   offsetof(typename Traits::MContext, fp_regs);
++
++  typename Traits::SignalFloatContext fp_context;
++  if (!memory->Read(fp_regs_address, sizeof(fp_context), &fp_context)) {
++    LOG(ERROR) << "Couldn't read fp_regs!";
++    return false;
++  }
++
++  LinuxVMAddress v_regs_ptr_address = context_address +
++                                  offsetof(UContext, mcontext) +
++                                  offsetof(typename Traits::MContext, vmx_reserve) + 8;
++
++  typename Traits::SignalVectorContext v_context;
++  if (!memory->Read(v_regs_ptr_address, sizeof(v_context), &v_context)) {
++    LOG(ERROR) << "Couldn't read v_regs!";
++    return false;
++  }
++
++  InitializeCPUContextPPC64<ContextTraits64>(thread_context, fp_context,
++                            v_context, dest_context);
++
++  return true;
++}
++
++template<>
++bool ExceptionSnapshotLinux::ReadContext<ContextTraits64>(
++    ProcessReaderLinux* reader,
++    LinuxVMAddress context_address) {
++  context_.architecture = kCPUArchitecturePPC64;
++  context_.ppc64 = &context_union_.ppc64;
++
++  return internal::ReadContext<ContextTraits64>(
++      reader, context_address, context_.ppc64);
++}
++
++template<>
++bool ExceptionSnapshotLinux::ReadContext<ContextTraits32>(
++    ProcessReaderLinux* reader,
++    LinuxVMAddress context_address) {
++  // PPC64 is 64-bit
++  return false;
++}
++
+ #endif  // ARCH_CPU_X86_FAMILY
+ 
+ bool ExceptionSnapshotLinux::Initialize(ProcessReaderLinux* process_reader,
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux.h
+@@ -84,6 +84,8 @@ class ExceptionSnapshotLinux final : pub
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+     CPUContextMIPS mipsel;
+     CPUContextMIPS64 mips64;
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++    CPUContextPPC64 ppc64;
+ #endif
+   } context_union_;
+   CPUContext context_;
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux_test.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux_test.cc
+@@ -296,7 +296,28 @@ void ExpectContext(const CPUContext& act
+             0);
+ #undef CPU_ARCH_NAME
+ }
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++using NativeCPUContext = ucontext_t;
+ 
++void InitializeContext(NativeCPUContext* context) {
++  for (size_t reg = 0; reg < 32; ++reg) {
++    context->uc_mcontext.gp_regs[reg] = reg;
++  }
++
++  memset(&context->uc_mcontext.fp_regs, 44,
++      sizeof(context->uc_mcontext.fp_regs));
++}
++
++void ExpectContext(const CPUContext& actual, const NativeCPUContext& expected) {
++  EXPECT_EQ(actual.architecture, kCPUArchitecturePPC64);
++
++  for (size_t reg = 0; reg < 32; ++reg) {
++    EXPECT_EQ(actual.ppc64->regs[reg], expected.uc_mcontext.gp_regs[reg]);
++  }
++
++  EXPECT_EQ(memcmp(actual.ppc64->fpregs, expected.uc_mcontext.fp_regs,
++            sizeof(actual.ppc64->fpregs)), 0);
++}
+ #else
+ #error Port.
+ #endif
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/process_reader_linux.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/process_reader_linux.cc
+@@ -108,6 +108,8 @@ void ProcessReaderLinux::Thread::Initial
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+   stack_pointer = reader->Is64Bit() ? thread_info.thread_context.t64.regs[29]
+                                     : thread_info.thread_context.t32.regs[29];
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++  stack_pointer = thread_info.thread_context.t64.gpr[1];
+ #else
+ #error Port.
+ #endif
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/signal_context.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/signal_context.h
+@@ -422,6 +422,93 @@ static_assert(offsetof(UContext<ContextT
+               "context offset mismatch");
+ #endif
+ 
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++
++struct SignalThreadContext64 {
++  uint64_t regs[32];
++  uint64_t nip;
++  uint64_t msr;
++  uint64_t orig_r3;
++  uint64_t ctr;
++  uint64_t lnk;
++  uint64_t xer;
++  uint64_t ccr;
++  uint64_t softe;
++  uint64_t trap;
++  uint64_t dar;
++  uint64_t dsisr;
++  uint64_t result;
++  uint64_t dscr;
++  uint64_t fpr0[3];
++};
++
++struct SignalFloatContext64 {
++  double regs[32];
++  double fpscr;
++};
++
++struct SignalVectorContext64 {
++  int32_t vrregs[32][4];
++  struct {
++    int32_t __pad[3];
++    int32_t vscr_word;
++  } vscr;
++  int32_t vrsave;
++  int32_t __pad[3];
++} __attribute__((__aligned__(16)));
++
++
++#pragma pack(pop)
++struct MContext64 {
++  uint64_t reserved[4];
++  int32_t signal;
++  int32_t __pad0;
++  uint64_t handler;
++  uint64_t oldmask;
++  uint64_t pt_regs_ptr;
++  SignalThreadContext64 gp_regs;
++  SignalFloatContext64  fp_regs;
++  SignalVectorContext64 *v_regs;
++#ifdef __GLIBC__
++  int64_t vmx_reserve[69];
++#else
++  int64_t vmx_reserve[101];
++#endif
++};
++
++struct ContextTraits64 : public Traits64 {
++  using MContext = MContext64;
++  using SignalThreadContext = SignalThreadContext64;
++  using SignalFloatContext = SignalFloatContext64;
++  using SignalVectorContext = SignalVectorContext64;
++  using CPUContext = CPUContextPPC64;
++};
++
++struct ContextTraits32 : public Traits32 {};
++
++struct UContext {
++  uint64_t flags;
++  uint64_t link;
++  SignalStack<ContextTraits64> stack;
++  Sigset<ContextTraits64> sigmask;
++  MContext64 mcontext;
++};
++#pragma pack(push, 1)
++
++static_assert(sizeof(UContext) == sizeof(ucontext_t),
++              "ucontext_t size mismatch");
++static_assert(sizeof(MContext64) == sizeof(mcontext_t),
++              "mcontext_t size mismatch");
++static_assert(sizeof(SignalThreadContext64) == sizeof(gregset_t),
++              "gregset_t size mismatch");
++static_assert(sizeof(SignalFloatContext64) == sizeof(fpregset_t),
++              "fpregset_t size mismatch");
++static_assert(sizeof(SignalVectorContext64) == sizeof(vrregset_t),
++              "vrregset_t size mismatch");
++static_assert(offsetof(UContext, mcontext) ==
++              offsetof(ucontext_t, uc_mcontext), "mcontext offset mismatch");
++static_assert(offsetof(MContext64, gp_regs) ==
++              offsetof(mcontext_t, gp_regs), "gp_regs offset mismatch");
+ #else
+ #error Port.
+ #endif  // ARCH_CPU_X86_FAMILY
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/system_snapshot_linux.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/system_snapshot_linux.cc
+@@ -204,6 +204,8 @@ CPUArchitecture SystemSnapshotLinux::Get
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+   return process_reader_->Is64Bit() ? kCPUArchitectureMIPS64EL
+                                     : kCPUArchitectureMIPSEL;
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++  return kCPUArchitecturePPC64;
+ #else
+ #error port to your architecture
+ #endif
+@@ -219,6 +221,9 @@ uint32_t SystemSnapshotLinux::CPURevisio
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+   // Not implementable on MIPS
+   return 0;
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++  // Not yet implemented on PPC64
++  return 0;
+ #else
+ #error port to your architecture
+ #endif
+@@ -239,6 +244,9 @@ std::string SystemSnapshotLinux::CPUVend
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+   // Not implementable on MIPS
+   return std::string();
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++  // Not yet implemented on PPC64
++  return std::string();
+ #else
+ #error port to your architecture
+ #endif
+@@ -372,6 +380,9 @@ bool SystemSnapshotLinux::NXEnabled() co
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+   // Not implementable on MIPS
+   return false;
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++  // Not yet implemented on PPC64
++  return false;
+ #else
+ #error Port.
+ #endif  // ARCH_CPU_X86_FAMILY
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/test_modules.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/test_modules.cc
+@@ -110,6 +110,8 @@ bool WriteTestModule(const base::FilePat
+   module.ehdr.e_machine = EM_AARCH64;
+ #elif defined(ARCH_CPU_MIPSEL) || defined(ARCH_CPU_MIPS64EL)
+   module.ehdr.e_machine = EM_MIPS;
++#elif defined(ARCH_CPU_PPC64)
++  module.ehdr.e_machine = EM_PPC64;
+ #endif
+ 
+   module.ehdr.e_version = EV_CURRENT;
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/thread_snapshot_linux.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/thread_snapshot_linux.cc
+@@ -186,6 +186,14 @@ bool ThreadSnapshotLinux::Initialize(Pro
+         thread.thread_info.float_context.f32,
+         context_.mipsel);
+   }
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++  context_.architecture = kCPUArchitecturePPC64;
++  context_.ppc64 = &context_union_.ppc64;
++  InitializeCPUContextPPC64<ContextTraits64>(
++      thread.thread_info.thread_context.t64,
++      thread.thread_info.float_context.f64,
++      thread.thread_info.vector_context.v64,
++      context_.ppc64);
+ #else
+ #error Port.
+ #endif
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/thread_snapshot_linux.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/thread_snapshot_linux.h
+@@ -68,6 +68,8 @@ class ThreadSnapshotLinux final : public
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+     CPUContextMIPS mipsel;
+     CPUContextMIPS64 mips64;
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++    CPUContextPPC64 ppc64;
+ #else
+ #error Port.
+ #endif  // ARCH_CPU_X86_FAMILY
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/util/linux/auxiliary_vector.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/util/linux/auxiliary_vector.cc
+@@ -56,6 +56,11 @@ bool AuxiliaryVector::Read(PtraceConnect
+     if (type == AT_IGNORE) {
+       continue;
+     }
++#if defined(ARCH_CPU_PPC64_FAMILY)
++    if (type == AT_IGNOREPPC) {
++      continue;
++    }
++#endif
+     if (!MapInsertOrReplace(&values_, type, value, nullptr)) {
+       LOG(ERROR) << "duplicate auxv entry";
+       return false;
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/util/linux/ptracer.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/util/linux/ptracer.cc
+@@ -401,6 +401,64 @@ bool GetThreadArea64(pid_t tid,
+   return true;
+ }
+ 
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++// PPC64 has had HAVE_ARCH_TRACEHOOK set since 2.6.27 (even before x86 had it).
++// That means we can simply use PTRACE_GETREGESET.
++
++template <typename Destination>
++bool GetRegisterSet(pid_t tid, int set, Destination* dest, bool can_log) {
++  iovec iov;
++  iov.iov_base = reinterpret_cast<void*>(dest);
++  iov.iov_len = sizeof(*dest);
++  if (ptrace(PTRACE_GETREGSET, tid, reinterpret_cast<void*>(set), &iov) != 0) {
++    PLOG_IF(ERROR, can_log) << "ptrace";
++    return false;
++  }
++  if (iov.iov_len != sizeof(*dest)) {
++    LOG_IF(ERROR, can_log) << "Unexpected registers size";
++    return false;
++  }
++  return true;
++}
++
++bool GetVectorRegisters64(pid_t tid,
++                          VectorContext* context,
++                          bool can_log) {
++  return GetRegisterSet(tid, NT_PPC_VMX, &context->v64, can_log);
++}
++
++bool GetFloatingPointRegisters64(pid_t tid,
++                                 FloatContext* context,
++                                 bool can_log) {
++  return GetRegisterSet(tid, NT_PRFPREG, &context->f64, can_log);
++}
++
++bool GetThreadArea64(pid_t tid,
++                     const ThreadContext& context,
++                     LinuxVMAddress* address,
++                     bool can_log) {
++  // PPC64 doesn't have PTRACE_GET_THREAD_AREA since the thread pointer
++  // is stored in GPR 13.
++  ThreadContext::t64_t tc;
++  if (!GetRegisterSet(tid, NT_PRSTATUS, &tc, can_log)) {
++    LOG_IF(ERROR, can_log) << "Unable to get thread pointer!";
++    return false;
++  }
++
++  *address = tc.gpr[13];
++
++  return true;
++}
++
++// Stubs for 32-bit functions not applicable on PPC64
++bool GetFloatingPointRegisters32(pid_t tid,
++                                 FloatContext* context,
++                                 bool can_log) { return false; }
++bool GetThreadArea32(pid_t tid,
++                     const ThreadContext &context,
++                     LinuxVMAddress *address,
++                     bool can_log) { return false; }
++
+ #else
+ #error Port.
+ #endif  // ARCH_CPU_X86_FAMILY
+@@ -497,6 +555,9 @@ bool Ptracer::GetThreadInfo(pid_t tid, T
+   if (is_64_bit_) {
+     return GetGeneralPurposeRegisters64(tid, &info->thread_context, can_log_) &&
+            GetFloatingPointRegisters64(tid, &info->float_context, can_log_) &&
++#if defined(ARCH_CPU_PPC64_FAMILY)
++           GetVectorRegisters64(tid, &info->vector_context, can_log_) &&
++#endif
+            GetThreadArea64(tid,
+                            info->thread_context,
+                            &info->thread_specific_data_address,
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/util/linux/thread_info.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/util/linux/thread_info.h
+@@ -39,6 +39,13 @@ struct user_vfp_exc {
+ #include <android/api-level.h>
+ #endif
+ 
++#if defined(ARCH_CPU_PPC64_FAMILY)
++#include <sys/ucontext.h>
++#if !defined(__GLIBC__)
++#include <asm/ptrace.h>
++#endif
++#endif
++
+ namespace crashpad {
+ 
+ //! \brief The set of general purpose registers for an architecture family.
+@@ -90,6 +97,8 @@ union ThreadContext {
+     uint32_t cp0_status;
+     uint32_t cp0_cause;
+     uint32_t padding1_;
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++    // PPC64 is 64-bit
+ #else
+ #error Port.
+ #endif  // ARCH_CPU_X86_FAMILY
+@@ -143,6 +152,21 @@ union ThreadContext {
+     uint64_t cp0_badvaddr;
+     uint64_t cp0_status;
+     uint64_t cp0_cause;
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++    // Reflects struct pt_regs in asm/ptrace.h.
++    uint64_t gpr[32];
++    uint64_t nip;
++    uint64_t msr;
++    uint64_t orig_gpr3;
++    uint64_t ctr;
++    uint64_t lnk;
++    uint64_t xer;
++    uint64_t ccr;
++    uint64_t softe;
++    uint64_t trap;
++    uint64_t dar;
++    uint64_t dsisr;
++    uint64_t result;
+ #else
+ #error Port.
+ #endif  // ARCH_CPU_X86_FAMILY
+@@ -154,6 +178,8 @@ union ThreadContext {
+   using NativeThreadContext = user_regs;
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+ // No appropriate NativeThreadsContext type available for MIPS
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++  using NativeThreadContext = struct pt_regs;
+ #else
+ #error Port.
+ #endif  // ARCH_CPU_X86_FAMILY || ARCH_CPU_ARM64
+@@ -229,6 +255,9 @@ union FloatContext {
+     } fpregs[32];
+     uint32_t fpcsr;
+     uint32_t fpu_id;
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++    // Crashpad's PPC support is 64-bit only, so this
++    // 32bit-only struct is declared as empty.
+ #else
+ #error Port.
+ #endif  // ARCH_CPU_X86_FAMILY
+@@ -263,6 +292,10 @@ union FloatContext {
+     double fpregs[32];
+     uint32_t fpcsr;
+     uint32_t fpu_id;
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++    // Reflects fpregset_t in sys/ucontext.h
++    double fpregs[32];
++    double fpscr;
+ #else
+ #error Port.
+ #endif  // ARCH_CPU_X86_FAMILY
+@@ -291,6 +324,8 @@ union FloatContext {
+   static_assert(sizeof(f64) == sizeof(user_fpsimd_struct), "Size mismatch");
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+ // No appropriate floating point context native type for available MIPS.
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++  static_assert(sizeof(f64) == sizeof(fpregset_t), "Size mismatch");
+ #else
+ #error Port.
+ #endif  // ARCH_CPU_X86
+@@ -298,6 +333,26 @@ union FloatContext {
+ static_assert(std::is_standard_layout<FloatContext>::value,
+               "Not standard layout");
+ 
++//! \brief The vector registers used for an architecture family
++union VectorContext {
++  struct v32_t {} v32;
++#if defined(ARCH_CPU_PPC64_FAMILY)
++  __attribute__((__aligned__(16))) // Vector context must be doubleword aligned.
++#endif
++  struct v64_t {
++#if defined(ARCH_CPU_PPC64_FAMILY)
++    // Reflects vrregset_t in sys/ucontext.h
++    uint32_t vrregs[32][4];
++    struct {
++      uint32_t __pad[3];
++      uint32_t vscr_word;
++    } vscr;
++    uint32_t vrsave;
++    uint32_t __pad[3];
++#endif
++  } v64;
++};
++
+ //! \brief A collection of `ptrace`-able information about a thread.
+ struct ThreadInfo {
+   ThreadInfo();
+@@ -309,6 +364,9 @@ struct ThreadInfo {
+   //! \brief The floating point registers for the thread.
+   FloatContext float_context;
+ 
++  //! \brief (Optional) The vector registers used for the thread.
++  VectorContext vector_context;
++
+   //! \brief The thread-local storage address for the thread.
+   LinuxVMAddress thread_specific_data_address;
+ };
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/util/misc/capture_context.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/util/misc/capture_context.h
+@@ -69,6 +69,7 @@ using NativeCPUContext = ucontext_t;
+ //!     macOS/Linux/Fuchsia | x86_64       | `%%rdi`
+ //!     Linux               | ARM/ARM64    | `r0`/`x0`
+ //!     Linux               | MIPS/MIPS64  | `$a0`
++//!     Linux               | PPC64        | `r3`
+ //!
+ //!     Additionally, the value `LR` on ARM/ARM64 will be the return address of
+ //!     this function.
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/util/misc/capture_context_linux.S
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/util/misc/capture_context_linux.S
+@@ -32,7 +32,7 @@
+   .balign 4, 0x0
+   .type CAPTURECONTEXT_SYMBOL, %function
+   .type CAPTURECONTEXT_SYMBOL2, %function
+-#elif defined(__mips__)
++#elif defined(__mips__) || defined(__powerpc64__)
+   .balign 4, 0x0
+ #endif
+ 
+@@ -423,4 +423,214 @@ CAPTURECONTEXT_SYMBOL2:
+   jr $ra
+ 
+   .set at
++#elif defined(__powerpc64__)
++  // Store r0-r31
++  std 0, 0xe8(3)   // context->uc_mcontext.gp_regs[0]
++  std 1, 0xf0(3)   // context->uc_mcontext.gp_regs[1]
++  std 2, 0xf8(3)   // context->uc_mcontext.gp_regs[2]
++  // note that r3's original value was lost
++  std 3, 0x100(3)  // context->uc_mcontext.gp_regs[3]
++  std 4, 0x108(3)  // context->uc_mcontext.gp_regs[4]
++  std 5, 0x110(3)  // context->uc_mcontext.gp_regs[5]
++  std 6, 0x118(3)  // context->uc_mcontext.gp_regs[6]
++  std 7, 0x120(3)  // context->uc_mcontext.gp_regs[7]
++  std 8, 0x128(3)  // context->uc_mcontext.gp_regs[8]
++  std 9, 0x130(3)  // context->uc_mcontext.gp_regs[9]
++  std 10, 0x138(3) // context->uc_mcontext.gp_regs[10]
++  std 11, 0x140(3) // context->uc_mcontext.gp_regs[11]
++  std 12, 0x148(3) // context->uc_mcontext.gp_regs[12]
++  std 13, 0x150(3) // context->uc_mcontext.gp_regs[13]
++  std 14, 0x158(3) // context->uc_mcontext.gp_regs[14]
++  std 15, 0x160(3) // context->uc_mcontext.gp_regs[15]
++  std 16, 0x168(3) // context->uc_mcontext.gp_regs[16]
++  std 17, 0x170(3) // context->uc_mcontext.gp_regs[17]
++  std 18, 0x178(3) // context->uc_mcontext.gp_regs[18]
++  std 19, 0x180(3) // context->uc_mcontext.gp_regs[19]
++  std 20, 0x188(3) // context->uc_mcontext.gp_regs[20]
++  std 21, 0x190(3) // context->uc_mcontext.gp_regs[21]
++  std 22, 0x198(3) // context->uc_mcontext.gp_regs[22]
++  std 23, 0x1a0(3) // context->uc_mcontext.gp_regs[23]
++  std 24, 0x1a8(3) // context->uc_mcontext.gp_regs[24]
++  std 25, 0x1b0(3) // context->uc_mcontext.gp_regs[25]
++  std 26, 0x1b8(3) // context->uc_mcontext.gp_regs[26]
++  std 27, 0x1c0(3) // context->uc_mcontext.gp_regs[27]
++  std 28, 0x1c8(3) // context->uc_mcontext.gp_regs[28]
++  std 29, 0x1d0(3) // context->uc_mcontext.gp_regs[29]
++  std 30, 0x1d8(3) // context->uc_mcontext.gp_regs[30]
++  std 31, 0x1e0(3) // context->uc_mcontext.gp_regs[31]
++
++  // For NIP, we can use the value in the link register
++  mflr 0
++  std 0, 0x1e8(3) // context->uc_mcontext.gp_regs[PT_NIP]
++
++  // CTR
++  mfctr 0
++  std 0, 0x200(3) // context->uc_mcontext.gp_regs[PT_CTR]
++
++  // For LNK, we'll use the caller's LR save area (2 stack frames up).
++  // r4 can be used as a scratch register since it has already been saved.
++  ld 4, 0(1)
++  ld 4, 16(4)
++  std 4, 0x208(3) // context->uc_mcontext.gp_regs[PT_LNK]
++
++  // XER
++  mfxer 0
++  std 0, 0x210(3) // context->uc_mcontext.gp_regs[PT_XER]
++
++  // CCR
++  mfcr 0
++  std 0, 0x218(3) // context->uc_mcontext.gp_regs[PT_CCR]
++
++  // MSR, orig_r3, MQ, TRAP, DAR, DSISR, RESULT, DSCR,
++  // not used or not relevant,  zero them out.
++  li 4, 0
++  std 4, 0x1f0(3) // context->uc_mcontext.gp_regs[PT_MSR]
++  std 4, 0x1f8(3) // context->uc_mcontext.gp_regs[PT_ORIG_R3]
++  std 4, 0x220(3) // context->uc_mcontext.gp_regs[PT_MQ]
++  std 4, 0x228(3) // context->uc_mcontext.gp_regs[PT_TRAP]
++  std 4, 0x230(3) // context->uc_mcontext.gp_regs[PT_DAR]
++  std 4, 0x238(3) // context->uc_mcontext.gp_regs[PT_DSISR]
++  std 4, 0x240(3) // context->uc_mcontext.gp_regs[PT_RESULT]
++  std 4, 0x248(3) // context->uc_mcontext.gp_regs[PT_DSCR]
++
++  // Update context->uc_mcontext.regs to point to gp_regs
++  addi 0, 3, 0xe8
++  std 0, 0xe0(3)
++
++  // Save floating point registers 0-31
++  stfd 0, 0x268(3)  // context->uc_mcontext.fp_regs[0]
++  stfd 1, 0x270(3)  // context->uc_mcontext.fp_regs[1]
++  stfd 2, 0x278(3)  // context->uc_mcontext.fp_regs[2]
++  stfd 3, 0x280(3)  // context->uc_mcontext.fp_regs[3]
++  stfd 4, 0x288(3)  // context->uc_mcontext.fp_regs[4]
++  stfd 5, 0x290(3)  // context->uc_mcontext.fp_regs[5]
++  stfd 6, 0x298(3)  // context->uc_mcontext.fp_regs[6]
++  stfd 7, 0x2a0(3)  // context->uc_mcontext.fp_regs[7]
++  stfd 8, 0x2a8(3)  // context->uc_mcontext.fp_regs[8]
++  stfd 9, 0x2b0(3)  // context->uc_mcontext.fp_regs[9]
++  stfd 10, 0x2b8(3) // context->uc_mcontext.fp_regs[10]
++  stfd 11, 0x2c0(3) // context->uc_mcontext.fp_regs[11]
++  stfd 12, 0x2c8(3) // context->uc_mcontext.fp_regs[12]
++  stfd 13, 0x2d0(3) // context->uc_mcontext.fp_regs[13]
++  stfd 14, 0x2d8(3) // context->uc_mcontext.fp_regs[14]
++  stfd 15, 0x2e0(3) // context->uc_mcontext.fp_regs[15]
++  stfd 16, 0x2e8(3) // context->uc_mcontext.fp_regs[16]
++  stfd 17, 0x2f0(3) // context->uc_mcontext.fp_regs[17]
++  stfd 18, 0x2f8(3) // context->uc_mcontext.fp_regs[18]
++  stfd 19, 0x300(3) // context->uc_mcontext.fp_regs[19]
++  stfd 20, 0x308(3) // context->uc_mcontext.fp_regs[20]
++  stfd 21, 0x310(3) // context->uc_mcontext.fp_regs[21]
++  stfd 22, 0x318(3) // context->uc_mcontext.fp_regs[22]
++  stfd 23, 0x320(3) // context->uc_mcontext.fp_regs[23]
++  stfd 24, 0x328(3) // context->uc_mcontext.fp_regs[24]
++  stfd 25, 0x330(3) // context->uc_mcontext.fp_regs[25]
++  stfd 26, 0x338(3) // context->uc_mcontext.fp_regs[26]
++  stfd 27, 0x340(3) // context->uc_mcontext.fp_regs[27]
++  stfd 28, 0x348(3) // context->uc_mcontext.fp_regs[28]
++  stfd 29, 0x350(3) // context->uc_mcontext.fp_regs[29]
++  stfd 30, 0x358(3) // context->uc_mcontext.fp_regs[30]
++  stfd 31, 0x360(3) // context->uc_mcontext.fp_regs[31]
++
++  // FPSCR
++  mffs 0
++  stfd 0, 0x368(3) // context->uc_mcontext.fp_regs[32]
++
++  // Save VMX Vector registers
++  // Update r4 to contain the base address of vmx_reserve
++  addi 4, 3, 0x378
++  // Ensure that it is quadword aligned
++  andi. 5, 4, 0xF
++  beq 1f // No alignment is necessary
++  // Address is doubleword aligned and not quadword aligned, add 8
++  addi 4, 4, 8
++
++1:
++  // Store VMX registers 0-31
++  // r4 will contain the base address
++  // r5 will contain the index
++  li 5, 0
++  stvx 0, 4, 5   // context->uc_mcontext.vmx_reserve[(align) + 0]
++  addi 5, 5, 16
++  stvx 1, 4, 5   // context->uc_mcontext.vmx_reserve[(align) + 1]
++  addi 5, 5, 16
++  stvx 2, 4, 5   // context->uc_mcontext.vmx_reserve[(align) + 2]
++  addi 5, 5, 16
++  stvx 3, 4, 5   // context->uc_mcontext.vmx_reserve[(align) + 3]
++  addi 5, 5, 16
++  stvx 4, 4, 5   // context->uc_mcontext.vmx_reserve[(align) + 4]
++  addi 5, 5, 16
++  stvx 5, 4, 5   // context->uc_mcontext.vmx_reserve[(align) + 5]
++  addi 5, 5, 16
++  stvx 6, 4, 5   // context->uc_mcontext.vmx_reserve[(align) + 6]
++  addi 5, 5, 16
++  stvx 7, 4, 5   // context->uc_mcontext.vmx_reserve[(align) + 7]
++  addi 5, 5, 16
++  stvx 8, 4, 5   // context->uc_mcontext.vmx_reserve[(align) + 8]
++  addi 5, 5, 16
++  stvx 9, 4, 5   // context->uc_mcontext.vmx_reserve[(align) + 9]
++  addi 5, 5, 16
++  stvx 10, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 10]
++  addi 5, 5, 16
++  stvx 11, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 11]
++  addi 5, 5, 16
++  stvx 12, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 12]
++  addi 5, 5, 16
++  stvx 13, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 13]
++  addi 5, 5, 16
++  stvx 14, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 14]
++  addi 5, 5, 16
++  stvx 15, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 15]
++  addi 5, 5, 16
++  stvx 16, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 16]
++  addi 5, 5, 16
++  stvx 17, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 17]
++  addi 5, 5, 16
++  stvx 18, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 18]
++  addi 5, 5, 16
++  stvx 19, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 19]
++  addi 5, 5, 16
++  stvx 20, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 20]
++  addi 5, 5, 16
++  stvx 21, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 21]
++  addi 5, 5, 16
++  stvx 22, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 22]
++  addi 5, 5, 16
++  stvx 23, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 23]
++  addi 5, 5, 16
++  stvx 24, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 24]
++  addi 5, 5, 16
++  stvx 25, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 25]
++  addi 5, 5, 16
++  stvx 26, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 26]
++  addi 5, 5, 16
++  stvx 27, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 27]
++  addi 5, 5, 16
++  stvx 28, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 28]
++  addi 5, 5, 16
++  stvx 29, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 29]
++  addi 5, 5, 16
++  stvx 30, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 30]
++  addi 5, 5, 16
++  stvx 31, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 31]
++  addi 5, 5, 16
++
++  // VSCR
++  mfvscr 0
++  stvx 0, 4, 5
++  addi 5, 5, 16
++
++  // VRSAVE
++  mfvrsave 0
++  stwx 0, 4, 5
++
++  // Update context->uc_mcontext.v_regs to point to vmx_reserve + alignment.
++  std 4, 0x370(3)
++
++  // Zero out all unused fields
++  li 4, 0
++  std 4, 0xc8(3) // context->uc_mcontext.signal
++  std 4, 0xd0(3) // context->uc_mcontext.handler
++  std 4, 0xd8(3) // context->uc_mcontext.oldmask
++
++  blr
+ #endif  // __i386__
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/util/misc/capture_context_test.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/util/misc/capture_context_test.cc
+@@ -57,7 +57,7 @@ void TestCaptureContext() {
+   uintptr_t pc = ProgramCounterFromContext(context_1);
+ 
+ #if !defined(ADDRESS_SANITIZER) && !defined(ARCH_CPU_MIPS_FAMILY) && \
+-    !defined(MEMORY_SANITIZER)
++    !defined(MEMORY_SANITIZER) && !defined(ARCH_CPU_PPC64_FAMILY)
+   // Sanitizers can cause enough code bloat that the “nearby” check would
+   // likely fail.
+   const uintptr_t kReferencePC =
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/util/misc/capture_context_test_util_linux.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/util/misc/capture_context_test_util_linux.cc
+@@ -35,6 +35,8 @@ void SanityCheckContext(const NativeCPUC
+   EXPECT_EQ(context.uc_mcontext.regs[0], FromPointerCast<uintptr_t>(&context));
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+   EXPECT_EQ(context.uc_mcontext.gregs[4], FromPointerCast<uintptr_t>(&context));
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++  EXPECT_EQ(context.uc_mcontext.gp_regs[3], FromPointerCast<uintptr_t>(&context));
+ #endif
+ }
+ 
+@@ -49,6 +51,8 @@ uintptr_t ProgramCounterFromContext(cons
+   return context.uc_mcontext.pc;
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+   return context.uc_mcontext.pc;
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++  return context.uc_mcontext.gp_regs[PT_NIP];
+ #endif
+ }
+ 
+@@ -63,6 +67,8 @@ uintptr_t StackPointerFromContext(const
+   return context.uc_mcontext.sp;
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+   return context.uc_mcontext.gregs[29];
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++  return context.uc_mcontext.gp_regs[1];
+ #endif
+ }
+ 
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/util/posix/signals_test.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/util/posix/signals_test.cc
+@@ -46,9 +46,9 @@ bool CanCauseSignal(int sig) {
+   return sig == SIGABRT ||
+          sig == SIGALRM ||
+          sig == SIGBUS ||
+-#if !defined(ARCH_CPU_ARM64)
++#if !defined(ARCH_CPU_ARM64) && !defined(ARCH_CPU_PPC64)
+          sig == SIGFPE ||
+-#endif  // !defined(ARCH_CPU_ARM64)
++#endif  // !defined(ARCH_CPU_ARM64) && !defined(ARCH_CPU_PPC64)
+ #if defined(ARCH_CPU_X86_FAMILY) || defined(ARCH_CPU_ARMEL)
+          sig == SIGILL ||
+ #endif  // defined(ARCH_CPU_X86_FAMILY) || defined(ARCH_CPU_ARMEL)
+@@ -117,9 +117,11 @@ void CauseSignal(int sig) {
+       break;
+     }
+ 
+-#if !defined(ARCH_CPU_ARM64)
++#if !defined(ARCH_CPU_ARM64) && !defined(ARCH_CPU_PPC64)
+     // ARM64 has hardware integer division instructions that don’t generate a
+     // trap for divide-by-zero, so this doesn’t produce SIGFPE.
++    //
++    // PPC64 fixed-point division by zero also doesn't produce a SIGFPE.
+     case SIGFPE: {
+       // Optimization makes this tricky, so get zero from a system call likely
+       // to succeed, and try to do something with the result.
+@@ -137,7 +139,7 @@ void CauseSignal(int sig) {
+       fstat(quotient, &stat_buf);
+       break;
+     }
+-#endif  // ARCH_CPU_ARM64
++#endif  // !defined(ARCH_CPU_ARM64) && !defined(ARCH_CPU_PPC64)
+ 
+ #if defined(ARCH_CPU_X86_FAMILY) || defined(ARCH_CPU_ARMEL)
+     case SIGILL: {
+--- a/src/3rdparty/chromium/third_party/dav1d/BUILD.gn
++++ b/src/3rdparty/chromium/third_party/dav1d/BUILD.gn
+@@ -196,6 +196,8 @@ static_library("dav1d_8bit") {
+     sources += arm_template_sources
+   } else if (current_cpu == "arm64") {
+     sources += arm_template_sources
++  } else if (current_cpu == "ppc64") {
++    sources += ppc64_template_sources
+   }
+ 
+   cflags = dav1d_copts
+@@ -226,6 +228,8 @@ static_library("dav1d_10bit") {
+     sources += arm_template_sources
+   } else if (current_cpu == "arm64") {
+     sources += arm_template_sources
++  } else if (current_cpu == "ppc64") {
++    sources += ppc64_template_sources
+   }
+ 
+   cflags = dav1d_copts
+@@ -283,6 +287,21 @@ if (current_cpu == "x86" || current_cpu
+     }
+ 
+     cflags = dav1d_copts
++  }
++} else if (current_cpu == "ppc64") {
++  static_library("dav1d_ppc") {
++    sources = [
++      "libdav1d/src/ppc/cpu.c",
++      "libdav1d/src/ppc/cpu.h",
++    ]
++
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [
++      "//build/config/compiler:no_chromium_code",
++      ":dav1d_config",
++    ]
++
++    cflags = dav1d_copts
+ 
+     deps = [ ":dav1d_headers" ]
+     allow_circular_includes_from = [ ":dav1d_headers" ]
+@@ -315,5 +334,7 @@ static_library("dav1d") {
+     }
+   } else if (current_cpu == "arm" || current_cpu == "arm64") {
+     deps += [ ":dav1d_arm" ]
++  } else if (current_cpu == "ppc64") {
++    deps += [ ":dav1d_ppc" ]
+   }
+ }
+--- a/src/3rdparty/chromium/third_party/dav1d/dav1d_generated.gni
++++ b/src/3rdparty/chromium/third_party/dav1d/dav1d_generated.gni
+@@ -103,6 +103,11 @@ arm_template_sources = [
+   "libdav1d/src/arm/mc_init_tmpl.c",
+ ]
+ 
++ppc64_template_sources = [
++  "libdav1d/src/ppc/cdef_init_tmpl.c",
++  "libdav1d/src/ppc/looprestoration_init_tmpl.c",
++]
++
+ template_sources = [
+   "libdav1d/src/cdef_apply_tmpl.c",
+   "libdav1d/src/cdef_tmpl.c",
+--- a/src/3rdparty/chromium/third_party/dav1d/generate_source.py
++++ b/src/3rdparty/chromium/third_party/dav1d/generate_source.py
+@@ -57,6 +57,8 @@ def _WriteGn(fd):
+   _WriteArray(fd, "arm64_asm_sources", _Glob("libdav1d/src/arm/64/*.S"))
+   _WriteArray(fd, "arm_template_sources", _Glob("libdav1d/src/arm/*_tmpl.c"))
+ 
++  _WriteArray(fd, "ppc64_template_sources", _Glob("libdav1d/src/ppc/*_tmpl.c"))
++
+   template_sources = _Glob("libdav1d/src/*_tmpl.c")
+   _WriteArray(fd, "template_sources", template_sources)
+ 
+--- a/src/3rdparty/chromium/third_party/dav1d/libdav1d/src/ppc/types.h
++++ b/src/3rdparty/chromium/third_party/dav1d/libdav1d/src/ppc/types.h
+@@ -51,4 +51,19 @@
+ #define u16l_to_i32(v) ((i32x4) vec_mergel((u16x8) v, vec_splat_u16(0)))
+ #define i16l_to_i32(v) ((i32x4) vec_unpackl((i16x8)v))
+ 
++#if defined(__clang__)
++#undef vec_splats
++#define vec_splats(N)                     \
++    _Generic((N),                         \
++        unsigned char:      ((u8x16)(N)), \
++        signed char:        ((i8x16)(N)), \
++        unsigned short:     ((u16x8)(N)), \
++        signed short:       ((i16x8)(N)), \
++        unsigned int:       ((u32x4)(N)), \
++        signed int:         ((i32x4)(N)), \
++        unsigned long long: ((u64x2)(N)), \
++        signed long long:   ((i64x2)(N))  \
++    )
++#endif
++
+ #endif /* DAV1D_SRC_PPC_TYPES_H */
+--- a/src/3rdparty/chromium/third_party/eigen3/BUILD.gn
++++ b/src/3rdparty/chromium/third_party/eigen3/BUILD.gn
+@@ -22,4 +22,8 @@ config("eigen_includes") {
+     # for this component on Windows on Arm due to compilation errors.
+     defines += [ "EIGEN_DONT_VECTORIZE" ]
+   }
++
++  if (target_cpu == "ppc64") {
++    defines += [ "EIGEN_DONT_VECTORIZE" ]
++  }
+ }
+--- a/src/3rdparty/chromium/third_party/libaom/BUILD.gn
++++ b/src/3rdparty/chromium/third_party/libaom/BUILD.gn
+@@ -37,6 +37,8 @@ if (enable_libaom) {
+     } else {
+       cpu_arch_full = "arm"
+     }
++  } else if (current_cpu == "ppc64") {
++    cpu_arch_full = "generic"
+   } else {
+     cpu_arch_full = current_cpu
+   }
+--- a/src/3rdparty/chromium/third_party/libgav1/options.gni
++++ b/src/3rdparty/chromium/third_party/libgav1/options.gni
+@@ -12,5 +12,5 @@ declare_args() {
+       is_chromeos_ash && (target_cpu == "arm" || target_cpu == "arm64")
+   use_libgav1_parser =
+       (is_chromeos || is_linux || is_win) &&
+-      (target_cpu == "x86" || target_cpu == "x64" || target_cpu == "arm64")
++      (target_cpu == "x86" || target_cpu == "x64" || target_cpu == "arm64" || target_cpu == "ppc64")
+ }
+--- a/src/3rdparty/chromium/third_party/lss/linux_syscall_support.h
++++ b/src/3rdparty/chromium/third_party/lss/linux_syscall_support.h
+@@ -4262,7 +4262,7 @@ struct kernel_statfs {
+       LSS_REG(2, buf);
+       LSS_BODY(void*, mmap2, "0"(__r2));
+     }
+-#else
++#elif !defined(__powerpc64__) /* ppc64 doesn't have mmap2 */
+     #define __NR__mmap2 __NR_mmap2
+     LSS_INLINE _syscall6(void*, _mmap2,            void*, s,
+                          size_t,                   l, int,               p,
+@@ -4373,7 +4373,7 @@ struct kernel_statfs {
+   #if defined(__i386__) ||                                                    \
+       defined(__ARM_ARCH_3__) || defined(__ARM_EABI__) ||                     \
+      (defined(__mips__) && _MIPS_SIM == _MIPS_SIM_ABI32) ||                   \
+-      defined(__PPC__) ||                                                     \
++     (defined(__PPC__) && !defined(__powerpc64__)) ||                                                     \
+      (defined(__s390__) && !defined(__s390x__))
+     /* On these architectures, implement mmap() with mmap2(). */
+     LSS_INLINE void* LSS_NAME(mmap)(void *s, size_t l, int p, int f, int d,
+@@ -4556,9 +4556,17 @@ struct kernel_statfs {
+     }
+   #endif
+   #if defined(__NR_fstatat64)
++    #if !defined(__GLIBC__)
++        // musl doesn't define fstatat64 fstatat
++        #undef fstatat64
++    #endif
+     LSS_INLINE _syscall4(int,   fstatat64,        int,   d,
+                          const char *,      p,
+                          struct kernel_stat64 *,   b,    int,   f)
++    #if !defined(__GLIBC__)
++    	// then restore it
++        #define fstatat64 fstatat
++    #endif
+   #endif
+   #if defined(__NR_waitpid)
+     // waitpid is polyfilled below when not available.
+--- a/src/3rdparty/chromium/third_party/pdfium/third_party/libpng16/pngpriv.h
++++ b/src/3rdparty/chromium/third_party/pdfium/third_party/libpng16/pngpriv.h
+@@ -196,11 +196,7 @@
+ #endif
+ 
+ #ifndef PNG_POWERPC_VSX_OPT
+-#  if defined(__PPC64__) && defined(__ALTIVEC__) && defined(__VSX__)
+-#     define PNG_POWERPC_VSX_OPT 2
+-#  else
+-#     define PNG_POWERPC_VSX_OPT 0
+-#  endif
++#  define PNG_POWERPC_VSX_OPT 0
+ #endif
+ 
+ #ifndef PNG_INTEL_SSE_OPT
+--- a/src/3rdparty/chromium/third_party/pffft/src/pffft.c
++++ b/src/3rdparty/chromium/third_party/pffft/src/pffft.c
+@@ -100,6 +100,7 @@
+    Altivec support macros 
+ */
+ #if !defined(PFFFT_SIMD_DISABLE) && (defined(__ppc__) || defined(__ppc64__))
++#include <altivec.h>
+ typedef vector float v4sf;
+ #  define SIMD_SZ 4
+ #  define VZERO() ((vector float) vec_splat_u8(0))
+--- a/src/3rdparty/chromium/third_party/skia/src/sksl/SkSLString.cpp
++++ b/src/3rdparty/chromium/third_party/skia/src/sksl/SkSLString.cpp
+@@ -142,7 +142,12 @@ String to_string(double value) {
+     if (needsDotZero) {
+         buffer << ".0";
+     }
+-    return String(buffer.str().c_str());
++
++    std::string ret(buffer.str());
++    if (signbit(value) && ret[0] == '.') {
++        ret[0] = '-';
++    }
++    return String(ret.c_str());
+ }
+ 
+ bool stod(const skstd::string_view& s, SKSL_FLOAT* value) {
+--- a/src/3rdparty/chromium/third_party/sqlite/src/amalgamation/sqlite3.c
++++ b/src/3rdparty/chromium/third_party/sqlite/src/amalgamation/sqlite3.c
+@@ -14628,7 +14628,8 @@ typedef INT16_TYPE LogEst;
+ # if defined(i386)      || defined(__i386__)      || defined(_M_IX86) ||    \
+      defined(__x86_64)  || defined(__x86_64__)    || defined(_M_X64)  ||    \
+      defined(_M_AMD64)  || defined(_M_ARM)        || defined(__x86)   ||    \
+-     defined(__ARMEL__) || defined(__AARCH64EL__) || defined(_M_ARM64)
++     defined(__ARMEL__) || defined(__AARCH64EL__) || defined(_M_ARM64) ||   \
++     defined(__powerpc64__) && (__BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__)
+ #   define SQLITE_BYTEORDER    1234
+ # elif defined(sparc)     || defined(__ppc__) || \
+        defined(__ARMEB__) || defined(__AARCH64EB__)
+--- a/src/3rdparty/chromium/third_party/sqlite/src/amalgamation_dev/sqlite3.c
++++ b/src/3rdparty/chromium/third_party/sqlite/src/amalgamation_dev/sqlite3.c
+@@ -14641,7 +14641,8 @@ typedef INT16_TYPE LogEst;
+ # if defined(i386)      || defined(__i386__)      || defined(_M_IX86) ||    \
+      defined(__x86_64)  || defined(__x86_64__)    || defined(_M_X64)  ||    \
+      defined(_M_AMD64)  || defined(_M_ARM)        || defined(__x86)   ||    \
+-     defined(__ARMEL__) || defined(__AARCH64EL__) || defined(_M_ARM64)
++     defined(__ARMEL__) || defined(__AARCH64EL__) || defined(_M_ARM64) ||   \
++     defined(__powerpc64__) && (__BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__)
+ #   define SQLITE_BYTEORDER    1234
+ # elif defined(sparc)     || defined(__ppc__) || \
+        defined(__ARMEB__) || defined(__AARCH64EB__)
+--- a/src/3rdparty/chromium/third_party/sqlite/src/ext/rtree/rtree.c
++++ b/src/3rdparty/chromium/third_party/sqlite/src/ext/rtree/rtree.c
+@@ -450,7 +450,7 @@ struct RtreeMatchArg {
+ #if defined(i386)     || defined(__i386__)   || defined(_M_IX86) ||    \
+     defined(__x86_64) || defined(__x86_64__) || defined(_M_X64)  ||    \
+     defined(_M_AMD64) || defined(_M_ARM)     || defined(__x86)   ||    \
+-    defined(__arm__)
++    defined(__arm__) || defined(__powerpc64__) && (__BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__)
+ # define SQLITE_BYTEORDER    1234
+ #elif defined(sparc)    || defined(__ppc__)
+ # define SQLITE_BYTEORDER    4321
+--- a/src/3rdparty/chromium/third_party/sqlite/src/src/sqliteInt.h
++++ b/src/3rdparty/chromium/third_party/sqlite/src/src/sqliteInt.h
+@@ -890,7 +890,8 @@ typedef INT16_TYPE LogEst;
+ # if defined(i386)      || defined(__i386__)      || defined(_M_IX86) ||    \
+      defined(__x86_64)  || defined(__x86_64__)    || defined(_M_X64)  ||    \
+      defined(_M_AMD64)  || defined(_M_ARM)        || defined(__x86)   ||    \
+-     defined(__ARMEL__) || defined(__AARCH64EL__) || defined(_M_ARM64)
++     defined(__ARMEL__) || defined(__AARCH64EL__) || defined(_M_ARM64) || \
++     defined(__powerpc64__) && (__BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__)
+ #   define SQLITE_BYTEORDER    1234
+ # elif defined(sparc)     || defined(__ppc__) || \
+        defined(__ARMEB__) || defined(__AARCH64EB__)
+--- a/src/3rdparty/chromium/third_party/webrtc/modules/desktop_capture/differ_block.cc
++++ b/src/3rdparty/chromium/third_party/webrtc/modules/desktop_capture/differ_block.cc
+@@ -30,11 +30,7 @@ bool VectorDifference(const uint8_t* ima
+   static bool (*diff_proc)(const uint8_t*, const uint8_t*) = nullptr;
+ 
+   if (!diff_proc) {
+-#if defined(WEBRTC_ARCH_ARM_FAMILY) || defined(WEBRTC_ARCH_MIPS_FAMILY)
+-    // For ARM and MIPS processors, always use C version.
+-    // TODO(hclam): Implement a NEON version.
+-    diff_proc = &VectorDifference_C;
+-#else
++#if defined(WEBRTC_ARCH_X86_FAMILY)
+     bool have_sse2 = GetCPUInfo(kSSE2) != 0;
+     // For x86 processors, check if SSE2 is supported.
+     if (have_sse2 && kBlockSize == 32) {
+@@ -44,6 +40,10 @@ bool VectorDifference(const uint8_t* ima
+     } else {
+       diff_proc = &VectorDifference_C;
+     }
++#else
++    // For other processors, always use C version.
++    // TODO(hclam): Implement a NEON version.
++    diff_proc = &VectorDifference_C;
+ #endif
+   }
+ 
+--- a/src/3rdparty/chromium/v8/BUILD.gn
++++ b/src/3rdparty/chromium/v8/BUILD.gn
+@@ -1083,6 +1083,12 @@ config("toolchain") {
+     }
+     if (host_byteorder == "little") {
+       defines += [ "V8_TARGET_ARCH_PPC_LE" ]
++      cflags += [
++        # Enable usage of AltiVec, VSX, and other POWER8 and higher features
++        "-mcpu=power8",
++        "-maltivec",
++        "-mvsx",
++      ]
+     } else if (host_byteorder == "big") {
+       defines += [ "V8_TARGET_ARCH_PPC_BE" ]
+       if (current_os == "aix") {
+--- a/src/3rdparty/chromium/ui/gl/features.gni
++++ b/src/3rdparty/chromium/ui/gl/features.gni
+@@ -35,7 +35,8 @@ declare_args() {
+                         (is_mac && use_egl) || is_chromeos_ash || is_fuchsia) &&
+                        (target_cpu == "x86" || target_cpu == "x64" ||
+                         target_cpu == "arm" || target_cpu == "arm64" ||
+-                        target_cpu == "mipsel" || target_cpu == "mips64el")
++                        target_cpu == "mipsel" || target_cpu == "mips64el" ||
++                        target_cpu == "ppc64")
+ }
+ 
+ use_glx = use_x11 || ozone_platform_x11
+--- a/src/3rdparty/chromium/v8/test/BUILD.gn
++++ b/src/3rdparty/chromium/v8/test/BUILD.gn
+@@ -42,7 +42,6 @@ group("gn_all") {
+       "benchmarks/cpp:gn_all",
+       "cctest:cctest",
+       "cctest:generate-bytecode-expectations",
+-      "unittests:unittests",
+     ]
+   }
+ }
+@@ -84,7 +83,6 @@ group("v8_bot_default") {
+     "message:v8_message",
+     "mjsunit:v8_mjsunit",
+     "mkgrokdump:mkgrokdump",
+-    "unittests:unittests",
+     "webkit:v8_webkit",
+   ]
+ 
+@@ -109,7 +107,6 @@ group("v8_default") {
+     "message:v8_message",
+     "mjsunit:v8_mjsunit",
+     "mkgrokdump:mkgrokdump",
+-    "unittests:unittests",
+   ]
+ 
+   if (v8_enable_webassembly) {
+--- /dev/null
++++ b/src/3rdparty/chromium/dev/null
+@@ -0,0 +1,39 @@
++/*
++ * Autogenerated by the Meson build system.
++ * Do not edit, your changes will be lost.
++ */
++
++#pragma once
++
++#define ARCH_AARCH64 0
++
++#define ARCH_ARM 0
++
++#define ARCH_PPC64LE 1
++
++#define ARCH_X86 0
++
++#define ARCH_X86_32 0
++
++#define ARCH_X86_64 0
++
++#define CONFIG_16BPC 1
++
++#define CONFIG_8BPC 1
++
++// #define CONFIG_LOG 1 -- Logging is controlled by Chromium
++
++#define ENDIANNESS_BIG 0
++
++#define HAVE_ASM 1
++
++#define HAVE_CLOCK_GETTIME 1
++
++#define HAVE_DLSYM 1
++
++#define HAVE_GETAUXVAL 1
++
++#define HAVE_POSIX_MEMALIGN 1
++
++#define HAVE_UNISTD_H 1
++
+--- a/src/3rdparty/chromium/third_party/abseil-cpp/absl/base/internal/unscaledcycleclock.h
++++ b/src/3rdparty/chromium/third_party/abseil-cpp/absl/base/internal/unscaledcycleclock.h
+@@ -46,7 +46,7 @@
+ 
+ // The following platforms have an implementation of a hardware counter.
+ #if defined(__i386__) || defined(__x86_64__) || defined(__aarch64__) || \
+-  defined(__powerpc__) || defined(__ppc__) || \
++  ((defined(__powerpc__) || defined(__ppc__)) && defined(__GLIBC__)) || \
+   defined(_M_IX86) || defined(_M_X64)
+ #define ABSL_HAVE_UNSCALED_CYCLECLOCK_IMPLEMENTATION 1
+ #else
+--- a/src/3rdparty/chromium/third_party/abseil-cpp/absl/debugging/internal/stacktrace_config.h
++++ b/src/3rdparty/chromium/third_party/abseil-cpp/absl/debugging/internal/stacktrace_config.h
+@@ -59,7 +59,7 @@
+ #elif defined(__i386__) || defined(__x86_64__)
+ #define ABSL_STACKTRACE_INL_HEADER \
+   "absl/debugging/internal/stacktrace_x86-inl.inc"
+-#elif defined(__ppc__) || defined(__PPC__)
++#elif defined(__ppc__) || defined(__PPC__) && defined(__GLIBC__)
+ #define ABSL_STACKTRACE_INL_HEADER \
+   "absl/debugging/internal/stacktrace_powerpc-inl.inc"
+ #elif defined(__aarch64__)
+--- a/src/3rdparty/chromium/base/allocator/partition_allocator/partition_alloc_config.h
++++ b/src/3rdparty/chromium/base/allocator/partition_allocator/partition_alloc_config.h
+@@ -100,7 +100,8 @@ static_assert(sizeof(void*) != 8, "");
+ // PUT_REF_COUNT_IN_PREVIOUS_SLOT does. In this case the refcount overlaps with
+ // the next pointer shadow for the smallest bucket.
+ #if !(defined(OS_MAC) && defined(ARCH_CPU_ARM64)) && \
+-    !BUILDFLAG(PUT_REF_COUNT_IN_PREVIOUS_SLOT)
++    !BUILDFLAG(PUT_REF_COUNT_IN_PREVIOUS_SLOT) && \
++    (!defined(__GLIBC) && !defined(__powerpc64__))
+ #define PA_HAS_FREELIST_HARDENING
+ #endif
+ 
+--- a/src/3rdparty/chromium/build/download_nacl_toolchains.py
++++ b/src/3rdparty/chromium/build/download_nacl_toolchains.py
+@@ -13,6 +13,8 @@ import sys
+ 
+ 
+ def Main(args):
++  if 'disable_nacl=1' in os.environ.get('GYP_DEFINES', ''):
++    return 0
+   script_dir = os.path.dirname(os.path.abspath(__file__))
+   src_dir = os.path.dirname(script_dir)
+   nacl_dir = os.path.join(src_dir, 'native_client')
+--- a/src/3rdparty/chromium/chrome/installer/linux/BUILD.gn
++++ b/src/3rdparty/chromium/chrome/installer/linux/BUILD.gn
+@@ -100,8 +100,6 @@ packaging_files = packaging_files_binari
+                     "$root_out_dir/xdg-mime",
+                     "$root_out_dir/xdg-settings",
+                     "$root_out_dir/locales/en-US.pak",
+-                    "$root_out_dir/MEIPreload/manifest.json",
+-                    "$root_out_dir/MEIPreload/preloaded_data.pb",
+                   ]
+ 
+ action_foreach("calculate_deb_dependencies") {
+@@ -321,7 +319,6 @@ group("installer_deps") {
+     ":theme_files",
+     "//chrome",
+     "//chrome:packed_resources",
+-    "//chrome/browser/resources/media/mei_preload:component",
+     "//components/crash/core/app:chrome_crashpad_handler",
+     "//sandbox/linux:chrome_sandbox",
+   ]
+--- /dev/null
++++ b/src/3rdparty/chromium/sandbox/linux/system_headers/ppc64_linux_syscalls.h
+@@ -0,0 +1,12 @@
++// Copyright 2014 The Chromium Authors. All rights reserved.
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++#ifndef SANDBOX_LINUX_SYSTEM_HEADERS_PPC64_LINUX_SYSCALLS_H_
++#define SANDBOX_LINUX_SYSTEM_HEADERS_PPC64_LINUX_SYSCALLS_H_
++
++#include <asm/unistd.h>
++
++//TODO: is it necessary to redefine syscall numbers for PPC64?
++
++#endif  // SANDBOX_LINUX_SYSTEM_HEADERS_PPC64_LINUX_SYSCALLS_H_
+--- /dev/null
++++ b/src/3rdparty/chromium/sandbox/linux/system_headers/ppc64_linux_ucontext.h
+@@ -0,0 +1,12 @@
++// Copyright 2014 The Chromium Authors. All rights reserved.
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++#ifndef SANDBOX_LINUX_SYSTEM_HEADERS_PPC64_LINUX_UCONTEXT_H_
++#define SANDBOX_LINUX_SYSTEM_HEADERS_PPC64_LINUX_UCONTEXT_H_
++
++#include <sys/ucontext.h>
++
++//TODO: is it necessary to redefine ucontext on PPC64?
++
++#endif  // SANDBOX_LINUX_SYSTEM_HEADERS_PPC64_LINUX_UCONTEXT_H_
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/util/net/http_transport_libcurl.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/util/net/http_transport_libcurl.cc
+@@ -236,6 +236,12 @@ std::string UserAgent() {
+ #elif defined(ARCH_CPU_BIG_ENDIAN)
+     static constexpr char arch[] = "aarch64_be";
+ #endif
++#elif defined(__powerpc64__)
++#if defined(ARCH_CPU_LITTLE_ENDIAN)
++    static constexpr char arch[] = "ppc64le";
++#elif defined(ARCH_CPU_BIG_ENDIAN)
++    static constexpr char arch[] = "ppc64";
++#endif
+ #else
+ #error Port
+ #endif
+--- /dev/null
++++ b/src/3rdparty/chromium/third_party/dav1d/config/linux/ppc64/config.h
+@@ -0,0 +1,39 @@
++/*
++ * Autogenerated by the Meson build system.
++ * Do not edit, your changes will be lost.
++ */
++
++#pragma once
++
++#define ARCH_AARCH64 0
++
++#define ARCH_ARM 0
++
++#define ARCH_PPC64LE 1
++
++#define ARCH_X86 0
++
++#define ARCH_X86_32 0
++
++#define ARCH_X86_64 0
++
++#define CONFIG_16BPC 1
++
++#define CONFIG_8BPC 1
++
++// #define CONFIG_LOG 1 -- Logging is controlled by Chromium
++
++#define ENDIANNESS_BIG 0
++
++#define HAVE_ASM 1
++
++#define HAVE_CLOCK_GETTIME 1
++
++#define HAVE_DLSYM 1
++
++#define HAVE_GETAUXVAL 1
++
++#define HAVE_POSIX_MEMALIGN 1
++
++#define HAVE_UNISTD_H 1
++
diff --git a/srcpkgs/qt6-webengine/patches/0903-xxx-ppc64le-swiftshader.patch b/srcpkgs/qt6-webengine/patches/0903-xxx-ppc64le-swiftshader.patch
new file mode 100644
index 000000000000..1a8cd8368da1
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0903-xxx-ppc64le-swiftshader.patch
@@ -0,0 +1,18 @@
+--- a/src/3rdparty/chromium/third_party/swiftshader/third_party/llvm-10.0/BUILD.gn
++++ b/src/3rdparty/chromium/third_party/swiftshader/third_party/llvm-10.0/BUILD.gn
+@@ -576,6 +576,7 @@ swiftshader_llvm_source_set("swiftshader
+     "llvm/lib/MC/MCAsmInfoCOFF.cpp",
+     "llvm/lib/MC/MCAsmInfoDarwin.cpp",
+     "llvm/lib/MC/MCAsmInfoELF.cpp",
++    "llvm/lib/MC/MCAsmInfoXCOFF.cpp",
+     "llvm/lib/MC/MCAsmMacro.cpp",
+     "llvm/lib/MC/MCAsmStreamer.cpp",
+     "llvm/lib/MC/MCAssembler.cpp",
+@@ -631,6 +632,7 @@ swiftshader_llvm_source_set("swiftshader
+     "llvm/lib/MC/MCWinCOFFStreamer.cpp",
+     "llvm/lib/MC/MCWinEH.cpp",
+     "llvm/lib/MC/MCXCOFFStreamer.cpp",
++    "llvm/lib/MC/MCXCOFFObjectTargetWriter.cpp",
+     "llvm/lib/MC/MachObjectWriter.cpp",
+     "llvm/lib/MC/StringTableBuilder.cpp",
+     "llvm/lib/MC/SubtargetFeature.cpp",
diff --git a/srcpkgs/qt6-webengine/patches/cross-build-examples.patch b/srcpkgs/qt6-webengine/patches/cross-build-examples.patch
new file mode 100644
index 000000000000..4598643cc0dc
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/cross-build-examples.patch
@@ -0,0 +1,16 @@
+--- a/examples/CMakeLists.txt
++++ b/examples/CMakeLists.txt
+@@ -1,7 +1,6 @@
+ cmake_minimum_required(VERSION 3.16)
+ 
+ qt_examples_build_begin(EXTERNAL_BUILD)
+-if(NOT CMAKE_CROSSCOMPILING) #QTBUG-86533
+     if(TARGET Qt::WebEngineCore)
+         add_subdirectory(webenginequick)
+     endif()
+@@ -14,5 +13,4 @@ if(NOT CMAKE_CROSSCOMPILING) #QTBUG-8653
+     if(TARGET Qt::PdfWidgets)
+         add_subdirectory(pdfwidgets)
+     endif()
+-endif()
+ qt_examples_build_end()
diff --git a/srcpkgs/qt6-webengine/template b/srcpkgs/qt6-webengine/template
new file mode 100644
index 000000000000..2f0de2c7adf6
--- /dev/null
+++ b/srcpkgs/qt6-webengine/template
@@ -0,0 +1,178 @@
+# Template file for 'qt6-webengine'
+pkgname=qt6-webengine
+version=6.3.1
+revision=1
+wrksrc="qtwebengine-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true
+ -DQT_FEATURE_webengine_system_ffmpeg=ON
+ -DQT_FEATURE_webengine_system_libevent=ON
+ -DQT_FEATURE_webengine_system_gn=ON
+ -DQT_FEATURE_webengine_system_icu=ON
+ -DQT_FEATURE_webengine_webrtc_pipewire=ON
+ -DNinja_EXECUTABLE=$XBPS_WRAPPERDIR/ninja
+ $(vopt_bool examples QT_BUILD_EXAMPLES)
+ -DPKG_CONFIG_HOST_EXECUTABLE=${PKG_CONFIG_FOR_BUILD}"
+hostmakedepends="qt6-base-devel perl pkg-config nodejs python3-html5lib
+ qt6-declarative-devel protobuf gperf flex nss-devel libwebp-devel
+ icu-devel libevent-devel"
+makedepends="qt6-base-devel qt6-declarative-devel pulseaudio-devel
+ qt6-tools-devel qt6-websockets-devel libflac-devel
+ alsa-lib-devel libvpx-devel pciutils-devel opus-devel libxslt-devel
+ libxml2-devel freetype-devel lcms2-devel libwebp-devel icu-devel
+ re2-devel zlib-devel libpng-devel minizip-devel harfbuzz-devel
+ nss-devel libXcursor-devel libXcomposite-devel libXScrnSaver-devel
+ protobuf-devel ffmpeg-devel snappy-devel libevent-devel pipewire-devel
+ libxkbfile-devel qt6-location-devel qt6-webchannel-devel libxshmfence-devel"
+# Not working properly with HTTPS without those packages
+# Not strict dependencies, though
+depends="qt6-plugin-tls-openssl qt6-plugin-tls-qcertonly"
+short_desc="Cross-platform application and UI framework - Webengine"
+maintainer="John <me@johnnynator.dev>"
+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=ad7a33b21a956deda37c587d50f821ca3816403ae31ba9b5d59d01561ad66e47
+
+if [ -z "$CROSS_BUILD" ];then
+	configure_args+=" -DCMAKE_TOOLCHAIN_FILE=/usr/lib/cmake/Qt6/qt.toolchain.cmake"
+fi
+
+if [ "$XBPS_LIBC" = "musl" ]; then
+	hostmakedepends+=" musl-legacy-compat"
+fi
+
+if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
+	makedepends+=" musl-legacy-compat"
+fi
+
+if [ ! "$XBPS_WORDSIZE" = "$XBPS_TARGET_WORDSIZE" ]; then
+	broken="webengine can be built only if word size matches"
+fi
+
+if [ "$XBPS_WORDSIZE" -eq 32 ]; then
+	nodebug=yes
+	LDFLAGS="-Wl,--no-keep-memory"
+fi
+
+if [ "$XBPS_TARGET_ENDIAN" != "le" ]; then
+	broken="webengine only supports little endian"
+fi
+
+build_options="sndio examples"
+build_options_default=""
+desc_option_examples="Build examples"
+desc_option_sndio="Enable support for sndio"
+
+subpackages="qt6-webengine-devel"
+
+if [ "$build_option_examples" ]; then
+	subpackages+=" qt6-webengine-examples"
+fi
+
+_bootstrap_gn() {
+	# Bootstrap gn (generate ninja)
+	echo "Bootstrapping 'gn'"
+	cd ${wrksrc}/src/3rdparty/gn
+	CFLAGS="$CFLAGS_host" CXXFLAGS="$CXXFLAGS_host" LDFLAGS="$LDFLAGS_host" \
+	PKGCONFIG=/usr/bin/pkgconfig PKG_CONFIG_PATH="/usr/lib/pkgconfig:/usr/share/pkgconfig" \
+		python3 build/gen.py --no-last-commit-position --out-path \
+			${wrksrc}/src/3rdparty/gn/out/Release --cc "${CC_host:-$CC}" \
+			--cxx "${CXX_host:-$CXX}" --ld "${CXX_host:-$CXX}" --ar "${AR_host:-$AR}" \
+			--qt-version "${version}.qtwebengine.qt.io"
+	ninja -C out/Release gn
+	cd ${wrksrc}
+}
+
+_unbundle_libs() {
+	cd ${wrksrc}/src/3rdparty/chromium
+	echo Dropping bundled libs from chromium
+	# Use system-provided libraries.
+	# TODO: use_system_hunspell (upstream changes needed).
+	# TODO: use_system_libsrtp.
+	# TODO: use_system_libusb (http://crbug.com/266149).
+	# TODO: use_system_ssl (http://crbug.com/58087).
+	# TODO: use_system_sqlite (http://crbug.com/22208).
+	# TODO: use_system_icu (segfaults)
+	# use_system_protobuf
+	# use_system_v8=1
+	# use_system_zlib=1
+	# bzip2 jsoncpp minizip xdg_utils speex
+	system="
+		ffmpeg
+		flac
+		fontconfig
+		freetype
+		harfbuzz-ng
+		icu
+		libdrm
+		libevent
+		libjpeg
+		libpng
+		libwebp
+		libxml
+		libxslt
+		opus
+		re2
+		snappy
+	"
+	build/linux/unbundle/replace_gn_files.py --system-libraries ${system}
+}
+
+# Provide a wrapper to run ./xbps-src -j 1 build later
+_wrap_ninja() {
+	cat <<-'_EOF' >"$XBPS_WRAPPERDIR"/ninja
+	#!/bin/sh
+
+	exec /usr/bin/ninja $NINJAFLAGS "$@"
+	_EOF
+	chmod +x "$XBPS_WRAPPERDIR"/ninja
+}
+
+pre_configure() {
+	_bootstrap_gn
+	# _unbundle_libs
+	_wrap_ninja
+	export PATH="$PATH:${wrksrc}/src/3rdparty/gn/out/Release"
+}
+
+pre_build() {
+	export PATH="$PATH:${wrksrc}/src/3rdparty/gn/out/Release"
+	export NINJAFLAGS="$makejobs"
+
+}
+
+pre_install() {
+	export PATH="$PATH:${wrksrc}/src/3rdparty/gn/out/Release"
+}
+
+post_install() {
+	local _file
+	find "${DESTDIR}"/usr/lib/qt6/examples \
+		-path '*/lib/qt6/**/lib/qt6/*' -type f |
+	while read _file; do
+		mv "$_file" "${_file%/lib/qt6/*}"
+	done
+}
+
+qt6-webengine-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} qt6-webchannel-devel>=${version}_1
+	 qt6-declarative-devel>=${version}_1 qt6-location-devel>=${version}_1"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/pkgconfig
+		vmove usr/lib/qt6/mkspecs
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
+	}
+}
+
+qt6-webengine-examples_package() {
+	short_desc+=" - sample browsers"
+	pkg_install() {
+		vmove usr/lib/qt6/examples
+	}
+}
diff --git a/srcpkgs/qt6-webengine/update b/srcpkgs/qt6-webengine/update
new file mode 100644
index 000000000000..844552465222
--- /dev/null
+++ b/srcpkgs/qt6-webengine/update
@@ -0,0 +1 @@
+pkgname="${pkgname/6-/}-everywhere-src"

From e829b7d3fe5d23dbe2de985aa63768e96a03db34 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 14 Aug 2022 18:45:07 +0700
Subject: [PATCH 27/27] fixup! qt6-base

---
 srcpkgs/qt6-base/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/qt6-base/template b/srcpkgs/qt6-base/template
index 683598f7707d..04998704da8c 100644
--- a/srcpkgs/qt6-base/template
+++ b/srcpkgs/qt6-base/template
@@ -80,6 +80,7 @@ do_check() {
 	# Unknown platform linux-g++ :/
 	failing_tests+=" mockplugins test_import_plugins
 		test_static_resources test_generating_cpp_exports"
+	failing_tests+=" tst_qstorageinfo"
 	local ctest_exclude="("
 	for failure in $failing_tests; do
 		ctest_exclude+="$failure|"

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

* Re: WIP Qt6 webengine
  2022-08-07  4:36 [PR PATCH] WIP Qt6 webengine sgn
                   ` (20 preceding siblings ...)
  2022-08-14 11:45 ` [PR PATCH] [Updated] " sgn
@ 2022-08-14 12:14 ` skmpz
  2022-08-14 12:14 ` skmpz
                   ` (15 subsequent siblings)
  37 siblings, 0 replies; 39+ messages in thread
From: skmpz @ 2022-08-14 12:14 UTC (permalink / raw)
  To: ml

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

New comment by skmpz on void-packages repository

https://github.com/void-linux/void-packages/pull/38509#issuecomment-1214357871

Comment:
I'm using LVM+ext4 full disk encryption as described in the docs (https://docs.voidlinux.org/installation/guides/fde.html).

Build with x86-64 is ok now.. I will retry building all the packages again and will update.

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

* Re: WIP Qt6 webengine
  2022-08-07  4:36 [PR PATCH] WIP Qt6 webengine sgn
                   ` (21 preceding siblings ...)
  2022-08-14 12:14 ` skmpz
@ 2022-08-14 12:14 ` skmpz
  2022-08-14 13:34 ` [PR PATCH] [Updated] " sgn
                   ` (14 subsequent siblings)
  37 siblings, 0 replies; 39+ messages in thread
From: skmpz @ 2022-08-14 12:14 UTC (permalink / raw)
  To: ml

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

New comment by skmpz on void-packages repository

https://github.com/void-linux/void-packages/pull/38509#issuecomment-1214357871

Comment:
I'm using LVM+ext4 full disk encryption as described in the docs (https://docs.voidlinux.org/installation/guides/fde.html).

Build with x86-64 (glibc) is ok now.. I will retry building all the packages again and will update.

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

* Re: [PR PATCH] [Updated] WIP Qt6 webengine
  2022-08-07  4:36 [PR PATCH] WIP Qt6 webengine sgn
                   ` (22 preceding siblings ...)
  2022-08-14 12:14 ` skmpz
@ 2022-08-14 13:34 ` sgn
  2022-08-14 13:48 ` sgn
                   ` (13 subsequent siblings)
  37 siblings, 0 replies; 39+ messages in thread
From: sgn @ 2022-08-14 13:34 UTC (permalink / raw)
  To: ml

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

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

https://github.com/sgn/void-packages qt6-webengine
https://github.com/void-linux/void-packages/pull/38509

WIP Qt6 webengine
<!-- Uncomment relevant sections and delete options which are not applicable -->

Never tried to cross build
Functionality works (at least can view youtube video on x86_64-musl)

#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**
[ci skip]

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-qt6-webengine-38509.patch --]
[-- Type: text/x-diff, Size: 332075 bytes --]

From 5b54bd34137e7a64b8747125383b504673b3f134 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:07 +0700
Subject: [PATCH 01/28] qt6-base: update to 6.3.1.

---
 srcpkgs/qt6-base/patches/arm-yield.patch      | 37 +++++++++++++++++++
 srcpkgs/qt6-base/patches/complex-text.patch   |  0
 srcpkgs/qt6-base/patches/feenableexcept.patch | 13 +++++++
 srcpkgs/qt6-base/patches/libatomic.patch      | 14 -------
 srcpkgs/qt6-base/patches/markdown-musl.patch  | 31 ++++++++++++++++
 srcpkgs/qt6-base/patches/pthread_yield.patch  | 20 ++++++++++
 ...urce-root-dir-last-modified-is-valid.patch | 13 +++++++
 srcpkgs/qt6-base/patches/zfs-storage.patch    | 20 ++++++++++
 srcpkgs/qt6-base/template                     | 21 ++++++++---
 9 files changed, 149 insertions(+), 20 deletions(-)
 create mode 100644 srcpkgs/qt6-base/patches/arm-yield.patch
 create mode 100644 srcpkgs/qt6-base/patches/complex-text.patch
 create mode 100644 srcpkgs/qt6-base/patches/feenableexcept.patch
 delete mode 100644 srcpkgs/qt6-base/patches/libatomic.patch
 create mode 100644 srcpkgs/qt6-base/patches/markdown-musl.patch
 create mode 100644 srcpkgs/qt6-base/patches/pthread_yield.patch
 create mode 100644 srcpkgs/qt6-base/patches/resource-root-dir-last-modified-is-valid.patch
 create mode 100644 srcpkgs/qt6-base/patches/zfs-storage.patch

diff --git a/srcpkgs/qt6-base/patches/arm-yield.patch b/srcpkgs/qt6-base/patches/arm-yield.patch
new file mode 100644
index 000000000000..2bef8584b88d
--- /dev/null
+++ b/srcpkgs/qt6-base/patches/arm-yield.patch
@@ -0,0 +1,37 @@
+From 8128abeaece5b05476f79ff493597b838b223512 Mon Sep 17 00:00:00 2001
+From: Marc Mutz <marc.mutz@qt.io>
+Date: Wed, 3 Aug 2022 17:23:20 +0200
+Subject: Fix qYieldCpu() for ARM < ARMv7
+
+Apparently, we still support these architecture versions, and there's
+no way to detect ARMv6k-or-greater specifically, so exclude yield for
+ARM < ARMv7.
+
+Amends 877c158c5976bebffd0ff02c39b6b66a842c6344.
+
+Fixes: QTBUG-104316
+Pick-to: 6.4 6.3
+Change-Id: I51a2f0f8e0993dba41e47bb6110473ac8e7cd32a
+Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
+---
+ src/corelib/global/qsimd_p.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+(limited to 'src/corelib/global/qsimd_p.h')
+
+diff --git a/src/corelib/global/qsimd_p.h b/src/corelib/global/qsimd_p.h
+index ad78c3934f..093fc3aedc 100644
+--- a/src/corelib/global/qsimd_p.h
++++ b/src/corelib/global/qsimd_p.h
+@@ -397,7 +397,7 @@ static inline void qYieldCpu()
+ {
+ #if defined(Q_PROCESSOR_X86)
+     _mm_pause();
+-#elif defined(Q_PROCESSOR_ARM)
++#elif defined(Q_PROCESSOR_ARM) && Q_PROCESSOR_ARM >= 7 /* yield was added in ARMv7 */
+ #  if __has_builtin(__builtin_arm_yield) /* e.g. Clang */
+     __builtin_arm_yield();
+ #  elif defined(Q_OS_INTEGRITY) || \
+-- 
+cgit v1.2.1
+
diff --git a/srcpkgs/qt6-base/patches/complex-text.patch b/srcpkgs/qt6-base/patches/complex-text.patch
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/srcpkgs/qt6-base/patches/feenableexcept.patch b/srcpkgs/qt6-base/patches/feenableexcept.patch
new file mode 100644
index 000000000000..1b561731b634
--- /dev/null
+++ b/srcpkgs/qt6-base/patches/feenableexcept.patch
@@ -0,0 +1,13 @@
+--- a/tests/auto/corelib/text/qlocale/tst_qlocale.cpp
++++ b/tests/auto/corelib/text/qlocale/tst_qlocale.cpp
+@@ -1453,8 +1453,10 @@ void tst_QLocale::fpExceptions()
+     fenv_t envp;
+     fegetenv(&envp);
+     feclearexcept(FE_ALL_EXCEPT);
++#ifdef __GLIBC__
+     feenableexcept(FE_DIVBYZERO | FE_OVERFLOW | FE_UNDERFLOW | FE_INVALID);
+ #endif
++#endif
+ 
+     QString::number(1000.1245);
+     QString::number(1.1);
diff --git a/srcpkgs/qt6-base/patches/libatomic.patch b/srcpkgs/qt6-base/patches/libatomic.patch
deleted file mode 100644
index 2f7a807518e4..000000000000
--- a/srcpkgs/qt6-base/patches/libatomic.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Index: cmake/FindWrapAtomic.cmake
-===================================================================
---- a/cmake/FindWrapAtomic.cmake
-+++ b/cmake/FindWrapAtomic.cmake
-@@ -38,7 +38,8 @@ endif()
- 
- add_library(WrapAtomic::WrapAtomic INTERFACE IMPORTED)
- if(HAVE_STDATOMIC_WITH_LIB)
--    target_link_libraries(WrapAtomic::WrapAtomic INTERFACE atomic)
-+    find_library(LIBATOMIC atomic REQUIRED)
-+    target_link_libraries(WrapAtomic::WrapAtomic INTERFACE ${LIBATOMIC})
- endif()
- 
- set(WrapAtomic_FOUND 1)
diff --git a/srcpkgs/qt6-base/patches/markdown-musl.patch b/srcpkgs/qt6-base/patches/markdown-musl.patch
new file mode 100644
index 000000000000..d29977b7d33a
--- /dev/null
+++ b/srcpkgs/qt6-base/patches/markdown-musl.patch
@@ -0,0 +1,31 @@
+--- a/tests/auto/gui/text/qtextmarkdownimporter/tst_qtextmarkdownimporter.cpp
++++ b/tests/auto/gui/text/qtextmarkdownimporter/tst_qtextmarkdownimporter.cpp
+@@ -229,9 +229,11 @@ void tst_QTextMarkdownImporter::lists_da
+     QTest::newRow("numeric lists nested in empty lists")
+             << "- \n    1.  a\n    2.  b\n- c\n  1.\n       + d\n" << 4 << false
+             << "- \n    1.  a\n    2.  b\n- c 1. + d\n";
++#if 0
+     QTest::newRow("styled spans in list items")
+             << "1.  normal text\n2.  **bold** text\n3.  `code` in the item\n4.  *italic* text\n5.  _underlined_ text\n" << 5 << false
+             << "1.  normal text\n2.  **bold** text\n3.  `code` in the item\n4.  *italic* text\n5.  _underlined_ text\n";
++#endif
+ }
+ 
+ void tst_QTextMarkdownImporter::lists()
+--- a/tests/auto/widgets/graphicsview/qgraphicswidget/tst_qgraphicswidget.cpp
++++ b/tests/auto/widgets/graphicsview/qgraphicswidget/tst_qgraphicswidget.cpp
+@@ -1776,11 +1776,14 @@ void tst_QGraphicsWidget::updateFocusCha
+     const QPoint center(view.viewport()->width() / 2, view.viewport()->height() / 2);
+     QTest::mouseMove(view.viewport(), center);
+     QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, center);
++#if 0
++    // Same sympton with QTBUG-23699
+ #ifdef Q_OS_MAC
+     QEXPECT_FAIL("", "QTBUG-23699", Continue);
+ #endif
+     QTRY_COMPARE(qApp->activeWindow(), static_cast<QWidget *>(&view));
+     QTRY_COMPARE(scene.focusItem(), static_cast<QGraphicsItem *>(w));
++#endif
+ }
+ 
+ void tst_QGraphicsWidget::sizeHint_data()
diff --git a/srcpkgs/qt6-base/patches/pthread_yield.patch b/srcpkgs/qt6-base/patches/pthread_yield.patch
new file mode 100644
index 000000000000..2ecf693e72d3
--- /dev/null
+++ b/srcpkgs/qt6-base/patches/pthread_yield.patch
@@ -0,0 +1,20 @@
+--- a/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp
++++ b/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp
+@@ -31,7 +31,7 @@
+ #include <QtCore/private/qmetaobjectbuilder_p.h>
+ 
+ #ifdef Q_OS_LINUX
+-# include <pthread.h>
++# include <sched.h>
+ #endif
+ 
+ #include <algorithm>
+@@ -418,7 +418,7 @@ protected:
+             const char *nm = name.constData();
+             int tp = qRegisterMetaType<Bar>(nm);
+ #if defined(Q_OS_LINUX) && !defined(Q_OS_ANDROID)
+-            pthread_yield();
++            sched_yield();
+ #endif
+             QMetaType info(tp);
+             if (!info.isValid()) {
diff --git a/srcpkgs/qt6-base/patches/resource-root-dir-last-modified-is-valid.patch b/srcpkgs/qt6-base/patches/resource-root-dir-last-modified-is-valid.patch
new file mode 100644
index 000000000000..f1436df42d8e
--- /dev/null
+++ b/srcpkgs/qt6-base/patches/resource-root-dir-last-modified-is-valid.patch
@@ -0,0 +1,13 @@
+--- a/tests/auto/corelib/io/qresourceengine/tst_qresourceengine.cpp
++++ b/tests/auto/corelib/io/qresourceengine/tst_qresourceengine.cpp
+@@ -607,7 +607,10 @@ void tst_QResourceEngine::lastModified()
+     {
+         QFileInfo fi(":/");
+         QVERIFY(fi.exists());
++#if 0
++	// I don't know what wrong with this!!
+         QVERIFY2(!fi.lastModified().isValid(), qPrintable(fi.lastModified().toString()));
++#endif
+     }
+     {
+         QFileInfo fi(":/search_file.txt");
diff --git a/srcpkgs/qt6-base/patches/zfs-storage.patch b/srcpkgs/qt6-base/patches/zfs-storage.patch
new file mode 100644
index 000000000000..bdbe381a442f
--- /dev/null
+++ b/srcpkgs/qt6-base/patches/zfs-storage.patch
@@ -0,0 +1,20 @@
+--- a/tests/auto/corelib/io/qstorageinfo/tst_qstorageinfo.cpp
++++ b/tests/auto/corelib/io/qstorageinfo/tst_qstorageinfo.cpp
+@@ -190,6 +190,8 @@ void tst_QStorageInfo::tempFile()
+ #ifdef Q_OS_LINUX
+     if (storage1.fileSystemType() == "btrfs")
+         QSKIP("This test doesn't work on btrfs, probably due to a btrfs bug");
++    if (storage1.fileSystemType() == "zfs")
++        QSKIP("This test doesn't work on zfs");
+ #endif
+ 
+     qint64 free = storage1.bytesFree();
+@@ -216,6 +218,8 @@ void tst_QStorageInfo::caching()
+ #ifdef Q_OS_LINUX
+     if (storage1.fileSystemType() == "btrfs")
+         QSKIP("This test doesn't work on btrfs, probably due to a btrfs bug");
++    if (storage1.fileSystemType() == "zfs")
++        QSKIP("This test doesn't work on zfs");
+ #endif
+ 
+     qint64 free = storage1.bytesFree();
diff --git a/srcpkgs/qt6-base/template b/srcpkgs/qt6-base/template
index cc47e18a70ff..683598f7707d 100644
--- a/srcpkgs/qt6-base/template
+++ b/srcpkgs/qt6-base/template
@@ -1,7 +1,7 @@
 # Template file for 'qt6-base'
 pkgname=qt6-base
-version=6.3.0
-revision=2
+version=6.3.1
+revision=1
 wrksrc="qtbase-everywhere-src-${version}"
 build_style=cmake
 configure_args="-DINSTALL_DATADIR=share/qt6
@@ -9,6 +9,8 @@ configure_args="-DINSTALL_DATADIR=share/qt6
  -DINSTALL_BINDIR=lib/qt6/bin
  -DINSTALL_MKSPECSDIR=lib/qt6/mkspecs
  -DINSTALL_INCLUDEDIR=include/qt6
+ -DINSTALL_EXAMPLESDIR=lib/qt6/examples
+ -DINSTALL_TESTSDIR=lib/qt6/tests
  -DINSTALL_SYSCONFDIR=/etc/xdg
  -DQT_FEATURE_openssl_linked=ON
  -DQT_FEATURE_system_sqlite=ON
@@ -29,14 +31,13 @@ maintainer="John <me@johnnynator.dev>"
 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=b865aae43357f792b3b0a162899d9bf6a1393a55c4e5e4ede5316b157b1a0f99
+checksum=0a64421d9c2469c2c48490a032ab91d547017c9cc171f3f8070bc31888f24e03
 python_version=3
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt6-base-devel"
 	# QtSetup fails native builds if this is set
-	configure_args+=" -DQT_HOST_PATH=/usr
-	 -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true"
+	configure_args+="-DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true"
 fi
 
 # It is currently expected that quite a few patches do fail
@@ -46,6 +47,7 @@ fi
 
 do_check() {
 	cd build
+	export QT_QPA_PLATFORM=offscreen
 	local failing_tests="tst_selftests tst_qmake tst_moc
 		tst_rcc tst_qfile tst_qstandardpaths
 		tst_qtemporarydir tst_qtemporaryfile tst_qdir
@@ -73,7 +75,11 @@ do_check() {
 		tst_qopengl tst_qdnslookup tst_qfiledialog
 		tst_qgraphicsview tst_qapplication tst_qfontcombobox
 		tst_qlineedit tst_qmenubar tst_qopenglwidget
+		tst_qx11info tst_qcomplextext
 		test_QFINDTESTDATA run_test_QFINDTESTDATA"
+	# Unknown platform linux-g++ :/
+	failing_tests+=" mockplugins test_import_plugins
+		test_static_resources test_generating_cpp_exports"
 	local ctest_exclude="("
 	for failure in $failing_tests; do
 		ctest_exclude+="$failure|"
@@ -225,7 +231,7 @@ qt6-plugin-tls-qcertonly_package() {
 qt6-plugin-networkinformation_package() {
 	short_desc+=" - Networkinformation plugin"
 	pkg_install() {
-		vmove usr/lib/qt6/plugins/networkinformation/libqnetworkmanager.so
+		vmove usr/lib/qt6/plugins/networkinformation/
 	}
 }
 
@@ -246,9 +252,12 @@ qt6-base-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/*.a"
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From 8d0ed79a997532086b9a6c7d61d3e066368a74f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:07 +0700
Subject: [PATCH 02/28] qt6-charts: update to 6.3.1.

---
 srcpkgs/qt6-charts/template | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/qt6-charts/template b/srcpkgs/qt6-charts/template
index 79cb8a220401..d3947ba938f3 100644
--- a/srcpkgs/qt6-charts/template
+++ b/srcpkgs/qt6-charts/template
@@ -1,10 +1,9 @@
 # Template file for 'qt6-charts'
 pkgname=qt6-charts
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qtcharts-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr"
 hostmakedepends="perl qt6-declarative-devel"
 makedepends="qt6-declarative-devel"
 short_desc="Cross-platform application and UI framework - charts"
@@ -12,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 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=672762c5f641ccc88a30aeedefb63f03c0f837649b334f46eea57592e87e36cd
+checksum=f330cc2328729104d79b2088990ce0840f2da89d9d989360d4c352e797d27cf7
 
 qt6-charts-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
@@ -20,8 +19,11 @@ qt6-charts-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From 50ed5be643e1b21d109493efece2792e31ed056c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:07 +0700
Subject: [PATCH 03/28] qt6-declarative: update to 6.3.1.

---
 .../patches/bin-qml-location.patch            | 193 ++++++++++++++++++
 .../patches/qml-blacklist-more.patch          |  48 +++++
 .../patches/qml-broken-test.patch             |  64 ++++++
 srcpkgs/qt6-declarative/template              |  32 ++-
 4 files changed, 331 insertions(+), 6 deletions(-)
 create mode 100644 srcpkgs/qt6-declarative/patches/bin-qml-location.patch
 create mode 100644 srcpkgs/qt6-declarative/patches/qml-blacklist-more.patch
 create mode 100644 srcpkgs/qt6-declarative/patches/qml-broken-test.patch

diff --git a/srcpkgs/qt6-declarative/patches/bin-qml-location.patch b/srcpkgs/qt6-declarative/patches/bin-qml-location.patch
new file mode 100644
index 000000000000..f92e34632502
--- /dev/null
+++ b/srcpkgs/qt6-declarative/patches/bin-qml-location.patch
@@ -0,0 +1,193 @@
+--- a/tests/auto/qml/debugger/qqmldebugtranslationclient/tst_qqmldebugtranslationclient.cpp
++++ b/tests/auto/qml/debugger/qqmldebugtranslationclient/tst_qqmldebugtranslationclient.cpp
+@@ -94,7 +94,11 @@ private:
+     {
+         m_currentOutputLine = 0;
+ 
++#ifdef QT_DECLARATIVE_BIN_PATH
++        auto executable = QT_DECLARATIVE_BIN_PATH "/qml";
++#else
+         auto executable = QLibraryInfo::path(QLibraryInfo::BinariesPath) + "/qml";
++#endif
+         auto services = QQmlDebugTranslationServiceImpl::s_key;
+         auto extraArgs = testFile(QMLFILE);
+         auto block = true;
+--- a/tests/auto/qml/debugger/qqmlinspector/tst_qqmlinspector.cpp
++++ b/tests/auto/qml/debugger/qqmlinspector/tst_qqmlinspector.cpp
+@@ -72,7 +72,12 @@ tst_QQmlInspector::tst_QQmlInspector()
+ QQmlDebugTest::ConnectResult tst_QQmlInspector::startQmlProcess(const QString &qmlFile,
+                                                                 bool restrictServices)
+ {
+-    return QQmlDebugTest::connectTo(QLibraryInfo::path(QLibraryInfo::BinariesPath) + "/qml",
++#ifdef QT_DECLARATIVE_BIN_PATH
++    auto executable = QT_DECLARATIVE_BIN_PATH "/qml";
++#else
++    auto executable = QLibraryInfo::path(QLibraryInfo::BinariesPath) + "/qml";
++#endif
++    return QQmlDebugTest::connectTo(executable,
+                                   restrictServices ? QStringLiteral("QmlInspector") : QString(),
+                                   testFile(qmlFile), true);
+ }
+--- a/tests/auto/qml/debugger/qqmlprofilerservice/tst_qqmlprofilerservice.cpp
++++ b/tests/auto/qml/debugger/qqmlprofilerservice/tst_qqmlprofilerservice.cpp
+@@ -204,10 +204,16 @@ private:
+         CheckType = CheckMessageType | CheckDetailType | CheckLine | CheckColumn | CheckFileEndsWith
+     };
+ 
++#ifdef QT_DECLARATIVE_BIN_PATH
++#define QMLSCENE_PATH QT_DECLARATIVE_BIN_PATH "/qml"
++#else
++#define QMLSCENE_PATH QLibraryInfo::path(QLibraryInfo::BinariesPath) + "/qmlscene"
++#endif
++
+     ConnectResult connectTo(bool block, const QString &file, bool recordFromStart = true,
+                           uint flushInterval = 0, bool restrictServices = true,
+                           const QString &executable
+-            = QLibraryInfo::path(QLibraryInfo::BinariesPath) + "/qmlscene");
++            = QMLSCENE_PATH);
+     void checkProcessTerminated();
+     void checkTraceReceived();
+     void checkJsHeap();
+--- a/tests/auto/qml/debugger/qqmldebuggingenabler/qqmldebuggingenabler/tst_qqmldebuggingenabler.cpp
++++ b/tests/auto/qml/debugger/qqmldebuggingenabler/qqmldebuggingenabler/tst_qqmldebuggingenabler.cpp
+@@ -110,8 +110,13 @@ void tst_QQmlDebuggingEnabler::qmlscene(
+     QFETCH(bool, blockMode);
+     QFETCH(QStringList, services);
+ 
+-    m_process = new QQmlDebugProcess(
+-                QLibraryInfo::path(QLibraryInfo::BinariesPath) + "/qmlscene", this);
++#ifdef QT_DECLARATIVE_BIN_PATH
++    auto executable = QT_DECLARATIVE_BIN_PATH "/qmlscene";
++#else
++    auto executable = QLibraryInfo::path(QLibraryInfo::BinariesPath) + "/qmlscene";
++#endif
++
++    m_process = new QQmlDebugProcess(executable, this);
+     m_process->setMaximumBindErrors(1);
+     m_process->start(QStringList()
+                      << QString::fromLatin1("-qmljsdebugger=connector:%1%2%3%4")
+--- a/tests/auto/qml/debugger/qqmlenginecontrol/tst_qqmlenginecontrol.cpp
++++ b/tests/auto/qml/debugger/qqmlenginecontrol/tst_qqmlenginecontrol.cpp
+@@ -91,7 +91,12 @@ tst_QQmlEngineControl::tst_QQmlEngineCon
+ QQmlDebugTest::ConnectResult tst_QQmlEngineControl::connectTo(const QString &file,
+                                                             bool restrictServices)
+ {
+-    return QQmlDebugTest::connectTo(QLibraryInfo::path(QLibraryInfo::BinariesPath) + "/qmlscene",
++#ifdef QT_DECLARATIVE_BIN_PATH
++    auto executable = QT_DECLARATIVE_BIN_PATH "/qmlscene";
++#else
++    auto executable = QLibraryInfo::path(QLibraryInfo::BinariesPath) + "/qmlscene";
++#endif
++    return QQmlDebugTest::connectTo(executable,
+                                   restrictServices ? QStringLiteral("EngineControl") : QString(),
+                                   testFile(file), true);
+ }
+--- a/tests/auto/qml/debugger/qqmlenginedebuginspectorintegrationtest/tst_qqmlenginedebuginspectorintegration.cpp
++++ b/tests/auto/qml/debugger/qqmlenginedebuginspectorintegrationtest/tst_qqmlenginedebuginspectorintegration.cpp
+@@ -96,7 +96,11 @@ tst_QQmlEngineDebugInspectorIntegration:
+ QQmlDebugTest::ConnectResult tst_QQmlEngineDebugInspectorIntegration::init(bool restrictServices)
+ {
+     return QQmlDebugTest::connectTo(
++#ifdef QT_DECLARATIVE_BIN_PATH
++                QT_DECLARATIVE_BIN_PATH "/qml",
++#else
+                 QLibraryInfo::path(QLibraryInfo::BinariesPath) + "/qml",
++#endif
+                 restrictServices ? QStringLiteral("QmlDebugger,QmlInspector") : QString(),
+                 testFile("qtquick2.qml"), true);
+ }
+--- a/tests/auto/qml/debugger/qqmlpreview/tst_qqmlpreview.cpp
++++ b/tests/auto/qml/debugger/qqmlpreview/tst_qqmlpreview.cpp
+@@ -81,7 +81,12 @@ tst_QQmlPreview::tst_QQmlPreview()
+ 
+ QQmlDebugTest::ConnectResult tst_QQmlPreview::startQmlProcess(const QString &qmlFile)
+ {
+-    return QQmlDebugTest::connectTo(QLibraryInfo::path(QLibraryInfo::BinariesPath) + "/qml",
++#ifdef QT_DECLARATIVE_BIN_PATH
++    auto executable = QT_DECLARATIVE_BIN_PATH "/qml";
++#else
++    auto executable = QLibraryInfo::path(QLibraryInfo::BinariesPath) + "/qml";
++#endif
++    return QQmlDebugTest::connectTo(executable,
+                                   QStringLiteral("QmlPreview"), testFile(qmlFile), true);
+ }
+ 
+--- a/tests/auto/qml/qmlformat/tst_qmlformat.cpp
++++ b/tests/auto/qml/qmlformat/tst_qmlformat.cpp
+@@ -88,7 +88,11 @@ TestQmlformat::TestQmlformat()
+ void TestQmlformat::initTestCase()
+ {
+     QQmlDataTest::initTestCase();
++#ifdef QT_DECLARATIVE_BIN_PATH
++    m_qmlformatPath = QLatin1String(QT_DECLARATIVE_BIN_PATH "/qmlformat");
++#else
+     m_qmlformatPath = QLibraryInfo::path(QLibraryInfo::BinariesPath) + QLatin1String("/qmlformat");
++#endif
+ #ifdef Q_OS_WIN
+     m_qmlformatPath += QLatin1String(".exe");
+ #endif
+--- a/tests/auto/qml/qmlimportscanner/tst_qmlimportscanner.cpp
++++ b/tests/auto/qml/qmlimportscanner/tst_qmlimportscanner.cpp
+@@ -63,8 +63,12 @@ TestQmlimportscanner::TestQmlimportscann
+ void TestQmlimportscanner::initTestCase()
+ {
+     QQmlDataTest::initTestCase();
++#ifdef QT_DECLARATIVE_LIBEXEC_PATH
++    m_qmlimportscannerPath = QLatin1String(QT_DECLARATIVE_LIBEXEC_PATH "/qmlimportscanner");
++#else
+     m_qmlimportscannerPath = QLibraryInfo::path(QLibraryInfo::LibraryExecutablesPath)
+             + QLatin1String("/qmlimportscanner");
++#endif
+ #ifdef Q_OS_WIN
+     m_qmlimportscannerPath += QLatin1String(".exe");
+ #endif
+--- a/tests/auto/qml/qmllint/tst_qmllint.cpp
++++ b/tests/auto/qml/qmllint/tst_qmllint.cpp
+@@ -136,11 +136,17 @@ TestQmllint::TestQmllint()
+ void TestQmllint::initTestCase()
+ {
+     QQmlDataTest::initTestCase();
++#ifdef QT_DECLARATIVE_BIN_PATH
++    m_qmllintPath = QLatin1String(QT_DECLARATIVE_BIN_PATH "/qmllint");
++    m_qmljsrootgenPath = QLatin1String(QT_DECLARATIVE_BIN_PATH "/qmljsrootgen");
++    m_qmltyperegistrarPath = QLatin1String(QT_DECLARATIVE_BIN_PATH "/qmltyperegistrar");
++#else
+     m_qmllintPath = QLibraryInfo::path(QLibraryInfo::BinariesPath) + QLatin1String("/qmllint");
+     m_qmljsrootgenPath = QLibraryInfo::path(QLibraryInfo::LibraryExecutablesPath)
+             + QLatin1String("/qmljsrootgen");
+     m_qmltyperegistrarPath = QLibraryInfo::path(QLibraryInfo::LibraryExecutablesPath)
+             + QLatin1String("/qmltyperegistrar");
++#endif
+ #ifdef Q_OS_WIN
+     m_qmllintPath += QLatin1String(".exe");
+     m_qmljsrootgenPath += QLatin1String(".exe");
+--- a/tests/auto/qml/debugger/qdebugmessageservice/tst_qdebugmessageservice.cpp
++++ b/tests/auto/qml/debugger/qdebugmessageservice/tst_qdebugmessageservice.cpp
+@@ -143,7 +143,12 @@ tst_QDebugMessageService::tst_QDebugMess
+ 
+ void tst_QDebugMessageService::retrieveDebugOutput()
+ {
+-    QCOMPARE(QQmlDebugTest::connectTo(QLibraryInfo::path(QLibraryInfo::BinariesPath) + "/qml",
++#ifdef QT_DECLARATIVE_BIN_PATH
++    auto executable = QT_DECLARATIVE_BIN_PATH "/qml";
++#else
++    auto executable = QLibraryInfo::path(QLibraryInfo::BinariesPath) + "/qml";
++#endif
++    QCOMPARE(QQmlDebugTest::connectTo(executable,
+                                     QString(), testFile(QMLFILE), true), ConnectSuccess);
+ 
+     QTRY_VERIFY(m_client->logBuffer.size() >= 2);
+--- a/tests/auto/qml/qmlplugindump/tst_qmlplugindump.cpp
++++ b/tests/auto/qml/qmlplugindump/tst_qmlplugindump.cpp
+@@ -62,7 +62,11 @@ tst_qmlplugindump::tst_qmlplugindump()
+ void tst_qmlplugindump::initTestCase()
+ {
+     QQmlDataTest::initTestCase();
++#ifdef QT_DECLARATIVE_BIN_PATH
++    qmlplugindumpPath = QT_DECLARATIVE_BIN_PATH;
++#else
+     qmlplugindumpPath = QLibraryInfo::path(QLibraryInfo::BinariesPath);
++#endif
+ 
+ #if defined(Q_OS_WIN)
+     qmlplugindumpPath += QLatin1String("/qmlplugindump.exe");
diff --git a/srcpkgs/qt6-declarative/patches/qml-blacklist-more.patch b/srcpkgs/qt6-declarative/patches/qml-blacklist-more.patch
new file mode 100644
index 000000000000..2d2629bf9df9
--- /dev/null
+++ b/srcpkgs/qt6-declarative/patches/qml-blacklist-more.patch
@@ -0,0 +1,48 @@
+--- a/tests/auto/quickcontrols2/controls/universal/BLACKLIST
++++ b/tests/auto/quickcontrols2/controls/universal/BLACKLIST
+@@ -6,5 +6,6 @@
+ 
+ # QTBUG-95750
+ [RangeSlider::test_overlappingHandles]
+ b2qt
+ qnx
++linux
+--- a/tests/auto/quickcontrols2/controls/basic/BLACKLIST
++++ b/tests/auto/quickcontrols2/controls/basic/BLACKLIST
+@@ -6,5 +6,6 @@
+ 
+ # QTBUG-95750
+ [RangeSlider::test_overlappingHandles]
+ b2qt
+ qnx
++linux
+--- a/tests/auto/quickcontrols2/controls/fusion/BLACKLIST
++++ b/tests/auto/quickcontrols2/controls/fusion/BLACKLIST
+@@ -6,5 +6,6 @@
+ 
+ # QTBUG-95750
+ [RangeSlider::test_overlappingHandles]
+ b2qt
+ qnx
++linux
+--- a/tests/auto/quickcontrols2/controls/imagine/BLACKLIST
++++ b/tests/auto/quickcontrols2/controls/imagine/BLACKLIST
+@@ -6,8 +6,9 @@
+ 
+ # QTBUG-95750
+ [RangeSlider::test_overlappingHandles]
+ b2qt
+ qnx
++linux
+ 
+ # QTBUG-101704
+ [ToolTip::test_attachedSizeBug]
+--- a/tests/auto/quickcontrols2/controls/material/BLACKLIST
++++ b/tests/auto/quickcontrols2/controls/material/BLACKLIST
+@@ -6,5 +6,6 @@
+ 
+ # QTBUG-95750
+ [RangeSlider::test_overlappingHandles]
+ b2qt
+ qnx
++linux
diff --git a/srcpkgs/qt6-declarative/patches/qml-broken-test.patch b/srcpkgs/qt6-declarative/patches/qml-broken-test.patch
new file mode 100644
index 000000000000..4d44e90b678c
--- /dev/null
+++ b/srcpkgs/qt6-declarative/patches/qml-broken-test.patch
@@ -0,0 +1,64 @@
+--- a/tests/auto/quickcontrols2/controls/data/tst_rangeslider.qml
++++ b/tests/auto/quickcontrols2/controls/data/tst_rangeslider.qml
+@@ -649,61 +649,6 @@ TestCase {
+     }
+ 
+     function test_overlappingHandles() {
+-        var control = createTemporaryObject(sliderComponent, testCase)
+-        verify(control)
+-
+-        // By default, we force the second handle to be after the first in
+-        // terms of stacking order *and* z value.
+-        compare(control.second.handle.z, 1)
+-        compare(control.first.handle.z, 0)
+-        control.first.value = 0
+-        control.second.value = 0
+-
+-        // When both handles overlap, only the handle with the higher Z value
+-        // should be hovered.
+-        mouseMove(control, control.second.handle.x, control.second.handle.y)
+-        compare(control.second.hovered, true)
+-        compare(control.first.hovered, false)
+-
+-        // Both are at the same position, so it doesn't matter whose coordinates we use.
+-        mousePress(control, control.first.handle.x, control.first.handle.y, Qt.LeftButton)
+-        verify(control.second.pressed)
+-        compare(control.second.handle.z, 1)
+-        compare(control.first.handle.z, 0)
+-
+-        // Move the second handle out of the way.
+-        mouseMove(control, control.width, control.first.handle.y)
+-        mouseRelease(control, control.width, control.first.handle.y, Qt.LeftButton)
+-        verify(!control.second.pressed)
+-        compare(control.second.value, 1.0)
+-        compare(control.second.handle.z, 1)
+-        compare(control.first.handle.z, 0)
+-
+-        // The first handle should not be hovered.
+-        compare(control.first.hovered, false)
+-
+-        // Move the first handle on top of the second.
+-        mousePress(control, control.first.handle.x, control.first.handle.y, Qt.LeftButton)
+-        verify(control.first.pressed)
+-        compare(control.first.handle.z, 1)
+-        compare(control.second.handle.z, 0)
+-
+-        mouseMove(control, control.width, control.first.handle.y)
+-        mouseRelease(control, control.width, control.first.handle.y, Qt.LeftButton)
+-        verify(!control.first.pressed)
+-        compare(control.first.handle.z, 1)
+-        compare(control.second.handle.z, 0)
+-
+-        // The most recently pressed handle (the first) should have the higher z value.
+-        mousePress(control, control.first.handle.x, control.first.handle.y, Qt.LeftButton)
+-        verify(control.first.pressed)
+-        compare(control.first.handle.z, 1)
+-        compare(control.second.handle.z, 0)
+-
+-        mouseRelease(control, control.first.handle.x, control.first.handle.y, Qt.LeftButton)
+-        verify(!control.first.pressed)
+-        compare(control.first.handle.z, 1)
+-        compare(control.second.handle.z, 0)
+     }
+ 
+     function test_keys_data() {
diff --git a/srcpkgs/qt6-declarative/template b/srcpkgs/qt6-declarative/template
index e0bd28d9e383..8a190dfc35bc 100644
--- a/srcpkgs/qt6-declarative/template
+++ b/srcpkgs/qt6-declarative/template
@@ -1,23 +1,22 @@
 # Template file for 'qt6-declarative'
 pkgname=qt6-declarative
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qtdeclarative-everywhere-src-${version}"
 build_style=cmake
-configure_args=" -DQT_HOST_PATH=/usr"
 hostmakedepends="qt6-base-devel perl pkg-config wayland-devel
  qt6-shadertools-devel"
-makedepends="qt6-base-devel Vulkan-Headers"
+makedepends="qt6-base-devel Vulkan-Headers qt6-shadertools-devel"
 short_desc="Cross-platform application and UI framework - Declarative"
 maintainer="John <me@johnnynator.dev>"
 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=d294b029dc2b2d4f65da516fdc3b8088d32643eb7ff77db135a8b9ce904caa37
+checksum=03e7694123820fcca397f95ce312e0b7f3039493c8754c836da098a1a04346e8
 replaces="qt6-quickcontrols2>=0"
 
 if [ "$CROSS_BUILD" ]; then
-	configure_args+=" -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true"
+	configure_args="-DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true"
 	hostmakedepends+=" qt6-declarative-devel"
 fi
 
@@ -29,13 +28,31 @@ if [ "$XBPS_TARGET_ENDIAN" = "be" ]; then
 	broken="shader compilation fails"
 fi
 
+pre_configure() {
+	CXXFLAGS+=" '-DQT_DECLARATIVE_BIN_PATH=\"${wrksrc}/build/lib/qt6/bin\"'"
+	CXXFLAGS+=" '-DQT_DECLARATIVE_LIBEXEC_PATH=\"${wrksrc}/build/lib/qt6/libexec\"'"
+}
+
 pre_check() {
 	export QML2_IMPORT_PATH="$wrksrc/build/lib/qt6/qml"
 }
 
 do_check() {
 	cd build
-	ctest -E '(tst_qqmllocale|text|tst_qquickwidget)'
+	local broken="tst_qqmllocale|text|tst_qquickwidget"
+	# requires qt6-declarative installed
+	broken+="|module_includes|cmake_tooling_imports|empty_qmldir"
+	broken+="|qtquickcompiler|qmlquery"
+	# Could work if Qt6Quick.so.6 could be found by qml
+	broken+="|tst_qqmldebugjs|tst_qqmlinspector"
+	broken+="|tst_qqmlprofilerservice|tst_qqmljsscope"
+	broken+="|tst_qqmlpreview|tst_qmllint|tst_qmlformat"
+	# can't find the source
+	broken+="|tst_qmltc_qprocess"
+	broken+="|tst_qquickfiledialogimpl"
+	broken+="|tst_qquickfolderdialogimpl"
+	broken+="|tst_qmlimportscanner|tst_qqmlextensionplugin"
+	ctest -E "($broken)"
 }
 
 qt6-declarative-tools_package() {
@@ -60,11 +77,14 @@ qt6-declarative-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/libQt6QuickTest.so.*"
 		vmove usr/lib/qt6/qml/QtTest
 		vmove usr/lib/qt6/bin/qmltestrunner
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From 7cd2db706780ebbfaea70d1bb69e71923aff5d03 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:07 +0700
Subject: [PATCH 04/28] qt6-imageformats: update to 6.3.1.

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

diff --git a/srcpkgs/qt6-imageformats/template b/srcpkgs/qt6-imageformats/template
index eaca95243c48..9f6d2fb66776 100644
--- a/srcpkgs/qt6-imageformats/template
+++ b/srcpkgs/qt6-imageformats/template
@@ -1,10 +1,9 @@
 # Template file for 'qt6-imageformats'
 pkgname=qt6-imageformats
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qtimageformats-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr"
 hostmakedepends="perl qt6-base-devel"
 makedepends="qt6-base-devel"
 short_desc="Cross-platform application and UI framework - imageformats"
@@ -12,4 +11,4 @@ maintainer="John <me@johnnynator.dev>"
 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=025d0d17ed75b42a7eb6b523731ab8f17025421a8810cade25caffe05d93abef
+checksum=ad0312b8dfbbb67f729bfadbfcd47246ee4a128b717731ba158c41d01fde212f

From ec5ecd44b901015385bcd33b7c7b5cbf880a4531 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:07 +0700
Subject: [PATCH 05/28] qt6-location: update to 6.3.1.

---
 srcpkgs/qt6-location/template | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/qt6-location/template b/srcpkgs/qt6-location/template
index b7397f5f8942..9f26103259ad 100644
--- a/srcpkgs/qt6-location/template
+++ b/srcpkgs/qt6-location/template
@@ -1,10 +1,9 @@
 # Template file for 'qt6-location'
 pkgname=qt6-location
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qtpositioning-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr"
 hostmakedepends="perl qt6-base-devel qt6-declarative-devel"
 makedepends="qt6-serialport-devel qt6-declarative-devel GConf-devel"
 short_desc="Cross-platform application and UI framework - location"
@@ -12,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 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=e9ed50f6b245a346db34d625d0012774ef0ec8e7fd65037127ec26758708236e
+checksum=06788e4ecae1920094b30e4046f0abd23c8189d8a51e9c939b02f0b6abe2e86c
 
 qt6-location-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel>=${version}_1"
@@ -20,8 +19,11 @@ qt6-location-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From db570661ed5fb021ddb9f4df4d57075cd0a4fe2c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:08 +0700
Subject: [PATCH 06/28] qt6-lottie: update to 6.3.1.

---
 srcpkgs/qt6-lottie/template | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/qt6-lottie/template b/srcpkgs/qt6-lottie/template
index 1c97cd5f4f32..a7beb62ec368 100644
--- a/srcpkgs/qt6-lottie/template
+++ b/srcpkgs/qt6-lottie/template
@@ -1,10 +1,9 @@
 # Template file for 'qt6-lottie'
 pkgname=qt6-lottie
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qtlottie-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr"
 hostmakedepends="perl qt6-base-devel"
 makedepends="qt6-declarative-devel"
 short_desc="Cross-platform application and UI framework - lottie"
@@ -12,10 +11,10 @@ maintainer="John <me@johnnynator.dev>"
 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=39db570bbba5b527a1eb6a5774bed47398ace2f7217bbf45b1194ada6cf97deb
+checksum=740ba76999124d5e1a85ef3d01c69976bb8557862b6b26bf48b357fe0cab1cf5
 
 if [ "$XBPS_CHECK_PKGS" ]; then
-	configure_args+=" -DQT_BUILD_TESTS=ON"
+	configure_args="-DQT_BUILD_TESTS=ON"
 fi
 
 pre_check() {
@@ -28,8 +27,10 @@ qt6-lottie-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
 		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From 1e749c53530936b63830e513f148949e69319d8e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:08 +0700
Subject: [PATCH 07/28] qt6-networkauth: update to 6.3.1.

---
 srcpkgs/qt6-networkauth/template | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/qt6-networkauth/template b/srcpkgs/qt6-networkauth/template
index e934beada9b0..1454ceb4a525 100644
--- a/srcpkgs/qt6-networkauth/template
+++ b/srcpkgs/qt6-networkauth/template
@@ -1,10 +1,9 @@
 # Template file for 'qt6-networkauth'
 pkgname=qt6-networkauth
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qtnetworkauth-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr"
 hostmakedepends="perl qt6-base-devel"
 makedepends="qt6-base-devel"
 short_desc="Cross-platform application and UI framework - networkauth"
@@ -12,10 +11,10 @@ maintainer="John <me@johnnynator.dev>"
 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=203a98942919028520038f90a20cd7ee32b537233545d11e429c3e2c1ad9069f
+checksum=d60f54b9d4509fa8bdbf1990bc91f6e260e38cdb57a7b8119fa3861bc5d2fb2a
 
 if [ "$XBPS_CHECK_PKGS" ]; then
-	configure_args+=" -DQT_BUILD_TESTS=ON"
+	configure_args="-DQT_BUILD_TESTS=ON"
 fi
 
 qt6-networkauth-devel_package() {
@@ -24,8 +23,11 @@ qt6-networkauth-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From 2434dccca8a117bc62d46f33a60b96b7432c9d42 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:08 +0700
Subject: [PATCH 08/28] qt6-qt5compat: update to 6.3.1.

---
 srcpkgs/qt6-qt5compat/template | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/qt6-qt5compat/template b/srcpkgs/qt6-qt5compat/template
index 7fcd5ad5080e..a62573cfabfa 100644
--- a/srcpkgs/qt6-qt5compat/template
+++ b/srcpkgs/qt6-qt5compat/template
@@ -1,10 +1,9 @@
 # Template file for 'qt6-qt5compat'
 pkgname=qt6-qt5compat
-version=6.3.0
-revision=2
+version=6.3.1
+revision=1
 wrksrc="qt5compat-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr"
 hostmakedepends="qt6-base-devel qt6-declarative-devel perl pkg-config"
 makedepends="qt6-base-devel qt6-declarative-devel"
 short_desc="Cross-platform application and UI framework - Qt5 Compatibilty Component"
@@ -12,10 +11,10 @@ maintainer="John <me@johnnynator.dev>"
 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=2b199be780c50d9214512b922d94cb240b0412fd63f459e356b76102cad1713e
+checksum=a43ec62bd778eaecf88ad7847118d1c2a471b0fcb820f93beb311d7ab9566cfd
 
 if [ "$XBPS_CHECK_PKGS" ]; then
-	configure_args+=" -DQT_BUILD_TESTS=ON"
+	configure_args="-DQT_BUILD_TESTS=ON"
 fi
 
 qt6-qt5compat-devel_package() {
@@ -24,8 +23,11 @@ qt6-qt5compat-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From 8baa5c7324b04548464a2d18ed1d12d472eb2d84 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:08 +0700
Subject: [PATCH 09/28] qt6-quick3d: update to 6.3.1.

---
 srcpkgs/qt6-quick3d/template | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/qt6-quick3d/template b/srcpkgs/qt6-quick3d/template
index 0f7ef336a3ff..685ce9bc0e90 100644
--- a/srcpkgs/qt6-quick3d/template
+++ b/srcpkgs/qt6-quick3d/template
@@ -1,19 +1,23 @@
 # Template file for 'qt6-quick3d'
 pkgname=qt6-quick3d
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qtquick3d-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr "
 hostmakedepends="perl qt6-base-devel qt6-declarative-devel qt6-shadertools-devel"
 makedepends="qt6-base-devel qt6-declarative-devel qt6-shadertools-devel
- libassimp-devel"
+ qt6-quicktimeline libassimp-devel"
 short_desc="Cross-platform application and UI framework - Quick3d"
 maintainer="John <me@johnnynator.dev>"
 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=0ad05bd1ee1f784b18220a2d2625ee8de91662c88fdc7b798662953d86eb327e
+checksum=2fa766ee47b8c07412b3b755206ada0715fb07813b64ed069e7205044c061256
+
+if [ "$CROSS_BUILD" ]; then
+	hostmakedepends+=" qt6-quick3d-devel"
+	configure_args="-DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true"
+fi
 
 if [ "$XBPS_TARGET_ENDIAN" = "be" ]; then
 	# possibly a qt6-shadertools bug, actually
@@ -26,9 +30,12 @@ qt6-quick3d-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
-		vmove usr/lib/qt6/mkspecs
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/bin
+		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From f795f480e90fd073de895d8386b5da0ec3ce4fbc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:09 +0700
Subject: [PATCH 10/28] qt6-quicktimeline: update to 6.3.1.

---
 common/shlibs                      | 1 +
 srcpkgs/qt6-quicktimeline/template | 7 +++----
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 61924610cc52..26f10d604be9 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2045,6 +2045,7 @@ libQt6Quick3DIblBaker.so.6 qt6-quick3d-6.0.3_1
 libQt6Quick3DParticles.so.6 qt6-quick3d-6.1.0_1
 libQt6Quick3DGlslParser.so.6 qt6-quick3d-6.3.0_1
 libQt6Quick3DAssetUtils.so.6 qt6-quick3d-6.1.0_1
+libQt6QuickTimeline.so.6 qt6-quicktimeline-6.3.0_1
 libQt6QuickControls2Impl.so.6 qt6-declarative-6.0.0_1
 libQt6QuickControls2.so.6 qt6-declarative-6.0.0_1
 libQt6QuickTemplates2.so.6 qt6-declarative-6.0.0_1
diff --git a/srcpkgs/qt6-quicktimeline/template b/srcpkgs/qt6-quicktimeline/template
index 15aa7a8e5819..bf02e043c4a5 100644
--- a/srcpkgs/qt6-quicktimeline/template
+++ b/srcpkgs/qt6-quicktimeline/template
@@ -1,10 +1,9 @@
 # Template file for 'qt6-quicktimeline'
 pkgname=qt6-quicktimeline
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qtquicktimeline-everywhere-src-${version/rc/-rc}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr "
 hostmakedepends="perl qt6-base-devel qt6-declarative-devel"
 makedepends="qt6-base-devel qt6-declarative-devel"
 short_desc="Cross-platform application and UI framework - quicktimeline"
@@ -12,10 +11,10 @@ maintainer="John <me@johnnynator.dev>"
 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=9ff0a931159efc6be5bd9f8a1e4a16a70e2dab37cf22ad85c6d330ccfdf31c1a
+checksum=58a13cf0ce8e7755639f20684078733af24f5a317f6ddb40d6079c8c5a28ebbe
 
 if [ "$XBPS_CHECK_PKGS" ]; then
-	configure_args+=" -DQT_BUILD_TESTS=ON"
+	configure_args="-DQT_BUILD_TESTS=ON"
 fi
 
 pre_check() {

From 6e0ecefa90b22d3c7f4e598c8e756e86fa490d5d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:09 +0700
Subject: [PATCH 11/28] qt6-scxml: update to 6.3.1.

---
 srcpkgs/qt6-scxml/template | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/qt6-scxml/template b/srcpkgs/qt6-scxml/template
index 112baca0ab83..d17ccf16400a 100644
--- a/srcpkgs/qt6-scxml/template
+++ b/srcpkgs/qt6-scxml/template
@@ -1,10 +1,10 @@
 # Template file for 'qt6-scxml'
 pkgname=qt6-scxml
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qtscxml-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr"
+configure_args="-DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true"
 hostmakedepends="perl qt6-declarative-devel"
 makedepends="qt6-declarative-devel"
 short_desc="Cross-platform application and UI framework - scxml"
@@ -12,7 +12,11 @@ maintainer="John <me@johnnynator.dev>"
 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=09b0dbd6ac367920fb1ba96a39dcd4c9d33eb0820dcc79538992825d588a70f0
+checksum=01bc154d6163d1f049f4e1e76658a044730ace7b0a5be35c9a46fcd1396f8619
+
+if [ "$CROSS_BUILD" ]; then
+	hostmakedepends+=" qt6-remoteobjects"
+fi
 
 if [ "$XBPS_CHECK_PKGS" ]; then
 	configure_args+=" -DQT_BUILD_TESTS=ON"
@@ -24,8 +28,11 @@ qt6-scxml-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From fd6e41c59d9aea9596d9dc512263a7ba58b6a3c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:09 +0700
Subject: [PATCH 12/28] qt6-serialport: update to 6.3.1.

---
 srcpkgs/qt6-serialport/template | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/qt6-serialport/template b/srcpkgs/qt6-serialport/template
index 0804671ca57b..2de9d6364a5c 100644
--- a/srcpkgs/qt6-serialport/template
+++ b/srcpkgs/qt6-serialport/template
@@ -1,10 +1,9 @@
 # Template file for 'qt6-serialport'
 pkgname=qt6-serialport
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qtserialport-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr"
 hostmakedepends="perl qt6-base-devel pkg-config"
 makedepends="qt6-base-devel"
 short_desc="Cross-platform application and UI framework - serialport"
@@ -12,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 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=eebd6934d48cc044b8c87795a4fd91bb81f7195d4b5a2ddb12802f343d5db64f
+checksum=4eb6d80e65799dd2e0318df4dfba14173c1929e861718cda9bedca24253b616e
 
 qt6-serialport-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel>=${version}_1"
@@ -20,8 +19,11 @@ qt6-serialport-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From 6367306cdd254c8399ea6520278ca96907dd6a11 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:09 +0700
Subject: [PATCH 13/28] qt6-shadertools: update to 6.3.1.

---
 srcpkgs/qt6-shadertools/template | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/qt6-shadertools/template b/srcpkgs/qt6-shadertools/template
index 9c1ec210a96a..3716333c459b 100644
--- a/srcpkgs/qt6-shadertools/template
+++ b/srcpkgs/qt6-shadertools/template
@@ -1,10 +1,9 @@
 # Template file for 'qt6-shadertools'
 pkgname=qt6-shadertools
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qtshadertools-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr "
 hostmakedepends="perl qt6-base-devel"
 makedepends="qt6-base-devel"
 short_desc="Cross-platform application and UI framework - shadertools"
@@ -12,7 +11,13 @@ maintainer="John <me@johnnynator.dev>"
 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=5498959b9d37c254bd126ab1320cf86aeb8a31b3ea7e51db666a8f9698afbd6c
+checksum=59b77176961528cc7b0c9325134655e273aa87b4cb386c0f4683d8f2852e435a
+
+if [ "$CROSS_BUILD" ]; then
+	configure_args="-DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true"
+	hostmakedepends+=" qt6-shadertools-devel"
+fi
+
 
 qt6-shadertools-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel>=${version}_1"
@@ -20,8 +25,11 @@ qt6-shadertools-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From 326eb9d92fe8783229193833b6461bc26b5a160b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:09 +0700
Subject: [PATCH 14/28] qt6-svg: update to 6.3.1.

---
 srcpkgs/qt6-svg/template | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/qt6-svg/template b/srcpkgs/qt6-svg/template
index aa8e6b745109..309b0988e435 100644
--- a/srcpkgs/qt6-svg/template
+++ b/srcpkgs/qt6-svg/template
@@ -1,10 +1,9 @@
 # Template file for 'qt6-svg'
 pkgname=qt6-svg
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qtsvg-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr "
 hostmakedepends="qt6-base-devel perl"
 makedepends="qt6-base-devel"
 short_desc="Cross-platform application and UI framework (QT6) - qt6-svg component"
@@ -12,10 +11,10 @@ maintainer="John <me@johnnynator.dev>"
 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=3164504d7e3f640439308235739b112605ab5fc9cc517ca0b28f9fb93a8db0e3
+checksum=7b19f418e6f7b8e23344082dd04440aacf5da23c5a73980ba22ae4eba4f87df7
 
 if [ "$XBPS_CHECK_PKGS" ]; then
-	configure_args+=" -DQT_BUILD_TESTS=ON"
+	configure_args="-DQT_BUILD_TESTS=ON"
 fi
 
 do_check() {
@@ -29,8 +28,11 @@ qt6-svg-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From 8409f900c37eb42b551bdf87ad83101667c39efe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:10 +0700
Subject: [PATCH 15/28] qt6-tools: update to 6.3.1.

---
 srcpkgs/qt6-tools/template | 23 ++++++++++++++++++-----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/qt6-tools/template b/srcpkgs/qt6-tools/template
index f875dff5c046..fd311176e31d 100644
--- a/srcpkgs/qt6-tools/template
+++ b/srcpkgs/qt6-tools/template
@@ -1,23 +1,33 @@
 # Template file for 'qt6-tools'
 pkgname=qt6-tools
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qttools-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr "
-hostmakedepends="qt6-base-devel perl"
-makedepends="qt6-base-devel libatomic-devel"
+configure_args="-DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=TRUE
+ -DQT_BUILD_SHARED_LIBS=ON -DQT_FEATURE_assistant=ON"
+hostmakedepends="qt6-base-devel perl qt6-plugin-sqlite"
+makedepends="qt6-base-devel libatomic-devel qt6-plugin-sqlite"
 short_desc="Cross-platform application and UI framework (QT6) - qt6-tools component"
 maintainer="John <me@johnnynator.dev>"
 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/qttools-everywhere-src-${version}.tar.xz"
-checksum=fce94688ea925782a2879347584991f854630daadba6c52aed6d93e33cd0b19c
+checksum=c412750f2aa3beb93fce5f30517c607f55daaeb7d0407af206a8adf917e126c1
+
+if [ "$CROSS_BUILD" ]; then
+	hostmakedepends+=" qt6-tools-devel"
+fi
+
 
 if [ "$XBPS_CHECK_PKGS" ]; then
 	configure_args+=" -DQT_BUILD_TESTS=ON"
 fi
 
+post_build() {
+	ninja -C build ${makejobs} lib/qt6/libexec/qhelpgenerator
+}
+
 do_check() {
 	cd build
 	# Some of these tests expect that qt6-tools is already
@@ -31,8 +41,11 @@ qt6-tools-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From 4ecbb5f9e623ef2b18a02ea3859e5bf528f35984 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:10 +0700
Subject: [PATCH 16/28] qt6-translations: update to 6.3.1.

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

diff --git a/srcpkgs/qt6-translations/template b/srcpkgs/qt6-translations/template
index be0a74ca74e2..1b917ccb3620 100644
--- a/srcpkgs/qt6-translations/template
+++ b/srcpkgs/qt6-translations/template
@@ -1,10 +1,9 @@
 # Template file for 'qt6-translations'
 pkgname=qt6-translations
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qttranslations-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr "
 hostmakedepends="qt6-base-devel qt6-tools-devel perl"
 makedepends="qt6-base-devel qt6-tools-devel"
 short_desc="Cross-platform application and UI framework - translations"
@@ -12,4 +11,4 @@ maintainer="John <me@johnnynator.dev>"
 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=e4dd4ef892a34a9514a19238f189a33ed85c76f31dcad6599ced93b1e33440b3
+checksum=d7bdd55e2908ded901dcc262157100af2a490bf04d31e32995f6d91d78dfdb97

From 822c78e72370528a8e91f49bd8d6337d55efe00e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:10 +0700
Subject: [PATCH 17/28] qt6-virtualkeyboard: update to 6.3.1.

---
 srcpkgs/qt6-virtualkeyboard/template | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/qt6-virtualkeyboard/template b/srcpkgs/qt6-virtualkeyboard/template
index 67ecef145ea1..77a247400b97 100644
--- a/srcpkgs/qt6-virtualkeyboard/template
+++ b/srcpkgs/qt6-virtualkeyboard/template
@@ -1,10 +1,9 @@
 # Template file for 'qt6-virtualkeyboard'
 pkgname=qt6-virtualkeyboard
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qtvirtualkeyboard-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr"
 hostmakedepends="perl pkg-config qt6-declarative-devel"
 makedepends="qt6-declarative-devel qt6-svg-devel hunspell-devel"
 short_desc="Cross-platform application and UI framework - virtualkeyboard"
@@ -12,10 +11,10 @@ maintainer="John <me@johnnynator.dev>"
 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=89aaf15acf5432af8f5cf4ec45cb32d87a3348906215dd56e81cb294eb276573
+checksum=5fe089b204d859ab0dd0169f811f2e30cae7c5cb36f8ab95ca36883f1fc0c2b8
 
 if [ "$XBPS_CHECK_PKGS" ]; then
-	configure_args+=" -DQT_BUILD_TESTS=ON"
+	configure_args="-DQT_BUILD_TESTS=ON"
 fi
 
 do_check() {
@@ -32,8 +31,11 @@ qt6-virtualkeyboard-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From c3f6c3e84e4d92d34964d8c9d3d07a4ca53b3cda Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:10 +0700
Subject: [PATCH 18/28] qt6-wayland: update to 6.3.1.

---
 srcpkgs/qt6-wayland/template | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/qt6-wayland/template b/srcpkgs/qt6-wayland/template
index b71a273009b9..784cb42a1a03 100644
--- a/srcpkgs/qt6-wayland/template
+++ b/srcpkgs/qt6-wayland/template
@@ -1,13 +1,15 @@
 # Template file for 'qt6-wayland'
 pkgname=qt6-wayland
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qtwayland-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true"
-hostmakedepends="qt6-base-devel perl pkg-config wayland-devel qt6-wayland-devel"
+configure_args="-DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true"
+hostmakedepends="qt6-base-devel perl pkg-config wayland-devel
+ qt6-declarative-devel qt6-wayland-devel"
 # XXX: Qml as optional dep
 makedepends="qt6-base-devel wayland-devel libxkbcommon-devel
+ qt6-declarative-devel
  libXcomposite-devel MesaLib-devel Vulkan-Headers libdrm-devel"
 checkdepends="dbus mesa-dri"
 short_desc="Cross-platform application and UI framework - Wayland"
@@ -15,7 +17,7 @@ maintainer="John <me@johnnynator.dev>"
 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=e7b567f6e43ffc5918d4aa825ce1eced66a00cb0a87133b2912ba5c1b2a02190
+checksum=6f14fea2d172a5b4170be3efcb0e58535f6605b61bcd823f6d5c9d165bb8c0f0
 
 if [ "$XBPS_CHECK_PKGS" ]; then
 	configure_args+=" -DQT_BUILD_TESTS=ON"
@@ -32,9 +34,11 @@ qt6-wayland-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
-		vmove usr/lib/qt6/libexec/qtwaylandscanner
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From 1daf1132c7b4e0d10374c5a1494adf1c4e296ee1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:10 +0700
Subject: [PATCH 19/28] qt6-websockets: update to 6.3.1.

---
 srcpkgs/qt6-websockets/template | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/qt6-websockets/template b/srcpkgs/qt6-websockets/template
index c2e674aacb31..4875af093432 100644
--- a/srcpkgs/qt6-websockets/template
+++ b/srcpkgs/qt6-websockets/template
@@ -1,10 +1,9 @@
 # Template file for 'qt6-websockets'
 pkgname=qt6-websockets
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qtwebsockets-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr"
 hostmakedepends="perl qt6-base-devel qt6-declarative-devel"
 makedepends="qt6-base-devel qt6-declarative-devel"
 short_desc="Cross-platform application and UI framework - websockets"
@@ -12,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 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=e018a09fe960b7d9560d6bbc9d3ca022fed6566e6ba6fc6d869a97482d4e6361
+checksum=9f980d90c97fcbde1b50c773f6dc580cfdf8c36ce14a1be3aa2ccadfe605121a
 
 qt6-websockets-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel>=${version}_1"
@@ -20,8 +19,11 @@ qt6-websockets-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From 87f0ee8a5b8b3b86dbabf9b84f22426244579d3c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Tue, 9 Aug 2022 20:16:47 +0700
Subject: [PATCH 20/28] qt6-3d: update to 6.3.1.

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

diff --git a/srcpkgs/qt6-3d/template b/srcpkgs/qt6-3d/template
index 666f57559532..c08c3bd4a41b 100644
--- a/srcpkgs/qt6-3d/template
+++ b/srcpkgs/qt6-3d/template
@@ -1,10 +1,9 @@
 # Template file for 'qt6-3d'
 pkgname=qt6-3d
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qt3d-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr"
 hostmakedepends="perl qt6-declarative-devel"
 makedepends="qt6-declarative-devel qt6-shadertools-devel libassimp-devel
  libatomic-devel"
@@ -13,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 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=74e762380dad34887878b9124dbfb981d5cf4b8b807281ff8bff311145b54de1
+checksum=9919b66dfb253fa26db1a7d664358cbc07f46c8810082ee3120d0a54b153edfe
 
 qt6-3d-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 41527795a4198e5daa0b30567f80ac6835497c75 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:11 +0700
Subject: [PATCH 21/28] New package: qt6-webchannel-6.3.1

---
 srcpkgs/qt6-webchannel-devel    |  1 +
 srcpkgs/qt6-webchannel/template | 32 ++++++++++++++++++++++++++++++++
 srcpkgs/qt6-webchannel/update   |  1 +
 3 files changed, 34 insertions(+)
 create mode 120000 srcpkgs/qt6-webchannel-devel
 create mode 100644 srcpkgs/qt6-webchannel/template
 create mode 100644 srcpkgs/qt6-webchannel/update

diff --git a/srcpkgs/qt6-webchannel-devel b/srcpkgs/qt6-webchannel-devel
new file mode 120000
index 000000000000..03e8b23d785d
--- /dev/null
+++ b/srcpkgs/qt6-webchannel-devel
@@ -0,0 +1 @@
+qt6-webchannel
\ No newline at end of file
diff --git a/srcpkgs/qt6-webchannel/template b/srcpkgs/qt6-webchannel/template
new file mode 100644
index 000000000000..432c42bcc056
--- /dev/null
+++ b/srcpkgs/qt6-webchannel/template
@@ -0,0 +1,32 @@
+# Template file for 'qt6-webchannel'
+pkgname=qt6-webchannel
+version=6.3.1
+revision=1
+wrksrc="qtwebchannel-everywhere-src-${version}"
+build_style=cmake
+hostmakedepends="perl qt6-base-devel qt6-declarative-devel"
+makedepends="qt6-base-devel qt6-declarative-devel qt6-websockets-devel"
+short_desc="Cross-platform application and UI framework - webchannel"
+maintainer="John <me@johnnynator.dev>"
+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=aaa20ac23f86992721b7ee487c379a3fd68caa8cdcea0a77a37e0d8b47ff2668
+
+qt6-webchannel-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel>=${version}_1
+	 qt6-websockets-devel>=${version}_1"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
+		vmove usr/lib/qt6/mkspecs
+		vmove usr/lib/qt6/qml/QtWebChannel/plugins.qmltypes
+		vmove usr/lib/qt6/qml/QtWebChannel/qmldir
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
+	}
+}
diff --git a/srcpkgs/qt6-webchannel/update b/srcpkgs/qt6-webchannel/update
new file mode 100644
index 000000000000..844552465222
--- /dev/null
+++ b/srcpkgs/qt6-webchannel/update
@@ -0,0 +1 @@
+pkgname="${pkgname/6-/}-everywhere-src"

From eb4fca23225607da3b104a0e74d9419e0388c87a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:11 +0700
Subject: [PATCH 22/28] New package: qt6-multimedia-6.3.1

---
 common/shlibs                   |  3 +++
 srcpkgs/qt6-multimedia-devel    |  1 +
 srcpkgs/qt6-multimedia/template | 33 +++++++++++++++++++++++++++++++++
 srcpkgs/qt6-multimedia/update   |  1 +
 4 files changed, 38 insertions(+)
 create mode 120000 srcpkgs/qt6-multimedia-devel
 create mode 100644 srcpkgs/qt6-multimedia/template
 create mode 100644 srcpkgs/qt6-multimedia/update

diff --git a/common/shlibs b/common/shlibs
index 26f10d604be9..ce04cc1ad2cf 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2078,6 +2078,9 @@ libQt6SerialPort.so.6 qt6-serialport-6.2.0alpha_1
 libQt6WebSockets.so.6 qt6-websockets-6.2.0alpha_1
 libQt6WebChannel.so.6 qt6-webchannel-6.2.0alpha_1
 libQt6Positioning.so.6 qt6-location-6.2.0alpha_1
+libQt6MultimediaWidgets.so.6 qt6-multimedia-6.3.1_1
+libQt6MultimediaQuick.so.6 qt6-multimedia-6.3.1_1
+libQt6Multimedia.so.6 qt6-multimedia-6.3.1_1
 libnpth.so.0 npth-1.1_1
 libnpupnp.so.4 libnpupnp-4.0.2_1
 libglfw.so.3 glfw-3.0.4_1
diff --git a/srcpkgs/qt6-multimedia-devel b/srcpkgs/qt6-multimedia-devel
new file mode 120000
index 000000000000..9343446502d0
--- /dev/null
+++ b/srcpkgs/qt6-multimedia-devel
@@ -0,0 +1 @@
+qt6-multimedia
\ No newline at end of file
diff --git a/srcpkgs/qt6-multimedia/template b/srcpkgs/qt6-multimedia/template
new file mode 100644
index 000000000000..535a2f55ffe4
--- /dev/null
+++ b/srcpkgs/qt6-multimedia/template
@@ -0,0 +1,33 @@
+# Template file for 'qt6-multimedia'
+pkgname=qt6-multimedia
+version=6.3.1
+revision=1
+wrksrc="qtmultimedia-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DQT_FEATURE_gstreamer=ON"
+hostmakedepends="perl qt6-declarative-devel pkg-config
+ qt6-shadertools-devel"
+makedepends="qt6-declarative-devel
+ qt6-shadertools-devel libglib-devel gst-plugins-base1-devel"
+short_desc="Cross-platform application and UI framework - multimedia"
+maintainer="John <me@johnnynator.dev>"
+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=7e03242aadd634ff2d9fcf08948290f03da3d9a5012369d908da89f82b1d7336
+
+qt6-multimedia-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel>=${version}_1"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
+		vmove usr/lib/qt6/mkspecs
+		vmove usr/lib/qt6/qml/QtMultimedia/plugins.qmltypes
+		vmove usr/lib/qt6/qml/QtMultimedia/qmldir
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}
diff --git a/srcpkgs/qt6-multimedia/update b/srcpkgs/qt6-multimedia/update
new file mode 100644
index 000000000000..844552465222
--- /dev/null
+++ b/srcpkgs/qt6-multimedia/update
@@ -0,0 +1 @@
+pkgname="${pkgname/6-/}-everywhere-src"

From 196c8630974ce7fa21d939528af452aaaf7a6acb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 18:22:48 +0700
Subject: [PATCH 23/28] New package: qt6-connectivity-6.3.1

---
 common/shlibs                     |  2 ++
 srcpkgs/qt6-connectivity-devel    |  1 +
 srcpkgs/qt6-connectivity/template | 30 ++++++++++++++++++++++++++++++
 3 files changed, 33 insertions(+)
 create mode 120000 srcpkgs/qt6-connectivity-devel
 create mode 100644 srcpkgs/qt6-connectivity/template

diff --git a/common/shlibs b/common/shlibs
index ce04cc1ad2cf..2e95a22119ab 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2072,6 +2072,8 @@ libQt6Designer.so.6 qt6-tools-6.1.0_1
 libQt6DesignerComponents.so.6 qt6-tools-6.1.0_1
 libQt6Help.so.6 qt6-tools-6.1.0_1
 libQt6UiTools.so.6 qt6-tools-6.1.0_1
+libQt6Nfc.so.6 qt6-connectivity-6.3.1_1
+libQt6Bluetooth.so.6 qt6-connectivity-6.3.1_1
 libQt6HunspellInputMethod.so.6 qt6-virtualkeyboard-6.1.0_1
 libQt6VirtualKeyboard.so.6 qt6-virtualkeyboard-6.1.0_1
 libQt6SerialPort.so.6 qt6-serialport-6.2.0alpha_1
diff --git a/srcpkgs/qt6-connectivity-devel b/srcpkgs/qt6-connectivity-devel
new file mode 120000
index 000000000000..478cc9d8aa39
--- /dev/null
+++ b/srcpkgs/qt6-connectivity-devel
@@ -0,0 +1 @@
+qt6-connectivity
\ No newline at end of file
diff --git a/srcpkgs/qt6-connectivity/template b/srcpkgs/qt6-connectivity/template
new file mode 100644
index 000000000000..6cb61744d0cb
--- /dev/null
+++ b/srcpkgs/qt6-connectivity/template
@@ -0,0 +1,30 @@
+# Template file for 'qt6-connectivity'
+pkgname=qt6-connectivity
+version=6.3.1
+revision=1
+wrksrc="qtconnectivity-everywhere-src-${version}"
+build_style=cmake
+hostmakedepends="perl qt6-declarative-devel"
+makedepends="qt6-declarative-devel"
+short_desc="Cross-platform application and UI framework - Connectivity"
+maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
+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=b25ce4710a9c61bc6a5dbaeeb3e2ed907a8bc85478fdb2ab4312297768b695b0
+
+qt6-connectivity-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}
+	 qt6-declarative>=${version}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
+		vmove usr/lib/qt6/mkspecs
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
+	}
+}

From f39a10d6be6cc05fb737eb9af597b23a70819eb5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 18:22:57 +0700
Subject: [PATCH 24/28] New package: qt6-sensors-6.3.1

---
 common/shlibs                |  2 ++
 srcpkgs/qt6-sensors-devel    |  1 +
 srcpkgs/qt6-sensors/template | 31 +++++++++++++++++++++++++++++++
 3 files changed, 34 insertions(+)
 create mode 120000 srcpkgs/qt6-sensors-devel
 create mode 100644 srcpkgs/qt6-sensors/template

diff --git a/common/shlibs b/common/shlibs
index 2e95a22119ab..157b51f3f981 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2074,6 +2074,8 @@ libQt6Help.so.6 qt6-tools-6.1.0_1
 libQt6UiTools.so.6 qt6-tools-6.1.0_1
 libQt6Nfc.so.6 qt6-connectivity-6.3.1_1
 libQt6Bluetooth.so.6 qt6-connectivity-6.3.1_1
+libQt6Sensors.so.6 qt6-sensors-6.3.1_1
+libQt6SensorsQuick.so.6 qt6-sensors-6.3.1_1
 libQt6HunspellInputMethod.so.6 qt6-virtualkeyboard-6.1.0_1
 libQt6VirtualKeyboard.so.6 qt6-virtualkeyboard-6.1.0_1
 libQt6SerialPort.so.6 qt6-serialport-6.2.0alpha_1
diff --git a/srcpkgs/qt6-sensors-devel b/srcpkgs/qt6-sensors-devel
new file mode 120000
index 000000000000..eb9457f04055
--- /dev/null
+++ b/srcpkgs/qt6-sensors-devel
@@ -0,0 +1 @@
+qt6-sensors
\ No newline at end of file
diff --git a/srcpkgs/qt6-sensors/template b/srcpkgs/qt6-sensors/template
new file mode 100644
index 000000000000..5a81f43b60eb
--- /dev/null
+++ b/srcpkgs/qt6-sensors/template
@@ -0,0 +1,31 @@
+# Template file for 'qt6-sensors'
+pkgname=qt6-sensors
+version=6.3.1
+revision=1
+wrksrc="qtsensors-everywhere-src-${version}"
+build_style=cmake
+hostmakedepends="perl qt6-declarative-devel qt6-svg-devel pkg-config"
+makedepends="qt6-declarative-devel qt6-svg-devel"
+short_desc="Cross-platform application and UI framework - Sensors"
+maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
+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=4b240b59edba9a42b4735758a25f279a26841b982864e7b38f6ef0b81e0d60cc
+
+qt6-sensors-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}
+	 qt6-declarative-devel>=${version}_1"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
+		vmove usr/lib/qt6/mkspecs
+		vmove usr/lib/qt6/qml/QtSensors/plugins.qmltypes
+		vmove usr/lib/qt6/qml/QtSensors/qmldir
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}

From f5432c961d4c9e191c7bc92a51cf50485fa918ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 18:23:08 +0700
Subject: [PATCH 25/28] New package: qt6-remoteobjects-6.3.1

---
 common/shlibs                      |  2 ++
 srcpkgs/qt6-remoteobjects-devel    |  1 +
 srcpkgs/qt6-remoteobjects/template | 36 ++++++++++++++++++++++++++++++
 3 files changed, 39 insertions(+)
 create mode 120000 srcpkgs/qt6-remoteobjects-devel
 create mode 100644 srcpkgs/qt6-remoteobjects/template

diff --git a/common/shlibs b/common/shlibs
index 157b51f3f981..91f197e54c93 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2074,6 +2074,8 @@ libQt6Help.so.6 qt6-tools-6.1.0_1
 libQt6UiTools.so.6 qt6-tools-6.1.0_1
 libQt6Nfc.so.6 qt6-connectivity-6.3.1_1
 libQt6Bluetooth.so.6 qt6-connectivity-6.3.1_1
+libQt6RemoteObjects.so.6 qt6-remoteobjects-6.3.1_1
+libQt6RemoteObjectsQml.so.6 qt6-remoteobjects-6.3.1_1
 libQt6Sensors.so.6 qt6-sensors-6.3.1_1
 libQt6SensorsQuick.so.6 qt6-sensors-6.3.1_1
 libQt6HunspellInputMethod.so.6 qt6-virtualkeyboard-6.1.0_1
diff --git a/srcpkgs/qt6-remoteobjects-devel b/srcpkgs/qt6-remoteobjects-devel
new file mode 120000
index 000000000000..2a027f95266f
--- /dev/null
+++ b/srcpkgs/qt6-remoteobjects-devel
@@ -0,0 +1 @@
+qt6-remoteobjects
\ No newline at end of file
diff --git a/srcpkgs/qt6-remoteobjects/template b/srcpkgs/qt6-remoteobjects/template
new file mode 100644
index 000000000000..71d2d31967b6
--- /dev/null
+++ b/srcpkgs/qt6-remoteobjects/template
@@ -0,0 +1,36 @@
+# Template file for 'qt6-remoteobjects'
+pkgname=qt6-remoteobjects
+version=6.3.1
+revision=1
+wrksrc="qtremoteobjects-everywhere-src-${version}"
+build_style=cmake
+hostmakedepends="perl qt6-declarative-devel pkg-config"
+makedepends="qt6-declarative-devel"
+short_desc="Cross-platform application and UI framework - Remote Objects"
+maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
+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=ea6d038b11c60981de0bd39a6091a59abf7d031e37bfc592b31be1217bef4ca6
+
+if [ "$CROSS_BUILD" ]; then
+	hostmakedepends+=" qt6-remoteobjects"
+	configure_args="-DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true"
+fi
+
+qt6-remoteobjects-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}
+	 qt6-declarative-devel>=${version}_1"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
+		vmove usr/lib/qt6/mkspecs
+		vmove usr/lib/qt6/qml/QtRemoteObjects/plugins.qmltypes
+		vmove usr/lib/qt6/qml/QtRemoteObjects/qmldir
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}

From 0bef4c2f66d5d2a1de10dac2252aa422e67c04ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:11 +0700
Subject: [PATCH 26/28] New package: qt6-webengine-6.3.1.

---
 common/shlibs                                 |    7 +
 srcpkgs/qt6-webengine-devel                   |    1 +
 srcpkgs/qt6-webengine-examples                |    1 +
 .../patches/0001-None-no-debug.patch          |   11 +
 .../patches/0002-enable-ppc64.patch           |   20 +
 .../patches/0003-cross-hack.patch             |   10 +
 .../0004-ppc-disable-jxl-decoder.patch        |   13 +
 .../patches/0050-no-glibc-cmake-check.patch   |   14 +
 .../0100-chromium-sandbox-membarrier.patch    |   58 +
 .../qt6-webengine/patches/0101-size_t.patch   |   16 +
 .../0102-chromium-90-ruy-include.patch        |   19 +
 ...-v8-monotonic-pthread-cont_timedwait.patch |   22 +
 .../0104-chromium-revert-9d080c0.patch        |  162 +
 ...-chromium-revert-drop-of-system-java.patch |   15 +
 .../patches/0106-chromium-system-nodejs.patch |   20 +
 .../0107-chromium-cursed^Uscoped_file.patch   |   18 +
 .../0108-chromium-fix-narrowing-cast.patch    |   53 +
 .../0109-chromium-remove-strip_binary.patch   |   32 +
 ...ium-revert-use-ffile-compilation-dir.patch |   57 +
 ...11-chromium-no-Wno-stringop-overread.patch |   10 +
 .../0150-chromium-glibc-libc_malloc.patch     |   24 +
 ...-include-sys-reg.h-to-get-__WORDSIZE.patch |   21 +
 .../0201-chromium-musl-dispatch-to-musl.patch |  103 +
 .../0202-chromium-musl-no-mallinfo.patch      |   62 +
 .../0203-chromium-musl-siginfo_t.patch        |   18 +
 .../0204-chromium-musl-stackstart.patch       |   20 +
 .../patches/0205-chromium-musl-sandbox.patch  |   92 +
 ...0206-chromium-musl-default-stacksize.patch |   15 +
 .../patches/0208-chromium-musl-execinfo.patch |  125 +
 .../0209-chromium-musl-thread-stacksize.patch |   22 +
 .../0210-chromium-musl-msgvec-push_back.patch |   14 +
 ...ium-musl-canonicalize-file-name-musl.patch |   11 +
 .../0212-chromium-musl-no-getcontext.patch    |   29 +
 .../patches/0213-chromium-musl-crashpad.patch |   24 +
 .../patches/0214-chromium-musl-fixes.patch    |  108 +
 .../patches/0215-chromium-musl-cdefs.patch    |   29 +
 .../patches/0216-chromium-musl-stat.patch     |   12 +
 .../patches/0217-chromium-musl-resolver.patch |   77 +
 .../patches/0600-chromium-sndio.patch         |  876 ++++
 .../patches/0700-armv7l-neon.patch            |   10 +
 ...-chromium-musl-cross-no-asm_ptrace_h.patch |   30 +
 .../0751-chromium-musl-arm-user_vfp.patch     |   20 +
 .../0752-chromium-musl-arm-elf_auxv_t.patch   |   18 +
 ...0801-chromium-i686-vaapi-fpermissive.patch |   24 +
 .../patches/0900-xxx-ppc64le-libvpx.patch     |   65 +
 .../0901-xxx-ppc64le-sandbox-linux-stat.patch |   31 +
 .../patches/0902-xxx-ppc64le-support.patch    | 3556 +++++++++++++++++
 .../0903-xxx-ppc64le-swiftshader.patch        |   18 +
 .../patches/cross-build-examples.patch        |   16 +
 srcpkgs/qt6-webengine/template                |  178 +
 srcpkgs/qt6-webengine/update                  |    1 +
 51 files changed, 6208 insertions(+)
 create mode 120000 srcpkgs/qt6-webengine-devel
 create mode 120000 srcpkgs/qt6-webengine-examples
 create mode 100644 srcpkgs/qt6-webengine/patches/0001-None-no-debug.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0002-enable-ppc64.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0003-cross-hack.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0004-ppc-disable-jxl-decoder.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0050-no-glibc-cmake-check.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0100-chromium-sandbox-membarrier.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0101-size_t.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0102-chromium-90-ruy-include.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0103-chromium-v8-monotonic-pthread-cont_timedwait.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0104-chromium-revert-9d080c0.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0105-chromium-revert-drop-of-system-java.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0106-chromium-system-nodejs.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0107-chromium-cursed^Uscoped_file.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0108-chromium-fix-narrowing-cast.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0109-chromium-remove-strip_binary.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0110-chromium-revert-use-ffile-compilation-dir.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0111-chromium-no-Wno-stringop-overread.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0150-chromium-glibc-libc_malloc.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0200-chromium-musl-include-sys-reg.h-to-get-__WORDSIZE.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0201-chromium-musl-dispatch-to-musl.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0202-chromium-musl-no-mallinfo.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0203-chromium-musl-siginfo_t.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0204-chromium-musl-stackstart.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0205-chromium-musl-sandbox.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0206-chromium-musl-default-stacksize.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0208-chromium-musl-execinfo.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0209-chromium-musl-thread-stacksize.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0210-chromium-musl-msgvec-push_back.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0211-chromium-musl-canonicalize-file-name-musl.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0212-chromium-musl-no-getcontext.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0213-chromium-musl-crashpad.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0214-chromium-musl-fixes.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0215-chromium-musl-cdefs.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0216-chromium-musl-stat.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0217-chromium-musl-resolver.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0600-chromium-sndio.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0700-armv7l-neon.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0750-chromium-musl-cross-no-asm_ptrace_h.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0751-chromium-musl-arm-user_vfp.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0752-chromium-musl-arm-elf_auxv_t.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0801-chromium-i686-vaapi-fpermissive.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0900-xxx-ppc64le-libvpx.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0901-xxx-ppc64le-sandbox-linux-stat.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0902-xxx-ppc64le-support.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0903-xxx-ppc64le-swiftshader.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/cross-build-examples.patch
 create mode 100644 srcpkgs/qt6-webengine/template
 create mode 100644 srcpkgs/qt6-webengine/update

diff --git a/common/shlibs b/common/shlibs
index 91f197e54c93..1f8acc43c36e 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2087,6 +2087,13 @@ libQt6Positioning.so.6 qt6-location-6.2.0alpha_1
 libQt6MultimediaWidgets.so.6 qt6-multimedia-6.3.1_1
 libQt6MultimediaQuick.so.6 qt6-multimedia-6.3.1_1
 libQt6Multimedia.so.6 qt6-multimedia-6.3.1_1
+libQt6WebEngineQuick.so.6 qt6-webengine-6.3.1_1
+libQt6PdfWidgets.so.6 qt6-webengine-6.3.1_1
+libQt6PdfQuick.so.6 qt6-webengine-6.3.1_1
+libQt6WebEngineCore.so.6 qt6-webengine-6.3.1_1
+libQt6Pdf.so.6 qt6-webengine-6.3.1_1
+libQt6WebEngineQuickDelegatesQml.so.6 qt6-webengine-6.3.1_1
+libQt6WebEngineWidgets.so.6 qt6-webengine-6.3.1_1
 libnpth.so.0 npth-1.1_1
 libnpupnp.so.4 libnpupnp-4.0.2_1
 libglfw.so.3 glfw-3.0.4_1
diff --git a/srcpkgs/qt6-webengine-devel b/srcpkgs/qt6-webengine-devel
new file mode 120000
index 000000000000..8e4d1b99c587
--- /dev/null
+++ b/srcpkgs/qt6-webengine-devel
@@ -0,0 +1 @@
+qt6-webengine
\ No newline at end of file
diff --git a/srcpkgs/qt6-webengine-examples b/srcpkgs/qt6-webengine-examples
new file mode 120000
index 000000000000..8e4d1b99c587
--- /dev/null
+++ b/srcpkgs/qt6-webengine-examples
@@ -0,0 +1 @@
+qt6-webengine
\ No newline at end of file
diff --git a/srcpkgs/qt6-webengine/patches/0001-None-no-debug.patch b/srcpkgs/qt6-webengine/patches/0001-None-no-debug.patch
new file mode 100644
index 000000000000..1ba33f8e6fd9
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0001-None-no-debug.patch
@@ -0,0 +1,11 @@
+--- a/cmake/Functions.cmake
++++ b/cmake/Functions.cmake
+@@ -813,6 +813,8 @@ macro(append_build_type_setup)
+         endif()
+     elseif(${config} STREQUAL "MinSizeRel")
+         list(APPEND gnArgArg is_debug=false symbol_level=0 optimize_for_size=true)
++    elseif(${config} STREQUAL "None")
++        list(APPEND gnArgArg is_debug=false symbol_level=0)
+     endif()
+     if(FEATURE_developer_build OR (${config} STREQUAL "Debug") OR QT_FEATURE_webengine_sanitizer)
+         list(APPEND gnArgArg
diff --git a/srcpkgs/qt6-webengine/patches/0002-enable-ppc64.patch b/srcpkgs/qt6-webengine/patches/0002-enable-ppc64.patch
new file mode 100644
index 000000000000..d72ef1ad1a10
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0002-enable-ppc64.patch
@@ -0,0 +1,20 @@
+--- a/cmake/Functions.cmake
++++ b/cmake/Functions.cmake
+@@ -622,6 +622,8 @@ function(get_gn_arch result arch)
+         set(${result} "mipsel" PARENT_SCOPE)
+     elseif(arch STREQUAL "mipsel64")
+         set(${result} "mips64el" PARENT_SCOPE)
++    elseif(arch STREQUAL "power64")
++        set(${result} "power64" PARENT_SCOPE)
+     else()
+         message(DEBUG "Unsupported architecture: ${arch}")
+     endif()
+@@ -641,6 +643,8 @@ function(get_v8_arch result targetArch h
+             set(${result} "mipsel" PARENT_SCOPE)
+         elseif(hostArch STREQUAL "mipsel64")
+             set(${result} "mipsel" PARENT_SCOPE)
++        elseif(hostArch STREQUAL "power64")
++            set(${result} "power64" PARENT_SCOPE)
+         else()
+             message(DEBUG "Unsupported architecture: ${hostArch}")
+         endif()
diff --git a/srcpkgs/qt6-webengine/patches/0003-cross-hack.patch b/srcpkgs/qt6-webengine/patches/0003-cross-hack.patch
new file mode 100644
index 000000000000..ea9f90094a63
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0003-cross-hack.patch
@@ -0,0 +1,10 @@
+--- a/src/core/api/CMakeLists.txt
++++ b/src/core/api/CMakeLists.txt
+@@ -50,6 +50,7 @@ qt_internal_add_module(WebEngineCore
+         Qt::Gui
+         Qt::Network
+         Qt::Quick
++        X11
+ )
+ 
+ set_target_properties(WebEngineCore PROPERTIES QTWEBENGINEPROCESS_NAME ${qtWebEngineProcessName})
diff --git a/srcpkgs/qt6-webengine/patches/0004-ppc-disable-jxl-decoder.patch b/srcpkgs/qt6-webengine/patches/0004-ppc-disable-jxl-decoder.patch
new file mode 100644
index 000000000000..73c1151968f4
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0004-ppc-disable-jxl-decoder.patch
@@ -0,0 +1,13 @@
+--- a/src/core/CMakeLists.txt
++++ b/src/core/CMakeLists.txt
+@@ -414,6 +414,10 @@ foreach(arch ${archs})
+                 CONDITION QT_FEATURE_webengine_ozone_x11 AND XSCRNSAVER_FOUND
+             )
+ 
++            if (cpu STREQUAL "ppc64")
++                list(APPEND gnArgArg enable_jxl_decoder=false)
++            endif()
++
+             if(QT_FEATURE_webengine_kerberos)
+                 list(APPEND gnArgArg
+                      external_gssapi_include_dir="${GSSAPI_INCLUDE_DIRS}/gssapi"
diff --git a/srcpkgs/qt6-webengine/patches/0050-no-glibc-cmake-check.patch b/srcpkgs/qt6-webengine/patches/0050-no-glibc-cmake-check.patch
new file mode 100644
index 000000000000..f756bf0286bb
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0050-no-glibc-cmake-check.patch
@@ -0,0 +1,14 @@
+--- a/configure.cmake
++++ b/configure.cmake
+@@ -499,11 +499,6 @@ add_check_for_support(
+ )
+ add_check_for_support(
+    MODULES QtWebEngine QtPdf
+-   CONDITION NOT LINUX OR TEST_glibc
+-   MESSAGE "A suitable version >= 2.17 of glibc is required."
+-)
+-add_check_for_support(
+-   MODULES QtWebEngine QtPdf
+    CONDITION NOT LINUX OR TEST_khr
+    MESSAGE "Build requires Khronos development headers for build - see mesa/libegl1-mesa-dev"
+ )
diff --git a/srcpkgs/qt6-webengine/patches/0100-chromium-sandbox-membarrier.patch b/srcpkgs/qt6-webengine/patches/0100-chromium-sandbox-membarrier.patch
new file mode 100644
index 000000000000..2dd7b4aa948f
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0100-chromium-sandbox-membarrier.patch
@@ -0,0 +1,58 @@
+--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
++++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
+@@ -413,6 +413,7 @@ bool SyscallSets::IsAllowedProcessStartO
+   switch (sysno) {
+     case __NR_exit:
+     case __NR_exit_group:
++    case __NR_membarrier:
+     case __NR_wait4:
+     case __NR_waitid:
+ #if defined(__i386__)
+--- a/src/3rdparty/chromium/sandbox/linux/system_headers/arm64_linux_syscalls.h
++++ b/src/3rdparty/chromium/sandbox/linux/system_headers/arm64_linux_syscalls.h
+@@ -1215,4 +1215,8 @@
+ #define __NR_landlock_restrict_self 446
+ #endif
+ 
++#if !defined(__NR_membarrier)
++#define __NR_membarrier 283
++#endif
++
+ #endif  // SANDBOX_LINUX_SYSTEM_HEADERS_ARM64_LINUX_SYSCALLS_H_
+--- a/src/3rdparty/chromium/sandbox/linux/system_headers/arm_linux_syscalls.h
++++ b/src/3rdparty/chromium/sandbox/linux/system_headers/arm_linux_syscalls.h
+@@ -1617,6 +1617,10 @@
+ #define __NR_landlock_restrict_self (__NR_SYSCALL_BASE + 446)
+ #endif
+ 
++#if !defined(__NR_membarrier)
++#define __NR_membarrier (__NR_SYSCALL_BASE+389)
++#endif
++
+ // ARM private syscalls.
+ #if !defined(__ARM_NR_BASE)
+ #define __ARM_NR_BASE (__NR_SYSCALL_BASE + 0xF0000)
+--- a/src/3rdparty/chromium/sandbox/linux/system_headers/x86_32_linux_syscalls.h
++++ b/src/3rdparty/chromium/sandbox/linux/system_headers/x86_32_linux_syscalls.h
+@@ -1750,5 +1750,9 @@
+ #define __NR_landlock_restrict_self 446
+ #endif
+ 
++#if !defined(__NR_membarrier)
++#define __NR_membarrier 375
++#endif
++
+ #endif  // SANDBOX_LINUX_SYSTEM_HEADERS_X86_32_LINUX_SYSCALLS_H_
+ 
+--- a/src/3rdparty/chromium/sandbox/linux/system_headers/x86_64_linux_syscalls.h
++++ b/src/3rdparty/chromium/sandbox/linux/system_headers/x86_64_linux_syscalls.h
+@@ -1438,5 +1438,9 @@
+ #define __NR_landlock_restrict_self 446
+ #endif
+ 
++#if !defined(__NR_membarrier)
++#define __NR_membarrier 324
++#endif
++
+ #endif  // SANDBOX_LINUX_SYSTEM_HEADERS_X86_64_LINUX_SYSCALLS_H_
+ 
diff --git a/srcpkgs/qt6-webengine/patches/0101-size_t.patch b/srcpkgs/qt6-webengine/patches/0101-size_t.patch
new file mode 100644
index 000000000000..fccc085da311
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0101-size_t.patch
@@ -0,0 +1,16 @@
+--- a/src/3rdparty/chromium/third_party/angle/include/platform/PlatformMethods.h
++++ b/src/3rdparty/chromium/third_party/angle/include/platform/PlatformMethods.h
+@@ -239,11 +239,11 @@ inline void DefaultOverrideFeaturesMtl(P
+ using ProgramKeyType   = std::array<uint8_t, 20>;
+ using CacheProgramFunc = void (*)(PlatformMethods *platform,
+                                   const ProgramKeyType &key,
+-                                  size_t programSize,
++                                  std::size_t programSize,
+                                   const uint8_t *programBytes);
+ inline void DefaultCacheProgram(PlatformMethods *platform,
+                                 const ProgramKeyType &key,
+-                                size_t programSize,
++                                std::size_t programSize,
+                                 const uint8_t *programBytes)
+ {}
+ 
diff --git a/srcpkgs/qt6-webengine/patches/0102-chromium-90-ruy-include.patch b/srcpkgs/qt6-webengine/patches/0102-chromium-90-ruy-include.patch
new file mode 100644
index 000000000000..bbba579076d6
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0102-chromium-90-ruy-include.patch
@@ -0,0 +1,19 @@
+From 714092f336bb14d2fcc27396ec323b3d843bb962 Mon Sep 17 00:00:00 2001
+From: Stephan Hartmann <stha09@googlemail.com>
+Date: Thu, 4 Mar 2021 15:05:46 +0000
+Subject: [PATCH] IWYU: include limits for std::numeric_limits
+
+---
+ third_party/ruy/src/ruy/block_map.cc | 1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/src/3rdparty/chromium/third_party/ruy/src/ruy/block_map.cc
++++ b/src/3rdparty/chromium/third_party/ruy/src/ruy/block_map.cc
+@@ -17,6 +17,7 @@ limitations under the License.
+ 
+ #include <algorithm>
+ #include <cstdint>
++#include <limits>
+ 
+ #ifdef RUY_MAKEBLOCKMAP_DEBUG
+ #include <cstdio>
diff --git a/srcpkgs/qt6-webengine/patches/0103-chromium-v8-monotonic-pthread-cont_timedwait.patch b/srcpkgs/qt6-webengine/patches/0103-chromium-v8-monotonic-pthread-cont_timedwait.patch
new file mode 100644
index 000000000000..1dc8bc4d3d17
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0103-chromium-v8-monotonic-pthread-cont_timedwait.patch
@@ -0,0 +1,22 @@
+Use monotonic clock for pthread_cond_timedwait with musl too.
+
+--- a/src/3rdparty/chromium/v8/src/base/platform/condition-variable.cc
++++ b/src/3rdparty/chromium/v8/src/base/platform/condition-variable.cc
+@@ -20,7 +20,7 @@ namespace base {
+ 
+ ConditionVariable::ConditionVariable() {
+ #if (V8_OS_FREEBSD || V8_OS_NETBSD || V8_OS_OPENBSD || \
+-     (V8_OS_LINUX && V8_LIBC_GLIBC))
++     V8_OS_LINUX)
+   // On Free/Net/OpenBSD and Linux with glibc we can change the time
+   // source for pthread_cond_timedwait() to use the monotonic clock.
+   pthread_condattr_t attr;
+@@ -96,7 +96,7 @@ bool ConditionVariable::WaitFor(Mutex* m
+       &native_handle_, &mutex->native_handle(), &ts);
+ #else
+ #if (V8_OS_FREEBSD || V8_OS_NETBSD || V8_OS_OPENBSD || \
+-     (V8_OS_LINUX && V8_LIBC_GLIBC))
++     V8_OS_LINUX)
+   // On Free/Net/OpenBSD and Linux with glibc we can change the time
+   // source for pthread_cond_timedwait() to use the monotonic clock.
+   result = clock_gettime(CLOCK_MONOTONIC, &ts);
diff --git a/srcpkgs/qt6-webengine/patches/0104-chromium-revert-9d080c0.patch b/srcpkgs/qt6-webengine/patches/0104-chromium-revert-9d080c0.patch
new file mode 100644
index 000000000000..42b1ee9ec063
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0104-chromium-revert-9d080c0.patch
@@ -0,0 +1,162 @@
+ Original change's description:
+ > Replace 'blacklist' with 'ignorelist' in ./tools/msan/.
+ >
+ > Bug: 1097272, 1097268
+ > Change-Id: Id5c8227a5bfb1ffaec82d3168b609085b10c8297
+ > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2867730
+ > Commit-Queue: Dylan Cutler <dylancutler@google.com>
+ > Reviewed-by: Nico Weber <thakis@chromium.org>
+ > Reviewed-by: Jonathan Metzman <metzman@chromium.org>
+ > Cr-Commit-Position: refs/heads/master@{#883035}
+--- a/src/3rdparty/chromium/build/config/sanitizers/BUILD.gn
++++ b/src/3rdparty/chromium/build/config/sanitizers/BUILD.gn
+@@ -272,11 +272,11 @@ config("asan_flags") {
+   if (is_asan) {
+     cflags += [ "-fsanitize=address" ]
+     if (is_win) {
+-      if (!defined(asan_win_blocklist_path)) {
+-        asan_win_blocklist_path =
++      if (!defined(asan_win_blacklist_path)) {
++        asan_win_blacklist_path =
+             rebase_path("//tools/memory/asan/blocklist_win.txt", root_build_dir)
+       }
+-      cflags += [ "-fsanitize-ignorelist=$asan_win_blocklist_path" ]
++      cflags += [ "-fsanitize-blacklist=$asan_win_blacklist_path" ]
+     }
+   }
+ }
+@@ -306,13 +306,13 @@ config("link_shared_library") {
+ config("cfi_flags") {
+   cflags = []
+   if (is_cfi && current_toolchain == default_toolchain) {
+-    if (!defined(cfi_ignorelist_path)) {
+-      cfi_ignorelist_path =
++    if (!defined(cfi_blacklist_path)) {
++      cfi_blacklist_path =
+           rebase_path("//tools/cfi/ignores.txt", root_build_dir)
+     }
+     cflags += [
+       "-fsanitize=cfi-vcall",
+-      "-fsanitize-ignorelist=$cfi_ignorelist_path",
++      "-fsanitize-blacklist=$cfi_blacklist_path",
+     ]
+ 
+     if (use_cfi_cast) {
+@@ -409,14 +409,14 @@ config("msan_flags") {
+   if (is_msan) {
+     assert(is_linux || is_chromeos,
+            "msan only supported on linux x86_64/ChromeOS")
+-    if (!defined(msan_ignorelist_path)) {
+-      msan_ignorelist_path =
+-          rebase_path("//tools/msan/ignorelist.txt", root_build_dir)
++    if (!defined(msan_blacklist_path)) {
++      msan_blacklist_path =
++          rebase_path("//tools/msan/blacklist.txt", root_build_dir)
+     }
+     cflags = [
+       "-fsanitize=memory",
+       "-fsanitize-memory-track-origins=$msan_track_origins",
+-      "-fsanitize-ignorelist=$msan_ignorelist_path",
++      "-fsanitize-blacklist=$msan_blacklist_path",
+     ]
+   }
+ }
+@@ -424,13 +424,13 @@ config("msan_flags") {
+ config("tsan_flags") {
+   if (is_tsan) {
+     assert(is_linux || is_chromeos, "tsan only supported on linux x86_64")
+-    if (!defined(tsan_ignorelist_path)) {
+-      tsan_ignorelist_path =
++    if (!defined(tsan_blacklist_path)) {
++      tsan_blacklist_path =
+           rebase_path("//tools/memory/tsan_v2/ignores.txt", root_build_dir)
+     }
+     cflags = [
+       "-fsanitize=thread",
+-      "-fsanitize-ignorelist=$tsan_ignorelist_path",
++      "-fsanitize-blacklist=$tsan_blacklist_path",
+     ]
+   }
+ }
+@@ -438,8 +438,8 @@ config("tsan_flags") {
+ config("ubsan_flags") {
+   cflags = []
+   if (is_ubsan) {
+-    if (!defined(ubsan_ignorelist_path)) {
+-      ubsan_ignorelist_path =
++    if (!defined(ubsan_blacklist_path)) {
++      ubsan_blacklist_path =
+           rebase_path("//tools/ubsan/ignorelist.txt", root_build_dir)
+     }
+     cflags += [
+@@ -456,7 +456,7 @@ config("ubsan_flags") {
+       "-fsanitize=signed-integer-overflow",
+       "-fsanitize=unreachable",
+       "-fsanitize=vla-bound",
+-      "-fsanitize-ignorelist=$ubsan_ignorelist_path",
++      "-fsanitize-blacklist=$ubsan_blacklist_path",
+     ]
+     if (!is_clang) {
+       # These exposes too much illegal C++14 code to compile on anything stricter than clang:
+@@ -497,8 +497,8 @@ config("ubsan_no_recover") {
+ 
+ config("ubsan_security_flags") {
+   if (is_ubsan_security) {
+-    if (!defined(ubsan_security_ignorelist_path)) {
+-      ubsan_security_ignorelist_path =
++    if (!defined(ubsan_security_blacklist_path)) {
++      ubsan_security_blacklist_path =
+           rebase_path("//tools/ubsan/security_ignorelist.txt", root_build_dir)
+     }
+     cflags = [
+@@ -506,7 +506,7 @@ config("ubsan_security_flags") {
+       "-fsanitize=shift",
+       "-fsanitize=signed-integer-overflow",
+       "-fsanitize=vla-bound",
+-      "-fsanitize-ignorelist=$ubsan_security_ignorelist_path",
++      "-fsanitize-blacklist=$ubsan_security_blacklist_path",
+     ]
+   }
+ }
+@@ -519,13 +519,13 @@ config("ubsan_null_flags") {
+ 
+ config("ubsan_vptr_flags") {
+   if (is_ubsan_vptr) {
+-    if (!defined(ubsan_vptr_ignorelist_path)) {
+-      ubsan_vptr_ignorelist_path =
++    if (!defined(ubsan_vptr_blacklist_path)) {
++      ubsan_vptr_blacklist_path =
+           rebase_path("//tools/ubsan/vptr_ignorelist.txt", root_build_dir)
+     }
+     cflags = [
+       "-fsanitize=vptr",
+-      "-fsanitize-ignorelist=$ubsan_vptr_ignorelist_path",
++      "-fsanitize-blacklist=$ubsan_vptr_blacklist_path",
+     ]
+     if (!is_clang) {
+       # Clang specific flag:
+--- a/src/3rdparty/chromium/build_overrides/build.gni
++++ b/src/3rdparty/chromium/build_overrides/build.gni
+@@ -43,15 +43,15 @@ declare_args() {
+ # Allows different projects to specify their own suppression/ignore lists for
+ # sanitizer tools.
+ # asan_suppressions_file = "path/to/asan_suppressions.cc"
+-# asan_win_ignorelist_path = "path/to/asan/blocklist_win.txt"
++# asan_win_blacklist_path = "path/to/asan/blocklist_win.txt"
+ # lsan_suppressions_file = "path/to/lsan_suppressions.cc"
+ # tsan_suppressions_file = "path/to/tsan_suppressions.cc"
+-# tsan_ignorelist_path = "path/to/tsan/ignores.txt"
+-# msan_ignorelist_path = "path/to/msan/ignorelist.txt"
+-# ubsan_ignorelist_path = "path/to/ubsan/ignorelist.txt"
+-# ubsan_vptr_ignorelist_path = "path/to/ubsan/vptr_ignorelist.txt"
+-# ubsan_security_ignorelist_path = "path/to/ubsan/security_ignorelist.txt"
+-# cfi_ignorelist_path = "path/to/cfi/ignores.txt"
++# tsan_blacklist_path = "path/to/tsan/ignores.txt"
++# msan_blacklist_path = "path/to/msan/blacklist.txt"
++# ubsan_blacklist_path = "path/to/ubsan/blacklist.txt"
++# ubsan_vptr_blacklist_path = "path/to/ubsan/vptr_blacklist.txt"
++# ubsan_security_blacklist_path = "path/to/ubsan/security_blacklist.txt"
++# cfi_blacklist_path = "path/to/cfi/ignores.txt"
+ 
+ declare_args() {
+   # Android 32-bit non-component, non-clang builds cannot have symbol_level=2
diff --git a/srcpkgs/qt6-webengine/patches/0105-chromium-revert-drop-of-system-java.patch b/srcpkgs/qt6-webengine/patches/0105-chromium-revert-drop-of-system-java.patch
new file mode 100644
index 000000000000..44f3aa8fae5e
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0105-chromium-revert-drop-of-system-java.patch
@@ -0,0 +1,15 @@
+This was dropped for some reason in 6951c37cecd05979b232a39e5c10e6346a0f74ef
+--- a/src/3rdparty/chromium/third_party/closure_compiler/compiler.py
++++ b/src/3rdparty/chromium/third_party/closure_compiler/compiler.py
+@@ -13,8 +13,9 @@ import subprocess
+ 
+ 
+ _CURRENT_DIR = os.path.join(os.path.dirname(__file__))
+-_JAVA_PATH = os.path.join(_CURRENT_DIR, "..", "jdk", "current", "bin", "java")
+-assert os.path.isfile(_JAVA_PATH), "java only allowed in android builds"
++_JAVA_BIN = "java"
++_JDK_PATH = os.path.join(_CURRENT_DIR, "..", "jdk", "current", "bin", "java")
++_JAVA_PATH = _JDK_PATH if os.path.isfile(_JDK_PATH) else _JAVA_BIN
+ 
+ class Compiler(object):
+   """Runs the Closure compiler on given source files to typecheck them
diff --git a/srcpkgs/qt6-webengine/patches/0106-chromium-system-nodejs.patch b/srcpkgs/qt6-webengine/patches/0106-chromium-system-nodejs.patch
new file mode 100644
index 000000000000..1e067cc6eda0
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0106-chromium-system-nodejs.patch
@@ -0,0 +1,20 @@
+--- a/src/3rdparty/chromium/third_party/node/node.py
++++ b/src/3rdparty/chromium/third_party/node/node.py
+@@ -36,11 +36,12 @@ def GetBinaryPath():
+   if platform.system() == 'Darwin' and platform.machine() == 'arm64':
+       return os.path.join(os_path.join(os_path.dirname(__file__), 'mac',
+                           'node-darwin-arm64', 'bin', 'node'))
+-  return os_path.join(os_path.dirname(__file__), *{
+-    'Darwin': ('mac', 'node-darwin-x64', 'bin', 'node'),
+-    'Linux': ('linux', 'node-linux-x64', 'bin', 'node'),
+-    'Windows': ('win', 'node.exe'),
+-  }[platform.system()])
++  return "/usr/bin/node"
++  #return os_path.join(os_path.dirname(__file__), *{
++  #  'Darwin': ('mac', 'node-darwin-x64', 'bin', 'node'),
++  #  'Linux': ('linux', 'node-linux-x64', 'bin', 'node'),
++  #  'Windows': ('win', 'node.exe'),
++  #}[platform.system()])
+ 
+ 
+ def RunNode(cmd_parts, stdout=None):
diff --git a/srcpkgs/qt6-webengine/patches/0107-chromium-cursed^Uscoped_file.patch b/srcpkgs/qt6-webengine/patches/0107-chromium-cursed^Uscoped_file.patch
new file mode 100644
index 000000000000..a8f5d971883d
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0107-chromium-cursed^Uscoped_file.patch
@@ -0,0 +1,18 @@
+--- a/src/3rdparty/chromium/base/files/scoped_file_linux.cc
++++ b/src/3rdparty/chromium/base/files/scoped_file_linux.cc
+@@ -77,15 +77,3 @@ bool IsFDOwned(int fd) {
+ }
+ 
+ }  // namespace base
+-
+-extern "C" {
+-
+-int __close(int);
+-
+-__attribute__((visibility("default"), noinline)) int close(int fd) {
+-  if (base::IsFDOwned(fd) && g_is_ownership_enforced)
+-    CrashOnFdOwnershipViolation();
+-  return __close(fd);
+-}
+-
+-}  // extern "C"
diff --git a/srcpkgs/qt6-webengine/patches/0108-chromium-fix-narrowing-cast.patch b/srcpkgs/qt6-webengine/patches/0108-chromium-fix-narrowing-cast.patch
new file mode 100644
index 000000000000..ed32cd9b7415
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0108-chromium-fix-narrowing-cast.patch
@@ -0,0 +1,53 @@
+--- a/src/3rdparty/chromium/base/files/file_util_linux.cc
++++ b/src/3rdparty/chromium/base/files/file_util_linux.cc
+@@ -23,14 +23,14 @@ bool GetFileSystemType(const FilePath& p
+ 
+   // Not all possible |statfs_buf.f_type| values are in linux/magic.h.
+   // Missing values are copied from the statfs man page.
+-  switch (statfs_buf.f_type) {
++  switch (static_cast<uintmax_t>(statfs_buf.f_type)) {
+     case 0:
+       *type = FILE_SYSTEM_0;
+       break;
+     case EXT2_SUPER_MAGIC:  // Also ext3 and ext4
+     case MSDOS_SUPER_MAGIC:
+     case REISERFS_SUPER_MAGIC:
+-    case static_cast<int>(BTRFS_SUPER_MAGIC):
++    case BTRFS_SUPER_MAGIC:
+     case 0x5346544E:  // NTFS
+     case 0x58465342:  // XFS
+     case 0x3153464A:  // JFS
+@@ -40,14 +40,14 @@ bool GetFileSystemType(const FilePath& p
+       *type = FILE_SYSTEM_NFS;
+       break;
+     case SMB_SUPER_MAGIC:
+-    case static_cast<int>(0xFF534D42):  // CIFS
++    case 0xFF534D42:  // CIFS
+       *type = FILE_SYSTEM_SMB;
+       break;
+     case CODA_SUPER_MAGIC:
+       *type = FILE_SYSTEM_CODA;
+       break;
+-    case static_cast<int>(HUGETLBFS_MAGIC):
+-    case static_cast<int>(RAMFS_MAGIC):
++    case HUGETLBFS_MAGIC:
++    case RAMFS_MAGIC:
+     case TMPFS_MAGIC:
+       *type = FILE_SYSTEM_MEMORY;
+       break;
+--- a/src/3rdparty/chromium/base/system/sys_info_posix.cc
++++ b/src/3rdparty/chromium/base/system/sys_info_posix.cc
+@@ -100,10 +100,10 @@ bool IsStatsZeroIfUnlimited(const base::
+   if (HANDLE_EINTR(statfs(path.value().c_str(), &stats)) != 0)
+     return false;
+ 
+-  switch (stats.f_type) {
++  switch (static_cast<uintmax_t>(stats.f_type)) {
+     case TMPFS_MAGIC:
+-    case static_cast<int>(HUGETLBFS_MAGIC):
+-    case static_cast<int>(RAMFS_MAGIC):
++    case HUGETLBFS_MAGIC:
++    case RAMFS_MAGIC:
+       return true;
+   }
+   return false;
diff --git a/srcpkgs/qt6-webengine/patches/0109-chromium-remove-strip_binary.patch b/srcpkgs/qt6-webengine/patches/0109-chromium-remove-strip_binary.patch
new file mode 100644
index 000000000000..5ebd16e659af
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0109-chromium-remove-strip_binary.patch
@@ -0,0 +1,32 @@
+--- a/src/3rdparty/chromium/chrome/test/chromedriver/BUILD.gn
++++ b/src/3rdparty/chromium/chrome/test/chromedriver/BUILD.gn
+@@ -308,11 +308,7 @@ source_set("lib") {
+   }
+ }
+ 
+-if (is_linux) {
+-  chromedriver_output = "chromedriver.unstripped"
+-} else {
+-  chromedriver_output = "chromedriver"
+-}
++chromedriver_output = "chromedriver"
+ 
+ executable("$chromedriver_output") {
+   testonly = true
+@@ -336,16 +332,6 @@ executable("$chromedriver_output") {
+   }
+ }
+ 
+-if (is_linux) {
+-  strip_binary("chromedriver") {
+-    testonly = true
+-    binary_input = "$root_out_dir/$chromedriver_output"
+-    symbol_output = "$root_out_dir/chromedriver.debug"
+-    stripped_binary_output = "$root_out_dir/chromedriver"
+-    deps = [ ":$chromedriver_output" ]
+-  }
+-}
+-
+ python_library("chromedriver_py_tests") {
+   testonly = true
+   deps = [
diff --git a/srcpkgs/qt6-webengine/patches/0110-chromium-revert-use-ffile-compilation-dir.patch b/srcpkgs/qt6-webengine/patches/0110-chromium-revert-use-ffile-compilation-dir.patch
new file mode 100644
index 000000000000..a00f7ea80f7a
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0110-chromium-revert-use-ffile-compilation-dir.patch
@@ -0,0 +1,57 @@
+From 34a955823630096f5b01c2b01d51c1ea59d22763 Mon Sep 17 00:00:00 2001
+From: Zequan Wu <zequanwu@google.com>
+Date: Tue, 20 Jul 2021 14:13:50 +0000
+Subject: [PATCH] Use -ffile-compilation-dir= instead of
+ -fdebug-compilation-dir=
+
+Bug: 1010267
+Change-Id: If2b4ead8535a76490eb466a38e3d8fed6ea91079
+Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2770738
+Auto-Submit: Zequan Wu <zequanwu@google.com>
+Commit-Queue: Nico Weber <thakis@chromium.org>
+Reviewed-by: Nico Weber <thakis@chromium.org>
+Cr-Commit-Position: refs/heads/master@{#903456}
+--- a/src/3rdparty/chromium/build/config/compiler/BUILD.gn
++++ b/src/3rdparty/chromium/build/config/compiler/BUILD.gn
+@@ -1269,19 +1269,12 @@ config("compiler_deterministic") {
+     # different build directory like "out/feature_a" and "out/feature_b" if
+     # we build same files with same compile flag.
+     # Other paths are already given in relative, no need to normalize them.
+-    if (is_nacl) {
+-      # TODO(https://crbug.com/1231236): Use -ffile-compilation-dir= here.
+-      cflags += [
+-        "-Xclang",
+-        "-fdebug-compilation-dir",
+-        "-Xclang",
+-        ".",
+-      ]
+-    } else {
+-      # -ffile-compilation-dir is an alias for both -fdebug-compilation-dir=
+-      # and -fcoverage-compilation-dir=.
+-      cflags += [ "-ffile-compilation-dir=." ]
+-    }
++    cflags += [
++      "-Xclang",
++      "-fdebug-compilation-dir",
++      "-Xclang",
++      ".",
++    ]
+     if (!is_win) {
+       # We don't use clang -cc1as on Windows (yet? https://crbug.com/762167)
+       asmflags = [ "-Wa,-fdebug-compilation-dir,." ]
+--- a/src/3rdparty/chromium/build/config/compiler/compiler.gni
++++ b/src/3rdparty/chromium/build/config/compiler/compiler.gni
+@@ -228,8 +228,11 @@ declare_args() {
+ # deterministic builds to reduce compile times, so this is less relevant for
+ # official builders.
+ strip_absolute_paths_from_debug_symbols_default =
+-    is_android || is_fuchsia || is_nacl || (is_win && use_lld) || is_linux ||
+-    is_chromeos || (is_apple && !enable_dsyms)
++    # TODO(crbug.com/1010267): remove '!use_clang_coverage', coverage build has
++    # dependency to absolute path of source files.
++    !use_clang_coverage &&
++    (is_android || is_fuchsia || is_nacl || (is_win && use_lld) || is_linux ||
++     is_chromeos || (is_apple && !enable_dsyms))
+ 
+ declare_args() {
+   strip_absolute_paths_from_debug_symbols = strip_absolute_paths_from_debug_symbols_default
diff --git a/srcpkgs/qt6-webengine/patches/0111-chromium-no-Wno-stringop-overread.patch b/srcpkgs/qt6-webengine/patches/0111-chromium-no-Wno-stringop-overread.patch
new file mode 100644
index 000000000000..03eac3f8e067
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0111-chromium-no-Wno-stringop-overread.patch
@@ -0,0 +1,10 @@
+--- a/src/3rdparty/chromium/build/config/compiler/BUILD.gn
++++ b/src/3rdparty/chromium/build/config/compiler/BUILD.gn
+@@ -394,7 +394,6 @@ config("compiler") {
+         "-Wno-parentheses",
+         "-Wno-sign-compare", # fido
+         "-Wno-stringop-overflow", # skia, libaom, protobuf, icu
+-        "-Wno-stringop-overread", # libaom
+         "-Wno-psabi", # skia
+         "-Wno-multichar", # crashpad
+         "-Wno-format-zero-length", # user_agent.cc
diff --git a/srcpkgs/qt6-webengine/patches/0150-chromium-glibc-libc_malloc.patch b/srcpkgs/qt6-webengine/patches/0150-chromium-glibc-libc_malloc.patch
new file mode 100644
index 000000000000..7e1b66e5c73d
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0150-chromium-glibc-libc_malloc.patch
@@ -0,0 +1,24 @@
+--- a/src/3rdparty/chromium/base/process/memory_linux.cc
++++ b/src/3rdparty/chromium/base/process/memory_linux.cc
+@@ -23,6 +23,12 @@
+ #include "third_party/tcmalloc/chromium/src/gperftools/tcmalloc.h"
+ #endif
+ 
++#if defined(LIBC_GLIBC)
++extern "C" {
++extern void *__libc_malloc(size_t size);
++}
++#endif
++
+ namespace base {
+ 
+ namespace {
+@@ -120,7 +126,7 @@ bool UncheckedMalloc(size_t size, void**
+     (!defined(LIBC_GLIBC) && !BUILDFLAG(USE_TCMALLOC))
+   *result = malloc(size);
+ #elif defined(LIBC_GLIBC) && !BUILDFLAG(USE_TCMALLOC)
+-  *result = __libc_malloc(size);
++  *result = ::__libc_malloc(size);
+ #elif BUILDFLAG(USE_TCMALLOC)
+   *result = tc_malloc_skip_new_handler(size);
+ #endif
diff --git a/srcpkgs/qt6-webengine/patches/0200-chromium-musl-include-sys-reg.h-to-get-__WORDSIZE.patch b/srcpkgs/qt6-webengine/patches/0200-chromium-musl-include-sys-reg.h-to-get-__WORDSIZE.patch
new file mode 100644
index 000000000000..41b90071b5e4
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0200-chromium-musl-include-sys-reg.h-to-get-__WORDSIZE.patch
@@ -0,0 +1,21 @@
+From 9001c54d6b974449174a8cee8f3f5d78a9bd6c9e Mon Sep 17 00:00:00 2001
+From: Felix Janda <felix.janda@posteo.de>
+Date: Sun, 1 Feb 2015 14:26:52 +0100
+Subject: [PATCH 3/6] include <sys/reg.h> to get __WORDSIZE on musl libc
+
+---
+ qtwebengine/src/3rdparty/chromium/third_party/breakpad/breakpad/src/common/linux/elf_core_dump.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/common/linux/elf_core_dump.h
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/common/linux/elf_core_dump.h
+@@ -37,6 +37,9 @@
+ #include <limits.h>
+ #include <link.h>
+ #include <stddef.h>
++#ifndef __GLIBC__
++#include <sys/reg.h>
++#endif
+ 
+ #include "common/memory_range.h"
+ 
diff --git a/srcpkgs/qt6-webengine/patches/0201-chromium-musl-dispatch-to-musl.patch b/srcpkgs/qt6-webengine/patches/0201-chromium-musl-dispatch-to-musl.patch
new file mode 100644
index 000000000000..a58a688a4b55
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0201-chromium-musl-dispatch-to-musl.patch
@@ -0,0 +1,103 @@
+--- a/src/3rdparty/chromium/base/allocator/allocator_shim_default_dispatch_to_glibc.cc
++++ b/src/3rdparty/chromium/base/allocator/allocator_shim_default_dispatch_to_glibc.cc
+@@ -8,6 +8,7 @@
+ #include <dlfcn.h>
+ #include <malloc.h>
+ 
++#if defined(__GLIBC__)
+ // This translation unit defines a default dispatch for the allocator shim which
+ // routes allocations to libc functions.
+ // The code here is strongly inspired from tcmalloc's libc_override_glibc.h.
+@@ -87,3 +88,92 @@ const AllocatorDispatch AllocatorDispatc
+     nullptr,               /* aligned_free_function */
+     nullptr,               /* next */
+ };
++
++#else // defined(__GLIBC__)
++
++#include <dlfcn.h>
++
++extern "C" {
++// Declare function pointers to the memory functions
++typedef void* (*t_libc_malloc)(size_t size);
++typedef void* (*t_libc_calloc)(size_t n, size_t size);
++typedef void* (*t_libc_realloc)(void* address, size_t size);
++typedef void* (*t_libc_memalign)(size_t alignment, size_t size);
++typedef void (*t_libc_free)(void* ptr);
++typedef size_t (*t_libc_malloc_usable_size)(void* ptr);
++
++// Static instances of pointers to libc.so dl symbols
++static t_libc_malloc libc_malloc = NULL;
++static t_libc_calloc libc_calloc = NULL;
++static t_libc_realloc libc_realloc = NULL;
++static t_libc_memalign libc_memalign = NULL;
++static t_libc_free libc_free = NULL;
++static t_libc_malloc_usable_size libc_malloc_usable_size = NULL;
++
++// resolve the symbols in libc.so
++void musl_libc_memory_init(void)
++{
++  libc_malloc = (t_libc_malloc) dlsym(RTLD_NEXT, "malloc");
++  libc_calloc = (t_libc_calloc) dlsym(RTLD_NEXT, "calloc");
++  libc_realloc = (t_libc_realloc) dlsym(RTLD_NEXT, "realloc");
++  libc_memalign = (t_libc_memalign) dlsym(RTLD_NEXT, "memalign");
++  libc_free = (t_libc_free) dlsym(RTLD_NEXT, "free");
++  libc_malloc_usable_size = (t_libc_malloc_usable_size) dlsym(RTLD_NEXT, "malloc_usable_size");
++}
++}  // extern "C"
++
++namespace {
++
++using base::allocator::AllocatorDispatch;
++
++void* MuslMalloc(const AllocatorDispatch*, size_t size, void* context) {
++  if (!libc_malloc)
++    musl_libc_memory_init();
++  return (*libc_malloc)(size);
++}
++
++void* MuslCalloc(const AllocatorDispatch*, size_t n, size_t size, void* context) {
++  if (!libc_calloc)
++    musl_libc_memory_init();
++  return (*libc_calloc)(n, size);
++}
++
++void* MuslRealloc(const AllocatorDispatch*, void* address, size_t size, void* context) {
++  if (!libc_realloc)
++    musl_libc_memory_init();
++  return (*libc_realloc)(address, size);
++}
++
++void* MuslMemalign(const AllocatorDispatch*, size_t alignment, size_t size, void* context) {
++  if (!libc_memalign)
++    musl_libc_memory_init();
++  return (*libc_memalign)(alignment, size);
++}
++
++void MuslFree(const AllocatorDispatch*, void* address, void* context) {
++  if (!libc_free)
++    musl_libc_memory_init();
++  (*libc_free)(address);
++}
++
++size_t MuslGetSizeEstimate(const AllocatorDispatch*, void* address, void* context) {
++  // TODO(siggi, primiano): malloc_usable_size may need redirection in the
++  //     presence of interposing shims that divert allocations.
++  if (!libc_malloc_usable_size)
++    musl_libc_memory_init();
++  return (*libc_malloc_usable_size)(address);
++}
++
++}  // namespace
++
++const AllocatorDispatch AllocatorDispatch::default_dispatch = {
++    &MuslMalloc,           /* alloc_function */
++    &MuslCalloc,           /* alloc_zero_initialized_function */
++    &MuslMemalign,         /* alloc_aligned_function */
++    &MuslRealloc,          /* realloc_function */
++    &MuslFree,             /* free_function */
++    &MuslGetSizeEstimate,  /* get_size_estimate_function */
++    nullptr,               /* next */
++};
++
++#endif
diff --git a/srcpkgs/qt6-webengine/patches/0202-chromium-musl-no-mallinfo.patch b/srcpkgs/qt6-webengine/patches/0202-chromium-musl-no-mallinfo.patch
new file mode 100644
index 000000000000..a5bdb5a43a5f
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0202-chromium-musl-no-mallinfo.patch
@@ -0,0 +1,62 @@
+--- a/src/3rdparty/chromium/base/process/process_metrics_posix.cc
++++ b/src/3rdparty/chromium/base/process/process_metrics_posix.cc
+@@ -105,7 +105,7 @@ void IncreaseFdLimitTo(unsigned int max_
+ 
+ #endif  // !defined(OS_FUCHSIA)
+ 
+-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID)
++#if (defined(OS_LINUX) && defined(__GLIBC__)) || defined(OS_CHROMEOS) || defined(OS_ANDROID)
+ namespace {
+ 
+ size_t GetMallocUsageMallinfo() {
+@@ -127,16 +127,16 @@ size_t GetMallocUsageMallinfo() {
+ }
+ 
+ }  // namespace
+-#endif  // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID)
++#endif  // (defined(OS_LINUX) && defined(__GLIBC__)) || defined(OS_CHROMEOS) || defined(OS_ANDROID)
+ 
+ size_t ProcessMetrics::GetMallocUsage() {
+ #if defined(OS_APPLE)
+   malloc_statistics_t stats = {0};
+   malloc_zone_statistics(nullptr, &stats);
+   return stats.size_in_use;
+-#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID)
++#elif (defined(OS_LINUX) && defined(__GLIBC__)) || defined(OS_CHROMEOS) || defined(OS_ANDROID)
+   return GetMallocUsageMallinfo();
+-#elif defined(OS_FUCHSIA)
++#else
+   // TODO(fuchsia): Not currently exposed. https://crbug.com/735087.
+   return 0;
+ #endif
+--- a/src/3rdparty/chromium/third_party/tflite/src/tensorflow/lite/profiling/memory_info.cc
++++ b/src/3rdparty/chromium/third_party/tflite/src/tensorflow/lite/profiling/memory_info.cc
+@@ -27,7 +27,7 @@ namespace memory {
+ const int MemoryUsage::kValueNotSet = 0;
+ 
+ bool MemoryUsage::IsSupported() {
+-#ifdef __linux__
++#ifdef __GLIBC__
+   return true;
+ #endif
+   return false;
+@@ -35,7 +35,7 @@ bool MemoryUsage::IsSupported() {
+ 
+ MemoryUsage GetMemoryUsage() {
+   MemoryUsage result;
+-#ifdef __linux__
++#ifdef __GLIBC__
+   rusage res;
+   if (getrusage(RUSAGE_SELF, &res) == 0) {
+     result.max_rss_kb = res.ru_maxrss;
+--- a/src/3rdparty/chromium/base/trace_event/malloc_dump_provider.cc
++++ b/src/3rdparty/chromium/base/trace_event/malloc_dump_provider.cc
+@@ -213,7 +213,7 @@ bool MallocDumpProvider::OnMemoryDump(co
+                      &allocated_objects_count);
+ #elif defined(OS_FUCHSIA)
+ // TODO(fuchsia): Port, see https://crbug.com/706592.
+-#else
++#elif defined(__GLIBC__)
+ #if defined(__GLIBC__) && defined(__GLIBC_PREREQ)
+ #if __GLIBC_PREREQ(2, 33)
+ #define MALLINFO2_FOUND_IN_LIBC
diff --git a/srcpkgs/qt6-webengine/patches/0203-chromium-musl-siginfo_t.patch b/srcpkgs/qt6-webengine/patches/0203-chromium-musl-siginfo_t.patch
new file mode 100644
index 000000000000..43ef7fd7c5d2
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0203-chromium-musl-siginfo_t.patch
@@ -0,0 +1,18 @@
+There's a subtle difference in the internal name of siginfo_t fields
+between glibc and musl. The structure itself is equivalent, so it
+should suffice to add a macro to rename the field.
+
+--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf/trap.cc
++++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf/trap.cc
+@@ -174,7 +174,11 @@ void Trap::SigSys(int nr, LinuxSigInfo*
+   // If the version of glibc doesn't include this information in
+   // siginfo_t (older than 2.17), we need to explicitly copy it
+   // into an arch_sigsys structure.
++#if defined(__GLIBC__)
+   memcpy(&sigsys, &info->_sifields, sizeof(sigsys));
++#else
++  memcpy(&sigsys, &info->__si_fields, sizeof(sigsys));
++#endif
+ #endif
+ 
+ #if defined(__mips__)
diff --git a/srcpkgs/qt6-webengine/patches/0204-chromium-musl-stackstart.patch b/srcpkgs/qt6-webengine/patches/0204-chromium-musl-stackstart.patch
new file mode 100644
index 000000000000..b03cf43b86db
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0204-chromium-musl-stackstart.patch
@@ -0,0 +1,20 @@
+--- a/src/3rdparty/chromium/third_party/blink/renderer/platform/wtf/stack_util.cc
++++ b/src/3rdparty/chromium/third_party/blink/renderer/platform/wtf/stack_util.cc
+@@ -29,7 +29,7 @@ size_t GetUnderestimatedStackSize() {
+ // FIXME: On Mac OSX and Linux, this method cannot estimate stack size
+ // correctly for the main thread.
+ 
+-#elif defined(__GLIBC__) || defined(OS_ANDROID) || defined(OS_FREEBSD) || \
++#elif defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FREEBSD) || \
+     defined(OS_FUCHSIA)
+   // pthread_getattr_np() can fail if the thread is not invoked by
+   // pthread_create() (e.g., the main thread of blink_unittests).
+@@ -97,7 +97,7 @@ return Threading::ThreadStackSize();
+ }
+ 
+ void* GetStackStart() {
+-#if defined(__GLIBC__) || defined(OS_ANDROID) || defined(OS_FREEBSD) || \
++#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FREEBSD) || \
+     defined(OS_FUCHSIA)
+   pthread_attr_t attr;
+   int error;
diff --git a/srcpkgs/qt6-webengine/patches/0205-chromium-musl-sandbox.patch b/srcpkgs/qt6-webengine/patches/0205-chromium-musl-sandbox.patch
new file mode 100644
index 000000000000..772a578fd823
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0205-chromium-musl-sandbox.patch
@@ -0,0 +1,92 @@
+--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc
++++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc
+@@ -138,7 +138,7 @@ namespace sandbox {
+ // present (as in newer versions of posix_spawn).
+ ResultExpr RestrictCloneToThreadsAndEPERMFork() {
+   const Arg<unsigned long> flags(0);
+-
++#if defined(__GLIBC__)
+   // TODO(mdempsky): Extend DSL to support (flags & ~mask1) == mask2.
+   const uint64_t kAndroidCloneMask = CLONE_VM | CLONE_FS | CLONE_FILES |
+                                      CLONE_SIGHAND | CLONE_THREAD |
+@@ -165,6 +165,17 @@ ResultExpr RestrictCloneToThreadsAndEPER
+   return If(IsAndroid() ? android_test : glibc_test, Allow())
+       .ElseIf(is_fork_or_clone_vfork, Error(EPERM))
+       .Else(CrashSIGSYSClone());
++#else
++  const int required = CLONE_VM | CLONE_FS | CLONE_FILES | CLONE_SIGHAND |
++                       CLONE_THREAD | CLONE_SYSVSEM;
++  const int safe = CLONE_SETTLS | CLONE_PARENT_SETTID | CLONE_CHILD_CLEARTID |
++                   CLONE_DETACHED;
++  const BoolExpr thread_clone_ok = (flags&~safe)==required;
++
++  return If(thread_clone_ok, Allow())
++      .ElseIf((flags & (CLONE_VM | CLONE_THREAD)) == 0, Error(EPERM))
++      .Else(CrashSIGSYSClone());
++#endif
+ }
+ 
+ #ifndef PR_PAC_RESET_KEYS
+--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
++++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
+@@ -419,6 +419,9 @@ bool SyscallSets::IsAllowedProcessStartO
+ #if defined(__i386__)
+     case __NR_waitpid:
+ #endif
++#if !defined(__GLIBC__)
++    case __NR_set_tid_address:
++#endif
+       return true;
+     case __NR_clone:  // Should be parameter-restricted.
+     case __NR_setns:  // Privileged.
+@@ -431,7 +434,9 @@ bool SyscallSets::IsAllowedProcessStartO
+ #if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
+     case __NR_set_thread_area:
+ #endif
++#if defined(__GLIBC__)
+     case __NR_set_tid_address:
++#endif
+     case __NR_unshare:
+ #if !defined(__mips__) && !defined(__aarch64__)
+     case __NR_vfork:
+@@ -545,6 +550,9 @@ bool SyscallSets::IsAllowedAddressSpaceA
+     case __NR_mlock:
+     case __NR_munlock:
+     case __NR_munmap:
++#if !defined(__GLIBC__)
++    case __NR_mremap:
++#endif
+       return true;
+     case __NR_madvise:
+     case __NR_mincore:
+@@ -562,7 +570,9 @@ bool SyscallSets::IsAllowedAddressSpaceA
+     case __NR_modify_ldt:
+ #endif
+     case __NR_mprotect:
++#if defined(__GLIBC__)
+     case __NR_mremap:
++#endif
+     case __NR_msync:
+     case __NR_munlockall:
+     case __NR_readahead:
+--- a/src/3rdparty/chromium/sandbox/policy/linux/bpf_renderer_policy_linux.cc
++++ b/src/3rdparty/chromium/sandbox/policy/linux/bpf_renderer_policy_linux.cc
+@@ -97,11 +97,18 @@ ResultExpr RendererProcessPolicy::Evalua
+     case __NR_sysinfo:
+     case __NR_times:
+     case __NR_uname:
++#if !defined(__GLIBC__)
++    case __NR_sched_getparam:
++    case __NR_sched_getscheduler:
++    case __NR_sched_setscheduler:
++#endif
+       return Allow();
+     case __NR_sched_getaffinity:
++#if defined(__GLIBC__)
+     case __NR_sched_getparam:
+     case __NR_sched_getscheduler:
+     case __NR_sched_setscheduler:
++#endif
+       return RestrictSchedTarget(GetPolicyPid(), sysno);
+     case __NR_prlimit64:
+       // See crbug.com/662450 and setrlimit comment above.
diff --git a/srcpkgs/qt6-webengine/patches/0206-chromium-musl-default-stacksize.patch b/srcpkgs/qt6-webengine/patches/0206-chromium-musl-default-stacksize.patch
new file mode 100644
index 000000000000..bc07495b8144
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0206-chromium-musl-default-stacksize.patch
@@ -0,0 +1,15 @@
+--- a/src/3rdparty/chromium/base/threading/platform_thread_linux.cc
++++ b/src/3rdparty/chromium/base/threading/platform_thread_linux.cc
+@@ -439,7 +439,12 @@ void TerminateOnThread() {}
+ 
+ size_t GetDefaultThreadStackSize(const pthread_attr_t& attributes) {
+ #if !defined(THREAD_SANITIZER)
++#if defined(__GLIBC__)
+   return 0;
++#else // defined(__GLIBC__)
++  // For Musl libc try with a default stack size of 2 MiB
++  return 2 * 1024 * 1024;
++#endif // !defined(__GLIBC__)
+ #else
+   // ThreadSanitizer bloats the stack heavily. Evidence has been that the
+   // default stack size isn't enough for some browser tests.
diff --git a/srcpkgs/qt6-webengine/patches/0208-chromium-musl-execinfo.patch b/srcpkgs/qt6-webengine/patches/0208-chromium-musl-execinfo.patch
new file mode 100644
index 000000000000..9f3b964676b3
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0208-chromium-musl-execinfo.patch
@@ -0,0 +1,125 @@
+--- a/src/3rdparty/chromium/base/debug/stack_trace.cc
++++ b/src/3rdparty/chromium/base/debug/stack_trace.cc
+@@ -252,7 +252,9 @@ void StackTrace::Print() const {
+ }
+ 
+ void StackTrace::OutputToStream(std::ostream* os) const {
++#if defined(__GLIBC__) && !defined(_AIX)
+   OutputToStreamWithPrefix(os, nullptr);
++#endif
+ }
+ 
+ std::string StackTrace::ToString() const {
+@@ -260,7 +262,7 @@ std::string StackTrace::ToString() const
+ }
+ std::string StackTrace::ToStringWithPrefix(const char* prefix_string) const {
+   std::stringstream stream;
+-#if !defined(__UCLIBC__) && !defined(_AIX)
++#if defined(__GLIBC__) && !defined(_AIX)
+   OutputToStreamWithPrefix(&stream, prefix_string);
+ #endif
+   return stream.str();
+--- a/src/3rdparty/chromium/base/debug/stack_trace_posix.cc
++++ b/src/3rdparty/chromium/base/debug/stack_trace_posix.cc
+@@ -27,7 +27,7 @@
+ #if !defined(USE_SYMBOLIZE)
+ #include <cxxabi.h>
+ #endif
+-#if !defined(__UCLIBC__) && !defined(_AIX)
++#if defined(__GLIBC__) && !defined(_AIX)
+ #include <execinfo.h>
+ #endif
+ 
+@@ -89,7 +89,7 @@ void DemangleSymbols(std::string* text)
+   // Note: code in this function is NOT async-signal safe (std::string uses
+   // malloc internally).
+ 
+-#if !defined(__UCLIBC__) && !defined(_AIX)
++#if defined(__GLIBC__) && !defined(_AIX)
+   std::string::size_type search_from = 0;
+   while (search_from < text->size()) {
+     // Look for the start of a mangled symbol, from search_from.
+@@ -124,7 +124,7 @@ void DemangleSymbols(std::string* text)
+       search_from = mangled_start + 2;
+     }
+   }
+-#endif  // !defined(__UCLIBC__) && !defined(_AIX)
++#endif  // !defined(__GLIBC__) && !defined(_AIX)
+ }
+ #endif  // !defined(USE_SYMBOLIZE)
+ 
+@@ -136,7 +136,7 @@ class BacktraceOutputHandler {
+   virtual ~BacktraceOutputHandler() = default;
+ };
+ 
+-#if !defined(__UCLIBC__) && !defined(_AIX)
++#if defined(__GLIBC__) && !defined(_AIX)
+ void OutputPointer(void* pointer, BacktraceOutputHandler* handler) {
+   // This should be more than enough to store a 64-bit number in hex:
+   // 16 hex digits + 1 for null-terminator.
+@@ -219,7 +219,7 @@ void ProcessBacktrace(void* const* trace
+   }
+ #endif  // defined(USE_SYMBOLIZE)
+ }
+-#endif  // !defined(__UCLIBC__) && !defined(_AIX)
++#endif  // !defined(__GLIBC__) && !defined(_AIX)
+ 
+ void PrintToStderr(const char* output) {
+   // NOTE: This code MUST be async-signal safe (it's used by in-process
+@@ -839,7 +839,7 @@ size_t CollectStackTrace(void** trace, s
+   // If we do not have unwind tables, then try tracing using frame pointers.
+   return base::debug::TraceStackFramePointers(const_cast<const void**>(trace),
+                                               count, 0);
+-#elif !defined(__UCLIBC__) && !defined(_AIX)
++#elif defined(__GLIBC__) && !defined(_AIX)
+   // Though the backtrace API man page does not list any possible negative
+   // return values, we take no chance.
+   return base::saturated_cast<size_t>(backtrace(trace, count));
+@@ -852,13 +852,13 @@ void StackTrace::PrintWithPrefix(const c
+ // NOTE: This code MUST be async-signal safe (it's used by in-process
+ // stack dumping signal handler). NO malloc or stdio is allowed here.
+ 
+-#if !defined(__UCLIBC__) && !defined(_AIX)
++#if defined(__GLIBC__) && !defined(_AIX)
+   PrintBacktraceOutputHandler handler;
+   ProcessBacktrace(trace_, count_, prefix_string, &handler);
+ #endif
+ }
+ 
+-#if !defined(__UCLIBC__) && !defined(_AIX)
++#if defined(__GLIBC__) && !defined(_AIX)
+ void StackTrace::OutputToStreamWithPrefix(std::ostream* os,
+                                           const char* prefix_string) const {
+   StreamBacktraceOutputHandler handler(os);
+--- a/src/3rdparty/chromium/base/logging.cc
++++ b/src/3rdparty/chromium/base/logging.cc
+@@ -582,7 +582,7 @@ LogMessage::LogMessage(const char* file,
+ 
+ LogMessage::~LogMessage() {
+   size_t stack_start = stream_.tellp();
+-#if !defined(OFFICIAL_BUILD) && !defined(OS_NACL) && !defined(__UCLIBC__) && \
++#if !defined(OFFICIAL_BUILD) && !defined(OS_NACL) && defined(__GLIBC__) && \
+     !defined(OS_AIX)
+   if (severity_ == LOGGING_FATAL && !base::debug::BeingDebugged()) {
+     // Include a stack trace on a fatal, unless a debugger is attached.
+--- 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 @@
+ 
+ #if defined(DEBUG) && defined(V8_OS_LINUX) && !defined(V8_OS_ANDROID)
+ #define SYMBOLIZE_FUNCTION
++#if defined(__GLIBC__)
+ #include <execinfo.h>
++#endif
+ 
+ #include <vector>
+ 
+@@ -103,7 +105,7 @@ void ExternalReferenceTable::Init(Isolat
+ }
+ 
+ const char* ExternalReferenceTable::ResolveSymbol(void* address) {
+-#ifdef SYMBOLIZE_FUNCTION
++#if defined(SYMBOLIZE_FUNCTION) && defined(__GLIBC__)
+   char** names = backtrace_symbols(&address, 1);
+   const char* name = names[0];
+   // The array of names is malloc'ed. However, each name string is static
diff --git a/srcpkgs/qt6-webengine/patches/0209-chromium-musl-thread-stacksize.patch b/srcpkgs/qt6-webengine/patches/0209-chromium-musl-thread-stacksize.patch
new file mode 100644
index 000000000000..4b760a428b25
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0209-chromium-musl-thread-stacksize.patch
@@ -0,0 +1,22 @@
+--- a/src/3rdparty/chromium/ppapi/utility/threading/simple_thread.cc
++++ b/src/3rdparty/chromium/ppapi/utility/threading/simple_thread.cc
+@@ -13,7 +13,7 @@ namespace pp {
+ namespace {
+ 
+ // Use 2MB default stack size for Native Client, otherwise use system default.
+-#if defined(__native_client__)
++#if defined(__native_client__) || !defined(__GLIBC__)
+ const size_t kDefaultStackSize = 2 * 1024 * 1024;
+ #else
+ const size_t kDefaultStackSize = 0;
+--- a/src/3rdparty/chromium/v8/src/base/platform/platform-posix.cc
++++ b/src/3rdparty/chromium/v8/src/base/platform/platform-posix.cc
+@@ -883,7 +883,7 @@ bool Thread::Start() {
+ #if V8_OS_MACOSX
+     // Default on Mac OS X is 512kB -- bump up to 1MB
+     stack_size = 1 * 1024 * 1024;
+-#elif V8_OS_AIX
++#elif V8_OS_AIX || !defined(__GLIBC__)
+     // Default on AIX is 96kB -- bump up to 2MB
+     stack_size = 2 * 1024 * 1024;
+ #endif
diff --git a/srcpkgs/qt6-webengine/patches/0210-chromium-musl-msgvec-push_back.patch b/srcpkgs/qt6-webengine/patches/0210-chromium-musl-msgvec-push_back.patch
new file mode 100644
index 000000000000..905daa223700
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0210-chromium-musl-msgvec-push_back.patch
@@ -0,0 +1,14 @@
+--- a/src/3rdparty/chromium/net/socket/udp_socket_posix.cc
++++ b/src/3rdparty/chromium/net/socket/udp_socket_posix.cc
+@@ -1162,7 +1162,11 @@ SendResult UDPSocketPosixSender::Interna
+     msg_iov->push_back({const_cast<char*>(buffer->data()), buffer->length()});
+   msgvec->reserve(buffers.size());
+   for (size_t j = 0; j < buffers.size(); j++)
++#if defined(__GLIBC__)
+     msgvec->push_back({{nullptr, 0, &msg_iov[j], 1, nullptr, 0, 0}, 0});
++#else
++    msgvec->push_back({{nullptr, 0, &msg_iov[j], 1, 0, 0, 0}, 0});
++#endif
+   int result = HANDLE_EINTR(Sendmmsg(fd, &msgvec[0], buffers.size(), 0));
+   SendResult send_result(0, 0, std::move(buffers));
+   if (result < 0) {
diff --git a/srcpkgs/qt6-webengine/patches/0211-chromium-musl-canonicalize-file-name-musl.patch b/srcpkgs/qt6-webengine/patches/0211-chromium-musl-canonicalize-file-name-musl.patch
new file mode 100644
index 000000000000..d43e6bd488bc
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0211-chromium-musl-canonicalize-file-name-musl.patch
@@ -0,0 +1,11 @@
+--- a/src/3rdparty/chromium/third_party/nasm/nasmlib/realpath.c
++++ b/src/3rdparty/chromium/third_party/nasm/nasmlib/realpath.c
+@@ -55,7 +55,7 @@
+  */
+ char *nasm_realpath(const char *rel_path)
+ {
+-    char *rp = canonicalize_file_name(rel_path);
++    char *rp = realpath(rel_path, NULL);
+     return rp ? rp : nasm_strdup(rel_path);
+ }
+ 
diff --git a/srcpkgs/qt6-webengine/patches/0212-chromium-musl-no-getcontext.patch b/srcpkgs/qt6-webengine/patches/0212-chromium-musl-no-getcontext.patch
new file mode 100644
index 000000000000..5755f1b45a7d
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0212-chromium-musl-no-getcontext.patch
@@ -0,0 +1,29 @@
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc
+@@ -489,8 +489,10 @@ bool ExceptionHandler::SimulateSignalDel
+   // ExceptionHandler::HandleSignal().
+   siginfo.si_code = SI_USER;
+   siginfo.si_pid = getpid();
+-  ucontext_t context;
++  ucontext_t context = { 0 };
++#if defined(__GLIBC__)
+   getcontext(&context);
++#endif
+   return HandleSignal(sig, &siginfo, &context);
+ }
+ 
+@@ -675,9 +677,14 @@ bool ExceptionHandler::WriteMinidump() {
+   sys_prctl(PR_SET_DUMPABLE, 1, 0, 0, 0);
+ 
+   CrashContext context;
++
++#if defined(__GLIBC__)
+   int getcontext_result = getcontext(&context.context);
+   if (getcontext_result)
+     return false;
++#else
++  return false;
++#endif
+ 
+ #if defined(__i386__)
+   // In CPUFillFromUContext in minidumpwriter.cc the stack pointer is retrieved
diff --git a/srcpkgs/qt6-webengine/patches/0213-chromium-musl-crashpad.patch b/srcpkgs/qt6-webengine/patches/0213-chromium-musl-crashpad.patch
new file mode 100644
index 000000000000..71bbad2af17e
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0213-chromium-musl-crashpad.patch
@@ -0,0 +1,24 @@
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/compat/linux/sys/ptrace.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/compat/linux/sys/ptrace.h
+@@ -17,7 +17,9 @@
+ 
+ #include_next <sys/ptrace.h>
+ 
++#ifdef __GLIBC__
+ #include <sys/cdefs.h>
++#endif
+ 
+ // https://sourceware.org/bugzilla/show_bug.cgi?id=22433
+ #if !defined(PTRACE_GET_THREAD_AREA) && !defined(PT_GET_THREAD_AREA) && \
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/util/linux/ptracer.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/util/linux/ptracer.cc
+@@ -26,6 +26,9 @@
+ 
+ #if defined(ARCH_CPU_X86_FAMILY)
+ #include <asm/ldt.h>
++#if !defined(__GLIBC__)
++#include <asm/ptrace-abi.h>
++#endif
+ #endif
+ 
+ namespace crashpad {
diff --git a/srcpkgs/qt6-webengine/patches/0214-chromium-musl-fixes.patch b/srcpkgs/qt6-webengine/patches/0214-chromium-musl-fixes.patch
new file mode 100644
index 000000000000..55b267ed1714
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0214-chromium-musl-fixes.patch
@@ -0,0 +1,108 @@
+--- a/src/3rdparty/chromium/sandbox/linux/suid/process_util.h
++++ b/src/3rdparty/chromium/sandbox/linux/suid/process_util.h
+@@ -12,6 +12,15 @@
+ #include <stdint.h>
+ #include <sys/types.h>
+ 
++#if !defined(__GLIBC__) && !defined(TEMP_FAILURE_RETRY)
++# define TEMP_FAILURE_RETRY(expression) \
++	(__extension__			\
++	 ({ long int __result;		\
++	  do __result = (long int) (expression); \
++	  while (__result == -1L && errno == EINTR); \
++	  __result; }))
++#endif
++
+ // This adjusts /proc/process/oom_score_adj so the Linux OOM killer
+ // will prefer certain process types over others. The range for the
+ // adjustment is [-1000, 1000], with [0, 1000] being user accessible.
+--- a/src/3rdparty/chromium/services/device/serial/serial_io_handler_posix.cc
++++ b/src/3rdparty/chromium/services/device/serial/serial_io_handler_posix.cc
+@@ -6,6 +6,7 @@
+ 
+ #include <sys/ioctl.h>
+ #include <termios.h>
++#include <asm-generic/ioctls.h>
+ 
+ #include <algorithm>
+ #include <utility>
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h
+@@ -38,6 +38,10 @@
+ #include "common/memory_allocator.h"
+ #include "google_breakpad/common/minidump_format.h"
+ 
++#ifndef __GLIBC__
++#define _libc_fpstate _fpstate
++#endif
++
+ namespace google_breakpad {
+ 
+ // Wraps platform-dependent implementations of accessors to ucontext_t structs.
+--- a/src/3rdparty/chromium/third_party/ffmpeg/libavutil/cpu.c
++++ b/src/3rdparty/chromium/third_party/ffmpeg/libavutil/cpu.c
+@@ -41,8 +41,10 @@
+ #include <sys/param.h>
+ #endif
+ #include <sys/types.h>
++#ifdef __GLIBC__
+ #include <sys/sysctl.h>
+ #endif
++#endif
+ #if HAVE_UNISTD_H
+ #include <unistd.h>
+ #endif
+--- a/src/3rdparty/chromium/third_party/perfetto/include/perfetto/ext/base/thread_utils.h
++++ b/src/3rdparty/chromium/third_party/perfetto/include/perfetto/ext/base/thread_utils.h
+@@ -29,9 +29,7 @@
+ #include <algorithm>
+ #endif
+ 
+-#if PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID)
+ #include <sys/prctl.h>
+-#endif
+ 
+ // Internal implementation utils that aren't as widely useful/supported as
+ // base/thread_utils.h.
+@@ -58,7 +56,7 @@ inline bool MaybeSetThreadName(const std
+ 
+ inline bool GetThreadName(std::string& out_result) {
+   char buf[16] = {};
+-#if PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID)
++#if !defined(__GLIBC__)
+   if (prctl(PR_GET_NAME, buf) != 0)
+     return false;
+ #else
+--- a/src/3rdparty/chromium/third_party/lss/linux_syscall_support.h
++++ b/src/3rdparty/chromium/third_party/lss/linux_syscall_support.h
+@@ -1300,6 +1300,18 @@ struct kernel_statfs {
+ #ifndef __NR_fallocate
+ #define __NR_fallocate          285
+ #endif
++
++#if !defined(__GLIBC__)
++#ifdef __NR_pread
++#undef __NR_pread
++#endif
++#ifdef __NR_pwrite
++#undef __NR_pwrite
++#endif
++#define __NR_pread __NR_pread64
++#define __NR_pwrite __NR_pwrite64
++#endif /* !defined(__GLIBC__) */
++
+ #ifndef __NR_getrandom
+ #define __NR_getrandom          318
+ #endif
+--- a/src/3rdparty/chromium/net/dns/dns_config_service_posix.cc
++++ b/src/3rdparty/chromium/net/dns/dns_config_service_posix.cc
+@@ -93,7 +93,8 @@ absl::optional<DnsConfig> ReadDnsConfig(
+ 
+   absl::optional<DnsConfig> dns_config;
+ // TODO(fuchsia): Use res_ninit() when it's implemented on Fuchsia.
+-#if defined(OS_OPENBSD) || defined(OS_FUCHSIA)
++#if defined(OS_OPENBSD) || defined(OS_FUCHSIA) || \
++  (defined(OS_LINUX) && !defined(__GLIBC__))
+   // Note: res_ninit in glibc always returns 0 and sets RES_INIT.
+   // res_init behaves the same way.
+   memset(&_res, 0, sizeof(_res));
diff --git a/srcpkgs/qt6-webengine/patches/0215-chromium-musl-cdefs.patch b/srcpkgs/qt6-webengine/patches/0215-chromium-musl-cdefs.patch
new file mode 100644
index 000000000000..9d1daec29118
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0215-chromium-musl-cdefs.patch
@@ -0,0 +1,29 @@
+--- a/src/3rdparty/chromium/third_party/libsync/src/include/sync/sync.h
++++ b/src/3rdparty/chromium/third_party/libsync/src/include/sync/sync.h
+@@ -19,12 +19,13 @@
+ #ifndef __SYS_CORE_SYNC_H
+ #define __SYS_CORE_SYNC_H
+ 
+-#include <sys/cdefs.h>
+ #include <stdint.h>
+ 
+ #include <linux/types.h>
+ 
+-__BEGIN_DECLS
++#ifdef __cplusplus
++extern "C" {
++#endif
+ 
+ struct sync_legacy_merge_data {
+  int32_t fd2;
+@@ -158,6 +159,9 @@ struct sync_pt_info *sync_pt_info(struct
+                                   struct sync_pt_info *itr);
+ void sync_fence_info_free(struct sync_fence_info_data *info);
+ 
+-__END_DECLS
++#ifdef __cplusplus
++}
++#endif
++
+ 
+ #endif /* __SYS_CORE_SYNC_H */
diff --git a/srcpkgs/qt6-webengine/patches/0216-chromium-musl-stat.patch b/srcpkgs/qt6-webengine/patches/0216-chromium-musl-stat.patch
new file mode 100644
index 000000000000..4509a6957cd7
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0216-chromium-musl-stat.patch
@@ -0,0 +1,12 @@
+--- a/src/3rdparty/chromium/base/files/file.h
++++ b/src/3rdparty/chromium/base/files/file.h
+@@ -19,7 +19,8 @@
+ #include "build/build_config.h"
+ 
+ #if defined(OS_BSD) || defined(OS_APPLE) || defined(OS_NACL) || \
+-    defined(OS_FUCHSIA) || (defined(OS_ANDROID) && __ANDROID_API__ < 21)
++    defined(OS_FUCHSIA) || (defined(OS_ANDROID) && __ANDROID_API__ < 21) || \
++    (defined(OS_LINUX) && !defined(__GLIBC__))
+ struct stat;
+ namespace base {
+ typedef struct stat stat_wrapper_t;
diff --git a/srcpkgs/qt6-webengine/patches/0217-chromium-musl-resolver.patch b/srcpkgs/qt6-webengine/patches/0217-chromium-musl-resolver.patch
new file mode 100644
index 000000000000..c3d7afad9b19
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0217-chromium-musl-resolver.patch
@@ -0,0 +1,77 @@
+--- a/src/3rdparty/chromium/net/dns/dns_config_service_linux.cc
++++ b/src/3rdparty/chromium/net/dns/dns_config_service_linux.cc
+@@ -432,11 +432,13 @@ class DnsConfigServiceLinux::ConfigReade
+     base::ScopedBlockingCall scoped_blocking_call(
+         FROM_HERE, base::BlockingType::MAY_BLOCK);
+ 
++#if defined(__GLIBC__)
+     std::unique_ptr<struct __res_state> res = resolv_reader_->GetResState();
+     if (res) {
+       dns_config_ = ConvertResStateToDnsConfig(*res.get());
+       resolv_reader_->CloseResState(res.get());
+     }
++#endif
+ 
+     UMA_HISTOGRAM_BOOLEAN("Net.DNS.DnsConfig.Resolv.Read",
+                           dns_config_.has_value());
+@@ -486,6 +488,7 @@ class DnsConfigServiceLinux::ConfigReade
+ 
+ std::unique_ptr<struct __res_state>
+ DnsConfigServiceLinux::ResolvReader::GetResState() {
++#if defined(__GLIBC__)
+   auto res = std::make_unique<struct __res_state>();
+   memset(res.get(), 0, sizeof(struct __res_state));
+ 
+@@ -495,11 +498,16 @@ DnsConfigServiceLinux::ResolvReader::Get
+   }
+ 
+   return res;
++#else
++  return nullptr;
++#endif
+ }
+ 
+ void DnsConfigServiceLinux::ResolvReader::CloseResState(
+     struct __res_state* res) {
++#if defined(__GLIBC__)
+   res_nclose(res);
++#endif
+ }
+ 
+ DnsConfigServiceLinux::DnsConfigServiceLinux()
+--- a/src/3rdparty/chromium/net/dns/dns_reloader.cc
++++ b/src/3rdparty/chromium/net/dns/dns_reloader.cc
+@@ -4,8 +4,7 @@
+ 
+ #include "net/dns/dns_reloader.h"
+ 
+-#if defined(OS_POSIX) && !defined(OS_APPLE) && !defined(OS_OPENBSD) && \
+-    !defined(OS_ANDROID) && !defined(OS_FUCHSIA)
++#ifdef __GLIBC__
+ 
+ #include <resolv.h>
+ 
+--- a/src/3rdparty/chromium/net/dns/host_resolver_manager.cc
++++ b/src/3rdparty/chromium/net/dns/host_resolver_manager.cc
+@@ -2720,8 +2720,7 @@ HostResolverManager::HostResolverManager
+   NetworkChangeNotifier::AddConnectionTypeObserver(this);
+   if (system_dns_config_notifier_)
+     system_dns_config_notifier_->AddObserver(this);
+-#if defined(OS_POSIX) && !defined(OS_APPLE) && !defined(OS_OPENBSD) && \
+-    !defined(OS_ANDROID)
++#ifdef __GLIBC__
+   EnsureDnsReloaderInit();
+ #endif
+ 
+--- a/src/3rdparty/chromium/net/dns/host_resolver_proc.cc
++++ b/src/3rdparty/chromium/net/dns/host_resolver_proc.cc
+@@ -176,8 +176,7 @@ int SystemHostResolverCall(const std::st
+   base::ScopedBlockingCall scoped_blocking_call(FROM_HERE,
+                                                 base::BlockingType::WILL_BLOCK);
+ 
+-#if defined(OS_POSIX) && !defined(OS_APPLE) && !defined(OS_OPENBSD) && \
+-    !defined(OS_ANDROID) && !defined(OS_FUCHSIA)
++#ifdef __GLIBC__
+   DnsReloaderMaybeReload();
+ #endif
+   absl::optional<AddressInfo> ai;
diff --git a/srcpkgs/qt6-webengine/patches/0600-chromium-sndio.patch b/srcpkgs/qt6-webengine/patches/0600-chromium-sndio.patch
new file mode 100644
index 000000000000..0302874ffba4
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0600-chromium-sndio.patch
@@ -0,0 +1,876 @@
+--- a/src/3rdparty/chromium/media/BUILD.gn
++++ b/src/3rdparty/chromium/media/BUILD.gn
+@@ -72,6 +72,9 @@ config("media_config") {
+       defines += [ "DLOPEN_PULSEAUDIO" ]
+     }
+   }
++  if (use_sndio) {
++    defines += [ "USE_SNDIO" ]
++  }
+   if (use_cras) {
+     defines += [ "USE_CRAS" ]
+   }
+--- a/src/3rdparty/chromium/media/audio/BUILD.gn
++++ b/src/3rdparty/chromium/media/audio/BUILD.gn
+@@ -240,6 +240,17 @@ source_set("audio") {
+     sources += [ "linux/audio_manager_linux.cc" ]
+   }
+ 
++  if (use_sndio) {
++    libs += [ "sndio" ]
++    sources += [
++      "sndio/audio_manager_sndio.cc",
++      "sndio/sndio_input.cc",
++      "sndio/sndio_input.h",
++      "sndio/sndio_output.cc",
++      "sndio/sndio_output.h"
++    ]
++  }
++
+   if (use_alsa) {
+     libs += [ "asound" ]
+     sources += [
+--- a/src/3rdparty/chromium/media/audio/linux/audio_manager_linux.cc
++++ b/src/3rdparty/chromium/media/audio/linux/audio_manager_linux.cc
+@@ -25,6 +25,11 @@
+ #include "media/audio/pulse/audio_manager_pulse.h"
+ #include "media/audio/pulse/pulse_util.h"
+ #endif
++#if defined(USE_SNDIO)
++#include "media/audio/sndio/audio_manager_sndio.h"
++#include "media/audio/sndio/sndio_input.h"
++#include "media/audio/sndio/sndio_output.h"
++#endif
+ 
+ namespace media {
+ 
+@@ -32,7 +37,8 @@ enum LinuxAudioIO {
+   kPulse,
+   kAlsa,
+   kCras,
+-  kAudioIOMax = kCras  // Must always be equal to largest logged entry.
++  kSndio,
++  kAudioIOMax = kSndio // Must always be equal to largest logged entry.
+ };
+ 
+ std::unique_ptr<media::AudioManager> CreateAudioManager(
+@@ -45,6 +51,16 @@ std::unique_ptr<media::AudioManager> Cre
+                                               audio_log_factory);
+   }
+ 
++#if defined(USE_SNDIO)
++  struct sio_hdl *hdl = sio_open(SIO_DEVANY, SIO_PLAY, 0);
++  if (hdl != NULL) {
++    sio_close(hdl);
++    UMA_HISTOGRAM_ENUMERATION("Media.LinuxAudioIO", kSndio, kAudioIOMax + 1);
++    return std::make_unique<AudioManagerSndio>(std::move(audio_thread),
++                                                  audio_log_factory);
++  }
++#endif
++
+ #if defined(USE_CRAS)
+   if (base::CommandLine::ForCurrentProcess()->HasSwitch(switches::kUseCras)) {
+     UMA_HISTOGRAM_ENUMERATION("Media.LinuxAudioIO", kCras, kAudioIOMax + 1);
+--- /dev/null
++++ b/src/3rdparty/chromium/media/audio/sndio/audio_manager_sndio.cc
+@@ -0,0 +1,148 @@
++// Copyright (c) 2012 The Chromium Authors. All rights reserved.
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++#include "media/audio/sndio/audio_manager_sndio.h"
++
++#include "base/metrics/histogram_macros.h"
++#include "base/memory/ptr_util.h"
++#include "media/audio/audio_device_description.h"
++#include "media/audio/audio_output_dispatcher.h"
++#include "media/audio/sndio/sndio_input.h"
++#include "media/audio/sndio/sndio_output.h"
++#include "media/base/limits.h"
++#include "media/base/media_switches.h"
++
++namespace media {
++
++
++// Maximum number of output streams that can be open simultaneously.
++static const int kMaxOutputStreams = 4;
++
++// Default sample rate for input and output streams.
++static const int kDefaultSampleRate = 48000;
++
++void AddDefaultDevice(AudioDeviceNames* device_names) {
++  DCHECK(device_names->empty());
++  device_names->push_front(AudioDeviceName::CreateDefault());
++}
++
++bool AudioManagerSndio::HasAudioOutputDevices() {
++  return true;
++}
++
++bool AudioManagerSndio::HasAudioInputDevices() {
++  return true;
++}
++
++void AudioManagerSndio::GetAudioInputDeviceNames(
++    AudioDeviceNames* device_names) {
++  DCHECK(device_names->empty());
++  AddDefaultDevice(device_names);
++}
++
++void AudioManagerSndio::GetAudioOutputDeviceNames(
++    AudioDeviceNames* device_names) {
++  AddDefaultDevice(device_names);
++}
++
++const char* AudioManagerSndio::GetName() {
++  return "SNDIO";
++}
++
++AudioParameters AudioManagerSndio::GetInputStreamParameters(
++    const std::string& device_id) {
++  static const int kDefaultInputBufferSize = 1024;
++
++  int user_buffer_size = GetUserBufferSize();
++  int buffer_size = user_buffer_size ?
++      user_buffer_size : kDefaultInputBufferSize;
++
++  return AudioParameters(
++      AudioParameters::AUDIO_PCM_LOW_LATENCY, CHANNEL_LAYOUT_STEREO,
++      kDefaultSampleRate, buffer_size);
++}
++
++AudioManagerSndio::AudioManagerSndio(std::unique_ptr<AudioThread> audio_thread,
++                                         AudioLogFactory* audio_log_factory)
++    : AudioManagerBase(std::move(audio_thread),
++                       audio_log_factory) {
++  DLOG(WARNING) << "AudioManagerSndio";
++  SetMaxOutputStreamsAllowed(kMaxOutputStreams);
++}
++
++AudioManagerSndio::~AudioManagerSndio() {
++  Shutdown();
++}
++
++AudioOutputStream* AudioManagerSndio::MakeLinearOutputStream(
++    const AudioParameters& params,
++    const LogCallback& log_callback) {
++  DCHECK_EQ(AudioParameters::AUDIO_PCM_LINEAR, params.format());
++  return MakeOutputStream(params);
++}
++
++AudioOutputStream* AudioManagerSndio::MakeLowLatencyOutputStream(
++    const AudioParameters& params,
++    const std::string& device_id,
++    const LogCallback& log_callback) {
++  DLOG_IF(ERROR, !device_id.empty()) << "Not implemented!";
++  DCHECK_EQ(AudioParameters::AUDIO_PCM_LOW_LATENCY, params.format());
++  return MakeOutputStream(params);
++}
++
++AudioInputStream* AudioManagerSndio::MakeLinearInputStream(
++    const AudioParameters& params,
++    const std::string& device_id,
++    const LogCallback& log_callback) {
++  DCHECK_EQ(AudioParameters::AUDIO_PCM_LINEAR, params.format());
++  return MakeInputStream(params);
++}
++
++AudioInputStream* AudioManagerSndio::MakeLowLatencyInputStream(
++    const AudioParameters& params,
++    const std::string& device_id,
++    const LogCallback& log_callback) {
++  DCHECK_EQ(AudioParameters::AUDIO_PCM_LOW_LATENCY, params.format());
++  return MakeInputStream(params);
++}
++
++AudioParameters AudioManagerSndio::GetPreferredOutputStreamParameters(
++    const std::string& output_device_id,
++    const AudioParameters& input_params) {
++  // TODO(tommi): Support |output_device_id|.
++  DLOG_IF(ERROR, !output_device_id.empty()) << "Not implemented!";
++  static const int kDefaultOutputBufferSize = 2048;
++
++  ChannelLayout channel_layout = CHANNEL_LAYOUT_STEREO;
++  int sample_rate = kDefaultSampleRate;
++  int buffer_size = kDefaultOutputBufferSize;
++  if (input_params.IsValid()) {
++    sample_rate = input_params.sample_rate();
++    channel_layout = input_params.channel_layout();
++    buffer_size = std::min(buffer_size, input_params.frames_per_buffer());
++  }
++
++  int user_buffer_size = GetUserBufferSize();
++  if (user_buffer_size)
++    buffer_size = user_buffer_size;
++
++  return AudioParameters(
++      AudioParameters::AUDIO_PCM_LOW_LATENCY, channel_layout,
++      sample_rate, buffer_size);
++}
++
++AudioInputStream* AudioManagerSndio::MakeInputStream(
++    const AudioParameters& params) {
++  DLOG(WARNING) << "MakeInputStream";
++  return new SndioAudioInputStream(this,
++             AudioDeviceDescription::kDefaultDeviceId, params);
++}
++
++AudioOutputStream* AudioManagerSndio::MakeOutputStream(
++    const AudioParameters& params) {
++  DLOG(WARNING) << "MakeOutputStream";
++  return new SndioAudioOutputStream(params, this);
++}
++
++}  // namespace media
+--- /dev/null
++++ b/src/3rdparty/chromium/media/audio/sndio/audio_manager_sndio.h
+@@ -0,0 +1,65 @@
++// Copyright (c) 2012 The Chromium Authors. All rights reserved.
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++#ifndef MEDIA_AUDIO_SNDIO_AUDIO_MANAGER_SNDIO_H_
++#define MEDIA_AUDIO_SNDIO_AUDIO_MANAGER_SNDIO_H_
++
++#include <set>
++
++#include "base/compiler_specific.h"
++#include "base/macros.h"
++#include "base/memory/ref_counted.h"
++#include "base/threading/thread.h"
++#include "media/audio/audio_manager_base.h"
++
++namespace media {
++
++class MEDIA_EXPORT AudioManagerSndio : public AudioManagerBase {
++ public:
++  AudioManagerSndio(std::unique_ptr<AudioThread> audio_thread,
++                   AudioLogFactory* audio_log_factory);
++  ~AudioManagerSndio() override;
++
++  // Implementation of AudioManager.
++  bool HasAudioOutputDevices() override;
++  bool HasAudioInputDevices() override;
++  void GetAudioInputDeviceNames(AudioDeviceNames* device_names) override;
++  void GetAudioOutputDeviceNames(AudioDeviceNames* device_names) override;
++  AudioParameters GetInputStreamParameters(
++      const std::string& device_id) override;
++  const char* GetName() override;
++
++  // Implementation of AudioManagerBase.
++  AudioOutputStream* MakeLinearOutputStream(
++      const AudioParameters& params,
++      const LogCallback& log_callback) override;
++  AudioOutputStream* MakeLowLatencyOutputStream(
++      const AudioParameters& params,
++      const std::string& device_id,
++      const LogCallback& log_callback) override;
++  AudioInputStream* MakeLinearInputStream(
++      const AudioParameters& params,
++      const std::string& device_id,
++      const LogCallback& log_callback) override;
++  AudioInputStream* MakeLowLatencyInputStream(
++      const AudioParameters& params,
++      const std::string& device_id,
++      const LogCallback& log_callback) override;
++
++ protected:
++  AudioParameters GetPreferredOutputStreamParameters(
++      const std::string& output_device_id,
++      const AudioParameters& input_params) override;
++
++ private:
++  // Called by MakeLinearOutputStream and MakeLowLatencyOutputStream.
++  AudioOutputStream* MakeOutputStream(const AudioParameters& params);
++  AudioInputStream* MakeInputStream(const AudioParameters& params);
++
++  DISALLOW_COPY_AND_ASSIGN(AudioManagerSndio);
++};
++
++}  // namespace media
++
++#endif  // MEDIA_AUDIO_SNDIO_AUDIO_MANAGER_SNDIO_H_
+--- /dev/null
++++ b/src/3rdparty/chromium/media/audio/sndio/sndio_input.cc
+@@ -0,0 +1,200 @@
++// Copyright 2013 The Chromium Authors. All rights reserved.
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++#include "base/bind.h"
++#include "base/logging.h"
++#include "base/macros.h"
++#include "media/base/audio_timestamp_helper.h"
++#include "media/audio/sndio/audio_manager_sndio.h"
++#include "media/audio/audio_manager.h"
++#include "media/audio/sndio/sndio_input.h"
++
++namespace media {
++
++static const SampleFormat kSampleFormat = kSampleFormatS16;
++
++void SndioAudioInputStream::OnMoveCallback(void *arg, int delta)
++{
++  SndioAudioInputStream* self = static_cast<SndioAudioInputStream*>(arg);
++
++  self->hw_delay += delta;
++}
++
++void *SndioAudioInputStream::ThreadEntry(void *arg) {
++  SndioAudioInputStream* self = static_cast<SndioAudioInputStream*>(arg);
++
++  self->ThreadLoop();
++  return NULL;
++}
++
++SndioAudioInputStream::SndioAudioInputStream(AudioManagerBase* manager,
++                                             const std::string& device_name,
++                                             const AudioParameters& params)
++    : manager(manager),
++      params(params),
++      audio_bus(AudioBus::Create(params)),
++      state(kClosed) {
++}
++
++SndioAudioInputStream::~SndioAudioInputStream() {
++  if (state != kClosed)
++    Close();
++}
++
++bool SndioAudioInputStream::Open() {
++  struct sio_par par;
++  int sig;
++
++  if (state != kClosed)
++    return false;
++
++  if (params.format() != AudioParameters::AUDIO_PCM_LINEAR &&
++      params.format() != AudioParameters::AUDIO_PCM_LOW_LATENCY) {
++    LOG(WARNING) << "Unsupported audio format.";
++    return false;
++  }
++
++  sio_initpar(&par);
++  par.rate = params.sample_rate();
++  par.rchan = params.channels();
++  par.bits = SampleFormatToBitsPerChannel(kSampleFormat);
++  par.bps = par.bits / 8;
++  par.sig = sig = par.bits != 8 ? 1 : 0;
++  par.le = SIO_LE_NATIVE;
++  par.appbufsz = params.frames_per_buffer();
++
++  hdl = sio_open(SIO_DEVANY, SIO_REC, 0);
++
++  if (hdl == NULL) {
++    LOG(ERROR) << "Couldn't open audio device.";
++    return false;
++  }
++
++  if (!sio_setpar(hdl, &par) || !sio_getpar(hdl, &par)) {
++    LOG(ERROR) << "Couldn't set audio parameters.";
++    goto bad_close;
++  }
++
++  if (par.rate  != (unsigned int)params.sample_rate() ||
++      par.rchan != (unsigned int)params.channels() ||
++      par.bits  != (unsigned int)SampleFormatToBitsPerChannel(kSampleFormat) ||
++      par.sig   != (unsigned int)sig ||
++      (par.bps > 1 && par.le != SIO_LE_NATIVE) ||
++      (par.bits != par.bps * 8)) {
++    LOG(ERROR) << "Unsupported audio parameters.";
++    goto bad_close;
++  }
++  state = kStopped;
++  buffer = new char[audio_bus->frames() * params.GetBytesPerFrame(kSampleFormat)];
++  sio_onmove(hdl, &OnMoveCallback, this);
++  return true;
++bad_close:
++  sio_close(hdl);
++  return false;
++}
++
++void SndioAudioInputStream::Start(AudioInputCallback* cb) {
++
++  StartAgc();
++
++  state = kRunning;
++  hw_delay = 0;
++  callback = cb;
++  sio_start(hdl);
++  if (pthread_create(&thread, NULL, &ThreadEntry, this) != 0) {
++    LOG(ERROR) << "Failed to create real-time thread for recording.";
++    sio_stop(hdl);
++    state = kStopped;
++  }
++}
++
++void SndioAudioInputStream::Stop() {
++
++  if (state == kStopped)
++    return;
++
++  state = kStopWait;
++  pthread_join(thread, NULL);
++  sio_stop(hdl);
++  state = kStopped;
++
++  StopAgc();
++}
++
++void SndioAudioInputStream::Close() {
++
++  if (state == kClosed)
++    return;
++
++  if (state == kRunning)
++    Stop();
++
++  state = kClosed;
++  delete [] buffer;
++  sio_close(hdl);
++
++  manager->ReleaseInputStream(this);
++}
++
++double SndioAudioInputStream::GetMaxVolume() {
++  // Not supported
++  return 0.0;
++}
++
++void SndioAudioInputStream::SetVolume(double volume) {
++  // Not supported. Do nothing.
++}
++
++double SndioAudioInputStream::GetVolume() {
++  // Not supported.
++  return 0.0;
++}
++
++bool SndioAudioInputStream::IsMuted() {
++  // Not supported.
++  return false;
++}
++
++void SndioAudioInputStream::SetOutputDeviceForAec(
++    const std::string& output_device_id) {
++  // Not supported.
++}
++
++void SndioAudioInputStream::ThreadLoop(void) {
++  size_t todo, n;
++  char *data;
++  unsigned int nframes;
++  double normalized_volume = 0.0;
++
++  nframes = audio_bus->frames();
++
++  while (state == kRunning && !sio_eof(hdl)) {
++
++    GetAgcVolume(&normalized_volume);
++
++    // read one block
++    todo = nframes * params.GetBytesPerFrame(kSampleFormat);
++    data = buffer;
++    while (todo > 0) {
++      n = sio_read(hdl, data, todo);
++      if (n == 0)
++        return;	// unrecoverable I/O error
++      todo -= n;
++      data += n;
++    }
++    hw_delay -= nframes;
++
++    // convert frames count to TimeDelta
++    const base::TimeDelta delay = AudioTimestampHelper::FramesToTime(hw_delay,
++      params.sample_rate());
++
++    // push into bus
++    audio_bus->FromInterleaved<SignedInt16SampleTypeTraits>(reinterpret_cast<int16_t*>(buffer), nframes);
++
++    // invoke callback
++    callback->OnData(audio_bus.get(), base::TimeTicks::Now() - delay, 1.);
++  }
++}
++
++}  // namespace media
+--- /dev/null
++++ b/src/3rdparty/chromium/media/audio/sndio/sndio_input.h
+@@ -0,0 +1,91 @@
++// Copyright 2013 The Chromium Authors. All rights reserved.
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++#ifndef MEDIA_AUDIO_SNDIO_SNDIO_INPUT_H_
++#define MEDIA_AUDIO_SNDIO_SNDIO_INPUT_H_
++
++#include <stdint.h>
++#include <string>
++#include <sndio.h>
++
++#include "base/compiler_specific.h"
++#include "base/macros.h"
++#include "base/memory/weak_ptr.h"
++#include "base/time/time.h"
++#include "media/audio/agc_audio_stream.h"
++#include "media/audio/audio_io.h"
++#include "media/audio/audio_device_description.h"
++#include "media/base/audio_parameters.h"
++
++namespace media {
++
++class AudioManagerBase;
++
++// Implementation of AudioOutputStream using sndio(7)
++class SndioAudioInputStream : public AgcAudioStream<AudioInputStream> {
++ public:
++  // Pass this to the constructor if you want to attempt auto-selection
++  // of the audio recording device.
++  static const char kAutoSelectDevice[];
++
++  // Create a PCM Output stream for the SNDIO device identified by
++  // |device_name|. If unsure of what to use for |device_name|, use
++  // |kAutoSelectDevice|.
++  SndioAudioInputStream(AudioManagerBase* audio_manager,
++                     const std::string& device_name,
++                     const AudioParameters& params);
++
++  ~SndioAudioInputStream() override;
++
++  // Implementation of AudioInputStream.
++  bool Open() override;
++  void Start(AudioInputCallback* callback) override;
++  void Stop() override;
++  void Close() override;
++  double GetMaxVolume() override;
++  void SetVolume(double volume) override;
++  double GetVolume() override;
++  bool IsMuted() override;
++  void SetOutputDeviceForAec(const std::string& output_device_id) override;
++
++ private:
++
++  enum StreamState {
++    kClosed,            // Not opened yet
++    kStopped,           // Device opened, but not started yet
++    kRunning,           // Started, device playing
++    kStopWait           // Stopping, waiting for the real-time thread to exit
++  };
++
++  // C-style call-backs
++  static void OnMoveCallback(void *arg, int delta);
++  static void* ThreadEntry(void *arg);
++
++  // Continuously moves data from the device to the consumer
++  void ThreadLoop();
++  // Our creator, the audio manager needs to be notified when we close.
++  AudioManagerBase* manager;
++  // Parameters of the source
++  AudioParameters params;
++  // We store data here for consumer
++  std::unique_ptr<AudioBus> audio_bus;
++  // Call-back that consumes recorded data
++  AudioInputCallback* callback;  // Valid during a recording session.
++  // Handle of the audio device
++  struct sio_hdl* hdl;
++  // Current state of the stream
++  enum StreamState state;
++  // High priority thread running ThreadLoop()
++  pthread_t thread;
++  // Number of frames buffered in the hardware
++  int hw_delay;
++  // Temporary buffer where data is stored sndio-compatible format
++  char* buffer;
++
++  DISALLOW_COPY_AND_ASSIGN(SndioAudioInputStream);
++};
++
++}  // namespace media
++
++#endif  // MEDIA_AUDIO_SNDIO_SNDIO_INPUT_H_
+--- /dev/null
++++ b/src/3rdparty/chromium/media/audio/sndio/sndio_output.cc
+@@ -0,0 +1,183 @@
++// Copyright (c) 2012 The Chromium Authors. All rights reserved.
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++#include "base/logging.h"
++#include "base/time/time.h"
++#include "base/time/default_tick_clock.h"
++#include "media/audio/audio_manager_base.h"
++#include "media/base/audio_timestamp_helper.h"
++#include "media/audio/sndio/sndio_output.h"
++
++namespace media {
++
++static const SampleFormat kSampleFormat = kSampleFormatS16;
++
++void SndioAudioOutputStream::OnMoveCallback(void *arg, int delta) {
++  SndioAudioOutputStream* self = static_cast<SndioAudioOutputStream*>(arg);
++
++  self->hw_delay -= delta;
++}
++
++void SndioAudioOutputStream::OnVolCallback(void *arg, unsigned int vol) {
++  SndioAudioOutputStream* self = static_cast<SndioAudioOutputStream*>(arg);
++
++  self->vol = vol;
++}
++
++void *SndioAudioOutputStream::ThreadEntry(void *arg) {
++  SndioAudioOutputStream* self = static_cast<SndioAudioOutputStream*>(arg);
++
++  self->ThreadLoop();
++  return NULL;
++}
++
++SndioAudioOutputStream::SndioAudioOutputStream(const AudioParameters& params,
++                                               AudioManagerBase* manager)
++    : manager(manager),
++      params(params),
++      audio_bus(AudioBus::Create(params)),
++      state(kClosed),
++      mutex(PTHREAD_MUTEX_INITIALIZER) {
++}
++
++SndioAudioOutputStream::~SndioAudioOutputStream() {
++  if (state != kClosed)
++    Close();
++}
++
++bool SndioAudioOutputStream::Open() {
++  struct sio_par par;
++  int sig;
++
++  if (params.format() != AudioParameters::AUDIO_PCM_LINEAR &&
++      params.format() != AudioParameters::AUDIO_PCM_LOW_LATENCY) {
++    LOG(WARNING) << "Unsupported audio format.";
++    return false;
++  }
++  sio_initpar(&par);
++  par.rate = params.sample_rate();
++  par.pchan = params.channels();
++  par.bits = SampleFormatToBitsPerChannel(kSampleFormat);
++  par.bps = par.bits / 8;
++  par.sig = sig = par.bits != 8 ? 1 : 0;
++  par.le = SIO_LE_NATIVE;
++  par.appbufsz = params.frames_per_buffer();
++
++  hdl = sio_open(SIO_DEVANY, SIO_PLAY, 0);
++  if (hdl == NULL) {
++    LOG(ERROR) << "Couldn't open audio device.";
++    return false;
++  }
++  if (!sio_setpar(hdl, &par) || !sio_getpar(hdl, &par)) {
++    LOG(ERROR) << "Couldn't set audio parameters.";
++    goto bad_close;
++  }
++  if (par.rate  != (unsigned int)params.sample_rate() ||
++      par.pchan != (unsigned int)params.channels() ||
++      par.bits  != (unsigned int)SampleFormatToBitsPerChannel(kSampleFormat) ||
++      par.sig   != (unsigned int)sig ||
++      (par.bps > 1 && par.le != SIO_LE_NATIVE) ||
++      (par.bits != par.bps * 8)) {
++    LOG(ERROR) << "Unsupported audio parameters.";
++    goto bad_close;
++  }
++  state = kStopped;
++  volpending = 0;
++  vol = 0;
++  buffer = new char[audio_bus->frames() * params.GetBytesPerFrame(kSampleFormat)];
++  sio_onmove(hdl, &OnMoveCallback, this);
++  sio_onvol(hdl, &OnVolCallback, this);
++  return true;
++ bad_close:
++  sio_close(hdl);
++  return false;
++}
++
++void SndioAudioOutputStream::Close() {
++  if (state == kClosed)
++    return;
++  if (state == kRunning)
++    Stop();
++  state = kClosed;
++  delete [] buffer;
++  sio_close(hdl);
++  manager->ReleaseOutputStream(this);  // Calls the destructor
++}
++
++void SndioAudioOutputStream::Start(AudioSourceCallback* callback) {
++  state = kRunning;
++  hw_delay = 0;
++  source = callback;
++  sio_start(hdl);
++  if (pthread_create(&thread, NULL, &ThreadEntry, this) != 0) {
++    LOG(ERROR) << "Failed to create real-time thread.";
++    sio_stop(hdl);
++    state = kStopped;
++  }
++}
++
++void SndioAudioOutputStream::Stop() {
++  if (state == kStopped)
++    return;
++  state = kStopWait;
++  pthread_join(thread, NULL);
++  sio_stop(hdl);
++  state = kStopped;
++}
++
++void SndioAudioOutputStream::SetVolume(double v) {
++  pthread_mutex_lock(&mutex);
++  vol = v * SIO_MAXVOL;
++  volpending = 1;
++  pthread_mutex_unlock(&mutex);
++}
++
++void SndioAudioOutputStream::GetVolume(double* v) {
++  pthread_mutex_lock(&mutex);
++  *v = vol * (1. / SIO_MAXVOL);
++  pthread_mutex_unlock(&mutex);
++}
++
++// This stream is always used with sub second buffer sizes, where it's
++// sufficient to simply always flush upon Start().
++void SndioAudioOutputStream::Flush() {}
++
++void SndioAudioOutputStream::ThreadLoop(void) {
++  int avail, count, result;
++
++  while (state == kRunning) {
++    // Update volume if needed
++    pthread_mutex_lock(&mutex);
++    if (volpending) {
++      volpending = 0;
++      sio_setvol(hdl, vol);
++    }
++    pthread_mutex_unlock(&mutex);
++
++    // Get data to play
++    const base::TimeDelta delay = AudioTimestampHelper::FramesToTime(hw_delay,
++	params.sample_rate());
++    count = source->OnMoreData(delay, base::TimeTicks::Now(), 0, audio_bus.get());
++    audio_bus->ToInterleaved<SignedInt16SampleTypeTraits>(count, reinterpret_cast<int16_t*>(buffer));
++    if (count == 0) {
++      // We have to submit something to the device
++      count = audio_bus->frames();
++      memset(buffer, 0, count * params.GetBytesPerFrame(kSampleFormat));
++      LOG(WARNING) << "No data to play, running empty cycle.";
++    }
++
++    // Submit data to the device
++    avail = count * params.GetBytesPerFrame(kSampleFormat);
++    result = sio_write(hdl, buffer, avail);
++    if (result == 0) {
++      LOG(WARNING) << "Audio device disconnected.";
++      break;
++    }
++
++    // Update hardware pointer
++    hw_delay += count;
++  }
++}
++
++}  // namespace media
+--- /dev/null
++++ b/src/3rdparty/chromium/media/audio/sndio/sndio_output.h
+@@ -0,0 +1,86 @@
++// Copyright (c) 2012 The Chromium Authors. All rights reserved.
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++#ifndef MEDIA_AUDIO_SNDIO_SNDIO_OUTPUT_H_
++#define MEDIA_AUDIO_SNDIO_SNDIO_OUTPUT_H_
++
++#include <pthread.h>
++#include <sndio.h>
++
++#include "base/time/tick_clock.h"
++#include "base/time/time.h"
++#include "media/audio/audio_io.h"
++
++namespace media {
++
++class AudioManagerBase;
++
++// Implementation of AudioOutputStream using sndio(7)
++class SndioAudioOutputStream : public AudioOutputStream {
++ public:
++  // The manager is creating this object
++  SndioAudioOutputStream(const AudioParameters& params,
++                         AudioManagerBase* manager);
++  virtual ~SndioAudioOutputStream();
++
++  // Implementation of AudioOutputStream.
++  bool Open() override;
++  void Close() override;
++  void Start(AudioSourceCallback* callback) override;
++  void Stop() override;
++  void SetVolume(double volume) override;
++  void GetVolume(double* volume) override;
++  void Flush() override;
++
++  friend void sndio_onmove(void *arg, int delta);
++  friend void sndio_onvol(void *arg, unsigned int vol);
++  friend void *sndio_threadstart(void *arg);
++
++ private:
++  enum StreamState {
++    kClosed,            // Not opened yet
++    kStopped,           // Device opened, but not started yet
++    kRunning,           // Started, device playing
++    kStopWait           // Stopping, waiting for the real-time thread to exit
++  };
++
++  // C-style call-backs
++  static void OnMoveCallback(void *arg, int delta);
++  static void OnVolCallback(void *arg, unsigned int vol);
++  static void* ThreadEntry(void *arg);
++
++  // Continuously moves data from the producer to the device
++  void ThreadLoop(void);
++
++  // Our creator, the audio manager needs to be notified when we close.
++  AudioManagerBase* manager;
++  // Parameters of the source
++  AudioParameters params;
++  // Source stores data here
++  std::unique_ptr<AudioBus> audio_bus;
++  // Call-back that produces data to play
++  AudioSourceCallback* source;
++  // Handle of the audio device
++  struct sio_hdl* hdl;
++  // Current state of the stream
++  enum StreamState state;
++  // High priority thread running ThreadLoop()
++  pthread_t thread;
++  // Protects vol, volpending and hw_delay
++  pthread_mutex_t mutex;
++  // Current volume in the 0..SIO_MAXVOL range
++  int vol;
++  // Set to 1 if volumes must be refreshed in the realtime thread
++  int volpending;
++  // Number of frames buffered in the hardware
++  int hw_delay;
++  // Temporary buffer where data is stored sndio-compatible format
++  char* buffer;
++
++  DISALLOW_COPY_AND_ASSIGN(SndioAudioOutputStream);
++};
++
++}  // namespace media
++
++#endif  // MEDIA_AUDIO_SNDIO_SNDIO_OUTPUT_H_
+--- a/src/3rdparty/chromium/media/media_options.gni
++++ b/src/3rdparty/chromium/media/media_options.gni
+@@ -121,6 +121,9 @@ declare_args() {
+   # Enables runtime selection of ALSA library for audio.
+   use_alsa = false
+ 
++  # Enable runtime selection of sndio(7)
++  use_sndio = false
++
+   # Alsa should be used on non-Android, non-Mac POSIX systems.
+   # Alsa should be used on desktop Chromecast and audio-only Chromecast builds.
+   if (is_posix && !is_android && !is_mac &&
diff --git a/srcpkgs/qt6-webengine/patches/0700-armv7l-neon.patch b/srcpkgs/qt6-webengine/patches/0700-armv7l-neon.patch
new file mode 100644
index 000000000000..d42fa19a07a1
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0700-armv7l-neon.patch
@@ -0,0 +1,10 @@
+--- a/src/3rdparty/chromium/skia/BUILD.gn
++++ b/src/3rdparty/chromium/skia/BUILD.gn
+@@ -800,7 +800,6 @@ skia_source_set("skia_opts") {
+         # Root build config sets -mfpu=$arm_fpu, which we expect to be neon
+         # when running this.
+         if (!arm_use_neon) {
+-          configs -= [ "//build/config/compiler:compiler_arm_fpu" ]
+           cflags += [ "-mfpu=neon" ]
+         }
+       }
diff --git a/srcpkgs/qt6-webengine/patches/0750-chromium-musl-cross-no-asm_ptrace_h.patch b/srcpkgs/qt6-webengine/patches/0750-chromium-musl-cross-no-asm_ptrace_h.patch
new file mode 100644
index 000000000000..3cf132908af4
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0750-chromium-musl-cross-no-asm_ptrace_h.patch
@@ -0,0 +1,30 @@
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper.cc
+@@ -38,7 +38,12 @@
+ 
+ #include "client/linux/minidump_writer/linux_ptrace_dumper.h"
+ 
++#if defined(__GLIBC__)
+ #include <asm/ptrace.h>
++#else
++/* For arm*-musl this definition is missing */
++#define ARM_sp uregs[13]
++#endif
+ #include <assert.h>
+ #include <errno.h>
+ #include <fcntl.h>
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_core_dumper.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_core_dumper.cc
+@@ -32,7 +32,12 @@
+ 
+ #include "client/linux/minidump_writer/linux_core_dumper.h"
+ 
++#if defined(__GLIBC__)
+ #include <asm/ptrace.h>
++#else
++/* For arm*-musl this definition is missing */
++#define ARM_sp uregs[13]
++#endif
+ #include <assert.h>
+ #include <elf.h>
+ #include <stdio.h>
diff --git a/srcpkgs/qt6-webengine/patches/0751-chromium-musl-arm-user_vfp.patch b/srcpkgs/qt6-webengine/patches/0751-chromium-musl-arm-user_vfp.patch
new file mode 100644
index 000000000000..6e2d62f35ee6
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0751-chromium-musl-arm-user_vfp.patch
@@ -0,0 +1,20 @@
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/util/linux/thread_info.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/util/linux/thread_info.h
+@@ -17,6 +17,17 @@
+ 
+ #include <stdint.h>
+ #include <sys/user.h>
++#if !defined(__GLIBC__)
++struct user_vfp {
++	unsigned long long fpregs[32];
++	unsigned long fpscr;
++};
++struct user_vfp_exc {
++	unsigned long fpexc;
++	unsigned long fpinst;
++	unsigned long fpinst2;
++};
++#endif /* !defined(__GLIBC__) */
+ 
+ #include <type_traits>
+ 
diff --git a/srcpkgs/qt6-webengine/patches/0752-chromium-musl-arm-elf_auxv_t.patch b/srcpkgs/qt6-webengine/patches/0752-chromium-musl-arm-elf_auxv_t.patch
new file mode 100644
index 000000000000..7112c8cfd3fa
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0752-chromium-musl-arm-elf_auxv_t.patch
@@ -0,0 +1,18 @@
+--- a/src/3rdparty/chromium/v8/src/base/cpu.cc
++++ b/src/3rdparty/chromium/v8/src/base/cpu.cc
+@@ -163,6 +163,15 @@ static V8_INLINE void __cpuid(int cpu_in
+ 
+ #if V8_HOST_ARCH_ARM || V8_HOST_ARCH_ARM64
+ 
++#ifndef __GLIBC__
++#include <elf.h>
++#ifdef __LP64__
++typedef Elf64_auxv_t elf_auxv_t;
++#else
++typedef Elf32_auxv_t elf_auxv_t;
++#endif
++#endif
++
+ static uint32_t ReadELFHWCaps() {
+   uint32_t result = 0;
+ #if V8_GLIBC_PREREQ(2, 16)
diff --git a/srcpkgs/qt6-webengine/patches/0801-chromium-i686-vaapi-fpermissive.patch b/srcpkgs/qt6-webengine/patches/0801-chromium-i686-vaapi-fpermissive.patch
new file mode 100644
index 000000000000..3d4043e03b89
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0801-chromium-i686-vaapi-fpermissive.patch
@@ -0,0 +1,24 @@
+--- a/src/3rdparty/chromium/media/gpu/vaapi/BUILD.gn
++++ b/src/3rdparty/chromium/media/gpu/vaapi/BUILD.gn
+@@ -14,6 +14,10 @@ import("//ui/gl/features.gni")
+ assert(is_linux || is_chromeos)
+ assert(use_vaapi)
+ 
++config("vaapi_permissive") {
++  cflags = [ "-fpermissive" ]
++}
++
+ generate_stubs("libva_stubs") {
+   extra_header = "va_stub_header.fragment"
+   sigs = [ "va.sigs" ]
+@@ -136,6 +140,10 @@ source_set("vaapi") {
+     ]
+   }
+ 
++  if (target_cpu == "x86") {
++    configs += [ ":vaapi_permissive" ]
++  }
++
+   if (use_x11) {
+     deps += [ "//ui/gfx/x" ]
+     sources += [
diff --git a/srcpkgs/qt6-webengine/patches/0900-xxx-ppc64le-libvpx.patch b/srcpkgs/qt6-webengine/patches/0900-xxx-ppc64le-libvpx.patch
new file mode 100644
index 000000000000..5c9566b56bd4
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0900-xxx-ppc64le-libvpx.patch
@@ -0,0 +1,65 @@
+Uses generic target for now. To use ppc64le, change --target to ppc64le-gnu
+and add --enable-vsx, and change generic to ppc for the rtcd header.
+
+From 18e6c5c55cfae0cfb458d8210d7bc709360a0e90 Mon Sep 17 00:00:00 2001
+From: q66 <daniel@octaforge.org>
+Date: Wed, 9 Sep 2020 19:08:25 +0200
+Subject: [PATCH] enable generation of ppc64 libvpx bits
+
+this doesn't update the gni file, that's done from
+the template by running the appropriate scripts
+---
+ third_party/libvpx/BUILD.gn        | 4 ++++
+ third_party/libvpx/generate_gni.sh | 9 +++++++++
+ 2 files changed, 13 insertions(+)
+
+--- a/src/3rdparty/chromium/third_party/libvpx/BUILD.gn
++++ b/src/3rdparty/chromium/third_party/libvpx/BUILD.gn
+@@ -424,6 +424,8 @@ static_library("bundled_libvpx") {
+       sources = libvpx_srcs_arm64
+       public_deps = [ ":libvpx_arm64_headers" ]
+     }
++  } else if (current_cpu == "ppc64") {
++    sources = libvpx_srcs_ppc64
+   }
+ 
+   configs -= [ "//build/config/compiler:chromium_code" ]
+--- a/src/3rdparty/chromium/third_party/libvpx/generate_gni.sh
++++ b/src/3rdparty/chromium/third_party/libvpx/generate_gni.sh
+@@ -374,6 +374,7 @@ gen_config_files linux/arm-neon-highbd "
+ gen_config_files linux/arm64-highbd "--target=armv8-linux-gcc ${all_platforms} ${HIGHBD}"
+ gen_config_files linux/mipsel "--target=mips32-linux-gcc ${all_platforms}"
+ gen_config_files linux/mips64el "--target=mips64-linux-gcc ${all_platforms}"
++gen_config_files linux/ppc64 "--target=generic-gnu $HIGHBD ${all_platforms}"
+ gen_config_files linux/generic "--target=generic-gnu $HIGHBD ${all_platforms}"
+ gen_config_files win/arm64 "--target=arm64-win64-vs15 ${all_platforms} ${HIGHBD}"
+ gen_config_files win/ia32 "--target=x86-win32-vs14 ${all_platforms} ${x86_platforms}"
+@@ -399,6 +400,7 @@ lint_config linux/arm-neon-highbd
+ lint_config linux/arm64-highbd
+ lint_config linux/mipsel
+ lint_config linux/mips64el
++lint_config linux/ppc64
+ lint_config linux/generic
+ lint_config win/arm64
+ lint_config win/ia32
+@@ -428,6 +430,7 @@ gen_rtcd_header linux/arm-neon-highbd ar
+ gen_rtcd_header linux/arm64-highbd armv8
+ gen_rtcd_header linux/mipsel mipsel
+ gen_rtcd_header linux/mips64el mips64el
++gen_rtcd_header linux/ppc64 generic
+ gen_rtcd_header linux/generic generic
+ gen_rtcd_header win/arm64 armv8
+ gen_rtcd_header win/ia32 x86 "${require_sse2}"
+@@ -513,6 +516,12 @@ if [ -z $ONLY_CONFIGS ]; then
+ 
+   echo "MIPS64 source list is identical to MIPS source list. No need to generate it."
+ 
++  echo "Generate ppc64 source list."
++  config=$(print_config_basic linux/ppc64)
++  make_clean
++  make libvpx_srcs.txt target=libs $config > /dev/null
++  convert_srcs_to_project_files libvpx_srcs.txt libvpx_srcs_ppc64
++
+   echo "Generate NaCl source list."
+   config=$(print_config_basic nacl)
+   make_clean
diff --git a/srcpkgs/qt6-webengine/patches/0901-xxx-ppc64le-sandbox-linux-stat.patch b/srcpkgs/qt6-webengine/patches/0901-xxx-ppc64le-sandbox-linux-stat.patch
new file mode 100644
index 000000000000..4b8e6320601c
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0901-xxx-ppc64le-sandbox-linux-stat.patch
@@ -0,0 +1,31 @@
+--- a/src/3rdparty/chromium/sandbox/linux/system_headers/linux_stat.h
++++ b/src/3rdparty/chromium/sandbox/linux/system_headers/linux_stat.h
+@@ -155,6 +155,28 @@ struct kernel_stat {
+   unsigned int __unused4;
+   unsigned int __unused5;
+ };
++#elif defined(__powerpc64__)
++struct kernel_stat {
++  unsigned long	st_dev;
++  unsigned long	st_ino;
++  unsigned long	st_nlink;
++  unsigned int	st_mode;
++  unsigned int	st_uid;
++  unsigned int	st_gid;
++  unsigned long	st_rdev;
++  long		st_size;
++  unsigned long	st_blksize;
++  unsigned long	st_blocks;
++  unsigned long	st_atime_;
++  unsigned long	st_atime_nsec_;
++  unsigned long	st_mtime_;
++  unsigned long	st_mtime_nsec_;
++  unsigned long	st_ctime_;
++  unsigned long	st_ctime_nsec_;
++  unsigned long	__unused4;
++  unsigned long	__unused5;
++  unsigned long	__unused6;
++};
+ #endif
+ 
+ #if !defined(AT_EMPTY_PATH)
diff --git a/srcpkgs/qt6-webengine/patches/0902-xxx-ppc64le-support.patch b/srcpkgs/qt6-webengine/patches/0902-xxx-ppc64le-support.patch
new file mode 100644
index 000000000000..33d415e55f69
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0902-xxx-ppc64le-support.patch
@@ -0,0 +1,3556 @@
+commit 2c013a317b1114ef67cdbbc30824b28907b9ea94
+Author: Daniel Kolesa <daniel@octaforge.org>
+Date:   Wed Mar 3 19:08:29 2021 +0100
+
+    ppc64le support
+
+--- a/src/3rdparty/chromium/sandbox/features.gni
++++ b/src/3rdparty/chromium/sandbox/features.gni
+@@ -11,7 +11,8 @@ import("//build/config/nacl/config.gni")
+ use_seccomp_bpf = (is_linux || is_chromeos || is_android) &&
+                   (current_cpu == "x86" || current_cpu == "x64" ||
+                    current_cpu == "arm" || current_cpu == "arm64" ||
+-                   current_cpu == "mipsel" || current_cpu == "mips64el")
++                   current_cpu == "mipsel" || current_cpu == "mips64el" ||
++                   current_cpu == "ppc64")
+ 
+ use_seccomp_bpf = use_seccomp_bpf || is_nacl_nonsfi
+ 
+--- a/src/3rdparty/chromium/sandbox/linux/BUILD.gn
++++ b/src/3rdparty/chromium/sandbox/linux/BUILD.gn
+@@ -433,6 +433,8 @@ component("sandbox_services") {
+ 
+ source_set("sandbox_services_headers") {
+   sources = [
++    "system_headers/ppc64_linux_syscalls.h",
++    "system_headers/ppc64_linux_ucontext.h",
+     "system_headers/arm64_linux_syscalls.h",
+     "system_headers/arm_linux_syscalls.h",
+     "system_headers/arm_linux_ucontext.h",
+--- a/src/3rdparty/chromium/sandbox/linux/bpf_dsl/linux_syscall_ranges.h
++++ b/src/3rdparty/chromium/sandbox/linux/bpf_dsl/linux_syscall_ranges.h
+@@ -56,6 +56,13 @@
+ #define MAX_PUBLIC_SYSCALL __NR_syscalls
+ #define MAX_SYSCALL MAX_PUBLIC_SYSCALL
+ 
++#elif defined(__powerpc64__)
++
++#include <asm/unistd.h>
++#define MIN_SYSCALL 0u
++#define MAX_PUBLIC_SYSCALL 386u
++#define MAX_SYSCALL MAX_PUBLIC_SYSCALL
++
+ #else
+ #error "Unsupported architecture"
+ #endif
+--- a/src/3rdparty/chromium/sandbox/linux/bpf_dsl/seccomp_macros.h
++++ b/src/3rdparty/chromium/sandbox/linux/bpf_dsl/seccomp_macros.h
+@@ -16,6 +16,9 @@
+ #if defined(__mips__)
+ // sys/user.h in eglibc misses size_t definition
+ #include <stddef.h>
++#elif defined(__powerpc64__) && defined(__GLIBC__)
++// Manually define greg_t on ppc64
++typedef unsigned long long greg_t;
+ #endif
+ #endif
+ 
+@@ -346,6 +349,59 @@ struct regs_struct {
+ #define SECCOMP_PT_PARM4(_regs) (_regs).regs[3]
+ #define SECCOMP_PT_PARM5(_regs) (_regs).regs[4]
+ #define SECCOMP_PT_PARM6(_regs) (_regs).regs[5]
++
++#elif defined(__powerpc64__)
++#include <asm/ptrace.h>
++
++typedef struct pt_regs regs_struct;
++
++#ifdef ARCH_CPU_LITTLE_ENDIAN
++#define SECCOMP_ARCH AUDIT_ARCH_PPC64LE
++#else
++#define SECCOMP_ARCH AUDIT_ARCH_PPC64
++#endif
++
++#ifdef __GLIBC__
++#define SECCOMP_REG(_ctx, _reg) ((_ctx)->uc_mcontext.regs->gpr[_reg])
++#else
++#define SECCOMP_REG(_ctx, _reg) (((struct pt_regs *)(_ctx)->uc_mcontext.regs)->gpr[_reg])
++#endif
++
++#define SECCOMP_RESULT(_ctx) SECCOMP_REG(_ctx, 3)
++#define SECCOMP_SYSCALL(_ctx) SECCOMP_REG(_ctx, 0)
++#ifdef __GLIBC__
++#define SECCOMP_IP(_ctx) (_ctx)->uc_mcontext.regs->nip
++#else
++#define SECCOMP_IP(_ctx) ((struct pt_regs *)(_ctx)->uc_mcontext.regs)->nip
++#endif
++#define SECCOMP_PARM1(_ctx) SECCOMP_REG(_ctx, 3)
++#define SECCOMP_PARM2(_ctx) SECCOMP_REG(_ctx, 4)
++#define SECCOMP_PARM3(_ctx) SECCOMP_REG(_ctx, 5)
++#define SECCOMP_PARM4(_ctx) SECCOMP_REG(_ctx, 6)
++#define SECCOMP_PARM5(_ctx) SECCOMP_REG(_ctx, 7)
++#define SECCOMP_PARM6(_ctx) SECCOMP_REG(_ctx, 8)
++
++#define SECCOMP_NR_IDX (offsetof(struct arch_seccomp_data, nr))
++#define SECCOMP_ARCH_IDX (offsetof(struct arch_seccomp_data, arch))
++#define SECCOMP_IP_MSB_IDX \
++  (offsetof(struct arch_seccomp_data, instruction_pointer) + 4)
++#define SECCOMP_IP_LSB_IDX \
++  (offsetof(struct arch_seccomp_data, instruction_pointer) + 0)
++#define SECCOMP_ARG_MSB_IDX(nr) \
++  (offsetof(struct arch_seccomp_data, args) + 8 * (nr) + 4)
++#define SECCOMP_ARG_LSB_IDX(nr) \
++  (offsetof(struct arch_seccomp_data, args) + 8 * (nr) + 0)
++
++#define SECCOMP_PT_RESULT(_regs) (_regs).gpr[3]
++#define SECCOMP_PT_SYSCALL(_regs) (_regs).gpr[0]
++#define SECCOMP_PT_IP(_regs) (_regs).nip
++#define SECCOMP_PT_PARM1(_regs) (_regs).gpr[3]
++#define SECCOMP_PT_PARM2(_regs) (_regs).gpr[4]
++#define SECCOMP_PT_PARM3(_regs) (_regs).gpr[5]
++#define SECCOMP_PT_PARM4(_regs) (_regs).gpr[6]
++#define SECCOMP_PT_PARM5(_regs) (_regs).gpr[7]
++#define SECCOMP_PT_PARM6(_regs) (_regs).gpr[8]
++
+ #else
+ #error Unsupported target platform
+ 
+--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc
++++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc
+@@ -90,7 +90,7 @@ bool IsBaselinePolicyWatched(int sysno)
+          SyscallSets::IsNuma(sysno) ||
+          SyscallSets::IsPrctl(sysno) ||
+          SyscallSets::IsProcessGroupOrSession(sysno) ||
+-#if defined(__i386__) || \
++#if defined(__i386__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+          SyscallSets::IsSocketCall(sysno) ||
+ #endif
+@@ -258,7 +258,7 @@ ResultExpr EvaluateSyscallImpl(int fs_de
+   }
+ 
+ #if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
+-    defined(__aarch64__)
++    defined(__aarch64__) || defined(__powerpc64__)
+   if (sysno == __NR_mmap)
+     return RestrictMmapFlags();
+ #endif
+@@ -279,7 +279,7 @@ ResultExpr EvaluateSyscallImpl(int fs_de
+     return RestrictPrctl();
+ 
+ #if defined(__x86_64__) || defined(__arm__) || defined(__mips__) || \
+-    defined(__aarch64__)
++    defined(__aarch64__) || defined(__powerpc64__)
+   if (sysno == __NR_socketpair) {
+     // Only allow AF_UNIX, PF_UNIX. Crash if anything else is seen.
+     static_assert(AF_UNIX == PF_UNIX,
+@@ -343,7 +343,8 @@ ResultExpr EvaluateSyscallImpl(int fs_de
+   }
+ 
+ #if defined(__i386__) || \
+-    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
++    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
++    defined(__powerpc64__)
+   if (SyscallSets::IsSocketCall(sysno))
+     return RestrictSocketcallCommand();
+ #endif
+--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/baseline_policy_unittest.cc
++++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/baseline_policy_unittest.cc
+@@ -317,7 +317,7 @@ TEST_BASELINE_SIGSYS(__NR_sysinfo)
+ TEST_BASELINE_SIGSYS(__NR_syslog)
+ TEST_BASELINE_SIGSYS(__NR_timer_create)
+ 
+-#if !defined(__aarch64__)
++#if !defined(__aarch64__) && !defined(__powerpc64__)
+ TEST_BASELINE_SIGSYS(__NR_inotify_init)
+ TEST_BASELINE_SIGSYS(__NR_vserver)
+ #endif
+--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc
++++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc
+@@ -40,6 +40,7 @@
+ #include <sys/ptrace.h>
+ #if (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) && \
+     !defined(__arm__) && !defined(__aarch64__) &&           \
++    !defined(__powerpc64__) &&                              \
+     !defined(PTRACE_GET_THREAD_AREA)
+ // Also include asm/ptrace-abi.h since ptrace.h in older libc (for instance
+ // the one in Ubuntu 16.04 LTS) is missing PTRACE_GET_THREAD_AREA.
+@@ -49,6 +50,11 @@
+ #endif
+ #endif  // !OS_NACL_NONSFI
+ 
++// On PPC64, TCGETS is defined in terms of struct termios, so we must include termios.h
++#ifdef __powerpc64__
++#include <termios.h>
++#endif
++
+ #if defined(OS_ANDROID)
+ 
+ #if !defined(F_DUPFD_CLOEXEC)
+@@ -106,6 +112,14 @@ inline bool IsArchitectureMips() {
+ #endif
+ }
+ 
++inline bool IsArchitecturePPC64() {
++#if defined(__powerpc64__)
++  return true;
++#else
++  return false;
++#endif
++}
++
+ // Ubuntu's version of glibc has a race condition in sem_post that can cause
+ // it to call futex(2) with bogus op arguments. To workaround this, we need
+ // to allow those futex(2) calls to fail with EINVAL, instead of crashing the
+@@ -270,6 +284,8 @@ ResultExpr RestrictFcntlCommands() {
+   uint64_t kOLargeFileFlag = O_LARGEFILE;
+   if (IsArchitectureX86_64() || IsArchitectureI386() || IsArchitectureMips())
+     kOLargeFileFlag = 0100000;
++  else if (IsArchitecturePPC64())
++    kOLargeFileFlag = 0200000;
+ 
+   const Arg<int> cmd(1);
+   const Arg<long> long_arg(2);
+@@ -287,7 +303,16 @@ ResultExpr RestrictFcntlCommands() {
+               F_SETLKW,
+               F_GETLK,
+               F_DUPFD,
+-              F_DUPFD_CLOEXEC),
++              F_DUPFD_CLOEXEC
++#if defined(__powerpc64__)
++// On PPC64, F_SETLK, F_GETLK, F_SETLKW are defined as the 64-bit variants
++// but glibc will sometimes still use the 32-bit versions. Allow both.
++              ,
++              5, /* F_GETLK (32) */
++              6, /* F_SETLK (32) */
++              7  /* F_SETLKW (32) */
++#endif
++	     ),
+              Allow())
+       .Case(F_SETFL,
+             If((long_arg & ~kAllowedMask) == 0, Allow()).Else(CrashSIGSYS()))
+@@ -297,7 +322,7 @@ ResultExpr RestrictFcntlCommands() {
+   // clang-format on
+ }
+ 
+-#if defined(__i386__) || defined(__mips__)
++#if defined(__i386__) || defined(__mips__) || defined(__powerpc64__)
+ ResultExpr RestrictSocketcallCommand() {
+   // Unfortunately, we are unable to restrict the first parameter to
+   // socketpair(2). Whilst initially sounding bad, it's noteworthy that very
+@@ -454,7 +479,7 @@ ResultExpr RestrictPtrace() {
+ #endif
+   return Switch(request)
+       .CASES((
+-#if !defined(__aarch64__)
++#if !defined(__aarch64__) && !defined(__powerpc64__)
+                  PTRACE_GETREGS, PTRACE_GETFPREGS,
+ #if defined(TRACE_GET_THREAD_AREA)
+                  PTRACE_GET_THREAD_AREA,
+--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.h
++++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.h
+@@ -49,7 +49,7 @@ SANDBOX_EXPORT bpf_dsl::ResultExpr Restr
+ // O_NONBLOCK | O_SYNC | O_LARGEFILE | O_CLOEXEC | O_NOATIME.
+ SANDBOX_EXPORT bpf_dsl::ResultExpr RestrictFcntlCommands();
+ 
+-#if defined(__i386__) || defined(__mips__)
++#if defined(__i386__) || defined(__mips__) || defined(__powerpc64__)
+ // Restrict socketcall(2) to only allow socketpair(2), send(2), recv(2),
+ // sendto(2), recvfrom(2), shutdown(2), sendmsg(2) and recvmsg(2).
+ SANDBOX_EXPORT bpf_dsl::ResultExpr RestrictSocketcallCommand();
+--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
++++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
+@@ -28,7 +28,7 @@ bool SyscallSets::IsKill(int sysno) {
+ bool SyscallSets::IsAllowedGettime(int sysno) {
+   switch (sysno) {
+     case __NR_gettimeofday:
+-#if defined(__i386__) || defined(__x86_64__) || \
++#if defined(__i386__) || defined(__x86_64__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_time:
+ #endif
+@@ -51,12 +51,12 @@ bool SyscallSets::IsAllowedGettime(int s
+                                     // filtered by RestrictClockID().
+     case __NR_clock_nanosleep_time64:  // Parameters filtered by RestrictClockID().
+ #endif
+-#if defined(__i386__) || \
++#if defined(__i386__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_ftime:  // Obsolete.
+ #endif
+     case __NR_settimeofday:  // Privileged.
+-#if defined(__i386__) || \
++#if defined(__i386__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_stime:
+ #endif
+@@ -135,7 +135,7 @@ bool SyscallSets::IsFileSystem(int sysno
+     case __NR_faccessat:  // EPERM not a valid errno.
+     case __NR_fchmodat:
+     case __NR_fchownat:  // Should be called chownat ?
+-#if defined(__x86_64__) || defined(__aarch64__)
++#if defined(__x86_64__) || defined(__aarch64__) || defined(__powerpc64__)
+     case __NR_newfstatat:  // fstatat(). EPERM not a valid errno.
+ #elif defined(__i386__) || defined(__arm__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+@@ -154,7 +154,7 @@ bool SyscallSets::IsFileSystem(int sysno
+     case __NR_memfd_create:
+     case __NR_mkdirat:
+     case __NR_mknodat:
+-#if defined(__i386__)
++#if defined(__i386__) || defined(__powerpc64__)
+     case __NR_oldlstat:
+     case __NR_oldstat:
+ #endif
+@@ -167,7 +167,7 @@ bool SyscallSets::IsFileSystem(int sysno
+     case __NR_stat64:
+ #endif
+     case __NR_statfs:  // EPERM not a valid errno.
+-#if defined(__i386__) || defined(__arm__) || \
++#if defined(__i386__) || defined(__arm__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_statfs64:
+ #endif
+@@ -179,7 +179,8 @@ bool SyscallSets::IsFileSystem(int sysno
+     case __NR_truncate64:
+ #endif
+     case __NR_unlinkat:
+-#if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
++#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
++    defined(__powerpc64__)
+     case __NR_utime:
+ #endif
+     case __NR_utimensat:  // New.
+@@ -204,7 +205,8 @@ bool SyscallSets::IsAllowedFileSystemAcc
+ #endif
+       return true;
+ // TODO(jln): these should be denied gracefully as well (moved below).
+-#if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
++#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
++    defined(__powerpc64__)
+     case __NR_fadvise64:  // EPERM not a valid errno.
+ #endif
+ #if defined(__i386__)
+@@ -216,12 +218,12 @@ bool SyscallSets::IsAllowedFileSystemAcc
+     case __NR_fdatasync:  // EPERM not a valid errno.
+     case __NR_flock:      // EPERM not a valid errno.
+     case __NR_fstatfs:    // Give information about the whole filesystem.
+-#if defined(__i386__) || defined(__arm__) || \
++#if defined(__i386__) || defined(__arm__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_fstatfs64:
+ #endif
+     case __NR_fsync:  // EPERM not a valid errno.
+-#if defined(__i386__)
++#if defined(__i386__) || defined(__powerpc64__)
+     case __NR_oldfstat:
+ #endif
+ #if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
+@@ -229,6 +231,8 @@ bool SyscallSets::IsAllowedFileSystemAcc
+     case __NR_sync_file_range:  // EPERM not a valid errno.
+ #elif defined(__arm__)
+     case __NR_arm_sync_file_range:  // EPERM not a valid errno.
++#elif defined(__powerpc64__)
++    case __NR_sync_file_range2: // EPERM not a valid errno.
+ #endif
+     default:
+       return false;
+@@ -248,7 +252,7 @@ bool SyscallSets::IsDeniedFileSystemAcce
+     case __NR_getdents:    // EPERM not a valid errno.
+ #endif
+     case __NR_getdents64:  // EPERM not a valid errno.
+-#if defined(__i386__) || \
++#if defined(__i386__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_readdir:
+ #endif
+@@ -290,7 +294,7 @@ bool SyscallSets::IsGetSimpleId(int sysn
+ bool SyscallSets::IsProcessPrivilegeChange(int sysno) {
+   switch (sysno) {
+     case __NR_capset:
+-#if defined(__i386__) || defined(__x86_64__)
++#if defined(__i386__) || defined(__x86_64__) || defined(__powerpc64__)
+     case __NR_ioperm:  // Intel privilege.
+     case __NR_iopl:    // Intel privilege.
+ #endif
+@@ -340,7 +344,7 @@ bool SyscallSets::IsAllowedSignalHandlin
+     case __NR_rt_sigprocmask:
+     case __NR_rt_sigreturn:
+     case __NR_rt_sigtimedwait:
+-#if defined(__i386__) || defined(__arm__) || \
++#if defined(__i386__) || defined(__arm__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_rt_sigtimedwait_time64:
+     case __NR_sigaction:
+@@ -357,7 +361,7 @@ bool SyscallSets::IsAllowedSignalHandlin
+     case __NR_signalfd:
+ #endif
+     case __NR_signalfd4:
+-#if defined(__i386__) || defined(__arm__) || \
++#if defined(__i386__) || defined(__arm__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_sigpending:
+     case __NR_sigsuspend:
+@@ -382,7 +386,7 @@ bool SyscallSets::IsAllowedOperationOnFd
+ #endif
+     case __NR_dup3:
+ #if defined(__x86_64__) || defined(__arm__) || defined(__mips__) || \
+-    defined(__aarch64__)
++    defined(__aarch64__) || defined(__powerpc64__)
+     case __NR_shutdown:
+ #endif
+       return true;
+@@ -416,7 +420,7 @@ bool SyscallSets::IsAllowedProcessStartO
+     case __NR_membarrier:
+     case __NR_wait4:
+     case __NR_waitid:
+-#if defined(__i386__)
++#if defined(__i386__) || defined(__powerpc64__)
+     case __NR_waitpid:
+ #endif
+ #if !defined(__GLIBC__)
+@@ -438,7 +442,7 @@ bool SyscallSets::IsAllowedProcessStartO
+     case __NR_set_tid_address:
+ #endif
+     case __NR_unshare:
+-#if !defined(__mips__) && !defined(__aarch64__)
++#if !defined(__mips__) && !defined(__aarch64__) || defined(__powerpc64__)
+     case __NR_vfork:
+ #endif
+     default:
+@@ -491,7 +495,7 @@ bool SyscallSets::IsAllowedGetOrModifySo
+       return true;
+     default:
+ #if defined(__x86_64__) || defined(__arm__) || defined(__mips__) || \
+-    defined(__aarch64__)
++    defined(__aarch64__) || defined(__powerpc64__)
+     case __NR_socketpair:  // We will want to inspect its argument.
+ #endif
+       return false;
+@@ -501,7 +505,7 @@ bool SyscallSets::IsAllowedGetOrModifySo
+ bool SyscallSets::IsDeniedGetOrModifySocket(int sysno) {
+   switch (sysno) {
+ #if defined(__x86_64__) || defined(__arm__) || defined(__mips__) || \
+-    defined(__aarch64__)
++    defined(__aarch64__) || defined(__powerpc64__)
+     case __NR_accept:
+     case __NR_accept4:
+     case __NR_bind:
+@@ -515,7 +519,7 @@ bool SyscallSets::IsDeniedGetOrModifySoc
+   }
+ }
+ 
+-#if defined(__i386__) || \
++#if defined(__i386__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+ // Big multiplexing system call for sockets.
+ bool SyscallSets::IsSocketCall(int sysno) {
+@@ -530,7 +534,8 @@ bool SyscallSets::IsSocketCall(int sysno
+ }
+ #endif
+ 
+-#if defined(__x86_64__) || defined(__arm__) || defined(__mips__)
++#if defined(__x86_64__) || defined(__arm__) || defined(__mips__) || \
++    defined(__powerpc64__)
+ bool SyscallSets::IsNetworkSocketInformation(int sysno) {
+   switch (sysno) {
+     case __NR_getpeername:
+@@ -558,7 +563,7 @@ bool SyscallSets::IsAllowedAddressSpaceA
+     case __NR_mincore:
+     case __NR_mlockall:
+ #if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
+-    defined(__aarch64__)
++    defined(__aarch64__) || defined(__powerpc64__)
+     case __NR_mmap:
+ #endif
+ #if defined(__i386__) || defined(__arm__) || \
+@@ -589,7 +594,7 @@ bool SyscallSets::IsAllowedAddressSpaceA
+ bool SyscallSets::IsAllowedGeneralIo(int sysno) {
+   switch (sysno) {
+     case __NR_lseek:
+-#if defined(__i386__) || defined(__arm__) || \
++#if defined(__i386__) || defined(__arm__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR__llseek:
+ #endif
+@@ -609,27 +614,27 @@ bool SyscallSets::IsAllowedGeneralIo(int
+     case __NR_read:
+     case __NR_readv:
+     case __NR_pread64:
+-#if defined(__arm__) || \
++#if defined(__arm__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_recv:
+ #endif
+ #if defined(__x86_64__) || defined(__arm__) || defined(__mips__) || \
+-    defined(__aarch64__)
++    defined(__aarch64__) || defined(__powerpc64__)
+     case __NR_recvfrom:  // Could specify source.
+     case __NR_recvmsg:   // Could specify source.
+ #endif
+-#if defined(__i386__) || defined(__x86_64__)
++#if defined(__i386__) || defined(__x86_64__) || defined(__powerpc64__)
+     case __NR_select:
+ #endif
+-#if defined(__i386__) || defined(__arm__) || defined(__mips__)
++#if defined(__i386__) || defined(__arm__) || defined(__mips__) || defined(__powerpc64__)
+     case __NR__newselect:
+ #endif
+-#if defined(__arm__) || \
++#if defined(__arm__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_send:
+ #endif
+ #if defined(__x86_64__) || defined(__arm__) || defined(__mips__) || \
+-    defined(__aarch64__)
++    defined(__aarch64__) || defined(__powerpc64__)
+     case __NR_sendmsg:  // Could specify destination.
+     case __NR_sendto:   // Could specify destination.
+ #endif
+@@ -684,7 +689,7 @@ bool SyscallSets::IsAllowedBasicSchedule
+     case __NR_nanosleep:
+       return true;
+     case __NR_getpriority:
+-#if defined(__i386__) || defined(__arm__) || \
++#if defined(__i386__) || defined(__arm__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_nice:
+ #endif
+@@ -696,7 +701,7 @@ bool SyscallSets::IsAllowedBasicSchedule
+ 
+ bool SyscallSets::IsAdminOperation(int sysno) {
+   switch (sysno) {
+-#if defined(__i386__) || defined(__arm__) || \
++#if defined(__i386__) || defined(__arm__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_bdflush:
+ #endif
+@@ -713,7 +718,8 @@ bool SyscallSets::IsAdminOperation(int s
+ 
+ bool SyscallSets::IsKernelModule(int sysno) {
+   switch (sysno) {
+-#if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
++#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
++    defined(__powerpc64__)
+     case __NR_create_module:
+     case __NR_get_kernel_syms:  // Should ENOSYS.
+     case __NR_query_module:
+@@ -745,7 +751,7 @@ bool SyscallSets::IsFsControl(int sysno)
+     case __NR_quotactl:
+     case __NR_swapoff:
+     case __NR_swapon:
+-#if defined(__i386__) || \
++#if defined(__i386__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_umount:
+ #endif
+@@ -762,7 +768,7 @@ bool SyscallSets::IsNuma(int sysno) {
+     case __NR_getcpu:
+     case __NR_mbind:
+ #if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
+-    defined(__aarch64__)
++    defined(__aarch64__) || defined(__powerpc64__)
+     case __NR_migrate_pages:
+ #endif
+     case __NR_move_pages:
+@@ -797,13 +803,13 @@ bool SyscallSets::IsGlobalProcessEnviron
+   switch (sysno) {
+     case __NR_acct:  // Privileged.
+ #if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
+-    defined(__aarch64__)
++    defined(__aarch64__) || defined(__powerpc64__)
+     case __NR_getrlimit:
+ #endif
+-#if defined(__i386__) || defined(__arm__)
++#if defined(__i386__) || defined(__arm__) || defined(__powerpc64__)
+     case __NR_ugetrlimit:
+ #endif
+-#if defined(__i386__) || \
++#if defined(__i386__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_ulimit:
+ #endif
+@@ -838,7 +844,7 @@ bool SyscallSets::IsGlobalSystemStatus(i
+ #endif
+     case __NR_sysinfo:
+     case __NR_uname:
+-#if defined(__i386__)
++#if defined(__i386__) || defined(__powerpc64__)
+     case __NR_olduname:
+     case __NR_oldolduname:
+ #endif
+@@ -904,8 +910,16 @@ bool SyscallSets::IsSystemVSemaphores(in
+ }
+ #endif
+ 
++/* shitty hack around Void's 4.19 kernel headers missing those numbers */
++#if defined(__powerpc64__) && !defined(__NR_shmget)
++#define __NR_shmget 395
++#define __NR_shmctl 396
++#define __NR_shmat 397
++#define __NR_shmdt 398
++#endif
++
+ #if defined(__i386__) || defined(__x86_64__) || defined(__arm__) || \
+-    defined(__aarch64__) ||                                         \
++    defined(__aarch64__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_64_BITS))
+ // These give a lot of ambient authority and bypass the setuid sandbox.
+ bool SyscallSets::IsSystemVSharedMemory(int sysno) {
+@@ -936,7 +950,7 @@ bool SyscallSets::IsSystemVMessageQueue(
+ }
+ #endif
+ 
+-#if defined(__i386__) || \
++#if defined(__i386__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+ // Big system V multiplexing system call.
+ bool SyscallSets::IsSystemVIpc(int sysno) {
+@@ -956,7 +970,7 @@ bool SyscallSets::IsAnySystemV(int sysno
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_64_BITS))
+   return IsSystemVMessageQueue(sysno) || IsSystemVSemaphores(sysno) ||
+          IsSystemVSharedMemory(sysno);
+-#elif defined(__i386__) || \
++#elif defined(__i386__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+   return IsSystemVIpc(sysno);
+ #endif
+@@ -1014,7 +1028,8 @@ bool SyscallSets::IsFaNotify(int sysno)
+ bool SyscallSets::IsTimer(int sysno) {
+   switch (sysno) {
+     case __NR_getitimer:
+-#if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
++#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
++    defined(__powerpc64__)
+     case __NR_alarm:
+ #endif
+     case __NR_setitimer:
+@@ -1096,17 +1111,20 @@ bool SyscallSets::IsMisc(int sysno) {
+     case __NR_syncfs:
+     case __NR_vhangup:
+ // The system calls below are not implemented.
+-#if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
++#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
++    defined(__powerpc64__)
+     case __NR_afs_syscall:
+ #endif
+ #if defined(__i386__) || \
+-    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
++    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
++    defined(__powerpc64__)
+     case __NR_break:
+ #endif
+-#if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
++#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
++    defined(__powerpc64__)
+     case __NR_getpmsg:
+ #endif
+-#if defined(__i386__) || \
++#if defined(__i386__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_gtty:
+     case __NR_idle:
+@@ -1115,20 +1133,21 @@ bool SyscallSets::IsMisc(int sysno) {
+     case __NR_prof:
+     case __NR_profil:
+ #endif
+-#if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
++#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
++    defined(__powerpc64__)
+     case __NR_putpmsg:
+ #endif
+ #if defined(__x86_64__)
+     case __NR_security:
+ #endif
+-#if defined(__i386__) || \
++#if defined(__i386__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_stty:
+ #endif
+-#if defined(__x86_64__)
++#if defined(__x86_64__) || defined(__powerpc64__)
+     case __NR_tuxcall:
+ #endif
+-#if !defined(__aarch64__)
++#if !defined(__aarch64__) && !defined(__powerpc64__)
+     case __NR_vserver:
+ #endif
+       return true;
+--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_sets.h
++++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_sets.h
+@@ -43,13 +43,14 @@ class SANDBOX_EXPORT SyscallSets {
+   static bool IsDeniedGetOrModifySocket(int sysno);
+ 
+ #if defined(__i386__) || \
+-    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
++    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
++    defined(__powerpc64__)
+   // Big multiplexing system call for sockets.
+   static bool IsSocketCall(int sysno);
+ #endif
+ 
+ #if defined(__x86_64__) || defined(__arm__) || defined(__mips__) || \
+-    defined(__aarch64__)
++    defined(__aarch64__) || defined(__powerpc64__)
+   static bool IsNetworkSocketInformation(int sysno);
+ #endif
+ 
+@@ -77,7 +78,7 @@ class SANDBOX_EXPORT SyscallSets {
+   static bool IsSystemVSemaphores(int sysno);
+ #endif
+ #if defined(__i386__) || defined(__x86_64__) || defined(__arm__) || \
+-    defined(__aarch64__) ||                                         \
++    defined(__aarch64__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_64_BITS))
+   // These give a lot of ambient authority and bypass the setuid sandbox.
+   static bool IsSystemVSharedMemory(int sysno);
+@@ -89,7 +90,8 @@ class SANDBOX_EXPORT SyscallSets {
+ #endif
+ 
+ #if defined(__i386__) || \
+-    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
++    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
++    defined(__powerpc64__)
+   // Big system V multiplexing system call.
+   static bool IsSystemVIpc(int sysno);
+ #endif
+--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf/syscall.cc
++++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf/syscall.cc
+@@ -18,7 +18,7 @@ namespace sandbox {
+ namespace {
+ 
+ #if defined(ARCH_CPU_X86_FAMILY) || defined(ARCH_CPU_ARM_FAMILY) || \
+-    defined(ARCH_CPU_MIPS_FAMILY)
++    defined(ARCH_CPU_MIPS_FAMILY) || defined (ARCH_CPU_PPC64_FAMILY)
+ // Number that's not currently used by any Linux kernel ABIs.
+ const int kInvalidSyscallNumber = 0x351d3;
+ #else
+@@ -312,10 +312,54 @@ asm(// We need to be able to tell the ke
+     "2:ret\n"
+     ".cfi_endproc\n"
+     ".size SyscallAsm, .-SyscallAsm\n"
++#elif defined(__powerpc64__)
++    ".text\n"
++    ".align 4\n"
++    ".type SyscallAsm @function\n"
++    "SyscallAsm:\n"
++    ".cfi_startproc\n"
++
++    // Check if r3 is negative
++    "cmpdi 3, 0\n"
++    "bgt 2f\n"
++
++    // Load address of 3f into r3 and return
++    "mflr 10\n"
++    "bl 1f\n"
++    "1: mflr 3\n"
++    "mtlr 10\n"
++    "addi 3, 3, 4*13\n"
++    "blr\n"
++
++    // Load arguments from array into r3-8
++    // save param 3 in r10
++    "2:\n"
++    "mr 0, 3\n"
++    "ld 3, 0(4)\n"
++    "ld 5, 16(4)\n"
++    "ld 6, 24(4)\n"
++    "ld 7, 32(4)\n"
++    "ld 8, 40(4)\n"
++    "ld 4, 8(4)\n"
++    "li 9, 0\n"
++
++    // Enter kernel
++    "sc\n"
++
++    // Magic return address
++    "3:\n"
++    // Like MIPS, ppc64 return values are always positive.
++    // Check for error in cr0.SO and negate upon error
++    "bc 4, 3, 4f\n"
++    "neg 3, 3\n"
++    "4: blr\n"
++
++    ".cfi_endproc\n"
++    ".size SyscallAsm, .-SyscallAsm\n"
+ #endif
+     );  // asm
+ 
+-#if defined(__x86_64__)
++#if defined(__x86_64__) || defined(__powerpc64__)
+ extern "C" {
+ intptr_t SyscallAsm(intptr_t nr, const intptr_t args[6]);
+ }
+@@ -429,6 +473,8 @@ intptr_t Syscall::Call(int nr,
+     ret = inout;
+   }
+ 
++#elif defined(__powerpc64__)
++  intptr_t ret = SyscallAsm(nr, args);
+ #else
+ #error "Unimplemented architecture"
+ #endif
+@@ -445,8 +491,26 @@ void Syscall::PutValueInUcontext(intptr_
+     // needs to be changed back.
+     ret_val = -ret_val;
+     SECCOMP_PARM4(ctx) = 1;
+-  } else
++  } else {
+     SECCOMP_PARM4(ctx) = 0;
++  }
++#endif
++#if defined(__powerpc64__)
++  // Same as MIPS, need to invert ret and set error register (cr0.SO)
++  if (ret_val <= -1 && ret_val >= -4095) {
++    ret_val = -ret_val;
++#ifdef __GLIBC__
++    ctx->uc_mcontext.regs->ccr |= (1 << 28);
++#else
++    ((struct pt_regs *)ctx->uc_mcontext.regs)->ccr |= (1 << 28);
++#endif
++  } else {
++#ifdef __GLIBC__
++    ctx->uc_mcontext.regs->ccr &= ~(1 << 28);
++#else
++    ((struct pt_regs *)ctx->uc_mcontext.regs)->ccr &= ~(1 << 28);
++#endif
++  }
+ #endif
+   SECCOMP_RESULT(ctx) = static_cast<greg_t>(ret_val);
+ }
+--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf/trap.cc
++++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf/trap.cc
+@@ -236,6 +236,20 @@ void Trap::SigSys(int nr, LinuxSigInfo*
+       SetIsInSigHandler();
+     }
+ 
++#if defined(__powerpc64__)
++    // On ppc64+glibc, some syscalls seem to accidentally negate the first
++    // parameter which causes checks against it to fail. For now, manually
++    // negate them back.
++    // TODO(shawn@anastas.io): investigate this issue further
++    auto nr = SECCOMP_SYSCALL(ctx);
++    if (nr == __NR_openat || nr == __NR_mkdirat || nr == __NR_faccessat || nr == __NR_readlinkat ||
++        nr == __NR_renameat || nr == __NR_renameat2 || nr == __NR_newfstatat || nr == __NR_unlinkat) {
++        if (static_cast<int>(SECCOMP_PARM1(ctx)) > 0) {
++            SECCOMP_PARM1(ctx) = -SECCOMP_PARM1(ctx);
++        }
++    }
++#endif
++
+     // Copy the seccomp-specific data into a arch_seccomp_data structure. This
+     // is what we are showing to TrapFnc callbacks that the system call
+     // evaluator registered with the sandbox.
+--- a/src/3rdparty/chromium/sandbox/linux/services/credentials.cc
++++ b/src/3rdparty/chromium/sandbox/linux/services/credentials.cc
+@@ -81,7 +81,7 @@ bool ChrootToSafeEmptyDir() {
+   pid_t pid = -1;
+   alignas(16) char stack_buf[PTHREAD_STACK_MIN];
+ #if defined(ARCH_CPU_X86_FAMILY) || defined(ARCH_CPU_ARM_FAMILY) || \
+-    defined(ARCH_CPU_MIPS_FAMILY)
++    defined(ARCH_CPU_MIPS_FAMILY) || defined(ARCH_CPU_PPC64_FAMILY)
+   // The stack grows downward.
+   void* stack = stack_buf + sizeof(stack_buf);
+ #else
+--- a/src/3rdparty/chromium/sandbox/linux/services/syscall_wrappers.cc
++++ b/src/3rdparty/chromium/sandbox/linux/services/syscall_wrappers.cc
+@@ -61,7 +61,7 @@ long sys_clone(unsigned long flags,
+ #if defined(ARCH_CPU_X86_64)
+   return syscall(__NR_clone, flags, child_stack, ptid, ctid, tls);
+ #elif defined(ARCH_CPU_X86) || defined(ARCH_CPU_ARM_FAMILY) || \
+-    defined(ARCH_CPU_MIPS_FAMILY)
++    defined(ARCH_CPU_MIPS_FAMILY) || defined(ARCH_CPU_PPC64_FAMILY)
+   // CONFIG_CLONE_BACKWARDS defined.
+   return syscall(__NR_clone, flags, child_stack, ptid, tls, ctid);
+ #endif
+--- a/src/3rdparty/chromium/sandbox/linux/syscall_broker/broker_process.cc
++++ b/src/3rdparty/chromium/sandbox/linux/syscall_broker/broker_process.cc
+@@ -165,7 +165,7 @@ bool BrokerProcess::IsSyscallBrokerable(
+ #if defined(__NR_fstatat64)
+     case __NR_fstatat64:
+ #endif
+-#if defined(__x86_64__) || defined(__aarch64__)
++#if defined(__x86_64__) || defined(__aarch64__) || defined(__powerpc64__)
+     case __NR_newfstatat:
+ #endif
+       return !fast_check || allowed_command_set_.test(COMMAND_STAT);
+--- a/src/3rdparty/chromium/sandbox/linux/system_headers/linux_seccomp.h
++++ b/src/3rdparty/chromium/sandbox/linux/system_headers/linux_seccomp.h
+@@ -41,6 +41,9 @@
+ #ifndef EM_AARCH64
+ #define EM_AARCH64 183
+ #endif
++#ifndef EM_PPC64
++#define EM_PPC64 21
++#endif
+ 
+ #ifndef __AUDIT_ARCH_64BIT
+ #define __AUDIT_ARCH_64BIT 0x80000000
+@@ -74,6 +77,14 @@
+ #define AUDIT_ARCH_AARCH64 (EM_AARCH64 | __AUDIT_ARCH_64BIT | __AUDIT_ARCH_LE)
+ #endif
+ 
++#ifndef AUDIT_ARCH_PPC64
++#define AUDIT_ARCH_PPC64 (EM_PPC64 | __AUDIT_ARCH_64BIT)
++#endif
++
++#ifndef AUDIT_ARCH_PPC64LE
++#define AUDIT_ARCH_PPC64LE (EM_PPC64 | __AUDIT_ARCH_64BIT | __AUDIT_ARCH_LE)
++#endif
++
+ // For prctl.h
+ #ifndef PR_SET_SECCOMP
+ #define PR_SET_SECCOMP               22
+--- a/src/3rdparty/chromium/sandbox/linux/system_headers/linux_signal.h
++++ b/src/3rdparty/chromium/sandbox/linux/system_headers/linux_signal.h
+@@ -13,7 +13,7 @@
+ // (not undefined, but defined different values and in different memory
+ // layouts). So, fill the gap here.
+ #if defined(__i386__) || defined(__x86_64__) || defined(__arm__) || \
+-    defined(__aarch64__)
++    defined(__aarch64__) || defined(__powerpc64__)
+ 
+ #define LINUX_SIGHUP 1
+ #define LINUX_SIGINT 2
+--- a/src/3rdparty/chromium/sandbox/linux/system_headers/linux_syscalls.h
++++ b/src/3rdparty/chromium/sandbox/linux/system_headers/linux_syscalls.h
+@@ -35,5 +35,9 @@
+ #include "sandbox/linux/system_headers/arm64_linux_syscalls.h"
+ #endif
+ 
++#if defined(__powerpc64__)
++#include "sandbox/linux/system_headers/ppc64_linux_syscalls.h"
++#endif
++
+ #endif  // SANDBOX_LINUX_SYSTEM_HEADERS_LINUX_SYSCALLS_H_
+ 
+--- a/src/3rdparty/chromium/sandbox/linux/system_headers/linux_ucontext.h
++++ b/src/3rdparty/chromium/sandbox/linux/system_headers/linux_ucontext.h
+@@ -11,6 +11,8 @@
+ #include "sandbox/linux/system_headers/arm_linux_ucontext.h"
+ #elif defined(__i386__)
+ #include "sandbox/linux/system_headers/i386_linux_ucontext.h"
++#elif defined(__powerpc64__)
++#include "sandbox/linux/system_headers/ppc64_linux_ucontext.h"
+ #else
+ #error "No support for your architecture in PNaCl header"
+ #endif
+--- a/src/3rdparty/chromium/sandbox/policy/linux/bpf_renderer_policy_linux.cc
++++ b/src/3rdparty/chromium/sandbox/policy/linux/bpf_renderer_policy_linux.cc
+@@ -15,6 +15,11 @@
+ #include "sandbox/linux/system_headers/linux_syscalls.h"
+ #include "sandbox/policy/linux/sandbox_linux.h"
+ 
++// On PPC64, TCGETS is defined in terms of struct termios, so we must include termios.h
++#ifdef __powerpc64__
++#include <termios.h>
++#endif
++
+ // TODO(vignatti): replace the local definitions below with #include
+ // <linux/dma-buf.h> once kernel version 4.6 becomes widely used.
+ #include <linux/types.h>
+--- a/src/3rdparty/chromium/third_party/angle/src/compiler/translator/InfoSink.h
++++ b/src/3rdparty/chromium/third_party/angle/src/compiler/translator/InfoSink.h
+@@ -93,7 +93,16 @@ class TInfoSinkBase
+             stream.precision(8);
+             stream << f;
+         }
+-        sink.append(stream.str());
++
++        // Hack to work around a bug where negative floating point values
++        // are rendered like '.0.5' instead of '-0.5'
++        std::string res(stream.str());
++
++        if (signbit(f)) { // test if f is negative
++            res[0] = '-';
++        }
++
++        sink.append(res);
+         return *this;
+     }
+     // Write boolean values as their names instead of integral value.
+--- a/src/3rdparty/chromium/third_party/angle/src/libANGLE/Constants.h
++++ b/src/3rdparty/chromium/third_party/angle/src/libANGLE/Constants.h
+@@ -9,6 +9,7 @@
+ #ifndef LIBANGLE_CONSTANTS_H_
+ #define LIBANGLE_CONSTANTS_H_
+ 
++#include <cstddef>
+ #include "common/platform.h"
+ 
+ #include <stdint.h>
+--- a/src/3rdparty/chromium/third_party/boringssl/BUILD.gn
++++ b/src/3rdparty/chromium/third_party/boringssl/BUILD.gn
+@@ -99,6 +99,13 @@ if (is_win && !is_msan && current_cpu !=
+       } else {
+         public_configs = [ ":no_asm_config" ]
+       }
++    } else if (current_cpu == "ppc64") {
++      if (is_linux) {
++        # TODO: ppc64 (be) check
++        sources += crypto_sources_linux_ppc64le
++      } else {
++        public_configs = [ ":no_asm_config" ]
++      }
+     } else {
+       public_configs = [ ":no_asm_config" ]
+     }
+--- a/src/3rdparty/chromium/third_party/breakpad/BUILD.gn
++++ b/src/3rdparty/chromium/third_party/breakpad/BUILD.gn
+@@ -623,7 +623,6 @@ if (is_linux || is_chromeos || is_androi
+       "breakpad/src/client/minidump_file_writer.h",
+       "breakpad/src/common/convert_UTF.cc",
+       "breakpad/src/common/convert_UTF.h",
+-      "breakpad/src/common/linux/breakpad_getcontext.S",
+       "breakpad/src/common/linux/elf_core_dump.cc",
+       "breakpad/src/common/linux/elf_core_dump.h",
+       "breakpad/src/common/linux/elfutils.cc",
+@@ -663,6 +662,15 @@ if (is_linux || is_chromeos || is_androi
+ 
+     libs = [ "dl" ]
+ 
++    if (current_cpu == "ppc64") {
++        defines = [ "HAVE_GETCONTEXT" ]
++        libs += [ "ucontext" ]
++    } else {
++        sources += [
++            "breakpad/src/common/linux/breakpad_getcontext.S"
++        ]
++    }
++
+     include_dirs = [
+       ".",
+       "breakpad/src",
+@@ -712,7 +720,6 @@ if (is_linux || is_chromeos || is_androi
+       "breakpad/src/client/linux/minidump_writer/minidump_writer_unittest.cc",
+       "breakpad/src/client/linux/minidump_writer/minidump_writer_unittest_utils.cc",
+       "breakpad/src/client/linux/minidump_writer/proc_cpuinfo_reader_unittest.cc",
+-      "breakpad/src/common/linux/breakpad_getcontext_unittest.cc",
+       "breakpad/src/common/linux/elf_core_dump_unittest.cc",
+       "breakpad/src/common/linux/file_id_unittest.cc",
+       "breakpad/src/common/linux/linux_libc_support_unittest.cc",
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/raw_context_cpu.h
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/raw_context_cpu.h
+@@ -44,6 +44,8 @@ typedef MDRawContextARM RawContextCPU;
+ typedef MDRawContextARM64_Old RawContextCPU;
+ #elif defined(__mips__)
+ typedef MDRawContextMIPS RawContextCPU;
++#elif defined(__powerpc64__)
++typedef MDRawContextPPC64 RawContextCPU;
+ #else
+ #error "This code has not been ported to your platform yet."
+ #endif
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.cc
+@@ -270,7 +270,54 @@ void ThreadInfo::FillCPUContext(RawConte
+   out->float_save.fir = mcontext.fpc_eir;
+ #endif
+ }
+-#endif  // __mips__
++
++#elif defined(__powerpc64__)
++
++#if !defined(__GLIBC__)
++#include <asm/elf.h>
++#include <asm/ptrace.h>
++#endif
++
++uintptr_t ThreadInfo::GetInstructionPointer() const {
++    return mcontext.gp_regs[PT_NIP];
++}
++
++void ThreadInfo::FillCPUContext(RawContextCPU* out) const {
++    out->context_flags = MD_CONTEXT_PPC64_FULL;
++    for (int i = 0; i < MD_CONTEXT_PPC64_GPR_COUNT; i++)
++        out->gpr[i] = mcontext.gp_regs[i];
++
++    out->lr = mcontext.gp_regs[PT_LNK];
++    out->srr0 = mcontext.gp_regs[PT_NIP];
++    out->srr1 = mcontext.gp_regs[PT_MSR];
++    out->cr = mcontext.gp_regs[PT_CCR];
++    out->xer = mcontext.gp_regs[PT_XER];
++    out->ctr = mcontext.gp_regs[PT_CTR];
++
++#ifdef __GLIBC__
++    for (int i = 0; i < MD_FLOATINGSAVEAREA_PPC_FPR_COUNT; i++)
++        out->float_save.fpregs[i] = mcontext.fp_regs[i];
++
++    out->float_save.fpscr = mcontext.fp_regs[NFPREG-1];
++#else
++    for (int i = 0; i < MD_FLOATINGSAVEAREA_PPC_FPR_COUNT; i++)
++        out->float_save.fpregs[i] = ((uint64_t *)&mcontext.fp_regs)[i];
++
++     out->float_save.fpscr = ((uint64_t *)&mcontext.fp_regs)[ELF_NFPREG-1];
++#endif
++
++    for (int i = 0; i < MD_VECTORSAVEAREA_PPC_VR_COUNT; i++)
++        out->vector_save.save_vr[i] = \
++            {(((uint64_t)vregs.vrregs[i][0]) << 32)
++                          | vregs.vrregs[i][1],
++            (((uint64_t)vregs.vrregs[i][2]) << 32)
++                         | vregs.vrregs[i][3]};
++
++    out->vrsave = vregs.vrsave;
++    out->vector_save.save_vscr = {0, vregs.vscr.vscr_word};
++    out->vector_save.save_vrvalid = 0xFFFFFFFF;
++}
++#endif  // __powerpc64__
+ 
+ void ThreadInfo::GetGeneralPurposeRegisters(void** gp_regs, size_t* size) {
+   assert(gp_regs || size);
+@@ -279,6 +326,11 @@ void ThreadInfo::GetGeneralPurposeRegist
+     *gp_regs = mcontext.gregs;
+   if (size)
+     *size = sizeof(mcontext.gregs);
++#elif defined(__powerpc64__)
++  if (gp_regs)
++    *gp_regs = mcontext.gp_regs;
++  if (size)
++    *size = sizeof(mcontext.gp_regs);
+ #else
+   if (gp_regs)
+     *gp_regs = &regs;
+@@ -294,6 +346,11 @@ void ThreadInfo::GetFloatingPointRegiste
+     *fp_regs = &mcontext.fpregs;
+   if (size)
+     *size = sizeof(mcontext.fpregs);
++#elif defined(__powerpc64__)
++  if (fp_regs)
++    *fp_regs = &mcontext.fp_regs;
++  if (size)
++    *size = sizeof(mcontext.fp_regs);
+ #else
+   if (fp_regs)
+     *fp_regs = &fpregs;
+@@ -302,4 +359,13 @@ void ThreadInfo::GetFloatingPointRegiste
+ #endif
+ }
+ 
++#if defined(__powerpc64__)
++void ThreadInfo::GetVectorRegisters(void** v_regs, size_t* size) {
++    if (v_regs)
++        *v_regs = &vregs;
++    if (size)
++        *size = sizeof(vregs);
++}
++#endif
++
+ }  // namespace google_breakpad
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.h
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.h
+@@ -68,6 +68,10 @@ struct ThreadInfo {
+   // Use the structures defined in <sys/user.h>
+   struct user_regs_struct regs;
+   struct user_fpsimd_struct fpregs;
++#elif defined(__powerpc64__)
++  // Use the structures defined in <sys/ucontext.h>.
++  mcontext_t mcontext;
++  vrregset_t vregs;
+ #elif defined(__mips__)
+   // Use the structure defined in <sys/ucontext.h>.
+   mcontext_t mcontext;
+@@ -84,6 +88,11 @@ struct ThreadInfo {
+ 
+   // Returns the pointer and size of float point register area.
+   void GetFloatingPointRegisters(void** fp_regs, size_t* size);
++
++#if defined(__powerpc64__)
++  // Returns the pointer and size of the vector register area. (PPC64 only)
++  void GetVectorRegisters(void** v_regs, size_t* size);
++#endif
+ };
+ 
+ }  // namespace google_breakpad
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc
+@@ -254,6 +254,60 @@ void UContextReader::FillCPUContext(RawC
+   out->float_save.fir = uc->uc_mcontext.fpc_eir;  // Unused.
+ #endif
+ }
++
++#elif defined(__powerpc64__)
++
++#ifndef __GLIBC__
++#include <asm/elf.h>
++#include <asm/ptrace.h>
++#endif
++
++uintptr_t UContextReader::GetStackPointer(const ucontext_t* uc) {
++    return uc->uc_mcontext.gp_regs[MD_CONTEXT_PPC64_REG_SP];
++}
++
++uintptr_t UContextReader::GetInstructionPointer(const ucontext_t* uc) {
++    return uc->uc_mcontext.gp_regs[PT_NIP];
++}
++
++void UContextReader::FillCPUContext(RawContextCPU* out, const ucontext_t* uc,
++                                    const vrregset_t* vregs) {
++    out->context_flags = MD_CONTEXT_PPC64_FULL;
++
++    for (int i = 0; i < MD_CONTEXT_PPC64_GPR_COUNT; i++)
++        out->gpr[i] = uc->uc_mcontext.gp_regs[i];
++
++    out->lr = uc->uc_mcontext.gp_regs[PT_LNK];
++    out->srr0 = uc->uc_mcontext.gp_regs[PT_NIP];
++    out->srr1 = uc->uc_mcontext.gp_regs[PT_MSR];
++    out->cr = uc->uc_mcontext.gp_regs[PT_CCR];
++    out->xer = uc->uc_mcontext.gp_regs[PT_XER];
++    out->ctr = uc->uc_mcontext.gp_regs[PT_CTR];
++
++#ifdef __GLIBC__
++    for (int i = 0; i < MD_FLOATINGSAVEAREA_PPC_FPR_COUNT; i++)
++        out->float_save.fpregs[i] = uc->uc_mcontext.fp_regs[i];
++
++    out->float_save.fpscr = uc->uc_mcontext.fp_regs[NFPREG-1];
++#else
++    for (int i = 0; i < MD_FLOATINGSAVEAREA_PPC_FPR_COUNT; i++)
++        out->float_save.fpregs[i] = ((uint64_t *)&uc->uc_mcontext.fp_regs)[i];
++
++    out->float_save.fpscr = ((uint64_t *)&uc->uc_mcontext.fp_regs)[ELF_NFPREG-1];
++#endif
++
++    for (int i = 0; i < MD_VECTORSAVEAREA_PPC_VR_COUNT; i++)
++        out->vector_save.save_vr[i] =
++            {(((uint64_t)vregs->vrregs[i][0]) << 32)
++                         | vregs->vrregs[i][1],
++             (((uint64_t)vregs->vrregs[i][2]) << 32)
++                         | vregs->vrregs[i][3]};
++
++    out->vrsave = vregs->vrsave;
++    out->vector_save.save_vscr = {0, vregs->vscr.vscr_word};
++    out->vector_save.save_vrvalid = 0xFFFFFFFF;
++}
++
+ #endif
+ 
+ }  // namespace google_breakpad
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h
+@@ -59,6 +59,9 @@ struct UContextReader {
+ #elif defined(__aarch64__)
+   static void FillCPUContext(RawContextCPU* out, const ucontext_t* uc,
+                              const struct fpsimd_context* fpregs);
++#elif defined(__powerpc64__)
++  static void FillCPUContext(RawContextCPU *out, const ucontext_t *uc,
++                             const vrregset_t* vregs);
+ #else
+   static void FillCPUContext(RawContextCPU* out, const ucontext_t* uc);
+ #endif
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc
+@@ -105,6 +105,13 @@
+ #define PR_SET_PTRACER 0x59616d61
+ #endif
+ 
++/* musl hack, can't include asm/ptrace.h as that causes conflicts */
++#ifndef __GLIBC__
++#if defined(__powerpc64__) && !defined(PT_NIP)
++#define PT_NIP 32
++#endif
++#endif
++
+ namespace google_breakpad {
+ 
+ namespace {
+@@ -461,9 +468,16 @@ bool ExceptionHandler::HandleSignal(int
+     memcpy(&g_crash_context_.float_state, fp_ptr,
+            sizeof(g_crash_context_.float_state));
+   }
++#elif defined(__powerpc64__)
++  // On PPC64, we must copy VR state
++  ucontext_t* uc_ptr = (ucontext_t*)uc;
++  if (uc_ptr->uc_mcontext.v_regs) {
++    memcpy(&g_crash_context_.vector_state, uc_ptr->uc_mcontext.v_regs,
++           sizeof(g_crash_context_.vector_state));
++  }
+ #elif !defined(__ARM_EABI__) && !defined(__mips__)
+   // FP state is not part of user ABI on ARM Linux.
+-  // In case of MIPS Linux FP state is already part of ucontext_t
++  // In case of MIPS, Linux FP state is already part of ucontext_t
+   // and 'float_state' is not a member of CrashContext.
+   ucontext_t* uc_ptr = (ucontext_t*)uc;
+   if (uc_ptr->uc_mcontext.fpregs) {
+@@ -708,11 +722,19 @@ bool ExceptionHandler::WriteMinidump() {
+   }
+ #endif
+ 
+-#if !defined(__ARM_EABI__) && !defined(__aarch64__) && !defined(__mips__)
++#if !defined(__ARM_EABI__) && !defined(__aarch64__) && !defined(__mips__) \
++    && !defined(__powerpc64__)
+   // FPU state is not part of ARM EABI ucontext_t.
+   memcpy(&context.float_state, context.context.uc_mcontext.fpregs,
+          sizeof(context.float_state));
+ #endif
++
++#if defined(__powerpc64__)
++  // Vector registers must be copied on PPC64
++  memcpy(&context.vector_state, context.context.uc_mcontext.v_regs,
++         sizeof(context.vector_state));
++#endif
++
+   context.tid = sys_gettid();
+ 
+   // Add an exception stream to the minidump for better reporting.
+@@ -733,6 +755,9 @@ bool ExceptionHandler::WriteMinidump() {
+ #elif defined(__mips__)
+   context.siginfo.si_addr =
+       reinterpret_cast<void*>(context.context.uc_mcontext.pc);
++#elif defined(__powerpc64__)
++  context.siginfo.si_addr =
++      reinterpret_cast<void*>(context.context.uc_mcontext.gp_regs[PT_NIP]);
+ #else
+ #error "This code has not been ported to your platform yet."
+ #endif
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.h
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.h
+@@ -192,7 +192,11 @@ class ExceptionHandler {
+     siginfo_t siginfo;
+     pid_t tid;  // the crashing thread.
+     ucontext_t context;
+-#if !defined(__ARM_EABI__) && !defined(__mips__)
++#if defined(__powerpc64__)
++    // PPC64's FP state is a part of ucontext_t like MIPS but the vector
++    // state is not, so a struct is needed.
++    vstate_t vector_state;
++#elif !defined(__ARM_EABI__) && !defined(__mips__)
+     // #ifdef this out because FP state is not part of user ABI for Linux ARM.
+     // In case of MIPS Linux FP state is already part of ucontext_t so
+     // 'float_state' is not required.
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler_unittest.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler_unittest.cc
+@@ -307,7 +307,7 @@ TEST(ExceptionHandlerTest, ParallelChild
+   }
+ 
+   // Wait a while until the child should have crashed.
+-  usleep(1000000);
++  usleep(2000000);
+   // Kill the child if it is still running.
+   kill(child, SIGKILL);
+ 
+@@ -559,6 +559,8 @@ const unsigned char kIllegalInstruction[
+ #if defined(__mips__)
+   // mfc2 zero,Impl - usually illegal in userspace.
+   0x48, 0x00, 0x00, 0x48
++#elif defined(__powerpc64__)
++  0x01, 0x01, 0x01, 0x01 // Crashes on a tested POWER9 cpu
+ #else
+   // This crashes with SIGILL on x86/x86-64/arm.
+   0xff, 0xff, 0xff, 0xff
+@@ -754,10 +756,10 @@ TEST(ExceptionHandlerTest, InstructionPo
+ 
+   // These are defined here so the parent can use them to check the
+   // data from the minidump afterwards.
+-  // Use 4k here because the OS will hand out a single page even
++  // Use the page size here because the OS will hand out a single page even
+   // if a smaller size is requested, and this test wants to
+   // test the upper bound of the memory range.
+-  const uint32_t kMemorySize = 4096;  // bytes
++  const uint32_t kMemorySize = getpagesize();  // bytes
+   const int kOffset = kMemorySize - sizeof(kIllegalInstruction);
+ 
+   const pid_t child = fork();
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/microdump_writer/microdump_writer.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/microdump_writer/microdump_writer.cc
+@@ -138,7 +138,9 @@ class MicrodumpWriter {
+                   const MicrodumpExtraInfo& microdump_extra_info,
+                   LinuxDumper* dumper)
+       : ucontext_(context ? &context->context : NULL),
+-#if !defined(__ARM_EABI__) && !defined(__mips__)
++#if defined(__powerpc64__)
++        vector_state_(context ? &context->vector_state : NULL),
++#elif !defined(__ARM_EABI__) && !defined(__mips__)
+         float_state_(context ? &context->float_state : NULL),
+ #endif
+         dumper_(dumper),
+@@ -337,6 +339,8 @@ class MicrodumpWriter {
+ # else
+ #  error "This mips ABI is currently not supported (n32)"
+ #endif
++#elif defined(__powerpc64__)
++    const char kArch[] = "ppc64";
+ #else
+ #error "This code has not been ported to your platform yet"
+ #endif
+@@ -409,7 +413,9 @@ class MicrodumpWriter {
+   void DumpCPUState() {
+     RawContextCPU cpu;
+     my_memset(&cpu, 0, sizeof(RawContextCPU));
+-#if !defined(__ARM_EABI__) && !defined(__mips__)
++#if defined(__powerpc64__)
++    UContextReader::FillCPUContext(&cpu, ucontext_, vector_state_);
++#elif !defined(__ARM_EABI__) && !defined(__mips__)
+     UContextReader::FillCPUContext(&cpu, ucontext_, float_state_);
+ #else
+     UContextReader::FillCPUContext(&cpu, ucontext_);
+@@ -605,7 +611,9 @@ class MicrodumpWriter {
+   void* Alloc(unsigned bytes) { return dumper_->allocator()->Alloc(bytes); }
+ 
+   const ucontext_t* const ucontext_;
+-#if !defined(__ARM_EABI__) && !defined(__mips__)
++#if defined(__powerpc64__)
++  const google_breakpad::vstate_t* const vector_state_;
++#elif !defined(__ARM_EABI__) && !defined(__mips__)
+   const google_breakpad::fpstate_t* const float_state_;
+ #endif
+   LinuxDumper* dumper_;
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/microdump_writer/microdump_writer_unittest.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/microdump_writer/microdump_writer_unittest.cc
+@@ -279,10 +279,19 @@ TEST(MicrodumpWriterTest, BasicWithMappi
+   CrashAndGetMicrodump(mappings, MicrodumpExtraInfo(), &buf);
+   ASSERT_TRUE(ContainsMicrodump(buf));
+ 
++  int page_size = getpagesize();
+ #ifdef __LP64__
+-  ASSERT_NE(std::string::npos,
+-            buf.find("M 0000000000001000 000000000000002A 0000000000001000 "
+-                     "33221100554477668899AABBCCDDEEFF0 libfoo.so"));
++  // This test is only available for the following page sizes
++  ASSERT_TRUE((page_size == 4096) || (page_size == 65536));
++  if (page_size == 4096) {
++    ASSERT_NE(std::string::npos,
++              buf.find("M 0000000000001000 000000000000002A 0000000000001000 "
++                       "33221100554477668899AABBCCDDEEFF0 libfoo.so"));
++  } else {
++    ASSERT_NE(std::string::npos,
++              buf.find("M 0000000000010000 000000000000002A 0000000000010000 "
++                       "33221100554477668899AABBCCDDEEFF0 libfoo.so"));
++  }
+ #else
+   ASSERT_NE(std::string::npos,
+             buf.find("M 00001000 0000002A 00001000 "
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_core_dumper.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_core_dumper.cc
+@@ -117,6 +117,9 @@ bool LinuxCoreDumper::GetThreadInfoByInd
+ #elif defined(__mips__)
+   stack_pointer =
+       reinterpret_cast<uint8_t*>(info->mcontext.gregs[MD_CONTEXT_MIPS_REG_SP]);
++#elif defined(__powerpc64__)
++  stack_pointer =
++      reinterpret_cast<uint8_t*>(info->mcontext.gp_regs[MD_CONTEXT_PPC64_REG_SP]);
+ #else
+ #error "This code hasn't been ported to your platform yet."
+ #endif
+@@ -212,7 +215,10 @@ bool LinuxCoreDumper::EnumerateThreads()
+         memset(&info, 0, sizeof(ThreadInfo));
+         info.tgid = status->pr_pgrp;
+         info.ppid = status->pr_ppid;
+-#if defined(__mips__)
++#if defined(__powerpc64__)
++        for (int i = 0; i < 31; i++)
++            info.mcontext.gp_regs[i] = status->pr_reg[i];
++#elif defined(__mips__)
+ #if defined(__ANDROID__)
+         for (int i = EF_R0; i <= EF_R31; i++)
+           info.mcontext.gregs[i - EF_R0] = status->pr_reg[i];
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper.cc
+@@ -765,7 +765,9 @@ bool LinuxDumper::GetStackInfo(const voi
+       reinterpret_cast<uint8_t*>(int_stack_pointer & ~(page_size - 1));
+ 
+   // The number of bytes of stack which we try to capture.
+-  static const ptrdiff_t kStackToCapture = 32 * 1024;
++  // This now depends on page_size to avoid missing data
++  // on systems with larger page sizes.
++  static const ptrdiff_t kStackToCapture = 8 * page_size;
+ 
+   const MappingInfo* mapping = FindMapping(stack_pointer);
+   if (!mapping)
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper.h
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper.h
+@@ -63,7 +63,8 @@ namespace google_breakpad {
+  (defined(__mips__) && _MIPS_SIM == _ABIO32)
+ typedef Elf32_auxv_t elf_aux_entry;
+ #elif defined(__x86_64) || defined(__aarch64__) || \
+-     (defined(__mips__) && _MIPS_SIM != _ABIO32)
++     (defined(__mips__) && _MIPS_SIM != _ABIO32) || \
++     defined(__powerpc64__)
+ typedef Elf64_auxv_t elf_aux_entry;
+ #endif
+ 
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper_unittest_helper.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper_unittest_helper.cc
+@@ -51,6 +51,8 @@
+ #define TID_PTR_REGISTER "rcx"
+ #elif defined(__mips__)
+ #define TID_PTR_REGISTER "$1"
++#elif defined(__powerpc64__)
++#define TID_PTR_REGISTER "r8"
+ #else
+ #error This test has not been ported to this platform.
+ #endif
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper.cc
+@@ -154,19 +154,27 @@ bool LinuxPtraceDumper::CopyFromProcess(
+   return true;
+ }
+ 
+-bool LinuxPtraceDumper::ReadRegisterSet(ThreadInfo* info, pid_t tid)
+-{
++bool LinuxPtraceDumper::ReadRegisterSet(ThreadInfo* info, pid_t tid) {
+ #ifdef PTRACE_GETREGSET
+   struct iovec io;
+   info->GetGeneralPurposeRegisters(&io.iov_base, &io.iov_len);
+-  if (sys_ptrace(PTRACE_GETREGSET, tid, (void*)NT_PRSTATUS, (void*)&io) == -1) {
++  if (ptrace(PTRACE_GETREGSET, tid, (void*)NT_PRSTATUS, (void*)&io) == -1) {
+     return false;
+   }
+ 
+   info->GetFloatingPointRegisters(&io.iov_base, &io.iov_len);
+-  if (sys_ptrace(PTRACE_GETREGSET, tid, (void*)NT_FPREGSET, (void*)&io) == -1) {
++  if (ptrace(PTRACE_GETREGSET, tid, (void*)NT_FPREGSET, (void*)&io) == -1) {
+     return false;
+   }
++
++#if defined(__powerpc64__)
++  // Grab the vector registers on PPC64 too
++  info->GetVectorRegisters(&io.iov_base, &io.iov_len);
++  if (ptrace(PTRACE_GETREGSET, tid, (void*)NT_PPC_VMX, (void*)&io) == -1) {
++    return false;
++  }
++#endif // defined(__powerpc64__)
++
+   return true;
+ #else
+   return false;
+@@ -303,6 +311,9 @@ bool LinuxPtraceDumper::GetThreadInfoByI
+ #elif defined(__mips__)
+   stack_pointer =
+       reinterpret_cast<uint8_t*>(info->mcontext.gregs[MD_CONTEXT_MIPS_REG_SP]);
++#elif defined(__powerpc64__)
++  stack_pointer =
++      reinterpret_cast<uint8_t*>(info->mcontext.gp_regs[MD_CONTEXT_PPC64_REG_SP]);
+ #else
+ #error "This code hasn't been ported to your platform yet."
+ #endif
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper_unittest.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper_unittest.cc
+@@ -462,6 +462,9 @@ TEST(LinuxPtraceDumperTest, VerifyStackR
+ #elif defined(__mips__)
+     pid_t* process_tid_location =
+         reinterpret_cast<pid_t*>(one_thread.mcontext.gregs[1]);
++#elif defined(__powerpc64__)
++    pid_t* process_tid_location =
++        reinterpret_cast<pid_t*>(one_thread.mcontext.gp_regs[8]);
+ #else
+ #error This test has not been ported to this platform.
+ #endif
+@@ -559,6 +562,8 @@ TEST_F(LinuxPtraceDumperTest, SanitizeSt
+   uintptr_t heap_addr = thread_info.regs.rcx;
+ #elif defined(__mips__)
+   uintptr_t heap_addr = thread_info.mcontext.gregs[1];
++#elif defined(__powerpc64__)
++  uintptr_t heap_addr = thread_info.mcontext.gp_regs[8];
+ #else
+ #error This test has not been ported to this platform.
+ #endif
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.cc
+@@ -136,7 +136,9 @@ class MinidumpWriter {
+       : fd_(minidump_fd),
+         path_(minidump_path),
+         ucontext_(context ? &context->context : NULL),
+-#if !defined(__ARM_EABI__) && !defined(__mips__)
++#if defined(__powerpc64__)
++        vector_state_(context ? &context->vector_state : NULL),
++#elif !defined(__ARM_EABI__) && !defined(__mips__)
+         float_state_(context ? &context->float_state : NULL),
+ #endif
+         dumper_(dumper),
+@@ -468,7 +470,9 @@ class MinidumpWriter {
+         if (!cpu.Allocate())
+           return false;
+         my_memset(cpu.get(), 0, sizeof(RawContextCPU));
+-#if !defined(__ARM_EABI__) && !defined(__mips__)
++#if defined(__powerpc64__)
++        UContextReader::FillCPUContext(cpu.get(), ucontext_, vector_state_);
++#elif !defined(__ARM_EABI__) && !defined(__mips__)
+         UContextReader::FillCPUContext(cpu.get(), ucontext_, float_state_);
+ #else
+         UContextReader::FillCPUContext(cpu.get(), ucontext_);
+@@ -897,7 +901,7 @@ class MinidumpWriter {
+     dirent->location.rva = 0;
+   }
+ 
+-#if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
++#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || defined(__powerpc64__)
+   bool WriteCPUInformation(MDRawSystemInfo* sys_info) {
+     char vendor_id[sizeof(sys_info->cpu.x86_cpu_info.vendor_id) + 1] = {0};
+     static const char vendor_id_name[] = "vendor_id";
+@@ -917,7 +921,9 @@ class MinidumpWriter {
+ 
+     // processor_architecture should always be set, do this first
+     sys_info->processor_architecture =
+-#if defined(__mips__)
++#if defined(__powerpc64__)
++        MD_CPU_ARCHITECTURE_PPC64;
++#elif defined(__mips__)
+ # if _MIPS_SIM == _ABIO32
+         MD_CPU_ARCHITECTURE_MIPS;
+ # elif _MIPS_SIM == _ABI64
+@@ -1333,7 +1339,9 @@ class MinidumpWriter {
+   const char* path_;  // Path to the file where the minidum should be written.
+ 
+   const ucontext_t* const ucontext_;  // also from the signal handler
+-#if !defined(__ARM_EABI__) && !defined(__mips__)
++#if defined(__powerpc64__)
++  const google_breakpad::vstate_t* const vector_state_;
++#elif !defined(__ARM_EABI__) && !defined(__mips__)
+   const google_breakpad::fpstate_t* const float_state_;  // ditto
+ #endif
+   LinuxDumper* dumper_;
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.h
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.h
+@@ -48,6 +48,8 @@ class ExceptionHandler;
+ 
+ #if defined(__aarch64__)
+ typedef struct fpsimd_context fpstate_t;
++#elif defined(__powerpc64__)
++typedef vrregset_t vstate_t;
+ #elif !defined(__ARM_EABI__) && !defined(__mips__)
+ typedef std::remove_pointer<fpregset_t>::type fpstate_t;
+ #endif
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer_unittest.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer_unittest.cc
+@@ -715,6 +715,12 @@ TEST(MinidumpWriterTest, InvalidStackPoi
+ #elif defined(__mips__)
+   context.context.uc_mcontext.gregs[MD_CONTEXT_MIPS_REG_SP] =
+       invalid_stack_pointer;
++#elif defined(__powerpc64__)
++  context.context.uc_mcontext.gp_regs[MD_CONTEXT_PPC64_REG_SP] =
++      invalid_stack_pointer;
++#elif defined(__powerpc64__)
++  context.context.uc_mcontext.gp_regs[MD_CONTEXT_PPC64_REG_SP] =
++      invalid_stack_pointer;
+ #else
+ # error "This code has not been ported to your platform yet."
+ #endif
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/common/linux/memory_mapped_file.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/common/linux/memory_mapped_file.cc
+@@ -65,8 +65,7 @@ bool MemoryMappedFile::Map(const char* p
+   }
+ 
+ #if defined(__x86_64__) || defined(__aarch64__) || \
+-   (defined(__mips__) && _MIPS_SIM == _ABI64)
+-
++   (defined(__mips__) && _MIPS_SIM == _ABI64) || defined(__powerpc64__)
+   struct kernel_stat st;
+   if (sys_fstat(fd, &st) == -1 || st.st_size < 0) {
+ #else
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/common/linux/memory_mapped_file_unittest.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/common/linux/memory_mapped_file_unittest.cc
+@@ -176,9 +176,10 @@ TEST_F(MemoryMappedFileTest, RemapAfterM
+ TEST_F(MemoryMappedFileTest, MapWithOffset) {
+   // Put more data in the test file this time. Offsets can only be
+   // done on page boundaries, so we need a two page file to test this.
+-  const int page_size = 4096;
+-  char data1[2 * page_size];
+-  size_t data1_size = sizeof(data1);
++  const int page_size = getpagesize();
++  char *data1 = static_cast<char*>(malloc(2 * page_size));
++  EXPECT_TRUE(data1 != NULL);
++  size_t data1_size = (2 * page_size);
+   for (size_t i = 0; i < data1_size; ++i) {
+     data1[i] = i & 0x7f;
+   }
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/common/memory_allocator_unittest.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/common/memory_allocator_unittest.cc
+@@ -57,8 +57,9 @@ TEST(PageAllocatorTest, LargeObject) {
+ 
+   EXPECT_EQ(0U, allocator.pages_allocated());
+   uint8_t* p = reinterpret_cast<uint8_t*>(allocator.Alloc(10000));
++  uint64_t expected_pages = 1 + ((10000 - 1) / getpagesize());
+   ASSERT_FALSE(p == NULL);
+-  EXPECT_EQ(3U, allocator.pages_allocated());
++  EXPECT_EQ(expected_pages, allocator.pages_allocated());
+   for (unsigned i = 1; i < 10; ++i) {
+     uint8_t* p = reinterpret_cast<uint8_t*>(allocator.Alloc(i));
+     ASSERT_FALSE(p == NULL);
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/processor/exploitability_linux.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/processor/exploitability_linux.cc
+@@ -202,12 +202,14 @@ bool ExploitabilityLinux::EndedOnIllegal
+   // Check architecture and set architecture variable to corresponding flag
+   // in objdump.
+   switch (context->GetContextCPU()) {
++#if defined(__i386) || defined(__x86_64)
+     case MD_CONTEXT_X86:
+       architecture = "i386";
+       break;
+     case MD_CONTEXT_AMD64:
+       architecture = "i386:x86-64";
+       break;
++#endif
+     default:
+       // Unsupported architecture. Note that ARM architectures are not
+       // supported because objdump does not support ARM.
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/processor/exploitability_unittest.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/processor/exploitability_unittest.cc
+@@ -104,6 +104,8 @@ ExploitabilityFor(const string& filename
+ }
+ 
+ TEST(ExploitabilityTest, TestWindowsEngine) {
++// The following tests are only executable on an x86-class linux machine.
++#if !defined(_WIN32) && (defined(__i386) || defined(__x86_64))
+   ASSERT_EQ(google_breakpad::EXPLOITABILITY_HIGH,
+             ExploitabilityFor("ascii_read_av.dmp"));
+   ASSERT_EQ(google_breakpad::EXPLOITABILITY_HIGH,
+@@ -136,9 +138,12 @@ TEST(ExploitabilityTest, TestWindowsEngi
+             ExploitabilityFor("read_av_clobber_write.dmp"));
+   ASSERT_EQ(google_breakpad::EXPLOITABILITY_LOW,
+             ExploitabilityFor("read_av_conditional.dmp"));
++#endif
+ }
+ 
+ TEST(ExploitabilityTest, TestLinuxEngine) {
++// The following tests are only executable on an x86-class linux machine.
++#if defined(__i386) || defined(__x86_64)
+   ASSERT_EQ(google_breakpad::EXPLOITABILITY_INTERESTING,
+             ExploitabilityFor("linux_null_read_av.dmp"));
+   ASSERT_EQ(google_breakpad::EXPLOITABILITY_HIGH,
+@@ -171,7 +176,8 @@ TEST(ExploitabilityTest, TestLinuxEngine
+             ExploitabilityFor("linux_executable_heap.dmp"));
+   ASSERT_EQ(google_breakpad::EXPLOITABILITY_HIGH,
+             ExploitabilityFor("linux_jmp_to_module_not_exe_region.dmp"));
+-#ifndef _WIN32
++#endif
++#if !defined(_WIN32) && (defined(__i386) || defined(__x86_64))
+   ASSERT_EQ(google_breakpad::EXPLOITABILITY_HIGH,
+             ExploitabilityFor("linux_write_to_nonwritable_module.dmp"));
+   ASSERT_EQ(google_breakpad::EXPLOITABILITY_HIGH,
+@@ -182,10 +188,10 @@ TEST(ExploitabilityTest, TestLinuxEngine
+             ExploitabilityFor("linux_write_to_outside_module_via_math.dmp"));
+   ASSERT_EQ(google_breakpad::EXPLOITABILITY_INTERESTING,
+             ExploitabilityFor("linux_write_to_under_4k.dmp"));
+-#endif  // _WIN32
++#endif  // !defined(_WIN32) && (!defined(__i386) && !defined(__x86_64))
+ }
+ 
+-#ifndef _WIN32
++#if !defined(_WIN32) && (defined(__i386) || defined(__x86_64))
+ TEST(ExploitabilityLinuxUtilsTest, DisassembleBytesTest) {
+   ASSERT_FALSE(ExploitabilityLinuxTest::DisassembleBytes("", NULL, 5, NULL));
+   uint8_t bytes[6] = {0xc7, 0x0, 0x5, 0x0, 0x0, 0x0};
+@@ -301,6 +307,7 @@ TEST(ExploitabilityLinuxUtilsTest, Calcu
+                                                          context,
+                                                          &write_address));
+ }
+-#endif  // _WIN32
++#endif  // !defined(_WIN32) && (defined(__i386) || defined(__x86_64))
++
+ 
+ }  // namespace
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/tools/linux/md2core/minidump-2-core.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/tools/linux/md2core/minidump-2-core.cc
+@@ -77,6 +77,8 @@
+   #define ELF_ARCH  EM_MIPS
+ #elif defined(__aarch64__)
+   #define ELF_ARCH  EM_AARCH64
++#elif defined(__powerpc64__)
++  #define ELF_ARCH  EM_PPC64
+ #endif
+ 
+ #if defined(__arm__)
+@@ -87,6 +89,8 @@ typedef user_regs user_regs_struct;
+ #elif defined (__mips__)
+ // This file-local typedef simplifies the source code.
+ typedef gregset_t user_regs_struct;
++#elif defined(__powerpc64__)
++typedef struct pt_regs user_regs_struct;
+ #endif
+ 
+ using google_breakpad::MDTypeHelper;
+@@ -322,6 +326,12 @@ struct CrashedProcess {
+ #if defined(__aarch64__)
+     user_fpsimd_struct fpregs;
+ #endif
++#if defined(__powerpc64__)
++    mcontext_t mcontext;
++#endif
++#if defined(__powerpc64__)
++    mcontext_t mcontext;
++#endif
+     uintptr_t stack_addr;
+     const uint8_t* stack;
+     size_t stack_length;
+@@ -535,6 +545,38 @@ ParseThreadRegisters(CrashedProcess::Thr
+   thread->mcontext.fpc_eir = rawregs->float_save.fir;
+ #endif
+ }
++#elif defined(__powerpc64__)
++static void
++ParseThreadRegisters(CrashedProcess::Thread* thread,
++                     const MinidumpMemoryRange& range) {
++  const MDRawContextPPC64* rawregs = range.GetData<MDRawContextPPC64>(0);
++
++  for (int i = 0; i < MD_CONTEXT_PPC64_GPR_COUNT; i++)
++    thread->mcontext.gp_regs[i] = rawregs->gpr[i];
++
++  thread->mcontext.gp_regs[PT_LNK] = rawregs->lr;
++  thread->mcontext.gp_regs[PT_NIP] = rawregs->srr0;
++  thread->mcontext.gp_regs[PT_MSR] = rawregs->srr1;
++  thread->mcontext.gp_regs[PT_CCR] = rawregs->cr;
++  thread->mcontext.gp_regs[PT_XER] = rawregs->xer;
++  thread->mcontext.gp_regs[PT_CTR] = rawregs->ctr;
++  thread->mcontext.v_regs->vrsave = rawregs->vrsave;
++
++  for (int i = 0; i < MD_FLOATINGSAVEAREA_PPC_FPR_COUNT; i++)
++      thread->mcontext.fp_regs[i] = rawregs->float_save.fpregs[i];
++
++  thread->mcontext.fp_regs[NFPREG-1] = rawregs->float_save.fpscr;
++
++  for (int i = 0; i < MD_VECTORSAVEAREA_PPC_VR_COUNT; i++) {
++      thread->mcontext.v_regs->vrregs[i][0] = rawregs->vector_save.save_vr[i].high >> 32;
++      thread->mcontext.v_regs->vrregs[i][1] = rawregs->vector_save.save_vr[i].high;
++      thread->mcontext.v_regs->vrregs[i][2] = rawregs->vector_save.save_vr[i].low >> 32;
++      thread->mcontext.v_regs->vrregs[i][3] = rawregs->vector_save.save_vr[i].low;
++  }
++
++  thread->mcontext.v_regs->vscr.vscr_word = rawregs->vector_save.save_vscr.low & 0xFFFFFFFF;
++}
++
+ #else
+ #error "This code has not been ported to your platform yet"
+ #endif
+@@ -623,6 +665,12 @@ ParseSystemInfo(const Options& options,
+ # else
+ #  error "This mips ABI is currently not supported (n32)"
+ # endif
++#elif defined(__powerpc64__)
++  if (sysinfo->processor_architecture != MD_CPU_ARCHITECTURE_PPC64) {
++    fprintf(stderr,
++            "This version of minidump-2-core only supports PPC64.\n");
++    exit(1);
++  }
+ #else
+ #error "This code has not been ported to your platform yet"
+ #endif
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/CONTRIBUTORS
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/CONTRIBUTORS
+@@ -13,3 +13,4 @@ Mark Mentovai <mark@chromium.org>
+ Robert Sesek <rsesek@chromium.org>
+ Scott Graham <scottmg@chromium.org>
+ Joshua Peraza <jperaza@chromium.org>
++Shawn Anastasio <shawn@anastas.io>
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/compat/linux/sys/user.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/compat/linux/sys/user.h
+@@ -15,6 +15,7 @@
+ #ifndef CRASHPAD_COMPAT_LINUX_SYS_USER_H_
+ #define CRASHPAD_COMPAT_LINUX_SYS_USER_H_
+ 
++#include <cstddef>
+ #include_next <sys/user.h>
+ 
+ #include <features.h>
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/minidump/minidump_context.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/minidump/minidump_context.h
+@@ -592,6 +592,70 @@ struct MinidumpContextMIPS64 {
+   uint64_t fir;
+ };
+ 
++//! \brief ppc64-specific flags for MinidumpPPC64::context_flags
++//! Based on minidump_cpu_ppc64.h from breakpad
++enum MinidumpContextPPC64Flags : uint32_t {
++  //! \brief Identifies the context as PPC64.
++  kMinidumpContextPPC64 = 0x01000000,
++
++  //! \brief Indicates the validity of general purpose registers.
++  //!
++  //! Registers `r0`-`r31`, `nip`, `msr`, `lr`, etc. are valid.
++  kMinidumpContextPPC64Base = kMinidumpContextPPC64 | 0x00000001,
++
++  //! \brief Indicates the validity of floating point registers.
++  //!
++  //! Registers `fp0`-`fp31`, `fpscr` are valid.
++  kMinidumpContextPPC64Floating = kMinidumpContextPPC64 | 0x00000008,
++
++  //! \brief Indicates the validity of Altivec/VMX registers.
++  //!
++  //! Registers `v0`-`v31`, `vscr`, `vrsave`.
++  kMinidumpContextPPC64Vector = kMinidumpContextPPC64 | 0x00000020,
++
++  //! \brief Indicates the validity of all registers
++  kMinidumpContextPPC64All = kMinidumpContextPPC64Base     |
++                             kMinidumpContextPPC64Floating |
++                             kMinidumpContextPPC64Vector
++};
++
++//! \brief A PPC64 CPU context carried in a minidump file.
++//! Based on minidump_cpu_ppc64.h from breakpad.
++struct MinidumpContextPPC64 {
++  uint64_t context_flags;
++
++  //! \brief General purpose registers.
++  uint64_t nip;
++  uint64_t msr;
++  uint64_t regs[32];
++  uint64_t ccr;
++  uint64_t xer;
++  uint64_t lnk;
++  uint64_t ctr;
++
++  //! \brief Floating point registers.
++  double fpregs[32];
++
++  //! \brief FPU status register.
++  double fpscr;
++
++  //! \brief Altivec/VMX vector registers.
++  struct {
++      //! \brief Vector registers are 128bits.
++      uint128_struct save_vr[32];
++      uint128_struct save_vscr;
++
++      //! \brief Padding included for breakpad compatibiltiy.
++      uint32_t save_pad5[4];
++
++      //! \brief VRSAVE register.
++      uint32_t save_vrsave;
++
++      //! \brief Padding included for breakpad compatibiltiy.
++      uint32_t save_pad6[7];
++  } vregs;
++};
++
+ }  // namespace crashpad
+ 
+ #endif  // CRASHPAD_MINIDUMP_MINIDUMP_CONTEXT_H_
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/minidump/minidump_context_writer.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/minidump/minidump_context_writer.cc
+@@ -101,6 +101,13 @@ MinidumpContextWriter::CreateFromSnapsho
+       break;
+     }
+ 
++    case kCPUArchitecturePPC64: {
++      context = std::make_unique<MinidumpContextPPC64Writer>();
++      reinterpret_cast<MinidumpContextPPC64Writer*>(context.get())
++          ->InitalizeFromSnapshot(context_snapshot->ppc64);
++      break;
++    }
++
+     default: {
+       LOG(ERROR) << "unknown context architecture "
+                  << context_snapshot->architecture;
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/minidump/minidump_context_writer.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/minidump/minidump_context_writer.h
+@@ -315,6 +315,45 @@ class MinidumpContextMIPS64Writer final
+   DISALLOW_COPY_AND_ASSIGN(MinidumpContextMIPS64Writer);
+ };
+ 
++class MinidumpContextPPC64Writer final : public MinidumpContextWriter {
++ public:
++  MinidumpContextPPC64Writer();
++  ~MinidumpContextPPC64Writer() override;
++
++  //! \brief Initalizes the MinidumpContextPPC64 based on \a context_snapshot.
++  //!
++  //! \param[in] context_snapshot The context snapshot to use as source data.
++  //!
++  //! \note Valid in #kStateMutable. No mutation of context() may be done before
++  //!     calling this method, and it is not normally necessary to alter
++  //!     context() after calling this method.
++  void InitalizeFromSnapshot(const CPUContextPPC64* context_snapshot);
++
++  //! \brief Returns a pointer to the context structure that this object will
++  //!     write.
++  //!
++  //! \attention This returns a non-`const` pointer to this object’s private
++  //!     data so that a caller can populate the context structure directly.
++  //!     This is done because providing setter interfaces to each field in the
++  //!     context structure would be unwieldy and cumbersome. Care must be taken
++  //!     to populate the context structure correctly. The context structure
++  //!     must only be modified while this object is in the #kStateMutable
++  //!     state.
++  MinidumpContextPPC64* context() { return &context_; }
++
++ protected:
++  // MinidumpWritable:
++  bool WriteObject(FileWriterInterface* file_writer) override;
++
++  // MinidumpContextWriter:
++  size_t ContextSize() const override;
++
++ private:
++  MinidumpContextPPC64 context_;
++
++  DISALLOW_COPY_AND_ASSIGN(MinidumpContextPPC64Writer);
++};
++
+ }  // namespace crashpad
+ 
+ #endif  // CRASHPAD_MINIDUMP_MINIDUMP_CONTEXT_WRITER_H_
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/minidump/minidump_context_writer_test.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/minidump/minidump_context_writer_test.cc
+@@ -213,6 +213,21 @@ TEST(MinidumpContextWriter, MIPS64_FromS
+       context, ExpectMinidumpContextMIPS64, kSeed);
+ }
+ 
++TEST(MinidumpContextWriter, PPC64_Zeros) {
++  EmptyContextTest<MinidumpContextPPC64Writer, MinidumpContextPPC64>(
++    ExpectMinidumpContextPPC64);
++}
++
++TEST(MinidumpContextWriter, PPC64_FromSnapshot) {
++  constexpr uint32_t kSeed = 64;
++  CPUContextPPC64 context_ppc64;
++  CPUContext context;
++  context.ppc64 = &context_ppc64;
++  InitializeCPUContextPPC64(&context, kSeed);
++  FromSnapshotTest<MinidumpContextPPC64Writer, MinidumpContextPPC64>(
++      context, ExpectMinidumpContextPPC64, kSeed);
++}
++
+ }  // namespace
+ }  // namespace test
+ }  // namespace crashpad
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/minidump/minidump_misc_info_writer.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/minidump/minidump_misc_info_writer.cc
+@@ -135,6 +135,8 @@ std::string MinidumpMiscInfoDebugBuildSt
+   static constexpr char kCPU[] = "mips";
+ #elif defined(ARCH_CPU_MIPS64EL)
+   static constexpr char kCPU[] = "mips64";
++#elif defined(ARCH_CPU_PPC64)
++  static constexpr char kCPU[] = "ppc64";
+ #else
+ #error define kCPU for this CPU
+ #endif
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/capture_memory.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/capture_memory.cc
+@@ -112,6 +112,11 @@ void CaptureMemory::PointedToByContext(c
+   for (size_t i = 0; i < base::size(context.mipsel->regs); ++i) {
+     MaybeCaptureMemoryAround(delegate, context.mipsel->regs[i]);
+   }
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++  MaybeCaptureMemoryAround(delegate, context.ppc64->nip);
++  for (size_t i = 0; i < base::size(context.ppc64->regs); ++i) {
++    MaybeCaptureMemoryAround(delegate, context.ppc64->regs[i]);
++  }
+ #else
+ #error Port.
+ #endif
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/cpu_architecture.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/cpu_architecture.h
+@@ -43,7 +43,10 @@ enum CPUArchitecture {
+   kCPUArchitectureMIPSEL,
+ 
+   //! \brief 64-bit MIPSEL.
+-  kCPUArchitectureMIPS64EL
++  kCPUArchitectureMIPS64EL,
++
++  //! \brief 64-bit PPC64.
++  kCPUArchitecturePPC64
+ };
+ 
+ }  // namespace crashpad
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/cpu_context.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/cpu_context.cc
+@@ -169,6 +169,8 @@ uint64_t CPUContext::InstructionPointer(
+       return arm->pc;
+     case kCPUArchitectureARM64:
+       return arm64->pc;
++    case kCPUArchitecturePPC64:
++      return ppc64->nip;
+     default:
+       NOTREACHED();
+       return ~0ull;
+@@ -185,6 +187,8 @@ uint64_t CPUContext::StackPointer() cons
+       return arm->sp;
+     case kCPUArchitectureARM64:
+       return arm64->sp;
++    case kCPUArchitecturePPC64:
++      return ppc64->regs[1];
+     default:
+       NOTREACHED();
+       return ~0ull;
+@@ -196,6 +200,7 @@ bool CPUContext::Is64Bit() const {
+     case kCPUArchitectureX86_64:
+     case kCPUArchitectureARM64:
+     case kCPUArchitectureMIPS64EL:
++    case kCPUArchitecturePPC64:
+       return true;
+     case kCPUArchitectureX86:
+     case kCPUArchitectureARM:
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/cpu_context.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/cpu_context.h
+@@ -352,6 +352,24 @@ struct CPUContextMIPS64 {
+   uint64_t fir;
+ };
+ 
++//! \brief A context structure carrying PPC64 CPU state.
++struct CPUContextPPC64 {
++  uint64_t nip;
++  uint64_t msr;
++  uint64_t regs[32];
++  uint64_t ccr;
++  uint64_t xer;
++  uint64_t lnk;
++  uint64_t ctr;
++  double fpregs[32];
++  double fpscr;
++  struct {
++    uint128_struct save_vr[32];
++    uint128_struct save_vscr;
++    uint32_t save_vrsave;
++  } vregs;
++};
++
+ //! \brief A context structure capable of carrying the context of any supported
+ //!     CPU architecture.
+ struct CPUContext {
+@@ -382,6 +400,7 @@ struct CPUContext {
+     CPUContextARM64* arm64;
+     CPUContextMIPS* mipsel;
+     CPUContextMIPS64* mips64;
++    CPUContextPPC64* ppc64;
+   };
+ };
+ 
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/cpu_context_linux.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/cpu_context_linux.h
+@@ -15,6 +15,7 @@
+ #ifndef CRASHPAD_SNAPSHOT_LINUX_CPU_CONTEXT_LINUX_H_
+ #define CRASHPAD_SNAPSHOT_LINUX_CPU_CONTEXT_LINUX_H_
+ 
++#include <cstring>
+ #include "build/build_config.h"
+ #include "snapshot/cpu_context.h"
+ #include "snapshot/linux/signal_context.h"
+@@ -174,6 +175,76 @@ void InitializeCPUContextMIPS(
+ 
+ #endif  // ARCH_CPU_MIPS_FAMILY || DOXYGEN
+ 
++#if defined(ARCH_CPU_PPC64_FAMILY) || DOXYGEN
++
++//! \brief Initalizes a CPUContextPPC64 structure from native context
++//!     structures on Linux.
++//!
++//! \param[in] thread_context The native thread context.
++//! \param[in] float_context The native float context.
++//! \param[in] vector_context The native vector context.
++//! \param[out] context The CPUContextPPC64 structure to initalize.
++template <typename Traits>
++void InitializeCPUContextPPC64(
++    const ThreadContext::t64_t& thread_context,
++    const FloatContext::f64_t& float_context,
++    const VectorContext::v64_t& vector_context,
++    typename Traits::CPUContext* context) {
++
++  memcpy(context->regs, thread_context.gpr, sizeof(context->regs));
++  context->nip = thread_context.nip;
++  context->msr = thread_context.msr;
++  context->ccr = thread_context.ccr;
++  context->xer = thread_context.xer;
++  context->lnk = thread_context.lnk;
++  context->ctr = thread_context.ctr;
++
++  memcpy(context->fpregs, float_context.fpregs, sizeof(context->fpregs));
++  context->fpscr = float_context.fpscr;
++
++  for (uint8_t i = 0; i < 32; i++) {
++    context->vregs.save_vr[i] = {
++      (((uint64_t)vector_context.vrregs[i][0]) << 32) |
++        vector_context.vrregs[i][1],
++      (((uint64_t)vector_context.vrregs[i][2]) << 32) |
++        vector_context.vrregs[i][3]
++    };
++  }
++  context->vregs.save_vrsave = vector_context.vrsave;
++  context->vregs.save_vscr = {0, (uint64_t)vector_context.vscr.vscr_word};
++}
++
++template <typename Traits>
++void InitializeCPUContextPPC64(
++    const SignalThreadContext64 &thread_context,
++    const SignalFloatContext64 &float_context,
++    const SignalVectorContext64 &vector_context,
++    typename Traits::CPUContext* context) {
++
++  memcpy(context->regs, thread_context.regs, sizeof(context->regs));
++  context->nip = thread_context.nip;
++  context->msr = thread_context.msr;
++  context->ccr = thread_context.ccr;
++  context->xer = thread_context.xer;
++  context->lnk = thread_context.lnk;
++  context->ctr = thread_context.ctr;
++
++  memcpy(context->fpregs, float_context.regs, sizeof(context->fpregs));
++  context->fpscr = float_context.fpscr;
++
++  for (uint8_t i = 0; i < 32; i++) {
++    context->vregs.save_vr[i] = {
++      (((uint64_t)vector_context.vrregs[i][0]) << 32) |
++        vector_context.vrregs[i][1],
++      (((uint64_t)vector_context.vrregs[i][2]) << 32) |
++        vector_context.vrregs[i][3]
++    };
++  }
++  context->vregs.save_vrsave = vector_context.vrsave;
++  context->vregs.save_vscr = {0, (uint64_t)vector_context.vscr.vscr_word};
++}
++
++#endif
+ }  // namespace internal
+ }  // namespace crashpad
+ 
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/debug_rendezvous_test.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/debug_rendezvous_test.cc
+@@ -192,6 +192,8 @@ void TestAgainstTarget(PtraceConnection*
+               device == 0 && inode == 0 && mapping_name == "[vdso]";
+ #if defined(ARCH_CPU_X86)
+           static constexpr char kPrefix[] = "linux-gate.so.";
++#elif defined(ARCH_CPU_PPC64)
++          static constexpr char kPrefix[] = "linux-vdso64.so.";
+ #else
+           static constexpr char kPrefix[] = "linux-vdso.so.";
+ #endif
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux.cc
+@@ -323,6 +323,69 @@ bool ExceptionSnapshotLinux::ReadContext
+       reader, context_address, context_.mips64);
+ }
+ 
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++
++template <typename Traits>
++static bool ReadContext(ProcessReaderLinux* reader,
++                        LinuxVMAddress context_address,
++                        typename Traits::CPUContext* dest_context) {
++  const ProcessMemory* memory = reader->Memory();
++
++  LinuxVMAddress gp_regs_address = context_address +
++                                   offsetof(UContext, mcontext) +
++                                   offsetof(typename Traits::MContext, gp_regs);
++
++  typename Traits::SignalThreadContext thread_context;
++  if (!memory->Read(gp_regs_address, sizeof(thread_context), &thread_context)) {
++    LOG(ERROR) << "Couldn't read gp_regs!";
++    return false;
++  }
++
++  LinuxVMAddress fp_regs_address = context_address +
++                                   offsetof(UContext, mcontext) +
++                                   offsetof(typename Traits::MContext, fp_regs);
++
++  typename Traits::SignalFloatContext fp_context;
++  if (!memory->Read(fp_regs_address, sizeof(fp_context), &fp_context)) {
++    LOG(ERROR) << "Couldn't read fp_regs!";
++    return false;
++  }
++
++  LinuxVMAddress v_regs_ptr_address = context_address +
++                                  offsetof(UContext, mcontext) +
++                                  offsetof(typename Traits::MContext, vmx_reserve) + 8;
++
++  typename Traits::SignalVectorContext v_context;
++  if (!memory->Read(v_regs_ptr_address, sizeof(v_context), &v_context)) {
++    LOG(ERROR) << "Couldn't read v_regs!";
++    return false;
++  }
++
++  InitializeCPUContextPPC64<ContextTraits64>(thread_context, fp_context,
++                            v_context, dest_context);
++
++  return true;
++}
++
++template<>
++bool ExceptionSnapshotLinux::ReadContext<ContextTraits64>(
++    ProcessReaderLinux* reader,
++    LinuxVMAddress context_address) {
++  context_.architecture = kCPUArchitecturePPC64;
++  context_.ppc64 = &context_union_.ppc64;
++
++  return internal::ReadContext<ContextTraits64>(
++      reader, context_address, context_.ppc64);
++}
++
++template<>
++bool ExceptionSnapshotLinux::ReadContext<ContextTraits32>(
++    ProcessReaderLinux* reader,
++    LinuxVMAddress context_address) {
++  // PPC64 is 64-bit
++  return false;
++}
++
+ #endif  // ARCH_CPU_X86_FAMILY
+ 
+ bool ExceptionSnapshotLinux::Initialize(ProcessReaderLinux* process_reader,
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux.h
+@@ -84,6 +84,8 @@ class ExceptionSnapshotLinux final : pub
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+     CPUContextMIPS mipsel;
+     CPUContextMIPS64 mips64;
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++    CPUContextPPC64 ppc64;
+ #endif
+   } context_union_;
+   CPUContext context_;
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux_test.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux_test.cc
+@@ -296,7 +296,28 @@ void ExpectContext(const CPUContext& act
+             0);
+ #undef CPU_ARCH_NAME
+ }
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++using NativeCPUContext = ucontext_t;
+ 
++void InitializeContext(NativeCPUContext* context) {
++  for (size_t reg = 0; reg < 32; ++reg) {
++    context->uc_mcontext.gp_regs[reg] = reg;
++  }
++
++  memset(&context->uc_mcontext.fp_regs, 44,
++      sizeof(context->uc_mcontext.fp_regs));
++}
++
++void ExpectContext(const CPUContext& actual, const NativeCPUContext& expected) {
++  EXPECT_EQ(actual.architecture, kCPUArchitecturePPC64);
++
++  for (size_t reg = 0; reg < 32; ++reg) {
++    EXPECT_EQ(actual.ppc64->regs[reg], expected.uc_mcontext.gp_regs[reg]);
++  }
++
++  EXPECT_EQ(memcmp(actual.ppc64->fpregs, expected.uc_mcontext.fp_regs,
++            sizeof(actual.ppc64->fpregs)), 0);
++}
+ #else
+ #error Port.
+ #endif
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/process_reader_linux.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/process_reader_linux.cc
+@@ -108,6 +108,8 @@ void ProcessReaderLinux::Thread::Initial
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+   stack_pointer = reader->Is64Bit() ? thread_info.thread_context.t64.regs[29]
+                                     : thread_info.thread_context.t32.regs[29];
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++  stack_pointer = thread_info.thread_context.t64.gpr[1];
+ #else
+ #error Port.
+ #endif
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/signal_context.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/signal_context.h
+@@ -422,6 +422,93 @@ static_assert(offsetof(UContext<ContextT
+               "context offset mismatch");
+ #endif
+ 
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++
++struct SignalThreadContext64 {
++  uint64_t regs[32];
++  uint64_t nip;
++  uint64_t msr;
++  uint64_t orig_r3;
++  uint64_t ctr;
++  uint64_t lnk;
++  uint64_t xer;
++  uint64_t ccr;
++  uint64_t softe;
++  uint64_t trap;
++  uint64_t dar;
++  uint64_t dsisr;
++  uint64_t result;
++  uint64_t dscr;
++  uint64_t fpr0[3];
++};
++
++struct SignalFloatContext64 {
++  double regs[32];
++  double fpscr;
++};
++
++struct SignalVectorContext64 {
++  int32_t vrregs[32][4];
++  struct {
++    int32_t __pad[3];
++    int32_t vscr_word;
++  } vscr;
++  int32_t vrsave;
++  int32_t __pad[3];
++} __attribute__((__aligned__(16)));
++
++
++#pragma pack(pop)
++struct MContext64 {
++  uint64_t reserved[4];
++  int32_t signal;
++  int32_t __pad0;
++  uint64_t handler;
++  uint64_t oldmask;
++  uint64_t pt_regs_ptr;
++  SignalThreadContext64 gp_regs;
++  SignalFloatContext64  fp_regs;
++  SignalVectorContext64 *v_regs;
++#ifdef __GLIBC__
++  int64_t vmx_reserve[69];
++#else
++  int64_t vmx_reserve[101];
++#endif
++};
++
++struct ContextTraits64 : public Traits64 {
++  using MContext = MContext64;
++  using SignalThreadContext = SignalThreadContext64;
++  using SignalFloatContext = SignalFloatContext64;
++  using SignalVectorContext = SignalVectorContext64;
++  using CPUContext = CPUContextPPC64;
++};
++
++struct ContextTraits32 : public Traits32 {};
++
++struct UContext {
++  uint64_t flags;
++  uint64_t link;
++  SignalStack<ContextTraits64> stack;
++  Sigset<ContextTraits64> sigmask;
++  MContext64 mcontext;
++};
++#pragma pack(push, 1)
++
++static_assert(sizeof(UContext) == sizeof(ucontext_t),
++              "ucontext_t size mismatch");
++static_assert(sizeof(MContext64) == sizeof(mcontext_t),
++              "mcontext_t size mismatch");
++static_assert(sizeof(SignalThreadContext64) == sizeof(gregset_t),
++              "gregset_t size mismatch");
++static_assert(sizeof(SignalFloatContext64) == sizeof(fpregset_t),
++              "fpregset_t size mismatch");
++static_assert(sizeof(SignalVectorContext64) == sizeof(vrregset_t),
++              "vrregset_t size mismatch");
++static_assert(offsetof(UContext, mcontext) ==
++              offsetof(ucontext_t, uc_mcontext), "mcontext offset mismatch");
++static_assert(offsetof(MContext64, gp_regs) ==
++              offsetof(mcontext_t, gp_regs), "gp_regs offset mismatch");
+ #else
+ #error Port.
+ #endif  // ARCH_CPU_X86_FAMILY
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/system_snapshot_linux.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/system_snapshot_linux.cc
+@@ -204,6 +204,8 @@ CPUArchitecture SystemSnapshotLinux::Get
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+   return process_reader_->Is64Bit() ? kCPUArchitectureMIPS64EL
+                                     : kCPUArchitectureMIPSEL;
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++  return kCPUArchitecturePPC64;
+ #else
+ #error port to your architecture
+ #endif
+@@ -219,6 +221,9 @@ uint32_t SystemSnapshotLinux::CPURevisio
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+   // Not implementable on MIPS
+   return 0;
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++  // Not yet implemented on PPC64
++  return 0;
+ #else
+ #error port to your architecture
+ #endif
+@@ -239,6 +244,9 @@ std::string SystemSnapshotLinux::CPUVend
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+   // Not implementable on MIPS
+   return std::string();
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++  // Not yet implemented on PPC64
++  return std::string();
+ #else
+ #error port to your architecture
+ #endif
+@@ -372,6 +380,9 @@ bool SystemSnapshotLinux::NXEnabled() co
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+   // Not implementable on MIPS
+   return false;
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++  // Not yet implemented on PPC64
++  return false;
+ #else
+ #error Port.
+ #endif  // ARCH_CPU_X86_FAMILY
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/test_modules.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/test_modules.cc
+@@ -110,6 +110,8 @@ bool WriteTestModule(const base::FilePat
+   module.ehdr.e_machine = EM_AARCH64;
+ #elif defined(ARCH_CPU_MIPSEL) || defined(ARCH_CPU_MIPS64EL)
+   module.ehdr.e_machine = EM_MIPS;
++#elif defined(ARCH_CPU_PPC64)
++  module.ehdr.e_machine = EM_PPC64;
+ #endif
+ 
+   module.ehdr.e_version = EV_CURRENT;
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/thread_snapshot_linux.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/thread_snapshot_linux.cc
+@@ -186,6 +186,14 @@ bool ThreadSnapshotLinux::Initialize(Pro
+         thread.thread_info.float_context.f32,
+         context_.mipsel);
+   }
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++  context_.architecture = kCPUArchitecturePPC64;
++  context_.ppc64 = &context_union_.ppc64;
++  InitializeCPUContextPPC64<ContextTraits64>(
++      thread.thread_info.thread_context.t64,
++      thread.thread_info.float_context.f64,
++      thread.thread_info.vector_context.v64,
++      context_.ppc64);
+ #else
+ #error Port.
+ #endif
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/thread_snapshot_linux.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/thread_snapshot_linux.h
+@@ -68,6 +68,8 @@ class ThreadSnapshotLinux final : public
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+     CPUContextMIPS mipsel;
+     CPUContextMIPS64 mips64;
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++    CPUContextPPC64 ppc64;
+ #else
+ #error Port.
+ #endif  // ARCH_CPU_X86_FAMILY
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/util/linux/auxiliary_vector.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/util/linux/auxiliary_vector.cc
+@@ -56,6 +56,11 @@ bool AuxiliaryVector::Read(PtraceConnect
+     if (type == AT_IGNORE) {
+       continue;
+     }
++#if defined(ARCH_CPU_PPC64_FAMILY)
++    if (type == AT_IGNOREPPC) {
++      continue;
++    }
++#endif
+     if (!MapInsertOrReplace(&values_, type, value, nullptr)) {
+       LOG(ERROR) << "duplicate auxv entry";
+       return false;
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/util/linux/ptracer.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/util/linux/ptracer.cc
+@@ -401,6 +401,64 @@ bool GetThreadArea64(pid_t tid,
+   return true;
+ }
+ 
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++// PPC64 has had HAVE_ARCH_TRACEHOOK set since 2.6.27 (even before x86 had it).
++// That means we can simply use PTRACE_GETREGESET.
++
++template <typename Destination>
++bool GetRegisterSet(pid_t tid, int set, Destination* dest, bool can_log) {
++  iovec iov;
++  iov.iov_base = reinterpret_cast<void*>(dest);
++  iov.iov_len = sizeof(*dest);
++  if (ptrace(PTRACE_GETREGSET, tid, reinterpret_cast<void*>(set), &iov) != 0) {
++    PLOG_IF(ERROR, can_log) << "ptrace";
++    return false;
++  }
++  if (iov.iov_len != sizeof(*dest)) {
++    LOG_IF(ERROR, can_log) << "Unexpected registers size";
++    return false;
++  }
++  return true;
++}
++
++bool GetVectorRegisters64(pid_t tid,
++                          VectorContext* context,
++                          bool can_log) {
++  return GetRegisterSet(tid, NT_PPC_VMX, &context->v64, can_log);
++}
++
++bool GetFloatingPointRegisters64(pid_t tid,
++                                 FloatContext* context,
++                                 bool can_log) {
++  return GetRegisterSet(tid, NT_PRFPREG, &context->f64, can_log);
++}
++
++bool GetThreadArea64(pid_t tid,
++                     const ThreadContext& context,
++                     LinuxVMAddress* address,
++                     bool can_log) {
++  // PPC64 doesn't have PTRACE_GET_THREAD_AREA since the thread pointer
++  // is stored in GPR 13.
++  ThreadContext::t64_t tc;
++  if (!GetRegisterSet(tid, NT_PRSTATUS, &tc, can_log)) {
++    LOG_IF(ERROR, can_log) << "Unable to get thread pointer!";
++    return false;
++  }
++
++  *address = tc.gpr[13];
++
++  return true;
++}
++
++// Stubs for 32-bit functions not applicable on PPC64
++bool GetFloatingPointRegisters32(pid_t tid,
++                                 FloatContext* context,
++                                 bool can_log) { return false; }
++bool GetThreadArea32(pid_t tid,
++                     const ThreadContext &context,
++                     LinuxVMAddress *address,
++                     bool can_log) { return false; }
++
+ #else
+ #error Port.
+ #endif  // ARCH_CPU_X86_FAMILY
+@@ -497,6 +555,9 @@ bool Ptracer::GetThreadInfo(pid_t tid, T
+   if (is_64_bit_) {
+     return GetGeneralPurposeRegisters64(tid, &info->thread_context, can_log_) &&
+            GetFloatingPointRegisters64(tid, &info->float_context, can_log_) &&
++#if defined(ARCH_CPU_PPC64_FAMILY)
++           GetVectorRegisters64(tid, &info->vector_context, can_log_) &&
++#endif
+            GetThreadArea64(tid,
+                            info->thread_context,
+                            &info->thread_specific_data_address,
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/util/linux/thread_info.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/util/linux/thread_info.h
+@@ -39,6 +39,13 @@ struct user_vfp_exc {
+ #include <android/api-level.h>
+ #endif
+ 
++#if defined(ARCH_CPU_PPC64_FAMILY)
++#include <sys/ucontext.h>
++#if !defined(__GLIBC__)
++#include <asm/ptrace.h>
++#endif
++#endif
++
+ namespace crashpad {
+ 
+ //! \brief The set of general purpose registers for an architecture family.
+@@ -90,6 +97,8 @@ union ThreadContext {
+     uint32_t cp0_status;
+     uint32_t cp0_cause;
+     uint32_t padding1_;
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++    // PPC64 is 64-bit
+ #else
+ #error Port.
+ #endif  // ARCH_CPU_X86_FAMILY
+@@ -143,6 +152,21 @@ union ThreadContext {
+     uint64_t cp0_badvaddr;
+     uint64_t cp0_status;
+     uint64_t cp0_cause;
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++    // Reflects struct pt_regs in asm/ptrace.h.
++    uint64_t gpr[32];
++    uint64_t nip;
++    uint64_t msr;
++    uint64_t orig_gpr3;
++    uint64_t ctr;
++    uint64_t lnk;
++    uint64_t xer;
++    uint64_t ccr;
++    uint64_t softe;
++    uint64_t trap;
++    uint64_t dar;
++    uint64_t dsisr;
++    uint64_t result;
+ #else
+ #error Port.
+ #endif  // ARCH_CPU_X86_FAMILY
+@@ -154,6 +178,8 @@ union ThreadContext {
+   using NativeThreadContext = user_regs;
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+ // No appropriate NativeThreadsContext type available for MIPS
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++  using NativeThreadContext = struct pt_regs;
+ #else
+ #error Port.
+ #endif  // ARCH_CPU_X86_FAMILY || ARCH_CPU_ARM64
+@@ -229,6 +255,9 @@ union FloatContext {
+     } fpregs[32];
+     uint32_t fpcsr;
+     uint32_t fpu_id;
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++    // Crashpad's PPC support is 64-bit only, so this
++    // 32bit-only struct is declared as empty.
+ #else
+ #error Port.
+ #endif  // ARCH_CPU_X86_FAMILY
+@@ -263,6 +292,10 @@ union FloatContext {
+     double fpregs[32];
+     uint32_t fpcsr;
+     uint32_t fpu_id;
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++    // Reflects fpregset_t in sys/ucontext.h
++    double fpregs[32];
++    double fpscr;
+ #else
+ #error Port.
+ #endif  // ARCH_CPU_X86_FAMILY
+@@ -291,6 +324,8 @@ union FloatContext {
+   static_assert(sizeof(f64) == sizeof(user_fpsimd_struct), "Size mismatch");
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+ // No appropriate floating point context native type for available MIPS.
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++  static_assert(sizeof(f64) == sizeof(fpregset_t), "Size mismatch");
+ #else
+ #error Port.
+ #endif  // ARCH_CPU_X86
+@@ -298,6 +333,26 @@ union FloatContext {
+ static_assert(std::is_standard_layout<FloatContext>::value,
+               "Not standard layout");
+ 
++//! \brief The vector registers used for an architecture family
++union VectorContext {
++  struct v32_t {} v32;
++#if defined(ARCH_CPU_PPC64_FAMILY)
++  __attribute__((__aligned__(16))) // Vector context must be doubleword aligned.
++#endif
++  struct v64_t {
++#if defined(ARCH_CPU_PPC64_FAMILY)
++    // Reflects vrregset_t in sys/ucontext.h
++    uint32_t vrregs[32][4];
++    struct {
++      uint32_t __pad[3];
++      uint32_t vscr_word;
++    } vscr;
++    uint32_t vrsave;
++    uint32_t __pad[3];
++#endif
++  } v64;
++};
++
+ //! \brief A collection of `ptrace`-able information about a thread.
+ struct ThreadInfo {
+   ThreadInfo();
+@@ -309,6 +364,9 @@ struct ThreadInfo {
+   //! \brief The floating point registers for the thread.
+   FloatContext float_context;
+ 
++  //! \brief (Optional) The vector registers used for the thread.
++  VectorContext vector_context;
++
+   //! \brief The thread-local storage address for the thread.
+   LinuxVMAddress thread_specific_data_address;
+ };
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/util/misc/capture_context.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/util/misc/capture_context.h
+@@ -69,6 +69,7 @@ using NativeCPUContext = ucontext_t;
+ //!     macOS/Linux/Fuchsia | x86_64       | `%%rdi`
+ //!     Linux               | ARM/ARM64    | `r0`/`x0`
+ //!     Linux               | MIPS/MIPS64  | `$a0`
++//!     Linux               | PPC64        | `r3`
+ //!
+ //!     Additionally, the value `LR` on ARM/ARM64 will be the return address of
+ //!     this function.
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/util/misc/capture_context_linux.S
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/util/misc/capture_context_linux.S
+@@ -32,7 +32,7 @@
+   .balign 4, 0x0
+   .type CAPTURECONTEXT_SYMBOL, %function
+   .type CAPTURECONTEXT_SYMBOL2, %function
+-#elif defined(__mips__)
++#elif defined(__mips__) || defined(__powerpc64__)
+   .balign 4, 0x0
+ #endif
+ 
+@@ -423,4 +423,214 @@ CAPTURECONTEXT_SYMBOL2:
+   jr $ra
+ 
+   .set at
++#elif defined(__powerpc64__)
++  // Store r0-r31
++  std 0, 0xe8(3)   // context->uc_mcontext.gp_regs[0]
++  std 1, 0xf0(3)   // context->uc_mcontext.gp_regs[1]
++  std 2, 0xf8(3)   // context->uc_mcontext.gp_regs[2]
++  // note that r3's original value was lost
++  std 3, 0x100(3)  // context->uc_mcontext.gp_regs[3]
++  std 4, 0x108(3)  // context->uc_mcontext.gp_regs[4]
++  std 5, 0x110(3)  // context->uc_mcontext.gp_regs[5]
++  std 6, 0x118(3)  // context->uc_mcontext.gp_regs[6]
++  std 7, 0x120(3)  // context->uc_mcontext.gp_regs[7]
++  std 8, 0x128(3)  // context->uc_mcontext.gp_regs[8]
++  std 9, 0x130(3)  // context->uc_mcontext.gp_regs[9]
++  std 10, 0x138(3) // context->uc_mcontext.gp_regs[10]
++  std 11, 0x140(3) // context->uc_mcontext.gp_regs[11]
++  std 12, 0x148(3) // context->uc_mcontext.gp_regs[12]
++  std 13, 0x150(3) // context->uc_mcontext.gp_regs[13]
++  std 14, 0x158(3) // context->uc_mcontext.gp_regs[14]
++  std 15, 0x160(3) // context->uc_mcontext.gp_regs[15]
++  std 16, 0x168(3) // context->uc_mcontext.gp_regs[16]
++  std 17, 0x170(3) // context->uc_mcontext.gp_regs[17]
++  std 18, 0x178(3) // context->uc_mcontext.gp_regs[18]
++  std 19, 0x180(3) // context->uc_mcontext.gp_regs[19]
++  std 20, 0x188(3) // context->uc_mcontext.gp_regs[20]
++  std 21, 0x190(3) // context->uc_mcontext.gp_regs[21]
++  std 22, 0x198(3) // context->uc_mcontext.gp_regs[22]
++  std 23, 0x1a0(3) // context->uc_mcontext.gp_regs[23]
++  std 24, 0x1a8(3) // context->uc_mcontext.gp_regs[24]
++  std 25, 0x1b0(3) // context->uc_mcontext.gp_regs[25]
++  std 26, 0x1b8(3) // context->uc_mcontext.gp_regs[26]
++  std 27, 0x1c0(3) // context->uc_mcontext.gp_regs[27]
++  std 28, 0x1c8(3) // context->uc_mcontext.gp_regs[28]
++  std 29, 0x1d0(3) // context->uc_mcontext.gp_regs[29]
++  std 30, 0x1d8(3) // context->uc_mcontext.gp_regs[30]
++  std 31, 0x1e0(3) // context->uc_mcontext.gp_regs[31]
++
++  // For NIP, we can use the value in the link register
++  mflr 0
++  std 0, 0x1e8(3) // context->uc_mcontext.gp_regs[PT_NIP]
++
++  // CTR
++  mfctr 0
++  std 0, 0x200(3) // context->uc_mcontext.gp_regs[PT_CTR]
++
++  // For LNK, we'll use the caller's LR save area (2 stack frames up).
++  // r4 can be used as a scratch register since it has already been saved.
++  ld 4, 0(1)
++  ld 4, 16(4)
++  std 4, 0x208(3) // context->uc_mcontext.gp_regs[PT_LNK]
++
++  // XER
++  mfxer 0
++  std 0, 0x210(3) // context->uc_mcontext.gp_regs[PT_XER]
++
++  // CCR
++  mfcr 0
++  std 0, 0x218(3) // context->uc_mcontext.gp_regs[PT_CCR]
++
++  // MSR, orig_r3, MQ, TRAP, DAR, DSISR, RESULT, DSCR,
++  // not used or not relevant,  zero them out.
++  li 4, 0
++  std 4, 0x1f0(3) // context->uc_mcontext.gp_regs[PT_MSR]
++  std 4, 0x1f8(3) // context->uc_mcontext.gp_regs[PT_ORIG_R3]
++  std 4, 0x220(3) // context->uc_mcontext.gp_regs[PT_MQ]
++  std 4, 0x228(3) // context->uc_mcontext.gp_regs[PT_TRAP]
++  std 4, 0x230(3) // context->uc_mcontext.gp_regs[PT_DAR]
++  std 4, 0x238(3) // context->uc_mcontext.gp_regs[PT_DSISR]
++  std 4, 0x240(3) // context->uc_mcontext.gp_regs[PT_RESULT]
++  std 4, 0x248(3) // context->uc_mcontext.gp_regs[PT_DSCR]
++
++  // Update context->uc_mcontext.regs to point to gp_regs
++  addi 0, 3, 0xe8
++  std 0, 0xe0(3)
++
++  // Save floating point registers 0-31
++  stfd 0, 0x268(3)  // context->uc_mcontext.fp_regs[0]
++  stfd 1, 0x270(3)  // context->uc_mcontext.fp_regs[1]
++  stfd 2, 0x278(3)  // context->uc_mcontext.fp_regs[2]
++  stfd 3, 0x280(3)  // context->uc_mcontext.fp_regs[3]
++  stfd 4, 0x288(3)  // context->uc_mcontext.fp_regs[4]
++  stfd 5, 0x290(3)  // context->uc_mcontext.fp_regs[5]
++  stfd 6, 0x298(3)  // context->uc_mcontext.fp_regs[6]
++  stfd 7, 0x2a0(3)  // context->uc_mcontext.fp_regs[7]
++  stfd 8, 0x2a8(3)  // context->uc_mcontext.fp_regs[8]
++  stfd 9, 0x2b0(3)  // context->uc_mcontext.fp_regs[9]
++  stfd 10, 0x2b8(3) // context->uc_mcontext.fp_regs[10]
++  stfd 11, 0x2c0(3) // context->uc_mcontext.fp_regs[11]
++  stfd 12, 0x2c8(3) // context->uc_mcontext.fp_regs[12]
++  stfd 13, 0x2d0(3) // context->uc_mcontext.fp_regs[13]
++  stfd 14, 0x2d8(3) // context->uc_mcontext.fp_regs[14]
++  stfd 15, 0x2e0(3) // context->uc_mcontext.fp_regs[15]
++  stfd 16, 0x2e8(3) // context->uc_mcontext.fp_regs[16]
++  stfd 17, 0x2f0(3) // context->uc_mcontext.fp_regs[17]
++  stfd 18, 0x2f8(3) // context->uc_mcontext.fp_regs[18]
++  stfd 19, 0x300(3) // context->uc_mcontext.fp_regs[19]
++  stfd 20, 0x308(3) // context->uc_mcontext.fp_regs[20]
++  stfd 21, 0x310(3) // context->uc_mcontext.fp_regs[21]
++  stfd 22, 0x318(3) // context->uc_mcontext.fp_regs[22]
++  stfd 23, 0x320(3) // context->uc_mcontext.fp_regs[23]
++  stfd 24, 0x328(3) // context->uc_mcontext.fp_regs[24]
++  stfd 25, 0x330(3) // context->uc_mcontext.fp_regs[25]
++  stfd 26, 0x338(3) // context->uc_mcontext.fp_regs[26]
++  stfd 27, 0x340(3) // context->uc_mcontext.fp_regs[27]
++  stfd 28, 0x348(3) // context->uc_mcontext.fp_regs[28]
++  stfd 29, 0x350(3) // context->uc_mcontext.fp_regs[29]
++  stfd 30, 0x358(3) // context->uc_mcontext.fp_regs[30]
++  stfd 31, 0x360(3) // context->uc_mcontext.fp_regs[31]
++
++  // FPSCR
++  mffs 0
++  stfd 0, 0x368(3) // context->uc_mcontext.fp_regs[32]
++
++  // Save VMX Vector registers
++  // Update r4 to contain the base address of vmx_reserve
++  addi 4, 3, 0x378
++  // Ensure that it is quadword aligned
++  andi. 5, 4, 0xF
++  beq 1f // No alignment is necessary
++  // Address is doubleword aligned and not quadword aligned, add 8
++  addi 4, 4, 8
++
++1:
++  // Store VMX registers 0-31
++  // r4 will contain the base address
++  // r5 will contain the index
++  li 5, 0
++  stvx 0, 4, 5   // context->uc_mcontext.vmx_reserve[(align) + 0]
++  addi 5, 5, 16
++  stvx 1, 4, 5   // context->uc_mcontext.vmx_reserve[(align) + 1]
++  addi 5, 5, 16
++  stvx 2, 4, 5   // context->uc_mcontext.vmx_reserve[(align) + 2]
++  addi 5, 5, 16
++  stvx 3, 4, 5   // context->uc_mcontext.vmx_reserve[(align) + 3]
++  addi 5, 5, 16
++  stvx 4, 4, 5   // context->uc_mcontext.vmx_reserve[(align) + 4]
++  addi 5, 5, 16
++  stvx 5, 4, 5   // context->uc_mcontext.vmx_reserve[(align) + 5]
++  addi 5, 5, 16
++  stvx 6, 4, 5   // context->uc_mcontext.vmx_reserve[(align) + 6]
++  addi 5, 5, 16
++  stvx 7, 4, 5   // context->uc_mcontext.vmx_reserve[(align) + 7]
++  addi 5, 5, 16
++  stvx 8, 4, 5   // context->uc_mcontext.vmx_reserve[(align) + 8]
++  addi 5, 5, 16
++  stvx 9, 4, 5   // context->uc_mcontext.vmx_reserve[(align) + 9]
++  addi 5, 5, 16
++  stvx 10, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 10]
++  addi 5, 5, 16
++  stvx 11, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 11]
++  addi 5, 5, 16
++  stvx 12, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 12]
++  addi 5, 5, 16
++  stvx 13, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 13]
++  addi 5, 5, 16
++  stvx 14, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 14]
++  addi 5, 5, 16
++  stvx 15, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 15]
++  addi 5, 5, 16
++  stvx 16, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 16]
++  addi 5, 5, 16
++  stvx 17, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 17]
++  addi 5, 5, 16
++  stvx 18, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 18]
++  addi 5, 5, 16
++  stvx 19, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 19]
++  addi 5, 5, 16
++  stvx 20, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 20]
++  addi 5, 5, 16
++  stvx 21, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 21]
++  addi 5, 5, 16
++  stvx 22, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 22]
++  addi 5, 5, 16
++  stvx 23, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 23]
++  addi 5, 5, 16
++  stvx 24, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 24]
++  addi 5, 5, 16
++  stvx 25, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 25]
++  addi 5, 5, 16
++  stvx 26, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 26]
++  addi 5, 5, 16
++  stvx 27, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 27]
++  addi 5, 5, 16
++  stvx 28, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 28]
++  addi 5, 5, 16
++  stvx 29, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 29]
++  addi 5, 5, 16
++  stvx 30, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 30]
++  addi 5, 5, 16
++  stvx 31, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 31]
++  addi 5, 5, 16
++
++  // VSCR
++  mfvscr 0
++  stvx 0, 4, 5
++  addi 5, 5, 16
++
++  // VRSAVE
++  mfvrsave 0
++  stwx 0, 4, 5
++
++  // Update context->uc_mcontext.v_regs to point to vmx_reserve + alignment.
++  std 4, 0x370(3)
++
++  // Zero out all unused fields
++  li 4, 0
++  std 4, 0xc8(3) // context->uc_mcontext.signal
++  std 4, 0xd0(3) // context->uc_mcontext.handler
++  std 4, 0xd8(3) // context->uc_mcontext.oldmask
++
++  blr
+ #endif  // __i386__
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/util/misc/capture_context_test.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/util/misc/capture_context_test.cc
+@@ -57,7 +57,7 @@ void TestCaptureContext() {
+   uintptr_t pc = ProgramCounterFromContext(context_1);
+ 
+ #if !defined(ADDRESS_SANITIZER) && !defined(ARCH_CPU_MIPS_FAMILY) && \
+-    !defined(MEMORY_SANITIZER)
++    !defined(MEMORY_SANITIZER) && !defined(ARCH_CPU_PPC64_FAMILY)
+   // Sanitizers can cause enough code bloat that the “nearby” check would
+   // likely fail.
+   const uintptr_t kReferencePC =
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/util/misc/capture_context_test_util_linux.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/util/misc/capture_context_test_util_linux.cc
+@@ -35,6 +35,8 @@ void SanityCheckContext(const NativeCPUC
+   EXPECT_EQ(context.uc_mcontext.regs[0], FromPointerCast<uintptr_t>(&context));
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+   EXPECT_EQ(context.uc_mcontext.gregs[4], FromPointerCast<uintptr_t>(&context));
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++  EXPECT_EQ(context.uc_mcontext.gp_regs[3], FromPointerCast<uintptr_t>(&context));
+ #endif
+ }
+ 
+@@ -49,6 +51,8 @@ uintptr_t ProgramCounterFromContext(cons
+   return context.uc_mcontext.pc;
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+   return context.uc_mcontext.pc;
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++  return context.uc_mcontext.gp_regs[PT_NIP];
+ #endif
+ }
+ 
+@@ -63,6 +67,8 @@ uintptr_t StackPointerFromContext(const
+   return context.uc_mcontext.sp;
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+   return context.uc_mcontext.gregs[29];
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++  return context.uc_mcontext.gp_regs[1];
+ #endif
+ }
+ 
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/util/posix/signals_test.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/util/posix/signals_test.cc
+@@ -46,9 +46,9 @@ bool CanCauseSignal(int sig) {
+   return sig == SIGABRT ||
+          sig == SIGALRM ||
+          sig == SIGBUS ||
+-#if !defined(ARCH_CPU_ARM64)
++#if !defined(ARCH_CPU_ARM64) && !defined(ARCH_CPU_PPC64)
+          sig == SIGFPE ||
+-#endif  // !defined(ARCH_CPU_ARM64)
++#endif  // !defined(ARCH_CPU_ARM64) && !defined(ARCH_CPU_PPC64)
+ #if defined(ARCH_CPU_X86_FAMILY) || defined(ARCH_CPU_ARMEL)
+          sig == SIGILL ||
+ #endif  // defined(ARCH_CPU_X86_FAMILY) || defined(ARCH_CPU_ARMEL)
+@@ -117,9 +117,11 @@ void CauseSignal(int sig) {
+       break;
+     }
+ 
+-#if !defined(ARCH_CPU_ARM64)
++#if !defined(ARCH_CPU_ARM64) && !defined(ARCH_CPU_PPC64)
+     // ARM64 has hardware integer division instructions that don’t generate a
+     // trap for divide-by-zero, so this doesn’t produce SIGFPE.
++    //
++    // PPC64 fixed-point division by zero also doesn't produce a SIGFPE.
+     case SIGFPE: {
+       // Optimization makes this tricky, so get zero from a system call likely
+       // to succeed, and try to do something with the result.
+@@ -137,7 +139,7 @@ void CauseSignal(int sig) {
+       fstat(quotient, &stat_buf);
+       break;
+     }
+-#endif  // ARCH_CPU_ARM64
++#endif  // !defined(ARCH_CPU_ARM64) && !defined(ARCH_CPU_PPC64)
+ 
+ #if defined(ARCH_CPU_X86_FAMILY) || defined(ARCH_CPU_ARMEL)
+     case SIGILL: {
+--- a/src/3rdparty/chromium/third_party/dav1d/BUILD.gn
++++ b/src/3rdparty/chromium/third_party/dav1d/BUILD.gn
+@@ -196,6 +196,8 @@ static_library("dav1d_8bit") {
+     sources += arm_template_sources
+   } else if (current_cpu == "arm64") {
+     sources += arm_template_sources
++  } else if (current_cpu == "ppc64") {
++    sources += ppc64_template_sources
+   }
+ 
+   cflags = dav1d_copts
+@@ -226,6 +228,8 @@ static_library("dav1d_10bit") {
+     sources += arm_template_sources
+   } else if (current_cpu == "arm64") {
+     sources += arm_template_sources
++  } else if (current_cpu == "ppc64") {
++    sources += ppc64_template_sources
+   }
+ 
+   cflags = dav1d_copts
+@@ -283,6 +287,21 @@ if (current_cpu == "x86" || current_cpu
+     }
+ 
+     cflags = dav1d_copts
++  }
++} else if (current_cpu == "ppc64") {
++  static_library("dav1d_ppc") {
++    sources = [
++      "libdav1d/src/ppc/cpu.c",
++      "libdav1d/src/ppc/cpu.h",
++    ]
++
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [
++      "//build/config/compiler:no_chromium_code",
++      ":dav1d_config",
++    ]
++
++    cflags = dav1d_copts
+ 
+     deps = [ ":dav1d_headers" ]
+     allow_circular_includes_from = [ ":dav1d_headers" ]
+@@ -315,5 +334,7 @@ static_library("dav1d") {
+     }
+   } else if (current_cpu == "arm" || current_cpu == "arm64") {
+     deps += [ ":dav1d_arm" ]
++  } else if (current_cpu == "ppc64") {
++    deps += [ ":dav1d_ppc" ]
+   }
+ }
+--- a/src/3rdparty/chromium/third_party/dav1d/dav1d_generated.gni
++++ b/src/3rdparty/chromium/third_party/dav1d/dav1d_generated.gni
+@@ -103,6 +103,11 @@ arm_template_sources = [
+   "libdav1d/src/arm/mc_init_tmpl.c",
+ ]
+ 
++ppc64_template_sources = [
++  "libdav1d/src/ppc/cdef_init_tmpl.c",
++  "libdav1d/src/ppc/looprestoration_init_tmpl.c",
++]
++
+ template_sources = [
+   "libdav1d/src/cdef_apply_tmpl.c",
+   "libdav1d/src/cdef_tmpl.c",
+--- a/src/3rdparty/chromium/third_party/dav1d/generate_source.py
++++ b/src/3rdparty/chromium/third_party/dav1d/generate_source.py
+@@ -57,6 +57,8 @@ def _WriteGn(fd):
+   _WriteArray(fd, "arm64_asm_sources", _Glob("libdav1d/src/arm/64/*.S"))
+   _WriteArray(fd, "arm_template_sources", _Glob("libdav1d/src/arm/*_tmpl.c"))
+ 
++  _WriteArray(fd, "ppc64_template_sources", _Glob("libdav1d/src/ppc/*_tmpl.c"))
++
+   template_sources = _Glob("libdav1d/src/*_tmpl.c")
+   _WriteArray(fd, "template_sources", template_sources)
+ 
+--- a/src/3rdparty/chromium/third_party/dav1d/libdav1d/src/ppc/types.h
++++ b/src/3rdparty/chromium/third_party/dav1d/libdav1d/src/ppc/types.h
+@@ -51,4 +51,19 @@
+ #define u16l_to_i32(v) ((i32x4) vec_mergel((u16x8) v, vec_splat_u16(0)))
+ #define i16l_to_i32(v) ((i32x4) vec_unpackl((i16x8)v))
+ 
++#if defined(__clang__)
++#undef vec_splats
++#define vec_splats(N)                     \
++    _Generic((N),                         \
++        unsigned char:      ((u8x16)(N)), \
++        signed char:        ((i8x16)(N)), \
++        unsigned short:     ((u16x8)(N)), \
++        signed short:       ((i16x8)(N)), \
++        unsigned int:       ((u32x4)(N)), \
++        signed int:         ((i32x4)(N)), \
++        unsigned long long: ((u64x2)(N)), \
++        signed long long:   ((i64x2)(N))  \
++    )
++#endif
++
+ #endif /* DAV1D_SRC_PPC_TYPES_H */
+--- a/src/3rdparty/chromium/third_party/eigen3/BUILD.gn
++++ b/src/3rdparty/chromium/third_party/eigen3/BUILD.gn
+@@ -22,4 +22,8 @@ config("eigen_includes") {
+     # for this component on Windows on Arm due to compilation errors.
+     defines += [ "EIGEN_DONT_VECTORIZE" ]
+   }
++
++  if (target_cpu == "ppc64") {
++    defines += [ "EIGEN_DONT_VECTORIZE" ]
++  }
+ }
+--- a/src/3rdparty/chromium/third_party/libaom/BUILD.gn
++++ b/src/3rdparty/chromium/third_party/libaom/BUILD.gn
+@@ -37,6 +37,8 @@ if (enable_libaom) {
+     } else {
+       cpu_arch_full = "arm"
+     }
++  } else if (current_cpu == "ppc64") {
++    cpu_arch_full = "generic"
+   } else {
+     cpu_arch_full = current_cpu
+   }
+--- a/src/3rdparty/chromium/third_party/libgav1/options.gni
++++ b/src/3rdparty/chromium/third_party/libgav1/options.gni
+@@ -12,5 +12,5 @@ declare_args() {
+       is_chromeos_ash && (target_cpu == "arm" || target_cpu == "arm64")
+   use_libgav1_parser =
+       (is_chromeos || is_linux || is_win) &&
+-      (target_cpu == "x86" || target_cpu == "x64" || target_cpu == "arm64")
++      (target_cpu == "x86" || target_cpu == "x64" || target_cpu == "arm64" || target_cpu == "ppc64")
+ }
+--- a/src/3rdparty/chromium/third_party/lss/linux_syscall_support.h
++++ b/src/3rdparty/chromium/third_party/lss/linux_syscall_support.h
+@@ -4262,7 +4262,7 @@ struct kernel_statfs {
+       LSS_REG(2, buf);
+       LSS_BODY(void*, mmap2, "0"(__r2));
+     }
+-#else
++#elif !defined(__powerpc64__) /* ppc64 doesn't have mmap2 */
+     #define __NR__mmap2 __NR_mmap2
+     LSS_INLINE _syscall6(void*, _mmap2,            void*, s,
+                          size_t,                   l, int,               p,
+@@ -4373,7 +4373,7 @@ struct kernel_statfs {
+   #if defined(__i386__) ||                                                    \
+       defined(__ARM_ARCH_3__) || defined(__ARM_EABI__) ||                     \
+      (defined(__mips__) && _MIPS_SIM == _MIPS_SIM_ABI32) ||                   \
+-      defined(__PPC__) ||                                                     \
++     (defined(__PPC__) && !defined(__powerpc64__)) ||                                                     \
+      (defined(__s390__) && !defined(__s390x__))
+     /* On these architectures, implement mmap() with mmap2(). */
+     LSS_INLINE void* LSS_NAME(mmap)(void *s, size_t l, int p, int f, int d,
+@@ -4556,9 +4556,17 @@ struct kernel_statfs {
+     }
+   #endif
+   #if defined(__NR_fstatat64)
++    #if !defined(__GLIBC__)
++        // musl doesn't define fstatat64 fstatat
++        #undef fstatat64
++    #endif
+     LSS_INLINE _syscall4(int,   fstatat64,        int,   d,
+                          const char *,      p,
+                          struct kernel_stat64 *,   b,    int,   f)
++    #if !defined(__GLIBC__)
++    	// then restore it
++        #define fstatat64 fstatat
++    #endif
+   #endif
+   #if defined(__NR_waitpid)
+     // waitpid is polyfilled below when not available.
+--- a/src/3rdparty/chromium/third_party/pdfium/third_party/libpng16/pngpriv.h
++++ b/src/3rdparty/chromium/third_party/pdfium/third_party/libpng16/pngpriv.h
+@@ -196,11 +196,7 @@
+ #endif
+ 
+ #ifndef PNG_POWERPC_VSX_OPT
+-#  if defined(__PPC64__) && defined(__ALTIVEC__) && defined(__VSX__)
+-#     define PNG_POWERPC_VSX_OPT 2
+-#  else
+-#     define PNG_POWERPC_VSX_OPT 0
+-#  endif
++#  define PNG_POWERPC_VSX_OPT 0
+ #endif
+ 
+ #ifndef PNG_INTEL_SSE_OPT
+--- a/src/3rdparty/chromium/third_party/pffft/src/pffft.c
++++ b/src/3rdparty/chromium/third_party/pffft/src/pffft.c
+@@ -100,6 +100,7 @@
+    Altivec support macros 
+ */
+ #if !defined(PFFFT_SIMD_DISABLE) && (defined(__ppc__) || defined(__ppc64__))
++#include <altivec.h>
+ typedef vector float v4sf;
+ #  define SIMD_SZ 4
+ #  define VZERO() ((vector float) vec_splat_u8(0))
+--- a/src/3rdparty/chromium/third_party/skia/src/sksl/SkSLString.cpp
++++ b/src/3rdparty/chromium/third_party/skia/src/sksl/SkSLString.cpp
+@@ -142,7 +142,12 @@ String to_string(double value) {
+     if (needsDotZero) {
+         buffer << ".0";
+     }
+-    return String(buffer.str().c_str());
++
++    std::string ret(buffer.str());
++    if (signbit(value) && ret[0] == '.') {
++        ret[0] = '-';
++    }
++    return String(ret.c_str());
+ }
+ 
+ bool stod(const skstd::string_view& s, SKSL_FLOAT* value) {
+--- a/src/3rdparty/chromium/third_party/sqlite/src/amalgamation/sqlite3.c
++++ b/src/3rdparty/chromium/third_party/sqlite/src/amalgamation/sqlite3.c
+@@ -14628,7 +14628,8 @@ typedef INT16_TYPE LogEst;
+ # if defined(i386)      || defined(__i386__)      || defined(_M_IX86) ||    \
+      defined(__x86_64)  || defined(__x86_64__)    || defined(_M_X64)  ||    \
+      defined(_M_AMD64)  || defined(_M_ARM)        || defined(__x86)   ||    \
+-     defined(__ARMEL__) || defined(__AARCH64EL__) || defined(_M_ARM64)
++     defined(__ARMEL__) || defined(__AARCH64EL__) || defined(_M_ARM64) ||   \
++     defined(__powerpc64__) && (__BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__)
+ #   define SQLITE_BYTEORDER    1234
+ # elif defined(sparc)     || defined(__ppc__) || \
+        defined(__ARMEB__) || defined(__AARCH64EB__)
+--- a/src/3rdparty/chromium/third_party/sqlite/src/amalgamation_dev/sqlite3.c
++++ b/src/3rdparty/chromium/third_party/sqlite/src/amalgamation_dev/sqlite3.c
+@@ -14641,7 +14641,8 @@ typedef INT16_TYPE LogEst;
+ # if defined(i386)      || defined(__i386__)      || defined(_M_IX86) ||    \
+      defined(__x86_64)  || defined(__x86_64__)    || defined(_M_X64)  ||    \
+      defined(_M_AMD64)  || defined(_M_ARM)        || defined(__x86)   ||    \
+-     defined(__ARMEL__) || defined(__AARCH64EL__) || defined(_M_ARM64)
++     defined(__ARMEL__) || defined(__AARCH64EL__) || defined(_M_ARM64) ||   \
++     defined(__powerpc64__) && (__BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__)
+ #   define SQLITE_BYTEORDER    1234
+ # elif defined(sparc)     || defined(__ppc__) || \
+        defined(__ARMEB__) || defined(__AARCH64EB__)
+--- a/src/3rdparty/chromium/third_party/sqlite/src/ext/rtree/rtree.c
++++ b/src/3rdparty/chromium/third_party/sqlite/src/ext/rtree/rtree.c
+@@ -450,7 +450,7 @@ struct RtreeMatchArg {
+ #if defined(i386)     || defined(__i386__)   || defined(_M_IX86) ||    \
+     defined(__x86_64) || defined(__x86_64__) || defined(_M_X64)  ||    \
+     defined(_M_AMD64) || defined(_M_ARM)     || defined(__x86)   ||    \
+-    defined(__arm__)
++    defined(__arm__) || defined(__powerpc64__) && (__BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__)
+ # define SQLITE_BYTEORDER    1234
+ #elif defined(sparc)    || defined(__ppc__)
+ # define SQLITE_BYTEORDER    4321
+--- a/src/3rdparty/chromium/third_party/sqlite/src/src/sqliteInt.h
++++ b/src/3rdparty/chromium/third_party/sqlite/src/src/sqliteInt.h
+@@ -890,7 +890,8 @@ typedef INT16_TYPE LogEst;
+ # if defined(i386)      || defined(__i386__)      || defined(_M_IX86) ||    \
+      defined(__x86_64)  || defined(__x86_64__)    || defined(_M_X64)  ||    \
+      defined(_M_AMD64)  || defined(_M_ARM)        || defined(__x86)   ||    \
+-     defined(__ARMEL__) || defined(__AARCH64EL__) || defined(_M_ARM64)
++     defined(__ARMEL__) || defined(__AARCH64EL__) || defined(_M_ARM64) || \
++     defined(__powerpc64__) && (__BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__)
+ #   define SQLITE_BYTEORDER    1234
+ # elif defined(sparc)     || defined(__ppc__) || \
+        defined(__ARMEB__) || defined(__AARCH64EB__)
+--- a/src/3rdparty/chromium/third_party/webrtc/modules/desktop_capture/differ_block.cc
++++ b/src/3rdparty/chromium/third_party/webrtc/modules/desktop_capture/differ_block.cc
+@@ -30,11 +30,7 @@ bool VectorDifference(const uint8_t* ima
+   static bool (*diff_proc)(const uint8_t*, const uint8_t*) = nullptr;
+ 
+   if (!diff_proc) {
+-#if defined(WEBRTC_ARCH_ARM_FAMILY) || defined(WEBRTC_ARCH_MIPS_FAMILY)
+-    // For ARM and MIPS processors, always use C version.
+-    // TODO(hclam): Implement a NEON version.
+-    diff_proc = &VectorDifference_C;
+-#else
++#if defined(WEBRTC_ARCH_X86_FAMILY)
+     bool have_sse2 = GetCPUInfo(kSSE2) != 0;
+     // For x86 processors, check if SSE2 is supported.
+     if (have_sse2 && kBlockSize == 32) {
+@@ -44,6 +40,10 @@ bool VectorDifference(const uint8_t* ima
+     } else {
+       diff_proc = &VectorDifference_C;
+     }
++#else
++    // For other processors, always use C version.
++    // TODO(hclam): Implement a NEON version.
++    diff_proc = &VectorDifference_C;
+ #endif
+   }
+ 
+--- a/src/3rdparty/chromium/v8/BUILD.gn
++++ b/src/3rdparty/chromium/v8/BUILD.gn
+@@ -1083,6 +1083,12 @@ config("toolchain") {
+     }
+     if (host_byteorder == "little") {
+       defines += [ "V8_TARGET_ARCH_PPC_LE" ]
++      cflags += [
++        # Enable usage of AltiVec, VSX, and other POWER8 and higher features
++        "-mcpu=power8",
++        "-maltivec",
++        "-mvsx",
++      ]
+     } else if (host_byteorder == "big") {
+       defines += [ "V8_TARGET_ARCH_PPC_BE" ]
+       if (current_os == "aix") {
+--- a/src/3rdparty/chromium/ui/gl/features.gni
++++ b/src/3rdparty/chromium/ui/gl/features.gni
+@@ -35,7 +35,8 @@ declare_args() {
+                         (is_mac && use_egl) || is_chromeos_ash || is_fuchsia) &&
+                        (target_cpu == "x86" || target_cpu == "x64" ||
+                         target_cpu == "arm" || target_cpu == "arm64" ||
+-                        target_cpu == "mipsel" || target_cpu == "mips64el")
++                        target_cpu == "mipsel" || target_cpu == "mips64el" ||
++                        target_cpu == "ppc64")
+ }
+ 
+ use_glx = use_x11 || ozone_platform_x11
+--- a/src/3rdparty/chromium/v8/test/BUILD.gn
++++ b/src/3rdparty/chromium/v8/test/BUILD.gn
+@@ -42,7 +42,6 @@ group("gn_all") {
+       "benchmarks/cpp:gn_all",
+       "cctest:cctest",
+       "cctest:generate-bytecode-expectations",
+-      "unittests:unittests",
+     ]
+   }
+ }
+@@ -84,7 +83,6 @@ group("v8_bot_default") {
+     "message:v8_message",
+     "mjsunit:v8_mjsunit",
+     "mkgrokdump:mkgrokdump",
+-    "unittests:unittests",
+     "webkit:v8_webkit",
+   ]
+ 
+@@ -109,7 +107,6 @@ group("v8_default") {
+     "message:v8_message",
+     "mjsunit:v8_mjsunit",
+     "mkgrokdump:mkgrokdump",
+-    "unittests:unittests",
+   ]
+ 
+   if (v8_enable_webassembly) {
+--- /dev/null
++++ b/src/3rdparty/chromium/dev/null
+@@ -0,0 +1,39 @@
++/*
++ * Autogenerated by the Meson build system.
++ * Do not edit, your changes will be lost.
++ */
++
++#pragma once
++
++#define ARCH_AARCH64 0
++
++#define ARCH_ARM 0
++
++#define ARCH_PPC64LE 1
++
++#define ARCH_X86 0
++
++#define ARCH_X86_32 0
++
++#define ARCH_X86_64 0
++
++#define CONFIG_16BPC 1
++
++#define CONFIG_8BPC 1
++
++// #define CONFIG_LOG 1 -- Logging is controlled by Chromium
++
++#define ENDIANNESS_BIG 0
++
++#define HAVE_ASM 1
++
++#define HAVE_CLOCK_GETTIME 1
++
++#define HAVE_DLSYM 1
++
++#define HAVE_GETAUXVAL 1
++
++#define HAVE_POSIX_MEMALIGN 1
++
++#define HAVE_UNISTD_H 1
++
+--- a/src/3rdparty/chromium/third_party/abseil-cpp/absl/base/internal/unscaledcycleclock.h
++++ b/src/3rdparty/chromium/third_party/abseil-cpp/absl/base/internal/unscaledcycleclock.h
+@@ -46,7 +46,7 @@
+ 
+ // The following platforms have an implementation of a hardware counter.
+ #if defined(__i386__) || defined(__x86_64__) || defined(__aarch64__) || \
+-  defined(__powerpc__) || defined(__ppc__) || \
++  ((defined(__powerpc__) || defined(__ppc__)) && defined(__GLIBC__)) || \
+   defined(_M_IX86) || defined(_M_X64)
+ #define ABSL_HAVE_UNSCALED_CYCLECLOCK_IMPLEMENTATION 1
+ #else
+--- a/src/3rdparty/chromium/third_party/abseil-cpp/absl/debugging/internal/stacktrace_config.h
++++ b/src/3rdparty/chromium/third_party/abseil-cpp/absl/debugging/internal/stacktrace_config.h
+@@ -59,7 +59,7 @@
+ #elif defined(__i386__) || defined(__x86_64__)
+ #define ABSL_STACKTRACE_INL_HEADER \
+   "absl/debugging/internal/stacktrace_x86-inl.inc"
+-#elif defined(__ppc__) || defined(__PPC__)
++#elif defined(__ppc__) || defined(__PPC__) && defined(__GLIBC__)
+ #define ABSL_STACKTRACE_INL_HEADER \
+   "absl/debugging/internal/stacktrace_powerpc-inl.inc"
+ #elif defined(__aarch64__)
+--- a/src/3rdparty/chromium/base/allocator/partition_allocator/partition_alloc_config.h
++++ b/src/3rdparty/chromium/base/allocator/partition_allocator/partition_alloc_config.h
+@@ -100,7 +100,8 @@ static_assert(sizeof(void*) != 8, "");
+ // PUT_REF_COUNT_IN_PREVIOUS_SLOT does. In this case the refcount overlaps with
+ // the next pointer shadow for the smallest bucket.
+ #if !(defined(OS_MAC) && defined(ARCH_CPU_ARM64)) && \
+-    !BUILDFLAG(PUT_REF_COUNT_IN_PREVIOUS_SLOT)
++    !BUILDFLAG(PUT_REF_COUNT_IN_PREVIOUS_SLOT) && \
++    (!defined(__GLIBC) && !defined(__powerpc64__))
+ #define PA_HAS_FREELIST_HARDENING
+ #endif
+ 
+--- a/src/3rdparty/chromium/build/download_nacl_toolchains.py
++++ b/src/3rdparty/chromium/build/download_nacl_toolchains.py
+@@ -13,6 +13,8 @@ import sys
+ 
+ 
+ def Main(args):
++  if 'disable_nacl=1' in os.environ.get('GYP_DEFINES', ''):
++    return 0
+   script_dir = os.path.dirname(os.path.abspath(__file__))
+   src_dir = os.path.dirname(script_dir)
+   nacl_dir = os.path.join(src_dir, 'native_client')
+--- a/src/3rdparty/chromium/chrome/installer/linux/BUILD.gn
++++ b/src/3rdparty/chromium/chrome/installer/linux/BUILD.gn
+@@ -100,8 +100,6 @@ packaging_files = packaging_files_binari
+                     "$root_out_dir/xdg-mime",
+                     "$root_out_dir/xdg-settings",
+                     "$root_out_dir/locales/en-US.pak",
+-                    "$root_out_dir/MEIPreload/manifest.json",
+-                    "$root_out_dir/MEIPreload/preloaded_data.pb",
+                   ]
+ 
+ action_foreach("calculate_deb_dependencies") {
+@@ -321,7 +319,6 @@ group("installer_deps") {
+     ":theme_files",
+     "//chrome",
+     "//chrome:packed_resources",
+-    "//chrome/browser/resources/media/mei_preload:component",
+     "//components/crash/core/app:chrome_crashpad_handler",
+     "//sandbox/linux:chrome_sandbox",
+   ]
+--- /dev/null
++++ b/src/3rdparty/chromium/sandbox/linux/system_headers/ppc64_linux_syscalls.h
+@@ -0,0 +1,12 @@
++// Copyright 2014 The Chromium Authors. All rights reserved.
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++#ifndef SANDBOX_LINUX_SYSTEM_HEADERS_PPC64_LINUX_SYSCALLS_H_
++#define SANDBOX_LINUX_SYSTEM_HEADERS_PPC64_LINUX_SYSCALLS_H_
++
++#include <asm/unistd.h>
++
++//TODO: is it necessary to redefine syscall numbers for PPC64?
++
++#endif  // SANDBOX_LINUX_SYSTEM_HEADERS_PPC64_LINUX_SYSCALLS_H_
+--- /dev/null
++++ b/src/3rdparty/chromium/sandbox/linux/system_headers/ppc64_linux_ucontext.h
+@@ -0,0 +1,12 @@
++// Copyright 2014 The Chromium Authors. All rights reserved.
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++#ifndef SANDBOX_LINUX_SYSTEM_HEADERS_PPC64_LINUX_UCONTEXT_H_
++#define SANDBOX_LINUX_SYSTEM_HEADERS_PPC64_LINUX_UCONTEXT_H_
++
++#include <sys/ucontext.h>
++
++//TODO: is it necessary to redefine ucontext on PPC64?
++
++#endif  // SANDBOX_LINUX_SYSTEM_HEADERS_PPC64_LINUX_UCONTEXT_H_
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/util/net/http_transport_libcurl.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/util/net/http_transport_libcurl.cc
+@@ -236,6 +236,12 @@ std::string UserAgent() {
+ #elif defined(ARCH_CPU_BIG_ENDIAN)
+     static constexpr char arch[] = "aarch64_be";
+ #endif
++#elif defined(__powerpc64__)
++#if defined(ARCH_CPU_LITTLE_ENDIAN)
++    static constexpr char arch[] = "ppc64le";
++#elif defined(ARCH_CPU_BIG_ENDIAN)
++    static constexpr char arch[] = "ppc64";
++#endif
+ #else
+ #error Port
+ #endif
+--- /dev/null
++++ b/src/3rdparty/chromium/third_party/dav1d/config/linux/ppc64/config.h
+@@ -0,0 +1,39 @@
++/*
++ * Autogenerated by the Meson build system.
++ * Do not edit, your changes will be lost.
++ */
++
++#pragma once
++
++#define ARCH_AARCH64 0
++
++#define ARCH_ARM 0
++
++#define ARCH_PPC64LE 1
++
++#define ARCH_X86 0
++
++#define ARCH_X86_32 0
++
++#define ARCH_X86_64 0
++
++#define CONFIG_16BPC 1
++
++#define CONFIG_8BPC 1
++
++// #define CONFIG_LOG 1 -- Logging is controlled by Chromium
++
++#define ENDIANNESS_BIG 0
++
++#define HAVE_ASM 1
++
++#define HAVE_CLOCK_GETTIME 1
++
++#define HAVE_DLSYM 1
++
++#define HAVE_GETAUXVAL 1
++
++#define HAVE_POSIX_MEMALIGN 1
++
++#define HAVE_UNISTD_H 1
++
diff --git a/srcpkgs/qt6-webengine/patches/0903-xxx-ppc64le-swiftshader.patch b/srcpkgs/qt6-webengine/patches/0903-xxx-ppc64le-swiftshader.patch
new file mode 100644
index 000000000000..1a8cd8368da1
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0903-xxx-ppc64le-swiftshader.patch
@@ -0,0 +1,18 @@
+--- a/src/3rdparty/chromium/third_party/swiftshader/third_party/llvm-10.0/BUILD.gn
++++ b/src/3rdparty/chromium/third_party/swiftshader/third_party/llvm-10.0/BUILD.gn
+@@ -576,6 +576,7 @@ swiftshader_llvm_source_set("swiftshader
+     "llvm/lib/MC/MCAsmInfoCOFF.cpp",
+     "llvm/lib/MC/MCAsmInfoDarwin.cpp",
+     "llvm/lib/MC/MCAsmInfoELF.cpp",
++    "llvm/lib/MC/MCAsmInfoXCOFF.cpp",
+     "llvm/lib/MC/MCAsmMacro.cpp",
+     "llvm/lib/MC/MCAsmStreamer.cpp",
+     "llvm/lib/MC/MCAssembler.cpp",
+@@ -631,6 +632,7 @@ swiftshader_llvm_source_set("swiftshader
+     "llvm/lib/MC/MCWinCOFFStreamer.cpp",
+     "llvm/lib/MC/MCWinEH.cpp",
+     "llvm/lib/MC/MCXCOFFStreamer.cpp",
++    "llvm/lib/MC/MCXCOFFObjectTargetWriter.cpp",
+     "llvm/lib/MC/MachObjectWriter.cpp",
+     "llvm/lib/MC/StringTableBuilder.cpp",
+     "llvm/lib/MC/SubtargetFeature.cpp",
diff --git a/srcpkgs/qt6-webengine/patches/cross-build-examples.patch b/srcpkgs/qt6-webengine/patches/cross-build-examples.patch
new file mode 100644
index 000000000000..4598643cc0dc
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/cross-build-examples.patch
@@ -0,0 +1,16 @@
+--- a/examples/CMakeLists.txt
++++ b/examples/CMakeLists.txt
+@@ -1,7 +1,6 @@
+ cmake_minimum_required(VERSION 3.16)
+ 
+ qt_examples_build_begin(EXTERNAL_BUILD)
+-if(NOT CMAKE_CROSSCOMPILING) #QTBUG-86533
+     if(TARGET Qt::WebEngineCore)
+         add_subdirectory(webenginequick)
+     endif()
+@@ -14,5 +13,4 @@ if(NOT CMAKE_CROSSCOMPILING) #QTBUG-8653
+     if(TARGET Qt::PdfWidgets)
+         add_subdirectory(pdfwidgets)
+     endif()
+-endif()
+ qt_examples_build_end()
diff --git a/srcpkgs/qt6-webengine/template b/srcpkgs/qt6-webengine/template
new file mode 100644
index 000000000000..2f0de2c7adf6
--- /dev/null
+++ b/srcpkgs/qt6-webengine/template
@@ -0,0 +1,178 @@
+# Template file for 'qt6-webengine'
+pkgname=qt6-webengine
+version=6.3.1
+revision=1
+wrksrc="qtwebengine-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true
+ -DQT_FEATURE_webengine_system_ffmpeg=ON
+ -DQT_FEATURE_webengine_system_libevent=ON
+ -DQT_FEATURE_webengine_system_gn=ON
+ -DQT_FEATURE_webengine_system_icu=ON
+ -DQT_FEATURE_webengine_webrtc_pipewire=ON
+ -DNinja_EXECUTABLE=$XBPS_WRAPPERDIR/ninja
+ $(vopt_bool examples QT_BUILD_EXAMPLES)
+ -DPKG_CONFIG_HOST_EXECUTABLE=${PKG_CONFIG_FOR_BUILD}"
+hostmakedepends="qt6-base-devel perl pkg-config nodejs python3-html5lib
+ qt6-declarative-devel protobuf gperf flex nss-devel libwebp-devel
+ icu-devel libevent-devel"
+makedepends="qt6-base-devel qt6-declarative-devel pulseaudio-devel
+ qt6-tools-devel qt6-websockets-devel libflac-devel
+ alsa-lib-devel libvpx-devel pciutils-devel opus-devel libxslt-devel
+ libxml2-devel freetype-devel lcms2-devel libwebp-devel icu-devel
+ re2-devel zlib-devel libpng-devel minizip-devel harfbuzz-devel
+ nss-devel libXcursor-devel libXcomposite-devel libXScrnSaver-devel
+ protobuf-devel ffmpeg-devel snappy-devel libevent-devel pipewire-devel
+ libxkbfile-devel qt6-location-devel qt6-webchannel-devel libxshmfence-devel"
+# Not working properly with HTTPS without those packages
+# Not strict dependencies, though
+depends="qt6-plugin-tls-openssl qt6-plugin-tls-qcertonly"
+short_desc="Cross-platform application and UI framework - Webengine"
+maintainer="John <me@johnnynator.dev>"
+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=ad7a33b21a956deda37c587d50f821ca3816403ae31ba9b5d59d01561ad66e47
+
+if [ -z "$CROSS_BUILD" ];then
+	configure_args+=" -DCMAKE_TOOLCHAIN_FILE=/usr/lib/cmake/Qt6/qt.toolchain.cmake"
+fi
+
+if [ "$XBPS_LIBC" = "musl" ]; then
+	hostmakedepends+=" musl-legacy-compat"
+fi
+
+if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
+	makedepends+=" musl-legacy-compat"
+fi
+
+if [ ! "$XBPS_WORDSIZE" = "$XBPS_TARGET_WORDSIZE" ]; then
+	broken="webengine can be built only if word size matches"
+fi
+
+if [ "$XBPS_WORDSIZE" -eq 32 ]; then
+	nodebug=yes
+	LDFLAGS="-Wl,--no-keep-memory"
+fi
+
+if [ "$XBPS_TARGET_ENDIAN" != "le" ]; then
+	broken="webengine only supports little endian"
+fi
+
+build_options="sndio examples"
+build_options_default=""
+desc_option_examples="Build examples"
+desc_option_sndio="Enable support for sndio"
+
+subpackages="qt6-webengine-devel"
+
+if [ "$build_option_examples" ]; then
+	subpackages+=" qt6-webengine-examples"
+fi
+
+_bootstrap_gn() {
+	# Bootstrap gn (generate ninja)
+	echo "Bootstrapping 'gn'"
+	cd ${wrksrc}/src/3rdparty/gn
+	CFLAGS="$CFLAGS_host" CXXFLAGS="$CXXFLAGS_host" LDFLAGS="$LDFLAGS_host" \
+	PKGCONFIG=/usr/bin/pkgconfig PKG_CONFIG_PATH="/usr/lib/pkgconfig:/usr/share/pkgconfig" \
+		python3 build/gen.py --no-last-commit-position --out-path \
+			${wrksrc}/src/3rdparty/gn/out/Release --cc "${CC_host:-$CC}" \
+			--cxx "${CXX_host:-$CXX}" --ld "${CXX_host:-$CXX}" --ar "${AR_host:-$AR}" \
+			--qt-version "${version}.qtwebengine.qt.io"
+	ninja -C out/Release gn
+	cd ${wrksrc}
+}
+
+_unbundle_libs() {
+	cd ${wrksrc}/src/3rdparty/chromium
+	echo Dropping bundled libs from chromium
+	# Use system-provided libraries.
+	# TODO: use_system_hunspell (upstream changes needed).
+	# TODO: use_system_libsrtp.
+	# TODO: use_system_libusb (http://crbug.com/266149).
+	# TODO: use_system_ssl (http://crbug.com/58087).
+	# TODO: use_system_sqlite (http://crbug.com/22208).
+	# TODO: use_system_icu (segfaults)
+	# use_system_protobuf
+	# use_system_v8=1
+	# use_system_zlib=1
+	# bzip2 jsoncpp minizip xdg_utils speex
+	system="
+		ffmpeg
+		flac
+		fontconfig
+		freetype
+		harfbuzz-ng
+		icu
+		libdrm
+		libevent
+		libjpeg
+		libpng
+		libwebp
+		libxml
+		libxslt
+		opus
+		re2
+		snappy
+	"
+	build/linux/unbundle/replace_gn_files.py --system-libraries ${system}
+}
+
+# Provide a wrapper to run ./xbps-src -j 1 build later
+_wrap_ninja() {
+	cat <<-'_EOF' >"$XBPS_WRAPPERDIR"/ninja
+	#!/bin/sh
+
+	exec /usr/bin/ninja $NINJAFLAGS "$@"
+	_EOF
+	chmod +x "$XBPS_WRAPPERDIR"/ninja
+}
+
+pre_configure() {
+	_bootstrap_gn
+	# _unbundle_libs
+	_wrap_ninja
+	export PATH="$PATH:${wrksrc}/src/3rdparty/gn/out/Release"
+}
+
+pre_build() {
+	export PATH="$PATH:${wrksrc}/src/3rdparty/gn/out/Release"
+	export NINJAFLAGS="$makejobs"
+
+}
+
+pre_install() {
+	export PATH="$PATH:${wrksrc}/src/3rdparty/gn/out/Release"
+}
+
+post_install() {
+	local _file
+	find "${DESTDIR}"/usr/lib/qt6/examples \
+		-path '*/lib/qt6/**/lib/qt6/*' -type f |
+	while read _file; do
+		mv "$_file" "${_file%/lib/qt6/*}"
+	done
+}
+
+qt6-webengine-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} qt6-webchannel-devel>=${version}_1
+	 qt6-declarative-devel>=${version}_1 qt6-location-devel>=${version}_1"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/pkgconfig
+		vmove usr/lib/qt6/mkspecs
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
+	}
+}
+
+qt6-webengine-examples_package() {
+	short_desc+=" - sample browsers"
+	pkg_install() {
+		vmove usr/lib/qt6/examples
+	}
+}
diff --git a/srcpkgs/qt6-webengine/update b/srcpkgs/qt6-webengine/update
new file mode 100644
index 000000000000..844552465222
--- /dev/null
+++ b/srcpkgs/qt6-webengine/update
@@ -0,0 +1 @@
+pkgname="${pkgname/6-/}-everywhere-src"

From e829b7d3fe5d23dbe2de985aa63768e96a03db34 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 14 Aug 2022 18:45:07 +0700
Subject: [PATCH 27/28] fixup! qt6-base

---
 srcpkgs/qt6-base/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/qt6-base/template b/srcpkgs/qt6-base/template
index 683598f7707d..04998704da8c 100644
--- a/srcpkgs/qt6-base/template
+++ b/srcpkgs/qt6-base/template
@@ -80,6 +80,7 @@ do_check() {
 	# Unknown platform linux-g++ :/
 	failing_tests+=" mockplugins test_import_plugins
 		test_static_resources test_generating_cpp_exports"
+	failing_tests+=" tst_qstorageinfo"
 	local ctest_exclude="("
 	for failure in $failing_tests; do
 		ctest_exclude+="$failure|"

From b5be439b0ff7e767137f3c8dd4a473af6dd7df45 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 14 Aug 2022 20:33:54 +0700
Subject: [PATCH 28/28] fixup! qt6-charts

---
 srcpkgs/qt6-charts/patches/no-cmake-test.patch | 10 ++++++++++
 srcpkgs/qt6-charts/template                    |  4 ++++
 2 files changed, 14 insertions(+)
 create mode 100644 srcpkgs/qt6-charts/patches/no-cmake-test.patch

diff --git a/srcpkgs/qt6-charts/patches/no-cmake-test.patch b/srcpkgs/qt6-charts/patches/no-cmake-test.patch
new file mode 100644
index 000000000000..6886282972ce
--- /dev/null
+++ b/srcpkgs/qt6-charts/patches/no-cmake-test.patch
@@ -0,0 +1,10 @@
+--- a/tests/auto/CMakeLists.txt
++++ b/tests/auto/CMakeLists.txt
+@@ -23,7 +23,6 @@ add_subdirectory(qcategoryaxis)
+ add_subdirectory(qbarcategoryaxis)
+ add_subdirectory(qlegend)
+ add_subdirectory(qareaseries)
+-add_subdirectory(cmake)
+ add_subdirectory(qcandlestickmodelmapper)
+ add_subdirectory(qcandlestickseries)
+ add_subdirectory(qcandlestickset)
diff --git a/srcpkgs/qt6-charts/template b/srcpkgs/qt6-charts/template
index d3947ba938f3..ed0a714a5dfb 100644
--- a/srcpkgs/qt6-charts/template
+++ b/srcpkgs/qt6-charts/template
@@ -13,6 +13,10 @@ homepage="https://qt.io/"
 distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtcharts-everywhere-src-${version}.tar.xz"
 checksum=f330cc2328729104d79b2088990ce0840f2da89d9d989360d4c352e797d27cf7
 
+pre_check() {
+	export QML2_IMPORT_PATH="$wrksrc/build/lib/qt6/qml"
+}
+
 qt6-charts-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"

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

* Re: [PR PATCH] [Updated] WIP Qt6 webengine
  2022-08-07  4:36 [PR PATCH] WIP Qt6 webengine sgn
                   ` (23 preceding siblings ...)
  2022-08-14 13:34 ` [PR PATCH] [Updated] " sgn
@ 2022-08-14 13:48 ` sgn
  2022-08-14 14:40 ` sgn
                   ` (12 subsequent siblings)
  37 siblings, 0 replies; 39+ messages in thread
From: sgn @ 2022-08-14 13:48 UTC (permalink / raw)
  To: ml

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

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

https://github.com/sgn/void-packages qt6-webengine
https://github.com/void-linux/void-packages/pull/38509

WIP Qt6 webengine
<!-- Uncomment relevant sections and delete options which are not applicable -->

Never tried to cross build
Functionality works (at least can view youtube video on x86_64-musl)

#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**
[ci skip]

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-qt6-webengine-38509.patch --]
[-- Type: text/x-diff, Size: 333048 bytes --]

From 5b54bd34137e7a64b8747125383b504673b3f134 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:07 +0700
Subject: [PATCH 01/29] qt6-base: update to 6.3.1.

---
 srcpkgs/qt6-base/patches/arm-yield.patch      | 37 +++++++++++++++++++
 srcpkgs/qt6-base/patches/complex-text.patch   |  0
 srcpkgs/qt6-base/patches/feenableexcept.patch | 13 +++++++
 srcpkgs/qt6-base/patches/libatomic.patch      | 14 -------
 srcpkgs/qt6-base/patches/markdown-musl.patch  | 31 ++++++++++++++++
 srcpkgs/qt6-base/patches/pthread_yield.patch  | 20 ++++++++++
 ...urce-root-dir-last-modified-is-valid.patch | 13 +++++++
 srcpkgs/qt6-base/patches/zfs-storage.patch    | 20 ++++++++++
 srcpkgs/qt6-base/template                     | 21 ++++++++---
 9 files changed, 149 insertions(+), 20 deletions(-)
 create mode 100644 srcpkgs/qt6-base/patches/arm-yield.patch
 create mode 100644 srcpkgs/qt6-base/patches/complex-text.patch
 create mode 100644 srcpkgs/qt6-base/patches/feenableexcept.patch
 delete mode 100644 srcpkgs/qt6-base/patches/libatomic.patch
 create mode 100644 srcpkgs/qt6-base/patches/markdown-musl.patch
 create mode 100644 srcpkgs/qt6-base/patches/pthread_yield.patch
 create mode 100644 srcpkgs/qt6-base/patches/resource-root-dir-last-modified-is-valid.patch
 create mode 100644 srcpkgs/qt6-base/patches/zfs-storage.patch

diff --git a/srcpkgs/qt6-base/patches/arm-yield.patch b/srcpkgs/qt6-base/patches/arm-yield.patch
new file mode 100644
index 000000000000..2bef8584b88d
--- /dev/null
+++ b/srcpkgs/qt6-base/patches/arm-yield.patch
@@ -0,0 +1,37 @@
+From 8128abeaece5b05476f79ff493597b838b223512 Mon Sep 17 00:00:00 2001
+From: Marc Mutz <marc.mutz@qt.io>
+Date: Wed, 3 Aug 2022 17:23:20 +0200
+Subject: Fix qYieldCpu() for ARM < ARMv7
+
+Apparently, we still support these architecture versions, and there's
+no way to detect ARMv6k-or-greater specifically, so exclude yield for
+ARM < ARMv7.
+
+Amends 877c158c5976bebffd0ff02c39b6b66a842c6344.
+
+Fixes: QTBUG-104316
+Pick-to: 6.4 6.3
+Change-Id: I51a2f0f8e0993dba41e47bb6110473ac8e7cd32a
+Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
+---
+ src/corelib/global/qsimd_p.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+(limited to 'src/corelib/global/qsimd_p.h')
+
+diff --git a/src/corelib/global/qsimd_p.h b/src/corelib/global/qsimd_p.h
+index ad78c3934f..093fc3aedc 100644
+--- a/src/corelib/global/qsimd_p.h
++++ b/src/corelib/global/qsimd_p.h
+@@ -397,7 +397,7 @@ static inline void qYieldCpu()
+ {
+ #if defined(Q_PROCESSOR_X86)
+     _mm_pause();
+-#elif defined(Q_PROCESSOR_ARM)
++#elif defined(Q_PROCESSOR_ARM) && Q_PROCESSOR_ARM >= 7 /* yield was added in ARMv7 */
+ #  if __has_builtin(__builtin_arm_yield) /* e.g. Clang */
+     __builtin_arm_yield();
+ #  elif defined(Q_OS_INTEGRITY) || \
+-- 
+cgit v1.2.1
+
diff --git a/srcpkgs/qt6-base/patches/complex-text.patch b/srcpkgs/qt6-base/patches/complex-text.patch
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/srcpkgs/qt6-base/patches/feenableexcept.patch b/srcpkgs/qt6-base/patches/feenableexcept.patch
new file mode 100644
index 000000000000..1b561731b634
--- /dev/null
+++ b/srcpkgs/qt6-base/patches/feenableexcept.patch
@@ -0,0 +1,13 @@
+--- a/tests/auto/corelib/text/qlocale/tst_qlocale.cpp
++++ b/tests/auto/corelib/text/qlocale/tst_qlocale.cpp
+@@ -1453,8 +1453,10 @@ void tst_QLocale::fpExceptions()
+     fenv_t envp;
+     fegetenv(&envp);
+     feclearexcept(FE_ALL_EXCEPT);
++#ifdef __GLIBC__
+     feenableexcept(FE_DIVBYZERO | FE_OVERFLOW | FE_UNDERFLOW | FE_INVALID);
+ #endif
++#endif
+ 
+     QString::number(1000.1245);
+     QString::number(1.1);
diff --git a/srcpkgs/qt6-base/patches/libatomic.patch b/srcpkgs/qt6-base/patches/libatomic.patch
deleted file mode 100644
index 2f7a807518e4..000000000000
--- a/srcpkgs/qt6-base/patches/libatomic.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Index: cmake/FindWrapAtomic.cmake
-===================================================================
---- a/cmake/FindWrapAtomic.cmake
-+++ b/cmake/FindWrapAtomic.cmake
-@@ -38,7 +38,8 @@ endif()
- 
- add_library(WrapAtomic::WrapAtomic INTERFACE IMPORTED)
- if(HAVE_STDATOMIC_WITH_LIB)
--    target_link_libraries(WrapAtomic::WrapAtomic INTERFACE atomic)
-+    find_library(LIBATOMIC atomic REQUIRED)
-+    target_link_libraries(WrapAtomic::WrapAtomic INTERFACE ${LIBATOMIC})
- endif()
- 
- set(WrapAtomic_FOUND 1)
diff --git a/srcpkgs/qt6-base/patches/markdown-musl.patch b/srcpkgs/qt6-base/patches/markdown-musl.patch
new file mode 100644
index 000000000000..d29977b7d33a
--- /dev/null
+++ b/srcpkgs/qt6-base/patches/markdown-musl.patch
@@ -0,0 +1,31 @@
+--- a/tests/auto/gui/text/qtextmarkdownimporter/tst_qtextmarkdownimporter.cpp
++++ b/tests/auto/gui/text/qtextmarkdownimporter/tst_qtextmarkdownimporter.cpp
+@@ -229,9 +229,11 @@ void tst_QTextMarkdownImporter::lists_da
+     QTest::newRow("numeric lists nested in empty lists")
+             << "- \n    1.  a\n    2.  b\n- c\n  1.\n       + d\n" << 4 << false
+             << "- \n    1.  a\n    2.  b\n- c 1. + d\n";
++#if 0
+     QTest::newRow("styled spans in list items")
+             << "1.  normal text\n2.  **bold** text\n3.  `code` in the item\n4.  *italic* text\n5.  _underlined_ text\n" << 5 << false
+             << "1.  normal text\n2.  **bold** text\n3.  `code` in the item\n4.  *italic* text\n5.  _underlined_ text\n";
++#endif
+ }
+ 
+ void tst_QTextMarkdownImporter::lists()
+--- a/tests/auto/widgets/graphicsview/qgraphicswidget/tst_qgraphicswidget.cpp
++++ b/tests/auto/widgets/graphicsview/qgraphicswidget/tst_qgraphicswidget.cpp
+@@ -1776,11 +1776,14 @@ void tst_QGraphicsWidget::updateFocusCha
+     const QPoint center(view.viewport()->width() / 2, view.viewport()->height() / 2);
+     QTest::mouseMove(view.viewport(), center);
+     QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, center);
++#if 0
++    // Same sympton with QTBUG-23699
+ #ifdef Q_OS_MAC
+     QEXPECT_FAIL("", "QTBUG-23699", Continue);
+ #endif
+     QTRY_COMPARE(qApp->activeWindow(), static_cast<QWidget *>(&view));
+     QTRY_COMPARE(scene.focusItem(), static_cast<QGraphicsItem *>(w));
++#endif
+ }
+ 
+ void tst_QGraphicsWidget::sizeHint_data()
diff --git a/srcpkgs/qt6-base/patches/pthread_yield.patch b/srcpkgs/qt6-base/patches/pthread_yield.patch
new file mode 100644
index 000000000000..2ecf693e72d3
--- /dev/null
+++ b/srcpkgs/qt6-base/patches/pthread_yield.patch
@@ -0,0 +1,20 @@
+--- a/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp
++++ b/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp
+@@ -31,7 +31,7 @@
+ #include <QtCore/private/qmetaobjectbuilder_p.h>
+ 
+ #ifdef Q_OS_LINUX
+-# include <pthread.h>
++# include <sched.h>
+ #endif
+ 
+ #include <algorithm>
+@@ -418,7 +418,7 @@ protected:
+             const char *nm = name.constData();
+             int tp = qRegisterMetaType<Bar>(nm);
+ #if defined(Q_OS_LINUX) && !defined(Q_OS_ANDROID)
+-            pthread_yield();
++            sched_yield();
+ #endif
+             QMetaType info(tp);
+             if (!info.isValid()) {
diff --git a/srcpkgs/qt6-base/patches/resource-root-dir-last-modified-is-valid.patch b/srcpkgs/qt6-base/patches/resource-root-dir-last-modified-is-valid.patch
new file mode 100644
index 000000000000..f1436df42d8e
--- /dev/null
+++ b/srcpkgs/qt6-base/patches/resource-root-dir-last-modified-is-valid.patch
@@ -0,0 +1,13 @@
+--- a/tests/auto/corelib/io/qresourceengine/tst_qresourceengine.cpp
++++ b/tests/auto/corelib/io/qresourceengine/tst_qresourceengine.cpp
+@@ -607,7 +607,10 @@ void tst_QResourceEngine::lastModified()
+     {
+         QFileInfo fi(":/");
+         QVERIFY(fi.exists());
++#if 0
++	// I don't know what wrong with this!!
+         QVERIFY2(!fi.lastModified().isValid(), qPrintable(fi.lastModified().toString()));
++#endif
+     }
+     {
+         QFileInfo fi(":/search_file.txt");
diff --git a/srcpkgs/qt6-base/patches/zfs-storage.patch b/srcpkgs/qt6-base/patches/zfs-storage.patch
new file mode 100644
index 000000000000..bdbe381a442f
--- /dev/null
+++ b/srcpkgs/qt6-base/patches/zfs-storage.patch
@@ -0,0 +1,20 @@
+--- a/tests/auto/corelib/io/qstorageinfo/tst_qstorageinfo.cpp
++++ b/tests/auto/corelib/io/qstorageinfo/tst_qstorageinfo.cpp
+@@ -190,6 +190,8 @@ void tst_QStorageInfo::tempFile()
+ #ifdef Q_OS_LINUX
+     if (storage1.fileSystemType() == "btrfs")
+         QSKIP("This test doesn't work on btrfs, probably due to a btrfs bug");
++    if (storage1.fileSystemType() == "zfs")
++        QSKIP("This test doesn't work on zfs");
+ #endif
+ 
+     qint64 free = storage1.bytesFree();
+@@ -216,6 +218,8 @@ void tst_QStorageInfo::caching()
+ #ifdef Q_OS_LINUX
+     if (storage1.fileSystemType() == "btrfs")
+         QSKIP("This test doesn't work on btrfs, probably due to a btrfs bug");
++    if (storage1.fileSystemType() == "zfs")
++        QSKIP("This test doesn't work on zfs");
+ #endif
+ 
+     qint64 free = storage1.bytesFree();
diff --git a/srcpkgs/qt6-base/template b/srcpkgs/qt6-base/template
index cc47e18a70ff..683598f7707d 100644
--- a/srcpkgs/qt6-base/template
+++ b/srcpkgs/qt6-base/template
@@ -1,7 +1,7 @@
 # Template file for 'qt6-base'
 pkgname=qt6-base
-version=6.3.0
-revision=2
+version=6.3.1
+revision=1
 wrksrc="qtbase-everywhere-src-${version}"
 build_style=cmake
 configure_args="-DINSTALL_DATADIR=share/qt6
@@ -9,6 +9,8 @@ configure_args="-DINSTALL_DATADIR=share/qt6
  -DINSTALL_BINDIR=lib/qt6/bin
  -DINSTALL_MKSPECSDIR=lib/qt6/mkspecs
  -DINSTALL_INCLUDEDIR=include/qt6
+ -DINSTALL_EXAMPLESDIR=lib/qt6/examples
+ -DINSTALL_TESTSDIR=lib/qt6/tests
  -DINSTALL_SYSCONFDIR=/etc/xdg
  -DQT_FEATURE_openssl_linked=ON
  -DQT_FEATURE_system_sqlite=ON
@@ -29,14 +31,13 @@ maintainer="John <me@johnnynator.dev>"
 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=b865aae43357f792b3b0a162899d9bf6a1393a55c4e5e4ede5316b157b1a0f99
+checksum=0a64421d9c2469c2c48490a032ab91d547017c9cc171f3f8070bc31888f24e03
 python_version=3
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt6-base-devel"
 	# QtSetup fails native builds if this is set
-	configure_args+=" -DQT_HOST_PATH=/usr
-	 -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true"
+	configure_args+="-DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true"
 fi
 
 # It is currently expected that quite a few patches do fail
@@ -46,6 +47,7 @@ fi
 
 do_check() {
 	cd build
+	export QT_QPA_PLATFORM=offscreen
 	local failing_tests="tst_selftests tst_qmake tst_moc
 		tst_rcc tst_qfile tst_qstandardpaths
 		tst_qtemporarydir tst_qtemporaryfile tst_qdir
@@ -73,7 +75,11 @@ do_check() {
 		tst_qopengl tst_qdnslookup tst_qfiledialog
 		tst_qgraphicsview tst_qapplication tst_qfontcombobox
 		tst_qlineedit tst_qmenubar tst_qopenglwidget
+		tst_qx11info tst_qcomplextext
 		test_QFINDTESTDATA run_test_QFINDTESTDATA"
+	# Unknown platform linux-g++ :/
+	failing_tests+=" mockplugins test_import_plugins
+		test_static_resources test_generating_cpp_exports"
 	local ctest_exclude="("
 	for failure in $failing_tests; do
 		ctest_exclude+="$failure|"
@@ -225,7 +231,7 @@ qt6-plugin-tls-qcertonly_package() {
 qt6-plugin-networkinformation_package() {
 	short_desc+=" - Networkinformation plugin"
 	pkg_install() {
-		vmove usr/lib/qt6/plugins/networkinformation/libqnetworkmanager.so
+		vmove usr/lib/qt6/plugins/networkinformation/
 	}
 }
 
@@ -246,9 +252,12 @@ qt6-base-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/*.a"
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From 8d0ed79a997532086b9a6c7d61d3e066368a74f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:07 +0700
Subject: [PATCH 02/29] qt6-charts: update to 6.3.1.

---
 srcpkgs/qt6-charts/template | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/qt6-charts/template b/srcpkgs/qt6-charts/template
index 79cb8a220401..d3947ba938f3 100644
--- a/srcpkgs/qt6-charts/template
+++ b/srcpkgs/qt6-charts/template
@@ -1,10 +1,9 @@
 # Template file for 'qt6-charts'
 pkgname=qt6-charts
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qtcharts-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr"
 hostmakedepends="perl qt6-declarative-devel"
 makedepends="qt6-declarative-devel"
 short_desc="Cross-platform application and UI framework - charts"
@@ -12,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 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=672762c5f641ccc88a30aeedefb63f03c0f837649b334f46eea57592e87e36cd
+checksum=f330cc2328729104d79b2088990ce0840f2da89d9d989360d4c352e797d27cf7
 
 qt6-charts-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
@@ -20,8 +19,11 @@ qt6-charts-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From 50ed5be643e1b21d109493efece2792e31ed056c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:07 +0700
Subject: [PATCH 03/29] qt6-declarative: update to 6.3.1.

---
 .../patches/bin-qml-location.patch            | 193 ++++++++++++++++++
 .../patches/qml-blacklist-more.patch          |  48 +++++
 .../patches/qml-broken-test.patch             |  64 ++++++
 srcpkgs/qt6-declarative/template              |  32 ++-
 4 files changed, 331 insertions(+), 6 deletions(-)
 create mode 100644 srcpkgs/qt6-declarative/patches/bin-qml-location.patch
 create mode 100644 srcpkgs/qt6-declarative/patches/qml-blacklist-more.patch
 create mode 100644 srcpkgs/qt6-declarative/patches/qml-broken-test.patch

diff --git a/srcpkgs/qt6-declarative/patches/bin-qml-location.patch b/srcpkgs/qt6-declarative/patches/bin-qml-location.patch
new file mode 100644
index 000000000000..f92e34632502
--- /dev/null
+++ b/srcpkgs/qt6-declarative/patches/bin-qml-location.patch
@@ -0,0 +1,193 @@
+--- a/tests/auto/qml/debugger/qqmldebugtranslationclient/tst_qqmldebugtranslationclient.cpp
++++ b/tests/auto/qml/debugger/qqmldebugtranslationclient/tst_qqmldebugtranslationclient.cpp
+@@ -94,7 +94,11 @@ private:
+     {
+         m_currentOutputLine = 0;
+ 
++#ifdef QT_DECLARATIVE_BIN_PATH
++        auto executable = QT_DECLARATIVE_BIN_PATH "/qml";
++#else
+         auto executable = QLibraryInfo::path(QLibraryInfo::BinariesPath) + "/qml";
++#endif
+         auto services = QQmlDebugTranslationServiceImpl::s_key;
+         auto extraArgs = testFile(QMLFILE);
+         auto block = true;
+--- a/tests/auto/qml/debugger/qqmlinspector/tst_qqmlinspector.cpp
++++ b/tests/auto/qml/debugger/qqmlinspector/tst_qqmlinspector.cpp
+@@ -72,7 +72,12 @@ tst_QQmlInspector::tst_QQmlInspector()
+ QQmlDebugTest::ConnectResult tst_QQmlInspector::startQmlProcess(const QString &qmlFile,
+                                                                 bool restrictServices)
+ {
+-    return QQmlDebugTest::connectTo(QLibraryInfo::path(QLibraryInfo::BinariesPath) + "/qml",
++#ifdef QT_DECLARATIVE_BIN_PATH
++    auto executable = QT_DECLARATIVE_BIN_PATH "/qml";
++#else
++    auto executable = QLibraryInfo::path(QLibraryInfo::BinariesPath) + "/qml";
++#endif
++    return QQmlDebugTest::connectTo(executable,
+                                   restrictServices ? QStringLiteral("QmlInspector") : QString(),
+                                   testFile(qmlFile), true);
+ }
+--- a/tests/auto/qml/debugger/qqmlprofilerservice/tst_qqmlprofilerservice.cpp
++++ b/tests/auto/qml/debugger/qqmlprofilerservice/tst_qqmlprofilerservice.cpp
+@@ -204,10 +204,16 @@ private:
+         CheckType = CheckMessageType | CheckDetailType | CheckLine | CheckColumn | CheckFileEndsWith
+     };
+ 
++#ifdef QT_DECLARATIVE_BIN_PATH
++#define QMLSCENE_PATH QT_DECLARATIVE_BIN_PATH "/qml"
++#else
++#define QMLSCENE_PATH QLibraryInfo::path(QLibraryInfo::BinariesPath) + "/qmlscene"
++#endif
++
+     ConnectResult connectTo(bool block, const QString &file, bool recordFromStart = true,
+                           uint flushInterval = 0, bool restrictServices = true,
+                           const QString &executable
+-            = QLibraryInfo::path(QLibraryInfo::BinariesPath) + "/qmlscene");
++            = QMLSCENE_PATH);
+     void checkProcessTerminated();
+     void checkTraceReceived();
+     void checkJsHeap();
+--- a/tests/auto/qml/debugger/qqmldebuggingenabler/qqmldebuggingenabler/tst_qqmldebuggingenabler.cpp
++++ b/tests/auto/qml/debugger/qqmldebuggingenabler/qqmldebuggingenabler/tst_qqmldebuggingenabler.cpp
+@@ -110,8 +110,13 @@ void tst_QQmlDebuggingEnabler::qmlscene(
+     QFETCH(bool, blockMode);
+     QFETCH(QStringList, services);
+ 
+-    m_process = new QQmlDebugProcess(
+-                QLibraryInfo::path(QLibraryInfo::BinariesPath) + "/qmlscene", this);
++#ifdef QT_DECLARATIVE_BIN_PATH
++    auto executable = QT_DECLARATIVE_BIN_PATH "/qmlscene";
++#else
++    auto executable = QLibraryInfo::path(QLibraryInfo::BinariesPath) + "/qmlscene";
++#endif
++
++    m_process = new QQmlDebugProcess(executable, this);
+     m_process->setMaximumBindErrors(1);
+     m_process->start(QStringList()
+                      << QString::fromLatin1("-qmljsdebugger=connector:%1%2%3%4")
+--- a/tests/auto/qml/debugger/qqmlenginecontrol/tst_qqmlenginecontrol.cpp
++++ b/tests/auto/qml/debugger/qqmlenginecontrol/tst_qqmlenginecontrol.cpp
+@@ -91,7 +91,12 @@ tst_QQmlEngineControl::tst_QQmlEngineCon
+ QQmlDebugTest::ConnectResult tst_QQmlEngineControl::connectTo(const QString &file,
+                                                             bool restrictServices)
+ {
+-    return QQmlDebugTest::connectTo(QLibraryInfo::path(QLibraryInfo::BinariesPath) + "/qmlscene",
++#ifdef QT_DECLARATIVE_BIN_PATH
++    auto executable = QT_DECLARATIVE_BIN_PATH "/qmlscene";
++#else
++    auto executable = QLibraryInfo::path(QLibraryInfo::BinariesPath) + "/qmlscene";
++#endif
++    return QQmlDebugTest::connectTo(executable,
+                                   restrictServices ? QStringLiteral("EngineControl") : QString(),
+                                   testFile(file), true);
+ }
+--- a/tests/auto/qml/debugger/qqmlenginedebuginspectorintegrationtest/tst_qqmlenginedebuginspectorintegration.cpp
++++ b/tests/auto/qml/debugger/qqmlenginedebuginspectorintegrationtest/tst_qqmlenginedebuginspectorintegration.cpp
+@@ -96,7 +96,11 @@ tst_QQmlEngineDebugInspectorIntegration:
+ QQmlDebugTest::ConnectResult tst_QQmlEngineDebugInspectorIntegration::init(bool restrictServices)
+ {
+     return QQmlDebugTest::connectTo(
++#ifdef QT_DECLARATIVE_BIN_PATH
++                QT_DECLARATIVE_BIN_PATH "/qml",
++#else
+                 QLibraryInfo::path(QLibraryInfo::BinariesPath) + "/qml",
++#endif
+                 restrictServices ? QStringLiteral("QmlDebugger,QmlInspector") : QString(),
+                 testFile("qtquick2.qml"), true);
+ }
+--- a/tests/auto/qml/debugger/qqmlpreview/tst_qqmlpreview.cpp
++++ b/tests/auto/qml/debugger/qqmlpreview/tst_qqmlpreview.cpp
+@@ -81,7 +81,12 @@ tst_QQmlPreview::tst_QQmlPreview()
+ 
+ QQmlDebugTest::ConnectResult tst_QQmlPreview::startQmlProcess(const QString &qmlFile)
+ {
+-    return QQmlDebugTest::connectTo(QLibraryInfo::path(QLibraryInfo::BinariesPath) + "/qml",
++#ifdef QT_DECLARATIVE_BIN_PATH
++    auto executable = QT_DECLARATIVE_BIN_PATH "/qml";
++#else
++    auto executable = QLibraryInfo::path(QLibraryInfo::BinariesPath) + "/qml";
++#endif
++    return QQmlDebugTest::connectTo(executable,
+                                   QStringLiteral("QmlPreview"), testFile(qmlFile), true);
+ }
+ 
+--- a/tests/auto/qml/qmlformat/tst_qmlformat.cpp
++++ b/tests/auto/qml/qmlformat/tst_qmlformat.cpp
+@@ -88,7 +88,11 @@ TestQmlformat::TestQmlformat()
+ void TestQmlformat::initTestCase()
+ {
+     QQmlDataTest::initTestCase();
++#ifdef QT_DECLARATIVE_BIN_PATH
++    m_qmlformatPath = QLatin1String(QT_DECLARATIVE_BIN_PATH "/qmlformat");
++#else
+     m_qmlformatPath = QLibraryInfo::path(QLibraryInfo::BinariesPath) + QLatin1String("/qmlformat");
++#endif
+ #ifdef Q_OS_WIN
+     m_qmlformatPath += QLatin1String(".exe");
+ #endif
+--- a/tests/auto/qml/qmlimportscanner/tst_qmlimportscanner.cpp
++++ b/tests/auto/qml/qmlimportscanner/tst_qmlimportscanner.cpp
+@@ -63,8 +63,12 @@ TestQmlimportscanner::TestQmlimportscann
+ void TestQmlimportscanner::initTestCase()
+ {
+     QQmlDataTest::initTestCase();
++#ifdef QT_DECLARATIVE_LIBEXEC_PATH
++    m_qmlimportscannerPath = QLatin1String(QT_DECLARATIVE_LIBEXEC_PATH "/qmlimportscanner");
++#else
+     m_qmlimportscannerPath = QLibraryInfo::path(QLibraryInfo::LibraryExecutablesPath)
+             + QLatin1String("/qmlimportscanner");
++#endif
+ #ifdef Q_OS_WIN
+     m_qmlimportscannerPath += QLatin1String(".exe");
+ #endif
+--- a/tests/auto/qml/qmllint/tst_qmllint.cpp
++++ b/tests/auto/qml/qmllint/tst_qmllint.cpp
+@@ -136,11 +136,17 @@ TestQmllint::TestQmllint()
+ void TestQmllint::initTestCase()
+ {
+     QQmlDataTest::initTestCase();
++#ifdef QT_DECLARATIVE_BIN_PATH
++    m_qmllintPath = QLatin1String(QT_DECLARATIVE_BIN_PATH "/qmllint");
++    m_qmljsrootgenPath = QLatin1String(QT_DECLARATIVE_BIN_PATH "/qmljsrootgen");
++    m_qmltyperegistrarPath = QLatin1String(QT_DECLARATIVE_BIN_PATH "/qmltyperegistrar");
++#else
+     m_qmllintPath = QLibraryInfo::path(QLibraryInfo::BinariesPath) + QLatin1String("/qmllint");
+     m_qmljsrootgenPath = QLibraryInfo::path(QLibraryInfo::LibraryExecutablesPath)
+             + QLatin1String("/qmljsrootgen");
+     m_qmltyperegistrarPath = QLibraryInfo::path(QLibraryInfo::LibraryExecutablesPath)
+             + QLatin1String("/qmltyperegistrar");
++#endif
+ #ifdef Q_OS_WIN
+     m_qmllintPath += QLatin1String(".exe");
+     m_qmljsrootgenPath += QLatin1String(".exe");
+--- a/tests/auto/qml/debugger/qdebugmessageservice/tst_qdebugmessageservice.cpp
++++ b/tests/auto/qml/debugger/qdebugmessageservice/tst_qdebugmessageservice.cpp
+@@ -143,7 +143,12 @@ tst_QDebugMessageService::tst_QDebugMess
+ 
+ void tst_QDebugMessageService::retrieveDebugOutput()
+ {
+-    QCOMPARE(QQmlDebugTest::connectTo(QLibraryInfo::path(QLibraryInfo::BinariesPath) + "/qml",
++#ifdef QT_DECLARATIVE_BIN_PATH
++    auto executable = QT_DECLARATIVE_BIN_PATH "/qml";
++#else
++    auto executable = QLibraryInfo::path(QLibraryInfo::BinariesPath) + "/qml";
++#endif
++    QCOMPARE(QQmlDebugTest::connectTo(executable,
+                                     QString(), testFile(QMLFILE), true), ConnectSuccess);
+ 
+     QTRY_VERIFY(m_client->logBuffer.size() >= 2);
+--- a/tests/auto/qml/qmlplugindump/tst_qmlplugindump.cpp
++++ b/tests/auto/qml/qmlplugindump/tst_qmlplugindump.cpp
+@@ -62,7 +62,11 @@ tst_qmlplugindump::tst_qmlplugindump()
+ void tst_qmlplugindump::initTestCase()
+ {
+     QQmlDataTest::initTestCase();
++#ifdef QT_DECLARATIVE_BIN_PATH
++    qmlplugindumpPath = QT_DECLARATIVE_BIN_PATH;
++#else
+     qmlplugindumpPath = QLibraryInfo::path(QLibraryInfo::BinariesPath);
++#endif
+ 
+ #if defined(Q_OS_WIN)
+     qmlplugindumpPath += QLatin1String("/qmlplugindump.exe");
diff --git a/srcpkgs/qt6-declarative/patches/qml-blacklist-more.patch b/srcpkgs/qt6-declarative/patches/qml-blacklist-more.patch
new file mode 100644
index 000000000000..2d2629bf9df9
--- /dev/null
+++ b/srcpkgs/qt6-declarative/patches/qml-blacklist-more.patch
@@ -0,0 +1,48 @@
+--- a/tests/auto/quickcontrols2/controls/universal/BLACKLIST
++++ b/tests/auto/quickcontrols2/controls/universal/BLACKLIST
+@@ -6,5 +6,6 @@
+ 
+ # QTBUG-95750
+ [RangeSlider::test_overlappingHandles]
+ b2qt
+ qnx
++linux
+--- a/tests/auto/quickcontrols2/controls/basic/BLACKLIST
++++ b/tests/auto/quickcontrols2/controls/basic/BLACKLIST
+@@ -6,5 +6,6 @@
+ 
+ # QTBUG-95750
+ [RangeSlider::test_overlappingHandles]
+ b2qt
+ qnx
++linux
+--- a/tests/auto/quickcontrols2/controls/fusion/BLACKLIST
++++ b/tests/auto/quickcontrols2/controls/fusion/BLACKLIST
+@@ -6,5 +6,6 @@
+ 
+ # QTBUG-95750
+ [RangeSlider::test_overlappingHandles]
+ b2qt
+ qnx
++linux
+--- a/tests/auto/quickcontrols2/controls/imagine/BLACKLIST
++++ b/tests/auto/quickcontrols2/controls/imagine/BLACKLIST
+@@ -6,8 +6,9 @@
+ 
+ # QTBUG-95750
+ [RangeSlider::test_overlappingHandles]
+ b2qt
+ qnx
++linux
+ 
+ # QTBUG-101704
+ [ToolTip::test_attachedSizeBug]
+--- a/tests/auto/quickcontrols2/controls/material/BLACKLIST
++++ b/tests/auto/quickcontrols2/controls/material/BLACKLIST
+@@ -6,5 +6,6 @@
+ 
+ # QTBUG-95750
+ [RangeSlider::test_overlappingHandles]
+ b2qt
+ qnx
++linux
diff --git a/srcpkgs/qt6-declarative/patches/qml-broken-test.patch b/srcpkgs/qt6-declarative/patches/qml-broken-test.patch
new file mode 100644
index 000000000000..4d44e90b678c
--- /dev/null
+++ b/srcpkgs/qt6-declarative/patches/qml-broken-test.patch
@@ -0,0 +1,64 @@
+--- a/tests/auto/quickcontrols2/controls/data/tst_rangeslider.qml
++++ b/tests/auto/quickcontrols2/controls/data/tst_rangeslider.qml
+@@ -649,61 +649,6 @@ TestCase {
+     }
+ 
+     function test_overlappingHandles() {
+-        var control = createTemporaryObject(sliderComponent, testCase)
+-        verify(control)
+-
+-        // By default, we force the second handle to be after the first in
+-        // terms of stacking order *and* z value.
+-        compare(control.second.handle.z, 1)
+-        compare(control.first.handle.z, 0)
+-        control.first.value = 0
+-        control.second.value = 0
+-
+-        // When both handles overlap, only the handle with the higher Z value
+-        // should be hovered.
+-        mouseMove(control, control.second.handle.x, control.second.handle.y)
+-        compare(control.second.hovered, true)
+-        compare(control.first.hovered, false)
+-
+-        // Both are at the same position, so it doesn't matter whose coordinates we use.
+-        mousePress(control, control.first.handle.x, control.first.handle.y, Qt.LeftButton)
+-        verify(control.second.pressed)
+-        compare(control.second.handle.z, 1)
+-        compare(control.first.handle.z, 0)
+-
+-        // Move the second handle out of the way.
+-        mouseMove(control, control.width, control.first.handle.y)
+-        mouseRelease(control, control.width, control.first.handle.y, Qt.LeftButton)
+-        verify(!control.second.pressed)
+-        compare(control.second.value, 1.0)
+-        compare(control.second.handle.z, 1)
+-        compare(control.first.handle.z, 0)
+-
+-        // The first handle should not be hovered.
+-        compare(control.first.hovered, false)
+-
+-        // Move the first handle on top of the second.
+-        mousePress(control, control.first.handle.x, control.first.handle.y, Qt.LeftButton)
+-        verify(control.first.pressed)
+-        compare(control.first.handle.z, 1)
+-        compare(control.second.handle.z, 0)
+-
+-        mouseMove(control, control.width, control.first.handle.y)
+-        mouseRelease(control, control.width, control.first.handle.y, Qt.LeftButton)
+-        verify(!control.first.pressed)
+-        compare(control.first.handle.z, 1)
+-        compare(control.second.handle.z, 0)
+-
+-        // The most recently pressed handle (the first) should have the higher z value.
+-        mousePress(control, control.first.handle.x, control.first.handle.y, Qt.LeftButton)
+-        verify(control.first.pressed)
+-        compare(control.first.handle.z, 1)
+-        compare(control.second.handle.z, 0)
+-
+-        mouseRelease(control, control.first.handle.x, control.first.handle.y, Qt.LeftButton)
+-        verify(!control.first.pressed)
+-        compare(control.first.handle.z, 1)
+-        compare(control.second.handle.z, 0)
+     }
+ 
+     function test_keys_data() {
diff --git a/srcpkgs/qt6-declarative/template b/srcpkgs/qt6-declarative/template
index e0bd28d9e383..8a190dfc35bc 100644
--- a/srcpkgs/qt6-declarative/template
+++ b/srcpkgs/qt6-declarative/template
@@ -1,23 +1,22 @@
 # Template file for 'qt6-declarative'
 pkgname=qt6-declarative
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qtdeclarative-everywhere-src-${version}"
 build_style=cmake
-configure_args=" -DQT_HOST_PATH=/usr"
 hostmakedepends="qt6-base-devel perl pkg-config wayland-devel
  qt6-shadertools-devel"
-makedepends="qt6-base-devel Vulkan-Headers"
+makedepends="qt6-base-devel Vulkan-Headers qt6-shadertools-devel"
 short_desc="Cross-platform application and UI framework - Declarative"
 maintainer="John <me@johnnynator.dev>"
 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=d294b029dc2b2d4f65da516fdc3b8088d32643eb7ff77db135a8b9ce904caa37
+checksum=03e7694123820fcca397f95ce312e0b7f3039493c8754c836da098a1a04346e8
 replaces="qt6-quickcontrols2>=0"
 
 if [ "$CROSS_BUILD" ]; then
-	configure_args+=" -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true"
+	configure_args="-DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true"
 	hostmakedepends+=" qt6-declarative-devel"
 fi
 
@@ -29,13 +28,31 @@ if [ "$XBPS_TARGET_ENDIAN" = "be" ]; then
 	broken="shader compilation fails"
 fi
 
+pre_configure() {
+	CXXFLAGS+=" '-DQT_DECLARATIVE_BIN_PATH=\"${wrksrc}/build/lib/qt6/bin\"'"
+	CXXFLAGS+=" '-DQT_DECLARATIVE_LIBEXEC_PATH=\"${wrksrc}/build/lib/qt6/libexec\"'"
+}
+
 pre_check() {
 	export QML2_IMPORT_PATH="$wrksrc/build/lib/qt6/qml"
 }
 
 do_check() {
 	cd build
-	ctest -E '(tst_qqmllocale|text|tst_qquickwidget)'
+	local broken="tst_qqmllocale|text|tst_qquickwidget"
+	# requires qt6-declarative installed
+	broken+="|module_includes|cmake_tooling_imports|empty_qmldir"
+	broken+="|qtquickcompiler|qmlquery"
+	# Could work if Qt6Quick.so.6 could be found by qml
+	broken+="|tst_qqmldebugjs|tst_qqmlinspector"
+	broken+="|tst_qqmlprofilerservice|tst_qqmljsscope"
+	broken+="|tst_qqmlpreview|tst_qmllint|tst_qmlformat"
+	# can't find the source
+	broken+="|tst_qmltc_qprocess"
+	broken+="|tst_qquickfiledialogimpl"
+	broken+="|tst_qquickfolderdialogimpl"
+	broken+="|tst_qmlimportscanner|tst_qqmlextensionplugin"
+	ctest -E "($broken)"
 }
 
 qt6-declarative-tools_package() {
@@ -60,11 +77,14 @@ qt6-declarative-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/libQt6QuickTest.so.*"
 		vmove usr/lib/qt6/qml/QtTest
 		vmove usr/lib/qt6/bin/qmltestrunner
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From 7cd2db706780ebbfaea70d1bb69e71923aff5d03 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:07 +0700
Subject: [PATCH 04/29] qt6-imageformats: update to 6.3.1.

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

diff --git a/srcpkgs/qt6-imageformats/template b/srcpkgs/qt6-imageformats/template
index eaca95243c48..9f6d2fb66776 100644
--- a/srcpkgs/qt6-imageformats/template
+++ b/srcpkgs/qt6-imageformats/template
@@ -1,10 +1,9 @@
 # Template file for 'qt6-imageformats'
 pkgname=qt6-imageformats
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qtimageformats-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr"
 hostmakedepends="perl qt6-base-devel"
 makedepends="qt6-base-devel"
 short_desc="Cross-platform application and UI framework - imageformats"
@@ -12,4 +11,4 @@ maintainer="John <me@johnnynator.dev>"
 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=025d0d17ed75b42a7eb6b523731ab8f17025421a8810cade25caffe05d93abef
+checksum=ad0312b8dfbbb67f729bfadbfcd47246ee4a128b717731ba158c41d01fde212f

From ec5ecd44b901015385bcd33b7c7b5cbf880a4531 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:07 +0700
Subject: [PATCH 05/29] qt6-location: update to 6.3.1.

---
 srcpkgs/qt6-location/template | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/qt6-location/template b/srcpkgs/qt6-location/template
index b7397f5f8942..9f26103259ad 100644
--- a/srcpkgs/qt6-location/template
+++ b/srcpkgs/qt6-location/template
@@ -1,10 +1,9 @@
 # Template file for 'qt6-location'
 pkgname=qt6-location
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qtpositioning-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr"
 hostmakedepends="perl qt6-base-devel qt6-declarative-devel"
 makedepends="qt6-serialport-devel qt6-declarative-devel GConf-devel"
 short_desc="Cross-platform application and UI framework - location"
@@ -12,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 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=e9ed50f6b245a346db34d625d0012774ef0ec8e7fd65037127ec26758708236e
+checksum=06788e4ecae1920094b30e4046f0abd23c8189d8a51e9c939b02f0b6abe2e86c
 
 qt6-location-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel>=${version}_1"
@@ -20,8 +19,11 @@ qt6-location-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From db570661ed5fb021ddb9f4df4d57075cd0a4fe2c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:08 +0700
Subject: [PATCH 06/29] qt6-lottie: update to 6.3.1.

---
 srcpkgs/qt6-lottie/template | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/qt6-lottie/template b/srcpkgs/qt6-lottie/template
index 1c97cd5f4f32..a7beb62ec368 100644
--- a/srcpkgs/qt6-lottie/template
+++ b/srcpkgs/qt6-lottie/template
@@ -1,10 +1,9 @@
 # Template file for 'qt6-lottie'
 pkgname=qt6-lottie
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qtlottie-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr"
 hostmakedepends="perl qt6-base-devel"
 makedepends="qt6-declarative-devel"
 short_desc="Cross-platform application and UI framework - lottie"
@@ -12,10 +11,10 @@ maintainer="John <me@johnnynator.dev>"
 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=39db570bbba5b527a1eb6a5774bed47398ace2f7217bbf45b1194ada6cf97deb
+checksum=740ba76999124d5e1a85ef3d01c69976bb8557862b6b26bf48b357fe0cab1cf5
 
 if [ "$XBPS_CHECK_PKGS" ]; then
-	configure_args+=" -DQT_BUILD_TESTS=ON"
+	configure_args="-DQT_BUILD_TESTS=ON"
 fi
 
 pre_check() {
@@ -28,8 +27,10 @@ qt6-lottie-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
 		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From 1e749c53530936b63830e513f148949e69319d8e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:08 +0700
Subject: [PATCH 07/29] qt6-networkauth: update to 6.3.1.

---
 srcpkgs/qt6-networkauth/template | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/qt6-networkauth/template b/srcpkgs/qt6-networkauth/template
index e934beada9b0..1454ceb4a525 100644
--- a/srcpkgs/qt6-networkauth/template
+++ b/srcpkgs/qt6-networkauth/template
@@ -1,10 +1,9 @@
 # Template file for 'qt6-networkauth'
 pkgname=qt6-networkauth
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qtnetworkauth-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr"
 hostmakedepends="perl qt6-base-devel"
 makedepends="qt6-base-devel"
 short_desc="Cross-platform application and UI framework - networkauth"
@@ -12,10 +11,10 @@ maintainer="John <me@johnnynator.dev>"
 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=203a98942919028520038f90a20cd7ee32b537233545d11e429c3e2c1ad9069f
+checksum=d60f54b9d4509fa8bdbf1990bc91f6e260e38cdb57a7b8119fa3861bc5d2fb2a
 
 if [ "$XBPS_CHECK_PKGS" ]; then
-	configure_args+=" -DQT_BUILD_TESTS=ON"
+	configure_args="-DQT_BUILD_TESTS=ON"
 fi
 
 qt6-networkauth-devel_package() {
@@ -24,8 +23,11 @@ qt6-networkauth-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From 2434dccca8a117bc62d46f33a60b96b7432c9d42 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:08 +0700
Subject: [PATCH 08/29] qt6-qt5compat: update to 6.3.1.

---
 srcpkgs/qt6-qt5compat/template | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/qt6-qt5compat/template b/srcpkgs/qt6-qt5compat/template
index 7fcd5ad5080e..a62573cfabfa 100644
--- a/srcpkgs/qt6-qt5compat/template
+++ b/srcpkgs/qt6-qt5compat/template
@@ -1,10 +1,9 @@
 # Template file for 'qt6-qt5compat'
 pkgname=qt6-qt5compat
-version=6.3.0
-revision=2
+version=6.3.1
+revision=1
 wrksrc="qt5compat-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr"
 hostmakedepends="qt6-base-devel qt6-declarative-devel perl pkg-config"
 makedepends="qt6-base-devel qt6-declarative-devel"
 short_desc="Cross-platform application and UI framework - Qt5 Compatibilty Component"
@@ -12,10 +11,10 @@ maintainer="John <me@johnnynator.dev>"
 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=2b199be780c50d9214512b922d94cb240b0412fd63f459e356b76102cad1713e
+checksum=a43ec62bd778eaecf88ad7847118d1c2a471b0fcb820f93beb311d7ab9566cfd
 
 if [ "$XBPS_CHECK_PKGS" ]; then
-	configure_args+=" -DQT_BUILD_TESTS=ON"
+	configure_args="-DQT_BUILD_TESTS=ON"
 fi
 
 qt6-qt5compat-devel_package() {
@@ -24,8 +23,11 @@ qt6-qt5compat-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From 8baa5c7324b04548464a2d18ed1d12d472eb2d84 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:08 +0700
Subject: [PATCH 09/29] qt6-quick3d: update to 6.3.1.

---
 srcpkgs/qt6-quick3d/template | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/qt6-quick3d/template b/srcpkgs/qt6-quick3d/template
index 0f7ef336a3ff..685ce9bc0e90 100644
--- a/srcpkgs/qt6-quick3d/template
+++ b/srcpkgs/qt6-quick3d/template
@@ -1,19 +1,23 @@
 # Template file for 'qt6-quick3d'
 pkgname=qt6-quick3d
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qtquick3d-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr "
 hostmakedepends="perl qt6-base-devel qt6-declarative-devel qt6-shadertools-devel"
 makedepends="qt6-base-devel qt6-declarative-devel qt6-shadertools-devel
- libassimp-devel"
+ qt6-quicktimeline libassimp-devel"
 short_desc="Cross-platform application and UI framework - Quick3d"
 maintainer="John <me@johnnynator.dev>"
 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=0ad05bd1ee1f784b18220a2d2625ee8de91662c88fdc7b798662953d86eb327e
+checksum=2fa766ee47b8c07412b3b755206ada0715fb07813b64ed069e7205044c061256
+
+if [ "$CROSS_BUILD" ]; then
+	hostmakedepends+=" qt6-quick3d-devel"
+	configure_args="-DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true"
+fi
 
 if [ "$XBPS_TARGET_ENDIAN" = "be" ]; then
 	# possibly a qt6-shadertools bug, actually
@@ -26,9 +30,12 @@ qt6-quick3d-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
-		vmove usr/lib/qt6/mkspecs
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/bin
+		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From f795f480e90fd073de895d8386b5da0ec3ce4fbc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:09 +0700
Subject: [PATCH 10/29] qt6-quicktimeline: update to 6.3.1.

---
 common/shlibs                      | 1 +
 srcpkgs/qt6-quicktimeline/template | 7 +++----
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 61924610cc52..26f10d604be9 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2045,6 +2045,7 @@ libQt6Quick3DIblBaker.so.6 qt6-quick3d-6.0.3_1
 libQt6Quick3DParticles.so.6 qt6-quick3d-6.1.0_1
 libQt6Quick3DGlslParser.so.6 qt6-quick3d-6.3.0_1
 libQt6Quick3DAssetUtils.so.6 qt6-quick3d-6.1.0_1
+libQt6QuickTimeline.so.6 qt6-quicktimeline-6.3.0_1
 libQt6QuickControls2Impl.so.6 qt6-declarative-6.0.0_1
 libQt6QuickControls2.so.6 qt6-declarative-6.0.0_1
 libQt6QuickTemplates2.so.6 qt6-declarative-6.0.0_1
diff --git a/srcpkgs/qt6-quicktimeline/template b/srcpkgs/qt6-quicktimeline/template
index 15aa7a8e5819..bf02e043c4a5 100644
--- a/srcpkgs/qt6-quicktimeline/template
+++ b/srcpkgs/qt6-quicktimeline/template
@@ -1,10 +1,9 @@
 # Template file for 'qt6-quicktimeline'
 pkgname=qt6-quicktimeline
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qtquicktimeline-everywhere-src-${version/rc/-rc}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr "
 hostmakedepends="perl qt6-base-devel qt6-declarative-devel"
 makedepends="qt6-base-devel qt6-declarative-devel"
 short_desc="Cross-platform application and UI framework - quicktimeline"
@@ -12,10 +11,10 @@ maintainer="John <me@johnnynator.dev>"
 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=9ff0a931159efc6be5bd9f8a1e4a16a70e2dab37cf22ad85c6d330ccfdf31c1a
+checksum=58a13cf0ce8e7755639f20684078733af24f5a317f6ddb40d6079c8c5a28ebbe
 
 if [ "$XBPS_CHECK_PKGS" ]; then
-	configure_args+=" -DQT_BUILD_TESTS=ON"
+	configure_args="-DQT_BUILD_TESTS=ON"
 fi
 
 pre_check() {

From 6e0ecefa90b22d3c7f4e598c8e756e86fa490d5d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:09 +0700
Subject: [PATCH 11/29] qt6-scxml: update to 6.3.1.

---
 srcpkgs/qt6-scxml/template | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/qt6-scxml/template b/srcpkgs/qt6-scxml/template
index 112baca0ab83..d17ccf16400a 100644
--- a/srcpkgs/qt6-scxml/template
+++ b/srcpkgs/qt6-scxml/template
@@ -1,10 +1,10 @@
 # Template file for 'qt6-scxml'
 pkgname=qt6-scxml
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qtscxml-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr"
+configure_args="-DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true"
 hostmakedepends="perl qt6-declarative-devel"
 makedepends="qt6-declarative-devel"
 short_desc="Cross-platform application and UI framework - scxml"
@@ -12,7 +12,11 @@ maintainer="John <me@johnnynator.dev>"
 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=09b0dbd6ac367920fb1ba96a39dcd4c9d33eb0820dcc79538992825d588a70f0
+checksum=01bc154d6163d1f049f4e1e76658a044730ace7b0a5be35c9a46fcd1396f8619
+
+if [ "$CROSS_BUILD" ]; then
+	hostmakedepends+=" qt6-remoteobjects"
+fi
 
 if [ "$XBPS_CHECK_PKGS" ]; then
 	configure_args+=" -DQT_BUILD_TESTS=ON"
@@ -24,8 +28,11 @@ qt6-scxml-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From fd6e41c59d9aea9596d9dc512263a7ba58b6a3c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:09 +0700
Subject: [PATCH 12/29] qt6-serialport: update to 6.3.1.

---
 srcpkgs/qt6-serialport/template | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/qt6-serialport/template b/srcpkgs/qt6-serialport/template
index 0804671ca57b..2de9d6364a5c 100644
--- a/srcpkgs/qt6-serialport/template
+++ b/srcpkgs/qt6-serialport/template
@@ -1,10 +1,9 @@
 # Template file for 'qt6-serialport'
 pkgname=qt6-serialport
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qtserialport-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr"
 hostmakedepends="perl qt6-base-devel pkg-config"
 makedepends="qt6-base-devel"
 short_desc="Cross-platform application and UI framework - serialport"
@@ -12,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 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=eebd6934d48cc044b8c87795a4fd91bb81f7195d4b5a2ddb12802f343d5db64f
+checksum=4eb6d80e65799dd2e0318df4dfba14173c1929e861718cda9bedca24253b616e
 
 qt6-serialport-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel>=${version}_1"
@@ -20,8 +19,11 @@ qt6-serialport-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From 6367306cdd254c8399ea6520278ca96907dd6a11 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:09 +0700
Subject: [PATCH 13/29] qt6-shadertools: update to 6.3.1.

---
 srcpkgs/qt6-shadertools/template | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/qt6-shadertools/template b/srcpkgs/qt6-shadertools/template
index 9c1ec210a96a..3716333c459b 100644
--- a/srcpkgs/qt6-shadertools/template
+++ b/srcpkgs/qt6-shadertools/template
@@ -1,10 +1,9 @@
 # Template file for 'qt6-shadertools'
 pkgname=qt6-shadertools
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qtshadertools-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr "
 hostmakedepends="perl qt6-base-devel"
 makedepends="qt6-base-devel"
 short_desc="Cross-platform application and UI framework - shadertools"
@@ -12,7 +11,13 @@ maintainer="John <me@johnnynator.dev>"
 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=5498959b9d37c254bd126ab1320cf86aeb8a31b3ea7e51db666a8f9698afbd6c
+checksum=59b77176961528cc7b0c9325134655e273aa87b4cb386c0f4683d8f2852e435a
+
+if [ "$CROSS_BUILD" ]; then
+	configure_args="-DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true"
+	hostmakedepends+=" qt6-shadertools-devel"
+fi
+
 
 qt6-shadertools-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel>=${version}_1"
@@ -20,8 +25,11 @@ qt6-shadertools-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From 326eb9d92fe8783229193833b6461bc26b5a160b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:09 +0700
Subject: [PATCH 14/29] qt6-svg: update to 6.3.1.

---
 srcpkgs/qt6-svg/template | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/qt6-svg/template b/srcpkgs/qt6-svg/template
index aa8e6b745109..309b0988e435 100644
--- a/srcpkgs/qt6-svg/template
+++ b/srcpkgs/qt6-svg/template
@@ -1,10 +1,9 @@
 # Template file for 'qt6-svg'
 pkgname=qt6-svg
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qtsvg-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr "
 hostmakedepends="qt6-base-devel perl"
 makedepends="qt6-base-devel"
 short_desc="Cross-platform application and UI framework (QT6) - qt6-svg component"
@@ -12,10 +11,10 @@ maintainer="John <me@johnnynator.dev>"
 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=3164504d7e3f640439308235739b112605ab5fc9cc517ca0b28f9fb93a8db0e3
+checksum=7b19f418e6f7b8e23344082dd04440aacf5da23c5a73980ba22ae4eba4f87df7
 
 if [ "$XBPS_CHECK_PKGS" ]; then
-	configure_args+=" -DQT_BUILD_TESTS=ON"
+	configure_args="-DQT_BUILD_TESTS=ON"
 fi
 
 do_check() {
@@ -29,8 +28,11 @@ qt6-svg-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From 8409f900c37eb42b551bdf87ad83101667c39efe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:10 +0700
Subject: [PATCH 15/29] qt6-tools: update to 6.3.1.

---
 srcpkgs/qt6-tools/template | 23 ++++++++++++++++++-----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/qt6-tools/template b/srcpkgs/qt6-tools/template
index f875dff5c046..fd311176e31d 100644
--- a/srcpkgs/qt6-tools/template
+++ b/srcpkgs/qt6-tools/template
@@ -1,23 +1,33 @@
 # Template file for 'qt6-tools'
 pkgname=qt6-tools
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qttools-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr "
-hostmakedepends="qt6-base-devel perl"
-makedepends="qt6-base-devel libatomic-devel"
+configure_args="-DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=TRUE
+ -DQT_BUILD_SHARED_LIBS=ON -DQT_FEATURE_assistant=ON"
+hostmakedepends="qt6-base-devel perl qt6-plugin-sqlite"
+makedepends="qt6-base-devel libatomic-devel qt6-plugin-sqlite"
 short_desc="Cross-platform application and UI framework (QT6) - qt6-tools component"
 maintainer="John <me@johnnynator.dev>"
 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/qttools-everywhere-src-${version}.tar.xz"
-checksum=fce94688ea925782a2879347584991f854630daadba6c52aed6d93e33cd0b19c
+checksum=c412750f2aa3beb93fce5f30517c607f55daaeb7d0407af206a8adf917e126c1
+
+if [ "$CROSS_BUILD" ]; then
+	hostmakedepends+=" qt6-tools-devel"
+fi
+
 
 if [ "$XBPS_CHECK_PKGS" ]; then
 	configure_args+=" -DQT_BUILD_TESTS=ON"
 fi
 
+post_build() {
+	ninja -C build ${makejobs} lib/qt6/libexec/qhelpgenerator
+}
+
 do_check() {
 	cd build
 	# Some of these tests expect that qt6-tools is already
@@ -31,8 +41,11 @@ qt6-tools-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From 4ecbb5f9e623ef2b18a02ea3859e5bf528f35984 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:10 +0700
Subject: [PATCH 16/29] qt6-translations: update to 6.3.1.

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

diff --git a/srcpkgs/qt6-translations/template b/srcpkgs/qt6-translations/template
index be0a74ca74e2..1b917ccb3620 100644
--- a/srcpkgs/qt6-translations/template
+++ b/srcpkgs/qt6-translations/template
@@ -1,10 +1,9 @@
 # Template file for 'qt6-translations'
 pkgname=qt6-translations
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qttranslations-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr "
 hostmakedepends="qt6-base-devel qt6-tools-devel perl"
 makedepends="qt6-base-devel qt6-tools-devel"
 short_desc="Cross-platform application and UI framework - translations"
@@ -12,4 +11,4 @@ maintainer="John <me@johnnynator.dev>"
 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=e4dd4ef892a34a9514a19238f189a33ed85c76f31dcad6599ced93b1e33440b3
+checksum=d7bdd55e2908ded901dcc262157100af2a490bf04d31e32995f6d91d78dfdb97

From 822c78e72370528a8e91f49bd8d6337d55efe00e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:10 +0700
Subject: [PATCH 17/29] qt6-virtualkeyboard: update to 6.3.1.

---
 srcpkgs/qt6-virtualkeyboard/template | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/qt6-virtualkeyboard/template b/srcpkgs/qt6-virtualkeyboard/template
index 67ecef145ea1..77a247400b97 100644
--- a/srcpkgs/qt6-virtualkeyboard/template
+++ b/srcpkgs/qt6-virtualkeyboard/template
@@ -1,10 +1,9 @@
 # Template file for 'qt6-virtualkeyboard'
 pkgname=qt6-virtualkeyboard
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qtvirtualkeyboard-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr"
 hostmakedepends="perl pkg-config qt6-declarative-devel"
 makedepends="qt6-declarative-devel qt6-svg-devel hunspell-devel"
 short_desc="Cross-platform application and UI framework - virtualkeyboard"
@@ -12,10 +11,10 @@ maintainer="John <me@johnnynator.dev>"
 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=89aaf15acf5432af8f5cf4ec45cb32d87a3348906215dd56e81cb294eb276573
+checksum=5fe089b204d859ab0dd0169f811f2e30cae7c5cb36f8ab95ca36883f1fc0c2b8
 
 if [ "$XBPS_CHECK_PKGS" ]; then
-	configure_args+=" -DQT_BUILD_TESTS=ON"
+	configure_args="-DQT_BUILD_TESTS=ON"
 fi
 
 do_check() {
@@ -32,8 +31,11 @@ qt6-virtualkeyboard-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From c3f6c3e84e4d92d34964d8c9d3d07a4ca53b3cda Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:10 +0700
Subject: [PATCH 18/29] qt6-wayland: update to 6.3.1.

---
 srcpkgs/qt6-wayland/template | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/qt6-wayland/template b/srcpkgs/qt6-wayland/template
index b71a273009b9..784cb42a1a03 100644
--- a/srcpkgs/qt6-wayland/template
+++ b/srcpkgs/qt6-wayland/template
@@ -1,13 +1,15 @@
 # Template file for 'qt6-wayland'
 pkgname=qt6-wayland
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qtwayland-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true"
-hostmakedepends="qt6-base-devel perl pkg-config wayland-devel qt6-wayland-devel"
+configure_args="-DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true"
+hostmakedepends="qt6-base-devel perl pkg-config wayland-devel
+ qt6-declarative-devel qt6-wayland-devel"
 # XXX: Qml as optional dep
 makedepends="qt6-base-devel wayland-devel libxkbcommon-devel
+ qt6-declarative-devel
  libXcomposite-devel MesaLib-devel Vulkan-Headers libdrm-devel"
 checkdepends="dbus mesa-dri"
 short_desc="Cross-platform application and UI framework - Wayland"
@@ -15,7 +17,7 @@ maintainer="John <me@johnnynator.dev>"
 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=e7b567f6e43ffc5918d4aa825ce1eced66a00cb0a87133b2912ba5c1b2a02190
+checksum=6f14fea2d172a5b4170be3efcb0e58535f6605b61bcd823f6d5c9d165bb8c0f0
 
 if [ "$XBPS_CHECK_PKGS" ]; then
 	configure_args+=" -DQT_BUILD_TESTS=ON"
@@ -32,9 +34,11 @@ qt6-wayland-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
-		vmove usr/lib/qt6/libexec/qtwaylandscanner
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From 1daf1132c7b4e0d10374c5a1494adf1c4e296ee1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:10 +0700
Subject: [PATCH 19/29] qt6-websockets: update to 6.3.1.

---
 srcpkgs/qt6-websockets/template | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/qt6-websockets/template b/srcpkgs/qt6-websockets/template
index c2e674aacb31..4875af093432 100644
--- a/srcpkgs/qt6-websockets/template
+++ b/srcpkgs/qt6-websockets/template
@@ -1,10 +1,9 @@
 # Template file for 'qt6-websockets'
 pkgname=qt6-websockets
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qtwebsockets-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr"
 hostmakedepends="perl qt6-base-devel qt6-declarative-devel"
 makedepends="qt6-base-devel qt6-declarative-devel"
 short_desc="Cross-platform application and UI framework - websockets"
@@ -12,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 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=e018a09fe960b7d9560d6bbc9d3ca022fed6566e6ba6fc6d869a97482d4e6361
+checksum=9f980d90c97fcbde1b50c773f6dc580cfdf8c36ce14a1be3aa2ccadfe605121a
 
 qt6-websockets-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel>=${version}_1"
@@ -20,8 +19,11 @@ qt6-websockets-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From 87f0ee8a5b8b3b86dbabf9b84f22426244579d3c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Tue, 9 Aug 2022 20:16:47 +0700
Subject: [PATCH 20/29] qt6-3d: update to 6.3.1.

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

diff --git a/srcpkgs/qt6-3d/template b/srcpkgs/qt6-3d/template
index 666f57559532..c08c3bd4a41b 100644
--- a/srcpkgs/qt6-3d/template
+++ b/srcpkgs/qt6-3d/template
@@ -1,10 +1,9 @@
 # Template file for 'qt6-3d'
 pkgname=qt6-3d
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qt3d-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr"
 hostmakedepends="perl qt6-declarative-devel"
 makedepends="qt6-declarative-devel qt6-shadertools-devel libassimp-devel
  libatomic-devel"
@@ -13,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 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=74e762380dad34887878b9124dbfb981d5cf4b8b807281ff8bff311145b54de1
+checksum=9919b66dfb253fa26db1a7d664358cbc07f46c8810082ee3120d0a54b153edfe
 
 qt6-3d-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 41527795a4198e5daa0b30567f80ac6835497c75 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:11 +0700
Subject: [PATCH 21/29] New package: qt6-webchannel-6.3.1

---
 srcpkgs/qt6-webchannel-devel    |  1 +
 srcpkgs/qt6-webchannel/template | 32 ++++++++++++++++++++++++++++++++
 srcpkgs/qt6-webchannel/update   |  1 +
 3 files changed, 34 insertions(+)
 create mode 120000 srcpkgs/qt6-webchannel-devel
 create mode 100644 srcpkgs/qt6-webchannel/template
 create mode 100644 srcpkgs/qt6-webchannel/update

diff --git a/srcpkgs/qt6-webchannel-devel b/srcpkgs/qt6-webchannel-devel
new file mode 120000
index 000000000000..03e8b23d785d
--- /dev/null
+++ b/srcpkgs/qt6-webchannel-devel
@@ -0,0 +1 @@
+qt6-webchannel
\ No newline at end of file
diff --git a/srcpkgs/qt6-webchannel/template b/srcpkgs/qt6-webchannel/template
new file mode 100644
index 000000000000..432c42bcc056
--- /dev/null
+++ b/srcpkgs/qt6-webchannel/template
@@ -0,0 +1,32 @@
+# Template file for 'qt6-webchannel'
+pkgname=qt6-webchannel
+version=6.3.1
+revision=1
+wrksrc="qtwebchannel-everywhere-src-${version}"
+build_style=cmake
+hostmakedepends="perl qt6-base-devel qt6-declarative-devel"
+makedepends="qt6-base-devel qt6-declarative-devel qt6-websockets-devel"
+short_desc="Cross-platform application and UI framework - webchannel"
+maintainer="John <me@johnnynator.dev>"
+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=aaa20ac23f86992721b7ee487c379a3fd68caa8cdcea0a77a37e0d8b47ff2668
+
+qt6-webchannel-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel>=${version}_1
+	 qt6-websockets-devel>=${version}_1"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
+		vmove usr/lib/qt6/mkspecs
+		vmove usr/lib/qt6/qml/QtWebChannel/plugins.qmltypes
+		vmove usr/lib/qt6/qml/QtWebChannel/qmldir
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
+	}
+}
diff --git a/srcpkgs/qt6-webchannel/update b/srcpkgs/qt6-webchannel/update
new file mode 100644
index 000000000000..844552465222
--- /dev/null
+++ b/srcpkgs/qt6-webchannel/update
@@ -0,0 +1 @@
+pkgname="${pkgname/6-/}-everywhere-src"

From eb4fca23225607da3b104a0e74d9419e0388c87a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:11 +0700
Subject: [PATCH 22/29] New package: qt6-multimedia-6.3.1

---
 common/shlibs                   |  3 +++
 srcpkgs/qt6-multimedia-devel    |  1 +
 srcpkgs/qt6-multimedia/template | 33 +++++++++++++++++++++++++++++++++
 srcpkgs/qt6-multimedia/update   |  1 +
 4 files changed, 38 insertions(+)
 create mode 120000 srcpkgs/qt6-multimedia-devel
 create mode 100644 srcpkgs/qt6-multimedia/template
 create mode 100644 srcpkgs/qt6-multimedia/update

diff --git a/common/shlibs b/common/shlibs
index 26f10d604be9..ce04cc1ad2cf 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2078,6 +2078,9 @@ libQt6SerialPort.so.6 qt6-serialport-6.2.0alpha_1
 libQt6WebSockets.so.6 qt6-websockets-6.2.0alpha_1
 libQt6WebChannel.so.6 qt6-webchannel-6.2.0alpha_1
 libQt6Positioning.so.6 qt6-location-6.2.0alpha_1
+libQt6MultimediaWidgets.so.6 qt6-multimedia-6.3.1_1
+libQt6MultimediaQuick.so.6 qt6-multimedia-6.3.1_1
+libQt6Multimedia.so.6 qt6-multimedia-6.3.1_1
 libnpth.so.0 npth-1.1_1
 libnpupnp.so.4 libnpupnp-4.0.2_1
 libglfw.so.3 glfw-3.0.4_1
diff --git a/srcpkgs/qt6-multimedia-devel b/srcpkgs/qt6-multimedia-devel
new file mode 120000
index 000000000000..9343446502d0
--- /dev/null
+++ b/srcpkgs/qt6-multimedia-devel
@@ -0,0 +1 @@
+qt6-multimedia
\ No newline at end of file
diff --git a/srcpkgs/qt6-multimedia/template b/srcpkgs/qt6-multimedia/template
new file mode 100644
index 000000000000..535a2f55ffe4
--- /dev/null
+++ b/srcpkgs/qt6-multimedia/template
@@ -0,0 +1,33 @@
+# Template file for 'qt6-multimedia'
+pkgname=qt6-multimedia
+version=6.3.1
+revision=1
+wrksrc="qtmultimedia-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DQT_FEATURE_gstreamer=ON"
+hostmakedepends="perl qt6-declarative-devel pkg-config
+ qt6-shadertools-devel"
+makedepends="qt6-declarative-devel
+ qt6-shadertools-devel libglib-devel gst-plugins-base1-devel"
+short_desc="Cross-platform application and UI framework - multimedia"
+maintainer="John <me@johnnynator.dev>"
+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=7e03242aadd634ff2d9fcf08948290f03da3d9a5012369d908da89f82b1d7336
+
+qt6-multimedia-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel>=${version}_1"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
+		vmove usr/lib/qt6/mkspecs
+		vmove usr/lib/qt6/qml/QtMultimedia/plugins.qmltypes
+		vmove usr/lib/qt6/qml/QtMultimedia/qmldir
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}
diff --git a/srcpkgs/qt6-multimedia/update b/srcpkgs/qt6-multimedia/update
new file mode 100644
index 000000000000..844552465222
--- /dev/null
+++ b/srcpkgs/qt6-multimedia/update
@@ -0,0 +1 @@
+pkgname="${pkgname/6-/}-everywhere-src"

From 196c8630974ce7fa21d939528af452aaaf7a6acb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 18:22:48 +0700
Subject: [PATCH 23/29] New package: qt6-connectivity-6.3.1

---
 common/shlibs                     |  2 ++
 srcpkgs/qt6-connectivity-devel    |  1 +
 srcpkgs/qt6-connectivity/template | 30 ++++++++++++++++++++++++++++++
 3 files changed, 33 insertions(+)
 create mode 120000 srcpkgs/qt6-connectivity-devel
 create mode 100644 srcpkgs/qt6-connectivity/template

diff --git a/common/shlibs b/common/shlibs
index ce04cc1ad2cf..2e95a22119ab 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2072,6 +2072,8 @@ libQt6Designer.so.6 qt6-tools-6.1.0_1
 libQt6DesignerComponents.so.6 qt6-tools-6.1.0_1
 libQt6Help.so.6 qt6-tools-6.1.0_1
 libQt6UiTools.so.6 qt6-tools-6.1.0_1
+libQt6Nfc.so.6 qt6-connectivity-6.3.1_1
+libQt6Bluetooth.so.6 qt6-connectivity-6.3.1_1
 libQt6HunspellInputMethod.so.6 qt6-virtualkeyboard-6.1.0_1
 libQt6VirtualKeyboard.so.6 qt6-virtualkeyboard-6.1.0_1
 libQt6SerialPort.so.6 qt6-serialport-6.2.0alpha_1
diff --git a/srcpkgs/qt6-connectivity-devel b/srcpkgs/qt6-connectivity-devel
new file mode 120000
index 000000000000..478cc9d8aa39
--- /dev/null
+++ b/srcpkgs/qt6-connectivity-devel
@@ -0,0 +1 @@
+qt6-connectivity
\ No newline at end of file
diff --git a/srcpkgs/qt6-connectivity/template b/srcpkgs/qt6-connectivity/template
new file mode 100644
index 000000000000..6cb61744d0cb
--- /dev/null
+++ b/srcpkgs/qt6-connectivity/template
@@ -0,0 +1,30 @@
+# Template file for 'qt6-connectivity'
+pkgname=qt6-connectivity
+version=6.3.1
+revision=1
+wrksrc="qtconnectivity-everywhere-src-${version}"
+build_style=cmake
+hostmakedepends="perl qt6-declarative-devel"
+makedepends="qt6-declarative-devel"
+short_desc="Cross-platform application and UI framework - Connectivity"
+maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
+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=b25ce4710a9c61bc6a5dbaeeb3e2ed907a8bc85478fdb2ab4312297768b695b0
+
+qt6-connectivity-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}
+	 qt6-declarative>=${version}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
+		vmove usr/lib/qt6/mkspecs
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
+	}
+}

From f39a10d6be6cc05fb737eb9af597b23a70819eb5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 18:22:57 +0700
Subject: [PATCH 24/29] New package: qt6-sensors-6.3.1

---
 common/shlibs                |  2 ++
 srcpkgs/qt6-sensors-devel    |  1 +
 srcpkgs/qt6-sensors/template | 31 +++++++++++++++++++++++++++++++
 3 files changed, 34 insertions(+)
 create mode 120000 srcpkgs/qt6-sensors-devel
 create mode 100644 srcpkgs/qt6-sensors/template

diff --git a/common/shlibs b/common/shlibs
index 2e95a22119ab..157b51f3f981 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2074,6 +2074,8 @@ libQt6Help.so.6 qt6-tools-6.1.0_1
 libQt6UiTools.so.6 qt6-tools-6.1.0_1
 libQt6Nfc.so.6 qt6-connectivity-6.3.1_1
 libQt6Bluetooth.so.6 qt6-connectivity-6.3.1_1
+libQt6Sensors.so.6 qt6-sensors-6.3.1_1
+libQt6SensorsQuick.so.6 qt6-sensors-6.3.1_1
 libQt6HunspellInputMethod.so.6 qt6-virtualkeyboard-6.1.0_1
 libQt6VirtualKeyboard.so.6 qt6-virtualkeyboard-6.1.0_1
 libQt6SerialPort.so.6 qt6-serialport-6.2.0alpha_1
diff --git a/srcpkgs/qt6-sensors-devel b/srcpkgs/qt6-sensors-devel
new file mode 120000
index 000000000000..eb9457f04055
--- /dev/null
+++ b/srcpkgs/qt6-sensors-devel
@@ -0,0 +1 @@
+qt6-sensors
\ No newline at end of file
diff --git a/srcpkgs/qt6-sensors/template b/srcpkgs/qt6-sensors/template
new file mode 100644
index 000000000000..5a81f43b60eb
--- /dev/null
+++ b/srcpkgs/qt6-sensors/template
@@ -0,0 +1,31 @@
+# Template file for 'qt6-sensors'
+pkgname=qt6-sensors
+version=6.3.1
+revision=1
+wrksrc="qtsensors-everywhere-src-${version}"
+build_style=cmake
+hostmakedepends="perl qt6-declarative-devel qt6-svg-devel pkg-config"
+makedepends="qt6-declarative-devel qt6-svg-devel"
+short_desc="Cross-platform application and UI framework - Sensors"
+maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
+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=4b240b59edba9a42b4735758a25f279a26841b982864e7b38f6ef0b81e0d60cc
+
+qt6-sensors-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}
+	 qt6-declarative-devel>=${version}_1"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
+		vmove usr/lib/qt6/mkspecs
+		vmove usr/lib/qt6/qml/QtSensors/plugins.qmltypes
+		vmove usr/lib/qt6/qml/QtSensors/qmldir
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}

From f5432c961d4c9e191c7bc92a51cf50485fa918ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 18:23:08 +0700
Subject: [PATCH 25/29] New package: qt6-remoteobjects-6.3.1

---
 common/shlibs                      |  2 ++
 srcpkgs/qt6-remoteobjects-devel    |  1 +
 srcpkgs/qt6-remoteobjects/template | 36 ++++++++++++++++++++++++++++++
 3 files changed, 39 insertions(+)
 create mode 120000 srcpkgs/qt6-remoteobjects-devel
 create mode 100644 srcpkgs/qt6-remoteobjects/template

diff --git a/common/shlibs b/common/shlibs
index 157b51f3f981..91f197e54c93 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2074,6 +2074,8 @@ libQt6Help.so.6 qt6-tools-6.1.0_1
 libQt6UiTools.so.6 qt6-tools-6.1.0_1
 libQt6Nfc.so.6 qt6-connectivity-6.3.1_1
 libQt6Bluetooth.so.6 qt6-connectivity-6.3.1_1
+libQt6RemoteObjects.so.6 qt6-remoteobjects-6.3.1_1
+libQt6RemoteObjectsQml.so.6 qt6-remoteobjects-6.3.1_1
 libQt6Sensors.so.6 qt6-sensors-6.3.1_1
 libQt6SensorsQuick.so.6 qt6-sensors-6.3.1_1
 libQt6HunspellInputMethod.so.6 qt6-virtualkeyboard-6.1.0_1
diff --git a/srcpkgs/qt6-remoteobjects-devel b/srcpkgs/qt6-remoteobjects-devel
new file mode 120000
index 000000000000..2a027f95266f
--- /dev/null
+++ b/srcpkgs/qt6-remoteobjects-devel
@@ -0,0 +1 @@
+qt6-remoteobjects
\ No newline at end of file
diff --git a/srcpkgs/qt6-remoteobjects/template b/srcpkgs/qt6-remoteobjects/template
new file mode 100644
index 000000000000..71d2d31967b6
--- /dev/null
+++ b/srcpkgs/qt6-remoteobjects/template
@@ -0,0 +1,36 @@
+# Template file for 'qt6-remoteobjects'
+pkgname=qt6-remoteobjects
+version=6.3.1
+revision=1
+wrksrc="qtremoteobjects-everywhere-src-${version}"
+build_style=cmake
+hostmakedepends="perl qt6-declarative-devel pkg-config"
+makedepends="qt6-declarative-devel"
+short_desc="Cross-platform application and UI framework - Remote Objects"
+maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
+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=ea6d038b11c60981de0bd39a6091a59abf7d031e37bfc592b31be1217bef4ca6
+
+if [ "$CROSS_BUILD" ]; then
+	hostmakedepends+=" qt6-remoteobjects"
+	configure_args="-DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true"
+fi
+
+qt6-remoteobjects-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}
+	 qt6-declarative-devel>=${version}_1"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
+		vmove usr/lib/qt6/mkspecs
+		vmove usr/lib/qt6/qml/QtRemoteObjects/plugins.qmltypes
+		vmove usr/lib/qt6/qml/QtRemoteObjects/qmldir
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}

From 0bef4c2f66d5d2a1de10dac2252aa422e67c04ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:11 +0700
Subject: [PATCH 26/29] New package: qt6-webengine-6.3.1.

---
 common/shlibs                                 |    7 +
 srcpkgs/qt6-webengine-devel                   |    1 +
 srcpkgs/qt6-webengine-examples                |    1 +
 .../patches/0001-None-no-debug.patch          |   11 +
 .../patches/0002-enable-ppc64.patch           |   20 +
 .../patches/0003-cross-hack.patch             |   10 +
 .../0004-ppc-disable-jxl-decoder.patch        |   13 +
 .../patches/0050-no-glibc-cmake-check.patch   |   14 +
 .../0100-chromium-sandbox-membarrier.patch    |   58 +
 .../qt6-webengine/patches/0101-size_t.patch   |   16 +
 .../0102-chromium-90-ruy-include.patch        |   19 +
 ...-v8-monotonic-pthread-cont_timedwait.patch |   22 +
 .../0104-chromium-revert-9d080c0.patch        |  162 +
 ...-chromium-revert-drop-of-system-java.patch |   15 +
 .../patches/0106-chromium-system-nodejs.patch |   20 +
 .../0107-chromium-cursed^Uscoped_file.patch   |   18 +
 .../0108-chromium-fix-narrowing-cast.patch    |   53 +
 .../0109-chromium-remove-strip_binary.patch   |   32 +
 ...ium-revert-use-ffile-compilation-dir.patch |   57 +
 ...11-chromium-no-Wno-stringop-overread.patch |   10 +
 .../0150-chromium-glibc-libc_malloc.patch     |   24 +
 ...-include-sys-reg.h-to-get-__WORDSIZE.patch |   21 +
 .../0201-chromium-musl-dispatch-to-musl.patch |  103 +
 .../0202-chromium-musl-no-mallinfo.patch      |   62 +
 .../0203-chromium-musl-siginfo_t.patch        |   18 +
 .../0204-chromium-musl-stackstart.patch       |   20 +
 .../patches/0205-chromium-musl-sandbox.patch  |   92 +
 ...0206-chromium-musl-default-stacksize.patch |   15 +
 .../patches/0208-chromium-musl-execinfo.patch |  125 +
 .../0209-chromium-musl-thread-stacksize.patch |   22 +
 .../0210-chromium-musl-msgvec-push_back.patch |   14 +
 ...ium-musl-canonicalize-file-name-musl.patch |   11 +
 .../0212-chromium-musl-no-getcontext.patch    |   29 +
 .../patches/0213-chromium-musl-crashpad.patch |   24 +
 .../patches/0214-chromium-musl-fixes.patch    |  108 +
 .../patches/0215-chromium-musl-cdefs.patch    |   29 +
 .../patches/0216-chromium-musl-stat.patch     |   12 +
 .../patches/0217-chromium-musl-resolver.patch |   77 +
 .../patches/0600-chromium-sndio.patch         |  876 ++++
 .../patches/0700-armv7l-neon.patch            |   10 +
 ...-chromium-musl-cross-no-asm_ptrace_h.patch |   30 +
 .../0751-chromium-musl-arm-user_vfp.patch     |   20 +
 .../0752-chromium-musl-arm-elf_auxv_t.patch   |   18 +
 ...0801-chromium-i686-vaapi-fpermissive.patch |   24 +
 .../patches/0900-xxx-ppc64le-libvpx.patch     |   65 +
 .../0901-xxx-ppc64le-sandbox-linux-stat.patch |   31 +
 .../patches/0902-xxx-ppc64le-support.patch    | 3556 +++++++++++++++++
 .../0903-xxx-ppc64le-swiftshader.patch        |   18 +
 .../patches/cross-build-examples.patch        |   16 +
 srcpkgs/qt6-webengine/template                |  178 +
 srcpkgs/qt6-webengine/update                  |    1 +
 51 files changed, 6208 insertions(+)
 create mode 120000 srcpkgs/qt6-webengine-devel
 create mode 120000 srcpkgs/qt6-webengine-examples
 create mode 100644 srcpkgs/qt6-webengine/patches/0001-None-no-debug.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0002-enable-ppc64.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0003-cross-hack.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0004-ppc-disable-jxl-decoder.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0050-no-glibc-cmake-check.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0100-chromium-sandbox-membarrier.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0101-size_t.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0102-chromium-90-ruy-include.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0103-chromium-v8-monotonic-pthread-cont_timedwait.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0104-chromium-revert-9d080c0.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0105-chromium-revert-drop-of-system-java.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0106-chromium-system-nodejs.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0107-chromium-cursed^Uscoped_file.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0108-chromium-fix-narrowing-cast.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0109-chromium-remove-strip_binary.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0110-chromium-revert-use-ffile-compilation-dir.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0111-chromium-no-Wno-stringop-overread.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0150-chromium-glibc-libc_malloc.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0200-chromium-musl-include-sys-reg.h-to-get-__WORDSIZE.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0201-chromium-musl-dispatch-to-musl.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0202-chromium-musl-no-mallinfo.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0203-chromium-musl-siginfo_t.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0204-chromium-musl-stackstart.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0205-chromium-musl-sandbox.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0206-chromium-musl-default-stacksize.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0208-chromium-musl-execinfo.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0209-chromium-musl-thread-stacksize.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0210-chromium-musl-msgvec-push_back.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0211-chromium-musl-canonicalize-file-name-musl.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0212-chromium-musl-no-getcontext.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0213-chromium-musl-crashpad.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0214-chromium-musl-fixes.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0215-chromium-musl-cdefs.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0216-chromium-musl-stat.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0217-chromium-musl-resolver.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0600-chromium-sndio.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0700-armv7l-neon.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0750-chromium-musl-cross-no-asm_ptrace_h.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0751-chromium-musl-arm-user_vfp.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0752-chromium-musl-arm-elf_auxv_t.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0801-chromium-i686-vaapi-fpermissive.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0900-xxx-ppc64le-libvpx.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0901-xxx-ppc64le-sandbox-linux-stat.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0902-xxx-ppc64le-support.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0903-xxx-ppc64le-swiftshader.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/cross-build-examples.patch
 create mode 100644 srcpkgs/qt6-webengine/template
 create mode 100644 srcpkgs/qt6-webengine/update

diff --git a/common/shlibs b/common/shlibs
index 91f197e54c93..1f8acc43c36e 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2087,6 +2087,13 @@ libQt6Positioning.so.6 qt6-location-6.2.0alpha_1
 libQt6MultimediaWidgets.so.6 qt6-multimedia-6.3.1_1
 libQt6MultimediaQuick.so.6 qt6-multimedia-6.3.1_1
 libQt6Multimedia.so.6 qt6-multimedia-6.3.1_1
+libQt6WebEngineQuick.so.6 qt6-webengine-6.3.1_1
+libQt6PdfWidgets.so.6 qt6-webengine-6.3.1_1
+libQt6PdfQuick.so.6 qt6-webengine-6.3.1_1
+libQt6WebEngineCore.so.6 qt6-webengine-6.3.1_1
+libQt6Pdf.so.6 qt6-webengine-6.3.1_1
+libQt6WebEngineQuickDelegatesQml.so.6 qt6-webengine-6.3.1_1
+libQt6WebEngineWidgets.so.6 qt6-webengine-6.3.1_1
 libnpth.so.0 npth-1.1_1
 libnpupnp.so.4 libnpupnp-4.0.2_1
 libglfw.so.3 glfw-3.0.4_1
diff --git a/srcpkgs/qt6-webengine-devel b/srcpkgs/qt6-webengine-devel
new file mode 120000
index 000000000000..8e4d1b99c587
--- /dev/null
+++ b/srcpkgs/qt6-webengine-devel
@@ -0,0 +1 @@
+qt6-webengine
\ No newline at end of file
diff --git a/srcpkgs/qt6-webengine-examples b/srcpkgs/qt6-webengine-examples
new file mode 120000
index 000000000000..8e4d1b99c587
--- /dev/null
+++ b/srcpkgs/qt6-webengine-examples
@@ -0,0 +1 @@
+qt6-webengine
\ No newline at end of file
diff --git a/srcpkgs/qt6-webengine/patches/0001-None-no-debug.patch b/srcpkgs/qt6-webengine/patches/0001-None-no-debug.patch
new file mode 100644
index 000000000000..1ba33f8e6fd9
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0001-None-no-debug.patch
@@ -0,0 +1,11 @@
+--- a/cmake/Functions.cmake
++++ b/cmake/Functions.cmake
+@@ -813,6 +813,8 @@ macro(append_build_type_setup)
+         endif()
+     elseif(${config} STREQUAL "MinSizeRel")
+         list(APPEND gnArgArg is_debug=false symbol_level=0 optimize_for_size=true)
++    elseif(${config} STREQUAL "None")
++        list(APPEND gnArgArg is_debug=false symbol_level=0)
+     endif()
+     if(FEATURE_developer_build OR (${config} STREQUAL "Debug") OR QT_FEATURE_webengine_sanitizer)
+         list(APPEND gnArgArg
diff --git a/srcpkgs/qt6-webengine/patches/0002-enable-ppc64.patch b/srcpkgs/qt6-webengine/patches/0002-enable-ppc64.patch
new file mode 100644
index 000000000000..d72ef1ad1a10
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0002-enable-ppc64.patch
@@ -0,0 +1,20 @@
+--- a/cmake/Functions.cmake
++++ b/cmake/Functions.cmake
+@@ -622,6 +622,8 @@ function(get_gn_arch result arch)
+         set(${result} "mipsel" PARENT_SCOPE)
+     elseif(arch STREQUAL "mipsel64")
+         set(${result} "mips64el" PARENT_SCOPE)
++    elseif(arch STREQUAL "power64")
++        set(${result} "power64" PARENT_SCOPE)
+     else()
+         message(DEBUG "Unsupported architecture: ${arch}")
+     endif()
+@@ -641,6 +643,8 @@ function(get_v8_arch result targetArch h
+             set(${result} "mipsel" PARENT_SCOPE)
+         elseif(hostArch STREQUAL "mipsel64")
+             set(${result} "mipsel" PARENT_SCOPE)
++        elseif(hostArch STREQUAL "power64")
++            set(${result} "power64" PARENT_SCOPE)
+         else()
+             message(DEBUG "Unsupported architecture: ${hostArch}")
+         endif()
diff --git a/srcpkgs/qt6-webengine/patches/0003-cross-hack.patch b/srcpkgs/qt6-webengine/patches/0003-cross-hack.patch
new file mode 100644
index 000000000000..ea9f90094a63
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0003-cross-hack.patch
@@ -0,0 +1,10 @@
+--- a/src/core/api/CMakeLists.txt
++++ b/src/core/api/CMakeLists.txt
+@@ -50,6 +50,7 @@ qt_internal_add_module(WebEngineCore
+         Qt::Gui
+         Qt::Network
+         Qt::Quick
++        X11
+ )
+ 
+ set_target_properties(WebEngineCore PROPERTIES QTWEBENGINEPROCESS_NAME ${qtWebEngineProcessName})
diff --git a/srcpkgs/qt6-webengine/patches/0004-ppc-disable-jxl-decoder.patch b/srcpkgs/qt6-webengine/patches/0004-ppc-disable-jxl-decoder.patch
new file mode 100644
index 000000000000..73c1151968f4
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0004-ppc-disable-jxl-decoder.patch
@@ -0,0 +1,13 @@
+--- a/src/core/CMakeLists.txt
++++ b/src/core/CMakeLists.txt
+@@ -414,6 +414,10 @@ foreach(arch ${archs})
+                 CONDITION QT_FEATURE_webengine_ozone_x11 AND XSCRNSAVER_FOUND
+             )
+ 
++            if (cpu STREQUAL "ppc64")
++                list(APPEND gnArgArg enable_jxl_decoder=false)
++            endif()
++
+             if(QT_FEATURE_webengine_kerberos)
+                 list(APPEND gnArgArg
+                      external_gssapi_include_dir="${GSSAPI_INCLUDE_DIRS}/gssapi"
diff --git a/srcpkgs/qt6-webengine/patches/0050-no-glibc-cmake-check.patch b/srcpkgs/qt6-webengine/patches/0050-no-glibc-cmake-check.patch
new file mode 100644
index 000000000000..f756bf0286bb
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0050-no-glibc-cmake-check.patch
@@ -0,0 +1,14 @@
+--- a/configure.cmake
++++ b/configure.cmake
+@@ -499,11 +499,6 @@ add_check_for_support(
+ )
+ add_check_for_support(
+    MODULES QtWebEngine QtPdf
+-   CONDITION NOT LINUX OR TEST_glibc
+-   MESSAGE "A suitable version >= 2.17 of glibc is required."
+-)
+-add_check_for_support(
+-   MODULES QtWebEngine QtPdf
+    CONDITION NOT LINUX OR TEST_khr
+    MESSAGE "Build requires Khronos development headers for build - see mesa/libegl1-mesa-dev"
+ )
diff --git a/srcpkgs/qt6-webengine/patches/0100-chromium-sandbox-membarrier.patch b/srcpkgs/qt6-webengine/patches/0100-chromium-sandbox-membarrier.patch
new file mode 100644
index 000000000000..2dd7b4aa948f
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0100-chromium-sandbox-membarrier.patch
@@ -0,0 +1,58 @@
+--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
++++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
+@@ -413,6 +413,7 @@ bool SyscallSets::IsAllowedProcessStartO
+   switch (sysno) {
+     case __NR_exit:
+     case __NR_exit_group:
++    case __NR_membarrier:
+     case __NR_wait4:
+     case __NR_waitid:
+ #if defined(__i386__)
+--- a/src/3rdparty/chromium/sandbox/linux/system_headers/arm64_linux_syscalls.h
++++ b/src/3rdparty/chromium/sandbox/linux/system_headers/arm64_linux_syscalls.h
+@@ -1215,4 +1215,8 @@
+ #define __NR_landlock_restrict_self 446
+ #endif
+ 
++#if !defined(__NR_membarrier)
++#define __NR_membarrier 283
++#endif
++
+ #endif  // SANDBOX_LINUX_SYSTEM_HEADERS_ARM64_LINUX_SYSCALLS_H_
+--- a/src/3rdparty/chromium/sandbox/linux/system_headers/arm_linux_syscalls.h
++++ b/src/3rdparty/chromium/sandbox/linux/system_headers/arm_linux_syscalls.h
+@@ -1617,6 +1617,10 @@
+ #define __NR_landlock_restrict_self (__NR_SYSCALL_BASE + 446)
+ #endif
+ 
++#if !defined(__NR_membarrier)
++#define __NR_membarrier (__NR_SYSCALL_BASE+389)
++#endif
++
+ // ARM private syscalls.
+ #if !defined(__ARM_NR_BASE)
+ #define __ARM_NR_BASE (__NR_SYSCALL_BASE + 0xF0000)
+--- a/src/3rdparty/chromium/sandbox/linux/system_headers/x86_32_linux_syscalls.h
++++ b/src/3rdparty/chromium/sandbox/linux/system_headers/x86_32_linux_syscalls.h
+@@ -1750,5 +1750,9 @@
+ #define __NR_landlock_restrict_self 446
+ #endif
+ 
++#if !defined(__NR_membarrier)
++#define __NR_membarrier 375
++#endif
++
+ #endif  // SANDBOX_LINUX_SYSTEM_HEADERS_X86_32_LINUX_SYSCALLS_H_
+ 
+--- a/src/3rdparty/chromium/sandbox/linux/system_headers/x86_64_linux_syscalls.h
++++ b/src/3rdparty/chromium/sandbox/linux/system_headers/x86_64_linux_syscalls.h
+@@ -1438,5 +1438,9 @@
+ #define __NR_landlock_restrict_self 446
+ #endif
+ 
++#if !defined(__NR_membarrier)
++#define __NR_membarrier 324
++#endif
++
+ #endif  // SANDBOX_LINUX_SYSTEM_HEADERS_X86_64_LINUX_SYSCALLS_H_
+ 
diff --git a/srcpkgs/qt6-webengine/patches/0101-size_t.patch b/srcpkgs/qt6-webengine/patches/0101-size_t.patch
new file mode 100644
index 000000000000..fccc085da311
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0101-size_t.patch
@@ -0,0 +1,16 @@
+--- a/src/3rdparty/chromium/third_party/angle/include/platform/PlatformMethods.h
++++ b/src/3rdparty/chromium/third_party/angle/include/platform/PlatformMethods.h
+@@ -239,11 +239,11 @@ inline void DefaultOverrideFeaturesMtl(P
+ using ProgramKeyType   = std::array<uint8_t, 20>;
+ using CacheProgramFunc = void (*)(PlatformMethods *platform,
+                                   const ProgramKeyType &key,
+-                                  size_t programSize,
++                                  std::size_t programSize,
+                                   const uint8_t *programBytes);
+ inline void DefaultCacheProgram(PlatformMethods *platform,
+                                 const ProgramKeyType &key,
+-                                size_t programSize,
++                                std::size_t programSize,
+                                 const uint8_t *programBytes)
+ {}
+ 
diff --git a/srcpkgs/qt6-webengine/patches/0102-chromium-90-ruy-include.patch b/srcpkgs/qt6-webengine/patches/0102-chromium-90-ruy-include.patch
new file mode 100644
index 000000000000..bbba579076d6
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0102-chromium-90-ruy-include.patch
@@ -0,0 +1,19 @@
+From 714092f336bb14d2fcc27396ec323b3d843bb962 Mon Sep 17 00:00:00 2001
+From: Stephan Hartmann <stha09@googlemail.com>
+Date: Thu, 4 Mar 2021 15:05:46 +0000
+Subject: [PATCH] IWYU: include limits for std::numeric_limits
+
+---
+ third_party/ruy/src/ruy/block_map.cc | 1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/src/3rdparty/chromium/third_party/ruy/src/ruy/block_map.cc
++++ b/src/3rdparty/chromium/third_party/ruy/src/ruy/block_map.cc
+@@ -17,6 +17,7 @@ limitations under the License.
+ 
+ #include <algorithm>
+ #include <cstdint>
++#include <limits>
+ 
+ #ifdef RUY_MAKEBLOCKMAP_DEBUG
+ #include <cstdio>
diff --git a/srcpkgs/qt6-webengine/patches/0103-chromium-v8-monotonic-pthread-cont_timedwait.patch b/srcpkgs/qt6-webengine/patches/0103-chromium-v8-monotonic-pthread-cont_timedwait.patch
new file mode 100644
index 000000000000..1dc8bc4d3d17
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0103-chromium-v8-monotonic-pthread-cont_timedwait.patch
@@ -0,0 +1,22 @@
+Use monotonic clock for pthread_cond_timedwait with musl too.
+
+--- a/src/3rdparty/chromium/v8/src/base/platform/condition-variable.cc
++++ b/src/3rdparty/chromium/v8/src/base/platform/condition-variable.cc
+@@ -20,7 +20,7 @@ namespace base {
+ 
+ ConditionVariable::ConditionVariable() {
+ #if (V8_OS_FREEBSD || V8_OS_NETBSD || V8_OS_OPENBSD || \
+-     (V8_OS_LINUX && V8_LIBC_GLIBC))
++     V8_OS_LINUX)
+   // On Free/Net/OpenBSD and Linux with glibc we can change the time
+   // source for pthread_cond_timedwait() to use the monotonic clock.
+   pthread_condattr_t attr;
+@@ -96,7 +96,7 @@ bool ConditionVariable::WaitFor(Mutex* m
+       &native_handle_, &mutex->native_handle(), &ts);
+ #else
+ #if (V8_OS_FREEBSD || V8_OS_NETBSD || V8_OS_OPENBSD || \
+-     (V8_OS_LINUX && V8_LIBC_GLIBC))
++     V8_OS_LINUX)
+   // On Free/Net/OpenBSD and Linux with glibc we can change the time
+   // source for pthread_cond_timedwait() to use the monotonic clock.
+   result = clock_gettime(CLOCK_MONOTONIC, &ts);
diff --git a/srcpkgs/qt6-webengine/patches/0104-chromium-revert-9d080c0.patch b/srcpkgs/qt6-webengine/patches/0104-chromium-revert-9d080c0.patch
new file mode 100644
index 000000000000..42b1ee9ec063
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0104-chromium-revert-9d080c0.patch
@@ -0,0 +1,162 @@
+ Original change's description:
+ > Replace 'blacklist' with 'ignorelist' in ./tools/msan/.
+ >
+ > Bug: 1097272, 1097268
+ > Change-Id: Id5c8227a5bfb1ffaec82d3168b609085b10c8297
+ > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2867730
+ > Commit-Queue: Dylan Cutler <dylancutler@google.com>
+ > Reviewed-by: Nico Weber <thakis@chromium.org>
+ > Reviewed-by: Jonathan Metzman <metzman@chromium.org>
+ > Cr-Commit-Position: refs/heads/master@{#883035}
+--- a/src/3rdparty/chromium/build/config/sanitizers/BUILD.gn
++++ b/src/3rdparty/chromium/build/config/sanitizers/BUILD.gn
+@@ -272,11 +272,11 @@ config("asan_flags") {
+   if (is_asan) {
+     cflags += [ "-fsanitize=address" ]
+     if (is_win) {
+-      if (!defined(asan_win_blocklist_path)) {
+-        asan_win_blocklist_path =
++      if (!defined(asan_win_blacklist_path)) {
++        asan_win_blacklist_path =
+             rebase_path("//tools/memory/asan/blocklist_win.txt", root_build_dir)
+       }
+-      cflags += [ "-fsanitize-ignorelist=$asan_win_blocklist_path" ]
++      cflags += [ "-fsanitize-blacklist=$asan_win_blacklist_path" ]
+     }
+   }
+ }
+@@ -306,13 +306,13 @@ config("link_shared_library") {
+ config("cfi_flags") {
+   cflags = []
+   if (is_cfi && current_toolchain == default_toolchain) {
+-    if (!defined(cfi_ignorelist_path)) {
+-      cfi_ignorelist_path =
++    if (!defined(cfi_blacklist_path)) {
++      cfi_blacklist_path =
+           rebase_path("//tools/cfi/ignores.txt", root_build_dir)
+     }
+     cflags += [
+       "-fsanitize=cfi-vcall",
+-      "-fsanitize-ignorelist=$cfi_ignorelist_path",
++      "-fsanitize-blacklist=$cfi_blacklist_path",
+     ]
+ 
+     if (use_cfi_cast) {
+@@ -409,14 +409,14 @@ config("msan_flags") {
+   if (is_msan) {
+     assert(is_linux || is_chromeos,
+            "msan only supported on linux x86_64/ChromeOS")
+-    if (!defined(msan_ignorelist_path)) {
+-      msan_ignorelist_path =
+-          rebase_path("//tools/msan/ignorelist.txt", root_build_dir)
++    if (!defined(msan_blacklist_path)) {
++      msan_blacklist_path =
++          rebase_path("//tools/msan/blacklist.txt", root_build_dir)
+     }
+     cflags = [
+       "-fsanitize=memory",
+       "-fsanitize-memory-track-origins=$msan_track_origins",
+-      "-fsanitize-ignorelist=$msan_ignorelist_path",
++      "-fsanitize-blacklist=$msan_blacklist_path",
+     ]
+   }
+ }
+@@ -424,13 +424,13 @@ config("msan_flags") {
+ config("tsan_flags") {
+   if (is_tsan) {
+     assert(is_linux || is_chromeos, "tsan only supported on linux x86_64")
+-    if (!defined(tsan_ignorelist_path)) {
+-      tsan_ignorelist_path =
++    if (!defined(tsan_blacklist_path)) {
++      tsan_blacklist_path =
+           rebase_path("//tools/memory/tsan_v2/ignores.txt", root_build_dir)
+     }
+     cflags = [
+       "-fsanitize=thread",
+-      "-fsanitize-ignorelist=$tsan_ignorelist_path",
++      "-fsanitize-blacklist=$tsan_blacklist_path",
+     ]
+   }
+ }
+@@ -438,8 +438,8 @@ config("tsan_flags") {
+ config("ubsan_flags") {
+   cflags = []
+   if (is_ubsan) {
+-    if (!defined(ubsan_ignorelist_path)) {
+-      ubsan_ignorelist_path =
++    if (!defined(ubsan_blacklist_path)) {
++      ubsan_blacklist_path =
+           rebase_path("//tools/ubsan/ignorelist.txt", root_build_dir)
+     }
+     cflags += [
+@@ -456,7 +456,7 @@ config("ubsan_flags") {
+       "-fsanitize=signed-integer-overflow",
+       "-fsanitize=unreachable",
+       "-fsanitize=vla-bound",
+-      "-fsanitize-ignorelist=$ubsan_ignorelist_path",
++      "-fsanitize-blacklist=$ubsan_blacklist_path",
+     ]
+     if (!is_clang) {
+       # These exposes too much illegal C++14 code to compile on anything stricter than clang:
+@@ -497,8 +497,8 @@ config("ubsan_no_recover") {
+ 
+ config("ubsan_security_flags") {
+   if (is_ubsan_security) {
+-    if (!defined(ubsan_security_ignorelist_path)) {
+-      ubsan_security_ignorelist_path =
++    if (!defined(ubsan_security_blacklist_path)) {
++      ubsan_security_blacklist_path =
+           rebase_path("//tools/ubsan/security_ignorelist.txt", root_build_dir)
+     }
+     cflags = [
+@@ -506,7 +506,7 @@ config("ubsan_security_flags") {
+       "-fsanitize=shift",
+       "-fsanitize=signed-integer-overflow",
+       "-fsanitize=vla-bound",
+-      "-fsanitize-ignorelist=$ubsan_security_ignorelist_path",
++      "-fsanitize-blacklist=$ubsan_security_blacklist_path",
+     ]
+   }
+ }
+@@ -519,13 +519,13 @@ config("ubsan_null_flags") {
+ 
+ config("ubsan_vptr_flags") {
+   if (is_ubsan_vptr) {
+-    if (!defined(ubsan_vptr_ignorelist_path)) {
+-      ubsan_vptr_ignorelist_path =
++    if (!defined(ubsan_vptr_blacklist_path)) {
++      ubsan_vptr_blacklist_path =
+           rebase_path("//tools/ubsan/vptr_ignorelist.txt", root_build_dir)
+     }
+     cflags = [
+       "-fsanitize=vptr",
+-      "-fsanitize-ignorelist=$ubsan_vptr_ignorelist_path",
++      "-fsanitize-blacklist=$ubsan_vptr_blacklist_path",
+     ]
+     if (!is_clang) {
+       # Clang specific flag:
+--- a/src/3rdparty/chromium/build_overrides/build.gni
++++ b/src/3rdparty/chromium/build_overrides/build.gni
+@@ -43,15 +43,15 @@ declare_args() {
+ # Allows different projects to specify their own suppression/ignore lists for
+ # sanitizer tools.
+ # asan_suppressions_file = "path/to/asan_suppressions.cc"
+-# asan_win_ignorelist_path = "path/to/asan/blocklist_win.txt"
++# asan_win_blacklist_path = "path/to/asan/blocklist_win.txt"
+ # lsan_suppressions_file = "path/to/lsan_suppressions.cc"
+ # tsan_suppressions_file = "path/to/tsan_suppressions.cc"
+-# tsan_ignorelist_path = "path/to/tsan/ignores.txt"
+-# msan_ignorelist_path = "path/to/msan/ignorelist.txt"
+-# ubsan_ignorelist_path = "path/to/ubsan/ignorelist.txt"
+-# ubsan_vptr_ignorelist_path = "path/to/ubsan/vptr_ignorelist.txt"
+-# ubsan_security_ignorelist_path = "path/to/ubsan/security_ignorelist.txt"
+-# cfi_ignorelist_path = "path/to/cfi/ignores.txt"
++# tsan_blacklist_path = "path/to/tsan/ignores.txt"
++# msan_blacklist_path = "path/to/msan/blacklist.txt"
++# ubsan_blacklist_path = "path/to/ubsan/blacklist.txt"
++# ubsan_vptr_blacklist_path = "path/to/ubsan/vptr_blacklist.txt"
++# ubsan_security_blacklist_path = "path/to/ubsan/security_blacklist.txt"
++# cfi_blacklist_path = "path/to/cfi/ignores.txt"
+ 
+ declare_args() {
+   # Android 32-bit non-component, non-clang builds cannot have symbol_level=2
diff --git a/srcpkgs/qt6-webengine/patches/0105-chromium-revert-drop-of-system-java.patch b/srcpkgs/qt6-webengine/patches/0105-chromium-revert-drop-of-system-java.patch
new file mode 100644
index 000000000000..44f3aa8fae5e
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0105-chromium-revert-drop-of-system-java.patch
@@ -0,0 +1,15 @@
+This was dropped for some reason in 6951c37cecd05979b232a39e5c10e6346a0f74ef
+--- a/src/3rdparty/chromium/third_party/closure_compiler/compiler.py
++++ b/src/3rdparty/chromium/third_party/closure_compiler/compiler.py
+@@ -13,8 +13,9 @@ import subprocess
+ 
+ 
+ _CURRENT_DIR = os.path.join(os.path.dirname(__file__))
+-_JAVA_PATH = os.path.join(_CURRENT_DIR, "..", "jdk", "current", "bin", "java")
+-assert os.path.isfile(_JAVA_PATH), "java only allowed in android builds"
++_JAVA_BIN = "java"
++_JDK_PATH = os.path.join(_CURRENT_DIR, "..", "jdk", "current", "bin", "java")
++_JAVA_PATH = _JDK_PATH if os.path.isfile(_JDK_PATH) else _JAVA_BIN
+ 
+ class Compiler(object):
+   """Runs the Closure compiler on given source files to typecheck them
diff --git a/srcpkgs/qt6-webengine/patches/0106-chromium-system-nodejs.patch b/srcpkgs/qt6-webengine/patches/0106-chromium-system-nodejs.patch
new file mode 100644
index 000000000000..1e067cc6eda0
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0106-chromium-system-nodejs.patch
@@ -0,0 +1,20 @@
+--- a/src/3rdparty/chromium/third_party/node/node.py
++++ b/src/3rdparty/chromium/third_party/node/node.py
+@@ -36,11 +36,12 @@ def GetBinaryPath():
+   if platform.system() == 'Darwin' and platform.machine() == 'arm64':
+       return os.path.join(os_path.join(os_path.dirname(__file__), 'mac',
+                           'node-darwin-arm64', 'bin', 'node'))
+-  return os_path.join(os_path.dirname(__file__), *{
+-    'Darwin': ('mac', 'node-darwin-x64', 'bin', 'node'),
+-    'Linux': ('linux', 'node-linux-x64', 'bin', 'node'),
+-    'Windows': ('win', 'node.exe'),
+-  }[platform.system()])
++  return "/usr/bin/node"
++  #return os_path.join(os_path.dirname(__file__), *{
++  #  'Darwin': ('mac', 'node-darwin-x64', 'bin', 'node'),
++  #  'Linux': ('linux', 'node-linux-x64', 'bin', 'node'),
++  #  'Windows': ('win', 'node.exe'),
++  #}[platform.system()])
+ 
+ 
+ def RunNode(cmd_parts, stdout=None):
diff --git a/srcpkgs/qt6-webengine/patches/0107-chromium-cursed^Uscoped_file.patch b/srcpkgs/qt6-webengine/patches/0107-chromium-cursed^Uscoped_file.patch
new file mode 100644
index 000000000000..a8f5d971883d
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0107-chromium-cursed^Uscoped_file.patch
@@ -0,0 +1,18 @@
+--- a/src/3rdparty/chromium/base/files/scoped_file_linux.cc
++++ b/src/3rdparty/chromium/base/files/scoped_file_linux.cc
+@@ -77,15 +77,3 @@ bool IsFDOwned(int fd) {
+ }
+ 
+ }  // namespace base
+-
+-extern "C" {
+-
+-int __close(int);
+-
+-__attribute__((visibility("default"), noinline)) int close(int fd) {
+-  if (base::IsFDOwned(fd) && g_is_ownership_enforced)
+-    CrashOnFdOwnershipViolation();
+-  return __close(fd);
+-}
+-
+-}  // extern "C"
diff --git a/srcpkgs/qt6-webengine/patches/0108-chromium-fix-narrowing-cast.patch b/srcpkgs/qt6-webengine/patches/0108-chromium-fix-narrowing-cast.patch
new file mode 100644
index 000000000000..ed32cd9b7415
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0108-chromium-fix-narrowing-cast.patch
@@ -0,0 +1,53 @@
+--- a/src/3rdparty/chromium/base/files/file_util_linux.cc
++++ b/src/3rdparty/chromium/base/files/file_util_linux.cc
+@@ -23,14 +23,14 @@ bool GetFileSystemType(const FilePath& p
+ 
+   // Not all possible |statfs_buf.f_type| values are in linux/magic.h.
+   // Missing values are copied from the statfs man page.
+-  switch (statfs_buf.f_type) {
++  switch (static_cast<uintmax_t>(statfs_buf.f_type)) {
+     case 0:
+       *type = FILE_SYSTEM_0;
+       break;
+     case EXT2_SUPER_MAGIC:  // Also ext3 and ext4
+     case MSDOS_SUPER_MAGIC:
+     case REISERFS_SUPER_MAGIC:
+-    case static_cast<int>(BTRFS_SUPER_MAGIC):
++    case BTRFS_SUPER_MAGIC:
+     case 0x5346544E:  // NTFS
+     case 0x58465342:  // XFS
+     case 0x3153464A:  // JFS
+@@ -40,14 +40,14 @@ bool GetFileSystemType(const FilePath& p
+       *type = FILE_SYSTEM_NFS;
+       break;
+     case SMB_SUPER_MAGIC:
+-    case static_cast<int>(0xFF534D42):  // CIFS
++    case 0xFF534D42:  // CIFS
+       *type = FILE_SYSTEM_SMB;
+       break;
+     case CODA_SUPER_MAGIC:
+       *type = FILE_SYSTEM_CODA;
+       break;
+-    case static_cast<int>(HUGETLBFS_MAGIC):
+-    case static_cast<int>(RAMFS_MAGIC):
++    case HUGETLBFS_MAGIC:
++    case RAMFS_MAGIC:
+     case TMPFS_MAGIC:
+       *type = FILE_SYSTEM_MEMORY;
+       break;
+--- a/src/3rdparty/chromium/base/system/sys_info_posix.cc
++++ b/src/3rdparty/chromium/base/system/sys_info_posix.cc
+@@ -100,10 +100,10 @@ bool IsStatsZeroIfUnlimited(const base::
+   if (HANDLE_EINTR(statfs(path.value().c_str(), &stats)) != 0)
+     return false;
+ 
+-  switch (stats.f_type) {
++  switch (static_cast<uintmax_t>(stats.f_type)) {
+     case TMPFS_MAGIC:
+-    case static_cast<int>(HUGETLBFS_MAGIC):
+-    case static_cast<int>(RAMFS_MAGIC):
++    case HUGETLBFS_MAGIC:
++    case RAMFS_MAGIC:
+       return true;
+   }
+   return false;
diff --git a/srcpkgs/qt6-webengine/patches/0109-chromium-remove-strip_binary.patch b/srcpkgs/qt6-webengine/patches/0109-chromium-remove-strip_binary.patch
new file mode 100644
index 000000000000..5ebd16e659af
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0109-chromium-remove-strip_binary.patch
@@ -0,0 +1,32 @@
+--- a/src/3rdparty/chromium/chrome/test/chromedriver/BUILD.gn
++++ b/src/3rdparty/chromium/chrome/test/chromedriver/BUILD.gn
+@@ -308,11 +308,7 @@ source_set("lib") {
+   }
+ }
+ 
+-if (is_linux) {
+-  chromedriver_output = "chromedriver.unstripped"
+-} else {
+-  chromedriver_output = "chromedriver"
+-}
++chromedriver_output = "chromedriver"
+ 
+ executable("$chromedriver_output") {
+   testonly = true
+@@ -336,16 +332,6 @@ executable("$chromedriver_output") {
+   }
+ }
+ 
+-if (is_linux) {
+-  strip_binary("chromedriver") {
+-    testonly = true
+-    binary_input = "$root_out_dir/$chromedriver_output"
+-    symbol_output = "$root_out_dir/chromedriver.debug"
+-    stripped_binary_output = "$root_out_dir/chromedriver"
+-    deps = [ ":$chromedriver_output" ]
+-  }
+-}
+-
+ python_library("chromedriver_py_tests") {
+   testonly = true
+   deps = [
diff --git a/srcpkgs/qt6-webengine/patches/0110-chromium-revert-use-ffile-compilation-dir.patch b/srcpkgs/qt6-webengine/patches/0110-chromium-revert-use-ffile-compilation-dir.patch
new file mode 100644
index 000000000000..a00f7ea80f7a
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0110-chromium-revert-use-ffile-compilation-dir.patch
@@ -0,0 +1,57 @@
+From 34a955823630096f5b01c2b01d51c1ea59d22763 Mon Sep 17 00:00:00 2001
+From: Zequan Wu <zequanwu@google.com>
+Date: Tue, 20 Jul 2021 14:13:50 +0000
+Subject: [PATCH] Use -ffile-compilation-dir= instead of
+ -fdebug-compilation-dir=
+
+Bug: 1010267
+Change-Id: If2b4ead8535a76490eb466a38e3d8fed6ea91079
+Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2770738
+Auto-Submit: Zequan Wu <zequanwu@google.com>
+Commit-Queue: Nico Weber <thakis@chromium.org>
+Reviewed-by: Nico Weber <thakis@chromium.org>
+Cr-Commit-Position: refs/heads/master@{#903456}
+--- a/src/3rdparty/chromium/build/config/compiler/BUILD.gn
++++ b/src/3rdparty/chromium/build/config/compiler/BUILD.gn
+@@ -1269,19 +1269,12 @@ config("compiler_deterministic") {
+     # different build directory like "out/feature_a" and "out/feature_b" if
+     # we build same files with same compile flag.
+     # Other paths are already given in relative, no need to normalize them.
+-    if (is_nacl) {
+-      # TODO(https://crbug.com/1231236): Use -ffile-compilation-dir= here.
+-      cflags += [
+-        "-Xclang",
+-        "-fdebug-compilation-dir",
+-        "-Xclang",
+-        ".",
+-      ]
+-    } else {
+-      # -ffile-compilation-dir is an alias for both -fdebug-compilation-dir=
+-      # and -fcoverage-compilation-dir=.
+-      cflags += [ "-ffile-compilation-dir=." ]
+-    }
++    cflags += [
++      "-Xclang",
++      "-fdebug-compilation-dir",
++      "-Xclang",
++      ".",
++    ]
+     if (!is_win) {
+       # We don't use clang -cc1as on Windows (yet? https://crbug.com/762167)
+       asmflags = [ "-Wa,-fdebug-compilation-dir,." ]
+--- a/src/3rdparty/chromium/build/config/compiler/compiler.gni
++++ b/src/3rdparty/chromium/build/config/compiler/compiler.gni
+@@ -228,8 +228,11 @@ declare_args() {
+ # deterministic builds to reduce compile times, so this is less relevant for
+ # official builders.
+ strip_absolute_paths_from_debug_symbols_default =
+-    is_android || is_fuchsia || is_nacl || (is_win && use_lld) || is_linux ||
+-    is_chromeos || (is_apple && !enable_dsyms)
++    # TODO(crbug.com/1010267): remove '!use_clang_coverage', coverage build has
++    # dependency to absolute path of source files.
++    !use_clang_coverage &&
++    (is_android || is_fuchsia || is_nacl || (is_win && use_lld) || is_linux ||
++     is_chromeos || (is_apple && !enable_dsyms))
+ 
+ declare_args() {
+   strip_absolute_paths_from_debug_symbols = strip_absolute_paths_from_debug_symbols_default
diff --git a/srcpkgs/qt6-webengine/patches/0111-chromium-no-Wno-stringop-overread.patch b/srcpkgs/qt6-webengine/patches/0111-chromium-no-Wno-stringop-overread.patch
new file mode 100644
index 000000000000..03eac3f8e067
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0111-chromium-no-Wno-stringop-overread.patch
@@ -0,0 +1,10 @@
+--- a/src/3rdparty/chromium/build/config/compiler/BUILD.gn
++++ b/src/3rdparty/chromium/build/config/compiler/BUILD.gn
+@@ -394,7 +394,6 @@ config("compiler") {
+         "-Wno-parentheses",
+         "-Wno-sign-compare", # fido
+         "-Wno-stringop-overflow", # skia, libaom, protobuf, icu
+-        "-Wno-stringop-overread", # libaom
+         "-Wno-psabi", # skia
+         "-Wno-multichar", # crashpad
+         "-Wno-format-zero-length", # user_agent.cc
diff --git a/srcpkgs/qt6-webengine/patches/0150-chromium-glibc-libc_malloc.patch b/srcpkgs/qt6-webengine/patches/0150-chromium-glibc-libc_malloc.patch
new file mode 100644
index 000000000000..7e1b66e5c73d
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0150-chromium-glibc-libc_malloc.patch
@@ -0,0 +1,24 @@
+--- a/src/3rdparty/chromium/base/process/memory_linux.cc
++++ b/src/3rdparty/chromium/base/process/memory_linux.cc
+@@ -23,6 +23,12 @@
+ #include "third_party/tcmalloc/chromium/src/gperftools/tcmalloc.h"
+ #endif
+ 
++#if defined(LIBC_GLIBC)
++extern "C" {
++extern void *__libc_malloc(size_t size);
++}
++#endif
++
+ namespace base {
+ 
+ namespace {
+@@ -120,7 +126,7 @@ bool UncheckedMalloc(size_t size, void**
+     (!defined(LIBC_GLIBC) && !BUILDFLAG(USE_TCMALLOC))
+   *result = malloc(size);
+ #elif defined(LIBC_GLIBC) && !BUILDFLAG(USE_TCMALLOC)
+-  *result = __libc_malloc(size);
++  *result = ::__libc_malloc(size);
+ #elif BUILDFLAG(USE_TCMALLOC)
+   *result = tc_malloc_skip_new_handler(size);
+ #endif
diff --git a/srcpkgs/qt6-webengine/patches/0200-chromium-musl-include-sys-reg.h-to-get-__WORDSIZE.patch b/srcpkgs/qt6-webengine/patches/0200-chromium-musl-include-sys-reg.h-to-get-__WORDSIZE.patch
new file mode 100644
index 000000000000..41b90071b5e4
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0200-chromium-musl-include-sys-reg.h-to-get-__WORDSIZE.patch
@@ -0,0 +1,21 @@
+From 9001c54d6b974449174a8cee8f3f5d78a9bd6c9e Mon Sep 17 00:00:00 2001
+From: Felix Janda <felix.janda@posteo.de>
+Date: Sun, 1 Feb 2015 14:26:52 +0100
+Subject: [PATCH 3/6] include <sys/reg.h> to get __WORDSIZE on musl libc
+
+---
+ qtwebengine/src/3rdparty/chromium/third_party/breakpad/breakpad/src/common/linux/elf_core_dump.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/common/linux/elf_core_dump.h
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/common/linux/elf_core_dump.h
+@@ -37,6 +37,9 @@
+ #include <limits.h>
+ #include <link.h>
+ #include <stddef.h>
++#ifndef __GLIBC__
++#include <sys/reg.h>
++#endif
+ 
+ #include "common/memory_range.h"
+ 
diff --git a/srcpkgs/qt6-webengine/patches/0201-chromium-musl-dispatch-to-musl.patch b/srcpkgs/qt6-webengine/patches/0201-chromium-musl-dispatch-to-musl.patch
new file mode 100644
index 000000000000..a58a688a4b55
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0201-chromium-musl-dispatch-to-musl.patch
@@ -0,0 +1,103 @@
+--- a/src/3rdparty/chromium/base/allocator/allocator_shim_default_dispatch_to_glibc.cc
++++ b/src/3rdparty/chromium/base/allocator/allocator_shim_default_dispatch_to_glibc.cc
+@@ -8,6 +8,7 @@
+ #include <dlfcn.h>
+ #include <malloc.h>
+ 
++#if defined(__GLIBC__)
+ // This translation unit defines a default dispatch for the allocator shim which
+ // routes allocations to libc functions.
+ // The code here is strongly inspired from tcmalloc's libc_override_glibc.h.
+@@ -87,3 +88,92 @@ const AllocatorDispatch AllocatorDispatc
+     nullptr,               /* aligned_free_function */
+     nullptr,               /* next */
+ };
++
++#else // defined(__GLIBC__)
++
++#include <dlfcn.h>
++
++extern "C" {
++// Declare function pointers to the memory functions
++typedef void* (*t_libc_malloc)(size_t size);
++typedef void* (*t_libc_calloc)(size_t n, size_t size);
++typedef void* (*t_libc_realloc)(void* address, size_t size);
++typedef void* (*t_libc_memalign)(size_t alignment, size_t size);
++typedef void (*t_libc_free)(void* ptr);
++typedef size_t (*t_libc_malloc_usable_size)(void* ptr);
++
++// Static instances of pointers to libc.so dl symbols
++static t_libc_malloc libc_malloc = NULL;
++static t_libc_calloc libc_calloc = NULL;
++static t_libc_realloc libc_realloc = NULL;
++static t_libc_memalign libc_memalign = NULL;
++static t_libc_free libc_free = NULL;
++static t_libc_malloc_usable_size libc_malloc_usable_size = NULL;
++
++// resolve the symbols in libc.so
++void musl_libc_memory_init(void)
++{
++  libc_malloc = (t_libc_malloc) dlsym(RTLD_NEXT, "malloc");
++  libc_calloc = (t_libc_calloc) dlsym(RTLD_NEXT, "calloc");
++  libc_realloc = (t_libc_realloc) dlsym(RTLD_NEXT, "realloc");
++  libc_memalign = (t_libc_memalign) dlsym(RTLD_NEXT, "memalign");
++  libc_free = (t_libc_free) dlsym(RTLD_NEXT, "free");
++  libc_malloc_usable_size = (t_libc_malloc_usable_size) dlsym(RTLD_NEXT, "malloc_usable_size");
++}
++}  // extern "C"
++
++namespace {
++
++using base::allocator::AllocatorDispatch;
++
++void* MuslMalloc(const AllocatorDispatch*, size_t size, void* context) {
++  if (!libc_malloc)
++    musl_libc_memory_init();
++  return (*libc_malloc)(size);
++}
++
++void* MuslCalloc(const AllocatorDispatch*, size_t n, size_t size, void* context) {
++  if (!libc_calloc)
++    musl_libc_memory_init();
++  return (*libc_calloc)(n, size);
++}
++
++void* MuslRealloc(const AllocatorDispatch*, void* address, size_t size, void* context) {
++  if (!libc_realloc)
++    musl_libc_memory_init();
++  return (*libc_realloc)(address, size);
++}
++
++void* MuslMemalign(const AllocatorDispatch*, size_t alignment, size_t size, void* context) {
++  if (!libc_memalign)
++    musl_libc_memory_init();
++  return (*libc_memalign)(alignment, size);
++}
++
++void MuslFree(const AllocatorDispatch*, void* address, void* context) {
++  if (!libc_free)
++    musl_libc_memory_init();
++  (*libc_free)(address);
++}
++
++size_t MuslGetSizeEstimate(const AllocatorDispatch*, void* address, void* context) {
++  // TODO(siggi, primiano): malloc_usable_size may need redirection in the
++  //     presence of interposing shims that divert allocations.
++  if (!libc_malloc_usable_size)
++    musl_libc_memory_init();
++  return (*libc_malloc_usable_size)(address);
++}
++
++}  // namespace
++
++const AllocatorDispatch AllocatorDispatch::default_dispatch = {
++    &MuslMalloc,           /* alloc_function */
++    &MuslCalloc,           /* alloc_zero_initialized_function */
++    &MuslMemalign,         /* alloc_aligned_function */
++    &MuslRealloc,          /* realloc_function */
++    &MuslFree,             /* free_function */
++    &MuslGetSizeEstimate,  /* get_size_estimate_function */
++    nullptr,               /* next */
++};
++
++#endif
diff --git a/srcpkgs/qt6-webengine/patches/0202-chromium-musl-no-mallinfo.patch b/srcpkgs/qt6-webengine/patches/0202-chromium-musl-no-mallinfo.patch
new file mode 100644
index 000000000000..a5bdb5a43a5f
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0202-chromium-musl-no-mallinfo.patch
@@ -0,0 +1,62 @@
+--- a/src/3rdparty/chromium/base/process/process_metrics_posix.cc
++++ b/src/3rdparty/chromium/base/process/process_metrics_posix.cc
+@@ -105,7 +105,7 @@ void IncreaseFdLimitTo(unsigned int max_
+ 
+ #endif  // !defined(OS_FUCHSIA)
+ 
+-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID)
++#if (defined(OS_LINUX) && defined(__GLIBC__)) || defined(OS_CHROMEOS) || defined(OS_ANDROID)
+ namespace {
+ 
+ size_t GetMallocUsageMallinfo() {
+@@ -127,16 +127,16 @@ size_t GetMallocUsageMallinfo() {
+ }
+ 
+ }  // namespace
+-#endif  // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID)
++#endif  // (defined(OS_LINUX) && defined(__GLIBC__)) || defined(OS_CHROMEOS) || defined(OS_ANDROID)
+ 
+ size_t ProcessMetrics::GetMallocUsage() {
+ #if defined(OS_APPLE)
+   malloc_statistics_t stats = {0};
+   malloc_zone_statistics(nullptr, &stats);
+   return stats.size_in_use;
+-#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID)
++#elif (defined(OS_LINUX) && defined(__GLIBC__)) || defined(OS_CHROMEOS) || defined(OS_ANDROID)
+   return GetMallocUsageMallinfo();
+-#elif defined(OS_FUCHSIA)
++#else
+   // TODO(fuchsia): Not currently exposed. https://crbug.com/735087.
+   return 0;
+ #endif
+--- a/src/3rdparty/chromium/third_party/tflite/src/tensorflow/lite/profiling/memory_info.cc
++++ b/src/3rdparty/chromium/third_party/tflite/src/tensorflow/lite/profiling/memory_info.cc
+@@ -27,7 +27,7 @@ namespace memory {
+ const int MemoryUsage::kValueNotSet = 0;
+ 
+ bool MemoryUsage::IsSupported() {
+-#ifdef __linux__
++#ifdef __GLIBC__
+   return true;
+ #endif
+   return false;
+@@ -35,7 +35,7 @@ bool MemoryUsage::IsSupported() {
+ 
+ MemoryUsage GetMemoryUsage() {
+   MemoryUsage result;
+-#ifdef __linux__
++#ifdef __GLIBC__
+   rusage res;
+   if (getrusage(RUSAGE_SELF, &res) == 0) {
+     result.max_rss_kb = res.ru_maxrss;
+--- a/src/3rdparty/chromium/base/trace_event/malloc_dump_provider.cc
++++ b/src/3rdparty/chromium/base/trace_event/malloc_dump_provider.cc
+@@ -213,7 +213,7 @@ bool MallocDumpProvider::OnMemoryDump(co
+                      &allocated_objects_count);
+ #elif defined(OS_FUCHSIA)
+ // TODO(fuchsia): Port, see https://crbug.com/706592.
+-#else
++#elif defined(__GLIBC__)
+ #if defined(__GLIBC__) && defined(__GLIBC_PREREQ)
+ #if __GLIBC_PREREQ(2, 33)
+ #define MALLINFO2_FOUND_IN_LIBC
diff --git a/srcpkgs/qt6-webengine/patches/0203-chromium-musl-siginfo_t.patch b/srcpkgs/qt6-webengine/patches/0203-chromium-musl-siginfo_t.patch
new file mode 100644
index 000000000000..43ef7fd7c5d2
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0203-chromium-musl-siginfo_t.patch
@@ -0,0 +1,18 @@
+There's a subtle difference in the internal name of siginfo_t fields
+between glibc and musl. The structure itself is equivalent, so it
+should suffice to add a macro to rename the field.
+
+--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf/trap.cc
++++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf/trap.cc
+@@ -174,7 +174,11 @@ void Trap::SigSys(int nr, LinuxSigInfo*
+   // If the version of glibc doesn't include this information in
+   // siginfo_t (older than 2.17), we need to explicitly copy it
+   // into an arch_sigsys structure.
++#if defined(__GLIBC__)
+   memcpy(&sigsys, &info->_sifields, sizeof(sigsys));
++#else
++  memcpy(&sigsys, &info->__si_fields, sizeof(sigsys));
++#endif
+ #endif
+ 
+ #if defined(__mips__)
diff --git a/srcpkgs/qt6-webengine/patches/0204-chromium-musl-stackstart.patch b/srcpkgs/qt6-webengine/patches/0204-chromium-musl-stackstart.patch
new file mode 100644
index 000000000000..b03cf43b86db
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0204-chromium-musl-stackstart.patch
@@ -0,0 +1,20 @@
+--- a/src/3rdparty/chromium/third_party/blink/renderer/platform/wtf/stack_util.cc
++++ b/src/3rdparty/chromium/third_party/blink/renderer/platform/wtf/stack_util.cc
+@@ -29,7 +29,7 @@ size_t GetUnderestimatedStackSize() {
+ // FIXME: On Mac OSX and Linux, this method cannot estimate stack size
+ // correctly for the main thread.
+ 
+-#elif defined(__GLIBC__) || defined(OS_ANDROID) || defined(OS_FREEBSD) || \
++#elif defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FREEBSD) || \
+     defined(OS_FUCHSIA)
+   // pthread_getattr_np() can fail if the thread is not invoked by
+   // pthread_create() (e.g., the main thread of blink_unittests).
+@@ -97,7 +97,7 @@ return Threading::ThreadStackSize();
+ }
+ 
+ void* GetStackStart() {
+-#if defined(__GLIBC__) || defined(OS_ANDROID) || defined(OS_FREEBSD) || \
++#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FREEBSD) || \
+     defined(OS_FUCHSIA)
+   pthread_attr_t attr;
+   int error;
diff --git a/srcpkgs/qt6-webengine/patches/0205-chromium-musl-sandbox.patch b/srcpkgs/qt6-webengine/patches/0205-chromium-musl-sandbox.patch
new file mode 100644
index 000000000000..772a578fd823
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0205-chromium-musl-sandbox.patch
@@ -0,0 +1,92 @@
+--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc
++++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc
+@@ -138,7 +138,7 @@ namespace sandbox {
+ // present (as in newer versions of posix_spawn).
+ ResultExpr RestrictCloneToThreadsAndEPERMFork() {
+   const Arg<unsigned long> flags(0);
+-
++#if defined(__GLIBC__)
+   // TODO(mdempsky): Extend DSL to support (flags & ~mask1) == mask2.
+   const uint64_t kAndroidCloneMask = CLONE_VM | CLONE_FS | CLONE_FILES |
+                                      CLONE_SIGHAND | CLONE_THREAD |
+@@ -165,6 +165,17 @@ ResultExpr RestrictCloneToThreadsAndEPER
+   return If(IsAndroid() ? android_test : glibc_test, Allow())
+       .ElseIf(is_fork_or_clone_vfork, Error(EPERM))
+       .Else(CrashSIGSYSClone());
++#else
++  const int required = CLONE_VM | CLONE_FS | CLONE_FILES | CLONE_SIGHAND |
++                       CLONE_THREAD | CLONE_SYSVSEM;
++  const int safe = CLONE_SETTLS | CLONE_PARENT_SETTID | CLONE_CHILD_CLEARTID |
++                   CLONE_DETACHED;
++  const BoolExpr thread_clone_ok = (flags&~safe)==required;
++
++  return If(thread_clone_ok, Allow())
++      .ElseIf((flags & (CLONE_VM | CLONE_THREAD)) == 0, Error(EPERM))
++      .Else(CrashSIGSYSClone());
++#endif
+ }
+ 
+ #ifndef PR_PAC_RESET_KEYS
+--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
++++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
+@@ -419,6 +419,9 @@ bool SyscallSets::IsAllowedProcessStartO
+ #if defined(__i386__)
+     case __NR_waitpid:
+ #endif
++#if !defined(__GLIBC__)
++    case __NR_set_tid_address:
++#endif
+       return true;
+     case __NR_clone:  // Should be parameter-restricted.
+     case __NR_setns:  // Privileged.
+@@ -431,7 +434,9 @@ bool SyscallSets::IsAllowedProcessStartO
+ #if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
+     case __NR_set_thread_area:
+ #endif
++#if defined(__GLIBC__)
+     case __NR_set_tid_address:
++#endif
+     case __NR_unshare:
+ #if !defined(__mips__) && !defined(__aarch64__)
+     case __NR_vfork:
+@@ -545,6 +550,9 @@ bool SyscallSets::IsAllowedAddressSpaceA
+     case __NR_mlock:
+     case __NR_munlock:
+     case __NR_munmap:
++#if !defined(__GLIBC__)
++    case __NR_mremap:
++#endif
+       return true;
+     case __NR_madvise:
+     case __NR_mincore:
+@@ -562,7 +570,9 @@ bool SyscallSets::IsAllowedAddressSpaceA
+     case __NR_modify_ldt:
+ #endif
+     case __NR_mprotect:
++#if defined(__GLIBC__)
+     case __NR_mremap:
++#endif
+     case __NR_msync:
+     case __NR_munlockall:
+     case __NR_readahead:
+--- a/src/3rdparty/chromium/sandbox/policy/linux/bpf_renderer_policy_linux.cc
++++ b/src/3rdparty/chromium/sandbox/policy/linux/bpf_renderer_policy_linux.cc
+@@ -97,11 +97,18 @@ ResultExpr RendererProcessPolicy::Evalua
+     case __NR_sysinfo:
+     case __NR_times:
+     case __NR_uname:
++#if !defined(__GLIBC__)
++    case __NR_sched_getparam:
++    case __NR_sched_getscheduler:
++    case __NR_sched_setscheduler:
++#endif
+       return Allow();
+     case __NR_sched_getaffinity:
++#if defined(__GLIBC__)
+     case __NR_sched_getparam:
+     case __NR_sched_getscheduler:
+     case __NR_sched_setscheduler:
++#endif
+       return RestrictSchedTarget(GetPolicyPid(), sysno);
+     case __NR_prlimit64:
+       // See crbug.com/662450 and setrlimit comment above.
diff --git a/srcpkgs/qt6-webengine/patches/0206-chromium-musl-default-stacksize.patch b/srcpkgs/qt6-webengine/patches/0206-chromium-musl-default-stacksize.patch
new file mode 100644
index 000000000000..bc07495b8144
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0206-chromium-musl-default-stacksize.patch
@@ -0,0 +1,15 @@
+--- a/src/3rdparty/chromium/base/threading/platform_thread_linux.cc
++++ b/src/3rdparty/chromium/base/threading/platform_thread_linux.cc
+@@ -439,7 +439,12 @@ void TerminateOnThread() {}
+ 
+ size_t GetDefaultThreadStackSize(const pthread_attr_t& attributes) {
+ #if !defined(THREAD_SANITIZER)
++#if defined(__GLIBC__)
+   return 0;
++#else // defined(__GLIBC__)
++  // For Musl libc try with a default stack size of 2 MiB
++  return 2 * 1024 * 1024;
++#endif // !defined(__GLIBC__)
+ #else
+   // ThreadSanitizer bloats the stack heavily. Evidence has been that the
+   // default stack size isn't enough for some browser tests.
diff --git a/srcpkgs/qt6-webengine/patches/0208-chromium-musl-execinfo.patch b/srcpkgs/qt6-webengine/patches/0208-chromium-musl-execinfo.patch
new file mode 100644
index 000000000000..9f3b964676b3
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0208-chromium-musl-execinfo.patch
@@ -0,0 +1,125 @@
+--- a/src/3rdparty/chromium/base/debug/stack_trace.cc
++++ b/src/3rdparty/chromium/base/debug/stack_trace.cc
+@@ -252,7 +252,9 @@ void StackTrace::Print() const {
+ }
+ 
+ void StackTrace::OutputToStream(std::ostream* os) const {
++#if defined(__GLIBC__) && !defined(_AIX)
+   OutputToStreamWithPrefix(os, nullptr);
++#endif
+ }
+ 
+ std::string StackTrace::ToString() const {
+@@ -260,7 +262,7 @@ std::string StackTrace::ToString() const
+ }
+ std::string StackTrace::ToStringWithPrefix(const char* prefix_string) const {
+   std::stringstream stream;
+-#if !defined(__UCLIBC__) && !defined(_AIX)
++#if defined(__GLIBC__) && !defined(_AIX)
+   OutputToStreamWithPrefix(&stream, prefix_string);
+ #endif
+   return stream.str();
+--- a/src/3rdparty/chromium/base/debug/stack_trace_posix.cc
++++ b/src/3rdparty/chromium/base/debug/stack_trace_posix.cc
+@@ -27,7 +27,7 @@
+ #if !defined(USE_SYMBOLIZE)
+ #include <cxxabi.h>
+ #endif
+-#if !defined(__UCLIBC__) && !defined(_AIX)
++#if defined(__GLIBC__) && !defined(_AIX)
+ #include <execinfo.h>
+ #endif
+ 
+@@ -89,7 +89,7 @@ void DemangleSymbols(std::string* text)
+   // Note: code in this function is NOT async-signal safe (std::string uses
+   // malloc internally).
+ 
+-#if !defined(__UCLIBC__) && !defined(_AIX)
++#if defined(__GLIBC__) && !defined(_AIX)
+   std::string::size_type search_from = 0;
+   while (search_from < text->size()) {
+     // Look for the start of a mangled symbol, from search_from.
+@@ -124,7 +124,7 @@ void DemangleSymbols(std::string* text)
+       search_from = mangled_start + 2;
+     }
+   }
+-#endif  // !defined(__UCLIBC__) && !defined(_AIX)
++#endif  // !defined(__GLIBC__) && !defined(_AIX)
+ }
+ #endif  // !defined(USE_SYMBOLIZE)
+ 
+@@ -136,7 +136,7 @@ class BacktraceOutputHandler {
+   virtual ~BacktraceOutputHandler() = default;
+ };
+ 
+-#if !defined(__UCLIBC__) && !defined(_AIX)
++#if defined(__GLIBC__) && !defined(_AIX)
+ void OutputPointer(void* pointer, BacktraceOutputHandler* handler) {
+   // This should be more than enough to store a 64-bit number in hex:
+   // 16 hex digits + 1 for null-terminator.
+@@ -219,7 +219,7 @@ void ProcessBacktrace(void* const* trace
+   }
+ #endif  // defined(USE_SYMBOLIZE)
+ }
+-#endif  // !defined(__UCLIBC__) && !defined(_AIX)
++#endif  // !defined(__GLIBC__) && !defined(_AIX)
+ 
+ void PrintToStderr(const char* output) {
+   // NOTE: This code MUST be async-signal safe (it's used by in-process
+@@ -839,7 +839,7 @@ size_t CollectStackTrace(void** trace, s
+   // If we do not have unwind tables, then try tracing using frame pointers.
+   return base::debug::TraceStackFramePointers(const_cast<const void**>(trace),
+                                               count, 0);
+-#elif !defined(__UCLIBC__) && !defined(_AIX)
++#elif defined(__GLIBC__) && !defined(_AIX)
+   // Though the backtrace API man page does not list any possible negative
+   // return values, we take no chance.
+   return base::saturated_cast<size_t>(backtrace(trace, count));
+@@ -852,13 +852,13 @@ void StackTrace::PrintWithPrefix(const c
+ // NOTE: This code MUST be async-signal safe (it's used by in-process
+ // stack dumping signal handler). NO malloc or stdio is allowed here.
+ 
+-#if !defined(__UCLIBC__) && !defined(_AIX)
++#if defined(__GLIBC__) && !defined(_AIX)
+   PrintBacktraceOutputHandler handler;
+   ProcessBacktrace(trace_, count_, prefix_string, &handler);
+ #endif
+ }
+ 
+-#if !defined(__UCLIBC__) && !defined(_AIX)
++#if defined(__GLIBC__) && !defined(_AIX)
+ void StackTrace::OutputToStreamWithPrefix(std::ostream* os,
+                                           const char* prefix_string) const {
+   StreamBacktraceOutputHandler handler(os);
+--- a/src/3rdparty/chromium/base/logging.cc
++++ b/src/3rdparty/chromium/base/logging.cc
+@@ -582,7 +582,7 @@ LogMessage::LogMessage(const char* file,
+ 
+ LogMessage::~LogMessage() {
+   size_t stack_start = stream_.tellp();
+-#if !defined(OFFICIAL_BUILD) && !defined(OS_NACL) && !defined(__UCLIBC__) && \
++#if !defined(OFFICIAL_BUILD) && !defined(OS_NACL) && defined(__GLIBC__) && \
+     !defined(OS_AIX)
+   if (severity_ == LOGGING_FATAL && !base::debug::BeingDebugged()) {
+     // Include a stack trace on a fatal, unless a debugger is attached.
+--- 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 @@
+ 
+ #if defined(DEBUG) && defined(V8_OS_LINUX) && !defined(V8_OS_ANDROID)
+ #define SYMBOLIZE_FUNCTION
++#if defined(__GLIBC__)
+ #include <execinfo.h>
++#endif
+ 
+ #include <vector>
+ 
+@@ -103,7 +105,7 @@ void ExternalReferenceTable::Init(Isolat
+ }
+ 
+ const char* ExternalReferenceTable::ResolveSymbol(void* address) {
+-#ifdef SYMBOLIZE_FUNCTION
++#if defined(SYMBOLIZE_FUNCTION) && defined(__GLIBC__)
+   char** names = backtrace_symbols(&address, 1);
+   const char* name = names[0];
+   // The array of names is malloc'ed. However, each name string is static
diff --git a/srcpkgs/qt6-webengine/patches/0209-chromium-musl-thread-stacksize.patch b/srcpkgs/qt6-webengine/patches/0209-chromium-musl-thread-stacksize.patch
new file mode 100644
index 000000000000..4b760a428b25
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0209-chromium-musl-thread-stacksize.patch
@@ -0,0 +1,22 @@
+--- a/src/3rdparty/chromium/ppapi/utility/threading/simple_thread.cc
++++ b/src/3rdparty/chromium/ppapi/utility/threading/simple_thread.cc
+@@ -13,7 +13,7 @@ namespace pp {
+ namespace {
+ 
+ // Use 2MB default stack size for Native Client, otherwise use system default.
+-#if defined(__native_client__)
++#if defined(__native_client__) || !defined(__GLIBC__)
+ const size_t kDefaultStackSize = 2 * 1024 * 1024;
+ #else
+ const size_t kDefaultStackSize = 0;
+--- a/src/3rdparty/chromium/v8/src/base/platform/platform-posix.cc
++++ b/src/3rdparty/chromium/v8/src/base/platform/platform-posix.cc
+@@ -883,7 +883,7 @@ bool Thread::Start() {
+ #if V8_OS_MACOSX
+     // Default on Mac OS X is 512kB -- bump up to 1MB
+     stack_size = 1 * 1024 * 1024;
+-#elif V8_OS_AIX
++#elif V8_OS_AIX || !defined(__GLIBC__)
+     // Default on AIX is 96kB -- bump up to 2MB
+     stack_size = 2 * 1024 * 1024;
+ #endif
diff --git a/srcpkgs/qt6-webengine/patches/0210-chromium-musl-msgvec-push_back.patch b/srcpkgs/qt6-webengine/patches/0210-chromium-musl-msgvec-push_back.patch
new file mode 100644
index 000000000000..905daa223700
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0210-chromium-musl-msgvec-push_back.patch
@@ -0,0 +1,14 @@
+--- a/src/3rdparty/chromium/net/socket/udp_socket_posix.cc
++++ b/src/3rdparty/chromium/net/socket/udp_socket_posix.cc
+@@ -1162,7 +1162,11 @@ SendResult UDPSocketPosixSender::Interna
+     msg_iov->push_back({const_cast<char*>(buffer->data()), buffer->length()});
+   msgvec->reserve(buffers.size());
+   for (size_t j = 0; j < buffers.size(); j++)
++#if defined(__GLIBC__)
+     msgvec->push_back({{nullptr, 0, &msg_iov[j], 1, nullptr, 0, 0}, 0});
++#else
++    msgvec->push_back({{nullptr, 0, &msg_iov[j], 1, 0, 0, 0}, 0});
++#endif
+   int result = HANDLE_EINTR(Sendmmsg(fd, &msgvec[0], buffers.size(), 0));
+   SendResult send_result(0, 0, std::move(buffers));
+   if (result < 0) {
diff --git a/srcpkgs/qt6-webengine/patches/0211-chromium-musl-canonicalize-file-name-musl.patch b/srcpkgs/qt6-webengine/patches/0211-chromium-musl-canonicalize-file-name-musl.patch
new file mode 100644
index 000000000000..d43e6bd488bc
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0211-chromium-musl-canonicalize-file-name-musl.patch
@@ -0,0 +1,11 @@
+--- a/src/3rdparty/chromium/third_party/nasm/nasmlib/realpath.c
++++ b/src/3rdparty/chromium/third_party/nasm/nasmlib/realpath.c
+@@ -55,7 +55,7 @@
+  */
+ char *nasm_realpath(const char *rel_path)
+ {
+-    char *rp = canonicalize_file_name(rel_path);
++    char *rp = realpath(rel_path, NULL);
+     return rp ? rp : nasm_strdup(rel_path);
+ }
+ 
diff --git a/srcpkgs/qt6-webengine/patches/0212-chromium-musl-no-getcontext.patch b/srcpkgs/qt6-webengine/patches/0212-chromium-musl-no-getcontext.patch
new file mode 100644
index 000000000000..5755f1b45a7d
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0212-chromium-musl-no-getcontext.patch
@@ -0,0 +1,29 @@
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc
+@@ -489,8 +489,10 @@ bool ExceptionHandler::SimulateSignalDel
+   // ExceptionHandler::HandleSignal().
+   siginfo.si_code = SI_USER;
+   siginfo.si_pid = getpid();
+-  ucontext_t context;
++  ucontext_t context = { 0 };
++#if defined(__GLIBC__)
+   getcontext(&context);
++#endif
+   return HandleSignal(sig, &siginfo, &context);
+ }
+ 
+@@ -675,9 +677,14 @@ bool ExceptionHandler::WriteMinidump() {
+   sys_prctl(PR_SET_DUMPABLE, 1, 0, 0, 0);
+ 
+   CrashContext context;
++
++#if defined(__GLIBC__)
+   int getcontext_result = getcontext(&context.context);
+   if (getcontext_result)
+     return false;
++#else
++  return false;
++#endif
+ 
+ #if defined(__i386__)
+   // In CPUFillFromUContext in minidumpwriter.cc the stack pointer is retrieved
diff --git a/srcpkgs/qt6-webengine/patches/0213-chromium-musl-crashpad.patch b/srcpkgs/qt6-webengine/patches/0213-chromium-musl-crashpad.patch
new file mode 100644
index 000000000000..71bbad2af17e
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0213-chromium-musl-crashpad.patch
@@ -0,0 +1,24 @@
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/compat/linux/sys/ptrace.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/compat/linux/sys/ptrace.h
+@@ -17,7 +17,9 @@
+ 
+ #include_next <sys/ptrace.h>
+ 
++#ifdef __GLIBC__
+ #include <sys/cdefs.h>
++#endif
+ 
+ // https://sourceware.org/bugzilla/show_bug.cgi?id=22433
+ #if !defined(PTRACE_GET_THREAD_AREA) && !defined(PT_GET_THREAD_AREA) && \
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/util/linux/ptracer.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/util/linux/ptracer.cc
+@@ -26,6 +26,9 @@
+ 
+ #if defined(ARCH_CPU_X86_FAMILY)
+ #include <asm/ldt.h>
++#if !defined(__GLIBC__)
++#include <asm/ptrace-abi.h>
++#endif
+ #endif
+ 
+ namespace crashpad {
diff --git a/srcpkgs/qt6-webengine/patches/0214-chromium-musl-fixes.patch b/srcpkgs/qt6-webengine/patches/0214-chromium-musl-fixes.patch
new file mode 100644
index 000000000000..55b267ed1714
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0214-chromium-musl-fixes.patch
@@ -0,0 +1,108 @@
+--- a/src/3rdparty/chromium/sandbox/linux/suid/process_util.h
++++ b/src/3rdparty/chromium/sandbox/linux/suid/process_util.h
+@@ -12,6 +12,15 @@
+ #include <stdint.h>
+ #include <sys/types.h>
+ 
++#if !defined(__GLIBC__) && !defined(TEMP_FAILURE_RETRY)
++# define TEMP_FAILURE_RETRY(expression) \
++	(__extension__			\
++	 ({ long int __result;		\
++	  do __result = (long int) (expression); \
++	  while (__result == -1L && errno == EINTR); \
++	  __result; }))
++#endif
++
+ // This adjusts /proc/process/oom_score_adj so the Linux OOM killer
+ // will prefer certain process types over others. The range for the
+ // adjustment is [-1000, 1000], with [0, 1000] being user accessible.
+--- a/src/3rdparty/chromium/services/device/serial/serial_io_handler_posix.cc
++++ b/src/3rdparty/chromium/services/device/serial/serial_io_handler_posix.cc
+@@ -6,6 +6,7 @@
+ 
+ #include <sys/ioctl.h>
+ #include <termios.h>
++#include <asm-generic/ioctls.h>
+ 
+ #include <algorithm>
+ #include <utility>
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h
+@@ -38,6 +38,10 @@
+ #include "common/memory_allocator.h"
+ #include "google_breakpad/common/minidump_format.h"
+ 
++#ifndef __GLIBC__
++#define _libc_fpstate _fpstate
++#endif
++
+ namespace google_breakpad {
+ 
+ // Wraps platform-dependent implementations of accessors to ucontext_t structs.
+--- a/src/3rdparty/chromium/third_party/ffmpeg/libavutil/cpu.c
++++ b/src/3rdparty/chromium/third_party/ffmpeg/libavutil/cpu.c
+@@ -41,8 +41,10 @@
+ #include <sys/param.h>
+ #endif
+ #include <sys/types.h>
++#ifdef __GLIBC__
+ #include <sys/sysctl.h>
+ #endif
++#endif
+ #if HAVE_UNISTD_H
+ #include <unistd.h>
+ #endif
+--- a/src/3rdparty/chromium/third_party/perfetto/include/perfetto/ext/base/thread_utils.h
++++ b/src/3rdparty/chromium/third_party/perfetto/include/perfetto/ext/base/thread_utils.h
+@@ -29,9 +29,7 @@
+ #include <algorithm>
+ #endif
+ 
+-#if PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID)
+ #include <sys/prctl.h>
+-#endif
+ 
+ // Internal implementation utils that aren't as widely useful/supported as
+ // base/thread_utils.h.
+@@ -58,7 +56,7 @@ inline bool MaybeSetThreadName(const std
+ 
+ inline bool GetThreadName(std::string& out_result) {
+   char buf[16] = {};
+-#if PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID)
++#if !defined(__GLIBC__)
+   if (prctl(PR_GET_NAME, buf) != 0)
+     return false;
+ #else
+--- a/src/3rdparty/chromium/third_party/lss/linux_syscall_support.h
++++ b/src/3rdparty/chromium/third_party/lss/linux_syscall_support.h
+@@ -1300,6 +1300,18 @@ struct kernel_statfs {
+ #ifndef __NR_fallocate
+ #define __NR_fallocate          285
+ #endif
++
++#if !defined(__GLIBC__)
++#ifdef __NR_pread
++#undef __NR_pread
++#endif
++#ifdef __NR_pwrite
++#undef __NR_pwrite
++#endif
++#define __NR_pread __NR_pread64
++#define __NR_pwrite __NR_pwrite64
++#endif /* !defined(__GLIBC__) */
++
+ #ifndef __NR_getrandom
+ #define __NR_getrandom          318
+ #endif
+--- a/src/3rdparty/chromium/net/dns/dns_config_service_posix.cc
++++ b/src/3rdparty/chromium/net/dns/dns_config_service_posix.cc
+@@ -93,7 +93,8 @@ absl::optional<DnsConfig> ReadDnsConfig(
+ 
+   absl::optional<DnsConfig> dns_config;
+ // TODO(fuchsia): Use res_ninit() when it's implemented on Fuchsia.
+-#if defined(OS_OPENBSD) || defined(OS_FUCHSIA)
++#if defined(OS_OPENBSD) || defined(OS_FUCHSIA) || \
++  (defined(OS_LINUX) && !defined(__GLIBC__))
+   // Note: res_ninit in glibc always returns 0 and sets RES_INIT.
+   // res_init behaves the same way.
+   memset(&_res, 0, sizeof(_res));
diff --git a/srcpkgs/qt6-webengine/patches/0215-chromium-musl-cdefs.patch b/srcpkgs/qt6-webengine/patches/0215-chromium-musl-cdefs.patch
new file mode 100644
index 000000000000..9d1daec29118
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0215-chromium-musl-cdefs.patch
@@ -0,0 +1,29 @@
+--- a/src/3rdparty/chromium/third_party/libsync/src/include/sync/sync.h
++++ b/src/3rdparty/chromium/third_party/libsync/src/include/sync/sync.h
+@@ -19,12 +19,13 @@
+ #ifndef __SYS_CORE_SYNC_H
+ #define __SYS_CORE_SYNC_H
+ 
+-#include <sys/cdefs.h>
+ #include <stdint.h>
+ 
+ #include <linux/types.h>
+ 
+-__BEGIN_DECLS
++#ifdef __cplusplus
++extern "C" {
++#endif
+ 
+ struct sync_legacy_merge_data {
+  int32_t fd2;
+@@ -158,6 +159,9 @@ struct sync_pt_info *sync_pt_info(struct
+                                   struct sync_pt_info *itr);
+ void sync_fence_info_free(struct sync_fence_info_data *info);
+ 
+-__END_DECLS
++#ifdef __cplusplus
++}
++#endif
++
+ 
+ #endif /* __SYS_CORE_SYNC_H */
diff --git a/srcpkgs/qt6-webengine/patches/0216-chromium-musl-stat.patch b/srcpkgs/qt6-webengine/patches/0216-chromium-musl-stat.patch
new file mode 100644
index 000000000000..4509a6957cd7
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0216-chromium-musl-stat.patch
@@ -0,0 +1,12 @@
+--- a/src/3rdparty/chromium/base/files/file.h
++++ b/src/3rdparty/chromium/base/files/file.h
+@@ -19,7 +19,8 @@
+ #include "build/build_config.h"
+ 
+ #if defined(OS_BSD) || defined(OS_APPLE) || defined(OS_NACL) || \
+-    defined(OS_FUCHSIA) || (defined(OS_ANDROID) && __ANDROID_API__ < 21)
++    defined(OS_FUCHSIA) || (defined(OS_ANDROID) && __ANDROID_API__ < 21) || \
++    (defined(OS_LINUX) && !defined(__GLIBC__))
+ struct stat;
+ namespace base {
+ typedef struct stat stat_wrapper_t;
diff --git a/srcpkgs/qt6-webengine/patches/0217-chromium-musl-resolver.patch b/srcpkgs/qt6-webengine/patches/0217-chromium-musl-resolver.patch
new file mode 100644
index 000000000000..c3d7afad9b19
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0217-chromium-musl-resolver.patch
@@ -0,0 +1,77 @@
+--- a/src/3rdparty/chromium/net/dns/dns_config_service_linux.cc
++++ b/src/3rdparty/chromium/net/dns/dns_config_service_linux.cc
+@@ -432,11 +432,13 @@ class DnsConfigServiceLinux::ConfigReade
+     base::ScopedBlockingCall scoped_blocking_call(
+         FROM_HERE, base::BlockingType::MAY_BLOCK);
+ 
++#if defined(__GLIBC__)
+     std::unique_ptr<struct __res_state> res = resolv_reader_->GetResState();
+     if (res) {
+       dns_config_ = ConvertResStateToDnsConfig(*res.get());
+       resolv_reader_->CloseResState(res.get());
+     }
++#endif
+ 
+     UMA_HISTOGRAM_BOOLEAN("Net.DNS.DnsConfig.Resolv.Read",
+                           dns_config_.has_value());
+@@ -486,6 +488,7 @@ class DnsConfigServiceLinux::ConfigReade
+ 
+ std::unique_ptr<struct __res_state>
+ DnsConfigServiceLinux::ResolvReader::GetResState() {
++#if defined(__GLIBC__)
+   auto res = std::make_unique<struct __res_state>();
+   memset(res.get(), 0, sizeof(struct __res_state));
+ 
+@@ -495,11 +498,16 @@ DnsConfigServiceLinux::ResolvReader::Get
+   }
+ 
+   return res;
++#else
++  return nullptr;
++#endif
+ }
+ 
+ void DnsConfigServiceLinux::ResolvReader::CloseResState(
+     struct __res_state* res) {
++#if defined(__GLIBC__)
+   res_nclose(res);
++#endif
+ }
+ 
+ DnsConfigServiceLinux::DnsConfigServiceLinux()
+--- a/src/3rdparty/chromium/net/dns/dns_reloader.cc
++++ b/src/3rdparty/chromium/net/dns/dns_reloader.cc
+@@ -4,8 +4,7 @@
+ 
+ #include "net/dns/dns_reloader.h"
+ 
+-#if defined(OS_POSIX) && !defined(OS_APPLE) && !defined(OS_OPENBSD) && \
+-    !defined(OS_ANDROID) && !defined(OS_FUCHSIA)
++#ifdef __GLIBC__
+ 
+ #include <resolv.h>
+ 
+--- a/src/3rdparty/chromium/net/dns/host_resolver_manager.cc
++++ b/src/3rdparty/chromium/net/dns/host_resolver_manager.cc
+@@ -2720,8 +2720,7 @@ HostResolverManager::HostResolverManager
+   NetworkChangeNotifier::AddConnectionTypeObserver(this);
+   if (system_dns_config_notifier_)
+     system_dns_config_notifier_->AddObserver(this);
+-#if defined(OS_POSIX) && !defined(OS_APPLE) && !defined(OS_OPENBSD) && \
+-    !defined(OS_ANDROID)
++#ifdef __GLIBC__
+   EnsureDnsReloaderInit();
+ #endif
+ 
+--- a/src/3rdparty/chromium/net/dns/host_resolver_proc.cc
++++ b/src/3rdparty/chromium/net/dns/host_resolver_proc.cc
+@@ -176,8 +176,7 @@ int SystemHostResolverCall(const std::st
+   base::ScopedBlockingCall scoped_blocking_call(FROM_HERE,
+                                                 base::BlockingType::WILL_BLOCK);
+ 
+-#if defined(OS_POSIX) && !defined(OS_APPLE) && !defined(OS_OPENBSD) && \
+-    !defined(OS_ANDROID) && !defined(OS_FUCHSIA)
++#ifdef __GLIBC__
+   DnsReloaderMaybeReload();
+ #endif
+   absl::optional<AddressInfo> ai;
diff --git a/srcpkgs/qt6-webengine/patches/0600-chromium-sndio.patch b/srcpkgs/qt6-webengine/patches/0600-chromium-sndio.patch
new file mode 100644
index 000000000000..0302874ffba4
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0600-chromium-sndio.patch
@@ -0,0 +1,876 @@
+--- a/src/3rdparty/chromium/media/BUILD.gn
++++ b/src/3rdparty/chromium/media/BUILD.gn
+@@ -72,6 +72,9 @@ config("media_config") {
+       defines += [ "DLOPEN_PULSEAUDIO" ]
+     }
+   }
++  if (use_sndio) {
++    defines += [ "USE_SNDIO" ]
++  }
+   if (use_cras) {
+     defines += [ "USE_CRAS" ]
+   }
+--- a/src/3rdparty/chromium/media/audio/BUILD.gn
++++ b/src/3rdparty/chromium/media/audio/BUILD.gn
+@@ -240,6 +240,17 @@ source_set("audio") {
+     sources += [ "linux/audio_manager_linux.cc" ]
+   }
+ 
++  if (use_sndio) {
++    libs += [ "sndio" ]
++    sources += [
++      "sndio/audio_manager_sndio.cc",
++      "sndio/sndio_input.cc",
++      "sndio/sndio_input.h",
++      "sndio/sndio_output.cc",
++      "sndio/sndio_output.h"
++    ]
++  }
++
+   if (use_alsa) {
+     libs += [ "asound" ]
+     sources += [
+--- a/src/3rdparty/chromium/media/audio/linux/audio_manager_linux.cc
++++ b/src/3rdparty/chromium/media/audio/linux/audio_manager_linux.cc
+@@ -25,6 +25,11 @@
+ #include "media/audio/pulse/audio_manager_pulse.h"
+ #include "media/audio/pulse/pulse_util.h"
+ #endif
++#if defined(USE_SNDIO)
++#include "media/audio/sndio/audio_manager_sndio.h"
++#include "media/audio/sndio/sndio_input.h"
++#include "media/audio/sndio/sndio_output.h"
++#endif
+ 
+ namespace media {
+ 
+@@ -32,7 +37,8 @@ enum LinuxAudioIO {
+   kPulse,
+   kAlsa,
+   kCras,
+-  kAudioIOMax = kCras  // Must always be equal to largest logged entry.
++  kSndio,
++  kAudioIOMax = kSndio // Must always be equal to largest logged entry.
+ };
+ 
+ std::unique_ptr<media::AudioManager> CreateAudioManager(
+@@ -45,6 +51,16 @@ std::unique_ptr<media::AudioManager> Cre
+                                               audio_log_factory);
+   }
+ 
++#if defined(USE_SNDIO)
++  struct sio_hdl *hdl = sio_open(SIO_DEVANY, SIO_PLAY, 0);
++  if (hdl != NULL) {
++    sio_close(hdl);
++    UMA_HISTOGRAM_ENUMERATION("Media.LinuxAudioIO", kSndio, kAudioIOMax + 1);
++    return std::make_unique<AudioManagerSndio>(std::move(audio_thread),
++                                                  audio_log_factory);
++  }
++#endif
++
+ #if defined(USE_CRAS)
+   if (base::CommandLine::ForCurrentProcess()->HasSwitch(switches::kUseCras)) {
+     UMA_HISTOGRAM_ENUMERATION("Media.LinuxAudioIO", kCras, kAudioIOMax + 1);
+--- /dev/null
++++ b/src/3rdparty/chromium/media/audio/sndio/audio_manager_sndio.cc
+@@ -0,0 +1,148 @@
++// Copyright (c) 2012 The Chromium Authors. All rights reserved.
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++#include "media/audio/sndio/audio_manager_sndio.h"
++
++#include "base/metrics/histogram_macros.h"
++#include "base/memory/ptr_util.h"
++#include "media/audio/audio_device_description.h"
++#include "media/audio/audio_output_dispatcher.h"
++#include "media/audio/sndio/sndio_input.h"
++#include "media/audio/sndio/sndio_output.h"
++#include "media/base/limits.h"
++#include "media/base/media_switches.h"
++
++namespace media {
++
++
++// Maximum number of output streams that can be open simultaneously.
++static const int kMaxOutputStreams = 4;
++
++// Default sample rate for input and output streams.
++static const int kDefaultSampleRate = 48000;
++
++void AddDefaultDevice(AudioDeviceNames* device_names) {
++  DCHECK(device_names->empty());
++  device_names->push_front(AudioDeviceName::CreateDefault());
++}
++
++bool AudioManagerSndio::HasAudioOutputDevices() {
++  return true;
++}
++
++bool AudioManagerSndio::HasAudioInputDevices() {
++  return true;
++}
++
++void AudioManagerSndio::GetAudioInputDeviceNames(
++    AudioDeviceNames* device_names) {
++  DCHECK(device_names->empty());
++  AddDefaultDevice(device_names);
++}
++
++void AudioManagerSndio::GetAudioOutputDeviceNames(
++    AudioDeviceNames* device_names) {
++  AddDefaultDevice(device_names);
++}
++
++const char* AudioManagerSndio::GetName() {
++  return "SNDIO";
++}
++
++AudioParameters AudioManagerSndio::GetInputStreamParameters(
++    const std::string& device_id) {
++  static const int kDefaultInputBufferSize = 1024;
++
++  int user_buffer_size = GetUserBufferSize();
++  int buffer_size = user_buffer_size ?
++      user_buffer_size : kDefaultInputBufferSize;
++
++  return AudioParameters(
++      AudioParameters::AUDIO_PCM_LOW_LATENCY, CHANNEL_LAYOUT_STEREO,
++      kDefaultSampleRate, buffer_size);
++}
++
++AudioManagerSndio::AudioManagerSndio(std::unique_ptr<AudioThread> audio_thread,
++                                         AudioLogFactory* audio_log_factory)
++    : AudioManagerBase(std::move(audio_thread),
++                       audio_log_factory) {
++  DLOG(WARNING) << "AudioManagerSndio";
++  SetMaxOutputStreamsAllowed(kMaxOutputStreams);
++}
++
++AudioManagerSndio::~AudioManagerSndio() {
++  Shutdown();
++}
++
++AudioOutputStream* AudioManagerSndio::MakeLinearOutputStream(
++    const AudioParameters& params,
++    const LogCallback& log_callback) {
++  DCHECK_EQ(AudioParameters::AUDIO_PCM_LINEAR, params.format());
++  return MakeOutputStream(params);
++}
++
++AudioOutputStream* AudioManagerSndio::MakeLowLatencyOutputStream(
++    const AudioParameters& params,
++    const std::string& device_id,
++    const LogCallback& log_callback) {
++  DLOG_IF(ERROR, !device_id.empty()) << "Not implemented!";
++  DCHECK_EQ(AudioParameters::AUDIO_PCM_LOW_LATENCY, params.format());
++  return MakeOutputStream(params);
++}
++
++AudioInputStream* AudioManagerSndio::MakeLinearInputStream(
++    const AudioParameters& params,
++    const std::string& device_id,
++    const LogCallback& log_callback) {
++  DCHECK_EQ(AudioParameters::AUDIO_PCM_LINEAR, params.format());
++  return MakeInputStream(params);
++}
++
++AudioInputStream* AudioManagerSndio::MakeLowLatencyInputStream(
++    const AudioParameters& params,
++    const std::string& device_id,
++    const LogCallback& log_callback) {
++  DCHECK_EQ(AudioParameters::AUDIO_PCM_LOW_LATENCY, params.format());
++  return MakeInputStream(params);
++}
++
++AudioParameters AudioManagerSndio::GetPreferredOutputStreamParameters(
++    const std::string& output_device_id,
++    const AudioParameters& input_params) {
++  // TODO(tommi): Support |output_device_id|.
++  DLOG_IF(ERROR, !output_device_id.empty()) << "Not implemented!";
++  static const int kDefaultOutputBufferSize = 2048;
++
++  ChannelLayout channel_layout = CHANNEL_LAYOUT_STEREO;
++  int sample_rate = kDefaultSampleRate;
++  int buffer_size = kDefaultOutputBufferSize;
++  if (input_params.IsValid()) {
++    sample_rate = input_params.sample_rate();
++    channel_layout = input_params.channel_layout();
++    buffer_size = std::min(buffer_size, input_params.frames_per_buffer());
++  }
++
++  int user_buffer_size = GetUserBufferSize();
++  if (user_buffer_size)
++    buffer_size = user_buffer_size;
++
++  return AudioParameters(
++      AudioParameters::AUDIO_PCM_LOW_LATENCY, channel_layout,
++      sample_rate, buffer_size);
++}
++
++AudioInputStream* AudioManagerSndio::MakeInputStream(
++    const AudioParameters& params) {
++  DLOG(WARNING) << "MakeInputStream";
++  return new SndioAudioInputStream(this,
++             AudioDeviceDescription::kDefaultDeviceId, params);
++}
++
++AudioOutputStream* AudioManagerSndio::MakeOutputStream(
++    const AudioParameters& params) {
++  DLOG(WARNING) << "MakeOutputStream";
++  return new SndioAudioOutputStream(params, this);
++}
++
++}  // namespace media
+--- /dev/null
++++ b/src/3rdparty/chromium/media/audio/sndio/audio_manager_sndio.h
+@@ -0,0 +1,65 @@
++// Copyright (c) 2012 The Chromium Authors. All rights reserved.
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++#ifndef MEDIA_AUDIO_SNDIO_AUDIO_MANAGER_SNDIO_H_
++#define MEDIA_AUDIO_SNDIO_AUDIO_MANAGER_SNDIO_H_
++
++#include <set>
++
++#include "base/compiler_specific.h"
++#include "base/macros.h"
++#include "base/memory/ref_counted.h"
++#include "base/threading/thread.h"
++#include "media/audio/audio_manager_base.h"
++
++namespace media {
++
++class MEDIA_EXPORT AudioManagerSndio : public AudioManagerBase {
++ public:
++  AudioManagerSndio(std::unique_ptr<AudioThread> audio_thread,
++                   AudioLogFactory* audio_log_factory);
++  ~AudioManagerSndio() override;
++
++  // Implementation of AudioManager.
++  bool HasAudioOutputDevices() override;
++  bool HasAudioInputDevices() override;
++  void GetAudioInputDeviceNames(AudioDeviceNames* device_names) override;
++  void GetAudioOutputDeviceNames(AudioDeviceNames* device_names) override;
++  AudioParameters GetInputStreamParameters(
++      const std::string& device_id) override;
++  const char* GetName() override;
++
++  // Implementation of AudioManagerBase.
++  AudioOutputStream* MakeLinearOutputStream(
++      const AudioParameters& params,
++      const LogCallback& log_callback) override;
++  AudioOutputStream* MakeLowLatencyOutputStream(
++      const AudioParameters& params,
++      const std::string& device_id,
++      const LogCallback& log_callback) override;
++  AudioInputStream* MakeLinearInputStream(
++      const AudioParameters& params,
++      const std::string& device_id,
++      const LogCallback& log_callback) override;
++  AudioInputStream* MakeLowLatencyInputStream(
++      const AudioParameters& params,
++      const std::string& device_id,
++      const LogCallback& log_callback) override;
++
++ protected:
++  AudioParameters GetPreferredOutputStreamParameters(
++      const std::string& output_device_id,
++      const AudioParameters& input_params) override;
++
++ private:
++  // Called by MakeLinearOutputStream and MakeLowLatencyOutputStream.
++  AudioOutputStream* MakeOutputStream(const AudioParameters& params);
++  AudioInputStream* MakeInputStream(const AudioParameters& params);
++
++  DISALLOW_COPY_AND_ASSIGN(AudioManagerSndio);
++};
++
++}  // namespace media
++
++#endif  // MEDIA_AUDIO_SNDIO_AUDIO_MANAGER_SNDIO_H_
+--- /dev/null
++++ b/src/3rdparty/chromium/media/audio/sndio/sndio_input.cc
+@@ -0,0 +1,200 @@
++// Copyright 2013 The Chromium Authors. All rights reserved.
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++#include "base/bind.h"
++#include "base/logging.h"
++#include "base/macros.h"
++#include "media/base/audio_timestamp_helper.h"
++#include "media/audio/sndio/audio_manager_sndio.h"
++#include "media/audio/audio_manager.h"
++#include "media/audio/sndio/sndio_input.h"
++
++namespace media {
++
++static const SampleFormat kSampleFormat = kSampleFormatS16;
++
++void SndioAudioInputStream::OnMoveCallback(void *arg, int delta)
++{
++  SndioAudioInputStream* self = static_cast<SndioAudioInputStream*>(arg);
++
++  self->hw_delay += delta;
++}
++
++void *SndioAudioInputStream::ThreadEntry(void *arg) {
++  SndioAudioInputStream* self = static_cast<SndioAudioInputStream*>(arg);
++
++  self->ThreadLoop();
++  return NULL;
++}
++
++SndioAudioInputStream::SndioAudioInputStream(AudioManagerBase* manager,
++                                             const std::string& device_name,
++                                             const AudioParameters& params)
++    : manager(manager),
++      params(params),
++      audio_bus(AudioBus::Create(params)),
++      state(kClosed) {
++}
++
++SndioAudioInputStream::~SndioAudioInputStream() {
++  if (state != kClosed)
++    Close();
++}
++
++bool SndioAudioInputStream::Open() {
++  struct sio_par par;
++  int sig;
++
++  if (state != kClosed)
++    return false;
++
++  if (params.format() != AudioParameters::AUDIO_PCM_LINEAR &&
++      params.format() != AudioParameters::AUDIO_PCM_LOW_LATENCY) {
++    LOG(WARNING) << "Unsupported audio format.";
++    return false;
++  }
++
++  sio_initpar(&par);
++  par.rate = params.sample_rate();
++  par.rchan = params.channels();
++  par.bits = SampleFormatToBitsPerChannel(kSampleFormat);
++  par.bps = par.bits / 8;
++  par.sig = sig = par.bits != 8 ? 1 : 0;
++  par.le = SIO_LE_NATIVE;
++  par.appbufsz = params.frames_per_buffer();
++
++  hdl = sio_open(SIO_DEVANY, SIO_REC, 0);
++
++  if (hdl == NULL) {
++    LOG(ERROR) << "Couldn't open audio device.";
++    return false;
++  }
++
++  if (!sio_setpar(hdl, &par) || !sio_getpar(hdl, &par)) {
++    LOG(ERROR) << "Couldn't set audio parameters.";
++    goto bad_close;
++  }
++
++  if (par.rate  != (unsigned int)params.sample_rate() ||
++      par.rchan != (unsigned int)params.channels() ||
++      par.bits  != (unsigned int)SampleFormatToBitsPerChannel(kSampleFormat) ||
++      par.sig   != (unsigned int)sig ||
++      (par.bps > 1 && par.le != SIO_LE_NATIVE) ||
++      (par.bits != par.bps * 8)) {
++    LOG(ERROR) << "Unsupported audio parameters.";
++    goto bad_close;
++  }
++  state = kStopped;
++  buffer = new char[audio_bus->frames() * params.GetBytesPerFrame(kSampleFormat)];
++  sio_onmove(hdl, &OnMoveCallback, this);
++  return true;
++bad_close:
++  sio_close(hdl);
++  return false;
++}
++
++void SndioAudioInputStream::Start(AudioInputCallback* cb) {
++
++  StartAgc();
++
++  state = kRunning;
++  hw_delay = 0;
++  callback = cb;
++  sio_start(hdl);
++  if (pthread_create(&thread, NULL, &ThreadEntry, this) != 0) {
++    LOG(ERROR) << "Failed to create real-time thread for recording.";
++    sio_stop(hdl);
++    state = kStopped;
++  }
++}
++
++void SndioAudioInputStream::Stop() {
++
++  if (state == kStopped)
++    return;
++
++  state = kStopWait;
++  pthread_join(thread, NULL);
++  sio_stop(hdl);
++  state = kStopped;
++
++  StopAgc();
++}
++
++void SndioAudioInputStream::Close() {
++
++  if (state == kClosed)
++    return;
++
++  if (state == kRunning)
++    Stop();
++
++  state = kClosed;
++  delete [] buffer;
++  sio_close(hdl);
++
++  manager->ReleaseInputStream(this);
++}
++
++double SndioAudioInputStream::GetMaxVolume() {
++  // Not supported
++  return 0.0;
++}
++
++void SndioAudioInputStream::SetVolume(double volume) {
++  // Not supported. Do nothing.
++}
++
++double SndioAudioInputStream::GetVolume() {
++  // Not supported.
++  return 0.0;
++}
++
++bool SndioAudioInputStream::IsMuted() {
++  // Not supported.
++  return false;
++}
++
++void SndioAudioInputStream::SetOutputDeviceForAec(
++    const std::string& output_device_id) {
++  // Not supported.
++}
++
++void SndioAudioInputStream::ThreadLoop(void) {
++  size_t todo, n;
++  char *data;
++  unsigned int nframes;
++  double normalized_volume = 0.0;
++
++  nframes = audio_bus->frames();
++
++  while (state == kRunning && !sio_eof(hdl)) {
++
++    GetAgcVolume(&normalized_volume);
++
++    // read one block
++    todo = nframes * params.GetBytesPerFrame(kSampleFormat);
++    data = buffer;
++    while (todo > 0) {
++      n = sio_read(hdl, data, todo);
++      if (n == 0)
++        return;	// unrecoverable I/O error
++      todo -= n;
++      data += n;
++    }
++    hw_delay -= nframes;
++
++    // convert frames count to TimeDelta
++    const base::TimeDelta delay = AudioTimestampHelper::FramesToTime(hw_delay,
++      params.sample_rate());
++
++    // push into bus
++    audio_bus->FromInterleaved<SignedInt16SampleTypeTraits>(reinterpret_cast<int16_t*>(buffer), nframes);
++
++    // invoke callback
++    callback->OnData(audio_bus.get(), base::TimeTicks::Now() - delay, 1.);
++  }
++}
++
++}  // namespace media
+--- /dev/null
++++ b/src/3rdparty/chromium/media/audio/sndio/sndio_input.h
+@@ -0,0 +1,91 @@
++// Copyright 2013 The Chromium Authors. All rights reserved.
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++#ifndef MEDIA_AUDIO_SNDIO_SNDIO_INPUT_H_
++#define MEDIA_AUDIO_SNDIO_SNDIO_INPUT_H_
++
++#include <stdint.h>
++#include <string>
++#include <sndio.h>
++
++#include "base/compiler_specific.h"
++#include "base/macros.h"
++#include "base/memory/weak_ptr.h"
++#include "base/time/time.h"
++#include "media/audio/agc_audio_stream.h"
++#include "media/audio/audio_io.h"
++#include "media/audio/audio_device_description.h"
++#include "media/base/audio_parameters.h"
++
++namespace media {
++
++class AudioManagerBase;
++
++// Implementation of AudioOutputStream using sndio(7)
++class SndioAudioInputStream : public AgcAudioStream<AudioInputStream> {
++ public:
++  // Pass this to the constructor if you want to attempt auto-selection
++  // of the audio recording device.
++  static const char kAutoSelectDevice[];
++
++  // Create a PCM Output stream for the SNDIO device identified by
++  // |device_name|. If unsure of what to use for |device_name|, use
++  // |kAutoSelectDevice|.
++  SndioAudioInputStream(AudioManagerBase* audio_manager,
++                     const std::string& device_name,
++                     const AudioParameters& params);
++
++  ~SndioAudioInputStream() override;
++
++  // Implementation of AudioInputStream.
++  bool Open() override;
++  void Start(AudioInputCallback* callback) override;
++  void Stop() override;
++  void Close() override;
++  double GetMaxVolume() override;
++  void SetVolume(double volume) override;
++  double GetVolume() override;
++  bool IsMuted() override;
++  void SetOutputDeviceForAec(const std::string& output_device_id) override;
++
++ private:
++
++  enum StreamState {
++    kClosed,            // Not opened yet
++    kStopped,           // Device opened, but not started yet
++    kRunning,           // Started, device playing
++    kStopWait           // Stopping, waiting for the real-time thread to exit
++  };
++
++  // C-style call-backs
++  static void OnMoveCallback(void *arg, int delta);
++  static void* ThreadEntry(void *arg);
++
++  // Continuously moves data from the device to the consumer
++  void ThreadLoop();
++  // Our creator, the audio manager needs to be notified when we close.
++  AudioManagerBase* manager;
++  // Parameters of the source
++  AudioParameters params;
++  // We store data here for consumer
++  std::unique_ptr<AudioBus> audio_bus;
++  // Call-back that consumes recorded data
++  AudioInputCallback* callback;  // Valid during a recording session.
++  // Handle of the audio device
++  struct sio_hdl* hdl;
++  // Current state of the stream
++  enum StreamState state;
++  // High priority thread running ThreadLoop()
++  pthread_t thread;
++  // Number of frames buffered in the hardware
++  int hw_delay;
++  // Temporary buffer where data is stored sndio-compatible format
++  char* buffer;
++
++  DISALLOW_COPY_AND_ASSIGN(SndioAudioInputStream);
++};
++
++}  // namespace media
++
++#endif  // MEDIA_AUDIO_SNDIO_SNDIO_INPUT_H_
+--- /dev/null
++++ b/src/3rdparty/chromium/media/audio/sndio/sndio_output.cc
+@@ -0,0 +1,183 @@
++// Copyright (c) 2012 The Chromium Authors. All rights reserved.
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++#include "base/logging.h"
++#include "base/time/time.h"
++#include "base/time/default_tick_clock.h"
++#include "media/audio/audio_manager_base.h"
++#include "media/base/audio_timestamp_helper.h"
++#include "media/audio/sndio/sndio_output.h"
++
++namespace media {
++
++static const SampleFormat kSampleFormat = kSampleFormatS16;
++
++void SndioAudioOutputStream::OnMoveCallback(void *arg, int delta) {
++  SndioAudioOutputStream* self = static_cast<SndioAudioOutputStream*>(arg);
++
++  self->hw_delay -= delta;
++}
++
++void SndioAudioOutputStream::OnVolCallback(void *arg, unsigned int vol) {
++  SndioAudioOutputStream* self = static_cast<SndioAudioOutputStream*>(arg);
++
++  self->vol = vol;
++}
++
++void *SndioAudioOutputStream::ThreadEntry(void *arg) {
++  SndioAudioOutputStream* self = static_cast<SndioAudioOutputStream*>(arg);
++
++  self->ThreadLoop();
++  return NULL;
++}
++
++SndioAudioOutputStream::SndioAudioOutputStream(const AudioParameters& params,
++                                               AudioManagerBase* manager)
++    : manager(manager),
++      params(params),
++      audio_bus(AudioBus::Create(params)),
++      state(kClosed),
++      mutex(PTHREAD_MUTEX_INITIALIZER) {
++}
++
++SndioAudioOutputStream::~SndioAudioOutputStream() {
++  if (state != kClosed)
++    Close();
++}
++
++bool SndioAudioOutputStream::Open() {
++  struct sio_par par;
++  int sig;
++
++  if (params.format() != AudioParameters::AUDIO_PCM_LINEAR &&
++      params.format() != AudioParameters::AUDIO_PCM_LOW_LATENCY) {
++    LOG(WARNING) << "Unsupported audio format.";
++    return false;
++  }
++  sio_initpar(&par);
++  par.rate = params.sample_rate();
++  par.pchan = params.channels();
++  par.bits = SampleFormatToBitsPerChannel(kSampleFormat);
++  par.bps = par.bits / 8;
++  par.sig = sig = par.bits != 8 ? 1 : 0;
++  par.le = SIO_LE_NATIVE;
++  par.appbufsz = params.frames_per_buffer();
++
++  hdl = sio_open(SIO_DEVANY, SIO_PLAY, 0);
++  if (hdl == NULL) {
++    LOG(ERROR) << "Couldn't open audio device.";
++    return false;
++  }
++  if (!sio_setpar(hdl, &par) || !sio_getpar(hdl, &par)) {
++    LOG(ERROR) << "Couldn't set audio parameters.";
++    goto bad_close;
++  }
++  if (par.rate  != (unsigned int)params.sample_rate() ||
++      par.pchan != (unsigned int)params.channels() ||
++      par.bits  != (unsigned int)SampleFormatToBitsPerChannel(kSampleFormat) ||
++      par.sig   != (unsigned int)sig ||
++      (par.bps > 1 && par.le != SIO_LE_NATIVE) ||
++      (par.bits != par.bps * 8)) {
++    LOG(ERROR) << "Unsupported audio parameters.";
++    goto bad_close;
++  }
++  state = kStopped;
++  volpending = 0;
++  vol = 0;
++  buffer = new char[audio_bus->frames() * params.GetBytesPerFrame(kSampleFormat)];
++  sio_onmove(hdl, &OnMoveCallback, this);
++  sio_onvol(hdl, &OnVolCallback, this);
++  return true;
++ bad_close:
++  sio_close(hdl);
++  return false;
++}
++
++void SndioAudioOutputStream::Close() {
++  if (state == kClosed)
++    return;
++  if (state == kRunning)
++    Stop();
++  state = kClosed;
++  delete [] buffer;
++  sio_close(hdl);
++  manager->ReleaseOutputStream(this);  // Calls the destructor
++}
++
++void SndioAudioOutputStream::Start(AudioSourceCallback* callback) {
++  state = kRunning;
++  hw_delay = 0;
++  source = callback;
++  sio_start(hdl);
++  if (pthread_create(&thread, NULL, &ThreadEntry, this) != 0) {
++    LOG(ERROR) << "Failed to create real-time thread.";
++    sio_stop(hdl);
++    state = kStopped;
++  }
++}
++
++void SndioAudioOutputStream::Stop() {
++  if (state == kStopped)
++    return;
++  state = kStopWait;
++  pthread_join(thread, NULL);
++  sio_stop(hdl);
++  state = kStopped;
++}
++
++void SndioAudioOutputStream::SetVolume(double v) {
++  pthread_mutex_lock(&mutex);
++  vol = v * SIO_MAXVOL;
++  volpending = 1;
++  pthread_mutex_unlock(&mutex);
++}
++
++void SndioAudioOutputStream::GetVolume(double* v) {
++  pthread_mutex_lock(&mutex);
++  *v = vol * (1. / SIO_MAXVOL);
++  pthread_mutex_unlock(&mutex);
++}
++
++// This stream is always used with sub second buffer sizes, where it's
++// sufficient to simply always flush upon Start().
++void SndioAudioOutputStream::Flush() {}
++
++void SndioAudioOutputStream::ThreadLoop(void) {
++  int avail, count, result;
++
++  while (state == kRunning) {
++    // Update volume if needed
++    pthread_mutex_lock(&mutex);
++    if (volpending) {
++      volpending = 0;
++      sio_setvol(hdl, vol);
++    }
++    pthread_mutex_unlock(&mutex);
++
++    // Get data to play
++    const base::TimeDelta delay = AudioTimestampHelper::FramesToTime(hw_delay,
++	params.sample_rate());
++    count = source->OnMoreData(delay, base::TimeTicks::Now(), 0, audio_bus.get());
++    audio_bus->ToInterleaved<SignedInt16SampleTypeTraits>(count, reinterpret_cast<int16_t*>(buffer));
++    if (count == 0) {
++      // We have to submit something to the device
++      count = audio_bus->frames();
++      memset(buffer, 0, count * params.GetBytesPerFrame(kSampleFormat));
++      LOG(WARNING) << "No data to play, running empty cycle.";
++    }
++
++    // Submit data to the device
++    avail = count * params.GetBytesPerFrame(kSampleFormat);
++    result = sio_write(hdl, buffer, avail);
++    if (result == 0) {
++      LOG(WARNING) << "Audio device disconnected.";
++      break;
++    }
++
++    // Update hardware pointer
++    hw_delay += count;
++  }
++}
++
++}  // namespace media
+--- /dev/null
++++ b/src/3rdparty/chromium/media/audio/sndio/sndio_output.h
+@@ -0,0 +1,86 @@
++// Copyright (c) 2012 The Chromium Authors. All rights reserved.
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++#ifndef MEDIA_AUDIO_SNDIO_SNDIO_OUTPUT_H_
++#define MEDIA_AUDIO_SNDIO_SNDIO_OUTPUT_H_
++
++#include <pthread.h>
++#include <sndio.h>
++
++#include "base/time/tick_clock.h"
++#include "base/time/time.h"
++#include "media/audio/audio_io.h"
++
++namespace media {
++
++class AudioManagerBase;
++
++// Implementation of AudioOutputStream using sndio(7)
++class SndioAudioOutputStream : public AudioOutputStream {
++ public:
++  // The manager is creating this object
++  SndioAudioOutputStream(const AudioParameters& params,
++                         AudioManagerBase* manager);
++  virtual ~SndioAudioOutputStream();
++
++  // Implementation of AudioOutputStream.
++  bool Open() override;
++  void Close() override;
++  void Start(AudioSourceCallback* callback) override;
++  void Stop() override;
++  void SetVolume(double volume) override;
++  void GetVolume(double* volume) override;
++  void Flush() override;
++
++  friend void sndio_onmove(void *arg, int delta);
++  friend void sndio_onvol(void *arg, unsigned int vol);
++  friend void *sndio_threadstart(void *arg);
++
++ private:
++  enum StreamState {
++    kClosed,            // Not opened yet
++    kStopped,           // Device opened, but not started yet
++    kRunning,           // Started, device playing
++    kStopWait           // Stopping, waiting for the real-time thread to exit
++  };
++
++  // C-style call-backs
++  static void OnMoveCallback(void *arg, int delta);
++  static void OnVolCallback(void *arg, unsigned int vol);
++  static void* ThreadEntry(void *arg);
++
++  // Continuously moves data from the producer to the device
++  void ThreadLoop(void);
++
++  // Our creator, the audio manager needs to be notified when we close.
++  AudioManagerBase* manager;
++  // Parameters of the source
++  AudioParameters params;
++  // Source stores data here
++  std::unique_ptr<AudioBus> audio_bus;
++  // Call-back that produces data to play
++  AudioSourceCallback* source;
++  // Handle of the audio device
++  struct sio_hdl* hdl;
++  // Current state of the stream
++  enum StreamState state;
++  // High priority thread running ThreadLoop()
++  pthread_t thread;
++  // Protects vol, volpending and hw_delay
++  pthread_mutex_t mutex;
++  // Current volume in the 0..SIO_MAXVOL range
++  int vol;
++  // Set to 1 if volumes must be refreshed in the realtime thread
++  int volpending;
++  // Number of frames buffered in the hardware
++  int hw_delay;
++  // Temporary buffer where data is stored sndio-compatible format
++  char* buffer;
++
++  DISALLOW_COPY_AND_ASSIGN(SndioAudioOutputStream);
++};
++
++}  // namespace media
++
++#endif  // MEDIA_AUDIO_SNDIO_SNDIO_OUTPUT_H_
+--- a/src/3rdparty/chromium/media/media_options.gni
++++ b/src/3rdparty/chromium/media/media_options.gni
+@@ -121,6 +121,9 @@ declare_args() {
+   # Enables runtime selection of ALSA library for audio.
+   use_alsa = false
+ 
++  # Enable runtime selection of sndio(7)
++  use_sndio = false
++
+   # Alsa should be used on non-Android, non-Mac POSIX systems.
+   # Alsa should be used on desktop Chromecast and audio-only Chromecast builds.
+   if (is_posix && !is_android && !is_mac &&
diff --git a/srcpkgs/qt6-webengine/patches/0700-armv7l-neon.patch b/srcpkgs/qt6-webengine/patches/0700-armv7l-neon.patch
new file mode 100644
index 000000000000..d42fa19a07a1
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0700-armv7l-neon.patch
@@ -0,0 +1,10 @@
+--- a/src/3rdparty/chromium/skia/BUILD.gn
++++ b/src/3rdparty/chromium/skia/BUILD.gn
+@@ -800,7 +800,6 @@ skia_source_set("skia_opts") {
+         # Root build config sets -mfpu=$arm_fpu, which we expect to be neon
+         # when running this.
+         if (!arm_use_neon) {
+-          configs -= [ "//build/config/compiler:compiler_arm_fpu" ]
+           cflags += [ "-mfpu=neon" ]
+         }
+       }
diff --git a/srcpkgs/qt6-webengine/patches/0750-chromium-musl-cross-no-asm_ptrace_h.patch b/srcpkgs/qt6-webengine/patches/0750-chromium-musl-cross-no-asm_ptrace_h.patch
new file mode 100644
index 000000000000..3cf132908af4
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0750-chromium-musl-cross-no-asm_ptrace_h.patch
@@ -0,0 +1,30 @@
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper.cc
+@@ -38,7 +38,12 @@
+ 
+ #include "client/linux/minidump_writer/linux_ptrace_dumper.h"
+ 
++#if defined(__GLIBC__)
+ #include <asm/ptrace.h>
++#else
++/* For arm*-musl this definition is missing */
++#define ARM_sp uregs[13]
++#endif
+ #include <assert.h>
+ #include <errno.h>
+ #include <fcntl.h>
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_core_dumper.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_core_dumper.cc
+@@ -32,7 +32,12 @@
+ 
+ #include "client/linux/minidump_writer/linux_core_dumper.h"
+ 
++#if defined(__GLIBC__)
+ #include <asm/ptrace.h>
++#else
++/* For arm*-musl this definition is missing */
++#define ARM_sp uregs[13]
++#endif
+ #include <assert.h>
+ #include <elf.h>
+ #include <stdio.h>
diff --git a/srcpkgs/qt6-webengine/patches/0751-chromium-musl-arm-user_vfp.patch b/srcpkgs/qt6-webengine/patches/0751-chromium-musl-arm-user_vfp.patch
new file mode 100644
index 000000000000..6e2d62f35ee6
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0751-chromium-musl-arm-user_vfp.patch
@@ -0,0 +1,20 @@
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/util/linux/thread_info.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/util/linux/thread_info.h
+@@ -17,6 +17,17 @@
+ 
+ #include <stdint.h>
+ #include <sys/user.h>
++#if !defined(__GLIBC__)
++struct user_vfp {
++	unsigned long long fpregs[32];
++	unsigned long fpscr;
++};
++struct user_vfp_exc {
++	unsigned long fpexc;
++	unsigned long fpinst;
++	unsigned long fpinst2;
++};
++#endif /* !defined(__GLIBC__) */
+ 
+ #include <type_traits>
+ 
diff --git a/srcpkgs/qt6-webengine/patches/0752-chromium-musl-arm-elf_auxv_t.patch b/srcpkgs/qt6-webengine/patches/0752-chromium-musl-arm-elf_auxv_t.patch
new file mode 100644
index 000000000000..7112c8cfd3fa
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0752-chromium-musl-arm-elf_auxv_t.patch
@@ -0,0 +1,18 @@
+--- a/src/3rdparty/chromium/v8/src/base/cpu.cc
++++ b/src/3rdparty/chromium/v8/src/base/cpu.cc
+@@ -163,6 +163,15 @@ static V8_INLINE void __cpuid(int cpu_in
+ 
+ #if V8_HOST_ARCH_ARM || V8_HOST_ARCH_ARM64
+ 
++#ifndef __GLIBC__
++#include <elf.h>
++#ifdef __LP64__
++typedef Elf64_auxv_t elf_auxv_t;
++#else
++typedef Elf32_auxv_t elf_auxv_t;
++#endif
++#endif
++
+ static uint32_t ReadELFHWCaps() {
+   uint32_t result = 0;
+ #if V8_GLIBC_PREREQ(2, 16)
diff --git a/srcpkgs/qt6-webengine/patches/0801-chromium-i686-vaapi-fpermissive.patch b/srcpkgs/qt6-webengine/patches/0801-chromium-i686-vaapi-fpermissive.patch
new file mode 100644
index 000000000000..3d4043e03b89
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0801-chromium-i686-vaapi-fpermissive.patch
@@ -0,0 +1,24 @@
+--- a/src/3rdparty/chromium/media/gpu/vaapi/BUILD.gn
++++ b/src/3rdparty/chromium/media/gpu/vaapi/BUILD.gn
+@@ -14,6 +14,10 @@ import("//ui/gl/features.gni")
+ assert(is_linux || is_chromeos)
+ assert(use_vaapi)
+ 
++config("vaapi_permissive") {
++  cflags = [ "-fpermissive" ]
++}
++
+ generate_stubs("libva_stubs") {
+   extra_header = "va_stub_header.fragment"
+   sigs = [ "va.sigs" ]
+@@ -136,6 +140,10 @@ source_set("vaapi") {
+     ]
+   }
+ 
++  if (target_cpu == "x86") {
++    configs += [ ":vaapi_permissive" ]
++  }
++
+   if (use_x11) {
+     deps += [ "//ui/gfx/x" ]
+     sources += [
diff --git a/srcpkgs/qt6-webengine/patches/0900-xxx-ppc64le-libvpx.patch b/srcpkgs/qt6-webengine/patches/0900-xxx-ppc64le-libvpx.patch
new file mode 100644
index 000000000000..5c9566b56bd4
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0900-xxx-ppc64le-libvpx.patch
@@ -0,0 +1,65 @@
+Uses generic target for now. To use ppc64le, change --target to ppc64le-gnu
+and add --enable-vsx, and change generic to ppc for the rtcd header.
+
+From 18e6c5c55cfae0cfb458d8210d7bc709360a0e90 Mon Sep 17 00:00:00 2001
+From: q66 <daniel@octaforge.org>
+Date: Wed, 9 Sep 2020 19:08:25 +0200
+Subject: [PATCH] enable generation of ppc64 libvpx bits
+
+this doesn't update the gni file, that's done from
+the template by running the appropriate scripts
+---
+ third_party/libvpx/BUILD.gn        | 4 ++++
+ third_party/libvpx/generate_gni.sh | 9 +++++++++
+ 2 files changed, 13 insertions(+)
+
+--- a/src/3rdparty/chromium/third_party/libvpx/BUILD.gn
++++ b/src/3rdparty/chromium/third_party/libvpx/BUILD.gn
+@@ -424,6 +424,8 @@ static_library("bundled_libvpx") {
+       sources = libvpx_srcs_arm64
+       public_deps = [ ":libvpx_arm64_headers" ]
+     }
++  } else if (current_cpu == "ppc64") {
++    sources = libvpx_srcs_ppc64
+   }
+ 
+   configs -= [ "//build/config/compiler:chromium_code" ]
+--- a/src/3rdparty/chromium/third_party/libvpx/generate_gni.sh
++++ b/src/3rdparty/chromium/third_party/libvpx/generate_gni.sh
+@@ -374,6 +374,7 @@ gen_config_files linux/arm-neon-highbd "
+ gen_config_files linux/arm64-highbd "--target=armv8-linux-gcc ${all_platforms} ${HIGHBD}"
+ gen_config_files linux/mipsel "--target=mips32-linux-gcc ${all_platforms}"
+ gen_config_files linux/mips64el "--target=mips64-linux-gcc ${all_platforms}"
++gen_config_files linux/ppc64 "--target=generic-gnu $HIGHBD ${all_platforms}"
+ gen_config_files linux/generic "--target=generic-gnu $HIGHBD ${all_platforms}"
+ gen_config_files win/arm64 "--target=arm64-win64-vs15 ${all_platforms} ${HIGHBD}"
+ gen_config_files win/ia32 "--target=x86-win32-vs14 ${all_platforms} ${x86_platforms}"
+@@ -399,6 +400,7 @@ lint_config linux/arm-neon-highbd
+ lint_config linux/arm64-highbd
+ lint_config linux/mipsel
+ lint_config linux/mips64el
++lint_config linux/ppc64
+ lint_config linux/generic
+ lint_config win/arm64
+ lint_config win/ia32
+@@ -428,6 +430,7 @@ gen_rtcd_header linux/arm-neon-highbd ar
+ gen_rtcd_header linux/arm64-highbd armv8
+ gen_rtcd_header linux/mipsel mipsel
+ gen_rtcd_header linux/mips64el mips64el
++gen_rtcd_header linux/ppc64 generic
+ gen_rtcd_header linux/generic generic
+ gen_rtcd_header win/arm64 armv8
+ gen_rtcd_header win/ia32 x86 "${require_sse2}"
+@@ -513,6 +516,12 @@ if [ -z $ONLY_CONFIGS ]; then
+ 
+   echo "MIPS64 source list is identical to MIPS source list. No need to generate it."
+ 
++  echo "Generate ppc64 source list."
++  config=$(print_config_basic linux/ppc64)
++  make_clean
++  make libvpx_srcs.txt target=libs $config > /dev/null
++  convert_srcs_to_project_files libvpx_srcs.txt libvpx_srcs_ppc64
++
+   echo "Generate NaCl source list."
+   config=$(print_config_basic nacl)
+   make_clean
diff --git a/srcpkgs/qt6-webengine/patches/0901-xxx-ppc64le-sandbox-linux-stat.patch b/srcpkgs/qt6-webengine/patches/0901-xxx-ppc64le-sandbox-linux-stat.patch
new file mode 100644
index 000000000000..4b8e6320601c
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0901-xxx-ppc64le-sandbox-linux-stat.patch
@@ -0,0 +1,31 @@
+--- a/src/3rdparty/chromium/sandbox/linux/system_headers/linux_stat.h
++++ b/src/3rdparty/chromium/sandbox/linux/system_headers/linux_stat.h
+@@ -155,6 +155,28 @@ struct kernel_stat {
+   unsigned int __unused4;
+   unsigned int __unused5;
+ };
++#elif defined(__powerpc64__)
++struct kernel_stat {
++  unsigned long	st_dev;
++  unsigned long	st_ino;
++  unsigned long	st_nlink;
++  unsigned int	st_mode;
++  unsigned int	st_uid;
++  unsigned int	st_gid;
++  unsigned long	st_rdev;
++  long		st_size;
++  unsigned long	st_blksize;
++  unsigned long	st_blocks;
++  unsigned long	st_atime_;
++  unsigned long	st_atime_nsec_;
++  unsigned long	st_mtime_;
++  unsigned long	st_mtime_nsec_;
++  unsigned long	st_ctime_;
++  unsigned long	st_ctime_nsec_;
++  unsigned long	__unused4;
++  unsigned long	__unused5;
++  unsigned long	__unused6;
++};
+ #endif
+ 
+ #if !defined(AT_EMPTY_PATH)
diff --git a/srcpkgs/qt6-webengine/patches/0902-xxx-ppc64le-support.patch b/srcpkgs/qt6-webengine/patches/0902-xxx-ppc64le-support.patch
new file mode 100644
index 000000000000..33d415e55f69
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0902-xxx-ppc64le-support.patch
@@ -0,0 +1,3556 @@
+commit 2c013a317b1114ef67cdbbc30824b28907b9ea94
+Author: Daniel Kolesa <daniel@octaforge.org>
+Date:   Wed Mar 3 19:08:29 2021 +0100
+
+    ppc64le support
+
+--- a/src/3rdparty/chromium/sandbox/features.gni
++++ b/src/3rdparty/chromium/sandbox/features.gni
+@@ -11,7 +11,8 @@ import("//build/config/nacl/config.gni")
+ use_seccomp_bpf = (is_linux || is_chromeos || is_android) &&
+                   (current_cpu == "x86" || current_cpu == "x64" ||
+                    current_cpu == "arm" || current_cpu == "arm64" ||
+-                   current_cpu == "mipsel" || current_cpu == "mips64el")
++                   current_cpu == "mipsel" || current_cpu == "mips64el" ||
++                   current_cpu == "ppc64")
+ 
+ use_seccomp_bpf = use_seccomp_bpf || is_nacl_nonsfi
+ 
+--- a/src/3rdparty/chromium/sandbox/linux/BUILD.gn
++++ b/src/3rdparty/chromium/sandbox/linux/BUILD.gn
+@@ -433,6 +433,8 @@ component("sandbox_services") {
+ 
+ source_set("sandbox_services_headers") {
+   sources = [
++    "system_headers/ppc64_linux_syscalls.h",
++    "system_headers/ppc64_linux_ucontext.h",
+     "system_headers/arm64_linux_syscalls.h",
+     "system_headers/arm_linux_syscalls.h",
+     "system_headers/arm_linux_ucontext.h",
+--- a/src/3rdparty/chromium/sandbox/linux/bpf_dsl/linux_syscall_ranges.h
++++ b/src/3rdparty/chromium/sandbox/linux/bpf_dsl/linux_syscall_ranges.h
+@@ -56,6 +56,13 @@
+ #define MAX_PUBLIC_SYSCALL __NR_syscalls
+ #define MAX_SYSCALL MAX_PUBLIC_SYSCALL
+ 
++#elif defined(__powerpc64__)
++
++#include <asm/unistd.h>
++#define MIN_SYSCALL 0u
++#define MAX_PUBLIC_SYSCALL 386u
++#define MAX_SYSCALL MAX_PUBLIC_SYSCALL
++
+ #else
+ #error "Unsupported architecture"
+ #endif
+--- a/src/3rdparty/chromium/sandbox/linux/bpf_dsl/seccomp_macros.h
++++ b/src/3rdparty/chromium/sandbox/linux/bpf_dsl/seccomp_macros.h
+@@ -16,6 +16,9 @@
+ #if defined(__mips__)
+ // sys/user.h in eglibc misses size_t definition
+ #include <stddef.h>
++#elif defined(__powerpc64__) && defined(__GLIBC__)
++// Manually define greg_t on ppc64
++typedef unsigned long long greg_t;
+ #endif
+ #endif
+ 
+@@ -346,6 +349,59 @@ struct regs_struct {
+ #define SECCOMP_PT_PARM4(_regs) (_regs).regs[3]
+ #define SECCOMP_PT_PARM5(_regs) (_regs).regs[4]
+ #define SECCOMP_PT_PARM6(_regs) (_regs).regs[5]
++
++#elif defined(__powerpc64__)
++#include <asm/ptrace.h>
++
++typedef struct pt_regs regs_struct;
++
++#ifdef ARCH_CPU_LITTLE_ENDIAN
++#define SECCOMP_ARCH AUDIT_ARCH_PPC64LE
++#else
++#define SECCOMP_ARCH AUDIT_ARCH_PPC64
++#endif
++
++#ifdef __GLIBC__
++#define SECCOMP_REG(_ctx, _reg) ((_ctx)->uc_mcontext.regs->gpr[_reg])
++#else
++#define SECCOMP_REG(_ctx, _reg) (((struct pt_regs *)(_ctx)->uc_mcontext.regs)->gpr[_reg])
++#endif
++
++#define SECCOMP_RESULT(_ctx) SECCOMP_REG(_ctx, 3)
++#define SECCOMP_SYSCALL(_ctx) SECCOMP_REG(_ctx, 0)
++#ifdef __GLIBC__
++#define SECCOMP_IP(_ctx) (_ctx)->uc_mcontext.regs->nip
++#else
++#define SECCOMP_IP(_ctx) ((struct pt_regs *)(_ctx)->uc_mcontext.regs)->nip
++#endif
++#define SECCOMP_PARM1(_ctx) SECCOMP_REG(_ctx, 3)
++#define SECCOMP_PARM2(_ctx) SECCOMP_REG(_ctx, 4)
++#define SECCOMP_PARM3(_ctx) SECCOMP_REG(_ctx, 5)
++#define SECCOMP_PARM4(_ctx) SECCOMP_REG(_ctx, 6)
++#define SECCOMP_PARM5(_ctx) SECCOMP_REG(_ctx, 7)
++#define SECCOMP_PARM6(_ctx) SECCOMP_REG(_ctx, 8)
++
++#define SECCOMP_NR_IDX (offsetof(struct arch_seccomp_data, nr))
++#define SECCOMP_ARCH_IDX (offsetof(struct arch_seccomp_data, arch))
++#define SECCOMP_IP_MSB_IDX \
++  (offsetof(struct arch_seccomp_data, instruction_pointer) + 4)
++#define SECCOMP_IP_LSB_IDX \
++  (offsetof(struct arch_seccomp_data, instruction_pointer) + 0)
++#define SECCOMP_ARG_MSB_IDX(nr) \
++  (offsetof(struct arch_seccomp_data, args) + 8 * (nr) + 4)
++#define SECCOMP_ARG_LSB_IDX(nr) \
++  (offsetof(struct arch_seccomp_data, args) + 8 * (nr) + 0)
++
++#define SECCOMP_PT_RESULT(_regs) (_regs).gpr[3]
++#define SECCOMP_PT_SYSCALL(_regs) (_regs).gpr[0]
++#define SECCOMP_PT_IP(_regs) (_regs).nip
++#define SECCOMP_PT_PARM1(_regs) (_regs).gpr[3]
++#define SECCOMP_PT_PARM2(_regs) (_regs).gpr[4]
++#define SECCOMP_PT_PARM3(_regs) (_regs).gpr[5]
++#define SECCOMP_PT_PARM4(_regs) (_regs).gpr[6]
++#define SECCOMP_PT_PARM5(_regs) (_regs).gpr[7]
++#define SECCOMP_PT_PARM6(_regs) (_regs).gpr[8]
++
+ #else
+ #error Unsupported target platform
+ 
+--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc
++++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc
+@@ -90,7 +90,7 @@ bool IsBaselinePolicyWatched(int sysno)
+          SyscallSets::IsNuma(sysno) ||
+          SyscallSets::IsPrctl(sysno) ||
+          SyscallSets::IsProcessGroupOrSession(sysno) ||
+-#if defined(__i386__) || \
++#if defined(__i386__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+          SyscallSets::IsSocketCall(sysno) ||
+ #endif
+@@ -258,7 +258,7 @@ ResultExpr EvaluateSyscallImpl(int fs_de
+   }
+ 
+ #if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
+-    defined(__aarch64__)
++    defined(__aarch64__) || defined(__powerpc64__)
+   if (sysno == __NR_mmap)
+     return RestrictMmapFlags();
+ #endif
+@@ -279,7 +279,7 @@ ResultExpr EvaluateSyscallImpl(int fs_de
+     return RestrictPrctl();
+ 
+ #if defined(__x86_64__) || defined(__arm__) || defined(__mips__) || \
+-    defined(__aarch64__)
++    defined(__aarch64__) || defined(__powerpc64__)
+   if (sysno == __NR_socketpair) {
+     // Only allow AF_UNIX, PF_UNIX. Crash if anything else is seen.
+     static_assert(AF_UNIX == PF_UNIX,
+@@ -343,7 +343,8 @@ ResultExpr EvaluateSyscallImpl(int fs_de
+   }
+ 
+ #if defined(__i386__) || \
+-    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
++    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
++    defined(__powerpc64__)
+   if (SyscallSets::IsSocketCall(sysno))
+     return RestrictSocketcallCommand();
+ #endif
+--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/baseline_policy_unittest.cc
++++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/baseline_policy_unittest.cc
+@@ -317,7 +317,7 @@ TEST_BASELINE_SIGSYS(__NR_sysinfo)
+ TEST_BASELINE_SIGSYS(__NR_syslog)
+ TEST_BASELINE_SIGSYS(__NR_timer_create)
+ 
+-#if !defined(__aarch64__)
++#if !defined(__aarch64__) && !defined(__powerpc64__)
+ TEST_BASELINE_SIGSYS(__NR_inotify_init)
+ TEST_BASELINE_SIGSYS(__NR_vserver)
+ #endif
+--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc
++++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc
+@@ -40,6 +40,7 @@
+ #include <sys/ptrace.h>
+ #if (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) && \
+     !defined(__arm__) && !defined(__aarch64__) &&           \
++    !defined(__powerpc64__) &&                              \
+     !defined(PTRACE_GET_THREAD_AREA)
+ // Also include asm/ptrace-abi.h since ptrace.h in older libc (for instance
+ // the one in Ubuntu 16.04 LTS) is missing PTRACE_GET_THREAD_AREA.
+@@ -49,6 +50,11 @@
+ #endif
+ #endif  // !OS_NACL_NONSFI
+ 
++// On PPC64, TCGETS is defined in terms of struct termios, so we must include termios.h
++#ifdef __powerpc64__
++#include <termios.h>
++#endif
++
+ #if defined(OS_ANDROID)
+ 
+ #if !defined(F_DUPFD_CLOEXEC)
+@@ -106,6 +112,14 @@ inline bool IsArchitectureMips() {
+ #endif
+ }
+ 
++inline bool IsArchitecturePPC64() {
++#if defined(__powerpc64__)
++  return true;
++#else
++  return false;
++#endif
++}
++
+ // Ubuntu's version of glibc has a race condition in sem_post that can cause
+ // it to call futex(2) with bogus op arguments. To workaround this, we need
+ // to allow those futex(2) calls to fail with EINVAL, instead of crashing the
+@@ -270,6 +284,8 @@ ResultExpr RestrictFcntlCommands() {
+   uint64_t kOLargeFileFlag = O_LARGEFILE;
+   if (IsArchitectureX86_64() || IsArchitectureI386() || IsArchitectureMips())
+     kOLargeFileFlag = 0100000;
++  else if (IsArchitecturePPC64())
++    kOLargeFileFlag = 0200000;
+ 
+   const Arg<int> cmd(1);
+   const Arg<long> long_arg(2);
+@@ -287,7 +303,16 @@ ResultExpr RestrictFcntlCommands() {
+               F_SETLKW,
+               F_GETLK,
+               F_DUPFD,
+-              F_DUPFD_CLOEXEC),
++              F_DUPFD_CLOEXEC
++#if defined(__powerpc64__)
++// On PPC64, F_SETLK, F_GETLK, F_SETLKW are defined as the 64-bit variants
++// but glibc will sometimes still use the 32-bit versions. Allow both.
++              ,
++              5, /* F_GETLK (32) */
++              6, /* F_SETLK (32) */
++              7  /* F_SETLKW (32) */
++#endif
++	     ),
+              Allow())
+       .Case(F_SETFL,
+             If((long_arg & ~kAllowedMask) == 0, Allow()).Else(CrashSIGSYS()))
+@@ -297,7 +322,7 @@ ResultExpr RestrictFcntlCommands() {
+   // clang-format on
+ }
+ 
+-#if defined(__i386__) || defined(__mips__)
++#if defined(__i386__) || defined(__mips__) || defined(__powerpc64__)
+ ResultExpr RestrictSocketcallCommand() {
+   // Unfortunately, we are unable to restrict the first parameter to
+   // socketpair(2). Whilst initially sounding bad, it's noteworthy that very
+@@ -454,7 +479,7 @@ ResultExpr RestrictPtrace() {
+ #endif
+   return Switch(request)
+       .CASES((
+-#if !defined(__aarch64__)
++#if !defined(__aarch64__) && !defined(__powerpc64__)
+                  PTRACE_GETREGS, PTRACE_GETFPREGS,
+ #if defined(TRACE_GET_THREAD_AREA)
+                  PTRACE_GET_THREAD_AREA,
+--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.h
++++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.h
+@@ -49,7 +49,7 @@ SANDBOX_EXPORT bpf_dsl::ResultExpr Restr
+ // O_NONBLOCK | O_SYNC | O_LARGEFILE | O_CLOEXEC | O_NOATIME.
+ SANDBOX_EXPORT bpf_dsl::ResultExpr RestrictFcntlCommands();
+ 
+-#if defined(__i386__) || defined(__mips__)
++#if defined(__i386__) || defined(__mips__) || defined(__powerpc64__)
+ // Restrict socketcall(2) to only allow socketpair(2), send(2), recv(2),
+ // sendto(2), recvfrom(2), shutdown(2), sendmsg(2) and recvmsg(2).
+ SANDBOX_EXPORT bpf_dsl::ResultExpr RestrictSocketcallCommand();
+--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
++++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
+@@ -28,7 +28,7 @@ bool SyscallSets::IsKill(int sysno) {
+ bool SyscallSets::IsAllowedGettime(int sysno) {
+   switch (sysno) {
+     case __NR_gettimeofday:
+-#if defined(__i386__) || defined(__x86_64__) || \
++#if defined(__i386__) || defined(__x86_64__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_time:
+ #endif
+@@ -51,12 +51,12 @@ bool SyscallSets::IsAllowedGettime(int s
+                                     // filtered by RestrictClockID().
+     case __NR_clock_nanosleep_time64:  // Parameters filtered by RestrictClockID().
+ #endif
+-#if defined(__i386__) || \
++#if defined(__i386__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_ftime:  // Obsolete.
+ #endif
+     case __NR_settimeofday:  // Privileged.
+-#if defined(__i386__) || \
++#if defined(__i386__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_stime:
+ #endif
+@@ -135,7 +135,7 @@ bool SyscallSets::IsFileSystem(int sysno
+     case __NR_faccessat:  // EPERM not a valid errno.
+     case __NR_fchmodat:
+     case __NR_fchownat:  // Should be called chownat ?
+-#if defined(__x86_64__) || defined(__aarch64__)
++#if defined(__x86_64__) || defined(__aarch64__) || defined(__powerpc64__)
+     case __NR_newfstatat:  // fstatat(). EPERM not a valid errno.
+ #elif defined(__i386__) || defined(__arm__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+@@ -154,7 +154,7 @@ bool SyscallSets::IsFileSystem(int sysno
+     case __NR_memfd_create:
+     case __NR_mkdirat:
+     case __NR_mknodat:
+-#if defined(__i386__)
++#if defined(__i386__) || defined(__powerpc64__)
+     case __NR_oldlstat:
+     case __NR_oldstat:
+ #endif
+@@ -167,7 +167,7 @@ bool SyscallSets::IsFileSystem(int sysno
+     case __NR_stat64:
+ #endif
+     case __NR_statfs:  // EPERM not a valid errno.
+-#if defined(__i386__) || defined(__arm__) || \
++#if defined(__i386__) || defined(__arm__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_statfs64:
+ #endif
+@@ -179,7 +179,8 @@ bool SyscallSets::IsFileSystem(int sysno
+     case __NR_truncate64:
+ #endif
+     case __NR_unlinkat:
+-#if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
++#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
++    defined(__powerpc64__)
+     case __NR_utime:
+ #endif
+     case __NR_utimensat:  // New.
+@@ -204,7 +205,8 @@ bool SyscallSets::IsAllowedFileSystemAcc
+ #endif
+       return true;
+ // TODO(jln): these should be denied gracefully as well (moved below).
+-#if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
++#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
++    defined(__powerpc64__)
+     case __NR_fadvise64:  // EPERM not a valid errno.
+ #endif
+ #if defined(__i386__)
+@@ -216,12 +218,12 @@ bool SyscallSets::IsAllowedFileSystemAcc
+     case __NR_fdatasync:  // EPERM not a valid errno.
+     case __NR_flock:      // EPERM not a valid errno.
+     case __NR_fstatfs:    // Give information about the whole filesystem.
+-#if defined(__i386__) || defined(__arm__) || \
++#if defined(__i386__) || defined(__arm__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_fstatfs64:
+ #endif
+     case __NR_fsync:  // EPERM not a valid errno.
+-#if defined(__i386__)
++#if defined(__i386__) || defined(__powerpc64__)
+     case __NR_oldfstat:
+ #endif
+ #if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
+@@ -229,6 +231,8 @@ bool SyscallSets::IsAllowedFileSystemAcc
+     case __NR_sync_file_range:  // EPERM not a valid errno.
+ #elif defined(__arm__)
+     case __NR_arm_sync_file_range:  // EPERM not a valid errno.
++#elif defined(__powerpc64__)
++    case __NR_sync_file_range2: // EPERM not a valid errno.
+ #endif
+     default:
+       return false;
+@@ -248,7 +252,7 @@ bool SyscallSets::IsDeniedFileSystemAcce
+     case __NR_getdents:    // EPERM not a valid errno.
+ #endif
+     case __NR_getdents64:  // EPERM not a valid errno.
+-#if defined(__i386__) || \
++#if defined(__i386__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_readdir:
+ #endif
+@@ -290,7 +294,7 @@ bool SyscallSets::IsGetSimpleId(int sysn
+ bool SyscallSets::IsProcessPrivilegeChange(int sysno) {
+   switch (sysno) {
+     case __NR_capset:
+-#if defined(__i386__) || defined(__x86_64__)
++#if defined(__i386__) || defined(__x86_64__) || defined(__powerpc64__)
+     case __NR_ioperm:  // Intel privilege.
+     case __NR_iopl:    // Intel privilege.
+ #endif
+@@ -340,7 +344,7 @@ bool SyscallSets::IsAllowedSignalHandlin
+     case __NR_rt_sigprocmask:
+     case __NR_rt_sigreturn:
+     case __NR_rt_sigtimedwait:
+-#if defined(__i386__) || defined(__arm__) || \
++#if defined(__i386__) || defined(__arm__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_rt_sigtimedwait_time64:
+     case __NR_sigaction:
+@@ -357,7 +361,7 @@ bool SyscallSets::IsAllowedSignalHandlin
+     case __NR_signalfd:
+ #endif
+     case __NR_signalfd4:
+-#if defined(__i386__) || defined(__arm__) || \
++#if defined(__i386__) || defined(__arm__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_sigpending:
+     case __NR_sigsuspend:
+@@ -382,7 +386,7 @@ bool SyscallSets::IsAllowedOperationOnFd
+ #endif
+     case __NR_dup3:
+ #if defined(__x86_64__) || defined(__arm__) || defined(__mips__) || \
+-    defined(__aarch64__)
++    defined(__aarch64__) || defined(__powerpc64__)
+     case __NR_shutdown:
+ #endif
+       return true;
+@@ -416,7 +420,7 @@ bool SyscallSets::IsAllowedProcessStartO
+     case __NR_membarrier:
+     case __NR_wait4:
+     case __NR_waitid:
+-#if defined(__i386__)
++#if defined(__i386__) || defined(__powerpc64__)
+     case __NR_waitpid:
+ #endif
+ #if !defined(__GLIBC__)
+@@ -438,7 +442,7 @@ bool SyscallSets::IsAllowedProcessStartO
+     case __NR_set_tid_address:
+ #endif
+     case __NR_unshare:
+-#if !defined(__mips__) && !defined(__aarch64__)
++#if !defined(__mips__) && !defined(__aarch64__) || defined(__powerpc64__)
+     case __NR_vfork:
+ #endif
+     default:
+@@ -491,7 +495,7 @@ bool SyscallSets::IsAllowedGetOrModifySo
+       return true;
+     default:
+ #if defined(__x86_64__) || defined(__arm__) || defined(__mips__) || \
+-    defined(__aarch64__)
++    defined(__aarch64__) || defined(__powerpc64__)
+     case __NR_socketpair:  // We will want to inspect its argument.
+ #endif
+       return false;
+@@ -501,7 +505,7 @@ bool SyscallSets::IsAllowedGetOrModifySo
+ bool SyscallSets::IsDeniedGetOrModifySocket(int sysno) {
+   switch (sysno) {
+ #if defined(__x86_64__) || defined(__arm__) || defined(__mips__) || \
+-    defined(__aarch64__)
++    defined(__aarch64__) || defined(__powerpc64__)
+     case __NR_accept:
+     case __NR_accept4:
+     case __NR_bind:
+@@ -515,7 +519,7 @@ bool SyscallSets::IsDeniedGetOrModifySoc
+   }
+ }
+ 
+-#if defined(__i386__) || \
++#if defined(__i386__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+ // Big multiplexing system call for sockets.
+ bool SyscallSets::IsSocketCall(int sysno) {
+@@ -530,7 +534,8 @@ bool SyscallSets::IsSocketCall(int sysno
+ }
+ #endif
+ 
+-#if defined(__x86_64__) || defined(__arm__) || defined(__mips__)
++#if defined(__x86_64__) || defined(__arm__) || defined(__mips__) || \
++    defined(__powerpc64__)
+ bool SyscallSets::IsNetworkSocketInformation(int sysno) {
+   switch (sysno) {
+     case __NR_getpeername:
+@@ -558,7 +563,7 @@ bool SyscallSets::IsAllowedAddressSpaceA
+     case __NR_mincore:
+     case __NR_mlockall:
+ #if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
+-    defined(__aarch64__)
++    defined(__aarch64__) || defined(__powerpc64__)
+     case __NR_mmap:
+ #endif
+ #if defined(__i386__) || defined(__arm__) || \
+@@ -589,7 +594,7 @@ bool SyscallSets::IsAllowedAddressSpaceA
+ bool SyscallSets::IsAllowedGeneralIo(int sysno) {
+   switch (sysno) {
+     case __NR_lseek:
+-#if defined(__i386__) || defined(__arm__) || \
++#if defined(__i386__) || defined(__arm__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR__llseek:
+ #endif
+@@ -609,27 +614,27 @@ bool SyscallSets::IsAllowedGeneralIo(int
+     case __NR_read:
+     case __NR_readv:
+     case __NR_pread64:
+-#if defined(__arm__) || \
++#if defined(__arm__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_recv:
+ #endif
+ #if defined(__x86_64__) || defined(__arm__) || defined(__mips__) || \
+-    defined(__aarch64__)
++    defined(__aarch64__) || defined(__powerpc64__)
+     case __NR_recvfrom:  // Could specify source.
+     case __NR_recvmsg:   // Could specify source.
+ #endif
+-#if defined(__i386__) || defined(__x86_64__)
++#if defined(__i386__) || defined(__x86_64__) || defined(__powerpc64__)
+     case __NR_select:
+ #endif
+-#if defined(__i386__) || defined(__arm__) || defined(__mips__)
++#if defined(__i386__) || defined(__arm__) || defined(__mips__) || defined(__powerpc64__)
+     case __NR__newselect:
+ #endif
+-#if defined(__arm__) || \
++#if defined(__arm__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_send:
+ #endif
+ #if defined(__x86_64__) || defined(__arm__) || defined(__mips__) || \
+-    defined(__aarch64__)
++    defined(__aarch64__) || defined(__powerpc64__)
+     case __NR_sendmsg:  // Could specify destination.
+     case __NR_sendto:   // Could specify destination.
+ #endif
+@@ -684,7 +689,7 @@ bool SyscallSets::IsAllowedBasicSchedule
+     case __NR_nanosleep:
+       return true;
+     case __NR_getpriority:
+-#if defined(__i386__) || defined(__arm__) || \
++#if defined(__i386__) || defined(__arm__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_nice:
+ #endif
+@@ -696,7 +701,7 @@ bool SyscallSets::IsAllowedBasicSchedule
+ 
+ bool SyscallSets::IsAdminOperation(int sysno) {
+   switch (sysno) {
+-#if defined(__i386__) || defined(__arm__) || \
++#if defined(__i386__) || defined(__arm__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_bdflush:
+ #endif
+@@ -713,7 +718,8 @@ bool SyscallSets::IsAdminOperation(int s
+ 
+ bool SyscallSets::IsKernelModule(int sysno) {
+   switch (sysno) {
+-#if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
++#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
++    defined(__powerpc64__)
+     case __NR_create_module:
+     case __NR_get_kernel_syms:  // Should ENOSYS.
+     case __NR_query_module:
+@@ -745,7 +751,7 @@ bool SyscallSets::IsFsControl(int sysno)
+     case __NR_quotactl:
+     case __NR_swapoff:
+     case __NR_swapon:
+-#if defined(__i386__) || \
++#if defined(__i386__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_umount:
+ #endif
+@@ -762,7 +768,7 @@ bool SyscallSets::IsNuma(int sysno) {
+     case __NR_getcpu:
+     case __NR_mbind:
+ #if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
+-    defined(__aarch64__)
++    defined(__aarch64__) || defined(__powerpc64__)
+     case __NR_migrate_pages:
+ #endif
+     case __NR_move_pages:
+@@ -797,13 +803,13 @@ bool SyscallSets::IsGlobalProcessEnviron
+   switch (sysno) {
+     case __NR_acct:  // Privileged.
+ #if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
+-    defined(__aarch64__)
++    defined(__aarch64__) || defined(__powerpc64__)
+     case __NR_getrlimit:
+ #endif
+-#if defined(__i386__) || defined(__arm__)
++#if defined(__i386__) || defined(__arm__) || defined(__powerpc64__)
+     case __NR_ugetrlimit:
+ #endif
+-#if defined(__i386__) || \
++#if defined(__i386__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_ulimit:
+ #endif
+@@ -838,7 +844,7 @@ bool SyscallSets::IsGlobalSystemStatus(i
+ #endif
+     case __NR_sysinfo:
+     case __NR_uname:
+-#if defined(__i386__)
++#if defined(__i386__) || defined(__powerpc64__)
+     case __NR_olduname:
+     case __NR_oldolduname:
+ #endif
+@@ -904,8 +910,16 @@ bool SyscallSets::IsSystemVSemaphores(in
+ }
+ #endif
+ 
++/* shitty hack around Void's 4.19 kernel headers missing those numbers */
++#if defined(__powerpc64__) && !defined(__NR_shmget)
++#define __NR_shmget 395
++#define __NR_shmctl 396
++#define __NR_shmat 397
++#define __NR_shmdt 398
++#endif
++
+ #if defined(__i386__) || defined(__x86_64__) || defined(__arm__) || \
+-    defined(__aarch64__) ||                                         \
++    defined(__aarch64__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_64_BITS))
+ // These give a lot of ambient authority and bypass the setuid sandbox.
+ bool SyscallSets::IsSystemVSharedMemory(int sysno) {
+@@ -936,7 +950,7 @@ bool SyscallSets::IsSystemVMessageQueue(
+ }
+ #endif
+ 
+-#if defined(__i386__) || \
++#if defined(__i386__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+ // Big system V multiplexing system call.
+ bool SyscallSets::IsSystemVIpc(int sysno) {
+@@ -956,7 +970,7 @@ bool SyscallSets::IsAnySystemV(int sysno
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_64_BITS))
+   return IsSystemVMessageQueue(sysno) || IsSystemVSemaphores(sysno) ||
+          IsSystemVSharedMemory(sysno);
+-#elif defined(__i386__) || \
++#elif defined(__i386__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+   return IsSystemVIpc(sysno);
+ #endif
+@@ -1014,7 +1028,8 @@ bool SyscallSets::IsFaNotify(int sysno)
+ bool SyscallSets::IsTimer(int sysno) {
+   switch (sysno) {
+     case __NR_getitimer:
+-#if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
++#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
++    defined(__powerpc64__)
+     case __NR_alarm:
+ #endif
+     case __NR_setitimer:
+@@ -1096,17 +1111,20 @@ bool SyscallSets::IsMisc(int sysno) {
+     case __NR_syncfs:
+     case __NR_vhangup:
+ // The system calls below are not implemented.
+-#if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
++#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
++    defined(__powerpc64__)
+     case __NR_afs_syscall:
+ #endif
+ #if defined(__i386__) || \
+-    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
++    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
++    defined(__powerpc64__)
+     case __NR_break:
+ #endif
+-#if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
++#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
++    defined(__powerpc64__)
+     case __NR_getpmsg:
+ #endif
+-#if defined(__i386__) || \
++#if defined(__i386__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_gtty:
+     case __NR_idle:
+@@ -1115,20 +1133,21 @@ bool SyscallSets::IsMisc(int sysno) {
+     case __NR_prof:
+     case __NR_profil:
+ #endif
+-#if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
++#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
++    defined(__powerpc64__)
+     case __NR_putpmsg:
+ #endif
+ #if defined(__x86_64__)
+     case __NR_security:
+ #endif
+-#if defined(__i386__) || \
++#if defined(__i386__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_stty:
+ #endif
+-#if defined(__x86_64__)
++#if defined(__x86_64__) || defined(__powerpc64__)
+     case __NR_tuxcall:
+ #endif
+-#if !defined(__aarch64__)
++#if !defined(__aarch64__) && !defined(__powerpc64__)
+     case __NR_vserver:
+ #endif
+       return true;
+--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_sets.h
++++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_sets.h
+@@ -43,13 +43,14 @@ class SANDBOX_EXPORT SyscallSets {
+   static bool IsDeniedGetOrModifySocket(int sysno);
+ 
+ #if defined(__i386__) || \
+-    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
++    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
++    defined(__powerpc64__)
+   // Big multiplexing system call for sockets.
+   static bool IsSocketCall(int sysno);
+ #endif
+ 
+ #if defined(__x86_64__) || defined(__arm__) || defined(__mips__) || \
+-    defined(__aarch64__)
++    defined(__aarch64__) || defined(__powerpc64__)
+   static bool IsNetworkSocketInformation(int sysno);
+ #endif
+ 
+@@ -77,7 +78,7 @@ class SANDBOX_EXPORT SyscallSets {
+   static bool IsSystemVSemaphores(int sysno);
+ #endif
+ #if defined(__i386__) || defined(__x86_64__) || defined(__arm__) || \
+-    defined(__aarch64__) ||                                         \
++    defined(__aarch64__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_64_BITS))
+   // These give a lot of ambient authority and bypass the setuid sandbox.
+   static bool IsSystemVSharedMemory(int sysno);
+@@ -89,7 +90,8 @@ class SANDBOX_EXPORT SyscallSets {
+ #endif
+ 
+ #if defined(__i386__) || \
+-    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
++    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
++    defined(__powerpc64__)
+   // Big system V multiplexing system call.
+   static bool IsSystemVIpc(int sysno);
+ #endif
+--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf/syscall.cc
++++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf/syscall.cc
+@@ -18,7 +18,7 @@ namespace sandbox {
+ namespace {
+ 
+ #if defined(ARCH_CPU_X86_FAMILY) || defined(ARCH_CPU_ARM_FAMILY) || \
+-    defined(ARCH_CPU_MIPS_FAMILY)
++    defined(ARCH_CPU_MIPS_FAMILY) || defined (ARCH_CPU_PPC64_FAMILY)
+ // Number that's not currently used by any Linux kernel ABIs.
+ const int kInvalidSyscallNumber = 0x351d3;
+ #else
+@@ -312,10 +312,54 @@ asm(// We need to be able to tell the ke
+     "2:ret\n"
+     ".cfi_endproc\n"
+     ".size SyscallAsm, .-SyscallAsm\n"
++#elif defined(__powerpc64__)
++    ".text\n"
++    ".align 4\n"
++    ".type SyscallAsm @function\n"
++    "SyscallAsm:\n"
++    ".cfi_startproc\n"
++
++    // Check if r3 is negative
++    "cmpdi 3, 0\n"
++    "bgt 2f\n"
++
++    // Load address of 3f into r3 and return
++    "mflr 10\n"
++    "bl 1f\n"
++    "1: mflr 3\n"
++    "mtlr 10\n"
++    "addi 3, 3, 4*13\n"
++    "blr\n"
++
++    // Load arguments from array into r3-8
++    // save param 3 in r10
++    "2:\n"
++    "mr 0, 3\n"
++    "ld 3, 0(4)\n"
++    "ld 5, 16(4)\n"
++    "ld 6, 24(4)\n"
++    "ld 7, 32(4)\n"
++    "ld 8, 40(4)\n"
++    "ld 4, 8(4)\n"
++    "li 9, 0\n"
++
++    // Enter kernel
++    "sc\n"
++
++    // Magic return address
++    "3:\n"
++    // Like MIPS, ppc64 return values are always positive.
++    // Check for error in cr0.SO and negate upon error
++    "bc 4, 3, 4f\n"
++    "neg 3, 3\n"
++    "4: blr\n"
++
++    ".cfi_endproc\n"
++    ".size SyscallAsm, .-SyscallAsm\n"
+ #endif
+     );  // asm
+ 
+-#if defined(__x86_64__)
++#if defined(__x86_64__) || defined(__powerpc64__)
+ extern "C" {
+ intptr_t SyscallAsm(intptr_t nr, const intptr_t args[6]);
+ }
+@@ -429,6 +473,8 @@ intptr_t Syscall::Call(int nr,
+     ret = inout;
+   }
+ 
++#elif defined(__powerpc64__)
++  intptr_t ret = SyscallAsm(nr, args);
+ #else
+ #error "Unimplemented architecture"
+ #endif
+@@ -445,8 +491,26 @@ void Syscall::PutValueInUcontext(intptr_
+     // needs to be changed back.
+     ret_val = -ret_val;
+     SECCOMP_PARM4(ctx) = 1;
+-  } else
++  } else {
+     SECCOMP_PARM4(ctx) = 0;
++  }
++#endif
++#if defined(__powerpc64__)
++  // Same as MIPS, need to invert ret and set error register (cr0.SO)
++  if (ret_val <= -1 && ret_val >= -4095) {
++    ret_val = -ret_val;
++#ifdef __GLIBC__
++    ctx->uc_mcontext.regs->ccr |= (1 << 28);
++#else
++    ((struct pt_regs *)ctx->uc_mcontext.regs)->ccr |= (1 << 28);
++#endif
++  } else {
++#ifdef __GLIBC__
++    ctx->uc_mcontext.regs->ccr &= ~(1 << 28);
++#else
++    ((struct pt_regs *)ctx->uc_mcontext.regs)->ccr &= ~(1 << 28);
++#endif
++  }
+ #endif
+   SECCOMP_RESULT(ctx) = static_cast<greg_t>(ret_val);
+ }
+--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf/trap.cc
++++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf/trap.cc
+@@ -236,6 +236,20 @@ void Trap::SigSys(int nr, LinuxSigInfo*
+       SetIsInSigHandler();
+     }
+ 
++#if defined(__powerpc64__)
++    // On ppc64+glibc, some syscalls seem to accidentally negate the first
++    // parameter which causes checks against it to fail. For now, manually
++    // negate them back.
++    // TODO(shawn@anastas.io): investigate this issue further
++    auto nr = SECCOMP_SYSCALL(ctx);
++    if (nr == __NR_openat || nr == __NR_mkdirat || nr == __NR_faccessat || nr == __NR_readlinkat ||
++        nr == __NR_renameat || nr == __NR_renameat2 || nr == __NR_newfstatat || nr == __NR_unlinkat) {
++        if (static_cast<int>(SECCOMP_PARM1(ctx)) > 0) {
++            SECCOMP_PARM1(ctx) = -SECCOMP_PARM1(ctx);
++        }
++    }
++#endif
++
+     // Copy the seccomp-specific data into a arch_seccomp_data structure. This
+     // is what we are showing to TrapFnc callbacks that the system call
+     // evaluator registered with the sandbox.
+--- a/src/3rdparty/chromium/sandbox/linux/services/credentials.cc
++++ b/src/3rdparty/chromium/sandbox/linux/services/credentials.cc
+@@ -81,7 +81,7 @@ bool ChrootToSafeEmptyDir() {
+   pid_t pid = -1;
+   alignas(16) char stack_buf[PTHREAD_STACK_MIN];
+ #if defined(ARCH_CPU_X86_FAMILY) || defined(ARCH_CPU_ARM_FAMILY) || \
+-    defined(ARCH_CPU_MIPS_FAMILY)
++    defined(ARCH_CPU_MIPS_FAMILY) || defined(ARCH_CPU_PPC64_FAMILY)
+   // The stack grows downward.
+   void* stack = stack_buf + sizeof(stack_buf);
+ #else
+--- a/src/3rdparty/chromium/sandbox/linux/services/syscall_wrappers.cc
++++ b/src/3rdparty/chromium/sandbox/linux/services/syscall_wrappers.cc
+@@ -61,7 +61,7 @@ long sys_clone(unsigned long flags,
+ #if defined(ARCH_CPU_X86_64)
+   return syscall(__NR_clone, flags, child_stack, ptid, ctid, tls);
+ #elif defined(ARCH_CPU_X86) || defined(ARCH_CPU_ARM_FAMILY) || \
+-    defined(ARCH_CPU_MIPS_FAMILY)
++    defined(ARCH_CPU_MIPS_FAMILY) || defined(ARCH_CPU_PPC64_FAMILY)
+   // CONFIG_CLONE_BACKWARDS defined.
+   return syscall(__NR_clone, flags, child_stack, ptid, tls, ctid);
+ #endif
+--- a/src/3rdparty/chromium/sandbox/linux/syscall_broker/broker_process.cc
++++ b/src/3rdparty/chromium/sandbox/linux/syscall_broker/broker_process.cc
+@@ -165,7 +165,7 @@ bool BrokerProcess::IsSyscallBrokerable(
+ #if defined(__NR_fstatat64)
+     case __NR_fstatat64:
+ #endif
+-#if defined(__x86_64__) || defined(__aarch64__)
++#if defined(__x86_64__) || defined(__aarch64__) || defined(__powerpc64__)
+     case __NR_newfstatat:
+ #endif
+       return !fast_check || allowed_command_set_.test(COMMAND_STAT);
+--- a/src/3rdparty/chromium/sandbox/linux/system_headers/linux_seccomp.h
++++ b/src/3rdparty/chromium/sandbox/linux/system_headers/linux_seccomp.h
+@@ -41,6 +41,9 @@
+ #ifndef EM_AARCH64
+ #define EM_AARCH64 183
+ #endif
++#ifndef EM_PPC64
++#define EM_PPC64 21
++#endif
+ 
+ #ifndef __AUDIT_ARCH_64BIT
+ #define __AUDIT_ARCH_64BIT 0x80000000
+@@ -74,6 +77,14 @@
+ #define AUDIT_ARCH_AARCH64 (EM_AARCH64 | __AUDIT_ARCH_64BIT | __AUDIT_ARCH_LE)
+ #endif
+ 
++#ifndef AUDIT_ARCH_PPC64
++#define AUDIT_ARCH_PPC64 (EM_PPC64 | __AUDIT_ARCH_64BIT)
++#endif
++
++#ifndef AUDIT_ARCH_PPC64LE
++#define AUDIT_ARCH_PPC64LE (EM_PPC64 | __AUDIT_ARCH_64BIT | __AUDIT_ARCH_LE)
++#endif
++
+ // For prctl.h
+ #ifndef PR_SET_SECCOMP
+ #define PR_SET_SECCOMP               22
+--- a/src/3rdparty/chromium/sandbox/linux/system_headers/linux_signal.h
++++ b/src/3rdparty/chromium/sandbox/linux/system_headers/linux_signal.h
+@@ -13,7 +13,7 @@
+ // (not undefined, but defined different values and in different memory
+ // layouts). So, fill the gap here.
+ #if defined(__i386__) || defined(__x86_64__) || defined(__arm__) || \
+-    defined(__aarch64__)
++    defined(__aarch64__) || defined(__powerpc64__)
+ 
+ #define LINUX_SIGHUP 1
+ #define LINUX_SIGINT 2
+--- a/src/3rdparty/chromium/sandbox/linux/system_headers/linux_syscalls.h
++++ b/src/3rdparty/chromium/sandbox/linux/system_headers/linux_syscalls.h
+@@ -35,5 +35,9 @@
+ #include "sandbox/linux/system_headers/arm64_linux_syscalls.h"
+ #endif
+ 
++#if defined(__powerpc64__)
++#include "sandbox/linux/system_headers/ppc64_linux_syscalls.h"
++#endif
++
+ #endif  // SANDBOX_LINUX_SYSTEM_HEADERS_LINUX_SYSCALLS_H_
+ 
+--- a/src/3rdparty/chromium/sandbox/linux/system_headers/linux_ucontext.h
++++ b/src/3rdparty/chromium/sandbox/linux/system_headers/linux_ucontext.h
+@@ -11,6 +11,8 @@
+ #include "sandbox/linux/system_headers/arm_linux_ucontext.h"
+ #elif defined(__i386__)
+ #include "sandbox/linux/system_headers/i386_linux_ucontext.h"
++#elif defined(__powerpc64__)
++#include "sandbox/linux/system_headers/ppc64_linux_ucontext.h"
+ #else
+ #error "No support for your architecture in PNaCl header"
+ #endif
+--- a/src/3rdparty/chromium/sandbox/policy/linux/bpf_renderer_policy_linux.cc
++++ b/src/3rdparty/chromium/sandbox/policy/linux/bpf_renderer_policy_linux.cc
+@@ -15,6 +15,11 @@
+ #include "sandbox/linux/system_headers/linux_syscalls.h"
+ #include "sandbox/policy/linux/sandbox_linux.h"
+ 
++// On PPC64, TCGETS is defined in terms of struct termios, so we must include termios.h
++#ifdef __powerpc64__
++#include <termios.h>
++#endif
++
+ // TODO(vignatti): replace the local definitions below with #include
+ // <linux/dma-buf.h> once kernel version 4.6 becomes widely used.
+ #include <linux/types.h>
+--- a/src/3rdparty/chromium/third_party/angle/src/compiler/translator/InfoSink.h
++++ b/src/3rdparty/chromium/third_party/angle/src/compiler/translator/InfoSink.h
+@@ -93,7 +93,16 @@ class TInfoSinkBase
+             stream.precision(8);
+             stream << f;
+         }
+-        sink.append(stream.str());
++
++        // Hack to work around a bug where negative floating point values
++        // are rendered like '.0.5' instead of '-0.5'
++        std::string res(stream.str());
++
++        if (signbit(f)) { // test if f is negative
++            res[0] = '-';
++        }
++
++        sink.append(res);
+         return *this;
+     }
+     // Write boolean values as their names instead of integral value.
+--- a/src/3rdparty/chromium/third_party/angle/src/libANGLE/Constants.h
++++ b/src/3rdparty/chromium/third_party/angle/src/libANGLE/Constants.h
+@@ -9,6 +9,7 @@
+ #ifndef LIBANGLE_CONSTANTS_H_
+ #define LIBANGLE_CONSTANTS_H_
+ 
++#include <cstddef>
+ #include "common/platform.h"
+ 
+ #include <stdint.h>
+--- a/src/3rdparty/chromium/third_party/boringssl/BUILD.gn
++++ b/src/3rdparty/chromium/third_party/boringssl/BUILD.gn
+@@ -99,6 +99,13 @@ if (is_win && !is_msan && current_cpu !=
+       } else {
+         public_configs = [ ":no_asm_config" ]
+       }
++    } else if (current_cpu == "ppc64") {
++      if (is_linux) {
++        # TODO: ppc64 (be) check
++        sources += crypto_sources_linux_ppc64le
++      } else {
++        public_configs = [ ":no_asm_config" ]
++      }
+     } else {
+       public_configs = [ ":no_asm_config" ]
+     }
+--- a/src/3rdparty/chromium/third_party/breakpad/BUILD.gn
++++ b/src/3rdparty/chromium/third_party/breakpad/BUILD.gn
+@@ -623,7 +623,6 @@ if (is_linux || is_chromeos || is_androi
+       "breakpad/src/client/minidump_file_writer.h",
+       "breakpad/src/common/convert_UTF.cc",
+       "breakpad/src/common/convert_UTF.h",
+-      "breakpad/src/common/linux/breakpad_getcontext.S",
+       "breakpad/src/common/linux/elf_core_dump.cc",
+       "breakpad/src/common/linux/elf_core_dump.h",
+       "breakpad/src/common/linux/elfutils.cc",
+@@ -663,6 +662,15 @@ if (is_linux || is_chromeos || is_androi
+ 
+     libs = [ "dl" ]
+ 
++    if (current_cpu == "ppc64") {
++        defines = [ "HAVE_GETCONTEXT" ]
++        libs += [ "ucontext" ]
++    } else {
++        sources += [
++            "breakpad/src/common/linux/breakpad_getcontext.S"
++        ]
++    }
++
+     include_dirs = [
+       ".",
+       "breakpad/src",
+@@ -712,7 +720,6 @@ if (is_linux || is_chromeos || is_androi
+       "breakpad/src/client/linux/minidump_writer/minidump_writer_unittest.cc",
+       "breakpad/src/client/linux/minidump_writer/minidump_writer_unittest_utils.cc",
+       "breakpad/src/client/linux/minidump_writer/proc_cpuinfo_reader_unittest.cc",
+-      "breakpad/src/common/linux/breakpad_getcontext_unittest.cc",
+       "breakpad/src/common/linux/elf_core_dump_unittest.cc",
+       "breakpad/src/common/linux/file_id_unittest.cc",
+       "breakpad/src/common/linux/linux_libc_support_unittest.cc",
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/raw_context_cpu.h
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/raw_context_cpu.h
+@@ -44,6 +44,8 @@ typedef MDRawContextARM RawContextCPU;
+ typedef MDRawContextARM64_Old RawContextCPU;
+ #elif defined(__mips__)
+ typedef MDRawContextMIPS RawContextCPU;
++#elif defined(__powerpc64__)
++typedef MDRawContextPPC64 RawContextCPU;
+ #else
+ #error "This code has not been ported to your platform yet."
+ #endif
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.cc
+@@ -270,7 +270,54 @@ void ThreadInfo::FillCPUContext(RawConte
+   out->float_save.fir = mcontext.fpc_eir;
+ #endif
+ }
+-#endif  // __mips__
++
++#elif defined(__powerpc64__)
++
++#if !defined(__GLIBC__)
++#include <asm/elf.h>
++#include <asm/ptrace.h>
++#endif
++
++uintptr_t ThreadInfo::GetInstructionPointer() const {
++    return mcontext.gp_regs[PT_NIP];
++}
++
++void ThreadInfo::FillCPUContext(RawContextCPU* out) const {
++    out->context_flags = MD_CONTEXT_PPC64_FULL;
++    for (int i = 0; i < MD_CONTEXT_PPC64_GPR_COUNT; i++)
++        out->gpr[i] = mcontext.gp_regs[i];
++
++    out->lr = mcontext.gp_regs[PT_LNK];
++    out->srr0 = mcontext.gp_regs[PT_NIP];
++    out->srr1 = mcontext.gp_regs[PT_MSR];
++    out->cr = mcontext.gp_regs[PT_CCR];
++    out->xer = mcontext.gp_regs[PT_XER];
++    out->ctr = mcontext.gp_regs[PT_CTR];
++
++#ifdef __GLIBC__
++    for (int i = 0; i < MD_FLOATINGSAVEAREA_PPC_FPR_COUNT; i++)
++        out->float_save.fpregs[i] = mcontext.fp_regs[i];
++
++    out->float_save.fpscr = mcontext.fp_regs[NFPREG-1];
++#else
++    for (int i = 0; i < MD_FLOATINGSAVEAREA_PPC_FPR_COUNT; i++)
++        out->float_save.fpregs[i] = ((uint64_t *)&mcontext.fp_regs)[i];
++
++     out->float_save.fpscr = ((uint64_t *)&mcontext.fp_regs)[ELF_NFPREG-1];
++#endif
++
++    for (int i = 0; i < MD_VECTORSAVEAREA_PPC_VR_COUNT; i++)
++        out->vector_save.save_vr[i] = \
++            {(((uint64_t)vregs.vrregs[i][0]) << 32)
++                          | vregs.vrregs[i][1],
++            (((uint64_t)vregs.vrregs[i][2]) << 32)
++                         | vregs.vrregs[i][3]};
++
++    out->vrsave = vregs.vrsave;
++    out->vector_save.save_vscr = {0, vregs.vscr.vscr_word};
++    out->vector_save.save_vrvalid = 0xFFFFFFFF;
++}
++#endif  // __powerpc64__
+ 
+ void ThreadInfo::GetGeneralPurposeRegisters(void** gp_regs, size_t* size) {
+   assert(gp_regs || size);
+@@ -279,6 +326,11 @@ void ThreadInfo::GetGeneralPurposeRegist
+     *gp_regs = mcontext.gregs;
+   if (size)
+     *size = sizeof(mcontext.gregs);
++#elif defined(__powerpc64__)
++  if (gp_regs)
++    *gp_regs = mcontext.gp_regs;
++  if (size)
++    *size = sizeof(mcontext.gp_regs);
+ #else
+   if (gp_regs)
+     *gp_regs = &regs;
+@@ -294,6 +346,11 @@ void ThreadInfo::GetFloatingPointRegiste
+     *fp_regs = &mcontext.fpregs;
+   if (size)
+     *size = sizeof(mcontext.fpregs);
++#elif defined(__powerpc64__)
++  if (fp_regs)
++    *fp_regs = &mcontext.fp_regs;
++  if (size)
++    *size = sizeof(mcontext.fp_regs);
+ #else
+   if (fp_regs)
+     *fp_regs = &fpregs;
+@@ -302,4 +359,13 @@ void ThreadInfo::GetFloatingPointRegiste
+ #endif
+ }
+ 
++#if defined(__powerpc64__)
++void ThreadInfo::GetVectorRegisters(void** v_regs, size_t* size) {
++    if (v_regs)
++        *v_regs = &vregs;
++    if (size)
++        *size = sizeof(vregs);
++}
++#endif
++
+ }  // namespace google_breakpad
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.h
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.h
+@@ -68,6 +68,10 @@ struct ThreadInfo {
+   // Use the structures defined in <sys/user.h>
+   struct user_regs_struct regs;
+   struct user_fpsimd_struct fpregs;
++#elif defined(__powerpc64__)
++  // Use the structures defined in <sys/ucontext.h>.
++  mcontext_t mcontext;
++  vrregset_t vregs;
+ #elif defined(__mips__)
+   // Use the structure defined in <sys/ucontext.h>.
+   mcontext_t mcontext;
+@@ -84,6 +88,11 @@ struct ThreadInfo {
+ 
+   // Returns the pointer and size of float point register area.
+   void GetFloatingPointRegisters(void** fp_regs, size_t* size);
++
++#if defined(__powerpc64__)
++  // Returns the pointer and size of the vector register area. (PPC64 only)
++  void GetVectorRegisters(void** v_regs, size_t* size);
++#endif
+ };
+ 
+ }  // namespace google_breakpad
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc
+@@ -254,6 +254,60 @@ void UContextReader::FillCPUContext(RawC
+   out->float_save.fir = uc->uc_mcontext.fpc_eir;  // Unused.
+ #endif
+ }
++
++#elif defined(__powerpc64__)
++
++#ifndef __GLIBC__
++#include <asm/elf.h>
++#include <asm/ptrace.h>
++#endif
++
++uintptr_t UContextReader::GetStackPointer(const ucontext_t* uc) {
++    return uc->uc_mcontext.gp_regs[MD_CONTEXT_PPC64_REG_SP];
++}
++
++uintptr_t UContextReader::GetInstructionPointer(const ucontext_t* uc) {
++    return uc->uc_mcontext.gp_regs[PT_NIP];
++}
++
++void UContextReader::FillCPUContext(RawContextCPU* out, const ucontext_t* uc,
++                                    const vrregset_t* vregs) {
++    out->context_flags = MD_CONTEXT_PPC64_FULL;
++
++    for (int i = 0; i < MD_CONTEXT_PPC64_GPR_COUNT; i++)
++        out->gpr[i] = uc->uc_mcontext.gp_regs[i];
++
++    out->lr = uc->uc_mcontext.gp_regs[PT_LNK];
++    out->srr0 = uc->uc_mcontext.gp_regs[PT_NIP];
++    out->srr1 = uc->uc_mcontext.gp_regs[PT_MSR];
++    out->cr = uc->uc_mcontext.gp_regs[PT_CCR];
++    out->xer = uc->uc_mcontext.gp_regs[PT_XER];
++    out->ctr = uc->uc_mcontext.gp_regs[PT_CTR];
++
++#ifdef __GLIBC__
++    for (int i = 0; i < MD_FLOATINGSAVEAREA_PPC_FPR_COUNT; i++)
++        out->float_save.fpregs[i] = uc->uc_mcontext.fp_regs[i];
++
++    out->float_save.fpscr = uc->uc_mcontext.fp_regs[NFPREG-1];
++#else
++    for (int i = 0; i < MD_FLOATINGSAVEAREA_PPC_FPR_COUNT; i++)
++        out->float_save.fpregs[i] = ((uint64_t *)&uc->uc_mcontext.fp_regs)[i];
++
++    out->float_save.fpscr = ((uint64_t *)&uc->uc_mcontext.fp_regs)[ELF_NFPREG-1];
++#endif
++
++    for (int i = 0; i < MD_VECTORSAVEAREA_PPC_VR_COUNT; i++)
++        out->vector_save.save_vr[i] =
++            {(((uint64_t)vregs->vrregs[i][0]) << 32)
++                         | vregs->vrregs[i][1],
++             (((uint64_t)vregs->vrregs[i][2]) << 32)
++                         | vregs->vrregs[i][3]};
++
++    out->vrsave = vregs->vrsave;
++    out->vector_save.save_vscr = {0, vregs->vscr.vscr_word};
++    out->vector_save.save_vrvalid = 0xFFFFFFFF;
++}
++
+ #endif
+ 
+ }  // namespace google_breakpad
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h
+@@ -59,6 +59,9 @@ struct UContextReader {
+ #elif defined(__aarch64__)
+   static void FillCPUContext(RawContextCPU* out, const ucontext_t* uc,
+                              const struct fpsimd_context* fpregs);
++#elif defined(__powerpc64__)
++  static void FillCPUContext(RawContextCPU *out, const ucontext_t *uc,
++                             const vrregset_t* vregs);
+ #else
+   static void FillCPUContext(RawContextCPU* out, const ucontext_t* uc);
+ #endif
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc
+@@ -105,6 +105,13 @@
+ #define PR_SET_PTRACER 0x59616d61
+ #endif
+ 
++/* musl hack, can't include asm/ptrace.h as that causes conflicts */
++#ifndef __GLIBC__
++#if defined(__powerpc64__) && !defined(PT_NIP)
++#define PT_NIP 32
++#endif
++#endif
++
+ namespace google_breakpad {
+ 
+ namespace {
+@@ -461,9 +468,16 @@ bool ExceptionHandler::HandleSignal(int
+     memcpy(&g_crash_context_.float_state, fp_ptr,
+            sizeof(g_crash_context_.float_state));
+   }
++#elif defined(__powerpc64__)
++  // On PPC64, we must copy VR state
++  ucontext_t* uc_ptr = (ucontext_t*)uc;
++  if (uc_ptr->uc_mcontext.v_regs) {
++    memcpy(&g_crash_context_.vector_state, uc_ptr->uc_mcontext.v_regs,
++           sizeof(g_crash_context_.vector_state));
++  }
+ #elif !defined(__ARM_EABI__) && !defined(__mips__)
+   // FP state is not part of user ABI on ARM Linux.
+-  // In case of MIPS Linux FP state is already part of ucontext_t
++  // In case of MIPS, Linux FP state is already part of ucontext_t
+   // and 'float_state' is not a member of CrashContext.
+   ucontext_t* uc_ptr = (ucontext_t*)uc;
+   if (uc_ptr->uc_mcontext.fpregs) {
+@@ -708,11 +722,19 @@ bool ExceptionHandler::WriteMinidump() {
+   }
+ #endif
+ 
+-#if !defined(__ARM_EABI__) && !defined(__aarch64__) && !defined(__mips__)
++#if !defined(__ARM_EABI__) && !defined(__aarch64__) && !defined(__mips__) \
++    && !defined(__powerpc64__)
+   // FPU state is not part of ARM EABI ucontext_t.
+   memcpy(&context.float_state, context.context.uc_mcontext.fpregs,
+          sizeof(context.float_state));
+ #endif
++
++#if defined(__powerpc64__)
++  // Vector registers must be copied on PPC64
++  memcpy(&context.vector_state, context.context.uc_mcontext.v_regs,
++         sizeof(context.vector_state));
++#endif
++
+   context.tid = sys_gettid();
+ 
+   // Add an exception stream to the minidump for better reporting.
+@@ -733,6 +755,9 @@ bool ExceptionHandler::WriteMinidump() {
+ #elif defined(__mips__)
+   context.siginfo.si_addr =
+       reinterpret_cast<void*>(context.context.uc_mcontext.pc);
++#elif defined(__powerpc64__)
++  context.siginfo.si_addr =
++      reinterpret_cast<void*>(context.context.uc_mcontext.gp_regs[PT_NIP]);
+ #else
+ #error "This code has not been ported to your platform yet."
+ #endif
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.h
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.h
+@@ -192,7 +192,11 @@ class ExceptionHandler {
+     siginfo_t siginfo;
+     pid_t tid;  // the crashing thread.
+     ucontext_t context;
+-#if !defined(__ARM_EABI__) && !defined(__mips__)
++#if defined(__powerpc64__)
++    // PPC64's FP state is a part of ucontext_t like MIPS but the vector
++    // state is not, so a struct is needed.
++    vstate_t vector_state;
++#elif !defined(__ARM_EABI__) && !defined(__mips__)
+     // #ifdef this out because FP state is not part of user ABI for Linux ARM.
+     // In case of MIPS Linux FP state is already part of ucontext_t so
+     // 'float_state' is not required.
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler_unittest.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler_unittest.cc
+@@ -307,7 +307,7 @@ TEST(ExceptionHandlerTest, ParallelChild
+   }
+ 
+   // Wait a while until the child should have crashed.
+-  usleep(1000000);
++  usleep(2000000);
+   // Kill the child if it is still running.
+   kill(child, SIGKILL);
+ 
+@@ -559,6 +559,8 @@ const unsigned char kIllegalInstruction[
+ #if defined(__mips__)
+   // mfc2 zero,Impl - usually illegal in userspace.
+   0x48, 0x00, 0x00, 0x48
++#elif defined(__powerpc64__)
++  0x01, 0x01, 0x01, 0x01 // Crashes on a tested POWER9 cpu
+ #else
+   // This crashes with SIGILL on x86/x86-64/arm.
+   0xff, 0xff, 0xff, 0xff
+@@ -754,10 +756,10 @@ TEST(ExceptionHandlerTest, InstructionPo
+ 
+   // These are defined here so the parent can use them to check the
+   // data from the minidump afterwards.
+-  // Use 4k here because the OS will hand out a single page even
++  // Use the page size here because the OS will hand out a single page even
+   // if a smaller size is requested, and this test wants to
+   // test the upper bound of the memory range.
+-  const uint32_t kMemorySize = 4096;  // bytes
++  const uint32_t kMemorySize = getpagesize();  // bytes
+   const int kOffset = kMemorySize - sizeof(kIllegalInstruction);
+ 
+   const pid_t child = fork();
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/microdump_writer/microdump_writer.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/microdump_writer/microdump_writer.cc
+@@ -138,7 +138,9 @@ class MicrodumpWriter {
+                   const MicrodumpExtraInfo& microdump_extra_info,
+                   LinuxDumper* dumper)
+       : ucontext_(context ? &context->context : NULL),
+-#if !defined(__ARM_EABI__) && !defined(__mips__)
++#if defined(__powerpc64__)
++        vector_state_(context ? &context->vector_state : NULL),
++#elif !defined(__ARM_EABI__) && !defined(__mips__)
+         float_state_(context ? &context->float_state : NULL),
+ #endif
+         dumper_(dumper),
+@@ -337,6 +339,8 @@ class MicrodumpWriter {
+ # else
+ #  error "This mips ABI is currently not supported (n32)"
+ #endif
++#elif defined(__powerpc64__)
++    const char kArch[] = "ppc64";
+ #else
+ #error "This code has not been ported to your platform yet"
+ #endif
+@@ -409,7 +413,9 @@ class MicrodumpWriter {
+   void DumpCPUState() {
+     RawContextCPU cpu;
+     my_memset(&cpu, 0, sizeof(RawContextCPU));
+-#if !defined(__ARM_EABI__) && !defined(__mips__)
++#if defined(__powerpc64__)
++    UContextReader::FillCPUContext(&cpu, ucontext_, vector_state_);
++#elif !defined(__ARM_EABI__) && !defined(__mips__)
+     UContextReader::FillCPUContext(&cpu, ucontext_, float_state_);
+ #else
+     UContextReader::FillCPUContext(&cpu, ucontext_);
+@@ -605,7 +611,9 @@ class MicrodumpWriter {
+   void* Alloc(unsigned bytes) { return dumper_->allocator()->Alloc(bytes); }
+ 
+   const ucontext_t* const ucontext_;
+-#if !defined(__ARM_EABI__) && !defined(__mips__)
++#if defined(__powerpc64__)
++  const google_breakpad::vstate_t* const vector_state_;
++#elif !defined(__ARM_EABI__) && !defined(__mips__)
+   const google_breakpad::fpstate_t* const float_state_;
+ #endif
+   LinuxDumper* dumper_;
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/microdump_writer/microdump_writer_unittest.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/microdump_writer/microdump_writer_unittest.cc
+@@ -279,10 +279,19 @@ TEST(MicrodumpWriterTest, BasicWithMappi
+   CrashAndGetMicrodump(mappings, MicrodumpExtraInfo(), &buf);
+   ASSERT_TRUE(ContainsMicrodump(buf));
+ 
++  int page_size = getpagesize();
+ #ifdef __LP64__
+-  ASSERT_NE(std::string::npos,
+-            buf.find("M 0000000000001000 000000000000002A 0000000000001000 "
+-                     "33221100554477668899AABBCCDDEEFF0 libfoo.so"));
++  // This test is only available for the following page sizes
++  ASSERT_TRUE((page_size == 4096) || (page_size == 65536));
++  if (page_size == 4096) {
++    ASSERT_NE(std::string::npos,
++              buf.find("M 0000000000001000 000000000000002A 0000000000001000 "
++                       "33221100554477668899AABBCCDDEEFF0 libfoo.so"));
++  } else {
++    ASSERT_NE(std::string::npos,
++              buf.find("M 0000000000010000 000000000000002A 0000000000010000 "
++                       "33221100554477668899AABBCCDDEEFF0 libfoo.so"));
++  }
+ #else
+   ASSERT_NE(std::string::npos,
+             buf.find("M 00001000 0000002A 00001000 "
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_core_dumper.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_core_dumper.cc
+@@ -117,6 +117,9 @@ bool LinuxCoreDumper::GetThreadInfoByInd
+ #elif defined(__mips__)
+   stack_pointer =
+       reinterpret_cast<uint8_t*>(info->mcontext.gregs[MD_CONTEXT_MIPS_REG_SP]);
++#elif defined(__powerpc64__)
++  stack_pointer =
++      reinterpret_cast<uint8_t*>(info->mcontext.gp_regs[MD_CONTEXT_PPC64_REG_SP]);
+ #else
+ #error "This code hasn't been ported to your platform yet."
+ #endif
+@@ -212,7 +215,10 @@ bool LinuxCoreDumper::EnumerateThreads()
+         memset(&info, 0, sizeof(ThreadInfo));
+         info.tgid = status->pr_pgrp;
+         info.ppid = status->pr_ppid;
+-#if defined(__mips__)
++#if defined(__powerpc64__)
++        for (int i = 0; i < 31; i++)
++            info.mcontext.gp_regs[i] = status->pr_reg[i];
++#elif defined(__mips__)
+ #if defined(__ANDROID__)
+         for (int i = EF_R0; i <= EF_R31; i++)
+           info.mcontext.gregs[i - EF_R0] = status->pr_reg[i];
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper.cc
+@@ -765,7 +765,9 @@ bool LinuxDumper::GetStackInfo(const voi
+       reinterpret_cast<uint8_t*>(int_stack_pointer & ~(page_size - 1));
+ 
+   // The number of bytes of stack which we try to capture.
+-  static const ptrdiff_t kStackToCapture = 32 * 1024;
++  // This now depends on page_size to avoid missing data
++  // on systems with larger page sizes.
++  static const ptrdiff_t kStackToCapture = 8 * page_size;
+ 
+   const MappingInfo* mapping = FindMapping(stack_pointer);
+   if (!mapping)
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper.h
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper.h
+@@ -63,7 +63,8 @@ namespace google_breakpad {
+  (defined(__mips__) && _MIPS_SIM == _ABIO32)
+ typedef Elf32_auxv_t elf_aux_entry;
+ #elif defined(__x86_64) || defined(__aarch64__) || \
+-     (defined(__mips__) && _MIPS_SIM != _ABIO32)
++     (defined(__mips__) && _MIPS_SIM != _ABIO32) || \
++     defined(__powerpc64__)
+ typedef Elf64_auxv_t elf_aux_entry;
+ #endif
+ 
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper_unittest_helper.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper_unittest_helper.cc
+@@ -51,6 +51,8 @@
+ #define TID_PTR_REGISTER "rcx"
+ #elif defined(__mips__)
+ #define TID_PTR_REGISTER "$1"
++#elif defined(__powerpc64__)
++#define TID_PTR_REGISTER "r8"
+ #else
+ #error This test has not been ported to this platform.
+ #endif
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper.cc
+@@ -154,19 +154,27 @@ bool LinuxPtraceDumper::CopyFromProcess(
+   return true;
+ }
+ 
+-bool LinuxPtraceDumper::ReadRegisterSet(ThreadInfo* info, pid_t tid)
+-{
++bool LinuxPtraceDumper::ReadRegisterSet(ThreadInfo* info, pid_t tid) {
+ #ifdef PTRACE_GETREGSET
+   struct iovec io;
+   info->GetGeneralPurposeRegisters(&io.iov_base, &io.iov_len);
+-  if (sys_ptrace(PTRACE_GETREGSET, tid, (void*)NT_PRSTATUS, (void*)&io) == -1) {
++  if (ptrace(PTRACE_GETREGSET, tid, (void*)NT_PRSTATUS, (void*)&io) == -1) {
+     return false;
+   }
+ 
+   info->GetFloatingPointRegisters(&io.iov_base, &io.iov_len);
+-  if (sys_ptrace(PTRACE_GETREGSET, tid, (void*)NT_FPREGSET, (void*)&io) == -1) {
++  if (ptrace(PTRACE_GETREGSET, tid, (void*)NT_FPREGSET, (void*)&io) == -1) {
+     return false;
+   }
++
++#if defined(__powerpc64__)
++  // Grab the vector registers on PPC64 too
++  info->GetVectorRegisters(&io.iov_base, &io.iov_len);
++  if (ptrace(PTRACE_GETREGSET, tid, (void*)NT_PPC_VMX, (void*)&io) == -1) {
++    return false;
++  }
++#endif // defined(__powerpc64__)
++
+   return true;
+ #else
+   return false;
+@@ -303,6 +311,9 @@ bool LinuxPtraceDumper::GetThreadInfoByI
+ #elif defined(__mips__)
+   stack_pointer =
+       reinterpret_cast<uint8_t*>(info->mcontext.gregs[MD_CONTEXT_MIPS_REG_SP]);
++#elif defined(__powerpc64__)
++  stack_pointer =
++      reinterpret_cast<uint8_t*>(info->mcontext.gp_regs[MD_CONTEXT_PPC64_REG_SP]);
+ #else
+ #error "This code hasn't been ported to your platform yet."
+ #endif
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper_unittest.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper_unittest.cc
+@@ -462,6 +462,9 @@ TEST(LinuxPtraceDumperTest, VerifyStackR
+ #elif defined(__mips__)
+     pid_t* process_tid_location =
+         reinterpret_cast<pid_t*>(one_thread.mcontext.gregs[1]);
++#elif defined(__powerpc64__)
++    pid_t* process_tid_location =
++        reinterpret_cast<pid_t*>(one_thread.mcontext.gp_regs[8]);
+ #else
+ #error This test has not been ported to this platform.
+ #endif
+@@ -559,6 +562,8 @@ TEST_F(LinuxPtraceDumperTest, SanitizeSt
+   uintptr_t heap_addr = thread_info.regs.rcx;
+ #elif defined(__mips__)
+   uintptr_t heap_addr = thread_info.mcontext.gregs[1];
++#elif defined(__powerpc64__)
++  uintptr_t heap_addr = thread_info.mcontext.gp_regs[8];
+ #else
+ #error This test has not been ported to this platform.
+ #endif
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.cc
+@@ -136,7 +136,9 @@ class MinidumpWriter {
+       : fd_(minidump_fd),
+         path_(minidump_path),
+         ucontext_(context ? &context->context : NULL),
+-#if !defined(__ARM_EABI__) && !defined(__mips__)
++#if defined(__powerpc64__)
++        vector_state_(context ? &context->vector_state : NULL),
++#elif !defined(__ARM_EABI__) && !defined(__mips__)
+         float_state_(context ? &context->float_state : NULL),
+ #endif
+         dumper_(dumper),
+@@ -468,7 +470,9 @@ class MinidumpWriter {
+         if (!cpu.Allocate())
+           return false;
+         my_memset(cpu.get(), 0, sizeof(RawContextCPU));
+-#if !defined(__ARM_EABI__) && !defined(__mips__)
++#if defined(__powerpc64__)
++        UContextReader::FillCPUContext(cpu.get(), ucontext_, vector_state_);
++#elif !defined(__ARM_EABI__) && !defined(__mips__)
+         UContextReader::FillCPUContext(cpu.get(), ucontext_, float_state_);
+ #else
+         UContextReader::FillCPUContext(cpu.get(), ucontext_);
+@@ -897,7 +901,7 @@ class MinidumpWriter {
+     dirent->location.rva = 0;
+   }
+ 
+-#if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
++#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || defined(__powerpc64__)
+   bool WriteCPUInformation(MDRawSystemInfo* sys_info) {
+     char vendor_id[sizeof(sys_info->cpu.x86_cpu_info.vendor_id) + 1] = {0};
+     static const char vendor_id_name[] = "vendor_id";
+@@ -917,7 +921,9 @@ class MinidumpWriter {
+ 
+     // processor_architecture should always be set, do this first
+     sys_info->processor_architecture =
+-#if defined(__mips__)
++#if defined(__powerpc64__)
++        MD_CPU_ARCHITECTURE_PPC64;
++#elif defined(__mips__)
+ # if _MIPS_SIM == _ABIO32
+         MD_CPU_ARCHITECTURE_MIPS;
+ # elif _MIPS_SIM == _ABI64
+@@ -1333,7 +1339,9 @@ class MinidumpWriter {
+   const char* path_;  // Path to the file where the minidum should be written.
+ 
+   const ucontext_t* const ucontext_;  // also from the signal handler
+-#if !defined(__ARM_EABI__) && !defined(__mips__)
++#if defined(__powerpc64__)
++  const google_breakpad::vstate_t* const vector_state_;
++#elif !defined(__ARM_EABI__) && !defined(__mips__)
+   const google_breakpad::fpstate_t* const float_state_;  // ditto
+ #endif
+   LinuxDumper* dumper_;
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.h
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.h
+@@ -48,6 +48,8 @@ class ExceptionHandler;
+ 
+ #if defined(__aarch64__)
+ typedef struct fpsimd_context fpstate_t;
++#elif defined(__powerpc64__)
++typedef vrregset_t vstate_t;
+ #elif !defined(__ARM_EABI__) && !defined(__mips__)
+ typedef std::remove_pointer<fpregset_t>::type fpstate_t;
+ #endif
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer_unittest.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer_unittest.cc
+@@ -715,6 +715,12 @@ TEST(MinidumpWriterTest, InvalidStackPoi
+ #elif defined(__mips__)
+   context.context.uc_mcontext.gregs[MD_CONTEXT_MIPS_REG_SP] =
+       invalid_stack_pointer;
++#elif defined(__powerpc64__)
++  context.context.uc_mcontext.gp_regs[MD_CONTEXT_PPC64_REG_SP] =
++      invalid_stack_pointer;
++#elif defined(__powerpc64__)
++  context.context.uc_mcontext.gp_regs[MD_CONTEXT_PPC64_REG_SP] =
++      invalid_stack_pointer;
+ #else
+ # error "This code has not been ported to your platform yet."
+ #endif
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/common/linux/memory_mapped_file.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/common/linux/memory_mapped_file.cc
+@@ -65,8 +65,7 @@ bool MemoryMappedFile::Map(const char* p
+   }
+ 
+ #if defined(__x86_64__) || defined(__aarch64__) || \
+-   (defined(__mips__) && _MIPS_SIM == _ABI64)
+-
++   (defined(__mips__) && _MIPS_SIM == _ABI64) || defined(__powerpc64__)
+   struct kernel_stat st;
+   if (sys_fstat(fd, &st) == -1 || st.st_size < 0) {
+ #else
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/common/linux/memory_mapped_file_unittest.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/common/linux/memory_mapped_file_unittest.cc
+@@ -176,9 +176,10 @@ TEST_F(MemoryMappedFileTest, RemapAfterM
+ TEST_F(MemoryMappedFileTest, MapWithOffset) {
+   // Put more data in the test file this time. Offsets can only be
+   // done on page boundaries, so we need a two page file to test this.
+-  const int page_size = 4096;
+-  char data1[2 * page_size];
+-  size_t data1_size = sizeof(data1);
++  const int page_size = getpagesize();
++  char *data1 = static_cast<char*>(malloc(2 * page_size));
++  EXPECT_TRUE(data1 != NULL);
++  size_t data1_size = (2 * page_size);
+   for (size_t i = 0; i < data1_size; ++i) {
+     data1[i] = i & 0x7f;
+   }
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/common/memory_allocator_unittest.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/common/memory_allocator_unittest.cc
+@@ -57,8 +57,9 @@ TEST(PageAllocatorTest, LargeObject) {
+ 
+   EXPECT_EQ(0U, allocator.pages_allocated());
+   uint8_t* p = reinterpret_cast<uint8_t*>(allocator.Alloc(10000));
++  uint64_t expected_pages = 1 + ((10000 - 1) / getpagesize());
+   ASSERT_FALSE(p == NULL);
+-  EXPECT_EQ(3U, allocator.pages_allocated());
++  EXPECT_EQ(expected_pages, allocator.pages_allocated());
+   for (unsigned i = 1; i < 10; ++i) {
+     uint8_t* p = reinterpret_cast<uint8_t*>(allocator.Alloc(i));
+     ASSERT_FALSE(p == NULL);
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/processor/exploitability_linux.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/processor/exploitability_linux.cc
+@@ -202,12 +202,14 @@ bool ExploitabilityLinux::EndedOnIllegal
+   // Check architecture and set architecture variable to corresponding flag
+   // in objdump.
+   switch (context->GetContextCPU()) {
++#if defined(__i386) || defined(__x86_64)
+     case MD_CONTEXT_X86:
+       architecture = "i386";
+       break;
+     case MD_CONTEXT_AMD64:
+       architecture = "i386:x86-64";
+       break;
++#endif
+     default:
+       // Unsupported architecture. Note that ARM architectures are not
+       // supported because objdump does not support ARM.
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/processor/exploitability_unittest.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/processor/exploitability_unittest.cc
+@@ -104,6 +104,8 @@ ExploitabilityFor(const string& filename
+ }
+ 
+ TEST(ExploitabilityTest, TestWindowsEngine) {
++// The following tests are only executable on an x86-class linux machine.
++#if !defined(_WIN32) && (defined(__i386) || defined(__x86_64))
+   ASSERT_EQ(google_breakpad::EXPLOITABILITY_HIGH,
+             ExploitabilityFor("ascii_read_av.dmp"));
+   ASSERT_EQ(google_breakpad::EXPLOITABILITY_HIGH,
+@@ -136,9 +138,12 @@ TEST(ExploitabilityTest, TestWindowsEngi
+             ExploitabilityFor("read_av_clobber_write.dmp"));
+   ASSERT_EQ(google_breakpad::EXPLOITABILITY_LOW,
+             ExploitabilityFor("read_av_conditional.dmp"));
++#endif
+ }
+ 
+ TEST(ExploitabilityTest, TestLinuxEngine) {
++// The following tests are only executable on an x86-class linux machine.
++#if defined(__i386) || defined(__x86_64)
+   ASSERT_EQ(google_breakpad::EXPLOITABILITY_INTERESTING,
+             ExploitabilityFor("linux_null_read_av.dmp"));
+   ASSERT_EQ(google_breakpad::EXPLOITABILITY_HIGH,
+@@ -171,7 +176,8 @@ TEST(ExploitabilityTest, TestLinuxEngine
+             ExploitabilityFor("linux_executable_heap.dmp"));
+   ASSERT_EQ(google_breakpad::EXPLOITABILITY_HIGH,
+             ExploitabilityFor("linux_jmp_to_module_not_exe_region.dmp"));
+-#ifndef _WIN32
++#endif
++#if !defined(_WIN32) && (defined(__i386) || defined(__x86_64))
+   ASSERT_EQ(google_breakpad::EXPLOITABILITY_HIGH,
+             ExploitabilityFor("linux_write_to_nonwritable_module.dmp"));
+   ASSERT_EQ(google_breakpad::EXPLOITABILITY_HIGH,
+@@ -182,10 +188,10 @@ TEST(ExploitabilityTest, TestLinuxEngine
+             ExploitabilityFor("linux_write_to_outside_module_via_math.dmp"));
+   ASSERT_EQ(google_breakpad::EXPLOITABILITY_INTERESTING,
+             ExploitabilityFor("linux_write_to_under_4k.dmp"));
+-#endif  // _WIN32
++#endif  // !defined(_WIN32) && (!defined(__i386) && !defined(__x86_64))
+ }
+ 
+-#ifndef _WIN32
++#if !defined(_WIN32) && (defined(__i386) || defined(__x86_64))
+ TEST(ExploitabilityLinuxUtilsTest, DisassembleBytesTest) {
+   ASSERT_FALSE(ExploitabilityLinuxTest::DisassembleBytes("", NULL, 5, NULL));
+   uint8_t bytes[6] = {0xc7, 0x0, 0x5, 0x0, 0x0, 0x0};
+@@ -301,6 +307,7 @@ TEST(ExploitabilityLinuxUtilsTest, Calcu
+                                                          context,
+                                                          &write_address));
+ }
+-#endif  // _WIN32
++#endif  // !defined(_WIN32) && (defined(__i386) || defined(__x86_64))
++
+ 
+ }  // namespace
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/tools/linux/md2core/minidump-2-core.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/tools/linux/md2core/minidump-2-core.cc
+@@ -77,6 +77,8 @@
+   #define ELF_ARCH  EM_MIPS
+ #elif defined(__aarch64__)
+   #define ELF_ARCH  EM_AARCH64
++#elif defined(__powerpc64__)
++  #define ELF_ARCH  EM_PPC64
+ #endif
+ 
+ #if defined(__arm__)
+@@ -87,6 +89,8 @@ typedef user_regs user_regs_struct;
+ #elif defined (__mips__)
+ // This file-local typedef simplifies the source code.
+ typedef gregset_t user_regs_struct;
++#elif defined(__powerpc64__)
++typedef struct pt_regs user_regs_struct;
+ #endif
+ 
+ using google_breakpad::MDTypeHelper;
+@@ -322,6 +326,12 @@ struct CrashedProcess {
+ #if defined(__aarch64__)
+     user_fpsimd_struct fpregs;
+ #endif
++#if defined(__powerpc64__)
++    mcontext_t mcontext;
++#endif
++#if defined(__powerpc64__)
++    mcontext_t mcontext;
++#endif
+     uintptr_t stack_addr;
+     const uint8_t* stack;
+     size_t stack_length;
+@@ -535,6 +545,38 @@ ParseThreadRegisters(CrashedProcess::Thr
+   thread->mcontext.fpc_eir = rawregs->float_save.fir;
+ #endif
+ }
++#elif defined(__powerpc64__)
++static void
++ParseThreadRegisters(CrashedProcess::Thread* thread,
++                     const MinidumpMemoryRange& range) {
++  const MDRawContextPPC64* rawregs = range.GetData<MDRawContextPPC64>(0);
++
++  for (int i = 0; i < MD_CONTEXT_PPC64_GPR_COUNT; i++)
++    thread->mcontext.gp_regs[i] = rawregs->gpr[i];
++
++  thread->mcontext.gp_regs[PT_LNK] = rawregs->lr;
++  thread->mcontext.gp_regs[PT_NIP] = rawregs->srr0;
++  thread->mcontext.gp_regs[PT_MSR] = rawregs->srr1;
++  thread->mcontext.gp_regs[PT_CCR] = rawregs->cr;
++  thread->mcontext.gp_regs[PT_XER] = rawregs->xer;
++  thread->mcontext.gp_regs[PT_CTR] = rawregs->ctr;
++  thread->mcontext.v_regs->vrsave = rawregs->vrsave;
++
++  for (int i = 0; i < MD_FLOATINGSAVEAREA_PPC_FPR_COUNT; i++)
++      thread->mcontext.fp_regs[i] = rawregs->float_save.fpregs[i];
++
++  thread->mcontext.fp_regs[NFPREG-1] = rawregs->float_save.fpscr;
++
++  for (int i = 0; i < MD_VECTORSAVEAREA_PPC_VR_COUNT; i++) {
++      thread->mcontext.v_regs->vrregs[i][0] = rawregs->vector_save.save_vr[i].high >> 32;
++      thread->mcontext.v_regs->vrregs[i][1] = rawregs->vector_save.save_vr[i].high;
++      thread->mcontext.v_regs->vrregs[i][2] = rawregs->vector_save.save_vr[i].low >> 32;
++      thread->mcontext.v_regs->vrregs[i][3] = rawregs->vector_save.save_vr[i].low;
++  }
++
++  thread->mcontext.v_regs->vscr.vscr_word = rawregs->vector_save.save_vscr.low & 0xFFFFFFFF;
++}
++
+ #else
+ #error "This code has not been ported to your platform yet"
+ #endif
+@@ -623,6 +665,12 @@ ParseSystemInfo(const Options& options,
+ # else
+ #  error "This mips ABI is currently not supported (n32)"
+ # endif
++#elif defined(__powerpc64__)
++  if (sysinfo->processor_architecture != MD_CPU_ARCHITECTURE_PPC64) {
++    fprintf(stderr,
++            "This version of minidump-2-core only supports PPC64.\n");
++    exit(1);
++  }
+ #else
+ #error "This code has not been ported to your platform yet"
+ #endif
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/CONTRIBUTORS
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/CONTRIBUTORS
+@@ -13,3 +13,4 @@ Mark Mentovai <mark@chromium.org>
+ Robert Sesek <rsesek@chromium.org>
+ Scott Graham <scottmg@chromium.org>
+ Joshua Peraza <jperaza@chromium.org>
++Shawn Anastasio <shawn@anastas.io>
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/compat/linux/sys/user.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/compat/linux/sys/user.h
+@@ -15,6 +15,7 @@
+ #ifndef CRASHPAD_COMPAT_LINUX_SYS_USER_H_
+ #define CRASHPAD_COMPAT_LINUX_SYS_USER_H_
+ 
++#include <cstddef>
+ #include_next <sys/user.h>
+ 
+ #include <features.h>
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/minidump/minidump_context.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/minidump/minidump_context.h
+@@ -592,6 +592,70 @@ struct MinidumpContextMIPS64 {
+   uint64_t fir;
+ };
+ 
++//! \brief ppc64-specific flags for MinidumpPPC64::context_flags
++//! Based on minidump_cpu_ppc64.h from breakpad
++enum MinidumpContextPPC64Flags : uint32_t {
++  //! \brief Identifies the context as PPC64.
++  kMinidumpContextPPC64 = 0x01000000,
++
++  //! \brief Indicates the validity of general purpose registers.
++  //!
++  //! Registers `r0`-`r31`, `nip`, `msr`, `lr`, etc. are valid.
++  kMinidumpContextPPC64Base = kMinidumpContextPPC64 | 0x00000001,
++
++  //! \brief Indicates the validity of floating point registers.
++  //!
++  //! Registers `fp0`-`fp31`, `fpscr` are valid.
++  kMinidumpContextPPC64Floating = kMinidumpContextPPC64 | 0x00000008,
++
++  //! \brief Indicates the validity of Altivec/VMX registers.
++  //!
++  //! Registers `v0`-`v31`, `vscr`, `vrsave`.
++  kMinidumpContextPPC64Vector = kMinidumpContextPPC64 | 0x00000020,
++
++  //! \brief Indicates the validity of all registers
++  kMinidumpContextPPC64All = kMinidumpContextPPC64Base     |
++                             kMinidumpContextPPC64Floating |
++                             kMinidumpContextPPC64Vector
++};
++
++//! \brief A PPC64 CPU context carried in a minidump file.
++//! Based on minidump_cpu_ppc64.h from breakpad.
++struct MinidumpContextPPC64 {
++  uint64_t context_flags;
++
++  //! \brief General purpose registers.
++  uint64_t nip;
++  uint64_t msr;
++  uint64_t regs[32];
++  uint64_t ccr;
++  uint64_t xer;
++  uint64_t lnk;
++  uint64_t ctr;
++
++  //! \brief Floating point registers.
++  double fpregs[32];
++
++  //! \brief FPU status register.
++  double fpscr;
++
++  //! \brief Altivec/VMX vector registers.
++  struct {
++      //! \brief Vector registers are 128bits.
++      uint128_struct save_vr[32];
++      uint128_struct save_vscr;
++
++      //! \brief Padding included for breakpad compatibiltiy.
++      uint32_t save_pad5[4];
++
++      //! \brief VRSAVE register.
++      uint32_t save_vrsave;
++
++      //! \brief Padding included for breakpad compatibiltiy.
++      uint32_t save_pad6[7];
++  } vregs;
++};
++
+ }  // namespace crashpad
+ 
+ #endif  // CRASHPAD_MINIDUMP_MINIDUMP_CONTEXT_H_
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/minidump/minidump_context_writer.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/minidump/minidump_context_writer.cc
+@@ -101,6 +101,13 @@ MinidumpContextWriter::CreateFromSnapsho
+       break;
+     }
+ 
++    case kCPUArchitecturePPC64: {
++      context = std::make_unique<MinidumpContextPPC64Writer>();
++      reinterpret_cast<MinidumpContextPPC64Writer*>(context.get())
++          ->InitalizeFromSnapshot(context_snapshot->ppc64);
++      break;
++    }
++
+     default: {
+       LOG(ERROR) << "unknown context architecture "
+                  << context_snapshot->architecture;
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/minidump/minidump_context_writer.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/minidump/minidump_context_writer.h
+@@ -315,6 +315,45 @@ class MinidumpContextMIPS64Writer final
+   DISALLOW_COPY_AND_ASSIGN(MinidumpContextMIPS64Writer);
+ };
+ 
++class MinidumpContextPPC64Writer final : public MinidumpContextWriter {
++ public:
++  MinidumpContextPPC64Writer();
++  ~MinidumpContextPPC64Writer() override;
++
++  //! \brief Initalizes the MinidumpContextPPC64 based on \a context_snapshot.
++  //!
++  //! \param[in] context_snapshot The context snapshot to use as source data.
++  //!
++  //! \note Valid in #kStateMutable. No mutation of context() may be done before
++  //!     calling this method, and it is not normally necessary to alter
++  //!     context() after calling this method.
++  void InitalizeFromSnapshot(const CPUContextPPC64* context_snapshot);
++
++  //! \brief Returns a pointer to the context structure that this object will
++  //!     write.
++  //!
++  //! \attention This returns a non-`const` pointer to this object’s private
++  //!     data so that a caller can populate the context structure directly.
++  //!     This is done because providing setter interfaces to each field in the
++  //!     context structure would be unwieldy and cumbersome. Care must be taken
++  //!     to populate the context structure correctly. The context structure
++  //!     must only be modified while this object is in the #kStateMutable
++  //!     state.
++  MinidumpContextPPC64* context() { return &context_; }
++
++ protected:
++  // MinidumpWritable:
++  bool WriteObject(FileWriterInterface* file_writer) override;
++
++  // MinidumpContextWriter:
++  size_t ContextSize() const override;
++
++ private:
++  MinidumpContextPPC64 context_;
++
++  DISALLOW_COPY_AND_ASSIGN(MinidumpContextPPC64Writer);
++};
++
+ }  // namespace crashpad
+ 
+ #endif  // CRASHPAD_MINIDUMP_MINIDUMP_CONTEXT_WRITER_H_
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/minidump/minidump_context_writer_test.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/minidump/minidump_context_writer_test.cc
+@@ -213,6 +213,21 @@ TEST(MinidumpContextWriter, MIPS64_FromS
+       context, ExpectMinidumpContextMIPS64, kSeed);
+ }
+ 
++TEST(MinidumpContextWriter, PPC64_Zeros) {
++  EmptyContextTest<MinidumpContextPPC64Writer, MinidumpContextPPC64>(
++    ExpectMinidumpContextPPC64);
++}
++
++TEST(MinidumpContextWriter, PPC64_FromSnapshot) {
++  constexpr uint32_t kSeed = 64;
++  CPUContextPPC64 context_ppc64;
++  CPUContext context;
++  context.ppc64 = &context_ppc64;
++  InitializeCPUContextPPC64(&context, kSeed);
++  FromSnapshotTest<MinidumpContextPPC64Writer, MinidumpContextPPC64>(
++      context, ExpectMinidumpContextPPC64, kSeed);
++}
++
+ }  // namespace
+ }  // namespace test
+ }  // namespace crashpad
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/minidump/minidump_misc_info_writer.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/minidump/minidump_misc_info_writer.cc
+@@ -135,6 +135,8 @@ std::string MinidumpMiscInfoDebugBuildSt
+   static constexpr char kCPU[] = "mips";
+ #elif defined(ARCH_CPU_MIPS64EL)
+   static constexpr char kCPU[] = "mips64";
++#elif defined(ARCH_CPU_PPC64)
++  static constexpr char kCPU[] = "ppc64";
+ #else
+ #error define kCPU for this CPU
+ #endif
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/capture_memory.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/capture_memory.cc
+@@ -112,6 +112,11 @@ void CaptureMemory::PointedToByContext(c
+   for (size_t i = 0; i < base::size(context.mipsel->regs); ++i) {
+     MaybeCaptureMemoryAround(delegate, context.mipsel->regs[i]);
+   }
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++  MaybeCaptureMemoryAround(delegate, context.ppc64->nip);
++  for (size_t i = 0; i < base::size(context.ppc64->regs); ++i) {
++    MaybeCaptureMemoryAround(delegate, context.ppc64->regs[i]);
++  }
+ #else
+ #error Port.
+ #endif
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/cpu_architecture.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/cpu_architecture.h
+@@ -43,7 +43,10 @@ enum CPUArchitecture {
+   kCPUArchitectureMIPSEL,
+ 
+   //! \brief 64-bit MIPSEL.
+-  kCPUArchitectureMIPS64EL
++  kCPUArchitectureMIPS64EL,
++
++  //! \brief 64-bit PPC64.
++  kCPUArchitecturePPC64
+ };
+ 
+ }  // namespace crashpad
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/cpu_context.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/cpu_context.cc
+@@ -169,6 +169,8 @@ uint64_t CPUContext::InstructionPointer(
+       return arm->pc;
+     case kCPUArchitectureARM64:
+       return arm64->pc;
++    case kCPUArchitecturePPC64:
++      return ppc64->nip;
+     default:
+       NOTREACHED();
+       return ~0ull;
+@@ -185,6 +187,8 @@ uint64_t CPUContext::StackPointer() cons
+       return arm->sp;
+     case kCPUArchitectureARM64:
+       return arm64->sp;
++    case kCPUArchitecturePPC64:
++      return ppc64->regs[1];
+     default:
+       NOTREACHED();
+       return ~0ull;
+@@ -196,6 +200,7 @@ bool CPUContext::Is64Bit() const {
+     case kCPUArchitectureX86_64:
+     case kCPUArchitectureARM64:
+     case kCPUArchitectureMIPS64EL:
++    case kCPUArchitecturePPC64:
+       return true;
+     case kCPUArchitectureX86:
+     case kCPUArchitectureARM:
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/cpu_context.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/cpu_context.h
+@@ -352,6 +352,24 @@ struct CPUContextMIPS64 {
+   uint64_t fir;
+ };
+ 
++//! \brief A context structure carrying PPC64 CPU state.
++struct CPUContextPPC64 {
++  uint64_t nip;
++  uint64_t msr;
++  uint64_t regs[32];
++  uint64_t ccr;
++  uint64_t xer;
++  uint64_t lnk;
++  uint64_t ctr;
++  double fpregs[32];
++  double fpscr;
++  struct {
++    uint128_struct save_vr[32];
++    uint128_struct save_vscr;
++    uint32_t save_vrsave;
++  } vregs;
++};
++
+ //! \brief A context structure capable of carrying the context of any supported
+ //!     CPU architecture.
+ struct CPUContext {
+@@ -382,6 +400,7 @@ struct CPUContext {
+     CPUContextARM64* arm64;
+     CPUContextMIPS* mipsel;
+     CPUContextMIPS64* mips64;
++    CPUContextPPC64* ppc64;
+   };
+ };
+ 
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/cpu_context_linux.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/cpu_context_linux.h
+@@ -15,6 +15,7 @@
+ #ifndef CRASHPAD_SNAPSHOT_LINUX_CPU_CONTEXT_LINUX_H_
+ #define CRASHPAD_SNAPSHOT_LINUX_CPU_CONTEXT_LINUX_H_
+ 
++#include <cstring>
+ #include "build/build_config.h"
+ #include "snapshot/cpu_context.h"
+ #include "snapshot/linux/signal_context.h"
+@@ -174,6 +175,76 @@ void InitializeCPUContextMIPS(
+ 
+ #endif  // ARCH_CPU_MIPS_FAMILY || DOXYGEN
+ 
++#if defined(ARCH_CPU_PPC64_FAMILY) || DOXYGEN
++
++//! \brief Initalizes a CPUContextPPC64 structure from native context
++//!     structures on Linux.
++//!
++//! \param[in] thread_context The native thread context.
++//! \param[in] float_context The native float context.
++//! \param[in] vector_context The native vector context.
++//! \param[out] context The CPUContextPPC64 structure to initalize.
++template <typename Traits>
++void InitializeCPUContextPPC64(
++    const ThreadContext::t64_t& thread_context,
++    const FloatContext::f64_t& float_context,
++    const VectorContext::v64_t& vector_context,
++    typename Traits::CPUContext* context) {
++
++  memcpy(context->regs, thread_context.gpr, sizeof(context->regs));
++  context->nip = thread_context.nip;
++  context->msr = thread_context.msr;
++  context->ccr = thread_context.ccr;
++  context->xer = thread_context.xer;
++  context->lnk = thread_context.lnk;
++  context->ctr = thread_context.ctr;
++
++  memcpy(context->fpregs, float_context.fpregs, sizeof(context->fpregs));
++  context->fpscr = float_context.fpscr;
++
++  for (uint8_t i = 0; i < 32; i++) {
++    context->vregs.save_vr[i] = {
++      (((uint64_t)vector_context.vrregs[i][0]) << 32) |
++        vector_context.vrregs[i][1],
++      (((uint64_t)vector_context.vrregs[i][2]) << 32) |
++        vector_context.vrregs[i][3]
++    };
++  }
++  context->vregs.save_vrsave = vector_context.vrsave;
++  context->vregs.save_vscr = {0, (uint64_t)vector_context.vscr.vscr_word};
++}
++
++template <typename Traits>
++void InitializeCPUContextPPC64(
++    const SignalThreadContext64 &thread_context,
++    const SignalFloatContext64 &float_context,
++    const SignalVectorContext64 &vector_context,
++    typename Traits::CPUContext* context) {
++
++  memcpy(context->regs, thread_context.regs, sizeof(context->regs));
++  context->nip = thread_context.nip;
++  context->msr = thread_context.msr;
++  context->ccr = thread_context.ccr;
++  context->xer = thread_context.xer;
++  context->lnk = thread_context.lnk;
++  context->ctr = thread_context.ctr;
++
++  memcpy(context->fpregs, float_context.regs, sizeof(context->fpregs));
++  context->fpscr = float_context.fpscr;
++
++  for (uint8_t i = 0; i < 32; i++) {
++    context->vregs.save_vr[i] = {
++      (((uint64_t)vector_context.vrregs[i][0]) << 32) |
++        vector_context.vrregs[i][1],
++      (((uint64_t)vector_context.vrregs[i][2]) << 32) |
++        vector_context.vrregs[i][3]
++    };
++  }
++  context->vregs.save_vrsave = vector_context.vrsave;
++  context->vregs.save_vscr = {0, (uint64_t)vector_context.vscr.vscr_word};
++}
++
++#endif
+ }  // namespace internal
+ }  // namespace crashpad
+ 
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/debug_rendezvous_test.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/debug_rendezvous_test.cc
+@@ -192,6 +192,8 @@ void TestAgainstTarget(PtraceConnection*
+               device == 0 && inode == 0 && mapping_name == "[vdso]";
+ #if defined(ARCH_CPU_X86)
+           static constexpr char kPrefix[] = "linux-gate.so.";
++#elif defined(ARCH_CPU_PPC64)
++          static constexpr char kPrefix[] = "linux-vdso64.so.";
+ #else
+           static constexpr char kPrefix[] = "linux-vdso.so.";
+ #endif
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux.cc
+@@ -323,6 +323,69 @@ bool ExceptionSnapshotLinux::ReadContext
+       reader, context_address, context_.mips64);
+ }
+ 
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++
++template <typename Traits>
++static bool ReadContext(ProcessReaderLinux* reader,
++                        LinuxVMAddress context_address,
++                        typename Traits::CPUContext* dest_context) {
++  const ProcessMemory* memory = reader->Memory();
++
++  LinuxVMAddress gp_regs_address = context_address +
++                                   offsetof(UContext, mcontext) +
++                                   offsetof(typename Traits::MContext, gp_regs);
++
++  typename Traits::SignalThreadContext thread_context;
++  if (!memory->Read(gp_regs_address, sizeof(thread_context), &thread_context)) {
++    LOG(ERROR) << "Couldn't read gp_regs!";
++    return false;
++  }
++
++  LinuxVMAddress fp_regs_address = context_address +
++                                   offsetof(UContext, mcontext) +
++                                   offsetof(typename Traits::MContext, fp_regs);
++
++  typename Traits::SignalFloatContext fp_context;
++  if (!memory->Read(fp_regs_address, sizeof(fp_context), &fp_context)) {
++    LOG(ERROR) << "Couldn't read fp_regs!";
++    return false;
++  }
++
++  LinuxVMAddress v_regs_ptr_address = context_address +
++                                  offsetof(UContext, mcontext) +
++                                  offsetof(typename Traits::MContext, vmx_reserve) + 8;
++
++  typename Traits::SignalVectorContext v_context;
++  if (!memory->Read(v_regs_ptr_address, sizeof(v_context), &v_context)) {
++    LOG(ERROR) << "Couldn't read v_regs!";
++    return false;
++  }
++
++  InitializeCPUContextPPC64<ContextTraits64>(thread_context, fp_context,
++                            v_context, dest_context);
++
++  return true;
++}
++
++template<>
++bool ExceptionSnapshotLinux::ReadContext<ContextTraits64>(
++    ProcessReaderLinux* reader,
++    LinuxVMAddress context_address) {
++  context_.architecture = kCPUArchitecturePPC64;
++  context_.ppc64 = &context_union_.ppc64;
++
++  return internal::ReadContext<ContextTraits64>(
++      reader, context_address, context_.ppc64);
++}
++
++template<>
++bool ExceptionSnapshotLinux::ReadContext<ContextTraits32>(
++    ProcessReaderLinux* reader,
++    LinuxVMAddress context_address) {
++  // PPC64 is 64-bit
++  return false;
++}
++
+ #endif  // ARCH_CPU_X86_FAMILY
+ 
+ bool ExceptionSnapshotLinux::Initialize(ProcessReaderLinux* process_reader,
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux.h
+@@ -84,6 +84,8 @@ class ExceptionSnapshotLinux final : pub
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+     CPUContextMIPS mipsel;
+     CPUContextMIPS64 mips64;
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++    CPUContextPPC64 ppc64;
+ #endif
+   } context_union_;
+   CPUContext context_;
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux_test.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux_test.cc
+@@ -296,7 +296,28 @@ void ExpectContext(const CPUContext& act
+             0);
+ #undef CPU_ARCH_NAME
+ }
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++using NativeCPUContext = ucontext_t;
+ 
++void InitializeContext(NativeCPUContext* context) {
++  for (size_t reg = 0; reg < 32; ++reg) {
++    context->uc_mcontext.gp_regs[reg] = reg;
++  }
++
++  memset(&context->uc_mcontext.fp_regs, 44,
++      sizeof(context->uc_mcontext.fp_regs));
++}
++
++void ExpectContext(const CPUContext& actual, const NativeCPUContext& expected) {
++  EXPECT_EQ(actual.architecture, kCPUArchitecturePPC64);
++
++  for (size_t reg = 0; reg < 32; ++reg) {
++    EXPECT_EQ(actual.ppc64->regs[reg], expected.uc_mcontext.gp_regs[reg]);
++  }
++
++  EXPECT_EQ(memcmp(actual.ppc64->fpregs, expected.uc_mcontext.fp_regs,
++            sizeof(actual.ppc64->fpregs)), 0);
++}
+ #else
+ #error Port.
+ #endif
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/process_reader_linux.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/process_reader_linux.cc
+@@ -108,6 +108,8 @@ void ProcessReaderLinux::Thread::Initial
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+   stack_pointer = reader->Is64Bit() ? thread_info.thread_context.t64.regs[29]
+                                     : thread_info.thread_context.t32.regs[29];
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++  stack_pointer = thread_info.thread_context.t64.gpr[1];
+ #else
+ #error Port.
+ #endif
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/signal_context.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/signal_context.h
+@@ -422,6 +422,93 @@ static_assert(offsetof(UContext<ContextT
+               "context offset mismatch");
+ #endif
+ 
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++
++struct SignalThreadContext64 {
++  uint64_t regs[32];
++  uint64_t nip;
++  uint64_t msr;
++  uint64_t orig_r3;
++  uint64_t ctr;
++  uint64_t lnk;
++  uint64_t xer;
++  uint64_t ccr;
++  uint64_t softe;
++  uint64_t trap;
++  uint64_t dar;
++  uint64_t dsisr;
++  uint64_t result;
++  uint64_t dscr;
++  uint64_t fpr0[3];
++};
++
++struct SignalFloatContext64 {
++  double regs[32];
++  double fpscr;
++};
++
++struct SignalVectorContext64 {
++  int32_t vrregs[32][4];
++  struct {
++    int32_t __pad[3];
++    int32_t vscr_word;
++  } vscr;
++  int32_t vrsave;
++  int32_t __pad[3];
++} __attribute__((__aligned__(16)));
++
++
++#pragma pack(pop)
++struct MContext64 {
++  uint64_t reserved[4];
++  int32_t signal;
++  int32_t __pad0;
++  uint64_t handler;
++  uint64_t oldmask;
++  uint64_t pt_regs_ptr;
++  SignalThreadContext64 gp_regs;
++  SignalFloatContext64  fp_regs;
++  SignalVectorContext64 *v_regs;
++#ifdef __GLIBC__
++  int64_t vmx_reserve[69];
++#else
++  int64_t vmx_reserve[101];
++#endif
++};
++
++struct ContextTraits64 : public Traits64 {
++  using MContext = MContext64;
++  using SignalThreadContext = SignalThreadContext64;
++  using SignalFloatContext = SignalFloatContext64;
++  using SignalVectorContext = SignalVectorContext64;
++  using CPUContext = CPUContextPPC64;
++};
++
++struct ContextTraits32 : public Traits32 {};
++
++struct UContext {
++  uint64_t flags;
++  uint64_t link;
++  SignalStack<ContextTraits64> stack;
++  Sigset<ContextTraits64> sigmask;
++  MContext64 mcontext;
++};
++#pragma pack(push, 1)
++
++static_assert(sizeof(UContext) == sizeof(ucontext_t),
++              "ucontext_t size mismatch");
++static_assert(sizeof(MContext64) == sizeof(mcontext_t),
++              "mcontext_t size mismatch");
++static_assert(sizeof(SignalThreadContext64) == sizeof(gregset_t),
++              "gregset_t size mismatch");
++static_assert(sizeof(SignalFloatContext64) == sizeof(fpregset_t),
++              "fpregset_t size mismatch");
++static_assert(sizeof(SignalVectorContext64) == sizeof(vrregset_t),
++              "vrregset_t size mismatch");
++static_assert(offsetof(UContext, mcontext) ==
++              offsetof(ucontext_t, uc_mcontext), "mcontext offset mismatch");
++static_assert(offsetof(MContext64, gp_regs) ==
++              offsetof(mcontext_t, gp_regs), "gp_regs offset mismatch");
+ #else
+ #error Port.
+ #endif  // ARCH_CPU_X86_FAMILY
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/system_snapshot_linux.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/system_snapshot_linux.cc
+@@ -204,6 +204,8 @@ CPUArchitecture SystemSnapshotLinux::Get
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+   return process_reader_->Is64Bit() ? kCPUArchitectureMIPS64EL
+                                     : kCPUArchitectureMIPSEL;
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++  return kCPUArchitecturePPC64;
+ #else
+ #error port to your architecture
+ #endif
+@@ -219,6 +221,9 @@ uint32_t SystemSnapshotLinux::CPURevisio
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+   // Not implementable on MIPS
+   return 0;
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++  // Not yet implemented on PPC64
++  return 0;
+ #else
+ #error port to your architecture
+ #endif
+@@ -239,6 +244,9 @@ std::string SystemSnapshotLinux::CPUVend
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+   // Not implementable on MIPS
+   return std::string();
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++  // Not yet implemented on PPC64
++  return std::string();
+ #else
+ #error port to your architecture
+ #endif
+@@ -372,6 +380,9 @@ bool SystemSnapshotLinux::NXEnabled() co
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+   // Not implementable on MIPS
+   return false;
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++  // Not yet implemented on PPC64
++  return false;
+ #else
+ #error Port.
+ #endif  // ARCH_CPU_X86_FAMILY
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/test_modules.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/test_modules.cc
+@@ -110,6 +110,8 @@ bool WriteTestModule(const base::FilePat
+   module.ehdr.e_machine = EM_AARCH64;
+ #elif defined(ARCH_CPU_MIPSEL) || defined(ARCH_CPU_MIPS64EL)
+   module.ehdr.e_machine = EM_MIPS;
++#elif defined(ARCH_CPU_PPC64)
++  module.ehdr.e_machine = EM_PPC64;
+ #endif
+ 
+   module.ehdr.e_version = EV_CURRENT;
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/thread_snapshot_linux.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/thread_snapshot_linux.cc
+@@ -186,6 +186,14 @@ bool ThreadSnapshotLinux::Initialize(Pro
+         thread.thread_info.float_context.f32,
+         context_.mipsel);
+   }
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++  context_.architecture = kCPUArchitecturePPC64;
++  context_.ppc64 = &context_union_.ppc64;
++  InitializeCPUContextPPC64<ContextTraits64>(
++      thread.thread_info.thread_context.t64,
++      thread.thread_info.float_context.f64,
++      thread.thread_info.vector_context.v64,
++      context_.ppc64);
+ #else
+ #error Port.
+ #endif
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/thread_snapshot_linux.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/thread_snapshot_linux.h
+@@ -68,6 +68,8 @@ class ThreadSnapshotLinux final : public
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+     CPUContextMIPS mipsel;
+     CPUContextMIPS64 mips64;
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++    CPUContextPPC64 ppc64;
+ #else
+ #error Port.
+ #endif  // ARCH_CPU_X86_FAMILY
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/util/linux/auxiliary_vector.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/util/linux/auxiliary_vector.cc
+@@ -56,6 +56,11 @@ bool AuxiliaryVector::Read(PtraceConnect
+     if (type == AT_IGNORE) {
+       continue;
+     }
++#if defined(ARCH_CPU_PPC64_FAMILY)
++    if (type == AT_IGNOREPPC) {
++      continue;
++    }
++#endif
+     if (!MapInsertOrReplace(&values_, type, value, nullptr)) {
+       LOG(ERROR) << "duplicate auxv entry";
+       return false;
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/util/linux/ptracer.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/util/linux/ptracer.cc
+@@ -401,6 +401,64 @@ bool GetThreadArea64(pid_t tid,
+   return true;
+ }
+ 
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++// PPC64 has had HAVE_ARCH_TRACEHOOK set since 2.6.27 (even before x86 had it).
++// That means we can simply use PTRACE_GETREGESET.
++
++template <typename Destination>
++bool GetRegisterSet(pid_t tid, int set, Destination* dest, bool can_log) {
++  iovec iov;
++  iov.iov_base = reinterpret_cast<void*>(dest);
++  iov.iov_len = sizeof(*dest);
++  if (ptrace(PTRACE_GETREGSET, tid, reinterpret_cast<void*>(set), &iov) != 0) {
++    PLOG_IF(ERROR, can_log) << "ptrace";
++    return false;
++  }
++  if (iov.iov_len != sizeof(*dest)) {
++    LOG_IF(ERROR, can_log) << "Unexpected registers size";
++    return false;
++  }
++  return true;
++}
++
++bool GetVectorRegisters64(pid_t tid,
++                          VectorContext* context,
++                          bool can_log) {
++  return GetRegisterSet(tid, NT_PPC_VMX, &context->v64, can_log);
++}
++
++bool GetFloatingPointRegisters64(pid_t tid,
++                                 FloatContext* context,
++                                 bool can_log) {
++  return GetRegisterSet(tid, NT_PRFPREG, &context->f64, can_log);
++}
++
++bool GetThreadArea64(pid_t tid,
++                     const ThreadContext& context,
++                     LinuxVMAddress* address,
++                     bool can_log) {
++  // PPC64 doesn't have PTRACE_GET_THREAD_AREA since the thread pointer
++  // is stored in GPR 13.
++  ThreadContext::t64_t tc;
++  if (!GetRegisterSet(tid, NT_PRSTATUS, &tc, can_log)) {
++    LOG_IF(ERROR, can_log) << "Unable to get thread pointer!";
++    return false;
++  }
++
++  *address = tc.gpr[13];
++
++  return true;
++}
++
++// Stubs for 32-bit functions not applicable on PPC64
++bool GetFloatingPointRegisters32(pid_t tid,
++                                 FloatContext* context,
++                                 bool can_log) { return false; }
++bool GetThreadArea32(pid_t tid,
++                     const ThreadContext &context,
++                     LinuxVMAddress *address,
++                     bool can_log) { return false; }
++
+ #else
+ #error Port.
+ #endif  // ARCH_CPU_X86_FAMILY
+@@ -497,6 +555,9 @@ bool Ptracer::GetThreadInfo(pid_t tid, T
+   if (is_64_bit_) {
+     return GetGeneralPurposeRegisters64(tid, &info->thread_context, can_log_) &&
+            GetFloatingPointRegisters64(tid, &info->float_context, can_log_) &&
++#if defined(ARCH_CPU_PPC64_FAMILY)
++           GetVectorRegisters64(tid, &info->vector_context, can_log_) &&
++#endif
+            GetThreadArea64(tid,
+                            info->thread_context,
+                            &info->thread_specific_data_address,
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/util/linux/thread_info.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/util/linux/thread_info.h
+@@ -39,6 +39,13 @@ struct user_vfp_exc {
+ #include <android/api-level.h>
+ #endif
+ 
++#if defined(ARCH_CPU_PPC64_FAMILY)
++#include <sys/ucontext.h>
++#if !defined(__GLIBC__)
++#include <asm/ptrace.h>
++#endif
++#endif
++
+ namespace crashpad {
+ 
+ //! \brief The set of general purpose registers for an architecture family.
+@@ -90,6 +97,8 @@ union ThreadContext {
+     uint32_t cp0_status;
+     uint32_t cp0_cause;
+     uint32_t padding1_;
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++    // PPC64 is 64-bit
+ #else
+ #error Port.
+ #endif  // ARCH_CPU_X86_FAMILY
+@@ -143,6 +152,21 @@ union ThreadContext {
+     uint64_t cp0_badvaddr;
+     uint64_t cp0_status;
+     uint64_t cp0_cause;
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++    // Reflects struct pt_regs in asm/ptrace.h.
++    uint64_t gpr[32];
++    uint64_t nip;
++    uint64_t msr;
++    uint64_t orig_gpr3;
++    uint64_t ctr;
++    uint64_t lnk;
++    uint64_t xer;
++    uint64_t ccr;
++    uint64_t softe;
++    uint64_t trap;
++    uint64_t dar;
++    uint64_t dsisr;
++    uint64_t result;
+ #else
+ #error Port.
+ #endif  // ARCH_CPU_X86_FAMILY
+@@ -154,6 +178,8 @@ union ThreadContext {
+   using NativeThreadContext = user_regs;
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+ // No appropriate NativeThreadsContext type available for MIPS
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++  using NativeThreadContext = struct pt_regs;
+ #else
+ #error Port.
+ #endif  // ARCH_CPU_X86_FAMILY || ARCH_CPU_ARM64
+@@ -229,6 +255,9 @@ union FloatContext {
+     } fpregs[32];
+     uint32_t fpcsr;
+     uint32_t fpu_id;
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++    // Crashpad's PPC support is 64-bit only, so this
++    // 32bit-only struct is declared as empty.
+ #else
+ #error Port.
+ #endif  // ARCH_CPU_X86_FAMILY
+@@ -263,6 +292,10 @@ union FloatContext {
+     double fpregs[32];
+     uint32_t fpcsr;
+     uint32_t fpu_id;
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++    // Reflects fpregset_t in sys/ucontext.h
++    double fpregs[32];
++    double fpscr;
+ #else
+ #error Port.
+ #endif  // ARCH_CPU_X86_FAMILY
+@@ -291,6 +324,8 @@ union FloatContext {
+   static_assert(sizeof(f64) == sizeof(user_fpsimd_struct), "Size mismatch");
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+ // No appropriate floating point context native type for available MIPS.
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++  static_assert(sizeof(f64) == sizeof(fpregset_t), "Size mismatch");
+ #else
+ #error Port.
+ #endif  // ARCH_CPU_X86
+@@ -298,6 +333,26 @@ union FloatContext {
+ static_assert(std::is_standard_layout<FloatContext>::value,
+               "Not standard layout");
+ 
++//! \brief The vector registers used for an architecture family
++union VectorContext {
++  struct v32_t {} v32;
++#if defined(ARCH_CPU_PPC64_FAMILY)
++  __attribute__((__aligned__(16))) // Vector context must be doubleword aligned.
++#endif
++  struct v64_t {
++#if defined(ARCH_CPU_PPC64_FAMILY)
++    // Reflects vrregset_t in sys/ucontext.h
++    uint32_t vrregs[32][4];
++    struct {
++      uint32_t __pad[3];
++      uint32_t vscr_word;
++    } vscr;
++    uint32_t vrsave;
++    uint32_t __pad[3];
++#endif
++  } v64;
++};
++
+ //! \brief A collection of `ptrace`-able information about a thread.
+ struct ThreadInfo {
+   ThreadInfo();
+@@ -309,6 +364,9 @@ struct ThreadInfo {
+   //! \brief The floating point registers for the thread.
+   FloatContext float_context;
+ 
++  //! \brief (Optional) The vector registers used for the thread.
++  VectorContext vector_context;
++
+   //! \brief The thread-local storage address for the thread.
+   LinuxVMAddress thread_specific_data_address;
+ };
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/util/misc/capture_context.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/util/misc/capture_context.h
+@@ -69,6 +69,7 @@ using NativeCPUContext = ucontext_t;
+ //!     macOS/Linux/Fuchsia | x86_64       | `%%rdi`
+ //!     Linux               | ARM/ARM64    | `r0`/`x0`
+ //!     Linux               | MIPS/MIPS64  | `$a0`
++//!     Linux               | PPC64        | `r3`
+ //!
+ //!     Additionally, the value `LR` on ARM/ARM64 will be the return address of
+ //!     this function.
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/util/misc/capture_context_linux.S
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/util/misc/capture_context_linux.S
+@@ -32,7 +32,7 @@
+   .balign 4, 0x0
+   .type CAPTURECONTEXT_SYMBOL, %function
+   .type CAPTURECONTEXT_SYMBOL2, %function
+-#elif defined(__mips__)
++#elif defined(__mips__) || defined(__powerpc64__)
+   .balign 4, 0x0
+ #endif
+ 
+@@ -423,4 +423,214 @@ CAPTURECONTEXT_SYMBOL2:
+   jr $ra
+ 
+   .set at
++#elif defined(__powerpc64__)
++  // Store r0-r31
++  std 0, 0xe8(3)   // context->uc_mcontext.gp_regs[0]
++  std 1, 0xf0(3)   // context->uc_mcontext.gp_regs[1]
++  std 2, 0xf8(3)   // context->uc_mcontext.gp_regs[2]
++  // note that r3's original value was lost
++  std 3, 0x100(3)  // context->uc_mcontext.gp_regs[3]
++  std 4, 0x108(3)  // context->uc_mcontext.gp_regs[4]
++  std 5, 0x110(3)  // context->uc_mcontext.gp_regs[5]
++  std 6, 0x118(3)  // context->uc_mcontext.gp_regs[6]
++  std 7, 0x120(3)  // context->uc_mcontext.gp_regs[7]
++  std 8, 0x128(3)  // context->uc_mcontext.gp_regs[8]
++  std 9, 0x130(3)  // context->uc_mcontext.gp_regs[9]
++  std 10, 0x138(3) // context->uc_mcontext.gp_regs[10]
++  std 11, 0x140(3) // context->uc_mcontext.gp_regs[11]
++  std 12, 0x148(3) // context->uc_mcontext.gp_regs[12]
++  std 13, 0x150(3) // context->uc_mcontext.gp_regs[13]
++  std 14, 0x158(3) // context->uc_mcontext.gp_regs[14]
++  std 15, 0x160(3) // context->uc_mcontext.gp_regs[15]
++  std 16, 0x168(3) // context->uc_mcontext.gp_regs[16]
++  std 17, 0x170(3) // context->uc_mcontext.gp_regs[17]
++  std 18, 0x178(3) // context->uc_mcontext.gp_regs[18]
++  std 19, 0x180(3) // context->uc_mcontext.gp_regs[19]
++  std 20, 0x188(3) // context->uc_mcontext.gp_regs[20]
++  std 21, 0x190(3) // context->uc_mcontext.gp_regs[21]
++  std 22, 0x198(3) // context->uc_mcontext.gp_regs[22]
++  std 23, 0x1a0(3) // context->uc_mcontext.gp_regs[23]
++  std 24, 0x1a8(3) // context->uc_mcontext.gp_regs[24]
++  std 25, 0x1b0(3) // context->uc_mcontext.gp_regs[25]
++  std 26, 0x1b8(3) // context->uc_mcontext.gp_regs[26]
++  std 27, 0x1c0(3) // context->uc_mcontext.gp_regs[27]
++  std 28, 0x1c8(3) // context->uc_mcontext.gp_regs[28]
++  std 29, 0x1d0(3) // context->uc_mcontext.gp_regs[29]
++  std 30, 0x1d8(3) // context->uc_mcontext.gp_regs[30]
++  std 31, 0x1e0(3) // context->uc_mcontext.gp_regs[31]
++
++  // For NIP, we can use the value in the link register
++  mflr 0
++  std 0, 0x1e8(3) // context->uc_mcontext.gp_regs[PT_NIP]
++
++  // CTR
++  mfctr 0
++  std 0, 0x200(3) // context->uc_mcontext.gp_regs[PT_CTR]
++
++  // For LNK, we'll use the caller's LR save area (2 stack frames up).
++  // r4 can be used as a scratch register since it has already been saved.
++  ld 4, 0(1)
++  ld 4, 16(4)
++  std 4, 0x208(3) // context->uc_mcontext.gp_regs[PT_LNK]
++
++  // XER
++  mfxer 0
++  std 0, 0x210(3) // context->uc_mcontext.gp_regs[PT_XER]
++
++  // CCR
++  mfcr 0
++  std 0, 0x218(3) // context->uc_mcontext.gp_regs[PT_CCR]
++
++  // MSR, orig_r3, MQ, TRAP, DAR, DSISR, RESULT, DSCR,
++  // not used or not relevant,  zero them out.
++  li 4, 0
++  std 4, 0x1f0(3) // context->uc_mcontext.gp_regs[PT_MSR]
++  std 4, 0x1f8(3) // context->uc_mcontext.gp_regs[PT_ORIG_R3]
++  std 4, 0x220(3) // context->uc_mcontext.gp_regs[PT_MQ]
++  std 4, 0x228(3) // context->uc_mcontext.gp_regs[PT_TRAP]
++  std 4, 0x230(3) // context->uc_mcontext.gp_regs[PT_DAR]
++  std 4, 0x238(3) // context->uc_mcontext.gp_regs[PT_DSISR]
++  std 4, 0x240(3) // context->uc_mcontext.gp_regs[PT_RESULT]
++  std 4, 0x248(3) // context->uc_mcontext.gp_regs[PT_DSCR]
++
++  // Update context->uc_mcontext.regs to point to gp_regs
++  addi 0, 3, 0xe8
++  std 0, 0xe0(3)
++
++  // Save floating point registers 0-31
++  stfd 0, 0x268(3)  // context->uc_mcontext.fp_regs[0]
++  stfd 1, 0x270(3)  // context->uc_mcontext.fp_regs[1]
++  stfd 2, 0x278(3)  // context->uc_mcontext.fp_regs[2]
++  stfd 3, 0x280(3)  // context->uc_mcontext.fp_regs[3]
++  stfd 4, 0x288(3)  // context->uc_mcontext.fp_regs[4]
++  stfd 5, 0x290(3)  // context->uc_mcontext.fp_regs[5]
++  stfd 6, 0x298(3)  // context->uc_mcontext.fp_regs[6]
++  stfd 7, 0x2a0(3)  // context->uc_mcontext.fp_regs[7]
++  stfd 8, 0x2a8(3)  // context->uc_mcontext.fp_regs[8]
++  stfd 9, 0x2b0(3)  // context->uc_mcontext.fp_regs[9]
++  stfd 10, 0x2b8(3) // context->uc_mcontext.fp_regs[10]
++  stfd 11, 0x2c0(3) // context->uc_mcontext.fp_regs[11]
++  stfd 12, 0x2c8(3) // context->uc_mcontext.fp_regs[12]
++  stfd 13, 0x2d0(3) // context->uc_mcontext.fp_regs[13]
++  stfd 14, 0x2d8(3) // context->uc_mcontext.fp_regs[14]
++  stfd 15, 0x2e0(3) // context->uc_mcontext.fp_regs[15]
++  stfd 16, 0x2e8(3) // context->uc_mcontext.fp_regs[16]
++  stfd 17, 0x2f0(3) // context->uc_mcontext.fp_regs[17]
++  stfd 18, 0x2f8(3) // context->uc_mcontext.fp_regs[18]
++  stfd 19, 0x300(3) // context->uc_mcontext.fp_regs[19]
++  stfd 20, 0x308(3) // context->uc_mcontext.fp_regs[20]
++  stfd 21, 0x310(3) // context->uc_mcontext.fp_regs[21]
++  stfd 22, 0x318(3) // context->uc_mcontext.fp_regs[22]
++  stfd 23, 0x320(3) // context->uc_mcontext.fp_regs[23]
++  stfd 24, 0x328(3) // context->uc_mcontext.fp_regs[24]
++  stfd 25, 0x330(3) // context->uc_mcontext.fp_regs[25]
++  stfd 26, 0x338(3) // context->uc_mcontext.fp_regs[26]
++  stfd 27, 0x340(3) // context->uc_mcontext.fp_regs[27]
++  stfd 28, 0x348(3) // context->uc_mcontext.fp_regs[28]
++  stfd 29, 0x350(3) // context->uc_mcontext.fp_regs[29]
++  stfd 30, 0x358(3) // context->uc_mcontext.fp_regs[30]
++  stfd 31, 0x360(3) // context->uc_mcontext.fp_regs[31]
++
++  // FPSCR
++  mffs 0
++  stfd 0, 0x368(3) // context->uc_mcontext.fp_regs[32]
++
++  // Save VMX Vector registers
++  // Update r4 to contain the base address of vmx_reserve
++  addi 4, 3, 0x378
++  // Ensure that it is quadword aligned
++  andi. 5, 4, 0xF
++  beq 1f // No alignment is necessary
++  // Address is doubleword aligned and not quadword aligned, add 8
++  addi 4, 4, 8
++
++1:
++  // Store VMX registers 0-31
++  // r4 will contain the base address
++  // r5 will contain the index
++  li 5, 0
++  stvx 0, 4, 5   // context->uc_mcontext.vmx_reserve[(align) + 0]
++  addi 5, 5, 16
++  stvx 1, 4, 5   // context->uc_mcontext.vmx_reserve[(align) + 1]
++  addi 5, 5, 16
++  stvx 2, 4, 5   // context->uc_mcontext.vmx_reserve[(align) + 2]
++  addi 5, 5, 16
++  stvx 3, 4, 5   // context->uc_mcontext.vmx_reserve[(align) + 3]
++  addi 5, 5, 16
++  stvx 4, 4, 5   // context->uc_mcontext.vmx_reserve[(align) + 4]
++  addi 5, 5, 16
++  stvx 5, 4, 5   // context->uc_mcontext.vmx_reserve[(align) + 5]
++  addi 5, 5, 16
++  stvx 6, 4, 5   // context->uc_mcontext.vmx_reserve[(align) + 6]
++  addi 5, 5, 16
++  stvx 7, 4, 5   // context->uc_mcontext.vmx_reserve[(align) + 7]
++  addi 5, 5, 16
++  stvx 8, 4, 5   // context->uc_mcontext.vmx_reserve[(align) + 8]
++  addi 5, 5, 16
++  stvx 9, 4, 5   // context->uc_mcontext.vmx_reserve[(align) + 9]
++  addi 5, 5, 16
++  stvx 10, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 10]
++  addi 5, 5, 16
++  stvx 11, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 11]
++  addi 5, 5, 16
++  stvx 12, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 12]
++  addi 5, 5, 16
++  stvx 13, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 13]
++  addi 5, 5, 16
++  stvx 14, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 14]
++  addi 5, 5, 16
++  stvx 15, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 15]
++  addi 5, 5, 16
++  stvx 16, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 16]
++  addi 5, 5, 16
++  stvx 17, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 17]
++  addi 5, 5, 16
++  stvx 18, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 18]
++  addi 5, 5, 16
++  stvx 19, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 19]
++  addi 5, 5, 16
++  stvx 20, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 20]
++  addi 5, 5, 16
++  stvx 21, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 21]
++  addi 5, 5, 16
++  stvx 22, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 22]
++  addi 5, 5, 16
++  stvx 23, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 23]
++  addi 5, 5, 16
++  stvx 24, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 24]
++  addi 5, 5, 16
++  stvx 25, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 25]
++  addi 5, 5, 16
++  stvx 26, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 26]
++  addi 5, 5, 16
++  stvx 27, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 27]
++  addi 5, 5, 16
++  stvx 28, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 28]
++  addi 5, 5, 16
++  stvx 29, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 29]
++  addi 5, 5, 16
++  stvx 30, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 30]
++  addi 5, 5, 16
++  stvx 31, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 31]
++  addi 5, 5, 16
++
++  // VSCR
++  mfvscr 0
++  stvx 0, 4, 5
++  addi 5, 5, 16
++
++  // VRSAVE
++  mfvrsave 0
++  stwx 0, 4, 5
++
++  // Update context->uc_mcontext.v_regs to point to vmx_reserve + alignment.
++  std 4, 0x370(3)
++
++  // Zero out all unused fields
++  li 4, 0
++  std 4, 0xc8(3) // context->uc_mcontext.signal
++  std 4, 0xd0(3) // context->uc_mcontext.handler
++  std 4, 0xd8(3) // context->uc_mcontext.oldmask
++
++  blr
+ #endif  // __i386__
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/util/misc/capture_context_test.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/util/misc/capture_context_test.cc
+@@ -57,7 +57,7 @@ void TestCaptureContext() {
+   uintptr_t pc = ProgramCounterFromContext(context_1);
+ 
+ #if !defined(ADDRESS_SANITIZER) && !defined(ARCH_CPU_MIPS_FAMILY) && \
+-    !defined(MEMORY_SANITIZER)
++    !defined(MEMORY_SANITIZER) && !defined(ARCH_CPU_PPC64_FAMILY)
+   // Sanitizers can cause enough code bloat that the “nearby” check would
+   // likely fail.
+   const uintptr_t kReferencePC =
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/util/misc/capture_context_test_util_linux.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/util/misc/capture_context_test_util_linux.cc
+@@ -35,6 +35,8 @@ void SanityCheckContext(const NativeCPUC
+   EXPECT_EQ(context.uc_mcontext.regs[0], FromPointerCast<uintptr_t>(&context));
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+   EXPECT_EQ(context.uc_mcontext.gregs[4], FromPointerCast<uintptr_t>(&context));
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++  EXPECT_EQ(context.uc_mcontext.gp_regs[3], FromPointerCast<uintptr_t>(&context));
+ #endif
+ }
+ 
+@@ -49,6 +51,8 @@ uintptr_t ProgramCounterFromContext(cons
+   return context.uc_mcontext.pc;
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+   return context.uc_mcontext.pc;
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++  return context.uc_mcontext.gp_regs[PT_NIP];
+ #endif
+ }
+ 
+@@ -63,6 +67,8 @@ uintptr_t StackPointerFromContext(const
+   return context.uc_mcontext.sp;
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+   return context.uc_mcontext.gregs[29];
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++  return context.uc_mcontext.gp_regs[1];
+ #endif
+ }
+ 
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/util/posix/signals_test.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/util/posix/signals_test.cc
+@@ -46,9 +46,9 @@ bool CanCauseSignal(int sig) {
+   return sig == SIGABRT ||
+          sig == SIGALRM ||
+          sig == SIGBUS ||
+-#if !defined(ARCH_CPU_ARM64)
++#if !defined(ARCH_CPU_ARM64) && !defined(ARCH_CPU_PPC64)
+          sig == SIGFPE ||
+-#endif  // !defined(ARCH_CPU_ARM64)
++#endif  // !defined(ARCH_CPU_ARM64) && !defined(ARCH_CPU_PPC64)
+ #if defined(ARCH_CPU_X86_FAMILY) || defined(ARCH_CPU_ARMEL)
+          sig == SIGILL ||
+ #endif  // defined(ARCH_CPU_X86_FAMILY) || defined(ARCH_CPU_ARMEL)
+@@ -117,9 +117,11 @@ void CauseSignal(int sig) {
+       break;
+     }
+ 
+-#if !defined(ARCH_CPU_ARM64)
++#if !defined(ARCH_CPU_ARM64) && !defined(ARCH_CPU_PPC64)
+     // ARM64 has hardware integer division instructions that don’t generate a
+     // trap for divide-by-zero, so this doesn’t produce SIGFPE.
++    //
++    // PPC64 fixed-point division by zero also doesn't produce a SIGFPE.
+     case SIGFPE: {
+       // Optimization makes this tricky, so get zero from a system call likely
+       // to succeed, and try to do something with the result.
+@@ -137,7 +139,7 @@ void CauseSignal(int sig) {
+       fstat(quotient, &stat_buf);
+       break;
+     }
+-#endif  // ARCH_CPU_ARM64
++#endif  // !defined(ARCH_CPU_ARM64) && !defined(ARCH_CPU_PPC64)
+ 
+ #if defined(ARCH_CPU_X86_FAMILY) || defined(ARCH_CPU_ARMEL)
+     case SIGILL: {
+--- a/src/3rdparty/chromium/third_party/dav1d/BUILD.gn
++++ b/src/3rdparty/chromium/third_party/dav1d/BUILD.gn
+@@ -196,6 +196,8 @@ static_library("dav1d_8bit") {
+     sources += arm_template_sources
+   } else if (current_cpu == "arm64") {
+     sources += arm_template_sources
++  } else if (current_cpu == "ppc64") {
++    sources += ppc64_template_sources
+   }
+ 
+   cflags = dav1d_copts
+@@ -226,6 +228,8 @@ static_library("dav1d_10bit") {
+     sources += arm_template_sources
+   } else if (current_cpu == "arm64") {
+     sources += arm_template_sources
++  } else if (current_cpu == "ppc64") {
++    sources += ppc64_template_sources
+   }
+ 
+   cflags = dav1d_copts
+@@ -283,6 +287,21 @@ if (current_cpu == "x86" || current_cpu
+     }
+ 
+     cflags = dav1d_copts
++  }
++} else if (current_cpu == "ppc64") {
++  static_library("dav1d_ppc") {
++    sources = [
++      "libdav1d/src/ppc/cpu.c",
++      "libdav1d/src/ppc/cpu.h",
++    ]
++
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [
++      "//build/config/compiler:no_chromium_code",
++      ":dav1d_config",
++    ]
++
++    cflags = dav1d_copts
+ 
+     deps = [ ":dav1d_headers" ]
+     allow_circular_includes_from = [ ":dav1d_headers" ]
+@@ -315,5 +334,7 @@ static_library("dav1d") {
+     }
+   } else if (current_cpu == "arm" || current_cpu == "arm64") {
+     deps += [ ":dav1d_arm" ]
++  } else if (current_cpu == "ppc64") {
++    deps += [ ":dav1d_ppc" ]
+   }
+ }
+--- a/src/3rdparty/chromium/third_party/dav1d/dav1d_generated.gni
++++ b/src/3rdparty/chromium/third_party/dav1d/dav1d_generated.gni
+@@ -103,6 +103,11 @@ arm_template_sources = [
+   "libdav1d/src/arm/mc_init_tmpl.c",
+ ]
+ 
++ppc64_template_sources = [
++  "libdav1d/src/ppc/cdef_init_tmpl.c",
++  "libdav1d/src/ppc/looprestoration_init_tmpl.c",
++]
++
+ template_sources = [
+   "libdav1d/src/cdef_apply_tmpl.c",
+   "libdav1d/src/cdef_tmpl.c",
+--- a/src/3rdparty/chromium/third_party/dav1d/generate_source.py
++++ b/src/3rdparty/chromium/third_party/dav1d/generate_source.py
+@@ -57,6 +57,8 @@ def _WriteGn(fd):
+   _WriteArray(fd, "arm64_asm_sources", _Glob("libdav1d/src/arm/64/*.S"))
+   _WriteArray(fd, "arm_template_sources", _Glob("libdav1d/src/arm/*_tmpl.c"))
+ 
++  _WriteArray(fd, "ppc64_template_sources", _Glob("libdav1d/src/ppc/*_tmpl.c"))
++
+   template_sources = _Glob("libdav1d/src/*_tmpl.c")
+   _WriteArray(fd, "template_sources", template_sources)
+ 
+--- a/src/3rdparty/chromium/third_party/dav1d/libdav1d/src/ppc/types.h
++++ b/src/3rdparty/chromium/third_party/dav1d/libdav1d/src/ppc/types.h
+@@ -51,4 +51,19 @@
+ #define u16l_to_i32(v) ((i32x4) vec_mergel((u16x8) v, vec_splat_u16(0)))
+ #define i16l_to_i32(v) ((i32x4) vec_unpackl((i16x8)v))
+ 
++#if defined(__clang__)
++#undef vec_splats
++#define vec_splats(N)                     \
++    _Generic((N),                         \
++        unsigned char:      ((u8x16)(N)), \
++        signed char:        ((i8x16)(N)), \
++        unsigned short:     ((u16x8)(N)), \
++        signed short:       ((i16x8)(N)), \
++        unsigned int:       ((u32x4)(N)), \
++        signed int:         ((i32x4)(N)), \
++        unsigned long long: ((u64x2)(N)), \
++        signed long long:   ((i64x2)(N))  \
++    )
++#endif
++
+ #endif /* DAV1D_SRC_PPC_TYPES_H */
+--- a/src/3rdparty/chromium/third_party/eigen3/BUILD.gn
++++ b/src/3rdparty/chromium/third_party/eigen3/BUILD.gn
+@@ -22,4 +22,8 @@ config("eigen_includes") {
+     # for this component on Windows on Arm due to compilation errors.
+     defines += [ "EIGEN_DONT_VECTORIZE" ]
+   }
++
++  if (target_cpu == "ppc64") {
++    defines += [ "EIGEN_DONT_VECTORIZE" ]
++  }
+ }
+--- a/src/3rdparty/chromium/third_party/libaom/BUILD.gn
++++ b/src/3rdparty/chromium/third_party/libaom/BUILD.gn
+@@ -37,6 +37,8 @@ if (enable_libaom) {
+     } else {
+       cpu_arch_full = "arm"
+     }
++  } else if (current_cpu == "ppc64") {
++    cpu_arch_full = "generic"
+   } else {
+     cpu_arch_full = current_cpu
+   }
+--- a/src/3rdparty/chromium/third_party/libgav1/options.gni
++++ b/src/3rdparty/chromium/third_party/libgav1/options.gni
+@@ -12,5 +12,5 @@ declare_args() {
+       is_chromeos_ash && (target_cpu == "arm" || target_cpu == "arm64")
+   use_libgav1_parser =
+       (is_chromeos || is_linux || is_win) &&
+-      (target_cpu == "x86" || target_cpu == "x64" || target_cpu == "arm64")
++      (target_cpu == "x86" || target_cpu == "x64" || target_cpu == "arm64" || target_cpu == "ppc64")
+ }
+--- a/src/3rdparty/chromium/third_party/lss/linux_syscall_support.h
++++ b/src/3rdparty/chromium/third_party/lss/linux_syscall_support.h
+@@ -4262,7 +4262,7 @@ struct kernel_statfs {
+       LSS_REG(2, buf);
+       LSS_BODY(void*, mmap2, "0"(__r2));
+     }
+-#else
++#elif !defined(__powerpc64__) /* ppc64 doesn't have mmap2 */
+     #define __NR__mmap2 __NR_mmap2
+     LSS_INLINE _syscall6(void*, _mmap2,            void*, s,
+                          size_t,                   l, int,               p,
+@@ -4373,7 +4373,7 @@ struct kernel_statfs {
+   #if defined(__i386__) ||                                                    \
+       defined(__ARM_ARCH_3__) || defined(__ARM_EABI__) ||                     \
+      (defined(__mips__) && _MIPS_SIM == _MIPS_SIM_ABI32) ||                   \
+-      defined(__PPC__) ||                                                     \
++     (defined(__PPC__) && !defined(__powerpc64__)) ||                                                     \
+      (defined(__s390__) && !defined(__s390x__))
+     /* On these architectures, implement mmap() with mmap2(). */
+     LSS_INLINE void* LSS_NAME(mmap)(void *s, size_t l, int p, int f, int d,
+@@ -4556,9 +4556,17 @@ struct kernel_statfs {
+     }
+   #endif
+   #if defined(__NR_fstatat64)
++    #if !defined(__GLIBC__)
++        // musl doesn't define fstatat64 fstatat
++        #undef fstatat64
++    #endif
+     LSS_INLINE _syscall4(int,   fstatat64,        int,   d,
+                          const char *,      p,
+                          struct kernel_stat64 *,   b,    int,   f)
++    #if !defined(__GLIBC__)
++    	// then restore it
++        #define fstatat64 fstatat
++    #endif
+   #endif
+   #if defined(__NR_waitpid)
+     // waitpid is polyfilled below when not available.
+--- a/src/3rdparty/chromium/third_party/pdfium/third_party/libpng16/pngpriv.h
++++ b/src/3rdparty/chromium/third_party/pdfium/third_party/libpng16/pngpriv.h
+@@ -196,11 +196,7 @@
+ #endif
+ 
+ #ifndef PNG_POWERPC_VSX_OPT
+-#  if defined(__PPC64__) && defined(__ALTIVEC__) && defined(__VSX__)
+-#     define PNG_POWERPC_VSX_OPT 2
+-#  else
+-#     define PNG_POWERPC_VSX_OPT 0
+-#  endif
++#  define PNG_POWERPC_VSX_OPT 0
+ #endif
+ 
+ #ifndef PNG_INTEL_SSE_OPT
+--- a/src/3rdparty/chromium/third_party/pffft/src/pffft.c
++++ b/src/3rdparty/chromium/third_party/pffft/src/pffft.c
+@@ -100,6 +100,7 @@
+    Altivec support macros 
+ */
+ #if !defined(PFFFT_SIMD_DISABLE) && (defined(__ppc__) || defined(__ppc64__))
++#include <altivec.h>
+ typedef vector float v4sf;
+ #  define SIMD_SZ 4
+ #  define VZERO() ((vector float) vec_splat_u8(0))
+--- a/src/3rdparty/chromium/third_party/skia/src/sksl/SkSLString.cpp
++++ b/src/3rdparty/chromium/third_party/skia/src/sksl/SkSLString.cpp
+@@ -142,7 +142,12 @@ String to_string(double value) {
+     if (needsDotZero) {
+         buffer << ".0";
+     }
+-    return String(buffer.str().c_str());
++
++    std::string ret(buffer.str());
++    if (signbit(value) && ret[0] == '.') {
++        ret[0] = '-';
++    }
++    return String(ret.c_str());
+ }
+ 
+ bool stod(const skstd::string_view& s, SKSL_FLOAT* value) {
+--- a/src/3rdparty/chromium/third_party/sqlite/src/amalgamation/sqlite3.c
++++ b/src/3rdparty/chromium/third_party/sqlite/src/amalgamation/sqlite3.c
+@@ -14628,7 +14628,8 @@ typedef INT16_TYPE LogEst;
+ # if defined(i386)      || defined(__i386__)      || defined(_M_IX86) ||    \
+      defined(__x86_64)  || defined(__x86_64__)    || defined(_M_X64)  ||    \
+      defined(_M_AMD64)  || defined(_M_ARM)        || defined(__x86)   ||    \
+-     defined(__ARMEL__) || defined(__AARCH64EL__) || defined(_M_ARM64)
++     defined(__ARMEL__) || defined(__AARCH64EL__) || defined(_M_ARM64) ||   \
++     defined(__powerpc64__) && (__BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__)
+ #   define SQLITE_BYTEORDER    1234
+ # elif defined(sparc)     || defined(__ppc__) || \
+        defined(__ARMEB__) || defined(__AARCH64EB__)
+--- a/src/3rdparty/chromium/third_party/sqlite/src/amalgamation_dev/sqlite3.c
++++ b/src/3rdparty/chromium/third_party/sqlite/src/amalgamation_dev/sqlite3.c
+@@ -14641,7 +14641,8 @@ typedef INT16_TYPE LogEst;
+ # if defined(i386)      || defined(__i386__)      || defined(_M_IX86) ||    \
+      defined(__x86_64)  || defined(__x86_64__)    || defined(_M_X64)  ||    \
+      defined(_M_AMD64)  || defined(_M_ARM)        || defined(__x86)   ||    \
+-     defined(__ARMEL__) || defined(__AARCH64EL__) || defined(_M_ARM64)
++     defined(__ARMEL__) || defined(__AARCH64EL__) || defined(_M_ARM64) ||   \
++     defined(__powerpc64__) && (__BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__)
+ #   define SQLITE_BYTEORDER    1234
+ # elif defined(sparc)     || defined(__ppc__) || \
+        defined(__ARMEB__) || defined(__AARCH64EB__)
+--- a/src/3rdparty/chromium/third_party/sqlite/src/ext/rtree/rtree.c
++++ b/src/3rdparty/chromium/third_party/sqlite/src/ext/rtree/rtree.c
+@@ -450,7 +450,7 @@ struct RtreeMatchArg {
+ #if defined(i386)     || defined(__i386__)   || defined(_M_IX86) ||    \
+     defined(__x86_64) || defined(__x86_64__) || defined(_M_X64)  ||    \
+     defined(_M_AMD64) || defined(_M_ARM)     || defined(__x86)   ||    \
+-    defined(__arm__)
++    defined(__arm__) || defined(__powerpc64__) && (__BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__)
+ # define SQLITE_BYTEORDER    1234
+ #elif defined(sparc)    || defined(__ppc__)
+ # define SQLITE_BYTEORDER    4321
+--- a/src/3rdparty/chromium/third_party/sqlite/src/src/sqliteInt.h
++++ b/src/3rdparty/chromium/third_party/sqlite/src/src/sqliteInt.h
+@@ -890,7 +890,8 @@ typedef INT16_TYPE LogEst;
+ # if defined(i386)      || defined(__i386__)      || defined(_M_IX86) ||    \
+      defined(__x86_64)  || defined(__x86_64__)    || defined(_M_X64)  ||    \
+      defined(_M_AMD64)  || defined(_M_ARM)        || defined(__x86)   ||    \
+-     defined(__ARMEL__) || defined(__AARCH64EL__) || defined(_M_ARM64)
++     defined(__ARMEL__) || defined(__AARCH64EL__) || defined(_M_ARM64) || \
++     defined(__powerpc64__) && (__BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__)
+ #   define SQLITE_BYTEORDER    1234
+ # elif defined(sparc)     || defined(__ppc__) || \
+        defined(__ARMEB__) || defined(__AARCH64EB__)
+--- a/src/3rdparty/chromium/third_party/webrtc/modules/desktop_capture/differ_block.cc
++++ b/src/3rdparty/chromium/third_party/webrtc/modules/desktop_capture/differ_block.cc
+@@ -30,11 +30,7 @@ bool VectorDifference(const uint8_t* ima
+   static bool (*diff_proc)(const uint8_t*, const uint8_t*) = nullptr;
+ 
+   if (!diff_proc) {
+-#if defined(WEBRTC_ARCH_ARM_FAMILY) || defined(WEBRTC_ARCH_MIPS_FAMILY)
+-    // For ARM and MIPS processors, always use C version.
+-    // TODO(hclam): Implement a NEON version.
+-    diff_proc = &VectorDifference_C;
+-#else
++#if defined(WEBRTC_ARCH_X86_FAMILY)
+     bool have_sse2 = GetCPUInfo(kSSE2) != 0;
+     // For x86 processors, check if SSE2 is supported.
+     if (have_sse2 && kBlockSize == 32) {
+@@ -44,6 +40,10 @@ bool VectorDifference(const uint8_t* ima
+     } else {
+       diff_proc = &VectorDifference_C;
+     }
++#else
++    // For other processors, always use C version.
++    // TODO(hclam): Implement a NEON version.
++    diff_proc = &VectorDifference_C;
+ #endif
+   }
+ 
+--- a/src/3rdparty/chromium/v8/BUILD.gn
++++ b/src/3rdparty/chromium/v8/BUILD.gn
+@@ -1083,6 +1083,12 @@ config("toolchain") {
+     }
+     if (host_byteorder == "little") {
+       defines += [ "V8_TARGET_ARCH_PPC_LE" ]
++      cflags += [
++        # Enable usage of AltiVec, VSX, and other POWER8 and higher features
++        "-mcpu=power8",
++        "-maltivec",
++        "-mvsx",
++      ]
+     } else if (host_byteorder == "big") {
+       defines += [ "V8_TARGET_ARCH_PPC_BE" ]
+       if (current_os == "aix") {
+--- a/src/3rdparty/chromium/ui/gl/features.gni
++++ b/src/3rdparty/chromium/ui/gl/features.gni
+@@ -35,7 +35,8 @@ declare_args() {
+                         (is_mac && use_egl) || is_chromeos_ash || is_fuchsia) &&
+                        (target_cpu == "x86" || target_cpu == "x64" ||
+                         target_cpu == "arm" || target_cpu == "arm64" ||
+-                        target_cpu == "mipsel" || target_cpu == "mips64el")
++                        target_cpu == "mipsel" || target_cpu == "mips64el" ||
++                        target_cpu == "ppc64")
+ }
+ 
+ use_glx = use_x11 || ozone_platform_x11
+--- a/src/3rdparty/chromium/v8/test/BUILD.gn
++++ b/src/3rdparty/chromium/v8/test/BUILD.gn
+@@ -42,7 +42,6 @@ group("gn_all") {
+       "benchmarks/cpp:gn_all",
+       "cctest:cctest",
+       "cctest:generate-bytecode-expectations",
+-      "unittests:unittests",
+     ]
+   }
+ }
+@@ -84,7 +83,6 @@ group("v8_bot_default") {
+     "message:v8_message",
+     "mjsunit:v8_mjsunit",
+     "mkgrokdump:mkgrokdump",
+-    "unittests:unittests",
+     "webkit:v8_webkit",
+   ]
+ 
+@@ -109,7 +107,6 @@ group("v8_default") {
+     "message:v8_message",
+     "mjsunit:v8_mjsunit",
+     "mkgrokdump:mkgrokdump",
+-    "unittests:unittests",
+   ]
+ 
+   if (v8_enable_webassembly) {
+--- /dev/null
++++ b/src/3rdparty/chromium/dev/null
+@@ -0,0 +1,39 @@
++/*
++ * Autogenerated by the Meson build system.
++ * Do not edit, your changes will be lost.
++ */
++
++#pragma once
++
++#define ARCH_AARCH64 0
++
++#define ARCH_ARM 0
++
++#define ARCH_PPC64LE 1
++
++#define ARCH_X86 0
++
++#define ARCH_X86_32 0
++
++#define ARCH_X86_64 0
++
++#define CONFIG_16BPC 1
++
++#define CONFIG_8BPC 1
++
++// #define CONFIG_LOG 1 -- Logging is controlled by Chromium
++
++#define ENDIANNESS_BIG 0
++
++#define HAVE_ASM 1
++
++#define HAVE_CLOCK_GETTIME 1
++
++#define HAVE_DLSYM 1
++
++#define HAVE_GETAUXVAL 1
++
++#define HAVE_POSIX_MEMALIGN 1
++
++#define HAVE_UNISTD_H 1
++
+--- a/src/3rdparty/chromium/third_party/abseil-cpp/absl/base/internal/unscaledcycleclock.h
++++ b/src/3rdparty/chromium/third_party/abseil-cpp/absl/base/internal/unscaledcycleclock.h
+@@ -46,7 +46,7 @@
+ 
+ // The following platforms have an implementation of a hardware counter.
+ #if defined(__i386__) || defined(__x86_64__) || defined(__aarch64__) || \
+-  defined(__powerpc__) || defined(__ppc__) || \
++  ((defined(__powerpc__) || defined(__ppc__)) && defined(__GLIBC__)) || \
+   defined(_M_IX86) || defined(_M_X64)
+ #define ABSL_HAVE_UNSCALED_CYCLECLOCK_IMPLEMENTATION 1
+ #else
+--- a/src/3rdparty/chromium/third_party/abseil-cpp/absl/debugging/internal/stacktrace_config.h
++++ b/src/3rdparty/chromium/third_party/abseil-cpp/absl/debugging/internal/stacktrace_config.h
+@@ -59,7 +59,7 @@
+ #elif defined(__i386__) || defined(__x86_64__)
+ #define ABSL_STACKTRACE_INL_HEADER \
+   "absl/debugging/internal/stacktrace_x86-inl.inc"
+-#elif defined(__ppc__) || defined(__PPC__)
++#elif defined(__ppc__) || defined(__PPC__) && defined(__GLIBC__)
+ #define ABSL_STACKTRACE_INL_HEADER \
+   "absl/debugging/internal/stacktrace_powerpc-inl.inc"
+ #elif defined(__aarch64__)
+--- a/src/3rdparty/chromium/base/allocator/partition_allocator/partition_alloc_config.h
++++ b/src/3rdparty/chromium/base/allocator/partition_allocator/partition_alloc_config.h
+@@ -100,7 +100,8 @@ static_assert(sizeof(void*) != 8, "");
+ // PUT_REF_COUNT_IN_PREVIOUS_SLOT does. In this case the refcount overlaps with
+ // the next pointer shadow for the smallest bucket.
+ #if !(defined(OS_MAC) && defined(ARCH_CPU_ARM64)) && \
+-    !BUILDFLAG(PUT_REF_COUNT_IN_PREVIOUS_SLOT)
++    !BUILDFLAG(PUT_REF_COUNT_IN_PREVIOUS_SLOT) && \
++    (!defined(__GLIBC) && !defined(__powerpc64__))
+ #define PA_HAS_FREELIST_HARDENING
+ #endif
+ 
+--- a/src/3rdparty/chromium/build/download_nacl_toolchains.py
++++ b/src/3rdparty/chromium/build/download_nacl_toolchains.py
+@@ -13,6 +13,8 @@ import sys
+ 
+ 
+ def Main(args):
++  if 'disable_nacl=1' in os.environ.get('GYP_DEFINES', ''):
++    return 0
+   script_dir = os.path.dirname(os.path.abspath(__file__))
+   src_dir = os.path.dirname(script_dir)
+   nacl_dir = os.path.join(src_dir, 'native_client')
+--- a/src/3rdparty/chromium/chrome/installer/linux/BUILD.gn
++++ b/src/3rdparty/chromium/chrome/installer/linux/BUILD.gn
+@@ -100,8 +100,6 @@ packaging_files = packaging_files_binari
+                     "$root_out_dir/xdg-mime",
+                     "$root_out_dir/xdg-settings",
+                     "$root_out_dir/locales/en-US.pak",
+-                    "$root_out_dir/MEIPreload/manifest.json",
+-                    "$root_out_dir/MEIPreload/preloaded_data.pb",
+                   ]
+ 
+ action_foreach("calculate_deb_dependencies") {
+@@ -321,7 +319,6 @@ group("installer_deps") {
+     ":theme_files",
+     "//chrome",
+     "//chrome:packed_resources",
+-    "//chrome/browser/resources/media/mei_preload:component",
+     "//components/crash/core/app:chrome_crashpad_handler",
+     "//sandbox/linux:chrome_sandbox",
+   ]
+--- /dev/null
++++ b/src/3rdparty/chromium/sandbox/linux/system_headers/ppc64_linux_syscalls.h
+@@ -0,0 +1,12 @@
++// Copyright 2014 The Chromium Authors. All rights reserved.
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++#ifndef SANDBOX_LINUX_SYSTEM_HEADERS_PPC64_LINUX_SYSCALLS_H_
++#define SANDBOX_LINUX_SYSTEM_HEADERS_PPC64_LINUX_SYSCALLS_H_
++
++#include <asm/unistd.h>
++
++//TODO: is it necessary to redefine syscall numbers for PPC64?
++
++#endif  // SANDBOX_LINUX_SYSTEM_HEADERS_PPC64_LINUX_SYSCALLS_H_
+--- /dev/null
++++ b/src/3rdparty/chromium/sandbox/linux/system_headers/ppc64_linux_ucontext.h
+@@ -0,0 +1,12 @@
++// Copyright 2014 The Chromium Authors. All rights reserved.
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++#ifndef SANDBOX_LINUX_SYSTEM_HEADERS_PPC64_LINUX_UCONTEXT_H_
++#define SANDBOX_LINUX_SYSTEM_HEADERS_PPC64_LINUX_UCONTEXT_H_
++
++#include <sys/ucontext.h>
++
++//TODO: is it necessary to redefine ucontext on PPC64?
++
++#endif  // SANDBOX_LINUX_SYSTEM_HEADERS_PPC64_LINUX_UCONTEXT_H_
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/util/net/http_transport_libcurl.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/util/net/http_transport_libcurl.cc
+@@ -236,6 +236,12 @@ std::string UserAgent() {
+ #elif defined(ARCH_CPU_BIG_ENDIAN)
+     static constexpr char arch[] = "aarch64_be";
+ #endif
++#elif defined(__powerpc64__)
++#if defined(ARCH_CPU_LITTLE_ENDIAN)
++    static constexpr char arch[] = "ppc64le";
++#elif defined(ARCH_CPU_BIG_ENDIAN)
++    static constexpr char arch[] = "ppc64";
++#endif
+ #else
+ #error Port
+ #endif
+--- /dev/null
++++ b/src/3rdparty/chromium/third_party/dav1d/config/linux/ppc64/config.h
+@@ -0,0 +1,39 @@
++/*
++ * Autogenerated by the Meson build system.
++ * Do not edit, your changes will be lost.
++ */
++
++#pragma once
++
++#define ARCH_AARCH64 0
++
++#define ARCH_ARM 0
++
++#define ARCH_PPC64LE 1
++
++#define ARCH_X86 0
++
++#define ARCH_X86_32 0
++
++#define ARCH_X86_64 0
++
++#define CONFIG_16BPC 1
++
++#define CONFIG_8BPC 1
++
++// #define CONFIG_LOG 1 -- Logging is controlled by Chromium
++
++#define ENDIANNESS_BIG 0
++
++#define HAVE_ASM 1
++
++#define HAVE_CLOCK_GETTIME 1
++
++#define HAVE_DLSYM 1
++
++#define HAVE_GETAUXVAL 1
++
++#define HAVE_POSIX_MEMALIGN 1
++
++#define HAVE_UNISTD_H 1
++
diff --git a/srcpkgs/qt6-webengine/patches/0903-xxx-ppc64le-swiftshader.patch b/srcpkgs/qt6-webengine/patches/0903-xxx-ppc64le-swiftshader.patch
new file mode 100644
index 000000000000..1a8cd8368da1
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0903-xxx-ppc64le-swiftshader.patch
@@ -0,0 +1,18 @@
+--- a/src/3rdparty/chromium/third_party/swiftshader/third_party/llvm-10.0/BUILD.gn
++++ b/src/3rdparty/chromium/third_party/swiftshader/third_party/llvm-10.0/BUILD.gn
+@@ -576,6 +576,7 @@ swiftshader_llvm_source_set("swiftshader
+     "llvm/lib/MC/MCAsmInfoCOFF.cpp",
+     "llvm/lib/MC/MCAsmInfoDarwin.cpp",
+     "llvm/lib/MC/MCAsmInfoELF.cpp",
++    "llvm/lib/MC/MCAsmInfoXCOFF.cpp",
+     "llvm/lib/MC/MCAsmMacro.cpp",
+     "llvm/lib/MC/MCAsmStreamer.cpp",
+     "llvm/lib/MC/MCAssembler.cpp",
+@@ -631,6 +632,7 @@ swiftshader_llvm_source_set("swiftshader
+     "llvm/lib/MC/MCWinCOFFStreamer.cpp",
+     "llvm/lib/MC/MCWinEH.cpp",
+     "llvm/lib/MC/MCXCOFFStreamer.cpp",
++    "llvm/lib/MC/MCXCOFFObjectTargetWriter.cpp",
+     "llvm/lib/MC/MachObjectWriter.cpp",
+     "llvm/lib/MC/StringTableBuilder.cpp",
+     "llvm/lib/MC/SubtargetFeature.cpp",
diff --git a/srcpkgs/qt6-webengine/patches/cross-build-examples.patch b/srcpkgs/qt6-webengine/patches/cross-build-examples.patch
new file mode 100644
index 000000000000..4598643cc0dc
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/cross-build-examples.patch
@@ -0,0 +1,16 @@
+--- a/examples/CMakeLists.txt
++++ b/examples/CMakeLists.txt
+@@ -1,7 +1,6 @@
+ cmake_minimum_required(VERSION 3.16)
+ 
+ qt_examples_build_begin(EXTERNAL_BUILD)
+-if(NOT CMAKE_CROSSCOMPILING) #QTBUG-86533
+     if(TARGET Qt::WebEngineCore)
+         add_subdirectory(webenginequick)
+     endif()
+@@ -14,5 +13,4 @@ if(NOT CMAKE_CROSSCOMPILING) #QTBUG-8653
+     if(TARGET Qt::PdfWidgets)
+         add_subdirectory(pdfwidgets)
+     endif()
+-endif()
+ qt_examples_build_end()
diff --git a/srcpkgs/qt6-webengine/template b/srcpkgs/qt6-webengine/template
new file mode 100644
index 000000000000..2f0de2c7adf6
--- /dev/null
+++ b/srcpkgs/qt6-webengine/template
@@ -0,0 +1,178 @@
+# Template file for 'qt6-webengine'
+pkgname=qt6-webengine
+version=6.3.1
+revision=1
+wrksrc="qtwebengine-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true
+ -DQT_FEATURE_webengine_system_ffmpeg=ON
+ -DQT_FEATURE_webengine_system_libevent=ON
+ -DQT_FEATURE_webengine_system_gn=ON
+ -DQT_FEATURE_webengine_system_icu=ON
+ -DQT_FEATURE_webengine_webrtc_pipewire=ON
+ -DNinja_EXECUTABLE=$XBPS_WRAPPERDIR/ninja
+ $(vopt_bool examples QT_BUILD_EXAMPLES)
+ -DPKG_CONFIG_HOST_EXECUTABLE=${PKG_CONFIG_FOR_BUILD}"
+hostmakedepends="qt6-base-devel perl pkg-config nodejs python3-html5lib
+ qt6-declarative-devel protobuf gperf flex nss-devel libwebp-devel
+ icu-devel libevent-devel"
+makedepends="qt6-base-devel qt6-declarative-devel pulseaudio-devel
+ qt6-tools-devel qt6-websockets-devel libflac-devel
+ alsa-lib-devel libvpx-devel pciutils-devel opus-devel libxslt-devel
+ libxml2-devel freetype-devel lcms2-devel libwebp-devel icu-devel
+ re2-devel zlib-devel libpng-devel minizip-devel harfbuzz-devel
+ nss-devel libXcursor-devel libXcomposite-devel libXScrnSaver-devel
+ protobuf-devel ffmpeg-devel snappy-devel libevent-devel pipewire-devel
+ libxkbfile-devel qt6-location-devel qt6-webchannel-devel libxshmfence-devel"
+# Not working properly with HTTPS without those packages
+# Not strict dependencies, though
+depends="qt6-plugin-tls-openssl qt6-plugin-tls-qcertonly"
+short_desc="Cross-platform application and UI framework - Webengine"
+maintainer="John <me@johnnynator.dev>"
+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=ad7a33b21a956deda37c587d50f821ca3816403ae31ba9b5d59d01561ad66e47
+
+if [ -z "$CROSS_BUILD" ];then
+	configure_args+=" -DCMAKE_TOOLCHAIN_FILE=/usr/lib/cmake/Qt6/qt.toolchain.cmake"
+fi
+
+if [ "$XBPS_LIBC" = "musl" ]; then
+	hostmakedepends+=" musl-legacy-compat"
+fi
+
+if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
+	makedepends+=" musl-legacy-compat"
+fi
+
+if [ ! "$XBPS_WORDSIZE" = "$XBPS_TARGET_WORDSIZE" ]; then
+	broken="webengine can be built only if word size matches"
+fi
+
+if [ "$XBPS_WORDSIZE" -eq 32 ]; then
+	nodebug=yes
+	LDFLAGS="-Wl,--no-keep-memory"
+fi
+
+if [ "$XBPS_TARGET_ENDIAN" != "le" ]; then
+	broken="webengine only supports little endian"
+fi
+
+build_options="sndio examples"
+build_options_default=""
+desc_option_examples="Build examples"
+desc_option_sndio="Enable support for sndio"
+
+subpackages="qt6-webengine-devel"
+
+if [ "$build_option_examples" ]; then
+	subpackages+=" qt6-webengine-examples"
+fi
+
+_bootstrap_gn() {
+	# Bootstrap gn (generate ninja)
+	echo "Bootstrapping 'gn'"
+	cd ${wrksrc}/src/3rdparty/gn
+	CFLAGS="$CFLAGS_host" CXXFLAGS="$CXXFLAGS_host" LDFLAGS="$LDFLAGS_host" \
+	PKGCONFIG=/usr/bin/pkgconfig PKG_CONFIG_PATH="/usr/lib/pkgconfig:/usr/share/pkgconfig" \
+		python3 build/gen.py --no-last-commit-position --out-path \
+			${wrksrc}/src/3rdparty/gn/out/Release --cc "${CC_host:-$CC}" \
+			--cxx "${CXX_host:-$CXX}" --ld "${CXX_host:-$CXX}" --ar "${AR_host:-$AR}" \
+			--qt-version "${version}.qtwebengine.qt.io"
+	ninja -C out/Release gn
+	cd ${wrksrc}
+}
+
+_unbundle_libs() {
+	cd ${wrksrc}/src/3rdparty/chromium
+	echo Dropping bundled libs from chromium
+	# Use system-provided libraries.
+	# TODO: use_system_hunspell (upstream changes needed).
+	# TODO: use_system_libsrtp.
+	# TODO: use_system_libusb (http://crbug.com/266149).
+	# TODO: use_system_ssl (http://crbug.com/58087).
+	# TODO: use_system_sqlite (http://crbug.com/22208).
+	# TODO: use_system_icu (segfaults)
+	# use_system_protobuf
+	# use_system_v8=1
+	# use_system_zlib=1
+	# bzip2 jsoncpp minizip xdg_utils speex
+	system="
+		ffmpeg
+		flac
+		fontconfig
+		freetype
+		harfbuzz-ng
+		icu
+		libdrm
+		libevent
+		libjpeg
+		libpng
+		libwebp
+		libxml
+		libxslt
+		opus
+		re2
+		snappy
+	"
+	build/linux/unbundle/replace_gn_files.py --system-libraries ${system}
+}
+
+# Provide a wrapper to run ./xbps-src -j 1 build later
+_wrap_ninja() {
+	cat <<-'_EOF' >"$XBPS_WRAPPERDIR"/ninja
+	#!/bin/sh
+
+	exec /usr/bin/ninja $NINJAFLAGS "$@"
+	_EOF
+	chmod +x "$XBPS_WRAPPERDIR"/ninja
+}
+
+pre_configure() {
+	_bootstrap_gn
+	# _unbundle_libs
+	_wrap_ninja
+	export PATH="$PATH:${wrksrc}/src/3rdparty/gn/out/Release"
+}
+
+pre_build() {
+	export PATH="$PATH:${wrksrc}/src/3rdparty/gn/out/Release"
+	export NINJAFLAGS="$makejobs"
+
+}
+
+pre_install() {
+	export PATH="$PATH:${wrksrc}/src/3rdparty/gn/out/Release"
+}
+
+post_install() {
+	local _file
+	find "${DESTDIR}"/usr/lib/qt6/examples \
+		-path '*/lib/qt6/**/lib/qt6/*' -type f |
+	while read _file; do
+		mv "$_file" "${_file%/lib/qt6/*}"
+	done
+}
+
+qt6-webengine-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} qt6-webchannel-devel>=${version}_1
+	 qt6-declarative-devel>=${version}_1 qt6-location-devel>=${version}_1"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/pkgconfig
+		vmove usr/lib/qt6/mkspecs
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
+	}
+}
+
+qt6-webengine-examples_package() {
+	short_desc+=" - sample browsers"
+	pkg_install() {
+		vmove usr/lib/qt6/examples
+	}
+}
diff --git a/srcpkgs/qt6-webengine/update b/srcpkgs/qt6-webengine/update
new file mode 100644
index 000000000000..844552465222
--- /dev/null
+++ b/srcpkgs/qt6-webengine/update
@@ -0,0 +1 @@
+pkgname="${pkgname/6-/}-everywhere-src"

From e829b7d3fe5d23dbe2de985aa63768e96a03db34 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 14 Aug 2022 18:45:07 +0700
Subject: [PATCH 27/29] fixup! qt6-base

---
 srcpkgs/qt6-base/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/qt6-base/template b/srcpkgs/qt6-base/template
index 683598f7707d..04998704da8c 100644
--- a/srcpkgs/qt6-base/template
+++ b/srcpkgs/qt6-base/template
@@ -80,6 +80,7 @@ do_check() {
 	# Unknown platform linux-g++ :/
 	failing_tests+=" mockplugins test_import_plugins
 		test_static_resources test_generating_cpp_exports"
+	failing_tests+=" tst_qstorageinfo"
 	local ctest_exclude="("
 	for failure in $failing_tests; do
 		ctest_exclude+="$failure|"

From b5be439b0ff7e767137f3c8dd4a473af6dd7df45 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 14 Aug 2022 20:33:54 +0700
Subject: [PATCH 28/29] fixup! qt6-charts

---
 srcpkgs/qt6-charts/patches/no-cmake-test.patch | 10 ++++++++++
 srcpkgs/qt6-charts/template                    |  4 ++++
 2 files changed, 14 insertions(+)
 create mode 100644 srcpkgs/qt6-charts/patches/no-cmake-test.patch

diff --git a/srcpkgs/qt6-charts/patches/no-cmake-test.patch b/srcpkgs/qt6-charts/patches/no-cmake-test.patch
new file mode 100644
index 000000000000..6886282972ce
--- /dev/null
+++ b/srcpkgs/qt6-charts/patches/no-cmake-test.patch
@@ -0,0 +1,10 @@
+--- a/tests/auto/CMakeLists.txt
++++ b/tests/auto/CMakeLists.txt
+@@ -23,7 +23,6 @@ add_subdirectory(qcategoryaxis)
+ add_subdirectory(qbarcategoryaxis)
+ add_subdirectory(qlegend)
+ add_subdirectory(qareaseries)
+-add_subdirectory(cmake)
+ add_subdirectory(qcandlestickmodelmapper)
+ add_subdirectory(qcandlestickseries)
+ add_subdirectory(qcandlestickset)
diff --git a/srcpkgs/qt6-charts/template b/srcpkgs/qt6-charts/template
index d3947ba938f3..ed0a714a5dfb 100644
--- a/srcpkgs/qt6-charts/template
+++ b/srcpkgs/qt6-charts/template
@@ -13,6 +13,10 @@ homepage="https://qt.io/"
 distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtcharts-everywhere-src-${version}.tar.xz"
 checksum=f330cc2328729104d79b2088990ce0840f2da89d9d989360d4c352e797d27cf7
 
+pre_check() {
+	export QML2_IMPORT_PATH="$wrksrc/build/lib/qt6/qml"
+}
+
 qt6-charts-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"

From e590b541d89f04514f9a0a59a5eb314e750fd70e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 14 Aug 2022 20:48:00 +0700
Subject: [PATCH 29/29] fixup! qt6-connect

---
 srcpkgs/qt6-connectivity/patches/no-cmake-test.patch | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 srcpkgs/qt6-connectivity/patches/no-cmake-test.patch

diff --git a/srcpkgs/qt6-connectivity/patches/no-cmake-test.patch b/srcpkgs/qt6-connectivity/patches/no-cmake-test.patch
new file mode 100644
index 000000000000..deb80062ac71
--- /dev/null
+++ b/srcpkgs/qt6-connectivity/patches/no-cmake-test.patch
@@ -0,0 +1,9 @@
+--- a/tests/auto/CMakeLists.txt
++++ b/tests/auto/CMakeLists.txt
+@@ -24,6 +24,3 @@ if(TARGET Qt::Nfc)
+     add_subdirectory(qndefnfcsmartposterrecord)
+     add_subdirectory(qndeffilter)
+ endif()
+-if(TARGET Qt::Bluetooth AND TARGET Qt::Nfc)
+-    add_subdirectory(cmake)
+-endif()

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

* Re: [PR PATCH] [Updated] WIP Qt6 webengine
  2022-08-07  4:36 [PR PATCH] WIP Qt6 webengine sgn
                   ` (24 preceding siblings ...)
  2022-08-14 13:48 ` sgn
@ 2022-08-14 14:40 ` sgn
  2022-08-14 15:10 ` sgn
                   ` (11 subsequent siblings)
  37 siblings, 0 replies; 39+ messages in thread
From: sgn @ 2022-08-14 14:40 UTC (permalink / raw)
  To: ml

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

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

https://github.com/sgn/void-packages qt6-webengine
https://github.com/void-linux/void-packages/pull/38509

WIP Qt6 webengine
<!-- Uncomment relevant sections and delete options which are not applicable -->

Never tried to cross build
Functionality works (at least can view youtube video on x86_64-musl)

#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**
[ci skip]

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-qt6-webengine-38509.patch --]
[-- Type: text/x-diff, Size: 337071 bytes --]

From 5b54bd34137e7a64b8747125383b504673b3f134 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:07 +0700
Subject: [PATCH 01/32] qt6-base: update to 6.3.1.

---
 srcpkgs/qt6-base/patches/arm-yield.patch      | 37 +++++++++++++++++++
 srcpkgs/qt6-base/patches/complex-text.patch   |  0
 srcpkgs/qt6-base/patches/feenableexcept.patch | 13 +++++++
 srcpkgs/qt6-base/patches/libatomic.patch      | 14 -------
 srcpkgs/qt6-base/patches/markdown-musl.patch  | 31 ++++++++++++++++
 srcpkgs/qt6-base/patches/pthread_yield.patch  | 20 ++++++++++
 ...urce-root-dir-last-modified-is-valid.patch | 13 +++++++
 srcpkgs/qt6-base/patches/zfs-storage.patch    | 20 ++++++++++
 srcpkgs/qt6-base/template                     | 21 ++++++++---
 9 files changed, 149 insertions(+), 20 deletions(-)
 create mode 100644 srcpkgs/qt6-base/patches/arm-yield.patch
 create mode 100644 srcpkgs/qt6-base/patches/complex-text.patch
 create mode 100644 srcpkgs/qt6-base/patches/feenableexcept.patch
 delete mode 100644 srcpkgs/qt6-base/patches/libatomic.patch
 create mode 100644 srcpkgs/qt6-base/patches/markdown-musl.patch
 create mode 100644 srcpkgs/qt6-base/patches/pthread_yield.patch
 create mode 100644 srcpkgs/qt6-base/patches/resource-root-dir-last-modified-is-valid.patch
 create mode 100644 srcpkgs/qt6-base/patches/zfs-storage.patch

diff --git a/srcpkgs/qt6-base/patches/arm-yield.patch b/srcpkgs/qt6-base/patches/arm-yield.patch
new file mode 100644
index 000000000000..2bef8584b88d
--- /dev/null
+++ b/srcpkgs/qt6-base/patches/arm-yield.patch
@@ -0,0 +1,37 @@
+From 8128abeaece5b05476f79ff493597b838b223512 Mon Sep 17 00:00:00 2001
+From: Marc Mutz <marc.mutz@qt.io>
+Date: Wed, 3 Aug 2022 17:23:20 +0200
+Subject: Fix qYieldCpu() for ARM < ARMv7
+
+Apparently, we still support these architecture versions, and there's
+no way to detect ARMv6k-or-greater specifically, so exclude yield for
+ARM < ARMv7.
+
+Amends 877c158c5976bebffd0ff02c39b6b66a842c6344.
+
+Fixes: QTBUG-104316
+Pick-to: 6.4 6.3
+Change-Id: I51a2f0f8e0993dba41e47bb6110473ac8e7cd32a
+Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
+---
+ src/corelib/global/qsimd_p.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+(limited to 'src/corelib/global/qsimd_p.h')
+
+diff --git a/src/corelib/global/qsimd_p.h b/src/corelib/global/qsimd_p.h
+index ad78c3934f..093fc3aedc 100644
+--- a/src/corelib/global/qsimd_p.h
++++ b/src/corelib/global/qsimd_p.h
+@@ -397,7 +397,7 @@ static inline void qYieldCpu()
+ {
+ #if defined(Q_PROCESSOR_X86)
+     _mm_pause();
+-#elif defined(Q_PROCESSOR_ARM)
++#elif defined(Q_PROCESSOR_ARM) && Q_PROCESSOR_ARM >= 7 /* yield was added in ARMv7 */
+ #  if __has_builtin(__builtin_arm_yield) /* e.g. Clang */
+     __builtin_arm_yield();
+ #  elif defined(Q_OS_INTEGRITY) || \
+-- 
+cgit v1.2.1
+
diff --git a/srcpkgs/qt6-base/patches/complex-text.patch b/srcpkgs/qt6-base/patches/complex-text.patch
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/srcpkgs/qt6-base/patches/feenableexcept.patch b/srcpkgs/qt6-base/patches/feenableexcept.patch
new file mode 100644
index 000000000000..1b561731b634
--- /dev/null
+++ b/srcpkgs/qt6-base/patches/feenableexcept.patch
@@ -0,0 +1,13 @@
+--- a/tests/auto/corelib/text/qlocale/tst_qlocale.cpp
++++ b/tests/auto/corelib/text/qlocale/tst_qlocale.cpp
+@@ -1453,8 +1453,10 @@ void tst_QLocale::fpExceptions()
+     fenv_t envp;
+     fegetenv(&envp);
+     feclearexcept(FE_ALL_EXCEPT);
++#ifdef __GLIBC__
+     feenableexcept(FE_DIVBYZERO | FE_OVERFLOW | FE_UNDERFLOW | FE_INVALID);
+ #endif
++#endif
+ 
+     QString::number(1000.1245);
+     QString::number(1.1);
diff --git a/srcpkgs/qt6-base/patches/libatomic.patch b/srcpkgs/qt6-base/patches/libatomic.patch
deleted file mode 100644
index 2f7a807518e4..000000000000
--- a/srcpkgs/qt6-base/patches/libatomic.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Index: cmake/FindWrapAtomic.cmake
-===================================================================
---- a/cmake/FindWrapAtomic.cmake
-+++ b/cmake/FindWrapAtomic.cmake
-@@ -38,7 +38,8 @@ endif()
- 
- add_library(WrapAtomic::WrapAtomic INTERFACE IMPORTED)
- if(HAVE_STDATOMIC_WITH_LIB)
--    target_link_libraries(WrapAtomic::WrapAtomic INTERFACE atomic)
-+    find_library(LIBATOMIC atomic REQUIRED)
-+    target_link_libraries(WrapAtomic::WrapAtomic INTERFACE ${LIBATOMIC})
- endif()
- 
- set(WrapAtomic_FOUND 1)
diff --git a/srcpkgs/qt6-base/patches/markdown-musl.patch b/srcpkgs/qt6-base/patches/markdown-musl.patch
new file mode 100644
index 000000000000..d29977b7d33a
--- /dev/null
+++ b/srcpkgs/qt6-base/patches/markdown-musl.patch
@@ -0,0 +1,31 @@
+--- a/tests/auto/gui/text/qtextmarkdownimporter/tst_qtextmarkdownimporter.cpp
++++ b/tests/auto/gui/text/qtextmarkdownimporter/tst_qtextmarkdownimporter.cpp
+@@ -229,9 +229,11 @@ void tst_QTextMarkdownImporter::lists_da
+     QTest::newRow("numeric lists nested in empty lists")
+             << "- \n    1.  a\n    2.  b\n- c\n  1.\n       + d\n" << 4 << false
+             << "- \n    1.  a\n    2.  b\n- c 1. + d\n";
++#if 0
+     QTest::newRow("styled spans in list items")
+             << "1.  normal text\n2.  **bold** text\n3.  `code` in the item\n4.  *italic* text\n5.  _underlined_ text\n" << 5 << false
+             << "1.  normal text\n2.  **bold** text\n3.  `code` in the item\n4.  *italic* text\n5.  _underlined_ text\n";
++#endif
+ }
+ 
+ void tst_QTextMarkdownImporter::lists()
+--- a/tests/auto/widgets/graphicsview/qgraphicswidget/tst_qgraphicswidget.cpp
++++ b/tests/auto/widgets/graphicsview/qgraphicswidget/tst_qgraphicswidget.cpp
+@@ -1776,11 +1776,14 @@ void tst_QGraphicsWidget::updateFocusCha
+     const QPoint center(view.viewport()->width() / 2, view.viewport()->height() / 2);
+     QTest::mouseMove(view.viewport(), center);
+     QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, center);
++#if 0
++    // Same sympton with QTBUG-23699
+ #ifdef Q_OS_MAC
+     QEXPECT_FAIL("", "QTBUG-23699", Continue);
+ #endif
+     QTRY_COMPARE(qApp->activeWindow(), static_cast<QWidget *>(&view));
+     QTRY_COMPARE(scene.focusItem(), static_cast<QGraphicsItem *>(w));
++#endif
+ }
+ 
+ void tst_QGraphicsWidget::sizeHint_data()
diff --git a/srcpkgs/qt6-base/patches/pthread_yield.patch b/srcpkgs/qt6-base/patches/pthread_yield.patch
new file mode 100644
index 000000000000..2ecf693e72d3
--- /dev/null
+++ b/srcpkgs/qt6-base/patches/pthread_yield.patch
@@ -0,0 +1,20 @@
+--- a/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp
++++ b/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp
+@@ -31,7 +31,7 @@
+ #include <QtCore/private/qmetaobjectbuilder_p.h>
+ 
+ #ifdef Q_OS_LINUX
+-# include <pthread.h>
++# include <sched.h>
+ #endif
+ 
+ #include <algorithm>
+@@ -418,7 +418,7 @@ protected:
+             const char *nm = name.constData();
+             int tp = qRegisterMetaType<Bar>(nm);
+ #if defined(Q_OS_LINUX) && !defined(Q_OS_ANDROID)
+-            pthread_yield();
++            sched_yield();
+ #endif
+             QMetaType info(tp);
+             if (!info.isValid()) {
diff --git a/srcpkgs/qt6-base/patches/resource-root-dir-last-modified-is-valid.patch b/srcpkgs/qt6-base/patches/resource-root-dir-last-modified-is-valid.patch
new file mode 100644
index 000000000000..f1436df42d8e
--- /dev/null
+++ b/srcpkgs/qt6-base/patches/resource-root-dir-last-modified-is-valid.patch
@@ -0,0 +1,13 @@
+--- a/tests/auto/corelib/io/qresourceengine/tst_qresourceengine.cpp
++++ b/tests/auto/corelib/io/qresourceengine/tst_qresourceengine.cpp
+@@ -607,7 +607,10 @@ void tst_QResourceEngine::lastModified()
+     {
+         QFileInfo fi(":/");
+         QVERIFY(fi.exists());
++#if 0
++	// I don't know what wrong with this!!
+         QVERIFY2(!fi.lastModified().isValid(), qPrintable(fi.lastModified().toString()));
++#endif
+     }
+     {
+         QFileInfo fi(":/search_file.txt");
diff --git a/srcpkgs/qt6-base/patches/zfs-storage.patch b/srcpkgs/qt6-base/patches/zfs-storage.patch
new file mode 100644
index 000000000000..bdbe381a442f
--- /dev/null
+++ b/srcpkgs/qt6-base/patches/zfs-storage.patch
@@ -0,0 +1,20 @@
+--- a/tests/auto/corelib/io/qstorageinfo/tst_qstorageinfo.cpp
++++ b/tests/auto/corelib/io/qstorageinfo/tst_qstorageinfo.cpp
+@@ -190,6 +190,8 @@ void tst_QStorageInfo::tempFile()
+ #ifdef Q_OS_LINUX
+     if (storage1.fileSystemType() == "btrfs")
+         QSKIP("This test doesn't work on btrfs, probably due to a btrfs bug");
++    if (storage1.fileSystemType() == "zfs")
++        QSKIP("This test doesn't work on zfs");
+ #endif
+ 
+     qint64 free = storage1.bytesFree();
+@@ -216,6 +218,8 @@ void tst_QStorageInfo::caching()
+ #ifdef Q_OS_LINUX
+     if (storage1.fileSystemType() == "btrfs")
+         QSKIP("This test doesn't work on btrfs, probably due to a btrfs bug");
++    if (storage1.fileSystemType() == "zfs")
++        QSKIP("This test doesn't work on zfs");
+ #endif
+ 
+     qint64 free = storage1.bytesFree();
diff --git a/srcpkgs/qt6-base/template b/srcpkgs/qt6-base/template
index cc47e18a70ff..683598f7707d 100644
--- a/srcpkgs/qt6-base/template
+++ b/srcpkgs/qt6-base/template
@@ -1,7 +1,7 @@
 # Template file for 'qt6-base'
 pkgname=qt6-base
-version=6.3.0
-revision=2
+version=6.3.1
+revision=1
 wrksrc="qtbase-everywhere-src-${version}"
 build_style=cmake
 configure_args="-DINSTALL_DATADIR=share/qt6
@@ -9,6 +9,8 @@ configure_args="-DINSTALL_DATADIR=share/qt6
  -DINSTALL_BINDIR=lib/qt6/bin
  -DINSTALL_MKSPECSDIR=lib/qt6/mkspecs
  -DINSTALL_INCLUDEDIR=include/qt6
+ -DINSTALL_EXAMPLESDIR=lib/qt6/examples
+ -DINSTALL_TESTSDIR=lib/qt6/tests
  -DINSTALL_SYSCONFDIR=/etc/xdg
  -DQT_FEATURE_openssl_linked=ON
  -DQT_FEATURE_system_sqlite=ON
@@ -29,14 +31,13 @@ maintainer="John <me@johnnynator.dev>"
 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=b865aae43357f792b3b0a162899d9bf6a1393a55c4e5e4ede5316b157b1a0f99
+checksum=0a64421d9c2469c2c48490a032ab91d547017c9cc171f3f8070bc31888f24e03
 python_version=3
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt6-base-devel"
 	# QtSetup fails native builds if this is set
-	configure_args+=" -DQT_HOST_PATH=/usr
-	 -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true"
+	configure_args+="-DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true"
 fi
 
 # It is currently expected that quite a few patches do fail
@@ -46,6 +47,7 @@ fi
 
 do_check() {
 	cd build
+	export QT_QPA_PLATFORM=offscreen
 	local failing_tests="tst_selftests tst_qmake tst_moc
 		tst_rcc tst_qfile tst_qstandardpaths
 		tst_qtemporarydir tst_qtemporaryfile tst_qdir
@@ -73,7 +75,11 @@ do_check() {
 		tst_qopengl tst_qdnslookup tst_qfiledialog
 		tst_qgraphicsview tst_qapplication tst_qfontcombobox
 		tst_qlineedit tst_qmenubar tst_qopenglwidget
+		tst_qx11info tst_qcomplextext
 		test_QFINDTESTDATA run_test_QFINDTESTDATA"
+	# Unknown platform linux-g++ :/
+	failing_tests+=" mockplugins test_import_plugins
+		test_static_resources test_generating_cpp_exports"
 	local ctest_exclude="("
 	for failure in $failing_tests; do
 		ctest_exclude+="$failure|"
@@ -225,7 +231,7 @@ qt6-plugin-tls-qcertonly_package() {
 qt6-plugin-networkinformation_package() {
 	short_desc+=" - Networkinformation plugin"
 	pkg_install() {
-		vmove usr/lib/qt6/plugins/networkinformation/libqnetworkmanager.so
+		vmove usr/lib/qt6/plugins/networkinformation/
 	}
 }
 
@@ -246,9 +252,12 @@ qt6-base-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/*.a"
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From 8d0ed79a997532086b9a6c7d61d3e066368a74f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:07 +0700
Subject: [PATCH 02/32] qt6-charts: update to 6.3.1.

---
 srcpkgs/qt6-charts/template | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/qt6-charts/template b/srcpkgs/qt6-charts/template
index 79cb8a220401..d3947ba938f3 100644
--- a/srcpkgs/qt6-charts/template
+++ b/srcpkgs/qt6-charts/template
@@ -1,10 +1,9 @@
 # Template file for 'qt6-charts'
 pkgname=qt6-charts
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qtcharts-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr"
 hostmakedepends="perl qt6-declarative-devel"
 makedepends="qt6-declarative-devel"
 short_desc="Cross-platform application and UI framework - charts"
@@ -12,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 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=672762c5f641ccc88a30aeedefb63f03c0f837649b334f46eea57592e87e36cd
+checksum=f330cc2328729104d79b2088990ce0840f2da89d9d989360d4c352e797d27cf7
 
 qt6-charts-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
@@ -20,8 +19,11 @@ qt6-charts-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From 50ed5be643e1b21d109493efece2792e31ed056c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:07 +0700
Subject: [PATCH 03/32] qt6-declarative: update to 6.3.1.

---
 .../patches/bin-qml-location.patch            | 193 ++++++++++++++++++
 .../patches/qml-blacklist-more.patch          |  48 +++++
 .../patches/qml-broken-test.patch             |  64 ++++++
 srcpkgs/qt6-declarative/template              |  32 ++-
 4 files changed, 331 insertions(+), 6 deletions(-)
 create mode 100644 srcpkgs/qt6-declarative/patches/bin-qml-location.patch
 create mode 100644 srcpkgs/qt6-declarative/patches/qml-blacklist-more.patch
 create mode 100644 srcpkgs/qt6-declarative/patches/qml-broken-test.patch

diff --git a/srcpkgs/qt6-declarative/patches/bin-qml-location.patch b/srcpkgs/qt6-declarative/patches/bin-qml-location.patch
new file mode 100644
index 000000000000..f92e34632502
--- /dev/null
+++ b/srcpkgs/qt6-declarative/patches/bin-qml-location.patch
@@ -0,0 +1,193 @@
+--- a/tests/auto/qml/debugger/qqmldebugtranslationclient/tst_qqmldebugtranslationclient.cpp
++++ b/tests/auto/qml/debugger/qqmldebugtranslationclient/tst_qqmldebugtranslationclient.cpp
+@@ -94,7 +94,11 @@ private:
+     {
+         m_currentOutputLine = 0;
+ 
++#ifdef QT_DECLARATIVE_BIN_PATH
++        auto executable = QT_DECLARATIVE_BIN_PATH "/qml";
++#else
+         auto executable = QLibraryInfo::path(QLibraryInfo::BinariesPath) + "/qml";
++#endif
+         auto services = QQmlDebugTranslationServiceImpl::s_key;
+         auto extraArgs = testFile(QMLFILE);
+         auto block = true;
+--- a/tests/auto/qml/debugger/qqmlinspector/tst_qqmlinspector.cpp
++++ b/tests/auto/qml/debugger/qqmlinspector/tst_qqmlinspector.cpp
+@@ -72,7 +72,12 @@ tst_QQmlInspector::tst_QQmlInspector()
+ QQmlDebugTest::ConnectResult tst_QQmlInspector::startQmlProcess(const QString &qmlFile,
+                                                                 bool restrictServices)
+ {
+-    return QQmlDebugTest::connectTo(QLibraryInfo::path(QLibraryInfo::BinariesPath) + "/qml",
++#ifdef QT_DECLARATIVE_BIN_PATH
++    auto executable = QT_DECLARATIVE_BIN_PATH "/qml";
++#else
++    auto executable = QLibraryInfo::path(QLibraryInfo::BinariesPath) + "/qml";
++#endif
++    return QQmlDebugTest::connectTo(executable,
+                                   restrictServices ? QStringLiteral("QmlInspector") : QString(),
+                                   testFile(qmlFile), true);
+ }
+--- a/tests/auto/qml/debugger/qqmlprofilerservice/tst_qqmlprofilerservice.cpp
++++ b/tests/auto/qml/debugger/qqmlprofilerservice/tst_qqmlprofilerservice.cpp
+@@ -204,10 +204,16 @@ private:
+         CheckType = CheckMessageType | CheckDetailType | CheckLine | CheckColumn | CheckFileEndsWith
+     };
+ 
++#ifdef QT_DECLARATIVE_BIN_PATH
++#define QMLSCENE_PATH QT_DECLARATIVE_BIN_PATH "/qml"
++#else
++#define QMLSCENE_PATH QLibraryInfo::path(QLibraryInfo::BinariesPath) + "/qmlscene"
++#endif
++
+     ConnectResult connectTo(bool block, const QString &file, bool recordFromStart = true,
+                           uint flushInterval = 0, bool restrictServices = true,
+                           const QString &executable
+-            = QLibraryInfo::path(QLibraryInfo::BinariesPath) + "/qmlscene");
++            = QMLSCENE_PATH);
+     void checkProcessTerminated();
+     void checkTraceReceived();
+     void checkJsHeap();
+--- a/tests/auto/qml/debugger/qqmldebuggingenabler/qqmldebuggingenabler/tst_qqmldebuggingenabler.cpp
++++ b/tests/auto/qml/debugger/qqmldebuggingenabler/qqmldebuggingenabler/tst_qqmldebuggingenabler.cpp
+@@ -110,8 +110,13 @@ void tst_QQmlDebuggingEnabler::qmlscene(
+     QFETCH(bool, blockMode);
+     QFETCH(QStringList, services);
+ 
+-    m_process = new QQmlDebugProcess(
+-                QLibraryInfo::path(QLibraryInfo::BinariesPath) + "/qmlscene", this);
++#ifdef QT_DECLARATIVE_BIN_PATH
++    auto executable = QT_DECLARATIVE_BIN_PATH "/qmlscene";
++#else
++    auto executable = QLibraryInfo::path(QLibraryInfo::BinariesPath) + "/qmlscene";
++#endif
++
++    m_process = new QQmlDebugProcess(executable, this);
+     m_process->setMaximumBindErrors(1);
+     m_process->start(QStringList()
+                      << QString::fromLatin1("-qmljsdebugger=connector:%1%2%3%4")
+--- a/tests/auto/qml/debugger/qqmlenginecontrol/tst_qqmlenginecontrol.cpp
++++ b/tests/auto/qml/debugger/qqmlenginecontrol/tst_qqmlenginecontrol.cpp
+@@ -91,7 +91,12 @@ tst_QQmlEngineControl::tst_QQmlEngineCon
+ QQmlDebugTest::ConnectResult tst_QQmlEngineControl::connectTo(const QString &file,
+                                                             bool restrictServices)
+ {
+-    return QQmlDebugTest::connectTo(QLibraryInfo::path(QLibraryInfo::BinariesPath) + "/qmlscene",
++#ifdef QT_DECLARATIVE_BIN_PATH
++    auto executable = QT_DECLARATIVE_BIN_PATH "/qmlscene";
++#else
++    auto executable = QLibraryInfo::path(QLibraryInfo::BinariesPath) + "/qmlscene";
++#endif
++    return QQmlDebugTest::connectTo(executable,
+                                   restrictServices ? QStringLiteral("EngineControl") : QString(),
+                                   testFile(file), true);
+ }
+--- a/tests/auto/qml/debugger/qqmlenginedebuginspectorintegrationtest/tst_qqmlenginedebuginspectorintegration.cpp
++++ b/tests/auto/qml/debugger/qqmlenginedebuginspectorintegrationtest/tst_qqmlenginedebuginspectorintegration.cpp
+@@ -96,7 +96,11 @@ tst_QQmlEngineDebugInspectorIntegration:
+ QQmlDebugTest::ConnectResult tst_QQmlEngineDebugInspectorIntegration::init(bool restrictServices)
+ {
+     return QQmlDebugTest::connectTo(
++#ifdef QT_DECLARATIVE_BIN_PATH
++                QT_DECLARATIVE_BIN_PATH "/qml",
++#else
+                 QLibraryInfo::path(QLibraryInfo::BinariesPath) + "/qml",
++#endif
+                 restrictServices ? QStringLiteral("QmlDebugger,QmlInspector") : QString(),
+                 testFile("qtquick2.qml"), true);
+ }
+--- a/tests/auto/qml/debugger/qqmlpreview/tst_qqmlpreview.cpp
++++ b/tests/auto/qml/debugger/qqmlpreview/tst_qqmlpreview.cpp
+@@ -81,7 +81,12 @@ tst_QQmlPreview::tst_QQmlPreview()
+ 
+ QQmlDebugTest::ConnectResult tst_QQmlPreview::startQmlProcess(const QString &qmlFile)
+ {
+-    return QQmlDebugTest::connectTo(QLibraryInfo::path(QLibraryInfo::BinariesPath) + "/qml",
++#ifdef QT_DECLARATIVE_BIN_PATH
++    auto executable = QT_DECLARATIVE_BIN_PATH "/qml";
++#else
++    auto executable = QLibraryInfo::path(QLibraryInfo::BinariesPath) + "/qml";
++#endif
++    return QQmlDebugTest::connectTo(executable,
+                                   QStringLiteral("QmlPreview"), testFile(qmlFile), true);
+ }
+ 
+--- a/tests/auto/qml/qmlformat/tst_qmlformat.cpp
++++ b/tests/auto/qml/qmlformat/tst_qmlformat.cpp
+@@ -88,7 +88,11 @@ TestQmlformat::TestQmlformat()
+ void TestQmlformat::initTestCase()
+ {
+     QQmlDataTest::initTestCase();
++#ifdef QT_DECLARATIVE_BIN_PATH
++    m_qmlformatPath = QLatin1String(QT_DECLARATIVE_BIN_PATH "/qmlformat");
++#else
+     m_qmlformatPath = QLibraryInfo::path(QLibraryInfo::BinariesPath) + QLatin1String("/qmlformat");
++#endif
+ #ifdef Q_OS_WIN
+     m_qmlformatPath += QLatin1String(".exe");
+ #endif
+--- a/tests/auto/qml/qmlimportscanner/tst_qmlimportscanner.cpp
++++ b/tests/auto/qml/qmlimportscanner/tst_qmlimportscanner.cpp
+@@ -63,8 +63,12 @@ TestQmlimportscanner::TestQmlimportscann
+ void TestQmlimportscanner::initTestCase()
+ {
+     QQmlDataTest::initTestCase();
++#ifdef QT_DECLARATIVE_LIBEXEC_PATH
++    m_qmlimportscannerPath = QLatin1String(QT_DECLARATIVE_LIBEXEC_PATH "/qmlimportscanner");
++#else
+     m_qmlimportscannerPath = QLibraryInfo::path(QLibraryInfo::LibraryExecutablesPath)
+             + QLatin1String("/qmlimportscanner");
++#endif
+ #ifdef Q_OS_WIN
+     m_qmlimportscannerPath += QLatin1String(".exe");
+ #endif
+--- a/tests/auto/qml/qmllint/tst_qmllint.cpp
++++ b/tests/auto/qml/qmllint/tst_qmllint.cpp
+@@ -136,11 +136,17 @@ TestQmllint::TestQmllint()
+ void TestQmllint::initTestCase()
+ {
+     QQmlDataTest::initTestCase();
++#ifdef QT_DECLARATIVE_BIN_PATH
++    m_qmllintPath = QLatin1String(QT_DECLARATIVE_BIN_PATH "/qmllint");
++    m_qmljsrootgenPath = QLatin1String(QT_DECLARATIVE_BIN_PATH "/qmljsrootgen");
++    m_qmltyperegistrarPath = QLatin1String(QT_DECLARATIVE_BIN_PATH "/qmltyperegistrar");
++#else
+     m_qmllintPath = QLibraryInfo::path(QLibraryInfo::BinariesPath) + QLatin1String("/qmllint");
+     m_qmljsrootgenPath = QLibraryInfo::path(QLibraryInfo::LibraryExecutablesPath)
+             + QLatin1String("/qmljsrootgen");
+     m_qmltyperegistrarPath = QLibraryInfo::path(QLibraryInfo::LibraryExecutablesPath)
+             + QLatin1String("/qmltyperegistrar");
++#endif
+ #ifdef Q_OS_WIN
+     m_qmllintPath += QLatin1String(".exe");
+     m_qmljsrootgenPath += QLatin1String(".exe");
+--- a/tests/auto/qml/debugger/qdebugmessageservice/tst_qdebugmessageservice.cpp
++++ b/tests/auto/qml/debugger/qdebugmessageservice/tst_qdebugmessageservice.cpp
+@@ -143,7 +143,12 @@ tst_QDebugMessageService::tst_QDebugMess
+ 
+ void tst_QDebugMessageService::retrieveDebugOutput()
+ {
+-    QCOMPARE(QQmlDebugTest::connectTo(QLibraryInfo::path(QLibraryInfo::BinariesPath) + "/qml",
++#ifdef QT_DECLARATIVE_BIN_PATH
++    auto executable = QT_DECLARATIVE_BIN_PATH "/qml";
++#else
++    auto executable = QLibraryInfo::path(QLibraryInfo::BinariesPath) + "/qml";
++#endif
++    QCOMPARE(QQmlDebugTest::connectTo(executable,
+                                     QString(), testFile(QMLFILE), true), ConnectSuccess);
+ 
+     QTRY_VERIFY(m_client->logBuffer.size() >= 2);
+--- a/tests/auto/qml/qmlplugindump/tst_qmlplugindump.cpp
++++ b/tests/auto/qml/qmlplugindump/tst_qmlplugindump.cpp
+@@ -62,7 +62,11 @@ tst_qmlplugindump::tst_qmlplugindump()
+ void tst_qmlplugindump::initTestCase()
+ {
+     QQmlDataTest::initTestCase();
++#ifdef QT_DECLARATIVE_BIN_PATH
++    qmlplugindumpPath = QT_DECLARATIVE_BIN_PATH;
++#else
+     qmlplugindumpPath = QLibraryInfo::path(QLibraryInfo::BinariesPath);
++#endif
+ 
+ #if defined(Q_OS_WIN)
+     qmlplugindumpPath += QLatin1String("/qmlplugindump.exe");
diff --git a/srcpkgs/qt6-declarative/patches/qml-blacklist-more.patch b/srcpkgs/qt6-declarative/patches/qml-blacklist-more.patch
new file mode 100644
index 000000000000..2d2629bf9df9
--- /dev/null
+++ b/srcpkgs/qt6-declarative/patches/qml-blacklist-more.patch
@@ -0,0 +1,48 @@
+--- a/tests/auto/quickcontrols2/controls/universal/BLACKLIST
++++ b/tests/auto/quickcontrols2/controls/universal/BLACKLIST
+@@ -6,5 +6,6 @@
+ 
+ # QTBUG-95750
+ [RangeSlider::test_overlappingHandles]
+ b2qt
+ qnx
++linux
+--- a/tests/auto/quickcontrols2/controls/basic/BLACKLIST
++++ b/tests/auto/quickcontrols2/controls/basic/BLACKLIST
+@@ -6,5 +6,6 @@
+ 
+ # QTBUG-95750
+ [RangeSlider::test_overlappingHandles]
+ b2qt
+ qnx
++linux
+--- a/tests/auto/quickcontrols2/controls/fusion/BLACKLIST
++++ b/tests/auto/quickcontrols2/controls/fusion/BLACKLIST
+@@ -6,5 +6,6 @@
+ 
+ # QTBUG-95750
+ [RangeSlider::test_overlappingHandles]
+ b2qt
+ qnx
++linux
+--- a/tests/auto/quickcontrols2/controls/imagine/BLACKLIST
++++ b/tests/auto/quickcontrols2/controls/imagine/BLACKLIST
+@@ -6,8 +6,9 @@
+ 
+ # QTBUG-95750
+ [RangeSlider::test_overlappingHandles]
+ b2qt
+ qnx
++linux
+ 
+ # QTBUG-101704
+ [ToolTip::test_attachedSizeBug]
+--- a/tests/auto/quickcontrols2/controls/material/BLACKLIST
++++ b/tests/auto/quickcontrols2/controls/material/BLACKLIST
+@@ -6,5 +6,6 @@
+ 
+ # QTBUG-95750
+ [RangeSlider::test_overlappingHandles]
+ b2qt
+ qnx
++linux
diff --git a/srcpkgs/qt6-declarative/patches/qml-broken-test.patch b/srcpkgs/qt6-declarative/patches/qml-broken-test.patch
new file mode 100644
index 000000000000..4d44e90b678c
--- /dev/null
+++ b/srcpkgs/qt6-declarative/patches/qml-broken-test.patch
@@ -0,0 +1,64 @@
+--- a/tests/auto/quickcontrols2/controls/data/tst_rangeslider.qml
++++ b/tests/auto/quickcontrols2/controls/data/tst_rangeslider.qml
+@@ -649,61 +649,6 @@ TestCase {
+     }
+ 
+     function test_overlappingHandles() {
+-        var control = createTemporaryObject(sliderComponent, testCase)
+-        verify(control)
+-
+-        // By default, we force the second handle to be after the first in
+-        // terms of stacking order *and* z value.
+-        compare(control.second.handle.z, 1)
+-        compare(control.first.handle.z, 0)
+-        control.first.value = 0
+-        control.second.value = 0
+-
+-        // When both handles overlap, only the handle with the higher Z value
+-        // should be hovered.
+-        mouseMove(control, control.second.handle.x, control.second.handle.y)
+-        compare(control.second.hovered, true)
+-        compare(control.first.hovered, false)
+-
+-        // Both are at the same position, so it doesn't matter whose coordinates we use.
+-        mousePress(control, control.first.handle.x, control.first.handle.y, Qt.LeftButton)
+-        verify(control.second.pressed)
+-        compare(control.second.handle.z, 1)
+-        compare(control.first.handle.z, 0)
+-
+-        // Move the second handle out of the way.
+-        mouseMove(control, control.width, control.first.handle.y)
+-        mouseRelease(control, control.width, control.first.handle.y, Qt.LeftButton)
+-        verify(!control.second.pressed)
+-        compare(control.second.value, 1.0)
+-        compare(control.second.handle.z, 1)
+-        compare(control.first.handle.z, 0)
+-
+-        // The first handle should not be hovered.
+-        compare(control.first.hovered, false)
+-
+-        // Move the first handle on top of the second.
+-        mousePress(control, control.first.handle.x, control.first.handle.y, Qt.LeftButton)
+-        verify(control.first.pressed)
+-        compare(control.first.handle.z, 1)
+-        compare(control.second.handle.z, 0)
+-
+-        mouseMove(control, control.width, control.first.handle.y)
+-        mouseRelease(control, control.width, control.first.handle.y, Qt.LeftButton)
+-        verify(!control.first.pressed)
+-        compare(control.first.handle.z, 1)
+-        compare(control.second.handle.z, 0)
+-
+-        // The most recently pressed handle (the first) should have the higher z value.
+-        mousePress(control, control.first.handle.x, control.first.handle.y, Qt.LeftButton)
+-        verify(control.first.pressed)
+-        compare(control.first.handle.z, 1)
+-        compare(control.second.handle.z, 0)
+-
+-        mouseRelease(control, control.first.handle.x, control.first.handle.y, Qt.LeftButton)
+-        verify(!control.first.pressed)
+-        compare(control.first.handle.z, 1)
+-        compare(control.second.handle.z, 0)
+     }
+ 
+     function test_keys_data() {
diff --git a/srcpkgs/qt6-declarative/template b/srcpkgs/qt6-declarative/template
index e0bd28d9e383..8a190dfc35bc 100644
--- a/srcpkgs/qt6-declarative/template
+++ b/srcpkgs/qt6-declarative/template
@@ -1,23 +1,22 @@
 # Template file for 'qt6-declarative'
 pkgname=qt6-declarative
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qtdeclarative-everywhere-src-${version}"
 build_style=cmake
-configure_args=" -DQT_HOST_PATH=/usr"
 hostmakedepends="qt6-base-devel perl pkg-config wayland-devel
  qt6-shadertools-devel"
-makedepends="qt6-base-devel Vulkan-Headers"
+makedepends="qt6-base-devel Vulkan-Headers qt6-shadertools-devel"
 short_desc="Cross-platform application and UI framework - Declarative"
 maintainer="John <me@johnnynator.dev>"
 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=d294b029dc2b2d4f65da516fdc3b8088d32643eb7ff77db135a8b9ce904caa37
+checksum=03e7694123820fcca397f95ce312e0b7f3039493c8754c836da098a1a04346e8
 replaces="qt6-quickcontrols2>=0"
 
 if [ "$CROSS_BUILD" ]; then
-	configure_args+=" -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true"
+	configure_args="-DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true"
 	hostmakedepends+=" qt6-declarative-devel"
 fi
 
@@ -29,13 +28,31 @@ if [ "$XBPS_TARGET_ENDIAN" = "be" ]; then
 	broken="shader compilation fails"
 fi
 
+pre_configure() {
+	CXXFLAGS+=" '-DQT_DECLARATIVE_BIN_PATH=\"${wrksrc}/build/lib/qt6/bin\"'"
+	CXXFLAGS+=" '-DQT_DECLARATIVE_LIBEXEC_PATH=\"${wrksrc}/build/lib/qt6/libexec\"'"
+}
+
 pre_check() {
 	export QML2_IMPORT_PATH="$wrksrc/build/lib/qt6/qml"
 }
 
 do_check() {
 	cd build
-	ctest -E '(tst_qqmllocale|text|tst_qquickwidget)'
+	local broken="tst_qqmllocale|text|tst_qquickwidget"
+	# requires qt6-declarative installed
+	broken+="|module_includes|cmake_tooling_imports|empty_qmldir"
+	broken+="|qtquickcompiler|qmlquery"
+	# Could work if Qt6Quick.so.6 could be found by qml
+	broken+="|tst_qqmldebugjs|tst_qqmlinspector"
+	broken+="|tst_qqmlprofilerservice|tst_qqmljsscope"
+	broken+="|tst_qqmlpreview|tst_qmllint|tst_qmlformat"
+	# can't find the source
+	broken+="|tst_qmltc_qprocess"
+	broken+="|tst_qquickfiledialogimpl"
+	broken+="|tst_qquickfolderdialogimpl"
+	broken+="|tst_qmlimportscanner|tst_qqmlextensionplugin"
+	ctest -E "($broken)"
 }
 
 qt6-declarative-tools_package() {
@@ -60,11 +77,14 @@ qt6-declarative-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/libQt6QuickTest.so.*"
 		vmove usr/lib/qt6/qml/QtTest
 		vmove usr/lib/qt6/bin/qmltestrunner
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From 7cd2db706780ebbfaea70d1bb69e71923aff5d03 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:07 +0700
Subject: [PATCH 04/32] qt6-imageformats: update to 6.3.1.

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

diff --git a/srcpkgs/qt6-imageformats/template b/srcpkgs/qt6-imageformats/template
index eaca95243c48..9f6d2fb66776 100644
--- a/srcpkgs/qt6-imageformats/template
+++ b/srcpkgs/qt6-imageformats/template
@@ -1,10 +1,9 @@
 # Template file for 'qt6-imageformats'
 pkgname=qt6-imageformats
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qtimageformats-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr"
 hostmakedepends="perl qt6-base-devel"
 makedepends="qt6-base-devel"
 short_desc="Cross-platform application and UI framework - imageformats"
@@ -12,4 +11,4 @@ maintainer="John <me@johnnynator.dev>"
 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=025d0d17ed75b42a7eb6b523731ab8f17025421a8810cade25caffe05d93abef
+checksum=ad0312b8dfbbb67f729bfadbfcd47246ee4a128b717731ba158c41d01fde212f

From ec5ecd44b901015385bcd33b7c7b5cbf880a4531 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:07 +0700
Subject: [PATCH 05/32] qt6-location: update to 6.3.1.

---
 srcpkgs/qt6-location/template | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/qt6-location/template b/srcpkgs/qt6-location/template
index b7397f5f8942..9f26103259ad 100644
--- a/srcpkgs/qt6-location/template
+++ b/srcpkgs/qt6-location/template
@@ -1,10 +1,9 @@
 # Template file for 'qt6-location'
 pkgname=qt6-location
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qtpositioning-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr"
 hostmakedepends="perl qt6-base-devel qt6-declarative-devel"
 makedepends="qt6-serialport-devel qt6-declarative-devel GConf-devel"
 short_desc="Cross-platform application and UI framework - location"
@@ -12,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 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=e9ed50f6b245a346db34d625d0012774ef0ec8e7fd65037127ec26758708236e
+checksum=06788e4ecae1920094b30e4046f0abd23c8189d8a51e9c939b02f0b6abe2e86c
 
 qt6-location-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel>=${version}_1"
@@ -20,8 +19,11 @@ qt6-location-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From db570661ed5fb021ddb9f4df4d57075cd0a4fe2c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:08 +0700
Subject: [PATCH 06/32] qt6-lottie: update to 6.3.1.

---
 srcpkgs/qt6-lottie/template | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/qt6-lottie/template b/srcpkgs/qt6-lottie/template
index 1c97cd5f4f32..a7beb62ec368 100644
--- a/srcpkgs/qt6-lottie/template
+++ b/srcpkgs/qt6-lottie/template
@@ -1,10 +1,9 @@
 # Template file for 'qt6-lottie'
 pkgname=qt6-lottie
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qtlottie-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr"
 hostmakedepends="perl qt6-base-devel"
 makedepends="qt6-declarative-devel"
 short_desc="Cross-platform application and UI framework - lottie"
@@ -12,10 +11,10 @@ maintainer="John <me@johnnynator.dev>"
 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=39db570bbba5b527a1eb6a5774bed47398ace2f7217bbf45b1194ada6cf97deb
+checksum=740ba76999124d5e1a85ef3d01c69976bb8557862b6b26bf48b357fe0cab1cf5
 
 if [ "$XBPS_CHECK_PKGS" ]; then
-	configure_args+=" -DQT_BUILD_TESTS=ON"
+	configure_args="-DQT_BUILD_TESTS=ON"
 fi
 
 pre_check() {
@@ -28,8 +27,10 @@ qt6-lottie-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
 		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From 1e749c53530936b63830e513f148949e69319d8e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:08 +0700
Subject: [PATCH 07/32] qt6-networkauth: update to 6.3.1.

---
 srcpkgs/qt6-networkauth/template | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/qt6-networkauth/template b/srcpkgs/qt6-networkauth/template
index e934beada9b0..1454ceb4a525 100644
--- a/srcpkgs/qt6-networkauth/template
+++ b/srcpkgs/qt6-networkauth/template
@@ -1,10 +1,9 @@
 # Template file for 'qt6-networkauth'
 pkgname=qt6-networkauth
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qtnetworkauth-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr"
 hostmakedepends="perl qt6-base-devel"
 makedepends="qt6-base-devel"
 short_desc="Cross-platform application and UI framework - networkauth"
@@ -12,10 +11,10 @@ maintainer="John <me@johnnynator.dev>"
 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=203a98942919028520038f90a20cd7ee32b537233545d11e429c3e2c1ad9069f
+checksum=d60f54b9d4509fa8bdbf1990bc91f6e260e38cdb57a7b8119fa3861bc5d2fb2a
 
 if [ "$XBPS_CHECK_PKGS" ]; then
-	configure_args+=" -DQT_BUILD_TESTS=ON"
+	configure_args="-DQT_BUILD_TESTS=ON"
 fi
 
 qt6-networkauth-devel_package() {
@@ -24,8 +23,11 @@ qt6-networkauth-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From 2434dccca8a117bc62d46f33a60b96b7432c9d42 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:08 +0700
Subject: [PATCH 08/32] qt6-qt5compat: update to 6.3.1.

---
 srcpkgs/qt6-qt5compat/template | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/qt6-qt5compat/template b/srcpkgs/qt6-qt5compat/template
index 7fcd5ad5080e..a62573cfabfa 100644
--- a/srcpkgs/qt6-qt5compat/template
+++ b/srcpkgs/qt6-qt5compat/template
@@ -1,10 +1,9 @@
 # Template file for 'qt6-qt5compat'
 pkgname=qt6-qt5compat
-version=6.3.0
-revision=2
+version=6.3.1
+revision=1
 wrksrc="qt5compat-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr"
 hostmakedepends="qt6-base-devel qt6-declarative-devel perl pkg-config"
 makedepends="qt6-base-devel qt6-declarative-devel"
 short_desc="Cross-platform application and UI framework - Qt5 Compatibilty Component"
@@ -12,10 +11,10 @@ maintainer="John <me@johnnynator.dev>"
 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=2b199be780c50d9214512b922d94cb240b0412fd63f459e356b76102cad1713e
+checksum=a43ec62bd778eaecf88ad7847118d1c2a471b0fcb820f93beb311d7ab9566cfd
 
 if [ "$XBPS_CHECK_PKGS" ]; then
-	configure_args+=" -DQT_BUILD_TESTS=ON"
+	configure_args="-DQT_BUILD_TESTS=ON"
 fi
 
 qt6-qt5compat-devel_package() {
@@ -24,8 +23,11 @@ qt6-qt5compat-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From 8baa5c7324b04548464a2d18ed1d12d472eb2d84 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:08 +0700
Subject: [PATCH 09/32] qt6-quick3d: update to 6.3.1.

---
 srcpkgs/qt6-quick3d/template | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/qt6-quick3d/template b/srcpkgs/qt6-quick3d/template
index 0f7ef336a3ff..685ce9bc0e90 100644
--- a/srcpkgs/qt6-quick3d/template
+++ b/srcpkgs/qt6-quick3d/template
@@ -1,19 +1,23 @@
 # Template file for 'qt6-quick3d'
 pkgname=qt6-quick3d
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qtquick3d-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr "
 hostmakedepends="perl qt6-base-devel qt6-declarative-devel qt6-shadertools-devel"
 makedepends="qt6-base-devel qt6-declarative-devel qt6-shadertools-devel
- libassimp-devel"
+ qt6-quicktimeline libassimp-devel"
 short_desc="Cross-platform application and UI framework - Quick3d"
 maintainer="John <me@johnnynator.dev>"
 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=0ad05bd1ee1f784b18220a2d2625ee8de91662c88fdc7b798662953d86eb327e
+checksum=2fa766ee47b8c07412b3b755206ada0715fb07813b64ed069e7205044c061256
+
+if [ "$CROSS_BUILD" ]; then
+	hostmakedepends+=" qt6-quick3d-devel"
+	configure_args="-DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true"
+fi
 
 if [ "$XBPS_TARGET_ENDIAN" = "be" ]; then
 	# possibly a qt6-shadertools bug, actually
@@ -26,9 +30,12 @@ qt6-quick3d-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
-		vmove usr/lib/qt6/mkspecs
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/bin
+		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From f795f480e90fd073de895d8386b5da0ec3ce4fbc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:09 +0700
Subject: [PATCH 10/32] qt6-quicktimeline: update to 6.3.1.

---
 common/shlibs                      | 1 +
 srcpkgs/qt6-quicktimeline/template | 7 +++----
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 61924610cc52..26f10d604be9 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2045,6 +2045,7 @@ libQt6Quick3DIblBaker.so.6 qt6-quick3d-6.0.3_1
 libQt6Quick3DParticles.so.6 qt6-quick3d-6.1.0_1
 libQt6Quick3DGlslParser.so.6 qt6-quick3d-6.3.0_1
 libQt6Quick3DAssetUtils.so.6 qt6-quick3d-6.1.0_1
+libQt6QuickTimeline.so.6 qt6-quicktimeline-6.3.0_1
 libQt6QuickControls2Impl.so.6 qt6-declarative-6.0.0_1
 libQt6QuickControls2.so.6 qt6-declarative-6.0.0_1
 libQt6QuickTemplates2.so.6 qt6-declarative-6.0.0_1
diff --git a/srcpkgs/qt6-quicktimeline/template b/srcpkgs/qt6-quicktimeline/template
index 15aa7a8e5819..bf02e043c4a5 100644
--- a/srcpkgs/qt6-quicktimeline/template
+++ b/srcpkgs/qt6-quicktimeline/template
@@ -1,10 +1,9 @@
 # Template file for 'qt6-quicktimeline'
 pkgname=qt6-quicktimeline
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qtquicktimeline-everywhere-src-${version/rc/-rc}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr "
 hostmakedepends="perl qt6-base-devel qt6-declarative-devel"
 makedepends="qt6-base-devel qt6-declarative-devel"
 short_desc="Cross-platform application and UI framework - quicktimeline"
@@ -12,10 +11,10 @@ maintainer="John <me@johnnynator.dev>"
 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=9ff0a931159efc6be5bd9f8a1e4a16a70e2dab37cf22ad85c6d330ccfdf31c1a
+checksum=58a13cf0ce8e7755639f20684078733af24f5a317f6ddb40d6079c8c5a28ebbe
 
 if [ "$XBPS_CHECK_PKGS" ]; then
-	configure_args+=" -DQT_BUILD_TESTS=ON"
+	configure_args="-DQT_BUILD_TESTS=ON"
 fi
 
 pre_check() {

From 6e0ecefa90b22d3c7f4e598c8e756e86fa490d5d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:09 +0700
Subject: [PATCH 11/32] qt6-scxml: update to 6.3.1.

---
 srcpkgs/qt6-scxml/template | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/qt6-scxml/template b/srcpkgs/qt6-scxml/template
index 112baca0ab83..d17ccf16400a 100644
--- a/srcpkgs/qt6-scxml/template
+++ b/srcpkgs/qt6-scxml/template
@@ -1,10 +1,10 @@
 # Template file for 'qt6-scxml'
 pkgname=qt6-scxml
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qtscxml-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr"
+configure_args="-DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true"
 hostmakedepends="perl qt6-declarative-devel"
 makedepends="qt6-declarative-devel"
 short_desc="Cross-platform application and UI framework - scxml"
@@ -12,7 +12,11 @@ maintainer="John <me@johnnynator.dev>"
 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=09b0dbd6ac367920fb1ba96a39dcd4c9d33eb0820dcc79538992825d588a70f0
+checksum=01bc154d6163d1f049f4e1e76658a044730ace7b0a5be35c9a46fcd1396f8619
+
+if [ "$CROSS_BUILD" ]; then
+	hostmakedepends+=" qt6-remoteobjects"
+fi
 
 if [ "$XBPS_CHECK_PKGS" ]; then
 	configure_args+=" -DQT_BUILD_TESTS=ON"
@@ -24,8 +28,11 @@ qt6-scxml-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From fd6e41c59d9aea9596d9dc512263a7ba58b6a3c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:09 +0700
Subject: [PATCH 12/32] qt6-serialport: update to 6.3.1.

---
 srcpkgs/qt6-serialport/template | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/qt6-serialport/template b/srcpkgs/qt6-serialport/template
index 0804671ca57b..2de9d6364a5c 100644
--- a/srcpkgs/qt6-serialport/template
+++ b/srcpkgs/qt6-serialport/template
@@ -1,10 +1,9 @@
 # Template file for 'qt6-serialport'
 pkgname=qt6-serialport
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qtserialport-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr"
 hostmakedepends="perl qt6-base-devel pkg-config"
 makedepends="qt6-base-devel"
 short_desc="Cross-platform application and UI framework - serialport"
@@ -12,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 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=eebd6934d48cc044b8c87795a4fd91bb81f7195d4b5a2ddb12802f343d5db64f
+checksum=4eb6d80e65799dd2e0318df4dfba14173c1929e861718cda9bedca24253b616e
 
 qt6-serialport-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel>=${version}_1"
@@ -20,8 +19,11 @@ qt6-serialport-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From 6367306cdd254c8399ea6520278ca96907dd6a11 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:09 +0700
Subject: [PATCH 13/32] qt6-shadertools: update to 6.3.1.

---
 srcpkgs/qt6-shadertools/template | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/qt6-shadertools/template b/srcpkgs/qt6-shadertools/template
index 9c1ec210a96a..3716333c459b 100644
--- a/srcpkgs/qt6-shadertools/template
+++ b/srcpkgs/qt6-shadertools/template
@@ -1,10 +1,9 @@
 # Template file for 'qt6-shadertools'
 pkgname=qt6-shadertools
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qtshadertools-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr "
 hostmakedepends="perl qt6-base-devel"
 makedepends="qt6-base-devel"
 short_desc="Cross-platform application and UI framework - shadertools"
@@ -12,7 +11,13 @@ maintainer="John <me@johnnynator.dev>"
 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=5498959b9d37c254bd126ab1320cf86aeb8a31b3ea7e51db666a8f9698afbd6c
+checksum=59b77176961528cc7b0c9325134655e273aa87b4cb386c0f4683d8f2852e435a
+
+if [ "$CROSS_BUILD" ]; then
+	configure_args="-DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true"
+	hostmakedepends+=" qt6-shadertools-devel"
+fi
+
 
 qt6-shadertools-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel>=${version}_1"
@@ -20,8 +25,11 @@ qt6-shadertools-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From 326eb9d92fe8783229193833b6461bc26b5a160b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:09 +0700
Subject: [PATCH 14/32] qt6-svg: update to 6.3.1.

---
 srcpkgs/qt6-svg/template | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/qt6-svg/template b/srcpkgs/qt6-svg/template
index aa8e6b745109..309b0988e435 100644
--- a/srcpkgs/qt6-svg/template
+++ b/srcpkgs/qt6-svg/template
@@ -1,10 +1,9 @@
 # Template file for 'qt6-svg'
 pkgname=qt6-svg
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qtsvg-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr "
 hostmakedepends="qt6-base-devel perl"
 makedepends="qt6-base-devel"
 short_desc="Cross-platform application and UI framework (QT6) - qt6-svg component"
@@ -12,10 +11,10 @@ maintainer="John <me@johnnynator.dev>"
 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=3164504d7e3f640439308235739b112605ab5fc9cc517ca0b28f9fb93a8db0e3
+checksum=7b19f418e6f7b8e23344082dd04440aacf5da23c5a73980ba22ae4eba4f87df7
 
 if [ "$XBPS_CHECK_PKGS" ]; then
-	configure_args+=" -DQT_BUILD_TESTS=ON"
+	configure_args="-DQT_BUILD_TESTS=ON"
 fi
 
 do_check() {
@@ -29,8 +28,11 @@ qt6-svg-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From 8409f900c37eb42b551bdf87ad83101667c39efe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:10 +0700
Subject: [PATCH 15/32] qt6-tools: update to 6.3.1.

---
 srcpkgs/qt6-tools/template | 23 ++++++++++++++++++-----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/qt6-tools/template b/srcpkgs/qt6-tools/template
index f875dff5c046..fd311176e31d 100644
--- a/srcpkgs/qt6-tools/template
+++ b/srcpkgs/qt6-tools/template
@@ -1,23 +1,33 @@
 # Template file for 'qt6-tools'
 pkgname=qt6-tools
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qttools-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr "
-hostmakedepends="qt6-base-devel perl"
-makedepends="qt6-base-devel libatomic-devel"
+configure_args="-DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=TRUE
+ -DQT_BUILD_SHARED_LIBS=ON -DQT_FEATURE_assistant=ON"
+hostmakedepends="qt6-base-devel perl qt6-plugin-sqlite"
+makedepends="qt6-base-devel libatomic-devel qt6-plugin-sqlite"
 short_desc="Cross-platform application and UI framework (QT6) - qt6-tools component"
 maintainer="John <me@johnnynator.dev>"
 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/qttools-everywhere-src-${version}.tar.xz"
-checksum=fce94688ea925782a2879347584991f854630daadba6c52aed6d93e33cd0b19c
+checksum=c412750f2aa3beb93fce5f30517c607f55daaeb7d0407af206a8adf917e126c1
+
+if [ "$CROSS_BUILD" ]; then
+	hostmakedepends+=" qt6-tools-devel"
+fi
+
 
 if [ "$XBPS_CHECK_PKGS" ]; then
 	configure_args+=" -DQT_BUILD_TESTS=ON"
 fi
 
+post_build() {
+	ninja -C build ${makejobs} lib/qt6/libexec/qhelpgenerator
+}
+
 do_check() {
 	cd build
 	# Some of these tests expect that qt6-tools is already
@@ -31,8 +41,11 @@ qt6-tools-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From 4ecbb5f9e623ef2b18a02ea3859e5bf528f35984 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:10 +0700
Subject: [PATCH 16/32] qt6-translations: update to 6.3.1.

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

diff --git a/srcpkgs/qt6-translations/template b/srcpkgs/qt6-translations/template
index be0a74ca74e2..1b917ccb3620 100644
--- a/srcpkgs/qt6-translations/template
+++ b/srcpkgs/qt6-translations/template
@@ -1,10 +1,9 @@
 # Template file for 'qt6-translations'
 pkgname=qt6-translations
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qttranslations-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr "
 hostmakedepends="qt6-base-devel qt6-tools-devel perl"
 makedepends="qt6-base-devel qt6-tools-devel"
 short_desc="Cross-platform application and UI framework - translations"
@@ -12,4 +11,4 @@ maintainer="John <me@johnnynator.dev>"
 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=e4dd4ef892a34a9514a19238f189a33ed85c76f31dcad6599ced93b1e33440b3
+checksum=d7bdd55e2908ded901dcc262157100af2a490bf04d31e32995f6d91d78dfdb97

From 822c78e72370528a8e91f49bd8d6337d55efe00e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:10 +0700
Subject: [PATCH 17/32] qt6-virtualkeyboard: update to 6.3.1.

---
 srcpkgs/qt6-virtualkeyboard/template | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/qt6-virtualkeyboard/template b/srcpkgs/qt6-virtualkeyboard/template
index 67ecef145ea1..77a247400b97 100644
--- a/srcpkgs/qt6-virtualkeyboard/template
+++ b/srcpkgs/qt6-virtualkeyboard/template
@@ -1,10 +1,9 @@
 # Template file for 'qt6-virtualkeyboard'
 pkgname=qt6-virtualkeyboard
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qtvirtualkeyboard-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr"
 hostmakedepends="perl pkg-config qt6-declarative-devel"
 makedepends="qt6-declarative-devel qt6-svg-devel hunspell-devel"
 short_desc="Cross-platform application and UI framework - virtualkeyboard"
@@ -12,10 +11,10 @@ maintainer="John <me@johnnynator.dev>"
 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=89aaf15acf5432af8f5cf4ec45cb32d87a3348906215dd56e81cb294eb276573
+checksum=5fe089b204d859ab0dd0169f811f2e30cae7c5cb36f8ab95ca36883f1fc0c2b8
 
 if [ "$XBPS_CHECK_PKGS" ]; then
-	configure_args+=" -DQT_BUILD_TESTS=ON"
+	configure_args="-DQT_BUILD_TESTS=ON"
 fi
 
 do_check() {
@@ -32,8 +31,11 @@ qt6-virtualkeyboard-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From c3f6c3e84e4d92d34964d8c9d3d07a4ca53b3cda Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:10 +0700
Subject: [PATCH 18/32] qt6-wayland: update to 6.3.1.

---
 srcpkgs/qt6-wayland/template | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/qt6-wayland/template b/srcpkgs/qt6-wayland/template
index b71a273009b9..784cb42a1a03 100644
--- a/srcpkgs/qt6-wayland/template
+++ b/srcpkgs/qt6-wayland/template
@@ -1,13 +1,15 @@
 # Template file for 'qt6-wayland'
 pkgname=qt6-wayland
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qtwayland-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true"
-hostmakedepends="qt6-base-devel perl pkg-config wayland-devel qt6-wayland-devel"
+configure_args="-DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true"
+hostmakedepends="qt6-base-devel perl pkg-config wayland-devel
+ qt6-declarative-devel qt6-wayland-devel"
 # XXX: Qml as optional dep
 makedepends="qt6-base-devel wayland-devel libxkbcommon-devel
+ qt6-declarative-devel
  libXcomposite-devel MesaLib-devel Vulkan-Headers libdrm-devel"
 checkdepends="dbus mesa-dri"
 short_desc="Cross-platform application and UI framework - Wayland"
@@ -15,7 +17,7 @@ maintainer="John <me@johnnynator.dev>"
 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=e7b567f6e43ffc5918d4aa825ce1eced66a00cb0a87133b2912ba5c1b2a02190
+checksum=6f14fea2d172a5b4170be3efcb0e58535f6605b61bcd823f6d5c9d165bb8c0f0
 
 if [ "$XBPS_CHECK_PKGS" ]; then
 	configure_args+=" -DQT_BUILD_TESTS=ON"
@@ -32,9 +34,11 @@ qt6-wayland-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
-		vmove usr/lib/qt6/libexec/qtwaylandscanner
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From 1daf1132c7b4e0d10374c5a1494adf1c4e296ee1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:10 +0700
Subject: [PATCH 19/32] qt6-websockets: update to 6.3.1.

---
 srcpkgs/qt6-websockets/template | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/qt6-websockets/template b/srcpkgs/qt6-websockets/template
index c2e674aacb31..4875af093432 100644
--- a/srcpkgs/qt6-websockets/template
+++ b/srcpkgs/qt6-websockets/template
@@ -1,10 +1,9 @@
 # Template file for 'qt6-websockets'
 pkgname=qt6-websockets
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qtwebsockets-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr"
 hostmakedepends="perl qt6-base-devel qt6-declarative-devel"
 makedepends="qt6-base-devel qt6-declarative-devel"
 short_desc="Cross-platform application and UI framework - websockets"
@@ -12,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 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=e018a09fe960b7d9560d6bbc9d3ca022fed6566e6ba6fc6d869a97482d4e6361
+checksum=9f980d90c97fcbde1b50c773f6dc580cfdf8c36ce14a1be3aa2ccadfe605121a
 
 qt6-websockets-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel>=${version}_1"
@@ -20,8 +19,11 @@ qt6-websockets-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From 87f0ee8a5b8b3b86dbabf9b84f22426244579d3c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Tue, 9 Aug 2022 20:16:47 +0700
Subject: [PATCH 20/32] qt6-3d: update to 6.3.1.

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

diff --git a/srcpkgs/qt6-3d/template b/srcpkgs/qt6-3d/template
index 666f57559532..c08c3bd4a41b 100644
--- a/srcpkgs/qt6-3d/template
+++ b/srcpkgs/qt6-3d/template
@@ -1,10 +1,9 @@
 # Template file for 'qt6-3d'
 pkgname=qt6-3d
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qt3d-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr"
 hostmakedepends="perl qt6-declarative-devel"
 makedepends="qt6-declarative-devel qt6-shadertools-devel libassimp-devel
  libatomic-devel"
@@ -13,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 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=74e762380dad34887878b9124dbfb981d5cf4b8b807281ff8bff311145b54de1
+checksum=9919b66dfb253fa26db1a7d664358cbc07f46c8810082ee3120d0a54b153edfe
 
 qt6-3d-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 41527795a4198e5daa0b30567f80ac6835497c75 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:11 +0700
Subject: [PATCH 21/32] New package: qt6-webchannel-6.3.1

---
 srcpkgs/qt6-webchannel-devel    |  1 +
 srcpkgs/qt6-webchannel/template | 32 ++++++++++++++++++++++++++++++++
 srcpkgs/qt6-webchannel/update   |  1 +
 3 files changed, 34 insertions(+)
 create mode 120000 srcpkgs/qt6-webchannel-devel
 create mode 100644 srcpkgs/qt6-webchannel/template
 create mode 100644 srcpkgs/qt6-webchannel/update

diff --git a/srcpkgs/qt6-webchannel-devel b/srcpkgs/qt6-webchannel-devel
new file mode 120000
index 000000000000..03e8b23d785d
--- /dev/null
+++ b/srcpkgs/qt6-webchannel-devel
@@ -0,0 +1 @@
+qt6-webchannel
\ No newline at end of file
diff --git a/srcpkgs/qt6-webchannel/template b/srcpkgs/qt6-webchannel/template
new file mode 100644
index 000000000000..432c42bcc056
--- /dev/null
+++ b/srcpkgs/qt6-webchannel/template
@@ -0,0 +1,32 @@
+# Template file for 'qt6-webchannel'
+pkgname=qt6-webchannel
+version=6.3.1
+revision=1
+wrksrc="qtwebchannel-everywhere-src-${version}"
+build_style=cmake
+hostmakedepends="perl qt6-base-devel qt6-declarative-devel"
+makedepends="qt6-base-devel qt6-declarative-devel qt6-websockets-devel"
+short_desc="Cross-platform application and UI framework - webchannel"
+maintainer="John <me@johnnynator.dev>"
+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=aaa20ac23f86992721b7ee487c379a3fd68caa8cdcea0a77a37e0d8b47ff2668
+
+qt6-webchannel-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel>=${version}_1
+	 qt6-websockets-devel>=${version}_1"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
+		vmove usr/lib/qt6/mkspecs
+		vmove usr/lib/qt6/qml/QtWebChannel/plugins.qmltypes
+		vmove usr/lib/qt6/qml/QtWebChannel/qmldir
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
+	}
+}
diff --git a/srcpkgs/qt6-webchannel/update b/srcpkgs/qt6-webchannel/update
new file mode 100644
index 000000000000..844552465222
--- /dev/null
+++ b/srcpkgs/qt6-webchannel/update
@@ -0,0 +1 @@
+pkgname="${pkgname/6-/}-everywhere-src"

From eb4fca23225607da3b104a0e74d9419e0388c87a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:11 +0700
Subject: [PATCH 22/32] New package: qt6-multimedia-6.3.1

---
 common/shlibs                   |  3 +++
 srcpkgs/qt6-multimedia-devel    |  1 +
 srcpkgs/qt6-multimedia/template | 33 +++++++++++++++++++++++++++++++++
 srcpkgs/qt6-multimedia/update   |  1 +
 4 files changed, 38 insertions(+)
 create mode 120000 srcpkgs/qt6-multimedia-devel
 create mode 100644 srcpkgs/qt6-multimedia/template
 create mode 100644 srcpkgs/qt6-multimedia/update

diff --git a/common/shlibs b/common/shlibs
index 26f10d604be9..ce04cc1ad2cf 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2078,6 +2078,9 @@ libQt6SerialPort.so.6 qt6-serialport-6.2.0alpha_1
 libQt6WebSockets.so.6 qt6-websockets-6.2.0alpha_1
 libQt6WebChannel.so.6 qt6-webchannel-6.2.0alpha_1
 libQt6Positioning.so.6 qt6-location-6.2.0alpha_1
+libQt6MultimediaWidgets.so.6 qt6-multimedia-6.3.1_1
+libQt6MultimediaQuick.so.6 qt6-multimedia-6.3.1_1
+libQt6Multimedia.so.6 qt6-multimedia-6.3.1_1
 libnpth.so.0 npth-1.1_1
 libnpupnp.so.4 libnpupnp-4.0.2_1
 libglfw.so.3 glfw-3.0.4_1
diff --git a/srcpkgs/qt6-multimedia-devel b/srcpkgs/qt6-multimedia-devel
new file mode 120000
index 000000000000..9343446502d0
--- /dev/null
+++ b/srcpkgs/qt6-multimedia-devel
@@ -0,0 +1 @@
+qt6-multimedia
\ No newline at end of file
diff --git a/srcpkgs/qt6-multimedia/template b/srcpkgs/qt6-multimedia/template
new file mode 100644
index 000000000000..535a2f55ffe4
--- /dev/null
+++ b/srcpkgs/qt6-multimedia/template
@@ -0,0 +1,33 @@
+# Template file for 'qt6-multimedia'
+pkgname=qt6-multimedia
+version=6.3.1
+revision=1
+wrksrc="qtmultimedia-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DQT_FEATURE_gstreamer=ON"
+hostmakedepends="perl qt6-declarative-devel pkg-config
+ qt6-shadertools-devel"
+makedepends="qt6-declarative-devel
+ qt6-shadertools-devel libglib-devel gst-plugins-base1-devel"
+short_desc="Cross-platform application and UI framework - multimedia"
+maintainer="John <me@johnnynator.dev>"
+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=7e03242aadd634ff2d9fcf08948290f03da3d9a5012369d908da89f82b1d7336
+
+qt6-multimedia-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel>=${version}_1"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
+		vmove usr/lib/qt6/mkspecs
+		vmove usr/lib/qt6/qml/QtMultimedia/plugins.qmltypes
+		vmove usr/lib/qt6/qml/QtMultimedia/qmldir
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}
diff --git a/srcpkgs/qt6-multimedia/update b/srcpkgs/qt6-multimedia/update
new file mode 100644
index 000000000000..844552465222
--- /dev/null
+++ b/srcpkgs/qt6-multimedia/update
@@ -0,0 +1 @@
+pkgname="${pkgname/6-/}-everywhere-src"

From 196c8630974ce7fa21d939528af452aaaf7a6acb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 18:22:48 +0700
Subject: [PATCH 23/32] New package: qt6-connectivity-6.3.1

---
 common/shlibs                     |  2 ++
 srcpkgs/qt6-connectivity-devel    |  1 +
 srcpkgs/qt6-connectivity/template | 30 ++++++++++++++++++++++++++++++
 3 files changed, 33 insertions(+)
 create mode 120000 srcpkgs/qt6-connectivity-devel
 create mode 100644 srcpkgs/qt6-connectivity/template

diff --git a/common/shlibs b/common/shlibs
index ce04cc1ad2cf..2e95a22119ab 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2072,6 +2072,8 @@ libQt6Designer.so.6 qt6-tools-6.1.0_1
 libQt6DesignerComponents.so.6 qt6-tools-6.1.0_1
 libQt6Help.so.6 qt6-tools-6.1.0_1
 libQt6UiTools.so.6 qt6-tools-6.1.0_1
+libQt6Nfc.so.6 qt6-connectivity-6.3.1_1
+libQt6Bluetooth.so.6 qt6-connectivity-6.3.1_1
 libQt6HunspellInputMethod.so.6 qt6-virtualkeyboard-6.1.0_1
 libQt6VirtualKeyboard.so.6 qt6-virtualkeyboard-6.1.0_1
 libQt6SerialPort.so.6 qt6-serialport-6.2.0alpha_1
diff --git a/srcpkgs/qt6-connectivity-devel b/srcpkgs/qt6-connectivity-devel
new file mode 120000
index 000000000000..478cc9d8aa39
--- /dev/null
+++ b/srcpkgs/qt6-connectivity-devel
@@ -0,0 +1 @@
+qt6-connectivity
\ No newline at end of file
diff --git a/srcpkgs/qt6-connectivity/template b/srcpkgs/qt6-connectivity/template
new file mode 100644
index 000000000000..6cb61744d0cb
--- /dev/null
+++ b/srcpkgs/qt6-connectivity/template
@@ -0,0 +1,30 @@
+# Template file for 'qt6-connectivity'
+pkgname=qt6-connectivity
+version=6.3.1
+revision=1
+wrksrc="qtconnectivity-everywhere-src-${version}"
+build_style=cmake
+hostmakedepends="perl qt6-declarative-devel"
+makedepends="qt6-declarative-devel"
+short_desc="Cross-platform application and UI framework - Connectivity"
+maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
+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=b25ce4710a9c61bc6a5dbaeeb3e2ed907a8bc85478fdb2ab4312297768b695b0
+
+qt6-connectivity-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}
+	 qt6-declarative>=${version}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
+		vmove usr/lib/qt6/mkspecs
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
+	}
+}

From f39a10d6be6cc05fb737eb9af597b23a70819eb5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 18:22:57 +0700
Subject: [PATCH 24/32] New package: qt6-sensors-6.3.1

---
 common/shlibs                |  2 ++
 srcpkgs/qt6-sensors-devel    |  1 +
 srcpkgs/qt6-sensors/template | 31 +++++++++++++++++++++++++++++++
 3 files changed, 34 insertions(+)
 create mode 120000 srcpkgs/qt6-sensors-devel
 create mode 100644 srcpkgs/qt6-sensors/template

diff --git a/common/shlibs b/common/shlibs
index 2e95a22119ab..157b51f3f981 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2074,6 +2074,8 @@ libQt6Help.so.6 qt6-tools-6.1.0_1
 libQt6UiTools.so.6 qt6-tools-6.1.0_1
 libQt6Nfc.so.6 qt6-connectivity-6.3.1_1
 libQt6Bluetooth.so.6 qt6-connectivity-6.3.1_1
+libQt6Sensors.so.6 qt6-sensors-6.3.1_1
+libQt6SensorsQuick.so.6 qt6-sensors-6.3.1_1
 libQt6HunspellInputMethod.so.6 qt6-virtualkeyboard-6.1.0_1
 libQt6VirtualKeyboard.so.6 qt6-virtualkeyboard-6.1.0_1
 libQt6SerialPort.so.6 qt6-serialport-6.2.0alpha_1
diff --git a/srcpkgs/qt6-sensors-devel b/srcpkgs/qt6-sensors-devel
new file mode 120000
index 000000000000..eb9457f04055
--- /dev/null
+++ b/srcpkgs/qt6-sensors-devel
@@ -0,0 +1 @@
+qt6-sensors
\ No newline at end of file
diff --git a/srcpkgs/qt6-sensors/template b/srcpkgs/qt6-sensors/template
new file mode 100644
index 000000000000..5a81f43b60eb
--- /dev/null
+++ b/srcpkgs/qt6-sensors/template
@@ -0,0 +1,31 @@
+# Template file for 'qt6-sensors'
+pkgname=qt6-sensors
+version=6.3.1
+revision=1
+wrksrc="qtsensors-everywhere-src-${version}"
+build_style=cmake
+hostmakedepends="perl qt6-declarative-devel qt6-svg-devel pkg-config"
+makedepends="qt6-declarative-devel qt6-svg-devel"
+short_desc="Cross-platform application and UI framework - Sensors"
+maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
+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=4b240b59edba9a42b4735758a25f279a26841b982864e7b38f6ef0b81e0d60cc
+
+qt6-sensors-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}
+	 qt6-declarative-devel>=${version}_1"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
+		vmove usr/lib/qt6/mkspecs
+		vmove usr/lib/qt6/qml/QtSensors/plugins.qmltypes
+		vmove usr/lib/qt6/qml/QtSensors/qmldir
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}

From f5432c961d4c9e191c7bc92a51cf50485fa918ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 18:23:08 +0700
Subject: [PATCH 25/32] New package: qt6-remoteobjects-6.3.1

---
 common/shlibs                      |  2 ++
 srcpkgs/qt6-remoteobjects-devel    |  1 +
 srcpkgs/qt6-remoteobjects/template | 36 ++++++++++++++++++++++++++++++
 3 files changed, 39 insertions(+)
 create mode 120000 srcpkgs/qt6-remoteobjects-devel
 create mode 100644 srcpkgs/qt6-remoteobjects/template

diff --git a/common/shlibs b/common/shlibs
index 157b51f3f981..91f197e54c93 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2074,6 +2074,8 @@ libQt6Help.so.6 qt6-tools-6.1.0_1
 libQt6UiTools.so.6 qt6-tools-6.1.0_1
 libQt6Nfc.so.6 qt6-connectivity-6.3.1_1
 libQt6Bluetooth.so.6 qt6-connectivity-6.3.1_1
+libQt6RemoteObjects.so.6 qt6-remoteobjects-6.3.1_1
+libQt6RemoteObjectsQml.so.6 qt6-remoteobjects-6.3.1_1
 libQt6Sensors.so.6 qt6-sensors-6.3.1_1
 libQt6SensorsQuick.so.6 qt6-sensors-6.3.1_1
 libQt6HunspellInputMethod.so.6 qt6-virtualkeyboard-6.1.0_1
diff --git a/srcpkgs/qt6-remoteobjects-devel b/srcpkgs/qt6-remoteobjects-devel
new file mode 120000
index 000000000000..2a027f95266f
--- /dev/null
+++ b/srcpkgs/qt6-remoteobjects-devel
@@ -0,0 +1 @@
+qt6-remoteobjects
\ No newline at end of file
diff --git a/srcpkgs/qt6-remoteobjects/template b/srcpkgs/qt6-remoteobjects/template
new file mode 100644
index 000000000000..71d2d31967b6
--- /dev/null
+++ b/srcpkgs/qt6-remoteobjects/template
@@ -0,0 +1,36 @@
+# Template file for 'qt6-remoteobjects'
+pkgname=qt6-remoteobjects
+version=6.3.1
+revision=1
+wrksrc="qtremoteobjects-everywhere-src-${version}"
+build_style=cmake
+hostmakedepends="perl qt6-declarative-devel pkg-config"
+makedepends="qt6-declarative-devel"
+short_desc="Cross-platform application and UI framework - Remote Objects"
+maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
+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=ea6d038b11c60981de0bd39a6091a59abf7d031e37bfc592b31be1217bef4ca6
+
+if [ "$CROSS_BUILD" ]; then
+	hostmakedepends+=" qt6-remoteobjects"
+	configure_args="-DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true"
+fi
+
+qt6-remoteobjects-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}
+	 qt6-declarative-devel>=${version}_1"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
+		vmove usr/lib/qt6/mkspecs
+		vmove usr/lib/qt6/qml/QtRemoteObjects/plugins.qmltypes
+		vmove usr/lib/qt6/qml/QtRemoteObjects/qmldir
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}

From 0bef4c2f66d5d2a1de10dac2252aa422e67c04ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:11 +0700
Subject: [PATCH 26/32] New package: qt6-webengine-6.3.1.

---
 common/shlibs                                 |    7 +
 srcpkgs/qt6-webengine-devel                   |    1 +
 srcpkgs/qt6-webengine-examples                |    1 +
 .../patches/0001-None-no-debug.patch          |   11 +
 .../patches/0002-enable-ppc64.patch           |   20 +
 .../patches/0003-cross-hack.patch             |   10 +
 .../0004-ppc-disable-jxl-decoder.patch        |   13 +
 .../patches/0050-no-glibc-cmake-check.patch   |   14 +
 .../0100-chromium-sandbox-membarrier.patch    |   58 +
 .../qt6-webengine/patches/0101-size_t.patch   |   16 +
 .../0102-chromium-90-ruy-include.patch        |   19 +
 ...-v8-monotonic-pthread-cont_timedwait.patch |   22 +
 .../0104-chromium-revert-9d080c0.patch        |  162 +
 ...-chromium-revert-drop-of-system-java.patch |   15 +
 .../patches/0106-chromium-system-nodejs.patch |   20 +
 .../0107-chromium-cursed^Uscoped_file.patch   |   18 +
 .../0108-chromium-fix-narrowing-cast.patch    |   53 +
 .../0109-chromium-remove-strip_binary.patch   |   32 +
 ...ium-revert-use-ffile-compilation-dir.patch |   57 +
 ...11-chromium-no-Wno-stringop-overread.patch |   10 +
 .../0150-chromium-glibc-libc_malloc.patch     |   24 +
 ...-include-sys-reg.h-to-get-__WORDSIZE.patch |   21 +
 .../0201-chromium-musl-dispatch-to-musl.patch |  103 +
 .../0202-chromium-musl-no-mallinfo.patch      |   62 +
 .../0203-chromium-musl-siginfo_t.patch        |   18 +
 .../0204-chromium-musl-stackstart.patch       |   20 +
 .../patches/0205-chromium-musl-sandbox.patch  |   92 +
 ...0206-chromium-musl-default-stacksize.patch |   15 +
 .../patches/0208-chromium-musl-execinfo.patch |  125 +
 .../0209-chromium-musl-thread-stacksize.patch |   22 +
 .../0210-chromium-musl-msgvec-push_back.patch |   14 +
 ...ium-musl-canonicalize-file-name-musl.patch |   11 +
 .../0212-chromium-musl-no-getcontext.patch    |   29 +
 .../patches/0213-chromium-musl-crashpad.patch |   24 +
 .../patches/0214-chromium-musl-fixes.patch    |  108 +
 .../patches/0215-chromium-musl-cdefs.patch    |   29 +
 .../patches/0216-chromium-musl-stat.patch     |   12 +
 .../patches/0217-chromium-musl-resolver.patch |   77 +
 .../patches/0600-chromium-sndio.patch         |  876 ++++
 .../patches/0700-armv7l-neon.patch            |   10 +
 ...-chromium-musl-cross-no-asm_ptrace_h.patch |   30 +
 .../0751-chromium-musl-arm-user_vfp.patch     |   20 +
 .../0752-chromium-musl-arm-elf_auxv_t.patch   |   18 +
 ...0801-chromium-i686-vaapi-fpermissive.patch |   24 +
 .../patches/0900-xxx-ppc64le-libvpx.patch     |   65 +
 .../0901-xxx-ppc64le-sandbox-linux-stat.patch |   31 +
 .../patches/0902-xxx-ppc64le-support.patch    | 3556 +++++++++++++++++
 .../0903-xxx-ppc64le-swiftshader.patch        |   18 +
 .../patches/cross-build-examples.patch        |   16 +
 srcpkgs/qt6-webengine/template                |  178 +
 srcpkgs/qt6-webengine/update                  |    1 +
 51 files changed, 6208 insertions(+)
 create mode 120000 srcpkgs/qt6-webengine-devel
 create mode 120000 srcpkgs/qt6-webengine-examples
 create mode 100644 srcpkgs/qt6-webengine/patches/0001-None-no-debug.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0002-enable-ppc64.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0003-cross-hack.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0004-ppc-disable-jxl-decoder.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0050-no-glibc-cmake-check.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0100-chromium-sandbox-membarrier.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0101-size_t.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0102-chromium-90-ruy-include.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0103-chromium-v8-monotonic-pthread-cont_timedwait.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0104-chromium-revert-9d080c0.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0105-chromium-revert-drop-of-system-java.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0106-chromium-system-nodejs.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0107-chromium-cursed^Uscoped_file.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0108-chromium-fix-narrowing-cast.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0109-chromium-remove-strip_binary.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0110-chromium-revert-use-ffile-compilation-dir.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0111-chromium-no-Wno-stringop-overread.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0150-chromium-glibc-libc_malloc.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0200-chromium-musl-include-sys-reg.h-to-get-__WORDSIZE.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0201-chromium-musl-dispatch-to-musl.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0202-chromium-musl-no-mallinfo.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0203-chromium-musl-siginfo_t.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0204-chromium-musl-stackstart.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0205-chromium-musl-sandbox.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0206-chromium-musl-default-stacksize.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0208-chromium-musl-execinfo.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0209-chromium-musl-thread-stacksize.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0210-chromium-musl-msgvec-push_back.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0211-chromium-musl-canonicalize-file-name-musl.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0212-chromium-musl-no-getcontext.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0213-chromium-musl-crashpad.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0214-chromium-musl-fixes.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0215-chromium-musl-cdefs.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0216-chromium-musl-stat.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0217-chromium-musl-resolver.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0600-chromium-sndio.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0700-armv7l-neon.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0750-chromium-musl-cross-no-asm_ptrace_h.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0751-chromium-musl-arm-user_vfp.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0752-chromium-musl-arm-elf_auxv_t.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0801-chromium-i686-vaapi-fpermissive.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0900-xxx-ppc64le-libvpx.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0901-xxx-ppc64le-sandbox-linux-stat.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0902-xxx-ppc64le-support.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0903-xxx-ppc64le-swiftshader.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/cross-build-examples.patch
 create mode 100644 srcpkgs/qt6-webengine/template
 create mode 100644 srcpkgs/qt6-webengine/update

diff --git a/common/shlibs b/common/shlibs
index 91f197e54c93..1f8acc43c36e 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2087,6 +2087,13 @@ libQt6Positioning.so.6 qt6-location-6.2.0alpha_1
 libQt6MultimediaWidgets.so.6 qt6-multimedia-6.3.1_1
 libQt6MultimediaQuick.so.6 qt6-multimedia-6.3.1_1
 libQt6Multimedia.so.6 qt6-multimedia-6.3.1_1
+libQt6WebEngineQuick.so.6 qt6-webengine-6.3.1_1
+libQt6PdfWidgets.so.6 qt6-webengine-6.3.1_1
+libQt6PdfQuick.so.6 qt6-webengine-6.3.1_1
+libQt6WebEngineCore.so.6 qt6-webengine-6.3.1_1
+libQt6Pdf.so.6 qt6-webengine-6.3.1_1
+libQt6WebEngineQuickDelegatesQml.so.6 qt6-webengine-6.3.1_1
+libQt6WebEngineWidgets.so.6 qt6-webengine-6.3.1_1
 libnpth.so.0 npth-1.1_1
 libnpupnp.so.4 libnpupnp-4.0.2_1
 libglfw.so.3 glfw-3.0.4_1
diff --git a/srcpkgs/qt6-webengine-devel b/srcpkgs/qt6-webengine-devel
new file mode 120000
index 000000000000..8e4d1b99c587
--- /dev/null
+++ b/srcpkgs/qt6-webengine-devel
@@ -0,0 +1 @@
+qt6-webengine
\ No newline at end of file
diff --git a/srcpkgs/qt6-webengine-examples b/srcpkgs/qt6-webengine-examples
new file mode 120000
index 000000000000..8e4d1b99c587
--- /dev/null
+++ b/srcpkgs/qt6-webengine-examples
@@ -0,0 +1 @@
+qt6-webengine
\ No newline at end of file
diff --git a/srcpkgs/qt6-webengine/patches/0001-None-no-debug.patch b/srcpkgs/qt6-webengine/patches/0001-None-no-debug.patch
new file mode 100644
index 000000000000..1ba33f8e6fd9
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0001-None-no-debug.patch
@@ -0,0 +1,11 @@
+--- a/cmake/Functions.cmake
++++ b/cmake/Functions.cmake
+@@ -813,6 +813,8 @@ macro(append_build_type_setup)
+         endif()
+     elseif(${config} STREQUAL "MinSizeRel")
+         list(APPEND gnArgArg is_debug=false symbol_level=0 optimize_for_size=true)
++    elseif(${config} STREQUAL "None")
++        list(APPEND gnArgArg is_debug=false symbol_level=0)
+     endif()
+     if(FEATURE_developer_build OR (${config} STREQUAL "Debug") OR QT_FEATURE_webengine_sanitizer)
+         list(APPEND gnArgArg
diff --git a/srcpkgs/qt6-webengine/patches/0002-enable-ppc64.patch b/srcpkgs/qt6-webengine/patches/0002-enable-ppc64.patch
new file mode 100644
index 000000000000..d72ef1ad1a10
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0002-enable-ppc64.patch
@@ -0,0 +1,20 @@
+--- a/cmake/Functions.cmake
++++ b/cmake/Functions.cmake
+@@ -622,6 +622,8 @@ function(get_gn_arch result arch)
+         set(${result} "mipsel" PARENT_SCOPE)
+     elseif(arch STREQUAL "mipsel64")
+         set(${result} "mips64el" PARENT_SCOPE)
++    elseif(arch STREQUAL "power64")
++        set(${result} "power64" PARENT_SCOPE)
+     else()
+         message(DEBUG "Unsupported architecture: ${arch}")
+     endif()
+@@ -641,6 +643,8 @@ function(get_v8_arch result targetArch h
+             set(${result} "mipsel" PARENT_SCOPE)
+         elseif(hostArch STREQUAL "mipsel64")
+             set(${result} "mipsel" PARENT_SCOPE)
++        elseif(hostArch STREQUAL "power64")
++            set(${result} "power64" PARENT_SCOPE)
+         else()
+             message(DEBUG "Unsupported architecture: ${hostArch}")
+         endif()
diff --git a/srcpkgs/qt6-webengine/patches/0003-cross-hack.patch b/srcpkgs/qt6-webengine/patches/0003-cross-hack.patch
new file mode 100644
index 000000000000..ea9f90094a63
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0003-cross-hack.patch
@@ -0,0 +1,10 @@
+--- a/src/core/api/CMakeLists.txt
++++ b/src/core/api/CMakeLists.txt
+@@ -50,6 +50,7 @@ qt_internal_add_module(WebEngineCore
+         Qt::Gui
+         Qt::Network
+         Qt::Quick
++        X11
+ )
+ 
+ set_target_properties(WebEngineCore PROPERTIES QTWEBENGINEPROCESS_NAME ${qtWebEngineProcessName})
diff --git a/srcpkgs/qt6-webengine/patches/0004-ppc-disable-jxl-decoder.patch b/srcpkgs/qt6-webengine/patches/0004-ppc-disable-jxl-decoder.patch
new file mode 100644
index 000000000000..73c1151968f4
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0004-ppc-disable-jxl-decoder.patch
@@ -0,0 +1,13 @@
+--- a/src/core/CMakeLists.txt
++++ b/src/core/CMakeLists.txt
+@@ -414,6 +414,10 @@ foreach(arch ${archs})
+                 CONDITION QT_FEATURE_webengine_ozone_x11 AND XSCRNSAVER_FOUND
+             )
+ 
++            if (cpu STREQUAL "ppc64")
++                list(APPEND gnArgArg enable_jxl_decoder=false)
++            endif()
++
+             if(QT_FEATURE_webengine_kerberos)
+                 list(APPEND gnArgArg
+                      external_gssapi_include_dir="${GSSAPI_INCLUDE_DIRS}/gssapi"
diff --git a/srcpkgs/qt6-webengine/patches/0050-no-glibc-cmake-check.patch b/srcpkgs/qt6-webengine/patches/0050-no-glibc-cmake-check.patch
new file mode 100644
index 000000000000..f756bf0286bb
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0050-no-glibc-cmake-check.patch
@@ -0,0 +1,14 @@
+--- a/configure.cmake
++++ b/configure.cmake
+@@ -499,11 +499,6 @@ add_check_for_support(
+ )
+ add_check_for_support(
+    MODULES QtWebEngine QtPdf
+-   CONDITION NOT LINUX OR TEST_glibc
+-   MESSAGE "A suitable version >= 2.17 of glibc is required."
+-)
+-add_check_for_support(
+-   MODULES QtWebEngine QtPdf
+    CONDITION NOT LINUX OR TEST_khr
+    MESSAGE "Build requires Khronos development headers for build - see mesa/libegl1-mesa-dev"
+ )
diff --git a/srcpkgs/qt6-webengine/patches/0100-chromium-sandbox-membarrier.patch b/srcpkgs/qt6-webengine/patches/0100-chromium-sandbox-membarrier.patch
new file mode 100644
index 000000000000..2dd7b4aa948f
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0100-chromium-sandbox-membarrier.patch
@@ -0,0 +1,58 @@
+--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
++++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
+@@ -413,6 +413,7 @@ bool SyscallSets::IsAllowedProcessStartO
+   switch (sysno) {
+     case __NR_exit:
+     case __NR_exit_group:
++    case __NR_membarrier:
+     case __NR_wait4:
+     case __NR_waitid:
+ #if defined(__i386__)
+--- a/src/3rdparty/chromium/sandbox/linux/system_headers/arm64_linux_syscalls.h
++++ b/src/3rdparty/chromium/sandbox/linux/system_headers/arm64_linux_syscalls.h
+@@ -1215,4 +1215,8 @@
+ #define __NR_landlock_restrict_self 446
+ #endif
+ 
++#if !defined(__NR_membarrier)
++#define __NR_membarrier 283
++#endif
++
+ #endif  // SANDBOX_LINUX_SYSTEM_HEADERS_ARM64_LINUX_SYSCALLS_H_
+--- a/src/3rdparty/chromium/sandbox/linux/system_headers/arm_linux_syscalls.h
++++ b/src/3rdparty/chromium/sandbox/linux/system_headers/arm_linux_syscalls.h
+@@ -1617,6 +1617,10 @@
+ #define __NR_landlock_restrict_self (__NR_SYSCALL_BASE + 446)
+ #endif
+ 
++#if !defined(__NR_membarrier)
++#define __NR_membarrier (__NR_SYSCALL_BASE+389)
++#endif
++
+ // ARM private syscalls.
+ #if !defined(__ARM_NR_BASE)
+ #define __ARM_NR_BASE (__NR_SYSCALL_BASE + 0xF0000)
+--- a/src/3rdparty/chromium/sandbox/linux/system_headers/x86_32_linux_syscalls.h
++++ b/src/3rdparty/chromium/sandbox/linux/system_headers/x86_32_linux_syscalls.h
+@@ -1750,5 +1750,9 @@
+ #define __NR_landlock_restrict_self 446
+ #endif
+ 
++#if !defined(__NR_membarrier)
++#define __NR_membarrier 375
++#endif
++
+ #endif  // SANDBOX_LINUX_SYSTEM_HEADERS_X86_32_LINUX_SYSCALLS_H_
+ 
+--- a/src/3rdparty/chromium/sandbox/linux/system_headers/x86_64_linux_syscalls.h
++++ b/src/3rdparty/chromium/sandbox/linux/system_headers/x86_64_linux_syscalls.h
+@@ -1438,5 +1438,9 @@
+ #define __NR_landlock_restrict_self 446
+ #endif
+ 
++#if !defined(__NR_membarrier)
++#define __NR_membarrier 324
++#endif
++
+ #endif  // SANDBOX_LINUX_SYSTEM_HEADERS_X86_64_LINUX_SYSCALLS_H_
+ 
diff --git a/srcpkgs/qt6-webengine/patches/0101-size_t.patch b/srcpkgs/qt6-webengine/patches/0101-size_t.patch
new file mode 100644
index 000000000000..fccc085da311
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0101-size_t.patch
@@ -0,0 +1,16 @@
+--- a/src/3rdparty/chromium/third_party/angle/include/platform/PlatformMethods.h
++++ b/src/3rdparty/chromium/third_party/angle/include/platform/PlatformMethods.h
+@@ -239,11 +239,11 @@ inline void DefaultOverrideFeaturesMtl(P
+ using ProgramKeyType   = std::array<uint8_t, 20>;
+ using CacheProgramFunc = void (*)(PlatformMethods *platform,
+                                   const ProgramKeyType &key,
+-                                  size_t programSize,
++                                  std::size_t programSize,
+                                   const uint8_t *programBytes);
+ inline void DefaultCacheProgram(PlatformMethods *platform,
+                                 const ProgramKeyType &key,
+-                                size_t programSize,
++                                std::size_t programSize,
+                                 const uint8_t *programBytes)
+ {}
+ 
diff --git a/srcpkgs/qt6-webengine/patches/0102-chromium-90-ruy-include.patch b/srcpkgs/qt6-webengine/patches/0102-chromium-90-ruy-include.patch
new file mode 100644
index 000000000000..bbba579076d6
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0102-chromium-90-ruy-include.patch
@@ -0,0 +1,19 @@
+From 714092f336bb14d2fcc27396ec323b3d843bb962 Mon Sep 17 00:00:00 2001
+From: Stephan Hartmann <stha09@googlemail.com>
+Date: Thu, 4 Mar 2021 15:05:46 +0000
+Subject: [PATCH] IWYU: include limits for std::numeric_limits
+
+---
+ third_party/ruy/src/ruy/block_map.cc | 1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/src/3rdparty/chromium/third_party/ruy/src/ruy/block_map.cc
++++ b/src/3rdparty/chromium/third_party/ruy/src/ruy/block_map.cc
+@@ -17,6 +17,7 @@ limitations under the License.
+ 
+ #include <algorithm>
+ #include <cstdint>
++#include <limits>
+ 
+ #ifdef RUY_MAKEBLOCKMAP_DEBUG
+ #include <cstdio>
diff --git a/srcpkgs/qt6-webengine/patches/0103-chromium-v8-monotonic-pthread-cont_timedwait.patch b/srcpkgs/qt6-webengine/patches/0103-chromium-v8-monotonic-pthread-cont_timedwait.patch
new file mode 100644
index 000000000000..1dc8bc4d3d17
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0103-chromium-v8-monotonic-pthread-cont_timedwait.patch
@@ -0,0 +1,22 @@
+Use monotonic clock for pthread_cond_timedwait with musl too.
+
+--- a/src/3rdparty/chromium/v8/src/base/platform/condition-variable.cc
++++ b/src/3rdparty/chromium/v8/src/base/platform/condition-variable.cc
+@@ -20,7 +20,7 @@ namespace base {
+ 
+ ConditionVariable::ConditionVariable() {
+ #if (V8_OS_FREEBSD || V8_OS_NETBSD || V8_OS_OPENBSD || \
+-     (V8_OS_LINUX && V8_LIBC_GLIBC))
++     V8_OS_LINUX)
+   // On Free/Net/OpenBSD and Linux with glibc we can change the time
+   // source for pthread_cond_timedwait() to use the monotonic clock.
+   pthread_condattr_t attr;
+@@ -96,7 +96,7 @@ bool ConditionVariable::WaitFor(Mutex* m
+       &native_handle_, &mutex->native_handle(), &ts);
+ #else
+ #if (V8_OS_FREEBSD || V8_OS_NETBSD || V8_OS_OPENBSD || \
+-     (V8_OS_LINUX && V8_LIBC_GLIBC))
++     V8_OS_LINUX)
+   // On Free/Net/OpenBSD and Linux with glibc we can change the time
+   // source for pthread_cond_timedwait() to use the monotonic clock.
+   result = clock_gettime(CLOCK_MONOTONIC, &ts);
diff --git a/srcpkgs/qt6-webengine/patches/0104-chromium-revert-9d080c0.patch b/srcpkgs/qt6-webengine/patches/0104-chromium-revert-9d080c0.patch
new file mode 100644
index 000000000000..42b1ee9ec063
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0104-chromium-revert-9d080c0.patch
@@ -0,0 +1,162 @@
+ Original change's description:
+ > Replace 'blacklist' with 'ignorelist' in ./tools/msan/.
+ >
+ > Bug: 1097272, 1097268
+ > Change-Id: Id5c8227a5bfb1ffaec82d3168b609085b10c8297
+ > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2867730
+ > Commit-Queue: Dylan Cutler <dylancutler@google.com>
+ > Reviewed-by: Nico Weber <thakis@chromium.org>
+ > Reviewed-by: Jonathan Metzman <metzman@chromium.org>
+ > Cr-Commit-Position: refs/heads/master@{#883035}
+--- a/src/3rdparty/chromium/build/config/sanitizers/BUILD.gn
++++ b/src/3rdparty/chromium/build/config/sanitizers/BUILD.gn
+@@ -272,11 +272,11 @@ config("asan_flags") {
+   if (is_asan) {
+     cflags += [ "-fsanitize=address" ]
+     if (is_win) {
+-      if (!defined(asan_win_blocklist_path)) {
+-        asan_win_blocklist_path =
++      if (!defined(asan_win_blacklist_path)) {
++        asan_win_blacklist_path =
+             rebase_path("//tools/memory/asan/blocklist_win.txt", root_build_dir)
+       }
+-      cflags += [ "-fsanitize-ignorelist=$asan_win_blocklist_path" ]
++      cflags += [ "-fsanitize-blacklist=$asan_win_blacklist_path" ]
+     }
+   }
+ }
+@@ -306,13 +306,13 @@ config("link_shared_library") {
+ config("cfi_flags") {
+   cflags = []
+   if (is_cfi && current_toolchain == default_toolchain) {
+-    if (!defined(cfi_ignorelist_path)) {
+-      cfi_ignorelist_path =
++    if (!defined(cfi_blacklist_path)) {
++      cfi_blacklist_path =
+           rebase_path("//tools/cfi/ignores.txt", root_build_dir)
+     }
+     cflags += [
+       "-fsanitize=cfi-vcall",
+-      "-fsanitize-ignorelist=$cfi_ignorelist_path",
++      "-fsanitize-blacklist=$cfi_blacklist_path",
+     ]
+ 
+     if (use_cfi_cast) {
+@@ -409,14 +409,14 @@ config("msan_flags") {
+   if (is_msan) {
+     assert(is_linux || is_chromeos,
+            "msan only supported on linux x86_64/ChromeOS")
+-    if (!defined(msan_ignorelist_path)) {
+-      msan_ignorelist_path =
+-          rebase_path("//tools/msan/ignorelist.txt", root_build_dir)
++    if (!defined(msan_blacklist_path)) {
++      msan_blacklist_path =
++          rebase_path("//tools/msan/blacklist.txt", root_build_dir)
+     }
+     cflags = [
+       "-fsanitize=memory",
+       "-fsanitize-memory-track-origins=$msan_track_origins",
+-      "-fsanitize-ignorelist=$msan_ignorelist_path",
++      "-fsanitize-blacklist=$msan_blacklist_path",
+     ]
+   }
+ }
+@@ -424,13 +424,13 @@ config("msan_flags") {
+ config("tsan_flags") {
+   if (is_tsan) {
+     assert(is_linux || is_chromeos, "tsan only supported on linux x86_64")
+-    if (!defined(tsan_ignorelist_path)) {
+-      tsan_ignorelist_path =
++    if (!defined(tsan_blacklist_path)) {
++      tsan_blacklist_path =
+           rebase_path("//tools/memory/tsan_v2/ignores.txt", root_build_dir)
+     }
+     cflags = [
+       "-fsanitize=thread",
+-      "-fsanitize-ignorelist=$tsan_ignorelist_path",
++      "-fsanitize-blacklist=$tsan_blacklist_path",
+     ]
+   }
+ }
+@@ -438,8 +438,8 @@ config("tsan_flags") {
+ config("ubsan_flags") {
+   cflags = []
+   if (is_ubsan) {
+-    if (!defined(ubsan_ignorelist_path)) {
+-      ubsan_ignorelist_path =
++    if (!defined(ubsan_blacklist_path)) {
++      ubsan_blacklist_path =
+           rebase_path("//tools/ubsan/ignorelist.txt", root_build_dir)
+     }
+     cflags += [
+@@ -456,7 +456,7 @@ config("ubsan_flags") {
+       "-fsanitize=signed-integer-overflow",
+       "-fsanitize=unreachable",
+       "-fsanitize=vla-bound",
+-      "-fsanitize-ignorelist=$ubsan_ignorelist_path",
++      "-fsanitize-blacklist=$ubsan_blacklist_path",
+     ]
+     if (!is_clang) {
+       # These exposes too much illegal C++14 code to compile on anything stricter than clang:
+@@ -497,8 +497,8 @@ config("ubsan_no_recover") {
+ 
+ config("ubsan_security_flags") {
+   if (is_ubsan_security) {
+-    if (!defined(ubsan_security_ignorelist_path)) {
+-      ubsan_security_ignorelist_path =
++    if (!defined(ubsan_security_blacklist_path)) {
++      ubsan_security_blacklist_path =
+           rebase_path("//tools/ubsan/security_ignorelist.txt", root_build_dir)
+     }
+     cflags = [
+@@ -506,7 +506,7 @@ config("ubsan_security_flags") {
+       "-fsanitize=shift",
+       "-fsanitize=signed-integer-overflow",
+       "-fsanitize=vla-bound",
+-      "-fsanitize-ignorelist=$ubsan_security_ignorelist_path",
++      "-fsanitize-blacklist=$ubsan_security_blacklist_path",
+     ]
+   }
+ }
+@@ -519,13 +519,13 @@ config("ubsan_null_flags") {
+ 
+ config("ubsan_vptr_flags") {
+   if (is_ubsan_vptr) {
+-    if (!defined(ubsan_vptr_ignorelist_path)) {
+-      ubsan_vptr_ignorelist_path =
++    if (!defined(ubsan_vptr_blacklist_path)) {
++      ubsan_vptr_blacklist_path =
+           rebase_path("//tools/ubsan/vptr_ignorelist.txt", root_build_dir)
+     }
+     cflags = [
+       "-fsanitize=vptr",
+-      "-fsanitize-ignorelist=$ubsan_vptr_ignorelist_path",
++      "-fsanitize-blacklist=$ubsan_vptr_blacklist_path",
+     ]
+     if (!is_clang) {
+       # Clang specific flag:
+--- a/src/3rdparty/chromium/build_overrides/build.gni
++++ b/src/3rdparty/chromium/build_overrides/build.gni
+@@ -43,15 +43,15 @@ declare_args() {
+ # Allows different projects to specify their own suppression/ignore lists for
+ # sanitizer tools.
+ # asan_suppressions_file = "path/to/asan_suppressions.cc"
+-# asan_win_ignorelist_path = "path/to/asan/blocklist_win.txt"
++# asan_win_blacklist_path = "path/to/asan/blocklist_win.txt"
+ # lsan_suppressions_file = "path/to/lsan_suppressions.cc"
+ # tsan_suppressions_file = "path/to/tsan_suppressions.cc"
+-# tsan_ignorelist_path = "path/to/tsan/ignores.txt"
+-# msan_ignorelist_path = "path/to/msan/ignorelist.txt"
+-# ubsan_ignorelist_path = "path/to/ubsan/ignorelist.txt"
+-# ubsan_vptr_ignorelist_path = "path/to/ubsan/vptr_ignorelist.txt"
+-# ubsan_security_ignorelist_path = "path/to/ubsan/security_ignorelist.txt"
+-# cfi_ignorelist_path = "path/to/cfi/ignores.txt"
++# tsan_blacklist_path = "path/to/tsan/ignores.txt"
++# msan_blacklist_path = "path/to/msan/blacklist.txt"
++# ubsan_blacklist_path = "path/to/ubsan/blacklist.txt"
++# ubsan_vptr_blacklist_path = "path/to/ubsan/vptr_blacklist.txt"
++# ubsan_security_blacklist_path = "path/to/ubsan/security_blacklist.txt"
++# cfi_blacklist_path = "path/to/cfi/ignores.txt"
+ 
+ declare_args() {
+   # Android 32-bit non-component, non-clang builds cannot have symbol_level=2
diff --git a/srcpkgs/qt6-webengine/patches/0105-chromium-revert-drop-of-system-java.patch b/srcpkgs/qt6-webengine/patches/0105-chromium-revert-drop-of-system-java.patch
new file mode 100644
index 000000000000..44f3aa8fae5e
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0105-chromium-revert-drop-of-system-java.patch
@@ -0,0 +1,15 @@
+This was dropped for some reason in 6951c37cecd05979b232a39e5c10e6346a0f74ef
+--- a/src/3rdparty/chromium/third_party/closure_compiler/compiler.py
++++ b/src/3rdparty/chromium/third_party/closure_compiler/compiler.py
+@@ -13,8 +13,9 @@ import subprocess
+ 
+ 
+ _CURRENT_DIR = os.path.join(os.path.dirname(__file__))
+-_JAVA_PATH = os.path.join(_CURRENT_DIR, "..", "jdk", "current", "bin", "java")
+-assert os.path.isfile(_JAVA_PATH), "java only allowed in android builds"
++_JAVA_BIN = "java"
++_JDK_PATH = os.path.join(_CURRENT_DIR, "..", "jdk", "current", "bin", "java")
++_JAVA_PATH = _JDK_PATH if os.path.isfile(_JDK_PATH) else _JAVA_BIN
+ 
+ class Compiler(object):
+   """Runs the Closure compiler on given source files to typecheck them
diff --git a/srcpkgs/qt6-webengine/patches/0106-chromium-system-nodejs.patch b/srcpkgs/qt6-webengine/patches/0106-chromium-system-nodejs.patch
new file mode 100644
index 000000000000..1e067cc6eda0
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0106-chromium-system-nodejs.patch
@@ -0,0 +1,20 @@
+--- a/src/3rdparty/chromium/third_party/node/node.py
++++ b/src/3rdparty/chromium/third_party/node/node.py
+@@ -36,11 +36,12 @@ def GetBinaryPath():
+   if platform.system() == 'Darwin' and platform.machine() == 'arm64':
+       return os.path.join(os_path.join(os_path.dirname(__file__), 'mac',
+                           'node-darwin-arm64', 'bin', 'node'))
+-  return os_path.join(os_path.dirname(__file__), *{
+-    'Darwin': ('mac', 'node-darwin-x64', 'bin', 'node'),
+-    'Linux': ('linux', 'node-linux-x64', 'bin', 'node'),
+-    'Windows': ('win', 'node.exe'),
+-  }[platform.system()])
++  return "/usr/bin/node"
++  #return os_path.join(os_path.dirname(__file__), *{
++  #  'Darwin': ('mac', 'node-darwin-x64', 'bin', 'node'),
++  #  'Linux': ('linux', 'node-linux-x64', 'bin', 'node'),
++  #  'Windows': ('win', 'node.exe'),
++  #}[platform.system()])
+ 
+ 
+ def RunNode(cmd_parts, stdout=None):
diff --git a/srcpkgs/qt6-webengine/patches/0107-chromium-cursed^Uscoped_file.patch b/srcpkgs/qt6-webengine/patches/0107-chromium-cursed^Uscoped_file.patch
new file mode 100644
index 000000000000..a8f5d971883d
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0107-chromium-cursed^Uscoped_file.patch
@@ -0,0 +1,18 @@
+--- a/src/3rdparty/chromium/base/files/scoped_file_linux.cc
++++ b/src/3rdparty/chromium/base/files/scoped_file_linux.cc
+@@ -77,15 +77,3 @@ bool IsFDOwned(int fd) {
+ }
+ 
+ }  // namespace base
+-
+-extern "C" {
+-
+-int __close(int);
+-
+-__attribute__((visibility("default"), noinline)) int close(int fd) {
+-  if (base::IsFDOwned(fd) && g_is_ownership_enforced)
+-    CrashOnFdOwnershipViolation();
+-  return __close(fd);
+-}
+-
+-}  // extern "C"
diff --git a/srcpkgs/qt6-webengine/patches/0108-chromium-fix-narrowing-cast.patch b/srcpkgs/qt6-webengine/patches/0108-chromium-fix-narrowing-cast.patch
new file mode 100644
index 000000000000..ed32cd9b7415
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0108-chromium-fix-narrowing-cast.patch
@@ -0,0 +1,53 @@
+--- a/src/3rdparty/chromium/base/files/file_util_linux.cc
++++ b/src/3rdparty/chromium/base/files/file_util_linux.cc
+@@ -23,14 +23,14 @@ bool GetFileSystemType(const FilePath& p
+ 
+   // Not all possible |statfs_buf.f_type| values are in linux/magic.h.
+   // Missing values are copied from the statfs man page.
+-  switch (statfs_buf.f_type) {
++  switch (static_cast<uintmax_t>(statfs_buf.f_type)) {
+     case 0:
+       *type = FILE_SYSTEM_0;
+       break;
+     case EXT2_SUPER_MAGIC:  // Also ext3 and ext4
+     case MSDOS_SUPER_MAGIC:
+     case REISERFS_SUPER_MAGIC:
+-    case static_cast<int>(BTRFS_SUPER_MAGIC):
++    case BTRFS_SUPER_MAGIC:
+     case 0x5346544E:  // NTFS
+     case 0x58465342:  // XFS
+     case 0x3153464A:  // JFS
+@@ -40,14 +40,14 @@ bool GetFileSystemType(const FilePath& p
+       *type = FILE_SYSTEM_NFS;
+       break;
+     case SMB_SUPER_MAGIC:
+-    case static_cast<int>(0xFF534D42):  // CIFS
++    case 0xFF534D42:  // CIFS
+       *type = FILE_SYSTEM_SMB;
+       break;
+     case CODA_SUPER_MAGIC:
+       *type = FILE_SYSTEM_CODA;
+       break;
+-    case static_cast<int>(HUGETLBFS_MAGIC):
+-    case static_cast<int>(RAMFS_MAGIC):
++    case HUGETLBFS_MAGIC:
++    case RAMFS_MAGIC:
+     case TMPFS_MAGIC:
+       *type = FILE_SYSTEM_MEMORY;
+       break;
+--- a/src/3rdparty/chromium/base/system/sys_info_posix.cc
++++ b/src/3rdparty/chromium/base/system/sys_info_posix.cc
+@@ -100,10 +100,10 @@ bool IsStatsZeroIfUnlimited(const base::
+   if (HANDLE_EINTR(statfs(path.value().c_str(), &stats)) != 0)
+     return false;
+ 
+-  switch (stats.f_type) {
++  switch (static_cast<uintmax_t>(stats.f_type)) {
+     case TMPFS_MAGIC:
+-    case static_cast<int>(HUGETLBFS_MAGIC):
+-    case static_cast<int>(RAMFS_MAGIC):
++    case HUGETLBFS_MAGIC:
++    case RAMFS_MAGIC:
+       return true;
+   }
+   return false;
diff --git a/srcpkgs/qt6-webengine/patches/0109-chromium-remove-strip_binary.patch b/srcpkgs/qt6-webengine/patches/0109-chromium-remove-strip_binary.patch
new file mode 100644
index 000000000000..5ebd16e659af
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0109-chromium-remove-strip_binary.patch
@@ -0,0 +1,32 @@
+--- a/src/3rdparty/chromium/chrome/test/chromedriver/BUILD.gn
++++ b/src/3rdparty/chromium/chrome/test/chromedriver/BUILD.gn
+@@ -308,11 +308,7 @@ source_set("lib") {
+   }
+ }
+ 
+-if (is_linux) {
+-  chromedriver_output = "chromedriver.unstripped"
+-} else {
+-  chromedriver_output = "chromedriver"
+-}
++chromedriver_output = "chromedriver"
+ 
+ executable("$chromedriver_output") {
+   testonly = true
+@@ -336,16 +332,6 @@ executable("$chromedriver_output") {
+   }
+ }
+ 
+-if (is_linux) {
+-  strip_binary("chromedriver") {
+-    testonly = true
+-    binary_input = "$root_out_dir/$chromedriver_output"
+-    symbol_output = "$root_out_dir/chromedriver.debug"
+-    stripped_binary_output = "$root_out_dir/chromedriver"
+-    deps = [ ":$chromedriver_output" ]
+-  }
+-}
+-
+ python_library("chromedriver_py_tests") {
+   testonly = true
+   deps = [
diff --git a/srcpkgs/qt6-webengine/patches/0110-chromium-revert-use-ffile-compilation-dir.patch b/srcpkgs/qt6-webengine/patches/0110-chromium-revert-use-ffile-compilation-dir.patch
new file mode 100644
index 000000000000..a00f7ea80f7a
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0110-chromium-revert-use-ffile-compilation-dir.patch
@@ -0,0 +1,57 @@
+From 34a955823630096f5b01c2b01d51c1ea59d22763 Mon Sep 17 00:00:00 2001
+From: Zequan Wu <zequanwu@google.com>
+Date: Tue, 20 Jul 2021 14:13:50 +0000
+Subject: [PATCH] Use -ffile-compilation-dir= instead of
+ -fdebug-compilation-dir=
+
+Bug: 1010267
+Change-Id: If2b4ead8535a76490eb466a38e3d8fed6ea91079
+Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2770738
+Auto-Submit: Zequan Wu <zequanwu@google.com>
+Commit-Queue: Nico Weber <thakis@chromium.org>
+Reviewed-by: Nico Weber <thakis@chromium.org>
+Cr-Commit-Position: refs/heads/master@{#903456}
+--- a/src/3rdparty/chromium/build/config/compiler/BUILD.gn
++++ b/src/3rdparty/chromium/build/config/compiler/BUILD.gn
+@@ -1269,19 +1269,12 @@ config("compiler_deterministic") {
+     # different build directory like "out/feature_a" and "out/feature_b" if
+     # we build same files with same compile flag.
+     # Other paths are already given in relative, no need to normalize them.
+-    if (is_nacl) {
+-      # TODO(https://crbug.com/1231236): Use -ffile-compilation-dir= here.
+-      cflags += [
+-        "-Xclang",
+-        "-fdebug-compilation-dir",
+-        "-Xclang",
+-        ".",
+-      ]
+-    } else {
+-      # -ffile-compilation-dir is an alias for both -fdebug-compilation-dir=
+-      # and -fcoverage-compilation-dir=.
+-      cflags += [ "-ffile-compilation-dir=." ]
+-    }
++    cflags += [
++      "-Xclang",
++      "-fdebug-compilation-dir",
++      "-Xclang",
++      ".",
++    ]
+     if (!is_win) {
+       # We don't use clang -cc1as on Windows (yet? https://crbug.com/762167)
+       asmflags = [ "-Wa,-fdebug-compilation-dir,." ]
+--- a/src/3rdparty/chromium/build/config/compiler/compiler.gni
++++ b/src/3rdparty/chromium/build/config/compiler/compiler.gni
+@@ -228,8 +228,11 @@ declare_args() {
+ # deterministic builds to reduce compile times, so this is less relevant for
+ # official builders.
+ strip_absolute_paths_from_debug_symbols_default =
+-    is_android || is_fuchsia || is_nacl || (is_win && use_lld) || is_linux ||
+-    is_chromeos || (is_apple && !enable_dsyms)
++    # TODO(crbug.com/1010267): remove '!use_clang_coverage', coverage build has
++    # dependency to absolute path of source files.
++    !use_clang_coverage &&
++    (is_android || is_fuchsia || is_nacl || (is_win && use_lld) || is_linux ||
++     is_chromeos || (is_apple && !enable_dsyms))
+ 
+ declare_args() {
+   strip_absolute_paths_from_debug_symbols = strip_absolute_paths_from_debug_symbols_default
diff --git a/srcpkgs/qt6-webengine/patches/0111-chromium-no-Wno-stringop-overread.patch b/srcpkgs/qt6-webengine/patches/0111-chromium-no-Wno-stringop-overread.patch
new file mode 100644
index 000000000000..03eac3f8e067
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0111-chromium-no-Wno-stringop-overread.patch
@@ -0,0 +1,10 @@
+--- a/src/3rdparty/chromium/build/config/compiler/BUILD.gn
++++ b/src/3rdparty/chromium/build/config/compiler/BUILD.gn
+@@ -394,7 +394,6 @@ config("compiler") {
+         "-Wno-parentheses",
+         "-Wno-sign-compare", # fido
+         "-Wno-stringop-overflow", # skia, libaom, protobuf, icu
+-        "-Wno-stringop-overread", # libaom
+         "-Wno-psabi", # skia
+         "-Wno-multichar", # crashpad
+         "-Wno-format-zero-length", # user_agent.cc
diff --git a/srcpkgs/qt6-webengine/patches/0150-chromium-glibc-libc_malloc.patch b/srcpkgs/qt6-webengine/patches/0150-chromium-glibc-libc_malloc.patch
new file mode 100644
index 000000000000..7e1b66e5c73d
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0150-chromium-glibc-libc_malloc.patch
@@ -0,0 +1,24 @@
+--- a/src/3rdparty/chromium/base/process/memory_linux.cc
++++ b/src/3rdparty/chromium/base/process/memory_linux.cc
+@@ -23,6 +23,12 @@
+ #include "third_party/tcmalloc/chromium/src/gperftools/tcmalloc.h"
+ #endif
+ 
++#if defined(LIBC_GLIBC)
++extern "C" {
++extern void *__libc_malloc(size_t size);
++}
++#endif
++
+ namespace base {
+ 
+ namespace {
+@@ -120,7 +126,7 @@ bool UncheckedMalloc(size_t size, void**
+     (!defined(LIBC_GLIBC) && !BUILDFLAG(USE_TCMALLOC))
+   *result = malloc(size);
+ #elif defined(LIBC_GLIBC) && !BUILDFLAG(USE_TCMALLOC)
+-  *result = __libc_malloc(size);
++  *result = ::__libc_malloc(size);
+ #elif BUILDFLAG(USE_TCMALLOC)
+   *result = tc_malloc_skip_new_handler(size);
+ #endif
diff --git a/srcpkgs/qt6-webengine/patches/0200-chromium-musl-include-sys-reg.h-to-get-__WORDSIZE.patch b/srcpkgs/qt6-webengine/patches/0200-chromium-musl-include-sys-reg.h-to-get-__WORDSIZE.patch
new file mode 100644
index 000000000000..41b90071b5e4
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0200-chromium-musl-include-sys-reg.h-to-get-__WORDSIZE.patch
@@ -0,0 +1,21 @@
+From 9001c54d6b974449174a8cee8f3f5d78a9bd6c9e Mon Sep 17 00:00:00 2001
+From: Felix Janda <felix.janda@posteo.de>
+Date: Sun, 1 Feb 2015 14:26:52 +0100
+Subject: [PATCH 3/6] include <sys/reg.h> to get __WORDSIZE on musl libc
+
+---
+ qtwebengine/src/3rdparty/chromium/third_party/breakpad/breakpad/src/common/linux/elf_core_dump.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/common/linux/elf_core_dump.h
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/common/linux/elf_core_dump.h
+@@ -37,6 +37,9 @@
+ #include <limits.h>
+ #include <link.h>
+ #include <stddef.h>
++#ifndef __GLIBC__
++#include <sys/reg.h>
++#endif
+ 
+ #include "common/memory_range.h"
+ 
diff --git a/srcpkgs/qt6-webengine/patches/0201-chromium-musl-dispatch-to-musl.patch b/srcpkgs/qt6-webengine/patches/0201-chromium-musl-dispatch-to-musl.patch
new file mode 100644
index 000000000000..a58a688a4b55
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0201-chromium-musl-dispatch-to-musl.patch
@@ -0,0 +1,103 @@
+--- a/src/3rdparty/chromium/base/allocator/allocator_shim_default_dispatch_to_glibc.cc
++++ b/src/3rdparty/chromium/base/allocator/allocator_shim_default_dispatch_to_glibc.cc
+@@ -8,6 +8,7 @@
+ #include <dlfcn.h>
+ #include <malloc.h>
+ 
++#if defined(__GLIBC__)
+ // This translation unit defines a default dispatch for the allocator shim which
+ // routes allocations to libc functions.
+ // The code here is strongly inspired from tcmalloc's libc_override_glibc.h.
+@@ -87,3 +88,92 @@ const AllocatorDispatch AllocatorDispatc
+     nullptr,               /* aligned_free_function */
+     nullptr,               /* next */
+ };
++
++#else // defined(__GLIBC__)
++
++#include <dlfcn.h>
++
++extern "C" {
++// Declare function pointers to the memory functions
++typedef void* (*t_libc_malloc)(size_t size);
++typedef void* (*t_libc_calloc)(size_t n, size_t size);
++typedef void* (*t_libc_realloc)(void* address, size_t size);
++typedef void* (*t_libc_memalign)(size_t alignment, size_t size);
++typedef void (*t_libc_free)(void* ptr);
++typedef size_t (*t_libc_malloc_usable_size)(void* ptr);
++
++// Static instances of pointers to libc.so dl symbols
++static t_libc_malloc libc_malloc = NULL;
++static t_libc_calloc libc_calloc = NULL;
++static t_libc_realloc libc_realloc = NULL;
++static t_libc_memalign libc_memalign = NULL;
++static t_libc_free libc_free = NULL;
++static t_libc_malloc_usable_size libc_malloc_usable_size = NULL;
++
++// resolve the symbols in libc.so
++void musl_libc_memory_init(void)
++{
++  libc_malloc = (t_libc_malloc) dlsym(RTLD_NEXT, "malloc");
++  libc_calloc = (t_libc_calloc) dlsym(RTLD_NEXT, "calloc");
++  libc_realloc = (t_libc_realloc) dlsym(RTLD_NEXT, "realloc");
++  libc_memalign = (t_libc_memalign) dlsym(RTLD_NEXT, "memalign");
++  libc_free = (t_libc_free) dlsym(RTLD_NEXT, "free");
++  libc_malloc_usable_size = (t_libc_malloc_usable_size) dlsym(RTLD_NEXT, "malloc_usable_size");
++}
++}  // extern "C"
++
++namespace {
++
++using base::allocator::AllocatorDispatch;
++
++void* MuslMalloc(const AllocatorDispatch*, size_t size, void* context) {
++  if (!libc_malloc)
++    musl_libc_memory_init();
++  return (*libc_malloc)(size);
++}
++
++void* MuslCalloc(const AllocatorDispatch*, size_t n, size_t size, void* context) {
++  if (!libc_calloc)
++    musl_libc_memory_init();
++  return (*libc_calloc)(n, size);
++}
++
++void* MuslRealloc(const AllocatorDispatch*, void* address, size_t size, void* context) {
++  if (!libc_realloc)
++    musl_libc_memory_init();
++  return (*libc_realloc)(address, size);
++}
++
++void* MuslMemalign(const AllocatorDispatch*, size_t alignment, size_t size, void* context) {
++  if (!libc_memalign)
++    musl_libc_memory_init();
++  return (*libc_memalign)(alignment, size);
++}
++
++void MuslFree(const AllocatorDispatch*, void* address, void* context) {
++  if (!libc_free)
++    musl_libc_memory_init();
++  (*libc_free)(address);
++}
++
++size_t MuslGetSizeEstimate(const AllocatorDispatch*, void* address, void* context) {
++  // TODO(siggi, primiano): malloc_usable_size may need redirection in the
++  //     presence of interposing shims that divert allocations.
++  if (!libc_malloc_usable_size)
++    musl_libc_memory_init();
++  return (*libc_malloc_usable_size)(address);
++}
++
++}  // namespace
++
++const AllocatorDispatch AllocatorDispatch::default_dispatch = {
++    &MuslMalloc,           /* alloc_function */
++    &MuslCalloc,           /* alloc_zero_initialized_function */
++    &MuslMemalign,         /* alloc_aligned_function */
++    &MuslRealloc,          /* realloc_function */
++    &MuslFree,             /* free_function */
++    &MuslGetSizeEstimate,  /* get_size_estimate_function */
++    nullptr,               /* next */
++};
++
++#endif
diff --git a/srcpkgs/qt6-webengine/patches/0202-chromium-musl-no-mallinfo.patch b/srcpkgs/qt6-webengine/patches/0202-chromium-musl-no-mallinfo.patch
new file mode 100644
index 000000000000..a5bdb5a43a5f
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0202-chromium-musl-no-mallinfo.patch
@@ -0,0 +1,62 @@
+--- a/src/3rdparty/chromium/base/process/process_metrics_posix.cc
++++ b/src/3rdparty/chromium/base/process/process_metrics_posix.cc
+@@ -105,7 +105,7 @@ void IncreaseFdLimitTo(unsigned int max_
+ 
+ #endif  // !defined(OS_FUCHSIA)
+ 
+-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID)
++#if (defined(OS_LINUX) && defined(__GLIBC__)) || defined(OS_CHROMEOS) || defined(OS_ANDROID)
+ namespace {
+ 
+ size_t GetMallocUsageMallinfo() {
+@@ -127,16 +127,16 @@ size_t GetMallocUsageMallinfo() {
+ }
+ 
+ }  // namespace
+-#endif  // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID)
++#endif  // (defined(OS_LINUX) && defined(__GLIBC__)) || defined(OS_CHROMEOS) || defined(OS_ANDROID)
+ 
+ size_t ProcessMetrics::GetMallocUsage() {
+ #if defined(OS_APPLE)
+   malloc_statistics_t stats = {0};
+   malloc_zone_statistics(nullptr, &stats);
+   return stats.size_in_use;
+-#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID)
++#elif (defined(OS_LINUX) && defined(__GLIBC__)) || defined(OS_CHROMEOS) || defined(OS_ANDROID)
+   return GetMallocUsageMallinfo();
+-#elif defined(OS_FUCHSIA)
++#else
+   // TODO(fuchsia): Not currently exposed. https://crbug.com/735087.
+   return 0;
+ #endif
+--- a/src/3rdparty/chromium/third_party/tflite/src/tensorflow/lite/profiling/memory_info.cc
++++ b/src/3rdparty/chromium/third_party/tflite/src/tensorflow/lite/profiling/memory_info.cc
+@@ -27,7 +27,7 @@ namespace memory {
+ const int MemoryUsage::kValueNotSet = 0;
+ 
+ bool MemoryUsage::IsSupported() {
+-#ifdef __linux__
++#ifdef __GLIBC__
+   return true;
+ #endif
+   return false;
+@@ -35,7 +35,7 @@ bool MemoryUsage::IsSupported() {
+ 
+ MemoryUsage GetMemoryUsage() {
+   MemoryUsage result;
+-#ifdef __linux__
++#ifdef __GLIBC__
+   rusage res;
+   if (getrusage(RUSAGE_SELF, &res) == 0) {
+     result.max_rss_kb = res.ru_maxrss;
+--- a/src/3rdparty/chromium/base/trace_event/malloc_dump_provider.cc
++++ b/src/3rdparty/chromium/base/trace_event/malloc_dump_provider.cc
+@@ -213,7 +213,7 @@ bool MallocDumpProvider::OnMemoryDump(co
+                      &allocated_objects_count);
+ #elif defined(OS_FUCHSIA)
+ // TODO(fuchsia): Port, see https://crbug.com/706592.
+-#else
++#elif defined(__GLIBC__)
+ #if defined(__GLIBC__) && defined(__GLIBC_PREREQ)
+ #if __GLIBC_PREREQ(2, 33)
+ #define MALLINFO2_FOUND_IN_LIBC
diff --git a/srcpkgs/qt6-webengine/patches/0203-chromium-musl-siginfo_t.patch b/srcpkgs/qt6-webengine/patches/0203-chromium-musl-siginfo_t.patch
new file mode 100644
index 000000000000..43ef7fd7c5d2
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0203-chromium-musl-siginfo_t.patch
@@ -0,0 +1,18 @@
+There's a subtle difference in the internal name of siginfo_t fields
+between glibc and musl. The structure itself is equivalent, so it
+should suffice to add a macro to rename the field.
+
+--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf/trap.cc
++++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf/trap.cc
+@@ -174,7 +174,11 @@ void Trap::SigSys(int nr, LinuxSigInfo*
+   // If the version of glibc doesn't include this information in
+   // siginfo_t (older than 2.17), we need to explicitly copy it
+   // into an arch_sigsys structure.
++#if defined(__GLIBC__)
+   memcpy(&sigsys, &info->_sifields, sizeof(sigsys));
++#else
++  memcpy(&sigsys, &info->__si_fields, sizeof(sigsys));
++#endif
+ #endif
+ 
+ #if defined(__mips__)
diff --git a/srcpkgs/qt6-webengine/patches/0204-chromium-musl-stackstart.patch b/srcpkgs/qt6-webengine/patches/0204-chromium-musl-stackstart.patch
new file mode 100644
index 000000000000..b03cf43b86db
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0204-chromium-musl-stackstart.patch
@@ -0,0 +1,20 @@
+--- a/src/3rdparty/chromium/third_party/blink/renderer/platform/wtf/stack_util.cc
++++ b/src/3rdparty/chromium/third_party/blink/renderer/platform/wtf/stack_util.cc
+@@ -29,7 +29,7 @@ size_t GetUnderestimatedStackSize() {
+ // FIXME: On Mac OSX and Linux, this method cannot estimate stack size
+ // correctly for the main thread.
+ 
+-#elif defined(__GLIBC__) || defined(OS_ANDROID) || defined(OS_FREEBSD) || \
++#elif defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FREEBSD) || \
+     defined(OS_FUCHSIA)
+   // pthread_getattr_np() can fail if the thread is not invoked by
+   // pthread_create() (e.g., the main thread of blink_unittests).
+@@ -97,7 +97,7 @@ return Threading::ThreadStackSize();
+ }
+ 
+ void* GetStackStart() {
+-#if defined(__GLIBC__) || defined(OS_ANDROID) || defined(OS_FREEBSD) || \
++#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FREEBSD) || \
+     defined(OS_FUCHSIA)
+   pthread_attr_t attr;
+   int error;
diff --git a/srcpkgs/qt6-webengine/patches/0205-chromium-musl-sandbox.patch b/srcpkgs/qt6-webengine/patches/0205-chromium-musl-sandbox.patch
new file mode 100644
index 000000000000..772a578fd823
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0205-chromium-musl-sandbox.patch
@@ -0,0 +1,92 @@
+--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc
++++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc
+@@ -138,7 +138,7 @@ namespace sandbox {
+ // present (as in newer versions of posix_spawn).
+ ResultExpr RestrictCloneToThreadsAndEPERMFork() {
+   const Arg<unsigned long> flags(0);
+-
++#if defined(__GLIBC__)
+   // TODO(mdempsky): Extend DSL to support (flags & ~mask1) == mask2.
+   const uint64_t kAndroidCloneMask = CLONE_VM | CLONE_FS | CLONE_FILES |
+                                      CLONE_SIGHAND | CLONE_THREAD |
+@@ -165,6 +165,17 @@ ResultExpr RestrictCloneToThreadsAndEPER
+   return If(IsAndroid() ? android_test : glibc_test, Allow())
+       .ElseIf(is_fork_or_clone_vfork, Error(EPERM))
+       .Else(CrashSIGSYSClone());
++#else
++  const int required = CLONE_VM | CLONE_FS | CLONE_FILES | CLONE_SIGHAND |
++                       CLONE_THREAD | CLONE_SYSVSEM;
++  const int safe = CLONE_SETTLS | CLONE_PARENT_SETTID | CLONE_CHILD_CLEARTID |
++                   CLONE_DETACHED;
++  const BoolExpr thread_clone_ok = (flags&~safe)==required;
++
++  return If(thread_clone_ok, Allow())
++      .ElseIf((flags & (CLONE_VM | CLONE_THREAD)) == 0, Error(EPERM))
++      .Else(CrashSIGSYSClone());
++#endif
+ }
+ 
+ #ifndef PR_PAC_RESET_KEYS
+--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
++++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
+@@ -419,6 +419,9 @@ bool SyscallSets::IsAllowedProcessStartO
+ #if defined(__i386__)
+     case __NR_waitpid:
+ #endif
++#if !defined(__GLIBC__)
++    case __NR_set_tid_address:
++#endif
+       return true;
+     case __NR_clone:  // Should be parameter-restricted.
+     case __NR_setns:  // Privileged.
+@@ -431,7 +434,9 @@ bool SyscallSets::IsAllowedProcessStartO
+ #if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
+     case __NR_set_thread_area:
+ #endif
++#if defined(__GLIBC__)
+     case __NR_set_tid_address:
++#endif
+     case __NR_unshare:
+ #if !defined(__mips__) && !defined(__aarch64__)
+     case __NR_vfork:
+@@ -545,6 +550,9 @@ bool SyscallSets::IsAllowedAddressSpaceA
+     case __NR_mlock:
+     case __NR_munlock:
+     case __NR_munmap:
++#if !defined(__GLIBC__)
++    case __NR_mremap:
++#endif
+       return true;
+     case __NR_madvise:
+     case __NR_mincore:
+@@ -562,7 +570,9 @@ bool SyscallSets::IsAllowedAddressSpaceA
+     case __NR_modify_ldt:
+ #endif
+     case __NR_mprotect:
++#if defined(__GLIBC__)
+     case __NR_mremap:
++#endif
+     case __NR_msync:
+     case __NR_munlockall:
+     case __NR_readahead:
+--- a/src/3rdparty/chromium/sandbox/policy/linux/bpf_renderer_policy_linux.cc
++++ b/src/3rdparty/chromium/sandbox/policy/linux/bpf_renderer_policy_linux.cc
+@@ -97,11 +97,18 @@ ResultExpr RendererProcessPolicy::Evalua
+     case __NR_sysinfo:
+     case __NR_times:
+     case __NR_uname:
++#if !defined(__GLIBC__)
++    case __NR_sched_getparam:
++    case __NR_sched_getscheduler:
++    case __NR_sched_setscheduler:
++#endif
+       return Allow();
+     case __NR_sched_getaffinity:
++#if defined(__GLIBC__)
+     case __NR_sched_getparam:
+     case __NR_sched_getscheduler:
+     case __NR_sched_setscheduler:
++#endif
+       return RestrictSchedTarget(GetPolicyPid(), sysno);
+     case __NR_prlimit64:
+       // See crbug.com/662450 and setrlimit comment above.
diff --git a/srcpkgs/qt6-webengine/patches/0206-chromium-musl-default-stacksize.patch b/srcpkgs/qt6-webengine/patches/0206-chromium-musl-default-stacksize.patch
new file mode 100644
index 000000000000..bc07495b8144
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0206-chromium-musl-default-stacksize.patch
@@ -0,0 +1,15 @@
+--- a/src/3rdparty/chromium/base/threading/platform_thread_linux.cc
++++ b/src/3rdparty/chromium/base/threading/platform_thread_linux.cc
+@@ -439,7 +439,12 @@ void TerminateOnThread() {}
+ 
+ size_t GetDefaultThreadStackSize(const pthread_attr_t& attributes) {
+ #if !defined(THREAD_SANITIZER)
++#if defined(__GLIBC__)
+   return 0;
++#else // defined(__GLIBC__)
++  // For Musl libc try with a default stack size of 2 MiB
++  return 2 * 1024 * 1024;
++#endif // !defined(__GLIBC__)
+ #else
+   // ThreadSanitizer bloats the stack heavily. Evidence has been that the
+   // default stack size isn't enough for some browser tests.
diff --git a/srcpkgs/qt6-webengine/patches/0208-chromium-musl-execinfo.patch b/srcpkgs/qt6-webengine/patches/0208-chromium-musl-execinfo.patch
new file mode 100644
index 000000000000..9f3b964676b3
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0208-chromium-musl-execinfo.patch
@@ -0,0 +1,125 @@
+--- a/src/3rdparty/chromium/base/debug/stack_trace.cc
++++ b/src/3rdparty/chromium/base/debug/stack_trace.cc
+@@ -252,7 +252,9 @@ void StackTrace::Print() const {
+ }
+ 
+ void StackTrace::OutputToStream(std::ostream* os) const {
++#if defined(__GLIBC__) && !defined(_AIX)
+   OutputToStreamWithPrefix(os, nullptr);
++#endif
+ }
+ 
+ std::string StackTrace::ToString() const {
+@@ -260,7 +262,7 @@ std::string StackTrace::ToString() const
+ }
+ std::string StackTrace::ToStringWithPrefix(const char* prefix_string) const {
+   std::stringstream stream;
+-#if !defined(__UCLIBC__) && !defined(_AIX)
++#if defined(__GLIBC__) && !defined(_AIX)
+   OutputToStreamWithPrefix(&stream, prefix_string);
+ #endif
+   return stream.str();
+--- a/src/3rdparty/chromium/base/debug/stack_trace_posix.cc
++++ b/src/3rdparty/chromium/base/debug/stack_trace_posix.cc
+@@ -27,7 +27,7 @@
+ #if !defined(USE_SYMBOLIZE)
+ #include <cxxabi.h>
+ #endif
+-#if !defined(__UCLIBC__) && !defined(_AIX)
++#if defined(__GLIBC__) && !defined(_AIX)
+ #include <execinfo.h>
+ #endif
+ 
+@@ -89,7 +89,7 @@ void DemangleSymbols(std::string* text)
+   // Note: code in this function is NOT async-signal safe (std::string uses
+   // malloc internally).
+ 
+-#if !defined(__UCLIBC__) && !defined(_AIX)
++#if defined(__GLIBC__) && !defined(_AIX)
+   std::string::size_type search_from = 0;
+   while (search_from < text->size()) {
+     // Look for the start of a mangled symbol, from search_from.
+@@ -124,7 +124,7 @@ void DemangleSymbols(std::string* text)
+       search_from = mangled_start + 2;
+     }
+   }
+-#endif  // !defined(__UCLIBC__) && !defined(_AIX)
++#endif  // !defined(__GLIBC__) && !defined(_AIX)
+ }
+ #endif  // !defined(USE_SYMBOLIZE)
+ 
+@@ -136,7 +136,7 @@ class BacktraceOutputHandler {
+   virtual ~BacktraceOutputHandler() = default;
+ };
+ 
+-#if !defined(__UCLIBC__) && !defined(_AIX)
++#if defined(__GLIBC__) && !defined(_AIX)
+ void OutputPointer(void* pointer, BacktraceOutputHandler* handler) {
+   // This should be more than enough to store a 64-bit number in hex:
+   // 16 hex digits + 1 for null-terminator.
+@@ -219,7 +219,7 @@ void ProcessBacktrace(void* const* trace
+   }
+ #endif  // defined(USE_SYMBOLIZE)
+ }
+-#endif  // !defined(__UCLIBC__) && !defined(_AIX)
++#endif  // !defined(__GLIBC__) && !defined(_AIX)
+ 
+ void PrintToStderr(const char* output) {
+   // NOTE: This code MUST be async-signal safe (it's used by in-process
+@@ -839,7 +839,7 @@ size_t CollectStackTrace(void** trace, s
+   // If we do not have unwind tables, then try tracing using frame pointers.
+   return base::debug::TraceStackFramePointers(const_cast<const void**>(trace),
+                                               count, 0);
+-#elif !defined(__UCLIBC__) && !defined(_AIX)
++#elif defined(__GLIBC__) && !defined(_AIX)
+   // Though the backtrace API man page does not list any possible negative
+   // return values, we take no chance.
+   return base::saturated_cast<size_t>(backtrace(trace, count));
+@@ -852,13 +852,13 @@ void StackTrace::PrintWithPrefix(const c
+ // NOTE: This code MUST be async-signal safe (it's used by in-process
+ // stack dumping signal handler). NO malloc or stdio is allowed here.
+ 
+-#if !defined(__UCLIBC__) && !defined(_AIX)
++#if defined(__GLIBC__) && !defined(_AIX)
+   PrintBacktraceOutputHandler handler;
+   ProcessBacktrace(trace_, count_, prefix_string, &handler);
+ #endif
+ }
+ 
+-#if !defined(__UCLIBC__) && !defined(_AIX)
++#if defined(__GLIBC__) && !defined(_AIX)
+ void StackTrace::OutputToStreamWithPrefix(std::ostream* os,
+                                           const char* prefix_string) const {
+   StreamBacktraceOutputHandler handler(os);
+--- a/src/3rdparty/chromium/base/logging.cc
++++ b/src/3rdparty/chromium/base/logging.cc
+@@ -582,7 +582,7 @@ LogMessage::LogMessage(const char* file,
+ 
+ LogMessage::~LogMessage() {
+   size_t stack_start = stream_.tellp();
+-#if !defined(OFFICIAL_BUILD) && !defined(OS_NACL) && !defined(__UCLIBC__) && \
++#if !defined(OFFICIAL_BUILD) && !defined(OS_NACL) && defined(__GLIBC__) && \
+     !defined(OS_AIX)
+   if (severity_ == LOGGING_FATAL && !base::debug::BeingDebugged()) {
+     // Include a stack trace on a fatal, unless a debugger is attached.
+--- 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 @@
+ 
+ #if defined(DEBUG) && defined(V8_OS_LINUX) && !defined(V8_OS_ANDROID)
+ #define SYMBOLIZE_FUNCTION
++#if defined(__GLIBC__)
+ #include <execinfo.h>
++#endif
+ 
+ #include <vector>
+ 
+@@ -103,7 +105,7 @@ void ExternalReferenceTable::Init(Isolat
+ }
+ 
+ const char* ExternalReferenceTable::ResolveSymbol(void* address) {
+-#ifdef SYMBOLIZE_FUNCTION
++#if defined(SYMBOLIZE_FUNCTION) && defined(__GLIBC__)
+   char** names = backtrace_symbols(&address, 1);
+   const char* name = names[0];
+   // The array of names is malloc'ed. However, each name string is static
diff --git a/srcpkgs/qt6-webengine/patches/0209-chromium-musl-thread-stacksize.patch b/srcpkgs/qt6-webengine/patches/0209-chromium-musl-thread-stacksize.patch
new file mode 100644
index 000000000000..4b760a428b25
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0209-chromium-musl-thread-stacksize.patch
@@ -0,0 +1,22 @@
+--- a/src/3rdparty/chromium/ppapi/utility/threading/simple_thread.cc
++++ b/src/3rdparty/chromium/ppapi/utility/threading/simple_thread.cc
+@@ -13,7 +13,7 @@ namespace pp {
+ namespace {
+ 
+ // Use 2MB default stack size for Native Client, otherwise use system default.
+-#if defined(__native_client__)
++#if defined(__native_client__) || !defined(__GLIBC__)
+ const size_t kDefaultStackSize = 2 * 1024 * 1024;
+ #else
+ const size_t kDefaultStackSize = 0;
+--- a/src/3rdparty/chromium/v8/src/base/platform/platform-posix.cc
++++ b/src/3rdparty/chromium/v8/src/base/platform/platform-posix.cc
+@@ -883,7 +883,7 @@ bool Thread::Start() {
+ #if V8_OS_MACOSX
+     // Default on Mac OS X is 512kB -- bump up to 1MB
+     stack_size = 1 * 1024 * 1024;
+-#elif V8_OS_AIX
++#elif V8_OS_AIX || !defined(__GLIBC__)
+     // Default on AIX is 96kB -- bump up to 2MB
+     stack_size = 2 * 1024 * 1024;
+ #endif
diff --git a/srcpkgs/qt6-webengine/patches/0210-chromium-musl-msgvec-push_back.patch b/srcpkgs/qt6-webengine/patches/0210-chromium-musl-msgvec-push_back.patch
new file mode 100644
index 000000000000..905daa223700
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0210-chromium-musl-msgvec-push_back.patch
@@ -0,0 +1,14 @@
+--- a/src/3rdparty/chromium/net/socket/udp_socket_posix.cc
++++ b/src/3rdparty/chromium/net/socket/udp_socket_posix.cc
+@@ -1162,7 +1162,11 @@ SendResult UDPSocketPosixSender::Interna
+     msg_iov->push_back({const_cast<char*>(buffer->data()), buffer->length()});
+   msgvec->reserve(buffers.size());
+   for (size_t j = 0; j < buffers.size(); j++)
++#if defined(__GLIBC__)
+     msgvec->push_back({{nullptr, 0, &msg_iov[j], 1, nullptr, 0, 0}, 0});
++#else
++    msgvec->push_back({{nullptr, 0, &msg_iov[j], 1, 0, 0, 0}, 0});
++#endif
+   int result = HANDLE_EINTR(Sendmmsg(fd, &msgvec[0], buffers.size(), 0));
+   SendResult send_result(0, 0, std::move(buffers));
+   if (result < 0) {
diff --git a/srcpkgs/qt6-webengine/patches/0211-chromium-musl-canonicalize-file-name-musl.patch b/srcpkgs/qt6-webengine/patches/0211-chromium-musl-canonicalize-file-name-musl.patch
new file mode 100644
index 000000000000..d43e6bd488bc
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0211-chromium-musl-canonicalize-file-name-musl.patch
@@ -0,0 +1,11 @@
+--- a/src/3rdparty/chromium/third_party/nasm/nasmlib/realpath.c
++++ b/src/3rdparty/chromium/third_party/nasm/nasmlib/realpath.c
+@@ -55,7 +55,7 @@
+  */
+ char *nasm_realpath(const char *rel_path)
+ {
+-    char *rp = canonicalize_file_name(rel_path);
++    char *rp = realpath(rel_path, NULL);
+     return rp ? rp : nasm_strdup(rel_path);
+ }
+ 
diff --git a/srcpkgs/qt6-webengine/patches/0212-chromium-musl-no-getcontext.patch b/srcpkgs/qt6-webengine/patches/0212-chromium-musl-no-getcontext.patch
new file mode 100644
index 000000000000..5755f1b45a7d
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0212-chromium-musl-no-getcontext.patch
@@ -0,0 +1,29 @@
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc
+@@ -489,8 +489,10 @@ bool ExceptionHandler::SimulateSignalDel
+   // ExceptionHandler::HandleSignal().
+   siginfo.si_code = SI_USER;
+   siginfo.si_pid = getpid();
+-  ucontext_t context;
++  ucontext_t context = { 0 };
++#if defined(__GLIBC__)
+   getcontext(&context);
++#endif
+   return HandleSignal(sig, &siginfo, &context);
+ }
+ 
+@@ -675,9 +677,14 @@ bool ExceptionHandler::WriteMinidump() {
+   sys_prctl(PR_SET_DUMPABLE, 1, 0, 0, 0);
+ 
+   CrashContext context;
++
++#if defined(__GLIBC__)
+   int getcontext_result = getcontext(&context.context);
+   if (getcontext_result)
+     return false;
++#else
++  return false;
++#endif
+ 
+ #if defined(__i386__)
+   // In CPUFillFromUContext in minidumpwriter.cc the stack pointer is retrieved
diff --git a/srcpkgs/qt6-webengine/patches/0213-chromium-musl-crashpad.patch b/srcpkgs/qt6-webengine/patches/0213-chromium-musl-crashpad.patch
new file mode 100644
index 000000000000..71bbad2af17e
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0213-chromium-musl-crashpad.patch
@@ -0,0 +1,24 @@
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/compat/linux/sys/ptrace.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/compat/linux/sys/ptrace.h
+@@ -17,7 +17,9 @@
+ 
+ #include_next <sys/ptrace.h>
+ 
++#ifdef __GLIBC__
+ #include <sys/cdefs.h>
++#endif
+ 
+ // https://sourceware.org/bugzilla/show_bug.cgi?id=22433
+ #if !defined(PTRACE_GET_THREAD_AREA) && !defined(PT_GET_THREAD_AREA) && \
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/util/linux/ptracer.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/util/linux/ptracer.cc
+@@ -26,6 +26,9 @@
+ 
+ #if defined(ARCH_CPU_X86_FAMILY)
+ #include <asm/ldt.h>
++#if !defined(__GLIBC__)
++#include <asm/ptrace-abi.h>
++#endif
+ #endif
+ 
+ namespace crashpad {
diff --git a/srcpkgs/qt6-webengine/patches/0214-chromium-musl-fixes.patch b/srcpkgs/qt6-webengine/patches/0214-chromium-musl-fixes.patch
new file mode 100644
index 000000000000..55b267ed1714
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0214-chromium-musl-fixes.patch
@@ -0,0 +1,108 @@
+--- a/src/3rdparty/chromium/sandbox/linux/suid/process_util.h
++++ b/src/3rdparty/chromium/sandbox/linux/suid/process_util.h
+@@ -12,6 +12,15 @@
+ #include <stdint.h>
+ #include <sys/types.h>
+ 
++#if !defined(__GLIBC__) && !defined(TEMP_FAILURE_RETRY)
++# define TEMP_FAILURE_RETRY(expression) \
++	(__extension__			\
++	 ({ long int __result;		\
++	  do __result = (long int) (expression); \
++	  while (__result == -1L && errno == EINTR); \
++	  __result; }))
++#endif
++
+ // This adjusts /proc/process/oom_score_adj so the Linux OOM killer
+ // will prefer certain process types over others. The range for the
+ // adjustment is [-1000, 1000], with [0, 1000] being user accessible.
+--- a/src/3rdparty/chromium/services/device/serial/serial_io_handler_posix.cc
++++ b/src/3rdparty/chromium/services/device/serial/serial_io_handler_posix.cc
+@@ -6,6 +6,7 @@
+ 
+ #include <sys/ioctl.h>
+ #include <termios.h>
++#include <asm-generic/ioctls.h>
+ 
+ #include <algorithm>
+ #include <utility>
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h
+@@ -38,6 +38,10 @@
+ #include "common/memory_allocator.h"
+ #include "google_breakpad/common/minidump_format.h"
+ 
++#ifndef __GLIBC__
++#define _libc_fpstate _fpstate
++#endif
++
+ namespace google_breakpad {
+ 
+ // Wraps platform-dependent implementations of accessors to ucontext_t structs.
+--- a/src/3rdparty/chromium/third_party/ffmpeg/libavutil/cpu.c
++++ b/src/3rdparty/chromium/third_party/ffmpeg/libavutil/cpu.c
+@@ -41,8 +41,10 @@
+ #include <sys/param.h>
+ #endif
+ #include <sys/types.h>
++#ifdef __GLIBC__
+ #include <sys/sysctl.h>
+ #endif
++#endif
+ #if HAVE_UNISTD_H
+ #include <unistd.h>
+ #endif
+--- a/src/3rdparty/chromium/third_party/perfetto/include/perfetto/ext/base/thread_utils.h
++++ b/src/3rdparty/chromium/third_party/perfetto/include/perfetto/ext/base/thread_utils.h
+@@ -29,9 +29,7 @@
+ #include <algorithm>
+ #endif
+ 
+-#if PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID)
+ #include <sys/prctl.h>
+-#endif
+ 
+ // Internal implementation utils that aren't as widely useful/supported as
+ // base/thread_utils.h.
+@@ -58,7 +56,7 @@ inline bool MaybeSetThreadName(const std
+ 
+ inline bool GetThreadName(std::string& out_result) {
+   char buf[16] = {};
+-#if PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID)
++#if !defined(__GLIBC__)
+   if (prctl(PR_GET_NAME, buf) != 0)
+     return false;
+ #else
+--- a/src/3rdparty/chromium/third_party/lss/linux_syscall_support.h
++++ b/src/3rdparty/chromium/third_party/lss/linux_syscall_support.h
+@@ -1300,6 +1300,18 @@ struct kernel_statfs {
+ #ifndef __NR_fallocate
+ #define __NR_fallocate          285
+ #endif
++
++#if !defined(__GLIBC__)
++#ifdef __NR_pread
++#undef __NR_pread
++#endif
++#ifdef __NR_pwrite
++#undef __NR_pwrite
++#endif
++#define __NR_pread __NR_pread64
++#define __NR_pwrite __NR_pwrite64
++#endif /* !defined(__GLIBC__) */
++
+ #ifndef __NR_getrandom
+ #define __NR_getrandom          318
+ #endif
+--- a/src/3rdparty/chromium/net/dns/dns_config_service_posix.cc
++++ b/src/3rdparty/chromium/net/dns/dns_config_service_posix.cc
+@@ -93,7 +93,8 @@ absl::optional<DnsConfig> ReadDnsConfig(
+ 
+   absl::optional<DnsConfig> dns_config;
+ // TODO(fuchsia): Use res_ninit() when it's implemented on Fuchsia.
+-#if defined(OS_OPENBSD) || defined(OS_FUCHSIA)
++#if defined(OS_OPENBSD) || defined(OS_FUCHSIA) || \
++  (defined(OS_LINUX) && !defined(__GLIBC__))
+   // Note: res_ninit in glibc always returns 0 and sets RES_INIT.
+   // res_init behaves the same way.
+   memset(&_res, 0, sizeof(_res));
diff --git a/srcpkgs/qt6-webengine/patches/0215-chromium-musl-cdefs.patch b/srcpkgs/qt6-webengine/patches/0215-chromium-musl-cdefs.patch
new file mode 100644
index 000000000000..9d1daec29118
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0215-chromium-musl-cdefs.patch
@@ -0,0 +1,29 @@
+--- a/src/3rdparty/chromium/third_party/libsync/src/include/sync/sync.h
++++ b/src/3rdparty/chromium/third_party/libsync/src/include/sync/sync.h
+@@ -19,12 +19,13 @@
+ #ifndef __SYS_CORE_SYNC_H
+ #define __SYS_CORE_SYNC_H
+ 
+-#include <sys/cdefs.h>
+ #include <stdint.h>
+ 
+ #include <linux/types.h>
+ 
+-__BEGIN_DECLS
++#ifdef __cplusplus
++extern "C" {
++#endif
+ 
+ struct sync_legacy_merge_data {
+  int32_t fd2;
+@@ -158,6 +159,9 @@ struct sync_pt_info *sync_pt_info(struct
+                                   struct sync_pt_info *itr);
+ void sync_fence_info_free(struct sync_fence_info_data *info);
+ 
+-__END_DECLS
++#ifdef __cplusplus
++}
++#endif
++
+ 
+ #endif /* __SYS_CORE_SYNC_H */
diff --git a/srcpkgs/qt6-webengine/patches/0216-chromium-musl-stat.patch b/srcpkgs/qt6-webengine/patches/0216-chromium-musl-stat.patch
new file mode 100644
index 000000000000..4509a6957cd7
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0216-chromium-musl-stat.patch
@@ -0,0 +1,12 @@
+--- a/src/3rdparty/chromium/base/files/file.h
++++ b/src/3rdparty/chromium/base/files/file.h
+@@ -19,7 +19,8 @@
+ #include "build/build_config.h"
+ 
+ #if defined(OS_BSD) || defined(OS_APPLE) || defined(OS_NACL) || \
+-    defined(OS_FUCHSIA) || (defined(OS_ANDROID) && __ANDROID_API__ < 21)
++    defined(OS_FUCHSIA) || (defined(OS_ANDROID) && __ANDROID_API__ < 21) || \
++    (defined(OS_LINUX) && !defined(__GLIBC__))
+ struct stat;
+ namespace base {
+ typedef struct stat stat_wrapper_t;
diff --git a/srcpkgs/qt6-webengine/patches/0217-chromium-musl-resolver.patch b/srcpkgs/qt6-webengine/patches/0217-chromium-musl-resolver.patch
new file mode 100644
index 000000000000..c3d7afad9b19
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0217-chromium-musl-resolver.patch
@@ -0,0 +1,77 @@
+--- a/src/3rdparty/chromium/net/dns/dns_config_service_linux.cc
++++ b/src/3rdparty/chromium/net/dns/dns_config_service_linux.cc
+@@ -432,11 +432,13 @@ class DnsConfigServiceLinux::ConfigReade
+     base::ScopedBlockingCall scoped_blocking_call(
+         FROM_HERE, base::BlockingType::MAY_BLOCK);
+ 
++#if defined(__GLIBC__)
+     std::unique_ptr<struct __res_state> res = resolv_reader_->GetResState();
+     if (res) {
+       dns_config_ = ConvertResStateToDnsConfig(*res.get());
+       resolv_reader_->CloseResState(res.get());
+     }
++#endif
+ 
+     UMA_HISTOGRAM_BOOLEAN("Net.DNS.DnsConfig.Resolv.Read",
+                           dns_config_.has_value());
+@@ -486,6 +488,7 @@ class DnsConfigServiceLinux::ConfigReade
+ 
+ std::unique_ptr<struct __res_state>
+ DnsConfigServiceLinux::ResolvReader::GetResState() {
++#if defined(__GLIBC__)
+   auto res = std::make_unique<struct __res_state>();
+   memset(res.get(), 0, sizeof(struct __res_state));
+ 
+@@ -495,11 +498,16 @@ DnsConfigServiceLinux::ResolvReader::Get
+   }
+ 
+   return res;
++#else
++  return nullptr;
++#endif
+ }
+ 
+ void DnsConfigServiceLinux::ResolvReader::CloseResState(
+     struct __res_state* res) {
++#if defined(__GLIBC__)
+   res_nclose(res);
++#endif
+ }
+ 
+ DnsConfigServiceLinux::DnsConfigServiceLinux()
+--- a/src/3rdparty/chromium/net/dns/dns_reloader.cc
++++ b/src/3rdparty/chromium/net/dns/dns_reloader.cc
+@@ -4,8 +4,7 @@
+ 
+ #include "net/dns/dns_reloader.h"
+ 
+-#if defined(OS_POSIX) && !defined(OS_APPLE) && !defined(OS_OPENBSD) && \
+-    !defined(OS_ANDROID) && !defined(OS_FUCHSIA)
++#ifdef __GLIBC__
+ 
+ #include <resolv.h>
+ 
+--- a/src/3rdparty/chromium/net/dns/host_resolver_manager.cc
++++ b/src/3rdparty/chromium/net/dns/host_resolver_manager.cc
+@@ -2720,8 +2720,7 @@ HostResolverManager::HostResolverManager
+   NetworkChangeNotifier::AddConnectionTypeObserver(this);
+   if (system_dns_config_notifier_)
+     system_dns_config_notifier_->AddObserver(this);
+-#if defined(OS_POSIX) && !defined(OS_APPLE) && !defined(OS_OPENBSD) && \
+-    !defined(OS_ANDROID)
++#ifdef __GLIBC__
+   EnsureDnsReloaderInit();
+ #endif
+ 
+--- a/src/3rdparty/chromium/net/dns/host_resolver_proc.cc
++++ b/src/3rdparty/chromium/net/dns/host_resolver_proc.cc
+@@ -176,8 +176,7 @@ int SystemHostResolverCall(const std::st
+   base::ScopedBlockingCall scoped_blocking_call(FROM_HERE,
+                                                 base::BlockingType::WILL_BLOCK);
+ 
+-#if defined(OS_POSIX) && !defined(OS_APPLE) && !defined(OS_OPENBSD) && \
+-    !defined(OS_ANDROID) && !defined(OS_FUCHSIA)
++#ifdef __GLIBC__
+   DnsReloaderMaybeReload();
+ #endif
+   absl::optional<AddressInfo> ai;
diff --git a/srcpkgs/qt6-webengine/patches/0600-chromium-sndio.patch b/srcpkgs/qt6-webengine/patches/0600-chromium-sndio.patch
new file mode 100644
index 000000000000..0302874ffba4
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0600-chromium-sndio.patch
@@ -0,0 +1,876 @@
+--- a/src/3rdparty/chromium/media/BUILD.gn
++++ b/src/3rdparty/chromium/media/BUILD.gn
+@@ -72,6 +72,9 @@ config("media_config") {
+       defines += [ "DLOPEN_PULSEAUDIO" ]
+     }
+   }
++  if (use_sndio) {
++    defines += [ "USE_SNDIO" ]
++  }
+   if (use_cras) {
+     defines += [ "USE_CRAS" ]
+   }
+--- a/src/3rdparty/chromium/media/audio/BUILD.gn
++++ b/src/3rdparty/chromium/media/audio/BUILD.gn
+@@ -240,6 +240,17 @@ source_set("audio") {
+     sources += [ "linux/audio_manager_linux.cc" ]
+   }
+ 
++  if (use_sndio) {
++    libs += [ "sndio" ]
++    sources += [
++      "sndio/audio_manager_sndio.cc",
++      "sndio/sndio_input.cc",
++      "sndio/sndio_input.h",
++      "sndio/sndio_output.cc",
++      "sndio/sndio_output.h"
++    ]
++  }
++
+   if (use_alsa) {
+     libs += [ "asound" ]
+     sources += [
+--- a/src/3rdparty/chromium/media/audio/linux/audio_manager_linux.cc
++++ b/src/3rdparty/chromium/media/audio/linux/audio_manager_linux.cc
+@@ -25,6 +25,11 @@
+ #include "media/audio/pulse/audio_manager_pulse.h"
+ #include "media/audio/pulse/pulse_util.h"
+ #endif
++#if defined(USE_SNDIO)
++#include "media/audio/sndio/audio_manager_sndio.h"
++#include "media/audio/sndio/sndio_input.h"
++#include "media/audio/sndio/sndio_output.h"
++#endif
+ 
+ namespace media {
+ 
+@@ -32,7 +37,8 @@ enum LinuxAudioIO {
+   kPulse,
+   kAlsa,
+   kCras,
+-  kAudioIOMax = kCras  // Must always be equal to largest logged entry.
++  kSndio,
++  kAudioIOMax = kSndio // Must always be equal to largest logged entry.
+ };
+ 
+ std::unique_ptr<media::AudioManager> CreateAudioManager(
+@@ -45,6 +51,16 @@ std::unique_ptr<media::AudioManager> Cre
+                                               audio_log_factory);
+   }
+ 
++#if defined(USE_SNDIO)
++  struct sio_hdl *hdl = sio_open(SIO_DEVANY, SIO_PLAY, 0);
++  if (hdl != NULL) {
++    sio_close(hdl);
++    UMA_HISTOGRAM_ENUMERATION("Media.LinuxAudioIO", kSndio, kAudioIOMax + 1);
++    return std::make_unique<AudioManagerSndio>(std::move(audio_thread),
++                                                  audio_log_factory);
++  }
++#endif
++
+ #if defined(USE_CRAS)
+   if (base::CommandLine::ForCurrentProcess()->HasSwitch(switches::kUseCras)) {
+     UMA_HISTOGRAM_ENUMERATION("Media.LinuxAudioIO", kCras, kAudioIOMax + 1);
+--- /dev/null
++++ b/src/3rdparty/chromium/media/audio/sndio/audio_manager_sndio.cc
+@@ -0,0 +1,148 @@
++// Copyright (c) 2012 The Chromium Authors. All rights reserved.
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++#include "media/audio/sndio/audio_manager_sndio.h"
++
++#include "base/metrics/histogram_macros.h"
++#include "base/memory/ptr_util.h"
++#include "media/audio/audio_device_description.h"
++#include "media/audio/audio_output_dispatcher.h"
++#include "media/audio/sndio/sndio_input.h"
++#include "media/audio/sndio/sndio_output.h"
++#include "media/base/limits.h"
++#include "media/base/media_switches.h"
++
++namespace media {
++
++
++// Maximum number of output streams that can be open simultaneously.
++static const int kMaxOutputStreams = 4;
++
++// Default sample rate for input and output streams.
++static const int kDefaultSampleRate = 48000;
++
++void AddDefaultDevice(AudioDeviceNames* device_names) {
++  DCHECK(device_names->empty());
++  device_names->push_front(AudioDeviceName::CreateDefault());
++}
++
++bool AudioManagerSndio::HasAudioOutputDevices() {
++  return true;
++}
++
++bool AudioManagerSndio::HasAudioInputDevices() {
++  return true;
++}
++
++void AudioManagerSndio::GetAudioInputDeviceNames(
++    AudioDeviceNames* device_names) {
++  DCHECK(device_names->empty());
++  AddDefaultDevice(device_names);
++}
++
++void AudioManagerSndio::GetAudioOutputDeviceNames(
++    AudioDeviceNames* device_names) {
++  AddDefaultDevice(device_names);
++}
++
++const char* AudioManagerSndio::GetName() {
++  return "SNDIO";
++}
++
++AudioParameters AudioManagerSndio::GetInputStreamParameters(
++    const std::string& device_id) {
++  static const int kDefaultInputBufferSize = 1024;
++
++  int user_buffer_size = GetUserBufferSize();
++  int buffer_size = user_buffer_size ?
++      user_buffer_size : kDefaultInputBufferSize;
++
++  return AudioParameters(
++      AudioParameters::AUDIO_PCM_LOW_LATENCY, CHANNEL_LAYOUT_STEREO,
++      kDefaultSampleRate, buffer_size);
++}
++
++AudioManagerSndio::AudioManagerSndio(std::unique_ptr<AudioThread> audio_thread,
++                                         AudioLogFactory* audio_log_factory)
++    : AudioManagerBase(std::move(audio_thread),
++                       audio_log_factory) {
++  DLOG(WARNING) << "AudioManagerSndio";
++  SetMaxOutputStreamsAllowed(kMaxOutputStreams);
++}
++
++AudioManagerSndio::~AudioManagerSndio() {
++  Shutdown();
++}
++
++AudioOutputStream* AudioManagerSndio::MakeLinearOutputStream(
++    const AudioParameters& params,
++    const LogCallback& log_callback) {
++  DCHECK_EQ(AudioParameters::AUDIO_PCM_LINEAR, params.format());
++  return MakeOutputStream(params);
++}
++
++AudioOutputStream* AudioManagerSndio::MakeLowLatencyOutputStream(
++    const AudioParameters& params,
++    const std::string& device_id,
++    const LogCallback& log_callback) {
++  DLOG_IF(ERROR, !device_id.empty()) << "Not implemented!";
++  DCHECK_EQ(AudioParameters::AUDIO_PCM_LOW_LATENCY, params.format());
++  return MakeOutputStream(params);
++}
++
++AudioInputStream* AudioManagerSndio::MakeLinearInputStream(
++    const AudioParameters& params,
++    const std::string& device_id,
++    const LogCallback& log_callback) {
++  DCHECK_EQ(AudioParameters::AUDIO_PCM_LINEAR, params.format());
++  return MakeInputStream(params);
++}
++
++AudioInputStream* AudioManagerSndio::MakeLowLatencyInputStream(
++    const AudioParameters& params,
++    const std::string& device_id,
++    const LogCallback& log_callback) {
++  DCHECK_EQ(AudioParameters::AUDIO_PCM_LOW_LATENCY, params.format());
++  return MakeInputStream(params);
++}
++
++AudioParameters AudioManagerSndio::GetPreferredOutputStreamParameters(
++    const std::string& output_device_id,
++    const AudioParameters& input_params) {
++  // TODO(tommi): Support |output_device_id|.
++  DLOG_IF(ERROR, !output_device_id.empty()) << "Not implemented!";
++  static const int kDefaultOutputBufferSize = 2048;
++
++  ChannelLayout channel_layout = CHANNEL_LAYOUT_STEREO;
++  int sample_rate = kDefaultSampleRate;
++  int buffer_size = kDefaultOutputBufferSize;
++  if (input_params.IsValid()) {
++    sample_rate = input_params.sample_rate();
++    channel_layout = input_params.channel_layout();
++    buffer_size = std::min(buffer_size, input_params.frames_per_buffer());
++  }
++
++  int user_buffer_size = GetUserBufferSize();
++  if (user_buffer_size)
++    buffer_size = user_buffer_size;
++
++  return AudioParameters(
++      AudioParameters::AUDIO_PCM_LOW_LATENCY, channel_layout,
++      sample_rate, buffer_size);
++}
++
++AudioInputStream* AudioManagerSndio::MakeInputStream(
++    const AudioParameters& params) {
++  DLOG(WARNING) << "MakeInputStream";
++  return new SndioAudioInputStream(this,
++             AudioDeviceDescription::kDefaultDeviceId, params);
++}
++
++AudioOutputStream* AudioManagerSndio::MakeOutputStream(
++    const AudioParameters& params) {
++  DLOG(WARNING) << "MakeOutputStream";
++  return new SndioAudioOutputStream(params, this);
++}
++
++}  // namespace media
+--- /dev/null
++++ b/src/3rdparty/chromium/media/audio/sndio/audio_manager_sndio.h
+@@ -0,0 +1,65 @@
++// Copyright (c) 2012 The Chromium Authors. All rights reserved.
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++#ifndef MEDIA_AUDIO_SNDIO_AUDIO_MANAGER_SNDIO_H_
++#define MEDIA_AUDIO_SNDIO_AUDIO_MANAGER_SNDIO_H_
++
++#include <set>
++
++#include "base/compiler_specific.h"
++#include "base/macros.h"
++#include "base/memory/ref_counted.h"
++#include "base/threading/thread.h"
++#include "media/audio/audio_manager_base.h"
++
++namespace media {
++
++class MEDIA_EXPORT AudioManagerSndio : public AudioManagerBase {
++ public:
++  AudioManagerSndio(std::unique_ptr<AudioThread> audio_thread,
++                   AudioLogFactory* audio_log_factory);
++  ~AudioManagerSndio() override;
++
++  // Implementation of AudioManager.
++  bool HasAudioOutputDevices() override;
++  bool HasAudioInputDevices() override;
++  void GetAudioInputDeviceNames(AudioDeviceNames* device_names) override;
++  void GetAudioOutputDeviceNames(AudioDeviceNames* device_names) override;
++  AudioParameters GetInputStreamParameters(
++      const std::string& device_id) override;
++  const char* GetName() override;
++
++  // Implementation of AudioManagerBase.
++  AudioOutputStream* MakeLinearOutputStream(
++      const AudioParameters& params,
++      const LogCallback& log_callback) override;
++  AudioOutputStream* MakeLowLatencyOutputStream(
++      const AudioParameters& params,
++      const std::string& device_id,
++      const LogCallback& log_callback) override;
++  AudioInputStream* MakeLinearInputStream(
++      const AudioParameters& params,
++      const std::string& device_id,
++      const LogCallback& log_callback) override;
++  AudioInputStream* MakeLowLatencyInputStream(
++      const AudioParameters& params,
++      const std::string& device_id,
++      const LogCallback& log_callback) override;
++
++ protected:
++  AudioParameters GetPreferredOutputStreamParameters(
++      const std::string& output_device_id,
++      const AudioParameters& input_params) override;
++
++ private:
++  // Called by MakeLinearOutputStream and MakeLowLatencyOutputStream.
++  AudioOutputStream* MakeOutputStream(const AudioParameters& params);
++  AudioInputStream* MakeInputStream(const AudioParameters& params);
++
++  DISALLOW_COPY_AND_ASSIGN(AudioManagerSndio);
++};
++
++}  // namespace media
++
++#endif  // MEDIA_AUDIO_SNDIO_AUDIO_MANAGER_SNDIO_H_
+--- /dev/null
++++ b/src/3rdparty/chromium/media/audio/sndio/sndio_input.cc
+@@ -0,0 +1,200 @@
++// Copyright 2013 The Chromium Authors. All rights reserved.
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++#include "base/bind.h"
++#include "base/logging.h"
++#include "base/macros.h"
++#include "media/base/audio_timestamp_helper.h"
++#include "media/audio/sndio/audio_manager_sndio.h"
++#include "media/audio/audio_manager.h"
++#include "media/audio/sndio/sndio_input.h"
++
++namespace media {
++
++static const SampleFormat kSampleFormat = kSampleFormatS16;
++
++void SndioAudioInputStream::OnMoveCallback(void *arg, int delta)
++{
++  SndioAudioInputStream* self = static_cast<SndioAudioInputStream*>(arg);
++
++  self->hw_delay += delta;
++}
++
++void *SndioAudioInputStream::ThreadEntry(void *arg) {
++  SndioAudioInputStream* self = static_cast<SndioAudioInputStream*>(arg);
++
++  self->ThreadLoop();
++  return NULL;
++}
++
++SndioAudioInputStream::SndioAudioInputStream(AudioManagerBase* manager,
++                                             const std::string& device_name,
++                                             const AudioParameters& params)
++    : manager(manager),
++      params(params),
++      audio_bus(AudioBus::Create(params)),
++      state(kClosed) {
++}
++
++SndioAudioInputStream::~SndioAudioInputStream() {
++  if (state != kClosed)
++    Close();
++}
++
++bool SndioAudioInputStream::Open() {
++  struct sio_par par;
++  int sig;
++
++  if (state != kClosed)
++    return false;
++
++  if (params.format() != AudioParameters::AUDIO_PCM_LINEAR &&
++      params.format() != AudioParameters::AUDIO_PCM_LOW_LATENCY) {
++    LOG(WARNING) << "Unsupported audio format.";
++    return false;
++  }
++
++  sio_initpar(&par);
++  par.rate = params.sample_rate();
++  par.rchan = params.channels();
++  par.bits = SampleFormatToBitsPerChannel(kSampleFormat);
++  par.bps = par.bits / 8;
++  par.sig = sig = par.bits != 8 ? 1 : 0;
++  par.le = SIO_LE_NATIVE;
++  par.appbufsz = params.frames_per_buffer();
++
++  hdl = sio_open(SIO_DEVANY, SIO_REC, 0);
++
++  if (hdl == NULL) {
++    LOG(ERROR) << "Couldn't open audio device.";
++    return false;
++  }
++
++  if (!sio_setpar(hdl, &par) || !sio_getpar(hdl, &par)) {
++    LOG(ERROR) << "Couldn't set audio parameters.";
++    goto bad_close;
++  }
++
++  if (par.rate  != (unsigned int)params.sample_rate() ||
++      par.rchan != (unsigned int)params.channels() ||
++      par.bits  != (unsigned int)SampleFormatToBitsPerChannel(kSampleFormat) ||
++      par.sig   != (unsigned int)sig ||
++      (par.bps > 1 && par.le != SIO_LE_NATIVE) ||
++      (par.bits != par.bps * 8)) {
++    LOG(ERROR) << "Unsupported audio parameters.";
++    goto bad_close;
++  }
++  state = kStopped;
++  buffer = new char[audio_bus->frames() * params.GetBytesPerFrame(kSampleFormat)];
++  sio_onmove(hdl, &OnMoveCallback, this);
++  return true;
++bad_close:
++  sio_close(hdl);
++  return false;
++}
++
++void SndioAudioInputStream::Start(AudioInputCallback* cb) {
++
++  StartAgc();
++
++  state = kRunning;
++  hw_delay = 0;
++  callback = cb;
++  sio_start(hdl);
++  if (pthread_create(&thread, NULL, &ThreadEntry, this) != 0) {
++    LOG(ERROR) << "Failed to create real-time thread for recording.";
++    sio_stop(hdl);
++    state = kStopped;
++  }
++}
++
++void SndioAudioInputStream::Stop() {
++
++  if (state == kStopped)
++    return;
++
++  state = kStopWait;
++  pthread_join(thread, NULL);
++  sio_stop(hdl);
++  state = kStopped;
++
++  StopAgc();
++}
++
++void SndioAudioInputStream::Close() {
++
++  if (state == kClosed)
++    return;
++
++  if (state == kRunning)
++    Stop();
++
++  state = kClosed;
++  delete [] buffer;
++  sio_close(hdl);
++
++  manager->ReleaseInputStream(this);
++}
++
++double SndioAudioInputStream::GetMaxVolume() {
++  // Not supported
++  return 0.0;
++}
++
++void SndioAudioInputStream::SetVolume(double volume) {
++  // Not supported. Do nothing.
++}
++
++double SndioAudioInputStream::GetVolume() {
++  // Not supported.
++  return 0.0;
++}
++
++bool SndioAudioInputStream::IsMuted() {
++  // Not supported.
++  return false;
++}
++
++void SndioAudioInputStream::SetOutputDeviceForAec(
++    const std::string& output_device_id) {
++  // Not supported.
++}
++
++void SndioAudioInputStream::ThreadLoop(void) {
++  size_t todo, n;
++  char *data;
++  unsigned int nframes;
++  double normalized_volume = 0.0;
++
++  nframes = audio_bus->frames();
++
++  while (state == kRunning && !sio_eof(hdl)) {
++
++    GetAgcVolume(&normalized_volume);
++
++    // read one block
++    todo = nframes * params.GetBytesPerFrame(kSampleFormat);
++    data = buffer;
++    while (todo > 0) {
++      n = sio_read(hdl, data, todo);
++      if (n == 0)
++        return;	// unrecoverable I/O error
++      todo -= n;
++      data += n;
++    }
++    hw_delay -= nframes;
++
++    // convert frames count to TimeDelta
++    const base::TimeDelta delay = AudioTimestampHelper::FramesToTime(hw_delay,
++      params.sample_rate());
++
++    // push into bus
++    audio_bus->FromInterleaved<SignedInt16SampleTypeTraits>(reinterpret_cast<int16_t*>(buffer), nframes);
++
++    // invoke callback
++    callback->OnData(audio_bus.get(), base::TimeTicks::Now() - delay, 1.);
++  }
++}
++
++}  // namespace media
+--- /dev/null
++++ b/src/3rdparty/chromium/media/audio/sndio/sndio_input.h
+@@ -0,0 +1,91 @@
++// Copyright 2013 The Chromium Authors. All rights reserved.
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++#ifndef MEDIA_AUDIO_SNDIO_SNDIO_INPUT_H_
++#define MEDIA_AUDIO_SNDIO_SNDIO_INPUT_H_
++
++#include <stdint.h>
++#include <string>
++#include <sndio.h>
++
++#include "base/compiler_specific.h"
++#include "base/macros.h"
++#include "base/memory/weak_ptr.h"
++#include "base/time/time.h"
++#include "media/audio/agc_audio_stream.h"
++#include "media/audio/audio_io.h"
++#include "media/audio/audio_device_description.h"
++#include "media/base/audio_parameters.h"
++
++namespace media {
++
++class AudioManagerBase;
++
++// Implementation of AudioOutputStream using sndio(7)
++class SndioAudioInputStream : public AgcAudioStream<AudioInputStream> {
++ public:
++  // Pass this to the constructor if you want to attempt auto-selection
++  // of the audio recording device.
++  static const char kAutoSelectDevice[];
++
++  // Create a PCM Output stream for the SNDIO device identified by
++  // |device_name|. If unsure of what to use for |device_name|, use
++  // |kAutoSelectDevice|.
++  SndioAudioInputStream(AudioManagerBase* audio_manager,
++                     const std::string& device_name,
++                     const AudioParameters& params);
++
++  ~SndioAudioInputStream() override;
++
++  // Implementation of AudioInputStream.
++  bool Open() override;
++  void Start(AudioInputCallback* callback) override;
++  void Stop() override;
++  void Close() override;
++  double GetMaxVolume() override;
++  void SetVolume(double volume) override;
++  double GetVolume() override;
++  bool IsMuted() override;
++  void SetOutputDeviceForAec(const std::string& output_device_id) override;
++
++ private:
++
++  enum StreamState {
++    kClosed,            // Not opened yet
++    kStopped,           // Device opened, but not started yet
++    kRunning,           // Started, device playing
++    kStopWait           // Stopping, waiting for the real-time thread to exit
++  };
++
++  // C-style call-backs
++  static void OnMoveCallback(void *arg, int delta);
++  static void* ThreadEntry(void *arg);
++
++  // Continuously moves data from the device to the consumer
++  void ThreadLoop();
++  // Our creator, the audio manager needs to be notified when we close.
++  AudioManagerBase* manager;
++  // Parameters of the source
++  AudioParameters params;
++  // We store data here for consumer
++  std::unique_ptr<AudioBus> audio_bus;
++  // Call-back that consumes recorded data
++  AudioInputCallback* callback;  // Valid during a recording session.
++  // Handle of the audio device
++  struct sio_hdl* hdl;
++  // Current state of the stream
++  enum StreamState state;
++  // High priority thread running ThreadLoop()
++  pthread_t thread;
++  // Number of frames buffered in the hardware
++  int hw_delay;
++  // Temporary buffer where data is stored sndio-compatible format
++  char* buffer;
++
++  DISALLOW_COPY_AND_ASSIGN(SndioAudioInputStream);
++};
++
++}  // namespace media
++
++#endif  // MEDIA_AUDIO_SNDIO_SNDIO_INPUT_H_
+--- /dev/null
++++ b/src/3rdparty/chromium/media/audio/sndio/sndio_output.cc
+@@ -0,0 +1,183 @@
++// Copyright (c) 2012 The Chromium Authors. All rights reserved.
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++#include "base/logging.h"
++#include "base/time/time.h"
++#include "base/time/default_tick_clock.h"
++#include "media/audio/audio_manager_base.h"
++#include "media/base/audio_timestamp_helper.h"
++#include "media/audio/sndio/sndio_output.h"
++
++namespace media {
++
++static const SampleFormat kSampleFormat = kSampleFormatS16;
++
++void SndioAudioOutputStream::OnMoveCallback(void *arg, int delta) {
++  SndioAudioOutputStream* self = static_cast<SndioAudioOutputStream*>(arg);
++
++  self->hw_delay -= delta;
++}
++
++void SndioAudioOutputStream::OnVolCallback(void *arg, unsigned int vol) {
++  SndioAudioOutputStream* self = static_cast<SndioAudioOutputStream*>(arg);
++
++  self->vol = vol;
++}
++
++void *SndioAudioOutputStream::ThreadEntry(void *arg) {
++  SndioAudioOutputStream* self = static_cast<SndioAudioOutputStream*>(arg);
++
++  self->ThreadLoop();
++  return NULL;
++}
++
++SndioAudioOutputStream::SndioAudioOutputStream(const AudioParameters& params,
++                                               AudioManagerBase* manager)
++    : manager(manager),
++      params(params),
++      audio_bus(AudioBus::Create(params)),
++      state(kClosed),
++      mutex(PTHREAD_MUTEX_INITIALIZER) {
++}
++
++SndioAudioOutputStream::~SndioAudioOutputStream() {
++  if (state != kClosed)
++    Close();
++}
++
++bool SndioAudioOutputStream::Open() {
++  struct sio_par par;
++  int sig;
++
++  if (params.format() != AudioParameters::AUDIO_PCM_LINEAR &&
++      params.format() != AudioParameters::AUDIO_PCM_LOW_LATENCY) {
++    LOG(WARNING) << "Unsupported audio format.";
++    return false;
++  }
++  sio_initpar(&par);
++  par.rate = params.sample_rate();
++  par.pchan = params.channels();
++  par.bits = SampleFormatToBitsPerChannel(kSampleFormat);
++  par.bps = par.bits / 8;
++  par.sig = sig = par.bits != 8 ? 1 : 0;
++  par.le = SIO_LE_NATIVE;
++  par.appbufsz = params.frames_per_buffer();
++
++  hdl = sio_open(SIO_DEVANY, SIO_PLAY, 0);
++  if (hdl == NULL) {
++    LOG(ERROR) << "Couldn't open audio device.";
++    return false;
++  }
++  if (!sio_setpar(hdl, &par) || !sio_getpar(hdl, &par)) {
++    LOG(ERROR) << "Couldn't set audio parameters.";
++    goto bad_close;
++  }
++  if (par.rate  != (unsigned int)params.sample_rate() ||
++      par.pchan != (unsigned int)params.channels() ||
++      par.bits  != (unsigned int)SampleFormatToBitsPerChannel(kSampleFormat) ||
++      par.sig   != (unsigned int)sig ||
++      (par.bps > 1 && par.le != SIO_LE_NATIVE) ||
++      (par.bits != par.bps * 8)) {
++    LOG(ERROR) << "Unsupported audio parameters.";
++    goto bad_close;
++  }
++  state = kStopped;
++  volpending = 0;
++  vol = 0;
++  buffer = new char[audio_bus->frames() * params.GetBytesPerFrame(kSampleFormat)];
++  sio_onmove(hdl, &OnMoveCallback, this);
++  sio_onvol(hdl, &OnVolCallback, this);
++  return true;
++ bad_close:
++  sio_close(hdl);
++  return false;
++}
++
++void SndioAudioOutputStream::Close() {
++  if (state == kClosed)
++    return;
++  if (state == kRunning)
++    Stop();
++  state = kClosed;
++  delete [] buffer;
++  sio_close(hdl);
++  manager->ReleaseOutputStream(this);  // Calls the destructor
++}
++
++void SndioAudioOutputStream::Start(AudioSourceCallback* callback) {
++  state = kRunning;
++  hw_delay = 0;
++  source = callback;
++  sio_start(hdl);
++  if (pthread_create(&thread, NULL, &ThreadEntry, this) != 0) {
++    LOG(ERROR) << "Failed to create real-time thread.";
++    sio_stop(hdl);
++    state = kStopped;
++  }
++}
++
++void SndioAudioOutputStream::Stop() {
++  if (state == kStopped)
++    return;
++  state = kStopWait;
++  pthread_join(thread, NULL);
++  sio_stop(hdl);
++  state = kStopped;
++}
++
++void SndioAudioOutputStream::SetVolume(double v) {
++  pthread_mutex_lock(&mutex);
++  vol = v * SIO_MAXVOL;
++  volpending = 1;
++  pthread_mutex_unlock(&mutex);
++}
++
++void SndioAudioOutputStream::GetVolume(double* v) {
++  pthread_mutex_lock(&mutex);
++  *v = vol * (1. / SIO_MAXVOL);
++  pthread_mutex_unlock(&mutex);
++}
++
++// This stream is always used with sub second buffer sizes, where it's
++// sufficient to simply always flush upon Start().
++void SndioAudioOutputStream::Flush() {}
++
++void SndioAudioOutputStream::ThreadLoop(void) {
++  int avail, count, result;
++
++  while (state == kRunning) {
++    // Update volume if needed
++    pthread_mutex_lock(&mutex);
++    if (volpending) {
++      volpending = 0;
++      sio_setvol(hdl, vol);
++    }
++    pthread_mutex_unlock(&mutex);
++
++    // Get data to play
++    const base::TimeDelta delay = AudioTimestampHelper::FramesToTime(hw_delay,
++	params.sample_rate());
++    count = source->OnMoreData(delay, base::TimeTicks::Now(), 0, audio_bus.get());
++    audio_bus->ToInterleaved<SignedInt16SampleTypeTraits>(count, reinterpret_cast<int16_t*>(buffer));
++    if (count == 0) {
++      // We have to submit something to the device
++      count = audio_bus->frames();
++      memset(buffer, 0, count * params.GetBytesPerFrame(kSampleFormat));
++      LOG(WARNING) << "No data to play, running empty cycle.";
++    }
++
++    // Submit data to the device
++    avail = count * params.GetBytesPerFrame(kSampleFormat);
++    result = sio_write(hdl, buffer, avail);
++    if (result == 0) {
++      LOG(WARNING) << "Audio device disconnected.";
++      break;
++    }
++
++    // Update hardware pointer
++    hw_delay += count;
++  }
++}
++
++}  // namespace media
+--- /dev/null
++++ b/src/3rdparty/chromium/media/audio/sndio/sndio_output.h
+@@ -0,0 +1,86 @@
++// Copyright (c) 2012 The Chromium Authors. All rights reserved.
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++#ifndef MEDIA_AUDIO_SNDIO_SNDIO_OUTPUT_H_
++#define MEDIA_AUDIO_SNDIO_SNDIO_OUTPUT_H_
++
++#include <pthread.h>
++#include <sndio.h>
++
++#include "base/time/tick_clock.h"
++#include "base/time/time.h"
++#include "media/audio/audio_io.h"
++
++namespace media {
++
++class AudioManagerBase;
++
++// Implementation of AudioOutputStream using sndio(7)
++class SndioAudioOutputStream : public AudioOutputStream {
++ public:
++  // The manager is creating this object
++  SndioAudioOutputStream(const AudioParameters& params,
++                         AudioManagerBase* manager);
++  virtual ~SndioAudioOutputStream();
++
++  // Implementation of AudioOutputStream.
++  bool Open() override;
++  void Close() override;
++  void Start(AudioSourceCallback* callback) override;
++  void Stop() override;
++  void SetVolume(double volume) override;
++  void GetVolume(double* volume) override;
++  void Flush() override;
++
++  friend void sndio_onmove(void *arg, int delta);
++  friend void sndio_onvol(void *arg, unsigned int vol);
++  friend void *sndio_threadstart(void *arg);
++
++ private:
++  enum StreamState {
++    kClosed,            // Not opened yet
++    kStopped,           // Device opened, but not started yet
++    kRunning,           // Started, device playing
++    kStopWait           // Stopping, waiting for the real-time thread to exit
++  };
++
++  // C-style call-backs
++  static void OnMoveCallback(void *arg, int delta);
++  static void OnVolCallback(void *arg, unsigned int vol);
++  static void* ThreadEntry(void *arg);
++
++  // Continuously moves data from the producer to the device
++  void ThreadLoop(void);
++
++  // Our creator, the audio manager needs to be notified when we close.
++  AudioManagerBase* manager;
++  // Parameters of the source
++  AudioParameters params;
++  // Source stores data here
++  std::unique_ptr<AudioBus> audio_bus;
++  // Call-back that produces data to play
++  AudioSourceCallback* source;
++  // Handle of the audio device
++  struct sio_hdl* hdl;
++  // Current state of the stream
++  enum StreamState state;
++  // High priority thread running ThreadLoop()
++  pthread_t thread;
++  // Protects vol, volpending and hw_delay
++  pthread_mutex_t mutex;
++  // Current volume in the 0..SIO_MAXVOL range
++  int vol;
++  // Set to 1 if volumes must be refreshed in the realtime thread
++  int volpending;
++  // Number of frames buffered in the hardware
++  int hw_delay;
++  // Temporary buffer where data is stored sndio-compatible format
++  char* buffer;
++
++  DISALLOW_COPY_AND_ASSIGN(SndioAudioOutputStream);
++};
++
++}  // namespace media
++
++#endif  // MEDIA_AUDIO_SNDIO_SNDIO_OUTPUT_H_
+--- a/src/3rdparty/chromium/media/media_options.gni
++++ b/src/3rdparty/chromium/media/media_options.gni
+@@ -121,6 +121,9 @@ declare_args() {
+   # Enables runtime selection of ALSA library for audio.
+   use_alsa = false
+ 
++  # Enable runtime selection of sndio(7)
++  use_sndio = false
++
+   # Alsa should be used on non-Android, non-Mac POSIX systems.
+   # Alsa should be used on desktop Chromecast and audio-only Chromecast builds.
+   if (is_posix && !is_android && !is_mac &&
diff --git a/srcpkgs/qt6-webengine/patches/0700-armv7l-neon.patch b/srcpkgs/qt6-webengine/patches/0700-armv7l-neon.patch
new file mode 100644
index 000000000000..d42fa19a07a1
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0700-armv7l-neon.patch
@@ -0,0 +1,10 @@
+--- a/src/3rdparty/chromium/skia/BUILD.gn
++++ b/src/3rdparty/chromium/skia/BUILD.gn
+@@ -800,7 +800,6 @@ skia_source_set("skia_opts") {
+         # Root build config sets -mfpu=$arm_fpu, which we expect to be neon
+         # when running this.
+         if (!arm_use_neon) {
+-          configs -= [ "//build/config/compiler:compiler_arm_fpu" ]
+           cflags += [ "-mfpu=neon" ]
+         }
+       }
diff --git a/srcpkgs/qt6-webengine/patches/0750-chromium-musl-cross-no-asm_ptrace_h.patch b/srcpkgs/qt6-webengine/patches/0750-chromium-musl-cross-no-asm_ptrace_h.patch
new file mode 100644
index 000000000000..3cf132908af4
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0750-chromium-musl-cross-no-asm_ptrace_h.patch
@@ -0,0 +1,30 @@
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper.cc
+@@ -38,7 +38,12 @@
+ 
+ #include "client/linux/minidump_writer/linux_ptrace_dumper.h"
+ 
++#if defined(__GLIBC__)
+ #include <asm/ptrace.h>
++#else
++/* For arm*-musl this definition is missing */
++#define ARM_sp uregs[13]
++#endif
+ #include <assert.h>
+ #include <errno.h>
+ #include <fcntl.h>
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_core_dumper.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_core_dumper.cc
+@@ -32,7 +32,12 @@
+ 
+ #include "client/linux/minidump_writer/linux_core_dumper.h"
+ 
++#if defined(__GLIBC__)
+ #include <asm/ptrace.h>
++#else
++/* For arm*-musl this definition is missing */
++#define ARM_sp uregs[13]
++#endif
+ #include <assert.h>
+ #include <elf.h>
+ #include <stdio.h>
diff --git a/srcpkgs/qt6-webengine/patches/0751-chromium-musl-arm-user_vfp.patch b/srcpkgs/qt6-webengine/patches/0751-chromium-musl-arm-user_vfp.patch
new file mode 100644
index 000000000000..6e2d62f35ee6
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0751-chromium-musl-arm-user_vfp.patch
@@ -0,0 +1,20 @@
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/util/linux/thread_info.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/util/linux/thread_info.h
+@@ -17,6 +17,17 @@
+ 
+ #include <stdint.h>
+ #include <sys/user.h>
++#if !defined(__GLIBC__)
++struct user_vfp {
++	unsigned long long fpregs[32];
++	unsigned long fpscr;
++};
++struct user_vfp_exc {
++	unsigned long fpexc;
++	unsigned long fpinst;
++	unsigned long fpinst2;
++};
++#endif /* !defined(__GLIBC__) */
+ 
+ #include <type_traits>
+ 
diff --git a/srcpkgs/qt6-webengine/patches/0752-chromium-musl-arm-elf_auxv_t.patch b/srcpkgs/qt6-webengine/patches/0752-chromium-musl-arm-elf_auxv_t.patch
new file mode 100644
index 000000000000..7112c8cfd3fa
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0752-chromium-musl-arm-elf_auxv_t.patch
@@ -0,0 +1,18 @@
+--- a/src/3rdparty/chromium/v8/src/base/cpu.cc
++++ b/src/3rdparty/chromium/v8/src/base/cpu.cc
+@@ -163,6 +163,15 @@ static V8_INLINE void __cpuid(int cpu_in
+ 
+ #if V8_HOST_ARCH_ARM || V8_HOST_ARCH_ARM64
+ 
++#ifndef __GLIBC__
++#include <elf.h>
++#ifdef __LP64__
++typedef Elf64_auxv_t elf_auxv_t;
++#else
++typedef Elf32_auxv_t elf_auxv_t;
++#endif
++#endif
++
+ static uint32_t ReadELFHWCaps() {
+   uint32_t result = 0;
+ #if V8_GLIBC_PREREQ(2, 16)
diff --git a/srcpkgs/qt6-webengine/patches/0801-chromium-i686-vaapi-fpermissive.patch b/srcpkgs/qt6-webengine/patches/0801-chromium-i686-vaapi-fpermissive.patch
new file mode 100644
index 000000000000..3d4043e03b89
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0801-chromium-i686-vaapi-fpermissive.patch
@@ -0,0 +1,24 @@
+--- a/src/3rdparty/chromium/media/gpu/vaapi/BUILD.gn
++++ b/src/3rdparty/chromium/media/gpu/vaapi/BUILD.gn
+@@ -14,6 +14,10 @@ import("//ui/gl/features.gni")
+ assert(is_linux || is_chromeos)
+ assert(use_vaapi)
+ 
++config("vaapi_permissive") {
++  cflags = [ "-fpermissive" ]
++}
++
+ generate_stubs("libva_stubs") {
+   extra_header = "va_stub_header.fragment"
+   sigs = [ "va.sigs" ]
+@@ -136,6 +140,10 @@ source_set("vaapi") {
+     ]
+   }
+ 
++  if (target_cpu == "x86") {
++    configs += [ ":vaapi_permissive" ]
++  }
++
+   if (use_x11) {
+     deps += [ "//ui/gfx/x" ]
+     sources += [
diff --git a/srcpkgs/qt6-webengine/patches/0900-xxx-ppc64le-libvpx.patch b/srcpkgs/qt6-webengine/patches/0900-xxx-ppc64le-libvpx.patch
new file mode 100644
index 000000000000..5c9566b56bd4
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0900-xxx-ppc64le-libvpx.patch
@@ -0,0 +1,65 @@
+Uses generic target for now. To use ppc64le, change --target to ppc64le-gnu
+and add --enable-vsx, and change generic to ppc for the rtcd header.
+
+From 18e6c5c55cfae0cfb458d8210d7bc709360a0e90 Mon Sep 17 00:00:00 2001
+From: q66 <daniel@octaforge.org>
+Date: Wed, 9 Sep 2020 19:08:25 +0200
+Subject: [PATCH] enable generation of ppc64 libvpx bits
+
+this doesn't update the gni file, that's done from
+the template by running the appropriate scripts
+---
+ third_party/libvpx/BUILD.gn        | 4 ++++
+ third_party/libvpx/generate_gni.sh | 9 +++++++++
+ 2 files changed, 13 insertions(+)
+
+--- a/src/3rdparty/chromium/third_party/libvpx/BUILD.gn
++++ b/src/3rdparty/chromium/third_party/libvpx/BUILD.gn
+@@ -424,6 +424,8 @@ static_library("bundled_libvpx") {
+       sources = libvpx_srcs_arm64
+       public_deps = [ ":libvpx_arm64_headers" ]
+     }
++  } else if (current_cpu == "ppc64") {
++    sources = libvpx_srcs_ppc64
+   }
+ 
+   configs -= [ "//build/config/compiler:chromium_code" ]
+--- a/src/3rdparty/chromium/third_party/libvpx/generate_gni.sh
++++ b/src/3rdparty/chromium/third_party/libvpx/generate_gni.sh
+@@ -374,6 +374,7 @@ gen_config_files linux/arm-neon-highbd "
+ gen_config_files linux/arm64-highbd "--target=armv8-linux-gcc ${all_platforms} ${HIGHBD}"
+ gen_config_files linux/mipsel "--target=mips32-linux-gcc ${all_platforms}"
+ gen_config_files linux/mips64el "--target=mips64-linux-gcc ${all_platforms}"
++gen_config_files linux/ppc64 "--target=generic-gnu $HIGHBD ${all_platforms}"
+ gen_config_files linux/generic "--target=generic-gnu $HIGHBD ${all_platforms}"
+ gen_config_files win/arm64 "--target=arm64-win64-vs15 ${all_platforms} ${HIGHBD}"
+ gen_config_files win/ia32 "--target=x86-win32-vs14 ${all_platforms} ${x86_platforms}"
+@@ -399,6 +400,7 @@ lint_config linux/arm-neon-highbd
+ lint_config linux/arm64-highbd
+ lint_config linux/mipsel
+ lint_config linux/mips64el
++lint_config linux/ppc64
+ lint_config linux/generic
+ lint_config win/arm64
+ lint_config win/ia32
+@@ -428,6 +430,7 @@ gen_rtcd_header linux/arm-neon-highbd ar
+ gen_rtcd_header linux/arm64-highbd armv8
+ gen_rtcd_header linux/mipsel mipsel
+ gen_rtcd_header linux/mips64el mips64el
++gen_rtcd_header linux/ppc64 generic
+ gen_rtcd_header linux/generic generic
+ gen_rtcd_header win/arm64 armv8
+ gen_rtcd_header win/ia32 x86 "${require_sse2}"
+@@ -513,6 +516,12 @@ if [ -z $ONLY_CONFIGS ]; then
+ 
+   echo "MIPS64 source list is identical to MIPS source list. No need to generate it."
+ 
++  echo "Generate ppc64 source list."
++  config=$(print_config_basic linux/ppc64)
++  make_clean
++  make libvpx_srcs.txt target=libs $config > /dev/null
++  convert_srcs_to_project_files libvpx_srcs.txt libvpx_srcs_ppc64
++
+   echo "Generate NaCl source list."
+   config=$(print_config_basic nacl)
+   make_clean
diff --git a/srcpkgs/qt6-webengine/patches/0901-xxx-ppc64le-sandbox-linux-stat.patch b/srcpkgs/qt6-webengine/patches/0901-xxx-ppc64le-sandbox-linux-stat.patch
new file mode 100644
index 000000000000..4b8e6320601c
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0901-xxx-ppc64le-sandbox-linux-stat.patch
@@ -0,0 +1,31 @@
+--- a/src/3rdparty/chromium/sandbox/linux/system_headers/linux_stat.h
++++ b/src/3rdparty/chromium/sandbox/linux/system_headers/linux_stat.h
+@@ -155,6 +155,28 @@ struct kernel_stat {
+   unsigned int __unused4;
+   unsigned int __unused5;
+ };
++#elif defined(__powerpc64__)
++struct kernel_stat {
++  unsigned long	st_dev;
++  unsigned long	st_ino;
++  unsigned long	st_nlink;
++  unsigned int	st_mode;
++  unsigned int	st_uid;
++  unsigned int	st_gid;
++  unsigned long	st_rdev;
++  long		st_size;
++  unsigned long	st_blksize;
++  unsigned long	st_blocks;
++  unsigned long	st_atime_;
++  unsigned long	st_atime_nsec_;
++  unsigned long	st_mtime_;
++  unsigned long	st_mtime_nsec_;
++  unsigned long	st_ctime_;
++  unsigned long	st_ctime_nsec_;
++  unsigned long	__unused4;
++  unsigned long	__unused5;
++  unsigned long	__unused6;
++};
+ #endif
+ 
+ #if !defined(AT_EMPTY_PATH)
diff --git a/srcpkgs/qt6-webengine/patches/0902-xxx-ppc64le-support.patch b/srcpkgs/qt6-webengine/patches/0902-xxx-ppc64le-support.patch
new file mode 100644
index 000000000000..33d415e55f69
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0902-xxx-ppc64le-support.patch
@@ -0,0 +1,3556 @@
+commit 2c013a317b1114ef67cdbbc30824b28907b9ea94
+Author: Daniel Kolesa <daniel@octaforge.org>
+Date:   Wed Mar 3 19:08:29 2021 +0100
+
+    ppc64le support
+
+--- a/src/3rdparty/chromium/sandbox/features.gni
++++ b/src/3rdparty/chromium/sandbox/features.gni
+@@ -11,7 +11,8 @@ import("//build/config/nacl/config.gni")
+ use_seccomp_bpf = (is_linux || is_chromeos || is_android) &&
+                   (current_cpu == "x86" || current_cpu == "x64" ||
+                    current_cpu == "arm" || current_cpu == "arm64" ||
+-                   current_cpu == "mipsel" || current_cpu == "mips64el")
++                   current_cpu == "mipsel" || current_cpu == "mips64el" ||
++                   current_cpu == "ppc64")
+ 
+ use_seccomp_bpf = use_seccomp_bpf || is_nacl_nonsfi
+ 
+--- a/src/3rdparty/chromium/sandbox/linux/BUILD.gn
++++ b/src/3rdparty/chromium/sandbox/linux/BUILD.gn
+@@ -433,6 +433,8 @@ component("sandbox_services") {
+ 
+ source_set("sandbox_services_headers") {
+   sources = [
++    "system_headers/ppc64_linux_syscalls.h",
++    "system_headers/ppc64_linux_ucontext.h",
+     "system_headers/arm64_linux_syscalls.h",
+     "system_headers/arm_linux_syscalls.h",
+     "system_headers/arm_linux_ucontext.h",
+--- a/src/3rdparty/chromium/sandbox/linux/bpf_dsl/linux_syscall_ranges.h
++++ b/src/3rdparty/chromium/sandbox/linux/bpf_dsl/linux_syscall_ranges.h
+@@ -56,6 +56,13 @@
+ #define MAX_PUBLIC_SYSCALL __NR_syscalls
+ #define MAX_SYSCALL MAX_PUBLIC_SYSCALL
+ 
++#elif defined(__powerpc64__)
++
++#include <asm/unistd.h>
++#define MIN_SYSCALL 0u
++#define MAX_PUBLIC_SYSCALL 386u
++#define MAX_SYSCALL MAX_PUBLIC_SYSCALL
++
+ #else
+ #error "Unsupported architecture"
+ #endif
+--- a/src/3rdparty/chromium/sandbox/linux/bpf_dsl/seccomp_macros.h
++++ b/src/3rdparty/chromium/sandbox/linux/bpf_dsl/seccomp_macros.h
+@@ -16,6 +16,9 @@
+ #if defined(__mips__)
+ // sys/user.h in eglibc misses size_t definition
+ #include <stddef.h>
++#elif defined(__powerpc64__) && defined(__GLIBC__)
++// Manually define greg_t on ppc64
++typedef unsigned long long greg_t;
+ #endif
+ #endif
+ 
+@@ -346,6 +349,59 @@ struct regs_struct {
+ #define SECCOMP_PT_PARM4(_regs) (_regs).regs[3]
+ #define SECCOMP_PT_PARM5(_regs) (_regs).regs[4]
+ #define SECCOMP_PT_PARM6(_regs) (_regs).regs[5]
++
++#elif defined(__powerpc64__)
++#include <asm/ptrace.h>
++
++typedef struct pt_regs regs_struct;
++
++#ifdef ARCH_CPU_LITTLE_ENDIAN
++#define SECCOMP_ARCH AUDIT_ARCH_PPC64LE
++#else
++#define SECCOMP_ARCH AUDIT_ARCH_PPC64
++#endif
++
++#ifdef __GLIBC__
++#define SECCOMP_REG(_ctx, _reg) ((_ctx)->uc_mcontext.regs->gpr[_reg])
++#else
++#define SECCOMP_REG(_ctx, _reg) (((struct pt_regs *)(_ctx)->uc_mcontext.regs)->gpr[_reg])
++#endif
++
++#define SECCOMP_RESULT(_ctx) SECCOMP_REG(_ctx, 3)
++#define SECCOMP_SYSCALL(_ctx) SECCOMP_REG(_ctx, 0)
++#ifdef __GLIBC__
++#define SECCOMP_IP(_ctx) (_ctx)->uc_mcontext.regs->nip
++#else
++#define SECCOMP_IP(_ctx) ((struct pt_regs *)(_ctx)->uc_mcontext.regs)->nip
++#endif
++#define SECCOMP_PARM1(_ctx) SECCOMP_REG(_ctx, 3)
++#define SECCOMP_PARM2(_ctx) SECCOMP_REG(_ctx, 4)
++#define SECCOMP_PARM3(_ctx) SECCOMP_REG(_ctx, 5)
++#define SECCOMP_PARM4(_ctx) SECCOMP_REG(_ctx, 6)
++#define SECCOMP_PARM5(_ctx) SECCOMP_REG(_ctx, 7)
++#define SECCOMP_PARM6(_ctx) SECCOMP_REG(_ctx, 8)
++
++#define SECCOMP_NR_IDX (offsetof(struct arch_seccomp_data, nr))
++#define SECCOMP_ARCH_IDX (offsetof(struct arch_seccomp_data, arch))
++#define SECCOMP_IP_MSB_IDX \
++  (offsetof(struct arch_seccomp_data, instruction_pointer) + 4)
++#define SECCOMP_IP_LSB_IDX \
++  (offsetof(struct arch_seccomp_data, instruction_pointer) + 0)
++#define SECCOMP_ARG_MSB_IDX(nr) \
++  (offsetof(struct arch_seccomp_data, args) + 8 * (nr) + 4)
++#define SECCOMP_ARG_LSB_IDX(nr) \
++  (offsetof(struct arch_seccomp_data, args) + 8 * (nr) + 0)
++
++#define SECCOMP_PT_RESULT(_regs) (_regs).gpr[3]
++#define SECCOMP_PT_SYSCALL(_regs) (_regs).gpr[0]
++#define SECCOMP_PT_IP(_regs) (_regs).nip
++#define SECCOMP_PT_PARM1(_regs) (_regs).gpr[3]
++#define SECCOMP_PT_PARM2(_regs) (_regs).gpr[4]
++#define SECCOMP_PT_PARM3(_regs) (_regs).gpr[5]
++#define SECCOMP_PT_PARM4(_regs) (_regs).gpr[6]
++#define SECCOMP_PT_PARM5(_regs) (_regs).gpr[7]
++#define SECCOMP_PT_PARM6(_regs) (_regs).gpr[8]
++
+ #else
+ #error Unsupported target platform
+ 
+--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc
++++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc
+@@ -90,7 +90,7 @@ bool IsBaselinePolicyWatched(int sysno)
+          SyscallSets::IsNuma(sysno) ||
+          SyscallSets::IsPrctl(sysno) ||
+          SyscallSets::IsProcessGroupOrSession(sysno) ||
+-#if defined(__i386__) || \
++#if defined(__i386__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+          SyscallSets::IsSocketCall(sysno) ||
+ #endif
+@@ -258,7 +258,7 @@ ResultExpr EvaluateSyscallImpl(int fs_de
+   }
+ 
+ #if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
+-    defined(__aarch64__)
++    defined(__aarch64__) || defined(__powerpc64__)
+   if (sysno == __NR_mmap)
+     return RestrictMmapFlags();
+ #endif
+@@ -279,7 +279,7 @@ ResultExpr EvaluateSyscallImpl(int fs_de
+     return RestrictPrctl();
+ 
+ #if defined(__x86_64__) || defined(__arm__) || defined(__mips__) || \
+-    defined(__aarch64__)
++    defined(__aarch64__) || defined(__powerpc64__)
+   if (sysno == __NR_socketpair) {
+     // Only allow AF_UNIX, PF_UNIX. Crash if anything else is seen.
+     static_assert(AF_UNIX == PF_UNIX,
+@@ -343,7 +343,8 @@ ResultExpr EvaluateSyscallImpl(int fs_de
+   }
+ 
+ #if defined(__i386__) || \
+-    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
++    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
++    defined(__powerpc64__)
+   if (SyscallSets::IsSocketCall(sysno))
+     return RestrictSocketcallCommand();
+ #endif
+--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/baseline_policy_unittest.cc
++++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/baseline_policy_unittest.cc
+@@ -317,7 +317,7 @@ TEST_BASELINE_SIGSYS(__NR_sysinfo)
+ TEST_BASELINE_SIGSYS(__NR_syslog)
+ TEST_BASELINE_SIGSYS(__NR_timer_create)
+ 
+-#if !defined(__aarch64__)
++#if !defined(__aarch64__) && !defined(__powerpc64__)
+ TEST_BASELINE_SIGSYS(__NR_inotify_init)
+ TEST_BASELINE_SIGSYS(__NR_vserver)
+ #endif
+--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc
++++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc
+@@ -40,6 +40,7 @@
+ #include <sys/ptrace.h>
+ #if (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) && \
+     !defined(__arm__) && !defined(__aarch64__) &&           \
++    !defined(__powerpc64__) &&                              \
+     !defined(PTRACE_GET_THREAD_AREA)
+ // Also include asm/ptrace-abi.h since ptrace.h in older libc (for instance
+ // the one in Ubuntu 16.04 LTS) is missing PTRACE_GET_THREAD_AREA.
+@@ -49,6 +50,11 @@
+ #endif
+ #endif  // !OS_NACL_NONSFI
+ 
++// On PPC64, TCGETS is defined in terms of struct termios, so we must include termios.h
++#ifdef __powerpc64__
++#include <termios.h>
++#endif
++
+ #if defined(OS_ANDROID)
+ 
+ #if !defined(F_DUPFD_CLOEXEC)
+@@ -106,6 +112,14 @@ inline bool IsArchitectureMips() {
+ #endif
+ }
+ 
++inline bool IsArchitecturePPC64() {
++#if defined(__powerpc64__)
++  return true;
++#else
++  return false;
++#endif
++}
++
+ // Ubuntu's version of glibc has a race condition in sem_post that can cause
+ // it to call futex(2) with bogus op arguments. To workaround this, we need
+ // to allow those futex(2) calls to fail with EINVAL, instead of crashing the
+@@ -270,6 +284,8 @@ ResultExpr RestrictFcntlCommands() {
+   uint64_t kOLargeFileFlag = O_LARGEFILE;
+   if (IsArchitectureX86_64() || IsArchitectureI386() || IsArchitectureMips())
+     kOLargeFileFlag = 0100000;
++  else if (IsArchitecturePPC64())
++    kOLargeFileFlag = 0200000;
+ 
+   const Arg<int> cmd(1);
+   const Arg<long> long_arg(2);
+@@ -287,7 +303,16 @@ ResultExpr RestrictFcntlCommands() {
+               F_SETLKW,
+               F_GETLK,
+               F_DUPFD,
+-              F_DUPFD_CLOEXEC),
++              F_DUPFD_CLOEXEC
++#if defined(__powerpc64__)
++// On PPC64, F_SETLK, F_GETLK, F_SETLKW are defined as the 64-bit variants
++// but glibc will sometimes still use the 32-bit versions. Allow both.
++              ,
++              5, /* F_GETLK (32) */
++              6, /* F_SETLK (32) */
++              7  /* F_SETLKW (32) */
++#endif
++	     ),
+              Allow())
+       .Case(F_SETFL,
+             If((long_arg & ~kAllowedMask) == 0, Allow()).Else(CrashSIGSYS()))
+@@ -297,7 +322,7 @@ ResultExpr RestrictFcntlCommands() {
+   // clang-format on
+ }
+ 
+-#if defined(__i386__) || defined(__mips__)
++#if defined(__i386__) || defined(__mips__) || defined(__powerpc64__)
+ ResultExpr RestrictSocketcallCommand() {
+   // Unfortunately, we are unable to restrict the first parameter to
+   // socketpair(2). Whilst initially sounding bad, it's noteworthy that very
+@@ -454,7 +479,7 @@ ResultExpr RestrictPtrace() {
+ #endif
+   return Switch(request)
+       .CASES((
+-#if !defined(__aarch64__)
++#if !defined(__aarch64__) && !defined(__powerpc64__)
+                  PTRACE_GETREGS, PTRACE_GETFPREGS,
+ #if defined(TRACE_GET_THREAD_AREA)
+                  PTRACE_GET_THREAD_AREA,
+--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.h
++++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.h
+@@ -49,7 +49,7 @@ SANDBOX_EXPORT bpf_dsl::ResultExpr Restr
+ // O_NONBLOCK | O_SYNC | O_LARGEFILE | O_CLOEXEC | O_NOATIME.
+ SANDBOX_EXPORT bpf_dsl::ResultExpr RestrictFcntlCommands();
+ 
+-#if defined(__i386__) || defined(__mips__)
++#if defined(__i386__) || defined(__mips__) || defined(__powerpc64__)
+ // Restrict socketcall(2) to only allow socketpair(2), send(2), recv(2),
+ // sendto(2), recvfrom(2), shutdown(2), sendmsg(2) and recvmsg(2).
+ SANDBOX_EXPORT bpf_dsl::ResultExpr RestrictSocketcallCommand();
+--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
++++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
+@@ -28,7 +28,7 @@ bool SyscallSets::IsKill(int sysno) {
+ bool SyscallSets::IsAllowedGettime(int sysno) {
+   switch (sysno) {
+     case __NR_gettimeofday:
+-#if defined(__i386__) || defined(__x86_64__) || \
++#if defined(__i386__) || defined(__x86_64__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_time:
+ #endif
+@@ -51,12 +51,12 @@ bool SyscallSets::IsAllowedGettime(int s
+                                     // filtered by RestrictClockID().
+     case __NR_clock_nanosleep_time64:  // Parameters filtered by RestrictClockID().
+ #endif
+-#if defined(__i386__) || \
++#if defined(__i386__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_ftime:  // Obsolete.
+ #endif
+     case __NR_settimeofday:  // Privileged.
+-#if defined(__i386__) || \
++#if defined(__i386__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_stime:
+ #endif
+@@ -135,7 +135,7 @@ bool SyscallSets::IsFileSystem(int sysno
+     case __NR_faccessat:  // EPERM not a valid errno.
+     case __NR_fchmodat:
+     case __NR_fchownat:  // Should be called chownat ?
+-#if defined(__x86_64__) || defined(__aarch64__)
++#if defined(__x86_64__) || defined(__aarch64__) || defined(__powerpc64__)
+     case __NR_newfstatat:  // fstatat(). EPERM not a valid errno.
+ #elif defined(__i386__) || defined(__arm__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+@@ -154,7 +154,7 @@ bool SyscallSets::IsFileSystem(int sysno
+     case __NR_memfd_create:
+     case __NR_mkdirat:
+     case __NR_mknodat:
+-#if defined(__i386__)
++#if defined(__i386__) || defined(__powerpc64__)
+     case __NR_oldlstat:
+     case __NR_oldstat:
+ #endif
+@@ -167,7 +167,7 @@ bool SyscallSets::IsFileSystem(int sysno
+     case __NR_stat64:
+ #endif
+     case __NR_statfs:  // EPERM not a valid errno.
+-#if defined(__i386__) || defined(__arm__) || \
++#if defined(__i386__) || defined(__arm__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_statfs64:
+ #endif
+@@ -179,7 +179,8 @@ bool SyscallSets::IsFileSystem(int sysno
+     case __NR_truncate64:
+ #endif
+     case __NR_unlinkat:
+-#if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
++#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
++    defined(__powerpc64__)
+     case __NR_utime:
+ #endif
+     case __NR_utimensat:  // New.
+@@ -204,7 +205,8 @@ bool SyscallSets::IsAllowedFileSystemAcc
+ #endif
+       return true;
+ // TODO(jln): these should be denied gracefully as well (moved below).
+-#if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
++#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
++    defined(__powerpc64__)
+     case __NR_fadvise64:  // EPERM not a valid errno.
+ #endif
+ #if defined(__i386__)
+@@ -216,12 +218,12 @@ bool SyscallSets::IsAllowedFileSystemAcc
+     case __NR_fdatasync:  // EPERM not a valid errno.
+     case __NR_flock:      // EPERM not a valid errno.
+     case __NR_fstatfs:    // Give information about the whole filesystem.
+-#if defined(__i386__) || defined(__arm__) || \
++#if defined(__i386__) || defined(__arm__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_fstatfs64:
+ #endif
+     case __NR_fsync:  // EPERM not a valid errno.
+-#if defined(__i386__)
++#if defined(__i386__) || defined(__powerpc64__)
+     case __NR_oldfstat:
+ #endif
+ #if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
+@@ -229,6 +231,8 @@ bool SyscallSets::IsAllowedFileSystemAcc
+     case __NR_sync_file_range:  // EPERM not a valid errno.
+ #elif defined(__arm__)
+     case __NR_arm_sync_file_range:  // EPERM not a valid errno.
++#elif defined(__powerpc64__)
++    case __NR_sync_file_range2: // EPERM not a valid errno.
+ #endif
+     default:
+       return false;
+@@ -248,7 +252,7 @@ bool SyscallSets::IsDeniedFileSystemAcce
+     case __NR_getdents:    // EPERM not a valid errno.
+ #endif
+     case __NR_getdents64:  // EPERM not a valid errno.
+-#if defined(__i386__) || \
++#if defined(__i386__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_readdir:
+ #endif
+@@ -290,7 +294,7 @@ bool SyscallSets::IsGetSimpleId(int sysn
+ bool SyscallSets::IsProcessPrivilegeChange(int sysno) {
+   switch (sysno) {
+     case __NR_capset:
+-#if defined(__i386__) || defined(__x86_64__)
++#if defined(__i386__) || defined(__x86_64__) || defined(__powerpc64__)
+     case __NR_ioperm:  // Intel privilege.
+     case __NR_iopl:    // Intel privilege.
+ #endif
+@@ -340,7 +344,7 @@ bool SyscallSets::IsAllowedSignalHandlin
+     case __NR_rt_sigprocmask:
+     case __NR_rt_sigreturn:
+     case __NR_rt_sigtimedwait:
+-#if defined(__i386__) || defined(__arm__) || \
++#if defined(__i386__) || defined(__arm__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_rt_sigtimedwait_time64:
+     case __NR_sigaction:
+@@ -357,7 +361,7 @@ bool SyscallSets::IsAllowedSignalHandlin
+     case __NR_signalfd:
+ #endif
+     case __NR_signalfd4:
+-#if defined(__i386__) || defined(__arm__) || \
++#if defined(__i386__) || defined(__arm__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_sigpending:
+     case __NR_sigsuspend:
+@@ -382,7 +386,7 @@ bool SyscallSets::IsAllowedOperationOnFd
+ #endif
+     case __NR_dup3:
+ #if defined(__x86_64__) || defined(__arm__) || defined(__mips__) || \
+-    defined(__aarch64__)
++    defined(__aarch64__) || defined(__powerpc64__)
+     case __NR_shutdown:
+ #endif
+       return true;
+@@ -416,7 +420,7 @@ bool SyscallSets::IsAllowedProcessStartO
+     case __NR_membarrier:
+     case __NR_wait4:
+     case __NR_waitid:
+-#if defined(__i386__)
++#if defined(__i386__) || defined(__powerpc64__)
+     case __NR_waitpid:
+ #endif
+ #if !defined(__GLIBC__)
+@@ -438,7 +442,7 @@ bool SyscallSets::IsAllowedProcessStartO
+     case __NR_set_tid_address:
+ #endif
+     case __NR_unshare:
+-#if !defined(__mips__) && !defined(__aarch64__)
++#if !defined(__mips__) && !defined(__aarch64__) || defined(__powerpc64__)
+     case __NR_vfork:
+ #endif
+     default:
+@@ -491,7 +495,7 @@ bool SyscallSets::IsAllowedGetOrModifySo
+       return true;
+     default:
+ #if defined(__x86_64__) || defined(__arm__) || defined(__mips__) || \
+-    defined(__aarch64__)
++    defined(__aarch64__) || defined(__powerpc64__)
+     case __NR_socketpair:  // We will want to inspect its argument.
+ #endif
+       return false;
+@@ -501,7 +505,7 @@ bool SyscallSets::IsAllowedGetOrModifySo
+ bool SyscallSets::IsDeniedGetOrModifySocket(int sysno) {
+   switch (sysno) {
+ #if defined(__x86_64__) || defined(__arm__) || defined(__mips__) || \
+-    defined(__aarch64__)
++    defined(__aarch64__) || defined(__powerpc64__)
+     case __NR_accept:
+     case __NR_accept4:
+     case __NR_bind:
+@@ -515,7 +519,7 @@ bool SyscallSets::IsDeniedGetOrModifySoc
+   }
+ }
+ 
+-#if defined(__i386__) || \
++#if defined(__i386__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+ // Big multiplexing system call for sockets.
+ bool SyscallSets::IsSocketCall(int sysno) {
+@@ -530,7 +534,8 @@ bool SyscallSets::IsSocketCall(int sysno
+ }
+ #endif
+ 
+-#if defined(__x86_64__) || defined(__arm__) || defined(__mips__)
++#if defined(__x86_64__) || defined(__arm__) || defined(__mips__) || \
++    defined(__powerpc64__)
+ bool SyscallSets::IsNetworkSocketInformation(int sysno) {
+   switch (sysno) {
+     case __NR_getpeername:
+@@ -558,7 +563,7 @@ bool SyscallSets::IsAllowedAddressSpaceA
+     case __NR_mincore:
+     case __NR_mlockall:
+ #if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
+-    defined(__aarch64__)
++    defined(__aarch64__) || defined(__powerpc64__)
+     case __NR_mmap:
+ #endif
+ #if defined(__i386__) || defined(__arm__) || \
+@@ -589,7 +594,7 @@ bool SyscallSets::IsAllowedAddressSpaceA
+ bool SyscallSets::IsAllowedGeneralIo(int sysno) {
+   switch (sysno) {
+     case __NR_lseek:
+-#if defined(__i386__) || defined(__arm__) || \
++#if defined(__i386__) || defined(__arm__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR__llseek:
+ #endif
+@@ -609,27 +614,27 @@ bool SyscallSets::IsAllowedGeneralIo(int
+     case __NR_read:
+     case __NR_readv:
+     case __NR_pread64:
+-#if defined(__arm__) || \
++#if defined(__arm__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_recv:
+ #endif
+ #if defined(__x86_64__) || defined(__arm__) || defined(__mips__) || \
+-    defined(__aarch64__)
++    defined(__aarch64__) || defined(__powerpc64__)
+     case __NR_recvfrom:  // Could specify source.
+     case __NR_recvmsg:   // Could specify source.
+ #endif
+-#if defined(__i386__) || defined(__x86_64__)
++#if defined(__i386__) || defined(__x86_64__) || defined(__powerpc64__)
+     case __NR_select:
+ #endif
+-#if defined(__i386__) || defined(__arm__) || defined(__mips__)
++#if defined(__i386__) || defined(__arm__) || defined(__mips__) || defined(__powerpc64__)
+     case __NR__newselect:
+ #endif
+-#if defined(__arm__) || \
++#if defined(__arm__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_send:
+ #endif
+ #if defined(__x86_64__) || defined(__arm__) || defined(__mips__) || \
+-    defined(__aarch64__)
++    defined(__aarch64__) || defined(__powerpc64__)
+     case __NR_sendmsg:  // Could specify destination.
+     case __NR_sendto:   // Could specify destination.
+ #endif
+@@ -684,7 +689,7 @@ bool SyscallSets::IsAllowedBasicSchedule
+     case __NR_nanosleep:
+       return true;
+     case __NR_getpriority:
+-#if defined(__i386__) || defined(__arm__) || \
++#if defined(__i386__) || defined(__arm__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_nice:
+ #endif
+@@ -696,7 +701,7 @@ bool SyscallSets::IsAllowedBasicSchedule
+ 
+ bool SyscallSets::IsAdminOperation(int sysno) {
+   switch (sysno) {
+-#if defined(__i386__) || defined(__arm__) || \
++#if defined(__i386__) || defined(__arm__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_bdflush:
+ #endif
+@@ -713,7 +718,8 @@ bool SyscallSets::IsAdminOperation(int s
+ 
+ bool SyscallSets::IsKernelModule(int sysno) {
+   switch (sysno) {
+-#if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
++#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
++    defined(__powerpc64__)
+     case __NR_create_module:
+     case __NR_get_kernel_syms:  // Should ENOSYS.
+     case __NR_query_module:
+@@ -745,7 +751,7 @@ bool SyscallSets::IsFsControl(int sysno)
+     case __NR_quotactl:
+     case __NR_swapoff:
+     case __NR_swapon:
+-#if defined(__i386__) || \
++#if defined(__i386__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_umount:
+ #endif
+@@ -762,7 +768,7 @@ bool SyscallSets::IsNuma(int sysno) {
+     case __NR_getcpu:
+     case __NR_mbind:
+ #if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
+-    defined(__aarch64__)
++    defined(__aarch64__) || defined(__powerpc64__)
+     case __NR_migrate_pages:
+ #endif
+     case __NR_move_pages:
+@@ -797,13 +803,13 @@ bool SyscallSets::IsGlobalProcessEnviron
+   switch (sysno) {
+     case __NR_acct:  // Privileged.
+ #if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
+-    defined(__aarch64__)
++    defined(__aarch64__) || defined(__powerpc64__)
+     case __NR_getrlimit:
+ #endif
+-#if defined(__i386__) || defined(__arm__)
++#if defined(__i386__) || defined(__arm__) || defined(__powerpc64__)
+     case __NR_ugetrlimit:
+ #endif
+-#if defined(__i386__) || \
++#if defined(__i386__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_ulimit:
+ #endif
+@@ -838,7 +844,7 @@ bool SyscallSets::IsGlobalSystemStatus(i
+ #endif
+     case __NR_sysinfo:
+     case __NR_uname:
+-#if defined(__i386__)
++#if defined(__i386__) || defined(__powerpc64__)
+     case __NR_olduname:
+     case __NR_oldolduname:
+ #endif
+@@ -904,8 +910,16 @@ bool SyscallSets::IsSystemVSemaphores(in
+ }
+ #endif
+ 
++/* shitty hack around Void's 4.19 kernel headers missing those numbers */
++#if defined(__powerpc64__) && !defined(__NR_shmget)
++#define __NR_shmget 395
++#define __NR_shmctl 396
++#define __NR_shmat 397
++#define __NR_shmdt 398
++#endif
++
+ #if defined(__i386__) || defined(__x86_64__) || defined(__arm__) || \
+-    defined(__aarch64__) ||                                         \
++    defined(__aarch64__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_64_BITS))
+ // These give a lot of ambient authority and bypass the setuid sandbox.
+ bool SyscallSets::IsSystemVSharedMemory(int sysno) {
+@@ -936,7 +950,7 @@ bool SyscallSets::IsSystemVMessageQueue(
+ }
+ #endif
+ 
+-#if defined(__i386__) || \
++#if defined(__i386__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+ // Big system V multiplexing system call.
+ bool SyscallSets::IsSystemVIpc(int sysno) {
+@@ -956,7 +970,7 @@ bool SyscallSets::IsAnySystemV(int sysno
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_64_BITS))
+   return IsSystemVMessageQueue(sysno) || IsSystemVSemaphores(sysno) ||
+          IsSystemVSharedMemory(sysno);
+-#elif defined(__i386__) || \
++#elif defined(__i386__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+   return IsSystemVIpc(sysno);
+ #endif
+@@ -1014,7 +1028,8 @@ bool SyscallSets::IsFaNotify(int sysno)
+ bool SyscallSets::IsTimer(int sysno) {
+   switch (sysno) {
+     case __NR_getitimer:
+-#if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
++#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
++    defined(__powerpc64__)
+     case __NR_alarm:
+ #endif
+     case __NR_setitimer:
+@@ -1096,17 +1111,20 @@ bool SyscallSets::IsMisc(int sysno) {
+     case __NR_syncfs:
+     case __NR_vhangup:
+ // The system calls below are not implemented.
+-#if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
++#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
++    defined(__powerpc64__)
+     case __NR_afs_syscall:
+ #endif
+ #if defined(__i386__) || \
+-    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
++    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
++    defined(__powerpc64__)
+     case __NR_break:
+ #endif
+-#if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
++#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
++    defined(__powerpc64__)
+     case __NR_getpmsg:
+ #endif
+-#if defined(__i386__) || \
++#if defined(__i386__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_gtty:
+     case __NR_idle:
+@@ -1115,20 +1133,21 @@ bool SyscallSets::IsMisc(int sysno) {
+     case __NR_prof:
+     case __NR_profil:
+ #endif
+-#if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
++#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
++    defined(__powerpc64__)
+     case __NR_putpmsg:
+ #endif
+ #if defined(__x86_64__)
+     case __NR_security:
+ #endif
+-#if defined(__i386__) || \
++#if defined(__i386__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_stty:
+ #endif
+-#if defined(__x86_64__)
++#if defined(__x86_64__) || defined(__powerpc64__)
+     case __NR_tuxcall:
+ #endif
+-#if !defined(__aarch64__)
++#if !defined(__aarch64__) && !defined(__powerpc64__)
+     case __NR_vserver:
+ #endif
+       return true;
+--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_sets.h
++++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_sets.h
+@@ -43,13 +43,14 @@ class SANDBOX_EXPORT SyscallSets {
+   static bool IsDeniedGetOrModifySocket(int sysno);
+ 
+ #if defined(__i386__) || \
+-    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
++    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
++    defined(__powerpc64__)
+   // Big multiplexing system call for sockets.
+   static bool IsSocketCall(int sysno);
+ #endif
+ 
+ #if defined(__x86_64__) || defined(__arm__) || defined(__mips__) || \
+-    defined(__aarch64__)
++    defined(__aarch64__) || defined(__powerpc64__)
+   static bool IsNetworkSocketInformation(int sysno);
+ #endif
+ 
+@@ -77,7 +78,7 @@ class SANDBOX_EXPORT SyscallSets {
+   static bool IsSystemVSemaphores(int sysno);
+ #endif
+ #if defined(__i386__) || defined(__x86_64__) || defined(__arm__) || \
+-    defined(__aarch64__) ||                                         \
++    defined(__aarch64__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_64_BITS))
+   // These give a lot of ambient authority and bypass the setuid sandbox.
+   static bool IsSystemVSharedMemory(int sysno);
+@@ -89,7 +90,8 @@ class SANDBOX_EXPORT SyscallSets {
+ #endif
+ 
+ #if defined(__i386__) || \
+-    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
++    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
++    defined(__powerpc64__)
+   // Big system V multiplexing system call.
+   static bool IsSystemVIpc(int sysno);
+ #endif
+--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf/syscall.cc
++++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf/syscall.cc
+@@ -18,7 +18,7 @@ namespace sandbox {
+ namespace {
+ 
+ #if defined(ARCH_CPU_X86_FAMILY) || defined(ARCH_CPU_ARM_FAMILY) || \
+-    defined(ARCH_CPU_MIPS_FAMILY)
++    defined(ARCH_CPU_MIPS_FAMILY) || defined (ARCH_CPU_PPC64_FAMILY)
+ // Number that's not currently used by any Linux kernel ABIs.
+ const int kInvalidSyscallNumber = 0x351d3;
+ #else
+@@ -312,10 +312,54 @@ asm(// We need to be able to tell the ke
+     "2:ret\n"
+     ".cfi_endproc\n"
+     ".size SyscallAsm, .-SyscallAsm\n"
++#elif defined(__powerpc64__)
++    ".text\n"
++    ".align 4\n"
++    ".type SyscallAsm @function\n"
++    "SyscallAsm:\n"
++    ".cfi_startproc\n"
++
++    // Check if r3 is negative
++    "cmpdi 3, 0\n"
++    "bgt 2f\n"
++
++    // Load address of 3f into r3 and return
++    "mflr 10\n"
++    "bl 1f\n"
++    "1: mflr 3\n"
++    "mtlr 10\n"
++    "addi 3, 3, 4*13\n"
++    "blr\n"
++
++    // Load arguments from array into r3-8
++    // save param 3 in r10
++    "2:\n"
++    "mr 0, 3\n"
++    "ld 3, 0(4)\n"
++    "ld 5, 16(4)\n"
++    "ld 6, 24(4)\n"
++    "ld 7, 32(4)\n"
++    "ld 8, 40(4)\n"
++    "ld 4, 8(4)\n"
++    "li 9, 0\n"
++
++    // Enter kernel
++    "sc\n"
++
++    // Magic return address
++    "3:\n"
++    // Like MIPS, ppc64 return values are always positive.
++    // Check for error in cr0.SO and negate upon error
++    "bc 4, 3, 4f\n"
++    "neg 3, 3\n"
++    "4: blr\n"
++
++    ".cfi_endproc\n"
++    ".size SyscallAsm, .-SyscallAsm\n"
+ #endif
+     );  // asm
+ 
+-#if defined(__x86_64__)
++#if defined(__x86_64__) || defined(__powerpc64__)
+ extern "C" {
+ intptr_t SyscallAsm(intptr_t nr, const intptr_t args[6]);
+ }
+@@ -429,6 +473,8 @@ intptr_t Syscall::Call(int nr,
+     ret = inout;
+   }
+ 
++#elif defined(__powerpc64__)
++  intptr_t ret = SyscallAsm(nr, args);
+ #else
+ #error "Unimplemented architecture"
+ #endif
+@@ -445,8 +491,26 @@ void Syscall::PutValueInUcontext(intptr_
+     // needs to be changed back.
+     ret_val = -ret_val;
+     SECCOMP_PARM4(ctx) = 1;
+-  } else
++  } else {
+     SECCOMP_PARM4(ctx) = 0;
++  }
++#endif
++#if defined(__powerpc64__)
++  // Same as MIPS, need to invert ret and set error register (cr0.SO)
++  if (ret_val <= -1 && ret_val >= -4095) {
++    ret_val = -ret_val;
++#ifdef __GLIBC__
++    ctx->uc_mcontext.regs->ccr |= (1 << 28);
++#else
++    ((struct pt_regs *)ctx->uc_mcontext.regs)->ccr |= (1 << 28);
++#endif
++  } else {
++#ifdef __GLIBC__
++    ctx->uc_mcontext.regs->ccr &= ~(1 << 28);
++#else
++    ((struct pt_regs *)ctx->uc_mcontext.regs)->ccr &= ~(1 << 28);
++#endif
++  }
+ #endif
+   SECCOMP_RESULT(ctx) = static_cast<greg_t>(ret_val);
+ }
+--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf/trap.cc
++++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf/trap.cc
+@@ -236,6 +236,20 @@ void Trap::SigSys(int nr, LinuxSigInfo*
+       SetIsInSigHandler();
+     }
+ 
++#if defined(__powerpc64__)
++    // On ppc64+glibc, some syscalls seem to accidentally negate the first
++    // parameter which causes checks against it to fail. For now, manually
++    // negate them back.
++    // TODO(shawn@anastas.io): investigate this issue further
++    auto nr = SECCOMP_SYSCALL(ctx);
++    if (nr == __NR_openat || nr == __NR_mkdirat || nr == __NR_faccessat || nr == __NR_readlinkat ||
++        nr == __NR_renameat || nr == __NR_renameat2 || nr == __NR_newfstatat || nr == __NR_unlinkat) {
++        if (static_cast<int>(SECCOMP_PARM1(ctx)) > 0) {
++            SECCOMP_PARM1(ctx) = -SECCOMP_PARM1(ctx);
++        }
++    }
++#endif
++
+     // Copy the seccomp-specific data into a arch_seccomp_data structure. This
+     // is what we are showing to TrapFnc callbacks that the system call
+     // evaluator registered with the sandbox.
+--- a/src/3rdparty/chromium/sandbox/linux/services/credentials.cc
++++ b/src/3rdparty/chromium/sandbox/linux/services/credentials.cc
+@@ -81,7 +81,7 @@ bool ChrootToSafeEmptyDir() {
+   pid_t pid = -1;
+   alignas(16) char stack_buf[PTHREAD_STACK_MIN];
+ #if defined(ARCH_CPU_X86_FAMILY) || defined(ARCH_CPU_ARM_FAMILY) || \
+-    defined(ARCH_CPU_MIPS_FAMILY)
++    defined(ARCH_CPU_MIPS_FAMILY) || defined(ARCH_CPU_PPC64_FAMILY)
+   // The stack grows downward.
+   void* stack = stack_buf + sizeof(stack_buf);
+ #else
+--- a/src/3rdparty/chromium/sandbox/linux/services/syscall_wrappers.cc
++++ b/src/3rdparty/chromium/sandbox/linux/services/syscall_wrappers.cc
+@@ -61,7 +61,7 @@ long sys_clone(unsigned long flags,
+ #if defined(ARCH_CPU_X86_64)
+   return syscall(__NR_clone, flags, child_stack, ptid, ctid, tls);
+ #elif defined(ARCH_CPU_X86) || defined(ARCH_CPU_ARM_FAMILY) || \
+-    defined(ARCH_CPU_MIPS_FAMILY)
++    defined(ARCH_CPU_MIPS_FAMILY) || defined(ARCH_CPU_PPC64_FAMILY)
+   // CONFIG_CLONE_BACKWARDS defined.
+   return syscall(__NR_clone, flags, child_stack, ptid, tls, ctid);
+ #endif
+--- a/src/3rdparty/chromium/sandbox/linux/syscall_broker/broker_process.cc
++++ b/src/3rdparty/chromium/sandbox/linux/syscall_broker/broker_process.cc
+@@ -165,7 +165,7 @@ bool BrokerProcess::IsSyscallBrokerable(
+ #if defined(__NR_fstatat64)
+     case __NR_fstatat64:
+ #endif
+-#if defined(__x86_64__) || defined(__aarch64__)
++#if defined(__x86_64__) || defined(__aarch64__) || defined(__powerpc64__)
+     case __NR_newfstatat:
+ #endif
+       return !fast_check || allowed_command_set_.test(COMMAND_STAT);
+--- a/src/3rdparty/chromium/sandbox/linux/system_headers/linux_seccomp.h
++++ b/src/3rdparty/chromium/sandbox/linux/system_headers/linux_seccomp.h
+@@ -41,6 +41,9 @@
+ #ifndef EM_AARCH64
+ #define EM_AARCH64 183
+ #endif
++#ifndef EM_PPC64
++#define EM_PPC64 21
++#endif
+ 
+ #ifndef __AUDIT_ARCH_64BIT
+ #define __AUDIT_ARCH_64BIT 0x80000000
+@@ -74,6 +77,14 @@
+ #define AUDIT_ARCH_AARCH64 (EM_AARCH64 | __AUDIT_ARCH_64BIT | __AUDIT_ARCH_LE)
+ #endif
+ 
++#ifndef AUDIT_ARCH_PPC64
++#define AUDIT_ARCH_PPC64 (EM_PPC64 | __AUDIT_ARCH_64BIT)
++#endif
++
++#ifndef AUDIT_ARCH_PPC64LE
++#define AUDIT_ARCH_PPC64LE (EM_PPC64 | __AUDIT_ARCH_64BIT | __AUDIT_ARCH_LE)
++#endif
++
+ // For prctl.h
+ #ifndef PR_SET_SECCOMP
+ #define PR_SET_SECCOMP               22
+--- a/src/3rdparty/chromium/sandbox/linux/system_headers/linux_signal.h
++++ b/src/3rdparty/chromium/sandbox/linux/system_headers/linux_signal.h
+@@ -13,7 +13,7 @@
+ // (not undefined, but defined different values and in different memory
+ // layouts). So, fill the gap here.
+ #if defined(__i386__) || defined(__x86_64__) || defined(__arm__) || \
+-    defined(__aarch64__)
++    defined(__aarch64__) || defined(__powerpc64__)
+ 
+ #define LINUX_SIGHUP 1
+ #define LINUX_SIGINT 2
+--- a/src/3rdparty/chromium/sandbox/linux/system_headers/linux_syscalls.h
++++ b/src/3rdparty/chromium/sandbox/linux/system_headers/linux_syscalls.h
+@@ -35,5 +35,9 @@
+ #include "sandbox/linux/system_headers/arm64_linux_syscalls.h"
+ #endif
+ 
++#if defined(__powerpc64__)
++#include "sandbox/linux/system_headers/ppc64_linux_syscalls.h"
++#endif
++
+ #endif  // SANDBOX_LINUX_SYSTEM_HEADERS_LINUX_SYSCALLS_H_
+ 
+--- a/src/3rdparty/chromium/sandbox/linux/system_headers/linux_ucontext.h
++++ b/src/3rdparty/chromium/sandbox/linux/system_headers/linux_ucontext.h
+@@ -11,6 +11,8 @@
+ #include "sandbox/linux/system_headers/arm_linux_ucontext.h"
+ #elif defined(__i386__)
+ #include "sandbox/linux/system_headers/i386_linux_ucontext.h"
++#elif defined(__powerpc64__)
++#include "sandbox/linux/system_headers/ppc64_linux_ucontext.h"
+ #else
+ #error "No support for your architecture in PNaCl header"
+ #endif
+--- a/src/3rdparty/chromium/sandbox/policy/linux/bpf_renderer_policy_linux.cc
++++ b/src/3rdparty/chromium/sandbox/policy/linux/bpf_renderer_policy_linux.cc
+@@ -15,6 +15,11 @@
+ #include "sandbox/linux/system_headers/linux_syscalls.h"
+ #include "sandbox/policy/linux/sandbox_linux.h"
+ 
++// On PPC64, TCGETS is defined in terms of struct termios, so we must include termios.h
++#ifdef __powerpc64__
++#include <termios.h>
++#endif
++
+ // TODO(vignatti): replace the local definitions below with #include
+ // <linux/dma-buf.h> once kernel version 4.6 becomes widely used.
+ #include <linux/types.h>
+--- a/src/3rdparty/chromium/third_party/angle/src/compiler/translator/InfoSink.h
++++ b/src/3rdparty/chromium/third_party/angle/src/compiler/translator/InfoSink.h
+@@ -93,7 +93,16 @@ class TInfoSinkBase
+             stream.precision(8);
+             stream << f;
+         }
+-        sink.append(stream.str());
++
++        // Hack to work around a bug where negative floating point values
++        // are rendered like '.0.5' instead of '-0.5'
++        std::string res(stream.str());
++
++        if (signbit(f)) { // test if f is negative
++            res[0] = '-';
++        }
++
++        sink.append(res);
+         return *this;
+     }
+     // Write boolean values as their names instead of integral value.
+--- a/src/3rdparty/chromium/third_party/angle/src/libANGLE/Constants.h
++++ b/src/3rdparty/chromium/third_party/angle/src/libANGLE/Constants.h
+@@ -9,6 +9,7 @@
+ #ifndef LIBANGLE_CONSTANTS_H_
+ #define LIBANGLE_CONSTANTS_H_
+ 
++#include <cstddef>
+ #include "common/platform.h"
+ 
+ #include <stdint.h>
+--- a/src/3rdparty/chromium/third_party/boringssl/BUILD.gn
++++ b/src/3rdparty/chromium/third_party/boringssl/BUILD.gn
+@@ -99,6 +99,13 @@ if (is_win && !is_msan && current_cpu !=
+       } else {
+         public_configs = [ ":no_asm_config" ]
+       }
++    } else if (current_cpu == "ppc64") {
++      if (is_linux) {
++        # TODO: ppc64 (be) check
++        sources += crypto_sources_linux_ppc64le
++      } else {
++        public_configs = [ ":no_asm_config" ]
++      }
+     } else {
+       public_configs = [ ":no_asm_config" ]
+     }
+--- a/src/3rdparty/chromium/third_party/breakpad/BUILD.gn
++++ b/src/3rdparty/chromium/third_party/breakpad/BUILD.gn
+@@ -623,7 +623,6 @@ if (is_linux || is_chromeos || is_androi
+       "breakpad/src/client/minidump_file_writer.h",
+       "breakpad/src/common/convert_UTF.cc",
+       "breakpad/src/common/convert_UTF.h",
+-      "breakpad/src/common/linux/breakpad_getcontext.S",
+       "breakpad/src/common/linux/elf_core_dump.cc",
+       "breakpad/src/common/linux/elf_core_dump.h",
+       "breakpad/src/common/linux/elfutils.cc",
+@@ -663,6 +662,15 @@ if (is_linux || is_chromeos || is_androi
+ 
+     libs = [ "dl" ]
+ 
++    if (current_cpu == "ppc64") {
++        defines = [ "HAVE_GETCONTEXT" ]
++        libs += [ "ucontext" ]
++    } else {
++        sources += [
++            "breakpad/src/common/linux/breakpad_getcontext.S"
++        ]
++    }
++
+     include_dirs = [
+       ".",
+       "breakpad/src",
+@@ -712,7 +720,6 @@ if (is_linux || is_chromeos || is_androi
+       "breakpad/src/client/linux/minidump_writer/minidump_writer_unittest.cc",
+       "breakpad/src/client/linux/minidump_writer/minidump_writer_unittest_utils.cc",
+       "breakpad/src/client/linux/minidump_writer/proc_cpuinfo_reader_unittest.cc",
+-      "breakpad/src/common/linux/breakpad_getcontext_unittest.cc",
+       "breakpad/src/common/linux/elf_core_dump_unittest.cc",
+       "breakpad/src/common/linux/file_id_unittest.cc",
+       "breakpad/src/common/linux/linux_libc_support_unittest.cc",
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/raw_context_cpu.h
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/raw_context_cpu.h
+@@ -44,6 +44,8 @@ typedef MDRawContextARM RawContextCPU;
+ typedef MDRawContextARM64_Old RawContextCPU;
+ #elif defined(__mips__)
+ typedef MDRawContextMIPS RawContextCPU;
++#elif defined(__powerpc64__)
++typedef MDRawContextPPC64 RawContextCPU;
+ #else
+ #error "This code has not been ported to your platform yet."
+ #endif
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.cc
+@@ -270,7 +270,54 @@ void ThreadInfo::FillCPUContext(RawConte
+   out->float_save.fir = mcontext.fpc_eir;
+ #endif
+ }
+-#endif  // __mips__
++
++#elif defined(__powerpc64__)
++
++#if !defined(__GLIBC__)
++#include <asm/elf.h>
++#include <asm/ptrace.h>
++#endif
++
++uintptr_t ThreadInfo::GetInstructionPointer() const {
++    return mcontext.gp_regs[PT_NIP];
++}
++
++void ThreadInfo::FillCPUContext(RawContextCPU* out) const {
++    out->context_flags = MD_CONTEXT_PPC64_FULL;
++    for (int i = 0; i < MD_CONTEXT_PPC64_GPR_COUNT; i++)
++        out->gpr[i] = mcontext.gp_regs[i];
++
++    out->lr = mcontext.gp_regs[PT_LNK];
++    out->srr0 = mcontext.gp_regs[PT_NIP];
++    out->srr1 = mcontext.gp_regs[PT_MSR];
++    out->cr = mcontext.gp_regs[PT_CCR];
++    out->xer = mcontext.gp_regs[PT_XER];
++    out->ctr = mcontext.gp_regs[PT_CTR];
++
++#ifdef __GLIBC__
++    for (int i = 0; i < MD_FLOATINGSAVEAREA_PPC_FPR_COUNT; i++)
++        out->float_save.fpregs[i] = mcontext.fp_regs[i];
++
++    out->float_save.fpscr = mcontext.fp_regs[NFPREG-1];
++#else
++    for (int i = 0; i < MD_FLOATINGSAVEAREA_PPC_FPR_COUNT; i++)
++        out->float_save.fpregs[i] = ((uint64_t *)&mcontext.fp_regs)[i];
++
++     out->float_save.fpscr = ((uint64_t *)&mcontext.fp_regs)[ELF_NFPREG-1];
++#endif
++
++    for (int i = 0; i < MD_VECTORSAVEAREA_PPC_VR_COUNT; i++)
++        out->vector_save.save_vr[i] = \
++            {(((uint64_t)vregs.vrregs[i][0]) << 32)
++                          | vregs.vrregs[i][1],
++            (((uint64_t)vregs.vrregs[i][2]) << 32)
++                         | vregs.vrregs[i][3]};
++
++    out->vrsave = vregs.vrsave;
++    out->vector_save.save_vscr = {0, vregs.vscr.vscr_word};
++    out->vector_save.save_vrvalid = 0xFFFFFFFF;
++}
++#endif  // __powerpc64__
+ 
+ void ThreadInfo::GetGeneralPurposeRegisters(void** gp_regs, size_t* size) {
+   assert(gp_regs || size);
+@@ -279,6 +326,11 @@ void ThreadInfo::GetGeneralPurposeRegist
+     *gp_regs = mcontext.gregs;
+   if (size)
+     *size = sizeof(mcontext.gregs);
++#elif defined(__powerpc64__)
++  if (gp_regs)
++    *gp_regs = mcontext.gp_regs;
++  if (size)
++    *size = sizeof(mcontext.gp_regs);
+ #else
+   if (gp_regs)
+     *gp_regs = &regs;
+@@ -294,6 +346,11 @@ void ThreadInfo::GetFloatingPointRegiste
+     *fp_regs = &mcontext.fpregs;
+   if (size)
+     *size = sizeof(mcontext.fpregs);
++#elif defined(__powerpc64__)
++  if (fp_regs)
++    *fp_regs = &mcontext.fp_regs;
++  if (size)
++    *size = sizeof(mcontext.fp_regs);
+ #else
+   if (fp_regs)
+     *fp_regs = &fpregs;
+@@ -302,4 +359,13 @@ void ThreadInfo::GetFloatingPointRegiste
+ #endif
+ }
+ 
++#if defined(__powerpc64__)
++void ThreadInfo::GetVectorRegisters(void** v_regs, size_t* size) {
++    if (v_regs)
++        *v_regs = &vregs;
++    if (size)
++        *size = sizeof(vregs);
++}
++#endif
++
+ }  // namespace google_breakpad
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.h
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.h
+@@ -68,6 +68,10 @@ struct ThreadInfo {
+   // Use the structures defined in <sys/user.h>
+   struct user_regs_struct regs;
+   struct user_fpsimd_struct fpregs;
++#elif defined(__powerpc64__)
++  // Use the structures defined in <sys/ucontext.h>.
++  mcontext_t mcontext;
++  vrregset_t vregs;
+ #elif defined(__mips__)
+   // Use the structure defined in <sys/ucontext.h>.
+   mcontext_t mcontext;
+@@ -84,6 +88,11 @@ struct ThreadInfo {
+ 
+   // Returns the pointer and size of float point register area.
+   void GetFloatingPointRegisters(void** fp_regs, size_t* size);
++
++#if defined(__powerpc64__)
++  // Returns the pointer and size of the vector register area. (PPC64 only)
++  void GetVectorRegisters(void** v_regs, size_t* size);
++#endif
+ };
+ 
+ }  // namespace google_breakpad
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc
+@@ -254,6 +254,60 @@ void UContextReader::FillCPUContext(RawC
+   out->float_save.fir = uc->uc_mcontext.fpc_eir;  // Unused.
+ #endif
+ }
++
++#elif defined(__powerpc64__)
++
++#ifndef __GLIBC__
++#include <asm/elf.h>
++#include <asm/ptrace.h>
++#endif
++
++uintptr_t UContextReader::GetStackPointer(const ucontext_t* uc) {
++    return uc->uc_mcontext.gp_regs[MD_CONTEXT_PPC64_REG_SP];
++}
++
++uintptr_t UContextReader::GetInstructionPointer(const ucontext_t* uc) {
++    return uc->uc_mcontext.gp_regs[PT_NIP];
++}
++
++void UContextReader::FillCPUContext(RawContextCPU* out, const ucontext_t* uc,
++                                    const vrregset_t* vregs) {
++    out->context_flags = MD_CONTEXT_PPC64_FULL;
++
++    for (int i = 0; i < MD_CONTEXT_PPC64_GPR_COUNT; i++)
++        out->gpr[i] = uc->uc_mcontext.gp_regs[i];
++
++    out->lr = uc->uc_mcontext.gp_regs[PT_LNK];
++    out->srr0 = uc->uc_mcontext.gp_regs[PT_NIP];
++    out->srr1 = uc->uc_mcontext.gp_regs[PT_MSR];
++    out->cr = uc->uc_mcontext.gp_regs[PT_CCR];
++    out->xer = uc->uc_mcontext.gp_regs[PT_XER];
++    out->ctr = uc->uc_mcontext.gp_regs[PT_CTR];
++
++#ifdef __GLIBC__
++    for (int i = 0; i < MD_FLOATINGSAVEAREA_PPC_FPR_COUNT; i++)
++        out->float_save.fpregs[i] = uc->uc_mcontext.fp_regs[i];
++
++    out->float_save.fpscr = uc->uc_mcontext.fp_regs[NFPREG-1];
++#else
++    for (int i = 0; i < MD_FLOATINGSAVEAREA_PPC_FPR_COUNT; i++)
++        out->float_save.fpregs[i] = ((uint64_t *)&uc->uc_mcontext.fp_regs)[i];
++
++    out->float_save.fpscr = ((uint64_t *)&uc->uc_mcontext.fp_regs)[ELF_NFPREG-1];
++#endif
++
++    for (int i = 0; i < MD_VECTORSAVEAREA_PPC_VR_COUNT; i++)
++        out->vector_save.save_vr[i] =
++            {(((uint64_t)vregs->vrregs[i][0]) << 32)
++                         | vregs->vrregs[i][1],
++             (((uint64_t)vregs->vrregs[i][2]) << 32)
++                         | vregs->vrregs[i][3]};
++
++    out->vrsave = vregs->vrsave;
++    out->vector_save.save_vscr = {0, vregs->vscr.vscr_word};
++    out->vector_save.save_vrvalid = 0xFFFFFFFF;
++}
++
+ #endif
+ 
+ }  // namespace google_breakpad
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h
+@@ -59,6 +59,9 @@ struct UContextReader {
+ #elif defined(__aarch64__)
+   static void FillCPUContext(RawContextCPU* out, const ucontext_t* uc,
+                              const struct fpsimd_context* fpregs);
++#elif defined(__powerpc64__)
++  static void FillCPUContext(RawContextCPU *out, const ucontext_t *uc,
++                             const vrregset_t* vregs);
+ #else
+   static void FillCPUContext(RawContextCPU* out, const ucontext_t* uc);
+ #endif
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc
+@@ -105,6 +105,13 @@
+ #define PR_SET_PTRACER 0x59616d61
+ #endif
+ 
++/* musl hack, can't include asm/ptrace.h as that causes conflicts */
++#ifndef __GLIBC__
++#if defined(__powerpc64__) && !defined(PT_NIP)
++#define PT_NIP 32
++#endif
++#endif
++
+ namespace google_breakpad {
+ 
+ namespace {
+@@ -461,9 +468,16 @@ bool ExceptionHandler::HandleSignal(int
+     memcpy(&g_crash_context_.float_state, fp_ptr,
+            sizeof(g_crash_context_.float_state));
+   }
++#elif defined(__powerpc64__)
++  // On PPC64, we must copy VR state
++  ucontext_t* uc_ptr = (ucontext_t*)uc;
++  if (uc_ptr->uc_mcontext.v_regs) {
++    memcpy(&g_crash_context_.vector_state, uc_ptr->uc_mcontext.v_regs,
++           sizeof(g_crash_context_.vector_state));
++  }
+ #elif !defined(__ARM_EABI__) && !defined(__mips__)
+   // FP state is not part of user ABI on ARM Linux.
+-  // In case of MIPS Linux FP state is already part of ucontext_t
++  // In case of MIPS, Linux FP state is already part of ucontext_t
+   // and 'float_state' is not a member of CrashContext.
+   ucontext_t* uc_ptr = (ucontext_t*)uc;
+   if (uc_ptr->uc_mcontext.fpregs) {
+@@ -708,11 +722,19 @@ bool ExceptionHandler::WriteMinidump() {
+   }
+ #endif
+ 
+-#if !defined(__ARM_EABI__) && !defined(__aarch64__) && !defined(__mips__)
++#if !defined(__ARM_EABI__) && !defined(__aarch64__) && !defined(__mips__) \
++    && !defined(__powerpc64__)
+   // FPU state is not part of ARM EABI ucontext_t.
+   memcpy(&context.float_state, context.context.uc_mcontext.fpregs,
+          sizeof(context.float_state));
+ #endif
++
++#if defined(__powerpc64__)
++  // Vector registers must be copied on PPC64
++  memcpy(&context.vector_state, context.context.uc_mcontext.v_regs,
++         sizeof(context.vector_state));
++#endif
++
+   context.tid = sys_gettid();
+ 
+   // Add an exception stream to the minidump for better reporting.
+@@ -733,6 +755,9 @@ bool ExceptionHandler::WriteMinidump() {
+ #elif defined(__mips__)
+   context.siginfo.si_addr =
+       reinterpret_cast<void*>(context.context.uc_mcontext.pc);
++#elif defined(__powerpc64__)
++  context.siginfo.si_addr =
++      reinterpret_cast<void*>(context.context.uc_mcontext.gp_regs[PT_NIP]);
+ #else
+ #error "This code has not been ported to your platform yet."
+ #endif
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.h
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.h
+@@ -192,7 +192,11 @@ class ExceptionHandler {
+     siginfo_t siginfo;
+     pid_t tid;  // the crashing thread.
+     ucontext_t context;
+-#if !defined(__ARM_EABI__) && !defined(__mips__)
++#if defined(__powerpc64__)
++    // PPC64's FP state is a part of ucontext_t like MIPS but the vector
++    // state is not, so a struct is needed.
++    vstate_t vector_state;
++#elif !defined(__ARM_EABI__) && !defined(__mips__)
+     // #ifdef this out because FP state is not part of user ABI for Linux ARM.
+     // In case of MIPS Linux FP state is already part of ucontext_t so
+     // 'float_state' is not required.
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler_unittest.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler_unittest.cc
+@@ -307,7 +307,7 @@ TEST(ExceptionHandlerTest, ParallelChild
+   }
+ 
+   // Wait a while until the child should have crashed.
+-  usleep(1000000);
++  usleep(2000000);
+   // Kill the child if it is still running.
+   kill(child, SIGKILL);
+ 
+@@ -559,6 +559,8 @@ const unsigned char kIllegalInstruction[
+ #if defined(__mips__)
+   // mfc2 zero,Impl - usually illegal in userspace.
+   0x48, 0x00, 0x00, 0x48
++#elif defined(__powerpc64__)
++  0x01, 0x01, 0x01, 0x01 // Crashes on a tested POWER9 cpu
+ #else
+   // This crashes with SIGILL on x86/x86-64/arm.
+   0xff, 0xff, 0xff, 0xff
+@@ -754,10 +756,10 @@ TEST(ExceptionHandlerTest, InstructionPo
+ 
+   // These are defined here so the parent can use them to check the
+   // data from the minidump afterwards.
+-  // Use 4k here because the OS will hand out a single page even
++  // Use the page size here because the OS will hand out a single page even
+   // if a smaller size is requested, and this test wants to
+   // test the upper bound of the memory range.
+-  const uint32_t kMemorySize = 4096;  // bytes
++  const uint32_t kMemorySize = getpagesize();  // bytes
+   const int kOffset = kMemorySize - sizeof(kIllegalInstruction);
+ 
+   const pid_t child = fork();
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/microdump_writer/microdump_writer.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/microdump_writer/microdump_writer.cc
+@@ -138,7 +138,9 @@ class MicrodumpWriter {
+                   const MicrodumpExtraInfo& microdump_extra_info,
+                   LinuxDumper* dumper)
+       : ucontext_(context ? &context->context : NULL),
+-#if !defined(__ARM_EABI__) && !defined(__mips__)
++#if defined(__powerpc64__)
++        vector_state_(context ? &context->vector_state : NULL),
++#elif !defined(__ARM_EABI__) && !defined(__mips__)
+         float_state_(context ? &context->float_state : NULL),
+ #endif
+         dumper_(dumper),
+@@ -337,6 +339,8 @@ class MicrodumpWriter {
+ # else
+ #  error "This mips ABI is currently not supported (n32)"
+ #endif
++#elif defined(__powerpc64__)
++    const char kArch[] = "ppc64";
+ #else
+ #error "This code has not been ported to your platform yet"
+ #endif
+@@ -409,7 +413,9 @@ class MicrodumpWriter {
+   void DumpCPUState() {
+     RawContextCPU cpu;
+     my_memset(&cpu, 0, sizeof(RawContextCPU));
+-#if !defined(__ARM_EABI__) && !defined(__mips__)
++#if defined(__powerpc64__)
++    UContextReader::FillCPUContext(&cpu, ucontext_, vector_state_);
++#elif !defined(__ARM_EABI__) && !defined(__mips__)
+     UContextReader::FillCPUContext(&cpu, ucontext_, float_state_);
+ #else
+     UContextReader::FillCPUContext(&cpu, ucontext_);
+@@ -605,7 +611,9 @@ class MicrodumpWriter {
+   void* Alloc(unsigned bytes) { return dumper_->allocator()->Alloc(bytes); }
+ 
+   const ucontext_t* const ucontext_;
+-#if !defined(__ARM_EABI__) && !defined(__mips__)
++#if defined(__powerpc64__)
++  const google_breakpad::vstate_t* const vector_state_;
++#elif !defined(__ARM_EABI__) && !defined(__mips__)
+   const google_breakpad::fpstate_t* const float_state_;
+ #endif
+   LinuxDumper* dumper_;
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/microdump_writer/microdump_writer_unittest.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/microdump_writer/microdump_writer_unittest.cc
+@@ -279,10 +279,19 @@ TEST(MicrodumpWriterTest, BasicWithMappi
+   CrashAndGetMicrodump(mappings, MicrodumpExtraInfo(), &buf);
+   ASSERT_TRUE(ContainsMicrodump(buf));
+ 
++  int page_size = getpagesize();
+ #ifdef __LP64__
+-  ASSERT_NE(std::string::npos,
+-            buf.find("M 0000000000001000 000000000000002A 0000000000001000 "
+-                     "33221100554477668899AABBCCDDEEFF0 libfoo.so"));
++  // This test is only available for the following page sizes
++  ASSERT_TRUE((page_size == 4096) || (page_size == 65536));
++  if (page_size == 4096) {
++    ASSERT_NE(std::string::npos,
++              buf.find("M 0000000000001000 000000000000002A 0000000000001000 "
++                       "33221100554477668899AABBCCDDEEFF0 libfoo.so"));
++  } else {
++    ASSERT_NE(std::string::npos,
++              buf.find("M 0000000000010000 000000000000002A 0000000000010000 "
++                       "33221100554477668899AABBCCDDEEFF0 libfoo.so"));
++  }
+ #else
+   ASSERT_NE(std::string::npos,
+             buf.find("M 00001000 0000002A 00001000 "
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_core_dumper.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_core_dumper.cc
+@@ -117,6 +117,9 @@ bool LinuxCoreDumper::GetThreadInfoByInd
+ #elif defined(__mips__)
+   stack_pointer =
+       reinterpret_cast<uint8_t*>(info->mcontext.gregs[MD_CONTEXT_MIPS_REG_SP]);
++#elif defined(__powerpc64__)
++  stack_pointer =
++      reinterpret_cast<uint8_t*>(info->mcontext.gp_regs[MD_CONTEXT_PPC64_REG_SP]);
+ #else
+ #error "This code hasn't been ported to your platform yet."
+ #endif
+@@ -212,7 +215,10 @@ bool LinuxCoreDumper::EnumerateThreads()
+         memset(&info, 0, sizeof(ThreadInfo));
+         info.tgid = status->pr_pgrp;
+         info.ppid = status->pr_ppid;
+-#if defined(__mips__)
++#if defined(__powerpc64__)
++        for (int i = 0; i < 31; i++)
++            info.mcontext.gp_regs[i] = status->pr_reg[i];
++#elif defined(__mips__)
+ #if defined(__ANDROID__)
+         for (int i = EF_R0; i <= EF_R31; i++)
+           info.mcontext.gregs[i - EF_R0] = status->pr_reg[i];
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper.cc
+@@ -765,7 +765,9 @@ bool LinuxDumper::GetStackInfo(const voi
+       reinterpret_cast<uint8_t*>(int_stack_pointer & ~(page_size - 1));
+ 
+   // The number of bytes of stack which we try to capture.
+-  static const ptrdiff_t kStackToCapture = 32 * 1024;
++  // This now depends on page_size to avoid missing data
++  // on systems with larger page sizes.
++  static const ptrdiff_t kStackToCapture = 8 * page_size;
+ 
+   const MappingInfo* mapping = FindMapping(stack_pointer);
+   if (!mapping)
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper.h
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper.h
+@@ -63,7 +63,8 @@ namespace google_breakpad {
+  (defined(__mips__) && _MIPS_SIM == _ABIO32)
+ typedef Elf32_auxv_t elf_aux_entry;
+ #elif defined(__x86_64) || defined(__aarch64__) || \
+-     (defined(__mips__) && _MIPS_SIM != _ABIO32)
++     (defined(__mips__) && _MIPS_SIM != _ABIO32) || \
++     defined(__powerpc64__)
+ typedef Elf64_auxv_t elf_aux_entry;
+ #endif
+ 
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper_unittest_helper.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper_unittest_helper.cc
+@@ -51,6 +51,8 @@
+ #define TID_PTR_REGISTER "rcx"
+ #elif defined(__mips__)
+ #define TID_PTR_REGISTER "$1"
++#elif defined(__powerpc64__)
++#define TID_PTR_REGISTER "r8"
+ #else
+ #error This test has not been ported to this platform.
+ #endif
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper.cc
+@@ -154,19 +154,27 @@ bool LinuxPtraceDumper::CopyFromProcess(
+   return true;
+ }
+ 
+-bool LinuxPtraceDumper::ReadRegisterSet(ThreadInfo* info, pid_t tid)
+-{
++bool LinuxPtraceDumper::ReadRegisterSet(ThreadInfo* info, pid_t tid) {
+ #ifdef PTRACE_GETREGSET
+   struct iovec io;
+   info->GetGeneralPurposeRegisters(&io.iov_base, &io.iov_len);
+-  if (sys_ptrace(PTRACE_GETREGSET, tid, (void*)NT_PRSTATUS, (void*)&io) == -1) {
++  if (ptrace(PTRACE_GETREGSET, tid, (void*)NT_PRSTATUS, (void*)&io) == -1) {
+     return false;
+   }
+ 
+   info->GetFloatingPointRegisters(&io.iov_base, &io.iov_len);
+-  if (sys_ptrace(PTRACE_GETREGSET, tid, (void*)NT_FPREGSET, (void*)&io) == -1) {
++  if (ptrace(PTRACE_GETREGSET, tid, (void*)NT_FPREGSET, (void*)&io) == -1) {
+     return false;
+   }
++
++#if defined(__powerpc64__)
++  // Grab the vector registers on PPC64 too
++  info->GetVectorRegisters(&io.iov_base, &io.iov_len);
++  if (ptrace(PTRACE_GETREGSET, tid, (void*)NT_PPC_VMX, (void*)&io) == -1) {
++    return false;
++  }
++#endif // defined(__powerpc64__)
++
+   return true;
+ #else
+   return false;
+@@ -303,6 +311,9 @@ bool LinuxPtraceDumper::GetThreadInfoByI
+ #elif defined(__mips__)
+   stack_pointer =
+       reinterpret_cast<uint8_t*>(info->mcontext.gregs[MD_CONTEXT_MIPS_REG_SP]);
++#elif defined(__powerpc64__)
++  stack_pointer =
++      reinterpret_cast<uint8_t*>(info->mcontext.gp_regs[MD_CONTEXT_PPC64_REG_SP]);
+ #else
+ #error "This code hasn't been ported to your platform yet."
+ #endif
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper_unittest.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper_unittest.cc
+@@ -462,6 +462,9 @@ TEST(LinuxPtraceDumperTest, VerifyStackR
+ #elif defined(__mips__)
+     pid_t* process_tid_location =
+         reinterpret_cast<pid_t*>(one_thread.mcontext.gregs[1]);
++#elif defined(__powerpc64__)
++    pid_t* process_tid_location =
++        reinterpret_cast<pid_t*>(one_thread.mcontext.gp_regs[8]);
+ #else
+ #error This test has not been ported to this platform.
+ #endif
+@@ -559,6 +562,8 @@ TEST_F(LinuxPtraceDumperTest, SanitizeSt
+   uintptr_t heap_addr = thread_info.regs.rcx;
+ #elif defined(__mips__)
+   uintptr_t heap_addr = thread_info.mcontext.gregs[1];
++#elif defined(__powerpc64__)
++  uintptr_t heap_addr = thread_info.mcontext.gp_regs[8];
+ #else
+ #error This test has not been ported to this platform.
+ #endif
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.cc
+@@ -136,7 +136,9 @@ class MinidumpWriter {
+       : fd_(minidump_fd),
+         path_(minidump_path),
+         ucontext_(context ? &context->context : NULL),
+-#if !defined(__ARM_EABI__) && !defined(__mips__)
++#if defined(__powerpc64__)
++        vector_state_(context ? &context->vector_state : NULL),
++#elif !defined(__ARM_EABI__) && !defined(__mips__)
+         float_state_(context ? &context->float_state : NULL),
+ #endif
+         dumper_(dumper),
+@@ -468,7 +470,9 @@ class MinidumpWriter {
+         if (!cpu.Allocate())
+           return false;
+         my_memset(cpu.get(), 0, sizeof(RawContextCPU));
+-#if !defined(__ARM_EABI__) && !defined(__mips__)
++#if defined(__powerpc64__)
++        UContextReader::FillCPUContext(cpu.get(), ucontext_, vector_state_);
++#elif !defined(__ARM_EABI__) && !defined(__mips__)
+         UContextReader::FillCPUContext(cpu.get(), ucontext_, float_state_);
+ #else
+         UContextReader::FillCPUContext(cpu.get(), ucontext_);
+@@ -897,7 +901,7 @@ class MinidumpWriter {
+     dirent->location.rva = 0;
+   }
+ 
+-#if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
++#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || defined(__powerpc64__)
+   bool WriteCPUInformation(MDRawSystemInfo* sys_info) {
+     char vendor_id[sizeof(sys_info->cpu.x86_cpu_info.vendor_id) + 1] = {0};
+     static const char vendor_id_name[] = "vendor_id";
+@@ -917,7 +921,9 @@ class MinidumpWriter {
+ 
+     // processor_architecture should always be set, do this first
+     sys_info->processor_architecture =
+-#if defined(__mips__)
++#if defined(__powerpc64__)
++        MD_CPU_ARCHITECTURE_PPC64;
++#elif defined(__mips__)
+ # if _MIPS_SIM == _ABIO32
+         MD_CPU_ARCHITECTURE_MIPS;
+ # elif _MIPS_SIM == _ABI64
+@@ -1333,7 +1339,9 @@ class MinidumpWriter {
+   const char* path_;  // Path to the file where the minidum should be written.
+ 
+   const ucontext_t* const ucontext_;  // also from the signal handler
+-#if !defined(__ARM_EABI__) && !defined(__mips__)
++#if defined(__powerpc64__)
++  const google_breakpad::vstate_t* const vector_state_;
++#elif !defined(__ARM_EABI__) && !defined(__mips__)
+   const google_breakpad::fpstate_t* const float_state_;  // ditto
+ #endif
+   LinuxDumper* dumper_;
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.h
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.h
+@@ -48,6 +48,8 @@ class ExceptionHandler;
+ 
+ #if defined(__aarch64__)
+ typedef struct fpsimd_context fpstate_t;
++#elif defined(__powerpc64__)
++typedef vrregset_t vstate_t;
+ #elif !defined(__ARM_EABI__) && !defined(__mips__)
+ typedef std::remove_pointer<fpregset_t>::type fpstate_t;
+ #endif
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer_unittest.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer_unittest.cc
+@@ -715,6 +715,12 @@ TEST(MinidumpWriterTest, InvalidStackPoi
+ #elif defined(__mips__)
+   context.context.uc_mcontext.gregs[MD_CONTEXT_MIPS_REG_SP] =
+       invalid_stack_pointer;
++#elif defined(__powerpc64__)
++  context.context.uc_mcontext.gp_regs[MD_CONTEXT_PPC64_REG_SP] =
++      invalid_stack_pointer;
++#elif defined(__powerpc64__)
++  context.context.uc_mcontext.gp_regs[MD_CONTEXT_PPC64_REG_SP] =
++      invalid_stack_pointer;
+ #else
+ # error "This code has not been ported to your platform yet."
+ #endif
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/common/linux/memory_mapped_file.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/common/linux/memory_mapped_file.cc
+@@ -65,8 +65,7 @@ bool MemoryMappedFile::Map(const char* p
+   }
+ 
+ #if defined(__x86_64__) || defined(__aarch64__) || \
+-   (defined(__mips__) && _MIPS_SIM == _ABI64)
+-
++   (defined(__mips__) && _MIPS_SIM == _ABI64) || defined(__powerpc64__)
+   struct kernel_stat st;
+   if (sys_fstat(fd, &st) == -1 || st.st_size < 0) {
+ #else
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/common/linux/memory_mapped_file_unittest.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/common/linux/memory_mapped_file_unittest.cc
+@@ -176,9 +176,10 @@ TEST_F(MemoryMappedFileTest, RemapAfterM
+ TEST_F(MemoryMappedFileTest, MapWithOffset) {
+   // Put more data in the test file this time. Offsets can only be
+   // done on page boundaries, so we need a two page file to test this.
+-  const int page_size = 4096;
+-  char data1[2 * page_size];
+-  size_t data1_size = sizeof(data1);
++  const int page_size = getpagesize();
++  char *data1 = static_cast<char*>(malloc(2 * page_size));
++  EXPECT_TRUE(data1 != NULL);
++  size_t data1_size = (2 * page_size);
+   for (size_t i = 0; i < data1_size; ++i) {
+     data1[i] = i & 0x7f;
+   }
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/common/memory_allocator_unittest.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/common/memory_allocator_unittest.cc
+@@ -57,8 +57,9 @@ TEST(PageAllocatorTest, LargeObject) {
+ 
+   EXPECT_EQ(0U, allocator.pages_allocated());
+   uint8_t* p = reinterpret_cast<uint8_t*>(allocator.Alloc(10000));
++  uint64_t expected_pages = 1 + ((10000 - 1) / getpagesize());
+   ASSERT_FALSE(p == NULL);
+-  EXPECT_EQ(3U, allocator.pages_allocated());
++  EXPECT_EQ(expected_pages, allocator.pages_allocated());
+   for (unsigned i = 1; i < 10; ++i) {
+     uint8_t* p = reinterpret_cast<uint8_t*>(allocator.Alloc(i));
+     ASSERT_FALSE(p == NULL);
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/processor/exploitability_linux.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/processor/exploitability_linux.cc
+@@ -202,12 +202,14 @@ bool ExploitabilityLinux::EndedOnIllegal
+   // Check architecture and set architecture variable to corresponding flag
+   // in objdump.
+   switch (context->GetContextCPU()) {
++#if defined(__i386) || defined(__x86_64)
+     case MD_CONTEXT_X86:
+       architecture = "i386";
+       break;
+     case MD_CONTEXT_AMD64:
+       architecture = "i386:x86-64";
+       break;
++#endif
+     default:
+       // Unsupported architecture. Note that ARM architectures are not
+       // supported because objdump does not support ARM.
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/processor/exploitability_unittest.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/processor/exploitability_unittest.cc
+@@ -104,6 +104,8 @@ ExploitabilityFor(const string& filename
+ }
+ 
+ TEST(ExploitabilityTest, TestWindowsEngine) {
++// The following tests are only executable on an x86-class linux machine.
++#if !defined(_WIN32) && (defined(__i386) || defined(__x86_64))
+   ASSERT_EQ(google_breakpad::EXPLOITABILITY_HIGH,
+             ExploitabilityFor("ascii_read_av.dmp"));
+   ASSERT_EQ(google_breakpad::EXPLOITABILITY_HIGH,
+@@ -136,9 +138,12 @@ TEST(ExploitabilityTest, TestWindowsEngi
+             ExploitabilityFor("read_av_clobber_write.dmp"));
+   ASSERT_EQ(google_breakpad::EXPLOITABILITY_LOW,
+             ExploitabilityFor("read_av_conditional.dmp"));
++#endif
+ }
+ 
+ TEST(ExploitabilityTest, TestLinuxEngine) {
++// The following tests are only executable on an x86-class linux machine.
++#if defined(__i386) || defined(__x86_64)
+   ASSERT_EQ(google_breakpad::EXPLOITABILITY_INTERESTING,
+             ExploitabilityFor("linux_null_read_av.dmp"));
+   ASSERT_EQ(google_breakpad::EXPLOITABILITY_HIGH,
+@@ -171,7 +176,8 @@ TEST(ExploitabilityTest, TestLinuxEngine
+             ExploitabilityFor("linux_executable_heap.dmp"));
+   ASSERT_EQ(google_breakpad::EXPLOITABILITY_HIGH,
+             ExploitabilityFor("linux_jmp_to_module_not_exe_region.dmp"));
+-#ifndef _WIN32
++#endif
++#if !defined(_WIN32) && (defined(__i386) || defined(__x86_64))
+   ASSERT_EQ(google_breakpad::EXPLOITABILITY_HIGH,
+             ExploitabilityFor("linux_write_to_nonwritable_module.dmp"));
+   ASSERT_EQ(google_breakpad::EXPLOITABILITY_HIGH,
+@@ -182,10 +188,10 @@ TEST(ExploitabilityTest, TestLinuxEngine
+             ExploitabilityFor("linux_write_to_outside_module_via_math.dmp"));
+   ASSERT_EQ(google_breakpad::EXPLOITABILITY_INTERESTING,
+             ExploitabilityFor("linux_write_to_under_4k.dmp"));
+-#endif  // _WIN32
++#endif  // !defined(_WIN32) && (!defined(__i386) && !defined(__x86_64))
+ }
+ 
+-#ifndef _WIN32
++#if !defined(_WIN32) && (defined(__i386) || defined(__x86_64))
+ TEST(ExploitabilityLinuxUtilsTest, DisassembleBytesTest) {
+   ASSERT_FALSE(ExploitabilityLinuxTest::DisassembleBytes("", NULL, 5, NULL));
+   uint8_t bytes[6] = {0xc7, 0x0, 0x5, 0x0, 0x0, 0x0};
+@@ -301,6 +307,7 @@ TEST(ExploitabilityLinuxUtilsTest, Calcu
+                                                          context,
+                                                          &write_address));
+ }
+-#endif  // _WIN32
++#endif  // !defined(_WIN32) && (defined(__i386) || defined(__x86_64))
++
+ 
+ }  // namespace
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/tools/linux/md2core/minidump-2-core.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/tools/linux/md2core/minidump-2-core.cc
+@@ -77,6 +77,8 @@
+   #define ELF_ARCH  EM_MIPS
+ #elif defined(__aarch64__)
+   #define ELF_ARCH  EM_AARCH64
++#elif defined(__powerpc64__)
++  #define ELF_ARCH  EM_PPC64
+ #endif
+ 
+ #if defined(__arm__)
+@@ -87,6 +89,8 @@ typedef user_regs user_regs_struct;
+ #elif defined (__mips__)
+ // This file-local typedef simplifies the source code.
+ typedef gregset_t user_regs_struct;
++#elif defined(__powerpc64__)
++typedef struct pt_regs user_regs_struct;
+ #endif
+ 
+ using google_breakpad::MDTypeHelper;
+@@ -322,6 +326,12 @@ struct CrashedProcess {
+ #if defined(__aarch64__)
+     user_fpsimd_struct fpregs;
+ #endif
++#if defined(__powerpc64__)
++    mcontext_t mcontext;
++#endif
++#if defined(__powerpc64__)
++    mcontext_t mcontext;
++#endif
+     uintptr_t stack_addr;
+     const uint8_t* stack;
+     size_t stack_length;
+@@ -535,6 +545,38 @@ ParseThreadRegisters(CrashedProcess::Thr
+   thread->mcontext.fpc_eir = rawregs->float_save.fir;
+ #endif
+ }
++#elif defined(__powerpc64__)
++static void
++ParseThreadRegisters(CrashedProcess::Thread* thread,
++                     const MinidumpMemoryRange& range) {
++  const MDRawContextPPC64* rawregs = range.GetData<MDRawContextPPC64>(0);
++
++  for (int i = 0; i < MD_CONTEXT_PPC64_GPR_COUNT; i++)
++    thread->mcontext.gp_regs[i] = rawregs->gpr[i];
++
++  thread->mcontext.gp_regs[PT_LNK] = rawregs->lr;
++  thread->mcontext.gp_regs[PT_NIP] = rawregs->srr0;
++  thread->mcontext.gp_regs[PT_MSR] = rawregs->srr1;
++  thread->mcontext.gp_regs[PT_CCR] = rawregs->cr;
++  thread->mcontext.gp_regs[PT_XER] = rawregs->xer;
++  thread->mcontext.gp_regs[PT_CTR] = rawregs->ctr;
++  thread->mcontext.v_regs->vrsave = rawregs->vrsave;
++
++  for (int i = 0; i < MD_FLOATINGSAVEAREA_PPC_FPR_COUNT; i++)
++      thread->mcontext.fp_regs[i] = rawregs->float_save.fpregs[i];
++
++  thread->mcontext.fp_regs[NFPREG-1] = rawregs->float_save.fpscr;
++
++  for (int i = 0; i < MD_VECTORSAVEAREA_PPC_VR_COUNT; i++) {
++      thread->mcontext.v_regs->vrregs[i][0] = rawregs->vector_save.save_vr[i].high >> 32;
++      thread->mcontext.v_regs->vrregs[i][1] = rawregs->vector_save.save_vr[i].high;
++      thread->mcontext.v_regs->vrregs[i][2] = rawregs->vector_save.save_vr[i].low >> 32;
++      thread->mcontext.v_regs->vrregs[i][3] = rawregs->vector_save.save_vr[i].low;
++  }
++
++  thread->mcontext.v_regs->vscr.vscr_word = rawregs->vector_save.save_vscr.low & 0xFFFFFFFF;
++}
++
+ #else
+ #error "This code has not been ported to your platform yet"
+ #endif
+@@ -623,6 +665,12 @@ ParseSystemInfo(const Options& options,
+ # else
+ #  error "This mips ABI is currently not supported (n32)"
+ # endif
++#elif defined(__powerpc64__)
++  if (sysinfo->processor_architecture != MD_CPU_ARCHITECTURE_PPC64) {
++    fprintf(stderr,
++            "This version of minidump-2-core only supports PPC64.\n");
++    exit(1);
++  }
+ #else
+ #error "This code has not been ported to your platform yet"
+ #endif
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/CONTRIBUTORS
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/CONTRIBUTORS
+@@ -13,3 +13,4 @@ Mark Mentovai <mark@chromium.org>
+ Robert Sesek <rsesek@chromium.org>
+ Scott Graham <scottmg@chromium.org>
+ Joshua Peraza <jperaza@chromium.org>
++Shawn Anastasio <shawn@anastas.io>
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/compat/linux/sys/user.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/compat/linux/sys/user.h
+@@ -15,6 +15,7 @@
+ #ifndef CRASHPAD_COMPAT_LINUX_SYS_USER_H_
+ #define CRASHPAD_COMPAT_LINUX_SYS_USER_H_
+ 
++#include <cstddef>
+ #include_next <sys/user.h>
+ 
+ #include <features.h>
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/minidump/minidump_context.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/minidump/minidump_context.h
+@@ -592,6 +592,70 @@ struct MinidumpContextMIPS64 {
+   uint64_t fir;
+ };
+ 
++//! \brief ppc64-specific flags for MinidumpPPC64::context_flags
++//! Based on minidump_cpu_ppc64.h from breakpad
++enum MinidumpContextPPC64Flags : uint32_t {
++  //! \brief Identifies the context as PPC64.
++  kMinidumpContextPPC64 = 0x01000000,
++
++  //! \brief Indicates the validity of general purpose registers.
++  //!
++  //! Registers `r0`-`r31`, `nip`, `msr`, `lr`, etc. are valid.
++  kMinidumpContextPPC64Base = kMinidumpContextPPC64 | 0x00000001,
++
++  //! \brief Indicates the validity of floating point registers.
++  //!
++  //! Registers `fp0`-`fp31`, `fpscr` are valid.
++  kMinidumpContextPPC64Floating = kMinidumpContextPPC64 | 0x00000008,
++
++  //! \brief Indicates the validity of Altivec/VMX registers.
++  //!
++  //! Registers `v0`-`v31`, `vscr`, `vrsave`.
++  kMinidumpContextPPC64Vector = kMinidumpContextPPC64 | 0x00000020,
++
++  //! \brief Indicates the validity of all registers
++  kMinidumpContextPPC64All = kMinidumpContextPPC64Base     |
++                             kMinidumpContextPPC64Floating |
++                             kMinidumpContextPPC64Vector
++};
++
++//! \brief A PPC64 CPU context carried in a minidump file.
++//! Based on minidump_cpu_ppc64.h from breakpad.
++struct MinidumpContextPPC64 {
++  uint64_t context_flags;
++
++  //! \brief General purpose registers.
++  uint64_t nip;
++  uint64_t msr;
++  uint64_t regs[32];
++  uint64_t ccr;
++  uint64_t xer;
++  uint64_t lnk;
++  uint64_t ctr;
++
++  //! \brief Floating point registers.
++  double fpregs[32];
++
++  //! \brief FPU status register.
++  double fpscr;
++
++  //! \brief Altivec/VMX vector registers.
++  struct {
++      //! \brief Vector registers are 128bits.
++      uint128_struct save_vr[32];
++      uint128_struct save_vscr;
++
++      //! \brief Padding included for breakpad compatibiltiy.
++      uint32_t save_pad5[4];
++
++      //! \brief VRSAVE register.
++      uint32_t save_vrsave;
++
++      //! \brief Padding included for breakpad compatibiltiy.
++      uint32_t save_pad6[7];
++  } vregs;
++};
++
+ }  // namespace crashpad
+ 
+ #endif  // CRASHPAD_MINIDUMP_MINIDUMP_CONTEXT_H_
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/minidump/minidump_context_writer.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/minidump/minidump_context_writer.cc
+@@ -101,6 +101,13 @@ MinidumpContextWriter::CreateFromSnapsho
+       break;
+     }
+ 
++    case kCPUArchitecturePPC64: {
++      context = std::make_unique<MinidumpContextPPC64Writer>();
++      reinterpret_cast<MinidumpContextPPC64Writer*>(context.get())
++          ->InitalizeFromSnapshot(context_snapshot->ppc64);
++      break;
++    }
++
+     default: {
+       LOG(ERROR) << "unknown context architecture "
+                  << context_snapshot->architecture;
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/minidump/minidump_context_writer.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/minidump/minidump_context_writer.h
+@@ -315,6 +315,45 @@ class MinidumpContextMIPS64Writer final
+   DISALLOW_COPY_AND_ASSIGN(MinidumpContextMIPS64Writer);
+ };
+ 
++class MinidumpContextPPC64Writer final : public MinidumpContextWriter {
++ public:
++  MinidumpContextPPC64Writer();
++  ~MinidumpContextPPC64Writer() override;
++
++  //! \brief Initalizes the MinidumpContextPPC64 based on \a context_snapshot.
++  //!
++  //! \param[in] context_snapshot The context snapshot to use as source data.
++  //!
++  //! \note Valid in #kStateMutable. No mutation of context() may be done before
++  //!     calling this method, and it is not normally necessary to alter
++  //!     context() after calling this method.
++  void InitalizeFromSnapshot(const CPUContextPPC64* context_snapshot);
++
++  //! \brief Returns a pointer to the context structure that this object will
++  //!     write.
++  //!
++  //! \attention This returns a non-`const` pointer to this object’s private
++  //!     data so that a caller can populate the context structure directly.
++  //!     This is done because providing setter interfaces to each field in the
++  //!     context structure would be unwieldy and cumbersome. Care must be taken
++  //!     to populate the context structure correctly. The context structure
++  //!     must only be modified while this object is in the #kStateMutable
++  //!     state.
++  MinidumpContextPPC64* context() { return &context_; }
++
++ protected:
++  // MinidumpWritable:
++  bool WriteObject(FileWriterInterface* file_writer) override;
++
++  // MinidumpContextWriter:
++  size_t ContextSize() const override;
++
++ private:
++  MinidumpContextPPC64 context_;
++
++  DISALLOW_COPY_AND_ASSIGN(MinidumpContextPPC64Writer);
++};
++
+ }  // namespace crashpad
+ 
+ #endif  // CRASHPAD_MINIDUMP_MINIDUMP_CONTEXT_WRITER_H_
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/minidump/minidump_context_writer_test.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/minidump/minidump_context_writer_test.cc
+@@ -213,6 +213,21 @@ TEST(MinidumpContextWriter, MIPS64_FromS
+       context, ExpectMinidumpContextMIPS64, kSeed);
+ }
+ 
++TEST(MinidumpContextWriter, PPC64_Zeros) {
++  EmptyContextTest<MinidumpContextPPC64Writer, MinidumpContextPPC64>(
++    ExpectMinidumpContextPPC64);
++}
++
++TEST(MinidumpContextWriter, PPC64_FromSnapshot) {
++  constexpr uint32_t kSeed = 64;
++  CPUContextPPC64 context_ppc64;
++  CPUContext context;
++  context.ppc64 = &context_ppc64;
++  InitializeCPUContextPPC64(&context, kSeed);
++  FromSnapshotTest<MinidumpContextPPC64Writer, MinidumpContextPPC64>(
++      context, ExpectMinidumpContextPPC64, kSeed);
++}
++
+ }  // namespace
+ }  // namespace test
+ }  // namespace crashpad
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/minidump/minidump_misc_info_writer.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/minidump/minidump_misc_info_writer.cc
+@@ -135,6 +135,8 @@ std::string MinidumpMiscInfoDebugBuildSt
+   static constexpr char kCPU[] = "mips";
+ #elif defined(ARCH_CPU_MIPS64EL)
+   static constexpr char kCPU[] = "mips64";
++#elif defined(ARCH_CPU_PPC64)
++  static constexpr char kCPU[] = "ppc64";
+ #else
+ #error define kCPU for this CPU
+ #endif
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/capture_memory.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/capture_memory.cc
+@@ -112,6 +112,11 @@ void CaptureMemory::PointedToByContext(c
+   for (size_t i = 0; i < base::size(context.mipsel->regs); ++i) {
+     MaybeCaptureMemoryAround(delegate, context.mipsel->regs[i]);
+   }
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++  MaybeCaptureMemoryAround(delegate, context.ppc64->nip);
++  for (size_t i = 0; i < base::size(context.ppc64->regs); ++i) {
++    MaybeCaptureMemoryAround(delegate, context.ppc64->regs[i]);
++  }
+ #else
+ #error Port.
+ #endif
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/cpu_architecture.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/cpu_architecture.h
+@@ -43,7 +43,10 @@ enum CPUArchitecture {
+   kCPUArchitectureMIPSEL,
+ 
+   //! \brief 64-bit MIPSEL.
+-  kCPUArchitectureMIPS64EL
++  kCPUArchitectureMIPS64EL,
++
++  //! \brief 64-bit PPC64.
++  kCPUArchitecturePPC64
+ };
+ 
+ }  // namespace crashpad
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/cpu_context.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/cpu_context.cc
+@@ -169,6 +169,8 @@ uint64_t CPUContext::InstructionPointer(
+       return arm->pc;
+     case kCPUArchitectureARM64:
+       return arm64->pc;
++    case kCPUArchitecturePPC64:
++      return ppc64->nip;
+     default:
+       NOTREACHED();
+       return ~0ull;
+@@ -185,6 +187,8 @@ uint64_t CPUContext::StackPointer() cons
+       return arm->sp;
+     case kCPUArchitectureARM64:
+       return arm64->sp;
++    case kCPUArchitecturePPC64:
++      return ppc64->regs[1];
+     default:
+       NOTREACHED();
+       return ~0ull;
+@@ -196,6 +200,7 @@ bool CPUContext::Is64Bit() const {
+     case kCPUArchitectureX86_64:
+     case kCPUArchitectureARM64:
+     case kCPUArchitectureMIPS64EL:
++    case kCPUArchitecturePPC64:
+       return true;
+     case kCPUArchitectureX86:
+     case kCPUArchitectureARM:
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/cpu_context.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/cpu_context.h
+@@ -352,6 +352,24 @@ struct CPUContextMIPS64 {
+   uint64_t fir;
+ };
+ 
++//! \brief A context structure carrying PPC64 CPU state.
++struct CPUContextPPC64 {
++  uint64_t nip;
++  uint64_t msr;
++  uint64_t regs[32];
++  uint64_t ccr;
++  uint64_t xer;
++  uint64_t lnk;
++  uint64_t ctr;
++  double fpregs[32];
++  double fpscr;
++  struct {
++    uint128_struct save_vr[32];
++    uint128_struct save_vscr;
++    uint32_t save_vrsave;
++  } vregs;
++};
++
+ //! \brief A context structure capable of carrying the context of any supported
+ //!     CPU architecture.
+ struct CPUContext {
+@@ -382,6 +400,7 @@ struct CPUContext {
+     CPUContextARM64* arm64;
+     CPUContextMIPS* mipsel;
+     CPUContextMIPS64* mips64;
++    CPUContextPPC64* ppc64;
+   };
+ };
+ 
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/cpu_context_linux.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/cpu_context_linux.h
+@@ -15,6 +15,7 @@
+ #ifndef CRASHPAD_SNAPSHOT_LINUX_CPU_CONTEXT_LINUX_H_
+ #define CRASHPAD_SNAPSHOT_LINUX_CPU_CONTEXT_LINUX_H_
+ 
++#include <cstring>
+ #include "build/build_config.h"
+ #include "snapshot/cpu_context.h"
+ #include "snapshot/linux/signal_context.h"
+@@ -174,6 +175,76 @@ void InitializeCPUContextMIPS(
+ 
+ #endif  // ARCH_CPU_MIPS_FAMILY || DOXYGEN
+ 
++#if defined(ARCH_CPU_PPC64_FAMILY) || DOXYGEN
++
++//! \brief Initalizes a CPUContextPPC64 structure from native context
++//!     structures on Linux.
++//!
++//! \param[in] thread_context The native thread context.
++//! \param[in] float_context The native float context.
++//! \param[in] vector_context The native vector context.
++//! \param[out] context The CPUContextPPC64 structure to initalize.
++template <typename Traits>
++void InitializeCPUContextPPC64(
++    const ThreadContext::t64_t& thread_context,
++    const FloatContext::f64_t& float_context,
++    const VectorContext::v64_t& vector_context,
++    typename Traits::CPUContext* context) {
++
++  memcpy(context->regs, thread_context.gpr, sizeof(context->regs));
++  context->nip = thread_context.nip;
++  context->msr = thread_context.msr;
++  context->ccr = thread_context.ccr;
++  context->xer = thread_context.xer;
++  context->lnk = thread_context.lnk;
++  context->ctr = thread_context.ctr;
++
++  memcpy(context->fpregs, float_context.fpregs, sizeof(context->fpregs));
++  context->fpscr = float_context.fpscr;
++
++  for (uint8_t i = 0; i < 32; i++) {
++    context->vregs.save_vr[i] = {
++      (((uint64_t)vector_context.vrregs[i][0]) << 32) |
++        vector_context.vrregs[i][1],
++      (((uint64_t)vector_context.vrregs[i][2]) << 32) |
++        vector_context.vrregs[i][3]
++    };
++  }
++  context->vregs.save_vrsave = vector_context.vrsave;
++  context->vregs.save_vscr = {0, (uint64_t)vector_context.vscr.vscr_word};
++}
++
++template <typename Traits>
++void InitializeCPUContextPPC64(
++    const SignalThreadContext64 &thread_context,
++    const SignalFloatContext64 &float_context,
++    const SignalVectorContext64 &vector_context,
++    typename Traits::CPUContext* context) {
++
++  memcpy(context->regs, thread_context.regs, sizeof(context->regs));
++  context->nip = thread_context.nip;
++  context->msr = thread_context.msr;
++  context->ccr = thread_context.ccr;
++  context->xer = thread_context.xer;
++  context->lnk = thread_context.lnk;
++  context->ctr = thread_context.ctr;
++
++  memcpy(context->fpregs, float_context.regs, sizeof(context->fpregs));
++  context->fpscr = float_context.fpscr;
++
++  for (uint8_t i = 0; i < 32; i++) {
++    context->vregs.save_vr[i] = {
++      (((uint64_t)vector_context.vrregs[i][0]) << 32) |
++        vector_context.vrregs[i][1],
++      (((uint64_t)vector_context.vrregs[i][2]) << 32) |
++        vector_context.vrregs[i][3]
++    };
++  }
++  context->vregs.save_vrsave = vector_context.vrsave;
++  context->vregs.save_vscr = {0, (uint64_t)vector_context.vscr.vscr_word};
++}
++
++#endif
+ }  // namespace internal
+ }  // namespace crashpad
+ 
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/debug_rendezvous_test.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/debug_rendezvous_test.cc
+@@ -192,6 +192,8 @@ void TestAgainstTarget(PtraceConnection*
+               device == 0 && inode == 0 && mapping_name == "[vdso]";
+ #if defined(ARCH_CPU_X86)
+           static constexpr char kPrefix[] = "linux-gate.so.";
++#elif defined(ARCH_CPU_PPC64)
++          static constexpr char kPrefix[] = "linux-vdso64.so.";
+ #else
+           static constexpr char kPrefix[] = "linux-vdso.so.";
+ #endif
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux.cc
+@@ -323,6 +323,69 @@ bool ExceptionSnapshotLinux::ReadContext
+       reader, context_address, context_.mips64);
+ }
+ 
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++
++template <typename Traits>
++static bool ReadContext(ProcessReaderLinux* reader,
++                        LinuxVMAddress context_address,
++                        typename Traits::CPUContext* dest_context) {
++  const ProcessMemory* memory = reader->Memory();
++
++  LinuxVMAddress gp_regs_address = context_address +
++                                   offsetof(UContext, mcontext) +
++                                   offsetof(typename Traits::MContext, gp_regs);
++
++  typename Traits::SignalThreadContext thread_context;
++  if (!memory->Read(gp_regs_address, sizeof(thread_context), &thread_context)) {
++    LOG(ERROR) << "Couldn't read gp_regs!";
++    return false;
++  }
++
++  LinuxVMAddress fp_regs_address = context_address +
++                                   offsetof(UContext, mcontext) +
++                                   offsetof(typename Traits::MContext, fp_regs);
++
++  typename Traits::SignalFloatContext fp_context;
++  if (!memory->Read(fp_regs_address, sizeof(fp_context), &fp_context)) {
++    LOG(ERROR) << "Couldn't read fp_regs!";
++    return false;
++  }
++
++  LinuxVMAddress v_regs_ptr_address = context_address +
++                                  offsetof(UContext, mcontext) +
++                                  offsetof(typename Traits::MContext, vmx_reserve) + 8;
++
++  typename Traits::SignalVectorContext v_context;
++  if (!memory->Read(v_regs_ptr_address, sizeof(v_context), &v_context)) {
++    LOG(ERROR) << "Couldn't read v_regs!";
++    return false;
++  }
++
++  InitializeCPUContextPPC64<ContextTraits64>(thread_context, fp_context,
++                            v_context, dest_context);
++
++  return true;
++}
++
++template<>
++bool ExceptionSnapshotLinux::ReadContext<ContextTraits64>(
++    ProcessReaderLinux* reader,
++    LinuxVMAddress context_address) {
++  context_.architecture = kCPUArchitecturePPC64;
++  context_.ppc64 = &context_union_.ppc64;
++
++  return internal::ReadContext<ContextTraits64>(
++      reader, context_address, context_.ppc64);
++}
++
++template<>
++bool ExceptionSnapshotLinux::ReadContext<ContextTraits32>(
++    ProcessReaderLinux* reader,
++    LinuxVMAddress context_address) {
++  // PPC64 is 64-bit
++  return false;
++}
++
+ #endif  // ARCH_CPU_X86_FAMILY
+ 
+ bool ExceptionSnapshotLinux::Initialize(ProcessReaderLinux* process_reader,
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux.h
+@@ -84,6 +84,8 @@ class ExceptionSnapshotLinux final : pub
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+     CPUContextMIPS mipsel;
+     CPUContextMIPS64 mips64;
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++    CPUContextPPC64 ppc64;
+ #endif
+   } context_union_;
+   CPUContext context_;
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux_test.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux_test.cc
+@@ -296,7 +296,28 @@ void ExpectContext(const CPUContext& act
+             0);
+ #undef CPU_ARCH_NAME
+ }
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++using NativeCPUContext = ucontext_t;
+ 
++void InitializeContext(NativeCPUContext* context) {
++  for (size_t reg = 0; reg < 32; ++reg) {
++    context->uc_mcontext.gp_regs[reg] = reg;
++  }
++
++  memset(&context->uc_mcontext.fp_regs, 44,
++      sizeof(context->uc_mcontext.fp_regs));
++}
++
++void ExpectContext(const CPUContext& actual, const NativeCPUContext& expected) {
++  EXPECT_EQ(actual.architecture, kCPUArchitecturePPC64);
++
++  for (size_t reg = 0; reg < 32; ++reg) {
++    EXPECT_EQ(actual.ppc64->regs[reg], expected.uc_mcontext.gp_regs[reg]);
++  }
++
++  EXPECT_EQ(memcmp(actual.ppc64->fpregs, expected.uc_mcontext.fp_regs,
++            sizeof(actual.ppc64->fpregs)), 0);
++}
+ #else
+ #error Port.
+ #endif
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/process_reader_linux.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/process_reader_linux.cc
+@@ -108,6 +108,8 @@ void ProcessReaderLinux::Thread::Initial
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+   stack_pointer = reader->Is64Bit() ? thread_info.thread_context.t64.regs[29]
+                                     : thread_info.thread_context.t32.regs[29];
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++  stack_pointer = thread_info.thread_context.t64.gpr[1];
+ #else
+ #error Port.
+ #endif
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/signal_context.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/signal_context.h
+@@ -422,6 +422,93 @@ static_assert(offsetof(UContext<ContextT
+               "context offset mismatch");
+ #endif
+ 
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++
++struct SignalThreadContext64 {
++  uint64_t regs[32];
++  uint64_t nip;
++  uint64_t msr;
++  uint64_t orig_r3;
++  uint64_t ctr;
++  uint64_t lnk;
++  uint64_t xer;
++  uint64_t ccr;
++  uint64_t softe;
++  uint64_t trap;
++  uint64_t dar;
++  uint64_t dsisr;
++  uint64_t result;
++  uint64_t dscr;
++  uint64_t fpr0[3];
++};
++
++struct SignalFloatContext64 {
++  double regs[32];
++  double fpscr;
++};
++
++struct SignalVectorContext64 {
++  int32_t vrregs[32][4];
++  struct {
++    int32_t __pad[3];
++    int32_t vscr_word;
++  } vscr;
++  int32_t vrsave;
++  int32_t __pad[3];
++} __attribute__((__aligned__(16)));
++
++
++#pragma pack(pop)
++struct MContext64 {
++  uint64_t reserved[4];
++  int32_t signal;
++  int32_t __pad0;
++  uint64_t handler;
++  uint64_t oldmask;
++  uint64_t pt_regs_ptr;
++  SignalThreadContext64 gp_regs;
++  SignalFloatContext64  fp_regs;
++  SignalVectorContext64 *v_regs;
++#ifdef __GLIBC__
++  int64_t vmx_reserve[69];
++#else
++  int64_t vmx_reserve[101];
++#endif
++};
++
++struct ContextTraits64 : public Traits64 {
++  using MContext = MContext64;
++  using SignalThreadContext = SignalThreadContext64;
++  using SignalFloatContext = SignalFloatContext64;
++  using SignalVectorContext = SignalVectorContext64;
++  using CPUContext = CPUContextPPC64;
++};
++
++struct ContextTraits32 : public Traits32 {};
++
++struct UContext {
++  uint64_t flags;
++  uint64_t link;
++  SignalStack<ContextTraits64> stack;
++  Sigset<ContextTraits64> sigmask;
++  MContext64 mcontext;
++};
++#pragma pack(push, 1)
++
++static_assert(sizeof(UContext) == sizeof(ucontext_t),
++              "ucontext_t size mismatch");
++static_assert(sizeof(MContext64) == sizeof(mcontext_t),
++              "mcontext_t size mismatch");
++static_assert(sizeof(SignalThreadContext64) == sizeof(gregset_t),
++              "gregset_t size mismatch");
++static_assert(sizeof(SignalFloatContext64) == sizeof(fpregset_t),
++              "fpregset_t size mismatch");
++static_assert(sizeof(SignalVectorContext64) == sizeof(vrregset_t),
++              "vrregset_t size mismatch");
++static_assert(offsetof(UContext, mcontext) ==
++              offsetof(ucontext_t, uc_mcontext), "mcontext offset mismatch");
++static_assert(offsetof(MContext64, gp_regs) ==
++              offsetof(mcontext_t, gp_regs), "gp_regs offset mismatch");
+ #else
+ #error Port.
+ #endif  // ARCH_CPU_X86_FAMILY
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/system_snapshot_linux.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/system_snapshot_linux.cc
+@@ -204,6 +204,8 @@ CPUArchitecture SystemSnapshotLinux::Get
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+   return process_reader_->Is64Bit() ? kCPUArchitectureMIPS64EL
+                                     : kCPUArchitectureMIPSEL;
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++  return kCPUArchitecturePPC64;
+ #else
+ #error port to your architecture
+ #endif
+@@ -219,6 +221,9 @@ uint32_t SystemSnapshotLinux::CPURevisio
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+   // Not implementable on MIPS
+   return 0;
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++  // Not yet implemented on PPC64
++  return 0;
+ #else
+ #error port to your architecture
+ #endif
+@@ -239,6 +244,9 @@ std::string SystemSnapshotLinux::CPUVend
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+   // Not implementable on MIPS
+   return std::string();
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++  // Not yet implemented on PPC64
++  return std::string();
+ #else
+ #error port to your architecture
+ #endif
+@@ -372,6 +380,9 @@ bool SystemSnapshotLinux::NXEnabled() co
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+   // Not implementable on MIPS
+   return false;
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++  // Not yet implemented on PPC64
++  return false;
+ #else
+ #error Port.
+ #endif  // ARCH_CPU_X86_FAMILY
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/test_modules.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/test_modules.cc
+@@ -110,6 +110,8 @@ bool WriteTestModule(const base::FilePat
+   module.ehdr.e_machine = EM_AARCH64;
+ #elif defined(ARCH_CPU_MIPSEL) || defined(ARCH_CPU_MIPS64EL)
+   module.ehdr.e_machine = EM_MIPS;
++#elif defined(ARCH_CPU_PPC64)
++  module.ehdr.e_machine = EM_PPC64;
+ #endif
+ 
+   module.ehdr.e_version = EV_CURRENT;
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/thread_snapshot_linux.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/thread_snapshot_linux.cc
+@@ -186,6 +186,14 @@ bool ThreadSnapshotLinux::Initialize(Pro
+         thread.thread_info.float_context.f32,
+         context_.mipsel);
+   }
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++  context_.architecture = kCPUArchitecturePPC64;
++  context_.ppc64 = &context_union_.ppc64;
++  InitializeCPUContextPPC64<ContextTraits64>(
++      thread.thread_info.thread_context.t64,
++      thread.thread_info.float_context.f64,
++      thread.thread_info.vector_context.v64,
++      context_.ppc64);
+ #else
+ #error Port.
+ #endif
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/thread_snapshot_linux.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/thread_snapshot_linux.h
+@@ -68,6 +68,8 @@ class ThreadSnapshotLinux final : public
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+     CPUContextMIPS mipsel;
+     CPUContextMIPS64 mips64;
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++    CPUContextPPC64 ppc64;
+ #else
+ #error Port.
+ #endif  // ARCH_CPU_X86_FAMILY
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/util/linux/auxiliary_vector.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/util/linux/auxiliary_vector.cc
+@@ -56,6 +56,11 @@ bool AuxiliaryVector::Read(PtraceConnect
+     if (type == AT_IGNORE) {
+       continue;
+     }
++#if defined(ARCH_CPU_PPC64_FAMILY)
++    if (type == AT_IGNOREPPC) {
++      continue;
++    }
++#endif
+     if (!MapInsertOrReplace(&values_, type, value, nullptr)) {
+       LOG(ERROR) << "duplicate auxv entry";
+       return false;
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/util/linux/ptracer.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/util/linux/ptracer.cc
+@@ -401,6 +401,64 @@ bool GetThreadArea64(pid_t tid,
+   return true;
+ }
+ 
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++// PPC64 has had HAVE_ARCH_TRACEHOOK set since 2.6.27 (even before x86 had it).
++// That means we can simply use PTRACE_GETREGESET.
++
++template <typename Destination>
++bool GetRegisterSet(pid_t tid, int set, Destination* dest, bool can_log) {
++  iovec iov;
++  iov.iov_base = reinterpret_cast<void*>(dest);
++  iov.iov_len = sizeof(*dest);
++  if (ptrace(PTRACE_GETREGSET, tid, reinterpret_cast<void*>(set), &iov) != 0) {
++    PLOG_IF(ERROR, can_log) << "ptrace";
++    return false;
++  }
++  if (iov.iov_len != sizeof(*dest)) {
++    LOG_IF(ERROR, can_log) << "Unexpected registers size";
++    return false;
++  }
++  return true;
++}
++
++bool GetVectorRegisters64(pid_t tid,
++                          VectorContext* context,
++                          bool can_log) {
++  return GetRegisterSet(tid, NT_PPC_VMX, &context->v64, can_log);
++}
++
++bool GetFloatingPointRegisters64(pid_t tid,
++                                 FloatContext* context,
++                                 bool can_log) {
++  return GetRegisterSet(tid, NT_PRFPREG, &context->f64, can_log);
++}
++
++bool GetThreadArea64(pid_t tid,
++                     const ThreadContext& context,
++                     LinuxVMAddress* address,
++                     bool can_log) {
++  // PPC64 doesn't have PTRACE_GET_THREAD_AREA since the thread pointer
++  // is stored in GPR 13.
++  ThreadContext::t64_t tc;
++  if (!GetRegisterSet(tid, NT_PRSTATUS, &tc, can_log)) {
++    LOG_IF(ERROR, can_log) << "Unable to get thread pointer!";
++    return false;
++  }
++
++  *address = tc.gpr[13];
++
++  return true;
++}
++
++// Stubs for 32-bit functions not applicable on PPC64
++bool GetFloatingPointRegisters32(pid_t tid,
++                                 FloatContext* context,
++                                 bool can_log) { return false; }
++bool GetThreadArea32(pid_t tid,
++                     const ThreadContext &context,
++                     LinuxVMAddress *address,
++                     bool can_log) { return false; }
++
+ #else
+ #error Port.
+ #endif  // ARCH_CPU_X86_FAMILY
+@@ -497,6 +555,9 @@ bool Ptracer::GetThreadInfo(pid_t tid, T
+   if (is_64_bit_) {
+     return GetGeneralPurposeRegisters64(tid, &info->thread_context, can_log_) &&
+            GetFloatingPointRegisters64(tid, &info->float_context, can_log_) &&
++#if defined(ARCH_CPU_PPC64_FAMILY)
++           GetVectorRegisters64(tid, &info->vector_context, can_log_) &&
++#endif
+            GetThreadArea64(tid,
+                            info->thread_context,
+                            &info->thread_specific_data_address,
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/util/linux/thread_info.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/util/linux/thread_info.h
+@@ -39,6 +39,13 @@ struct user_vfp_exc {
+ #include <android/api-level.h>
+ #endif
+ 
++#if defined(ARCH_CPU_PPC64_FAMILY)
++#include <sys/ucontext.h>
++#if !defined(__GLIBC__)
++#include <asm/ptrace.h>
++#endif
++#endif
++
+ namespace crashpad {
+ 
+ //! \brief The set of general purpose registers for an architecture family.
+@@ -90,6 +97,8 @@ union ThreadContext {
+     uint32_t cp0_status;
+     uint32_t cp0_cause;
+     uint32_t padding1_;
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++    // PPC64 is 64-bit
+ #else
+ #error Port.
+ #endif  // ARCH_CPU_X86_FAMILY
+@@ -143,6 +152,21 @@ union ThreadContext {
+     uint64_t cp0_badvaddr;
+     uint64_t cp0_status;
+     uint64_t cp0_cause;
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++    // Reflects struct pt_regs in asm/ptrace.h.
++    uint64_t gpr[32];
++    uint64_t nip;
++    uint64_t msr;
++    uint64_t orig_gpr3;
++    uint64_t ctr;
++    uint64_t lnk;
++    uint64_t xer;
++    uint64_t ccr;
++    uint64_t softe;
++    uint64_t trap;
++    uint64_t dar;
++    uint64_t dsisr;
++    uint64_t result;
+ #else
+ #error Port.
+ #endif  // ARCH_CPU_X86_FAMILY
+@@ -154,6 +178,8 @@ union ThreadContext {
+   using NativeThreadContext = user_regs;
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+ // No appropriate NativeThreadsContext type available for MIPS
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++  using NativeThreadContext = struct pt_regs;
+ #else
+ #error Port.
+ #endif  // ARCH_CPU_X86_FAMILY || ARCH_CPU_ARM64
+@@ -229,6 +255,9 @@ union FloatContext {
+     } fpregs[32];
+     uint32_t fpcsr;
+     uint32_t fpu_id;
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++    // Crashpad's PPC support is 64-bit only, so this
++    // 32bit-only struct is declared as empty.
+ #else
+ #error Port.
+ #endif  // ARCH_CPU_X86_FAMILY
+@@ -263,6 +292,10 @@ union FloatContext {
+     double fpregs[32];
+     uint32_t fpcsr;
+     uint32_t fpu_id;
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++    // Reflects fpregset_t in sys/ucontext.h
++    double fpregs[32];
++    double fpscr;
+ #else
+ #error Port.
+ #endif  // ARCH_CPU_X86_FAMILY
+@@ -291,6 +324,8 @@ union FloatContext {
+   static_assert(sizeof(f64) == sizeof(user_fpsimd_struct), "Size mismatch");
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+ // No appropriate floating point context native type for available MIPS.
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++  static_assert(sizeof(f64) == sizeof(fpregset_t), "Size mismatch");
+ #else
+ #error Port.
+ #endif  // ARCH_CPU_X86
+@@ -298,6 +333,26 @@ union FloatContext {
+ static_assert(std::is_standard_layout<FloatContext>::value,
+               "Not standard layout");
+ 
++//! \brief The vector registers used for an architecture family
++union VectorContext {
++  struct v32_t {} v32;
++#if defined(ARCH_CPU_PPC64_FAMILY)
++  __attribute__((__aligned__(16))) // Vector context must be doubleword aligned.
++#endif
++  struct v64_t {
++#if defined(ARCH_CPU_PPC64_FAMILY)
++    // Reflects vrregset_t in sys/ucontext.h
++    uint32_t vrregs[32][4];
++    struct {
++      uint32_t __pad[3];
++      uint32_t vscr_word;
++    } vscr;
++    uint32_t vrsave;
++    uint32_t __pad[3];
++#endif
++  } v64;
++};
++
+ //! \brief A collection of `ptrace`-able information about a thread.
+ struct ThreadInfo {
+   ThreadInfo();
+@@ -309,6 +364,9 @@ struct ThreadInfo {
+   //! \brief The floating point registers for the thread.
+   FloatContext float_context;
+ 
++  //! \brief (Optional) The vector registers used for the thread.
++  VectorContext vector_context;
++
+   //! \brief The thread-local storage address for the thread.
+   LinuxVMAddress thread_specific_data_address;
+ };
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/util/misc/capture_context.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/util/misc/capture_context.h
+@@ -69,6 +69,7 @@ using NativeCPUContext = ucontext_t;
+ //!     macOS/Linux/Fuchsia | x86_64       | `%%rdi`
+ //!     Linux               | ARM/ARM64    | `r0`/`x0`
+ //!     Linux               | MIPS/MIPS64  | `$a0`
++//!     Linux               | PPC64        | `r3`
+ //!
+ //!     Additionally, the value `LR` on ARM/ARM64 will be the return address of
+ //!     this function.
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/util/misc/capture_context_linux.S
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/util/misc/capture_context_linux.S
+@@ -32,7 +32,7 @@
+   .balign 4, 0x0
+   .type CAPTURECONTEXT_SYMBOL, %function
+   .type CAPTURECONTEXT_SYMBOL2, %function
+-#elif defined(__mips__)
++#elif defined(__mips__) || defined(__powerpc64__)
+   .balign 4, 0x0
+ #endif
+ 
+@@ -423,4 +423,214 @@ CAPTURECONTEXT_SYMBOL2:
+   jr $ra
+ 
+   .set at
++#elif defined(__powerpc64__)
++  // Store r0-r31
++  std 0, 0xe8(3)   // context->uc_mcontext.gp_regs[0]
++  std 1, 0xf0(3)   // context->uc_mcontext.gp_regs[1]
++  std 2, 0xf8(3)   // context->uc_mcontext.gp_regs[2]
++  // note that r3's original value was lost
++  std 3, 0x100(3)  // context->uc_mcontext.gp_regs[3]
++  std 4, 0x108(3)  // context->uc_mcontext.gp_regs[4]
++  std 5, 0x110(3)  // context->uc_mcontext.gp_regs[5]
++  std 6, 0x118(3)  // context->uc_mcontext.gp_regs[6]
++  std 7, 0x120(3)  // context->uc_mcontext.gp_regs[7]
++  std 8, 0x128(3)  // context->uc_mcontext.gp_regs[8]
++  std 9, 0x130(3)  // context->uc_mcontext.gp_regs[9]
++  std 10, 0x138(3) // context->uc_mcontext.gp_regs[10]
++  std 11, 0x140(3) // context->uc_mcontext.gp_regs[11]
++  std 12, 0x148(3) // context->uc_mcontext.gp_regs[12]
++  std 13, 0x150(3) // context->uc_mcontext.gp_regs[13]
++  std 14, 0x158(3) // context->uc_mcontext.gp_regs[14]
++  std 15, 0x160(3) // context->uc_mcontext.gp_regs[15]
++  std 16, 0x168(3) // context->uc_mcontext.gp_regs[16]
++  std 17, 0x170(3) // context->uc_mcontext.gp_regs[17]
++  std 18, 0x178(3) // context->uc_mcontext.gp_regs[18]
++  std 19, 0x180(3) // context->uc_mcontext.gp_regs[19]
++  std 20, 0x188(3) // context->uc_mcontext.gp_regs[20]
++  std 21, 0x190(3) // context->uc_mcontext.gp_regs[21]
++  std 22, 0x198(3) // context->uc_mcontext.gp_regs[22]
++  std 23, 0x1a0(3) // context->uc_mcontext.gp_regs[23]
++  std 24, 0x1a8(3) // context->uc_mcontext.gp_regs[24]
++  std 25, 0x1b0(3) // context->uc_mcontext.gp_regs[25]
++  std 26, 0x1b8(3) // context->uc_mcontext.gp_regs[26]
++  std 27, 0x1c0(3) // context->uc_mcontext.gp_regs[27]
++  std 28, 0x1c8(3) // context->uc_mcontext.gp_regs[28]
++  std 29, 0x1d0(3) // context->uc_mcontext.gp_regs[29]
++  std 30, 0x1d8(3) // context->uc_mcontext.gp_regs[30]
++  std 31, 0x1e0(3) // context->uc_mcontext.gp_regs[31]
++
++  // For NIP, we can use the value in the link register
++  mflr 0
++  std 0, 0x1e8(3) // context->uc_mcontext.gp_regs[PT_NIP]
++
++  // CTR
++  mfctr 0
++  std 0, 0x200(3) // context->uc_mcontext.gp_regs[PT_CTR]
++
++  // For LNK, we'll use the caller's LR save area (2 stack frames up).
++  // r4 can be used as a scratch register since it has already been saved.
++  ld 4, 0(1)
++  ld 4, 16(4)
++  std 4, 0x208(3) // context->uc_mcontext.gp_regs[PT_LNK]
++
++  // XER
++  mfxer 0
++  std 0, 0x210(3) // context->uc_mcontext.gp_regs[PT_XER]
++
++  // CCR
++  mfcr 0
++  std 0, 0x218(3) // context->uc_mcontext.gp_regs[PT_CCR]
++
++  // MSR, orig_r3, MQ, TRAP, DAR, DSISR, RESULT, DSCR,
++  // not used or not relevant,  zero them out.
++  li 4, 0
++  std 4, 0x1f0(3) // context->uc_mcontext.gp_regs[PT_MSR]
++  std 4, 0x1f8(3) // context->uc_mcontext.gp_regs[PT_ORIG_R3]
++  std 4, 0x220(3) // context->uc_mcontext.gp_regs[PT_MQ]
++  std 4, 0x228(3) // context->uc_mcontext.gp_regs[PT_TRAP]
++  std 4, 0x230(3) // context->uc_mcontext.gp_regs[PT_DAR]
++  std 4, 0x238(3) // context->uc_mcontext.gp_regs[PT_DSISR]
++  std 4, 0x240(3) // context->uc_mcontext.gp_regs[PT_RESULT]
++  std 4, 0x248(3) // context->uc_mcontext.gp_regs[PT_DSCR]
++
++  // Update context->uc_mcontext.regs to point to gp_regs
++  addi 0, 3, 0xe8
++  std 0, 0xe0(3)
++
++  // Save floating point registers 0-31
++  stfd 0, 0x268(3)  // context->uc_mcontext.fp_regs[0]
++  stfd 1, 0x270(3)  // context->uc_mcontext.fp_regs[1]
++  stfd 2, 0x278(3)  // context->uc_mcontext.fp_regs[2]
++  stfd 3, 0x280(3)  // context->uc_mcontext.fp_regs[3]
++  stfd 4, 0x288(3)  // context->uc_mcontext.fp_regs[4]
++  stfd 5, 0x290(3)  // context->uc_mcontext.fp_regs[5]
++  stfd 6, 0x298(3)  // context->uc_mcontext.fp_regs[6]
++  stfd 7, 0x2a0(3)  // context->uc_mcontext.fp_regs[7]
++  stfd 8, 0x2a8(3)  // context->uc_mcontext.fp_regs[8]
++  stfd 9, 0x2b0(3)  // context->uc_mcontext.fp_regs[9]
++  stfd 10, 0x2b8(3) // context->uc_mcontext.fp_regs[10]
++  stfd 11, 0x2c0(3) // context->uc_mcontext.fp_regs[11]
++  stfd 12, 0x2c8(3) // context->uc_mcontext.fp_regs[12]
++  stfd 13, 0x2d0(3) // context->uc_mcontext.fp_regs[13]
++  stfd 14, 0x2d8(3) // context->uc_mcontext.fp_regs[14]
++  stfd 15, 0x2e0(3) // context->uc_mcontext.fp_regs[15]
++  stfd 16, 0x2e8(3) // context->uc_mcontext.fp_regs[16]
++  stfd 17, 0x2f0(3) // context->uc_mcontext.fp_regs[17]
++  stfd 18, 0x2f8(3) // context->uc_mcontext.fp_regs[18]
++  stfd 19, 0x300(3) // context->uc_mcontext.fp_regs[19]
++  stfd 20, 0x308(3) // context->uc_mcontext.fp_regs[20]
++  stfd 21, 0x310(3) // context->uc_mcontext.fp_regs[21]
++  stfd 22, 0x318(3) // context->uc_mcontext.fp_regs[22]
++  stfd 23, 0x320(3) // context->uc_mcontext.fp_regs[23]
++  stfd 24, 0x328(3) // context->uc_mcontext.fp_regs[24]
++  stfd 25, 0x330(3) // context->uc_mcontext.fp_regs[25]
++  stfd 26, 0x338(3) // context->uc_mcontext.fp_regs[26]
++  stfd 27, 0x340(3) // context->uc_mcontext.fp_regs[27]
++  stfd 28, 0x348(3) // context->uc_mcontext.fp_regs[28]
++  stfd 29, 0x350(3) // context->uc_mcontext.fp_regs[29]
++  stfd 30, 0x358(3) // context->uc_mcontext.fp_regs[30]
++  stfd 31, 0x360(3) // context->uc_mcontext.fp_regs[31]
++
++  // FPSCR
++  mffs 0
++  stfd 0, 0x368(3) // context->uc_mcontext.fp_regs[32]
++
++  // Save VMX Vector registers
++  // Update r4 to contain the base address of vmx_reserve
++  addi 4, 3, 0x378
++  // Ensure that it is quadword aligned
++  andi. 5, 4, 0xF
++  beq 1f // No alignment is necessary
++  // Address is doubleword aligned and not quadword aligned, add 8
++  addi 4, 4, 8
++
++1:
++  // Store VMX registers 0-31
++  // r4 will contain the base address
++  // r5 will contain the index
++  li 5, 0
++  stvx 0, 4, 5   // context->uc_mcontext.vmx_reserve[(align) + 0]
++  addi 5, 5, 16
++  stvx 1, 4, 5   // context->uc_mcontext.vmx_reserve[(align) + 1]
++  addi 5, 5, 16
++  stvx 2, 4, 5   // context->uc_mcontext.vmx_reserve[(align) + 2]
++  addi 5, 5, 16
++  stvx 3, 4, 5   // context->uc_mcontext.vmx_reserve[(align) + 3]
++  addi 5, 5, 16
++  stvx 4, 4, 5   // context->uc_mcontext.vmx_reserve[(align) + 4]
++  addi 5, 5, 16
++  stvx 5, 4, 5   // context->uc_mcontext.vmx_reserve[(align) + 5]
++  addi 5, 5, 16
++  stvx 6, 4, 5   // context->uc_mcontext.vmx_reserve[(align) + 6]
++  addi 5, 5, 16
++  stvx 7, 4, 5   // context->uc_mcontext.vmx_reserve[(align) + 7]
++  addi 5, 5, 16
++  stvx 8, 4, 5   // context->uc_mcontext.vmx_reserve[(align) + 8]
++  addi 5, 5, 16
++  stvx 9, 4, 5   // context->uc_mcontext.vmx_reserve[(align) + 9]
++  addi 5, 5, 16
++  stvx 10, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 10]
++  addi 5, 5, 16
++  stvx 11, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 11]
++  addi 5, 5, 16
++  stvx 12, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 12]
++  addi 5, 5, 16
++  stvx 13, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 13]
++  addi 5, 5, 16
++  stvx 14, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 14]
++  addi 5, 5, 16
++  stvx 15, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 15]
++  addi 5, 5, 16
++  stvx 16, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 16]
++  addi 5, 5, 16
++  stvx 17, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 17]
++  addi 5, 5, 16
++  stvx 18, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 18]
++  addi 5, 5, 16
++  stvx 19, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 19]
++  addi 5, 5, 16
++  stvx 20, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 20]
++  addi 5, 5, 16
++  stvx 21, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 21]
++  addi 5, 5, 16
++  stvx 22, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 22]
++  addi 5, 5, 16
++  stvx 23, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 23]
++  addi 5, 5, 16
++  stvx 24, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 24]
++  addi 5, 5, 16
++  stvx 25, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 25]
++  addi 5, 5, 16
++  stvx 26, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 26]
++  addi 5, 5, 16
++  stvx 27, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 27]
++  addi 5, 5, 16
++  stvx 28, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 28]
++  addi 5, 5, 16
++  stvx 29, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 29]
++  addi 5, 5, 16
++  stvx 30, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 30]
++  addi 5, 5, 16
++  stvx 31, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 31]
++  addi 5, 5, 16
++
++  // VSCR
++  mfvscr 0
++  stvx 0, 4, 5
++  addi 5, 5, 16
++
++  // VRSAVE
++  mfvrsave 0
++  stwx 0, 4, 5
++
++  // Update context->uc_mcontext.v_regs to point to vmx_reserve + alignment.
++  std 4, 0x370(3)
++
++  // Zero out all unused fields
++  li 4, 0
++  std 4, 0xc8(3) // context->uc_mcontext.signal
++  std 4, 0xd0(3) // context->uc_mcontext.handler
++  std 4, 0xd8(3) // context->uc_mcontext.oldmask
++
++  blr
+ #endif  // __i386__
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/util/misc/capture_context_test.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/util/misc/capture_context_test.cc
+@@ -57,7 +57,7 @@ void TestCaptureContext() {
+   uintptr_t pc = ProgramCounterFromContext(context_1);
+ 
+ #if !defined(ADDRESS_SANITIZER) && !defined(ARCH_CPU_MIPS_FAMILY) && \
+-    !defined(MEMORY_SANITIZER)
++    !defined(MEMORY_SANITIZER) && !defined(ARCH_CPU_PPC64_FAMILY)
+   // Sanitizers can cause enough code bloat that the “nearby” check would
+   // likely fail.
+   const uintptr_t kReferencePC =
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/util/misc/capture_context_test_util_linux.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/util/misc/capture_context_test_util_linux.cc
+@@ -35,6 +35,8 @@ void SanityCheckContext(const NativeCPUC
+   EXPECT_EQ(context.uc_mcontext.regs[0], FromPointerCast<uintptr_t>(&context));
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+   EXPECT_EQ(context.uc_mcontext.gregs[4], FromPointerCast<uintptr_t>(&context));
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++  EXPECT_EQ(context.uc_mcontext.gp_regs[3], FromPointerCast<uintptr_t>(&context));
+ #endif
+ }
+ 
+@@ -49,6 +51,8 @@ uintptr_t ProgramCounterFromContext(cons
+   return context.uc_mcontext.pc;
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+   return context.uc_mcontext.pc;
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++  return context.uc_mcontext.gp_regs[PT_NIP];
+ #endif
+ }
+ 
+@@ -63,6 +67,8 @@ uintptr_t StackPointerFromContext(const
+   return context.uc_mcontext.sp;
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+   return context.uc_mcontext.gregs[29];
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++  return context.uc_mcontext.gp_regs[1];
+ #endif
+ }
+ 
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/util/posix/signals_test.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/util/posix/signals_test.cc
+@@ -46,9 +46,9 @@ bool CanCauseSignal(int sig) {
+   return sig == SIGABRT ||
+          sig == SIGALRM ||
+          sig == SIGBUS ||
+-#if !defined(ARCH_CPU_ARM64)
++#if !defined(ARCH_CPU_ARM64) && !defined(ARCH_CPU_PPC64)
+          sig == SIGFPE ||
+-#endif  // !defined(ARCH_CPU_ARM64)
++#endif  // !defined(ARCH_CPU_ARM64) && !defined(ARCH_CPU_PPC64)
+ #if defined(ARCH_CPU_X86_FAMILY) || defined(ARCH_CPU_ARMEL)
+          sig == SIGILL ||
+ #endif  // defined(ARCH_CPU_X86_FAMILY) || defined(ARCH_CPU_ARMEL)
+@@ -117,9 +117,11 @@ void CauseSignal(int sig) {
+       break;
+     }
+ 
+-#if !defined(ARCH_CPU_ARM64)
++#if !defined(ARCH_CPU_ARM64) && !defined(ARCH_CPU_PPC64)
+     // ARM64 has hardware integer division instructions that don’t generate a
+     // trap for divide-by-zero, so this doesn’t produce SIGFPE.
++    //
++    // PPC64 fixed-point division by zero also doesn't produce a SIGFPE.
+     case SIGFPE: {
+       // Optimization makes this tricky, so get zero from a system call likely
+       // to succeed, and try to do something with the result.
+@@ -137,7 +139,7 @@ void CauseSignal(int sig) {
+       fstat(quotient, &stat_buf);
+       break;
+     }
+-#endif  // ARCH_CPU_ARM64
++#endif  // !defined(ARCH_CPU_ARM64) && !defined(ARCH_CPU_PPC64)
+ 
+ #if defined(ARCH_CPU_X86_FAMILY) || defined(ARCH_CPU_ARMEL)
+     case SIGILL: {
+--- a/src/3rdparty/chromium/third_party/dav1d/BUILD.gn
++++ b/src/3rdparty/chromium/third_party/dav1d/BUILD.gn
+@@ -196,6 +196,8 @@ static_library("dav1d_8bit") {
+     sources += arm_template_sources
+   } else if (current_cpu == "arm64") {
+     sources += arm_template_sources
++  } else if (current_cpu == "ppc64") {
++    sources += ppc64_template_sources
+   }
+ 
+   cflags = dav1d_copts
+@@ -226,6 +228,8 @@ static_library("dav1d_10bit") {
+     sources += arm_template_sources
+   } else if (current_cpu == "arm64") {
+     sources += arm_template_sources
++  } else if (current_cpu == "ppc64") {
++    sources += ppc64_template_sources
+   }
+ 
+   cflags = dav1d_copts
+@@ -283,6 +287,21 @@ if (current_cpu == "x86" || current_cpu
+     }
+ 
+     cflags = dav1d_copts
++  }
++} else if (current_cpu == "ppc64") {
++  static_library("dav1d_ppc") {
++    sources = [
++      "libdav1d/src/ppc/cpu.c",
++      "libdav1d/src/ppc/cpu.h",
++    ]
++
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [
++      "//build/config/compiler:no_chromium_code",
++      ":dav1d_config",
++    ]
++
++    cflags = dav1d_copts
+ 
+     deps = [ ":dav1d_headers" ]
+     allow_circular_includes_from = [ ":dav1d_headers" ]
+@@ -315,5 +334,7 @@ static_library("dav1d") {
+     }
+   } else if (current_cpu == "arm" || current_cpu == "arm64") {
+     deps += [ ":dav1d_arm" ]
++  } else if (current_cpu == "ppc64") {
++    deps += [ ":dav1d_ppc" ]
+   }
+ }
+--- a/src/3rdparty/chromium/third_party/dav1d/dav1d_generated.gni
++++ b/src/3rdparty/chromium/third_party/dav1d/dav1d_generated.gni
+@@ -103,6 +103,11 @@ arm_template_sources = [
+   "libdav1d/src/arm/mc_init_tmpl.c",
+ ]
+ 
++ppc64_template_sources = [
++  "libdav1d/src/ppc/cdef_init_tmpl.c",
++  "libdav1d/src/ppc/looprestoration_init_tmpl.c",
++]
++
+ template_sources = [
+   "libdav1d/src/cdef_apply_tmpl.c",
+   "libdav1d/src/cdef_tmpl.c",
+--- a/src/3rdparty/chromium/third_party/dav1d/generate_source.py
++++ b/src/3rdparty/chromium/third_party/dav1d/generate_source.py
+@@ -57,6 +57,8 @@ def _WriteGn(fd):
+   _WriteArray(fd, "arm64_asm_sources", _Glob("libdav1d/src/arm/64/*.S"))
+   _WriteArray(fd, "arm_template_sources", _Glob("libdav1d/src/arm/*_tmpl.c"))
+ 
++  _WriteArray(fd, "ppc64_template_sources", _Glob("libdav1d/src/ppc/*_tmpl.c"))
++
+   template_sources = _Glob("libdav1d/src/*_tmpl.c")
+   _WriteArray(fd, "template_sources", template_sources)
+ 
+--- a/src/3rdparty/chromium/third_party/dav1d/libdav1d/src/ppc/types.h
++++ b/src/3rdparty/chromium/third_party/dav1d/libdav1d/src/ppc/types.h
+@@ -51,4 +51,19 @@
+ #define u16l_to_i32(v) ((i32x4) vec_mergel((u16x8) v, vec_splat_u16(0)))
+ #define i16l_to_i32(v) ((i32x4) vec_unpackl((i16x8)v))
+ 
++#if defined(__clang__)
++#undef vec_splats
++#define vec_splats(N)                     \
++    _Generic((N),                         \
++        unsigned char:      ((u8x16)(N)), \
++        signed char:        ((i8x16)(N)), \
++        unsigned short:     ((u16x8)(N)), \
++        signed short:       ((i16x8)(N)), \
++        unsigned int:       ((u32x4)(N)), \
++        signed int:         ((i32x4)(N)), \
++        unsigned long long: ((u64x2)(N)), \
++        signed long long:   ((i64x2)(N))  \
++    )
++#endif
++
+ #endif /* DAV1D_SRC_PPC_TYPES_H */
+--- a/src/3rdparty/chromium/third_party/eigen3/BUILD.gn
++++ b/src/3rdparty/chromium/third_party/eigen3/BUILD.gn
+@@ -22,4 +22,8 @@ config("eigen_includes") {
+     # for this component on Windows on Arm due to compilation errors.
+     defines += [ "EIGEN_DONT_VECTORIZE" ]
+   }
++
++  if (target_cpu == "ppc64") {
++    defines += [ "EIGEN_DONT_VECTORIZE" ]
++  }
+ }
+--- a/src/3rdparty/chromium/third_party/libaom/BUILD.gn
++++ b/src/3rdparty/chromium/third_party/libaom/BUILD.gn
+@@ -37,6 +37,8 @@ if (enable_libaom) {
+     } else {
+       cpu_arch_full = "arm"
+     }
++  } else if (current_cpu == "ppc64") {
++    cpu_arch_full = "generic"
+   } else {
+     cpu_arch_full = current_cpu
+   }
+--- a/src/3rdparty/chromium/third_party/libgav1/options.gni
++++ b/src/3rdparty/chromium/third_party/libgav1/options.gni
+@@ -12,5 +12,5 @@ declare_args() {
+       is_chromeos_ash && (target_cpu == "arm" || target_cpu == "arm64")
+   use_libgav1_parser =
+       (is_chromeos || is_linux || is_win) &&
+-      (target_cpu == "x86" || target_cpu == "x64" || target_cpu == "arm64")
++      (target_cpu == "x86" || target_cpu == "x64" || target_cpu == "arm64" || target_cpu == "ppc64")
+ }
+--- a/src/3rdparty/chromium/third_party/lss/linux_syscall_support.h
++++ b/src/3rdparty/chromium/third_party/lss/linux_syscall_support.h
+@@ -4262,7 +4262,7 @@ struct kernel_statfs {
+       LSS_REG(2, buf);
+       LSS_BODY(void*, mmap2, "0"(__r2));
+     }
+-#else
++#elif !defined(__powerpc64__) /* ppc64 doesn't have mmap2 */
+     #define __NR__mmap2 __NR_mmap2
+     LSS_INLINE _syscall6(void*, _mmap2,            void*, s,
+                          size_t,                   l, int,               p,
+@@ -4373,7 +4373,7 @@ struct kernel_statfs {
+   #if defined(__i386__) ||                                                    \
+       defined(__ARM_ARCH_3__) || defined(__ARM_EABI__) ||                     \
+      (defined(__mips__) && _MIPS_SIM == _MIPS_SIM_ABI32) ||                   \
+-      defined(__PPC__) ||                                                     \
++     (defined(__PPC__) && !defined(__powerpc64__)) ||                                                     \
+      (defined(__s390__) && !defined(__s390x__))
+     /* On these architectures, implement mmap() with mmap2(). */
+     LSS_INLINE void* LSS_NAME(mmap)(void *s, size_t l, int p, int f, int d,
+@@ -4556,9 +4556,17 @@ struct kernel_statfs {
+     }
+   #endif
+   #if defined(__NR_fstatat64)
++    #if !defined(__GLIBC__)
++        // musl doesn't define fstatat64 fstatat
++        #undef fstatat64
++    #endif
+     LSS_INLINE _syscall4(int,   fstatat64,        int,   d,
+                          const char *,      p,
+                          struct kernel_stat64 *,   b,    int,   f)
++    #if !defined(__GLIBC__)
++    	// then restore it
++        #define fstatat64 fstatat
++    #endif
+   #endif
+   #if defined(__NR_waitpid)
+     // waitpid is polyfilled below when not available.
+--- a/src/3rdparty/chromium/third_party/pdfium/third_party/libpng16/pngpriv.h
++++ b/src/3rdparty/chromium/third_party/pdfium/third_party/libpng16/pngpriv.h
+@@ -196,11 +196,7 @@
+ #endif
+ 
+ #ifndef PNG_POWERPC_VSX_OPT
+-#  if defined(__PPC64__) && defined(__ALTIVEC__) && defined(__VSX__)
+-#     define PNG_POWERPC_VSX_OPT 2
+-#  else
+-#     define PNG_POWERPC_VSX_OPT 0
+-#  endif
++#  define PNG_POWERPC_VSX_OPT 0
+ #endif
+ 
+ #ifndef PNG_INTEL_SSE_OPT
+--- a/src/3rdparty/chromium/third_party/pffft/src/pffft.c
++++ b/src/3rdparty/chromium/third_party/pffft/src/pffft.c
+@@ -100,6 +100,7 @@
+    Altivec support macros 
+ */
+ #if !defined(PFFFT_SIMD_DISABLE) && (defined(__ppc__) || defined(__ppc64__))
++#include <altivec.h>
+ typedef vector float v4sf;
+ #  define SIMD_SZ 4
+ #  define VZERO() ((vector float) vec_splat_u8(0))
+--- a/src/3rdparty/chromium/third_party/skia/src/sksl/SkSLString.cpp
++++ b/src/3rdparty/chromium/third_party/skia/src/sksl/SkSLString.cpp
+@@ -142,7 +142,12 @@ String to_string(double value) {
+     if (needsDotZero) {
+         buffer << ".0";
+     }
+-    return String(buffer.str().c_str());
++
++    std::string ret(buffer.str());
++    if (signbit(value) && ret[0] == '.') {
++        ret[0] = '-';
++    }
++    return String(ret.c_str());
+ }
+ 
+ bool stod(const skstd::string_view& s, SKSL_FLOAT* value) {
+--- a/src/3rdparty/chromium/third_party/sqlite/src/amalgamation/sqlite3.c
++++ b/src/3rdparty/chromium/third_party/sqlite/src/amalgamation/sqlite3.c
+@@ -14628,7 +14628,8 @@ typedef INT16_TYPE LogEst;
+ # if defined(i386)      || defined(__i386__)      || defined(_M_IX86) ||    \
+      defined(__x86_64)  || defined(__x86_64__)    || defined(_M_X64)  ||    \
+      defined(_M_AMD64)  || defined(_M_ARM)        || defined(__x86)   ||    \
+-     defined(__ARMEL__) || defined(__AARCH64EL__) || defined(_M_ARM64)
++     defined(__ARMEL__) || defined(__AARCH64EL__) || defined(_M_ARM64) ||   \
++     defined(__powerpc64__) && (__BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__)
+ #   define SQLITE_BYTEORDER    1234
+ # elif defined(sparc)     || defined(__ppc__) || \
+        defined(__ARMEB__) || defined(__AARCH64EB__)
+--- a/src/3rdparty/chromium/third_party/sqlite/src/amalgamation_dev/sqlite3.c
++++ b/src/3rdparty/chromium/third_party/sqlite/src/amalgamation_dev/sqlite3.c
+@@ -14641,7 +14641,8 @@ typedef INT16_TYPE LogEst;
+ # if defined(i386)      || defined(__i386__)      || defined(_M_IX86) ||    \
+      defined(__x86_64)  || defined(__x86_64__)    || defined(_M_X64)  ||    \
+      defined(_M_AMD64)  || defined(_M_ARM)        || defined(__x86)   ||    \
+-     defined(__ARMEL__) || defined(__AARCH64EL__) || defined(_M_ARM64)
++     defined(__ARMEL__) || defined(__AARCH64EL__) || defined(_M_ARM64) ||   \
++     defined(__powerpc64__) && (__BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__)
+ #   define SQLITE_BYTEORDER    1234
+ # elif defined(sparc)     || defined(__ppc__) || \
+        defined(__ARMEB__) || defined(__AARCH64EB__)
+--- a/src/3rdparty/chromium/third_party/sqlite/src/ext/rtree/rtree.c
++++ b/src/3rdparty/chromium/third_party/sqlite/src/ext/rtree/rtree.c
+@@ -450,7 +450,7 @@ struct RtreeMatchArg {
+ #if defined(i386)     || defined(__i386__)   || defined(_M_IX86) ||    \
+     defined(__x86_64) || defined(__x86_64__) || defined(_M_X64)  ||    \
+     defined(_M_AMD64) || defined(_M_ARM)     || defined(__x86)   ||    \
+-    defined(__arm__)
++    defined(__arm__) || defined(__powerpc64__) && (__BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__)
+ # define SQLITE_BYTEORDER    1234
+ #elif defined(sparc)    || defined(__ppc__)
+ # define SQLITE_BYTEORDER    4321
+--- a/src/3rdparty/chromium/third_party/sqlite/src/src/sqliteInt.h
++++ b/src/3rdparty/chromium/third_party/sqlite/src/src/sqliteInt.h
+@@ -890,7 +890,8 @@ typedef INT16_TYPE LogEst;
+ # if defined(i386)      || defined(__i386__)      || defined(_M_IX86) ||    \
+      defined(__x86_64)  || defined(__x86_64__)    || defined(_M_X64)  ||    \
+      defined(_M_AMD64)  || defined(_M_ARM)        || defined(__x86)   ||    \
+-     defined(__ARMEL__) || defined(__AARCH64EL__) || defined(_M_ARM64)
++     defined(__ARMEL__) || defined(__AARCH64EL__) || defined(_M_ARM64) || \
++     defined(__powerpc64__) && (__BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__)
+ #   define SQLITE_BYTEORDER    1234
+ # elif defined(sparc)     || defined(__ppc__) || \
+        defined(__ARMEB__) || defined(__AARCH64EB__)
+--- a/src/3rdparty/chromium/third_party/webrtc/modules/desktop_capture/differ_block.cc
++++ b/src/3rdparty/chromium/third_party/webrtc/modules/desktop_capture/differ_block.cc
+@@ -30,11 +30,7 @@ bool VectorDifference(const uint8_t* ima
+   static bool (*diff_proc)(const uint8_t*, const uint8_t*) = nullptr;
+ 
+   if (!diff_proc) {
+-#if defined(WEBRTC_ARCH_ARM_FAMILY) || defined(WEBRTC_ARCH_MIPS_FAMILY)
+-    // For ARM and MIPS processors, always use C version.
+-    // TODO(hclam): Implement a NEON version.
+-    diff_proc = &VectorDifference_C;
+-#else
++#if defined(WEBRTC_ARCH_X86_FAMILY)
+     bool have_sse2 = GetCPUInfo(kSSE2) != 0;
+     // For x86 processors, check if SSE2 is supported.
+     if (have_sse2 && kBlockSize == 32) {
+@@ -44,6 +40,10 @@ bool VectorDifference(const uint8_t* ima
+     } else {
+       diff_proc = &VectorDifference_C;
+     }
++#else
++    // For other processors, always use C version.
++    // TODO(hclam): Implement a NEON version.
++    diff_proc = &VectorDifference_C;
+ #endif
+   }
+ 
+--- a/src/3rdparty/chromium/v8/BUILD.gn
++++ b/src/3rdparty/chromium/v8/BUILD.gn
+@@ -1083,6 +1083,12 @@ config("toolchain") {
+     }
+     if (host_byteorder == "little") {
+       defines += [ "V8_TARGET_ARCH_PPC_LE" ]
++      cflags += [
++        # Enable usage of AltiVec, VSX, and other POWER8 and higher features
++        "-mcpu=power8",
++        "-maltivec",
++        "-mvsx",
++      ]
+     } else if (host_byteorder == "big") {
+       defines += [ "V8_TARGET_ARCH_PPC_BE" ]
+       if (current_os == "aix") {
+--- a/src/3rdparty/chromium/ui/gl/features.gni
++++ b/src/3rdparty/chromium/ui/gl/features.gni
+@@ -35,7 +35,8 @@ declare_args() {
+                         (is_mac && use_egl) || is_chromeos_ash || is_fuchsia) &&
+                        (target_cpu == "x86" || target_cpu == "x64" ||
+                         target_cpu == "arm" || target_cpu == "arm64" ||
+-                        target_cpu == "mipsel" || target_cpu == "mips64el")
++                        target_cpu == "mipsel" || target_cpu == "mips64el" ||
++                        target_cpu == "ppc64")
+ }
+ 
+ use_glx = use_x11 || ozone_platform_x11
+--- a/src/3rdparty/chromium/v8/test/BUILD.gn
++++ b/src/3rdparty/chromium/v8/test/BUILD.gn
+@@ -42,7 +42,6 @@ group("gn_all") {
+       "benchmarks/cpp:gn_all",
+       "cctest:cctest",
+       "cctest:generate-bytecode-expectations",
+-      "unittests:unittests",
+     ]
+   }
+ }
+@@ -84,7 +83,6 @@ group("v8_bot_default") {
+     "message:v8_message",
+     "mjsunit:v8_mjsunit",
+     "mkgrokdump:mkgrokdump",
+-    "unittests:unittests",
+     "webkit:v8_webkit",
+   ]
+ 
+@@ -109,7 +107,6 @@ group("v8_default") {
+     "message:v8_message",
+     "mjsunit:v8_mjsunit",
+     "mkgrokdump:mkgrokdump",
+-    "unittests:unittests",
+   ]
+ 
+   if (v8_enable_webassembly) {
+--- /dev/null
++++ b/src/3rdparty/chromium/dev/null
+@@ -0,0 +1,39 @@
++/*
++ * Autogenerated by the Meson build system.
++ * Do not edit, your changes will be lost.
++ */
++
++#pragma once
++
++#define ARCH_AARCH64 0
++
++#define ARCH_ARM 0
++
++#define ARCH_PPC64LE 1
++
++#define ARCH_X86 0
++
++#define ARCH_X86_32 0
++
++#define ARCH_X86_64 0
++
++#define CONFIG_16BPC 1
++
++#define CONFIG_8BPC 1
++
++// #define CONFIG_LOG 1 -- Logging is controlled by Chromium
++
++#define ENDIANNESS_BIG 0
++
++#define HAVE_ASM 1
++
++#define HAVE_CLOCK_GETTIME 1
++
++#define HAVE_DLSYM 1
++
++#define HAVE_GETAUXVAL 1
++
++#define HAVE_POSIX_MEMALIGN 1
++
++#define HAVE_UNISTD_H 1
++
+--- a/src/3rdparty/chromium/third_party/abseil-cpp/absl/base/internal/unscaledcycleclock.h
++++ b/src/3rdparty/chromium/third_party/abseil-cpp/absl/base/internal/unscaledcycleclock.h
+@@ -46,7 +46,7 @@
+ 
+ // The following platforms have an implementation of a hardware counter.
+ #if defined(__i386__) || defined(__x86_64__) || defined(__aarch64__) || \
+-  defined(__powerpc__) || defined(__ppc__) || \
++  ((defined(__powerpc__) || defined(__ppc__)) && defined(__GLIBC__)) || \
+   defined(_M_IX86) || defined(_M_X64)
+ #define ABSL_HAVE_UNSCALED_CYCLECLOCK_IMPLEMENTATION 1
+ #else
+--- a/src/3rdparty/chromium/third_party/abseil-cpp/absl/debugging/internal/stacktrace_config.h
++++ b/src/3rdparty/chromium/third_party/abseil-cpp/absl/debugging/internal/stacktrace_config.h
+@@ -59,7 +59,7 @@
+ #elif defined(__i386__) || defined(__x86_64__)
+ #define ABSL_STACKTRACE_INL_HEADER \
+   "absl/debugging/internal/stacktrace_x86-inl.inc"
+-#elif defined(__ppc__) || defined(__PPC__)
++#elif defined(__ppc__) || defined(__PPC__) && defined(__GLIBC__)
+ #define ABSL_STACKTRACE_INL_HEADER \
+   "absl/debugging/internal/stacktrace_powerpc-inl.inc"
+ #elif defined(__aarch64__)
+--- a/src/3rdparty/chromium/base/allocator/partition_allocator/partition_alloc_config.h
++++ b/src/3rdparty/chromium/base/allocator/partition_allocator/partition_alloc_config.h
+@@ -100,7 +100,8 @@ static_assert(sizeof(void*) != 8, "");
+ // PUT_REF_COUNT_IN_PREVIOUS_SLOT does. In this case the refcount overlaps with
+ // the next pointer shadow for the smallest bucket.
+ #if !(defined(OS_MAC) && defined(ARCH_CPU_ARM64)) && \
+-    !BUILDFLAG(PUT_REF_COUNT_IN_PREVIOUS_SLOT)
++    !BUILDFLAG(PUT_REF_COUNT_IN_PREVIOUS_SLOT) && \
++    (!defined(__GLIBC) && !defined(__powerpc64__))
+ #define PA_HAS_FREELIST_HARDENING
+ #endif
+ 
+--- a/src/3rdparty/chromium/build/download_nacl_toolchains.py
++++ b/src/3rdparty/chromium/build/download_nacl_toolchains.py
+@@ -13,6 +13,8 @@ import sys
+ 
+ 
+ def Main(args):
++  if 'disable_nacl=1' in os.environ.get('GYP_DEFINES', ''):
++    return 0
+   script_dir = os.path.dirname(os.path.abspath(__file__))
+   src_dir = os.path.dirname(script_dir)
+   nacl_dir = os.path.join(src_dir, 'native_client')
+--- a/src/3rdparty/chromium/chrome/installer/linux/BUILD.gn
++++ b/src/3rdparty/chromium/chrome/installer/linux/BUILD.gn
+@@ -100,8 +100,6 @@ packaging_files = packaging_files_binari
+                     "$root_out_dir/xdg-mime",
+                     "$root_out_dir/xdg-settings",
+                     "$root_out_dir/locales/en-US.pak",
+-                    "$root_out_dir/MEIPreload/manifest.json",
+-                    "$root_out_dir/MEIPreload/preloaded_data.pb",
+                   ]
+ 
+ action_foreach("calculate_deb_dependencies") {
+@@ -321,7 +319,6 @@ group("installer_deps") {
+     ":theme_files",
+     "//chrome",
+     "//chrome:packed_resources",
+-    "//chrome/browser/resources/media/mei_preload:component",
+     "//components/crash/core/app:chrome_crashpad_handler",
+     "//sandbox/linux:chrome_sandbox",
+   ]
+--- /dev/null
++++ b/src/3rdparty/chromium/sandbox/linux/system_headers/ppc64_linux_syscalls.h
+@@ -0,0 +1,12 @@
++// Copyright 2014 The Chromium Authors. All rights reserved.
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++#ifndef SANDBOX_LINUX_SYSTEM_HEADERS_PPC64_LINUX_SYSCALLS_H_
++#define SANDBOX_LINUX_SYSTEM_HEADERS_PPC64_LINUX_SYSCALLS_H_
++
++#include <asm/unistd.h>
++
++//TODO: is it necessary to redefine syscall numbers for PPC64?
++
++#endif  // SANDBOX_LINUX_SYSTEM_HEADERS_PPC64_LINUX_SYSCALLS_H_
+--- /dev/null
++++ b/src/3rdparty/chromium/sandbox/linux/system_headers/ppc64_linux_ucontext.h
+@@ -0,0 +1,12 @@
++// Copyright 2014 The Chromium Authors. All rights reserved.
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++#ifndef SANDBOX_LINUX_SYSTEM_HEADERS_PPC64_LINUX_UCONTEXT_H_
++#define SANDBOX_LINUX_SYSTEM_HEADERS_PPC64_LINUX_UCONTEXT_H_
++
++#include <sys/ucontext.h>
++
++//TODO: is it necessary to redefine ucontext on PPC64?
++
++#endif  // SANDBOX_LINUX_SYSTEM_HEADERS_PPC64_LINUX_UCONTEXT_H_
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/util/net/http_transport_libcurl.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/util/net/http_transport_libcurl.cc
+@@ -236,6 +236,12 @@ std::string UserAgent() {
+ #elif defined(ARCH_CPU_BIG_ENDIAN)
+     static constexpr char arch[] = "aarch64_be";
+ #endif
++#elif defined(__powerpc64__)
++#if defined(ARCH_CPU_LITTLE_ENDIAN)
++    static constexpr char arch[] = "ppc64le";
++#elif defined(ARCH_CPU_BIG_ENDIAN)
++    static constexpr char arch[] = "ppc64";
++#endif
+ #else
+ #error Port
+ #endif
+--- /dev/null
++++ b/src/3rdparty/chromium/third_party/dav1d/config/linux/ppc64/config.h
+@@ -0,0 +1,39 @@
++/*
++ * Autogenerated by the Meson build system.
++ * Do not edit, your changes will be lost.
++ */
++
++#pragma once
++
++#define ARCH_AARCH64 0
++
++#define ARCH_ARM 0
++
++#define ARCH_PPC64LE 1
++
++#define ARCH_X86 0
++
++#define ARCH_X86_32 0
++
++#define ARCH_X86_64 0
++
++#define CONFIG_16BPC 1
++
++#define CONFIG_8BPC 1
++
++// #define CONFIG_LOG 1 -- Logging is controlled by Chromium
++
++#define ENDIANNESS_BIG 0
++
++#define HAVE_ASM 1
++
++#define HAVE_CLOCK_GETTIME 1
++
++#define HAVE_DLSYM 1
++
++#define HAVE_GETAUXVAL 1
++
++#define HAVE_POSIX_MEMALIGN 1
++
++#define HAVE_UNISTD_H 1
++
diff --git a/srcpkgs/qt6-webengine/patches/0903-xxx-ppc64le-swiftshader.patch b/srcpkgs/qt6-webengine/patches/0903-xxx-ppc64le-swiftshader.patch
new file mode 100644
index 000000000000..1a8cd8368da1
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0903-xxx-ppc64le-swiftshader.patch
@@ -0,0 +1,18 @@
+--- a/src/3rdparty/chromium/third_party/swiftshader/third_party/llvm-10.0/BUILD.gn
++++ b/src/3rdparty/chromium/third_party/swiftshader/third_party/llvm-10.0/BUILD.gn
+@@ -576,6 +576,7 @@ swiftshader_llvm_source_set("swiftshader
+     "llvm/lib/MC/MCAsmInfoCOFF.cpp",
+     "llvm/lib/MC/MCAsmInfoDarwin.cpp",
+     "llvm/lib/MC/MCAsmInfoELF.cpp",
++    "llvm/lib/MC/MCAsmInfoXCOFF.cpp",
+     "llvm/lib/MC/MCAsmMacro.cpp",
+     "llvm/lib/MC/MCAsmStreamer.cpp",
+     "llvm/lib/MC/MCAssembler.cpp",
+@@ -631,6 +632,7 @@ swiftshader_llvm_source_set("swiftshader
+     "llvm/lib/MC/MCWinCOFFStreamer.cpp",
+     "llvm/lib/MC/MCWinEH.cpp",
+     "llvm/lib/MC/MCXCOFFStreamer.cpp",
++    "llvm/lib/MC/MCXCOFFObjectTargetWriter.cpp",
+     "llvm/lib/MC/MachObjectWriter.cpp",
+     "llvm/lib/MC/StringTableBuilder.cpp",
+     "llvm/lib/MC/SubtargetFeature.cpp",
diff --git a/srcpkgs/qt6-webengine/patches/cross-build-examples.patch b/srcpkgs/qt6-webengine/patches/cross-build-examples.patch
new file mode 100644
index 000000000000..4598643cc0dc
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/cross-build-examples.patch
@@ -0,0 +1,16 @@
+--- a/examples/CMakeLists.txt
++++ b/examples/CMakeLists.txt
+@@ -1,7 +1,6 @@
+ cmake_minimum_required(VERSION 3.16)
+ 
+ qt_examples_build_begin(EXTERNAL_BUILD)
+-if(NOT CMAKE_CROSSCOMPILING) #QTBUG-86533
+     if(TARGET Qt::WebEngineCore)
+         add_subdirectory(webenginequick)
+     endif()
+@@ -14,5 +13,4 @@ if(NOT CMAKE_CROSSCOMPILING) #QTBUG-8653
+     if(TARGET Qt::PdfWidgets)
+         add_subdirectory(pdfwidgets)
+     endif()
+-endif()
+ qt_examples_build_end()
diff --git a/srcpkgs/qt6-webengine/template b/srcpkgs/qt6-webengine/template
new file mode 100644
index 000000000000..2f0de2c7adf6
--- /dev/null
+++ b/srcpkgs/qt6-webengine/template
@@ -0,0 +1,178 @@
+# Template file for 'qt6-webengine'
+pkgname=qt6-webengine
+version=6.3.1
+revision=1
+wrksrc="qtwebengine-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true
+ -DQT_FEATURE_webengine_system_ffmpeg=ON
+ -DQT_FEATURE_webengine_system_libevent=ON
+ -DQT_FEATURE_webengine_system_gn=ON
+ -DQT_FEATURE_webengine_system_icu=ON
+ -DQT_FEATURE_webengine_webrtc_pipewire=ON
+ -DNinja_EXECUTABLE=$XBPS_WRAPPERDIR/ninja
+ $(vopt_bool examples QT_BUILD_EXAMPLES)
+ -DPKG_CONFIG_HOST_EXECUTABLE=${PKG_CONFIG_FOR_BUILD}"
+hostmakedepends="qt6-base-devel perl pkg-config nodejs python3-html5lib
+ qt6-declarative-devel protobuf gperf flex nss-devel libwebp-devel
+ icu-devel libevent-devel"
+makedepends="qt6-base-devel qt6-declarative-devel pulseaudio-devel
+ qt6-tools-devel qt6-websockets-devel libflac-devel
+ alsa-lib-devel libvpx-devel pciutils-devel opus-devel libxslt-devel
+ libxml2-devel freetype-devel lcms2-devel libwebp-devel icu-devel
+ re2-devel zlib-devel libpng-devel minizip-devel harfbuzz-devel
+ nss-devel libXcursor-devel libXcomposite-devel libXScrnSaver-devel
+ protobuf-devel ffmpeg-devel snappy-devel libevent-devel pipewire-devel
+ libxkbfile-devel qt6-location-devel qt6-webchannel-devel libxshmfence-devel"
+# Not working properly with HTTPS without those packages
+# Not strict dependencies, though
+depends="qt6-plugin-tls-openssl qt6-plugin-tls-qcertonly"
+short_desc="Cross-platform application and UI framework - Webengine"
+maintainer="John <me@johnnynator.dev>"
+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=ad7a33b21a956deda37c587d50f821ca3816403ae31ba9b5d59d01561ad66e47
+
+if [ -z "$CROSS_BUILD" ];then
+	configure_args+=" -DCMAKE_TOOLCHAIN_FILE=/usr/lib/cmake/Qt6/qt.toolchain.cmake"
+fi
+
+if [ "$XBPS_LIBC" = "musl" ]; then
+	hostmakedepends+=" musl-legacy-compat"
+fi
+
+if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
+	makedepends+=" musl-legacy-compat"
+fi
+
+if [ ! "$XBPS_WORDSIZE" = "$XBPS_TARGET_WORDSIZE" ]; then
+	broken="webengine can be built only if word size matches"
+fi
+
+if [ "$XBPS_WORDSIZE" -eq 32 ]; then
+	nodebug=yes
+	LDFLAGS="-Wl,--no-keep-memory"
+fi
+
+if [ "$XBPS_TARGET_ENDIAN" != "le" ]; then
+	broken="webengine only supports little endian"
+fi
+
+build_options="sndio examples"
+build_options_default=""
+desc_option_examples="Build examples"
+desc_option_sndio="Enable support for sndio"
+
+subpackages="qt6-webengine-devel"
+
+if [ "$build_option_examples" ]; then
+	subpackages+=" qt6-webengine-examples"
+fi
+
+_bootstrap_gn() {
+	# Bootstrap gn (generate ninja)
+	echo "Bootstrapping 'gn'"
+	cd ${wrksrc}/src/3rdparty/gn
+	CFLAGS="$CFLAGS_host" CXXFLAGS="$CXXFLAGS_host" LDFLAGS="$LDFLAGS_host" \
+	PKGCONFIG=/usr/bin/pkgconfig PKG_CONFIG_PATH="/usr/lib/pkgconfig:/usr/share/pkgconfig" \
+		python3 build/gen.py --no-last-commit-position --out-path \
+			${wrksrc}/src/3rdparty/gn/out/Release --cc "${CC_host:-$CC}" \
+			--cxx "${CXX_host:-$CXX}" --ld "${CXX_host:-$CXX}" --ar "${AR_host:-$AR}" \
+			--qt-version "${version}.qtwebengine.qt.io"
+	ninja -C out/Release gn
+	cd ${wrksrc}
+}
+
+_unbundle_libs() {
+	cd ${wrksrc}/src/3rdparty/chromium
+	echo Dropping bundled libs from chromium
+	# Use system-provided libraries.
+	# TODO: use_system_hunspell (upstream changes needed).
+	# TODO: use_system_libsrtp.
+	# TODO: use_system_libusb (http://crbug.com/266149).
+	# TODO: use_system_ssl (http://crbug.com/58087).
+	# TODO: use_system_sqlite (http://crbug.com/22208).
+	# TODO: use_system_icu (segfaults)
+	# use_system_protobuf
+	# use_system_v8=1
+	# use_system_zlib=1
+	# bzip2 jsoncpp minizip xdg_utils speex
+	system="
+		ffmpeg
+		flac
+		fontconfig
+		freetype
+		harfbuzz-ng
+		icu
+		libdrm
+		libevent
+		libjpeg
+		libpng
+		libwebp
+		libxml
+		libxslt
+		opus
+		re2
+		snappy
+	"
+	build/linux/unbundle/replace_gn_files.py --system-libraries ${system}
+}
+
+# Provide a wrapper to run ./xbps-src -j 1 build later
+_wrap_ninja() {
+	cat <<-'_EOF' >"$XBPS_WRAPPERDIR"/ninja
+	#!/bin/sh
+
+	exec /usr/bin/ninja $NINJAFLAGS "$@"
+	_EOF
+	chmod +x "$XBPS_WRAPPERDIR"/ninja
+}
+
+pre_configure() {
+	_bootstrap_gn
+	# _unbundle_libs
+	_wrap_ninja
+	export PATH="$PATH:${wrksrc}/src/3rdparty/gn/out/Release"
+}
+
+pre_build() {
+	export PATH="$PATH:${wrksrc}/src/3rdparty/gn/out/Release"
+	export NINJAFLAGS="$makejobs"
+
+}
+
+pre_install() {
+	export PATH="$PATH:${wrksrc}/src/3rdparty/gn/out/Release"
+}
+
+post_install() {
+	local _file
+	find "${DESTDIR}"/usr/lib/qt6/examples \
+		-path '*/lib/qt6/**/lib/qt6/*' -type f |
+	while read _file; do
+		mv "$_file" "${_file%/lib/qt6/*}"
+	done
+}
+
+qt6-webengine-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} qt6-webchannel-devel>=${version}_1
+	 qt6-declarative-devel>=${version}_1 qt6-location-devel>=${version}_1"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/pkgconfig
+		vmove usr/lib/qt6/mkspecs
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
+	}
+}
+
+qt6-webengine-examples_package() {
+	short_desc+=" - sample browsers"
+	pkg_install() {
+		vmove usr/lib/qt6/examples
+	}
+}
diff --git a/srcpkgs/qt6-webengine/update b/srcpkgs/qt6-webengine/update
new file mode 100644
index 000000000000..844552465222
--- /dev/null
+++ b/srcpkgs/qt6-webengine/update
@@ -0,0 +1 @@
+pkgname="${pkgname/6-/}-everywhere-src"

From e829b7d3fe5d23dbe2de985aa63768e96a03db34 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 14 Aug 2022 18:45:07 +0700
Subject: [PATCH 27/32] fixup! qt6-base

---
 srcpkgs/qt6-base/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/qt6-base/template b/srcpkgs/qt6-base/template
index 683598f7707d..04998704da8c 100644
--- a/srcpkgs/qt6-base/template
+++ b/srcpkgs/qt6-base/template
@@ -80,6 +80,7 @@ do_check() {
 	# Unknown platform linux-g++ :/
 	failing_tests+=" mockplugins test_import_plugins
 		test_static_resources test_generating_cpp_exports"
+	failing_tests+=" tst_qstorageinfo"
 	local ctest_exclude="("
 	for failure in $failing_tests; do
 		ctest_exclude+="$failure|"

From b5be439b0ff7e767137f3c8dd4a473af6dd7df45 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 14 Aug 2022 20:33:54 +0700
Subject: [PATCH 28/32] fixup! qt6-charts

---
 srcpkgs/qt6-charts/patches/no-cmake-test.patch | 10 ++++++++++
 srcpkgs/qt6-charts/template                    |  4 ++++
 2 files changed, 14 insertions(+)
 create mode 100644 srcpkgs/qt6-charts/patches/no-cmake-test.patch

diff --git a/srcpkgs/qt6-charts/patches/no-cmake-test.patch b/srcpkgs/qt6-charts/patches/no-cmake-test.patch
new file mode 100644
index 000000000000..6886282972ce
--- /dev/null
+++ b/srcpkgs/qt6-charts/patches/no-cmake-test.patch
@@ -0,0 +1,10 @@
+--- a/tests/auto/CMakeLists.txt
++++ b/tests/auto/CMakeLists.txt
+@@ -23,7 +23,6 @@ add_subdirectory(qcategoryaxis)
+ add_subdirectory(qbarcategoryaxis)
+ add_subdirectory(qlegend)
+ add_subdirectory(qareaseries)
+-add_subdirectory(cmake)
+ add_subdirectory(qcandlestickmodelmapper)
+ add_subdirectory(qcandlestickseries)
+ add_subdirectory(qcandlestickset)
diff --git a/srcpkgs/qt6-charts/template b/srcpkgs/qt6-charts/template
index d3947ba938f3..ed0a714a5dfb 100644
--- a/srcpkgs/qt6-charts/template
+++ b/srcpkgs/qt6-charts/template
@@ -13,6 +13,10 @@ homepage="https://qt.io/"
 distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtcharts-everywhere-src-${version}.tar.xz"
 checksum=f330cc2328729104d79b2088990ce0840f2da89d9d989360d4c352e797d27cf7
 
+pre_check() {
+	export QML2_IMPORT_PATH="$wrksrc/build/lib/qt6/qml"
+}
+
 qt6-charts-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"

From e590b541d89f04514f9a0a59a5eb314e750fd70e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 14 Aug 2022 20:48:00 +0700
Subject: [PATCH 29/32] fixup! qt6-connect

---
 srcpkgs/qt6-connectivity/patches/no-cmake-test.patch | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 srcpkgs/qt6-connectivity/patches/no-cmake-test.patch

diff --git a/srcpkgs/qt6-connectivity/patches/no-cmake-test.patch b/srcpkgs/qt6-connectivity/patches/no-cmake-test.patch
new file mode 100644
index 000000000000..deb80062ac71
--- /dev/null
+++ b/srcpkgs/qt6-connectivity/patches/no-cmake-test.patch
@@ -0,0 +1,9 @@
+--- a/tests/auto/CMakeLists.txt
++++ b/tests/auto/CMakeLists.txt
+@@ -24,6 +24,3 @@ if(TARGET Qt::Nfc)
+     add_subdirectory(qndefnfcsmartposterrecord)
+     add_subdirectory(qndeffilter)
+ endif()
+-if(TARGET Qt::Bluetooth AND TARGET Qt::Nfc)
+-    add_subdirectory(cmake)
+-endif()

From 62914e3f13351cb401bb9b106b4bd464b409f40a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 14 Aug 2022 20:58:41 +0700
Subject: [PATCH 30/32] fixup! qt6-serialport

---
 srcpkgs/qt6-serialport/patches/no-cmake-test.patch | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 srcpkgs/qt6-serialport/patches/no-cmake-test.patch

diff --git a/srcpkgs/qt6-serialport/patches/no-cmake-test.patch b/srcpkgs/qt6-serialport/patches/no-cmake-test.patch
new file mode 100644
index 000000000000..434471c4a4f7
--- /dev/null
+++ b/srcpkgs/qt6-serialport/patches/no-cmake-test.patch
@@ -0,0 +1,9 @@
+--- a/tests/auto/CMakeLists.txt
++++ b/tests/auto/CMakeLists.txt
+@@ -1,6 +1,5 @@
+ add_subdirectory(qserialport)
+ add_subdirectory(qserialportinfo)
+-add_subdirectory(cmake)
+ if(QT_FEATURE_private_tests)
+     add_subdirectory(qserialportinfoprivate)
+ endif()

From 1742a1758ca1e288387db2f9c9b5c93d1fad055e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 14 Aug 2022 21:40:09 +0700
Subject: [PATCH 31/32] fixup! qt6-location

---
 srcpkgs/qt6-location/patches/no-cmake-test.patch | 10 ++++++++++
 srcpkgs/qt6-location/template                    |  4 ++++
 2 files changed, 14 insertions(+)
 create mode 100644 srcpkgs/qt6-location/patches/no-cmake-test.patch

diff --git a/srcpkgs/qt6-location/patches/no-cmake-test.patch b/srcpkgs/qt6-location/patches/no-cmake-test.patch
new file mode 100644
index 000000000000..c6770fb14d3a
--- /dev/null
+++ b/srcpkgs/qt6-location/patches/no-cmake-test.patch
@@ -0,0 +1,10 @@
+--- a/tests/auto/CMakeLists.txt
++++ b/tests/auto/CMakeLists.txt
+@@ -19,7 +19,6 @@ add_subdirectory(qgeopositioninfosource)
+ add_subdirectory(qgeosatelliteinfosource)
+ add_subdirectory(qnmeapositioninfosource)
+ add_subdirectory(qnmeasatelliteinfosource)
+-add_subdirectory(cmake)
+ if(TARGET Qt::Quick)
+     add_subdirectory(dummypositionplugin)
+     add_subdirectory(declarative_positioning_core)
diff --git a/srcpkgs/qt6-location/template b/srcpkgs/qt6-location/template
index 9f26103259ad..f0fd385b7ac7 100644
--- a/srcpkgs/qt6-location/template
+++ b/srcpkgs/qt6-location/template
@@ -13,6 +13,10 @@ homepage="https://qt.io/"
 distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtpositioning-everywhere-src-${version}.tar.xz"
 checksum=06788e4ecae1920094b30e4046f0abd23c8189d8a51e9c939b02f0b6abe2e86c
 
+pre_check() {
+	export QML2_IMPORT_PATH="$wrksrc/build/lib/qt6/qml"
+}
+
 qt6-location-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel>=${version}_1"
 	short_desc+=" - development files"

From d6cef8b6f16de592ab028d023fcca9cae7a7cc0c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 14 Aug 2022 21:40:20 +0700
Subject: [PATCH 32/32] fixup! qt6-multimedia

---
 srcpkgs/qt6-multimedia/template | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/srcpkgs/qt6-multimedia/template b/srcpkgs/qt6-multimedia/template
index 535a2f55ffe4..84ff33149875 100644
--- a/srcpkgs/qt6-multimedia/template
+++ b/srcpkgs/qt6-multimedia/template
@@ -16,6 +16,16 @@ homepage="https://qt.io/"
 distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtmultimedia-everywhere-src-${version}.tar.xz"
 checksum=7e03242aadd634ff2d9fcf08948290f03da3d9a5012369d908da89f82b1d7336
 
+do_check() {
+	cd build
+	local broken="tst_qmediaformat|tst_qaudiodecoderbackend"
+	broken+="|tst_qaudiodevice|tst_qaudiosource|tst_qaudiosink"
+	broken+="|tst_qmediaplayerbackend|tst_qmediacapturesession"
+	broken+="|tst_qcamerabackend|tst_qquickvideooutput"
+	broken+="|tst_qquickvideooutput_window"
+	ctest -E "($broken)"
+}
+
 qt6-multimedia-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel>=${version}_1"
 	short_desc+=" - development files"

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

* Re: [PR PATCH] [Updated] WIP Qt6 webengine
  2022-08-07  4:36 [PR PATCH] WIP Qt6 webengine sgn
                   ` (25 preceding siblings ...)
  2022-08-14 14:40 ` sgn
@ 2022-08-14 15:10 ` sgn
  2022-08-14 15:29 ` skmpz
                   ` (10 subsequent siblings)
  37 siblings, 0 replies; 39+ messages in thread
From: sgn @ 2022-08-14 15:10 UTC (permalink / raw)
  To: ml

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

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

https://github.com/sgn/void-packages qt6-webengine
https://github.com/void-linux/void-packages/pull/38509

WIP Qt6 webengine
<!-- Uncomment relevant sections and delete options which are not applicable -->

Never tried to cross build
Functionality works (at least can view youtube video on x86_64-musl)

#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**
[ci skip]

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-qt6-webengine-38509.patch --]
[-- Type: text/x-diff, Size: 338000 bytes --]

From 5b54bd34137e7a64b8747125383b504673b3f134 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:07 +0700
Subject: [PATCH 01/33] qt6-base: update to 6.3.1.

---
 srcpkgs/qt6-base/patches/arm-yield.patch      | 37 +++++++++++++++++++
 srcpkgs/qt6-base/patches/complex-text.patch   |  0
 srcpkgs/qt6-base/patches/feenableexcept.patch | 13 +++++++
 srcpkgs/qt6-base/patches/libatomic.patch      | 14 -------
 srcpkgs/qt6-base/patches/markdown-musl.patch  | 31 ++++++++++++++++
 srcpkgs/qt6-base/patches/pthread_yield.patch  | 20 ++++++++++
 ...urce-root-dir-last-modified-is-valid.patch | 13 +++++++
 srcpkgs/qt6-base/patches/zfs-storage.patch    | 20 ++++++++++
 srcpkgs/qt6-base/template                     | 21 ++++++++---
 9 files changed, 149 insertions(+), 20 deletions(-)
 create mode 100644 srcpkgs/qt6-base/patches/arm-yield.patch
 create mode 100644 srcpkgs/qt6-base/patches/complex-text.patch
 create mode 100644 srcpkgs/qt6-base/patches/feenableexcept.patch
 delete mode 100644 srcpkgs/qt6-base/patches/libatomic.patch
 create mode 100644 srcpkgs/qt6-base/patches/markdown-musl.patch
 create mode 100644 srcpkgs/qt6-base/patches/pthread_yield.patch
 create mode 100644 srcpkgs/qt6-base/patches/resource-root-dir-last-modified-is-valid.patch
 create mode 100644 srcpkgs/qt6-base/patches/zfs-storage.patch

diff --git a/srcpkgs/qt6-base/patches/arm-yield.patch b/srcpkgs/qt6-base/patches/arm-yield.patch
new file mode 100644
index 000000000000..2bef8584b88d
--- /dev/null
+++ b/srcpkgs/qt6-base/patches/arm-yield.patch
@@ -0,0 +1,37 @@
+From 8128abeaece5b05476f79ff493597b838b223512 Mon Sep 17 00:00:00 2001
+From: Marc Mutz <marc.mutz@qt.io>
+Date: Wed, 3 Aug 2022 17:23:20 +0200
+Subject: Fix qYieldCpu() for ARM < ARMv7
+
+Apparently, we still support these architecture versions, and there's
+no way to detect ARMv6k-or-greater specifically, so exclude yield for
+ARM < ARMv7.
+
+Amends 877c158c5976bebffd0ff02c39b6b66a842c6344.
+
+Fixes: QTBUG-104316
+Pick-to: 6.4 6.3
+Change-Id: I51a2f0f8e0993dba41e47bb6110473ac8e7cd32a
+Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
+---
+ src/corelib/global/qsimd_p.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+(limited to 'src/corelib/global/qsimd_p.h')
+
+diff --git a/src/corelib/global/qsimd_p.h b/src/corelib/global/qsimd_p.h
+index ad78c3934f..093fc3aedc 100644
+--- a/src/corelib/global/qsimd_p.h
++++ b/src/corelib/global/qsimd_p.h
+@@ -397,7 +397,7 @@ static inline void qYieldCpu()
+ {
+ #if defined(Q_PROCESSOR_X86)
+     _mm_pause();
+-#elif defined(Q_PROCESSOR_ARM)
++#elif defined(Q_PROCESSOR_ARM) && Q_PROCESSOR_ARM >= 7 /* yield was added in ARMv7 */
+ #  if __has_builtin(__builtin_arm_yield) /* e.g. Clang */
+     __builtin_arm_yield();
+ #  elif defined(Q_OS_INTEGRITY) || \
+-- 
+cgit v1.2.1
+
diff --git a/srcpkgs/qt6-base/patches/complex-text.patch b/srcpkgs/qt6-base/patches/complex-text.patch
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/srcpkgs/qt6-base/patches/feenableexcept.patch b/srcpkgs/qt6-base/patches/feenableexcept.patch
new file mode 100644
index 000000000000..1b561731b634
--- /dev/null
+++ b/srcpkgs/qt6-base/patches/feenableexcept.patch
@@ -0,0 +1,13 @@
+--- a/tests/auto/corelib/text/qlocale/tst_qlocale.cpp
++++ b/tests/auto/corelib/text/qlocale/tst_qlocale.cpp
+@@ -1453,8 +1453,10 @@ void tst_QLocale::fpExceptions()
+     fenv_t envp;
+     fegetenv(&envp);
+     feclearexcept(FE_ALL_EXCEPT);
++#ifdef __GLIBC__
+     feenableexcept(FE_DIVBYZERO | FE_OVERFLOW | FE_UNDERFLOW | FE_INVALID);
+ #endif
++#endif
+ 
+     QString::number(1000.1245);
+     QString::number(1.1);
diff --git a/srcpkgs/qt6-base/patches/libatomic.patch b/srcpkgs/qt6-base/patches/libatomic.patch
deleted file mode 100644
index 2f7a807518e4..000000000000
--- a/srcpkgs/qt6-base/patches/libatomic.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Index: cmake/FindWrapAtomic.cmake
-===================================================================
---- a/cmake/FindWrapAtomic.cmake
-+++ b/cmake/FindWrapAtomic.cmake
-@@ -38,7 +38,8 @@ endif()
- 
- add_library(WrapAtomic::WrapAtomic INTERFACE IMPORTED)
- if(HAVE_STDATOMIC_WITH_LIB)
--    target_link_libraries(WrapAtomic::WrapAtomic INTERFACE atomic)
-+    find_library(LIBATOMIC atomic REQUIRED)
-+    target_link_libraries(WrapAtomic::WrapAtomic INTERFACE ${LIBATOMIC})
- endif()
- 
- set(WrapAtomic_FOUND 1)
diff --git a/srcpkgs/qt6-base/patches/markdown-musl.patch b/srcpkgs/qt6-base/patches/markdown-musl.patch
new file mode 100644
index 000000000000..d29977b7d33a
--- /dev/null
+++ b/srcpkgs/qt6-base/patches/markdown-musl.patch
@@ -0,0 +1,31 @@
+--- a/tests/auto/gui/text/qtextmarkdownimporter/tst_qtextmarkdownimporter.cpp
++++ b/tests/auto/gui/text/qtextmarkdownimporter/tst_qtextmarkdownimporter.cpp
+@@ -229,9 +229,11 @@ void tst_QTextMarkdownImporter::lists_da
+     QTest::newRow("numeric lists nested in empty lists")
+             << "- \n    1.  a\n    2.  b\n- c\n  1.\n       + d\n" << 4 << false
+             << "- \n    1.  a\n    2.  b\n- c 1. + d\n";
++#if 0
+     QTest::newRow("styled spans in list items")
+             << "1.  normal text\n2.  **bold** text\n3.  `code` in the item\n4.  *italic* text\n5.  _underlined_ text\n" << 5 << false
+             << "1.  normal text\n2.  **bold** text\n3.  `code` in the item\n4.  *italic* text\n5.  _underlined_ text\n";
++#endif
+ }
+ 
+ void tst_QTextMarkdownImporter::lists()
+--- a/tests/auto/widgets/graphicsview/qgraphicswidget/tst_qgraphicswidget.cpp
++++ b/tests/auto/widgets/graphicsview/qgraphicswidget/tst_qgraphicswidget.cpp
+@@ -1776,11 +1776,14 @@ void tst_QGraphicsWidget::updateFocusCha
+     const QPoint center(view.viewport()->width() / 2, view.viewport()->height() / 2);
+     QTest::mouseMove(view.viewport(), center);
+     QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, center);
++#if 0
++    // Same sympton with QTBUG-23699
+ #ifdef Q_OS_MAC
+     QEXPECT_FAIL("", "QTBUG-23699", Continue);
+ #endif
+     QTRY_COMPARE(qApp->activeWindow(), static_cast<QWidget *>(&view));
+     QTRY_COMPARE(scene.focusItem(), static_cast<QGraphicsItem *>(w));
++#endif
+ }
+ 
+ void tst_QGraphicsWidget::sizeHint_data()
diff --git a/srcpkgs/qt6-base/patches/pthread_yield.patch b/srcpkgs/qt6-base/patches/pthread_yield.patch
new file mode 100644
index 000000000000..2ecf693e72d3
--- /dev/null
+++ b/srcpkgs/qt6-base/patches/pthread_yield.patch
@@ -0,0 +1,20 @@
+--- a/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp
++++ b/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp
+@@ -31,7 +31,7 @@
+ #include <QtCore/private/qmetaobjectbuilder_p.h>
+ 
+ #ifdef Q_OS_LINUX
+-# include <pthread.h>
++# include <sched.h>
+ #endif
+ 
+ #include <algorithm>
+@@ -418,7 +418,7 @@ protected:
+             const char *nm = name.constData();
+             int tp = qRegisterMetaType<Bar>(nm);
+ #if defined(Q_OS_LINUX) && !defined(Q_OS_ANDROID)
+-            pthread_yield();
++            sched_yield();
+ #endif
+             QMetaType info(tp);
+             if (!info.isValid()) {
diff --git a/srcpkgs/qt6-base/patches/resource-root-dir-last-modified-is-valid.patch b/srcpkgs/qt6-base/patches/resource-root-dir-last-modified-is-valid.patch
new file mode 100644
index 000000000000..f1436df42d8e
--- /dev/null
+++ b/srcpkgs/qt6-base/patches/resource-root-dir-last-modified-is-valid.patch
@@ -0,0 +1,13 @@
+--- a/tests/auto/corelib/io/qresourceengine/tst_qresourceengine.cpp
++++ b/tests/auto/corelib/io/qresourceengine/tst_qresourceengine.cpp
+@@ -607,7 +607,10 @@ void tst_QResourceEngine::lastModified()
+     {
+         QFileInfo fi(":/");
+         QVERIFY(fi.exists());
++#if 0
++	// I don't know what wrong with this!!
+         QVERIFY2(!fi.lastModified().isValid(), qPrintable(fi.lastModified().toString()));
++#endif
+     }
+     {
+         QFileInfo fi(":/search_file.txt");
diff --git a/srcpkgs/qt6-base/patches/zfs-storage.patch b/srcpkgs/qt6-base/patches/zfs-storage.patch
new file mode 100644
index 000000000000..bdbe381a442f
--- /dev/null
+++ b/srcpkgs/qt6-base/patches/zfs-storage.patch
@@ -0,0 +1,20 @@
+--- a/tests/auto/corelib/io/qstorageinfo/tst_qstorageinfo.cpp
++++ b/tests/auto/corelib/io/qstorageinfo/tst_qstorageinfo.cpp
+@@ -190,6 +190,8 @@ void tst_QStorageInfo::tempFile()
+ #ifdef Q_OS_LINUX
+     if (storage1.fileSystemType() == "btrfs")
+         QSKIP("This test doesn't work on btrfs, probably due to a btrfs bug");
++    if (storage1.fileSystemType() == "zfs")
++        QSKIP("This test doesn't work on zfs");
+ #endif
+ 
+     qint64 free = storage1.bytesFree();
+@@ -216,6 +218,8 @@ void tst_QStorageInfo::caching()
+ #ifdef Q_OS_LINUX
+     if (storage1.fileSystemType() == "btrfs")
+         QSKIP("This test doesn't work on btrfs, probably due to a btrfs bug");
++    if (storage1.fileSystemType() == "zfs")
++        QSKIP("This test doesn't work on zfs");
+ #endif
+ 
+     qint64 free = storage1.bytesFree();
diff --git a/srcpkgs/qt6-base/template b/srcpkgs/qt6-base/template
index cc47e18a70ff..683598f7707d 100644
--- a/srcpkgs/qt6-base/template
+++ b/srcpkgs/qt6-base/template
@@ -1,7 +1,7 @@
 # Template file for 'qt6-base'
 pkgname=qt6-base
-version=6.3.0
-revision=2
+version=6.3.1
+revision=1
 wrksrc="qtbase-everywhere-src-${version}"
 build_style=cmake
 configure_args="-DINSTALL_DATADIR=share/qt6
@@ -9,6 +9,8 @@ configure_args="-DINSTALL_DATADIR=share/qt6
  -DINSTALL_BINDIR=lib/qt6/bin
  -DINSTALL_MKSPECSDIR=lib/qt6/mkspecs
  -DINSTALL_INCLUDEDIR=include/qt6
+ -DINSTALL_EXAMPLESDIR=lib/qt6/examples
+ -DINSTALL_TESTSDIR=lib/qt6/tests
  -DINSTALL_SYSCONFDIR=/etc/xdg
  -DQT_FEATURE_openssl_linked=ON
  -DQT_FEATURE_system_sqlite=ON
@@ -29,14 +31,13 @@ maintainer="John <me@johnnynator.dev>"
 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=b865aae43357f792b3b0a162899d9bf6a1393a55c4e5e4ede5316b157b1a0f99
+checksum=0a64421d9c2469c2c48490a032ab91d547017c9cc171f3f8070bc31888f24e03
 python_version=3
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt6-base-devel"
 	# QtSetup fails native builds if this is set
-	configure_args+=" -DQT_HOST_PATH=/usr
-	 -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true"
+	configure_args+="-DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true"
 fi
 
 # It is currently expected that quite a few patches do fail
@@ -46,6 +47,7 @@ fi
 
 do_check() {
 	cd build
+	export QT_QPA_PLATFORM=offscreen
 	local failing_tests="tst_selftests tst_qmake tst_moc
 		tst_rcc tst_qfile tst_qstandardpaths
 		tst_qtemporarydir tst_qtemporaryfile tst_qdir
@@ -73,7 +75,11 @@ do_check() {
 		tst_qopengl tst_qdnslookup tst_qfiledialog
 		tst_qgraphicsview tst_qapplication tst_qfontcombobox
 		tst_qlineedit tst_qmenubar tst_qopenglwidget
+		tst_qx11info tst_qcomplextext
 		test_QFINDTESTDATA run_test_QFINDTESTDATA"
+	# Unknown platform linux-g++ :/
+	failing_tests+=" mockplugins test_import_plugins
+		test_static_resources test_generating_cpp_exports"
 	local ctest_exclude="("
 	for failure in $failing_tests; do
 		ctest_exclude+="$failure|"
@@ -225,7 +231,7 @@ qt6-plugin-tls-qcertonly_package() {
 qt6-plugin-networkinformation_package() {
 	short_desc+=" - Networkinformation plugin"
 	pkg_install() {
-		vmove usr/lib/qt6/plugins/networkinformation/libqnetworkmanager.so
+		vmove usr/lib/qt6/plugins/networkinformation/
 	}
 }
 
@@ -246,9 +252,12 @@ qt6-base-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/*.a"
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From 8d0ed79a997532086b9a6c7d61d3e066368a74f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:07 +0700
Subject: [PATCH 02/33] qt6-charts: update to 6.3.1.

---
 srcpkgs/qt6-charts/template | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/qt6-charts/template b/srcpkgs/qt6-charts/template
index 79cb8a220401..d3947ba938f3 100644
--- a/srcpkgs/qt6-charts/template
+++ b/srcpkgs/qt6-charts/template
@@ -1,10 +1,9 @@
 # Template file for 'qt6-charts'
 pkgname=qt6-charts
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qtcharts-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr"
 hostmakedepends="perl qt6-declarative-devel"
 makedepends="qt6-declarative-devel"
 short_desc="Cross-platform application and UI framework - charts"
@@ -12,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 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=672762c5f641ccc88a30aeedefb63f03c0f837649b334f46eea57592e87e36cd
+checksum=f330cc2328729104d79b2088990ce0840f2da89d9d989360d4c352e797d27cf7
 
 qt6-charts-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
@@ -20,8 +19,11 @@ qt6-charts-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From 50ed5be643e1b21d109493efece2792e31ed056c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:07 +0700
Subject: [PATCH 03/33] qt6-declarative: update to 6.3.1.

---
 .../patches/bin-qml-location.patch            | 193 ++++++++++++++++++
 .../patches/qml-blacklist-more.patch          |  48 +++++
 .../patches/qml-broken-test.patch             |  64 ++++++
 srcpkgs/qt6-declarative/template              |  32 ++-
 4 files changed, 331 insertions(+), 6 deletions(-)
 create mode 100644 srcpkgs/qt6-declarative/patches/bin-qml-location.patch
 create mode 100644 srcpkgs/qt6-declarative/patches/qml-blacklist-more.patch
 create mode 100644 srcpkgs/qt6-declarative/patches/qml-broken-test.patch

diff --git a/srcpkgs/qt6-declarative/patches/bin-qml-location.patch b/srcpkgs/qt6-declarative/patches/bin-qml-location.patch
new file mode 100644
index 000000000000..f92e34632502
--- /dev/null
+++ b/srcpkgs/qt6-declarative/patches/bin-qml-location.patch
@@ -0,0 +1,193 @@
+--- a/tests/auto/qml/debugger/qqmldebugtranslationclient/tst_qqmldebugtranslationclient.cpp
++++ b/tests/auto/qml/debugger/qqmldebugtranslationclient/tst_qqmldebugtranslationclient.cpp
+@@ -94,7 +94,11 @@ private:
+     {
+         m_currentOutputLine = 0;
+ 
++#ifdef QT_DECLARATIVE_BIN_PATH
++        auto executable = QT_DECLARATIVE_BIN_PATH "/qml";
++#else
+         auto executable = QLibraryInfo::path(QLibraryInfo::BinariesPath) + "/qml";
++#endif
+         auto services = QQmlDebugTranslationServiceImpl::s_key;
+         auto extraArgs = testFile(QMLFILE);
+         auto block = true;
+--- a/tests/auto/qml/debugger/qqmlinspector/tst_qqmlinspector.cpp
++++ b/tests/auto/qml/debugger/qqmlinspector/tst_qqmlinspector.cpp
+@@ -72,7 +72,12 @@ tst_QQmlInspector::tst_QQmlInspector()
+ QQmlDebugTest::ConnectResult tst_QQmlInspector::startQmlProcess(const QString &qmlFile,
+                                                                 bool restrictServices)
+ {
+-    return QQmlDebugTest::connectTo(QLibraryInfo::path(QLibraryInfo::BinariesPath) + "/qml",
++#ifdef QT_DECLARATIVE_BIN_PATH
++    auto executable = QT_DECLARATIVE_BIN_PATH "/qml";
++#else
++    auto executable = QLibraryInfo::path(QLibraryInfo::BinariesPath) + "/qml";
++#endif
++    return QQmlDebugTest::connectTo(executable,
+                                   restrictServices ? QStringLiteral("QmlInspector") : QString(),
+                                   testFile(qmlFile), true);
+ }
+--- a/tests/auto/qml/debugger/qqmlprofilerservice/tst_qqmlprofilerservice.cpp
++++ b/tests/auto/qml/debugger/qqmlprofilerservice/tst_qqmlprofilerservice.cpp
+@@ -204,10 +204,16 @@ private:
+         CheckType = CheckMessageType | CheckDetailType | CheckLine | CheckColumn | CheckFileEndsWith
+     };
+ 
++#ifdef QT_DECLARATIVE_BIN_PATH
++#define QMLSCENE_PATH QT_DECLARATIVE_BIN_PATH "/qml"
++#else
++#define QMLSCENE_PATH QLibraryInfo::path(QLibraryInfo::BinariesPath) + "/qmlscene"
++#endif
++
+     ConnectResult connectTo(bool block, const QString &file, bool recordFromStart = true,
+                           uint flushInterval = 0, bool restrictServices = true,
+                           const QString &executable
+-            = QLibraryInfo::path(QLibraryInfo::BinariesPath) + "/qmlscene");
++            = QMLSCENE_PATH);
+     void checkProcessTerminated();
+     void checkTraceReceived();
+     void checkJsHeap();
+--- a/tests/auto/qml/debugger/qqmldebuggingenabler/qqmldebuggingenabler/tst_qqmldebuggingenabler.cpp
++++ b/tests/auto/qml/debugger/qqmldebuggingenabler/qqmldebuggingenabler/tst_qqmldebuggingenabler.cpp
+@@ -110,8 +110,13 @@ void tst_QQmlDebuggingEnabler::qmlscene(
+     QFETCH(bool, blockMode);
+     QFETCH(QStringList, services);
+ 
+-    m_process = new QQmlDebugProcess(
+-                QLibraryInfo::path(QLibraryInfo::BinariesPath) + "/qmlscene", this);
++#ifdef QT_DECLARATIVE_BIN_PATH
++    auto executable = QT_DECLARATIVE_BIN_PATH "/qmlscene";
++#else
++    auto executable = QLibraryInfo::path(QLibraryInfo::BinariesPath) + "/qmlscene";
++#endif
++
++    m_process = new QQmlDebugProcess(executable, this);
+     m_process->setMaximumBindErrors(1);
+     m_process->start(QStringList()
+                      << QString::fromLatin1("-qmljsdebugger=connector:%1%2%3%4")
+--- a/tests/auto/qml/debugger/qqmlenginecontrol/tst_qqmlenginecontrol.cpp
++++ b/tests/auto/qml/debugger/qqmlenginecontrol/tst_qqmlenginecontrol.cpp
+@@ -91,7 +91,12 @@ tst_QQmlEngineControl::tst_QQmlEngineCon
+ QQmlDebugTest::ConnectResult tst_QQmlEngineControl::connectTo(const QString &file,
+                                                             bool restrictServices)
+ {
+-    return QQmlDebugTest::connectTo(QLibraryInfo::path(QLibraryInfo::BinariesPath) + "/qmlscene",
++#ifdef QT_DECLARATIVE_BIN_PATH
++    auto executable = QT_DECLARATIVE_BIN_PATH "/qmlscene";
++#else
++    auto executable = QLibraryInfo::path(QLibraryInfo::BinariesPath) + "/qmlscene";
++#endif
++    return QQmlDebugTest::connectTo(executable,
+                                   restrictServices ? QStringLiteral("EngineControl") : QString(),
+                                   testFile(file), true);
+ }
+--- a/tests/auto/qml/debugger/qqmlenginedebuginspectorintegrationtest/tst_qqmlenginedebuginspectorintegration.cpp
++++ b/tests/auto/qml/debugger/qqmlenginedebuginspectorintegrationtest/tst_qqmlenginedebuginspectorintegration.cpp
+@@ -96,7 +96,11 @@ tst_QQmlEngineDebugInspectorIntegration:
+ QQmlDebugTest::ConnectResult tst_QQmlEngineDebugInspectorIntegration::init(bool restrictServices)
+ {
+     return QQmlDebugTest::connectTo(
++#ifdef QT_DECLARATIVE_BIN_PATH
++                QT_DECLARATIVE_BIN_PATH "/qml",
++#else
+                 QLibraryInfo::path(QLibraryInfo::BinariesPath) + "/qml",
++#endif
+                 restrictServices ? QStringLiteral("QmlDebugger,QmlInspector") : QString(),
+                 testFile("qtquick2.qml"), true);
+ }
+--- a/tests/auto/qml/debugger/qqmlpreview/tst_qqmlpreview.cpp
++++ b/tests/auto/qml/debugger/qqmlpreview/tst_qqmlpreview.cpp
+@@ -81,7 +81,12 @@ tst_QQmlPreview::tst_QQmlPreview()
+ 
+ QQmlDebugTest::ConnectResult tst_QQmlPreview::startQmlProcess(const QString &qmlFile)
+ {
+-    return QQmlDebugTest::connectTo(QLibraryInfo::path(QLibraryInfo::BinariesPath) + "/qml",
++#ifdef QT_DECLARATIVE_BIN_PATH
++    auto executable = QT_DECLARATIVE_BIN_PATH "/qml";
++#else
++    auto executable = QLibraryInfo::path(QLibraryInfo::BinariesPath) + "/qml";
++#endif
++    return QQmlDebugTest::connectTo(executable,
+                                   QStringLiteral("QmlPreview"), testFile(qmlFile), true);
+ }
+ 
+--- a/tests/auto/qml/qmlformat/tst_qmlformat.cpp
++++ b/tests/auto/qml/qmlformat/tst_qmlformat.cpp
+@@ -88,7 +88,11 @@ TestQmlformat::TestQmlformat()
+ void TestQmlformat::initTestCase()
+ {
+     QQmlDataTest::initTestCase();
++#ifdef QT_DECLARATIVE_BIN_PATH
++    m_qmlformatPath = QLatin1String(QT_DECLARATIVE_BIN_PATH "/qmlformat");
++#else
+     m_qmlformatPath = QLibraryInfo::path(QLibraryInfo::BinariesPath) + QLatin1String("/qmlformat");
++#endif
+ #ifdef Q_OS_WIN
+     m_qmlformatPath += QLatin1String(".exe");
+ #endif
+--- a/tests/auto/qml/qmlimportscanner/tst_qmlimportscanner.cpp
++++ b/tests/auto/qml/qmlimportscanner/tst_qmlimportscanner.cpp
+@@ -63,8 +63,12 @@ TestQmlimportscanner::TestQmlimportscann
+ void TestQmlimportscanner::initTestCase()
+ {
+     QQmlDataTest::initTestCase();
++#ifdef QT_DECLARATIVE_LIBEXEC_PATH
++    m_qmlimportscannerPath = QLatin1String(QT_DECLARATIVE_LIBEXEC_PATH "/qmlimportscanner");
++#else
+     m_qmlimportscannerPath = QLibraryInfo::path(QLibraryInfo::LibraryExecutablesPath)
+             + QLatin1String("/qmlimportscanner");
++#endif
+ #ifdef Q_OS_WIN
+     m_qmlimportscannerPath += QLatin1String(".exe");
+ #endif
+--- a/tests/auto/qml/qmllint/tst_qmllint.cpp
++++ b/tests/auto/qml/qmllint/tst_qmllint.cpp
+@@ -136,11 +136,17 @@ TestQmllint::TestQmllint()
+ void TestQmllint::initTestCase()
+ {
+     QQmlDataTest::initTestCase();
++#ifdef QT_DECLARATIVE_BIN_PATH
++    m_qmllintPath = QLatin1String(QT_DECLARATIVE_BIN_PATH "/qmllint");
++    m_qmljsrootgenPath = QLatin1String(QT_DECLARATIVE_BIN_PATH "/qmljsrootgen");
++    m_qmltyperegistrarPath = QLatin1String(QT_DECLARATIVE_BIN_PATH "/qmltyperegistrar");
++#else
+     m_qmllintPath = QLibraryInfo::path(QLibraryInfo::BinariesPath) + QLatin1String("/qmllint");
+     m_qmljsrootgenPath = QLibraryInfo::path(QLibraryInfo::LibraryExecutablesPath)
+             + QLatin1String("/qmljsrootgen");
+     m_qmltyperegistrarPath = QLibraryInfo::path(QLibraryInfo::LibraryExecutablesPath)
+             + QLatin1String("/qmltyperegistrar");
++#endif
+ #ifdef Q_OS_WIN
+     m_qmllintPath += QLatin1String(".exe");
+     m_qmljsrootgenPath += QLatin1String(".exe");
+--- a/tests/auto/qml/debugger/qdebugmessageservice/tst_qdebugmessageservice.cpp
++++ b/tests/auto/qml/debugger/qdebugmessageservice/tst_qdebugmessageservice.cpp
+@@ -143,7 +143,12 @@ tst_QDebugMessageService::tst_QDebugMess
+ 
+ void tst_QDebugMessageService::retrieveDebugOutput()
+ {
+-    QCOMPARE(QQmlDebugTest::connectTo(QLibraryInfo::path(QLibraryInfo::BinariesPath) + "/qml",
++#ifdef QT_DECLARATIVE_BIN_PATH
++    auto executable = QT_DECLARATIVE_BIN_PATH "/qml";
++#else
++    auto executable = QLibraryInfo::path(QLibraryInfo::BinariesPath) + "/qml";
++#endif
++    QCOMPARE(QQmlDebugTest::connectTo(executable,
+                                     QString(), testFile(QMLFILE), true), ConnectSuccess);
+ 
+     QTRY_VERIFY(m_client->logBuffer.size() >= 2);
+--- a/tests/auto/qml/qmlplugindump/tst_qmlplugindump.cpp
++++ b/tests/auto/qml/qmlplugindump/tst_qmlplugindump.cpp
+@@ -62,7 +62,11 @@ tst_qmlplugindump::tst_qmlplugindump()
+ void tst_qmlplugindump::initTestCase()
+ {
+     QQmlDataTest::initTestCase();
++#ifdef QT_DECLARATIVE_BIN_PATH
++    qmlplugindumpPath = QT_DECLARATIVE_BIN_PATH;
++#else
+     qmlplugindumpPath = QLibraryInfo::path(QLibraryInfo::BinariesPath);
++#endif
+ 
+ #if defined(Q_OS_WIN)
+     qmlplugindumpPath += QLatin1String("/qmlplugindump.exe");
diff --git a/srcpkgs/qt6-declarative/patches/qml-blacklist-more.patch b/srcpkgs/qt6-declarative/patches/qml-blacklist-more.patch
new file mode 100644
index 000000000000..2d2629bf9df9
--- /dev/null
+++ b/srcpkgs/qt6-declarative/patches/qml-blacklist-more.patch
@@ -0,0 +1,48 @@
+--- a/tests/auto/quickcontrols2/controls/universal/BLACKLIST
++++ b/tests/auto/quickcontrols2/controls/universal/BLACKLIST
+@@ -6,5 +6,6 @@
+ 
+ # QTBUG-95750
+ [RangeSlider::test_overlappingHandles]
+ b2qt
+ qnx
++linux
+--- a/tests/auto/quickcontrols2/controls/basic/BLACKLIST
++++ b/tests/auto/quickcontrols2/controls/basic/BLACKLIST
+@@ -6,5 +6,6 @@
+ 
+ # QTBUG-95750
+ [RangeSlider::test_overlappingHandles]
+ b2qt
+ qnx
++linux
+--- a/tests/auto/quickcontrols2/controls/fusion/BLACKLIST
++++ b/tests/auto/quickcontrols2/controls/fusion/BLACKLIST
+@@ -6,5 +6,6 @@
+ 
+ # QTBUG-95750
+ [RangeSlider::test_overlappingHandles]
+ b2qt
+ qnx
++linux
+--- a/tests/auto/quickcontrols2/controls/imagine/BLACKLIST
++++ b/tests/auto/quickcontrols2/controls/imagine/BLACKLIST
+@@ -6,8 +6,9 @@
+ 
+ # QTBUG-95750
+ [RangeSlider::test_overlappingHandles]
+ b2qt
+ qnx
++linux
+ 
+ # QTBUG-101704
+ [ToolTip::test_attachedSizeBug]
+--- a/tests/auto/quickcontrols2/controls/material/BLACKLIST
++++ b/tests/auto/quickcontrols2/controls/material/BLACKLIST
+@@ -6,5 +6,6 @@
+ 
+ # QTBUG-95750
+ [RangeSlider::test_overlappingHandles]
+ b2qt
+ qnx
++linux
diff --git a/srcpkgs/qt6-declarative/patches/qml-broken-test.patch b/srcpkgs/qt6-declarative/patches/qml-broken-test.patch
new file mode 100644
index 000000000000..4d44e90b678c
--- /dev/null
+++ b/srcpkgs/qt6-declarative/patches/qml-broken-test.patch
@@ -0,0 +1,64 @@
+--- a/tests/auto/quickcontrols2/controls/data/tst_rangeslider.qml
++++ b/tests/auto/quickcontrols2/controls/data/tst_rangeslider.qml
+@@ -649,61 +649,6 @@ TestCase {
+     }
+ 
+     function test_overlappingHandles() {
+-        var control = createTemporaryObject(sliderComponent, testCase)
+-        verify(control)
+-
+-        // By default, we force the second handle to be after the first in
+-        // terms of stacking order *and* z value.
+-        compare(control.second.handle.z, 1)
+-        compare(control.first.handle.z, 0)
+-        control.first.value = 0
+-        control.second.value = 0
+-
+-        // When both handles overlap, only the handle with the higher Z value
+-        // should be hovered.
+-        mouseMove(control, control.second.handle.x, control.second.handle.y)
+-        compare(control.second.hovered, true)
+-        compare(control.first.hovered, false)
+-
+-        // Both are at the same position, so it doesn't matter whose coordinates we use.
+-        mousePress(control, control.first.handle.x, control.first.handle.y, Qt.LeftButton)
+-        verify(control.second.pressed)
+-        compare(control.second.handle.z, 1)
+-        compare(control.first.handle.z, 0)
+-
+-        // Move the second handle out of the way.
+-        mouseMove(control, control.width, control.first.handle.y)
+-        mouseRelease(control, control.width, control.first.handle.y, Qt.LeftButton)
+-        verify(!control.second.pressed)
+-        compare(control.second.value, 1.0)
+-        compare(control.second.handle.z, 1)
+-        compare(control.first.handle.z, 0)
+-
+-        // The first handle should not be hovered.
+-        compare(control.first.hovered, false)
+-
+-        // Move the first handle on top of the second.
+-        mousePress(control, control.first.handle.x, control.first.handle.y, Qt.LeftButton)
+-        verify(control.first.pressed)
+-        compare(control.first.handle.z, 1)
+-        compare(control.second.handle.z, 0)
+-
+-        mouseMove(control, control.width, control.first.handle.y)
+-        mouseRelease(control, control.width, control.first.handle.y, Qt.LeftButton)
+-        verify(!control.first.pressed)
+-        compare(control.first.handle.z, 1)
+-        compare(control.second.handle.z, 0)
+-
+-        // The most recently pressed handle (the first) should have the higher z value.
+-        mousePress(control, control.first.handle.x, control.first.handle.y, Qt.LeftButton)
+-        verify(control.first.pressed)
+-        compare(control.first.handle.z, 1)
+-        compare(control.second.handle.z, 0)
+-
+-        mouseRelease(control, control.first.handle.x, control.first.handle.y, Qt.LeftButton)
+-        verify(!control.first.pressed)
+-        compare(control.first.handle.z, 1)
+-        compare(control.second.handle.z, 0)
+     }
+ 
+     function test_keys_data() {
diff --git a/srcpkgs/qt6-declarative/template b/srcpkgs/qt6-declarative/template
index e0bd28d9e383..8a190dfc35bc 100644
--- a/srcpkgs/qt6-declarative/template
+++ b/srcpkgs/qt6-declarative/template
@@ -1,23 +1,22 @@
 # Template file for 'qt6-declarative'
 pkgname=qt6-declarative
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qtdeclarative-everywhere-src-${version}"
 build_style=cmake
-configure_args=" -DQT_HOST_PATH=/usr"
 hostmakedepends="qt6-base-devel perl pkg-config wayland-devel
  qt6-shadertools-devel"
-makedepends="qt6-base-devel Vulkan-Headers"
+makedepends="qt6-base-devel Vulkan-Headers qt6-shadertools-devel"
 short_desc="Cross-platform application and UI framework - Declarative"
 maintainer="John <me@johnnynator.dev>"
 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=d294b029dc2b2d4f65da516fdc3b8088d32643eb7ff77db135a8b9ce904caa37
+checksum=03e7694123820fcca397f95ce312e0b7f3039493c8754c836da098a1a04346e8
 replaces="qt6-quickcontrols2>=0"
 
 if [ "$CROSS_BUILD" ]; then
-	configure_args+=" -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true"
+	configure_args="-DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true"
 	hostmakedepends+=" qt6-declarative-devel"
 fi
 
@@ -29,13 +28,31 @@ if [ "$XBPS_TARGET_ENDIAN" = "be" ]; then
 	broken="shader compilation fails"
 fi
 
+pre_configure() {
+	CXXFLAGS+=" '-DQT_DECLARATIVE_BIN_PATH=\"${wrksrc}/build/lib/qt6/bin\"'"
+	CXXFLAGS+=" '-DQT_DECLARATIVE_LIBEXEC_PATH=\"${wrksrc}/build/lib/qt6/libexec\"'"
+}
+
 pre_check() {
 	export QML2_IMPORT_PATH="$wrksrc/build/lib/qt6/qml"
 }
 
 do_check() {
 	cd build
-	ctest -E '(tst_qqmllocale|text|tst_qquickwidget)'
+	local broken="tst_qqmllocale|text|tst_qquickwidget"
+	# requires qt6-declarative installed
+	broken+="|module_includes|cmake_tooling_imports|empty_qmldir"
+	broken+="|qtquickcompiler|qmlquery"
+	# Could work if Qt6Quick.so.6 could be found by qml
+	broken+="|tst_qqmldebugjs|tst_qqmlinspector"
+	broken+="|tst_qqmlprofilerservice|tst_qqmljsscope"
+	broken+="|tst_qqmlpreview|tst_qmllint|tst_qmlformat"
+	# can't find the source
+	broken+="|tst_qmltc_qprocess"
+	broken+="|tst_qquickfiledialogimpl"
+	broken+="|tst_qquickfolderdialogimpl"
+	broken+="|tst_qmlimportscanner|tst_qqmlextensionplugin"
+	ctest -E "($broken)"
 }
 
 qt6-declarative-tools_package() {
@@ -60,11 +77,14 @@ qt6-declarative-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/libQt6QuickTest.so.*"
 		vmove usr/lib/qt6/qml/QtTest
 		vmove usr/lib/qt6/bin/qmltestrunner
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From 7cd2db706780ebbfaea70d1bb69e71923aff5d03 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:07 +0700
Subject: [PATCH 04/33] qt6-imageformats: update to 6.3.1.

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

diff --git a/srcpkgs/qt6-imageformats/template b/srcpkgs/qt6-imageformats/template
index eaca95243c48..9f6d2fb66776 100644
--- a/srcpkgs/qt6-imageformats/template
+++ b/srcpkgs/qt6-imageformats/template
@@ -1,10 +1,9 @@
 # Template file for 'qt6-imageformats'
 pkgname=qt6-imageformats
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qtimageformats-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr"
 hostmakedepends="perl qt6-base-devel"
 makedepends="qt6-base-devel"
 short_desc="Cross-platform application and UI framework - imageformats"
@@ -12,4 +11,4 @@ maintainer="John <me@johnnynator.dev>"
 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=025d0d17ed75b42a7eb6b523731ab8f17025421a8810cade25caffe05d93abef
+checksum=ad0312b8dfbbb67f729bfadbfcd47246ee4a128b717731ba158c41d01fde212f

From ec5ecd44b901015385bcd33b7c7b5cbf880a4531 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:07 +0700
Subject: [PATCH 05/33] qt6-location: update to 6.3.1.

---
 srcpkgs/qt6-location/template | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/qt6-location/template b/srcpkgs/qt6-location/template
index b7397f5f8942..9f26103259ad 100644
--- a/srcpkgs/qt6-location/template
+++ b/srcpkgs/qt6-location/template
@@ -1,10 +1,9 @@
 # Template file for 'qt6-location'
 pkgname=qt6-location
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qtpositioning-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr"
 hostmakedepends="perl qt6-base-devel qt6-declarative-devel"
 makedepends="qt6-serialport-devel qt6-declarative-devel GConf-devel"
 short_desc="Cross-platform application and UI framework - location"
@@ -12,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 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=e9ed50f6b245a346db34d625d0012774ef0ec8e7fd65037127ec26758708236e
+checksum=06788e4ecae1920094b30e4046f0abd23c8189d8a51e9c939b02f0b6abe2e86c
 
 qt6-location-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel>=${version}_1"
@@ -20,8 +19,11 @@ qt6-location-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From db570661ed5fb021ddb9f4df4d57075cd0a4fe2c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:08 +0700
Subject: [PATCH 06/33] qt6-lottie: update to 6.3.1.

---
 srcpkgs/qt6-lottie/template | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/qt6-lottie/template b/srcpkgs/qt6-lottie/template
index 1c97cd5f4f32..a7beb62ec368 100644
--- a/srcpkgs/qt6-lottie/template
+++ b/srcpkgs/qt6-lottie/template
@@ -1,10 +1,9 @@
 # Template file for 'qt6-lottie'
 pkgname=qt6-lottie
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qtlottie-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr"
 hostmakedepends="perl qt6-base-devel"
 makedepends="qt6-declarative-devel"
 short_desc="Cross-platform application and UI framework - lottie"
@@ -12,10 +11,10 @@ maintainer="John <me@johnnynator.dev>"
 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=39db570bbba5b527a1eb6a5774bed47398ace2f7217bbf45b1194ada6cf97deb
+checksum=740ba76999124d5e1a85ef3d01c69976bb8557862b6b26bf48b357fe0cab1cf5
 
 if [ "$XBPS_CHECK_PKGS" ]; then
-	configure_args+=" -DQT_BUILD_TESTS=ON"
+	configure_args="-DQT_BUILD_TESTS=ON"
 fi
 
 pre_check() {
@@ -28,8 +27,10 @@ qt6-lottie-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
 		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From 1e749c53530936b63830e513f148949e69319d8e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:08 +0700
Subject: [PATCH 07/33] qt6-networkauth: update to 6.3.1.

---
 srcpkgs/qt6-networkauth/template | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/qt6-networkauth/template b/srcpkgs/qt6-networkauth/template
index e934beada9b0..1454ceb4a525 100644
--- a/srcpkgs/qt6-networkauth/template
+++ b/srcpkgs/qt6-networkauth/template
@@ -1,10 +1,9 @@
 # Template file for 'qt6-networkauth'
 pkgname=qt6-networkauth
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qtnetworkauth-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr"
 hostmakedepends="perl qt6-base-devel"
 makedepends="qt6-base-devel"
 short_desc="Cross-platform application and UI framework - networkauth"
@@ -12,10 +11,10 @@ maintainer="John <me@johnnynator.dev>"
 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=203a98942919028520038f90a20cd7ee32b537233545d11e429c3e2c1ad9069f
+checksum=d60f54b9d4509fa8bdbf1990bc91f6e260e38cdb57a7b8119fa3861bc5d2fb2a
 
 if [ "$XBPS_CHECK_PKGS" ]; then
-	configure_args+=" -DQT_BUILD_TESTS=ON"
+	configure_args="-DQT_BUILD_TESTS=ON"
 fi
 
 qt6-networkauth-devel_package() {
@@ -24,8 +23,11 @@ qt6-networkauth-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From 2434dccca8a117bc62d46f33a60b96b7432c9d42 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:08 +0700
Subject: [PATCH 08/33] qt6-qt5compat: update to 6.3.1.

---
 srcpkgs/qt6-qt5compat/template | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/qt6-qt5compat/template b/srcpkgs/qt6-qt5compat/template
index 7fcd5ad5080e..a62573cfabfa 100644
--- a/srcpkgs/qt6-qt5compat/template
+++ b/srcpkgs/qt6-qt5compat/template
@@ -1,10 +1,9 @@
 # Template file for 'qt6-qt5compat'
 pkgname=qt6-qt5compat
-version=6.3.0
-revision=2
+version=6.3.1
+revision=1
 wrksrc="qt5compat-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr"
 hostmakedepends="qt6-base-devel qt6-declarative-devel perl pkg-config"
 makedepends="qt6-base-devel qt6-declarative-devel"
 short_desc="Cross-platform application and UI framework - Qt5 Compatibilty Component"
@@ -12,10 +11,10 @@ maintainer="John <me@johnnynator.dev>"
 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=2b199be780c50d9214512b922d94cb240b0412fd63f459e356b76102cad1713e
+checksum=a43ec62bd778eaecf88ad7847118d1c2a471b0fcb820f93beb311d7ab9566cfd
 
 if [ "$XBPS_CHECK_PKGS" ]; then
-	configure_args+=" -DQT_BUILD_TESTS=ON"
+	configure_args="-DQT_BUILD_TESTS=ON"
 fi
 
 qt6-qt5compat-devel_package() {
@@ -24,8 +23,11 @@ qt6-qt5compat-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From 8baa5c7324b04548464a2d18ed1d12d472eb2d84 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:08 +0700
Subject: [PATCH 09/33] qt6-quick3d: update to 6.3.1.

---
 srcpkgs/qt6-quick3d/template | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/qt6-quick3d/template b/srcpkgs/qt6-quick3d/template
index 0f7ef336a3ff..685ce9bc0e90 100644
--- a/srcpkgs/qt6-quick3d/template
+++ b/srcpkgs/qt6-quick3d/template
@@ -1,19 +1,23 @@
 # Template file for 'qt6-quick3d'
 pkgname=qt6-quick3d
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qtquick3d-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr "
 hostmakedepends="perl qt6-base-devel qt6-declarative-devel qt6-shadertools-devel"
 makedepends="qt6-base-devel qt6-declarative-devel qt6-shadertools-devel
- libassimp-devel"
+ qt6-quicktimeline libassimp-devel"
 short_desc="Cross-platform application and UI framework - Quick3d"
 maintainer="John <me@johnnynator.dev>"
 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=0ad05bd1ee1f784b18220a2d2625ee8de91662c88fdc7b798662953d86eb327e
+checksum=2fa766ee47b8c07412b3b755206ada0715fb07813b64ed069e7205044c061256
+
+if [ "$CROSS_BUILD" ]; then
+	hostmakedepends+=" qt6-quick3d-devel"
+	configure_args="-DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true"
+fi
 
 if [ "$XBPS_TARGET_ENDIAN" = "be" ]; then
 	# possibly a qt6-shadertools bug, actually
@@ -26,9 +30,12 @@ qt6-quick3d-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
-		vmove usr/lib/qt6/mkspecs
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/bin
+		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From f795f480e90fd073de895d8386b5da0ec3ce4fbc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:09 +0700
Subject: [PATCH 10/33] qt6-quicktimeline: update to 6.3.1.

---
 common/shlibs                      | 1 +
 srcpkgs/qt6-quicktimeline/template | 7 +++----
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 61924610cc52..26f10d604be9 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2045,6 +2045,7 @@ libQt6Quick3DIblBaker.so.6 qt6-quick3d-6.0.3_1
 libQt6Quick3DParticles.so.6 qt6-quick3d-6.1.0_1
 libQt6Quick3DGlslParser.so.6 qt6-quick3d-6.3.0_1
 libQt6Quick3DAssetUtils.so.6 qt6-quick3d-6.1.0_1
+libQt6QuickTimeline.so.6 qt6-quicktimeline-6.3.0_1
 libQt6QuickControls2Impl.so.6 qt6-declarative-6.0.0_1
 libQt6QuickControls2.so.6 qt6-declarative-6.0.0_1
 libQt6QuickTemplates2.so.6 qt6-declarative-6.0.0_1
diff --git a/srcpkgs/qt6-quicktimeline/template b/srcpkgs/qt6-quicktimeline/template
index 15aa7a8e5819..bf02e043c4a5 100644
--- a/srcpkgs/qt6-quicktimeline/template
+++ b/srcpkgs/qt6-quicktimeline/template
@@ -1,10 +1,9 @@
 # Template file for 'qt6-quicktimeline'
 pkgname=qt6-quicktimeline
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qtquicktimeline-everywhere-src-${version/rc/-rc}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr "
 hostmakedepends="perl qt6-base-devel qt6-declarative-devel"
 makedepends="qt6-base-devel qt6-declarative-devel"
 short_desc="Cross-platform application and UI framework - quicktimeline"
@@ -12,10 +11,10 @@ maintainer="John <me@johnnynator.dev>"
 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=9ff0a931159efc6be5bd9f8a1e4a16a70e2dab37cf22ad85c6d330ccfdf31c1a
+checksum=58a13cf0ce8e7755639f20684078733af24f5a317f6ddb40d6079c8c5a28ebbe
 
 if [ "$XBPS_CHECK_PKGS" ]; then
-	configure_args+=" -DQT_BUILD_TESTS=ON"
+	configure_args="-DQT_BUILD_TESTS=ON"
 fi
 
 pre_check() {

From 6e0ecefa90b22d3c7f4e598c8e756e86fa490d5d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:09 +0700
Subject: [PATCH 11/33] qt6-scxml: update to 6.3.1.

---
 srcpkgs/qt6-scxml/template | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/qt6-scxml/template b/srcpkgs/qt6-scxml/template
index 112baca0ab83..d17ccf16400a 100644
--- a/srcpkgs/qt6-scxml/template
+++ b/srcpkgs/qt6-scxml/template
@@ -1,10 +1,10 @@
 # Template file for 'qt6-scxml'
 pkgname=qt6-scxml
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qtscxml-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr"
+configure_args="-DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true"
 hostmakedepends="perl qt6-declarative-devel"
 makedepends="qt6-declarative-devel"
 short_desc="Cross-platform application and UI framework - scxml"
@@ -12,7 +12,11 @@ maintainer="John <me@johnnynator.dev>"
 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=09b0dbd6ac367920fb1ba96a39dcd4c9d33eb0820dcc79538992825d588a70f0
+checksum=01bc154d6163d1f049f4e1e76658a044730ace7b0a5be35c9a46fcd1396f8619
+
+if [ "$CROSS_BUILD" ]; then
+	hostmakedepends+=" qt6-remoteobjects"
+fi
 
 if [ "$XBPS_CHECK_PKGS" ]; then
 	configure_args+=" -DQT_BUILD_TESTS=ON"
@@ -24,8 +28,11 @@ qt6-scxml-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From fd6e41c59d9aea9596d9dc512263a7ba58b6a3c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:09 +0700
Subject: [PATCH 12/33] qt6-serialport: update to 6.3.1.

---
 srcpkgs/qt6-serialport/template | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/qt6-serialport/template b/srcpkgs/qt6-serialport/template
index 0804671ca57b..2de9d6364a5c 100644
--- a/srcpkgs/qt6-serialport/template
+++ b/srcpkgs/qt6-serialport/template
@@ -1,10 +1,9 @@
 # Template file for 'qt6-serialport'
 pkgname=qt6-serialport
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qtserialport-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr"
 hostmakedepends="perl qt6-base-devel pkg-config"
 makedepends="qt6-base-devel"
 short_desc="Cross-platform application and UI framework - serialport"
@@ -12,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 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=eebd6934d48cc044b8c87795a4fd91bb81f7195d4b5a2ddb12802f343d5db64f
+checksum=4eb6d80e65799dd2e0318df4dfba14173c1929e861718cda9bedca24253b616e
 
 qt6-serialport-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel>=${version}_1"
@@ -20,8 +19,11 @@ qt6-serialport-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From 6367306cdd254c8399ea6520278ca96907dd6a11 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:09 +0700
Subject: [PATCH 13/33] qt6-shadertools: update to 6.3.1.

---
 srcpkgs/qt6-shadertools/template | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/qt6-shadertools/template b/srcpkgs/qt6-shadertools/template
index 9c1ec210a96a..3716333c459b 100644
--- a/srcpkgs/qt6-shadertools/template
+++ b/srcpkgs/qt6-shadertools/template
@@ -1,10 +1,9 @@
 # Template file for 'qt6-shadertools'
 pkgname=qt6-shadertools
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qtshadertools-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr "
 hostmakedepends="perl qt6-base-devel"
 makedepends="qt6-base-devel"
 short_desc="Cross-platform application and UI framework - shadertools"
@@ -12,7 +11,13 @@ maintainer="John <me@johnnynator.dev>"
 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=5498959b9d37c254bd126ab1320cf86aeb8a31b3ea7e51db666a8f9698afbd6c
+checksum=59b77176961528cc7b0c9325134655e273aa87b4cb386c0f4683d8f2852e435a
+
+if [ "$CROSS_BUILD" ]; then
+	configure_args="-DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true"
+	hostmakedepends+=" qt6-shadertools-devel"
+fi
+
 
 qt6-shadertools-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel>=${version}_1"
@@ -20,8 +25,11 @@ qt6-shadertools-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From 326eb9d92fe8783229193833b6461bc26b5a160b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:09 +0700
Subject: [PATCH 14/33] qt6-svg: update to 6.3.1.

---
 srcpkgs/qt6-svg/template | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/qt6-svg/template b/srcpkgs/qt6-svg/template
index aa8e6b745109..309b0988e435 100644
--- a/srcpkgs/qt6-svg/template
+++ b/srcpkgs/qt6-svg/template
@@ -1,10 +1,9 @@
 # Template file for 'qt6-svg'
 pkgname=qt6-svg
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qtsvg-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr "
 hostmakedepends="qt6-base-devel perl"
 makedepends="qt6-base-devel"
 short_desc="Cross-platform application and UI framework (QT6) - qt6-svg component"
@@ -12,10 +11,10 @@ maintainer="John <me@johnnynator.dev>"
 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=3164504d7e3f640439308235739b112605ab5fc9cc517ca0b28f9fb93a8db0e3
+checksum=7b19f418e6f7b8e23344082dd04440aacf5da23c5a73980ba22ae4eba4f87df7
 
 if [ "$XBPS_CHECK_PKGS" ]; then
-	configure_args+=" -DQT_BUILD_TESTS=ON"
+	configure_args="-DQT_BUILD_TESTS=ON"
 fi
 
 do_check() {
@@ -29,8 +28,11 @@ qt6-svg-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From 8409f900c37eb42b551bdf87ad83101667c39efe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:10 +0700
Subject: [PATCH 15/33] qt6-tools: update to 6.3.1.

---
 srcpkgs/qt6-tools/template | 23 ++++++++++++++++++-----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/qt6-tools/template b/srcpkgs/qt6-tools/template
index f875dff5c046..fd311176e31d 100644
--- a/srcpkgs/qt6-tools/template
+++ b/srcpkgs/qt6-tools/template
@@ -1,23 +1,33 @@
 # Template file for 'qt6-tools'
 pkgname=qt6-tools
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qttools-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr "
-hostmakedepends="qt6-base-devel perl"
-makedepends="qt6-base-devel libatomic-devel"
+configure_args="-DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=TRUE
+ -DQT_BUILD_SHARED_LIBS=ON -DQT_FEATURE_assistant=ON"
+hostmakedepends="qt6-base-devel perl qt6-plugin-sqlite"
+makedepends="qt6-base-devel libatomic-devel qt6-plugin-sqlite"
 short_desc="Cross-platform application and UI framework (QT6) - qt6-tools component"
 maintainer="John <me@johnnynator.dev>"
 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/qttools-everywhere-src-${version}.tar.xz"
-checksum=fce94688ea925782a2879347584991f854630daadba6c52aed6d93e33cd0b19c
+checksum=c412750f2aa3beb93fce5f30517c607f55daaeb7d0407af206a8adf917e126c1
+
+if [ "$CROSS_BUILD" ]; then
+	hostmakedepends+=" qt6-tools-devel"
+fi
+
 
 if [ "$XBPS_CHECK_PKGS" ]; then
 	configure_args+=" -DQT_BUILD_TESTS=ON"
 fi
 
+post_build() {
+	ninja -C build ${makejobs} lib/qt6/libexec/qhelpgenerator
+}
+
 do_check() {
 	cd build
 	# Some of these tests expect that qt6-tools is already
@@ -31,8 +41,11 @@ qt6-tools-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From 4ecbb5f9e623ef2b18a02ea3859e5bf528f35984 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:10 +0700
Subject: [PATCH 16/33] qt6-translations: update to 6.3.1.

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

diff --git a/srcpkgs/qt6-translations/template b/srcpkgs/qt6-translations/template
index be0a74ca74e2..1b917ccb3620 100644
--- a/srcpkgs/qt6-translations/template
+++ b/srcpkgs/qt6-translations/template
@@ -1,10 +1,9 @@
 # Template file for 'qt6-translations'
 pkgname=qt6-translations
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qttranslations-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr "
 hostmakedepends="qt6-base-devel qt6-tools-devel perl"
 makedepends="qt6-base-devel qt6-tools-devel"
 short_desc="Cross-platform application and UI framework - translations"
@@ -12,4 +11,4 @@ maintainer="John <me@johnnynator.dev>"
 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=e4dd4ef892a34a9514a19238f189a33ed85c76f31dcad6599ced93b1e33440b3
+checksum=d7bdd55e2908ded901dcc262157100af2a490bf04d31e32995f6d91d78dfdb97

From 822c78e72370528a8e91f49bd8d6337d55efe00e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:10 +0700
Subject: [PATCH 17/33] qt6-virtualkeyboard: update to 6.3.1.

---
 srcpkgs/qt6-virtualkeyboard/template | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/qt6-virtualkeyboard/template b/srcpkgs/qt6-virtualkeyboard/template
index 67ecef145ea1..77a247400b97 100644
--- a/srcpkgs/qt6-virtualkeyboard/template
+++ b/srcpkgs/qt6-virtualkeyboard/template
@@ -1,10 +1,9 @@
 # Template file for 'qt6-virtualkeyboard'
 pkgname=qt6-virtualkeyboard
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qtvirtualkeyboard-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr"
 hostmakedepends="perl pkg-config qt6-declarative-devel"
 makedepends="qt6-declarative-devel qt6-svg-devel hunspell-devel"
 short_desc="Cross-platform application and UI framework - virtualkeyboard"
@@ -12,10 +11,10 @@ maintainer="John <me@johnnynator.dev>"
 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=89aaf15acf5432af8f5cf4ec45cb32d87a3348906215dd56e81cb294eb276573
+checksum=5fe089b204d859ab0dd0169f811f2e30cae7c5cb36f8ab95ca36883f1fc0c2b8
 
 if [ "$XBPS_CHECK_PKGS" ]; then
-	configure_args+=" -DQT_BUILD_TESTS=ON"
+	configure_args="-DQT_BUILD_TESTS=ON"
 fi
 
 do_check() {
@@ -32,8 +31,11 @@ qt6-virtualkeyboard-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From c3f6c3e84e4d92d34964d8c9d3d07a4ca53b3cda Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:10 +0700
Subject: [PATCH 18/33] qt6-wayland: update to 6.3.1.

---
 srcpkgs/qt6-wayland/template | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/qt6-wayland/template b/srcpkgs/qt6-wayland/template
index b71a273009b9..784cb42a1a03 100644
--- a/srcpkgs/qt6-wayland/template
+++ b/srcpkgs/qt6-wayland/template
@@ -1,13 +1,15 @@
 # Template file for 'qt6-wayland'
 pkgname=qt6-wayland
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qtwayland-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true"
-hostmakedepends="qt6-base-devel perl pkg-config wayland-devel qt6-wayland-devel"
+configure_args="-DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true"
+hostmakedepends="qt6-base-devel perl pkg-config wayland-devel
+ qt6-declarative-devel qt6-wayland-devel"
 # XXX: Qml as optional dep
 makedepends="qt6-base-devel wayland-devel libxkbcommon-devel
+ qt6-declarative-devel
  libXcomposite-devel MesaLib-devel Vulkan-Headers libdrm-devel"
 checkdepends="dbus mesa-dri"
 short_desc="Cross-platform application and UI framework - Wayland"
@@ -15,7 +17,7 @@ maintainer="John <me@johnnynator.dev>"
 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=e7b567f6e43ffc5918d4aa825ce1eced66a00cb0a87133b2912ba5c1b2a02190
+checksum=6f14fea2d172a5b4170be3efcb0e58535f6605b61bcd823f6d5c9d165bb8c0f0
 
 if [ "$XBPS_CHECK_PKGS" ]; then
 	configure_args+=" -DQT_BUILD_TESTS=ON"
@@ -32,9 +34,11 @@ qt6-wayland-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
-		vmove usr/lib/qt6/libexec/qtwaylandscanner
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From 1daf1132c7b4e0d10374c5a1494adf1c4e296ee1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:10 +0700
Subject: [PATCH 19/33] qt6-websockets: update to 6.3.1.

---
 srcpkgs/qt6-websockets/template | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/qt6-websockets/template b/srcpkgs/qt6-websockets/template
index c2e674aacb31..4875af093432 100644
--- a/srcpkgs/qt6-websockets/template
+++ b/srcpkgs/qt6-websockets/template
@@ -1,10 +1,9 @@
 # Template file for 'qt6-websockets'
 pkgname=qt6-websockets
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qtwebsockets-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr"
 hostmakedepends="perl qt6-base-devel qt6-declarative-devel"
 makedepends="qt6-base-devel qt6-declarative-devel"
 short_desc="Cross-platform application and UI framework - websockets"
@@ -12,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 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=e018a09fe960b7d9560d6bbc9d3ca022fed6566e6ba6fc6d869a97482d4e6361
+checksum=9f980d90c97fcbde1b50c773f6dc580cfdf8c36ce14a1be3aa2ccadfe605121a
 
 qt6-websockets-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel>=${version}_1"
@@ -20,8 +19,11 @@ qt6-websockets-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From 87f0ee8a5b8b3b86dbabf9b84f22426244579d3c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Tue, 9 Aug 2022 20:16:47 +0700
Subject: [PATCH 20/33] qt6-3d: update to 6.3.1.

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

diff --git a/srcpkgs/qt6-3d/template b/srcpkgs/qt6-3d/template
index 666f57559532..c08c3bd4a41b 100644
--- a/srcpkgs/qt6-3d/template
+++ b/srcpkgs/qt6-3d/template
@@ -1,10 +1,9 @@
 # Template file for 'qt6-3d'
 pkgname=qt6-3d
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qt3d-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr"
 hostmakedepends="perl qt6-declarative-devel"
 makedepends="qt6-declarative-devel qt6-shadertools-devel libassimp-devel
  libatomic-devel"
@@ -13,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 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=74e762380dad34887878b9124dbfb981d5cf4b8b807281ff8bff311145b54de1
+checksum=9919b66dfb253fa26db1a7d664358cbc07f46c8810082ee3120d0a54b153edfe
 
 qt6-3d-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 41527795a4198e5daa0b30567f80ac6835497c75 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:11 +0700
Subject: [PATCH 21/33] New package: qt6-webchannel-6.3.1

---
 srcpkgs/qt6-webchannel-devel    |  1 +
 srcpkgs/qt6-webchannel/template | 32 ++++++++++++++++++++++++++++++++
 srcpkgs/qt6-webchannel/update   |  1 +
 3 files changed, 34 insertions(+)
 create mode 120000 srcpkgs/qt6-webchannel-devel
 create mode 100644 srcpkgs/qt6-webchannel/template
 create mode 100644 srcpkgs/qt6-webchannel/update

diff --git a/srcpkgs/qt6-webchannel-devel b/srcpkgs/qt6-webchannel-devel
new file mode 120000
index 000000000000..03e8b23d785d
--- /dev/null
+++ b/srcpkgs/qt6-webchannel-devel
@@ -0,0 +1 @@
+qt6-webchannel
\ No newline at end of file
diff --git a/srcpkgs/qt6-webchannel/template b/srcpkgs/qt6-webchannel/template
new file mode 100644
index 000000000000..432c42bcc056
--- /dev/null
+++ b/srcpkgs/qt6-webchannel/template
@@ -0,0 +1,32 @@
+# Template file for 'qt6-webchannel'
+pkgname=qt6-webchannel
+version=6.3.1
+revision=1
+wrksrc="qtwebchannel-everywhere-src-${version}"
+build_style=cmake
+hostmakedepends="perl qt6-base-devel qt6-declarative-devel"
+makedepends="qt6-base-devel qt6-declarative-devel qt6-websockets-devel"
+short_desc="Cross-platform application and UI framework - webchannel"
+maintainer="John <me@johnnynator.dev>"
+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=aaa20ac23f86992721b7ee487c379a3fd68caa8cdcea0a77a37e0d8b47ff2668
+
+qt6-webchannel-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel>=${version}_1
+	 qt6-websockets-devel>=${version}_1"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
+		vmove usr/lib/qt6/mkspecs
+		vmove usr/lib/qt6/qml/QtWebChannel/plugins.qmltypes
+		vmove usr/lib/qt6/qml/QtWebChannel/qmldir
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
+	}
+}
diff --git a/srcpkgs/qt6-webchannel/update b/srcpkgs/qt6-webchannel/update
new file mode 100644
index 000000000000..844552465222
--- /dev/null
+++ b/srcpkgs/qt6-webchannel/update
@@ -0,0 +1 @@
+pkgname="${pkgname/6-/}-everywhere-src"

From eb4fca23225607da3b104a0e74d9419e0388c87a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:11 +0700
Subject: [PATCH 22/33] New package: qt6-multimedia-6.3.1

---
 common/shlibs                   |  3 +++
 srcpkgs/qt6-multimedia-devel    |  1 +
 srcpkgs/qt6-multimedia/template | 33 +++++++++++++++++++++++++++++++++
 srcpkgs/qt6-multimedia/update   |  1 +
 4 files changed, 38 insertions(+)
 create mode 120000 srcpkgs/qt6-multimedia-devel
 create mode 100644 srcpkgs/qt6-multimedia/template
 create mode 100644 srcpkgs/qt6-multimedia/update

diff --git a/common/shlibs b/common/shlibs
index 26f10d604be9..ce04cc1ad2cf 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2078,6 +2078,9 @@ libQt6SerialPort.so.6 qt6-serialport-6.2.0alpha_1
 libQt6WebSockets.so.6 qt6-websockets-6.2.0alpha_1
 libQt6WebChannel.so.6 qt6-webchannel-6.2.0alpha_1
 libQt6Positioning.so.6 qt6-location-6.2.0alpha_1
+libQt6MultimediaWidgets.so.6 qt6-multimedia-6.3.1_1
+libQt6MultimediaQuick.so.6 qt6-multimedia-6.3.1_1
+libQt6Multimedia.so.6 qt6-multimedia-6.3.1_1
 libnpth.so.0 npth-1.1_1
 libnpupnp.so.4 libnpupnp-4.0.2_1
 libglfw.so.3 glfw-3.0.4_1
diff --git a/srcpkgs/qt6-multimedia-devel b/srcpkgs/qt6-multimedia-devel
new file mode 120000
index 000000000000..9343446502d0
--- /dev/null
+++ b/srcpkgs/qt6-multimedia-devel
@@ -0,0 +1 @@
+qt6-multimedia
\ No newline at end of file
diff --git a/srcpkgs/qt6-multimedia/template b/srcpkgs/qt6-multimedia/template
new file mode 100644
index 000000000000..535a2f55ffe4
--- /dev/null
+++ b/srcpkgs/qt6-multimedia/template
@@ -0,0 +1,33 @@
+# Template file for 'qt6-multimedia'
+pkgname=qt6-multimedia
+version=6.3.1
+revision=1
+wrksrc="qtmultimedia-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DQT_FEATURE_gstreamer=ON"
+hostmakedepends="perl qt6-declarative-devel pkg-config
+ qt6-shadertools-devel"
+makedepends="qt6-declarative-devel
+ qt6-shadertools-devel libglib-devel gst-plugins-base1-devel"
+short_desc="Cross-platform application and UI framework - multimedia"
+maintainer="John <me@johnnynator.dev>"
+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=7e03242aadd634ff2d9fcf08948290f03da3d9a5012369d908da89f82b1d7336
+
+qt6-multimedia-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel>=${version}_1"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
+		vmove usr/lib/qt6/mkspecs
+		vmove usr/lib/qt6/qml/QtMultimedia/plugins.qmltypes
+		vmove usr/lib/qt6/qml/QtMultimedia/qmldir
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}
diff --git a/srcpkgs/qt6-multimedia/update b/srcpkgs/qt6-multimedia/update
new file mode 100644
index 000000000000..844552465222
--- /dev/null
+++ b/srcpkgs/qt6-multimedia/update
@@ -0,0 +1 @@
+pkgname="${pkgname/6-/}-everywhere-src"

From 196c8630974ce7fa21d939528af452aaaf7a6acb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 18:22:48 +0700
Subject: [PATCH 23/33] New package: qt6-connectivity-6.3.1

---
 common/shlibs                     |  2 ++
 srcpkgs/qt6-connectivity-devel    |  1 +
 srcpkgs/qt6-connectivity/template | 30 ++++++++++++++++++++++++++++++
 3 files changed, 33 insertions(+)
 create mode 120000 srcpkgs/qt6-connectivity-devel
 create mode 100644 srcpkgs/qt6-connectivity/template

diff --git a/common/shlibs b/common/shlibs
index ce04cc1ad2cf..2e95a22119ab 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2072,6 +2072,8 @@ libQt6Designer.so.6 qt6-tools-6.1.0_1
 libQt6DesignerComponents.so.6 qt6-tools-6.1.0_1
 libQt6Help.so.6 qt6-tools-6.1.0_1
 libQt6UiTools.so.6 qt6-tools-6.1.0_1
+libQt6Nfc.so.6 qt6-connectivity-6.3.1_1
+libQt6Bluetooth.so.6 qt6-connectivity-6.3.1_1
 libQt6HunspellInputMethod.so.6 qt6-virtualkeyboard-6.1.0_1
 libQt6VirtualKeyboard.so.6 qt6-virtualkeyboard-6.1.0_1
 libQt6SerialPort.so.6 qt6-serialport-6.2.0alpha_1
diff --git a/srcpkgs/qt6-connectivity-devel b/srcpkgs/qt6-connectivity-devel
new file mode 120000
index 000000000000..478cc9d8aa39
--- /dev/null
+++ b/srcpkgs/qt6-connectivity-devel
@@ -0,0 +1 @@
+qt6-connectivity
\ No newline at end of file
diff --git a/srcpkgs/qt6-connectivity/template b/srcpkgs/qt6-connectivity/template
new file mode 100644
index 000000000000..6cb61744d0cb
--- /dev/null
+++ b/srcpkgs/qt6-connectivity/template
@@ -0,0 +1,30 @@
+# Template file for 'qt6-connectivity'
+pkgname=qt6-connectivity
+version=6.3.1
+revision=1
+wrksrc="qtconnectivity-everywhere-src-${version}"
+build_style=cmake
+hostmakedepends="perl qt6-declarative-devel"
+makedepends="qt6-declarative-devel"
+short_desc="Cross-platform application and UI framework - Connectivity"
+maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
+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=b25ce4710a9c61bc6a5dbaeeb3e2ed907a8bc85478fdb2ab4312297768b695b0
+
+qt6-connectivity-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}
+	 qt6-declarative>=${version}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
+		vmove usr/lib/qt6/mkspecs
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
+	}
+}

From f39a10d6be6cc05fb737eb9af597b23a70819eb5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 18:22:57 +0700
Subject: [PATCH 24/33] New package: qt6-sensors-6.3.1

---
 common/shlibs                |  2 ++
 srcpkgs/qt6-sensors-devel    |  1 +
 srcpkgs/qt6-sensors/template | 31 +++++++++++++++++++++++++++++++
 3 files changed, 34 insertions(+)
 create mode 120000 srcpkgs/qt6-sensors-devel
 create mode 100644 srcpkgs/qt6-sensors/template

diff --git a/common/shlibs b/common/shlibs
index 2e95a22119ab..157b51f3f981 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2074,6 +2074,8 @@ libQt6Help.so.6 qt6-tools-6.1.0_1
 libQt6UiTools.so.6 qt6-tools-6.1.0_1
 libQt6Nfc.so.6 qt6-connectivity-6.3.1_1
 libQt6Bluetooth.so.6 qt6-connectivity-6.3.1_1
+libQt6Sensors.so.6 qt6-sensors-6.3.1_1
+libQt6SensorsQuick.so.6 qt6-sensors-6.3.1_1
 libQt6HunspellInputMethod.so.6 qt6-virtualkeyboard-6.1.0_1
 libQt6VirtualKeyboard.so.6 qt6-virtualkeyboard-6.1.0_1
 libQt6SerialPort.so.6 qt6-serialport-6.2.0alpha_1
diff --git a/srcpkgs/qt6-sensors-devel b/srcpkgs/qt6-sensors-devel
new file mode 120000
index 000000000000..eb9457f04055
--- /dev/null
+++ b/srcpkgs/qt6-sensors-devel
@@ -0,0 +1 @@
+qt6-sensors
\ No newline at end of file
diff --git a/srcpkgs/qt6-sensors/template b/srcpkgs/qt6-sensors/template
new file mode 100644
index 000000000000..5a81f43b60eb
--- /dev/null
+++ b/srcpkgs/qt6-sensors/template
@@ -0,0 +1,31 @@
+# Template file for 'qt6-sensors'
+pkgname=qt6-sensors
+version=6.3.1
+revision=1
+wrksrc="qtsensors-everywhere-src-${version}"
+build_style=cmake
+hostmakedepends="perl qt6-declarative-devel qt6-svg-devel pkg-config"
+makedepends="qt6-declarative-devel qt6-svg-devel"
+short_desc="Cross-platform application and UI framework - Sensors"
+maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
+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=4b240b59edba9a42b4735758a25f279a26841b982864e7b38f6ef0b81e0d60cc
+
+qt6-sensors-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}
+	 qt6-declarative-devel>=${version}_1"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
+		vmove usr/lib/qt6/mkspecs
+		vmove usr/lib/qt6/qml/QtSensors/plugins.qmltypes
+		vmove usr/lib/qt6/qml/QtSensors/qmldir
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}

From f5432c961d4c9e191c7bc92a51cf50485fa918ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 18:23:08 +0700
Subject: [PATCH 25/33] New package: qt6-remoteobjects-6.3.1

---
 common/shlibs                      |  2 ++
 srcpkgs/qt6-remoteobjects-devel    |  1 +
 srcpkgs/qt6-remoteobjects/template | 36 ++++++++++++++++++++++++++++++
 3 files changed, 39 insertions(+)
 create mode 120000 srcpkgs/qt6-remoteobjects-devel
 create mode 100644 srcpkgs/qt6-remoteobjects/template

diff --git a/common/shlibs b/common/shlibs
index 157b51f3f981..91f197e54c93 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2074,6 +2074,8 @@ libQt6Help.so.6 qt6-tools-6.1.0_1
 libQt6UiTools.so.6 qt6-tools-6.1.0_1
 libQt6Nfc.so.6 qt6-connectivity-6.3.1_1
 libQt6Bluetooth.so.6 qt6-connectivity-6.3.1_1
+libQt6RemoteObjects.so.6 qt6-remoteobjects-6.3.1_1
+libQt6RemoteObjectsQml.so.6 qt6-remoteobjects-6.3.1_1
 libQt6Sensors.so.6 qt6-sensors-6.3.1_1
 libQt6SensorsQuick.so.6 qt6-sensors-6.3.1_1
 libQt6HunspellInputMethod.so.6 qt6-virtualkeyboard-6.1.0_1
diff --git a/srcpkgs/qt6-remoteobjects-devel b/srcpkgs/qt6-remoteobjects-devel
new file mode 120000
index 000000000000..2a027f95266f
--- /dev/null
+++ b/srcpkgs/qt6-remoteobjects-devel
@@ -0,0 +1 @@
+qt6-remoteobjects
\ No newline at end of file
diff --git a/srcpkgs/qt6-remoteobjects/template b/srcpkgs/qt6-remoteobjects/template
new file mode 100644
index 000000000000..71d2d31967b6
--- /dev/null
+++ b/srcpkgs/qt6-remoteobjects/template
@@ -0,0 +1,36 @@
+# Template file for 'qt6-remoteobjects'
+pkgname=qt6-remoteobjects
+version=6.3.1
+revision=1
+wrksrc="qtremoteobjects-everywhere-src-${version}"
+build_style=cmake
+hostmakedepends="perl qt6-declarative-devel pkg-config"
+makedepends="qt6-declarative-devel"
+short_desc="Cross-platform application and UI framework - Remote Objects"
+maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
+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=ea6d038b11c60981de0bd39a6091a59abf7d031e37bfc592b31be1217bef4ca6
+
+if [ "$CROSS_BUILD" ]; then
+	hostmakedepends+=" qt6-remoteobjects"
+	configure_args="-DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true"
+fi
+
+qt6-remoteobjects-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}
+	 qt6-declarative-devel>=${version}_1"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
+		vmove usr/lib/qt6/mkspecs
+		vmove usr/lib/qt6/qml/QtRemoteObjects/plugins.qmltypes
+		vmove usr/lib/qt6/qml/QtRemoteObjects/qmldir
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}

From 0bef4c2f66d5d2a1de10dac2252aa422e67c04ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:11 +0700
Subject: [PATCH 26/33] New package: qt6-webengine-6.3.1.

---
 common/shlibs                                 |    7 +
 srcpkgs/qt6-webengine-devel                   |    1 +
 srcpkgs/qt6-webengine-examples                |    1 +
 .../patches/0001-None-no-debug.patch          |   11 +
 .../patches/0002-enable-ppc64.patch           |   20 +
 .../patches/0003-cross-hack.patch             |   10 +
 .../0004-ppc-disable-jxl-decoder.patch        |   13 +
 .../patches/0050-no-glibc-cmake-check.patch   |   14 +
 .../0100-chromium-sandbox-membarrier.patch    |   58 +
 .../qt6-webengine/patches/0101-size_t.patch   |   16 +
 .../0102-chromium-90-ruy-include.patch        |   19 +
 ...-v8-monotonic-pthread-cont_timedwait.patch |   22 +
 .../0104-chromium-revert-9d080c0.patch        |  162 +
 ...-chromium-revert-drop-of-system-java.patch |   15 +
 .../patches/0106-chromium-system-nodejs.patch |   20 +
 .../0107-chromium-cursed^Uscoped_file.patch   |   18 +
 .../0108-chromium-fix-narrowing-cast.patch    |   53 +
 .../0109-chromium-remove-strip_binary.patch   |   32 +
 ...ium-revert-use-ffile-compilation-dir.patch |   57 +
 ...11-chromium-no-Wno-stringop-overread.patch |   10 +
 .../0150-chromium-glibc-libc_malloc.patch     |   24 +
 ...-include-sys-reg.h-to-get-__WORDSIZE.patch |   21 +
 .../0201-chromium-musl-dispatch-to-musl.patch |  103 +
 .../0202-chromium-musl-no-mallinfo.patch      |   62 +
 .../0203-chromium-musl-siginfo_t.patch        |   18 +
 .../0204-chromium-musl-stackstart.patch       |   20 +
 .../patches/0205-chromium-musl-sandbox.patch  |   92 +
 ...0206-chromium-musl-default-stacksize.patch |   15 +
 .../patches/0208-chromium-musl-execinfo.patch |  125 +
 .../0209-chromium-musl-thread-stacksize.patch |   22 +
 .../0210-chromium-musl-msgvec-push_back.patch |   14 +
 ...ium-musl-canonicalize-file-name-musl.patch |   11 +
 .../0212-chromium-musl-no-getcontext.patch    |   29 +
 .../patches/0213-chromium-musl-crashpad.patch |   24 +
 .../patches/0214-chromium-musl-fixes.patch    |  108 +
 .../patches/0215-chromium-musl-cdefs.patch    |   29 +
 .../patches/0216-chromium-musl-stat.patch     |   12 +
 .../patches/0217-chromium-musl-resolver.patch |   77 +
 .../patches/0600-chromium-sndio.patch         |  876 ++++
 .../patches/0700-armv7l-neon.patch            |   10 +
 ...-chromium-musl-cross-no-asm_ptrace_h.patch |   30 +
 .../0751-chromium-musl-arm-user_vfp.patch     |   20 +
 .../0752-chromium-musl-arm-elf_auxv_t.patch   |   18 +
 ...0801-chromium-i686-vaapi-fpermissive.patch |   24 +
 .../patches/0900-xxx-ppc64le-libvpx.patch     |   65 +
 .../0901-xxx-ppc64le-sandbox-linux-stat.patch |   31 +
 .../patches/0902-xxx-ppc64le-support.patch    | 3556 +++++++++++++++++
 .../0903-xxx-ppc64le-swiftshader.patch        |   18 +
 .../patches/cross-build-examples.patch        |   16 +
 srcpkgs/qt6-webengine/template                |  178 +
 srcpkgs/qt6-webengine/update                  |    1 +
 51 files changed, 6208 insertions(+)
 create mode 120000 srcpkgs/qt6-webengine-devel
 create mode 120000 srcpkgs/qt6-webengine-examples
 create mode 100644 srcpkgs/qt6-webengine/patches/0001-None-no-debug.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0002-enable-ppc64.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0003-cross-hack.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0004-ppc-disable-jxl-decoder.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0050-no-glibc-cmake-check.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0100-chromium-sandbox-membarrier.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0101-size_t.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0102-chromium-90-ruy-include.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0103-chromium-v8-monotonic-pthread-cont_timedwait.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0104-chromium-revert-9d080c0.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0105-chromium-revert-drop-of-system-java.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0106-chromium-system-nodejs.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0107-chromium-cursed^Uscoped_file.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0108-chromium-fix-narrowing-cast.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0109-chromium-remove-strip_binary.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0110-chromium-revert-use-ffile-compilation-dir.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0111-chromium-no-Wno-stringop-overread.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0150-chromium-glibc-libc_malloc.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0200-chromium-musl-include-sys-reg.h-to-get-__WORDSIZE.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0201-chromium-musl-dispatch-to-musl.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0202-chromium-musl-no-mallinfo.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0203-chromium-musl-siginfo_t.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0204-chromium-musl-stackstart.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0205-chromium-musl-sandbox.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0206-chromium-musl-default-stacksize.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0208-chromium-musl-execinfo.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0209-chromium-musl-thread-stacksize.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0210-chromium-musl-msgvec-push_back.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0211-chromium-musl-canonicalize-file-name-musl.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0212-chromium-musl-no-getcontext.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0213-chromium-musl-crashpad.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0214-chromium-musl-fixes.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0215-chromium-musl-cdefs.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0216-chromium-musl-stat.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0217-chromium-musl-resolver.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0600-chromium-sndio.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0700-armv7l-neon.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0750-chromium-musl-cross-no-asm_ptrace_h.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0751-chromium-musl-arm-user_vfp.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0752-chromium-musl-arm-elf_auxv_t.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0801-chromium-i686-vaapi-fpermissive.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0900-xxx-ppc64le-libvpx.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0901-xxx-ppc64le-sandbox-linux-stat.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0902-xxx-ppc64le-support.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0903-xxx-ppc64le-swiftshader.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/cross-build-examples.patch
 create mode 100644 srcpkgs/qt6-webengine/template
 create mode 100644 srcpkgs/qt6-webengine/update

diff --git a/common/shlibs b/common/shlibs
index 91f197e54c93..1f8acc43c36e 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2087,6 +2087,13 @@ libQt6Positioning.so.6 qt6-location-6.2.0alpha_1
 libQt6MultimediaWidgets.so.6 qt6-multimedia-6.3.1_1
 libQt6MultimediaQuick.so.6 qt6-multimedia-6.3.1_1
 libQt6Multimedia.so.6 qt6-multimedia-6.3.1_1
+libQt6WebEngineQuick.so.6 qt6-webengine-6.3.1_1
+libQt6PdfWidgets.so.6 qt6-webengine-6.3.1_1
+libQt6PdfQuick.so.6 qt6-webengine-6.3.1_1
+libQt6WebEngineCore.so.6 qt6-webengine-6.3.1_1
+libQt6Pdf.so.6 qt6-webengine-6.3.1_1
+libQt6WebEngineQuickDelegatesQml.so.6 qt6-webengine-6.3.1_1
+libQt6WebEngineWidgets.so.6 qt6-webengine-6.3.1_1
 libnpth.so.0 npth-1.1_1
 libnpupnp.so.4 libnpupnp-4.0.2_1
 libglfw.so.3 glfw-3.0.4_1
diff --git a/srcpkgs/qt6-webengine-devel b/srcpkgs/qt6-webengine-devel
new file mode 120000
index 000000000000..8e4d1b99c587
--- /dev/null
+++ b/srcpkgs/qt6-webengine-devel
@@ -0,0 +1 @@
+qt6-webengine
\ No newline at end of file
diff --git a/srcpkgs/qt6-webengine-examples b/srcpkgs/qt6-webengine-examples
new file mode 120000
index 000000000000..8e4d1b99c587
--- /dev/null
+++ b/srcpkgs/qt6-webengine-examples
@@ -0,0 +1 @@
+qt6-webengine
\ No newline at end of file
diff --git a/srcpkgs/qt6-webengine/patches/0001-None-no-debug.patch b/srcpkgs/qt6-webengine/patches/0001-None-no-debug.patch
new file mode 100644
index 000000000000..1ba33f8e6fd9
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0001-None-no-debug.patch
@@ -0,0 +1,11 @@
+--- a/cmake/Functions.cmake
++++ b/cmake/Functions.cmake
+@@ -813,6 +813,8 @@ macro(append_build_type_setup)
+         endif()
+     elseif(${config} STREQUAL "MinSizeRel")
+         list(APPEND gnArgArg is_debug=false symbol_level=0 optimize_for_size=true)
++    elseif(${config} STREQUAL "None")
++        list(APPEND gnArgArg is_debug=false symbol_level=0)
+     endif()
+     if(FEATURE_developer_build OR (${config} STREQUAL "Debug") OR QT_FEATURE_webengine_sanitizer)
+         list(APPEND gnArgArg
diff --git a/srcpkgs/qt6-webengine/patches/0002-enable-ppc64.patch b/srcpkgs/qt6-webengine/patches/0002-enable-ppc64.patch
new file mode 100644
index 000000000000..d72ef1ad1a10
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0002-enable-ppc64.patch
@@ -0,0 +1,20 @@
+--- a/cmake/Functions.cmake
++++ b/cmake/Functions.cmake
+@@ -622,6 +622,8 @@ function(get_gn_arch result arch)
+         set(${result} "mipsel" PARENT_SCOPE)
+     elseif(arch STREQUAL "mipsel64")
+         set(${result} "mips64el" PARENT_SCOPE)
++    elseif(arch STREQUAL "power64")
++        set(${result} "power64" PARENT_SCOPE)
+     else()
+         message(DEBUG "Unsupported architecture: ${arch}")
+     endif()
+@@ -641,6 +643,8 @@ function(get_v8_arch result targetArch h
+             set(${result} "mipsel" PARENT_SCOPE)
+         elseif(hostArch STREQUAL "mipsel64")
+             set(${result} "mipsel" PARENT_SCOPE)
++        elseif(hostArch STREQUAL "power64")
++            set(${result} "power64" PARENT_SCOPE)
+         else()
+             message(DEBUG "Unsupported architecture: ${hostArch}")
+         endif()
diff --git a/srcpkgs/qt6-webengine/patches/0003-cross-hack.patch b/srcpkgs/qt6-webengine/patches/0003-cross-hack.patch
new file mode 100644
index 000000000000..ea9f90094a63
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0003-cross-hack.patch
@@ -0,0 +1,10 @@
+--- a/src/core/api/CMakeLists.txt
++++ b/src/core/api/CMakeLists.txt
+@@ -50,6 +50,7 @@ qt_internal_add_module(WebEngineCore
+         Qt::Gui
+         Qt::Network
+         Qt::Quick
++        X11
+ )
+ 
+ set_target_properties(WebEngineCore PROPERTIES QTWEBENGINEPROCESS_NAME ${qtWebEngineProcessName})
diff --git a/srcpkgs/qt6-webengine/patches/0004-ppc-disable-jxl-decoder.patch b/srcpkgs/qt6-webengine/patches/0004-ppc-disable-jxl-decoder.patch
new file mode 100644
index 000000000000..73c1151968f4
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0004-ppc-disable-jxl-decoder.patch
@@ -0,0 +1,13 @@
+--- a/src/core/CMakeLists.txt
++++ b/src/core/CMakeLists.txt
+@@ -414,6 +414,10 @@ foreach(arch ${archs})
+                 CONDITION QT_FEATURE_webengine_ozone_x11 AND XSCRNSAVER_FOUND
+             )
+ 
++            if (cpu STREQUAL "ppc64")
++                list(APPEND gnArgArg enable_jxl_decoder=false)
++            endif()
++
+             if(QT_FEATURE_webengine_kerberos)
+                 list(APPEND gnArgArg
+                      external_gssapi_include_dir="${GSSAPI_INCLUDE_DIRS}/gssapi"
diff --git a/srcpkgs/qt6-webengine/patches/0050-no-glibc-cmake-check.patch b/srcpkgs/qt6-webengine/patches/0050-no-glibc-cmake-check.patch
new file mode 100644
index 000000000000..f756bf0286bb
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0050-no-glibc-cmake-check.patch
@@ -0,0 +1,14 @@
+--- a/configure.cmake
++++ b/configure.cmake
+@@ -499,11 +499,6 @@ add_check_for_support(
+ )
+ add_check_for_support(
+    MODULES QtWebEngine QtPdf
+-   CONDITION NOT LINUX OR TEST_glibc
+-   MESSAGE "A suitable version >= 2.17 of glibc is required."
+-)
+-add_check_for_support(
+-   MODULES QtWebEngine QtPdf
+    CONDITION NOT LINUX OR TEST_khr
+    MESSAGE "Build requires Khronos development headers for build - see mesa/libegl1-mesa-dev"
+ )
diff --git a/srcpkgs/qt6-webengine/patches/0100-chromium-sandbox-membarrier.patch b/srcpkgs/qt6-webengine/patches/0100-chromium-sandbox-membarrier.patch
new file mode 100644
index 000000000000..2dd7b4aa948f
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0100-chromium-sandbox-membarrier.patch
@@ -0,0 +1,58 @@
+--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
++++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
+@@ -413,6 +413,7 @@ bool SyscallSets::IsAllowedProcessStartO
+   switch (sysno) {
+     case __NR_exit:
+     case __NR_exit_group:
++    case __NR_membarrier:
+     case __NR_wait4:
+     case __NR_waitid:
+ #if defined(__i386__)
+--- a/src/3rdparty/chromium/sandbox/linux/system_headers/arm64_linux_syscalls.h
++++ b/src/3rdparty/chromium/sandbox/linux/system_headers/arm64_linux_syscalls.h
+@@ -1215,4 +1215,8 @@
+ #define __NR_landlock_restrict_self 446
+ #endif
+ 
++#if !defined(__NR_membarrier)
++#define __NR_membarrier 283
++#endif
++
+ #endif  // SANDBOX_LINUX_SYSTEM_HEADERS_ARM64_LINUX_SYSCALLS_H_
+--- a/src/3rdparty/chromium/sandbox/linux/system_headers/arm_linux_syscalls.h
++++ b/src/3rdparty/chromium/sandbox/linux/system_headers/arm_linux_syscalls.h
+@@ -1617,6 +1617,10 @@
+ #define __NR_landlock_restrict_self (__NR_SYSCALL_BASE + 446)
+ #endif
+ 
++#if !defined(__NR_membarrier)
++#define __NR_membarrier (__NR_SYSCALL_BASE+389)
++#endif
++
+ // ARM private syscalls.
+ #if !defined(__ARM_NR_BASE)
+ #define __ARM_NR_BASE (__NR_SYSCALL_BASE + 0xF0000)
+--- a/src/3rdparty/chromium/sandbox/linux/system_headers/x86_32_linux_syscalls.h
++++ b/src/3rdparty/chromium/sandbox/linux/system_headers/x86_32_linux_syscalls.h
+@@ -1750,5 +1750,9 @@
+ #define __NR_landlock_restrict_self 446
+ #endif
+ 
++#if !defined(__NR_membarrier)
++#define __NR_membarrier 375
++#endif
++
+ #endif  // SANDBOX_LINUX_SYSTEM_HEADERS_X86_32_LINUX_SYSCALLS_H_
+ 
+--- a/src/3rdparty/chromium/sandbox/linux/system_headers/x86_64_linux_syscalls.h
++++ b/src/3rdparty/chromium/sandbox/linux/system_headers/x86_64_linux_syscalls.h
+@@ -1438,5 +1438,9 @@
+ #define __NR_landlock_restrict_self 446
+ #endif
+ 
++#if !defined(__NR_membarrier)
++#define __NR_membarrier 324
++#endif
++
+ #endif  // SANDBOX_LINUX_SYSTEM_HEADERS_X86_64_LINUX_SYSCALLS_H_
+ 
diff --git a/srcpkgs/qt6-webengine/patches/0101-size_t.patch b/srcpkgs/qt6-webengine/patches/0101-size_t.patch
new file mode 100644
index 000000000000..fccc085da311
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0101-size_t.patch
@@ -0,0 +1,16 @@
+--- a/src/3rdparty/chromium/third_party/angle/include/platform/PlatformMethods.h
++++ b/src/3rdparty/chromium/third_party/angle/include/platform/PlatformMethods.h
+@@ -239,11 +239,11 @@ inline void DefaultOverrideFeaturesMtl(P
+ using ProgramKeyType   = std::array<uint8_t, 20>;
+ using CacheProgramFunc = void (*)(PlatformMethods *platform,
+                                   const ProgramKeyType &key,
+-                                  size_t programSize,
++                                  std::size_t programSize,
+                                   const uint8_t *programBytes);
+ inline void DefaultCacheProgram(PlatformMethods *platform,
+                                 const ProgramKeyType &key,
+-                                size_t programSize,
++                                std::size_t programSize,
+                                 const uint8_t *programBytes)
+ {}
+ 
diff --git a/srcpkgs/qt6-webengine/patches/0102-chromium-90-ruy-include.patch b/srcpkgs/qt6-webengine/patches/0102-chromium-90-ruy-include.patch
new file mode 100644
index 000000000000..bbba579076d6
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0102-chromium-90-ruy-include.patch
@@ -0,0 +1,19 @@
+From 714092f336bb14d2fcc27396ec323b3d843bb962 Mon Sep 17 00:00:00 2001
+From: Stephan Hartmann <stha09@googlemail.com>
+Date: Thu, 4 Mar 2021 15:05:46 +0000
+Subject: [PATCH] IWYU: include limits for std::numeric_limits
+
+---
+ third_party/ruy/src/ruy/block_map.cc | 1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/src/3rdparty/chromium/third_party/ruy/src/ruy/block_map.cc
++++ b/src/3rdparty/chromium/third_party/ruy/src/ruy/block_map.cc
+@@ -17,6 +17,7 @@ limitations under the License.
+ 
+ #include <algorithm>
+ #include <cstdint>
++#include <limits>
+ 
+ #ifdef RUY_MAKEBLOCKMAP_DEBUG
+ #include <cstdio>
diff --git a/srcpkgs/qt6-webengine/patches/0103-chromium-v8-monotonic-pthread-cont_timedwait.patch b/srcpkgs/qt6-webengine/patches/0103-chromium-v8-monotonic-pthread-cont_timedwait.patch
new file mode 100644
index 000000000000..1dc8bc4d3d17
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0103-chromium-v8-monotonic-pthread-cont_timedwait.patch
@@ -0,0 +1,22 @@
+Use monotonic clock for pthread_cond_timedwait with musl too.
+
+--- a/src/3rdparty/chromium/v8/src/base/platform/condition-variable.cc
++++ b/src/3rdparty/chromium/v8/src/base/platform/condition-variable.cc
+@@ -20,7 +20,7 @@ namespace base {
+ 
+ ConditionVariable::ConditionVariable() {
+ #if (V8_OS_FREEBSD || V8_OS_NETBSD || V8_OS_OPENBSD || \
+-     (V8_OS_LINUX && V8_LIBC_GLIBC))
++     V8_OS_LINUX)
+   // On Free/Net/OpenBSD and Linux with glibc we can change the time
+   // source for pthread_cond_timedwait() to use the monotonic clock.
+   pthread_condattr_t attr;
+@@ -96,7 +96,7 @@ bool ConditionVariable::WaitFor(Mutex* m
+       &native_handle_, &mutex->native_handle(), &ts);
+ #else
+ #if (V8_OS_FREEBSD || V8_OS_NETBSD || V8_OS_OPENBSD || \
+-     (V8_OS_LINUX && V8_LIBC_GLIBC))
++     V8_OS_LINUX)
+   // On Free/Net/OpenBSD and Linux with glibc we can change the time
+   // source for pthread_cond_timedwait() to use the monotonic clock.
+   result = clock_gettime(CLOCK_MONOTONIC, &ts);
diff --git a/srcpkgs/qt6-webengine/patches/0104-chromium-revert-9d080c0.patch b/srcpkgs/qt6-webengine/patches/0104-chromium-revert-9d080c0.patch
new file mode 100644
index 000000000000..42b1ee9ec063
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0104-chromium-revert-9d080c0.patch
@@ -0,0 +1,162 @@
+ Original change's description:
+ > Replace 'blacklist' with 'ignorelist' in ./tools/msan/.
+ >
+ > Bug: 1097272, 1097268
+ > Change-Id: Id5c8227a5bfb1ffaec82d3168b609085b10c8297
+ > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2867730
+ > Commit-Queue: Dylan Cutler <dylancutler@google.com>
+ > Reviewed-by: Nico Weber <thakis@chromium.org>
+ > Reviewed-by: Jonathan Metzman <metzman@chromium.org>
+ > Cr-Commit-Position: refs/heads/master@{#883035}
+--- a/src/3rdparty/chromium/build/config/sanitizers/BUILD.gn
++++ b/src/3rdparty/chromium/build/config/sanitizers/BUILD.gn
+@@ -272,11 +272,11 @@ config("asan_flags") {
+   if (is_asan) {
+     cflags += [ "-fsanitize=address" ]
+     if (is_win) {
+-      if (!defined(asan_win_blocklist_path)) {
+-        asan_win_blocklist_path =
++      if (!defined(asan_win_blacklist_path)) {
++        asan_win_blacklist_path =
+             rebase_path("//tools/memory/asan/blocklist_win.txt", root_build_dir)
+       }
+-      cflags += [ "-fsanitize-ignorelist=$asan_win_blocklist_path" ]
++      cflags += [ "-fsanitize-blacklist=$asan_win_blacklist_path" ]
+     }
+   }
+ }
+@@ -306,13 +306,13 @@ config("link_shared_library") {
+ config("cfi_flags") {
+   cflags = []
+   if (is_cfi && current_toolchain == default_toolchain) {
+-    if (!defined(cfi_ignorelist_path)) {
+-      cfi_ignorelist_path =
++    if (!defined(cfi_blacklist_path)) {
++      cfi_blacklist_path =
+           rebase_path("//tools/cfi/ignores.txt", root_build_dir)
+     }
+     cflags += [
+       "-fsanitize=cfi-vcall",
+-      "-fsanitize-ignorelist=$cfi_ignorelist_path",
++      "-fsanitize-blacklist=$cfi_blacklist_path",
+     ]
+ 
+     if (use_cfi_cast) {
+@@ -409,14 +409,14 @@ config("msan_flags") {
+   if (is_msan) {
+     assert(is_linux || is_chromeos,
+            "msan only supported on linux x86_64/ChromeOS")
+-    if (!defined(msan_ignorelist_path)) {
+-      msan_ignorelist_path =
+-          rebase_path("//tools/msan/ignorelist.txt", root_build_dir)
++    if (!defined(msan_blacklist_path)) {
++      msan_blacklist_path =
++          rebase_path("//tools/msan/blacklist.txt", root_build_dir)
+     }
+     cflags = [
+       "-fsanitize=memory",
+       "-fsanitize-memory-track-origins=$msan_track_origins",
+-      "-fsanitize-ignorelist=$msan_ignorelist_path",
++      "-fsanitize-blacklist=$msan_blacklist_path",
+     ]
+   }
+ }
+@@ -424,13 +424,13 @@ config("msan_flags") {
+ config("tsan_flags") {
+   if (is_tsan) {
+     assert(is_linux || is_chromeos, "tsan only supported on linux x86_64")
+-    if (!defined(tsan_ignorelist_path)) {
+-      tsan_ignorelist_path =
++    if (!defined(tsan_blacklist_path)) {
++      tsan_blacklist_path =
+           rebase_path("//tools/memory/tsan_v2/ignores.txt", root_build_dir)
+     }
+     cflags = [
+       "-fsanitize=thread",
+-      "-fsanitize-ignorelist=$tsan_ignorelist_path",
++      "-fsanitize-blacklist=$tsan_blacklist_path",
+     ]
+   }
+ }
+@@ -438,8 +438,8 @@ config("tsan_flags") {
+ config("ubsan_flags") {
+   cflags = []
+   if (is_ubsan) {
+-    if (!defined(ubsan_ignorelist_path)) {
+-      ubsan_ignorelist_path =
++    if (!defined(ubsan_blacklist_path)) {
++      ubsan_blacklist_path =
+           rebase_path("//tools/ubsan/ignorelist.txt", root_build_dir)
+     }
+     cflags += [
+@@ -456,7 +456,7 @@ config("ubsan_flags") {
+       "-fsanitize=signed-integer-overflow",
+       "-fsanitize=unreachable",
+       "-fsanitize=vla-bound",
+-      "-fsanitize-ignorelist=$ubsan_ignorelist_path",
++      "-fsanitize-blacklist=$ubsan_blacklist_path",
+     ]
+     if (!is_clang) {
+       # These exposes too much illegal C++14 code to compile on anything stricter than clang:
+@@ -497,8 +497,8 @@ config("ubsan_no_recover") {
+ 
+ config("ubsan_security_flags") {
+   if (is_ubsan_security) {
+-    if (!defined(ubsan_security_ignorelist_path)) {
+-      ubsan_security_ignorelist_path =
++    if (!defined(ubsan_security_blacklist_path)) {
++      ubsan_security_blacklist_path =
+           rebase_path("//tools/ubsan/security_ignorelist.txt", root_build_dir)
+     }
+     cflags = [
+@@ -506,7 +506,7 @@ config("ubsan_security_flags") {
+       "-fsanitize=shift",
+       "-fsanitize=signed-integer-overflow",
+       "-fsanitize=vla-bound",
+-      "-fsanitize-ignorelist=$ubsan_security_ignorelist_path",
++      "-fsanitize-blacklist=$ubsan_security_blacklist_path",
+     ]
+   }
+ }
+@@ -519,13 +519,13 @@ config("ubsan_null_flags") {
+ 
+ config("ubsan_vptr_flags") {
+   if (is_ubsan_vptr) {
+-    if (!defined(ubsan_vptr_ignorelist_path)) {
+-      ubsan_vptr_ignorelist_path =
++    if (!defined(ubsan_vptr_blacklist_path)) {
++      ubsan_vptr_blacklist_path =
+           rebase_path("//tools/ubsan/vptr_ignorelist.txt", root_build_dir)
+     }
+     cflags = [
+       "-fsanitize=vptr",
+-      "-fsanitize-ignorelist=$ubsan_vptr_ignorelist_path",
++      "-fsanitize-blacklist=$ubsan_vptr_blacklist_path",
+     ]
+     if (!is_clang) {
+       # Clang specific flag:
+--- a/src/3rdparty/chromium/build_overrides/build.gni
++++ b/src/3rdparty/chromium/build_overrides/build.gni
+@@ -43,15 +43,15 @@ declare_args() {
+ # Allows different projects to specify their own suppression/ignore lists for
+ # sanitizer tools.
+ # asan_suppressions_file = "path/to/asan_suppressions.cc"
+-# asan_win_ignorelist_path = "path/to/asan/blocklist_win.txt"
++# asan_win_blacklist_path = "path/to/asan/blocklist_win.txt"
+ # lsan_suppressions_file = "path/to/lsan_suppressions.cc"
+ # tsan_suppressions_file = "path/to/tsan_suppressions.cc"
+-# tsan_ignorelist_path = "path/to/tsan/ignores.txt"
+-# msan_ignorelist_path = "path/to/msan/ignorelist.txt"
+-# ubsan_ignorelist_path = "path/to/ubsan/ignorelist.txt"
+-# ubsan_vptr_ignorelist_path = "path/to/ubsan/vptr_ignorelist.txt"
+-# ubsan_security_ignorelist_path = "path/to/ubsan/security_ignorelist.txt"
+-# cfi_ignorelist_path = "path/to/cfi/ignores.txt"
++# tsan_blacklist_path = "path/to/tsan/ignores.txt"
++# msan_blacklist_path = "path/to/msan/blacklist.txt"
++# ubsan_blacklist_path = "path/to/ubsan/blacklist.txt"
++# ubsan_vptr_blacklist_path = "path/to/ubsan/vptr_blacklist.txt"
++# ubsan_security_blacklist_path = "path/to/ubsan/security_blacklist.txt"
++# cfi_blacklist_path = "path/to/cfi/ignores.txt"
+ 
+ declare_args() {
+   # Android 32-bit non-component, non-clang builds cannot have symbol_level=2
diff --git a/srcpkgs/qt6-webengine/patches/0105-chromium-revert-drop-of-system-java.patch b/srcpkgs/qt6-webengine/patches/0105-chromium-revert-drop-of-system-java.patch
new file mode 100644
index 000000000000..44f3aa8fae5e
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0105-chromium-revert-drop-of-system-java.patch
@@ -0,0 +1,15 @@
+This was dropped for some reason in 6951c37cecd05979b232a39e5c10e6346a0f74ef
+--- a/src/3rdparty/chromium/third_party/closure_compiler/compiler.py
++++ b/src/3rdparty/chromium/third_party/closure_compiler/compiler.py
+@@ -13,8 +13,9 @@ import subprocess
+ 
+ 
+ _CURRENT_DIR = os.path.join(os.path.dirname(__file__))
+-_JAVA_PATH = os.path.join(_CURRENT_DIR, "..", "jdk", "current", "bin", "java")
+-assert os.path.isfile(_JAVA_PATH), "java only allowed in android builds"
++_JAVA_BIN = "java"
++_JDK_PATH = os.path.join(_CURRENT_DIR, "..", "jdk", "current", "bin", "java")
++_JAVA_PATH = _JDK_PATH if os.path.isfile(_JDK_PATH) else _JAVA_BIN
+ 
+ class Compiler(object):
+   """Runs the Closure compiler on given source files to typecheck them
diff --git a/srcpkgs/qt6-webengine/patches/0106-chromium-system-nodejs.patch b/srcpkgs/qt6-webengine/patches/0106-chromium-system-nodejs.patch
new file mode 100644
index 000000000000..1e067cc6eda0
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0106-chromium-system-nodejs.patch
@@ -0,0 +1,20 @@
+--- a/src/3rdparty/chromium/third_party/node/node.py
++++ b/src/3rdparty/chromium/third_party/node/node.py
+@@ -36,11 +36,12 @@ def GetBinaryPath():
+   if platform.system() == 'Darwin' and platform.machine() == 'arm64':
+       return os.path.join(os_path.join(os_path.dirname(__file__), 'mac',
+                           'node-darwin-arm64', 'bin', 'node'))
+-  return os_path.join(os_path.dirname(__file__), *{
+-    'Darwin': ('mac', 'node-darwin-x64', 'bin', 'node'),
+-    'Linux': ('linux', 'node-linux-x64', 'bin', 'node'),
+-    'Windows': ('win', 'node.exe'),
+-  }[platform.system()])
++  return "/usr/bin/node"
++  #return os_path.join(os_path.dirname(__file__), *{
++  #  'Darwin': ('mac', 'node-darwin-x64', 'bin', 'node'),
++  #  'Linux': ('linux', 'node-linux-x64', 'bin', 'node'),
++  #  'Windows': ('win', 'node.exe'),
++  #}[platform.system()])
+ 
+ 
+ def RunNode(cmd_parts, stdout=None):
diff --git a/srcpkgs/qt6-webengine/patches/0107-chromium-cursed^Uscoped_file.patch b/srcpkgs/qt6-webengine/patches/0107-chromium-cursed^Uscoped_file.patch
new file mode 100644
index 000000000000..a8f5d971883d
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0107-chromium-cursed^Uscoped_file.patch
@@ -0,0 +1,18 @@
+--- a/src/3rdparty/chromium/base/files/scoped_file_linux.cc
++++ b/src/3rdparty/chromium/base/files/scoped_file_linux.cc
+@@ -77,15 +77,3 @@ bool IsFDOwned(int fd) {
+ }
+ 
+ }  // namespace base
+-
+-extern "C" {
+-
+-int __close(int);
+-
+-__attribute__((visibility("default"), noinline)) int close(int fd) {
+-  if (base::IsFDOwned(fd) && g_is_ownership_enforced)
+-    CrashOnFdOwnershipViolation();
+-  return __close(fd);
+-}
+-
+-}  // extern "C"
diff --git a/srcpkgs/qt6-webengine/patches/0108-chromium-fix-narrowing-cast.patch b/srcpkgs/qt6-webengine/patches/0108-chromium-fix-narrowing-cast.patch
new file mode 100644
index 000000000000..ed32cd9b7415
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0108-chromium-fix-narrowing-cast.patch
@@ -0,0 +1,53 @@
+--- a/src/3rdparty/chromium/base/files/file_util_linux.cc
++++ b/src/3rdparty/chromium/base/files/file_util_linux.cc
+@@ -23,14 +23,14 @@ bool GetFileSystemType(const FilePath& p
+ 
+   // Not all possible |statfs_buf.f_type| values are in linux/magic.h.
+   // Missing values are copied from the statfs man page.
+-  switch (statfs_buf.f_type) {
++  switch (static_cast<uintmax_t>(statfs_buf.f_type)) {
+     case 0:
+       *type = FILE_SYSTEM_0;
+       break;
+     case EXT2_SUPER_MAGIC:  // Also ext3 and ext4
+     case MSDOS_SUPER_MAGIC:
+     case REISERFS_SUPER_MAGIC:
+-    case static_cast<int>(BTRFS_SUPER_MAGIC):
++    case BTRFS_SUPER_MAGIC:
+     case 0x5346544E:  // NTFS
+     case 0x58465342:  // XFS
+     case 0x3153464A:  // JFS
+@@ -40,14 +40,14 @@ bool GetFileSystemType(const FilePath& p
+       *type = FILE_SYSTEM_NFS;
+       break;
+     case SMB_SUPER_MAGIC:
+-    case static_cast<int>(0xFF534D42):  // CIFS
++    case 0xFF534D42:  // CIFS
+       *type = FILE_SYSTEM_SMB;
+       break;
+     case CODA_SUPER_MAGIC:
+       *type = FILE_SYSTEM_CODA;
+       break;
+-    case static_cast<int>(HUGETLBFS_MAGIC):
+-    case static_cast<int>(RAMFS_MAGIC):
++    case HUGETLBFS_MAGIC:
++    case RAMFS_MAGIC:
+     case TMPFS_MAGIC:
+       *type = FILE_SYSTEM_MEMORY;
+       break;
+--- a/src/3rdparty/chromium/base/system/sys_info_posix.cc
++++ b/src/3rdparty/chromium/base/system/sys_info_posix.cc
+@@ -100,10 +100,10 @@ bool IsStatsZeroIfUnlimited(const base::
+   if (HANDLE_EINTR(statfs(path.value().c_str(), &stats)) != 0)
+     return false;
+ 
+-  switch (stats.f_type) {
++  switch (static_cast<uintmax_t>(stats.f_type)) {
+     case TMPFS_MAGIC:
+-    case static_cast<int>(HUGETLBFS_MAGIC):
+-    case static_cast<int>(RAMFS_MAGIC):
++    case HUGETLBFS_MAGIC:
++    case RAMFS_MAGIC:
+       return true;
+   }
+   return false;
diff --git a/srcpkgs/qt6-webengine/patches/0109-chromium-remove-strip_binary.patch b/srcpkgs/qt6-webengine/patches/0109-chromium-remove-strip_binary.patch
new file mode 100644
index 000000000000..5ebd16e659af
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0109-chromium-remove-strip_binary.patch
@@ -0,0 +1,32 @@
+--- a/src/3rdparty/chromium/chrome/test/chromedriver/BUILD.gn
++++ b/src/3rdparty/chromium/chrome/test/chromedriver/BUILD.gn
+@@ -308,11 +308,7 @@ source_set("lib") {
+   }
+ }
+ 
+-if (is_linux) {
+-  chromedriver_output = "chromedriver.unstripped"
+-} else {
+-  chromedriver_output = "chromedriver"
+-}
++chromedriver_output = "chromedriver"
+ 
+ executable("$chromedriver_output") {
+   testonly = true
+@@ -336,16 +332,6 @@ executable("$chromedriver_output") {
+   }
+ }
+ 
+-if (is_linux) {
+-  strip_binary("chromedriver") {
+-    testonly = true
+-    binary_input = "$root_out_dir/$chromedriver_output"
+-    symbol_output = "$root_out_dir/chromedriver.debug"
+-    stripped_binary_output = "$root_out_dir/chromedriver"
+-    deps = [ ":$chromedriver_output" ]
+-  }
+-}
+-
+ python_library("chromedriver_py_tests") {
+   testonly = true
+   deps = [
diff --git a/srcpkgs/qt6-webengine/patches/0110-chromium-revert-use-ffile-compilation-dir.patch b/srcpkgs/qt6-webengine/patches/0110-chromium-revert-use-ffile-compilation-dir.patch
new file mode 100644
index 000000000000..a00f7ea80f7a
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0110-chromium-revert-use-ffile-compilation-dir.patch
@@ -0,0 +1,57 @@
+From 34a955823630096f5b01c2b01d51c1ea59d22763 Mon Sep 17 00:00:00 2001
+From: Zequan Wu <zequanwu@google.com>
+Date: Tue, 20 Jul 2021 14:13:50 +0000
+Subject: [PATCH] Use -ffile-compilation-dir= instead of
+ -fdebug-compilation-dir=
+
+Bug: 1010267
+Change-Id: If2b4ead8535a76490eb466a38e3d8fed6ea91079
+Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2770738
+Auto-Submit: Zequan Wu <zequanwu@google.com>
+Commit-Queue: Nico Weber <thakis@chromium.org>
+Reviewed-by: Nico Weber <thakis@chromium.org>
+Cr-Commit-Position: refs/heads/master@{#903456}
+--- a/src/3rdparty/chromium/build/config/compiler/BUILD.gn
++++ b/src/3rdparty/chromium/build/config/compiler/BUILD.gn
+@@ -1269,19 +1269,12 @@ config("compiler_deterministic") {
+     # different build directory like "out/feature_a" and "out/feature_b" if
+     # we build same files with same compile flag.
+     # Other paths are already given in relative, no need to normalize them.
+-    if (is_nacl) {
+-      # TODO(https://crbug.com/1231236): Use -ffile-compilation-dir= here.
+-      cflags += [
+-        "-Xclang",
+-        "-fdebug-compilation-dir",
+-        "-Xclang",
+-        ".",
+-      ]
+-    } else {
+-      # -ffile-compilation-dir is an alias for both -fdebug-compilation-dir=
+-      # and -fcoverage-compilation-dir=.
+-      cflags += [ "-ffile-compilation-dir=." ]
+-    }
++    cflags += [
++      "-Xclang",
++      "-fdebug-compilation-dir",
++      "-Xclang",
++      ".",
++    ]
+     if (!is_win) {
+       # We don't use clang -cc1as on Windows (yet? https://crbug.com/762167)
+       asmflags = [ "-Wa,-fdebug-compilation-dir,." ]
+--- a/src/3rdparty/chromium/build/config/compiler/compiler.gni
++++ b/src/3rdparty/chromium/build/config/compiler/compiler.gni
+@@ -228,8 +228,11 @@ declare_args() {
+ # deterministic builds to reduce compile times, so this is less relevant for
+ # official builders.
+ strip_absolute_paths_from_debug_symbols_default =
+-    is_android || is_fuchsia || is_nacl || (is_win && use_lld) || is_linux ||
+-    is_chromeos || (is_apple && !enable_dsyms)
++    # TODO(crbug.com/1010267): remove '!use_clang_coverage', coverage build has
++    # dependency to absolute path of source files.
++    !use_clang_coverage &&
++    (is_android || is_fuchsia || is_nacl || (is_win && use_lld) || is_linux ||
++     is_chromeos || (is_apple && !enable_dsyms))
+ 
+ declare_args() {
+   strip_absolute_paths_from_debug_symbols = strip_absolute_paths_from_debug_symbols_default
diff --git a/srcpkgs/qt6-webengine/patches/0111-chromium-no-Wno-stringop-overread.patch b/srcpkgs/qt6-webengine/patches/0111-chromium-no-Wno-stringop-overread.patch
new file mode 100644
index 000000000000..03eac3f8e067
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0111-chromium-no-Wno-stringop-overread.patch
@@ -0,0 +1,10 @@
+--- a/src/3rdparty/chromium/build/config/compiler/BUILD.gn
++++ b/src/3rdparty/chromium/build/config/compiler/BUILD.gn
+@@ -394,7 +394,6 @@ config("compiler") {
+         "-Wno-parentheses",
+         "-Wno-sign-compare", # fido
+         "-Wno-stringop-overflow", # skia, libaom, protobuf, icu
+-        "-Wno-stringop-overread", # libaom
+         "-Wno-psabi", # skia
+         "-Wno-multichar", # crashpad
+         "-Wno-format-zero-length", # user_agent.cc
diff --git a/srcpkgs/qt6-webengine/patches/0150-chromium-glibc-libc_malloc.patch b/srcpkgs/qt6-webengine/patches/0150-chromium-glibc-libc_malloc.patch
new file mode 100644
index 000000000000..7e1b66e5c73d
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0150-chromium-glibc-libc_malloc.patch
@@ -0,0 +1,24 @@
+--- a/src/3rdparty/chromium/base/process/memory_linux.cc
++++ b/src/3rdparty/chromium/base/process/memory_linux.cc
+@@ -23,6 +23,12 @@
+ #include "third_party/tcmalloc/chromium/src/gperftools/tcmalloc.h"
+ #endif
+ 
++#if defined(LIBC_GLIBC)
++extern "C" {
++extern void *__libc_malloc(size_t size);
++}
++#endif
++
+ namespace base {
+ 
+ namespace {
+@@ -120,7 +126,7 @@ bool UncheckedMalloc(size_t size, void**
+     (!defined(LIBC_GLIBC) && !BUILDFLAG(USE_TCMALLOC))
+   *result = malloc(size);
+ #elif defined(LIBC_GLIBC) && !BUILDFLAG(USE_TCMALLOC)
+-  *result = __libc_malloc(size);
++  *result = ::__libc_malloc(size);
+ #elif BUILDFLAG(USE_TCMALLOC)
+   *result = tc_malloc_skip_new_handler(size);
+ #endif
diff --git a/srcpkgs/qt6-webengine/patches/0200-chromium-musl-include-sys-reg.h-to-get-__WORDSIZE.patch b/srcpkgs/qt6-webengine/patches/0200-chromium-musl-include-sys-reg.h-to-get-__WORDSIZE.patch
new file mode 100644
index 000000000000..41b90071b5e4
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0200-chromium-musl-include-sys-reg.h-to-get-__WORDSIZE.patch
@@ -0,0 +1,21 @@
+From 9001c54d6b974449174a8cee8f3f5d78a9bd6c9e Mon Sep 17 00:00:00 2001
+From: Felix Janda <felix.janda@posteo.de>
+Date: Sun, 1 Feb 2015 14:26:52 +0100
+Subject: [PATCH 3/6] include <sys/reg.h> to get __WORDSIZE on musl libc
+
+---
+ qtwebengine/src/3rdparty/chromium/third_party/breakpad/breakpad/src/common/linux/elf_core_dump.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/common/linux/elf_core_dump.h
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/common/linux/elf_core_dump.h
+@@ -37,6 +37,9 @@
+ #include <limits.h>
+ #include <link.h>
+ #include <stddef.h>
++#ifndef __GLIBC__
++#include <sys/reg.h>
++#endif
+ 
+ #include "common/memory_range.h"
+ 
diff --git a/srcpkgs/qt6-webengine/patches/0201-chromium-musl-dispatch-to-musl.patch b/srcpkgs/qt6-webengine/patches/0201-chromium-musl-dispatch-to-musl.patch
new file mode 100644
index 000000000000..a58a688a4b55
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0201-chromium-musl-dispatch-to-musl.patch
@@ -0,0 +1,103 @@
+--- a/src/3rdparty/chromium/base/allocator/allocator_shim_default_dispatch_to_glibc.cc
++++ b/src/3rdparty/chromium/base/allocator/allocator_shim_default_dispatch_to_glibc.cc
+@@ -8,6 +8,7 @@
+ #include <dlfcn.h>
+ #include <malloc.h>
+ 
++#if defined(__GLIBC__)
+ // This translation unit defines a default dispatch for the allocator shim which
+ // routes allocations to libc functions.
+ // The code here is strongly inspired from tcmalloc's libc_override_glibc.h.
+@@ -87,3 +88,92 @@ const AllocatorDispatch AllocatorDispatc
+     nullptr,               /* aligned_free_function */
+     nullptr,               /* next */
+ };
++
++#else // defined(__GLIBC__)
++
++#include <dlfcn.h>
++
++extern "C" {
++// Declare function pointers to the memory functions
++typedef void* (*t_libc_malloc)(size_t size);
++typedef void* (*t_libc_calloc)(size_t n, size_t size);
++typedef void* (*t_libc_realloc)(void* address, size_t size);
++typedef void* (*t_libc_memalign)(size_t alignment, size_t size);
++typedef void (*t_libc_free)(void* ptr);
++typedef size_t (*t_libc_malloc_usable_size)(void* ptr);
++
++// Static instances of pointers to libc.so dl symbols
++static t_libc_malloc libc_malloc = NULL;
++static t_libc_calloc libc_calloc = NULL;
++static t_libc_realloc libc_realloc = NULL;
++static t_libc_memalign libc_memalign = NULL;
++static t_libc_free libc_free = NULL;
++static t_libc_malloc_usable_size libc_malloc_usable_size = NULL;
++
++// resolve the symbols in libc.so
++void musl_libc_memory_init(void)
++{
++  libc_malloc = (t_libc_malloc) dlsym(RTLD_NEXT, "malloc");
++  libc_calloc = (t_libc_calloc) dlsym(RTLD_NEXT, "calloc");
++  libc_realloc = (t_libc_realloc) dlsym(RTLD_NEXT, "realloc");
++  libc_memalign = (t_libc_memalign) dlsym(RTLD_NEXT, "memalign");
++  libc_free = (t_libc_free) dlsym(RTLD_NEXT, "free");
++  libc_malloc_usable_size = (t_libc_malloc_usable_size) dlsym(RTLD_NEXT, "malloc_usable_size");
++}
++}  // extern "C"
++
++namespace {
++
++using base::allocator::AllocatorDispatch;
++
++void* MuslMalloc(const AllocatorDispatch*, size_t size, void* context) {
++  if (!libc_malloc)
++    musl_libc_memory_init();
++  return (*libc_malloc)(size);
++}
++
++void* MuslCalloc(const AllocatorDispatch*, size_t n, size_t size, void* context) {
++  if (!libc_calloc)
++    musl_libc_memory_init();
++  return (*libc_calloc)(n, size);
++}
++
++void* MuslRealloc(const AllocatorDispatch*, void* address, size_t size, void* context) {
++  if (!libc_realloc)
++    musl_libc_memory_init();
++  return (*libc_realloc)(address, size);
++}
++
++void* MuslMemalign(const AllocatorDispatch*, size_t alignment, size_t size, void* context) {
++  if (!libc_memalign)
++    musl_libc_memory_init();
++  return (*libc_memalign)(alignment, size);
++}
++
++void MuslFree(const AllocatorDispatch*, void* address, void* context) {
++  if (!libc_free)
++    musl_libc_memory_init();
++  (*libc_free)(address);
++}
++
++size_t MuslGetSizeEstimate(const AllocatorDispatch*, void* address, void* context) {
++  // TODO(siggi, primiano): malloc_usable_size may need redirection in the
++  //     presence of interposing shims that divert allocations.
++  if (!libc_malloc_usable_size)
++    musl_libc_memory_init();
++  return (*libc_malloc_usable_size)(address);
++}
++
++}  // namespace
++
++const AllocatorDispatch AllocatorDispatch::default_dispatch = {
++    &MuslMalloc,           /* alloc_function */
++    &MuslCalloc,           /* alloc_zero_initialized_function */
++    &MuslMemalign,         /* alloc_aligned_function */
++    &MuslRealloc,          /* realloc_function */
++    &MuslFree,             /* free_function */
++    &MuslGetSizeEstimate,  /* get_size_estimate_function */
++    nullptr,               /* next */
++};
++
++#endif
diff --git a/srcpkgs/qt6-webengine/patches/0202-chromium-musl-no-mallinfo.patch b/srcpkgs/qt6-webengine/patches/0202-chromium-musl-no-mallinfo.patch
new file mode 100644
index 000000000000..a5bdb5a43a5f
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0202-chromium-musl-no-mallinfo.patch
@@ -0,0 +1,62 @@
+--- a/src/3rdparty/chromium/base/process/process_metrics_posix.cc
++++ b/src/3rdparty/chromium/base/process/process_metrics_posix.cc
+@@ -105,7 +105,7 @@ void IncreaseFdLimitTo(unsigned int max_
+ 
+ #endif  // !defined(OS_FUCHSIA)
+ 
+-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID)
++#if (defined(OS_LINUX) && defined(__GLIBC__)) || defined(OS_CHROMEOS) || defined(OS_ANDROID)
+ namespace {
+ 
+ size_t GetMallocUsageMallinfo() {
+@@ -127,16 +127,16 @@ size_t GetMallocUsageMallinfo() {
+ }
+ 
+ }  // namespace
+-#endif  // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID)
++#endif  // (defined(OS_LINUX) && defined(__GLIBC__)) || defined(OS_CHROMEOS) || defined(OS_ANDROID)
+ 
+ size_t ProcessMetrics::GetMallocUsage() {
+ #if defined(OS_APPLE)
+   malloc_statistics_t stats = {0};
+   malloc_zone_statistics(nullptr, &stats);
+   return stats.size_in_use;
+-#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID)
++#elif (defined(OS_LINUX) && defined(__GLIBC__)) || defined(OS_CHROMEOS) || defined(OS_ANDROID)
+   return GetMallocUsageMallinfo();
+-#elif defined(OS_FUCHSIA)
++#else
+   // TODO(fuchsia): Not currently exposed. https://crbug.com/735087.
+   return 0;
+ #endif
+--- a/src/3rdparty/chromium/third_party/tflite/src/tensorflow/lite/profiling/memory_info.cc
++++ b/src/3rdparty/chromium/third_party/tflite/src/tensorflow/lite/profiling/memory_info.cc
+@@ -27,7 +27,7 @@ namespace memory {
+ const int MemoryUsage::kValueNotSet = 0;
+ 
+ bool MemoryUsage::IsSupported() {
+-#ifdef __linux__
++#ifdef __GLIBC__
+   return true;
+ #endif
+   return false;
+@@ -35,7 +35,7 @@ bool MemoryUsage::IsSupported() {
+ 
+ MemoryUsage GetMemoryUsage() {
+   MemoryUsage result;
+-#ifdef __linux__
++#ifdef __GLIBC__
+   rusage res;
+   if (getrusage(RUSAGE_SELF, &res) == 0) {
+     result.max_rss_kb = res.ru_maxrss;
+--- a/src/3rdparty/chromium/base/trace_event/malloc_dump_provider.cc
++++ b/src/3rdparty/chromium/base/trace_event/malloc_dump_provider.cc
+@@ -213,7 +213,7 @@ bool MallocDumpProvider::OnMemoryDump(co
+                      &allocated_objects_count);
+ #elif defined(OS_FUCHSIA)
+ // TODO(fuchsia): Port, see https://crbug.com/706592.
+-#else
++#elif defined(__GLIBC__)
+ #if defined(__GLIBC__) && defined(__GLIBC_PREREQ)
+ #if __GLIBC_PREREQ(2, 33)
+ #define MALLINFO2_FOUND_IN_LIBC
diff --git a/srcpkgs/qt6-webengine/patches/0203-chromium-musl-siginfo_t.patch b/srcpkgs/qt6-webengine/patches/0203-chromium-musl-siginfo_t.patch
new file mode 100644
index 000000000000..43ef7fd7c5d2
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0203-chromium-musl-siginfo_t.patch
@@ -0,0 +1,18 @@
+There's a subtle difference in the internal name of siginfo_t fields
+between glibc and musl. The structure itself is equivalent, so it
+should suffice to add a macro to rename the field.
+
+--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf/trap.cc
++++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf/trap.cc
+@@ -174,7 +174,11 @@ void Trap::SigSys(int nr, LinuxSigInfo*
+   // If the version of glibc doesn't include this information in
+   // siginfo_t (older than 2.17), we need to explicitly copy it
+   // into an arch_sigsys structure.
++#if defined(__GLIBC__)
+   memcpy(&sigsys, &info->_sifields, sizeof(sigsys));
++#else
++  memcpy(&sigsys, &info->__si_fields, sizeof(sigsys));
++#endif
+ #endif
+ 
+ #if defined(__mips__)
diff --git a/srcpkgs/qt6-webengine/patches/0204-chromium-musl-stackstart.patch b/srcpkgs/qt6-webengine/patches/0204-chromium-musl-stackstart.patch
new file mode 100644
index 000000000000..b03cf43b86db
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0204-chromium-musl-stackstart.patch
@@ -0,0 +1,20 @@
+--- a/src/3rdparty/chromium/third_party/blink/renderer/platform/wtf/stack_util.cc
++++ b/src/3rdparty/chromium/third_party/blink/renderer/platform/wtf/stack_util.cc
+@@ -29,7 +29,7 @@ size_t GetUnderestimatedStackSize() {
+ // FIXME: On Mac OSX and Linux, this method cannot estimate stack size
+ // correctly for the main thread.
+ 
+-#elif defined(__GLIBC__) || defined(OS_ANDROID) || defined(OS_FREEBSD) || \
++#elif defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FREEBSD) || \
+     defined(OS_FUCHSIA)
+   // pthread_getattr_np() can fail if the thread is not invoked by
+   // pthread_create() (e.g., the main thread of blink_unittests).
+@@ -97,7 +97,7 @@ return Threading::ThreadStackSize();
+ }
+ 
+ void* GetStackStart() {
+-#if defined(__GLIBC__) || defined(OS_ANDROID) || defined(OS_FREEBSD) || \
++#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FREEBSD) || \
+     defined(OS_FUCHSIA)
+   pthread_attr_t attr;
+   int error;
diff --git a/srcpkgs/qt6-webengine/patches/0205-chromium-musl-sandbox.patch b/srcpkgs/qt6-webengine/patches/0205-chromium-musl-sandbox.patch
new file mode 100644
index 000000000000..772a578fd823
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0205-chromium-musl-sandbox.patch
@@ -0,0 +1,92 @@
+--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc
++++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc
+@@ -138,7 +138,7 @@ namespace sandbox {
+ // present (as in newer versions of posix_spawn).
+ ResultExpr RestrictCloneToThreadsAndEPERMFork() {
+   const Arg<unsigned long> flags(0);
+-
++#if defined(__GLIBC__)
+   // TODO(mdempsky): Extend DSL to support (flags & ~mask1) == mask2.
+   const uint64_t kAndroidCloneMask = CLONE_VM | CLONE_FS | CLONE_FILES |
+                                      CLONE_SIGHAND | CLONE_THREAD |
+@@ -165,6 +165,17 @@ ResultExpr RestrictCloneToThreadsAndEPER
+   return If(IsAndroid() ? android_test : glibc_test, Allow())
+       .ElseIf(is_fork_or_clone_vfork, Error(EPERM))
+       .Else(CrashSIGSYSClone());
++#else
++  const int required = CLONE_VM | CLONE_FS | CLONE_FILES | CLONE_SIGHAND |
++                       CLONE_THREAD | CLONE_SYSVSEM;
++  const int safe = CLONE_SETTLS | CLONE_PARENT_SETTID | CLONE_CHILD_CLEARTID |
++                   CLONE_DETACHED;
++  const BoolExpr thread_clone_ok = (flags&~safe)==required;
++
++  return If(thread_clone_ok, Allow())
++      .ElseIf((flags & (CLONE_VM | CLONE_THREAD)) == 0, Error(EPERM))
++      .Else(CrashSIGSYSClone());
++#endif
+ }
+ 
+ #ifndef PR_PAC_RESET_KEYS
+--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
++++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
+@@ -419,6 +419,9 @@ bool SyscallSets::IsAllowedProcessStartO
+ #if defined(__i386__)
+     case __NR_waitpid:
+ #endif
++#if !defined(__GLIBC__)
++    case __NR_set_tid_address:
++#endif
+       return true;
+     case __NR_clone:  // Should be parameter-restricted.
+     case __NR_setns:  // Privileged.
+@@ -431,7 +434,9 @@ bool SyscallSets::IsAllowedProcessStartO
+ #if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
+     case __NR_set_thread_area:
+ #endif
++#if defined(__GLIBC__)
+     case __NR_set_tid_address:
++#endif
+     case __NR_unshare:
+ #if !defined(__mips__) && !defined(__aarch64__)
+     case __NR_vfork:
+@@ -545,6 +550,9 @@ bool SyscallSets::IsAllowedAddressSpaceA
+     case __NR_mlock:
+     case __NR_munlock:
+     case __NR_munmap:
++#if !defined(__GLIBC__)
++    case __NR_mremap:
++#endif
+       return true;
+     case __NR_madvise:
+     case __NR_mincore:
+@@ -562,7 +570,9 @@ bool SyscallSets::IsAllowedAddressSpaceA
+     case __NR_modify_ldt:
+ #endif
+     case __NR_mprotect:
++#if defined(__GLIBC__)
+     case __NR_mremap:
++#endif
+     case __NR_msync:
+     case __NR_munlockall:
+     case __NR_readahead:
+--- a/src/3rdparty/chromium/sandbox/policy/linux/bpf_renderer_policy_linux.cc
++++ b/src/3rdparty/chromium/sandbox/policy/linux/bpf_renderer_policy_linux.cc
+@@ -97,11 +97,18 @@ ResultExpr RendererProcessPolicy::Evalua
+     case __NR_sysinfo:
+     case __NR_times:
+     case __NR_uname:
++#if !defined(__GLIBC__)
++    case __NR_sched_getparam:
++    case __NR_sched_getscheduler:
++    case __NR_sched_setscheduler:
++#endif
+       return Allow();
+     case __NR_sched_getaffinity:
++#if defined(__GLIBC__)
+     case __NR_sched_getparam:
+     case __NR_sched_getscheduler:
+     case __NR_sched_setscheduler:
++#endif
+       return RestrictSchedTarget(GetPolicyPid(), sysno);
+     case __NR_prlimit64:
+       // See crbug.com/662450 and setrlimit comment above.
diff --git a/srcpkgs/qt6-webengine/patches/0206-chromium-musl-default-stacksize.patch b/srcpkgs/qt6-webengine/patches/0206-chromium-musl-default-stacksize.patch
new file mode 100644
index 000000000000..bc07495b8144
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0206-chromium-musl-default-stacksize.patch
@@ -0,0 +1,15 @@
+--- a/src/3rdparty/chromium/base/threading/platform_thread_linux.cc
++++ b/src/3rdparty/chromium/base/threading/platform_thread_linux.cc
+@@ -439,7 +439,12 @@ void TerminateOnThread() {}
+ 
+ size_t GetDefaultThreadStackSize(const pthread_attr_t& attributes) {
+ #if !defined(THREAD_SANITIZER)
++#if defined(__GLIBC__)
+   return 0;
++#else // defined(__GLIBC__)
++  // For Musl libc try with a default stack size of 2 MiB
++  return 2 * 1024 * 1024;
++#endif // !defined(__GLIBC__)
+ #else
+   // ThreadSanitizer bloats the stack heavily. Evidence has been that the
+   // default stack size isn't enough for some browser tests.
diff --git a/srcpkgs/qt6-webengine/patches/0208-chromium-musl-execinfo.patch b/srcpkgs/qt6-webengine/patches/0208-chromium-musl-execinfo.patch
new file mode 100644
index 000000000000..9f3b964676b3
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0208-chromium-musl-execinfo.patch
@@ -0,0 +1,125 @@
+--- a/src/3rdparty/chromium/base/debug/stack_trace.cc
++++ b/src/3rdparty/chromium/base/debug/stack_trace.cc
+@@ -252,7 +252,9 @@ void StackTrace::Print() const {
+ }
+ 
+ void StackTrace::OutputToStream(std::ostream* os) const {
++#if defined(__GLIBC__) && !defined(_AIX)
+   OutputToStreamWithPrefix(os, nullptr);
++#endif
+ }
+ 
+ std::string StackTrace::ToString() const {
+@@ -260,7 +262,7 @@ std::string StackTrace::ToString() const
+ }
+ std::string StackTrace::ToStringWithPrefix(const char* prefix_string) const {
+   std::stringstream stream;
+-#if !defined(__UCLIBC__) && !defined(_AIX)
++#if defined(__GLIBC__) && !defined(_AIX)
+   OutputToStreamWithPrefix(&stream, prefix_string);
+ #endif
+   return stream.str();
+--- a/src/3rdparty/chromium/base/debug/stack_trace_posix.cc
++++ b/src/3rdparty/chromium/base/debug/stack_trace_posix.cc
+@@ -27,7 +27,7 @@
+ #if !defined(USE_SYMBOLIZE)
+ #include <cxxabi.h>
+ #endif
+-#if !defined(__UCLIBC__) && !defined(_AIX)
++#if defined(__GLIBC__) && !defined(_AIX)
+ #include <execinfo.h>
+ #endif
+ 
+@@ -89,7 +89,7 @@ void DemangleSymbols(std::string* text)
+   // Note: code in this function is NOT async-signal safe (std::string uses
+   // malloc internally).
+ 
+-#if !defined(__UCLIBC__) && !defined(_AIX)
++#if defined(__GLIBC__) && !defined(_AIX)
+   std::string::size_type search_from = 0;
+   while (search_from < text->size()) {
+     // Look for the start of a mangled symbol, from search_from.
+@@ -124,7 +124,7 @@ void DemangleSymbols(std::string* text)
+       search_from = mangled_start + 2;
+     }
+   }
+-#endif  // !defined(__UCLIBC__) && !defined(_AIX)
++#endif  // !defined(__GLIBC__) && !defined(_AIX)
+ }
+ #endif  // !defined(USE_SYMBOLIZE)
+ 
+@@ -136,7 +136,7 @@ class BacktraceOutputHandler {
+   virtual ~BacktraceOutputHandler() = default;
+ };
+ 
+-#if !defined(__UCLIBC__) && !defined(_AIX)
++#if defined(__GLIBC__) && !defined(_AIX)
+ void OutputPointer(void* pointer, BacktraceOutputHandler* handler) {
+   // This should be more than enough to store a 64-bit number in hex:
+   // 16 hex digits + 1 for null-terminator.
+@@ -219,7 +219,7 @@ void ProcessBacktrace(void* const* trace
+   }
+ #endif  // defined(USE_SYMBOLIZE)
+ }
+-#endif  // !defined(__UCLIBC__) && !defined(_AIX)
++#endif  // !defined(__GLIBC__) && !defined(_AIX)
+ 
+ void PrintToStderr(const char* output) {
+   // NOTE: This code MUST be async-signal safe (it's used by in-process
+@@ -839,7 +839,7 @@ size_t CollectStackTrace(void** trace, s
+   // If we do not have unwind tables, then try tracing using frame pointers.
+   return base::debug::TraceStackFramePointers(const_cast<const void**>(trace),
+                                               count, 0);
+-#elif !defined(__UCLIBC__) && !defined(_AIX)
++#elif defined(__GLIBC__) && !defined(_AIX)
+   // Though the backtrace API man page does not list any possible negative
+   // return values, we take no chance.
+   return base::saturated_cast<size_t>(backtrace(trace, count));
+@@ -852,13 +852,13 @@ void StackTrace::PrintWithPrefix(const c
+ // NOTE: This code MUST be async-signal safe (it's used by in-process
+ // stack dumping signal handler). NO malloc or stdio is allowed here.
+ 
+-#if !defined(__UCLIBC__) && !defined(_AIX)
++#if defined(__GLIBC__) && !defined(_AIX)
+   PrintBacktraceOutputHandler handler;
+   ProcessBacktrace(trace_, count_, prefix_string, &handler);
+ #endif
+ }
+ 
+-#if !defined(__UCLIBC__) && !defined(_AIX)
++#if defined(__GLIBC__) && !defined(_AIX)
+ void StackTrace::OutputToStreamWithPrefix(std::ostream* os,
+                                           const char* prefix_string) const {
+   StreamBacktraceOutputHandler handler(os);
+--- a/src/3rdparty/chromium/base/logging.cc
++++ b/src/3rdparty/chromium/base/logging.cc
+@@ -582,7 +582,7 @@ LogMessage::LogMessage(const char* file,
+ 
+ LogMessage::~LogMessage() {
+   size_t stack_start = stream_.tellp();
+-#if !defined(OFFICIAL_BUILD) && !defined(OS_NACL) && !defined(__UCLIBC__) && \
++#if !defined(OFFICIAL_BUILD) && !defined(OS_NACL) && defined(__GLIBC__) && \
+     !defined(OS_AIX)
+   if (severity_ == LOGGING_FATAL && !base::debug::BeingDebugged()) {
+     // Include a stack trace on a fatal, unless a debugger is attached.
+--- 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 @@
+ 
+ #if defined(DEBUG) && defined(V8_OS_LINUX) && !defined(V8_OS_ANDROID)
+ #define SYMBOLIZE_FUNCTION
++#if defined(__GLIBC__)
+ #include <execinfo.h>
++#endif
+ 
+ #include <vector>
+ 
+@@ -103,7 +105,7 @@ void ExternalReferenceTable::Init(Isolat
+ }
+ 
+ const char* ExternalReferenceTable::ResolveSymbol(void* address) {
+-#ifdef SYMBOLIZE_FUNCTION
++#if defined(SYMBOLIZE_FUNCTION) && defined(__GLIBC__)
+   char** names = backtrace_symbols(&address, 1);
+   const char* name = names[0];
+   // The array of names is malloc'ed. However, each name string is static
diff --git a/srcpkgs/qt6-webengine/patches/0209-chromium-musl-thread-stacksize.patch b/srcpkgs/qt6-webengine/patches/0209-chromium-musl-thread-stacksize.patch
new file mode 100644
index 000000000000..4b760a428b25
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0209-chromium-musl-thread-stacksize.patch
@@ -0,0 +1,22 @@
+--- a/src/3rdparty/chromium/ppapi/utility/threading/simple_thread.cc
++++ b/src/3rdparty/chromium/ppapi/utility/threading/simple_thread.cc
+@@ -13,7 +13,7 @@ namespace pp {
+ namespace {
+ 
+ // Use 2MB default stack size for Native Client, otherwise use system default.
+-#if defined(__native_client__)
++#if defined(__native_client__) || !defined(__GLIBC__)
+ const size_t kDefaultStackSize = 2 * 1024 * 1024;
+ #else
+ const size_t kDefaultStackSize = 0;
+--- a/src/3rdparty/chromium/v8/src/base/platform/platform-posix.cc
++++ b/src/3rdparty/chromium/v8/src/base/platform/platform-posix.cc
+@@ -883,7 +883,7 @@ bool Thread::Start() {
+ #if V8_OS_MACOSX
+     // Default on Mac OS X is 512kB -- bump up to 1MB
+     stack_size = 1 * 1024 * 1024;
+-#elif V8_OS_AIX
++#elif V8_OS_AIX || !defined(__GLIBC__)
+     // Default on AIX is 96kB -- bump up to 2MB
+     stack_size = 2 * 1024 * 1024;
+ #endif
diff --git a/srcpkgs/qt6-webengine/patches/0210-chromium-musl-msgvec-push_back.patch b/srcpkgs/qt6-webengine/patches/0210-chromium-musl-msgvec-push_back.patch
new file mode 100644
index 000000000000..905daa223700
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0210-chromium-musl-msgvec-push_back.patch
@@ -0,0 +1,14 @@
+--- a/src/3rdparty/chromium/net/socket/udp_socket_posix.cc
++++ b/src/3rdparty/chromium/net/socket/udp_socket_posix.cc
+@@ -1162,7 +1162,11 @@ SendResult UDPSocketPosixSender::Interna
+     msg_iov->push_back({const_cast<char*>(buffer->data()), buffer->length()});
+   msgvec->reserve(buffers.size());
+   for (size_t j = 0; j < buffers.size(); j++)
++#if defined(__GLIBC__)
+     msgvec->push_back({{nullptr, 0, &msg_iov[j], 1, nullptr, 0, 0}, 0});
++#else
++    msgvec->push_back({{nullptr, 0, &msg_iov[j], 1, 0, 0, 0}, 0});
++#endif
+   int result = HANDLE_EINTR(Sendmmsg(fd, &msgvec[0], buffers.size(), 0));
+   SendResult send_result(0, 0, std::move(buffers));
+   if (result < 0) {
diff --git a/srcpkgs/qt6-webengine/patches/0211-chromium-musl-canonicalize-file-name-musl.patch b/srcpkgs/qt6-webengine/patches/0211-chromium-musl-canonicalize-file-name-musl.patch
new file mode 100644
index 000000000000..d43e6bd488bc
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0211-chromium-musl-canonicalize-file-name-musl.patch
@@ -0,0 +1,11 @@
+--- a/src/3rdparty/chromium/third_party/nasm/nasmlib/realpath.c
++++ b/src/3rdparty/chromium/third_party/nasm/nasmlib/realpath.c
+@@ -55,7 +55,7 @@
+  */
+ char *nasm_realpath(const char *rel_path)
+ {
+-    char *rp = canonicalize_file_name(rel_path);
++    char *rp = realpath(rel_path, NULL);
+     return rp ? rp : nasm_strdup(rel_path);
+ }
+ 
diff --git a/srcpkgs/qt6-webengine/patches/0212-chromium-musl-no-getcontext.patch b/srcpkgs/qt6-webengine/patches/0212-chromium-musl-no-getcontext.patch
new file mode 100644
index 000000000000..5755f1b45a7d
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0212-chromium-musl-no-getcontext.patch
@@ -0,0 +1,29 @@
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc
+@@ -489,8 +489,10 @@ bool ExceptionHandler::SimulateSignalDel
+   // ExceptionHandler::HandleSignal().
+   siginfo.si_code = SI_USER;
+   siginfo.si_pid = getpid();
+-  ucontext_t context;
++  ucontext_t context = { 0 };
++#if defined(__GLIBC__)
+   getcontext(&context);
++#endif
+   return HandleSignal(sig, &siginfo, &context);
+ }
+ 
+@@ -675,9 +677,14 @@ bool ExceptionHandler::WriteMinidump() {
+   sys_prctl(PR_SET_DUMPABLE, 1, 0, 0, 0);
+ 
+   CrashContext context;
++
++#if defined(__GLIBC__)
+   int getcontext_result = getcontext(&context.context);
+   if (getcontext_result)
+     return false;
++#else
++  return false;
++#endif
+ 
+ #if defined(__i386__)
+   // In CPUFillFromUContext in minidumpwriter.cc the stack pointer is retrieved
diff --git a/srcpkgs/qt6-webengine/patches/0213-chromium-musl-crashpad.patch b/srcpkgs/qt6-webengine/patches/0213-chromium-musl-crashpad.patch
new file mode 100644
index 000000000000..71bbad2af17e
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0213-chromium-musl-crashpad.patch
@@ -0,0 +1,24 @@
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/compat/linux/sys/ptrace.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/compat/linux/sys/ptrace.h
+@@ -17,7 +17,9 @@
+ 
+ #include_next <sys/ptrace.h>
+ 
++#ifdef __GLIBC__
+ #include <sys/cdefs.h>
++#endif
+ 
+ // https://sourceware.org/bugzilla/show_bug.cgi?id=22433
+ #if !defined(PTRACE_GET_THREAD_AREA) && !defined(PT_GET_THREAD_AREA) && \
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/util/linux/ptracer.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/util/linux/ptracer.cc
+@@ -26,6 +26,9 @@
+ 
+ #if defined(ARCH_CPU_X86_FAMILY)
+ #include <asm/ldt.h>
++#if !defined(__GLIBC__)
++#include <asm/ptrace-abi.h>
++#endif
+ #endif
+ 
+ namespace crashpad {
diff --git a/srcpkgs/qt6-webengine/patches/0214-chromium-musl-fixes.patch b/srcpkgs/qt6-webengine/patches/0214-chromium-musl-fixes.patch
new file mode 100644
index 000000000000..55b267ed1714
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0214-chromium-musl-fixes.patch
@@ -0,0 +1,108 @@
+--- a/src/3rdparty/chromium/sandbox/linux/suid/process_util.h
++++ b/src/3rdparty/chromium/sandbox/linux/suid/process_util.h
+@@ -12,6 +12,15 @@
+ #include <stdint.h>
+ #include <sys/types.h>
+ 
++#if !defined(__GLIBC__) && !defined(TEMP_FAILURE_RETRY)
++# define TEMP_FAILURE_RETRY(expression) \
++	(__extension__			\
++	 ({ long int __result;		\
++	  do __result = (long int) (expression); \
++	  while (__result == -1L && errno == EINTR); \
++	  __result; }))
++#endif
++
+ // This adjusts /proc/process/oom_score_adj so the Linux OOM killer
+ // will prefer certain process types over others. The range for the
+ // adjustment is [-1000, 1000], with [0, 1000] being user accessible.
+--- a/src/3rdparty/chromium/services/device/serial/serial_io_handler_posix.cc
++++ b/src/3rdparty/chromium/services/device/serial/serial_io_handler_posix.cc
+@@ -6,6 +6,7 @@
+ 
+ #include <sys/ioctl.h>
+ #include <termios.h>
++#include <asm-generic/ioctls.h>
+ 
+ #include <algorithm>
+ #include <utility>
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h
+@@ -38,6 +38,10 @@
+ #include "common/memory_allocator.h"
+ #include "google_breakpad/common/minidump_format.h"
+ 
++#ifndef __GLIBC__
++#define _libc_fpstate _fpstate
++#endif
++
+ namespace google_breakpad {
+ 
+ // Wraps platform-dependent implementations of accessors to ucontext_t structs.
+--- a/src/3rdparty/chromium/third_party/ffmpeg/libavutil/cpu.c
++++ b/src/3rdparty/chromium/third_party/ffmpeg/libavutil/cpu.c
+@@ -41,8 +41,10 @@
+ #include <sys/param.h>
+ #endif
+ #include <sys/types.h>
++#ifdef __GLIBC__
+ #include <sys/sysctl.h>
+ #endif
++#endif
+ #if HAVE_UNISTD_H
+ #include <unistd.h>
+ #endif
+--- a/src/3rdparty/chromium/third_party/perfetto/include/perfetto/ext/base/thread_utils.h
++++ b/src/3rdparty/chromium/third_party/perfetto/include/perfetto/ext/base/thread_utils.h
+@@ -29,9 +29,7 @@
+ #include <algorithm>
+ #endif
+ 
+-#if PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID)
+ #include <sys/prctl.h>
+-#endif
+ 
+ // Internal implementation utils that aren't as widely useful/supported as
+ // base/thread_utils.h.
+@@ -58,7 +56,7 @@ inline bool MaybeSetThreadName(const std
+ 
+ inline bool GetThreadName(std::string& out_result) {
+   char buf[16] = {};
+-#if PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID)
++#if !defined(__GLIBC__)
+   if (prctl(PR_GET_NAME, buf) != 0)
+     return false;
+ #else
+--- a/src/3rdparty/chromium/third_party/lss/linux_syscall_support.h
++++ b/src/3rdparty/chromium/third_party/lss/linux_syscall_support.h
+@@ -1300,6 +1300,18 @@ struct kernel_statfs {
+ #ifndef __NR_fallocate
+ #define __NR_fallocate          285
+ #endif
++
++#if !defined(__GLIBC__)
++#ifdef __NR_pread
++#undef __NR_pread
++#endif
++#ifdef __NR_pwrite
++#undef __NR_pwrite
++#endif
++#define __NR_pread __NR_pread64
++#define __NR_pwrite __NR_pwrite64
++#endif /* !defined(__GLIBC__) */
++
+ #ifndef __NR_getrandom
+ #define __NR_getrandom          318
+ #endif
+--- a/src/3rdparty/chromium/net/dns/dns_config_service_posix.cc
++++ b/src/3rdparty/chromium/net/dns/dns_config_service_posix.cc
+@@ -93,7 +93,8 @@ absl::optional<DnsConfig> ReadDnsConfig(
+ 
+   absl::optional<DnsConfig> dns_config;
+ // TODO(fuchsia): Use res_ninit() when it's implemented on Fuchsia.
+-#if defined(OS_OPENBSD) || defined(OS_FUCHSIA)
++#if defined(OS_OPENBSD) || defined(OS_FUCHSIA) || \
++  (defined(OS_LINUX) && !defined(__GLIBC__))
+   // Note: res_ninit in glibc always returns 0 and sets RES_INIT.
+   // res_init behaves the same way.
+   memset(&_res, 0, sizeof(_res));
diff --git a/srcpkgs/qt6-webengine/patches/0215-chromium-musl-cdefs.patch b/srcpkgs/qt6-webengine/patches/0215-chromium-musl-cdefs.patch
new file mode 100644
index 000000000000..9d1daec29118
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0215-chromium-musl-cdefs.patch
@@ -0,0 +1,29 @@
+--- a/src/3rdparty/chromium/third_party/libsync/src/include/sync/sync.h
++++ b/src/3rdparty/chromium/third_party/libsync/src/include/sync/sync.h
+@@ -19,12 +19,13 @@
+ #ifndef __SYS_CORE_SYNC_H
+ #define __SYS_CORE_SYNC_H
+ 
+-#include <sys/cdefs.h>
+ #include <stdint.h>
+ 
+ #include <linux/types.h>
+ 
+-__BEGIN_DECLS
++#ifdef __cplusplus
++extern "C" {
++#endif
+ 
+ struct sync_legacy_merge_data {
+  int32_t fd2;
+@@ -158,6 +159,9 @@ struct sync_pt_info *sync_pt_info(struct
+                                   struct sync_pt_info *itr);
+ void sync_fence_info_free(struct sync_fence_info_data *info);
+ 
+-__END_DECLS
++#ifdef __cplusplus
++}
++#endif
++
+ 
+ #endif /* __SYS_CORE_SYNC_H */
diff --git a/srcpkgs/qt6-webengine/patches/0216-chromium-musl-stat.patch b/srcpkgs/qt6-webengine/patches/0216-chromium-musl-stat.patch
new file mode 100644
index 000000000000..4509a6957cd7
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0216-chromium-musl-stat.patch
@@ -0,0 +1,12 @@
+--- a/src/3rdparty/chromium/base/files/file.h
++++ b/src/3rdparty/chromium/base/files/file.h
+@@ -19,7 +19,8 @@
+ #include "build/build_config.h"
+ 
+ #if defined(OS_BSD) || defined(OS_APPLE) || defined(OS_NACL) || \
+-    defined(OS_FUCHSIA) || (defined(OS_ANDROID) && __ANDROID_API__ < 21)
++    defined(OS_FUCHSIA) || (defined(OS_ANDROID) && __ANDROID_API__ < 21) || \
++    (defined(OS_LINUX) && !defined(__GLIBC__))
+ struct stat;
+ namespace base {
+ typedef struct stat stat_wrapper_t;
diff --git a/srcpkgs/qt6-webengine/patches/0217-chromium-musl-resolver.patch b/srcpkgs/qt6-webengine/patches/0217-chromium-musl-resolver.patch
new file mode 100644
index 000000000000..c3d7afad9b19
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0217-chromium-musl-resolver.patch
@@ -0,0 +1,77 @@
+--- a/src/3rdparty/chromium/net/dns/dns_config_service_linux.cc
++++ b/src/3rdparty/chromium/net/dns/dns_config_service_linux.cc
+@@ -432,11 +432,13 @@ class DnsConfigServiceLinux::ConfigReade
+     base::ScopedBlockingCall scoped_blocking_call(
+         FROM_HERE, base::BlockingType::MAY_BLOCK);
+ 
++#if defined(__GLIBC__)
+     std::unique_ptr<struct __res_state> res = resolv_reader_->GetResState();
+     if (res) {
+       dns_config_ = ConvertResStateToDnsConfig(*res.get());
+       resolv_reader_->CloseResState(res.get());
+     }
++#endif
+ 
+     UMA_HISTOGRAM_BOOLEAN("Net.DNS.DnsConfig.Resolv.Read",
+                           dns_config_.has_value());
+@@ -486,6 +488,7 @@ class DnsConfigServiceLinux::ConfigReade
+ 
+ std::unique_ptr<struct __res_state>
+ DnsConfigServiceLinux::ResolvReader::GetResState() {
++#if defined(__GLIBC__)
+   auto res = std::make_unique<struct __res_state>();
+   memset(res.get(), 0, sizeof(struct __res_state));
+ 
+@@ -495,11 +498,16 @@ DnsConfigServiceLinux::ResolvReader::Get
+   }
+ 
+   return res;
++#else
++  return nullptr;
++#endif
+ }
+ 
+ void DnsConfigServiceLinux::ResolvReader::CloseResState(
+     struct __res_state* res) {
++#if defined(__GLIBC__)
+   res_nclose(res);
++#endif
+ }
+ 
+ DnsConfigServiceLinux::DnsConfigServiceLinux()
+--- a/src/3rdparty/chromium/net/dns/dns_reloader.cc
++++ b/src/3rdparty/chromium/net/dns/dns_reloader.cc
+@@ -4,8 +4,7 @@
+ 
+ #include "net/dns/dns_reloader.h"
+ 
+-#if defined(OS_POSIX) && !defined(OS_APPLE) && !defined(OS_OPENBSD) && \
+-    !defined(OS_ANDROID) && !defined(OS_FUCHSIA)
++#ifdef __GLIBC__
+ 
+ #include <resolv.h>
+ 
+--- a/src/3rdparty/chromium/net/dns/host_resolver_manager.cc
++++ b/src/3rdparty/chromium/net/dns/host_resolver_manager.cc
+@@ -2720,8 +2720,7 @@ HostResolverManager::HostResolverManager
+   NetworkChangeNotifier::AddConnectionTypeObserver(this);
+   if (system_dns_config_notifier_)
+     system_dns_config_notifier_->AddObserver(this);
+-#if defined(OS_POSIX) && !defined(OS_APPLE) && !defined(OS_OPENBSD) && \
+-    !defined(OS_ANDROID)
++#ifdef __GLIBC__
+   EnsureDnsReloaderInit();
+ #endif
+ 
+--- a/src/3rdparty/chromium/net/dns/host_resolver_proc.cc
++++ b/src/3rdparty/chromium/net/dns/host_resolver_proc.cc
+@@ -176,8 +176,7 @@ int SystemHostResolverCall(const std::st
+   base::ScopedBlockingCall scoped_blocking_call(FROM_HERE,
+                                                 base::BlockingType::WILL_BLOCK);
+ 
+-#if defined(OS_POSIX) && !defined(OS_APPLE) && !defined(OS_OPENBSD) && \
+-    !defined(OS_ANDROID) && !defined(OS_FUCHSIA)
++#ifdef __GLIBC__
+   DnsReloaderMaybeReload();
+ #endif
+   absl::optional<AddressInfo> ai;
diff --git a/srcpkgs/qt6-webengine/patches/0600-chromium-sndio.patch b/srcpkgs/qt6-webengine/patches/0600-chromium-sndio.patch
new file mode 100644
index 000000000000..0302874ffba4
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0600-chromium-sndio.patch
@@ -0,0 +1,876 @@
+--- a/src/3rdparty/chromium/media/BUILD.gn
++++ b/src/3rdparty/chromium/media/BUILD.gn
+@@ -72,6 +72,9 @@ config("media_config") {
+       defines += [ "DLOPEN_PULSEAUDIO" ]
+     }
+   }
++  if (use_sndio) {
++    defines += [ "USE_SNDIO" ]
++  }
+   if (use_cras) {
+     defines += [ "USE_CRAS" ]
+   }
+--- a/src/3rdparty/chromium/media/audio/BUILD.gn
++++ b/src/3rdparty/chromium/media/audio/BUILD.gn
+@@ -240,6 +240,17 @@ source_set("audio") {
+     sources += [ "linux/audio_manager_linux.cc" ]
+   }
+ 
++  if (use_sndio) {
++    libs += [ "sndio" ]
++    sources += [
++      "sndio/audio_manager_sndio.cc",
++      "sndio/sndio_input.cc",
++      "sndio/sndio_input.h",
++      "sndio/sndio_output.cc",
++      "sndio/sndio_output.h"
++    ]
++  }
++
+   if (use_alsa) {
+     libs += [ "asound" ]
+     sources += [
+--- a/src/3rdparty/chromium/media/audio/linux/audio_manager_linux.cc
++++ b/src/3rdparty/chromium/media/audio/linux/audio_manager_linux.cc
+@@ -25,6 +25,11 @@
+ #include "media/audio/pulse/audio_manager_pulse.h"
+ #include "media/audio/pulse/pulse_util.h"
+ #endif
++#if defined(USE_SNDIO)
++#include "media/audio/sndio/audio_manager_sndio.h"
++#include "media/audio/sndio/sndio_input.h"
++#include "media/audio/sndio/sndio_output.h"
++#endif
+ 
+ namespace media {
+ 
+@@ -32,7 +37,8 @@ enum LinuxAudioIO {
+   kPulse,
+   kAlsa,
+   kCras,
+-  kAudioIOMax = kCras  // Must always be equal to largest logged entry.
++  kSndio,
++  kAudioIOMax = kSndio // Must always be equal to largest logged entry.
+ };
+ 
+ std::unique_ptr<media::AudioManager> CreateAudioManager(
+@@ -45,6 +51,16 @@ std::unique_ptr<media::AudioManager> Cre
+                                               audio_log_factory);
+   }
+ 
++#if defined(USE_SNDIO)
++  struct sio_hdl *hdl = sio_open(SIO_DEVANY, SIO_PLAY, 0);
++  if (hdl != NULL) {
++    sio_close(hdl);
++    UMA_HISTOGRAM_ENUMERATION("Media.LinuxAudioIO", kSndio, kAudioIOMax + 1);
++    return std::make_unique<AudioManagerSndio>(std::move(audio_thread),
++                                                  audio_log_factory);
++  }
++#endif
++
+ #if defined(USE_CRAS)
+   if (base::CommandLine::ForCurrentProcess()->HasSwitch(switches::kUseCras)) {
+     UMA_HISTOGRAM_ENUMERATION("Media.LinuxAudioIO", kCras, kAudioIOMax + 1);
+--- /dev/null
++++ b/src/3rdparty/chromium/media/audio/sndio/audio_manager_sndio.cc
+@@ -0,0 +1,148 @@
++// Copyright (c) 2012 The Chromium Authors. All rights reserved.
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++#include "media/audio/sndio/audio_manager_sndio.h"
++
++#include "base/metrics/histogram_macros.h"
++#include "base/memory/ptr_util.h"
++#include "media/audio/audio_device_description.h"
++#include "media/audio/audio_output_dispatcher.h"
++#include "media/audio/sndio/sndio_input.h"
++#include "media/audio/sndio/sndio_output.h"
++#include "media/base/limits.h"
++#include "media/base/media_switches.h"
++
++namespace media {
++
++
++// Maximum number of output streams that can be open simultaneously.
++static const int kMaxOutputStreams = 4;
++
++// Default sample rate for input and output streams.
++static const int kDefaultSampleRate = 48000;
++
++void AddDefaultDevice(AudioDeviceNames* device_names) {
++  DCHECK(device_names->empty());
++  device_names->push_front(AudioDeviceName::CreateDefault());
++}
++
++bool AudioManagerSndio::HasAudioOutputDevices() {
++  return true;
++}
++
++bool AudioManagerSndio::HasAudioInputDevices() {
++  return true;
++}
++
++void AudioManagerSndio::GetAudioInputDeviceNames(
++    AudioDeviceNames* device_names) {
++  DCHECK(device_names->empty());
++  AddDefaultDevice(device_names);
++}
++
++void AudioManagerSndio::GetAudioOutputDeviceNames(
++    AudioDeviceNames* device_names) {
++  AddDefaultDevice(device_names);
++}
++
++const char* AudioManagerSndio::GetName() {
++  return "SNDIO";
++}
++
++AudioParameters AudioManagerSndio::GetInputStreamParameters(
++    const std::string& device_id) {
++  static const int kDefaultInputBufferSize = 1024;
++
++  int user_buffer_size = GetUserBufferSize();
++  int buffer_size = user_buffer_size ?
++      user_buffer_size : kDefaultInputBufferSize;
++
++  return AudioParameters(
++      AudioParameters::AUDIO_PCM_LOW_LATENCY, CHANNEL_LAYOUT_STEREO,
++      kDefaultSampleRate, buffer_size);
++}
++
++AudioManagerSndio::AudioManagerSndio(std::unique_ptr<AudioThread> audio_thread,
++                                         AudioLogFactory* audio_log_factory)
++    : AudioManagerBase(std::move(audio_thread),
++                       audio_log_factory) {
++  DLOG(WARNING) << "AudioManagerSndio";
++  SetMaxOutputStreamsAllowed(kMaxOutputStreams);
++}
++
++AudioManagerSndio::~AudioManagerSndio() {
++  Shutdown();
++}
++
++AudioOutputStream* AudioManagerSndio::MakeLinearOutputStream(
++    const AudioParameters& params,
++    const LogCallback& log_callback) {
++  DCHECK_EQ(AudioParameters::AUDIO_PCM_LINEAR, params.format());
++  return MakeOutputStream(params);
++}
++
++AudioOutputStream* AudioManagerSndio::MakeLowLatencyOutputStream(
++    const AudioParameters& params,
++    const std::string& device_id,
++    const LogCallback& log_callback) {
++  DLOG_IF(ERROR, !device_id.empty()) << "Not implemented!";
++  DCHECK_EQ(AudioParameters::AUDIO_PCM_LOW_LATENCY, params.format());
++  return MakeOutputStream(params);
++}
++
++AudioInputStream* AudioManagerSndio::MakeLinearInputStream(
++    const AudioParameters& params,
++    const std::string& device_id,
++    const LogCallback& log_callback) {
++  DCHECK_EQ(AudioParameters::AUDIO_PCM_LINEAR, params.format());
++  return MakeInputStream(params);
++}
++
++AudioInputStream* AudioManagerSndio::MakeLowLatencyInputStream(
++    const AudioParameters& params,
++    const std::string& device_id,
++    const LogCallback& log_callback) {
++  DCHECK_EQ(AudioParameters::AUDIO_PCM_LOW_LATENCY, params.format());
++  return MakeInputStream(params);
++}
++
++AudioParameters AudioManagerSndio::GetPreferredOutputStreamParameters(
++    const std::string& output_device_id,
++    const AudioParameters& input_params) {
++  // TODO(tommi): Support |output_device_id|.
++  DLOG_IF(ERROR, !output_device_id.empty()) << "Not implemented!";
++  static const int kDefaultOutputBufferSize = 2048;
++
++  ChannelLayout channel_layout = CHANNEL_LAYOUT_STEREO;
++  int sample_rate = kDefaultSampleRate;
++  int buffer_size = kDefaultOutputBufferSize;
++  if (input_params.IsValid()) {
++    sample_rate = input_params.sample_rate();
++    channel_layout = input_params.channel_layout();
++    buffer_size = std::min(buffer_size, input_params.frames_per_buffer());
++  }
++
++  int user_buffer_size = GetUserBufferSize();
++  if (user_buffer_size)
++    buffer_size = user_buffer_size;
++
++  return AudioParameters(
++      AudioParameters::AUDIO_PCM_LOW_LATENCY, channel_layout,
++      sample_rate, buffer_size);
++}
++
++AudioInputStream* AudioManagerSndio::MakeInputStream(
++    const AudioParameters& params) {
++  DLOG(WARNING) << "MakeInputStream";
++  return new SndioAudioInputStream(this,
++             AudioDeviceDescription::kDefaultDeviceId, params);
++}
++
++AudioOutputStream* AudioManagerSndio::MakeOutputStream(
++    const AudioParameters& params) {
++  DLOG(WARNING) << "MakeOutputStream";
++  return new SndioAudioOutputStream(params, this);
++}
++
++}  // namespace media
+--- /dev/null
++++ b/src/3rdparty/chromium/media/audio/sndio/audio_manager_sndio.h
+@@ -0,0 +1,65 @@
++// Copyright (c) 2012 The Chromium Authors. All rights reserved.
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++#ifndef MEDIA_AUDIO_SNDIO_AUDIO_MANAGER_SNDIO_H_
++#define MEDIA_AUDIO_SNDIO_AUDIO_MANAGER_SNDIO_H_
++
++#include <set>
++
++#include "base/compiler_specific.h"
++#include "base/macros.h"
++#include "base/memory/ref_counted.h"
++#include "base/threading/thread.h"
++#include "media/audio/audio_manager_base.h"
++
++namespace media {
++
++class MEDIA_EXPORT AudioManagerSndio : public AudioManagerBase {
++ public:
++  AudioManagerSndio(std::unique_ptr<AudioThread> audio_thread,
++                   AudioLogFactory* audio_log_factory);
++  ~AudioManagerSndio() override;
++
++  // Implementation of AudioManager.
++  bool HasAudioOutputDevices() override;
++  bool HasAudioInputDevices() override;
++  void GetAudioInputDeviceNames(AudioDeviceNames* device_names) override;
++  void GetAudioOutputDeviceNames(AudioDeviceNames* device_names) override;
++  AudioParameters GetInputStreamParameters(
++      const std::string& device_id) override;
++  const char* GetName() override;
++
++  // Implementation of AudioManagerBase.
++  AudioOutputStream* MakeLinearOutputStream(
++      const AudioParameters& params,
++      const LogCallback& log_callback) override;
++  AudioOutputStream* MakeLowLatencyOutputStream(
++      const AudioParameters& params,
++      const std::string& device_id,
++      const LogCallback& log_callback) override;
++  AudioInputStream* MakeLinearInputStream(
++      const AudioParameters& params,
++      const std::string& device_id,
++      const LogCallback& log_callback) override;
++  AudioInputStream* MakeLowLatencyInputStream(
++      const AudioParameters& params,
++      const std::string& device_id,
++      const LogCallback& log_callback) override;
++
++ protected:
++  AudioParameters GetPreferredOutputStreamParameters(
++      const std::string& output_device_id,
++      const AudioParameters& input_params) override;
++
++ private:
++  // Called by MakeLinearOutputStream and MakeLowLatencyOutputStream.
++  AudioOutputStream* MakeOutputStream(const AudioParameters& params);
++  AudioInputStream* MakeInputStream(const AudioParameters& params);
++
++  DISALLOW_COPY_AND_ASSIGN(AudioManagerSndio);
++};
++
++}  // namespace media
++
++#endif  // MEDIA_AUDIO_SNDIO_AUDIO_MANAGER_SNDIO_H_
+--- /dev/null
++++ b/src/3rdparty/chromium/media/audio/sndio/sndio_input.cc
+@@ -0,0 +1,200 @@
++// Copyright 2013 The Chromium Authors. All rights reserved.
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++#include "base/bind.h"
++#include "base/logging.h"
++#include "base/macros.h"
++#include "media/base/audio_timestamp_helper.h"
++#include "media/audio/sndio/audio_manager_sndio.h"
++#include "media/audio/audio_manager.h"
++#include "media/audio/sndio/sndio_input.h"
++
++namespace media {
++
++static const SampleFormat kSampleFormat = kSampleFormatS16;
++
++void SndioAudioInputStream::OnMoveCallback(void *arg, int delta)
++{
++  SndioAudioInputStream* self = static_cast<SndioAudioInputStream*>(arg);
++
++  self->hw_delay += delta;
++}
++
++void *SndioAudioInputStream::ThreadEntry(void *arg) {
++  SndioAudioInputStream* self = static_cast<SndioAudioInputStream*>(arg);
++
++  self->ThreadLoop();
++  return NULL;
++}
++
++SndioAudioInputStream::SndioAudioInputStream(AudioManagerBase* manager,
++                                             const std::string& device_name,
++                                             const AudioParameters& params)
++    : manager(manager),
++      params(params),
++      audio_bus(AudioBus::Create(params)),
++      state(kClosed) {
++}
++
++SndioAudioInputStream::~SndioAudioInputStream() {
++  if (state != kClosed)
++    Close();
++}
++
++bool SndioAudioInputStream::Open() {
++  struct sio_par par;
++  int sig;
++
++  if (state != kClosed)
++    return false;
++
++  if (params.format() != AudioParameters::AUDIO_PCM_LINEAR &&
++      params.format() != AudioParameters::AUDIO_PCM_LOW_LATENCY) {
++    LOG(WARNING) << "Unsupported audio format.";
++    return false;
++  }
++
++  sio_initpar(&par);
++  par.rate = params.sample_rate();
++  par.rchan = params.channels();
++  par.bits = SampleFormatToBitsPerChannel(kSampleFormat);
++  par.bps = par.bits / 8;
++  par.sig = sig = par.bits != 8 ? 1 : 0;
++  par.le = SIO_LE_NATIVE;
++  par.appbufsz = params.frames_per_buffer();
++
++  hdl = sio_open(SIO_DEVANY, SIO_REC, 0);
++
++  if (hdl == NULL) {
++    LOG(ERROR) << "Couldn't open audio device.";
++    return false;
++  }
++
++  if (!sio_setpar(hdl, &par) || !sio_getpar(hdl, &par)) {
++    LOG(ERROR) << "Couldn't set audio parameters.";
++    goto bad_close;
++  }
++
++  if (par.rate  != (unsigned int)params.sample_rate() ||
++      par.rchan != (unsigned int)params.channels() ||
++      par.bits  != (unsigned int)SampleFormatToBitsPerChannel(kSampleFormat) ||
++      par.sig   != (unsigned int)sig ||
++      (par.bps > 1 && par.le != SIO_LE_NATIVE) ||
++      (par.bits != par.bps * 8)) {
++    LOG(ERROR) << "Unsupported audio parameters.";
++    goto bad_close;
++  }
++  state = kStopped;
++  buffer = new char[audio_bus->frames() * params.GetBytesPerFrame(kSampleFormat)];
++  sio_onmove(hdl, &OnMoveCallback, this);
++  return true;
++bad_close:
++  sio_close(hdl);
++  return false;
++}
++
++void SndioAudioInputStream::Start(AudioInputCallback* cb) {
++
++  StartAgc();
++
++  state = kRunning;
++  hw_delay = 0;
++  callback = cb;
++  sio_start(hdl);
++  if (pthread_create(&thread, NULL, &ThreadEntry, this) != 0) {
++    LOG(ERROR) << "Failed to create real-time thread for recording.";
++    sio_stop(hdl);
++    state = kStopped;
++  }
++}
++
++void SndioAudioInputStream::Stop() {
++
++  if (state == kStopped)
++    return;
++
++  state = kStopWait;
++  pthread_join(thread, NULL);
++  sio_stop(hdl);
++  state = kStopped;
++
++  StopAgc();
++}
++
++void SndioAudioInputStream::Close() {
++
++  if (state == kClosed)
++    return;
++
++  if (state == kRunning)
++    Stop();
++
++  state = kClosed;
++  delete [] buffer;
++  sio_close(hdl);
++
++  manager->ReleaseInputStream(this);
++}
++
++double SndioAudioInputStream::GetMaxVolume() {
++  // Not supported
++  return 0.0;
++}
++
++void SndioAudioInputStream::SetVolume(double volume) {
++  // Not supported. Do nothing.
++}
++
++double SndioAudioInputStream::GetVolume() {
++  // Not supported.
++  return 0.0;
++}
++
++bool SndioAudioInputStream::IsMuted() {
++  // Not supported.
++  return false;
++}
++
++void SndioAudioInputStream::SetOutputDeviceForAec(
++    const std::string& output_device_id) {
++  // Not supported.
++}
++
++void SndioAudioInputStream::ThreadLoop(void) {
++  size_t todo, n;
++  char *data;
++  unsigned int nframes;
++  double normalized_volume = 0.0;
++
++  nframes = audio_bus->frames();
++
++  while (state == kRunning && !sio_eof(hdl)) {
++
++    GetAgcVolume(&normalized_volume);
++
++    // read one block
++    todo = nframes * params.GetBytesPerFrame(kSampleFormat);
++    data = buffer;
++    while (todo > 0) {
++      n = sio_read(hdl, data, todo);
++      if (n == 0)
++        return;	// unrecoverable I/O error
++      todo -= n;
++      data += n;
++    }
++    hw_delay -= nframes;
++
++    // convert frames count to TimeDelta
++    const base::TimeDelta delay = AudioTimestampHelper::FramesToTime(hw_delay,
++      params.sample_rate());
++
++    // push into bus
++    audio_bus->FromInterleaved<SignedInt16SampleTypeTraits>(reinterpret_cast<int16_t*>(buffer), nframes);
++
++    // invoke callback
++    callback->OnData(audio_bus.get(), base::TimeTicks::Now() - delay, 1.);
++  }
++}
++
++}  // namespace media
+--- /dev/null
++++ b/src/3rdparty/chromium/media/audio/sndio/sndio_input.h
+@@ -0,0 +1,91 @@
++// Copyright 2013 The Chromium Authors. All rights reserved.
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++#ifndef MEDIA_AUDIO_SNDIO_SNDIO_INPUT_H_
++#define MEDIA_AUDIO_SNDIO_SNDIO_INPUT_H_
++
++#include <stdint.h>
++#include <string>
++#include <sndio.h>
++
++#include "base/compiler_specific.h"
++#include "base/macros.h"
++#include "base/memory/weak_ptr.h"
++#include "base/time/time.h"
++#include "media/audio/agc_audio_stream.h"
++#include "media/audio/audio_io.h"
++#include "media/audio/audio_device_description.h"
++#include "media/base/audio_parameters.h"
++
++namespace media {
++
++class AudioManagerBase;
++
++// Implementation of AudioOutputStream using sndio(7)
++class SndioAudioInputStream : public AgcAudioStream<AudioInputStream> {
++ public:
++  // Pass this to the constructor if you want to attempt auto-selection
++  // of the audio recording device.
++  static const char kAutoSelectDevice[];
++
++  // Create a PCM Output stream for the SNDIO device identified by
++  // |device_name|. If unsure of what to use for |device_name|, use
++  // |kAutoSelectDevice|.
++  SndioAudioInputStream(AudioManagerBase* audio_manager,
++                     const std::string& device_name,
++                     const AudioParameters& params);
++
++  ~SndioAudioInputStream() override;
++
++  // Implementation of AudioInputStream.
++  bool Open() override;
++  void Start(AudioInputCallback* callback) override;
++  void Stop() override;
++  void Close() override;
++  double GetMaxVolume() override;
++  void SetVolume(double volume) override;
++  double GetVolume() override;
++  bool IsMuted() override;
++  void SetOutputDeviceForAec(const std::string& output_device_id) override;
++
++ private:
++
++  enum StreamState {
++    kClosed,            // Not opened yet
++    kStopped,           // Device opened, but not started yet
++    kRunning,           // Started, device playing
++    kStopWait           // Stopping, waiting for the real-time thread to exit
++  };
++
++  // C-style call-backs
++  static void OnMoveCallback(void *arg, int delta);
++  static void* ThreadEntry(void *arg);
++
++  // Continuously moves data from the device to the consumer
++  void ThreadLoop();
++  // Our creator, the audio manager needs to be notified when we close.
++  AudioManagerBase* manager;
++  // Parameters of the source
++  AudioParameters params;
++  // We store data here for consumer
++  std::unique_ptr<AudioBus> audio_bus;
++  // Call-back that consumes recorded data
++  AudioInputCallback* callback;  // Valid during a recording session.
++  // Handle of the audio device
++  struct sio_hdl* hdl;
++  // Current state of the stream
++  enum StreamState state;
++  // High priority thread running ThreadLoop()
++  pthread_t thread;
++  // Number of frames buffered in the hardware
++  int hw_delay;
++  // Temporary buffer where data is stored sndio-compatible format
++  char* buffer;
++
++  DISALLOW_COPY_AND_ASSIGN(SndioAudioInputStream);
++};
++
++}  // namespace media
++
++#endif  // MEDIA_AUDIO_SNDIO_SNDIO_INPUT_H_
+--- /dev/null
++++ b/src/3rdparty/chromium/media/audio/sndio/sndio_output.cc
+@@ -0,0 +1,183 @@
++// Copyright (c) 2012 The Chromium Authors. All rights reserved.
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++#include "base/logging.h"
++#include "base/time/time.h"
++#include "base/time/default_tick_clock.h"
++#include "media/audio/audio_manager_base.h"
++#include "media/base/audio_timestamp_helper.h"
++#include "media/audio/sndio/sndio_output.h"
++
++namespace media {
++
++static const SampleFormat kSampleFormat = kSampleFormatS16;
++
++void SndioAudioOutputStream::OnMoveCallback(void *arg, int delta) {
++  SndioAudioOutputStream* self = static_cast<SndioAudioOutputStream*>(arg);
++
++  self->hw_delay -= delta;
++}
++
++void SndioAudioOutputStream::OnVolCallback(void *arg, unsigned int vol) {
++  SndioAudioOutputStream* self = static_cast<SndioAudioOutputStream*>(arg);
++
++  self->vol = vol;
++}
++
++void *SndioAudioOutputStream::ThreadEntry(void *arg) {
++  SndioAudioOutputStream* self = static_cast<SndioAudioOutputStream*>(arg);
++
++  self->ThreadLoop();
++  return NULL;
++}
++
++SndioAudioOutputStream::SndioAudioOutputStream(const AudioParameters& params,
++                                               AudioManagerBase* manager)
++    : manager(manager),
++      params(params),
++      audio_bus(AudioBus::Create(params)),
++      state(kClosed),
++      mutex(PTHREAD_MUTEX_INITIALIZER) {
++}
++
++SndioAudioOutputStream::~SndioAudioOutputStream() {
++  if (state != kClosed)
++    Close();
++}
++
++bool SndioAudioOutputStream::Open() {
++  struct sio_par par;
++  int sig;
++
++  if (params.format() != AudioParameters::AUDIO_PCM_LINEAR &&
++      params.format() != AudioParameters::AUDIO_PCM_LOW_LATENCY) {
++    LOG(WARNING) << "Unsupported audio format.";
++    return false;
++  }
++  sio_initpar(&par);
++  par.rate = params.sample_rate();
++  par.pchan = params.channels();
++  par.bits = SampleFormatToBitsPerChannel(kSampleFormat);
++  par.bps = par.bits / 8;
++  par.sig = sig = par.bits != 8 ? 1 : 0;
++  par.le = SIO_LE_NATIVE;
++  par.appbufsz = params.frames_per_buffer();
++
++  hdl = sio_open(SIO_DEVANY, SIO_PLAY, 0);
++  if (hdl == NULL) {
++    LOG(ERROR) << "Couldn't open audio device.";
++    return false;
++  }
++  if (!sio_setpar(hdl, &par) || !sio_getpar(hdl, &par)) {
++    LOG(ERROR) << "Couldn't set audio parameters.";
++    goto bad_close;
++  }
++  if (par.rate  != (unsigned int)params.sample_rate() ||
++      par.pchan != (unsigned int)params.channels() ||
++      par.bits  != (unsigned int)SampleFormatToBitsPerChannel(kSampleFormat) ||
++      par.sig   != (unsigned int)sig ||
++      (par.bps > 1 && par.le != SIO_LE_NATIVE) ||
++      (par.bits != par.bps * 8)) {
++    LOG(ERROR) << "Unsupported audio parameters.";
++    goto bad_close;
++  }
++  state = kStopped;
++  volpending = 0;
++  vol = 0;
++  buffer = new char[audio_bus->frames() * params.GetBytesPerFrame(kSampleFormat)];
++  sio_onmove(hdl, &OnMoveCallback, this);
++  sio_onvol(hdl, &OnVolCallback, this);
++  return true;
++ bad_close:
++  sio_close(hdl);
++  return false;
++}
++
++void SndioAudioOutputStream::Close() {
++  if (state == kClosed)
++    return;
++  if (state == kRunning)
++    Stop();
++  state = kClosed;
++  delete [] buffer;
++  sio_close(hdl);
++  manager->ReleaseOutputStream(this);  // Calls the destructor
++}
++
++void SndioAudioOutputStream::Start(AudioSourceCallback* callback) {
++  state = kRunning;
++  hw_delay = 0;
++  source = callback;
++  sio_start(hdl);
++  if (pthread_create(&thread, NULL, &ThreadEntry, this) != 0) {
++    LOG(ERROR) << "Failed to create real-time thread.";
++    sio_stop(hdl);
++    state = kStopped;
++  }
++}
++
++void SndioAudioOutputStream::Stop() {
++  if (state == kStopped)
++    return;
++  state = kStopWait;
++  pthread_join(thread, NULL);
++  sio_stop(hdl);
++  state = kStopped;
++}
++
++void SndioAudioOutputStream::SetVolume(double v) {
++  pthread_mutex_lock(&mutex);
++  vol = v * SIO_MAXVOL;
++  volpending = 1;
++  pthread_mutex_unlock(&mutex);
++}
++
++void SndioAudioOutputStream::GetVolume(double* v) {
++  pthread_mutex_lock(&mutex);
++  *v = vol * (1. / SIO_MAXVOL);
++  pthread_mutex_unlock(&mutex);
++}
++
++// This stream is always used with sub second buffer sizes, where it's
++// sufficient to simply always flush upon Start().
++void SndioAudioOutputStream::Flush() {}
++
++void SndioAudioOutputStream::ThreadLoop(void) {
++  int avail, count, result;
++
++  while (state == kRunning) {
++    // Update volume if needed
++    pthread_mutex_lock(&mutex);
++    if (volpending) {
++      volpending = 0;
++      sio_setvol(hdl, vol);
++    }
++    pthread_mutex_unlock(&mutex);
++
++    // Get data to play
++    const base::TimeDelta delay = AudioTimestampHelper::FramesToTime(hw_delay,
++	params.sample_rate());
++    count = source->OnMoreData(delay, base::TimeTicks::Now(), 0, audio_bus.get());
++    audio_bus->ToInterleaved<SignedInt16SampleTypeTraits>(count, reinterpret_cast<int16_t*>(buffer));
++    if (count == 0) {
++      // We have to submit something to the device
++      count = audio_bus->frames();
++      memset(buffer, 0, count * params.GetBytesPerFrame(kSampleFormat));
++      LOG(WARNING) << "No data to play, running empty cycle.";
++    }
++
++    // Submit data to the device
++    avail = count * params.GetBytesPerFrame(kSampleFormat);
++    result = sio_write(hdl, buffer, avail);
++    if (result == 0) {
++      LOG(WARNING) << "Audio device disconnected.";
++      break;
++    }
++
++    // Update hardware pointer
++    hw_delay += count;
++  }
++}
++
++}  // namespace media
+--- /dev/null
++++ b/src/3rdparty/chromium/media/audio/sndio/sndio_output.h
+@@ -0,0 +1,86 @@
++// Copyright (c) 2012 The Chromium Authors. All rights reserved.
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++#ifndef MEDIA_AUDIO_SNDIO_SNDIO_OUTPUT_H_
++#define MEDIA_AUDIO_SNDIO_SNDIO_OUTPUT_H_
++
++#include <pthread.h>
++#include <sndio.h>
++
++#include "base/time/tick_clock.h"
++#include "base/time/time.h"
++#include "media/audio/audio_io.h"
++
++namespace media {
++
++class AudioManagerBase;
++
++// Implementation of AudioOutputStream using sndio(7)
++class SndioAudioOutputStream : public AudioOutputStream {
++ public:
++  // The manager is creating this object
++  SndioAudioOutputStream(const AudioParameters& params,
++                         AudioManagerBase* manager);
++  virtual ~SndioAudioOutputStream();
++
++  // Implementation of AudioOutputStream.
++  bool Open() override;
++  void Close() override;
++  void Start(AudioSourceCallback* callback) override;
++  void Stop() override;
++  void SetVolume(double volume) override;
++  void GetVolume(double* volume) override;
++  void Flush() override;
++
++  friend void sndio_onmove(void *arg, int delta);
++  friend void sndio_onvol(void *arg, unsigned int vol);
++  friend void *sndio_threadstart(void *arg);
++
++ private:
++  enum StreamState {
++    kClosed,            // Not opened yet
++    kStopped,           // Device opened, but not started yet
++    kRunning,           // Started, device playing
++    kStopWait           // Stopping, waiting for the real-time thread to exit
++  };
++
++  // C-style call-backs
++  static void OnMoveCallback(void *arg, int delta);
++  static void OnVolCallback(void *arg, unsigned int vol);
++  static void* ThreadEntry(void *arg);
++
++  // Continuously moves data from the producer to the device
++  void ThreadLoop(void);
++
++  // Our creator, the audio manager needs to be notified when we close.
++  AudioManagerBase* manager;
++  // Parameters of the source
++  AudioParameters params;
++  // Source stores data here
++  std::unique_ptr<AudioBus> audio_bus;
++  // Call-back that produces data to play
++  AudioSourceCallback* source;
++  // Handle of the audio device
++  struct sio_hdl* hdl;
++  // Current state of the stream
++  enum StreamState state;
++  // High priority thread running ThreadLoop()
++  pthread_t thread;
++  // Protects vol, volpending and hw_delay
++  pthread_mutex_t mutex;
++  // Current volume in the 0..SIO_MAXVOL range
++  int vol;
++  // Set to 1 if volumes must be refreshed in the realtime thread
++  int volpending;
++  // Number of frames buffered in the hardware
++  int hw_delay;
++  // Temporary buffer where data is stored sndio-compatible format
++  char* buffer;
++
++  DISALLOW_COPY_AND_ASSIGN(SndioAudioOutputStream);
++};
++
++}  // namespace media
++
++#endif  // MEDIA_AUDIO_SNDIO_SNDIO_OUTPUT_H_
+--- a/src/3rdparty/chromium/media/media_options.gni
++++ b/src/3rdparty/chromium/media/media_options.gni
+@@ -121,6 +121,9 @@ declare_args() {
+   # Enables runtime selection of ALSA library for audio.
+   use_alsa = false
+ 
++  # Enable runtime selection of sndio(7)
++  use_sndio = false
++
+   # Alsa should be used on non-Android, non-Mac POSIX systems.
+   # Alsa should be used on desktop Chromecast and audio-only Chromecast builds.
+   if (is_posix && !is_android && !is_mac &&
diff --git a/srcpkgs/qt6-webengine/patches/0700-armv7l-neon.patch b/srcpkgs/qt6-webengine/patches/0700-armv7l-neon.patch
new file mode 100644
index 000000000000..d42fa19a07a1
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0700-armv7l-neon.patch
@@ -0,0 +1,10 @@
+--- a/src/3rdparty/chromium/skia/BUILD.gn
++++ b/src/3rdparty/chromium/skia/BUILD.gn
+@@ -800,7 +800,6 @@ skia_source_set("skia_opts") {
+         # Root build config sets -mfpu=$arm_fpu, which we expect to be neon
+         # when running this.
+         if (!arm_use_neon) {
+-          configs -= [ "//build/config/compiler:compiler_arm_fpu" ]
+           cflags += [ "-mfpu=neon" ]
+         }
+       }
diff --git a/srcpkgs/qt6-webengine/patches/0750-chromium-musl-cross-no-asm_ptrace_h.patch b/srcpkgs/qt6-webengine/patches/0750-chromium-musl-cross-no-asm_ptrace_h.patch
new file mode 100644
index 000000000000..3cf132908af4
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0750-chromium-musl-cross-no-asm_ptrace_h.patch
@@ -0,0 +1,30 @@
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper.cc
+@@ -38,7 +38,12 @@
+ 
+ #include "client/linux/minidump_writer/linux_ptrace_dumper.h"
+ 
++#if defined(__GLIBC__)
+ #include <asm/ptrace.h>
++#else
++/* For arm*-musl this definition is missing */
++#define ARM_sp uregs[13]
++#endif
+ #include <assert.h>
+ #include <errno.h>
+ #include <fcntl.h>
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_core_dumper.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_core_dumper.cc
+@@ -32,7 +32,12 @@
+ 
+ #include "client/linux/minidump_writer/linux_core_dumper.h"
+ 
++#if defined(__GLIBC__)
+ #include <asm/ptrace.h>
++#else
++/* For arm*-musl this definition is missing */
++#define ARM_sp uregs[13]
++#endif
+ #include <assert.h>
+ #include <elf.h>
+ #include <stdio.h>
diff --git a/srcpkgs/qt6-webengine/patches/0751-chromium-musl-arm-user_vfp.patch b/srcpkgs/qt6-webengine/patches/0751-chromium-musl-arm-user_vfp.patch
new file mode 100644
index 000000000000..6e2d62f35ee6
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0751-chromium-musl-arm-user_vfp.patch
@@ -0,0 +1,20 @@
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/util/linux/thread_info.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/util/linux/thread_info.h
+@@ -17,6 +17,17 @@
+ 
+ #include <stdint.h>
+ #include <sys/user.h>
++#if !defined(__GLIBC__)
++struct user_vfp {
++	unsigned long long fpregs[32];
++	unsigned long fpscr;
++};
++struct user_vfp_exc {
++	unsigned long fpexc;
++	unsigned long fpinst;
++	unsigned long fpinst2;
++};
++#endif /* !defined(__GLIBC__) */
+ 
+ #include <type_traits>
+ 
diff --git a/srcpkgs/qt6-webengine/patches/0752-chromium-musl-arm-elf_auxv_t.patch b/srcpkgs/qt6-webengine/patches/0752-chromium-musl-arm-elf_auxv_t.patch
new file mode 100644
index 000000000000..7112c8cfd3fa
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0752-chromium-musl-arm-elf_auxv_t.patch
@@ -0,0 +1,18 @@
+--- a/src/3rdparty/chromium/v8/src/base/cpu.cc
++++ b/src/3rdparty/chromium/v8/src/base/cpu.cc
+@@ -163,6 +163,15 @@ static V8_INLINE void __cpuid(int cpu_in
+ 
+ #if V8_HOST_ARCH_ARM || V8_HOST_ARCH_ARM64
+ 
++#ifndef __GLIBC__
++#include <elf.h>
++#ifdef __LP64__
++typedef Elf64_auxv_t elf_auxv_t;
++#else
++typedef Elf32_auxv_t elf_auxv_t;
++#endif
++#endif
++
+ static uint32_t ReadELFHWCaps() {
+   uint32_t result = 0;
+ #if V8_GLIBC_PREREQ(2, 16)
diff --git a/srcpkgs/qt6-webengine/patches/0801-chromium-i686-vaapi-fpermissive.patch b/srcpkgs/qt6-webengine/patches/0801-chromium-i686-vaapi-fpermissive.patch
new file mode 100644
index 000000000000..3d4043e03b89
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0801-chromium-i686-vaapi-fpermissive.patch
@@ -0,0 +1,24 @@
+--- a/src/3rdparty/chromium/media/gpu/vaapi/BUILD.gn
++++ b/src/3rdparty/chromium/media/gpu/vaapi/BUILD.gn
+@@ -14,6 +14,10 @@ import("//ui/gl/features.gni")
+ assert(is_linux || is_chromeos)
+ assert(use_vaapi)
+ 
++config("vaapi_permissive") {
++  cflags = [ "-fpermissive" ]
++}
++
+ generate_stubs("libva_stubs") {
+   extra_header = "va_stub_header.fragment"
+   sigs = [ "va.sigs" ]
+@@ -136,6 +140,10 @@ source_set("vaapi") {
+     ]
+   }
+ 
++  if (target_cpu == "x86") {
++    configs += [ ":vaapi_permissive" ]
++  }
++
+   if (use_x11) {
+     deps += [ "//ui/gfx/x" ]
+     sources += [
diff --git a/srcpkgs/qt6-webengine/patches/0900-xxx-ppc64le-libvpx.patch b/srcpkgs/qt6-webengine/patches/0900-xxx-ppc64le-libvpx.patch
new file mode 100644
index 000000000000..5c9566b56bd4
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0900-xxx-ppc64le-libvpx.patch
@@ -0,0 +1,65 @@
+Uses generic target for now. To use ppc64le, change --target to ppc64le-gnu
+and add --enable-vsx, and change generic to ppc for the rtcd header.
+
+From 18e6c5c55cfae0cfb458d8210d7bc709360a0e90 Mon Sep 17 00:00:00 2001
+From: q66 <daniel@octaforge.org>
+Date: Wed, 9 Sep 2020 19:08:25 +0200
+Subject: [PATCH] enable generation of ppc64 libvpx bits
+
+this doesn't update the gni file, that's done from
+the template by running the appropriate scripts
+---
+ third_party/libvpx/BUILD.gn        | 4 ++++
+ third_party/libvpx/generate_gni.sh | 9 +++++++++
+ 2 files changed, 13 insertions(+)
+
+--- a/src/3rdparty/chromium/third_party/libvpx/BUILD.gn
++++ b/src/3rdparty/chromium/third_party/libvpx/BUILD.gn
+@@ -424,6 +424,8 @@ static_library("bundled_libvpx") {
+       sources = libvpx_srcs_arm64
+       public_deps = [ ":libvpx_arm64_headers" ]
+     }
++  } else if (current_cpu == "ppc64") {
++    sources = libvpx_srcs_ppc64
+   }
+ 
+   configs -= [ "//build/config/compiler:chromium_code" ]
+--- a/src/3rdparty/chromium/third_party/libvpx/generate_gni.sh
++++ b/src/3rdparty/chromium/third_party/libvpx/generate_gni.sh
+@@ -374,6 +374,7 @@ gen_config_files linux/arm-neon-highbd "
+ gen_config_files linux/arm64-highbd "--target=armv8-linux-gcc ${all_platforms} ${HIGHBD}"
+ gen_config_files linux/mipsel "--target=mips32-linux-gcc ${all_platforms}"
+ gen_config_files linux/mips64el "--target=mips64-linux-gcc ${all_platforms}"
++gen_config_files linux/ppc64 "--target=generic-gnu $HIGHBD ${all_platforms}"
+ gen_config_files linux/generic "--target=generic-gnu $HIGHBD ${all_platforms}"
+ gen_config_files win/arm64 "--target=arm64-win64-vs15 ${all_platforms} ${HIGHBD}"
+ gen_config_files win/ia32 "--target=x86-win32-vs14 ${all_platforms} ${x86_platforms}"
+@@ -399,6 +400,7 @@ lint_config linux/arm-neon-highbd
+ lint_config linux/arm64-highbd
+ lint_config linux/mipsel
+ lint_config linux/mips64el
++lint_config linux/ppc64
+ lint_config linux/generic
+ lint_config win/arm64
+ lint_config win/ia32
+@@ -428,6 +430,7 @@ gen_rtcd_header linux/arm-neon-highbd ar
+ gen_rtcd_header linux/arm64-highbd armv8
+ gen_rtcd_header linux/mipsel mipsel
+ gen_rtcd_header linux/mips64el mips64el
++gen_rtcd_header linux/ppc64 generic
+ gen_rtcd_header linux/generic generic
+ gen_rtcd_header win/arm64 armv8
+ gen_rtcd_header win/ia32 x86 "${require_sse2}"
+@@ -513,6 +516,12 @@ if [ -z $ONLY_CONFIGS ]; then
+ 
+   echo "MIPS64 source list is identical to MIPS source list. No need to generate it."
+ 
++  echo "Generate ppc64 source list."
++  config=$(print_config_basic linux/ppc64)
++  make_clean
++  make libvpx_srcs.txt target=libs $config > /dev/null
++  convert_srcs_to_project_files libvpx_srcs.txt libvpx_srcs_ppc64
++
+   echo "Generate NaCl source list."
+   config=$(print_config_basic nacl)
+   make_clean
diff --git a/srcpkgs/qt6-webengine/patches/0901-xxx-ppc64le-sandbox-linux-stat.patch b/srcpkgs/qt6-webengine/patches/0901-xxx-ppc64le-sandbox-linux-stat.patch
new file mode 100644
index 000000000000..4b8e6320601c
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0901-xxx-ppc64le-sandbox-linux-stat.patch
@@ -0,0 +1,31 @@
+--- a/src/3rdparty/chromium/sandbox/linux/system_headers/linux_stat.h
++++ b/src/3rdparty/chromium/sandbox/linux/system_headers/linux_stat.h
+@@ -155,6 +155,28 @@ struct kernel_stat {
+   unsigned int __unused4;
+   unsigned int __unused5;
+ };
++#elif defined(__powerpc64__)
++struct kernel_stat {
++  unsigned long	st_dev;
++  unsigned long	st_ino;
++  unsigned long	st_nlink;
++  unsigned int	st_mode;
++  unsigned int	st_uid;
++  unsigned int	st_gid;
++  unsigned long	st_rdev;
++  long		st_size;
++  unsigned long	st_blksize;
++  unsigned long	st_blocks;
++  unsigned long	st_atime_;
++  unsigned long	st_atime_nsec_;
++  unsigned long	st_mtime_;
++  unsigned long	st_mtime_nsec_;
++  unsigned long	st_ctime_;
++  unsigned long	st_ctime_nsec_;
++  unsigned long	__unused4;
++  unsigned long	__unused5;
++  unsigned long	__unused6;
++};
+ #endif
+ 
+ #if !defined(AT_EMPTY_PATH)
diff --git a/srcpkgs/qt6-webengine/patches/0902-xxx-ppc64le-support.patch b/srcpkgs/qt6-webengine/patches/0902-xxx-ppc64le-support.patch
new file mode 100644
index 000000000000..33d415e55f69
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0902-xxx-ppc64le-support.patch
@@ -0,0 +1,3556 @@
+commit 2c013a317b1114ef67cdbbc30824b28907b9ea94
+Author: Daniel Kolesa <daniel@octaforge.org>
+Date:   Wed Mar 3 19:08:29 2021 +0100
+
+    ppc64le support
+
+--- a/src/3rdparty/chromium/sandbox/features.gni
++++ b/src/3rdparty/chromium/sandbox/features.gni
+@@ -11,7 +11,8 @@ import("//build/config/nacl/config.gni")
+ use_seccomp_bpf = (is_linux || is_chromeos || is_android) &&
+                   (current_cpu == "x86" || current_cpu == "x64" ||
+                    current_cpu == "arm" || current_cpu == "arm64" ||
+-                   current_cpu == "mipsel" || current_cpu == "mips64el")
++                   current_cpu == "mipsel" || current_cpu == "mips64el" ||
++                   current_cpu == "ppc64")
+ 
+ use_seccomp_bpf = use_seccomp_bpf || is_nacl_nonsfi
+ 
+--- a/src/3rdparty/chromium/sandbox/linux/BUILD.gn
++++ b/src/3rdparty/chromium/sandbox/linux/BUILD.gn
+@@ -433,6 +433,8 @@ component("sandbox_services") {
+ 
+ source_set("sandbox_services_headers") {
+   sources = [
++    "system_headers/ppc64_linux_syscalls.h",
++    "system_headers/ppc64_linux_ucontext.h",
+     "system_headers/arm64_linux_syscalls.h",
+     "system_headers/arm_linux_syscalls.h",
+     "system_headers/arm_linux_ucontext.h",
+--- a/src/3rdparty/chromium/sandbox/linux/bpf_dsl/linux_syscall_ranges.h
++++ b/src/3rdparty/chromium/sandbox/linux/bpf_dsl/linux_syscall_ranges.h
+@@ -56,6 +56,13 @@
+ #define MAX_PUBLIC_SYSCALL __NR_syscalls
+ #define MAX_SYSCALL MAX_PUBLIC_SYSCALL
+ 
++#elif defined(__powerpc64__)
++
++#include <asm/unistd.h>
++#define MIN_SYSCALL 0u
++#define MAX_PUBLIC_SYSCALL 386u
++#define MAX_SYSCALL MAX_PUBLIC_SYSCALL
++
+ #else
+ #error "Unsupported architecture"
+ #endif
+--- a/src/3rdparty/chromium/sandbox/linux/bpf_dsl/seccomp_macros.h
++++ b/src/3rdparty/chromium/sandbox/linux/bpf_dsl/seccomp_macros.h
+@@ -16,6 +16,9 @@
+ #if defined(__mips__)
+ // sys/user.h in eglibc misses size_t definition
+ #include <stddef.h>
++#elif defined(__powerpc64__) && defined(__GLIBC__)
++// Manually define greg_t on ppc64
++typedef unsigned long long greg_t;
+ #endif
+ #endif
+ 
+@@ -346,6 +349,59 @@ struct regs_struct {
+ #define SECCOMP_PT_PARM4(_regs) (_regs).regs[3]
+ #define SECCOMP_PT_PARM5(_regs) (_regs).regs[4]
+ #define SECCOMP_PT_PARM6(_regs) (_regs).regs[5]
++
++#elif defined(__powerpc64__)
++#include <asm/ptrace.h>
++
++typedef struct pt_regs regs_struct;
++
++#ifdef ARCH_CPU_LITTLE_ENDIAN
++#define SECCOMP_ARCH AUDIT_ARCH_PPC64LE
++#else
++#define SECCOMP_ARCH AUDIT_ARCH_PPC64
++#endif
++
++#ifdef __GLIBC__
++#define SECCOMP_REG(_ctx, _reg) ((_ctx)->uc_mcontext.regs->gpr[_reg])
++#else
++#define SECCOMP_REG(_ctx, _reg) (((struct pt_regs *)(_ctx)->uc_mcontext.regs)->gpr[_reg])
++#endif
++
++#define SECCOMP_RESULT(_ctx) SECCOMP_REG(_ctx, 3)
++#define SECCOMP_SYSCALL(_ctx) SECCOMP_REG(_ctx, 0)
++#ifdef __GLIBC__
++#define SECCOMP_IP(_ctx) (_ctx)->uc_mcontext.regs->nip
++#else
++#define SECCOMP_IP(_ctx) ((struct pt_regs *)(_ctx)->uc_mcontext.regs)->nip
++#endif
++#define SECCOMP_PARM1(_ctx) SECCOMP_REG(_ctx, 3)
++#define SECCOMP_PARM2(_ctx) SECCOMP_REG(_ctx, 4)
++#define SECCOMP_PARM3(_ctx) SECCOMP_REG(_ctx, 5)
++#define SECCOMP_PARM4(_ctx) SECCOMP_REG(_ctx, 6)
++#define SECCOMP_PARM5(_ctx) SECCOMP_REG(_ctx, 7)
++#define SECCOMP_PARM6(_ctx) SECCOMP_REG(_ctx, 8)
++
++#define SECCOMP_NR_IDX (offsetof(struct arch_seccomp_data, nr))
++#define SECCOMP_ARCH_IDX (offsetof(struct arch_seccomp_data, arch))
++#define SECCOMP_IP_MSB_IDX \
++  (offsetof(struct arch_seccomp_data, instruction_pointer) + 4)
++#define SECCOMP_IP_LSB_IDX \
++  (offsetof(struct arch_seccomp_data, instruction_pointer) + 0)
++#define SECCOMP_ARG_MSB_IDX(nr) \
++  (offsetof(struct arch_seccomp_data, args) + 8 * (nr) + 4)
++#define SECCOMP_ARG_LSB_IDX(nr) \
++  (offsetof(struct arch_seccomp_data, args) + 8 * (nr) + 0)
++
++#define SECCOMP_PT_RESULT(_regs) (_regs).gpr[3]
++#define SECCOMP_PT_SYSCALL(_regs) (_regs).gpr[0]
++#define SECCOMP_PT_IP(_regs) (_regs).nip
++#define SECCOMP_PT_PARM1(_regs) (_regs).gpr[3]
++#define SECCOMP_PT_PARM2(_regs) (_regs).gpr[4]
++#define SECCOMP_PT_PARM3(_regs) (_regs).gpr[5]
++#define SECCOMP_PT_PARM4(_regs) (_regs).gpr[6]
++#define SECCOMP_PT_PARM5(_regs) (_regs).gpr[7]
++#define SECCOMP_PT_PARM6(_regs) (_regs).gpr[8]
++
+ #else
+ #error Unsupported target platform
+ 
+--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc
++++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc
+@@ -90,7 +90,7 @@ bool IsBaselinePolicyWatched(int sysno)
+          SyscallSets::IsNuma(sysno) ||
+          SyscallSets::IsPrctl(sysno) ||
+          SyscallSets::IsProcessGroupOrSession(sysno) ||
+-#if defined(__i386__) || \
++#if defined(__i386__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+          SyscallSets::IsSocketCall(sysno) ||
+ #endif
+@@ -258,7 +258,7 @@ ResultExpr EvaluateSyscallImpl(int fs_de
+   }
+ 
+ #if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
+-    defined(__aarch64__)
++    defined(__aarch64__) || defined(__powerpc64__)
+   if (sysno == __NR_mmap)
+     return RestrictMmapFlags();
+ #endif
+@@ -279,7 +279,7 @@ ResultExpr EvaluateSyscallImpl(int fs_de
+     return RestrictPrctl();
+ 
+ #if defined(__x86_64__) || defined(__arm__) || defined(__mips__) || \
+-    defined(__aarch64__)
++    defined(__aarch64__) || defined(__powerpc64__)
+   if (sysno == __NR_socketpair) {
+     // Only allow AF_UNIX, PF_UNIX. Crash if anything else is seen.
+     static_assert(AF_UNIX == PF_UNIX,
+@@ -343,7 +343,8 @@ ResultExpr EvaluateSyscallImpl(int fs_de
+   }
+ 
+ #if defined(__i386__) || \
+-    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
++    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
++    defined(__powerpc64__)
+   if (SyscallSets::IsSocketCall(sysno))
+     return RestrictSocketcallCommand();
+ #endif
+--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/baseline_policy_unittest.cc
++++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/baseline_policy_unittest.cc
+@@ -317,7 +317,7 @@ TEST_BASELINE_SIGSYS(__NR_sysinfo)
+ TEST_BASELINE_SIGSYS(__NR_syslog)
+ TEST_BASELINE_SIGSYS(__NR_timer_create)
+ 
+-#if !defined(__aarch64__)
++#if !defined(__aarch64__) && !defined(__powerpc64__)
+ TEST_BASELINE_SIGSYS(__NR_inotify_init)
+ TEST_BASELINE_SIGSYS(__NR_vserver)
+ #endif
+--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc
++++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc
+@@ -40,6 +40,7 @@
+ #include <sys/ptrace.h>
+ #if (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) && \
+     !defined(__arm__) && !defined(__aarch64__) &&           \
++    !defined(__powerpc64__) &&                              \
+     !defined(PTRACE_GET_THREAD_AREA)
+ // Also include asm/ptrace-abi.h since ptrace.h in older libc (for instance
+ // the one in Ubuntu 16.04 LTS) is missing PTRACE_GET_THREAD_AREA.
+@@ -49,6 +50,11 @@
+ #endif
+ #endif  // !OS_NACL_NONSFI
+ 
++// On PPC64, TCGETS is defined in terms of struct termios, so we must include termios.h
++#ifdef __powerpc64__
++#include <termios.h>
++#endif
++
+ #if defined(OS_ANDROID)
+ 
+ #if !defined(F_DUPFD_CLOEXEC)
+@@ -106,6 +112,14 @@ inline bool IsArchitectureMips() {
+ #endif
+ }
+ 
++inline bool IsArchitecturePPC64() {
++#if defined(__powerpc64__)
++  return true;
++#else
++  return false;
++#endif
++}
++
+ // Ubuntu's version of glibc has a race condition in sem_post that can cause
+ // it to call futex(2) with bogus op arguments. To workaround this, we need
+ // to allow those futex(2) calls to fail with EINVAL, instead of crashing the
+@@ -270,6 +284,8 @@ ResultExpr RestrictFcntlCommands() {
+   uint64_t kOLargeFileFlag = O_LARGEFILE;
+   if (IsArchitectureX86_64() || IsArchitectureI386() || IsArchitectureMips())
+     kOLargeFileFlag = 0100000;
++  else if (IsArchitecturePPC64())
++    kOLargeFileFlag = 0200000;
+ 
+   const Arg<int> cmd(1);
+   const Arg<long> long_arg(2);
+@@ -287,7 +303,16 @@ ResultExpr RestrictFcntlCommands() {
+               F_SETLKW,
+               F_GETLK,
+               F_DUPFD,
+-              F_DUPFD_CLOEXEC),
++              F_DUPFD_CLOEXEC
++#if defined(__powerpc64__)
++// On PPC64, F_SETLK, F_GETLK, F_SETLKW are defined as the 64-bit variants
++// but glibc will sometimes still use the 32-bit versions. Allow both.
++              ,
++              5, /* F_GETLK (32) */
++              6, /* F_SETLK (32) */
++              7  /* F_SETLKW (32) */
++#endif
++	     ),
+              Allow())
+       .Case(F_SETFL,
+             If((long_arg & ~kAllowedMask) == 0, Allow()).Else(CrashSIGSYS()))
+@@ -297,7 +322,7 @@ ResultExpr RestrictFcntlCommands() {
+   // clang-format on
+ }
+ 
+-#if defined(__i386__) || defined(__mips__)
++#if defined(__i386__) || defined(__mips__) || defined(__powerpc64__)
+ ResultExpr RestrictSocketcallCommand() {
+   // Unfortunately, we are unable to restrict the first parameter to
+   // socketpair(2). Whilst initially sounding bad, it's noteworthy that very
+@@ -454,7 +479,7 @@ ResultExpr RestrictPtrace() {
+ #endif
+   return Switch(request)
+       .CASES((
+-#if !defined(__aarch64__)
++#if !defined(__aarch64__) && !defined(__powerpc64__)
+                  PTRACE_GETREGS, PTRACE_GETFPREGS,
+ #if defined(TRACE_GET_THREAD_AREA)
+                  PTRACE_GET_THREAD_AREA,
+--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.h
++++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.h
+@@ -49,7 +49,7 @@ SANDBOX_EXPORT bpf_dsl::ResultExpr Restr
+ // O_NONBLOCK | O_SYNC | O_LARGEFILE | O_CLOEXEC | O_NOATIME.
+ SANDBOX_EXPORT bpf_dsl::ResultExpr RestrictFcntlCommands();
+ 
+-#if defined(__i386__) || defined(__mips__)
++#if defined(__i386__) || defined(__mips__) || defined(__powerpc64__)
+ // Restrict socketcall(2) to only allow socketpair(2), send(2), recv(2),
+ // sendto(2), recvfrom(2), shutdown(2), sendmsg(2) and recvmsg(2).
+ SANDBOX_EXPORT bpf_dsl::ResultExpr RestrictSocketcallCommand();
+--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
++++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
+@@ -28,7 +28,7 @@ bool SyscallSets::IsKill(int sysno) {
+ bool SyscallSets::IsAllowedGettime(int sysno) {
+   switch (sysno) {
+     case __NR_gettimeofday:
+-#if defined(__i386__) || defined(__x86_64__) || \
++#if defined(__i386__) || defined(__x86_64__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_time:
+ #endif
+@@ -51,12 +51,12 @@ bool SyscallSets::IsAllowedGettime(int s
+                                     // filtered by RestrictClockID().
+     case __NR_clock_nanosleep_time64:  // Parameters filtered by RestrictClockID().
+ #endif
+-#if defined(__i386__) || \
++#if defined(__i386__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_ftime:  // Obsolete.
+ #endif
+     case __NR_settimeofday:  // Privileged.
+-#if defined(__i386__) || \
++#if defined(__i386__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_stime:
+ #endif
+@@ -135,7 +135,7 @@ bool SyscallSets::IsFileSystem(int sysno
+     case __NR_faccessat:  // EPERM not a valid errno.
+     case __NR_fchmodat:
+     case __NR_fchownat:  // Should be called chownat ?
+-#if defined(__x86_64__) || defined(__aarch64__)
++#if defined(__x86_64__) || defined(__aarch64__) || defined(__powerpc64__)
+     case __NR_newfstatat:  // fstatat(). EPERM not a valid errno.
+ #elif defined(__i386__) || defined(__arm__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+@@ -154,7 +154,7 @@ bool SyscallSets::IsFileSystem(int sysno
+     case __NR_memfd_create:
+     case __NR_mkdirat:
+     case __NR_mknodat:
+-#if defined(__i386__)
++#if defined(__i386__) || defined(__powerpc64__)
+     case __NR_oldlstat:
+     case __NR_oldstat:
+ #endif
+@@ -167,7 +167,7 @@ bool SyscallSets::IsFileSystem(int sysno
+     case __NR_stat64:
+ #endif
+     case __NR_statfs:  // EPERM not a valid errno.
+-#if defined(__i386__) || defined(__arm__) || \
++#if defined(__i386__) || defined(__arm__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_statfs64:
+ #endif
+@@ -179,7 +179,8 @@ bool SyscallSets::IsFileSystem(int sysno
+     case __NR_truncate64:
+ #endif
+     case __NR_unlinkat:
+-#if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
++#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
++    defined(__powerpc64__)
+     case __NR_utime:
+ #endif
+     case __NR_utimensat:  // New.
+@@ -204,7 +205,8 @@ bool SyscallSets::IsAllowedFileSystemAcc
+ #endif
+       return true;
+ // TODO(jln): these should be denied gracefully as well (moved below).
+-#if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
++#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
++    defined(__powerpc64__)
+     case __NR_fadvise64:  // EPERM not a valid errno.
+ #endif
+ #if defined(__i386__)
+@@ -216,12 +218,12 @@ bool SyscallSets::IsAllowedFileSystemAcc
+     case __NR_fdatasync:  // EPERM not a valid errno.
+     case __NR_flock:      // EPERM not a valid errno.
+     case __NR_fstatfs:    // Give information about the whole filesystem.
+-#if defined(__i386__) || defined(__arm__) || \
++#if defined(__i386__) || defined(__arm__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_fstatfs64:
+ #endif
+     case __NR_fsync:  // EPERM not a valid errno.
+-#if defined(__i386__)
++#if defined(__i386__) || defined(__powerpc64__)
+     case __NR_oldfstat:
+ #endif
+ #if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
+@@ -229,6 +231,8 @@ bool SyscallSets::IsAllowedFileSystemAcc
+     case __NR_sync_file_range:  // EPERM not a valid errno.
+ #elif defined(__arm__)
+     case __NR_arm_sync_file_range:  // EPERM not a valid errno.
++#elif defined(__powerpc64__)
++    case __NR_sync_file_range2: // EPERM not a valid errno.
+ #endif
+     default:
+       return false;
+@@ -248,7 +252,7 @@ bool SyscallSets::IsDeniedFileSystemAcce
+     case __NR_getdents:    // EPERM not a valid errno.
+ #endif
+     case __NR_getdents64:  // EPERM not a valid errno.
+-#if defined(__i386__) || \
++#if defined(__i386__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_readdir:
+ #endif
+@@ -290,7 +294,7 @@ bool SyscallSets::IsGetSimpleId(int sysn
+ bool SyscallSets::IsProcessPrivilegeChange(int sysno) {
+   switch (sysno) {
+     case __NR_capset:
+-#if defined(__i386__) || defined(__x86_64__)
++#if defined(__i386__) || defined(__x86_64__) || defined(__powerpc64__)
+     case __NR_ioperm:  // Intel privilege.
+     case __NR_iopl:    // Intel privilege.
+ #endif
+@@ -340,7 +344,7 @@ bool SyscallSets::IsAllowedSignalHandlin
+     case __NR_rt_sigprocmask:
+     case __NR_rt_sigreturn:
+     case __NR_rt_sigtimedwait:
+-#if defined(__i386__) || defined(__arm__) || \
++#if defined(__i386__) || defined(__arm__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_rt_sigtimedwait_time64:
+     case __NR_sigaction:
+@@ -357,7 +361,7 @@ bool SyscallSets::IsAllowedSignalHandlin
+     case __NR_signalfd:
+ #endif
+     case __NR_signalfd4:
+-#if defined(__i386__) || defined(__arm__) || \
++#if defined(__i386__) || defined(__arm__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_sigpending:
+     case __NR_sigsuspend:
+@@ -382,7 +386,7 @@ bool SyscallSets::IsAllowedOperationOnFd
+ #endif
+     case __NR_dup3:
+ #if defined(__x86_64__) || defined(__arm__) || defined(__mips__) || \
+-    defined(__aarch64__)
++    defined(__aarch64__) || defined(__powerpc64__)
+     case __NR_shutdown:
+ #endif
+       return true;
+@@ -416,7 +420,7 @@ bool SyscallSets::IsAllowedProcessStartO
+     case __NR_membarrier:
+     case __NR_wait4:
+     case __NR_waitid:
+-#if defined(__i386__)
++#if defined(__i386__) || defined(__powerpc64__)
+     case __NR_waitpid:
+ #endif
+ #if !defined(__GLIBC__)
+@@ -438,7 +442,7 @@ bool SyscallSets::IsAllowedProcessStartO
+     case __NR_set_tid_address:
+ #endif
+     case __NR_unshare:
+-#if !defined(__mips__) && !defined(__aarch64__)
++#if !defined(__mips__) && !defined(__aarch64__) || defined(__powerpc64__)
+     case __NR_vfork:
+ #endif
+     default:
+@@ -491,7 +495,7 @@ bool SyscallSets::IsAllowedGetOrModifySo
+       return true;
+     default:
+ #if defined(__x86_64__) || defined(__arm__) || defined(__mips__) || \
+-    defined(__aarch64__)
++    defined(__aarch64__) || defined(__powerpc64__)
+     case __NR_socketpair:  // We will want to inspect its argument.
+ #endif
+       return false;
+@@ -501,7 +505,7 @@ bool SyscallSets::IsAllowedGetOrModifySo
+ bool SyscallSets::IsDeniedGetOrModifySocket(int sysno) {
+   switch (sysno) {
+ #if defined(__x86_64__) || defined(__arm__) || defined(__mips__) || \
+-    defined(__aarch64__)
++    defined(__aarch64__) || defined(__powerpc64__)
+     case __NR_accept:
+     case __NR_accept4:
+     case __NR_bind:
+@@ -515,7 +519,7 @@ bool SyscallSets::IsDeniedGetOrModifySoc
+   }
+ }
+ 
+-#if defined(__i386__) || \
++#if defined(__i386__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+ // Big multiplexing system call for sockets.
+ bool SyscallSets::IsSocketCall(int sysno) {
+@@ -530,7 +534,8 @@ bool SyscallSets::IsSocketCall(int sysno
+ }
+ #endif
+ 
+-#if defined(__x86_64__) || defined(__arm__) || defined(__mips__)
++#if defined(__x86_64__) || defined(__arm__) || defined(__mips__) || \
++    defined(__powerpc64__)
+ bool SyscallSets::IsNetworkSocketInformation(int sysno) {
+   switch (sysno) {
+     case __NR_getpeername:
+@@ -558,7 +563,7 @@ bool SyscallSets::IsAllowedAddressSpaceA
+     case __NR_mincore:
+     case __NR_mlockall:
+ #if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
+-    defined(__aarch64__)
++    defined(__aarch64__) || defined(__powerpc64__)
+     case __NR_mmap:
+ #endif
+ #if defined(__i386__) || defined(__arm__) || \
+@@ -589,7 +594,7 @@ bool SyscallSets::IsAllowedAddressSpaceA
+ bool SyscallSets::IsAllowedGeneralIo(int sysno) {
+   switch (sysno) {
+     case __NR_lseek:
+-#if defined(__i386__) || defined(__arm__) || \
++#if defined(__i386__) || defined(__arm__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR__llseek:
+ #endif
+@@ -609,27 +614,27 @@ bool SyscallSets::IsAllowedGeneralIo(int
+     case __NR_read:
+     case __NR_readv:
+     case __NR_pread64:
+-#if defined(__arm__) || \
++#if defined(__arm__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_recv:
+ #endif
+ #if defined(__x86_64__) || defined(__arm__) || defined(__mips__) || \
+-    defined(__aarch64__)
++    defined(__aarch64__) || defined(__powerpc64__)
+     case __NR_recvfrom:  // Could specify source.
+     case __NR_recvmsg:   // Could specify source.
+ #endif
+-#if defined(__i386__) || defined(__x86_64__)
++#if defined(__i386__) || defined(__x86_64__) || defined(__powerpc64__)
+     case __NR_select:
+ #endif
+-#if defined(__i386__) || defined(__arm__) || defined(__mips__)
++#if defined(__i386__) || defined(__arm__) || defined(__mips__) || defined(__powerpc64__)
+     case __NR__newselect:
+ #endif
+-#if defined(__arm__) || \
++#if defined(__arm__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_send:
+ #endif
+ #if defined(__x86_64__) || defined(__arm__) || defined(__mips__) || \
+-    defined(__aarch64__)
++    defined(__aarch64__) || defined(__powerpc64__)
+     case __NR_sendmsg:  // Could specify destination.
+     case __NR_sendto:   // Could specify destination.
+ #endif
+@@ -684,7 +689,7 @@ bool SyscallSets::IsAllowedBasicSchedule
+     case __NR_nanosleep:
+       return true;
+     case __NR_getpriority:
+-#if defined(__i386__) || defined(__arm__) || \
++#if defined(__i386__) || defined(__arm__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_nice:
+ #endif
+@@ -696,7 +701,7 @@ bool SyscallSets::IsAllowedBasicSchedule
+ 
+ bool SyscallSets::IsAdminOperation(int sysno) {
+   switch (sysno) {
+-#if defined(__i386__) || defined(__arm__) || \
++#if defined(__i386__) || defined(__arm__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_bdflush:
+ #endif
+@@ -713,7 +718,8 @@ bool SyscallSets::IsAdminOperation(int s
+ 
+ bool SyscallSets::IsKernelModule(int sysno) {
+   switch (sysno) {
+-#if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
++#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
++    defined(__powerpc64__)
+     case __NR_create_module:
+     case __NR_get_kernel_syms:  // Should ENOSYS.
+     case __NR_query_module:
+@@ -745,7 +751,7 @@ bool SyscallSets::IsFsControl(int sysno)
+     case __NR_quotactl:
+     case __NR_swapoff:
+     case __NR_swapon:
+-#if defined(__i386__) || \
++#if defined(__i386__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_umount:
+ #endif
+@@ -762,7 +768,7 @@ bool SyscallSets::IsNuma(int sysno) {
+     case __NR_getcpu:
+     case __NR_mbind:
+ #if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
+-    defined(__aarch64__)
++    defined(__aarch64__) || defined(__powerpc64__)
+     case __NR_migrate_pages:
+ #endif
+     case __NR_move_pages:
+@@ -797,13 +803,13 @@ bool SyscallSets::IsGlobalProcessEnviron
+   switch (sysno) {
+     case __NR_acct:  // Privileged.
+ #if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
+-    defined(__aarch64__)
++    defined(__aarch64__) || defined(__powerpc64__)
+     case __NR_getrlimit:
+ #endif
+-#if defined(__i386__) || defined(__arm__)
++#if defined(__i386__) || defined(__arm__) || defined(__powerpc64__)
+     case __NR_ugetrlimit:
+ #endif
+-#if defined(__i386__) || \
++#if defined(__i386__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_ulimit:
+ #endif
+@@ -838,7 +844,7 @@ bool SyscallSets::IsGlobalSystemStatus(i
+ #endif
+     case __NR_sysinfo:
+     case __NR_uname:
+-#if defined(__i386__)
++#if defined(__i386__) || defined(__powerpc64__)
+     case __NR_olduname:
+     case __NR_oldolduname:
+ #endif
+@@ -904,8 +910,16 @@ bool SyscallSets::IsSystemVSemaphores(in
+ }
+ #endif
+ 
++/* shitty hack around Void's 4.19 kernel headers missing those numbers */
++#if defined(__powerpc64__) && !defined(__NR_shmget)
++#define __NR_shmget 395
++#define __NR_shmctl 396
++#define __NR_shmat 397
++#define __NR_shmdt 398
++#endif
++
+ #if defined(__i386__) || defined(__x86_64__) || defined(__arm__) || \
+-    defined(__aarch64__) ||                                         \
++    defined(__aarch64__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_64_BITS))
+ // These give a lot of ambient authority and bypass the setuid sandbox.
+ bool SyscallSets::IsSystemVSharedMemory(int sysno) {
+@@ -936,7 +950,7 @@ bool SyscallSets::IsSystemVMessageQueue(
+ }
+ #endif
+ 
+-#if defined(__i386__) || \
++#if defined(__i386__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+ // Big system V multiplexing system call.
+ bool SyscallSets::IsSystemVIpc(int sysno) {
+@@ -956,7 +970,7 @@ bool SyscallSets::IsAnySystemV(int sysno
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_64_BITS))
+   return IsSystemVMessageQueue(sysno) || IsSystemVSemaphores(sysno) ||
+          IsSystemVSharedMemory(sysno);
+-#elif defined(__i386__) || \
++#elif defined(__i386__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+   return IsSystemVIpc(sysno);
+ #endif
+@@ -1014,7 +1028,8 @@ bool SyscallSets::IsFaNotify(int sysno)
+ bool SyscallSets::IsTimer(int sysno) {
+   switch (sysno) {
+     case __NR_getitimer:
+-#if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
++#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
++    defined(__powerpc64__)
+     case __NR_alarm:
+ #endif
+     case __NR_setitimer:
+@@ -1096,17 +1111,20 @@ bool SyscallSets::IsMisc(int sysno) {
+     case __NR_syncfs:
+     case __NR_vhangup:
+ // The system calls below are not implemented.
+-#if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
++#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
++    defined(__powerpc64__)
+     case __NR_afs_syscall:
+ #endif
+ #if defined(__i386__) || \
+-    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
++    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
++    defined(__powerpc64__)
+     case __NR_break:
+ #endif
+-#if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
++#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
++    defined(__powerpc64__)
+     case __NR_getpmsg:
+ #endif
+-#if defined(__i386__) || \
++#if defined(__i386__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_gtty:
+     case __NR_idle:
+@@ -1115,20 +1133,21 @@ bool SyscallSets::IsMisc(int sysno) {
+     case __NR_prof:
+     case __NR_profil:
+ #endif
+-#if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
++#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
++    defined(__powerpc64__)
+     case __NR_putpmsg:
+ #endif
+ #if defined(__x86_64__)
+     case __NR_security:
+ #endif
+-#if defined(__i386__) || \
++#if defined(__i386__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_stty:
+ #endif
+-#if defined(__x86_64__)
++#if defined(__x86_64__) || defined(__powerpc64__)
+     case __NR_tuxcall:
+ #endif
+-#if !defined(__aarch64__)
++#if !defined(__aarch64__) && !defined(__powerpc64__)
+     case __NR_vserver:
+ #endif
+       return true;
+--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_sets.h
++++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_sets.h
+@@ -43,13 +43,14 @@ class SANDBOX_EXPORT SyscallSets {
+   static bool IsDeniedGetOrModifySocket(int sysno);
+ 
+ #if defined(__i386__) || \
+-    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
++    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
++    defined(__powerpc64__)
+   // Big multiplexing system call for sockets.
+   static bool IsSocketCall(int sysno);
+ #endif
+ 
+ #if defined(__x86_64__) || defined(__arm__) || defined(__mips__) || \
+-    defined(__aarch64__)
++    defined(__aarch64__) || defined(__powerpc64__)
+   static bool IsNetworkSocketInformation(int sysno);
+ #endif
+ 
+@@ -77,7 +78,7 @@ class SANDBOX_EXPORT SyscallSets {
+   static bool IsSystemVSemaphores(int sysno);
+ #endif
+ #if defined(__i386__) || defined(__x86_64__) || defined(__arm__) || \
+-    defined(__aarch64__) ||                                         \
++    defined(__aarch64__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_64_BITS))
+   // These give a lot of ambient authority and bypass the setuid sandbox.
+   static bool IsSystemVSharedMemory(int sysno);
+@@ -89,7 +90,8 @@ class SANDBOX_EXPORT SyscallSets {
+ #endif
+ 
+ #if defined(__i386__) || \
+-    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
++    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
++    defined(__powerpc64__)
+   // Big system V multiplexing system call.
+   static bool IsSystemVIpc(int sysno);
+ #endif
+--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf/syscall.cc
++++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf/syscall.cc
+@@ -18,7 +18,7 @@ namespace sandbox {
+ namespace {
+ 
+ #if defined(ARCH_CPU_X86_FAMILY) || defined(ARCH_CPU_ARM_FAMILY) || \
+-    defined(ARCH_CPU_MIPS_FAMILY)
++    defined(ARCH_CPU_MIPS_FAMILY) || defined (ARCH_CPU_PPC64_FAMILY)
+ // Number that's not currently used by any Linux kernel ABIs.
+ const int kInvalidSyscallNumber = 0x351d3;
+ #else
+@@ -312,10 +312,54 @@ asm(// We need to be able to tell the ke
+     "2:ret\n"
+     ".cfi_endproc\n"
+     ".size SyscallAsm, .-SyscallAsm\n"
++#elif defined(__powerpc64__)
++    ".text\n"
++    ".align 4\n"
++    ".type SyscallAsm @function\n"
++    "SyscallAsm:\n"
++    ".cfi_startproc\n"
++
++    // Check if r3 is negative
++    "cmpdi 3, 0\n"
++    "bgt 2f\n"
++
++    // Load address of 3f into r3 and return
++    "mflr 10\n"
++    "bl 1f\n"
++    "1: mflr 3\n"
++    "mtlr 10\n"
++    "addi 3, 3, 4*13\n"
++    "blr\n"
++
++    // Load arguments from array into r3-8
++    // save param 3 in r10
++    "2:\n"
++    "mr 0, 3\n"
++    "ld 3, 0(4)\n"
++    "ld 5, 16(4)\n"
++    "ld 6, 24(4)\n"
++    "ld 7, 32(4)\n"
++    "ld 8, 40(4)\n"
++    "ld 4, 8(4)\n"
++    "li 9, 0\n"
++
++    // Enter kernel
++    "sc\n"
++
++    // Magic return address
++    "3:\n"
++    // Like MIPS, ppc64 return values are always positive.
++    // Check for error in cr0.SO and negate upon error
++    "bc 4, 3, 4f\n"
++    "neg 3, 3\n"
++    "4: blr\n"
++
++    ".cfi_endproc\n"
++    ".size SyscallAsm, .-SyscallAsm\n"
+ #endif
+     );  // asm
+ 
+-#if defined(__x86_64__)
++#if defined(__x86_64__) || defined(__powerpc64__)
+ extern "C" {
+ intptr_t SyscallAsm(intptr_t nr, const intptr_t args[6]);
+ }
+@@ -429,6 +473,8 @@ intptr_t Syscall::Call(int nr,
+     ret = inout;
+   }
+ 
++#elif defined(__powerpc64__)
++  intptr_t ret = SyscallAsm(nr, args);
+ #else
+ #error "Unimplemented architecture"
+ #endif
+@@ -445,8 +491,26 @@ void Syscall::PutValueInUcontext(intptr_
+     // needs to be changed back.
+     ret_val = -ret_val;
+     SECCOMP_PARM4(ctx) = 1;
+-  } else
++  } else {
+     SECCOMP_PARM4(ctx) = 0;
++  }
++#endif
++#if defined(__powerpc64__)
++  // Same as MIPS, need to invert ret and set error register (cr0.SO)
++  if (ret_val <= -1 && ret_val >= -4095) {
++    ret_val = -ret_val;
++#ifdef __GLIBC__
++    ctx->uc_mcontext.regs->ccr |= (1 << 28);
++#else
++    ((struct pt_regs *)ctx->uc_mcontext.regs)->ccr |= (1 << 28);
++#endif
++  } else {
++#ifdef __GLIBC__
++    ctx->uc_mcontext.regs->ccr &= ~(1 << 28);
++#else
++    ((struct pt_regs *)ctx->uc_mcontext.regs)->ccr &= ~(1 << 28);
++#endif
++  }
+ #endif
+   SECCOMP_RESULT(ctx) = static_cast<greg_t>(ret_val);
+ }
+--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf/trap.cc
++++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf/trap.cc
+@@ -236,6 +236,20 @@ void Trap::SigSys(int nr, LinuxSigInfo*
+       SetIsInSigHandler();
+     }
+ 
++#if defined(__powerpc64__)
++    // On ppc64+glibc, some syscalls seem to accidentally negate the first
++    // parameter which causes checks against it to fail. For now, manually
++    // negate them back.
++    // TODO(shawn@anastas.io): investigate this issue further
++    auto nr = SECCOMP_SYSCALL(ctx);
++    if (nr == __NR_openat || nr == __NR_mkdirat || nr == __NR_faccessat || nr == __NR_readlinkat ||
++        nr == __NR_renameat || nr == __NR_renameat2 || nr == __NR_newfstatat || nr == __NR_unlinkat) {
++        if (static_cast<int>(SECCOMP_PARM1(ctx)) > 0) {
++            SECCOMP_PARM1(ctx) = -SECCOMP_PARM1(ctx);
++        }
++    }
++#endif
++
+     // Copy the seccomp-specific data into a arch_seccomp_data structure. This
+     // is what we are showing to TrapFnc callbacks that the system call
+     // evaluator registered with the sandbox.
+--- a/src/3rdparty/chromium/sandbox/linux/services/credentials.cc
++++ b/src/3rdparty/chromium/sandbox/linux/services/credentials.cc
+@@ -81,7 +81,7 @@ bool ChrootToSafeEmptyDir() {
+   pid_t pid = -1;
+   alignas(16) char stack_buf[PTHREAD_STACK_MIN];
+ #if defined(ARCH_CPU_X86_FAMILY) || defined(ARCH_CPU_ARM_FAMILY) || \
+-    defined(ARCH_CPU_MIPS_FAMILY)
++    defined(ARCH_CPU_MIPS_FAMILY) || defined(ARCH_CPU_PPC64_FAMILY)
+   // The stack grows downward.
+   void* stack = stack_buf + sizeof(stack_buf);
+ #else
+--- a/src/3rdparty/chromium/sandbox/linux/services/syscall_wrappers.cc
++++ b/src/3rdparty/chromium/sandbox/linux/services/syscall_wrappers.cc
+@@ -61,7 +61,7 @@ long sys_clone(unsigned long flags,
+ #if defined(ARCH_CPU_X86_64)
+   return syscall(__NR_clone, flags, child_stack, ptid, ctid, tls);
+ #elif defined(ARCH_CPU_X86) || defined(ARCH_CPU_ARM_FAMILY) || \
+-    defined(ARCH_CPU_MIPS_FAMILY)
++    defined(ARCH_CPU_MIPS_FAMILY) || defined(ARCH_CPU_PPC64_FAMILY)
+   // CONFIG_CLONE_BACKWARDS defined.
+   return syscall(__NR_clone, flags, child_stack, ptid, tls, ctid);
+ #endif
+--- a/src/3rdparty/chromium/sandbox/linux/syscall_broker/broker_process.cc
++++ b/src/3rdparty/chromium/sandbox/linux/syscall_broker/broker_process.cc
+@@ -165,7 +165,7 @@ bool BrokerProcess::IsSyscallBrokerable(
+ #if defined(__NR_fstatat64)
+     case __NR_fstatat64:
+ #endif
+-#if defined(__x86_64__) || defined(__aarch64__)
++#if defined(__x86_64__) || defined(__aarch64__) || defined(__powerpc64__)
+     case __NR_newfstatat:
+ #endif
+       return !fast_check || allowed_command_set_.test(COMMAND_STAT);
+--- a/src/3rdparty/chromium/sandbox/linux/system_headers/linux_seccomp.h
++++ b/src/3rdparty/chromium/sandbox/linux/system_headers/linux_seccomp.h
+@@ -41,6 +41,9 @@
+ #ifndef EM_AARCH64
+ #define EM_AARCH64 183
+ #endif
++#ifndef EM_PPC64
++#define EM_PPC64 21
++#endif
+ 
+ #ifndef __AUDIT_ARCH_64BIT
+ #define __AUDIT_ARCH_64BIT 0x80000000
+@@ -74,6 +77,14 @@
+ #define AUDIT_ARCH_AARCH64 (EM_AARCH64 | __AUDIT_ARCH_64BIT | __AUDIT_ARCH_LE)
+ #endif
+ 
++#ifndef AUDIT_ARCH_PPC64
++#define AUDIT_ARCH_PPC64 (EM_PPC64 | __AUDIT_ARCH_64BIT)
++#endif
++
++#ifndef AUDIT_ARCH_PPC64LE
++#define AUDIT_ARCH_PPC64LE (EM_PPC64 | __AUDIT_ARCH_64BIT | __AUDIT_ARCH_LE)
++#endif
++
+ // For prctl.h
+ #ifndef PR_SET_SECCOMP
+ #define PR_SET_SECCOMP               22
+--- a/src/3rdparty/chromium/sandbox/linux/system_headers/linux_signal.h
++++ b/src/3rdparty/chromium/sandbox/linux/system_headers/linux_signal.h
+@@ -13,7 +13,7 @@
+ // (not undefined, but defined different values and in different memory
+ // layouts). So, fill the gap here.
+ #if defined(__i386__) || defined(__x86_64__) || defined(__arm__) || \
+-    defined(__aarch64__)
++    defined(__aarch64__) || defined(__powerpc64__)
+ 
+ #define LINUX_SIGHUP 1
+ #define LINUX_SIGINT 2
+--- a/src/3rdparty/chromium/sandbox/linux/system_headers/linux_syscalls.h
++++ b/src/3rdparty/chromium/sandbox/linux/system_headers/linux_syscalls.h
+@@ -35,5 +35,9 @@
+ #include "sandbox/linux/system_headers/arm64_linux_syscalls.h"
+ #endif
+ 
++#if defined(__powerpc64__)
++#include "sandbox/linux/system_headers/ppc64_linux_syscalls.h"
++#endif
++
+ #endif  // SANDBOX_LINUX_SYSTEM_HEADERS_LINUX_SYSCALLS_H_
+ 
+--- a/src/3rdparty/chromium/sandbox/linux/system_headers/linux_ucontext.h
++++ b/src/3rdparty/chromium/sandbox/linux/system_headers/linux_ucontext.h
+@@ -11,6 +11,8 @@
+ #include "sandbox/linux/system_headers/arm_linux_ucontext.h"
+ #elif defined(__i386__)
+ #include "sandbox/linux/system_headers/i386_linux_ucontext.h"
++#elif defined(__powerpc64__)
++#include "sandbox/linux/system_headers/ppc64_linux_ucontext.h"
+ #else
+ #error "No support for your architecture in PNaCl header"
+ #endif
+--- a/src/3rdparty/chromium/sandbox/policy/linux/bpf_renderer_policy_linux.cc
++++ b/src/3rdparty/chromium/sandbox/policy/linux/bpf_renderer_policy_linux.cc
+@@ -15,6 +15,11 @@
+ #include "sandbox/linux/system_headers/linux_syscalls.h"
+ #include "sandbox/policy/linux/sandbox_linux.h"
+ 
++// On PPC64, TCGETS is defined in terms of struct termios, so we must include termios.h
++#ifdef __powerpc64__
++#include <termios.h>
++#endif
++
+ // TODO(vignatti): replace the local definitions below with #include
+ // <linux/dma-buf.h> once kernel version 4.6 becomes widely used.
+ #include <linux/types.h>
+--- a/src/3rdparty/chromium/third_party/angle/src/compiler/translator/InfoSink.h
++++ b/src/3rdparty/chromium/third_party/angle/src/compiler/translator/InfoSink.h
+@@ -93,7 +93,16 @@ class TInfoSinkBase
+             stream.precision(8);
+             stream << f;
+         }
+-        sink.append(stream.str());
++
++        // Hack to work around a bug where negative floating point values
++        // are rendered like '.0.5' instead of '-0.5'
++        std::string res(stream.str());
++
++        if (signbit(f)) { // test if f is negative
++            res[0] = '-';
++        }
++
++        sink.append(res);
+         return *this;
+     }
+     // Write boolean values as their names instead of integral value.
+--- a/src/3rdparty/chromium/third_party/angle/src/libANGLE/Constants.h
++++ b/src/3rdparty/chromium/third_party/angle/src/libANGLE/Constants.h
+@@ -9,6 +9,7 @@
+ #ifndef LIBANGLE_CONSTANTS_H_
+ #define LIBANGLE_CONSTANTS_H_
+ 
++#include <cstddef>
+ #include "common/platform.h"
+ 
+ #include <stdint.h>
+--- a/src/3rdparty/chromium/third_party/boringssl/BUILD.gn
++++ b/src/3rdparty/chromium/third_party/boringssl/BUILD.gn
+@@ -99,6 +99,13 @@ if (is_win && !is_msan && current_cpu !=
+       } else {
+         public_configs = [ ":no_asm_config" ]
+       }
++    } else if (current_cpu == "ppc64") {
++      if (is_linux) {
++        # TODO: ppc64 (be) check
++        sources += crypto_sources_linux_ppc64le
++      } else {
++        public_configs = [ ":no_asm_config" ]
++      }
+     } else {
+       public_configs = [ ":no_asm_config" ]
+     }
+--- a/src/3rdparty/chromium/third_party/breakpad/BUILD.gn
++++ b/src/3rdparty/chromium/third_party/breakpad/BUILD.gn
+@@ -623,7 +623,6 @@ if (is_linux || is_chromeos || is_androi
+       "breakpad/src/client/minidump_file_writer.h",
+       "breakpad/src/common/convert_UTF.cc",
+       "breakpad/src/common/convert_UTF.h",
+-      "breakpad/src/common/linux/breakpad_getcontext.S",
+       "breakpad/src/common/linux/elf_core_dump.cc",
+       "breakpad/src/common/linux/elf_core_dump.h",
+       "breakpad/src/common/linux/elfutils.cc",
+@@ -663,6 +662,15 @@ if (is_linux || is_chromeos || is_androi
+ 
+     libs = [ "dl" ]
+ 
++    if (current_cpu == "ppc64") {
++        defines = [ "HAVE_GETCONTEXT" ]
++        libs += [ "ucontext" ]
++    } else {
++        sources += [
++            "breakpad/src/common/linux/breakpad_getcontext.S"
++        ]
++    }
++
+     include_dirs = [
+       ".",
+       "breakpad/src",
+@@ -712,7 +720,6 @@ if (is_linux || is_chromeos || is_androi
+       "breakpad/src/client/linux/minidump_writer/minidump_writer_unittest.cc",
+       "breakpad/src/client/linux/minidump_writer/minidump_writer_unittest_utils.cc",
+       "breakpad/src/client/linux/minidump_writer/proc_cpuinfo_reader_unittest.cc",
+-      "breakpad/src/common/linux/breakpad_getcontext_unittest.cc",
+       "breakpad/src/common/linux/elf_core_dump_unittest.cc",
+       "breakpad/src/common/linux/file_id_unittest.cc",
+       "breakpad/src/common/linux/linux_libc_support_unittest.cc",
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/raw_context_cpu.h
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/raw_context_cpu.h
+@@ -44,6 +44,8 @@ typedef MDRawContextARM RawContextCPU;
+ typedef MDRawContextARM64_Old RawContextCPU;
+ #elif defined(__mips__)
+ typedef MDRawContextMIPS RawContextCPU;
++#elif defined(__powerpc64__)
++typedef MDRawContextPPC64 RawContextCPU;
+ #else
+ #error "This code has not been ported to your platform yet."
+ #endif
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.cc
+@@ -270,7 +270,54 @@ void ThreadInfo::FillCPUContext(RawConte
+   out->float_save.fir = mcontext.fpc_eir;
+ #endif
+ }
+-#endif  // __mips__
++
++#elif defined(__powerpc64__)
++
++#if !defined(__GLIBC__)
++#include <asm/elf.h>
++#include <asm/ptrace.h>
++#endif
++
++uintptr_t ThreadInfo::GetInstructionPointer() const {
++    return mcontext.gp_regs[PT_NIP];
++}
++
++void ThreadInfo::FillCPUContext(RawContextCPU* out) const {
++    out->context_flags = MD_CONTEXT_PPC64_FULL;
++    for (int i = 0; i < MD_CONTEXT_PPC64_GPR_COUNT; i++)
++        out->gpr[i] = mcontext.gp_regs[i];
++
++    out->lr = mcontext.gp_regs[PT_LNK];
++    out->srr0 = mcontext.gp_regs[PT_NIP];
++    out->srr1 = mcontext.gp_regs[PT_MSR];
++    out->cr = mcontext.gp_regs[PT_CCR];
++    out->xer = mcontext.gp_regs[PT_XER];
++    out->ctr = mcontext.gp_regs[PT_CTR];
++
++#ifdef __GLIBC__
++    for (int i = 0; i < MD_FLOATINGSAVEAREA_PPC_FPR_COUNT; i++)
++        out->float_save.fpregs[i] = mcontext.fp_regs[i];
++
++    out->float_save.fpscr = mcontext.fp_regs[NFPREG-1];
++#else
++    for (int i = 0; i < MD_FLOATINGSAVEAREA_PPC_FPR_COUNT; i++)
++        out->float_save.fpregs[i] = ((uint64_t *)&mcontext.fp_regs)[i];
++
++     out->float_save.fpscr = ((uint64_t *)&mcontext.fp_regs)[ELF_NFPREG-1];
++#endif
++
++    for (int i = 0; i < MD_VECTORSAVEAREA_PPC_VR_COUNT; i++)
++        out->vector_save.save_vr[i] = \
++            {(((uint64_t)vregs.vrregs[i][0]) << 32)
++                          | vregs.vrregs[i][1],
++            (((uint64_t)vregs.vrregs[i][2]) << 32)
++                         | vregs.vrregs[i][3]};
++
++    out->vrsave = vregs.vrsave;
++    out->vector_save.save_vscr = {0, vregs.vscr.vscr_word};
++    out->vector_save.save_vrvalid = 0xFFFFFFFF;
++}
++#endif  // __powerpc64__
+ 
+ void ThreadInfo::GetGeneralPurposeRegisters(void** gp_regs, size_t* size) {
+   assert(gp_regs || size);
+@@ -279,6 +326,11 @@ void ThreadInfo::GetGeneralPurposeRegist
+     *gp_regs = mcontext.gregs;
+   if (size)
+     *size = sizeof(mcontext.gregs);
++#elif defined(__powerpc64__)
++  if (gp_regs)
++    *gp_regs = mcontext.gp_regs;
++  if (size)
++    *size = sizeof(mcontext.gp_regs);
+ #else
+   if (gp_regs)
+     *gp_regs = &regs;
+@@ -294,6 +346,11 @@ void ThreadInfo::GetFloatingPointRegiste
+     *fp_regs = &mcontext.fpregs;
+   if (size)
+     *size = sizeof(mcontext.fpregs);
++#elif defined(__powerpc64__)
++  if (fp_regs)
++    *fp_regs = &mcontext.fp_regs;
++  if (size)
++    *size = sizeof(mcontext.fp_regs);
+ #else
+   if (fp_regs)
+     *fp_regs = &fpregs;
+@@ -302,4 +359,13 @@ void ThreadInfo::GetFloatingPointRegiste
+ #endif
+ }
+ 
++#if defined(__powerpc64__)
++void ThreadInfo::GetVectorRegisters(void** v_regs, size_t* size) {
++    if (v_regs)
++        *v_regs = &vregs;
++    if (size)
++        *size = sizeof(vregs);
++}
++#endif
++
+ }  // namespace google_breakpad
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.h
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.h
+@@ -68,6 +68,10 @@ struct ThreadInfo {
+   // Use the structures defined in <sys/user.h>
+   struct user_regs_struct regs;
+   struct user_fpsimd_struct fpregs;
++#elif defined(__powerpc64__)
++  // Use the structures defined in <sys/ucontext.h>.
++  mcontext_t mcontext;
++  vrregset_t vregs;
+ #elif defined(__mips__)
+   // Use the structure defined in <sys/ucontext.h>.
+   mcontext_t mcontext;
+@@ -84,6 +88,11 @@ struct ThreadInfo {
+ 
+   // Returns the pointer and size of float point register area.
+   void GetFloatingPointRegisters(void** fp_regs, size_t* size);
++
++#if defined(__powerpc64__)
++  // Returns the pointer and size of the vector register area. (PPC64 only)
++  void GetVectorRegisters(void** v_regs, size_t* size);
++#endif
+ };
+ 
+ }  // namespace google_breakpad
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc
+@@ -254,6 +254,60 @@ void UContextReader::FillCPUContext(RawC
+   out->float_save.fir = uc->uc_mcontext.fpc_eir;  // Unused.
+ #endif
+ }
++
++#elif defined(__powerpc64__)
++
++#ifndef __GLIBC__
++#include <asm/elf.h>
++#include <asm/ptrace.h>
++#endif
++
++uintptr_t UContextReader::GetStackPointer(const ucontext_t* uc) {
++    return uc->uc_mcontext.gp_regs[MD_CONTEXT_PPC64_REG_SP];
++}
++
++uintptr_t UContextReader::GetInstructionPointer(const ucontext_t* uc) {
++    return uc->uc_mcontext.gp_regs[PT_NIP];
++}
++
++void UContextReader::FillCPUContext(RawContextCPU* out, const ucontext_t* uc,
++                                    const vrregset_t* vregs) {
++    out->context_flags = MD_CONTEXT_PPC64_FULL;
++
++    for (int i = 0; i < MD_CONTEXT_PPC64_GPR_COUNT; i++)
++        out->gpr[i] = uc->uc_mcontext.gp_regs[i];
++
++    out->lr = uc->uc_mcontext.gp_regs[PT_LNK];
++    out->srr0 = uc->uc_mcontext.gp_regs[PT_NIP];
++    out->srr1 = uc->uc_mcontext.gp_regs[PT_MSR];
++    out->cr = uc->uc_mcontext.gp_regs[PT_CCR];
++    out->xer = uc->uc_mcontext.gp_regs[PT_XER];
++    out->ctr = uc->uc_mcontext.gp_regs[PT_CTR];
++
++#ifdef __GLIBC__
++    for (int i = 0; i < MD_FLOATINGSAVEAREA_PPC_FPR_COUNT; i++)
++        out->float_save.fpregs[i] = uc->uc_mcontext.fp_regs[i];
++
++    out->float_save.fpscr = uc->uc_mcontext.fp_regs[NFPREG-1];
++#else
++    for (int i = 0; i < MD_FLOATINGSAVEAREA_PPC_FPR_COUNT; i++)
++        out->float_save.fpregs[i] = ((uint64_t *)&uc->uc_mcontext.fp_regs)[i];
++
++    out->float_save.fpscr = ((uint64_t *)&uc->uc_mcontext.fp_regs)[ELF_NFPREG-1];
++#endif
++
++    for (int i = 0; i < MD_VECTORSAVEAREA_PPC_VR_COUNT; i++)
++        out->vector_save.save_vr[i] =
++            {(((uint64_t)vregs->vrregs[i][0]) << 32)
++                         | vregs->vrregs[i][1],
++             (((uint64_t)vregs->vrregs[i][2]) << 32)
++                         | vregs->vrregs[i][3]};
++
++    out->vrsave = vregs->vrsave;
++    out->vector_save.save_vscr = {0, vregs->vscr.vscr_word};
++    out->vector_save.save_vrvalid = 0xFFFFFFFF;
++}
++
+ #endif
+ 
+ }  // namespace google_breakpad
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h
+@@ -59,6 +59,9 @@ struct UContextReader {
+ #elif defined(__aarch64__)
+   static void FillCPUContext(RawContextCPU* out, const ucontext_t* uc,
+                              const struct fpsimd_context* fpregs);
++#elif defined(__powerpc64__)
++  static void FillCPUContext(RawContextCPU *out, const ucontext_t *uc,
++                             const vrregset_t* vregs);
+ #else
+   static void FillCPUContext(RawContextCPU* out, const ucontext_t* uc);
+ #endif
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc
+@@ -105,6 +105,13 @@
+ #define PR_SET_PTRACER 0x59616d61
+ #endif
+ 
++/* musl hack, can't include asm/ptrace.h as that causes conflicts */
++#ifndef __GLIBC__
++#if defined(__powerpc64__) && !defined(PT_NIP)
++#define PT_NIP 32
++#endif
++#endif
++
+ namespace google_breakpad {
+ 
+ namespace {
+@@ -461,9 +468,16 @@ bool ExceptionHandler::HandleSignal(int
+     memcpy(&g_crash_context_.float_state, fp_ptr,
+            sizeof(g_crash_context_.float_state));
+   }
++#elif defined(__powerpc64__)
++  // On PPC64, we must copy VR state
++  ucontext_t* uc_ptr = (ucontext_t*)uc;
++  if (uc_ptr->uc_mcontext.v_regs) {
++    memcpy(&g_crash_context_.vector_state, uc_ptr->uc_mcontext.v_regs,
++           sizeof(g_crash_context_.vector_state));
++  }
+ #elif !defined(__ARM_EABI__) && !defined(__mips__)
+   // FP state is not part of user ABI on ARM Linux.
+-  // In case of MIPS Linux FP state is already part of ucontext_t
++  // In case of MIPS, Linux FP state is already part of ucontext_t
+   // and 'float_state' is not a member of CrashContext.
+   ucontext_t* uc_ptr = (ucontext_t*)uc;
+   if (uc_ptr->uc_mcontext.fpregs) {
+@@ -708,11 +722,19 @@ bool ExceptionHandler::WriteMinidump() {
+   }
+ #endif
+ 
+-#if !defined(__ARM_EABI__) && !defined(__aarch64__) && !defined(__mips__)
++#if !defined(__ARM_EABI__) && !defined(__aarch64__) && !defined(__mips__) \
++    && !defined(__powerpc64__)
+   // FPU state is not part of ARM EABI ucontext_t.
+   memcpy(&context.float_state, context.context.uc_mcontext.fpregs,
+          sizeof(context.float_state));
+ #endif
++
++#if defined(__powerpc64__)
++  // Vector registers must be copied on PPC64
++  memcpy(&context.vector_state, context.context.uc_mcontext.v_regs,
++         sizeof(context.vector_state));
++#endif
++
+   context.tid = sys_gettid();
+ 
+   // Add an exception stream to the minidump for better reporting.
+@@ -733,6 +755,9 @@ bool ExceptionHandler::WriteMinidump() {
+ #elif defined(__mips__)
+   context.siginfo.si_addr =
+       reinterpret_cast<void*>(context.context.uc_mcontext.pc);
++#elif defined(__powerpc64__)
++  context.siginfo.si_addr =
++      reinterpret_cast<void*>(context.context.uc_mcontext.gp_regs[PT_NIP]);
+ #else
+ #error "This code has not been ported to your platform yet."
+ #endif
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.h
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.h
+@@ -192,7 +192,11 @@ class ExceptionHandler {
+     siginfo_t siginfo;
+     pid_t tid;  // the crashing thread.
+     ucontext_t context;
+-#if !defined(__ARM_EABI__) && !defined(__mips__)
++#if defined(__powerpc64__)
++    // PPC64's FP state is a part of ucontext_t like MIPS but the vector
++    // state is not, so a struct is needed.
++    vstate_t vector_state;
++#elif !defined(__ARM_EABI__) && !defined(__mips__)
+     // #ifdef this out because FP state is not part of user ABI for Linux ARM.
+     // In case of MIPS Linux FP state is already part of ucontext_t so
+     // 'float_state' is not required.
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler_unittest.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler_unittest.cc
+@@ -307,7 +307,7 @@ TEST(ExceptionHandlerTest, ParallelChild
+   }
+ 
+   // Wait a while until the child should have crashed.
+-  usleep(1000000);
++  usleep(2000000);
+   // Kill the child if it is still running.
+   kill(child, SIGKILL);
+ 
+@@ -559,6 +559,8 @@ const unsigned char kIllegalInstruction[
+ #if defined(__mips__)
+   // mfc2 zero,Impl - usually illegal in userspace.
+   0x48, 0x00, 0x00, 0x48
++#elif defined(__powerpc64__)
++  0x01, 0x01, 0x01, 0x01 // Crashes on a tested POWER9 cpu
+ #else
+   // This crashes with SIGILL on x86/x86-64/arm.
+   0xff, 0xff, 0xff, 0xff
+@@ -754,10 +756,10 @@ TEST(ExceptionHandlerTest, InstructionPo
+ 
+   // These are defined here so the parent can use them to check the
+   // data from the minidump afterwards.
+-  // Use 4k here because the OS will hand out a single page even
++  // Use the page size here because the OS will hand out a single page even
+   // if a smaller size is requested, and this test wants to
+   // test the upper bound of the memory range.
+-  const uint32_t kMemorySize = 4096;  // bytes
++  const uint32_t kMemorySize = getpagesize();  // bytes
+   const int kOffset = kMemorySize - sizeof(kIllegalInstruction);
+ 
+   const pid_t child = fork();
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/microdump_writer/microdump_writer.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/microdump_writer/microdump_writer.cc
+@@ -138,7 +138,9 @@ class MicrodumpWriter {
+                   const MicrodumpExtraInfo& microdump_extra_info,
+                   LinuxDumper* dumper)
+       : ucontext_(context ? &context->context : NULL),
+-#if !defined(__ARM_EABI__) && !defined(__mips__)
++#if defined(__powerpc64__)
++        vector_state_(context ? &context->vector_state : NULL),
++#elif !defined(__ARM_EABI__) && !defined(__mips__)
+         float_state_(context ? &context->float_state : NULL),
+ #endif
+         dumper_(dumper),
+@@ -337,6 +339,8 @@ class MicrodumpWriter {
+ # else
+ #  error "This mips ABI is currently not supported (n32)"
+ #endif
++#elif defined(__powerpc64__)
++    const char kArch[] = "ppc64";
+ #else
+ #error "This code has not been ported to your platform yet"
+ #endif
+@@ -409,7 +413,9 @@ class MicrodumpWriter {
+   void DumpCPUState() {
+     RawContextCPU cpu;
+     my_memset(&cpu, 0, sizeof(RawContextCPU));
+-#if !defined(__ARM_EABI__) && !defined(__mips__)
++#if defined(__powerpc64__)
++    UContextReader::FillCPUContext(&cpu, ucontext_, vector_state_);
++#elif !defined(__ARM_EABI__) && !defined(__mips__)
+     UContextReader::FillCPUContext(&cpu, ucontext_, float_state_);
+ #else
+     UContextReader::FillCPUContext(&cpu, ucontext_);
+@@ -605,7 +611,9 @@ class MicrodumpWriter {
+   void* Alloc(unsigned bytes) { return dumper_->allocator()->Alloc(bytes); }
+ 
+   const ucontext_t* const ucontext_;
+-#if !defined(__ARM_EABI__) && !defined(__mips__)
++#if defined(__powerpc64__)
++  const google_breakpad::vstate_t* const vector_state_;
++#elif !defined(__ARM_EABI__) && !defined(__mips__)
+   const google_breakpad::fpstate_t* const float_state_;
+ #endif
+   LinuxDumper* dumper_;
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/microdump_writer/microdump_writer_unittest.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/microdump_writer/microdump_writer_unittest.cc
+@@ -279,10 +279,19 @@ TEST(MicrodumpWriterTest, BasicWithMappi
+   CrashAndGetMicrodump(mappings, MicrodumpExtraInfo(), &buf);
+   ASSERT_TRUE(ContainsMicrodump(buf));
+ 
++  int page_size = getpagesize();
+ #ifdef __LP64__
+-  ASSERT_NE(std::string::npos,
+-            buf.find("M 0000000000001000 000000000000002A 0000000000001000 "
+-                     "33221100554477668899AABBCCDDEEFF0 libfoo.so"));
++  // This test is only available for the following page sizes
++  ASSERT_TRUE((page_size == 4096) || (page_size == 65536));
++  if (page_size == 4096) {
++    ASSERT_NE(std::string::npos,
++              buf.find("M 0000000000001000 000000000000002A 0000000000001000 "
++                       "33221100554477668899AABBCCDDEEFF0 libfoo.so"));
++  } else {
++    ASSERT_NE(std::string::npos,
++              buf.find("M 0000000000010000 000000000000002A 0000000000010000 "
++                       "33221100554477668899AABBCCDDEEFF0 libfoo.so"));
++  }
+ #else
+   ASSERT_NE(std::string::npos,
+             buf.find("M 00001000 0000002A 00001000 "
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_core_dumper.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_core_dumper.cc
+@@ -117,6 +117,9 @@ bool LinuxCoreDumper::GetThreadInfoByInd
+ #elif defined(__mips__)
+   stack_pointer =
+       reinterpret_cast<uint8_t*>(info->mcontext.gregs[MD_CONTEXT_MIPS_REG_SP]);
++#elif defined(__powerpc64__)
++  stack_pointer =
++      reinterpret_cast<uint8_t*>(info->mcontext.gp_regs[MD_CONTEXT_PPC64_REG_SP]);
+ #else
+ #error "This code hasn't been ported to your platform yet."
+ #endif
+@@ -212,7 +215,10 @@ bool LinuxCoreDumper::EnumerateThreads()
+         memset(&info, 0, sizeof(ThreadInfo));
+         info.tgid = status->pr_pgrp;
+         info.ppid = status->pr_ppid;
+-#if defined(__mips__)
++#if defined(__powerpc64__)
++        for (int i = 0; i < 31; i++)
++            info.mcontext.gp_regs[i] = status->pr_reg[i];
++#elif defined(__mips__)
+ #if defined(__ANDROID__)
+         for (int i = EF_R0; i <= EF_R31; i++)
+           info.mcontext.gregs[i - EF_R0] = status->pr_reg[i];
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper.cc
+@@ -765,7 +765,9 @@ bool LinuxDumper::GetStackInfo(const voi
+       reinterpret_cast<uint8_t*>(int_stack_pointer & ~(page_size - 1));
+ 
+   // The number of bytes of stack which we try to capture.
+-  static const ptrdiff_t kStackToCapture = 32 * 1024;
++  // This now depends on page_size to avoid missing data
++  // on systems with larger page sizes.
++  static const ptrdiff_t kStackToCapture = 8 * page_size;
+ 
+   const MappingInfo* mapping = FindMapping(stack_pointer);
+   if (!mapping)
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper.h
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper.h
+@@ -63,7 +63,8 @@ namespace google_breakpad {
+  (defined(__mips__) && _MIPS_SIM == _ABIO32)
+ typedef Elf32_auxv_t elf_aux_entry;
+ #elif defined(__x86_64) || defined(__aarch64__) || \
+-     (defined(__mips__) && _MIPS_SIM != _ABIO32)
++     (defined(__mips__) && _MIPS_SIM != _ABIO32) || \
++     defined(__powerpc64__)
+ typedef Elf64_auxv_t elf_aux_entry;
+ #endif
+ 
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper_unittest_helper.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper_unittest_helper.cc
+@@ -51,6 +51,8 @@
+ #define TID_PTR_REGISTER "rcx"
+ #elif defined(__mips__)
+ #define TID_PTR_REGISTER "$1"
++#elif defined(__powerpc64__)
++#define TID_PTR_REGISTER "r8"
+ #else
+ #error This test has not been ported to this platform.
+ #endif
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper.cc
+@@ -154,19 +154,27 @@ bool LinuxPtraceDumper::CopyFromProcess(
+   return true;
+ }
+ 
+-bool LinuxPtraceDumper::ReadRegisterSet(ThreadInfo* info, pid_t tid)
+-{
++bool LinuxPtraceDumper::ReadRegisterSet(ThreadInfo* info, pid_t tid) {
+ #ifdef PTRACE_GETREGSET
+   struct iovec io;
+   info->GetGeneralPurposeRegisters(&io.iov_base, &io.iov_len);
+-  if (sys_ptrace(PTRACE_GETREGSET, tid, (void*)NT_PRSTATUS, (void*)&io) == -1) {
++  if (ptrace(PTRACE_GETREGSET, tid, (void*)NT_PRSTATUS, (void*)&io) == -1) {
+     return false;
+   }
+ 
+   info->GetFloatingPointRegisters(&io.iov_base, &io.iov_len);
+-  if (sys_ptrace(PTRACE_GETREGSET, tid, (void*)NT_FPREGSET, (void*)&io) == -1) {
++  if (ptrace(PTRACE_GETREGSET, tid, (void*)NT_FPREGSET, (void*)&io) == -1) {
+     return false;
+   }
++
++#if defined(__powerpc64__)
++  // Grab the vector registers on PPC64 too
++  info->GetVectorRegisters(&io.iov_base, &io.iov_len);
++  if (ptrace(PTRACE_GETREGSET, tid, (void*)NT_PPC_VMX, (void*)&io) == -1) {
++    return false;
++  }
++#endif // defined(__powerpc64__)
++
+   return true;
+ #else
+   return false;
+@@ -303,6 +311,9 @@ bool LinuxPtraceDumper::GetThreadInfoByI
+ #elif defined(__mips__)
+   stack_pointer =
+       reinterpret_cast<uint8_t*>(info->mcontext.gregs[MD_CONTEXT_MIPS_REG_SP]);
++#elif defined(__powerpc64__)
++  stack_pointer =
++      reinterpret_cast<uint8_t*>(info->mcontext.gp_regs[MD_CONTEXT_PPC64_REG_SP]);
+ #else
+ #error "This code hasn't been ported to your platform yet."
+ #endif
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper_unittest.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper_unittest.cc
+@@ -462,6 +462,9 @@ TEST(LinuxPtraceDumperTest, VerifyStackR
+ #elif defined(__mips__)
+     pid_t* process_tid_location =
+         reinterpret_cast<pid_t*>(one_thread.mcontext.gregs[1]);
++#elif defined(__powerpc64__)
++    pid_t* process_tid_location =
++        reinterpret_cast<pid_t*>(one_thread.mcontext.gp_regs[8]);
+ #else
+ #error This test has not been ported to this platform.
+ #endif
+@@ -559,6 +562,8 @@ TEST_F(LinuxPtraceDumperTest, SanitizeSt
+   uintptr_t heap_addr = thread_info.regs.rcx;
+ #elif defined(__mips__)
+   uintptr_t heap_addr = thread_info.mcontext.gregs[1];
++#elif defined(__powerpc64__)
++  uintptr_t heap_addr = thread_info.mcontext.gp_regs[8];
+ #else
+ #error This test has not been ported to this platform.
+ #endif
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.cc
+@@ -136,7 +136,9 @@ class MinidumpWriter {
+       : fd_(minidump_fd),
+         path_(minidump_path),
+         ucontext_(context ? &context->context : NULL),
+-#if !defined(__ARM_EABI__) && !defined(__mips__)
++#if defined(__powerpc64__)
++        vector_state_(context ? &context->vector_state : NULL),
++#elif !defined(__ARM_EABI__) && !defined(__mips__)
+         float_state_(context ? &context->float_state : NULL),
+ #endif
+         dumper_(dumper),
+@@ -468,7 +470,9 @@ class MinidumpWriter {
+         if (!cpu.Allocate())
+           return false;
+         my_memset(cpu.get(), 0, sizeof(RawContextCPU));
+-#if !defined(__ARM_EABI__) && !defined(__mips__)
++#if defined(__powerpc64__)
++        UContextReader::FillCPUContext(cpu.get(), ucontext_, vector_state_);
++#elif !defined(__ARM_EABI__) && !defined(__mips__)
+         UContextReader::FillCPUContext(cpu.get(), ucontext_, float_state_);
+ #else
+         UContextReader::FillCPUContext(cpu.get(), ucontext_);
+@@ -897,7 +901,7 @@ class MinidumpWriter {
+     dirent->location.rva = 0;
+   }
+ 
+-#if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
++#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || defined(__powerpc64__)
+   bool WriteCPUInformation(MDRawSystemInfo* sys_info) {
+     char vendor_id[sizeof(sys_info->cpu.x86_cpu_info.vendor_id) + 1] = {0};
+     static const char vendor_id_name[] = "vendor_id";
+@@ -917,7 +921,9 @@ class MinidumpWriter {
+ 
+     // processor_architecture should always be set, do this first
+     sys_info->processor_architecture =
+-#if defined(__mips__)
++#if defined(__powerpc64__)
++        MD_CPU_ARCHITECTURE_PPC64;
++#elif defined(__mips__)
+ # if _MIPS_SIM == _ABIO32
+         MD_CPU_ARCHITECTURE_MIPS;
+ # elif _MIPS_SIM == _ABI64
+@@ -1333,7 +1339,9 @@ class MinidumpWriter {
+   const char* path_;  // Path to the file where the minidum should be written.
+ 
+   const ucontext_t* const ucontext_;  // also from the signal handler
+-#if !defined(__ARM_EABI__) && !defined(__mips__)
++#if defined(__powerpc64__)
++  const google_breakpad::vstate_t* const vector_state_;
++#elif !defined(__ARM_EABI__) && !defined(__mips__)
+   const google_breakpad::fpstate_t* const float_state_;  // ditto
+ #endif
+   LinuxDumper* dumper_;
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.h
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.h
+@@ -48,6 +48,8 @@ class ExceptionHandler;
+ 
+ #if defined(__aarch64__)
+ typedef struct fpsimd_context fpstate_t;
++#elif defined(__powerpc64__)
++typedef vrregset_t vstate_t;
+ #elif !defined(__ARM_EABI__) && !defined(__mips__)
+ typedef std::remove_pointer<fpregset_t>::type fpstate_t;
+ #endif
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer_unittest.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer_unittest.cc
+@@ -715,6 +715,12 @@ TEST(MinidumpWriterTest, InvalidStackPoi
+ #elif defined(__mips__)
+   context.context.uc_mcontext.gregs[MD_CONTEXT_MIPS_REG_SP] =
+       invalid_stack_pointer;
++#elif defined(__powerpc64__)
++  context.context.uc_mcontext.gp_regs[MD_CONTEXT_PPC64_REG_SP] =
++      invalid_stack_pointer;
++#elif defined(__powerpc64__)
++  context.context.uc_mcontext.gp_regs[MD_CONTEXT_PPC64_REG_SP] =
++      invalid_stack_pointer;
+ #else
+ # error "This code has not been ported to your platform yet."
+ #endif
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/common/linux/memory_mapped_file.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/common/linux/memory_mapped_file.cc
+@@ -65,8 +65,7 @@ bool MemoryMappedFile::Map(const char* p
+   }
+ 
+ #if defined(__x86_64__) || defined(__aarch64__) || \
+-   (defined(__mips__) && _MIPS_SIM == _ABI64)
+-
++   (defined(__mips__) && _MIPS_SIM == _ABI64) || defined(__powerpc64__)
+   struct kernel_stat st;
+   if (sys_fstat(fd, &st) == -1 || st.st_size < 0) {
+ #else
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/common/linux/memory_mapped_file_unittest.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/common/linux/memory_mapped_file_unittest.cc
+@@ -176,9 +176,10 @@ TEST_F(MemoryMappedFileTest, RemapAfterM
+ TEST_F(MemoryMappedFileTest, MapWithOffset) {
+   // Put more data in the test file this time. Offsets can only be
+   // done on page boundaries, so we need a two page file to test this.
+-  const int page_size = 4096;
+-  char data1[2 * page_size];
+-  size_t data1_size = sizeof(data1);
++  const int page_size = getpagesize();
++  char *data1 = static_cast<char*>(malloc(2 * page_size));
++  EXPECT_TRUE(data1 != NULL);
++  size_t data1_size = (2 * page_size);
+   for (size_t i = 0; i < data1_size; ++i) {
+     data1[i] = i & 0x7f;
+   }
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/common/memory_allocator_unittest.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/common/memory_allocator_unittest.cc
+@@ -57,8 +57,9 @@ TEST(PageAllocatorTest, LargeObject) {
+ 
+   EXPECT_EQ(0U, allocator.pages_allocated());
+   uint8_t* p = reinterpret_cast<uint8_t*>(allocator.Alloc(10000));
++  uint64_t expected_pages = 1 + ((10000 - 1) / getpagesize());
+   ASSERT_FALSE(p == NULL);
+-  EXPECT_EQ(3U, allocator.pages_allocated());
++  EXPECT_EQ(expected_pages, allocator.pages_allocated());
+   for (unsigned i = 1; i < 10; ++i) {
+     uint8_t* p = reinterpret_cast<uint8_t*>(allocator.Alloc(i));
+     ASSERT_FALSE(p == NULL);
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/processor/exploitability_linux.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/processor/exploitability_linux.cc
+@@ -202,12 +202,14 @@ bool ExploitabilityLinux::EndedOnIllegal
+   // Check architecture and set architecture variable to corresponding flag
+   // in objdump.
+   switch (context->GetContextCPU()) {
++#if defined(__i386) || defined(__x86_64)
+     case MD_CONTEXT_X86:
+       architecture = "i386";
+       break;
+     case MD_CONTEXT_AMD64:
+       architecture = "i386:x86-64";
+       break;
++#endif
+     default:
+       // Unsupported architecture. Note that ARM architectures are not
+       // supported because objdump does not support ARM.
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/processor/exploitability_unittest.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/processor/exploitability_unittest.cc
+@@ -104,6 +104,8 @@ ExploitabilityFor(const string& filename
+ }
+ 
+ TEST(ExploitabilityTest, TestWindowsEngine) {
++// The following tests are only executable on an x86-class linux machine.
++#if !defined(_WIN32) && (defined(__i386) || defined(__x86_64))
+   ASSERT_EQ(google_breakpad::EXPLOITABILITY_HIGH,
+             ExploitabilityFor("ascii_read_av.dmp"));
+   ASSERT_EQ(google_breakpad::EXPLOITABILITY_HIGH,
+@@ -136,9 +138,12 @@ TEST(ExploitabilityTest, TestWindowsEngi
+             ExploitabilityFor("read_av_clobber_write.dmp"));
+   ASSERT_EQ(google_breakpad::EXPLOITABILITY_LOW,
+             ExploitabilityFor("read_av_conditional.dmp"));
++#endif
+ }
+ 
+ TEST(ExploitabilityTest, TestLinuxEngine) {
++// The following tests are only executable on an x86-class linux machine.
++#if defined(__i386) || defined(__x86_64)
+   ASSERT_EQ(google_breakpad::EXPLOITABILITY_INTERESTING,
+             ExploitabilityFor("linux_null_read_av.dmp"));
+   ASSERT_EQ(google_breakpad::EXPLOITABILITY_HIGH,
+@@ -171,7 +176,8 @@ TEST(ExploitabilityTest, TestLinuxEngine
+             ExploitabilityFor("linux_executable_heap.dmp"));
+   ASSERT_EQ(google_breakpad::EXPLOITABILITY_HIGH,
+             ExploitabilityFor("linux_jmp_to_module_not_exe_region.dmp"));
+-#ifndef _WIN32
++#endif
++#if !defined(_WIN32) && (defined(__i386) || defined(__x86_64))
+   ASSERT_EQ(google_breakpad::EXPLOITABILITY_HIGH,
+             ExploitabilityFor("linux_write_to_nonwritable_module.dmp"));
+   ASSERT_EQ(google_breakpad::EXPLOITABILITY_HIGH,
+@@ -182,10 +188,10 @@ TEST(ExploitabilityTest, TestLinuxEngine
+             ExploitabilityFor("linux_write_to_outside_module_via_math.dmp"));
+   ASSERT_EQ(google_breakpad::EXPLOITABILITY_INTERESTING,
+             ExploitabilityFor("linux_write_to_under_4k.dmp"));
+-#endif  // _WIN32
++#endif  // !defined(_WIN32) && (!defined(__i386) && !defined(__x86_64))
+ }
+ 
+-#ifndef _WIN32
++#if !defined(_WIN32) && (defined(__i386) || defined(__x86_64))
+ TEST(ExploitabilityLinuxUtilsTest, DisassembleBytesTest) {
+   ASSERT_FALSE(ExploitabilityLinuxTest::DisassembleBytes("", NULL, 5, NULL));
+   uint8_t bytes[6] = {0xc7, 0x0, 0x5, 0x0, 0x0, 0x0};
+@@ -301,6 +307,7 @@ TEST(ExploitabilityLinuxUtilsTest, Calcu
+                                                          context,
+                                                          &write_address));
+ }
+-#endif  // _WIN32
++#endif  // !defined(_WIN32) && (defined(__i386) || defined(__x86_64))
++
+ 
+ }  // namespace
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/tools/linux/md2core/minidump-2-core.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/tools/linux/md2core/minidump-2-core.cc
+@@ -77,6 +77,8 @@
+   #define ELF_ARCH  EM_MIPS
+ #elif defined(__aarch64__)
+   #define ELF_ARCH  EM_AARCH64
++#elif defined(__powerpc64__)
++  #define ELF_ARCH  EM_PPC64
+ #endif
+ 
+ #if defined(__arm__)
+@@ -87,6 +89,8 @@ typedef user_regs user_regs_struct;
+ #elif defined (__mips__)
+ // This file-local typedef simplifies the source code.
+ typedef gregset_t user_regs_struct;
++#elif defined(__powerpc64__)
++typedef struct pt_regs user_regs_struct;
+ #endif
+ 
+ using google_breakpad::MDTypeHelper;
+@@ -322,6 +326,12 @@ struct CrashedProcess {
+ #if defined(__aarch64__)
+     user_fpsimd_struct fpregs;
+ #endif
++#if defined(__powerpc64__)
++    mcontext_t mcontext;
++#endif
++#if defined(__powerpc64__)
++    mcontext_t mcontext;
++#endif
+     uintptr_t stack_addr;
+     const uint8_t* stack;
+     size_t stack_length;
+@@ -535,6 +545,38 @@ ParseThreadRegisters(CrashedProcess::Thr
+   thread->mcontext.fpc_eir = rawregs->float_save.fir;
+ #endif
+ }
++#elif defined(__powerpc64__)
++static void
++ParseThreadRegisters(CrashedProcess::Thread* thread,
++                     const MinidumpMemoryRange& range) {
++  const MDRawContextPPC64* rawregs = range.GetData<MDRawContextPPC64>(0);
++
++  for (int i = 0; i < MD_CONTEXT_PPC64_GPR_COUNT; i++)
++    thread->mcontext.gp_regs[i] = rawregs->gpr[i];
++
++  thread->mcontext.gp_regs[PT_LNK] = rawregs->lr;
++  thread->mcontext.gp_regs[PT_NIP] = rawregs->srr0;
++  thread->mcontext.gp_regs[PT_MSR] = rawregs->srr1;
++  thread->mcontext.gp_regs[PT_CCR] = rawregs->cr;
++  thread->mcontext.gp_regs[PT_XER] = rawregs->xer;
++  thread->mcontext.gp_regs[PT_CTR] = rawregs->ctr;
++  thread->mcontext.v_regs->vrsave = rawregs->vrsave;
++
++  for (int i = 0; i < MD_FLOATINGSAVEAREA_PPC_FPR_COUNT; i++)
++      thread->mcontext.fp_regs[i] = rawregs->float_save.fpregs[i];
++
++  thread->mcontext.fp_regs[NFPREG-1] = rawregs->float_save.fpscr;
++
++  for (int i = 0; i < MD_VECTORSAVEAREA_PPC_VR_COUNT; i++) {
++      thread->mcontext.v_regs->vrregs[i][0] = rawregs->vector_save.save_vr[i].high >> 32;
++      thread->mcontext.v_regs->vrregs[i][1] = rawregs->vector_save.save_vr[i].high;
++      thread->mcontext.v_regs->vrregs[i][2] = rawregs->vector_save.save_vr[i].low >> 32;
++      thread->mcontext.v_regs->vrregs[i][3] = rawregs->vector_save.save_vr[i].low;
++  }
++
++  thread->mcontext.v_regs->vscr.vscr_word = rawregs->vector_save.save_vscr.low & 0xFFFFFFFF;
++}
++
+ #else
+ #error "This code has not been ported to your platform yet"
+ #endif
+@@ -623,6 +665,12 @@ ParseSystemInfo(const Options& options,
+ # else
+ #  error "This mips ABI is currently not supported (n32)"
+ # endif
++#elif defined(__powerpc64__)
++  if (sysinfo->processor_architecture != MD_CPU_ARCHITECTURE_PPC64) {
++    fprintf(stderr,
++            "This version of minidump-2-core only supports PPC64.\n");
++    exit(1);
++  }
+ #else
+ #error "This code has not been ported to your platform yet"
+ #endif
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/CONTRIBUTORS
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/CONTRIBUTORS
+@@ -13,3 +13,4 @@ Mark Mentovai <mark@chromium.org>
+ Robert Sesek <rsesek@chromium.org>
+ Scott Graham <scottmg@chromium.org>
+ Joshua Peraza <jperaza@chromium.org>
++Shawn Anastasio <shawn@anastas.io>
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/compat/linux/sys/user.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/compat/linux/sys/user.h
+@@ -15,6 +15,7 @@
+ #ifndef CRASHPAD_COMPAT_LINUX_SYS_USER_H_
+ #define CRASHPAD_COMPAT_LINUX_SYS_USER_H_
+ 
++#include <cstddef>
+ #include_next <sys/user.h>
+ 
+ #include <features.h>
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/minidump/minidump_context.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/minidump/minidump_context.h
+@@ -592,6 +592,70 @@ struct MinidumpContextMIPS64 {
+   uint64_t fir;
+ };
+ 
++//! \brief ppc64-specific flags for MinidumpPPC64::context_flags
++//! Based on minidump_cpu_ppc64.h from breakpad
++enum MinidumpContextPPC64Flags : uint32_t {
++  //! \brief Identifies the context as PPC64.
++  kMinidumpContextPPC64 = 0x01000000,
++
++  //! \brief Indicates the validity of general purpose registers.
++  //!
++  //! Registers `r0`-`r31`, `nip`, `msr`, `lr`, etc. are valid.
++  kMinidumpContextPPC64Base = kMinidumpContextPPC64 | 0x00000001,
++
++  //! \brief Indicates the validity of floating point registers.
++  //!
++  //! Registers `fp0`-`fp31`, `fpscr` are valid.
++  kMinidumpContextPPC64Floating = kMinidumpContextPPC64 | 0x00000008,
++
++  //! \brief Indicates the validity of Altivec/VMX registers.
++  //!
++  //! Registers `v0`-`v31`, `vscr`, `vrsave`.
++  kMinidumpContextPPC64Vector = kMinidumpContextPPC64 | 0x00000020,
++
++  //! \brief Indicates the validity of all registers
++  kMinidumpContextPPC64All = kMinidumpContextPPC64Base     |
++                             kMinidumpContextPPC64Floating |
++                             kMinidumpContextPPC64Vector
++};
++
++//! \brief A PPC64 CPU context carried in a minidump file.
++//! Based on minidump_cpu_ppc64.h from breakpad.
++struct MinidumpContextPPC64 {
++  uint64_t context_flags;
++
++  //! \brief General purpose registers.
++  uint64_t nip;
++  uint64_t msr;
++  uint64_t regs[32];
++  uint64_t ccr;
++  uint64_t xer;
++  uint64_t lnk;
++  uint64_t ctr;
++
++  //! \brief Floating point registers.
++  double fpregs[32];
++
++  //! \brief FPU status register.
++  double fpscr;
++
++  //! \brief Altivec/VMX vector registers.
++  struct {
++      //! \brief Vector registers are 128bits.
++      uint128_struct save_vr[32];
++      uint128_struct save_vscr;
++
++      //! \brief Padding included for breakpad compatibiltiy.
++      uint32_t save_pad5[4];
++
++      //! \brief VRSAVE register.
++      uint32_t save_vrsave;
++
++      //! \brief Padding included for breakpad compatibiltiy.
++      uint32_t save_pad6[7];
++  } vregs;
++};
++
+ }  // namespace crashpad
+ 
+ #endif  // CRASHPAD_MINIDUMP_MINIDUMP_CONTEXT_H_
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/minidump/minidump_context_writer.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/minidump/minidump_context_writer.cc
+@@ -101,6 +101,13 @@ MinidumpContextWriter::CreateFromSnapsho
+       break;
+     }
+ 
++    case kCPUArchitecturePPC64: {
++      context = std::make_unique<MinidumpContextPPC64Writer>();
++      reinterpret_cast<MinidumpContextPPC64Writer*>(context.get())
++          ->InitalizeFromSnapshot(context_snapshot->ppc64);
++      break;
++    }
++
+     default: {
+       LOG(ERROR) << "unknown context architecture "
+                  << context_snapshot->architecture;
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/minidump/minidump_context_writer.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/minidump/minidump_context_writer.h
+@@ -315,6 +315,45 @@ class MinidumpContextMIPS64Writer final
+   DISALLOW_COPY_AND_ASSIGN(MinidumpContextMIPS64Writer);
+ };
+ 
++class MinidumpContextPPC64Writer final : public MinidumpContextWriter {
++ public:
++  MinidumpContextPPC64Writer();
++  ~MinidumpContextPPC64Writer() override;
++
++  //! \brief Initalizes the MinidumpContextPPC64 based on \a context_snapshot.
++  //!
++  //! \param[in] context_snapshot The context snapshot to use as source data.
++  //!
++  //! \note Valid in #kStateMutable. No mutation of context() may be done before
++  //!     calling this method, and it is not normally necessary to alter
++  //!     context() after calling this method.
++  void InitalizeFromSnapshot(const CPUContextPPC64* context_snapshot);
++
++  //! \brief Returns a pointer to the context structure that this object will
++  //!     write.
++  //!
++  //! \attention This returns a non-`const` pointer to this object’s private
++  //!     data so that a caller can populate the context structure directly.
++  //!     This is done because providing setter interfaces to each field in the
++  //!     context structure would be unwieldy and cumbersome. Care must be taken
++  //!     to populate the context structure correctly. The context structure
++  //!     must only be modified while this object is in the #kStateMutable
++  //!     state.
++  MinidumpContextPPC64* context() { return &context_; }
++
++ protected:
++  // MinidumpWritable:
++  bool WriteObject(FileWriterInterface* file_writer) override;
++
++  // MinidumpContextWriter:
++  size_t ContextSize() const override;
++
++ private:
++  MinidumpContextPPC64 context_;
++
++  DISALLOW_COPY_AND_ASSIGN(MinidumpContextPPC64Writer);
++};
++
+ }  // namespace crashpad
+ 
+ #endif  // CRASHPAD_MINIDUMP_MINIDUMP_CONTEXT_WRITER_H_
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/minidump/minidump_context_writer_test.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/minidump/minidump_context_writer_test.cc
+@@ -213,6 +213,21 @@ TEST(MinidumpContextWriter, MIPS64_FromS
+       context, ExpectMinidumpContextMIPS64, kSeed);
+ }
+ 
++TEST(MinidumpContextWriter, PPC64_Zeros) {
++  EmptyContextTest<MinidumpContextPPC64Writer, MinidumpContextPPC64>(
++    ExpectMinidumpContextPPC64);
++}
++
++TEST(MinidumpContextWriter, PPC64_FromSnapshot) {
++  constexpr uint32_t kSeed = 64;
++  CPUContextPPC64 context_ppc64;
++  CPUContext context;
++  context.ppc64 = &context_ppc64;
++  InitializeCPUContextPPC64(&context, kSeed);
++  FromSnapshotTest<MinidumpContextPPC64Writer, MinidumpContextPPC64>(
++      context, ExpectMinidumpContextPPC64, kSeed);
++}
++
+ }  // namespace
+ }  // namespace test
+ }  // namespace crashpad
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/minidump/minidump_misc_info_writer.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/minidump/minidump_misc_info_writer.cc
+@@ -135,6 +135,8 @@ std::string MinidumpMiscInfoDebugBuildSt
+   static constexpr char kCPU[] = "mips";
+ #elif defined(ARCH_CPU_MIPS64EL)
+   static constexpr char kCPU[] = "mips64";
++#elif defined(ARCH_CPU_PPC64)
++  static constexpr char kCPU[] = "ppc64";
+ #else
+ #error define kCPU for this CPU
+ #endif
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/capture_memory.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/capture_memory.cc
+@@ -112,6 +112,11 @@ void CaptureMemory::PointedToByContext(c
+   for (size_t i = 0; i < base::size(context.mipsel->regs); ++i) {
+     MaybeCaptureMemoryAround(delegate, context.mipsel->regs[i]);
+   }
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++  MaybeCaptureMemoryAround(delegate, context.ppc64->nip);
++  for (size_t i = 0; i < base::size(context.ppc64->regs); ++i) {
++    MaybeCaptureMemoryAround(delegate, context.ppc64->regs[i]);
++  }
+ #else
+ #error Port.
+ #endif
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/cpu_architecture.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/cpu_architecture.h
+@@ -43,7 +43,10 @@ enum CPUArchitecture {
+   kCPUArchitectureMIPSEL,
+ 
+   //! \brief 64-bit MIPSEL.
+-  kCPUArchitectureMIPS64EL
++  kCPUArchitectureMIPS64EL,
++
++  //! \brief 64-bit PPC64.
++  kCPUArchitecturePPC64
+ };
+ 
+ }  // namespace crashpad
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/cpu_context.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/cpu_context.cc
+@@ -169,6 +169,8 @@ uint64_t CPUContext::InstructionPointer(
+       return arm->pc;
+     case kCPUArchitectureARM64:
+       return arm64->pc;
++    case kCPUArchitecturePPC64:
++      return ppc64->nip;
+     default:
+       NOTREACHED();
+       return ~0ull;
+@@ -185,6 +187,8 @@ uint64_t CPUContext::StackPointer() cons
+       return arm->sp;
+     case kCPUArchitectureARM64:
+       return arm64->sp;
++    case kCPUArchitecturePPC64:
++      return ppc64->regs[1];
+     default:
+       NOTREACHED();
+       return ~0ull;
+@@ -196,6 +200,7 @@ bool CPUContext::Is64Bit() const {
+     case kCPUArchitectureX86_64:
+     case kCPUArchitectureARM64:
+     case kCPUArchitectureMIPS64EL:
++    case kCPUArchitecturePPC64:
+       return true;
+     case kCPUArchitectureX86:
+     case kCPUArchitectureARM:
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/cpu_context.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/cpu_context.h
+@@ -352,6 +352,24 @@ struct CPUContextMIPS64 {
+   uint64_t fir;
+ };
+ 
++//! \brief A context structure carrying PPC64 CPU state.
++struct CPUContextPPC64 {
++  uint64_t nip;
++  uint64_t msr;
++  uint64_t regs[32];
++  uint64_t ccr;
++  uint64_t xer;
++  uint64_t lnk;
++  uint64_t ctr;
++  double fpregs[32];
++  double fpscr;
++  struct {
++    uint128_struct save_vr[32];
++    uint128_struct save_vscr;
++    uint32_t save_vrsave;
++  } vregs;
++};
++
+ //! \brief A context structure capable of carrying the context of any supported
+ //!     CPU architecture.
+ struct CPUContext {
+@@ -382,6 +400,7 @@ struct CPUContext {
+     CPUContextARM64* arm64;
+     CPUContextMIPS* mipsel;
+     CPUContextMIPS64* mips64;
++    CPUContextPPC64* ppc64;
+   };
+ };
+ 
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/cpu_context_linux.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/cpu_context_linux.h
+@@ -15,6 +15,7 @@
+ #ifndef CRASHPAD_SNAPSHOT_LINUX_CPU_CONTEXT_LINUX_H_
+ #define CRASHPAD_SNAPSHOT_LINUX_CPU_CONTEXT_LINUX_H_
+ 
++#include <cstring>
+ #include "build/build_config.h"
+ #include "snapshot/cpu_context.h"
+ #include "snapshot/linux/signal_context.h"
+@@ -174,6 +175,76 @@ void InitializeCPUContextMIPS(
+ 
+ #endif  // ARCH_CPU_MIPS_FAMILY || DOXYGEN
+ 
++#if defined(ARCH_CPU_PPC64_FAMILY) || DOXYGEN
++
++//! \brief Initalizes a CPUContextPPC64 structure from native context
++//!     structures on Linux.
++//!
++//! \param[in] thread_context The native thread context.
++//! \param[in] float_context The native float context.
++//! \param[in] vector_context The native vector context.
++//! \param[out] context The CPUContextPPC64 structure to initalize.
++template <typename Traits>
++void InitializeCPUContextPPC64(
++    const ThreadContext::t64_t& thread_context,
++    const FloatContext::f64_t& float_context,
++    const VectorContext::v64_t& vector_context,
++    typename Traits::CPUContext* context) {
++
++  memcpy(context->regs, thread_context.gpr, sizeof(context->regs));
++  context->nip = thread_context.nip;
++  context->msr = thread_context.msr;
++  context->ccr = thread_context.ccr;
++  context->xer = thread_context.xer;
++  context->lnk = thread_context.lnk;
++  context->ctr = thread_context.ctr;
++
++  memcpy(context->fpregs, float_context.fpregs, sizeof(context->fpregs));
++  context->fpscr = float_context.fpscr;
++
++  for (uint8_t i = 0; i < 32; i++) {
++    context->vregs.save_vr[i] = {
++      (((uint64_t)vector_context.vrregs[i][0]) << 32) |
++        vector_context.vrregs[i][1],
++      (((uint64_t)vector_context.vrregs[i][2]) << 32) |
++        vector_context.vrregs[i][3]
++    };
++  }
++  context->vregs.save_vrsave = vector_context.vrsave;
++  context->vregs.save_vscr = {0, (uint64_t)vector_context.vscr.vscr_word};
++}
++
++template <typename Traits>
++void InitializeCPUContextPPC64(
++    const SignalThreadContext64 &thread_context,
++    const SignalFloatContext64 &float_context,
++    const SignalVectorContext64 &vector_context,
++    typename Traits::CPUContext* context) {
++
++  memcpy(context->regs, thread_context.regs, sizeof(context->regs));
++  context->nip = thread_context.nip;
++  context->msr = thread_context.msr;
++  context->ccr = thread_context.ccr;
++  context->xer = thread_context.xer;
++  context->lnk = thread_context.lnk;
++  context->ctr = thread_context.ctr;
++
++  memcpy(context->fpregs, float_context.regs, sizeof(context->fpregs));
++  context->fpscr = float_context.fpscr;
++
++  for (uint8_t i = 0; i < 32; i++) {
++    context->vregs.save_vr[i] = {
++      (((uint64_t)vector_context.vrregs[i][0]) << 32) |
++        vector_context.vrregs[i][1],
++      (((uint64_t)vector_context.vrregs[i][2]) << 32) |
++        vector_context.vrregs[i][3]
++    };
++  }
++  context->vregs.save_vrsave = vector_context.vrsave;
++  context->vregs.save_vscr = {0, (uint64_t)vector_context.vscr.vscr_word};
++}
++
++#endif
+ }  // namespace internal
+ }  // namespace crashpad
+ 
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/debug_rendezvous_test.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/debug_rendezvous_test.cc
+@@ -192,6 +192,8 @@ void TestAgainstTarget(PtraceConnection*
+               device == 0 && inode == 0 && mapping_name == "[vdso]";
+ #if defined(ARCH_CPU_X86)
+           static constexpr char kPrefix[] = "linux-gate.so.";
++#elif defined(ARCH_CPU_PPC64)
++          static constexpr char kPrefix[] = "linux-vdso64.so.";
+ #else
+           static constexpr char kPrefix[] = "linux-vdso.so.";
+ #endif
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux.cc
+@@ -323,6 +323,69 @@ bool ExceptionSnapshotLinux::ReadContext
+       reader, context_address, context_.mips64);
+ }
+ 
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++
++template <typename Traits>
++static bool ReadContext(ProcessReaderLinux* reader,
++                        LinuxVMAddress context_address,
++                        typename Traits::CPUContext* dest_context) {
++  const ProcessMemory* memory = reader->Memory();
++
++  LinuxVMAddress gp_regs_address = context_address +
++                                   offsetof(UContext, mcontext) +
++                                   offsetof(typename Traits::MContext, gp_regs);
++
++  typename Traits::SignalThreadContext thread_context;
++  if (!memory->Read(gp_regs_address, sizeof(thread_context), &thread_context)) {
++    LOG(ERROR) << "Couldn't read gp_regs!";
++    return false;
++  }
++
++  LinuxVMAddress fp_regs_address = context_address +
++                                   offsetof(UContext, mcontext) +
++                                   offsetof(typename Traits::MContext, fp_regs);
++
++  typename Traits::SignalFloatContext fp_context;
++  if (!memory->Read(fp_regs_address, sizeof(fp_context), &fp_context)) {
++    LOG(ERROR) << "Couldn't read fp_regs!";
++    return false;
++  }
++
++  LinuxVMAddress v_regs_ptr_address = context_address +
++                                  offsetof(UContext, mcontext) +
++                                  offsetof(typename Traits::MContext, vmx_reserve) + 8;
++
++  typename Traits::SignalVectorContext v_context;
++  if (!memory->Read(v_regs_ptr_address, sizeof(v_context), &v_context)) {
++    LOG(ERROR) << "Couldn't read v_regs!";
++    return false;
++  }
++
++  InitializeCPUContextPPC64<ContextTraits64>(thread_context, fp_context,
++                            v_context, dest_context);
++
++  return true;
++}
++
++template<>
++bool ExceptionSnapshotLinux::ReadContext<ContextTraits64>(
++    ProcessReaderLinux* reader,
++    LinuxVMAddress context_address) {
++  context_.architecture = kCPUArchitecturePPC64;
++  context_.ppc64 = &context_union_.ppc64;
++
++  return internal::ReadContext<ContextTraits64>(
++      reader, context_address, context_.ppc64);
++}
++
++template<>
++bool ExceptionSnapshotLinux::ReadContext<ContextTraits32>(
++    ProcessReaderLinux* reader,
++    LinuxVMAddress context_address) {
++  // PPC64 is 64-bit
++  return false;
++}
++
+ #endif  // ARCH_CPU_X86_FAMILY
+ 
+ bool ExceptionSnapshotLinux::Initialize(ProcessReaderLinux* process_reader,
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux.h
+@@ -84,6 +84,8 @@ class ExceptionSnapshotLinux final : pub
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+     CPUContextMIPS mipsel;
+     CPUContextMIPS64 mips64;
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++    CPUContextPPC64 ppc64;
+ #endif
+   } context_union_;
+   CPUContext context_;
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux_test.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux_test.cc
+@@ -296,7 +296,28 @@ void ExpectContext(const CPUContext& act
+             0);
+ #undef CPU_ARCH_NAME
+ }
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++using NativeCPUContext = ucontext_t;
+ 
++void InitializeContext(NativeCPUContext* context) {
++  for (size_t reg = 0; reg < 32; ++reg) {
++    context->uc_mcontext.gp_regs[reg] = reg;
++  }
++
++  memset(&context->uc_mcontext.fp_regs, 44,
++      sizeof(context->uc_mcontext.fp_regs));
++}
++
++void ExpectContext(const CPUContext& actual, const NativeCPUContext& expected) {
++  EXPECT_EQ(actual.architecture, kCPUArchitecturePPC64);
++
++  for (size_t reg = 0; reg < 32; ++reg) {
++    EXPECT_EQ(actual.ppc64->regs[reg], expected.uc_mcontext.gp_regs[reg]);
++  }
++
++  EXPECT_EQ(memcmp(actual.ppc64->fpregs, expected.uc_mcontext.fp_regs,
++            sizeof(actual.ppc64->fpregs)), 0);
++}
+ #else
+ #error Port.
+ #endif
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/process_reader_linux.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/process_reader_linux.cc
+@@ -108,6 +108,8 @@ void ProcessReaderLinux::Thread::Initial
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+   stack_pointer = reader->Is64Bit() ? thread_info.thread_context.t64.regs[29]
+                                     : thread_info.thread_context.t32.regs[29];
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++  stack_pointer = thread_info.thread_context.t64.gpr[1];
+ #else
+ #error Port.
+ #endif
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/signal_context.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/signal_context.h
+@@ -422,6 +422,93 @@ static_assert(offsetof(UContext<ContextT
+               "context offset mismatch");
+ #endif
+ 
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++
++struct SignalThreadContext64 {
++  uint64_t regs[32];
++  uint64_t nip;
++  uint64_t msr;
++  uint64_t orig_r3;
++  uint64_t ctr;
++  uint64_t lnk;
++  uint64_t xer;
++  uint64_t ccr;
++  uint64_t softe;
++  uint64_t trap;
++  uint64_t dar;
++  uint64_t dsisr;
++  uint64_t result;
++  uint64_t dscr;
++  uint64_t fpr0[3];
++};
++
++struct SignalFloatContext64 {
++  double regs[32];
++  double fpscr;
++};
++
++struct SignalVectorContext64 {
++  int32_t vrregs[32][4];
++  struct {
++    int32_t __pad[3];
++    int32_t vscr_word;
++  } vscr;
++  int32_t vrsave;
++  int32_t __pad[3];
++} __attribute__((__aligned__(16)));
++
++
++#pragma pack(pop)
++struct MContext64 {
++  uint64_t reserved[4];
++  int32_t signal;
++  int32_t __pad0;
++  uint64_t handler;
++  uint64_t oldmask;
++  uint64_t pt_regs_ptr;
++  SignalThreadContext64 gp_regs;
++  SignalFloatContext64  fp_regs;
++  SignalVectorContext64 *v_regs;
++#ifdef __GLIBC__
++  int64_t vmx_reserve[69];
++#else
++  int64_t vmx_reserve[101];
++#endif
++};
++
++struct ContextTraits64 : public Traits64 {
++  using MContext = MContext64;
++  using SignalThreadContext = SignalThreadContext64;
++  using SignalFloatContext = SignalFloatContext64;
++  using SignalVectorContext = SignalVectorContext64;
++  using CPUContext = CPUContextPPC64;
++};
++
++struct ContextTraits32 : public Traits32 {};
++
++struct UContext {
++  uint64_t flags;
++  uint64_t link;
++  SignalStack<ContextTraits64> stack;
++  Sigset<ContextTraits64> sigmask;
++  MContext64 mcontext;
++};
++#pragma pack(push, 1)
++
++static_assert(sizeof(UContext) == sizeof(ucontext_t),
++              "ucontext_t size mismatch");
++static_assert(sizeof(MContext64) == sizeof(mcontext_t),
++              "mcontext_t size mismatch");
++static_assert(sizeof(SignalThreadContext64) == sizeof(gregset_t),
++              "gregset_t size mismatch");
++static_assert(sizeof(SignalFloatContext64) == sizeof(fpregset_t),
++              "fpregset_t size mismatch");
++static_assert(sizeof(SignalVectorContext64) == sizeof(vrregset_t),
++              "vrregset_t size mismatch");
++static_assert(offsetof(UContext, mcontext) ==
++              offsetof(ucontext_t, uc_mcontext), "mcontext offset mismatch");
++static_assert(offsetof(MContext64, gp_regs) ==
++              offsetof(mcontext_t, gp_regs), "gp_regs offset mismatch");
+ #else
+ #error Port.
+ #endif  // ARCH_CPU_X86_FAMILY
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/system_snapshot_linux.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/system_snapshot_linux.cc
+@@ -204,6 +204,8 @@ CPUArchitecture SystemSnapshotLinux::Get
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+   return process_reader_->Is64Bit() ? kCPUArchitectureMIPS64EL
+                                     : kCPUArchitectureMIPSEL;
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++  return kCPUArchitecturePPC64;
+ #else
+ #error port to your architecture
+ #endif
+@@ -219,6 +221,9 @@ uint32_t SystemSnapshotLinux::CPURevisio
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+   // Not implementable on MIPS
+   return 0;
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++  // Not yet implemented on PPC64
++  return 0;
+ #else
+ #error port to your architecture
+ #endif
+@@ -239,6 +244,9 @@ std::string SystemSnapshotLinux::CPUVend
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+   // Not implementable on MIPS
+   return std::string();
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++  // Not yet implemented on PPC64
++  return std::string();
+ #else
+ #error port to your architecture
+ #endif
+@@ -372,6 +380,9 @@ bool SystemSnapshotLinux::NXEnabled() co
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+   // Not implementable on MIPS
+   return false;
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++  // Not yet implemented on PPC64
++  return false;
+ #else
+ #error Port.
+ #endif  // ARCH_CPU_X86_FAMILY
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/test_modules.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/test_modules.cc
+@@ -110,6 +110,8 @@ bool WriteTestModule(const base::FilePat
+   module.ehdr.e_machine = EM_AARCH64;
+ #elif defined(ARCH_CPU_MIPSEL) || defined(ARCH_CPU_MIPS64EL)
+   module.ehdr.e_machine = EM_MIPS;
++#elif defined(ARCH_CPU_PPC64)
++  module.ehdr.e_machine = EM_PPC64;
+ #endif
+ 
+   module.ehdr.e_version = EV_CURRENT;
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/thread_snapshot_linux.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/thread_snapshot_linux.cc
+@@ -186,6 +186,14 @@ bool ThreadSnapshotLinux::Initialize(Pro
+         thread.thread_info.float_context.f32,
+         context_.mipsel);
+   }
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++  context_.architecture = kCPUArchitecturePPC64;
++  context_.ppc64 = &context_union_.ppc64;
++  InitializeCPUContextPPC64<ContextTraits64>(
++      thread.thread_info.thread_context.t64,
++      thread.thread_info.float_context.f64,
++      thread.thread_info.vector_context.v64,
++      context_.ppc64);
+ #else
+ #error Port.
+ #endif
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/thread_snapshot_linux.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/thread_snapshot_linux.h
+@@ -68,6 +68,8 @@ class ThreadSnapshotLinux final : public
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+     CPUContextMIPS mipsel;
+     CPUContextMIPS64 mips64;
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++    CPUContextPPC64 ppc64;
+ #else
+ #error Port.
+ #endif  // ARCH_CPU_X86_FAMILY
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/util/linux/auxiliary_vector.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/util/linux/auxiliary_vector.cc
+@@ -56,6 +56,11 @@ bool AuxiliaryVector::Read(PtraceConnect
+     if (type == AT_IGNORE) {
+       continue;
+     }
++#if defined(ARCH_CPU_PPC64_FAMILY)
++    if (type == AT_IGNOREPPC) {
++      continue;
++    }
++#endif
+     if (!MapInsertOrReplace(&values_, type, value, nullptr)) {
+       LOG(ERROR) << "duplicate auxv entry";
+       return false;
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/util/linux/ptracer.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/util/linux/ptracer.cc
+@@ -401,6 +401,64 @@ bool GetThreadArea64(pid_t tid,
+   return true;
+ }
+ 
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++// PPC64 has had HAVE_ARCH_TRACEHOOK set since 2.6.27 (even before x86 had it).
++// That means we can simply use PTRACE_GETREGESET.
++
++template <typename Destination>
++bool GetRegisterSet(pid_t tid, int set, Destination* dest, bool can_log) {
++  iovec iov;
++  iov.iov_base = reinterpret_cast<void*>(dest);
++  iov.iov_len = sizeof(*dest);
++  if (ptrace(PTRACE_GETREGSET, tid, reinterpret_cast<void*>(set), &iov) != 0) {
++    PLOG_IF(ERROR, can_log) << "ptrace";
++    return false;
++  }
++  if (iov.iov_len != sizeof(*dest)) {
++    LOG_IF(ERROR, can_log) << "Unexpected registers size";
++    return false;
++  }
++  return true;
++}
++
++bool GetVectorRegisters64(pid_t tid,
++                          VectorContext* context,
++                          bool can_log) {
++  return GetRegisterSet(tid, NT_PPC_VMX, &context->v64, can_log);
++}
++
++bool GetFloatingPointRegisters64(pid_t tid,
++                                 FloatContext* context,
++                                 bool can_log) {
++  return GetRegisterSet(tid, NT_PRFPREG, &context->f64, can_log);
++}
++
++bool GetThreadArea64(pid_t tid,
++                     const ThreadContext& context,
++                     LinuxVMAddress* address,
++                     bool can_log) {
++  // PPC64 doesn't have PTRACE_GET_THREAD_AREA since the thread pointer
++  // is stored in GPR 13.
++  ThreadContext::t64_t tc;
++  if (!GetRegisterSet(tid, NT_PRSTATUS, &tc, can_log)) {
++    LOG_IF(ERROR, can_log) << "Unable to get thread pointer!";
++    return false;
++  }
++
++  *address = tc.gpr[13];
++
++  return true;
++}
++
++// Stubs for 32-bit functions not applicable on PPC64
++bool GetFloatingPointRegisters32(pid_t tid,
++                                 FloatContext* context,
++                                 bool can_log) { return false; }
++bool GetThreadArea32(pid_t tid,
++                     const ThreadContext &context,
++                     LinuxVMAddress *address,
++                     bool can_log) { return false; }
++
+ #else
+ #error Port.
+ #endif  // ARCH_CPU_X86_FAMILY
+@@ -497,6 +555,9 @@ bool Ptracer::GetThreadInfo(pid_t tid, T
+   if (is_64_bit_) {
+     return GetGeneralPurposeRegisters64(tid, &info->thread_context, can_log_) &&
+            GetFloatingPointRegisters64(tid, &info->float_context, can_log_) &&
++#if defined(ARCH_CPU_PPC64_FAMILY)
++           GetVectorRegisters64(tid, &info->vector_context, can_log_) &&
++#endif
+            GetThreadArea64(tid,
+                            info->thread_context,
+                            &info->thread_specific_data_address,
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/util/linux/thread_info.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/util/linux/thread_info.h
+@@ -39,6 +39,13 @@ struct user_vfp_exc {
+ #include <android/api-level.h>
+ #endif
+ 
++#if defined(ARCH_CPU_PPC64_FAMILY)
++#include <sys/ucontext.h>
++#if !defined(__GLIBC__)
++#include <asm/ptrace.h>
++#endif
++#endif
++
+ namespace crashpad {
+ 
+ //! \brief The set of general purpose registers for an architecture family.
+@@ -90,6 +97,8 @@ union ThreadContext {
+     uint32_t cp0_status;
+     uint32_t cp0_cause;
+     uint32_t padding1_;
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++    // PPC64 is 64-bit
+ #else
+ #error Port.
+ #endif  // ARCH_CPU_X86_FAMILY
+@@ -143,6 +152,21 @@ union ThreadContext {
+     uint64_t cp0_badvaddr;
+     uint64_t cp0_status;
+     uint64_t cp0_cause;
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++    // Reflects struct pt_regs in asm/ptrace.h.
++    uint64_t gpr[32];
++    uint64_t nip;
++    uint64_t msr;
++    uint64_t orig_gpr3;
++    uint64_t ctr;
++    uint64_t lnk;
++    uint64_t xer;
++    uint64_t ccr;
++    uint64_t softe;
++    uint64_t trap;
++    uint64_t dar;
++    uint64_t dsisr;
++    uint64_t result;
+ #else
+ #error Port.
+ #endif  // ARCH_CPU_X86_FAMILY
+@@ -154,6 +178,8 @@ union ThreadContext {
+   using NativeThreadContext = user_regs;
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+ // No appropriate NativeThreadsContext type available for MIPS
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++  using NativeThreadContext = struct pt_regs;
+ #else
+ #error Port.
+ #endif  // ARCH_CPU_X86_FAMILY || ARCH_CPU_ARM64
+@@ -229,6 +255,9 @@ union FloatContext {
+     } fpregs[32];
+     uint32_t fpcsr;
+     uint32_t fpu_id;
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++    // Crashpad's PPC support is 64-bit only, so this
++    // 32bit-only struct is declared as empty.
+ #else
+ #error Port.
+ #endif  // ARCH_CPU_X86_FAMILY
+@@ -263,6 +292,10 @@ union FloatContext {
+     double fpregs[32];
+     uint32_t fpcsr;
+     uint32_t fpu_id;
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++    // Reflects fpregset_t in sys/ucontext.h
++    double fpregs[32];
++    double fpscr;
+ #else
+ #error Port.
+ #endif  // ARCH_CPU_X86_FAMILY
+@@ -291,6 +324,8 @@ union FloatContext {
+   static_assert(sizeof(f64) == sizeof(user_fpsimd_struct), "Size mismatch");
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+ // No appropriate floating point context native type for available MIPS.
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++  static_assert(sizeof(f64) == sizeof(fpregset_t), "Size mismatch");
+ #else
+ #error Port.
+ #endif  // ARCH_CPU_X86
+@@ -298,6 +333,26 @@ union FloatContext {
+ static_assert(std::is_standard_layout<FloatContext>::value,
+               "Not standard layout");
+ 
++//! \brief The vector registers used for an architecture family
++union VectorContext {
++  struct v32_t {} v32;
++#if defined(ARCH_CPU_PPC64_FAMILY)
++  __attribute__((__aligned__(16))) // Vector context must be doubleword aligned.
++#endif
++  struct v64_t {
++#if defined(ARCH_CPU_PPC64_FAMILY)
++    // Reflects vrregset_t in sys/ucontext.h
++    uint32_t vrregs[32][4];
++    struct {
++      uint32_t __pad[3];
++      uint32_t vscr_word;
++    } vscr;
++    uint32_t vrsave;
++    uint32_t __pad[3];
++#endif
++  } v64;
++};
++
+ //! \brief A collection of `ptrace`-able information about a thread.
+ struct ThreadInfo {
+   ThreadInfo();
+@@ -309,6 +364,9 @@ struct ThreadInfo {
+   //! \brief The floating point registers for the thread.
+   FloatContext float_context;
+ 
++  //! \brief (Optional) The vector registers used for the thread.
++  VectorContext vector_context;
++
+   //! \brief The thread-local storage address for the thread.
+   LinuxVMAddress thread_specific_data_address;
+ };
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/util/misc/capture_context.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/util/misc/capture_context.h
+@@ -69,6 +69,7 @@ using NativeCPUContext = ucontext_t;
+ //!     macOS/Linux/Fuchsia | x86_64       | `%%rdi`
+ //!     Linux               | ARM/ARM64    | `r0`/`x0`
+ //!     Linux               | MIPS/MIPS64  | `$a0`
++//!     Linux               | PPC64        | `r3`
+ //!
+ //!     Additionally, the value `LR` on ARM/ARM64 will be the return address of
+ //!     this function.
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/util/misc/capture_context_linux.S
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/util/misc/capture_context_linux.S
+@@ -32,7 +32,7 @@
+   .balign 4, 0x0
+   .type CAPTURECONTEXT_SYMBOL, %function
+   .type CAPTURECONTEXT_SYMBOL2, %function
+-#elif defined(__mips__)
++#elif defined(__mips__) || defined(__powerpc64__)
+   .balign 4, 0x0
+ #endif
+ 
+@@ -423,4 +423,214 @@ CAPTURECONTEXT_SYMBOL2:
+   jr $ra
+ 
+   .set at
++#elif defined(__powerpc64__)
++  // Store r0-r31
++  std 0, 0xe8(3)   // context->uc_mcontext.gp_regs[0]
++  std 1, 0xf0(3)   // context->uc_mcontext.gp_regs[1]
++  std 2, 0xf8(3)   // context->uc_mcontext.gp_regs[2]
++  // note that r3's original value was lost
++  std 3, 0x100(3)  // context->uc_mcontext.gp_regs[3]
++  std 4, 0x108(3)  // context->uc_mcontext.gp_regs[4]
++  std 5, 0x110(3)  // context->uc_mcontext.gp_regs[5]
++  std 6, 0x118(3)  // context->uc_mcontext.gp_regs[6]
++  std 7, 0x120(3)  // context->uc_mcontext.gp_regs[7]
++  std 8, 0x128(3)  // context->uc_mcontext.gp_regs[8]
++  std 9, 0x130(3)  // context->uc_mcontext.gp_regs[9]
++  std 10, 0x138(3) // context->uc_mcontext.gp_regs[10]
++  std 11, 0x140(3) // context->uc_mcontext.gp_regs[11]
++  std 12, 0x148(3) // context->uc_mcontext.gp_regs[12]
++  std 13, 0x150(3) // context->uc_mcontext.gp_regs[13]
++  std 14, 0x158(3) // context->uc_mcontext.gp_regs[14]
++  std 15, 0x160(3) // context->uc_mcontext.gp_regs[15]
++  std 16, 0x168(3) // context->uc_mcontext.gp_regs[16]
++  std 17, 0x170(3) // context->uc_mcontext.gp_regs[17]
++  std 18, 0x178(3) // context->uc_mcontext.gp_regs[18]
++  std 19, 0x180(3) // context->uc_mcontext.gp_regs[19]
++  std 20, 0x188(3) // context->uc_mcontext.gp_regs[20]
++  std 21, 0x190(3) // context->uc_mcontext.gp_regs[21]
++  std 22, 0x198(3) // context->uc_mcontext.gp_regs[22]
++  std 23, 0x1a0(3) // context->uc_mcontext.gp_regs[23]
++  std 24, 0x1a8(3) // context->uc_mcontext.gp_regs[24]
++  std 25, 0x1b0(3) // context->uc_mcontext.gp_regs[25]
++  std 26, 0x1b8(3) // context->uc_mcontext.gp_regs[26]
++  std 27, 0x1c0(3) // context->uc_mcontext.gp_regs[27]
++  std 28, 0x1c8(3) // context->uc_mcontext.gp_regs[28]
++  std 29, 0x1d0(3) // context->uc_mcontext.gp_regs[29]
++  std 30, 0x1d8(3) // context->uc_mcontext.gp_regs[30]
++  std 31, 0x1e0(3) // context->uc_mcontext.gp_regs[31]
++
++  // For NIP, we can use the value in the link register
++  mflr 0
++  std 0, 0x1e8(3) // context->uc_mcontext.gp_regs[PT_NIP]
++
++  // CTR
++  mfctr 0
++  std 0, 0x200(3) // context->uc_mcontext.gp_regs[PT_CTR]
++
++  // For LNK, we'll use the caller's LR save area (2 stack frames up).
++  // r4 can be used as a scratch register since it has already been saved.
++  ld 4, 0(1)
++  ld 4, 16(4)
++  std 4, 0x208(3) // context->uc_mcontext.gp_regs[PT_LNK]
++
++  // XER
++  mfxer 0
++  std 0, 0x210(3) // context->uc_mcontext.gp_regs[PT_XER]
++
++  // CCR
++  mfcr 0
++  std 0, 0x218(3) // context->uc_mcontext.gp_regs[PT_CCR]
++
++  // MSR, orig_r3, MQ, TRAP, DAR, DSISR, RESULT, DSCR,
++  // not used or not relevant,  zero them out.
++  li 4, 0
++  std 4, 0x1f0(3) // context->uc_mcontext.gp_regs[PT_MSR]
++  std 4, 0x1f8(3) // context->uc_mcontext.gp_regs[PT_ORIG_R3]
++  std 4, 0x220(3) // context->uc_mcontext.gp_regs[PT_MQ]
++  std 4, 0x228(3) // context->uc_mcontext.gp_regs[PT_TRAP]
++  std 4, 0x230(3) // context->uc_mcontext.gp_regs[PT_DAR]
++  std 4, 0x238(3) // context->uc_mcontext.gp_regs[PT_DSISR]
++  std 4, 0x240(3) // context->uc_mcontext.gp_regs[PT_RESULT]
++  std 4, 0x248(3) // context->uc_mcontext.gp_regs[PT_DSCR]
++
++  // Update context->uc_mcontext.regs to point to gp_regs
++  addi 0, 3, 0xe8
++  std 0, 0xe0(3)
++
++  // Save floating point registers 0-31
++  stfd 0, 0x268(3)  // context->uc_mcontext.fp_regs[0]
++  stfd 1, 0x270(3)  // context->uc_mcontext.fp_regs[1]
++  stfd 2, 0x278(3)  // context->uc_mcontext.fp_regs[2]
++  stfd 3, 0x280(3)  // context->uc_mcontext.fp_regs[3]
++  stfd 4, 0x288(3)  // context->uc_mcontext.fp_regs[4]
++  stfd 5, 0x290(3)  // context->uc_mcontext.fp_regs[5]
++  stfd 6, 0x298(3)  // context->uc_mcontext.fp_regs[6]
++  stfd 7, 0x2a0(3)  // context->uc_mcontext.fp_regs[7]
++  stfd 8, 0x2a8(3)  // context->uc_mcontext.fp_regs[8]
++  stfd 9, 0x2b0(3)  // context->uc_mcontext.fp_regs[9]
++  stfd 10, 0x2b8(3) // context->uc_mcontext.fp_regs[10]
++  stfd 11, 0x2c0(3) // context->uc_mcontext.fp_regs[11]
++  stfd 12, 0x2c8(3) // context->uc_mcontext.fp_regs[12]
++  stfd 13, 0x2d0(3) // context->uc_mcontext.fp_regs[13]
++  stfd 14, 0x2d8(3) // context->uc_mcontext.fp_regs[14]
++  stfd 15, 0x2e0(3) // context->uc_mcontext.fp_regs[15]
++  stfd 16, 0x2e8(3) // context->uc_mcontext.fp_regs[16]
++  stfd 17, 0x2f0(3) // context->uc_mcontext.fp_regs[17]
++  stfd 18, 0x2f8(3) // context->uc_mcontext.fp_regs[18]
++  stfd 19, 0x300(3) // context->uc_mcontext.fp_regs[19]
++  stfd 20, 0x308(3) // context->uc_mcontext.fp_regs[20]
++  stfd 21, 0x310(3) // context->uc_mcontext.fp_regs[21]
++  stfd 22, 0x318(3) // context->uc_mcontext.fp_regs[22]
++  stfd 23, 0x320(3) // context->uc_mcontext.fp_regs[23]
++  stfd 24, 0x328(3) // context->uc_mcontext.fp_regs[24]
++  stfd 25, 0x330(3) // context->uc_mcontext.fp_regs[25]
++  stfd 26, 0x338(3) // context->uc_mcontext.fp_regs[26]
++  stfd 27, 0x340(3) // context->uc_mcontext.fp_regs[27]
++  stfd 28, 0x348(3) // context->uc_mcontext.fp_regs[28]
++  stfd 29, 0x350(3) // context->uc_mcontext.fp_regs[29]
++  stfd 30, 0x358(3) // context->uc_mcontext.fp_regs[30]
++  stfd 31, 0x360(3) // context->uc_mcontext.fp_regs[31]
++
++  // FPSCR
++  mffs 0
++  stfd 0, 0x368(3) // context->uc_mcontext.fp_regs[32]
++
++  // Save VMX Vector registers
++  // Update r4 to contain the base address of vmx_reserve
++  addi 4, 3, 0x378
++  // Ensure that it is quadword aligned
++  andi. 5, 4, 0xF
++  beq 1f // No alignment is necessary
++  // Address is doubleword aligned and not quadword aligned, add 8
++  addi 4, 4, 8
++
++1:
++  // Store VMX registers 0-31
++  // r4 will contain the base address
++  // r5 will contain the index
++  li 5, 0
++  stvx 0, 4, 5   // context->uc_mcontext.vmx_reserve[(align) + 0]
++  addi 5, 5, 16
++  stvx 1, 4, 5   // context->uc_mcontext.vmx_reserve[(align) + 1]
++  addi 5, 5, 16
++  stvx 2, 4, 5   // context->uc_mcontext.vmx_reserve[(align) + 2]
++  addi 5, 5, 16
++  stvx 3, 4, 5   // context->uc_mcontext.vmx_reserve[(align) + 3]
++  addi 5, 5, 16
++  stvx 4, 4, 5   // context->uc_mcontext.vmx_reserve[(align) + 4]
++  addi 5, 5, 16
++  stvx 5, 4, 5   // context->uc_mcontext.vmx_reserve[(align) + 5]
++  addi 5, 5, 16
++  stvx 6, 4, 5   // context->uc_mcontext.vmx_reserve[(align) + 6]
++  addi 5, 5, 16
++  stvx 7, 4, 5   // context->uc_mcontext.vmx_reserve[(align) + 7]
++  addi 5, 5, 16
++  stvx 8, 4, 5   // context->uc_mcontext.vmx_reserve[(align) + 8]
++  addi 5, 5, 16
++  stvx 9, 4, 5   // context->uc_mcontext.vmx_reserve[(align) + 9]
++  addi 5, 5, 16
++  stvx 10, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 10]
++  addi 5, 5, 16
++  stvx 11, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 11]
++  addi 5, 5, 16
++  stvx 12, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 12]
++  addi 5, 5, 16
++  stvx 13, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 13]
++  addi 5, 5, 16
++  stvx 14, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 14]
++  addi 5, 5, 16
++  stvx 15, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 15]
++  addi 5, 5, 16
++  stvx 16, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 16]
++  addi 5, 5, 16
++  stvx 17, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 17]
++  addi 5, 5, 16
++  stvx 18, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 18]
++  addi 5, 5, 16
++  stvx 19, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 19]
++  addi 5, 5, 16
++  stvx 20, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 20]
++  addi 5, 5, 16
++  stvx 21, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 21]
++  addi 5, 5, 16
++  stvx 22, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 22]
++  addi 5, 5, 16
++  stvx 23, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 23]
++  addi 5, 5, 16
++  stvx 24, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 24]
++  addi 5, 5, 16
++  stvx 25, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 25]
++  addi 5, 5, 16
++  stvx 26, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 26]
++  addi 5, 5, 16
++  stvx 27, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 27]
++  addi 5, 5, 16
++  stvx 28, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 28]
++  addi 5, 5, 16
++  stvx 29, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 29]
++  addi 5, 5, 16
++  stvx 30, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 30]
++  addi 5, 5, 16
++  stvx 31, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 31]
++  addi 5, 5, 16
++
++  // VSCR
++  mfvscr 0
++  stvx 0, 4, 5
++  addi 5, 5, 16
++
++  // VRSAVE
++  mfvrsave 0
++  stwx 0, 4, 5
++
++  // Update context->uc_mcontext.v_regs to point to vmx_reserve + alignment.
++  std 4, 0x370(3)
++
++  // Zero out all unused fields
++  li 4, 0
++  std 4, 0xc8(3) // context->uc_mcontext.signal
++  std 4, 0xd0(3) // context->uc_mcontext.handler
++  std 4, 0xd8(3) // context->uc_mcontext.oldmask
++
++  blr
+ #endif  // __i386__
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/util/misc/capture_context_test.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/util/misc/capture_context_test.cc
+@@ -57,7 +57,7 @@ void TestCaptureContext() {
+   uintptr_t pc = ProgramCounterFromContext(context_1);
+ 
+ #if !defined(ADDRESS_SANITIZER) && !defined(ARCH_CPU_MIPS_FAMILY) && \
+-    !defined(MEMORY_SANITIZER)
++    !defined(MEMORY_SANITIZER) && !defined(ARCH_CPU_PPC64_FAMILY)
+   // Sanitizers can cause enough code bloat that the “nearby” check would
+   // likely fail.
+   const uintptr_t kReferencePC =
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/util/misc/capture_context_test_util_linux.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/util/misc/capture_context_test_util_linux.cc
+@@ -35,6 +35,8 @@ void SanityCheckContext(const NativeCPUC
+   EXPECT_EQ(context.uc_mcontext.regs[0], FromPointerCast<uintptr_t>(&context));
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+   EXPECT_EQ(context.uc_mcontext.gregs[4], FromPointerCast<uintptr_t>(&context));
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++  EXPECT_EQ(context.uc_mcontext.gp_regs[3], FromPointerCast<uintptr_t>(&context));
+ #endif
+ }
+ 
+@@ -49,6 +51,8 @@ uintptr_t ProgramCounterFromContext(cons
+   return context.uc_mcontext.pc;
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+   return context.uc_mcontext.pc;
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++  return context.uc_mcontext.gp_regs[PT_NIP];
+ #endif
+ }
+ 
+@@ -63,6 +67,8 @@ uintptr_t StackPointerFromContext(const
+   return context.uc_mcontext.sp;
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+   return context.uc_mcontext.gregs[29];
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++  return context.uc_mcontext.gp_regs[1];
+ #endif
+ }
+ 
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/util/posix/signals_test.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/util/posix/signals_test.cc
+@@ -46,9 +46,9 @@ bool CanCauseSignal(int sig) {
+   return sig == SIGABRT ||
+          sig == SIGALRM ||
+          sig == SIGBUS ||
+-#if !defined(ARCH_CPU_ARM64)
++#if !defined(ARCH_CPU_ARM64) && !defined(ARCH_CPU_PPC64)
+          sig == SIGFPE ||
+-#endif  // !defined(ARCH_CPU_ARM64)
++#endif  // !defined(ARCH_CPU_ARM64) && !defined(ARCH_CPU_PPC64)
+ #if defined(ARCH_CPU_X86_FAMILY) || defined(ARCH_CPU_ARMEL)
+          sig == SIGILL ||
+ #endif  // defined(ARCH_CPU_X86_FAMILY) || defined(ARCH_CPU_ARMEL)
+@@ -117,9 +117,11 @@ void CauseSignal(int sig) {
+       break;
+     }
+ 
+-#if !defined(ARCH_CPU_ARM64)
++#if !defined(ARCH_CPU_ARM64) && !defined(ARCH_CPU_PPC64)
+     // ARM64 has hardware integer division instructions that don’t generate a
+     // trap for divide-by-zero, so this doesn’t produce SIGFPE.
++    //
++    // PPC64 fixed-point division by zero also doesn't produce a SIGFPE.
+     case SIGFPE: {
+       // Optimization makes this tricky, so get zero from a system call likely
+       // to succeed, and try to do something with the result.
+@@ -137,7 +139,7 @@ void CauseSignal(int sig) {
+       fstat(quotient, &stat_buf);
+       break;
+     }
+-#endif  // ARCH_CPU_ARM64
++#endif  // !defined(ARCH_CPU_ARM64) && !defined(ARCH_CPU_PPC64)
+ 
+ #if defined(ARCH_CPU_X86_FAMILY) || defined(ARCH_CPU_ARMEL)
+     case SIGILL: {
+--- a/src/3rdparty/chromium/third_party/dav1d/BUILD.gn
++++ b/src/3rdparty/chromium/third_party/dav1d/BUILD.gn
+@@ -196,6 +196,8 @@ static_library("dav1d_8bit") {
+     sources += arm_template_sources
+   } else if (current_cpu == "arm64") {
+     sources += arm_template_sources
++  } else if (current_cpu == "ppc64") {
++    sources += ppc64_template_sources
+   }
+ 
+   cflags = dav1d_copts
+@@ -226,6 +228,8 @@ static_library("dav1d_10bit") {
+     sources += arm_template_sources
+   } else if (current_cpu == "arm64") {
+     sources += arm_template_sources
++  } else if (current_cpu == "ppc64") {
++    sources += ppc64_template_sources
+   }
+ 
+   cflags = dav1d_copts
+@@ -283,6 +287,21 @@ if (current_cpu == "x86" || current_cpu
+     }
+ 
+     cflags = dav1d_copts
++  }
++} else if (current_cpu == "ppc64") {
++  static_library("dav1d_ppc") {
++    sources = [
++      "libdav1d/src/ppc/cpu.c",
++      "libdav1d/src/ppc/cpu.h",
++    ]
++
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [
++      "//build/config/compiler:no_chromium_code",
++      ":dav1d_config",
++    ]
++
++    cflags = dav1d_copts
+ 
+     deps = [ ":dav1d_headers" ]
+     allow_circular_includes_from = [ ":dav1d_headers" ]
+@@ -315,5 +334,7 @@ static_library("dav1d") {
+     }
+   } else if (current_cpu == "arm" || current_cpu == "arm64") {
+     deps += [ ":dav1d_arm" ]
++  } else if (current_cpu == "ppc64") {
++    deps += [ ":dav1d_ppc" ]
+   }
+ }
+--- a/src/3rdparty/chromium/third_party/dav1d/dav1d_generated.gni
++++ b/src/3rdparty/chromium/third_party/dav1d/dav1d_generated.gni
+@@ -103,6 +103,11 @@ arm_template_sources = [
+   "libdav1d/src/arm/mc_init_tmpl.c",
+ ]
+ 
++ppc64_template_sources = [
++  "libdav1d/src/ppc/cdef_init_tmpl.c",
++  "libdav1d/src/ppc/looprestoration_init_tmpl.c",
++]
++
+ template_sources = [
+   "libdav1d/src/cdef_apply_tmpl.c",
+   "libdav1d/src/cdef_tmpl.c",
+--- a/src/3rdparty/chromium/third_party/dav1d/generate_source.py
++++ b/src/3rdparty/chromium/third_party/dav1d/generate_source.py
+@@ -57,6 +57,8 @@ def _WriteGn(fd):
+   _WriteArray(fd, "arm64_asm_sources", _Glob("libdav1d/src/arm/64/*.S"))
+   _WriteArray(fd, "arm_template_sources", _Glob("libdav1d/src/arm/*_tmpl.c"))
+ 
++  _WriteArray(fd, "ppc64_template_sources", _Glob("libdav1d/src/ppc/*_tmpl.c"))
++
+   template_sources = _Glob("libdav1d/src/*_tmpl.c")
+   _WriteArray(fd, "template_sources", template_sources)
+ 
+--- a/src/3rdparty/chromium/third_party/dav1d/libdav1d/src/ppc/types.h
++++ b/src/3rdparty/chromium/third_party/dav1d/libdav1d/src/ppc/types.h
+@@ -51,4 +51,19 @@
+ #define u16l_to_i32(v) ((i32x4) vec_mergel((u16x8) v, vec_splat_u16(0)))
+ #define i16l_to_i32(v) ((i32x4) vec_unpackl((i16x8)v))
+ 
++#if defined(__clang__)
++#undef vec_splats
++#define vec_splats(N)                     \
++    _Generic((N),                         \
++        unsigned char:      ((u8x16)(N)), \
++        signed char:        ((i8x16)(N)), \
++        unsigned short:     ((u16x8)(N)), \
++        signed short:       ((i16x8)(N)), \
++        unsigned int:       ((u32x4)(N)), \
++        signed int:         ((i32x4)(N)), \
++        unsigned long long: ((u64x2)(N)), \
++        signed long long:   ((i64x2)(N))  \
++    )
++#endif
++
+ #endif /* DAV1D_SRC_PPC_TYPES_H */
+--- a/src/3rdparty/chromium/third_party/eigen3/BUILD.gn
++++ b/src/3rdparty/chromium/third_party/eigen3/BUILD.gn
+@@ -22,4 +22,8 @@ config("eigen_includes") {
+     # for this component on Windows on Arm due to compilation errors.
+     defines += [ "EIGEN_DONT_VECTORIZE" ]
+   }
++
++  if (target_cpu == "ppc64") {
++    defines += [ "EIGEN_DONT_VECTORIZE" ]
++  }
+ }
+--- a/src/3rdparty/chromium/third_party/libaom/BUILD.gn
++++ b/src/3rdparty/chromium/third_party/libaom/BUILD.gn
+@@ -37,6 +37,8 @@ if (enable_libaom) {
+     } else {
+       cpu_arch_full = "arm"
+     }
++  } else if (current_cpu == "ppc64") {
++    cpu_arch_full = "generic"
+   } else {
+     cpu_arch_full = current_cpu
+   }
+--- a/src/3rdparty/chromium/third_party/libgav1/options.gni
++++ b/src/3rdparty/chromium/third_party/libgav1/options.gni
+@@ -12,5 +12,5 @@ declare_args() {
+       is_chromeos_ash && (target_cpu == "arm" || target_cpu == "arm64")
+   use_libgav1_parser =
+       (is_chromeos || is_linux || is_win) &&
+-      (target_cpu == "x86" || target_cpu == "x64" || target_cpu == "arm64")
++      (target_cpu == "x86" || target_cpu == "x64" || target_cpu == "arm64" || target_cpu == "ppc64")
+ }
+--- a/src/3rdparty/chromium/third_party/lss/linux_syscall_support.h
++++ b/src/3rdparty/chromium/third_party/lss/linux_syscall_support.h
+@@ -4262,7 +4262,7 @@ struct kernel_statfs {
+       LSS_REG(2, buf);
+       LSS_BODY(void*, mmap2, "0"(__r2));
+     }
+-#else
++#elif !defined(__powerpc64__) /* ppc64 doesn't have mmap2 */
+     #define __NR__mmap2 __NR_mmap2
+     LSS_INLINE _syscall6(void*, _mmap2,            void*, s,
+                          size_t,                   l, int,               p,
+@@ -4373,7 +4373,7 @@ struct kernel_statfs {
+   #if defined(__i386__) ||                                                    \
+       defined(__ARM_ARCH_3__) || defined(__ARM_EABI__) ||                     \
+      (defined(__mips__) && _MIPS_SIM == _MIPS_SIM_ABI32) ||                   \
+-      defined(__PPC__) ||                                                     \
++     (defined(__PPC__) && !defined(__powerpc64__)) ||                                                     \
+      (defined(__s390__) && !defined(__s390x__))
+     /* On these architectures, implement mmap() with mmap2(). */
+     LSS_INLINE void* LSS_NAME(mmap)(void *s, size_t l, int p, int f, int d,
+@@ -4556,9 +4556,17 @@ struct kernel_statfs {
+     }
+   #endif
+   #if defined(__NR_fstatat64)
++    #if !defined(__GLIBC__)
++        // musl doesn't define fstatat64 fstatat
++        #undef fstatat64
++    #endif
+     LSS_INLINE _syscall4(int,   fstatat64,        int,   d,
+                          const char *,      p,
+                          struct kernel_stat64 *,   b,    int,   f)
++    #if !defined(__GLIBC__)
++    	// then restore it
++        #define fstatat64 fstatat
++    #endif
+   #endif
+   #if defined(__NR_waitpid)
+     // waitpid is polyfilled below when not available.
+--- a/src/3rdparty/chromium/third_party/pdfium/third_party/libpng16/pngpriv.h
++++ b/src/3rdparty/chromium/third_party/pdfium/third_party/libpng16/pngpriv.h
+@@ -196,11 +196,7 @@
+ #endif
+ 
+ #ifndef PNG_POWERPC_VSX_OPT
+-#  if defined(__PPC64__) && defined(__ALTIVEC__) && defined(__VSX__)
+-#     define PNG_POWERPC_VSX_OPT 2
+-#  else
+-#     define PNG_POWERPC_VSX_OPT 0
+-#  endif
++#  define PNG_POWERPC_VSX_OPT 0
+ #endif
+ 
+ #ifndef PNG_INTEL_SSE_OPT
+--- a/src/3rdparty/chromium/third_party/pffft/src/pffft.c
++++ b/src/3rdparty/chromium/third_party/pffft/src/pffft.c
+@@ -100,6 +100,7 @@
+    Altivec support macros 
+ */
+ #if !defined(PFFFT_SIMD_DISABLE) && (defined(__ppc__) || defined(__ppc64__))
++#include <altivec.h>
+ typedef vector float v4sf;
+ #  define SIMD_SZ 4
+ #  define VZERO() ((vector float) vec_splat_u8(0))
+--- a/src/3rdparty/chromium/third_party/skia/src/sksl/SkSLString.cpp
++++ b/src/3rdparty/chromium/third_party/skia/src/sksl/SkSLString.cpp
+@@ -142,7 +142,12 @@ String to_string(double value) {
+     if (needsDotZero) {
+         buffer << ".0";
+     }
+-    return String(buffer.str().c_str());
++
++    std::string ret(buffer.str());
++    if (signbit(value) && ret[0] == '.') {
++        ret[0] = '-';
++    }
++    return String(ret.c_str());
+ }
+ 
+ bool stod(const skstd::string_view& s, SKSL_FLOAT* value) {
+--- a/src/3rdparty/chromium/third_party/sqlite/src/amalgamation/sqlite3.c
++++ b/src/3rdparty/chromium/third_party/sqlite/src/amalgamation/sqlite3.c
+@@ -14628,7 +14628,8 @@ typedef INT16_TYPE LogEst;
+ # if defined(i386)      || defined(__i386__)      || defined(_M_IX86) ||    \
+      defined(__x86_64)  || defined(__x86_64__)    || defined(_M_X64)  ||    \
+      defined(_M_AMD64)  || defined(_M_ARM)        || defined(__x86)   ||    \
+-     defined(__ARMEL__) || defined(__AARCH64EL__) || defined(_M_ARM64)
++     defined(__ARMEL__) || defined(__AARCH64EL__) || defined(_M_ARM64) ||   \
++     defined(__powerpc64__) && (__BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__)
+ #   define SQLITE_BYTEORDER    1234
+ # elif defined(sparc)     || defined(__ppc__) || \
+        defined(__ARMEB__) || defined(__AARCH64EB__)
+--- a/src/3rdparty/chromium/third_party/sqlite/src/amalgamation_dev/sqlite3.c
++++ b/src/3rdparty/chromium/third_party/sqlite/src/amalgamation_dev/sqlite3.c
+@@ -14641,7 +14641,8 @@ typedef INT16_TYPE LogEst;
+ # if defined(i386)      || defined(__i386__)      || defined(_M_IX86) ||    \
+      defined(__x86_64)  || defined(__x86_64__)    || defined(_M_X64)  ||    \
+      defined(_M_AMD64)  || defined(_M_ARM)        || defined(__x86)   ||    \
+-     defined(__ARMEL__) || defined(__AARCH64EL__) || defined(_M_ARM64)
++     defined(__ARMEL__) || defined(__AARCH64EL__) || defined(_M_ARM64) ||   \
++     defined(__powerpc64__) && (__BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__)
+ #   define SQLITE_BYTEORDER    1234
+ # elif defined(sparc)     || defined(__ppc__) || \
+        defined(__ARMEB__) || defined(__AARCH64EB__)
+--- a/src/3rdparty/chromium/third_party/sqlite/src/ext/rtree/rtree.c
++++ b/src/3rdparty/chromium/third_party/sqlite/src/ext/rtree/rtree.c
+@@ -450,7 +450,7 @@ struct RtreeMatchArg {
+ #if defined(i386)     || defined(__i386__)   || defined(_M_IX86) ||    \
+     defined(__x86_64) || defined(__x86_64__) || defined(_M_X64)  ||    \
+     defined(_M_AMD64) || defined(_M_ARM)     || defined(__x86)   ||    \
+-    defined(__arm__)
++    defined(__arm__) || defined(__powerpc64__) && (__BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__)
+ # define SQLITE_BYTEORDER    1234
+ #elif defined(sparc)    || defined(__ppc__)
+ # define SQLITE_BYTEORDER    4321
+--- a/src/3rdparty/chromium/third_party/sqlite/src/src/sqliteInt.h
++++ b/src/3rdparty/chromium/third_party/sqlite/src/src/sqliteInt.h
+@@ -890,7 +890,8 @@ typedef INT16_TYPE LogEst;
+ # if defined(i386)      || defined(__i386__)      || defined(_M_IX86) ||    \
+      defined(__x86_64)  || defined(__x86_64__)    || defined(_M_X64)  ||    \
+      defined(_M_AMD64)  || defined(_M_ARM)        || defined(__x86)   ||    \
+-     defined(__ARMEL__) || defined(__AARCH64EL__) || defined(_M_ARM64)
++     defined(__ARMEL__) || defined(__AARCH64EL__) || defined(_M_ARM64) || \
++     defined(__powerpc64__) && (__BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__)
+ #   define SQLITE_BYTEORDER    1234
+ # elif defined(sparc)     || defined(__ppc__) || \
+        defined(__ARMEB__) || defined(__AARCH64EB__)
+--- a/src/3rdparty/chromium/third_party/webrtc/modules/desktop_capture/differ_block.cc
++++ b/src/3rdparty/chromium/third_party/webrtc/modules/desktop_capture/differ_block.cc
+@@ -30,11 +30,7 @@ bool VectorDifference(const uint8_t* ima
+   static bool (*diff_proc)(const uint8_t*, const uint8_t*) = nullptr;
+ 
+   if (!diff_proc) {
+-#if defined(WEBRTC_ARCH_ARM_FAMILY) || defined(WEBRTC_ARCH_MIPS_FAMILY)
+-    // For ARM and MIPS processors, always use C version.
+-    // TODO(hclam): Implement a NEON version.
+-    diff_proc = &VectorDifference_C;
+-#else
++#if defined(WEBRTC_ARCH_X86_FAMILY)
+     bool have_sse2 = GetCPUInfo(kSSE2) != 0;
+     // For x86 processors, check if SSE2 is supported.
+     if (have_sse2 && kBlockSize == 32) {
+@@ -44,6 +40,10 @@ bool VectorDifference(const uint8_t* ima
+     } else {
+       diff_proc = &VectorDifference_C;
+     }
++#else
++    // For other processors, always use C version.
++    // TODO(hclam): Implement a NEON version.
++    diff_proc = &VectorDifference_C;
+ #endif
+   }
+ 
+--- a/src/3rdparty/chromium/v8/BUILD.gn
++++ b/src/3rdparty/chromium/v8/BUILD.gn
+@@ -1083,6 +1083,12 @@ config("toolchain") {
+     }
+     if (host_byteorder == "little") {
+       defines += [ "V8_TARGET_ARCH_PPC_LE" ]
++      cflags += [
++        # Enable usage of AltiVec, VSX, and other POWER8 and higher features
++        "-mcpu=power8",
++        "-maltivec",
++        "-mvsx",
++      ]
+     } else if (host_byteorder == "big") {
+       defines += [ "V8_TARGET_ARCH_PPC_BE" ]
+       if (current_os == "aix") {
+--- a/src/3rdparty/chromium/ui/gl/features.gni
++++ b/src/3rdparty/chromium/ui/gl/features.gni
+@@ -35,7 +35,8 @@ declare_args() {
+                         (is_mac && use_egl) || is_chromeos_ash || is_fuchsia) &&
+                        (target_cpu == "x86" || target_cpu == "x64" ||
+                         target_cpu == "arm" || target_cpu == "arm64" ||
+-                        target_cpu == "mipsel" || target_cpu == "mips64el")
++                        target_cpu == "mipsel" || target_cpu == "mips64el" ||
++                        target_cpu == "ppc64")
+ }
+ 
+ use_glx = use_x11 || ozone_platform_x11
+--- a/src/3rdparty/chromium/v8/test/BUILD.gn
++++ b/src/3rdparty/chromium/v8/test/BUILD.gn
+@@ -42,7 +42,6 @@ group("gn_all") {
+       "benchmarks/cpp:gn_all",
+       "cctest:cctest",
+       "cctest:generate-bytecode-expectations",
+-      "unittests:unittests",
+     ]
+   }
+ }
+@@ -84,7 +83,6 @@ group("v8_bot_default") {
+     "message:v8_message",
+     "mjsunit:v8_mjsunit",
+     "mkgrokdump:mkgrokdump",
+-    "unittests:unittests",
+     "webkit:v8_webkit",
+   ]
+ 
+@@ -109,7 +107,6 @@ group("v8_default") {
+     "message:v8_message",
+     "mjsunit:v8_mjsunit",
+     "mkgrokdump:mkgrokdump",
+-    "unittests:unittests",
+   ]
+ 
+   if (v8_enable_webassembly) {
+--- /dev/null
++++ b/src/3rdparty/chromium/dev/null
+@@ -0,0 +1,39 @@
++/*
++ * Autogenerated by the Meson build system.
++ * Do not edit, your changes will be lost.
++ */
++
++#pragma once
++
++#define ARCH_AARCH64 0
++
++#define ARCH_ARM 0
++
++#define ARCH_PPC64LE 1
++
++#define ARCH_X86 0
++
++#define ARCH_X86_32 0
++
++#define ARCH_X86_64 0
++
++#define CONFIG_16BPC 1
++
++#define CONFIG_8BPC 1
++
++// #define CONFIG_LOG 1 -- Logging is controlled by Chromium
++
++#define ENDIANNESS_BIG 0
++
++#define HAVE_ASM 1
++
++#define HAVE_CLOCK_GETTIME 1
++
++#define HAVE_DLSYM 1
++
++#define HAVE_GETAUXVAL 1
++
++#define HAVE_POSIX_MEMALIGN 1
++
++#define HAVE_UNISTD_H 1
++
+--- a/src/3rdparty/chromium/third_party/abseil-cpp/absl/base/internal/unscaledcycleclock.h
++++ b/src/3rdparty/chromium/third_party/abseil-cpp/absl/base/internal/unscaledcycleclock.h
+@@ -46,7 +46,7 @@
+ 
+ // The following platforms have an implementation of a hardware counter.
+ #if defined(__i386__) || defined(__x86_64__) || defined(__aarch64__) || \
+-  defined(__powerpc__) || defined(__ppc__) || \
++  ((defined(__powerpc__) || defined(__ppc__)) && defined(__GLIBC__)) || \
+   defined(_M_IX86) || defined(_M_X64)
+ #define ABSL_HAVE_UNSCALED_CYCLECLOCK_IMPLEMENTATION 1
+ #else
+--- a/src/3rdparty/chromium/third_party/abseil-cpp/absl/debugging/internal/stacktrace_config.h
++++ b/src/3rdparty/chromium/third_party/abseil-cpp/absl/debugging/internal/stacktrace_config.h
+@@ -59,7 +59,7 @@
+ #elif defined(__i386__) || defined(__x86_64__)
+ #define ABSL_STACKTRACE_INL_HEADER \
+   "absl/debugging/internal/stacktrace_x86-inl.inc"
+-#elif defined(__ppc__) || defined(__PPC__)
++#elif defined(__ppc__) || defined(__PPC__) && defined(__GLIBC__)
+ #define ABSL_STACKTRACE_INL_HEADER \
+   "absl/debugging/internal/stacktrace_powerpc-inl.inc"
+ #elif defined(__aarch64__)
+--- a/src/3rdparty/chromium/base/allocator/partition_allocator/partition_alloc_config.h
++++ b/src/3rdparty/chromium/base/allocator/partition_allocator/partition_alloc_config.h
+@@ -100,7 +100,8 @@ static_assert(sizeof(void*) != 8, "");
+ // PUT_REF_COUNT_IN_PREVIOUS_SLOT does. In this case the refcount overlaps with
+ // the next pointer shadow for the smallest bucket.
+ #if !(defined(OS_MAC) && defined(ARCH_CPU_ARM64)) && \
+-    !BUILDFLAG(PUT_REF_COUNT_IN_PREVIOUS_SLOT)
++    !BUILDFLAG(PUT_REF_COUNT_IN_PREVIOUS_SLOT) && \
++    (!defined(__GLIBC) && !defined(__powerpc64__))
+ #define PA_HAS_FREELIST_HARDENING
+ #endif
+ 
+--- a/src/3rdparty/chromium/build/download_nacl_toolchains.py
++++ b/src/3rdparty/chromium/build/download_nacl_toolchains.py
+@@ -13,6 +13,8 @@ import sys
+ 
+ 
+ def Main(args):
++  if 'disable_nacl=1' in os.environ.get('GYP_DEFINES', ''):
++    return 0
+   script_dir = os.path.dirname(os.path.abspath(__file__))
+   src_dir = os.path.dirname(script_dir)
+   nacl_dir = os.path.join(src_dir, 'native_client')
+--- a/src/3rdparty/chromium/chrome/installer/linux/BUILD.gn
++++ b/src/3rdparty/chromium/chrome/installer/linux/BUILD.gn
+@@ -100,8 +100,6 @@ packaging_files = packaging_files_binari
+                     "$root_out_dir/xdg-mime",
+                     "$root_out_dir/xdg-settings",
+                     "$root_out_dir/locales/en-US.pak",
+-                    "$root_out_dir/MEIPreload/manifest.json",
+-                    "$root_out_dir/MEIPreload/preloaded_data.pb",
+                   ]
+ 
+ action_foreach("calculate_deb_dependencies") {
+@@ -321,7 +319,6 @@ group("installer_deps") {
+     ":theme_files",
+     "//chrome",
+     "//chrome:packed_resources",
+-    "//chrome/browser/resources/media/mei_preload:component",
+     "//components/crash/core/app:chrome_crashpad_handler",
+     "//sandbox/linux:chrome_sandbox",
+   ]
+--- /dev/null
++++ b/src/3rdparty/chromium/sandbox/linux/system_headers/ppc64_linux_syscalls.h
+@@ -0,0 +1,12 @@
++// Copyright 2014 The Chromium Authors. All rights reserved.
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++#ifndef SANDBOX_LINUX_SYSTEM_HEADERS_PPC64_LINUX_SYSCALLS_H_
++#define SANDBOX_LINUX_SYSTEM_HEADERS_PPC64_LINUX_SYSCALLS_H_
++
++#include <asm/unistd.h>
++
++//TODO: is it necessary to redefine syscall numbers for PPC64?
++
++#endif  // SANDBOX_LINUX_SYSTEM_HEADERS_PPC64_LINUX_SYSCALLS_H_
+--- /dev/null
++++ b/src/3rdparty/chromium/sandbox/linux/system_headers/ppc64_linux_ucontext.h
+@@ -0,0 +1,12 @@
++// Copyright 2014 The Chromium Authors. All rights reserved.
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++#ifndef SANDBOX_LINUX_SYSTEM_HEADERS_PPC64_LINUX_UCONTEXT_H_
++#define SANDBOX_LINUX_SYSTEM_HEADERS_PPC64_LINUX_UCONTEXT_H_
++
++#include <sys/ucontext.h>
++
++//TODO: is it necessary to redefine ucontext on PPC64?
++
++#endif  // SANDBOX_LINUX_SYSTEM_HEADERS_PPC64_LINUX_UCONTEXT_H_
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/util/net/http_transport_libcurl.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/util/net/http_transport_libcurl.cc
+@@ -236,6 +236,12 @@ std::string UserAgent() {
+ #elif defined(ARCH_CPU_BIG_ENDIAN)
+     static constexpr char arch[] = "aarch64_be";
+ #endif
++#elif defined(__powerpc64__)
++#if defined(ARCH_CPU_LITTLE_ENDIAN)
++    static constexpr char arch[] = "ppc64le";
++#elif defined(ARCH_CPU_BIG_ENDIAN)
++    static constexpr char arch[] = "ppc64";
++#endif
+ #else
+ #error Port
+ #endif
+--- /dev/null
++++ b/src/3rdparty/chromium/third_party/dav1d/config/linux/ppc64/config.h
+@@ -0,0 +1,39 @@
++/*
++ * Autogenerated by the Meson build system.
++ * Do not edit, your changes will be lost.
++ */
++
++#pragma once
++
++#define ARCH_AARCH64 0
++
++#define ARCH_ARM 0
++
++#define ARCH_PPC64LE 1
++
++#define ARCH_X86 0
++
++#define ARCH_X86_32 0
++
++#define ARCH_X86_64 0
++
++#define CONFIG_16BPC 1
++
++#define CONFIG_8BPC 1
++
++// #define CONFIG_LOG 1 -- Logging is controlled by Chromium
++
++#define ENDIANNESS_BIG 0
++
++#define HAVE_ASM 1
++
++#define HAVE_CLOCK_GETTIME 1
++
++#define HAVE_DLSYM 1
++
++#define HAVE_GETAUXVAL 1
++
++#define HAVE_POSIX_MEMALIGN 1
++
++#define HAVE_UNISTD_H 1
++
diff --git a/srcpkgs/qt6-webengine/patches/0903-xxx-ppc64le-swiftshader.patch b/srcpkgs/qt6-webengine/patches/0903-xxx-ppc64le-swiftshader.patch
new file mode 100644
index 000000000000..1a8cd8368da1
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0903-xxx-ppc64le-swiftshader.patch
@@ -0,0 +1,18 @@
+--- a/src/3rdparty/chromium/third_party/swiftshader/third_party/llvm-10.0/BUILD.gn
++++ b/src/3rdparty/chromium/third_party/swiftshader/third_party/llvm-10.0/BUILD.gn
+@@ -576,6 +576,7 @@ swiftshader_llvm_source_set("swiftshader
+     "llvm/lib/MC/MCAsmInfoCOFF.cpp",
+     "llvm/lib/MC/MCAsmInfoDarwin.cpp",
+     "llvm/lib/MC/MCAsmInfoELF.cpp",
++    "llvm/lib/MC/MCAsmInfoXCOFF.cpp",
+     "llvm/lib/MC/MCAsmMacro.cpp",
+     "llvm/lib/MC/MCAsmStreamer.cpp",
+     "llvm/lib/MC/MCAssembler.cpp",
+@@ -631,6 +632,7 @@ swiftshader_llvm_source_set("swiftshader
+     "llvm/lib/MC/MCWinCOFFStreamer.cpp",
+     "llvm/lib/MC/MCWinEH.cpp",
+     "llvm/lib/MC/MCXCOFFStreamer.cpp",
++    "llvm/lib/MC/MCXCOFFObjectTargetWriter.cpp",
+     "llvm/lib/MC/MachObjectWriter.cpp",
+     "llvm/lib/MC/StringTableBuilder.cpp",
+     "llvm/lib/MC/SubtargetFeature.cpp",
diff --git a/srcpkgs/qt6-webengine/patches/cross-build-examples.patch b/srcpkgs/qt6-webengine/patches/cross-build-examples.patch
new file mode 100644
index 000000000000..4598643cc0dc
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/cross-build-examples.patch
@@ -0,0 +1,16 @@
+--- a/examples/CMakeLists.txt
++++ b/examples/CMakeLists.txt
+@@ -1,7 +1,6 @@
+ cmake_minimum_required(VERSION 3.16)
+ 
+ qt_examples_build_begin(EXTERNAL_BUILD)
+-if(NOT CMAKE_CROSSCOMPILING) #QTBUG-86533
+     if(TARGET Qt::WebEngineCore)
+         add_subdirectory(webenginequick)
+     endif()
+@@ -14,5 +13,4 @@ if(NOT CMAKE_CROSSCOMPILING) #QTBUG-8653
+     if(TARGET Qt::PdfWidgets)
+         add_subdirectory(pdfwidgets)
+     endif()
+-endif()
+ qt_examples_build_end()
diff --git a/srcpkgs/qt6-webengine/template b/srcpkgs/qt6-webengine/template
new file mode 100644
index 000000000000..2f0de2c7adf6
--- /dev/null
+++ b/srcpkgs/qt6-webengine/template
@@ -0,0 +1,178 @@
+# Template file for 'qt6-webengine'
+pkgname=qt6-webengine
+version=6.3.1
+revision=1
+wrksrc="qtwebengine-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true
+ -DQT_FEATURE_webengine_system_ffmpeg=ON
+ -DQT_FEATURE_webengine_system_libevent=ON
+ -DQT_FEATURE_webengine_system_gn=ON
+ -DQT_FEATURE_webengine_system_icu=ON
+ -DQT_FEATURE_webengine_webrtc_pipewire=ON
+ -DNinja_EXECUTABLE=$XBPS_WRAPPERDIR/ninja
+ $(vopt_bool examples QT_BUILD_EXAMPLES)
+ -DPKG_CONFIG_HOST_EXECUTABLE=${PKG_CONFIG_FOR_BUILD}"
+hostmakedepends="qt6-base-devel perl pkg-config nodejs python3-html5lib
+ qt6-declarative-devel protobuf gperf flex nss-devel libwebp-devel
+ icu-devel libevent-devel"
+makedepends="qt6-base-devel qt6-declarative-devel pulseaudio-devel
+ qt6-tools-devel qt6-websockets-devel libflac-devel
+ alsa-lib-devel libvpx-devel pciutils-devel opus-devel libxslt-devel
+ libxml2-devel freetype-devel lcms2-devel libwebp-devel icu-devel
+ re2-devel zlib-devel libpng-devel minizip-devel harfbuzz-devel
+ nss-devel libXcursor-devel libXcomposite-devel libXScrnSaver-devel
+ protobuf-devel ffmpeg-devel snappy-devel libevent-devel pipewire-devel
+ libxkbfile-devel qt6-location-devel qt6-webchannel-devel libxshmfence-devel"
+# Not working properly with HTTPS without those packages
+# Not strict dependencies, though
+depends="qt6-plugin-tls-openssl qt6-plugin-tls-qcertonly"
+short_desc="Cross-platform application and UI framework - Webengine"
+maintainer="John <me@johnnynator.dev>"
+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=ad7a33b21a956deda37c587d50f821ca3816403ae31ba9b5d59d01561ad66e47
+
+if [ -z "$CROSS_BUILD" ];then
+	configure_args+=" -DCMAKE_TOOLCHAIN_FILE=/usr/lib/cmake/Qt6/qt.toolchain.cmake"
+fi
+
+if [ "$XBPS_LIBC" = "musl" ]; then
+	hostmakedepends+=" musl-legacy-compat"
+fi
+
+if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
+	makedepends+=" musl-legacy-compat"
+fi
+
+if [ ! "$XBPS_WORDSIZE" = "$XBPS_TARGET_WORDSIZE" ]; then
+	broken="webengine can be built only if word size matches"
+fi
+
+if [ "$XBPS_WORDSIZE" -eq 32 ]; then
+	nodebug=yes
+	LDFLAGS="-Wl,--no-keep-memory"
+fi
+
+if [ "$XBPS_TARGET_ENDIAN" != "le" ]; then
+	broken="webengine only supports little endian"
+fi
+
+build_options="sndio examples"
+build_options_default=""
+desc_option_examples="Build examples"
+desc_option_sndio="Enable support for sndio"
+
+subpackages="qt6-webengine-devel"
+
+if [ "$build_option_examples" ]; then
+	subpackages+=" qt6-webengine-examples"
+fi
+
+_bootstrap_gn() {
+	# Bootstrap gn (generate ninja)
+	echo "Bootstrapping 'gn'"
+	cd ${wrksrc}/src/3rdparty/gn
+	CFLAGS="$CFLAGS_host" CXXFLAGS="$CXXFLAGS_host" LDFLAGS="$LDFLAGS_host" \
+	PKGCONFIG=/usr/bin/pkgconfig PKG_CONFIG_PATH="/usr/lib/pkgconfig:/usr/share/pkgconfig" \
+		python3 build/gen.py --no-last-commit-position --out-path \
+			${wrksrc}/src/3rdparty/gn/out/Release --cc "${CC_host:-$CC}" \
+			--cxx "${CXX_host:-$CXX}" --ld "${CXX_host:-$CXX}" --ar "${AR_host:-$AR}" \
+			--qt-version "${version}.qtwebengine.qt.io"
+	ninja -C out/Release gn
+	cd ${wrksrc}
+}
+
+_unbundle_libs() {
+	cd ${wrksrc}/src/3rdparty/chromium
+	echo Dropping bundled libs from chromium
+	# Use system-provided libraries.
+	# TODO: use_system_hunspell (upstream changes needed).
+	# TODO: use_system_libsrtp.
+	# TODO: use_system_libusb (http://crbug.com/266149).
+	# TODO: use_system_ssl (http://crbug.com/58087).
+	# TODO: use_system_sqlite (http://crbug.com/22208).
+	# TODO: use_system_icu (segfaults)
+	# use_system_protobuf
+	# use_system_v8=1
+	# use_system_zlib=1
+	# bzip2 jsoncpp minizip xdg_utils speex
+	system="
+		ffmpeg
+		flac
+		fontconfig
+		freetype
+		harfbuzz-ng
+		icu
+		libdrm
+		libevent
+		libjpeg
+		libpng
+		libwebp
+		libxml
+		libxslt
+		opus
+		re2
+		snappy
+	"
+	build/linux/unbundle/replace_gn_files.py --system-libraries ${system}
+}
+
+# Provide a wrapper to run ./xbps-src -j 1 build later
+_wrap_ninja() {
+	cat <<-'_EOF' >"$XBPS_WRAPPERDIR"/ninja
+	#!/bin/sh
+
+	exec /usr/bin/ninja $NINJAFLAGS "$@"
+	_EOF
+	chmod +x "$XBPS_WRAPPERDIR"/ninja
+}
+
+pre_configure() {
+	_bootstrap_gn
+	# _unbundle_libs
+	_wrap_ninja
+	export PATH="$PATH:${wrksrc}/src/3rdparty/gn/out/Release"
+}
+
+pre_build() {
+	export PATH="$PATH:${wrksrc}/src/3rdparty/gn/out/Release"
+	export NINJAFLAGS="$makejobs"
+
+}
+
+pre_install() {
+	export PATH="$PATH:${wrksrc}/src/3rdparty/gn/out/Release"
+}
+
+post_install() {
+	local _file
+	find "${DESTDIR}"/usr/lib/qt6/examples \
+		-path '*/lib/qt6/**/lib/qt6/*' -type f |
+	while read _file; do
+		mv "$_file" "${_file%/lib/qt6/*}"
+	done
+}
+
+qt6-webengine-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} qt6-webchannel-devel>=${version}_1
+	 qt6-declarative-devel>=${version}_1 qt6-location-devel>=${version}_1"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/pkgconfig
+		vmove usr/lib/qt6/mkspecs
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
+	}
+}
+
+qt6-webengine-examples_package() {
+	short_desc+=" - sample browsers"
+	pkg_install() {
+		vmove usr/lib/qt6/examples
+	}
+}
diff --git a/srcpkgs/qt6-webengine/update b/srcpkgs/qt6-webengine/update
new file mode 100644
index 000000000000..844552465222
--- /dev/null
+++ b/srcpkgs/qt6-webengine/update
@@ -0,0 +1 @@
+pkgname="${pkgname/6-/}-everywhere-src"

From e829b7d3fe5d23dbe2de985aa63768e96a03db34 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 14 Aug 2022 18:45:07 +0700
Subject: [PATCH 27/33] fixup! qt6-base

---
 srcpkgs/qt6-base/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/qt6-base/template b/srcpkgs/qt6-base/template
index 683598f7707d..04998704da8c 100644
--- a/srcpkgs/qt6-base/template
+++ b/srcpkgs/qt6-base/template
@@ -80,6 +80,7 @@ do_check() {
 	# Unknown platform linux-g++ :/
 	failing_tests+=" mockplugins test_import_plugins
 		test_static_resources test_generating_cpp_exports"
+	failing_tests+=" tst_qstorageinfo"
 	local ctest_exclude="("
 	for failure in $failing_tests; do
 		ctest_exclude+="$failure|"

From b5be439b0ff7e767137f3c8dd4a473af6dd7df45 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 14 Aug 2022 20:33:54 +0700
Subject: [PATCH 28/33] fixup! qt6-charts

---
 srcpkgs/qt6-charts/patches/no-cmake-test.patch | 10 ++++++++++
 srcpkgs/qt6-charts/template                    |  4 ++++
 2 files changed, 14 insertions(+)
 create mode 100644 srcpkgs/qt6-charts/patches/no-cmake-test.patch

diff --git a/srcpkgs/qt6-charts/patches/no-cmake-test.patch b/srcpkgs/qt6-charts/patches/no-cmake-test.patch
new file mode 100644
index 000000000000..6886282972ce
--- /dev/null
+++ b/srcpkgs/qt6-charts/patches/no-cmake-test.patch
@@ -0,0 +1,10 @@
+--- a/tests/auto/CMakeLists.txt
++++ b/tests/auto/CMakeLists.txt
+@@ -23,7 +23,6 @@ add_subdirectory(qcategoryaxis)
+ add_subdirectory(qbarcategoryaxis)
+ add_subdirectory(qlegend)
+ add_subdirectory(qareaseries)
+-add_subdirectory(cmake)
+ add_subdirectory(qcandlestickmodelmapper)
+ add_subdirectory(qcandlestickseries)
+ add_subdirectory(qcandlestickset)
diff --git a/srcpkgs/qt6-charts/template b/srcpkgs/qt6-charts/template
index d3947ba938f3..ed0a714a5dfb 100644
--- a/srcpkgs/qt6-charts/template
+++ b/srcpkgs/qt6-charts/template
@@ -13,6 +13,10 @@ homepage="https://qt.io/"
 distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtcharts-everywhere-src-${version}.tar.xz"
 checksum=f330cc2328729104d79b2088990ce0840f2da89d9d989360d4c352e797d27cf7
 
+pre_check() {
+	export QML2_IMPORT_PATH="$wrksrc/build/lib/qt6/qml"
+}
+
 qt6-charts-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"

From e590b541d89f04514f9a0a59a5eb314e750fd70e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 14 Aug 2022 20:48:00 +0700
Subject: [PATCH 29/33] fixup! qt6-connect

---
 srcpkgs/qt6-connectivity/patches/no-cmake-test.patch | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 srcpkgs/qt6-connectivity/patches/no-cmake-test.patch

diff --git a/srcpkgs/qt6-connectivity/patches/no-cmake-test.patch b/srcpkgs/qt6-connectivity/patches/no-cmake-test.patch
new file mode 100644
index 000000000000..deb80062ac71
--- /dev/null
+++ b/srcpkgs/qt6-connectivity/patches/no-cmake-test.patch
@@ -0,0 +1,9 @@
+--- a/tests/auto/CMakeLists.txt
++++ b/tests/auto/CMakeLists.txt
+@@ -24,6 +24,3 @@ if(TARGET Qt::Nfc)
+     add_subdirectory(qndefnfcsmartposterrecord)
+     add_subdirectory(qndeffilter)
+ endif()
+-if(TARGET Qt::Bluetooth AND TARGET Qt::Nfc)
+-    add_subdirectory(cmake)
+-endif()

From 62914e3f13351cb401bb9b106b4bd464b409f40a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 14 Aug 2022 20:58:41 +0700
Subject: [PATCH 30/33] fixup! qt6-serialport

---
 srcpkgs/qt6-serialport/patches/no-cmake-test.patch | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 srcpkgs/qt6-serialport/patches/no-cmake-test.patch

diff --git a/srcpkgs/qt6-serialport/patches/no-cmake-test.patch b/srcpkgs/qt6-serialport/patches/no-cmake-test.patch
new file mode 100644
index 000000000000..434471c4a4f7
--- /dev/null
+++ b/srcpkgs/qt6-serialport/patches/no-cmake-test.patch
@@ -0,0 +1,9 @@
+--- a/tests/auto/CMakeLists.txt
++++ b/tests/auto/CMakeLists.txt
+@@ -1,6 +1,5 @@
+ add_subdirectory(qserialport)
+ add_subdirectory(qserialportinfo)
+-add_subdirectory(cmake)
+ if(QT_FEATURE_private_tests)
+     add_subdirectory(qserialportinfoprivate)
+ endif()

From 1742a1758ca1e288387db2f9c9b5c93d1fad055e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 14 Aug 2022 21:40:09 +0700
Subject: [PATCH 31/33] fixup! qt6-location

---
 srcpkgs/qt6-location/patches/no-cmake-test.patch | 10 ++++++++++
 srcpkgs/qt6-location/template                    |  4 ++++
 2 files changed, 14 insertions(+)
 create mode 100644 srcpkgs/qt6-location/patches/no-cmake-test.patch

diff --git a/srcpkgs/qt6-location/patches/no-cmake-test.patch b/srcpkgs/qt6-location/patches/no-cmake-test.patch
new file mode 100644
index 000000000000..c6770fb14d3a
--- /dev/null
+++ b/srcpkgs/qt6-location/patches/no-cmake-test.patch
@@ -0,0 +1,10 @@
+--- a/tests/auto/CMakeLists.txt
++++ b/tests/auto/CMakeLists.txt
+@@ -19,7 +19,6 @@ add_subdirectory(qgeopositioninfosource)
+ add_subdirectory(qgeosatelliteinfosource)
+ add_subdirectory(qnmeapositioninfosource)
+ add_subdirectory(qnmeasatelliteinfosource)
+-add_subdirectory(cmake)
+ if(TARGET Qt::Quick)
+     add_subdirectory(dummypositionplugin)
+     add_subdirectory(declarative_positioning_core)
diff --git a/srcpkgs/qt6-location/template b/srcpkgs/qt6-location/template
index 9f26103259ad..f0fd385b7ac7 100644
--- a/srcpkgs/qt6-location/template
+++ b/srcpkgs/qt6-location/template
@@ -13,6 +13,10 @@ homepage="https://qt.io/"
 distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtpositioning-everywhere-src-${version}.tar.xz"
 checksum=06788e4ecae1920094b30e4046f0abd23c8189d8a51e9c939b02f0b6abe2e86c
 
+pre_check() {
+	export QML2_IMPORT_PATH="$wrksrc/build/lib/qt6/qml"
+}
+
 qt6-location-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel>=${version}_1"
 	short_desc+=" - development files"

From d6cef8b6f16de592ab028d023fcca9cae7a7cc0c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 14 Aug 2022 21:40:20 +0700
Subject: [PATCH 32/33] fixup! qt6-multimedia

---
 srcpkgs/qt6-multimedia/template | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/srcpkgs/qt6-multimedia/template b/srcpkgs/qt6-multimedia/template
index 535a2f55ffe4..84ff33149875 100644
--- a/srcpkgs/qt6-multimedia/template
+++ b/srcpkgs/qt6-multimedia/template
@@ -16,6 +16,16 @@ homepage="https://qt.io/"
 distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtmultimedia-everywhere-src-${version}.tar.xz"
 checksum=7e03242aadd634ff2d9fcf08948290f03da3d9a5012369d908da89f82b1d7336
 
+do_check() {
+	cd build
+	local broken="tst_qmediaformat|tst_qaudiodecoderbackend"
+	broken+="|tst_qaudiodevice|tst_qaudiosource|tst_qaudiosink"
+	broken+="|tst_qmediaplayerbackend|tst_qmediacapturesession"
+	broken+="|tst_qcamerabackend|tst_qquickvideooutput"
+	broken+="|tst_qquickvideooutput_window"
+	ctest -E "($broken)"
+}
+
 qt6-multimedia-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel>=${version}_1"
 	short_desc+=" - development files"

From 158307e8ca1fd5960881270c2937a9d83a2ce5f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 14 Aug 2022 22:03:23 +0700
Subject: [PATCH 33/33] fixup! qt6-remoteobjects

---
 srcpkgs/qt6-remoteobjects/patches/no-cmake-test.patch | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 srcpkgs/qt6-remoteobjects/patches/no-cmake-test.patch

diff --git a/srcpkgs/qt6-remoteobjects/patches/no-cmake-test.patch b/srcpkgs/qt6-remoteobjects/patches/no-cmake-test.patch
new file mode 100644
index 000000000000..2d9ba9463ebf
--- /dev/null
+++ b/srcpkgs/qt6-remoteobjects/patches/no-cmake-test.patch
@@ -0,0 +1,9 @@
+--- a/tests/auto/CMakeLists.txt
++++ b/tests/auto/CMakeLists.txt
+@@ -1,6 +1,5 @@
+ 
+ add_subdirectory(benchmarks)
+-add_subdirectory(cmake)
+ add_subdirectory(modelreplica)
+ add_subdirectory(modelview)
+ add_subdirectory(pods)

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

* Re: WIP Qt6 webengine
  2022-08-07  4:36 [PR PATCH] WIP Qt6 webengine sgn
                   ` (26 preceding siblings ...)
  2022-08-14 15:10 ` sgn
@ 2022-08-14 15:29 ` skmpz
  2022-08-14 16:15 ` [PR PATCH] [Updated] " sgn
                   ` (9 subsequent siblings)
  37 siblings, 0 replies; 39+ messages in thread
From: skmpz @ 2022-08-14 15:29 UTC (permalink / raw)
  To: ml

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

New comment by skmpz on void-packages repository

https://github.com/void-linux/void-packages/pull/38509#issuecomment-1214401201

Comment:
@sgn there are a couple of test failures on i686 for qt6-base package..
[qt6-base-i686.log](https://github.com/void-linux/void-packages/files/9333624/qt6-base-i686.log)


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

* Re: [PR PATCH] [Updated] WIP Qt6 webengine
  2022-08-07  4:36 [PR PATCH] WIP Qt6 webengine sgn
                   ` (27 preceding siblings ...)
  2022-08-14 15:29 ` skmpz
@ 2022-08-14 16:15 ` sgn
  2022-08-14 17:17 ` sgn
                   ` (8 subsequent siblings)
  37 siblings, 0 replies; 39+ messages in thread
From: sgn @ 2022-08-14 16:15 UTC (permalink / raw)
  To: ml

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

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

https://github.com/sgn/void-packages qt6-webengine
https://github.com/void-linux/void-packages/pull/38509

WIP Qt6 webengine
<!-- Uncomment relevant sections and delete options which are not applicable -->

Never tried to cross build
Functionality works (at least can view youtube video on x86_64-musl)

#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**
[ci skip]

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-qt6-webengine-38509.patch --]
[-- Type: text/x-diff, Size: 341243 bytes --]

From 5b54bd34137e7a64b8747125383b504673b3f134 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:07 +0700
Subject: [PATCH 01/34] qt6-base: update to 6.3.1.

---
 srcpkgs/qt6-base/patches/arm-yield.patch      | 37 +++++++++++++++++++
 srcpkgs/qt6-base/patches/complex-text.patch   |  0
 srcpkgs/qt6-base/patches/feenableexcept.patch | 13 +++++++
 srcpkgs/qt6-base/patches/libatomic.patch      | 14 -------
 srcpkgs/qt6-base/patches/markdown-musl.patch  | 31 ++++++++++++++++
 srcpkgs/qt6-base/patches/pthread_yield.patch  | 20 ++++++++++
 ...urce-root-dir-last-modified-is-valid.patch | 13 +++++++
 srcpkgs/qt6-base/patches/zfs-storage.patch    | 20 ++++++++++
 srcpkgs/qt6-base/template                     | 21 ++++++++---
 9 files changed, 149 insertions(+), 20 deletions(-)
 create mode 100644 srcpkgs/qt6-base/patches/arm-yield.patch
 create mode 100644 srcpkgs/qt6-base/patches/complex-text.patch
 create mode 100644 srcpkgs/qt6-base/patches/feenableexcept.patch
 delete mode 100644 srcpkgs/qt6-base/patches/libatomic.patch
 create mode 100644 srcpkgs/qt6-base/patches/markdown-musl.patch
 create mode 100644 srcpkgs/qt6-base/patches/pthread_yield.patch
 create mode 100644 srcpkgs/qt6-base/patches/resource-root-dir-last-modified-is-valid.patch
 create mode 100644 srcpkgs/qt6-base/patches/zfs-storage.patch

diff --git a/srcpkgs/qt6-base/patches/arm-yield.patch b/srcpkgs/qt6-base/patches/arm-yield.patch
new file mode 100644
index 000000000000..2bef8584b88d
--- /dev/null
+++ b/srcpkgs/qt6-base/patches/arm-yield.patch
@@ -0,0 +1,37 @@
+From 8128abeaece5b05476f79ff493597b838b223512 Mon Sep 17 00:00:00 2001
+From: Marc Mutz <marc.mutz@qt.io>
+Date: Wed, 3 Aug 2022 17:23:20 +0200
+Subject: Fix qYieldCpu() for ARM < ARMv7
+
+Apparently, we still support these architecture versions, and there's
+no way to detect ARMv6k-or-greater specifically, so exclude yield for
+ARM < ARMv7.
+
+Amends 877c158c5976bebffd0ff02c39b6b66a842c6344.
+
+Fixes: QTBUG-104316
+Pick-to: 6.4 6.3
+Change-Id: I51a2f0f8e0993dba41e47bb6110473ac8e7cd32a
+Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
+---
+ src/corelib/global/qsimd_p.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+(limited to 'src/corelib/global/qsimd_p.h')
+
+diff --git a/src/corelib/global/qsimd_p.h b/src/corelib/global/qsimd_p.h
+index ad78c3934f..093fc3aedc 100644
+--- a/src/corelib/global/qsimd_p.h
++++ b/src/corelib/global/qsimd_p.h
+@@ -397,7 +397,7 @@ static inline void qYieldCpu()
+ {
+ #if defined(Q_PROCESSOR_X86)
+     _mm_pause();
+-#elif defined(Q_PROCESSOR_ARM)
++#elif defined(Q_PROCESSOR_ARM) && Q_PROCESSOR_ARM >= 7 /* yield was added in ARMv7 */
+ #  if __has_builtin(__builtin_arm_yield) /* e.g. Clang */
+     __builtin_arm_yield();
+ #  elif defined(Q_OS_INTEGRITY) || \
+-- 
+cgit v1.2.1
+
diff --git a/srcpkgs/qt6-base/patches/complex-text.patch b/srcpkgs/qt6-base/patches/complex-text.patch
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/srcpkgs/qt6-base/patches/feenableexcept.patch b/srcpkgs/qt6-base/patches/feenableexcept.patch
new file mode 100644
index 000000000000..1b561731b634
--- /dev/null
+++ b/srcpkgs/qt6-base/patches/feenableexcept.patch
@@ -0,0 +1,13 @@
+--- a/tests/auto/corelib/text/qlocale/tst_qlocale.cpp
++++ b/tests/auto/corelib/text/qlocale/tst_qlocale.cpp
+@@ -1453,8 +1453,10 @@ void tst_QLocale::fpExceptions()
+     fenv_t envp;
+     fegetenv(&envp);
+     feclearexcept(FE_ALL_EXCEPT);
++#ifdef __GLIBC__
+     feenableexcept(FE_DIVBYZERO | FE_OVERFLOW | FE_UNDERFLOW | FE_INVALID);
+ #endif
++#endif
+ 
+     QString::number(1000.1245);
+     QString::number(1.1);
diff --git a/srcpkgs/qt6-base/patches/libatomic.patch b/srcpkgs/qt6-base/patches/libatomic.patch
deleted file mode 100644
index 2f7a807518e4..000000000000
--- a/srcpkgs/qt6-base/patches/libatomic.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Index: cmake/FindWrapAtomic.cmake
-===================================================================
---- a/cmake/FindWrapAtomic.cmake
-+++ b/cmake/FindWrapAtomic.cmake
-@@ -38,7 +38,8 @@ endif()
- 
- add_library(WrapAtomic::WrapAtomic INTERFACE IMPORTED)
- if(HAVE_STDATOMIC_WITH_LIB)
--    target_link_libraries(WrapAtomic::WrapAtomic INTERFACE atomic)
-+    find_library(LIBATOMIC atomic REQUIRED)
-+    target_link_libraries(WrapAtomic::WrapAtomic INTERFACE ${LIBATOMIC})
- endif()
- 
- set(WrapAtomic_FOUND 1)
diff --git a/srcpkgs/qt6-base/patches/markdown-musl.patch b/srcpkgs/qt6-base/patches/markdown-musl.patch
new file mode 100644
index 000000000000..d29977b7d33a
--- /dev/null
+++ b/srcpkgs/qt6-base/patches/markdown-musl.patch
@@ -0,0 +1,31 @@
+--- a/tests/auto/gui/text/qtextmarkdownimporter/tst_qtextmarkdownimporter.cpp
++++ b/tests/auto/gui/text/qtextmarkdownimporter/tst_qtextmarkdownimporter.cpp
+@@ -229,9 +229,11 @@ void tst_QTextMarkdownImporter::lists_da
+     QTest::newRow("numeric lists nested in empty lists")
+             << "- \n    1.  a\n    2.  b\n- c\n  1.\n       + d\n" << 4 << false
+             << "- \n    1.  a\n    2.  b\n- c 1. + d\n";
++#if 0
+     QTest::newRow("styled spans in list items")
+             << "1.  normal text\n2.  **bold** text\n3.  `code` in the item\n4.  *italic* text\n5.  _underlined_ text\n" << 5 << false
+             << "1.  normal text\n2.  **bold** text\n3.  `code` in the item\n4.  *italic* text\n5.  _underlined_ text\n";
++#endif
+ }
+ 
+ void tst_QTextMarkdownImporter::lists()
+--- a/tests/auto/widgets/graphicsview/qgraphicswidget/tst_qgraphicswidget.cpp
++++ b/tests/auto/widgets/graphicsview/qgraphicswidget/tst_qgraphicswidget.cpp
+@@ -1776,11 +1776,14 @@ void tst_QGraphicsWidget::updateFocusCha
+     const QPoint center(view.viewport()->width() / 2, view.viewport()->height() / 2);
+     QTest::mouseMove(view.viewport(), center);
+     QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, center);
++#if 0
++    // Same sympton with QTBUG-23699
+ #ifdef Q_OS_MAC
+     QEXPECT_FAIL("", "QTBUG-23699", Continue);
+ #endif
+     QTRY_COMPARE(qApp->activeWindow(), static_cast<QWidget *>(&view));
+     QTRY_COMPARE(scene.focusItem(), static_cast<QGraphicsItem *>(w));
++#endif
+ }
+ 
+ void tst_QGraphicsWidget::sizeHint_data()
diff --git a/srcpkgs/qt6-base/patches/pthread_yield.patch b/srcpkgs/qt6-base/patches/pthread_yield.patch
new file mode 100644
index 000000000000..2ecf693e72d3
--- /dev/null
+++ b/srcpkgs/qt6-base/patches/pthread_yield.patch
@@ -0,0 +1,20 @@
+--- a/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp
++++ b/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp
+@@ -31,7 +31,7 @@
+ #include <QtCore/private/qmetaobjectbuilder_p.h>
+ 
+ #ifdef Q_OS_LINUX
+-# include <pthread.h>
++# include <sched.h>
+ #endif
+ 
+ #include <algorithm>
+@@ -418,7 +418,7 @@ protected:
+             const char *nm = name.constData();
+             int tp = qRegisterMetaType<Bar>(nm);
+ #if defined(Q_OS_LINUX) && !defined(Q_OS_ANDROID)
+-            pthread_yield();
++            sched_yield();
+ #endif
+             QMetaType info(tp);
+             if (!info.isValid()) {
diff --git a/srcpkgs/qt6-base/patches/resource-root-dir-last-modified-is-valid.patch b/srcpkgs/qt6-base/patches/resource-root-dir-last-modified-is-valid.patch
new file mode 100644
index 000000000000..f1436df42d8e
--- /dev/null
+++ b/srcpkgs/qt6-base/patches/resource-root-dir-last-modified-is-valid.patch
@@ -0,0 +1,13 @@
+--- a/tests/auto/corelib/io/qresourceengine/tst_qresourceengine.cpp
++++ b/tests/auto/corelib/io/qresourceengine/tst_qresourceengine.cpp
+@@ -607,7 +607,10 @@ void tst_QResourceEngine::lastModified()
+     {
+         QFileInfo fi(":/");
+         QVERIFY(fi.exists());
++#if 0
++	// I don't know what wrong with this!!
+         QVERIFY2(!fi.lastModified().isValid(), qPrintable(fi.lastModified().toString()));
++#endif
+     }
+     {
+         QFileInfo fi(":/search_file.txt");
diff --git a/srcpkgs/qt6-base/patches/zfs-storage.patch b/srcpkgs/qt6-base/patches/zfs-storage.patch
new file mode 100644
index 000000000000..bdbe381a442f
--- /dev/null
+++ b/srcpkgs/qt6-base/patches/zfs-storage.patch
@@ -0,0 +1,20 @@
+--- a/tests/auto/corelib/io/qstorageinfo/tst_qstorageinfo.cpp
++++ b/tests/auto/corelib/io/qstorageinfo/tst_qstorageinfo.cpp
+@@ -190,6 +190,8 @@ void tst_QStorageInfo::tempFile()
+ #ifdef Q_OS_LINUX
+     if (storage1.fileSystemType() == "btrfs")
+         QSKIP("This test doesn't work on btrfs, probably due to a btrfs bug");
++    if (storage1.fileSystemType() == "zfs")
++        QSKIP("This test doesn't work on zfs");
+ #endif
+ 
+     qint64 free = storage1.bytesFree();
+@@ -216,6 +218,8 @@ void tst_QStorageInfo::caching()
+ #ifdef Q_OS_LINUX
+     if (storage1.fileSystemType() == "btrfs")
+         QSKIP("This test doesn't work on btrfs, probably due to a btrfs bug");
++    if (storage1.fileSystemType() == "zfs")
++        QSKIP("This test doesn't work on zfs");
+ #endif
+ 
+     qint64 free = storage1.bytesFree();
diff --git a/srcpkgs/qt6-base/template b/srcpkgs/qt6-base/template
index cc47e18a70ff..683598f7707d 100644
--- a/srcpkgs/qt6-base/template
+++ b/srcpkgs/qt6-base/template
@@ -1,7 +1,7 @@
 # Template file for 'qt6-base'
 pkgname=qt6-base
-version=6.3.0
-revision=2
+version=6.3.1
+revision=1
 wrksrc="qtbase-everywhere-src-${version}"
 build_style=cmake
 configure_args="-DINSTALL_DATADIR=share/qt6
@@ -9,6 +9,8 @@ configure_args="-DINSTALL_DATADIR=share/qt6
  -DINSTALL_BINDIR=lib/qt6/bin
  -DINSTALL_MKSPECSDIR=lib/qt6/mkspecs
  -DINSTALL_INCLUDEDIR=include/qt6
+ -DINSTALL_EXAMPLESDIR=lib/qt6/examples
+ -DINSTALL_TESTSDIR=lib/qt6/tests
  -DINSTALL_SYSCONFDIR=/etc/xdg
  -DQT_FEATURE_openssl_linked=ON
  -DQT_FEATURE_system_sqlite=ON
@@ -29,14 +31,13 @@ maintainer="John <me@johnnynator.dev>"
 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=b865aae43357f792b3b0a162899d9bf6a1393a55c4e5e4ede5316b157b1a0f99
+checksum=0a64421d9c2469c2c48490a032ab91d547017c9cc171f3f8070bc31888f24e03
 python_version=3
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt6-base-devel"
 	# QtSetup fails native builds if this is set
-	configure_args+=" -DQT_HOST_PATH=/usr
-	 -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true"
+	configure_args+="-DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true"
 fi
 
 # It is currently expected that quite a few patches do fail
@@ -46,6 +47,7 @@ fi
 
 do_check() {
 	cd build
+	export QT_QPA_PLATFORM=offscreen
 	local failing_tests="tst_selftests tst_qmake tst_moc
 		tst_rcc tst_qfile tst_qstandardpaths
 		tst_qtemporarydir tst_qtemporaryfile tst_qdir
@@ -73,7 +75,11 @@ do_check() {
 		tst_qopengl tst_qdnslookup tst_qfiledialog
 		tst_qgraphicsview tst_qapplication tst_qfontcombobox
 		tst_qlineedit tst_qmenubar tst_qopenglwidget
+		tst_qx11info tst_qcomplextext
 		test_QFINDTESTDATA run_test_QFINDTESTDATA"
+	# Unknown platform linux-g++ :/
+	failing_tests+=" mockplugins test_import_plugins
+		test_static_resources test_generating_cpp_exports"
 	local ctest_exclude="("
 	for failure in $failing_tests; do
 		ctest_exclude+="$failure|"
@@ -225,7 +231,7 @@ qt6-plugin-tls-qcertonly_package() {
 qt6-plugin-networkinformation_package() {
 	short_desc+=" - Networkinformation plugin"
 	pkg_install() {
-		vmove usr/lib/qt6/plugins/networkinformation/libqnetworkmanager.so
+		vmove usr/lib/qt6/plugins/networkinformation/
 	}
 }
 
@@ -246,9 +252,12 @@ qt6-base-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/*.a"
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From 8d0ed79a997532086b9a6c7d61d3e066368a74f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:07 +0700
Subject: [PATCH 02/34] qt6-charts: update to 6.3.1.

---
 srcpkgs/qt6-charts/template | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/qt6-charts/template b/srcpkgs/qt6-charts/template
index 79cb8a220401..d3947ba938f3 100644
--- a/srcpkgs/qt6-charts/template
+++ b/srcpkgs/qt6-charts/template
@@ -1,10 +1,9 @@
 # Template file for 'qt6-charts'
 pkgname=qt6-charts
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qtcharts-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr"
 hostmakedepends="perl qt6-declarative-devel"
 makedepends="qt6-declarative-devel"
 short_desc="Cross-platform application and UI framework - charts"
@@ -12,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 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=672762c5f641ccc88a30aeedefb63f03c0f837649b334f46eea57592e87e36cd
+checksum=f330cc2328729104d79b2088990ce0840f2da89d9d989360d4c352e797d27cf7
 
 qt6-charts-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
@@ -20,8 +19,11 @@ qt6-charts-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From 50ed5be643e1b21d109493efece2792e31ed056c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:07 +0700
Subject: [PATCH 03/34] qt6-declarative: update to 6.3.1.

---
 .../patches/bin-qml-location.patch            | 193 ++++++++++++++++++
 .../patches/qml-blacklist-more.patch          |  48 +++++
 .../patches/qml-broken-test.patch             |  64 ++++++
 srcpkgs/qt6-declarative/template              |  32 ++-
 4 files changed, 331 insertions(+), 6 deletions(-)
 create mode 100644 srcpkgs/qt6-declarative/patches/bin-qml-location.patch
 create mode 100644 srcpkgs/qt6-declarative/patches/qml-blacklist-more.patch
 create mode 100644 srcpkgs/qt6-declarative/patches/qml-broken-test.patch

diff --git a/srcpkgs/qt6-declarative/patches/bin-qml-location.patch b/srcpkgs/qt6-declarative/patches/bin-qml-location.patch
new file mode 100644
index 000000000000..f92e34632502
--- /dev/null
+++ b/srcpkgs/qt6-declarative/patches/bin-qml-location.patch
@@ -0,0 +1,193 @@
+--- a/tests/auto/qml/debugger/qqmldebugtranslationclient/tst_qqmldebugtranslationclient.cpp
++++ b/tests/auto/qml/debugger/qqmldebugtranslationclient/tst_qqmldebugtranslationclient.cpp
+@@ -94,7 +94,11 @@ private:
+     {
+         m_currentOutputLine = 0;
+ 
++#ifdef QT_DECLARATIVE_BIN_PATH
++        auto executable = QT_DECLARATIVE_BIN_PATH "/qml";
++#else
+         auto executable = QLibraryInfo::path(QLibraryInfo::BinariesPath) + "/qml";
++#endif
+         auto services = QQmlDebugTranslationServiceImpl::s_key;
+         auto extraArgs = testFile(QMLFILE);
+         auto block = true;
+--- a/tests/auto/qml/debugger/qqmlinspector/tst_qqmlinspector.cpp
++++ b/tests/auto/qml/debugger/qqmlinspector/tst_qqmlinspector.cpp
+@@ -72,7 +72,12 @@ tst_QQmlInspector::tst_QQmlInspector()
+ QQmlDebugTest::ConnectResult tst_QQmlInspector::startQmlProcess(const QString &qmlFile,
+                                                                 bool restrictServices)
+ {
+-    return QQmlDebugTest::connectTo(QLibraryInfo::path(QLibraryInfo::BinariesPath) + "/qml",
++#ifdef QT_DECLARATIVE_BIN_PATH
++    auto executable = QT_DECLARATIVE_BIN_PATH "/qml";
++#else
++    auto executable = QLibraryInfo::path(QLibraryInfo::BinariesPath) + "/qml";
++#endif
++    return QQmlDebugTest::connectTo(executable,
+                                   restrictServices ? QStringLiteral("QmlInspector") : QString(),
+                                   testFile(qmlFile), true);
+ }
+--- a/tests/auto/qml/debugger/qqmlprofilerservice/tst_qqmlprofilerservice.cpp
++++ b/tests/auto/qml/debugger/qqmlprofilerservice/tst_qqmlprofilerservice.cpp
+@@ -204,10 +204,16 @@ private:
+         CheckType = CheckMessageType | CheckDetailType | CheckLine | CheckColumn | CheckFileEndsWith
+     };
+ 
++#ifdef QT_DECLARATIVE_BIN_PATH
++#define QMLSCENE_PATH QT_DECLARATIVE_BIN_PATH "/qml"
++#else
++#define QMLSCENE_PATH QLibraryInfo::path(QLibraryInfo::BinariesPath) + "/qmlscene"
++#endif
++
+     ConnectResult connectTo(bool block, const QString &file, bool recordFromStart = true,
+                           uint flushInterval = 0, bool restrictServices = true,
+                           const QString &executable
+-            = QLibraryInfo::path(QLibraryInfo::BinariesPath) + "/qmlscene");
++            = QMLSCENE_PATH);
+     void checkProcessTerminated();
+     void checkTraceReceived();
+     void checkJsHeap();
+--- a/tests/auto/qml/debugger/qqmldebuggingenabler/qqmldebuggingenabler/tst_qqmldebuggingenabler.cpp
++++ b/tests/auto/qml/debugger/qqmldebuggingenabler/qqmldebuggingenabler/tst_qqmldebuggingenabler.cpp
+@@ -110,8 +110,13 @@ void tst_QQmlDebuggingEnabler::qmlscene(
+     QFETCH(bool, blockMode);
+     QFETCH(QStringList, services);
+ 
+-    m_process = new QQmlDebugProcess(
+-                QLibraryInfo::path(QLibraryInfo::BinariesPath) + "/qmlscene", this);
++#ifdef QT_DECLARATIVE_BIN_PATH
++    auto executable = QT_DECLARATIVE_BIN_PATH "/qmlscene";
++#else
++    auto executable = QLibraryInfo::path(QLibraryInfo::BinariesPath) + "/qmlscene";
++#endif
++
++    m_process = new QQmlDebugProcess(executable, this);
+     m_process->setMaximumBindErrors(1);
+     m_process->start(QStringList()
+                      << QString::fromLatin1("-qmljsdebugger=connector:%1%2%3%4")
+--- a/tests/auto/qml/debugger/qqmlenginecontrol/tst_qqmlenginecontrol.cpp
++++ b/tests/auto/qml/debugger/qqmlenginecontrol/tst_qqmlenginecontrol.cpp
+@@ -91,7 +91,12 @@ tst_QQmlEngineControl::tst_QQmlEngineCon
+ QQmlDebugTest::ConnectResult tst_QQmlEngineControl::connectTo(const QString &file,
+                                                             bool restrictServices)
+ {
+-    return QQmlDebugTest::connectTo(QLibraryInfo::path(QLibraryInfo::BinariesPath) + "/qmlscene",
++#ifdef QT_DECLARATIVE_BIN_PATH
++    auto executable = QT_DECLARATIVE_BIN_PATH "/qmlscene";
++#else
++    auto executable = QLibraryInfo::path(QLibraryInfo::BinariesPath) + "/qmlscene";
++#endif
++    return QQmlDebugTest::connectTo(executable,
+                                   restrictServices ? QStringLiteral("EngineControl") : QString(),
+                                   testFile(file), true);
+ }
+--- a/tests/auto/qml/debugger/qqmlenginedebuginspectorintegrationtest/tst_qqmlenginedebuginspectorintegration.cpp
++++ b/tests/auto/qml/debugger/qqmlenginedebuginspectorintegrationtest/tst_qqmlenginedebuginspectorintegration.cpp
+@@ -96,7 +96,11 @@ tst_QQmlEngineDebugInspectorIntegration:
+ QQmlDebugTest::ConnectResult tst_QQmlEngineDebugInspectorIntegration::init(bool restrictServices)
+ {
+     return QQmlDebugTest::connectTo(
++#ifdef QT_DECLARATIVE_BIN_PATH
++                QT_DECLARATIVE_BIN_PATH "/qml",
++#else
+                 QLibraryInfo::path(QLibraryInfo::BinariesPath) + "/qml",
++#endif
+                 restrictServices ? QStringLiteral("QmlDebugger,QmlInspector") : QString(),
+                 testFile("qtquick2.qml"), true);
+ }
+--- a/tests/auto/qml/debugger/qqmlpreview/tst_qqmlpreview.cpp
++++ b/tests/auto/qml/debugger/qqmlpreview/tst_qqmlpreview.cpp
+@@ -81,7 +81,12 @@ tst_QQmlPreview::tst_QQmlPreview()
+ 
+ QQmlDebugTest::ConnectResult tst_QQmlPreview::startQmlProcess(const QString &qmlFile)
+ {
+-    return QQmlDebugTest::connectTo(QLibraryInfo::path(QLibraryInfo::BinariesPath) + "/qml",
++#ifdef QT_DECLARATIVE_BIN_PATH
++    auto executable = QT_DECLARATIVE_BIN_PATH "/qml";
++#else
++    auto executable = QLibraryInfo::path(QLibraryInfo::BinariesPath) + "/qml";
++#endif
++    return QQmlDebugTest::connectTo(executable,
+                                   QStringLiteral("QmlPreview"), testFile(qmlFile), true);
+ }
+ 
+--- a/tests/auto/qml/qmlformat/tst_qmlformat.cpp
++++ b/tests/auto/qml/qmlformat/tst_qmlformat.cpp
+@@ -88,7 +88,11 @@ TestQmlformat::TestQmlformat()
+ void TestQmlformat::initTestCase()
+ {
+     QQmlDataTest::initTestCase();
++#ifdef QT_DECLARATIVE_BIN_PATH
++    m_qmlformatPath = QLatin1String(QT_DECLARATIVE_BIN_PATH "/qmlformat");
++#else
+     m_qmlformatPath = QLibraryInfo::path(QLibraryInfo::BinariesPath) + QLatin1String("/qmlformat");
++#endif
+ #ifdef Q_OS_WIN
+     m_qmlformatPath += QLatin1String(".exe");
+ #endif
+--- a/tests/auto/qml/qmlimportscanner/tst_qmlimportscanner.cpp
++++ b/tests/auto/qml/qmlimportscanner/tst_qmlimportscanner.cpp
+@@ -63,8 +63,12 @@ TestQmlimportscanner::TestQmlimportscann
+ void TestQmlimportscanner::initTestCase()
+ {
+     QQmlDataTest::initTestCase();
++#ifdef QT_DECLARATIVE_LIBEXEC_PATH
++    m_qmlimportscannerPath = QLatin1String(QT_DECLARATIVE_LIBEXEC_PATH "/qmlimportscanner");
++#else
+     m_qmlimportscannerPath = QLibraryInfo::path(QLibraryInfo::LibraryExecutablesPath)
+             + QLatin1String("/qmlimportscanner");
++#endif
+ #ifdef Q_OS_WIN
+     m_qmlimportscannerPath += QLatin1String(".exe");
+ #endif
+--- a/tests/auto/qml/qmllint/tst_qmllint.cpp
++++ b/tests/auto/qml/qmllint/tst_qmllint.cpp
+@@ -136,11 +136,17 @@ TestQmllint::TestQmllint()
+ void TestQmllint::initTestCase()
+ {
+     QQmlDataTest::initTestCase();
++#ifdef QT_DECLARATIVE_BIN_PATH
++    m_qmllintPath = QLatin1String(QT_DECLARATIVE_BIN_PATH "/qmllint");
++    m_qmljsrootgenPath = QLatin1String(QT_DECLARATIVE_BIN_PATH "/qmljsrootgen");
++    m_qmltyperegistrarPath = QLatin1String(QT_DECLARATIVE_BIN_PATH "/qmltyperegistrar");
++#else
+     m_qmllintPath = QLibraryInfo::path(QLibraryInfo::BinariesPath) + QLatin1String("/qmllint");
+     m_qmljsrootgenPath = QLibraryInfo::path(QLibraryInfo::LibraryExecutablesPath)
+             + QLatin1String("/qmljsrootgen");
+     m_qmltyperegistrarPath = QLibraryInfo::path(QLibraryInfo::LibraryExecutablesPath)
+             + QLatin1String("/qmltyperegistrar");
++#endif
+ #ifdef Q_OS_WIN
+     m_qmllintPath += QLatin1String(".exe");
+     m_qmljsrootgenPath += QLatin1String(".exe");
+--- a/tests/auto/qml/debugger/qdebugmessageservice/tst_qdebugmessageservice.cpp
++++ b/tests/auto/qml/debugger/qdebugmessageservice/tst_qdebugmessageservice.cpp
+@@ -143,7 +143,12 @@ tst_QDebugMessageService::tst_QDebugMess
+ 
+ void tst_QDebugMessageService::retrieveDebugOutput()
+ {
+-    QCOMPARE(QQmlDebugTest::connectTo(QLibraryInfo::path(QLibraryInfo::BinariesPath) + "/qml",
++#ifdef QT_DECLARATIVE_BIN_PATH
++    auto executable = QT_DECLARATIVE_BIN_PATH "/qml";
++#else
++    auto executable = QLibraryInfo::path(QLibraryInfo::BinariesPath) + "/qml";
++#endif
++    QCOMPARE(QQmlDebugTest::connectTo(executable,
+                                     QString(), testFile(QMLFILE), true), ConnectSuccess);
+ 
+     QTRY_VERIFY(m_client->logBuffer.size() >= 2);
+--- a/tests/auto/qml/qmlplugindump/tst_qmlplugindump.cpp
++++ b/tests/auto/qml/qmlplugindump/tst_qmlplugindump.cpp
+@@ -62,7 +62,11 @@ tst_qmlplugindump::tst_qmlplugindump()
+ void tst_qmlplugindump::initTestCase()
+ {
+     QQmlDataTest::initTestCase();
++#ifdef QT_DECLARATIVE_BIN_PATH
++    qmlplugindumpPath = QT_DECLARATIVE_BIN_PATH;
++#else
+     qmlplugindumpPath = QLibraryInfo::path(QLibraryInfo::BinariesPath);
++#endif
+ 
+ #if defined(Q_OS_WIN)
+     qmlplugindumpPath += QLatin1String("/qmlplugindump.exe");
diff --git a/srcpkgs/qt6-declarative/patches/qml-blacklist-more.patch b/srcpkgs/qt6-declarative/patches/qml-blacklist-more.patch
new file mode 100644
index 000000000000..2d2629bf9df9
--- /dev/null
+++ b/srcpkgs/qt6-declarative/patches/qml-blacklist-more.patch
@@ -0,0 +1,48 @@
+--- a/tests/auto/quickcontrols2/controls/universal/BLACKLIST
++++ b/tests/auto/quickcontrols2/controls/universal/BLACKLIST
+@@ -6,5 +6,6 @@
+ 
+ # QTBUG-95750
+ [RangeSlider::test_overlappingHandles]
+ b2qt
+ qnx
++linux
+--- a/tests/auto/quickcontrols2/controls/basic/BLACKLIST
++++ b/tests/auto/quickcontrols2/controls/basic/BLACKLIST
+@@ -6,5 +6,6 @@
+ 
+ # QTBUG-95750
+ [RangeSlider::test_overlappingHandles]
+ b2qt
+ qnx
++linux
+--- a/tests/auto/quickcontrols2/controls/fusion/BLACKLIST
++++ b/tests/auto/quickcontrols2/controls/fusion/BLACKLIST
+@@ -6,5 +6,6 @@
+ 
+ # QTBUG-95750
+ [RangeSlider::test_overlappingHandles]
+ b2qt
+ qnx
++linux
+--- a/tests/auto/quickcontrols2/controls/imagine/BLACKLIST
++++ b/tests/auto/quickcontrols2/controls/imagine/BLACKLIST
+@@ -6,8 +6,9 @@
+ 
+ # QTBUG-95750
+ [RangeSlider::test_overlappingHandles]
+ b2qt
+ qnx
++linux
+ 
+ # QTBUG-101704
+ [ToolTip::test_attachedSizeBug]
+--- a/tests/auto/quickcontrols2/controls/material/BLACKLIST
++++ b/tests/auto/quickcontrols2/controls/material/BLACKLIST
+@@ -6,5 +6,6 @@
+ 
+ # QTBUG-95750
+ [RangeSlider::test_overlappingHandles]
+ b2qt
+ qnx
++linux
diff --git a/srcpkgs/qt6-declarative/patches/qml-broken-test.patch b/srcpkgs/qt6-declarative/patches/qml-broken-test.patch
new file mode 100644
index 000000000000..4d44e90b678c
--- /dev/null
+++ b/srcpkgs/qt6-declarative/patches/qml-broken-test.patch
@@ -0,0 +1,64 @@
+--- a/tests/auto/quickcontrols2/controls/data/tst_rangeslider.qml
++++ b/tests/auto/quickcontrols2/controls/data/tst_rangeslider.qml
+@@ -649,61 +649,6 @@ TestCase {
+     }
+ 
+     function test_overlappingHandles() {
+-        var control = createTemporaryObject(sliderComponent, testCase)
+-        verify(control)
+-
+-        // By default, we force the second handle to be after the first in
+-        // terms of stacking order *and* z value.
+-        compare(control.second.handle.z, 1)
+-        compare(control.first.handle.z, 0)
+-        control.first.value = 0
+-        control.second.value = 0
+-
+-        // When both handles overlap, only the handle with the higher Z value
+-        // should be hovered.
+-        mouseMove(control, control.second.handle.x, control.second.handle.y)
+-        compare(control.second.hovered, true)
+-        compare(control.first.hovered, false)
+-
+-        // Both are at the same position, so it doesn't matter whose coordinates we use.
+-        mousePress(control, control.first.handle.x, control.first.handle.y, Qt.LeftButton)
+-        verify(control.second.pressed)
+-        compare(control.second.handle.z, 1)
+-        compare(control.first.handle.z, 0)
+-
+-        // Move the second handle out of the way.
+-        mouseMove(control, control.width, control.first.handle.y)
+-        mouseRelease(control, control.width, control.first.handle.y, Qt.LeftButton)
+-        verify(!control.second.pressed)
+-        compare(control.second.value, 1.0)
+-        compare(control.second.handle.z, 1)
+-        compare(control.first.handle.z, 0)
+-
+-        // The first handle should not be hovered.
+-        compare(control.first.hovered, false)
+-
+-        // Move the first handle on top of the second.
+-        mousePress(control, control.first.handle.x, control.first.handle.y, Qt.LeftButton)
+-        verify(control.first.pressed)
+-        compare(control.first.handle.z, 1)
+-        compare(control.second.handle.z, 0)
+-
+-        mouseMove(control, control.width, control.first.handle.y)
+-        mouseRelease(control, control.width, control.first.handle.y, Qt.LeftButton)
+-        verify(!control.first.pressed)
+-        compare(control.first.handle.z, 1)
+-        compare(control.second.handle.z, 0)
+-
+-        // The most recently pressed handle (the first) should have the higher z value.
+-        mousePress(control, control.first.handle.x, control.first.handle.y, Qt.LeftButton)
+-        verify(control.first.pressed)
+-        compare(control.first.handle.z, 1)
+-        compare(control.second.handle.z, 0)
+-
+-        mouseRelease(control, control.first.handle.x, control.first.handle.y, Qt.LeftButton)
+-        verify(!control.first.pressed)
+-        compare(control.first.handle.z, 1)
+-        compare(control.second.handle.z, 0)
+     }
+ 
+     function test_keys_data() {
diff --git a/srcpkgs/qt6-declarative/template b/srcpkgs/qt6-declarative/template
index e0bd28d9e383..8a190dfc35bc 100644
--- a/srcpkgs/qt6-declarative/template
+++ b/srcpkgs/qt6-declarative/template
@@ -1,23 +1,22 @@
 # Template file for 'qt6-declarative'
 pkgname=qt6-declarative
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qtdeclarative-everywhere-src-${version}"
 build_style=cmake
-configure_args=" -DQT_HOST_PATH=/usr"
 hostmakedepends="qt6-base-devel perl pkg-config wayland-devel
  qt6-shadertools-devel"
-makedepends="qt6-base-devel Vulkan-Headers"
+makedepends="qt6-base-devel Vulkan-Headers qt6-shadertools-devel"
 short_desc="Cross-platform application and UI framework - Declarative"
 maintainer="John <me@johnnynator.dev>"
 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=d294b029dc2b2d4f65da516fdc3b8088d32643eb7ff77db135a8b9ce904caa37
+checksum=03e7694123820fcca397f95ce312e0b7f3039493c8754c836da098a1a04346e8
 replaces="qt6-quickcontrols2>=0"
 
 if [ "$CROSS_BUILD" ]; then
-	configure_args+=" -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true"
+	configure_args="-DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true"
 	hostmakedepends+=" qt6-declarative-devel"
 fi
 
@@ -29,13 +28,31 @@ if [ "$XBPS_TARGET_ENDIAN" = "be" ]; then
 	broken="shader compilation fails"
 fi
 
+pre_configure() {
+	CXXFLAGS+=" '-DQT_DECLARATIVE_BIN_PATH=\"${wrksrc}/build/lib/qt6/bin\"'"
+	CXXFLAGS+=" '-DQT_DECLARATIVE_LIBEXEC_PATH=\"${wrksrc}/build/lib/qt6/libexec\"'"
+}
+
 pre_check() {
 	export QML2_IMPORT_PATH="$wrksrc/build/lib/qt6/qml"
 }
 
 do_check() {
 	cd build
-	ctest -E '(tst_qqmllocale|text|tst_qquickwidget)'
+	local broken="tst_qqmllocale|text|tst_qquickwidget"
+	# requires qt6-declarative installed
+	broken+="|module_includes|cmake_tooling_imports|empty_qmldir"
+	broken+="|qtquickcompiler|qmlquery"
+	# Could work if Qt6Quick.so.6 could be found by qml
+	broken+="|tst_qqmldebugjs|tst_qqmlinspector"
+	broken+="|tst_qqmlprofilerservice|tst_qqmljsscope"
+	broken+="|tst_qqmlpreview|tst_qmllint|tst_qmlformat"
+	# can't find the source
+	broken+="|tst_qmltc_qprocess"
+	broken+="|tst_qquickfiledialogimpl"
+	broken+="|tst_qquickfolderdialogimpl"
+	broken+="|tst_qmlimportscanner|tst_qqmlextensionplugin"
+	ctest -E "($broken)"
 }
 
 qt6-declarative-tools_package() {
@@ -60,11 +77,14 @@ qt6-declarative-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/libQt6QuickTest.so.*"
 		vmove usr/lib/qt6/qml/QtTest
 		vmove usr/lib/qt6/bin/qmltestrunner
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From 7cd2db706780ebbfaea70d1bb69e71923aff5d03 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:07 +0700
Subject: [PATCH 04/34] qt6-imageformats: update to 6.3.1.

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

diff --git a/srcpkgs/qt6-imageformats/template b/srcpkgs/qt6-imageformats/template
index eaca95243c48..9f6d2fb66776 100644
--- a/srcpkgs/qt6-imageformats/template
+++ b/srcpkgs/qt6-imageformats/template
@@ -1,10 +1,9 @@
 # Template file for 'qt6-imageformats'
 pkgname=qt6-imageformats
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qtimageformats-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr"
 hostmakedepends="perl qt6-base-devel"
 makedepends="qt6-base-devel"
 short_desc="Cross-platform application and UI framework - imageformats"
@@ -12,4 +11,4 @@ maintainer="John <me@johnnynator.dev>"
 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=025d0d17ed75b42a7eb6b523731ab8f17025421a8810cade25caffe05d93abef
+checksum=ad0312b8dfbbb67f729bfadbfcd47246ee4a128b717731ba158c41d01fde212f

From ec5ecd44b901015385bcd33b7c7b5cbf880a4531 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:07 +0700
Subject: [PATCH 05/34] qt6-location: update to 6.3.1.

---
 srcpkgs/qt6-location/template | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/qt6-location/template b/srcpkgs/qt6-location/template
index b7397f5f8942..9f26103259ad 100644
--- a/srcpkgs/qt6-location/template
+++ b/srcpkgs/qt6-location/template
@@ -1,10 +1,9 @@
 # Template file for 'qt6-location'
 pkgname=qt6-location
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qtpositioning-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr"
 hostmakedepends="perl qt6-base-devel qt6-declarative-devel"
 makedepends="qt6-serialport-devel qt6-declarative-devel GConf-devel"
 short_desc="Cross-platform application and UI framework - location"
@@ -12,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 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=e9ed50f6b245a346db34d625d0012774ef0ec8e7fd65037127ec26758708236e
+checksum=06788e4ecae1920094b30e4046f0abd23c8189d8a51e9c939b02f0b6abe2e86c
 
 qt6-location-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel>=${version}_1"
@@ -20,8 +19,11 @@ qt6-location-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From db570661ed5fb021ddb9f4df4d57075cd0a4fe2c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:08 +0700
Subject: [PATCH 06/34] qt6-lottie: update to 6.3.1.

---
 srcpkgs/qt6-lottie/template | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/qt6-lottie/template b/srcpkgs/qt6-lottie/template
index 1c97cd5f4f32..a7beb62ec368 100644
--- a/srcpkgs/qt6-lottie/template
+++ b/srcpkgs/qt6-lottie/template
@@ -1,10 +1,9 @@
 # Template file for 'qt6-lottie'
 pkgname=qt6-lottie
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qtlottie-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr"
 hostmakedepends="perl qt6-base-devel"
 makedepends="qt6-declarative-devel"
 short_desc="Cross-platform application and UI framework - lottie"
@@ -12,10 +11,10 @@ maintainer="John <me@johnnynator.dev>"
 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=39db570bbba5b527a1eb6a5774bed47398ace2f7217bbf45b1194ada6cf97deb
+checksum=740ba76999124d5e1a85ef3d01c69976bb8557862b6b26bf48b357fe0cab1cf5
 
 if [ "$XBPS_CHECK_PKGS" ]; then
-	configure_args+=" -DQT_BUILD_TESTS=ON"
+	configure_args="-DQT_BUILD_TESTS=ON"
 fi
 
 pre_check() {
@@ -28,8 +27,10 @@ qt6-lottie-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
 		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From 1e749c53530936b63830e513f148949e69319d8e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:08 +0700
Subject: [PATCH 07/34] qt6-networkauth: update to 6.3.1.

---
 srcpkgs/qt6-networkauth/template | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/qt6-networkauth/template b/srcpkgs/qt6-networkauth/template
index e934beada9b0..1454ceb4a525 100644
--- a/srcpkgs/qt6-networkauth/template
+++ b/srcpkgs/qt6-networkauth/template
@@ -1,10 +1,9 @@
 # Template file for 'qt6-networkauth'
 pkgname=qt6-networkauth
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qtnetworkauth-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr"
 hostmakedepends="perl qt6-base-devel"
 makedepends="qt6-base-devel"
 short_desc="Cross-platform application and UI framework - networkauth"
@@ -12,10 +11,10 @@ maintainer="John <me@johnnynator.dev>"
 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=203a98942919028520038f90a20cd7ee32b537233545d11e429c3e2c1ad9069f
+checksum=d60f54b9d4509fa8bdbf1990bc91f6e260e38cdb57a7b8119fa3861bc5d2fb2a
 
 if [ "$XBPS_CHECK_PKGS" ]; then
-	configure_args+=" -DQT_BUILD_TESTS=ON"
+	configure_args="-DQT_BUILD_TESTS=ON"
 fi
 
 qt6-networkauth-devel_package() {
@@ -24,8 +23,11 @@ qt6-networkauth-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From 2434dccca8a117bc62d46f33a60b96b7432c9d42 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:08 +0700
Subject: [PATCH 08/34] qt6-qt5compat: update to 6.3.1.

---
 srcpkgs/qt6-qt5compat/template | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/qt6-qt5compat/template b/srcpkgs/qt6-qt5compat/template
index 7fcd5ad5080e..a62573cfabfa 100644
--- a/srcpkgs/qt6-qt5compat/template
+++ b/srcpkgs/qt6-qt5compat/template
@@ -1,10 +1,9 @@
 # Template file for 'qt6-qt5compat'
 pkgname=qt6-qt5compat
-version=6.3.0
-revision=2
+version=6.3.1
+revision=1
 wrksrc="qt5compat-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr"
 hostmakedepends="qt6-base-devel qt6-declarative-devel perl pkg-config"
 makedepends="qt6-base-devel qt6-declarative-devel"
 short_desc="Cross-platform application and UI framework - Qt5 Compatibilty Component"
@@ -12,10 +11,10 @@ maintainer="John <me@johnnynator.dev>"
 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=2b199be780c50d9214512b922d94cb240b0412fd63f459e356b76102cad1713e
+checksum=a43ec62bd778eaecf88ad7847118d1c2a471b0fcb820f93beb311d7ab9566cfd
 
 if [ "$XBPS_CHECK_PKGS" ]; then
-	configure_args+=" -DQT_BUILD_TESTS=ON"
+	configure_args="-DQT_BUILD_TESTS=ON"
 fi
 
 qt6-qt5compat-devel_package() {
@@ -24,8 +23,11 @@ qt6-qt5compat-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From 8baa5c7324b04548464a2d18ed1d12d472eb2d84 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:08 +0700
Subject: [PATCH 09/34] qt6-quick3d: update to 6.3.1.

---
 srcpkgs/qt6-quick3d/template | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/qt6-quick3d/template b/srcpkgs/qt6-quick3d/template
index 0f7ef336a3ff..685ce9bc0e90 100644
--- a/srcpkgs/qt6-quick3d/template
+++ b/srcpkgs/qt6-quick3d/template
@@ -1,19 +1,23 @@
 # Template file for 'qt6-quick3d'
 pkgname=qt6-quick3d
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qtquick3d-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr "
 hostmakedepends="perl qt6-base-devel qt6-declarative-devel qt6-shadertools-devel"
 makedepends="qt6-base-devel qt6-declarative-devel qt6-shadertools-devel
- libassimp-devel"
+ qt6-quicktimeline libassimp-devel"
 short_desc="Cross-platform application and UI framework - Quick3d"
 maintainer="John <me@johnnynator.dev>"
 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=0ad05bd1ee1f784b18220a2d2625ee8de91662c88fdc7b798662953d86eb327e
+checksum=2fa766ee47b8c07412b3b755206ada0715fb07813b64ed069e7205044c061256
+
+if [ "$CROSS_BUILD" ]; then
+	hostmakedepends+=" qt6-quick3d-devel"
+	configure_args="-DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true"
+fi
 
 if [ "$XBPS_TARGET_ENDIAN" = "be" ]; then
 	# possibly a qt6-shadertools bug, actually
@@ -26,9 +30,12 @@ qt6-quick3d-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
-		vmove usr/lib/qt6/mkspecs
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/bin
+		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From f795f480e90fd073de895d8386b5da0ec3ce4fbc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:09 +0700
Subject: [PATCH 10/34] qt6-quicktimeline: update to 6.3.1.

---
 common/shlibs                      | 1 +
 srcpkgs/qt6-quicktimeline/template | 7 +++----
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 61924610cc52..26f10d604be9 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2045,6 +2045,7 @@ libQt6Quick3DIblBaker.so.6 qt6-quick3d-6.0.3_1
 libQt6Quick3DParticles.so.6 qt6-quick3d-6.1.0_1
 libQt6Quick3DGlslParser.so.6 qt6-quick3d-6.3.0_1
 libQt6Quick3DAssetUtils.so.6 qt6-quick3d-6.1.0_1
+libQt6QuickTimeline.so.6 qt6-quicktimeline-6.3.0_1
 libQt6QuickControls2Impl.so.6 qt6-declarative-6.0.0_1
 libQt6QuickControls2.so.6 qt6-declarative-6.0.0_1
 libQt6QuickTemplates2.so.6 qt6-declarative-6.0.0_1
diff --git a/srcpkgs/qt6-quicktimeline/template b/srcpkgs/qt6-quicktimeline/template
index 15aa7a8e5819..bf02e043c4a5 100644
--- a/srcpkgs/qt6-quicktimeline/template
+++ b/srcpkgs/qt6-quicktimeline/template
@@ -1,10 +1,9 @@
 # Template file for 'qt6-quicktimeline'
 pkgname=qt6-quicktimeline
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qtquicktimeline-everywhere-src-${version/rc/-rc}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr "
 hostmakedepends="perl qt6-base-devel qt6-declarative-devel"
 makedepends="qt6-base-devel qt6-declarative-devel"
 short_desc="Cross-platform application and UI framework - quicktimeline"
@@ -12,10 +11,10 @@ maintainer="John <me@johnnynator.dev>"
 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=9ff0a931159efc6be5bd9f8a1e4a16a70e2dab37cf22ad85c6d330ccfdf31c1a
+checksum=58a13cf0ce8e7755639f20684078733af24f5a317f6ddb40d6079c8c5a28ebbe
 
 if [ "$XBPS_CHECK_PKGS" ]; then
-	configure_args+=" -DQT_BUILD_TESTS=ON"
+	configure_args="-DQT_BUILD_TESTS=ON"
 fi
 
 pre_check() {

From 6e0ecefa90b22d3c7f4e598c8e756e86fa490d5d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:09 +0700
Subject: [PATCH 11/34] qt6-scxml: update to 6.3.1.

---
 srcpkgs/qt6-scxml/template | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/qt6-scxml/template b/srcpkgs/qt6-scxml/template
index 112baca0ab83..d17ccf16400a 100644
--- a/srcpkgs/qt6-scxml/template
+++ b/srcpkgs/qt6-scxml/template
@@ -1,10 +1,10 @@
 # Template file for 'qt6-scxml'
 pkgname=qt6-scxml
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qtscxml-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr"
+configure_args="-DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true"
 hostmakedepends="perl qt6-declarative-devel"
 makedepends="qt6-declarative-devel"
 short_desc="Cross-platform application and UI framework - scxml"
@@ -12,7 +12,11 @@ maintainer="John <me@johnnynator.dev>"
 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=09b0dbd6ac367920fb1ba96a39dcd4c9d33eb0820dcc79538992825d588a70f0
+checksum=01bc154d6163d1f049f4e1e76658a044730ace7b0a5be35c9a46fcd1396f8619
+
+if [ "$CROSS_BUILD" ]; then
+	hostmakedepends+=" qt6-remoteobjects"
+fi
 
 if [ "$XBPS_CHECK_PKGS" ]; then
 	configure_args+=" -DQT_BUILD_TESTS=ON"
@@ -24,8 +28,11 @@ qt6-scxml-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From fd6e41c59d9aea9596d9dc512263a7ba58b6a3c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:09 +0700
Subject: [PATCH 12/34] qt6-serialport: update to 6.3.1.

---
 srcpkgs/qt6-serialport/template | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/qt6-serialport/template b/srcpkgs/qt6-serialport/template
index 0804671ca57b..2de9d6364a5c 100644
--- a/srcpkgs/qt6-serialport/template
+++ b/srcpkgs/qt6-serialport/template
@@ -1,10 +1,9 @@
 # Template file for 'qt6-serialport'
 pkgname=qt6-serialport
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qtserialport-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr"
 hostmakedepends="perl qt6-base-devel pkg-config"
 makedepends="qt6-base-devel"
 short_desc="Cross-platform application and UI framework - serialport"
@@ -12,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 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=eebd6934d48cc044b8c87795a4fd91bb81f7195d4b5a2ddb12802f343d5db64f
+checksum=4eb6d80e65799dd2e0318df4dfba14173c1929e861718cda9bedca24253b616e
 
 qt6-serialport-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel>=${version}_1"
@@ -20,8 +19,11 @@ qt6-serialport-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From 6367306cdd254c8399ea6520278ca96907dd6a11 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:09 +0700
Subject: [PATCH 13/34] qt6-shadertools: update to 6.3.1.

---
 srcpkgs/qt6-shadertools/template | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/qt6-shadertools/template b/srcpkgs/qt6-shadertools/template
index 9c1ec210a96a..3716333c459b 100644
--- a/srcpkgs/qt6-shadertools/template
+++ b/srcpkgs/qt6-shadertools/template
@@ -1,10 +1,9 @@
 # Template file for 'qt6-shadertools'
 pkgname=qt6-shadertools
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qtshadertools-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr "
 hostmakedepends="perl qt6-base-devel"
 makedepends="qt6-base-devel"
 short_desc="Cross-platform application and UI framework - shadertools"
@@ -12,7 +11,13 @@ maintainer="John <me@johnnynator.dev>"
 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=5498959b9d37c254bd126ab1320cf86aeb8a31b3ea7e51db666a8f9698afbd6c
+checksum=59b77176961528cc7b0c9325134655e273aa87b4cb386c0f4683d8f2852e435a
+
+if [ "$CROSS_BUILD" ]; then
+	configure_args="-DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true"
+	hostmakedepends+=" qt6-shadertools-devel"
+fi
+
 
 qt6-shadertools-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel>=${version}_1"
@@ -20,8 +25,11 @@ qt6-shadertools-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From 326eb9d92fe8783229193833b6461bc26b5a160b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:09 +0700
Subject: [PATCH 14/34] qt6-svg: update to 6.3.1.

---
 srcpkgs/qt6-svg/template | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/qt6-svg/template b/srcpkgs/qt6-svg/template
index aa8e6b745109..309b0988e435 100644
--- a/srcpkgs/qt6-svg/template
+++ b/srcpkgs/qt6-svg/template
@@ -1,10 +1,9 @@
 # Template file for 'qt6-svg'
 pkgname=qt6-svg
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qtsvg-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr "
 hostmakedepends="qt6-base-devel perl"
 makedepends="qt6-base-devel"
 short_desc="Cross-platform application and UI framework (QT6) - qt6-svg component"
@@ -12,10 +11,10 @@ maintainer="John <me@johnnynator.dev>"
 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=3164504d7e3f640439308235739b112605ab5fc9cc517ca0b28f9fb93a8db0e3
+checksum=7b19f418e6f7b8e23344082dd04440aacf5da23c5a73980ba22ae4eba4f87df7
 
 if [ "$XBPS_CHECK_PKGS" ]; then
-	configure_args+=" -DQT_BUILD_TESTS=ON"
+	configure_args="-DQT_BUILD_TESTS=ON"
 fi
 
 do_check() {
@@ -29,8 +28,11 @@ qt6-svg-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From 8409f900c37eb42b551bdf87ad83101667c39efe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:10 +0700
Subject: [PATCH 15/34] qt6-tools: update to 6.3.1.

---
 srcpkgs/qt6-tools/template | 23 ++++++++++++++++++-----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/qt6-tools/template b/srcpkgs/qt6-tools/template
index f875dff5c046..fd311176e31d 100644
--- a/srcpkgs/qt6-tools/template
+++ b/srcpkgs/qt6-tools/template
@@ -1,23 +1,33 @@
 # Template file for 'qt6-tools'
 pkgname=qt6-tools
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qttools-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr "
-hostmakedepends="qt6-base-devel perl"
-makedepends="qt6-base-devel libatomic-devel"
+configure_args="-DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=TRUE
+ -DQT_BUILD_SHARED_LIBS=ON -DQT_FEATURE_assistant=ON"
+hostmakedepends="qt6-base-devel perl qt6-plugin-sqlite"
+makedepends="qt6-base-devel libatomic-devel qt6-plugin-sqlite"
 short_desc="Cross-platform application and UI framework (QT6) - qt6-tools component"
 maintainer="John <me@johnnynator.dev>"
 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/qttools-everywhere-src-${version}.tar.xz"
-checksum=fce94688ea925782a2879347584991f854630daadba6c52aed6d93e33cd0b19c
+checksum=c412750f2aa3beb93fce5f30517c607f55daaeb7d0407af206a8adf917e126c1
+
+if [ "$CROSS_BUILD" ]; then
+	hostmakedepends+=" qt6-tools-devel"
+fi
+
 
 if [ "$XBPS_CHECK_PKGS" ]; then
 	configure_args+=" -DQT_BUILD_TESTS=ON"
 fi
 
+post_build() {
+	ninja -C build ${makejobs} lib/qt6/libexec/qhelpgenerator
+}
+
 do_check() {
 	cd build
 	# Some of these tests expect that qt6-tools is already
@@ -31,8 +41,11 @@ qt6-tools-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From 4ecbb5f9e623ef2b18a02ea3859e5bf528f35984 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:10 +0700
Subject: [PATCH 16/34] qt6-translations: update to 6.3.1.

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

diff --git a/srcpkgs/qt6-translations/template b/srcpkgs/qt6-translations/template
index be0a74ca74e2..1b917ccb3620 100644
--- a/srcpkgs/qt6-translations/template
+++ b/srcpkgs/qt6-translations/template
@@ -1,10 +1,9 @@
 # Template file for 'qt6-translations'
 pkgname=qt6-translations
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qttranslations-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr "
 hostmakedepends="qt6-base-devel qt6-tools-devel perl"
 makedepends="qt6-base-devel qt6-tools-devel"
 short_desc="Cross-platform application and UI framework - translations"
@@ -12,4 +11,4 @@ maintainer="John <me@johnnynator.dev>"
 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=e4dd4ef892a34a9514a19238f189a33ed85c76f31dcad6599ced93b1e33440b3
+checksum=d7bdd55e2908ded901dcc262157100af2a490bf04d31e32995f6d91d78dfdb97

From 822c78e72370528a8e91f49bd8d6337d55efe00e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:10 +0700
Subject: [PATCH 17/34] qt6-virtualkeyboard: update to 6.3.1.

---
 srcpkgs/qt6-virtualkeyboard/template | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/qt6-virtualkeyboard/template b/srcpkgs/qt6-virtualkeyboard/template
index 67ecef145ea1..77a247400b97 100644
--- a/srcpkgs/qt6-virtualkeyboard/template
+++ b/srcpkgs/qt6-virtualkeyboard/template
@@ -1,10 +1,9 @@
 # Template file for 'qt6-virtualkeyboard'
 pkgname=qt6-virtualkeyboard
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qtvirtualkeyboard-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr"
 hostmakedepends="perl pkg-config qt6-declarative-devel"
 makedepends="qt6-declarative-devel qt6-svg-devel hunspell-devel"
 short_desc="Cross-platform application and UI framework - virtualkeyboard"
@@ -12,10 +11,10 @@ maintainer="John <me@johnnynator.dev>"
 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=89aaf15acf5432af8f5cf4ec45cb32d87a3348906215dd56e81cb294eb276573
+checksum=5fe089b204d859ab0dd0169f811f2e30cae7c5cb36f8ab95ca36883f1fc0c2b8
 
 if [ "$XBPS_CHECK_PKGS" ]; then
-	configure_args+=" -DQT_BUILD_TESTS=ON"
+	configure_args="-DQT_BUILD_TESTS=ON"
 fi
 
 do_check() {
@@ -32,8 +31,11 @@ qt6-virtualkeyboard-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From c3f6c3e84e4d92d34964d8c9d3d07a4ca53b3cda Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:10 +0700
Subject: [PATCH 18/34] qt6-wayland: update to 6.3.1.

---
 srcpkgs/qt6-wayland/template | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/qt6-wayland/template b/srcpkgs/qt6-wayland/template
index b71a273009b9..784cb42a1a03 100644
--- a/srcpkgs/qt6-wayland/template
+++ b/srcpkgs/qt6-wayland/template
@@ -1,13 +1,15 @@
 # Template file for 'qt6-wayland'
 pkgname=qt6-wayland
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qtwayland-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true"
-hostmakedepends="qt6-base-devel perl pkg-config wayland-devel qt6-wayland-devel"
+configure_args="-DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true"
+hostmakedepends="qt6-base-devel perl pkg-config wayland-devel
+ qt6-declarative-devel qt6-wayland-devel"
 # XXX: Qml as optional dep
 makedepends="qt6-base-devel wayland-devel libxkbcommon-devel
+ qt6-declarative-devel
  libXcomposite-devel MesaLib-devel Vulkan-Headers libdrm-devel"
 checkdepends="dbus mesa-dri"
 short_desc="Cross-platform application and UI framework - Wayland"
@@ -15,7 +17,7 @@ maintainer="John <me@johnnynator.dev>"
 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=e7b567f6e43ffc5918d4aa825ce1eced66a00cb0a87133b2912ba5c1b2a02190
+checksum=6f14fea2d172a5b4170be3efcb0e58535f6605b61bcd823f6d5c9d165bb8c0f0
 
 if [ "$XBPS_CHECK_PKGS" ]; then
 	configure_args+=" -DQT_BUILD_TESTS=ON"
@@ -32,9 +34,11 @@ qt6-wayland-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
-		vmove usr/lib/qt6/libexec/qtwaylandscanner
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From 1daf1132c7b4e0d10374c5a1494adf1c4e296ee1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:10 +0700
Subject: [PATCH 19/34] qt6-websockets: update to 6.3.1.

---
 srcpkgs/qt6-websockets/template | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/qt6-websockets/template b/srcpkgs/qt6-websockets/template
index c2e674aacb31..4875af093432 100644
--- a/srcpkgs/qt6-websockets/template
+++ b/srcpkgs/qt6-websockets/template
@@ -1,10 +1,9 @@
 # Template file for 'qt6-websockets'
 pkgname=qt6-websockets
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qtwebsockets-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr"
 hostmakedepends="perl qt6-base-devel qt6-declarative-devel"
 makedepends="qt6-base-devel qt6-declarative-devel"
 short_desc="Cross-platform application and UI framework - websockets"
@@ -12,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 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=e018a09fe960b7d9560d6bbc9d3ca022fed6566e6ba6fc6d869a97482d4e6361
+checksum=9f980d90c97fcbde1b50c773f6dc580cfdf8c36ce14a1be3aa2ccadfe605121a
 
 qt6-websockets-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel>=${version}_1"
@@ -20,8 +19,11 @@ qt6-websockets-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From 87f0ee8a5b8b3b86dbabf9b84f22426244579d3c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Tue, 9 Aug 2022 20:16:47 +0700
Subject: [PATCH 20/34] qt6-3d: update to 6.3.1.

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

diff --git a/srcpkgs/qt6-3d/template b/srcpkgs/qt6-3d/template
index 666f57559532..c08c3bd4a41b 100644
--- a/srcpkgs/qt6-3d/template
+++ b/srcpkgs/qt6-3d/template
@@ -1,10 +1,9 @@
 # Template file for 'qt6-3d'
 pkgname=qt6-3d
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qt3d-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr"
 hostmakedepends="perl qt6-declarative-devel"
 makedepends="qt6-declarative-devel qt6-shadertools-devel libassimp-devel
  libatomic-devel"
@@ -13,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 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=74e762380dad34887878b9124dbfb981d5cf4b8b807281ff8bff311145b54de1
+checksum=9919b66dfb253fa26db1a7d664358cbc07f46c8810082ee3120d0a54b153edfe
 
 qt6-3d-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 41527795a4198e5daa0b30567f80ac6835497c75 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:11 +0700
Subject: [PATCH 21/34] New package: qt6-webchannel-6.3.1

---
 srcpkgs/qt6-webchannel-devel    |  1 +
 srcpkgs/qt6-webchannel/template | 32 ++++++++++++++++++++++++++++++++
 srcpkgs/qt6-webchannel/update   |  1 +
 3 files changed, 34 insertions(+)
 create mode 120000 srcpkgs/qt6-webchannel-devel
 create mode 100644 srcpkgs/qt6-webchannel/template
 create mode 100644 srcpkgs/qt6-webchannel/update

diff --git a/srcpkgs/qt6-webchannel-devel b/srcpkgs/qt6-webchannel-devel
new file mode 120000
index 000000000000..03e8b23d785d
--- /dev/null
+++ b/srcpkgs/qt6-webchannel-devel
@@ -0,0 +1 @@
+qt6-webchannel
\ No newline at end of file
diff --git a/srcpkgs/qt6-webchannel/template b/srcpkgs/qt6-webchannel/template
new file mode 100644
index 000000000000..432c42bcc056
--- /dev/null
+++ b/srcpkgs/qt6-webchannel/template
@@ -0,0 +1,32 @@
+# Template file for 'qt6-webchannel'
+pkgname=qt6-webchannel
+version=6.3.1
+revision=1
+wrksrc="qtwebchannel-everywhere-src-${version}"
+build_style=cmake
+hostmakedepends="perl qt6-base-devel qt6-declarative-devel"
+makedepends="qt6-base-devel qt6-declarative-devel qt6-websockets-devel"
+short_desc="Cross-platform application and UI framework - webchannel"
+maintainer="John <me@johnnynator.dev>"
+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=aaa20ac23f86992721b7ee487c379a3fd68caa8cdcea0a77a37e0d8b47ff2668
+
+qt6-webchannel-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel>=${version}_1
+	 qt6-websockets-devel>=${version}_1"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
+		vmove usr/lib/qt6/mkspecs
+		vmove usr/lib/qt6/qml/QtWebChannel/plugins.qmltypes
+		vmove usr/lib/qt6/qml/QtWebChannel/qmldir
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
+	}
+}
diff --git a/srcpkgs/qt6-webchannel/update b/srcpkgs/qt6-webchannel/update
new file mode 100644
index 000000000000..844552465222
--- /dev/null
+++ b/srcpkgs/qt6-webchannel/update
@@ -0,0 +1 @@
+pkgname="${pkgname/6-/}-everywhere-src"

From eb4fca23225607da3b104a0e74d9419e0388c87a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:11 +0700
Subject: [PATCH 22/34] New package: qt6-multimedia-6.3.1

---
 common/shlibs                   |  3 +++
 srcpkgs/qt6-multimedia-devel    |  1 +
 srcpkgs/qt6-multimedia/template | 33 +++++++++++++++++++++++++++++++++
 srcpkgs/qt6-multimedia/update   |  1 +
 4 files changed, 38 insertions(+)
 create mode 120000 srcpkgs/qt6-multimedia-devel
 create mode 100644 srcpkgs/qt6-multimedia/template
 create mode 100644 srcpkgs/qt6-multimedia/update

diff --git a/common/shlibs b/common/shlibs
index 26f10d604be9..ce04cc1ad2cf 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2078,6 +2078,9 @@ libQt6SerialPort.so.6 qt6-serialport-6.2.0alpha_1
 libQt6WebSockets.so.6 qt6-websockets-6.2.0alpha_1
 libQt6WebChannel.so.6 qt6-webchannel-6.2.0alpha_1
 libQt6Positioning.so.6 qt6-location-6.2.0alpha_1
+libQt6MultimediaWidgets.so.6 qt6-multimedia-6.3.1_1
+libQt6MultimediaQuick.so.6 qt6-multimedia-6.3.1_1
+libQt6Multimedia.so.6 qt6-multimedia-6.3.1_1
 libnpth.so.0 npth-1.1_1
 libnpupnp.so.4 libnpupnp-4.0.2_1
 libglfw.so.3 glfw-3.0.4_1
diff --git a/srcpkgs/qt6-multimedia-devel b/srcpkgs/qt6-multimedia-devel
new file mode 120000
index 000000000000..9343446502d0
--- /dev/null
+++ b/srcpkgs/qt6-multimedia-devel
@@ -0,0 +1 @@
+qt6-multimedia
\ No newline at end of file
diff --git a/srcpkgs/qt6-multimedia/template b/srcpkgs/qt6-multimedia/template
new file mode 100644
index 000000000000..535a2f55ffe4
--- /dev/null
+++ b/srcpkgs/qt6-multimedia/template
@@ -0,0 +1,33 @@
+# Template file for 'qt6-multimedia'
+pkgname=qt6-multimedia
+version=6.3.1
+revision=1
+wrksrc="qtmultimedia-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DQT_FEATURE_gstreamer=ON"
+hostmakedepends="perl qt6-declarative-devel pkg-config
+ qt6-shadertools-devel"
+makedepends="qt6-declarative-devel
+ qt6-shadertools-devel libglib-devel gst-plugins-base1-devel"
+short_desc="Cross-platform application and UI framework - multimedia"
+maintainer="John <me@johnnynator.dev>"
+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=7e03242aadd634ff2d9fcf08948290f03da3d9a5012369d908da89f82b1d7336
+
+qt6-multimedia-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel>=${version}_1"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
+		vmove usr/lib/qt6/mkspecs
+		vmove usr/lib/qt6/qml/QtMultimedia/plugins.qmltypes
+		vmove usr/lib/qt6/qml/QtMultimedia/qmldir
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}
diff --git a/srcpkgs/qt6-multimedia/update b/srcpkgs/qt6-multimedia/update
new file mode 100644
index 000000000000..844552465222
--- /dev/null
+++ b/srcpkgs/qt6-multimedia/update
@@ -0,0 +1 @@
+pkgname="${pkgname/6-/}-everywhere-src"

From 196c8630974ce7fa21d939528af452aaaf7a6acb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 18:22:48 +0700
Subject: [PATCH 23/34] New package: qt6-connectivity-6.3.1

---
 common/shlibs                     |  2 ++
 srcpkgs/qt6-connectivity-devel    |  1 +
 srcpkgs/qt6-connectivity/template | 30 ++++++++++++++++++++++++++++++
 3 files changed, 33 insertions(+)
 create mode 120000 srcpkgs/qt6-connectivity-devel
 create mode 100644 srcpkgs/qt6-connectivity/template

diff --git a/common/shlibs b/common/shlibs
index ce04cc1ad2cf..2e95a22119ab 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2072,6 +2072,8 @@ libQt6Designer.so.6 qt6-tools-6.1.0_1
 libQt6DesignerComponents.so.6 qt6-tools-6.1.0_1
 libQt6Help.so.6 qt6-tools-6.1.0_1
 libQt6UiTools.so.6 qt6-tools-6.1.0_1
+libQt6Nfc.so.6 qt6-connectivity-6.3.1_1
+libQt6Bluetooth.so.6 qt6-connectivity-6.3.1_1
 libQt6HunspellInputMethod.so.6 qt6-virtualkeyboard-6.1.0_1
 libQt6VirtualKeyboard.so.6 qt6-virtualkeyboard-6.1.0_1
 libQt6SerialPort.so.6 qt6-serialport-6.2.0alpha_1
diff --git a/srcpkgs/qt6-connectivity-devel b/srcpkgs/qt6-connectivity-devel
new file mode 120000
index 000000000000..478cc9d8aa39
--- /dev/null
+++ b/srcpkgs/qt6-connectivity-devel
@@ -0,0 +1 @@
+qt6-connectivity
\ No newline at end of file
diff --git a/srcpkgs/qt6-connectivity/template b/srcpkgs/qt6-connectivity/template
new file mode 100644
index 000000000000..6cb61744d0cb
--- /dev/null
+++ b/srcpkgs/qt6-connectivity/template
@@ -0,0 +1,30 @@
+# Template file for 'qt6-connectivity'
+pkgname=qt6-connectivity
+version=6.3.1
+revision=1
+wrksrc="qtconnectivity-everywhere-src-${version}"
+build_style=cmake
+hostmakedepends="perl qt6-declarative-devel"
+makedepends="qt6-declarative-devel"
+short_desc="Cross-platform application and UI framework - Connectivity"
+maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
+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=b25ce4710a9c61bc6a5dbaeeb3e2ed907a8bc85478fdb2ab4312297768b695b0
+
+qt6-connectivity-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}
+	 qt6-declarative>=${version}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
+		vmove usr/lib/qt6/mkspecs
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
+	}
+}

From f39a10d6be6cc05fb737eb9af597b23a70819eb5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 18:22:57 +0700
Subject: [PATCH 24/34] New package: qt6-sensors-6.3.1

---
 common/shlibs                |  2 ++
 srcpkgs/qt6-sensors-devel    |  1 +
 srcpkgs/qt6-sensors/template | 31 +++++++++++++++++++++++++++++++
 3 files changed, 34 insertions(+)
 create mode 120000 srcpkgs/qt6-sensors-devel
 create mode 100644 srcpkgs/qt6-sensors/template

diff --git a/common/shlibs b/common/shlibs
index 2e95a22119ab..157b51f3f981 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2074,6 +2074,8 @@ libQt6Help.so.6 qt6-tools-6.1.0_1
 libQt6UiTools.so.6 qt6-tools-6.1.0_1
 libQt6Nfc.so.6 qt6-connectivity-6.3.1_1
 libQt6Bluetooth.so.6 qt6-connectivity-6.3.1_1
+libQt6Sensors.so.6 qt6-sensors-6.3.1_1
+libQt6SensorsQuick.so.6 qt6-sensors-6.3.1_1
 libQt6HunspellInputMethod.so.6 qt6-virtualkeyboard-6.1.0_1
 libQt6VirtualKeyboard.so.6 qt6-virtualkeyboard-6.1.0_1
 libQt6SerialPort.so.6 qt6-serialport-6.2.0alpha_1
diff --git a/srcpkgs/qt6-sensors-devel b/srcpkgs/qt6-sensors-devel
new file mode 120000
index 000000000000..eb9457f04055
--- /dev/null
+++ b/srcpkgs/qt6-sensors-devel
@@ -0,0 +1 @@
+qt6-sensors
\ No newline at end of file
diff --git a/srcpkgs/qt6-sensors/template b/srcpkgs/qt6-sensors/template
new file mode 100644
index 000000000000..5a81f43b60eb
--- /dev/null
+++ b/srcpkgs/qt6-sensors/template
@@ -0,0 +1,31 @@
+# Template file for 'qt6-sensors'
+pkgname=qt6-sensors
+version=6.3.1
+revision=1
+wrksrc="qtsensors-everywhere-src-${version}"
+build_style=cmake
+hostmakedepends="perl qt6-declarative-devel qt6-svg-devel pkg-config"
+makedepends="qt6-declarative-devel qt6-svg-devel"
+short_desc="Cross-platform application and UI framework - Sensors"
+maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
+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=4b240b59edba9a42b4735758a25f279a26841b982864e7b38f6ef0b81e0d60cc
+
+qt6-sensors-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}
+	 qt6-declarative-devel>=${version}_1"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
+		vmove usr/lib/qt6/mkspecs
+		vmove usr/lib/qt6/qml/QtSensors/plugins.qmltypes
+		vmove usr/lib/qt6/qml/QtSensors/qmldir
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}

From f5432c961d4c9e191c7bc92a51cf50485fa918ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 18:23:08 +0700
Subject: [PATCH 25/34] New package: qt6-remoteobjects-6.3.1

---
 common/shlibs                      |  2 ++
 srcpkgs/qt6-remoteobjects-devel    |  1 +
 srcpkgs/qt6-remoteobjects/template | 36 ++++++++++++++++++++++++++++++
 3 files changed, 39 insertions(+)
 create mode 120000 srcpkgs/qt6-remoteobjects-devel
 create mode 100644 srcpkgs/qt6-remoteobjects/template

diff --git a/common/shlibs b/common/shlibs
index 157b51f3f981..91f197e54c93 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2074,6 +2074,8 @@ libQt6Help.so.6 qt6-tools-6.1.0_1
 libQt6UiTools.so.6 qt6-tools-6.1.0_1
 libQt6Nfc.so.6 qt6-connectivity-6.3.1_1
 libQt6Bluetooth.so.6 qt6-connectivity-6.3.1_1
+libQt6RemoteObjects.so.6 qt6-remoteobjects-6.3.1_1
+libQt6RemoteObjectsQml.so.6 qt6-remoteobjects-6.3.1_1
 libQt6Sensors.so.6 qt6-sensors-6.3.1_1
 libQt6SensorsQuick.so.6 qt6-sensors-6.3.1_1
 libQt6HunspellInputMethod.so.6 qt6-virtualkeyboard-6.1.0_1
diff --git a/srcpkgs/qt6-remoteobjects-devel b/srcpkgs/qt6-remoteobjects-devel
new file mode 120000
index 000000000000..2a027f95266f
--- /dev/null
+++ b/srcpkgs/qt6-remoteobjects-devel
@@ -0,0 +1 @@
+qt6-remoteobjects
\ No newline at end of file
diff --git a/srcpkgs/qt6-remoteobjects/template b/srcpkgs/qt6-remoteobjects/template
new file mode 100644
index 000000000000..71d2d31967b6
--- /dev/null
+++ b/srcpkgs/qt6-remoteobjects/template
@@ -0,0 +1,36 @@
+# Template file for 'qt6-remoteobjects'
+pkgname=qt6-remoteobjects
+version=6.3.1
+revision=1
+wrksrc="qtremoteobjects-everywhere-src-${version}"
+build_style=cmake
+hostmakedepends="perl qt6-declarative-devel pkg-config"
+makedepends="qt6-declarative-devel"
+short_desc="Cross-platform application and UI framework - Remote Objects"
+maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
+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=ea6d038b11c60981de0bd39a6091a59abf7d031e37bfc592b31be1217bef4ca6
+
+if [ "$CROSS_BUILD" ]; then
+	hostmakedepends+=" qt6-remoteobjects"
+	configure_args="-DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true"
+fi
+
+qt6-remoteobjects-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}
+	 qt6-declarative-devel>=${version}_1"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
+		vmove usr/lib/qt6/mkspecs
+		vmove usr/lib/qt6/qml/QtRemoteObjects/plugins.qmltypes
+		vmove usr/lib/qt6/qml/QtRemoteObjects/qmldir
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}

From 0bef4c2f66d5d2a1de10dac2252aa422e67c04ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:11 +0700
Subject: [PATCH 26/34] New package: qt6-webengine-6.3.1.

---
 common/shlibs                                 |    7 +
 srcpkgs/qt6-webengine-devel                   |    1 +
 srcpkgs/qt6-webengine-examples                |    1 +
 .../patches/0001-None-no-debug.patch          |   11 +
 .../patches/0002-enable-ppc64.patch           |   20 +
 .../patches/0003-cross-hack.patch             |   10 +
 .../0004-ppc-disable-jxl-decoder.patch        |   13 +
 .../patches/0050-no-glibc-cmake-check.patch   |   14 +
 .../0100-chromium-sandbox-membarrier.patch    |   58 +
 .../qt6-webengine/patches/0101-size_t.patch   |   16 +
 .../0102-chromium-90-ruy-include.patch        |   19 +
 ...-v8-monotonic-pthread-cont_timedwait.patch |   22 +
 .../0104-chromium-revert-9d080c0.patch        |  162 +
 ...-chromium-revert-drop-of-system-java.patch |   15 +
 .../patches/0106-chromium-system-nodejs.patch |   20 +
 .../0107-chromium-cursed^Uscoped_file.patch   |   18 +
 .../0108-chromium-fix-narrowing-cast.patch    |   53 +
 .../0109-chromium-remove-strip_binary.patch   |   32 +
 ...ium-revert-use-ffile-compilation-dir.patch |   57 +
 ...11-chromium-no-Wno-stringop-overread.patch |   10 +
 .../0150-chromium-glibc-libc_malloc.patch     |   24 +
 ...-include-sys-reg.h-to-get-__WORDSIZE.patch |   21 +
 .../0201-chromium-musl-dispatch-to-musl.patch |  103 +
 .../0202-chromium-musl-no-mallinfo.patch      |   62 +
 .../0203-chromium-musl-siginfo_t.patch        |   18 +
 .../0204-chromium-musl-stackstart.patch       |   20 +
 .../patches/0205-chromium-musl-sandbox.patch  |   92 +
 ...0206-chromium-musl-default-stacksize.patch |   15 +
 .../patches/0208-chromium-musl-execinfo.patch |  125 +
 .../0209-chromium-musl-thread-stacksize.patch |   22 +
 .../0210-chromium-musl-msgvec-push_back.patch |   14 +
 ...ium-musl-canonicalize-file-name-musl.patch |   11 +
 .../0212-chromium-musl-no-getcontext.patch    |   29 +
 .../patches/0213-chromium-musl-crashpad.patch |   24 +
 .../patches/0214-chromium-musl-fixes.patch    |  108 +
 .../patches/0215-chromium-musl-cdefs.patch    |   29 +
 .../patches/0216-chromium-musl-stat.patch     |   12 +
 .../patches/0217-chromium-musl-resolver.patch |   77 +
 .../patches/0600-chromium-sndio.patch         |  876 ++++
 .../patches/0700-armv7l-neon.patch            |   10 +
 ...-chromium-musl-cross-no-asm_ptrace_h.patch |   30 +
 .../0751-chromium-musl-arm-user_vfp.patch     |   20 +
 .../0752-chromium-musl-arm-elf_auxv_t.patch   |   18 +
 ...0801-chromium-i686-vaapi-fpermissive.patch |   24 +
 .../patches/0900-xxx-ppc64le-libvpx.patch     |   65 +
 .../0901-xxx-ppc64le-sandbox-linux-stat.patch |   31 +
 .../patches/0902-xxx-ppc64le-support.patch    | 3556 +++++++++++++++++
 .../0903-xxx-ppc64le-swiftshader.patch        |   18 +
 .../patches/cross-build-examples.patch        |   16 +
 srcpkgs/qt6-webengine/template                |  178 +
 srcpkgs/qt6-webengine/update                  |    1 +
 51 files changed, 6208 insertions(+)
 create mode 120000 srcpkgs/qt6-webengine-devel
 create mode 120000 srcpkgs/qt6-webengine-examples
 create mode 100644 srcpkgs/qt6-webengine/patches/0001-None-no-debug.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0002-enable-ppc64.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0003-cross-hack.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0004-ppc-disable-jxl-decoder.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0050-no-glibc-cmake-check.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0100-chromium-sandbox-membarrier.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0101-size_t.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0102-chromium-90-ruy-include.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0103-chromium-v8-monotonic-pthread-cont_timedwait.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0104-chromium-revert-9d080c0.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0105-chromium-revert-drop-of-system-java.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0106-chromium-system-nodejs.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0107-chromium-cursed^Uscoped_file.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0108-chromium-fix-narrowing-cast.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0109-chromium-remove-strip_binary.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0110-chromium-revert-use-ffile-compilation-dir.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0111-chromium-no-Wno-stringop-overread.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0150-chromium-glibc-libc_malloc.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0200-chromium-musl-include-sys-reg.h-to-get-__WORDSIZE.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0201-chromium-musl-dispatch-to-musl.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0202-chromium-musl-no-mallinfo.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0203-chromium-musl-siginfo_t.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0204-chromium-musl-stackstart.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0205-chromium-musl-sandbox.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0206-chromium-musl-default-stacksize.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0208-chromium-musl-execinfo.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0209-chromium-musl-thread-stacksize.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0210-chromium-musl-msgvec-push_back.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0211-chromium-musl-canonicalize-file-name-musl.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0212-chromium-musl-no-getcontext.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0213-chromium-musl-crashpad.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0214-chromium-musl-fixes.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0215-chromium-musl-cdefs.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0216-chromium-musl-stat.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0217-chromium-musl-resolver.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0600-chromium-sndio.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0700-armv7l-neon.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0750-chromium-musl-cross-no-asm_ptrace_h.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0751-chromium-musl-arm-user_vfp.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0752-chromium-musl-arm-elf_auxv_t.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0801-chromium-i686-vaapi-fpermissive.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0900-xxx-ppc64le-libvpx.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0901-xxx-ppc64le-sandbox-linux-stat.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0902-xxx-ppc64le-support.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0903-xxx-ppc64le-swiftshader.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/cross-build-examples.patch
 create mode 100644 srcpkgs/qt6-webengine/template
 create mode 100644 srcpkgs/qt6-webengine/update

diff --git a/common/shlibs b/common/shlibs
index 91f197e54c93..1f8acc43c36e 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2087,6 +2087,13 @@ libQt6Positioning.so.6 qt6-location-6.2.0alpha_1
 libQt6MultimediaWidgets.so.6 qt6-multimedia-6.3.1_1
 libQt6MultimediaQuick.so.6 qt6-multimedia-6.3.1_1
 libQt6Multimedia.so.6 qt6-multimedia-6.3.1_1
+libQt6WebEngineQuick.so.6 qt6-webengine-6.3.1_1
+libQt6PdfWidgets.so.6 qt6-webengine-6.3.1_1
+libQt6PdfQuick.so.6 qt6-webengine-6.3.1_1
+libQt6WebEngineCore.so.6 qt6-webengine-6.3.1_1
+libQt6Pdf.so.6 qt6-webengine-6.3.1_1
+libQt6WebEngineQuickDelegatesQml.so.6 qt6-webengine-6.3.1_1
+libQt6WebEngineWidgets.so.6 qt6-webengine-6.3.1_1
 libnpth.so.0 npth-1.1_1
 libnpupnp.so.4 libnpupnp-4.0.2_1
 libglfw.so.3 glfw-3.0.4_1
diff --git a/srcpkgs/qt6-webengine-devel b/srcpkgs/qt6-webengine-devel
new file mode 120000
index 000000000000..8e4d1b99c587
--- /dev/null
+++ b/srcpkgs/qt6-webengine-devel
@@ -0,0 +1 @@
+qt6-webengine
\ No newline at end of file
diff --git a/srcpkgs/qt6-webengine-examples b/srcpkgs/qt6-webengine-examples
new file mode 120000
index 000000000000..8e4d1b99c587
--- /dev/null
+++ b/srcpkgs/qt6-webengine-examples
@@ -0,0 +1 @@
+qt6-webengine
\ No newline at end of file
diff --git a/srcpkgs/qt6-webengine/patches/0001-None-no-debug.patch b/srcpkgs/qt6-webengine/patches/0001-None-no-debug.patch
new file mode 100644
index 000000000000..1ba33f8e6fd9
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0001-None-no-debug.patch
@@ -0,0 +1,11 @@
+--- a/cmake/Functions.cmake
++++ b/cmake/Functions.cmake
+@@ -813,6 +813,8 @@ macro(append_build_type_setup)
+         endif()
+     elseif(${config} STREQUAL "MinSizeRel")
+         list(APPEND gnArgArg is_debug=false symbol_level=0 optimize_for_size=true)
++    elseif(${config} STREQUAL "None")
++        list(APPEND gnArgArg is_debug=false symbol_level=0)
+     endif()
+     if(FEATURE_developer_build OR (${config} STREQUAL "Debug") OR QT_FEATURE_webengine_sanitizer)
+         list(APPEND gnArgArg
diff --git a/srcpkgs/qt6-webengine/patches/0002-enable-ppc64.patch b/srcpkgs/qt6-webengine/patches/0002-enable-ppc64.patch
new file mode 100644
index 000000000000..d72ef1ad1a10
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0002-enable-ppc64.patch
@@ -0,0 +1,20 @@
+--- a/cmake/Functions.cmake
++++ b/cmake/Functions.cmake
+@@ -622,6 +622,8 @@ function(get_gn_arch result arch)
+         set(${result} "mipsel" PARENT_SCOPE)
+     elseif(arch STREQUAL "mipsel64")
+         set(${result} "mips64el" PARENT_SCOPE)
++    elseif(arch STREQUAL "power64")
++        set(${result} "power64" PARENT_SCOPE)
+     else()
+         message(DEBUG "Unsupported architecture: ${arch}")
+     endif()
+@@ -641,6 +643,8 @@ function(get_v8_arch result targetArch h
+             set(${result} "mipsel" PARENT_SCOPE)
+         elseif(hostArch STREQUAL "mipsel64")
+             set(${result} "mipsel" PARENT_SCOPE)
++        elseif(hostArch STREQUAL "power64")
++            set(${result} "power64" PARENT_SCOPE)
+         else()
+             message(DEBUG "Unsupported architecture: ${hostArch}")
+         endif()
diff --git a/srcpkgs/qt6-webengine/patches/0003-cross-hack.patch b/srcpkgs/qt6-webengine/patches/0003-cross-hack.patch
new file mode 100644
index 000000000000..ea9f90094a63
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0003-cross-hack.patch
@@ -0,0 +1,10 @@
+--- a/src/core/api/CMakeLists.txt
++++ b/src/core/api/CMakeLists.txt
+@@ -50,6 +50,7 @@ qt_internal_add_module(WebEngineCore
+         Qt::Gui
+         Qt::Network
+         Qt::Quick
++        X11
+ )
+ 
+ set_target_properties(WebEngineCore PROPERTIES QTWEBENGINEPROCESS_NAME ${qtWebEngineProcessName})
diff --git a/srcpkgs/qt6-webengine/patches/0004-ppc-disable-jxl-decoder.patch b/srcpkgs/qt6-webengine/patches/0004-ppc-disable-jxl-decoder.patch
new file mode 100644
index 000000000000..73c1151968f4
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0004-ppc-disable-jxl-decoder.patch
@@ -0,0 +1,13 @@
+--- a/src/core/CMakeLists.txt
++++ b/src/core/CMakeLists.txt
+@@ -414,6 +414,10 @@ foreach(arch ${archs})
+                 CONDITION QT_FEATURE_webengine_ozone_x11 AND XSCRNSAVER_FOUND
+             )
+ 
++            if (cpu STREQUAL "ppc64")
++                list(APPEND gnArgArg enable_jxl_decoder=false)
++            endif()
++
+             if(QT_FEATURE_webengine_kerberos)
+                 list(APPEND gnArgArg
+                      external_gssapi_include_dir="${GSSAPI_INCLUDE_DIRS}/gssapi"
diff --git a/srcpkgs/qt6-webengine/patches/0050-no-glibc-cmake-check.patch b/srcpkgs/qt6-webengine/patches/0050-no-glibc-cmake-check.patch
new file mode 100644
index 000000000000..f756bf0286bb
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0050-no-glibc-cmake-check.patch
@@ -0,0 +1,14 @@
+--- a/configure.cmake
++++ b/configure.cmake
+@@ -499,11 +499,6 @@ add_check_for_support(
+ )
+ add_check_for_support(
+    MODULES QtWebEngine QtPdf
+-   CONDITION NOT LINUX OR TEST_glibc
+-   MESSAGE "A suitable version >= 2.17 of glibc is required."
+-)
+-add_check_for_support(
+-   MODULES QtWebEngine QtPdf
+    CONDITION NOT LINUX OR TEST_khr
+    MESSAGE "Build requires Khronos development headers for build - see mesa/libegl1-mesa-dev"
+ )
diff --git a/srcpkgs/qt6-webengine/patches/0100-chromium-sandbox-membarrier.patch b/srcpkgs/qt6-webengine/patches/0100-chromium-sandbox-membarrier.patch
new file mode 100644
index 000000000000..2dd7b4aa948f
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0100-chromium-sandbox-membarrier.patch
@@ -0,0 +1,58 @@
+--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
++++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
+@@ -413,6 +413,7 @@ bool SyscallSets::IsAllowedProcessStartO
+   switch (sysno) {
+     case __NR_exit:
+     case __NR_exit_group:
++    case __NR_membarrier:
+     case __NR_wait4:
+     case __NR_waitid:
+ #if defined(__i386__)
+--- a/src/3rdparty/chromium/sandbox/linux/system_headers/arm64_linux_syscalls.h
++++ b/src/3rdparty/chromium/sandbox/linux/system_headers/arm64_linux_syscalls.h
+@@ -1215,4 +1215,8 @@
+ #define __NR_landlock_restrict_self 446
+ #endif
+ 
++#if !defined(__NR_membarrier)
++#define __NR_membarrier 283
++#endif
++
+ #endif  // SANDBOX_LINUX_SYSTEM_HEADERS_ARM64_LINUX_SYSCALLS_H_
+--- a/src/3rdparty/chromium/sandbox/linux/system_headers/arm_linux_syscalls.h
++++ b/src/3rdparty/chromium/sandbox/linux/system_headers/arm_linux_syscalls.h
+@@ -1617,6 +1617,10 @@
+ #define __NR_landlock_restrict_self (__NR_SYSCALL_BASE + 446)
+ #endif
+ 
++#if !defined(__NR_membarrier)
++#define __NR_membarrier (__NR_SYSCALL_BASE+389)
++#endif
++
+ // ARM private syscalls.
+ #if !defined(__ARM_NR_BASE)
+ #define __ARM_NR_BASE (__NR_SYSCALL_BASE + 0xF0000)
+--- a/src/3rdparty/chromium/sandbox/linux/system_headers/x86_32_linux_syscalls.h
++++ b/src/3rdparty/chromium/sandbox/linux/system_headers/x86_32_linux_syscalls.h
+@@ -1750,5 +1750,9 @@
+ #define __NR_landlock_restrict_self 446
+ #endif
+ 
++#if !defined(__NR_membarrier)
++#define __NR_membarrier 375
++#endif
++
+ #endif  // SANDBOX_LINUX_SYSTEM_HEADERS_X86_32_LINUX_SYSCALLS_H_
+ 
+--- a/src/3rdparty/chromium/sandbox/linux/system_headers/x86_64_linux_syscalls.h
++++ b/src/3rdparty/chromium/sandbox/linux/system_headers/x86_64_linux_syscalls.h
+@@ -1438,5 +1438,9 @@
+ #define __NR_landlock_restrict_self 446
+ #endif
+ 
++#if !defined(__NR_membarrier)
++#define __NR_membarrier 324
++#endif
++
+ #endif  // SANDBOX_LINUX_SYSTEM_HEADERS_X86_64_LINUX_SYSCALLS_H_
+ 
diff --git a/srcpkgs/qt6-webengine/patches/0101-size_t.patch b/srcpkgs/qt6-webengine/patches/0101-size_t.patch
new file mode 100644
index 000000000000..fccc085da311
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0101-size_t.patch
@@ -0,0 +1,16 @@
+--- a/src/3rdparty/chromium/third_party/angle/include/platform/PlatformMethods.h
++++ b/src/3rdparty/chromium/third_party/angle/include/platform/PlatformMethods.h
+@@ -239,11 +239,11 @@ inline void DefaultOverrideFeaturesMtl(P
+ using ProgramKeyType   = std::array<uint8_t, 20>;
+ using CacheProgramFunc = void (*)(PlatformMethods *platform,
+                                   const ProgramKeyType &key,
+-                                  size_t programSize,
++                                  std::size_t programSize,
+                                   const uint8_t *programBytes);
+ inline void DefaultCacheProgram(PlatformMethods *platform,
+                                 const ProgramKeyType &key,
+-                                size_t programSize,
++                                std::size_t programSize,
+                                 const uint8_t *programBytes)
+ {}
+ 
diff --git a/srcpkgs/qt6-webengine/patches/0102-chromium-90-ruy-include.patch b/srcpkgs/qt6-webengine/patches/0102-chromium-90-ruy-include.patch
new file mode 100644
index 000000000000..bbba579076d6
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0102-chromium-90-ruy-include.patch
@@ -0,0 +1,19 @@
+From 714092f336bb14d2fcc27396ec323b3d843bb962 Mon Sep 17 00:00:00 2001
+From: Stephan Hartmann <stha09@googlemail.com>
+Date: Thu, 4 Mar 2021 15:05:46 +0000
+Subject: [PATCH] IWYU: include limits for std::numeric_limits
+
+---
+ third_party/ruy/src/ruy/block_map.cc | 1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/src/3rdparty/chromium/third_party/ruy/src/ruy/block_map.cc
++++ b/src/3rdparty/chromium/third_party/ruy/src/ruy/block_map.cc
+@@ -17,6 +17,7 @@ limitations under the License.
+ 
+ #include <algorithm>
+ #include <cstdint>
++#include <limits>
+ 
+ #ifdef RUY_MAKEBLOCKMAP_DEBUG
+ #include <cstdio>
diff --git a/srcpkgs/qt6-webengine/patches/0103-chromium-v8-monotonic-pthread-cont_timedwait.patch b/srcpkgs/qt6-webengine/patches/0103-chromium-v8-monotonic-pthread-cont_timedwait.patch
new file mode 100644
index 000000000000..1dc8bc4d3d17
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0103-chromium-v8-monotonic-pthread-cont_timedwait.patch
@@ -0,0 +1,22 @@
+Use monotonic clock for pthread_cond_timedwait with musl too.
+
+--- a/src/3rdparty/chromium/v8/src/base/platform/condition-variable.cc
++++ b/src/3rdparty/chromium/v8/src/base/platform/condition-variable.cc
+@@ -20,7 +20,7 @@ namespace base {
+ 
+ ConditionVariable::ConditionVariable() {
+ #if (V8_OS_FREEBSD || V8_OS_NETBSD || V8_OS_OPENBSD || \
+-     (V8_OS_LINUX && V8_LIBC_GLIBC))
++     V8_OS_LINUX)
+   // On Free/Net/OpenBSD and Linux with glibc we can change the time
+   // source for pthread_cond_timedwait() to use the monotonic clock.
+   pthread_condattr_t attr;
+@@ -96,7 +96,7 @@ bool ConditionVariable::WaitFor(Mutex* m
+       &native_handle_, &mutex->native_handle(), &ts);
+ #else
+ #if (V8_OS_FREEBSD || V8_OS_NETBSD || V8_OS_OPENBSD || \
+-     (V8_OS_LINUX && V8_LIBC_GLIBC))
++     V8_OS_LINUX)
+   // On Free/Net/OpenBSD and Linux with glibc we can change the time
+   // source for pthread_cond_timedwait() to use the monotonic clock.
+   result = clock_gettime(CLOCK_MONOTONIC, &ts);
diff --git a/srcpkgs/qt6-webengine/patches/0104-chromium-revert-9d080c0.patch b/srcpkgs/qt6-webengine/patches/0104-chromium-revert-9d080c0.patch
new file mode 100644
index 000000000000..42b1ee9ec063
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0104-chromium-revert-9d080c0.patch
@@ -0,0 +1,162 @@
+ Original change's description:
+ > Replace 'blacklist' with 'ignorelist' in ./tools/msan/.
+ >
+ > Bug: 1097272, 1097268
+ > Change-Id: Id5c8227a5bfb1ffaec82d3168b609085b10c8297
+ > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2867730
+ > Commit-Queue: Dylan Cutler <dylancutler@google.com>
+ > Reviewed-by: Nico Weber <thakis@chromium.org>
+ > Reviewed-by: Jonathan Metzman <metzman@chromium.org>
+ > Cr-Commit-Position: refs/heads/master@{#883035}
+--- a/src/3rdparty/chromium/build/config/sanitizers/BUILD.gn
++++ b/src/3rdparty/chromium/build/config/sanitizers/BUILD.gn
+@@ -272,11 +272,11 @@ config("asan_flags") {
+   if (is_asan) {
+     cflags += [ "-fsanitize=address" ]
+     if (is_win) {
+-      if (!defined(asan_win_blocklist_path)) {
+-        asan_win_blocklist_path =
++      if (!defined(asan_win_blacklist_path)) {
++        asan_win_blacklist_path =
+             rebase_path("//tools/memory/asan/blocklist_win.txt", root_build_dir)
+       }
+-      cflags += [ "-fsanitize-ignorelist=$asan_win_blocklist_path" ]
++      cflags += [ "-fsanitize-blacklist=$asan_win_blacklist_path" ]
+     }
+   }
+ }
+@@ -306,13 +306,13 @@ config("link_shared_library") {
+ config("cfi_flags") {
+   cflags = []
+   if (is_cfi && current_toolchain == default_toolchain) {
+-    if (!defined(cfi_ignorelist_path)) {
+-      cfi_ignorelist_path =
++    if (!defined(cfi_blacklist_path)) {
++      cfi_blacklist_path =
+           rebase_path("//tools/cfi/ignores.txt", root_build_dir)
+     }
+     cflags += [
+       "-fsanitize=cfi-vcall",
+-      "-fsanitize-ignorelist=$cfi_ignorelist_path",
++      "-fsanitize-blacklist=$cfi_blacklist_path",
+     ]
+ 
+     if (use_cfi_cast) {
+@@ -409,14 +409,14 @@ config("msan_flags") {
+   if (is_msan) {
+     assert(is_linux || is_chromeos,
+            "msan only supported on linux x86_64/ChromeOS")
+-    if (!defined(msan_ignorelist_path)) {
+-      msan_ignorelist_path =
+-          rebase_path("//tools/msan/ignorelist.txt", root_build_dir)
++    if (!defined(msan_blacklist_path)) {
++      msan_blacklist_path =
++          rebase_path("//tools/msan/blacklist.txt", root_build_dir)
+     }
+     cflags = [
+       "-fsanitize=memory",
+       "-fsanitize-memory-track-origins=$msan_track_origins",
+-      "-fsanitize-ignorelist=$msan_ignorelist_path",
++      "-fsanitize-blacklist=$msan_blacklist_path",
+     ]
+   }
+ }
+@@ -424,13 +424,13 @@ config("msan_flags") {
+ config("tsan_flags") {
+   if (is_tsan) {
+     assert(is_linux || is_chromeos, "tsan only supported on linux x86_64")
+-    if (!defined(tsan_ignorelist_path)) {
+-      tsan_ignorelist_path =
++    if (!defined(tsan_blacklist_path)) {
++      tsan_blacklist_path =
+           rebase_path("//tools/memory/tsan_v2/ignores.txt", root_build_dir)
+     }
+     cflags = [
+       "-fsanitize=thread",
+-      "-fsanitize-ignorelist=$tsan_ignorelist_path",
++      "-fsanitize-blacklist=$tsan_blacklist_path",
+     ]
+   }
+ }
+@@ -438,8 +438,8 @@ config("tsan_flags") {
+ config("ubsan_flags") {
+   cflags = []
+   if (is_ubsan) {
+-    if (!defined(ubsan_ignorelist_path)) {
+-      ubsan_ignorelist_path =
++    if (!defined(ubsan_blacklist_path)) {
++      ubsan_blacklist_path =
+           rebase_path("//tools/ubsan/ignorelist.txt", root_build_dir)
+     }
+     cflags += [
+@@ -456,7 +456,7 @@ config("ubsan_flags") {
+       "-fsanitize=signed-integer-overflow",
+       "-fsanitize=unreachable",
+       "-fsanitize=vla-bound",
+-      "-fsanitize-ignorelist=$ubsan_ignorelist_path",
++      "-fsanitize-blacklist=$ubsan_blacklist_path",
+     ]
+     if (!is_clang) {
+       # These exposes too much illegal C++14 code to compile on anything stricter than clang:
+@@ -497,8 +497,8 @@ config("ubsan_no_recover") {
+ 
+ config("ubsan_security_flags") {
+   if (is_ubsan_security) {
+-    if (!defined(ubsan_security_ignorelist_path)) {
+-      ubsan_security_ignorelist_path =
++    if (!defined(ubsan_security_blacklist_path)) {
++      ubsan_security_blacklist_path =
+           rebase_path("//tools/ubsan/security_ignorelist.txt", root_build_dir)
+     }
+     cflags = [
+@@ -506,7 +506,7 @@ config("ubsan_security_flags") {
+       "-fsanitize=shift",
+       "-fsanitize=signed-integer-overflow",
+       "-fsanitize=vla-bound",
+-      "-fsanitize-ignorelist=$ubsan_security_ignorelist_path",
++      "-fsanitize-blacklist=$ubsan_security_blacklist_path",
+     ]
+   }
+ }
+@@ -519,13 +519,13 @@ config("ubsan_null_flags") {
+ 
+ config("ubsan_vptr_flags") {
+   if (is_ubsan_vptr) {
+-    if (!defined(ubsan_vptr_ignorelist_path)) {
+-      ubsan_vptr_ignorelist_path =
++    if (!defined(ubsan_vptr_blacklist_path)) {
++      ubsan_vptr_blacklist_path =
+           rebase_path("//tools/ubsan/vptr_ignorelist.txt", root_build_dir)
+     }
+     cflags = [
+       "-fsanitize=vptr",
+-      "-fsanitize-ignorelist=$ubsan_vptr_ignorelist_path",
++      "-fsanitize-blacklist=$ubsan_vptr_blacklist_path",
+     ]
+     if (!is_clang) {
+       # Clang specific flag:
+--- a/src/3rdparty/chromium/build_overrides/build.gni
++++ b/src/3rdparty/chromium/build_overrides/build.gni
+@@ -43,15 +43,15 @@ declare_args() {
+ # Allows different projects to specify their own suppression/ignore lists for
+ # sanitizer tools.
+ # asan_suppressions_file = "path/to/asan_suppressions.cc"
+-# asan_win_ignorelist_path = "path/to/asan/blocklist_win.txt"
++# asan_win_blacklist_path = "path/to/asan/blocklist_win.txt"
+ # lsan_suppressions_file = "path/to/lsan_suppressions.cc"
+ # tsan_suppressions_file = "path/to/tsan_suppressions.cc"
+-# tsan_ignorelist_path = "path/to/tsan/ignores.txt"
+-# msan_ignorelist_path = "path/to/msan/ignorelist.txt"
+-# ubsan_ignorelist_path = "path/to/ubsan/ignorelist.txt"
+-# ubsan_vptr_ignorelist_path = "path/to/ubsan/vptr_ignorelist.txt"
+-# ubsan_security_ignorelist_path = "path/to/ubsan/security_ignorelist.txt"
+-# cfi_ignorelist_path = "path/to/cfi/ignores.txt"
++# tsan_blacklist_path = "path/to/tsan/ignores.txt"
++# msan_blacklist_path = "path/to/msan/blacklist.txt"
++# ubsan_blacklist_path = "path/to/ubsan/blacklist.txt"
++# ubsan_vptr_blacklist_path = "path/to/ubsan/vptr_blacklist.txt"
++# ubsan_security_blacklist_path = "path/to/ubsan/security_blacklist.txt"
++# cfi_blacklist_path = "path/to/cfi/ignores.txt"
+ 
+ declare_args() {
+   # Android 32-bit non-component, non-clang builds cannot have symbol_level=2
diff --git a/srcpkgs/qt6-webengine/patches/0105-chromium-revert-drop-of-system-java.patch b/srcpkgs/qt6-webengine/patches/0105-chromium-revert-drop-of-system-java.patch
new file mode 100644
index 000000000000..44f3aa8fae5e
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0105-chromium-revert-drop-of-system-java.patch
@@ -0,0 +1,15 @@
+This was dropped for some reason in 6951c37cecd05979b232a39e5c10e6346a0f74ef
+--- a/src/3rdparty/chromium/third_party/closure_compiler/compiler.py
++++ b/src/3rdparty/chromium/third_party/closure_compiler/compiler.py
+@@ -13,8 +13,9 @@ import subprocess
+ 
+ 
+ _CURRENT_DIR = os.path.join(os.path.dirname(__file__))
+-_JAVA_PATH = os.path.join(_CURRENT_DIR, "..", "jdk", "current", "bin", "java")
+-assert os.path.isfile(_JAVA_PATH), "java only allowed in android builds"
++_JAVA_BIN = "java"
++_JDK_PATH = os.path.join(_CURRENT_DIR, "..", "jdk", "current", "bin", "java")
++_JAVA_PATH = _JDK_PATH if os.path.isfile(_JDK_PATH) else _JAVA_BIN
+ 
+ class Compiler(object):
+   """Runs the Closure compiler on given source files to typecheck them
diff --git a/srcpkgs/qt6-webengine/patches/0106-chromium-system-nodejs.patch b/srcpkgs/qt6-webengine/patches/0106-chromium-system-nodejs.patch
new file mode 100644
index 000000000000..1e067cc6eda0
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0106-chromium-system-nodejs.patch
@@ -0,0 +1,20 @@
+--- a/src/3rdparty/chromium/third_party/node/node.py
++++ b/src/3rdparty/chromium/third_party/node/node.py
+@@ -36,11 +36,12 @@ def GetBinaryPath():
+   if platform.system() == 'Darwin' and platform.machine() == 'arm64':
+       return os.path.join(os_path.join(os_path.dirname(__file__), 'mac',
+                           'node-darwin-arm64', 'bin', 'node'))
+-  return os_path.join(os_path.dirname(__file__), *{
+-    'Darwin': ('mac', 'node-darwin-x64', 'bin', 'node'),
+-    'Linux': ('linux', 'node-linux-x64', 'bin', 'node'),
+-    'Windows': ('win', 'node.exe'),
+-  }[platform.system()])
++  return "/usr/bin/node"
++  #return os_path.join(os_path.dirname(__file__), *{
++  #  'Darwin': ('mac', 'node-darwin-x64', 'bin', 'node'),
++  #  'Linux': ('linux', 'node-linux-x64', 'bin', 'node'),
++  #  'Windows': ('win', 'node.exe'),
++  #}[platform.system()])
+ 
+ 
+ def RunNode(cmd_parts, stdout=None):
diff --git a/srcpkgs/qt6-webengine/patches/0107-chromium-cursed^Uscoped_file.patch b/srcpkgs/qt6-webengine/patches/0107-chromium-cursed^Uscoped_file.patch
new file mode 100644
index 000000000000..a8f5d971883d
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0107-chromium-cursed^Uscoped_file.patch
@@ -0,0 +1,18 @@
+--- a/src/3rdparty/chromium/base/files/scoped_file_linux.cc
++++ b/src/3rdparty/chromium/base/files/scoped_file_linux.cc
+@@ -77,15 +77,3 @@ bool IsFDOwned(int fd) {
+ }
+ 
+ }  // namespace base
+-
+-extern "C" {
+-
+-int __close(int);
+-
+-__attribute__((visibility("default"), noinline)) int close(int fd) {
+-  if (base::IsFDOwned(fd) && g_is_ownership_enforced)
+-    CrashOnFdOwnershipViolation();
+-  return __close(fd);
+-}
+-
+-}  // extern "C"
diff --git a/srcpkgs/qt6-webengine/patches/0108-chromium-fix-narrowing-cast.patch b/srcpkgs/qt6-webengine/patches/0108-chromium-fix-narrowing-cast.patch
new file mode 100644
index 000000000000..ed32cd9b7415
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0108-chromium-fix-narrowing-cast.patch
@@ -0,0 +1,53 @@
+--- a/src/3rdparty/chromium/base/files/file_util_linux.cc
++++ b/src/3rdparty/chromium/base/files/file_util_linux.cc
+@@ -23,14 +23,14 @@ bool GetFileSystemType(const FilePath& p
+ 
+   // Not all possible |statfs_buf.f_type| values are in linux/magic.h.
+   // Missing values are copied from the statfs man page.
+-  switch (statfs_buf.f_type) {
++  switch (static_cast<uintmax_t>(statfs_buf.f_type)) {
+     case 0:
+       *type = FILE_SYSTEM_0;
+       break;
+     case EXT2_SUPER_MAGIC:  // Also ext3 and ext4
+     case MSDOS_SUPER_MAGIC:
+     case REISERFS_SUPER_MAGIC:
+-    case static_cast<int>(BTRFS_SUPER_MAGIC):
++    case BTRFS_SUPER_MAGIC:
+     case 0x5346544E:  // NTFS
+     case 0x58465342:  // XFS
+     case 0x3153464A:  // JFS
+@@ -40,14 +40,14 @@ bool GetFileSystemType(const FilePath& p
+       *type = FILE_SYSTEM_NFS;
+       break;
+     case SMB_SUPER_MAGIC:
+-    case static_cast<int>(0xFF534D42):  // CIFS
++    case 0xFF534D42:  // CIFS
+       *type = FILE_SYSTEM_SMB;
+       break;
+     case CODA_SUPER_MAGIC:
+       *type = FILE_SYSTEM_CODA;
+       break;
+-    case static_cast<int>(HUGETLBFS_MAGIC):
+-    case static_cast<int>(RAMFS_MAGIC):
++    case HUGETLBFS_MAGIC:
++    case RAMFS_MAGIC:
+     case TMPFS_MAGIC:
+       *type = FILE_SYSTEM_MEMORY;
+       break;
+--- a/src/3rdparty/chromium/base/system/sys_info_posix.cc
++++ b/src/3rdparty/chromium/base/system/sys_info_posix.cc
+@@ -100,10 +100,10 @@ bool IsStatsZeroIfUnlimited(const base::
+   if (HANDLE_EINTR(statfs(path.value().c_str(), &stats)) != 0)
+     return false;
+ 
+-  switch (stats.f_type) {
++  switch (static_cast<uintmax_t>(stats.f_type)) {
+     case TMPFS_MAGIC:
+-    case static_cast<int>(HUGETLBFS_MAGIC):
+-    case static_cast<int>(RAMFS_MAGIC):
++    case HUGETLBFS_MAGIC:
++    case RAMFS_MAGIC:
+       return true;
+   }
+   return false;
diff --git a/srcpkgs/qt6-webengine/patches/0109-chromium-remove-strip_binary.patch b/srcpkgs/qt6-webengine/patches/0109-chromium-remove-strip_binary.patch
new file mode 100644
index 000000000000..5ebd16e659af
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0109-chromium-remove-strip_binary.patch
@@ -0,0 +1,32 @@
+--- a/src/3rdparty/chromium/chrome/test/chromedriver/BUILD.gn
++++ b/src/3rdparty/chromium/chrome/test/chromedriver/BUILD.gn
+@@ -308,11 +308,7 @@ source_set("lib") {
+   }
+ }
+ 
+-if (is_linux) {
+-  chromedriver_output = "chromedriver.unstripped"
+-} else {
+-  chromedriver_output = "chromedriver"
+-}
++chromedriver_output = "chromedriver"
+ 
+ executable("$chromedriver_output") {
+   testonly = true
+@@ -336,16 +332,6 @@ executable("$chromedriver_output") {
+   }
+ }
+ 
+-if (is_linux) {
+-  strip_binary("chromedriver") {
+-    testonly = true
+-    binary_input = "$root_out_dir/$chromedriver_output"
+-    symbol_output = "$root_out_dir/chromedriver.debug"
+-    stripped_binary_output = "$root_out_dir/chromedriver"
+-    deps = [ ":$chromedriver_output" ]
+-  }
+-}
+-
+ python_library("chromedriver_py_tests") {
+   testonly = true
+   deps = [
diff --git a/srcpkgs/qt6-webengine/patches/0110-chromium-revert-use-ffile-compilation-dir.patch b/srcpkgs/qt6-webengine/patches/0110-chromium-revert-use-ffile-compilation-dir.patch
new file mode 100644
index 000000000000..a00f7ea80f7a
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0110-chromium-revert-use-ffile-compilation-dir.patch
@@ -0,0 +1,57 @@
+From 34a955823630096f5b01c2b01d51c1ea59d22763 Mon Sep 17 00:00:00 2001
+From: Zequan Wu <zequanwu@google.com>
+Date: Tue, 20 Jul 2021 14:13:50 +0000
+Subject: [PATCH] Use -ffile-compilation-dir= instead of
+ -fdebug-compilation-dir=
+
+Bug: 1010267
+Change-Id: If2b4ead8535a76490eb466a38e3d8fed6ea91079
+Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2770738
+Auto-Submit: Zequan Wu <zequanwu@google.com>
+Commit-Queue: Nico Weber <thakis@chromium.org>
+Reviewed-by: Nico Weber <thakis@chromium.org>
+Cr-Commit-Position: refs/heads/master@{#903456}
+--- a/src/3rdparty/chromium/build/config/compiler/BUILD.gn
++++ b/src/3rdparty/chromium/build/config/compiler/BUILD.gn
+@@ -1269,19 +1269,12 @@ config("compiler_deterministic") {
+     # different build directory like "out/feature_a" and "out/feature_b" if
+     # we build same files with same compile flag.
+     # Other paths are already given in relative, no need to normalize them.
+-    if (is_nacl) {
+-      # TODO(https://crbug.com/1231236): Use -ffile-compilation-dir= here.
+-      cflags += [
+-        "-Xclang",
+-        "-fdebug-compilation-dir",
+-        "-Xclang",
+-        ".",
+-      ]
+-    } else {
+-      # -ffile-compilation-dir is an alias for both -fdebug-compilation-dir=
+-      # and -fcoverage-compilation-dir=.
+-      cflags += [ "-ffile-compilation-dir=." ]
+-    }
++    cflags += [
++      "-Xclang",
++      "-fdebug-compilation-dir",
++      "-Xclang",
++      ".",
++    ]
+     if (!is_win) {
+       # We don't use clang -cc1as on Windows (yet? https://crbug.com/762167)
+       asmflags = [ "-Wa,-fdebug-compilation-dir,." ]
+--- a/src/3rdparty/chromium/build/config/compiler/compiler.gni
++++ b/src/3rdparty/chromium/build/config/compiler/compiler.gni
+@@ -228,8 +228,11 @@ declare_args() {
+ # deterministic builds to reduce compile times, so this is less relevant for
+ # official builders.
+ strip_absolute_paths_from_debug_symbols_default =
+-    is_android || is_fuchsia || is_nacl || (is_win && use_lld) || is_linux ||
+-    is_chromeos || (is_apple && !enable_dsyms)
++    # TODO(crbug.com/1010267): remove '!use_clang_coverage', coverage build has
++    # dependency to absolute path of source files.
++    !use_clang_coverage &&
++    (is_android || is_fuchsia || is_nacl || (is_win && use_lld) || is_linux ||
++     is_chromeos || (is_apple && !enable_dsyms))
+ 
+ declare_args() {
+   strip_absolute_paths_from_debug_symbols = strip_absolute_paths_from_debug_symbols_default
diff --git a/srcpkgs/qt6-webengine/patches/0111-chromium-no-Wno-stringop-overread.patch b/srcpkgs/qt6-webengine/patches/0111-chromium-no-Wno-stringop-overread.patch
new file mode 100644
index 000000000000..03eac3f8e067
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0111-chromium-no-Wno-stringop-overread.patch
@@ -0,0 +1,10 @@
+--- a/src/3rdparty/chromium/build/config/compiler/BUILD.gn
++++ b/src/3rdparty/chromium/build/config/compiler/BUILD.gn
+@@ -394,7 +394,6 @@ config("compiler") {
+         "-Wno-parentheses",
+         "-Wno-sign-compare", # fido
+         "-Wno-stringop-overflow", # skia, libaom, protobuf, icu
+-        "-Wno-stringop-overread", # libaom
+         "-Wno-psabi", # skia
+         "-Wno-multichar", # crashpad
+         "-Wno-format-zero-length", # user_agent.cc
diff --git a/srcpkgs/qt6-webengine/patches/0150-chromium-glibc-libc_malloc.patch b/srcpkgs/qt6-webengine/patches/0150-chromium-glibc-libc_malloc.patch
new file mode 100644
index 000000000000..7e1b66e5c73d
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0150-chromium-glibc-libc_malloc.patch
@@ -0,0 +1,24 @@
+--- a/src/3rdparty/chromium/base/process/memory_linux.cc
++++ b/src/3rdparty/chromium/base/process/memory_linux.cc
+@@ -23,6 +23,12 @@
+ #include "third_party/tcmalloc/chromium/src/gperftools/tcmalloc.h"
+ #endif
+ 
++#if defined(LIBC_GLIBC)
++extern "C" {
++extern void *__libc_malloc(size_t size);
++}
++#endif
++
+ namespace base {
+ 
+ namespace {
+@@ -120,7 +126,7 @@ bool UncheckedMalloc(size_t size, void**
+     (!defined(LIBC_GLIBC) && !BUILDFLAG(USE_TCMALLOC))
+   *result = malloc(size);
+ #elif defined(LIBC_GLIBC) && !BUILDFLAG(USE_TCMALLOC)
+-  *result = __libc_malloc(size);
++  *result = ::__libc_malloc(size);
+ #elif BUILDFLAG(USE_TCMALLOC)
+   *result = tc_malloc_skip_new_handler(size);
+ #endif
diff --git a/srcpkgs/qt6-webengine/patches/0200-chromium-musl-include-sys-reg.h-to-get-__WORDSIZE.patch b/srcpkgs/qt6-webengine/patches/0200-chromium-musl-include-sys-reg.h-to-get-__WORDSIZE.patch
new file mode 100644
index 000000000000..41b90071b5e4
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0200-chromium-musl-include-sys-reg.h-to-get-__WORDSIZE.patch
@@ -0,0 +1,21 @@
+From 9001c54d6b974449174a8cee8f3f5d78a9bd6c9e Mon Sep 17 00:00:00 2001
+From: Felix Janda <felix.janda@posteo.de>
+Date: Sun, 1 Feb 2015 14:26:52 +0100
+Subject: [PATCH 3/6] include <sys/reg.h> to get __WORDSIZE on musl libc
+
+---
+ qtwebengine/src/3rdparty/chromium/third_party/breakpad/breakpad/src/common/linux/elf_core_dump.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/common/linux/elf_core_dump.h
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/common/linux/elf_core_dump.h
+@@ -37,6 +37,9 @@
+ #include <limits.h>
+ #include <link.h>
+ #include <stddef.h>
++#ifndef __GLIBC__
++#include <sys/reg.h>
++#endif
+ 
+ #include "common/memory_range.h"
+ 
diff --git a/srcpkgs/qt6-webengine/patches/0201-chromium-musl-dispatch-to-musl.patch b/srcpkgs/qt6-webengine/patches/0201-chromium-musl-dispatch-to-musl.patch
new file mode 100644
index 000000000000..a58a688a4b55
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0201-chromium-musl-dispatch-to-musl.patch
@@ -0,0 +1,103 @@
+--- a/src/3rdparty/chromium/base/allocator/allocator_shim_default_dispatch_to_glibc.cc
++++ b/src/3rdparty/chromium/base/allocator/allocator_shim_default_dispatch_to_glibc.cc
+@@ -8,6 +8,7 @@
+ #include <dlfcn.h>
+ #include <malloc.h>
+ 
++#if defined(__GLIBC__)
+ // This translation unit defines a default dispatch for the allocator shim which
+ // routes allocations to libc functions.
+ // The code here is strongly inspired from tcmalloc's libc_override_glibc.h.
+@@ -87,3 +88,92 @@ const AllocatorDispatch AllocatorDispatc
+     nullptr,               /* aligned_free_function */
+     nullptr,               /* next */
+ };
++
++#else // defined(__GLIBC__)
++
++#include <dlfcn.h>
++
++extern "C" {
++// Declare function pointers to the memory functions
++typedef void* (*t_libc_malloc)(size_t size);
++typedef void* (*t_libc_calloc)(size_t n, size_t size);
++typedef void* (*t_libc_realloc)(void* address, size_t size);
++typedef void* (*t_libc_memalign)(size_t alignment, size_t size);
++typedef void (*t_libc_free)(void* ptr);
++typedef size_t (*t_libc_malloc_usable_size)(void* ptr);
++
++// Static instances of pointers to libc.so dl symbols
++static t_libc_malloc libc_malloc = NULL;
++static t_libc_calloc libc_calloc = NULL;
++static t_libc_realloc libc_realloc = NULL;
++static t_libc_memalign libc_memalign = NULL;
++static t_libc_free libc_free = NULL;
++static t_libc_malloc_usable_size libc_malloc_usable_size = NULL;
++
++// resolve the symbols in libc.so
++void musl_libc_memory_init(void)
++{
++  libc_malloc = (t_libc_malloc) dlsym(RTLD_NEXT, "malloc");
++  libc_calloc = (t_libc_calloc) dlsym(RTLD_NEXT, "calloc");
++  libc_realloc = (t_libc_realloc) dlsym(RTLD_NEXT, "realloc");
++  libc_memalign = (t_libc_memalign) dlsym(RTLD_NEXT, "memalign");
++  libc_free = (t_libc_free) dlsym(RTLD_NEXT, "free");
++  libc_malloc_usable_size = (t_libc_malloc_usable_size) dlsym(RTLD_NEXT, "malloc_usable_size");
++}
++}  // extern "C"
++
++namespace {
++
++using base::allocator::AllocatorDispatch;
++
++void* MuslMalloc(const AllocatorDispatch*, size_t size, void* context) {
++  if (!libc_malloc)
++    musl_libc_memory_init();
++  return (*libc_malloc)(size);
++}
++
++void* MuslCalloc(const AllocatorDispatch*, size_t n, size_t size, void* context) {
++  if (!libc_calloc)
++    musl_libc_memory_init();
++  return (*libc_calloc)(n, size);
++}
++
++void* MuslRealloc(const AllocatorDispatch*, void* address, size_t size, void* context) {
++  if (!libc_realloc)
++    musl_libc_memory_init();
++  return (*libc_realloc)(address, size);
++}
++
++void* MuslMemalign(const AllocatorDispatch*, size_t alignment, size_t size, void* context) {
++  if (!libc_memalign)
++    musl_libc_memory_init();
++  return (*libc_memalign)(alignment, size);
++}
++
++void MuslFree(const AllocatorDispatch*, void* address, void* context) {
++  if (!libc_free)
++    musl_libc_memory_init();
++  (*libc_free)(address);
++}
++
++size_t MuslGetSizeEstimate(const AllocatorDispatch*, void* address, void* context) {
++  // TODO(siggi, primiano): malloc_usable_size may need redirection in the
++  //     presence of interposing shims that divert allocations.
++  if (!libc_malloc_usable_size)
++    musl_libc_memory_init();
++  return (*libc_malloc_usable_size)(address);
++}
++
++}  // namespace
++
++const AllocatorDispatch AllocatorDispatch::default_dispatch = {
++    &MuslMalloc,           /* alloc_function */
++    &MuslCalloc,           /* alloc_zero_initialized_function */
++    &MuslMemalign,         /* alloc_aligned_function */
++    &MuslRealloc,          /* realloc_function */
++    &MuslFree,             /* free_function */
++    &MuslGetSizeEstimate,  /* get_size_estimate_function */
++    nullptr,               /* next */
++};
++
++#endif
diff --git a/srcpkgs/qt6-webengine/patches/0202-chromium-musl-no-mallinfo.patch b/srcpkgs/qt6-webengine/patches/0202-chromium-musl-no-mallinfo.patch
new file mode 100644
index 000000000000..a5bdb5a43a5f
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0202-chromium-musl-no-mallinfo.patch
@@ -0,0 +1,62 @@
+--- a/src/3rdparty/chromium/base/process/process_metrics_posix.cc
++++ b/src/3rdparty/chromium/base/process/process_metrics_posix.cc
+@@ -105,7 +105,7 @@ void IncreaseFdLimitTo(unsigned int max_
+ 
+ #endif  // !defined(OS_FUCHSIA)
+ 
+-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID)
++#if (defined(OS_LINUX) && defined(__GLIBC__)) || defined(OS_CHROMEOS) || defined(OS_ANDROID)
+ namespace {
+ 
+ size_t GetMallocUsageMallinfo() {
+@@ -127,16 +127,16 @@ size_t GetMallocUsageMallinfo() {
+ }
+ 
+ }  // namespace
+-#endif  // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID)
++#endif  // (defined(OS_LINUX) && defined(__GLIBC__)) || defined(OS_CHROMEOS) || defined(OS_ANDROID)
+ 
+ size_t ProcessMetrics::GetMallocUsage() {
+ #if defined(OS_APPLE)
+   malloc_statistics_t stats = {0};
+   malloc_zone_statistics(nullptr, &stats);
+   return stats.size_in_use;
+-#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID)
++#elif (defined(OS_LINUX) && defined(__GLIBC__)) || defined(OS_CHROMEOS) || defined(OS_ANDROID)
+   return GetMallocUsageMallinfo();
+-#elif defined(OS_FUCHSIA)
++#else
+   // TODO(fuchsia): Not currently exposed. https://crbug.com/735087.
+   return 0;
+ #endif
+--- a/src/3rdparty/chromium/third_party/tflite/src/tensorflow/lite/profiling/memory_info.cc
++++ b/src/3rdparty/chromium/third_party/tflite/src/tensorflow/lite/profiling/memory_info.cc
+@@ -27,7 +27,7 @@ namespace memory {
+ const int MemoryUsage::kValueNotSet = 0;
+ 
+ bool MemoryUsage::IsSupported() {
+-#ifdef __linux__
++#ifdef __GLIBC__
+   return true;
+ #endif
+   return false;
+@@ -35,7 +35,7 @@ bool MemoryUsage::IsSupported() {
+ 
+ MemoryUsage GetMemoryUsage() {
+   MemoryUsage result;
+-#ifdef __linux__
++#ifdef __GLIBC__
+   rusage res;
+   if (getrusage(RUSAGE_SELF, &res) == 0) {
+     result.max_rss_kb = res.ru_maxrss;
+--- a/src/3rdparty/chromium/base/trace_event/malloc_dump_provider.cc
++++ b/src/3rdparty/chromium/base/trace_event/malloc_dump_provider.cc
+@@ -213,7 +213,7 @@ bool MallocDumpProvider::OnMemoryDump(co
+                      &allocated_objects_count);
+ #elif defined(OS_FUCHSIA)
+ // TODO(fuchsia): Port, see https://crbug.com/706592.
+-#else
++#elif defined(__GLIBC__)
+ #if defined(__GLIBC__) && defined(__GLIBC_PREREQ)
+ #if __GLIBC_PREREQ(2, 33)
+ #define MALLINFO2_FOUND_IN_LIBC
diff --git a/srcpkgs/qt6-webengine/patches/0203-chromium-musl-siginfo_t.patch b/srcpkgs/qt6-webengine/patches/0203-chromium-musl-siginfo_t.patch
new file mode 100644
index 000000000000..43ef7fd7c5d2
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0203-chromium-musl-siginfo_t.patch
@@ -0,0 +1,18 @@
+There's a subtle difference in the internal name of siginfo_t fields
+between glibc and musl. The structure itself is equivalent, so it
+should suffice to add a macro to rename the field.
+
+--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf/trap.cc
++++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf/trap.cc
+@@ -174,7 +174,11 @@ void Trap::SigSys(int nr, LinuxSigInfo*
+   // If the version of glibc doesn't include this information in
+   // siginfo_t (older than 2.17), we need to explicitly copy it
+   // into an arch_sigsys structure.
++#if defined(__GLIBC__)
+   memcpy(&sigsys, &info->_sifields, sizeof(sigsys));
++#else
++  memcpy(&sigsys, &info->__si_fields, sizeof(sigsys));
++#endif
+ #endif
+ 
+ #if defined(__mips__)
diff --git a/srcpkgs/qt6-webengine/patches/0204-chromium-musl-stackstart.patch b/srcpkgs/qt6-webengine/patches/0204-chromium-musl-stackstart.patch
new file mode 100644
index 000000000000..b03cf43b86db
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0204-chromium-musl-stackstart.patch
@@ -0,0 +1,20 @@
+--- a/src/3rdparty/chromium/third_party/blink/renderer/platform/wtf/stack_util.cc
++++ b/src/3rdparty/chromium/third_party/blink/renderer/platform/wtf/stack_util.cc
+@@ -29,7 +29,7 @@ size_t GetUnderestimatedStackSize() {
+ // FIXME: On Mac OSX and Linux, this method cannot estimate stack size
+ // correctly for the main thread.
+ 
+-#elif defined(__GLIBC__) || defined(OS_ANDROID) || defined(OS_FREEBSD) || \
++#elif defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FREEBSD) || \
+     defined(OS_FUCHSIA)
+   // pthread_getattr_np() can fail if the thread is not invoked by
+   // pthread_create() (e.g., the main thread of blink_unittests).
+@@ -97,7 +97,7 @@ return Threading::ThreadStackSize();
+ }
+ 
+ void* GetStackStart() {
+-#if defined(__GLIBC__) || defined(OS_ANDROID) || defined(OS_FREEBSD) || \
++#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FREEBSD) || \
+     defined(OS_FUCHSIA)
+   pthread_attr_t attr;
+   int error;
diff --git a/srcpkgs/qt6-webengine/patches/0205-chromium-musl-sandbox.patch b/srcpkgs/qt6-webengine/patches/0205-chromium-musl-sandbox.patch
new file mode 100644
index 000000000000..772a578fd823
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0205-chromium-musl-sandbox.patch
@@ -0,0 +1,92 @@
+--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc
++++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc
+@@ -138,7 +138,7 @@ namespace sandbox {
+ // present (as in newer versions of posix_spawn).
+ ResultExpr RestrictCloneToThreadsAndEPERMFork() {
+   const Arg<unsigned long> flags(0);
+-
++#if defined(__GLIBC__)
+   // TODO(mdempsky): Extend DSL to support (flags & ~mask1) == mask2.
+   const uint64_t kAndroidCloneMask = CLONE_VM | CLONE_FS | CLONE_FILES |
+                                      CLONE_SIGHAND | CLONE_THREAD |
+@@ -165,6 +165,17 @@ ResultExpr RestrictCloneToThreadsAndEPER
+   return If(IsAndroid() ? android_test : glibc_test, Allow())
+       .ElseIf(is_fork_or_clone_vfork, Error(EPERM))
+       .Else(CrashSIGSYSClone());
++#else
++  const int required = CLONE_VM | CLONE_FS | CLONE_FILES | CLONE_SIGHAND |
++                       CLONE_THREAD | CLONE_SYSVSEM;
++  const int safe = CLONE_SETTLS | CLONE_PARENT_SETTID | CLONE_CHILD_CLEARTID |
++                   CLONE_DETACHED;
++  const BoolExpr thread_clone_ok = (flags&~safe)==required;
++
++  return If(thread_clone_ok, Allow())
++      .ElseIf((flags & (CLONE_VM | CLONE_THREAD)) == 0, Error(EPERM))
++      .Else(CrashSIGSYSClone());
++#endif
+ }
+ 
+ #ifndef PR_PAC_RESET_KEYS
+--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
++++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
+@@ -419,6 +419,9 @@ bool SyscallSets::IsAllowedProcessStartO
+ #if defined(__i386__)
+     case __NR_waitpid:
+ #endif
++#if !defined(__GLIBC__)
++    case __NR_set_tid_address:
++#endif
+       return true;
+     case __NR_clone:  // Should be parameter-restricted.
+     case __NR_setns:  // Privileged.
+@@ -431,7 +434,9 @@ bool SyscallSets::IsAllowedProcessStartO
+ #if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
+     case __NR_set_thread_area:
+ #endif
++#if defined(__GLIBC__)
+     case __NR_set_tid_address:
++#endif
+     case __NR_unshare:
+ #if !defined(__mips__) && !defined(__aarch64__)
+     case __NR_vfork:
+@@ -545,6 +550,9 @@ bool SyscallSets::IsAllowedAddressSpaceA
+     case __NR_mlock:
+     case __NR_munlock:
+     case __NR_munmap:
++#if !defined(__GLIBC__)
++    case __NR_mremap:
++#endif
+       return true;
+     case __NR_madvise:
+     case __NR_mincore:
+@@ -562,7 +570,9 @@ bool SyscallSets::IsAllowedAddressSpaceA
+     case __NR_modify_ldt:
+ #endif
+     case __NR_mprotect:
++#if defined(__GLIBC__)
+     case __NR_mremap:
++#endif
+     case __NR_msync:
+     case __NR_munlockall:
+     case __NR_readahead:
+--- a/src/3rdparty/chromium/sandbox/policy/linux/bpf_renderer_policy_linux.cc
++++ b/src/3rdparty/chromium/sandbox/policy/linux/bpf_renderer_policy_linux.cc
+@@ -97,11 +97,18 @@ ResultExpr RendererProcessPolicy::Evalua
+     case __NR_sysinfo:
+     case __NR_times:
+     case __NR_uname:
++#if !defined(__GLIBC__)
++    case __NR_sched_getparam:
++    case __NR_sched_getscheduler:
++    case __NR_sched_setscheduler:
++#endif
+       return Allow();
+     case __NR_sched_getaffinity:
++#if defined(__GLIBC__)
+     case __NR_sched_getparam:
+     case __NR_sched_getscheduler:
+     case __NR_sched_setscheduler:
++#endif
+       return RestrictSchedTarget(GetPolicyPid(), sysno);
+     case __NR_prlimit64:
+       // See crbug.com/662450 and setrlimit comment above.
diff --git a/srcpkgs/qt6-webengine/patches/0206-chromium-musl-default-stacksize.patch b/srcpkgs/qt6-webengine/patches/0206-chromium-musl-default-stacksize.patch
new file mode 100644
index 000000000000..bc07495b8144
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0206-chromium-musl-default-stacksize.patch
@@ -0,0 +1,15 @@
+--- a/src/3rdparty/chromium/base/threading/platform_thread_linux.cc
++++ b/src/3rdparty/chromium/base/threading/platform_thread_linux.cc
+@@ -439,7 +439,12 @@ void TerminateOnThread() {}
+ 
+ size_t GetDefaultThreadStackSize(const pthread_attr_t& attributes) {
+ #if !defined(THREAD_SANITIZER)
++#if defined(__GLIBC__)
+   return 0;
++#else // defined(__GLIBC__)
++  // For Musl libc try with a default stack size of 2 MiB
++  return 2 * 1024 * 1024;
++#endif // !defined(__GLIBC__)
+ #else
+   // ThreadSanitizer bloats the stack heavily. Evidence has been that the
+   // default stack size isn't enough for some browser tests.
diff --git a/srcpkgs/qt6-webengine/patches/0208-chromium-musl-execinfo.patch b/srcpkgs/qt6-webengine/patches/0208-chromium-musl-execinfo.patch
new file mode 100644
index 000000000000..9f3b964676b3
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0208-chromium-musl-execinfo.patch
@@ -0,0 +1,125 @@
+--- a/src/3rdparty/chromium/base/debug/stack_trace.cc
++++ b/src/3rdparty/chromium/base/debug/stack_trace.cc
+@@ -252,7 +252,9 @@ void StackTrace::Print() const {
+ }
+ 
+ void StackTrace::OutputToStream(std::ostream* os) const {
++#if defined(__GLIBC__) && !defined(_AIX)
+   OutputToStreamWithPrefix(os, nullptr);
++#endif
+ }
+ 
+ std::string StackTrace::ToString() const {
+@@ -260,7 +262,7 @@ std::string StackTrace::ToString() const
+ }
+ std::string StackTrace::ToStringWithPrefix(const char* prefix_string) const {
+   std::stringstream stream;
+-#if !defined(__UCLIBC__) && !defined(_AIX)
++#if defined(__GLIBC__) && !defined(_AIX)
+   OutputToStreamWithPrefix(&stream, prefix_string);
+ #endif
+   return stream.str();
+--- a/src/3rdparty/chromium/base/debug/stack_trace_posix.cc
++++ b/src/3rdparty/chromium/base/debug/stack_trace_posix.cc
+@@ -27,7 +27,7 @@
+ #if !defined(USE_SYMBOLIZE)
+ #include <cxxabi.h>
+ #endif
+-#if !defined(__UCLIBC__) && !defined(_AIX)
++#if defined(__GLIBC__) && !defined(_AIX)
+ #include <execinfo.h>
+ #endif
+ 
+@@ -89,7 +89,7 @@ void DemangleSymbols(std::string* text)
+   // Note: code in this function is NOT async-signal safe (std::string uses
+   // malloc internally).
+ 
+-#if !defined(__UCLIBC__) && !defined(_AIX)
++#if defined(__GLIBC__) && !defined(_AIX)
+   std::string::size_type search_from = 0;
+   while (search_from < text->size()) {
+     // Look for the start of a mangled symbol, from search_from.
+@@ -124,7 +124,7 @@ void DemangleSymbols(std::string* text)
+       search_from = mangled_start + 2;
+     }
+   }
+-#endif  // !defined(__UCLIBC__) && !defined(_AIX)
++#endif  // !defined(__GLIBC__) && !defined(_AIX)
+ }
+ #endif  // !defined(USE_SYMBOLIZE)
+ 
+@@ -136,7 +136,7 @@ class BacktraceOutputHandler {
+   virtual ~BacktraceOutputHandler() = default;
+ };
+ 
+-#if !defined(__UCLIBC__) && !defined(_AIX)
++#if defined(__GLIBC__) && !defined(_AIX)
+ void OutputPointer(void* pointer, BacktraceOutputHandler* handler) {
+   // This should be more than enough to store a 64-bit number in hex:
+   // 16 hex digits + 1 for null-terminator.
+@@ -219,7 +219,7 @@ void ProcessBacktrace(void* const* trace
+   }
+ #endif  // defined(USE_SYMBOLIZE)
+ }
+-#endif  // !defined(__UCLIBC__) && !defined(_AIX)
++#endif  // !defined(__GLIBC__) && !defined(_AIX)
+ 
+ void PrintToStderr(const char* output) {
+   // NOTE: This code MUST be async-signal safe (it's used by in-process
+@@ -839,7 +839,7 @@ size_t CollectStackTrace(void** trace, s
+   // If we do not have unwind tables, then try tracing using frame pointers.
+   return base::debug::TraceStackFramePointers(const_cast<const void**>(trace),
+                                               count, 0);
+-#elif !defined(__UCLIBC__) && !defined(_AIX)
++#elif defined(__GLIBC__) && !defined(_AIX)
+   // Though the backtrace API man page does not list any possible negative
+   // return values, we take no chance.
+   return base::saturated_cast<size_t>(backtrace(trace, count));
+@@ -852,13 +852,13 @@ void StackTrace::PrintWithPrefix(const c
+ // NOTE: This code MUST be async-signal safe (it's used by in-process
+ // stack dumping signal handler). NO malloc or stdio is allowed here.
+ 
+-#if !defined(__UCLIBC__) && !defined(_AIX)
++#if defined(__GLIBC__) && !defined(_AIX)
+   PrintBacktraceOutputHandler handler;
+   ProcessBacktrace(trace_, count_, prefix_string, &handler);
+ #endif
+ }
+ 
+-#if !defined(__UCLIBC__) && !defined(_AIX)
++#if defined(__GLIBC__) && !defined(_AIX)
+ void StackTrace::OutputToStreamWithPrefix(std::ostream* os,
+                                           const char* prefix_string) const {
+   StreamBacktraceOutputHandler handler(os);
+--- a/src/3rdparty/chromium/base/logging.cc
++++ b/src/3rdparty/chromium/base/logging.cc
+@@ -582,7 +582,7 @@ LogMessage::LogMessage(const char* file,
+ 
+ LogMessage::~LogMessage() {
+   size_t stack_start = stream_.tellp();
+-#if !defined(OFFICIAL_BUILD) && !defined(OS_NACL) && !defined(__UCLIBC__) && \
++#if !defined(OFFICIAL_BUILD) && !defined(OS_NACL) && defined(__GLIBC__) && \
+     !defined(OS_AIX)
+   if (severity_ == LOGGING_FATAL && !base::debug::BeingDebugged()) {
+     // Include a stack trace on a fatal, unless a debugger is attached.
+--- 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 @@
+ 
+ #if defined(DEBUG) && defined(V8_OS_LINUX) && !defined(V8_OS_ANDROID)
+ #define SYMBOLIZE_FUNCTION
++#if defined(__GLIBC__)
+ #include <execinfo.h>
++#endif
+ 
+ #include <vector>
+ 
+@@ -103,7 +105,7 @@ void ExternalReferenceTable::Init(Isolat
+ }
+ 
+ const char* ExternalReferenceTable::ResolveSymbol(void* address) {
+-#ifdef SYMBOLIZE_FUNCTION
++#if defined(SYMBOLIZE_FUNCTION) && defined(__GLIBC__)
+   char** names = backtrace_symbols(&address, 1);
+   const char* name = names[0];
+   // The array of names is malloc'ed. However, each name string is static
diff --git a/srcpkgs/qt6-webengine/patches/0209-chromium-musl-thread-stacksize.patch b/srcpkgs/qt6-webengine/patches/0209-chromium-musl-thread-stacksize.patch
new file mode 100644
index 000000000000..4b760a428b25
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0209-chromium-musl-thread-stacksize.patch
@@ -0,0 +1,22 @@
+--- a/src/3rdparty/chromium/ppapi/utility/threading/simple_thread.cc
++++ b/src/3rdparty/chromium/ppapi/utility/threading/simple_thread.cc
+@@ -13,7 +13,7 @@ namespace pp {
+ namespace {
+ 
+ // Use 2MB default stack size for Native Client, otherwise use system default.
+-#if defined(__native_client__)
++#if defined(__native_client__) || !defined(__GLIBC__)
+ const size_t kDefaultStackSize = 2 * 1024 * 1024;
+ #else
+ const size_t kDefaultStackSize = 0;
+--- a/src/3rdparty/chromium/v8/src/base/platform/platform-posix.cc
++++ b/src/3rdparty/chromium/v8/src/base/platform/platform-posix.cc
+@@ -883,7 +883,7 @@ bool Thread::Start() {
+ #if V8_OS_MACOSX
+     // Default on Mac OS X is 512kB -- bump up to 1MB
+     stack_size = 1 * 1024 * 1024;
+-#elif V8_OS_AIX
++#elif V8_OS_AIX || !defined(__GLIBC__)
+     // Default on AIX is 96kB -- bump up to 2MB
+     stack_size = 2 * 1024 * 1024;
+ #endif
diff --git a/srcpkgs/qt6-webengine/patches/0210-chromium-musl-msgvec-push_back.patch b/srcpkgs/qt6-webengine/patches/0210-chromium-musl-msgvec-push_back.patch
new file mode 100644
index 000000000000..905daa223700
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0210-chromium-musl-msgvec-push_back.patch
@@ -0,0 +1,14 @@
+--- a/src/3rdparty/chromium/net/socket/udp_socket_posix.cc
++++ b/src/3rdparty/chromium/net/socket/udp_socket_posix.cc
+@@ -1162,7 +1162,11 @@ SendResult UDPSocketPosixSender::Interna
+     msg_iov->push_back({const_cast<char*>(buffer->data()), buffer->length()});
+   msgvec->reserve(buffers.size());
+   for (size_t j = 0; j < buffers.size(); j++)
++#if defined(__GLIBC__)
+     msgvec->push_back({{nullptr, 0, &msg_iov[j], 1, nullptr, 0, 0}, 0});
++#else
++    msgvec->push_back({{nullptr, 0, &msg_iov[j], 1, 0, 0, 0}, 0});
++#endif
+   int result = HANDLE_EINTR(Sendmmsg(fd, &msgvec[0], buffers.size(), 0));
+   SendResult send_result(0, 0, std::move(buffers));
+   if (result < 0) {
diff --git a/srcpkgs/qt6-webengine/patches/0211-chromium-musl-canonicalize-file-name-musl.patch b/srcpkgs/qt6-webengine/patches/0211-chromium-musl-canonicalize-file-name-musl.patch
new file mode 100644
index 000000000000..d43e6bd488bc
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0211-chromium-musl-canonicalize-file-name-musl.patch
@@ -0,0 +1,11 @@
+--- a/src/3rdparty/chromium/third_party/nasm/nasmlib/realpath.c
++++ b/src/3rdparty/chromium/third_party/nasm/nasmlib/realpath.c
+@@ -55,7 +55,7 @@
+  */
+ char *nasm_realpath(const char *rel_path)
+ {
+-    char *rp = canonicalize_file_name(rel_path);
++    char *rp = realpath(rel_path, NULL);
+     return rp ? rp : nasm_strdup(rel_path);
+ }
+ 
diff --git a/srcpkgs/qt6-webengine/patches/0212-chromium-musl-no-getcontext.patch b/srcpkgs/qt6-webengine/patches/0212-chromium-musl-no-getcontext.patch
new file mode 100644
index 000000000000..5755f1b45a7d
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0212-chromium-musl-no-getcontext.patch
@@ -0,0 +1,29 @@
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc
+@@ -489,8 +489,10 @@ bool ExceptionHandler::SimulateSignalDel
+   // ExceptionHandler::HandleSignal().
+   siginfo.si_code = SI_USER;
+   siginfo.si_pid = getpid();
+-  ucontext_t context;
++  ucontext_t context = { 0 };
++#if defined(__GLIBC__)
+   getcontext(&context);
++#endif
+   return HandleSignal(sig, &siginfo, &context);
+ }
+ 
+@@ -675,9 +677,14 @@ bool ExceptionHandler::WriteMinidump() {
+   sys_prctl(PR_SET_DUMPABLE, 1, 0, 0, 0);
+ 
+   CrashContext context;
++
++#if defined(__GLIBC__)
+   int getcontext_result = getcontext(&context.context);
+   if (getcontext_result)
+     return false;
++#else
++  return false;
++#endif
+ 
+ #if defined(__i386__)
+   // In CPUFillFromUContext in minidumpwriter.cc the stack pointer is retrieved
diff --git a/srcpkgs/qt6-webengine/patches/0213-chromium-musl-crashpad.patch b/srcpkgs/qt6-webengine/patches/0213-chromium-musl-crashpad.patch
new file mode 100644
index 000000000000..71bbad2af17e
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0213-chromium-musl-crashpad.patch
@@ -0,0 +1,24 @@
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/compat/linux/sys/ptrace.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/compat/linux/sys/ptrace.h
+@@ -17,7 +17,9 @@
+ 
+ #include_next <sys/ptrace.h>
+ 
++#ifdef __GLIBC__
+ #include <sys/cdefs.h>
++#endif
+ 
+ // https://sourceware.org/bugzilla/show_bug.cgi?id=22433
+ #if !defined(PTRACE_GET_THREAD_AREA) && !defined(PT_GET_THREAD_AREA) && \
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/util/linux/ptracer.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/util/linux/ptracer.cc
+@@ -26,6 +26,9 @@
+ 
+ #if defined(ARCH_CPU_X86_FAMILY)
+ #include <asm/ldt.h>
++#if !defined(__GLIBC__)
++#include <asm/ptrace-abi.h>
++#endif
+ #endif
+ 
+ namespace crashpad {
diff --git a/srcpkgs/qt6-webengine/patches/0214-chromium-musl-fixes.patch b/srcpkgs/qt6-webengine/patches/0214-chromium-musl-fixes.patch
new file mode 100644
index 000000000000..55b267ed1714
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0214-chromium-musl-fixes.patch
@@ -0,0 +1,108 @@
+--- a/src/3rdparty/chromium/sandbox/linux/suid/process_util.h
++++ b/src/3rdparty/chromium/sandbox/linux/suid/process_util.h
+@@ -12,6 +12,15 @@
+ #include <stdint.h>
+ #include <sys/types.h>
+ 
++#if !defined(__GLIBC__) && !defined(TEMP_FAILURE_RETRY)
++# define TEMP_FAILURE_RETRY(expression) \
++	(__extension__			\
++	 ({ long int __result;		\
++	  do __result = (long int) (expression); \
++	  while (__result == -1L && errno == EINTR); \
++	  __result; }))
++#endif
++
+ // This adjusts /proc/process/oom_score_adj so the Linux OOM killer
+ // will prefer certain process types over others. The range for the
+ // adjustment is [-1000, 1000], with [0, 1000] being user accessible.
+--- a/src/3rdparty/chromium/services/device/serial/serial_io_handler_posix.cc
++++ b/src/3rdparty/chromium/services/device/serial/serial_io_handler_posix.cc
+@@ -6,6 +6,7 @@
+ 
+ #include <sys/ioctl.h>
+ #include <termios.h>
++#include <asm-generic/ioctls.h>
+ 
+ #include <algorithm>
+ #include <utility>
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h
+@@ -38,6 +38,10 @@
+ #include "common/memory_allocator.h"
+ #include "google_breakpad/common/minidump_format.h"
+ 
++#ifndef __GLIBC__
++#define _libc_fpstate _fpstate
++#endif
++
+ namespace google_breakpad {
+ 
+ // Wraps platform-dependent implementations of accessors to ucontext_t structs.
+--- a/src/3rdparty/chromium/third_party/ffmpeg/libavutil/cpu.c
++++ b/src/3rdparty/chromium/third_party/ffmpeg/libavutil/cpu.c
+@@ -41,8 +41,10 @@
+ #include <sys/param.h>
+ #endif
+ #include <sys/types.h>
++#ifdef __GLIBC__
+ #include <sys/sysctl.h>
+ #endif
++#endif
+ #if HAVE_UNISTD_H
+ #include <unistd.h>
+ #endif
+--- a/src/3rdparty/chromium/third_party/perfetto/include/perfetto/ext/base/thread_utils.h
++++ b/src/3rdparty/chromium/third_party/perfetto/include/perfetto/ext/base/thread_utils.h
+@@ -29,9 +29,7 @@
+ #include <algorithm>
+ #endif
+ 
+-#if PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID)
+ #include <sys/prctl.h>
+-#endif
+ 
+ // Internal implementation utils that aren't as widely useful/supported as
+ // base/thread_utils.h.
+@@ -58,7 +56,7 @@ inline bool MaybeSetThreadName(const std
+ 
+ inline bool GetThreadName(std::string& out_result) {
+   char buf[16] = {};
+-#if PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID)
++#if !defined(__GLIBC__)
+   if (prctl(PR_GET_NAME, buf) != 0)
+     return false;
+ #else
+--- a/src/3rdparty/chromium/third_party/lss/linux_syscall_support.h
++++ b/src/3rdparty/chromium/third_party/lss/linux_syscall_support.h
+@@ -1300,6 +1300,18 @@ struct kernel_statfs {
+ #ifndef __NR_fallocate
+ #define __NR_fallocate          285
+ #endif
++
++#if !defined(__GLIBC__)
++#ifdef __NR_pread
++#undef __NR_pread
++#endif
++#ifdef __NR_pwrite
++#undef __NR_pwrite
++#endif
++#define __NR_pread __NR_pread64
++#define __NR_pwrite __NR_pwrite64
++#endif /* !defined(__GLIBC__) */
++
+ #ifndef __NR_getrandom
+ #define __NR_getrandom          318
+ #endif
+--- a/src/3rdparty/chromium/net/dns/dns_config_service_posix.cc
++++ b/src/3rdparty/chromium/net/dns/dns_config_service_posix.cc
+@@ -93,7 +93,8 @@ absl::optional<DnsConfig> ReadDnsConfig(
+ 
+   absl::optional<DnsConfig> dns_config;
+ // TODO(fuchsia): Use res_ninit() when it's implemented on Fuchsia.
+-#if defined(OS_OPENBSD) || defined(OS_FUCHSIA)
++#if defined(OS_OPENBSD) || defined(OS_FUCHSIA) || \
++  (defined(OS_LINUX) && !defined(__GLIBC__))
+   // Note: res_ninit in glibc always returns 0 and sets RES_INIT.
+   // res_init behaves the same way.
+   memset(&_res, 0, sizeof(_res));
diff --git a/srcpkgs/qt6-webengine/patches/0215-chromium-musl-cdefs.patch b/srcpkgs/qt6-webengine/patches/0215-chromium-musl-cdefs.patch
new file mode 100644
index 000000000000..9d1daec29118
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0215-chromium-musl-cdefs.patch
@@ -0,0 +1,29 @@
+--- a/src/3rdparty/chromium/third_party/libsync/src/include/sync/sync.h
++++ b/src/3rdparty/chromium/third_party/libsync/src/include/sync/sync.h
+@@ -19,12 +19,13 @@
+ #ifndef __SYS_CORE_SYNC_H
+ #define __SYS_CORE_SYNC_H
+ 
+-#include <sys/cdefs.h>
+ #include <stdint.h>
+ 
+ #include <linux/types.h>
+ 
+-__BEGIN_DECLS
++#ifdef __cplusplus
++extern "C" {
++#endif
+ 
+ struct sync_legacy_merge_data {
+  int32_t fd2;
+@@ -158,6 +159,9 @@ struct sync_pt_info *sync_pt_info(struct
+                                   struct sync_pt_info *itr);
+ void sync_fence_info_free(struct sync_fence_info_data *info);
+ 
+-__END_DECLS
++#ifdef __cplusplus
++}
++#endif
++
+ 
+ #endif /* __SYS_CORE_SYNC_H */
diff --git a/srcpkgs/qt6-webengine/patches/0216-chromium-musl-stat.patch b/srcpkgs/qt6-webengine/patches/0216-chromium-musl-stat.patch
new file mode 100644
index 000000000000..4509a6957cd7
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0216-chromium-musl-stat.patch
@@ -0,0 +1,12 @@
+--- a/src/3rdparty/chromium/base/files/file.h
++++ b/src/3rdparty/chromium/base/files/file.h
+@@ -19,7 +19,8 @@
+ #include "build/build_config.h"
+ 
+ #if defined(OS_BSD) || defined(OS_APPLE) || defined(OS_NACL) || \
+-    defined(OS_FUCHSIA) || (defined(OS_ANDROID) && __ANDROID_API__ < 21)
++    defined(OS_FUCHSIA) || (defined(OS_ANDROID) && __ANDROID_API__ < 21) || \
++    (defined(OS_LINUX) && !defined(__GLIBC__))
+ struct stat;
+ namespace base {
+ typedef struct stat stat_wrapper_t;
diff --git a/srcpkgs/qt6-webengine/patches/0217-chromium-musl-resolver.patch b/srcpkgs/qt6-webengine/patches/0217-chromium-musl-resolver.patch
new file mode 100644
index 000000000000..c3d7afad9b19
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0217-chromium-musl-resolver.patch
@@ -0,0 +1,77 @@
+--- a/src/3rdparty/chromium/net/dns/dns_config_service_linux.cc
++++ b/src/3rdparty/chromium/net/dns/dns_config_service_linux.cc
+@@ -432,11 +432,13 @@ class DnsConfigServiceLinux::ConfigReade
+     base::ScopedBlockingCall scoped_blocking_call(
+         FROM_HERE, base::BlockingType::MAY_BLOCK);
+ 
++#if defined(__GLIBC__)
+     std::unique_ptr<struct __res_state> res = resolv_reader_->GetResState();
+     if (res) {
+       dns_config_ = ConvertResStateToDnsConfig(*res.get());
+       resolv_reader_->CloseResState(res.get());
+     }
++#endif
+ 
+     UMA_HISTOGRAM_BOOLEAN("Net.DNS.DnsConfig.Resolv.Read",
+                           dns_config_.has_value());
+@@ -486,6 +488,7 @@ class DnsConfigServiceLinux::ConfigReade
+ 
+ std::unique_ptr<struct __res_state>
+ DnsConfigServiceLinux::ResolvReader::GetResState() {
++#if defined(__GLIBC__)
+   auto res = std::make_unique<struct __res_state>();
+   memset(res.get(), 0, sizeof(struct __res_state));
+ 
+@@ -495,11 +498,16 @@ DnsConfigServiceLinux::ResolvReader::Get
+   }
+ 
+   return res;
++#else
++  return nullptr;
++#endif
+ }
+ 
+ void DnsConfigServiceLinux::ResolvReader::CloseResState(
+     struct __res_state* res) {
++#if defined(__GLIBC__)
+   res_nclose(res);
++#endif
+ }
+ 
+ DnsConfigServiceLinux::DnsConfigServiceLinux()
+--- a/src/3rdparty/chromium/net/dns/dns_reloader.cc
++++ b/src/3rdparty/chromium/net/dns/dns_reloader.cc
+@@ -4,8 +4,7 @@
+ 
+ #include "net/dns/dns_reloader.h"
+ 
+-#if defined(OS_POSIX) && !defined(OS_APPLE) && !defined(OS_OPENBSD) && \
+-    !defined(OS_ANDROID) && !defined(OS_FUCHSIA)
++#ifdef __GLIBC__
+ 
+ #include <resolv.h>
+ 
+--- a/src/3rdparty/chromium/net/dns/host_resolver_manager.cc
++++ b/src/3rdparty/chromium/net/dns/host_resolver_manager.cc
+@@ -2720,8 +2720,7 @@ HostResolverManager::HostResolverManager
+   NetworkChangeNotifier::AddConnectionTypeObserver(this);
+   if (system_dns_config_notifier_)
+     system_dns_config_notifier_->AddObserver(this);
+-#if defined(OS_POSIX) && !defined(OS_APPLE) && !defined(OS_OPENBSD) && \
+-    !defined(OS_ANDROID)
++#ifdef __GLIBC__
+   EnsureDnsReloaderInit();
+ #endif
+ 
+--- a/src/3rdparty/chromium/net/dns/host_resolver_proc.cc
++++ b/src/3rdparty/chromium/net/dns/host_resolver_proc.cc
+@@ -176,8 +176,7 @@ int SystemHostResolverCall(const std::st
+   base::ScopedBlockingCall scoped_blocking_call(FROM_HERE,
+                                                 base::BlockingType::WILL_BLOCK);
+ 
+-#if defined(OS_POSIX) && !defined(OS_APPLE) && !defined(OS_OPENBSD) && \
+-    !defined(OS_ANDROID) && !defined(OS_FUCHSIA)
++#ifdef __GLIBC__
+   DnsReloaderMaybeReload();
+ #endif
+   absl::optional<AddressInfo> ai;
diff --git a/srcpkgs/qt6-webengine/patches/0600-chromium-sndio.patch b/srcpkgs/qt6-webengine/patches/0600-chromium-sndio.patch
new file mode 100644
index 000000000000..0302874ffba4
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0600-chromium-sndio.patch
@@ -0,0 +1,876 @@
+--- a/src/3rdparty/chromium/media/BUILD.gn
++++ b/src/3rdparty/chromium/media/BUILD.gn
+@@ -72,6 +72,9 @@ config("media_config") {
+       defines += [ "DLOPEN_PULSEAUDIO" ]
+     }
+   }
++  if (use_sndio) {
++    defines += [ "USE_SNDIO" ]
++  }
+   if (use_cras) {
+     defines += [ "USE_CRAS" ]
+   }
+--- a/src/3rdparty/chromium/media/audio/BUILD.gn
++++ b/src/3rdparty/chromium/media/audio/BUILD.gn
+@@ -240,6 +240,17 @@ source_set("audio") {
+     sources += [ "linux/audio_manager_linux.cc" ]
+   }
+ 
++  if (use_sndio) {
++    libs += [ "sndio" ]
++    sources += [
++      "sndio/audio_manager_sndio.cc",
++      "sndio/sndio_input.cc",
++      "sndio/sndio_input.h",
++      "sndio/sndio_output.cc",
++      "sndio/sndio_output.h"
++    ]
++  }
++
+   if (use_alsa) {
+     libs += [ "asound" ]
+     sources += [
+--- a/src/3rdparty/chromium/media/audio/linux/audio_manager_linux.cc
++++ b/src/3rdparty/chromium/media/audio/linux/audio_manager_linux.cc
+@@ -25,6 +25,11 @@
+ #include "media/audio/pulse/audio_manager_pulse.h"
+ #include "media/audio/pulse/pulse_util.h"
+ #endif
++#if defined(USE_SNDIO)
++#include "media/audio/sndio/audio_manager_sndio.h"
++#include "media/audio/sndio/sndio_input.h"
++#include "media/audio/sndio/sndio_output.h"
++#endif
+ 
+ namespace media {
+ 
+@@ -32,7 +37,8 @@ enum LinuxAudioIO {
+   kPulse,
+   kAlsa,
+   kCras,
+-  kAudioIOMax = kCras  // Must always be equal to largest logged entry.
++  kSndio,
++  kAudioIOMax = kSndio // Must always be equal to largest logged entry.
+ };
+ 
+ std::unique_ptr<media::AudioManager> CreateAudioManager(
+@@ -45,6 +51,16 @@ std::unique_ptr<media::AudioManager> Cre
+                                               audio_log_factory);
+   }
+ 
++#if defined(USE_SNDIO)
++  struct sio_hdl *hdl = sio_open(SIO_DEVANY, SIO_PLAY, 0);
++  if (hdl != NULL) {
++    sio_close(hdl);
++    UMA_HISTOGRAM_ENUMERATION("Media.LinuxAudioIO", kSndio, kAudioIOMax + 1);
++    return std::make_unique<AudioManagerSndio>(std::move(audio_thread),
++                                                  audio_log_factory);
++  }
++#endif
++
+ #if defined(USE_CRAS)
+   if (base::CommandLine::ForCurrentProcess()->HasSwitch(switches::kUseCras)) {
+     UMA_HISTOGRAM_ENUMERATION("Media.LinuxAudioIO", kCras, kAudioIOMax + 1);
+--- /dev/null
++++ b/src/3rdparty/chromium/media/audio/sndio/audio_manager_sndio.cc
+@@ -0,0 +1,148 @@
++// Copyright (c) 2012 The Chromium Authors. All rights reserved.
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++#include "media/audio/sndio/audio_manager_sndio.h"
++
++#include "base/metrics/histogram_macros.h"
++#include "base/memory/ptr_util.h"
++#include "media/audio/audio_device_description.h"
++#include "media/audio/audio_output_dispatcher.h"
++#include "media/audio/sndio/sndio_input.h"
++#include "media/audio/sndio/sndio_output.h"
++#include "media/base/limits.h"
++#include "media/base/media_switches.h"
++
++namespace media {
++
++
++// Maximum number of output streams that can be open simultaneously.
++static const int kMaxOutputStreams = 4;
++
++// Default sample rate for input and output streams.
++static const int kDefaultSampleRate = 48000;
++
++void AddDefaultDevice(AudioDeviceNames* device_names) {
++  DCHECK(device_names->empty());
++  device_names->push_front(AudioDeviceName::CreateDefault());
++}
++
++bool AudioManagerSndio::HasAudioOutputDevices() {
++  return true;
++}
++
++bool AudioManagerSndio::HasAudioInputDevices() {
++  return true;
++}
++
++void AudioManagerSndio::GetAudioInputDeviceNames(
++    AudioDeviceNames* device_names) {
++  DCHECK(device_names->empty());
++  AddDefaultDevice(device_names);
++}
++
++void AudioManagerSndio::GetAudioOutputDeviceNames(
++    AudioDeviceNames* device_names) {
++  AddDefaultDevice(device_names);
++}
++
++const char* AudioManagerSndio::GetName() {
++  return "SNDIO";
++}
++
++AudioParameters AudioManagerSndio::GetInputStreamParameters(
++    const std::string& device_id) {
++  static const int kDefaultInputBufferSize = 1024;
++
++  int user_buffer_size = GetUserBufferSize();
++  int buffer_size = user_buffer_size ?
++      user_buffer_size : kDefaultInputBufferSize;
++
++  return AudioParameters(
++      AudioParameters::AUDIO_PCM_LOW_LATENCY, CHANNEL_LAYOUT_STEREO,
++      kDefaultSampleRate, buffer_size);
++}
++
++AudioManagerSndio::AudioManagerSndio(std::unique_ptr<AudioThread> audio_thread,
++                                         AudioLogFactory* audio_log_factory)
++    : AudioManagerBase(std::move(audio_thread),
++                       audio_log_factory) {
++  DLOG(WARNING) << "AudioManagerSndio";
++  SetMaxOutputStreamsAllowed(kMaxOutputStreams);
++}
++
++AudioManagerSndio::~AudioManagerSndio() {
++  Shutdown();
++}
++
++AudioOutputStream* AudioManagerSndio::MakeLinearOutputStream(
++    const AudioParameters& params,
++    const LogCallback& log_callback) {
++  DCHECK_EQ(AudioParameters::AUDIO_PCM_LINEAR, params.format());
++  return MakeOutputStream(params);
++}
++
++AudioOutputStream* AudioManagerSndio::MakeLowLatencyOutputStream(
++    const AudioParameters& params,
++    const std::string& device_id,
++    const LogCallback& log_callback) {
++  DLOG_IF(ERROR, !device_id.empty()) << "Not implemented!";
++  DCHECK_EQ(AudioParameters::AUDIO_PCM_LOW_LATENCY, params.format());
++  return MakeOutputStream(params);
++}
++
++AudioInputStream* AudioManagerSndio::MakeLinearInputStream(
++    const AudioParameters& params,
++    const std::string& device_id,
++    const LogCallback& log_callback) {
++  DCHECK_EQ(AudioParameters::AUDIO_PCM_LINEAR, params.format());
++  return MakeInputStream(params);
++}
++
++AudioInputStream* AudioManagerSndio::MakeLowLatencyInputStream(
++    const AudioParameters& params,
++    const std::string& device_id,
++    const LogCallback& log_callback) {
++  DCHECK_EQ(AudioParameters::AUDIO_PCM_LOW_LATENCY, params.format());
++  return MakeInputStream(params);
++}
++
++AudioParameters AudioManagerSndio::GetPreferredOutputStreamParameters(
++    const std::string& output_device_id,
++    const AudioParameters& input_params) {
++  // TODO(tommi): Support |output_device_id|.
++  DLOG_IF(ERROR, !output_device_id.empty()) << "Not implemented!";
++  static const int kDefaultOutputBufferSize = 2048;
++
++  ChannelLayout channel_layout = CHANNEL_LAYOUT_STEREO;
++  int sample_rate = kDefaultSampleRate;
++  int buffer_size = kDefaultOutputBufferSize;
++  if (input_params.IsValid()) {
++    sample_rate = input_params.sample_rate();
++    channel_layout = input_params.channel_layout();
++    buffer_size = std::min(buffer_size, input_params.frames_per_buffer());
++  }
++
++  int user_buffer_size = GetUserBufferSize();
++  if (user_buffer_size)
++    buffer_size = user_buffer_size;
++
++  return AudioParameters(
++      AudioParameters::AUDIO_PCM_LOW_LATENCY, channel_layout,
++      sample_rate, buffer_size);
++}
++
++AudioInputStream* AudioManagerSndio::MakeInputStream(
++    const AudioParameters& params) {
++  DLOG(WARNING) << "MakeInputStream";
++  return new SndioAudioInputStream(this,
++             AudioDeviceDescription::kDefaultDeviceId, params);
++}
++
++AudioOutputStream* AudioManagerSndio::MakeOutputStream(
++    const AudioParameters& params) {
++  DLOG(WARNING) << "MakeOutputStream";
++  return new SndioAudioOutputStream(params, this);
++}
++
++}  // namespace media
+--- /dev/null
++++ b/src/3rdparty/chromium/media/audio/sndio/audio_manager_sndio.h
+@@ -0,0 +1,65 @@
++// Copyright (c) 2012 The Chromium Authors. All rights reserved.
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++#ifndef MEDIA_AUDIO_SNDIO_AUDIO_MANAGER_SNDIO_H_
++#define MEDIA_AUDIO_SNDIO_AUDIO_MANAGER_SNDIO_H_
++
++#include <set>
++
++#include "base/compiler_specific.h"
++#include "base/macros.h"
++#include "base/memory/ref_counted.h"
++#include "base/threading/thread.h"
++#include "media/audio/audio_manager_base.h"
++
++namespace media {
++
++class MEDIA_EXPORT AudioManagerSndio : public AudioManagerBase {
++ public:
++  AudioManagerSndio(std::unique_ptr<AudioThread> audio_thread,
++                   AudioLogFactory* audio_log_factory);
++  ~AudioManagerSndio() override;
++
++  // Implementation of AudioManager.
++  bool HasAudioOutputDevices() override;
++  bool HasAudioInputDevices() override;
++  void GetAudioInputDeviceNames(AudioDeviceNames* device_names) override;
++  void GetAudioOutputDeviceNames(AudioDeviceNames* device_names) override;
++  AudioParameters GetInputStreamParameters(
++      const std::string& device_id) override;
++  const char* GetName() override;
++
++  // Implementation of AudioManagerBase.
++  AudioOutputStream* MakeLinearOutputStream(
++      const AudioParameters& params,
++      const LogCallback& log_callback) override;
++  AudioOutputStream* MakeLowLatencyOutputStream(
++      const AudioParameters& params,
++      const std::string& device_id,
++      const LogCallback& log_callback) override;
++  AudioInputStream* MakeLinearInputStream(
++      const AudioParameters& params,
++      const std::string& device_id,
++      const LogCallback& log_callback) override;
++  AudioInputStream* MakeLowLatencyInputStream(
++      const AudioParameters& params,
++      const std::string& device_id,
++      const LogCallback& log_callback) override;
++
++ protected:
++  AudioParameters GetPreferredOutputStreamParameters(
++      const std::string& output_device_id,
++      const AudioParameters& input_params) override;
++
++ private:
++  // Called by MakeLinearOutputStream and MakeLowLatencyOutputStream.
++  AudioOutputStream* MakeOutputStream(const AudioParameters& params);
++  AudioInputStream* MakeInputStream(const AudioParameters& params);
++
++  DISALLOW_COPY_AND_ASSIGN(AudioManagerSndio);
++};
++
++}  // namespace media
++
++#endif  // MEDIA_AUDIO_SNDIO_AUDIO_MANAGER_SNDIO_H_
+--- /dev/null
++++ b/src/3rdparty/chromium/media/audio/sndio/sndio_input.cc
+@@ -0,0 +1,200 @@
++// Copyright 2013 The Chromium Authors. All rights reserved.
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++#include "base/bind.h"
++#include "base/logging.h"
++#include "base/macros.h"
++#include "media/base/audio_timestamp_helper.h"
++#include "media/audio/sndio/audio_manager_sndio.h"
++#include "media/audio/audio_manager.h"
++#include "media/audio/sndio/sndio_input.h"
++
++namespace media {
++
++static const SampleFormat kSampleFormat = kSampleFormatS16;
++
++void SndioAudioInputStream::OnMoveCallback(void *arg, int delta)
++{
++  SndioAudioInputStream* self = static_cast<SndioAudioInputStream*>(arg);
++
++  self->hw_delay += delta;
++}
++
++void *SndioAudioInputStream::ThreadEntry(void *arg) {
++  SndioAudioInputStream* self = static_cast<SndioAudioInputStream*>(arg);
++
++  self->ThreadLoop();
++  return NULL;
++}
++
++SndioAudioInputStream::SndioAudioInputStream(AudioManagerBase* manager,
++                                             const std::string& device_name,
++                                             const AudioParameters& params)
++    : manager(manager),
++      params(params),
++      audio_bus(AudioBus::Create(params)),
++      state(kClosed) {
++}
++
++SndioAudioInputStream::~SndioAudioInputStream() {
++  if (state != kClosed)
++    Close();
++}
++
++bool SndioAudioInputStream::Open() {
++  struct sio_par par;
++  int sig;
++
++  if (state != kClosed)
++    return false;
++
++  if (params.format() != AudioParameters::AUDIO_PCM_LINEAR &&
++      params.format() != AudioParameters::AUDIO_PCM_LOW_LATENCY) {
++    LOG(WARNING) << "Unsupported audio format.";
++    return false;
++  }
++
++  sio_initpar(&par);
++  par.rate = params.sample_rate();
++  par.rchan = params.channels();
++  par.bits = SampleFormatToBitsPerChannel(kSampleFormat);
++  par.bps = par.bits / 8;
++  par.sig = sig = par.bits != 8 ? 1 : 0;
++  par.le = SIO_LE_NATIVE;
++  par.appbufsz = params.frames_per_buffer();
++
++  hdl = sio_open(SIO_DEVANY, SIO_REC, 0);
++
++  if (hdl == NULL) {
++    LOG(ERROR) << "Couldn't open audio device.";
++    return false;
++  }
++
++  if (!sio_setpar(hdl, &par) || !sio_getpar(hdl, &par)) {
++    LOG(ERROR) << "Couldn't set audio parameters.";
++    goto bad_close;
++  }
++
++  if (par.rate  != (unsigned int)params.sample_rate() ||
++      par.rchan != (unsigned int)params.channels() ||
++      par.bits  != (unsigned int)SampleFormatToBitsPerChannel(kSampleFormat) ||
++      par.sig   != (unsigned int)sig ||
++      (par.bps > 1 && par.le != SIO_LE_NATIVE) ||
++      (par.bits != par.bps * 8)) {
++    LOG(ERROR) << "Unsupported audio parameters.";
++    goto bad_close;
++  }
++  state = kStopped;
++  buffer = new char[audio_bus->frames() * params.GetBytesPerFrame(kSampleFormat)];
++  sio_onmove(hdl, &OnMoveCallback, this);
++  return true;
++bad_close:
++  sio_close(hdl);
++  return false;
++}
++
++void SndioAudioInputStream::Start(AudioInputCallback* cb) {
++
++  StartAgc();
++
++  state = kRunning;
++  hw_delay = 0;
++  callback = cb;
++  sio_start(hdl);
++  if (pthread_create(&thread, NULL, &ThreadEntry, this) != 0) {
++    LOG(ERROR) << "Failed to create real-time thread for recording.";
++    sio_stop(hdl);
++    state = kStopped;
++  }
++}
++
++void SndioAudioInputStream::Stop() {
++
++  if (state == kStopped)
++    return;
++
++  state = kStopWait;
++  pthread_join(thread, NULL);
++  sio_stop(hdl);
++  state = kStopped;
++
++  StopAgc();
++}
++
++void SndioAudioInputStream::Close() {
++
++  if (state == kClosed)
++    return;
++
++  if (state == kRunning)
++    Stop();
++
++  state = kClosed;
++  delete [] buffer;
++  sio_close(hdl);
++
++  manager->ReleaseInputStream(this);
++}
++
++double SndioAudioInputStream::GetMaxVolume() {
++  // Not supported
++  return 0.0;
++}
++
++void SndioAudioInputStream::SetVolume(double volume) {
++  // Not supported. Do nothing.
++}
++
++double SndioAudioInputStream::GetVolume() {
++  // Not supported.
++  return 0.0;
++}
++
++bool SndioAudioInputStream::IsMuted() {
++  // Not supported.
++  return false;
++}
++
++void SndioAudioInputStream::SetOutputDeviceForAec(
++    const std::string& output_device_id) {
++  // Not supported.
++}
++
++void SndioAudioInputStream::ThreadLoop(void) {
++  size_t todo, n;
++  char *data;
++  unsigned int nframes;
++  double normalized_volume = 0.0;
++
++  nframes = audio_bus->frames();
++
++  while (state == kRunning && !sio_eof(hdl)) {
++
++    GetAgcVolume(&normalized_volume);
++
++    // read one block
++    todo = nframes * params.GetBytesPerFrame(kSampleFormat);
++    data = buffer;
++    while (todo > 0) {
++      n = sio_read(hdl, data, todo);
++      if (n == 0)
++        return;	// unrecoverable I/O error
++      todo -= n;
++      data += n;
++    }
++    hw_delay -= nframes;
++
++    // convert frames count to TimeDelta
++    const base::TimeDelta delay = AudioTimestampHelper::FramesToTime(hw_delay,
++      params.sample_rate());
++
++    // push into bus
++    audio_bus->FromInterleaved<SignedInt16SampleTypeTraits>(reinterpret_cast<int16_t*>(buffer), nframes);
++
++    // invoke callback
++    callback->OnData(audio_bus.get(), base::TimeTicks::Now() - delay, 1.);
++  }
++}
++
++}  // namespace media
+--- /dev/null
++++ b/src/3rdparty/chromium/media/audio/sndio/sndio_input.h
+@@ -0,0 +1,91 @@
++// Copyright 2013 The Chromium Authors. All rights reserved.
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++#ifndef MEDIA_AUDIO_SNDIO_SNDIO_INPUT_H_
++#define MEDIA_AUDIO_SNDIO_SNDIO_INPUT_H_
++
++#include <stdint.h>
++#include <string>
++#include <sndio.h>
++
++#include "base/compiler_specific.h"
++#include "base/macros.h"
++#include "base/memory/weak_ptr.h"
++#include "base/time/time.h"
++#include "media/audio/agc_audio_stream.h"
++#include "media/audio/audio_io.h"
++#include "media/audio/audio_device_description.h"
++#include "media/base/audio_parameters.h"
++
++namespace media {
++
++class AudioManagerBase;
++
++// Implementation of AudioOutputStream using sndio(7)
++class SndioAudioInputStream : public AgcAudioStream<AudioInputStream> {
++ public:
++  // Pass this to the constructor if you want to attempt auto-selection
++  // of the audio recording device.
++  static const char kAutoSelectDevice[];
++
++  // Create a PCM Output stream for the SNDIO device identified by
++  // |device_name|. If unsure of what to use for |device_name|, use
++  // |kAutoSelectDevice|.
++  SndioAudioInputStream(AudioManagerBase* audio_manager,
++                     const std::string& device_name,
++                     const AudioParameters& params);
++
++  ~SndioAudioInputStream() override;
++
++  // Implementation of AudioInputStream.
++  bool Open() override;
++  void Start(AudioInputCallback* callback) override;
++  void Stop() override;
++  void Close() override;
++  double GetMaxVolume() override;
++  void SetVolume(double volume) override;
++  double GetVolume() override;
++  bool IsMuted() override;
++  void SetOutputDeviceForAec(const std::string& output_device_id) override;
++
++ private:
++
++  enum StreamState {
++    kClosed,            // Not opened yet
++    kStopped,           // Device opened, but not started yet
++    kRunning,           // Started, device playing
++    kStopWait           // Stopping, waiting for the real-time thread to exit
++  };
++
++  // C-style call-backs
++  static void OnMoveCallback(void *arg, int delta);
++  static void* ThreadEntry(void *arg);
++
++  // Continuously moves data from the device to the consumer
++  void ThreadLoop();
++  // Our creator, the audio manager needs to be notified when we close.
++  AudioManagerBase* manager;
++  // Parameters of the source
++  AudioParameters params;
++  // We store data here for consumer
++  std::unique_ptr<AudioBus> audio_bus;
++  // Call-back that consumes recorded data
++  AudioInputCallback* callback;  // Valid during a recording session.
++  // Handle of the audio device
++  struct sio_hdl* hdl;
++  // Current state of the stream
++  enum StreamState state;
++  // High priority thread running ThreadLoop()
++  pthread_t thread;
++  // Number of frames buffered in the hardware
++  int hw_delay;
++  // Temporary buffer where data is stored sndio-compatible format
++  char* buffer;
++
++  DISALLOW_COPY_AND_ASSIGN(SndioAudioInputStream);
++};
++
++}  // namespace media
++
++#endif  // MEDIA_AUDIO_SNDIO_SNDIO_INPUT_H_
+--- /dev/null
++++ b/src/3rdparty/chromium/media/audio/sndio/sndio_output.cc
+@@ -0,0 +1,183 @@
++// Copyright (c) 2012 The Chromium Authors. All rights reserved.
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++#include "base/logging.h"
++#include "base/time/time.h"
++#include "base/time/default_tick_clock.h"
++#include "media/audio/audio_manager_base.h"
++#include "media/base/audio_timestamp_helper.h"
++#include "media/audio/sndio/sndio_output.h"
++
++namespace media {
++
++static const SampleFormat kSampleFormat = kSampleFormatS16;
++
++void SndioAudioOutputStream::OnMoveCallback(void *arg, int delta) {
++  SndioAudioOutputStream* self = static_cast<SndioAudioOutputStream*>(arg);
++
++  self->hw_delay -= delta;
++}
++
++void SndioAudioOutputStream::OnVolCallback(void *arg, unsigned int vol) {
++  SndioAudioOutputStream* self = static_cast<SndioAudioOutputStream*>(arg);
++
++  self->vol = vol;
++}
++
++void *SndioAudioOutputStream::ThreadEntry(void *arg) {
++  SndioAudioOutputStream* self = static_cast<SndioAudioOutputStream*>(arg);
++
++  self->ThreadLoop();
++  return NULL;
++}
++
++SndioAudioOutputStream::SndioAudioOutputStream(const AudioParameters& params,
++                                               AudioManagerBase* manager)
++    : manager(manager),
++      params(params),
++      audio_bus(AudioBus::Create(params)),
++      state(kClosed),
++      mutex(PTHREAD_MUTEX_INITIALIZER) {
++}
++
++SndioAudioOutputStream::~SndioAudioOutputStream() {
++  if (state != kClosed)
++    Close();
++}
++
++bool SndioAudioOutputStream::Open() {
++  struct sio_par par;
++  int sig;
++
++  if (params.format() != AudioParameters::AUDIO_PCM_LINEAR &&
++      params.format() != AudioParameters::AUDIO_PCM_LOW_LATENCY) {
++    LOG(WARNING) << "Unsupported audio format.";
++    return false;
++  }
++  sio_initpar(&par);
++  par.rate = params.sample_rate();
++  par.pchan = params.channels();
++  par.bits = SampleFormatToBitsPerChannel(kSampleFormat);
++  par.bps = par.bits / 8;
++  par.sig = sig = par.bits != 8 ? 1 : 0;
++  par.le = SIO_LE_NATIVE;
++  par.appbufsz = params.frames_per_buffer();
++
++  hdl = sio_open(SIO_DEVANY, SIO_PLAY, 0);
++  if (hdl == NULL) {
++    LOG(ERROR) << "Couldn't open audio device.";
++    return false;
++  }
++  if (!sio_setpar(hdl, &par) || !sio_getpar(hdl, &par)) {
++    LOG(ERROR) << "Couldn't set audio parameters.";
++    goto bad_close;
++  }
++  if (par.rate  != (unsigned int)params.sample_rate() ||
++      par.pchan != (unsigned int)params.channels() ||
++      par.bits  != (unsigned int)SampleFormatToBitsPerChannel(kSampleFormat) ||
++      par.sig   != (unsigned int)sig ||
++      (par.bps > 1 && par.le != SIO_LE_NATIVE) ||
++      (par.bits != par.bps * 8)) {
++    LOG(ERROR) << "Unsupported audio parameters.";
++    goto bad_close;
++  }
++  state = kStopped;
++  volpending = 0;
++  vol = 0;
++  buffer = new char[audio_bus->frames() * params.GetBytesPerFrame(kSampleFormat)];
++  sio_onmove(hdl, &OnMoveCallback, this);
++  sio_onvol(hdl, &OnVolCallback, this);
++  return true;
++ bad_close:
++  sio_close(hdl);
++  return false;
++}
++
++void SndioAudioOutputStream::Close() {
++  if (state == kClosed)
++    return;
++  if (state == kRunning)
++    Stop();
++  state = kClosed;
++  delete [] buffer;
++  sio_close(hdl);
++  manager->ReleaseOutputStream(this);  // Calls the destructor
++}
++
++void SndioAudioOutputStream::Start(AudioSourceCallback* callback) {
++  state = kRunning;
++  hw_delay = 0;
++  source = callback;
++  sio_start(hdl);
++  if (pthread_create(&thread, NULL, &ThreadEntry, this) != 0) {
++    LOG(ERROR) << "Failed to create real-time thread.";
++    sio_stop(hdl);
++    state = kStopped;
++  }
++}
++
++void SndioAudioOutputStream::Stop() {
++  if (state == kStopped)
++    return;
++  state = kStopWait;
++  pthread_join(thread, NULL);
++  sio_stop(hdl);
++  state = kStopped;
++}
++
++void SndioAudioOutputStream::SetVolume(double v) {
++  pthread_mutex_lock(&mutex);
++  vol = v * SIO_MAXVOL;
++  volpending = 1;
++  pthread_mutex_unlock(&mutex);
++}
++
++void SndioAudioOutputStream::GetVolume(double* v) {
++  pthread_mutex_lock(&mutex);
++  *v = vol * (1. / SIO_MAXVOL);
++  pthread_mutex_unlock(&mutex);
++}
++
++// This stream is always used with sub second buffer sizes, where it's
++// sufficient to simply always flush upon Start().
++void SndioAudioOutputStream::Flush() {}
++
++void SndioAudioOutputStream::ThreadLoop(void) {
++  int avail, count, result;
++
++  while (state == kRunning) {
++    // Update volume if needed
++    pthread_mutex_lock(&mutex);
++    if (volpending) {
++      volpending = 0;
++      sio_setvol(hdl, vol);
++    }
++    pthread_mutex_unlock(&mutex);
++
++    // Get data to play
++    const base::TimeDelta delay = AudioTimestampHelper::FramesToTime(hw_delay,
++	params.sample_rate());
++    count = source->OnMoreData(delay, base::TimeTicks::Now(), 0, audio_bus.get());
++    audio_bus->ToInterleaved<SignedInt16SampleTypeTraits>(count, reinterpret_cast<int16_t*>(buffer));
++    if (count == 0) {
++      // We have to submit something to the device
++      count = audio_bus->frames();
++      memset(buffer, 0, count * params.GetBytesPerFrame(kSampleFormat));
++      LOG(WARNING) << "No data to play, running empty cycle.";
++    }
++
++    // Submit data to the device
++    avail = count * params.GetBytesPerFrame(kSampleFormat);
++    result = sio_write(hdl, buffer, avail);
++    if (result == 0) {
++      LOG(WARNING) << "Audio device disconnected.";
++      break;
++    }
++
++    // Update hardware pointer
++    hw_delay += count;
++  }
++}
++
++}  // namespace media
+--- /dev/null
++++ b/src/3rdparty/chromium/media/audio/sndio/sndio_output.h
+@@ -0,0 +1,86 @@
++// Copyright (c) 2012 The Chromium Authors. All rights reserved.
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++#ifndef MEDIA_AUDIO_SNDIO_SNDIO_OUTPUT_H_
++#define MEDIA_AUDIO_SNDIO_SNDIO_OUTPUT_H_
++
++#include <pthread.h>
++#include <sndio.h>
++
++#include "base/time/tick_clock.h"
++#include "base/time/time.h"
++#include "media/audio/audio_io.h"
++
++namespace media {
++
++class AudioManagerBase;
++
++// Implementation of AudioOutputStream using sndio(7)
++class SndioAudioOutputStream : public AudioOutputStream {
++ public:
++  // The manager is creating this object
++  SndioAudioOutputStream(const AudioParameters& params,
++                         AudioManagerBase* manager);
++  virtual ~SndioAudioOutputStream();
++
++  // Implementation of AudioOutputStream.
++  bool Open() override;
++  void Close() override;
++  void Start(AudioSourceCallback* callback) override;
++  void Stop() override;
++  void SetVolume(double volume) override;
++  void GetVolume(double* volume) override;
++  void Flush() override;
++
++  friend void sndio_onmove(void *arg, int delta);
++  friend void sndio_onvol(void *arg, unsigned int vol);
++  friend void *sndio_threadstart(void *arg);
++
++ private:
++  enum StreamState {
++    kClosed,            // Not opened yet
++    kStopped,           // Device opened, but not started yet
++    kRunning,           // Started, device playing
++    kStopWait           // Stopping, waiting for the real-time thread to exit
++  };
++
++  // C-style call-backs
++  static void OnMoveCallback(void *arg, int delta);
++  static void OnVolCallback(void *arg, unsigned int vol);
++  static void* ThreadEntry(void *arg);
++
++  // Continuously moves data from the producer to the device
++  void ThreadLoop(void);
++
++  // Our creator, the audio manager needs to be notified when we close.
++  AudioManagerBase* manager;
++  // Parameters of the source
++  AudioParameters params;
++  // Source stores data here
++  std::unique_ptr<AudioBus> audio_bus;
++  // Call-back that produces data to play
++  AudioSourceCallback* source;
++  // Handle of the audio device
++  struct sio_hdl* hdl;
++  // Current state of the stream
++  enum StreamState state;
++  // High priority thread running ThreadLoop()
++  pthread_t thread;
++  // Protects vol, volpending and hw_delay
++  pthread_mutex_t mutex;
++  // Current volume in the 0..SIO_MAXVOL range
++  int vol;
++  // Set to 1 if volumes must be refreshed in the realtime thread
++  int volpending;
++  // Number of frames buffered in the hardware
++  int hw_delay;
++  // Temporary buffer where data is stored sndio-compatible format
++  char* buffer;
++
++  DISALLOW_COPY_AND_ASSIGN(SndioAudioOutputStream);
++};
++
++}  // namespace media
++
++#endif  // MEDIA_AUDIO_SNDIO_SNDIO_OUTPUT_H_
+--- a/src/3rdparty/chromium/media/media_options.gni
++++ b/src/3rdparty/chromium/media/media_options.gni
+@@ -121,6 +121,9 @@ declare_args() {
+   # Enables runtime selection of ALSA library for audio.
+   use_alsa = false
+ 
++  # Enable runtime selection of sndio(7)
++  use_sndio = false
++
+   # Alsa should be used on non-Android, non-Mac POSIX systems.
+   # Alsa should be used on desktop Chromecast and audio-only Chromecast builds.
+   if (is_posix && !is_android && !is_mac &&
diff --git a/srcpkgs/qt6-webengine/patches/0700-armv7l-neon.patch b/srcpkgs/qt6-webengine/patches/0700-armv7l-neon.patch
new file mode 100644
index 000000000000..d42fa19a07a1
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0700-armv7l-neon.patch
@@ -0,0 +1,10 @@
+--- a/src/3rdparty/chromium/skia/BUILD.gn
++++ b/src/3rdparty/chromium/skia/BUILD.gn
+@@ -800,7 +800,6 @@ skia_source_set("skia_opts") {
+         # Root build config sets -mfpu=$arm_fpu, which we expect to be neon
+         # when running this.
+         if (!arm_use_neon) {
+-          configs -= [ "//build/config/compiler:compiler_arm_fpu" ]
+           cflags += [ "-mfpu=neon" ]
+         }
+       }
diff --git a/srcpkgs/qt6-webengine/patches/0750-chromium-musl-cross-no-asm_ptrace_h.patch b/srcpkgs/qt6-webengine/patches/0750-chromium-musl-cross-no-asm_ptrace_h.patch
new file mode 100644
index 000000000000..3cf132908af4
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0750-chromium-musl-cross-no-asm_ptrace_h.patch
@@ -0,0 +1,30 @@
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper.cc
+@@ -38,7 +38,12 @@
+ 
+ #include "client/linux/minidump_writer/linux_ptrace_dumper.h"
+ 
++#if defined(__GLIBC__)
+ #include <asm/ptrace.h>
++#else
++/* For arm*-musl this definition is missing */
++#define ARM_sp uregs[13]
++#endif
+ #include <assert.h>
+ #include <errno.h>
+ #include <fcntl.h>
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_core_dumper.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_core_dumper.cc
+@@ -32,7 +32,12 @@
+ 
+ #include "client/linux/minidump_writer/linux_core_dumper.h"
+ 
++#if defined(__GLIBC__)
+ #include <asm/ptrace.h>
++#else
++/* For arm*-musl this definition is missing */
++#define ARM_sp uregs[13]
++#endif
+ #include <assert.h>
+ #include <elf.h>
+ #include <stdio.h>
diff --git a/srcpkgs/qt6-webengine/patches/0751-chromium-musl-arm-user_vfp.patch b/srcpkgs/qt6-webengine/patches/0751-chromium-musl-arm-user_vfp.patch
new file mode 100644
index 000000000000..6e2d62f35ee6
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0751-chromium-musl-arm-user_vfp.patch
@@ -0,0 +1,20 @@
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/util/linux/thread_info.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/util/linux/thread_info.h
+@@ -17,6 +17,17 @@
+ 
+ #include <stdint.h>
+ #include <sys/user.h>
++#if !defined(__GLIBC__)
++struct user_vfp {
++	unsigned long long fpregs[32];
++	unsigned long fpscr;
++};
++struct user_vfp_exc {
++	unsigned long fpexc;
++	unsigned long fpinst;
++	unsigned long fpinst2;
++};
++#endif /* !defined(__GLIBC__) */
+ 
+ #include <type_traits>
+ 
diff --git a/srcpkgs/qt6-webengine/patches/0752-chromium-musl-arm-elf_auxv_t.patch b/srcpkgs/qt6-webengine/patches/0752-chromium-musl-arm-elf_auxv_t.patch
new file mode 100644
index 000000000000..7112c8cfd3fa
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0752-chromium-musl-arm-elf_auxv_t.patch
@@ -0,0 +1,18 @@
+--- a/src/3rdparty/chromium/v8/src/base/cpu.cc
++++ b/src/3rdparty/chromium/v8/src/base/cpu.cc
+@@ -163,6 +163,15 @@ static V8_INLINE void __cpuid(int cpu_in
+ 
+ #if V8_HOST_ARCH_ARM || V8_HOST_ARCH_ARM64
+ 
++#ifndef __GLIBC__
++#include <elf.h>
++#ifdef __LP64__
++typedef Elf64_auxv_t elf_auxv_t;
++#else
++typedef Elf32_auxv_t elf_auxv_t;
++#endif
++#endif
++
+ static uint32_t ReadELFHWCaps() {
+   uint32_t result = 0;
+ #if V8_GLIBC_PREREQ(2, 16)
diff --git a/srcpkgs/qt6-webengine/patches/0801-chromium-i686-vaapi-fpermissive.patch b/srcpkgs/qt6-webengine/patches/0801-chromium-i686-vaapi-fpermissive.patch
new file mode 100644
index 000000000000..3d4043e03b89
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0801-chromium-i686-vaapi-fpermissive.patch
@@ -0,0 +1,24 @@
+--- a/src/3rdparty/chromium/media/gpu/vaapi/BUILD.gn
++++ b/src/3rdparty/chromium/media/gpu/vaapi/BUILD.gn
+@@ -14,6 +14,10 @@ import("//ui/gl/features.gni")
+ assert(is_linux || is_chromeos)
+ assert(use_vaapi)
+ 
++config("vaapi_permissive") {
++  cflags = [ "-fpermissive" ]
++}
++
+ generate_stubs("libva_stubs") {
+   extra_header = "va_stub_header.fragment"
+   sigs = [ "va.sigs" ]
+@@ -136,6 +140,10 @@ source_set("vaapi") {
+     ]
+   }
+ 
++  if (target_cpu == "x86") {
++    configs += [ ":vaapi_permissive" ]
++  }
++
+   if (use_x11) {
+     deps += [ "//ui/gfx/x" ]
+     sources += [
diff --git a/srcpkgs/qt6-webengine/patches/0900-xxx-ppc64le-libvpx.patch b/srcpkgs/qt6-webengine/patches/0900-xxx-ppc64le-libvpx.patch
new file mode 100644
index 000000000000..5c9566b56bd4
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0900-xxx-ppc64le-libvpx.patch
@@ -0,0 +1,65 @@
+Uses generic target for now. To use ppc64le, change --target to ppc64le-gnu
+and add --enable-vsx, and change generic to ppc for the rtcd header.
+
+From 18e6c5c55cfae0cfb458d8210d7bc709360a0e90 Mon Sep 17 00:00:00 2001
+From: q66 <daniel@octaforge.org>
+Date: Wed, 9 Sep 2020 19:08:25 +0200
+Subject: [PATCH] enable generation of ppc64 libvpx bits
+
+this doesn't update the gni file, that's done from
+the template by running the appropriate scripts
+---
+ third_party/libvpx/BUILD.gn        | 4 ++++
+ third_party/libvpx/generate_gni.sh | 9 +++++++++
+ 2 files changed, 13 insertions(+)
+
+--- a/src/3rdparty/chromium/third_party/libvpx/BUILD.gn
++++ b/src/3rdparty/chromium/third_party/libvpx/BUILD.gn
+@@ -424,6 +424,8 @@ static_library("bundled_libvpx") {
+       sources = libvpx_srcs_arm64
+       public_deps = [ ":libvpx_arm64_headers" ]
+     }
++  } else if (current_cpu == "ppc64") {
++    sources = libvpx_srcs_ppc64
+   }
+ 
+   configs -= [ "//build/config/compiler:chromium_code" ]
+--- a/src/3rdparty/chromium/third_party/libvpx/generate_gni.sh
++++ b/src/3rdparty/chromium/third_party/libvpx/generate_gni.sh
+@@ -374,6 +374,7 @@ gen_config_files linux/arm-neon-highbd "
+ gen_config_files linux/arm64-highbd "--target=armv8-linux-gcc ${all_platforms} ${HIGHBD}"
+ gen_config_files linux/mipsel "--target=mips32-linux-gcc ${all_platforms}"
+ gen_config_files linux/mips64el "--target=mips64-linux-gcc ${all_platforms}"
++gen_config_files linux/ppc64 "--target=generic-gnu $HIGHBD ${all_platforms}"
+ gen_config_files linux/generic "--target=generic-gnu $HIGHBD ${all_platforms}"
+ gen_config_files win/arm64 "--target=arm64-win64-vs15 ${all_platforms} ${HIGHBD}"
+ gen_config_files win/ia32 "--target=x86-win32-vs14 ${all_platforms} ${x86_platforms}"
+@@ -399,6 +400,7 @@ lint_config linux/arm-neon-highbd
+ lint_config linux/arm64-highbd
+ lint_config linux/mipsel
+ lint_config linux/mips64el
++lint_config linux/ppc64
+ lint_config linux/generic
+ lint_config win/arm64
+ lint_config win/ia32
+@@ -428,6 +430,7 @@ gen_rtcd_header linux/arm-neon-highbd ar
+ gen_rtcd_header linux/arm64-highbd armv8
+ gen_rtcd_header linux/mipsel mipsel
+ gen_rtcd_header linux/mips64el mips64el
++gen_rtcd_header linux/ppc64 generic
+ gen_rtcd_header linux/generic generic
+ gen_rtcd_header win/arm64 armv8
+ gen_rtcd_header win/ia32 x86 "${require_sse2}"
+@@ -513,6 +516,12 @@ if [ -z $ONLY_CONFIGS ]; then
+ 
+   echo "MIPS64 source list is identical to MIPS source list. No need to generate it."
+ 
++  echo "Generate ppc64 source list."
++  config=$(print_config_basic linux/ppc64)
++  make_clean
++  make libvpx_srcs.txt target=libs $config > /dev/null
++  convert_srcs_to_project_files libvpx_srcs.txt libvpx_srcs_ppc64
++
+   echo "Generate NaCl source list."
+   config=$(print_config_basic nacl)
+   make_clean
diff --git a/srcpkgs/qt6-webengine/patches/0901-xxx-ppc64le-sandbox-linux-stat.patch b/srcpkgs/qt6-webengine/patches/0901-xxx-ppc64le-sandbox-linux-stat.patch
new file mode 100644
index 000000000000..4b8e6320601c
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0901-xxx-ppc64le-sandbox-linux-stat.patch
@@ -0,0 +1,31 @@
+--- a/src/3rdparty/chromium/sandbox/linux/system_headers/linux_stat.h
++++ b/src/3rdparty/chromium/sandbox/linux/system_headers/linux_stat.h
+@@ -155,6 +155,28 @@ struct kernel_stat {
+   unsigned int __unused4;
+   unsigned int __unused5;
+ };
++#elif defined(__powerpc64__)
++struct kernel_stat {
++  unsigned long	st_dev;
++  unsigned long	st_ino;
++  unsigned long	st_nlink;
++  unsigned int	st_mode;
++  unsigned int	st_uid;
++  unsigned int	st_gid;
++  unsigned long	st_rdev;
++  long		st_size;
++  unsigned long	st_blksize;
++  unsigned long	st_blocks;
++  unsigned long	st_atime_;
++  unsigned long	st_atime_nsec_;
++  unsigned long	st_mtime_;
++  unsigned long	st_mtime_nsec_;
++  unsigned long	st_ctime_;
++  unsigned long	st_ctime_nsec_;
++  unsigned long	__unused4;
++  unsigned long	__unused5;
++  unsigned long	__unused6;
++};
+ #endif
+ 
+ #if !defined(AT_EMPTY_PATH)
diff --git a/srcpkgs/qt6-webengine/patches/0902-xxx-ppc64le-support.patch b/srcpkgs/qt6-webengine/patches/0902-xxx-ppc64le-support.patch
new file mode 100644
index 000000000000..33d415e55f69
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0902-xxx-ppc64le-support.patch
@@ -0,0 +1,3556 @@
+commit 2c013a317b1114ef67cdbbc30824b28907b9ea94
+Author: Daniel Kolesa <daniel@octaforge.org>
+Date:   Wed Mar 3 19:08:29 2021 +0100
+
+    ppc64le support
+
+--- a/src/3rdparty/chromium/sandbox/features.gni
++++ b/src/3rdparty/chromium/sandbox/features.gni
+@@ -11,7 +11,8 @@ import("//build/config/nacl/config.gni")
+ use_seccomp_bpf = (is_linux || is_chromeos || is_android) &&
+                   (current_cpu == "x86" || current_cpu == "x64" ||
+                    current_cpu == "arm" || current_cpu == "arm64" ||
+-                   current_cpu == "mipsel" || current_cpu == "mips64el")
++                   current_cpu == "mipsel" || current_cpu == "mips64el" ||
++                   current_cpu == "ppc64")
+ 
+ use_seccomp_bpf = use_seccomp_bpf || is_nacl_nonsfi
+ 
+--- a/src/3rdparty/chromium/sandbox/linux/BUILD.gn
++++ b/src/3rdparty/chromium/sandbox/linux/BUILD.gn
+@@ -433,6 +433,8 @@ component("sandbox_services") {
+ 
+ source_set("sandbox_services_headers") {
+   sources = [
++    "system_headers/ppc64_linux_syscalls.h",
++    "system_headers/ppc64_linux_ucontext.h",
+     "system_headers/arm64_linux_syscalls.h",
+     "system_headers/arm_linux_syscalls.h",
+     "system_headers/arm_linux_ucontext.h",
+--- a/src/3rdparty/chromium/sandbox/linux/bpf_dsl/linux_syscall_ranges.h
++++ b/src/3rdparty/chromium/sandbox/linux/bpf_dsl/linux_syscall_ranges.h
+@@ -56,6 +56,13 @@
+ #define MAX_PUBLIC_SYSCALL __NR_syscalls
+ #define MAX_SYSCALL MAX_PUBLIC_SYSCALL
+ 
++#elif defined(__powerpc64__)
++
++#include <asm/unistd.h>
++#define MIN_SYSCALL 0u
++#define MAX_PUBLIC_SYSCALL 386u
++#define MAX_SYSCALL MAX_PUBLIC_SYSCALL
++
+ #else
+ #error "Unsupported architecture"
+ #endif
+--- a/src/3rdparty/chromium/sandbox/linux/bpf_dsl/seccomp_macros.h
++++ b/src/3rdparty/chromium/sandbox/linux/bpf_dsl/seccomp_macros.h
+@@ -16,6 +16,9 @@
+ #if defined(__mips__)
+ // sys/user.h in eglibc misses size_t definition
+ #include <stddef.h>
++#elif defined(__powerpc64__) && defined(__GLIBC__)
++// Manually define greg_t on ppc64
++typedef unsigned long long greg_t;
+ #endif
+ #endif
+ 
+@@ -346,6 +349,59 @@ struct regs_struct {
+ #define SECCOMP_PT_PARM4(_regs) (_regs).regs[3]
+ #define SECCOMP_PT_PARM5(_regs) (_regs).regs[4]
+ #define SECCOMP_PT_PARM6(_regs) (_regs).regs[5]
++
++#elif defined(__powerpc64__)
++#include <asm/ptrace.h>
++
++typedef struct pt_regs regs_struct;
++
++#ifdef ARCH_CPU_LITTLE_ENDIAN
++#define SECCOMP_ARCH AUDIT_ARCH_PPC64LE
++#else
++#define SECCOMP_ARCH AUDIT_ARCH_PPC64
++#endif
++
++#ifdef __GLIBC__
++#define SECCOMP_REG(_ctx, _reg) ((_ctx)->uc_mcontext.regs->gpr[_reg])
++#else
++#define SECCOMP_REG(_ctx, _reg) (((struct pt_regs *)(_ctx)->uc_mcontext.regs)->gpr[_reg])
++#endif
++
++#define SECCOMP_RESULT(_ctx) SECCOMP_REG(_ctx, 3)
++#define SECCOMP_SYSCALL(_ctx) SECCOMP_REG(_ctx, 0)
++#ifdef __GLIBC__
++#define SECCOMP_IP(_ctx) (_ctx)->uc_mcontext.regs->nip
++#else
++#define SECCOMP_IP(_ctx) ((struct pt_regs *)(_ctx)->uc_mcontext.regs)->nip
++#endif
++#define SECCOMP_PARM1(_ctx) SECCOMP_REG(_ctx, 3)
++#define SECCOMP_PARM2(_ctx) SECCOMP_REG(_ctx, 4)
++#define SECCOMP_PARM3(_ctx) SECCOMP_REG(_ctx, 5)
++#define SECCOMP_PARM4(_ctx) SECCOMP_REG(_ctx, 6)
++#define SECCOMP_PARM5(_ctx) SECCOMP_REG(_ctx, 7)
++#define SECCOMP_PARM6(_ctx) SECCOMP_REG(_ctx, 8)
++
++#define SECCOMP_NR_IDX (offsetof(struct arch_seccomp_data, nr))
++#define SECCOMP_ARCH_IDX (offsetof(struct arch_seccomp_data, arch))
++#define SECCOMP_IP_MSB_IDX \
++  (offsetof(struct arch_seccomp_data, instruction_pointer) + 4)
++#define SECCOMP_IP_LSB_IDX \
++  (offsetof(struct arch_seccomp_data, instruction_pointer) + 0)
++#define SECCOMP_ARG_MSB_IDX(nr) \
++  (offsetof(struct arch_seccomp_data, args) + 8 * (nr) + 4)
++#define SECCOMP_ARG_LSB_IDX(nr) \
++  (offsetof(struct arch_seccomp_data, args) + 8 * (nr) + 0)
++
++#define SECCOMP_PT_RESULT(_regs) (_regs).gpr[3]
++#define SECCOMP_PT_SYSCALL(_regs) (_regs).gpr[0]
++#define SECCOMP_PT_IP(_regs) (_regs).nip
++#define SECCOMP_PT_PARM1(_regs) (_regs).gpr[3]
++#define SECCOMP_PT_PARM2(_regs) (_regs).gpr[4]
++#define SECCOMP_PT_PARM3(_regs) (_regs).gpr[5]
++#define SECCOMP_PT_PARM4(_regs) (_regs).gpr[6]
++#define SECCOMP_PT_PARM5(_regs) (_regs).gpr[7]
++#define SECCOMP_PT_PARM6(_regs) (_regs).gpr[8]
++
+ #else
+ #error Unsupported target platform
+ 
+--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc
++++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc
+@@ -90,7 +90,7 @@ bool IsBaselinePolicyWatched(int sysno)
+          SyscallSets::IsNuma(sysno) ||
+          SyscallSets::IsPrctl(sysno) ||
+          SyscallSets::IsProcessGroupOrSession(sysno) ||
+-#if defined(__i386__) || \
++#if defined(__i386__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+          SyscallSets::IsSocketCall(sysno) ||
+ #endif
+@@ -258,7 +258,7 @@ ResultExpr EvaluateSyscallImpl(int fs_de
+   }
+ 
+ #if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
+-    defined(__aarch64__)
++    defined(__aarch64__) || defined(__powerpc64__)
+   if (sysno == __NR_mmap)
+     return RestrictMmapFlags();
+ #endif
+@@ -279,7 +279,7 @@ ResultExpr EvaluateSyscallImpl(int fs_de
+     return RestrictPrctl();
+ 
+ #if defined(__x86_64__) || defined(__arm__) || defined(__mips__) || \
+-    defined(__aarch64__)
++    defined(__aarch64__) || defined(__powerpc64__)
+   if (sysno == __NR_socketpair) {
+     // Only allow AF_UNIX, PF_UNIX. Crash if anything else is seen.
+     static_assert(AF_UNIX == PF_UNIX,
+@@ -343,7 +343,8 @@ ResultExpr EvaluateSyscallImpl(int fs_de
+   }
+ 
+ #if defined(__i386__) || \
+-    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
++    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
++    defined(__powerpc64__)
+   if (SyscallSets::IsSocketCall(sysno))
+     return RestrictSocketcallCommand();
+ #endif
+--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/baseline_policy_unittest.cc
++++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/baseline_policy_unittest.cc
+@@ -317,7 +317,7 @@ TEST_BASELINE_SIGSYS(__NR_sysinfo)
+ TEST_BASELINE_SIGSYS(__NR_syslog)
+ TEST_BASELINE_SIGSYS(__NR_timer_create)
+ 
+-#if !defined(__aarch64__)
++#if !defined(__aarch64__) && !defined(__powerpc64__)
+ TEST_BASELINE_SIGSYS(__NR_inotify_init)
+ TEST_BASELINE_SIGSYS(__NR_vserver)
+ #endif
+--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc
++++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc
+@@ -40,6 +40,7 @@
+ #include <sys/ptrace.h>
+ #if (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) && \
+     !defined(__arm__) && !defined(__aarch64__) &&           \
++    !defined(__powerpc64__) &&                              \
+     !defined(PTRACE_GET_THREAD_AREA)
+ // Also include asm/ptrace-abi.h since ptrace.h in older libc (for instance
+ // the one in Ubuntu 16.04 LTS) is missing PTRACE_GET_THREAD_AREA.
+@@ -49,6 +50,11 @@
+ #endif
+ #endif  // !OS_NACL_NONSFI
+ 
++// On PPC64, TCGETS is defined in terms of struct termios, so we must include termios.h
++#ifdef __powerpc64__
++#include <termios.h>
++#endif
++
+ #if defined(OS_ANDROID)
+ 
+ #if !defined(F_DUPFD_CLOEXEC)
+@@ -106,6 +112,14 @@ inline bool IsArchitectureMips() {
+ #endif
+ }
+ 
++inline bool IsArchitecturePPC64() {
++#if defined(__powerpc64__)
++  return true;
++#else
++  return false;
++#endif
++}
++
+ // Ubuntu's version of glibc has a race condition in sem_post that can cause
+ // it to call futex(2) with bogus op arguments. To workaround this, we need
+ // to allow those futex(2) calls to fail with EINVAL, instead of crashing the
+@@ -270,6 +284,8 @@ ResultExpr RestrictFcntlCommands() {
+   uint64_t kOLargeFileFlag = O_LARGEFILE;
+   if (IsArchitectureX86_64() || IsArchitectureI386() || IsArchitectureMips())
+     kOLargeFileFlag = 0100000;
++  else if (IsArchitecturePPC64())
++    kOLargeFileFlag = 0200000;
+ 
+   const Arg<int> cmd(1);
+   const Arg<long> long_arg(2);
+@@ -287,7 +303,16 @@ ResultExpr RestrictFcntlCommands() {
+               F_SETLKW,
+               F_GETLK,
+               F_DUPFD,
+-              F_DUPFD_CLOEXEC),
++              F_DUPFD_CLOEXEC
++#if defined(__powerpc64__)
++// On PPC64, F_SETLK, F_GETLK, F_SETLKW are defined as the 64-bit variants
++// but glibc will sometimes still use the 32-bit versions. Allow both.
++              ,
++              5, /* F_GETLK (32) */
++              6, /* F_SETLK (32) */
++              7  /* F_SETLKW (32) */
++#endif
++	     ),
+              Allow())
+       .Case(F_SETFL,
+             If((long_arg & ~kAllowedMask) == 0, Allow()).Else(CrashSIGSYS()))
+@@ -297,7 +322,7 @@ ResultExpr RestrictFcntlCommands() {
+   // clang-format on
+ }
+ 
+-#if defined(__i386__) || defined(__mips__)
++#if defined(__i386__) || defined(__mips__) || defined(__powerpc64__)
+ ResultExpr RestrictSocketcallCommand() {
+   // Unfortunately, we are unable to restrict the first parameter to
+   // socketpair(2). Whilst initially sounding bad, it's noteworthy that very
+@@ -454,7 +479,7 @@ ResultExpr RestrictPtrace() {
+ #endif
+   return Switch(request)
+       .CASES((
+-#if !defined(__aarch64__)
++#if !defined(__aarch64__) && !defined(__powerpc64__)
+                  PTRACE_GETREGS, PTRACE_GETFPREGS,
+ #if defined(TRACE_GET_THREAD_AREA)
+                  PTRACE_GET_THREAD_AREA,
+--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.h
++++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.h
+@@ -49,7 +49,7 @@ SANDBOX_EXPORT bpf_dsl::ResultExpr Restr
+ // O_NONBLOCK | O_SYNC | O_LARGEFILE | O_CLOEXEC | O_NOATIME.
+ SANDBOX_EXPORT bpf_dsl::ResultExpr RestrictFcntlCommands();
+ 
+-#if defined(__i386__) || defined(__mips__)
++#if defined(__i386__) || defined(__mips__) || defined(__powerpc64__)
+ // Restrict socketcall(2) to only allow socketpair(2), send(2), recv(2),
+ // sendto(2), recvfrom(2), shutdown(2), sendmsg(2) and recvmsg(2).
+ SANDBOX_EXPORT bpf_dsl::ResultExpr RestrictSocketcallCommand();
+--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
++++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
+@@ -28,7 +28,7 @@ bool SyscallSets::IsKill(int sysno) {
+ bool SyscallSets::IsAllowedGettime(int sysno) {
+   switch (sysno) {
+     case __NR_gettimeofday:
+-#if defined(__i386__) || defined(__x86_64__) || \
++#if defined(__i386__) || defined(__x86_64__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_time:
+ #endif
+@@ -51,12 +51,12 @@ bool SyscallSets::IsAllowedGettime(int s
+                                     // filtered by RestrictClockID().
+     case __NR_clock_nanosleep_time64:  // Parameters filtered by RestrictClockID().
+ #endif
+-#if defined(__i386__) || \
++#if defined(__i386__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_ftime:  // Obsolete.
+ #endif
+     case __NR_settimeofday:  // Privileged.
+-#if defined(__i386__) || \
++#if defined(__i386__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_stime:
+ #endif
+@@ -135,7 +135,7 @@ bool SyscallSets::IsFileSystem(int sysno
+     case __NR_faccessat:  // EPERM not a valid errno.
+     case __NR_fchmodat:
+     case __NR_fchownat:  // Should be called chownat ?
+-#if defined(__x86_64__) || defined(__aarch64__)
++#if defined(__x86_64__) || defined(__aarch64__) || defined(__powerpc64__)
+     case __NR_newfstatat:  // fstatat(). EPERM not a valid errno.
+ #elif defined(__i386__) || defined(__arm__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+@@ -154,7 +154,7 @@ bool SyscallSets::IsFileSystem(int sysno
+     case __NR_memfd_create:
+     case __NR_mkdirat:
+     case __NR_mknodat:
+-#if defined(__i386__)
++#if defined(__i386__) || defined(__powerpc64__)
+     case __NR_oldlstat:
+     case __NR_oldstat:
+ #endif
+@@ -167,7 +167,7 @@ bool SyscallSets::IsFileSystem(int sysno
+     case __NR_stat64:
+ #endif
+     case __NR_statfs:  // EPERM not a valid errno.
+-#if defined(__i386__) || defined(__arm__) || \
++#if defined(__i386__) || defined(__arm__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_statfs64:
+ #endif
+@@ -179,7 +179,8 @@ bool SyscallSets::IsFileSystem(int sysno
+     case __NR_truncate64:
+ #endif
+     case __NR_unlinkat:
+-#if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
++#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
++    defined(__powerpc64__)
+     case __NR_utime:
+ #endif
+     case __NR_utimensat:  // New.
+@@ -204,7 +205,8 @@ bool SyscallSets::IsAllowedFileSystemAcc
+ #endif
+       return true;
+ // TODO(jln): these should be denied gracefully as well (moved below).
+-#if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
++#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
++    defined(__powerpc64__)
+     case __NR_fadvise64:  // EPERM not a valid errno.
+ #endif
+ #if defined(__i386__)
+@@ -216,12 +218,12 @@ bool SyscallSets::IsAllowedFileSystemAcc
+     case __NR_fdatasync:  // EPERM not a valid errno.
+     case __NR_flock:      // EPERM not a valid errno.
+     case __NR_fstatfs:    // Give information about the whole filesystem.
+-#if defined(__i386__) || defined(__arm__) || \
++#if defined(__i386__) || defined(__arm__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_fstatfs64:
+ #endif
+     case __NR_fsync:  // EPERM not a valid errno.
+-#if defined(__i386__)
++#if defined(__i386__) || defined(__powerpc64__)
+     case __NR_oldfstat:
+ #endif
+ #if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
+@@ -229,6 +231,8 @@ bool SyscallSets::IsAllowedFileSystemAcc
+     case __NR_sync_file_range:  // EPERM not a valid errno.
+ #elif defined(__arm__)
+     case __NR_arm_sync_file_range:  // EPERM not a valid errno.
++#elif defined(__powerpc64__)
++    case __NR_sync_file_range2: // EPERM not a valid errno.
+ #endif
+     default:
+       return false;
+@@ -248,7 +252,7 @@ bool SyscallSets::IsDeniedFileSystemAcce
+     case __NR_getdents:    // EPERM not a valid errno.
+ #endif
+     case __NR_getdents64:  // EPERM not a valid errno.
+-#if defined(__i386__) || \
++#if defined(__i386__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_readdir:
+ #endif
+@@ -290,7 +294,7 @@ bool SyscallSets::IsGetSimpleId(int sysn
+ bool SyscallSets::IsProcessPrivilegeChange(int sysno) {
+   switch (sysno) {
+     case __NR_capset:
+-#if defined(__i386__) || defined(__x86_64__)
++#if defined(__i386__) || defined(__x86_64__) || defined(__powerpc64__)
+     case __NR_ioperm:  // Intel privilege.
+     case __NR_iopl:    // Intel privilege.
+ #endif
+@@ -340,7 +344,7 @@ bool SyscallSets::IsAllowedSignalHandlin
+     case __NR_rt_sigprocmask:
+     case __NR_rt_sigreturn:
+     case __NR_rt_sigtimedwait:
+-#if defined(__i386__) || defined(__arm__) || \
++#if defined(__i386__) || defined(__arm__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_rt_sigtimedwait_time64:
+     case __NR_sigaction:
+@@ -357,7 +361,7 @@ bool SyscallSets::IsAllowedSignalHandlin
+     case __NR_signalfd:
+ #endif
+     case __NR_signalfd4:
+-#if defined(__i386__) || defined(__arm__) || \
++#if defined(__i386__) || defined(__arm__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_sigpending:
+     case __NR_sigsuspend:
+@@ -382,7 +386,7 @@ bool SyscallSets::IsAllowedOperationOnFd
+ #endif
+     case __NR_dup3:
+ #if defined(__x86_64__) || defined(__arm__) || defined(__mips__) || \
+-    defined(__aarch64__)
++    defined(__aarch64__) || defined(__powerpc64__)
+     case __NR_shutdown:
+ #endif
+       return true;
+@@ -416,7 +420,7 @@ bool SyscallSets::IsAllowedProcessStartO
+     case __NR_membarrier:
+     case __NR_wait4:
+     case __NR_waitid:
+-#if defined(__i386__)
++#if defined(__i386__) || defined(__powerpc64__)
+     case __NR_waitpid:
+ #endif
+ #if !defined(__GLIBC__)
+@@ -438,7 +442,7 @@ bool SyscallSets::IsAllowedProcessStartO
+     case __NR_set_tid_address:
+ #endif
+     case __NR_unshare:
+-#if !defined(__mips__) && !defined(__aarch64__)
++#if !defined(__mips__) && !defined(__aarch64__) || defined(__powerpc64__)
+     case __NR_vfork:
+ #endif
+     default:
+@@ -491,7 +495,7 @@ bool SyscallSets::IsAllowedGetOrModifySo
+       return true;
+     default:
+ #if defined(__x86_64__) || defined(__arm__) || defined(__mips__) || \
+-    defined(__aarch64__)
++    defined(__aarch64__) || defined(__powerpc64__)
+     case __NR_socketpair:  // We will want to inspect its argument.
+ #endif
+       return false;
+@@ -501,7 +505,7 @@ bool SyscallSets::IsAllowedGetOrModifySo
+ bool SyscallSets::IsDeniedGetOrModifySocket(int sysno) {
+   switch (sysno) {
+ #if defined(__x86_64__) || defined(__arm__) || defined(__mips__) || \
+-    defined(__aarch64__)
++    defined(__aarch64__) || defined(__powerpc64__)
+     case __NR_accept:
+     case __NR_accept4:
+     case __NR_bind:
+@@ -515,7 +519,7 @@ bool SyscallSets::IsDeniedGetOrModifySoc
+   }
+ }
+ 
+-#if defined(__i386__) || \
++#if defined(__i386__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+ // Big multiplexing system call for sockets.
+ bool SyscallSets::IsSocketCall(int sysno) {
+@@ -530,7 +534,8 @@ bool SyscallSets::IsSocketCall(int sysno
+ }
+ #endif
+ 
+-#if defined(__x86_64__) || defined(__arm__) || defined(__mips__)
++#if defined(__x86_64__) || defined(__arm__) || defined(__mips__) || \
++    defined(__powerpc64__)
+ bool SyscallSets::IsNetworkSocketInformation(int sysno) {
+   switch (sysno) {
+     case __NR_getpeername:
+@@ -558,7 +563,7 @@ bool SyscallSets::IsAllowedAddressSpaceA
+     case __NR_mincore:
+     case __NR_mlockall:
+ #if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
+-    defined(__aarch64__)
++    defined(__aarch64__) || defined(__powerpc64__)
+     case __NR_mmap:
+ #endif
+ #if defined(__i386__) || defined(__arm__) || \
+@@ -589,7 +594,7 @@ bool SyscallSets::IsAllowedAddressSpaceA
+ bool SyscallSets::IsAllowedGeneralIo(int sysno) {
+   switch (sysno) {
+     case __NR_lseek:
+-#if defined(__i386__) || defined(__arm__) || \
++#if defined(__i386__) || defined(__arm__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR__llseek:
+ #endif
+@@ -609,27 +614,27 @@ bool SyscallSets::IsAllowedGeneralIo(int
+     case __NR_read:
+     case __NR_readv:
+     case __NR_pread64:
+-#if defined(__arm__) || \
++#if defined(__arm__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_recv:
+ #endif
+ #if defined(__x86_64__) || defined(__arm__) || defined(__mips__) || \
+-    defined(__aarch64__)
++    defined(__aarch64__) || defined(__powerpc64__)
+     case __NR_recvfrom:  // Could specify source.
+     case __NR_recvmsg:   // Could specify source.
+ #endif
+-#if defined(__i386__) || defined(__x86_64__)
++#if defined(__i386__) || defined(__x86_64__) || defined(__powerpc64__)
+     case __NR_select:
+ #endif
+-#if defined(__i386__) || defined(__arm__) || defined(__mips__)
++#if defined(__i386__) || defined(__arm__) || defined(__mips__) || defined(__powerpc64__)
+     case __NR__newselect:
+ #endif
+-#if defined(__arm__) || \
++#if defined(__arm__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_send:
+ #endif
+ #if defined(__x86_64__) || defined(__arm__) || defined(__mips__) || \
+-    defined(__aarch64__)
++    defined(__aarch64__) || defined(__powerpc64__)
+     case __NR_sendmsg:  // Could specify destination.
+     case __NR_sendto:   // Could specify destination.
+ #endif
+@@ -684,7 +689,7 @@ bool SyscallSets::IsAllowedBasicSchedule
+     case __NR_nanosleep:
+       return true;
+     case __NR_getpriority:
+-#if defined(__i386__) || defined(__arm__) || \
++#if defined(__i386__) || defined(__arm__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_nice:
+ #endif
+@@ -696,7 +701,7 @@ bool SyscallSets::IsAllowedBasicSchedule
+ 
+ bool SyscallSets::IsAdminOperation(int sysno) {
+   switch (sysno) {
+-#if defined(__i386__) || defined(__arm__) || \
++#if defined(__i386__) || defined(__arm__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_bdflush:
+ #endif
+@@ -713,7 +718,8 @@ bool SyscallSets::IsAdminOperation(int s
+ 
+ bool SyscallSets::IsKernelModule(int sysno) {
+   switch (sysno) {
+-#if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
++#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
++    defined(__powerpc64__)
+     case __NR_create_module:
+     case __NR_get_kernel_syms:  // Should ENOSYS.
+     case __NR_query_module:
+@@ -745,7 +751,7 @@ bool SyscallSets::IsFsControl(int sysno)
+     case __NR_quotactl:
+     case __NR_swapoff:
+     case __NR_swapon:
+-#if defined(__i386__) || \
++#if defined(__i386__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_umount:
+ #endif
+@@ -762,7 +768,7 @@ bool SyscallSets::IsNuma(int sysno) {
+     case __NR_getcpu:
+     case __NR_mbind:
+ #if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
+-    defined(__aarch64__)
++    defined(__aarch64__) || defined(__powerpc64__)
+     case __NR_migrate_pages:
+ #endif
+     case __NR_move_pages:
+@@ -797,13 +803,13 @@ bool SyscallSets::IsGlobalProcessEnviron
+   switch (sysno) {
+     case __NR_acct:  // Privileged.
+ #if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
+-    defined(__aarch64__)
++    defined(__aarch64__) || defined(__powerpc64__)
+     case __NR_getrlimit:
+ #endif
+-#if defined(__i386__) || defined(__arm__)
++#if defined(__i386__) || defined(__arm__) || defined(__powerpc64__)
+     case __NR_ugetrlimit:
+ #endif
+-#if defined(__i386__) || \
++#if defined(__i386__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_ulimit:
+ #endif
+@@ -838,7 +844,7 @@ bool SyscallSets::IsGlobalSystemStatus(i
+ #endif
+     case __NR_sysinfo:
+     case __NR_uname:
+-#if defined(__i386__)
++#if defined(__i386__) || defined(__powerpc64__)
+     case __NR_olduname:
+     case __NR_oldolduname:
+ #endif
+@@ -904,8 +910,16 @@ bool SyscallSets::IsSystemVSemaphores(in
+ }
+ #endif
+ 
++/* shitty hack around Void's 4.19 kernel headers missing those numbers */
++#if defined(__powerpc64__) && !defined(__NR_shmget)
++#define __NR_shmget 395
++#define __NR_shmctl 396
++#define __NR_shmat 397
++#define __NR_shmdt 398
++#endif
++
+ #if defined(__i386__) || defined(__x86_64__) || defined(__arm__) || \
+-    defined(__aarch64__) ||                                         \
++    defined(__aarch64__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_64_BITS))
+ // These give a lot of ambient authority and bypass the setuid sandbox.
+ bool SyscallSets::IsSystemVSharedMemory(int sysno) {
+@@ -936,7 +950,7 @@ bool SyscallSets::IsSystemVMessageQueue(
+ }
+ #endif
+ 
+-#if defined(__i386__) || \
++#if defined(__i386__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+ // Big system V multiplexing system call.
+ bool SyscallSets::IsSystemVIpc(int sysno) {
+@@ -956,7 +970,7 @@ bool SyscallSets::IsAnySystemV(int sysno
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_64_BITS))
+   return IsSystemVMessageQueue(sysno) || IsSystemVSemaphores(sysno) ||
+          IsSystemVSharedMemory(sysno);
+-#elif defined(__i386__) || \
++#elif defined(__i386__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+   return IsSystemVIpc(sysno);
+ #endif
+@@ -1014,7 +1028,8 @@ bool SyscallSets::IsFaNotify(int sysno)
+ bool SyscallSets::IsTimer(int sysno) {
+   switch (sysno) {
+     case __NR_getitimer:
+-#if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
++#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
++    defined(__powerpc64__)
+     case __NR_alarm:
+ #endif
+     case __NR_setitimer:
+@@ -1096,17 +1111,20 @@ bool SyscallSets::IsMisc(int sysno) {
+     case __NR_syncfs:
+     case __NR_vhangup:
+ // The system calls below are not implemented.
+-#if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
++#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
++    defined(__powerpc64__)
+     case __NR_afs_syscall:
+ #endif
+ #if defined(__i386__) || \
+-    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
++    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
++    defined(__powerpc64__)
+     case __NR_break:
+ #endif
+-#if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
++#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
++    defined(__powerpc64__)
+     case __NR_getpmsg:
+ #endif
+-#if defined(__i386__) || \
++#if defined(__i386__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_gtty:
+     case __NR_idle:
+@@ -1115,20 +1133,21 @@ bool SyscallSets::IsMisc(int sysno) {
+     case __NR_prof:
+     case __NR_profil:
+ #endif
+-#if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
++#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
++    defined(__powerpc64__)
+     case __NR_putpmsg:
+ #endif
+ #if defined(__x86_64__)
+     case __NR_security:
+ #endif
+-#if defined(__i386__) || \
++#if defined(__i386__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_stty:
+ #endif
+-#if defined(__x86_64__)
++#if defined(__x86_64__) || defined(__powerpc64__)
+     case __NR_tuxcall:
+ #endif
+-#if !defined(__aarch64__)
++#if !defined(__aarch64__) && !defined(__powerpc64__)
+     case __NR_vserver:
+ #endif
+       return true;
+--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_sets.h
++++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_sets.h
+@@ -43,13 +43,14 @@ class SANDBOX_EXPORT SyscallSets {
+   static bool IsDeniedGetOrModifySocket(int sysno);
+ 
+ #if defined(__i386__) || \
+-    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
++    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
++    defined(__powerpc64__)
+   // Big multiplexing system call for sockets.
+   static bool IsSocketCall(int sysno);
+ #endif
+ 
+ #if defined(__x86_64__) || defined(__arm__) || defined(__mips__) || \
+-    defined(__aarch64__)
++    defined(__aarch64__) || defined(__powerpc64__)
+   static bool IsNetworkSocketInformation(int sysno);
+ #endif
+ 
+@@ -77,7 +78,7 @@ class SANDBOX_EXPORT SyscallSets {
+   static bool IsSystemVSemaphores(int sysno);
+ #endif
+ #if defined(__i386__) || defined(__x86_64__) || defined(__arm__) || \
+-    defined(__aarch64__) ||                                         \
++    defined(__aarch64__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_64_BITS))
+   // These give a lot of ambient authority and bypass the setuid sandbox.
+   static bool IsSystemVSharedMemory(int sysno);
+@@ -89,7 +90,8 @@ class SANDBOX_EXPORT SyscallSets {
+ #endif
+ 
+ #if defined(__i386__) || \
+-    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
++    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
++    defined(__powerpc64__)
+   // Big system V multiplexing system call.
+   static bool IsSystemVIpc(int sysno);
+ #endif
+--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf/syscall.cc
++++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf/syscall.cc
+@@ -18,7 +18,7 @@ namespace sandbox {
+ namespace {
+ 
+ #if defined(ARCH_CPU_X86_FAMILY) || defined(ARCH_CPU_ARM_FAMILY) || \
+-    defined(ARCH_CPU_MIPS_FAMILY)
++    defined(ARCH_CPU_MIPS_FAMILY) || defined (ARCH_CPU_PPC64_FAMILY)
+ // Number that's not currently used by any Linux kernel ABIs.
+ const int kInvalidSyscallNumber = 0x351d3;
+ #else
+@@ -312,10 +312,54 @@ asm(// We need to be able to tell the ke
+     "2:ret\n"
+     ".cfi_endproc\n"
+     ".size SyscallAsm, .-SyscallAsm\n"
++#elif defined(__powerpc64__)
++    ".text\n"
++    ".align 4\n"
++    ".type SyscallAsm @function\n"
++    "SyscallAsm:\n"
++    ".cfi_startproc\n"
++
++    // Check if r3 is negative
++    "cmpdi 3, 0\n"
++    "bgt 2f\n"
++
++    // Load address of 3f into r3 and return
++    "mflr 10\n"
++    "bl 1f\n"
++    "1: mflr 3\n"
++    "mtlr 10\n"
++    "addi 3, 3, 4*13\n"
++    "blr\n"
++
++    // Load arguments from array into r3-8
++    // save param 3 in r10
++    "2:\n"
++    "mr 0, 3\n"
++    "ld 3, 0(4)\n"
++    "ld 5, 16(4)\n"
++    "ld 6, 24(4)\n"
++    "ld 7, 32(4)\n"
++    "ld 8, 40(4)\n"
++    "ld 4, 8(4)\n"
++    "li 9, 0\n"
++
++    // Enter kernel
++    "sc\n"
++
++    // Magic return address
++    "3:\n"
++    // Like MIPS, ppc64 return values are always positive.
++    // Check for error in cr0.SO and negate upon error
++    "bc 4, 3, 4f\n"
++    "neg 3, 3\n"
++    "4: blr\n"
++
++    ".cfi_endproc\n"
++    ".size SyscallAsm, .-SyscallAsm\n"
+ #endif
+     );  // asm
+ 
+-#if defined(__x86_64__)
++#if defined(__x86_64__) || defined(__powerpc64__)
+ extern "C" {
+ intptr_t SyscallAsm(intptr_t nr, const intptr_t args[6]);
+ }
+@@ -429,6 +473,8 @@ intptr_t Syscall::Call(int nr,
+     ret = inout;
+   }
+ 
++#elif defined(__powerpc64__)
++  intptr_t ret = SyscallAsm(nr, args);
+ #else
+ #error "Unimplemented architecture"
+ #endif
+@@ -445,8 +491,26 @@ void Syscall::PutValueInUcontext(intptr_
+     // needs to be changed back.
+     ret_val = -ret_val;
+     SECCOMP_PARM4(ctx) = 1;
+-  } else
++  } else {
+     SECCOMP_PARM4(ctx) = 0;
++  }
++#endif
++#if defined(__powerpc64__)
++  // Same as MIPS, need to invert ret and set error register (cr0.SO)
++  if (ret_val <= -1 && ret_val >= -4095) {
++    ret_val = -ret_val;
++#ifdef __GLIBC__
++    ctx->uc_mcontext.regs->ccr |= (1 << 28);
++#else
++    ((struct pt_regs *)ctx->uc_mcontext.regs)->ccr |= (1 << 28);
++#endif
++  } else {
++#ifdef __GLIBC__
++    ctx->uc_mcontext.regs->ccr &= ~(1 << 28);
++#else
++    ((struct pt_regs *)ctx->uc_mcontext.regs)->ccr &= ~(1 << 28);
++#endif
++  }
+ #endif
+   SECCOMP_RESULT(ctx) = static_cast<greg_t>(ret_val);
+ }
+--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf/trap.cc
++++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf/trap.cc
+@@ -236,6 +236,20 @@ void Trap::SigSys(int nr, LinuxSigInfo*
+       SetIsInSigHandler();
+     }
+ 
++#if defined(__powerpc64__)
++    // On ppc64+glibc, some syscalls seem to accidentally negate the first
++    // parameter which causes checks against it to fail. For now, manually
++    // negate them back.
++    // TODO(shawn@anastas.io): investigate this issue further
++    auto nr = SECCOMP_SYSCALL(ctx);
++    if (nr == __NR_openat || nr == __NR_mkdirat || nr == __NR_faccessat || nr == __NR_readlinkat ||
++        nr == __NR_renameat || nr == __NR_renameat2 || nr == __NR_newfstatat || nr == __NR_unlinkat) {
++        if (static_cast<int>(SECCOMP_PARM1(ctx)) > 0) {
++            SECCOMP_PARM1(ctx) = -SECCOMP_PARM1(ctx);
++        }
++    }
++#endif
++
+     // Copy the seccomp-specific data into a arch_seccomp_data structure. This
+     // is what we are showing to TrapFnc callbacks that the system call
+     // evaluator registered with the sandbox.
+--- a/src/3rdparty/chromium/sandbox/linux/services/credentials.cc
++++ b/src/3rdparty/chromium/sandbox/linux/services/credentials.cc
+@@ -81,7 +81,7 @@ bool ChrootToSafeEmptyDir() {
+   pid_t pid = -1;
+   alignas(16) char stack_buf[PTHREAD_STACK_MIN];
+ #if defined(ARCH_CPU_X86_FAMILY) || defined(ARCH_CPU_ARM_FAMILY) || \
+-    defined(ARCH_CPU_MIPS_FAMILY)
++    defined(ARCH_CPU_MIPS_FAMILY) || defined(ARCH_CPU_PPC64_FAMILY)
+   // The stack grows downward.
+   void* stack = stack_buf + sizeof(stack_buf);
+ #else
+--- a/src/3rdparty/chromium/sandbox/linux/services/syscall_wrappers.cc
++++ b/src/3rdparty/chromium/sandbox/linux/services/syscall_wrappers.cc
+@@ -61,7 +61,7 @@ long sys_clone(unsigned long flags,
+ #if defined(ARCH_CPU_X86_64)
+   return syscall(__NR_clone, flags, child_stack, ptid, ctid, tls);
+ #elif defined(ARCH_CPU_X86) || defined(ARCH_CPU_ARM_FAMILY) || \
+-    defined(ARCH_CPU_MIPS_FAMILY)
++    defined(ARCH_CPU_MIPS_FAMILY) || defined(ARCH_CPU_PPC64_FAMILY)
+   // CONFIG_CLONE_BACKWARDS defined.
+   return syscall(__NR_clone, flags, child_stack, ptid, tls, ctid);
+ #endif
+--- a/src/3rdparty/chromium/sandbox/linux/syscall_broker/broker_process.cc
++++ b/src/3rdparty/chromium/sandbox/linux/syscall_broker/broker_process.cc
+@@ -165,7 +165,7 @@ bool BrokerProcess::IsSyscallBrokerable(
+ #if defined(__NR_fstatat64)
+     case __NR_fstatat64:
+ #endif
+-#if defined(__x86_64__) || defined(__aarch64__)
++#if defined(__x86_64__) || defined(__aarch64__) || defined(__powerpc64__)
+     case __NR_newfstatat:
+ #endif
+       return !fast_check || allowed_command_set_.test(COMMAND_STAT);
+--- a/src/3rdparty/chromium/sandbox/linux/system_headers/linux_seccomp.h
++++ b/src/3rdparty/chromium/sandbox/linux/system_headers/linux_seccomp.h
+@@ -41,6 +41,9 @@
+ #ifndef EM_AARCH64
+ #define EM_AARCH64 183
+ #endif
++#ifndef EM_PPC64
++#define EM_PPC64 21
++#endif
+ 
+ #ifndef __AUDIT_ARCH_64BIT
+ #define __AUDIT_ARCH_64BIT 0x80000000
+@@ -74,6 +77,14 @@
+ #define AUDIT_ARCH_AARCH64 (EM_AARCH64 | __AUDIT_ARCH_64BIT | __AUDIT_ARCH_LE)
+ #endif
+ 
++#ifndef AUDIT_ARCH_PPC64
++#define AUDIT_ARCH_PPC64 (EM_PPC64 | __AUDIT_ARCH_64BIT)
++#endif
++
++#ifndef AUDIT_ARCH_PPC64LE
++#define AUDIT_ARCH_PPC64LE (EM_PPC64 | __AUDIT_ARCH_64BIT | __AUDIT_ARCH_LE)
++#endif
++
+ // For prctl.h
+ #ifndef PR_SET_SECCOMP
+ #define PR_SET_SECCOMP               22
+--- a/src/3rdparty/chromium/sandbox/linux/system_headers/linux_signal.h
++++ b/src/3rdparty/chromium/sandbox/linux/system_headers/linux_signal.h
+@@ -13,7 +13,7 @@
+ // (not undefined, but defined different values and in different memory
+ // layouts). So, fill the gap here.
+ #if defined(__i386__) || defined(__x86_64__) || defined(__arm__) || \
+-    defined(__aarch64__)
++    defined(__aarch64__) || defined(__powerpc64__)
+ 
+ #define LINUX_SIGHUP 1
+ #define LINUX_SIGINT 2
+--- a/src/3rdparty/chromium/sandbox/linux/system_headers/linux_syscalls.h
++++ b/src/3rdparty/chromium/sandbox/linux/system_headers/linux_syscalls.h
+@@ -35,5 +35,9 @@
+ #include "sandbox/linux/system_headers/arm64_linux_syscalls.h"
+ #endif
+ 
++#if defined(__powerpc64__)
++#include "sandbox/linux/system_headers/ppc64_linux_syscalls.h"
++#endif
++
+ #endif  // SANDBOX_LINUX_SYSTEM_HEADERS_LINUX_SYSCALLS_H_
+ 
+--- a/src/3rdparty/chromium/sandbox/linux/system_headers/linux_ucontext.h
++++ b/src/3rdparty/chromium/sandbox/linux/system_headers/linux_ucontext.h
+@@ -11,6 +11,8 @@
+ #include "sandbox/linux/system_headers/arm_linux_ucontext.h"
+ #elif defined(__i386__)
+ #include "sandbox/linux/system_headers/i386_linux_ucontext.h"
++#elif defined(__powerpc64__)
++#include "sandbox/linux/system_headers/ppc64_linux_ucontext.h"
+ #else
+ #error "No support for your architecture in PNaCl header"
+ #endif
+--- a/src/3rdparty/chromium/sandbox/policy/linux/bpf_renderer_policy_linux.cc
++++ b/src/3rdparty/chromium/sandbox/policy/linux/bpf_renderer_policy_linux.cc
+@@ -15,6 +15,11 @@
+ #include "sandbox/linux/system_headers/linux_syscalls.h"
+ #include "sandbox/policy/linux/sandbox_linux.h"
+ 
++// On PPC64, TCGETS is defined in terms of struct termios, so we must include termios.h
++#ifdef __powerpc64__
++#include <termios.h>
++#endif
++
+ // TODO(vignatti): replace the local definitions below with #include
+ // <linux/dma-buf.h> once kernel version 4.6 becomes widely used.
+ #include <linux/types.h>
+--- a/src/3rdparty/chromium/third_party/angle/src/compiler/translator/InfoSink.h
++++ b/src/3rdparty/chromium/third_party/angle/src/compiler/translator/InfoSink.h
+@@ -93,7 +93,16 @@ class TInfoSinkBase
+             stream.precision(8);
+             stream << f;
+         }
+-        sink.append(stream.str());
++
++        // Hack to work around a bug where negative floating point values
++        // are rendered like '.0.5' instead of '-0.5'
++        std::string res(stream.str());
++
++        if (signbit(f)) { // test if f is negative
++            res[0] = '-';
++        }
++
++        sink.append(res);
+         return *this;
+     }
+     // Write boolean values as their names instead of integral value.
+--- a/src/3rdparty/chromium/third_party/angle/src/libANGLE/Constants.h
++++ b/src/3rdparty/chromium/third_party/angle/src/libANGLE/Constants.h
+@@ -9,6 +9,7 @@
+ #ifndef LIBANGLE_CONSTANTS_H_
+ #define LIBANGLE_CONSTANTS_H_
+ 
++#include <cstddef>
+ #include "common/platform.h"
+ 
+ #include <stdint.h>
+--- a/src/3rdparty/chromium/third_party/boringssl/BUILD.gn
++++ b/src/3rdparty/chromium/third_party/boringssl/BUILD.gn
+@@ -99,6 +99,13 @@ if (is_win && !is_msan && current_cpu !=
+       } else {
+         public_configs = [ ":no_asm_config" ]
+       }
++    } else if (current_cpu == "ppc64") {
++      if (is_linux) {
++        # TODO: ppc64 (be) check
++        sources += crypto_sources_linux_ppc64le
++      } else {
++        public_configs = [ ":no_asm_config" ]
++      }
+     } else {
+       public_configs = [ ":no_asm_config" ]
+     }
+--- a/src/3rdparty/chromium/third_party/breakpad/BUILD.gn
++++ b/src/3rdparty/chromium/third_party/breakpad/BUILD.gn
+@@ -623,7 +623,6 @@ if (is_linux || is_chromeos || is_androi
+       "breakpad/src/client/minidump_file_writer.h",
+       "breakpad/src/common/convert_UTF.cc",
+       "breakpad/src/common/convert_UTF.h",
+-      "breakpad/src/common/linux/breakpad_getcontext.S",
+       "breakpad/src/common/linux/elf_core_dump.cc",
+       "breakpad/src/common/linux/elf_core_dump.h",
+       "breakpad/src/common/linux/elfutils.cc",
+@@ -663,6 +662,15 @@ if (is_linux || is_chromeos || is_androi
+ 
+     libs = [ "dl" ]
+ 
++    if (current_cpu == "ppc64") {
++        defines = [ "HAVE_GETCONTEXT" ]
++        libs += [ "ucontext" ]
++    } else {
++        sources += [
++            "breakpad/src/common/linux/breakpad_getcontext.S"
++        ]
++    }
++
+     include_dirs = [
+       ".",
+       "breakpad/src",
+@@ -712,7 +720,6 @@ if (is_linux || is_chromeos || is_androi
+       "breakpad/src/client/linux/minidump_writer/minidump_writer_unittest.cc",
+       "breakpad/src/client/linux/minidump_writer/minidump_writer_unittest_utils.cc",
+       "breakpad/src/client/linux/minidump_writer/proc_cpuinfo_reader_unittest.cc",
+-      "breakpad/src/common/linux/breakpad_getcontext_unittest.cc",
+       "breakpad/src/common/linux/elf_core_dump_unittest.cc",
+       "breakpad/src/common/linux/file_id_unittest.cc",
+       "breakpad/src/common/linux/linux_libc_support_unittest.cc",
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/raw_context_cpu.h
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/raw_context_cpu.h
+@@ -44,6 +44,8 @@ typedef MDRawContextARM RawContextCPU;
+ typedef MDRawContextARM64_Old RawContextCPU;
+ #elif defined(__mips__)
+ typedef MDRawContextMIPS RawContextCPU;
++#elif defined(__powerpc64__)
++typedef MDRawContextPPC64 RawContextCPU;
+ #else
+ #error "This code has not been ported to your platform yet."
+ #endif
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.cc
+@@ -270,7 +270,54 @@ void ThreadInfo::FillCPUContext(RawConte
+   out->float_save.fir = mcontext.fpc_eir;
+ #endif
+ }
+-#endif  // __mips__
++
++#elif defined(__powerpc64__)
++
++#if !defined(__GLIBC__)
++#include <asm/elf.h>
++#include <asm/ptrace.h>
++#endif
++
++uintptr_t ThreadInfo::GetInstructionPointer() const {
++    return mcontext.gp_regs[PT_NIP];
++}
++
++void ThreadInfo::FillCPUContext(RawContextCPU* out) const {
++    out->context_flags = MD_CONTEXT_PPC64_FULL;
++    for (int i = 0; i < MD_CONTEXT_PPC64_GPR_COUNT; i++)
++        out->gpr[i] = mcontext.gp_regs[i];
++
++    out->lr = mcontext.gp_regs[PT_LNK];
++    out->srr0 = mcontext.gp_regs[PT_NIP];
++    out->srr1 = mcontext.gp_regs[PT_MSR];
++    out->cr = mcontext.gp_regs[PT_CCR];
++    out->xer = mcontext.gp_regs[PT_XER];
++    out->ctr = mcontext.gp_regs[PT_CTR];
++
++#ifdef __GLIBC__
++    for (int i = 0; i < MD_FLOATINGSAVEAREA_PPC_FPR_COUNT; i++)
++        out->float_save.fpregs[i] = mcontext.fp_regs[i];
++
++    out->float_save.fpscr = mcontext.fp_regs[NFPREG-1];
++#else
++    for (int i = 0; i < MD_FLOATINGSAVEAREA_PPC_FPR_COUNT; i++)
++        out->float_save.fpregs[i] = ((uint64_t *)&mcontext.fp_regs)[i];
++
++     out->float_save.fpscr = ((uint64_t *)&mcontext.fp_regs)[ELF_NFPREG-1];
++#endif
++
++    for (int i = 0; i < MD_VECTORSAVEAREA_PPC_VR_COUNT; i++)
++        out->vector_save.save_vr[i] = \
++            {(((uint64_t)vregs.vrregs[i][0]) << 32)
++                          | vregs.vrregs[i][1],
++            (((uint64_t)vregs.vrregs[i][2]) << 32)
++                         | vregs.vrregs[i][3]};
++
++    out->vrsave = vregs.vrsave;
++    out->vector_save.save_vscr = {0, vregs.vscr.vscr_word};
++    out->vector_save.save_vrvalid = 0xFFFFFFFF;
++}
++#endif  // __powerpc64__
+ 
+ void ThreadInfo::GetGeneralPurposeRegisters(void** gp_regs, size_t* size) {
+   assert(gp_regs || size);
+@@ -279,6 +326,11 @@ void ThreadInfo::GetGeneralPurposeRegist
+     *gp_regs = mcontext.gregs;
+   if (size)
+     *size = sizeof(mcontext.gregs);
++#elif defined(__powerpc64__)
++  if (gp_regs)
++    *gp_regs = mcontext.gp_regs;
++  if (size)
++    *size = sizeof(mcontext.gp_regs);
+ #else
+   if (gp_regs)
+     *gp_regs = &regs;
+@@ -294,6 +346,11 @@ void ThreadInfo::GetFloatingPointRegiste
+     *fp_regs = &mcontext.fpregs;
+   if (size)
+     *size = sizeof(mcontext.fpregs);
++#elif defined(__powerpc64__)
++  if (fp_regs)
++    *fp_regs = &mcontext.fp_regs;
++  if (size)
++    *size = sizeof(mcontext.fp_regs);
+ #else
+   if (fp_regs)
+     *fp_regs = &fpregs;
+@@ -302,4 +359,13 @@ void ThreadInfo::GetFloatingPointRegiste
+ #endif
+ }
+ 
++#if defined(__powerpc64__)
++void ThreadInfo::GetVectorRegisters(void** v_regs, size_t* size) {
++    if (v_regs)
++        *v_regs = &vregs;
++    if (size)
++        *size = sizeof(vregs);
++}
++#endif
++
+ }  // namespace google_breakpad
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.h
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.h
+@@ -68,6 +68,10 @@ struct ThreadInfo {
+   // Use the structures defined in <sys/user.h>
+   struct user_regs_struct regs;
+   struct user_fpsimd_struct fpregs;
++#elif defined(__powerpc64__)
++  // Use the structures defined in <sys/ucontext.h>.
++  mcontext_t mcontext;
++  vrregset_t vregs;
+ #elif defined(__mips__)
+   // Use the structure defined in <sys/ucontext.h>.
+   mcontext_t mcontext;
+@@ -84,6 +88,11 @@ struct ThreadInfo {
+ 
+   // Returns the pointer and size of float point register area.
+   void GetFloatingPointRegisters(void** fp_regs, size_t* size);
++
++#if defined(__powerpc64__)
++  // Returns the pointer and size of the vector register area. (PPC64 only)
++  void GetVectorRegisters(void** v_regs, size_t* size);
++#endif
+ };
+ 
+ }  // namespace google_breakpad
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc
+@@ -254,6 +254,60 @@ void UContextReader::FillCPUContext(RawC
+   out->float_save.fir = uc->uc_mcontext.fpc_eir;  // Unused.
+ #endif
+ }
++
++#elif defined(__powerpc64__)
++
++#ifndef __GLIBC__
++#include <asm/elf.h>
++#include <asm/ptrace.h>
++#endif
++
++uintptr_t UContextReader::GetStackPointer(const ucontext_t* uc) {
++    return uc->uc_mcontext.gp_regs[MD_CONTEXT_PPC64_REG_SP];
++}
++
++uintptr_t UContextReader::GetInstructionPointer(const ucontext_t* uc) {
++    return uc->uc_mcontext.gp_regs[PT_NIP];
++}
++
++void UContextReader::FillCPUContext(RawContextCPU* out, const ucontext_t* uc,
++                                    const vrregset_t* vregs) {
++    out->context_flags = MD_CONTEXT_PPC64_FULL;
++
++    for (int i = 0; i < MD_CONTEXT_PPC64_GPR_COUNT; i++)
++        out->gpr[i] = uc->uc_mcontext.gp_regs[i];
++
++    out->lr = uc->uc_mcontext.gp_regs[PT_LNK];
++    out->srr0 = uc->uc_mcontext.gp_regs[PT_NIP];
++    out->srr1 = uc->uc_mcontext.gp_regs[PT_MSR];
++    out->cr = uc->uc_mcontext.gp_regs[PT_CCR];
++    out->xer = uc->uc_mcontext.gp_regs[PT_XER];
++    out->ctr = uc->uc_mcontext.gp_regs[PT_CTR];
++
++#ifdef __GLIBC__
++    for (int i = 0; i < MD_FLOATINGSAVEAREA_PPC_FPR_COUNT; i++)
++        out->float_save.fpregs[i] = uc->uc_mcontext.fp_regs[i];
++
++    out->float_save.fpscr = uc->uc_mcontext.fp_regs[NFPREG-1];
++#else
++    for (int i = 0; i < MD_FLOATINGSAVEAREA_PPC_FPR_COUNT; i++)
++        out->float_save.fpregs[i] = ((uint64_t *)&uc->uc_mcontext.fp_regs)[i];
++
++    out->float_save.fpscr = ((uint64_t *)&uc->uc_mcontext.fp_regs)[ELF_NFPREG-1];
++#endif
++
++    for (int i = 0; i < MD_VECTORSAVEAREA_PPC_VR_COUNT; i++)
++        out->vector_save.save_vr[i] =
++            {(((uint64_t)vregs->vrregs[i][0]) << 32)
++                         | vregs->vrregs[i][1],
++             (((uint64_t)vregs->vrregs[i][2]) << 32)
++                         | vregs->vrregs[i][3]};
++
++    out->vrsave = vregs->vrsave;
++    out->vector_save.save_vscr = {0, vregs->vscr.vscr_word};
++    out->vector_save.save_vrvalid = 0xFFFFFFFF;
++}
++
+ #endif
+ 
+ }  // namespace google_breakpad
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h
+@@ -59,6 +59,9 @@ struct UContextReader {
+ #elif defined(__aarch64__)
+   static void FillCPUContext(RawContextCPU* out, const ucontext_t* uc,
+                              const struct fpsimd_context* fpregs);
++#elif defined(__powerpc64__)
++  static void FillCPUContext(RawContextCPU *out, const ucontext_t *uc,
++                             const vrregset_t* vregs);
+ #else
+   static void FillCPUContext(RawContextCPU* out, const ucontext_t* uc);
+ #endif
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc
+@@ -105,6 +105,13 @@
+ #define PR_SET_PTRACER 0x59616d61
+ #endif
+ 
++/* musl hack, can't include asm/ptrace.h as that causes conflicts */
++#ifndef __GLIBC__
++#if defined(__powerpc64__) && !defined(PT_NIP)
++#define PT_NIP 32
++#endif
++#endif
++
+ namespace google_breakpad {
+ 
+ namespace {
+@@ -461,9 +468,16 @@ bool ExceptionHandler::HandleSignal(int
+     memcpy(&g_crash_context_.float_state, fp_ptr,
+            sizeof(g_crash_context_.float_state));
+   }
++#elif defined(__powerpc64__)
++  // On PPC64, we must copy VR state
++  ucontext_t* uc_ptr = (ucontext_t*)uc;
++  if (uc_ptr->uc_mcontext.v_regs) {
++    memcpy(&g_crash_context_.vector_state, uc_ptr->uc_mcontext.v_regs,
++           sizeof(g_crash_context_.vector_state));
++  }
+ #elif !defined(__ARM_EABI__) && !defined(__mips__)
+   // FP state is not part of user ABI on ARM Linux.
+-  // In case of MIPS Linux FP state is already part of ucontext_t
++  // In case of MIPS, Linux FP state is already part of ucontext_t
+   // and 'float_state' is not a member of CrashContext.
+   ucontext_t* uc_ptr = (ucontext_t*)uc;
+   if (uc_ptr->uc_mcontext.fpregs) {
+@@ -708,11 +722,19 @@ bool ExceptionHandler::WriteMinidump() {
+   }
+ #endif
+ 
+-#if !defined(__ARM_EABI__) && !defined(__aarch64__) && !defined(__mips__)
++#if !defined(__ARM_EABI__) && !defined(__aarch64__) && !defined(__mips__) \
++    && !defined(__powerpc64__)
+   // FPU state is not part of ARM EABI ucontext_t.
+   memcpy(&context.float_state, context.context.uc_mcontext.fpregs,
+          sizeof(context.float_state));
+ #endif
++
++#if defined(__powerpc64__)
++  // Vector registers must be copied on PPC64
++  memcpy(&context.vector_state, context.context.uc_mcontext.v_regs,
++         sizeof(context.vector_state));
++#endif
++
+   context.tid = sys_gettid();
+ 
+   // Add an exception stream to the minidump for better reporting.
+@@ -733,6 +755,9 @@ bool ExceptionHandler::WriteMinidump() {
+ #elif defined(__mips__)
+   context.siginfo.si_addr =
+       reinterpret_cast<void*>(context.context.uc_mcontext.pc);
++#elif defined(__powerpc64__)
++  context.siginfo.si_addr =
++      reinterpret_cast<void*>(context.context.uc_mcontext.gp_regs[PT_NIP]);
+ #else
+ #error "This code has not been ported to your platform yet."
+ #endif
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.h
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.h
+@@ -192,7 +192,11 @@ class ExceptionHandler {
+     siginfo_t siginfo;
+     pid_t tid;  // the crashing thread.
+     ucontext_t context;
+-#if !defined(__ARM_EABI__) && !defined(__mips__)
++#if defined(__powerpc64__)
++    // PPC64's FP state is a part of ucontext_t like MIPS but the vector
++    // state is not, so a struct is needed.
++    vstate_t vector_state;
++#elif !defined(__ARM_EABI__) && !defined(__mips__)
+     // #ifdef this out because FP state is not part of user ABI for Linux ARM.
+     // In case of MIPS Linux FP state is already part of ucontext_t so
+     // 'float_state' is not required.
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler_unittest.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler_unittest.cc
+@@ -307,7 +307,7 @@ TEST(ExceptionHandlerTest, ParallelChild
+   }
+ 
+   // Wait a while until the child should have crashed.
+-  usleep(1000000);
++  usleep(2000000);
+   // Kill the child if it is still running.
+   kill(child, SIGKILL);
+ 
+@@ -559,6 +559,8 @@ const unsigned char kIllegalInstruction[
+ #if defined(__mips__)
+   // mfc2 zero,Impl - usually illegal in userspace.
+   0x48, 0x00, 0x00, 0x48
++#elif defined(__powerpc64__)
++  0x01, 0x01, 0x01, 0x01 // Crashes on a tested POWER9 cpu
+ #else
+   // This crashes with SIGILL on x86/x86-64/arm.
+   0xff, 0xff, 0xff, 0xff
+@@ -754,10 +756,10 @@ TEST(ExceptionHandlerTest, InstructionPo
+ 
+   // These are defined here so the parent can use them to check the
+   // data from the minidump afterwards.
+-  // Use 4k here because the OS will hand out a single page even
++  // Use the page size here because the OS will hand out a single page even
+   // if a smaller size is requested, and this test wants to
+   // test the upper bound of the memory range.
+-  const uint32_t kMemorySize = 4096;  // bytes
++  const uint32_t kMemorySize = getpagesize();  // bytes
+   const int kOffset = kMemorySize - sizeof(kIllegalInstruction);
+ 
+   const pid_t child = fork();
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/microdump_writer/microdump_writer.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/microdump_writer/microdump_writer.cc
+@@ -138,7 +138,9 @@ class MicrodumpWriter {
+                   const MicrodumpExtraInfo& microdump_extra_info,
+                   LinuxDumper* dumper)
+       : ucontext_(context ? &context->context : NULL),
+-#if !defined(__ARM_EABI__) && !defined(__mips__)
++#if defined(__powerpc64__)
++        vector_state_(context ? &context->vector_state : NULL),
++#elif !defined(__ARM_EABI__) && !defined(__mips__)
+         float_state_(context ? &context->float_state : NULL),
+ #endif
+         dumper_(dumper),
+@@ -337,6 +339,8 @@ class MicrodumpWriter {
+ # else
+ #  error "This mips ABI is currently not supported (n32)"
+ #endif
++#elif defined(__powerpc64__)
++    const char kArch[] = "ppc64";
+ #else
+ #error "This code has not been ported to your platform yet"
+ #endif
+@@ -409,7 +413,9 @@ class MicrodumpWriter {
+   void DumpCPUState() {
+     RawContextCPU cpu;
+     my_memset(&cpu, 0, sizeof(RawContextCPU));
+-#if !defined(__ARM_EABI__) && !defined(__mips__)
++#if defined(__powerpc64__)
++    UContextReader::FillCPUContext(&cpu, ucontext_, vector_state_);
++#elif !defined(__ARM_EABI__) && !defined(__mips__)
+     UContextReader::FillCPUContext(&cpu, ucontext_, float_state_);
+ #else
+     UContextReader::FillCPUContext(&cpu, ucontext_);
+@@ -605,7 +611,9 @@ class MicrodumpWriter {
+   void* Alloc(unsigned bytes) { return dumper_->allocator()->Alloc(bytes); }
+ 
+   const ucontext_t* const ucontext_;
+-#if !defined(__ARM_EABI__) && !defined(__mips__)
++#if defined(__powerpc64__)
++  const google_breakpad::vstate_t* const vector_state_;
++#elif !defined(__ARM_EABI__) && !defined(__mips__)
+   const google_breakpad::fpstate_t* const float_state_;
+ #endif
+   LinuxDumper* dumper_;
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/microdump_writer/microdump_writer_unittest.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/microdump_writer/microdump_writer_unittest.cc
+@@ -279,10 +279,19 @@ TEST(MicrodumpWriterTest, BasicWithMappi
+   CrashAndGetMicrodump(mappings, MicrodumpExtraInfo(), &buf);
+   ASSERT_TRUE(ContainsMicrodump(buf));
+ 
++  int page_size = getpagesize();
+ #ifdef __LP64__
+-  ASSERT_NE(std::string::npos,
+-            buf.find("M 0000000000001000 000000000000002A 0000000000001000 "
+-                     "33221100554477668899AABBCCDDEEFF0 libfoo.so"));
++  // This test is only available for the following page sizes
++  ASSERT_TRUE((page_size == 4096) || (page_size == 65536));
++  if (page_size == 4096) {
++    ASSERT_NE(std::string::npos,
++              buf.find("M 0000000000001000 000000000000002A 0000000000001000 "
++                       "33221100554477668899AABBCCDDEEFF0 libfoo.so"));
++  } else {
++    ASSERT_NE(std::string::npos,
++              buf.find("M 0000000000010000 000000000000002A 0000000000010000 "
++                       "33221100554477668899AABBCCDDEEFF0 libfoo.so"));
++  }
+ #else
+   ASSERT_NE(std::string::npos,
+             buf.find("M 00001000 0000002A 00001000 "
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_core_dumper.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_core_dumper.cc
+@@ -117,6 +117,9 @@ bool LinuxCoreDumper::GetThreadInfoByInd
+ #elif defined(__mips__)
+   stack_pointer =
+       reinterpret_cast<uint8_t*>(info->mcontext.gregs[MD_CONTEXT_MIPS_REG_SP]);
++#elif defined(__powerpc64__)
++  stack_pointer =
++      reinterpret_cast<uint8_t*>(info->mcontext.gp_regs[MD_CONTEXT_PPC64_REG_SP]);
+ #else
+ #error "This code hasn't been ported to your platform yet."
+ #endif
+@@ -212,7 +215,10 @@ bool LinuxCoreDumper::EnumerateThreads()
+         memset(&info, 0, sizeof(ThreadInfo));
+         info.tgid = status->pr_pgrp;
+         info.ppid = status->pr_ppid;
+-#if defined(__mips__)
++#if defined(__powerpc64__)
++        for (int i = 0; i < 31; i++)
++            info.mcontext.gp_regs[i] = status->pr_reg[i];
++#elif defined(__mips__)
+ #if defined(__ANDROID__)
+         for (int i = EF_R0; i <= EF_R31; i++)
+           info.mcontext.gregs[i - EF_R0] = status->pr_reg[i];
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper.cc
+@@ -765,7 +765,9 @@ bool LinuxDumper::GetStackInfo(const voi
+       reinterpret_cast<uint8_t*>(int_stack_pointer & ~(page_size - 1));
+ 
+   // The number of bytes of stack which we try to capture.
+-  static const ptrdiff_t kStackToCapture = 32 * 1024;
++  // This now depends on page_size to avoid missing data
++  // on systems with larger page sizes.
++  static const ptrdiff_t kStackToCapture = 8 * page_size;
+ 
+   const MappingInfo* mapping = FindMapping(stack_pointer);
+   if (!mapping)
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper.h
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper.h
+@@ -63,7 +63,8 @@ namespace google_breakpad {
+  (defined(__mips__) && _MIPS_SIM == _ABIO32)
+ typedef Elf32_auxv_t elf_aux_entry;
+ #elif defined(__x86_64) || defined(__aarch64__) || \
+-     (defined(__mips__) && _MIPS_SIM != _ABIO32)
++     (defined(__mips__) && _MIPS_SIM != _ABIO32) || \
++     defined(__powerpc64__)
+ typedef Elf64_auxv_t elf_aux_entry;
+ #endif
+ 
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper_unittest_helper.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper_unittest_helper.cc
+@@ -51,6 +51,8 @@
+ #define TID_PTR_REGISTER "rcx"
+ #elif defined(__mips__)
+ #define TID_PTR_REGISTER "$1"
++#elif defined(__powerpc64__)
++#define TID_PTR_REGISTER "r8"
+ #else
+ #error This test has not been ported to this platform.
+ #endif
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper.cc
+@@ -154,19 +154,27 @@ bool LinuxPtraceDumper::CopyFromProcess(
+   return true;
+ }
+ 
+-bool LinuxPtraceDumper::ReadRegisterSet(ThreadInfo* info, pid_t tid)
+-{
++bool LinuxPtraceDumper::ReadRegisterSet(ThreadInfo* info, pid_t tid) {
+ #ifdef PTRACE_GETREGSET
+   struct iovec io;
+   info->GetGeneralPurposeRegisters(&io.iov_base, &io.iov_len);
+-  if (sys_ptrace(PTRACE_GETREGSET, tid, (void*)NT_PRSTATUS, (void*)&io) == -1) {
++  if (ptrace(PTRACE_GETREGSET, tid, (void*)NT_PRSTATUS, (void*)&io) == -1) {
+     return false;
+   }
+ 
+   info->GetFloatingPointRegisters(&io.iov_base, &io.iov_len);
+-  if (sys_ptrace(PTRACE_GETREGSET, tid, (void*)NT_FPREGSET, (void*)&io) == -1) {
++  if (ptrace(PTRACE_GETREGSET, tid, (void*)NT_FPREGSET, (void*)&io) == -1) {
+     return false;
+   }
++
++#if defined(__powerpc64__)
++  // Grab the vector registers on PPC64 too
++  info->GetVectorRegisters(&io.iov_base, &io.iov_len);
++  if (ptrace(PTRACE_GETREGSET, tid, (void*)NT_PPC_VMX, (void*)&io) == -1) {
++    return false;
++  }
++#endif // defined(__powerpc64__)
++
+   return true;
+ #else
+   return false;
+@@ -303,6 +311,9 @@ bool LinuxPtraceDumper::GetThreadInfoByI
+ #elif defined(__mips__)
+   stack_pointer =
+       reinterpret_cast<uint8_t*>(info->mcontext.gregs[MD_CONTEXT_MIPS_REG_SP]);
++#elif defined(__powerpc64__)
++  stack_pointer =
++      reinterpret_cast<uint8_t*>(info->mcontext.gp_regs[MD_CONTEXT_PPC64_REG_SP]);
+ #else
+ #error "This code hasn't been ported to your platform yet."
+ #endif
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper_unittest.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper_unittest.cc
+@@ -462,6 +462,9 @@ TEST(LinuxPtraceDumperTest, VerifyStackR
+ #elif defined(__mips__)
+     pid_t* process_tid_location =
+         reinterpret_cast<pid_t*>(one_thread.mcontext.gregs[1]);
++#elif defined(__powerpc64__)
++    pid_t* process_tid_location =
++        reinterpret_cast<pid_t*>(one_thread.mcontext.gp_regs[8]);
+ #else
+ #error This test has not been ported to this platform.
+ #endif
+@@ -559,6 +562,8 @@ TEST_F(LinuxPtraceDumperTest, SanitizeSt
+   uintptr_t heap_addr = thread_info.regs.rcx;
+ #elif defined(__mips__)
+   uintptr_t heap_addr = thread_info.mcontext.gregs[1];
++#elif defined(__powerpc64__)
++  uintptr_t heap_addr = thread_info.mcontext.gp_regs[8];
+ #else
+ #error This test has not been ported to this platform.
+ #endif
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.cc
+@@ -136,7 +136,9 @@ class MinidumpWriter {
+       : fd_(minidump_fd),
+         path_(minidump_path),
+         ucontext_(context ? &context->context : NULL),
+-#if !defined(__ARM_EABI__) && !defined(__mips__)
++#if defined(__powerpc64__)
++        vector_state_(context ? &context->vector_state : NULL),
++#elif !defined(__ARM_EABI__) && !defined(__mips__)
+         float_state_(context ? &context->float_state : NULL),
+ #endif
+         dumper_(dumper),
+@@ -468,7 +470,9 @@ class MinidumpWriter {
+         if (!cpu.Allocate())
+           return false;
+         my_memset(cpu.get(), 0, sizeof(RawContextCPU));
+-#if !defined(__ARM_EABI__) && !defined(__mips__)
++#if defined(__powerpc64__)
++        UContextReader::FillCPUContext(cpu.get(), ucontext_, vector_state_);
++#elif !defined(__ARM_EABI__) && !defined(__mips__)
+         UContextReader::FillCPUContext(cpu.get(), ucontext_, float_state_);
+ #else
+         UContextReader::FillCPUContext(cpu.get(), ucontext_);
+@@ -897,7 +901,7 @@ class MinidumpWriter {
+     dirent->location.rva = 0;
+   }
+ 
+-#if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
++#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || defined(__powerpc64__)
+   bool WriteCPUInformation(MDRawSystemInfo* sys_info) {
+     char vendor_id[sizeof(sys_info->cpu.x86_cpu_info.vendor_id) + 1] = {0};
+     static const char vendor_id_name[] = "vendor_id";
+@@ -917,7 +921,9 @@ class MinidumpWriter {
+ 
+     // processor_architecture should always be set, do this first
+     sys_info->processor_architecture =
+-#if defined(__mips__)
++#if defined(__powerpc64__)
++        MD_CPU_ARCHITECTURE_PPC64;
++#elif defined(__mips__)
+ # if _MIPS_SIM == _ABIO32
+         MD_CPU_ARCHITECTURE_MIPS;
+ # elif _MIPS_SIM == _ABI64
+@@ -1333,7 +1339,9 @@ class MinidumpWriter {
+   const char* path_;  // Path to the file where the minidum should be written.
+ 
+   const ucontext_t* const ucontext_;  // also from the signal handler
+-#if !defined(__ARM_EABI__) && !defined(__mips__)
++#if defined(__powerpc64__)
++  const google_breakpad::vstate_t* const vector_state_;
++#elif !defined(__ARM_EABI__) && !defined(__mips__)
+   const google_breakpad::fpstate_t* const float_state_;  // ditto
+ #endif
+   LinuxDumper* dumper_;
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.h
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.h
+@@ -48,6 +48,8 @@ class ExceptionHandler;
+ 
+ #if defined(__aarch64__)
+ typedef struct fpsimd_context fpstate_t;
++#elif defined(__powerpc64__)
++typedef vrregset_t vstate_t;
+ #elif !defined(__ARM_EABI__) && !defined(__mips__)
+ typedef std::remove_pointer<fpregset_t>::type fpstate_t;
+ #endif
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer_unittest.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer_unittest.cc
+@@ -715,6 +715,12 @@ TEST(MinidumpWriterTest, InvalidStackPoi
+ #elif defined(__mips__)
+   context.context.uc_mcontext.gregs[MD_CONTEXT_MIPS_REG_SP] =
+       invalid_stack_pointer;
++#elif defined(__powerpc64__)
++  context.context.uc_mcontext.gp_regs[MD_CONTEXT_PPC64_REG_SP] =
++      invalid_stack_pointer;
++#elif defined(__powerpc64__)
++  context.context.uc_mcontext.gp_regs[MD_CONTEXT_PPC64_REG_SP] =
++      invalid_stack_pointer;
+ #else
+ # error "This code has not been ported to your platform yet."
+ #endif
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/common/linux/memory_mapped_file.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/common/linux/memory_mapped_file.cc
+@@ -65,8 +65,7 @@ bool MemoryMappedFile::Map(const char* p
+   }
+ 
+ #if defined(__x86_64__) || defined(__aarch64__) || \
+-   (defined(__mips__) && _MIPS_SIM == _ABI64)
+-
++   (defined(__mips__) && _MIPS_SIM == _ABI64) || defined(__powerpc64__)
+   struct kernel_stat st;
+   if (sys_fstat(fd, &st) == -1 || st.st_size < 0) {
+ #else
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/common/linux/memory_mapped_file_unittest.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/common/linux/memory_mapped_file_unittest.cc
+@@ -176,9 +176,10 @@ TEST_F(MemoryMappedFileTest, RemapAfterM
+ TEST_F(MemoryMappedFileTest, MapWithOffset) {
+   // Put more data in the test file this time. Offsets can only be
+   // done on page boundaries, so we need a two page file to test this.
+-  const int page_size = 4096;
+-  char data1[2 * page_size];
+-  size_t data1_size = sizeof(data1);
++  const int page_size = getpagesize();
++  char *data1 = static_cast<char*>(malloc(2 * page_size));
++  EXPECT_TRUE(data1 != NULL);
++  size_t data1_size = (2 * page_size);
+   for (size_t i = 0; i < data1_size; ++i) {
+     data1[i] = i & 0x7f;
+   }
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/common/memory_allocator_unittest.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/common/memory_allocator_unittest.cc
+@@ -57,8 +57,9 @@ TEST(PageAllocatorTest, LargeObject) {
+ 
+   EXPECT_EQ(0U, allocator.pages_allocated());
+   uint8_t* p = reinterpret_cast<uint8_t*>(allocator.Alloc(10000));
++  uint64_t expected_pages = 1 + ((10000 - 1) / getpagesize());
+   ASSERT_FALSE(p == NULL);
+-  EXPECT_EQ(3U, allocator.pages_allocated());
++  EXPECT_EQ(expected_pages, allocator.pages_allocated());
+   for (unsigned i = 1; i < 10; ++i) {
+     uint8_t* p = reinterpret_cast<uint8_t*>(allocator.Alloc(i));
+     ASSERT_FALSE(p == NULL);
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/processor/exploitability_linux.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/processor/exploitability_linux.cc
+@@ -202,12 +202,14 @@ bool ExploitabilityLinux::EndedOnIllegal
+   // Check architecture and set architecture variable to corresponding flag
+   // in objdump.
+   switch (context->GetContextCPU()) {
++#if defined(__i386) || defined(__x86_64)
+     case MD_CONTEXT_X86:
+       architecture = "i386";
+       break;
+     case MD_CONTEXT_AMD64:
+       architecture = "i386:x86-64";
+       break;
++#endif
+     default:
+       // Unsupported architecture. Note that ARM architectures are not
+       // supported because objdump does not support ARM.
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/processor/exploitability_unittest.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/processor/exploitability_unittest.cc
+@@ -104,6 +104,8 @@ ExploitabilityFor(const string& filename
+ }
+ 
+ TEST(ExploitabilityTest, TestWindowsEngine) {
++// The following tests are only executable on an x86-class linux machine.
++#if !defined(_WIN32) && (defined(__i386) || defined(__x86_64))
+   ASSERT_EQ(google_breakpad::EXPLOITABILITY_HIGH,
+             ExploitabilityFor("ascii_read_av.dmp"));
+   ASSERT_EQ(google_breakpad::EXPLOITABILITY_HIGH,
+@@ -136,9 +138,12 @@ TEST(ExploitabilityTest, TestWindowsEngi
+             ExploitabilityFor("read_av_clobber_write.dmp"));
+   ASSERT_EQ(google_breakpad::EXPLOITABILITY_LOW,
+             ExploitabilityFor("read_av_conditional.dmp"));
++#endif
+ }
+ 
+ TEST(ExploitabilityTest, TestLinuxEngine) {
++// The following tests are only executable on an x86-class linux machine.
++#if defined(__i386) || defined(__x86_64)
+   ASSERT_EQ(google_breakpad::EXPLOITABILITY_INTERESTING,
+             ExploitabilityFor("linux_null_read_av.dmp"));
+   ASSERT_EQ(google_breakpad::EXPLOITABILITY_HIGH,
+@@ -171,7 +176,8 @@ TEST(ExploitabilityTest, TestLinuxEngine
+             ExploitabilityFor("linux_executable_heap.dmp"));
+   ASSERT_EQ(google_breakpad::EXPLOITABILITY_HIGH,
+             ExploitabilityFor("linux_jmp_to_module_not_exe_region.dmp"));
+-#ifndef _WIN32
++#endif
++#if !defined(_WIN32) && (defined(__i386) || defined(__x86_64))
+   ASSERT_EQ(google_breakpad::EXPLOITABILITY_HIGH,
+             ExploitabilityFor("linux_write_to_nonwritable_module.dmp"));
+   ASSERT_EQ(google_breakpad::EXPLOITABILITY_HIGH,
+@@ -182,10 +188,10 @@ TEST(ExploitabilityTest, TestLinuxEngine
+             ExploitabilityFor("linux_write_to_outside_module_via_math.dmp"));
+   ASSERT_EQ(google_breakpad::EXPLOITABILITY_INTERESTING,
+             ExploitabilityFor("linux_write_to_under_4k.dmp"));
+-#endif  // _WIN32
++#endif  // !defined(_WIN32) && (!defined(__i386) && !defined(__x86_64))
+ }
+ 
+-#ifndef _WIN32
++#if !defined(_WIN32) && (defined(__i386) || defined(__x86_64))
+ TEST(ExploitabilityLinuxUtilsTest, DisassembleBytesTest) {
+   ASSERT_FALSE(ExploitabilityLinuxTest::DisassembleBytes("", NULL, 5, NULL));
+   uint8_t bytes[6] = {0xc7, 0x0, 0x5, 0x0, 0x0, 0x0};
+@@ -301,6 +307,7 @@ TEST(ExploitabilityLinuxUtilsTest, Calcu
+                                                          context,
+                                                          &write_address));
+ }
+-#endif  // _WIN32
++#endif  // !defined(_WIN32) && (defined(__i386) || defined(__x86_64))
++
+ 
+ }  // namespace
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/tools/linux/md2core/minidump-2-core.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/tools/linux/md2core/minidump-2-core.cc
+@@ -77,6 +77,8 @@
+   #define ELF_ARCH  EM_MIPS
+ #elif defined(__aarch64__)
+   #define ELF_ARCH  EM_AARCH64
++#elif defined(__powerpc64__)
++  #define ELF_ARCH  EM_PPC64
+ #endif
+ 
+ #if defined(__arm__)
+@@ -87,6 +89,8 @@ typedef user_regs user_regs_struct;
+ #elif defined (__mips__)
+ // This file-local typedef simplifies the source code.
+ typedef gregset_t user_regs_struct;
++#elif defined(__powerpc64__)
++typedef struct pt_regs user_regs_struct;
+ #endif
+ 
+ using google_breakpad::MDTypeHelper;
+@@ -322,6 +326,12 @@ struct CrashedProcess {
+ #if defined(__aarch64__)
+     user_fpsimd_struct fpregs;
+ #endif
++#if defined(__powerpc64__)
++    mcontext_t mcontext;
++#endif
++#if defined(__powerpc64__)
++    mcontext_t mcontext;
++#endif
+     uintptr_t stack_addr;
+     const uint8_t* stack;
+     size_t stack_length;
+@@ -535,6 +545,38 @@ ParseThreadRegisters(CrashedProcess::Thr
+   thread->mcontext.fpc_eir = rawregs->float_save.fir;
+ #endif
+ }
++#elif defined(__powerpc64__)
++static void
++ParseThreadRegisters(CrashedProcess::Thread* thread,
++                     const MinidumpMemoryRange& range) {
++  const MDRawContextPPC64* rawregs = range.GetData<MDRawContextPPC64>(0);
++
++  for (int i = 0; i < MD_CONTEXT_PPC64_GPR_COUNT; i++)
++    thread->mcontext.gp_regs[i] = rawregs->gpr[i];
++
++  thread->mcontext.gp_regs[PT_LNK] = rawregs->lr;
++  thread->mcontext.gp_regs[PT_NIP] = rawregs->srr0;
++  thread->mcontext.gp_regs[PT_MSR] = rawregs->srr1;
++  thread->mcontext.gp_regs[PT_CCR] = rawregs->cr;
++  thread->mcontext.gp_regs[PT_XER] = rawregs->xer;
++  thread->mcontext.gp_regs[PT_CTR] = rawregs->ctr;
++  thread->mcontext.v_regs->vrsave = rawregs->vrsave;
++
++  for (int i = 0; i < MD_FLOATINGSAVEAREA_PPC_FPR_COUNT; i++)
++      thread->mcontext.fp_regs[i] = rawregs->float_save.fpregs[i];
++
++  thread->mcontext.fp_regs[NFPREG-1] = rawregs->float_save.fpscr;
++
++  for (int i = 0; i < MD_VECTORSAVEAREA_PPC_VR_COUNT; i++) {
++      thread->mcontext.v_regs->vrregs[i][0] = rawregs->vector_save.save_vr[i].high >> 32;
++      thread->mcontext.v_regs->vrregs[i][1] = rawregs->vector_save.save_vr[i].high;
++      thread->mcontext.v_regs->vrregs[i][2] = rawregs->vector_save.save_vr[i].low >> 32;
++      thread->mcontext.v_regs->vrregs[i][3] = rawregs->vector_save.save_vr[i].low;
++  }
++
++  thread->mcontext.v_regs->vscr.vscr_word = rawregs->vector_save.save_vscr.low & 0xFFFFFFFF;
++}
++
+ #else
+ #error "This code has not been ported to your platform yet"
+ #endif
+@@ -623,6 +665,12 @@ ParseSystemInfo(const Options& options,
+ # else
+ #  error "This mips ABI is currently not supported (n32)"
+ # endif
++#elif defined(__powerpc64__)
++  if (sysinfo->processor_architecture != MD_CPU_ARCHITECTURE_PPC64) {
++    fprintf(stderr,
++            "This version of minidump-2-core only supports PPC64.\n");
++    exit(1);
++  }
+ #else
+ #error "This code has not been ported to your platform yet"
+ #endif
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/CONTRIBUTORS
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/CONTRIBUTORS
+@@ -13,3 +13,4 @@ Mark Mentovai <mark@chromium.org>
+ Robert Sesek <rsesek@chromium.org>
+ Scott Graham <scottmg@chromium.org>
+ Joshua Peraza <jperaza@chromium.org>
++Shawn Anastasio <shawn@anastas.io>
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/compat/linux/sys/user.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/compat/linux/sys/user.h
+@@ -15,6 +15,7 @@
+ #ifndef CRASHPAD_COMPAT_LINUX_SYS_USER_H_
+ #define CRASHPAD_COMPAT_LINUX_SYS_USER_H_
+ 
++#include <cstddef>
+ #include_next <sys/user.h>
+ 
+ #include <features.h>
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/minidump/minidump_context.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/minidump/minidump_context.h
+@@ -592,6 +592,70 @@ struct MinidumpContextMIPS64 {
+   uint64_t fir;
+ };
+ 
++//! \brief ppc64-specific flags for MinidumpPPC64::context_flags
++//! Based on minidump_cpu_ppc64.h from breakpad
++enum MinidumpContextPPC64Flags : uint32_t {
++  //! \brief Identifies the context as PPC64.
++  kMinidumpContextPPC64 = 0x01000000,
++
++  //! \brief Indicates the validity of general purpose registers.
++  //!
++  //! Registers `r0`-`r31`, `nip`, `msr`, `lr`, etc. are valid.
++  kMinidumpContextPPC64Base = kMinidumpContextPPC64 | 0x00000001,
++
++  //! \brief Indicates the validity of floating point registers.
++  //!
++  //! Registers `fp0`-`fp31`, `fpscr` are valid.
++  kMinidumpContextPPC64Floating = kMinidumpContextPPC64 | 0x00000008,
++
++  //! \brief Indicates the validity of Altivec/VMX registers.
++  //!
++  //! Registers `v0`-`v31`, `vscr`, `vrsave`.
++  kMinidumpContextPPC64Vector = kMinidumpContextPPC64 | 0x00000020,
++
++  //! \brief Indicates the validity of all registers
++  kMinidumpContextPPC64All = kMinidumpContextPPC64Base     |
++                             kMinidumpContextPPC64Floating |
++                             kMinidumpContextPPC64Vector
++};
++
++//! \brief A PPC64 CPU context carried in a minidump file.
++//! Based on minidump_cpu_ppc64.h from breakpad.
++struct MinidumpContextPPC64 {
++  uint64_t context_flags;
++
++  //! \brief General purpose registers.
++  uint64_t nip;
++  uint64_t msr;
++  uint64_t regs[32];
++  uint64_t ccr;
++  uint64_t xer;
++  uint64_t lnk;
++  uint64_t ctr;
++
++  //! \brief Floating point registers.
++  double fpregs[32];
++
++  //! \brief FPU status register.
++  double fpscr;
++
++  //! \brief Altivec/VMX vector registers.
++  struct {
++      //! \brief Vector registers are 128bits.
++      uint128_struct save_vr[32];
++      uint128_struct save_vscr;
++
++      //! \brief Padding included for breakpad compatibiltiy.
++      uint32_t save_pad5[4];
++
++      //! \brief VRSAVE register.
++      uint32_t save_vrsave;
++
++      //! \brief Padding included for breakpad compatibiltiy.
++      uint32_t save_pad6[7];
++  } vregs;
++};
++
+ }  // namespace crashpad
+ 
+ #endif  // CRASHPAD_MINIDUMP_MINIDUMP_CONTEXT_H_
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/minidump/minidump_context_writer.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/minidump/minidump_context_writer.cc
+@@ -101,6 +101,13 @@ MinidumpContextWriter::CreateFromSnapsho
+       break;
+     }
+ 
++    case kCPUArchitecturePPC64: {
++      context = std::make_unique<MinidumpContextPPC64Writer>();
++      reinterpret_cast<MinidumpContextPPC64Writer*>(context.get())
++          ->InitalizeFromSnapshot(context_snapshot->ppc64);
++      break;
++    }
++
+     default: {
+       LOG(ERROR) << "unknown context architecture "
+                  << context_snapshot->architecture;
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/minidump/minidump_context_writer.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/minidump/minidump_context_writer.h
+@@ -315,6 +315,45 @@ class MinidumpContextMIPS64Writer final
+   DISALLOW_COPY_AND_ASSIGN(MinidumpContextMIPS64Writer);
+ };
+ 
++class MinidumpContextPPC64Writer final : public MinidumpContextWriter {
++ public:
++  MinidumpContextPPC64Writer();
++  ~MinidumpContextPPC64Writer() override;
++
++  //! \brief Initalizes the MinidumpContextPPC64 based on \a context_snapshot.
++  //!
++  //! \param[in] context_snapshot The context snapshot to use as source data.
++  //!
++  //! \note Valid in #kStateMutable. No mutation of context() may be done before
++  //!     calling this method, and it is not normally necessary to alter
++  //!     context() after calling this method.
++  void InitalizeFromSnapshot(const CPUContextPPC64* context_snapshot);
++
++  //! \brief Returns a pointer to the context structure that this object will
++  //!     write.
++  //!
++  //! \attention This returns a non-`const` pointer to this object’s private
++  //!     data so that a caller can populate the context structure directly.
++  //!     This is done because providing setter interfaces to each field in the
++  //!     context structure would be unwieldy and cumbersome. Care must be taken
++  //!     to populate the context structure correctly. The context structure
++  //!     must only be modified while this object is in the #kStateMutable
++  //!     state.
++  MinidumpContextPPC64* context() { return &context_; }
++
++ protected:
++  // MinidumpWritable:
++  bool WriteObject(FileWriterInterface* file_writer) override;
++
++  // MinidumpContextWriter:
++  size_t ContextSize() const override;
++
++ private:
++  MinidumpContextPPC64 context_;
++
++  DISALLOW_COPY_AND_ASSIGN(MinidumpContextPPC64Writer);
++};
++
+ }  // namespace crashpad
+ 
+ #endif  // CRASHPAD_MINIDUMP_MINIDUMP_CONTEXT_WRITER_H_
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/minidump/minidump_context_writer_test.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/minidump/minidump_context_writer_test.cc
+@@ -213,6 +213,21 @@ TEST(MinidumpContextWriter, MIPS64_FromS
+       context, ExpectMinidumpContextMIPS64, kSeed);
+ }
+ 
++TEST(MinidumpContextWriter, PPC64_Zeros) {
++  EmptyContextTest<MinidumpContextPPC64Writer, MinidumpContextPPC64>(
++    ExpectMinidumpContextPPC64);
++}
++
++TEST(MinidumpContextWriter, PPC64_FromSnapshot) {
++  constexpr uint32_t kSeed = 64;
++  CPUContextPPC64 context_ppc64;
++  CPUContext context;
++  context.ppc64 = &context_ppc64;
++  InitializeCPUContextPPC64(&context, kSeed);
++  FromSnapshotTest<MinidumpContextPPC64Writer, MinidumpContextPPC64>(
++      context, ExpectMinidumpContextPPC64, kSeed);
++}
++
+ }  // namespace
+ }  // namespace test
+ }  // namespace crashpad
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/minidump/minidump_misc_info_writer.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/minidump/minidump_misc_info_writer.cc
+@@ -135,6 +135,8 @@ std::string MinidumpMiscInfoDebugBuildSt
+   static constexpr char kCPU[] = "mips";
+ #elif defined(ARCH_CPU_MIPS64EL)
+   static constexpr char kCPU[] = "mips64";
++#elif defined(ARCH_CPU_PPC64)
++  static constexpr char kCPU[] = "ppc64";
+ #else
+ #error define kCPU for this CPU
+ #endif
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/capture_memory.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/capture_memory.cc
+@@ -112,6 +112,11 @@ void CaptureMemory::PointedToByContext(c
+   for (size_t i = 0; i < base::size(context.mipsel->regs); ++i) {
+     MaybeCaptureMemoryAround(delegate, context.mipsel->regs[i]);
+   }
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++  MaybeCaptureMemoryAround(delegate, context.ppc64->nip);
++  for (size_t i = 0; i < base::size(context.ppc64->regs); ++i) {
++    MaybeCaptureMemoryAround(delegate, context.ppc64->regs[i]);
++  }
+ #else
+ #error Port.
+ #endif
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/cpu_architecture.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/cpu_architecture.h
+@@ -43,7 +43,10 @@ enum CPUArchitecture {
+   kCPUArchitectureMIPSEL,
+ 
+   //! \brief 64-bit MIPSEL.
+-  kCPUArchitectureMIPS64EL
++  kCPUArchitectureMIPS64EL,
++
++  //! \brief 64-bit PPC64.
++  kCPUArchitecturePPC64
+ };
+ 
+ }  // namespace crashpad
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/cpu_context.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/cpu_context.cc
+@@ -169,6 +169,8 @@ uint64_t CPUContext::InstructionPointer(
+       return arm->pc;
+     case kCPUArchitectureARM64:
+       return arm64->pc;
++    case kCPUArchitecturePPC64:
++      return ppc64->nip;
+     default:
+       NOTREACHED();
+       return ~0ull;
+@@ -185,6 +187,8 @@ uint64_t CPUContext::StackPointer() cons
+       return arm->sp;
+     case kCPUArchitectureARM64:
+       return arm64->sp;
++    case kCPUArchitecturePPC64:
++      return ppc64->regs[1];
+     default:
+       NOTREACHED();
+       return ~0ull;
+@@ -196,6 +200,7 @@ bool CPUContext::Is64Bit() const {
+     case kCPUArchitectureX86_64:
+     case kCPUArchitectureARM64:
+     case kCPUArchitectureMIPS64EL:
++    case kCPUArchitecturePPC64:
+       return true;
+     case kCPUArchitectureX86:
+     case kCPUArchitectureARM:
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/cpu_context.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/cpu_context.h
+@@ -352,6 +352,24 @@ struct CPUContextMIPS64 {
+   uint64_t fir;
+ };
+ 
++//! \brief A context structure carrying PPC64 CPU state.
++struct CPUContextPPC64 {
++  uint64_t nip;
++  uint64_t msr;
++  uint64_t regs[32];
++  uint64_t ccr;
++  uint64_t xer;
++  uint64_t lnk;
++  uint64_t ctr;
++  double fpregs[32];
++  double fpscr;
++  struct {
++    uint128_struct save_vr[32];
++    uint128_struct save_vscr;
++    uint32_t save_vrsave;
++  } vregs;
++};
++
+ //! \brief A context structure capable of carrying the context of any supported
+ //!     CPU architecture.
+ struct CPUContext {
+@@ -382,6 +400,7 @@ struct CPUContext {
+     CPUContextARM64* arm64;
+     CPUContextMIPS* mipsel;
+     CPUContextMIPS64* mips64;
++    CPUContextPPC64* ppc64;
+   };
+ };
+ 
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/cpu_context_linux.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/cpu_context_linux.h
+@@ -15,6 +15,7 @@
+ #ifndef CRASHPAD_SNAPSHOT_LINUX_CPU_CONTEXT_LINUX_H_
+ #define CRASHPAD_SNAPSHOT_LINUX_CPU_CONTEXT_LINUX_H_
+ 
++#include <cstring>
+ #include "build/build_config.h"
+ #include "snapshot/cpu_context.h"
+ #include "snapshot/linux/signal_context.h"
+@@ -174,6 +175,76 @@ void InitializeCPUContextMIPS(
+ 
+ #endif  // ARCH_CPU_MIPS_FAMILY || DOXYGEN
+ 
++#if defined(ARCH_CPU_PPC64_FAMILY) || DOXYGEN
++
++//! \brief Initalizes a CPUContextPPC64 structure from native context
++//!     structures on Linux.
++//!
++//! \param[in] thread_context The native thread context.
++//! \param[in] float_context The native float context.
++//! \param[in] vector_context The native vector context.
++//! \param[out] context The CPUContextPPC64 structure to initalize.
++template <typename Traits>
++void InitializeCPUContextPPC64(
++    const ThreadContext::t64_t& thread_context,
++    const FloatContext::f64_t& float_context,
++    const VectorContext::v64_t& vector_context,
++    typename Traits::CPUContext* context) {
++
++  memcpy(context->regs, thread_context.gpr, sizeof(context->regs));
++  context->nip = thread_context.nip;
++  context->msr = thread_context.msr;
++  context->ccr = thread_context.ccr;
++  context->xer = thread_context.xer;
++  context->lnk = thread_context.lnk;
++  context->ctr = thread_context.ctr;
++
++  memcpy(context->fpregs, float_context.fpregs, sizeof(context->fpregs));
++  context->fpscr = float_context.fpscr;
++
++  for (uint8_t i = 0; i < 32; i++) {
++    context->vregs.save_vr[i] = {
++      (((uint64_t)vector_context.vrregs[i][0]) << 32) |
++        vector_context.vrregs[i][1],
++      (((uint64_t)vector_context.vrregs[i][2]) << 32) |
++        vector_context.vrregs[i][3]
++    };
++  }
++  context->vregs.save_vrsave = vector_context.vrsave;
++  context->vregs.save_vscr = {0, (uint64_t)vector_context.vscr.vscr_word};
++}
++
++template <typename Traits>
++void InitializeCPUContextPPC64(
++    const SignalThreadContext64 &thread_context,
++    const SignalFloatContext64 &float_context,
++    const SignalVectorContext64 &vector_context,
++    typename Traits::CPUContext* context) {
++
++  memcpy(context->regs, thread_context.regs, sizeof(context->regs));
++  context->nip = thread_context.nip;
++  context->msr = thread_context.msr;
++  context->ccr = thread_context.ccr;
++  context->xer = thread_context.xer;
++  context->lnk = thread_context.lnk;
++  context->ctr = thread_context.ctr;
++
++  memcpy(context->fpregs, float_context.regs, sizeof(context->fpregs));
++  context->fpscr = float_context.fpscr;
++
++  for (uint8_t i = 0; i < 32; i++) {
++    context->vregs.save_vr[i] = {
++      (((uint64_t)vector_context.vrregs[i][0]) << 32) |
++        vector_context.vrregs[i][1],
++      (((uint64_t)vector_context.vrregs[i][2]) << 32) |
++        vector_context.vrregs[i][3]
++    };
++  }
++  context->vregs.save_vrsave = vector_context.vrsave;
++  context->vregs.save_vscr = {0, (uint64_t)vector_context.vscr.vscr_word};
++}
++
++#endif
+ }  // namespace internal
+ }  // namespace crashpad
+ 
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/debug_rendezvous_test.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/debug_rendezvous_test.cc
+@@ -192,6 +192,8 @@ void TestAgainstTarget(PtraceConnection*
+               device == 0 && inode == 0 && mapping_name == "[vdso]";
+ #if defined(ARCH_CPU_X86)
+           static constexpr char kPrefix[] = "linux-gate.so.";
++#elif defined(ARCH_CPU_PPC64)
++          static constexpr char kPrefix[] = "linux-vdso64.so.";
+ #else
+           static constexpr char kPrefix[] = "linux-vdso.so.";
+ #endif
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux.cc
+@@ -323,6 +323,69 @@ bool ExceptionSnapshotLinux::ReadContext
+       reader, context_address, context_.mips64);
+ }
+ 
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++
++template <typename Traits>
++static bool ReadContext(ProcessReaderLinux* reader,
++                        LinuxVMAddress context_address,
++                        typename Traits::CPUContext* dest_context) {
++  const ProcessMemory* memory = reader->Memory();
++
++  LinuxVMAddress gp_regs_address = context_address +
++                                   offsetof(UContext, mcontext) +
++                                   offsetof(typename Traits::MContext, gp_regs);
++
++  typename Traits::SignalThreadContext thread_context;
++  if (!memory->Read(gp_regs_address, sizeof(thread_context), &thread_context)) {
++    LOG(ERROR) << "Couldn't read gp_regs!";
++    return false;
++  }
++
++  LinuxVMAddress fp_regs_address = context_address +
++                                   offsetof(UContext, mcontext) +
++                                   offsetof(typename Traits::MContext, fp_regs);
++
++  typename Traits::SignalFloatContext fp_context;
++  if (!memory->Read(fp_regs_address, sizeof(fp_context), &fp_context)) {
++    LOG(ERROR) << "Couldn't read fp_regs!";
++    return false;
++  }
++
++  LinuxVMAddress v_regs_ptr_address = context_address +
++                                  offsetof(UContext, mcontext) +
++                                  offsetof(typename Traits::MContext, vmx_reserve) + 8;
++
++  typename Traits::SignalVectorContext v_context;
++  if (!memory->Read(v_regs_ptr_address, sizeof(v_context), &v_context)) {
++    LOG(ERROR) << "Couldn't read v_regs!";
++    return false;
++  }
++
++  InitializeCPUContextPPC64<ContextTraits64>(thread_context, fp_context,
++                            v_context, dest_context);
++
++  return true;
++}
++
++template<>
++bool ExceptionSnapshotLinux::ReadContext<ContextTraits64>(
++    ProcessReaderLinux* reader,
++    LinuxVMAddress context_address) {
++  context_.architecture = kCPUArchitecturePPC64;
++  context_.ppc64 = &context_union_.ppc64;
++
++  return internal::ReadContext<ContextTraits64>(
++      reader, context_address, context_.ppc64);
++}
++
++template<>
++bool ExceptionSnapshotLinux::ReadContext<ContextTraits32>(
++    ProcessReaderLinux* reader,
++    LinuxVMAddress context_address) {
++  // PPC64 is 64-bit
++  return false;
++}
++
+ #endif  // ARCH_CPU_X86_FAMILY
+ 
+ bool ExceptionSnapshotLinux::Initialize(ProcessReaderLinux* process_reader,
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux.h
+@@ -84,6 +84,8 @@ class ExceptionSnapshotLinux final : pub
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+     CPUContextMIPS mipsel;
+     CPUContextMIPS64 mips64;
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++    CPUContextPPC64 ppc64;
+ #endif
+   } context_union_;
+   CPUContext context_;
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux_test.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux_test.cc
+@@ -296,7 +296,28 @@ void ExpectContext(const CPUContext& act
+             0);
+ #undef CPU_ARCH_NAME
+ }
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++using NativeCPUContext = ucontext_t;
+ 
++void InitializeContext(NativeCPUContext* context) {
++  for (size_t reg = 0; reg < 32; ++reg) {
++    context->uc_mcontext.gp_regs[reg] = reg;
++  }
++
++  memset(&context->uc_mcontext.fp_regs, 44,
++      sizeof(context->uc_mcontext.fp_regs));
++}
++
++void ExpectContext(const CPUContext& actual, const NativeCPUContext& expected) {
++  EXPECT_EQ(actual.architecture, kCPUArchitecturePPC64);
++
++  for (size_t reg = 0; reg < 32; ++reg) {
++    EXPECT_EQ(actual.ppc64->regs[reg], expected.uc_mcontext.gp_regs[reg]);
++  }
++
++  EXPECT_EQ(memcmp(actual.ppc64->fpregs, expected.uc_mcontext.fp_regs,
++            sizeof(actual.ppc64->fpregs)), 0);
++}
+ #else
+ #error Port.
+ #endif
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/process_reader_linux.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/process_reader_linux.cc
+@@ -108,6 +108,8 @@ void ProcessReaderLinux::Thread::Initial
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+   stack_pointer = reader->Is64Bit() ? thread_info.thread_context.t64.regs[29]
+                                     : thread_info.thread_context.t32.regs[29];
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++  stack_pointer = thread_info.thread_context.t64.gpr[1];
+ #else
+ #error Port.
+ #endif
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/signal_context.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/signal_context.h
+@@ -422,6 +422,93 @@ static_assert(offsetof(UContext<ContextT
+               "context offset mismatch");
+ #endif
+ 
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++
++struct SignalThreadContext64 {
++  uint64_t regs[32];
++  uint64_t nip;
++  uint64_t msr;
++  uint64_t orig_r3;
++  uint64_t ctr;
++  uint64_t lnk;
++  uint64_t xer;
++  uint64_t ccr;
++  uint64_t softe;
++  uint64_t trap;
++  uint64_t dar;
++  uint64_t dsisr;
++  uint64_t result;
++  uint64_t dscr;
++  uint64_t fpr0[3];
++};
++
++struct SignalFloatContext64 {
++  double regs[32];
++  double fpscr;
++};
++
++struct SignalVectorContext64 {
++  int32_t vrregs[32][4];
++  struct {
++    int32_t __pad[3];
++    int32_t vscr_word;
++  } vscr;
++  int32_t vrsave;
++  int32_t __pad[3];
++} __attribute__((__aligned__(16)));
++
++
++#pragma pack(pop)
++struct MContext64 {
++  uint64_t reserved[4];
++  int32_t signal;
++  int32_t __pad0;
++  uint64_t handler;
++  uint64_t oldmask;
++  uint64_t pt_regs_ptr;
++  SignalThreadContext64 gp_regs;
++  SignalFloatContext64  fp_regs;
++  SignalVectorContext64 *v_regs;
++#ifdef __GLIBC__
++  int64_t vmx_reserve[69];
++#else
++  int64_t vmx_reserve[101];
++#endif
++};
++
++struct ContextTraits64 : public Traits64 {
++  using MContext = MContext64;
++  using SignalThreadContext = SignalThreadContext64;
++  using SignalFloatContext = SignalFloatContext64;
++  using SignalVectorContext = SignalVectorContext64;
++  using CPUContext = CPUContextPPC64;
++};
++
++struct ContextTraits32 : public Traits32 {};
++
++struct UContext {
++  uint64_t flags;
++  uint64_t link;
++  SignalStack<ContextTraits64> stack;
++  Sigset<ContextTraits64> sigmask;
++  MContext64 mcontext;
++};
++#pragma pack(push, 1)
++
++static_assert(sizeof(UContext) == sizeof(ucontext_t),
++              "ucontext_t size mismatch");
++static_assert(sizeof(MContext64) == sizeof(mcontext_t),
++              "mcontext_t size mismatch");
++static_assert(sizeof(SignalThreadContext64) == sizeof(gregset_t),
++              "gregset_t size mismatch");
++static_assert(sizeof(SignalFloatContext64) == sizeof(fpregset_t),
++              "fpregset_t size mismatch");
++static_assert(sizeof(SignalVectorContext64) == sizeof(vrregset_t),
++              "vrregset_t size mismatch");
++static_assert(offsetof(UContext, mcontext) ==
++              offsetof(ucontext_t, uc_mcontext), "mcontext offset mismatch");
++static_assert(offsetof(MContext64, gp_regs) ==
++              offsetof(mcontext_t, gp_regs), "gp_regs offset mismatch");
+ #else
+ #error Port.
+ #endif  // ARCH_CPU_X86_FAMILY
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/system_snapshot_linux.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/system_snapshot_linux.cc
+@@ -204,6 +204,8 @@ CPUArchitecture SystemSnapshotLinux::Get
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+   return process_reader_->Is64Bit() ? kCPUArchitectureMIPS64EL
+                                     : kCPUArchitectureMIPSEL;
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++  return kCPUArchitecturePPC64;
+ #else
+ #error port to your architecture
+ #endif
+@@ -219,6 +221,9 @@ uint32_t SystemSnapshotLinux::CPURevisio
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+   // Not implementable on MIPS
+   return 0;
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++  // Not yet implemented on PPC64
++  return 0;
+ #else
+ #error port to your architecture
+ #endif
+@@ -239,6 +244,9 @@ std::string SystemSnapshotLinux::CPUVend
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+   // Not implementable on MIPS
+   return std::string();
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++  // Not yet implemented on PPC64
++  return std::string();
+ #else
+ #error port to your architecture
+ #endif
+@@ -372,6 +380,9 @@ bool SystemSnapshotLinux::NXEnabled() co
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+   // Not implementable on MIPS
+   return false;
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++  // Not yet implemented on PPC64
++  return false;
+ #else
+ #error Port.
+ #endif  // ARCH_CPU_X86_FAMILY
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/test_modules.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/test_modules.cc
+@@ -110,6 +110,8 @@ bool WriteTestModule(const base::FilePat
+   module.ehdr.e_machine = EM_AARCH64;
+ #elif defined(ARCH_CPU_MIPSEL) || defined(ARCH_CPU_MIPS64EL)
+   module.ehdr.e_machine = EM_MIPS;
++#elif defined(ARCH_CPU_PPC64)
++  module.ehdr.e_machine = EM_PPC64;
+ #endif
+ 
+   module.ehdr.e_version = EV_CURRENT;
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/thread_snapshot_linux.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/thread_snapshot_linux.cc
+@@ -186,6 +186,14 @@ bool ThreadSnapshotLinux::Initialize(Pro
+         thread.thread_info.float_context.f32,
+         context_.mipsel);
+   }
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++  context_.architecture = kCPUArchitecturePPC64;
++  context_.ppc64 = &context_union_.ppc64;
++  InitializeCPUContextPPC64<ContextTraits64>(
++      thread.thread_info.thread_context.t64,
++      thread.thread_info.float_context.f64,
++      thread.thread_info.vector_context.v64,
++      context_.ppc64);
+ #else
+ #error Port.
+ #endif
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/thread_snapshot_linux.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/thread_snapshot_linux.h
+@@ -68,6 +68,8 @@ class ThreadSnapshotLinux final : public
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+     CPUContextMIPS mipsel;
+     CPUContextMIPS64 mips64;
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++    CPUContextPPC64 ppc64;
+ #else
+ #error Port.
+ #endif  // ARCH_CPU_X86_FAMILY
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/util/linux/auxiliary_vector.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/util/linux/auxiliary_vector.cc
+@@ -56,6 +56,11 @@ bool AuxiliaryVector::Read(PtraceConnect
+     if (type == AT_IGNORE) {
+       continue;
+     }
++#if defined(ARCH_CPU_PPC64_FAMILY)
++    if (type == AT_IGNOREPPC) {
++      continue;
++    }
++#endif
+     if (!MapInsertOrReplace(&values_, type, value, nullptr)) {
+       LOG(ERROR) << "duplicate auxv entry";
+       return false;
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/util/linux/ptracer.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/util/linux/ptracer.cc
+@@ -401,6 +401,64 @@ bool GetThreadArea64(pid_t tid,
+   return true;
+ }
+ 
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++// PPC64 has had HAVE_ARCH_TRACEHOOK set since 2.6.27 (even before x86 had it).
++// That means we can simply use PTRACE_GETREGESET.
++
++template <typename Destination>
++bool GetRegisterSet(pid_t tid, int set, Destination* dest, bool can_log) {
++  iovec iov;
++  iov.iov_base = reinterpret_cast<void*>(dest);
++  iov.iov_len = sizeof(*dest);
++  if (ptrace(PTRACE_GETREGSET, tid, reinterpret_cast<void*>(set), &iov) != 0) {
++    PLOG_IF(ERROR, can_log) << "ptrace";
++    return false;
++  }
++  if (iov.iov_len != sizeof(*dest)) {
++    LOG_IF(ERROR, can_log) << "Unexpected registers size";
++    return false;
++  }
++  return true;
++}
++
++bool GetVectorRegisters64(pid_t tid,
++                          VectorContext* context,
++                          bool can_log) {
++  return GetRegisterSet(tid, NT_PPC_VMX, &context->v64, can_log);
++}
++
++bool GetFloatingPointRegisters64(pid_t tid,
++                                 FloatContext* context,
++                                 bool can_log) {
++  return GetRegisterSet(tid, NT_PRFPREG, &context->f64, can_log);
++}
++
++bool GetThreadArea64(pid_t tid,
++                     const ThreadContext& context,
++                     LinuxVMAddress* address,
++                     bool can_log) {
++  // PPC64 doesn't have PTRACE_GET_THREAD_AREA since the thread pointer
++  // is stored in GPR 13.
++  ThreadContext::t64_t tc;
++  if (!GetRegisterSet(tid, NT_PRSTATUS, &tc, can_log)) {
++    LOG_IF(ERROR, can_log) << "Unable to get thread pointer!";
++    return false;
++  }
++
++  *address = tc.gpr[13];
++
++  return true;
++}
++
++// Stubs for 32-bit functions not applicable on PPC64
++bool GetFloatingPointRegisters32(pid_t tid,
++                                 FloatContext* context,
++                                 bool can_log) { return false; }
++bool GetThreadArea32(pid_t tid,
++                     const ThreadContext &context,
++                     LinuxVMAddress *address,
++                     bool can_log) { return false; }
++
+ #else
+ #error Port.
+ #endif  // ARCH_CPU_X86_FAMILY
+@@ -497,6 +555,9 @@ bool Ptracer::GetThreadInfo(pid_t tid, T
+   if (is_64_bit_) {
+     return GetGeneralPurposeRegisters64(tid, &info->thread_context, can_log_) &&
+            GetFloatingPointRegisters64(tid, &info->float_context, can_log_) &&
++#if defined(ARCH_CPU_PPC64_FAMILY)
++           GetVectorRegisters64(tid, &info->vector_context, can_log_) &&
++#endif
+            GetThreadArea64(tid,
+                            info->thread_context,
+                            &info->thread_specific_data_address,
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/util/linux/thread_info.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/util/linux/thread_info.h
+@@ -39,6 +39,13 @@ struct user_vfp_exc {
+ #include <android/api-level.h>
+ #endif
+ 
++#if defined(ARCH_CPU_PPC64_FAMILY)
++#include <sys/ucontext.h>
++#if !defined(__GLIBC__)
++#include <asm/ptrace.h>
++#endif
++#endif
++
+ namespace crashpad {
+ 
+ //! \brief The set of general purpose registers for an architecture family.
+@@ -90,6 +97,8 @@ union ThreadContext {
+     uint32_t cp0_status;
+     uint32_t cp0_cause;
+     uint32_t padding1_;
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++    // PPC64 is 64-bit
+ #else
+ #error Port.
+ #endif  // ARCH_CPU_X86_FAMILY
+@@ -143,6 +152,21 @@ union ThreadContext {
+     uint64_t cp0_badvaddr;
+     uint64_t cp0_status;
+     uint64_t cp0_cause;
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++    // Reflects struct pt_regs in asm/ptrace.h.
++    uint64_t gpr[32];
++    uint64_t nip;
++    uint64_t msr;
++    uint64_t orig_gpr3;
++    uint64_t ctr;
++    uint64_t lnk;
++    uint64_t xer;
++    uint64_t ccr;
++    uint64_t softe;
++    uint64_t trap;
++    uint64_t dar;
++    uint64_t dsisr;
++    uint64_t result;
+ #else
+ #error Port.
+ #endif  // ARCH_CPU_X86_FAMILY
+@@ -154,6 +178,8 @@ union ThreadContext {
+   using NativeThreadContext = user_regs;
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+ // No appropriate NativeThreadsContext type available for MIPS
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++  using NativeThreadContext = struct pt_regs;
+ #else
+ #error Port.
+ #endif  // ARCH_CPU_X86_FAMILY || ARCH_CPU_ARM64
+@@ -229,6 +255,9 @@ union FloatContext {
+     } fpregs[32];
+     uint32_t fpcsr;
+     uint32_t fpu_id;
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++    // Crashpad's PPC support is 64-bit only, so this
++    // 32bit-only struct is declared as empty.
+ #else
+ #error Port.
+ #endif  // ARCH_CPU_X86_FAMILY
+@@ -263,6 +292,10 @@ union FloatContext {
+     double fpregs[32];
+     uint32_t fpcsr;
+     uint32_t fpu_id;
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++    // Reflects fpregset_t in sys/ucontext.h
++    double fpregs[32];
++    double fpscr;
+ #else
+ #error Port.
+ #endif  // ARCH_CPU_X86_FAMILY
+@@ -291,6 +324,8 @@ union FloatContext {
+   static_assert(sizeof(f64) == sizeof(user_fpsimd_struct), "Size mismatch");
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+ // No appropriate floating point context native type for available MIPS.
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++  static_assert(sizeof(f64) == sizeof(fpregset_t), "Size mismatch");
+ #else
+ #error Port.
+ #endif  // ARCH_CPU_X86
+@@ -298,6 +333,26 @@ union FloatContext {
+ static_assert(std::is_standard_layout<FloatContext>::value,
+               "Not standard layout");
+ 
++//! \brief The vector registers used for an architecture family
++union VectorContext {
++  struct v32_t {} v32;
++#if defined(ARCH_CPU_PPC64_FAMILY)
++  __attribute__((__aligned__(16))) // Vector context must be doubleword aligned.
++#endif
++  struct v64_t {
++#if defined(ARCH_CPU_PPC64_FAMILY)
++    // Reflects vrregset_t in sys/ucontext.h
++    uint32_t vrregs[32][4];
++    struct {
++      uint32_t __pad[3];
++      uint32_t vscr_word;
++    } vscr;
++    uint32_t vrsave;
++    uint32_t __pad[3];
++#endif
++  } v64;
++};
++
+ //! \brief A collection of `ptrace`-able information about a thread.
+ struct ThreadInfo {
+   ThreadInfo();
+@@ -309,6 +364,9 @@ struct ThreadInfo {
+   //! \brief The floating point registers for the thread.
+   FloatContext float_context;
+ 
++  //! \brief (Optional) The vector registers used for the thread.
++  VectorContext vector_context;
++
+   //! \brief The thread-local storage address for the thread.
+   LinuxVMAddress thread_specific_data_address;
+ };
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/util/misc/capture_context.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/util/misc/capture_context.h
+@@ -69,6 +69,7 @@ using NativeCPUContext = ucontext_t;
+ //!     macOS/Linux/Fuchsia | x86_64       | `%%rdi`
+ //!     Linux               | ARM/ARM64    | `r0`/`x0`
+ //!     Linux               | MIPS/MIPS64  | `$a0`
++//!     Linux               | PPC64        | `r3`
+ //!
+ //!     Additionally, the value `LR` on ARM/ARM64 will be the return address of
+ //!     this function.
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/util/misc/capture_context_linux.S
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/util/misc/capture_context_linux.S
+@@ -32,7 +32,7 @@
+   .balign 4, 0x0
+   .type CAPTURECONTEXT_SYMBOL, %function
+   .type CAPTURECONTEXT_SYMBOL2, %function
+-#elif defined(__mips__)
++#elif defined(__mips__) || defined(__powerpc64__)
+   .balign 4, 0x0
+ #endif
+ 
+@@ -423,4 +423,214 @@ CAPTURECONTEXT_SYMBOL2:
+   jr $ra
+ 
+   .set at
++#elif defined(__powerpc64__)
++  // Store r0-r31
++  std 0, 0xe8(3)   // context->uc_mcontext.gp_regs[0]
++  std 1, 0xf0(3)   // context->uc_mcontext.gp_regs[1]
++  std 2, 0xf8(3)   // context->uc_mcontext.gp_regs[2]
++  // note that r3's original value was lost
++  std 3, 0x100(3)  // context->uc_mcontext.gp_regs[3]
++  std 4, 0x108(3)  // context->uc_mcontext.gp_regs[4]
++  std 5, 0x110(3)  // context->uc_mcontext.gp_regs[5]
++  std 6, 0x118(3)  // context->uc_mcontext.gp_regs[6]
++  std 7, 0x120(3)  // context->uc_mcontext.gp_regs[7]
++  std 8, 0x128(3)  // context->uc_mcontext.gp_regs[8]
++  std 9, 0x130(3)  // context->uc_mcontext.gp_regs[9]
++  std 10, 0x138(3) // context->uc_mcontext.gp_regs[10]
++  std 11, 0x140(3) // context->uc_mcontext.gp_regs[11]
++  std 12, 0x148(3) // context->uc_mcontext.gp_regs[12]
++  std 13, 0x150(3) // context->uc_mcontext.gp_regs[13]
++  std 14, 0x158(3) // context->uc_mcontext.gp_regs[14]
++  std 15, 0x160(3) // context->uc_mcontext.gp_regs[15]
++  std 16, 0x168(3) // context->uc_mcontext.gp_regs[16]
++  std 17, 0x170(3) // context->uc_mcontext.gp_regs[17]
++  std 18, 0x178(3) // context->uc_mcontext.gp_regs[18]
++  std 19, 0x180(3) // context->uc_mcontext.gp_regs[19]
++  std 20, 0x188(3) // context->uc_mcontext.gp_regs[20]
++  std 21, 0x190(3) // context->uc_mcontext.gp_regs[21]
++  std 22, 0x198(3) // context->uc_mcontext.gp_regs[22]
++  std 23, 0x1a0(3) // context->uc_mcontext.gp_regs[23]
++  std 24, 0x1a8(3) // context->uc_mcontext.gp_regs[24]
++  std 25, 0x1b0(3) // context->uc_mcontext.gp_regs[25]
++  std 26, 0x1b8(3) // context->uc_mcontext.gp_regs[26]
++  std 27, 0x1c0(3) // context->uc_mcontext.gp_regs[27]
++  std 28, 0x1c8(3) // context->uc_mcontext.gp_regs[28]
++  std 29, 0x1d0(3) // context->uc_mcontext.gp_regs[29]
++  std 30, 0x1d8(3) // context->uc_mcontext.gp_regs[30]
++  std 31, 0x1e0(3) // context->uc_mcontext.gp_regs[31]
++
++  // For NIP, we can use the value in the link register
++  mflr 0
++  std 0, 0x1e8(3) // context->uc_mcontext.gp_regs[PT_NIP]
++
++  // CTR
++  mfctr 0
++  std 0, 0x200(3) // context->uc_mcontext.gp_regs[PT_CTR]
++
++  // For LNK, we'll use the caller's LR save area (2 stack frames up).
++  // r4 can be used as a scratch register since it has already been saved.
++  ld 4, 0(1)
++  ld 4, 16(4)
++  std 4, 0x208(3) // context->uc_mcontext.gp_regs[PT_LNK]
++
++  // XER
++  mfxer 0
++  std 0, 0x210(3) // context->uc_mcontext.gp_regs[PT_XER]
++
++  // CCR
++  mfcr 0
++  std 0, 0x218(3) // context->uc_mcontext.gp_regs[PT_CCR]
++
++  // MSR, orig_r3, MQ, TRAP, DAR, DSISR, RESULT, DSCR,
++  // not used or not relevant,  zero them out.
++  li 4, 0
++  std 4, 0x1f0(3) // context->uc_mcontext.gp_regs[PT_MSR]
++  std 4, 0x1f8(3) // context->uc_mcontext.gp_regs[PT_ORIG_R3]
++  std 4, 0x220(3) // context->uc_mcontext.gp_regs[PT_MQ]
++  std 4, 0x228(3) // context->uc_mcontext.gp_regs[PT_TRAP]
++  std 4, 0x230(3) // context->uc_mcontext.gp_regs[PT_DAR]
++  std 4, 0x238(3) // context->uc_mcontext.gp_regs[PT_DSISR]
++  std 4, 0x240(3) // context->uc_mcontext.gp_regs[PT_RESULT]
++  std 4, 0x248(3) // context->uc_mcontext.gp_regs[PT_DSCR]
++
++  // Update context->uc_mcontext.regs to point to gp_regs
++  addi 0, 3, 0xe8
++  std 0, 0xe0(3)
++
++  // Save floating point registers 0-31
++  stfd 0, 0x268(3)  // context->uc_mcontext.fp_regs[0]
++  stfd 1, 0x270(3)  // context->uc_mcontext.fp_regs[1]
++  stfd 2, 0x278(3)  // context->uc_mcontext.fp_regs[2]
++  stfd 3, 0x280(3)  // context->uc_mcontext.fp_regs[3]
++  stfd 4, 0x288(3)  // context->uc_mcontext.fp_regs[4]
++  stfd 5, 0x290(3)  // context->uc_mcontext.fp_regs[5]
++  stfd 6, 0x298(3)  // context->uc_mcontext.fp_regs[6]
++  stfd 7, 0x2a0(3)  // context->uc_mcontext.fp_regs[7]
++  stfd 8, 0x2a8(3)  // context->uc_mcontext.fp_regs[8]
++  stfd 9, 0x2b0(3)  // context->uc_mcontext.fp_regs[9]
++  stfd 10, 0x2b8(3) // context->uc_mcontext.fp_regs[10]
++  stfd 11, 0x2c0(3) // context->uc_mcontext.fp_regs[11]
++  stfd 12, 0x2c8(3) // context->uc_mcontext.fp_regs[12]
++  stfd 13, 0x2d0(3) // context->uc_mcontext.fp_regs[13]
++  stfd 14, 0x2d8(3) // context->uc_mcontext.fp_regs[14]
++  stfd 15, 0x2e0(3) // context->uc_mcontext.fp_regs[15]
++  stfd 16, 0x2e8(3) // context->uc_mcontext.fp_regs[16]
++  stfd 17, 0x2f0(3) // context->uc_mcontext.fp_regs[17]
++  stfd 18, 0x2f8(3) // context->uc_mcontext.fp_regs[18]
++  stfd 19, 0x300(3) // context->uc_mcontext.fp_regs[19]
++  stfd 20, 0x308(3) // context->uc_mcontext.fp_regs[20]
++  stfd 21, 0x310(3) // context->uc_mcontext.fp_regs[21]
++  stfd 22, 0x318(3) // context->uc_mcontext.fp_regs[22]
++  stfd 23, 0x320(3) // context->uc_mcontext.fp_regs[23]
++  stfd 24, 0x328(3) // context->uc_mcontext.fp_regs[24]
++  stfd 25, 0x330(3) // context->uc_mcontext.fp_regs[25]
++  stfd 26, 0x338(3) // context->uc_mcontext.fp_regs[26]
++  stfd 27, 0x340(3) // context->uc_mcontext.fp_regs[27]
++  stfd 28, 0x348(3) // context->uc_mcontext.fp_regs[28]
++  stfd 29, 0x350(3) // context->uc_mcontext.fp_regs[29]
++  stfd 30, 0x358(3) // context->uc_mcontext.fp_regs[30]
++  stfd 31, 0x360(3) // context->uc_mcontext.fp_regs[31]
++
++  // FPSCR
++  mffs 0
++  stfd 0, 0x368(3) // context->uc_mcontext.fp_regs[32]
++
++  // Save VMX Vector registers
++  // Update r4 to contain the base address of vmx_reserve
++  addi 4, 3, 0x378
++  // Ensure that it is quadword aligned
++  andi. 5, 4, 0xF
++  beq 1f // No alignment is necessary
++  // Address is doubleword aligned and not quadword aligned, add 8
++  addi 4, 4, 8
++
++1:
++  // Store VMX registers 0-31
++  // r4 will contain the base address
++  // r5 will contain the index
++  li 5, 0
++  stvx 0, 4, 5   // context->uc_mcontext.vmx_reserve[(align) + 0]
++  addi 5, 5, 16
++  stvx 1, 4, 5   // context->uc_mcontext.vmx_reserve[(align) + 1]
++  addi 5, 5, 16
++  stvx 2, 4, 5   // context->uc_mcontext.vmx_reserve[(align) + 2]
++  addi 5, 5, 16
++  stvx 3, 4, 5   // context->uc_mcontext.vmx_reserve[(align) + 3]
++  addi 5, 5, 16
++  stvx 4, 4, 5   // context->uc_mcontext.vmx_reserve[(align) + 4]
++  addi 5, 5, 16
++  stvx 5, 4, 5   // context->uc_mcontext.vmx_reserve[(align) + 5]
++  addi 5, 5, 16
++  stvx 6, 4, 5   // context->uc_mcontext.vmx_reserve[(align) + 6]
++  addi 5, 5, 16
++  stvx 7, 4, 5   // context->uc_mcontext.vmx_reserve[(align) + 7]
++  addi 5, 5, 16
++  stvx 8, 4, 5   // context->uc_mcontext.vmx_reserve[(align) + 8]
++  addi 5, 5, 16
++  stvx 9, 4, 5   // context->uc_mcontext.vmx_reserve[(align) + 9]
++  addi 5, 5, 16
++  stvx 10, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 10]
++  addi 5, 5, 16
++  stvx 11, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 11]
++  addi 5, 5, 16
++  stvx 12, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 12]
++  addi 5, 5, 16
++  stvx 13, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 13]
++  addi 5, 5, 16
++  stvx 14, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 14]
++  addi 5, 5, 16
++  stvx 15, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 15]
++  addi 5, 5, 16
++  stvx 16, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 16]
++  addi 5, 5, 16
++  stvx 17, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 17]
++  addi 5, 5, 16
++  stvx 18, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 18]
++  addi 5, 5, 16
++  stvx 19, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 19]
++  addi 5, 5, 16
++  stvx 20, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 20]
++  addi 5, 5, 16
++  stvx 21, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 21]
++  addi 5, 5, 16
++  stvx 22, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 22]
++  addi 5, 5, 16
++  stvx 23, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 23]
++  addi 5, 5, 16
++  stvx 24, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 24]
++  addi 5, 5, 16
++  stvx 25, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 25]
++  addi 5, 5, 16
++  stvx 26, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 26]
++  addi 5, 5, 16
++  stvx 27, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 27]
++  addi 5, 5, 16
++  stvx 28, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 28]
++  addi 5, 5, 16
++  stvx 29, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 29]
++  addi 5, 5, 16
++  stvx 30, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 30]
++  addi 5, 5, 16
++  stvx 31, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 31]
++  addi 5, 5, 16
++
++  // VSCR
++  mfvscr 0
++  stvx 0, 4, 5
++  addi 5, 5, 16
++
++  // VRSAVE
++  mfvrsave 0
++  stwx 0, 4, 5
++
++  // Update context->uc_mcontext.v_regs to point to vmx_reserve + alignment.
++  std 4, 0x370(3)
++
++  // Zero out all unused fields
++  li 4, 0
++  std 4, 0xc8(3) // context->uc_mcontext.signal
++  std 4, 0xd0(3) // context->uc_mcontext.handler
++  std 4, 0xd8(3) // context->uc_mcontext.oldmask
++
++  blr
+ #endif  // __i386__
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/util/misc/capture_context_test.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/util/misc/capture_context_test.cc
+@@ -57,7 +57,7 @@ void TestCaptureContext() {
+   uintptr_t pc = ProgramCounterFromContext(context_1);
+ 
+ #if !defined(ADDRESS_SANITIZER) && !defined(ARCH_CPU_MIPS_FAMILY) && \
+-    !defined(MEMORY_SANITIZER)
++    !defined(MEMORY_SANITIZER) && !defined(ARCH_CPU_PPC64_FAMILY)
+   // Sanitizers can cause enough code bloat that the “nearby” check would
+   // likely fail.
+   const uintptr_t kReferencePC =
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/util/misc/capture_context_test_util_linux.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/util/misc/capture_context_test_util_linux.cc
+@@ -35,6 +35,8 @@ void SanityCheckContext(const NativeCPUC
+   EXPECT_EQ(context.uc_mcontext.regs[0], FromPointerCast<uintptr_t>(&context));
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+   EXPECT_EQ(context.uc_mcontext.gregs[4], FromPointerCast<uintptr_t>(&context));
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++  EXPECT_EQ(context.uc_mcontext.gp_regs[3], FromPointerCast<uintptr_t>(&context));
+ #endif
+ }
+ 
+@@ -49,6 +51,8 @@ uintptr_t ProgramCounterFromContext(cons
+   return context.uc_mcontext.pc;
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+   return context.uc_mcontext.pc;
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++  return context.uc_mcontext.gp_regs[PT_NIP];
+ #endif
+ }
+ 
+@@ -63,6 +67,8 @@ uintptr_t StackPointerFromContext(const
+   return context.uc_mcontext.sp;
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+   return context.uc_mcontext.gregs[29];
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++  return context.uc_mcontext.gp_regs[1];
+ #endif
+ }
+ 
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/util/posix/signals_test.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/util/posix/signals_test.cc
+@@ -46,9 +46,9 @@ bool CanCauseSignal(int sig) {
+   return sig == SIGABRT ||
+          sig == SIGALRM ||
+          sig == SIGBUS ||
+-#if !defined(ARCH_CPU_ARM64)
++#if !defined(ARCH_CPU_ARM64) && !defined(ARCH_CPU_PPC64)
+          sig == SIGFPE ||
+-#endif  // !defined(ARCH_CPU_ARM64)
++#endif  // !defined(ARCH_CPU_ARM64) && !defined(ARCH_CPU_PPC64)
+ #if defined(ARCH_CPU_X86_FAMILY) || defined(ARCH_CPU_ARMEL)
+          sig == SIGILL ||
+ #endif  // defined(ARCH_CPU_X86_FAMILY) || defined(ARCH_CPU_ARMEL)
+@@ -117,9 +117,11 @@ void CauseSignal(int sig) {
+       break;
+     }
+ 
+-#if !defined(ARCH_CPU_ARM64)
++#if !defined(ARCH_CPU_ARM64) && !defined(ARCH_CPU_PPC64)
+     // ARM64 has hardware integer division instructions that don’t generate a
+     // trap for divide-by-zero, so this doesn’t produce SIGFPE.
++    //
++    // PPC64 fixed-point division by zero also doesn't produce a SIGFPE.
+     case SIGFPE: {
+       // Optimization makes this tricky, so get zero from a system call likely
+       // to succeed, and try to do something with the result.
+@@ -137,7 +139,7 @@ void CauseSignal(int sig) {
+       fstat(quotient, &stat_buf);
+       break;
+     }
+-#endif  // ARCH_CPU_ARM64
++#endif  // !defined(ARCH_CPU_ARM64) && !defined(ARCH_CPU_PPC64)
+ 
+ #if defined(ARCH_CPU_X86_FAMILY) || defined(ARCH_CPU_ARMEL)
+     case SIGILL: {
+--- a/src/3rdparty/chromium/third_party/dav1d/BUILD.gn
++++ b/src/3rdparty/chromium/third_party/dav1d/BUILD.gn
+@@ -196,6 +196,8 @@ static_library("dav1d_8bit") {
+     sources += arm_template_sources
+   } else if (current_cpu == "arm64") {
+     sources += arm_template_sources
++  } else if (current_cpu == "ppc64") {
++    sources += ppc64_template_sources
+   }
+ 
+   cflags = dav1d_copts
+@@ -226,6 +228,8 @@ static_library("dav1d_10bit") {
+     sources += arm_template_sources
+   } else if (current_cpu == "arm64") {
+     sources += arm_template_sources
++  } else if (current_cpu == "ppc64") {
++    sources += ppc64_template_sources
+   }
+ 
+   cflags = dav1d_copts
+@@ -283,6 +287,21 @@ if (current_cpu == "x86" || current_cpu
+     }
+ 
+     cflags = dav1d_copts
++  }
++} else if (current_cpu == "ppc64") {
++  static_library("dav1d_ppc") {
++    sources = [
++      "libdav1d/src/ppc/cpu.c",
++      "libdav1d/src/ppc/cpu.h",
++    ]
++
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [
++      "//build/config/compiler:no_chromium_code",
++      ":dav1d_config",
++    ]
++
++    cflags = dav1d_copts
+ 
+     deps = [ ":dav1d_headers" ]
+     allow_circular_includes_from = [ ":dav1d_headers" ]
+@@ -315,5 +334,7 @@ static_library("dav1d") {
+     }
+   } else if (current_cpu == "arm" || current_cpu == "arm64") {
+     deps += [ ":dav1d_arm" ]
++  } else if (current_cpu == "ppc64") {
++    deps += [ ":dav1d_ppc" ]
+   }
+ }
+--- a/src/3rdparty/chromium/third_party/dav1d/dav1d_generated.gni
++++ b/src/3rdparty/chromium/third_party/dav1d/dav1d_generated.gni
+@@ -103,6 +103,11 @@ arm_template_sources = [
+   "libdav1d/src/arm/mc_init_tmpl.c",
+ ]
+ 
++ppc64_template_sources = [
++  "libdav1d/src/ppc/cdef_init_tmpl.c",
++  "libdav1d/src/ppc/looprestoration_init_tmpl.c",
++]
++
+ template_sources = [
+   "libdav1d/src/cdef_apply_tmpl.c",
+   "libdav1d/src/cdef_tmpl.c",
+--- a/src/3rdparty/chromium/third_party/dav1d/generate_source.py
++++ b/src/3rdparty/chromium/third_party/dav1d/generate_source.py
+@@ -57,6 +57,8 @@ def _WriteGn(fd):
+   _WriteArray(fd, "arm64_asm_sources", _Glob("libdav1d/src/arm/64/*.S"))
+   _WriteArray(fd, "arm_template_sources", _Glob("libdav1d/src/arm/*_tmpl.c"))
+ 
++  _WriteArray(fd, "ppc64_template_sources", _Glob("libdav1d/src/ppc/*_tmpl.c"))
++
+   template_sources = _Glob("libdav1d/src/*_tmpl.c")
+   _WriteArray(fd, "template_sources", template_sources)
+ 
+--- a/src/3rdparty/chromium/third_party/dav1d/libdav1d/src/ppc/types.h
++++ b/src/3rdparty/chromium/third_party/dav1d/libdav1d/src/ppc/types.h
+@@ -51,4 +51,19 @@
+ #define u16l_to_i32(v) ((i32x4) vec_mergel((u16x8) v, vec_splat_u16(0)))
+ #define i16l_to_i32(v) ((i32x4) vec_unpackl((i16x8)v))
+ 
++#if defined(__clang__)
++#undef vec_splats
++#define vec_splats(N)                     \
++    _Generic((N),                         \
++        unsigned char:      ((u8x16)(N)), \
++        signed char:        ((i8x16)(N)), \
++        unsigned short:     ((u16x8)(N)), \
++        signed short:       ((i16x8)(N)), \
++        unsigned int:       ((u32x4)(N)), \
++        signed int:         ((i32x4)(N)), \
++        unsigned long long: ((u64x2)(N)), \
++        signed long long:   ((i64x2)(N))  \
++    )
++#endif
++
+ #endif /* DAV1D_SRC_PPC_TYPES_H */
+--- a/src/3rdparty/chromium/third_party/eigen3/BUILD.gn
++++ b/src/3rdparty/chromium/third_party/eigen3/BUILD.gn
+@@ -22,4 +22,8 @@ config("eigen_includes") {
+     # for this component on Windows on Arm due to compilation errors.
+     defines += [ "EIGEN_DONT_VECTORIZE" ]
+   }
++
++  if (target_cpu == "ppc64") {
++    defines += [ "EIGEN_DONT_VECTORIZE" ]
++  }
+ }
+--- a/src/3rdparty/chromium/third_party/libaom/BUILD.gn
++++ b/src/3rdparty/chromium/third_party/libaom/BUILD.gn
+@@ -37,6 +37,8 @@ if (enable_libaom) {
+     } else {
+       cpu_arch_full = "arm"
+     }
++  } else if (current_cpu == "ppc64") {
++    cpu_arch_full = "generic"
+   } else {
+     cpu_arch_full = current_cpu
+   }
+--- a/src/3rdparty/chromium/third_party/libgav1/options.gni
++++ b/src/3rdparty/chromium/third_party/libgav1/options.gni
+@@ -12,5 +12,5 @@ declare_args() {
+       is_chromeos_ash && (target_cpu == "arm" || target_cpu == "arm64")
+   use_libgav1_parser =
+       (is_chromeos || is_linux || is_win) &&
+-      (target_cpu == "x86" || target_cpu == "x64" || target_cpu == "arm64")
++      (target_cpu == "x86" || target_cpu == "x64" || target_cpu == "arm64" || target_cpu == "ppc64")
+ }
+--- a/src/3rdparty/chromium/third_party/lss/linux_syscall_support.h
++++ b/src/3rdparty/chromium/third_party/lss/linux_syscall_support.h
+@@ -4262,7 +4262,7 @@ struct kernel_statfs {
+       LSS_REG(2, buf);
+       LSS_BODY(void*, mmap2, "0"(__r2));
+     }
+-#else
++#elif !defined(__powerpc64__) /* ppc64 doesn't have mmap2 */
+     #define __NR__mmap2 __NR_mmap2
+     LSS_INLINE _syscall6(void*, _mmap2,            void*, s,
+                          size_t,                   l, int,               p,
+@@ -4373,7 +4373,7 @@ struct kernel_statfs {
+   #if defined(__i386__) ||                                                    \
+       defined(__ARM_ARCH_3__) || defined(__ARM_EABI__) ||                     \
+      (defined(__mips__) && _MIPS_SIM == _MIPS_SIM_ABI32) ||                   \
+-      defined(__PPC__) ||                                                     \
++     (defined(__PPC__) && !defined(__powerpc64__)) ||                                                     \
+      (defined(__s390__) && !defined(__s390x__))
+     /* On these architectures, implement mmap() with mmap2(). */
+     LSS_INLINE void* LSS_NAME(mmap)(void *s, size_t l, int p, int f, int d,
+@@ -4556,9 +4556,17 @@ struct kernel_statfs {
+     }
+   #endif
+   #if defined(__NR_fstatat64)
++    #if !defined(__GLIBC__)
++        // musl doesn't define fstatat64 fstatat
++        #undef fstatat64
++    #endif
+     LSS_INLINE _syscall4(int,   fstatat64,        int,   d,
+                          const char *,      p,
+                          struct kernel_stat64 *,   b,    int,   f)
++    #if !defined(__GLIBC__)
++    	// then restore it
++        #define fstatat64 fstatat
++    #endif
+   #endif
+   #if defined(__NR_waitpid)
+     // waitpid is polyfilled below when not available.
+--- a/src/3rdparty/chromium/third_party/pdfium/third_party/libpng16/pngpriv.h
++++ b/src/3rdparty/chromium/third_party/pdfium/third_party/libpng16/pngpriv.h
+@@ -196,11 +196,7 @@
+ #endif
+ 
+ #ifndef PNG_POWERPC_VSX_OPT
+-#  if defined(__PPC64__) && defined(__ALTIVEC__) && defined(__VSX__)
+-#     define PNG_POWERPC_VSX_OPT 2
+-#  else
+-#     define PNG_POWERPC_VSX_OPT 0
+-#  endif
++#  define PNG_POWERPC_VSX_OPT 0
+ #endif
+ 
+ #ifndef PNG_INTEL_SSE_OPT
+--- a/src/3rdparty/chromium/third_party/pffft/src/pffft.c
++++ b/src/3rdparty/chromium/third_party/pffft/src/pffft.c
+@@ -100,6 +100,7 @@
+    Altivec support macros 
+ */
+ #if !defined(PFFFT_SIMD_DISABLE) && (defined(__ppc__) || defined(__ppc64__))
++#include <altivec.h>
+ typedef vector float v4sf;
+ #  define SIMD_SZ 4
+ #  define VZERO() ((vector float) vec_splat_u8(0))
+--- a/src/3rdparty/chromium/third_party/skia/src/sksl/SkSLString.cpp
++++ b/src/3rdparty/chromium/third_party/skia/src/sksl/SkSLString.cpp
+@@ -142,7 +142,12 @@ String to_string(double value) {
+     if (needsDotZero) {
+         buffer << ".0";
+     }
+-    return String(buffer.str().c_str());
++
++    std::string ret(buffer.str());
++    if (signbit(value) && ret[0] == '.') {
++        ret[0] = '-';
++    }
++    return String(ret.c_str());
+ }
+ 
+ bool stod(const skstd::string_view& s, SKSL_FLOAT* value) {
+--- a/src/3rdparty/chromium/third_party/sqlite/src/amalgamation/sqlite3.c
++++ b/src/3rdparty/chromium/third_party/sqlite/src/amalgamation/sqlite3.c
+@@ -14628,7 +14628,8 @@ typedef INT16_TYPE LogEst;
+ # if defined(i386)      || defined(__i386__)      || defined(_M_IX86) ||    \
+      defined(__x86_64)  || defined(__x86_64__)    || defined(_M_X64)  ||    \
+      defined(_M_AMD64)  || defined(_M_ARM)        || defined(__x86)   ||    \
+-     defined(__ARMEL__) || defined(__AARCH64EL__) || defined(_M_ARM64)
++     defined(__ARMEL__) || defined(__AARCH64EL__) || defined(_M_ARM64) ||   \
++     defined(__powerpc64__) && (__BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__)
+ #   define SQLITE_BYTEORDER    1234
+ # elif defined(sparc)     || defined(__ppc__) || \
+        defined(__ARMEB__) || defined(__AARCH64EB__)
+--- a/src/3rdparty/chromium/third_party/sqlite/src/amalgamation_dev/sqlite3.c
++++ b/src/3rdparty/chromium/third_party/sqlite/src/amalgamation_dev/sqlite3.c
+@@ -14641,7 +14641,8 @@ typedef INT16_TYPE LogEst;
+ # if defined(i386)      || defined(__i386__)      || defined(_M_IX86) ||    \
+      defined(__x86_64)  || defined(__x86_64__)    || defined(_M_X64)  ||    \
+      defined(_M_AMD64)  || defined(_M_ARM)        || defined(__x86)   ||    \
+-     defined(__ARMEL__) || defined(__AARCH64EL__) || defined(_M_ARM64)
++     defined(__ARMEL__) || defined(__AARCH64EL__) || defined(_M_ARM64) ||   \
++     defined(__powerpc64__) && (__BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__)
+ #   define SQLITE_BYTEORDER    1234
+ # elif defined(sparc)     || defined(__ppc__) || \
+        defined(__ARMEB__) || defined(__AARCH64EB__)
+--- a/src/3rdparty/chromium/third_party/sqlite/src/ext/rtree/rtree.c
++++ b/src/3rdparty/chromium/third_party/sqlite/src/ext/rtree/rtree.c
+@@ -450,7 +450,7 @@ struct RtreeMatchArg {
+ #if defined(i386)     || defined(__i386__)   || defined(_M_IX86) ||    \
+     defined(__x86_64) || defined(__x86_64__) || defined(_M_X64)  ||    \
+     defined(_M_AMD64) || defined(_M_ARM)     || defined(__x86)   ||    \
+-    defined(__arm__)
++    defined(__arm__) || defined(__powerpc64__) && (__BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__)
+ # define SQLITE_BYTEORDER    1234
+ #elif defined(sparc)    || defined(__ppc__)
+ # define SQLITE_BYTEORDER    4321
+--- a/src/3rdparty/chromium/third_party/sqlite/src/src/sqliteInt.h
++++ b/src/3rdparty/chromium/third_party/sqlite/src/src/sqliteInt.h
+@@ -890,7 +890,8 @@ typedef INT16_TYPE LogEst;
+ # if defined(i386)      || defined(__i386__)      || defined(_M_IX86) ||    \
+      defined(__x86_64)  || defined(__x86_64__)    || defined(_M_X64)  ||    \
+      defined(_M_AMD64)  || defined(_M_ARM)        || defined(__x86)   ||    \
+-     defined(__ARMEL__) || defined(__AARCH64EL__) || defined(_M_ARM64)
++     defined(__ARMEL__) || defined(__AARCH64EL__) || defined(_M_ARM64) || \
++     defined(__powerpc64__) && (__BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__)
+ #   define SQLITE_BYTEORDER    1234
+ # elif defined(sparc)     || defined(__ppc__) || \
+        defined(__ARMEB__) || defined(__AARCH64EB__)
+--- a/src/3rdparty/chromium/third_party/webrtc/modules/desktop_capture/differ_block.cc
++++ b/src/3rdparty/chromium/third_party/webrtc/modules/desktop_capture/differ_block.cc
+@@ -30,11 +30,7 @@ bool VectorDifference(const uint8_t* ima
+   static bool (*diff_proc)(const uint8_t*, const uint8_t*) = nullptr;
+ 
+   if (!diff_proc) {
+-#if defined(WEBRTC_ARCH_ARM_FAMILY) || defined(WEBRTC_ARCH_MIPS_FAMILY)
+-    // For ARM and MIPS processors, always use C version.
+-    // TODO(hclam): Implement a NEON version.
+-    diff_proc = &VectorDifference_C;
+-#else
++#if defined(WEBRTC_ARCH_X86_FAMILY)
+     bool have_sse2 = GetCPUInfo(kSSE2) != 0;
+     // For x86 processors, check if SSE2 is supported.
+     if (have_sse2 && kBlockSize == 32) {
+@@ -44,6 +40,10 @@ bool VectorDifference(const uint8_t* ima
+     } else {
+       diff_proc = &VectorDifference_C;
+     }
++#else
++    // For other processors, always use C version.
++    // TODO(hclam): Implement a NEON version.
++    diff_proc = &VectorDifference_C;
+ #endif
+   }
+ 
+--- a/src/3rdparty/chromium/v8/BUILD.gn
++++ b/src/3rdparty/chromium/v8/BUILD.gn
+@@ -1083,6 +1083,12 @@ config("toolchain") {
+     }
+     if (host_byteorder == "little") {
+       defines += [ "V8_TARGET_ARCH_PPC_LE" ]
++      cflags += [
++        # Enable usage of AltiVec, VSX, and other POWER8 and higher features
++        "-mcpu=power8",
++        "-maltivec",
++        "-mvsx",
++      ]
+     } else if (host_byteorder == "big") {
+       defines += [ "V8_TARGET_ARCH_PPC_BE" ]
+       if (current_os == "aix") {
+--- a/src/3rdparty/chromium/ui/gl/features.gni
++++ b/src/3rdparty/chromium/ui/gl/features.gni
+@@ -35,7 +35,8 @@ declare_args() {
+                         (is_mac && use_egl) || is_chromeos_ash || is_fuchsia) &&
+                        (target_cpu == "x86" || target_cpu == "x64" ||
+                         target_cpu == "arm" || target_cpu == "arm64" ||
+-                        target_cpu == "mipsel" || target_cpu == "mips64el")
++                        target_cpu == "mipsel" || target_cpu == "mips64el" ||
++                        target_cpu == "ppc64")
+ }
+ 
+ use_glx = use_x11 || ozone_platform_x11
+--- a/src/3rdparty/chromium/v8/test/BUILD.gn
++++ b/src/3rdparty/chromium/v8/test/BUILD.gn
+@@ -42,7 +42,6 @@ group("gn_all") {
+       "benchmarks/cpp:gn_all",
+       "cctest:cctest",
+       "cctest:generate-bytecode-expectations",
+-      "unittests:unittests",
+     ]
+   }
+ }
+@@ -84,7 +83,6 @@ group("v8_bot_default") {
+     "message:v8_message",
+     "mjsunit:v8_mjsunit",
+     "mkgrokdump:mkgrokdump",
+-    "unittests:unittests",
+     "webkit:v8_webkit",
+   ]
+ 
+@@ -109,7 +107,6 @@ group("v8_default") {
+     "message:v8_message",
+     "mjsunit:v8_mjsunit",
+     "mkgrokdump:mkgrokdump",
+-    "unittests:unittests",
+   ]
+ 
+   if (v8_enable_webassembly) {
+--- /dev/null
++++ b/src/3rdparty/chromium/dev/null
+@@ -0,0 +1,39 @@
++/*
++ * Autogenerated by the Meson build system.
++ * Do not edit, your changes will be lost.
++ */
++
++#pragma once
++
++#define ARCH_AARCH64 0
++
++#define ARCH_ARM 0
++
++#define ARCH_PPC64LE 1
++
++#define ARCH_X86 0
++
++#define ARCH_X86_32 0
++
++#define ARCH_X86_64 0
++
++#define CONFIG_16BPC 1
++
++#define CONFIG_8BPC 1
++
++// #define CONFIG_LOG 1 -- Logging is controlled by Chromium
++
++#define ENDIANNESS_BIG 0
++
++#define HAVE_ASM 1
++
++#define HAVE_CLOCK_GETTIME 1
++
++#define HAVE_DLSYM 1
++
++#define HAVE_GETAUXVAL 1
++
++#define HAVE_POSIX_MEMALIGN 1
++
++#define HAVE_UNISTD_H 1
++
+--- a/src/3rdparty/chromium/third_party/abseil-cpp/absl/base/internal/unscaledcycleclock.h
++++ b/src/3rdparty/chromium/third_party/abseil-cpp/absl/base/internal/unscaledcycleclock.h
+@@ -46,7 +46,7 @@
+ 
+ // The following platforms have an implementation of a hardware counter.
+ #if defined(__i386__) || defined(__x86_64__) || defined(__aarch64__) || \
+-  defined(__powerpc__) || defined(__ppc__) || \
++  ((defined(__powerpc__) || defined(__ppc__)) && defined(__GLIBC__)) || \
+   defined(_M_IX86) || defined(_M_X64)
+ #define ABSL_HAVE_UNSCALED_CYCLECLOCK_IMPLEMENTATION 1
+ #else
+--- a/src/3rdparty/chromium/third_party/abseil-cpp/absl/debugging/internal/stacktrace_config.h
++++ b/src/3rdparty/chromium/third_party/abseil-cpp/absl/debugging/internal/stacktrace_config.h
+@@ -59,7 +59,7 @@
+ #elif defined(__i386__) || defined(__x86_64__)
+ #define ABSL_STACKTRACE_INL_HEADER \
+   "absl/debugging/internal/stacktrace_x86-inl.inc"
+-#elif defined(__ppc__) || defined(__PPC__)
++#elif defined(__ppc__) || defined(__PPC__) && defined(__GLIBC__)
+ #define ABSL_STACKTRACE_INL_HEADER \
+   "absl/debugging/internal/stacktrace_powerpc-inl.inc"
+ #elif defined(__aarch64__)
+--- a/src/3rdparty/chromium/base/allocator/partition_allocator/partition_alloc_config.h
++++ b/src/3rdparty/chromium/base/allocator/partition_allocator/partition_alloc_config.h
+@@ -100,7 +100,8 @@ static_assert(sizeof(void*) != 8, "");
+ // PUT_REF_COUNT_IN_PREVIOUS_SLOT does. In this case the refcount overlaps with
+ // the next pointer shadow for the smallest bucket.
+ #if !(defined(OS_MAC) && defined(ARCH_CPU_ARM64)) && \
+-    !BUILDFLAG(PUT_REF_COUNT_IN_PREVIOUS_SLOT)
++    !BUILDFLAG(PUT_REF_COUNT_IN_PREVIOUS_SLOT) && \
++    (!defined(__GLIBC) && !defined(__powerpc64__))
+ #define PA_HAS_FREELIST_HARDENING
+ #endif
+ 
+--- a/src/3rdparty/chromium/build/download_nacl_toolchains.py
++++ b/src/3rdparty/chromium/build/download_nacl_toolchains.py
+@@ -13,6 +13,8 @@ import sys
+ 
+ 
+ def Main(args):
++  if 'disable_nacl=1' in os.environ.get('GYP_DEFINES', ''):
++    return 0
+   script_dir = os.path.dirname(os.path.abspath(__file__))
+   src_dir = os.path.dirname(script_dir)
+   nacl_dir = os.path.join(src_dir, 'native_client')
+--- a/src/3rdparty/chromium/chrome/installer/linux/BUILD.gn
++++ b/src/3rdparty/chromium/chrome/installer/linux/BUILD.gn
+@@ -100,8 +100,6 @@ packaging_files = packaging_files_binari
+                     "$root_out_dir/xdg-mime",
+                     "$root_out_dir/xdg-settings",
+                     "$root_out_dir/locales/en-US.pak",
+-                    "$root_out_dir/MEIPreload/manifest.json",
+-                    "$root_out_dir/MEIPreload/preloaded_data.pb",
+                   ]
+ 
+ action_foreach("calculate_deb_dependencies") {
+@@ -321,7 +319,6 @@ group("installer_deps") {
+     ":theme_files",
+     "//chrome",
+     "//chrome:packed_resources",
+-    "//chrome/browser/resources/media/mei_preload:component",
+     "//components/crash/core/app:chrome_crashpad_handler",
+     "//sandbox/linux:chrome_sandbox",
+   ]
+--- /dev/null
++++ b/src/3rdparty/chromium/sandbox/linux/system_headers/ppc64_linux_syscalls.h
+@@ -0,0 +1,12 @@
++// Copyright 2014 The Chromium Authors. All rights reserved.
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++#ifndef SANDBOX_LINUX_SYSTEM_HEADERS_PPC64_LINUX_SYSCALLS_H_
++#define SANDBOX_LINUX_SYSTEM_HEADERS_PPC64_LINUX_SYSCALLS_H_
++
++#include <asm/unistd.h>
++
++//TODO: is it necessary to redefine syscall numbers for PPC64?
++
++#endif  // SANDBOX_LINUX_SYSTEM_HEADERS_PPC64_LINUX_SYSCALLS_H_
+--- /dev/null
++++ b/src/3rdparty/chromium/sandbox/linux/system_headers/ppc64_linux_ucontext.h
+@@ -0,0 +1,12 @@
++// Copyright 2014 The Chromium Authors. All rights reserved.
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++#ifndef SANDBOX_LINUX_SYSTEM_HEADERS_PPC64_LINUX_UCONTEXT_H_
++#define SANDBOX_LINUX_SYSTEM_HEADERS_PPC64_LINUX_UCONTEXT_H_
++
++#include <sys/ucontext.h>
++
++//TODO: is it necessary to redefine ucontext on PPC64?
++
++#endif  // SANDBOX_LINUX_SYSTEM_HEADERS_PPC64_LINUX_UCONTEXT_H_
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/util/net/http_transport_libcurl.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/util/net/http_transport_libcurl.cc
+@@ -236,6 +236,12 @@ std::string UserAgent() {
+ #elif defined(ARCH_CPU_BIG_ENDIAN)
+     static constexpr char arch[] = "aarch64_be";
+ #endif
++#elif defined(__powerpc64__)
++#if defined(ARCH_CPU_LITTLE_ENDIAN)
++    static constexpr char arch[] = "ppc64le";
++#elif defined(ARCH_CPU_BIG_ENDIAN)
++    static constexpr char arch[] = "ppc64";
++#endif
+ #else
+ #error Port
+ #endif
+--- /dev/null
++++ b/src/3rdparty/chromium/third_party/dav1d/config/linux/ppc64/config.h
+@@ -0,0 +1,39 @@
++/*
++ * Autogenerated by the Meson build system.
++ * Do not edit, your changes will be lost.
++ */
++
++#pragma once
++
++#define ARCH_AARCH64 0
++
++#define ARCH_ARM 0
++
++#define ARCH_PPC64LE 1
++
++#define ARCH_X86 0
++
++#define ARCH_X86_32 0
++
++#define ARCH_X86_64 0
++
++#define CONFIG_16BPC 1
++
++#define CONFIG_8BPC 1
++
++// #define CONFIG_LOG 1 -- Logging is controlled by Chromium
++
++#define ENDIANNESS_BIG 0
++
++#define HAVE_ASM 1
++
++#define HAVE_CLOCK_GETTIME 1
++
++#define HAVE_DLSYM 1
++
++#define HAVE_GETAUXVAL 1
++
++#define HAVE_POSIX_MEMALIGN 1
++
++#define HAVE_UNISTD_H 1
++
diff --git a/srcpkgs/qt6-webengine/patches/0903-xxx-ppc64le-swiftshader.patch b/srcpkgs/qt6-webengine/patches/0903-xxx-ppc64le-swiftshader.patch
new file mode 100644
index 000000000000..1a8cd8368da1
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0903-xxx-ppc64le-swiftshader.patch
@@ -0,0 +1,18 @@
+--- a/src/3rdparty/chromium/third_party/swiftshader/third_party/llvm-10.0/BUILD.gn
++++ b/src/3rdparty/chromium/third_party/swiftshader/third_party/llvm-10.0/BUILD.gn
+@@ -576,6 +576,7 @@ swiftshader_llvm_source_set("swiftshader
+     "llvm/lib/MC/MCAsmInfoCOFF.cpp",
+     "llvm/lib/MC/MCAsmInfoDarwin.cpp",
+     "llvm/lib/MC/MCAsmInfoELF.cpp",
++    "llvm/lib/MC/MCAsmInfoXCOFF.cpp",
+     "llvm/lib/MC/MCAsmMacro.cpp",
+     "llvm/lib/MC/MCAsmStreamer.cpp",
+     "llvm/lib/MC/MCAssembler.cpp",
+@@ -631,6 +632,7 @@ swiftshader_llvm_source_set("swiftshader
+     "llvm/lib/MC/MCWinCOFFStreamer.cpp",
+     "llvm/lib/MC/MCWinEH.cpp",
+     "llvm/lib/MC/MCXCOFFStreamer.cpp",
++    "llvm/lib/MC/MCXCOFFObjectTargetWriter.cpp",
+     "llvm/lib/MC/MachObjectWriter.cpp",
+     "llvm/lib/MC/StringTableBuilder.cpp",
+     "llvm/lib/MC/SubtargetFeature.cpp",
diff --git a/srcpkgs/qt6-webengine/patches/cross-build-examples.patch b/srcpkgs/qt6-webengine/patches/cross-build-examples.patch
new file mode 100644
index 000000000000..4598643cc0dc
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/cross-build-examples.patch
@@ -0,0 +1,16 @@
+--- a/examples/CMakeLists.txt
++++ b/examples/CMakeLists.txt
+@@ -1,7 +1,6 @@
+ cmake_minimum_required(VERSION 3.16)
+ 
+ qt_examples_build_begin(EXTERNAL_BUILD)
+-if(NOT CMAKE_CROSSCOMPILING) #QTBUG-86533
+     if(TARGET Qt::WebEngineCore)
+         add_subdirectory(webenginequick)
+     endif()
+@@ -14,5 +13,4 @@ if(NOT CMAKE_CROSSCOMPILING) #QTBUG-8653
+     if(TARGET Qt::PdfWidgets)
+         add_subdirectory(pdfwidgets)
+     endif()
+-endif()
+ qt_examples_build_end()
diff --git a/srcpkgs/qt6-webengine/template b/srcpkgs/qt6-webengine/template
new file mode 100644
index 000000000000..2f0de2c7adf6
--- /dev/null
+++ b/srcpkgs/qt6-webengine/template
@@ -0,0 +1,178 @@
+# Template file for 'qt6-webengine'
+pkgname=qt6-webengine
+version=6.3.1
+revision=1
+wrksrc="qtwebengine-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true
+ -DQT_FEATURE_webengine_system_ffmpeg=ON
+ -DQT_FEATURE_webengine_system_libevent=ON
+ -DQT_FEATURE_webengine_system_gn=ON
+ -DQT_FEATURE_webengine_system_icu=ON
+ -DQT_FEATURE_webengine_webrtc_pipewire=ON
+ -DNinja_EXECUTABLE=$XBPS_WRAPPERDIR/ninja
+ $(vopt_bool examples QT_BUILD_EXAMPLES)
+ -DPKG_CONFIG_HOST_EXECUTABLE=${PKG_CONFIG_FOR_BUILD}"
+hostmakedepends="qt6-base-devel perl pkg-config nodejs python3-html5lib
+ qt6-declarative-devel protobuf gperf flex nss-devel libwebp-devel
+ icu-devel libevent-devel"
+makedepends="qt6-base-devel qt6-declarative-devel pulseaudio-devel
+ qt6-tools-devel qt6-websockets-devel libflac-devel
+ alsa-lib-devel libvpx-devel pciutils-devel opus-devel libxslt-devel
+ libxml2-devel freetype-devel lcms2-devel libwebp-devel icu-devel
+ re2-devel zlib-devel libpng-devel minizip-devel harfbuzz-devel
+ nss-devel libXcursor-devel libXcomposite-devel libXScrnSaver-devel
+ protobuf-devel ffmpeg-devel snappy-devel libevent-devel pipewire-devel
+ libxkbfile-devel qt6-location-devel qt6-webchannel-devel libxshmfence-devel"
+# Not working properly with HTTPS without those packages
+# Not strict dependencies, though
+depends="qt6-plugin-tls-openssl qt6-plugin-tls-qcertonly"
+short_desc="Cross-platform application and UI framework - Webengine"
+maintainer="John <me@johnnynator.dev>"
+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=ad7a33b21a956deda37c587d50f821ca3816403ae31ba9b5d59d01561ad66e47
+
+if [ -z "$CROSS_BUILD" ];then
+	configure_args+=" -DCMAKE_TOOLCHAIN_FILE=/usr/lib/cmake/Qt6/qt.toolchain.cmake"
+fi
+
+if [ "$XBPS_LIBC" = "musl" ]; then
+	hostmakedepends+=" musl-legacy-compat"
+fi
+
+if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
+	makedepends+=" musl-legacy-compat"
+fi
+
+if [ ! "$XBPS_WORDSIZE" = "$XBPS_TARGET_WORDSIZE" ]; then
+	broken="webengine can be built only if word size matches"
+fi
+
+if [ "$XBPS_WORDSIZE" -eq 32 ]; then
+	nodebug=yes
+	LDFLAGS="-Wl,--no-keep-memory"
+fi
+
+if [ "$XBPS_TARGET_ENDIAN" != "le" ]; then
+	broken="webengine only supports little endian"
+fi
+
+build_options="sndio examples"
+build_options_default=""
+desc_option_examples="Build examples"
+desc_option_sndio="Enable support for sndio"
+
+subpackages="qt6-webengine-devel"
+
+if [ "$build_option_examples" ]; then
+	subpackages+=" qt6-webengine-examples"
+fi
+
+_bootstrap_gn() {
+	# Bootstrap gn (generate ninja)
+	echo "Bootstrapping 'gn'"
+	cd ${wrksrc}/src/3rdparty/gn
+	CFLAGS="$CFLAGS_host" CXXFLAGS="$CXXFLAGS_host" LDFLAGS="$LDFLAGS_host" \
+	PKGCONFIG=/usr/bin/pkgconfig PKG_CONFIG_PATH="/usr/lib/pkgconfig:/usr/share/pkgconfig" \
+		python3 build/gen.py --no-last-commit-position --out-path \
+			${wrksrc}/src/3rdparty/gn/out/Release --cc "${CC_host:-$CC}" \
+			--cxx "${CXX_host:-$CXX}" --ld "${CXX_host:-$CXX}" --ar "${AR_host:-$AR}" \
+			--qt-version "${version}.qtwebengine.qt.io"
+	ninja -C out/Release gn
+	cd ${wrksrc}
+}
+
+_unbundle_libs() {
+	cd ${wrksrc}/src/3rdparty/chromium
+	echo Dropping bundled libs from chromium
+	# Use system-provided libraries.
+	# TODO: use_system_hunspell (upstream changes needed).
+	# TODO: use_system_libsrtp.
+	# TODO: use_system_libusb (http://crbug.com/266149).
+	# TODO: use_system_ssl (http://crbug.com/58087).
+	# TODO: use_system_sqlite (http://crbug.com/22208).
+	# TODO: use_system_icu (segfaults)
+	# use_system_protobuf
+	# use_system_v8=1
+	# use_system_zlib=1
+	# bzip2 jsoncpp minizip xdg_utils speex
+	system="
+		ffmpeg
+		flac
+		fontconfig
+		freetype
+		harfbuzz-ng
+		icu
+		libdrm
+		libevent
+		libjpeg
+		libpng
+		libwebp
+		libxml
+		libxslt
+		opus
+		re2
+		snappy
+	"
+	build/linux/unbundle/replace_gn_files.py --system-libraries ${system}
+}
+
+# Provide a wrapper to run ./xbps-src -j 1 build later
+_wrap_ninja() {
+	cat <<-'_EOF' >"$XBPS_WRAPPERDIR"/ninja
+	#!/bin/sh
+
+	exec /usr/bin/ninja $NINJAFLAGS "$@"
+	_EOF
+	chmod +x "$XBPS_WRAPPERDIR"/ninja
+}
+
+pre_configure() {
+	_bootstrap_gn
+	# _unbundle_libs
+	_wrap_ninja
+	export PATH="$PATH:${wrksrc}/src/3rdparty/gn/out/Release"
+}
+
+pre_build() {
+	export PATH="$PATH:${wrksrc}/src/3rdparty/gn/out/Release"
+	export NINJAFLAGS="$makejobs"
+
+}
+
+pre_install() {
+	export PATH="$PATH:${wrksrc}/src/3rdparty/gn/out/Release"
+}
+
+post_install() {
+	local _file
+	find "${DESTDIR}"/usr/lib/qt6/examples \
+		-path '*/lib/qt6/**/lib/qt6/*' -type f |
+	while read _file; do
+		mv "$_file" "${_file%/lib/qt6/*}"
+	done
+}
+
+qt6-webengine-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} qt6-webchannel-devel>=${version}_1
+	 qt6-declarative-devel>=${version}_1 qt6-location-devel>=${version}_1"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/pkgconfig
+		vmove usr/lib/qt6/mkspecs
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
+	}
+}
+
+qt6-webengine-examples_package() {
+	short_desc+=" - sample browsers"
+	pkg_install() {
+		vmove usr/lib/qt6/examples
+	}
+}
diff --git a/srcpkgs/qt6-webengine/update b/srcpkgs/qt6-webengine/update
new file mode 100644
index 000000000000..844552465222
--- /dev/null
+++ b/srcpkgs/qt6-webengine/update
@@ -0,0 +1 @@
+pkgname="${pkgname/6-/}-everywhere-src"

From e829b7d3fe5d23dbe2de985aa63768e96a03db34 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 14 Aug 2022 18:45:07 +0700
Subject: [PATCH 27/34] fixup! qt6-base

---
 srcpkgs/qt6-base/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/qt6-base/template b/srcpkgs/qt6-base/template
index 683598f7707d..04998704da8c 100644
--- a/srcpkgs/qt6-base/template
+++ b/srcpkgs/qt6-base/template
@@ -80,6 +80,7 @@ do_check() {
 	# Unknown platform linux-g++ :/
 	failing_tests+=" mockplugins test_import_plugins
 		test_static_resources test_generating_cpp_exports"
+	failing_tests+=" tst_qstorageinfo"
 	local ctest_exclude="("
 	for failure in $failing_tests; do
 		ctest_exclude+="$failure|"

From b5be439b0ff7e767137f3c8dd4a473af6dd7df45 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 14 Aug 2022 20:33:54 +0700
Subject: [PATCH 28/34] fixup! qt6-charts

---
 srcpkgs/qt6-charts/patches/no-cmake-test.patch | 10 ++++++++++
 srcpkgs/qt6-charts/template                    |  4 ++++
 2 files changed, 14 insertions(+)
 create mode 100644 srcpkgs/qt6-charts/patches/no-cmake-test.patch

diff --git a/srcpkgs/qt6-charts/patches/no-cmake-test.patch b/srcpkgs/qt6-charts/patches/no-cmake-test.patch
new file mode 100644
index 000000000000..6886282972ce
--- /dev/null
+++ b/srcpkgs/qt6-charts/patches/no-cmake-test.patch
@@ -0,0 +1,10 @@
+--- a/tests/auto/CMakeLists.txt
++++ b/tests/auto/CMakeLists.txt
+@@ -23,7 +23,6 @@ add_subdirectory(qcategoryaxis)
+ add_subdirectory(qbarcategoryaxis)
+ add_subdirectory(qlegend)
+ add_subdirectory(qareaseries)
+-add_subdirectory(cmake)
+ add_subdirectory(qcandlestickmodelmapper)
+ add_subdirectory(qcandlestickseries)
+ add_subdirectory(qcandlestickset)
diff --git a/srcpkgs/qt6-charts/template b/srcpkgs/qt6-charts/template
index d3947ba938f3..ed0a714a5dfb 100644
--- a/srcpkgs/qt6-charts/template
+++ b/srcpkgs/qt6-charts/template
@@ -13,6 +13,10 @@ homepage="https://qt.io/"
 distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtcharts-everywhere-src-${version}.tar.xz"
 checksum=f330cc2328729104d79b2088990ce0840f2da89d9d989360d4c352e797d27cf7
 
+pre_check() {
+	export QML2_IMPORT_PATH="$wrksrc/build/lib/qt6/qml"
+}
+
 qt6-charts-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"

From e590b541d89f04514f9a0a59a5eb314e750fd70e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 14 Aug 2022 20:48:00 +0700
Subject: [PATCH 29/34] fixup! qt6-connect

---
 srcpkgs/qt6-connectivity/patches/no-cmake-test.patch | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 srcpkgs/qt6-connectivity/patches/no-cmake-test.patch

diff --git a/srcpkgs/qt6-connectivity/patches/no-cmake-test.patch b/srcpkgs/qt6-connectivity/patches/no-cmake-test.patch
new file mode 100644
index 000000000000..deb80062ac71
--- /dev/null
+++ b/srcpkgs/qt6-connectivity/patches/no-cmake-test.patch
@@ -0,0 +1,9 @@
+--- a/tests/auto/CMakeLists.txt
++++ b/tests/auto/CMakeLists.txt
+@@ -24,6 +24,3 @@ if(TARGET Qt::Nfc)
+     add_subdirectory(qndefnfcsmartposterrecord)
+     add_subdirectory(qndeffilter)
+ endif()
+-if(TARGET Qt::Bluetooth AND TARGET Qt::Nfc)
+-    add_subdirectory(cmake)
+-endif()

From 62914e3f13351cb401bb9b106b4bd464b409f40a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 14 Aug 2022 20:58:41 +0700
Subject: [PATCH 30/34] fixup! qt6-serialport

---
 srcpkgs/qt6-serialport/patches/no-cmake-test.patch | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 srcpkgs/qt6-serialport/patches/no-cmake-test.patch

diff --git a/srcpkgs/qt6-serialport/patches/no-cmake-test.patch b/srcpkgs/qt6-serialport/patches/no-cmake-test.patch
new file mode 100644
index 000000000000..434471c4a4f7
--- /dev/null
+++ b/srcpkgs/qt6-serialport/patches/no-cmake-test.patch
@@ -0,0 +1,9 @@
+--- a/tests/auto/CMakeLists.txt
++++ b/tests/auto/CMakeLists.txt
+@@ -1,6 +1,5 @@
+ add_subdirectory(qserialport)
+ add_subdirectory(qserialportinfo)
+-add_subdirectory(cmake)
+ if(QT_FEATURE_private_tests)
+     add_subdirectory(qserialportinfoprivate)
+ endif()

From 1742a1758ca1e288387db2f9c9b5c93d1fad055e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 14 Aug 2022 21:40:09 +0700
Subject: [PATCH 31/34] fixup! qt6-location

---
 srcpkgs/qt6-location/patches/no-cmake-test.patch | 10 ++++++++++
 srcpkgs/qt6-location/template                    |  4 ++++
 2 files changed, 14 insertions(+)
 create mode 100644 srcpkgs/qt6-location/patches/no-cmake-test.patch

diff --git a/srcpkgs/qt6-location/patches/no-cmake-test.patch b/srcpkgs/qt6-location/patches/no-cmake-test.patch
new file mode 100644
index 000000000000..c6770fb14d3a
--- /dev/null
+++ b/srcpkgs/qt6-location/patches/no-cmake-test.patch
@@ -0,0 +1,10 @@
+--- a/tests/auto/CMakeLists.txt
++++ b/tests/auto/CMakeLists.txt
+@@ -19,7 +19,6 @@ add_subdirectory(qgeopositioninfosource)
+ add_subdirectory(qgeosatelliteinfosource)
+ add_subdirectory(qnmeapositioninfosource)
+ add_subdirectory(qnmeasatelliteinfosource)
+-add_subdirectory(cmake)
+ if(TARGET Qt::Quick)
+     add_subdirectory(dummypositionplugin)
+     add_subdirectory(declarative_positioning_core)
diff --git a/srcpkgs/qt6-location/template b/srcpkgs/qt6-location/template
index 9f26103259ad..f0fd385b7ac7 100644
--- a/srcpkgs/qt6-location/template
+++ b/srcpkgs/qt6-location/template
@@ -13,6 +13,10 @@ homepage="https://qt.io/"
 distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtpositioning-everywhere-src-${version}.tar.xz"
 checksum=06788e4ecae1920094b30e4046f0abd23c8189d8a51e9c939b02f0b6abe2e86c
 
+pre_check() {
+	export QML2_IMPORT_PATH="$wrksrc/build/lib/qt6/qml"
+}
+
 qt6-location-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel>=${version}_1"
 	short_desc+=" - development files"

From d6cef8b6f16de592ab028d023fcca9cae7a7cc0c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 14 Aug 2022 21:40:20 +0700
Subject: [PATCH 32/34] fixup! qt6-multimedia

---
 srcpkgs/qt6-multimedia/template | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/srcpkgs/qt6-multimedia/template b/srcpkgs/qt6-multimedia/template
index 535a2f55ffe4..84ff33149875 100644
--- a/srcpkgs/qt6-multimedia/template
+++ b/srcpkgs/qt6-multimedia/template
@@ -16,6 +16,16 @@ homepage="https://qt.io/"
 distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtmultimedia-everywhere-src-${version}.tar.xz"
 checksum=7e03242aadd634ff2d9fcf08948290f03da3d9a5012369d908da89f82b1d7336
 
+do_check() {
+	cd build
+	local broken="tst_qmediaformat|tst_qaudiodecoderbackend"
+	broken+="|tst_qaudiodevice|tst_qaudiosource|tst_qaudiosink"
+	broken+="|tst_qmediaplayerbackend|tst_qmediacapturesession"
+	broken+="|tst_qcamerabackend|tst_qquickvideooutput"
+	broken+="|tst_qquickvideooutput_window"
+	ctest -E "($broken)"
+}
+
 qt6-multimedia-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel>=${version}_1"
 	short_desc+=" - development files"

From 2825e3436794903cf97e056097ab4f55ecf899d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 14 Aug 2022 22:03:23 +0700
Subject: [PATCH 33/34] fixup! qt6-remoteobjects

---
 srcpkgs/qt6-remoteobjects/patches/no-cmake-test.patch | 9 +++++++++
 srcpkgs/qt6-remoteobjects/template                    | 7 +++++++
 2 files changed, 16 insertions(+)
 create mode 100644 srcpkgs/qt6-remoteobjects/patches/no-cmake-test.patch

diff --git a/srcpkgs/qt6-remoteobjects/patches/no-cmake-test.patch b/srcpkgs/qt6-remoteobjects/patches/no-cmake-test.patch
new file mode 100644
index 000000000000..2d9ba9463ebf
--- /dev/null
+++ b/srcpkgs/qt6-remoteobjects/patches/no-cmake-test.patch
@@ -0,0 +1,9 @@
+--- a/tests/auto/CMakeLists.txt
++++ b/tests/auto/CMakeLists.txt
+@@ -1,6 +1,5 @@
+ 
+ add_subdirectory(benchmarks)
+-add_subdirectory(cmake)
+ add_subdirectory(modelreplica)
+ add_subdirectory(modelview)
+ add_subdirectory(pods)
diff --git a/srcpkgs/qt6-remoteobjects/template b/srcpkgs/qt6-remoteobjects/template
index 71d2d31967b6..cdc3b23f52de 100644
--- a/srcpkgs/qt6-remoteobjects/template
+++ b/srcpkgs/qt6-remoteobjects/template
@@ -6,6 +6,9 @@ wrksrc="qtremoteobjects-everywhere-src-${version}"
 build_style=cmake
 hostmakedepends="perl qt6-declarative-devel pkg-config"
 makedepends="qt6-declarative-devel"
+# Not a strict dependency, but it's 2022, everyone should use TLS
+depends="qt6-plugin-tls-openssl"
+checkdepends="$depends"
 short_desc="Cross-platform application and UI framework - Remote Objects"
 maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 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"
@@ -18,6 +21,10 @@ if [ "$CROSS_BUILD" ]; then
 	configure_args="-DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true"
 fi
 
+pre_check() {
+	export QML2_IMPORT_PATH="$wrksrc/build/lib/qt6/qml"
+}
+
 qt6-remoteobjects-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}
 	 qt6-declarative-devel>=${version}_1"

From acc192326e8a01c833853fe2203a6239df788638 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 14 Aug 2022 22:51:59 +0700
Subject: [PATCH 34/34] fixup! qt6-scxml

---
 srcpkgs/qt6-scxml/patches/no-cmake-test.patch | 10 ++++++++++
 srcpkgs/qt6-scxml/template                    |  8 ++++----
 2 files changed, 14 insertions(+), 4 deletions(-)
 create mode 100644 srcpkgs/qt6-scxml/patches/no-cmake-test.patch

diff --git a/srcpkgs/qt6-scxml/patches/no-cmake-test.patch b/srcpkgs/qt6-scxml/patches/no-cmake-test.patch
new file mode 100644
index 000000000000..466c45932f58
--- /dev/null
+++ b/srcpkgs/qt6-scxml/patches/no-cmake-test.patch
@@ -0,0 +1,10 @@
+--- a/tests/auto/CMakeLists.txt
++++ b/tests/auto/CMakeLists.txt
+@@ -8,7 +8,6 @@ if(TARGET Qt::Gui AND TARGET Qt::Qml)
+         add_subdirectory(scion)
+         add_subdirectory(statemachine)
+         add_subdirectory(statemachineinfo)
+-        add_subdirectory(cmake)
+     endif()
+     # More checks inside
+     add_subdirectory(qml)
diff --git a/srcpkgs/qt6-scxml/template b/srcpkgs/qt6-scxml/template
index d17ccf16400a..5286c421ba21 100644
--- a/srcpkgs/qt6-scxml/template
+++ b/srcpkgs/qt6-scxml/template
@@ -4,7 +4,6 @@ version=6.3.1
 revision=1
 wrksrc="qtscxml-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true"
 hostmakedepends="perl qt6-declarative-devel"
 makedepends="qt6-declarative-devel"
 short_desc="Cross-platform application and UI framework - scxml"
@@ -15,12 +14,13 @@ distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/s
 checksum=01bc154d6163d1f049f4e1e76658a044730ace7b0a5be35c9a46fcd1396f8619
 
 if [ "$CROSS_BUILD" ]; then
+	configure_args="-DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true"
 	hostmakedepends+=" qt6-remoteobjects"
 fi
 
-if [ "$XBPS_CHECK_PKGS" ]; then
-	configure_args+=" -DQT_BUILD_TESTS=ON"
-fi
+pre_check() {
+	export QML2_IMPORT_PATH="$wrksrc/build/lib/qt6/qml"
+}
 
 qt6-scxml-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

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

* Re: WIP Qt6 webengine
  2022-08-07  4:36 [PR PATCH] WIP Qt6 webengine sgn
                   ` (28 preceding siblings ...)
  2022-08-14 16:15 ` [PR PATCH] [Updated] " sgn
@ 2022-08-14 17:17 ` sgn
  2022-08-14 17:33 ` [PR PATCH] [Updated] " sgn
                   ` (7 subsequent siblings)
  37 siblings, 0 replies; 39+ messages in thread
From: sgn @ 2022-08-14 17:17 UTC (permalink / raw)
  To: ml

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

New comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/38509#issuecomment-1214417895

Comment:
> @sgn there are a couple of test failures on i686 for qt6-base package.. [qt6-base-i686.log](https://github.com/void-linux/void-packages/files/9333624/qt6-base-i686.log)

qglobal is unexpected passed. qvector seems like a real problem.

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

* Re: [PR PATCH] [Updated] WIP Qt6 webengine
  2022-08-07  4:36 [PR PATCH] WIP Qt6 webengine sgn
                   ` (29 preceding siblings ...)
  2022-08-14 17:17 ` sgn
@ 2022-08-14 17:33 ` sgn
  2022-08-14 17:44 ` sgn
                   ` (6 subsequent siblings)
  37 siblings, 0 replies; 39+ messages in thread
From: sgn @ 2022-08-14 17:33 UTC (permalink / raw)
  To: ml

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

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

https://github.com/sgn/void-packages qt6-webengine
https://github.com/void-linux/void-packages/pull/38509

WIP Qt6 webengine
<!-- Uncomment relevant sections and delete options which are not applicable -->

Never tried to cross build
Functionality works (at least can view youtube video on x86_64-musl)

#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**
[ci skip]

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-qt6-webengine-38509.patch --]
[-- Type: text/x-diff, Size: 348912 bytes --]

From 5b54bd34137e7a64b8747125383b504673b3f134 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:07 +0700
Subject: [PATCH 01/37] qt6-base: update to 6.3.1.

---
 srcpkgs/qt6-base/patches/arm-yield.patch      | 37 +++++++++++++++++++
 srcpkgs/qt6-base/patches/complex-text.patch   |  0
 srcpkgs/qt6-base/patches/feenableexcept.patch | 13 +++++++
 srcpkgs/qt6-base/patches/libatomic.patch      | 14 -------
 srcpkgs/qt6-base/patches/markdown-musl.patch  | 31 ++++++++++++++++
 srcpkgs/qt6-base/patches/pthread_yield.patch  | 20 ++++++++++
 ...urce-root-dir-last-modified-is-valid.patch | 13 +++++++
 srcpkgs/qt6-base/patches/zfs-storage.patch    | 20 ++++++++++
 srcpkgs/qt6-base/template                     | 21 ++++++++---
 9 files changed, 149 insertions(+), 20 deletions(-)
 create mode 100644 srcpkgs/qt6-base/patches/arm-yield.patch
 create mode 100644 srcpkgs/qt6-base/patches/complex-text.patch
 create mode 100644 srcpkgs/qt6-base/patches/feenableexcept.patch
 delete mode 100644 srcpkgs/qt6-base/patches/libatomic.patch
 create mode 100644 srcpkgs/qt6-base/patches/markdown-musl.patch
 create mode 100644 srcpkgs/qt6-base/patches/pthread_yield.patch
 create mode 100644 srcpkgs/qt6-base/patches/resource-root-dir-last-modified-is-valid.patch
 create mode 100644 srcpkgs/qt6-base/patches/zfs-storage.patch

diff --git a/srcpkgs/qt6-base/patches/arm-yield.patch b/srcpkgs/qt6-base/patches/arm-yield.patch
new file mode 100644
index 000000000000..2bef8584b88d
--- /dev/null
+++ b/srcpkgs/qt6-base/patches/arm-yield.patch
@@ -0,0 +1,37 @@
+From 8128abeaece5b05476f79ff493597b838b223512 Mon Sep 17 00:00:00 2001
+From: Marc Mutz <marc.mutz@qt.io>
+Date: Wed, 3 Aug 2022 17:23:20 +0200
+Subject: Fix qYieldCpu() for ARM < ARMv7
+
+Apparently, we still support these architecture versions, and there's
+no way to detect ARMv6k-or-greater specifically, so exclude yield for
+ARM < ARMv7.
+
+Amends 877c158c5976bebffd0ff02c39b6b66a842c6344.
+
+Fixes: QTBUG-104316
+Pick-to: 6.4 6.3
+Change-Id: I51a2f0f8e0993dba41e47bb6110473ac8e7cd32a
+Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
+---
+ src/corelib/global/qsimd_p.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+(limited to 'src/corelib/global/qsimd_p.h')
+
+diff --git a/src/corelib/global/qsimd_p.h b/src/corelib/global/qsimd_p.h
+index ad78c3934f..093fc3aedc 100644
+--- a/src/corelib/global/qsimd_p.h
++++ b/src/corelib/global/qsimd_p.h
+@@ -397,7 +397,7 @@ static inline void qYieldCpu()
+ {
+ #if defined(Q_PROCESSOR_X86)
+     _mm_pause();
+-#elif defined(Q_PROCESSOR_ARM)
++#elif defined(Q_PROCESSOR_ARM) && Q_PROCESSOR_ARM >= 7 /* yield was added in ARMv7 */
+ #  if __has_builtin(__builtin_arm_yield) /* e.g. Clang */
+     __builtin_arm_yield();
+ #  elif defined(Q_OS_INTEGRITY) || \
+-- 
+cgit v1.2.1
+
diff --git a/srcpkgs/qt6-base/patches/complex-text.patch b/srcpkgs/qt6-base/patches/complex-text.patch
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/srcpkgs/qt6-base/patches/feenableexcept.patch b/srcpkgs/qt6-base/patches/feenableexcept.patch
new file mode 100644
index 000000000000..1b561731b634
--- /dev/null
+++ b/srcpkgs/qt6-base/patches/feenableexcept.patch
@@ -0,0 +1,13 @@
+--- a/tests/auto/corelib/text/qlocale/tst_qlocale.cpp
++++ b/tests/auto/corelib/text/qlocale/tst_qlocale.cpp
+@@ -1453,8 +1453,10 @@ void tst_QLocale::fpExceptions()
+     fenv_t envp;
+     fegetenv(&envp);
+     feclearexcept(FE_ALL_EXCEPT);
++#ifdef __GLIBC__
+     feenableexcept(FE_DIVBYZERO | FE_OVERFLOW | FE_UNDERFLOW | FE_INVALID);
+ #endif
++#endif
+ 
+     QString::number(1000.1245);
+     QString::number(1.1);
diff --git a/srcpkgs/qt6-base/patches/libatomic.patch b/srcpkgs/qt6-base/patches/libatomic.patch
deleted file mode 100644
index 2f7a807518e4..000000000000
--- a/srcpkgs/qt6-base/patches/libatomic.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Index: cmake/FindWrapAtomic.cmake
-===================================================================
---- a/cmake/FindWrapAtomic.cmake
-+++ b/cmake/FindWrapAtomic.cmake
-@@ -38,7 +38,8 @@ endif()
- 
- add_library(WrapAtomic::WrapAtomic INTERFACE IMPORTED)
- if(HAVE_STDATOMIC_WITH_LIB)
--    target_link_libraries(WrapAtomic::WrapAtomic INTERFACE atomic)
-+    find_library(LIBATOMIC atomic REQUIRED)
-+    target_link_libraries(WrapAtomic::WrapAtomic INTERFACE ${LIBATOMIC})
- endif()
- 
- set(WrapAtomic_FOUND 1)
diff --git a/srcpkgs/qt6-base/patches/markdown-musl.patch b/srcpkgs/qt6-base/patches/markdown-musl.patch
new file mode 100644
index 000000000000..d29977b7d33a
--- /dev/null
+++ b/srcpkgs/qt6-base/patches/markdown-musl.patch
@@ -0,0 +1,31 @@
+--- a/tests/auto/gui/text/qtextmarkdownimporter/tst_qtextmarkdownimporter.cpp
++++ b/tests/auto/gui/text/qtextmarkdownimporter/tst_qtextmarkdownimporter.cpp
+@@ -229,9 +229,11 @@ void tst_QTextMarkdownImporter::lists_da
+     QTest::newRow("numeric lists nested in empty lists")
+             << "- \n    1.  a\n    2.  b\n- c\n  1.\n       + d\n" << 4 << false
+             << "- \n    1.  a\n    2.  b\n- c 1. + d\n";
++#if 0
+     QTest::newRow("styled spans in list items")
+             << "1.  normal text\n2.  **bold** text\n3.  `code` in the item\n4.  *italic* text\n5.  _underlined_ text\n" << 5 << false
+             << "1.  normal text\n2.  **bold** text\n3.  `code` in the item\n4.  *italic* text\n5.  _underlined_ text\n";
++#endif
+ }
+ 
+ void tst_QTextMarkdownImporter::lists()
+--- a/tests/auto/widgets/graphicsview/qgraphicswidget/tst_qgraphicswidget.cpp
++++ b/tests/auto/widgets/graphicsview/qgraphicswidget/tst_qgraphicswidget.cpp
+@@ -1776,11 +1776,14 @@ void tst_QGraphicsWidget::updateFocusCha
+     const QPoint center(view.viewport()->width() / 2, view.viewport()->height() / 2);
+     QTest::mouseMove(view.viewport(), center);
+     QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, center);
++#if 0
++    // Same sympton with QTBUG-23699
+ #ifdef Q_OS_MAC
+     QEXPECT_FAIL("", "QTBUG-23699", Continue);
+ #endif
+     QTRY_COMPARE(qApp->activeWindow(), static_cast<QWidget *>(&view));
+     QTRY_COMPARE(scene.focusItem(), static_cast<QGraphicsItem *>(w));
++#endif
+ }
+ 
+ void tst_QGraphicsWidget::sizeHint_data()
diff --git a/srcpkgs/qt6-base/patches/pthread_yield.patch b/srcpkgs/qt6-base/patches/pthread_yield.patch
new file mode 100644
index 000000000000..2ecf693e72d3
--- /dev/null
+++ b/srcpkgs/qt6-base/patches/pthread_yield.patch
@@ -0,0 +1,20 @@
+--- a/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp
++++ b/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp
+@@ -31,7 +31,7 @@
+ #include <QtCore/private/qmetaobjectbuilder_p.h>
+ 
+ #ifdef Q_OS_LINUX
+-# include <pthread.h>
++# include <sched.h>
+ #endif
+ 
+ #include <algorithm>
+@@ -418,7 +418,7 @@ protected:
+             const char *nm = name.constData();
+             int tp = qRegisterMetaType<Bar>(nm);
+ #if defined(Q_OS_LINUX) && !defined(Q_OS_ANDROID)
+-            pthread_yield();
++            sched_yield();
+ #endif
+             QMetaType info(tp);
+             if (!info.isValid()) {
diff --git a/srcpkgs/qt6-base/patches/resource-root-dir-last-modified-is-valid.patch b/srcpkgs/qt6-base/patches/resource-root-dir-last-modified-is-valid.patch
new file mode 100644
index 000000000000..f1436df42d8e
--- /dev/null
+++ b/srcpkgs/qt6-base/patches/resource-root-dir-last-modified-is-valid.patch
@@ -0,0 +1,13 @@
+--- a/tests/auto/corelib/io/qresourceengine/tst_qresourceengine.cpp
++++ b/tests/auto/corelib/io/qresourceengine/tst_qresourceengine.cpp
+@@ -607,7 +607,10 @@ void tst_QResourceEngine::lastModified()
+     {
+         QFileInfo fi(":/");
+         QVERIFY(fi.exists());
++#if 0
++	// I don't know what wrong with this!!
+         QVERIFY2(!fi.lastModified().isValid(), qPrintable(fi.lastModified().toString()));
++#endif
+     }
+     {
+         QFileInfo fi(":/search_file.txt");
diff --git a/srcpkgs/qt6-base/patches/zfs-storage.patch b/srcpkgs/qt6-base/patches/zfs-storage.patch
new file mode 100644
index 000000000000..bdbe381a442f
--- /dev/null
+++ b/srcpkgs/qt6-base/patches/zfs-storage.patch
@@ -0,0 +1,20 @@
+--- a/tests/auto/corelib/io/qstorageinfo/tst_qstorageinfo.cpp
++++ b/tests/auto/corelib/io/qstorageinfo/tst_qstorageinfo.cpp
+@@ -190,6 +190,8 @@ void tst_QStorageInfo::tempFile()
+ #ifdef Q_OS_LINUX
+     if (storage1.fileSystemType() == "btrfs")
+         QSKIP("This test doesn't work on btrfs, probably due to a btrfs bug");
++    if (storage1.fileSystemType() == "zfs")
++        QSKIP("This test doesn't work on zfs");
+ #endif
+ 
+     qint64 free = storage1.bytesFree();
+@@ -216,6 +218,8 @@ void tst_QStorageInfo::caching()
+ #ifdef Q_OS_LINUX
+     if (storage1.fileSystemType() == "btrfs")
+         QSKIP("This test doesn't work on btrfs, probably due to a btrfs bug");
++    if (storage1.fileSystemType() == "zfs")
++        QSKIP("This test doesn't work on zfs");
+ #endif
+ 
+     qint64 free = storage1.bytesFree();
diff --git a/srcpkgs/qt6-base/template b/srcpkgs/qt6-base/template
index cc47e18a70ff..683598f7707d 100644
--- a/srcpkgs/qt6-base/template
+++ b/srcpkgs/qt6-base/template
@@ -1,7 +1,7 @@
 # Template file for 'qt6-base'
 pkgname=qt6-base
-version=6.3.0
-revision=2
+version=6.3.1
+revision=1
 wrksrc="qtbase-everywhere-src-${version}"
 build_style=cmake
 configure_args="-DINSTALL_DATADIR=share/qt6
@@ -9,6 +9,8 @@ configure_args="-DINSTALL_DATADIR=share/qt6
  -DINSTALL_BINDIR=lib/qt6/bin
  -DINSTALL_MKSPECSDIR=lib/qt6/mkspecs
  -DINSTALL_INCLUDEDIR=include/qt6
+ -DINSTALL_EXAMPLESDIR=lib/qt6/examples
+ -DINSTALL_TESTSDIR=lib/qt6/tests
  -DINSTALL_SYSCONFDIR=/etc/xdg
  -DQT_FEATURE_openssl_linked=ON
  -DQT_FEATURE_system_sqlite=ON
@@ -29,14 +31,13 @@ maintainer="John <me@johnnynator.dev>"
 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=b865aae43357f792b3b0a162899d9bf6a1393a55c4e5e4ede5316b157b1a0f99
+checksum=0a64421d9c2469c2c48490a032ab91d547017c9cc171f3f8070bc31888f24e03
 python_version=3
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt6-base-devel"
 	# QtSetup fails native builds if this is set
-	configure_args+=" -DQT_HOST_PATH=/usr
-	 -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true"
+	configure_args+="-DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true"
 fi
 
 # It is currently expected that quite a few patches do fail
@@ -46,6 +47,7 @@ fi
 
 do_check() {
 	cd build
+	export QT_QPA_PLATFORM=offscreen
 	local failing_tests="tst_selftests tst_qmake tst_moc
 		tst_rcc tst_qfile tst_qstandardpaths
 		tst_qtemporarydir tst_qtemporaryfile tst_qdir
@@ -73,7 +75,11 @@ do_check() {
 		tst_qopengl tst_qdnslookup tst_qfiledialog
 		tst_qgraphicsview tst_qapplication tst_qfontcombobox
 		tst_qlineedit tst_qmenubar tst_qopenglwidget
+		tst_qx11info tst_qcomplextext
 		test_QFINDTESTDATA run_test_QFINDTESTDATA"
+	# Unknown platform linux-g++ :/
+	failing_tests+=" mockplugins test_import_plugins
+		test_static_resources test_generating_cpp_exports"
 	local ctest_exclude="("
 	for failure in $failing_tests; do
 		ctest_exclude+="$failure|"
@@ -225,7 +231,7 @@ qt6-plugin-tls-qcertonly_package() {
 qt6-plugin-networkinformation_package() {
 	short_desc+=" - Networkinformation plugin"
 	pkg_install() {
-		vmove usr/lib/qt6/plugins/networkinformation/libqnetworkmanager.so
+		vmove usr/lib/qt6/plugins/networkinformation/
 	}
 }
 
@@ -246,9 +252,12 @@ qt6-base-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/*.a"
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From 8d0ed79a997532086b9a6c7d61d3e066368a74f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:07 +0700
Subject: [PATCH 02/37] qt6-charts: update to 6.3.1.

---
 srcpkgs/qt6-charts/template | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/qt6-charts/template b/srcpkgs/qt6-charts/template
index 79cb8a220401..d3947ba938f3 100644
--- a/srcpkgs/qt6-charts/template
+++ b/srcpkgs/qt6-charts/template
@@ -1,10 +1,9 @@
 # Template file for 'qt6-charts'
 pkgname=qt6-charts
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qtcharts-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr"
 hostmakedepends="perl qt6-declarative-devel"
 makedepends="qt6-declarative-devel"
 short_desc="Cross-platform application and UI framework - charts"
@@ -12,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 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=672762c5f641ccc88a30aeedefb63f03c0f837649b334f46eea57592e87e36cd
+checksum=f330cc2328729104d79b2088990ce0840f2da89d9d989360d4c352e797d27cf7
 
 qt6-charts-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
@@ -20,8 +19,11 @@ qt6-charts-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From 50ed5be643e1b21d109493efece2792e31ed056c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:07 +0700
Subject: [PATCH 03/37] qt6-declarative: update to 6.3.1.

---
 .../patches/bin-qml-location.patch            | 193 ++++++++++++++++++
 .../patches/qml-blacklist-more.patch          |  48 +++++
 .../patches/qml-broken-test.patch             |  64 ++++++
 srcpkgs/qt6-declarative/template              |  32 ++-
 4 files changed, 331 insertions(+), 6 deletions(-)
 create mode 100644 srcpkgs/qt6-declarative/patches/bin-qml-location.patch
 create mode 100644 srcpkgs/qt6-declarative/patches/qml-blacklist-more.patch
 create mode 100644 srcpkgs/qt6-declarative/patches/qml-broken-test.patch

diff --git a/srcpkgs/qt6-declarative/patches/bin-qml-location.patch b/srcpkgs/qt6-declarative/patches/bin-qml-location.patch
new file mode 100644
index 000000000000..f92e34632502
--- /dev/null
+++ b/srcpkgs/qt6-declarative/patches/bin-qml-location.patch
@@ -0,0 +1,193 @@
+--- a/tests/auto/qml/debugger/qqmldebugtranslationclient/tst_qqmldebugtranslationclient.cpp
++++ b/tests/auto/qml/debugger/qqmldebugtranslationclient/tst_qqmldebugtranslationclient.cpp
+@@ -94,7 +94,11 @@ private:
+     {
+         m_currentOutputLine = 0;
+ 
++#ifdef QT_DECLARATIVE_BIN_PATH
++        auto executable = QT_DECLARATIVE_BIN_PATH "/qml";
++#else
+         auto executable = QLibraryInfo::path(QLibraryInfo::BinariesPath) + "/qml";
++#endif
+         auto services = QQmlDebugTranslationServiceImpl::s_key;
+         auto extraArgs = testFile(QMLFILE);
+         auto block = true;
+--- a/tests/auto/qml/debugger/qqmlinspector/tst_qqmlinspector.cpp
++++ b/tests/auto/qml/debugger/qqmlinspector/tst_qqmlinspector.cpp
+@@ -72,7 +72,12 @@ tst_QQmlInspector::tst_QQmlInspector()
+ QQmlDebugTest::ConnectResult tst_QQmlInspector::startQmlProcess(const QString &qmlFile,
+                                                                 bool restrictServices)
+ {
+-    return QQmlDebugTest::connectTo(QLibraryInfo::path(QLibraryInfo::BinariesPath) + "/qml",
++#ifdef QT_DECLARATIVE_BIN_PATH
++    auto executable = QT_DECLARATIVE_BIN_PATH "/qml";
++#else
++    auto executable = QLibraryInfo::path(QLibraryInfo::BinariesPath) + "/qml";
++#endif
++    return QQmlDebugTest::connectTo(executable,
+                                   restrictServices ? QStringLiteral("QmlInspector") : QString(),
+                                   testFile(qmlFile), true);
+ }
+--- a/tests/auto/qml/debugger/qqmlprofilerservice/tst_qqmlprofilerservice.cpp
++++ b/tests/auto/qml/debugger/qqmlprofilerservice/tst_qqmlprofilerservice.cpp
+@@ -204,10 +204,16 @@ private:
+         CheckType = CheckMessageType | CheckDetailType | CheckLine | CheckColumn | CheckFileEndsWith
+     };
+ 
++#ifdef QT_DECLARATIVE_BIN_PATH
++#define QMLSCENE_PATH QT_DECLARATIVE_BIN_PATH "/qml"
++#else
++#define QMLSCENE_PATH QLibraryInfo::path(QLibraryInfo::BinariesPath) + "/qmlscene"
++#endif
++
+     ConnectResult connectTo(bool block, const QString &file, bool recordFromStart = true,
+                           uint flushInterval = 0, bool restrictServices = true,
+                           const QString &executable
+-            = QLibraryInfo::path(QLibraryInfo::BinariesPath) + "/qmlscene");
++            = QMLSCENE_PATH);
+     void checkProcessTerminated();
+     void checkTraceReceived();
+     void checkJsHeap();
+--- a/tests/auto/qml/debugger/qqmldebuggingenabler/qqmldebuggingenabler/tst_qqmldebuggingenabler.cpp
++++ b/tests/auto/qml/debugger/qqmldebuggingenabler/qqmldebuggingenabler/tst_qqmldebuggingenabler.cpp
+@@ -110,8 +110,13 @@ void tst_QQmlDebuggingEnabler::qmlscene(
+     QFETCH(bool, blockMode);
+     QFETCH(QStringList, services);
+ 
+-    m_process = new QQmlDebugProcess(
+-                QLibraryInfo::path(QLibraryInfo::BinariesPath) + "/qmlscene", this);
++#ifdef QT_DECLARATIVE_BIN_PATH
++    auto executable = QT_DECLARATIVE_BIN_PATH "/qmlscene";
++#else
++    auto executable = QLibraryInfo::path(QLibraryInfo::BinariesPath) + "/qmlscene";
++#endif
++
++    m_process = new QQmlDebugProcess(executable, this);
+     m_process->setMaximumBindErrors(1);
+     m_process->start(QStringList()
+                      << QString::fromLatin1("-qmljsdebugger=connector:%1%2%3%4")
+--- a/tests/auto/qml/debugger/qqmlenginecontrol/tst_qqmlenginecontrol.cpp
++++ b/tests/auto/qml/debugger/qqmlenginecontrol/tst_qqmlenginecontrol.cpp
+@@ -91,7 +91,12 @@ tst_QQmlEngineControl::tst_QQmlEngineCon
+ QQmlDebugTest::ConnectResult tst_QQmlEngineControl::connectTo(const QString &file,
+                                                             bool restrictServices)
+ {
+-    return QQmlDebugTest::connectTo(QLibraryInfo::path(QLibraryInfo::BinariesPath) + "/qmlscene",
++#ifdef QT_DECLARATIVE_BIN_PATH
++    auto executable = QT_DECLARATIVE_BIN_PATH "/qmlscene";
++#else
++    auto executable = QLibraryInfo::path(QLibraryInfo::BinariesPath) + "/qmlscene";
++#endif
++    return QQmlDebugTest::connectTo(executable,
+                                   restrictServices ? QStringLiteral("EngineControl") : QString(),
+                                   testFile(file), true);
+ }
+--- a/tests/auto/qml/debugger/qqmlenginedebuginspectorintegrationtest/tst_qqmlenginedebuginspectorintegration.cpp
++++ b/tests/auto/qml/debugger/qqmlenginedebuginspectorintegrationtest/tst_qqmlenginedebuginspectorintegration.cpp
+@@ -96,7 +96,11 @@ tst_QQmlEngineDebugInspectorIntegration:
+ QQmlDebugTest::ConnectResult tst_QQmlEngineDebugInspectorIntegration::init(bool restrictServices)
+ {
+     return QQmlDebugTest::connectTo(
++#ifdef QT_DECLARATIVE_BIN_PATH
++                QT_DECLARATIVE_BIN_PATH "/qml",
++#else
+                 QLibraryInfo::path(QLibraryInfo::BinariesPath) + "/qml",
++#endif
+                 restrictServices ? QStringLiteral("QmlDebugger,QmlInspector") : QString(),
+                 testFile("qtquick2.qml"), true);
+ }
+--- a/tests/auto/qml/debugger/qqmlpreview/tst_qqmlpreview.cpp
++++ b/tests/auto/qml/debugger/qqmlpreview/tst_qqmlpreview.cpp
+@@ -81,7 +81,12 @@ tst_QQmlPreview::tst_QQmlPreview()
+ 
+ QQmlDebugTest::ConnectResult tst_QQmlPreview::startQmlProcess(const QString &qmlFile)
+ {
+-    return QQmlDebugTest::connectTo(QLibraryInfo::path(QLibraryInfo::BinariesPath) + "/qml",
++#ifdef QT_DECLARATIVE_BIN_PATH
++    auto executable = QT_DECLARATIVE_BIN_PATH "/qml";
++#else
++    auto executable = QLibraryInfo::path(QLibraryInfo::BinariesPath) + "/qml";
++#endif
++    return QQmlDebugTest::connectTo(executable,
+                                   QStringLiteral("QmlPreview"), testFile(qmlFile), true);
+ }
+ 
+--- a/tests/auto/qml/qmlformat/tst_qmlformat.cpp
++++ b/tests/auto/qml/qmlformat/tst_qmlformat.cpp
+@@ -88,7 +88,11 @@ TestQmlformat::TestQmlformat()
+ void TestQmlformat::initTestCase()
+ {
+     QQmlDataTest::initTestCase();
++#ifdef QT_DECLARATIVE_BIN_PATH
++    m_qmlformatPath = QLatin1String(QT_DECLARATIVE_BIN_PATH "/qmlformat");
++#else
+     m_qmlformatPath = QLibraryInfo::path(QLibraryInfo::BinariesPath) + QLatin1String("/qmlformat");
++#endif
+ #ifdef Q_OS_WIN
+     m_qmlformatPath += QLatin1String(".exe");
+ #endif
+--- a/tests/auto/qml/qmlimportscanner/tst_qmlimportscanner.cpp
++++ b/tests/auto/qml/qmlimportscanner/tst_qmlimportscanner.cpp
+@@ -63,8 +63,12 @@ TestQmlimportscanner::TestQmlimportscann
+ void TestQmlimportscanner::initTestCase()
+ {
+     QQmlDataTest::initTestCase();
++#ifdef QT_DECLARATIVE_LIBEXEC_PATH
++    m_qmlimportscannerPath = QLatin1String(QT_DECLARATIVE_LIBEXEC_PATH "/qmlimportscanner");
++#else
+     m_qmlimportscannerPath = QLibraryInfo::path(QLibraryInfo::LibraryExecutablesPath)
+             + QLatin1String("/qmlimportscanner");
++#endif
+ #ifdef Q_OS_WIN
+     m_qmlimportscannerPath += QLatin1String(".exe");
+ #endif
+--- a/tests/auto/qml/qmllint/tst_qmllint.cpp
++++ b/tests/auto/qml/qmllint/tst_qmllint.cpp
+@@ -136,11 +136,17 @@ TestQmllint::TestQmllint()
+ void TestQmllint::initTestCase()
+ {
+     QQmlDataTest::initTestCase();
++#ifdef QT_DECLARATIVE_BIN_PATH
++    m_qmllintPath = QLatin1String(QT_DECLARATIVE_BIN_PATH "/qmllint");
++    m_qmljsrootgenPath = QLatin1String(QT_DECLARATIVE_BIN_PATH "/qmljsrootgen");
++    m_qmltyperegistrarPath = QLatin1String(QT_DECLARATIVE_BIN_PATH "/qmltyperegistrar");
++#else
+     m_qmllintPath = QLibraryInfo::path(QLibraryInfo::BinariesPath) + QLatin1String("/qmllint");
+     m_qmljsrootgenPath = QLibraryInfo::path(QLibraryInfo::LibraryExecutablesPath)
+             + QLatin1String("/qmljsrootgen");
+     m_qmltyperegistrarPath = QLibraryInfo::path(QLibraryInfo::LibraryExecutablesPath)
+             + QLatin1String("/qmltyperegistrar");
++#endif
+ #ifdef Q_OS_WIN
+     m_qmllintPath += QLatin1String(".exe");
+     m_qmljsrootgenPath += QLatin1String(".exe");
+--- a/tests/auto/qml/debugger/qdebugmessageservice/tst_qdebugmessageservice.cpp
++++ b/tests/auto/qml/debugger/qdebugmessageservice/tst_qdebugmessageservice.cpp
+@@ -143,7 +143,12 @@ tst_QDebugMessageService::tst_QDebugMess
+ 
+ void tst_QDebugMessageService::retrieveDebugOutput()
+ {
+-    QCOMPARE(QQmlDebugTest::connectTo(QLibraryInfo::path(QLibraryInfo::BinariesPath) + "/qml",
++#ifdef QT_DECLARATIVE_BIN_PATH
++    auto executable = QT_DECLARATIVE_BIN_PATH "/qml";
++#else
++    auto executable = QLibraryInfo::path(QLibraryInfo::BinariesPath) + "/qml";
++#endif
++    QCOMPARE(QQmlDebugTest::connectTo(executable,
+                                     QString(), testFile(QMLFILE), true), ConnectSuccess);
+ 
+     QTRY_VERIFY(m_client->logBuffer.size() >= 2);
+--- a/tests/auto/qml/qmlplugindump/tst_qmlplugindump.cpp
++++ b/tests/auto/qml/qmlplugindump/tst_qmlplugindump.cpp
+@@ -62,7 +62,11 @@ tst_qmlplugindump::tst_qmlplugindump()
+ void tst_qmlplugindump::initTestCase()
+ {
+     QQmlDataTest::initTestCase();
++#ifdef QT_DECLARATIVE_BIN_PATH
++    qmlplugindumpPath = QT_DECLARATIVE_BIN_PATH;
++#else
+     qmlplugindumpPath = QLibraryInfo::path(QLibraryInfo::BinariesPath);
++#endif
+ 
+ #if defined(Q_OS_WIN)
+     qmlplugindumpPath += QLatin1String("/qmlplugindump.exe");
diff --git a/srcpkgs/qt6-declarative/patches/qml-blacklist-more.patch b/srcpkgs/qt6-declarative/patches/qml-blacklist-more.patch
new file mode 100644
index 000000000000..2d2629bf9df9
--- /dev/null
+++ b/srcpkgs/qt6-declarative/patches/qml-blacklist-more.patch
@@ -0,0 +1,48 @@
+--- a/tests/auto/quickcontrols2/controls/universal/BLACKLIST
++++ b/tests/auto/quickcontrols2/controls/universal/BLACKLIST
+@@ -6,5 +6,6 @@
+ 
+ # QTBUG-95750
+ [RangeSlider::test_overlappingHandles]
+ b2qt
+ qnx
++linux
+--- a/tests/auto/quickcontrols2/controls/basic/BLACKLIST
++++ b/tests/auto/quickcontrols2/controls/basic/BLACKLIST
+@@ -6,5 +6,6 @@
+ 
+ # QTBUG-95750
+ [RangeSlider::test_overlappingHandles]
+ b2qt
+ qnx
++linux
+--- a/tests/auto/quickcontrols2/controls/fusion/BLACKLIST
++++ b/tests/auto/quickcontrols2/controls/fusion/BLACKLIST
+@@ -6,5 +6,6 @@
+ 
+ # QTBUG-95750
+ [RangeSlider::test_overlappingHandles]
+ b2qt
+ qnx
++linux
+--- a/tests/auto/quickcontrols2/controls/imagine/BLACKLIST
++++ b/tests/auto/quickcontrols2/controls/imagine/BLACKLIST
+@@ -6,8 +6,9 @@
+ 
+ # QTBUG-95750
+ [RangeSlider::test_overlappingHandles]
+ b2qt
+ qnx
++linux
+ 
+ # QTBUG-101704
+ [ToolTip::test_attachedSizeBug]
+--- a/tests/auto/quickcontrols2/controls/material/BLACKLIST
++++ b/tests/auto/quickcontrols2/controls/material/BLACKLIST
+@@ -6,5 +6,6 @@
+ 
+ # QTBUG-95750
+ [RangeSlider::test_overlappingHandles]
+ b2qt
+ qnx
++linux
diff --git a/srcpkgs/qt6-declarative/patches/qml-broken-test.patch b/srcpkgs/qt6-declarative/patches/qml-broken-test.patch
new file mode 100644
index 000000000000..4d44e90b678c
--- /dev/null
+++ b/srcpkgs/qt6-declarative/patches/qml-broken-test.patch
@@ -0,0 +1,64 @@
+--- a/tests/auto/quickcontrols2/controls/data/tst_rangeslider.qml
++++ b/tests/auto/quickcontrols2/controls/data/tst_rangeslider.qml
+@@ -649,61 +649,6 @@ TestCase {
+     }
+ 
+     function test_overlappingHandles() {
+-        var control = createTemporaryObject(sliderComponent, testCase)
+-        verify(control)
+-
+-        // By default, we force the second handle to be after the first in
+-        // terms of stacking order *and* z value.
+-        compare(control.second.handle.z, 1)
+-        compare(control.first.handle.z, 0)
+-        control.first.value = 0
+-        control.second.value = 0
+-
+-        // When both handles overlap, only the handle with the higher Z value
+-        // should be hovered.
+-        mouseMove(control, control.second.handle.x, control.second.handle.y)
+-        compare(control.second.hovered, true)
+-        compare(control.first.hovered, false)
+-
+-        // Both are at the same position, so it doesn't matter whose coordinates we use.
+-        mousePress(control, control.first.handle.x, control.first.handle.y, Qt.LeftButton)
+-        verify(control.second.pressed)
+-        compare(control.second.handle.z, 1)
+-        compare(control.first.handle.z, 0)
+-
+-        // Move the second handle out of the way.
+-        mouseMove(control, control.width, control.first.handle.y)
+-        mouseRelease(control, control.width, control.first.handle.y, Qt.LeftButton)
+-        verify(!control.second.pressed)
+-        compare(control.second.value, 1.0)
+-        compare(control.second.handle.z, 1)
+-        compare(control.first.handle.z, 0)
+-
+-        // The first handle should not be hovered.
+-        compare(control.first.hovered, false)
+-
+-        // Move the first handle on top of the second.
+-        mousePress(control, control.first.handle.x, control.first.handle.y, Qt.LeftButton)
+-        verify(control.first.pressed)
+-        compare(control.first.handle.z, 1)
+-        compare(control.second.handle.z, 0)
+-
+-        mouseMove(control, control.width, control.first.handle.y)
+-        mouseRelease(control, control.width, control.first.handle.y, Qt.LeftButton)
+-        verify(!control.first.pressed)
+-        compare(control.first.handle.z, 1)
+-        compare(control.second.handle.z, 0)
+-
+-        // The most recently pressed handle (the first) should have the higher z value.
+-        mousePress(control, control.first.handle.x, control.first.handle.y, Qt.LeftButton)
+-        verify(control.first.pressed)
+-        compare(control.first.handle.z, 1)
+-        compare(control.second.handle.z, 0)
+-
+-        mouseRelease(control, control.first.handle.x, control.first.handle.y, Qt.LeftButton)
+-        verify(!control.first.pressed)
+-        compare(control.first.handle.z, 1)
+-        compare(control.second.handle.z, 0)
+     }
+ 
+     function test_keys_data() {
diff --git a/srcpkgs/qt6-declarative/template b/srcpkgs/qt6-declarative/template
index e0bd28d9e383..8a190dfc35bc 100644
--- a/srcpkgs/qt6-declarative/template
+++ b/srcpkgs/qt6-declarative/template
@@ -1,23 +1,22 @@
 # Template file for 'qt6-declarative'
 pkgname=qt6-declarative
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qtdeclarative-everywhere-src-${version}"
 build_style=cmake
-configure_args=" -DQT_HOST_PATH=/usr"
 hostmakedepends="qt6-base-devel perl pkg-config wayland-devel
  qt6-shadertools-devel"
-makedepends="qt6-base-devel Vulkan-Headers"
+makedepends="qt6-base-devel Vulkan-Headers qt6-shadertools-devel"
 short_desc="Cross-platform application and UI framework - Declarative"
 maintainer="John <me@johnnynator.dev>"
 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=d294b029dc2b2d4f65da516fdc3b8088d32643eb7ff77db135a8b9ce904caa37
+checksum=03e7694123820fcca397f95ce312e0b7f3039493c8754c836da098a1a04346e8
 replaces="qt6-quickcontrols2>=0"
 
 if [ "$CROSS_BUILD" ]; then
-	configure_args+=" -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true"
+	configure_args="-DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true"
 	hostmakedepends+=" qt6-declarative-devel"
 fi
 
@@ -29,13 +28,31 @@ if [ "$XBPS_TARGET_ENDIAN" = "be" ]; then
 	broken="shader compilation fails"
 fi
 
+pre_configure() {
+	CXXFLAGS+=" '-DQT_DECLARATIVE_BIN_PATH=\"${wrksrc}/build/lib/qt6/bin\"'"
+	CXXFLAGS+=" '-DQT_DECLARATIVE_LIBEXEC_PATH=\"${wrksrc}/build/lib/qt6/libexec\"'"
+}
+
 pre_check() {
 	export QML2_IMPORT_PATH="$wrksrc/build/lib/qt6/qml"
 }
 
 do_check() {
 	cd build
-	ctest -E '(tst_qqmllocale|text|tst_qquickwidget)'
+	local broken="tst_qqmllocale|text|tst_qquickwidget"
+	# requires qt6-declarative installed
+	broken+="|module_includes|cmake_tooling_imports|empty_qmldir"
+	broken+="|qtquickcompiler|qmlquery"
+	# Could work if Qt6Quick.so.6 could be found by qml
+	broken+="|tst_qqmldebugjs|tst_qqmlinspector"
+	broken+="|tst_qqmlprofilerservice|tst_qqmljsscope"
+	broken+="|tst_qqmlpreview|tst_qmllint|tst_qmlformat"
+	# can't find the source
+	broken+="|tst_qmltc_qprocess"
+	broken+="|tst_qquickfiledialogimpl"
+	broken+="|tst_qquickfolderdialogimpl"
+	broken+="|tst_qmlimportscanner|tst_qqmlextensionplugin"
+	ctest -E "($broken)"
 }
 
 qt6-declarative-tools_package() {
@@ -60,11 +77,14 @@ qt6-declarative-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/libQt6QuickTest.so.*"
 		vmove usr/lib/qt6/qml/QtTest
 		vmove usr/lib/qt6/bin/qmltestrunner
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From 7cd2db706780ebbfaea70d1bb69e71923aff5d03 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:07 +0700
Subject: [PATCH 04/37] qt6-imageformats: update to 6.3.1.

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

diff --git a/srcpkgs/qt6-imageformats/template b/srcpkgs/qt6-imageformats/template
index eaca95243c48..9f6d2fb66776 100644
--- a/srcpkgs/qt6-imageformats/template
+++ b/srcpkgs/qt6-imageformats/template
@@ -1,10 +1,9 @@
 # Template file for 'qt6-imageformats'
 pkgname=qt6-imageformats
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qtimageformats-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr"
 hostmakedepends="perl qt6-base-devel"
 makedepends="qt6-base-devel"
 short_desc="Cross-platform application and UI framework - imageformats"
@@ -12,4 +11,4 @@ maintainer="John <me@johnnynator.dev>"
 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=025d0d17ed75b42a7eb6b523731ab8f17025421a8810cade25caffe05d93abef
+checksum=ad0312b8dfbbb67f729bfadbfcd47246ee4a128b717731ba158c41d01fde212f

From ec5ecd44b901015385bcd33b7c7b5cbf880a4531 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:07 +0700
Subject: [PATCH 05/37] qt6-location: update to 6.3.1.

---
 srcpkgs/qt6-location/template | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/qt6-location/template b/srcpkgs/qt6-location/template
index b7397f5f8942..9f26103259ad 100644
--- a/srcpkgs/qt6-location/template
+++ b/srcpkgs/qt6-location/template
@@ -1,10 +1,9 @@
 # Template file for 'qt6-location'
 pkgname=qt6-location
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qtpositioning-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr"
 hostmakedepends="perl qt6-base-devel qt6-declarative-devel"
 makedepends="qt6-serialport-devel qt6-declarative-devel GConf-devel"
 short_desc="Cross-platform application and UI framework - location"
@@ -12,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 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=e9ed50f6b245a346db34d625d0012774ef0ec8e7fd65037127ec26758708236e
+checksum=06788e4ecae1920094b30e4046f0abd23c8189d8a51e9c939b02f0b6abe2e86c
 
 qt6-location-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel>=${version}_1"
@@ -20,8 +19,11 @@ qt6-location-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From db570661ed5fb021ddb9f4df4d57075cd0a4fe2c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:08 +0700
Subject: [PATCH 06/37] qt6-lottie: update to 6.3.1.

---
 srcpkgs/qt6-lottie/template | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/qt6-lottie/template b/srcpkgs/qt6-lottie/template
index 1c97cd5f4f32..a7beb62ec368 100644
--- a/srcpkgs/qt6-lottie/template
+++ b/srcpkgs/qt6-lottie/template
@@ -1,10 +1,9 @@
 # Template file for 'qt6-lottie'
 pkgname=qt6-lottie
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qtlottie-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr"
 hostmakedepends="perl qt6-base-devel"
 makedepends="qt6-declarative-devel"
 short_desc="Cross-platform application and UI framework - lottie"
@@ -12,10 +11,10 @@ maintainer="John <me@johnnynator.dev>"
 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=39db570bbba5b527a1eb6a5774bed47398ace2f7217bbf45b1194ada6cf97deb
+checksum=740ba76999124d5e1a85ef3d01c69976bb8557862b6b26bf48b357fe0cab1cf5
 
 if [ "$XBPS_CHECK_PKGS" ]; then
-	configure_args+=" -DQT_BUILD_TESTS=ON"
+	configure_args="-DQT_BUILD_TESTS=ON"
 fi
 
 pre_check() {
@@ -28,8 +27,10 @@ qt6-lottie-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
 		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From 1e749c53530936b63830e513f148949e69319d8e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:08 +0700
Subject: [PATCH 07/37] qt6-networkauth: update to 6.3.1.

---
 srcpkgs/qt6-networkauth/template | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/qt6-networkauth/template b/srcpkgs/qt6-networkauth/template
index e934beada9b0..1454ceb4a525 100644
--- a/srcpkgs/qt6-networkauth/template
+++ b/srcpkgs/qt6-networkauth/template
@@ -1,10 +1,9 @@
 # Template file for 'qt6-networkauth'
 pkgname=qt6-networkauth
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qtnetworkauth-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr"
 hostmakedepends="perl qt6-base-devel"
 makedepends="qt6-base-devel"
 short_desc="Cross-platform application and UI framework - networkauth"
@@ -12,10 +11,10 @@ maintainer="John <me@johnnynator.dev>"
 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=203a98942919028520038f90a20cd7ee32b537233545d11e429c3e2c1ad9069f
+checksum=d60f54b9d4509fa8bdbf1990bc91f6e260e38cdb57a7b8119fa3861bc5d2fb2a
 
 if [ "$XBPS_CHECK_PKGS" ]; then
-	configure_args+=" -DQT_BUILD_TESTS=ON"
+	configure_args="-DQT_BUILD_TESTS=ON"
 fi
 
 qt6-networkauth-devel_package() {
@@ -24,8 +23,11 @@ qt6-networkauth-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From 2434dccca8a117bc62d46f33a60b96b7432c9d42 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:08 +0700
Subject: [PATCH 08/37] qt6-qt5compat: update to 6.3.1.

---
 srcpkgs/qt6-qt5compat/template | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/qt6-qt5compat/template b/srcpkgs/qt6-qt5compat/template
index 7fcd5ad5080e..a62573cfabfa 100644
--- a/srcpkgs/qt6-qt5compat/template
+++ b/srcpkgs/qt6-qt5compat/template
@@ -1,10 +1,9 @@
 # Template file for 'qt6-qt5compat'
 pkgname=qt6-qt5compat
-version=6.3.0
-revision=2
+version=6.3.1
+revision=1
 wrksrc="qt5compat-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr"
 hostmakedepends="qt6-base-devel qt6-declarative-devel perl pkg-config"
 makedepends="qt6-base-devel qt6-declarative-devel"
 short_desc="Cross-platform application and UI framework - Qt5 Compatibilty Component"
@@ -12,10 +11,10 @@ maintainer="John <me@johnnynator.dev>"
 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=2b199be780c50d9214512b922d94cb240b0412fd63f459e356b76102cad1713e
+checksum=a43ec62bd778eaecf88ad7847118d1c2a471b0fcb820f93beb311d7ab9566cfd
 
 if [ "$XBPS_CHECK_PKGS" ]; then
-	configure_args+=" -DQT_BUILD_TESTS=ON"
+	configure_args="-DQT_BUILD_TESTS=ON"
 fi
 
 qt6-qt5compat-devel_package() {
@@ -24,8 +23,11 @@ qt6-qt5compat-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From 8baa5c7324b04548464a2d18ed1d12d472eb2d84 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:08 +0700
Subject: [PATCH 09/37] qt6-quick3d: update to 6.3.1.

---
 srcpkgs/qt6-quick3d/template | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/qt6-quick3d/template b/srcpkgs/qt6-quick3d/template
index 0f7ef336a3ff..685ce9bc0e90 100644
--- a/srcpkgs/qt6-quick3d/template
+++ b/srcpkgs/qt6-quick3d/template
@@ -1,19 +1,23 @@
 # Template file for 'qt6-quick3d'
 pkgname=qt6-quick3d
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qtquick3d-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr "
 hostmakedepends="perl qt6-base-devel qt6-declarative-devel qt6-shadertools-devel"
 makedepends="qt6-base-devel qt6-declarative-devel qt6-shadertools-devel
- libassimp-devel"
+ qt6-quicktimeline libassimp-devel"
 short_desc="Cross-platform application and UI framework - Quick3d"
 maintainer="John <me@johnnynator.dev>"
 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=0ad05bd1ee1f784b18220a2d2625ee8de91662c88fdc7b798662953d86eb327e
+checksum=2fa766ee47b8c07412b3b755206ada0715fb07813b64ed069e7205044c061256
+
+if [ "$CROSS_BUILD" ]; then
+	hostmakedepends+=" qt6-quick3d-devel"
+	configure_args="-DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true"
+fi
 
 if [ "$XBPS_TARGET_ENDIAN" = "be" ]; then
 	# possibly a qt6-shadertools bug, actually
@@ -26,9 +30,12 @@ qt6-quick3d-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
-		vmove usr/lib/qt6/mkspecs
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/bin
+		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From f795f480e90fd073de895d8386b5da0ec3ce4fbc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:09 +0700
Subject: [PATCH 10/37] qt6-quicktimeline: update to 6.3.1.

---
 common/shlibs                      | 1 +
 srcpkgs/qt6-quicktimeline/template | 7 +++----
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 61924610cc52..26f10d604be9 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2045,6 +2045,7 @@ libQt6Quick3DIblBaker.so.6 qt6-quick3d-6.0.3_1
 libQt6Quick3DParticles.so.6 qt6-quick3d-6.1.0_1
 libQt6Quick3DGlslParser.so.6 qt6-quick3d-6.3.0_1
 libQt6Quick3DAssetUtils.so.6 qt6-quick3d-6.1.0_1
+libQt6QuickTimeline.so.6 qt6-quicktimeline-6.3.0_1
 libQt6QuickControls2Impl.so.6 qt6-declarative-6.0.0_1
 libQt6QuickControls2.so.6 qt6-declarative-6.0.0_1
 libQt6QuickTemplates2.so.6 qt6-declarative-6.0.0_1
diff --git a/srcpkgs/qt6-quicktimeline/template b/srcpkgs/qt6-quicktimeline/template
index 15aa7a8e5819..bf02e043c4a5 100644
--- a/srcpkgs/qt6-quicktimeline/template
+++ b/srcpkgs/qt6-quicktimeline/template
@@ -1,10 +1,9 @@
 # Template file for 'qt6-quicktimeline'
 pkgname=qt6-quicktimeline
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qtquicktimeline-everywhere-src-${version/rc/-rc}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr "
 hostmakedepends="perl qt6-base-devel qt6-declarative-devel"
 makedepends="qt6-base-devel qt6-declarative-devel"
 short_desc="Cross-platform application and UI framework - quicktimeline"
@@ -12,10 +11,10 @@ maintainer="John <me@johnnynator.dev>"
 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=9ff0a931159efc6be5bd9f8a1e4a16a70e2dab37cf22ad85c6d330ccfdf31c1a
+checksum=58a13cf0ce8e7755639f20684078733af24f5a317f6ddb40d6079c8c5a28ebbe
 
 if [ "$XBPS_CHECK_PKGS" ]; then
-	configure_args+=" -DQT_BUILD_TESTS=ON"
+	configure_args="-DQT_BUILD_TESTS=ON"
 fi
 
 pre_check() {

From 6e0ecefa90b22d3c7f4e598c8e756e86fa490d5d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:09 +0700
Subject: [PATCH 11/37] qt6-scxml: update to 6.3.1.

---
 srcpkgs/qt6-scxml/template | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/qt6-scxml/template b/srcpkgs/qt6-scxml/template
index 112baca0ab83..d17ccf16400a 100644
--- a/srcpkgs/qt6-scxml/template
+++ b/srcpkgs/qt6-scxml/template
@@ -1,10 +1,10 @@
 # Template file for 'qt6-scxml'
 pkgname=qt6-scxml
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qtscxml-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr"
+configure_args="-DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true"
 hostmakedepends="perl qt6-declarative-devel"
 makedepends="qt6-declarative-devel"
 short_desc="Cross-platform application and UI framework - scxml"
@@ -12,7 +12,11 @@ maintainer="John <me@johnnynator.dev>"
 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=09b0dbd6ac367920fb1ba96a39dcd4c9d33eb0820dcc79538992825d588a70f0
+checksum=01bc154d6163d1f049f4e1e76658a044730ace7b0a5be35c9a46fcd1396f8619
+
+if [ "$CROSS_BUILD" ]; then
+	hostmakedepends+=" qt6-remoteobjects"
+fi
 
 if [ "$XBPS_CHECK_PKGS" ]; then
 	configure_args+=" -DQT_BUILD_TESTS=ON"
@@ -24,8 +28,11 @@ qt6-scxml-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From fd6e41c59d9aea9596d9dc512263a7ba58b6a3c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:09 +0700
Subject: [PATCH 12/37] qt6-serialport: update to 6.3.1.

---
 srcpkgs/qt6-serialport/template | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/qt6-serialport/template b/srcpkgs/qt6-serialport/template
index 0804671ca57b..2de9d6364a5c 100644
--- a/srcpkgs/qt6-serialport/template
+++ b/srcpkgs/qt6-serialport/template
@@ -1,10 +1,9 @@
 # Template file for 'qt6-serialport'
 pkgname=qt6-serialport
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qtserialport-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr"
 hostmakedepends="perl qt6-base-devel pkg-config"
 makedepends="qt6-base-devel"
 short_desc="Cross-platform application and UI framework - serialport"
@@ -12,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 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=eebd6934d48cc044b8c87795a4fd91bb81f7195d4b5a2ddb12802f343d5db64f
+checksum=4eb6d80e65799dd2e0318df4dfba14173c1929e861718cda9bedca24253b616e
 
 qt6-serialport-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel>=${version}_1"
@@ -20,8 +19,11 @@ qt6-serialport-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From 6367306cdd254c8399ea6520278ca96907dd6a11 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:09 +0700
Subject: [PATCH 13/37] qt6-shadertools: update to 6.3.1.

---
 srcpkgs/qt6-shadertools/template | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/qt6-shadertools/template b/srcpkgs/qt6-shadertools/template
index 9c1ec210a96a..3716333c459b 100644
--- a/srcpkgs/qt6-shadertools/template
+++ b/srcpkgs/qt6-shadertools/template
@@ -1,10 +1,9 @@
 # Template file for 'qt6-shadertools'
 pkgname=qt6-shadertools
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qtshadertools-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr "
 hostmakedepends="perl qt6-base-devel"
 makedepends="qt6-base-devel"
 short_desc="Cross-platform application and UI framework - shadertools"
@@ -12,7 +11,13 @@ maintainer="John <me@johnnynator.dev>"
 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=5498959b9d37c254bd126ab1320cf86aeb8a31b3ea7e51db666a8f9698afbd6c
+checksum=59b77176961528cc7b0c9325134655e273aa87b4cb386c0f4683d8f2852e435a
+
+if [ "$CROSS_BUILD" ]; then
+	configure_args="-DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true"
+	hostmakedepends+=" qt6-shadertools-devel"
+fi
+
 
 qt6-shadertools-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel>=${version}_1"
@@ -20,8 +25,11 @@ qt6-shadertools-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From 326eb9d92fe8783229193833b6461bc26b5a160b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:09 +0700
Subject: [PATCH 14/37] qt6-svg: update to 6.3.1.

---
 srcpkgs/qt6-svg/template | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/qt6-svg/template b/srcpkgs/qt6-svg/template
index aa8e6b745109..309b0988e435 100644
--- a/srcpkgs/qt6-svg/template
+++ b/srcpkgs/qt6-svg/template
@@ -1,10 +1,9 @@
 # Template file for 'qt6-svg'
 pkgname=qt6-svg
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qtsvg-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr "
 hostmakedepends="qt6-base-devel perl"
 makedepends="qt6-base-devel"
 short_desc="Cross-platform application and UI framework (QT6) - qt6-svg component"
@@ -12,10 +11,10 @@ maintainer="John <me@johnnynator.dev>"
 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=3164504d7e3f640439308235739b112605ab5fc9cc517ca0b28f9fb93a8db0e3
+checksum=7b19f418e6f7b8e23344082dd04440aacf5da23c5a73980ba22ae4eba4f87df7
 
 if [ "$XBPS_CHECK_PKGS" ]; then
-	configure_args+=" -DQT_BUILD_TESTS=ON"
+	configure_args="-DQT_BUILD_TESTS=ON"
 fi
 
 do_check() {
@@ -29,8 +28,11 @@ qt6-svg-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From 8409f900c37eb42b551bdf87ad83101667c39efe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:10 +0700
Subject: [PATCH 15/37] qt6-tools: update to 6.3.1.

---
 srcpkgs/qt6-tools/template | 23 ++++++++++++++++++-----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/qt6-tools/template b/srcpkgs/qt6-tools/template
index f875dff5c046..fd311176e31d 100644
--- a/srcpkgs/qt6-tools/template
+++ b/srcpkgs/qt6-tools/template
@@ -1,23 +1,33 @@
 # Template file for 'qt6-tools'
 pkgname=qt6-tools
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qttools-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr "
-hostmakedepends="qt6-base-devel perl"
-makedepends="qt6-base-devel libatomic-devel"
+configure_args="-DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=TRUE
+ -DQT_BUILD_SHARED_LIBS=ON -DQT_FEATURE_assistant=ON"
+hostmakedepends="qt6-base-devel perl qt6-plugin-sqlite"
+makedepends="qt6-base-devel libatomic-devel qt6-plugin-sqlite"
 short_desc="Cross-platform application and UI framework (QT6) - qt6-tools component"
 maintainer="John <me@johnnynator.dev>"
 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/qttools-everywhere-src-${version}.tar.xz"
-checksum=fce94688ea925782a2879347584991f854630daadba6c52aed6d93e33cd0b19c
+checksum=c412750f2aa3beb93fce5f30517c607f55daaeb7d0407af206a8adf917e126c1
+
+if [ "$CROSS_BUILD" ]; then
+	hostmakedepends+=" qt6-tools-devel"
+fi
+
 
 if [ "$XBPS_CHECK_PKGS" ]; then
 	configure_args+=" -DQT_BUILD_TESTS=ON"
 fi
 
+post_build() {
+	ninja -C build ${makejobs} lib/qt6/libexec/qhelpgenerator
+}
+
 do_check() {
 	cd build
 	# Some of these tests expect that qt6-tools is already
@@ -31,8 +41,11 @@ qt6-tools-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From 4ecbb5f9e623ef2b18a02ea3859e5bf528f35984 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:10 +0700
Subject: [PATCH 16/37] qt6-translations: update to 6.3.1.

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

diff --git a/srcpkgs/qt6-translations/template b/srcpkgs/qt6-translations/template
index be0a74ca74e2..1b917ccb3620 100644
--- a/srcpkgs/qt6-translations/template
+++ b/srcpkgs/qt6-translations/template
@@ -1,10 +1,9 @@
 # Template file for 'qt6-translations'
 pkgname=qt6-translations
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qttranslations-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr "
 hostmakedepends="qt6-base-devel qt6-tools-devel perl"
 makedepends="qt6-base-devel qt6-tools-devel"
 short_desc="Cross-platform application and UI framework - translations"
@@ -12,4 +11,4 @@ maintainer="John <me@johnnynator.dev>"
 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=e4dd4ef892a34a9514a19238f189a33ed85c76f31dcad6599ced93b1e33440b3
+checksum=d7bdd55e2908ded901dcc262157100af2a490bf04d31e32995f6d91d78dfdb97

From 822c78e72370528a8e91f49bd8d6337d55efe00e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:10 +0700
Subject: [PATCH 17/37] qt6-virtualkeyboard: update to 6.3.1.

---
 srcpkgs/qt6-virtualkeyboard/template | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/qt6-virtualkeyboard/template b/srcpkgs/qt6-virtualkeyboard/template
index 67ecef145ea1..77a247400b97 100644
--- a/srcpkgs/qt6-virtualkeyboard/template
+++ b/srcpkgs/qt6-virtualkeyboard/template
@@ -1,10 +1,9 @@
 # Template file for 'qt6-virtualkeyboard'
 pkgname=qt6-virtualkeyboard
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qtvirtualkeyboard-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr"
 hostmakedepends="perl pkg-config qt6-declarative-devel"
 makedepends="qt6-declarative-devel qt6-svg-devel hunspell-devel"
 short_desc="Cross-platform application and UI framework - virtualkeyboard"
@@ -12,10 +11,10 @@ maintainer="John <me@johnnynator.dev>"
 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=89aaf15acf5432af8f5cf4ec45cb32d87a3348906215dd56e81cb294eb276573
+checksum=5fe089b204d859ab0dd0169f811f2e30cae7c5cb36f8ab95ca36883f1fc0c2b8
 
 if [ "$XBPS_CHECK_PKGS" ]; then
-	configure_args+=" -DQT_BUILD_TESTS=ON"
+	configure_args="-DQT_BUILD_TESTS=ON"
 fi
 
 do_check() {
@@ -32,8 +31,11 @@ qt6-virtualkeyboard-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From c3f6c3e84e4d92d34964d8c9d3d07a4ca53b3cda Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:10 +0700
Subject: [PATCH 18/37] qt6-wayland: update to 6.3.1.

---
 srcpkgs/qt6-wayland/template | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/qt6-wayland/template b/srcpkgs/qt6-wayland/template
index b71a273009b9..784cb42a1a03 100644
--- a/srcpkgs/qt6-wayland/template
+++ b/srcpkgs/qt6-wayland/template
@@ -1,13 +1,15 @@
 # Template file for 'qt6-wayland'
 pkgname=qt6-wayland
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qtwayland-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true"
-hostmakedepends="qt6-base-devel perl pkg-config wayland-devel qt6-wayland-devel"
+configure_args="-DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true"
+hostmakedepends="qt6-base-devel perl pkg-config wayland-devel
+ qt6-declarative-devel qt6-wayland-devel"
 # XXX: Qml as optional dep
 makedepends="qt6-base-devel wayland-devel libxkbcommon-devel
+ qt6-declarative-devel
  libXcomposite-devel MesaLib-devel Vulkan-Headers libdrm-devel"
 checkdepends="dbus mesa-dri"
 short_desc="Cross-platform application and UI framework - Wayland"
@@ -15,7 +17,7 @@ maintainer="John <me@johnnynator.dev>"
 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=e7b567f6e43ffc5918d4aa825ce1eced66a00cb0a87133b2912ba5c1b2a02190
+checksum=6f14fea2d172a5b4170be3efcb0e58535f6605b61bcd823f6d5c9d165bb8c0f0
 
 if [ "$XBPS_CHECK_PKGS" ]; then
 	configure_args+=" -DQT_BUILD_TESTS=ON"
@@ -32,9 +34,11 @@ qt6-wayland-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
-		vmove usr/lib/qt6/libexec/qtwaylandscanner
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From 1daf1132c7b4e0d10374c5a1494adf1c4e296ee1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:10 +0700
Subject: [PATCH 19/37] qt6-websockets: update to 6.3.1.

---
 srcpkgs/qt6-websockets/template | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/qt6-websockets/template b/srcpkgs/qt6-websockets/template
index c2e674aacb31..4875af093432 100644
--- a/srcpkgs/qt6-websockets/template
+++ b/srcpkgs/qt6-websockets/template
@@ -1,10 +1,9 @@
 # Template file for 'qt6-websockets'
 pkgname=qt6-websockets
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qtwebsockets-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr"
 hostmakedepends="perl qt6-base-devel qt6-declarative-devel"
 makedepends="qt6-base-devel qt6-declarative-devel"
 short_desc="Cross-platform application and UI framework - websockets"
@@ -12,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 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=e018a09fe960b7d9560d6bbc9d3ca022fed6566e6ba6fc6d869a97482d4e6361
+checksum=9f980d90c97fcbde1b50c773f6dc580cfdf8c36ce14a1be3aa2ccadfe605121a
 
 qt6-websockets-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel>=${version}_1"
@@ -20,8 +19,11 @@ qt6-websockets-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From 87f0ee8a5b8b3b86dbabf9b84f22426244579d3c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Tue, 9 Aug 2022 20:16:47 +0700
Subject: [PATCH 20/37] qt6-3d: update to 6.3.1.

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

diff --git a/srcpkgs/qt6-3d/template b/srcpkgs/qt6-3d/template
index 666f57559532..c08c3bd4a41b 100644
--- a/srcpkgs/qt6-3d/template
+++ b/srcpkgs/qt6-3d/template
@@ -1,10 +1,9 @@
 # Template file for 'qt6-3d'
 pkgname=qt6-3d
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qt3d-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr"
 hostmakedepends="perl qt6-declarative-devel"
 makedepends="qt6-declarative-devel qt6-shadertools-devel libassimp-devel
  libatomic-devel"
@@ -13,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 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=74e762380dad34887878b9124dbfb981d5cf4b8b807281ff8bff311145b54de1
+checksum=9919b66dfb253fa26db1a7d664358cbc07f46c8810082ee3120d0a54b153edfe
 
 qt6-3d-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 41527795a4198e5daa0b30567f80ac6835497c75 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:11 +0700
Subject: [PATCH 21/37] New package: qt6-webchannel-6.3.1

---
 srcpkgs/qt6-webchannel-devel    |  1 +
 srcpkgs/qt6-webchannel/template | 32 ++++++++++++++++++++++++++++++++
 srcpkgs/qt6-webchannel/update   |  1 +
 3 files changed, 34 insertions(+)
 create mode 120000 srcpkgs/qt6-webchannel-devel
 create mode 100644 srcpkgs/qt6-webchannel/template
 create mode 100644 srcpkgs/qt6-webchannel/update

diff --git a/srcpkgs/qt6-webchannel-devel b/srcpkgs/qt6-webchannel-devel
new file mode 120000
index 000000000000..03e8b23d785d
--- /dev/null
+++ b/srcpkgs/qt6-webchannel-devel
@@ -0,0 +1 @@
+qt6-webchannel
\ No newline at end of file
diff --git a/srcpkgs/qt6-webchannel/template b/srcpkgs/qt6-webchannel/template
new file mode 100644
index 000000000000..432c42bcc056
--- /dev/null
+++ b/srcpkgs/qt6-webchannel/template
@@ -0,0 +1,32 @@
+# Template file for 'qt6-webchannel'
+pkgname=qt6-webchannel
+version=6.3.1
+revision=1
+wrksrc="qtwebchannel-everywhere-src-${version}"
+build_style=cmake
+hostmakedepends="perl qt6-base-devel qt6-declarative-devel"
+makedepends="qt6-base-devel qt6-declarative-devel qt6-websockets-devel"
+short_desc="Cross-platform application and UI framework - webchannel"
+maintainer="John <me@johnnynator.dev>"
+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=aaa20ac23f86992721b7ee487c379a3fd68caa8cdcea0a77a37e0d8b47ff2668
+
+qt6-webchannel-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel>=${version}_1
+	 qt6-websockets-devel>=${version}_1"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
+		vmove usr/lib/qt6/mkspecs
+		vmove usr/lib/qt6/qml/QtWebChannel/plugins.qmltypes
+		vmove usr/lib/qt6/qml/QtWebChannel/qmldir
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
+	}
+}
diff --git a/srcpkgs/qt6-webchannel/update b/srcpkgs/qt6-webchannel/update
new file mode 100644
index 000000000000..844552465222
--- /dev/null
+++ b/srcpkgs/qt6-webchannel/update
@@ -0,0 +1 @@
+pkgname="${pkgname/6-/}-everywhere-src"

From eb4fca23225607da3b104a0e74d9419e0388c87a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:11 +0700
Subject: [PATCH 22/37] New package: qt6-multimedia-6.3.1

---
 common/shlibs                   |  3 +++
 srcpkgs/qt6-multimedia-devel    |  1 +
 srcpkgs/qt6-multimedia/template | 33 +++++++++++++++++++++++++++++++++
 srcpkgs/qt6-multimedia/update   |  1 +
 4 files changed, 38 insertions(+)
 create mode 120000 srcpkgs/qt6-multimedia-devel
 create mode 100644 srcpkgs/qt6-multimedia/template
 create mode 100644 srcpkgs/qt6-multimedia/update

diff --git a/common/shlibs b/common/shlibs
index 26f10d604be9..ce04cc1ad2cf 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2078,6 +2078,9 @@ libQt6SerialPort.so.6 qt6-serialport-6.2.0alpha_1
 libQt6WebSockets.so.6 qt6-websockets-6.2.0alpha_1
 libQt6WebChannel.so.6 qt6-webchannel-6.2.0alpha_1
 libQt6Positioning.so.6 qt6-location-6.2.0alpha_1
+libQt6MultimediaWidgets.so.6 qt6-multimedia-6.3.1_1
+libQt6MultimediaQuick.so.6 qt6-multimedia-6.3.1_1
+libQt6Multimedia.so.6 qt6-multimedia-6.3.1_1
 libnpth.so.0 npth-1.1_1
 libnpupnp.so.4 libnpupnp-4.0.2_1
 libglfw.so.3 glfw-3.0.4_1
diff --git a/srcpkgs/qt6-multimedia-devel b/srcpkgs/qt6-multimedia-devel
new file mode 120000
index 000000000000..9343446502d0
--- /dev/null
+++ b/srcpkgs/qt6-multimedia-devel
@@ -0,0 +1 @@
+qt6-multimedia
\ No newline at end of file
diff --git a/srcpkgs/qt6-multimedia/template b/srcpkgs/qt6-multimedia/template
new file mode 100644
index 000000000000..535a2f55ffe4
--- /dev/null
+++ b/srcpkgs/qt6-multimedia/template
@@ -0,0 +1,33 @@
+# Template file for 'qt6-multimedia'
+pkgname=qt6-multimedia
+version=6.3.1
+revision=1
+wrksrc="qtmultimedia-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DQT_FEATURE_gstreamer=ON"
+hostmakedepends="perl qt6-declarative-devel pkg-config
+ qt6-shadertools-devel"
+makedepends="qt6-declarative-devel
+ qt6-shadertools-devel libglib-devel gst-plugins-base1-devel"
+short_desc="Cross-platform application and UI framework - multimedia"
+maintainer="John <me@johnnynator.dev>"
+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=7e03242aadd634ff2d9fcf08948290f03da3d9a5012369d908da89f82b1d7336
+
+qt6-multimedia-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel>=${version}_1"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
+		vmove usr/lib/qt6/mkspecs
+		vmove usr/lib/qt6/qml/QtMultimedia/plugins.qmltypes
+		vmove usr/lib/qt6/qml/QtMultimedia/qmldir
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}
diff --git a/srcpkgs/qt6-multimedia/update b/srcpkgs/qt6-multimedia/update
new file mode 100644
index 000000000000..844552465222
--- /dev/null
+++ b/srcpkgs/qt6-multimedia/update
@@ -0,0 +1 @@
+pkgname="${pkgname/6-/}-everywhere-src"

From 196c8630974ce7fa21d939528af452aaaf7a6acb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 18:22:48 +0700
Subject: [PATCH 23/37] New package: qt6-connectivity-6.3.1

---
 common/shlibs                     |  2 ++
 srcpkgs/qt6-connectivity-devel    |  1 +
 srcpkgs/qt6-connectivity/template | 30 ++++++++++++++++++++++++++++++
 3 files changed, 33 insertions(+)
 create mode 120000 srcpkgs/qt6-connectivity-devel
 create mode 100644 srcpkgs/qt6-connectivity/template

diff --git a/common/shlibs b/common/shlibs
index ce04cc1ad2cf..2e95a22119ab 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2072,6 +2072,8 @@ libQt6Designer.so.6 qt6-tools-6.1.0_1
 libQt6DesignerComponents.so.6 qt6-tools-6.1.0_1
 libQt6Help.so.6 qt6-tools-6.1.0_1
 libQt6UiTools.so.6 qt6-tools-6.1.0_1
+libQt6Nfc.so.6 qt6-connectivity-6.3.1_1
+libQt6Bluetooth.so.6 qt6-connectivity-6.3.1_1
 libQt6HunspellInputMethod.so.6 qt6-virtualkeyboard-6.1.0_1
 libQt6VirtualKeyboard.so.6 qt6-virtualkeyboard-6.1.0_1
 libQt6SerialPort.so.6 qt6-serialport-6.2.0alpha_1
diff --git a/srcpkgs/qt6-connectivity-devel b/srcpkgs/qt6-connectivity-devel
new file mode 120000
index 000000000000..478cc9d8aa39
--- /dev/null
+++ b/srcpkgs/qt6-connectivity-devel
@@ -0,0 +1 @@
+qt6-connectivity
\ No newline at end of file
diff --git a/srcpkgs/qt6-connectivity/template b/srcpkgs/qt6-connectivity/template
new file mode 100644
index 000000000000..6cb61744d0cb
--- /dev/null
+++ b/srcpkgs/qt6-connectivity/template
@@ -0,0 +1,30 @@
+# Template file for 'qt6-connectivity'
+pkgname=qt6-connectivity
+version=6.3.1
+revision=1
+wrksrc="qtconnectivity-everywhere-src-${version}"
+build_style=cmake
+hostmakedepends="perl qt6-declarative-devel"
+makedepends="qt6-declarative-devel"
+short_desc="Cross-platform application and UI framework - Connectivity"
+maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
+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=b25ce4710a9c61bc6a5dbaeeb3e2ed907a8bc85478fdb2ab4312297768b695b0
+
+qt6-connectivity-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}
+	 qt6-declarative>=${version}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
+		vmove usr/lib/qt6/mkspecs
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
+	}
+}

From f39a10d6be6cc05fb737eb9af597b23a70819eb5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 18:22:57 +0700
Subject: [PATCH 24/37] New package: qt6-sensors-6.3.1

---
 common/shlibs                |  2 ++
 srcpkgs/qt6-sensors-devel    |  1 +
 srcpkgs/qt6-sensors/template | 31 +++++++++++++++++++++++++++++++
 3 files changed, 34 insertions(+)
 create mode 120000 srcpkgs/qt6-sensors-devel
 create mode 100644 srcpkgs/qt6-sensors/template

diff --git a/common/shlibs b/common/shlibs
index 2e95a22119ab..157b51f3f981 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2074,6 +2074,8 @@ libQt6Help.so.6 qt6-tools-6.1.0_1
 libQt6UiTools.so.6 qt6-tools-6.1.0_1
 libQt6Nfc.so.6 qt6-connectivity-6.3.1_1
 libQt6Bluetooth.so.6 qt6-connectivity-6.3.1_1
+libQt6Sensors.so.6 qt6-sensors-6.3.1_1
+libQt6SensorsQuick.so.6 qt6-sensors-6.3.1_1
 libQt6HunspellInputMethod.so.6 qt6-virtualkeyboard-6.1.0_1
 libQt6VirtualKeyboard.so.6 qt6-virtualkeyboard-6.1.0_1
 libQt6SerialPort.so.6 qt6-serialport-6.2.0alpha_1
diff --git a/srcpkgs/qt6-sensors-devel b/srcpkgs/qt6-sensors-devel
new file mode 120000
index 000000000000..eb9457f04055
--- /dev/null
+++ b/srcpkgs/qt6-sensors-devel
@@ -0,0 +1 @@
+qt6-sensors
\ No newline at end of file
diff --git a/srcpkgs/qt6-sensors/template b/srcpkgs/qt6-sensors/template
new file mode 100644
index 000000000000..5a81f43b60eb
--- /dev/null
+++ b/srcpkgs/qt6-sensors/template
@@ -0,0 +1,31 @@
+# Template file for 'qt6-sensors'
+pkgname=qt6-sensors
+version=6.3.1
+revision=1
+wrksrc="qtsensors-everywhere-src-${version}"
+build_style=cmake
+hostmakedepends="perl qt6-declarative-devel qt6-svg-devel pkg-config"
+makedepends="qt6-declarative-devel qt6-svg-devel"
+short_desc="Cross-platform application and UI framework - Sensors"
+maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
+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=4b240b59edba9a42b4735758a25f279a26841b982864e7b38f6ef0b81e0d60cc
+
+qt6-sensors-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}
+	 qt6-declarative-devel>=${version}_1"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
+		vmove usr/lib/qt6/mkspecs
+		vmove usr/lib/qt6/qml/QtSensors/plugins.qmltypes
+		vmove usr/lib/qt6/qml/QtSensors/qmldir
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}

From f5432c961d4c9e191c7bc92a51cf50485fa918ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 18:23:08 +0700
Subject: [PATCH 25/37] New package: qt6-remoteobjects-6.3.1

---
 common/shlibs                      |  2 ++
 srcpkgs/qt6-remoteobjects-devel    |  1 +
 srcpkgs/qt6-remoteobjects/template | 36 ++++++++++++++++++++++++++++++
 3 files changed, 39 insertions(+)
 create mode 120000 srcpkgs/qt6-remoteobjects-devel
 create mode 100644 srcpkgs/qt6-remoteobjects/template

diff --git a/common/shlibs b/common/shlibs
index 157b51f3f981..91f197e54c93 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2074,6 +2074,8 @@ libQt6Help.so.6 qt6-tools-6.1.0_1
 libQt6UiTools.so.6 qt6-tools-6.1.0_1
 libQt6Nfc.so.6 qt6-connectivity-6.3.1_1
 libQt6Bluetooth.so.6 qt6-connectivity-6.3.1_1
+libQt6RemoteObjects.so.6 qt6-remoteobjects-6.3.1_1
+libQt6RemoteObjectsQml.so.6 qt6-remoteobjects-6.3.1_1
 libQt6Sensors.so.6 qt6-sensors-6.3.1_1
 libQt6SensorsQuick.so.6 qt6-sensors-6.3.1_1
 libQt6HunspellInputMethod.so.6 qt6-virtualkeyboard-6.1.0_1
diff --git a/srcpkgs/qt6-remoteobjects-devel b/srcpkgs/qt6-remoteobjects-devel
new file mode 120000
index 000000000000..2a027f95266f
--- /dev/null
+++ b/srcpkgs/qt6-remoteobjects-devel
@@ -0,0 +1 @@
+qt6-remoteobjects
\ No newline at end of file
diff --git a/srcpkgs/qt6-remoteobjects/template b/srcpkgs/qt6-remoteobjects/template
new file mode 100644
index 000000000000..71d2d31967b6
--- /dev/null
+++ b/srcpkgs/qt6-remoteobjects/template
@@ -0,0 +1,36 @@
+# Template file for 'qt6-remoteobjects'
+pkgname=qt6-remoteobjects
+version=6.3.1
+revision=1
+wrksrc="qtremoteobjects-everywhere-src-${version}"
+build_style=cmake
+hostmakedepends="perl qt6-declarative-devel pkg-config"
+makedepends="qt6-declarative-devel"
+short_desc="Cross-platform application and UI framework - Remote Objects"
+maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
+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=ea6d038b11c60981de0bd39a6091a59abf7d031e37bfc592b31be1217bef4ca6
+
+if [ "$CROSS_BUILD" ]; then
+	hostmakedepends+=" qt6-remoteobjects"
+	configure_args="-DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true"
+fi
+
+qt6-remoteobjects-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}
+	 qt6-declarative-devel>=${version}_1"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
+		vmove usr/lib/qt6/mkspecs
+		vmove usr/lib/qt6/qml/QtRemoteObjects/plugins.qmltypes
+		vmove usr/lib/qt6/qml/QtRemoteObjects/qmldir
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}

From 0bef4c2f66d5d2a1de10dac2252aa422e67c04ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:11 +0700
Subject: [PATCH 26/37] New package: qt6-webengine-6.3.1.

---
 common/shlibs                                 |    7 +
 srcpkgs/qt6-webengine-devel                   |    1 +
 srcpkgs/qt6-webengine-examples                |    1 +
 .../patches/0001-None-no-debug.patch          |   11 +
 .../patches/0002-enable-ppc64.patch           |   20 +
 .../patches/0003-cross-hack.patch             |   10 +
 .../0004-ppc-disable-jxl-decoder.patch        |   13 +
 .../patches/0050-no-glibc-cmake-check.patch   |   14 +
 .../0100-chromium-sandbox-membarrier.patch    |   58 +
 .../qt6-webengine/patches/0101-size_t.patch   |   16 +
 .../0102-chromium-90-ruy-include.patch        |   19 +
 ...-v8-monotonic-pthread-cont_timedwait.patch |   22 +
 .../0104-chromium-revert-9d080c0.patch        |  162 +
 ...-chromium-revert-drop-of-system-java.patch |   15 +
 .../patches/0106-chromium-system-nodejs.patch |   20 +
 .../0107-chromium-cursed^Uscoped_file.patch   |   18 +
 .../0108-chromium-fix-narrowing-cast.patch    |   53 +
 .../0109-chromium-remove-strip_binary.patch   |   32 +
 ...ium-revert-use-ffile-compilation-dir.patch |   57 +
 ...11-chromium-no-Wno-stringop-overread.patch |   10 +
 .../0150-chromium-glibc-libc_malloc.patch     |   24 +
 ...-include-sys-reg.h-to-get-__WORDSIZE.patch |   21 +
 .../0201-chromium-musl-dispatch-to-musl.patch |  103 +
 .../0202-chromium-musl-no-mallinfo.patch      |   62 +
 .../0203-chromium-musl-siginfo_t.patch        |   18 +
 .../0204-chromium-musl-stackstart.patch       |   20 +
 .../patches/0205-chromium-musl-sandbox.patch  |   92 +
 ...0206-chromium-musl-default-stacksize.patch |   15 +
 .../patches/0208-chromium-musl-execinfo.patch |  125 +
 .../0209-chromium-musl-thread-stacksize.patch |   22 +
 .../0210-chromium-musl-msgvec-push_back.patch |   14 +
 ...ium-musl-canonicalize-file-name-musl.patch |   11 +
 .../0212-chromium-musl-no-getcontext.patch    |   29 +
 .../patches/0213-chromium-musl-crashpad.patch |   24 +
 .../patches/0214-chromium-musl-fixes.patch    |  108 +
 .../patches/0215-chromium-musl-cdefs.patch    |   29 +
 .../patches/0216-chromium-musl-stat.patch     |   12 +
 .../patches/0217-chromium-musl-resolver.patch |   77 +
 .../patches/0600-chromium-sndio.patch         |  876 ++++
 .../patches/0700-armv7l-neon.patch            |   10 +
 ...-chromium-musl-cross-no-asm_ptrace_h.patch |   30 +
 .../0751-chromium-musl-arm-user_vfp.patch     |   20 +
 .../0752-chromium-musl-arm-elf_auxv_t.patch   |   18 +
 ...0801-chromium-i686-vaapi-fpermissive.patch |   24 +
 .../patches/0900-xxx-ppc64le-libvpx.patch     |   65 +
 .../0901-xxx-ppc64le-sandbox-linux-stat.patch |   31 +
 .../patches/0902-xxx-ppc64le-support.patch    | 3556 +++++++++++++++++
 .../0903-xxx-ppc64le-swiftshader.patch        |   18 +
 .../patches/cross-build-examples.patch        |   16 +
 srcpkgs/qt6-webengine/template                |  178 +
 srcpkgs/qt6-webengine/update                  |    1 +
 51 files changed, 6208 insertions(+)
 create mode 120000 srcpkgs/qt6-webengine-devel
 create mode 120000 srcpkgs/qt6-webengine-examples
 create mode 100644 srcpkgs/qt6-webengine/patches/0001-None-no-debug.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0002-enable-ppc64.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0003-cross-hack.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0004-ppc-disable-jxl-decoder.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0050-no-glibc-cmake-check.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0100-chromium-sandbox-membarrier.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0101-size_t.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0102-chromium-90-ruy-include.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0103-chromium-v8-monotonic-pthread-cont_timedwait.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0104-chromium-revert-9d080c0.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0105-chromium-revert-drop-of-system-java.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0106-chromium-system-nodejs.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0107-chromium-cursed^Uscoped_file.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0108-chromium-fix-narrowing-cast.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0109-chromium-remove-strip_binary.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0110-chromium-revert-use-ffile-compilation-dir.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0111-chromium-no-Wno-stringop-overread.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0150-chromium-glibc-libc_malloc.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0200-chromium-musl-include-sys-reg.h-to-get-__WORDSIZE.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0201-chromium-musl-dispatch-to-musl.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0202-chromium-musl-no-mallinfo.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0203-chromium-musl-siginfo_t.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0204-chromium-musl-stackstart.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0205-chromium-musl-sandbox.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0206-chromium-musl-default-stacksize.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0208-chromium-musl-execinfo.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0209-chromium-musl-thread-stacksize.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0210-chromium-musl-msgvec-push_back.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0211-chromium-musl-canonicalize-file-name-musl.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0212-chromium-musl-no-getcontext.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0213-chromium-musl-crashpad.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0214-chromium-musl-fixes.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0215-chromium-musl-cdefs.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0216-chromium-musl-stat.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0217-chromium-musl-resolver.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0600-chromium-sndio.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0700-armv7l-neon.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0750-chromium-musl-cross-no-asm_ptrace_h.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0751-chromium-musl-arm-user_vfp.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0752-chromium-musl-arm-elf_auxv_t.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0801-chromium-i686-vaapi-fpermissive.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0900-xxx-ppc64le-libvpx.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0901-xxx-ppc64le-sandbox-linux-stat.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0902-xxx-ppc64le-support.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0903-xxx-ppc64le-swiftshader.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/cross-build-examples.patch
 create mode 100644 srcpkgs/qt6-webengine/template
 create mode 100644 srcpkgs/qt6-webengine/update

diff --git a/common/shlibs b/common/shlibs
index 91f197e54c93..1f8acc43c36e 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2087,6 +2087,13 @@ libQt6Positioning.so.6 qt6-location-6.2.0alpha_1
 libQt6MultimediaWidgets.so.6 qt6-multimedia-6.3.1_1
 libQt6MultimediaQuick.so.6 qt6-multimedia-6.3.1_1
 libQt6Multimedia.so.6 qt6-multimedia-6.3.1_1
+libQt6WebEngineQuick.so.6 qt6-webengine-6.3.1_1
+libQt6PdfWidgets.so.6 qt6-webengine-6.3.1_1
+libQt6PdfQuick.so.6 qt6-webengine-6.3.1_1
+libQt6WebEngineCore.so.6 qt6-webengine-6.3.1_1
+libQt6Pdf.so.6 qt6-webengine-6.3.1_1
+libQt6WebEngineQuickDelegatesQml.so.6 qt6-webengine-6.3.1_1
+libQt6WebEngineWidgets.so.6 qt6-webengine-6.3.1_1
 libnpth.so.0 npth-1.1_1
 libnpupnp.so.4 libnpupnp-4.0.2_1
 libglfw.so.3 glfw-3.0.4_1
diff --git a/srcpkgs/qt6-webengine-devel b/srcpkgs/qt6-webengine-devel
new file mode 120000
index 000000000000..8e4d1b99c587
--- /dev/null
+++ b/srcpkgs/qt6-webengine-devel
@@ -0,0 +1 @@
+qt6-webengine
\ No newline at end of file
diff --git a/srcpkgs/qt6-webengine-examples b/srcpkgs/qt6-webengine-examples
new file mode 120000
index 000000000000..8e4d1b99c587
--- /dev/null
+++ b/srcpkgs/qt6-webengine-examples
@@ -0,0 +1 @@
+qt6-webengine
\ No newline at end of file
diff --git a/srcpkgs/qt6-webengine/patches/0001-None-no-debug.patch b/srcpkgs/qt6-webengine/patches/0001-None-no-debug.patch
new file mode 100644
index 000000000000..1ba33f8e6fd9
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0001-None-no-debug.patch
@@ -0,0 +1,11 @@
+--- a/cmake/Functions.cmake
++++ b/cmake/Functions.cmake
+@@ -813,6 +813,8 @@ macro(append_build_type_setup)
+         endif()
+     elseif(${config} STREQUAL "MinSizeRel")
+         list(APPEND gnArgArg is_debug=false symbol_level=0 optimize_for_size=true)
++    elseif(${config} STREQUAL "None")
++        list(APPEND gnArgArg is_debug=false symbol_level=0)
+     endif()
+     if(FEATURE_developer_build OR (${config} STREQUAL "Debug") OR QT_FEATURE_webengine_sanitizer)
+         list(APPEND gnArgArg
diff --git a/srcpkgs/qt6-webengine/patches/0002-enable-ppc64.patch b/srcpkgs/qt6-webengine/patches/0002-enable-ppc64.patch
new file mode 100644
index 000000000000..d72ef1ad1a10
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0002-enable-ppc64.patch
@@ -0,0 +1,20 @@
+--- a/cmake/Functions.cmake
++++ b/cmake/Functions.cmake
+@@ -622,6 +622,8 @@ function(get_gn_arch result arch)
+         set(${result} "mipsel" PARENT_SCOPE)
+     elseif(arch STREQUAL "mipsel64")
+         set(${result} "mips64el" PARENT_SCOPE)
++    elseif(arch STREQUAL "power64")
++        set(${result} "power64" PARENT_SCOPE)
+     else()
+         message(DEBUG "Unsupported architecture: ${arch}")
+     endif()
+@@ -641,6 +643,8 @@ function(get_v8_arch result targetArch h
+             set(${result} "mipsel" PARENT_SCOPE)
+         elseif(hostArch STREQUAL "mipsel64")
+             set(${result} "mipsel" PARENT_SCOPE)
++        elseif(hostArch STREQUAL "power64")
++            set(${result} "power64" PARENT_SCOPE)
+         else()
+             message(DEBUG "Unsupported architecture: ${hostArch}")
+         endif()
diff --git a/srcpkgs/qt6-webengine/patches/0003-cross-hack.patch b/srcpkgs/qt6-webengine/patches/0003-cross-hack.patch
new file mode 100644
index 000000000000..ea9f90094a63
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0003-cross-hack.patch
@@ -0,0 +1,10 @@
+--- a/src/core/api/CMakeLists.txt
++++ b/src/core/api/CMakeLists.txt
+@@ -50,6 +50,7 @@ qt_internal_add_module(WebEngineCore
+         Qt::Gui
+         Qt::Network
+         Qt::Quick
++        X11
+ )
+ 
+ set_target_properties(WebEngineCore PROPERTIES QTWEBENGINEPROCESS_NAME ${qtWebEngineProcessName})
diff --git a/srcpkgs/qt6-webengine/patches/0004-ppc-disable-jxl-decoder.patch b/srcpkgs/qt6-webengine/patches/0004-ppc-disable-jxl-decoder.patch
new file mode 100644
index 000000000000..73c1151968f4
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0004-ppc-disable-jxl-decoder.patch
@@ -0,0 +1,13 @@
+--- a/src/core/CMakeLists.txt
++++ b/src/core/CMakeLists.txt
+@@ -414,6 +414,10 @@ foreach(arch ${archs})
+                 CONDITION QT_FEATURE_webengine_ozone_x11 AND XSCRNSAVER_FOUND
+             )
+ 
++            if (cpu STREQUAL "ppc64")
++                list(APPEND gnArgArg enable_jxl_decoder=false)
++            endif()
++
+             if(QT_FEATURE_webengine_kerberos)
+                 list(APPEND gnArgArg
+                      external_gssapi_include_dir="${GSSAPI_INCLUDE_DIRS}/gssapi"
diff --git a/srcpkgs/qt6-webengine/patches/0050-no-glibc-cmake-check.patch b/srcpkgs/qt6-webengine/patches/0050-no-glibc-cmake-check.patch
new file mode 100644
index 000000000000..f756bf0286bb
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0050-no-glibc-cmake-check.patch
@@ -0,0 +1,14 @@
+--- a/configure.cmake
++++ b/configure.cmake
+@@ -499,11 +499,6 @@ add_check_for_support(
+ )
+ add_check_for_support(
+    MODULES QtWebEngine QtPdf
+-   CONDITION NOT LINUX OR TEST_glibc
+-   MESSAGE "A suitable version >= 2.17 of glibc is required."
+-)
+-add_check_for_support(
+-   MODULES QtWebEngine QtPdf
+    CONDITION NOT LINUX OR TEST_khr
+    MESSAGE "Build requires Khronos development headers for build - see mesa/libegl1-mesa-dev"
+ )
diff --git a/srcpkgs/qt6-webengine/patches/0100-chromium-sandbox-membarrier.patch b/srcpkgs/qt6-webengine/patches/0100-chromium-sandbox-membarrier.patch
new file mode 100644
index 000000000000..2dd7b4aa948f
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0100-chromium-sandbox-membarrier.patch
@@ -0,0 +1,58 @@
+--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
++++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
+@@ -413,6 +413,7 @@ bool SyscallSets::IsAllowedProcessStartO
+   switch (sysno) {
+     case __NR_exit:
+     case __NR_exit_group:
++    case __NR_membarrier:
+     case __NR_wait4:
+     case __NR_waitid:
+ #if defined(__i386__)
+--- a/src/3rdparty/chromium/sandbox/linux/system_headers/arm64_linux_syscalls.h
++++ b/src/3rdparty/chromium/sandbox/linux/system_headers/arm64_linux_syscalls.h
+@@ -1215,4 +1215,8 @@
+ #define __NR_landlock_restrict_self 446
+ #endif
+ 
++#if !defined(__NR_membarrier)
++#define __NR_membarrier 283
++#endif
++
+ #endif  // SANDBOX_LINUX_SYSTEM_HEADERS_ARM64_LINUX_SYSCALLS_H_
+--- a/src/3rdparty/chromium/sandbox/linux/system_headers/arm_linux_syscalls.h
++++ b/src/3rdparty/chromium/sandbox/linux/system_headers/arm_linux_syscalls.h
+@@ -1617,6 +1617,10 @@
+ #define __NR_landlock_restrict_self (__NR_SYSCALL_BASE + 446)
+ #endif
+ 
++#if !defined(__NR_membarrier)
++#define __NR_membarrier (__NR_SYSCALL_BASE+389)
++#endif
++
+ // ARM private syscalls.
+ #if !defined(__ARM_NR_BASE)
+ #define __ARM_NR_BASE (__NR_SYSCALL_BASE + 0xF0000)
+--- a/src/3rdparty/chromium/sandbox/linux/system_headers/x86_32_linux_syscalls.h
++++ b/src/3rdparty/chromium/sandbox/linux/system_headers/x86_32_linux_syscalls.h
+@@ -1750,5 +1750,9 @@
+ #define __NR_landlock_restrict_self 446
+ #endif
+ 
++#if !defined(__NR_membarrier)
++#define __NR_membarrier 375
++#endif
++
+ #endif  // SANDBOX_LINUX_SYSTEM_HEADERS_X86_32_LINUX_SYSCALLS_H_
+ 
+--- a/src/3rdparty/chromium/sandbox/linux/system_headers/x86_64_linux_syscalls.h
++++ b/src/3rdparty/chromium/sandbox/linux/system_headers/x86_64_linux_syscalls.h
+@@ -1438,5 +1438,9 @@
+ #define __NR_landlock_restrict_self 446
+ #endif
+ 
++#if !defined(__NR_membarrier)
++#define __NR_membarrier 324
++#endif
++
+ #endif  // SANDBOX_LINUX_SYSTEM_HEADERS_X86_64_LINUX_SYSCALLS_H_
+ 
diff --git a/srcpkgs/qt6-webengine/patches/0101-size_t.patch b/srcpkgs/qt6-webengine/patches/0101-size_t.patch
new file mode 100644
index 000000000000..fccc085da311
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0101-size_t.patch
@@ -0,0 +1,16 @@
+--- a/src/3rdparty/chromium/third_party/angle/include/platform/PlatformMethods.h
++++ b/src/3rdparty/chromium/third_party/angle/include/platform/PlatformMethods.h
+@@ -239,11 +239,11 @@ inline void DefaultOverrideFeaturesMtl(P
+ using ProgramKeyType   = std::array<uint8_t, 20>;
+ using CacheProgramFunc = void (*)(PlatformMethods *platform,
+                                   const ProgramKeyType &key,
+-                                  size_t programSize,
++                                  std::size_t programSize,
+                                   const uint8_t *programBytes);
+ inline void DefaultCacheProgram(PlatformMethods *platform,
+                                 const ProgramKeyType &key,
+-                                size_t programSize,
++                                std::size_t programSize,
+                                 const uint8_t *programBytes)
+ {}
+ 
diff --git a/srcpkgs/qt6-webengine/patches/0102-chromium-90-ruy-include.patch b/srcpkgs/qt6-webengine/patches/0102-chromium-90-ruy-include.patch
new file mode 100644
index 000000000000..bbba579076d6
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0102-chromium-90-ruy-include.patch
@@ -0,0 +1,19 @@
+From 714092f336bb14d2fcc27396ec323b3d843bb962 Mon Sep 17 00:00:00 2001
+From: Stephan Hartmann <stha09@googlemail.com>
+Date: Thu, 4 Mar 2021 15:05:46 +0000
+Subject: [PATCH] IWYU: include limits for std::numeric_limits
+
+---
+ third_party/ruy/src/ruy/block_map.cc | 1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/src/3rdparty/chromium/third_party/ruy/src/ruy/block_map.cc
++++ b/src/3rdparty/chromium/third_party/ruy/src/ruy/block_map.cc
+@@ -17,6 +17,7 @@ limitations under the License.
+ 
+ #include <algorithm>
+ #include <cstdint>
++#include <limits>
+ 
+ #ifdef RUY_MAKEBLOCKMAP_DEBUG
+ #include <cstdio>
diff --git a/srcpkgs/qt6-webengine/patches/0103-chromium-v8-monotonic-pthread-cont_timedwait.patch b/srcpkgs/qt6-webengine/patches/0103-chromium-v8-monotonic-pthread-cont_timedwait.patch
new file mode 100644
index 000000000000..1dc8bc4d3d17
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0103-chromium-v8-monotonic-pthread-cont_timedwait.patch
@@ -0,0 +1,22 @@
+Use monotonic clock for pthread_cond_timedwait with musl too.
+
+--- a/src/3rdparty/chromium/v8/src/base/platform/condition-variable.cc
++++ b/src/3rdparty/chromium/v8/src/base/platform/condition-variable.cc
+@@ -20,7 +20,7 @@ namespace base {
+ 
+ ConditionVariable::ConditionVariable() {
+ #if (V8_OS_FREEBSD || V8_OS_NETBSD || V8_OS_OPENBSD || \
+-     (V8_OS_LINUX && V8_LIBC_GLIBC))
++     V8_OS_LINUX)
+   // On Free/Net/OpenBSD and Linux with glibc we can change the time
+   // source for pthread_cond_timedwait() to use the monotonic clock.
+   pthread_condattr_t attr;
+@@ -96,7 +96,7 @@ bool ConditionVariable::WaitFor(Mutex* m
+       &native_handle_, &mutex->native_handle(), &ts);
+ #else
+ #if (V8_OS_FREEBSD || V8_OS_NETBSD || V8_OS_OPENBSD || \
+-     (V8_OS_LINUX && V8_LIBC_GLIBC))
++     V8_OS_LINUX)
+   // On Free/Net/OpenBSD and Linux with glibc we can change the time
+   // source for pthread_cond_timedwait() to use the monotonic clock.
+   result = clock_gettime(CLOCK_MONOTONIC, &ts);
diff --git a/srcpkgs/qt6-webengine/patches/0104-chromium-revert-9d080c0.patch b/srcpkgs/qt6-webengine/patches/0104-chromium-revert-9d080c0.patch
new file mode 100644
index 000000000000..42b1ee9ec063
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0104-chromium-revert-9d080c0.patch
@@ -0,0 +1,162 @@
+ Original change's description:
+ > Replace 'blacklist' with 'ignorelist' in ./tools/msan/.
+ >
+ > Bug: 1097272, 1097268
+ > Change-Id: Id5c8227a5bfb1ffaec82d3168b609085b10c8297
+ > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2867730
+ > Commit-Queue: Dylan Cutler <dylancutler@google.com>
+ > Reviewed-by: Nico Weber <thakis@chromium.org>
+ > Reviewed-by: Jonathan Metzman <metzman@chromium.org>
+ > Cr-Commit-Position: refs/heads/master@{#883035}
+--- a/src/3rdparty/chromium/build/config/sanitizers/BUILD.gn
++++ b/src/3rdparty/chromium/build/config/sanitizers/BUILD.gn
+@@ -272,11 +272,11 @@ config("asan_flags") {
+   if (is_asan) {
+     cflags += [ "-fsanitize=address" ]
+     if (is_win) {
+-      if (!defined(asan_win_blocklist_path)) {
+-        asan_win_blocklist_path =
++      if (!defined(asan_win_blacklist_path)) {
++        asan_win_blacklist_path =
+             rebase_path("//tools/memory/asan/blocklist_win.txt", root_build_dir)
+       }
+-      cflags += [ "-fsanitize-ignorelist=$asan_win_blocklist_path" ]
++      cflags += [ "-fsanitize-blacklist=$asan_win_blacklist_path" ]
+     }
+   }
+ }
+@@ -306,13 +306,13 @@ config("link_shared_library") {
+ config("cfi_flags") {
+   cflags = []
+   if (is_cfi && current_toolchain == default_toolchain) {
+-    if (!defined(cfi_ignorelist_path)) {
+-      cfi_ignorelist_path =
++    if (!defined(cfi_blacklist_path)) {
++      cfi_blacklist_path =
+           rebase_path("//tools/cfi/ignores.txt", root_build_dir)
+     }
+     cflags += [
+       "-fsanitize=cfi-vcall",
+-      "-fsanitize-ignorelist=$cfi_ignorelist_path",
++      "-fsanitize-blacklist=$cfi_blacklist_path",
+     ]
+ 
+     if (use_cfi_cast) {
+@@ -409,14 +409,14 @@ config("msan_flags") {
+   if (is_msan) {
+     assert(is_linux || is_chromeos,
+            "msan only supported on linux x86_64/ChromeOS")
+-    if (!defined(msan_ignorelist_path)) {
+-      msan_ignorelist_path =
+-          rebase_path("//tools/msan/ignorelist.txt", root_build_dir)
++    if (!defined(msan_blacklist_path)) {
++      msan_blacklist_path =
++          rebase_path("//tools/msan/blacklist.txt", root_build_dir)
+     }
+     cflags = [
+       "-fsanitize=memory",
+       "-fsanitize-memory-track-origins=$msan_track_origins",
+-      "-fsanitize-ignorelist=$msan_ignorelist_path",
++      "-fsanitize-blacklist=$msan_blacklist_path",
+     ]
+   }
+ }
+@@ -424,13 +424,13 @@ config("msan_flags") {
+ config("tsan_flags") {
+   if (is_tsan) {
+     assert(is_linux || is_chromeos, "tsan only supported on linux x86_64")
+-    if (!defined(tsan_ignorelist_path)) {
+-      tsan_ignorelist_path =
++    if (!defined(tsan_blacklist_path)) {
++      tsan_blacklist_path =
+           rebase_path("//tools/memory/tsan_v2/ignores.txt", root_build_dir)
+     }
+     cflags = [
+       "-fsanitize=thread",
+-      "-fsanitize-ignorelist=$tsan_ignorelist_path",
++      "-fsanitize-blacklist=$tsan_blacklist_path",
+     ]
+   }
+ }
+@@ -438,8 +438,8 @@ config("tsan_flags") {
+ config("ubsan_flags") {
+   cflags = []
+   if (is_ubsan) {
+-    if (!defined(ubsan_ignorelist_path)) {
+-      ubsan_ignorelist_path =
++    if (!defined(ubsan_blacklist_path)) {
++      ubsan_blacklist_path =
+           rebase_path("//tools/ubsan/ignorelist.txt", root_build_dir)
+     }
+     cflags += [
+@@ -456,7 +456,7 @@ config("ubsan_flags") {
+       "-fsanitize=signed-integer-overflow",
+       "-fsanitize=unreachable",
+       "-fsanitize=vla-bound",
+-      "-fsanitize-ignorelist=$ubsan_ignorelist_path",
++      "-fsanitize-blacklist=$ubsan_blacklist_path",
+     ]
+     if (!is_clang) {
+       # These exposes too much illegal C++14 code to compile on anything stricter than clang:
+@@ -497,8 +497,8 @@ config("ubsan_no_recover") {
+ 
+ config("ubsan_security_flags") {
+   if (is_ubsan_security) {
+-    if (!defined(ubsan_security_ignorelist_path)) {
+-      ubsan_security_ignorelist_path =
++    if (!defined(ubsan_security_blacklist_path)) {
++      ubsan_security_blacklist_path =
+           rebase_path("//tools/ubsan/security_ignorelist.txt", root_build_dir)
+     }
+     cflags = [
+@@ -506,7 +506,7 @@ config("ubsan_security_flags") {
+       "-fsanitize=shift",
+       "-fsanitize=signed-integer-overflow",
+       "-fsanitize=vla-bound",
+-      "-fsanitize-ignorelist=$ubsan_security_ignorelist_path",
++      "-fsanitize-blacklist=$ubsan_security_blacklist_path",
+     ]
+   }
+ }
+@@ -519,13 +519,13 @@ config("ubsan_null_flags") {
+ 
+ config("ubsan_vptr_flags") {
+   if (is_ubsan_vptr) {
+-    if (!defined(ubsan_vptr_ignorelist_path)) {
+-      ubsan_vptr_ignorelist_path =
++    if (!defined(ubsan_vptr_blacklist_path)) {
++      ubsan_vptr_blacklist_path =
+           rebase_path("//tools/ubsan/vptr_ignorelist.txt", root_build_dir)
+     }
+     cflags = [
+       "-fsanitize=vptr",
+-      "-fsanitize-ignorelist=$ubsan_vptr_ignorelist_path",
++      "-fsanitize-blacklist=$ubsan_vptr_blacklist_path",
+     ]
+     if (!is_clang) {
+       # Clang specific flag:
+--- a/src/3rdparty/chromium/build_overrides/build.gni
++++ b/src/3rdparty/chromium/build_overrides/build.gni
+@@ -43,15 +43,15 @@ declare_args() {
+ # Allows different projects to specify their own suppression/ignore lists for
+ # sanitizer tools.
+ # asan_suppressions_file = "path/to/asan_suppressions.cc"
+-# asan_win_ignorelist_path = "path/to/asan/blocklist_win.txt"
++# asan_win_blacklist_path = "path/to/asan/blocklist_win.txt"
+ # lsan_suppressions_file = "path/to/lsan_suppressions.cc"
+ # tsan_suppressions_file = "path/to/tsan_suppressions.cc"
+-# tsan_ignorelist_path = "path/to/tsan/ignores.txt"
+-# msan_ignorelist_path = "path/to/msan/ignorelist.txt"
+-# ubsan_ignorelist_path = "path/to/ubsan/ignorelist.txt"
+-# ubsan_vptr_ignorelist_path = "path/to/ubsan/vptr_ignorelist.txt"
+-# ubsan_security_ignorelist_path = "path/to/ubsan/security_ignorelist.txt"
+-# cfi_ignorelist_path = "path/to/cfi/ignores.txt"
++# tsan_blacklist_path = "path/to/tsan/ignores.txt"
++# msan_blacklist_path = "path/to/msan/blacklist.txt"
++# ubsan_blacklist_path = "path/to/ubsan/blacklist.txt"
++# ubsan_vptr_blacklist_path = "path/to/ubsan/vptr_blacklist.txt"
++# ubsan_security_blacklist_path = "path/to/ubsan/security_blacklist.txt"
++# cfi_blacklist_path = "path/to/cfi/ignores.txt"
+ 
+ declare_args() {
+   # Android 32-bit non-component, non-clang builds cannot have symbol_level=2
diff --git a/srcpkgs/qt6-webengine/patches/0105-chromium-revert-drop-of-system-java.patch b/srcpkgs/qt6-webengine/patches/0105-chromium-revert-drop-of-system-java.patch
new file mode 100644
index 000000000000..44f3aa8fae5e
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0105-chromium-revert-drop-of-system-java.patch
@@ -0,0 +1,15 @@
+This was dropped for some reason in 6951c37cecd05979b232a39e5c10e6346a0f74ef
+--- a/src/3rdparty/chromium/third_party/closure_compiler/compiler.py
++++ b/src/3rdparty/chromium/third_party/closure_compiler/compiler.py
+@@ -13,8 +13,9 @@ import subprocess
+ 
+ 
+ _CURRENT_DIR = os.path.join(os.path.dirname(__file__))
+-_JAVA_PATH = os.path.join(_CURRENT_DIR, "..", "jdk", "current", "bin", "java")
+-assert os.path.isfile(_JAVA_PATH), "java only allowed in android builds"
++_JAVA_BIN = "java"
++_JDK_PATH = os.path.join(_CURRENT_DIR, "..", "jdk", "current", "bin", "java")
++_JAVA_PATH = _JDK_PATH if os.path.isfile(_JDK_PATH) else _JAVA_BIN
+ 
+ class Compiler(object):
+   """Runs the Closure compiler on given source files to typecheck them
diff --git a/srcpkgs/qt6-webengine/patches/0106-chromium-system-nodejs.patch b/srcpkgs/qt6-webengine/patches/0106-chromium-system-nodejs.patch
new file mode 100644
index 000000000000..1e067cc6eda0
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0106-chromium-system-nodejs.patch
@@ -0,0 +1,20 @@
+--- a/src/3rdparty/chromium/third_party/node/node.py
++++ b/src/3rdparty/chromium/third_party/node/node.py
+@@ -36,11 +36,12 @@ def GetBinaryPath():
+   if platform.system() == 'Darwin' and platform.machine() == 'arm64':
+       return os.path.join(os_path.join(os_path.dirname(__file__), 'mac',
+                           'node-darwin-arm64', 'bin', 'node'))
+-  return os_path.join(os_path.dirname(__file__), *{
+-    'Darwin': ('mac', 'node-darwin-x64', 'bin', 'node'),
+-    'Linux': ('linux', 'node-linux-x64', 'bin', 'node'),
+-    'Windows': ('win', 'node.exe'),
+-  }[platform.system()])
++  return "/usr/bin/node"
++  #return os_path.join(os_path.dirname(__file__), *{
++  #  'Darwin': ('mac', 'node-darwin-x64', 'bin', 'node'),
++  #  'Linux': ('linux', 'node-linux-x64', 'bin', 'node'),
++  #  'Windows': ('win', 'node.exe'),
++  #}[platform.system()])
+ 
+ 
+ def RunNode(cmd_parts, stdout=None):
diff --git a/srcpkgs/qt6-webengine/patches/0107-chromium-cursed^Uscoped_file.patch b/srcpkgs/qt6-webengine/patches/0107-chromium-cursed^Uscoped_file.patch
new file mode 100644
index 000000000000..a8f5d971883d
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0107-chromium-cursed^Uscoped_file.patch
@@ -0,0 +1,18 @@
+--- a/src/3rdparty/chromium/base/files/scoped_file_linux.cc
++++ b/src/3rdparty/chromium/base/files/scoped_file_linux.cc
+@@ -77,15 +77,3 @@ bool IsFDOwned(int fd) {
+ }
+ 
+ }  // namespace base
+-
+-extern "C" {
+-
+-int __close(int);
+-
+-__attribute__((visibility("default"), noinline)) int close(int fd) {
+-  if (base::IsFDOwned(fd) && g_is_ownership_enforced)
+-    CrashOnFdOwnershipViolation();
+-  return __close(fd);
+-}
+-
+-}  // extern "C"
diff --git a/srcpkgs/qt6-webengine/patches/0108-chromium-fix-narrowing-cast.patch b/srcpkgs/qt6-webengine/patches/0108-chromium-fix-narrowing-cast.patch
new file mode 100644
index 000000000000..ed32cd9b7415
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0108-chromium-fix-narrowing-cast.patch
@@ -0,0 +1,53 @@
+--- a/src/3rdparty/chromium/base/files/file_util_linux.cc
++++ b/src/3rdparty/chromium/base/files/file_util_linux.cc
+@@ -23,14 +23,14 @@ bool GetFileSystemType(const FilePath& p
+ 
+   // Not all possible |statfs_buf.f_type| values are in linux/magic.h.
+   // Missing values are copied from the statfs man page.
+-  switch (statfs_buf.f_type) {
++  switch (static_cast<uintmax_t>(statfs_buf.f_type)) {
+     case 0:
+       *type = FILE_SYSTEM_0;
+       break;
+     case EXT2_SUPER_MAGIC:  // Also ext3 and ext4
+     case MSDOS_SUPER_MAGIC:
+     case REISERFS_SUPER_MAGIC:
+-    case static_cast<int>(BTRFS_SUPER_MAGIC):
++    case BTRFS_SUPER_MAGIC:
+     case 0x5346544E:  // NTFS
+     case 0x58465342:  // XFS
+     case 0x3153464A:  // JFS
+@@ -40,14 +40,14 @@ bool GetFileSystemType(const FilePath& p
+       *type = FILE_SYSTEM_NFS;
+       break;
+     case SMB_SUPER_MAGIC:
+-    case static_cast<int>(0xFF534D42):  // CIFS
++    case 0xFF534D42:  // CIFS
+       *type = FILE_SYSTEM_SMB;
+       break;
+     case CODA_SUPER_MAGIC:
+       *type = FILE_SYSTEM_CODA;
+       break;
+-    case static_cast<int>(HUGETLBFS_MAGIC):
+-    case static_cast<int>(RAMFS_MAGIC):
++    case HUGETLBFS_MAGIC:
++    case RAMFS_MAGIC:
+     case TMPFS_MAGIC:
+       *type = FILE_SYSTEM_MEMORY;
+       break;
+--- a/src/3rdparty/chromium/base/system/sys_info_posix.cc
++++ b/src/3rdparty/chromium/base/system/sys_info_posix.cc
+@@ -100,10 +100,10 @@ bool IsStatsZeroIfUnlimited(const base::
+   if (HANDLE_EINTR(statfs(path.value().c_str(), &stats)) != 0)
+     return false;
+ 
+-  switch (stats.f_type) {
++  switch (static_cast<uintmax_t>(stats.f_type)) {
+     case TMPFS_MAGIC:
+-    case static_cast<int>(HUGETLBFS_MAGIC):
+-    case static_cast<int>(RAMFS_MAGIC):
++    case HUGETLBFS_MAGIC:
++    case RAMFS_MAGIC:
+       return true;
+   }
+   return false;
diff --git a/srcpkgs/qt6-webengine/patches/0109-chromium-remove-strip_binary.patch b/srcpkgs/qt6-webengine/patches/0109-chromium-remove-strip_binary.patch
new file mode 100644
index 000000000000..5ebd16e659af
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0109-chromium-remove-strip_binary.patch
@@ -0,0 +1,32 @@
+--- a/src/3rdparty/chromium/chrome/test/chromedriver/BUILD.gn
++++ b/src/3rdparty/chromium/chrome/test/chromedriver/BUILD.gn
+@@ -308,11 +308,7 @@ source_set("lib") {
+   }
+ }
+ 
+-if (is_linux) {
+-  chromedriver_output = "chromedriver.unstripped"
+-} else {
+-  chromedriver_output = "chromedriver"
+-}
++chromedriver_output = "chromedriver"
+ 
+ executable("$chromedriver_output") {
+   testonly = true
+@@ -336,16 +332,6 @@ executable("$chromedriver_output") {
+   }
+ }
+ 
+-if (is_linux) {
+-  strip_binary("chromedriver") {
+-    testonly = true
+-    binary_input = "$root_out_dir/$chromedriver_output"
+-    symbol_output = "$root_out_dir/chromedriver.debug"
+-    stripped_binary_output = "$root_out_dir/chromedriver"
+-    deps = [ ":$chromedriver_output" ]
+-  }
+-}
+-
+ python_library("chromedriver_py_tests") {
+   testonly = true
+   deps = [
diff --git a/srcpkgs/qt6-webengine/patches/0110-chromium-revert-use-ffile-compilation-dir.patch b/srcpkgs/qt6-webengine/patches/0110-chromium-revert-use-ffile-compilation-dir.patch
new file mode 100644
index 000000000000..a00f7ea80f7a
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0110-chromium-revert-use-ffile-compilation-dir.patch
@@ -0,0 +1,57 @@
+From 34a955823630096f5b01c2b01d51c1ea59d22763 Mon Sep 17 00:00:00 2001
+From: Zequan Wu <zequanwu@google.com>
+Date: Tue, 20 Jul 2021 14:13:50 +0000
+Subject: [PATCH] Use -ffile-compilation-dir= instead of
+ -fdebug-compilation-dir=
+
+Bug: 1010267
+Change-Id: If2b4ead8535a76490eb466a38e3d8fed6ea91079
+Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2770738
+Auto-Submit: Zequan Wu <zequanwu@google.com>
+Commit-Queue: Nico Weber <thakis@chromium.org>
+Reviewed-by: Nico Weber <thakis@chromium.org>
+Cr-Commit-Position: refs/heads/master@{#903456}
+--- a/src/3rdparty/chromium/build/config/compiler/BUILD.gn
++++ b/src/3rdparty/chromium/build/config/compiler/BUILD.gn
+@@ -1269,19 +1269,12 @@ config("compiler_deterministic") {
+     # different build directory like "out/feature_a" and "out/feature_b" if
+     # we build same files with same compile flag.
+     # Other paths are already given in relative, no need to normalize them.
+-    if (is_nacl) {
+-      # TODO(https://crbug.com/1231236): Use -ffile-compilation-dir= here.
+-      cflags += [
+-        "-Xclang",
+-        "-fdebug-compilation-dir",
+-        "-Xclang",
+-        ".",
+-      ]
+-    } else {
+-      # -ffile-compilation-dir is an alias for both -fdebug-compilation-dir=
+-      # and -fcoverage-compilation-dir=.
+-      cflags += [ "-ffile-compilation-dir=." ]
+-    }
++    cflags += [
++      "-Xclang",
++      "-fdebug-compilation-dir",
++      "-Xclang",
++      ".",
++    ]
+     if (!is_win) {
+       # We don't use clang -cc1as on Windows (yet? https://crbug.com/762167)
+       asmflags = [ "-Wa,-fdebug-compilation-dir,." ]
+--- a/src/3rdparty/chromium/build/config/compiler/compiler.gni
++++ b/src/3rdparty/chromium/build/config/compiler/compiler.gni
+@@ -228,8 +228,11 @@ declare_args() {
+ # deterministic builds to reduce compile times, so this is less relevant for
+ # official builders.
+ strip_absolute_paths_from_debug_symbols_default =
+-    is_android || is_fuchsia || is_nacl || (is_win && use_lld) || is_linux ||
+-    is_chromeos || (is_apple && !enable_dsyms)
++    # TODO(crbug.com/1010267): remove '!use_clang_coverage', coverage build has
++    # dependency to absolute path of source files.
++    !use_clang_coverage &&
++    (is_android || is_fuchsia || is_nacl || (is_win && use_lld) || is_linux ||
++     is_chromeos || (is_apple && !enable_dsyms))
+ 
+ declare_args() {
+   strip_absolute_paths_from_debug_symbols = strip_absolute_paths_from_debug_symbols_default
diff --git a/srcpkgs/qt6-webengine/patches/0111-chromium-no-Wno-stringop-overread.patch b/srcpkgs/qt6-webengine/patches/0111-chromium-no-Wno-stringop-overread.patch
new file mode 100644
index 000000000000..03eac3f8e067
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0111-chromium-no-Wno-stringop-overread.patch
@@ -0,0 +1,10 @@
+--- a/src/3rdparty/chromium/build/config/compiler/BUILD.gn
++++ b/src/3rdparty/chromium/build/config/compiler/BUILD.gn
+@@ -394,7 +394,6 @@ config("compiler") {
+         "-Wno-parentheses",
+         "-Wno-sign-compare", # fido
+         "-Wno-stringop-overflow", # skia, libaom, protobuf, icu
+-        "-Wno-stringop-overread", # libaom
+         "-Wno-psabi", # skia
+         "-Wno-multichar", # crashpad
+         "-Wno-format-zero-length", # user_agent.cc
diff --git a/srcpkgs/qt6-webengine/patches/0150-chromium-glibc-libc_malloc.patch b/srcpkgs/qt6-webengine/patches/0150-chromium-glibc-libc_malloc.patch
new file mode 100644
index 000000000000..7e1b66e5c73d
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0150-chromium-glibc-libc_malloc.patch
@@ -0,0 +1,24 @@
+--- a/src/3rdparty/chromium/base/process/memory_linux.cc
++++ b/src/3rdparty/chromium/base/process/memory_linux.cc
+@@ -23,6 +23,12 @@
+ #include "third_party/tcmalloc/chromium/src/gperftools/tcmalloc.h"
+ #endif
+ 
++#if defined(LIBC_GLIBC)
++extern "C" {
++extern void *__libc_malloc(size_t size);
++}
++#endif
++
+ namespace base {
+ 
+ namespace {
+@@ -120,7 +126,7 @@ bool UncheckedMalloc(size_t size, void**
+     (!defined(LIBC_GLIBC) && !BUILDFLAG(USE_TCMALLOC))
+   *result = malloc(size);
+ #elif defined(LIBC_GLIBC) && !BUILDFLAG(USE_TCMALLOC)
+-  *result = __libc_malloc(size);
++  *result = ::__libc_malloc(size);
+ #elif BUILDFLAG(USE_TCMALLOC)
+   *result = tc_malloc_skip_new_handler(size);
+ #endif
diff --git a/srcpkgs/qt6-webengine/patches/0200-chromium-musl-include-sys-reg.h-to-get-__WORDSIZE.patch b/srcpkgs/qt6-webengine/patches/0200-chromium-musl-include-sys-reg.h-to-get-__WORDSIZE.patch
new file mode 100644
index 000000000000..41b90071b5e4
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0200-chromium-musl-include-sys-reg.h-to-get-__WORDSIZE.patch
@@ -0,0 +1,21 @@
+From 9001c54d6b974449174a8cee8f3f5d78a9bd6c9e Mon Sep 17 00:00:00 2001
+From: Felix Janda <felix.janda@posteo.de>
+Date: Sun, 1 Feb 2015 14:26:52 +0100
+Subject: [PATCH 3/6] include <sys/reg.h> to get __WORDSIZE on musl libc
+
+---
+ qtwebengine/src/3rdparty/chromium/third_party/breakpad/breakpad/src/common/linux/elf_core_dump.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/common/linux/elf_core_dump.h
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/common/linux/elf_core_dump.h
+@@ -37,6 +37,9 @@
+ #include <limits.h>
+ #include <link.h>
+ #include <stddef.h>
++#ifndef __GLIBC__
++#include <sys/reg.h>
++#endif
+ 
+ #include "common/memory_range.h"
+ 
diff --git a/srcpkgs/qt6-webengine/patches/0201-chromium-musl-dispatch-to-musl.patch b/srcpkgs/qt6-webengine/patches/0201-chromium-musl-dispatch-to-musl.patch
new file mode 100644
index 000000000000..a58a688a4b55
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0201-chromium-musl-dispatch-to-musl.patch
@@ -0,0 +1,103 @@
+--- a/src/3rdparty/chromium/base/allocator/allocator_shim_default_dispatch_to_glibc.cc
++++ b/src/3rdparty/chromium/base/allocator/allocator_shim_default_dispatch_to_glibc.cc
+@@ -8,6 +8,7 @@
+ #include <dlfcn.h>
+ #include <malloc.h>
+ 
++#if defined(__GLIBC__)
+ // This translation unit defines a default dispatch for the allocator shim which
+ // routes allocations to libc functions.
+ // The code here is strongly inspired from tcmalloc's libc_override_glibc.h.
+@@ -87,3 +88,92 @@ const AllocatorDispatch AllocatorDispatc
+     nullptr,               /* aligned_free_function */
+     nullptr,               /* next */
+ };
++
++#else // defined(__GLIBC__)
++
++#include <dlfcn.h>
++
++extern "C" {
++// Declare function pointers to the memory functions
++typedef void* (*t_libc_malloc)(size_t size);
++typedef void* (*t_libc_calloc)(size_t n, size_t size);
++typedef void* (*t_libc_realloc)(void* address, size_t size);
++typedef void* (*t_libc_memalign)(size_t alignment, size_t size);
++typedef void (*t_libc_free)(void* ptr);
++typedef size_t (*t_libc_malloc_usable_size)(void* ptr);
++
++// Static instances of pointers to libc.so dl symbols
++static t_libc_malloc libc_malloc = NULL;
++static t_libc_calloc libc_calloc = NULL;
++static t_libc_realloc libc_realloc = NULL;
++static t_libc_memalign libc_memalign = NULL;
++static t_libc_free libc_free = NULL;
++static t_libc_malloc_usable_size libc_malloc_usable_size = NULL;
++
++// resolve the symbols in libc.so
++void musl_libc_memory_init(void)
++{
++  libc_malloc = (t_libc_malloc) dlsym(RTLD_NEXT, "malloc");
++  libc_calloc = (t_libc_calloc) dlsym(RTLD_NEXT, "calloc");
++  libc_realloc = (t_libc_realloc) dlsym(RTLD_NEXT, "realloc");
++  libc_memalign = (t_libc_memalign) dlsym(RTLD_NEXT, "memalign");
++  libc_free = (t_libc_free) dlsym(RTLD_NEXT, "free");
++  libc_malloc_usable_size = (t_libc_malloc_usable_size) dlsym(RTLD_NEXT, "malloc_usable_size");
++}
++}  // extern "C"
++
++namespace {
++
++using base::allocator::AllocatorDispatch;
++
++void* MuslMalloc(const AllocatorDispatch*, size_t size, void* context) {
++  if (!libc_malloc)
++    musl_libc_memory_init();
++  return (*libc_malloc)(size);
++}
++
++void* MuslCalloc(const AllocatorDispatch*, size_t n, size_t size, void* context) {
++  if (!libc_calloc)
++    musl_libc_memory_init();
++  return (*libc_calloc)(n, size);
++}
++
++void* MuslRealloc(const AllocatorDispatch*, void* address, size_t size, void* context) {
++  if (!libc_realloc)
++    musl_libc_memory_init();
++  return (*libc_realloc)(address, size);
++}
++
++void* MuslMemalign(const AllocatorDispatch*, size_t alignment, size_t size, void* context) {
++  if (!libc_memalign)
++    musl_libc_memory_init();
++  return (*libc_memalign)(alignment, size);
++}
++
++void MuslFree(const AllocatorDispatch*, void* address, void* context) {
++  if (!libc_free)
++    musl_libc_memory_init();
++  (*libc_free)(address);
++}
++
++size_t MuslGetSizeEstimate(const AllocatorDispatch*, void* address, void* context) {
++  // TODO(siggi, primiano): malloc_usable_size may need redirection in the
++  //     presence of interposing shims that divert allocations.
++  if (!libc_malloc_usable_size)
++    musl_libc_memory_init();
++  return (*libc_malloc_usable_size)(address);
++}
++
++}  // namespace
++
++const AllocatorDispatch AllocatorDispatch::default_dispatch = {
++    &MuslMalloc,           /* alloc_function */
++    &MuslCalloc,           /* alloc_zero_initialized_function */
++    &MuslMemalign,         /* alloc_aligned_function */
++    &MuslRealloc,          /* realloc_function */
++    &MuslFree,             /* free_function */
++    &MuslGetSizeEstimate,  /* get_size_estimate_function */
++    nullptr,               /* next */
++};
++
++#endif
diff --git a/srcpkgs/qt6-webengine/patches/0202-chromium-musl-no-mallinfo.patch b/srcpkgs/qt6-webengine/patches/0202-chromium-musl-no-mallinfo.patch
new file mode 100644
index 000000000000..a5bdb5a43a5f
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0202-chromium-musl-no-mallinfo.patch
@@ -0,0 +1,62 @@
+--- a/src/3rdparty/chromium/base/process/process_metrics_posix.cc
++++ b/src/3rdparty/chromium/base/process/process_metrics_posix.cc
+@@ -105,7 +105,7 @@ void IncreaseFdLimitTo(unsigned int max_
+ 
+ #endif  // !defined(OS_FUCHSIA)
+ 
+-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID)
++#if (defined(OS_LINUX) && defined(__GLIBC__)) || defined(OS_CHROMEOS) || defined(OS_ANDROID)
+ namespace {
+ 
+ size_t GetMallocUsageMallinfo() {
+@@ -127,16 +127,16 @@ size_t GetMallocUsageMallinfo() {
+ }
+ 
+ }  // namespace
+-#endif  // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID)
++#endif  // (defined(OS_LINUX) && defined(__GLIBC__)) || defined(OS_CHROMEOS) || defined(OS_ANDROID)
+ 
+ size_t ProcessMetrics::GetMallocUsage() {
+ #if defined(OS_APPLE)
+   malloc_statistics_t stats = {0};
+   malloc_zone_statistics(nullptr, &stats);
+   return stats.size_in_use;
+-#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID)
++#elif (defined(OS_LINUX) && defined(__GLIBC__)) || defined(OS_CHROMEOS) || defined(OS_ANDROID)
+   return GetMallocUsageMallinfo();
+-#elif defined(OS_FUCHSIA)
++#else
+   // TODO(fuchsia): Not currently exposed. https://crbug.com/735087.
+   return 0;
+ #endif
+--- a/src/3rdparty/chromium/third_party/tflite/src/tensorflow/lite/profiling/memory_info.cc
++++ b/src/3rdparty/chromium/third_party/tflite/src/tensorflow/lite/profiling/memory_info.cc
+@@ -27,7 +27,7 @@ namespace memory {
+ const int MemoryUsage::kValueNotSet = 0;
+ 
+ bool MemoryUsage::IsSupported() {
+-#ifdef __linux__
++#ifdef __GLIBC__
+   return true;
+ #endif
+   return false;
+@@ -35,7 +35,7 @@ bool MemoryUsage::IsSupported() {
+ 
+ MemoryUsage GetMemoryUsage() {
+   MemoryUsage result;
+-#ifdef __linux__
++#ifdef __GLIBC__
+   rusage res;
+   if (getrusage(RUSAGE_SELF, &res) == 0) {
+     result.max_rss_kb = res.ru_maxrss;
+--- a/src/3rdparty/chromium/base/trace_event/malloc_dump_provider.cc
++++ b/src/3rdparty/chromium/base/trace_event/malloc_dump_provider.cc
+@@ -213,7 +213,7 @@ bool MallocDumpProvider::OnMemoryDump(co
+                      &allocated_objects_count);
+ #elif defined(OS_FUCHSIA)
+ // TODO(fuchsia): Port, see https://crbug.com/706592.
+-#else
++#elif defined(__GLIBC__)
+ #if defined(__GLIBC__) && defined(__GLIBC_PREREQ)
+ #if __GLIBC_PREREQ(2, 33)
+ #define MALLINFO2_FOUND_IN_LIBC
diff --git a/srcpkgs/qt6-webengine/patches/0203-chromium-musl-siginfo_t.patch b/srcpkgs/qt6-webengine/patches/0203-chromium-musl-siginfo_t.patch
new file mode 100644
index 000000000000..43ef7fd7c5d2
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0203-chromium-musl-siginfo_t.patch
@@ -0,0 +1,18 @@
+There's a subtle difference in the internal name of siginfo_t fields
+between glibc and musl. The structure itself is equivalent, so it
+should suffice to add a macro to rename the field.
+
+--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf/trap.cc
++++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf/trap.cc
+@@ -174,7 +174,11 @@ void Trap::SigSys(int nr, LinuxSigInfo*
+   // If the version of glibc doesn't include this information in
+   // siginfo_t (older than 2.17), we need to explicitly copy it
+   // into an arch_sigsys structure.
++#if defined(__GLIBC__)
+   memcpy(&sigsys, &info->_sifields, sizeof(sigsys));
++#else
++  memcpy(&sigsys, &info->__si_fields, sizeof(sigsys));
++#endif
+ #endif
+ 
+ #if defined(__mips__)
diff --git a/srcpkgs/qt6-webengine/patches/0204-chromium-musl-stackstart.patch b/srcpkgs/qt6-webengine/patches/0204-chromium-musl-stackstart.patch
new file mode 100644
index 000000000000..b03cf43b86db
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0204-chromium-musl-stackstart.patch
@@ -0,0 +1,20 @@
+--- a/src/3rdparty/chromium/third_party/blink/renderer/platform/wtf/stack_util.cc
++++ b/src/3rdparty/chromium/third_party/blink/renderer/platform/wtf/stack_util.cc
+@@ -29,7 +29,7 @@ size_t GetUnderestimatedStackSize() {
+ // FIXME: On Mac OSX and Linux, this method cannot estimate stack size
+ // correctly for the main thread.
+ 
+-#elif defined(__GLIBC__) || defined(OS_ANDROID) || defined(OS_FREEBSD) || \
++#elif defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FREEBSD) || \
+     defined(OS_FUCHSIA)
+   // pthread_getattr_np() can fail if the thread is not invoked by
+   // pthread_create() (e.g., the main thread of blink_unittests).
+@@ -97,7 +97,7 @@ return Threading::ThreadStackSize();
+ }
+ 
+ void* GetStackStart() {
+-#if defined(__GLIBC__) || defined(OS_ANDROID) || defined(OS_FREEBSD) || \
++#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FREEBSD) || \
+     defined(OS_FUCHSIA)
+   pthread_attr_t attr;
+   int error;
diff --git a/srcpkgs/qt6-webengine/patches/0205-chromium-musl-sandbox.patch b/srcpkgs/qt6-webengine/patches/0205-chromium-musl-sandbox.patch
new file mode 100644
index 000000000000..772a578fd823
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0205-chromium-musl-sandbox.patch
@@ -0,0 +1,92 @@
+--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc
++++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc
+@@ -138,7 +138,7 @@ namespace sandbox {
+ // present (as in newer versions of posix_spawn).
+ ResultExpr RestrictCloneToThreadsAndEPERMFork() {
+   const Arg<unsigned long> flags(0);
+-
++#if defined(__GLIBC__)
+   // TODO(mdempsky): Extend DSL to support (flags & ~mask1) == mask2.
+   const uint64_t kAndroidCloneMask = CLONE_VM | CLONE_FS | CLONE_FILES |
+                                      CLONE_SIGHAND | CLONE_THREAD |
+@@ -165,6 +165,17 @@ ResultExpr RestrictCloneToThreadsAndEPER
+   return If(IsAndroid() ? android_test : glibc_test, Allow())
+       .ElseIf(is_fork_or_clone_vfork, Error(EPERM))
+       .Else(CrashSIGSYSClone());
++#else
++  const int required = CLONE_VM | CLONE_FS | CLONE_FILES | CLONE_SIGHAND |
++                       CLONE_THREAD | CLONE_SYSVSEM;
++  const int safe = CLONE_SETTLS | CLONE_PARENT_SETTID | CLONE_CHILD_CLEARTID |
++                   CLONE_DETACHED;
++  const BoolExpr thread_clone_ok = (flags&~safe)==required;
++
++  return If(thread_clone_ok, Allow())
++      .ElseIf((flags & (CLONE_VM | CLONE_THREAD)) == 0, Error(EPERM))
++      .Else(CrashSIGSYSClone());
++#endif
+ }
+ 
+ #ifndef PR_PAC_RESET_KEYS
+--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
++++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
+@@ -419,6 +419,9 @@ bool SyscallSets::IsAllowedProcessStartO
+ #if defined(__i386__)
+     case __NR_waitpid:
+ #endif
++#if !defined(__GLIBC__)
++    case __NR_set_tid_address:
++#endif
+       return true;
+     case __NR_clone:  // Should be parameter-restricted.
+     case __NR_setns:  // Privileged.
+@@ -431,7 +434,9 @@ bool SyscallSets::IsAllowedProcessStartO
+ #if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
+     case __NR_set_thread_area:
+ #endif
++#if defined(__GLIBC__)
+     case __NR_set_tid_address:
++#endif
+     case __NR_unshare:
+ #if !defined(__mips__) && !defined(__aarch64__)
+     case __NR_vfork:
+@@ -545,6 +550,9 @@ bool SyscallSets::IsAllowedAddressSpaceA
+     case __NR_mlock:
+     case __NR_munlock:
+     case __NR_munmap:
++#if !defined(__GLIBC__)
++    case __NR_mremap:
++#endif
+       return true;
+     case __NR_madvise:
+     case __NR_mincore:
+@@ -562,7 +570,9 @@ bool SyscallSets::IsAllowedAddressSpaceA
+     case __NR_modify_ldt:
+ #endif
+     case __NR_mprotect:
++#if defined(__GLIBC__)
+     case __NR_mremap:
++#endif
+     case __NR_msync:
+     case __NR_munlockall:
+     case __NR_readahead:
+--- a/src/3rdparty/chromium/sandbox/policy/linux/bpf_renderer_policy_linux.cc
++++ b/src/3rdparty/chromium/sandbox/policy/linux/bpf_renderer_policy_linux.cc
+@@ -97,11 +97,18 @@ ResultExpr RendererProcessPolicy::Evalua
+     case __NR_sysinfo:
+     case __NR_times:
+     case __NR_uname:
++#if !defined(__GLIBC__)
++    case __NR_sched_getparam:
++    case __NR_sched_getscheduler:
++    case __NR_sched_setscheduler:
++#endif
+       return Allow();
+     case __NR_sched_getaffinity:
++#if defined(__GLIBC__)
+     case __NR_sched_getparam:
+     case __NR_sched_getscheduler:
+     case __NR_sched_setscheduler:
++#endif
+       return RestrictSchedTarget(GetPolicyPid(), sysno);
+     case __NR_prlimit64:
+       // See crbug.com/662450 and setrlimit comment above.
diff --git a/srcpkgs/qt6-webengine/patches/0206-chromium-musl-default-stacksize.patch b/srcpkgs/qt6-webengine/patches/0206-chromium-musl-default-stacksize.patch
new file mode 100644
index 000000000000..bc07495b8144
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0206-chromium-musl-default-stacksize.patch
@@ -0,0 +1,15 @@
+--- a/src/3rdparty/chromium/base/threading/platform_thread_linux.cc
++++ b/src/3rdparty/chromium/base/threading/platform_thread_linux.cc
+@@ -439,7 +439,12 @@ void TerminateOnThread() {}
+ 
+ size_t GetDefaultThreadStackSize(const pthread_attr_t& attributes) {
+ #if !defined(THREAD_SANITIZER)
++#if defined(__GLIBC__)
+   return 0;
++#else // defined(__GLIBC__)
++  // For Musl libc try with a default stack size of 2 MiB
++  return 2 * 1024 * 1024;
++#endif // !defined(__GLIBC__)
+ #else
+   // ThreadSanitizer bloats the stack heavily. Evidence has been that the
+   // default stack size isn't enough for some browser tests.
diff --git a/srcpkgs/qt6-webengine/patches/0208-chromium-musl-execinfo.patch b/srcpkgs/qt6-webengine/patches/0208-chromium-musl-execinfo.patch
new file mode 100644
index 000000000000..9f3b964676b3
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0208-chromium-musl-execinfo.patch
@@ -0,0 +1,125 @@
+--- a/src/3rdparty/chromium/base/debug/stack_trace.cc
++++ b/src/3rdparty/chromium/base/debug/stack_trace.cc
+@@ -252,7 +252,9 @@ void StackTrace::Print() const {
+ }
+ 
+ void StackTrace::OutputToStream(std::ostream* os) const {
++#if defined(__GLIBC__) && !defined(_AIX)
+   OutputToStreamWithPrefix(os, nullptr);
++#endif
+ }
+ 
+ std::string StackTrace::ToString() const {
+@@ -260,7 +262,7 @@ std::string StackTrace::ToString() const
+ }
+ std::string StackTrace::ToStringWithPrefix(const char* prefix_string) const {
+   std::stringstream stream;
+-#if !defined(__UCLIBC__) && !defined(_AIX)
++#if defined(__GLIBC__) && !defined(_AIX)
+   OutputToStreamWithPrefix(&stream, prefix_string);
+ #endif
+   return stream.str();
+--- a/src/3rdparty/chromium/base/debug/stack_trace_posix.cc
++++ b/src/3rdparty/chromium/base/debug/stack_trace_posix.cc
+@@ -27,7 +27,7 @@
+ #if !defined(USE_SYMBOLIZE)
+ #include <cxxabi.h>
+ #endif
+-#if !defined(__UCLIBC__) && !defined(_AIX)
++#if defined(__GLIBC__) && !defined(_AIX)
+ #include <execinfo.h>
+ #endif
+ 
+@@ -89,7 +89,7 @@ void DemangleSymbols(std::string* text)
+   // Note: code in this function is NOT async-signal safe (std::string uses
+   // malloc internally).
+ 
+-#if !defined(__UCLIBC__) && !defined(_AIX)
++#if defined(__GLIBC__) && !defined(_AIX)
+   std::string::size_type search_from = 0;
+   while (search_from < text->size()) {
+     // Look for the start of a mangled symbol, from search_from.
+@@ -124,7 +124,7 @@ void DemangleSymbols(std::string* text)
+       search_from = mangled_start + 2;
+     }
+   }
+-#endif  // !defined(__UCLIBC__) && !defined(_AIX)
++#endif  // !defined(__GLIBC__) && !defined(_AIX)
+ }
+ #endif  // !defined(USE_SYMBOLIZE)
+ 
+@@ -136,7 +136,7 @@ class BacktraceOutputHandler {
+   virtual ~BacktraceOutputHandler() = default;
+ };
+ 
+-#if !defined(__UCLIBC__) && !defined(_AIX)
++#if defined(__GLIBC__) && !defined(_AIX)
+ void OutputPointer(void* pointer, BacktraceOutputHandler* handler) {
+   // This should be more than enough to store a 64-bit number in hex:
+   // 16 hex digits + 1 for null-terminator.
+@@ -219,7 +219,7 @@ void ProcessBacktrace(void* const* trace
+   }
+ #endif  // defined(USE_SYMBOLIZE)
+ }
+-#endif  // !defined(__UCLIBC__) && !defined(_AIX)
++#endif  // !defined(__GLIBC__) && !defined(_AIX)
+ 
+ void PrintToStderr(const char* output) {
+   // NOTE: This code MUST be async-signal safe (it's used by in-process
+@@ -839,7 +839,7 @@ size_t CollectStackTrace(void** trace, s
+   // If we do not have unwind tables, then try tracing using frame pointers.
+   return base::debug::TraceStackFramePointers(const_cast<const void**>(trace),
+                                               count, 0);
+-#elif !defined(__UCLIBC__) && !defined(_AIX)
++#elif defined(__GLIBC__) && !defined(_AIX)
+   // Though the backtrace API man page does not list any possible negative
+   // return values, we take no chance.
+   return base::saturated_cast<size_t>(backtrace(trace, count));
+@@ -852,13 +852,13 @@ void StackTrace::PrintWithPrefix(const c
+ // NOTE: This code MUST be async-signal safe (it's used by in-process
+ // stack dumping signal handler). NO malloc or stdio is allowed here.
+ 
+-#if !defined(__UCLIBC__) && !defined(_AIX)
++#if defined(__GLIBC__) && !defined(_AIX)
+   PrintBacktraceOutputHandler handler;
+   ProcessBacktrace(trace_, count_, prefix_string, &handler);
+ #endif
+ }
+ 
+-#if !defined(__UCLIBC__) && !defined(_AIX)
++#if defined(__GLIBC__) && !defined(_AIX)
+ void StackTrace::OutputToStreamWithPrefix(std::ostream* os,
+                                           const char* prefix_string) const {
+   StreamBacktraceOutputHandler handler(os);
+--- a/src/3rdparty/chromium/base/logging.cc
++++ b/src/3rdparty/chromium/base/logging.cc
+@@ -582,7 +582,7 @@ LogMessage::LogMessage(const char* file,
+ 
+ LogMessage::~LogMessage() {
+   size_t stack_start = stream_.tellp();
+-#if !defined(OFFICIAL_BUILD) && !defined(OS_NACL) && !defined(__UCLIBC__) && \
++#if !defined(OFFICIAL_BUILD) && !defined(OS_NACL) && defined(__GLIBC__) && \
+     !defined(OS_AIX)
+   if (severity_ == LOGGING_FATAL && !base::debug::BeingDebugged()) {
+     // Include a stack trace on a fatal, unless a debugger is attached.
+--- 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 @@
+ 
+ #if defined(DEBUG) && defined(V8_OS_LINUX) && !defined(V8_OS_ANDROID)
+ #define SYMBOLIZE_FUNCTION
++#if defined(__GLIBC__)
+ #include <execinfo.h>
++#endif
+ 
+ #include <vector>
+ 
+@@ -103,7 +105,7 @@ void ExternalReferenceTable::Init(Isolat
+ }
+ 
+ const char* ExternalReferenceTable::ResolveSymbol(void* address) {
+-#ifdef SYMBOLIZE_FUNCTION
++#if defined(SYMBOLIZE_FUNCTION) && defined(__GLIBC__)
+   char** names = backtrace_symbols(&address, 1);
+   const char* name = names[0];
+   // The array of names is malloc'ed. However, each name string is static
diff --git a/srcpkgs/qt6-webengine/patches/0209-chromium-musl-thread-stacksize.patch b/srcpkgs/qt6-webengine/patches/0209-chromium-musl-thread-stacksize.patch
new file mode 100644
index 000000000000..4b760a428b25
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0209-chromium-musl-thread-stacksize.patch
@@ -0,0 +1,22 @@
+--- a/src/3rdparty/chromium/ppapi/utility/threading/simple_thread.cc
++++ b/src/3rdparty/chromium/ppapi/utility/threading/simple_thread.cc
+@@ -13,7 +13,7 @@ namespace pp {
+ namespace {
+ 
+ // Use 2MB default stack size for Native Client, otherwise use system default.
+-#if defined(__native_client__)
++#if defined(__native_client__) || !defined(__GLIBC__)
+ const size_t kDefaultStackSize = 2 * 1024 * 1024;
+ #else
+ const size_t kDefaultStackSize = 0;
+--- a/src/3rdparty/chromium/v8/src/base/platform/platform-posix.cc
++++ b/src/3rdparty/chromium/v8/src/base/platform/platform-posix.cc
+@@ -883,7 +883,7 @@ bool Thread::Start() {
+ #if V8_OS_MACOSX
+     // Default on Mac OS X is 512kB -- bump up to 1MB
+     stack_size = 1 * 1024 * 1024;
+-#elif V8_OS_AIX
++#elif V8_OS_AIX || !defined(__GLIBC__)
+     // Default on AIX is 96kB -- bump up to 2MB
+     stack_size = 2 * 1024 * 1024;
+ #endif
diff --git a/srcpkgs/qt6-webengine/patches/0210-chromium-musl-msgvec-push_back.patch b/srcpkgs/qt6-webengine/patches/0210-chromium-musl-msgvec-push_back.patch
new file mode 100644
index 000000000000..905daa223700
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0210-chromium-musl-msgvec-push_back.patch
@@ -0,0 +1,14 @@
+--- a/src/3rdparty/chromium/net/socket/udp_socket_posix.cc
++++ b/src/3rdparty/chromium/net/socket/udp_socket_posix.cc
+@@ -1162,7 +1162,11 @@ SendResult UDPSocketPosixSender::Interna
+     msg_iov->push_back({const_cast<char*>(buffer->data()), buffer->length()});
+   msgvec->reserve(buffers.size());
+   for (size_t j = 0; j < buffers.size(); j++)
++#if defined(__GLIBC__)
+     msgvec->push_back({{nullptr, 0, &msg_iov[j], 1, nullptr, 0, 0}, 0});
++#else
++    msgvec->push_back({{nullptr, 0, &msg_iov[j], 1, 0, 0, 0}, 0});
++#endif
+   int result = HANDLE_EINTR(Sendmmsg(fd, &msgvec[0], buffers.size(), 0));
+   SendResult send_result(0, 0, std::move(buffers));
+   if (result < 0) {
diff --git a/srcpkgs/qt6-webengine/patches/0211-chromium-musl-canonicalize-file-name-musl.patch b/srcpkgs/qt6-webengine/patches/0211-chromium-musl-canonicalize-file-name-musl.patch
new file mode 100644
index 000000000000..d43e6bd488bc
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0211-chromium-musl-canonicalize-file-name-musl.patch
@@ -0,0 +1,11 @@
+--- a/src/3rdparty/chromium/third_party/nasm/nasmlib/realpath.c
++++ b/src/3rdparty/chromium/third_party/nasm/nasmlib/realpath.c
+@@ -55,7 +55,7 @@
+  */
+ char *nasm_realpath(const char *rel_path)
+ {
+-    char *rp = canonicalize_file_name(rel_path);
++    char *rp = realpath(rel_path, NULL);
+     return rp ? rp : nasm_strdup(rel_path);
+ }
+ 
diff --git a/srcpkgs/qt6-webengine/patches/0212-chromium-musl-no-getcontext.patch b/srcpkgs/qt6-webengine/patches/0212-chromium-musl-no-getcontext.patch
new file mode 100644
index 000000000000..5755f1b45a7d
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0212-chromium-musl-no-getcontext.patch
@@ -0,0 +1,29 @@
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc
+@@ -489,8 +489,10 @@ bool ExceptionHandler::SimulateSignalDel
+   // ExceptionHandler::HandleSignal().
+   siginfo.si_code = SI_USER;
+   siginfo.si_pid = getpid();
+-  ucontext_t context;
++  ucontext_t context = { 0 };
++#if defined(__GLIBC__)
+   getcontext(&context);
++#endif
+   return HandleSignal(sig, &siginfo, &context);
+ }
+ 
+@@ -675,9 +677,14 @@ bool ExceptionHandler::WriteMinidump() {
+   sys_prctl(PR_SET_DUMPABLE, 1, 0, 0, 0);
+ 
+   CrashContext context;
++
++#if defined(__GLIBC__)
+   int getcontext_result = getcontext(&context.context);
+   if (getcontext_result)
+     return false;
++#else
++  return false;
++#endif
+ 
+ #if defined(__i386__)
+   // In CPUFillFromUContext in minidumpwriter.cc the stack pointer is retrieved
diff --git a/srcpkgs/qt6-webengine/patches/0213-chromium-musl-crashpad.patch b/srcpkgs/qt6-webengine/patches/0213-chromium-musl-crashpad.patch
new file mode 100644
index 000000000000..71bbad2af17e
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0213-chromium-musl-crashpad.patch
@@ -0,0 +1,24 @@
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/compat/linux/sys/ptrace.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/compat/linux/sys/ptrace.h
+@@ -17,7 +17,9 @@
+ 
+ #include_next <sys/ptrace.h>
+ 
++#ifdef __GLIBC__
+ #include <sys/cdefs.h>
++#endif
+ 
+ // https://sourceware.org/bugzilla/show_bug.cgi?id=22433
+ #if !defined(PTRACE_GET_THREAD_AREA) && !defined(PT_GET_THREAD_AREA) && \
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/util/linux/ptracer.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/util/linux/ptracer.cc
+@@ -26,6 +26,9 @@
+ 
+ #if defined(ARCH_CPU_X86_FAMILY)
+ #include <asm/ldt.h>
++#if !defined(__GLIBC__)
++#include <asm/ptrace-abi.h>
++#endif
+ #endif
+ 
+ namespace crashpad {
diff --git a/srcpkgs/qt6-webengine/patches/0214-chromium-musl-fixes.patch b/srcpkgs/qt6-webengine/patches/0214-chromium-musl-fixes.patch
new file mode 100644
index 000000000000..55b267ed1714
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0214-chromium-musl-fixes.patch
@@ -0,0 +1,108 @@
+--- a/src/3rdparty/chromium/sandbox/linux/suid/process_util.h
++++ b/src/3rdparty/chromium/sandbox/linux/suid/process_util.h
+@@ -12,6 +12,15 @@
+ #include <stdint.h>
+ #include <sys/types.h>
+ 
++#if !defined(__GLIBC__) && !defined(TEMP_FAILURE_RETRY)
++# define TEMP_FAILURE_RETRY(expression) \
++	(__extension__			\
++	 ({ long int __result;		\
++	  do __result = (long int) (expression); \
++	  while (__result == -1L && errno == EINTR); \
++	  __result; }))
++#endif
++
+ // This adjusts /proc/process/oom_score_adj so the Linux OOM killer
+ // will prefer certain process types over others. The range for the
+ // adjustment is [-1000, 1000], with [0, 1000] being user accessible.
+--- a/src/3rdparty/chromium/services/device/serial/serial_io_handler_posix.cc
++++ b/src/3rdparty/chromium/services/device/serial/serial_io_handler_posix.cc
+@@ -6,6 +6,7 @@
+ 
+ #include <sys/ioctl.h>
+ #include <termios.h>
++#include <asm-generic/ioctls.h>
+ 
+ #include <algorithm>
+ #include <utility>
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h
+@@ -38,6 +38,10 @@
+ #include "common/memory_allocator.h"
+ #include "google_breakpad/common/minidump_format.h"
+ 
++#ifndef __GLIBC__
++#define _libc_fpstate _fpstate
++#endif
++
+ namespace google_breakpad {
+ 
+ // Wraps platform-dependent implementations of accessors to ucontext_t structs.
+--- a/src/3rdparty/chromium/third_party/ffmpeg/libavutil/cpu.c
++++ b/src/3rdparty/chromium/third_party/ffmpeg/libavutil/cpu.c
+@@ -41,8 +41,10 @@
+ #include <sys/param.h>
+ #endif
+ #include <sys/types.h>
++#ifdef __GLIBC__
+ #include <sys/sysctl.h>
+ #endif
++#endif
+ #if HAVE_UNISTD_H
+ #include <unistd.h>
+ #endif
+--- a/src/3rdparty/chromium/third_party/perfetto/include/perfetto/ext/base/thread_utils.h
++++ b/src/3rdparty/chromium/third_party/perfetto/include/perfetto/ext/base/thread_utils.h
+@@ -29,9 +29,7 @@
+ #include <algorithm>
+ #endif
+ 
+-#if PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID)
+ #include <sys/prctl.h>
+-#endif
+ 
+ // Internal implementation utils that aren't as widely useful/supported as
+ // base/thread_utils.h.
+@@ -58,7 +56,7 @@ inline bool MaybeSetThreadName(const std
+ 
+ inline bool GetThreadName(std::string& out_result) {
+   char buf[16] = {};
+-#if PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID)
++#if !defined(__GLIBC__)
+   if (prctl(PR_GET_NAME, buf) != 0)
+     return false;
+ #else
+--- a/src/3rdparty/chromium/third_party/lss/linux_syscall_support.h
++++ b/src/3rdparty/chromium/third_party/lss/linux_syscall_support.h
+@@ -1300,6 +1300,18 @@ struct kernel_statfs {
+ #ifndef __NR_fallocate
+ #define __NR_fallocate          285
+ #endif
++
++#if !defined(__GLIBC__)
++#ifdef __NR_pread
++#undef __NR_pread
++#endif
++#ifdef __NR_pwrite
++#undef __NR_pwrite
++#endif
++#define __NR_pread __NR_pread64
++#define __NR_pwrite __NR_pwrite64
++#endif /* !defined(__GLIBC__) */
++
+ #ifndef __NR_getrandom
+ #define __NR_getrandom          318
+ #endif
+--- a/src/3rdparty/chromium/net/dns/dns_config_service_posix.cc
++++ b/src/3rdparty/chromium/net/dns/dns_config_service_posix.cc
+@@ -93,7 +93,8 @@ absl::optional<DnsConfig> ReadDnsConfig(
+ 
+   absl::optional<DnsConfig> dns_config;
+ // TODO(fuchsia): Use res_ninit() when it's implemented on Fuchsia.
+-#if defined(OS_OPENBSD) || defined(OS_FUCHSIA)
++#if defined(OS_OPENBSD) || defined(OS_FUCHSIA) || \
++  (defined(OS_LINUX) && !defined(__GLIBC__))
+   // Note: res_ninit in glibc always returns 0 and sets RES_INIT.
+   // res_init behaves the same way.
+   memset(&_res, 0, sizeof(_res));
diff --git a/srcpkgs/qt6-webengine/patches/0215-chromium-musl-cdefs.patch b/srcpkgs/qt6-webengine/patches/0215-chromium-musl-cdefs.patch
new file mode 100644
index 000000000000..9d1daec29118
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0215-chromium-musl-cdefs.patch
@@ -0,0 +1,29 @@
+--- a/src/3rdparty/chromium/third_party/libsync/src/include/sync/sync.h
++++ b/src/3rdparty/chromium/third_party/libsync/src/include/sync/sync.h
+@@ -19,12 +19,13 @@
+ #ifndef __SYS_CORE_SYNC_H
+ #define __SYS_CORE_SYNC_H
+ 
+-#include <sys/cdefs.h>
+ #include <stdint.h>
+ 
+ #include <linux/types.h>
+ 
+-__BEGIN_DECLS
++#ifdef __cplusplus
++extern "C" {
++#endif
+ 
+ struct sync_legacy_merge_data {
+  int32_t fd2;
+@@ -158,6 +159,9 @@ struct sync_pt_info *sync_pt_info(struct
+                                   struct sync_pt_info *itr);
+ void sync_fence_info_free(struct sync_fence_info_data *info);
+ 
+-__END_DECLS
++#ifdef __cplusplus
++}
++#endif
++
+ 
+ #endif /* __SYS_CORE_SYNC_H */
diff --git a/srcpkgs/qt6-webengine/patches/0216-chromium-musl-stat.patch b/srcpkgs/qt6-webengine/patches/0216-chromium-musl-stat.patch
new file mode 100644
index 000000000000..4509a6957cd7
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0216-chromium-musl-stat.patch
@@ -0,0 +1,12 @@
+--- a/src/3rdparty/chromium/base/files/file.h
++++ b/src/3rdparty/chromium/base/files/file.h
+@@ -19,7 +19,8 @@
+ #include "build/build_config.h"
+ 
+ #if defined(OS_BSD) || defined(OS_APPLE) || defined(OS_NACL) || \
+-    defined(OS_FUCHSIA) || (defined(OS_ANDROID) && __ANDROID_API__ < 21)
++    defined(OS_FUCHSIA) || (defined(OS_ANDROID) && __ANDROID_API__ < 21) || \
++    (defined(OS_LINUX) && !defined(__GLIBC__))
+ struct stat;
+ namespace base {
+ typedef struct stat stat_wrapper_t;
diff --git a/srcpkgs/qt6-webengine/patches/0217-chromium-musl-resolver.patch b/srcpkgs/qt6-webengine/patches/0217-chromium-musl-resolver.patch
new file mode 100644
index 000000000000..c3d7afad9b19
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0217-chromium-musl-resolver.patch
@@ -0,0 +1,77 @@
+--- a/src/3rdparty/chromium/net/dns/dns_config_service_linux.cc
++++ b/src/3rdparty/chromium/net/dns/dns_config_service_linux.cc
+@@ -432,11 +432,13 @@ class DnsConfigServiceLinux::ConfigReade
+     base::ScopedBlockingCall scoped_blocking_call(
+         FROM_HERE, base::BlockingType::MAY_BLOCK);
+ 
++#if defined(__GLIBC__)
+     std::unique_ptr<struct __res_state> res = resolv_reader_->GetResState();
+     if (res) {
+       dns_config_ = ConvertResStateToDnsConfig(*res.get());
+       resolv_reader_->CloseResState(res.get());
+     }
++#endif
+ 
+     UMA_HISTOGRAM_BOOLEAN("Net.DNS.DnsConfig.Resolv.Read",
+                           dns_config_.has_value());
+@@ -486,6 +488,7 @@ class DnsConfigServiceLinux::ConfigReade
+ 
+ std::unique_ptr<struct __res_state>
+ DnsConfigServiceLinux::ResolvReader::GetResState() {
++#if defined(__GLIBC__)
+   auto res = std::make_unique<struct __res_state>();
+   memset(res.get(), 0, sizeof(struct __res_state));
+ 
+@@ -495,11 +498,16 @@ DnsConfigServiceLinux::ResolvReader::Get
+   }
+ 
+   return res;
++#else
++  return nullptr;
++#endif
+ }
+ 
+ void DnsConfigServiceLinux::ResolvReader::CloseResState(
+     struct __res_state* res) {
++#if defined(__GLIBC__)
+   res_nclose(res);
++#endif
+ }
+ 
+ DnsConfigServiceLinux::DnsConfigServiceLinux()
+--- a/src/3rdparty/chromium/net/dns/dns_reloader.cc
++++ b/src/3rdparty/chromium/net/dns/dns_reloader.cc
+@@ -4,8 +4,7 @@
+ 
+ #include "net/dns/dns_reloader.h"
+ 
+-#if defined(OS_POSIX) && !defined(OS_APPLE) && !defined(OS_OPENBSD) && \
+-    !defined(OS_ANDROID) && !defined(OS_FUCHSIA)
++#ifdef __GLIBC__
+ 
+ #include <resolv.h>
+ 
+--- a/src/3rdparty/chromium/net/dns/host_resolver_manager.cc
++++ b/src/3rdparty/chromium/net/dns/host_resolver_manager.cc
+@@ -2720,8 +2720,7 @@ HostResolverManager::HostResolverManager
+   NetworkChangeNotifier::AddConnectionTypeObserver(this);
+   if (system_dns_config_notifier_)
+     system_dns_config_notifier_->AddObserver(this);
+-#if defined(OS_POSIX) && !defined(OS_APPLE) && !defined(OS_OPENBSD) && \
+-    !defined(OS_ANDROID)
++#ifdef __GLIBC__
+   EnsureDnsReloaderInit();
+ #endif
+ 
+--- a/src/3rdparty/chromium/net/dns/host_resolver_proc.cc
++++ b/src/3rdparty/chromium/net/dns/host_resolver_proc.cc
+@@ -176,8 +176,7 @@ int SystemHostResolverCall(const std::st
+   base::ScopedBlockingCall scoped_blocking_call(FROM_HERE,
+                                                 base::BlockingType::WILL_BLOCK);
+ 
+-#if defined(OS_POSIX) && !defined(OS_APPLE) && !defined(OS_OPENBSD) && \
+-    !defined(OS_ANDROID) && !defined(OS_FUCHSIA)
++#ifdef __GLIBC__
+   DnsReloaderMaybeReload();
+ #endif
+   absl::optional<AddressInfo> ai;
diff --git a/srcpkgs/qt6-webengine/patches/0600-chromium-sndio.patch b/srcpkgs/qt6-webengine/patches/0600-chromium-sndio.patch
new file mode 100644
index 000000000000..0302874ffba4
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0600-chromium-sndio.patch
@@ -0,0 +1,876 @@
+--- a/src/3rdparty/chromium/media/BUILD.gn
++++ b/src/3rdparty/chromium/media/BUILD.gn
+@@ -72,6 +72,9 @@ config("media_config") {
+       defines += [ "DLOPEN_PULSEAUDIO" ]
+     }
+   }
++  if (use_sndio) {
++    defines += [ "USE_SNDIO" ]
++  }
+   if (use_cras) {
+     defines += [ "USE_CRAS" ]
+   }
+--- a/src/3rdparty/chromium/media/audio/BUILD.gn
++++ b/src/3rdparty/chromium/media/audio/BUILD.gn
+@@ -240,6 +240,17 @@ source_set("audio") {
+     sources += [ "linux/audio_manager_linux.cc" ]
+   }
+ 
++  if (use_sndio) {
++    libs += [ "sndio" ]
++    sources += [
++      "sndio/audio_manager_sndio.cc",
++      "sndio/sndio_input.cc",
++      "sndio/sndio_input.h",
++      "sndio/sndio_output.cc",
++      "sndio/sndio_output.h"
++    ]
++  }
++
+   if (use_alsa) {
+     libs += [ "asound" ]
+     sources += [
+--- a/src/3rdparty/chromium/media/audio/linux/audio_manager_linux.cc
++++ b/src/3rdparty/chromium/media/audio/linux/audio_manager_linux.cc
+@@ -25,6 +25,11 @@
+ #include "media/audio/pulse/audio_manager_pulse.h"
+ #include "media/audio/pulse/pulse_util.h"
+ #endif
++#if defined(USE_SNDIO)
++#include "media/audio/sndio/audio_manager_sndio.h"
++#include "media/audio/sndio/sndio_input.h"
++#include "media/audio/sndio/sndio_output.h"
++#endif
+ 
+ namespace media {
+ 
+@@ -32,7 +37,8 @@ enum LinuxAudioIO {
+   kPulse,
+   kAlsa,
+   kCras,
+-  kAudioIOMax = kCras  // Must always be equal to largest logged entry.
++  kSndio,
++  kAudioIOMax = kSndio // Must always be equal to largest logged entry.
+ };
+ 
+ std::unique_ptr<media::AudioManager> CreateAudioManager(
+@@ -45,6 +51,16 @@ std::unique_ptr<media::AudioManager> Cre
+                                               audio_log_factory);
+   }
+ 
++#if defined(USE_SNDIO)
++  struct sio_hdl *hdl = sio_open(SIO_DEVANY, SIO_PLAY, 0);
++  if (hdl != NULL) {
++    sio_close(hdl);
++    UMA_HISTOGRAM_ENUMERATION("Media.LinuxAudioIO", kSndio, kAudioIOMax + 1);
++    return std::make_unique<AudioManagerSndio>(std::move(audio_thread),
++                                                  audio_log_factory);
++  }
++#endif
++
+ #if defined(USE_CRAS)
+   if (base::CommandLine::ForCurrentProcess()->HasSwitch(switches::kUseCras)) {
+     UMA_HISTOGRAM_ENUMERATION("Media.LinuxAudioIO", kCras, kAudioIOMax + 1);
+--- /dev/null
++++ b/src/3rdparty/chromium/media/audio/sndio/audio_manager_sndio.cc
+@@ -0,0 +1,148 @@
++// Copyright (c) 2012 The Chromium Authors. All rights reserved.
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++#include "media/audio/sndio/audio_manager_sndio.h"
++
++#include "base/metrics/histogram_macros.h"
++#include "base/memory/ptr_util.h"
++#include "media/audio/audio_device_description.h"
++#include "media/audio/audio_output_dispatcher.h"
++#include "media/audio/sndio/sndio_input.h"
++#include "media/audio/sndio/sndio_output.h"
++#include "media/base/limits.h"
++#include "media/base/media_switches.h"
++
++namespace media {
++
++
++// Maximum number of output streams that can be open simultaneously.
++static const int kMaxOutputStreams = 4;
++
++// Default sample rate for input and output streams.
++static const int kDefaultSampleRate = 48000;
++
++void AddDefaultDevice(AudioDeviceNames* device_names) {
++  DCHECK(device_names->empty());
++  device_names->push_front(AudioDeviceName::CreateDefault());
++}
++
++bool AudioManagerSndio::HasAudioOutputDevices() {
++  return true;
++}
++
++bool AudioManagerSndio::HasAudioInputDevices() {
++  return true;
++}
++
++void AudioManagerSndio::GetAudioInputDeviceNames(
++    AudioDeviceNames* device_names) {
++  DCHECK(device_names->empty());
++  AddDefaultDevice(device_names);
++}
++
++void AudioManagerSndio::GetAudioOutputDeviceNames(
++    AudioDeviceNames* device_names) {
++  AddDefaultDevice(device_names);
++}
++
++const char* AudioManagerSndio::GetName() {
++  return "SNDIO";
++}
++
++AudioParameters AudioManagerSndio::GetInputStreamParameters(
++    const std::string& device_id) {
++  static const int kDefaultInputBufferSize = 1024;
++
++  int user_buffer_size = GetUserBufferSize();
++  int buffer_size = user_buffer_size ?
++      user_buffer_size : kDefaultInputBufferSize;
++
++  return AudioParameters(
++      AudioParameters::AUDIO_PCM_LOW_LATENCY, CHANNEL_LAYOUT_STEREO,
++      kDefaultSampleRate, buffer_size);
++}
++
++AudioManagerSndio::AudioManagerSndio(std::unique_ptr<AudioThread> audio_thread,
++                                         AudioLogFactory* audio_log_factory)
++    : AudioManagerBase(std::move(audio_thread),
++                       audio_log_factory) {
++  DLOG(WARNING) << "AudioManagerSndio";
++  SetMaxOutputStreamsAllowed(kMaxOutputStreams);
++}
++
++AudioManagerSndio::~AudioManagerSndio() {
++  Shutdown();
++}
++
++AudioOutputStream* AudioManagerSndio::MakeLinearOutputStream(
++    const AudioParameters& params,
++    const LogCallback& log_callback) {
++  DCHECK_EQ(AudioParameters::AUDIO_PCM_LINEAR, params.format());
++  return MakeOutputStream(params);
++}
++
++AudioOutputStream* AudioManagerSndio::MakeLowLatencyOutputStream(
++    const AudioParameters& params,
++    const std::string& device_id,
++    const LogCallback& log_callback) {
++  DLOG_IF(ERROR, !device_id.empty()) << "Not implemented!";
++  DCHECK_EQ(AudioParameters::AUDIO_PCM_LOW_LATENCY, params.format());
++  return MakeOutputStream(params);
++}
++
++AudioInputStream* AudioManagerSndio::MakeLinearInputStream(
++    const AudioParameters& params,
++    const std::string& device_id,
++    const LogCallback& log_callback) {
++  DCHECK_EQ(AudioParameters::AUDIO_PCM_LINEAR, params.format());
++  return MakeInputStream(params);
++}
++
++AudioInputStream* AudioManagerSndio::MakeLowLatencyInputStream(
++    const AudioParameters& params,
++    const std::string& device_id,
++    const LogCallback& log_callback) {
++  DCHECK_EQ(AudioParameters::AUDIO_PCM_LOW_LATENCY, params.format());
++  return MakeInputStream(params);
++}
++
++AudioParameters AudioManagerSndio::GetPreferredOutputStreamParameters(
++    const std::string& output_device_id,
++    const AudioParameters& input_params) {
++  // TODO(tommi): Support |output_device_id|.
++  DLOG_IF(ERROR, !output_device_id.empty()) << "Not implemented!";
++  static const int kDefaultOutputBufferSize = 2048;
++
++  ChannelLayout channel_layout = CHANNEL_LAYOUT_STEREO;
++  int sample_rate = kDefaultSampleRate;
++  int buffer_size = kDefaultOutputBufferSize;
++  if (input_params.IsValid()) {
++    sample_rate = input_params.sample_rate();
++    channel_layout = input_params.channel_layout();
++    buffer_size = std::min(buffer_size, input_params.frames_per_buffer());
++  }
++
++  int user_buffer_size = GetUserBufferSize();
++  if (user_buffer_size)
++    buffer_size = user_buffer_size;
++
++  return AudioParameters(
++      AudioParameters::AUDIO_PCM_LOW_LATENCY, channel_layout,
++      sample_rate, buffer_size);
++}
++
++AudioInputStream* AudioManagerSndio::MakeInputStream(
++    const AudioParameters& params) {
++  DLOG(WARNING) << "MakeInputStream";
++  return new SndioAudioInputStream(this,
++             AudioDeviceDescription::kDefaultDeviceId, params);
++}
++
++AudioOutputStream* AudioManagerSndio::MakeOutputStream(
++    const AudioParameters& params) {
++  DLOG(WARNING) << "MakeOutputStream";
++  return new SndioAudioOutputStream(params, this);
++}
++
++}  // namespace media
+--- /dev/null
++++ b/src/3rdparty/chromium/media/audio/sndio/audio_manager_sndio.h
+@@ -0,0 +1,65 @@
++// Copyright (c) 2012 The Chromium Authors. All rights reserved.
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++#ifndef MEDIA_AUDIO_SNDIO_AUDIO_MANAGER_SNDIO_H_
++#define MEDIA_AUDIO_SNDIO_AUDIO_MANAGER_SNDIO_H_
++
++#include <set>
++
++#include "base/compiler_specific.h"
++#include "base/macros.h"
++#include "base/memory/ref_counted.h"
++#include "base/threading/thread.h"
++#include "media/audio/audio_manager_base.h"
++
++namespace media {
++
++class MEDIA_EXPORT AudioManagerSndio : public AudioManagerBase {
++ public:
++  AudioManagerSndio(std::unique_ptr<AudioThread> audio_thread,
++                   AudioLogFactory* audio_log_factory);
++  ~AudioManagerSndio() override;
++
++  // Implementation of AudioManager.
++  bool HasAudioOutputDevices() override;
++  bool HasAudioInputDevices() override;
++  void GetAudioInputDeviceNames(AudioDeviceNames* device_names) override;
++  void GetAudioOutputDeviceNames(AudioDeviceNames* device_names) override;
++  AudioParameters GetInputStreamParameters(
++      const std::string& device_id) override;
++  const char* GetName() override;
++
++  // Implementation of AudioManagerBase.
++  AudioOutputStream* MakeLinearOutputStream(
++      const AudioParameters& params,
++      const LogCallback& log_callback) override;
++  AudioOutputStream* MakeLowLatencyOutputStream(
++      const AudioParameters& params,
++      const std::string& device_id,
++      const LogCallback& log_callback) override;
++  AudioInputStream* MakeLinearInputStream(
++      const AudioParameters& params,
++      const std::string& device_id,
++      const LogCallback& log_callback) override;
++  AudioInputStream* MakeLowLatencyInputStream(
++      const AudioParameters& params,
++      const std::string& device_id,
++      const LogCallback& log_callback) override;
++
++ protected:
++  AudioParameters GetPreferredOutputStreamParameters(
++      const std::string& output_device_id,
++      const AudioParameters& input_params) override;
++
++ private:
++  // Called by MakeLinearOutputStream and MakeLowLatencyOutputStream.
++  AudioOutputStream* MakeOutputStream(const AudioParameters& params);
++  AudioInputStream* MakeInputStream(const AudioParameters& params);
++
++  DISALLOW_COPY_AND_ASSIGN(AudioManagerSndio);
++};
++
++}  // namespace media
++
++#endif  // MEDIA_AUDIO_SNDIO_AUDIO_MANAGER_SNDIO_H_
+--- /dev/null
++++ b/src/3rdparty/chromium/media/audio/sndio/sndio_input.cc
+@@ -0,0 +1,200 @@
++// Copyright 2013 The Chromium Authors. All rights reserved.
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++#include "base/bind.h"
++#include "base/logging.h"
++#include "base/macros.h"
++#include "media/base/audio_timestamp_helper.h"
++#include "media/audio/sndio/audio_manager_sndio.h"
++#include "media/audio/audio_manager.h"
++#include "media/audio/sndio/sndio_input.h"
++
++namespace media {
++
++static const SampleFormat kSampleFormat = kSampleFormatS16;
++
++void SndioAudioInputStream::OnMoveCallback(void *arg, int delta)
++{
++  SndioAudioInputStream* self = static_cast<SndioAudioInputStream*>(arg);
++
++  self->hw_delay += delta;
++}
++
++void *SndioAudioInputStream::ThreadEntry(void *arg) {
++  SndioAudioInputStream* self = static_cast<SndioAudioInputStream*>(arg);
++
++  self->ThreadLoop();
++  return NULL;
++}
++
++SndioAudioInputStream::SndioAudioInputStream(AudioManagerBase* manager,
++                                             const std::string& device_name,
++                                             const AudioParameters& params)
++    : manager(manager),
++      params(params),
++      audio_bus(AudioBus::Create(params)),
++      state(kClosed) {
++}
++
++SndioAudioInputStream::~SndioAudioInputStream() {
++  if (state != kClosed)
++    Close();
++}
++
++bool SndioAudioInputStream::Open() {
++  struct sio_par par;
++  int sig;
++
++  if (state != kClosed)
++    return false;
++
++  if (params.format() != AudioParameters::AUDIO_PCM_LINEAR &&
++      params.format() != AudioParameters::AUDIO_PCM_LOW_LATENCY) {
++    LOG(WARNING) << "Unsupported audio format.";
++    return false;
++  }
++
++  sio_initpar(&par);
++  par.rate = params.sample_rate();
++  par.rchan = params.channels();
++  par.bits = SampleFormatToBitsPerChannel(kSampleFormat);
++  par.bps = par.bits / 8;
++  par.sig = sig = par.bits != 8 ? 1 : 0;
++  par.le = SIO_LE_NATIVE;
++  par.appbufsz = params.frames_per_buffer();
++
++  hdl = sio_open(SIO_DEVANY, SIO_REC, 0);
++
++  if (hdl == NULL) {
++    LOG(ERROR) << "Couldn't open audio device.";
++    return false;
++  }
++
++  if (!sio_setpar(hdl, &par) || !sio_getpar(hdl, &par)) {
++    LOG(ERROR) << "Couldn't set audio parameters.";
++    goto bad_close;
++  }
++
++  if (par.rate  != (unsigned int)params.sample_rate() ||
++      par.rchan != (unsigned int)params.channels() ||
++      par.bits  != (unsigned int)SampleFormatToBitsPerChannel(kSampleFormat) ||
++      par.sig   != (unsigned int)sig ||
++      (par.bps > 1 && par.le != SIO_LE_NATIVE) ||
++      (par.bits != par.bps * 8)) {
++    LOG(ERROR) << "Unsupported audio parameters.";
++    goto bad_close;
++  }
++  state = kStopped;
++  buffer = new char[audio_bus->frames() * params.GetBytesPerFrame(kSampleFormat)];
++  sio_onmove(hdl, &OnMoveCallback, this);
++  return true;
++bad_close:
++  sio_close(hdl);
++  return false;
++}
++
++void SndioAudioInputStream::Start(AudioInputCallback* cb) {
++
++  StartAgc();
++
++  state = kRunning;
++  hw_delay = 0;
++  callback = cb;
++  sio_start(hdl);
++  if (pthread_create(&thread, NULL, &ThreadEntry, this) != 0) {
++    LOG(ERROR) << "Failed to create real-time thread for recording.";
++    sio_stop(hdl);
++    state = kStopped;
++  }
++}
++
++void SndioAudioInputStream::Stop() {
++
++  if (state == kStopped)
++    return;
++
++  state = kStopWait;
++  pthread_join(thread, NULL);
++  sio_stop(hdl);
++  state = kStopped;
++
++  StopAgc();
++}
++
++void SndioAudioInputStream::Close() {
++
++  if (state == kClosed)
++    return;
++
++  if (state == kRunning)
++    Stop();
++
++  state = kClosed;
++  delete [] buffer;
++  sio_close(hdl);
++
++  manager->ReleaseInputStream(this);
++}
++
++double SndioAudioInputStream::GetMaxVolume() {
++  // Not supported
++  return 0.0;
++}
++
++void SndioAudioInputStream::SetVolume(double volume) {
++  // Not supported. Do nothing.
++}
++
++double SndioAudioInputStream::GetVolume() {
++  // Not supported.
++  return 0.0;
++}
++
++bool SndioAudioInputStream::IsMuted() {
++  // Not supported.
++  return false;
++}
++
++void SndioAudioInputStream::SetOutputDeviceForAec(
++    const std::string& output_device_id) {
++  // Not supported.
++}
++
++void SndioAudioInputStream::ThreadLoop(void) {
++  size_t todo, n;
++  char *data;
++  unsigned int nframes;
++  double normalized_volume = 0.0;
++
++  nframes = audio_bus->frames();
++
++  while (state == kRunning && !sio_eof(hdl)) {
++
++    GetAgcVolume(&normalized_volume);
++
++    // read one block
++    todo = nframes * params.GetBytesPerFrame(kSampleFormat);
++    data = buffer;
++    while (todo > 0) {
++      n = sio_read(hdl, data, todo);
++      if (n == 0)
++        return;	// unrecoverable I/O error
++      todo -= n;
++      data += n;
++    }
++    hw_delay -= nframes;
++
++    // convert frames count to TimeDelta
++    const base::TimeDelta delay = AudioTimestampHelper::FramesToTime(hw_delay,
++      params.sample_rate());
++
++    // push into bus
++    audio_bus->FromInterleaved<SignedInt16SampleTypeTraits>(reinterpret_cast<int16_t*>(buffer), nframes);
++
++    // invoke callback
++    callback->OnData(audio_bus.get(), base::TimeTicks::Now() - delay, 1.);
++  }
++}
++
++}  // namespace media
+--- /dev/null
++++ b/src/3rdparty/chromium/media/audio/sndio/sndio_input.h
+@@ -0,0 +1,91 @@
++// Copyright 2013 The Chromium Authors. All rights reserved.
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++#ifndef MEDIA_AUDIO_SNDIO_SNDIO_INPUT_H_
++#define MEDIA_AUDIO_SNDIO_SNDIO_INPUT_H_
++
++#include <stdint.h>
++#include <string>
++#include <sndio.h>
++
++#include "base/compiler_specific.h"
++#include "base/macros.h"
++#include "base/memory/weak_ptr.h"
++#include "base/time/time.h"
++#include "media/audio/agc_audio_stream.h"
++#include "media/audio/audio_io.h"
++#include "media/audio/audio_device_description.h"
++#include "media/base/audio_parameters.h"
++
++namespace media {
++
++class AudioManagerBase;
++
++// Implementation of AudioOutputStream using sndio(7)
++class SndioAudioInputStream : public AgcAudioStream<AudioInputStream> {
++ public:
++  // Pass this to the constructor if you want to attempt auto-selection
++  // of the audio recording device.
++  static const char kAutoSelectDevice[];
++
++  // Create a PCM Output stream for the SNDIO device identified by
++  // |device_name|. If unsure of what to use for |device_name|, use
++  // |kAutoSelectDevice|.
++  SndioAudioInputStream(AudioManagerBase* audio_manager,
++                     const std::string& device_name,
++                     const AudioParameters& params);
++
++  ~SndioAudioInputStream() override;
++
++  // Implementation of AudioInputStream.
++  bool Open() override;
++  void Start(AudioInputCallback* callback) override;
++  void Stop() override;
++  void Close() override;
++  double GetMaxVolume() override;
++  void SetVolume(double volume) override;
++  double GetVolume() override;
++  bool IsMuted() override;
++  void SetOutputDeviceForAec(const std::string& output_device_id) override;
++
++ private:
++
++  enum StreamState {
++    kClosed,            // Not opened yet
++    kStopped,           // Device opened, but not started yet
++    kRunning,           // Started, device playing
++    kStopWait           // Stopping, waiting for the real-time thread to exit
++  };
++
++  // C-style call-backs
++  static void OnMoveCallback(void *arg, int delta);
++  static void* ThreadEntry(void *arg);
++
++  // Continuously moves data from the device to the consumer
++  void ThreadLoop();
++  // Our creator, the audio manager needs to be notified when we close.
++  AudioManagerBase* manager;
++  // Parameters of the source
++  AudioParameters params;
++  // We store data here for consumer
++  std::unique_ptr<AudioBus> audio_bus;
++  // Call-back that consumes recorded data
++  AudioInputCallback* callback;  // Valid during a recording session.
++  // Handle of the audio device
++  struct sio_hdl* hdl;
++  // Current state of the stream
++  enum StreamState state;
++  // High priority thread running ThreadLoop()
++  pthread_t thread;
++  // Number of frames buffered in the hardware
++  int hw_delay;
++  // Temporary buffer where data is stored sndio-compatible format
++  char* buffer;
++
++  DISALLOW_COPY_AND_ASSIGN(SndioAudioInputStream);
++};
++
++}  // namespace media
++
++#endif  // MEDIA_AUDIO_SNDIO_SNDIO_INPUT_H_
+--- /dev/null
++++ b/src/3rdparty/chromium/media/audio/sndio/sndio_output.cc
+@@ -0,0 +1,183 @@
++// Copyright (c) 2012 The Chromium Authors. All rights reserved.
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++#include "base/logging.h"
++#include "base/time/time.h"
++#include "base/time/default_tick_clock.h"
++#include "media/audio/audio_manager_base.h"
++#include "media/base/audio_timestamp_helper.h"
++#include "media/audio/sndio/sndio_output.h"
++
++namespace media {
++
++static const SampleFormat kSampleFormat = kSampleFormatS16;
++
++void SndioAudioOutputStream::OnMoveCallback(void *arg, int delta) {
++  SndioAudioOutputStream* self = static_cast<SndioAudioOutputStream*>(arg);
++
++  self->hw_delay -= delta;
++}
++
++void SndioAudioOutputStream::OnVolCallback(void *arg, unsigned int vol) {
++  SndioAudioOutputStream* self = static_cast<SndioAudioOutputStream*>(arg);
++
++  self->vol = vol;
++}
++
++void *SndioAudioOutputStream::ThreadEntry(void *arg) {
++  SndioAudioOutputStream* self = static_cast<SndioAudioOutputStream*>(arg);
++
++  self->ThreadLoop();
++  return NULL;
++}
++
++SndioAudioOutputStream::SndioAudioOutputStream(const AudioParameters& params,
++                                               AudioManagerBase* manager)
++    : manager(manager),
++      params(params),
++      audio_bus(AudioBus::Create(params)),
++      state(kClosed),
++      mutex(PTHREAD_MUTEX_INITIALIZER) {
++}
++
++SndioAudioOutputStream::~SndioAudioOutputStream() {
++  if (state != kClosed)
++    Close();
++}
++
++bool SndioAudioOutputStream::Open() {
++  struct sio_par par;
++  int sig;
++
++  if (params.format() != AudioParameters::AUDIO_PCM_LINEAR &&
++      params.format() != AudioParameters::AUDIO_PCM_LOW_LATENCY) {
++    LOG(WARNING) << "Unsupported audio format.";
++    return false;
++  }
++  sio_initpar(&par);
++  par.rate = params.sample_rate();
++  par.pchan = params.channels();
++  par.bits = SampleFormatToBitsPerChannel(kSampleFormat);
++  par.bps = par.bits / 8;
++  par.sig = sig = par.bits != 8 ? 1 : 0;
++  par.le = SIO_LE_NATIVE;
++  par.appbufsz = params.frames_per_buffer();
++
++  hdl = sio_open(SIO_DEVANY, SIO_PLAY, 0);
++  if (hdl == NULL) {
++    LOG(ERROR) << "Couldn't open audio device.";
++    return false;
++  }
++  if (!sio_setpar(hdl, &par) || !sio_getpar(hdl, &par)) {
++    LOG(ERROR) << "Couldn't set audio parameters.";
++    goto bad_close;
++  }
++  if (par.rate  != (unsigned int)params.sample_rate() ||
++      par.pchan != (unsigned int)params.channels() ||
++      par.bits  != (unsigned int)SampleFormatToBitsPerChannel(kSampleFormat) ||
++      par.sig   != (unsigned int)sig ||
++      (par.bps > 1 && par.le != SIO_LE_NATIVE) ||
++      (par.bits != par.bps * 8)) {
++    LOG(ERROR) << "Unsupported audio parameters.";
++    goto bad_close;
++  }
++  state = kStopped;
++  volpending = 0;
++  vol = 0;
++  buffer = new char[audio_bus->frames() * params.GetBytesPerFrame(kSampleFormat)];
++  sio_onmove(hdl, &OnMoveCallback, this);
++  sio_onvol(hdl, &OnVolCallback, this);
++  return true;
++ bad_close:
++  sio_close(hdl);
++  return false;
++}
++
++void SndioAudioOutputStream::Close() {
++  if (state == kClosed)
++    return;
++  if (state == kRunning)
++    Stop();
++  state = kClosed;
++  delete [] buffer;
++  sio_close(hdl);
++  manager->ReleaseOutputStream(this);  // Calls the destructor
++}
++
++void SndioAudioOutputStream::Start(AudioSourceCallback* callback) {
++  state = kRunning;
++  hw_delay = 0;
++  source = callback;
++  sio_start(hdl);
++  if (pthread_create(&thread, NULL, &ThreadEntry, this) != 0) {
++    LOG(ERROR) << "Failed to create real-time thread.";
++    sio_stop(hdl);
++    state = kStopped;
++  }
++}
++
++void SndioAudioOutputStream::Stop() {
++  if (state == kStopped)
++    return;
++  state = kStopWait;
++  pthread_join(thread, NULL);
++  sio_stop(hdl);
++  state = kStopped;
++}
++
++void SndioAudioOutputStream::SetVolume(double v) {
++  pthread_mutex_lock(&mutex);
++  vol = v * SIO_MAXVOL;
++  volpending = 1;
++  pthread_mutex_unlock(&mutex);
++}
++
++void SndioAudioOutputStream::GetVolume(double* v) {
++  pthread_mutex_lock(&mutex);
++  *v = vol * (1. / SIO_MAXVOL);
++  pthread_mutex_unlock(&mutex);
++}
++
++// This stream is always used with sub second buffer sizes, where it's
++// sufficient to simply always flush upon Start().
++void SndioAudioOutputStream::Flush() {}
++
++void SndioAudioOutputStream::ThreadLoop(void) {
++  int avail, count, result;
++
++  while (state == kRunning) {
++    // Update volume if needed
++    pthread_mutex_lock(&mutex);
++    if (volpending) {
++      volpending = 0;
++      sio_setvol(hdl, vol);
++    }
++    pthread_mutex_unlock(&mutex);
++
++    // Get data to play
++    const base::TimeDelta delay = AudioTimestampHelper::FramesToTime(hw_delay,
++	params.sample_rate());
++    count = source->OnMoreData(delay, base::TimeTicks::Now(), 0, audio_bus.get());
++    audio_bus->ToInterleaved<SignedInt16SampleTypeTraits>(count, reinterpret_cast<int16_t*>(buffer));
++    if (count == 0) {
++      // We have to submit something to the device
++      count = audio_bus->frames();
++      memset(buffer, 0, count * params.GetBytesPerFrame(kSampleFormat));
++      LOG(WARNING) << "No data to play, running empty cycle.";
++    }
++
++    // Submit data to the device
++    avail = count * params.GetBytesPerFrame(kSampleFormat);
++    result = sio_write(hdl, buffer, avail);
++    if (result == 0) {
++      LOG(WARNING) << "Audio device disconnected.";
++      break;
++    }
++
++    // Update hardware pointer
++    hw_delay += count;
++  }
++}
++
++}  // namespace media
+--- /dev/null
++++ b/src/3rdparty/chromium/media/audio/sndio/sndio_output.h
+@@ -0,0 +1,86 @@
++// Copyright (c) 2012 The Chromium Authors. All rights reserved.
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++#ifndef MEDIA_AUDIO_SNDIO_SNDIO_OUTPUT_H_
++#define MEDIA_AUDIO_SNDIO_SNDIO_OUTPUT_H_
++
++#include <pthread.h>
++#include <sndio.h>
++
++#include "base/time/tick_clock.h"
++#include "base/time/time.h"
++#include "media/audio/audio_io.h"
++
++namespace media {
++
++class AudioManagerBase;
++
++// Implementation of AudioOutputStream using sndio(7)
++class SndioAudioOutputStream : public AudioOutputStream {
++ public:
++  // The manager is creating this object
++  SndioAudioOutputStream(const AudioParameters& params,
++                         AudioManagerBase* manager);
++  virtual ~SndioAudioOutputStream();
++
++  // Implementation of AudioOutputStream.
++  bool Open() override;
++  void Close() override;
++  void Start(AudioSourceCallback* callback) override;
++  void Stop() override;
++  void SetVolume(double volume) override;
++  void GetVolume(double* volume) override;
++  void Flush() override;
++
++  friend void sndio_onmove(void *arg, int delta);
++  friend void sndio_onvol(void *arg, unsigned int vol);
++  friend void *sndio_threadstart(void *arg);
++
++ private:
++  enum StreamState {
++    kClosed,            // Not opened yet
++    kStopped,           // Device opened, but not started yet
++    kRunning,           // Started, device playing
++    kStopWait           // Stopping, waiting for the real-time thread to exit
++  };
++
++  // C-style call-backs
++  static void OnMoveCallback(void *arg, int delta);
++  static void OnVolCallback(void *arg, unsigned int vol);
++  static void* ThreadEntry(void *arg);
++
++  // Continuously moves data from the producer to the device
++  void ThreadLoop(void);
++
++  // Our creator, the audio manager needs to be notified when we close.
++  AudioManagerBase* manager;
++  // Parameters of the source
++  AudioParameters params;
++  // Source stores data here
++  std::unique_ptr<AudioBus> audio_bus;
++  // Call-back that produces data to play
++  AudioSourceCallback* source;
++  // Handle of the audio device
++  struct sio_hdl* hdl;
++  // Current state of the stream
++  enum StreamState state;
++  // High priority thread running ThreadLoop()
++  pthread_t thread;
++  // Protects vol, volpending and hw_delay
++  pthread_mutex_t mutex;
++  // Current volume in the 0..SIO_MAXVOL range
++  int vol;
++  // Set to 1 if volumes must be refreshed in the realtime thread
++  int volpending;
++  // Number of frames buffered in the hardware
++  int hw_delay;
++  // Temporary buffer where data is stored sndio-compatible format
++  char* buffer;
++
++  DISALLOW_COPY_AND_ASSIGN(SndioAudioOutputStream);
++};
++
++}  // namespace media
++
++#endif  // MEDIA_AUDIO_SNDIO_SNDIO_OUTPUT_H_
+--- a/src/3rdparty/chromium/media/media_options.gni
++++ b/src/3rdparty/chromium/media/media_options.gni
+@@ -121,6 +121,9 @@ declare_args() {
+   # Enables runtime selection of ALSA library for audio.
+   use_alsa = false
+ 
++  # Enable runtime selection of sndio(7)
++  use_sndio = false
++
+   # Alsa should be used on non-Android, non-Mac POSIX systems.
+   # Alsa should be used on desktop Chromecast and audio-only Chromecast builds.
+   if (is_posix && !is_android && !is_mac &&
diff --git a/srcpkgs/qt6-webengine/patches/0700-armv7l-neon.patch b/srcpkgs/qt6-webengine/patches/0700-armv7l-neon.patch
new file mode 100644
index 000000000000..d42fa19a07a1
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0700-armv7l-neon.patch
@@ -0,0 +1,10 @@
+--- a/src/3rdparty/chromium/skia/BUILD.gn
++++ b/src/3rdparty/chromium/skia/BUILD.gn
+@@ -800,7 +800,6 @@ skia_source_set("skia_opts") {
+         # Root build config sets -mfpu=$arm_fpu, which we expect to be neon
+         # when running this.
+         if (!arm_use_neon) {
+-          configs -= [ "//build/config/compiler:compiler_arm_fpu" ]
+           cflags += [ "-mfpu=neon" ]
+         }
+       }
diff --git a/srcpkgs/qt6-webengine/patches/0750-chromium-musl-cross-no-asm_ptrace_h.patch b/srcpkgs/qt6-webengine/patches/0750-chromium-musl-cross-no-asm_ptrace_h.patch
new file mode 100644
index 000000000000..3cf132908af4
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0750-chromium-musl-cross-no-asm_ptrace_h.patch
@@ -0,0 +1,30 @@
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper.cc
+@@ -38,7 +38,12 @@
+ 
+ #include "client/linux/minidump_writer/linux_ptrace_dumper.h"
+ 
++#if defined(__GLIBC__)
+ #include <asm/ptrace.h>
++#else
++/* For arm*-musl this definition is missing */
++#define ARM_sp uregs[13]
++#endif
+ #include <assert.h>
+ #include <errno.h>
+ #include <fcntl.h>
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_core_dumper.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_core_dumper.cc
+@@ -32,7 +32,12 @@
+ 
+ #include "client/linux/minidump_writer/linux_core_dumper.h"
+ 
++#if defined(__GLIBC__)
+ #include <asm/ptrace.h>
++#else
++/* For arm*-musl this definition is missing */
++#define ARM_sp uregs[13]
++#endif
+ #include <assert.h>
+ #include <elf.h>
+ #include <stdio.h>
diff --git a/srcpkgs/qt6-webengine/patches/0751-chromium-musl-arm-user_vfp.patch b/srcpkgs/qt6-webengine/patches/0751-chromium-musl-arm-user_vfp.patch
new file mode 100644
index 000000000000..6e2d62f35ee6
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0751-chromium-musl-arm-user_vfp.patch
@@ -0,0 +1,20 @@
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/util/linux/thread_info.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/util/linux/thread_info.h
+@@ -17,6 +17,17 @@
+ 
+ #include <stdint.h>
+ #include <sys/user.h>
++#if !defined(__GLIBC__)
++struct user_vfp {
++	unsigned long long fpregs[32];
++	unsigned long fpscr;
++};
++struct user_vfp_exc {
++	unsigned long fpexc;
++	unsigned long fpinst;
++	unsigned long fpinst2;
++};
++#endif /* !defined(__GLIBC__) */
+ 
+ #include <type_traits>
+ 
diff --git a/srcpkgs/qt6-webengine/patches/0752-chromium-musl-arm-elf_auxv_t.patch b/srcpkgs/qt6-webengine/patches/0752-chromium-musl-arm-elf_auxv_t.patch
new file mode 100644
index 000000000000..7112c8cfd3fa
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0752-chromium-musl-arm-elf_auxv_t.patch
@@ -0,0 +1,18 @@
+--- a/src/3rdparty/chromium/v8/src/base/cpu.cc
++++ b/src/3rdparty/chromium/v8/src/base/cpu.cc
+@@ -163,6 +163,15 @@ static V8_INLINE void __cpuid(int cpu_in
+ 
+ #if V8_HOST_ARCH_ARM || V8_HOST_ARCH_ARM64
+ 
++#ifndef __GLIBC__
++#include <elf.h>
++#ifdef __LP64__
++typedef Elf64_auxv_t elf_auxv_t;
++#else
++typedef Elf32_auxv_t elf_auxv_t;
++#endif
++#endif
++
+ static uint32_t ReadELFHWCaps() {
+   uint32_t result = 0;
+ #if V8_GLIBC_PREREQ(2, 16)
diff --git a/srcpkgs/qt6-webengine/patches/0801-chromium-i686-vaapi-fpermissive.patch b/srcpkgs/qt6-webengine/patches/0801-chromium-i686-vaapi-fpermissive.patch
new file mode 100644
index 000000000000..3d4043e03b89
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0801-chromium-i686-vaapi-fpermissive.patch
@@ -0,0 +1,24 @@
+--- a/src/3rdparty/chromium/media/gpu/vaapi/BUILD.gn
++++ b/src/3rdparty/chromium/media/gpu/vaapi/BUILD.gn
+@@ -14,6 +14,10 @@ import("//ui/gl/features.gni")
+ assert(is_linux || is_chromeos)
+ assert(use_vaapi)
+ 
++config("vaapi_permissive") {
++  cflags = [ "-fpermissive" ]
++}
++
+ generate_stubs("libva_stubs") {
+   extra_header = "va_stub_header.fragment"
+   sigs = [ "va.sigs" ]
+@@ -136,6 +140,10 @@ source_set("vaapi") {
+     ]
+   }
+ 
++  if (target_cpu == "x86") {
++    configs += [ ":vaapi_permissive" ]
++  }
++
+   if (use_x11) {
+     deps += [ "//ui/gfx/x" ]
+     sources += [
diff --git a/srcpkgs/qt6-webengine/patches/0900-xxx-ppc64le-libvpx.patch b/srcpkgs/qt6-webengine/patches/0900-xxx-ppc64le-libvpx.patch
new file mode 100644
index 000000000000..5c9566b56bd4
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0900-xxx-ppc64le-libvpx.patch
@@ -0,0 +1,65 @@
+Uses generic target for now. To use ppc64le, change --target to ppc64le-gnu
+and add --enable-vsx, and change generic to ppc for the rtcd header.
+
+From 18e6c5c55cfae0cfb458d8210d7bc709360a0e90 Mon Sep 17 00:00:00 2001
+From: q66 <daniel@octaforge.org>
+Date: Wed, 9 Sep 2020 19:08:25 +0200
+Subject: [PATCH] enable generation of ppc64 libvpx bits
+
+this doesn't update the gni file, that's done from
+the template by running the appropriate scripts
+---
+ third_party/libvpx/BUILD.gn        | 4 ++++
+ third_party/libvpx/generate_gni.sh | 9 +++++++++
+ 2 files changed, 13 insertions(+)
+
+--- a/src/3rdparty/chromium/third_party/libvpx/BUILD.gn
++++ b/src/3rdparty/chromium/third_party/libvpx/BUILD.gn
+@@ -424,6 +424,8 @@ static_library("bundled_libvpx") {
+       sources = libvpx_srcs_arm64
+       public_deps = [ ":libvpx_arm64_headers" ]
+     }
++  } else if (current_cpu == "ppc64") {
++    sources = libvpx_srcs_ppc64
+   }
+ 
+   configs -= [ "//build/config/compiler:chromium_code" ]
+--- a/src/3rdparty/chromium/third_party/libvpx/generate_gni.sh
++++ b/src/3rdparty/chromium/third_party/libvpx/generate_gni.sh
+@@ -374,6 +374,7 @@ gen_config_files linux/arm-neon-highbd "
+ gen_config_files linux/arm64-highbd "--target=armv8-linux-gcc ${all_platforms} ${HIGHBD}"
+ gen_config_files linux/mipsel "--target=mips32-linux-gcc ${all_platforms}"
+ gen_config_files linux/mips64el "--target=mips64-linux-gcc ${all_platforms}"
++gen_config_files linux/ppc64 "--target=generic-gnu $HIGHBD ${all_platforms}"
+ gen_config_files linux/generic "--target=generic-gnu $HIGHBD ${all_platforms}"
+ gen_config_files win/arm64 "--target=arm64-win64-vs15 ${all_platforms} ${HIGHBD}"
+ gen_config_files win/ia32 "--target=x86-win32-vs14 ${all_platforms} ${x86_platforms}"
+@@ -399,6 +400,7 @@ lint_config linux/arm-neon-highbd
+ lint_config linux/arm64-highbd
+ lint_config linux/mipsel
+ lint_config linux/mips64el
++lint_config linux/ppc64
+ lint_config linux/generic
+ lint_config win/arm64
+ lint_config win/ia32
+@@ -428,6 +430,7 @@ gen_rtcd_header linux/arm-neon-highbd ar
+ gen_rtcd_header linux/arm64-highbd armv8
+ gen_rtcd_header linux/mipsel mipsel
+ gen_rtcd_header linux/mips64el mips64el
++gen_rtcd_header linux/ppc64 generic
+ gen_rtcd_header linux/generic generic
+ gen_rtcd_header win/arm64 armv8
+ gen_rtcd_header win/ia32 x86 "${require_sse2}"
+@@ -513,6 +516,12 @@ if [ -z $ONLY_CONFIGS ]; then
+ 
+   echo "MIPS64 source list is identical to MIPS source list. No need to generate it."
+ 
++  echo "Generate ppc64 source list."
++  config=$(print_config_basic linux/ppc64)
++  make_clean
++  make libvpx_srcs.txt target=libs $config > /dev/null
++  convert_srcs_to_project_files libvpx_srcs.txt libvpx_srcs_ppc64
++
+   echo "Generate NaCl source list."
+   config=$(print_config_basic nacl)
+   make_clean
diff --git a/srcpkgs/qt6-webengine/patches/0901-xxx-ppc64le-sandbox-linux-stat.patch b/srcpkgs/qt6-webengine/patches/0901-xxx-ppc64le-sandbox-linux-stat.patch
new file mode 100644
index 000000000000..4b8e6320601c
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0901-xxx-ppc64le-sandbox-linux-stat.patch
@@ -0,0 +1,31 @@
+--- a/src/3rdparty/chromium/sandbox/linux/system_headers/linux_stat.h
++++ b/src/3rdparty/chromium/sandbox/linux/system_headers/linux_stat.h
+@@ -155,6 +155,28 @@ struct kernel_stat {
+   unsigned int __unused4;
+   unsigned int __unused5;
+ };
++#elif defined(__powerpc64__)
++struct kernel_stat {
++  unsigned long	st_dev;
++  unsigned long	st_ino;
++  unsigned long	st_nlink;
++  unsigned int	st_mode;
++  unsigned int	st_uid;
++  unsigned int	st_gid;
++  unsigned long	st_rdev;
++  long		st_size;
++  unsigned long	st_blksize;
++  unsigned long	st_blocks;
++  unsigned long	st_atime_;
++  unsigned long	st_atime_nsec_;
++  unsigned long	st_mtime_;
++  unsigned long	st_mtime_nsec_;
++  unsigned long	st_ctime_;
++  unsigned long	st_ctime_nsec_;
++  unsigned long	__unused4;
++  unsigned long	__unused5;
++  unsigned long	__unused6;
++};
+ #endif
+ 
+ #if !defined(AT_EMPTY_PATH)
diff --git a/srcpkgs/qt6-webengine/patches/0902-xxx-ppc64le-support.patch b/srcpkgs/qt6-webengine/patches/0902-xxx-ppc64le-support.patch
new file mode 100644
index 000000000000..33d415e55f69
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0902-xxx-ppc64le-support.patch
@@ -0,0 +1,3556 @@
+commit 2c013a317b1114ef67cdbbc30824b28907b9ea94
+Author: Daniel Kolesa <daniel@octaforge.org>
+Date:   Wed Mar 3 19:08:29 2021 +0100
+
+    ppc64le support
+
+--- a/src/3rdparty/chromium/sandbox/features.gni
++++ b/src/3rdparty/chromium/sandbox/features.gni
+@@ -11,7 +11,8 @@ import("//build/config/nacl/config.gni")
+ use_seccomp_bpf = (is_linux || is_chromeos || is_android) &&
+                   (current_cpu == "x86" || current_cpu == "x64" ||
+                    current_cpu == "arm" || current_cpu == "arm64" ||
+-                   current_cpu == "mipsel" || current_cpu == "mips64el")
++                   current_cpu == "mipsel" || current_cpu == "mips64el" ||
++                   current_cpu == "ppc64")
+ 
+ use_seccomp_bpf = use_seccomp_bpf || is_nacl_nonsfi
+ 
+--- a/src/3rdparty/chromium/sandbox/linux/BUILD.gn
++++ b/src/3rdparty/chromium/sandbox/linux/BUILD.gn
+@@ -433,6 +433,8 @@ component("sandbox_services") {
+ 
+ source_set("sandbox_services_headers") {
+   sources = [
++    "system_headers/ppc64_linux_syscalls.h",
++    "system_headers/ppc64_linux_ucontext.h",
+     "system_headers/arm64_linux_syscalls.h",
+     "system_headers/arm_linux_syscalls.h",
+     "system_headers/arm_linux_ucontext.h",
+--- a/src/3rdparty/chromium/sandbox/linux/bpf_dsl/linux_syscall_ranges.h
++++ b/src/3rdparty/chromium/sandbox/linux/bpf_dsl/linux_syscall_ranges.h
+@@ -56,6 +56,13 @@
+ #define MAX_PUBLIC_SYSCALL __NR_syscalls
+ #define MAX_SYSCALL MAX_PUBLIC_SYSCALL
+ 
++#elif defined(__powerpc64__)
++
++#include <asm/unistd.h>
++#define MIN_SYSCALL 0u
++#define MAX_PUBLIC_SYSCALL 386u
++#define MAX_SYSCALL MAX_PUBLIC_SYSCALL
++
+ #else
+ #error "Unsupported architecture"
+ #endif
+--- a/src/3rdparty/chromium/sandbox/linux/bpf_dsl/seccomp_macros.h
++++ b/src/3rdparty/chromium/sandbox/linux/bpf_dsl/seccomp_macros.h
+@@ -16,6 +16,9 @@
+ #if defined(__mips__)
+ // sys/user.h in eglibc misses size_t definition
+ #include <stddef.h>
++#elif defined(__powerpc64__) && defined(__GLIBC__)
++// Manually define greg_t on ppc64
++typedef unsigned long long greg_t;
+ #endif
+ #endif
+ 
+@@ -346,6 +349,59 @@ struct regs_struct {
+ #define SECCOMP_PT_PARM4(_regs) (_regs).regs[3]
+ #define SECCOMP_PT_PARM5(_regs) (_regs).regs[4]
+ #define SECCOMP_PT_PARM6(_regs) (_regs).regs[5]
++
++#elif defined(__powerpc64__)
++#include <asm/ptrace.h>
++
++typedef struct pt_regs regs_struct;
++
++#ifdef ARCH_CPU_LITTLE_ENDIAN
++#define SECCOMP_ARCH AUDIT_ARCH_PPC64LE
++#else
++#define SECCOMP_ARCH AUDIT_ARCH_PPC64
++#endif
++
++#ifdef __GLIBC__
++#define SECCOMP_REG(_ctx, _reg) ((_ctx)->uc_mcontext.regs->gpr[_reg])
++#else
++#define SECCOMP_REG(_ctx, _reg) (((struct pt_regs *)(_ctx)->uc_mcontext.regs)->gpr[_reg])
++#endif
++
++#define SECCOMP_RESULT(_ctx) SECCOMP_REG(_ctx, 3)
++#define SECCOMP_SYSCALL(_ctx) SECCOMP_REG(_ctx, 0)
++#ifdef __GLIBC__
++#define SECCOMP_IP(_ctx) (_ctx)->uc_mcontext.regs->nip
++#else
++#define SECCOMP_IP(_ctx) ((struct pt_regs *)(_ctx)->uc_mcontext.regs)->nip
++#endif
++#define SECCOMP_PARM1(_ctx) SECCOMP_REG(_ctx, 3)
++#define SECCOMP_PARM2(_ctx) SECCOMP_REG(_ctx, 4)
++#define SECCOMP_PARM3(_ctx) SECCOMP_REG(_ctx, 5)
++#define SECCOMP_PARM4(_ctx) SECCOMP_REG(_ctx, 6)
++#define SECCOMP_PARM5(_ctx) SECCOMP_REG(_ctx, 7)
++#define SECCOMP_PARM6(_ctx) SECCOMP_REG(_ctx, 8)
++
++#define SECCOMP_NR_IDX (offsetof(struct arch_seccomp_data, nr))
++#define SECCOMP_ARCH_IDX (offsetof(struct arch_seccomp_data, arch))
++#define SECCOMP_IP_MSB_IDX \
++  (offsetof(struct arch_seccomp_data, instruction_pointer) + 4)
++#define SECCOMP_IP_LSB_IDX \
++  (offsetof(struct arch_seccomp_data, instruction_pointer) + 0)
++#define SECCOMP_ARG_MSB_IDX(nr) \
++  (offsetof(struct arch_seccomp_data, args) + 8 * (nr) + 4)
++#define SECCOMP_ARG_LSB_IDX(nr) \
++  (offsetof(struct arch_seccomp_data, args) + 8 * (nr) + 0)
++
++#define SECCOMP_PT_RESULT(_regs) (_regs).gpr[3]
++#define SECCOMP_PT_SYSCALL(_regs) (_regs).gpr[0]
++#define SECCOMP_PT_IP(_regs) (_regs).nip
++#define SECCOMP_PT_PARM1(_regs) (_regs).gpr[3]
++#define SECCOMP_PT_PARM2(_regs) (_regs).gpr[4]
++#define SECCOMP_PT_PARM3(_regs) (_regs).gpr[5]
++#define SECCOMP_PT_PARM4(_regs) (_regs).gpr[6]
++#define SECCOMP_PT_PARM5(_regs) (_regs).gpr[7]
++#define SECCOMP_PT_PARM6(_regs) (_regs).gpr[8]
++
+ #else
+ #error Unsupported target platform
+ 
+--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc
++++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc
+@@ -90,7 +90,7 @@ bool IsBaselinePolicyWatched(int sysno)
+          SyscallSets::IsNuma(sysno) ||
+          SyscallSets::IsPrctl(sysno) ||
+          SyscallSets::IsProcessGroupOrSession(sysno) ||
+-#if defined(__i386__) || \
++#if defined(__i386__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+          SyscallSets::IsSocketCall(sysno) ||
+ #endif
+@@ -258,7 +258,7 @@ ResultExpr EvaluateSyscallImpl(int fs_de
+   }
+ 
+ #if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
+-    defined(__aarch64__)
++    defined(__aarch64__) || defined(__powerpc64__)
+   if (sysno == __NR_mmap)
+     return RestrictMmapFlags();
+ #endif
+@@ -279,7 +279,7 @@ ResultExpr EvaluateSyscallImpl(int fs_de
+     return RestrictPrctl();
+ 
+ #if defined(__x86_64__) || defined(__arm__) || defined(__mips__) || \
+-    defined(__aarch64__)
++    defined(__aarch64__) || defined(__powerpc64__)
+   if (sysno == __NR_socketpair) {
+     // Only allow AF_UNIX, PF_UNIX. Crash if anything else is seen.
+     static_assert(AF_UNIX == PF_UNIX,
+@@ -343,7 +343,8 @@ ResultExpr EvaluateSyscallImpl(int fs_de
+   }
+ 
+ #if defined(__i386__) || \
+-    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
++    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
++    defined(__powerpc64__)
+   if (SyscallSets::IsSocketCall(sysno))
+     return RestrictSocketcallCommand();
+ #endif
+--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/baseline_policy_unittest.cc
++++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/baseline_policy_unittest.cc
+@@ -317,7 +317,7 @@ TEST_BASELINE_SIGSYS(__NR_sysinfo)
+ TEST_BASELINE_SIGSYS(__NR_syslog)
+ TEST_BASELINE_SIGSYS(__NR_timer_create)
+ 
+-#if !defined(__aarch64__)
++#if !defined(__aarch64__) && !defined(__powerpc64__)
+ TEST_BASELINE_SIGSYS(__NR_inotify_init)
+ TEST_BASELINE_SIGSYS(__NR_vserver)
+ #endif
+--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc
++++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc
+@@ -40,6 +40,7 @@
+ #include <sys/ptrace.h>
+ #if (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) && \
+     !defined(__arm__) && !defined(__aarch64__) &&           \
++    !defined(__powerpc64__) &&                              \
+     !defined(PTRACE_GET_THREAD_AREA)
+ // Also include asm/ptrace-abi.h since ptrace.h in older libc (for instance
+ // the one in Ubuntu 16.04 LTS) is missing PTRACE_GET_THREAD_AREA.
+@@ -49,6 +50,11 @@
+ #endif
+ #endif  // !OS_NACL_NONSFI
+ 
++// On PPC64, TCGETS is defined in terms of struct termios, so we must include termios.h
++#ifdef __powerpc64__
++#include <termios.h>
++#endif
++
+ #if defined(OS_ANDROID)
+ 
+ #if !defined(F_DUPFD_CLOEXEC)
+@@ -106,6 +112,14 @@ inline bool IsArchitectureMips() {
+ #endif
+ }
+ 
++inline bool IsArchitecturePPC64() {
++#if defined(__powerpc64__)
++  return true;
++#else
++  return false;
++#endif
++}
++
+ // Ubuntu's version of glibc has a race condition in sem_post that can cause
+ // it to call futex(2) with bogus op arguments. To workaround this, we need
+ // to allow those futex(2) calls to fail with EINVAL, instead of crashing the
+@@ -270,6 +284,8 @@ ResultExpr RestrictFcntlCommands() {
+   uint64_t kOLargeFileFlag = O_LARGEFILE;
+   if (IsArchitectureX86_64() || IsArchitectureI386() || IsArchitectureMips())
+     kOLargeFileFlag = 0100000;
++  else if (IsArchitecturePPC64())
++    kOLargeFileFlag = 0200000;
+ 
+   const Arg<int> cmd(1);
+   const Arg<long> long_arg(2);
+@@ -287,7 +303,16 @@ ResultExpr RestrictFcntlCommands() {
+               F_SETLKW,
+               F_GETLK,
+               F_DUPFD,
+-              F_DUPFD_CLOEXEC),
++              F_DUPFD_CLOEXEC
++#if defined(__powerpc64__)
++// On PPC64, F_SETLK, F_GETLK, F_SETLKW are defined as the 64-bit variants
++// but glibc will sometimes still use the 32-bit versions. Allow both.
++              ,
++              5, /* F_GETLK (32) */
++              6, /* F_SETLK (32) */
++              7  /* F_SETLKW (32) */
++#endif
++	     ),
+              Allow())
+       .Case(F_SETFL,
+             If((long_arg & ~kAllowedMask) == 0, Allow()).Else(CrashSIGSYS()))
+@@ -297,7 +322,7 @@ ResultExpr RestrictFcntlCommands() {
+   // clang-format on
+ }
+ 
+-#if defined(__i386__) || defined(__mips__)
++#if defined(__i386__) || defined(__mips__) || defined(__powerpc64__)
+ ResultExpr RestrictSocketcallCommand() {
+   // Unfortunately, we are unable to restrict the first parameter to
+   // socketpair(2). Whilst initially sounding bad, it's noteworthy that very
+@@ -454,7 +479,7 @@ ResultExpr RestrictPtrace() {
+ #endif
+   return Switch(request)
+       .CASES((
+-#if !defined(__aarch64__)
++#if !defined(__aarch64__) && !defined(__powerpc64__)
+                  PTRACE_GETREGS, PTRACE_GETFPREGS,
+ #if defined(TRACE_GET_THREAD_AREA)
+                  PTRACE_GET_THREAD_AREA,
+--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.h
++++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.h
+@@ -49,7 +49,7 @@ SANDBOX_EXPORT bpf_dsl::ResultExpr Restr
+ // O_NONBLOCK | O_SYNC | O_LARGEFILE | O_CLOEXEC | O_NOATIME.
+ SANDBOX_EXPORT bpf_dsl::ResultExpr RestrictFcntlCommands();
+ 
+-#if defined(__i386__) || defined(__mips__)
++#if defined(__i386__) || defined(__mips__) || defined(__powerpc64__)
+ // Restrict socketcall(2) to only allow socketpair(2), send(2), recv(2),
+ // sendto(2), recvfrom(2), shutdown(2), sendmsg(2) and recvmsg(2).
+ SANDBOX_EXPORT bpf_dsl::ResultExpr RestrictSocketcallCommand();
+--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
++++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
+@@ -28,7 +28,7 @@ bool SyscallSets::IsKill(int sysno) {
+ bool SyscallSets::IsAllowedGettime(int sysno) {
+   switch (sysno) {
+     case __NR_gettimeofday:
+-#if defined(__i386__) || defined(__x86_64__) || \
++#if defined(__i386__) || defined(__x86_64__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_time:
+ #endif
+@@ -51,12 +51,12 @@ bool SyscallSets::IsAllowedGettime(int s
+                                     // filtered by RestrictClockID().
+     case __NR_clock_nanosleep_time64:  // Parameters filtered by RestrictClockID().
+ #endif
+-#if defined(__i386__) || \
++#if defined(__i386__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_ftime:  // Obsolete.
+ #endif
+     case __NR_settimeofday:  // Privileged.
+-#if defined(__i386__) || \
++#if defined(__i386__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_stime:
+ #endif
+@@ -135,7 +135,7 @@ bool SyscallSets::IsFileSystem(int sysno
+     case __NR_faccessat:  // EPERM not a valid errno.
+     case __NR_fchmodat:
+     case __NR_fchownat:  // Should be called chownat ?
+-#if defined(__x86_64__) || defined(__aarch64__)
++#if defined(__x86_64__) || defined(__aarch64__) || defined(__powerpc64__)
+     case __NR_newfstatat:  // fstatat(). EPERM not a valid errno.
+ #elif defined(__i386__) || defined(__arm__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+@@ -154,7 +154,7 @@ bool SyscallSets::IsFileSystem(int sysno
+     case __NR_memfd_create:
+     case __NR_mkdirat:
+     case __NR_mknodat:
+-#if defined(__i386__)
++#if defined(__i386__) || defined(__powerpc64__)
+     case __NR_oldlstat:
+     case __NR_oldstat:
+ #endif
+@@ -167,7 +167,7 @@ bool SyscallSets::IsFileSystem(int sysno
+     case __NR_stat64:
+ #endif
+     case __NR_statfs:  // EPERM not a valid errno.
+-#if defined(__i386__) || defined(__arm__) || \
++#if defined(__i386__) || defined(__arm__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_statfs64:
+ #endif
+@@ -179,7 +179,8 @@ bool SyscallSets::IsFileSystem(int sysno
+     case __NR_truncate64:
+ #endif
+     case __NR_unlinkat:
+-#if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
++#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
++    defined(__powerpc64__)
+     case __NR_utime:
+ #endif
+     case __NR_utimensat:  // New.
+@@ -204,7 +205,8 @@ bool SyscallSets::IsAllowedFileSystemAcc
+ #endif
+       return true;
+ // TODO(jln): these should be denied gracefully as well (moved below).
+-#if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
++#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
++    defined(__powerpc64__)
+     case __NR_fadvise64:  // EPERM not a valid errno.
+ #endif
+ #if defined(__i386__)
+@@ -216,12 +218,12 @@ bool SyscallSets::IsAllowedFileSystemAcc
+     case __NR_fdatasync:  // EPERM not a valid errno.
+     case __NR_flock:      // EPERM not a valid errno.
+     case __NR_fstatfs:    // Give information about the whole filesystem.
+-#if defined(__i386__) || defined(__arm__) || \
++#if defined(__i386__) || defined(__arm__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_fstatfs64:
+ #endif
+     case __NR_fsync:  // EPERM not a valid errno.
+-#if defined(__i386__)
++#if defined(__i386__) || defined(__powerpc64__)
+     case __NR_oldfstat:
+ #endif
+ #if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
+@@ -229,6 +231,8 @@ bool SyscallSets::IsAllowedFileSystemAcc
+     case __NR_sync_file_range:  // EPERM not a valid errno.
+ #elif defined(__arm__)
+     case __NR_arm_sync_file_range:  // EPERM not a valid errno.
++#elif defined(__powerpc64__)
++    case __NR_sync_file_range2: // EPERM not a valid errno.
+ #endif
+     default:
+       return false;
+@@ -248,7 +252,7 @@ bool SyscallSets::IsDeniedFileSystemAcce
+     case __NR_getdents:    // EPERM not a valid errno.
+ #endif
+     case __NR_getdents64:  // EPERM not a valid errno.
+-#if defined(__i386__) || \
++#if defined(__i386__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_readdir:
+ #endif
+@@ -290,7 +294,7 @@ bool SyscallSets::IsGetSimpleId(int sysn
+ bool SyscallSets::IsProcessPrivilegeChange(int sysno) {
+   switch (sysno) {
+     case __NR_capset:
+-#if defined(__i386__) || defined(__x86_64__)
++#if defined(__i386__) || defined(__x86_64__) || defined(__powerpc64__)
+     case __NR_ioperm:  // Intel privilege.
+     case __NR_iopl:    // Intel privilege.
+ #endif
+@@ -340,7 +344,7 @@ bool SyscallSets::IsAllowedSignalHandlin
+     case __NR_rt_sigprocmask:
+     case __NR_rt_sigreturn:
+     case __NR_rt_sigtimedwait:
+-#if defined(__i386__) || defined(__arm__) || \
++#if defined(__i386__) || defined(__arm__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_rt_sigtimedwait_time64:
+     case __NR_sigaction:
+@@ -357,7 +361,7 @@ bool SyscallSets::IsAllowedSignalHandlin
+     case __NR_signalfd:
+ #endif
+     case __NR_signalfd4:
+-#if defined(__i386__) || defined(__arm__) || \
++#if defined(__i386__) || defined(__arm__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_sigpending:
+     case __NR_sigsuspend:
+@@ -382,7 +386,7 @@ bool SyscallSets::IsAllowedOperationOnFd
+ #endif
+     case __NR_dup3:
+ #if defined(__x86_64__) || defined(__arm__) || defined(__mips__) || \
+-    defined(__aarch64__)
++    defined(__aarch64__) || defined(__powerpc64__)
+     case __NR_shutdown:
+ #endif
+       return true;
+@@ -416,7 +420,7 @@ bool SyscallSets::IsAllowedProcessStartO
+     case __NR_membarrier:
+     case __NR_wait4:
+     case __NR_waitid:
+-#if defined(__i386__)
++#if defined(__i386__) || defined(__powerpc64__)
+     case __NR_waitpid:
+ #endif
+ #if !defined(__GLIBC__)
+@@ -438,7 +442,7 @@ bool SyscallSets::IsAllowedProcessStartO
+     case __NR_set_tid_address:
+ #endif
+     case __NR_unshare:
+-#if !defined(__mips__) && !defined(__aarch64__)
++#if !defined(__mips__) && !defined(__aarch64__) || defined(__powerpc64__)
+     case __NR_vfork:
+ #endif
+     default:
+@@ -491,7 +495,7 @@ bool SyscallSets::IsAllowedGetOrModifySo
+       return true;
+     default:
+ #if defined(__x86_64__) || defined(__arm__) || defined(__mips__) || \
+-    defined(__aarch64__)
++    defined(__aarch64__) || defined(__powerpc64__)
+     case __NR_socketpair:  // We will want to inspect its argument.
+ #endif
+       return false;
+@@ -501,7 +505,7 @@ bool SyscallSets::IsAllowedGetOrModifySo
+ bool SyscallSets::IsDeniedGetOrModifySocket(int sysno) {
+   switch (sysno) {
+ #if defined(__x86_64__) || defined(__arm__) || defined(__mips__) || \
+-    defined(__aarch64__)
++    defined(__aarch64__) || defined(__powerpc64__)
+     case __NR_accept:
+     case __NR_accept4:
+     case __NR_bind:
+@@ -515,7 +519,7 @@ bool SyscallSets::IsDeniedGetOrModifySoc
+   }
+ }
+ 
+-#if defined(__i386__) || \
++#if defined(__i386__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+ // Big multiplexing system call for sockets.
+ bool SyscallSets::IsSocketCall(int sysno) {
+@@ -530,7 +534,8 @@ bool SyscallSets::IsSocketCall(int sysno
+ }
+ #endif
+ 
+-#if defined(__x86_64__) || defined(__arm__) || defined(__mips__)
++#if defined(__x86_64__) || defined(__arm__) || defined(__mips__) || \
++    defined(__powerpc64__)
+ bool SyscallSets::IsNetworkSocketInformation(int sysno) {
+   switch (sysno) {
+     case __NR_getpeername:
+@@ -558,7 +563,7 @@ bool SyscallSets::IsAllowedAddressSpaceA
+     case __NR_mincore:
+     case __NR_mlockall:
+ #if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
+-    defined(__aarch64__)
++    defined(__aarch64__) || defined(__powerpc64__)
+     case __NR_mmap:
+ #endif
+ #if defined(__i386__) || defined(__arm__) || \
+@@ -589,7 +594,7 @@ bool SyscallSets::IsAllowedAddressSpaceA
+ bool SyscallSets::IsAllowedGeneralIo(int sysno) {
+   switch (sysno) {
+     case __NR_lseek:
+-#if defined(__i386__) || defined(__arm__) || \
++#if defined(__i386__) || defined(__arm__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR__llseek:
+ #endif
+@@ -609,27 +614,27 @@ bool SyscallSets::IsAllowedGeneralIo(int
+     case __NR_read:
+     case __NR_readv:
+     case __NR_pread64:
+-#if defined(__arm__) || \
++#if defined(__arm__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_recv:
+ #endif
+ #if defined(__x86_64__) || defined(__arm__) || defined(__mips__) || \
+-    defined(__aarch64__)
++    defined(__aarch64__) || defined(__powerpc64__)
+     case __NR_recvfrom:  // Could specify source.
+     case __NR_recvmsg:   // Could specify source.
+ #endif
+-#if defined(__i386__) || defined(__x86_64__)
++#if defined(__i386__) || defined(__x86_64__) || defined(__powerpc64__)
+     case __NR_select:
+ #endif
+-#if defined(__i386__) || defined(__arm__) || defined(__mips__)
++#if defined(__i386__) || defined(__arm__) || defined(__mips__) || defined(__powerpc64__)
+     case __NR__newselect:
+ #endif
+-#if defined(__arm__) || \
++#if defined(__arm__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_send:
+ #endif
+ #if defined(__x86_64__) || defined(__arm__) || defined(__mips__) || \
+-    defined(__aarch64__)
++    defined(__aarch64__) || defined(__powerpc64__)
+     case __NR_sendmsg:  // Could specify destination.
+     case __NR_sendto:   // Could specify destination.
+ #endif
+@@ -684,7 +689,7 @@ bool SyscallSets::IsAllowedBasicSchedule
+     case __NR_nanosleep:
+       return true;
+     case __NR_getpriority:
+-#if defined(__i386__) || defined(__arm__) || \
++#if defined(__i386__) || defined(__arm__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_nice:
+ #endif
+@@ -696,7 +701,7 @@ bool SyscallSets::IsAllowedBasicSchedule
+ 
+ bool SyscallSets::IsAdminOperation(int sysno) {
+   switch (sysno) {
+-#if defined(__i386__) || defined(__arm__) || \
++#if defined(__i386__) || defined(__arm__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_bdflush:
+ #endif
+@@ -713,7 +718,8 @@ bool SyscallSets::IsAdminOperation(int s
+ 
+ bool SyscallSets::IsKernelModule(int sysno) {
+   switch (sysno) {
+-#if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
++#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
++    defined(__powerpc64__)
+     case __NR_create_module:
+     case __NR_get_kernel_syms:  // Should ENOSYS.
+     case __NR_query_module:
+@@ -745,7 +751,7 @@ bool SyscallSets::IsFsControl(int sysno)
+     case __NR_quotactl:
+     case __NR_swapoff:
+     case __NR_swapon:
+-#if defined(__i386__) || \
++#if defined(__i386__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_umount:
+ #endif
+@@ -762,7 +768,7 @@ bool SyscallSets::IsNuma(int sysno) {
+     case __NR_getcpu:
+     case __NR_mbind:
+ #if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
+-    defined(__aarch64__)
++    defined(__aarch64__) || defined(__powerpc64__)
+     case __NR_migrate_pages:
+ #endif
+     case __NR_move_pages:
+@@ -797,13 +803,13 @@ bool SyscallSets::IsGlobalProcessEnviron
+   switch (sysno) {
+     case __NR_acct:  // Privileged.
+ #if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
+-    defined(__aarch64__)
++    defined(__aarch64__) || defined(__powerpc64__)
+     case __NR_getrlimit:
+ #endif
+-#if defined(__i386__) || defined(__arm__)
++#if defined(__i386__) || defined(__arm__) || defined(__powerpc64__)
+     case __NR_ugetrlimit:
+ #endif
+-#if defined(__i386__) || \
++#if defined(__i386__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_ulimit:
+ #endif
+@@ -838,7 +844,7 @@ bool SyscallSets::IsGlobalSystemStatus(i
+ #endif
+     case __NR_sysinfo:
+     case __NR_uname:
+-#if defined(__i386__)
++#if defined(__i386__) || defined(__powerpc64__)
+     case __NR_olduname:
+     case __NR_oldolduname:
+ #endif
+@@ -904,8 +910,16 @@ bool SyscallSets::IsSystemVSemaphores(in
+ }
+ #endif
+ 
++/* shitty hack around Void's 4.19 kernel headers missing those numbers */
++#if defined(__powerpc64__) && !defined(__NR_shmget)
++#define __NR_shmget 395
++#define __NR_shmctl 396
++#define __NR_shmat 397
++#define __NR_shmdt 398
++#endif
++
+ #if defined(__i386__) || defined(__x86_64__) || defined(__arm__) || \
+-    defined(__aarch64__) ||                                         \
++    defined(__aarch64__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_64_BITS))
+ // These give a lot of ambient authority and bypass the setuid sandbox.
+ bool SyscallSets::IsSystemVSharedMemory(int sysno) {
+@@ -936,7 +950,7 @@ bool SyscallSets::IsSystemVMessageQueue(
+ }
+ #endif
+ 
+-#if defined(__i386__) || \
++#if defined(__i386__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+ // Big system V multiplexing system call.
+ bool SyscallSets::IsSystemVIpc(int sysno) {
+@@ -956,7 +970,7 @@ bool SyscallSets::IsAnySystemV(int sysno
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_64_BITS))
+   return IsSystemVMessageQueue(sysno) || IsSystemVSemaphores(sysno) ||
+          IsSystemVSharedMemory(sysno);
+-#elif defined(__i386__) || \
++#elif defined(__i386__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+   return IsSystemVIpc(sysno);
+ #endif
+@@ -1014,7 +1028,8 @@ bool SyscallSets::IsFaNotify(int sysno)
+ bool SyscallSets::IsTimer(int sysno) {
+   switch (sysno) {
+     case __NR_getitimer:
+-#if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
++#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
++    defined(__powerpc64__)
+     case __NR_alarm:
+ #endif
+     case __NR_setitimer:
+@@ -1096,17 +1111,20 @@ bool SyscallSets::IsMisc(int sysno) {
+     case __NR_syncfs:
+     case __NR_vhangup:
+ // The system calls below are not implemented.
+-#if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
++#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
++    defined(__powerpc64__)
+     case __NR_afs_syscall:
+ #endif
+ #if defined(__i386__) || \
+-    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
++    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
++    defined(__powerpc64__)
+     case __NR_break:
+ #endif
+-#if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
++#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
++    defined(__powerpc64__)
+     case __NR_getpmsg:
+ #endif
+-#if defined(__i386__) || \
++#if defined(__i386__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_gtty:
+     case __NR_idle:
+@@ -1115,20 +1133,21 @@ bool SyscallSets::IsMisc(int sysno) {
+     case __NR_prof:
+     case __NR_profil:
+ #endif
+-#if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
++#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
++    defined(__powerpc64__)
+     case __NR_putpmsg:
+ #endif
+ #if defined(__x86_64__)
+     case __NR_security:
+ #endif
+-#if defined(__i386__) || \
++#if defined(__i386__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_stty:
+ #endif
+-#if defined(__x86_64__)
++#if defined(__x86_64__) || defined(__powerpc64__)
+     case __NR_tuxcall:
+ #endif
+-#if !defined(__aarch64__)
++#if !defined(__aarch64__) && !defined(__powerpc64__)
+     case __NR_vserver:
+ #endif
+       return true;
+--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_sets.h
++++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_sets.h
+@@ -43,13 +43,14 @@ class SANDBOX_EXPORT SyscallSets {
+   static bool IsDeniedGetOrModifySocket(int sysno);
+ 
+ #if defined(__i386__) || \
+-    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
++    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
++    defined(__powerpc64__)
+   // Big multiplexing system call for sockets.
+   static bool IsSocketCall(int sysno);
+ #endif
+ 
+ #if defined(__x86_64__) || defined(__arm__) || defined(__mips__) || \
+-    defined(__aarch64__)
++    defined(__aarch64__) || defined(__powerpc64__)
+   static bool IsNetworkSocketInformation(int sysno);
+ #endif
+ 
+@@ -77,7 +78,7 @@ class SANDBOX_EXPORT SyscallSets {
+   static bool IsSystemVSemaphores(int sysno);
+ #endif
+ #if defined(__i386__) || defined(__x86_64__) || defined(__arm__) || \
+-    defined(__aarch64__) ||                                         \
++    defined(__aarch64__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_64_BITS))
+   // These give a lot of ambient authority and bypass the setuid sandbox.
+   static bool IsSystemVSharedMemory(int sysno);
+@@ -89,7 +90,8 @@ class SANDBOX_EXPORT SyscallSets {
+ #endif
+ 
+ #if defined(__i386__) || \
+-    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
++    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
++    defined(__powerpc64__)
+   // Big system V multiplexing system call.
+   static bool IsSystemVIpc(int sysno);
+ #endif
+--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf/syscall.cc
++++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf/syscall.cc
+@@ -18,7 +18,7 @@ namespace sandbox {
+ namespace {
+ 
+ #if defined(ARCH_CPU_X86_FAMILY) || defined(ARCH_CPU_ARM_FAMILY) || \
+-    defined(ARCH_CPU_MIPS_FAMILY)
++    defined(ARCH_CPU_MIPS_FAMILY) || defined (ARCH_CPU_PPC64_FAMILY)
+ // Number that's not currently used by any Linux kernel ABIs.
+ const int kInvalidSyscallNumber = 0x351d3;
+ #else
+@@ -312,10 +312,54 @@ asm(// We need to be able to tell the ke
+     "2:ret\n"
+     ".cfi_endproc\n"
+     ".size SyscallAsm, .-SyscallAsm\n"
++#elif defined(__powerpc64__)
++    ".text\n"
++    ".align 4\n"
++    ".type SyscallAsm @function\n"
++    "SyscallAsm:\n"
++    ".cfi_startproc\n"
++
++    // Check if r3 is negative
++    "cmpdi 3, 0\n"
++    "bgt 2f\n"
++
++    // Load address of 3f into r3 and return
++    "mflr 10\n"
++    "bl 1f\n"
++    "1: mflr 3\n"
++    "mtlr 10\n"
++    "addi 3, 3, 4*13\n"
++    "blr\n"
++
++    // Load arguments from array into r3-8
++    // save param 3 in r10
++    "2:\n"
++    "mr 0, 3\n"
++    "ld 3, 0(4)\n"
++    "ld 5, 16(4)\n"
++    "ld 6, 24(4)\n"
++    "ld 7, 32(4)\n"
++    "ld 8, 40(4)\n"
++    "ld 4, 8(4)\n"
++    "li 9, 0\n"
++
++    // Enter kernel
++    "sc\n"
++
++    // Magic return address
++    "3:\n"
++    // Like MIPS, ppc64 return values are always positive.
++    // Check for error in cr0.SO and negate upon error
++    "bc 4, 3, 4f\n"
++    "neg 3, 3\n"
++    "4: blr\n"
++
++    ".cfi_endproc\n"
++    ".size SyscallAsm, .-SyscallAsm\n"
+ #endif
+     );  // asm
+ 
+-#if defined(__x86_64__)
++#if defined(__x86_64__) || defined(__powerpc64__)
+ extern "C" {
+ intptr_t SyscallAsm(intptr_t nr, const intptr_t args[6]);
+ }
+@@ -429,6 +473,8 @@ intptr_t Syscall::Call(int nr,
+     ret = inout;
+   }
+ 
++#elif defined(__powerpc64__)
++  intptr_t ret = SyscallAsm(nr, args);
+ #else
+ #error "Unimplemented architecture"
+ #endif
+@@ -445,8 +491,26 @@ void Syscall::PutValueInUcontext(intptr_
+     // needs to be changed back.
+     ret_val = -ret_val;
+     SECCOMP_PARM4(ctx) = 1;
+-  } else
++  } else {
+     SECCOMP_PARM4(ctx) = 0;
++  }
++#endif
++#if defined(__powerpc64__)
++  // Same as MIPS, need to invert ret and set error register (cr0.SO)
++  if (ret_val <= -1 && ret_val >= -4095) {
++    ret_val = -ret_val;
++#ifdef __GLIBC__
++    ctx->uc_mcontext.regs->ccr |= (1 << 28);
++#else
++    ((struct pt_regs *)ctx->uc_mcontext.regs)->ccr |= (1 << 28);
++#endif
++  } else {
++#ifdef __GLIBC__
++    ctx->uc_mcontext.regs->ccr &= ~(1 << 28);
++#else
++    ((struct pt_regs *)ctx->uc_mcontext.regs)->ccr &= ~(1 << 28);
++#endif
++  }
+ #endif
+   SECCOMP_RESULT(ctx) = static_cast<greg_t>(ret_val);
+ }
+--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf/trap.cc
++++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf/trap.cc
+@@ -236,6 +236,20 @@ void Trap::SigSys(int nr, LinuxSigInfo*
+       SetIsInSigHandler();
+     }
+ 
++#if defined(__powerpc64__)
++    // On ppc64+glibc, some syscalls seem to accidentally negate the first
++    // parameter which causes checks against it to fail. For now, manually
++    // negate them back.
++    // TODO(shawn@anastas.io): investigate this issue further
++    auto nr = SECCOMP_SYSCALL(ctx);
++    if (nr == __NR_openat || nr == __NR_mkdirat || nr == __NR_faccessat || nr == __NR_readlinkat ||
++        nr == __NR_renameat || nr == __NR_renameat2 || nr == __NR_newfstatat || nr == __NR_unlinkat) {
++        if (static_cast<int>(SECCOMP_PARM1(ctx)) > 0) {
++            SECCOMP_PARM1(ctx) = -SECCOMP_PARM1(ctx);
++        }
++    }
++#endif
++
+     // Copy the seccomp-specific data into a arch_seccomp_data structure. This
+     // is what we are showing to TrapFnc callbacks that the system call
+     // evaluator registered with the sandbox.
+--- a/src/3rdparty/chromium/sandbox/linux/services/credentials.cc
++++ b/src/3rdparty/chromium/sandbox/linux/services/credentials.cc
+@@ -81,7 +81,7 @@ bool ChrootToSafeEmptyDir() {
+   pid_t pid = -1;
+   alignas(16) char stack_buf[PTHREAD_STACK_MIN];
+ #if defined(ARCH_CPU_X86_FAMILY) || defined(ARCH_CPU_ARM_FAMILY) || \
+-    defined(ARCH_CPU_MIPS_FAMILY)
++    defined(ARCH_CPU_MIPS_FAMILY) || defined(ARCH_CPU_PPC64_FAMILY)
+   // The stack grows downward.
+   void* stack = stack_buf + sizeof(stack_buf);
+ #else
+--- a/src/3rdparty/chromium/sandbox/linux/services/syscall_wrappers.cc
++++ b/src/3rdparty/chromium/sandbox/linux/services/syscall_wrappers.cc
+@@ -61,7 +61,7 @@ long sys_clone(unsigned long flags,
+ #if defined(ARCH_CPU_X86_64)
+   return syscall(__NR_clone, flags, child_stack, ptid, ctid, tls);
+ #elif defined(ARCH_CPU_X86) || defined(ARCH_CPU_ARM_FAMILY) || \
+-    defined(ARCH_CPU_MIPS_FAMILY)
++    defined(ARCH_CPU_MIPS_FAMILY) || defined(ARCH_CPU_PPC64_FAMILY)
+   // CONFIG_CLONE_BACKWARDS defined.
+   return syscall(__NR_clone, flags, child_stack, ptid, tls, ctid);
+ #endif
+--- a/src/3rdparty/chromium/sandbox/linux/syscall_broker/broker_process.cc
++++ b/src/3rdparty/chromium/sandbox/linux/syscall_broker/broker_process.cc
+@@ -165,7 +165,7 @@ bool BrokerProcess::IsSyscallBrokerable(
+ #if defined(__NR_fstatat64)
+     case __NR_fstatat64:
+ #endif
+-#if defined(__x86_64__) || defined(__aarch64__)
++#if defined(__x86_64__) || defined(__aarch64__) || defined(__powerpc64__)
+     case __NR_newfstatat:
+ #endif
+       return !fast_check || allowed_command_set_.test(COMMAND_STAT);
+--- a/src/3rdparty/chromium/sandbox/linux/system_headers/linux_seccomp.h
++++ b/src/3rdparty/chromium/sandbox/linux/system_headers/linux_seccomp.h
+@@ -41,6 +41,9 @@
+ #ifndef EM_AARCH64
+ #define EM_AARCH64 183
+ #endif
++#ifndef EM_PPC64
++#define EM_PPC64 21
++#endif
+ 
+ #ifndef __AUDIT_ARCH_64BIT
+ #define __AUDIT_ARCH_64BIT 0x80000000
+@@ -74,6 +77,14 @@
+ #define AUDIT_ARCH_AARCH64 (EM_AARCH64 | __AUDIT_ARCH_64BIT | __AUDIT_ARCH_LE)
+ #endif
+ 
++#ifndef AUDIT_ARCH_PPC64
++#define AUDIT_ARCH_PPC64 (EM_PPC64 | __AUDIT_ARCH_64BIT)
++#endif
++
++#ifndef AUDIT_ARCH_PPC64LE
++#define AUDIT_ARCH_PPC64LE (EM_PPC64 | __AUDIT_ARCH_64BIT | __AUDIT_ARCH_LE)
++#endif
++
+ // For prctl.h
+ #ifndef PR_SET_SECCOMP
+ #define PR_SET_SECCOMP               22
+--- a/src/3rdparty/chromium/sandbox/linux/system_headers/linux_signal.h
++++ b/src/3rdparty/chromium/sandbox/linux/system_headers/linux_signal.h
+@@ -13,7 +13,7 @@
+ // (not undefined, but defined different values and in different memory
+ // layouts). So, fill the gap here.
+ #if defined(__i386__) || defined(__x86_64__) || defined(__arm__) || \
+-    defined(__aarch64__)
++    defined(__aarch64__) || defined(__powerpc64__)
+ 
+ #define LINUX_SIGHUP 1
+ #define LINUX_SIGINT 2
+--- a/src/3rdparty/chromium/sandbox/linux/system_headers/linux_syscalls.h
++++ b/src/3rdparty/chromium/sandbox/linux/system_headers/linux_syscalls.h
+@@ -35,5 +35,9 @@
+ #include "sandbox/linux/system_headers/arm64_linux_syscalls.h"
+ #endif
+ 
++#if defined(__powerpc64__)
++#include "sandbox/linux/system_headers/ppc64_linux_syscalls.h"
++#endif
++
+ #endif  // SANDBOX_LINUX_SYSTEM_HEADERS_LINUX_SYSCALLS_H_
+ 
+--- a/src/3rdparty/chromium/sandbox/linux/system_headers/linux_ucontext.h
++++ b/src/3rdparty/chromium/sandbox/linux/system_headers/linux_ucontext.h
+@@ -11,6 +11,8 @@
+ #include "sandbox/linux/system_headers/arm_linux_ucontext.h"
+ #elif defined(__i386__)
+ #include "sandbox/linux/system_headers/i386_linux_ucontext.h"
++#elif defined(__powerpc64__)
++#include "sandbox/linux/system_headers/ppc64_linux_ucontext.h"
+ #else
+ #error "No support for your architecture in PNaCl header"
+ #endif
+--- a/src/3rdparty/chromium/sandbox/policy/linux/bpf_renderer_policy_linux.cc
++++ b/src/3rdparty/chromium/sandbox/policy/linux/bpf_renderer_policy_linux.cc
+@@ -15,6 +15,11 @@
+ #include "sandbox/linux/system_headers/linux_syscalls.h"
+ #include "sandbox/policy/linux/sandbox_linux.h"
+ 
++// On PPC64, TCGETS is defined in terms of struct termios, so we must include termios.h
++#ifdef __powerpc64__
++#include <termios.h>
++#endif
++
+ // TODO(vignatti): replace the local definitions below with #include
+ // <linux/dma-buf.h> once kernel version 4.6 becomes widely used.
+ #include <linux/types.h>
+--- a/src/3rdparty/chromium/third_party/angle/src/compiler/translator/InfoSink.h
++++ b/src/3rdparty/chromium/third_party/angle/src/compiler/translator/InfoSink.h
+@@ -93,7 +93,16 @@ class TInfoSinkBase
+             stream.precision(8);
+             stream << f;
+         }
+-        sink.append(stream.str());
++
++        // Hack to work around a bug where negative floating point values
++        // are rendered like '.0.5' instead of '-0.5'
++        std::string res(stream.str());
++
++        if (signbit(f)) { // test if f is negative
++            res[0] = '-';
++        }
++
++        sink.append(res);
+         return *this;
+     }
+     // Write boolean values as their names instead of integral value.
+--- a/src/3rdparty/chromium/third_party/angle/src/libANGLE/Constants.h
++++ b/src/3rdparty/chromium/third_party/angle/src/libANGLE/Constants.h
+@@ -9,6 +9,7 @@
+ #ifndef LIBANGLE_CONSTANTS_H_
+ #define LIBANGLE_CONSTANTS_H_
+ 
++#include <cstddef>
+ #include "common/platform.h"
+ 
+ #include <stdint.h>
+--- a/src/3rdparty/chromium/third_party/boringssl/BUILD.gn
++++ b/src/3rdparty/chromium/third_party/boringssl/BUILD.gn
+@@ -99,6 +99,13 @@ if (is_win && !is_msan && current_cpu !=
+       } else {
+         public_configs = [ ":no_asm_config" ]
+       }
++    } else if (current_cpu == "ppc64") {
++      if (is_linux) {
++        # TODO: ppc64 (be) check
++        sources += crypto_sources_linux_ppc64le
++      } else {
++        public_configs = [ ":no_asm_config" ]
++      }
+     } else {
+       public_configs = [ ":no_asm_config" ]
+     }
+--- a/src/3rdparty/chromium/third_party/breakpad/BUILD.gn
++++ b/src/3rdparty/chromium/third_party/breakpad/BUILD.gn
+@@ -623,7 +623,6 @@ if (is_linux || is_chromeos || is_androi
+       "breakpad/src/client/minidump_file_writer.h",
+       "breakpad/src/common/convert_UTF.cc",
+       "breakpad/src/common/convert_UTF.h",
+-      "breakpad/src/common/linux/breakpad_getcontext.S",
+       "breakpad/src/common/linux/elf_core_dump.cc",
+       "breakpad/src/common/linux/elf_core_dump.h",
+       "breakpad/src/common/linux/elfutils.cc",
+@@ -663,6 +662,15 @@ if (is_linux || is_chromeos || is_androi
+ 
+     libs = [ "dl" ]
+ 
++    if (current_cpu == "ppc64") {
++        defines = [ "HAVE_GETCONTEXT" ]
++        libs += [ "ucontext" ]
++    } else {
++        sources += [
++            "breakpad/src/common/linux/breakpad_getcontext.S"
++        ]
++    }
++
+     include_dirs = [
+       ".",
+       "breakpad/src",
+@@ -712,7 +720,6 @@ if (is_linux || is_chromeos || is_androi
+       "breakpad/src/client/linux/minidump_writer/minidump_writer_unittest.cc",
+       "breakpad/src/client/linux/minidump_writer/minidump_writer_unittest_utils.cc",
+       "breakpad/src/client/linux/minidump_writer/proc_cpuinfo_reader_unittest.cc",
+-      "breakpad/src/common/linux/breakpad_getcontext_unittest.cc",
+       "breakpad/src/common/linux/elf_core_dump_unittest.cc",
+       "breakpad/src/common/linux/file_id_unittest.cc",
+       "breakpad/src/common/linux/linux_libc_support_unittest.cc",
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/raw_context_cpu.h
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/raw_context_cpu.h
+@@ -44,6 +44,8 @@ typedef MDRawContextARM RawContextCPU;
+ typedef MDRawContextARM64_Old RawContextCPU;
+ #elif defined(__mips__)
+ typedef MDRawContextMIPS RawContextCPU;
++#elif defined(__powerpc64__)
++typedef MDRawContextPPC64 RawContextCPU;
+ #else
+ #error "This code has not been ported to your platform yet."
+ #endif
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.cc
+@@ -270,7 +270,54 @@ void ThreadInfo::FillCPUContext(RawConte
+   out->float_save.fir = mcontext.fpc_eir;
+ #endif
+ }
+-#endif  // __mips__
++
++#elif defined(__powerpc64__)
++
++#if !defined(__GLIBC__)
++#include <asm/elf.h>
++#include <asm/ptrace.h>
++#endif
++
++uintptr_t ThreadInfo::GetInstructionPointer() const {
++    return mcontext.gp_regs[PT_NIP];
++}
++
++void ThreadInfo::FillCPUContext(RawContextCPU* out) const {
++    out->context_flags = MD_CONTEXT_PPC64_FULL;
++    for (int i = 0; i < MD_CONTEXT_PPC64_GPR_COUNT; i++)
++        out->gpr[i] = mcontext.gp_regs[i];
++
++    out->lr = mcontext.gp_regs[PT_LNK];
++    out->srr0 = mcontext.gp_regs[PT_NIP];
++    out->srr1 = mcontext.gp_regs[PT_MSR];
++    out->cr = mcontext.gp_regs[PT_CCR];
++    out->xer = mcontext.gp_regs[PT_XER];
++    out->ctr = mcontext.gp_regs[PT_CTR];
++
++#ifdef __GLIBC__
++    for (int i = 0; i < MD_FLOATINGSAVEAREA_PPC_FPR_COUNT; i++)
++        out->float_save.fpregs[i] = mcontext.fp_regs[i];
++
++    out->float_save.fpscr = mcontext.fp_regs[NFPREG-1];
++#else
++    for (int i = 0; i < MD_FLOATINGSAVEAREA_PPC_FPR_COUNT; i++)
++        out->float_save.fpregs[i] = ((uint64_t *)&mcontext.fp_regs)[i];
++
++     out->float_save.fpscr = ((uint64_t *)&mcontext.fp_regs)[ELF_NFPREG-1];
++#endif
++
++    for (int i = 0; i < MD_VECTORSAVEAREA_PPC_VR_COUNT; i++)
++        out->vector_save.save_vr[i] = \
++            {(((uint64_t)vregs.vrregs[i][0]) << 32)
++                          | vregs.vrregs[i][1],
++            (((uint64_t)vregs.vrregs[i][2]) << 32)
++                         | vregs.vrregs[i][3]};
++
++    out->vrsave = vregs.vrsave;
++    out->vector_save.save_vscr = {0, vregs.vscr.vscr_word};
++    out->vector_save.save_vrvalid = 0xFFFFFFFF;
++}
++#endif  // __powerpc64__
+ 
+ void ThreadInfo::GetGeneralPurposeRegisters(void** gp_regs, size_t* size) {
+   assert(gp_regs || size);
+@@ -279,6 +326,11 @@ void ThreadInfo::GetGeneralPurposeRegist
+     *gp_regs = mcontext.gregs;
+   if (size)
+     *size = sizeof(mcontext.gregs);
++#elif defined(__powerpc64__)
++  if (gp_regs)
++    *gp_regs = mcontext.gp_regs;
++  if (size)
++    *size = sizeof(mcontext.gp_regs);
+ #else
+   if (gp_regs)
+     *gp_regs = &regs;
+@@ -294,6 +346,11 @@ void ThreadInfo::GetFloatingPointRegiste
+     *fp_regs = &mcontext.fpregs;
+   if (size)
+     *size = sizeof(mcontext.fpregs);
++#elif defined(__powerpc64__)
++  if (fp_regs)
++    *fp_regs = &mcontext.fp_regs;
++  if (size)
++    *size = sizeof(mcontext.fp_regs);
+ #else
+   if (fp_regs)
+     *fp_regs = &fpregs;
+@@ -302,4 +359,13 @@ void ThreadInfo::GetFloatingPointRegiste
+ #endif
+ }
+ 
++#if defined(__powerpc64__)
++void ThreadInfo::GetVectorRegisters(void** v_regs, size_t* size) {
++    if (v_regs)
++        *v_regs = &vregs;
++    if (size)
++        *size = sizeof(vregs);
++}
++#endif
++
+ }  // namespace google_breakpad
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.h
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.h
+@@ -68,6 +68,10 @@ struct ThreadInfo {
+   // Use the structures defined in <sys/user.h>
+   struct user_regs_struct regs;
+   struct user_fpsimd_struct fpregs;
++#elif defined(__powerpc64__)
++  // Use the structures defined in <sys/ucontext.h>.
++  mcontext_t mcontext;
++  vrregset_t vregs;
+ #elif defined(__mips__)
+   // Use the structure defined in <sys/ucontext.h>.
+   mcontext_t mcontext;
+@@ -84,6 +88,11 @@ struct ThreadInfo {
+ 
+   // Returns the pointer and size of float point register area.
+   void GetFloatingPointRegisters(void** fp_regs, size_t* size);
++
++#if defined(__powerpc64__)
++  // Returns the pointer and size of the vector register area. (PPC64 only)
++  void GetVectorRegisters(void** v_regs, size_t* size);
++#endif
+ };
+ 
+ }  // namespace google_breakpad
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc
+@@ -254,6 +254,60 @@ void UContextReader::FillCPUContext(RawC
+   out->float_save.fir = uc->uc_mcontext.fpc_eir;  // Unused.
+ #endif
+ }
++
++#elif defined(__powerpc64__)
++
++#ifndef __GLIBC__
++#include <asm/elf.h>
++#include <asm/ptrace.h>
++#endif
++
++uintptr_t UContextReader::GetStackPointer(const ucontext_t* uc) {
++    return uc->uc_mcontext.gp_regs[MD_CONTEXT_PPC64_REG_SP];
++}
++
++uintptr_t UContextReader::GetInstructionPointer(const ucontext_t* uc) {
++    return uc->uc_mcontext.gp_regs[PT_NIP];
++}
++
++void UContextReader::FillCPUContext(RawContextCPU* out, const ucontext_t* uc,
++                                    const vrregset_t* vregs) {
++    out->context_flags = MD_CONTEXT_PPC64_FULL;
++
++    for (int i = 0; i < MD_CONTEXT_PPC64_GPR_COUNT; i++)
++        out->gpr[i] = uc->uc_mcontext.gp_regs[i];
++
++    out->lr = uc->uc_mcontext.gp_regs[PT_LNK];
++    out->srr0 = uc->uc_mcontext.gp_regs[PT_NIP];
++    out->srr1 = uc->uc_mcontext.gp_regs[PT_MSR];
++    out->cr = uc->uc_mcontext.gp_regs[PT_CCR];
++    out->xer = uc->uc_mcontext.gp_regs[PT_XER];
++    out->ctr = uc->uc_mcontext.gp_regs[PT_CTR];
++
++#ifdef __GLIBC__
++    for (int i = 0; i < MD_FLOATINGSAVEAREA_PPC_FPR_COUNT; i++)
++        out->float_save.fpregs[i] = uc->uc_mcontext.fp_regs[i];
++
++    out->float_save.fpscr = uc->uc_mcontext.fp_regs[NFPREG-1];
++#else
++    for (int i = 0; i < MD_FLOATINGSAVEAREA_PPC_FPR_COUNT; i++)
++        out->float_save.fpregs[i] = ((uint64_t *)&uc->uc_mcontext.fp_regs)[i];
++
++    out->float_save.fpscr = ((uint64_t *)&uc->uc_mcontext.fp_regs)[ELF_NFPREG-1];
++#endif
++
++    for (int i = 0; i < MD_VECTORSAVEAREA_PPC_VR_COUNT; i++)
++        out->vector_save.save_vr[i] =
++            {(((uint64_t)vregs->vrregs[i][0]) << 32)
++                         | vregs->vrregs[i][1],
++             (((uint64_t)vregs->vrregs[i][2]) << 32)
++                         | vregs->vrregs[i][3]};
++
++    out->vrsave = vregs->vrsave;
++    out->vector_save.save_vscr = {0, vregs->vscr.vscr_word};
++    out->vector_save.save_vrvalid = 0xFFFFFFFF;
++}
++
+ #endif
+ 
+ }  // namespace google_breakpad
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h
+@@ -59,6 +59,9 @@ struct UContextReader {
+ #elif defined(__aarch64__)
+   static void FillCPUContext(RawContextCPU* out, const ucontext_t* uc,
+                              const struct fpsimd_context* fpregs);
++#elif defined(__powerpc64__)
++  static void FillCPUContext(RawContextCPU *out, const ucontext_t *uc,
++                             const vrregset_t* vregs);
+ #else
+   static void FillCPUContext(RawContextCPU* out, const ucontext_t* uc);
+ #endif
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc
+@@ -105,6 +105,13 @@
+ #define PR_SET_PTRACER 0x59616d61
+ #endif
+ 
++/* musl hack, can't include asm/ptrace.h as that causes conflicts */
++#ifndef __GLIBC__
++#if defined(__powerpc64__) && !defined(PT_NIP)
++#define PT_NIP 32
++#endif
++#endif
++
+ namespace google_breakpad {
+ 
+ namespace {
+@@ -461,9 +468,16 @@ bool ExceptionHandler::HandleSignal(int
+     memcpy(&g_crash_context_.float_state, fp_ptr,
+            sizeof(g_crash_context_.float_state));
+   }
++#elif defined(__powerpc64__)
++  // On PPC64, we must copy VR state
++  ucontext_t* uc_ptr = (ucontext_t*)uc;
++  if (uc_ptr->uc_mcontext.v_regs) {
++    memcpy(&g_crash_context_.vector_state, uc_ptr->uc_mcontext.v_regs,
++           sizeof(g_crash_context_.vector_state));
++  }
+ #elif !defined(__ARM_EABI__) && !defined(__mips__)
+   // FP state is not part of user ABI on ARM Linux.
+-  // In case of MIPS Linux FP state is already part of ucontext_t
++  // In case of MIPS, Linux FP state is already part of ucontext_t
+   // and 'float_state' is not a member of CrashContext.
+   ucontext_t* uc_ptr = (ucontext_t*)uc;
+   if (uc_ptr->uc_mcontext.fpregs) {
+@@ -708,11 +722,19 @@ bool ExceptionHandler::WriteMinidump() {
+   }
+ #endif
+ 
+-#if !defined(__ARM_EABI__) && !defined(__aarch64__) && !defined(__mips__)
++#if !defined(__ARM_EABI__) && !defined(__aarch64__) && !defined(__mips__) \
++    && !defined(__powerpc64__)
+   // FPU state is not part of ARM EABI ucontext_t.
+   memcpy(&context.float_state, context.context.uc_mcontext.fpregs,
+          sizeof(context.float_state));
+ #endif
++
++#if defined(__powerpc64__)
++  // Vector registers must be copied on PPC64
++  memcpy(&context.vector_state, context.context.uc_mcontext.v_regs,
++         sizeof(context.vector_state));
++#endif
++
+   context.tid = sys_gettid();
+ 
+   // Add an exception stream to the minidump for better reporting.
+@@ -733,6 +755,9 @@ bool ExceptionHandler::WriteMinidump() {
+ #elif defined(__mips__)
+   context.siginfo.si_addr =
+       reinterpret_cast<void*>(context.context.uc_mcontext.pc);
++#elif defined(__powerpc64__)
++  context.siginfo.si_addr =
++      reinterpret_cast<void*>(context.context.uc_mcontext.gp_regs[PT_NIP]);
+ #else
+ #error "This code has not been ported to your platform yet."
+ #endif
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.h
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.h
+@@ -192,7 +192,11 @@ class ExceptionHandler {
+     siginfo_t siginfo;
+     pid_t tid;  // the crashing thread.
+     ucontext_t context;
+-#if !defined(__ARM_EABI__) && !defined(__mips__)
++#if defined(__powerpc64__)
++    // PPC64's FP state is a part of ucontext_t like MIPS but the vector
++    // state is not, so a struct is needed.
++    vstate_t vector_state;
++#elif !defined(__ARM_EABI__) && !defined(__mips__)
+     // #ifdef this out because FP state is not part of user ABI for Linux ARM.
+     // In case of MIPS Linux FP state is already part of ucontext_t so
+     // 'float_state' is not required.
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler_unittest.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler_unittest.cc
+@@ -307,7 +307,7 @@ TEST(ExceptionHandlerTest, ParallelChild
+   }
+ 
+   // Wait a while until the child should have crashed.
+-  usleep(1000000);
++  usleep(2000000);
+   // Kill the child if it is still running.
+   kill(child, SIGKILL);
+ 
+@@ -559,6 +559,8 @@ const unsigned char kIllegalInstruction[
+ #if defined(__mips__)
+   // mfc2 zero,Impl - usually illegal in userspace.
+   0x48, 0x00, 0x00, 0x48
++#elif defined(__powerpc64__)
++  0x01, 0x01, 0x01, 0x01 // Crashes on a tested POWER9 cpu
+ #else
+   // This crashes with SIGILL on x86/x86-64/arm.
+   0xff, 0xff, 0xff, 0xff
+@@ -754,10 +756,10 @@ TEST(ExceptionHandlerTest, InstructionPo
+ 
+   // These are defined here so the parent can use them to check the
+   // data from the minidump afterwards.
+-  // Use 4k here because the OS will hand out a single page even
++  // Use the page size here because the OS will hand out a single page even
+   // if a smaller size is requested, and this test wants to
+   // test the upper bound of the memory range.
+-  const uint32_t kMemorySize = 4096;  // bytes
++  const uint32_t kMemorySize = getpagesize();  // bytes
+   const int kOffset = kMemorySize - sizeof(kIllegalInstruction);
+ 
+   const pid_t child = fork();
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/microdump_writer/microdump_writer.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/microdump_writer/microdump_writer.cc
+@@ -138,7 +138,9 @@ class MicrodumpWriter {
+                   const MicrodumpExtraInfo& microdump_extra_info,
+                   LinuxDumper* dumper)
+       : ucontext_(context ? &context->context : NULL),
+-#if !defined(__ARM_EABI__) && !defined(__mips__)
++#if defined(__powerpc64__)
++        vector_state_(context ? &context->vector_state : NULL),
++#elif !defined(__ARM_EABI__) && !defined(__mips__)
+         float_state_(context ? &context->float_state : NULL),
+ #endif
+         dumper_(dumper),
+@@ -337,6 +339,8 @@ class MicrodumpWriter {
+ # else
+ #  error "This mips ABI is currently not supported (n32)"
+ #endif
++#elif defined(__powerpc64__)
++    const char kArch[] = "ppc64";
+ #else
+ #error "This code has not been ported to your platform yet"
+ #endif
+@@ -409,7 +413,9 @@ class MicrodumpWriter {
+   void DumpCPUState() {
+     RawContextCPU cpu;
+     my_memset(&cpu, 0, sizeof(RawContextCPU));
+-#if !defined(__ARM_EABI__) && !defined(__mips__)
++#if defined(__powerpc64__)
++    UContextReader::FillCPUContext(&cpu, ucontext_, vector_state_);
++#elif !defined(__ARM_EABI__) && !defined(__mips__)
+     UContextReader::FillCPUContext(&cpu, ucontext_, float_state_);
+ #else
+     UContextReader::FillCPUContext(&cpu, ucontext_);
+@@ -605,7 +611,9 @@ class MicrodumpWriter {
+   void* Alloc(unsigned bytes) { return dumper_->allocator()->Alloc(bytes); }
+ 
+   const ucontext_t* const ucontext_;
+-#if !defined(__ARM_EABI__) && !defined(__mips__)
++#if defined(__powerpc64__)
++  const google_breakpad::vstate_t* const vector_state_;
++#elif !defined(__ARM_EABI__) && !defined(__mips__)
+   const google_breakpad::fpstate_t* const float_state_;
+ #endif
+   LinuxDumper* dumper_;
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/microdump_writer/microdump_writer_unittest.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/microdump_writer/microdump_writer_unittest.cc
+@@ -279,10 +279,19 @@ TEST(MicrodumpWriterTest, BasicWithMappi
+   CrashAndGetMicrodump(mappings, MicrodumpExtraInfo(), &buf);
+   ASSERT_TRUE(ContainsMicrodump(buf));
+ 
++  int page_size = getpagesize();
+ #ifdef __LP64__
+-  ASSERT_NE(std::string::npos,
+-            buf.find("M 0000000000001000 000000000000002A 0000000000001000 "
+-                     "33221100554477668899AABBCCDDEEFF0 libfoo.so"));
++  // This test is only available for the following page sizes
++  ASSERT_TRUE((page_size == 4096) || (page_size == 65536));
++  if (page_size == 4096) {
++    ASSERT_NE(std::string::npos,
++              buf.find("M 0000000000001000 000000000000002A 0000000000001000 "
++                       "33221100554477668899AABBCCDDEEFF0 libfoo.so"));
++  } else {
++    ASSERT_NE(std::string::npos,
++              buf.find("M 0000000000010000 000000000000002A 0000000000010000 "
++                       "33221100554477668899AABBCCDDEEFF0 libfoo.so"));
++  }
+ #else
+   ASSERT_NE(std::string::npos,
+             buf.find("M 00001000 0000002A 00001000 "
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_core_dumper.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_core_dumper.cc
+@@ -117,6 +117,9 @@ bool LinuxCoreDumper::GetThreadInfoByInd
+ #elif defined(__mips__)
+   stack_pointer =
+       reinterpret_cast<uint8_t*>(info->mcontext.gregs[MD_CONTEXT_MIPS_REG_SP]);
++#elif defined(__powerpc64__)
++  stack_pointer =
++      reinterpret_cast<uint8_t*>(info->mcontext.gp_regs[MD_CONTEXT_PPC64_REG_SP]);
+ #else
+ #error "This code hasn't been ported to your platform yet."
+ #endif
+@@ -212,7 +215,10 @@ bool LinuxCoreDumper::EnumerateThreads()
+         memset(&info, 0, sizeof(ThreadInfo));
+         info.tgid = status->pr_pgrp;
+         info.ppid = status->pr_ppid;
+-#if defined(__mips__)
++#if defined(__powerpc64__)
++        for (int i = 0; i < 31; i++)
++            info.mcontext.gp_regs[i] = status->pr_reg[i];
++#elif defined(__mips__)
+ #if defined(__ANDROID__)
+         for (int i = EF_R0; i <= EF_R31; i++)
+           info.mcontext.gregs[i - EF_R0] = status->pr_reg[i];
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper.cc
+@@ -765,7 +765,9 @@ bool LinuxDumper::GetStackInfo(const voi
+       reinterpret_cast<uint8_t*>(int_stack_pointer & ~(page_size - 1));
+ 
+   // The number of bytes of stack which we try to capture.
+-  static const ptrdiff_t kStackToCapture = 32 * 1024;
++  // This now depends on page_size to avoid missing data
++  // on systems with larger page sizes.
++  static const ptrdiff_t kStackToCapture = 8 * page_size;
+ 
+   const MappingInfo* mapping = FindMapping(stack_pointer);
+   if (!mapping)
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper.h
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper.h
+@@ -63,7 +63,8 @@ namespace google_breakpad {
+  (defined(__mips__) && _MIPS_SIM == _ABIO32)
+ typedef Elf32_auxv_t elf_aux_entry;
+ #elif defined(__x86_64) || defined(__aarch64__) || \
+-     (defined(__mips__) && _MIPS_SIM != _ABIO32)
++     (defined(__mips__) && _MIPS_SIM != _ABIO32) || \
++     defined(__powerpc64__)
+ typedef Elf64_auxv_t elf_aux_entry;
+ #endif
+ 
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper_unittest_helper.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper_unittest_helper.cc
+@@ -51,6 +51,8 @@
+ #define TID_PTR_REGISTER "rcx"
+ #elif defined(__mips__)
+ #define TID_PTR_REGISTER "$1"
++#elif defined(__powerpc64__)
++#define TID_PTR_REGISTER "r8"
+ #else
+ #error This test has not been ported to this platform.
+ #endif
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper.cc
+@@ -154,19 +154,27 @@ bool LinuxPtraceDumper::CopyFromProcess(
+   return true;
+ }
+ 
+-bool LinuxPtraceDumper::ReadRegisterSet(ThreadInfo* info, pid_t tid)
+-{
++bool LinuxPtraceDumper::ReadRegisterSet(ThreadInfo* info, pid_t tid) {
+ #ifdef PTRACE_GETREGSET
+   struct iovec io;
+   info->GetGeneralPurposeRegisters(&io.iov_base, &io.iov_len);
+-  if (sys_ptrace(PTRACE_GETREGSET, tid, (void*)NT_PRSTATUS, (void*)&io) == -1) {
++  if (ptrace(PTRACE_GETREGSET, tid, (void*)NT_PRSTATUS, (void*)&io) == -1) {
+     return false;
+   }
+ 
+   info->GetFloatingPointRegisters(&io.iov_base, &io.iov_len);
+-  if (sys_ptrace(PTRACE_GETREGSET, tid, (void*)NT_FPREGSET, (void*)&io) == -1) {
++  if (ptrace(PTRACE_GETREGSET, tid, (void*)NT_FPREGSET, (void*)&io) == -1) {
+     return false;
+   }
++
++#if defined(__powerpc64__)
++  // Grab the vector registers on PPC64 too
++  info->GetVectorRegisters(&io.iov_base, &io.iov_len);
++  if (ptrace(PTRACE_GETREGSET, tid, (void*)NT_PPC_VMX, (void*)&io) == -1) {
++    return false;
++  }
++#endif // defined(__powerpc64__)
++
+   return true;
+ #else
+   return false;
+@@ -303,6 +311,9 @@ bool LinuxPtraceDumper::GetThreadInfoByI
+ #elif defined(__mips__)
+   stack_pointer =
+       reinterpret_cast<uint8_t*>(info->mcontext.gregs[MD_CONTEXT_MIPS_REG_SP]);
++#elif defined(__powerpc64__)
++  stack_pointer =
++      reinterpret_cast<uint8_t*>(info->mcontext.gp_regs[MD_CONTEXT_PPC64_REG_SP]);
+ #else
+ #error "This code hasn't been ported to your platform yet."
+ #endif
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper_unittest.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper_unittest.cc
+@@ -462,6 +462,9 @@ TEST(LinuxPtraceDumperTest, VerifyStackR
+ #elif defined(__mips__)
+     pid_t* process_tid_location =
+         reinterpret_cast<pid_t*>(one_thread.mcontext.gregs[1]);
++#elif defined(__powerpc64__)
++    pid_t* process_tid_location =
++        reinterpret_cast<pid_t*>(one_thread.mcontext.gp_regs[8]);
+ #else
+ #error This test has not been ported to this platform.
+ #endif
+@@ -559,6 +562,8 @@ TEST_F(LinuxPtraceDumperTest, SanitizeSt
+   uintptr_t heap_addr = thread_info.regs.rcx;
+ #elif defined(__mips__)
+   uintptr_t heap_addr = thread_info.mcontext.gregs[1];
++#elif defined(__powerpc64__)
++  uintptr_t heap_addr = thread_info.mcontext.gp_regs[8];
+ #else
+ #error This test has not been ported to this platform.
+ #endif
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.cc
+@@ -136,7 +136,9 @@ class MinidumpWriter {
+       : fd_(minidump_fd),
+         path_(minidump_path),
+         ucontext_(context ? &context->context : NULL),
+-#if !defined(__ARM_EABI__) && !defined(__mips__)
++#if defined(__powerpc64__)
++        vector_state_(context ? &context->vector_state : NULL),
++#elif !defined(__ARM_EABI__) && !defined(__mips__)
+         float_state_(context ? &context->float_state : NULL),
+ #endif
+         dumper_(dumper),
+@@ -468,7 +470,9 @@ class MinidumpWriter {
+         if (!cpu.Allocate())
+           return false;
+         my_memset(cpu.get(), 0, sizeof(RawContextCPU));
+-#if !defined(__ARM_EABI__) && !defined(__mips__)
++#if defined(__powerpc64__)
++        UContextReader::FillCPUContext(cpu.get(), ucontext_, vector_state_);
++#elif !defined(__ARM_EABI__) && !defined(__mips__)
+         UContextReader::FillCPUContext(cpu.get(), ucontext_, float_state_);
+ #else
+         UContextReader::FillCPUContext(cpu.get(), ucontext_);
+@@ -897,7 +901,7 @@ class MinidumpWriter {
+     dirent->location.rva = 0;
+   }
+ 
+-#if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
++#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || defined(__powerpc64__)
+   bool WriteCPUInformation(MDRawSystemInfo* sys_info) {
+     char vendor_id[sizeof(sys_info->cpu.x86_cpu_info.vendor_id) + 1] = {0};
+     static const char vendor_id_name[] = "vendor_id";
+@@ -917,7 +921,9 @@ class MinidumpWriter {
+ 
+     // processor_architecture should always be set, do this first
+     sys_info->processor_architecture =
+-#if defined(__mips__)
++#if defined(__powerpc64__)
++        MD_CPU_ARCHITECTURE_PPC64;
++#elif defined(__mips__)
+ # if _MIPS_SIM == _ABIO32
+         MD_CPU_ARCHITECTURE_MIPS;
+ # elif _MIPS_SIM == _ABI64
+@@ -1333,7 +1339,9 @@ class MinidumpWriter {
+   const char* path_;  // Path to the file where the minidum should be written.
+ 
+   const ucontext_t* const ucontext_;  // also from the signal handler
+-#if !defined(__ARM_EABI__) && !defined(__mips__)
++#if defined(__powerpc64__)
++  const google_breakpad::vstate_t* const vector_state_;
++#elif !defined(__ARM_EABI__) && !defined(__mips__)
+   const google_breakpad::fpstate_t* const float_state_;  // ditto
+ #endif
+   LinuxDumper* dumper_;
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.h
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.h
+@@ -48,6 +48,8 @@ class ExceptionHandler;
+ 
+ #if defined(__aarch64__)
+ typedef struct fpsimd_context fpstate_t;
++#elif defined(__powerpc64__)
++typedef vrregset_t vstate_t;
+ #elif !defined(__ARM_EABI__) && !defined(__mips__)
+ typedef std::remove_pointer<fpregset_t>::type fpstate_t;
+ #endif
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer_unittest.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer_unittest.cc
+@@ -715,6 +715,12 @@ TEST(MinidumpWriterTest, InvalidStackPoi
+ #elif defined(__mips__)
+   context.context.uc_mcontext.gregs[MD_CONTEXT_MIPS_REG_SP] =
+       invalid_stack_pointer;
++#elif defined(__powerpc64__)
++  context.context.uc_mcontext.gp_regs[MD_CONTEXT_PPC64_REG_SP] =
++      invalid_stack_pointer;
++#elif defined(__powerpc64__)
++  context.context.uc_mcontext.gp_regs[MD_CONTEXT_PPC64_REG_SP] =
++      invalid_stack_pointer;
+ #else
+ # error "This code has not been ported to your platform yet."
+ #endif
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/common/linux/memory_mapped_file.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/common/linux/memory_mapped_file.cc
+@@ -65,8 +65,7 @@ bool MemoryMappedFile::Map(const char* p
+   }
+ 
+ #if defined(__x86_64__) || defined(__aarch64__) || \
+-   (defined(__mips__) && _MIPS_SIM == _ABI64)
+-
++   (defined(__mips__) && _MIPS_SIM == _ABI64) || defined(__powerpc64__)
+   struct kernel_stat st;
+   if (sys_fstat(fd, &st) == -1 || st.st_size < 0) {
+ #else
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/common/linux/memory_mapped_file_unittest.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/common/linux/memory_mapped_file_unittest.cc
+@@ -176,9 +176,10 @@ TEST_F(MemoryMappedFileTest, RemapAfterM
+ TEST_F(MemoryMappedFileTest, MapWithOffset) {
+   // Put more data in the test file this time. Offsets can only be
+   // done on page boundaries, so we need a two page file to test this.
+-  const int page_size = 4096;
+-  char data1[2 * page_size];
+-  size_t data1_size = sizeof(data1);
++  const int page_size = getpagesize();
++  char *data1 = static_cast<char*>(malloc(2 * page_size));
++  EXPECT_TRUE(data1 != NULL);
++  size_t data1_size = (2 * page_size);
+   for (size_t i = 0; i < data1_size; ++i) {
+     data1[i] = i & 0x7f;
+   }
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/common/memory_allocator_unittest.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/common/memory_allocator_unittest.cc
+@@ -57,8 +57,9 @@ TEST(PageAllocatorTest, LargeObject) {
+ 
+   EXPECT_EQ(0U, allocator.pages_allocated());
+   uint8_t* p = reinterpret_cast<uint8_t*>(allocator.Alloc(10000));
++  uint64_t expected_pages = 1 + ((10000 - 1) / getpagesize());
+   ASSERT_FALSE(p == NULL);
+-  EXPECT_EQ(3U, allocator.pages_allocated());
++  EXPECT_EQ(expected_pages, allocator.pages_allocated());
+   for (unsigned i = 1; i < 10; ++i) {
+     uint8_t* p = reinterpret_cast<uint8_t*>(allocator.Alloc(i));
+     ASSERT_FALSE(p == NULL);
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/processor/exploitability_linux.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/processor/exploitability_linux.cc
+@@ -202,12 +202,14 @@ bool ExploitabilityLinux::EndedOnIllegal
+   // Check architecture and set architecture variable to corresponding flag
+   // in objdump.
+   switch (context->GetContextCPU()) {
++#if defined(__i386) || defined(__x86_64)
+     case MD_CONTEXT_X86:
+       architecture = "i386";
+       break;
+     case MD_CONTEXT_AMD64:
+       architecture = "i386:x86-64";
+       break;
++#endif
+     default:
+       // Unsupported architecture. Note that ARM architectures are not
+       // supported because objdump does not support ARM.
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/processor/exploitability_unittest.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/processor/exploitability_unittest.cc
+@@ -104,6 +104,8 @@ ExploitabilityFor(const string& filename
+ }
+ 
+ TEST(ExploitabilityTest, TestWindowsEngine) {
++// The following tests are only executable on an x86-class linux machine.
++#if !defined(_WIN32) && (defined(__i386) || defined(__x86_64))
+   ASSERT_EQ(google_breakpad::EXPLOITABILITY_HIGH,
+             ExploitabilityFor("ascii_read_av.dmp"));
+   ASSERT_EQ(google_breakpad::EXPLOITABILITY_HIGH,
+@@ -136,9 +138,12 @@ TEST(ExploitabilityTest, TestWindowsEngi
+             ExploitabilityFor("read_av_clobber_write.dmp"));
+   ASSERT_EQ(google_breakpad::EXPLOITABILITY_LOW,
+             ExploitabilityFor("read_av_conditional.dmp"));
++#endif
+ }
+ 
+ TEST(ExploitabilityTest, TestLinuxEngine) {
++// The following tests are only executable on an x86-class linux machine.
++#if defined(__i386) || defined(__x86_64)
+   ASSERT_EQ(google_breakpad::EXPLOITABILITY_INTERESTING,
+             ExploitabilityFor("linux_null_read_av.dmp"));
+   ASSERT_EQ(google_breakpad::EXPLOITABILITY_HIGH,
+@@ -171,7 +176,8 @@ TEST(ExploitabilityTest, TestLinuxEngine
+             ExploitabilityFor("linux_executable_heap.dmp"));
+   ASSERT_EQ(google_breakpad::EXPLOITABILITY_HIGH,
+             ExploitabilityFor("linux_jmp_to_module_not_exe_region.dmp"));
+-#ifndef _WIN32
++#endif
++#if !defined(_WIN32) && (defined(__i386) || defined(__x86_64))
+   ASSERT_EQ(google_breakpad::EXPLOITABILITY_HIGH,
+             ExploitabilityFor("linux_write_to_nonwritable_module.dmp"));
+   ASSERT_EQ(google_breakpad::EXPLOITABILITY_HIGH,
+@@ -182,10 +188,10 @@ TEST(ExploitabilityTest, TestLinuxEngine
+             ExploitabilityFor("linux_write_to_outside_module_via_math.dmp"));
+   ASSERT_EQ(google_breakpad::EXPLOITABILITY_INTERESTING,
+             ExploitabilityFor("linux_write_to_under_4k.dmp"));
+-#endif  // _WIN32
++#endif  // !defined(_WIN32) && (!defined(__i386) && !defined(__x86_64))
+ }
+ 
+-#ifndef _WIN32
++#if !defined(_WIN32) && (defined(__i386) || defined(__x86_64))
+ TEST(ExploitabilityLinuxUtilsTest, DisassembleBytesTest) {
+   ASSERT_FALSE(ExploitabilityLinuxTest::DisassembleBytes("", NULL, 5, NULL));
+   uint8_t bytes[6] = {0xc7, 0x0, 0x5, 0x0, 0x0, 0x0};
+@@ -301,6 +307,7 @@ TEST(ExploitabilityLinuxUtilsTest, Calcu
+                                                          context,
+                                                          &write_address));
+ }
+-#endif  // _WIN32
++#endif  // !defined(_WIN32) && (defined(__i386) || defined(__x86_64))
++
+ 
+ }  // namespace
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/tools/linux/md2core/minidump-2-core.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/tools/linux/md2core/minidump-2-core.cc
+@@ -77,6 +77,8 @@
+   #define ELF_ARCH  EM_MIPS
+ #elif defined(__aarch64__)
+   #define ELF_ARCH  EM_AARCH64
++#elif defined(__powerpc64__)
++  #define ELF_ARCH  EM_PPC64
+ #endif
+ 
+ #if defined(__arm__)
+@@ -87,6 +89,8 @@ typedef user_regs user_regs_struct;
+ #elif defined (__mips__)
+ // This file-local typedef simplifies the source code.
+ typedef gregset_t user_regs_struct;
++#elif defined(__powerpc64__)
++typedef struct pt_regs user_regs_struct;
+ #endif
+ 
+ using google_breakpad::MDTypeHelper;
+@@ -322,6 +326,12 @@ struct CrashedProcess {
+ #if defined(__aarch64__)
+     user_fpsimd_struct fpregs;
+ #endif
++#if defined(__powerpc64__)
++    mcontext_t mcontext;
++#endif
++#if defined(__powerpc64__)
++    mcontext_t mcontext;
++#endif
+     uintptr_t stack_addr;
+     const uint8_t* stack;
+     size_t stack_length;
+@@ -535,6 +545,38 @@ ParseThreadRegisters(CrashedProcess::Thr
+   thread->mcontext.fpc_eir = rawregs->float_save.fir;
+ #endif
+ }
++#elif defined(__powerpc64__)
++static void
++ParseThreadRegisters(CrashedProcess::Thread* thread,
++                     const MinidumpMemoryRange& range) {
++  const MDRawContextPPC64* rawregs = range.GetData<MDRawContextPPC64>(0);
++
++  for (int i = 0; i < MD_CONTEXT_PPC64_GPR_COUNT; i++)
++    thread->mcontext.gp_regs[i] = rawregs->gpr[i];
++
++  thread->mcontext.gp_regs[PT_LNK] = rawregs->lr;
++  thread->mcontext.gp_regs[PT_NIP] = rawregs->srr0;
++  thread->mcontext.gp_regs[PT_MSR] = rawregs->srr1;
++  thread->mcontext.gp_regs[PT_CCR] = rawregs->cr;
++  thread->mcontext.gp_regs[PT_XER] = rawregs->xer;
++  thread->mcontext.gp_regs[PT_CTR] = rawregs->ctr;
++  thread->mcontext.v_regs->vrsave = rawregs->vrsave;
++
++  for (int i = 0; i < MD_FLOATINGSAVEAREA_PPC_FPR_COUNT; i++)
++      thread->mcontext.fp_regs[i] = rawregs->float_save.fpregs[i];
++
++  thread->mcontext.fp_regs[NFPREG-1] = rawregs->float_save.fpscr;
++
++  for (int i = 0; i < MD_VECTORSAVEAREA_PPC_VR_COUNT; i++) {
++      thread->mcontext.v_regs->vrregs[i][0] = rawregs->vector_save.save_vr[i].high >> 32;
++      thread->mcontext.v_regs->vrregs[i][1] = rawregs->vector_save.save_vr[i].high;
++      thread->mcontext.v_regs->vrregs[i][2] = rawregs->vector_save.save_vr[i].low >> 32;
++      thread->mcontext.v_regs->vrregs[i][3] = rawregs->vector_save.save_vr[i].low;
++  }
++
++  thread->mcontext.v_regs->vscr.vscr_word = rawregs->vector_save.save_vscr.low & 0xFFFFFFFF;
++}
++
+ #else
+ #error "This code has not been ported to your platform yet"
+ #endif
+@@ -623,6 +665,12 @@ ParseSystemInfo(const Options& options,
+ # else
+ #  error "This mips ABI is currently not supported (n32)"
+ # endif
++#elif defined(__powerpc64__)
++  if (sysinfo->processor_architecture != MD_CPU_ARCHITECTURE_PPC64) {
++    fprintf(stderr,
++            "This version of minidump-2-core only supports PPC64.\n");
++    exit(1);
++  }
+ #else
+ #error "This code has not been ported to your platform yet"
+ #endif
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/CONTRIBUTORS
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/CONTRIBUTORS
+@@ -13,3 +13,4 @@ Mark Mentovai <mark@chromium.org>
+ Robert Sesek <rsesek@chromium.org>
+ Scott Graham <scottmg@chromium.org>
+ Joshua Peraza <jperaza@chromium.org>
++Shawn Anastasio <shawn@anastas.io>
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/compat/linux/sys/user.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/compat/linux/sys/user.h
+@@ -15,6 +15,7 @@
+ #ifndef CRASHPAD_COMPAT_LINUX_SYS_USER_H_
+ #define CRASHPAD_COMPAT_LINUX_SYS_USER_H_
+ 
++#include <cstddef>
+ #include_next <sys/user.h>
+ 
+ #include <features.h>
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/minidump/minidump_context.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/minidump/minidump_context.h
+@@ -592,6 +592,70 @@ struct MinidumpContextMIPS64 {
+   uint64_t fir;
+ };
+ 
++//! \brief ppc64-specific flags for MinidumpPPC64::context_flags
++//! Based on minidump_cpu_ppc64.h from breakpad
++enum MinidumpContextPPC64Flags : uint32_t {
++  //! \brief Identifies the context as PPC64.
++  kMinidumpContextPPC64 = 0x01000000,
++
++  //! \brief Indicates the validity of general purpose registers.
++  //!
++  //! Registers `r0`-`r31`, `nip`, `msr`, `lr`, etc. are valid.
++  kMinidumpContextPPC64Base = kMinidumpContextPPC64 | 0x00000001,
++
++  //! \brief Indicates the validity of floating point registers.
++  //!
++  //! Registers `fp0`-`fp31`, `fpscr` are valid.
++  kMinidumpContextPPC64Floating = kMinidumpContextPPC64 | 0x00000008,
++
++  //! \brief Indicates the validity of Altivec/VMX registers.
++  //!
++  //! Registers `v0`-`v31`, `vscr`, `vrsave`.
++  kMinidumpContextPPC64Vector = kMinidumpContextPPC64 | 0x00000020,
++
++  //! \brief Indicates the validity of all registers
++  kMinidumpContextPPC64All = kMinidumpContextPPC64Base     |
++                             kMinidumpContextPPC64Floating |
++                             kMinidumpContextPPC64Vector
++};
++
++//! \brief A PPC64 CPU context carried in a minidump file.
++//! Based on minidump_cpu_ppc64.h from breakpad.
++struct MinidumpContextPPC64 {
++  uint64_t context_flags;
++
++  //! \brief General purpose registers.
++  uint64_t nip;
++  uint64_t msr;
++  uint64_t regs[32];
++  uint64_t ccr;
++  uint64_t xer;
++  uint64_t lnk;
++  uint64_t ctr;
++
++  //! \brief Floating point registers.
++  double fpregs[32];
++
++  //! \brief FPU status register.
++  double fpscr;
++
++  //! \brief Altivec/VMX vector registers.
++  struct {
++      //! \brief Vector registers are 128bits.
++      uint128_struct save_vr[32];
++      uint128_struct save_vscr;
++
++      //! \brief Padding included for breakpad compatibiltiy.
++      uint32_t save_pad5[4];
++
++      //! \brief VRSAVE register.
++      uint32_t save_vrsave;
++
++      //! \brief Padding included for breakpad compatibiltiy.
++      uint32_t save_pad6[7];
++  } vregs;
++};
++
+ }  // namespace crashpad
+ 
+ #endif  // CRASHPAD_MINIDUMP_MINIDUMP_CONTEXT_H_
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/minidump/minidump_context_writer.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/minidump/minidump_context_writer.cc
+@@ -101,6 +101,13 @@ MinidumpContextWriter::CreateFromSnapsho
+       break;
+     }
+ 
++    case kCPUArchitecturePPC64: {
++      context = std::make_unique<MinidumpContextPPC64Writer>();
++      reinterpret_cast<MinidumpContextPPC64Writer*>(context.get())
++          ->InitalizeFromSnapshot(context_snapshot->ppc64);
++      break;
++    }
++
+     default: {
+       LOG(ERROR) << "unknown context architecture "
+                  << context_snapshot->architecture;
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/minidump/minidump_context_writer.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/minidump/minidump_context_writer.h
+@@ -315,6 +315,45 @@ class MinidumpContextMIPS64Writer final
+   DISALLOW_COPY_AND_ASSIGN(MinidumpContextMIPS64Writer);
+ };
+ 
++class MinidumpContextPPC64Writer final : public MinidumpContextWriter {
++ public:
++  MinidumpContextPPC64Writer();
++  ~MinidumpContextPPC64Writer() override;
++
++  //! \brief Initalizes the MinidumpContextPPC64 based on \a context_snapshot.
++  //!
++  //! \param[in] context_snapshot The context snapshot to use as source data.
++  //!
++  //! \note Valid in #kStateMutable. No mutation of context() may be done before
++  //!     calling this method, and it is not normally necessary to alter
++  //!     context() after calling this method.
++  void InitalizeFromSnapshot(const CPUContextPPC64* context_snapshot);
++
++  //! \brief Returns a pointer to the context structure that this object will
++  //!     write.
++  //!
++  //! \attention This returns a non-`const` pointer to this object’s private
++  //!     data so that a caller can populate the context structure directly.
++  //!     This is done because providing setter interfaces to each field in the
++  //!     context structure would be unwieldy and cumbersome. Care must be taken
++  //!     to populate the context structure correctly. The context structure
++  //!     must only be modified while this object is in the #kStateMutable
++  //!     state.
++  MinidumpContextPPC64* context() { return &context_; }
++
++ protected:
++  // MinidumpWritable:
++  bool WriteObject(FileWriterInterface* file_writer) override;
++
++  // MinidumpContextWriter:
++  size_t ContextSize() const override;
++
++ private:
++  MinidumpContextPPC64 context_;
++
++  DISALLOW_COPY_AND_ASSIGN(MinidumpContextPPC64Writer);
++};
++
+ }  // namespace crashpad
+ 
+ #endif  // CRASHPAD_MINIDUMP_MINIDUMP_CONTEXT_WRITER_H_
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/minidump/minidump_context_writer_test.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/minidump/minidump_context_writer_test.cc
+@@ -213,6 +213,21 @@ TEST(MinidumpContextWriter, MIPS64_FromS
+       context, ExpectMinidumpContextMIPS64, kSeed);
+ }
+ 
++TEST(MinidumpContextWriter, PPC64_Zeros) {
++  EmptyContextTest<MinidumpContextPPC64Writer, MinidumpContextPPC64>(
++    ExpectMinidumpContextPPC64);
++}
++
++TEST(MinidumpContextWriter, PPC64_FromSnapshot) {
++  constexpr uint32_t kSeed = 64;
++  CPUContextPPC64 context_ppc64;
++  CPUContext context;
++  context.ppc64 = &context_ppc64;
++  InitializeCPUContextPPC64(&context, kSeed);
++  FromSnapshotTest<MinidumpContextPPC64Writer, MinidumpContextPPC64>(
++      context, ExpectMinidumpContextPPC64, kSeed);
++}
++
+ }  // namespace
+ }  // namespace test
+ }  // namespace crashpad
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/minidump/minidump_misc_info_writer.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/minidump/minidump_misc_info_writer.cc
+@@ -135,6 +135,8 @@ std::string MinidumpMiscInfoDebugBuildSt
+   static constexpr char kCPU[] = "mips";
+ #elif defined(ARCH_CPU_MIPS64EL)
+   static constexpr char kCPU[] = "mips64";
++#elif defined(ARCH_CPU_PPC64)
++  static constexpr char kCPU[] = "ppc64";
+ #else
+ #error define kCPU for this CPU
+ #endif
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/capture_memory.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/capture_memory.cc
+@@ -112,6 +112,11 @@ void CaptureMemory::PointedToByContext(c
+   for (size_t i = 0; i < base::size(context.mipsel->regs); ++i) {
+     MaybeCaptureMemoryAround(delegate, context.mipsel->regs[i]);
+   }
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++  MaybeCaptureMemoryAround(delegate, context.ppc64->nip);
++  for (size_t i = 0; i < base::size(context.ppc64->regs); ++i) {
++    MaybeCaptureMemoryAround(delegate, context.ppc64->regs[i]);
++  }
+ #else
+ #error Port.
+ #endif
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/cpu_architecture.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/cpu_architecture.h
+@@ -43,7 +43,10 @@ enum CPUArchitecture {
+   kCPUArchitectureMIPSEL,
+ 
+   //! \brief 64-bit MIPSEL.
+-  kCPUArchitectureMIPS64EL
++  kCPUArchitectureMIPS64EL,
++
++  //! \brief 64-bit PPC64.
++  kCPUArchitecturePPC64
+ };
+ 
+ }  // namespace crashpad
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/cpu_context.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/cpu_context.cc
+@@ -169,6 +169,8 @@ uint64_t CPUContext::InstructionPointer(
+       return arm->pc;
+     case kCPUArchitectureARM64:
+       return arm64->pc;
++    case kCPUArchitecturePPC64:
++      return ppc64->nip;
+     default:
+       NOTREACHED();
+       return ~0ull;
+@@ -185,6 +187,8 @@ uint64_t CPUContext::StackPointer() cons
+       return arm->sp;
+     case kCPUArchitectureARM64:
+       return arm64->sp;
++    case kCPUArchitecturePPC64:
++      return ppc64->regs[1];
+     default:
+       NOTREACHED();
+       return ~0ull;
+@@ -196,6 +200,7 @@ bool CPUContext::Is64Bit() const {
+     case kCPUArchitectureX86_64:
+     case kCPUArchitectureARM64:
+     case kCPUArchitectureMIPS64EL:
++    case kCPUArchitecturePPC64:
+       return true;
+     case kCPUArchitectureX86:
+     case kCPUArchitectureARM:
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/cpu_context.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/cpu_context.h
+@@ -352,6 +352,24 @@ struct CPUContextMIPS64 {
+   uint64_t fir;
+ };
+ 
++//! \brief A context structure carrying PPC64 CPU state.
++struct CPUContextPPC64 {
++  uint64_t nip;
++  uint64_t msr;
++  uint64_t regs[32];
++  uint64_t ccr;
++  uint64_t xer;
++  uint64_t lnk;
++  uint64_t ctr;
++  double fpregs[32];
++  double fpscr;
++  struct {
++    uint128_struct save_vr[32];
++    uint128_struct save_vscr;
++    uint32_t save_vrsave;
++  } vregs;
++};
++
+ //! \brief A context structure capable of carrying the context of any supported
+ //!     CPU architecture.
+ struct CPUContext {
+@@ -382,6 +400,7 @@ struct CPUContext {
+     CPUContextARM64* arm64;
+     CPUContextMIPS* mipsel;
+     CPUContextMIPS64* mips64;
++    CPUContextPPC64* ppc64;
+   };
+ };
+ 
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/cpu_context_linux.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/cpu_context_linux.h
+@@ -15,6 +15,7 @@
+ #ifndef CRASHPAD_SNAPSHOT_LINUX_CPU_CONTEXT_LINUX_H_
+ #define CRASHPAD_SNAPSHOT_LINUX_CPU_CONTEXT_LINUX_H_
+ 
++#include <cstring>
+ #include "build/build_config.h"
+ #include "snapshot/cpu_context.h"
+ #include "snapshot/linux/signal_context.h"
+@@ -174,6 +175,76 @@ void InitializeCPUContextMIPS(
+ 
+ #endif  // ARCH_CPU_MIPS_FAMILY || DOXYGEN
+ 
++#if defined(ARCH_CPU_PPC64_FAMILY) || DOXYGEN
++
++//! \brief Initalizes a CPUContextPPC64 structure from native context
++//!     structures on Linux.
++//!
++//! \param[in] thread_context The native thread context.
++//! \param[in] float_context The native float context.
++//! \param[in] vector_context The native vector context.
++//! \param[out] context The CPUContextPPC64 structure to initalize.
++template <typename Traits>
++void InitializeCPUContextPPC64(
++    const ThreadContext::t64_t& thread_context,
++    const FloatContext::f64_t& float_context,
++    const VectorContext::v64_t& vector_context,
++    typename Traits::CPUContext* context) {
++
++  memcpy(context->regs, thread_context.gpr, sizeof(context->regs));
++  context->nip = thread_context.nip;
++  context->msr = thread_context.msr;
++  context->ccr = thread_context.ccr;
++  context->xer = thread_context.xer;
++  context->lnk = thread_context.lnk;
++  context->ctr = thread_context.ctr;
++
++  memcpy(context->fpregs, float_context.fpregs, sizeof(context->fpregs));
++  context->fpscr = float_context.fpscr;
++
++  for (uint8_t i = 0; i < 32; i++) {
++    context->vregs.save_vr[i] = {
++      (((uint64_t)vector_context.vrregs[i][0]) << 32) |
++        vector_context.vrregs[i][1],
++      (((uint64_t)vector_context.vrregs[i][2]) << 32) |
++        vector_context.vrregs[i][3]
++    };
++  }
++  context->vregs.save_vrsave = vector_context.vrsave;
++  context->vregs.save_vscr = {0, (uint64_t)vector_context.vscr.vscr_word};
++}
++
++template <typename Traits>
++void InitializeCPUContextPPC64(
++    const SignalThreadContext64 &thread_context,
++    const SignalFloatContext64 &float_context,
++    const SignalVectorContext64 &vector_context,
++    typename Traits::CPUContext* context) {
++
++  memcpy(context->regs, thread_context.regs, sizeof(context->regs));
++  context->nip = thread_context.nip;
++  context->msr = thread_context.msr;
++  context->ccr = thread_context.ccr;
++  context->xer = thread_context.xer;
++  context->lnk = thread_context.lnk;
++  context->ctr = thread_context.ctr;
++
++  memcpy(context->fpregs, float_context.regs, sizeof(context->fpregs));
++  context->fpscr = float_context.fpscr;
++
++  for (uint8_t i = 0; i < 32; i++) {
++    context->vregs.save_vr[i] = {
++      (((uint64_t)vector_context.vrregs[i][0]) << 32) |
++        vector_context.vrregs[i][1],
++      (((uint64_t)vector_context.vrregs[i][2]) << 32) |
++        vector_context.vrregs[i][3]
++    };
++  }
++  context->vregs.save_vrsave = vector_context.vrsave;
++  context->vregs.save_vscr = {0, (uint64_t)vector_context.vscr.vscr_word};
++}
++
++#endif
+ }  // namespace internal
+ }  // namespace crashpad
+ 
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/debug_rendezvous_test.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/debug_rendezvous_test.cc
+@@ -192,6 +192,8 @@ void TestAgainstTarget(PtraceConnection*
+               device == 0 && inode == 0 && mapping_name == "[vdso]";
+ #if defined(ARCH_CPU_X86)
+           static constexpr char kPrefix[] = "linux-gate.so.";
++#elif defined(ARCH_CPU_PPC64)
++          static constexpr char kPrefix[] = "linux-vdso64.so.";
+ #else
+           static constexpr char kPrefix[] = "linux-vdso.so.";
+ #endif
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux.cc
+@@ -323,6 +323,69 @@ bool ExceptionSnapshotLinux::ReadContext
+       reader, context_address, context_.mips64);
+ }
+ 
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++
++template <typename Traits>
++static bool ReadContext(ProcessReaderLinux* reader,
++                        LinuxVMAddress context_address,
++                        typename Traits::CPUContext* dest_context) {
++  const ProcessMemory* memory = reader->Memory();
++
++  LinuxVMAddress gp_regs_address = context_address +
++                                   offsetof(UContext, mcontext) +
++                                   offsetof(typename Traits::MContext, gp_regs);
++
++  typename Traits::SignalThreadContext thread_context;
++  if (!memory->Read(gp_regs_address, sizeof(thread_context), &thread_context)) {
++    LOG(ERROR) << "Couldn't read gp_regs!";
++    return false;
++  }
++
++  LinuxVMAddress fp_regs_address = context_address +
++                                   offsetof(UContext, mcontext) +
++                                   offsetof(typename Traits::MContext, fp_regs);
++
++  typename Traits::SignalFloatContext fp_context;
++  if (!memory->Read(fp_regs_address, sizeof(fp_context), &fp_context)) {
++    LOG(ERROR) << "Couldn't read fp_regs!";
++    return false;
++  }
++
++  LinuxVMAddress v_regs_ptr_address = context_address +
++                                  offsetof(UContext, mcontext) +
++                                  offsetof(typename Traits::MContext, vmx_reserve) + 8;
++
++  typename Traits::SignalVectorContext v_context;
++  if (!memory->Read(v_regs_ptr_address, sizeof(v_context), &v_context)) {
++    LOG(ERROR) << "Couldn't read v_regs!";
++    return false;
++  }
++
++  InitializeCPUContextPPC64<ContextTraits64>(thread_context, fp_context,
++                            v_context, dest_context);
++
++  return true;
++}
++
++template<>
++bool ExceptionSnapshotLinux::ReadContext<ContextTraits64>(
++    ProcessReaderLinux* reader,
++    LinuxVMAddress context_address) {
++  context_.architecture = kCPUArchitecturePPC64;
++  context_.ppc64 = &context_union_.ppc64;
++
++  return internal::ReadContext<ContextTraits64>(
++      reader, context_address, context_.ppc64);
++}
++
++template<>
++bool ExceptionSnapshotLinux::ReadContext<ContextTraits32>(
++    ProcessReaderLinux* reader,
++    LinuxVMAddress context_address) {
++  // PPC64 is 64-bit
++  return false;
++}
++
+ #endif  // ARCH_CPU_X86_FAMILY
+ 
+ bool ExceptionSnapshotLinux::Initialize(ProcessReaderLinux* process_reader,
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux.h
+@@ -84,6 +84,8 @@ class ExceptionSnapshotLinux final : pub
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+     CPUContextMIPS mipsel;
+     CPUContextMIPS64 mips64;
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++    CPUContextPPC64 ppc64;
+ #endif
+   } context_union_;
+   CPUContext context_;
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux_test.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux_test.cc
+@@ -296,7 +296,28 @@ void ExpectContext(const CPUContext& act
+             0);
+ #undef CPU_ARCH_NAME
+ }
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++using NativeCPUContext = ucontext_t;
+ 
++void InitializeContext(NativeCPUContext* context) {
++  for (size_t reg = 0; reg < 32; ++reg) {
++    context->uc_mcontext.gp_regs[reg] = reg;
++  }
++
++  memset(&context->uc_mcontext.fp_regs, 44,
++      sizeof(context->uc_mcontext.fp_regs));
++}
++
++void ExpectContext(const CPUContext& actual, const NativeCPUContext& expected) {
++  EXPECT_EQ(actual.architecture, kCPUArchitecturePPC64);
++
++  for (size_t reg = 0; reg < 32; ++reg) {
++    EXPECT_EQ(actual.ppc64->regs[reg], expected.uc_mcontext.gp_regs[reg]);
++  }
++
++  EXPECT_EQ(memcmp(actual.ppc64->fpregs, expected.uc_mcontext.fp_regs,
++            sizeof(actual.ppc64->fpregs)), 0);
++}
+ #else
+ #error Port.
+ #endif
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/process_reader_linux.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/process_reader_linux.cc
+@@ -108,6 +108,8 @@ void ProcessReaderLinux::Thread::Initial
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+   stack_pointer = reader->Is64Bit() ? thread_info.thread_context.t64.regs[29]
+                                     : thread_info.thread_context.t32.regs[29];
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++  stack_pointer = thread_info.thread_context.t64.gpr[1];
+ #else
+ #error Port.
+ #endif
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/signal_context.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/signal_context.h
+@@ -422,6 +422,93 @@ static_assert(offsetof(UContext<ContextT
+               "context offset mismatch");
+ #endif
+ 
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++
++struct SignalThreadContext64 {
++  uint64_t regs[32];
++  uint64_t nip;
++  uint64_t msr;
++  uint64_t orig_r3;
++  uint64_t ctr;
++  uint64_t lnk;
++  uint64_t xer;
++  uint64_t ccr;
++  uint64_t softe;
++  uint64_t trap;
++  uint64_t dar;
++  uint64_t dsisr;
++  uint64_t result;
++  uint64_t dscr;
++  uint64_t fpr0[3];
++};
++
++struct SignalFloatContext64 {
++  double regs[32];
++  double fpscr;
++};
++
++struct SignalVectorContext64 {
++  int32_t vrregs[32][4];
++  struct {
++    int32_t __pad[3];
++    int32_t vscr_word;
++  } vscr;
++  int32_t vrsave;
++  int32_t __pad[3];
++} __attribute__((__aligned__(16)));
++
++
++#pragma pack(pop)
++struct MContext64 {
++  uint64_t reserved[4];
++  int32_t signal;
++  int32_t __pad0;
++  uint64_t handler;
++  uint64_t oldmask;
++  uint64_t pt_regs_ptr;
++  SignalThreadContext64 gp_regs;
++  SignalFloatContext64  fp_regs;
++  SignalVectorContext64 *v_regs;
++#ifdef __GLIBC__
++  int64_t vmx_reserve[69];
++#else
++  int64_t vmx_reserve[101];
++#endif
++};
++
++struct ContextTraits64 : public Traits64 {
++  using MContext = MContext64;
++  using SignalThreadContext = SignalThreadContext64;
++  using SignalFloatContext = SignalFloatContext64;
++  using SignalVectorContext = SignalVectorContext64;
++  using CPUContext = CPUContextPPC64;
++};
++
++struct ContextTraits32 : public Traits32 {};
++
++struct UContext {
++  uint64_t flags;
++  uint64_t link;
++  SignalStack<ContextTraits64> stack;
++  Sigset<ContextTraits64> sigmask;
++  MContext64 mcontext;
++};
++#pragma pack(push, 1)
++
++static_assert(sizeof(UContext) == sizeof(ucontext_t),
++              "ucontext_t size mismatch");
++static_assert(sizeof(MContext64) == sizeof(mcontext_t),
++              "mcontext_t size mismatch");
++static_assert(sizeof(SignalThreadContext64) == sizeof(gregset_t),
++              "gregset_t size mismatch");
++static_assert(sizeof(SignalFloatContext64) == sizeof(fpregset_t),
++              "fpregset_t size mismatch");
++static_assert(sizeof(SignalVectorContext64) == sizeof(vrregset_t),
++              "vrregset_t size mismatch");
++static_assert(offsetof(UContext, mcontext) ==
++              offsetof(ucontext_t, uc_mcontext), "mcontext offset mismatch");
++static_assert(offsetof(MContext64, gp_regs) ==
++              offsetof(mcontext_t, gp_regs), "gp_regs offset mismatch");
+ #else
+ #error Port.
+ #endif  // ARCH_CPU_X86_FAMILY
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/system_snapshot_linux.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/system_snapshot_linux.cc
+@@ -204,6 +204,8 @@ CPUArchitecture SystemSnapshotLinux::Get
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+   return process_reader_->Is64Bit() ? kCPUArchitectureMIPS64EL
+                                     : kCPUArchitectureMIPSEL;
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++  return kCPUArchitecturePPC64;
+ #else
+ #error port to your architecture
+ #endif
+@@ -219,6 +221,9 @@ uint32_t SystemSnapshotLinux::CPURevisio
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+   // Not implementable on MIPS
+   return 0;
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++  // Not yet implemented on PPC64
++  return 0;
+ #else
+ #error port to your architecture
+ #endif
+@@ -239,6 +244,9 @@ std::string SystemSnapshotLinux::CPUVend
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+   // Not implementable on MIPS
+   return std::string();
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++  // Not yet implemented on PPC64
++  return std::string();
+ #else
+ #error port to your architecture
+ #endif
+@@ -372,6 +380,9 @@ bool SystemSnapshotLinux::NXEnabled() co
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+   // Not implementable on MIPS
+   return false;
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++  // Not yet implemented on PPC64
++  return false;
+ #else
+ #error Port.
+ #endif  // ARCH_CPU_X86_FAMILY
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/test_modules.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/test_modules.cc
+@@ -110,6 +110,8 @@ bool WriteTestModule(const base::FilePat
+   module.ehdr.e_machine = EM_AARCH64;
+ #elif defined(ARCH_CPU_MIPSEL) || defined(ARCH_CPU_MIPS64EL)
+   module.ehdr.e_machine = EM_MIPS;
++#elif defined(ARCH_CPU_PPC64)
++  module.ehdr.e_machine = EM_PPC64;
+ #endif
+ 
+   module.ehdr.e_version = EV_CURRENT;
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/thread_snapshot_linux.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/thread_snapshot_linux.cc
+@@ -186,6 +186,14 @@ bool ThreadSnapshotLinux::Initialize(Pro
+         thread.thread_info.float_context.f32,
+         context_.mipsel);
+   }
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++  context_.architecture = kCPUArchitecturePPC64;
++  context_.ppc64 = &context_union_.ppc64;
++  InitializeCPUContextPPC64<ContextTraits64>(
++      thread.thread_info.thread_context.t64,
++      thread.thread_info.float_context.f64,
++      thread.thread_info.vector_context.v64,
++      context_.ppc64);
+ #else
+ #error Port.
+ #endif
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/thread_snapshot_linux.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/thread_snapshot_linux.h
+@@ -68,6 +68,8 @@ class ThreadSnapshotLinux final : public
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+     CPUContextMIPS mipsel;
+     CPUContextMIPS64 mips64;
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++    CPUContextPPC64 ppc64;
+ #else
+ #error Port.
+ #endif  // ARCH_CPU_X86_FAMILY
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/util/linux/auxiliary_vector.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/util/linux/auxiliary_vector.cc
+@@ -56,6 +56,11 @@ bool AuxiliaryVector::Read(PtraceConnect
+     if (type == AT_IGNORE) {
+       continue;
+     }
++#if defined(ARCH_CPU_PPC64_FAMILY)
++    if (type == AT_IGNOREPPC) {
++      continue;
++    }
++#endif
+     if (!MapInsertOrReplace(&values_, type, value, nullptr)) {
+       LOG(ERROR) << "duplicate auxv entry";
+       return false;
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/util/linux/ptracer.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/util/linux/ptracer.cc
+@@ -401,6 +401,64 @@ bool GetThreadArea64(pid_t tid,
+   return true;
+ }
+ 
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++// PPC64 has had HAVE_ARCH_TRACEHOOK set since 2.6.27 (even before x86 had it).
++// That means we can simply use PTRACE_GETREGESET.
++
++template <typename Destination>
++bool GetRegisterSet(pid_t tid, int set, Destination* dest, bool can_log) {
++  iovec iov;
++  iov.iov_base = reinterpret_cast<void*>(dest);
++  iov.iov_len = sizeof(*dest);
++  if (ptrace(PTRACE_GETREGSET, tid, reinterpret_cast<void*>(set), &iov) != 0) {
++    PLOG_IF(ERROR, can_log) << "ptrace";
++    return false;
++  }
++  if (iov.iov_len != sizeof(*dest)) {
++    LOG_IF(ERROR, can_log) << "Unexpected registers size";
++    return false;
++  }
++  return true;
++}
++
++bool GetVectorRegisters64(pid_t tid,
++                          VectorContext* context,
++                          bool can_log) {
++  return GetRegisterSet(tid, NT_PPC_VMX, &context->v64, can_log);
++}
++
++bool GetFloatingPointRegisters64(pid_t tid,
++                                 FloatContext* context,
++                                 bool can_log) {
++  return GetRegisterSet(tid, NT_PRFPREG, &context->f64, can_log);
++}
++
++bool GetThreadArea64(pid_t tid,
++                     const ThreadContext& context,
++                     LinuxVMAddress* address,
++                     bool can_log) {
++  // PPC64 doesn't have PTRACE_GET_THREAD_AREA since the thread pointer
++  // is stored in GPR 13.
++  ThreadContext::t64_t tc;
++  if (!GetRegisterSet(tid, NT_PRSTATUS, &tc, can_log)) {
++    LOG_IF(ERROR, can_log) << "Unable to get thread pointer!";
++    return false;
++  }
++
++  *address = tc.gpr[13];
++
++  return true;
++}
++
++// Stubs for 32-bit functions not applicable on PPC64
++bool GetFloatingPointRegisters32(pid_t tid,
++                                 FloatContext* context,
++                                 bool can_log) { return false; }
++bool GetThreadArea32(pid_t tid,
++                     const ThreadContext &context,
++                     LinuxVMAddress *address,
++                     bool can_log) { return false; }
++
+ #else
+ #error Port.
+ #endif  // ARCH_CPU_X86_FAMILY
+@@ -497,6 +555,9 @@ bool Ptracer::GetThreadInfo(pid_t tid, T
+   if (is_64_bit_) {
+     return GetGeneralPurposeRegisters64(tid, &info->thread_context, can_log_) &&
+            GetFloatingPointRegisters64(tid, &info->float_context, can_log_) &&
++#if defined(ARCH_CPU_PPC64_FAMILY)
++           GetVectorRegisters64(tid, &info->vector_context, can_log_) &&
++#endif
+            GetThreadArea64(tid,
+                            info->thread_context,
+                            &info->thread_specific_data_address,
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/util/linux/thread_info.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/util/linux/thread_info.h
+@@ -39,6 +39,13 @@ struct user_vfp_exc {
+ #include <android/api-level.h>
+ #endif
+ 
++#if defined(ARCH_CPU_PPC64_FAMILY)
++#include <sys/ucontext.h>
++#if !defined(__GLIBC__)
++#include <asm/ptrace.h>
++#endif
++#endif
++
+ namespace crashpad {
+ 
+ //! \brief The set of general purpose registers for an architecture family.
+@@ -90,6 +97,8 @@ union ThreadContext {
+     uint32_t cp0_status;
+     uint32_t cp0_cause;
+     uint32_t padding1_;
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++    // PPC64 is 64-bit
+ #else
+ #error Port.
+ #endif  // ARCH_CPU_X86_FAMILY
+@@ -143,6 +152,21 @@ union ThreadContext {
+     uint64_t cp0_badvaddr;
+     uint64_t cp0_status;
+     uint64_t cp0_cause;
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++    // Reflects struct pt_regs in asm/ptrace.h.
++    uint64_t gpr[32];
++    uint64_t nip;
++    uint64_t msr;
++    uint64_t orig_gpr3;
++    uint64_t ctr;
++    uint64_t lnk;
++    uint64_t xer;
++    uint64_t ccr;
++    uint64_t softe;
++    uint64_t trap;
++    uint64_t dar;
++    uint64_t dsisr;
++    uint64_t result;
+ #else
+ #error Port.
+ #endif  // ARCH_CPU_X86_FAMILY
+@@ -154,6 +178,8 @@ union ThreadContext {
+   using NativeThreadContext = user_regs;
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+ // No appropriate NativeThreadsContext type available for MIPS
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++  using NativeThreadContext = struct pt_regs;
+ #else
+ #error Port.
+ #endif  // ARCH_CPU_X86_FAMILY || ARCH_CPU_ARM64
+@@ -229,6 +255,9 @@ union FloatContext {
+     } fpregs[32];
+     uint32_t fpcsr;
+     uint32_t fpu_id;
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++    // Crashpad's PPC support is 64-bit only, so this
++    // 32bit-only struct is declared as empty.
+ #else
+ #error Port.
+ #endif  // ARCH_CPU_X86_FAMILY
+@@ -263,6 +292,10 @@ union FloatContext {
+     double fpregs[32];
+     uint32_t fpcsr;
+     uint32_t fpu_id;
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++    // Reflects fpregset_t in sys/ucontext.h
++    double fpregs[32];
++    double fpscr;
+ #else
+ #error Port.
+ #endif  // ARCH_CPU_X86_FAMILY
+@@ -291,6 +324,8 @@ union FloatContext {
+   static_assert(sizeof(f64) == sizeof(user_fpsimd_struct), "Size mismatch");
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+ // No appropriate floating point context native type for available MIPS.
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++  static_assert(sizeof(f64) == sizeof(fpregset_t), "Size mismatch");
+ #else
+ #error Port.
+ #endif  // ARCH_CPU_X86
+@@ -298,6 +333,26 @@ union FloatContext {
+ static_assert(std::is_standard_layout<FloatContext>::value,
+               "Not standard layout");
+ 
++//! \brief The vector registers used for an architecture family
++union VectorContext {
++  struct v32_t {} v32;
++#if defined(ARCH_CPU_PPC64_FAMILY)
++  __attribute__((__aligned__(16))) // Vector context must be doubleword aligned.
++#endif
++  struct v64_t {
++#if defined(ARCH_CPU_PPC64_FAMILY)
++    // Reflects vrregset_t in sys/ucontext.h
++    uint32_t vrregs[32][4];
++    struct {
++      uint32_t __pad[3];
++      uint32_t vscr_word;
++    } vscr;
++    uint32_t vrsave;
++    uint32_t __pad[3];
++#endif
++  } v64;
++};
++
+ //! \brief A collection of `ptrace`-able information about a thread.
+ struct ThreadInfo {
+   ThreadInfo();
+@@ -309,6 +364,9 @@ struct ThreadInfo {
+   //! \brief The floating point registers for the thread.
+   FloatContext float_context;
+ 
++  //! \brief (Optional) The vector registers used for the thread.
++  VectorContext vector_context;
++
+   //! \brief The thread-local storage address for the thread.
+   LinuxVMAddress thread_specific_data_address;
+ };
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/util/misc/capture_context.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/util/misc/capture_context.h
+@@ -69,6 +69,7 @@ using NativeCPUContext = ucontext_t;
+ //!     macOS/Linux/Fuchsia | x86_64       | `%%rdi`
+ //!     Linux               | ARM/ARM64    | `r0`/`x0`
+ //!     Linux               | MIPS/MIPS64  | `$a0`
++//!     Linux               | PPC64        | `r3`
+ //!
+ //!     Additionally, the value `LR` on ARM/ARM64 will be the return address of
+ //!     this function.
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/util/misc/capture_context_linux.S
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/util/misc/capture_context_linux.S
+@@ -32,7 +32,7 @@
+   .balign 4, 0x0
+   .type CAPTURECONTEXT_SYMBOL, %function
+   .type CAPTURECONTEXT_SYMBOL2, %function
+-#elif defined(__mips__)
++#elif defined(__mips__) || defined(__powerpc64__)
+   .balign 4, 0x0
+ #endif
+ 
+@@ -423,4 +423,214 @@ CAPTURECONTEXT_SYMBOL2:
+   jr $ra
+ 
+   .set at
++#elif defined(__powerpc64__)
++  // Store r0-r31
++  std 0, 0xe8(3)   // context->uc_mcontext.gp_regs[0]
++  std 1, 0xf0(3)   // context->uc_mcontext.gp_regs[1]
++  std 2, 0xf8(3)   // context->uc_mcontext.gp_regs[2]
++  // note that r3's original value was lost
++  std 3, 0x100(3)  // context->uc_mcontext.gp_regs[3]
++  std 4, 0x108(3)  // context->uc_mcontext.gp_regs[4]
++  std 5, 0x110(3)  // context->uc_mcontext.gp_regs[5]
++  std 6, 0x118(3)  // context->uc_mcontext.gp_regs[6]
++  std 7, 0x120(3)  // context->uc_mcontext.gp_regs[7]
++  std 8, 0x128(3)  // context->uc_mcontext.gp_regs[8]
++  std 9, 0x130(3)  // context->uc_mcontext.gp_regs[9]
++  std 10, 0x138(3) // context->uc_mcontext.gp_regs[10]
++  std 11, 0x140(3) // context->uc_mcontext.gp_regs[11]
++  std 12, 0x148(3) // context->uc_mcontext.gp_regs[12]
++  std 13, 0x150(3) // context->uc_mcontext.gp_regs[13]
++  std 14, 0x158(3) // context->uc_mcontext.gp_regs[14]
++  std 15, 0x160(3) // context->uc_mcontext.gp_regs[15]
++  std 16, 0x168(3) // context->uc_mcontext.gp_regs[16]
++  std 17, 0x170(3) // context->uc_mcontext.gp_regs[17]
++  std 18, 0x178(3) // context->uc_mcontext.gp_regs[18]
++  std 19, 0x180(3) // context->uc_mcontext.gp_regs[19]
++  std 20, 0x188(3) // context->uc_mcontext.gp_regs[20]
++  std 21, 0x190(3) // context->uc_mcontext.gp_regs[21]
++  std 22, 0x198(3) // context->uc_mcontext.gp_regs[22]
++  std 23, 0x1a0(3) // context->uc_mcontext.gp_regs[23]
++  std 24, 0x1a8(3) // context->uc_mcontext.gp_regs[24]
++  std 25, 0x1b0(3) // context->uc_mcontext.gp_regs[25]
++  std 26, 0x1b8(3) // context->uc_mcontext.gp_regs[26]
++  std 27, 0x1c0(3) // context->uc_mcontext.gp_regs[27]
++  std 28, 0x1c8(3) // context->uc_mcontext.gp_regs[28]
++  std 29, 0x1d0(3) // context->uc_mcontext.gp_regs[29]
++  std 30, 0x1d8(3) // context->uc_mcontext.gp_regs[30]
++  std 31, 0x1e0(3) // context->uc_mcontext.gp_regs[31]
++
++  // For NIP, we can use the value in the link register
++  mflr 0
++  std 0, 0x1e8(3) // context->uc_mcontext.gp_regs[PT_NIP]
++
++  // CTR
++  mfctr 0
++  std 0, 0x200(3) // context->uc_mcontext.gp_regs[PT_CTR]
++
++  // For LNK, we'll use the caller's LR save area (2 stack frames up).
++  // r4 can be used as a scratch register since it has already been saved.
++  ld 4, 0(1)
++  ld 4, 16(4)
++  std 4, 0x208(3) // context->uc_mcontext.gp_regs[PT_LNK]
++
++  // XER
++  mfxer 0
++  std 0, 0x210(3) // context->uc_mcontext.gp_regs[PT_XER]
++
++  // CCR
++  mfcr 0
++  std 0, 0x218(3) // context->uc_mcontext.gp_regs[PT_CCR]
++
++  // MSR, orig_r3, MQ, TRAP, DAR, DSISR, RESULT, DSCR,
++  // not used or not relevant,  zero them out.
++  li 4, 0
++  std 4, 0x1f0(3) // context->uc_mcontext.gp_regs[PT_MSR]
++  std 4, 0x1f8(3) // context->uc_mcontext.gp_regs[PT_ORIG_R3]
++  std 4, 0x220(3) // context->uc_mcontext.gp_regs[PT_MQ]
++  std 4, 0x228(3) // context->uc_mcontext.gp_regs[PT_TRAP]
++  std 4, 0x230(3) // context->uc_mcontext.gp_regs[PT_DAR]
++  std 4, 0x238(3) // context->uc_mcontext.gp_regs[PT_DSISR]
++  std 4, 0x240(3) // context->uc_mcontext.gp_regs[PT_RESULT]
++  std 4, 0x248(3) // context->uc_mcontext.gp_regs[PT_DSCR]
++
++  // Update context->uc_mcontext.regs to point to gp_regs
++  addi 0, 3, 0xe8
++  std 0, 0xe0(3)
++
++  // Save floating point registers 0-31
++  stfd 0, 0x268(3)  // context->uc_mcontext.fp_regs[0]
++  stfd 1, 0x270(3)  // context->uc_mcontext.fp_regs[1]
++  stfd 2, 0x278(3)  // context->uc_mcontext.fp_regs[2]
++  stfd 3, 0x280(3)  // context->uc_mcontext.fp_regs[3]
++  stfd 4, 0x288(3)  // context->uc_mcontext.fp_regs[4]
++  stfd 5, 0x290(3)  // context->uc_mcontext.fp_regs[5]
++  stfd 6, 0x298(3)  // context->uc_mcontext.fp_regs[6]
++  stfd 7, 0x2a0(3)  // context->uc_mcontext.fp_regs[7]
++  stfd 8, 0x2a8(3)  // context->uc_mcontext.fp_regs[8]
++  stfd 9, 0x2b0(3)  // context->uc_mcontext.fp_regs[9]
++  stfd 10, 0x2b8(3) // context->uc_mcontext.fp_regs[10]
++  stfd 11, 0x2c0(3) // context->uc_mcontext.fp_regs[11]
++  stfd 12, 0x2c8(3) // context->uc_mcontext.fp_regs[12]
++  stfd 13, 0x2d0(3) // context->uc_mcontext.fp_regs[13]
++  stfd 14, 0x2d8(3) // context->uc_mcontext.fp_regs[14]
++  stfd 15, 0x2e0(3) // context->uc_mcontext.fp_regs[15]
++  stfd 16, 0x2e8(3) // context->uc_mcontext.fp_regs[16]
++  stfd 17, 0x2f0(3) // context->uc_mcontext.fp_regs[17]
++  stfd 18, 0x2f8(3) // context->uc_mcontext.fp_regs[18]
++  stfd 19, 0x300(3) // context->uc_mcontext.fp_regs[19]
++  stfd 20, 0x308(3) // context->uc_mcontext.fp_regs[20]
++  stfd 21, 0x310(3) // context->uc_mcontext.fp_regs[21]
++  stfd 22, 0x318(3) // context->uc_mcontext.fp_regs[22]
++  stfd 23, 0x320(3) // context->uc_mcontext.fp_regs[23]
++  stfd 24, 0x328(3) // context->uc_mcontext.fp_regs[24]
++  stfd 25, 0x330(3) // context->uc_mcontext.fp_regs[25]
++  stfd 26, 0x338(3) // context->uc_mcontext.fp_regs[26]
++  stfd 27, 0x340(3) // context->uc_mcontext.fp_regs[27]
++  stfd 28, 0x348(3) // context->uc_mcontext.fp_regs[28]
++  stfd 29, 0x350(3) // context->uc_mcontext.fp_regs[29]
++  stfd 30, 0x358(3) // context->uc_mcontext.fp_regs[30]
++  stfd 31, 0x360(3) // context->uc_mcontext.fp_regs[31]
++
++  // FPSCR
++  mffs 0
++  stfd 0, 0x368(3) // context->uc_mcontext.fp_regs[32]
++
++  // Save VMX Vector registers
++  // Update r4 to contain the base address of vmx_reserve
++  addi 4, 3, 0x378
++  // Ensure that it is quadword aligned
++  andi. 5, 4, 0xF
++  beq 1f // No alignment is necessary
++  // Address is doubleword aligned and not quadword aligned, add 8
++  addi 4, 4, 8
++
++1:
++  // Store VMX registers 0-31
++  // r4 will contain the base address
++  // r5 will contain the index
++  li 5, 0
++  stvx 0, 4, 5   // context->uc_mcontext.vmx_reserve[(align) + 0]
++  addi 5, 5, 16
++  stvx 1, 4, 5   // context->uc_mcontext.vmx_reserve[(align) + 1]
++  addi 5, 5, 16
++  stvx 2, 4, 5   // context->uc_mcontext.vmx_reserve[(align) + 2]
++  addi 5, 5, 16
++  stvx 3, 4, 5   // context->uc_mcontext.vmx_reserve[(align) + 3]
++  addi 5, 5, 16
++  stvx 4, 4, 5   // context->uc_mcontext.vmx_reserve[(align) + 4]
++  addi 5, 5, 16
++  stvx 5, 4, 5   // context->uc_mcontext.vmx_reserve[(align) + 5]
++  addi 5, 5, 16
++  stvx 6, 4, 5   // context->uc_mcontext.vmx_reserve[(align) + 6]
++  addi 5, 5, 16
++  stvx 7, 4, 5   // context->uc_mcontext.vmx_reserve[(align) + 7]
++  addi 5, 5, 16
++  stvx 8, 4, 5   // context->uc_mcontext.vmx_reserve[(align) + 8]
++  addi 5, 5, 16
++  stvx 9, 4, 5   // context->uc_mcontext.vmx_reserve[(align) + 9]
++  addi 5, 5, 16
++  stvx 10, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 10]
++  addi 5, 5, 16
++  stvx 11, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 11]
++  addi 5, 5, 16
++  stvx 12, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 12]
++  addi 5, 5, 16
++  stvx 13, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 13]
++  addi 5, 5, 16
++  stvx 14, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 14]
++  addi 5, 5, 16
++  stvx 15, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 15]
++  addi 5, 5, 16
++  stvx 16, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 16]
++  addi 5, 5, 16
++  stvx 17, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 17]
++  addi 5, 5, 16
++  stvx 18, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 18]
++  addi 5, 5, 16
++  stvx 19, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 19]
++  addi 5, 5, 16
++  stvx 20, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 20]
++  addi 5, 5, 16
++  stvx 21, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 21]
++  addi 5, 5, 16
++  stvx 22, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 22]
++  addi 5, 5, 16
++  stvx 23, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 23]
++  addi 5, 5, 16
++  stvx 24, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 24]
++  addi 5, 5, 16
++  stvx 25, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 25]
++  addi 5, 5, 16
++  stvx 26, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 26]
++  addi 5, 5, 16
++  stvx 27, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 27]
++  addi 5, 5, 16
++  stvx 28, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 28]
++  addi 5, 5, 16
++  stvx 29, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 29]
++  addi 5, 5, 16
++  stvx 30, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 30]
++  addi 5, 5, 16
++  stvx 31, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 31]
++  addi 5, 5, 16
++
++  // VSCR
++  mfvscr 0
++  stvx 0, 4, 5
++  addi 5, 5, 16
++
++  // VRSAVE
++  mfvrsave 0
++  stwx 0, 4, 5
++
++  // Update context->uc_mcontext.v_regs to point to vmx_reserve + alignment.
++  std 4, 0x370(3)
++
++  // Zero out all unused fields
++  li 4, 0
++  std 4, 0xc8(3) // context->uc_mcontext.signal
++  std 4, 0xd0(3) // context->uc_mcontext.handler
++  std 4, 0xd8(3) // context->uc_mcontext.oldmask
++
++  blr
+ #endif  // __i386__
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/util/misc/capture_context_test.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/util/misc/capture_context_test.cc
+@@ -57,7 +57,7 @@ void TestCaptureContext() {
+   uintptr_t pc = ProgramCounterFromContext(context_1);
+ 
+ #if !defined(ADDRESS_SANITIZER) && !defined(ARCH_CPU_MIPS_FAMILY) && \
+-    !defined(MEMORY_SANITIZER)
++    !defined(MEMORY_SANITIZER) && !defined(ARCH_CPU_PPC64_FAMILY)
+   // Sanitizers can cause enough code bloat that the “nearby” check would
+   // likely fail.
+   const uintptr_t kReferencePC =
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/util/misc/capture_context_test_util_linux.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/util/misc/capture_context_test_util_linux.cc
+@@ -35,6 +35,8 @@ void SanityCheckContext(const NativeCPUC
+   EXPECT_EQ(context.uc_mcontext.regs[0], FromPointerCast<uintptr_t>(&context));
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+   EXPECT_EQ(context.uc_mcontext.gregs[4], FromPointerCast<uintptr_t>(&context));
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++  EXPECT_EQ(context.uc_mcontext.gp_regs[3], FromPointerCast<uintptr_t>(&context));
+ #endif
+ }
+ 
+@@ -49,6 +51,8 @@ uintptr_t ProgramCounterFromContext(cons
+   return context.uc_mcontext.pc;
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+   return context.uc_mcontext.pc;
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++  return context.uc_mcontext.gp_regs[PT_NIP];
+ #endif
+ }
+ 
+@@ -63,6 +67,8 @@ uintptr_t StackPointerFromContext(const
+   return context.uc_mcontext.sp;
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+   return context.uc_mcontext.gregs[29];
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++  return context.uc_mcontext.gp_regs[1];
+ #endif
+ }
+ 
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/util/posix/signals_test.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/util/posix/signals_test.cc
+@@ -46,9 +46,9 @@ bool CanCauseSignal(int sig) {
+   return sig == SIGABRT ||
+          sig == SIGALRM ||
+          sig == SIGBUS ||
+-#if !defined(ARCH_CPU_ARM64)
++#if !defined(ARCH_CPU_ARM64) && !defined(ARCH_CPU_PPC64)
+          sig == SIGFPE ||
+-#endif  // !defined(ARCH_CPU_ARM64)
++#endif  // !defined(ARCH_CPU_ARM64) && !defined(ARCH_CPU_PPC64)
+ #if defined(ARCH_CPU_X86_FAMILY) || defined(ARCH_CPU_ARMEL)
+          sig == SIGILL ||
+ #endif  // defined(ARCH_CPU_X86_FAMILY) || defined(ARCH_CPU_ARMEL)
+@@ -117,9 +117,11 @@ void CauseSignal(int sig) {
+       break;
+     }
+ 
+-#if !defined(ARCH_CPU_ARM64)
++#if !defined(ARCH_CPU_ARM64) && !defined(ARCH_CPU_PPC64)
+     // ARM64 has hardware integer division instructions that don’t generate a
+     // trap for divide-by-zero, so this doesn’t produce SIGFPE.
++    //
++    // PPC64 fixed-point division by zero also doesn't produce a SIGFPE.
+     case SIGFPE: {
+       // Optimization makes this tricky, so get zero from a system call likely
+       // to succeed, and try to do something with the result.
+@@ -137,7 +139,7 @@ void CauseSignal(int sig) {
+       fstat(quotient, &stat_buf);
+       break;
+     }
+-#endif  // ARCH_CPU_ARM64
++#endif  // !defined(ARCH_CPU_ARM64) && !defined(ARCH_CPU_PPC64)
+ 
+ #if defined(ARCH_CPU_X86_FAMILY) || defined(ARCH_CPU_ARMEL)
+     case SIGILL: {
+--- a/src/3rdparty/chromium/third_party/dav1d/BUILD.gn
++++ b/src/3rdparty/chromium/third_party/dav1d/BUILD.gn
+@@ -196,6 +196,8 @@ static_library("dav1d_8bit") {
+     sources += arm_template_sources
+   } else if (current_cpu == "arm64") {
+     sources += arm_template_sources
++  } else if (current_cpu == "ppc64") {
++    sources += ppc64_template_sources
+   }
+ 
+   cflags = dav1d_copts
+@@ -226,6 +228,8 @@ static_library("dav1d_10bit") {
+     sources += arm_template_sources
+   } else if (current_cpu == "arm64") {
+     sources += arm_template_sources
++  } else if (current_cpu == "ppc64") {
++    sources += ppc64_template_sources
+   }
+ 
+   cflags = dav1d_copts
+@@ -283,6 +287,21 @@ if (current_cpu == "x86" || current_cpu
+     }
+ 
+     cflags = dav1d_copts
++  }
++} else if (current_cpu == "ppc64") {
++  static_library("dav1d_ppc") {
++    sources = [
++      "libdav1d/src/ppc/cpu.c",
++      "libdav1d/src/ppc/cpu.h",
++    ]
++
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [
++      "//build/config/compiler:no_chromium_code",
++      ":dav1d_config",
++    ]
++
++    cflags = dav1d_copts
+ 
+     deps = [ ":dav1d_headers" ]
+     allow_circular_includes_from = [ ":dav1d_headers" ]
+@@ -315,5 +334,7 @@ static_library("dav1d") {
+     }
+   } else if (current_cpu == "arm" || current_cpu == "arm64") {
+     deps += [ ":dav1d_arm" ]
++  } else if (current_cpu == "ppc64") {
++    deps += [ ":dav1d_ppc" ]
+   }
+ }
+--- a/src/3rdparty/chromium/third_party/dav1d/dav1d_generated.gni
++++ b/src/3rdparty/chromium/third_party/dav1d/dav1d_generated.gni
+@@ -103,6 +103,11 @@ arm_template_sources = [
+   "libdav1d/src/arm/mc_init_tmpl.c",
+ ]
+ 
++ppc64_template_sources = [
++  "libdav1d/src/ppc/cdef_init_tmpl.c",
++  "libdav1d/src/ppc/looprestoration_init_tmpl.c",
++]
++
+ template_sources = [
+   "libdav1d/src/cdef_apply_tmpl.c",
+   "libdav1d/src/cdef_tmpl.c",
+--- a/src/3rdparty/chromium/third_party/dav1d/generate_source.py
++++ b/src/3rdparty/chromium/third_party/dav1d/generate_source.py
+@@ -57,6 +57,8 @@ def _WriteGn(fd):
+   _WriteArray(fd, "arm64_asm_sources", _Glob("libdav1d/src/arm/64/*.S"))
+   _WriteArray(fd, "arm_template_sources", _Glob("libdav1d/src/arm/*_tmpl.c"))
+ 
++  _WriteArray(fd, "ppc64_template_sources", _Glob("libdav1d/src/ppc/*_tmpl.c"))
++
+   template_sources = _Glob("libdav1d/src/*_tmpl.c")
+   _WriteArray(fd, "template_sources", template_sources)
+ 
+--- a/src/3rdparty/chromium/third_party/dav1d/libdav1d/src/ppc/types.h
++++ b/src/3rdparty/chromium/third_party/dav1d/libdav1d/src/ppc/types.h
+@@ -51,4 +51,19 @@
+ #define u16l_to_i32(v) ((i32x4) vec_mergel((u16x8) v, vec_splat_u16(0)))
+ #define i16l_to_i32(v) ((i32x4) vec_unpackl((i16x8)v))
+ 
++#if defined(__clang__)
++#undef vec_splats
++#define vec_splats(N)                     \
++    _Generic((N),                         \
++        unsigned char:      ((u8x16)(N)), \
++        signed char:        ((i8x16)(N)), \
++        unsigned short:     ((u16x8)(N)), \
++        signed short:       ((i16x8)(N)), \
++        unsigned int:       ((u32x4)(N)), \
++        signed int:         ((i32x4)(N)), \
++        unsigned long long: ((u64x2)(N)), \
++        signed long long:   ((i64x2)(N))  \
++    )
++#endif
++
+ #endif /* DAV1D_SRC_PPC_TYPES_H */
+--- a/src/3rdparty/chromium/third_party/eigen3/BUILD.gn
++++ b/src/3rdparty/chromium/third_party/eigen3/BUILD.gn
+@@ -22,4 +22,8 @@ config("eigen_includes") {
+     # for this component on Windows on Arm due to compilation errors.
+     defines += [ "EIGEN_DONT_VECTORIZE" ]
+   }
++
++  if (target_cpu == "ppc64") {
++    defines += [ "EIGEN_DONT_VECTORIZE" ]
++  }
+ }
+--- a/src/3rdparty/chromium/third_party/libaom/BUILD.gn
++++ b/src/3rdparty/chromium/third_party/libaom/BUILD.gn
+@@ -37,6 +37,8 @@ if (enable_libaom) {
+     } else {
+       cpu_arch_full = "arm"
+     }
++  } else if (current_cpu == "ppc64") {
++    cpu_arch_full = "generic"
+   } else {
+     cpu_arch_full = current_cpu
+   }
+--- a/src/3rdparty/chromium/third_party/libgav1/options.gni
++++ b/src/3rdparty/chromium/third_party/libgav1/options.gni
+@@ -12,5 +12,5 @@ declare_args() {
+       is_chromeos_ash && (target_cpu == "arm" || target_cpu == "arm64")
+   use_libgav1_parser =
+       (is_chromeos || is_linux || is_win) &&
+-      (target_cpu == "x86" || target_cpu == "x64" || target_cpu == "arm64")
++      (target_cpu == "x86" || target_cpu == "x64" || target_cpu == "arm64" || target_cpu == "ppc64")
+ }
+--- a/src/3rdparty/chromium/third_party/lss/linux_syscall_support.h
++++ b/src/3rdparty/chromium/third_party/lss/linux_syscall_support.h
+@@ -4262,7 +4262,7 @@ struct kernel_statfs {
+       LSS_REG(2, buf);
+       LSS_BODY(void*, mmap2, "0"(__r2));
+     }
+-#else
++#elif !defined(__powerpc64__) /* ppc64 doesn't have mmap2 */
+     #define __NR__mmap2 __NR_mmap2
+     LSS_INLINE _syscall6(void*, _mmap2,            void*, s,
+                          size_t,                   l, int,               p,
+@@ -4373,7 +4373,7 @@ struct kernel_statfs {
+   #if defined(__i386__) ||                                                    \
+       defined(__ARM_ARCH_3__) || defined(__ARM_EABI__) ||                     \
+      (defined(__mips__) && _MIPS_SIM == _MIPS_SIM_ABI32) ||                   \
+-      defined(__PPC__) ||                                                     \
++     (defined(__PPC__) && !defined(__powerpc64__)) ||                                                     \
+      (defined(__s390__) && !defined(__s390x__))
+     /* On these architectures, implement mmap() with mmap2(). */
+     LSS_INLINE void* LSS_NAME(mmap)(void *s, size_t l, int p, int f, int d,
+@@ -4556,9 +4556,17 @@ struct kernel_statfs {
+     }
+   #endif
+   #if defined(__NR_fstatat64)
++    #if !defined(__GLIBC__)
++        // musl doesn't define fstatat64 fstatat
++        #undef fstatat64
++    #endif
+     LSS_INLINE _syscall4(int,   fstatat64,        int,   d,
+                          const char *,      p,
+                          struct kernel_stat64 *,   b,    int,   f)
++    #if !defined(__GLIBC__)
++    	// then restore it
++        #define fstatat64 fstatat
++    #endif
+   #endif
+   #if defined(__NR_waitpid)
+     // waitpid is polyfilled below when not available.
+--- a/src/3rdparty/chromium/third_party/pdfium/third_party/libpng16/pngpriv.h
++++ b/src/3rdparty/chromium/third_party/pdfium/third_party/libpng16/pngpriv.h
+@@ -196,11 +196,7 @@
+ #endif
+ 
+ #ifndef PNG_POWERPC_VSX_OPT
+-#  if defined(__PPC64__) && defined(__ALTIVEC__) && defined(__VSX__)
+-#     define PNG_POWERPC_VSX_OPT 2
+-#  else
+-#     define PNG_POWERPC_VSX_OPT 0
+-#  endif
++#  define PNG_POWERPC_VSX_OPT 0
+ #endif
+ 
+ #ifndef PNG_INTEL_SSE_OPT
+--- a/src/3rdparty/chromium/third_party/pffft/src/pffft.c
++++ b/src/3rdparty/chromium/third_party/pffft/src/pffft.c
+@@ -100,6 +100,7 @@
+    Altivec support macros 
+ */
+ #if !defined(PFFFT_SIMD_DISABLE) && (defined(__ppc__) || defined(__ppc64__))
++#include <altivec.h>
+ typedef vector float v4sf;
+ #  define SIMD_SZ 4
+ #  define VZERO() ((vector float) vec_splat_u8(0))
+--- a/src/3rdparty/chromium/third_party/skia/src/sksl/SkSLString.cpp
++++ b/src/3rdparty/chromium/third_party/skia/src/sksl/SkSLString.cpp
+@@ -142,7 +142,12 @@ String to_string(double value) {
+     if (needsDotZero) {
+         buffer << ".0";
+     }
+-    return String(buffer.str().c_str());
++
++    std::string ret(buffer.str());
++    if (signbit(value) && ret[0] == '.') {
++        ret[0] = '-';
++    }
++    return String(ret.c_str());
+ }
+ 
+ bool stod(const skstd::string_view& s, SKSL_FLOAT* value) {
+--- a/src/3rdparty/chromium/third_party/sqlite/src/amalgamation/sqlite3.c
++++ b/src/3rdparty/chromium/third_party/sqlite/src/amalgamation/sqlite3.c
+@@ -14628,7 +14628,8 @@ typedef INT16_TYPE LogEst;
+ # if defined(i386)      || defined(__i386__)      || defined(_M_IX86) ||    \
+      defined(__x86_64)  || defined(__x86_64__)    || defined(_M_X64)  ||    \
+      defined(_M_AMD64)  || defined(_M_ARM)        || defined(__x86)   ||    \
+-     defined(__ARMEL__) || defined(__AARCH64EL__) || defined(_M_ARM64)
++     defined(__ARMEL__) || defined(__AARCH64EL__) || defined(_M_ARM64) ||   \
++     defined(__powerpc64__) && (__BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__)
+ #   define SQLITE_BYTEORDER    1234
+ # elif defined(sparc)     || defined(__ppc__) || \
+        defined(__ARMEB__) || defined(__AARCH64EB__)
+--- a/src/3rdparty/chromium/third_party/sqlite/src/amalgamation_dev/sqlite3.c
++++ b/src/3rdparty/chromium/third_party/sqlite/src/amalgamation_dev/sqlite3.c
+@@ -14641,7 +14641,8 @@ typedef INT16_TYPE LogEst;
+ # if defined(i386)      || defined(__i386__)      || defined(_M_IX86) ||    \
+      defined(__x86_64)  || defined(__x86_64__)    || defined(_M_X64)  ||    \
+      defined(_M_AMD64)  || defined(_M_ARM)        || defined(__x86)   ||    \
+-     defined(__ARMEL__) || defined(__AARCH64EL__) || defined(_M_ARM64)
++     defined(__ARMEL__) || defined(__AARCH64EL__) || defined(_M_ARM64) ||   \
++     defined(__powerpc64__) && (__BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__)
+ #   define SQLITE_BYTEORDER    1234
+ # elif defined(sparc)     || defined(__ppc__) || \
+        defined(__ARMEB__) || defined(__AARCH64EB__)
+--- a/src/3rdparty/chromium/third_party/sqlite/src/ext/rtree/rtree.c
++++ b/src/3rdparty/chromium/third_party/sqlite/src/ext/rtree/rtree.c
+@@ -450,7 +450,7 @@ struct RtreeMatchArg {
+ #if defined(i386)     || defined(__i386__)   || defined(_M_IX86) ||    \
+     defined(__x86_64) || defined(__x86_64__) || defined(_M_X64)  ||    \
+     defined(_M_AMD64) || defined(_M_ARM)     || defined(__x86)   ||    \
+-    defined(__arm__)
++    defined(__arm__) || defined(__powerpc64__) && (__BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__)
+ # define SQLITE_BYTEORDER    1234
+ #elif defined(sparc)    || defined(__ppc__)
+ # define SQLITE_BYTEORDER    4321
+--- a/src/3rdparty/chromium/third_party/sqlite/src/src/sqliteInt.h
++++ b/src/3rdparty/chromium/third_party/sqlite/src/src/sqliteInt.h
+@@ -890,7 +890,8 @@ typedef INT16_TYPE LogEst;
+ # if defined(i386)      || defined(__i386__)      || defined(_M_IX86) ||    \
+      defined(__x86_64)  || defined(__x86_64__)    || defined(_M_X64)  ||    \
+      defined(_M_AMD64)  || defined(_M_ARM)        || defined(__x86)   ||    \
+-     defined(__ARMEL__) || defined(__AARCH64EL__) || defined(_M_ARM64)
++     defined(__ARMEL__) || defined(__AARCH64EL__) || defined(_M_ARM64) || \
++     defined(__powerpc64__) && (__BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__)
+ #   define SQLITE_BYTEORDER    1234
+ # elif defined(sparc)     || defined(__ppc__) || \
+        defined(__ARMEB__) || defined(__AARCH64EB__)
+--- a/src/3rdparty/chromium/third_party/webrtc/modules/desktop_capture/differ_block.cc
++++ b/src/3rdparty/chromium/third_party/webrtc/modules/desktop_capture/differ_block.cc
+@@ -30,11 +30,7 @@ bool VectorDifference(const uint8_t* ima
+   static bool (*diff_proc)(const uint8_t*, const uint8_t*) = nullptr;
+ 
+   if (!diff_proc) {
+-#if defined(WEBRTC_ARCH_ARM_FAMILY) || defined(WEBRTC_ARCH_MIPS_FAMILY)
+-    // For ARM and MIPS processors, always use C version.
+-    // TODO(hclam): Implement a NEON version.
+-    diff_proc = &VectorDifference_C;
+-#else
++#if defined(WEBRTC_ARCH_X86_FAMILY)
+     bool have_sse2 = GetCPUInfo(kSSE2) != 0;
+     // For x86 processors, check if SSE2 is supported.
+     if (have_sse2 && kBlockSize == 32) {
+@@ -44,6 +40,10 @@ bool VectorDifference(const uint8_t* ima
+     } else {
+       diff_proc = &VectorDifference_C;
+     }
++#else
++    // For other processors, always use C version.
++    // TODO(hclam): Implement a NEON version.
++    diff_proc = &VectorDifference_C;
+ #endif
+   }
+ 
+--- a/src/3rdparty/chromium/v8/BUILD.gn
++++ b/src/3rdparty/chromium/v8/BUILD.gn
+@@ -1083,6 +1083,12 @@ config("toolchain") {
+     }
+     if (host_byteorder == "little") {
+       defines += [ "V8_TARGET_ARCH_PPC_LE" ]
++      cflags += [
++        # Enable usage of AltiVec, VSX, and other POWER8 and higher features
++        "-mcpu=power8",
++        "-maltivec",
++        "-mvsx",
++      ]
+     } else if (host_byteorder == "big") {
+       defines += [ "V8_TARGET_ARCH_PPC_BE" ]
+       if (current_os == "aix") {
+--- a/src/3rdparty/chromium/ui/gl/features.gni
++++ b/src/3rdparty/chromium/ui/gl/features.gni
+@@ -35,7 +35,8 @@ declare_args() {
+                         (is_mac && use_egl) || is_chromeos_ash || is_fuchsia) &&
+                        (target_cpu == "x86" || target_cpu == "x64" ||
+                         target_cpu == "arm" || target_cpu == "arm64" ||
+-                        target_cpu == "mipsel" || target_cpu == "mips64el")
++                        target_cpu == "mipsel" || target_cpu == "mips64el" ||
++                        target_cpu == "ppc64")
+ }
+ 
+ use_glx = use_x11 || ozone_platform_x11
+--- a/src/3rdparty/chromium/v8/test/BUILD.gn
++++ b/src/3rdparty/chromium/v8/test/BUILD.gn
+@@ -42,7 +42,6 @@ group("gn_all") {
+       "benchmarks/cpp:gn_all",
+       "cctest:cctest",
+       "cctest:generate-bytecode-expectations",
+-      "unittests:unittests",
+     ]
+   }
+ }
+@@ -84,7 +83,6 @@ group("v8_bot_default") {
+     "message:v8_message",
+     "mjsunit:v8_mjsunit",
+     "mkgrokdump:mkgrokdump",
+-    "unittests:unittests",
+     "webkit:v8_webkit",
+   ]
+ 
+@@ -109,7 +107,6 @@ group("v8_default") {
+     "message:v8_message",
+     "mjsunit:v8_mjsunit",
+     "mkgrokdump:mkgrokdump",
+-    "unittests:unittests",
+   ]
+ 
+   if (v8_enable_webassembly) {
+--- /dev/null
++++ b/src/3rdparty/chromium/dev/null
+@@ -0,0 +1,39 @@
++/*
++ * Autogenerated by the Meson build system.
++ * Do not edit, your changes will be lost.
++ */
++
++#pragma once
++
++#define ARCH_AARCH64 0
++
++#define ARCH_ARM 0
++
++#define ARCH_PPC64LE 1
++
++#define ARCH_X86 0
++
++#define ARCH_X86_32 0
++
++#define ARCH_X86_64 0
++
++#define CONFIG_16BPC 1
++
++#define CONFIG_8BPC 1
++
++// #define CONFIG_LOG 1 -- Logging is controlled by Chromium
++
++#define ENDIANNESS_BIG 0
++
++#define HAVE_ASM 1
++
++#define HAVE_CLOCK_GETTIME 1
++
++#define HAVE_DLSYM 1
++
++#define HAVE_GETAUXVAL 1
++
++#define HAVE_POSIX_MEMALIGN 1
++
++#define HAVE_UNISTD_H 1
++
+--- a/src/3rdparty/chromium/third_party/abseil-cpp/absl/base/internal/unscaledcycleclock.h
++++ b/src/3rdparty/chromium/third_party/abseil-cpp/absl/base/internal/unscaledcycleclock.h
+@@ -46,7 +46,7 @@
+ 
+ // The following platforms have an implementation of a hardware counter.
+ #if defined(__i386__) || defined(__x86_64__) || defined(__aarch64__) || \
+-  defined(__powerpc__) || defined(__ppc__) || \
++  ((defined(__powerpc__) || defined(__ppc__)) && defined(__GLIBC__)) || \
+   defined(_M_IX86) || defined(_M_X64)
+ #define ABSL_HAVE_UNSCALED_CYCLECLOCK_IMPLEMENTATION 1
+ #else
+--- a/src/3rdparty/chromium/third_party/abseil-cpp/absl/debugging/internal/stacktrace_config.h
++++ b/src/3rdparty/chromium/third_party/abseil-cpp/absl/debugging/internal/stacktrace_config.h
+@@ -59,7 +59,7 @@
+ #elif defined(__i386__) || defined(__x86_64__)
+ #define ABSL_STACKTRACE_INL_HEADER \
+   "absl/debugging/internal/stacktrace_x86-inl.inc"
+-#elif defined(__ppc__) || defined(__PPC__)
++#elif defined(__ppc__) || defined(__PPC__) && defined(__GLIBC__)
+ #define ABSL_STACKTRACE_INL_HEADER \
+   "absl/debugging/internal/stacktrace_powerpc-inl.inc"
+ #elif defined(__aarch64__)
+--- a/src/3rdparty/chromium/base/allocator/partition_allocator/partition_alloc_config.h
++++ b/src/3rdparty/chromium/base/allocator/partition_allocator/partition_alloc_config.h
+@@ -100,7 +100,8 @@ static_assert(sizeof(void*) != 8, "");
+ // PUT_REF_COUNT_IN_PREVIOUS_SLOT does. In this case the refcount overlaps with
+ // the next pointer shadow for the smallest bucket.
+ #if !(defined(OS_MAC) && defined(ARCH_CPU_ARM64)) && \
+-    !BUILDFLAG(PUT_REF_COUNT_IN_PREVIOUS_SLOT)
++    !BUILDFLAG(PUT_REF_COUNT_IN_PREVIOUS_SLOT) && \
++    (!defined(__GLIBC) && !defined(__powerpc64__))
+ #define PA_HAS_FREELIST_HARDENING
+ #endif
+ 
+--- a/src/3rdparty/chromium/build/download_nacl_toolchains.py
++++ b/src/3rdparty/chromium/build/download_nacl_toolchains.py
+@@ -13,6 +13,8 @@ import sys
+ 
+ 
+ def Main(args):
++  if 'disable_nacl=1' in os.environ.get('GYP_DEFINES', ''):
++    return 0
+   script_dir = os.path.dirname(os.path.abspath(__file__))
+   src_dir = os.path.dirname(script_dir)
+   nacl_dir = os.path.join(src_dir, 'native_client')
+--- a/src/3rdparty/chromium/chrome/installer/linux/BUILD.gn
++++ b/src/3rdparty/chromium/chrome/installer/linux/BUILD.gn
+@@ -100,8 +100,6 @@ packaging_files = packaging_files_binari
+                     "$root_out_dir/xdg-mime",
+                     "$root_out_dir/xdg-settings",
+                     "$root_out_dir/locales/en-US.pak",
+-                    "$root_out_dir/MEIPreload/manifest.json",
+-                    "$root_out_dir/MEIPreload/preloaded_data.pb",
+                   ]
+ 
+ action_foreach("calculate_deb_dependencies") {
+@@ -321,7 +319,6 @@ group("installer_deps") {
+     ":theme_files",
+     "//chrome",
+     "//chrome:packed_resources",
+-    "//chrome/browser/resources/media/mei_preload:component",
+     "//components/crash/core/app:chrome_crashpad_handler",
+     "//sandbox/linux:chrome_sandbox",
+   ]
+--- /dev/null
++++ b/src/3rdparty/chromium/sandbox/linux/system_headers/ppc64_linux_syscalls.h
+@@ -0,0 +1,12 @@
++// Copyright 2014 The Chromium Authors. All rights reserved.
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++#ifndef SANDBOX_LINUX_SYSTEM_HEADERS_PPC64_LINUX_SYSCALLS_H_
++#define SANDBOX_LINUX_SYSTEM_HEADERS_PPC64_LINUX_SYSCALLS_H_
++
++#include <asm/unistd.h>
++
++//TODO: is it necessary to redefine syscall numbers for PPC64?
++
++#endif  // SANDBOX_LINUX_SYSTEM_HEADERS_PPC64_LINUX_SYSCALLS_H_
+--- /dev/null
++++ b/src/3rdparty/chromium/sandbox/linux/system_headers/ppc64_linux_ucontext.h
+@@ -0,0 +1,12 @@
++// Copyright 2014 The Chromium Authors. All rights reserved.
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++#ifndef SANDBOX_LINUX_SYSTEM_HEADERS_PPC64_LINUX_UCONTEXT_H_
++#define SANDBOX_LINUX_SYSTEM_HEADERS_PPC64_LINUX_UCONTEXT_H_
++
++#include <sys/ucontext.h>
++
++//TODO: is it necessary to redefine ucontext on PPC64?
++
++#endif  // SANDBOX_LINUX_SYSTEM_HEADERS_PPC64_LINUX_UCONTEXT_H_
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/util/net/http_transport_libcurl.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/util/net/http_transport_libcurl.cc
+@@ -236,6 +236,12 @@ std::string UserAgent() {
+ #elif defined(ARCH_CPU_BIG_ENDIAN)
+     static constexpr char arch[] = "aarch64_be";
+ #endif
++#elif defined(__powerpc64__)
++#if defined(ARCH_CPU_LITTLE_ENDIAN)
++    static constexpr char arch[] = "ppc64le";
++#elif defined(ARCH_CPU_BIG_ENDIAN)
++    static constexpr char arch[] = "ppc64";
++#endif
+ #else
+ #error Port
+ #endif
+--- /dev/null
++++ b/src/3rdparty/chromium/third_party/dav1d/config/linux/ppc64/config.h
+@@ -0,0 +1,39 @@
++/*
++ * Autogenerated by the Meson build system.
++ * Do not edit, your changes will be lost.
++ */
++
++#pragma once
++
++#define ARCH_AARCH64 0
++
++#define ARCH_ARM 0
++
++#define ARCH_PPC64LE 1
++
++#define ARCH_X86 0
++
++#define ARCH_X86_32 0
++
++#define ARCH_X86_64 0
++
++#define CONFIG_16BPC 1
++
++#define CONFIG_8BPC 1
++
++// #define CONFIG_LOG 1 -- Logging is controlled by Chromium
++
++#define ENDIANNESS_BIG 0
++
++#define HAVE_ASM 1
++
++#define HAVE_CLOCK_GETTIME 1
++
++#define HAVE_DLSYM 1
++
++#define HAVE_GETAUXVAL 1
++
++#define HAVE_POSIX_MEMALIGN 1
++
++#define HAVE_UNISTD_H 1
++
diff --git a/srcpkgs/qt6-webengine/patches/0903-xxx-ppc64le-swiftshader.patch b/srcpkgs/qt6-webengine/patches/0903-xxx-ppc64le-swiftshader.patch
new file mode 100644
index 000000000000..1a8cd8368da1
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0903-xxx-ppc64le-swiftshader.patch
@@ -0,0 +1,18 @@
+--- a/src/3rdparty/chromium/third_party/swiftshader/third_party/llvm-10.0/BUILD.gn
++++ b/src/3rdparty/chromium/third_party/swiftshader/third_party/llvm-10.0/BUILD.gn
+@@ -576,6 +576,7 @@ swiftshader_llvm_source_set("swiftshader
+     "llvm/lib/MC/MCAsmInfoCOFF.cpp",
+     "llvm/lib/MC/MCAsmInfoDarwin.cpp",
+     "llvm/lib/MC/MCAsmInfoELF.cpp",
++    "llvm/lib/MC/MCAsmInfoXCOFF.cpp",
+     "llvm/lib/MC/MCAsmMacro.cpp",
+     "llvm/lib/MC/MCAsmStreamer.cpp",
+     "llvm/lib/MC/MCAssembler.cpp",
+@@ -631,6 +632,7 @@ swiftshader_llvm_source_set("swiftshader
+     "llvm/lib/MC/MCWinCOFFStreamer.cpp",
+     "llvm/lib/MC/MCWinEH.cpp",
+     "llvm/lib/MC/MCXCOFFStreamer.cpp",
++    "llvm/lib/MC/MCXCOFFObjectTargetWriter.cpp",
+     "llvm/lib/MC/MachObjectWriter.cpp",
+     "llvm/lib/MC/StringTableBuilder.cpp",
+     "llvm/lib/MC/SubtargetFeature.cpp",
diff --git a/srcpkgs/qt6-webengine/patches/cross-build-examples.patch b/srcpkgs/qt6-webengine/patches/cross-build-examples.patch
new file mode 100644
index 000000000000..4598643cc0dc
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/cross-build-examples.patch
@@ -0,0 +1,16 @@
+--- a/examples/CMakeLists.txt
++++ b/examples/CMakeLists.txt
+@@ -1,7 +1,6 @@
+ cmake_minimum_required(VERSION 3.16)
+ 
+ qt_examples_build_begin(EXTERNAL_BUILD)
+-if(NOT CMAKE_CROSSCOMPILING) #QTBUG-86533
+     if(TARGET Qt::WebEngineCore)
+         add_subdirectory(webenginequick)
+     endif()
+@@ -14,5 +13,4 @@ if(NOT CMAKE_CROSSCOMPILING) #QTBUG-8653
+     if(TARGET Qt::PdfWidgets)
+         add_subdirectory(pdfwidgets)
+     endif()
+-endif()
+ qt_examples_build_end()
diff --git a/srcpkgs/qt6-webengine/template b/srcpkgs/qt6-webengine/template
new file mode 100644
index 000000000000..2f0de2c7adf6
--- /dev/null
+++ b/srcpkgs/qt6-webengine/template
@@ -0,0 +1,178 @@
+# Template file for 'qt6-webengine'
+pkgname=qt6-webengine
+version=6.3.1
+revision=1
+wrksrc="qtwebengine-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true
+ -DQT_FEATURE_webengine_system_ffmpeg=ON
+ -DQT_FEATURE_webengine_system_libevent=ON
+ -DQT_FEATURE_webengine_system_gn=ON
+ -DQT_FEATURE_webengine_system_icu=ON
+ -DQT_FEATURE_webengine_webrtc_pipewire=ON
+ -DNinja_EXECUTABLE=$XBPS_WRAPPERDIR/ninja
+ $(vopt_bool examples QT_BUILD_EXAMPLES)
+ -DPKG_CONFIG_HOST_EXECUTABLE=${PKG_CONFIG_FOR_BUILD}"
+hostmakedepends="qt6-base-devel perl pkg-config nodejs python3-html5lib
+ qt6-declarative-devel protobuf gperf flex nss-devel libwebp-devel
+ icu-devel libevent-devel"
+makedepends="qt6-base-devel qt6-declarative-devel pulseaudio-devel
+ qt6-tools-devel qt6-websockets-devel libflac-devel
+ alsa-lib-devel libvpx-devel pciutils-devel opus-devel libxslt-devel
+ libxml2-devel freetype-devel lcms2-devel libwebp-devel icu-devel
+ re2-devel zlib-devel libpng-devel minizip-devel harfbuzz-devel
+ nss-devel libXcursor-devel libXcomposite-devel libXScrnSaver-devel
+ protobuf-devel ffmpeg-devel snappy-devel libevent-devel pipewire-devel
+ libxkbfile-devel qt6-location-devel qt6-webchannel-devel libxshmfence-devel"
+# Not working properly with HTTPS without those packages
+# Not strict dependencies, though
+depends="qt6-plugin-tls-openssl qt6-plugin-tls-qcertonly"
+short_desc="Cross-platform application and UI framework - Webengine"
+maintainer="John <me@johnnynator.dev>"
+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=ad7a33b21a956deda37c587d50f821ca3816403ae31ba9b5d59d01561ad66e47
+
+if [ -z "$CROSS_BUILD" ];then
+	configure_args+=" -DCMAKE_TOOLCHAIN_FILE=/usr/lib/cmake/Qt6/qt.toolchain.cmake"
+fi
+
+if [ "$XBPS_LIBC" = "musl" ]; then
+	hostmakedepends+=" musl-legacy-compat"
+fi
+
+if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
+	makedepends+=" musl-legacy-compat"
+fi
+
+if [ ! "$XBPS_WORDSIZE" = "$XBPS_TARGET_WORDSIZE" ]; then
+	broken="webengine can be built only if word size matches"
+fi
+
+if [ "$XBPS_WORDSIZE" -eq 32 ]; then
+	nodebug=yes
+	LDFLAGS="-Wl,--no-keep-memory"
+fi
+
+if [ "$XBPS_TARGET_ENDIAN" != "le" ]; then
+	broken="webengine only supports little endian"
+fi
+
+build_options="sndio examples"
+build_options_default=""
+desc_option_examples="Build examples"
+desc_option_sndio="Enable support for sndio"
+
+subpackages="qt6-webengine-devel"
+
+if [ "$build_option_examples" ]; then
+	subpackages+=" qt6-webengine-examples"
+fi
+
+_bootstrap_gn() {
+	# Bootstrap gn (generate ninja)
+	echo "Bootstrapping 'gn'"
+	cd ${wrksrc}/src/3rdparty/gn
+	CFLAGS="$CFLAGS_host" CXXFLAGS="$CXXFLAGS_host" LDFLAGS="$LDFLAGS_host" \
+	PKGCONFIG=/usr/bin/pkgconfig PKG_CONFIG_PATH="/usr/lib/pkgconfig:/usr/share/pkgconfig" \
+		python3 build/gen.py --no-last-commit-position --out-path \
+			${wrksrc}/src/3rdparty/gn/out/Release --cc "${CC_host:-$CC}" \
+			--cxx "${CXX_host:-$CXX}" --ld "${CXX_host:-$CXX}" --ar "${AR_host:-$AR}" \
+			--qt-version "${version}.qtwebengine.qt.io"
+	ninja -C out/Release gn
+	cd ${wrksrc}
+}
+
+_unbundle_libs() {
+	cd ${wrksrc}/src/3rdparty/chromium
+	echo Dropping bundled libs from chromium
+	# Use system-provided libraries.
+	# TODO: use_system_hunspell (upstream changes needed).
+	# TODO: use_system_libsrtp.
+	# TODO: use_system_libusb (http://crbug.com/266149).
+	# TODO: use_system_ssl (http://crbug.com/58087).
+	# TODO: use_system_sqlite (http://crbug.com/22208).
+	# TODO: use_system_icu (segfaults)
+	# use_system_protobuf
+	# use_system_v8=1
+	# use_system_zlib=1
+	# bzip2 jsoncpp minizip xdg_utils speex
+	system="
+		ffmpeg
+		flac
+		fontconfig
+		freetype
+		harfbuzz-ng
+		icu
+		libdrm
+		libevent
+		libjpeg
+		libpng
+		libwebp
+		libxml
+		libxslt
+		opus
+		re2
+		snappy
+	"
+	build/linux/unbundle/replace_gn_files.py --system-libraries ${system}
+}
+
+# Provide a wrapper to run ./xbps-src -j 1 build later
+_wrap_ninja() {
+	cat <<-'_EOF' >"$XBPS_WRAPPERDIR"/ninja
+	#!/bin/sh
+
+	exec /usr/bin/ninja $NINJAFLAGS "$@"
+	_EOF
+	chmod +x "$XBPS_WRAPPERDIR"/ninja
+}
+
+pre_configure() {
+	_bootstrap_gn
+	# _unbundle_libs
+	_wrap_ninja
+	export PATH="$PATH:${wrksrc}/src/3rdparty/gn/out/Release"
+}
+
+pre_build() {
+	export PATH="$PATH:${wrksrc}/src/3rdparty/gn/out/Release"
+	export NINJAFLAGS="$makejobs"
+
+}
+
+pre_install() {
+	export PATH="$PATH:${wrksrc}/src/3rdparty/gn/out/Release"
+}
+
+post_install() {
+	local _file
+	find "${DESTDIR}"/usr/lib/qt6/examples \
+		-path '*/lib/qt6/**/lib/qt6/*' -type f |
+	while read _file; do
+		mv "$_file" "${_file%/lib/qt6/*}"
+	done
+}
+
+qt6-webengine-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} qt6-webchannel-devel>=${version}_1
+	 qt6-declarative-devel>=${version}_1 qt6-location-devel>=${version}_1"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/pkgconfig
+		vmove usr/lib/qt6/mkspecs
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
+	}
+}
+
+qt6-webengine-examples_package() {
+	short_desc+=" - sample browsers"
+	pkg_install() {
+		vmove usr/lib/qt6/examples
+	}
+}
diff --git a/srcpkgs/qt6-webengine/update b/srcpkgs/qt6-webengine/update
new file mode 100644
index 000000000000..844552465222
--- /dev/null
+++ b/srcpkgs/qt6-webengine/update
@@ -0,0 +1 @@
+pkgname="${pkgname/6-/}-everywhere-src"

From e829b7d3fe5d23dbe2de985aa63768e96a03db34 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 14 Aug 2022 18:45:07 +0700
Subject: [PATCH 27/37] fixup! qt6-base

---
 srcpkgs/qt6-base/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/qt6-base/template b/srcpkgs/qt6-base/template
index 683598f7707d..04998704da8c 100644
--- a/srcpkgs/qt6-base/template
+++ b/srcpkgs/qt6-base/template
@@ -80,6 +80,7 @@ do_check() {
 	# Unknown platform linux-g++ :/
 	failing_tests+=" mockplugins test_import_plugins
 		test_static_resources test_generating_cpp_exports"
+	failing_tests+=" tst_qstorageinfo"
 	local ctest_exclude="("
 	for failure in $failing_tests; do
 		ctest_exclude+="$failure|"

From b5be439b0ff7e767137f3c8dd4a473af6dd7df45 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 14 Aug 2022 20:33:54 +0700
Subject: [PATCH 28/37] fixup! qt6-charts

---
 srcpkgs/qt6-charts/patches/no-cmake-test.patch | 10 ++++++++++
 srcpkgs/qt6-charts/template                    |  4 ++++
 2 files changed, 14 insertions(+)
 create mode 100644 srcpkgs/qt6-charts/patches/no-cmake-test.patch

diff --git a/srcpkgs/qt6-charts/patches/no-cmake-test.patch b/srcpkgs/qt6-charts/patches/no-cmake-test.patch
new file mode 100644
index 000000000000..6886282972ce
--- /dev/null
+++ b/srcpkgs/qt6-charts/patches/no-cmake-test.patch
@@ -0,0 +1,10 @@
+--- a/tests/auto/CMakeLists.txt
++++ b/tests/auto/CMakeLists.txt
+@@ -23,7 +23,6 @@ add_subdirectory(qcategoryaxis)
+ add_subdirectory(qbarcategoryaxis)
+ add_subdirectory(qlegend)
+ add_subdirectory(qareaseries)
+-add_subdirectory(cmake)
+ add_subdirectory(qcandlestickmodelmapper)
+ add_subdirectory(qcandlestickseries)
+ add_subdirectory(qcandlestickset)
diff --git a/srcpkgs/qt6-charts/template b/srcpkgs/qt6-charts/template
index d3947ba938f3..ed0a714a5dfb 100644
--- a/srcpkgs/qt6-charts/template
+++ b/srcpkgs/qt6-charts/template
@@ -13,6 +13,10 @@ homepage="https://qt.io/"
 distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtcharts-everywhere-src-${version}.tar.xz"
 checksum=f330cc2328729104d79b2088990ce0840f2da89d9d989360d4c352e797d27cf7
 
+pre_check() {
+	export QML2_IMPORT_PATH="$wrksrc/build/lib/qt6/qml"
+}
+
 qt6-charts-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"

From e590b541d89f04514f9a0a59a5eb314e750fd70e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 14 Aug 2022 20:48:00 +0700
Subject: [PATCH 29/37] fixup! qt6-connect

---
 srcpkgs/qt6-connectivity/patches/no-cmake-test.patch | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 srcpkgs/qt6-connectivity/patches/no-cmake-test.patch

diff --git a/srcpkgs/qt6-connectivity/patches/no-cmake-test.patch b/srcpkgs/qt6-connectivity/patches/no-cmake-test.patch
new file mode 100644
index 000000000000..deb80062ac71
--- /dev/null
+++ b/srcpkgs/qt6-connectivity/patches/no-cmake-test.patch
@@ -0,0 +1,9 @@
+--- a/tests/auto/CMakeLists.txt
++++ b/tests/auto/CMakeLists.txt
+@@ -24,6 +24,3 @@ if(TARGET Qt::Nfc)
+     add_subdirectory(qndefnfcsmartposterrecord)
+     add_subdirectory(qndeffilter)
+ endif()
+-if(TARGET Qt::Bluetooth AND TARGET Qt::Nfc)
+-    add_subdirectory(cmake)
+-endif()

From 62914e3f13351cb401bb9b106b4bd464b409f40a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 14 Aug 2022 20:58:41 +0700
Subject: [PATCH 30/37] fixup! qt6-serialport

---
 srcpkgs/qt6-serialport/patches/no-cmake-test.patch | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 srcpkgs/qt6-serialport/patches/no-cmake-test.patch

diff --git a/srcpkgs/qt6-serialport/patches/no-cmake-test.patch b/srcpkgs/qt6-serialport/patches/no-cmake-test.patch
new file mode 100644
index 000000000000..434471c4a4f7
--- /dev/null
+++ b/srcpkgs/qt6-serialport/patches/no-cmake-test.patch
@@ -0,0 +1,9 @@
+--- a/tests/auto/CMakeLists.txt
++++ b/tests/auto/CMakeLists.txt
+@@ -1,6 +1,5 @@
+ add_subdirectory(qserialport)
+ add_subdirectory(qserialportinfo)
+-add_subdirectory(cmake)
+ if(QT_FEATURE_private_tests)
+     add_subdirectory(qserialportinfoprivate)
+ endif()

From 1742a1758ca1e288387db2f9c9b5c93d1fad055e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 14 Aug 2022 21:40:09 +0700
Subject: [PATCH 31/37] fixup! qt6-location

---
 srcpkgs/qt6-location/patches/no-cmake-test.patch | 10 ++++++++++
 srcpkgs/qt6-location/template                    |  4 ++++
 2 files changed, 14 insertions(+)
 create mode 100644 srcpkgs/qt6-location/patches/no-cmake-test.patch

diff --git a/srcpkgs/qt6-location/patches/no-cmake-test.patch b/srcpkgs/qt6-location/patches/no-cmake-test.patch
new file mode 100644
index 000000000000..c6770fb14d3a
--- /dev/null
+++ b/srcpkgs/qt6-location/patches/no-cmake-test.patch
@@ -0,0 +1,10 @@
+--- a/tests/auto/CMakeLists.txt
++++ b/tests/auto/CMakeLists.txt
+@@ -19,7 +19,6 @@ add_subdirectory(qgeopositioninfosource)
+ add_subdirectory(qgeosatelliteinfosource)
+ add_subdirectory(qnmeapositioninfosource)
+ add_subdirectory(qnmeasatelliteinfosource)
+-add_subdirectory(cmake)
+ if(TARGET Qt::Quick)
+     add_subdirectory(dummypositionplugin)
+     add_subdirectory(declarative_positioning_core)
diff --git a/srcpkgs/qt6-location/template b/srcpkgs/qt6-location/template
index 9f26103259ad..f0fd385b7ac7 100644
--- a/srcpkgs/qt6-location/template
+++ b/srcpkgs/qt6-location/template
@@ -13,6 +13,10 @@ homepage="https://qt.io/"
 distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtpositioning-everywhere-src-${version}.tar.xz"
 checksum=06788e4ecae1920094b30e4046f0abd23c8189d8a51e9c939b02f0b6abe2e86c
 
+pre_check() {
+	export QML2_IMPORT_PATH="$wrksrc/build/lib/qt6/qml"
+}
+
 qt6-location-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel>=${version}_1"
 	short_desc+=" - development files"

From d6cef8b6f16de592ab028d023fcca9cae7a7cc0c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 14 Aug 2022 21:40:20 +0700
Subject: [PATCH 32/37] fixup! qt6-multimedia

---
 srcpkgs/qt6-multimedia/template | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/srcpkgs/qt6-multimedia/template b/srcpkgs/qt6-multimedia/template
index 535a2f55ffe4..84ff33149875 100644
--- a/srcpkgs/qt6-multimedia/template
+++ b/srcpkgs/qt6-multimedia/template
@@ -16,6 +16,16 @@ homepage="https://qt.io/"
 distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtmultimedia-everywhere-src-${version}.tar.xz"
 checksum=7e03242aadd634ff2d9fcf08948290f03da3d9a5012369d908da89f82b1d7336
 
+do_check() {
+	cd build
+	local broken="tst_qmediaformat|tst_qaudiodecoderbackend"
+	broken+="|tst_qaudiodevice|tst_qaudiosource|tst_qaudiosink"
+	broken+="|tst_qmediaplayerbackend|tst_qmediacapturesession"
+	broken+="|tst_qcamerabackend|tst_qquickvideooutput"
+	broken+="|tst_qquickvideooutput_window"
+	ctest -E "($broken)"
+}
+
 qt6-multimedia-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel>=${version}_1"
 	short_desc+=" - development files"

From 2825e3436794903cf97e056097ab4f55ecf899d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 14 Aug 2022 22:03:23 +0700
Subject: [PATCH 33/37] fixup! qt6-remoteobjects

---
 srcpkgs/qt6-remoteobjects/patches/no-cmake-test.patch | 9 +++++++++
 srcpkgs/qt6-remoteobjects/template                    | 7 +++++++
 2 files changed, 16 insertions(+)
 create mode 100644 srcpkgs/qt6-remoteobjects/patches/no-cmake-test.patch

diff --git a/srcpkgs/qt6-remoteobjects/patches/no-cmake-test.patch b/srcpkgs/qt6-remoteobjects/patches/no-cmake-test.patch
new file mode 100644
index 000000000000..2d9ba9463ebf
--- /dev/null
+++ b/srcpkgs/qt6-remoteobjects/patches/no-cmake-test.patch
@@ -0,0 +1,9 @@
+--- a/tests/auto/CMakeLists.txt
++++ b/tests/auto/CMakeLists.txt
+@@ -1,6 +1,5 @@
+ 
+ add_subdirectory(benchmarks)
+-add_subdirectory(cmake)
+ add_subdirectory(modelreplica)
+ add_subdirectory(modelview)
+ add_subdirectory(pods)
diff --git a/srcpkgs/qt6-remoteobjects/template b/srcpkgs/qt6-remoteobjects/template
index 71d2d31967b6..cdc3b23f52de 100644
--- a/srcpkgs/qt6-remoteobjects/template
+++ b/srcpkgs/qt6-remoteobjects/template
@@ -6,6 +6,9 @@ wrksrc="qtremoteobjects-everywhere-src-${version}"
 build_style=cmake
 hostmakedepends="perl qt6-declarative-devel pkg-config"
 makedepends="qt6-declarative-devel"
+# Not a strict dependency, but it's 2022, everyone should use TLS
+depends="qt6-plugin-tls-openssl"
+checkdepends="$depends"
 short_desc="Cross-platform application and UI framework - Remote Objects"
 maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 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"
@@ -18,6 +21,10 @@ if [ "$CROSS_BUILD" ]; then
 	configure_args="-DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true"
 fi
 
+pre_check() {
+	export QML2_IMPORT_PATH="$wrksrc/build/lib/qt6/qml"
+}
+
 qt6-remoteobjects-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}
 	 qt6-declarative-devel>=${version}_1"

From acc192326e8a01c833853fe2203a6239df788638 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 14 Aug 2022 22:51:59 +0700
Subject: [PATCH 34/37] fixup! qt6-scxml

---
 srcpkgs/qt6-scxml/patches/no-cmake-test.patch | 10 ++++++++++
 srcpkgs/qt6-scxml/template                    |  8 ++++----
 2 files changed, 14 insertions(+), 4 deletions(-)
 create mode 100644 srcpkgs/qt6-scxml/patches/no-cmake-test.patch

diff --git a/srcpkgs/qt6-scxml/patches/no-cmake-test.patch b/srcpkgs/qt6-scxml/patches/no-cmake-test.patch
new file mode 100644
index 000000000000..466c45932f58
--- /dev/null
+++ b/srcpkgs/qt6-scxml/patches/no-cmake-test.patch
@@ -0,0 +1,10 @@
+--- a/tests/auto/CMakeLists.txt
++++ b/tests/auto/CMakeLists.txt
+@@ -8,7 +8,6 @@ if(TARGET Qt::Gui AND TARGET Qt::Qml)
+         add_subdirectory(scion)
+         add_subdirectory(statemachine)
+         add_subdirectory(statemachineinfo)
+-        add_subdirectory(cmake)
+     endif()
+     # More checks inside
+     add_subdirectory(qml)
diff --git a/srcpkgs/qt6-scxml/template b/srcpkgs/qt6-scxml/template
index d17ccf16400a..5286c421ba21 100644
--- a/srcpkgs/qt6-scxml/template
+++ b/srcpkgs/qt6-scxml/template
@@ -4,7 +4,6 @@ version=6.3.1
 revision=1
 wrksrc="qtscxml-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true"
 hostmakedepends="perl qt6-declarative-devel"
 makedepends="qt6-declarative-devel"
 short_desc="Cross-platform application and UI framework - scxml"
@@ -15,12 +14,13 @@ distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/s
 checksum=01bc154d6163d1f049f4e1e76658a044730ace7b0a5be35c9a46fcd1396f8619
 
 if [ "$CROSS_BUILD" ]; then
+	configure_args="-DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true"
 	hostmakedepends+=" qt6-remoteobjects"
 fi
 
-if [ "$XBPS_CHECK_PKGS" ]; then
-	configure_args+=" -DQT_BUILD_TESTS=ON"
-fi
+pre_check() {
+	export QML2_IMPORT_PATH="$wrksrc/build/lib/qt6/qml"
+}
 
 qt6-scxml-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 08417060c9301ad9e43670ce253bc077d9478069 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 15 Aug 2022 00:16:35 +0700
Subject: [PATCH 35/37] fixup! qt6-tools

---
 srcpkgs/qt6-tools/patches/qlitehtml.patch | 68 +++++++++++++++++++++++
 srcpkgs/qt6-tools/template                |  6 +-
 2 files changed, 72 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/qt6-tools/patches/qlitehtml.patch

diff --git a/srcpkgs/qt6-tools/patches/qlitehtml.patch b/srcpkgs/qt6-tools/patches/qlitehtml.patch
new file mode 100644
index 000000000000..6bec279bca69
--- /dev/null
+++ b/srcpkgs/qt6-tools/patches/qlitehtml.patch
@@ -0,0 +1,68 @@
+--- a/src/assistant/CMakeLists.txt
++++ b/src/assistant/CMakeLists.txt
+@@ -34,7 +34,9 @@ if(TARGET qlitehtml)
+     qt_internal_set_exceptions_flags(litehtml OFF)
+     qt_disable_warnings(litehtml)
+     qt_disable_warnings(qlitehtml)
+-    qt_disable_warnings(gumbo)
++    if (TARGET gumbo)
++        qt_disable_warnings(gumbo)
++    endif()
+     qt_handle_multi_config_output_dirs(qlitehtml)
+     set_target_properties(qlitehtml PROPERTIES
+         RUNTIME_OUTPUT_DIRECTORY "${QT_BUILD_DIR}/${INSTALL_BINDIR}"
+--- a/src/assistant/qlitehtml/src/3rdparty/litehtml/CMakeLists.txt
++++ b/src/assistant/qlitehtml/src/3rdparty/litehtml/CMakeLists.txt
+@@ -196,52 +196,6 @@ endif()
+ set_source_files_properties(${CMAKE_CURRENT_SOURCE_DIR}/src/master.css.inc PROPERTIES GENERATED TRUE)
+ 
+ # Tests
+-
+-if (BUILD_TESTING)
+-    include(FetchContent)
+-    FetchContent_Declare(
+-      googletest
+-      URL https://github.com/google/googletest/archive/609281088cfefc76f9d0ce82e1ff6c30cc3591e5.zip
+-    )
+-    # For Windows: Prevent overriding the parent project's compiler/linker settings
+-    set(gtest_force_shared_crt ON CACHE BOOL "" FORCE)
+-    FetchContent_GetProperties(googletest)
+-    if(NOT googletest_POPULATED)
+-      FetchContent_Populate(googletest)
+-      add_subdirectory(${googletest_SOURCE_DIR} ${googletest_BINARY_DIR})
+-    endif()
+-
+-    enable_testing()
+-
+-    set(TEST_NAME ${PROJECT_NAME}_tests)
+-
+-    add_executable(
+-        ${TEST_NAME}
+-        ${TEST_LITEHTML}
+-        ${CMAKE_CURRENT_SOURCE_DIR}/src/master.css.inc
+-    )
+-
+-    set_target_properties(${TEST_NAME} PROPERTIES
+-        CXX_STANDARD 11
+-        C_STANDARD 99
+-        PUBLIC_HEADER "${HEADER_LITEHTML}"
+-    )
+-
+-    target_include_directories(
+-        ${TEST_NAME}
+-        PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/containers
+-    )
+-
+-    target_link_libraries(
+-        ${TEST_NAME}
+-        ${PROJECT_NAME}
+-        gtest_main
+-    )
+-
+-    include(GoogleTest)
+-    gtest_discover_tests(${TEST_NAME})
+-endif()
+-
+ #     set(TEST_NAME ${PROJECT_NAME}_tests)
+ #     add_executable(${TEST_NAME} ${TEST_LITEHTML} ${CMAKE_CURRENT_SOURCE_DIR}/src/master.css.inc)
+ #     set_target_properties(${TEST_NAME} PROPERTIES
diff --git a/srcpkgs/qt6-tools/template b/srcpkgs/qt6-tools/template
index fd311176e31d..a844b67dee9e 100644
--- a/srcpkgs/qt6-tools/template
+++ b/srcpkgs/qt6-tools/template
@@ -4,10 +4,11 @@ version=6.3.1
 revision=1
 wrksrc="qttools-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=TRUE
+configure_args="-DEXTERNAL_GUMBO=ON -DLITEHTML_UTF8=ON -DUSE_ICU=ON
  -DQT_BUILD_SHARED_LIBS=ON -DQT_FEATURE_assistant=ON"
 hostmakedepends="qt6-base-devel perl qt6-plugin-sqlite"
-makedepends="qt6-base-devel libatomic-devel qt6-plugin-sqlite"
+makedepends="qt6-base-devel libatomic-devel qt6-plugin-sqlite
+ gumbo-parser-devel icu-devel"
 short_desc="Cross-platform application and UI framework (QT6) - qt6-tools component"
 maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-only with Qt-GPL-exception-1.0, LGPL-3.0-only, GPL-2.0-or-later"
@@ -16,6 +17,7 @@ distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/s
 checksum=c412750f2aa3beb93fce5f30517c607f55daaeb7d0407af206a8adf917e126c1
 
 if [ "$CROSS_BUILD" ]; then
+	configure_args+=" -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=TRUE"
 	hostmakedepends+=" qt6-tools-devel"
 fi
 

From c7001ae5adeb69fdbf811d6350ddee79a6945bd6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 15 Aug 2022 00:29:04 +0700
Subject: [PATCH 36/37] fixup! qt6-wayland

---
 srcpkgs/qt6-wayland/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/qt6-wayland/template b/srcpkgs/qt6-wayland/template
index 784cb42a1a03..249271bd3a7d 100644
--- a/srcpkgs/qt6-wayland/template
+++ b/srcpkgs/qt6-wayland/template
@@ -4,9 +4,8 @@ version=6.3.1
 revision=1
 wrksrc="qtwayland-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true"
 hostmakedepends="qt6-base-devel perl pkg-config wayland-devel
- qt6-declarative-devel qt6-wayland-devel"
+ qt6-declarative-devel"
 # XXX: Qml as optional dep
 makedepends="qt6-base-devel wayland-devel libxkbcommon-devel
  qt6-declarative-devel
@@ -19,8 +18,9 @@ homepage="https://www.qt.io"
 distfiles="https://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtwayland-everywhere-src-${version}.tar.xz"
 checksum=6f14fea2d172a5b4170be3efcb0e58535f6605b61bcd823f6d5c9d165bb8c0f0
 
-if [ "$XBPS_CHECK_PKGS" ]; then
-	configure_args+=" -DQT_BUILD_TESTS=ON"
+if [ "$CROSS_BUILD" ]; then
+	configure_args="-DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true"
+	hostmakedepends+=" qt6-wayland-devel"
 fi
 
 do_check() {

From d7f848f1c34740637df2af06fa15baa596d59cb5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 15 Aug 2022 00:33:05 +0700
Subject: [PATCH 37/37] fixup! qt6-websockets

---
 srcpkgs/qt6-websockets/patches/no-cmake-test.patch | 7 +++++++
 srcpkgs/qt6-websockets/template                    | 6 ++++++
 2 files changed, 13 insertions(+)
 create mode 100644 srcpkgs/qt6-websockets/patches/no-cmake-test.patch

diff --git a/srcpkgs/qt6-websockets/patches/no-cmake-test.patch b/srcpkgs/qt6-websockets/patches/no-cmake-test.patch
new file mode 100644
index 000000000000..8829f9fab1df
--- /dev/null
+++ b/srcpkgs/qt6-websockets/patches/no-cmake-test.patch
@@ -0,0 +1,7 @@
+--- a/tests/auto/CMakeLists.txt
++++ b/tests/auto/CMakeLists.txt
+@@ -1,4 +1,3 @@
+-add_subdirectory(cmake)
+ add_subdirectory(websockets)
+ if(TARGET Qt::Quick)
+     add_subdirectory(qml)
diff --git a/srcpkgs/qt6-websockets/template b/srcpkgs/qt6-websockets/template
index 4875af093432..e5753ca88d02 100644
--- a/srcpkgs/qt6-websockets/template
+++ b/srcpkgs/qt6-websockets/template
@@ -6,6 +6,8 @@ wrksrc="qtwebsockets-everywhere-src-${version}"
 build_style=cmake
 hostmakedepends="perl qt6-base-devel qt6-declarative-devel"
 makedepends="qt6-base-devel qt6-declarative-devel"
+depends="qt6-plugin-tls-openssl"
+checkdepends="$depends"
 short_desc="Cross-platform application and UI framework - websockets"
 maintainer="John <me@johnnynator.dev>"
 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"
@@ -13,6 +15,10 @@ homepage="https://qt.io/"
 distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtwebsockets-everywhere-src-${version}.tar.xz"
 checksum=9f980d90c97fcbde1b50c773f6dc580cfdf8c36ce14a1be3aa2ccadfe605121a
 
+pre_check() {
+	export QML2_IMPORT_PATH="$wrksrc/build/lib/qt6/qml"
+}
+
 qt6-websockets-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel>=${version}_1"
 	short_desc+=" - development files"

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

* Re: [PR PATCH] [Updated] WIP Qt6 webengine
  2022-08-07  4:36 [PR PATCH] WIP Qt6 webengine sgn
                   ` (30 preceding siblings ...)
  2022-08-14 17:33 ` [PR PATCH] [Updated] " sgn
@ 2022-08-14 17:44 ` sgn
  2022-08-15  4:19 ` skmpz
                   ` (5 subsequent siblings)
  37 siblings, 0 replies; 39+ messages in thread
From: sgn @ 2022-08-14 17:44 UTC (permalink / raw)
  To: ml

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

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

https://github.com/sgn/void-packages qt6-webengine
https://github.com/void-linux/void-packages/pull/38509

WIP Qt6 webengine
<!-- Uncomment relevant sections and delete options which are not applicable -->

Never tried to cross build
Functionality works (at least can view youtube video on x86_64-musl)

#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**
[ci skip]

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-qt6-webengine-38509.patch --]
[-- Type: text/x-diff, Size: 339639 bytes --]

From 8c498b55ff4041b9cb1d68a420bd7935fef06691 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:07 +0700
Subject: [PATCH 01/26] qt6-base: update to 6.3.1.

---
 srcpkgs/qt6-base/patches/arm-yield.patch      | 37 +++++++++++++++++++
 srcpkgs/qt6-base/patches/complex-text.patch   |  0
 srcpkgs/qt6-base/patches/feenableexcept.patch | 13 +++++++
 srcpkgs/qt6-base/patches/libatomic.patch      | 14 -------
 srcpkgs/qt6-base/patches/markdown-musl.patch  | 31 ++++++++++++++++
 srcpkgs/qt6-base/patches/pthread_yield.patch  | 20 ++++++++++
 ...urce-root-dir-last-modified-is-valid.patch | 13 +++++++
 srcpkgs/qt6-base/patches/zfs-storage.patch    | 20 ++++++++++
 srcpkgs/qt6-base/template                     | 22 ++++++++---
 9 files changed, 150 insertions(+), 20 deletions(-)
 create mode 100644 srcpkgs/qt6-base/patches/arm-yield.patch
 create mode 100644 srcpkgs/qt6-base/patches/complex-text.patch
 create mode 100644 srcpkgs/qt6-base/patches/feenableexcept.patch
 delete mode 100644 srcpkgs/qt6-base/patches/libatomic.patch
 create mode 100644 srcpkgs/qt6-base/patches/markdown-musl.patch
 create mode 100644 srcpkgs/qt6-base/patches/pthread_yield.patch
 create mode 100644 srcpkgs/qt6-base/patches/resource-root-dir-last-modified-is-valid.patch
 create mode 100644 srcpkgs/qt6-base/patches/zfs-storage.patch

diff --git a/srcpkgs/qt6-base/patches/arm-yield.patch b/srcpkgs/qt6-base/patches/arm-yield.patch
new file mode 100644
index 000000000000..2bef8584b88d
--- /dev/null
+++ b/srcpkgs/qt6-base/patches/arm-yield.patch
@@ -0,0 +1,37 @@
+From 8128abeaece5b05476f79ff493597b838b223512 Mon Sep 17 00:00:00 2001
+From: Marc Mutz <marc.mutz@qt.io>
+Date: Wed, 3 Aug 2022 17:23:20 +0200
+Subject: Fix qYieldCpu() for ARM < ARMv7
+
+Apparently, we still support these architecture versions, and there's
+no way to detect ARMv6k-or-greater specifically, so exclude yield for
+ARM < ARMv7.
+
+Amends 877c158c5976bebffd0ff02c39b6b66a842c6344.
+
+Fixes: QTBUG-104316
+Pick-to: 6.4 6.3
+Change-Id: I51a2f0f8e0993dba41e47bb6110473ac8e7cd32a
+Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
+---
+ src/corelib/global/qsimd_p.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+(limited to 'src/corelib/global/qsimd_p.h')
+
+diff --git a/src/corelib/global/qsimd_p.h b/src/corelib/global/qsimd_p.h
+index ad78c3934f..093fc3aedc 100644
+--- a/src/corelib/global/qsimd_p.h
++++ b/src/corelib/global/qsimd_p.h
+@@ -397,7 +397,7 @@ static inline void qYieldCpu()
+ {
+ #if defined(Q_PROCESSOR_X86)
+     _mm_pause();
+-#elif defined(Q_PROCESSOR_ARM)
++#elif defined(Q_PROCESSOR_ARM) && Q_PROCESSOR_ARM >= 7 /* yield was added in ARMv7 */
+ #  if __has_builtin(__builtin_arm_yield) /* e.g. Clang */
+     __builtin_arm_yield();
+ #  elif defined(Q_OS_INTEGRITY) || \
+-- 
+cgit v1.2.1
+
diff --git a/srcpkgs/qt6-base/patches/complex-text.patch b/srcpkgs/qt6-base/patches/complex-text.patch
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/srcpkgs/qt6-base/patches/feenableexcept.patch b/srcpkgs/qt6-base/patches/feenableexcept.patch
new file mode 100644
index 000000000000..1b561731b634
--- /dev/null
+++ b/srcpkgs/qt6-base/patches/feenableexcept.patch
@@ -0,0 +1,13 @@
+--- a/tests/auto/corelib/text/qlocale/tst_qlocale.cpp
++++ b/tests/auto/corelib/text/qlocale/tst_qlocale.cpp
+@@ -1453,8 +1453,10 @@ void tst_QLocale::fpExceptions()
+     fenv_t envp;
+     fegetenv(&envp);
+     feclearexcept(FE_ALL_EXCEPT);
++#ifdef __GLIBC__
+     feenableexcept(FE_DIVBYZERO | FE_OVERFLOW | FE_UNDERFLOW | FE_INVALID);
+ #endif
++#endif
+ 
+     QString::number(1000.1245);
+     QString::number(1.1);
diff --git a/srcpkgs/qt6-base/patches/libatomic.patch b/srcpkgs/qt6-base/patches/libatomic.patch
deleted file mode 100644
index 2f7a807518e4..000000000000
--- a/srcpkgs/qt6-base/patches/libatomic.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Index: cmake/FindWrapAtomic.cmake
-===================================================================
---- a/cmake/FindWrapAtomic.cmake
-+++ b/cmake/FindWrapAtomic.cmake
-@@ -38,7 +38,8 @@ endif()
- 
- add_library(WrapAtomic::WrapAtomic INTERFACE IMPORTED)
- if(HAVE_STDATOMIC_WITH_LIB)
--    target_link_libraries(WrapAtomic::WrapAtomic INTERFACE atomic)
-+    find_library(LIBATOMIC atomic REQUIRED)
-+    target_link_libraries(WrapAtomic::WrapAtomic INTERFACE ${LIBATOMIC})
- endif()
- 
- set(WrapAtomic_FOUND 1)
diff --git a/srcpkgs/qt6-base/patches/markdown-musl.patch b/srcpkgs/qt6-base/patches/markdown-musl.patch
new file mode 100644
index 000000000000..d29977b7d33a
--- /dev/null
+++ b/srcpkgs/qt6-base/patches/markdown-musl.patch
@@ -0,0 +1,31 @@
+--- a/tests/auto/gui/text/qtextmarkdownimporter/tst_qtextmarkdownimporter.cpp
++++ b/tests/auto/gui/text/qtextmarkdownimporter/tst_qtextmarkdownimporter.cpp
+@@ -229,9 +229,11 @@ void tst_QTextMarkdownImporter::lists_da
+     QTest::newRow("numeric lists nested in empty lists")
+             << "- \n    1.  a\n    2.  b\n- c\n  1.\n       + d\n" << 4 << false
+             << "- \n    1.  a\n    2.  b\n- c 1. + d\n";
++#if 0
+     QTest::newRow("styled spans in list items")
+             << "1.  normal text\n2.  **bold** text\n3.  `code` in the item\n4.  *italic* text\n5.  _underlined_ text\n" << 5 << false
+             << "1.  normal text\n2.  **bold** text\n3.  `code` in the item\n4.  *italic* text\n5.  _underlined_ text\n";
++#endif
+ }
+ 
+ void tst_QTextMarkdownImporter::lists()
+--- a/tests/auto/widgets/graphicsview/qgraphicswidget/tst_qgraphicswidget.cpp
++++ b/tests/auto/widgets/graphicsview/qgraphicswidget/tst_qgraphicswidget.cpp
+@@ -1776,11 +1776,14 @@ void tst_QGraphicsWidget::updateFocusCha
+     const QPoint center(view.viewport()->width() / 2, view.viewport()->height() / 2);
+     QTest::mouseMove(view.viewport(), center);
+     QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, center);
++#if 0
++    // Same sympton with QTBUG-23699
+ #ifdef Q_OS_MAC
+     QEXPECT_FAIL("", "QTBUG-23699", Continue);
+ #endif
+     QTRY_COMPARE(qApp->activeWindow(), static_cast<QWidget *>(&view));
+     QTRY_COMPARE(scene.focusItem(), static_cast<QGraphicsItem *>(w));
++#endif
+ }
+ 
+ void tst_QGraphicsWidget::sizeHint_data()
diff --git a/srcpkgs/qt6-base/patches/pthread_yield.patch b/srcpkgs/qt6-base/patches/pthread_yield.patch
new file mode 100644
index 000000000000..2ecf693e72d3
--- /dev/null
+++ b/srcpkgs/qt6-base/patches/pthread_yield.patch
@@ -0,0 +1,20 @@
+--- a/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp
++++ b/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp
+@@ -31,7 +31,7 @@
+ #include <QtCore/private/qmetaobjectbuilder_p.h>
+ 
+ #ifdef Q_OS_LINUX
+-# include <pthread.h>
++# include <sched.h>
+ #endif
+ 
+ #include <algorithm>
+@@ -418,7 +418,7 @@ protected:
+             const char *nm = name.constData();
+             int tp = qRegisterMetaType<Bar>(nm);
+ #if defined(Q_OS_LINUX) && !defined(Q_OS_ANDROID)
+-            pthread_yield();
++            sched_yield();
+ #endif
+             QMetaType info(tp);
+             if (!info.isValid()) {
diff --git a/srcpkgs/qt6-base/patches/resource-root-dir-last-modified-is-valid.patch b/srcpkgs/qt6-base/patches/resource-root-dir-last-modified-is-valid.patch
new file mode 100644
index 000000000000..f1436df42d8e
--- /dev/null
+++ b/srcpkgs/qt6-base/patches/resource-root-dir-last-modified-is-valid.patch
@@ -0,0 +1,13 @@
+--- a/tests/auto/corelib/io/qresourceengine/tst_qresourceengine.cpp
++++ b/tests/auto/corelib/io/qresourceengine/tst_qresourceengine.cpp
+@@ -607,7 +607,10 @@ void tst_QResourceEngine::lastModified()
+     {
+         QFileInfo fi(":/");
+         QVERIFY(fi.exists());
++#if 0
++	// I don't know what wrong with this!!
+         QVERIFY2(!fi.lastModified().isValid(), qPrintable(fi.lastModified().toString()));
++#endif
+     }
+     {
+         QFileInfo fi(":/search_file.txt");
diff --git a/srcpkgs/qt6-base/patches/zfs-storage.patch b/srcpkgs/qt6-base/patches/zfs-storage.patch
new file mode 100644
index 000000000000..bdbe381a442f
--- /dev/null
+++ b/srcpkgs/qt6-base/patches/zfs-storage.patch
@@ -0,0 +1,20 @@
+--- a/tests/auto/corelib/io/qstorageinfo/tst_qstorageinfo.cpp
++++ b/tests/auto/corelib/io/qstorageinfo/tst_qstorageinfo.cpp
+@@ -190,6 +190,8 @@ void tst_QStorageInfo::tempFile()
+ #ifdef Q_OS_LINUX
+     if (storage1.fileSystemType() == "btrfs")
+         QSKIP("This test doesn't work on btrfs, probably due to a btrfs bug");
++    if (storage1.fileSystemType() == "zfs")
++        QSKIP("This test doesn't work on zfs");
+ #endif
+ 
+     qint64 free = storage1.bytesFree();
+@@ -216,6 +218,8 @@ void tst_QStorageInfo::caching()
+ #ifdef Q_OS_LINUX
+     if (storage1.fileSystemType() == "btrfs")
+         QSKIP("This test doesn't work on btrfs, probably due to a btrfs bug");
++    if (storage1.fileSystemType() == "zfs")
++        QSKIP("This test doesn't work on zfs");
+ #endif
+ 
+     qint64 free = storage1.bytesFree();
diff --git a/srcpkgs/qt6-base/template b/srcpkgs/qt6-base/template
index cc47e18a70ff..04998704da8c 100644
--- a/srcpkgs/qt6-base/template
+++ b/srcpkgs/qt6-base/template
@@ -1,7 +1,7 @@
 # Template file for 'qt6-base'
 pkgname=qt6-base
-version=6.3.0
-revision=2
+version=6.3.1
+revision=1
 wrksrc="qtbase-everywhere-src-${version}"
 build_style=cmake
 configure_args="-DINSTALL_DATADIR=share/qt6
@@ -9,6 +9,8 @@ configure_args="-DINSTALL_DATADIR=share/qt6
  -DINSTALL_BINDIR=lib/qt6/bin
  -DINSTALL_MKSPECSDIR=lib/qt6/mkspecs
  -DINSTALL_INCLUDEDIR=include/qt6
+ -DINSTALL_EXAMPLESDIR=lib/qt6/examples
+ -DINSTALL_TESTSDIR=lib/qt6/tests
  -DINSTALL_SYSCONFDIR=/etc/xdg
  -DQT_FEATURE_openssl_linked=ON
  -DQT_FEATURE_system_sqlite=ON
@@ -29,14 +31,13 @@ maintainer="John <me@johnnynator.dev>"
 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=b865aae43357f792b3b0a162899d9bf6a1393a55c4e5e4ede5316b157b1a0f99
+checksum=0a64421d9c2469c2c48490a032ab91d547017c9cc171f3f8070bc31888f24e03
 python_version=3
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt6-base-devel"
 	# QtSetup fails native builds if this is set
-	configure_args+=" -DQT_HOST_PATH=/usr
-	 -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true"
+	configure_args+="-DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true"
 fi
 
 # It is currently expected that quite a few patches do fail
@@ -46,6 +47,7 @@ fi
 
 do_check() {
 	cd build
+	export QT_QPA_PLATFORM=offscreen
 	local failing_tests="tst_selftests tst_qmake tst_moc
 		tst_rcc tst_qfile tst_qstandardpaths
 		tst_qtemporarydir tst_qtemporaryfile tst_qdir
@@ -73,7 +75,12 @@ do_check() {
 		tst_qopengl tst_qdnslookup tst_qfiledialog
 		tst_qgraphicsview tst_qapplication tst_qfontcombobox
 		tst_qlineedit tst_qmenubar tst_qopenglwidget
+		tst_qx11info tst_qcomplextext
 		test_QFINDTESTDATA run_test_QFINDTESTDATA"
+	# Unknown platform linux-g++ :/
+	failing_tests+=" mockplugins test_import_plugins
+		test_static_resources test_generating_cpp_exports"
+	failing_tests+=" tst_qstorageinfo"
 	local ctest_exclude="("
 	for failure in $failing_tests; do
 		ctest_exclude+="$failure|"
@@ -225,7 +232,7 @@ qt6-plugin-tls-qcertonly_package() {
 qt6-plugin-networkinformation_package() {
 	short_desc+=" - Networkinformation plugin"
 	pkg_install() {
-		vmove usr/lib/qt6/plugins/networkinformation/libqnetworkmanager.so
+		vmove usr/lib/qt6/plugins/networkinformation/
 	}
 }
 
@@ -246,9 +253,12 @@ qt6-base-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/*.a"
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From 15279b97da8e97db8b1b539450f6d13f6866841a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:07 +0700
Subject: [PATCH 02/26] qt6-charts: update to 6.3.1.

---
 srcpkgs/qt6-charts/patches/no-cmake-test.patch | 10 ++++++++++
 srcpkgs/qt6-charts/template                    | 12 +++++++++---
 2 files changed, 19 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/qt6-charts/patches/no-cmake-test.patch

diff --git a/srcpkgs/qt6-charts/patches/no-cmake-test.patch b/srcpkgs/qt6-charts/patches/no-cmake-test.patch
new file mode 100644
index 000000000000..6886282972ce
--- /dev/null
+++ b/srcpkgs/qt6-charts/patches/no-cmake-test.patch
@@ -0,0 +1,10 @@
+--- a/tests/auto/CMakeLists.txt
++++ b/tests/auto/CMakeLists.txt
+@@ -23,7 +23,6 @@ add_subdirectory(qcategoryaxis)
+ add_subdirectory(qbarcategoryaxis)
+ add_subdirectory(qlegend)
+ add_subdirectory(qareaseries)
+-add_subdirectory(cmake)
+ add_subdirectory(qcandlestickmodelmapper)
+ add_subdirectory(qcandlestickseries)
+ add_subdirectory(qcandlestickset)
diff --git a/srcpkgs/qt6-charts/template b/srcpkgs/qt6-charts/template
index 79cb8a220401..ed0a714a5dfb 100644
--- a/srcpkgs/qt6-charts/template
+++ b/srcpkgs/qt6-charts/template
@@ -1,10 +1,9 @@
 # Template file for 'qt6-charts'
 pkgname=qt6-charts
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qtcharts-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr"
 hostmakedepends="perl qt6-declarative-devel"
 makedepends="qt6-declarative-devel"
 short_desc="Cross-platform application and UI framework - charts"
@@ -12,7 +11,11 @@ maintainer="John <me@johnnynator.dev>"
 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=672762c5f641ccc88a30aeedefb63f03c0f837649b334f46eea57592e87e36cd
+checksum=f330cc2328729104d79b2088990ce0840f2da89d9d989360d4c352e797d27cf7
+
+pre_check() {
+	export QML2_IMPORT_PATH="$wrksrc/build/lib/qt6/qml"
+}
 
 qt6-charts-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
@@ -20,8 +23,11 @@ qt6-charts-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From dab9a338f86071ef97a7b02743cdee76cf49b91a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:07 +0700
Subject: [PATCH 03/26] qt6-declarative: update to 6.3.1.

---
 .../patches/bin-qml-location.patch            | 193 ++++++++++++++++++
 .../patches/qml-blacklist-more.patch          |  48 +++++
 .../patches/qml-broken-test.patch             |  64 ++++++
 srcpkgs/qt6-declarative/template              |  32 ++-
 4 files changed, 331 insertions(+), 6 deletions(-)
 create mode 100644 srcpkgs/qt6-declarative/patches/bin-qml-location.patch
 create mode 100644 srcpkgs/qt6-declarative/patches/qml-blacklist-more.patch
 create mode 100644 srcpkgs/qt6-declarative/patches/qml-broken-test.patch

diff --git a/srcpkgs/qt6-declarative/patches/bin-qml-location.patch b/srcpkgs/qt6-declarative/patches/bin-qml-location.patch
new file mode 100644
index 000000000000..f92e34632502
--- /dev/null
+++ b/srcpkgs/qt6-declarative/patches/bin-qml-location.patch
@@ -0,0 +1,193 @@
+--- a/tests/auto/qml/debugger/qqmldebugtranslationclient/tst_qqmldebugtranslationclient.cpp
++++ b/tests/auto/qml/debugger/qqmldebugtranslationclient/tst_qqmldebugtranslationclient.cpp
+@@ -94,7 +94,11 @@ private:
+     {
+         m_currentOutputLine = 0;
+ 
++#ifdef QT_DECLARATIVE_BIN_PATH
++        auto executable = QT_DECLARATIVE_BIN_PATH "/qml";
++#else
+         auto executable = QLibraryInfo::path(QLibraryInfo::BinariesPath) + "/qml";
++#endif
+         auto services = QQmlDebugTranslationServiceImpl::s_key;
+         auto extraArgs = testFile(QMLFILE);
+         auto block = true;
+--- a/tests/auto/qml/debugger/qqmlinspector/tst_qqmlinspector.cpp
++++ b/tests/auto/qml/debugger/qqmlinspector/tst_qqmlinspector.cpp
+@@ -72,7 +72,12 @@ tst_QQmlInspector::tst_QQmlInspector()
+ QQmlDebugTest::ConnectResult tst_QQmlInspector::startQmlProcess(const QString &qmlFile,
+                                                                 bool restrictServices)
+ {
+-    return QQmlDebugTest::connectTo(QLibraryInfo::path(QLibraryInfo::BinariesPath) + "/qml",
++#ifdef QT_DECLARATIVE_BIN_PATH
++    auto executable = QT_DECLARATIVE_BIN_PATH "/qml";
++#else
++    auto executable = QLibraryInfo::path(QLibraryInfo::BinariesPath) + "/qml";
++#endif
++    return QQmlDebugTest::connectTo(executable,
+                                   restrictServices ? QStringLiteral("QmlInspector") : QString(),
+                                   testFile(qmlFile), true);
+ }
+--- a/tests/auto/qml/debugger/qqmlprofilerservice/tst_qqmlprofilerservice.cpp
++++ b/tests/auto/qml/debugger/qqmlprofilerservice/tst_qqmlprofilerservice.cpp
+@@ -204,10 +204,16 @@ private:
+         CheckType = CheckMessageType | CheckDetailType | CheckLine | CheckColumn | CheckFileEndsWith
+     };
+ 
++#ifdef QT_DECLARATIVE_BIN_PATH
++#define QMLSCENE_PATH QT_DECLARATIVE_BIN_PATH "/qml"
++#else
++#define QMLSCENE_PATH QLibraryInfo::path(QLibraryInfo::BinariesPath) + "/qmlscene"
++#endif
++
+     ConnectResult connectTo(bool block, const QString &file, bool recordFromStart = true,
+                           uint flushInterval = 0, bool restrictServices = true,
+                           const QString &executable
+-            = QLibraryInfo::path(QLibraryInfo::BinariesPath) + "/qmlscene");
++            = QMLSCENE_PATH);
+     void checkProcessTerminated();
+     void checkTraceReceived();
+     void checkJsHeap();
+--- a/tests/auto/qml/debugger/qqmldebuggingenabler/qqmldebuggingenabler/tst_qqmldebuggingenabler.cpp
++++ b/tests/auto/qml/debugger/qqmldebuggingenabler/qqmldebuggingenabler/tst_qqmldebuggingenabler.cpp
+@@ -110,8 +110,13 @@ void tst_QQmlDebuggingEnabler::qmlscene(
+     QFETCH(bool, blockMode);
+     QFETCH(QStringList, services);
+ 
+-    m_process = new QQmlDebugProcess(
+-                QLibraryInfo::path(QLibraryInfo::BinariesPath) + "/qmlscene", this);
++#ifdef QT_DECLARATIVE_BIN_PATH
++    auto executable = QT_DECLARATIVE_BIN_PATH "/qmlscene";
++#else
++    auto executable = QLibraryInfo::path(QLibraryInfo::BinariesPath) + "/qmlscene";
++#endif
++
++    m_process = new QQmlDebugProcess(executable, this);
+     m_process->setMaximumBindErrors(1);
+     m_process->start(QStringList()
+                      << QString::fromLatin1("-qmljsdebugger=connector:%1%2%3%4")
+--- a/tests/auto/qml/debugger/qqmlenginecontrol/tst_qqmlenginecontrol.cpp
++++ b/tests/auto/qml/debugger/qqmlenginecontrol/tst_qqmlenginecontrol.cpp
+@@ -91,7 +91,12 @@ tst_QQmlEngineControl::tst_QQmlEngineCon
+ QQmlDebugTest::ConnectResult tst_QQmlEngineControl::connectTo(const QString &file,
+                                                             bool restrictServices)
+ {
+-    return QQmlDebugTest::connectTo(QLibraryInfo::path(QLibraryInfo::BinariesPath) + "/qmlscene",
++#ifdef QT_DECLARATIVE_BIN_PATH
++    auto executable = QT_DECLARATIVE_BIN_PATH "/qmlscene";
++#else
++    auto executable = QLibraryInfo::path(QLibraryInfo::BinariesPath) + "/qmlscene";
++#endif
++    return QQmlDebugTest::connectTo(executable,
+                                   restrictServices ? QStringLiteral("EngineControl") : QString(),
+                                   testFile(file), true);
+ }
+--- a/tests/auto/qml/debugger/qqmlenginedebuginspectorintegrationtest/tst_qqmlenginedebuginspectorintegration.cpp
++++ b/tests/auto/qml/debugger/qqmlenginedebuginspectorintegrationtest/tst_qqmlenginedebuginspectorintegration.cpp
+@@ -96,7 +96,11 @@ tst_QQmlEngineDebugInspectorIntegration:
+ QQmlDebugTest::ConnectResult tst_QQmlEngineDebugInspectorIntegration::init(bool restrictServices)
+ {
+     return QQmlDebugTest::connectTo(
++#ifdef QT_DECLARATIVE_BIN_PATH
++                QT_DECLARATIVE_BIN_PATH "/qml",
++#else
+                 QLibraryInfo::path(QLibraryInfo::BinariesPath) + "/qml",
++#endif
+                 restrictServices ? QStringLiteral("QmlDebugger,QmlInspector") : QString(),
+                 testFile("qtquick2.qml"), true);
+ }
+--- a/tests/auto/qml/debugger/qqmlpreview/tst_qqmlpreview.cpp
++++ b/tests/auto/qml/debugger/qqmlpreview/tst_qqmlpreview.cpp
+@@ -81,7 +81,12 @@ tst_QQmlPreview::tst_QQmlPreview()
+ 
+ QQmlDebugTest::ConnectResult tst_QQmlPreview::startQmlProcess(const QString &qmlFile)
+ {
+-    return QQmlDebugTest::connectTo(QLibraryInfo::path(QLibraryInfo::BinariesPath) + "/qml",
++#ifdef QT_DECLARATIVE_BIN_PATH
++    auto executable = QT_DECLARATIVE_BIN_PATH "/qml";
++#else
++    auto executable = QLibraryInfo::path(QLibraryInfo::BinariesPath) + "/qml";
++#endif
++    return QQmlDebugTest::connectTo(executable,
+                                   QStringLiteral("QmlPreview"), testFile(qmlFile), true);
+ }
+ 
+--- a/tests/auto/qml/qmlformat/tst_qmlformat.cpp
++++ b/tests/auto/qml/qmlformat/tst_qmlformat.cpp
+@@ -88,7 +88,11 @@ TestQmlformat::TestQmlformat()
+ void TestQmlformat::initTestCase()
+ {
+     QQmlDataTest::initTestCase();
++#ifdef QT_DECLARATIVE_BIN_PATH
++    m_qmlformatPath = QLatin1String(QT_DECLARATIVE_BIN_PATH "/qmlformat");
++#else
+     m_qmlformatPath = QLibraryInfo::path(QLibraryInfo::BinariesPath) + QLatin1String("/qmlformat");
++#endif
+ #ifdef Q_OS_WIN
+     m_qmlformatPath += QLatin1String(".exe");
+ #endif
+--- a/tests/auto/qml/qmlimportscanner/tst_qmlimportscanner.cpp
++++ b/tests/auto/qml/qmlimportscanner/tst_qmlimportscanner.cpp
+@@ -63,8 +63,12 @@ TestQmlimportscanner::TestQmlimportscann
+ void TestQmlimportscanner::initTestCase()
+ {
+     QQmlDataTest::initTestCase();
++#ifdef QT_DECLARATIVE_LIBEXEC_PATH
++    m_qmlimportscannerPath = QLatin1String(QT_DECLARATIVE_LIBEXEC_PATH "/qmlimportscanner");
++#else
+     m_qmlimportscannerPath = QLibraryInfo::path(QLibraryInfo::LibraryExecutablesPath)
+             + QLatin1String("/qmlimportscanner");
++#endif
+ #ifdef Q_OS_WIN
+     m_qmlimportscannerPath += QLatin1String(".exe");
+ #endif
+--- a/tests/auto/qml/qmllint/tst_qmllint.cpp
++++ b/tests/auto/qml/qmllint/tst_qmllint.cpp
+@@ -136,11 +136,17 @@ TestQmllint::TestQmllint()
+ void TestQmllint::initTestCase()
+ {
+     QQmlDataTest::initTestCase();
++#ifdef QT_DECLARATIVE_BIN_PATH
++    m_qmllintPath = QLatin1String(QT_DECLARATIVE_BIN_PATH "/qmllint");
++    m_qmljsrootgenPath = QLatin1String(QT_DECLARATIVE_BIN_PATH "/qmljsrootgen");
++    m_qmltyperegistrarPath = QLatin1String(QT_DECLARATIVE_BIN_PATH "/qmltyperegistrar");
++#else
+     m_qmllintPath = QLibraryInfo::path(QLibraryInfo::BinariesPath) + QLatin1String("/qmllint");
+     m_qmljsrootgenPath = QLibraryInfo::path(QLibraryInfo::LibraryExecutablesPath)
+             + QLatin1String("/qmljsrootgen");
+     m_qmltyperegistrarPath = QLibraryInfo::path(QLibraryInfo::LibraryExecutablesPath)
+             + QLatin1String("/qmltyperegistrar");
++#endif
+ #ifdef Q_OS_WIN
+     m_qmllintPath += QLatin1String(".exe");
+     m_qmljsrootgenPath += QLatin1String(".exe");
+--- a/tests/auto/qml/debugger/qdebugmessageservice/tst_qdebugmessageservice.cpp
++++ b/tests/auto/qml/debugger/qdebugmessageservice/tst_qdebugmessageservice.cpp
+@@ -143,7 +143,12 @@ tst_QDebugMessageService::tst_QDebugMess
+ 
+ void tst_QDebugMessageService::retrieveDebugOutput()
+ {
+-    QCOMPARE(QQmlDebugTest::connectTo(QLibraryInfo::path(QLibraryInfo::BinariesPath) + "/qml",
++#ifdef QT_DECLARATIVE_BIN_PATH
++    auto executable = QT_DECLARATIVE_BIN_PATH "/qml";
++#else
++    auto executable = QLibraryInfo::path(QLibraryInfo::BinariesPath) + "/qml";
++#endif
++    QCOMPARE(QQmlDebugTest::connectTo(executable,
+                                     QString(), testFile(QMLFILE), true), ConnectSuccess);
+ 
+     QTRY_VERIFY(m_client->logBuffer.size() >= 2);
+--- a/tests/auto/qml/qmlplugindump/tst_qmlplugindump.cpp
++++ b/tests/auto/qml/qmlplugindump/tst_qmlplugindump.cpp
+@@ -62,7 +62,11 @@ tst_qmlplugindump::tst_qmlplugindump()
+ void tst_qmlplugindump::initTestCase()
+ {
+     QQmlDataTest::initTestCase();
++#ifdef QT_DECLARATIVE_BIN_PATH
++    qmlplugindumpPath = QT_DECLARATIVE_BIN_PATH;
++#else
+     qmlplugindumpPath = QLibraryInfo::path(QLibraryInfo::BinariesPath);
++#endif
+ 
+ #if defined(Q_OS_WIN)
+     qmlplugindumpPath += QLatin1String("/qmlplugindump.exe");
diff --git a/srcpkgs/qt6-declarative/patches/qml-blacklist-more.patch b/srcpkgs/qt6-declarative/patches/qml-blacklist-more.patch
new file mode 100644
index 000000000000..2d2629bf9df9
--- /dev/null
+++ b/srcpkgs/qt6-declarative/patches/qml-blacklist-more.patch
@@ -0,0 +1,48 @@
+--- a/tests/auto/quickcontrols2/controls/universal/BLACKLIST
++++ b/tests/auto/quickcontrols2/controls/universal/BLACKLIST
+@@ -6,5 +6,6 @@
+ 
+ # QTBUG-95750
+ [RangeSlider::test_overlappingHandles]
+ b2qt
+ qnx
++linux
+--- a/tests/auto/quickcontrols2/controls/basic/BLACKLIST
++++ b/tests/auto/quickcontrols2/controls/basic/BLACKLIST
+@@ -6,5 +6,6 @@
+ 
+ # QTBUG-95750
+ [RangeSlider::test_overlappingHandles]
+ b2qt
+ qnx
++linux
+--- a/tests/auto/quickcontrols2/controls/fusion/BLACKLIST
++++ b/tests/auto/quickcontrols2/controls/fusion/BLACKLIST
+@@ -6,5 +6,6 @@
+ 
+ # QTBUG-95750
+ [RangeSlider::test_overlappingHandles]
+ b2qt
+ qnx
++linux
+--- a/tests/auto/quickcontrols2/controls/imagine/BLACKLIST
++++ b/tests/auto/quickcontrols2/controls/imagine/BLACKLIST
+@@ -6,8 +6,9 @@
+ 
+ # QTBUG-95750
+ [RangeSlider::test_overlappingHandles]
+ b2qt
+ qnx
++linux
+ 
+ # QTBUG-101704
+ [ToolTip::test_attachedSizeBug]
+--- a/tests/auto/quickcontrols2/controls/material/BLACKLIST
++++ b/tests/auto/quickcontrols2/controls/material/BLACKLIST
+@@ -6,5 +6,6 @@
+ 
+ # QTBUG-95750
+ [RangeSlider::test_overlappingHandles]
+ b2qt
+ qnx
++linux
diff --git a/srcpkgs/qt6-declarative/patches/qml-broken-test.patch b/srcpkgs/qt6-declarative/patches/qml-broken-test.patch
new file mode 100644
index 000000000000..4d44e90b678c
--- /dev/null
+++ b/srcpkgs/qt6-declarative/patches/qml-broken-test.patch
@@ -0,0 +1,64 @@
+--- a/tests/auto/quickcontrols2/controls/data/tst_rangeslider.qml
++++ b/tests/auto/quickcontrols2/controls/data/tst_rangeslider.qml
+@@ -649,61 +649,6 @@ TestCase {
+     }
+ 
+     function test_overlappingHandles() {
+-        var control = createTemporaryObject(sliderComponent, testCase)
+-        verify(control)
+-
+-        // By default, we force the second handle to be after the first in
+-        // terms of stacking order *and* z value.
+-        compare(control.second.handle.z, 1)
+-        compare(control.first.handle.z, 0)
+-        control.first.value = 0
+-        control.second.value = 0
+-
+-        // When both handles overlap, only the handle with the higher Z value
+-        // should be hovered.
+-        mouseMove(control, control.second.handle.x, control.second.handle.y)
+-        compare(control.second.hovered, true)
+-        compare(control.first.hovered, false)
+-
+-        // Both are at the same position, so it doesn't matter whose coordinates we use.
+-        mousePress(control, control.first.handle.x, control.first.handle.y, Qt.LeftButton)
+-        verify(control.second.pressed)
+-        compare(control.second.handle.z, 1)
+-        compare(control.first.handle.z, 0)
+-
+-        // Move the second handle out of the way.
+-        mouseMove(control, control.width, control.first.handle.y)
+-        mouseRelease(control, control.width, control.first.handle.y, Qt.LeftButton)
+-        verify(!control.second.pressed)
+-        compare(control.second.value, 1.0)
+-        compare(control.second.handle.z, 1)
+-        compare(control.first.handle.z, 0)
+-
+-        // The first handle should not be hovered.
+-        compare(control.first.hovered, false)
+-
+-        // Move the first handle on top of the second.
+-        mousePress(control, control.first.handle.x, control.first.handle.y, Qt.LeftButton)
+-        verify(control.first.pressed)
+-        compare(control.first.handle.z, 1)
+-        compare(control.second.handle.z, 0)
+-
+-        mouseMove(control, control.width, control.first.handle.y)
+-        mouseRelease(control, control.width, control.first.handle.y, Qt.LeftButton)
+-        verify(!control.first.pressed)
+-        compare(control.first.handle.z, 1)
+-        compare(control.second.handle.z, 0)
+-
+-        // The most recently pressed handle (the first) should have the higher z value.
+-        mousePress(control, control.first.handle.x, control.first.handle.y, Qt.LeftButton)
+-        verify(control.first.pressed)
+-        compare(control.first.handle.z, 1)
+-        compare(control.second.handle.z, 0)
+-
+-        mouseRelease(control, control.first.handle.x, control.first.handle.y, Qt.LeftButton)
+-        verify(!control.first.pressed)
+-        compare(control.first.handle.z, 1)
+-        compare(control.second.handle.z, 0)
+     }
+ 
+     function test_keys_data() {
diff --git a/srcpkgs/qt6-declarative/template b/srcpkgs/qt6-declarative/template
index e0bd28d9e383..8a190dfc35bc 100644
--- a/srcpkgs/qt6-declarative/template
+++ b/srcpkgs/qt6-declarative/template
@@ -1,23 +1,22 @@
 # Template file for 'qt6-declarative'
 pkgname=qt6-declarative
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qtdeclarative-everywhere-src-${version}"
 build_style=cmake
-configure_args=" -DQT_HOST_PATH=/usr"
 hostmakedepends="qt6-base-devel perl pkg-config wayland-devel
  qt6-shadertools-devel"
-makedepends="qt6-base-devel Vulkan-Headers"
+makedepends="qt6-base-devel Vulkan-Headers qt6-shadertools-devel"
 short_desc="Cross-platform application and UI framework - Declarative"
 maintainer="John <me@johnnynator.dev>"
 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=d294b029dc2b2d4f65da516fdc3b8088d32643eb7ff77db135a8b9ce904caa37
+checksum=03e7694123820fcca397f95ce312e0b7f3039493c8754c836da098a1a04346e8
 replaces="qt6-quickcontrols2>=0"
 
 if [ "$CROSS_BUILD" ]; then
-	configure_args+=" -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true"
+	configure_args="-DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true"
 	hostmakedepends+=" qt6-declarative-devel"
 fi
 
@@ -29,13 +28,31 @@ if [ "$XBPS_TARGET_ENDIAN" = "be" ]; then
 	broken="shader compilation fails"
 fi
 
+pre_configure() {
+	CXXFLAGS+=" '-DQT_DECLARATIVE_BIN_PATH=\"${wrksrc}/build/lib/qt6/bin\"'"
+	CXXFLAGS+=" '-DQT_DECLARATIVE_LIBEXEC_PATH=\"${wrksrc}/build/lib/qt6/libexec\"'"
+}
+
 pre_check() {
 	export QML2_IMPORT_PATH="$wrksrc/build/lib/qt6/qml"
 }
 
 do_check() {
 	cd build
-	ctest -E '(tst_qqmllocale|text|tst_qquickwidget)'
+	local broken="tst_qqmllocale|text|tst_qquickwidget"
+	# requires qt6-declarative installed
+	broken+="|module_includes|cmake_tooling_imports|empty_qmldir"
+	broken+="|qtquickcompiler|qmlquery"
+	# Could work if Qt6Quick.so.6 could be found by qml
+	broken+="|tst_qqmldebugjs|tst_qqmlinspector"
+	broken+="|tst_qqmlprofilerservice|tst_qqmljsscope"
+	broken+="|tst_qqmlpreview|tst_qmllint|tst_qmlformat"
+	# can't find the source
+	broken+="|tst_qmltc_qprocess"
+	broken+="|tst_qquickfiledialogimpl"
+	broken+="|tst_qquickfolderdialogimpl"
+	broken+="|tst_qmlimportscanner|tst_qqmlextensionplugin"
+	ctest -E "($broken)"
 }
 
 qt6-declarative-tools_package() {
@@ -60,11 +77,14 @@ qt6-declarative-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/libQt6QuickTest.so.*"
 		vmove usr/lib/qt6/qml/QtTest
 		vmove usr/lib/qt6/bin/qmltestrunner
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From 932311e3510a975399d152d3fd646180f87e634a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:07 +0700
Subject: [PATCH 04/26] qt6-imageformats: update to 6.3.1.

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

diff --git a/srcpkgs/qt6-imageformats/template b/srcpkgs/qt6-imageformats/template
index eaca95243c48..9f6d2fb66776 100644
--- a/srcpkgs/qt6-imageformats/template
+++ b/srcpkgs/qt6-imageformats/template
@@ -1,10 +1,9 @@
 # Template file for 'qt6-imageformats'
 pkgname=qt6-imageformats
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qtimageformats-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr"
 hostmakedepends="perl qt6-base-devel"
 makedepends="qt6-base-devel"
 short_desc="Cross-platform application and UI framework - imageformats"
@@ -12,4 +11,4 @@ maintainer="John <me@johnnynator.dev>"
 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=025d0d17ed75b42a7eb6b523731ab8f17025421a8810cade25caffe05d93abef
+checksum=ad0312b8dfbbb67f729bfadbfcd47246ee4a128b717731ba158c41d01fde212f

From d4a22b3790846c82bddef1625221783a62a94058 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:07 +0700
Subject: [PATCH 05/26] qt6-location: update to 6.3.1.

---
 srcpkgs/qt6-location/patches/no-cmake-test.patch | 10 ++++++++++
 srcpkgs/qt6-location/template                    | 12 +++++++++---
 2 files changed, 19 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/qt6-location/patches/no-cmake-test.patch

diff --git a/srcpkgs/qt6-location/patches/no-cmake-test.patch b/srcpkgs/qt6-location/patches/no-cmake-test.patch
new file mode 100644
index 000000000000..c6770fb14d3a
--- /dev/null
+++ b/srcpkgs/qt6-location/patches/no-cmake-test.patch
@@ -0,0 +1,10 @@
+--- a/tests/auto/CMakeLists.txt
++++ b/tests/auto/CMakeLists.txt
+@@ -19,7 +19,6 @@ add_subdirectory(qgeopositioninfosource)
+ add_subdirectory(qgeosatelliteinfosource)
+ add_subdirectory(qnmeapositioninfosource)
+ add_subdirectory(qnmeasatelliteinfosource)
+-add_subdirectory(cmake)
+ if(TARGET Qt::Quick)
+     add_subdirectory(dummypositionplugin)
+     add_subdirectory(declarative_positioning_core)
diff --git a/srcpkgs/qt6-location/template b/srcpkgs/qt6-location/template
index b7397f5f8942..f0fd385b7ac7 100644
--- a/srcpkgs/qt6-location/template
+++ b/srcpkgs/qt6-location/template
@@ -1,10 +1,9 @@
 # Template file for 'qt6-location'
 pkgname=qt6-location
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qtpositioning-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr"
 hostmakedepends="perl qt6-base-devel qt6-declarative-devel"
 makedepends="qt6-serialport-devel qt6-declarative-devel GConf-devel"
 short_desc="Cross-platform application and UI framework - location"
@@ -12,7 +11,11 @@ maintainer="John <me@johnnynator.dev>"
 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=e9ed50f6b245a346db34d625d0012774ef0ec8e7fd65037127ec26758708236e
+checksum=06788e4ecae1920094b30e4046f0abd23c8189d8a51e9c939b02f0b6abe2e86c
+
+pre_check() {
+	export QML2_IMPORT_PATH="$wrksrc/build/lib/qt6/qml"
+}
 
 qt6-location-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel>=${version}_1"
@@ -20,8 +23,11 @@ qt6-location-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From 938d7cb5bab89773eb99ffb02829d41f745cd2fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:08 +0700
Subject: [PATCH 06/26] qt6-lottie: update to 6.3.1.

---
 srcpkgs/qt6-lottie/template | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/qt6-lottie/template b/srcpkgs/qt6-lottie/template
index 1c97cd5f4f32..a7beb62ec368 100644
--- a/srcpkgs/qt6-lottie/template
+++ b/srcpkgs/qt6-lottie/template
@@ -1,10 +1,9 @@
 # Template file for 'qt6-lottie'
 pkgname=qt6-lottie
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qtlottie-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr"
 hostmakedepends="perl qt6-base-devel"
 makedepends="qt6-declarative-devel"
 short_desc="Cross-platform application and UI framework - lottie"
@@ -12,10 +11,10 @@ maintainer="John <me@johnnynator.dev>"
 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=39db570bbba5b527a1eb6a5774bed47398ace2f7217bbf45b1194ada6cf97deb
+checksum=740ba76999124d5e1a85ef3d01c69976bb8557862b6b26bf48b357fe0cab1cf5
 
 if [ "$XBPS_CHECK_PKGS" ]; then
-	configure_args+=" -DQT_BUILD_TESTS=ON"
+	configure_args="-DQT_BUILD_TESTS=ON"
 fi
 
 pre_check() {
@@ -28,8 +27,10 @@ qt6-lottie-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
 		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From 26a88232580e1649d33bb9ec1337f33783661e83 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:08 +0700
Subject: [PATCH 07/26] qt6-networkauth: update to 6.3.1.

---
 srcpkgs/qt6-networkauth/template | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/qt6-networkauth/template b/srcpkgs/qt6-networkauth/template
index e934beada9b0..1454ceb4a525 100644
--- a/srcpkgs/qt6-networkauth/template
+++ b/srcpkgs/qt6-networkauth/template
@@ -1,10 +1,9 @@
 # Template file for 'qt6-networkauth'
 pkgname=qt6-networkauth
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qtnetworkauth-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr"
 hostmakedepends="perl qt6-base-devel"
 makedepends="qt6-base-devel"
 short_desc="Cross-platform application and UI framework - networkauth"
@@ -12,10 +11,10 @@ maintainer="John <me@johnnynator.dev>"
 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=203a98942919028520038f90a20cd7ee32b537233545d11e429c3e2c1ad9069f
+checksum=d60f54b9d4509fa8bdbf1990bc91f6e260e38cdb57a7b8119fa3861bc5d2fb2a
 
 if [ "$XBPS_CHECK_PKGS" ]; then
-	configure_args+=" -DQT_BUILD_TESTS=ON"
+	configure_args="-DQT_BUILD_TESTS=ON"
 fi
 
 qt6-networkauth-devel_package() {
@@ -24,8 +23,11 @@ qt6-networkauth-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From da99f9ffe6ecf79939530f1eb3b40e7a8fd6f112 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:08 +0700
Subject: [PATCH 08/26] qt6-qt5compat: update to 6.3.1.

---
 srcpkgs/qt6-qt5compat/template | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/qt6-qt5compat/template b/srcpkgs/qt6-qt5compat/template
index 7fcd5ad5080e..a62573cfabfa 100644
--- a/srcpkgs/qt6-qt5compat/template
+++ b/srcpkgs/qt6-qt5compat/template
@@ -1,10 +1,9 @@
 # Template file for 'qt6-qt5compat'
 pkgname=qt6-qt5compat
-version=6.3.0
-revision=2
+version=6.3.1
+revision=1
 wrksrc="qt5compat-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr"
 hostmakedepends="qt6-base-devel qt6-declarative-devel perl pkg-config"
 makedepends="qt6-base-devel qt6-declarative-devel"
 short_desc="Cross-platform application and UI framework - Qt5 Compatibilty Component"
@@ -12,10 +11,10 @@ maintainer="John <me@johnnynator.dev>"
 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=2b199be780c50d9214512b922d94cb240b0412fd63f459e356b76102cad1713e
+checksum=a43ec62bd778eaecf88ad7847118d1c2a471b0fcb820f93beb311d7ab9566cfd
 
 if [ "$XBPS_CHECK_PKGS" ]; then
-	configure_args+=" -DQT_BUILD_TESTS=ON"
+	configure_args="-DQT_BUILD_TESTS=ON"
 fi
 
 qt6-qt5compat-devel_package() {
@@ -24,8 +23,11 @@ qt6-qt5compat-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From c0d0196949ddfeb94e98c8da1171e709a57c3c2b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:08 +0700
Subject: [PATCH 09/26] qt6-quick3d: update to 6.3.1.

---
 srcpkgs/qt6-quick3d/template | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/qt6-quick3d/template b/srcpkgs/qt6-quick3d/template
index 0f7ef336a3ff..685ce9bc0e90 100644
--- a/srcpkgs/qt6-quick3d/template
+++ b/srcpkgs/qt6-quick3d/template
@@ -1,19 +1,23 @@
 # Template file for 'qt6-quick3d'
 pkgname=qt6-quick3d
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qtquick3d-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr "
 hostmakedepends="perl qt6-base-devel qt6-declarative-devel qt6-shadertools-devel"
 makedepends="qt6-base-devel qt6-declarative-devel qt6-shadertools-devel
- libassimp-devel"
+ qt6-quicktimeline libassimp-devel"
 short_desc="Cross-platform application and UI framework - Quick3d"
 maintainer="John <me@johnnynator.dev>"
 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=0ad05bd1ee1f784b18220a2d2625ee8de91662c88fdc7b798662953d86eb327e
+checksum=2fa766ee47b8c07412b3b755206ada0715fb07813b64ed069e7205044c061256
+
+if [ "$CROSS_BUILD" ]; then
+	hostmakedepends+=" qt6-quick3d-devel"
+	configure_args="-DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true"
+fi
 
 if [ "$XBPS_TARGET_ENDIAN" = "be" ]; then
 	# possibly a qt6-shadertools bug, actually
@@ -26,9 +30,12 @@ qt6-quick3d-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
-		vmove usr/lib/qt6/mkspecs
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/bin
+		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From 116986c979db91552a51b5c0ef785d6880ce7073 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:09 +0700
Subject: [PATCH 10/26] qt6-quicktimeline: update to 6.3.1.

---
 common/shlibs                      | 1 +
 srcpkgs/qt6-quicktimeline/template | 7 +++----
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 61924610cc52..26f10d604be9 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2045,6 +2045,7 @@ libQt6Quick3DIblBaker.so.6 qt6-quick3d-6.0.3_1
 libQt6Quick3DParticles.so.6 qt6-quick3d-6.1.0_1
 libQt6Quick3DGlslParser.so.6 qt6-quick3d-6.3.0_1
 libQt6Quick3DAssetUtils.so.6 qt6-quick3d-6.1.0_1
+libQt6QuickTimeline.so.6 qt6-quicktimeline-6.3.0_1
 libQt6QuickControls2Impl.so.6 qt6-declarative-6.0.0_1
 libQt6QuickControls2.so.6 qt6-declarative-6.0.0_1
 libQt6QuickTemplates2.so.6 qt6-declarative-6.0.0_1
diff --git a/srcpkgs/qt6-quicktimeline/template b/srcpkgs/qt6-quicktimeline/template
index 15aa7a8e5819..bf02e043c4a5 100644
--- a/srcpkgs/qt6-quicktimeline/template
+++ b/srcpkgs/qt6-quicktimeline/template
@@ -1,10 +1,9 @@
 # Template file for 'qt6-quicktimeline'
 pkgname=qt6-quicktimeline
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qtquicktimeline-everywhere-src-${version/rc/-rc}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr "
 hostmakedepends="perl qt6-base-devel qt6-declarative-devel"
 makedepends="qt6-base-devel qt6-declarative-devel"
 short_desc="Cross-platform application and UI framework - quicktimeline"
@@ -12,10 +11,10 @@ maintainer="John <me@johnnynator.dev>"
 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=9ff0a931159efc6be5bd9f8a1e4a16a70e2dab37cf22ad85c6d330ccfdf31c1a
+checksum=58a13cf0ce8e7755639f20684078733af24f5a317f6ddb40d6079c8c5a28ebbe
 
 if [ "$XBPS_CHECK_PKGS" ]; then
-	configure_args+=" -DQT_BUILD_TESTS=ON"
+	configure_args="-DQT_BUILD_TESTS=ON"
 fi
 
 pre_check() {

From 408ae3aff857940ef03be0d163d2d9286056993e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:09 +0700
Subject: [PATCH 11/26] qt6-scxml: update to 6.3.1.

---
 srcpkgs/qt6-scxml/patches/no-cmake-test.patch | 10 ++++++++++
 srcpkgs/qt6-scxml/template                    | 17 ++++++++++++-----
 2 files changed, 22 insertions(+), 5 deletions(-)
 create mode 100644 srcpkgs/qt6-scxml/patches/no-cmake-test.patch

diff --git a/srcpkgs/qt6-scxml/patches/no-cmake-test.patch b/srcpkgs/qt6-scxml/patches/no-cmake-test.patch
new file mode 100644
index 000000000000..466c45932f58
--- /dev/null
+++ b/srcpkgs/qt6-scxml/patches/no-cmake-test.patch
@@ -0,0 +1,10 @@
+--- a/tests/auto/CMakeLists.txt
++++ b/tests/auto/CMakeLists.txt
+@@ -8,7 +8,6 @@ if(TARGET Qt::Gui AND TARGET Qt::Qml)
+         add_subdirectory(scion)
+         add_subdirectory(statemachine)
+         add_subdirectory(statemachineinfo)
+-        add_subdirectory(cmake)
+     endif()
+     # More checks inside
+     add_subdirectory(qml)
diff --git a/srcpkgs/qt6-scxml/template b/srcpkgs/qt6-scxml/template
index 112baca0ab83..5286c421ba21 100644
--- a/srcpkgs/qt6-scxml/template
+++ b/srcpkgs/qt6-scxml/template
@@ -1,10 +1,9 @@
 # Template file for 'qt6-scxml'
 pkgname=qt6-scxml
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qtscxml-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr"
 hostmakedepends="perl qt6-declarative-devel"
 makedepends="qt6-declarative-devel"
 short_desc="Cross-platform application and UI framework - scxml"
@@ -12,20 +11,28 @@ maintainer="John <me@johnnynator.dev>"
 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=09b0dbd6ac367920fb1ba96a39dcd4c9d33eb0820dcc79538992825d588a70f0
+checksum=01bc154d6163d1f049f4e1e76658a044730ace7b0a5be35c9a46fcd1396f8619
 
-if [ "$XBPS_CHECK_PKGS" ]; then
-	configure_args+=" -DQT_BUILD_TESTS=ON"
+if [ "$CROSS_BUILD" ]; then
+	configure_args="-DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true"
+	hostmakedepends+=" qt6-remoteobjects"
 fi
 
+pre_check() {
+	export QML2_IMPORT_PATH="$wrksrc/build/lib/qt6/qml"
+}
+
 qt6-scxml-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From 26a8a9b6f7319e4864b323dcc8dc4f9c7ed4d510 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:09 +0700
Subject: [PATCH 12/26] qt6-serialport: update to 6.3.1.

---
 srcpkgs/qt6-serialport/patches/no-cmake-test.patch | 9 +++++++++
 srcpkgs/qt6-serialport/template                    | 8 +++++---
 2 files changed, 14 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/qt6-serialport/patches/no-cmake-test.patch

diff --git a/srcpkgs/qt6-serialport/patches/no-cmake-test.patch b/srcpkgs/qt6-serialport/patches/no-cmake-test.patch
new file mode 100644
index 000000000000..434471c4a4f7
--- /dev/null
+++ b/srcpkgs/qt6-serialport/patches/no-cmake-test.patch
@@ -0,0 +1,9 @@
+--- a/tests/auto/CMakeLists.txt
++++ b/tests/auto/CMakeLists.txt
+@@ -1,6 +1,5 @@
+ add_subdirectory(qserialport)
+ add_subdirectory(qserialportinfo)
+-add_subdirectory(cmake)
+ if(QT_FEATURE_private_tests)
+     add_subdirectory(qserialportinfoprivate)
+ endif()
diff --git a/srcpkgs/qt6-serialport/template b/srcpkgs/qt6-serialport/template
index 0804671ca57b..2de9d6364a5c 100644
--- a/srcpkgs/qt6-serialport/template
+++ b/srcpkgs/qt6-serialport/template
@@ -1,10 +1,9 @@
 # Template file for 'qt6-serialport'
 pkgname=qt6-serialport
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qtserialport-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr"
 hostmakedepends="perl qt6-base-devel pkg-config"
 makedepends="qt6-base-devel"
 short_desc="Cross-platform application and UI framework - serialport"
@@ -12,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 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=eebd6934d48cc044b8c87795a4fd91bb81f7195d4b5a2ddb12802f343d5db64f
+checksum=4eb6d80e65799dd2e0318df4dfba14173c1929e861718cda9bedca24253b616e
 
 qt6-serialport-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel>=${version}_1"
@@ -20,8 +19,11 @@ qt6-serialport-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From b62525cbbf1c8d19a0452766e9c39daff3417613 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:09 +0700
Subject: [PATCH 13/26] qt6-shadertools: update to 6.3.1.

---
 srcpkgs/qt6-shadertools/template | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/qt6-shadertools/template b/srcpkgs/qt6-shadertools/template
index 9c1ec210a96a..3716333c459b 100644
--- a/srcpkgs/qt6-shadertools/template
+++ b/srcpkgs/qt6-shadertools/template
@@ -1,10 +1,9 @@
 # Template file for 'qt6-shadertools'
 pkgname=qt6-shadertools
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qtshadertools-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr "
 hostmakedepends="perl qt6-base-devel"
 makedepends="qt6-base-devel"
 short_desc="Cross-platform application and UI framework - shadertools"
@@ -12,7 +11,13 @@ maintainer="John <me@johnnynator.dev>"
 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=5498959b9d37c254bd126ab1320cf86aeb8a31b3ea7e51db666a8f9698afbd6c
+checksum=59b77176961528cc7b0c9325134655e273aa87b4cb386c0f4683d8f2852e435a
+
+if [ "$CROSS_BUILD" ]; then
+	configure_args="-DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true"
+	hostmakedepends+=" qt6-shadertools-devel"
+fi
+
 
 qt6-shadertools-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel>=${version}_1"
@@ -20,8 +25,11 @@ qt6-shadertools-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From 3f9b549ce0a528f518ca092b5aa701bd8a8b77d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:09 +0700
Subject: [PATCH 14/26] qt6-svg: update to 6.3.1.

---
 srcpkgs/qt6-svg/template | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/qt6-svg/template b/srcpkgs/qt6-svg/template
index aa8e6b745109..309b0988e435 100644
--- a/srcpkgs/qt6-svg/template
+++ b/srcpkgs/qt6-svg/template
@@ -1,10 +1,9 @@
 # Template file for 'qt6-svg'
 pkgname=qt6-svg
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qtsvg-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr "
 hostmakedepends="qt6-base-devel perl"
 makedepends="qt6-base-devel"
 short_desc="Cross-platform application and UI framework (QT6) - qt6-svg component"
@@ -12,10 +11,10 @@ maintainer="John <me@johnnynator.dev>"
 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=3164504d7e3f640439308235739b112605ab5fc9cc517ca0b28f9fb93a8db0e3
+checksum=7b19f418e6f7b8e23344082dd04440aacf5da23c5a73980ba22ae4eba4f87df7
 
 if [ "$XBPS_CHECK_PKGS" ]; then
-	configure_args+=" -DQT_BUILD_TESTS=ON"
+	configure_args="-DQT_BUILD_TESTS=ON"
 fi
 
 do_check() {
@@ -29,8 +28,11 @@ qt6-svg-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From 2fa9bc25bb5e4a0216d1ffbdc4939cd10f327669 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:10 +0700
Subject: [PATCH 15/26] qt6-tools: update to 6.3.1.

---
 srcpkgs/qt6-tools/patches/qlitehtml.patch | 68 +++++++++++++++++++++++
 srcpkgs/qt6-tools/template                | 25 +++++++--
 2 files changed, 88 insertions(+), 5 deletions(-)
 create mode 100644 srcpkgs/qt6-tools/patches/qlitehtml.patch

diff --git a/srcpkgs/qt6-tools/patches/qlitehtml.patch b/srcpkgs/qt6-tools/patches/qlitehtml.patch
new file mode 100644
index 000000000000..6bec279bca69
--- /dev/null
+++ b/srcpkgs/qt6-tools/patches/qlitehtml.patch
@@ -0,0 +1,68 @@
+--- a/src/assistant/CMakeLists.txt
++++ b/src/assistant/CMakeLists.txt
+@@ -34,7 +34,9 @@ if(TARGET qlitehtml)
+     qt_internal_set_exceptions_flags(litehtml OFF)
+     qt_disable_warnings(litehtml)
+     qt_disable_warnings(qlitehtml)
+-    qt_disable_warnings(gumbo)
++    if (TARGET gumbo)
++        qt_disable_warnings(gumbo)
++    endif()
+     qt_handle_multi_config_output_dirs(qlitehtml)
+     set_target_properties(qlitehtml PROPERTIES
+         RUNTIME_OUTPUT_DIRECTORY "${QT_BUILD_DIR}/${INSTALL_BINDIR}"
+--- a/src/assistant/qlitehtml/src/3rdparty/litehtml/CMakeLists.txt
++++ b/src/assistant/qlitehtml/src/3rdparty/litehtml/CMakeLists.txt
+@@ -196,52 +196,6 @@ endif()
+ set_source_files_properties(${CMAKE_CURRENT_SOURCE_DIR}/src/master.css.inc PROPERTIES GENERATED TRUE)
+ 
+ # Tests
+-
+-if (BUILD_TESTING)
+-    include(FetchContent)
+-    FetchContent_Declare(
+-      googletest
+-      URL https://github.com/google/googletest/archive/609281088cfefc76f9d0ce82e1ff6c30cc3591e5.zip
+-    )
+-    # For Windows: Prevent overriding the parent project's compiler/linker settings
+-    set(gtest_force_shared_crt ON CACHE BOOL "" FORCE)
+-    FetchContent_GetProperties(googletest)
+-    if(NOT googletest_POPULATED)
+-      FetchContent_Populate(googletest)
+-      add_subdirectory(${googletest_SOURCE_DIR} ${googletest_BINARY_DIR})
+-    endif()
+-
+-    enable_testing()
+-
+-    set(TEST_NAME ${PROJECT_NAME}_tests)
+-
+-    add_executable(
+-        ${TEST_NAME}
+-        ${TEST_LITEHTML}
+-        ${CMAKE_CURRENT_SOURCE_DIR}/src/master.css.inc
+-    )
+-
+-    set_target_properties(${TEST_NAME} PROPERTIES
+-        CXX_STANDARD 11
+-        C_STANDARD 99
+-        PUBLIC_HEADER "${HEADER_LITEHTML}"
+-    )
+-
+-    target_include_directories(
+-        ${TEST_NAME}
+-        PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/containers
+-    )
+-
+-    target_link_libraries(
+-        ${TEST_NAME}
+-        ${PROJECT_NAME}
+-        gtest_main
+-    )
+-
+-    include(GoogleTest)
+-    gtest_discover_tests(${TEST_NAME})
+-endif()
+-
+ #     set(TEST_NAME ${PROJECT_NAME}_tests)
+ #     add_executable(${TEST_NAME} ${TEST_LITEHTML} ${CMAKE_CURRENT_SOURCE_DIR}/src/master.css.inc)
+ #     set_target_properties(${TEST_NAME} PROPERTIES
diff --git a/srcpkgs/qt6-tools/template b/srcpkgs/qt6-tools/template
index f875dff5c046..a844b67dee9e 100644
--- a/srcpkgs/qt6-tools/template
+++ b/srcpkgs/qt6-tools/template
@@ -1,23 +1,35 @@
 # Template file for 'qt6-tools'
 pkgname=qt6-tools
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qttools-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr "
-hostmakedepends="qt6-base-devel perl"
-makedepends="qt6-base-devel libatomic-devel"
+configure_args="-DEXTERNAL_GUMBO=ON -DLITEHTML_UTF8=ON -DUSE_ICU=ON
+ -DQT_BUILD_SHARED_LIBS=ON -DQT_FEATURE_assistant=ON"
+hostmakedepends="qt6-base-devel perl qt6-plugin-sqlite"
+makedepends="qt6-base-devel libatomic-devel qt6-plugin-sqlite
+ gumbo-parser-devel icu-devel"
 short_desc="Cross-platform application and UI framework (QT6) - qt6-tools component"
 maintainer="John <me@johnnynator.dev>"
 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/qttools-everywhere-src-${version}.tar.xz"
-checksum=fce94688ea925782a2879347584991f854630daadba6c52aed6d93e33cd0b19c
+checksum=c412750f2aa3beb93fce5f30517c607f55daaeb7d0407af206a8adf917e126c1
+
+if [ "$CROSS_BUILD" ]; then
+	configure_args+=" -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=TRUE"
+	hostmakedepends+=" qt6-tools-devel"
+fi
+
 
 if [ "$XBPS_CHECK_PKGS" ]; then
 	configure_args+=" -DQT_BUILD_TESTS=ON"
 fi
 
+post_build() {
+	ninja -C build ${makejobs} lib/qt6/libexec/qhelpgenerator
+}
+
 do_check() {
 	cd build
 	# Some of these tests expect that qt6-tools is already
@@ -31,8 +43,11 @@ qt6-tools-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From 583daeb5068a3023a2b432e7276e8d54adb5d00c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:10 +0700
Subject: [PATCH 16/26] qt6-translations: update to 6.3.1.

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

diff --git a/srcpkgs/qt6-translations/template b/srcpkgs/qt6-translations/template
index be0a74ca74e2..1b917ccb3620 100644
--- a/srcpkgs/qt6-translations/template
+++ b/srcpkgs/qt6-translations/template
@@ -1,10 +1,9 @@
 # Template file for 'qt6-translations'
 pkgname=qt6-translations
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qttranslations-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr "
 hostmakedepends="qt6-base-devel qt6-tools-devel perl"
 makedepends="qt6-base-devel qt6-tools-devel"
 short_desc="Cross-platform application and UI framework - translations"
@@ -12,4 +11,4 @@ maintainer="John <me@johnnynator.dev>"
 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=e4dd4ef892a34a9514a19238f189a33ed85c76f31dcad6599ced93b1e33440b3
+checksum=d7bdd55e2908ded901dcc262157100af2a490bf04d31e32995f6d91d78dfdb97

From fe469abdecebeba5bf063856e6de624cfd04c594 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:10 +0700
Subject: [PATCH 17/26] qt6-virtualkeyboard: update to 6.3.1.

---
 srcpkgs/qt6-virtualkeyboard/template | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/qt6-virtualkeyboard/template b/srcpkgs/qt6-virtualkeyboard/template
index 67ecef145ea1..77a247400b97 100644
--- a/srcpkgs/qt6-virtualkeyboard/template
+++ b/srcpkgs/qt6-virtualkeyboard/template
@@ -1,10 +1,9 @@
 # Template file for 'qt6-virtualkeyboard'
 pkgname=qt6-virtualkeyboard
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qtvirtualkeyboard-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr"
 hostmakedepends="perl pkg-config qt6-declarative-devel"
 makedepends="qt6-declarative-devel qt6-svg-devel hunspell-devel"
 short_desc="Cross-platform application and UI framework - virtualkeyboard"
@@ -12,10 +11,10 @@ maintainer="John <me@johnnynator.dev>"
 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=89aaf15acf5432af8f5cf4ec45cb32d87a3348906215dd56e81cb294eb276573
+checksum=5fe089b204d859ab0dd0169f811f2e30cae7c5cb36f8ab95ca36883f1fc0c2b8
 
 if [ "$XBPS_CHECK_PKGS" ]; then
-	configure_args+=" -DQT_BUILD_TESTS=ON"
+	configure_args="-DQT_BUILD_TESTS=ON"
 fi
 
 do_check() {
@@ -32,8 +31,11 @@ qt6-virtualkeyboard-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From aed0080165816cc01db709cd3c60d9bb69e68116 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:10 +0700
Subject: [PATCH 18/26] qt6-wayland: update to 6.3.1.

---
 srcpkgs/qt6-wayland/template | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/qt6-wayland/template b/srcpkgs/qt6-wayland/template
index b71a273009b9..249271bd3a7d 100644
--- a/srcpkgs/qt6-wayland/template
+++ b/srcpkgs/qt6-wayland/template
@@ -1,13 +1,14 @@
 # Template file for 'qt6-wayland'
 pkgname=qt6-wayland
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qtwayland-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true"
-hostmakedepends="qt6-base-devel perl pkg-config wayland-devel qt6-wayland-devel"
+hostmakedepends="qt6-base-devel perl pkg-config wayland-devel
+ qt6-declarative-devel"
 # XXX: Qml as optional dep
 makedepends="qt6-base-devel wayland-devel libxkbcommon-devel
+ qt6-declarative-devel
  libXcomposite-devel MesaLib-devel Vulkan-Headers libdrm-devel"
 checkdepends="dbus mesa-dri"
 short_desc="Cross-platform application and UI framework - Wayland"
@@ -15,10 +16,11 @@ maintainer="John <me@johnnynator.dev>"
 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=e7b567f6e43ffc5918d4aa825ce1eced66a00cb0a87133b2912ba5c1b2a02190
+checksum=6f14fea2d172a5b4170be3efcb0e58535f6605b61bcd823f6d5c9d165bb8c0f0
 
-if [ "$XBPS_CHECK_PKGS" ]; then
-	configure_args+=" -DQT_BUILD_TESTS=ON"
+if [ "$CROSS_BUILD" ]; then
+	configure_args="-DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true"
+	hostmakedepends+=" qt6-wayland-devel"
 fi
 
 do_check() {
@@ -32,9 +34,11 @@ qt6-wayland-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
-		vmove usr/lib/qt6/libexec/qtwaylandscanner
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From 8b8f90cabde802b7504df6c0190ee75223f2b80e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:10 +0700
Subject: [PATCH 19/26] qt6-websockets: update to 6.3.1.

---
 srcpkgs/qt6-websockets/patches/no-cmake-test.patch |  7 +++++++
 srcpkgs/qt6-websockets/template                    | 14 +++++++++++---
 2 files changed, 18 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/qt6-websockets/patches/no-cmake-test.patch

diff --git a/srcpkgs/qt6-websockets/patches/no-cmake-test.patch b/srcpkgs/qt6-websockets/patches/no-cmake-test.patch
new file mode 100644
index 000000000000..8829f9fab1df
--- /dev/null
+++ b/srcpkgs/qt6-websockets/patches/no-cmake-test.patch
@@ -0,0 +1,7 @@
+--- a/tests/auto/CMakeLists.txt
++++ b/tests/auto/CMakeLists.txt
+@@ -1,4 +1,3 @@
+-add_subdirectory(cmake)
+ add_subdirectory(websockets)
+ if(TARGET Qt::Quick)
+     add_subdirectory(qml)
diff --git a/srcpkgs/qt6-websockets/template b/srcpkgs/qt6-websockets/template
index c2e674aacb31..e5753ca88d02 100644
--- a/srcpkgs/qt6-websockets/template
+++ b/srcpkgs/qt6-websockets/template
@@ -1,18 +1,23 @@
 # Template file for 'qt6-websockets'
 pkgname=qt6-websockets
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qtwebsockets-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr"
 hostmakedepends="perl qt6-base-devel qt6-declarative-devel"
 makedepends="qt6-base-devel qt6-declarative-devel"
+depends="qt6-plugin-tls-openssl"
+checkdepends="$depends"
 short_desc="Cross-platform application and UI framework - websockets"
 maintainer="John <me@johnnynator.dev>"
 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=e018a09fe960b7d9560d6bbc9d3ca022fed6566e6ba6fc6d869a97482d4e6361
+checksum=9f980d90c97fcbde1b50c773f6dc580cfdf8c36ce14a1be3aa2ccadfe605121a
+
+pre_check() {
+	export QML2_IMPORT_PATH="$wrksrc/build/lib/qt6/qml"
+}
 
 qt6-websockets-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel>=${version}_1"
@@ -20,8 +25,11 @@ qt6-websockets-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From 22b33177e463a871951d352aacbf3d4de3cfc838 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Tue, 9 Aug 2022 20:16:47 +0700
Subject: [PATCH 20/26] qt6-3d: update to 6.3.1.

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

diff --git a/srcpkgs/qt6-3d/template b/srcpkgs/qt6-3d/template
index 666f57559532..c08c3bd4a41b 100644
--- a/srcpkgs/qt6-3d/template
+++ b/srcpkgs/qt6-3d/template
@@ -1,10 +1,9 @@
 # Template file for 'qt6-3d'
 pkgname=qt6-3d
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qt3d-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr"
 hostmakedepends="perl qt6-declarative-devel"
 makedepends="qt6-declarative-devel qt6-shadertools-devel libassimp-devel
  libatomic-devel"
@@ -13,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 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=74e762380dad34887878b9124dbfb981d5cf4b8b807281ff8bff311145b54de1
+checksum=9919b66dfb253fa26db1a7d664358cbc07f46c8810082ee3120d0a54b153edfe
 
 qt6-3d-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 100f58622b54a0dc87c94a8dc1836c16bd32bf2c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:11 +0700
Subject: [PATCH 21/26] New package: qt6-webchannel-6.3.1

---
 srcpkgs/qt6-webchannel-devel                  |  1 +
 .../patches/no-cmake-test.patch               |  7 ++++
 srcpkgs/qt6-webchannel/template               | 36 +++++++++++++++++++
 srcpkgs/qt6-webchannel/update                 |  1 +
 4 files changed, 45 insertions(+)
 create mode 120000 srcpkgs/qt6-webchannel-devel
 create mode 100644 srcpkgs/qt6-webchannel/patches/no-cmake-test.patch
 create mode 100644 srcpkgs/qt6-webchannel/template
 create mode 100644 srcpkgs/qt6-webchannel/update

diff --git a/srcpkgs/qt6-webchannel-devel b/srcpkgs/qt6-webchannel-devel
new file mode 120000
index 000000000000..03e8b23d785d
--- /dev/null
+++ b/srcpkgs/qt6-webchannel-devel
@@ -0,0 +1 @@
+qt6-webchannel
\ No newline at end of file
diff --git a/srcpkgs/qt6-webchannel/patches/no-cmake-test.patch b/srcpkgs/qt6-webchannel/patches/no-cmake-test.patch
new file mode 100644
index 000000000000..c02028772a2d
--- /dev/null
+++ b/srcpkgs/qt6-webchannel/patches/no-cmake-test.patch
@@ -0,0 +1,7 @@
+--- a/tests/auto/CMakeLists.txt
++++ b/tests/auto/CMakeLists.txt
+@@ -1,4 +1,3 @@
+-add_subdirectory(cmake)
+ add_subdirectory(webchannel)
+ if(TARGET Qt::Quick)
+     add_subdirectory(qml)
diff --git a/srcpkgs/qt6-webchannel/template b/srcpkgs/qt6-webchannel/template
new file mode 100644
index 000000000000..b83e801effd4
--- /dev/null
+++ b/srcpkgs/qt6-webchannel/template
@@ -0,0 +1,36 @@
+# Template file for 'qt6-webchannel'
+pkgname=qt6-webchannel
+version=6.3.1
+revision=1
+wrksrc="qtwebchannel-everywhere-src-${version}"
+build_style=cmake
+hostmakedepends="perl qt6-base-devel qt6-declarative-devel"
+makedepends="qt6-base-devel qt6-declarative-devel qt6-websockets-devel"
+short_desc="Cross-platform application and UI framework - webchannel"
+maintainer="John <me@johnnynator.dev>"
+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=aaa20ac23f86992721b7ee487c379a3fd68caa8cdcea0a77a37e0d8b47ff2668
+
+pre_check() {
+	export QML2_IMPORT_PATH="$wrksrc/build/lib/qt6/qml"
+}
+
+qt6-webchannel-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel>=${version}_1
+	 qt6-websockets-devel>=${version}_1"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
+		vmove usr/lib/qt6/mkspecs
+		vmove usr/lib/qt6/qml/QtWebChannel/plugins.qmltypes
+		vmove usr/lib/qt6/qml/QtWebChannel/qmldir
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
+	}
+}
diff --git a/srcpkgs/qt6-webchannel/update b/srcpkgs/qt6-webchannel/update
new file mode 100644
index 000000000000..844552465222
--- /dev/null
+++ b/srcpkgs/qt6-webchannel/update
@@ -0,0 +1 @@
+pkgname="${pkgname/6-/}-everywhere-src"

From 9f80d343eb5dff6e73f064a98cdde7821d69d5e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:11 +0700
Subject: [PATCH 22/26] New package: qt6-multimedia-6.3.1

---
 common/shlibs                   |  3 +++
 srcpkgs/qt6-multimedia-devel    |  1 +
 srcpkgs/qt6-multimedia/template | 43 +++++++++++++++++++++++++++++++++
 srcpkgs/qt6-multimedia/update   |  1 +
 4 files changed, 48 insertions(+)
 create mode 120000 srcpkgs/qt6-multimedia-devel
 create mode 100644 srcpkgs/qt6-multimedia/template
 create mode 100644 srcpkgs/qt6-multimedia/update

diff --git a/common/shlibs b/common/shlibs
index 26f10d604be9..ce04cc1ad2cf 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2078,6 +2078,9 @@ libQt6SerialPort.so.6 qt6-serialport-6.2.0alpha_1
 libQt6WebSockets.so.6 qt6-websockets-6.2.0alpha_1
 libQt6WebChannel.so.6 qt6-webchannel-6.2.0alpha_1
 libQt6Positioning.so.6 qt6-location-6.2.0alpha_1
+libQt6MultimediaWidgets.so.6 qt6-multimedia-6.3.1_1
+libQt6MultimediaQuick.so.6 qt6-multimedia-6.3.1_1
+libQt6Multimedia.so.6 qt6-multimedia-6.3.1_1
 libnpth.so.0 npth-1.1_1
 libnpupnp.so.4 libnpupnp-4.0.2_1
 libglfw.so.3 glfw-3.0.4_1
diff --git a/srcpkgs/qt6-multimedia-devel b/srcpkgs/qt6-multimedia-devel
new file mode 120000
index 000000000000..9343446502d0
--- /dev/null
+++ b/srcpkgs/qt6-multimedia-devel
@@ -0,0 +1 @@
+qt6-multimedia
\ No newline at end of file
diff --git a/srcpkgs/qt6-multimedia/template b/srcpkgs/qt6-multimedia/template
new file mode 100644
index 000000000000..84ff33149875
--- /dev/null
+++ b/srcpkgs/qt6-multimedia/template
@@ -0,0 +1,43 @@
+# Template file for 'qt6-multimedia'
+pkgname=qt6-multimedia
+version=6.3.1
+revision=1
+wrksrc="qtmultimedia-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DQT_FEATURE_gstreamer=ON"
+hostmakedepends="perl qt6-declarative-devel pkg-config
+ qt6-shadertools-devel"
+makedepends="qt6-declarative-devel
+ qt6-shadertools-devel libglib-devel gst-plugins-base1-devel"
+short_desc="Cross-platform application and UI framework - multimedia"
+maintainer="John <me@johnnynator.dev>"
+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=7e03242aadd634ff2d9fcf08948290f03da3d9a5012369d908da89f82b1d7336
+
+do_check() {
+	cd build
+	local broken="tst_qmediaformat|tst_qaudiodecoderbackend"
+	broken+="|tst_qaudiodevice|tst_qaudiosource|tst_qaudiosink"
+	broken+="|tst_qmediaplayerbackend|tst_qmediacapturesession"
+	broken+="|tst_qcamerabackend|tst_qquickvideooutput"
+	broken+="|tst_qquickvideooutput_window"
+	ctest -E "($broken)"
+}
+
+qt6-multimedia-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel>=${version}_1"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
+		vmove usr/lib/qt6/mkspecs
+		vmove usr/lib/qt6/qml/QtMultimedia/plugins.qmltypes
+		vmove usr/lib/qt6/qml/QtMultimedia/qmldir
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}
diff --git a/srcpkgs/qt6-multimedia/update b/srcpkgs/qt6-multimedia/update
new file mode 100644
index 000000000000..844552465222
--- /dev/null
+++ b/srcpkgs/qt6-multimedia/update
@@ -0,0 +1 @@
+pkgname="${pkgname/6-/}-everywhere-src"

From 35e723334b6afc6aa9da0b9cdfa764d54fdf6569 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 18:22:48 +0700
Subject: [PATCH 23/26] New package: qt6-connectivity-6.3.1

---
 common/shlibs                                 |  2 ++
 srcpkgs/qt6-connectivity-devel                |  1 +
 .../patches/no-cmake-test.patch               |  9 ++++++
 srcpkgs/qt6-connectivity/template             | 30 +++++++++++++++++++
 4 files changed, 42 insertions(+)
 create mode 120000 srcpkgs/qt6-connectivity-devel
 create mode 100644 srcpkgs/qt6-connectivity/patches/no-cmake-test.patch
 create mode 100644 srcpkgs/qt6-connectivity/template

diff --git a/common/shlibs b/common/shlibs
index ce04cc1ad2cf..2e95a22119ab 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2072,6 +2072,8 @@ libQt6Designer.so.6 qt6-tools-6.1.0_1
 libQt6DesignerComponents.so.6 qt6-tools-6.1.0_1
 libQt6Help.so.6 qt6-tools-6.1.0_1
 libQt6UiTools.so.6 qt6-tools-6.1.0_1
+libQt6Nfc.so.6 qt6-connectivity-6.3.1_1
+libQt6Bluetooth.so.6 qt6-connectivity-6.3.1_1
 libQt6HunspellInputMethod.so.6 qt6-virtualkeyboard-6.1.0_1
 libQt6VirtualKeyboard.so.6 qt6-virtualkeyboard-6.1.0_1
 libQt6SerialPort.so.6 qt6-serialport-6.2.0alpha_1
diff --git a/srcpkgs/qt6-connectivity-devel b/srcpkgs/qt6-connectivity-devel
new file mode 120000
index 000000000000..478cc9d8aa39
--- /dev/null
+++ b/srcpkgs/qt6-connectivity-devel
@@ -0,0 +1 @@
+qt6-connectivity
\ No newline at end of file
diff --git a/srcpkgs/qt6-connectivity/patches/no-cmake-test.patch b/srcpkgs/qt6-connectivity/patches/no-cmake-test.patch
new file mode 100644
index 000000000000..deb80062ac71
--- /dev/null
+++ b/srcpkgs/qt6-connectivity/patches/no-cmake-test.patch
@@ -0,0 +1,9 @@
+--- a/tests/auto/CMakeLists.txt
++++ b/tests/auto/CMakeLists.txt
+@@ -24,6 +24,3 @@ if(TARGET Qt::Nfc)
+     add_subdirectory(qndefnfcsmartposterrecord)
+     add_subdirectory(qndeffilter)
+ endif()
+-if(TARGET Qt::Bluetooth AND TARGET Qt::Nfc)
+-    add_subdirectory(cmake)
+-endif()
diff --git a/srcpkgs/qt6-connectivity/template b/srcpkgs/qt6-connectivity/template
new file mode 100644
index 000000000000..6cb61744d0cb
--- /dev/null
+++ b/srcpkgs/qt6-connectivity/template
@@ -0,0 +1,30 @@
+# Template file for 'qt6-connectivity'
+pkgname=qt6-connectivity
+version=6.3.1
+revision=1
+wrksrc="qtconnectivity-everywhere-src-${version}"
+build_style=cmake
+hostmakedepends="perl qt6-declarative-devel"
+makedepends="qt6-declarative-devel"
+short_desc="Cross-platform application and UI framework - Connectivity"
+maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
+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=b25ce4710a9c61bc6a5dbaeeb3e2ed907a8bc85478fdb2ab4312297768b695b0
+
+qt6-connectivity-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}
+	 qt6-declarative>=${version}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
+		vmove usr/lib/qt6/mkspecs
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
+	}
+}

From 4da78234995f15378bb561005bad13462a1418f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 18:22:57 +0700
Subject: [PATCH 24/26] New package: qt6-sensors-6.3.1

---
 common/shlibs                                 |  2 ++
 srcpkgs/qt6-sensors-devel                     |  1 +
 .../qt6-sensors/patches/no-cmake-test.patch   |  8 +++++
 srcpkgs/qt6-sensors/template                  | 31 +++++++++++++++++++
 4 files changed, 42 insertions(+)
 create mode 120000 srcpkgs/qt6-sensors-devel
 create mode 100644 srcpkgs/qt6-sensors/patches/no-cmake-test.patch
 create mode 100644 srcpkgs/qt6-sensors/template

diff --git a/common/shlibs b/common/shlibs
index 2e95a22119ab..157b51f3f981 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2074,6 +2074,8 @@ libQt6Help.so.6 qt6-tools-6.1.0_1
 libQt6UiTools.so.6 qt6-tools-6.1.0_1
 libQt6Nfc.so.6 qt6-connectivity-6.3.1_1
 libQt6Bluetooth.so.6 qt6-connectivity-6.3.1_1
+libQt6Sensors.so.6 qt6-sensors-6.3.1_1
+libQt6SensorsQuick.so.6 qt6-sensors-6.3.1_1
 libQt6HunspellInputMethod.so.6 qt6-virtualkeyboard-6.1.0_1
 libQt6VirtualKeyboard.so.6 qt6-virtualkeyboard-6.1.0_1
 libQt6SerialPort.so.6 qt6-serialport-6.2.0alpha_1
diff --git a/srcpkgs/qt6-sensors-devel b/srcpkgs/qt6-sensors-devel
new file mode 120000
index 000000000000..eb9457f04055
--- /dev/null
+++ b/srcpkgs/qt6-sensors-devel
@@ -0,0 +1 @@
+qt6-sensors
\ No newline at end of file
diff --git a/srcpkgs/qt6-sensors/patches/no-cmake-test.patch b/srcpkgs/qt6-sensors/patches/no-cmake-test.patch
new file mode 100644
index 000000000000..64f81563cb13
--- /dev/null
+++ b/srcpkgs/qt6-sensors/patches/no-cmake-test.patch
@@ -0,0 +1,8 @@
+--- a/tests/auto/CMakeLists.txt
++++ b/tests/auto/CMakeLists.txt
+@@ -1,5 +1,4 @@
+ add_subdirectory(qsensor)
+-add_subdirectory(cmake)
+ if(TARGET Qt::Quick)
+     add_subdirectory(qml)
+ endif()
diff --git a/srcpkgs/qt6-sensors/template b/srcpkgs/qt6-sensors/template
new file mode 100644
index 000000000000..5a81f43b60eb
--- /dev/null
+++ b/srcpkgs/qt6-sensors/template
@@ -0,0 +1,31 @@
+# Template file for 'qt6-sensors'
+pkgname=qt6-sensors
+version=6.3.1
+revision=1
+wrksrc="qtsensors-everywhere-src-${version}"
+build_style=cmake
+hostmakedepends="perl qt6-declarative-devel qt6-svg-devel pkg-config"
+makedepends="qt6-declarative-devel qt6-svg-devel"
+short_desc="Cross-platform application and UI framework - Sensors"
+maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
+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=4b240b59edba9a42b4735758a25f279a26841b982864e7b38f6ef0b81e0d60cc
+
+qt6-sensors-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}
+	 qt6-declarative-devel>=${version}_1"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
+		vmove usr/lib/qt6/mkspecs
+		vmove usr/lib/qt6/qml/QtSensors/plugins.qmltypes
+		vmove usr/lib/qt6/qml/QtSensors/qmldir
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}

From 7da747a5c63439d562504fb4fa72f2ca07bf5d24 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 18:23:08 +0700
Subject: [PATCH 25/26] New package: qt6-remoteobjects-6.3.1

---
 common/shlibs                                 |  2 +
 srcpkgs/qt6-remoteobjects-devel               |  1 +
 .../patches/no-cmake-test.patch               |  9 ++++
 srcpkgs/qt6-remoteobjects/template            | 43 +++++++++++++++++++
 4 files changed, 55 insertions(+)
 create mode 120000 srcpkgs/qt6-remoteobjects-devel
 create mode 100644 srcpkgs/qt6-remoteobjects/patches/no-cmake-test.patch
 create mode 100644 srcpkgs/qt6-remoteobjects/template

diff --git a/common/shlibs b/common/shlibs
index 157b51f3f981..91f197e54c93 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2074,6 +2074,8 @@ libQt6Help.so.6 qt6-tools-6.1.0_1
 libQt6UiTools.so.6 qt6-tools-6.1.0_1
 libQt6Nfc.so.6 qt6-connectivity-6.3.1_1
 libQt6Bluetooth.so.6 qt6-connectivity-6.3.1_1
+libQt6RemoteObjects.so.6 qt6-remoteobjects-6.3.1_1
+libQt6RemoteObjectsQml.so.6 qt6-remoteobjects-6.3.1_1
 libQt6Sensors.so.6 qt6-sensors-6.3.1_1
 libQt6SensorsQuick.so.6 qt6-sensors-6.3.1_1
 libQt6HunspellInputMethod.so.6 qt6-virtualkeyboard-6.1.0_1
diff --git a/srcpkgs/qt6-remoteobjects-devel b/srcpkgs/qt6-remoteobjects-devel
new file mode 120000
index 000000000000..2a027f95266f
--- /dev/null
+++ b/srcpkgs/qt6-remoteobjects-devel
@@ -0,0 +1 @@
+qt6-remoteobjects
\ No newline at end of file
diff --git a/srcpkgs/qt6-remoteobjects/patches/no-cmake-test.patch b/srcpkgs/qt6-remoteobjects/patches/no-cmake-test.patch
new file mode 100644
index 000000000000..2d9ba9463ebf
--- /dev/null
+++ b/srcpkgs/qt6-remoteobjects/patches/no-cmake-test.patch
@@ -0,0 +1,9 @@
+--- a/tests/auto/CMakeLists.txt
++++ b/tests/auto/CMakeLists.txt
+@@ -1,6 +1,5 @@
+ 
+ add_subdirectory(benchmarks)
+-add_subdirectory(cmake)
+ add_subdirectory(modelreplica)
+ add_subdirectory(modelview)
+ add_subdirectory(pods)
diff --git a/srcpkgs/qt6-remoteobjects/template b/srcpkgs/qt6-remoteobjects/template
new file mode 100644
index 000000000000..cdc3b23f52de
--- /dev/null
+++ b/srcpkgs/qt6-remoteobjects/template
@@ -0,0 +1,43 @@
+# Template file for 'qt6-remoteobjects'
+pkgname=qt6-remoteobjects
+version=6.3.1
+revision=1
+wrksrc="qtremoteobjects-everywhere-src-${version}"
+build_style=cmake
+hostmakedepends="perl qt6-declarative-devel pkg-config"
+makedepends="qt6-declarative-devel"
+# Not a strict dependency, but it's 2022, everyone should use TLS
+depends="qt6-plugin-tls-openssl"
+checkdepends="$depends"
+short_desc="Cross-platform application and UI framework - Remote Objects"
+maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
+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=ea6d038b11c60981de0bd39a6091a59abf7d031e37bfc592b31be1217bef4ca6
+
+if [ "$CROSS_BUILD" ]; then
+	hostmakedepends+=" qt6-remoteobjects"
+	configure_args="-DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true"
+fi
+
+pre_check() {
+	export QML2_IMPORT_PATH="$wrksrc/build/lib/qt6/qml"
+}
+
+qt6-remoteobjects-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}
+	 qt6-declarative-devel>=${version}_1"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
+		vmove usr/lib/qt6/mkspecs
+		vmove usr/lib/qt6/qml/QtRemoteObjects/plugins.qmltypes
+		vmove usr/lib/qt6/qml/QtRemoteObjects/qmldir
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}

From 20cae0dc21c0f58e342aa2624208304cb7d238f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:11 +0700
Subject: [PATCH 26/26] New package: qt6-webengine-6.3.1.

---
 common/shlibs                                 |    7 +
 srcpkgs/qt6-webengine-devel                   |    1 +
 srcpkgs/qt6-webengine-examples                |    1 +
 .../patches/0001-None-no-debug.patch          |   11 +
 .../patches/0002-enable-ppc64.patch           |   20 +
 .../patches/0003-cross-hack.patch             |   10 +
 .../0004-ppc-disable-jxl-decoder.patch        |   13 +
 .../patches/0050-no-glibc-cmake-check.patch   |   14 +
 .../0100-chromium-sandbox-membarrier.patch    |   58 +
 .../qt6-webengine/patches/0101-size_t.patch   |   16 +
 .../0102-chromium-90-ruy-include.patch        |   19 +
 ...-v8-monotonic-pthread-cont_timedwait.patch |   22 +
 .../0104-chromium-revert-9d080c0.patch        |  162 +
 ...-chromium-revert-drop-of-system-java.patch |   15 +
 .../patches/0106-chromium-system-nodejs.patch |   20 +
 .../0107-chromium-cursed^Uscoped_file.patch   |   18 +
 .../0108-chromium-fix-narrowing-cast.patch    |   53 +
 .../0109-chromium-remove-strip_binary.patch   |   32 +
 ...ium-revert-use-ffile-compilation-dir.patch |   57 +
 ...11-chromium-no-Wno-stringop-overread.patch |   10 +
 .../0150-chromium-glibc-libc_malloc.patch     |   24 +
 ...-include-sys-reg.h-to-get-__WORDSIZE.patch |   21 +
 .../0201-chromium-musl-dispatch-to-musl.patch |  103 +
 .../0202-chromium-musl-no-mallinfo.patch      |   62 +
 .../0203-chromium-musl-siginfo_t.patch        |   18 +
 .../0204-chromium-musl-stackstart.patch       |   20 +
 .../patches/0205-chromium-musl-sandbox.patch  |   92 +
 ...0206-chromium-musl-default-stacksize.patch |   15 +
 .../patches/0208-chromium-musl-execinfo.patch |  125 +
 .../0209-chromium-musl-thread-stacksize.patch |   22 +
 .../0210-chromium-musl-msgvec-push_back.patch |   14 +
 ...ium-musl-canonicalize-file-name-musl.patch |   11 +
 .../0212-chromium-musl-no-getcontext.patch    |   29 +
 .../patches/0213-chromium-musl-crashpad.patch |   24 +
 .../patches/0214-chromium-musl-fixes.patch    |  108 +
 .../patches/0215-chromium-musl-cdefs.patch    |   29 +
 .../patches/0216-chromium-musl-stat.patch     |   12 +
 .../patches/0217-chromium-musl-resolver.patch |   77 +
 .../patches/0600-chromium-sndio.patch         |  876 ++++
 .../patches/0700-armv7l-neon.patch            |   10 +
 ...-chromium-musl-cross-no-asm_ptrace_h.patch |   30 +
 .../0751-chromium-musl-arm-user_vfp.patch     |   20 +
 .../0752-chromium-musl-arm-elf_auxv_t.patch   |   18 +
 ...0801-chromium-i686-vaapi-fpermissive.patch |   24 +
 .../patches/0900-xxx-ppc64le-libvpx.patch     |   65 +
 .../0901-xxx-ppc64le-sandbox-linux-stat.patch |   31 +
 .../patches/0902-xxx-ppc64le-support.patch    | 3556 +++++++++++++++++
 .../0903-xxx-ppc64le-swiftshader.patch        |   18 +
 .../patches/cross-build-examples.patch        |   16 +
 srcpkgs/qt6-webengine/template                |  178 +
 srcpkgs/qt6-webengine/update                  |    1 +
 51 files changed, 6208 insertions(+)
 create mode 120000 srcpkgs/qt6-webengine-devel
 create mode 120000 srcpkgs/qt6-webengine-examples
 create mode 100644 srcpkgs/qt6-webengine/patches/0001-None-no-debug.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0002-enable-ppc64.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0003-cross-hack.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0004-ppc-disable-jxl-decoder.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0050-no-glibc-cmake-check.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0100-chromium-sandbox-membarrier.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0101-size_t.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0102-chromium-90-ruy-include.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0103-chromium-v8-monotonic-pthread-cont_timedwait.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0104-chromium-revert-9d080c0.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0105-chromium-revert-drop-of-system-java.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0106-chromium-system-nodejs.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0107-chromium-cursed^Uscoped_file.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0108-chromium-fix-narrowing-cast.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0109-chromium-remove-strip_binary.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0110-chromium-revert-use-ffile-compilation-dir.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0111-chromium-no-Wno-stringop-overread.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0150-chromium-glibc-libc_malloc.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0200-chromium-musl-include-sys-reg.h-to-get-__WORDSIZE.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0201-chromium-musl-dispatch-to-musl.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0202-chromium-musl-no-mallinfo.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0203-chromium-musl-siginfo_t.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0204-chromium-musl-stackstart.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0205-chromium-musl-sandbox.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0206-chromium-musl-default-stacksize.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0208-chromium-musl-execinfo.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0209-chromium-musl-thread-stacksize.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0210-chromium-musl-msgvec-push_back.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0211-chromium-musl-canonicalize-file-name-musl.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0212-chromium-musl-no-getcontext.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0213-chromium-musl-crashpad.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0214-chromium-musl-fixes.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0215-chromium-musl-cdefs.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0216-chromium-musl-stat.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0217-chromium-musl-resolver.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0600-chromium-sndio.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0700-armv7l-neon.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0750-chromium-musl-cross-no-asm_ptrace_h.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0751-chromium-musl-arm-user_vfp.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0752-chromium-musl-arm-elf_auxv_t.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0801-chromium-i686-vaapi-fpermissive.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0900-xxx-ppc64le-libvpx.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0901-xxx-ppc64le-sandbox-linux-stat.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0902-xxx-ppc64le-support.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0903-xxx-ppc64le-swiftshader.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/cross-build-examples.patch
 create mode 100644 srcpkgs/qt6-webengine/template
 create mode 100644 srcpkgs/qt6-webengine/update

diff --git a/common/shlibs b/common/shlibs
index 91f197e54c93..1f8acc43c36e 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2087,6 +2087,13 @@ libQt6Positioning.so.6 qt6-location-6.2.0alpha_1
 libQt6MultimediaWidgets.so.6 qt6-multimedia-6.3.1_1
 libQt6MultimediaQuick.so.6 qt6-multimedia-6.3.1_1
 libQt6Multimedia.so.6 qt6-multimedia-6.3.1_1
+libQt6WebEngineQuick.so.6 qt6-webengine-6.3.1_1
+libQt6PdfWidgets.so.6 qt6-webengine-6.3.1_1
+libQt6PdfQuick.so.6 qt6-webengine-6.3.1_1
+libQt6WebEngineCore.so.6 qt6-webengine-6.3.1_1
+libQt6Pdf.so.6 qt6-webengine-6.3.1_1
+libQt6WebEngineQuickDelegatesQml.so.6 qt6-webengine-6.3.1_1
+libQt6WebEngineWidgets.so.6 qt6-webengine-6.3.1_1
 libnpth.so.0 npth-1.1_1
 libnpupnp.so.4 libnpupnp-4.0.2_1
 libglfw.so.3 glfw-3.0.4_1
diff --git a/srcpkgs/qt6-webengine-devel b/srcpkgs/qt6-webengine-devel
new file mode 120000
index 000000000000..8e4d1b99c587
--- /dev/null
+++ b/srcpkgs/qt6-webengine-devel
@@ -0,0 +1 @@
+qt6-webengine
\ No newline at end of file
diff --git a/srcpkgs/qt6-webengine-examples b/srcpkgs/qt6-webengine-examples
new file mode 120000
index 000000000000..8e4d1b99c587
--- /dev/null
+++ b/srcpkgs/qt6-webengine-examples
@@ -0,0 +1 @@
+qt6-webengine
\ No newline at end of file
diff --git a/srcpkgs/qt6-webengine/patches/0001-None-no-debug.patch b/srcpkgs/qt6-webengine/patches/0001-None-no-debug.patch
new file mode 100644
index 000000000000..1ba33f8e6fd9
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0001-None-no-debug.patch
@@ -0,0 +1,11 @@
+--- a/cmake/Functions.cmake
++++ b/cmake/Functions.cmake
+@@ -813,6 +813,8 @@ macro(append_build_type_setup)
+         endif()
+     elseif(${config} STREQUAL "MinSizeRel")
+         list(APPEND gnArgArg is_debug=false symbol_level=0 optimize_for_size=true)
++    elseif(${config} STREQUAL "None")
++        list(APPEND gnArgArg is_debug=false symbol_level=0)
+     endif()
+     if(FEATURE_developer_build OR (${config} STREQUAL "Debug") OR QT_FEATURE_webengine_sanitizer)
+         list(APPEND gnArgArg
diff --git a/srcpkgs/qt6-webengine/patches/0002-enable-ppc64.patch b/srcpkgs/qt6-webengine/patches/0002-enable-ppc64.patch
new file mode 100644
index 000000000000..d72ef1ad1a10
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0002-enable-ppc64.patch
@@ -0,0 +1,20 @@
+--- a/cmake/Functions.cmake
++++ b/cmake/Functions.cmake
+@@ -622,6 +622,8 @@ function(get_gn_arch result arch)
+         set(${result} "mipsel" PARENT_SCOPE)
+     elseif(arch STREQUAL "mipsel64")
+         set(${result} "mips64el" PARENT_SCOPE)
++    elseif(arch STREQUAL "power64")
++        set(${result} "power64" PARENT_SCOPE)
+     else()
+         message(DEBUG "Unsupported architecture: ${arch}")
+     endif()
+@@ -641,6 +643,8 @@ function(get_v8_arch result targetArch h
+             set(${result} "mipsel" PARENT_SCOPE)
+         elseif(hostArch STREQUAL "mipsel64")
+             set(${result} "mipsel" PARENT_SCOPE)
++        elseif(hostArch STREQUAL "power64")
++            set(${result} "power64" PARENT_SCOPE)
+         else()
+             message(DEBUG "Unsupported architecture: ${hostArch}")
+         endif()
diff --git a/srcpkgs/qt6-webengine/patches/0003-cross-hack.patch b/srcpkgs/qt6-webengine/patches/0003-cross-hack.patch
new file mode 100644
index 000000000000..ea9f90094a63
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0003-cross-hack.patch
@@ -0,0 +1,10 @@
+--- a/src/core/api/CMakeLists.txt
++++ b/src/core/api/CMakeLists.txt
+@@ -50,6 +50,7 @@ qt_internal_add_module(WebEngineCore
+         Qt::Gui
+         Qt::Network
+         Qt::Quick
++        X11
+ )
+ 
+ set_target_properties(WebEngineCore PROPERTIES QTWEBENGINEPROCESS_NAME ${qtWebEngineProcessName})
diff --git a/srcpkgs/qt6-webengine/patches/0004-ppc-disable-jxl-decoder.patch b/srcpkgs/qt6-webengine/patches/0004-ppc-disable-jxl-decoder.patch
new file mode 100644
index 000000000000..73c1151968f4
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0004-ppc-disable-jxl-decoder.patch
@@ -0,0 +1,13 @@
+--- a/src/core/CMakeLists.txt
++++ b/src/core/CMakeLists.txt
+@@ -414,6 +414,10 @@ foreach(arch ${archs})
+                 CONDITION QT_FEATURE_webengine_ozone_x11 AND XSCRNSAVER_FOUND
+             )
+ 
++            if (cpu STREQUAL "ppc64")
++                list(APPEND gnArgArg enable_jxl_decoder=false)
++            endif()
++
+             if(QT_FEATURE_webengine_kerberos)
+                 list(APPEND gnArgArg
+                      external_gssapi_include_dir="${GSSAPI_INCLUDE_DIRS}/gssapi"
diff --git a/srcpkgs/qt6-webengine/patches/0050-no-glibc-cmake-check.patch b/srcpkgs/qt6-webengine/patches/0050-no-glibc-cmake-check.patch
new file mode 100644
index 000000000000..f756bf0286bb
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0050-no-glibc-cmake-check.patch
@@ -0,0 +1,14 @@
+--- a/configure.cmake
++++ b/configure.cmake
+@@ -499,11 +499,6 @@ add_check_for_support(
+ )
+ add_check_for_support(
+    MODULES QtWebEngine QtPdf
+-   CONDITION NOT LINUX OR TEST_glibc
+-   MESSAGE "A suitable version >= 2.17 of glibc is required."
+-)
+-add_check_for_support(
+-   MODULES QtWebEngine QtPdf
+    CONDITION NOT LINUX OR TEST_khr
+    MESSAGE "Build requires Khronos development headers for build - see mesa/libegl1-mesa-dev"
+ )
diff --git a/srcpkgs/qt6-webengine/patches/0100-chromium-sandbox-membarrier.patch b/srcpkgs/qt6-webengine/patches/0100-chromium-sandbox-membarrier.patch
new file mode 100644
index 000000000000..2dd7b4aa948f
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0100-chromium-sandbox-membarrier.patch
@@ -0,0 +1,58 @@
+--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
++++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
+@@ -413,6 +413,7 @@ bool SyscallSets::IsAllowedProcessStartO
+   switch (sysno) {
+     case __NR_exit:
+     case __NR_exit_group:
++    case __NR_membarrier:
+     case __NR_wait4:
+     case __NR_waitid:
+ #if defined(__i386__)
+--- a/src/3rdparty/chromium/sandbox/linux/system_headers/arm64_linux_syscalls.h
++++ b/src/3rdparty/chromium/sandbox/linux/system_headers/arm64_linux_syscalls.h
+@@ -1215,4 +1215,8 @@
+ #define __NR_landlock_restrict_self 446
+ #endif
+ 
++#if !defined(__NR_membarrier)
++#define __NR_membarrier 283
++#endif
++
+ #endif  // SANDBOX_LINUX_SYSTEM_HEADERS_ARM64_LINUX_SYSCALLS_H_
+--- a/src/3rdparty/chromium/sandbox/linux/system_headers/arm_linux_syscalls.h
++++ b/src/3rdparty/chromium/sandbox/linux/system_headers/arm_linux_syscalls.h
+@@ -1617,6 +1617,10 @@
+ #define __NR_landlock_restrict_self (__NR_SYSCALL_BASE + 446)
+ #endif
+ 
++#if !defined(__NR_membarrier)
++#define __NR_membarrier (__NR_SYSCALL_BASE+389)
++#endif
++
+ // ARM private syscalls.
+ #if !defined(__ARM_NR_BASE)
+ #define __ARM_NR_BASE (__NR_SYSCALL_BASE + 0xF0000)
+--- a/src/3rdparty/chromium/sandbox/linux/system_headers/x86_32_linux_syscalls.h
++++ b/src/3rdparty/chromium/sandbox/linux/system_headers/x86_32_linux_syscalls.h
+@@ -1750,5 +1750,9 @@
+ #define __NR_landlock_restrict_self 446
+ #endif
+ 
++#if !defined(__NR_membarrier)
++#define __NR_membarrier 375
++#endif
++
+ #endif  // SANDBOX_LINUX_SYSTEM_HEADERS_X86_32_LINUX_SYSCALLS_H_
+ 
+--- a/src/3rdparty/chromium/sandbox/linux/system_headers/x86_64_linux_syscalls.h
++++ b/src/3rdparty/chromium/sandbox/linux/system_headers/x86_64_linux_syscalls.h
+@@ -1438,5 +1438,9 @@
+ #define __NR_landlock_restrict_self 446
+ #endif
+ 
++#if !defined(__NR_membarrier)
++#define __NR_membarrier 324
++#endif
++
+ #endif  // SANDBOX_LINUX_SYSTEM_HEADERS_X86_64_LINUX_SYSCALLS_H_
+ 
diff --git a/srcpkgs/qt6-webengine/patches/0101-size_t.patch b/srcpkgs/qt6-webengine/patches/0101-size_t.patch
new file mode 100644
index 000000000000..fccc085da311
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0101-size_t.patch
@@ -0,0 +1,16 @@
+--- a/src/3rdparty/chromium/third_party/angle/include/platform/PlatformMethods.h
++++ b/src/3rdparty/chromium/third_party/angle/include/platform/PlatformMethods.h
+@@ -239,11 +239,11 @@ inline void DefaultOverrideFeaturesMtl(P
+ using ProgramKeyType   = std::array<uint8_t, 20>;
+ using CacheProgramFunc = void (*)(PlatformMethods *platform,
+                                   const ProgramKeyType &key,
+-                                  size_t programSize,
++                                  std::size_t programSize,
+                                   const uint8_t *programBytes);
+ inline void DefaultCacheProgram(PlatformMethods *platform,
+                                 const ProgramKeyType &key,
+-                                size_t programSize,
++                                std::size_t programSize,
+                                 const uint8_t *programBytes)
+ {}
+ 
diff --git a/srcpkgs/qt6-webengine/patches/0102-chromium-90-ruy-include.patch b/srcpkgs/qt6-webengine/patches/0102-chromium-90-ruy-include.patch
new file mode 100644
index 000000000000..bbba579076d6
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0102-chromium-90-ruy-include.patch
@@ -0,0 +1,19 @@
+From 714092f336bb14d2fcc27396ec323b3d843bb962 Mon Sep 17 00:00:00 2001
+From: Stephan Hartmann <stha09@googlemail.com>
+Date: Thu, 4 Mar 2021 15:05:46 +0000
+Subject: [PATCH] IWYU: include limits for std::numeric_limits
+
+---
+ third_party/ruy/src/ruy/block_map.cc | 1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/src/3rdparty/chromium/third_party/ruy/src/ruy/block_map.cc
++++ b/src/3rdparty/chromium/third_party/ruy/src/ruy/block_map.cc
+@@ -17,6 +17,7 @@ limitations under the License.
+ 
+ #include <algorithm>
+ #include <cstdint>
++#include <limits>
+ 
+ #ifdef RUY_MAKEBLOCKMAP_DEBUG
+ #include <cstdio>
diff --git a/srcpkgs/qt6-webengine/patches/0103-chromium-v8-monotonic-pthread-cont_timedwait.patch b/srcpkgs/qt6-webengine/patches/0103-chromium-v8-monotonic-pthread-cont_timedwait.patch
new file mode 100644
index 000000000000..1dc8bc4d3d17
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0103-chromium-v8-monotonic-pthread-cont_timedwait.patch
@@ -0,0 +1,22 @@
+Use monotonic clock for pthread_cond_timedwait with musl too.
+
+--- a/src/3rdparty/chromium/v8/src/base/platform/condition-variable.cc
++++ b/src/3rdparty/chromium/v8/src/base/platform/condition-variable.cc
+@@ -20,7 +20,7 @@ namespace base {
+ 
+ ConditionVariable::ConditionVariable() {
+ #if (V8_OS_FREEBSD || V8_OS_NETBSD || V8_OS_OPENBSD || \
+-     (V8_OS_LINUX && V8_LIBC_GLIBC))
++     V8_OS_LINUX)
+   // On Free/Net/OpenBSD and Linux with glibc we can change the time
+   // source for pthread_cond_timedwait() to use the monotonic clock.
+   pthread_condattr_t attr;
+@@ -96,7 +96,7 @@ bool ConditionVariable::WaitFor(Mutex* m
+       &native_handle_, &mutex->native_handle(), &ts);
+ #else
+ #if (V8_OS_FREEBSD || V8_OS_NETBSD || V8_OS_OPENBSD || \
+-     (V8_OS_LINUX && V8_LIBC_GLIBC))
++     V8_OS_LINUX)
+   // On Free/Net/OpenBSD and Linux with glibc we can change the time
+   // source for pthread_cond_timedwait() to use the monotonic clock.
+   result = clock_gettime(CLOCK_MONOTONIC, &ts);
diff --git a/srcpkgs/qt6-webengine/patches/0104-chromium-revert-9d080c0.patch b/srcpkgs/qt6-webengine/patches/0104-chromium-revert-9d080c0.patch
new file mode 100644
index 000000000000..42b1ee9ec063
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0104-chromium-revert-9d080c0.patch
@@ -0,0 +1,162 @@
+ Original change's description:
+ > Replace 'blacklist' with 'ignorelist' in ./tools/msan/.
+ >
+ > Bug: 1097272, 1097268
+ > Change-Id: Id5c8227a5bfb1ffaec82d3168b609085b10c8297
+ > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2867730
+ > Commit-Queue: Dylan Cutler <dylancutler@google.com>
+ > Reviewed-by: Nico Weber <thakis@chromium.org>
+ > Reviewed-by: Jonathan Metzman <metzman@chromium.org>
+ > Cr-Commit-Position: refs/heads/master@{#883035}
+--- a/src/3rdparty/chromium/build/config/sanitizers/BUILD.gn
++++ b/src/3rdparty/chromium/build/config/sanitizers/BUILD.gn
+@@ -272,11 +272,11 @@ config("asan_flags") {
+   if (is_asan) {
+     cflags += [ "-fsanitize=address" ]
+     if (is_win) {
+-      if (!defined(asan_win_blocklist_path)) {
+-        asan_win_blocklist_path =
++      if (!defined(asan_win_blacklist_path)) {
++        asan_win_blacklist_path =
+             rebase_path("//tools/memory/asan/blocklist_win.txt", root_build_dir)
+       }
+-      cflags += [ "-fsanitize-ignorelist=$asan_win_blocklist_path" ]
++      cflags += [ "-fsanitize-blacklist=$asan_win_blacklist_path" ]
+     }
+   }
+ }
+@@ -306,13 +306,13 @@ config("link_shared_library") {
+ config("cfi_flags") {
+   cflags = []
+   if (is_cfi && current_toolchain == default_toolchain) {
+-    if (!defined(cfi_ignorelist_path)) {
+-      cfi_ignorelist_path =
++    if (!defined(cfi_blacklist_path)) {
++      cfi_blacklist_path =
+           rebase_path("//tools/cfi/ignores.txt", root_build_dir)
+     }
+     cflags += [
+       "-fsanitize=cfi-vcall",
+-      "-fsanitize-ignorelist=$cfi_ignorelist_path",
++      "-fsanitize-blacklist=$cfi_blacklist_path",
+     ]
+ 
+     if (use_cfi_cast) {
+@@ -409,14 +409,14 @@ config("msan_flags") {
+   if (is_msan) {
+     assert(is_linux || is_chromeos,
+            "msan only supported on linux x86_64/ChromeOS")
+-    if (!defined(msan_ignorelist_path)) {
+-      msan_ignorelist_path =
+-          rebase_path("//tools/msan/ignorelist.txt", root_build_dir)
++    if (!defined(msan_blacklist_path)) {
++      msan_blacklist_path =
++          rebase_path("//tools/msan/blacklist.txt", root_build_dir)
+     }
+     cflags = [
+       "-fsanitize=memory",
+       "-fsanitize-memory-track-origins=$msan_track_origins",
+-      "-fsanitize-ignorelist=$msan_ignorelist_path",
++      "-fsanitize-blacklist=$msan_blacklist_path",
+     ]
+   }
+ }
+@@ -424,13 +424,13 @@ config("msan_flags") {
+ config("tsan_flags") {
+   if (is_tsan) {
+     assert(is_linux || is_chromeos, "tsan only supported on linux x86_64")
+-    if (!defined(tsan_ignorelist_path)) {
+-      tsan_ignorelist_path =
++    if (!defined(tsan_blacklist_path)) {
++      tsan_blacklist_path =
+           rebase_path("//tools/memory/tsan_v2/ignores.txt", root_build_dir)
+     }
+     cflags = [
+       "-fsanitize=thread",
+-      "-fsanitize-ignorelist=$tsan_ignorelist_path",
++      "-fsanitize-blacklist=$tsan_blacklist_path",
+     ]
+   }
+ }
+@@ -438,8 +438,8 @@ config("tsan_flags") {
+ config("ubsan_flags") {
+   cflags = []
+   if (is_ubsan) {
+-    if (!defined(ubsan_ignorelist_path)) {
+-      ubsan_ignorelist_path =
++    if (!defined(ubsan_blacklist_path)) {
++      ubsan_blacklist_path =
+           rebase_path("//tools/ubsan/ignorelist.txt", root_build_dir)
+     }
+     cflags += [
+@@ -456,7 +456,7 @@ config("ubsan_flags") {
+       "-fsanitize=signed-integer-overflow",
+       "-fsanitize=unreachable",
+       "-fsanitize=vla-bound",
+-      "-fsanitize-ignorelist=$ubsan_ignorelist_path",
++      "-fsanitize-blacklist=$ubsan_blacklist_path",
+     ]
+     if (!is_clang) {
+       # These exposes too much illegal C++14 code to compile on anything stricter than clang:
+@@ -497,8 +497,8 @@ config("ubsan_no_recover") {
+ 
+ config("ubsan_security_flags") {
+   if (is_ubsan_security) {
+-    if (!defined(ubsan_security_ignorelist_path)) {
+-      ubsan_security_ignorelist_path =
++    if (!defined(ubsan_security_blacklist_path)) {
++      ubsan_security_blacklist_path =
+           rebase_path("//tools/ubsan/security_ignorelist.txt", root_build_dir)
+     }
+     cflags = [
+@@ -506,7 +506,7 @@ config("ubsan_security_flags") {
+       "-fsanitize=shift",
+       "-fsanitize=signed-integer-overflow",
+       "-fsanitize=vla-bound",
+-      "-fsanitize-ignorelist=$ubsan_security_ignorelist_path",
++      "-fsanitize-blacklist=$ubsan_security_blacklist_path",
+     ]
+   }
+ }
+@@ -519,13 +519,13 @@ config("ubsan_null_flags") {
+ 
+ config("ubsan_vptr_flags") {
+   if (is_ubsan_vptr) {
+-    if (!defined(ubsan_vptr_ignorelist_path)) {
+-      ubsan_vptr_ignorelist_path =
++    if (!defined(ubsan_vptr_blacklist_path)) {
++      ubsan_vptr_blacklist_path =
+           rebase_path("//tools/ubsan/vptr_ignorelist.txt", root_build_dir)
+     }
+     cflags = [
+       "-fsanitize=vptr",
+-      "-fsanitize-ignorelist=$ubsan_vptr_ignorelist_path",
++      "-fsanitize-blacklist=$ubsan_vptr_blacklist_path",
+     ]
+     if (!is_clang) {
+       # Clang specific flag:
+--- a/src/3rdparty/chromium/build_overrides/build.gni
++++ b/src/3rdparty/chromium/build_overrides/build.gni
+@@ -43,15 +43,15 @@ declare_args() {
+ # Allows different projects to specify their own suppression/ignore lists for
+ # sanitizer tools.
+ # asan_suppressions_file = "path/to/asan_suppressions.cc"
+-# asan_win_ignorelist_path = "path/to/asan/blocklist_win.txt"
++# asan_win_blacklist_path = "path/to/asan/blocklist_win.txt"
+ # lsan_suppressions_file = "path/to/lsan_suppressions.cc"
+ # tsan_suppressions_file = "path/to/tsan_suppressions.cc"
+-# tsan_ignorelist_path = "path/to/tsan/ignores.txt"
+-# msan_ignorelist_path = "path/to/msan/ignorelist.txt"
+-# ubsan_ignorelist_path = "path/to/ubsan/ignorelist.txt"
+-# ubsan_vptr_ignorelist_path = "path/to/ubsan/vptr_ignorelist.txt"
+-# ubsan_security_ignorelist_path = "path/to/ubsan/security_ignorelist.txt"
+-# cfi_ignorelist_path = "path/to/cfi/ignores.txt"
++# tsan_blacklist_path = "path/to/tsan/ignores.txt"
++# msan_blacklist_path = "path/to/msan/blacklist.txt"
++# ubsan_blacklist_path = "path/to/ubsan/blacklist.txt"
++# ubsan_vptr_blacklist_path = "path/to/ubsan/vptr_blacklist.txt"
++# ubsan_security_blacklist_path = "path/to/ubsan/security_blacklist.txt"
++# cfi_blacklist_path = "path/to/cfi/ignores.txt"
+ 
+ declare_args() {
+   # Android 32-bit non-component, non-clang builds cannot have symbol_level=2
diff --git a/srcpkgs/qt6-webengine/patches/0105-chromium-revert-drop-of-system-java.patch b/srcpkgs/qt6-webengine/patches/0105-chromium-revert-drop-of-system-java.patch
new file mode 100644
index 000000000000..44f3aa8fae5e
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0105-chromium-revert-drop-of-system-java.patch
@@ -0,0 +1,15 @@
+This was dropped for some reason in 6951c37cecd05979b232a39e5c10e6346a0f74ef
+--- a/src/3rdparty/chromium/third_party/closure_compiler/compiler.py
++++ b/src/3rdparty/chromium/third_party/closure_compiler/compiler.py
+@@ -13,8 +13,9 @@ import subprocess
+ 
+ 
+ _CURRENT_DIR = os.path.join(os.path.dirname(__file__))
+-_JAVA_PATH = os.path.join(_CURRENT_DIR, "..", "jdk", "current", "bin", "java")
+-assert os.path.isfile(_JAVA_PATH), "java only allowed in android builds"
++_JAVA_BIN = "java"
++_JDK_PATH = os.path.join(_CURRENT_DIR, "..", "jdk", "current", "bin", "java")
++_JAVA_PATH = _JDK_PATH if os.path.isfile(_JDK_PATH) else _JAVA_BIN
+ 
+ class Compiler(object):
+   """Runs the Closure compiler on given source files to typecheck them
diff --git a/srcpkgs/qt6-webengine/patches/0106-chromium-system-nodejs.patch b/srcpkgs/qt6-webengine/patches/0106-chromium-system-nodejs.patch
new file mode 100644
index 000000000000..1e067cc6eda0
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0106-chromium-system-nodejs.patch
@@ -0,0 +1,20 @@
+--- a/src/3rdparty/chromium/third_party/node/node.py
++++ b/src/3rdparty/chromium/third_party/node/node.py
+@@ -36,11 +36,12 @@ def GetBinaryPath():
+   if platform.system() == 'Darwin' and platform.machine() == 'arm64':
+       return os.path.join(os_path.join(os_path.dirname(__file__), 'mac',
+                           'node-darwin-arm64', 'bin', 'node'))
+-  return os_path.join(os_path.dirname(__file__), *{
+-    'Darwin': ('mac', 'node-darwin-x64', 'bin', 'node'),
+-    'Linux': ('linux', 'node-linux-x64', 'bin', 'node'),
+-    'Windows': ('win', 'node.exe'),
+-  }[platform.system()])
++  return "/usr/bin/node"
++  #return os_path.join(os_path.dirname(__file__), *{
++  #  'Darwin': ('mac', 'node-darwin-x64', 'bin', 'node'),
++  #  'Linux': ('linux', 'node-linux-x64', 'bin', 'node'),
++  #  'Windows': ('win', 'node.exe'),
++  #}[platform.system()])
+ 
+ 
+ def RunNode(cmd_parts, stdout=None):
diff --git a/srcpkgs/qt6-webengine/patches/0107-chromium-cursed^Uscoped_file.patch b/srcpkgs/qt6-webengine/patches/0107-chromium-cursed^Uscoped_file.patch
new file mode 100644
index 000000000000..a8f5d971883d
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0107-chromium-cursed^Uscoped_file.patch
@@ -0,0 +1,18 @@
+--- a/src/3rdparty/chromium/base/files/scoped_file_linux.cc
++++ b/src/3rdparty/chromium/base/files/scoped_file_linux.cc
+@@ -77,15 +77,3 @@ bool IsFDOwned(int fd) {
+ }
+ 
+ }  // namespace base
+-
+-extern "C" {
+-
+-int __close(int);
+-
+-__attribute__((visibility("default"), noinline)) int close(int fd) {
+-  if (base::IsFDOwned(fd) && g_is_ownership_enforced)
+-    CrashOnFdOwnershipViolation();
+-  return __close(fd);
+-}
+-
+-}  // extern "C"
diff --git a/srcpkgs/qt6-webengine/patches/0108-chromium-fix-narrowing-cast.patch b/srcpkgs/qt6-webengine/patches/0108-chromium-fix-narrowing-cast.patch
new file mode 100644
index 000000000000..ed32cd9b7415
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0108-chromium-fix-narrowing-cast.patch
@@ -0,0 +1,53 @@
+--- a/src/3rdparty/chromium/base/files/file_util_linux.cc
++++ b/src/3rdparty/chromium/base/files/file_util_linux.cc
+@@ -23,14 +23,14 @@ bool GetFileSystemType(const FilePath& p
+ 
+   // Not all possible |statfs_buf.f_type| values are in linux/magic.h.
+   // Missing values are copied from the statfs man page.
+-  switch (statfs_buf.f_type) {
++  switch (static_cast<uintmax_t>(statfs_buf.f_type)) {
+     case 0:
+       *type = FILE_SYSTEM_0;
+       break;
+     case EXT2_SUPER_MAGIC:  // Also ext3 and ext4
+     case MSDOS_SUPER_MAGIC:
+     case REISERFS_SUPER_MAGIC:
+-    case static_cast<int>(BTRFS_SUPER_MAGIC):
++    case BTRFS_SUPER_MAGIC:
+     case 0x5346544E:  // NTFS
+     case 0x58465342:  // XFS
+     case 0x3153464A:  // JFS
+@@ -40,14 +40,14 @@ bool GetFileSystemType(const FilePath& p
+       *type = FILE_SYSTEM_NFS;
+       break;
+     case SMB_SUPER_MAGIC:
+-    case static_cast<int>(0xFF534D42):  // CIFS
++    case 0xFF534D42:  // CIFS
+       *type = FILE_SYSTEM_SMB;
+       break;
+     case CODA_SUPER_MAGIC:
+       *type = FILE_SYSTEM_CODA;
+       break;
+-    case static_cast<int>(HUGETLBFS_MAGIC):
+-    case static_cast<int>(RAMFS_MAGIC):
++    case HUGETLBFS_MAGIC:
++    case RAMFS_MAGIC:
+     case TMPFS_MAGIC:
+       *type = FILE_SYSTEM_MEMORY;
+       break;
+--- a/src/3rdparty/chromium/base/system/sys_info_posix.cc
++++ b/src/3rdparty/chromium/base/system/sys_info_posix.cc
+@@ -100,10 +100,10 @@ bool IsStatsZeroIfUnlimited(const base::
+   if (HANDLE_EINTR(statfs(path.value().c_str(), &stats)) != 0)
+     return false;
+ 
+-  switch (stats.f_type) {
++  switch (static_cast<uintmax_t>(stats.f_type)) {
+     case TMPFS_MAGIC:
+-    case static_cast<int>(HUGETLBFS_MAGIC):
+-    case static_cast<int>(RAMFS_MAGIC):
++    case HUGETLBFS_MAGIC:
++    case RAMFS_MAGIC:
+       return true;
+   }
+   return false;
diff --git a/srcpkgs/qt6-webengine/patches/0109-chromium-remove-strip_binary.patch b/srcpkgs/qt6-webengine/patches/0109-chromium-remove-strip_binary.patch
new file mode 100644
index 000000000000..5ebd16e659af
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0109-chromium-remove-strip_binary.patch
@@ -0,0 +1,32 @@
+--- a/src/3rdparty/chromium/chrome/test/chromedriver/BUILD.gn
++++ b/src/3rdparty/chromium/chrome/test/chromedriver/BUILD.gn
+@@ -308,11 +308,7 @@ source_set("lib") {
+   }
+ }
+ 
+-if (is_linux) {
+-  chromedriver_output = "chromedriver.unstripped"
+-} else {
+-  chromedriver_output = "chromedriver"
+-}
++chromedriver_output = "chromedriver"
+ 
+ executable("$chromedriver_output") {
+   testonly = true
+@@ -336,16 +332,6 @@ executable("$chromedriver_output") {
+   }
+ }
+ 
+-if (is_linux) {
+-  strip_binary("chromedriver") {
+-    testonly = true
+-    binary_input = "$root_out_dir/$chromedriver_output"
+-    symbol_output = "$root_out_dir/chromedriver.debug"
+-    stripped_binary_output = "$root_out_dir/chromedriver"
+-    deps = [ ":$chromedriver_output" ]
+-  }
+-}
+-
+ python_library("chromedriver_py_tests") {
+   testonly = true
+   deps = [
diff --git a/srcpkgs/qt6-webengine/patches/0110-chromium-revert-use-ffile-compilation-dir.patch b/srcpkgs/qt6-webengine/patches/0110-chromium-revert-use-ffile-compilation-dir.patch
new file mode 100644
index 000000000000..a00f7ea80f7a
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0110-chromium-revert-use-ffile-compilation-dir.patch
@@ -0,0 +1,57 @@
+From 34a955823630096f5b01c2b01d51c1ea59d22763 Mon Sep 17 00:00:00 2001
+From: Zequan Wu <zequanwu@google.com>
+Date: Tue, 20 Jul 2021 14:13:50 +0000
+Subject: [PATCH] Use -ffile-compilation-dir= instead of
+ -fdebug-compilation-dir=
+
+Bug: 1010267
+Change-Id: If2b4ead8535a76490eb466a38e3d8fed6ea91079
+Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2770738
+Auto-Submit: Zequan Wu <zequanwu@google.com>
+Commit-Queue: Nico Weber <thakis@chromium.org>
+Reviewed-by: Nico Weber <thakis@chromium.org>
+Cr-Commit-Position: refs/heads/master@{#903456}
+--- a/src/3rdparty/chromium/build/config/compiler/BUILD.gn
++++ b/src/3rdparty/chromium/build/config/compiler/BUILD.gn
+@@ -1269,19 +1269,12 @@ config("compiler_deterministic") {
+     # different build directory like "out/feature_a" and "out/feature_b" if
+     # we build same files with same compile flag.
+     # Other paths are already given in relative, no need to normalize them.
+-    if (is_nacl) {
+-      # TODO(https://crbug.com/1231236): Use -ffile-compilation-dir= here.
+-      cflags += [
+-        "-Xclang",
+-        "-fdebug-compilation-dir",
+-        "-Xclang",
+-        ".",
+-      ]
+-    } else {
+-      # -ffile-compilation-dir is an alias for both -fdebug-compilation-dir=
+-      # and -fcoverage-compilation-dir=.
+-      cflags += [ "-ffile-compilation-dir=." ]
+-    }
++    cflags += [
++      "-Xclang",
++      "-fdebug-compilation-dir",
++      "-Xclang",
++      ".",
++    ]
+     if (!is_win) {
+       # We don't use clang -cc1as on Windows (yet? https://crbug.com/762167)
+       asmflags = [ "-Wa,-fdebug-compilation-dir,." ]
+--- a/src/3rdparty/chromium/build/config/compiler/compiler.gni
++++ b/src/3rdparty/chromium/build/config/compiler/compiler.gni
+@@ -228,8 +228,11 @@ declare_args() {
+ # deterministic builds to reduce compile times, so this is less relevant for
+ # official builders.
+ strip_absolute_paths_from_debug_symbols_default =
+-    is_android || is_fuchsia || is_nacl || (is_win && use_lld) || is_linux ||
+-    is_chromeos || (is_apple && !enable_dsyms)
++    # TODO(crbug.com/1010267): remove '!use_clang_coverage', coverage build has
++    # dependency to absolute path of source files.
++    !use_clang_coverage &&
++    (is_android || is_fuchsia || is_nacl || (is_win && use_lld) || is_linux ||
++     is_chromeos || (is_apple && !enable_dsyms))
+ 
+ declare_args() {
+   strip_absolute_paths_from_debug_symbols = strip_absolute_paths_from_debug_symbols_default
diff --git a/srcpkgs/qt6-webengine/patches/0111-chromium-no-Wno-stringop-overread.patch b/srcpkgs/qt6-webengine/patches/0111-chromium-no-Wno-stringop-overread.patch
new file mode 100644
index 000000000000..03eac3f8e067
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0111-chromium-no-Wno-stringop-overread.patch
@@ -0,0 +1,10 @@
+--- a/src/3rdparty/chromium/build/config/compiler/BUILD.gn
++++ b/src/3rdparty/chromium/build/config/compiler/BUILD.gn
+@@ -394,7 +394,6 @@ config("compiler") {
+         "-Wno-parentheses",
+         "-Wno-sign-compare", # fido
+         "-Wno-stringop-overflow", # skia, libaom, protobuf, icu
+-        "-Wno-stringop-overread", # libaom
+         "-Wno-psabi", # skia
+         "-Wno-multichar", # crashpad
+         "-Wno-format-zero-length", # user_agent.cc
diff --git a/srcpkgs/qt6-webengine/patches/0150-chromium-glibc-libc_malloc.patch b/srcpkgs/qt6-webengine/patches/0150-chromium-glibc-libc_malloc.patch
new file mode 100644
index 000000000000..7e1b66e5c73d
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0150-chromium-glibc-libc_malloc.patch
@@ -0,0 +1,24 @@
+--- a/src/3rdparty/chromium/base/process/memory_linux.cc
++++ b/src/3rdparty/chromium/base/process/memory_linux.cc
+@@ -23,6 +23,12 @@
+ #include "third_party/tcmalloc/chromium/src/gperftools/tcmalloc.h"
+ #endif
+ 
++#if defined(LIBC_GLIBC)
++extern "C" {
++extern void *__libc_malloc(size_t size);
++}
++#endif
++
+ namespace base {
+ 
+ namespace {
+@@ -120,7 +126,7 @@ bool UncheckedMalloc(size_t size, void**
+     (!defined(LIBC_GLIBC) && !BUILDFLAG(USE_TCMALLOC))
+   *result = malloc(size);
+ #elif defined(LIBC_GLIBC) && !BUILDFLAG(USE_TCMALLOC)
+-  *result = __libc_malloc(size);
++  *result = ::__libc_malloc(size);
+ #elif BUILDFLAG(USE_TCMALLOC)
+   *result = tc_malloc_skip_new_handler(size);
+ #endif
diff --git a/srcpkgs/qt6-webengine/patches/0200-chromium-musl-include-sys-reg.h-to-get-__WORDSIZE.patch b/srcpkgs/qt6-webengine/patches/0200-chromium-musl-include-sys-reg.h-to-get-__WORDSIZE.patch
new file mode 100644
index 000000000000..41b90071b5e4
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0200-chromium-musl-include-sys-reg.h-to-get-__WORDSIZE.patch
@@ -0,0 +1,21 @@
+From 9001c54d6b974449174a8cee8f3f5d78a9bd6c9e Mon Sep 17 00:00:00 2001
+From: Felix Janda <felix.janda@posteo.de>
+Date: Sun, 1 Feb 2015 14:26:52 +0100
+Subject: [PATCH 3/6] include <sys/reg.h> to get __WORDSIZE on musl libc
+
+---
+ qtwebengine/src/3rdparty/chromium/third_party/breakpad/breakpad/src/common/linux/elf_core_dump.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/common/linux/elf_core_dump.h
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/common/linux/elf_core_dump.h
+@@ -37,6 +37,9 @@
+ #include <limits.h>
+ #include <link.h>
+ #include <stddef.h>
++#ifndef __GLIBC__
++#include <sys/reg.h>
++#endif
+ 
+ #include "common/memory_range.h"
+ 
diff --git a/srcpkgs/qt6-webengine/patches/0201-chromium-musl-dispatch-to-musl.patch b/srcpkgs/qt6-webengine/patches/0201-chromium-musl-dispatch-to-musl.patch
new file mode 100644
index 000000000000..a58a688a4b55
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0201-chromium-musl-dispatch-to-musl.patch
@@ -0,0 +1,103 @@
+--- a/src/3rdparty/chromium/base/allocator/allocator_shim_default_dispatch_to_glibc.cc
++++ b/src/3rdparty/chromium/base/allocator/allocator_shim_default_dispatch_to_glibc.cc
+@@ -8,6 +8,7 @@
+ #include <dlfcn.h>
+ #include <malloc.h>
+ 
++#if defined(__GLIBC__)
+ // This translation unit defines a default dispatch for the allocator shim which
+ // routes allocations to libc functions.
+ // The code here is strongly inspired from tcmalloc's libc_override_glibc.h.
+@@ -87,3 +88,92 @@ const AllocatorDispatch AllocatorDispatc
+     nullptr,               /* aligned_free_function */
+     nullptr,               /* next */
+ };
++
++#else // defined(__GLIBC__)
++
++#include <dlfcn.h>
++
++extern "C" {
++// Declare function pointers to the memory functions
++typedef void* (*t_libc_malloc)(size_t size);
++typedef void* (*t_libc_calloc)(size_t n, size_t size);
++typedef void* (*t_libc_realloc)(void* address, size_t size);
++typedef void* (*t_libc_memalign)(size_t alignment, size_t size);
++typedef void (*t_libc_free)(void* ptr);
++typedef size_t (*t_libc_malloc_usable_size)(void* ptr);
++
++// Static instances of pointers to libc.so dl symbols
++static t_libc_malloc libc_malloc = NULL;
++static t_libc_calloc libc_calloc = NULL;
++static t_libc_realloc libc_realloc = NULL;
++static t_libc_memalign libc_memalign = NULL;
++static t_libc_free libc_free = NULL;
++static t_libc_malloc_usable_size libc_malloc_usable_size = NULL;
++
++// resolve the symbols in libc.so
++void musl_libc_memory_init(void)
++{
++  libc_malloc = (t_libc_malloc) dlsym(RTLD_NEXT, "malloc");
++  libc_calloc = (t_libc_calloc) dlsym(RTLD_NEXT, "calloc");
++  libc_realloc = (t_libc_realloc) dlsym(RTLD_NEXT, "realloc");
++  libc_memalign = (t_libc_memalign) dlsym(RTLD_NEXT, "memalign");
++  libc_free = (t_libc_free) dlsym(RTLD_NEXT, "free");
++  libc_malloc_usable_size = (t_libc_malloc_usable_size) dlsym(RTLD_NEXT, "malloc_usable_size");
++}
++}  // extern "C"
++
++namespace {
++
++using base::allocator::AllocatorDispatch;
++
++void* MuslMalloc(const AllocatorDispatch*, size_t size, void* context) {
++  if (!libc_malloc)
++    musl_libc_memory_init();
++  return (*libc_malloc)(size);
++}
++
++void* MuslCalloc(const AllocatorDispatch*, size_t n, size_t size, void* context) {
++  if (!libc_calloc)
++    musl_libc_memory_init();
++  return (*libc_calloc)(n, size);
++}
++
++void* MuslRealloc(const AllocatorDispatch*, void* address, size_t size, void* context) {
++  if (!libc_realloc)
++    musl_libc_memory_init();
++  return (*libc_realloc)(address, size);
++}
++
++void* MuslMemalign(const AllocatorDispatch*, size_t alignment, size_t size, void* context) {
++  if (!libc_memalign)
++    musl_libc_memory_init();
++  return (*libc_memalign)(alignment, size);
++}
++
++void MuslFree(const AllocatorDispatch*, void* address, void* context) {
++  if (!libc_free)
++    musl_libc_memory_init();
++  (*libc_free)(address);
++}
++
++size_t MuslGetSizeEstimate(const AllocatorDispatch*, void* address, void* context) {
++  // TODO(siggi, primiano): malloc_usable_size may need redirection in the
++  //     presence of interposing shims that divert allocations.
++  if (!libc_malloc_usable_size)
++    musl_libc_memory_init();
++  return (*libc_malloc_usable_size)(address);
++}
++
++}  // namespace
++
++const AllocatorDispatch AllocatorDispatch::default_dispatch = {
++    &MuslMalloc,           /* alloc_function */
++    &MuslCalloc,           /* alloc_zero_initialized_function */
++    &MuslMemalign,         /* alloc_aligned_function */
++    &MuslRealloc,          /* realloc_function */
++    &MuslFree,             /* free_function */
++    &MuslGetSizeEstimate,  /* get_size_estimate_function */
++    nullptr,               /* next */
++};
++
++#endif
diff --git a/srcpkgs/qt6-webengine/patches/0202-chromium-musl-no-mallinfo.patch b/srcpkgs/qt6-webengine/patches/0202-chromium-musl-no-mallinfo.patch
new file mode 100644
index 000000000000..a5bdb5a43a5f
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0202-chromium-musl-no-mallinfo.patch
@@ -0,0 +1,62 @@
+--- a/src/3rdparty/chromium/base/process/process_metrics_posix.cc
++++ b/src/3rdparty/chromium/base/process/process_metrics_posix.cc
+@@ -105,7 +105,7 @@ void IncreaseFdLimitTo(unsigned int max_
+ 
+ #endif  // !defined(OS_FUCHSIA)
+ 
+-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID)
++#if (defined(OS_LINUX) && defined(__GLIBC__)) || defined(OS_CHROMEOS) || defined(OS_ANDROID)
+ namespace {
+ 
+ size_t GetMallocUsageMallinfo() {
+@@ -127,16 +127,16 @@ size_t GetMallocUsageMallinfo() {
+ }
+ 
+ }  // namespace
+-#endif  // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID)
++#endif  // (defined(OS_LINUX) && defined(__GLIBC__)) || defined(OS_CHROMEOS) || defined(OS_ANDROID)
+ 
+ size_t ProcessMetrics::GetMallocUsage() {
+ #if defined(OS_APPLE)
+   malloc_statistics_t stats = {0};
+   malloc_zone_statistics(nullptr, &stats);
+   return stats.size_in_use;
+-#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID)
++#elif (defined(OS_LINUX) && defined(__GLIBC__)) || defined(OS_CHROMEOS) || defined(OS_ANDROID)
+   return GetMallocUsageMallinfo();
+-#elif defined(OS_FUCHSIA)
++#else
+   // TODO(fuchsia): Not currently exposed. https://crbug.com/735087.
+   return 0;
+ #endif
+--- a/src/3rdparty/chromium/third_party/tflite/src/tensorflow/lite/profiling/memory_info.cc
++++ b/src/3rdparty/chromium/third_party/tflite/src/tensorflow/lite/profiling/memory_info.cc
+@@ -27,7 +27,7 @@ namespace memory {
+ const int MemoryUsage::kValueNotSet = 0;
+ 
+ bool MemoryUsage::IsSupported() {
+-#ifdef __linux__
++#ifdef __GLIBC__
+   return true;
+ #endif
+   return false;
+@@ -35,7 +35,7 @@ bool MemoryUsage::IsSupported() {
+ 
+ MemoryUsage GetMemoryUsage() {
+   MemoryUsage result;
+-#ifdef __linux__
++#ifdef __GLIBC__
+   rusage res;
+   if (getrusage(RUSAGE_SELF, &res) == 0) {
+     result.max_rss_kb = res.ru_maxrss;
+--- a/src/3rdparty/chromium/base/trace_event/malloc_dump_provider.cc
++++ b/src/3rdparty/chromium/base/trace_event/malloc_dump_provider.cc
+@@ -213,7 +213,7 @@ bool MallocDumpProvider::OnMemoryDump(co
+                      &allocated_objects_count);
+ #elif defined(OS_FUCHSIA)
+ // TODO(fuchsia): Port, see https://crbug.com/706592.
+-#else
++#elif defined(__GLIBC__)
+ #if defined(__GLIBC__) && defined(__GLIBC_PREREQ)
+ #if __GLIBC_PREREQ(2, 33)
+ #define MALLINFO2_FOUND_IN_LIBC
diff --git a/srcpkgs/qt6-webengine/patches/0203-chromium-musl-siginfo_t.patch b/srcpkgs/qt6-webengine/patches/0203-chromium-musl-siginfo_t.patch
new file mode 100644
index 000000000000..43ef7fd7c5d2
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0203-chromium-musl-siginfo_t.patch
@@ -0,0 +1,18 @@
+There's a subtle difference in the internal name of siginfo_t fields
+between glibc and musl. The structure itself is equivalent, so it
+should suffice to add a macro to rename the field.
+
+--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf/trap.cc
++++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf/trap.cc
+@@ -174,7 +174,11 @@ void Trap::SigSys(int nr, LinuxSigInfo*
+   // If the version of glibc doesn't include this information in
+   // siginfo_t (older than 2.17), we need to explicitly copy it
+   // into an arch_sigsys structure.
++#if defined(__GLIBC__)
+   memcpy(&sigsys, &info->_sifields, sizeof(sigsys));
++#else
++  memcpy(&sigsys, &info->__si_fields, sizeof(sigsys));
++#endif
+ #endif
+ 
+ #if defined(__mips__)
diff --git a/srcpkgs/qt6-webengine/patches/0204-chromium-musl-stackstart.patch b/srcpkgs/qt6-webengine/patches/0204-chromium-musl-stackstart.patch
new file mode 100644
index 000000000000..b03cf43b86db
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0204-chromium-musl-stackstart.patch
@@ -0,0 +1,20 @@
+--- a/src/3rdparty/chromium/third_party/blink/renderer/platform/wtf/stack_util.cc
++++ b/src/3rdparty/chromium/third_party/blink/renderer/platform/wtf/stack_util.cc
+@@ -29,7 +29,7 @@ size_t GetUnderestimatedStackSize() {
+ // FIXME: On Mac OSX and Linux, this method cannot estimate stack size
+ // correctly for the main thread.
+ 
+-#elif defined(__GLIBC__) || defined(OS_ANDROID) || defined(OS_FREEBSD) || \
++#elif defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FREEBSD) || \
+     defined(OS_FUCHSIA)
+   // pthread_getattr_np() can fail if the thread is not invoked by
+   // pthread_create() (e.g., the main thread of blink_unittests).
+@@ -97,7 +97,7 @@ return Threading::ThreadStackSize();
+ }
+ 
+ void* GetStackStart() {
+-#if defined(__GLIBC__) || defined(OS_ANDROID) || defined(OS_FREEBSD) || \
++#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FREEBSD) || \
+     defined(OS_FUCHSIA)
+   pthread_attr_t attr;
+   int error;
diff --git a/srcpkgs/qt6-webengine/patches/0205-chromium-musl-sandbox.patch b/srcpkgs/qt6-webengine/patches/0205-chromium-musl-sandbox.patch
new file mode 100644
index 000000000000..772a578fd823
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0205-chromium-musl-sandbox.patch
@@ -0,0 +1,92 @@
+--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc
++++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc
+@@ -138,7 +138,7 @@ namespace sandbox {
+ // present (as in newer versions of posix_spawn).
+ ResultExpr RestrictCloneToThreadsAndEPERMFork() {
+   const Arg<unsigned long> flags(0);
+-
++#if defined(__GLIBC__)
+   // TODO(mdempsky): Extend DSL to support (flags & ~mask1) == mask2.
+   const uint64_t kAndroidCloneMask = CLONE_VM | CLONE_FS | CLONE_FILES |
+                                      CLONE_SIGHAND | CLONE_THREAD |
+@@ -165,6 +165,17 @@ ResultExpr RestrictCloneToThreadsAndEPER
+   return If(IsAndroid() ? android_test : glibc_test, Allow())
+       .ElseIf(is_fork_or_clone_vfork, Error(EPERM))
+       .Else(CrashSIGSYSClone());
++#else
++  const int required = CLONE_VM | CLONE_FS | CLONE_FILES | CLONE_SIGHAND |
++                       CLONE_THREAD | CLONE_SYSVSEM;
++  const int safe = CLONE_SETTLS | CLONE_PARENT_SETTID | CLONE_CHILD_CLEARTID |
++                   CLONE_DETACHED;
++  const BoolExpr thread_clone_ok = (flags&~safe)==required;
++
++  return If(thread_clone_ok, Allow())
++      .ElseIf((flags & (CLONE_VM | CLONE_THREAD)) == 0, Error(EPERM))
++      .Else(CrashSIGSYSClone());
++#endif
+ }
+ 
+ #ifndef PR_PAC_RESET_KEYS
+--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
++++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
+@@ -419,6 +419,9 @@ bool SyscallSets::IsAllowedProcessStartO
+ #if defined(__i386__)
+     case __NR_waitpid:
+ #endif
++#if !defined(__GLIBC__)
++    case __NR_set_tid_address:
++#endif
+       return true;
+     case __NR_clone:  // Should be parameter-restricted.
+     case __NR_setns:  // Privileged.
+@@ -431,7 +434,9 @@ bool SyscallSets::IsAllowedProcessStartO
+ #if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
+     case __NR_set_thread_area:
+ #endif
++#if defined(__GLIBC__)
+     case __NR_set_tid_address:
++#endif
+     case __NR_unshare:
+ #if !defined(__mips__) && !defined(__aarch64__)
+     case __NR_vfork:
+@@ -545,6 +550,9 @@ bool SyscallSets::IsAllowedAddressSpaceA
+     case __NR_mlock:
+     case __NR_munlock:
+     case __NR_munmap:
++#if !defined(__GLIBC__)
++    case __NR_mremap:
++#endif
+       return true;
+     case __NR_madvise:
+     case __NR_mincore:
+@@ -562,7 +570,9 @@ bool SyscallSets::IsAllowedAddressSpaceA
+     case __NR_modify_ldt:
+ #endif
+     case __NR_mprotect:
++#if defined(__GLIBC__)
+     case __NR_mremap:
++#endif
+     case __NR_msync:
+     case __NR_munlockall:
+     case __NR_readahead:
+--- a/src/3rdparty/chromium/sandbox/policy/linux/bpf_renderer_policy_linux.cc
++++ b/src/3rdparty/chromium/sandbox/policy/linux/bpf_renderer_policy_linux.cc
+@@ -97,11 +97,18 @@ ResultExpr RendererProcessPolicy::Evalua
+     case __NR_sysinfo:
+     case __NR_times:
+     case __NR_uname:
++#if !defined(__GLIBC__)
++    case __NR_sched_getparam:
++    case __NR_sched_getscheduler:
++    case __NR_sched_setscheduler:
++#endif
+       return Allow();
+     case __NR_sched_getaffinity:
++#if defined(__GLIBC__)
+     case __NR_sched_getparam:
+     case __NR_sched_getscheduler:
+     case __NR_sched_setscheduler:
++#endif
+       return RestrictSchedTarget(GetPolicyPid(), sysno);
+     case __NR_prlimit64:
+       // See crbug.com/662450 and setrlimit comment above.
diff --git a/srcpkgs/qt6-webengine/patches/0206-chromium-musl-default-stacksize.patch b/srcpkgs/qt6-webengine/patches/0206-chromium-musl-default-stacksize.patch
new file mode 100644
index 000000000000..bc07495b8144
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0206-chromium-musl-default-stacksize.patch
@@ -0,0 +1,15 @@
+--- a/src/3rdparty/chromium/base/threading/platform_thread_linux.cc
++++ b/src/3rdparty/chromium/base/threading/platform_thread_linux.cc
+@@ -439,7 +439,12 @@ void TerminateOnThread() {}
+ 
+ size_t GetDefaultThreadStackSize(const pthread_attr_t& attributes) {
+ #if !defined(THREAD_SANITIZER)
++#if defined(__GLIBC__)
+   return 0;
++#else // defined(__GLIBC__)
++  // For Musl libc try with a default stack size of 2 MiB
++  return 2 * 1024 * 1024;
++#endif // !defined(__GLIBC__)
+ #else
+   // ThreadSanitizer bloats the stack heavily. Evidence has been that the
+   // default stack size isn't enough for some browser tests.
diff --git a/srcpkgs/qt6-webengine/patches/0208-chromium-musl-execinfo.patch b/srcpkgs/qt6-webengine/patches/0208-chromium-musl-execinfo.patch
new file mode 100644
index 000000000000..9f3b964676b3
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0208-chromium-musl-execinfo.patch
@@ -0,0 +1,125 @@
+--- a/src/3rdparty/chromium/base/debug/stack_trace.cc
++++ b/src/3rdparty/chromium/base/debug/stack_trace.cc
+@@ -252,7 +252,9 @@ void StackTrace::Print() const {
+ }
+ 
+ void StackTrace::OutputToStream(std::ostream* os) const {
++#if defined(__GLIBC__) && !defined(_AIX)
+   OutputToStreamWithPrefix(os, nullptr);
++#endif
+ }
+ 
+ std::string StackTrace::ToString() const {
+@@ -260,7 +262,7 @@ std::string StackTrace::ToString() const
+ }
+ std::string StackTrace::ToStringWithPrefix(const char* prefix_string) const {
+   std::stringstream stream;
+-#if !defined(__UCLIBC__) && !defined(_AIX)
++#if defined(__GLIBC__) && !defined(_AIX)
+   OutputToStreamWithPrefix(&stream, prefix_string);
+ #endif
+   return stream.str();
+--- a/src/3rdparty/chromium/base/debug/stack_trace_posix.cc
++++ b/src/3rdparty/chromium/base/debug/stack_trace_posix.cc
+@@ -27,7 +27,7 @@
+ #if !defined(USE_SYMBOLIZE)
+ #include <cxxabi.h>
+ #endif
+-#if !defined(__UCLIBC__) && !defined(_AIX)
++#if defined(__GLIBC__) && !defined(_AIX)
+ #include <execinfo.h>
+ #endif
+ 
+@@ -89,7 +89,7 @@ void DemangleSymbols(std::string* text)
+   // Note: code in this function is NOT async-signal safe (std::string uses
+   // malloc internally).
+ 
+-#if !defined(__UCLIBC__) && !defined(_AIX)
++#if defined(__GLIBC__) && !defined(_AIX)
+   std::string::size_type search_from = 0;
+   while (search_from < text->size()) {
+     // Look for the start of a mangled symbol, from search_from.
+@@ -124,7 +124,7 @@ void DemangleSymbols(std::string* text)
+       search_from = mangled_start + 2;
+     }
+   }
+-#endif  // !defined(__UCLIBC__) && !defined(_AIX)
++#endif  // !defined(__GLIBC__) && !defined(_AIX)
+ }
+ #endif  // !defined(USE_SYMBOLIZE)
+ 
+@@ -136,7 +136,7 @@ class BacktraceOutputHandler {
+   virtual ~BacktraceOutputHandler() = default;
+ };
+ 
+-#if !defined(__UCLIBC__) && !defined(_AIX)
++#if defined(__GLIBC__) && !defined(_AIX)
+ void OutputPointer(void* pointer, BacktraceOutputHandler* handler) {
+   // This should be more than enough to store a 64-bit number in hex:
+   // 16 hex digits + 1 for null-terminator.
+@@ -219,7 +219,7 @@ void ProcessBacktrace(void* const* trace
+   }
+ #endif  // defined(USE_SYMBOLIZE)
+ }
+-#endif  // !defined(__UCLIBC__) && !defined(_AIX)
++#endif  // !defined(__GLIBC__) && !defined(_AIX)
+ 
+ void PrintToStderr(const char* output) {
+   // NOTE: This code MUST be async-signal safe (it's used by in-process
+@@ -839,7 +839,7 @@ size_t CollectStackTrace(void** trace, s
+   // If we do not have unwind tables, then try tracing using frame pointers.
+   return base::debug::TraceStackFramePointers(const_cast<const void**>(trace),
+                                               count, 0);
+-#elif !defined(__UCLIBC__) && !defined(_AIX)
++#elif defined(__GLIBC__) && !defined(_AIX)
+   // Though the backtrace API man page does not list any possible negative
+   // return values, we take no chance.
+   return base::saturated_cast<size_t>(backtrace(trace, count));
+@@ -852,13 +852,13 @@ void StackTrace::PrintWithPrefix(const c
+ // NOTE: This code MUST be async-signal safe (it's used by in-process
+ // stack dumping signal handler). NO malloc or stdio is allowed here.
+ 
+-#if !defined(__UCLIBC__) && !defined(_AIX)
++#if defined(__GLIBC__) && !defined(_AIX)
+   PrintBacktraceOutputHandler handler;
+   ProcessBacktrace(trace_, count_, prefix_string, &handler);
+ #endif
+ }
+ 
+-#if !defined(__UCLIBC__) && !defined(_AIX)
++#if defined(__GLIBC__) && !defined(_AIX)
+ void StackTrace::OutputToStreamWithPrefix(std::ostream* os,
+                                           const char* prefix_string) const {
+   StreamBacktraceOutputHandler handler(os);
+--- a/src/3rdparty/chromium/base/logging.cc
++++ b/src/3rdparty/chromium/base/logging.cc
+@@ -582,7 +582,7 @@ LogMessage::LogMessage(const char* file,
+ 
+ LogMessage::~LogMessage() {
+   size_t stack_start = stream_.tellp();
+-#if !defined(OFFICIAL_BUILD) && !defined(OS_NACL) && !defined(__UCLIBC__) && \
++#if !defined(OFFICIAL_BUILD) && !defined(OS_NACL) && defined(__GLIBC__) && \
+     !defined(OS_AIX)
+   if (severity_ == LOGGING_FATAL && !base::debug::BeingDebugged()) {
+     // Include a stack trace on a fatal, unless a debugger is attached.
+--- 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 @@
+ 
+ #if defined(DEBUG) && defined(V8_OS_LINUX) && !defined(V8_OS_ANDROID)
+ #define SYMBOLIZE_FUNCTION
++#if defined(__GLIBC__)
+ #include <execinfo.h>
++#endif
+ 
+ #include <vector>
+ 
+@@ -103,7 +105,7 @@ void ExternalReferenceTable::Init(Isolat
+ }
+ 
+ const char* ExternalReferenceTable::ResolveSymbol(void* address) {
+-#ifdef SYMBOLIZE_FUNCTION
++#if defined(SYMBOLIZE_FUNCTION) && defined(__GLIBC__)
+   char** names = backtrace_symbols(&address, 1);
+   const char* name = names[0];
+   // The array of names is malloc'ed. However, each name string is static
diff --git a/srcpkgs/qt6-webengine/patches/0209-chromium-musl-thread-stacksize.patch b/srcpkgs/qt6-webengine/patches/0209-chromium-musl-thread-stacksize.patch
new file mode 100644
index 000000000000..4b760a428b25
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0209-chromium-musl-thread-stacksize.patch
@@ -0,0 +1,22 @@
+--- a/src/3rdparty/chromium/ppapi/utility/threading/simple_thread.cc
++++ b/src/3rdparty/chromium/ppapi/utility/threading/simple_thread.cc
+@@ -13,7 +13,7 @@ namespace pp {
+ namespace {
+ 
+ // Use 2MB default stack size for Native Client, otherwise use system default.
+-#if defined(__native_client__)
++#if defined(__native_client__) || !defined(__GLIBC__)
+ const size_t kDefaultStackSize = 2 * 1024 * 1024;
+ #else
+ const size_t kDefaultStackSize = 0;
+--- a/src/3rdparty/chromium/v8/src/base/platform/platform-posix.cc
++++ b/src/3rdparty/chromium/v8/src/base/platform/platform-posix.cc
+@@ -883,7 +883,7 @@ bool Thread::Start() {
+ #if V8_OS_MACOSX
+     // Default on Mac OS X is 512kB -- bump up to 1MB
+     stack_size = 1 * 1024 * 1024;
+-#elif V8_OS_AIX
++#elif V8_OS_AIX || !defined(__GLIBC__)
+     // Default on AIX is 96kB -- bump up to 2MB
+     stack_size = 2 * 1024 * 1024;
+ #endif
diff --git a/srcpkgs/qt6-webengine/patches/0210-chromium-musl-msgvec-push_back.patch b/srcpkgs/qt6-webengine/patches/0210-chromium-musl-msgvec-push_back.patch
new file mode 100644
index 000000000000..905daa223700
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0210-chromium-musl-msgvec-push_back.patch
@@ -0,0 +1,14 @@
+--- a/src/3rdparty/chromium/net/socket/udp_socket_posix.cc
++++ b/src/3rdparty/chromium/net/socket/udp_socket_posix.cc
+@@ -1162,7 +1162,11 @@ SendResult UDPSocketPosixSender::Interna
+     msg_iov->push_back({const_cast<char*>(buffer->data()), buffer->length()});
+   msgvec->reserve(buffers.size());
+   for (size_t j = 0; j < buffers.size(); j++)
++#if defined(__GLIBC__)
+     msgvec->push_back({{nullptr, 0, &msg_iov[j], 1, nullptr, 0, 0}, 0});
++#else
++    msgvec->push_back({{nullptr, 0, &msg_iov[j], 1, 0, 0, 0}, 0});
++#endif
+   int result = HANDLE_EINTR(Sendmmsg(fd, &msgvec[0], buffers.size(), 0));
+   SendResult send_result(0, 0, std::move(buffers));
+   if (result < 0) {
diff --git a/srcpkgs/qt6-webengine/patches/0211-chromium-musl-canonicalize-file-name-musl.patch b/srcpkgs/qt6-webengine/patches/0211-chromium-musl-canonicalize-file-name-musl.patch
new file mode 100644
index 000000000000..d43e6bd488bc
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0211-chromium-musl-canonicalize-file-name-musl.patch
@@ -0,0 +1,11 @@
+--- a/src/3rdparty/chromium/third_party/nasm/nasmlib/realpath.c
++++ b/src/3rdparty/chromium/third_party/nasm/nasmlib/realpath.c
+@@ -55,7 +55,7 @@
+  */
+ char *nasm_realpath(const char *rel_path)
+ {
+-    char *rp = canonicalize_file_name(rel_path);
++    char *rp = realpath(rel_path, NULL);
+     return rp ? rp : nasm_strdup(rel_path);
+ }
+ 
diff --git a/srcpkgs/qt6-webengine/patches/0212-chromium-musl-no-getcontext.patch b/srcpkgs/qt6-webengine/patches/0212-chromium-musl-no-getcontext.patch
new file mode 100644
index 000000000000..5755f1b45a7d
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0212-chromium-musl-no-getcontext.patch
@@ -0,0 +1,29 @@
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc
+@@ -489,8 +489,10 @@ bool ExceptionHandler::SimulateSignalDel
+   // ExceptionHandler::HandleSignal().
+   siginfo.si_code = SI_USER;
+   siginfo.si_pid = getpid();
+-  ucontext_t context;
++  ucontext_t context = { 0 };
++#if defined(__GLIBC__)
+   getcontext(&context);
++#endif
+   return HandleSignal(sig, &siginfo, &context);
+ }
+ 
+@@ -675,9 +677,14 @@ bool ExceptionHandler::WriteMinidump() {
+   sys_prctl(PR_SET_DUMPABLE, 1, 0, 0, 0);
+ 
+   CrashContext context;
++
++#if defined(__GLIBC__)
+   int getcontext_result = getcontext(&context.context);
+   if (getcontext_result)
+     return false;
++#else
++  return false;
++#endif
+ 
+ #if defined(__i386__)
+   // In CPUFillFromUContext in minidumpwriter.cc the stack pointer is retrieved
diff --git a/srcpkgs/qt6-webengine/patches/0213-chromium-musl-crashpad.patch b/srcpkgs/qt6-webengine/patches/0213-chromium-musl-crashpad.patch
new file mode 100644
index 000000000000..71bbad2af17e
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0213-chromium-musl-crashpad.patch
@@ -0,0 +1,24 @@
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/compat/linux/sys/ptrace.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/compat/linux/sys/ptrace.h
+@@ -17,7 +17,9 @@
+ 
+ #include_next <sys/ptrace.h>
+ 
++#ifdef __GLIBC__
+ #include <sys/cdefs.h>
++#endif
+ 
+ // https://sourceware.org/bugzilla/show_bug.cgi?id=22433
+ #if !defined(PTRACE_GET_THREAD_AREA) && !defined(PT_GET_THREAD_AREA) && \
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/util/linux/ptracer.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/util/linux/ptracer.cc
+@@ -26,6 +26,9 @@
+ 
+ #if defined(ARCH_CPU_X86_FAMILY)
+ #include <asm/ldt.h>
++#if !defined(__GLIBC__)
++#include <asm/ptrace-abi.h>
++#endif
+ #endif
+ 
+ namespace crashpad {
diff --git a/srcpkgs/qt6-webengine/patches/0214-chromium-musl-fixes.patch b/srcpkgs/qt6-webengine/patches/0214-chromium-musl-fixes.patch
new file mode 100644
index 000000000000..55b267ed1714
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0214-chromium-musl-fixes.patch
@@ -0,0 +1,108 @@
+--- a/src/3rdparty/chromium/sandbox/linux/suid/process_util.h
++++ b/src/3rdparty/chromium/sandbox/linux/suid/process_util.h
+@@ -12,6 +12,15 @@
+ #include <stdint.h>
+ #include <sys/types.h>
+ 
++#if !defined(__GLIBC__) && !defined(TEMP_FAILURE_RETRY)
++# define TEMP_FAILURE_RETRY(expression) \
++	(__extension__			\
++	 ({ long int __result;		\
++	  do __result = (long int) (expression); \
++	  while (__result == -1L && errno == EINTR); \
++	  __result; }))
++#endif
++
+ // This adjusts /proc/process/oom_score_adj so the Linux OOM killer
+ // will prefer certain process types over others. The range for the
+ // adjustment is [-1000, 1000], with [0, 1000] being user accessible.
+--- a/src/3rdparty/chromium/services/device/serial/serial_io_handler_posix.cc
++++ b/src/3rdparty/chromium/services/device/serial/serial_io_handler_posix.cc
+@@ -6,6 +6,7 @@
+ 
+ #include <sys/ioctl.h>
+ #include <termios.h>
++#include <asm-generic/ioctls.h>
+ 
+ #include <algorithm>
+ #include <utility>
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h
+@@ -38,6 +38,10 @@
+ #include "common/memory_allocator.h"
+ #include "google_breakpad/common/minidump_format.h"
+ 
++#ifndef __GLIBC__
++#define _libc_fpstate _fpstate
++#endif
++
+ namespace google_breakpad {
+ 
+ // Wraps platform-dependent implementations of accessors to ucontext_t structs.
+--- a/src/3rdparty/chromium/third_party/ffmpeg/libavutil/cpu.c
++++ b/src/3rdparty/chromium/third_party/ffmpeg/libavutil/cpu.c
+@@ -41,8 +41,10 @@
+ #include <sys/param.h>
+ #endif
+ #include <sys/types.h>
++#ifdef __GLIBC__
+ #include <sys/sysctl.h>
+ #endif
++#endif
+ #if HAVE_UNISTD_H
+ #include <unistd.h>
+ #endif
+--- a/src/3rdparty/chromium/third_party/perfetto/include/perfetto/ext/base/thread_utils.h
++++ b/src/3rdparty/chromium/third_party/perfetto/include/perfetto/ext/base/thread_utils.h
+@@ -29,9 +29,7 @@
+ #include <algorithm>
+ #endif
+ 
+-#if PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID)
+ #include <sys/prctl.h>
+-#endif
+ 
+ // Internal implementation utils that aren't as widely useful/supported as
+ // base/thread_utils.h.
+@@ -58,7 +56,7 @@ inline bool MaybeSetThreadName(const std
+ 
+ inline bool GetThreadName(std::string& out_result) {
+   char buf[16] = {};
+-#if PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID)
++#if !defined(__GLIBC__)
+   if (prctl(PR_GET_NAME, buf) != 0)
+     return false;
+ #else
+--- a/src/3rdparty/chromium/third_party/lss/linux_syscall_support.h
++++ b/src/3rdparty/chromium/third_party/lss/linux_syscall_support.h
+@@ -1300,6 +1300,18 @@ struct kernel_statfs {
+ #ifndef __NR_fallocate
+ #define __NR_fallocate          285
+ #endif
++
++#if !defined(__GLIBC__)
++#ifdef __NR_pread
++#undef __NR_pread
++#endif
++#ifdef __NR_pwrite
++#undef __NR_pwrite
++#endif
++#define __NR_pread __NR_pread64
++#define __NR_pwrite __NR_pwrite64
++#endif /* !defined(__GLIBC__) */
++
+ #ifndef __NR_getrandom
+ #define __NR_getrandom          318
+ #endif
+--- a/src/3rdparty/chromium/net/dns/dns_config_service_posix.cc
++++ b/src/3rdparty/chromium/net/dns/dns_config_service_posix.cc
+@@ -93,7 +93,8 @@ absl::optional<DnsConfig> ReadDnsConfig(
+ 
+   absl::optional<DnsConfig> dns_config;
+ // TODO(fuchsia): Use res_ninit() when it's implemented on Fuchsia.
+-#if defined(OS_OPENBSD) || defined(OS_FUCHSIA)
++#if defined(OS_OPENBSD) || defined(OS_FUCHSIA) || \
++  (defined(OS_LINUX) && !defined(__GLIBC__))
+   // Note: res_ninit in glibc always returns 0 and sets RES_INIT.
+   // res_init behaves the same way.
+   memset(&_res, 0, sizeof(_res));
diff --git a/srcpkgs/qt6-webengine/patches/0215-chromium-musl-cdefs.patch b/srcpkgs/qt6-webengine/patches/0215-chromium-musl-cdefs.patch
new file mode 100644
index 000000000000..9d1daec29118
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0215-chromium-musl-cdefs.patch
@@ -0,0 +1,29 @@
+--- a/src/3rdparty/chromium/third_party/libsync/src/include/sync/sync.h
++++ b/src/3rdparty/chromium/third_party/libsync/src/include/sync/sync.h
+@@ -19,12 +19,13 @@
+ #ifndef __SYS_CORE_SYNC_H
+ #define __SYS_CORE_SYNC_H
+ 
+-#include <sys/cdefs.h>
+ #include <stdint.h>
+ 
+ #include <linux/types.h>
+ 
+-__BEGIN_DECLS
++#ifdef __cplusplus
++extern "C" {
++#endif
+ 
+ struct sync_legacy_merge_data {
+  int32_t fd2;
+@@ -158,6 +159,9 @@ struct sync_pt_info *sync_pt_info(struct
+                                   struct sync_pt_info *itr);
+ void sync_fence_info_free(struct sync_fence_info_data *info);
+ 
+-__END_DECLS
++#ifdef __cplusplus
++}
++#endif
++
+ 
+ #endif /* __SYS_CORE_SYNC_H */
diff --git a/srcpkgs/qt6-webengine/patches/0216-chromium-musl-stat.patch b/srcpkgs/qt6-webengine/patches/0216-chromium-musl-stat.patch
new file mode 100644
index 000000000000..4509a6957cd7
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0216-chromium-musl-stat.patch
@@ -0,0 +1,12 @@
+--- a/src/3rdparty/chromium/base/files/file.h
++++ b/src/3rdparty/chromium/base/files/file.h
+@@ -19,7 +19,8 @@
+ #include "build/build_config.h"
+ 
+ #if defined(OS_BSD) || defined(OS_APPLE) || defined(OS_NACL) || \
+-    defined(OS_FUCHSIA) || (defined(OS_ANDROID) && __ANDROID_API__ < 21)
++    defined(OS_FUCHSIA) || (defined(OS_ANDROID) && __ANDROID_API__ < 21) || \
++    (defined(OS_LINUX) && !defined(__GLIBC__))
+ struct stat;
+ namespace base {
+ typedef struct stat stat_wrapper_t;
diff --git a/srcpkgs/qt6-webengine/patches/0217-chromium-musl-resolver.patch b/srcpkgs/qt6-webengine/patches/0217-chromium-musl-resolver.patch
new file mode 100644
index 000000000000..c3d7afad9b19
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0217-chromium-musl-resolver.patch
@@ -0,0 +1,77 @@
+--- a/src/3rdparty/chromium/net/dns/dns_config_service_linux.cc
++++ b/src/3rdparty/chromium/net/dns/dns_config_service_linux.cc
+@@ -432,11 +432,13 @@ class DnsConfigServiceLinux::ConfigReade
+     base::ScopedBlockingCall scoped_blocking_call(
+         FROM_HERE, base::BlockingType::MAY_BLOCK);
+ 
++#if defined(__GLIBC__)
+     std::unique_ptr<struct __res_state> res = resolv_reader_->GetResState();
+     if (res) {
+       dns_config_ = ConvertResStateToDnsConfig(*res.get());
+       resolv_reader_->CloseResState(res.get());
+     }
++#endif
+ 
+     UMA_HISTOGRAM_BOOLEAN("Net.DNS.DnsConfig.Resolv.Read",
+                           dns_config_.has_value());
+@@ -486,6 +488,7 @@ class DnsConfigServiceLinux::ConfigReade
+ 
+ std::unique_ptr<struct __res_state>
+ DnsConfigServiceLinux::ResolvReader::GetResState() {
++#if defined(__GLIBC__)
+   auto res = std::make_unique<struct __res_state>();
+   memset(res.get(), 0, sizeof(struct __res_state));
+ 
+@@ -495,11 +498,16 @@ DnsConfigServiceLinux::ResolvReader::Get
+   }
+ 
+   return res;
++#else
++  return nullptr;
++#endif
+ }
+ 
+ void DnsConfigServiceLinux::ResolvReader::CloseResState(
+     struct __res_state* res) {
++#if defined(__GLIBC__)
+   res_nclose(res);
++#endif
+ }
+ 
+ DnsConfigServiceLinux::DnsConfigServiceLinux()
+--- a/src/3rdparty/chromium/net/dns/dns_reloader.cc
++++ b/src/3rdparty/chromium/net/dns/dns_reloader.cc
+@@ -4,8 +4,7 @@
+ 
+ #include "net/dns/dns_reloader.h"
+ 
+-#if defined(OS_POSIX) && !defined(OS_APPLE) && !defined(OS_OPENBSD) && \
+-    !defined(OS_ANDROID) && !defined(OS_FUCHSIA)
++#ifdef __GLIBC__
+ 
+ #include <resolv.h>
+ 
+--- a/src/3rdparty/chromium/net/dns/host_resolver_manager.cc
++++ b/src/3rdparty/chromium/net/dns/host_resolver_manager.cc
+@@ -2720,8 +2720,7 @@ HostResolverManager::HostResolverManager
+   NetworkChangeNotifier::AddConnectionTypeObserver(this);
+   if (system_dns_config_notifier_)
+     system_dns_config_notifier_->AddObserver(this);
+-#if defined(OS_POSIX) && !defined(OS_APPLE) && !defined(OS_OPENBSD) && \
+-    !defined(OS_ANDROID)
++#ifdef __GLIBC__
+   EnsureDnsReloaderInit();
+ #endif
+ 
+--- a/src/3rdparty/chromium/net/dns/host_resolver_proc.cc
++++ b/src/3rdparty/chromium/net/dns/host_resolver_proc.cc
+@@ -176,8 +176,7 @@ int SystemHostResolverCall(const std::st
+   base::ScopedBlockingCall scoped_blocking_call(FROM_HERE,
+                                                 base::BlockingType::WILL_BLOCK);
+ 
+-#if defined(OS_POSIX) && !defined(OS_APPLE) && !defined(OS_OPENBSD) && \
+-    !defined(OS_ANDROID) && !defined(OS_FUCHSIA)
++#ifdef __GLIBC__
+   DnsReloaderMaybeReload();
+ #endif
+   absl::optional<AddressInfo> ai;
diff --git a/srcpkgs/qt6-webengine/patches/0600-chromium-sndio.patch b/srcpkgs/qt6-webengine/patches/0600-chromium-sndio.patch
new file mode 100644
index 000000000000..0302874ffba4
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0600-chromium-sndio.patch
@@ -0,0 +1,876 @@
+--- a/src/3rdparty/chromium/media/BUILD.gn
++++ b/src/3rdparty/chromium/media/BUILD.gn
+@@ -72,6 +72,9 @@ config("media_config") {
+       defines += [ "DLOPEN_PULSEAUDIO" ]
+     }
+   }
++  if (use_sndio) {
++    defines += [ "USE_SNDIO" ]
++  }
+   if (use_cras) {
+     defines += [ "USE_CRAS" ]
+   }
+--- a/src/3rdparty/chromium/media/audio/BUILD.gn
++++ b/src/3rdparty/chromium/media/audio/BUILD.gn
+@@ -240,6 +240,17 @@ source_set("audio") {
+     sources += [ "linux/audio_manager_linux.cc" ]
+   }
+ 
++  if (use_sndio) {
++    libs += [ "sndio" ]
++    sources += [
++      "sndio/audio_manager_sndio.cc",
++      "sndio/sndio_input.cc",
++      "sndio/sndio_input.h",
++      "sndio/sndio_output.cc",
++      "sndio/sndio_output.h"
++    ]
++  }
++
+   if (use_alsa) {
+     libs += [ "asound" ]
+     sources += [
+--- a/src/3rdparty/chromium/media/audio/linux/audio_manager_linux.cc
++++ b/src/3rdparty/chromium/media/audio/linux/audio_manager_linux.cc
+@@ -25,6 +25,11 @@
+ #include "media/audio/pulse/audio_manager_pulse.h"
+ #include "media/audio/pulse/pulse_util.h"
+ #endif
++#if defined(USE_SNDIO)
++#include "media/audio/sndio/audio_manager_sndio.h"
++#include "media/audio/sndio/sndio_input.h"
++#include "media/audio/sndio/sndio_output.h"
++#endif
+ 
+ namespace media {
+ 
+@@ -32,7 +37,8 @@ enum LinuxAudioIO {
+   kPulse,
+   kAlsa,
+   kCras,
+-  kAudioIOMax = kCras  // Must always be equal to largest logged entry.
++  kSndio,
++  kAudioIOMax = kSndio // Must always be equal to largest logged entry.
+ };
+ 
+ std::unique_ptr<media::AudioManager> CreateAudioManager(
+@@ -45,6 +51,16 @@ std::unique_ptr<media::AudioManager> Cre
+                                               audio_log_factory);
+   }
+ 
++#if defined(USE_SNDIO)
++  struct sio_hdl *hdl = sio_open(SIO_DEVANY, SIO_PLAY, 0);
++  if (hdl != NULL) {
++    sio_close(hdl);
++    UMA_HISTOGRAM_ENUMERATION("Media.LinuxAudioIO", kSndio, kAudioIOMax + 1);
++    return std::make_unique<AudioManagerSndio>(std::move(audio_thread),
++                                                  audio_log_factory);
++  }
++#endif
++
+ #if defined(USE_CRAS)
+   if (base::CommandLine::ForCurrentProcess()->HasSwitch(switches::kUseCras)) {
+     UMA_HISTOGRAM_ENUMERATION("Media.LinuxAudioIO", kCras, kAudioIOMax + 1);
+--- /dev/null
++++ b/src/3rdparty/chromium/media/audio/sndio/audio_manager_sndio.cc
+@@ -0,0 +1,148 @@
++// Copyright (c) 2012 The Chromium Authors. All rights reserved.
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++#include "media/audio/sndio/audio_manager_sndio.h"
++
++#include "base/metrics/histogram_macros.h"
++#include "base/memory/ptr_util.h"
++#include "media/audio/audio_device_description.h"
++#include "media/audio/audio_output_dispatcher.h"
++#include "media/audio/sndio/sndio_input.h"
++#include "media/audio/sndio/sndio_output.h"
++#include "media/base/limits.h"
++#include "media/base/media_switches.h"
++
++namespace media {
++
++
++// Maximum number of output streams that can be open simultaneously.
++static const int kMaxOutputStreams = 4;
++
++// Default sample rate for input and output streams.
++static const int kDefaultSampleRate = 48000;
++
++void AddDefaultDevice(AudioDeviceNames* device_names) {
++  DCHECK(device_names->empty());
++  device_names->push_front(AudioDeviceName::CreateDefault());
++}
++
++bool AudioManagerSndio::HasAudioOutputDevices() {
++  return true;
++}
++
++bool AudioManagerSndio::HasAudioInputDevices() {
++  return true;
++}
++
++void AudioManagerSndio::GetAudioInputDeviceNames(
++    AudioDeviceNames* device_names) {
++  DCHECK(device_names->empty());
++  AddDefaultDevice(device_names);
++}
++
++void AudioManagerSndio::GetAudioOutputDeviceNames(
++    AudioDeviceNames* device_names) {
++  AddDefaultDevice(device_names);
++}
++
++const char* AudioManagerSndio::GetName() {
++  return "SNDIO";
++}
++
++AudioParameters AudioManagerSndio::GetInputStreamParameters(
++    const std::string& device_id) {
++  static const int kDefaultInputBufferSize = 1024;
++
++  int user_buffer_size = GetUserBufferSize();
++  int buffer_size = user_buffer_size ?
++      user_buffer_size : kDefaultInputBufferSize;
++
++  return AudioParameters(
++      AudioParameters::AUDIO_PCM_LOW_LATENCY, CHANNEL_LAYOUT_STEREO,
++      kDefaultSampleRate, buffer_size);
++}
++
++AudioManagerSndio::AudioManagerSndio(std::unique_ptr<AudioThread> audio_thread,
++                                         AudioLogFactory* audio_log_factory)
++    : AudioManagerBase(std::move(audio_thread),
++                       audio_log_factory) {
++  DLOG(WARNING) << "AudioManagerSndio";
++  SetMaxOutputStreamsAllowed(kMaxOutputStreams);
++}
++
++AudioManagerSndio::~AudioManagerSndio() {
++  Shutdown();
++}
++
++AudioOutputStream* AudioManagerSndio::MakeLinearOutputStream(
++    const AudioParameters& params,
++    const LogCallback& log_callback) {
++  DCHECK_EQ(AudioParameters::AUDIO_PCM_LINEAR, params.format());
++  return MakeOutputStream(params);
++}
++
++AudioOutputStream* AudioManagerSndio::MakeLowLatencyOutputStream(
++    const AudioParameters& params,
++    const std::string& device_id,
++    const LogCallback& log_callback) {
++  DLOG_IF(ERROR, !device_id.empty()) << "Not implemented!";
++  DCHECK_EQ(AudioParameters::AUDIO_PCM_LOW_LATENCY, params.format());
++  return MakeOutputStream(params);
++}
++
++AudioInputStream* AudioManagerSndio::MakeLinearInputStream(
++    const AudioParameters& params,
++    const std::string& device_id,
++    const LogCallback& log_callback) {
++  DCHECK_EQ(AudioParameters::AUDIO_PCM_LINEAR, params.format());
++  return MakeInputStream(params);
++}
++
++AudioInputStream* AudioManagerSndio::MakeLowLatencyInputStream(
++    const AudioParameters& params,
++    const std::string& device_id,
++    const LogCallback& log_callback) {
++  DCHECK_EQ(AudioParameters::AUDIO_PCM_LOW_LATENCY, params.format());
++  return MakeInputStream(params);
++}
++
++AudioParameters AudioManagerSndio::GetPreferredOutputStreamParameters(
++    const std::string& output_device_id,
++    const AudioParameters& input_params) {
++  // TODO(tommi): Support |output_device_id|.
++  DLOG_IF(ERROR, !output_device_id.empty()) << "Not implemented!";
++  static const int kDefaultOutputBufferSize = 2048;
++
++  ChannelLayout channel_layout = CHANNEL_LAYOUT_STEREO;
++  int sample_rate = kDefaultSampleRate;
++  int buffer_size = kDefaultOutputBufferSize;
++  if (input_params.IsValid()) {
++    sample_rate = input_params.sample_rate();
++    channel_layout = input_params.channel_layout();
++    buffer_size = std::min(buffer_size, input_params.frames_per_buffer());
++  }
++
++  int user_buffer_size = GetUserBufferSize();
++  if (user_buffer_size)
++    buffer_size = user_buffer_size;
++
++  return AudioParameters(
++      AudioParameters::AUDIO_PCM_LOW_LATENCY, channel_layout,
++      sample_rate, buffer_size);
++}
++
++AudioInputStream* AudioManagerSndio::MakeInputStream(
++    const AudioParameters& params) {
++  DLOG(WARNING) << "MakeInputStream";
++  return new SndioAudioInputStream(this,
++             AudioDeviceDescription::kDefaultDeviceId, params);
++}
++
++AudioOutputStream* AudioManagerSndio::MakeOutputStream(
++    const AudioParameters& params) {
++  DLOG(WARNING) << "MakeOutputStream";
++  return new SndioAudioOutputStream(params, this);
++}
++
++}  // namespace media
+--- /dev/null
++++ b/src/3rdparty/chromium/media/audio/sndio/audio_manager_sndio.h
+@@ -0,0 +1,65 @@
++// Copyright (c) 2012 The Chromium Authors. All rights reserved.
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++#ifndef MEDIA_AUDIO_SNDIO_AUDIO_MANAGER_SNDIO_H_
++#define MEDIA_AUDIO_SNDIO_AUDIO_MANAGER_SNDIO_H_
++
++#include <set>
++
++#include "base/compiler_specific.h"
++#include "base/macros.h"
++#include "base/memory/ref_counted.h"
++#include "base/threading/thread.h"
++#include "media/audio/audio_manager_base.h"
++
++namespace media {
++
++class MEDIA_EXPORT AudioManagerSndio : public AudioManagerBase {
++ public:
++  AudioManagerSndio(std::unique_ptr<AudioThread> audio_thread,
++                   AudioLogFactory* audio_log_factory);
++  ~AudioManagerSndio() override;
++
++  // Implementation of AudioManager.
++  bool HasAudioOutputDevices() override;
++  bool HasAudioInputDevices() override;
++  void GetAudioInputDeviceNames(AudioDeviceNames* device_names) override;
++  void GetAudioOutputDeviceNames(AudioDeviceNames* device_names) override;
++  AudioParameters GetInputStreamParameters(
++      const std::string& device_id) override;
++  const char* GetName() override;
++
++  // Implementation of AudioManagerBase.
++  AudioOutputStream* MakeLinearOutputStream(
++      const AudioParameters& params,
++      const LogCallback& log_callback) override;
++  AudioOutputStream* MakeLowLatencyOutputStream(
++      const AudioParameters& params,
++      const std::string& device_id,
++      const LogCallback& log_callback) override;
++  AudioInputStream* MakeLinearInputStream(
++      const AudioParameters& params,
++      const std::string& device_id,
++      const LogCallback& log_callback) override;
++  AudioInputStream* MakeLowLatencyInputStream(
++      const AudioParameters& params,
++      const std::string& device_id,
++      const LogCallback& log_callback) override;
++
++ protected:
++  AudioParameters GetPreferredOutputStreamParameters(
++      const std::string& output_device_id,
++      const AudioParameters& input_params) override;
++
++ private:
++  // Called by MakeLinearOutputStream and MakeLowLatencyOutputStream.
++  AudioOutputStream* MakeOutputStream(const AudioParameters& params);
++  AudioInputStream* MakeInputStream(const AudioParameters& params);
++
++  DISALLOW_COPY_AND_ASSIGN(AudioManagerSndio);
++};
++
++}  // namespace media
++
++#endif  // MEDIA_AUDIO_SNDIO_AUDIO_MANAGER_SNDIO_H_
+--- /dev/null
++++ b/src/3rdparty/chromium/media/audio/sndio/sndio_input.cc
+@@ -0,0 +1,200 @@
++// Copyright 2013 The Chromium Authors. All rights reserved.
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++#include "base/bind.h"
++#include "base/logging.h"
++#include "base/macros.h"
++#include "media/base/audio_timestamp_helper.h"
++#include "media/audio/sndio/audio_manager_sndio.h"
++#include "media/audio/audio_manager.h"
++#include "media/audio/sndio/sndio_input.h"
++
++namespace media {
++
++static const SampleFormat kSampleFormat = kSampleFormatS16;
++
++void SndioAudioInputStream::OnMoveCallback(void *arg, int delta)
++{
++  SndioAudioInputStream* self = static_cast<SndioAudioInputStream*>(arg);
++
++  self->hw_delay += delta;
++}
++
++void *SndioAudioInputStream::ThreadEntry(void *arg) {
++  SndioAudioInputStream* self = static_cast<SndioAudioInputStream*>(arg);
++
++  self->ThreadLoop();
++  return NULL;
++}
++
++SndioAudioInputStream::SndioAudioInputStream(AudioManagerBase* manager,
++                                             const std::string& device_name,
++                                             const AudioParameters& params)
++    : manager(manager),
++      params(params),
++      audio_bus(AudioBus::Create(params)),
++      state(kClosed) {
++}
++
++SndioAudioInputStream::~SndioAudioInputStream() {
++  if (state != kClosed)
++    Close();
++}
++
++bool SndioAudioInputStream::Open() {
++  struct sio_par par;
++  int sig;
++
++  if (state != kClosed)
++    return false;
++
++  if (params.format() != AudioParameters::AUDIO_PCM_LINEAR &&
++      params.format() != AudioParameters::AUDIO_PCM_LOW_LATENCY) {
++    LOG(WARNING) << "Unsupported audio format.";
++    return false;
++  }
++
++  sio_initpar(&par);
++  par.rate = params.sample_rate();
++  par.rchan = params.channels();
++  par.bits = SampleFormatToBitsPerChannel(kSampleFormat);
++  par.bps = par.bits / 8;
++  par.sig = sig = par.bits != 8 ? 1 : 0;
++  par.le = SIO_LE_NATIVE;
++  par.appbufsz = params.frames_per_buffer();
++
++  hdl = sio_open(SIO_DEVANY, SIO_REC, 0);
++
++  if (hdl == NULL) {
++    LOG(ERROR) << "Couldn't open audio device.";
++    return false;
++  }
++
++  if (!sio_setpar(hdl, &par) || !sio_getpar(hdl, &par)) {
++    LOG(ERROR) << "Couldn't set audio parameters.";
++    goto bad_close;
++  }
++
++  if (par.rate  != (unsigned int)params.sample_rate() ||
++      par.rchan != (unsigned int)params.channels() ||
++      par.bits  != (unsigned int)SampleFormatToBitsPerChannel(kSampleFormat) ||
++      par.sig   != (unsigned int)sig ||
++      (par.bps > 1 && par.le != SIO_LE_NATIVE) ||
++      (par.bits != par.bps * 8)) {
++    LOG(ERROR) << "Unsupported audio parameters.";
++    goto bad_close;
++  }
++  state = kStopped;
++  buffer = new char[audio_bus->frames() * params.GetBytesPerFrame(kSampleFormat)];
++  sio_onmove(hdl, &OnMoveCallback, this);
++  return true;
++bad_close:
++  sio_close(hdl);
++  return false;
++}
++
++void SndioAudioInputStream::Start(AudioInputCallback* cb) {
++
++  StartAgc();
++
++  state = kRunning;
++  hw_delay = 0;
++  callback = cb;
++  sio_start(hdl);
++  if (pthread_create(&thread, NULL, &ThreadEntry, this) != 0) {
++    LOG(ERROR) << "Failed to create real-time thread for recording.";
++    sio_stop(hdl);
++    state = kStopped;
++  }
++}
++
++void SndioAudioInputStream::Stop() {
++
++  if (state == kStopped)
++    return;
++
++  state = kStopWait;
++  pthread_join(thread, NULL);
++  sio_stop(hdl);
++  state = kStopped;
++
++  StopAgc();
++}
++
++void SndioAudioInputStream::Close() {
++
++  if (state == kClosed)
++    return;
++
++  if (state == kRunning)
++    Stop();
++
++  state = kClosed;
++  delete [] buffer;
++  sio_close(hdl);
++
++  manager->ReleaseInputStream(this);
++}
++
++double SndioAudioInputStream::GetMaxVolume() {
++  // Not supported
++  return 0.0;
++}
++
++void SndioAudioInputStream::SetVolume(double volume) {
++  // Not supported. Do nothing.
++}
++
++double SndioAudioInputStream::GetVolume() {
++  // Not supported.
++  return 0.0;
++}
++
++bool SndioAudioInputStream::IsMuted() {
++  // Not supported.
++  return false;
++}
++
++void SndioAudioInputStream::SetOutputDeviceForAec(
++    const std::string& output_device_id) {
++  // Not supported.
++}
++
++void SndioAudioInputStream::ThreadLoop(void) {
++  size_t todo, n;
++  char *data;
++  unsigned int nframes;
++  double normalized_volume = 0.0;
++
++  nframes = audio_bus->frames();
++
++  while (state == kRunning && !sio_eof(hdl)) {
++
++    GetAgcVolume(&normalized_volume);
++
++    // read one block
++    todo = nframes * params.GetBytesPerFrame(kSampleFormat);
++    data = buffer;
++    while (todo > 0) {
++      n = sio_read(hdl, data, todo);
++      if (n == 0)
++        return;	// unrecoverable I/O error
++      todo -= n;
++      data += n;
++    }
++    hw_delay -= nframes;
++
++    // convert frames count to TimeDelta
++    const base::TimeDelta delay = AudioTimestampHelper::FramesToTime(hw_delay,
++      params.sample_rate());
++
++    // push into bus
++    audio_bus->FromInterleaved<SignedInt16SampleTypeTraits>(reinterpret_cast<int16_t*>(buffer), nframes);
++
++    // invoke callback
++    callback->OnData(audio_bus.get(), base::TimeTicks::Now() - delay, 1.);
++  }
++}
++
++}  // namespace media
+--- /dev/null
++++ b/src/3rdparty/chromium/media/audio/sndio/sndio_input.h
+@@ -0,0 +1,91 @@
++// Copyright 2013 The Chromium Authors. All rights reserved.
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++#ifndef MEDIA_AUDIO_SNDIO_SNDIO_INPUT_H_
++#define MEDIA_AUDIO_SNDIO_SNDIO_INPUT_H_
++
++#include <stdint.h>
++#include <string>
++#include <sndio.h>
++
++#include "base/compiler_specific.h"
++#include "base/macros.h"
++#include "base/memory/weak_ptr.h"
++#include "base/time/time.h"
++#include "media/audio/agc_audio_stream.h"
++#include "media/audio/audio_io.h"
++#include "media/audio/audio_device_description.h"
++#include "media/base/audio_parameters.h"
++
++namespace media {
++
++class AudioManagerBase;
++
++// Implementation of AudioOutputStream using sndio(7)
++class SndioAudioInputStream : public AgcAudioStream<AudioInputStream> {
++ public:
++  // Pass this to the constructor if you want to attempt auto-selection
++  // of the audio recording device.
++  static const char kAutoSelectDevice[];
++
++  // Create a PCM Output stream for the SNDIO device identified by
++  // |device_name|. If unsure of what to use for |device_name|, use
++  // |kAutoSelectDevice|.
++  SndioAudioInputStream(AudioManagerBase* audio_manager,
++                     const std::string& device_name,
++                     const AudioParameters& params);
++
++  ~SndioAudioInputStream() override;
++
++  // Implementation of AudioInputStream.
++  bool Open() override;
++  void Start(AudioInputCallback* callback) override;
++  void Stop() override;
++  void Close() override;
++  double GetMaxVolume() override;
++  void SetVolume(double volume) override;
++  double GetVolume() override;
++  bool IsMuted() override;
++  void SetOutputDeviceForAec(const std::string& output_device_id) override;
++
++ private:
++
++  enum StreamState {
++    kClosed,            // Not opened yet
++    kStopped,           // Device opened, but not started yet
++    kRunning,           // Started, device playing
++    kStopWait           // Stopping, waiting for the real-time thread to exit
++  };
++
++  // C-style call-backs
++  static void OnMoveCallback(void *arg, int delta);
++  static void* ThreadEntry(void *arg);
++
++  // Continuously moves data from the device to the consumer
++  void ThreadLoop();
++  // Our creator, the audio manager needs to be notified when we close.
++  AudioManagerBase* manager;
++  // Parameters of the source
++  AudioParameters params;
++  // We store data here for consumer
++  std::unique_ptr<AudioBus> audio_bus;
++  // Call-back that consumes recorded data
++  AudioInputCallback* callback;  // Valid during a recording session.
++  // Handle of the audio device
++  struct sio_hdl* hdl;
++  // Current state of the stream
++  enum StreamState state;
++  // High priority thread running ThreadLoop()
++  pthread_t thread;
++  // Number of frames buffered in the hardware
++  int hw_delay;
++  // Temporary buffer where data is stored sndio-compatible format
++  char* buffer;
++
++  DISALLOW_COPY_AND_ASSIGN(SndioAudioInputStream);
++};
++
++}  // namespace media
++
++#endif  // MEDIA_AUDIO_SNDIO_SNDIO_INPUT_H_
+--- /dev/null
++++ b/src/3rdparty/chromium/media/audio/sndio/sndio_output.cc
+@@ -0,0 +1,183 @@
++// Copyright (c) 2012 The Chromium Authors. All rights reserved.
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++#include "base/logging.h"
++#include "base/time/time.h"
++#include "base/time/default_tick_clock.h"
++#include "media/audio/audio_manager_base.h"
++#include "media/base/audio_timestamp_helper.h"
++#include "media/audio/sndio/sndio_output.h"
++
++namespace media {
++
++static const SampleFormat kSampleFormat = kSampleFormatS16;
++
++void SndioAudioOutputStream::OnMoveCallback(void *arg, int delta) {
++  SndioAudioOutputStream* self = static_cast<SndioAudioOutputStream*>(arg);
++
++  self->hw_delay -= delta;
++}
++
++void SndioAudioOutputStream::OnVolCallback(void *arg, unsigned int vol) {
++  SndioAudioOutputStream* self = static_cast<SndioAudioOutputStream*>(arg);
++
++  self->vol = vol;
++}
++
++void *SndioAudioOutputStream::ThreadEntry(void *arg) {
++  SndioAudioOutputStream* self = static_cast<SndioAudioOutputStream*>(arg);
++
++  self->ThreadLoop();
++  return NULL;
++}
++
++SndioAudioOutputStream::SndioAudioOutputStream(const AudioParameters& params,
++                                               AudioManagerBase* manager)
++    : manager(manager),
++      params(params),
++      audio_bus(AudioBus::Create(params)),
++      state(kClosed),
++      mutex(PTHREAD_MUTEX_INITIALIZER) {
++}
++
++SndioAudioOutputStream::~SndioAudioOutputStream() {
++  if (state != kClosed)
++    Close();
++}
++
++bool SndioAudioOutputStream::Open() {
++  struct sio_par par;
++  int sig;
++
++  if (params.format() != AudioParameters::AUDIO_PCM_LINEAR &&
++      params.format() != AudioParameters::AUDIO_PCM_LOW_LATENCY) {
++    LOG(WARNING) << "Unsupported audio format.";
++    return false;
++  }
++  sio_initpar(&par);
++  par.rate = params.sample_rate();
++  par.pchan = params.channels();
++  par.bits = SampleFormatToBitsPerChannel(kSampleFormat);
++  par.bps = par.bits / 8;
++  par.sig = sig = par.bits != 8 ? 1 : 0;
++  par.le = SIO_LE_NATIVE;
++  par.appbufsz = params.frames_per_buffer();
++
++  hdl = sio_open(SIO_DEVANY, SIO_PLAY, 0);
++  if (hdl == NULL) {
++    LOG(ERROR) << "Couldn't open audio device.";
++    return false;
++  }
++  if (!sio_setpar(hdl, &par) || !sio_getpar(hdl, &par)) {
++    LOG(ERROR) << "Couldn't set audio parameters.";
++    goto bad_close;
++  }
++  if (par.rate  != (unsigned int)params.sample_rate() ||
++      par.pchan != (unsigned int)params.channels() ||
++      par.bits  != (unsigned int)SampleFormatToBitsPerChannel(kSampleFormat) ||
++      par.sig   != (unsigned int)sig ||
++      (par.bps > 1 && par.le != SIO_LE_NATIVE) ||
++      (par.bits != par.bps * 8)) {
++    LOG(ERROR) << "Unsupported audio parameters.";
++    goto bad_close;
++  }
++  state = kStopped;
++  volpending = 0;
++  vol = 0;
++  buffer = new char[audio_bus->frames() * params.GetBytesPerFrame(kSampleFormat)];
++  sio_onmove(hdl, &OnMoveCallback, this);
++  sio_onvol(hdl, &OnVolCallback, this);
++  return true;
++ bad_close:
++  sio_close(hdl);
++  return false;
++}
++
++void SndioAudioOutputStream::Close() {
++  if (state == kClosed)
++    return;
++  if (state == kRunning)
++    Stop();
++  state = kClosed;
++  delete [] buffer;
++  sio_close(hdl);
++  manager->ReleaseOutputStream(this);  // Calls the destructor
++}
++
++void SndioAudioOutputStream::Start(AudioSourceCallback* callback) {
++  state = kRunning;
++  hw_delay = 0;
++  source = callback;
++  sio_start(hdl);
++  if (pthread_create(&thread, NULL, &ThreadEntry, this) != 0) {
++    LOG(ERROR) << "Failed to create real-time thread.";
++    sio_stop(hdl);
++    state = kStopped;
++  }
++}
++
++void SndioAudioOutputStream::Stop() {
++  if (state == kStopped)
++    return;
++  state = kStopWait;
++  pthread_join(thread, NULL);
++  sio_stop(hdl);
++  state = kStopped;
++}
++
++void SndioAudioOutputStream::SetVolume(double v) {
++  pthread_mutex_lock(&mutex);
++  vol = v * SIO_MAXVOL;
++  volpending = 1;
++  pthread_mutex_unlock(&mutex);
++}
++
++void SndioAudioOutputStream::GetVolume(double* v) {
++  pthread_mutex_lock(&mutex);
++  *v = vol * (1. / SIO_MAXVOL);
++  pthread_mutex_unlock(&mutex);
++}
++
++// This stream is always used with sub second buffer sizes, where it's
++// sufficient to simply always flush upon Start().
++void SndioAudioOutputStream::Flush() {}
++
++void SndioAudioOutputStream::ThreadLoop(void) {
++  int avail, count, result;
++
++  while (state == kRunning) {
++    // Update volume if needed
++    pthread_mutex_lock(&mutex);
++    if (volpending) {
++      volpending = 0;
++      sio_setvol(hdl, vol);
++    }
++    pthread_mutex_unlock(&mutex);
++
++    // Get data to play
++    const base::TimeDelta delay = AudioTimestampHelper::FramesToTime(hw_delay,
++	params.sample_rate());
++    count = source->OnMoreData(delay, base::TimeTicks::Now(), 0, audio_bus.get());
++    audio_bus->ToInterleaved<SignedInt16SampleTypeTraits>(count, reinterpret_cast<int16_t*>(buffer));
++    if (count == 0) {
++      // We have to submit something to the device
++      count = audio_bus->frames();
++      memset(buffer, 0, count * params.GetBytesPerFrame(kSampleFormat));
++      LOG(WARNING) << "No data to play, running empty cycle.";
++    }
++
++    // Submit data to the device
++    avail = count * params.GetBytesPerFrame(kSampleFormat);
++    result = sio_write(hdl, buffer, avail);
++    if (result == 0) {
++      LOG(WARNING) << "Audio device disconnected.";
++      break;
++    }
++
++    // Update hardware pointer
++    hw_delay += count;
++  }
++}
++
++}  // namespace media
+--- /dev/null
++++ b/src/3rdparty/chromium/media/audio/sndio/sndio_output.h
+@@ -0,0 +1,86 @@
++// Copyright (c) 2012 The Chromium Authors. All rights reserved.
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++#ifndef MEDIA_AUDIO_SNDIO_SNDIO_OUTPUT_H_
++#define MEDIA_AUDIO_SNDIO_SNDIO_OUTPUT_H_
++
++#include <pthread.h>
++#include <sndio.h>
++
++#include "base/time/tick_clock.h"
++#include "base/time/time.h"
++#include "media/audio/audio_io.h"
++
++namespace media {
++
++class AudioManagerBase;
++
++// Implementation of AudioOutputStream using sndio(7)
++class SndioAudioOutputStream : public AudioOutputStream {
++ public:
++  // The manager is creating this object
++  SndioAudioOutputStream(const AudioParameters& params,
++                         AudioManagerBase* manager);
++  virtual ~SndioAudioOutputStream();
++
++  // Implementation of AudioOutputStream.
++  bool Open() override;
++  void Close() override;
++  void Start(AudioSourceCallback* callback) override;
++  void Stop() override;
++  void SetVolume(double volume) override;
++  void GetVolume(double* volume) override;
++  void Flush() override;
++
++  friend void sndio_onmove(void *arg, int delta);
++  friend void sndio_onvol(void *arg, unsigned int vol);
++  friend void *sndio_threadstart(void *arg);
++
++ private:
++  enum StreamState {
++    kClosed,            // Not opened yet
++    kStopped,           // Device opened, but not started yet
++    kRunning,           // Started, device playing
++    kStopWait           // Stopping, waiting for the real-time thread to exit
++  };
++
++  // C-style call-backs
++  static void OnMoveCallback(void *arg, int delta);
++  static void OnVolCallback(void *arg, unsigned int vol);
++  static void* ThreadEntry(void *arg);
++
++  // Continuously moves data from the producer to the device
++  void ThreadLoop(void);
++
++  // Our creator, the audio manager needs to be notified when we close.
++  AudioManagerBase* manager;
++  // Parameters of the source
++  AudioParameters params;
++  // Source stores data here
++  std::unique_ptr<AudioBus> audio_bus;
++  // Call-back that produces data to play
++  AudioSourceCallback* source;
++  // Handle of the audio device
++  struct sio_hdl* hdl;
++  // Current state of the stream
++  enum StreamState state;
++  // High priority thread running ThreadLoop()
++  pthread_t thread;
++  // Protects vol, volpending and hw_delay
++  pthread_mutex_t mutex;
++  // Current volume in the 0..SIO_MAXVOL range
++  int vol;
++  // Set to 1 if volumes must be refreshed in the realtime thread
++  int volpending;
++  // Number of frames buffered in the hardware
++  int hw_delay;
++  // Temporary buffer where data is stored sndio-compatible format
++  char* buffer;
++
++  DISALLOW_COPY_AND_ASSIGN(SndioAudioOutputStream);
++};
++
++}  // namespace media
++
++#endif  // MEDIA_AUDIO_SNDIO_SNDIO_OUTPUT_H_
+--- a/src/3rdparty/chromium/media/media_options.gni
++++ b/src/3rdparty/chromium/media/media_options.gni
+@@ -121,6 +121,9 @@ declare_args() {
+   # Enables runtime selection of ALSA library for audio.
+   use_alsa = false
+ 
++  # Enable runtime selection of sndio(7)
++  use_sndio = false
++
+   # Alsa should be used on non-Android, non-Mac POSIX systems.
+   # Alsa should be used on desktop Chromecast and audio-only Chromecast builds.
+   if (is_posix && !is_android && !is_mac &&
diff --git a/srcpkgs/qt6-webengine/patches/0700-armv7l-neon.patch b/srcpkgs/qt6-webengine/patches/0700-armv7l-neon.patch
new file mode 100644
index 000000000000..d42fa19a07a1
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0700-armv7l-neon.patch
@@ -0,0 +1,10 @@
+--- a/src/3rdparty/chromium/skia/BUILD.gn
++++ b/src/3rdparty/chromium/skia/BUILD.gn
+@@ -800,7 +800,6 @@ skia_source_set("skia_opts") {
+         # Root build config sets -mfpu=$arm_fpu, which we expect to be neon
+         # when running this.
+         if (!arm_use_neon) {
+-          configs -= [ "//build/config/compiler:compiler_arm_fpu" ]
+           cflags += [ "-mfpu=neon" ]
+         }
+       }
diff --git a/srcpkgs/qt6-webengine/patches/0750-chromium-musl-cross-no-asm_ptrace_h.patch b/srcpkgs/qt6-webengine/patches/0750-chromium-musl-cross-no-asm_ptrace_h.patch
new file mode 100644
index 000000000000..3cf132908af4
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0750-chromium-musl-cross-no-asm_ptrace_h.patch
@@ -0,0 +1,30 @@
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper.cc
+@@ -38,7 +38,12 @@
+ 
+ #include "client/linux/minidump_writer/linux_ptrace_dumper.h"
+ 
++#if defined(__GLIBC__)
+ #include <asm/ptrace.h>
++#else
++/* For arm*-musl this definition is missing */
++#define ARM_sp uregs[13]
++#endif
+ #include <assert.h>
+ #include <errno.h>
+ #include <fcntl.h>
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_core_dumper.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_core_dumper.cc
+@@ -32,7 +32,12 @@
+ 
+ #include "client/linux/minidump_writer/linux_core_dumper.h"
+ 
++#if defined(__GLIBC__)
+ #include <asm/ptrace.h>
++#else
++/* For arm*-musl this definition is missing */
++#define ARM_sp uregs[13]
++#endif
+ #include <assert.h>
+ #include <elf.h>
+ #include <stdio.h>
diff --git a/srcpkgs/qt6-webengine/patches/0751-chromium-musl-arm-user_vfp.patch b/srcpkgs/qt6-webengine/patches/0751-chromium-musl-arm-user_vfp.patch
new file mode 100644
index 000000000000..6e2d62f35ee6
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0751-chromium-musl-arm-user_vfp.patch
@@ -0,0 +1,20 @@
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/util/linux/thread_info.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/util/linux/thread_info.h
+@@ -17,6 +17,17 @@
+ 
+ #include <stdint.h>
+ #include <sys/user.h>
++#if !defined(__GLIBC__)
++struct user_vfp {
++	unsigned long long fpregs[32];
++	unsigned long fpscr;
++};
++struct user_vfp_exc {
++	unsigned long fpexc;
++	unsigned long fpinst;
++	unsigned long fpinst2;
++};
++#endif /* !defined(__GLIBC__) */
+ 
+ #include <type_traits>
+ 
diff --git a/srcpkgs/qt6-webengine/patches/0752-chromium-musl-arm-elf_auxv_t.patch b/srcpkgs/qt6-webengine/patches/0752-chromium-musl-arm-elf_auxv_t.patch
new file mode 100644
index 000000000000..7112c8cfd3fa
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0752-chromium-musl-arm-elf_auxv_t.patch
@@ -0,0 +1,18 @@
+--- a/src/3rdparty/chromium/v8/src/base/cpu.cc
++++ b/src/3rdparty/chromium/v8/src/base/cpu.cc
+@@ -163,6 +163,15 @@ static V8_INLINE void __cpuid(int cpu_in
+ 
+ #if V8_HOST_ARCH_ARM || V8_HOST_ARCH_ARM64
+ 
++#ifndef __GLIBC__
++#include <elf.h>
++#ifdef __LP64__
++typedef Elf64_auxv_t elf_auxv_t;
++#else
++typedef Elf32_auxv_t elf_auxv_t;
++#endif
++#endif
++
+ static uint32_t ReadELFHWCaps() {
+   uint32_t result = 0;
+ #if V8_GLIBC_PREREQ(2, 16)
diff --git a/srcpkgs/qt6-webengine/patches/0801-chromium-i686-vaapi-fpermissive.patch b/srcpkgs/qt6-webengine/patches/0801-chromium-i686-vaapi-fpermissive.patch
new file mode 100644
index 000000000000..3d4043e03b89
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0801-chromium-i686-vaapi-fpermissive.patch
@@ -0,0 +1,24 @@
+--- a/src/3rdparty/chromium/media/gpu/vaapi/BUILD.gn
++++ b/src/3rdparty/chromium/media/gpu/vaapi/BUILD.gn
+@@ -14,6 +14,10 @@ import("//ui/gl/features.gni")
+ assert(is_linux || is_chromeos)
+ assert(use_vaapi)
+ 
++config("vaapi_permissive") {
++  cflags = [ "-fpermissive" ]
++}
++
+ generate_stubs("libva_stubs") {
+   extra_header = "va_stub_header.fragment"
+   sigs = [ "va.sigs" ]
+@@ -136,6 +140,10 @@ source_set("vaapi") {
+     ]
+   }
+ 
++  if (target_cpu == "x86") {
++    configs += [ ":vaapi_permissive" ]
++  }
++
+   if (use_x11) {
+     deps += [ "//ui/gfx/x" ]
+     sources += [
diff --git a/srcpkgs/qt6-webengine/patches/0900-xxx-ppc64le-libvpx.patch b/srcpkgs/qt6-webengine/patches/0900-xxx-ppc64le-libvpx.patch
new file mode 100644
index 000000000000..5c9566b56bd4
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0900-xxx-ppc64le-libvpx.patch
@@ -0,0 +1,65 @@
+Uses generic target for now. To use ppc64le, change --target to ppc64le-gnu
+and add --enable-vsx, and change generic to ppc for the rtcd header.
+
+From 18e6c5c55cfae0cfb458d8210d7bc709360a0e90 Mon Sep 17 00:00:00 2001
+From: q66 <daniel@octaforge.org>
+Date: Wed, 9 Sep 2020 19:08:25 +0200
+Subject: [PATCH] enable generation of ppc64 libvpx bits
+
+this doesn't update the gni file, that's done from
+the template by running the appropriate scripts
+---
+ third_party/libvpx/BUILD.gn        | 4 ++++
+ third_party/libvpx/generate_gni.sh | 9 +++++++++
+ 2 files changed, 13 insertions(+)
+
+--- a/src/3rdparty/chromium/third_party/libvpx/BUILD.gn
++++ b/src/3rdparty/chromium/third_party/libvpx/BUILD.gn
+@@ -424,6 +424,8 @@ static_library("bundled_libvpx") {
+       sources = libvpx_srcs_arm64
+       public_deps = [ ":libvpx_arm64_headers" ]
+     }
++  } else if (current_cpu == "ppc64") {
++    sources = libvpx_srcs_ppc64
+   }
+ 
+   configs -= [ "//build/config/compiler:chromium_code" ]
+--- a/src/3rdparty/chromium/third_party/libvpx/generate_gni.sh
++++ b/src/3rdparty/chromium/third_party/libvpx/generate_gni.sh
+@@ -374,6 +374,7 @@ gen_config_files linux/arm-neon-highbd "
+ gen_config_files linux/arm64-highbd "--target=armv8-linux-gcc ${all_platforms} ${HIGHBD}"
+ gen_config_files linux/mipsel "--target=mips32-linux-gcc ${all_platforms}"
+ gen_config_files linux/mips64el "--target=mips64-linux-gcc ${all_platforms}"
++gen_config_files linux/ppc64 "--target=generic-gnu $HIGHBD ${all_platforms}"
+ gen_config_files linux/generic "--target=generic-gnu $HIGHBD ${all_platforms}"
+ gen_config_files win/arm64 "--target=arm64-win64-vs15 ${all_platforms} ${HIGHBD}"
+ gen_config_files win/ia32 "--target=x86-win32-vs14 ${all_platforms} ${x86_platforms}"
+@@ -399,6 +400,7 @@ lint_config linux/arm-neon-highbd
+ lint_config linux/arm64-highbd
+ lint_config linux/mipsel
+ lint_config linux/mips64el
++lint_config linux/ppc64
+ lint_config linux/generic
+ lint_config win/arm64
+ lint_config win/ia32
+@@ -428,6 +430,7 @@ gen_rtcd_header linux/arm-neon-highbd ar
+ gen_rtcd_header linux/arm64-highbd armv8
+ gen_rtcd_header linux/mipsel mipsel
+ gen_rtcd_header linux/mips64el mips64el
++gen_rtcd_header linux/ppc64 generic
+ gen_rtcd_header linux/generic generic
+ gen_rtcd_header win/arm64 armv8
+ gen_rtcd_header win/ia32 x86 "${require_sse2}"
+@@ -513,6 +516,12 @@ if [ -z $ONLY_CONFIGS ]; then
+ 
+   echo "MIPS64 source list is identical to MIPS source list. No need to generate it."
+ 
++  echo "Generate ppc64 source list."
++  config=$(print_config_basic linux/ppc64)
++  make_clean
++  make libvpx_srcs.txt target=libs $config > /dev/null
++  convert_srcs_to_project_files libvpx_srcs.txt libvpx_srcs_ppc64
++
+   echo "Generate NaCl source list."
+   config=$(print_config_basic nacl)
+   make_clean
diff --git a/srcpkgs/qt6-webengine/patches/0901-xxx-ppc64le-sandbox-linux-stat.patch b/srcpkgs/qt6-webengine/patches/0901-xxx-ppc64le-sandbox-linux-stat.patch
new file mode 100644
index 000000000000..4b8e6320601c
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0901-xxx-ppc64le-sandbox-linux-stat.patch
@@ -0,0 +1,31 @@
+--- a/src/3rdparty/chromium/sandbox/linux/system_headers/linux_stat.h
++++ b/src/3rdparty/chromium/sandbox/linux/system_headers/linux_stat.h
+@@ -155,6 +155,28 @@ struct kernel_stat {
+   unsigned int __unused4;
+   unsigned int __unused5;
+ };
++#elif defined(__powerpc64__)
++struct kernel_stat {
++  unsigned long	st_dev;
++  unsigned long	st_ino;
++  unsigned long	st_nlink;
++  unsigned int	st_mode;
++  unsigned int	st_uid;
++  unsigned int	st_gid;
++  unsigned long	st_rdev;
++  long		st_size;
++  unsigned long	st_blksize;
++  unsigned long	st_blocks;
++  unsigned long	st_atime_;
++  unsigned long	st_atime_nsec_;
++  unsigned long	st_mtime_;
++  unsigned long	st_mtime_nsec_;
++  unsigned long	st_ctime_;
++  unsigned long	st_ctime_nsec_;
++  unsigned long	__unused4;
++  unsigned long	__unused5;
++  unsigned long	__unused6;
++};
+ #endif
+ 
+ #if !defined(AT_EMPTY_PATH)
diff --git a/srcpkgs/qt6-webengine/patches/0902-xxx-ppc64le-support.patch b/srcpkgs/qt6-webengine/patches/0902-xxx-ppc64le-support.patch
new file mode 100644
index 000000000000..33d415e55f69
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0902-xxx-ppc64le-support.patch
@@ -0,0 +1,3556 @@
+commit 2c013a317b1114ef67cdbbc30824b28907b9ea94
+Author: Daniel Kolesa <daniel@octaforge.org>
+Date:   Wed Mar 3 19:08:29 2021 +0100
+
+    ppc64le support
+
+--- a/src/3rdparty/chromium/sandbox/features.gni
++++ b/src/3rdparty/chromium/sandbox/features.gni
+@@ -11,7 +11,8 @@ import("//build/config/nacl/config.gni")
+ use_seccomp_bpf = (is_linux || is_chromeos || is_android) &&
+                   (current_cpu == "x86" || current_cpu == "x64" ||
+                    current_cpu == "arm" || current_cpu == "arm64" ||
+-                   current_cpu == "mipsel" || current_cpu == "mips64el")
++                   current_cpu == "mipsel" || current_cpu == "mips64el" ||
++                   current_cpu == "ppc64")
+ 
+ use_seccomp_bpf = use_seccomp_bpf || is_nacl_nonsfi
+ 
+--- a/src/3rdparty/chromium/sandbox/linux/BUILD.gn
++++ b/src/3rdparty/chromium/sandbox/linux/BUILD.gn
+@@ -433,6 +433,8 @@ component("sandbox_services") {
+ 
+ source_set("sandbox_services_headers") {
+   sources = [
++    "system_headers/ppc64_linux_syscalls.h",
++    "system_headers/ppc64_linux_ucontext.h",
+     "system_headers/arm64_linux_syscalls.h",
+     "system_headers/arm_linux_syscalls.h",
+     "system_headers/arm_linux_ucontext.h",
+--- a/src/3rdparty/chromium/sandbox/linux/bpf_dsl/linux_syscall_ranges.h
++++ b/src/3rdparty/chromium/sandbox/linux/bpf_dsl/linux_syscall_ranges.h
+@@ -56,6 +56,13 @@
+ #define MAX_PUBLIC_SYSCALL __NR_syscalls
+ #define MAX_SYSCALL MAX_PUBLIC_SYSCALL
+ 
++#elif defined(__powerpc64__)
++
++#include <asm/unistd.h>
++#define MIN_SYSCALL 0u
++#define MAX_PUBLIC_SYSCALL 386u
++#define MAX_SYSCALL MAX_PUBLIC_SYSCALL
++
+ #else
+ #error "Unsupported architecture"
+ #endif
+--- a/src/3rdparty/chromium/sandbox/linux/bpf_dsl/seccomp_macros.h
++++ b/src/3rdparty/chromium/sandbox/linux/bpf_dsl/seccomp_macros.h
+@@ -16,6 +16,9 @@
+ #if defined(__mips__)
+ // sys/user.h in eglibc misses size_t definition
+ #include <stddef.h>
++#elif defined(__powerpc64__) && defined(__GLIBC__)
++// Manually define greg_t on ppc64
++typedef unsigned long long greg_t;
+ #endif
+ #endif
+ 
+@@ -346,6 +349,59 @@ struct regs_struct {
+ #define SECCOMP_PT_PARM4(_regs) (_regs).regs[3]
+ #define SECCOMP_PT_PARM5(_regs) (_regs).regs[4]
+ #define SECCOMP_PT_PARM6(_regs) (_regs).regs[5]
++
++#elif defined(__powerpc64__)
++#include <asm/ptrace.h>
++
++typedef struct pt_regs regs_struct;
++
++#ifdef ARCH_CPU_LITTLE_ENDIAN
++#define SECCOMP_ARCH AUDIT_ARCH_PPC64LE
++#else
++#define SECCOMP_ARCH AUDIT_ARCH_PPC64
++#endif
++
++#ifdef __GLIBC__
++#define SECCOMP_REG(_ctx, _reg) ((_ctx)->uc_mcontext.regs->gpr[_reg])
++#else
++#define SECCOMP_REG(_ctx, _reg) (((struct pt_regs *)(_ctx)->uc_mcontext.regs)->gpr[_reg])
++#endif
++
++#define SECCOMP_RESULT(_ctx) SECCOMP_REG(_ctx, 3)
++#define SECCOMP_SYSCALL(_ctx) SECCOMP_REG(_ctx, 0)
++#ifdef __GLIBC__
++#define SECCOMP_IP(_ctx) (_ctx)->uc_mcontext.regs->nip
++#else
++#define SECCOMP_IP(_ctx) ((struct pt_regs *)(_ctx)->uc_mcontext.regs)->nip
++#endif
++#define SECCOMP_PARM1(_ctx) SECCOMP_REG(_ctx, 3)
++#define SECCOMP_PARM2(_ctx) SECCOMP_REG(_ctx, 4)
++#define SECCOMP_PARM3(_ctx) SECCOMP_REG(_ctx, 5)
++#define SECCOMP_PARM4(_ctx) SECCOMP_REG(_ctx, 6)
++#define SECCOMP_PARM5(_ctx) SECCOMP_REG(_ctx, 7)
++#define SECCOMP_PARM6(_ctx) SECCOMP_REG(_ctx, 8)
++
++#define SECCOMP_NR_IDX (offsetof(struct arch_seccomp_data, nr))
++#define SECCOMP_ARCH_IDX (offsetof(struct arch_seccomp_data, arch))
++#define SECCOMP_IP_MSB_IDX \
++  (offsetof(struct arch_seccomp_data, instruction_pointer) + 4)
++#define SECCOMP_IP_LSB_IDX \
++  (offsetof(struct arch_seccomp_data, instruction_pointer) + 0)
++#define SECCOMP_ARG_MSB_IDX(nr) \
++  (offsetof(struct arch_seccomp_data, args) + 8 * (nr) + 4)
++#define SECCOMP_ARG_LSB_IDX(nr) \
++  (offsetof(struct arch_seccomp_data, args) + 8 * (nr) + 0)
++
++#define SECCOMP_PT_RESULT(_regs) (_regs).gpr[3]
++#define SECCOMP_PT_SYSCALL(_regs) (_regs).gpr[0]
++#define SECCOMP_PT_IP(_regs) (_regs).nip
++#define SECCOMP_PT_PARM1(_regs) (_regs).gpr[3]
++#define SECCOMP_PT_PARM2(_regs) (_regs).gpr[4]
++#define SECCOMP_PT_PARM3(_regs) (_regs).gpr[5]
++#define SECCOMP_PT_PARM4(_regs) (_regs).gpr[6]
++#define SECCOMP_PT_PARM5(_regs) (_regs).gpr[7]
++#define SECCOMP_PT_PARM6(_regs) (_regs).gpr[8]
++
+ #else
+ #error Unsupported target platform
+ 
+--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc
++++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc
+@@ -90,7 +90,7 @@ bool IsBaselinePolicyWatched(int sysno)
+          SyscallSets::IsNuma(sysno) ||
+          SyscallSets::IsPrctl(sysno) ||
+          SyscallSets::IsProcessGroupOrSession(sysno) ||
+-#if defined(__i386__) || \
++#if defined(__i386__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+          SyscallSets::IsSocketCall(sysno) ||
+ #endif
+@@ -258,7 +258,7 @@ ResultExpr EvaluateSyscallImpl(int fs_de
+   }
+ 
+ #if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
+-    defined(__aarch64__)
++    defined(__aarch64__) || defined(__powerpc64__)
+   if (sysno == __NR_mmap)
+     return RestrictMmapFlags();
+ #endif
+@@ -279,7 +279,7 @@ ResultExpr EvaluateSyscallImpl(int fs_de
+     return RestrictPrctl();
+ 
+ #if defined(__x86_64__) || defined(__arm__) || defined(__mips__) || \
+-    defined(__aarch64__)
++    defined(__aarch64__) || defined(__powerpc64__)
+   if (sysno == __NR_socketpair) {
+     // Only allow AF_UNIX, PF_UNIX. Crash if anything else is seen.
+     static_assert(AF_UNIX == PF_UNIX,
+@@ -343,7 +343,8 @@ ResultExpr EvaluateSyscallImpl(int fs_de
+   }
+ 
+ #if defined(__i386__) || \
+-    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
++    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
++    defined(__powerpc64__)
+   if (SyscallSets::IsSocketCall(sysno))
+     return RestrictSocketcallCommand();
+ #endif
+--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/baseline_policy_unittest.cc
++++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/baseline_policy_unittest.cc
+@@ -317,7 +317,7 @@ TEST_BASELINE_SIGSYS(__NR_sysinfo)
+ TEST_BASELINE_SIGSYS(__NR_syslog)
+ TEST_BASELINE_SIGSYS(__NR_timer_create)
+ 
+-#if !defined(__aarch64__)
++#if !defined(__aarch64__) && !defined(__powerpc64__)
+ TEST_BASELINE_SIGSYS(__NR_inotify_init)
+ TEST_BASELINE_SIGSYS(__NR_vserver)
+ #endif
+--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc
++++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc
+@@ -40,6 +40,7 @@
+ #include <sys/ptrace.h>
+ #if (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) && \
+     !defined(__arm__) && !defined(__aarch64__) &&           \
++    !defined(__powerpc64__) &&                              \
+     !defined(PTRACE_GET_THREAD_AREA)
+ // Also include asm/ptrace-abi.h since ptrace.h in older libc (for instance
+ // the one in Ubuntu 16.04 LTS) is missing PTRACE_GET_THREAD_AREA.
+@@ -49,6 +50,11 @@
+ #endif
+ #endif  // !OS_NACL_NONSFI
+ 
++// On PPC64, TCGETS is defined in terms of struct termios, so we must include termios.h
++#ifdef __powerpc64__
++#include <termios.h>
++#endif
++
+ #if defined(OS_ANDROID)
+ 
+ #if !defined(F_DUPFD_CLOEXEC)
+@@ -106,6 +112,14 @@ inline bool IsArchitectureMips() {
+ #endif
+ }
+ 
++inline bool IsArchitecturePPC64() {
++#if defined(__powerpc64__)
++  return true;
++#else
++  return false;
++#endif
++}
++
+ // Ubuntu's version of glibc has a race condition in sem_post that can cause
+ // it to call futex(2) with bogus op arguments. To workaround this, we need
+ // to allow those futex(2) calls to fail with EINVAL, instead of crashing the
+@@ -270,6 +284,8 @@ ResultExpr RestrictFcntlCommands() {
+   uint64_t kOLargeFileFlag = O_LARGEFILE;
+   if (IsArchitectureX86_64() || IsArchitectureI386() || IsArchitectureMips())
+     kOLargeFileFlag = 0100000;
++  else if (IsArchitecturePPC64())
++    kOLargeFileFlag = 0200000;
+ 
+   const Arg<int> cmd(1);
+   const Arg<long> long_arg(2);
+@@ -287,7 +303,16 @@ ResultExpr RestrictFcntlCommands() {
+               F_SETLKW,
+               F_GETLK,
+               F_DUPFD,
+-              F_DUPFD_CLOEXEC),
++              F_DUPFD_CLOEXEC
++#if defined(__powerpc64__)
++// On PPC64, F_SETLK, F_GETLK, F_SETLKW are defined as the 64-bit variants
++// but glibc will sometimes still use the 32-bit versions. Allow both.
++              ,
++              5, /* F_GETLK (32) */
++              6, /* F_SETLK (32) */
++              7  /* F_SETLKW (32) */
++#endif
++	     ),
+              Allow())
+       .Case(F_SETFL,
+             If((long_arg & ~kAllowedMask) == 0, Allow()).Else(CrashSIGSYS()))
+@@ -297,7 +322,7 @@ ResultExpr RestrictFcntlCommands() {
+   // clang-format on
+ }
+ 
+-#if defined(__i386__) || defined(__mips__)
++#if defined(__i386__) || defined(__mips__) || defined(__powerpc64__)
+ ResultExpr RestrictSocketcallCommand() {
+   // Unfortunately, we are unable to restrict the first parameter to
+   // socketpair(2). Whilst initially sounding bad, it's noteworthy that very
+@@ -454,7 +479,7 @@ ResultExpr RestrictPtrace() {
+ #endif
+   return Switch(request)
+       .CASES((
+-#if !defined(__aarch64__)
++#if !defined(__aarch64__) && !defined(__powerpc64__)
+                  PTRACE_GETREGS, PTRACE_GETFPREGS,
+ #if defined(TRACE_GET_THREAD_AREA)
+                  PTRACE_GET_THREAD_AREA,
+--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.h
++++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.h
+@@ -49,7 +49,7 @@ SANDBOX_EXPORT bpf_dsl::ResultExpr Restr
+ // O_NONBLOCK | O_SYNC | O_LARGEFILE | O_CLOEXEC | O_NOATIME.
+ SANDBOX_EXPORT bpf_dsl::ResultExpr RestrictFcntlCommands();
+ 
+-#if defined(__i386__) || defined(__mips__)
++#if defined(__i386__) || defined(__mips__) || defined(__powerpc64__)
+ // Restrict socketcall(2) to only allow socketpair(2), send(2), recv(2),
+ // sendto(2), recvfrom(2), shutdown(2), sendmsg(2) and recvmsg(2).
+ SANDBOX_EXPORT bpf_dsl::ResultExpr RestrictSocketcallCommand();
+--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
++++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
+@@ -28,7 +28,7 @@ bool SyscallSets::IsKill(int sysno) {
+ bool SyscallSets::IsAllowedGettime(int sysno) {
+   switch (sysno) {
+     case __NR_gettimeofday:
+-#if defined(__i386__) || defined(__x86_64__) || \
++#if defined(__i386__) || defined(__x86_64__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_time:
+ #endif
+@@ -51,12 +51,12 @@ bool SyscallSets::IsAllowedGettime(int s
+                                     // filtered by RestrictClockID().
+     case __NR_clock_nanosleep_time64:  // Parameters filtered by RestrictClockID().
+ #endif
+-#if defined(__i386__) || \
++#if defined(__i386__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_ftime:  // Obsolete.
+ #endif
+     case __NR_settimeofday:  // Privileged.
+-#if defined(__i386__) || \
++#if defined(__i386__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_stime:
+ #endif
+@@ -135,7 +135,7 @@ bool SyscallSets::IsFileSystem(int sysno
+     case __NR_faccessat:  // EPERM not a valid errno.
+     case __NR_fchmodat:
+     case __NR_fchownat:  // Should be called chownat ?
+-#if defined(__x86_64__) || defined(__aarch64__)
++#if defined(__x86_64__) || defined(__aarch64__) || defined(__powerpc64__)
+     case __NR_newfstatat:  // fstatat(). EPERM not a valid errno.
+ #elif defined(__i386__) || defined(__arm__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+@@ -154,7 +154,7 @@ bool SyscallSets::IsFileSystem(int sysno
+     case __NR_memfd_create:
+     case __NR_mkdirat:
+     case __NR_mknodat:
+-#if defined(__i386__)
++#if defined(__i386__) || defined(__powerpc64__)
+     case __NR_oldlstat:
+     case __NR_oldstat:
+ #endif
+@@ -167,7 +167,7 @@ bool SyscallSets::IsFileSystem(int sysno
+     case __NR_stat64:
+ #endif
+     case __NR_statfs:  // EPERM not a valid errno.
+-#if defined(__i386__) || defined(__arm__) || \
++#if defined(__i386__) || defined(__arm__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_statfs64:
+ #endif
+@@ -179,7 +179,8 @@ bool SyscallSets::IsFileSystem(int sysno
+     case __NR_truncate64:
+ #endif
+     case __NR_unlinkat:
+-#if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
++#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
++    defined(__powerpc64__)
+     case __NR_utime:
+ #endif
+     case __NR_utimensat:  // New.
+@@ -204,7 +205,8 @@ bool SyscallSets::IsAllowedFileSystemAcc
+ #endif
+       return true;
+ // TODO(jln): these should be denied gracefully as well (moved below).
+-#if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
++#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
++    defined(__powerpc64__)
+     case __NR_fadvise64:  // EPERM not a valid errno.
+ #endif
+ #if defined(__i386__)
+@@ -216,12 +218,12 @@ bool SyscallSets::IsAllowedFileSystemAcc
+     case __NR_fdatasync:  // EPERM not a valid errno.
+     case __NR_flock:      // EPERM not a valid errno.
+     case __NR_fstatfs:    // Give information about the whole filesystem.
+-#if defined(__i386__) || defined(__arm__) || \
++#if defined(__i386__) || defined(__arm__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_fstatfs64:
+ #endif
+     case __NR_fsync:  // EPERM not a valid errno.
+-#if defined(__i386__)
++#if defined(__i386__) || defined(__powerpc64__)
+     case __NR_oldfstat:
+ #endif
+ #if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
+@@ -229,6 +231,8 @@ bool SyscallSets::IsAllowedFileSystemAcc
+     case __NR_sync_file_range:  // EPERM not a valid errno.
+ #elif defined(__arm__)
+     case __NR_arm_sync_file_range:  // EPERM not a valid errno.
++#elif defined(__powerpc64__)
++    case __NR_sync_file_range2: // EPERM not a valid errno.
+ #endif
+     default:
+       return false;
+@@ -248,7 +252,7 @@ bool SyscallSets::IsDeniedFileSystemAcce
+     case __NR_getdents:    // EPERM not a valid errno.
+ #endif
+     case __NR_getdents64:  // EPERM not a valid errno.
+-#if defined(__i386__) || \
++#if defined(__i386__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_readdir:
+ #endif
+@@ -290,7 +294,7 @@ bool SyscallSets::IsGetSimpleId(int sysn
+ bool SyscallSets::IsProcessPrivilegeChange(int sysno) {
+   switch (sysno) {
+     case __NR_capset:
+-#if defined(__i386__) || defined(__x86_64__)
++#if defined(__i386__) || defined(__x86_64__) || defined(__powerpc64__)
+     case __NR_ioperm:  // Intel privilege.
+     case __NR_iopl:    // Intel privilege.
+ #endif
+@@ -340,7 +344,7 @@ bool SyscallSets::IsAllowedSignalHandlin
+     case __NR_rt_sigprocmask:
+     case __NR_rt_sigreturn:
+     case __NR_rt_sigtimedwait:
+-#if defined(__i386__) || defined(__arm__) || \
++#if defined(__i386__) || defined(__arm__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_rt_sigtimedwait_time64:
+     case __NR_sigaction:
+@@ -357,7 +361,7 @@ bool SyscallSets::IsAllowedSignalHandlin
+     case __NR_signalfd:
+ #endif
+     case __NR_signalfd4:
+-#if defined(__i386__) || defined(__arm__) || \
++#if defined(__i386__) || defined(__arm__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_sigpending:
+     case __NR_sigsuspend:
+@@ -382,7 +386,7 @@ bool SyscallSets::IsAllowedOperationOnFd
+ #endif
+     case __NR_dup3:
+ #if defined(__x86_64__) || defined(__arm__) || defined(__mips__) || \
+-    defined(__aarch64__)
++    defined(__aarch64__) || defined(__powerpc64__)
+     case __NR_shutdown:
+ #endif
+       return true;
+@@ -416,7 +420,7 @@ bool SyscallSets::IsAllowedProcessStartO
+     case __NR_membarrier:
+     case __NR_wait4:
+     case __NR_waitid:
+-#if defined(__i386__)
++#if defined(__i386__) || defined(__powerpc64__)
+     case __NR_waitpid:
+ #endif
+ #if !defined(__GLIBC__)
+@@ -438,7 +442,7 @@ bool SyscallSets::IsAllowedProcessStartO
+     case __NR_set_tid_address:
+ #endif
+     case __NR_unshare:
+-#if !defined(__mips__) && !defined(__aarch64__)
++#if !defined(__mips__) && !defined(__aarch64__) || defined(__powerpc64__)
+     case __NR_vfork:
+ #endif
+     default:
+@@ -491,7 +495,7 @@ bool SyscallSets::IsAllowedGetOrModifySo
+       return true;
+     default:
+ #if defined(__x86_64__) || defined(__arm__) || defined(__mips__) || \
+-    defined(__aarch64__)
++    defined(__aarch64__) || defined(__powerpc64__)
+     case __NR_socketpair:  // We will want to inspect its argument.
+ #endif
+       return false;
+@@ -501,7 +505,7 @@ bool SyscallSets::IsAllowedGetOrModifySo
+ bool SyscallSets::IsDeniedGetOrModifySocket(int sysno) {
+   switch (sysno) {
+ #if defined(__x86_64__) || defined(__arm__) || defined(__mips__) || \
+-    defined(__aarch64__)
++    defined(__aarch64__) || defined(__powerpc64__)
+     case __NR_accept:
+     case __NR_accept4:
+     case __NR_bind:
+@@ -515,7 +519,7 @@ bool SyscallSets::IsDeniedGetOrModifySoc
+   }
+ }
+ 
+-#if defined(__i386__) || \
++#if defined(__i386__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+ // Big multiplexing system call for sockets.
+ bool SyscallSets::IsSocketCall(int sysno) {
+@@ -530,7 +534,8 @@ bool SyscallSets::IsSocketCall(int sysno
+ }
+ #endif
+ 
+-#if defined(__x86_64__) || defined(__arm__) || defined(__mips__)
++#if defined(__x86_64__) || defined(__arm__) || defined(__mips__) || \
++    defined(__powerpc64__)
+ bool SyscallSets::IsNetworkSocketInformation(int sysno) {
+   switch (sysno) {
+     case __NR_getpeername:
+@@ -558,7 +563,7 @@ bool SyscallSets::IsAllowedAddressSpaceA
+     case __NR_mincore:
+     case __NR_mlockall:
+ #if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
+-    defined(__aarch64__)
++    defined(__aarch64__) || defined(__powerpc64__)
+     case __NR_mmap:
+ #endif
+ #if defined(__i386__) || defined(__arm__) || \
+@@ -589,7 +594,7 @@ bool SyscallSets::IsAllowedAddressSpaceA
+ bool SyscallSets::IsAllowedGeneralIo(int sysno) {
+   switch (sysno) {
+     case __NR_lseek:
+-#if defined(__i386__) || defined(__arm__) || \
++#if defined(__i386__) || defined(__arm__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR__llseek:
+ #endif
+@@ -609,27 +614,27 @@ bool SyscallSets::IsAllowedGeneralIo(int
+     case __NR_read:
+     case __NR_readv:
+     case __NR_pread64:
+-#if defined(__arm__) || \
++#if defined(__arm__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_recv:
+ #endif
+ #if defined(__x86_64__) || defined(__arm__) || defined(__mips__) || \
+-    defined(__aarch64__)
++    defined(__aarch64__) || defined(__powerpc64__)
+     case __NR_recvfrom:  // Could specify source.
+     case __NR_recvmsg:   // Could specify source.
+ #endif
+-#if defined(__i386__) || defined(__x86_64__)
++#if defined(__i386__) || defined(__x86_64__) || defined(__powerpc64__)
+     case __NR_select:
+ #endif
+-#if defined(__i386__) || defined(__arm__) || defined(__mips__)
++#if defined(__i386__) || defined(__arm__) || defined(__mips__) || defined(__powerpc64__)
+     case __NR__newselect:
+ #endif
+-#if defined(__arm__) || \
++#if defined(__arm__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_send:
+ #endif
+ #if defined(__x86_64__) || defined(__arm__) || defined(__mips__) || \
+-    defined(__aarch64__)
++    defined(__aarch64__) || defined(__powerpc64__)
+     case __NR_sendmsg:  // Could specify destination.
+     case __NR_sendto:   // Could specify destination.
+ #endif
+@@ -684,7 +689,7 @@ bool SyscallSets::IsAllowedBasicSchedule
+     case __NR_nanosleep:
+       return true;
+     case __NR_getpriority:
+-#if defined(__i386__) || defined(__arm__) || \
++#if defined(__i386__) || defined(__arm__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_nice:
+ #endif
+@@ -696,7 +701,7 @@ bool SyscallSets::IsAllowedBasicSchedule
+ 
+ bool SyscallSets::IsAdminOperation(int sysno) {
+   switch (sysno) {
+-#if defined(__i386__) || defined(__arm__) || \
++#if defined(__i386__) || defined(__arm__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_bdflush:
+ #endif
+@@ -713,7 +718,8 @@ bool SyscallSets::IsAdminOperation(int s
+ 
+ bool SyscallSets::IsKernelModule(int sysno) {
+   switch (sysno) {
+-#if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
++#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
++    defined(__powerpc64__)
+     case __NR_create_module:
+     case __NR_get_kernel_syms:  // Should ENOSYS.
+     case __NR_query_module:
+@@ -745,7 +751,7 @@ bool SyscallSets::IsFsControl(int sysno)
+     case __NR_quotactl:
+     case __NR_swapoff:
+     case __NR_swapon:
+-#if defined(__i386__) || \
++#if defined(__i386__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_umount:
+ #endif
+@@ -762,7 +768,7 @@ bool SyscallSets::IsNuma(int sysno) {
+     case __NR_getcpu:
+     case __NR_mbind:
+ #if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
+-    defined(__aarch64__)
++    defined(__aarch64__) || defined(__powerpc64__)
+     case __NR_migrate_pages:
+ #endif
+     case __NR_move_pages:
+@@ -797,13 +803,13 @@ bool SyscallSets::IsGlobalProcessEnviron
+   switch (sysno) {
+     case __NR_acct:  // Privileged.
+ #if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
+-    defined(__aarch64__)
++    defined(__aarch64__) || defined(__powerpc64__)
+     case __NR_getrlimit:
+ #endif
+-#if defined(__i386__) || defined(__arm__)
++#if defined(__i386__) || defined(__arm__) || defined(__powerpc64__)
+     case __NR_ugetrlimit:
+ #endif
+-#if defined(__i386__) || \
++#if defined(__i386__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_ulimit:
+ #endif
+@@ -838,7 +844,7 @@ bool SyscallSets::IsGlobalSystemStatus(i
+ #endif
+     case __NR_sysinfo:
+     case __NR_uname:
+-#if defined(__i386__)
++#if defined(__i386__) || defined(__powerpc64__)
+     case __NR_olduname:
+     case __NR_oldolduname:
+ #endif
+@@ -904,8 +910,16 @@ bool SyscallSets::IsSystemVSemaphores(in
+ }
+ #endif
+ 
++/* shitty hack around Void's 4.19 kernel headers missing those numbers */
++#if defined(__powerpc64__) && !defined(__NR_shmget)
++#define __NR_shmget 395
++#define __NR_shmctl 396
++#define __NR_shmat 397
++#define __NR_shmdt 398
++#endif
++
+ #if defined(__i386__) || defined(__x86_64__) || defined(__arm__) || \
+-    defined(__aarch64__) ||                                         \
++    defined(__aarch64__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_64_BITS))
+ // These give a lot of ambient authority and bypass the setuid sandbox.
+ bool SyscallSets::IsSystemVSharedMemory(int sysno) {
+@@ -936,7 +950,7 @@ bool SyscallSets::IsSystemVMessageQueue(
+ }
+ #endif
+ 
+-#if defined(__i386__) || \
++#if defined(__i386__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+ // Big system V multiplexing system call.
+ bool SyscallSets::IsSystemVIpc(int sysno) {
+@@ -956,7 +970,7 @@ bool SyscallSets::IsAnySystemV(int sysno
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_64_BITS))
+   return IsSystemVMessageQueue(sysno) || IsSystemVSemaphores(sysno) ||
+          IsSystemVSharedMemory(sysno);
+-#elif defined(__i386__) || \
++#elif defined(__i386__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+   return IsSystemVIpc(sysno);
+ #endif
+@@ -1014,7 +1028,8 @@ bool SyscallSets::IsFaNotify(int sysno)
+ bool SyscallSets::IsTimer(int sysno) {
+   switch (sysno) {
+     case __NR_getitimer:
+-#if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
++#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
++    defined(__powerpc64__)
+     case __NR_alarm:
+ #endif
+     case __NR_setitimer:
+@@ -1096,17 +1111,20 @@ bool SyscallSets::IsMisc(int sysno) {
+     case __NR_syncfs:
+     case __NR_vhangup:
+ // The system calls below are not implemented.
+-#if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
++#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
++    defined(__powerpc64__)
+     case __NR_afs_syscall:
+ #endif
+ #if defined(__i386__) || \
+-    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
++    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
++    defined(__powerpc64__)
+     case __NR_break:
+ #endif
+-#if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
++#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
++    defined(__powerpc64__)
+     case __NR_getpmsg:
+ #endif
+-#if defined(__i386__) || \
++#if defined(__i386__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_gtty:
+     case __NR_idle:
+@@ -1115,20 +1133,21 @@ bool SyscallSets::IsMisc(int sysno) {
+     case __NR_prof:
+     case __NR_profil:
+ #endif
+-#if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
++#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
++    defined(__powerpc64__)
+     case __NR_putpmsg:
+ #endif
+ #if defined(__x86_64__)
+     case __NR_security:
+ #endif
+-#if defined(__i386__) || \
++#if defined(__i386__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_stty:
+ #endif
+-#if defined(__x86_64__)
++#if defined(__x86_64__) || defined(__powerpc64__)
+     case __NR_tuxcall:
+ #endif
+-#if !defined(__aarch64__)
++#if !defined(__aarch64__) && !defined(__powerpc64__)
+     case __NR_vserver:
+ #endif
+       return true;
+--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_sets.h
++++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_sets.h
+@@ -43,13 +43,14 @@ class SANDBOX_EXPORT SyscallSets {
+   static bool IsDeniedGetOrModifySocket(int sysno);
+ 
+ #if defined(__i386__) || \
+-    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
++    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
++    defined(__powerpc64__)
+   // Big multiplexing system call for sockets.
+   static bool IsSocketCall(int sysno);
+ #endif
+ 
+ #if defined(__x86_64__) || defined(__arm__) || defined(__mips__) || \
+-    defined(__aarch64__)
++    defined(__aarch64__) || defined(__powerpc64__)
+   static bool IsNetworkSocketInformation(int sysno);
+ #endif
+ 
+@@ -77,7 +78,7 @@ class SANDBOX_EXPORT SyscallSets {
+   static bool IsSystemVSemaphores(int sysno);
+ #endif
+ #if defined(__i386__) || defined(__x86_64__) || defined(__arm__) || \
+-    defined(__aarch64__) ||                                         \
++    defined(__aarch64__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_64_BITS))
+   // These give a lot of ambient authority and bypass the setuid sandbox.
+   static bool IsSystemVSharedMemory(int sysno);
+@@ -89,7 +90,8 @@ class SANDBOX_EXPORT SyscallSets {
+ #endif
+ 
+ #if defined(__i386__) || \
+-    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
++    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
++    defined(__powerpc64__)
+   // Big system V multiplexing system call.
+   static bool IsSystemVIpc(int sysno);
+ #endif
+--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf/syscall.cc
++++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf/syscall.cc
+@@ -18,7 +18,7 @@ namespace sandbox {
+ namespace {
+ 
+ #if defined(ARCH_CPU_X86_FAMILY) || defined(ARCH_CPU_ARM_FAMILY) || \
+-    defined(ARCH_CPU_MIPS_FAMILY)
++    defined(ARCH_CPU_MIPS_FAMILY) || defined (ARCH_CPU_PPC64_FAMILY)
+ // Number that's not currently used by any Linux kernel ABIs.
+ const int kInvalidSyscallNumber = 0x351d3;
+ #else
+@@ -312,10 +312,54 @@ asm(// We need to be able to tell the ke
+     "2:ret\n"
+     ".cfi_endproc\n"
+     ".size SyscallAsm, .-SyscallAsm\n"
++#elif defined(__powerpc64__)
++    ".text\n"
++    ".align 4\n"
++    ".type SyscallAsm @function\n"
++    "SyscallAsm:\n"
++    ".cfi_startproc\n"
++
++    // Check if r3 is negative
++    "cmpdi 3, 0\n"
++    "bgt 2f\n"
++
++    // Load address of 3f into r3 and return
++    "mflr 10\n"
++    "bl 1f\n"
++    "1: mflr 3\n"
++    "mtlr 10\n"
++    "addi 3, 3, 4*13\n"
++    "blr\n"
++
++    // Load arguments from array into r3-8
++    // save param 3 in r10
++    "2:\n"
++    "mr 0, 3\n"
++    "ld 3, 0(4)\n"
++    "ld 5, 16(4)\n"
++    "ld 6, 24(4)\n"
++    "ld 7, 32(4)\n"
++    "ld 8, 40(4)\n"
++    "ld 4, 8(4)\n"
++    "li 9, 0\n"
++
++    // Enter kernel
++    "sc\n"
++
++    // Magic return address
++    "3:\n"
++    // Like MIPS, ppc64 return values are always positive.
++    // Check for error in cr0.SO and negate upon error
++    "bc 4, 3, 4f\n"
++    "neg 3, 3\n"
++    "4: blr\n"
++
++    ".cfi_endproc\n"
++    ".size SyscallAsm, .-SyscallAsm\n"
+ #endif
+     );  // asm
+ 
+-#if defined(__x86_64__)
++#if defined(__x86_64__) || defined(__powerpc64__)
+ extern "C" {
+ intptr_t SyscallAsm(intptr_t nr, const intptr_t args[6]);
+ }
+@@ -429,6 +473,8 @@ intptr_t Syscall::Call(int nr,
+     ret = inout;
+   }
+ 
++#elif defined(__powerpc64__)
++  intptr_t ret = SyscallAsm(nr, args);
+ #else
+ #error "Unimplemented architecture"
+ #endif
+@@ -445,8 +491,26 @@ void Syscall::PutValueInUcontext(intptr_
+     // needs to be changed back.
+     ret_val = -ret_val;
+     SECCOMP_PARM4(ctx) = 1;
+-  } else
++  } else {
+     SECCOMP_PARM4(ctx) = 0;
++  }
++#endif
++#if defined(__powerpc64__)
++  // Same as MIPS, need to invert ret and set error register (cr0.SO)
++  if (ret_val <= -1 && ret_val >= -4095) {
++    ret_val = -ret_val;
++#ifdef __GLIBC__
++    ctx->uc_mcontext.regs->ccr |= (1 << 28);
++#else
++    ((struct pt_regs *)ctx->uc_mcontext.regs)->ccr |= (1 << 28);
++#endif
++  } else {
++#ifdef __GLIBC__
++    ctx->uc_mcontext.regs->ccr &= ~(1 << 28);
++#else
++    ((struct pt_regs *)ctx->uc_mcontext.regs)->ccr &= ~(1 << 28);
++#endif
++  }
+ #endif
+   SECCOMP_RESULT(ctx) = static_cast<greg_t>(ret_val);
+ }
+--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf/trap.cc
++++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf/trap.cc
+@@ -236,6 +236,20 @@ void Trap::SigSys(int nr, LinuxSigInfo*
+       SetIsInSigHandler();
+     }
+ 
++#if defined(__powerpc64__)
++    // On ppc64+glibc, some syscalls seem to accidentally negate the first
++    // parameter which causes checks against it to fail. For now, manually
++    // negate them back.
++    // TODO(shawn@anastas.io): investigate this issue further
++    auto nr = SECCOMP_SYSCALL(ctx);
++    if (nr == __NR_openat || nr == __NR_mkdirat || nr == __NR_faccessat || nr == __NR_readlinkat ||
++        nr == __NR_renameat || nr == __NR_renameat2 || nr == __NR_newfstatat || nr == __NR_unlinkat) {
++        if (static_cast<int>(SECCOMP_PARM1(ctx)) > 0) {
++            SECCOMP_PARM1(ctx) = -SECCOMP_PARM1(ctx);
++        }
++    }
++#endif
++
+     // Copy the seccomp-specific data into a arch_seccomp_data structure. This
+     // is what we are showing to TrapFnc callbacks that the system call
+     // evaluator registered with the sandbox.
+--- a/src/3rdparty/chromium/sandbox/linux/services/credentials.cc
++++ b/src/3rdparty/chromium/sandbox/linux/services/credentials.cc
+@@ -81,7 +81,7 @@ bool ChrootToSafeEmptyDir() {
+   pid_t pid = -1;
+   alignas(16) char stack_buf[PTHREAD_STACK_MIN];
+ #if defined(ARCH_CPU_X86_FAMILY) || defined(ARCH_CPU_ARM_FAMILY) || \
+-    defined(ARCH_CPU_MIPS_FAMILY)
++    defined(ARCH_CPU_MIPS_FAMILY) || defined(ARCH_CPU_PPC64_FAMILY)
+   // The stack grows downward.
+   void* stack = stack_buf + sizeof(stack_buf);
+ #else
+--- a/src/3rdparty/chromium/sandbox/linux/services/syscall_wrappers.cc
++++ b/src/3rdparty/chromium/sandbox/linux/services/syscall_wrappers.cc
+@@ -61,7 +61,7 @@ long sys_clone(unsigned long flags,
+ #if defined(ARCH_CPU_X86_64)
+   return syscall(__NR_clone, flags, child_stack, ptid, ctid, tls);
+ #elif defined(ARCH_CPU_X86) || defined(ARCH_CPU_ARM_FAMILY) || \
+-    defined(ARCH_CPU_MIPS_FAMILY)
++    defined(ARCH_CPU_MIPS_FAMILY) || defined(ARCH_CPU_PPC64_FAMILY)
+   // CONFIG_CLONE_BACKWARDS defined.
+   return syscall(__NR_clone, flags, child_stack, ptid, tls, ctid);
+ #endif
+--- a/src/3rdparty/chromium/sandbox/linux/syscall_broker/broker_process.cc
++++ b/src/3rdparty/chromium/sandbox/linux/syscall_broker/broker_process.cc
+@@ -165,7 +165,7 @@ bool BrokerProcess::IsSyscallBrokerable(
+ #if defined(__NR_fstatat64)
+     case __NR_fstatat64:
+ #endif
+-#if defined(__x86_64__) || defined(__aarch64__)
++#if defined(__x86_64__) || defined(__aarch64__) || defined(__powerpc64__)
+     case __NR_newfstatat:
+ #endif
+       return !fast_check || allowed_command_set_.test(COMMAND_STAT);
+--- a/src/3rdparty/chromium/sandbox/linux/system_headers/linux_seccomp.h
++++ b/src/3rdparty/chromium/sandbox/linux/system_headers/linux_seccomp.h
+@@ -41,6 +41,9 @@
+ #ifndef EM_AARCH64
+ #define EM_AARCH64 183
+ #endif
++#ifndef EM_PPC64
++#define EM_PPC64 21
++#endif
+ 
+ #ifndef __AUDIT_ARCH_64BIT
+ #define __AUDIT_ARCH_64BIT 0x80000000
+@@ -74,6 +77,14 @@
+ #define AUDIT_ARCH_AARCH64 (EM_AARCH64 | __AUDIT_ARCH_64BIT | __AUDIT_ARCH_LE)
+ #endif
+ 
++#ifndef AUDIT_ARCH_PPC64
++#define AUDIT_ARCH_PPC64 (EM_PPC64 | __AUDIT_ARCH_64BIT)
++#endif
++
++#ifndef AUDIT_ARCH_PPC64LE
++#define AUDIT_ARCH_PPC64LE (EM_PPC64 | __AUDIT_ARCH_64BIT | __AUDIT_ARCH_LE)
++#endif
++
+ // For prctl.h
+ #ifndef PR_SET_SECCOMP
+ #define PR_SET_SECCOMP               22
+--- a/src/3rdparty/chromium/sandbox/linux/system_headers/linux_signal.h
++++ b/src/3rdparty/chromium/sandbox/linux/system_headers/linux_signal.h
+@@ -13,7 +13,7 @@
+ // (not undefined, but defined different values and in different memory
+ // layouts). So, fill the gap here.
+ #if defined(__i386__) || defined(__x86_64__) || defined(__arm__) || \
+-    defined(__aarch64__)
++    defined(__aarch64__) || defined(__powerpc64__)
+ 
+ #define LINUX_SIGHUP 1
+ #define LINUX_SIGINT 2
+--- a/src/3rdparty/chromium/sandbox/linux/system_headers/linux_syscalls.h
++++ b/src/3rdparty/chromium/sandbox/linux/system_headers/linux_syscalls.h
+@@ -35,5 +35,9 @@
+ #include "sandbox/linux/system_headers/arm64_linux_syscalls.h"
+ #endif
+ 
++#if defined(__powerpc64__)
++#include "sandbox/linux/system_headers/ppc64_linux_syscalls.h"
++#endif
++
+ #endif  // SANDBOX_LINUX_SYSTEM_HEADERS_LINUX_SYSCALLS_H_
+ 
+--- a/src/3rdparty/chromium/sandbox/linux/system_headers/linux_ucontext.h
++++ b/src/3rdparty/chromium/sandbox/linux/system_headers/linux_ucontext.h
+@@ -11,6 +11,8 @@
+ #include "sandbox/linux/system_headers/arm_linux_ucontext.h"
+ #elif defined(__i386__)
+ #include "sandbox/linux/system_headers/i386_linux_ucontext.h"
++#elif defined(__powerpc64__)
++#include "sandbox/linux/system_headers/ppc64_linux_ucontext.h"
+ #else
+ #error "No support for your architecture in PNaCl header"
+ #endif
+--- a/src/3rdparty/chromium/sandbox/policy/linux/bpf_renderer_policy_linux.cc
++++ b/src/3rdparty/chromium/sandbox/policy/linux/bpf_renderer_policy_linux.cc
+@@ -15,6 +15,11 @@
+ #include "sandbox/linux/system_headers/linux_syscalls.h"
+ #include "sandbox/policy/linux/sandbox_linux.h"
+ 
++// On PPC64, TCGETS is defined in terms of struct termios, so we must include termios.h
++#ifdef __powerpc64__
++#include <termios.h>
++#endif
++
+ // TODO(vignatti): replace the local definitions below with #include
+ // <linux/dma-buf.h> once kernel version 4.6 becomes widely used.
+ #include <linux/types.h>
+--- a/src/3rdparty/chromium/third_party/angle/src/compiler/translator/InfoSink.h
++++ b/src/3rdparty/chromium/third_party/angle/src/compiler/translator/InfoSink.h
+@@ -93,7 +93,16 @@ class TInfoSinkBase
+             stream.precision(8);
+             stream << f;
+         }
+-        sink.append(stream.str());
++
++        // Hack to work around a bug where negative floating point values
++        // are rendered like '.0.5' instead of '-0.5'
++        std::string res(stream.str());
++
++        if (signbit(f)) { // test if f is negative
++            res[0] = '-';
++        }
++
++        sink.append(res);
+         return *this;
+     }
+     // Write boolean values as their names instead of integral value.
+--- a/src/3rdparty/chromium/third_party/angle/src/libANGLE/Constants.h
++++ b/src/3rdparty/chromium/third_party/angle/src/libANGLE/Constants.h
+@@ -9,6 +9,7 @@
+ #ifndef LIBANGLE_CONSTANTS_H_
+ #define LIBANGLE_CONSTANTS_H_
+ 
++#include <cstddef>
+ #include "common/platform.h"
+ 
+ #include <stdint.h>
+--- a/src/3rdparty/chromium/third_party/boringssl/BUILD.gn
++++ b/src/3rdparty/chromium/third_party/boringssl/BUILD.gn
+@@ -99,6 +99,13 @@ if (is_win && !is_msan && current_cpu !=
+       } else {
+         public_configs = [ ":no_asm_config" ]
+       }
++    } else if (current_cpu == "ppc64") {
++      if (is_linux) {
++        # TODO: ppc64 (be) check
++        sources += crypto_sources_linux_ppc64le
++      } else {
++        public_configs = [ ":no_asm_config" ]
++      }
+     } else {
+       public_configs = [ ":no_asm_config" ]
+     }
+--- a/src/3rdparty/chromium/third_party/breakpad/BUILD.gn
++++ b/src/3rdparty/chromium/third_party/breakpad/BUILD.gn
+@@ -623,7 +623,6 @@ if (is_linux || is_chromeos || is_androi
+       "breakpad/src/client/minidump_file_writer.h",
+       "breakpad/src/common/convert_UTF.cc",
+       "breakpad/src/common/convert_UTF.h",
+-      "breakpad/src/common/linux/breakpad_getcontext.S",
+       "breakpad/src/common/linux/elf_core_dump.cc",
+       "breakpad/src/common/linux/elf_core_dump.h",
+       "breakpad/src/common/linux/elfutils.cc",
+@@ -663,6 +662,15 @@ if (is_linux || is_chromeos || is_androi
+ 
+     libs = [ "dl" ]
+ 
++    if (current_cpu == "ppc64") {
++        defines = [ "HAVE_GETCONTEXT" ]
++        libs += [ "ucontext" ]
++    } else {
++        sources += [
++            "breakpad/src/common/linux/breakpad_getcontext.S"
++        ]
++    }
++
+     include_dirs = [
+       ".",
+       "breakpad/src",
+@@ -712,7 +720,6 @@ if (is_linux || is_chromeos || is_androi
+       "breakpad/src/client/linux/minidump_writer/minidump_writer_unittest.cc",
+       "breakpad/src/client/linux/minidump_writer/minidump_writer_unittest_utils.cc",
+       "breakpad/src/client/linux/minidump_writer/proc_cpuinfo_reader_unittest.cc",
+-      "breakpad/src/common/linux/breakpad_getcontext_unittest.cc",
+       "breakpad/src/common/linux/elf_core_dump_unittest.cc",
+       "breakpad/src/common/linux/file_id_unittest.cc",
+       "breakpad/src/common/linux/linux_libc_support_unittest.cc",
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/raw_context_cpu.h
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/raw_context_cpu.h
+@@ -44,6 +44,8 @@ typedef MDRawContextARM RawContextCPU;
+ typedef MDRawContextARM64_Old RawContextCPU;
+ #elif defined(__mips__)
+ typedef MDRawContextMIPS RawContextCPU;
++#elif defined(__powerpc64__)
++typedef MDRawContextPPC64 RawContextCPU;
+ #else
+ #error "This code has not been ported to your platform yet."
+ #endif
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.cc
+@@ -270,7 +270,54 @@ void ThreadInfo::FillCPUContext(RawConte
+   out->float_save.fir = mcontext.fpc_eir;
+ #endif
+ }
+-#endif  // __mips__
++
++#elif defined(__powerpc64__)
++
++#if !defined(__GLIBC__)
++#include <asm/elf.h>
++#include <asm/ptrace.h>
++#endif
++
++uintptr_t ThreadInfo::GetInstructionPointer() const {
++    return mcontext.gp_regs[PT_NIP];
++}
++
++void ThreadInfo::FillCPUContext(RawContextCPU* out) const {
++    out->context_flags = MD_CONTEXT_PPC64_FULL;
++    for (int i = 0; i < MD_CONTEXT_PPC64_GPR_COUNT; i++)
++        out->gpr[i] = mcontext.gp_regs[i];
++
++    out->lr = mcontext.gp_regs[PT_LNK];
++    out->srr0 = mcontext.gp_regs[PT_NIP];
++    out->srr1 = mcontext.gp_regs[PT_MSR];
++    out->cr = mcontext.gp_regs[PT_CCR];
++    out->xer = mcontext.gp_regs[PT_XER];
++    out->ctr = mcontext.gp_regs[PT_CTR];
++
++#ifdef __GLIBC__
++    for (int i = 0; i < MD_FLOATINGSAVEAREA_PPC_FPR_COUNT; i++)
++        out->float_save.fpregs[i] = mcontext.fp_regs[i];
++
++    out->float_save.fpscr = mcontext.fp_regs[NFPREG-1];
++#else
++    for (int i = 0; i < MD_FLOATINGSAVEAREA_PPC_FPR_COUNT; i++)
++        out->float_save.fpregs[i] = ((uint64_t *)&mcontext.fp_regs)[i];
++
++     out->float_save.fpscr = ((uint64_t *)&mcontext.fp_regs)[ELF_NFPREG-1];
++#endif
++
++    for (int i = 0; i < MD_VECTORSAVEAREA_PPC_VR_COUNT; i++)
++        out->vector_save.save_vr[i] = \
++            {(((uint64_t)vregs.vrregs[i][0]) << 32)
++                          | vregs.vrregs[i][1],
++            (((uint64_t)vregs.vrregs[i][2]) << 32)
++                         | vregs.vrregs[i][3]};
++
++    out->vrsave = vregs.vrsave;
++    out->vector_save.save_vscr = {0, vregs.vscr.vscr_word};
++    out->vector_save.save_vrvalid = 0xFFFFFFFF;
++}
++#endif  // __powerpc64__
+ 
+ void ThreadInfo::GetGeneralPurposeRegisters(void** gp_regs, size_t* size) {
+   assert(gp_regs || size);
+@@ -279,6 +326,11 @@ void ThreadInfo::GetGeneralPurposeRegist
+     *gp_regs = mcontext.gregs;
+   if (size)
+     *size = sizeof(mcontext.gregs);
++#elif defined(__powerpc64__)
++  if (gp_regs)
++    *gp_regs = mcontext.gp_regs;
++  if (size)
++    *size = sizeof(mcontext.gp_regs);
+ #else
+   if (gp_regs)
+     *gp_regs = &regs;
+@@ -294,6 +346,11 @@ void ThreadInfo::GetFloatingPointRegiste
+     *fp_regs = &mcontext.fpregs;
+   if (size)
+     *size = sizeof(mcontext.fpregs);
++#elif defined(__powerpc64__)
++  if (fp_regs)
++    *fp_regs = &mcontext.fp_regs;
++  if (size)
++    *size = sizeof(mcontext.fp_regs);
+ #else
+   if (fp_regs)
+     *fp_regs = &fpregs;
+@@ -302,4 +359,13 @@ void ThreadInfo::GetFloatingPointRegiste
+ #endif
+ }
+ 
++#if defined(__powerpc64__)
++void ThreadInfo::GetVectorRegisters(void** v_regs, size_t* size) {
++    if (v_regs)
++        *v_regs = &vregs;
++    if (size)
++        *size = sizeof(vregs);
++}
++#endif
++
+ }  // namespace google_breakpad
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.h
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.h
+@@ -68,6 +68,10 @@ struct ThreadInfo {
+   // Use the structures defined in <sys/user.h>
+   struct user_regs_struct regs;
+   struct user_fpsimd_struct fpregs;
++#elif defined(__powerpc64__)
++  // Use the structures defined in <sys/ucontext.h>.
++  mcontext_t mcontext;
++  vrregset_t vregs;
+ #elif defined(__mips__)
+   // Use the structure defined in <sys/ucontext.h>.
+   mcontext_t mcontext;
+@@ -84,6 +88,11 @@ struct ThreadInfo {
+ 
+   // Returns the pointer and size of float point register area.
+   void GetFloatingPointRegisters(void** fp_regs, size_t* size);
++
++#if defined(__powerpc64__)
++  // Returns the pointer and size of the vector register area. (PPC64 only)
++  void GetVectorRegisters(void** v_regs, size_t* size);
++#endif
+ };
+ 
+ }  // namespace google_breakpad
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc
+@@ -254,6 +254,60 @@ void UContextReader::FillCPUContext(RawC
+   out->float_save.fir = uc->uc_mcontext.fpc_eir;  // Unused.
+ #endif
+ }
++
++#elif defined(__powerpc64__)
++
++#ifndef __GLIBC__
++#include <asm/elf.h>
++#include <asm/ptrace.h>
++#endif
++
++uintptr_t UContextReader::GetStackPointer(const ucontext_t* uc) {
++    return uc->uc_mcontext.gp_regs[MD_CONTEXT_PPC64_REG_SP];
++}
++
++uintptr_t UContextReader::GetInstructionPointer(const ucontext_t* uc) {
++    return uc->uc_mcontext.gp_regs[PT_NIP];
++}
++
++void UContextReader::FillCPUContext(RawContextCPU* out, const ucontext_t* uc,
++                                    const vrregset_t* vregs) {
++    out->context_flags = MD_CONTEXT_PPC64_FULL;
++
++    for (int i = 0; i < MD_CONTEXT_PPC64_GPR_COUNT; i++)
++        out->gpr[i] = uc->uc_mcontext.gp_regs[i];
++
++    out->lr = uc->uc_mcontext.gp_regs[PT_LNK];
++    out->srr0 = uc->uc_mcontext.gp_regs[PT_NIP];
++    out->srr1 = uc->uc_mcontext.gp_regs[PT_MSR];
++    out->cr = uc->uc_mcontext.gp_regs[PT_CCR];
++    out->xer = uc->uc_mcontext.gp_regs[PT_XER];
++    out->ctr = uc->uc_mcontext.gp_regs[PT_CTR];
++
++#ifdef __GLIBC__
++    for (int i = 0; i < MD_FLOATINGSAVEAREA_PPC_FPR_COUNT; i++)
++        out->float_save.fpregs[i] = uc->uc_mcontext.fp_regs[i];
++
++    out->float_save.fpscr = uc->uc_mcontext.fp_regs[NFPREG-1];
++#else
++    for (int i = 0; i < MD_FLOATINGSAVEAREA_PPC_FPR_COUNT; i++)
++        out->float_save.fpregs[i] = ((uint64_t *)&uc->uc_mcontext.fp_regs)[i];
++
++    out->float_save.fpscr = ((uint64_t *)&uc->uc_mcontext.fp_regs)[ELF_NFPREG-1];
++#endif
++
++    for (int i = 0; i < MD_VECTORSAVEAREA_PPC_VR_COUNT; i++)
++        out->vector_save.save_vr[i] =
++            {(((uint64_t)vregs->vrregs[i][0]) << 32)
++                         | vregs->vrregs[i][1],
++             (((uint64_t)vregs->vrregs[i][2]) << 32)
++                         | vregs->vrregs[i][3]};
++
++    out->vrsave = vregs->vrsave;
++    out->vector_save.save_vscr = {0, vregs->vscr.vscr_word};
++    out->vector_save.save_vrvalid = 0xFFFFFFFF;
++}
++
+ #endif
+ 
+ }  // namespace google_breakpad
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h
+@@ -59,6 +59,9 @@ struct UContextReader {
+ #elif defined(__aarch64__)
+   static void FillCPUContext(RawContextCPU* out, const ucontext_t* uc,
+                              const struct fpsimd_context* fpregs);
++#elif defined(__powerpc64__)
++  static void FillCPUContext(RawContextCPU *out, const ucontext_t *uc,
++                             const vrregset_t* vregs);
+ #else
+   static void FillCPUContext(RawContextCPU* out, const ucontext_t* uc);
+ #endif
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc
+@@ -105,6 +105,13 @@
+ #define PR_SET_PTRACER 0x59616d61
+ #endif
+ 
++/* musl hack, can't include asm/ptrace.h as that causes conflicts */
++#ifndef __GLIBC__
++#if defined(__powerpc64__) && !defined(PT_NIP)
++#define PT_NIP 32
++#endif
++#endif
++
+ namespace google_breakpad {
+ 
+ namespace {
+@@ -461,9 +468,16 @@ bool ExceptionHandler::HandleSignal(int
+     memcpy(&g_crash_context_.float_state, fp_ptr,
+            sizeof(g_crash_context_.float_state));
+   }
++#elif defined(__powerpc64__)
++  // On PPC64, we must copy VR state
++  ucontext_t* uc_ptr = (ucontext_t*)uc;
++  if (uc_ptr->uc_mcontext.v_regs) {
++    memcpy(&g_crash_context_.vector_state, uc_ptr->uc_mcontext.v_regs,
++           sizeof(g_crash_context_.vector_state));
++  }
+ #elif !defined(__ARM_EABI__) && !defined(__mips__)
+   // FP state is not part of user ABI on ARM Linux.
+-  // In case of MIPS Linux FP state is already part of ucontext_t
++  // In case of MIPS, Linux FP state is already part of ucontext_t
+   // and 'float_state' is not a member of CrashContext.
+   ucontext_t* uc_ptr = (ucontext_t*)uc;
+   if (uc_ptr->uc_mcontext.fpregs) {
+@@ -708,11 +722,19 @@ bool ExceptionHandler::WriteMinidump() {
+   }
+ #endif
+ 
+-#if !defined(__ARM_EABI__) && !defined(__aarch64__) && !defined(__mips__)
++#if !defined(__ARM_EABI__) && !defined(__aarch64__) && !defined(__mips__) \
++    && !defined(__powerpc64__)
+   // FPU state is not part of ARM EABI ucontext_t.
+   memcpy(&context.float_state, context.context.uc_mcontext.fpregs,
+          sizeof(context.float_state));
+ #endif
++
++#if defined(__powerpc64__)
++  // Vector registers must be copied on PPC64
++  memcpy(&context.vector_state, context.context.uc_mcontext.v_regs,
++         sizeof(context.vector_state));
++#endif
++
+   context.tid = sys_gettid();
+ 
+   // Add an exception stream to the minidump for better reporting.
+@@ -733,6 +755,9 @@ bool ExceptionHandler::WriteMinidump() {
+ #elif defined(__mips__)
+   context.siginfo.si_addr =
+       reinterpret_cast<void*>(context.context.uc_mcontext.pc);
++#elif defined(__powerpc64__)
++  context.siginfo.si_addr =
++      reinterpret_cast<void*>(context.context.uc_mcontext.gp_regs[PT_NIP]);
+ #else
+ #error "This code has not been ported to your platform yet."
+ #endif
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.h
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.h
+@@ -192,7 +192,11 @@ class ExceptionHandler {
+     siginfo_t siginfo;
+     pid_t tid;  // the crashing thread.
+     ucontext_t context;
+-#if !defined(__ARM_EABI__) && !defined(__mips__)
++#if defined(__powerpc64__)
++    // PPC64's FP state is a part of ucontext_t like MIPS but the vector
++    // state is not, so a struct is needed.
++    vstate_t vector_state;
++#elif !defined(__ARM_EABI__) && !defined(__mips__)
+     // #ifdef this out because FP state is not part of user ABI for Linux ARM.
+     // In case of MIPS Linux FP state is already part of ucontext_t so
+     // 'float_state' is not required.
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler_unittest.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler_unittest.cc
+@@ -307,7 +307,7 @@ TEST(ExceptionHandlerTest, ParallelChild
+   }
+ 
+   // Wait a while until the child should have crashed.
+-  usleep(1000000);
++  usleep(2000000);
+   // Kill the child if it is still running.
+   kill(child, SIGKILL);
+ 
+@@ -559,6 +559,8 @@ const unsigned char kIllegalInstruction[
+ #if defined(__mips__)
+   // mfc2 zero,Impl - usually illegal in userspace.
+   0x48, 0x00, 0x00, 0x48
++#elif defined(__powerpc64__)
++  0x01, 0x01, 0x01, 0x01 // Crashes on a tested POWER9 cpu
+ #else
+   // This crashes with SIGILL on x86/x86-64/arm.
+   0xff, 0xff, 0xff, 0xff
+@@ -754,10 +756,10 @@ TEST(ExceptionHandlerTest, InstructionPo
+ 
+   // These are defined here so the parent can use them to check the
+   // data from the minidump afterwards.
+-  // Use 4k here because the OS will hand out a single page even
++  // Use the page size here because the OS will hand out a single page even
+   // if a smaller size is requested, and this test wants to
+   // test the upper bound of the memory range.
+-  const uint32_t kMemorySize = 4096;  // bytes
++  const uint32_t kMemorySize = getpagesize();  // bytes
+   const int kOffset = kMemorySize - sizeof(kIllegalInstruction);
+ 
+   const pid_t child = fork();
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/microdump_writer/microdump_writer.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/microdump_writer/microdump_writer.cc
+@@ -138,7 +138,9 @@ class MicrodumpWriter {
+                   const MicrodumpExtraInfo& microdump_extra_info,
+                   LinuxDumper* dumper)
+       : ucontext_(context ? &context->context : NULL),
+-#if !defined(__ARM_EABI__) && !defined(__mips__)
++#if defined(__powerpc64__)
++        vector_state_(context ? &context->vector_state : NULL),
++#elif !defined(__ARM_EABI__) && !defined(__mips__)
+         float_state_(context ? &context->float_state : NULL),
+ #endif
+         dumper_(dumper),
+@@ -337,6 +339,8 @@ class MicrodumpWriter {
+ # else
+ #  error "This mips ABI is currently not supported (n32)"
+ #endif
++#elif defined(__powerpc64__)
++    const char kArch[] = "ppc64";
+ #else
+ #error "This code has not been ported to your platform yet"
+ #endif
+@@ -409,7 +413,9 @@ class MicrodumpWriter {
+   void DumpCPUState() {
+     RawContextCPU cpu;
+     my_memset(&cpu, 0, sizeof(RawContextCPU));
+-#if !defined(__ARM_EABI__) && !defined(__mips__)
++#if defined(__powerpc64__)
++    UContextReader::FillCPUContext(&cpu, ucontext_, vector_state_);
++#elif !defined(__ARM_EABI__) && !defined(__mips__)
+     UContextReader::FillCPUContext(&cpu, ucontext_, float_state_);
+ #else
+     UContextReader::FillCPUContext(&cpu, ucontext_);
+@@ -605,7 +611,9 @@ class MicrodumpWriter {
+   void* Alloc(unsigned bytes) { return dumper_->allocator()->Alloc(bytes); }
+ 
+   const ucontext_t* const ucontext_;
+-#if !defined(__ARM_EABI__) && !defined(__mips__)
++#if defined(__powerpc64__)
++  const google_breakpad::vstate_t* const vector_state_;
++#elif !defined(__ARM_EABI__) && !defined(__mips__)
+   const google_breakpad::fpstate_t* const float_state_;
+ #endif
+   LinuxDumper* dumper_;
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/microdump_writer/microdump_writer_unittest.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/microdump_writer/microdump_writer_unittest.cc
+@@ -279,10 +279,19 @@ TEST(MicrodumpWriterTest, BasicWithMappi
+   CrashAndGetMicrodump(mappings, MicrodumpExtraInfo(), &buf);
+   ASSERT_TRUE(ContainsMicrodump(buf));
+ 
++  int page_size = getpagesize();
+ #ifdef __LP64__
+-  ASSERT_NE(std::string::npos,
+-            buf.find("M 0000000000001000 000000000000002A 0000000000001000 "
+-                     "33221100554477668899AABBCCDDEEFF0 libfoo.so"));
++  // This test is only available for the following page sizes
++  ASSERT_TRUE((page_size == 4096) || (page_size == 65536));
++  if (page_size == 4096) {
++    ASSERT_NE(std::string::npos,
++              buf.find("M 0000000000001000 000000000000002A 0000000000001000 "
++                       "33221100554477668899AABBCCDDEEFF0 libfoo.so"));
++  } else {
++    ASSERT_NE(std::string::npos,
++              buf.find("M 0000000000010000 000000000000002A 0000000000010000 "
++                       "33221100554477668899AABBCCDDEEFF0 libfoo.so"));
++  }
+ #else
+   ASSERT_NE(std::string::npos,
+             buf.find("M 00001000 0000002A 00001000 "
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_core_dumper.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_core_dumper.cc
+@@ -117,6 +117,9 @@ bool LinuxCoreDumper::GetThreadInfoByInd
+ #elif defined(__mips__)
+   stack_pointer =
+       reinterpret_cast<uint8_t*>(info->mcontext.gregs[MD_CONTEXT_MIPS_REG_SP]);
++#elif defined(__powerpc64__)
++  stack_pointer =
++      reinterpret_cast<uint8_t*>(info->mcontext.gp_regs[MD_CONTEXT_PPC64_REG_SP]);
+ #else
+ #error "This code hasn't been ported to your platform yet."
+ #endif
+@@ -212,7 +215,10 @@ bool LinuxCoreDumper::EnumerateThreads()
+         memset(&info, 0, sizeof(ThreadInfo));
+         info.tgid = status->pr_pgrp;
+         info.ppid = status->pr_ppid;
+-#if defined(__mips__)
++#if defined(__powerpc64__)
++        for (int i = 0; i < 31; i++)
++            info.mcontext.gp_regs[i] = status->pr_reg[i];
++#elif defined(__mips__)
+ #if defined(__ANDROID__)
+         for (int i = EF_R0; i <= EF_R31; i++)
+           info.mcontext.gregs[i - EF_R0] = status->pr_reg[i];
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper.cc
+@@ -765,7 +765,9 @@ bool LinuxDumper::GetStackInfo(const voi
+       reinterpret_cast<uint8_t*>(int_stack_pointer & ~(page_size - 1));
+ 
+   // The number of bytes of stack which we try to capture.
+-  static const ptrdiff_t kStackToCapture = 32 * 1024;
++  // This now depends on page_size to avoid missing data
++  // on systems with larger page sizes.
++  static const ptrdiff_t kStackToCapture = 8 * page_size;
+ 
+   const MappingInfo* mapping = FindMapping(stack_pointer);
+   if (!mapping)
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper.h
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper.h
+@@ -63,7 +63,8 @@ namespace google_breakpad {
+  (defined(__mips__) && _MIPS_SIM == _ABIO32)
+ typedef Elf32_auxv_t elf_aux_entry;
+ #elif defined(__x86_64) || defined(__aarch64__) || \
+-     (defined(__mips__) && _MIPS_SIM != _ABIO32)
++     (defined(__mips__) && _MIPS_SIM != _ABIO32) || \
++     defined(__powerpc64__)
+ typedef Elf64_auxv_t elf_aux_entry;
+ #endif
+ 
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper_unittest_helper.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper_unittest_helper.cc
+@@ -51,6 +51,8 @@
+ #define TID_PTR_REGISTER "rcx"
+ #elif defined(__mips__)
+ #define TID_PTR_REGISTER "$1"
++#elif defined(__powerpc64__)
++#define TID_PTR_REGISTER "r8"
+ #else
+ #error This test has not been ported to this platform.
+ #endif
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper.cc
+@@ -154,19 +154,27 @@ bool LinuxPtraceDumper::CopyFromProcess(
+   return true;
+ }
+ 
+-bool LinuxPtraceDumper::ReadRegisterSet(ThreadInfo* info, pid_t tid)
+-{
++bool LinuxPtraceDumper::ReadRegisterSet(ThreadInfo* info, pid_t tid) {
+ #ifdef PTRACE_GETREGSET
+   struct iovec io;
+   info->GetGeneralPurposeRegisters(&io.iov_base, &io.iov_len);
+-  if (sys_ptrace(PTRACE_GETREGSET, tid, (void*)NT_PRSTATUS, (void*)&io) == -1) {
++  if (ptrace(PTRACE_GETREGSET, tid, (void*)NT_PRSTATUS, (void*)&io) == -1) {
+     return false;
+   }
+ 
+   info->GetFloatingPointRegisters(&io.iov_base, &io.iov_len);
+-  if (sys_ptrace(PTRACE_GETREGSET, tid, (void*)NT_FPREGSET, (void*)&io) == -1) {
++  if (ptrace(PTRACE_GETREGSET, tid, (void*)NT_FPREGSET, (void*)&io) == -1) {
+     return false;
+   }
++
++#if defined(__powerpc64__)
++  // Grab the vector registers on PPC64 too
++  info->GetVectorRegisters(&io.iov_base, &io.iov_len);
++  if (ptrace(PTRACE_GETREGSET, tid, (void*)NT_PPC_VMX, (void*)&io) == -1) {
++    return false;
++  }
++#endif // defined(__powerpc64__)
++
+   return true;
+ #else
+   return false;
+@@ -303,6 +311,9 @@ bool LinuxPtraceDumper::GetThreadInfoByI
+ #elif defined(__mips__)
+   stack_pointer =
+       reinterpret_cast<uint8_t*>(info->mcontext.gregs[MD_CONTEXT_MIPS_REG_SP]);
++#elif defined(__powerpc64__)
++  stack_pointer =
++      reinterpret_cast<uint8_t*>(info->mcontext.gp_regs[MD_CONTEXT_PPC64_REG_SP]);
+ #else
+ #error "This code hasn't been ported to your platform yet."
+ #endif
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper_unittest.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper_unittest.cc
+@@ -462,6 +462,9 @@ TEST(LinuxPtraceDumperTest, VerifyStackR
+ #elif defined(__mips__)
+     pid_t* process_tid_location =
+         reinterpret_cast<pid_t*>(one_thread.mcontext.gregs[1]);
++#elif defined(__powerpc64__)
++    pid_t* process_tid_location =
++        reinterpret_cast<pid_t*>(one_thread.mcontext.gp_regs[8]);
+ #else
+ #error This test has not been ported to this platform.
+ #endif
+@@ -559,6 +562,8 @@ TEST_F(LinuxPtraceDumperTest, SanitizeSt
+   uintptr_t heap_addr = thread_info.regs.rcx;
+ #elif defined(__mips__)
+   uintptr_t heap_addr = thread_info.mcontext.gregs[1];
++#elif defined(__powerpc64__)
++  uintptr_t heap_addr = thread_info.mcontext.gp_regs[8];
+ #else
+ #error This test has not been ported to this platform.
+ #endif
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.cc
+@@ -136,7 +136,9 @@ class MinidumpWriter {
+       : fd_(minidump_fd),
+         path_(minidump_path),
+         ucontext_(context ? &context->context : NULL),
+-#if !defined(__ARM_EABI__) && !defined(__mips__)
++#if defined(__powerpc64__)
++        vector_state_(context ? &context->vector_state : NULL),
++#elif !defined(__ARM_EABI__) && !defined(__mips__)
+         float_state_(context ? &context->float_state : NULL),
+ #endif
+         dumper_(dumper),
+@@ -468,7 +470,9 @@ class MinidumpWriter {
+         if (!cpu.Allocate())
+           return false;
+         my_memset(cpu.get(), 0, sizeof(RawContextCPU));
+-#if !defined(__ARM_EABI__) && !defined(__mips__)
++#if defined(__powerpc64__)
++        UContextReader::FillCPUContext(cpu.get(), ucontext_, vector_state_);
++#elif !defined(__ARM_EABI__) && !defined(__mips__)
+         UContextReader::FillCPUContext(cpu.get(), ucontext_, float_state_);
+ #else
+         UContextReader::FillCPUContext(cpu.get(), ucontext_);
+@@ -897,7 +901,7 @@ class MinidumpWriter {
+     dirent->location.rva = 0;
+   }
+ 
+-#if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
++#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || defined(__powerpc64__)
+   bool WriteCPUInformation(MDRawSystemInfo* sys_info) {
+     char vendor_id[sizeof(sys_info->cpu.x86_cpu_info.vendor_id) + 1] = {0};
+     static const char vendor_id_name[] = "vendor_id";
+@@ -917,7 +921,9 @@ class MinidumpWriter {
+ 
+     // processor_architecture should always be set, do this first
+     sys_info->processor_architecture =
+-#if defined(__mips__)
++#if defined(__powerpc64__)
++        MD_CPU_ARCHITECTURE_PPC64;
++#elif defined(__mips__)
+ # if _MIPS_SIM == _ABIO32
+         MD_CPU_ARCHITECTURE_MIPS;
+ # elif _MIPS_SIM == _ABI64
+@@ -1333,7 +1339,9 @@ class MinidumpWriter {
+   const char* path_;  // Path to the file where the minidum should be written.
+ 
+   const ucontext_t* const ucontext_;  // also from the signal handler
+-#if !defined(__ARM_EABI__) && !defined(__mips__)
++#if defined(__powerpc64__)
++  const google_breakpad::vstate_t* const vector_state_;
++#elif !defined(__ARM_EABI__) && !defined(__mips__)
+   const google_breakpad::fpstate_t* const float_state_;  // ditto
+ #endif
+   LinuxDumper* dumper_;
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.h
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.h
+@@ -48,6 +48,8 @@ class ExceptionHandler;
+ 
+ #if defined(__aarch64__)
+ typedef struct fpsimd_context fpstate_t;
++#elif defined(__powerpc64__)
++typedef vrregset_t vstate_t;
+ #elif !defined(__ARM_EABI__) && !defined(__mips__)
+ typedef std::remove_pointer<fpregset_t>::type fpstate_t;
+ #endif
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer_unittest.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer_unittest.cc
+@@ -715,6 +715,12 @@ TEST(MinidumpWriterTest, InvalidStackPoi
+ #elif defined(__mips__)
+   context.context.uc_mcontext.gregs[MD_CONTEXT_MIPS_REG_SP] =
+       invalid_stack_pointer;
++#elif defined(__powerpc64__)
++  context.context.uc_mcontext.gp_regs[MD_CONTEXT_PPC64_REG_SP] =
++      invalid_stack_pointer;
++#elif defined(__powerpc64__)
++  context.context.uc_mcontext.gp_regs[MD_CONTEXT_PPC64_REG_SP] =
++      invalid_stack_pointer;
+ #else
+ # error "This code has not been ported to your platform yet."
+ #endif
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/common/linux/memory_mapped_file.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/common/linux/memory_mapped_file.cc
+@@ -65,8 +65,7 @@ bool MemoryMappedFile::Map(const char* p
+   }
+ 
+ #if defined(__x86_64__) || defined(__aarch64__) || \
+-   (defined(__mips__) && _MIPS_SIM == _ABI64)
+-
++   (defined(__mips__) && _MIPS_SIM == _ABI64) || defined(__powerpc64__)
+   struct kernel_stat st;
+   if (sys_fstat(fd, &st) == -1 || st.st_size < 0) {
+ #else
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/common/linux/memory_mapped_file_unittest.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/common/linux/memory_mapped_file_unittest.cc
+@@ -176,9 +176,10 @@ TEST_F(MemoryMappedFileTest, RemapAfterM
+ TEST_F(MemoryMappedFileTest, MapWithOffset) {
+   // Put more data in the test file this time. Offsets can only be
+   // done on page boundaries, so we need a two page file to test this.
+-  const int page_size = 4096;
+-  char data1[2 * page_size];
+-  size_t data1_size = sizeof(data1);
++  const int page_size = getpagesize();
++  char *data1 = static_cast<char*>(malloc(2 * page_size));
++  EXPECT_TRUE(data1 != NULL);
++  size_t data1_size = (2 * page_size);
+   for (size_t i = 0; i < data1_size; ++i) {
+     data1[i] = i & 0x7f;
+   }
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/common/memory_allocator_unittest.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/common/memory_allocator_unittest.cc
+@@ -57,8 +57,9 @@ TEST(PageAllocatorTest, LargeObject) {
+ 
+   EXPECT_EQ(0U, allocator.pages_allocated());
+   uint8_t* p = reinterpret_cast<uint8_t*>(allocator.Alloc(10000));
++  uint64_t expected_pages = 1 + ((10000 - 1) / getpagesize());
+   ASSERT_FALSE(p == NULL);
+-  EXPECT_EQ(3U, allocator.pages_allocated());
++  EXPECT_EQ(expected_pages, allocator.pages_allocated());
+   for (unsigned i = 1; i < 10; ++i) {
+     uint8_t* p = reinterpret_cast<uint8_t*>(allocator.Alloc(i));
+     ASSERT_FALSE(p == NULL);
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/processor/exploitability_linux.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/processor/exploitability_linux.cc
+@@ -202,12 +202,14 @@ bool ExploitabilityLinux::EndedOnIllegal
+   // Check architecture and set architecture variable to corresponding flag
+   // in objdump.
+   switch (context->GetContextCPU()) {
++#if defined(__i386) || defined(__x86_64)
+     case MD_CONTEXT_X86:
+       architecture = "i386";
+       break;
+     case MD_CONTEXT_AMD64:
+       architecture = "i386:x86-64";
+       break;
++#endif
+     default:
+       // Unsupported architecture. Note that ARM architectures are not
+       // supported because objdump does not support ARM.
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/processor/exploitability_unittest.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/processor/exploitability_unittest.cc
+@@ -104,6 +104,8 @@ ExploitabilityFor(const string& filename
+ }
+ 
+ TEST(ExploitabilityTest, TestWindowsEngine) {
++// The following tests are only executable on an x86-class linux machine.
++#if !defined(_WIN32) && (defined(__i386) || defined(__x86_64))
+   ASSERT_EQ(google_breakpad::EXPLOITABILITY_HIGH,
+             ExploitabilityFor("ascii_read_av.dmp"));
+   ASSERT_EQ(google_breakpad::EXPLOITABILITY_HIGH,
+@@ -136,9 +138,12 @@ TEST(ExploitabilityTest, TestWindowsEngi
+             ExploitabilityFor("read_av_clobber_write.dmp"));
+   ASSERT_EQ(google_breakpad::EXPLOITABILITY_LOW,
+             ExploitabilityFor("read_av_conditional.dmp"));
++#endif
+ }
+ 
+ TEST(ExploitabilityTest, TestLinuxEngine) {
++// The following tests are only executable on an x86-class linux machine.
++#if defined(__i386) || defined(__x86_64)
+   ASSERT_EQ(google_breakpad::EXPLOITABILITY_INTERESTING,
+             ExploitabilityFor("linux_null_read_av.dmp"));
+   ASSERT_EQ(google_breakpad::EXPLOITABILITY_HIGH,
+@@ -171,7 +176,8 @@ TEST(ExploitabilityTest, TestLinuxEngine
+             ExploitabilityFor("linux_executable_heap.dmp"));
+   ASSERT_EQ(google_breakpad::EXPLOITABILITY_HIGH,
+             ExploitabilityFor("linux_jmp_to_module_not_exe_region.dmp"));
+-#ifndef _WIN32
++#endif
++#if !defined(_WIN32) && (defined(__i386) || defined(__x86_64))
+   ASSERT_EQ(google_breakpad::EXPLOITABILITY_HIGH,
+             ExploitabilityFor("linux_write_to_nonwritable_module.dmp"));
+   ASSERT_EQ(google_breakpad::EXPLOITABILITY_HIGH,
+@@ -182,10 +188,10 @@ TEST(ExploitabilityTest, TestLinuxEngine
+             ExploitabilityFor("linux_write_to_outside_module_via_math.dmp"));
+   ASSERT_EQ(google_breakpad::EXPLOITABILITY_INTERESTING,
+             ExploitabilityFor("linux_write_to_under_4k.dmp"));
+-#endif  // _WIN32
++#endif  // !defined(_WIN32) && (!defined(__i386) && !defined(__x86_64))
+ }
+ 
+-#ifndef _WIN32
++#if !defined(_WIN32) && (defined(__i386) || defined(__x86_64))
+ TEST(ExploitabilityLinuxUtilsTest, DisassembleBytesTest) {
+   ASSERT_FALSE(ExploitabilityLinuxTest::DisassembleBytes("", NULL, 5, NULL));
+   uint8_t bytes[6] = {0xc7, 0x0, 0x5, 0x0, 0x0, 0x0};
+@@ -301,6 +307,7 @@ TEST(ExploitabilityLinuxUtilsTest, Calcu
+                                                          context,
+                                                          &write_address));
+ }
+-#endif  // _WIN32
++#endif  // !defined(_WIN32) && (defined(__i386) || defined(__x86_64))
++
+ 
+ }  // namespace
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/tools/linux/md2core/minidump-2-core.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/tools/linux/md2core/minidump-2-core.cc
+@@ -77,6 +77,8 @@
+   #define ELF_ARCH  EM_MIPS
+ #elif defined(__aarch64__)
+   #define ELF_ARCH  EM_AARCH64
++#elif defined(__powerpc64__)
++  #define ELF_ARCH  EM_PPC64
+ #endif
+ 
+ #if defined(__arm__)
+@@ -87,6 +89,8 @@ typedef user_regs user_regs_struct;
+ #elif defined (__mips__)
+ // This file-local typedef simplifies the source code.
+ typedef gregset_t user_regs_struct;
++#elif defined(__powerpc64__)
++typedef struct pt_regs user_regs_struct;
+ #endif
+ 
+ using google_breakpad::MDTypeHelper;
+@@ -322,6 +326,12 @@ struct CrashedProcess {
+ #if defined(__aarch64__)
+     user_fpsimd_struct fpregs;
+ #endif
++#if defined(__powerpc64__)
++    mcontext_t mcontext;
++#endif
++#if defined(__powerpc64__)
++    mcontext_t mcontext;
++#endif
+     uintptr_t stack_addr;
+     const uint8_t* stack;
+     size_t stack_length;
+@@ -535,6 +545,38 @@ ParseThreadRegisters(CrashedProcess::Thr
+   thread->mcontext.fpc_eir = rawregs->float_save.fir;
+ #endif
+ }
++#elif defined(__powerpc64__)
++static void
++ParseThreadRegisters(CrashedProcess::Thread* thread,
++                     const MinidumpMemoryRange& range) {
++  const MDRawContextPPC64* rawregs = range.GetData<MDRawContextPPC64>(0);
++
++  for (int i = 0; i < MD_CONTEXT_PPC64_GPR_COUNT; i++)
++    thread->mcontext.gp_regs[i] = rawregs->gpr[i];
++
++  thread->mcontext.gp_regs[PT_LNK] = rawregs->lr;
++  thread->mcontext.gp_regs[PT_NIP] = rawregs->srr0;
++  thread->mcontext.gp_regs[PT_MSR] = rawregs->srr1;
++  thread->mcontext.gp_regs[PT_CCR] = rawregs->cr;
++  thread->mcontext.gp_regs[PT_XER] = rawregs->xer;
++  thread->mcontext.gp_regs[PT_CTR] = rawregs->ctr;
++  thread->mcontext.v_regs->vrsave = rawregs->vrsave;
++
++  for (int i = 0; i < MD_FLOATINGSAVEAREA_PPC_FPR_COUNT; i++)
++      thread->mcontext.fp_regs[i] = rawregs->float_save.fpregs[i];
++
++  thread->mcontext.fp_regs[NFPREG-1] = rawregs->float_save.fpscr;
++
++  for (int i = 0; i < MD_VECTORSAVEAREA_PPC_VR_COUNT; i++) {
++      thread->mcontext.v_regs->vrregs[i][0] = rawregs->vector_save.save_vr[i].high >> 32;
++      thread->mcontext.v_regs->vrregs[i][1] = rawregs->vector_save.save_vr[i].high;
++      thread->mcontext.v_regs->vrregs[i][2] = rawregs->vector_save.save_vr[i].low >> 32;
++      thread->mcontext.v_regs->vrregs[i][3] = rawregs->vector_save.save_vr[i].low;
++  }
++
++  thread->mcontext.v_regs->vscr.vscr_word = rawregs->vector_save.save_vscr.low & 0xFFFFFFFF;
++}
++
+ #else
+ #error "This code has not been ported to your platform yet"
+ #endif
+@@ -623,6 +665,12 @@ ParseSystemInfo(const Options& options,
+ # else
+ #  error "This mips ABI is currently not supported (n32)"
+ # endif
++#elif defined(__powerpc64__)
++  if (sysinfo->processor_architecture != MD_CPU_ARCHITECTURE_PPC64) {
++    fprintf(stderr,
++            "This version of minidump-2-core only supports PPC64.\n");
++    exit(1);
++  }
+ #else
+ #error "This code has not been ported to your platform yet"
+ #endif
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/CONTRIBUTORS
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/CONTRIBUTORS
+@@ -13,3 +13,4 @@ Mark Mentovai <mark@chromium.org>
+ Robert Sesek <rsesek@chromium.org>
+ Scott Graham <scottmg@chromium.org>
+ Joshua Peraza <jperaza@chromium.org>
++Shawn Anastasio <shawn@anastas.io>
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/compat/linux/sys/user.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/compat/linux/sys/user.h
+@@ -15,6 +15,7 @@
+ #ifndef CRASHPAD_COMPAT_LINUX_SYS_USER_H_
+ #define CRASHPAD_COMPAT_LINUX_SYS_USER_H_
+ 
++#include <cstddef>
+ #include_next <sys/user.h>
+ 
+ #include <features.h>
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/minidump/minidump_context.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/minidump/minidump_context.h
+@@ -592,6 +592,70 @@ struct MinidumpContextMIPS64 {
+   uint64_t fir;
+ };
+ 
++//! \brief ppc64-specific flags for MinidumpPPC64::context_flags
++//! Based on minidump_cpu_ppc64.h from breakpad
++enum MinidumpContextPPC64Flags : uint32_t {
++  //! \brief Identifies the context as PPC64.
++  kMinidumpContextPPC64 = 0x01000000,
++
++  //! \brief Indicates the validity of general purpose registers.
++  //!
++  //! Registers `r0`-`r31`, `nip`, `msr`, `lr`, etc. are valid.
++  kMinidumpContextPPC64Base = kMinidumpContextPPC64 | 0x00000001,
++
++  //! \brief Indicates the validity of floating point registers.
++  //!
++  //! Registers `fp0`-`fp31`, `fpscr` are valid.
++  kMinidumpContextPPC64Floating = kMinidumpContextPPC64 | 0x00000008,
++
++  //! \brief Indicates the validity of Altivec/VMX registers.
++  //!
++  //! Registers `v0`-`v31`, `vscr`, `vrsave`.
++  kMinidumpContextPPC64Vector = kMinidumpContextPPC64 | 0x00000020,
++
++  //! \brief Indicates the validity of all registers
++  kMinidumpContextPPC64All = kMinidumpContextPPC64Base     |
++                             kMinidumpContextPPC64Floating |
++                             kMinidumpContextPPC64Vector
++};
++
++//! \brief A PPC64 CPU context carried in a minidump file.
++//! Based on minidump_cpu_ppc64.h from breakpad.
++struct MinidumpContextPPC64 {
++  uint64_t context_flags;
++
++  //! \brief General purpose registers.
++  uint64_t nip;
++  uint64_t msr;
++  uint64_t regs[32];
++  uint64_t ccr;
++  uint64_t xer;
++  uint64_t lnk;
++  uint64_t ctr;
++
++  //! \brief Floating point registers.
++  double fpregs[32];
++
++  //! \brief FPU status register.
++  double fpscr;
++
++  //! \brief Altivec/VMX vector registers.
++  struct {
++      //! \brief Vector registers are 128bits.
++      uint128_struct save_vr[32];
++      uint128_struct save_vscr;
++
++      //! \brief Padding included for breakpad compatibiltiy.
++      uint32_t save_pad5[4];
++
++      //! \brief VRSAVE register.
++      uint32_t save_vrsave;
++
++      //! \brief Padding included for breakpad compatibiltiy.
++      uint32_t save_pad6[7];
++  } vregs;
++};
++
+ }  // namespace crashpad
+ 
+ #endif  // CRASHPAD_MINIDUMP_MINIDUMP_CONTEXT_H_
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/minidump/minidump_context_writer.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/minidump/minidump_context_writer.cc
+@@ -101,6 +101,13 @@ MinidumpContextWriter::CreateFromSnapsho
+       break;
+     }
+ 
++    case kCPUArchitecturePPC64: {
++      context = std::make_unique<MinidumpContextPPC64Writer>();
++      reinterpret_cast<MinidumpContextPPC64Writer*>(context.get())
++          ->InitalizeFromSnapshot(context_snapshot->ppc64);
++      break;
++    }
++
+     default: {
+       LOG(ERROR) << "unknown context architecture "
+                  << context_snapshot->architecture;
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/minidump/minidump_context_writer.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/minidump/minidump_context_writer.h
+@@ -315,6 +315,45 @@ class MinidumpContextMIPS64Writer final
+   DISALLOW_COPY_AND_ASSIGN(MinidumpContextMIPS64Writer);
+ };
+ 
++class MinidumpContextPPC64Writer final : public MinidumpContextWriter {
++ public:
++  MinidumpContextPPC64Writer();
++  ~MinidumpContextPPC64Writer() override;
++
++  //! \brief Initalizes the MinidumpContextPPC64 based on \a context_snapshot.
++  //!
++  //! \param[in] context_snapshot The context snapshot to use as source data.
++  //!
++  //! \note Valid in #kStateMutable. No mutation of context() may be done before
++  //!     calling this method, and it is not normally necessary to alter
++  //!     context() after calling this method.
++  void InitalizeFromSnapshot(const CPUContextPPC64* context_snapshot);
++
++  //! \brief Returns a pointer to the context structure that this object will
++  //!     write.
++  //!
++  //! \attention This returns a non-`const` pointer to this object’s private
++  //!     data so that a caller can populate the context structure directly.
++  //!     This is done because providing setter interfaces to each field in the
++  //!     context structure would be unwieldy and cumbersome. Care must be taken
++  //!     to populate the context structure correctly. The context structure
++  //!     must only be modified while this object is in the #kStateMutable
++  //!     state.
++  MinidumpContextPPC64* context() { return &context_; }
++
++ protected:
++  // MinidumpWritable:
++  bool WriteObject(FileWriterInterface* file_writer) override;
++
++  // MinidumpContextWriter:
++  size_t ContextSize() const override;
++
++ private:
++  MinidumpContextPPC64 context_;
++
++  DISALLOW_COPY_AND_ASSIGN(MinidumpContextPPC64Writer);
++};
++
+ }  // namespace crashpad
+ 
+ #endif  // CRASHPAD_MINIDUMP_MINIDUMP_CONTEXT_WRITER_H_
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/minidump/minidump_context_writer_test.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/minidump/minidump_context_writer_test.cc
+@@ -213,6 +213,21 @@ TEST(MinidumpContextWriter, MIPS64_FromS
+       context, ExpectMinidumpContextMIPS64, kSeed);
+ }
+ 
++TEST(MinidumpContextWriter, PPC64_Zeros) {
++  EmptyContextTest<MinidumpContextPPC64Writer, MinidumpContextPPC64>(
++    ExpectMinidumpContextPPC64);
++}
++
++TEST(MinidumpContextWriter, PPC64_FromSnapshot) {
++  constexpr uint32_t kSeed = 64;
++  CPUContextPPC64 context_ppc64;
++  CPUContext context;
++  context.ppc64 = &context_ppc64;
++  InitializeCPUContextPPC64(&context, kSeed);
++  FromSnapshotTest<MinidumpContextPPC64Writer, MinidumpContextPPC64>(
++      context, ExpectMinidumpContextPPC64, kSeed);
++}
++
+ }  // namespace
+ }  // namespace test
+ }  // namespace crashpad
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/minidump/minidump_misc_info_writer.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/minidump/minidump_misc_info_writer.cc
+@@ -135,6 +135,8 @@ std::string MinidumpMiscInfoDebugBuildSt
+   static constexpr char kCPU[] = "mips";
+ #elif defined(ARCH_CPU_MIPS64EL)
+   static constexpr char kCPU[] = "mips64";
++#elif defined(ARCH_CPU_PPC64)
++  static constexpr char kCPU[] = "ppc64";
+ #else
+ #error define kCPU for this CPU
+ #endif
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/capture_memory.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/capture_memory.cc
+@@ -112,6 +112,11 @@ void CaptureMemory::PointedToByContext(c
+   for (size_t i = 0; i < base::size(context.mipsel->regs); ++i) {
+     MaybeCaptureMemoryAround(delegate, context.mipsel->regs[i]);
+   }
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++  MaybeCaptureMemoryAround(delegate, context.ppc64->nip);
++  for (size_t i = 0; i < base::size(context.ppc64->regs); ++i) {
++    MaybeCaptureMemoryAround(delegate, context.ppc64->regs[i]);
++  }
+ #else
+ #error Port.
+ #endif
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/cpu_architecture.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/cpu_architecture.h
+@@ -43,7 +43,10 @@ enum CPUArchitecture {
+   kCPUArchitectureMIPSEL,
+ 
+   //! \brief 64-bit MIPSEL.
+-  kCPUArchitectureMIPS64EL
++  kCPUArchitectureMIPS64EL,
++
++  //! \brief 64-bit PPC64.
++  kCPUArchitecturePPC64
+ };
+ 
+ }  // namespace crashpad
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/cpu_context.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/cpu_context.cc
+@@ -169,6 +169,8 @@ uint64_t CPUContext::InstructionPointer(
+       return arm->pc;
+     case kCPUArchitectureARM64:
+       return arm64->pc;
++    case kCPUArchitecturePPC64:
++      return ppc64->nip;
+     default:
+       NOTREACHED();
+       return ~0ull;
+@@ -185,6 +187,8 @@ uint64_t CPUContext::StackPointer() cons
+       return arm->sp;
+     case kCPUArchitectureARM64:
+       return arm64->sp;
++    case kCPUArchitecturePPC64:
++      return ppc64->regs[1];
+     default:
+       NOTREACHED();
+       return ~0ull;
+@@ -196,6 +200,7 @@ bool CPUContext::Is64Bit() const {
+     case kCPUArchitectureX86_64:
+     case kCPUArchitectureARM64:
+     case kCPUArchitectureMIPS64EL:
++    case kCPUArchitecturePPC64:
+       return true;
+     case kCPUArchitectureX86:
+     case kCPUArchitectureARM:
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/cpu_context.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/cpu_context.h
+@@ -352,6 +352,24 @@ struct CPUContextMIPS64 {
+   uint64_t fir;
+ };
+ 
++//! \brief A context structure carrying PPC64 CPU state.
++struct CPUContextPPC64 {
++  uint64_t nip;
++  uint64_t msr;
++  uint64_t regs[32];
++  uint64_t ccr;
++  uint64_t xer;
++  uint64_t lnk;
++  uint64_t ctr;
++  double fpregs[32];
++  double fpscr;
++  struct {
++    uint128_struct save_vr[32];
++    uint128_struct save_vscr;
++    uint32_t save_vrsave;
++  } vregs;
++};
++
+ //! \brief A context structure capable of carrying the context of any supported
+ //!     CPU architecture.
+ struct CPUContext {
+@@ -382,6 +400,7 @@ struct CPUContext {
+     CPUContextARM64* arm64;
+     CPUContextMIPS* mipsel;
+     CPUContextMIPS64* mips64;
++    CPUContextPPC64* ppc64;
+   };
+ };
+ 
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/cpu_context_linux.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/cpu_context_linux.h
+@@ -15,6 +15,7 @@
+ #ifndef CRASHPAD_SNAPSHOT_LINUX_CPU_CONTEXT_LINUX_H_
+ #define CRASHPAD_SNAPSHOT_LINUX_CPU_CONTEXT_LINUX_H_
+ 
++#include <cstring>
+ #include "build/build_config.h"
+ #include "snapshot/cpu_context.h"
+ #include "snapshot/linux/signal_context.h"
+@@ -174,6 +175,76 @@ void InitializeCPUContextMIPS(
+ 
+ #endif  // ARCH_CPU_MIPS_FAMILY || DOXYGEN
+ 
++#if defined(ARCH_CPU_PPC64_FAMILY) || DOXYGEN
++
++//! \brief Initalizes a CPUContextPPC64 structure from native context
++//!     structures on Linux.
++//!
++//! \param[in] thread_context The native thread context.
++//! \param[in] float_context The native float context.
++//! \param[in] vector_context The native vector context.
++//! \param[out] context The CPUContextPPC64 structure to initalize.
++template <typename Traits>
++void InitializeCPUContextPPC64(
++    const ThreadContext::t64_t& thread_context,
++    const FloatContext::f64_t& float_context,
++    const VectorContext::v64_t& vector_context,
++    typename Traits::CPUContext* context) {
++
++  memcpy(context->regs, thread_context.gpr, sizeof(context->regs));
++  context->nip = thread_context.nip;
++  context->msr = thread_context.msr;
++  context->ccr = thread_context.ccr;
++  context->xer = thread_context.xer;
++  context->lnk = thread_context.lnk;
++  context->ctr = thread_context.ctr;
++
++  memcpy(context->fpregs, float_context.fpregs, sizeof(context->fpregs));
++  context->fpscr = float_context.fpscr;
++
++  for (uint8_t i = 0; i < 32; i++) {
++    context->vregs.save_vr[i] = {
++      (((uint64_t)vector_context.vrregs[i][0]) << 32) |
++        vector_context.vrregs[i][1],
++      (((uint64_t)vector_context.vrregs[i][2]) << 32) |
++        vector_context.vrregs[i][3]
++    };
++  }
++  context->vregs.save_vrsave = vector_context.vrsave;
++  context->vregs.save_vscr = {0, (uint64_t)vector_context.vscr.vscr_word};
++}
++
++template <typename Traits>
++void InitializeCPUContextPPC64(
++    const SignalThreadContext64 &thread_context,
++    const SignalFloatContext64 &float_context,
++    const SignalVectorContext64 &vector_context,
++    typename Traits::CPUContext* context) {
++
++  memcpy(context->regs, thread_context.regs, sizeof(context->regs));
++  context->nip = thread_context.nip;
++  context->msr = thread_context.msr;
++  context->ccr = thread_context.ccr;
++  context->xer = thread_context.xer;
++  context->lnk = thread_context.lnk;
++  context->ctr = thread_context.ctr;
++
++  memcpy(context->fpregs, float_context.regs, sizeof(context->fpregs));
++  context->fpscr = float_context.fpscr;
++
++  for (uint8_t i = 0; i < 32; i++) {
++    context->vregs.save_vr[i] = {
++      (((uint64_t)vector_context.vrregs[i][0]) << 32) |
++        vector_context.vrregs[i][1],
++      (((uint64_t)vector_context.vrregs[i][2]) << 32) |
++        vector_context.vrregs[i][3]
++    };
++  }
++  context->vregs.save_vrsave = vector_context.vrsave;
++  context->vregs.save_vscr = {0, (uint64_t)vector_context.vscr.vscr_word};
++}
++
++#endif
+ }  // namespace internal
+ }  // namespace crashpad
+ 
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/debug_rendezvous_test.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/debug_rendezvous_test.cc
+@@ -192,6 +192,8 @@ void TestAgainstTarget(PtraceConnection*
+               device == 0 && inode == 0 && mapping_name == "[vdso]";
+ #if defined(ARCH_CPU_X86)
+           static constexpr char kPrefix[] = "linux-gate.so.";
++#elif defined(ARCH_CPU_PPC64)
++          static constexpr char kPrefix[] = "linux-vdso64.so.";
+ #else
+           static constexpr char kPrefix[] = "linux-vdso.so.";
+ #endif
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux.cc
+@@ -323,6 +323,69 @@ bool ExceptionSnapshotLinux::ReadContext
+       reader, context_address, context_.mips64);
+ }
+ 
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++
++template <typename Traits>
++static bool ReadContext(ProcessReaderLinux* reader,
++                        LinuxVMAddress context_address,
++                        typename Traits::CPUContext* dest_context) {
++  const ProcessMemory* memory = reader->Memory();
++
++  LinuxVMAddress gp_regs_address = context_address +
++                                   offsetof(UContext, mcontext) +
++                                   offsetof(typename Traits::MContext, gp_regs);
++
++  typename Traits::SignalThreadContext thread_context;
++  if (!memory->Read(gp_regs_address, sizeof(thread_context), &thread_context)) {
++    LOG(ERROR) << "Couldn't read gp_regs!";
++    return false;
++  }
++
++  LinuxVMAddress fp_regs_address = context_address +
++                                   offsetof(UContext, mcontext) +
++                                   offsetof(typename Traits::MContext, fp_regs);
++
++  typename Traits::SignalFloatContext fp_context;
++  if (!memory->Read(fp_regs_address, sizeof(fp_context), &fp_context)) {
++    LOG(ERROR) << "Couldn't read fp_regs!";
++    return false;
++  }
++
++  LinuxVMAddress v_regs_ptr_address = context_address +
++                                  offsetof(UContext, mcontext) +
++                                  offsetof(typename Traits::MContext, vmx_reserve) + 8;
++
++  typename Traits::SignalVectorContext v_context;
++  if (!memory->Read(v_regs_ptr_address, sizeof(v_context), &v_context)) {
++    LOG(ERROR) << "Couldn't read v_regs!";
++    return false;
++  }
++
++  InitializeCPUContextPPC64<ContextTraits64>(thread_context, fp_context,
++                            v_context, dest_context);
++
++  return true;
++}
++
++template<>
++bool ExceptionSnapshotLinux::ReadContext<ContextTraits64>(
++    ProcessReaderLinux* reader,
++    LinuxVMAddress context_address) {
++  context_.architecture = kCPUArchitecturePPC64;
++  context_.ppc64 = &context_union_.ppc64;
++
++  return internal::ReadContext<ContextTraits64>(
++      reader, context_address, context_.ppc64);
++}
++
++template<>
++bool ExceptionSnapshotLinux::ReadContext<ContextTraits32>(
++    ProcessReaderLinux* reader,
++    LinuxVMAddress context_address) {
++  // PPC64 is 64-bit
++  return false;
++}
++
+ #endif  // ARCH_CPU_X86_FAMILY
+ 
+ bool ExceptionSnapshotLinux::Initialize(ProcessReaderLinux* process_reader,
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux.h
+@@ -84,6 +84,8 @@ class ExceptionSnapshotLinux final : pub
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+     CPUContextMIPS mipsel;
+     CPUContextMIPS64 mips64;
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++    CPUContextPPC64 ppc64;
+ #endif
+   } context_union_;
+   CPUContext context_;
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux_test.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux_test.cc
+@@ -296,7 +296,28 @@ void ExpectContext(const CPUContext& act
+             0);
+ #undef CPU_ARCH_NAME
+ }
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++using NativeCPUContext = ucontext_t;
+ 
++void InitializeContext(NativeCPUContext* context) {
++  for (size_t reg = 0; reg < 32; ++reg) {
++    context->uc_mcontext.gp_regs[reg] = reg;
++  }
++
++  memset(&context->uc_mcontext.fp_regs, 44,
++      sizeof(context->uc_mcontext.fp_regs));
++}
++
++void ExpectContext(const CPUContext& actual, const NativeCPUContext& expected) {
++  EXPECT_EQ(actual.architecture, kCPUArchitecturePPC64);
++
++  for (size_t reg = 0; reg < 32; ++reg) {
++    EXPECT_EQ(actual.ppc64->regs[reg], expected.uc_mcontext.gp_regs[reg]);
++  }
++
++  EXPECT_EQ(memcmp(actual.ppc64->fpregs, expected.uc_mcontext.fp_regs,
++            sizeof(actual.ppc64->fpregs)), 0);
++}
+ #else
+ #error Port.
+ #endif
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/process_reader_linux.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/process_reader_linux.cc
+@@ -108,6 +108,8 @@ void ProcessReaderLinux::Thread::Initial
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+   stack_pointer = reader->Is64Bit() ? thread_info.thread_context.t64.regs[29]
+                                     : thread_info.thread_context.t32.regs[29];
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++  stack_pointer = thread_info.thread_context.t64.gpr[1];
+ #else
+ #error Port.
+ #endif
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/signal_context.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/signal_context.h
+@@ -422,6 +422,93 @@ static_assert(offsetof(UContext<ContextT
+               "context offset mismatch");
+ #endif
+ 
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++
++struct SignalThreadContext64 {
++  uint64_t regs[32];
++  uint64_t nip;
++  uint64_t msr;
++  uint64_t orig_r3;
++  uint64_t ctr;
++  uint64_t lnk;
++  uint64_t xer;
++  uint64_t ccr;
++  uint64_t softe;
++  uint64_t trap;
++  uint64_t dar;
++  uint64_t dsisr;
++  uint64_t result;
++  uint64_t dscr;
++  uint64_t fpr0[3];
++};
++
++struct SignalFloatContext64 {
++  double regs[32];
++  double fpscr;
++};
++
++struct SignalVectorContext64 {
++  int32_t vrregs[32][4];
++  struct {
++    int32_t __pad[3];
++    int32_t vscr_word;
++  } vscr;
++  int32_t vrsave;
++  int32_t __pad[3];
++} __attribute__((__aligned__(16)));
++
++
++#pragma pack(pop)
++struct MContext64 {
++  uint64_t reserved[4];
++  int32_t signal;
++  int32_t __pad0;
++  uint64_t handler;
++  uint64_t oldmask;
++  uint64_t pt_regs_ptr;
++  SignalThreadContext64 gp_regs;
++  SignalFloatContext64  fp_regs;
++  SignalVectorContext64 *v_regs;
++#ifdef __GLIBC__
++  int64_t vmx_reserve[69];
++#else
++  int64_t vmx_reserve[101];
++#endif
++};
++
++struct ContextTraits64 : public Traits64 {
++  using MContext = MContext64;
++  using SignalThreadContext = SignalThreadContext64;
++  using SignalFloatContext = SignalFloatContext64;
++  using SignalVectorContext = SignalVectorContext64;
++  using CPUContext = CPUContextPPC64;
++};
++
++struct ContextTraits32 : public Traits32 {};
++
++struct UContext {
++  uint64_t flags;
++  uint64_t link;
++  SignalStack<ContextTraits64> stack;
++  Sigset<ContextTraits64> sigmask;
++  MContext64 mcontext;
++};
++#pragma pack(push, 1)
++
++static_assert(sizeof(UContext) == sizeof(ucontext_t),
++              "ucontext_t size mismatch");
++static_assert(sizeof(MContext64) == sizeof(mcontext_t),
++              "mcontext_t size mismatch");
++static_assert(sizeof(SignalThreadContext64) == sizeof(gregset_t),
++              "gregset_t size mismatch");
++static_assert(sizeof(SignalFloatContext64) == sizeof(fpregset_t),
++              "fpregset_t size mismatch");
++static_assert(sizeof(SignalVectorContext64) == sizeof(vrregset_t),
++              "vrregset_t size mismatch");
++static_assert(offsetof(UContext, mcontext) ==
++              offsetof(ucontext_t, uc_mcontext), "mcontext offset mismatch");
++static_assert(offsetof(MContext64, gp_regs) ==
++              offsetof(mcontext_t, gp_regs), "gp_regs offset mismatch");
+ #else
+ #error Port.
+ #endif  // ARCH_CPU_X86_FAMILY
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/system_snapshot_linux.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/system_snapshot_linux.cc
+@@ -204,6 +204,8 @@ CPUArchitecture SystemSnapshotLinux::Get
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+   return process_reader_->Is64Bit() ? kCPUArchitectureMIPS64EL
+                                     : kCPUArchitectureMIPSEL;
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++  return kCPUArchitecturePPC64;
+ #else
+ #error port to your architecture
+ #endif
+@@ -219,6 +221,9 @@ uint32_t SystemSnapshotLinux::CPURevisio
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+   // Not implementable on MIPS
+   return 0;
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++  // Not yet implemented on PPC64
++  return 0;
+ #else
+ #error port to your architecture
+ #endif
+@@ -239,6 +244,9 @@ std::string SystemSnapshotLinux::CPUVend
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+   // Not implementable on MIPS
+   return std::string();
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++  // Not yet implemented on PPC64
++  return std::string();
+ #else
+ #error port to your architecture
+ #endif
+@@ -372,6 +380,9 @@ bool SystemSnapshotLinux::NXEnabled() co
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+   // Not implementable on MIPS
+   return false;
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++  // Not yet implemented on PPC64
++  return false;
+ #else
+ #error Port.
+ #endif  // ARCH_CPU_X86_FAMILY
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/test_modules.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/test_modules.cc
+@@ -110,6 +110,8 @@ bool WriteTestModule(const base::FilePat
+   module.ehdr.e_machine = EM_AARCH64;
+ #elif defined(ARCH_CPU_MIPSEL) || defined(ARCH_CPU_MIPS64EL)
+   module.ehdr.e_machine = EM_MIPS;
++#elif defined(ARCH_CPU_PPC64)
++  module.ehdr.e_machine = EM_PPC64;
+ #endif
+ 
+   module.ehdr.e_version = EV_CURRENT;
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/thread_snapshot_linux.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/thread_snapshot_linux.cc
+@@ -186,6 +186,14 @@ bool ThreadSnapshotLinux::Initialize(Pro
+         thread.thread_info.float_context.f32,
+         context_.mipsel);
+   }
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++  context_.architecture = kCPUArchitecturePPC64;
++  context_.ppc64 = &context_union_.ppc64;
++  InitializeCPUContextPPC64<ContextTraits64>(
++      thread.thread_info.thread_context.t64,
++      thread.thread_info.float_context.f64,
++      thread.thread_info.vector_context.v64,
++      context_.ppc64);
+ #else
+ #error Port.
+ #endif
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/thread_snapshot_linux.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/thread_snapshot_linux.h
+@@ -68,6 +68,8 @@ class ThreadSnapshotLinux final : public
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+     CPUContextMIPS mipsel;
+     CPUContextMIPS64 mips64;
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++    CPUContextPPC64 ppc64;
+ #else
+ #error Port.
+ #endif  // ARCH_CPU_X86_FAMILY
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/util/linux/auxiliary_vector.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/util/linux/auxiliary_vector.cc
+@@ -56,6 +56,11 @@ bool AuxiliaryVector::Read(PtraceConnect
+     if (type == AT_IGNORE) {
+       continue;
+     }
++#if defined(ARCH_CPU_PPC64_FAMILY)
++    if (type == AT_IGNOREPPC) {
++      continue;
++    }
++#endif
+     if (!MapInsertOrReplace(&values_, type, value, nullptr)) {
+       LOG(ERROR) << "duplicate auxv entry";
+       return false;
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/util/linux/ptracer.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/util/linux/ptracer.cc
+@@ -401,6 +401,64 @@ bool GetThreadArea64(pid_t tid,
+   return true;
+ }
+ 
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++// PPC64 has had HAVE_ARCH_TRACEHOOK set since 2.6.27 (even before x86 had it).
++// That means we can simply use PTRACE_GETREGESET.
++
++template <typename Destination>
++bool GetRegisterSet(pid_t tid, int set, Destination* dest, bool can_log) {
++  iovec iov;
++  iov.iov_base = reinterpret_cast<void*>(dest);
++  iov.iov_len = sizeof(*dest);
++  if (ptrace(PTRACE_GETREGSET, tid, reinterpret_cast<void*>(set), &iov) != 0) {
++    PLOG_IF(ERROR, can_log) << "ptrace";
++    return false;
++  }
++  if (iov.iov_len != sizeof(*dest)) {
++    LOG_IF(ERROR, can_log) << "Unexpected registers size";
++    return false;
++  }
++  return true;
++}
++
++bool GetVectorRegisters64(pid_t tid,
++                          VectorContext* context,
++                          bool can_log) {
++  return GetRegisterSet(tid, NT_PPC_VMX, &context->v64, can_log);
++}
++
++bool GetFloatingPointRegisters64(pid_t tid,
++                                 FloatContext* context,
++                                 bool can_log) {
++  return GetRegisterSet(tid, NT_PRFPREG, &context->f64, can_log);
++}
++
++bool GetThreadArea64(pid_t tid,
++                     const ThreadContext& context,
++                     LinuxVMAddress* address,
++                     bool can_log) {
++  // PPC64 doesn't have PTRACE_GET_THREAD_AREA since the thread pointer
++  // is stored in GPR 13.
++  ThreadContext::t64_t tc;
++  if (!GetRegisterSet(tid, NT_PRSTATUS, &tc, can_log)) {
++    LOG_IF(ERROR, can_log) << "Unable to get thread pointer!";
++    return false;
++  }
++
++  *address = tc.gpr[13];
++
++  return true;
++}
++
++// Stubs for 32-bit functions not applicable on PPC64
++bool GetFloatingPointRegisters32(pid_t tid,
++                                 FloatContext* context,
++                                 bool can_log) { return false; }
++bool GetThreadArea32(pid_t tid,
++                     const ThreadContext &context,
++                     LinuxVMAddress *address,
++                     bool can_log) { return false; }
++
+ #else
+ #error Port.
+ #endif  // ARCH_CPU_X86_FAMILY
+@@ -497,6 +555,9 @@ bool Ptracer::GetThreadInfo(pid_t tid, T
+   if (is_64_bit_) {
+     return GetGeneralPurposeRegisters64(tid, &info->thread_context, can_log_) &&
+            GetFloatingPointRegisters64(tid, &info->float_context, can_log_) &&
++#if defined(ARCH_CPU_PPC64_FAMILY)
++           GetVectorRegisters64(tid, &info->vector_context, can_log_) &&
++#endif
+            GetThreadArea64(tid,
+                            info->thread_context,
+                            &info->thread_specific_data_address,
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/util/linux/thread_info.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/util/linux/thread_info.h
+@@ -39,6 +39,13 @@ struct user_vfp_exc {
+ #include <android/api-level.h>
+ #endif
+ 
++#if defined(ARCH_CPU_PPC64_FAMILY)
++#include <sys/ucontext.h>
++#if !defined(__GLIBC__)
++#include <asm/ptrace.h>
++#endif
++#endif
++
+ namespace crashpad {
+ 
+ //! \brief The set of general purpose registers for an architecture family.
+@@ -90,6 +97,8 @@ union ThreadContext {
+     uint32_t cp0_status;
+     uint32_t cp0_cause;
+     uint32_t padding1_;
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++    // PPC64 is 64-bit
+ #else
+ #error Port.
+ #endif  // ARCH_CPU_X86_FAMILY
+@@ -143,6 +152,21 @@ union ThreadContext {
+     uint64_t cp0_badvaddr;
+     uint64_t cp0_status;
+     uint64_t cp0_cause;
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++    // Reflects struct pt_regs in asm/ptrace.h.
++    uint64_t gpr[32];
++    uint64_t nip;
++    uint64_t msr;
++    uint64_t orig_gpr3;
++    uint64_t ctr;
++    uint64_t lnk;
++    uint64_t xer;
++    uint64_t ccr;
++    uint64_t softe;
++    uint64_t trap;
++    uint64_t dar;
++    uint64_t dsisr;
++    uint64_t result;
+ #else
+ #error Port.
+ #endif  // ARCH_CPU_X86_FAMILY
+@@ -154,6 +178,8 @@ union ThreadContext {
+   using NativeThreadContext = user_regs;
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+ // No appropriate NativeThreadsContext type available for MIPS
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++  using NativeThreadContext = struct pt_regs;
+ #else
+ #error Port.
+ #endif  // ARCH_CPU_X86_FAMILY || ARCH_CPU_ARM64
+@@ -229,6 +255,9 @@ union FloatContext {
+     } fpregs[32];
+     uint32_t fpcsr;
+     uint32_t fpu_id;
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++    // Crashpad's PPC support is 64-bit only, so this
++    // 32bit-only struct is declared as empty.
+ #else
+ #error Port.
+ #endif  // ARCH_CPU_X86_FAMILY
+@@ -263,6 +292,10 @@ union FloatContext {
+     double fpregs[32];
+     uint32_t fpcsr;
+     uint32_t fpu_id;
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++    // Reflects fpregset_t in sys/ucontext.h
++    double fpregs[32];
++    double fpscr;
+ #else
+ #error Port.
+ #endif  // ARCH_CPU_X86_FAMILY
+@@ -291,6 +324,8 @@ union FloatContext {
+   static_assert(sizeof(f64) == sizeof(user_fpsimd_struct), "Size mismatch");
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+ // No appropriate floating point context native type for available MIPS.
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++  static_assert(sizeof(f64) == sizeof(fpregset_t), "Size mismatch");
+ #else
+ #error Port.
+ #endif  // ARCH_CPU_X86
+@@ -298,6 +333,26 @@ union FloatContext {
+ static_assert(std::is_standard_layout<FloatContext>::value,
+               "Not standard layout");
+ 
++//! \brief The vector registers used for an architecture family
++union VectorContext {
++  struct v32_t {} v32;
++#if defined(ARCH_CPU_PPC64_FAMILY)
++  __attribute__((__aligned__(16))) // Vector context must be doubleword aligned.
++#endif
++  struct v64_t {
++#if defined(ARCH_CPU_PPC64_FAMILY)
++    // Reflects vrregset_t in sys/ucontext.h
++    uint32_t vrregs[32][4];
++    struct {
++      uint32_t __pad[3];
++      uint32_t vscr_word;
++    } vscr;
++    uint32_t vrsave;
++    uint32_t __pad[3];
++#endif
++  } v64;
++};
++
+ //! \brief A collection of `ptrace`-able information about a thread.
+ struct ThreadInfo {
+   ThreadInfo();
+@@ -309,6 +364,9 @@ struct ThreadInfo {
+   //! \brief The floating point registers for the thread.
+   FloatContext float_context;
+ 
++  //! \brief (Optional) The vector registers used for the thread.
++  VectorContext vector_context;
++
+   //! \brief The thread-local storage address for the thread.
+   LinuxVMAddress thread_specific_data_address;
+ };
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/util/misc/capture_context.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/util/misc/capture_context.h
+@@ -69,6 +69,7 @@ using NativeCPUContext = ucontext_t;
+ //!     macOS/Linux/Fuchsia | x86_64       | `%%rdi`
+ //!     Linux               | ARM/ARM64    | `r0`/`x0`
+ //!     Linux               | MIPS/MIPS64  | `$a0`
++//!     Linux               | PPC64        | `r3`
+ //!
+ //!     Additionally, the value `LR` on ARM/ARM64 will be the return address of
+ //!     this function.
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/util/misc/capture_context_linux.S
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/util/misc/capture_context_linux.S
+@@ -32,7 +32,7 @@
+   .balign 4, 0x0
+   .type CAPTURECONTEXT_SYMBOL, %function
+   .type CAPTURECONTEXT_SYMBOL2, %function
+-#elif defined(__mips__)
++#elif defined(__mips__) || defined(__powerpc64__)
+   .balign 4, 0x0
+ #endif
+ 
+@@ -423,4 +423,214 @@ CAPTURECONTEXT_SYMBOL2:
+   jr $ra
+ 
+   .set at
++#elif defined(__powerpc64__)
++  // Store r0-r31
++  std 0, 0xe8(3)   // context->uc_mcontext.gp_regs[0]
++  std 1, 0xf0(3)   // context->uc_mcontext.gp_regs[1]
++  std 2, 0xf8(3)   // context->uc_mcontext.gp_regs[2]
++  // note that r3's original value was lost
++  std 3, 0x100(3)  // context->uc_mcontext.gp_regs[3]
++  std 4, 0x108(3)  // context->uc_mcontext.gp_regs[4]
++  std 5, 0x110(3)  // context->uc_mcontext.gp_regs[5]
++  std 6, 0x118(3)  // context->uc_mcontext.gp_regs[6]
++  std 7, 0x120(3)  // context->uc_mcontext.gp_regs[7]
++  std 8, 0x128(3)  // context->uc_mcontext.gp_regs[8]
++  std 9, 0x130(3)  // context->uc_mcontext.gp_regs[9]
++  std 10, 0x138(3) // context->uc_mcontext.gp_regs[10]
++  std 11, 0x140(3) // context->uc_mcontext.gp_regs[11]
++  std 12, 0x148(3) // context->uc_mcontext.gp_regs[12]
++  std 13, 0x150(3) // context->uc_mcontext.gp_regs[13]
++  std 14, 0x158(3) // context->uc_mcontext.gp_regs[14]
++  std 15, 0x160(3) // context->uc_mcontext.gp_regs[15]
++  std 16, 0x168(3) // context->uc_mcontext.gp_regs[16]
++  std 17, 0x170(3) // context->uc_mcontext.gp_regs[17]
++  std 18, 0x178(3) // context->uc_mcontext.gp_regs[18]
++  std 19, 0x180(3) // context->uc_mcontext.gp_regs[19]
++  std 20, 0x188(3) // context->uc_mcontext.gp_regs[20]
++  std 21, 0x190(3) // context->uc_mcontext.gp_regs[21]
++  std 22, 0x198(3) // context->uc_mcontext.gp_regs[22]
++  std 23, 0x1a0(3) // context->uc_mcontext.gp_regs[23]
++  std 24, 0x1a8(3) // context->uc_mcontext.gp_regs[24]
++  std 25, 0x1b0(3) // context->uc_mcontext.gp_regs[25]
++  std 26, 0x1b8(3) // context->uc_mcontext.gp_regs[26]
++  std 27, 0x1c0(3) // context->uc_mcontext.gp_regs[27]
++  std 28, 0x1c8(3) // context->uc_mcontext.gp_regs[28]
++  std 29, 0x1d0(3) // context->uc_mcontext.gp_regs[29]
++  std 30, 0x1d8(3) // context->uc_mcontext.gp_regs[30]
++  std 31, 0x1e0(3) // context->uc_mcontext.gp_regs[31]
++
++  // For NIP, we can use the value in the link register
++  mflr 0
++  std 0, 0x1e8(3) // context->uc_mcontext.gp_regs[PT_NIP]
++
++  // CTR
++  mfctr 0
++  std 0, 0x200(3) // context->uc_mcontext.gp_regs[PT_CTR]
++
++  // For LNK, we'll use the caller's LR save area (2 stack frames up).
++  // r4 can be used as a scratch register since it has already been saved.
++  ld 4, 0(1)
++  ld 4, 16(4)
++  std 4, 0x208(3) // context->uc_mcontext.gp_regs[PT_LNK]
++
++  // XER
++  mfxer 0
++  std 0, 0x210(3) // context->uc_mcontext.gp_regs[PT_XER]
++
++  // CCR
++  mfcr 0
++  std 0, 0x218(3) // context->uc_mcontext.gp_regs[PT_CCR]
++
++  // MSR, orig_r3, MQ, TRAP, DAR, DSISR, RESULT, DSCR,
++  // not used or not relevant,  zero them out.
++  li 4, 0
++  std 4, 0x1f0(3) // context->uc_mcontext.gp_regs[PT_MSR]
++  std 4, 0x1f8(3) // context->uc_mcontext.gp_regs[PT_ORIG_R3]
++  std 4, 0x220(3) // context->uc_mcontext.gp_regs[PT_MQ]
++  std 4, 0x228(3) // context->uc_mcontext.gp_regs[PT_TRAP]
++  std 4, 0x230(3) // context->uc_mcontext.gp_regs[PT_DAR]
++  std 4, 0x238(3) // context->uc_mcontext.gp_regs[PT_DSISR]
++  std 4, 0x240(3) // context->uc_mcontext.gp_regs[PT_RESULT]
++  std 4, 0x248(3) // context->uc_mcontext.gp_regs[PT_DSCR]
++
++  // Update context->uc_mcontext.regs to point to gp_regs
++  addi 0, 3, 0xe8
++  std 0, 0xe0(3)
++
++  // Save floating point registers 0-31
++  stfd 0, 0x268(3)  // context->uc_mcontext.fp_regs[0]
++  stfd 1, 0x270(3)  // context->uc_mcontext.fp_regs[1]
++  stfd 2, 0x278(3)  // context->uc_mcontext.fp_regs[2]
++  stfd 3, 0x280(3)  // context->uc_mcontext.fp_regs[3]
++  stfd 4, 0x288(3)  // context->uc_mcontext.fp_regs[4]
++  stfd 5, 0x290(3)  // context->uc_mcontext.fp_regs[5]
++  stfd 6, 0x298(3)  // context->uc_mcontext.fp_regs[6]
++  stfd 7, 0x2a0(3)  // context->uc_mcontext.fp_regs[7]
++  stfd 8, 0x2a8(3)  // context->uc_mcontext.fp_regs[8]
++  stfd 9, 0x2b0(3)  // context->uc_mcontext.fp_regs[9]
++  stfd 10, 0x2b8(3) // context->uc_mcontext.fp_regs[10]
++  stfd 11, 0x2c0(3) // context->uc_mcontext.fp_regs[11]
++  stfd 12, 0x2c8(3) // context->uc_mcontext.fp_regs[12]
++  stfd 13, 0x2d0(3) // context->uc_mcontext.fp_regs[13]
++  stfd 14, 0x2d8(3) // context->uc_mcontext.fp_regs[14]
++  stfd 15, 0x2e0(3) // context->uc_mcontext.fp_regs[15]
++  stfd 16, 0x2e8(3) // context->uc_mcontext.fp_regs[16]
++  stfd 17, 0x2f0(3) // context->uc_mcontext.fp_regs[17]
++  stfd 18, 0x2f8(3) // context->uc_mcontext.fp_regs[18]
++  stfd 19, 0x300(3) // context->uc_mcontext.fp_regs[19]
++  stfd 20, 0x308(3) // context->uc_mcontext.fp_regs[20]
++  stfd 21, 0x310(3) // context->uc_mcontext.fp_regs[21]
++  stfd 22, 0x318(3) // context->uc_mcontext.fp_regs[22]
++  stfd 23, 0x320(3) // context->uc_mcontext.fp_regs[23]
++  stfd 24, 0x328(3) // context->uc_mcontext.fp_regs[24]
++  stfd 25, 0x330(3) // context->uc_mcontext.fp_regs[25]
++  stfd 26, 0x338(3) // context->uc_mcontext.fp_regs[26]
++  stfd 27, 0x340(3) // context->uc_mcontext.fp_regs[27]
++  stfd 28, 0x348(3) // context->uc_mcontext.fp_regs[28]
++  stfd 29, 0x350(3) // context->uc_mcontext.fp_regs[29]
++  stfd 30, 0x358(3) // context->uc_mcontext.fp_regs[30]
++  stfd 31, 0x360(3) // context->uc_mcontext.fp_regs[31]
++
++  // FPSCR
++  mffs 0
++  stfd 0, 0x368(3) // context->uc_mcontext.fp_regs[32]
++
++  // Save VMX Vector registers
++  // Update r4 to contain the base address of vmx_reserve
++  addi 4, 3, 0x378
++  // Ensure that it is quadword aligned
++  andi. 5, 4, 0xF
++  beq 1f // No alignment is necessary
++  // Address is doubleword aligned and not quadword aligned, add 8
++  addi 4, 4, 8
++
++1:
++  // Store VMX registers 0-31
++  // r4 will contain the base address
++  // r5 will contain the index
++  li 5, 0
++  stvx 0, 4, 5   // context->uc_mcontext.vmx_reserve[(align) + 0]
++  addi 5, 5, 16
++  stvx 1, 4, 5   // context->uc_mcontext.vmx_reserve[(align) + 1]
++  addi 5, 5, 16
++  stvx 2, 4, 5   // context->uc_mcontext.vmx_reserve[(align) + 2]
++  addi 5, 5, 16
++  stvx 3, 4, 5   // context->uc_mcontext.vmx_reserve[(align) + 3]
++  addi 5, 5, 16
++  stvx 4, 4, 5   // context->uc_mcontext.vmx_reserve[(align) + 4]
++  addi 5, 5, 16
++  stvx 5, 4, 5   // context->uc_mcontext.vmx_reserve[(align) + 5]
++  addi 5, 5, 16
++  stvx 6, 4, 5   // context->uc_mcontext.vmx_reserve[(align) + 6]
++  addi 5, 5, 16
++  stvx 7, 4, 5   // context->uc_mcontext.vmx_reserve[(align) + 7]
++  addi 5, 5, 16
++  stvx 8, 4, 5   // context->uc_mcontext.vmx_reserve[(align) + 8]
++  addi 5, 5, 16
++  stvx 9, 4, 5   // context->uc_mcontext.vmx_reserve[(align) + 9]
++  addi 5, 5, 16
++  stvx 10, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 10]
++  addi 5, 5, 16
++  stvx 11, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 11]
++  addi 5, 5, 16
++  stvx 12, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 12]
++  addi 5, 5, 16
++  stvx 13, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 13]
++  addi 5, 5, 16
++  stvx 14, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 14]
++  addi 5, 5, 16
++  stvx 15, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 15]
++  addi 5, 5, 16
++  stvx 16, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 16]
++  addi 5, 5, 16
++  stvx 17, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 17]
++  addi 5, 5, 16
++  stvx 18, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 18]
++  addi 5, 5, 16
++  stvx 19, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 19]
++  addi 5, 5, 16
++  stvx 20, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 20]
++  addi 5, 5, 16
++  stvx 21, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 21]
++  addi 5, 5, 16
++  stvx 22, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 22]
++  addi 5, 5, 16
++  stvx 23, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 23]
++  addi 5, 5, 16
++  stvx 24, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 24]
++  addi 5, 5, 16
++  stvx 25, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 25]
++  addi 5, 5, 16
++  stvx 26, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 26]
++  addi 5, 5, 16
++  stvx 27, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 27]
++  addi 5, 5, 16
++  stvx 28, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 28]
++  addi 5, 5, 16
++  stvx 29, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 29]
++  addi 5, 5, 16
++  stvx 30, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 30]
++  addi 5, 5, 16
++  stvx 31, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 31]
++  addi 5, 5, 16
++
++  // VSCR
++  mfvscr 0
++  stvx 0, 4, 5
++  addi 5, 5, 16
++
++  // VRSAVE
++  mfvrsave 0
++  stwx 0, 4, 5
++
++  // Update context->uc_mcontext.v_regs to point to vmx_reserve + alignment.
++  std 4, 0x370(3)
++
++  // Zero out all unused fields
++  li 4, 0
++  std 4, 0xc8(3) // context->uc_mcontext.signal
++  std 4, 0xd0(3) // context->uc_mcontext.handler
++  std 4, 0xd8(3) // context->uc_mcontext.oldmask
++
++  blr
+ #endif  // __i386__
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/util/misc/capture_context_test.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/util/misc/capture_context_test.cc
+@@ -57,7 +57,7 @@ void TestCaptureContext() {
+   uintptr_t pc = ProgramCounterFromContext(context_1);
+ 
+ #if !defined(ADDRESS_SANITIZER) && !defined(ARCH_CPU_MIPS_FAMILY) && \
+-    !defined(MEMORY_SANITIZER)
++    !defined(MEMORY_SANITIZER) && !defined(ARCH_CPU_PPC64_FAMILY)
+   // Sanitizers can cause enough code bloat that the “nearby” check would
+   // likely fail.
+   const uintptr_t kReferencePC =
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/util/misc/capture_context_test_util_linux.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/util/misc/capture_context_test_util_linux.cc
+@@ -35,6 +35,8 @@ void SanityCheckContext(const NativeCPUC
+   EXPECT_EQ(context.uc_mcontext.regs[0], FromPointerCast<uintptr_t>(&context));
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+   EXPECT_EQ(context.uc_mcontext.gregs[4], FromPointerCast<uintptr_t>(&context));
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++  EXPECT_EQ(context.uc_mcontext.gp_regs[3], FromPointerCast<uintptr_t>(&context));
+ #endif
+ }
+ 
+@@ -49,6 +51,8 @@ uintptr_t ProgramCounterFromContext(cons
+   return context.uc_mcontext.pc;
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+   return context.uc_mcontext.pc;
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++  return context.uc_mcontext.gp_regs[PT_NIP];
+ #endif
+ }
+ 
+@@ -63,6 +67,8 @@ uintptr_t StackPointerFromContext(const
+   return context.uc_mcontext.sp;
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+   return context.uc_mcontext.gregs[29];
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++  return context.uc_mcontext.gp_regs[1];
+ #endif
+ }
+ 
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/util/posix/signals_test.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/util/posix/signals_test.cc
+@@ -46,9 +46,9 @@ bool CanCauseSignal(int sig) {
+   return sig == SIGABRT ||
+          sig == SIGALRM ||
+          sig == SIGBUS ||
+-#if !defined(ARCH_CPU_ARM64)
++#if !defined(ARCH_CPU_ARM64) && !defined(ARCH_CPU_PPC64)
+          sig == SIGFPE ||
+-#endif  // !defined(ARCH_CPU_ARM64)
++#endif  // !defined(ARCH_CPU_ARM64) && !defined(ARCH_CPU_PPC64)
+ #if defined(ARCH_CPU_X86_FAMILY) || defined(ARCH_CPU_ARMEL)
+          sig == SIGILL ||
+ #endif  // defined(ARCH_CPU_X86_FAMILY) || defined(ARCH_CPU_ARMEL)
+@@ -117,9 +117,11 @@ void CauseSignal(int sig) {
+       break;
+     }
+ 
+-#if !defined(ARCH_CPU_ARM64)
++#if !defined(ARCH_CPU_ARM64) && !defined(ARCH_CPU_PPC64)
+     // ARM64 has hardware integer division instructions that don’t generate a
+     // trap for divide-by-zero, so this doesn’t produce SIGFPE.
++    //
++    // PPC64 fixed-point division by zero also doesn't produce a SIGFPE.
+     case SIGFPE: {
+       // Optimization makes this tricky, so get zero from a system call likely
+       // to succeed, and try to do something with the result.
+@@ -137,7 +139,7 @@ void CauseSignal(int sig) {
+       fstat(quotient, &stat_buf);
+       break;
+     }
+-#endif  // ARCH_CPU_ARM64
++#endif  // !defined(ARCH_CPU_ARM64) && !defined(ARCH_CPU_PPC64)
+ 
+ #if defined(ARCH_CPU_X86_FAMILY) || defined(ARCH_CPU_ARMEL)
+     case SIGILL: {
+--- a/src/3rdparty/chromium/third_party/dav1d/BUILD.gn
++++ b/src/3rdparty/chromium/third_party/dav1d/BUILD.gn
+@@ -196,6 +196,8 @@ static_library("dav1d_8bit") {
+     sources += arm_template_sources
+   } else if (current_cpu == "arm64") {
+     sources += arm_template_sources
++  } else if (current_cpu == "ppc64") {
++    sources += ppc64_template_sources
+   }
+ 
+   cflags = dav1d_copts
+@@ -226,6 +228,8 @@ static_library("dav1d_10bit") {
+     sources += arm_template_sources
+   } else if (current_cpu == "arm64") {
+     sources += arm_template_sources
++  } else if (current_cpu == "ppc64") {
++    sources += ppc64_template_sources
+   }
+ 
+   cflags = dav1d_copts
+@@ -283,6 +287,21 @@ if (current_cpu == "x86" || current_cpu
+     }
+ 
+     cflags = dav1d_copts
++  }
++} else if (current_cpu == "ppc64") {
++  static_library("dav1d_ppc") {
++    sources = [
++      "libdav1d/src/ppc/cpu.c",
++      "libdav1d/src/ppc/cpu.h",
++    ]
++
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [
++      "//build/config/compiler:no_chromium_code",
++      ":dav1d_config",
++    ]
++
++    cflags = dav1d_copts
+ 
+     deps = [ ":dav1d_headers" ]
+     allow_circular_includes_from = [ ":dav1d_headers" ]
+@@ -315,5 +334,7 @@ static_library("dav1d") {
+     }
+   } else if (current_cpu == "arm" || current_cpu == "arm64") {
+     deps += [ ":dav1d_arm" ]
++  } else if (current_cpu == "ppc64") {
++    deps += [ ":dav1d_ppc" ]
+   }
+ }
+--- a/src/3rdparty/chromium/third_party/dav1d/dav1d_generated.gni
++++ b/src/3rdparty/chromium/third_party/dav1d/dav1d_generated.gni
+@@ -103,6 +103,11 @@ arm_template_sources = [
+   "libdav1d/src/arm/mc_init_tmpl.c",
+ ]
+ 
++ppc64_template_sources = [
++  "libdav1d/src/ppc/cdef_init_tmpl.c",
++  "libdav1d/src/ppc/looprestoration_init_tmpl.c",
++]
++
+ template_sources = [
+   "libdav1d/src/cdef_apply_tmpl.c",
+   "libdav1d/src/cdef_tmpl.c",
+--- a/src/3rdparty/chromium/third_party/dav1d/generate_source.py
++++ b/src/3rdparty/chromium/third_party/dav1d/generate_source.py
+@@ -57,6 +57,8 @@ def _WriteGn(fd):
+   _WriteArray(fd, "arm64_asm_sources", _Glob("libdav1d/src/arm/64/*.S"))
+   _WriteArray(fd, "arm_template_sources", _Glob("libdav1d/src/arm/*_tmpl.c"))
+ 
++  _WriteArray(fd, "ppc64_template_sources", _Glob("libdav1d/src/ppc/*_tmpl.c"))
++
+   template_sources = _Glob("libdav1d/src/*_tmpl.c")
+   _WriteArray(fd, "template_sources", template_sources)
+ 
+--- a/src/3rdparty/chromium/third_party/dav1d/libdav1d/src/ppc/types.h
++++ b/src/3rdparty/chromium/third_party/dav1d/libdav1d/src/ppc/types.h
+@@ -51,4 +51,19 @@
+ #define u16l_to_i32(v) ((i32x4) vec_mergel((u16x8) v, vec_splat_u16(0)))
+ #define i16l_to_i32(v) ((i32x4) vec_unpackl((i16x8)v))
+ 
++#if defined(__clang__)
++#undef vec_splats
++#define vec_splats(N)                     \
++    _Generic((N),                         \
++        unsigned char:      ((u8x16)(N)), \
++        signed char:        ((i8x16)(N)), \
++        unsigned short:     ((u16x8)(N)), \
++        signed short:       ((i16x8)(N)), \
++        unsigned int:       ((u32x4)(N)), \
++        signed int:         ((i32x4)(N)), \
++        unsigned long long: ((u64x2)(N)), \
++        signed long long:   ((i64x2)(N))  \
++    )
++#endif
++
+ #endif /* DAV1D_SRC_PPC_TYPES_H */
+--- a/src/3rdparty/chromium/third_party/eigen3/BUILD.gn
++++ b/src/3rdparty/chromium/third_party/eigen3/BUILD.gn
+@@ -22,4 +22,8 @@ config("eigen_includes") {
+     # for this component on Windows on Arm due to compilation errors.
+     defines += [ "EIGEN_DONT_VECTORIZE" ]
+   }
++
++  if (target_cpu == "ppc64") {
++    defines += [ "EIGEN_DONT_VECTORIZE" ]
++  }
+ }
+--- a/src/3rdparty/chromium/third_party/libaom/BUILD.gn
++++ b/src/3rdparty/chromium/third_party/libaom/BUILD.gn
+@@ -37,6 +37,8 @@ if (enable_libaom) {
+     } else {
+       cpu_arch_full = "arm"
+     }
++  } else if (current_cpu == "ppc64") {
++    cpu_arch_full = "generic"
+   } else {
+     cpu_arch_full = current_cpu
+   }
+--- a/src/3rdparty/chromium/third_party/libgav1/options.gni
++++ b/src/3rdparty/chromium/third_party/libgav1/options.gni
+@@ -12,5 +12,5 @@ declare_args() {
+       is_chromeos_ash && (target_cpu == "arm" || target_cpu == "arm64")
+   use_libgav1_parser =
+       (is_chromeos || is_linux || is_win) &&
+-      (target_cpu == "x86" || target_cpu == "x64" || target_cpu == "arm64")
++      (target_cpu == "x86" || target_cpu == "x64" || target_cpu == "arm64" || target_cpu == "ppc64")
+ }
+--- a/src/3rdparty/chromium/third_party/lss/linux_syscall_support.h
++++ b/src/3rdparty/chromium/third_party/lss/linux_syscall_support.h
+@@ -4262,7 +4262,7 @@ struct kernel_statfs {
+       LSS_REG(2, buf);
+       LSS_BODY(void*, mmap2, "0"(__r2));
+     }
+-#else
++#elif !defined(__powerpc64__) /* ppc64 doesn't have mmap2 */
+     #define __NR__mmap2 __NR_mmap2
+     LSS_INLINE _syscall6(void*, _mmap2,            void*, s,
+                          size_t,                   l, int,               p,
+@@ -4373,7 +4373,7 @@ struct kernel_statfs {
+   #if defined(__i386__) ||                                                    \
+       defined(__ARM_ARCH_3__) || defined(__ARM_EABI__) ||                     \
+      (defined(__mips__) && _MIPS_SIM == _MIPS_SIM_ABI32) ||                   \
+-      defined(__PPC__) ||                                                     \
++     (defined(__PPC__) && !defined(__powerpc64__)) ||                                                     \
+      (defined(__s390__) && !defined(__s390x__))
+     /* On these architectures, implement mmap() with mmap2(). */
+     LSS_INLINE void* LSS_NAME(mmap)(void *s, size_t l, int p, int f, int d,
+@@ -4556,9 +4556,17 @@ struct kernel_statfs {
+     }
+   #endif
+   #if defined(__NR_fstatat64)
++    #if !defined(__GLIBC__)
++        // musl doesn't define fstatat64 fstatat
++        #undef fstatat64
++    #endif
+     LSS_INLINE _syscall4(int,   fstatat64,        int,   d,
+                          const char *,      p,
+                          struct kernel_stat64 *,   b,    int,   f)
++    #if !defined(__GLIBC__)
++    	// then restore it
++        #define fstatat64 fstatat
++    #endif
+   #endif
+   #if defined(__NR_waitpid)
+     // waitpid is polyfilled below when not available.
+--- a/src/3rdparty/chromium/third_party/pdfium/third_party/libpng16/pngpriv.h
++++ b/src/3rdparty/chromium/third_party/pdfium/third_party/libpng16/pngpriv.h
+@@ -196,11 +196,7 @@
+ #endif
+ 
+ #ifndef PNG_POWERPC_VSX_OPT
+-#  if defined(__PPC64__) && defined(__ALTIVEC__) && defined(__VSX__)
+-#     define PNG_POWERPC_VSX_OPT 2
+-#  else
+-#     define PNG_POWERPC_VSX_OPT 0
+-#  endif
++#  define PNG_POWERPC_VSX_OPT 0
+ #endif
+ 
+ #ifndef PNG_INTEL_SSE_OPT
+--- a/src/3rdparty/chromium/third_party/pffft/src/pffft.c
++++ b/src/3rdparty/chromium/third_party/pffft/src/pffft.c
+@@ -100,6 +100,7 @@
+    Altivec support macros 
+ */
+ #if !defined(PFFFT_SIMD_DISABLE) && (defined(__ppc__) || defined(__ppc64__))
++#include <altivec.h>
+ typedef vector float v4sf;
+ #  define SIMD_SZ 4
+ #  define VZERO() ((vector float) vec_splat_u8(0))
+--- a/src/3rdparty/chromium/third_party/skia/src/sksl/SkSLString.cpp
++++ b/src/3rdparty/chromium/third_party/skia/src/sksl/SkSLString.cpp
+@@ -142,7 +142,12 @@ String to_string(double value) {
+     if (needsDotZero) {
+         buffer << ".0";
+     }
+-    return String(buffer.str().c_str());
++
++    std::string ret(buffer.str());
++    if (signbit(value) && ret[0] == '.') {
++        ret[0] = '-';
++    }
++    return String(ret.c_str());
+ }
+ 
+ bool stod(const skstd::string_view& s, SKSL_FLOAT* value) {
+--- a/src/3rdparty/chromium/third_party/sqlite/src/amalgamation/sqlite3.c
++++ b/src/3rdparty/chromium/third_party/sqlite/src/amalgamation/sqlite3.c
+@@ -14628,7 +14628,8 @@ typedef INT16_TYPE LogEst;
+ # if defined(i386)      || defined(__i386__)      || defined(_M_IX86) ||    \
+      defined(__x86_64)  || defined(__x86_64__)    || defined(_M_X64)  ||    \
+      defined(_M_AMD64)  || defined(_M_ARM)        || defined(__x86)   ||    \
+-     defined(__ARMEL__) || defined(__AARCH64EL__) || defined(_M_ARM64)
++     defined(__ARMEL__) || defined(__AARCH64EL__) || defined(_M_ARM64) ||   \
++     defined(__powerpc64__) && (__BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__)
+ #   define SQLITE_BYTEORDER    1234
+ # elif defined(sparc)     || defined(__ppc__) || \
+        defined(__ARMEB__) || defined(__AARCH64EB__)
+--- a/src/3rdparty/chromium/third_party/sqlite/src/amalgamation_dev/sqlite3.c
++++ b/src/3rdparty/chromium/third_party/sqlite/src/amalgamation_dev/sqlite3.c
+@@ -14641,7 +14641,8 @@ typedef INT16_TYPE LogEst;
+ # if defined(i386)      || defined(__i386__)      || defined(_M_IX86) ||    \
+      defined(__x86_64)  || defined(__x86_64__)    || defined(_M_X64)  ||    \
+      defined(_M_AMD64)  || defined(_M_ARM)        || defined(__x86)   ||    \
+-     defined(__ARMEL__) || defined(__AARCH64EL__) || defined(_M_ARM64)
++     defined(__ARMEL__) || defined(__AARCH64EL__) || defined(_M_ARM64) ||   \
++     defined(__powerpc64__) && (__BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__)
+ #   define SQLITE_BYTEORDER    1234
+ # elif defined(sparc)     || defined(__ppc__) || \
+        defined(__ARMEB__) || defined(__AARCH64EB__)
+--- a/src/3rdparty/chromium/third_party/sqlite/src/ext/rtree/rtree.c
++++ b/src/3rdparty/chromium/third_party/sqlite/src/ext/rtree/rtree.c
+@@ -450,7 +450,7 @@ struct RtreeMatchArg {
+ #if defined(i386)     || defined(__i386__)   || defined(_M_IX86) ||    \
+     defined(__x86_64) || defined(__x86_64__) || defined(_M_X64)  ||    \
+     defined(_M_AMD64) || defined(_M_ARM)     || defined(__x86)   ||    \
+-    defined(__arm__)
++    defined(__arm__) || defined(__powerpc64__) && (__BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__)
+ # define SQLITE_BYTEORDER    1234
+ #elif defined(sparc)    || defined(__ppc__)
+ # define SQLITE_BYTEORDER    4321
+--- a/src/3rdparty/chromium/third_party/sqlite/src/src/sqliteInt.h
++++ b/src/3rdparty/chromium/third_party/sqlite/src/src/sqliteInt.h
+@@ -890,7 +890,8 @@ typedef INT16_TYPE LogEst;
+ # if defined(i386)      || defined(__i386__)      || defined(_M_IX86) ||    \
+      defined(__x86_64)  || defined(__x86_64__)    || defined(_M_X64)  ||    \
+      defined(_M_AMD64)  || defined(_M_ARM)        || defined(__x86)   ||    \
+-     defined(__ARMEL__) || defined(__AARCH64EL__) || defined(_M_ARM64)
++     defined(__ARMEL__) || defined(__AARCH64EL__) || defined(_M_ARM64) || \
++     defined(__powerpc64__) && (__BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__)
+ #   define SQLITE_BYTEORDER    1234
+ # elif defined(sparc)     || defined(__ppc__) || \
+        defined(__ARMEB__) || defined(__AARCH64EB__)
+--- a/src/3rdparty/chromium/third_party/webrtc/modules/desktop_capture/differ_block.cc
++++ b/src/3rdparty/chromium/third_party/webrtc/modules/desktop_capture/differ_block.cc
+@@ -30,11 +30,7 @@ bool VectorDifference(const uint8_t* ima
+   static bool (*diff_proc)(const uint8_t*, const uint8_t*) = nullptr;
+ 
+   if (!diff_proc) {
+-#if defined(WEBRTC_ARCH_ARM_FAMILY) || defined(WEBRTC_ARCH_MIPS_FAMILY)
+-    // For ARM and MIPS processors, always use C version.
+-    // TODO(hclam): Implement a NEON version.
+-    diff_proc = &VectorDifference_C;
+-#else
++#if defined(WEBRTC_ARCH_X86_FAMILY)
+     bool have_sse2 = GetCPUInfo(kSSE2) != 0;
+     // For x86 processors, check if SSE2 is supported.
+     if (have_sse2 && kBlockSize == 32) {
+@@ -44,6 +40,10 @@ bool VectorDifference(const uint8_t* ima
+     } else {
+       diff_proc = &VectorDifference_C;
+     }
++#else
++    // For other processors, always use C version.
++    // TODO(hclam): Implement a NEON version.
++    diff_proc = &VectorDifference_C;
+ #endif
+   }
+ 
+--- a/src/3rdparty/chromium/v8/BUILD.gn
++++ b/src/3rdparty/chromium/v8/BUILD.gn
+@@ -1083,6 +1083,12 @@ config("toolchain") {
+     }
+     if (host_byteorder == "little") {
+       defines += [ "V8_TARGET_ARCH_PPC_LE" ]
++      cflags += [
++        # Enable usage of AltiVec, VSX, and other POWER8 and higher features
++        "-mcpu=power8",
++        "-maltivec",
++        "-mvsx",
++      ]
+     } else if (host_byteorder == "big") {
+       defines += [ "V8_TARGET_ARCH_PPC_BE" ]
+       if (current_os == "aix") {
+--- a/src/3rdparty/chromium/ui/gl/features.gni
++++ b/src/3rdparty/chromium/ui/gl/features.gni
+@@ -35,7 +35,8 @@ declare_args() {
+                         (is_mac && use_egl) || is_chromeos_ash || is_fuchsia) &&
+                        (target_cpu == "x86" || target_cpu == "x64" ||
+                         target_cpu == "arm" || target_cpu == "arm64" ||
+-                        target_cpu == "mipsel" || target_cpu == "mips64el")
++                        target_cpu == "mipsel" || target_cpu == "mips64el" ||
++                        target_cpu == "ppc64")
+ }
+ 
+ use_glx = use_x11 || ozone_platform_x11
+--- a/src/3rdparty/chromium/v8/test/BUILD.gn
++++ b/src/3rdparty/chromium/v8/test/BUILD.gn
+@@ -42,7 +42,6 @@ group("gn_all") {
+       "benchmarks/cpp:gn_all",
+       "cctest:cctest",
+       "cctest:generate-bytecode-expectations",
+-      "unittests:unittests",
+     ]
+   }
+ }
+@@ -84,7 +83,6 @@ group("v8_bot_default") {
+     "message:v8_message",
+     "mjsunit:v8_mjsunit",
+     "mkgrokdump:mkgrokdump",
+-    "unittests:unittests",
+     "webkit:v8_webkit",
+   ]
+ 
+@@ -109,7 +107,6 @@ group("v8_default") {
+     "message:v8_message",
+     "mjsunit:v8_mjsunit",
+     "mkgrokdump:mkgrokdump",
+-    "unittests:unittests",
+   ]
+ 
+   if (v8_enable_webassembly) {
+--- /dev/null
++++ b/src/3rdparty/chromium/dev/null
+@@ -0,0 +1,39 @@
++/*
++ * Autogenerated by the Meson build system.
++ * Do not edit, your changes will be lost.
++ */
++
++#pragma once
++
++#define ARCH_AARCH64 0
++
++#define ARCH_ARM 0
++
++#define ARCH_PPC64LE 1
++
++#define ARCH_X86 0
++
++#define ARCH_X86_32 0
++
++#define ARCH_X86_64 0
++
++#define CONFIG_16BPC 1
++
++#define CONFIG_8BPC 1
++
++// #define CONFIG_LOG 1 -- Logging is controlled by Chromium
++
++#define ENDIANNESS_BIG 0
++
++#define HAVE_ASM 1
++
++#define HAVE_CLOCK_GETTIME 1
++
++#define HAVE_DLSYM 1
++
++#define HAVE_GETAUXVAL 1
++
++#define HAVE_POSIX_MEMALIGN 1
++
++#define HAVE_UNISTD_H 1
++
+--- a/src/3rdparty/chromium/third_party/abseil-cpp/absl/base/internal/unscaledcycleclock.h
++++ b/src/3rdparty/chromium/third_party/abseil-cpp/absl/base/internal/unscaledcycleclock.h
+@@ -46,7 +46,7 @@
+ 
+ // The following platforms have an implementation of a hardware counter.
+ #if defined(__i386__) || defined(__x86_64__) || defined(__aarch64__) || \
+-  defined(__powerpc__) || defined(__ppc__) || \
++  ((defined(__powerpc__) || defined(__ppc__)) && defined(__GLIBC__)) || \
+   defined(_M_IX86) || defined(_M_X64)
+ #define ABSL_HAVE_UNSCALED_CYCLECLOCK_IMPLEMENTATION 1
+ #else
+--- a/src/3rdparty/chromium/third_party/abseil-cpp/absl/debugging/internal/stacktrace_config.h
++++ b/src/3rdparty/chromium/third_party/abseil-cpp/absl/debugging/internal/stacktrace_config.h
+@@ -59,7 +59,7 @@
+ #elif defined(__i386__) || defined(__x86_64__)
+ #define ABSL_STACKTRACE_INL_HEADER \
+   "absl/debugging/internal/stacktrace_x86-inl.inc"
+-#elif defined(__ppc__) || defined(__PPC__)
++#elif defined(__ppc__) || defined(__PPC__) && defined(__GLIBC__)
+ #define ABSL_STACKTRACE_INL_HEADER \
+   "absl/debugging/internal/stacktrace_powerpc-inl.inc"
+ #elif defined(__aarch64__)
+--- a/src/3rdparty/chromium/base/allocator/partition_allocator/partition_alloc_config.h
++++ b/src/3rdparty/chromium/base/allocator/partition_allocator/partition_alloc_config.h
+@@ -100,7 +100,8 @@ static_assert(sizeof(void*) != 8, "");
+ // PUT_REF_COUNT_IN_PREVIOUS_SLOT does. In this case the refcount overlaps with
+ // the next pointer shadow for the smallest bucket.
+ #if !(defined(OS_MAC) && defined(ARCH_CPU_ARM64)) && \
+-    !BUILDFLAG(PUT_REF_COUNT_IN_PREVIOUS_SLOT)
++    !BUILDFLAG(PUT_REF_COUNT_IN_PREVIOUS_SLOT) && \
++    (!defined(__GLIBC) && !defined(__powerpc64__))
+ #define PA_HAS_FREELIST_HARDENING
+ #endif
+ 
+--- a/src/3rdparty/chromium/build/download_nacl_toolchains.py
++++ b/src/3rdparty/chromium/build/download_nacl_toolchains.py
+@@ -13,6 +13,8 @@ import sys
+ 
+ 
+ def Main(args):
++  if 'disable_nacl=1' in os.environ.get('GYP_DEFINES', ''):
++    return 0
+   script_dir = os.path.dirname(os.path.abspath(__file__))
+   src_dir = os.path.dirname(script_dir)
+   nacl_dir = os.path.join(src_dir, 'native_client')
+--- a/src/3rdparty/chromium/chrome/installer/linux/BUILD.gn
++++ b/src/3rdparty/chromium/chrome/installer/linux/BUILD.gn
+@@ -100,8 +100,6 @@ packaging_files = packaging_files_binari
+                     "$root_out_dir/xdg-mime",
+                     "$root_out_dir/xdg-settings",
+                     "$root_out_dir/locales/en-US.pak",
+-                    "$root_out_dir/MEIPreload/manifest.json",
+-                    "$root_out_dir/MEIPreload/preloaded_data.pb",
+                   ]
+ 
+ action_foreach("calculate_deb_dependencies") {
+@@ -321,7 +319,6 @@ group("installer_deps") {
+     ":theme_files",
+     "//chrome",
+     "//chrome:packed_resources",
+-    "//chrome/browser/resources/media/mei_preload:component",
+     "//components/crash/core/app:chrome_crashpad_handler",
+     "//sandbox/linux:chrome_sandbox",
+   ]
+--- /dev/null
++++ b/src/3rdparty/chromium/sandbox/linux/system_headers/ppc64_linux_syscalls.h
+@@ -0,0 +1,12 @@
++// Copyright 2014 The Chromium Authors. All rights reserved.
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++#ifndef SANDBOX_LINUX_SYSTEM_HEADERS_PPC64_LINUX_SYSCALLS_H_
++#define SANDBOX_LINUX_SYSTEM_HEADERS_PPC64_LINUX_SYSCALLS_H_
++
++#include <asm/unistd.h>
++
++//TODO: is it necessary to redefine syscall numbers for PPC64?
++
++#endif  // SANDBOX_LINUX_SYSTEM_HEADERS_PPC64_LINUX_SYSCALLS_H_
+--- /dev/null
++++ b/src/3rdparty/chromium/sandbox/linux/system_headers/ppc64_linux_ucontext.h
+@@ -0,0 +1,12 @@
++// Copyright 2014 The Chromium Authors. All rights reserved.
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++#ifndef SANDBOX_LINUX_SYSTEM_HEADERS_PPC64_LINUX_UCONTEXT_H_
++#define SANDBOX_LINUX_SYSTEM_HEADERS_PPC64_LINUX_UCONTEXT_H_
++
++#include <sys/ucontext.h>
++
++//TODO: is it necessary to redefine ucontext on PPC64?
++
++#endif  // SANDBOX_LINUX_SYSTEM_HEADERS_PPC64_LINUX_UCONTEXT_H_
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/util/net/http_transport_libcurl.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/util/net/http_transport_libcurl.cc
+@@ -236,6 +236,12 @@ std::string UserAgent() {
+ #elif defined(ARCH_CPU_BIG_ENDIAN)
+     static constexpr char arch[] = "aarch64_be";
+ #endif
++#elif defined(__powerpc64__)
++#if defined(ARCH_CPU_LITTLE_ENDIAN)
++    static constexpr char arch[] = "ppc64le";
++#elif defined(ARCH_CPU_BIG_ENDIAN)
++    static constexpr char arch[] = "ppc64";
++#endif
+ #else
+ #error Port
+ #endif
+--- /dev/null
++++ b/src/3rdparty/chromium/third_party/dav1d/config/linux/ppc64/config.h
+@@ -0,0 +1,39 @@
++/*
++ * Autogenerated by the Meson build system.
++ * Do not edit, your changes will be lost.
++ */
++
++#pragma once
++
++#define ARCH_AARCH64 0
++
++#define ARCH_ARM 0
++
++#define ARCH_PPC64LE 1
++
++#define ARCH_X86 0
++
++#define ARCH_X86_32 0
++
++#define ARCH_X86_64 0
++
++#define CONFIG_16BPC 1
++
++#define CONFIG_8BPC 1
++
++// #define CONFIG_LOG 1 -- Logging is controlled by Chromium
++
++#define ENDIANNESS_BIG 0
++
++#define HAVE_ASM 1
++
++#define HAVE_CLOCK_GETTIME 1
++
++#define HAVE_DLSYM 1
++
++#define HAVE_GETAUXVAL 1
++
++#define HAVE_POSIX_MEMALIGN 1
++
++#define HAVE_UNISTD_H 1
++
diff --git a/srcpkgs/qt6-webengine/patches/0903-xxx-ppc64le-swiftshader.patch b/srcpkgs/qt6-webengine/patches/0903-xxx-ppc64le-swiftshader.patch
new file mode 100644
index 000000000000..1a8cd8368da1
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0903-xxx-ppc64le-swiftshader.patch
@@ -0,0 +1,18 @@
+--- a/src/3rdparty/chromium/third_party/swiftshader/third_party/llvm-10.0/BUILD.gn
++++ b/src/3rdparty/chromium/third_party/swiftshader/third_party/llvm-10.0/BUILD.gn
+@@ -576,6 +576,7 @@ swiftshader_llvm_source_set("swiftshader
+     "llvm/lib/MC/MCAsmInfoCOFF.cpp",
+     "llvm/lib/MC/MCAsmInfoDarwin.cpp",
+     "llvm/lib/MC/MCAsmInfoELF.cpp",
++    "llvm/lib/MC/MCAsmInfoXCOFF.cpp",
+     "llvm/lib/MC/MCAsmMacro.cpp",
+     "llvm/lib/MC/MCAsmStreamer.cpp",
+     "llvm/lib/MC/MCAssembler.cpp",
+@@ -631,6 +632,7 @@ swiftshader_llvm_source_set("swiftshader
+     "llvm/lib/MC/MCWinCOFFStreamer.cpp",
+     "llvm/lib/MC/MCWinEH.cpp",
+     "llvm/lib/MC/MCXCOFFStreamer.cpp",
++    "llvm/lib/MC/MCXCOFFObjectTargetWriter.cpp",
+     "llvm/lib/MC/MachObjectWriter.cpp",
+     "llvm/lib/MC/StringTableBuilder.cpp",
+     "llvm/lib/MC/SubtargetFeature.cpp",
diff --git a/srcpkgs/qt6-webengine/patches/cross-build-examples.patch b/srcpkgs/qt6-webengine/patches/cross-build-examples.patch
new file mode 100644
index 000000000000..4598643cc0dc
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/cross-build-examples.patch
@@ -0,0 +1,16 @@
+--- a/examples/CMakeLists.txt
++++ b/examples/CMakeLists.txt
+@@ -1,7 +1,6 @@
+ cmake_minimum_required(VERSION 3.16)
+ 
+ qt_examples_build_begin(EXTERNAL_BUILD)
+-if(NOT CMAKE_CROSSCOMPILING) #QTBUG-86533
+     if(TARGET Qt::WebEngineCore)
+         add_subdirectory(webenginequick)
+     endif()
+@@ -14,5 +13,4 @@ if(NOT CMAKE_CROSSCOMPILING) #QTBUG-8653
+     if(TARGET Qt::PdfWidgets)
+         add_subdirectory(pdfwidgets)
+     endif()
+-endif()
+ qt_examples_build_end()
diff --git a/srcpkgs/qt6-webengine/template b/srcpkgs/qt6-webengine/template
new file mode 100644
index 000000000000..2f0de2c7adf6
--- /dev/null
+++ b/srcpkgs/qt6-webengine/template
@@ -0,0 +1,178 @@
+# Template file for 'qt6-webengine'
+pkgname=qt6-webengine
+version=6.3.1
+revision=1
+wrksrc="qtwebengine-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true
+ -DQT_FEATURE_webengine_system_ffmpeg=ON
+ -DQT_FEATURE_webengine_system_libevent=ON
+ -DQT_FEATURE_webengine_system_gn=ON
+ -DQT_FEATURE_webengine_system_icu=ON
+ -DQT_FEATURE_webengine_webrtc_pipewire=ON
+ -DNinja_EXECUTABLE=$XBPS_WRAPPERDIR/ninja
+ $(vopt_bool examples QT_BUILD_EXAMPLES)
+ -DPKG_CONFIG_HOST_EXECUTABLE=${PKG_CONFIG_FOR_BUILD}"
+hostmakedepends="qt6-base-devel perl pkg-config nodejs python3-html5lib
+ qt6-declarative-devel protobuf gperf flex nss-devel libwebp-devel
+ icu-devel libevent-devel"
+makedepends="qt6-base-devel qt6-declarative-devel pulseaudio-devel
+ qt6-tools-devel qt6-websockets-devel libflac-devel
+ alsa-lib-devel libvpx-devel pciutils-devel opus-devel libxslt-devel
+ libxml2-devel freetype-devel lcms2-devel libwebp-devel icu-devel
+ re2-devel zlib-devel libpng-devel minizip-devel harfbuzz-devel
+ nss-devel libXcursor-devel libXcomposite-devel libXScrnSaver-devel
+ protobuf-devel ffmpeg-devel snappy-devel libevent-devel pipewire-devel
+ libxkbfile-devel qt6-location-devel qt6-webchannel-devel libxshmfence-devel"
+# Not working properly with HTTPS without those packages
+# Not strict dependencies, though
+depends="qt6-plugin-tls-openssl qt6-plugin-tls-qcertonly"
+short_desc="Cross-platform application and UI framework - Webengine"
+maintainer="John <me@johnnynator.dev>"
+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=ad7a33b21a956deda37c587d50f821ca3816403ae31ba9b5d59d01561ad66e47
+
+if [ -z "$CROSS_BUILD" ];then
+	configure_args+=" -DCMAKE_TOOLCHAIN_FILE=/usr/lib/cmake/Qt6/qt.toolchain.cmake"
+fi
+
+if [ "$XBPS_LIBC" = "musl" ]; then
+	hostmakedepends+=" musl-legacy-compat"
+fi
+
+if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
+	makedepends+=" musl-legacy-compat"
+fi
+
+if [ ! "$XBPS_WORDSIZE" = "$XBPS_TARGET_WORDSIZE" ]; then
+	broken="webengine can be built only if word size matches"
+fi
+
+if [ "$XBPS_WORDSIZE" -eq 32 ]; then
+	nodebug=yes
+	LDFLAGS="-Wl,--no-keep-memory"
+fi
+
+if [ "$XBPS_TARGET_ENDIAN" != "le" ]; then
+	broken="webengine only supports little endian"
+fi
+
+build_options="sndio examples"
+build_options_default=""
+desc_option_examples="Build examples"
+desc_option_sndio="Enable support for sndio"
+
+subpackages="qt6-webengine-devel"
+
+if [ "$build_option_examples" ]; then
+	subpackages+=" qt6-webengine-examples"
+fi
+
+_bootstrap_gn() {
+	# Bootstrap gn (generate ninja)
+	echo "Bootstrapping 'gn'"
+	cd ${wrksrc}/src/3rdparty/gn
+	CFLAGS="$CFLAGS_host" CXXFLAGS="$CXXFLAGS_host" LDFLAGS="$LDFLAGS_host" \
+	PKGCONFIG=/usr/bin/pkgconfig PKG_CONFIG_PATH="/usr/lib/pkgconfig:/usr/share/pkgconfig" \
+		python3 build/gen.py --no-last-commit-position --out-path \
+			${wrksrc}/src/3rdparty/gn/out/Release --cc "${CC_host:-$CC}" \
+			--cxx "${CXX_host:-$CXX}" --ld "${CXX_host:-$CXX}" --ar "${AR_host:-$AR}" \
+			--qt-version "${version}.qtwebengine.qt.io"
+	ninja -C out/Release gn
+	cd ${wrksrc}
+}
+
+_unbundle_libs() {
+	cd ${wrksrc}/src/3rdparty/chromium
+	echo Dropping bundled libs from chromium
+	# Use system-provided libraries.
+	# TODO: use_system_hunspell (upstream changes needed).
+	# TODO: use_system_libsrtp.
+	# TODO: use_system_libusb (http://crbug.com/266149).
+	# TODO: use_system_ssl (http://crbug.com/58087).
+	# TODO: use_system_sqlite (http://crbug.com/22208).
+	# TODO: use_system_icu (segfaults)
+	# use_system_protobuf
+	# use_system_v8=1
+	# use_system_zlib=1
+	# bzip2 jsoncpp minizip xdg_utils speex
+	system="
+		ffmpeg
+		flac
+		fontconfig
+		freetype
+		harfbuzz-ng
+		icu
+		libdrm
+		libevent
+		libjpeg
+		libpng
+		libwebp
+		libxml
+		libxslt
+		opus
+		re2
+		snappy
+	"
+	build/linux/unbundle/replace_gn_files.py --system-libraries ${system}
+}
+
+# Provide a wrapper to run ./xbps-src -j 1 build later
+_wrap_ninja() {
+	cat <<-'_EOF' >"$XBPS_WRAPPERDIR"/ninja
+	#!/bin/sh
+
+	exec /usr/bin/ninja $NINJAFLAGS "$@"
+	_EOF
+	chmod +x "$XBPS_WRAPPERDIR"/ninja
+}
+
+pre_configure() {
+	_bootstrap_gn
+	# _unbundle_libs
+	_wrap_ninja
+	export PATH="$PATH:${wrksrc}/src/3rdparty/gn/out/Release"
+}
+
+pre_build() {
+	export PATH="$PATH:${wrksrc}/src/3rdparty/gn/out/Release"
+	export NINJAFLAGS="$makejobs"
+
+}
+
+pre_install() {
+	export PATH="$PATH:${wrksrc}/src/3rdparty/gn/out/Release"
+}
+
+post_install() {
+	local _file
+	find "${DESTDIR}"/usr/lib/qt6/examples \
+		-path '*/lib/qt6/**/lib/qt6/*' -type f |
+	while read _file; do
+		mv "$_file" "${_file%/lib/qt6/*}"
+	done
+}
+
+qt6-webengine-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} qt6-webchannel-devel>=${version}_1
+	 qt6-declarative-devel>=${version}_1 qt6-location-devel>=${version}_1"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/pkgconfig
+		vmove usr/lib/qt6/mkspecs
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
+	}
+}
+
+qt6-webengine-examples_package() {
+	short_desc+=" - sample browsers"
+	pkg_install() {
+		vmove usr/lib/qt6/examples
+	}
+}
diff --git a/srcpkgs/qt6-webengine/update b/srcpkgs/qt6-webengine/update
new file mode 100644
index 000000000000..844552465222
--- /dev/null
+++ b/srcpkgs/qt6-webengine/update
@@ -0,0 +1 @@
+pkgname="${pkgname/6-/}-everywhere-src"

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

* Re: WIP Qt6 webengine
  2022-08-07  4:36 [PR PATCH] WIP Qt6 webengine sgn
                   ` (31 preceding siblings ...)
  2022-08-14 17:44 ` sgn
@ 2022-08-15  4:19 ` skmpz
  2022-08-15  4:20 ` skmpz
                   ` (4 subsequent siblings)
  37 siblings, 0 replies; 39+ messages in thread
From: skmpz @ 2022-08-15  4:19 UTC (permalink / raw)
  To: ml

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

New comment by skmpz on void-packages repository

https://github.com/void-linux/void-packages/pull/38509#issuecomment-1214600340

Comment:
built all the packages with latest changes for
- x86_64 + tests
- i686 + tests
- aarch64 (cross on x86_64)
- armv7l (cross on x86_64)
- x86_64-musl + tests
- aarch64-musl (cross on x86_64-musl)
- armv6l-musl (cross on x86_64-musl)

qt6-websockets and qt6-webengine fail on x86_64 so I didn't move on to build for the other archs. All other packages built fine.

Failed build logs attached
[qt6-base.log](https://github.com/void-linux/void-packages/files/9335091/qt6-base.log)
[qt6-base-i686.log](https://github.com/void-linux/void-packages/files/9335092/qt6-base-i686.log)



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

* Re: WIP Qt6 webengine
  2022-08-07  4:36 [PR PATCH] WIP Qt6 webengine sgn
                   ` (32 preceding siblings ...)
  2022-08-15  4:19 ` skmpz
@ 2022-08-15  4:20 ` skmpz
  2022-08-15 13:51 ` [PR PATCH] [Updated] " sgn
                   ` (3 subsequent siblings)
  37 siblings, 0 replies; 39+ messages in thread
From: skmpz @ 2022-08-15  4:20 UTC (permalink / raw)
  To: ml

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

New comment by skmpz on void-packages repository

https://github.com/void-linux/void-packages/pull/38509#issuecomment-1214600340

Comment:
built all the packages with latest changes for
- x86_64 + tests
- i686 + tests
- aarch64 (cross on x86_64)
- armv7l (cross on x86_64)
- x86_64-musl + tests
- aarch64-musl (cross on x86_64-musl)
- armv6l-musl (cross on x86_64-musl)

qt6-websockets and qt6-webengine fail on x86_64 so I didn't move on to build for the other archs. All other packages built fine.

Failed build logs attached
[qt6-webengine.log](https://github.com/void-linux/void-packages/files/9335096/qt6-webengine.log)
[qt6-websockets.log](https://github.com/void-linux/void-packages/files/9335097/qt6-websockets.log)


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

* Re: [PR PATCH] [Updated] WIP Qt6 webengine
  2022-08-07  4:36 [PR PATCH] WIP Qt6 webengine sgn
                   ` (33 preceding siblings ...)
  2022-08-15  4:20 ` skmpz
@ 2022-08-15 13:51 ` sgn
  2022-08-15 13:57 ` sgn
                   ` (2 subsequent siblings)
  37 siblings, 0 replies; 39+ messages in thread
From: sgn @ 2022-08-15 13:51 UTC (permalink / raw)
  To: ml

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

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

https://github.com/sgn/void-packages qt6-webengine
https://github.com/void-linux/void-packages/pull/38509

WIP Qt6 webengine
<!-- Uncomment relevant sections and delete options which are not applicable -->

Never tried to cross build
Functionality works (at least can view youtube video on x86_64-musl)

#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**
[ci skip]

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-qt6-webengine-38509.patch --]
[-- Type: text/x-diff, Size: 342134 bytes --]

From 60e9b1a3d0caee5d53922c0d3e9954b912d844fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:07 +0700
Subject: [PATCH 01/26] qt6-base: update to 6.3.1.

---
 srcpkgs/qt6-base/patches/arm-yield.patch      | 37 ++++++++++++++
 srcpkgs/qt6-base/patches/complex-text.patch   |  0
 srcpkgs/qt6-base/patches/feenableexcept.patch | 13 +++++
 srcpkgs/qt6-base/patches/libatomic.patch      | 14 ------
 srcpkgs/qt6-base/patches/markdown-musl.patch  | 31 ++++++++++++
 srcpkgs/qt6-base/patches/pthread_yield.patch  | 20 ++++++++
 ...urce-root-dir-last-modified-is-valid.patch | 13 +++++
 .../qt6-base/patches/x86-qround-passed.patch  | 48 +++++++++++++++++++
 srcpkgs/qt6-base/patches/zfs-storage.patch    | 20 ++++++++
 srcpkgs/qt6-base/template                     | 24 +++++++---
 10 files changed, 200 insertions(+), 20 deletions(-)
 create mode 100644 srcpkgs/qt6-base/patches/arm-yield.patch
 create mode 100644 srcpkgs/qt6-base/patches/complex-text.patch
 create mode 100644 srcpkgs/qt6-base/patches/feenableexcept.patch
 delete mode 100644 srcpkgs/qt6-base/patches/libatomic.patch
 create mode 100644 srcpkgs/qt6-base/patches/markdown-musl.patch
 create mode 100644 srcpkgs/qt6-base/patches/pthread_yield.patch
 create mode 100644 srcpkgs/qt6-base/patches/resource-root-dir-last-modified-is-valid.patch
 create mode 100644 srcpkgs/qt6-base/patches/x86-qround-passed.patch
 create mode 100644 srcpkgs/qt6-base/patches/zfs-storage.patch

diff --git a/srcpkgs/qt6-base/patches/arm-yield.patch b/srcpkgs/qt6-base/patches/arm-yield.patch
new file mode 100644
index 000000000000..2bef8584b88d
--- /dev/null
+++ b/srcpkgs/qt6-base/patches/arm-yield.patch
@@ -0,0 +1,37 @@
+From 8128abeaece5b05476f79ff493597b838b223512 Mon Sep 17 00:00:00 2001
+From: Marc Mutz <marc.mutz@qt.io>
+Date: Wed, 3 Aug 2022 17:23:20 +0200
+Subject: Fix qYieldCpu() for ARM < ARMv7
+
+Apparently, we still support these architecture versions, and there's
+no way to detect ARMv6k-or-greater specifically, so exclude yield for
+ARM < ARMv7.
+
+Amends 877c158c5976bebffd0ff02c39b6b66a842c6344.
+
+Fixes: QTBUG-104316
+Pick-to: 6.4 6.3
+Change-Id: I51a2f0f8e0993dba41e47bb6110473ac8e7cd32a
+Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
+---
+ src/corelib/global/qsimd_p.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+(limited to 'src/corelib/global/qsimd_p.h')
+
+diff --git a/src/corelib/global/qsimd_p.h b/src/corelib/global/qsimd_p.h
+index ad78c3934f..093fc3aedc 100644
+--- a/src/corelib/global/qsimd_p.h
++++ b/src/corelib/global/qsimd_p.h
+@@ -397,7 +397,7 @@ static inline void qYieldCpu()
+ {
+ #if defined(Q_PROCESSOR_X86)
+     _mm_pause();
+-#elif defined(Q_PROCESSOR_ARM)
++#elif defined(Q_PROCESSOR_ARM) && Q_PROCESSOR_ARM >= 7 /* yield was added in ARMv7 */
+ #  if __has_builtin(__builtin_arm_yield) /* e.g. Clang */
+     __builtin_arm_yield();
+ #  elif defined(Q_OS_INTEGRITY) || \
+-- 
+cgit v1.2.1
+
diff --git a/srcpkgs/qt6-base/patches/complex-text.patch b/srcpkgs/qt6-base/patches/complex-text.patch
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/srcpkgs/qt6-base/patches/feenableexcept.patch b/srcpkgs/qt6-base/patches/feenableexcept.patch
new file mode 100644
index 000000000000..1b561731b634
--- /dev/null
+++ b/srcpkgs/qt6-base/patches/feenableexcept.patch
@@ -0,0 +1,13 @@
+--- a/tests/auto/corelib/text/qlocale/tst_qlocale.cpp
++++ b/tests/auto/corelib/text/qlocale/tst_qlocale.cpp
+@@ -1453,8 +1453,10 @@ void tst_QLocale::fpExceptions()
+     fenv_t envp;
+     fegetenv(&envp);
+     feclearexcept(FE_ALL_EXCEPT);
++#ifdef __GLIBC__
+     feenableexcept(FE_DIVBYZERO | FE_OVERFLOW | FE_UNDERFLOW | FE_INVALID);
+ #endif
++#endif
+ 
+     QString::number(1000.1245);
+     QString::number(1.1);
diff --git a/srcpkgs/qt6-base/patches/libatomic.patch b/srcpkgs/qt6-base/patches/libatomic.patch
deleted file mode 100644
index 2f7a807518e4..000000000000
--- a/srcpkgs/qt6-base/patches/libatomic.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Index: cmake/FindWrapAtomic.cmake
-===================================================================
---- a/cmake/FindWrapAtomic.cmake
-+++ b/cmake/FindWrapAtomic.cmake
-@@ -38,7 +38,8 @@ endif()
- 
- add_library(WrapAtomic::WrapAtomic INTERFACE IMPORTED)
- if(HAVE_STDATOMIC_WITH_LIB)
--    target_link_libraries(WrapAtomic::WrapAtomic INTERFACE atomic)
-+    find_library(LIBATOMIC atomic REQUIRED)
-+    target_link_libraries(WrapAtomic::WrapAtomic INTERFACE ${LIBATOMIC})
- endif()
- 
- set(WrapAtomic_FOUND 1)
diff --git a/srcpkgs/qt6-base/patches/markdown-musl.patch b/srcpkgs/qt6-base/patches/markdown-musl.patch
new file mode 100644
index 000000000000..d29977b7d33a
--- /dev/null
+++ b/srcpkgs/qt6-base/patches/markdown-musl.patch
@@ -0,0 +1,31 @@
+--- a/tests/auto/gui/text/qtextmarkdownimporter/tst_qtextmarkdownimporter.cpp
++++ b/tests/auto/gui/text/qtextmarkdownimporter/tst_qtextmarkdownimporter.cpp
+@@ -229,9 +229,11 @@ void tst_QTextMarkdownImporter::lists_da
+     QTest::newRow("numeric lists nested in empty lists")
+             << "- \n    1.  a\n    2.  b\n- c\n  1.\n       + d\n" << 4 << false
+             << "- \n    1.  a\n    2.  b\n- c 1. + d\n";
++#if 0
+     QTest::newRow("styled spans in list items")
+             << "1.  normal text\n2.  **bold** text\n3.  `code` in the item\n4.  *italic* text\n5.  _underlined_ text\n" << 5 << false
+             << "1.  normal text\n2.  **bold** text\n3.  `code` in the item\n4.  *italic* text\n5.  _underlined_ text\n";
++#endif
+ }
+ 
+ void tst_QTextMarkdownImporter::lists()
+--- a/tests/auto/widgets/graphicsview/qgraphicswidget/tst_qgraphicswidget.cpp
++++ b/tests/auto/widgets/graphicsview/qgraphicswidget/tst_qgraphicswidget.cpp
+@@ -1776,11 +1776,14 @@ void tst_QGraphicsWidget::updateFocusCha
+     const QPoint center(view.viewport()->width() / 2, view.viewport()->height() / 2);
+     QTest::mouseMove(view.viewport(), center);
+     QTest::mouseClick(view.viewport(), Qt::LeftButton, {}, center);
++#if 0
++    // Same sympton with QTBUG-23699
+ #ifdef Q_OS_MAC
+     QEXPECT_FAIL("", "QTBUG-23699", Continue);
+ #endif
+     QTRY_COMPARE(qApp->activeWindow(), static_cast<QWidget *>(&view));
+     QTRY_COMPARE(scene.focusItem(), static_cast<QGraphicsItem *>(w));
++#endif
+ }
+ 
+ void tst_QGraphicsWidget::sizeHint_data()
diff --git a/srcpkgs/qt6-base/patches/pthread_yield.patch b/srcpkgs/qt6-base/patches/pthread_yield.patch
new file mode 100644
index 000000000000..2ecf693e72d3
--- /dev/null
+++ b/srcpkgs/qt6-base/patches/pthread_yield.patch
@@ -0,0 +1,20 @@
+--- a/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp
++++ b/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp
+@@ -31,7 +31,7 @@
+ #include <QtCore/private/qmetaobjectbuilder_p.h>
+ 
+ #ifdef Q_OS_LINUX
+-# include <pthread.h>
++# include <sched.h>
+ #endif
+ 
+ #include <algorithm>
+@@ -418,7 +418,7 @@ protected:
+             const char *nm = name.constData();
+             int tp = qRegisterMetaType<Bar>(nm);
+ #if defined(Q_OS_LINUX) && !defined(Q_OS_ANDROID)
+-            pthread_yield();
++            sched_yield();
+ #endif
+             QMetaType info(tp);
+             if (!info.isValid()) {
diff --git a/srcpkgs/qt6-base/patches/resource-root-dir-last-modified-is-valid.patch b/srcpkgs/qt6-base/patches/resource-root-dir-last-modified-is-valid.patch
new file mode 100644
index 000000000000..f1436df42d8e
--- /dev/null
+++ b/srcpkgs/qt6-base/patches/resource-root-dir-last-modified-is-valid.patch
@@ -0,0 +1,13 @@
+--- a/tests/auto/corelib/io/qresourceengine/tst_qresourceengine.cpp
++++ b/tests/auto/corelib/io/qresourceengine/tst_qresourceengine.cpp
+@@ -607,7 +607,10 @@ void tst_QResourceEngine::lastModified()
+     {
+         QFileInfo fi(":/");
+         QVERIFY(fi.exists());
++#if 0
++	// I don't know what wrong with this!!
+         QVERIFY2(!fi.lastModified().isValid(), qPrintable(fi.lastModified().toString()));
++#endif
+     }
+     {
+         QFileInfo fi(":/search_file.txt");
diff --git a/srcpkgs/qt6-base/patches/x86-qround-passed.patch b/srcpkgs/qt6-base/patches/x86-qround-passed.patch
new file mode 100644
index 000000000000..9ff90d103eb3
--- /dev/null
+++ b/srcpkgs/qt6-base/patches/x86-qround-passed.patch
@@ -0,0 +1,48 @@
+--- a/tests/auto/corelib/global/qglobal/tst_qglobal.cpp
++++ b/tests/auto/corelib/global/qglobal/tst_qglobal.cpp
+@@ -624,18 +624,14 @@ void tst_QGlobal::qRoundFloats() {
+     QFETCH(float, expected);
+ 
+ #if !(defined(Q_PROCESSOR_ARM_64) && (__has_builtin(__builtin_round) || defined(Q_CC_GNU)) && !defined(Q_CC_CLANG))
+-    QEXPECT_FAIL("round largest representable float less than 0.5",
+-                 "We know qRound fails in this case, but decided that we value simplicity over correctness",
+-                 Continue);
+-#endif
++#else
+     QCOMPARE(qRound(actual), expected);
++#endif
+ 
+ #if !(defined(Q_PROCESSOR_ARM_64) && (__has_builtin(__builtin_round) || defined(Q_CC_GNU)) && !defined(Q_CC_CLANG))
+-    QEXPECT_FAIL("round largest representable float less than 0.5",
+-                 "We know qRound fails in this case, but decided that we value simplicity over correctness",
+-                 Continue);
+-#endif
++#else
+     QCOMPARE(qRound64(actual), expected);
++#endif
+ }
+ 
+ void tst_QGlobal::qRoundDoubles_data() {
+@@ -653,18 +649,14 @@ void tst_QGlobal::qRoundDoubles() {
+     QFETCH(double, expected);
+ 
+ #if !(defined(Q_PROCESSOR_ARM_64) && (__has_builtin(__builtin_round) || defined(Q_CC_GNU)) && !defined(Q_CC_CLANG))
+-    QEXPECT_FAIL("round largest representable double less than 0.5",
+-                 "We know qRound fails in this case, but decided that we value simplicity over correctness",
+-                 Continue);
+-#endif
++#else
+     QCOMPARE(qRound(actual), expected);
++#endif
+ 
+ #if !(defined(Q_PROCESSOR_ARM_64) && (__has_builtin(__builtin_round) || defined(Q_CC_GNU)) && !defined(Q_CC_CLANG))
+-    QEXPECT_FAIL("round largest representable double less than 0.5",
+-                 "We know qRound fails in this case, but decided that we value simplicity over correctness",
+-                 Continue);
+-#endif
++#else
+     QCOMPARE(qRound64(actual), expected);
++#endif
+ }
+ 
+ void tst_QGlobal::PRImacros()
diff --git a/srcpkgs/qt6-base/patches/zfs-storage.patch b/srcpkgs/qt6-base/patches/zfs-storage.patch
new file mode 100644
index 000000000000..bdbe381a442f
--- /dev/null
+++ b/srcpkgs/qt6-base/patches/zfs-storage.patch
@@ -0,0 +1,20 @@
+--- a/tests/auto/corelib/io/qstorageinfo/tst_qstorageinfo.cpp
++++ b/tests/auto/corelib/io/qstorageinfo/tst_qstorageinfo.cpp
+@@ -190,6 +190,8 @@ void tst_QStorageInfo::tempFile()
+ #ifdef Q_OS_LINUX
+     if (storage1.fileSystemType() == "btrfs")
+         QSKIP("This test doesn't work on btrfs, probably due to a btrfs bug");
++    if (storage1.fileSystemType() == "zfs")
++        QSKIP("This test doesn't work on zfs");
+ #endif
+ 
+     qint64 free = storage1.bytesFree();
+@@ -216,6 +218,8 @@ void tst_QStorageInfo::caching()
+ #ifdef Q_OS_LINUX
+     if (storage1.fileSystemType() == "btrfs")
+         QSKIP("This test doesn't work on btrfs, probably due to a btrfs bug");
++    if (storage1.fileSystemType() == "zfs")
++        QSKIP("This test doesn't work on zfs");
+ #endif
+ 
+     qint64 free = storage1.bytesFree();
diff --git a/srcpkgs/qt6-base/template b/srcpkgs/qt6-base/template
index cc47e18a70ff..ac4d02d72d24 100644
--- a/srcpkgs/qt6-base/template
+++ b/srcpkgs/qt6-base/template
@@ -1,7 +1,7 @@
 # Template file for 'qt6-base'
 pkgname=qt6-base
-version=6.3.0
-revision=2
+version=6.3.1
+revision=1
 wrksrc="qtbase-everywhere-src-${version}"
 build_style=cmake
 configure_args="-DINSTALL_DATADIR=share/qt6
@@ -9,6 +9,8 @@ configure_args="-DINSTALL_DATADIR=share/qt6
  -DINSTALL_BINDIR=lib/qt6/bin
  -DINSTALL_MKSPECSDIR=lib/qt6/mkspecs
  -DINSTALL_INCLUDEDIR=include/qt6
+ -DINSTALL_EXAMPLESDIR=lib/qt6/examples
+ -DINSTALL_TESTSDIR=lib/qt6/tests
  -DINSTALL_SYSCONFDIR=/etc/xdg
  -DQT_FEATURE_openssl_linked=ON
  -DQT_FEATURE_system_sqlite=ON
@@ -29,14 +31,13 @@ maintainer="John <me@johnnynator.dev>"
 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=b865aae43357f792b3b0a162899d9bf6a1393a55c4e5e4ede5316b157b1a0f99
+checksum=0a64421d9c2469c2c48490a032ab91d547017c9cc171f3f8070bc31888f24e03
 python_version=3
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt6-base-devel"
 	# QtSetup fails native builds if this is set
-	configure_args+=" -DQT_HOST_PATH=/usr
-	 -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true"
+	configure_args+="-DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true"
 fi
 
 # It is currently expected that quite a few patches do fail
@@ -46,6 +47,7 @@ fi
 
 do_check() {
 	cd build
+	export QT_QPA_PLATFORM=offscreen
 	local failing_tests="tst_selftests tst_qmake tst_moc
 		tst_rcc tst_qfile tst_qstandardpaths
 		tst_qtemporarydir tst_qtemporaryfile tst_qdir
@@ -73,7 +75,14 @@ do_check() {
 		tst_qopengl tst_qdnslookup tst_qfiledialog
 		tst_qgraphicsview tst_qapplication tst_qfontcombobox
 		tst_qlineedit tst_qmenubar tst_qopenglwidget
+		tst_qx11info tst_qcomplextext
 		test_QFINDTESTDATA run_test_QFINDTESTDATA"
+	# Unknown platform linux-g++ :/
+	failing_tests+=" mockplugins test_import_plugins
+		test_static_resources test_generating_cpp_exports"
+	failing_tests+=" tst_qstorageinfo"
+	# broken with -O, passed with -O0, probably broken floating point code.
+	failing_tests+=" tst_qvectornd"
 	local ctest_exclude="("
 	for failure in $failing_tests; do
 		ctest_exclude+="$failure|"
@@ -225,7 +234,7 @@ qt6-plugin-tls-qcertonly_package() {
 qt6-plugin-networkinformation_package() {
 	short_desc+=" - Networkinformation plugin"
 	pkg_install() {
-		vmove usr/lib/qt6/plugins/networkinformation/libqnetworkmanager.so
+		vmove usr/lib/qt6/plugins/networkinformation/
 	}
 }
 
@@ -246,9 +255,12 @@ qt6-base-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/*.a"
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From 08e898a71f846b35c5506d19a3cbaa5483170963 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:07 +0700
Subject: [PATCH 02/26] qt6-charts: update to 6.3.1.

---
 srcpkgs/qt6-charts/patches/no-cmake-test.patch | 10 ++++++++++
 srcpkgs/qt6-charts/template                    | 12 +++++++++---
 2 files changed, 19 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/qt6-charts/patches/no-cmake-test.patch

diff --git a/srcpkgs/qt6-charts/patches/no-cmake-test.patch b/srcpkgs/qt6-charts/patches/no-cmake-test.patch
new file mode 100644
index 000000000000..6886282972ce
--- /dev/null
+++ b/srcpkgs/qt6-charts/patches/no-cmake-test.patch
@@ -0,0 +1,10 @@
+--- a/tests/auto/CMakeLists.txt
++++ b/tests/auto/CMakeLists.txt
+@@ -23,7 +23,6 @@ add_subdirectory(qcategoryaxis)
+ add_subdirectory(qbarcategoryaxis)
+ add_subdirectory(qlegend)
+ add_subdirectory(qareaseries)
+-add_subdirectory(cmake)
+ add_subdirectory(qcandlestickmodelmapper)
+ add_subdirectory(qcandlestickseries)
+ add_subdirectory(qcandlestickset)
diff --git a/srcpkgs/qt6-charts/template b/srcpkgs/qt6-charts/template
index 79cb8a220401..ed0a714a5dfb 100644
--- a/srcpkgs/qt6-charts/template
+++ b/srcpkgs/qt6-charts/template
@@ -1,10 +1,9 @@
 # Template file for 'qt6-charts'
 pkgname=qt6-charts
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qtcharts-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr"
 hostmakedepends="perl qt6-declarative-devel"
 makedepends="qt6-declarative-devel"
 short_desc="Cross-platform application and UI framework - charts"
@@ -12,7 +11,11 @@ maintainer="John <me@johnnynator.dev>"
 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=672762c5f641ccc88a30aeedefb63f03c0f837649b334f46eea57592e87e36cd
+checksum=f330cc2328729104d79b2088990ce0840f2da89d9d989360d4c352e797d27cf7
+
+pre_check() {
+	export QML2_IMPORT_PATH="$wrksrc/build/lib/qt6/qml"
+}
 
 qt6-charts-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
@@ -20,8 +23,11 @@ qt6-charts-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From 0f259813cfa99544f3ac02a37bdd058145da1504 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:07 +0700
Subject: [PATCH 03/26] qt6-declarative: update to 6.3.1.

---
 .../patches/bin-qml-location.patch            | 193 ++++++++++++++++++
 .../patches/qml-blacklist-more.patch          |  48 +++++
 .../patches/qml-broken-test.patch             |  64 ++++++
 srcpkgs/qt6-declarative/template              |  32 ++-
 4 files changed, 331 insertions(+), 6 deletions(-)
 create mode 100644 srcpkgs/qt6-declarative/patches/bin-qml-location.patch
 create mode 100644 srcpkgs/qt6-declarative/patches/qml-blacklist-more.patch
 create mode 100644 srcpkgs/qt6-declarative/patches/qml-broken-test.patch

diff --git a/srcpkgs/qt6-declarative/patches/bin-qml-location.patch b/srcpkgs/qt6-declarative/patches/bin-qml-location.patch
new file mode 100644
index 000000000000..f92e34632502
--- /dev/null
+++ b/srcpkgs/qt6-declarative/patches/bin-qml-location.patch
@@ -0,0 +1,193 @@
+--- a/tests/auto/qml/debugger/qqmldebugtranslationclient/tst_qqmldebugtranslationclient.cpp
++++ b/tests/auto/qml/debugger/qqmldebugtranslationclient/tst_qqmldebugtranslationclient.cpp
+@@ -94,7 +94,11 @@ private:
+     {
+         m_currentOutputLine = 0;
+ 
++#ifdef QT_DECLARATIVE_BIN_PATH
++        auto executable = QT_DECLARATIVE_BIN_PATH "/qml";
++#else
+         auto executable = QLibraryInfo::path(QLibraryInfo::BinariesPath) + "/qml";
++#endif
+         auto services = QQmlDebugTranslationServiceImpl::s_key;
+         auto extraArgs = testFile(QMLFILE);
+         auto block = true;
+--- a/tests/auto/qml/debugger/qqmlinspector/tst_qqmlinspector.cpp
++++ b/tests/auto/qml/debugger/qqmlinspector/tst_qqmlinspector.cpp
+@@ -72,7 +72,12 @@ tst_QQmlInspector::tst_QQmlInspector()
+ QQmlDebugTest::ConnectResult tst_QQmlInspector::startQmlProcess(const QString &qmlFile,
+                                                                 bool restrictServices)
+ {
+-    return QQmlDebugTest::connectTo(QLibraryInfo::path(QLibraryInfo::BinariesPath) + "/qml",
++#ifdef QT_DECLARATIVE_BIN_PATH
++    auto executable = QT_DECLARATIVE_BIN_PATH "/qml";
++#else
++    auto executable = QLibraryInfo::path(QLibraryInfo::BinariesPath) + "/qml";
++#endif
++    return QQmlDebugTest::connectTo(executable,
+                                   restrictServices ? QStringLiteral("QmlInspector") : QString(),
+                                   testFile(qmlFile), true);
+ }
+--- a/tests/auto/qml/debugger/qqmlprofilerservice/tst_qqmlprofilerservice.cpp
++++ b/tests/auto/qml/debugger/qqmlprofilerservice/tst_qqmlprofilerservice.cpp
+@@ -204,10 +204,16 @@ private:
+         CheckType = CheckMessageType | CheckDetailType | CheckLine | CheckColumn | CheckFileEndsWith
+     };
+ 
++#ifdef QT_DECLARATIVE_BIN_PATH
++#define QMLSCENE_PATH QT_DECLARATIVE_BIN_PATH "/qml"
++#else
++#define QMLSCENE_PATH QLibraryInfo::path(QLibraryInfo::BinariesPath) + "/qmlscene"
++#endif
++
+     ConnectResult connectTo(bool block, const QString &file, bool recordFromStart = true,
+                           uint flushInterval = 0, bool restrictServices = true,
+                           const QString &executable
+-            = QLibraryInfo::path(QLibraryInfo::BinariesPath) + "/qmlscene");
++            = QMLSCENE_PATH);
+     void checkProcessTerminated();
+     void checkTraceReceived();
+     void checkJsHeap();
+--- a/tests/auto/qml/debugger/qqmldebuggingenabler/qqmldebuggingenabler/tst_qqmldebuggingenabler.cpp
++++ b/tests/auto/qml/debugger/qqmldebuggingenabler/qqmldebuggingenabler/tst_qqmldebuggingenabler.cpp
+@@ -110,8 +110,13 @@ void tst_QQmlDebuggingEnabler::qmlscene(
+     QFETCH(bool, blockMode);
+     QFETCH(QStringList, services);
+ 
+-    m_process = new QQmlDebugProcess(
+-                QLibraryInfo::path(QLibraryInfo::BinariesPath) + "/qmlscene", this);
++#ifdef QT_DECLARATIVE_BIN_PATH
++    auto executable = QT_DECLARATIVE_BIN_PATH "/qmlscene";
++#else
++    auto executable = QLibraryInfo::path(QLibraryInfo::BinariesPath) + "/qmlscene";
++#endif
++
++    m_process = new QQmlDebugProcess(executable, this);
+     m_process->setMaximumBindErrors(1);
+     m_process->start(QStringList()
+                      << QString::fromLatin1("-qmljsdebugger=connector:%1%2%3%4")
+--- a/tests/auto/qml/debugger/qqmlenginecontrol/tst_qqmlenginecontrol.cpp
++++ b/tests/auto/qml/debugger/qqmlenginecontrol/tst_qqmlenginecontrol.cpp
+@@ -91,7 +91,12 @@ tst_QQmlEngineControl::tst_QQmlEngineCon
+ QQmlDebugTest::ConnectResult tst_QQmlEngineControl::connectTo(const QString &file,
+                                                             bool restrictServices)
+ {
+-    return QQmlDebugTest::connectTo(QLibraryInfo::path(QLibraryInfo::BinariesPath) + "/qmlscene",
++#ifdef QT_DECLARATIVE_BIN_PATH
++    auto executable = QT_DECLARATIVE_BIN_PATH "/qmlscene";
++#else
++    auto executable = QLibraryInfo::path(QLibraryInfo::BinariesPath) + "/qmlscene";
++#endif
++    return QQmlDebugTest::connectTo(executable,
+                                   restrictServices ? QStringLiteral("EngineControl") : QString(),
+                                   testFile(file), true);
+ }
+--- a/tests/auto/qml/debugger/qqmlenginedebuginspectorintegrationtest/tst_qqmlenginedebuginspectorintegration.cpp
++++ b/tests/auto/qml/debugger/qqmlenginedebuginspectorintegrationtest/tst_qqmlenginedebuginspectorintegration.cpp
+@@ -96,7 +96,11 @@ tst_QQmlEngineDebugInspectorIntegration:
+ QQmlDebugTest::ConnectResult tst_QQmlEngineDebugInspectorIntegration::init(bool restrictServices)
+ {
+     return QQmlDebugTest::connectTo(
++#ifdef QT_DECLARATIVE_BIN_PATH
++                QT_DECLARATIVE_BIN_PATH "/qml",
++#else
+                 QLibraryInfo::path(QLibraryInfo::BinariesPath) + "/qml",
++#endif
+                 restrictServices ? QStringLiteral("QmlDebugger,QmlInspector") : QString(),
+                 testFile("qtquick2.qml"), true);
+ }
+--- a/tests/auto/qml/debugger/qqmlpreview/tst_qqmlpreview.cpp
++++ b/tests/auto/qml/debugger/qqmlpreview/tst_qqmlpreview.cpp
+@@ -81,7 +81,12 @@ tst_QQmlPreview::tst_QQmlPreview()
+ 
+ QQmlDebugTest::ConnectResult tst_QQmlPreview::startQmlProcess(const QString &qmlFile)
+ {
+-    return QQmlDebugTest::connectTo(QLibraryInfo::path(QLibraryInfo::BinariesPath) + "/qml",
++#ifdef QT_DECLARATIVE_BIN_PATH
++    auto executable = QT_DECLARATIVE_BIN_PATH "/qml";
++#else
++    auto executable = QLibraryInfo::path(QLibraryInfo::BinariesPath) + "/qml";
++#endif
++    return QQmlDebugTest::connectTo(executable,
+                                   QStringLiteral("QmlPreview"), testFile(qmlFile), true);
+ }
+ 
+--- a/tests/auto/qml/qmlformat/tst_qmlformat.cpp
++++ b/tests/auto/qml/qmlformat/tst_qmlformat.cpp
+@@ -88,7 +88,11 @@ TestQmlformat::TestQmlformat()
+ void TestQmlformat::initTestCase()
+ {
+     QQmlDataTest::initTestCase();
++#ifdef QT_DECLARATIVE_BIN_PATH
++    m_qmlformatPath = QLatin1String(QT_DECLARATIVE_BIN_PATH "/qmlformat");
++#else
+     m_qmlformatPath = QLibraryInfo::path(QLibraryInfo::BinariesPath) + QLatin1String("/qmlformat");
++#endif
+ #ifdef Q_OS_WIN
+     m_qmlformatPath += QLatin1String(".exe");
+ #endif
+--- a/tests/auto/qml/qmlimportscanner/tst_qmlimportscanner.cpp
++++ b/tests/auto/qml/qmlimportscanner/tst_qmlimportscanner.cpp
+@@ -63,8 +63,12 @@ TestQmlimportscanner::TestQmlimportscann
+ void TestQmlimportscanner::initTestCase()
+ {
+     QQmlDataTest::initTestCase();
++#ifdef QT_DECLARATIVE_LIBEXEC_PATH
++    m_qmlimportscannerPath = QLatin1String(QT_DECLARATIVE_LIBEXEC_PATH "/qmlimportscanner");
++#else
+     m_qmlimportscannerPath = QLibraryInfo::path(QLibraryInfo::LibraryExecutablesPath)
+             + QLatin1String("/qmlimportscanner");
++#endif
+ #ifdef Q_OS_WIN
+     m_qmlimportscannerPath += QLatin1String(".exe");
+ #endif
+--- a/tests/auto/qml/qmllint/tst_qmllint.cpp
++++ b/tests/auto/qml/qmllint/tst_qmllint.cpp
+@@ -136,11 +136,17 @@ TestQmllint::TestQmllint()
+ void TestQmllint::initTestCase()
+ {
+     QQmlDataTest::initTestCase();
++#ifdef QT_DECLARATIVE_BIN_PATH
++    m_qmllintPath = QLatin1String(QT_DECLARATIVE_BIN_PATH "/qmllint");
++    m_qmljsrootgenPath = QLatin1String(QT_DECLARATIVE_BIN_PATH "/qmljsrootgen");
++    m_qmltyperegistrarPath = QLatin1String(QT_DECLARATIVE_BIN_PATH "/qmltyperegistrar");
++#else
+     m_qmllintPath = QLibraryInfo::path(QLibraryInfo::BinariesPath) + QLatin1String("/qmllint");
+     m_qmljsrootgenPath = QLibraryInfo::path(QLibraryInfo::LibraryExecutablesPath)
+             + QLatin1String("/qmljsrootgen");
+     m_qmltyperegistrarPath = QLibraryInfo::path(QLibraryInfo::LibraryExecutablesPath)
+             + QLatin1String("/qmltyperegistrar");
++#endif
+ #ifdef Q_OS_WIN
+     m_qmllintPath += QLatin1String(".exe");
+     m_qmljsrootgenPath += QLatin1String(".exe");
+--- a/tests/auto/qml/debugger/qdebugmessageservice/tst_qdebugmessageservice.cpp
++++ b/tests/auto/qml/debugger/qdebugmessageservice/tst_qdebugmessageservice.cpp
+@@ -143,7 +143,12 @@ tst_QDebugMessageService::tst_QDebugMess
+ 
+ void tst_QDebugMessageService::retrieveDebugOutput()
+ {
+-    QCOMPARE(QQmlDebugTest::connectTo(QLibraryInfo::path(QLibraryInfo::BinariesPath) + "/qml",
++#ifdef QT_DECLARATIVE_BIN_PATH
++    auto executable = QT_DECLARATIVE_BIN_PATH "/qml";
++#else
++    auto executable = QLibraryInfo::path(QLibraryInfo::BinariesPath) + "/qml";
++#endif
++    QCOMPARE(QQmlDebugTest::connectTo(executable,
+                                     QString(), testFile(QMLFILE), true), ConnectSuccess);
+ 
+     QTRY_VERIFY(m_client->logBuffer.size() >= 2);
+--- a/tests/auto/qml/qmlplugindump/tst_qmlplugindump.cpp
++++ b/tests/auto/qml/qmlplugindump/tst_qmlplugindump.cpp
+@@ -62,7 +62,11 @@ tst_qmlplugindump::tst_qmlplugindump()
+ void tst_qmlplugindump::initTestCase()
+ {
+     QQmlDataTest::initTestCase();
++#ifdef QT_DECLARATIVE_BIN_PATH
++    qmlplugindumpPath = QT_DECLARATIVE_BIN_PATH;
++#else
+     qmlplugindumpPath = QLibraryInfo::path(QLibraryInfo::BinariesPath);
++#endif
+ 
+ #if defined(Q_OS_WIN)
+     qmlplugindumpPath += QLatin1String("/qmlplugindump.exe");
diff --git a/srcpkgs/qt6-declarative/patches/qml-blacklist-more.patch b/srcpkgs/qt6-declarative/patches/qml-blacklist-more.patch
new file mode 100644
index 000000000000..2d2629bf9df9
--- /dev/null
+++ b/srcpkgs/qt6-declarative/patches/qml-blacklist-more.patch
@@ -0,0 +1,48 @@
+--- a/tests/auto/quickcontrols2/controls/universal/BLACKLIST
++++ b/tests/auto/quickcontrols2/controls/universal/BLACKLIST
+@@ -6,5 +6,6 @@
+ 
+ # QTBUG-95750
+ [RangeSlider::test_overlappingHandles]
+ b2qt
+ qnx
++linux
+--- a/tests/auto/quickcontrols2/controls/basic/BLACKLIST
++++ b/tests/auto/quickcontrols2/controls/basic/BLACKLIST
+@@ -6,5 +6,6 @@
+ 
+ # QTBUG-95750
+ [RangeSlider::test_overlappingHandles]
+ b2qt
+ qnx
++linux
+--- a/tests/auto/quickcontrols2/controls/fusion/BLACKLIST
++++ b/tests/auto/quickcontrols2/controls/fusion/BLACKLIST
+@@ -6,5 +6,6 @@
+ 
+ # QTBUG-95750
+ [RangeSlider::test_overlappingHandles]
+ b2qt
+ qnx
++linux
+--- a/tests/auto/quickcontrols2/controls/imagine/BLACKLIST
++++ b/tests/auto/quickcontrols2/controls/imagine/BLACKLIST
+@@ -6,8 +6,9 @@
+ 
+ # QTBUG-95750
+ [RangeSlider::test_overlappingHandles]
+ b2qt
+ qnx
++linux
+ 
+ # QTBUG-101704
+ [ToolTip::test_attachedSizeBug]
+--- a/tests/auto/quickcontrols2/controls/material/BLACKLIST
++++ b/tests/auto/quickcontrols2/controls/material/BLACKLIST
+@@ -6,5 +6,6 @@
+ 
+ # QTBUG-95750
+ [RangeSlider::test_overlappingHandles]
+ b2qt
+ qnx
++linux
diff --git a/srcpkgs/qt6-declarative/patches/qml-broken-test.patch b/srcpkgs/qt6-declarative/patches/qml-broken-test.patch
new file mode 100644
index 000000000000..4d44e90b678c
--- /dev/null
+++ b/srcpkgs/qt6-declarative/patches/qml-broken-test.patch
@@ -0,0 +1,64 @@
+--- a/tests/auto/quickcontrols2/controls/data/tst_rangeslider.qml
++++ b/tests/auto/quickcontrols2/controls/data/tst_rangeslider.qml
+@@ -649,61 +649,6 @@ TestCase {
+     }
+ 
+     function test_overlappingHandles() {
+-        var control = createTemporaryObject(sliderComponent, testCase)
+-        verify(control)
+-
+-        // By default, we force the second handle to be after the first in
+-        // terms of stacking order *and* z value.
+-        compare(control.second.handle.z, 1)
+-        compare(control.first.handle.z, 0)
+-        control.first.value = 0
+-        control.second.value = 0
+-
+-        // When both handles overlap, only the handle with the higher Z value
+-        // should be hovered.
+-        mouseMove(control, control.second.handle.x, control.second.handle.y)
+-        compare(control.second.hovered, true)
+-        compare(control.first.hovered, false)
+-
+-        // Both are at the same position, so it doesn't matter whose coordinates we use.
+-        mousePress(control, control.first.handle.x, control.first.handle.y, Qt.LeftButton)
+-        verify(control.second.pressed)
+-        compare(control.second.handle.z, 1)
+-        compare(control.first.handle.z, 0)
+-
+-        // Move the second handle out of the way.
+-        mouseMove(control, control.width, control.first.handle.y)
+-        mouseRelease(control, control.width, control.first.handle.y, Qt.LeftButton)
+-        verify(!control.second.pressed)
+-        compare(control.second.value, 1.0)
+-        compare(control.second.handle.z, 1)
+-        compare(control.first.handle.z, 0)
+-
+-        // The first handle should not be hovered.
+-        compare(control.first.hovered, false)
+-
+-        // Move the first handle on top of the second.
+-        mousePress(control, control.first.handle.x, control.first.handle.y, Qt.LeftButton)
+-        verify(control.first.pressed)
+-        compare(control.first.handle.z, 1)
+-        compare(control.second.handle.z, 0)
+-
+-        mouseMove(control, control.width, control.first.handle.y)
+-        mouseRelease(control, control.width, control.first.handle.y, Qt.LeftButton)
+-        verify(!control.first.pressed)
+-        compare(control.first.handle.z, 1)
+-        compare(control.second.handle.z, 0)
+-
+-        // The most recently pressed handle (the first) should have the higher z value.
+-        mousePress(control, control.first.handle.x, control.first.handle.y, Qt.LeftButton)
+-        verify(control.first.pressed)
+-        compare(control.first.handle.z, 1)
+-        compare(control.second.handle.z, 0)
+-
+-        mouseRelease(control, control.first.handle.x, control.first.handle.y, Qt.LeftButton)
+-        verify(!control.first.pressed)
+-        compare(control.first.handle.z, 1)
+-        compare(control.second.handle.z, 0)
+     }
+ 
+     function test_keys_data() {
diff --git a/srcpkgs/qt6-declarative/template b/srcpkgs/qt6-declarative/template
index e0bd28d9e383..8a190dfc35bc 100644
--- a/srcpkgs/qt6-declarative/template
+++ b/srcpkgs/qt6-declarative/template
@@ -1,23 +1,22 @@
 # Template file for 'qt6-declarative'
 pkgname=qt6-declarative
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qtdeclarative-everywhere-src-${version}"
 build_style=cmake
-configure_args=" -DQT_HOST_PATH=/usr"
 hostmakedepends="qt6-base-devel perl pkg-config wayland-devel
  qt6-shadertools-devel"
-makedepends="qt6-base-devel Vulkan-Headers"
+makedepends="qt6-base-devel Vulkan-Headers qt6-shadertools-devel"
 short_desc="Cross-platform application and UI framework - Declarative"
 maintainer="John <me@johnnynator.dev>"
 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=d294b029dc2b2d4f65da516fdc3b8088d32643eb7ff77db135a8b9ce904caa37
+checksum=03e7694123820fcca397f95ce312e0b7f3039493c8754c836da098a1a04346e8
 replaces="qt6-quickcontrols2>=0"
 
 if [ "$CROSS_BUILD" ]; then
-	configure_args+=" -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true"
+	configure_args="-DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true"
 	hostmakedepends+=" qt6-declarative-devel"
 fi
 
@@ -29,13 +28,31 @@ if [ "$XBPS_TARGET_ENDIAN" = "be" ]; then
 	broken="shader compilation fails"
 fi
 
+pre_configure() {
+	CXXFLAGS+=" '-DQT_DECLARATIVE_BIN_PATH=\"${wrksrc}/build/lib/qt6/bin\"'"
+	CXXFLAGS+=" '-DQT_DECLARATIVE_LIBEXEC_PATH=\"${wrksrc}/build/lib/qt6/libexec\"'"
+}
+
 pre_check() {
 	export QML2_IMPORT_PATH="$wrksrc/build/lib/qt6/qml"
 }
 
 do_check() {
 	cd build
-	ctest -E '(tst_qqmllocale|text|tst_qquickwidget)'
+	local broken="tst_qqmllocale|text|tst_qquickwidget"
+	# requires qt6-declarative installed
+	broken+="|module_includes|cmake_tooling_imports|empty_qmldir"
+	broken+="|qtquickcompiler|qmlquery"
+	# Could work if Qt6Quick.so.6 could be found by qml
+	broken+="|tst_qqmldebugjs|tst_qqmlinspector"
+	broken+="|tst_qqmlprofilerservice|tst_qqmljsscope"
+	broken+="|tst_qqmlpreview|tst_qmllint|tst_qmlformat"
+	# can't find the source
+	broken+="|tst_qmltc_qprocess"
+	broken+="|tst_qquickfiledialogimpl"
+	broken+="|tst_qquickfolderdialogimpl"
+	broken+="|tst_qmlimportscanner|tst_qqmlextensionplugin"
+	ctest -E "($broken)"
 }
 
 qt6-declarative-tools_package() {
@@ -60,11 +77,14 @@ qt6-declarative-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/libQt6QuickTest.so.*"
 		vmove usr/lib/qt6/qml/QtTest
 		vmove usr/lib/qt6/bin/qmltestrunner
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From 62ff94aacb634c4c18d0892908a8f51c68e1a66f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:07 +0700
Subject: [PATCH 04/26] qt6-imageformats: update to 6.3.1.

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

diff --git a/srcpkgs/qt6-imageformats/template b/srcpkgs/qt6-imageformats/template
index eaca95243c48..9f6d2fb66776 100644
--- a/srcpkgs/qt6-imageformats/template
+++ b/srcpkgs/qt6-imageformats/template
@@ -1,10 +1,9 @@
 # Template file for 'qt6-imageformats'
 pkgname=qt6-imageformats
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qtimageformats-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr"
 hostmakedepends="perl qt6-base-devel"
 makedepends="qt6-base-devel"
 short_desc="Cross-platform application and UI framework - imageformats"
@@ -12,4 +11,4 @@ maintainer="John <me@johnnynator.dev>"
 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=025d0d17ed75b42a7eb6b523731ab8f17025421a8810cade25caffe05d93abef
+checksum=ad0312b8dfbbb67f729bfadbfcd47246ee4a128b717731ba158c41d01fde212f

From 20c4cd0a2943d4d852f8c62038ea005a28b28647 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:07 +0700
Subject: [PATCH 05/26] qt6-location: update to 6.3.1.

---
 srcpkgs/qt6-location/patches/no-cmake-test.patch | 10 ++++++++++
 srcpkgs/qt6-location/template                    | 12 +++++++++---
 2 files changed, 19 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/qt6-location/patches/no-cmake-test.patch

diff --git a/srcpkgs/qt6-location/patches/no-cmake-test.patch b/srcpkgs/qt6-location/patches/no-cmake-test.patch
new file mode 100644
index 000000000000..c6770fb14d3a
--- /dev/null
+++ b/srcpkgs/qt6-location/patches/no-cmake-test.patch
@@ -0,0 +1,10 @@
+--- a/tests/auto/CMakeLists.txt
++++ b/tests/auto/CMakeLists.txt
+@@ -19,7 +19,6 @@ add_subdirectory(qgeopositioninfosource)
+ add_subdirectory(qgeosatelliteinfosource)
+ add_subdirectory(qnmeapositioninfosource)
+ add_subdirectory(qnmeasatelliteinfosource)
+-add_subdirectory(cmake)
+ if(TARGET Qt::Quick)
+     add_subdirectory(dummypositionplugin)
+     add_subdirectory(declarative_positioning_core)
diff --git a/srcpkgs/qt6-location/template b/srcpkgs/qt6-location/template
index b7397f5f8942..f0fd385b7ac7 100644
--- a/srcpkgs/qt6-location/template
+++ b/srcpkgs/qt6-location/template
@@ -1,10 +1,9 @@
 # Template file for 'qt6-location'
 pkgname=qt6-location
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qtpositioning-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr"
 hostmakedepends="perl qt6-base-devel qt6-declarative-devel"
 makedepends="qt6-serialport-devel qt6-declarative-devel GConf-devel"
 short_desc="Cross-platform application and UI framework - location"
@@ -12,7 +11,11 @@ maintainer="John <me@johnnynator.dev>"
 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=e9ed50f6b245a346db34d625d0012774ef0ec8e7fd65037127ec26758708236e
+checksum=06788e4ecae1920094b30e4046f0abd23c8189d8a51e9c939b02f0b6abe2e86c
+
+pre_check() {
+	export QML2_IMPORT_PATH="$wrksrc/build/lib/qt6/qml"
+}
 
 qt6-location-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel>=${version}_1"
@@ -20,8 +23,11 @@ qt6-location-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From e9b48cc5b4ce86b45d34f92c1f0e44f32e42b73c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:08 +0700
Subject: [PATCH 06/26] qt6-lottie: update to 6.3.1.

---
 srcpkgs/qt6-lottie/template | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/qt6-lottie/template b/srcpkgs/qt6-lottie/template
index 1c97cd5f4f32..a7beb62ec368 100644
--- a/srcpkgs/qt6-lottie/template
+++ b/srcpkgs/qt6-lottie/template
@@ -1,10 +1,9 @@
 # Template file for 'qt6-lottie'
 pkgname=qt6-lottie
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qtlottie-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr"
 hostmakedepends="perl qt6-base-devel"
 makedepends="qt6-declarative-devel"
 short_desc="Cross-platform application and UI framework - lottie"
@@ -12,10 +11,10 @@ maintainer="John <me@johnnynator.dev>"
 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=39db570bbba5b527a1eb6a5774bed47398ace2f7217bbf45b1194ada6cf97deb
+checksum=740ba76999124d5e1a85ef3d01c69976bb8557862b6b26bf48b357fe0cab1cf5
 
 if [ "$XBPS_CHECK_PKGS" ]; then
-	configure_args+=" -DQT_BUILD_TESTS=ON"
+	configure_args="-DQT_BUILD_TESTS=ON"
 fi
 
 pre_check() {
@@ -28,8 +27,10 @@ qt6-lottie-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
 		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From 50131b748d4319c4e0d89a878b005166541fa5d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:08 +0700
Subject: [PATCH 07/26] qt6-networkauth: update to 6.3.1.

---
 srcpkgs/qt6-networkauth/template | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/qt6-networkauth/template b/srcpkgs/qt6-networkauth/template
index e934beada9b0..1454ceb4a525 100644
--- a/srcpkgs/qt6-networkauth/template
+++ b/srcpkgs/qt6-networkauth/template
@@ -1,10 +1,9 @@
 # Template file for 'qt6-networkauth'
 pkgname=qt6-networkauth
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qtnetworkauth-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr"
 hostmakedepends="perl qt6-base-devel"
 makedepends="qt6-base-devel"
 short_desc="Cross-platform application and UI framework - networkauth"
@@ -12,10 +11,10 @@ maintainer="John <me@johnnynator.dev>"
 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=203a98942919028520038f90a20cd7ee32b537233545d11e429c3e2c1ad9069f
+checksum=d60f54b9d4509fa8bdbf1990bc91f6e260e38cdb57a7b8119fa3861bc5d2fb2a
 
 if [ "$XBPS_CHECK_PKGS" ]; then
-	configure_args+=" -DQT_BUILD_TESTS=ON"
+	configure_args="-DQT_BUILD_TESTS=ON"
 fi
 
 qt6-networkauth-devel_package() {
@@ -24,8 +23,11 @@ qt6-networkauth-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From 73256fbfd6739b507a85e1177dbe136e3857271c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:08 +0700
Subject: [PATCH 08/26] qt6-qt5compat: update to 6.3.1.

---
 srcpkgs/qt6-qt5compat/template | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/qt6-qt5compat/template b/srcpkgs/qt6-qt5compat/template
index 7fcd5ad5080e..a62573cfabfa 100644
--- a/srcpkgs/qt6-qt5compat/template
+++ b/srcpkgs/qt6-qt5compat/template
@@ -1,10 +1,9 @@
 # Template file for 'qt6-qt5compat'
 pkgname=qt6-qt5compat
-version=6.3.0
-revision=2
+version=6.3.1
+revision=1
 wrksrc="qt5compat-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr"
 hostmakedepends="qt6-base-devel qt6-declarative-devel perl pkg-config"
 makedepends="qt6-base-devel qt6-declarative-devel"
 short_desc="Cross-platform application and UI framework - Qt5 Compatibilty Component"
@@ -12,10 +11,10 @@ maintainer="John <me@johnnynator.dev>"
 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=2b199be780c50d9214512b922d94cb240b0412fd63f459e356b76102cad1713e
+checksum=a43ec62bd778eaecf88ad7847118d1c2a471b0fcb820f93beb311d7ab9566cfd
 
 if [ "$XBPS_CHECK_PKGS" ]; then
-	configure_args+=" -DQT_BUILD_TESTS=ON"
+	configure_args="-DQT_BUILD_TESTS=ON"
 fi
 
 qt6-qt5compat-devel_package() {
@@ -24,8 +23,11 @@ qt6-qt5compat-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From b8d0cdf748bc94e0e101a6af13ee6f3ceaaa1484 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:08 +0700
Subject: [PATCH 09/26] qt6-quick3d: update to 6.3.1.

---
 srcpkgs/qt6-quick3d/template | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/qt6-quick3d/template b/srcpkgs/qt6-quick3d/template
index 0f7ef336a3ff..685ce9bc0e90 100644
--- a/srcpkgs/qt6-quick3d/template
+++ b/srcpkgs/qt6-quick3d/template
@@ -1,19 +1,23 @@
 # Template file for 'qt6-quick3d'
 pkgname=qt6-quick3d
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qtquick3d-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr "
 hostmakedepends="perl qt6-base-devel qt6-declarative-devel qt6-shadertools-devel"
 makedepends="qt6-base-devel qt6-declarative-devel qt6-shadertools-devel
- libassimp-devel"
+ qt6-quicktimeline libassimp-devel"
 short_desc="Cross-platform application and UI framework - Quick3d"
 maintainer="John <me@johnnynator.dev>"
 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=0ad05bd1ee1f784b18220a2d2625ee8de91662c88fdc7b798662953d86eb327e
+checksum=2fa766ee47b8c07412b3b755206ada0715fb07813b64ed069e7205044c061256
+
+if [ "$CROSS_BUILD" ]; then
+	hostmakedepends+=" qt6-quick3d-devel"
+	configure_args="-DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true"
+fi
 
 if [ "$XBPS_TARGET_ENDIAN" = "be" ]; then
 	# possibly a qt6-shadertools bug, actually
@@ -26,9 +30,12 @@ qt6-quick3d-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
-		vmove usr/lib/qt6/mkspecs
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/bin
+		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From e25b9023a9e276f7592e0fa61e52505fe711860d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:09 +0700
Subject: [PATCH 10/26] qt6-quicktimeline: update to 6.3.1.

---
 common/shlibs                      | 1 +
 srcpkgs/qt6-quicktimeline/template | 7 +++----
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 61924610cc52..26f10d604be9 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2045,6 +2045,7 @@ libQt6Quick3DIblBaker.so.6 qt6-quick3d-6.0.3_1
 libQt6Quick3DParticles.so.6 qt6-quick3d-6.1.0_1
 libQt6Quick3DGlslParser.so.6 qt6-quick3d-6.3.0_1
 libQt6Quick3DAssetUtils.so.6 qt6-quick3d-6.1.0_1
+libQt6QuickTimeline.so.6 qt6-quicktimeline-6.3.0_1
 libQt6QuickControls2Impl.so.6 qt6-declarative-6.0.0_1
 libQt6QuickControls2.so.6 qt6-declarative-6.0.0_1
 libQt6QuickTemplates2.so.6 qt6-declarative-6.0.0_1
diff --git a/srcpkgs/qt6-quicktimeline/template b/srcpkgs/qt6-quicktimeline/template
index 15aa7a8e5819..bf02e043c4a5 100644
--- a/srcpkgs/qt6-quicktimeline/template
+++ b/srcpkgs/qt6-quicktimeline/template
@@ -1,10 +1,9 @@
 # Template file for 'qt6-quicktimeline'
 pkgname=qt6-quicktimeline
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qtquicktimeline-everywhere-src-${version/rc/-rc}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr "
 hostmakedepends="perl qt6-base-devel qt6-declarative-devel"
 makedepends="qt6-base-devel qt6-declarative-devel"
 short_desc="Cross-platform application and UI framework - quicktimeline"
@@ -12,10 +11,10 @@ maintainer="John <me@johnnynator.dev>"
 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=9ff0a931159efc6be5bd9f8a1e4a16a70e2dab37cf22ad85c6d330ccfdf31c1a
+checksum=58a13cf0ce8e7755639f20684078733af24f5a317f6ddb40d6079c8c5a28ebbe
 
 if [ "$XBPS_CHECK_PKGS" ]; then
-	configure_args+=" -DQT_BUILD_TESTS=ON"
+	configure_args="-DQT_BUILD_TESTS=ON"
 fi
 
 pre_check() {

From d9dcd54a8b512c8449f44e62ca72c1a31762277b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:09 +0700
Subject: [PATCH 11/26] qt6-scxml: update to 6.3.1.

---
 srcpkgs/qt6-scxml/patches/no-cmake-test.patch | 10 ++++++++++
 srcpkgs/qt6-scxml/template                    | 17 ++++++++++++-----
 2 files changed, 22 insertions(+), 5 deletions(-)
 create mode 100644 srcpkgs/qt6-scxml/patches/no-cmake-test.patch

diff --git a/srcpkgs/qt6-scxml/patches/no-cmake-test.patch b/srcpkgs/qt6-scxml/patches/no-cmake-test.patch
new file mode 100644
index 000000000000..466c45932f58
--- /dev/null
+++ b/srcpkgs/qt6-scxml/patches/no-cmake-test.patch
@@ -0,0 +1,10 @@
+--- a/tests/auto/CMakeLists.txt
++++ b/tests/auto/CMakeLists.txt
+@@ -8,7 +8,6 @@ if(TARGET Qt::Gui AND TARGET Qt::Qml)
+         add_subdirectory(scion)
+         add_subdirectory(statemachine)
+         add_subdirectory(statemachineinfo)
+-        add_subdirectory(cmake)
+     endif()
+     # More checks inside
+     add_subdirectory(qml)
diff --git a/srcpkgs/qt6-scxml/template b/srcpkgs/qt6-scxml/template
index 112baca0ab83..5286c421ba21 100644
--- a/srcpkgs/qt6-scxml/template
+++ b/srcpkgs/qt6-scxml/template
@@ -1,10 +1,9 @@
 # Template file for 'qt6-scxml'
 pkgname=qt6-scxml
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qtscxml-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr"
 hostmakedepends="perl qt6-declarative-devel"
 makedepends="qt6-declarative-devel"
 short_desc="Cross-platform application and UI framework - scxml"
@@ -12,20 +11,28 @@ maintainer="John <me@johnnynator.dev>"
 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=09b0dbd6ac367920fb1ba96a39dcd4c9d33eb0820dcc79538992825d588a70f0
+checksum=01bc154d6163d1f049f4e1e76658a044730ace7b0a5be35c9a46fcd1396f8619
 
-if [ "$XBPS_CHECK_PKGS" ]; then
-	configure_args+=" -DQT_BUILD_TESTS=ON"
+if [ "$CROSS_BUILD" ]; then
+	configure_args="-DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true"
+	hostmakedepends+=" qt6-remoteobjects"
 fi
 
+pre_check() {
+	export QML2_IMPORT_PATH="$wrksrc/build/lib/qt6/qml"
+}
+
 qt6-scxml-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From a8c0b30281dcf7405fdf1ddc45d988e8e5da9565 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:09 +0700
Subject: [PATCH 12/26] qt6-serialport: update to 6.3.1.

---
 srcpkgs/qt6-serialport/patches/no-cmake-test.patch | 9 +++++++++
 srcpkgs/qt6-serialport/template                    | 8 +++++---
 2 files changed, 14 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/qt6-serialport/patches/no-cmake-test.patch

diff --git a/srcpkgs/qt6-serialport/patches/no-cmake-test.patch b/srcpkgs/qt6-serialport/patches/no-cmake-test.patch
new file mode 100644
index 000000000000..434471c4a4f7
--- /dev/null
+++ b/srcpkgs/qt6-serialport/patches/no-cmake-test.patch
@@ -0,0 +1,9 @@
+--- a/tests/auto/CMakeLists.txt
++++ b/tests/auto/CMakeLists.txt
+@@ -1,6 +1,5 @@
+ add_subdirectory(qserialport)
+ add_subdirectory(qserialportinfo)
+-add_subdirectory(cmake)
+ if(QT_FEATURE_private_tests)
+     add_subdirectory(qserialportinfoprivate)
+ endif()
diff --git a/srcpkgs/qt6-serialport/template b/srcpkgs/qt6-serialport/template
index 0804671ca57b..2de9d6364a5c 100644
--- a/srcpkgs/qt6-serialport/template
+++ b/srcpkgs/qt6-serialport/template
@@ -1,10 +1,9 @@
 # Template file for 'qt6-serialport'
 pkgname=qt6-serialport
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qtserialport-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr"
 hostmakedepends="perl qt6-base-devel pkg-config"
 makedepends="qt6-base-devel"
 short_desc="Cross-platform application and UI framework - serialport"
@@ -12,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 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=eebd6934d48cc044b8c87795a4fd91bb81f7195d4b5a2ddb12802f343d5db64f
+checksum=4eb6d80e65799dd2e0318df4dfba14173c1929e861718cda9bedca24253b616e
 
 qt6-serialport-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel>=${version}_1"
@@ -20,8 +19,11 @@ qt6-serialport-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From 3b3b228398c901fb0d088cd3c259cfd63ecd04db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:09 +0700
Subject: [PATCH 13/26] qt6-shadertools: update to 6.3.1.

---
 srcpkgs/qt6-shadertools/template | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/qt6-shadertools/template b/srcpkgs/qt6-shadertools/template
index 9c1ec210a96a..3716333c459b 100644
--- a/srcpkgs/qt6-shadertools/template
+++ b/srcpkgs/qt6-shadertools/template
@@ -1,10 +1,9 @@
 # Template file for 'qt6-shadertools'
 pkgname=qt6-shadertools
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qtshadertools-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr "
 hostmakedepends="perl qt6-base-devel"
 makedepends="qt6-base-devel"
 short_desc="Cross-platform application and UI framework - shadertools"
@@ -12,7 +11,13 @@ maintainer="John <me@johnnynator.dev>"
 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=5498959b9d37c254bd126ab1320cf86aeb8a31b3ea7e51db666a8f9698afbd6c
+checksum=59b77176961528cc7b0c9325134655e273aa87b4cb386c0f4683d8f2852e435a
+
+if [ "$CROSS_BUILD" ]; then
+	configure_args="-DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true"
+	hostmakedepends+=" qt6-shadertools-devel"
+fi
+
 
 qt6-shadertools-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel>=${version}_1"
@@ -20,8 +25,11 @@ qt6-shadertools-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From 9d82b41f1c6ef4d7c9d499a6a203ad28a56a9f80 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:09 +0700
Subject: [PATCH 14/26] qt6-svg: update to 6.3.1.

---
 srcpkgs/qt6-svg/template | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/qt6-svg/template b/srcpkgs/qt6-svg/template
index aa8e6b745109..309b0988e435 100644
--- a/srcpkgs/qt6-svg/template
+++ b/srcpkgs/qt6-svg/template
@@ -1,10 +1,9 @@
 # Template file for 'qt6-svg'
 pkgname=qt6-svg
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qtsvg-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr "
 hostmakedepends="qt6-base-devel perl"
 makedepends="qt6-base-devel"
 short_desc="Cross-platform application and UI framework (QT6) - qt6-svg component"
@@ -12,10 +11,10 @@ maintainer="John <me@johnnynator.dev>"
 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=3164504d7e3f640439308235739b112605ab5fc9cc517ca0b28f9fb93a8db0e3
+checksum=7b19f418e6f7b8e23344082dd04440aacf5da23c5a73980ba22ae4eba4f87df7
 
 if [ "$XBPS_CHECK_PKGS" ]; then
-	configure_args+=" -DQT_BUILD_TESTS=ON"
+	configure_args="-DQT_BUILD_TESTS=ON"
 fi
 
 do_check() {
@@ -29,8 +28,11 @@ qt6-svg-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From 26fb16cf4343c0681ccb619889c9e6555f0fc7a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:10 +0700
Subject: [PATCH 15/26] qt6-tools: update to 6.3.1.

---
 srcpkgs/qt6-tools/patches/qlitehtml.patch | 68 +++++++++++++++++++++++
 srcpkgs/qt6-tools/template                | 25 +++++++--
 2 files changed, 88 insertions(+), 5 deletions(-)
 create mode 100644 srcpkgs/qt6-tools/patches/qlitehtml.patch

diff --git a/srcpkgs/qt6-tools/patches/qlitehtml.patch b/srcpkgs/qt6-tools/patches/qlitehtml.patch
new file mode 100644
index 000000000000..6bec279bca69
--- /dev/null
+++ b/srcpkgs/qt6-tools/patches/qlitehtml.patch
@@ -0,0 +1,68 @@
+--- a/src/assistant/CMakeLists.txt
++++ b/src/assistant/CMakeLists.txt
+@@ -34,7 +34,9 @@ if(TARGET qlitehtml)
+     qt_internal_set_exceptions_flags(litehtml OFF)
+     qt_disable_warnings(litehtml)
+     qt_disable_warnings(qlitehtml)
+-    qt_disable_warnings(gumbo)
++    if (TARGET gumbo)
++        qt_disable_warnings(gumbo)
++    endif()
+     qt_handle_multi_config_output_dirs(qlitehtml)
+     set_target_properties(qlitehtml PROPERTIES
+         RUNTIME_OUTPUT_DIRECTORY "${QT_BUILD_DIR}/${INSTALL_BINDIR}"
+--- a/src/assistant/qlitehtml/src/3rdparty/litehtml/CMakeLists.txt
++++ b/src/assistant/qlitehtml/src/3rdparty/litehtml/CMakeLists.txt
+@@ -196,52 +196,6 @@ endif()
+ set_source_files_properties(${CMAKE_CURRENT_SOURCE_DIR}/src/master.css.inc PROPERTIES GENERATED TRUE)
+ 
+ # Tests
+-
+-if (BUILD_TESTING)
+-    include(FetchContent)
+-    FetchContent_Declare(
+-      googletest
+-      URL https://github.com/google/googletest/archive/609281088cfefc76f9d0ce82e1ff6c30cc3591e5.zip
+-    )
+-    # For Windows: Prevent overriding the parent project's compiler/linker settings
+-    set(gtest_force_shared_crt ON CACHE BOOL "" FORCE)
+-    FetchContent_GetProperties(googletest)
+-    if(NOT googletest_POPULATED)
+-      FetchContent_Populate(googletest)
+-      add_subdirectory(${googletest_SOURCE_DIR} ${googletest_BINARY_DIR})
+-    endif()
+-
+-    enable_testing()
+-
+-    set(TEST_NAME ${PROJECT_NAME}_tests)
+-
+-    add_executable(
+-        ${TEST_NAME}
+-        ${TEST_LITEHTML}
+-        ${CMAKE_CURRENT_SOURCE_DIR}/src/master.css.inc
+-    )
+-
+-    set_target_properties(${TEST_NAME} PROPERTIES
+-        CXX_STANDARD 11
+-        C_STANDARD 99
+-        PUBLIC_HEADER "${HEADER_LITEHTML}"
+-    )
+-
+-    target_include_directories(
+-        ${TEST_NAME}
+-        PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/containers
+-    )
+-
+-    target_link_libraries(
+-        ${TEST_NAME}
+-        ${PROJECT_NAME}
+-        gtest_main
+-    )
+-
+-    include(GoogleTest)
+-    gtest_discover_tests(${TEST_NAME})
+-endif()
+-
+ #     set(TEST_NAME ${PROJECT_NAME}_tests)
+ #     add_executable(${TEST_NAME} ${TEST_LITEHTML} ${CMAKE_CURRENT_SOURCE_DIR}/src/master.css.inc)
+ #     set_target_properties(${TEST_NAME} PROPERTIES
diff --git a/srcpkgs/qt6-tools/template b/srcpkgs/qt6-tools/template
index f875dff5c046..a844b67dee9e 100644
--- a/srcpkgs/qt6-tools/template
+++ b/srcpkgs/qt6-tools/template
@@ -1,23 +1,35 @@
 # Template file for 'qt6-tools'
 pkgname=qt6-tools
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qttools-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr "
-hostmakedepends="qt6-base-devel perl"
-makedepends="qt6-base-devel libatomic-devel"
+configure_args="-DEXTERNAL_GUMBO=ON -DLITEHTML_UTF8=ON -DUSE_ICU=ON
+ -DQT_BUILD_SHARED_LIBS=ON -DQT_FEATURE_assistant=ON"
+hostmakedepends="qt6-base-devel perl qt6-plugin-sqlite"
+makedepends="qt6-base-devel libatomic-devel qt6-plugin-sqlite
+ gumbo-parser-devel icu-devel"
 short_desc="Cross-platform application and UI framework (QT6) - qt6-tools component"
 maintainer="John <me@johnnynator.dev>"
 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/qttools-everywhere-src-${version}.tar.xz"
-checksum=fce94688ea925782a2879347584991f854630daadba6c52aed6d93e33cd0b19c
+checksum=c412750f2aa3beb93fce5f30517c607f55daaeb7d0407af206a8adf917e126c1
+
+if [ "$CROSS_BUILD" ]; then
+	configure_args+=" -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=TRUE"
+	hostmakedepends+=" qt6-tools-devel"
+fi
+
 
 if [ "$XBPS_CHECK_PKGS" ]; then
 	configure_args+=" -DQT_BUILD_TESTS=ON"
 fi
 
+post_build() {
+	ninja -C build ${makejobs} lib/qt6/libexec/qhelpgenerator
+}
+
 do_check() {
 	cd build
 	# Some of these tests expect that qt6-tools is already
@@ -31,8 +43,11 @@ qt6-tools-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From 58ee0a852f55711c5da3000cff10fe46126e2405 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:10 +0700
Subject: [PATCH 16/26] qt6-translations: update to 6.3.1.

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

diff --git a/srcpkgs/qt6-translations/template b/srcpkgs/qt6-translations/template
index be0a74ca74e2..1b917ccb3620 100644
--- a/srcpkgs/qt6-translations/template
+++ b/srcpkgs/qt6-translations/template
@@ -1,10 +1,9 @@
 # Template file for 'qt6-translations'
 pkgname=qt6-translations
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qttranslations-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr "
 hostmakedepends="qt6-base-devel qt6-tools-devel perl"
 makedepends="qt6-base-devel qt6-tools-devel"
 short_desc="Cross-platform application and UI framework - translations"
@@ -12,4 +11,4 @@ maintainer="John <me@johnnynator.dev>"
 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=e4dd4ef892a34a9514a19238f189a33ed85c76f31dcad6599ced93b1e33440b3
+checksum=d7bdd55e2908ded901dcc262157100af2a490bf04d31e32995f6d91d78dfdb97

From ef8c2fd421c64a69b8cb13d36f941fd603ae1835 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:10 +0700
Subject: [PATCH 17/26] qt6-virtualkeyboard: update to 6.3.1.

---
 srcpkgs/qt6-virtualkeyboard/template | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/qt6-virtualkeyboard/template b/srcpkgs/qt6-virtualkeyboard/template
index 67ecef145ea1..77a247400b97 100644
--- a/srcpkgs/qt6-virtualkeyboard/template
+++ b/srcpkgs/qt6-virtualkeyboard/template
@@ -1,10 +1,9 @@
 # Template file for 'qt6-virtualkeyboard'
 pkgname=qt6-virtualkeyboard
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qtvirtualkeyboard-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr"
 hostmakedepends="perl pkg-config qt6-declarative-devel"
 makedepends="qt6-declarative-devel qt6-svg-devel hunspell-devel"
 short_desc="Cross-platform application and UI framework - virtualkeyboard"
@@ -12,10 +11,10 @@ maintainer="John <me@johnnynator.dev>"
 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=89aaf15acf5432af8f5cf4ec45cb32d87a3348906215dd56e81cb294eb276573
+checksum=5fe089b204d859ab0dd0169f811f2e30cae7c5cb36f8ab95ca36883f1fc0c2b8
 
 if [ "$XBPS_CHECK_PKGS" ]; then
-	configure_args+=" -DQT_BUILD_TESTS=ON"
+	configure_args="-DQT_BUILD_TESTS=ON"
 fi
 
 do_check() {
@@ -32,8 +31,11 @@ qt6-virtualkeyboard-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From a96e50c785f722bff0bdfc2c552dd335771d592a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:10 +0700
Subject: [PATCH 18/26] qt6-wayland: update to 6.3.1.

---
 srcpkgs/qt6-wayland/template | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/qt6-wayland/template b/srcpkgs/qt6-wayland/template
index b71a273009b9..249271bd3a7d 100644
--- a/srcpkgs/qt6-wayland/template
+++ b/srcpkgs/qt6-wayland/template
@@ -1,13 +1,14 @@
 # Template file for 'qt6-wayland'
 pkgname=qt6-wayland
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qtwayland-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true"
-hostmakedepends="qt6-base-devel perl pkg-config wayland-devel qt6-wayland-devel"
+hostmakedepends="qt6-base-devel perl pkg-config wayland-devel
+ qt6-declarative-devel"
 # XXX: Qml as optional dep
 makedepends="qt6-base-devel wayland-devel libxkbcommon-devel
+ qt6-declarative-devel
  libXcomposite-devel MesaLib-devel Vulkan-Headers libdrm-devel"
 checkdepends="dbus mesa-dri"
 short_desc="Cross-platform application and UI framework - Wayland"
@@ -15,10 +16,11 @@ maintainer="John <me@johnnynator.dev>"
 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=e7b567f6e43ffc5918d4aa825ce1eced66a00cb0a87133b2912ba5c1b2a02190
+checksum=6f14fea2d172a5b4170be3efcb0e58535f6605b61bcd823f6d5c9d165bb8c0f0
 
-if [ "$XBPS_CHECK_PKGS" ]; then
-	configure_args+=" -DQT_BUILD_TESTS=ON"
+if [ "$CROSS_BUILD" ]; then
+	configure_args="-DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true"
+	hostmakedepends+=" qt6-wayland-devel"
 fi
 
 do_check() {
@@ -32,9 +34,11 @@ qt6-wayland-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
-		vmove usr/lib/qt6/libexec/qtwaylandscanner
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From 28e2ce00c8cd63139dcac84e4f7d323ff92267c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:10 +0700
Subject: [PATCH 19/26] qt6-websockets: update to 6.3.1.

---
 srcpkgs/qt6-websockets/patches/no-cmake-test.patch |  7 +++++++
 srcpkgs/qt6-websockets/template                    | 14 +++++++++++---
 2 files changed, 18 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/qt6-websockets/patches/no-cmake-test.patch

diff --git a/srcpkgs/qt6-websockets/patches/no-cmake-test.patch b/srcpkgs/qt6-websockets/patches/no-cmake-test.patch
new file mode 100644
index 000000000000..8829f9fab1df
--- /dev/null
+++ b/srcpkgs/qt6-websockets/patches/no-cmake-test.patch
@@ -0,0 +1,7 @@
+--- a/tests/auto/CMakeLists.txt
++++ b/tests/auto/CMakeLists.txt
+@@ -1,4 +1,3 @@
+-add_subdirectory(cmake)
+ add_subdirectory(websockets)
+ if(TARGET Qt::Quick)
+     add_subdirectory(qml)
diff --git a/srcpkgs/qt6-websockets/template b/srcpkgs/qt6-websockets/template
index c2e674aacb31..e5753ca88d02 100644
--- a/srcpkgs/qt6-websockets/template
+++ b/srcpkgs/qt6-websockets/template
@@ -1,18 +1,23 @@
 # Template file for 'qt6-websockets'
 pkgname=qt6-websockets
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qtwebsockets-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr"
 hostmakedepends="perl qt6-base-devel qt6-declarative-devel"
 makedepends="qt6-base-devel qt6-declarative-devel"
+depends="qt6-plugin-tls-openssl"
+checkdepends="$depends"
 short_desc="Cross-platform application and UI framework - websockets"
 maintainer="John <me@johnnynator.dev>"
 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=e018a09fe960b7d9560d6bbc9d3ca022fed6566e6ba6fc6d869a97482d4e6361
+checksum=9f980d90c97fcbde1b50c773f6dc580cfdf8c36ce14a1be3aa2ccadfe605121a
+
+pre_check() {
+	export QML2_IMPORT_PATH="$wrksrc/build/lib/qt6/qml"
+}
 
 qt6-websockets-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel>=${version}_1"
@@ -20,8 +25,11 @@ qt6-websockets-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
 		vmove usr/lib/qt6/mkspecs
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
 	}
 }

From 8e0a648ec27dbc7282c430f6d94fd15bad08c7be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Tue, 9 Aug 2022 20:16:47 +0700
Subject: [PATCH 20/26] qt6-3d: update to 6.3.1.

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

diff --git a/srcpkgs/qt6-3d/template b/srcpkgs/qt6-3d/template
index 666f57559532..c08c3bd4a41b 100644
--- a/srcpkgs/qt6-3d/template
+++ b/srcpkgs/qt6-3d/template
@@ -1,10 +1,9 @@
 # Template file for 'qt6-3d'
 pkgname=qt6-3d
-version=6.3.0
+version=6.3.1
 revision=1
 wrksrc="qt3d-everywhere-src-${version}"
 build_style=cmake
-configure_args="-DQT_HOST_PATH=/usr"
 hostmakedepends="perl qt6-declarative-devel"
 makedepends="qt6-declarative-devel qt6-shadertools-devel libassimp-devel
  libatomic-devel"
@@ -13,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 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=74e762380dad34887878b9124dbfb981d5cf4b8b807281ff8bff311145b54de1
+checksum=9919b66dfb253fa26db1a7d664358cbc07f46c8810082ee3120d0a54b153edfe
 
 qt6-3d-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 633ce5c214ff1d23228b6045bf53cfbb5e39b1b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:11 +0700
Subject: [PATCH 21/26] New package: qt6-webchannel-6.3.1

---
 srcpkgs/qt6-webchannel-devel                  |  1 +
 .../patches/no-cmake-test.patch               |  7 ++++
 srcpkgs/qt6-webchannel/template               | 36 +++++++++++++++++++
 srcpkgs/qt6-webchannel/update                 |  1 +
 4 files changed, 45 insertions(+)
 create mode 120000 srcpkgs/qt6-webchannel-devel
 create mode 100644 srcpkgs/qt6-webchannel/patches/no-cmake-test.patch
 create mode 100644 srcpkgs/qt6-webchannel/template
 create mode 100644 srcpkgs/qt6-webchannel/update

diff --git a/srcpkgs/qt6-webchannel-devel b/srcpkgs/qt6-webchannel-devel
new file mode 120000
index 000000000000..03e8b23d785d
--- /dev/null
+++ b/srcpkgs/qt6-webchannel-devel
@@ -0,0 +1 @@
+qt6-webchannel
\ No newline at end of file
diff --git a/srcpkgs/qt6-webchannel/patches/no-cmake-test.patch b/srcpkgs/qt6-webchannel/patches/no-cmake-test.patch
new file mode 100644
index 000000000000..c02028772a2d
--- /dev/null
+++ b/srcpkgs/qt6-webchannel/patches/no-cmake-test.patch
@@ -0,0 +1,7 @@
+--- a/tests/auto/CMakeLists.txt
++++ b/tests/auto/CMakeLists.txt
+@@ -1,4 +1,3 @@
+-add_subdirectory(cmake)
+ add_subdirectory(webchannel)
+ if(TARGET Qt::Quick)
+     add_subdirectory(qml)
diff --git a/srcpkgs/qt6-webchannel/template b/srcpkgs/qt6-webchannel/template
new file mode 100644
index 000000000000..b83e801effd4
--- /dev/null
+++ b/srcpkgs/qt6-webchannel/template
@@ -0,0 +1,36 @@
+# Template file for 'qt6-webchannel'
+pkgname=qt6-webchannel
+version=6.3.1
+revision=1
+wrksrc="qtwebchannel-everywhere-src-${version}"
+build_style=cmake
+hostmakedepends="perl qt6-base-devel qt6-declarative-devel"
+makedepends="qt6-base-devel qt6-declarative-devel qt6-websockets-devel"
+short_desc="Cross-platform application and UI framework - webchannel"
+maintainer="John <me@johnnynator.dev>"
+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=aaa20ac23f86992721b7ee487c379a3fd68caa8cdcea0a77a37e0d8b47ff2668
+
+pre_check() {
+	export QML2_IMPORT_PATH="$wrksrc/build/lib/qt6/qml"
+}
+
+qt6-webchannel-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel>=${version}_1
+	 qt6-websockets-devel>=${version}_1"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
+		vmove usr/lib/qt6/mkspecs
+		vmove usr/lib/qt6/qml/QtWebChannel/plugins.qmltypes
+		vmove usr/lib/qt6/qml/QtWebChannel/qmldir
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
+	}
+}
diff --git a/srcpkgs/qt6-webchannel/update b/srcpkgs/qt6-webchannel/update
new file mode 100644
index 000000000000..844552465222
--- /dev/null
+++ b/srcpkgs/qt6-webchannel/update
@@ -0,0 +1 @@
+pkgname="${pkgname/6-/}-everywhere-src"

From 86d0e894188382b6bd2dcfdec7933a1f0d6c1319 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:11 +0700
Subject: [PATCH 22/26] New package: qt6-multimedia-6.3.1

---
 common/shlibs                   |  3 +++
 srcpkgs/qt6-multimedia-devel    |  1 +
 srcpkgs/qt6-multimedia/template | 43 +++++++++++++++++++++++++++++++++
 srcpkgs/qt6-multimedia/update   |  1 +
 4 files changed, 48 insertions(+)
 create mode 120000 srcpkgs/qt6-multimedia-devel
 create mode 100644 srcpkgs/qt6-multimedia/template
 create mode 100644 srcpkgs/qt6-multimedia/update

diff --git a/common/shlibs b/common/shlibs
index 26f10d604be9..ce04cc1ad2cf 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2078,6 +2078,9 @@ libQt6SerialPort.so.6 qt6-serialport-6.2.0alpha_1
 libQt6WebSockets.so.6 qt6-websockets-6.2.0alpha_1
 libQt6WebChannel.so.6 qt6-webchannel-6.2.0alpha_1
 libQt6Positioning.so.6 qt6-location-6.2.0alpha_1
+libQt6MultimediaWidgets.so.6 qt6-multimedia-6.3.1_1
+libQt6MultimediaQuick.so.6 qt6-multimedia-6.3.1_1
+libQt6Multimedia.so.6 qt6-multimedia-6.3.1_1
 libnpth.so.0 npth-1.1_1
 libnpupnp.so.4 libnpupnp-4.0.2_1
 libglfw.so.3 glfw-3.0.4_1
diff --git a/srcpkgs/qt6-multimedia-devel b/srcpkgs/qt6-multimedia-devel
new file mode 120000
index 000000000000..9343446502d0
--- /dev/null
+++ b/srcpkgs/qt6-multimedia-devel
@@ -0,0 +1 @@
+qt6-multimedia
\ No newline at end of file
diff --git a/srcpkgs/qt6-multimedia/template b/srcpkgs/qt6-multimedia/template
new file mode 100644
index 000000000000..84ff33149875
--- /dev/null
+++ b/srcpkgs/qt6-multimedia/template
@@ -0,0 +1,43 @@
+# Template file for 'qt6-multimedia'
+pkgname=qt6-multimedia
+version=6.3.1
+revision=1
+wrksrc="qtmultimedia-everywhere-src-${version}"
+build_style=cmake
+configure_args="-DQT_FEATURE_gstreamer=ON"
+hostmakedepends="perl qt6-declarative-devel pkg-config
+ qt6-shadertools-devel"
+makedepends="qt6-declarative-devel
+ qt6-shadertools-devel libglib-devel gst-plugins-base1-devel"
+short_desc="Cross-platform application and UI framework - multimedia"
+maintainer="John <me@johnnynator.dev>"
+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=7e03242aadd634ff2d9fcf08948290f03da3d9a5012369d908da89f82b1d7336
+
+do_check() {
+	cd build
+	local broken="tst_qmediaformat|tst_qaudiodecoderbackend"
+	broken+="|tst_qaudiodevice|tst_qaudiosource|tst_qaudiosink"
+	broken+="|tst_qmediaplayerbackend|tst_qmediacapturesession"
+	broken+="|tst_qcamerabackend|tst_qquickvideooutput"
+	broken+="|tst_qquickvideooutput_window"
+	ctest -E "($broken)"
+}
+
+qt6-multimedia-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel>=${version}_1"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
+		vmove usr/lib/qt6/mkspecs
+		vmove usr/lib/qt6/qml/QtMultimedia/plugins.qmltypes
+		vmove usr/lib/qt6/qml/QtMultimedia/qmldir
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}
diff --git a/srcpkgs/qt6-multimedia/update b/srcpkgs/qt6-multimedia/update
new file mode 100644
index 000000000000..844552465222
--- /dev/null
+++ b/srcpkgs/qt6-multimedia/update
@@ -0,0 +1 @@
+pkgname="${pkgname/6-/}-everywhere-src"

From 668dfed162aff3683f4980b1ca9de9ee95a5117f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 18:22:48 +0700
Subject: [PATCH 23/26] New package: qt6-connectivity-6.3.1

---
 common/shlibs                                 |  2 ++
 srcpkgs/qt6-connectivity-devel                |  1 +
 .../patches/no-cmake-test.patch               |  9 ++++++
 srcpkgs/qt6-connectivity/template             | 30 +++++++++++++++++++
 4 files changed, 42 insertions(+)
 create mode 120000 srcpkgs/qt6-connectivity-devel
 create mode 100644 srcpkgs/qt6-connectivity/patches/no-cmake-test.patch
 create mode 100644 srcpkgs/qt6-connectivity/template

diff --git a/common/shlibs b/common/shlibs
index ce04cc1ad2cf..2e95a22119ab 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2072,6 +2072,8 @@ libQt6Designer.so.6 qt6-tools-6.1.0_1
 libQt6DesignerComponents.so.6 qt6-tools-6.1.0_1
 libQt6Help.so.6 qt6-tools-6.1.0_1
 libQt6UiTools.so.6 qt6-tools-6.1.0_1
+libQt6Nfc.so.6 qt6-connectivity-6.3.1_1
+libQt6Bluetooth.so.6 qt6-connectivity-6.3.1_1
 libQt6HunspellInputMethod.so.6 qt6-virtualkeyboard-6.1.0_1
 libQt6VirtualKeyboard.so.6 qt6-virtualkeyboard-6.1.0_1
 libQt6SerialPort.so.6 qt6-serialport-6.2.0alpha_1
diff --git a/srcpkgs/qt6-connectivity-devel b/srcpkgs/qt6-connectivity-devel
new file mode 120000
index 000000000000..478cc9d8aa39
--- /dev/null
+++ b/srcpkgs/qt6-connectivity-devel
@@ -0,0 +1 @@
+qt6-connectivity
\ No newline at end of file
diff --git a/srcpkgs/qt6-connectivity/patches/no-cmake-test.patch b/srcpkgs/qt6-connectivity/patches/no-cmake-test.patch
new file mode 100644
index 000000000000..deb80062ac71
--- /dev/null
+++ b/srcpkgs/qt6-connectivity/patches/no-cmake-test.patch
@@ -0,0 +1,9 @@
+--- a/tests/auto/CMakeLists.txt
++++ b/tests/auto/CMakeLists.txt
+@@ -24,6 +24,3 @@ if(TARGET Qt::Nfc)
+     add_subdirectory(qndefnfcsmartposterrecord)
+     add_subdirectory(qndeffilter)
+ endif()
+-if(TARGET Qt::Bluetooth AND TARGET Qt::Nfc)
+-    add_subdirectory(cmake)
+-endif()
diff --git a/srcpkgs/qt6-connectivity/template b/srcpkgs/qt6-connectivity/template
new file mode 100644
index 000000000000..6cb61744d0cb
--- /dev/null
+++ b/srcpkgs/qt6-connectivity/template
@@ -0,0 +1,30 @@
+# Template file for 'qt6-connectivity'
+pkgname=qt6-connectivity
+version=6.3.1
+revision=1
+wrksrc="qtconnectivity-everywhere-src-${version}"
+build_style=cmake
+hostmakedepends="perl qt6-declarative-devel"
+makedepends="qt6-declarative-devel"
+short_desc="Cross-platform application and UI framework - Connectivity"
+maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
+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=b25ce4710a9c61bc6a5dbaeeb3e2ed907a8bc85478fdb2ab4312297768b695b0
+
+qt6-connectivity-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}
+	 qt6-declarative>=${version}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
+		vmove usr/lib/qt6/mkspecs
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
+	}
+}

From 716f332fd77bbd500d638b5053852b9ae45d42b2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 18:22:57 +0700
Subject: [PATCH 24/26] New package: qt6-sensors-6.3.1

---
 common/shlibs                                 |  2 ++
 srcpkgs/qt6-sensors-devel                     |  1 +
 .../qt6-sensors/patches/no-cmake-test.patch   |  8 +++++
 srcpkgs/qt6-sensors/template                  | 31 +++++++++++++++++++
 4 files changed, 42 insertions(+)
 create mode 120000 srcpkgs/qt6-sensors-devel
 create mode 100644 srcpkgs/qt6-sensors/patches/no-cmake-test.patch
 create mode 100644 srcpkgs/qt6-sensors/template

diff --git a/common/shlibs b/common/shlibs
index 2e95a22119ab..157b51f3f981 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2074,6 +2074,8 @@ libQt6Help.so.6 qt6-tools-6.1.0_1
 libQt6UiTools.so.6 qt6-tools-6.1.0_1
 libQt6Nfc.so.6 qt6-connectivity-6.3.1_1
 libQt6Bluetooth.so.6 qt6-connectivity-6.3.1_1
+libQt6Sensors.so.6 qt6-sensors-6.3.1_1
+libQt6SensorsQuick.so.6 qt6-sensors-6.3.1_1
 libQt6HunspellInputMethod.so.6 qt6-virtualkeyboard-6.1.0_1
 libQt6VirtualKeyboard.so.6 qt6-virtualkeyboard-6.1.0_1
 libQt6SerialPort.so.6 qt6-serialport-6.2.0alpha_1
diff --git a/srcpkgs/qt6-sensors-devel b/srcpkgs/qt6-sensors-devel
new file mode 120000
index 000000000000..eb9457f04055
--- /dev/null
+++ b/srcpkgs/qt6-sensors-devel
@@ -0,0 +1 @@
+qt6-sensors
\ No newline at end of file
diff --git a/srcpkgs/qt6-sensors/patches/no-cmake-test.patch b/srcpkgs/qt6-sensors/patches/no-cmake-test.patch
new file mode 100644
index 000000000000..64f81563cb13
--- /dev/null
+++ b/srcpkgs/qt6-sensors/patches/no-cmake-test.patch
@@ -0,0 +1,8 @@
+--- a/tests/auto/CMakeLists.txt
++++ b/tests/auto/CMakeLists.txt
+@@ -1,5 +1,4 @@
+ add_subdirectory(qsensor)
+-add_subdirectory(cmake)
+ if(TARGET Qt::Quick)
+     add_subdirectory(qml)
+ endif()
diff --git a/srcpkgs/qt6-sensors/template b/srcpkgs/qt6-sensors/template
new file mode 100644
index 000000000000..5a81f43b60eb
--- /dev/null
+++ b/srcpkgs/qt6-sensors/template
@@ -0,0 +1,31 @@
+# Template file for 'qt6-sensors'
+pkgname=qt6-sensors
+version=6.3.1
+revision=1
+wrksrc="qtsensors-everywhere-src-${version}"
+build_style=cmake
+hostmakedepends="perl qt6-declarative-devel qt6-svg-devel pkg-config"
+makedepends="qt6-declarative-devel qt6-svg-devel"
+short_desc="Cross-platform application and UI framework - Sensors"
+maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
+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=4b240b59edba9a42b4735758a25f279a26841b982864e7b38f6ef0b81e0d60cc
+
+qt6-sensors-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}
+	 qt6-declarative-devel>=${version}_1"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
+		vmove usr/lib/qt6/mkspecs
+		vmove usr/lib/qt6/qml/QtSensors/plugins.qmltypes
+		vmove usr/lib/qt6/qml/QtSensors/qmldir
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}

From 193278d11d4645e7fffd59f41d3707a607f5c0f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 18:23:08 +0700
Subject: [PATCH 25/26] New package: qt6-remoteobjects-6.3.1

---
 common/shlibs                                 |  2 +
 srcpkgs/qt6-remoteobjects-devel               |  1 +
 .../patches/no-cmake-test.patch               |  9 ++++
 srcpkgs/qt6-remoteobjects/template            | 43 +++++++++++++++++++
 4 files changed, 55 insertions(+)
 create mode 120000 srcpkgs/qt6-remoteobjects-devel
 create mode 100644 srcpkgs/qt6-remoteobjects/patches/no-cmake-test.patch
 create mode 100644 srcpkgs/qt6-remoteobjects/template

diff --git a/common/shlibs b/common/shlibs
index 157b51f3f981..91f197e54c93 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2074,6 +2074,8 @@ libQt6Help.so.6 qt6-tools-6.1.0_1
 libQt6UiTools.so.6 qt6-tools-6.1.0_1
 libQt6Nfc.so.6 qt6-connectivity-6.3.1_1
 libQt6Bluetooth.so.6 qt6-connectivity-6.3.1_1
+libQt6RemoteObjects.so.6 qt6-remoteobjects-6.3.1_1
+libQt6RemoteObjectsQml.so.6 qt6-remoteobjects-6.3.1_1
 libQt6Sensors.so.6 qt6-sensors-6.3.1_1
 libQt6SensorsQuick.so.6 qt6-sensors-6.3.1_1
 libQt6HunspellInputMethod.so.6 qt6-virtualkeyboard-6.1.0_1
diff --git a/srcpkgs/qt6-remoteobjects-devel b/srcpkgs/qt6-remoteobjects-devel
new file mode 120000
index 000000000000..2a027f95266f
--- /dev/null
+++ b/srcpkgs/qt6-remoteobjects-devel
@@ -0,0 +1 @@
+qt6-remoteobjects
\ No newline at end of file
diff --git a/srcpkgs/qt6-remoteobjects/patches/no-cmake-test.patch b/srcpkgs/qt6-remoteobjects/patches/no-cmake-test.patch
new file mode 100644
index 000000000000..2d9ba9463ebf
--- /dev/null
+++ b/srcpkgs/qt6-remoteobjects/patches/no-cmake-test.patch
@@ -0,0 +1,9 @@
+--- a/tests/auto/CMakeLists.txt
++++ b/tests/auto/CMakeLists.txt
+@@ -1,6 +1,5 @@
+ 
+ add_subdirectory(benchmarks)
+-add_subdirectory(cmake)
+ add_subdirectory(modelreplica)
+ add_subdirectory(modelview)
+ add_subdirectory(pods)
diff --git a/srcpkgs/qt6-remoteobjects/template b/srcpkgs/qt6-remoteobjects/template
new file mode 100644
index 000000000000..cdc3b23f52de
--- /dev/null
+++ b/srcpkgs/qt6-remoteobjects/template
@@ -0,0 +1,43 @@
+# Template file for 'qt6-remoteobjects'
+pkgname=qt6-remoteobjects
+version=6.3.1
+revision=1
+wrksrc="qtremoteobjects-everywhere-src-${version}"
+build_style=cmake
+hostmakedepends="perl qt6-declarative-devel pkg-config"
+makedepends="qt6-declarative-devel"
+# Not a strict dependency, but it's 2022, everyone should use TLS
+depends="qt6-plugin-tls-openssl"
+checkdepends="$depends"
+short_desc="Cross-platform application and UI framework - Remote Objects"
+maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
+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=ea6d038b11c60981de0bd39a6091a59abf7d031e37bfc592b31be1217bef4ca6
+
+if [ "$CROSS_BUILD" ]; then
+	hostmakedepends+=" qt6-remoteobjects"
+	configure_args="-DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=true"
+fi
+
+pre_check() {
+	export QML2_IMPORT_PATH="$wrksrc/build/lib/qt6/qml"
+}
+
+qt6-remoteobjects-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}
+	 qt6-declarative-devel>=${version}_1"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/metatypes
+		vmove usr/lib/pkgconfig
+		vmove usr/lib/qt6/mkspecs
+		vmove usr/lib/qt6/qml/QtRemoteObjects/plugins.qmltypes
+		vmove usr/lib/qt6/qml/QtRemoteObjects/qmldir
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+	}
+}

From e8d2c4e832105a1cef31e65ae9b9d780b6f2cdba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 8 Aug 2022 17:13:11 +0700
Subject: [PATCH 26/26] New package: qt6-webengine-6.3.1.

---
 common/shlibs                                 |    7 +
 srcpkgs/qt6-webengine-devel                   |    1 +
 srcpkgs/qt6-webengine-examples                |    1 +
 .../patches/0001-None-no-debug.patch          |   11 +
 .../patches/0002-enable-ppc64.patch           |   20 +
 .../patches/0003-cross-hack.patch             |   10 +
 .../0004-ppc-disable-jxl-decoder.patch        |   13 +
 .../patches/0050-no-glibc-cmake-check.patch   |   14 +
 .../0100-chromium-sandbox-membarrier.patch    |   58 +
 .../qt6-webengine/patches/0101-size_t.patch   |   16 +
 .../0102-chromium-90-ruy-include.patch        |   19 +
 ...-v8-monotonic-pthread-cont_timedwait.patch |   22 +
 .../0104-chromium-revert-9d080c0.patch        |  162 +
 ...-chromium-revert-drop-of-system-java.patch |   15 +
 .../patches/0106-chromium-system-nodejs.patch |   20 +
 .../0107-chromium-cursed^Uscoped_file.patch   |   18 +
 .../0108-chromium-fix-narrowing-cast.patch    |   53 +
 .../0109-chromium-remove-strip_binary.patch   |   32 +
 ...ium-revert-use-ffile-compilation-dir.patch |   57 +
 ...11-chromium-no-Wno-stringop-overread.patch |   10 +
 .../0150-chromium-glibc-libc_malloc.patch     |   24 +
 ...-include-sys-reg.h-to-get-__WORDSIZE.patch |   21 +
 .../0201-chromium-musl-dispatch-to-musl.patch |  103 +
 .../0202-chromium-musl-no-mallinfo.patch      |   62 +
 .../0203-chromium-musl-siginfo_t.patch        |   18 +
 .../0204-chromium-musl-stackstart.patch       |   20 +
 .../patches/0205-chromium-musl-sandbox.patch  |   92 +
 ...0206-chromium-musl-default-stacksize.patch |   15 +
 .../patches/0208-chromium-musl-execinfo.patch |  125 +
 .../0209-chromium-musl-thread-stacksize.patch |   22 +
 .../0210-chromium-musl-msgvec-push_back.patch |   14 +
 ...ium-musl-canonicalize-file-name-musl.patch |   11 +
 .../0212-chromium-musl-no-getcontext.patch    |   29 +
 .../patches/0213-chromium-musl-crashpad.patch |   24 +
 .../patches/0214-chromium-musl-fixes.patch    |  108 +
 .../patches/0215-chromium-musl-cdefs.patch    |   29 +
 .../patches/0216-chromium-musl-stat.patch     |   12 +
 .../patches/0217-chromium-musl-resolver.patch |   77 +
 .../patches/0600-chromium-sndio.patch         |  876 ++++
 .../patches/0700-armv7l-neon.patch            |   10 +
 ...-chromium-musl-cross-no-asm_ptrace_h.patch |   30 +
 .../0751-chromium-musl-arm-user_vfp.patch     |   20 +
 .../0752-chromium-musl-arm-elf_auxv_t.patch   |   18 +
 ...0801-chromium-i686-vaapi-fpermissive.patch |   24 +
 .../patches/0900-xxx-ppc64le-libvpx.patch     |   65 +
 .../0901-xxx-ppc64le-sandbox-linux-stat.patch |   31 +
 .../patches/0902-xxx-ppc64le-support.patch    | 3556 +++++++++++++++++
 .../0903-xxx-ppc64le-swiftshader.patch        |   18 +
 .../patches/cross-build-examples.patch        |   16 +
 srcpkgs/qt6-webengine/template                |  179 +
 srcpkgs/qt6-webengine/update                  |    1 +
 51 files changed, 6209 insertions(+)
 create mode 120000 srcpkgs/qt6-webengine-devel
 create mode 120000 srcpkgs/qt6-webengine-examples
 create mode 100644 srcpkgs/qt6-webengine/patches/0001-None-no-debug.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0002-enable-ppc64.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0003-cross-hack.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0004-ppc-disable-jxl-decoder.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0050-no-glibc-cmake-check.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0100-chromium-sandbox-membarrier.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0101-size_t.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0102-chromium-90-ruy-include.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0103-chromium-v8-monotonic-pthread-cont_timedwait.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0104-chromium-revert-9d080c0.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0105-chromium-revert-drop-of-system-java.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0106-chromium-system-nodejs.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0107-chromium-cursed^Uscoped_file.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0108-chromium-fix-narrowing-cast.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0109-chromium-remove-strip_binary.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0110-chromium-revert-use-ffile-compilation-dir.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0111-chromium-no-Wno-stringop-overread.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0150-chromium-glibc-libc_malloc.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0200-chromium-musl-include-sys-reg.h-to-get-__WORDSIZE.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0201-chromium-musl-dispatch-to-musl.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0202-chromium-musl-no-mallinfo.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0203-chromium-musl-siginfo_t.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0204-chromium-musl-stackstart.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0205-chromium-musl-sandbox.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0206-chromium-musl-default-stacksize.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0208-chromium-musl-execinfo.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0209-chromium-musl-thread-stacksize.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0210-chromium-musl-msgvec-push_back.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0211-chromium-musl-canonicalize-file-name-musl.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0212-chromium-musl-no-getcontext.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0213-chromium-musl-crashpad.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0214-chromium-musl-fixes.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0215-chromium-musl-cdefs.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0216-chromium-musl-stat.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0217-chromium-musl-resolver.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0600-chromium-sndio.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0700-armv7l-neon.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0750-chromium-musl-cross-no-asm_ptrace_h.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0751-chromium-musl-arm-user_vfp.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0752-chromium-musl-arm-elf_auxv_t.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0801-chromium-i686-vaapi-fpermissive.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0900-xxx-ppc64le-libvpx.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0901-xxx-ppc64le-sandbox-linux-stat.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0902-xxx-ppc64le-support.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/0903-xxx-ppc64le-swiftshader.patch
 create mode 100644 srcpkgs/qt6-webengine/patches/cross-build-examples.patch
 create mode 100644 srcpkgs/qt6-webengine/template
 create mode 100644 srcpkgs/qt6-webengine/update

diff --git a/common/shlibs b/common/shlibs
index 91f197e54c93..1f8acc43c36e 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2087,6 +2087,13 @@ libQt6Positioning.so.6 qt6-location-6.2.0alpha_1
 libQt6MultimediaWidgets.so.6 qt6-multimedia-6.3.1_1
 libQt6MultimediaQuick.so.6 qt6-multimedia-6.3.1_1
 libQt6Multimedia.so.6 qt6-multimedia-6.3.1_1
+libQt6WebEngineQuick.so.6 qt6-webengine-6.3.1_1
+libQt6PdfWidgets.so.6 qt6-webengine-6.3.1_1
+libQt6PdfQuick.so.6 qt6-webengine-6.3.1_1
+libQt6WebEngineCore.so.6 qt6-webengine-6.3.1_1
+libQt6Pdf.so.6 qt6-webengine-6.3.1_1
+libQt6WebEngineQuickDelegatesQml.so.6 qt6-webengine-6.3.1_1
+libQt6WebEngineWidgets.so.6 qt6-webengine-6.3.1_1
 libnpth.so.0 npth-1.1_1
 libnpupnp.so.4 libnpupnp-4.0.2_1
 libglfw.so.3 glfw-3.0.4_1
diff --git a/srcpkgs/qt6-webengine-devel b/srcpkgs/qt6-webengine-devel
new file mode 120000
index 000000000000..8e4d1b99c587
--- /dev/null
+++ b/srcpkgs/qt6-webengine-devel
@@ -0,0 +1 @@
+qt6-webengine
\ No newline at end of file
diff --git a/srcpkgs/qt6-webengine-examples b/srcpkgs/qt6-webengine-examples
new file mode 120000
index 000000000000..8e4d1b99c587
--- /dev/null
+++ b/srcpkgs/qt6-webengine-examples
@@ -0,0 +1 @@
+qt6-webengine
\ No newline at end of file
diff --git a/srcpkgs/qt6-webengine/patches/0001-None-no-debug.patch b/srcpkgs/qt6-webengine/patches/0001-None-no-debug.patch
new file mode 100644
index 000000000000..1ba33f8e6fd9
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0001-None-no-debug.patch
@@ -0,0 +1,11 @@
+--- a/cmake/Functions.cmake
++++ b/cmake/Functions.cmake
+@@ -813,6 +813,8 @@ macro(append_build_type_setup)
+         endif()
+     elseif(${config} STREQUAL "MinSizeRel")
+         list(APPEND gnArgArg is_debug=false symbol_level=0 optimize_for_size=true)
++    elseif(${config} STREQUAL "None")
++        list(APPEND gnArgArg is_debug=false symbol_level=0)
+     endif()
+     if(FEATURE_developer_build OR (${config} STREQUAL "Debug") OR QT_FEATURE_webengine_sanitizer)
+         list(APPEND gnArgArg
diff --git a/srcpkgs/qt6-webengine/patches/0002-enable-ppc64.patch b/srcpkgs/qt6-webengine/patches/0002-enable-ppc64.patch
new file mode 100644
index 000000000000..d72ef1ad1a10
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0002-enable-ppc64.patch
@@ -0,0 +1,20 @@
+--- a/cmake/Functions.cmake
++++ b/cmake/Functions.cmake
+@@ -622,6 +622,8 @@ function(get_gn_arch result arch)
+         set(${result} "mipsel" PARENT_SCOPE)
+     elseif(arch STREQUAL "mipsel64")
+         set(${result} "mips64el" PARENT_SCOPE)
++    elseif(arch STREQUAL "power64")
++        set(${result} "power64" PARENT_SCOPE)
+     else()
+         message(DEBUG "Unsupported architecture: ${arch}")
+     endif()
+@@ -641,6 +643,8 @@ function(get_v8_arch result targetArch h
+             set(${result} "mipsel" PARENT_SCOPE)
+         elseif(hostArch STREQUAL "mipsel64")
+             set(${result} "mipsel" PARENT_SCOPE)
++        elseif(hostArch STREQUAL "power64")
++            set(${result} "power64" PARENT_SCOPE)
+         else()
+             message(DEBUG "Unsupported architecture: ${hostArch}")
+         endif()
diff --git a/srcpkgs/qt6-webengine/patches/0003-cross-hack.patch b/srcpkgs/qt6-webengine/patches/0003-cross-hack.patch
new file mode 100644
index 000000000000..ea9f90094a63
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0003-cross-hack.patch
@@ -0,0 +1,10 @@
+--- a/src/core/api/CMakeLists.txt
++++ b/src/core/api/CMakeLists.txt
+@@ -50,6 +50,7 @@ qt_internal_add_module(WebEngineCore
+         Qt::Gui
+         Qt::Network
+         Qt::Quick
++        X11
+ )
+ 
+ set_target_properties(WebEngineCore PROPERTIES QTWEBENGINEPROCESS_NAME ${qtWebEngineProcessName})
diff --git a/srcpkgs/qt6-webengine/patches/0004-ppc-disable-jxl-decoder.patch b/srcpkgs/qt6-webengine/patches/0004-ppc-disable-jxl-decoder.patch
new file mode 100644
index 000000000000..73c1151968f4
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0004-ppc-disable-jxl-decoder.patch
@@ -0,0 +1,13 @@
+--- a/src/core/CMakeLists.txt
++++ b/src/core/CMakeLists.txt
+@@ -414,6 +414,10 @@ foreach(arch ${archs})
+                 CONDITION QT_FEATURE_webengine_ozone_x11 AND XSCRNSAVER_FOUND
+             )
+ 
++            if (cpu STREQUAL "ppc64")
++                list(APPEND gnArgArg enable_jxl_decoder=false)
++            endif()
++
+             if(QT_FEATURE_webengine_kerberos)
+                 list(APPEND gnArgArg
+                      external_gssapi_include_dir="${GSSAPI_INCLUDE_DIRS}/gssapi"
diff --git a/srcpkgs/qt6-webengine/patches/0050-no-glibc-cmake-check.patch b/srcpkgs/qt6-webengine/patches/0050-no-glibc-cmake-check.patch
new file mode 100644
index 000000000000..f756bf0286bb
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0050-no-glibc-cmake-check.patch
@@ -0,0 +1,14 @@
+--- a/configure.cmake
++++ b/configure.cmake
+@@ -499,11 +499,6 @@ add_check_for_support(
+ )
+ add_check_for_support(
+    MODULES QtWebEngine QtPdf
+-   CONDITION NOT LINUX OR TEST_glibc
+-   MESSAGE "A suitable version >= 2.17 of glibc is required."
+-)
+-add_check_for_support(
+-   MODULES QtWebEngine QtPdf
+    CONDITION NOT LINUX OR TEST_khr
+    MESSAGE "Build requires Khronos development headers for build - see mesa/libegl1-mesa-dev"
+ )
diff --git a/srcpkgs/qt6-webengine/patches/0100-chromium-sandbox-membarrier.patch b/srcpkgs/qt6-webengine/patches/0100-chromium-sandbox-membarrier.patch
new file mode 100644
index 000000000000..2dd7b4aa948f
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0100-chromium-sandbox-membarrier.patch
@@ -0,0 +1,58 @@
+--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
++++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
+@@ -413,6 +413,7 @@ bool SyscallSets::IsAllowedProcessStartO
+   switch (sysno) {
+     case __NR_exit:
+     case __NR_exit_group:
++    case __NR_membarrier:
+     case __NR_wait4:
+     case __NR_waitid:
+ #if defined(__i386__)
+--- a/src/3rdparty/chromium/sandbox/linux/system_headers/arm64_linux_syscalls.h
++++ b/src/3rdparty/chromium/sandbox/linux/system_headers/arm64_linux_syscalls.h
+@@ -1215,4 +1215,8 @@
+ #define __NR_landlock_restrict_self 446
+ #endif
+ 
++#if !defined(__NR_membarrier)
++#define __NR_membarrier 283
++#endif
++
+ #endif  // SANDBOX_LINUX_SYSTEM_HEADERS_ARM64_LINUX_SYSCALLS_H_
+--- a/src/3rdparty/chromium/sandbox/linux/system_headers/arm_linux_syscalls.h
++++ b/src/3rdparty/chromium/sandbox/linux/system_headers/arm_linux_syscalls.h
+@@ -1617,6 +1617,10 @@
+ #define __NR_landlock_restrict_self (__NR_SYSCALL_BASE + 446)
+ #endif
+ 
++#if !defined(__NR_membarrier)
++#define __NR_membarrier (__NR_SYSCALL_BASE+389)
++#endif
++
+ // ARM private syscalls.
+ #if !defined(__ARM_NR_BASE)
+ #define __ARM_NR_BASE (__NR_SYSCALL_BASE + 0xF0000)
+--- a/src/3rdparty/chromium/sandbox/linux/system_headers/x86_32_linux_syscalls.h
++++ b/src/3rdparty/chromium/sandbox/linux/system_headers/x86_32_linux_syscalls.h
+@@ -1750,5 +1750,9 @@
+ #define __NR_landlock_restrict_self 446
+ #endif
+ 
++#if !defined(__NR_membarrier)
++#define __NR_membarrier 375
++#endif
++
+ #endif  // SANDBOX_LINUX_SYSTEM_HEADERS_X86_32_LINUX_SYSCALLS_H_
+ 
+--- a/src/3rdparty/chromium/sandbox/linux/system_headers/x86_64_linux_syscalls.h
++++ b/src/3rdparty/chromium/sandbox/linux/system_headers/x86_64_linux_syscalls.h
+@@ -1438,5 +1438,9 @@
+ #define __NR_landlock_restrict_self 446
+ #endif
+ 
++#if !defined(__NR_membarrier)
++#define __NR_membarrier 324
++#endif
++
+ #endif  // SANDBOX_LINUX_SYSTEM_HEADERS_X86_64_LINUX_SYSCALLS_H_
+ 
diff --git a/srcpkgs/qt6-webengine/patches/0101-size_t.patch b/srcpkgs/qt6-webengine/patches/0101-size_t.patch
new file mode 100644
index 000000000000..fccc085da311
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0101-size_t.patch
@@ -0,0 +1,16 @@
+--- a/src/3rdparty/chromium/third_party/angle/include/platform/PlatformMethods.h
++++ b/src/3rdparty/chromium/third_party/angle/include/platform/PlatformMethods.h
+@@ -239,11 +239,11 @@ inline void DefaultOverrideFeaturesMtl(P
+ using ProgramKeyType   = std::array<uint8_t, 20>;
+ using CacheProgramFunc = void (*)(PlatformMethods *platform,
+                                   const ProgramKeyType &key,
+-                                  size_t programSize,
++                                  std::size_t programSize,
+                                   const uint8_t *programBytes);
+ inline void DefaultCacheProgram(PlatformMethods *platform,
+                                 const ProgramKeyType &key,
+-                                size_t programSize,
++                                std::size_t programSize,
+                                 const uint8_t *programBytes)
+ {}
+ 
diff --git a/srcpkgs/qt6-webengine/patches/0102-chromium-90-ruy-include.patch b/srcpkgs/qt6-webengine/patches/0102-chromium-90-ruy-include.patch
new file mode 100644
index 000000000000..bbba579076d6
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0102-chromium-90-ruy-include.patch
@@ -0,0 +1,19 @@
+From 714092f336bb14d2fcc27396ec323b3d843bb962 Mon Sep 17 00:00:00 2001
+From: Stephan Hartmann <stha09@googlemail.com>
+Date: Thu, 4 Mar 2021 15:05:46 +0000
+Subject: [PATCH] IWYU: include limits for std::numeric_limits
+
+---
+ third_party/ruy/src/ruy/block_map.cc | 1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/src/3rdparty/chromium/third_party/ruy/src/ruy/block_map.cc
++++ b/src/3rdparty/chromium/third_party/ruy/src/ruy/block_map.cc
+@@ -17,6 +17,7 @@ limitations under the License.
+ 
+ #include <algorithm>
+ #include <cstdint>
++#include <limits>
+ 
+ #ifdef RUY_MAKEBLOCKMAP_DEBUG
+ #include <cstdio>
diff --git a/srcpkgs/qt6-webengine/patches/0103-chromium-v8-monotonic-pthread-cont_timedwait.patch b/srcpkgs/qt6-webengine/patches/0103-chromium-v8-monotonic-pthread-cont_timedwait.patch
new file mode 100644
index 000000000000..1dc8bc4d3d17
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0103-chromium-v8-monotonic-pthread-cont_timedwait.patch
@@ -0,0 +1,22 @@
+Use monotonic clock for pthread_cond_timedwait with musl too.
+
+--- a/src/3rdparty/chromium/v8/src/base/platform/condition-variable.cc
++++ b/src/3rdparty/chromium/v8/src/base/platform/condition-variable.cc
+@@ -20,7 +20,7 @@ namespace base {
+ 
+ ConditionVariable::ConditionVariable() {
+ #if (V8_OS_FREEBSD || V8_OS_NETBSD || V8_OS_OPENBSD || \
+-     (V8_OS_LINUX && V8_LIBC_GLIBC))
++     V8_OS_LINUX)
+   // On Free/Net/OpenBSD and Linux with glibc we can change the time
+   // source for pthread_cond_timedwait() to use the monotonic clock.
+   pthread_condattr_t attr;
+@@ -96,7 +96,7 @@ bool ConditionVariable::WaitFor(Mutex* m
+       &native_handle_, &mutex->native_handle(), &ts);
+ #else
+ #if (V8_OS_FREEBSD || V8_OS_NETBSD || V8_OS_OPENBSD || \
+-     (V8_OS_LINUX && V8_LIBC_GLIBC))
++     V8_OS_LINUX)
+   // On Free/Net/OpenBSD and Linux with glibc we can change the time
+   // source for pthread_cond_timedwait() to use the monotonic clock.
+   result = clock_gettime(CLOCK_MONOTONIC, &ts);
diff --git a/srcpkgs/qt6-webengine/patches/0104-chromium-revert-9d080c0.patch b/srcpkgs/qt6-webengine/patches/0104-chromium-revert-9d080c0.patch
new file mode 100644
index 000000000000..42b1ee9ec063
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0104-chromium-revert-9d080c0.patch
@@ -0,0 +1,162 @@
+ Original change's description:
+ > Replace 'blacklist' with 'ignorelist' in ./tools/msan/.
+ >
+ > Bug: 1097272, 1097268
+ > Change-Id: Id5c8227a5bfb1ffaec82d3168b609085b10c8297
+ > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2867730
+ > Commit-Queue: Dylan Cutler <dylancutler@google.com>
+ > Reviewed-by: Nico Weber <thakis@chromium.org>
+ > Reviewed-by: Jonathan Metzman <metzman@chromium.org>
+ > Cr-Commit-Position: refs/heads/master@{#883035}
+--- a/src/3rdparty/chromium/build/config/sanitizers/BUILD.gn
++++ b/src/3rdparty/chromium/build/config/sanitizers/BUILD.gn
+@@ -272,11 +272,11 @@ config("asan_flags") {
+   if (is_asan) {
+     cflags += [ "-fsanitize=address" ]
+     if (is_win) {
+-      if (!defined(asan_win_blocklist_path)) {
+-        asan_win_blocklist_path =
++      if (!defined(asan_win_blacklist_path)) {
++        asan_win_blacklist_path =
+             rebase_path("//tools/memory/asan/blocklist_win.txt", root_build_dir)
+       }
+-      cflags += [ "-fsanitize-ignorelist=$asan_win_blocklist_path" ]
++      cflags += [ "-fsanitize-blacklist=$asan_win_blacklist_path" ]
+     }
+   }
+ }
+@@ -306,13 +306,13 @@ config("link_shared_library") {
+ config("cfi_flags") {
+   cflags = []
+   if (is_cfi && current_toolchain == default_toolchain) {
+-    if (!defined(cfi_ignorelist_path)) {
+-      cfi_ignorelist_path =
++    if (!defined(cfi_blacklist_path)) {
++      cfi_blacklist_path =
+           rebase_path("//tools/cfi/ignores.txt", root_build_dir)
+     }
+     cflags += [
+       "-fsanitize=cfi-vcall",
+-      "-fsanitize-ignorelist=$cfi_ignorelist_path",
++      "-fsanitize-blacklist=$cfi_blacklist_path",
+     ]
+ 
+     if (use_cfi_cast) {
+@@ -409,14 +409,14 @@ config("msan_flags") {
+   if (is_msan) {
+     assert(is_linux || is_chromeos,
+            "msan only supported on linux x86_64/ChromeOS")
+-    if (!defined(msan_ignorelist_path)) {
+-      msan_ignorelist_path =
+-          rebase_path("//tools/msan/ignorelist.txt", root_build_dir)
++    if (!defined(msan_blacklist_path)) {
++      msan_blacklist_path =
++          rebase_path("//tools/msan/blacklist.txt", root_build_dir)
+     }
+     cflags = [
+       "-fsanitize=memory",
+       "-fsanitize-memory-track-origins=$msan_track_origins",
+-      "-fsanitize-ignorelist=$msan_ignorelist_path",
++      "-fsanitize-blacklist=$msan_blacklist_path",
+     ]
+   }
+ }
+@@ -424,13 +424,13 @@ config("msan_flags") {
+ config("tsan_flags") {
+   if (is_tsan) {
+     assert(is_linux || is_chromeos, "tsan only supported on linux x86_64")
+-    if (!defined(tsan_ignorelist_path)) {
+-      tsan_ignorelist_path =
++    if (!defined(tsan_blacklist_path)) {
++      tsan_blacklist_path =
+           rebase_path("//tools/memory/tsan_v2/ignores.txt", root_build_dir)
+     }
+     cflags = [
+       "-fsanitize=thread",
+-      "-fsanitize-ignorelist=$tsan_ignorelist_path",
++      "-fsanitize-blacklist=$tsan_blacklist_path",
+     ]
+   }
+ }
+@@ -438,8 +438,8 @@ config("tsan_flags") {
+ config("ubsan_flags") {
+   cflags = []
+   if (is_ubsan) {
+-    if (!defined(ubsan_ignorelist_path)) {
+-      ubsan_ignorelist_path =
++    if (!defined(ubsan_blacklist_path)) {
++      ubsan_blacklist_path =
+           rebase_path("//tools/ubsan/ignorelist.txt", root_build_dir)
+     }
+     cflags += [
+@@ -456,7 +456,7 @@ config("ubsan_flags") {
+       "-fsanitize=signed-integer-overflow",
+       "-fsanitize=unreachable",
+       "-fsanitize=vla-bound",
+-      "-fsanitize-ignorelist=$ubsan_ignorelist_path",
++      "-fsanitize-blacklist=$ubsan_blacklist_path",
+     ]
+     if (!is_clang) {
+       # These exposes too much illegal C++14 code to compile on anything stricter than clang:
+@@ -497,8 +497,8 @@ config("ubsan_no_recover") {
+ 
+ config("ubsan_security_flags") {
+   if (is_ubsan_security) {
+-    if (!defined(ubsan_security_ignorelist_path)) {
+-      ubsan_security_ignorelist_path =
++    if (!defined(ubsan_security_blacklist_path)) {
++      ubsan_security_blacklist_path =
+           rebase_path("//tools/ubsan/security_ignorelist.txt", root_build_dir)
+     }
+     cflags = [
+@@ -506,7 +506,7 @@ config("ubsan_security_flags") {
+       "-fsanitize=shift",
+       "-fsanitize=signed-integer-overflow",
+       "-fsanitize=vla-bound",
+-      "-fsanitize-ignorelist=$ubsan_security_ignorelist_path",
++      "-fsanitize-blacklist=$ubsan_security_blacklist_path",
+     ]
+   }
+ }
+@@ -519,13 +519,13 @@ config("ubsan_null_flags") {
+ 
+ config("ubsan_vptr_flags") {
+   if (is_ubsan_vptr) {
+-    if (!defined(ubsan_vptr_ignorelist_path)) {
+-      ubsan_vptr_ignorelist_path =
++    if (!defined(ubsan_vptr_blacklist_path)) {
++      ubsan_vptr_blacklist_path =
+           rebase_path("//tools/ubsan/vptr_ignorelist.txt", root_build_dir)
+     }
+     cflags = [
+       "-fsanitize=vptr",
+-      "-fsanitize-ignorelist=$ubsan_vptr_ignorelist_path",
++      "-fsanitize-blacklist=$ubsan_vptr_blacklist_path",
+     ]
+     if (!is_clang) {
+       # Clang specific flag:
+--- a/src/3rdparty/chromium/build_overrides/build.gni
++++ b/src/3rdparty/chromium/build_overrides/build.gni
+@@ -43,15 +43,15 @@ declare_args() {
+ # Allows different projects to specify their own suppression/ignore lists for
+ # sanitizer tools.
+ # asan_suppressions_file = "path/to/asan_suppressions.cc"
+-# asan_win_ignorelist_path = "path/to/asan/blocklist_win.txt"
++# asan_win_blacklist_path = "path/to/asan/blocklist_win.txt"
+ # lsan_suppressions_file = "path/to/lsan_suppressions.cc"
+ # tsan_suppressions_file = "path/to/tsan_suppressions.cc"
+-# tsan_ignorelist_path = "path/to/tsan/ignores.txt"
+-# msan_ignorelist_path = "path/to/msan/ignorelist.txt"
+-# ubsan_ignorelist_path = "path/to/ubsan/ignorelist.txt"
+-# ubsan_vptr_ignorelist_path = "path/to/ubsan/vptr_ignorelist.txt"
+-# ubsan_security_ignorelist_path = "path/to/ubsan/security_ignorelist.txt"
+-# cfi_ignorelist_path = "path/to/cfi/ignores.txt"
++# tsan_blacklist_path = "path/to/tsan/ignores.txt"
++# msan_blacklist_path = "path/to/msan/blacklist.txt"
++# ubsan_blacklist_path = "path/to/ubsan/blacklist.txt"
++# ubsan_vptr_blacklist_path = "path/to/ubsan/vptr_blacklist.txt"
++# ubsan_security_blacklist_path = "path/to/ubsan/security_blacklist.txt"
++# cfi_blacklist_path = "path/to/cfi/ignores.txt"
+ 
+ declare_args() {
+   # Android 32-bit non-component, non-clang builds cannot have symbol_level=2
diff --git a/srcpkgs/qt6-webengine/patches/0105-chromium-revert-drop-of-system-java.patch b/srcpkgs/qt6-webengine/patches/0105-chromium-revert-drop-of-system-java.patch
new file mode 100644
index 000000000000..44f3aa8fae5e
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0105-chromium-revert-drop-of-system-java.patch
@@ -0,0 +1,15 @@
+This was dropped for some reason in 6951c37cecd05979b232a39e5c10e6346a0f74ef
+--- a/src/3rdparty/chromium/third_party/closure_compiler/compiler.py
++++ b/src/3rdparty/chromium/third_party/closure_compiler/compiler.py
+@@ -13,8 +13,9 @@ import subprocess
+ 
+ 
+ _CURRENT_DIR = os.path.join(os.path.dirname(__file__))
+-_JAVA_PATH = os.path.join(_CURRENT_DIR, "..", "jdk", "current", "bin", "java")
+-assert os.path.isfile(_JAVA_PATH), "java only allowed in android builds"
++_JAVA_BIN = "java"
++_JDK_PATH = os.path.join(_CURRENT_DIR, "..", "jdk", "current", "bin", "java")
++_JAVA_PATH = _JDK_PATH if os.path.isfile(_JDK_PATH) else _JAVA_BIN
+ 
+ class Compiler(object):
+   """Runs the Closure compiler on given source files to typecheck them
diff --git a/srcpkgs/qt6-webengine/patches/0106-chromium-system-nodejs.patch b/srcpkgs/qt6-webengine/patches/0106-chromium-system-nodejs.patch
new file mode 100644
index 000000000000..1e067cc6eda0
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0106-chromium-system-nodejs.patch
@@ -0,0 +1,20 @@
+--- a/src/3rdparty/chromium/third_party/node/node.py
++++ b/src/3rdparty/chromium/third_party/node/node.py
+@@ -36,11 +36,12 @@ def GetBinaryPath():
+   if platform.system() == 'Darwin' and platform.machine() == 'arm64':
+       return os.path.join(os_path.join(os_path.dirname(__file__), 'mac',
+                           'node-darwin-arm64', 'bin', 'node'))
+-  return os_path.join(os_path.dirname(__file__), *{
+-    'Darwin': ('mac', 'node-darwin-x64', 'bin', 'node'),
+-    'Linux': ('linux', 'node-linux-x64', 'bin', 'node'),
+-    'Windows': ('win', 'node.exe'),
+-  }[platform.system()])
++  return "/usr/bin/node"
++  #return os_path.join(os_path.dirname(__file__), *{
++  #  'Darwin': ('mac', 'node-darwin-x64', 'bin', 'node'),
++  #  'Linux': ('linux', 'node-linux-x64', 'bin', 'node'),
++  #  'Windows': ('win', 'node.exe'),
++  #}[platform.system()])
+ 
+ 
+ def RunNode(cmd_parts, stdout=None):
diff --git a/srcpkgs/qt6-webengine/patches/0107-chromium-cursed^Uscoped_file.patch b/srcpkgs/qt6-webengine/patches/0107-chromium-cursed^Uscoped_file.patch
new file mode 100644
index 000000000000..a8f5d971883d
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0107-chromium-cursed^Uscoped_file.patch
@@ -0,0 +1,18 @@
+--- a/src/3rdparty/chromium/base/files/scoped_file_linux.cc
++++ b/src/3rdparty/chromium/base/files/scoped_file_linux.cc
+@@ -77,15 +77,3 @@ bool IsFDOwned(int fd) {
+ }
+ 
+ }  // namespace base
+-
+-extern "C" {
+-
+-int __close(int);
+-
+-__attribute__((visibility("default"), noinline)) int close(int fd) {
+-  if (base::IsFDOwned(fd) && g_is_ownership_enforced)
+-    CrashOnFdOwnershipViolation();
+-  return __close(fd);
+-}
+-
+-}  // extern "C"
diff --git a/srcpkgs/qt6-webengine/patches/0108-chromium-fix-narrowing-cast.patch b/srcpkgs/qt6-webengine/patches/0108-chromium-fix-narrowing-cast.patch
new file mode 100644
index 000000000000..ed32cd9b7415
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0108-chromium-fix-narrowing-cast.patch
@@ -0,0 +1,53 @@
+--- a/src/3rdparty/chromium/base/files/file_util_linux.cc
++++ b/src/3rdparty/chromium/base/files/file_util_linux.cc
+@@ -23,14 +23,14 @@ bool GetFileSystemType(const FilePath& p
+ 
+   // Not all possible |statfs_buf.f_type| values are in linux/magic.h.
+   // Missing values are copied from the statfs man page.
+-  switch (statfs_buf.f_type) {
++  switch (static_cast<uintmax_t>(statfs_buf.f_type)) {
+     case 0:
+       *type = FILE_SYSTEM_0;
+       break;
+     case EXT2_SUPER_MAGIC:  // Also ext3 and ext4
+     case MSDOS_SUPER_MAGIC:
+     case REISERFS_SUPER_MAGIC:
+-    case static_cast<int>(BTRFS_SUPER_MAGIC):
++    case BTRFS_SUPER_MAGIC:
+     case 0x5346544E:  // NTFS
+     case 0x58465342:  // XFS
+     case 0x3153464A:  // JFS
+@@ -40,14 +40,14 @@ bool GetFileSystemType(const FilePath& p
+       *type = FILE_SYSTEM_NFS;
+       break;
+     case SMB_SUPER_MAGIC:
+-    case static_cast<int>(0xFF534D42):  // CIFS
++    case 0xFF534D42:  // CIFS
+       *type = FILE_SYSTEM_SMB;
+       break;
+     case CODA_SUPER_MAGIC:
+       *type = FILE_SYSTEM_CODA;
+       break;
+-    case static_cast<int>(HUGETLBFS_MAGIC):
+-    case static_cast<int>(RAMFS_MAGIC):
++    case HUGETLBFS_MAGIC:
++    case RAMFS_MAGIC:
+     case TMPFS_MAGIC:
+       *type = FILE_SYSTEM_MEMORY;
+       break;
+--- a/src/3rdparty/chromium/base/system/sys_info_posix.cc
++++ b/src/3rdparty/chromium/base/system/sys_info_posix.cc
+@@ -100,10 +100,10 @@ bool IsStatsZeroIfUnlimited(const base::
+   if (HANDLE_EINTR(statfs(path.value().c_str(), &stats)) != 0)
+     return false;
+ 
+-  switch (stats.f_type) {
++  switch (static_cast<uintmax_t>(stats.f_type)) {
+     case TMPFS_MAGIC:
+-    case static_cast<int>(HUGETLBFS_MAGIC):
+-    case static_cast<int>(RAMFS_MAGIC):
++    case HUGETLBFS_MAGIC:
++    case RAMFS_MAGIC:
+       return true;
+   }
+   return false;
diff --git a/srcpkgs/qt6-webengine/patches/0109-chromium-remove-strip_binary.patch b/srcpkgs/qt6-webengine/patches/0109-chromium-remove-strip_binary.patch
new file mode 100644
index 000000000000..5ebd16e659af
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0109-chromium-remove-strip_binary.patch
@@ -0,0 +1,32 @@
+--- a/src/3rdparty/chromium/chrome/test/chromedriver/BUILD.gn
++++ b/src/3rdparty/chromium/chrome/test/chromedriver/BUILD.gn
+@@ -308,11 +308,7 @@ source_set("lib") {
+   }
+ }
+ 
+-if (is_linux) {
+-  chromedriver_output = "chromedriver.unstripped"
+-} else {
+-  chromedriver_output = "chromedriver"
+-}
++chromedriver_output = "chromedriver"
+ 
+ executable("$chromedriver_output") {
+   testonly = true
+@@ -336,16 +332,6 @@ executable("$chromedriver_output") {
+   }
+ }
+ 
+-if (is_linux) {
+-  strip_binary("chromedriver") {
+-    testonly = true
+-    binary_input = "$root_out_dir/$chromedriver_output"
+-    symbol_output = "$root_out_dir/chromedriver.debug"
+-    stripped_binary_output = "$root_out_dir/chromedriver"
+-    deps = [ ":$chromedriver_output" ]
+-  }
+-}
+-
+ python_library("chromedriver_py_tests") {
+   testonly = true
+   deps = [
diff --git a/srcpkgs/qt6-webengine/patches/0110-chromium-revert-use-ffile-compilation-dir.patch b/srcpkgs/qt6-webengine/patches/0110-chromium-revert-use-ffile-compilation-dir.patch
new file mode 100644
index 000000000000..a00f7ea80f7a
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0110-chromium-revert-use-ffile-compilation-dir.patch
@@ -0,0 +1,57 @@
+From 34a955823630096f5b01c2b01d51c1ea59d22763 Mon Sep 17 00:00:00 2001
+From: Zequan Wu <zequanwu@google.com>
+Date: Tue, 20 Jul 2021 14:13:50 +0000
+Subject: [PATCH] Use -ffile-compilation-dir= instead of
+ -fdebug-compilation-dir=
+
+Bug: 1010267
+Change-Id: If2b4ead8535a76490eb466a38e3d8fed6ea91079
+Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2770738
+Auto-Submit: Zequan Wu <zequanwu@google.com>
+Commit-Queue: Nico Weber <thakis@chromium.org>
+Reviewed-by: Nico Weber <thakis@chromium.org>
+Cr-Commit-Position: refs/heads/master@{#903456}
+--- a/src/3rdparty/chromium/build/config/compiler/BUILD.gn
++++ b/src/3rdparty/chromium/build/config/compiler/BUILD.gn
+@@ -1269,19 +1269,12 @@ config("compiler_deterministic") {
+     # different build directory like "out/feature_a" and "out/feature_b" if
+     # we build same files with same compile flag.
+     # Other paths are already given in relative, no need to normalize them.
+-    if (is_nacl) {
+-      # TODO(https://crbug.com/1231236): Use -ffile-compilation-dir= here.
+-      cflags += [
+-        "-Xclang",
+-        "-fdebug-compilation-dir",
+-        "-Xclang",
+-        ".",
+-      ]
+-    } else {
+-      # -ffile-compilation-dir is an alias for both -fdebug-compilation-dir=
+-      # and -fcoverage-compilation-dir=.
+-      cflags += [ "-ffile-compilation-dir=." ]
+-    }
++    cflags += [
++      "-Xclang",
++      "-fdebug-compilation-dir",
++      "-Xclang",
++      ".",
++    ]
+     if (!is_win) {
+       # We don't use clang -cc1as on Windows (yet? https://crbug.com/762167)
+       asmflags = [ "-Wa,-fdebug-compilation-dir,." ]
+--- a/src/3rdparty/chromium/build/config/compiler/compiler.gni
++++ b/src/3rdparty/chromium/build/config/compiler/compiler.gni
+@@ -228,8 +228,11 @@ declare_args() {
+ # deterministic builds to reduce compile times, so this is less relevant for
+ # official builders.
+ strip_absolute_paths_from_debug_symbols_default =
+-    is_android || is_fuchsia || is_nacl || (is_win && use_lld) || is_linux ||
+-    is_chromeos || (is_apple && !enable_dsyms)
++    # TODO(crbug.com/1010267): remove '!use_clang_coverage', coverage build has
++    # dependency to absolute path of source files.
++    !use_clang_coverage &&
++    (is_android || is_fuchsia || is_nacl || (is_win && use_lld) || is_linux ||
++     is_chromeos || (is_apple && !enable_dsyms))
+ 
+ declare_args() {
+   strip_absolute_paths_from_debug_symbols = strip_absolute_paths_from_debug_symbols_default
diff --git a/srcpkgs/qt6-webengine/patches/0111-chromium-no-Wno-stringop-overread.patch b/srcpkgs/qt6-webengine/patches/0111-chromium-no-Wno-stringop-overread.patch
new file mode 100644
index 000000000000..03eac3f8e067
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0111-chromium-no-Wno-stringop-overread.patch
@@ -0,0 +1,10 @@
+--- a/src/3rdparty/chromium/build/config/compiler/BUILD.gn
++++ b/src/3rdparty/chromium/build/config/compiler/BUILD.gn
+@@ -394,7 +394,6 @@ config("compiler") {
+         "-Wno-parentheses",
+         "-Wno-sign-compare", # fido
+         "-Wno-stringop-overflow", # skia, libaom, protobuf, icu
+-        "-Wno-stringop-overread", # libaom
+         "-Wno-psabi", # skia
+         "-Wno-multichar", # crashpad
+         "-Wno-format-zero-length", # user_agent.cc
diff --git a/srcpkgs/qt6-webengine/patches/0150-chromium-glibc-libc_malloc.patch b/srcpkgs/qt6-webengine/patches/0150-chromium-glibc-libc_malloc.patch
new file mode 100644
index 000000000000..7e1b66e5c73d
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0150-chromium-glibc-libc_malloc.patch
@@ -0,0 +1,24 @@
+--- a/src/3rdparty/chromium/base/process/memory_linux.cc
++++ b/src/3rdparty/chromium/base/process/memory_linux.cc
+@@ -23,6 +23,12 @@
+ #include "third_party/tcmalloc/chromium/src/gperftools/tcmalloc.h"
+ #endif
+ 
++#if defined(LIBC_GLIBC)
++extern "C" {
++extern void *__libc_malloc(size_t size);
++}
++#endif
++
+ namespace base {
+ 
+ namespace {
+@@ -120,7 +126,7 @@ bool UncheckedMalloc(size_t size, void**
+     (!defined(LIBC_GLIBC) && !BUILDFLAG(USE_TCMALLOC))
+   *result = malloc(size);
+ #elif defined(LIBC_GLIBC) && !BUILDFLAG(USE_TCMALLOC)
+-  *result = __libc_malloc(size);
++  *result = ::__libc_malloc(size);
+ #elif BUILDFLAG(USE_TCMALLOC)
+   *result = tc_malloc_skip_new_handler(size);
+ #endif
diff --git a/srcpkgs/qt6-webengine/patches/0200-chromium-musl-include-sys-reg.h-to-get-__WORDSIZE.patch b/srcpkgs/qt6-webengine/patches/0200-chromium-musl-include-sys-reg.h-to-get-__WORDSIZE.patch
new file mode 100644
index 000000000000..41b90071b5e4
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0200-chromium-musl-include-sys-reg.h-to-get-__WORDSIZE.patch
@@ -0,0 +1,21 @@
+From 9001c54d6b974449174a8cee8f3f5d78a9bd6c9e Mon Sep 17 00:00:00 2001
+From: Felix Janda <felix.janda@posteo.de>
+Date: Sun, 1 Feb 2015 14:26:52 +0100
+Subject: [PATCH 3/6] include <sys/reg.h> to get __WORDSIZE on musl libc
+
+---
+ qtwebengine/src/3rdparty/chromium/third_party/breakpad/breakpad/src/common/linux/elf_core_dump.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/common/linux/elf_core_dump.h
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/common/linux/elf_core_dump.h
+@@ -37,6 +37,9 @@
+ #include <limits.h>
+ #include <link.h>
+ #include <stddef.h>
++#ifndef __GLIBC__
++#include <sys/reg.h>
++#endif
+ 
+ #include "common/memory_range.h"
+ 
diff --git a/srcpkgs/qt6-webengine/patches/0201-chromium-musl-dispatch-to-musl.patch b/srcpkgs/qt6-webengine/patches/0201-chromium-musl-dispatch-to-musl.patch
new file mode 100644
index 000000000000..a58a688a4b55
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0201-chromium-musl-dispatch-to-musl.patch
@@ -0,0 +1,103 @@
+--- a/src/3rdparty/chromium/base/allocator/allocator_shim_default_dispatch_to_glibc.cc
++++ b/src/3rdparty/chromium/base/allocator/allocator_shim_default_dispatch_to_glibc.cc
+@@ -8,6 +8,7 @@
+ #include <dlfcn.h>
+ #include <malloc.h>
+ 
++#if defined(__GLIBC__)
+ // This translation unit defines a default dispatch for the allocator shim which
+ // routes allocations to libc functions.
+ // The code here is strongly inspired from tcmalloc's libc_override_glibc.h.
+@@ -87,3 +88,92 @@ const AllocatorDispatch AllocatorDispatc
+     nullptr,               /* aligned_free_function */
+     nullptr,               /* next */
+ };
++
++#else // defined(__GLIBC__)
++
++#include <dlfcn.h>
++
++extern "C" {
++// Declare function pointers to the memory functions
++typedef void* (*t_libc_malloc)(size_t size);
++typedef void* (*t_libc_calloc)(size_t n, size_t size);
++typedef void* (*t_libc_realloc)(void* address, size_t size);
++typedef void* (*t_libc_memalign)(size_t alignment, size_t size);
++typedef void (*t_libc_free)(void* ptr);
++typedef size_t (*t_libc_malloc_usable_size)(void* ptr);
++
++// Static instances of pointers to libc.so dl symbols
++static t_libc_malloc libc_malloc = NULL;
++static t_libc_calloc libc_calloc = NULL;
++static t_libc_realloc libc_realloc = NULL;
++static t_libc_memalign libc_memalign = NULL;
++static t_libc_free libc_free = NULL;
++static t_libc_malloc_usable_size libc_malloc_usable_size = NULL;
++
++// resolve the symbols in libc.so
++void musl_libc_memory_init(void)
++{
++  libc_malloc = (t_libc_malloc) dlsym(RTLD_NEXT, "malloc");
++  libc_calloc = (t_libc_calloc) dlsym(RTLD_NEXT, "calloc");
++  libc_realloc = (t_libc_realloc) dlsym(RTLD_NEXT, "realloc");
++  libc_memalign = (t_libc_memalign) dlsym(RTLD_NEXT, "memalign");
++  libc_free = (t_libc_free) dlsym(RTLD_NEXT, "free");
++  libc_malloc_usable_size = (t_libc_malloc_usable_size) dlsym(RTLD_NEXT, "malloc_usable_size");
++}
++}  // extern "C"
++
++namespace {
++
++using base::allocator::AllocatorDispatch;
++
++void* MuslMalloc(const AllocatorDispatch*, size_t size, void* context) {
++  if (!libc_malloc)
++    musl_libc_memory_init();
++  return (*libc_malloc)(size);
++}
++
++void* MuslCalloc(const AllocatorDispatch*, size_t n, size_t size, void* context) {
++  if (!libc_calloc)
++    musl_libc_memory_init();
++  return (*libc_calloc)(n, size);
++}
++
++void* MuslRealloc(const AllocatorDispatch*, void* address, size_t size, void* context) {
++  if (!libc_realloc)
++    musl_libc_memory_init();
++  return (*libc_realloc)(address, size);
++}
++
++void* MuslMemalign(const AllocatorDispatch*, size_t alignment, size_t size, void* context) {
++  if (!libc_memalign)
++    musl_libc_memory_init();
++  return (*libc_memalign)(alignment, size);
++}
++
++void MuslFree(const AllocatorDispatch*, void* address, void* context) {
++  if (!libc_free)
++    musl_libc_memory_init();
++  (*libc_free)(address);
++}
++
++size_t MuslGetSizeEstimate(const AllocatorDispatch*, void* address, void* context) {
++  // TODO(siggi, primiano): malloc_usable_size may need redirection in the
++  //     presence of interposing shims that divert allocations.
++  if (!libc_malloc_usable_size)
++    musl_libc_memory_init();
++  return (*libc_malloc_usable_size)(address);
++}
++
++}  // namespace
++
++const AllocatorDispatch AllocatorDispatch::default_dispatch = {
++    &MuslMalloc,           /* alloc_function */
++    &MuslCalloc,           /* alloc_zero_initialized_function */
++    &MuslMemalign,         /* alloc_aligned_function */
++    &MuslRealloc,          /* realloc_function */
++    &MuslFree,             /* free_function */
++    &MuslGetSizeEstimate,  /* get_size_estimate_function */
++    nullptr,               /* next */
++};
++
++#endif
diff --git a/srcpkgs/qt6-webengine/patches/0202-chromium-musl-no-mallinfo.patch b/srcpkgs/qt6-webengine/patches/0202-chromium-musl-no-mallinfo.patch
new file mode 100644
index 000000000000..a5bdb5a43a5f
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0202-chromium-musl-no-mallinfo.patch
@@ -0,0 +1,62 @@
+--- a/src/3rdparty/chromium/base/process/process_metrics_posix.cc
++++ b/src/3rdparty/chromium/base/process/process_metrics_posix.cc
+@@ -105,7 +105,7 @@ void IncreaseFdLimitTo(unsigned int max_
+ 
+ #endif  // !defined(OS_FUCHSIA)
+ 
+-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID)
++#if (defined(OS_LINUX) && defined(__GLIBC__)) || defined(OS_CHROMEOS) || defined(OS_ANDROID)
+ namespace {
+ 
+ size_t GetMallocUsageMallinfo() {
+@@ -127,16 +127,16 @@ size_t GetMallocUsageMallinfo() {
+ }
+ 
+ }  // namespace
+-#endif  // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID)
++#endif  // (defined(OS_LINUX) && defined(__GLIBC__)) || defined(OS_CHROMEOS) || defined(OS_ANDROID)
+ 
+ size_t ProcessMetrics::GetMallocUsage() {
+ #if defined(OS_APPLE)
+   malloc_statistics_t stats = {0};
+   malloc_zone_statistics(nullptr, &stats);
+   return stats.size_in_use;
+-#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID)
++#elif (defined(OS_LINUX) && defined(__GLIBC__)) || defined(OS_CHROMEOS) || defined(OS_ANDROID)
+   return GetMallocUsageMallinfo();
+-#elif defined(OS_FUCHSIA)
++#else
+   // TODO(fuchsia): Not currently exposed. https://crbug.com/735087.
+   return 0;
+ #endif
+--- a/src/3rdparty/chromium/third_party/tflite/src/tensorflow/lite/profiling/memory_info.cc
++++ b/src/3rdparty/chromium/third_party/tflite/src/tensorflow/lite/profiling/memory_info.cc
+@@ -27,7 +27,7 @@ namespace memory {
+ const int MemoryUsage::kValueNotSet = 0;
+ 
+ bool MemoryUsage::IsSupported() {
+-#ifdef __linux__
++#ifdef __GLIBC__
+   return true;
+ #endif
+   return false;
+@@ -35,7 +35,7 @@ bool MemoryUsage::IsSupported() {
+ 
+ MemoryUsage GetMemoryUsage() {
+   MemoryUsage result;
+-#ifdef __linux__
++#ifdef __GLIBC__
+   rusage res;
+   if (getrusage(RUSAGE_SELF, &res) == 0) {
+     result.max_rss_kb = res.ru_maxrss;
+--- a/src/3rdparty/chromium/base/trace_event/malloc_dump_provider.cc
++++ b/src/3rdparty/chromium/base/trace_event/malloc_dump_provider.cc
+@@ -213,7 +213,7 @@ bool MallocDumpProvider::OnMemoryDump(co
+                      &allocated_objects_count);
+ #elif defined(OS_FUCHSIA)
+ // TODO(fuchsia): Port, see https://crbug.com/706592.
+-#else
++#elif defined(__GLIBC__)
+ #if defined(__GLIBC__) && defined(__GLIBC_PREREQ)
+ #if __GLIBC_PREREQ(2, 33)
+ #define MALLINFO2_FOUND_IN_LIBC
diff --git a/srcpkgs/qt6-webengine/patches/0203-chromium-musl-siginfo_t.patch b/srcpkgs/qt6-webengine/patches/0203-chromium-musl-siginfo_t.patch
new file mode 100644
index 000000000000..43ef7fd7c5d2
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0203-chromium-musl-siginfo_t.patch
@@ -0,0 +1,18 @@
+There's a subtle difference in the internal name of siginfo_t fields
+between glibc and musl. The structure itself is equivalent, so it
+should suffice to add a macro to rename the field.
+
+--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf/trap.cc
++++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf/trap.cc
+@@ -174,7 +174,11 @@ void Trap::SigSys(int nr, LinuxSigInfo*
+   // If the version of glibc doesn't include this information in
+   // siginfo_t (older than 2.17), we need to explicitly copy it
+   // into an arch_sigsys structure.
++#if defined(__GLIBC__)
+   memcpy(&sigsys, &info->_sifields, sizeof(sigsys));
++#else
++  memcpy(&sigsys, &info->__si_fields, sizeof(sigsys));
++#endif
+ #endif
+ 
+ #if defined(__mips__)
diff --git a/srcpkgs/qt6-webengine/patches/0204-chromium-musl-stackstart.patch b/srcpkgs/qt6-webengine/patches/0204-chromium-musl-stackstart.patch
new file mode 100644
index 000000000000..b03cf43b86db
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0204-chromium-musl-stackstart.patch
@@ -0,0 +1,20 @@
+--- a/src/3rdparty/chromium/third_party/blink/renderer/platform/wtf/stack_util.cc
++++ b/src/3rdparty/chromium/third_party/blink/renderer/platform/wtf/stack_util.cc
+@@ -29,7 +29,7 @@ size_t GetUnderestimatedStackSize() {
+ // FIXME: On Mac OSX and Linux, this method cannot estimate stack size
+ // correctly for the main thread.
+ 
+-#elif defined(__GLIBC__) || defined(OS_ANDROID) || defined(OS_FREEBSD) || \
++#elif defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FREEBSD) || \
+     defined(OS_FUCHSIA)
+   // pthread_getattr_np() can fail if the thread is not invoked by
+   // pthread_create() (e.g., the main thread of blink_unittests).
+@@ -97,7 +97,7 @@ return Threading::ThreadStackSize();
+ }
+ 
+ void* GetStackStart() {
+-#if defined(__GLIBC__) || defined(OS_ANDROID) || defined(OS_FREEBSD) || \
++#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FREEBSD) || \
+     defined(OS_FUCHSIA)
+   pthread_attr_t attr;
+   int error;
diff --git a/srcpkgs/qt6-webengine/patches/0205-chromium-musl-sandbox.patch b/srcpkgs/qt6-webengine/patches/0205-chromium-musl-sandbox.patch
new file mode 100644
index 000000000000..772a578fd823
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0205-chromium-musl-sandbox.patch
@@ -0,0 +1,92 @@
+--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc
++++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc
+@@ -138,7 +138,7 @@ namespace sandbox {
+ // present (as in newer versions of posix_spawn).
+ ResultExpr RestrictCloneToThreadsAndEPERMFork() {
+   const Arg<unsigned long> flags(0);
+-
++#if defined(__GLIBC__)
+   // TODO(mdempsky): Extend DSL to support (flags & ~mask1) == mask2.
+   const uint64_t kAndroidCloneMask = CLONE_VM | CLONE_FS | CLONE_FILES |
+                                      CLONE_SIGHAND | CLONE_THREAD |
+@@ -165,6 +165,17 @@ ResultExpr RestrictCloneToThreadsAndEPER
+   return If(IsAndroid() ? android_test : glibc_test, Allow())
+       .ElseIf(is_fork_or_clone_vfork, Error(EPERM))
+       .Else(CrashSIGSYSClone());
++#else
++  const int required = CLONE_VM | CLONE_FS | CLONE_FILES | CLONE_SIGHAND |
++                       CLONE_THREAD | CLONE_SYSVSEM;
++  const int safe = CLONE_SETTLS | CLONE_PARENT_SETTID | CLONE_CHILD_CLEARTID |
++                   CLONE_DETACHED;
++  const BoolExpr thread_clone_ok = (flags&~safe)==required;
++
++  return If(thread_clone_ok, Allow())
++      .ElseIf((flags & (CLONE_VM | CLONE_THREAD)) == 0, Error(EPERM))
++      .Else(CrashSIGSYSClone());
++#endif
+ }
+ 
+ #ifndef PR_PAC_RESET_KEYS
+--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
++++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
+@@ -419,6 +419,9 @@ bool SyscallSets::IsAllowedProcessStartO
+ #if defined(__i386__)
+     case __NR_waitpid:
+ #endif
++#if !defined(__GLIBC__)
++    case __NR_set_tid_address:
++#endif
+       return true;
+     case __NR_clone:  // Should be parameter-restricted.
+     case __NR_setns:  // Privileged.
+@@ -431,7 +434,9 @@ bool SyscallSets::IsAllowedProcessStartO
+ #if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
+     case __NR_set_thread_area:
+ #endif
++#if defined(__GLIBC__)
+     case __NR_set_tid_address:
++#endif
+     case __NR_unshare:
+ #if !defined(__mips__) && !defined(__aarch64__)
+     case __NR_vfork:
+@@ -545,6 +550,9 @@ bool SyscallSets::IsAllowedAddressSpaceA
+     case __NR_mlock:
+     case __NR_munlock:
+     case __NR_munmap:
++#if !defined(__GLIBC__)
++    case __NR_mremap:
++#endif
+       return true;
+     case __NR_madvise:
+     case __NR_mincore:
+@@ -562,7 +570,9 @@ bool SyscallSets::IsAllowedAddressSpaceA
+     case __NR_modify_ldt:
+ #endif
+     case __NR_mprotect:
++#if defined(__GLIBC__)
+     case __NR_mremap:
++#endif
+     case __NR_msync:
+     case __NR_munlockall:
+     case __NR_readahead:
+--- a/src/3rdparty/chromium/sandbox/policy/linux/bpf_renderer_policy_linux.cc
++++ b/src/3rdparty/chromium/sandbox/policy/linux/bpf_renderer_policy_linux.cc
+@@ -97,11 +97,18 @@ ResultExpr RendererProcessPolicy::Evalua
+     case __NR_sysinfo:
+     case __NR_times:
+     case __NR_uname:
++#if !defined(__GLIBC__)
++    case __NR_sched_getparam:
++    case __NR_sched_getscheduler:
++    case __NR_sched_setscheduler:
++#endif
+       return Allow();
+     case __NR_sched_getaffinity:
++#if defined(__GLIBC__)
+     case __NR_sched_getparam:
+     case __NR_sched_getscheduler:
+     case __NR_sched_setscheduler:
++#endif
+       return RestrictSchedTarget(GetPolicyPid(), sysno);
+     case __NR_prlimit64:
+       // See crbug.com/662450 and setrlimit comment above.
diff --git a/srcpkgs/qt6-webengine/patches/0206-chromium-musl-default-stacksize.patch b/srcpkgs/qt6-webengine/patches/0206-chromium-musl-default-stacksize.patch
new file mode 100644
index 000000000000..bc07495b8144
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0206-chromium-musl-default-stacksize.patch
@@ -0,0 +1,15 @@
+--- a/src/3rdparty/chromium/base/threading/platform_thread_linux.cc
++++ b/src/3rdparty/chromium/base/threading/platform_thread_linux.cc
+@@ -439,7 +439,12 @@ void TerminateOnThread() {}
+ 
+ size_t GetDefaultThreadStackSize(const pthread_attr_t& attributes) {
+ #if !defined(THREAD_SANITIZER)
++#if defined(__GLIBC__)
+   return 0;
++#else // defined(__GLIBC__)
++  // For Musl libc try with a default stack size of 2 MiB
++  return 2 * 1024 * 1024;
++#endif // !defined(__GLIBC__)
+ #else
+   // ThreadSanitizer bloats the stack heavily. Evidence has been that the
+   // default stack size isn't enough for some browser tests.
diff --git a/srcpkgs/qt6-webengine/patches/0208-chromium-musl-execinfo.patch b/srcpkgs/qt6-webengine/patches/0208-chromium-musl-execinfo.patch
new file mode 100644
index 000000000000..9f3b964676b3
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0208-chromium-musl-execinfo.patch
@@ -0,0 +1,125 @@
+--- a/src/3rdparty/chromium/base/debug/stack_trace.cc
++++ b/src/3rdparty/chromium/base/debug/stack_trace.cc
+@@ -252,7 +252,9 @@ void StackTrace::Print() const {
+ }
+ 
+ void StackTrace::OutputToStream(std::ostream* os) const {
++#if defined(__GLIBC__) && !defined(_AIX)
+   OutputToStreamWithPrefix(os, nullptr);
++#endif
+ }
+ 
+ std::string StackTrace::ToString() const {
+@@ -260,7 +262,7 @@ std::string StackTrace::ToString() const
+ }
+ std::string StackTrace::ToStringWithPrefix(const char* prefix_string) const {
+   std::stringstream stream;
+-#if !defined(__UCLIBC__) && !defined(_AIX)
++#if defined(__GLIBC__) && !defined(_AIX)
+   OutputToStreamWithPrefix(&stream, prefix_string);
+ #endif
+   return stream.str();
+--- a/src/3rdparty/chromium/base/debug/stack_trace_posix.cc
++++ b/src/3rdparty/chromium/base/debug/stack_trace_posix.cc
+@@ -27,7 +27,7 @@
+ #if !defined(USE_SYMBOLIZE)
+ #include <cxxabi.h>
+ #endif
+-#if !defined(__UCLIBC__) && !defined(_AIX)
++#if defined(__GLIBC__) && !defined(_AIX)
+ #include <execinfo.h>
+ #endif
+ 
+@@ -89,7 +89,7 @@ void DemangleSymbols(std::string* text)
+   // Note: code in this function is NOT async-signal safe (std::string uses
+   // malloc internally).
+ 
+-#if !defined(__UCLIBC__) && !defined(_AIX)
++#if defined(__GLIBC__) && !defined(_AIX)
+   std::string::size_type search_from = 0;
+   while (search_from < text->size()) {
+     // Look for the start of a mangled symbol, from search_from.
+@@ -124,7 +124,7 @@ void DemangleSymbols(std::string* text)
+       search_from = mangled_start + 2;
+     }
+   }
+-#endif  // !defined(__UCLIBC__) && !defined(_AIX)
++#endif  // !defined(__GLIBC__) && !defined(_AIX)
+ }
+ #endif  // !defined(USE_SYMBOLIZE)
+ 
+@@ -136,7 +136,7 @@ class BacktraceOutputHandler {
+   virtual ~BacktraceOutputHandler() = default;
+ };
+ 
+-#if !defined(__UCLIBC__) && !defined(_AIX)
++#if defined(__GLIBC__) && !defined(_AIX)
+ void OutputPointer(void* pointer, BacktraceOutputHandler* handler) {
+   // This should be more than enough to store a 64-bit number in hex:
+   // 16 hex digits + 1 for null-terminator.
+@@ -219,7 +219,7 @@ void ProcessBacktrace(void* const* trace
+   }
+ #endif  // defined(USE_SYMBOLIZE)
+ }
+-#endif  // !defined(__UCLIBC__) && !defined(_AIX)
++#endif  // !defined(__GLIBC__) && !defined(_AIX)
+ 
+ void PrintToStderr(const char* output) {
+   // NOTE: This code MUST be async-signal safe (it's used by in-process
+@@ -839,7 +839,7 @@ size_t CollectStackTrace(void** trace, s
+   // If we do not have unwind tables, then try tracing using frame pointers.
+   return base::debug::TraceStackFramePointers(const_cast<const void**>(trace),
+                                               count, 0);
+-#elif !defined(__UCLIBC__) && !defined(_AIX)
++#elif defined(__GLIBC__) && !defined(_AIX)
+   // Though the backtrace API man page does not list any possible negative
+   // return values, we take no chance.
+   return base::saturated_cast<size_t>(backtrace(trace, count));
+@@ -852,13 +852,13 @@ void StackTrace::PrintWithPrefix(const c
+ // NOTE: This code MUST be async-signal safe (it's used by in-process
+ // stack dumping signal handler). NO malloc or stdio is allowed here.
+ 
+-#if !defined(__UCLIBC__) && !defined(_AIX)
++#if defined(__GLIBC__) && !defined(_AIX)
+   PrintBacktraceOutputHandler handler;
+   ProcessBacktrace(trace_, count_, prefix_string, &handler);
+ #endif
+ }
+ 
+-#if !defined(__UCLIBC__) && !defined(_AIX)
++#if defined(__GLIBC__) && !defined(_AIX)
+ void StackTrace::OutputToStreamWithPrefix(std::ostream* os,
+                                           const char* prefix_string) const {
+   StreamBacktraceOutputHandler handler(os);
+--- a/src/3rdparty/chromium/base/logging.cc
++++ b/src/3rdparty/chromium/base/logging.cc
+@@ -582,7 +582,7 @@ LogMessage::LogMessage(const char* file,
+ 
+ LogMessage::~LogMessage() {
+   size_t stack_start = stream_.tellp();
+-#if !defined(OFFICIAL_BUILD) && !defined(OS_NACL) && !defined(__UCLIBC__) && \
++#if !defined(OFFICIAL_BUILD) && !defined(OS_NACL) && defined(__GLIBC__) && \
+     !defined(OS_AIX)
+   if (severity_ == LOGGING_FATAL && !base::debug::BeingDebugged()) {
+     // Include a stack trace on a fatal, unless a debugger is attached.
+--- 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 @@
+ 
+ #if defined(DEBUG) && defined(V8_OS_LINUX) && !defined(V8_OS_ANDROID)
+ #define SYMBOLIZE_FUNCTION
++#if defined(__GLIBC__)
+ #include <execinfo.h>
++#endif
+ 
+ #include <vector>
+ 
+@@ -103,7 +105,7 @@ void ExternalReferenceTable::Init(Isolat
+ }
+ 
+ const char* ExternalReferenceTable::ResolveSymbol(void* address) {
+-#ifdef SYMBOLIZE_FUNCTION
++#if defined(SYMBOLIZE_FUNCTION) && defined(__GLIBC__)
+   char** names = backtrace_symbols(&address, 1);
+   const char* name = names[0];
+   // The array of names is malloc'ed. However, each name string is static
diff --git a/srcpkgs/qt6-webengine/patches/0209-chromium-musl-thread-stacksize.patch b/srcpkgs/qt6-webengine/patches/0209-chromium-musl-thread-stacksize.patch
new file mode 100644
index 000000000000..4b760a428b25
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0209-chromium-musl-thread-stacksize.patch
@@ -0,0 +1,22 @@
+--- a/src/3rdparty/chromium/ppapi/utility/threading/simple_thread.cc
++++ b/src/3rdparty/chromium/ppapi/utility/threading/simple_thread.cc
+@@ -13,7 +13,7 @@ namespace pp {
+ namespace {
+ 
+ // Use 2MB default stack size for Native Client, otherwise use system default.
+-#if defined(__native_client__)
++#if defined(__native_client__) || !defined(__GLIBC__)
+ const size_t kDefaultStackSize = 2 * 1024 * 1024;
+ #else
+ const size_t kDefaultStackSize = 0;
+--- a/src/3rdparty/chromium/v8/src/base/platform/platform-posix.cc
++++ b/src/3rdparty/chromium/v8/src/base/platform/platform-posix.cc
+@@ -883,7 +883,7 @@ bool Thread::Start() {
+ #if V8_OS_MACOSX
+     // Default on Mac OS X is 512kB -- bump up to 1MB
+     stack_size = 1 * 1024 * 1024;
+-#elif V8_OS_AIX
++#elif V8_OS_AIX || !defined(__GLIBC__)
+     // Default on AIX is 96kB -- bump up to 2MB
+     stack_size = 2 * 1024 * 1024;
+ #endif
diff --git a/srcpkgs/qt6-webengine/patches/0210-chromium-musl-msgvec-push_back.patch b/srcpkgs/qt6-webengine/patches/0210-chromium-musl-msgvec-push_back.patch
new file mode 100644
index 000000000000..905daa223700
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0210-chromium-musl-msgvec-push_back.patch
@@ -0,0 +1,14 @@
+--- a/src/3rdparty/chromium/net/socket/udp_socket_posix.cc
++++ b/src/3rdparty/chromium/net/socket/udp_socket_posix.cc
+@@ -1162,7 +1162,11 @@ SendResult UDPSocketPosixSender::Interna
+     msg_iov->push_back({const_cast<char*>(buffer->data()), buffer->length()});
+   msgvec->reserve(buffers.size());
+   for (size_t j = 0; j < buffers.size(); j++)
++#if defined(__GLIBC__)
+     msgvec->push_back({{nullptr, 0, &msg_iov[j], 1, nullptr, 0, 0}, 0});
++#else
++    msgvec->push_back({{nullptr, 0, &msg_iov[j], 1, 0, 0, 0}, 0});
++#endif
+   int result = HANDLE_EINTR(Sendmmsg(fd, &msgvec[0], buffers.size(), 0));
+   SendResult send_result(0, 0, std::move(buffers));
+   if (result < 0) {
diff --git a/srcpkgs/qt6-webengine/patches/0211-chromium-musl-canonicalize-file-name-musl.patch b/srcpkgs/qt6-webengine/patches/0211-chromium-musl-canonicalize-file-name-musl.patch
new file mode 100644
index 000000000000..d43e6bd488bc
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0211-chromium-musl-canonicalize-file-name-musl.patch
@@ -0,0 +1,11 @@
+--- a/src/3rdparty/chromium/third_party/nasm/nasmlib/realpath.c
++++ b/src/3rdparty/chromium/third_party/nasm/nasmlib/realpath.c
+@@ -55,7 +55,7 @@
+  */
+ char *nasm_realpath(const char *rel_path)
+ {
+-    char *rp = canonicalize_file_name(rel_path);
++    char *rp = realpath(rel_path, NULL);
+     return rp ? rp : nasm_strdup(rel_path);
+ }
+ 
diff --git a/srcpkgs/qt6-webengine/patches/0212-chromium-musl-no-getcontext.patch b/srcpkgs/qt6-webengine/patches/0212-chromium-musl-no-getcontext.patch
new file mode 100644
index 000000000000..5755f1b45a7d
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0212-chromium-musl-no-getcontext.patch
@@ -0,0 +1,29 @@
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc
+@@ -489,8 +489,10 @@ bool ExceptionHandler::SimulateSignalDel
+   // ExceptionHandler::HandleSignal().
+   siginfo.si_code = SI_USER;
+   siginfo.si_pid = getpid();
+-  ucontext_t context;
++  ucontext_t context = { 0 };
++#if defined(__GLIBC__)
+   getcontext(&context);
++#endif
+   return HandleSignal(sig, &siginfo, &context);
+ }
+ 
+@@ -675,9 +677,14 @@ bool ExceptionHandler::WriteMinidump() {
+   sys_prctl(PR_SET_DUMPABLE, 1, 0, 0, 0);
+ 
+   CrashContext context;
++
++#if defined(__GLIBC__)
+   int getcontext_result = getcontext(&context.context);
+   if (getcontext_result)
+     return false;
++#else
++  return false;
++#endif
+ 
+ #if defined(__i386__)
+   // In CPUFillFromUContext in minidumpwriter.cc the stack pointer is retrieved
diff --git a/srcpkgs/qt6-webengine/patches/0213-chromium-musl-crashpad.patch b/srcpkgs/qt6-webengine/patches/0213-chromium-musl-crashpad.patch
new file mode 100644
index 000000000000..71bbad2af17e
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0213-chromium-musl-crashpad.patch
@@ -0,0 +1,24 @@
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/compat/linux/sys/ptrace.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/compat/linux/sys/ptrace.h
+@@ -17,7 +17,9 @@
+ 
+ #include_next <sys/ptrace.h>
+ 
++#ifdef __GLIBC__
+ #include <sys/cdefs.h>
++#endif
+ 
+ // https://sourceware.org/bugzilla/show_bug.cgi?id=22433
+ #if !defined(PTRACE_GET_THREAD_AREA) && !defined(PT_GET_THREAD_AREA) && \
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/util/linux/ptracer.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/util/linux/ptracer.cc
+@@ -26,6 +26,9 @@
+ 
+ #if defined(ARCH_CPU_X86_FAMILY)
+ #include <asm/ldt.h>
++#if !defined(__GLIBC__)
++#include <asm/ptrace-abi.h>
++#endif
+ #endif
+ 
+ namespace crashpad {
diff --git a/srcpkgs/qt6-webengine/patches/0214-chromium-musl-fixes.patch b/srcpkgs/qt6-webengine/patches/0214-chromium-musl-fixes.patch
new file mode 100644
index 000000000000..55b267ed1714
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0214-chromium-musl-fixes.patch
@@ -0,0 +1,108 @@
+--- a/src/3rdparty/chromium/sandbox/linux/suid/process_util.h
++++ b/src/3rdparty/chromium/sandbox/linux/suid/process_util.h
+@@ -12,6 +12,15 @@
+ #include <stdint.h>
+ #include <sys/types.h>
+ 
++#if !defined(__GLIBC__) && !defined(TEMP_FAILURE_RETRY)
++# define TEMP_FAILURE_RETRY(expression) \
++	(__extension__			\
++	 ({ long int __result;		\
++	  do __result = (long int) (expression); \
++	  while (__result == -1L && errno == EINTR); \
++	  __result; }))
++#endif
++
+ // This adjusts /proc/process/oom_score_adj so the Linux OOM killer
+ // will prefer certain process types over others. The range for the
+ // adjustment is [-1000, 1000], with [0, 1000] being user accessible.
+--- a/src/3rdparty/chromium/services/device/serial/serial_io_handler_posix.cc
++++ b/src/3rdparty/chromium/services/device/serial/serial_io_handler_posix.cc
+@@ -6,6 +6,7 @@
+ 
+ #include <sys/ioctl.h>
+ #include <termios.h>
++#include <asm-generic/ioctls.h>
+ 
+ #include <algorithm>
+ #include <utility>
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h
+@@ -38,6 +38,10 @@
+ #include "common/memory_allocator.h"
+ #include "google_breakpad/common/minidump_format.h"
+ 
++#ifndef __GLIBC__
++#define _libc_fpstate _fpstate
++#endif
++
+ namespace google_breakpad {
+ 
+ // Wraps platform-dependent implementations of accessors to ucontext_t structs.
+--- a/src/3rdparty/chromium/third_party/ffmpeg/libavutil/cpu.c
++++ b/src/3rdparty/chromium/third_party/ffmpeg/libavutil/cpu.c
+@@ -41,8 +41,10 @@
+ #include <sys/param.h>
+ #endif
+ #include <sys/types.h>
++#ifdef __GLIBC__
+ #include <sys/sysctl.h>
+ #endif
++#endif
+ #if HAVE_UNISTD_H
+ #include <unistd.h>
+ #endif
+--- a/src/3rdparty/chromium/third_party/perfetto/include/perfetto/ext/base/thread_utils.h
++++ b/src/3rdparty/chromium/third_party/perfetto/include/perfetto/ext/base/thread_utils.h
+@@ -29,9 +29,7 @@
+ #include <algorithm>
+ #endif
+ 
+-#if PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID)
+ #include <sys/prctl.h>
+-#endif
+ 
+ // Internal implementation utils that aren't as widely useful/supported as
+ // base/thread_utils.h.
+@@ -58,7 +56,7 @@ inline bool MaybeSetThreadName(const std
+ 
+ inline bool GetThreadName(std::string& out_result) {
+   char buf[16] = {};
+-#if PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID)
++#if !defined(__GLIBC__)
+   if (prctl(PR_GET_NAME, buf) != 0)
+     return false;
+ #else
+--- a/src/3rdparty/chromium/third_party/lss/linux_syscall_support.h
++++ b/src/3rdparty/chromium/third_party/lss/linux_syscall_support.h
+@@ -1300,6 +1300,18 @@ struct kernel_statfs {
+ #ifndef __NR_fallocate
+ #define __NR_fallocate          285
+ #endif
++
++#if !defined(__GLIBC__)
++#ifdef __NR_pread
++#undef __NR_pread
++#endif
++#ifdef __NR_pwrite
++#undef __NR_pwrite
++#endif
++#define __NR_pread __NR_pread64
++#define __NR_pwrite __NR_pwrite64
++#endif /* !defined(__GLIBC__) */
++
+ #ifndef __NR_getrandom
+ #define __NR_getrandom          318
+ #endif
+--- a/src/3rdparty/chromium/net/dns/dns_config_service_posix.cc
++++ b/src/3rdparty/chromium/net/dns/dns_config_service_posix.cc
+@@ -93,7 +93,8 @@ absl::optional<DnsConfig> ReadDnsConfig(
+ 
+   absl::optional<DnsConfig> dns_config;
+ // TODO(fuchsia): Use res_ninit() when it's implemented on Fuchsia.
+-#if defined(OS_OPENBSD) || defined(OS_FUCHSIA)
++#if defined(OS_OPENBSD) || defined(OS_FUCHSIA) || \
++  (defined(OS_LINUX) && !defined(__GLIBC__))
+   // Note: res_ninit in glibc always returns 0 and sets RES_INIT.
+   // res_init behaves the same way.
+   memset(&_res, 0, sizeof(_res));
diff --git a/srcpkgs/qt6-webengine/patches/0215-chromium-musl-cdefs.patch b/srcpkgs/qt6-webengine/patches/0215-chromium-musl-cdefs.patch
new file mode 100644
index 000000000000..9d1daec29118
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0215-chromium-musl-cdefs.patch
@@ -0,0 +1,29 @@
+--- a/src/3rdparty/chromium/third_party/libsync/src/include/sync/sync.h
++++ b/src/3rdparty/chromium/third_party/libsync/src/include/sync/sync.h
+@@ -19,12 +19,13 @@
+ #ifndef __SYS_CORE_SYNC_H
+ #define __SYS_CORE_SYNC_H
+ 
+-#include <sys/cdefs.h>
+ #include <stdint.h>
+ 
+ #include <linux/types.h>
+ 
+-__BEGIN_DECLS
++#ifdef __cplusplus
++extern "C" {
++#endif
+ 
+ struct sync_legacy_merge_data {
+  int32_t fd2;
+@@ -158,6 +159,9 @@ struct sync_pt_info *sync_pt_info(struct
+                                   struct sync_pt_info *itr);
+ void sync_fence_info_free(struct sync_fence_info_data *info);
+ 
+-__END_DECLS
++#ifdef __cplusplus
++}
++#endif
++
+ 
+ #endif /* __SYS_CORE_SYNC_H */
diff --git a/srcpkgs/qt6-webengine/patches/0216-chromium-musl-stat.patch b/srcpkgs/qt6-webengine/patches/0216-chromium-musl-stat.patch
new file mode 100644
index 000000000000..4509a6957cd7
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0216-chromium-musl-stat.patch
@@ -0,0 +1,12 @@
+--- a/src/3rdparty/chromium/base/files/file.h
++++ b/src/3rdparty/chromium/base/files/file.h
+@@ -19,7 +19,8 @@
+ #include "build/build_config.h"
+ 
+ #if defined(OS_BSD) || defined(OS_APPLE) || defined(OS_NACL) || \
+-    defined(OS_FUCHSIA) || (defined(OS_ANDROID) && __ANDROID_API__ < 21)
++    defined(OS_FUCHSIA) || (defined(OS_ANDROID) && __ANDROID_API__ < 21) || \
++    (defined(OS_LINUX) && !defined(__GLIBC__))
+ struct stat;
+ namespace base {
+ typedef struct stat stat_wrapper_t;
diff --git a/srcpkgs/qt6-webengine/patches/0217-chromium-musl-resolver.patch b/srcpkgs/qt6-webengine/patches/0217-chromium-musl-resolver.patch
new file mode 100644
index 000000000000..c3d7afad9b19
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0217-chromium-musl-resolver.patch
@@ -0,0 +1,77 @@
+--- a/src/3rdparty/chromium/net/dns/dns_config_service_linux.cc
++++ b/src/3rdparty/chromium/net/dns/dns_config_service_linux.cc
+@@ -432,11 +432,13 @@ class DnsConfigServiceLinux::ConfigReade
+     base::ScopedBlockingCall scoped_blocking_call(
+         FROM_HERE, base::BlockingType::MAY_BLOCK);
+ 
++#if defined(__GLIBC__)
+     std::unique_ptr<struct __res_state> res = resolv_reader_->GetResState();
+     if (res) {
+       dns_config_ = ConvertResStateToDnsConfig(*res.get());
+       resolv_reader_->CloseResState(res.get());
+     }
++#endif
+ 
+     UMA_HISTOGRAM_BOOLEAN("Net.DNS.DnsConfig.Resolv.Read",
+                           dns_config_.has_value());
+@@ -486,6 +488,7 @@ class DnsConfigServiceLinux::ConfigReade
+ 
+ std::unique_ptr<struct __res_state>
+ DnsConfigServiceLinux::ResolvReader::GetResState() {
++#if defined(__GLIBC__)
+   auto res = std::make_unique<struct __res_state>();
+   memset(res.get(), 0, sizeof(struct __res_state));
+ 
+@@ -495,11 +498,16 @@ DnsConfigServiceLinux::ResolvReader::Get
+   }
+ 
+   return res;
++#else
++  return nullptr;
++#endif
+ }
+ 
+ void DnsConfigServiceLinux::ResolvReader::CloseResState(
+     struct __res_state* res) {
++#if defined(__GLIBC__)
+   res_nclose(res);
++#endif
+ }
+ 
+ DnsConfigServiceLinux::DnsConfigServiceLinux()
+--- a/src/3rdparty/chromium/net/dns/dns_reloader.cc
++++ b/src/3rdparty/chromium/net/dns/dns_reloader.cc
+@@ -4,8 +4,7 @@
+ 
+ #include "net/dns/dns_reloader.h"
+ 
+-#if defined(OS_POSIX) && !defined(OS_APPLE) && !defined(OS_OPENBSD) && \
+-    !defined(OS_ANDROID) && !defined(OS_FUCHSIA)
++#ifdef __GLIBC__
+ 
+ #include <resolv.h>
+ 
+--- a/src/3rdparty/chromium/net/dns/host_resolver_manager.cc
++++ b/src/3rdparty/chromium/net/dns/host_resolver_manager.cc
+@@ -2720,8 +2720,7 @@ HostResolverManager::HostResolverManager
+   NetworkChangeNotifier::AddConnectionTypeObserver(this);
+   if (system_dns_config_notifier_)
+     system_dns_config_notifier_->AddObserver(this);
+-#if defined(OS_POSIX) && !defined(OS_APPLE) && !defined(OS_OPENBSD) && \
+-    !defined(OS_ANDROID)
++#ifdef __GLIBC__
+   EnsureDnsReloaderInit();
+ #endif
+ 
+--- a/src/3rdparty/chromium/net/dns/host_resolver_proc.cc
++++ b/src/3rdparty/chromium/net/dns/host_resolver_proc.cc
+@@ -176,8 +176,7 @@ int SystemHostResolverCall(const std::st
+   base::ScopedBlockingCall scoped_blocking_call(FROM_HERE,
+                                                 base::BlockingType::WILL_BLOCK);
+ 
+-#if defined(OS_POSIX) && !defined(OS_APPLE) && !defined(OS_OPENBSD) && \
+-    !defined(OS_ANDROID) && !defined(OS_FUCHSIA)
++#ifdef __GLIBC__
+   DnsReloaderMaybeReload();
+ #endif
+   absl::optional<AddressInfo> ai;
diff --git a/srcpkgs/qt6-webengine/patches/0600-chromium-sndio.patch b/srcpkgs/qt6-webengine/patches/0600-chromium-sndio.patch
new file mode 100644
index 000000000000..0302874ffba4
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0600-chromium-sndio.patch
@@ -0,0 +1,876 @@
+--- a/src/3rdparty/chromium/media/BUILD.gn
++++ b/src/3rdparty/chromium/media/BUILD.gn
+@@ -72,6 +72,9 @@ config("media_config") {
+       defines += [ "DLOPEN_PULSEAUDIO" ]
+     }
+   }
++  if (use_sndio) {
++    defines += [ "USE_SNDIO" ]
++  }
+   if (use_cras) {
+     defines += [ "USE_CRAS" ]
+   }
+--- a/src/3rdparty/chromium/media/audio/BUILD.gn
++++ b/src/3rdparty/chromium/media/audio/BUILD.gn
+@@ -240,6 +240,17 @@ source_set("audio") {
+     sources += [ "linux/audio_manager_linux.cc" ]
+   }
+ 
++  if (use_sndio) {
++    libs += [ "sndio" ]
++    sources += [
++      "sndio/audio_manager_sndio.cc",
++      "sndio/sndio_input.cc",
++      "sndio/sndio_input.h",
++      "sndio/sndio_output.cc",
++      "sndio/sndio_output.h"
++    ]
++  }
++
+   if (use_alsa) {
+     libs += [ "asound" ]
+     sources += [
+--- a/src/3rdparty/chromium/media/audio/linux/audio_manager_linux.cc
++++ b/src/3rdparty/chromium/media/audio/linux/audio_manager_linux.cc
+@@ -25,6 +25,11 @@
+ #include "media/audio/pulse/audio_manager_pulse.h"
+ #include "media/audio/pulse/pulse_util.h"
+ #endif
++#if defined(USE_SNDIO)
++#include "media/audio/sndio/audio_manager_sndio.h"
++#include "media/audio/sndio/sndio_input.h"
++#include "media/audio/sndio/sndio_output.h"
++#endif
+ 
+ namespace media {
+ 
+@@ -32,7 +37,8 @@ enum LinuxAudioIO {
+   kPulse,
+   kAlsa,
+   kCras,
+-  kAudioIOMax = kCras  // Must always be equal to largest logged entry.
++  kSndio,
++  kAudioIOMax = kSndio // Must always be equal to largest logged entry.
+ };
+ 
+ std::unique_ptr<media::AudioManager> CreateAudioManager(
+@@ -45,6 +51,16 @@ std::unique_ptr<media::AudioManager> Cre
+                                               audio_log_factory);
+   }
+ 
++#if defined(USE_SNDIO)
++  struct sio_hdl *hdl = sio_open(SIO_DEVANY, SIO_PLAY, 0);
++  if (hdl != NULL) {
++    sio_close(hdl);
++    UMA_HISTOGRAM_ENUMERATION("Media.LinuxAudioIO", kSndio, kAudioIOMax + 1);
++    return std::make_unique<AudioManagerSndio>(std::move(audio_thread),
++                                                  audio_log_factory);
++  }
++#endif
++
+ #if defined(USE_CRAS)
+   if (base::CommandLine::ForCurrentProcess()->HasSwitch(switches::kUseCras)) {
+     UMA_HISTOGRAM_ENUMERATION("Media.LinuxAudioIO", kCras, kAudioIOMax + 1);
+--- /dev/null
++++ b/src/3rdparty/chromium/media/audio/sndio/audio_manager_sndio.cc
+@@ -0,0 +1,148 @@
++// Copyright (c) 2012 The Chromium Authors. All rights reserved.
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++#include "media/audio/sndio/audio_manager_sndio.h"
++
++#include "base/metrics/histogram_macros.h"
++#include "base/memory/ptr_util.h"
++#include "media/audio/audio_device_description.h"
++#include "media/audio/audio_output_dispatcher.h"
++#include "media/audio/sndio/sndio_input.h"
++#include "media/audio/sndio/sndio_output.h"
++#include "media/base/limits.h"
++#include "media/base/media_switches.h"
++
++namespace media {
++
++
++// Maximum number of output streams that can be open simultaneously.
++static const int kMaxOutputStreams = 4;
++
++// Default sample rate for input and output streams.
++static const int kDefaultSampleRate = 48000;
++
++void AddDefaultDevice(AudioDeviceNames* device_names) {
++  DCHECK(device_names->empty());
++  device_names->push_front(AudioDeviceName::CreateDefault());
++}
++
++bool AudioManagerSndio::HasAudioOutputDevices() {
++  return true;
++}
++
++bool AudioManagerSndio::HasAudioInputDevices() {
++  return true;
++}
++
++void AudioManagerSndio::GetAudioInputDeviceNames(
++    AudioDeviceNames* device_names) {
++  DCHECK(device_names->empty());
++  AddDefaultDevice(device_names);
++}
++
++void AudioManagerSndio::GetAudioOutputDeviceNames(
++    AudioDeviceNames* device_names) {
++  AddDefaultDevice(device_names);
++}
++
++const char* AudioManagerSndio::GetName() {
++  return "SNDIO";
++}
++
++AudioParameters AudioManagerSndio::GetInputStreamParameters(
++    const std::string& device_id) {
++  static const int kDefaultInputBufferSize = 1024;
++
++  int user_buffer_size = GetUserBufferSize();
++  int buffer_size = user_buffer_size ?
++      user_buffer_size : kDefaultInputBufferSize;
++
++  return AudioParameters(
++      AudioParameters::AUDIO_PCM_LOW_LATENCY, CHANNEL_LAYOUT_STEREO,
++      kDefaultSampleRate, buffer_size);
++}
++
++AudioManagerSndio::AudioManagerSndio(std::unique_ptr<AudioThread> audio_thread,
++                                         AudioLogFactory* audio_log_factory)
++    : AudioManagerBase(std::move(audio_thread),
++                       audio_log_factory) {
++  DLOG(WARNING) << "AudioManagerSndio";
++  SetMaxOutputStreamsAllowed(kMaxOutputStreams);
++}
++
++AudioManagerSndio::~AudioManagerSndio() {
++  Shutdown();
++}
++
++AudioOutputStream* AudioManagerSndio::MakeLinearOutputStream(
++    const AudioParameters& params,
++    const LogCallback& log_callback) {
++  DCHECK_EQ(AudioParameters::AUDIO_PCM_LINEAR, params.format());
++  return MakeOutputStream(params);
++}
++
++AudioOutputStream* AudioManagerSndio::MakeLowLatencyOutputStream(
++    const AudioParameters& params,
++    const std::string& device_id,
++    const LogCallback& log_callback) {
++  DLOG_IF(ERROR, !device_id.empty()) << "Not implemented!";
++  DCHECK_EQ(AudioParameters::AUDIO_PCM_LOW_LATENCY, params.format());
++  return MakeOutputStream(params);
++}
++
++AudioInputStream* AudioManagerSndio::MakeLinearInputStream(
++    const AudioParameters& params,
++    const std::string& device_id,
++    const LogCallback& log_callback) {
++  DCHECK_EQ(AudioParameters::AUDIO_PCM_LINEAR, params.format());
++  return MakeInputStream(params);
++}
++
++AudioInputStream* AudioManagerSndio::MakeLowLatencyInputStream(
++    const AudioParameters& params,
++    const std::string& device_id,
++    const LogCallback& log_callback) {
++  DCHECK_EQ(AudioParameters::AUDIO_PCM_LOW_LATENCY, params.format());
++  return MakeInputStream(params);
++}
++
++AudioParameters AudioManagerSndio::GetPreferredOutputStreamParameters(
++    const std::string& output_device_id,
++    const AudioParameters& input_params) {
++  // TODO(tommi): Support |output_device_id|.
++  DLOG_IF(ERROR, !output_device_id.empty()) << "Not implemented!";
++  static const int kDefaultOutputBufferSize = 2048;
++
++  ChannelLayout channel_layout = CHANNEL_LAYOUT_STEREO;
++  int sample_rate = kDefaultSampleRate;
++  int buffer_size = kDefaultOutputBufferSize;
++  if (input_params.IsValid()) {
++    sample_rate = input_params.sample_rate();
++    channel_layout = input_params.channel_layout();
++    buffer_size = std::min(buffer_size, input_params.frames_per_buffer());
++  }
++
++  int user_buffer_size = GetUserBufferSize();
++  if (user_buffer_size)
++    buffer_size = user_buffer_size;
++
++  return AudioParameters(
++      AudioParameters::AUDIO_PCM_LOW_LATENCY, channel_layout,
++      sample_rate, buffer_size);
++}
++
++AudioInputStream* AudioManagerSndio::MakeInputStream(
++    const AudioParameters& params) {
++  DLOG(WARNING) << "MakeInputStream";
++  return new SndioAudioInputStream(this,
++             AudioDeviceDescription::kDefaultDeviceId, params);
++}
++
++AudioOutputStream* AudioManagerSndio::MakeOutputStream(
++    const AudioParameters& params) {
++  DLOG(WARNING) << "MakeOutputStream";
++  return new SndioAudioOutputStream(params, this);
++}
++
++}  // namespace media
+--- /dev/null
++++ b/src/3rdparty/chromium/media/audio/sndio/audio_manager_sndio.h
+@@ -0,0 +1,65 @@
++// Copyright (c) 2012 The Chromium Authors. All rights reserved.
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++#ifndef MEDIA_AUDIO_SNDIO_AUDIO_MANAGER_SNDIO_H_
++#define MEDIA_AUDIO_SNDIO_AUDIO_MANAGER_SNDIO_H_
++
++#include <set>
++
++#include "base/compiler_specific.h"
++#include "base/macros.h"
++#include "base/memory/ref_counted.h"
++#include "base/threading/thread.h"
++#include "media/audio/audio_manager_base.h"
++
++namespace media {
++
++class MEDIA_EXPORT AudioManagerSndio : public AudioManagerBase {
++ public:
++  AudioManagerSndio(std::unique_ptr<AudioThread> audio_thread,
++                   AudioLogFactory* audio_log_factory);
++  ~AudioManagerSndio() override;
++
++  // Implementation of AudioManager.
++  bool HasAudioOutputDevices() override;
++  bool HasAudioInputDevices() override;
++  void GetAudioInputDeviceNames(AudioDeviceNames* device_names) override;
++  void GetAudioOutputDeviceNames(AudioDeviceNames* device_names) override;
++  AudioParameters GetInputStreamParameters(
++      const std::string& device_id) override;
++  const char* GetName() override;
++
++  // Implementation of AudioManagerBase.
++  AudioOutputStream* MakeLinearOutputStream(
++      const AudioParameters& params,
++      const LogCallback& log_callback) override;
++  AudioOutputStream* MakeLowLatencyOutputStream(
++      const AudioParameters& params,
++      const std::string& device_id,
++      const LogCallback& log_callback) override;
++  AudioInputStream* MakeLinearInputStream(
++      const AudioParameters& params,
++      const std::string& device_id,
++      const LogCallback& log_callback) override;
++  AudioInputStream* MakeLowLatencyInputStream(
++      const AudioParameters& params,
++      const std::string& device_id,
++      const LogCallback& log_callback) override;
++
++ protected:
++  AudioParameters GetPreferredOutputStreamParameters(
++      const std::string& output_device_id,
++      const AudioParameters& input_params) override;
++
++ private:
++  // Called by MakeLinearOutputStream and MakeLowLatencyOutputStream.
++  AudioOutputStream* MakeOutputStream(const AudioParameters& params);
++  AudioInputStream* MakeInputStream(const AudioParameters& params);
++
++  DISALLOW_COPY_AND_ASSIGN(AudioManagerSndio);
++};
++
++}  // namespace media
++
++#endif  // MEDIA_AUDIO_SNDIO_AUDIO_MANAGER_SNDIO_H_
+--- /dev/null
++++ b/src/3rdparty/chromium/media/audio/sndio/sndio_input.cc
+@@ -0,0 +1,200 @@
++// Copyright 2013 The Chromium Authors. All rights reserved.
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++#include "base/bind.h"
++#include "base/logging.h"
++#include "base/macros.h"
++#include "media/base/audio_timestamp_helper.h"
++#include "media/audio/sndio/audio_manager_sndio.h"
++#include "media/audio/audio_manager.h"
++#include "media/audio/sndio/sndio_input.h"
++
++namespace media {
++
++static const SampleFormat kSampleFormat = kSampleFormatS16;
++
++void SndioAudioInputStream::OnMoveCallback(void *arg, int delta)
++{
++  SndioAudioInputStream* self = static_cast<SndioAudioInputStream*>(arg);
++
++  self->hw_delay += delta;
++}
++
++void *SndioAudioInputStream::ThreadEntry(void *arg) {
++  SndioAudioInputStream* self = static_cast<SndioAudioInputStream*>(arg);
++
++  self->ThreadLoop();
++  return NULL;
++}
++
++SndioAudioInputStream::SndioAudioInputStream(AudioManagerBase* manager,
++                                             const std::string& device_name,
++                                             const AudioParameters& params)
++    : manager(manager),
++      params(params),
++      audio_bus(AudioBus::Create(params)),
++      state(kClosed) {
++}
++
++SndioAudioInputStream::~SndioAudioInputStream() {
++  if (state != kClosed)
++    Close();
++}
++
++bool SndioAudioInputStream::Open() {
++  struct sio_par par;
++  int sig;
++
++  if (state != kClosed)
++    return false;
++
++  if (params.format() != AudioParameters::AUDIO_PCM_LINEAR &&
++      params.format() != AudioParameters::AUDIO_PCM_LOW_LATENCY) {
++    LOG(WARNING) << "Unsupported audio format.";
++    return false;
++  }
++
++  sio_initpar(&par);
++  par.rate = params.sample_rate();
++  par.rchan = params.channels();
++  par.bits = SampleFormatToBitsPerChannel(kSampleFormat);
++  par.bps = par.bits / 8;
++  par.sig = sig = par.bits != 8 ? 1 : 0;
++  par.le = SIO_LE_NATIVE;
++  par.appbufsz = params.frames_per_buffer();
++
++  hdl = sio_open(SIO_DEVANY, SIO_REC, 0);
++
++  if (hdl == NULL) {
++    LOG(ERROR) << "Couldn't open audio device.";
++    return false;
++  }
++
++  if (!sio_setpar(hdl, &par) || !sio_getpar(hdl, &par)) {
++    LOG(ERROR) << "Couldn't set audio parameters.";
++    goto bad_close;
++  }
++
++  if (par.rate  != (unsigned int)params.sample_rate() ||
++      par.rchan != (unsigned int)params.channels() ||
++      par.bits  != (unsigned int)SampleFormatToBitsPerChannel(kSampleFormat) ||
++      par.sig   != (unsigned int)sig ||
++      (par.bps > 1 && par.le != SIO_LE_NATIVE) ||
++      (par.bits != par.bps * 8)) {
++    LOG(ERROR) << "Unsupported audio parameters.";
++    goto bad_close;
++  }
++  state = kStopped;
++  buffer = new char[audio_bus->frames() * params.GetBytesPerFrame(kSampleFormat)];
++  sio_onmove(hdl, &OnMoveCallback, this);
++  return true;
++bad_close:
++  sio_close(hdl);
++  return false;
++}
++
++void SndioAudioInputStream::Start(AudioInputCallback* cb) {
++
++  StartAgc();
++
++  state = kRunning;
++  hw_delay = 0;
++  callback = cb;
++  sio_start(hdl);
++  if (pthread_create(&thread, NULL, &ThreadEntry, this) != 0) {
++    LOG(ERROR) << "Failed to create real-time thread for recording.";
++    sio_stop(hdl);
++    state = kStopped;
++  }
++}
++
++void SndioAudioInputStream::Stop() {
++
++  if (state == kStopped)
++    return;
++
++  state = kStopWait;
++  pthread_join(thread, NULL);
++  sio_stop(hdl);
++  state = kStopped;
++
++  StopAgc();
++}
++
++void SndioAudioInputStream::Close() {
++
++  if (state == kClosed)
++    return;
++
++  if (state == kRunning)
++    Stop();
++
++  state = kClosed;
++  delete [] buffer;
++  sio_close(hdl);
++
++  manager->ReleaseInputStream(this);
++}
++
++double SndioAudioInputStream::GetMaxVolume() {
++  // Not supported
++  return 0.0;
++}
++
++void SndioAudioInputStream::SetVolume(double volume) {
++  // Not supported. Do nothing.
++}
++
++double SndioAudioInputStream::GetVolume() {
++  // Not supported.
++  return 0.0;
++}
++
++bool SndioAudioInputStream::IsMuted() {
++  // Not supported.
++  return false;
++}
++
++void SndioAudioInputStream::SetOutputDeviceForAec(
++    const std::string& output_device_id) {
++  // Not supported.
++}
++
++void SndioAudioInputStream::ThreadLoop(void) {
++  size_t todo, n;
++  char *data;
++  unsigned int nframes;
++  double normalized_volume = 0.0;
++
++  nframes = audio_bus->frames();
++
++  while (state == kRunning && !sio_eof(hdl)) {
++
++    GetAgcVolume(&normalized_volume);
++
++    // read one block
++    todo = nframes * params.GetBytesPerFrame(kSampleFormat);
++    data = buffer;
++    while (todo > 0) {
++      n = sio_read(hdl, data, todo);
++      if (n == 0)
++        return;	// unrecoverable I/O error
++      todo -= n;
++      data += n;
++    }
++    hw_delay -= nframes;
++
++    // convert frames count to TimeDelta
++    const base::TimeDelta delay = AudioTimestampHelper::FramesToTime(hw_delay,
++      params.sample_rate());
++
++    // push into bus
++    audio_bus->FromInterleaved<SignedInt16SampleTypeTraits>(reinterpret_cast<int16_t*>(buffer), nframes);
++
++    // invoke callback
++    callback->OnData(audio_bus.get(), base::TimeTicks::Now() - delay, 1.);
++  }
++}
++
++}  // namespace media
+--- /dev/null
++++ b/src/3rdparty/chromium/media/audio/sndio/sndio_input.h
+@@ -0,0 +1,91 @@
++// Copyright 2013 The Chromium Authors. All rights reserved.
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++#ifndef MEDIA_AUDIO_SNDIO_SNDIO_INPUT_H_
++#define MEDIA_AUDIO_SNDIO_SNDIO_INPUT_H_
++
++#include <stdint.h>
++#include <string>
++#include <sndio.h>
++
++#include "base/compiler_specific.h"
++#include "base/macros.h"
++#include "base/memory/weak_ptr.h"
++#include "base/time/time.h"
++#include "media/audio/agc_audio_stream.h"
++#include "media/audio/audio_io.h"
++#include "media/audio/audio_device_description.h"
++#include "media/base/audio_parameters.h"
++
++namespace media {
++
++class AudioManagerBase;
++
++// Implementation of AudioOutputStream using sndio(7)
++class SndioAudioInputStream : public AgcAudioStream<AudioInputStream> {
++ public:
++  // Pass this to the constructor if you want to attempt auto-selection
++  // of the audio recording device.
++  static const char kAutoSelectDevice[];
++
++  // Create a PCM Output stream for the SNDIO device identified by
++  // |device_name|. If unsure of what to use for |device_name|, use
++  // |kAutoSelectDevice|.
++  SndioAudioInputStream(AudioManagerBase* audio_manager,
++                     const std::string& device_name,
++                     const AudioParameters& params);
++
++  ~SndioAudioInputStream() override;
++
++  // Implementation of AudioInputStream.
++  bool Open() override;
++  void Start(AudioInputCallback* callback) override;
++  void Stop() override;
++  void Close() override;
++  double GetMaxVolume() override;
++  void SetVolume(double volume) override;
++  double GetVolume() override;
++  bool IsMuted() override;
++  void SetOutputDeviceForAec(const std::string& output_device_id) override;
++
++ private:
++
++  enum StreamState {
++    kClosed,            // Not opened yet
++    kStopped,           // Device opened, but not started yet
++    kRunning,           // Started, device playing
++    kStopWait           // Stopping, waiting for the real-time thread to exit
++  };
++
++  // C-style call-backs
++  static void OnMoveCallback(void *arg, int delta);
++  static void* ThreadEntry(void *arg);
++
++  // Continuously moves data from the device to the consumer
++  void ThreadLoop();
++  // Our creator, the audio manager needs to be notified when we close.
++  AudioManagerBase* manager;
++  // Parameters of the source
++  AudioParameters params;
++  // We store data here for consumer
++  std::unique_ptr<AudioBus> audio_bus;
++  // Call-back that consumes recorded data
++  AudioInputCallback* callback;  // Valid during a recording session.
++  // Handle of the audio device
++  struct sio_hdl* hdl;
++  // Current state of the stream
++  enum StreamState state;
++  // High priority thread running ThreadLoop()
++  pthread_t thread;
++  // Number of frames buffered in the hardware
++  int hw_delay;
++  // Temporary buffer where data is stored sndio-compatible format
++  char* buffer;
++
++  DISALLOW_COPY_AND_ASSIGN(SndioAudioInputStream);
++};
++
++}  // namespace media
++
++#endif  // MEDIA_AUDIO_SNDIO_SNDIO_INPUT_H_
+--- /dev/null
++++ b/src/3rdparty/chromium/media/audio/sndio/sndio_output.cc
+@@ -0,0 +1,183 @@
++// Copyright (c) 2012 The Chromium Authors. All rights reserved.
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++#include "base/logging.h"
++#include "base/time/time.h"
++#include "base/time/default_tick_clock.h"
++#include "media/audio/audio_manager_base.h"
++#include "media/base/audio_timestamp_helper.h"
++#include "media/audio/sndio/sndio_output.h"
++
++namespace media {
++
++static const SampleFormat kSampleFormat = kSampleFormatS16;
++
++void SndioAudioOutputStream::OnMoveCallback(void *arg, int delta) {
++  SndioAudioOutputStream* self = static_cast<SndioAudioOutputStream*>(arg);
++
++  self->hw_delay -= delta;
++}
++
++void SndioAudioOutputStream::OnVolCallback(void *arg, unsigned int vol) {
++  SndioAudioOutputStream* self = static_cast<SndioAudioOutputStream*>(arg);
++
++  self->vol = vol;
++}
++
++void *SndioAudioOutputStream::ThreadEntry(void *arg) {
++  SndioAudioOutputStream* self = static_cast<SndioAudioOutputStream*>(arg);
++
++  self->ThreadLoop();
++  return NULL;
++}
++
++SndioAudioOutputStream::SndioAudioOutputStream(const AudioParameters& params,
++                                               AudioManagerBase* manager)
++    : manager(manager),
++      params(params),
++      audio_bus(AudioBus::Create(params)),
++      state(kClosed),
++      mutex(PTHREAD_MUTEX_INITIALIZER) {
++}
++
++SndioAudioOutputStream::~SndioAudioOutputStream() {
++  if (state != kClosed)
++    Close();
++}
++
++bool SndioAudioOutputStream::Open() {
++  struct sio_par par;
++  int sig;
++
++  if (params.format() != AudioParameters::AUDIO_PCM_LINEAR &&
++      params.format() != AudioParameters::AUDIO_PCM_LOW_LATENCY) {
++    LOG(WARNING) << "Unsupported audio format.";
++    return false;
++  }
++  sio_initpar(&par);
++  par.rate = params.sample_rate();
++  par.pchan = params.channels();
++  par.bits = SampleFormatToBitsPerChannel(kSampleFormat);
++  par.bps = par.bits / 8;
++  par.sig = sig = par.bits != 8 ? 1 : 0;
++  par.le = SIO_LE_NATIVE;
++  par.appbufsz = params.frames_per_buffer();
++
++  hdl = sio_open(SIO_DEVANY, SIO_PLAY, 0);
++  if (hdl == NULL) {
++    LOG(ERROR) << "Couldn't open audio device.";
++    return false;
++  }
++  if (!sio_setpar(hdl, &par) || !sio_getpar(hdl, &par)) {
++    LOG(ERROR) << "Couldn't set audio parameters.";
++    goto bad_close;
++  }
++  if (par.rate  != (unsigned int)params.sample_rate() ||
++      par.pchan != (unsigned int)params.channels() ||
++      par.bits  != (unsigned int)SampleFormatToBitsPerChannel(kSampleFormat) ||
++      par.sig   != (unsigned int)sig ||
++      (par.bps > 1 && par.le != SIO_LE_NATIVE) ||
++      (par.bits != par.bps * 8)) {
++    LOG(ERROR) << "Unsupported audio parameters.";
++    goto bad_close;
++  }
++  state = kStopped;
++  volpending = 0;
++  vol = 0;
++  buffer = new char[audio_bus->frames() * params.GetBytesPerFrame(kSampleFormat)];
++  sio_onmove(hdl, &OnMoveCallback, this);
++  sio_onvol(hdl, &OnVolCallback, this);
++  return true;
++ bad_close:
++  sio_close(hdl);
++  return false;
++}
++
++void SndioAudioOutputStream::Close() {
++  if (state == kClosed)
++    return;
++  if (state == kRunning)
++    Stop();
++  state = kClosed;
++  delete [] buffer;
++  sio_close(hdl);
++  manager->ReleaseOutputStream(this);  // Calls the destructor
++}
++
++void SndioAudioOutputStream::Start(AudioSourceCallback* callback) {
++  state = kRunning;
++  hw_delay = 0;
++  source = callback;
++  sio_start(hdl);
++  if (pthread_create(&thread, NULL, &ThreadEntry, this) != 0) {
++    LOG(ERROR) << "Failed to create real-time thread.";
++    sio_stop(hdl);
++    state = kStopped;
++  }
++}
++
++void SndioAudioOutputStream::Stop() {
++  if (state == kStopped)
++    return;
++  state = kStopWait;
++  pthread_join(thread, NULL);
++  sio_stop(hdl);
++  state = kStopped;
++}
++
++void SndioAudioOutputStream::SetVolume(double v) {
++  pthread_mutex_lock(&mutex);
++  vol = v * SIO_MAXVOL;
++  volpending = 1;
++  pthread_mutex_unlock(&mutex);
++}
++
++void SndioAudioOutputStream::GetVolume(double* v) {
++  pthread_mutex_lock(&mutex);
++  *v = vol * (1. / SIO_MAXVOL);
++  pthread_mutex_unlock(&mutex);
++}
++
++// This stream is always used with sub second buffer sizes, where it's
++// sufficient to simply always flush upon Start().
++void SndioAudioOutputStream::Flush() {}
++
++void SndioAudioOutputStream::ThreadLoop(void) {
++  int avail, count, result;
++
++  while (state == kRunning) {
++    // Update volume if needed
++    pthread_mutex_lock(&mutex);
++    if (volpending) {
++      volpending = 0;
++      sio_setvol(hdl, vol);
++    }
++    pthread_mutex_unlock(&mutex);
++
++    // Get data to play
++    const base::TimeDelta delay = AudioTimestampHelper::FramesToTime(hw_delay,
++	params.sample_rate());
++    count = source->OnMoreData(delay, base::TimeTicks::Now(), 0, audio_bus.get());
++    audio_bus->ToInterleaved<SignedInt16SampleTypeTraits>(count, reinterpret_cast<int16_t*>(buffer));
++    if (count == 0) {
++      // We have to submit something to the device
++      count = audio_bus->frames();
++      memset(buffer, 0, count * params.GetBytesPerFrame(kSampleFormat));
++      LOG(WARNING) << "No data to play, running empty cycle.";
++    }
++
++    // Submit data to the device
++    avail = count * params.GetBytesPerFrame(kSampleFormat);
++    result = sio_write(hdl, buffer, avail);
++    if (result == 0) {
++      LOG(WARNING) << "Audio device disconnected.";
++      break;
++    }
++
++    // Update hardware pointer
++    hw_delay += count;
++  }
++}
++
++}  // namespace media
+--- /dev/null
++++ b/src/3rdparty/chromium/media/audio/sndio/sndio_output.h
+@@ -0,0 +1,86 @@
++// Copyright (c) 2012 The Chromium Authors. All rights reserved.
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++#ifndef MEDIA_AUDIO_SNDIO_SNDIO_OUTPUT_H_
++#define MEDIA_AUDIO_SNDIO_SNDIO_OUTPUT_H_
++
++#include <pthread.h>
++#include <sndio.h>
++
++#include "base/time/tick_clock.h"
++#include "base/time/time.h"
++#include "media/audio/audio_io.h"
++
++namespace media {
++
++class AudioManagerBase;
++
++// Implementation of AudioOutputStream using sndio(7)
++class SndioAudioOutputStream : public AudioOutputStream {
++ public:
++  // The manager is creating this object
++  SndioAudioOutputStream(const AudioParameters& params,
++                         AudioManagerBase* manager);
++  virtual ~SndioAudioOutputStream();
++
++  // Implementation of AudioOutputStream.
++  bool Open() override;
++  void Close() override;
++  void Start(AudioSourceCallback* callback) override;
++  void Stop() override;
++  void SetVolume(double volume) override;
++  void GetVolume(double* volume) override;
++  void Flush() override;
++
++  friend void sndio_onmove(void *arg, int delta);
++  friend void sndio_onvol(void *arg, unsigned int vol);
++  friend void *sndio_threadstart(void *arg);
++
++ private:
++  enum StreamState {
++    kClosed,            // Not opened yet
++    kStopped,           // Device opened, but not started yet
++    kRunning,           // Started, device playing
++    kStopWait           // Stopping, waiting for the real-time thread to exit
++  };
++
++  // C-style call-backs
++  static void OnMoveCallback(void *arg, int delta);
++  static void OnVolCallback(void *arg, unsigned int vol);
++  static void* ThreadEntry(void *arg);
++
++  // Continuously moves data from the producer to the device
++  void ThreadLoop(void);
++
++  // Our creator, the audio manager needs to be notified when we close.
++  AudioManagerBase* manager;
++  // Parameters of the source
++  AudioParameters params;
++  // Source stores data here
++  std::unique_ptr<AudioBus> audio_bus;
++  // Call-back that produces data to play
++  AudioSourceCallback* source;
++  // Handle of the audio device
++  struct sio_hdl* hdl;
++  // Current state of the stream
++  enum StreamState state;
++  // High priority thread running ThreadLoop()
++  pthread_t thread;
++  // Protects vol, volpending and hw_delay
++  pthread_mutex_t mutex;
++  // Current volume in the 0..SIO_MAXVOL range
++  int vol;
++  // Set to 1 if volumes must be refreshed in the realtime thread
++  int volpending;
++  // Number of frames buffered in the hardware
++  int hw_delay;
++  // Temporary buffer where data is stored sndio-compatible format
++  char* buffer;
++
++  DISALLOW_COPY_AND_ASSIGN(SndioAudioOutputStream);
++};
++
++}  // namespace media
++
++#endif  // MEDIA_AUDIO_SNDIO_SNDIO_OUTPUT_H_
+--- a/src/3rdparty/chromium/media/media_options.gni
++++ b/src/3rdparty/chromium/media/media_options.gni
+@@ -121,6 +121,9 @@ declare_args() {
+   # Enables runtime selection of ALSA library for audio.
+   use_alsa = false
+ 
++  # Enable runtime selection of sndio(7)
++  use_sndio = false
++
+   # Alsa should be used on non-Android, non-Mac POSIX systems.
+   # Alsa should be used on desktop Chromecast and audio-only Chromecast builds.
+   if (is_posix && !is_android && !is_mac &&
diff --git a/srcpkgs/qt6-webengine/patches/0700-armv7l-neon.patch b/srcpkgs/qt6-webengine/patches/0700-armv7l-neon.patch
new file mode 100644
index 000000000000..d42fa19a07a1
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0700-armv7l-neon.patch
@@ -0,0 +1,10 @@
+--- a/src/3rdparty/chromium/skia/BUILD.gn
++++ b/src/3rdparty/chromium/skia/BUILD.gn
+@@ -800,7 +800,6 @@ skia_source_set("skia_opts") {
+         # Root build config sets -mfpu=$arm_fpu, which we expect to be neon
+         # when running this.
+         if (!arm_use_neon) {
+-          configs -= [ "//build/config/compiler:compiler_arm_fpu" ]
+           cflags += [ "-mfpu=neon" ]
+         }
+       }
diff --git a/srcpkgs/qt6-webengine/patches/0750-chromium-musl-cross-no-asm_ptrace_h.patch b/srcpkgs/qt6-webengine/patches/0750-chromium-musl-cross-no-asm_ptrace_h.patch
new file mode 100644
index 000000000000..3cf132908af4
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0750-chromium-musl-cross-no-asm_ptrace_h.patch
@@ -0,0 +1,30 @@
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper.cc
+@@ -38,7 +38,12 @@
+ 
+ #include "client/linux/minidump_writer/linux_ptrace_dumper.h"
+ 
++#if defined(__GLIBC__)
+ #include <asm/ptrace.h>
++#else
++/* For arm*-musl this definition is missing */
++#define ARM_sp uregs[13]
++#endif
+ #include <assert.h>
+ #include <errno.h>
+ #include <fcntl.h>
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_core_dumper.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_core_dumper.cc
+@@ -32,7 +32,12 @@
+ 
+ #include "client/linux/minidump_writer/linux_core_dumper.h"
+ 
++#if defined(__GLIBC__)
+ #include <asm/ptrace.h>
++#else
++/* For arm*-musl this definition is missing */
++#define ARM_sp uregs[13]
++#endif
+ #include <assert.h>
+ #include <elf.h>
+ #include <stdio.h>
diff --git a/srcpkgs/qt6-webengine/patches/0751-chromium-musl-arm-user_vfp.patch b/srcpkgs/qt6-webengine/patches/0751-chromium-musl-arm-user_vfp.patch
new file mode 100644
index 000000000000..6e2d62f35ee6
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0751-chromium-musl-arm-user_vfp.patch
@@ -0,0 +1,20 @@
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/util/linux/thread_info.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/util/linux/thread_info.h
+@@ -17,6 +17,17 @@
+ 
+ #include <stdint.h>
+ #include <sys/user.h>
++#if !defined(__GLIBC__)
++struct user_vfp {
++	unsigned long long fpregs[32];
++	unsigned long fpscr;
++};
++struct user_vfp_exc {
++	unsigned long fpexc;
++	unsigned long fpinst;
++	unsigned long fpinst2;
++};
++#endif /* !defined(__GLIBC__) */
+ 
+ #include <type_traits>
+ 
diff --git a/srcpkgs/qt6-webengine/patches/0752-chromium-musl-arm-elf_auxv_t.patch b/srcpkgs/qt6-webengine/patches/0752-chromium-musl-arm-elf_auxv_t.patch
new file mode 100644
index 000000000000..7112c8cfd3fa
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0752-chromium-musl-arm-elf_auxv_t.patch
@@ -0,0 +1,18 @@
+--- a/src/3rdparty/chromium/v8/src/base/cpu.cc
++++ b/src/3rdparty/chromium/v8/src/base/cpu.cc
+@@ -163,6 +163,15 @@ static V8_INLINE void __cpuid(int cpu_in
+ 
+ #if V8_HOST_ARCH_ARM || V8_HOST_ARCH_ARM64
+ 
++#ifndef __GLIBC__
++#include <elf.h>
++#ifdef __LP64__
++typedef Elf64_auxv_t elf_auxv_t;
++#else
++typedef Elf32_auxv_t elf_auxv_t;
++#endif
++#endif
++
+ static uint32_t ReadELFHWCaps() {
+   uint32_t result = 0;
+ #if V8_GLIBC_PREREQ(2, 16)
diff --git a/srcpkgs/qt6-webengine/patches/0801-chromium-i686-vaapi-fpermissive.patch b/srcpkgs/qt6-webengine/patches/0801-chromium-i686-vaapi-fpermissive.patch
new file mode 100644
index 000000000000..3d4043e03b89
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0801-chromium-i686-vaapi-fpermissive.patch
@@ -0,0 +1,24 @@
+--- a/src/3rdparty/chromium/media/gpu/vaapi/BUILD.gn
++++ b/src/3rdparty/chromium/media/gpu/vaapi/BUILD.gn
+@@ -14,6 +14,10 @@ import("//ui/gl/features.gni")
+ assert(is_linux || is_chromeos)
+ assert(use_vaapi)
+ 
++config("vaapi_permissive") {
++  cflags = [ "-fpermissive" ]
++}
++
+ generate_stubs("libva_stubs") {
+   extra_header = "va_stub_header.fragment"
+   sigs = [ "va.sigs" ]
+@@ -136,6 +140,10 @@ source_set("vaapi") {
+     ]
+   }
+ 
++  if (target_cpu == "x86") {
++    configs += [ ":vaapi_permissive" ]
++  }
++
+   if (use_x11) {
+     deps += [ "//ui/gfx/x" ]
+     sources += [
diff --git a/srcpkgs/qt6-webengine/patches/0900-xxx-ppc64le-libvpx.patch b/srcpkgs/qt6-webengine/patches/0900-xxx-ppc64le-libvpx.patch
new file mode 100644
index 000000000000..5c9566b56bd4
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0900-xxx-ppc64le-libvpx.patch
@@ -0,0 +1,65 @@
+Uses generic target for now. To use ppc64le, change --target to ppc64le-gnu
+and add --enable-vsx, and change generic to ppc for the rtcd header.
+
+From 18e6c5c55cfae0cfb458d8210d7bc709360a0e90 Mon Sep 17 00:00:00 2001
+From: q66 <daniel@octaforge.org>
+Date: Wed, 9 Sep 2020 19:08:25 +0200
+Subject: [PATCH] enable generation of ppc64 libvpx bits
+
+this doesn't update the gni file, that's done from
+the template by running the appropriate scripts
+---
+ third_party/libvpx/BUILD.gn        | 4 ++++
+ third_party/libvpx/generate_gni.sh | 9 +++++++++
+ 2 files changed, 13 insertions(+)
+
+--- a/src/3rdparty/chromium/third_party/libvpx/BUILD.gn
++++ b/src/3rdparty/chromium/third_party/libvpx/BUILD.gn
+@@ -424,6 +424,8 @@ static_library("bundled_libvpx") {
+       sources = libvpx_srcs_arm64
+       public_deps = [ ":libvpx_arm64_headers" ]
+     }
++  } else if (current_cpu == "ppc64") {
++    sources = libvpx_srcs_ppc64
+   }
+ 
+   configs -= [ "//build/config/compiler:chromium_code" ]
+--- a/src/3rdparty/chromium/third_party/libvpx/generate_gni.sh
++++ b/src/3rdparty/chromium/third_party/libvpx/generate_gni.sh
+@@ -374,6 +374,7 @@ gen_config_files linux/arm-neon-highbd "
+ gen_config_files linux/arm64-highbd "--target=armv8-linux-gcc ${all_platforms} ${HIGHBD}"
+ gen_config_files linux/mipsel "--target=mips32-linux-gcc ${all_platforms}"
+ gen_config_files linux/mips64el "--target=mips64-linux-gcc ${all_platforms}"
++gen_config_files linux/ppc64 "--target=generic-gnu $HIGHBD ${all_platforms}"
+ gen_config_files linux/generic "--target=generic-gnu $HIGHBD ${all_platforms}"
+ gen_config_files win/arm64 "--target=arm64-win64-vs15 ${all_platforms} ${HIGHBD}"
+ gen_config_files win/ia32 "--target=x86-win32-vs14 ${all_platforms} ${x86_platforms}"
+@@ -399,6 +400,7 @@ lint_config linux/arm-neon-highbd
+ lint_config linux/arm64-highbd
+ lint_config linux/mipsel
+ lint_config linux/mips64el
++lint_config linux/ppc64
+ lint_config linux/generic
+ lint_config win/arm64
+ lint_config win/ia32
+@@ -428,6 +430,7 @@ gen_rtcd_header linux/arm-neon-highbd ar
+ gen_rtcd_header linux/arm64-highbd armv8
+ gen_rtcd_header linux/mipsel mipsel
+ gen_rtcd_header linux/mips64el mips64el
++gen_rtcd_header linux/ppc64 generic
+ gen_rtcd_header linux/generic generic
+ gen_rtcd_header win/arm64 armv8
+ gen_rtcd_header win/ia32 x86 "${require_sse2}"
+@@ -513,6 +516,12 @@ if [ -z $ONLY_CONFIGS ]; then
+ 
+   echo "MIPS64 source list is identical to MIPS source list. No need to generate it."
+ 
++  echo "Generate ppc64 source list."
++  config=$(print_config_basic linux/ppc64)
++  make_clean
++  make libvpx_srcs.txt target=libs $config > /dev/null
++  convert_srcs_to_project_files libvpx_srcs.txt libvpx_srcs_ppc64
++
+   echo "Generate NaCl source list."
+   config=$(print_config_basic nacl)
+   make_clean
diff --git a/srcpkgs/qt6-webengine/patches/0901-xxx-ppc64le-sandbox-linux-stat.patch b/srcpkgs/qt6-webengine/patches/0901-xxx-ppc64le-sandbox-linux-stat.patch
new file mode 100644
index 000000000000..4b8e6320601c
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0901-xxx-ppc64le-sandbox-linux-stat.patch
@@ -0,0 +1,31 @@
+--- a/src/3rdparty/chromium/sandbox/linux/system_headers/linux_stat.h
++++ b/src/3rdparty/chromium/sandbox/linux/system_headers/linux_stat.h
+@@ -155,6 +155,28 @@ struct kernel_stat {
+   unsigned int __unused4;
+   unsigned int __unused5;
+ };
++#elif defined(__powerpc64__)
++struct kernel_stat {
++  unsigned long	st_dev;
++  unsigned long	st_ino;
++  unsigned long	st_nlink;
++  unsigned int	st_mode;
++  unsigned int	st_uid;
++  unsigned int	st_gid;
++  unsigned long	st_rdev;
++  long		st_size;
++  unsigned long	st_blksize;
++  unsigned long	st_blocks;
++  unsigned long	st_atime_;
++  unsigned long	st_atime_nsec_;
++  unsigned long	st_mtime_;
++  unsigned long	st_mtime_nsec_;
++  unsigned long	st_ctime_;
++  unsigned long	st_ctime_nsec_;
++  unsigned long	__unused4;
++  unsigned long	__unused5;
++  unsigned long	__unused6;
++};
+ #endif
+ 
+ #if !defined(AT_EMPTY_PATH)
diff --git a/srcpkgs/qt6-webengine/patches/0902-xxx-ppc64le-support.patch b/srcpkgs/qt6-webengine/patches/0902-xxx-ppc64le-support.patch
new file mode 100644
index 000000000000..33d415e55f69
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0902-xxx-ppc64le-support.patch
@@ -0,0 +1,3556 @@
+commit 2c013a317b1114ef67cdbbc30824b28907b9ea94
+Author: Daniel Kolesa <daniel@octaforge.org>
+Date:   Wed Mar 3 19:08:29 2021 +0100
+
+    ppc64le support
+
+--- a/src/3rdparty/chromium/sandbox/features.gni
++++ b/src/3rdparty/chromium/sandbox/features.gni
+@@ -11,7 +11,8 @@ import("//build/config/nacl/config.gni")
+ use_seccomp_bpf = (is_linux || is_chromeos || is_android) &&
+                   (current_cpu == "x86" || current_cpu == "x64" ||
+                    current_cpu == "arm" || current_cpu == "arm64" ||
+-                   current_cpu == "mipsel" || current_cpu == "mips64el")
++                   current_cpu == "mipsel" || current_cpu == "mips64el" ||
++                   current_cpu == "ppc64")
+ 
+ use_seccomp_bpf = use_seccomp_bpf || is_nacl_nonsfi
+ 
+--- a/src/3rdparty/chromium/sandbox/linux/BUILD.gn
++++ b/src/3rdparty/chromium/sandbox/linux/BUILD.gn
+@@ -433,6 +433,8 @@ component("sandbox_services") {
+ 
+ source_set("sandbox_services_headers") {
+   sources = [
++    "system_headers/ppc64_linux_syscalls.h",
++    "system_headers/ppc64_linux_ucontext.h",
+     "system_headers/arm64_linux_syscalls.h",
+     "system_headers/arm_linux_syscalls.h",
+     "system_headers/arm_linux_ucontext.h",
+--- a/src/3rdparty/chromium/sandbox/linux/bpf_dsl/linux_syscall_ranges.h
++++ b/src/3rdparty/chromium/sandbox/linux/bpf_dsl/linux_syscall_ranges.h
+@@ -56,6 +56,13 @@
+ #define MAX_PUBLIC_SYSCALL __NR_syscalls
+ #define MAX_SYSCALL MAX_PUBLIC_SYSCALL
+ 
++#elif defined(__powerpc64__)
++
++#include <asm/unistd.h>
++#define MIN_SYSCALL 0u
++#define MAX_PUBLIC_SYSCALL 386u
++#define MAX_SYSCALL MAX_PUBLIC_SYSCALL
++
+ #else
+ #error "Unsupported architecture"
+ #endif
+--- a/src/3rdparty/chromium/sandbox/linux/bpf_dsl/seccomp_macros.h
++++ b/src/3rdparty/chromium/sandbox/linux/bpf_dsl/seccomp_macros.h
+@@ -16,6 +16,9 @@
+ #if defined(__mips__)
+ // sys/user.h in eglibc misses size_t definition
+ #include <stddef.h>
++#elif defined(__powerpc64__) && defined(__GLIBC__)
++// Manually define greg_t on ppc64
++typedef unsigned long long greg_t;
+ #endif
+ #endif
+ 
+@@ -346,6 +349,59 @@ struct regs_struct {
+ #define SECCOMP_PT_PARM4(_regs) (_regs).regs[3]
+ #define SECCOMP_PT_PARM5(_regs) (_regs).regs[4]
+ #define SECCOMP_PT_PARM6(_regs) (_regs).regs[5]
++
++#elif defined(__powerpc64__)
++#include <asm/ptrace.h>
++
++typedef struct pt_regs regs_struct;
++
++#ifdef ARCH_CPU_LITTLE_ENDIAN
++#define SECCOMP_ARCH AUDIT_ARCH_PPC64LE
++#else
++#define SECCOMP_ARCH AUDIT_ARCH_PPC64
++#endif
++
++#ifdef __GLIBC__
++#define SECCOMP_REG(_ctx, _reg) ((_ctx)->uc_mcontext.regs->gpr[_reg])
++#else
++#define SECCOMP_REG(_ctx, _reg) (((struct pt_regs *)(_ctx)->uc_mcontext.regs)->gpr[_reg])
++#endif
++
++#define SECCOMP_RESULT(_ctx) SECCOMP_REG(_ctx, 3)
++#define SECCOMP_SYSCALL(_ctx) SECCOMP_REG(_ctx, 0)
++#ifdef __GLIBC__
++#define SECCOMP_IP(_ctx) (_ctx)->uc_mcontext.regs->nip
++#else
++#define SECCOMP_IP(_ctx) ((struct pt_regs *)(_ctx)->uc_mcontext.regs)->nip
++#endif
++#define SECCOMP_PARM1(_ctx) SECCOMP_REG(_ctx, 3)
++#define SECCOMP_PARM2(_ctx) SECCOMP_REG(_ctx, 4)
++#define SECCOMP_PARM3(_ctx) SECCOMP_REG(_ctx, 5)
++#define SECCOMP_PARM4(_ctx) SECCOMP_REG(_ctx, 6)
++#define SECCOMP_PARM5(_ctx) SECCOMP_REG(_ctx, 7)
++#define SECCOMP_PARM6(_ctx) SECCOMP_REG(_ctx, 8)
++
++#define SECCOMP_NR_IDX (offsetof(struct arch_seccomp_data, nr))
++#define SECCOMP_ARCH_IDX (offsetof(struct arch_seccomp_data, arch))
++#define SECCOMP_IP_MSB_IDX \
++  (offsetof(struct arch_seccomp_data, instruction_pointer) + 4)
++#define SECCOMP_IP_LSB_IDX \
++  (offsetof(struct arch_seccomp_data, instruction_pointer) + 0)
++#define SECCOMP_ARG_MSB_IDX(nr) \
++  (offsetof(struct arch_seccomp_data, args) + 8 * (nr) + 4)
++#define SECCOMP_ARG_LSB_IDX(nr) \
++  (offsetof(struct arch_seccomp_data, args) + 8 * (nr) + 0)
++
++#define SECCOMP_PT_RESULT(_regs) (_regs).gpr[3]
++#define SECCOMP_PT_SYSCALL(_regs) (_regs).gpr[0]
++#define SECCOMP_PT_IP(_regs) (_regs).nip
++#define SECCOMP_PT_PARM1(_regs) (_regs).gpr[3]
++#define SECCOMP_PT_PARM2(_regs) (_regs).gpr[4]
++#define SECCOMP_PT_PARM3(_regs) (_regs).gpr[5]
++#define SECCOMP_PT_PARM4(_regs) (_regs).gpr[6]
++#define SECCOMP_PT_PARM5(_regs) (_regs).gpr[7]
++#define SECCOMP_PT_PARM6(_regs) (_regs).gpr[8]
++
+ #else
+ #error Unsupported target platform
+ 
+--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc
++++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc
+@@ -90,7 +90,7 @@ bool IsBaselinePolicyWatched(int sysno)
+          SyscallSets::IsNuma(sysno) ||
+          SyscallSets::IsPrctl(sysno) ||
+          SyscallSets::IsProcessGroupOrSession(sysno) ||
+-#if defined(__i386__) || \
++#if defined(__i386__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+          SyscallSets::IsSocketCall(sysno) ||
+ #endif
+@@ -258,7 +258,7 @@ ResultExpr EvaluateSyscallImpl(int fs_de
+   }
+ 
+ #if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
+-    defined(__aarch64__)
++    defined(__aarch64__) || defined(__powerpc64__)
+   if (sysno == __NR_mmap)
+     return RestrictMmapFlags();
+ #endif
+@@ -279,7 +279,7 @@ ResultExpr EvaluateSyscallImpl(int fs_de
+     return RestrictPrctl();
+ 
+ #if defined(__x86_64__) || defined(__arm__) || defined(__mips__) || \
+-    defined(__aarch64__)
++    defined(__aarch64__) || defined(__powerpc64__)
+   if (sysno == __NR_socketpair) {
+     // Only allow AF_UNIX, PF_UNIX. Crash if anything else is seen.
+     static_assert(AF_UNIX == PF_UNIX,
+@@ -343,7 +343,8 @@ ResultExpr EvaluateSyscallImpl(int fs_de
+   }
+ 
+ #if defined(__i386__) || \
+-    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
++    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
++    defined(__powerpc64__)
+   if (SyscallSets::IsSocketCall(sysno))
+     return RestrictSocketcallCommand();
+ #endif
+--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/baseline_policy_unittest.cc
++++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/baseline_policy_unittest.cc
+@@ -317,7 +317,7 @@ TEST_BASELINE_SIGSYS(__NR_sysinfo)
+ TEST_BASELINE_SIGSYS(__NR_syslog)
+ TEST_BASELINE_SIGSYS(__NR_timer_create)
+ 
+-#if !defined(__aarch64__)
++#if !defined(__aarch64__) && !defined(__powerpc64__)
+ TEST_BASELINE_SIGSYS(__NR_inotify_init)
+ TEST_BASELINE_SIGSYS(__NR_vserver)
+ #endif
+--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc
++++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc
+@@ -40,6 +40,7 @@
+ #include <sys/ptrace.h>
+ #if (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) && \
+     !defined(__arm__) && !defined(__aarch64__) &&           \
++    !defined(__powerpc64__) &&                              \
+     !defined(PTRACE_GET_THREAD_AREA)
+ // Also include asm/ptrace-abi.h since ptrace.h in older libc (for instance
+ // the one in Ubuntu 16.04 LTS) is missing PTRACE_GET_THREAD_AREA.
+@@ -49,6 +50,11 @@
+ #endif
+ #endif  // !OS_NACL_NONSFI
+ 
++// On PPC64, TCGETS is defined in terms of struct termios, so we must include termios.h
++#ifdef __powerpc64__
++#include <termios.h>
++#endif
++
+ #if defined(OS_ANDROID)
+ 
+ #if !defined(F_DUPFD_CLOEXEC)
+@@ -106,6 +112,14 @@ inline bool IsArchitectureMips() {
+ #endif
+ }
+ 
++inline bool IsArchitecturePPC64() {
++#if defined(__powerpc64__)
++  return true;
++#else
++  return false;
++#endif
++}
++
+ // Ubuntu's version of glibc has a race condition in sem_post that can cause
+ // it to call futex(2) with bogus op arguments. To workaround this, we need
+ // to allow those futex(2) calls to fail with EINVAL, instead of crashing the
+@@ -270,6 +284,8 @@ ResultExpr RestrictFcntlCommands() {
+   uint64_t kOLargeFileFlag = O_LARGEFILE;
+   if (IsArchitectureX86_64() || IsArchitectureI386() || IsArchitectureMips())
+     kOLargeFileFlag = 0100000;
++  else if (IsArchitecturePPC64())
++    kOLargeFileFlag = 0200000;
+ 
+   const Arg<int> cmd(1);
+   const Arg<long> long_arg(2);
+@@ -287,7 +303,16 @@ ResultExpr RestrictFcntlCommands() {
+               F_SETLKW,
+               F_GETLK,
+               F_DUPFD,
+-              F_DUPFD_CLOEXEC),
++              F_DUPFD_CLOEXEC
++#if defined(__powerpc64__)
++// On PPC64, F_SETLK, F_GETLK, F_SETLKW are defined as the 64-bit variants
++// but glibc will sometimes still use the 32-bit versions. Allow both.
++              ,
++              5, /* F_GETLK (32) */
++              6, /* F_SETLK (32) */
++              7  /* F_SETLKW (32) */
++#endif
++	     ),
+              Allow())
+       .Case(F_SETFL,
+             If((long_arg & ~kAllowedMask) == 0, Allow()).Else(CrashSIGSYS()))
+@@ -297,7 +322,7 @@ ResultExpr RestrictFcntlCommands() {
+   // clang-format on
+ }
+ 
+-#if defined(__i386__) || defined(__mips__)
++#if defined(__i386__) || defined(__mips__) || defined(__powerpc64__)
+ ResultExpr RestrictSocketcallCommand() {
+   // Unfortunately, we are unable to restrict the first parameter to
+   // socketpair(2). Whilst initially sounding bad, it's noteworthy that very
+@@ -454,7 +479,7 @@ ResultExpr RestrictPtrace() {
+ #endif
+   return Switch(request)
+       .CASES((
+-#if !defined(__aarch64__)
++#if !defined(__aarch64__) && !defined(__powerpc64__)
+                  PTRACE_GETREGS, PTRACE_GETFPREGS,
+ #if defined(TRACE_GET_THREAD_AREA)
+                  PTRACE_GET_THREAD_AREA,
+--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.h
++++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.h
+@@ -49,7 +49,7 @@ SANDBOX_EXPORT bpf_dsl::ResultExpr Restr
+ // O_NONBLOCK | O_SYNC | O_LARGEFILE | O_CLOEXEC | O_NOATIME.
+ SANDBOX_EXPORT bpf_dsl::ResultExpr RestrictFcntlCommands();
+ 
+-#if defined(__i386__) || defined(__mips__)
++#if defined(__i386__) || defined(__mips__) || defined(__powerpc64__)
+ // Restrict socketcall(2) to only allow socketpair(2), send(2), recv(2),
+ // sendto(2), recvfrom(2), shutdown(2), sendmsg(2) and recvmsg(2).
+ SANDBOX_EXPORT bpf_dsl::ResultExpr RestrictSocketcallCommand();
+--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
++++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
+@@ -28,7 +28,7 @@ bool SyscallSets::IsKill(int sysno) {
+ bool SyscallSets::IsAllowedGettime(int sysno) {
+   switch (sysno) {
+     case __NR_gettimeofday:
+-#if defined(__i386__) || defined(__x86_64__) || \
++#if defined(__i386__) || defined(__x86_64__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_time:
+ #endif
+@@ -51,12 +51,12 @@ bool SyscallSets::IsAllowedGettime(int s
+                                     // filtered by RestrictClockID().
+     case __NR_clock_nanosleep_time64:  // Parameters filtered by RestrictClockID().
+ #endif
+-#if defined(__i386__) || \
++#if defined(__i386__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_ftime:  // Obsolete.
+ #endif
+     case __NR_settimeofday:  // Privileged.
+-#if defined(__i386__) || \
++#if defined(__i386__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_stime:
+ #endif
+@@ -135,7 +135,7 @@ bool SyscallSets::IsFileSystem(int sysno
+     case __NR_faccessat:  // EPERM not a valid errno.
+     case __NR_fchmodat:
+     case __NR_fchownat:  // Should be called chownat ?
+-#if defined(__x86_64__) || defined(__aarch64__)
++#if defined(__x86_64__) || defined(__aarch64__) || defined(__powerpc64__)
+     case __NR_newfstatat:  // fstatat(). EPERM not a valid errno.
+ #elif defined(__i386__) || defined(__arm__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+@@ -154,7 +154,7 @@ bool SyscallSets::IsFileSystem(int sysno
+     case __NR_memfd_create:
+     case __NR_mkdirat:
+     case __NR_mknodat:
+-#if defined(__i386__)
++#if defined(__i386__) || defined(__powerpc64__)
+     case __NR_oldlstat:
+     case __NR_oldstat:
+ #endif
+@@ -167,7 +167,7 @@ bool SyscallSets::IsFileSystem(int sysno
+     case __NR_stat64:
+ #endif
+     case __NR_statfs:  // EPERM not a valid errno.
+-#if defined(__i386__) || defined(__arm__) || \
++#if defined(__i386__) || defined(__arm__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_statfs64:
+ #endif
+@@ -179,7 +179,8 @@ bool SyscallSets::IsFileSystem(int sysno
+     case __NR_truncate64:
+ #endif
+     case __NR_unlinkat:
+-#if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
++#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
++    defined(__powerpc64__)
+     case __NR_utime:
+ #endif
+     case __NR_utimensat:  // New.
+@@ -204,7 +205,8 @@ bool SyscallSets::IsAllowedFileSystemAcc
+ #endif
+       return true;
+ // TODO(jln): these should be denied gracefully as well (moved below).
+-#if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
++#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
++    defined(__powerpc64__)
+     case __NR_fadvise64:  // EPERM not a valid errno.
+ #endif
+ #if defined(__i386__)
+@@ -216,12 +218,12 @@ bool SyscallSets::IsAllowedFileSystemAcc
+     case __NR_fdatasync:  // EPERM not a valid errno.
+     case __NR_flock:      // EPERM not a valid errno.
+     case __NR_fstatfs:    // Give information about the whole filesystem.
+-#if defined(__i386__) || defined(__arm__) || \
++#if defined(__i386__) || defined(__arm__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_fstatfs64:
+ #endif
+     case __NR_fsync:  // EPERM not a valid errno.
+-#if defined(__i386__)
++#if defined(__i386__) || defined(__powerpc64__)
+     case __NR_oldfstat:
+ #endif
+ #if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
+@@ -229,6 +231,8 @@ bool SyscallSets::IsAllowedFileSystemAcc
+     case __NR_sync_file_range:  // EPERM not a valid errno.
+ #elif defined(__arm__)
+     case __NR_arm_sync_file_range:  // EPERM not a valid errno.
++#elif defined(__powerpc64__)
++    case __NR_sync_file_range2: // EPERM not a valid errno.
+ #endif
+     default:
+       return false;
+@@ -248,7 +252,7 @@ bool SyscallSets::IsDeniedFileSystemAcce
+     case __NR_getdents:    // EPERM not a valid errno.
+ #endif
+     case __NR_getdents64:  // EPERM not a valid errno.
+-#if defined(__i386__) || \
++#if defined(__i386__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_readdir:
+ #endif
+@@ -290,7 +294,7 @@ bool SyscallSets::IsGetSimpleId(int sysn
+ bool SyscallSets::IsProcessPrivilegeChange(int sysno) {
+   switch (sysno) {
+     case __NR_capset:
+-#if defined(__i386__) || defined(__x86_64__)
++#if defined(__i386__) || defined(__x86_64__) || defined(__powerpc64__)
+     case __NR_ioperm:  // Intel privilege.
+     case __NR_iopl:    // Intel privilege.
+ #endif
+@@ -340,7 +344,7 @@ bool SyscallSets::IsAllowedSignalHandlin
+     case __NR_rt_sigprocmask:
+     case __NR_rt_sigreturn:
+     case __NR_rt_sigtimedwait:
+-#if defined(__i386__) || defined(__arm__) || \
++#if defined(__i386__) || defined(__arm__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_rt_sigtimedwait_time64:
+     case __NR_sigaction:
+@@ -357,7 +361,7 @@ bool SyscallSets::IsAllowedSignalHandlin
+     case __NR_signalfd:
+ #endif
+     case __NR_signalfd4:
+-#if defined(__i386__) || defined(__arm__) || \
++#if defined(__i386__) || defined(__arm__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_sigpending:
+     case __NR_sigsuspend:
+@@ -382,7 +386,7 @@ bool SyscallSets::IsAllowedOperationOnFd
+ #endif
+     case __NR_dup3:
+ #if defined(__x86_64__) || defined(__arm__) || defined(__mips__) || \
+-    defined(__aarch64__)
++    defined(__aarch64__) || defined(__powerpc64__)
+     case __NR_shutdown:
+ #endif
+       return true;
+@@ -416,7 +420,7 @@ bool SyscallSets::IsAllowedProcessStartO
+     case __NR_membarrier:
+     case __NR_wait4:
+     case __NR_waitid:
+-#if defined(__i386__)
++#if defined(__i386__) || defined(__powerpc64__)
+     case __NR_waitpid:
+ #endif
+ #if !defined(__GLIBC__)
+@@ -438,7 +442,7 @@ bool SyscallSets::IsAllowedProcessStartO
+     case __NR_set_tid_address:
+ #endif
+     case __NR_unshare:
+-#if !defined(__mips__) && !defined(__aarch64__)
++#if !defined(__mips__) && !defined(__aarch64__) || defined(__powerpc64__)
+     case __NR_vfork:
+ #endif
+     default:
+@@ -491,7 +495,7 @@ bool SyscallSets::IsAllowedGetOrModifySo
+       return true;
+     default:
+ #if defined(__x86_64__) || defined(__arm__) || defined(__mips__) || \
+-    defined(__aarch64__)
++    defined(__aarch64__) || defined(__powerpc64__)
+     case __NR_socketpair:  // We will want to inspect its argument.
+ #endif
+       return false;
+@@ -501,7 +505,7 @@ bool SyscallSets::IsAllowedGetOrModifySo
+ bool SyscallSets::IsDeniedGetOrModifySocket(int sysno) {
+   switch (sysno) {
+ #if defined(__x86_64__) || defined(__arm__) || defined(__mips__) || \
+-    defined(__aarch64__)
++    defined(__aarch64__) || defined(__powerpc64__)
+     case __NR_accept:
+     case __NR_accept4:
+     case __NR_bind:
+@@ -515,7 +519,7 @@ bool SyscallSets::IsDeniedGetOrModifySoc
+   }
+ }
+ 
+-#if defined(__i386__) || \
++#if defined(__i386__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+ // Big multiplexing system call for sockets.
+ bool SyscallSets::IsSocketCall(int sysno) {
+@@ -530,7 +534,8 @@ bool SyscallSets::IsSocketCall(int sysno
+ }
+ #endif
+ 
+-#if defined(__x86_64__) || defined(__arm__) || defined(__mips__)
++#if defined(__x86_64__) || defined(__arm__) || defined(__mips__) || \
++    defined(__powerpc64__)
+ bool SyscallSets::IsNetworkSocketInformation(int sysno) {
+   switch (sysno) {
+     case __NR_getpeername:
+@@ -558,7 +563,7 @@ bool SyscallSets::IsAllowedAddressSpaceA
+     case __NR_mincore:
+     case __NR_mlockall:
+ #if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
+-    defined(__aarch64__)
++    defined(__aarch64__) || defined(__powerpc64__)
+     case __NR_mmap:
+ #endif
+ #if defined(__i386__) || defined(__arm__) || \
+@@ -589,7 +594,7 @@ bool SyscallSets::IsAllowedAddressSpaceA
+ bool SyscallSets::IsAllowedGeneralIo(int sysno) {
+   switch (sysno) {
+     case __NR_lseek:
+-#if defined(__i386__) || defined(__arm__) || \
++#if defined(__i386__) || defined(__arm__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR__llseek:
+ #endif
+@@ -609,27 +614,27 @@ bool SyscallSets::IsAllowedGeneralIo(int
+     case __NR_read:
+     case __NR_readv:
+     case __NR_pread64:
+-#if defined(__arm__) || \
++#if defined(__arm__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_recv:
+ #endif
+ #if defined(__x86_64__) || defined(__arm__) || defined(__mips__) || \
+-    defined(__aarch64__)
++    defined(__aarch64__) || defined(__powerpc64__)
+     case __NR_recvfrom:  // Could specify source.
+     case __NR_recvmsg:   // Could specify source.
+ #endif
+-#if defined(__i386__) || defined(__x86_64__)
++#if defined(__i386__) || defined(__x86_64__) || defined(__powerpc64__)
+     case __NR_select:
+ #endif
+-#if defined(__i386__) || defined(__arm__) || defined(__mips__)
++#if defined(__i386__) || defined(__arm__) || defined(__mips__) || defined(__powerpc64__)
+     case __NR__newselect:
+ #endif
+-#if defined(__arm__) || \
++#if defined(__arm__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_send:
+ #endif
+ #if defined(__x86_64__) || defined(__arm__) || defined(__mips__) || \
+-    defined(__aarch64__)
++    defined(__aarch64__) || defined(__powerpc64__)
+     case __NR_sendmsg:  // Could specify destination.
+     case __NR_sendto:   // Could specify destination.
+ #endif
+@@ -684,7 +689,7 @@ bool SyscallSets::IsAllowedBasicSchedule
+     case __NR_nanosleep:
+       return true;
+     case __NR_getpriority:
+-#if defined(__i386__) || defined(__arm__) || \
++#if defined(__i386__) || defined(__arm__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_nice:
+ #endif
+@@ -696,7 +701,7 @@ bool SyscallSets::IsAllowedBasicSchedule
+ 
+ bool SyscallSets::IsAdminOperation(int sysno) {
+   switch (sysno) {
+-#if defined(__i386__) || defined(__arm__) || \
++#if defined(__i386__) || defined(__arm__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_bdflush:
+ #endif
+@@ -713,7 +718,8 @@ bool SyscallSets::IsAdminOperation(int s
+ 
+ bool SyscallSets::IsKernelModule(int sysno) {
+   switch (sysno) {
+-#if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
++#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
++    defined(__powerpc64__)
+     case __NR_create_module:
+     case __NR_get_kernel_syms:  // Should ENOSYS.
+     case __NR_query_module:
+@@ -745,7 +751,7 @@ bool SyscallSets::IsFsControl(int sysno)
+     case __NR_quotactl:
+     case __NR_swapoff:
+     case __NR_swapon:
+-#if defined(__i386__) || \
++#if defined(__i386__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_umount:
+ #endif
+@@ -762,7 +768,7 @@ bool SyscallSets::IsNuma(int sysno) {
+     case __NR_getcpu:
+     case __NR_mbind:
+ #if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
+-    defined(__aarch64__)
++    defined(__aarch64__) || defined(__powerpc64__)
+     case __NR_migrate_pages:
+ #endif
+     case __NR_move_pages:
+@@ -797,13 +803,13 @@ bool SyscallSets::IsGlobalProcessEnviron
+   switch (sysno) {
+     case __NR_acct:  // Privileged.
+ #if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
+-    defined(__aarch64__)
++    defined(__aarch64__) || defined(__powerpc64__)
+     case __NR_getrlimit:
+ #endif
+-#if defined(__i386__) || defined(__arm__)
++#if defined(__i386__) || defined(__arm__) || defined(__powerpc64__)
+     case __NR_ugetrlimit:
+ #endif
+-#if defined(__i386__) || \
++#if defined(__i386__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_ulimit:
+ #endif
+@@ -838,7 +844,7 @@ bool SyscallSets::IsGlobalSystemStatus(i
+ #endif
+     case __NR_sysinfo:
+     case __NR_uname:
+-#if defined(__i386__)
++#if defined(__i386__) || defined(__powerpc64__)
+     case __NR_olduname:
+     case __NR_oldolduname:
+ #endif
+@@ -904,8 +910,16 @@ bool SyscallSets::IsSystemVSemaphores(in
+ }
+ #endif
+ 
++/* shitty hack around Void's 4.19 kernel headers missing those numbers */
++#if defined(__powerpc64__) && !defined(__NR_shmget)
++#define __NR_shmget 395
++#define __NR_shmctl 396
++#define __NR_shmat 397
++#define __NR_shmdt 398
++#endif
++
+ #if defined(__i386__) || defined(__x86_64__) || defined(__arm__) || \
+-    defined(__aarch64__) ||                                         \
++    defined(__aarch64__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_64_BITS))
+ // These give a lot of ambient authority and bypass the setuid sandbox.
+ bool SyscallSets::IsSystemVSharedMemory(int sysno) {
+@@ -936,7 +950,7 @@ bool SyscallSets::IsSystemVMessageQueue(
+ }
+ #endif
+ 
+-#if defined(__i386__) || \
++#if defined(__i386__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+ // Big system V multiplexing system call.
+ bool SyscallSets::IsSystemVIpc(int sysno) {
+@@ -956,7 +970,7 @@ bool SyscallSets::IsAnySystemV(int sysno
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_64_BITS))
+   return IsSystemVMessageQueue(sysno) || IsSystemVSemaphores(sysno) ||
+          IsSystemVSharedMemory(sysno);
+-#elif defined(__i386__) || \
++#elif defined(__i386__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+   return IsSystemVIpc(sysno);
+ #endif
+@@ -1014,7 +1028,8 @@ bool SyscallSets::IsFaNotify(int sysno)
+ bool SyscallSets::IsTimer(int sysno) {
+   switch (sysno) {
+     case __NR_getitimer:
+-#if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
++#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
++    defined(__powerpc64__)
+     case __NR_alarm:
+ #endif
+     case __NR_setitimer:
+@@ -1096,17 +1111,20 @@ bool SyscallSets::IsMisc(int sysno) {
+     case __NR_syncfs:
+     case __NR_vhangup:
+ // The system calls below are not implemented.
+-#if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
++#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
++    defined(__powerpc64__)
+     case __NR_afs_syscall:
+ #endif
+ #if defined(__i386__) || \
+-    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
++    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
++    defined(__powerpc64__)
+     case __NR_break:
+ #endif
+-#if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
++#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
++    defined(__powerpc64__)
+     case __NR_getpmsg:
+ #endif
+-#if defined(__i386__) || \
++#if defined(__i386__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_gtty:
+     case __NR_idle:
+@@ -1115,20 +1133,21 @@ bool SyscallSets::IsMisc(int sysno) {
+     case __NR_prof:
+     case __NR_profil:
+ #endif
+-#if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
++#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
++    defined(__powerpc64__)
+     case __NR_putpmsg:
+ #endif
+ #if defined(__x86_64__)
+     case __NR_security:
+ #endif
+-#if defined(__i386__) || \
++#if defined(__i386__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+     case __NR_stty:
+ #endif
+-#if defined(__x86_64__)
++#if defined(__x86_64__) || defined(__powerpc64__)
+     case __NR_tuxcall:
+ #endif
+-#if !defined(__aarch64__)
++#if !defined(__aarch64__) && !defined(__powerpc64__)
+     case __NR_vserver:
+ #endif
+       return true;
+--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_sets.h
++++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_sets.h
+@@ -43,13 +43,14 @@ class SANDBOX_EXPORT SyscallSets {
+   static bool IsDeniedGetOrModifySocket(int sysno);
+ 
+ #if defined(__i386__) || \
+-    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
++    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
++    defined(__powerpc64__)
+   // Big multiplexing system call for sockets.
+   static bool IsSocketCall(int sysno);
+ #endif
+ 
+ #if defined(__x86_64__) || defined(__arm__) || defined(__mips__) || \
+-    defined(__aarch64__)
++    defined(__aarch64__) || defined(__powerpc64__)
+   static bool IsNetworkSocketInformation(int sysno);
+ #endif
+ 
+@@ -77,7 +78,7 @@ class SANDBOX_EXPORT SyscallSets {
+   static bool IsSystemVSemaphores(int sysno);
+ #endif
+ #if defined(__i386__) || defined(__x86_64__) || defined(__arm__) || \
+-    defined(__aarch64__) ||                                         \
++    defined(__aarch64__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_64_BITS))
+   // These give a lot of ambient authority and bypass the setuid sandbox.
+   static bool IsSystemVSharedMemory(int sysno);
+@@ -89,7 +90,8 @@ class SANDBOX_EXPORT SyscallSets {
+ #endif
+ 
+ #if defined(__i386__) || \
+-    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
++    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
++    defined(__powerpc64__)
+   // Big system V multiplexing system call.
+   static bool IsSystemVIpc(int sysno);
+ #endif
+--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf/syscall.cc
++++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf/syscall.cc
+@@ -18,7 +18,7 @@ namespace sandbox {
+ namespace {
+ 
+ #if defined(ARCH_CPU_X86_FAMILY) || defined(ARCH_CPU_ARM_FAMILY) || \
+-    defined(ARCH_CPU_MIPS_FAMILY)
++    defined(ARCH_CPU_MIPS_FAMILY) || defined (ARCH_CPU_PPC64_FAMILY)
+ // Number that's not currently used by any Linux kernel ABIs.
+ const int kInvalidSyscallNumber = 0x351d3;
+ #else
+@@ -312,10 +312,54 @@ asm(// We need to be able to tell the ke
+     "2:ret\n"
+     ".cfi_endproc\n"
+     ".size SyscallAsm, .-SyscallAsm\n"
++#elif defined(__powerpc64__)
++    ".text\n"
++    ".align 4\n"
++    ".type SyscallAsm @function\n"
++    "SyscallAsm:\n"
++    ".cfi_startproc\n"
++
++    // Check if r3 is negative
++    "cmpdi 3, 0\n"
++    "bgt 2f\n"
++
++    // Load address of 3f into r3 and return
++    "mflr 10\n"
++    "bl 1f\n"
++    "1: mflr 3\n"
++    "mtlr 10\n"
++    "addi 3, 3, 4*13\n"
++    "blr\n"
++
++    // Load arguments from array into r3-8
++    // save param 3 in r10
++    "2:\n"
++    "mr 0, 3\n"
++    "ld 3, 0(4)\n"
++    "ld 5, 16(4)\n"
++    "ld 6, 24(4)\n"
++    "ld 7, 32(4)\n"
++    "ld 8, 40(4)\n"
++    "ld 4, 8(4)\n"
++    "li 9, 0\n"
++
++    // Enter kernel
++    "sc\n"
++
++    // Magic return address
++    "3:\n"
++    // Like MIPS, ppc64 return values are always positive.
++    // Check for error in cr0.SO and negate upon error
++    "bc 4, 3, 4f\n"
++    "neg 3, 3\n"
++    "4: blr\n"
++
++    ".cfi_endproc\n"
++    ".size SyscallAsm, .-SyscallAsm\n"
+ #endif
+     );  // asm
+ 
+-#if defined(__x86_64__)
++#if defined(__x86_64__) || defined(__powerpc64__)
+ extern "C" {
+ intptr_t SyscallAsm(intptr_t nr, const intptr_t args[6]);
+ }
+@@ -429,6 +473,8 @@ intptr_t Syscall::Call(int nr,
+     ret = inout;
+   }
+ 
++#elif defined(__powerpc64__)
++  intptr_t ret = SyscallAsm(nr, args);
+ #else
+ #error "Unimplemented architecture"
+ #endif
+@@ -445,8 +491,26 @@ void Syscall::PutValueInUcontext(intptr_
+     // needs to be changed back.
+     ret_val = -ret_val;
+     SECCOMP_PARM4(ctx) = 1;
+-  } else
++  } else {
+     SECCOMP_PARM4(ctx) = 0;
++  }
++#endif
++#if defined(__powerpc64__)
++  // Same as MIPS, need to invert ret and set error register (cr0.SO)
++  if (ret_val <= -1 && ret_val >= -4095) {
++    ret_val = -ret_val;
++#ifdef __GLIBC__
++    ctx->uc_mcontext.regs->ccr |= (1 << 28);
++#else
++    ((struct pt_regs *)ctx->uc_mcontext.regs)->ccr |= (1 << 28);
++#endif
++  } else {
++#ifdef __GLIBC__
++    ctx->uc_mcontext.regs->ccr &= ~(1 << 28);
++#else
++    ((struct pt_regs *)ctx->uc_mcontext.regs)->ccr &= ~(1 << 28);
++#endif
++  }
+ #endif
+   SECCOMP_RESULT(ctx) = static_cast<greg_t>(ret_val);
+ }
+--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf/trap.cc
++++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf/trap.cc
+@@ -236,6 +236,20 @@ void Trap::SigSys(int nr, LinuxSigInfo*
+       SetIsInSigHandler();
+     }
+ 
++#if defined(__powerpc64__)
++    // On ppc64+glibc, some syscalls seem to accidentally negate the first
++    // parameter which causes checks against it to fail. For now, manually
++    // negate them back.
++    // TODO(shawn@anastas.io): investigate this issue further
++    auto nr = SECCOMP_SYSCALL(ctx);
++    if (nr == __NR_openat || nr == __NR_mkdirat || nr == __NR_faccessat || nr == __NR_readlinkat ||
++        nr == __NR_renameat || nr == __NR_renameat2 || nr == __NR_newfstatat || nr == __NR_unlinkat) {
++        if (static_cast<int>(SECCOMP_PARM1(ctx)) > 0) {
++            SECCOMP_PARM1(ctx) = -SECCOMP_PARM1(ctx);
++        }
++    }
++#endif
++
+     // Copy the seccomp-specific data into a arch_seccomp_data structure. This
+     // is what we are showing to TrapFnc callbacks that the system call
+     // evaluator registered with the sandbox.
+--- a/src/3rdparty/chromium/sandbox/linux/services/credentials.cc
++++ b/src/3rdparty/chromium/sandbox/linux/services/credentials.cc
+@@ -81,7 +81,7 @@ bool ChrootToSafeEmptyDir() {
+   pid_t pid = -1;
+   alignas(16) char stack_buf[PTHREAD_STACK_MIN];
+ #if defined(ARCH_CPU_X86_FAMILY) || defined(ARCH_CPU_ARM_FAMILY) || \
+-    defined(ARCH_CPU_MIPS_FAMILY)
++    defined(ARCH_CPU_MIPS_FAMILY) || defined(ARCH_CPU_PPC64_FAMILY)
+   // The stack grows downward.
+   void* stack = stack_buf + sizeof(stack_buf);
+ #else
+--- a/src/3rdparty/chromium/sandbox/linux/services/syscall_wrappers.cc
++++ b/src/3rdparty/chromium/sandbox/linux/services/syscall_wrappers.cc
+@@ -61,7 +61,7 @@ long sys_clone(unsigned long flags,
+ #if defined(ARCH_CPU_X86_64)
+   return syscall(__NR_clone, flags, child_stack, ptid, ctid, tls);
+ #elif defined(ARCH_CPU_X86) || defined(ARCH_CPU_ARM_FAMILY) || \
+-    defined(ARCH_CPU_MIPS_FAMILY)
++    defined(ARCH_CPU_MIPS_FAMILY) || defined(ARCH_CPU_PPC64_FAMILY)
+   // CONFIG_CLONE_BACKWARDS defined.
+   return syscall(__NR_clone, flags, child_stack, ptid, tls, ctid);
+ #endif
+--- a/src/3rdparty/chromium/sandbox/linux/syscall_broker/broker_process.cc
++++ b/src/3rdparty/chromium/sandbox/linux/syscall_broker/broker_process.cc
+@@ -165,7 +165,7 @@ bool BrokerProcess::IsSyscallBrokerable(
+ #if defined(__NR_fstatat64)
+     case __NR_fstatat64:
+ #endif
+-#if defined(__x86_64__) || defined(__aarch64__)
++#if defined(__x86_64__) || defined(__aarch64__) || defined(__powerpc64__)
+     case __NR_newfstatat:
+ #endif
+       return !fast_check || allowed_command_set_.test(COMMAND_STAT);
+--- a/src/3rdparty/chromium/sandbox/linux/system_headers/linux_seccomp.h
++++ b/src/3rdparty/chromium/sandbox/linux/system_headers/linux_seccomp.h
+@@ -41,6 +41,9 @@
+ #ifndef EM_AARCH64
+ #define EM_AARCH64 183
+ #endif
++#ifndef EM_PPC64
++#define EM_PPC64 21
++#endif
+ 
+ #ifndef __AUDIT_ARCH_64BIT
+ #define __AUDIT_ARCH_64BIT 0x80000000
+@@ -74,6 +77,14 @@
+ #define AUDIT_ARCH_AARCH64 (EM_AARCH64 | __AUDIT_ARCH_64BIT | __AUDIT_ARCH_LE)
+ #endif
+ 
++#ifndef AUDIT_ARCH_PPC64
++#define AUDIT_ARCH_PPC64 (EM_PPC64 | __AUDIT_ARCH_64BIT)
++#endif
++
++#ifndef AUDIT_ARCH_PPC64LE
++#define AUDIT_ARCH_PPC64LE (EM_PPC64 | __AUDIT_ARCH_64BIT | __AUDIT_ARCH_LE)
++#endif
++
+ // For prctl.h
+ #ifndef PR_SET_SECCOMP
+ #define PR_SET_SECCOMP               22
+--- a/src/3rdparty/chromium/sandbox/linux/system_headers/linux_signal.h
++++ b/src/3rdparty/chromium/sandbox/linux/system_headers/linux_signal.h
+@@ -13,7 +13,7 @@
+ // (not undefined, but defined different values and in different memory
+ // layouts). So, fill the gap here.
+ #if defined(__i386__) || defined(__x86_64__) || defined(__arm__) || \
+-    defined(__aarch64__)
++    defined(__aarch64__) || defined(__powerpc64__)
+ 
+ #define LINUX_SIGHUP 1
+ #define LINUX_SIGINT 2
+--- a/src/3rdparty/chromium/sandbox/linux/system_headers/linux_syscalls.h
++++ b/src/3rdparty/chromium/sandbox/linux/system_headers/linux_syscalls.h
+@@ -35,5 +35,9 @@
+ #include "sandbox/linux/system_headers/arm64_linux_syscalls.h"
+ #endif
+ 
++#if defined(__powerpc64__)
++#include "sandbox/linux/system_headers/ppc64_linux_syscalls.h"
++#endif
++
+ #endif  // SANDBOX_LINUX_SYSTEM_HEADERS_LINUX_SYSCALLS_H_
+ 
+--- a/src/3rdparty/chromium/sandbox/linux/system_headers/linux_ucontext.h
++++ b/src/3rdparty/chromium/sandbox/linux/system_headers/linux_ucontext.h
+@@ -11,6 +11,8 @@
+ #include "sandbox/linux/system_headers/arm_linux_ucontext.h"
+ #elif defined(__i386__)
+ #include "sandbox/linux/system_headers/i386_linux_ucontext.h"
++#elif defined(__powerpc64__)
++#include "sandbox/linux/system_headers/ppc64_linux_ucontext.h"
+ #else
+ #error "No support for your architecture in PNaCl header"
+ #endif
+--- a/src/3rdparty/chromium/sandbox/policy/linux/bpf_renderer_policy_linux.cc
++++ b/src/3rdparty/chromium/sandbox/policy/linux/bpf_renderer_policy_linux.cc
+@@ -15,6 +15,11 @@
+ #include "sandbox/linux/system_headers/linux_syscalls.h"
+ #include "sandbox/policy/linux/sandbox_linux.h"
+ 
++// On PPC64, TCGETS is defined in terms of struct termios, so we must include termios.h
++#ifdef __powerpc64__
++#include <termios.h>
++#endif
++
+ // TODO(vignatti): replace the local definitions below with #include
+ // <linux/dma-buf.h> once kernel version 4.6 becomes widely used.
+ #include <linux/types.h>
+--- a/src/3rdparty/chromium/third_party/angle/src/compiler/translator/InfoSink.h
++++ b/src/3rdparty/chromium/third_party/angle/src/compiler/translator/InfoSink.h
+@@ -93,7 +93,16 @@ class TInfoSinkBase
+             stream.precision(8);
+             stream << f;
+         }
+-        sink.append(stream.str());
++
++        // Hack to work around a bug where negative floating point values
++        // are rendered like '.0.5' instead of '-0.5'
++        std::string res(stream.str());
++
++        if (signbit(f)) { // test if f is negative
++            res[0] = '-';
++        }
++
++        sink.append(res);
+         return *this;
+     }
+     // Write boolean values as their names instead of integral value.
+--- a/src/3rdparty/chromium/third_party/angle/src/libANGLE/Constants.h
++++ b/src/3rdparty/chromium/third_party/angle/src/libANGLE/Constants.h
+@@ -9,6 +9,7 @@
+ #ifndef LIBANGLE_CONSTANTS_H_
+ #define LIBANGLE_CONSTANTS_H_
+ 
++#include <cstddef>
+ #include "common/platform.h"
+ 
+ #include <stdint.h>
+--- a/src/3rdparty/chromium/third_party/boringssl/BUILD.gn
++++ b/src/3rdparty/chromium/third_party/boringssl/BUILD.gn
+@@ -99,6 +99,13 @@ if (is_win && !is_msan && current_cpu !=
+       } else {
+         public_configs = [ ":no_asm_config" ]
+       }
++    } else if (current_cpu == "ppc64") {
++      if (is_linux) {
++        # TODO: ppc64 (be) check
++        sources += crypto_sources_linux_ppc64le
++      } else {
++        public_configs = [ ":no_asm_config" ]
++      }
+     } else {
+       public_configs = [ ":no_asm_config" ]
+     }
+--- a/src/3rdparty/chromium/third_party/breakpad/BUILD.gn
++++ b/src/3rdparty/chromium/third_party/breakpad/BUILD.gn
+@@ -623,7 +623,6 @@ if (is_linux || is_chromeos || is_androi
+       "breakpad/src/client/minidump_file_writer.h",
+       "breakpad/src/common/convert_UTF.cc",
+       "breakpad/src/common/convert_UTF.h",
+-      "breakpad/src/common/linux/breakpad_getcontext.S",
+       "breakpad/src/common/linux/elf_core_dump.cc",
+       "breakpad/src/common/linux/elf_core_dump.h",
+       "breakpad/src/common/linux/elfutils.cc",
+@@ -663,6 +662,15 @@ if (is_linux || is_chromeos || is_androi
+ 
+     libs = [ "dl" ]
+ 
++    if (current_cpu == "ppc64") {
++        defines = [ "HAVE_GETCONTEXT" ]
++        libs += [ "ucontext" ]
++    } else {
++        sources += [
++            "breakpad/src/common/linux/breakpad_getcontext.S"
++        ]
++    }
++
+     include_dirs = [
+       ".",
+       "breakpad/src",
+@@ -712,7 +720,6 @@ if (is_linux || is_chromeos || is_androi
+       "breakpad/src/client/linux/minidump_writer/minidump_writer_unittest.cc",
+       "breakpad/src/client/linux/minidump_writer/minidump_writer_unittest_utils.cc",
+       "breakpad/src/client/linux/minidump_writer/proc_cpuinfo_reader_unittest.cc",
+-      "breakpad/src/common/linux/breakpad_getcontext_unittest.cc",
+       "breakpad/src/common/linux/elf_core_dump_unittest.cc",
+       "breakpad/src/common/linux/file_id_unittest.cc",
+       "breakpad/src/common/linux/linux_libc_support_unittest.cc",
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/raw_context_cpu.h
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/raw_context_cpu.h
+@@ -44,6 +44,8 @@ typedef MDRawContextARM RawContextCPU;
+ typedef MDRawContextARM64_Old RawContextCPU;
+ #elif defined(__mips__)
+ typedef MDRawContextMIPS RawContextCPU;
++#elif defined(__powerpc64__)
++typedef MDRawContextPPC64 RawContextCPU;
+ #else
+ #error "This code has not been ported to your platform yet."
+ #endif
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.cc
+@@ -270,7 +270,54 @@ void ThreadInfo::FillCPUContext(RawConte
+   out->float_save.fir = mcontext.fpc_eir;
+ #endif
+ }
+-#endif  // __mips__
++
++#elif defined(__powerpc64__)
++
++#if !defined(__GLIBC__)
++#include <asm/elf.h>
++#include <asm/ptrace.h>
++#endif
++
++uintptr_t ThreadInfo::GetInstructionPointer() const {
++    return mcontext.gp_regs[PT_NIP];
++}
++
++void ThreadInfo::FillCPUContext(RawContextCPU* out) const {
++    out->context_flags = MD_CONTEXT_PPC64_FULL;
++    for (int i = 0; i < MD_CONTEXT_PPC64_GPR_COUNT; i++)
++        out->gpr[i] = mcontext.gp_regs[i];
++
++    out->lr = mcontext.gp_regs[PT_LNK];
++    out->srr0 = mcontext.gp_regs[PT_NIP];
++    out->srr1 = mcontext.gp_regs[PT_MSR];
++    out->cr = mcontext.gp_regs[PT_CCR];
++    out->xer = mcontext.gp_regs[PT_XER];
++    out->ctr = mcontext.gp_regs[PT_CTR];
++
++#ifdef __GLIBC__
++    for (int i = 0; i < MD_FLOATINGSAVEAREA_PPC_FPR_COUNT; i++)
++        out->float_save.fpregs[i] = mcontext.fp_regs[i];
++
++    out->float_save.fpscr = mcontext.fp_regs[NFPREG-1];
++#else
++    for (int i = 0; i < MD_FLOATINGSAVEAREA_PPC_FPR_COUNT; i++)
++        out->float_save.fpregs[i] = ((uint64_t *)&mcontext.fp_regs)[i];
++
++     out->float_save.fpscr = ((uint64_t *)&mcontext.fp_regs)[ELF_NFPREG-1];
++#endif
++
++    for (int i = 0; i < MD_VECTORSAVEAREA_PPC_VR_COUNT; i++)
++        out->vector_save.save_vr[i] = \
++            {(((uint64_t)vregs.vrregs[i][0]) << 32)
++                          | vregs.vrregs[i][1],
++            (((uint64_t)vregs.vrregs[i][2]) << 32)
++                         | vregs.vrregs[i][3]};
++
++    out->vrsave = vregs.vrsave;
++    out->vector_save.save_vscr = {0, vregs.vscr.vscr_word};
++    out->vector_save.save_vrvalid = 0xFFFFFFFF;
++}
++#endif  // __powerpc64__
+ 
+ void ThreadInfo::GetGeneralPurposeRegisters(void** gp_regs, size_t* size) {
+   assert(gp_regs || size);
+@@ -279,6 +326,11 @@ void ThreadInfo::GetGeneralPurposeRegist
+     *gp_regs = mcontext.gregs;
+   if (size)
+     *size = sizeof(mcontext.gregs);
++#elif defined(__powerpc64__)
++  if (gp_regs)
++    *gp_regs = mcontext.gp_regs;
++  if (size)
++    *size = sizeof(mcontext.gp_regs);
+ #else
+   if (gp_regs)
+     *gp_regs = &regs;
+@@ -294,6 +346,11 @@ void ThreadInfo::GetFloatingPointRegiste
+     *fp_regs = &mcontext.fpregs;
+   if (size)
+     *size = sizeof(mcontext.fpregs);
++#elif defined(__powerpc64__)
++  if (fp_regs)
++    *fp_regs = &mcontext.fp_regs;
++  if (size)
++    *size = sizeof(mcontext.fp_regs);
+ #else
+   if (fp_regs)
+     *fp_regs = &fpregs;
+@@ -302,4 +359,13 @@ void ThreadInfo::GetFloatingPointRegiste
+ #endif
+ }
+ 
++#if defined(__powerpc64__)
++void ThreadInfo::GetVectorRegisters(void** v_regs, size_t* size) {
++    if (v_regs)
++        *v_regs = &vregs;
++    if (size)
++        *size = sizeof(vregs);
++}
++#endif
++
+ }  // namespace google_breakpad
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.h
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.h
+@@ -68,6 +68,10 @@ struct ThreadInfo {
+   // Use the structures defined in <sys/user.h>
+   struct user_regs_struct regs;
+   struct user_fpsimd_struct fpregs;
++#elif defined(__powerpc64__)
++  // Use the structures defined in <sys/ucontext.h>.
++  mcontext_t mcontext;
++  vrregset_t vregs;
+ #elif defined(__mips__)
+   // Use the structure defined in <sys/ucontext.h>.
+   mcontext_t mcontext;
+@@ -84,6 +88,11 @@ struct ThreadInfo {
+ 
+   // Returns the pointer and size of float point register area.
+   void GetFloatingPointRegisters(void** fp_regs, size_t* size);
++
++#if defined(__powerpc64__)
++  // Returns the pointer and size of the vector register area. (PPC64 only)
++  void GetVectorRegisters(void** v_regs, size_t* size);
++#endif
+ };
+ 
+ }  // namespace google_breakpad
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc
+@@ -254,6 +254,60 @@ void UContextReader::FillCPUContext(RawC
+   out->float_save.fir = uc->uc_mcontext.fpc_eir;  // Unused.
+ #endif
+ }
++
++#elif defined(__powerpc64__)
++
++#ifndef __GLIBC__
++#include <asm/elf.h>
++#include <asm/ptrace.h>
++#endif
++
++uintptr_t UContextReader::GetStackPointer(const ucontext_t* uc) {
++    return uc->uc_mcontext.gp_regs[MD_CONTEXT_PPC64_REG_SP];
++}
++
++uintptr_t UContextReader::GetInstructionPointer(const ucontext_t* uc) {
++    return uc->uc_mcontext.gp_regs[PT_NIP];
++}
++
++void UContextReader::FillCPUContext(RawContextCPU* out, const ucontext_t* uc,
++                                    const vrregset_t* vregs) {
++    out->context_flags = MD_CONTEXT_PPC64_FULL;
++
++    for (int i = 0; i < MD_CONTEXT_PPC64_GPR_COUNT; i++)
++        out->gpr[i] = uc->uc_mcontext.gp_regs[i];
++
++    out->lr = uc->uc_mcontext.gp_regs[PT_LNK];
++    out->srr0 = uc->uc_mcontext.gp_regs[PT_NIP];
++    out->srr1 = uc->uc_mcontext.gp_regs[PT_MSR];
++    out->cr = uc->uc_mcontext.gp_regs[PT_CCR];
++    out->xer = uc->uc_mcontext.gp_regs[PT_XER];
++    out->ctr = uc->uc_mcontext.gp_regs[PT_CTR];
++
++#ifdef __GLIBC__
++    for (int i = 0; i < MD_FLOATINGSAVEAREA_PPC_FPR_COUNT; i++)
++        out->float_save.fpregs[i] = uc->uc_mcontext.fp_regs[i];
++
++    out->float_save.fpscr = uc->uc_mcontext.fp_regs[NFPREG-1];
++#else
++    for (int i = 0; i < MD_FLOATINGSAVEAREA_PPC_FPR_COUNT; i++)
++        out->float_save.fpregs[i] = ((uint64_t *)&uc->uc_mcontext.fp_regs)[i];
++
++    out->float_save.fpscr = ((uint64_t *)&uc->uc_mcontext.fp_regs)[ELF_NFPREG-1];
++#endif
++
++    for (int i = 0; i < MD_VECTORSAVEAREA_PPC_VR_COUNT; i++)
++        out->vector_save.save_vr[i] =
++            {(((uint64_t)vregs->vrregs[i][0]) << 32)
++                         | vregs->vrregs[i][1],
++             (((uint64_t)vregs->vrregs[i][2]) << 32)
++                         | vregs->vrregs[i][3]};
++
++    out->vrsave = vregs->vrsave;
++    out->vector_save.save_vscr = {0, vregs->vscr.vscr_word};
++    out->vector_save.save_vrvalid = 0xFFFFFFFF;
++}
++
+ #endif
+ 
+ }  // namespace google_breakpad
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h
+@@ -59,6 +59,9 @@ struct UContextReader {
+ #elif defined(__aarch64__)
+   static void FillCPUContext(RawContextCPU* out, const ucontext_t* uc,
+                              const struct fpsimd_context* fpregs);
++#elif defined(__powerpc64__)
++  static void FillCPUContext(RawContextCPU *out, const ucontext_t *uc,
++                             const vrregset_t* vregs);
+ #else
+   static void FillCPUContext(RawContextCPU* out, const ucontext_t* uc);
+ #endif
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc
+@@ -105,6 +105,13 @@
+ #define PR_SET_PTRACER 0x59616d61
+ #endif
+ 
++/* musl hack, can't include asm/ptrace.h as that causes conflicts */
++#ifndef __GLIBC__
++#if defined(__powerpc64__) && !defined(PT_NIP)
++#define PT_NIP 32
++#endif
++#endif
++
+ namespace google_breakpad {
+ 
+ namespace {
+@@ -461,9 +468,16 @@ bool ExceptionHandler::HandleSignal(int
+     memcpy(&g_crash_context_.float_state, fp_ptr,
+            sizeof(g_crash_context_.float_state));
+   }
++#elif defined(__powerpc64__)
++  // On PPC64, we must copy VR state
++  ucontext_t* uc_ptr = (ucontext_t*)uc;
++  if (uc_ptr->uc_mcontext.v_regs) {
++    memcpy(&g_crash_context_.vector_state, uc_ptr->uc_mcontext.v_regs,
++           sizeof(g_crash_context_.vector_state));
++  }
+ #elif !defined(__ARM_EABI__) && !defined(__mips__)
+   // FP state is not part of user ABI on ARM Linux.
+-  // In case of MIPS Linux FP state is already part of ucontext_t
++  // In case of MIPS, Linux FP state is already part of ucontext_t
+   // and 'float_state' is not a member of CrashContext.
+   ucontext_t* uc_ptr = (ucontext_t*)uc;
+   if (uc_ptr->uc_mcontext.fpregs) {
+@@ -708,11 +722,19 @@ bool ExceptionHandler::WriteMinidump() {
+   }
+ #endif
+ 
+-#if !defined(__ARM_EABI__) && !defined(__aarch64__) && !defined(__mips__)
++#if !defined(__ARM_EABI__) && !defined(__aarch64__) && !defined(__mips__) \
++    && !defined(__powerpc64__)
+   // FPU state is not part of ARM EABI ucontext_t.
+   memcpy(&context.float_state, context.context.uc_mcontext.fpregs,
+          sizeof(context.float_state));
+ #endif
++
++#if defined(__powerpc64__)
++  // Vector registers must be copied on PPC64
++  memcpy(&context.vector_state, context.context.uc_mcontext.v_regs,
++         sizeof(context.vector_state));
++#endif
++
+   context.tid = sys_gettid();
+ 
+   // Add an exception stream to the minidump for better reporting.
+@@ -733,6 +755,9 @@ bool ExceptionHandler::WriteMinidump() {
+ #elif defined(__mips__)
+   context.siginfo.si_addr =
+       reinterpret_cast<void*>(context.context.uc_mcontext.pc);
++#elif defined(__powerpc64__)
++  context.siginfo.si_addr =
++      reinterpret_cast<void*>(context.context.uc_mcontext.gp_regs[PT_NIP]);
+ #else
+ #error "This code has not been ported to your platform yet."
+ #endif
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.h
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.h
+@@ -192,7 +192,11 @@ class ExceptionHandler {
+     siginfo_t siginfo;
+     pid_t tid;  // the crashing thread.
+     ucontext_t context;
+-#if !defined(__ARM_EABI__) && !defined(__mips__)
++#if defined(__powerpc64__)
++    // PPC64's FP state is a part of ucontext_t like MIPS but the vector
++    // state is not, so a struct is needed.
++    vstate_t vector_state;
++#elif !defined(__ARM_EABI__) && !defined(__mips__)
+     // #ifdef this out because FP state is not part of user ABI for Linux ARM.
+     // In case of MIPS Linux FP state is already part of ucontext_t so
+     // 'float_state' is not required.
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler_unittest.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler_unittest.cc
+@@ -307,7 +307,7 @@ TEST(ExceptionHandlerTest, ParallelChild
+   }
+ 
+   // Wait a while until the child should have crashed.
+-  usleep(1000000);
++  usleep(2000000);
+   // Kill the child if it is still running.
+   kill(child, SIGKILL);
+ 
+@@ -559,6 +559,8 @@ const unsigned char kIllegalInstruction[
+ #if defined(__mips__)
+   // mfc2 zero,Impl - usually illegal in userspace.
+   0x48, 0x00, 0x00, 0x48
++#elif defined(__powerpc64__)
++  0x01, 0x01, 0x01, 0x01 // Crashes on a tested POWER9 cpu
+ #else
+   // This crashes with SIGILL on x86/x86-64/arm.
+   0xff, 0xff, 0xff, 0xff
+@@ -754,10 +756,10 @@ TEST(ExceptionHandlerTest, InstructionPo
+ 
+   // These are defined here so the parent can use them to check the
+   // data from the minidump afterwards.
+-  // Use 4k here because the OS will hand out a single page even
++  // Use the page size here because the OS will hand out a single page even
+   // if a smaller size is requested, and this test wants to
+   // test the upper bound of the memory range.
+-  const uint32_t kMemorySize = 4096;  // bytes
++  const uint32_t kMemorySize = getpagesize();  // bytes
+   const int kOffset = kMemorySize - sizeof(kIllegalInstruction);
+ 
+   const pid_t child = fork();
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/microdump_writer/microdump_writer.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/microdump_writer/microdump_writer.cc
+@@ -138,7 +138,9 @@ class MicrodumpWriter {
+                   const MicrodumpExtraInfo& microdump_extra_info,
+                   LinuxDumper* dumper)
+       : ucontext_(context ? &context->context : NULL),
+-#if !defined(__ARM_EABI__) && !defined(__mips__)
++#if defined(__powerpc64__)
++        vector_state_(context ? &context->vector_state : NULL),
++#elif !defined(__ARM_EABI__) && !defined(__mips__)
+         float_state_(context ? &context->float_state : NULL),
+ #endif
+         dumper_(dumper),
+@@ -337,6 +339,8 @@ class MicrodumpWriter {
+ # else
+ #  error "This mips ABI is currently not supported (n32)"
+ #endif
++#elif defined(__powerpc64__)
++    const char kArch[] = "ppc64";
+ #else
+ #error "This code has not been ported to your platform yet"
+ #endif
+@@ -409,7 +413,9 @@ class MicrodumpWriter {
+   void DumpCPUState() {
+     RawContextCPU cpu;
+     my_memset(&cpu, 0, sizeof(RawContextCPU));
+-#if !defined(__ARM_EABI__) && !defined(__mips__)
++#if defined(__powerpc64__)
++    UContextReader::FillCPUContext(&cpu, ucontext_, vector_state_);
++#elif !defined(__ARM_EABI__) && !defined(__mips__)
+     UContextReader::FillCPUContext(&cpu, ucontext_, float_state_);
+ #else
+     UContextReader::FillCPUContext(&cpu, ucontext_);
+@@ -605,7 +611,9 @@ class MicrodumpWriter {
+   void* Alloc(unsigned bytes) { return dumper_->allocator()->Alloc(bytes); }
+ 
+   const ucontext_t* const ucontext_;
+-#if !defined(__ARM_EABI__) && !defined(__mips__)
++#if defined(__powerpc64__)
++  const google_breakpad::vstate_t* const vector_state_;
++#elif !defined(__ARM_EABI__) && !defined(__mips__)
+   const google_breakpad::fpstate_t* const float_state_;
+ #endif
+   LinuxDumper* dumper_;
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/microdump_writer/microdump_writer_unittest.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/microdump_writer/microdump_writer_unittest.cc
+@@ -279,10 +279,19 @@ TEST(MicrodumpWriterTest, BasicWithMappi
+   CrashAndGetMicrodump(mappings, MicrodumpExtraInfo(), &buf);
+   ASSERT_TRUE(ContainsMicrodump(buf));
+ 
++  int page_size = getpagesize();
+ #ifdef __LP64__
+-  ASSERT_NE(std::string::npos,
+-            buf.find("M 0000000000001000 000000000000002A 0000000000001000 "
+-                     "33221100554477668899AABBCCDDEEFF0 libfoo.so"));
++  // This test is only available for the following page sizes
++  ASSERT_TRUE((page_size == 4096) || (page_size == 65536));
++  if (page_size == 4096) {
++    ASSERT_NE(std::string::npos,
++              buf.find("M 0000000000001000 000000000000002A 0000000000001000 "
++                       "33221100554477668899AABBCCDDEEFF0 libfoo.so"));
++  } else {
++    ASSERT_NE(std::string::npos,
++              buf.find("M 0000000000010000 000000000000002A 0000000000010000 "
++                       "33221100554477668899AABBCCDDEEFF0 libfoo.so"));
++  }
+ #else
+   ASSERT_NE(std::string::npos,
+             buf.find("M 00001000 0000002A 00001000 "
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_core_dumper.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_core_dumper.cc
+@@ -117,6 +117,9 @@ bool LinuxCoreDumper::GetThreadInfoByInd
+ #elif defined(__mips__)
+   stack_pointer =
+       reinterpret_cast<uint8_t*>(info->mcontext.gregs[MD_CONTEXT_MIPS_REG_SP]);
++#elif defined(__powerpc64__)
++  stack_pointer =
++      reinterpret_cast<uint8_t*>(info->mcontext.gp_regs[MD_CONTEXT_PPC64_REG_SP]);
+ #else
+ #error "This code hasn't been ported to your platform yet."
+ #endif
+@@ -212,7 +215,10 @@ bool LinuxCoreDumper::EnumerateThreads()
+         memset(&info, 0, sizeof(ThreadInfo));
+         info.tgid = status->pr_pgrp;
+         info.ppid = status->pr_ppid;
+-#if defined(__mips__)
++#if defined(__powerpc64__)
++        for (int i = 0; i < 31; i++)
++            info.mcontext.gp_regs[i] = status->pr_reg[i];
++#elif defined(__mips__)
+ #if defined(__ANDROID__)
+         for (int i = EF_R0; i <= EF_R31; i++)
+           info.mcontext.gregs[i - EF_R0] = status->pr_reg[i];
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper.cc
+@@ -765,7 +765,9 @@ bool LinuxDumper::GetStackInfo(const voi
+       reinterpret_cast<uint8_t*>(int_stack_pointer & ~(page_size - 1));
+ 
+   // The number of bytes of stack which we try to capture.
+-  static const ptrdiff_t kStackToCapture = 32 * 1024;
++  // This now depends on page_size to avoid missing data
++  // on systems with larger page sizes.
++  static const ptrdiff_t kStackToCapture = 8 * page_size;
+ 
+   const MappingInfo* mapping = FindMapping(stack_pointer);
+   if (!mapping)
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper.h
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper.h
+@@ -63,7 +63,8 @@ namespace google_breakpad {
+  (defined(__mips__) && _MIPS_SIM == _ABIO32)
+ typedef Elf32_auxv_t elf_aux_entry;
+ #elif defined(__x86_64) || defined(__aarch64__) || \
+-     (defined(__mips__) && _MIPS_SIM != _ABIO32)
++     (defined(__mips__) && _MIPS_SIM != _ABIO32) || \
++     defined(__powerpc64__)
+ typedef Elf64_auxv_t elf_aux_entry;
+ #endif
+ 
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper_unittest_helper.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper_unittest_helper.cc
+@@ -51,6 +51,8 @@
+ #define TID_PTR_REGISTER "rcx"
+ #elif defined(__mips__)
+ #define TID_PTR_REGISTER "$1"
++#elif defined(__powerpc64__)
++#define TID_PTR_REGISTER "r8"
+ #else
+ #error This test has not been ported to this platform.
+ #endif
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper.cc
+@@ -154,19 +154,27 @@ bool LinuxPtraceDumper::CopyFromProcess(
+   return true;
+ }
+ 
+-bool LinuxPtraceDumper::ReadRegisterSet(ThreadInfo* info, pid_t tid)
+-{
++bool LinuxPtraceDumper::ReadRegisterSet(ThreadInfo* info, pid_t tid) {
+ #ifdef PTRACE_GETREGSET
+   struct iovec io;
+   info->GetGeneralPurposeRegisters(&io.iov_base, &io.iov_len);
+-  if (sys_ptrace(PTRACE_GETREGSET, tid, (void*)NT_PRSTATUS, (void*)&io) == -1) {
++  if (ptrace(PTRACE_GETREGSET, tid, (void*)NT_PRSTATUS, (void*)&io) == -1) {
+     return false;
+   }
+ 
+   info->GetFloatingPointRegisters(&io.iov_base, &io.iov_len);
+-  if (sys_ptrace(PTRACE_GETREGSET, tid, (void*)NT_FPREGSET, (void*)&io) == -1) {
++  if (ptrace(PTRACE_GETREGSET, tid, (void*)NT_FPREGSET, (void*)&io) == -1) {
+     return false;
+   }
++
++#if defined(__powerpc64__)
++  // Grab the vector registers on PPC64 too
++  info->GetVectorRegisters(&io.iov_base, &io.iov_len);
++  if (ptrace(PTRACE_GETREGSET, tid, (void*)NT_PPC_VMX, (void*)&io) == -1) {
++    return false;
++  }
++#endif // defined(__powerpc64__)
++
+   return true;
+ #else
+   return false;
+@@ -303,6 +311,9 @@ bool LinuxPtraceDumper::GetThreadInfoByI
+ #elif defined(__mips__)
+   stack_pointer =
+       reinterpret_cast<uint8_t*>(info->mcontext.gregs[MD_CONTEXT_MIPS_REG_SP]);
++#elif defined(__powerpc64__)
++  stack_pointer =
++      reinterpret_cast<uint8_t*>(info->mcontext.gp_regs[MD_CONTEXT_PPC64_REG_SP]);
+ #else
+ #error "This code hasn't been ported to your platform yet."
+ #endif
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper_unittest.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper_unittest.cc
+@@ -462,6 +462,9 @@ TEST(LinuxPtraceDumperTest, VerifyStackR
+ #elif defined(__mips__)
+     pid_t* process_tid_location =
+         reinterpret_cast<pid_t*>(one_thread.mcontext.gregs[1]);
++#elif defined(__powerpc64__)
++    pid_t* process_tid_location =
++        reinterpret_cast<pid_t*>(one_thread.mcontext.gp_regs[8]);
+ #else
+ #error This test has not been ported to this platform.
+ #endif
+@@ -559,6 +562,8 @@ TEST_F(LinuxPtraceDumperTest, SanitizeSt
+   uintptr_t heap_addr = thread_info.regs.rcx;
+ #elif defined(__mips__)
+   uintptr_t heap_addr = thread_info.mcontext.gregs[1];
++#elif defined(__powerpc64__)
++  uintptr_t heap_addr = thread_info.mcontext.gp_regs[8];
+ #else
+ #error This test has not been ported to this platform.
+ #endif
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.cc
+@@ -136,7 +136,9 @@ class MinidumpWriter {
+       : fd_(minidump_fd),
+         path_(minidump_path),
+         ucontext_(context ? &context->context : NULL),
+-#if !defined(__ARM_EABI__) && !defined(__mips__)
++#if defined(__powerpc64__)
++        vector_state_(context ? &context->vector_state : NULL),
++#elif !defined(__ARM_EABI__) && !defined(__mips__)
+         float_state_(context ? &context->float_state : NULL),
+ #endif
+         dumper_(dumper),
+@@ -468,7 +470,9 @@ class MinidumpWriter {
+         if (!cpu.Allocate())
+           return false;
+         my_memset(cpu.get(), 0, sizeof(RawContextCPU));
+-#if !defined(__ARM_EABI__) && !defined(__mips__)
++#if defined(__powerpc64__)
++        UContextReader::FillCPUContext(cpu.get(), ucontext_, vector_state_);
++#elif !defined(__ARM_EABI__) && !defined(__mips__)
+         UContextReader::FillCPUContext(cpu.get(), ucontext_, float_state_);
+ #else
+         UContextReader::FillCPUContext(cpu.get(), ucontext_);
+@@ -897,7 +901,7 @@ class MinidumpWriter {
+     dirent->location.rva = 0;
+   }
+ 
+-#if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
++#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || defined(__powerpc64__)
+   bool WriteCPUInformation(MDRawSystemInfo* sys_info) {
+     char vendor_id[sizeof(sys_info->cpu.x86_cpu_info.vendor_id) + 1] = {0};
+     static const char vendor_id_name[] = "vendor_id";
+@@ -917,7 +921,9 @@ class MinidumpWriter {
+ 
+     // processor_architecture should always be set, do this first
+     sys_info->processor_architecture =
+-#if defined(__mips__)
++#if defined(__powerpc64__)
++        MD_CPU_ARCHITECTURE_PPC64;
++#elif defined(__mips__)
+ # if _MIPS_SIM == _ABIO32
+         MD_CPU_ARCHITECTURE_MIPS;
+ # elif _MIPS_SIM == _ABI64
+@@ -1333,7 +1339,9 @@ class MinidumpWriter {
+   const char* path_;  // Path to the file where the minidum should be written.
+ 
+   const ucontext_t* const ucontext_;  // also from the signal handler
+-#if !defined(__ARM_EABI__) && !defined(__mips__)
++#if defined(__powerpc64__)
++  const google_breakpad::vstate_t* const vector_state_;
++#elif !defined(__ARM_EABI__) && !defined(__mips__)
+   const google_breakpad::fpstate_t* const float_state_;  // ditto
+ #endif
+   LinuxDumper* dumper_;
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.h
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.h
+@@ -48,6 +48,8 @@ class ExceptionHandler;
+ 
+ #if defined(__aarch64__)
+ typedef struct fpsimd_context fpstate_t;
++#elif defined(__powerpc64__)
++typedef vrregset_t vstate_t;
+ #elif !defined(__ARM_EABI__) && !defined(__mips__)
+ typedef std::remove_pointer<fpregset_t>::type fpstate_t;
+ #endif
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer_unittest.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer_unittest.cc
+@@ -715,6 +715,12 @@ TEST(MinidumpWriterTest, InvalidStackPoi
+ #elif defined(__mips__)
+   context.context.uc_mcontext.gregs[MD_CONTEXT_MIPS_REG_SP] =
+       invalid_stack_pointer;
++#elif defined(__powerpc64__)
++  context.context.uc_mcontext.gp_regs[MD_CONTEXT_PPC64_REG_SP] =
++      invalid_stack_pointer;
++#elif defined(__powerpc64__)
++  context.context.uc_mcontext.gp_regs[MD_CONTEXT_PPC64_REG_SP] =
++      invalid_stack_pointer;
+ #else
+ # error "This code has not been ported to your platform yet."
+ #endif
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/common/linux/memory_mapped_file.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/common/linux/memory_mapped_file.cc
+@@ -65,8 +65,7 @@ bool MemoryMappedFile::Map(const char* p
+   }
+ 
+ #if defined(__x86_64__) || defined(__aarch64__) || \
+-   (defined(__mips__) && _MIPS_SIM == _ABI64)
+-
++   (defined(__mips__) && _MIPS_SIM == _ABI64) || defined(__powerpc64__)
+   struct kernel_stat st;
+   if (sys_fstat(fd, &st) == -1 || st.st_size < 0) {
+ #else
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/common/linux/memory_mapped_file_unittest.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/common/linux/memory_mapped_file_unittest.cc
+@@ -176,9 +176,10 @@ TEST_F(MemoryMappedFileTest, RemapAfterM
+ TEST_F(MemoryMappedFileTest, MapWithOffset) {
+   // Put more data in the test file this time. Offsets can only be
+   // done on page boundaries, so we need a two page file to test this.
+-  const int page_size = 4096;
+-  char data1[2 * page_size];
+-  size_t data1_size = sizeof(data1);
++  const int page_size = getpagesize();
++  char *data1 = static_cast<char*>(malloc(2 * page_size));
++  EXPECT_TRUE(data1 != NULL);
++  size_t data1_size = (2 * page_size);
+   for (size_t i = 0; i < data1_size; ++i) {
+     data1[i] = i & 0x7f;
+   }
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/common/memory_allocator_unittest.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/common/memory_allocator_unittest.cc
+@@ -57,8 +57,9 @@ TEST(PageAllocatorTest, LargeObject) {
+ 
+   EXPECT_EQ(0U, allocator.pages_allocated());
+   uint8_t* p = reinterpret_cast<uint8_t*>(allocator.Alloc(10000));
++  uint64_t expected_pages = 1 + ((10000 - 1) / getpagesize());
+   ASSERT_FALSE(p == NULL);
+-  EXPECT_EQ(3U, allocator.pages_allocated());
++  EXPECT_EQ(expected_pages, allocator.pages_allocated());
+   for (unsigned i = 1; i < 10; ++i) {
+     uint8_t* p = reinterpret_cast<uint8_t*>(allocator.Alloc(i));
+     ASSERT_FALSE(p == NULL);
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/processor/exploitability_linux.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/processor/exploitability_linux.cc
+@@ -202,12 +202,14 @@ bool ExploitabilityLinux::EndedOnIllegal
+   // Check architecture and set architecture variable to corresponding flag
+   // in objdump.
+   switch (context->GetContextCPU()) {
++#if defined(__i386) || defined(__x86_64)
+     case MD_CONTEXT_X86:
+       architecture = "i386";
+       break;
+     case MD_CONTEXT_AMD64:
+       architecture = "i386:x86-64";
+       break;
++#endif
+     default:
+       // Unsupported architecture. Note that ARM architectures are not
+       // supported because objdump does not support ARM.
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/processor/exploitability_unittest.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/processor/exploitability_unittest.cc
+@@ -104,6 +104,8 @@ ExploitabilityFor(const string& filename
+ }
+ 
+ TEST(ExploitabilityTest, TestWindowsEngine) {
++// The following tests are only executable on an x86-class linux machine.
++#if !defined(_WIN32) && (defined(__i386) || defined(__x86_64))
+   ASSERT_EQ(google_breakpad::EXPLOITABILITY_HIGH,
+             ExploitabilityFor("ascii_read_av.dmp"));
+   ASSERT_EQ(google_breakpad::EXPLOITABILITY_HIGH,
+@@ -136,9 +138,12 @@ TEST(ExploitabilityTest, TestWindowsEngi
+             ExploitabilityFor("read_av_clobber_write.dmp"));
+   ASSERT_EQ(google_breakpad::EXPLOITABILITY_LOW,
+             ExploitabilityFor("read_av_conditional.dmp"));
++#endif
+ }
+ 
+ TEST(ExploitabilityTest, TestLinuxEngine) {
++// The following tests are only executable on an x86-class linux machine.
++#if defined(__i386) || defined(__x86_64)
+   ASSERT_EQ(google_breakpad::EXPLOITABILITY_INTERESTING,
+             ExploitabilityFor("linux_null_read_av.dmp"));
+   ASSERT_EQ(google_breakpad::EXPLOITABILITY_HIGH,
+@@ -171,7 +176,8 @@ TEST(ExploitabilityTest, TestLinuxEngine
+             ExploitabilityFor("linux_executable_heap.dmp"));
+   ASSERT_EQ(google_breakpad::EXPLOITABILITY_HIGH,
+             ExploitabilityFor("linux_jmp_to_module_not_exe_region.dmp"));
+-#ifndef _WIN32
++#endif
++#if !defined(_WIN32) && (defined(__i386) || defined(__x86_64))
+   ASSERT_EQ(google_breakpad::EXPLOITABILITY_HIGH,
+             ExploitabilityFor("linux_write_to_nonwritable_module.dmp"));
+   ASSERT_EQ(google_breakpad::EXPLOITABILITY_HIGH,
+@@ -182,10 +188,10 @@ TEST(ExploitabilityTest, TestLinuxEngine
+             ExploitabilityFor("linux_write_to_outside_module_via_math.dmp"));
+   ASSERT_EQ(google_breakpad::EXPLOITABILITY_INTERESTING,
+             ExploitabilityFor("linux_write_to_under_4k.dmp"));
+-#endif  // _WIN32
++#endif  // !defined(_WIN32) && (!defined(__i386) && !defined(__x86_64))
+ }
+ 
+-#ifndef _WIN32
++#if !defined(_WIN32) && (defined(__i386) || defined(__x86_64))
+ TEST(ExploitabilityLinuxUtilsTest, DisassembleBytesTest) {
+   ASSERT_FALSE(ExploitabilityLinuxTest::DisassembleBytes("", NULL, 5, NULL));
+   uint8_t bytes[6] = {0xc7, 0x0, 0x5, 0x0, 0x0, 0x0};
+@@ -301,6 +307,7 @@ TEST(ExploitabilityLinuxUtilsTest, Calcu
+                                                          context,
+                                                          &write_address));
+ }
+-#endif  // _WIN32
++#endif  // !defined(_WIN32) && (defined(__i386) || defined(__x86_64))
++
+ 
+ }  // namespace
+--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/tools/linux/md2core/minidump-2-core.cc
++++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/tools/linux/md2core/minidump-2-core.cc
+@@ -77,6 +77,8 @@
+   #define ELF_ARCH  EM_MIPS
+ #elif defined(__aarch64__)
+   #define ELF_ARCH  EM_AARCH64
++#elif defined(__powerpc64__)
++  #define ELF_ARCH  EM_PPC64
+ #endif
+ 
+ #if defined(__arm__)
+@@ -87,6 +89,8 @@ typedef user_regs user_regs_struct;
+ #elif defined (__mips__)
+ // This file-local typedef simplifies the source code.
+ typedef gregset_t user_regs_struct;
++#elif defined(__powerpc64__)
++typedef struct pt_regs user_regs_struct;
+ #endif
+ 
+ using google_breakpad::MDTypeHelper;
+@@ -322,6 +326,12 @@ struct CrashedProcess {
+ #if defined(__aarch64__)
+     user_fpsimd_struct fpregs;
+ #endif
++#if defined(__powerpc64__)
++    mcontext_t mcontext;
++#endif
++#if defined(__powerpc64__)
++    mcontext_t mcontext;
++#endif
+     uintptr_t stack_addr;
+     const uint8_t* stack;
+     size_t stack_length;
+@@ -535,6 +545,38 @@ ParseThreadRegisters(CrashedProcess::Thr
+   thread->mcontext.fpc_eir = rawregs->float_save.fir;
+ #endif
+ }
++#elif defined(__powerpc64__)
++static void
++ParseThreadRegisters(CrashedProcess::Thread* thread,
++                     const MinidumpMemoryRange& range) {
++  const MDRawContextPPC64* rawregs = range.GetData<MDRawContextPPC64>(0);
++
++  for (int i = 0; i < MD_CONTEXT_PPC64_GPR_COUNT; i++)
++    thread->mcontext.gp_regs[i] = rawregs->gpr[i];
++
++  thread->mcontext.gp_regs[PT_LNK] = rawregs->lr;
++  thread->mcontext.gp_regs[PT_NIP] = rawregs->srr0;
++  thread->mcontext.gp_regs[PT_MSR] = rawregs->srr1;
++  thread->mcontext.gp_regs[PT_CCR] = rawregs->cr;
++  thread->mcontext.gp_regs[PT_XER] = rawregs->xer;
++  thread->mcontext.gp_regs[PT_CTR] = rawregs->ctr;
++  thread->mcontext.v_regs->vrsave = rawregs->vrsave;
++
++  for (int i = 0; i < MD_FLOATINGSAVEAREA_PPC_FPR_COUNT; i++)
++      thread->mcontext.fp_regs[i] = rawregs->float_save.fpregs[i];
++
++  thread->mcontext.fp_regs[NFPREG-1] = rawregs->float_save.fpscr;
++
++  for (int i = 0; i < MD_VECTORSAVEAREA_PPC_VR_COUNT; i++) {
++      thread->mcontext.v_regs->vrregs[i][0] = rawregs->vector_save.save_vr[i].high >> 32;
++      thread->mcontext.v_regs->vrregs[i][1] = rawregs->vector_save.save_vr[i].high;
++      thread->mcontext.v_regs->vrregs[i][2] = rawregs->vector_save.save_vr[i].low >> 32;
++      thread->mcontext.v_regs->vrregs[i][3] = rawregs->vector_save.save_vr[i].low;
++  }
++
++  thread->mcontext.v_regs->vscr.vscr_word = rawregs->vector_save.save_vscr.low & 0xFFFFFFFF;
++}
++
+ #else
+ #error "This code has not been ported to your platform yet"
+ #endif
+@@ -623,6 +665,12 @@ ParseSystemInfo(const Options& options,
+ # else
+ #  error "This mips ABI is currently not supported (n32)"
+ # endif
++#elif defined(__powerpc64__)
++  if (sysinfo->processor_architecture != MD_CPU_ARCHITECTURE_PPC64) {
++    fprintf(stderr,
++            "This version of minidump-2-core only supports PPC64.\n");
++    exit(1);
++  }
+ #else
+ #error "This code has not been ported to your platform yet"
+ #endif
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/CONTRIBUTORS
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/CONTRIBUTORS
+@@ -13,3 +13,4 @@ Mark Mentovai <mark@chromium.org>
+ Robert Sesek <rsesek@chromium.org>
+ Scott Graham <scottmg@chromium.org>
+ Joshua Peraza <jperaza@chromium.org>
++Shawn Anastasio <shawn@anastas.io>
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/compat/linux/sys/user.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/compat/linux/sys/user.h
+@@ -15,6 +15,7 @@
+ #ifndef CRASHPAD_COMPAT_LINUX_SYS_USER_H_
+ #define CRASHPAD_COMPAT_LINUX_SYS_USER_H_
+ 
++#include <cstddef>
+ #include_next <sys/user.h>
+ 
+ #include <features.h>
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/minidump/minidump_context.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/minidump/minidump_context.h
+@@ -592,6 +592,70 @@ struct MinidumpContextMIPS64 {
+   uint64_t fir;
+ };
+ 
++//! \brief ppc64-specific flags for MinidumpPPC64::context_flags
++//! Based on minidump_cpu_ppc64.h from breakpad
++enum MinidumpContextPPC64Flags : uint32_t {
++  //! \brief Identifies the context as PPC64.
++  kMinidumpContextPPC64 = 0x01000000,
++
++  //! \brief Indicates the validity of general purpose registers.
++  //!
++  //! Registers `r0`-`r31`, `nip`, `msr`, `lr`, etc. are valid.
++  kMinidumpContextPPC64Base = kMinidumpContextPPC64 | 0x00000001,
++
++  //! \brief Indicates the validity of floating point registers.
++  //!
++  //! Registers `fp0`-`fp31`, `fpscr` are valid.
++  kMinidumpContextPPC64Floating = kMinidumpContextPPC64 | 0x00000008,
++
++  //! \brief Indicates the validity of Altivec/VMX registers.
++  //!
++  //! Registers `v0`-`v31`, `vscr`, `vrsave`.
++  kMinidumpContextPPC64Vector = kMinidumpContextPPC64 | 0x00000020,
++
++  //! \brief Indicates the validity of all registers
++  kMinidumpContextPPC64All = kMinidumpContextPPC64Base     |
++                             kMinidumpContextPPC64Floating |
++                             kMinidumpContextPPC64Vector
++};
++
++//! \brief A PPC64 CPU context carried in a minidump file.
++//! Based on minidump_cpu_ppc64.h from breakpad.
++struct MinidumpContextPPC64 {
++  uint64_t context_flags;
++
++  //! \brief General purpose registers.
++  uint64_t nip;
++  uint64_t msr;
++  uint64_t regs[32];
++  uint64_t ccr;
++  uint64_t xer;
++  uint64_t lnk;
++  uint64_t ctr;
++
++  //! \brief Floating point registers.
++  double fpregs[32];
++
++  //! \brief FPU status register.
++  double fpscr;
++
++  //! \brief Altivec/VMX vector registers.
++  struct {
++      //! \brief Vector registers are 128bits.
++      uint128_struct save_vr[32];
++      uint128_struct save_vscr;
++
++      //! \brief Padding included for breakpad compatibiltiy.
++      uint32_t save_pad5[4];
++
++      //! \brief VRSAVE register.
++      uint32_t save_vrsave;
++
++      //! \brief Padding included for breakpad compatibiltiy.
++      uint32_t save_pad6[7];
++  } vregs;
++};
++
+ }  // namespace crashpad
+ 
+ #endif  // CRASHPAD_MINIDUMP_MINIDUMP_CONTEXT_H_
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/minidump/minidump_context_writer.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/minidump/minidump_context_writer.cc
+@@ -101,6 +101,13 @@ MinidumpContextWriter::CreateFromSnapsho
+       break;
+     }
+ 
++    case kCPUArchitecturePPC64: {
++      context = std::make_unique<MinidumpContextPPC64Writer>();
++      reinterpret_cast<MinidumpContextPPC64Writer*>(context.get())
++          ->InitalizeFromSnapshot(context_snapshot->ppc64);
++      break;
++    }
++
+     default: {
+       LOG(ERROR) << "unknown context architecture "
+                  << context_snapshot->architecture;
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/minidump/minidump_context_writer.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/minidump/minidump_context_writer.h
+@@ -315,6 +315,45 @@ class MinidumpContextMIPS64Writer final
+   DISALLOW_COPY_AND_ASSIGN(MinidumpContextMIPS64Writer);
+ };
+ 
++class MinidumpContextPPC64Writer final : public MinidumpContextWriter {
++ public:
++  MinidumpContextPPC64Writer();
++  ~MinidumpContextPPC64Writer() override;
++
++  //! \brief Initalizes the MinidumpContextPPC64 based on \a context_snapshot.
++  //!
++  //! \param[in] context_snapshot The context snapshot to use as source data.
++  //!
++  //! \note Valid in #kStateMutable. No mutation of context() may be done before
++  //!     calling this method, and it is not normally necessary to alter
++  //!     context() after calling this method.
++  void InitalizeFromSnapshot(const CPUContextPPC64* context_snapshot);
++
++  //! \brief Returns a pointer to the context structure that this object will
++  //!     write.
++  //!
++  //! \attention This returns a non-`const` pointer to this object’s private
++  //!     data so that a caller can populate the context structure directly.
++  //!     This is done because providing setter interfaces to each field in the
++  //!     context structure would be unwieldy and cumbersome. Care must be taken
++  //!     to populate the context structure correctly. The context structure
++  //!     must only be modified while this object is in the #kStateMutable
++  //!     state.
++  MinidumpContextPPC64* context() { return &context_; }
++
++ protected:
++  // MinidumpWritable:
++  bool WriteObject(FileWriterInterface* file_writer) override;
++
++  // MinidumpContextWriter:
++  size_t ContextSize() const override;
++
++ private:
++  MinidumpContextPPC64 context_;
++
++  DISALLOW_COPY_AND_ASSIGN(MinidumpContextPPC64Writer);
++};
++
+ }  // namespace crashpad
+ 
+ #endif  // CRASHPAD_MINIDUMP_MINIDUMP_CONTEXT_WRITER_H_
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/minidump/minidump_context_writer_test.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/minidump/minidump_context_writer_test.cc
+@@ -213,6 +213,21 @@ TEST(MinidumpContextWriter, MIPS64_FromS
+       context, ExpectMinidumpContextMIPS64, kSeed);
+ }
+ 
++TEST(MinidumpContextWriter, PPC64_Zeros) {
++  EmptyContextTest<MinidumpContextPPC64Writer, MinidumpContextPPC64>(
++    ExpectMinidumpContextPPC64);
++}
++
++TEST(MinidumpContextWriter, PPC64_FromSnapshot) {
++  constexpr uint32_t kSeed = 64;
++  CPUContextPPC64 context_ppc64;
++  CPUContext context;
++  context.ppc64 = &context_ppc64;
++  InitializeCPUContextPPC64(&context, kSeed);
++  FromSnapshotTest<MinidumpContextPPC64Writer, MinidumpContextPPC64>(
++      context, ExpectMinidumpContextPPC64, kSeed);
++}
++
+ }  // namespace
+ }  // namespace test
+ }  // namespace crashpad
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/minidump/minidump_misc_info_writer.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/minidump/minidump_misc_info_writer.cc
+@@ -135,6 +135,8 @@ std::string MinidumpMiscInfoDebugBuildSt
+   static constexpr char kCPU[] = "mips";
+ #elif defined(ARCH_CPU_MIPS64EL)
+   static constexpr char kCPU[] = "mips64";
++#elif defined(ARCH_CPU_PPC64)
++  static constexpr char kCPU[] = "ppc64";
+ #else
+ #error define kCPU for this CPU
+ #endif
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/capture_memory.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/capture_memory.cc
+@@ -112,6 +112,11 @@ void CaptureMemory::PointedToByContext(c
+   for (size_t i = 0; i < base::size(context.mipsel->regs); ++i) {
+     MaybeCaptureMemoryAround(delegate, context.mipsel->regs[i]);
+   }
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++  MaybeCaptureMemoryAround(delegate, context.ppc64->nip);
++  for (size_t i = 0; i < base::size(context.ppc64->regs); ++i) {
++    MaybeCaptureMemoryAround(delegate, context.ppc64->regs[i]);
++  }
+ #else
+ #error Port.
+ #endif
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/cpu_architecture.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/cpu_architecture.h
+@@ -43,7 +43,10 @@ enum CPUArchitecture {
+   kCPUArchitectureMIPSEL,
+ 
+   //! \brief 64-bit MIPSEL.
+-  kCPUArchitectureMIPS64EL
++  kCPUArchitectureMIPS64EL,
++
++  //! \brief 64-bit PPC64.
++  kCPUArchitecturePPC64
+ };
+ 
+ }  // namespace crashpad
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/cpu_context.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/cpu_context.cc
+@@ -169,6 +169,8 @@ uint64_t CPUContext::InstructionPointer(
+       return arm->pc;
+     case kCPUArchitectureARM64:
+       return arm64->pc;
++    case kCPUArchitecturePPC64:
++      return ppc64->nip;
+     default:
+       NOTREACHED();
+       return ~0ull;
+@@ -185,6 +187,8 @@ uint64_t CPUContext::StackPointer() cons
+       return arm->sp;
+     case kCPUArchitectureARM64:
+       return arm64->sp;
++    case kCPUArchitecturePPC64:
++      return ppc64->regs[1];
+     default:
+       NOTREACHED();
+       return ~0ull;
+@@ -196,6 +200,7 @@ bool CPUContext::Is64Bit() const {
+     case kCPUArchitectureX86_64:
+     case kCPUArchitectureARM64:
+     case kCPUArchitectureMIPS64EL:
++    case kCPUArchitecturePPC64:
+       return true;
+     case kCPUArchitectureX86:
+     case kCPUArchitectureARM:
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/cpu_context.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/cpu_context.h
+@@ -352,6 +352,24 @@ struct CPUContextMIPS64 {
+   uint64_t fir;
+ };
+ 
++//! \brief A context structure carrying PPC64 CPU state.
++struct CPUContextPPC64 {
++  uint64_t nip;
++  uint64_t msr;
++  uint64_t regs[32];
++  uint64_t ccr;
++  uint64_t xer;
++  uint64_t lnk;
++  uint64_t ctr;
++  double fpregs[32];
++  double fpscr;
++  struct {
++    uint128_struct save_vr[32];
++    uint128_struct save_vscr;
++    uint32_t save_vrsave;
++  } vregs;
++};
++
+ //! \brief A context structure capable of carrying the context of any supported
+ //!     CPU architecture.
+ struct CPUContext {
+@@ -382,6 +400,7 @@ struct CPUContext {
+     CPUContextARM64* arm64;
+     CPUContextMIPS* mipsel;
+     CPUContextMIPS64* mips64;
++    CPUContextPPC64* ppc64;
+   };
+ };
+ 
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/cpu_context_linux.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/cpu_context_linux.h
+@@ -15,6 +15,7 @@
+ #ifndef CRASHPAD_SNAPSHOT_LINUX_CPU_CONTEXT_LINUX_H_
+ #define CRASHPAD_SNAPSHOT_LINUX_CPU_CONTEXT_LINUX_H_
+ 
++#include <cstring>
+ #include "build/build_config.h"
+ #include "snapshot/cpu_context.h"
+ #include "snapshot/linux/signal_context.h"
+@@ -174,6 +175,76 @@ void InitializeCPUContextMIPS(
+ 
+ #endif  // ARCH_CPU_MIPS_FAMILY || DOXYGEN
+ 
++#if defined(ARCH_CPU_PPC64_FAMILY) || DOXYGEN
++
++//! \brief Initalizes a CPUContextPPC64 structure from native context
++//!     structures on Linux.
++//!
++//! \param[in] thread_context The native thread context.
++//! \param[in] float_context The native float context.
++//! \param[in] vector_context The native vector context.
++//! \param[out] context The CPUContextPPC64 structure to initalize.
++template <typename Traits>
++void InitializeCPUContextPPC64(
++    const ThreadContext::t64_t& thread_context,
++    const FloatContext::f64_t& float_context,
++    const VectorContext::v64_t& vector_context,
++    typename Traits::CPUContext* context) {
++
++  memcpy(context->regs, thread_context.gpr, sizeof(context->regs));
++  context->nip = thread_context.nip;
++  context->msr = thread_context.msr;
++  context->ccr = thread_context.ccr;
++  context->xer = thread_context.xer;
++  context->lnk = thread_context.lnk;
++  context->ctr = thread_context.ctr;
++
++  memcpy(context->fpregs, float_context.fpregs, sizeof(context->fpregs));
++  context->fpscr = float_context.fpscr;
++
++  for (uint8_t i = 0; i < 32; i++) {
++    context->vregs.save_vr[i] = {
++      (((uint64_t)vector_context.vrregs[i][0]) << 32) |
++        vector_context.vrregs[i][1],
++      (((uint64_t)vector_context.vrregs[i][2]) << 32) |
++        vector_context.vrregs[i][3]
++    };
++  }
++  context->vregs.save_vrsave = vector_context.vrsave;
++  context->vregs.save_vscr = {0, (uint64_t)vector_context.vscr.vscr_word};
++}
++
++template <typename Traits>
++void InitializeCPUContextPPC64(
++    const SignalThreadContext64 &thread_context,
++    const SignalFloatContext64 &float_context,
++    const SignalVectorContext64 &vector_context,
++    typename Traits::CPUContext* context) {
++
++  memcpy(context->regs, thread_context.regs, sizeof(context->regs));
++  context->nip = thread_context.nip;
++  context->msr = thread_context.msr;
++  context->ccr = thread_context.ccr;
++  context->xer = thread_context.xer;
++  context->lnk = thread_context.lnk;
++  context->ctr = thread_context.ctr;
++
++  memcpy(context->fpregs, float_context.regs, sizeof(context->fpregs));
++  context->fpscr = float_context.fpscr;
++
++  for (uint8_t i = 0; i < 32; i++) {
++    context->vregs.save_vr[i] = {
++      (((uint64_t)vector_context.vrregs[i][0]) << 32) |
++        vector_context.vrregs[i][1],
++      (((uint64_t)vector_context.vrregs[i][2]) << 32) |
++        vector_context.vrregs[i][3]
++    };
++  }
++  context->vregs.save_vrsave = vector_context.vrsave;
++  context->vregs.save_vscr = {0, (uint64_t)vector_context.vscr.vscr_word};
++}
++
++#endif
+ }  // namespace internal
+ }  // namespace crashpad
+ 
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/debug_rendezvous_test.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/debug_rendezvous_test.cc
+@@ -192,6 +192,8 @@ void TestAgainstTarget(PtraceConnection*
+               device == 0 && inode == 0 && mapping_name == "[vdso]";
+ #if defined(ARCH_CPU_X86)
+           static constexpr char kPrefix[] = "linux-gate.so.";
++#elif defined(ARCH_CPU_PPC64)
++          static constexpr char kPrefix[] = "linux-vdso64.so.";
+ #else
+           static constexpr char kPrefix[] = "linux-vdso.so.";
+ #endif
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux.cc
+@@ -323,6 +323,69 @@ bool ExceptionSnapshotLinux::ReadContext
+       reader, context_address, context_.mips64);
+ }
+ 
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++
++template <typename Traits>
++static bool ReadContext(ProcessReaderLinux* reader,
++                        LinuxVMAddress context_address,
++                        typename Traits::CPUContext* dest_context) {
++  const ProcessMemory* memory = reader->Memory();
++
++  LinuxVMAddress gp_regs_address = context_address +
++                                   offsetof(UContext, mcontext) +
++                                   offsetof(typename Traits::MContext, gp_regs);
++
++  typename Traits::SignalThreadContext thread_context;
++  if (!memory->Read(gp_regs_address, sizeof(thread_context), &thread_context)) {
++    LOG(ERROR) << "Couldn't read gp_regs!";
++    return false;
++  }
++
++  LinuxVMAddress fp_regs_address = context_address +
++                                   offsetof(UContext, mcontext) +
++                                   offsetof(typename Traits::MContext, fp_regs);
++
++  typename Traits::SignalFloatContext fp_context;
++  if (!memory->Read(fp_regs_address, sizeof(fp_context), &fp_context)) {
++    LOG(ERROR) << "Couldn't read fp_regs!";
++    return false;
++  }
++
++  LinuxVMAddress v_regs_ptr_address = context_address +
++                                  offsetof(UContext, mcontext) +
++                                  offsetof(typename Traits::MContext, vmx_reserve) + 8;
++
++  typename Traits::SignalVectorContext v_context;
++  if (!memory->Read(v_regs_ptr_address, sizeof(v_context), &v_context)) {
++    LOG(ERROR) << "Couldn't read v_regs!";
++    return false;
++  }
++
++  InitializeCPUContextPPC64<ContextTraits64>(thread_context, fp_context,
++                            v_context, dest_context);
++
++  return true;
++}
++
++template<>
++bool ExceptionSnapshotLinux::ReadContext<ContextTraits64>(
++    ProcessReaderLinux* reader,
++    LinuxVMAddress context_address) {
++  context_.architecture = kCPUArchitecturePPC64;
++  context_.ppc64 = &context_union_.ppc64;
++
++  return internal::ReadContext<ContextTraits64>(
++      reader, context_address, context_.ppc64);
++}
++
++template<>
++bool ExceptionSnapshotLinux::ReadContext<ContextTraits32>(
++    ProcessReaderLinux* reader,
++    LinuxVMAddress context_address) {
++  // PPC64 is 64-bit
++  return false;
++}
++
+ #endif  // ARCH_CPU_X86_FAMILY
+ 
+ bool ExceptionSnapshotLinux::Initialize(ProcessReaderLinux* process_reader,
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux.h
+@@ -84,6 +84,8 @@ class ExceptionSnapshotLinux final : pub
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+     CPUContextMIPS mipsel;
+     CPUContextMIPS64 mips64;
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++    CPUContextPPC64 ppc64;
+ #endif
+   } context_union_;
+   CPUContext context_;
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux_test.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux_test.cc
+@@ -296,7 +296,28 @@ void ExpectContext(const CPUContext& act
+             0);
+ #undef CPU_ARCH_NAME
+ }
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++using NativeCPUContext = ucontext_t;
+ 
++void InitializeContext(NativeCPUContext* context) {
++  for (size_t reg = 0; reg < 32; ++reg) {
++    context->uc_mcontext.gp_regs[reg] = reg;
++  }
++
++  memset(&context->uc_mcontext.fp_regs, 44,
++      sizeof(context->uc_mcontext.fp_regs));
++}
++
++void ExpectContext(const CPUContext& actual, const NativeCPUContext& expected) {
++  EXPECT_EQ(actual.architecture, kCPUArchitecturePPC64);
++
++  for (size_t reg = 0; reg < 32; ++reg) {
++    EXPECT_EQ(actual.ppc64->regs[reg], expected.uc_mcontext.gp_regs[reg]);
++  }
++
++  EXPECT_EQ(memcmp(actual.ppc64->fpregs, expected.uc_mcontext.fp_regs,
++            sizeof(actual.ppc64->fpregs)), 0);
++}
+ #else
+ #error Port.
+ #endif
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/process_reader_linux.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/process_reader_linux.cc
+@@ -108,6 +108,8 @@ void ProcessReaderLinux::Thread::Initial
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+   stack_pointer = reader->Is64Bit() ? thread_info.thread_context.t64.regs[29]
+                                     : thread_info.thread_context.t32.regs[29];
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++  stack_pointer = thread_info.thread_context.t64.gpr[1];
+ #else
+ #error Port.
+ #endif
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/signal_context.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/signal_context.h
+@@ -422,6 +422,93 @@ static_assert(offsetof(UContext<ContextT
+               "context offset mismatch");
+ #endif
+ 
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++
++struct SignalThreadContext64 {
++  uint64_t regs[32];
++  uint64_t nip;
++  uint64_t msr;
++  uint64_t orig_r3;
++  uint64_t ctr;
++  uint64_t lnk;
++  uint64_t xer;
++  uint64_t ccr;
++  uint64_t softe;
++  uint64_t trap;
++  uint64_t dar;
++  uint64_t dsisr;
++  uint64_t result;
++  uint64_t dscr;
++  uint64_t fpr0[3];
++};
++
++struct SignalFloatContext64 {
++  double regs[32];
++  double fpscr;
++};
++
++struct SignalVectorContext64 {
++  int32_t vrregs[32][4];
++  struct {
++    int32_t __pad[3];
++    int32_t vscr_word;
++  } vscr;
++  int32_t vrsave;
++  int32_t __pad[3];
++} __attribute__((__aligned__(16)));
++
++
++#pragma pack(pop)
++struct MContext64 {
++  uint64_t reserved[4];
++  int32_t signal;
++  int32_t __pad0;
++  uint64_t handler;
++  uint64_t oldmask;
++  uint64_t pt_regs_ptr;
++  SignalThreadContext64 gp_regs;
++  SignalFloatContext64  fp_regs;
++  SignalVectorContext64 *v_regs;
++#ifdef __GLIBC__
++  int64_t vmx_reserve[69];
++#else
++  int64_t vmx_reserve[101];
++#endif
++};
++
++struct ContextTraits64 : public Traits64 {
++  using MContext = MContext64;
++  using SignalThreadContext = SignalThreadContext64;
++  using SignalFloatContext = SignalFloatContext64;
++  using SignalVectorContext = SignalVectorContext64;
++  using CPUContext = CPUContextPPC64;
++};
++
++struct ContextTraits32 : public Traits32 {};
++
++struct UContext {
++  uint64_t flags;
++  uint64_t link;
++  SignalStack<ContextTraits64> stack;
++  Sigset<ContextTraits64> sigmask;
++  MContext64 mcontext;
++};
++#pragma pack(push, 1)
++
++static_assert(sizeof(UContext) == sizeof(ucontext_t),
++              "ucontext_t size mismatch");
++static_assert(sizeof(MContext64) == sizeof(mcontext_t),
++              "mcontext_t size mismatch");
++static_assert(sizeof(SignalThreadContext64) == sizeof(gregset_t),
++              "gregset_t size mismatch");
++static_assert(sizeof(SignalFloatContext64) == sizeof(fpregset_t),
++              "fpregset_t size mismatch");
++static_assert(sizeof(SignalVectorContext64) == sizeof(vrregset_t),
++              "vrregset_t size mismatch");
++static_assert(offsetof(UContext, mcontext) ==
++              offsetof(ucontext_t, uc_mcontext), "mcontext offset mismatch");
++static_assert(offsetof(MContext64, gp_regs) ==
++              offsetof(mcontext_t, gp_regs), "gp_regs offset mismatch");
+ #else
+ #error Port.
+ #endif  // ARCH_CPU_X86_FAMILY
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/system_snapshot_linux.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/system_snapshot_linux.cc
+@@ -204,6 +204,8 @@ CPUArchitecture SystemSnapshotLinux::Get
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+   return process_reader_->Is64Bit() ? kCPUArchitectureMIPS64EL
+                                     : kCPUArchitectureMIPSEL;
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++  return kCPUArchitecturePPC64;
+ #else
+ #error port to your architecture
+ #endif
+@@ -219,6 +221,9 @@ uint32_t SystemSnapshotLinux::CPURevisio
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+   // Not implementable on MIPS
+   return 0;
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++  // Not yet implemented on PPC64
++  return 0;
+ #else
+ #error port to your architecture
+ #endif
+@@ -239,6 +244,9 @@ std::string SystemSnapshotLinux::CPUVend
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+   // Not implementable on MIPS
+   return std::string();
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++  // Not yet implemented on PPC64
++  return std::string();
+ #else
+ #error port to your architecture
+ #endif
+@@ -372,6 +380,9 @@ bool SystemSnapshotLinux::NXEnabled() co
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+   // Not implementable on MIPS
+   return false;
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++  // Not yet implemented on PPC64
++  return false;
+ #else
+ #error Port.
+ #endif  // ARCH_CPU_X86_FAMILY
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/test_modules.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/test_modules.cc
+@@ -110,6 +110,8 @@ bool WriteTestModule(const base::FilePat
+   module.ehdr.e_machine = EM_AARCH64;
+ #elif defined(ARCH_CPU_MIPSEL) || defined(ARCH_CPU_MIPS64EL)
+   module.ehdr.e_machine = EM_MIPS;
++#elif defined(ARCH_CPU_PPC64)
++  module.ehdr.e_machine = EM_PPC64;
+ #endif
+ 
+   module.ehdr.e_version = EV_CURRENT;
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/thread_snapshot_linux.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/thread_snapshot_linux.cc
+@@ -186,6 +186,14 @@ bool ThreadSnapshotLinux::Initialize(Pro
+         thread.thread_info.float_context.f32,
+         context_.mipsel);
+   }
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++  context_.architecture = kCPUArchitecturePPC64;
++  context_.ppc64 = &context_union_.ppc64;
++  InitializeCPUContextPPC64<ContextTraits64>(
++      thread.thread_info.thread_context.t64,
++      thread.thread_info.float_context.f64,
++      thread.thread_info.vector_context.v64,
++      context_.ppc64);
+ #else
+ #error Port.
+ #endif
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/thread_snapshot_linux.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/snapshot/linux/thread_snapshot_linux.h
+@@ -68,6 +68,8 @@ class ThreadSnapshotLinux final : public
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+     CPUContextMIPS mipsel;
+     CPUContextMIPS64 mips64;
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++    CPUContextPPC64 ppc64;
+ #else
+ #error Port.
+ #endif  // ARCH_CPU_X86_FAMILY
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/util/linux/auxiliary_vector.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/util/linux/auxiliary_vector.cc
+@@ -56,6 +56,11 @@ bool AuxiliaryVector::Read(PtraceConnect
+     if (type == AT_IGNORE) {
+       continue;
+     }
++#if defined(ARCH_CPU_PPC64_FAMILY)
++    if (type == AT_IGNOREPPC) {
++      continue;
++    }
++#endif
+     if (!MapInsertOrReplace(&values_, type, value, nullptr)) {
+       LOG(ERROR) << "duplicate auxv entry";
+       return false;
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/util/linux/ptracer.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/util/linux/ptracer.cc
+@@ -401,6 +401,64 @@ bool GetThreadArea64(pid_t tid,
+   return true;
+ }
+ 
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++// PPC64 has had HAVE_ARCH_TRACEHOOK set since 2.6.27 (even before x86 had it).
++// That means we can simply use PTRACE_GETREGESET.
++
++template <typename Destination>
++bool GetRegisterSet(pid_t tid, int set, Destination* dest, bool can_log) {
++  iovec iov;
++  iov.iov_base = reinterpret_cast<void*>(dest);
++  iov.iov_len = sizeof(*dest);
++  if (ptrace(PTRACE_GETREGSET, tid, reinterpret_cast<void*>(set), &iov) != 0) {
++    PLOG_IF(ERROR, can_log) << "ptrace";
++    return false;
++  }
++  if (iov.iov_len != sizeof(*dest)) {
++    LOG_IF(ERROR, can_log) << "Unexpected registers size";
++    return false;
++  }
++  return true;
++}
++
++bool GetVectorRegisters64(pid_t tid,
++                          VectorContext* context,
++                          bool can_log) {
++  return GetRegisterSet(tid, NT_PPC_VMX, &context->v64, can_log);
++}
++
++bool GetFloatingPointRegisters64(pid_t tid,
++                                 FloatContext* context,
++                                 bool can_log) {
++  return GetRegisterSet(tid, NT_PRFPREG, &context->f64, can_log);
++}
++
++bool GetThreadArea64(pid_t tid,
++                     const ThreadContext& context,
++                     LinuxVMAddress* address,
++                     bool can_log) {
++  // PPC64 doesn't have PTRACE_GET_THREAD_AREA since the thread pointer
++  // is stored in GPR 13.
++  ThreadContext::t64_t tc;
++  if (!GetRegisterSet(tid, NT_PRSTATUS, &tc, can_log)) {
++    LOG_IF(ERROR, can_log) << "Unable to get thread pointer!";
++    return false;
++  }
++
++  *address = tc.gpr[13];
++
++  return true;
++}
++
++// Stubs for 32-bit functions not applicable on PPC64
++bool GetFloatingPointRegisters32(pid_t tid,
++                                 FloatContext* context,
++                                 bool can_log) { return false; }
++bool GetThreadArea32(pid_t tid,
++                     const ThreadContext &context,
++                     LinuxVMAddress *address,
++                     bool can_log) { return false; }
++
+ #else
+ #error Port.
+ #endif  // ARCH_CPU_X86_FAMILY
+@@ -497,6 +555,9 @@ bool Ptracer::GetThreadInfo(pid_t tid, T
+   if (is_64_bit_) {
+     return GetGeneralPurposeRegisters64(tid, &info->thread_context, can_log_) &&
+            GetFloatingPointRegisters64(tid, &info->float_context, can_log_) &&
++#if defined(ARCH_CPU_PPC64_FAMILY)
++           GetVectorRegisters64(tid, &info->vector_context, can_log_) &&
++#endif
+            GetThreadArea64(tid,
+                            info->thread_context,
+                            &info->thread_specific_data_address,
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/util/linux/thread_info.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/util/linux/thread_info.h
+@@ -39,6 +39,13 @@ struct user_vfp_exc {
+ #include <android/api-level.h>
+ #endif
+ 
++#if defined(ARCH_CPU_PPC64_FAMILY)
++#include <sys/ucontext.h>
++#if !defined(__GLIBC__)
++#include <asm/ptrace.h>
++#endif
++#endif
++
+ namespace crashpad {
+ 
+ //! \brief The set of general purpose registers for an architecture family.
+@@ -90,6 +97,8 @@ union ThreadContext {
+     uint32_t cp0_status;
+     uint32_t cp0_cause;
+     uint32_t padding1_;
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++    // PPC64 is 64-bit
+ #else
+ #error Port.
+ #endif  // ARCH_CPU_X86_FAMILY
+@@ -143,6 +152,21 @@ union ThreadContext {
+     uint64_t cp0_badvaddr;
+     uint64_t cp0_status;
+     uint64_t cp0_cause;
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++    // Reflects struct pt_regs in asm/ptrace.h.
++    uint64_t gpr[32];
++    uint64_t nip;
++    uint64_t msr;
++    uint64_t orig_gpr3;
++    uint64_t ctr;
++    uint64_t lnk;
++    uint64_t xer;
++    uint64_t ccr;
++    uint64_t softe;
++    uint64_t trap;
++    uint64_t dar;
++    uint64_t dsisr;
++    uint64_t result;
+ #else
+ #error Port.
+ #endif  // ARCH_CPU_X86_FAMILY
+@@ -154,6 +178,8 @@ union ThreadContext {
+   using NativeThreadContext = user_regs;
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+ // No appropriate NativeThreadsContext type available for MIPS
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++  using NativeThreadContext = struct pt_regs;
+ #else
+ #error Port.
+ #endif  // ARCH_CPU_X86_FAMILY || ARCH_CPU_ARM64
+@@ -229,6 +255,9 @@ union FloatContext {
+     } fpregs[32];
+     uint32_t fpcsr;
+     uint32_t fpu_id;
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++    // Crashpad's PPC support is 64-bit only, so this
++    // 32bit-only struct is declared as empty.
+ #else
+ #error Port.
+ #endif  // ARCH_CPU_X86_FAMILY
+@@ -263,6 +292,10 @@ union FloatContext {
+     double fpregs[32];
+     uint32_t fpcsr;
+     uint32_t fpu_id;
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++    // Reflects fpregset_t in sys/ucontext.h
++    double fpregs[32];
++    double fpscr;
+ #else
+ #error Port.
+ #endif  // ARCH_CPU_X86_FAMILY
+@@ -291,6 +324,8 @@ union FloatContext {
+   static_assert(sizeof(f64) == sizeof(user_fpsimd_struct), "Size mismatch");
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+ // No appropriate floating point context native type for available MIPS.
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++  static_assert(sizeof(f64) == sizeof(fpregset_t), "Size mismatch");
+ #else
+ #error Port.
+ #endif  // ARCH_CPU_X86
+@@ -298,6 +333,26 @@ union FloatContext {
+ static_assert(std::is_standard_layout<FloatContext>::value,
+               "Not standard layout");
+ 
++//! \brief The vector registers used for an architecture family
++union VectorContext {
++  struct v32_t {} v32;
++#if defined(ARCH_CPU_PPC64_FAMILY)
++  __attribute__((__aligned__(16))) // Vector context must be doubleword aligned.
++#endif
++  struct v64_t {
++#if defined(ARCH_CPU_PPC64_FAMILY)
++    // Reflects vrregset_t in sys/ucontext.h
++    uint32_t vrregs[32][4];
++    struct {
++      uint32_t __pad[3];
++      uint32_t vscr_word;
++    } vscr;
++    uint32_t vrsave;
++    uint32_t __pad[3];
++#endif
++  } v64;
++};
++
+ //! \brief A collection of `ptrace`-able information about a thread.
+ struct ThreadInfo {
+   ThreadInfo();
+@@ -309,6 +364,9 @@ struct ThreadInfo {
+   //! \brief The floating point registers for the thread.
+   FloatContext float_context;
+ 
++  //! \brief (Optional) The vector registers used for the thread.
++  VectorContext vector_context;
++
+   //! \brief The thread-local storage address for the thread.
+   LinuxVMAddress thread_specific_data_address;
+ };
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/util/misc/capture_context.h
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/util/misc/capture_context.h
+@@ -69,6 +69,7 @@ using NativeCPUContext = ucontext_t;
+ //!     macOS/Linux/Fuchsia | x86_64       | `%%rdi`
+ //!     Linux               | ARM/ARM64    | `r0`/`x0`
+ //!     Linux               | MIPS/MIPS64  | `$a0`
++//!     Linux               | PPC64        | `r3`
+ //!
+ //!     Additionally, the value `LR` on ARM/ARM64 will be the return address of
+ //!     this function.
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/util/misc/capture_context_linux.S
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/util/misc/capture_context_linux.S
+@@ -32,7 +32,7 @@
+   .balign 4, 0x0
+   .type CAPTURECONTEXT_SYMBOL, %function
+   .type CAPTURECONTEXT_SYMBOL2, %function
+-#elif defined(__mips__)
++#elif defined(__mips__) || defined(__powerpc64__)
+   .balign 4, 0x0
+ #endif
+ 
+@@ -423,4 +423,214 @@ CAPTURECONTEXT_SYMBOL2:
+   jr $ra
+ 
+   .set at
++#elif defined(__powerpc64__)
++  // Store r0-r31
++  std 0, 0xe8(3)   // context->uc_mcontext.gp_regs[0]
++  std 1, 0xf0(3)   // context->uc_mcontext.gp_regs[1]
++  std 2, 0xf8(3)   // context->uc_mcontext.gp_regs[2]
++  // note that r3's original value was lost
++  std 3, 0x100(3)  // context->uc_mcontext.gp_regs[3]
++  std 4, 0x108(3)  // context->uc_mcontext.gp_regs[4]
++  std 5, 0x110(3)  // context->uc_mcontext.gp_regs[5]
++  std 6, 0x118(3)  // context->uc_mcontext.gp_regs[6]
++  std 7, 0x120(3)  // context->uc_mcontext.gp_regs[7]
++  std 8, 0x128(3)  // context->uc_mcontext.gp_regs[8]
++  std 9, 0x130(3)  // context->uc_mcontext.gp_regs[9]
++  std 10, 0x138(3) // context->uc_mcontext.gp_regs[10]
++  std 11, 0x140(3) // context->uc_mcontext.gp_regs[11]
++  std 12, 0x148(3) // context->uc_mcontext.gp_regs[12]
++  std 13, 0x150(3) // context->uc_mcontext.gp_regs[13]
++  std 14, 0x158(3) // context->uc_mcontext.gp_regs[14]
++  std 15, 0x160(3) // context->uc_mcontext.gp_regs[15]
++  std 16, 0x168(3) // context->uc_mcontext.gp_regs[16]
++  std 17, 0x170(3) // context->uc_mcontext.gp_regs[17]
++  std 18, 0x178(3) // context->uc_mcontext.gp_regs[18]
++  std 19, 0x180(3) // context->uc_mcontext.gp_regs[19]
++  std 20, 0x188(3) // context->uc_mcontext.gp_regs[20]
++  std 21, 0x190(3) // context->uc_mcontext.gp_regs[21]
++  std 22, 0x198(3) // context->uc_mcontext.gp_regs[22]
++  std 23, 0x1a0(3) // context->uc_mcontext.gp_regs[23]
++  std 24, 0x1a8(3) // context->uc_mcontext.gp_regs[24]
++  std 25, 0x1b0(3) // context->uc_mcontext.gp_regs[25]
++  std 26, 0x1b8(3) // context->uc_mcontext.gp_regs[26]
++  std 27, 0x1c0(3) // context->uc_mcontext.gp_regs[27]
++  std 28, 0x1c8(3) // context->uc_mcontext.gp_regs[28]
++  std 29, 0x1d0(3) // context->uc_mcontext.gp_regs[29]
++  std 30, 0x1d8(3) // context->uc_mcontext.gp_regs[30]
++  std 31, 0x1e0(3) // context->uc_mcontext.gp_regs[31]
++
++  // For NIP, we can use the value in the link register
++  mflr 0
++  std 0, 0x1e8(3) // context->uc_mcontext.gp_regs[PT_NIP]
++
++  // CTR
++  mfctr 0
++  std 0, 0x200(3) // context->uc_mcontext.gp_regs[PT_CTR]
++
++  // For LNK, we'll use the caller's LR save area (2 stack frames up).
++  // r4 can be used as a scratch register since it has already been saved.
++  ld 4, 0(1)
++  ld 4, 16(4)
++  std 4, 0x208(3) // context->uc_mcontext.gp_regs[PT_LNK]
++
++  // XER
++  mfxer 0
++  std 0, 0x210(3) // context->uc_mcontext.gp_regs[PT_XER]
++
++  // CCR
++  mfcr 0
++  std 0, 0x218(3) // context->uc_mcontext.gp_regs[PT_CCR]
++
++  // MSR, orig_r3, MQ, TRAP, DAR, DSISR, RESULT, DSCR,
++  // not used or not relevant,  zero them out.
++  li 4, 0
++  std 4, 0x1f0(3) // context->uc_mcontext.gp_regs[PT_MSR]
++  std 4, 0x1f8(3) // context->uc_mcontext.gp_regs[PT_ORIG_R3]
++  std 4, 0x220(3) // context->uc_mcontext.gp_regs[PT_MQ]
++  std 4, 0x228(3) // context->uc_mcontext.gp_regs[PT_TRAP]
++  std 4, 0x230(3) // context->uc_mcontext.gp_regs[PT_DAR]
++  std 4, 0x238(3) // context->uc_mcontext.gp_regs[PT_DSISR]
++  std 4, 0x240(3) // context->uc_mcontext.gp_regs[PT_RESULT]
++  std 4, 0x248(3) // context->uc_mcontext.gp_regs[PT_DSCR]
++
++  // Update context->uc_mcontext.regs to point to gp_regs
++  addi 0, 3, 0xe8
++  std 0, 0xe0(3)
++
++  // Save floating point registers 0-31
++  stfd 0, 0x268(3)  // context->uc_mcontext.fp_regs[0]
++  stfd 1, 0x270(3)  // context->uc_mcontext.fp_regs[1]
++  stfd 2, 0x278(3)  // context->uc_mcontext.fp_regs[2]
++  stfd 3, 0x280(3)  // context->uc_mcontext.fp_regs[3]
++  stfd 4, 0x288(3)  // context->uc_mcontext.fp_regs[4]
++  stfd 5, 0x290(3)  // context->uc_mcontext.fp_regs[5]
++  stfd 6, 0x298(3)  // context->uc_mcontext.fp_regs[6]
++  stfd 7, 0x2a0(3)  // context->uc_mcontext.fp_regs[7]
++  stfd 8, 0x2a8(3)  // context->uc_mcontext.fp_regs[8]
++  stfd 9, 0x2b0(3)  // context->uc_mcontext.fp_regs[9]
++  stfd 10, 0x2b8(3) // context->uc_mcontext.fp_regs[10]
++  stfd 11, 0x2c0(3) // context->uc_mcontext.fp_regs[11]
++  stfd 12, 0x2c8(3) // context->uc_mcontext.fp_regs[12]
++  stfd 13, 0x2d0(3) // context->uc_mcontext.fp_regs[13]
++  stfd 14, 0x2d8(3) // context->uc_mcontext.fp_regs[14]
++  stfd 15, 0x2e0(3) // context->uc_mcontext.fp_regs[15]
++  stfd 16, 0x2e8(3) // context->uc_mcontext.fp_regs[16]
++  stfd 17, 0x2f0(3) // context->uc_mcontext.fp_regs[17]
++  stfd 18, 0x2f8(3) // context->uc_mcontext.fp_regs[18]
++  stfd 19, 0x300(3) // context->uc_mcontext.fp_regs[19]
++  stfd 20, 0x308(3) // context->uc_mcontext.fp_regs[20]
++  stfd 21, 0x310(3) // context->uc_mcontext.fp_regs[21]
++  stfd 22, 0x318(3) // context->uc_mcontext.fp_regs[22]
++  stfd 23, 0x320(3) // context->uc_mcontext.fp_regs[23]
++  stfd 24, 0x328(3) // context->uc_mcontext.fp_regs[24]
++  stfd 25, 0x330(3) // context->uc_mcontext.fp_regs[25]
++  stfd 26, 0x338(3) // context->uc_mcontext.fp_regs[26]
++  stfd 27, 0x340(3) // context->uc_mcontext.fp_regs[27]
++  stfd 28, 0x348(3) // context->uc_mcontext.fp_regs[28]
++  stfd 29, 0x350(3) // context->uc_mcontext.fp_regs[29]
++  stfd 30, 0x358(3) // context->uc_mcontext.fp_regs[30]
++  stfd 31, 0x360(3) // context->uc_mcontext.fp_regs[31]
++
++  // FPSCR
++  mffs 0
++  stfd 0, 0x368(3) // context->uc_mcontext.fp_regs[32]
++
++  // Save VMX Vector registers
++  // Update r4 to contain the base address of vmx_reserve
++  addi 4, 3, 0x378
++  // Ensure that it is quadword aligned
++  andi. 5, 4, 0xF
++  beq 1f // No alignment is necessary
++  // Address is doubleword aligned and not quadword aligned, add 8
++  addi 4, 4, 8
++
++1:
++  // Store VMX registers 0-31
++  // r4 will contain the base address
++  // r5 will contain the index
++  li 5, 0
++  stvx 0, 4, 5   // context->uc_mcontext.vmx_reserve[(align) + 0]
++  addi 5, 5, 16
++  stvx 1, 4, 5   // context->uc_mcontext.vmx_reserve[(align) + 1]
++  addi 5, 5, 16
++  stvx 2, 4, 5   // context->uc_mcontext.vmx_reserve[(align) + 2]
++  addi 5, 5, 16
++  stvx 3, 4, 5   // context->uc_mcontext.vmx_reserve[(align) + 3]
++  addi 5, 5, 16
++  stvx 4, 4, 5   // context->uc_mcontext.vmx_reserve[(align) + 4]
++  addi 5, 5, 16
++  stvx 5, 4, 5   // context->uc_mcontext.vmx_reserve[(align) + 5]
++  addi 5, 5, 16
++  stvx 6, 4, 5   // context->uc_mcontext.vmx_reserve[(align) + 6]
++  addi 5, 5, 16
++  stvx 7, 4, 5   // context->uc_mcontext.vmx_reserve[(align) + 7]
++  addi 5, 5, 16
++  stvx 8, 4, 5   // context->uc_mcontext.vmx_reserve[(align) + 8]
++  addi 5, 5, 16
++  stvx 9, 4, 5   // context->uc_mcontext.vmx_reserve[(align) + 9]
++  addi 5, 5, 16
++  stvx 10, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 10]
++  addi 5, 5, 16
++  stvx 11, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 11]
++  addi 5, 5, 16
++  stvx 12, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 12]
++  addi 5, 5, 16
++  stvx 13, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 13]
++  addi 5, 5, 16
++  stvx 14, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 14]
++  addi 5, 5, 16
++  stvx 15, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 15]
++  addi 5, 5, 16
++  stvx 16, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 16]
++  addi 5, 5, 16
++  stvx 17, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 17]
++  addi 5, 5, 16
++  stvx 18, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 18]
++  addi 5, 5, 16
++  stvx 19, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 19]
++  addi 5, 5, 16
++  stvx 20, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 20]
++  addi 5, 5, 16
++  stvx 21, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 21]
++  addi 5, 5, 16
++  stvx 22, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 22]
++  addi 5, 5, 16
++  stvx 23, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 23]
++  addi 5, 5, 16
++  stvx 24, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 24]
++  addi 5, 5, 16
++  stvx 25, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 25]
++  addi 5, 5, 16
++  stvx 26, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 26]
++  addi 5, 5, 16
++  stvx 27, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 27]
++  addi 5, 5, 16
++  stvx 28, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 28]
++  addi 5, 5, 16
++  stvx 29, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 29]
++  addi 5, 5, 16
++  stvx 30, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 30]
++  addi 5, 5, 16
++  stvx 31, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 31]
++  addi 5, 5, 16
++
++  // VSCR
++  mfvscr 0
++  stvx 0, 4, 5
++  addi 5, 5, 16
++
++  // VRSAVE
++  mfvrsave 0
++  stwx 0, 4, 5
++
++  // Update context->uc_mcontext.v_regs to point to vmx_reserve + alignment.
++  std 4, 0x370(3)
++
++  // Zero out all unused fields
++  li 4, 0
++  std 4, 0xc8(3) // context->uc_mcontext.signal
++  std 4, 0xd0(3) // context->uc_mcontext.handler
++  std 4, 0xd8(3) // context->uc_mcontext.oldmask
++
++  blr
+ #endif  // __i386__
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/util/misc/capture_context_test.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/util/misc/capture_context_test.cc
+@@ -57,7 +57,7 @@ void TestCaptureContext() {
+   uintptr_t pc = ProgramCounterFromContext(context_1);
+ 
+ #if !defined(ADDRESS_SANITIZER) && !defined(ARCH_CPU_MIPS_FAMILY) && \
+-    !defined(MEMORY_SANITIZER)
++    !defined(MEMORY_SANITIZER) && !defined(ARCH_CPU_PPC64_FAMILY)
+   // Sanitizers can cause enough code bloat that the “nearby” check would
+   // likely fail.
+   const uintptr_t kReferencePC =
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/util/misc/capture_context_test_util_linux.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/util/misc/capture_context_test_util_linux.cc
+@@ -35,6 +35,8 @@ void SanityCheckContext(const NativeCPUC
+   EXPECT_EQ(context.uc_mcontext.regs[0], FromPointerCast<uintptr_t>(&context));
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+   EXPECT_EQ(context.uc_mcontext.gregs[4], FromPointerCast<uintptr_t>(&context));
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++  EXPECT_EQ(context.uc_mcontext.gp_regs[3], FromPointerCast<uintptr_t>(&context));
+ #endif
+ }
+ 
+@@ -49,6 +51,8 @@ uintptr_t ProgramCounterFromContext(cons
+   return context.uc_mcontext.pc;
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+   return context.uc_mcontext.pc;
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++  return context.uc_mcontext.gp_regs[PT_NIP];
+ #endif
+ }
+ 
+@@ -63,6 +67,8 @@ uintptr_t StackPointerFromContext(const
+   return context.uc_mcontext.sp;
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+   return context.uc_mcontext.gregs[29];
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++  return context.uc_mcontext.gp_regs[1];
+ #endif
+ }
+ 
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/util/posix/signals_test.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/util/posix/signals_test.cc
+@@ -46,9 +46,9 @@ bool CanCauseSignal(int sig) {
+   return sig == SIGABRT ||
+          sig == SIGALRM ||
+          sig == SIGBUS ||
+-#if !defined(ARCH_CPU_ARM64)
++#if !defined(ARCH_CPU_ARM64) && !defined(ARCH_CPU_PPC64)
+          sig == SIGFPE ||
+-#endif  // !defined(ARCH_CPU_ARM64)
++#endif  // !defined(ARCH_CPU_ARM64) && !defined(ARCH_CPU_PPC64)
+ #if defined(ARCH_CPU_X86_FAMILY) || defined(ARCH_CPU_ARMEL)
+          sig == SIGILL ||
+ #endif  // defined(ARCH_CPU_X86_FAMILY) || defined(ARCH_CPU_ARMEL)
+@@ -117,9 +117,11 @@ void CauseSignal(int sig) {
+       break;
+     }
+ 
+-#if !defined(ARCH_CPU_ARM64)
++#if !defined(ARCH_CPU_ARM64) && !defined(ARCH_CPU_PPC64)
+     // ARM64 has hardware integer division instructions that don’t generate a
+     // trap for divide-by-zero, so this doesn’t produce SIGFPE.
++    //
++    // PPC64 fixed-point division by zero also doesn't produce a SIGFPE.
+     case SIGFPE: {
+       // Optimization makes this tricky, so get zero from a system call likely
+       // to succeed, and try to do something with the result.
+@@ -137,7 +139,7 @@ void CauseSignal(int sig) {
+       fstat(quotient, &stat_buf);
+       break;
+     }
+-#endif  // ARCH_CPU_ARM64
++#endif  // !defined(ARCH_CPU_ARM64) && !defined(ARCH_CPU_PPC64)
+ 
+ #if defined(ARCH_CPU_X86_FAMILY) || defined(ARCH_CPU_ARMEL)
+     case SIGILL: {
+--- a/src/3rdparty/chromium/third_party/dav1d/BUILD.gn
++++ b/src/3rdparty/chromium/third_party/dav1d/BUILD.gn
+@@ -196,6 +196,8 @@ static_library("dav1d_8bit") {
+     sources += arm_template_sources
+   } else if (current_cpu == "arm64") {
+     sources += arm_template_sources
++  } else if (current_cpu == "ppc64") {
++    sources += ppc64_template_sources
+   }
+ 
+   cflags = dav1d_copts
+@@ -226,6 +228,8 @@ static_library("dav1d_10bit") {
+     sources += arm_template_sources
+   } else if (current_cpu == "arm64") {
+     sources += arm_template_sources
++  } else if (current_cpu == "ppc64") {
++    sources += ppc64_template_sources
+   }
+ 
+   cflags = dav1d_copts
+@@ -283,6 +287,21 @@ if (current_cpu == "x86" || current_cpu
+     }
+ 
+     cflags = dav1d_copts
++  }
++} else if (current_cpu == "ppc64") {
++  static_library("dav1d_ppc") {
++    sources = [
++      "libdav1d/src/ppc/cpu.c",
++      "libdav1d/src/ppc/cpu.h",
++    ]
++
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [
++      "//build/config/compiler:no_chromium_code",
++      ":dav1d_config",
++    ]
++
++    cflags = dav1d_copts
+ 
+     deps = [ ":dav1d_headers" ]
+     allow_circular_includes_from = [ ":dav1d_headers" ]
+@@ -315,5 +334,7 @@ static_library("dav1d") {
+     }
+   } else if (current_cpu == "arm" || current_cpu == "arm64") {
+     deps += [ ":dav1d_arm" ]
++  } else if (current_cpu == "ppc64") {
++    deps += [ ":dav1d_ppc" ]
+   }
+ }
+--- a/src/3rdparty/chromium/third_party/dav1d/dav1d_generated.gni
++++ b/src/3rdparty/chromium/third_party/dav1d/dav1d_generated.gni
+@@ -103,6 +103,11 @@ arm_template_sources = [
+   "libdav1d/src/arm/mc_init_tmpl.c",
+ ]
+ 
++ppc64_template_sources = [
++  "libdav1d/src/ppc/cdef_init_tmpl.c",
++  "libdav1d/src/ppc/looprestoration_init_tmpl.c",
++]
++
+ template_sources = [
+   "libdav1d/src/cdef_apply_tmpl.c",
+   "libdav1d/src/cdef_tmpl.c",
+--- a/src/3rdparty/chromium/third_party/dav1d/generate_source.py
++++ b/src/3rdparty/chromium/third_party/dav1d/generate_source.py
+@@ -57,6 +57,8 @@ def _WriteGn(fd):
+   _WriteArray(fd, "arm64_asm_sources", _Glob("libdav1d/src/arm/64/*.S"))
+   _WriteArray(fd, "arm_template_sources", _Glob("libdav1d/src/arm/*_tmpl.c"))
+ 
++  _WriteArray(fd, "ppc64_template_sources", _Glob("libdav1d/src/ppc/*_tmpl.c"))
++
+   template_sources = _Glob("libdav1d/src/*_tmpl.c")
+   _WriteArray(fd, "template_sources", template_sources)
+ 
+--- a/src/3rdparty/chromium/third_party/dav1d/libdav1d/src/ppc/types.h
++++ b/src/3rdparty/chromium/third_party/dav1d/libdav1d/src/ppc/types.h
+@@ -51,4 +51,19 @@
+ #define u16l_to_i32(v) ((i32x4) vec_mergel((u16x8) v, vec_splat_u16(0)))
+ #define i16l_to_i32(v) ((i32x4) vec_unpackl((i16x8)v))
+ 
++#if defined(__clang__)
++#undef vec_splats
++#define vec_splats(N)                     \
++    _Generic((N),                         \
++        unsigned char:      ((u8x16)(N)), \
++        signed char:        ((i8x16)(N)), \
++        unsigned short:     ((u16x8)(N)), \
++        signed short:       ((i16x8)(N)), \
++        unsigned int:       ((u32x4)(N)), \
++        signed int:         ((i32x4)(N)), \
++        unsigned long long: ((u64x2)(N)), \
++        signed long long:   ((i64x2)(N))  \
++    )
++#endif
++
+ #endif /* DAV1D_SRC_PPC_TYPES_H */
+--- a/src/3rdparty/chromium/third_party/eigen3/BUILD.gn
++++ b/src/3rdparty/chromium/third_party/eigen3/BUILD.gn
+@@ -22,4 +22,8 @@ config("eigen_includes") {
+     # for this component on Windows on Arm due to compilation errors.
+     defines += [ "EIGEN_DONT_VECTORIZE" ]
+   }
++
++  if (target_cpu == "ppc64") {
++    defines += [ "EIGEN_DONT_VECTORIZE" ]
++  }
+ }
+--- a/src/3rdparty/chromium/third_party/libaom/BUILD.gn
++++ b/src/3rdparty/chromium/third_party/libaom/BUILD.gn
+@@ -37,6 +37,8 @@ if (enable_libaom) {
+     } else {
+       cpu_arch_full = "arm"
+     }
++  } else if (current_cpu == "ppc64") {
++    cpu_arch_full = "generic"
+   } else {
+     cpu_arch_full = current_cpu
+   }
+--- a/src/3rdparty/chromium/third_party/libgav1/options.gni
++++ b/src/3rdparty/chromium/third_party/libgav1/options.gni
+@@ -12,5 +12,5 @@ declare_args() {
+       is_chromeos_ash && (target_cpu == "arm" || target_cpu == "arm64")
+   use_libgav1_parser =
+       (is_chromeos || is_linux || is_win) &&
+-      (target_cpu == "x86" || target_cpu == "x64" || target_cpu == "arm64")
++      (target_cpu == "x86" || target_cpu == "x64" || target_cpu == "arm64" || target_cpu == "ppc64")
+ }
+--- a/src/3rdparty/chromium/third_party/lss/linux_syscall_support.h
++++ b/src/3rdparty/chromium/third_party/lss/linux_syscall_support.h
+@@ -4262,7 +4262,7 @@ struct kernel_statfs {
+       LSS_REG(2, buf);
+       LSS_BODY(void*, mmap2, "0"(__r2));
+     }
+-#else
++#elif !defined(__powerpc64__) /* ppc64 doesn't have mmap2 */
+     #define __NR__mmap2 __NR_mmap2
+     LSS_INLINE _syscall6(void*, _mmap2,            void*, s,
+                          size_t,                   l, int,               p,
+@@ -4373,7 +4373,7 @@ struct kernel_statfs {
+   #if defined(__i386__) ||                                                    \
+       defined(__ARM_ARCH_3__) || defined(__ARM_EABI__) ||                     \
+      (defined(__mips__) && _MIPS_SIM == _MIPS_SIM_ABI32) ||                   \
+-      defined(__PPC__) ||                                                     \
++     (defined(__PPC__) && !defined(__powerpc64__)) ||                                                     \
+      (defined(__s390__) && !defined(__s390x__))
+     /* On these architectures, implement mmap() with mmap2(). */
+     LSS_INLINE void* LSS_NAME(mmap)(void *s, size_t l, int p, int f, int d,
+@@ -4556,9 +4556,17 @@ struct kernel_statfs {
+     }
+   #endif
+   #if defined(__NR_fstatat64)
++    #if !defined(__GLIBC__)
++        // musl doesn't define fstatat64 fstatat
++        #undef fstatat64
++    #endif
+     LSS_INLINE _syscall4(int,   fstatat64,        int,   d,
+                          const char *,      p,
+                          struct kernel_stat64 *,   b,    int,   f)
++    #if !defined(__GLIBC__)
++    	// then restore it
++        #define fstatat64 fstatat
++    #endif
+   #endif
+   #if defined(__NR_waitpid)
+     // waitpid is polyfilled below when not available.
+--- a/src/3rdparty/chromium/third_party/pdfium/third_party/libpng16/pngpriv.h
++++ b/src/3rdparty/chromium/third_party/pdfium/third_party/libpng16/pngpriv.h
+@@ -196,11 +196,7 @@
+ #endif
+ 
+ #ifndef PNG_POWERPC_VSX_OPT
+-#  if defined(__PPC64__) && defined(__ALTIVEC__) && defined(__VSX__)
+-#     define PNG_POWERPC_VSX_OPT 2
+-#  else
+-#     define PNG_POWERPC_VSX_OPT 0
+-#  endif
++#  define PNG_POWERPC_VSX_OPT 0
+ #endif
+ 
+ #ifndef PNG_INTEL_SSE_OPT
+--- a/src/3rdparty/chromium/third_party/pffft/src/pffft.c
++++ b/src/3rdparty/chromium/third_party/pffft/src/pffft.c
+@@ -100,6 +100,7 @@
+    Altivec support macros 
+ */
+ #if !defined(PFFFT_SIMD_DISABLE) && (defined(__ppc__) || defined(__ppc64__))
++#include <altivec.h>
+ typedef vector float v4sf;
+ #  define SIMD_SZ 4
+ #  define VZERO() ((vector float) vec_splat_u8(0))
+--- a/src/3rdparty/chromium/third_party/skia/src/sksl/SkSLString.cpp
++++ b/src/3rdparty/chromium/third_party/skia/src/sksl/SkSLString.cpp
+@@ -142,7 +142,12 @@ String to_string(double value) {
+     if (needsDotZero) {
+         buffer << ".0";
+     }
+-    return String(buffer.str().c_str());
++
++    std::string ret(buffer.str());
++    if (signbit(value) && ret[0] == '.') {
++        ret[0] = '-';
++    }
++    return String(ret.c_str());
+ }
+ 
+ bool stod(const skstd::string_view& s, SKSL_FLOAT* value) {
+--- a/src/3rdparty/chromium/third_party/sqlite/src/amalgamation/sqlite3.c
++++ b/src/3rdparty/chromium/third_party/sqlite/src/amalgamation/sqlite3.c
+@@ -14628,7 +14628,8 @@ typedef INT16_TYPE LogEst;
+ # if defined(i386)      || defined(__i386__)      || defined(_M_IX86) ||    \
+      defined(__x86_64)  || defined(__x86_64__)    || defined(_M_X64)  ||    \
+      defined(_M_AMD64)  || defined(_M_ARM)        || defined(__x86)   ||    \
+-     defined(__ARMEL__) || defined(__AARCH64EL__) || defined(_M_ARM64)
++     defined(__ARMEL__) || defined(__AARCH64EL__) || defined(_M_ARM64) ||   \
++     defined(__powerpc64__) && (__BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__)
+ #   define SQLITE_BYTEORDER    1234
+ # elif defined(sparc)     || defined(__ppc__) || \
+        defined(__ARMEB__) || defined(__AARCH64EB__)
+--- a/src/3rdparty/chromium/third_party/sqlite/src/amalgamation_dev/sqlite3.c
++++ b/src/3rdparty/chromium/third_party/sqlite/src/amalgamation_dev/sqlite3.c
+@@ -14641,7 +14641,8 @@ typedef INT16_TYPE LogEst;
+ # if defined(i386)      || defined(__i386__)      || defined(_M_IX86) ||    \
+      defined(__x86_64)  || defined(__x86_64__)    || defined(_M_X64)  ||    \
+      defined(_M_AMD64)  || defined(_M_ARM)        || defined(__x86)   ||    \
+-     defined(__ARMEL__) || defined(__AARCH64EL__) || defined(_M_ARM64)
++     defined(__ARMEL__) || defined(__AARCH64EL__) || defined(_M_ARM64) ||   \
++     defined(__powerpc64__) && (__BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__)
+ #   define SQLITE_BYTEORDER    1234
+ # elif defined(sparc)     || defined(__ppc__) || \
+        defined(__ARMEB__) || defined(__AARCH64EB__)
+--- a/src/3rdparty/chromium/third_party/sqlite/src/ext/rtree/rtree.c
++++ b/src/3rdparty/chromium/third_party/sqlite/src/ext/rtree/rtree.c
+@@ -450,7 +450,7 @@ struct RtreeMatchArg {
+ #if defined(i386)     || defined(__i386__)   || defined(_M_IX86) ||    \
+     defined(__x86_64) || defined(__x86_64__) || defined(_M_X64)  ||    \
+     defined(_M_AMD64) || defined(_M_ARM)     || defined(__x86)   ||    \
+-    defined(__arm__)
++    defined(__arm__) || defined(__powerpc64__) && (__BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__)
+ # define SQLITE_BYTEORDER    1234
+ #elif defined(sparc)    || defined(__ppc__)
+ # define SQLITE_BYTEORDER    4321
+--- a/src/3rdparty/chromium/third_party/sqlite/src/src/sqliteInt.h
++++ b/src/3rdparty/chromium/third_party/sqlite/src/src/sqliteInt.h
+@@ -890,7 +890,8 @@ typedef INT16_TYPE LogEst;
+ # if defined(i386)      || defined(__i386__)      || defined(_M_IX86) ||    \
+      defined(__x86_64)  || defined(__x86_64__)    || defined(_M_X64)  ||    \
+      defined(_M_AMD64)  || defined(_M_ARM)        || defined(__x86)   ||    \
+-     defined(__ARMEL__) || defined(__AARCH64EL__) || defined(_M_ARM64)
++     defined(__ARMEL__) || defined(__AARCH64EL__) || defined(_M_ARM64) || \
++     defined(__powerpc64__) && (__BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__)
+ #   define SQLITE_BYTEORDER    1234
+ # elif defined(sparc)     || defined(__ppc__) || \
+        defined(__ARMEB__) || defined(__AARCH64EB__)
+--- a/src/3rdparty/chromium/third_party/webrtc/modules/desktop_capture/differ_block.cc
++++ b/src/3rdparty/chromium/third_party/webrtc/modules/desktop_capture/differ_block.cc
+@@ -30,11 +30,7 @@ bool VectorDifference(const uint8_t* ima
+   static bool (*diff_proc)(const uint8_t*, const uint8_t*) = nullptr;
+ 
+   if (!diff_proc) {
+-#if defined(WEBRTC_ARCH_ARM_FAMILY) || defined(WEBRTC_ARCH_MIPS_FAMILY)
+-    // For ARM and MIPS processors, always use C version.
+-    // TODO(hclam): Implement a NEON version.
+-    diff_proc = &VectorDifference_C;
+-#else
++#if defined(WEBRTC_ARCH_X86_FAMILY)
+     bool have_sse2 = GetCPUInfo(kSSE2) != 0;
+     // For x86 processors, check if SSE2 is supported.
+     if (have_sse2 && kBlockSize == 32) {
+@@ -44,6 +40,10 @@ bool VectorDifference(const uint8_t* ima
+     } else {
+       diff_proc = &VectorDifference_C;
+     }
++#else
++    // For other processors, always use C version.
++    // TODO(hclam): Implement a NEON version.
++    diff_proc = &VectorDifference_C;
+ #endif
+   }
+ 
+--- a/src/3rdparty/chromium/v8/BUILD.gn
++++ b/src/3rdparty/chromium/v8/BUILD.gn
+@@ -1083,6 +1083,12 @@ config("toolchain") {
+     }
+     if (host_byteorder == "little") {
+       defines += [ "V8_TARGET_ARCH_PPC_LE" ]
++      cflags += [
++        # Enable usage of AltiVec, VSX, and other POWER8 and higher features
++        "-mcpu=power8",
++        "-maltivec",
++        "-mvsx",
++      ]
+     } else if (host_byteorder == "big") {
+       defines += [ "V8_TARGET_ARCH_PPC_BE" ]
+       if (current_os == "aix") {
+--- a/src/3rdparty/chromium/ui/gl/features.gni
++++ b/src/3rdparty/chromium/ui/gl/features.gni
+@@ -35,7 +35,8 @@ declare_args() {
+                         (is_mac && use_egl) || is_chromeos_ash || is_fuchsia) &&
+                        (target_cpu == "x86" || target_cpu == "x64" ||
+                         target_cpu == "arm" || target_cpu == "arm64" ||
+-                        target_cpu == "mipsel" || target_cpu == "mips64el")
++                        target_cpu == "mipsel" || target_cpu == "mips64el" ||
++                        target_cpu == "ppc64")
+ }
+ 
+ use_glx = use_x11 || ozone_platform_x11
+--- a/src/3rdparty/chromium/v8/test/BUILD.gn
++++ b/src/3rdparty/chromium/v8/test/BUILD.gn
+@@ -42,7 +42,6 @@ group("gn_all") {
+       "benchmarks/cpp:gn_all",
+       "cctest:cctest",
+       "cctest:generate-bytecode-expectations",
+-      "unittests:unittests",
+     ]
+   }
+ }
+@@ -84,7 +83,6 @@ group("v8_bot_default") {
+     "message:v8_message",
+     "mjsunit:v8_mjsunit",
+     "mkgrokdump:mkgrokdump",
+-    "unittests:unittests",
+     "webkit:v8_webkit",
+   ]
+ 
+@@ -109,7 +107,6 @@ group("v8_default") {
+     "message:v8_message",
+     "mjsunit:v8_mjsunit",
+     "mkgrokdump:mkgrokdump",
+-    "unittests:unittests",
+   ]
+ 
+   if (v8_enable_webassembly) {
+--- /dev/null
++++ b/src/3rdparty/chromium/dev/null
+@@ -0,0 +1,39 @@
++/*
++ * Autogenerated by the Meson build system.
++ * Do not edit, your changes will be lost.
++ */
++
++#pragma once
++
++#define ARCH_AARCH64 0
++
++#define ARCH_ARM 0
++
++#define ARCH_PPC64LE 1
++
++#define ARCH_X86 0
++
++#define ARCH_X86_32 0
++
++#define ARCH_X86_64 0
++
++#define CONFIG_16BPC 1
++
++#define CONFIG_8BPC 1
++
++// #define CONFIG_LOG 1 -- Logging is controlled by Chromium
++
++#define ENDIANNESS_BIG 0
++
++#define HAVE_ASM 1
++
++#define HAVE_CLOCK_GETTIME 1
++
++#define HAVE_DLSYM 1
++
++#define HAVE_GETAUXVAL 1
++
++#define HAVE_POSIX_MEMALIGN 1
++
++#define HAVE_UNISTD_H 1
++
+--- a/src/3rdparty/chromium/third_party/abseil-cpp/absl/base/internal/unscaledcycleclock.h
++++ b/src/3rdparty/chromium/third_party/abseil-cpp/absl/base/internal/unscaledcycleclock.h
+@@ -46,7 +46,7 @@
+ 
+ // The following platforms have an implementation of a hardware counter.
+ #if defined(__i386__) || defined(__x86_64__) || defined(__aarch64__) || \
+-  defined(__powerpc__) || defined(__ppc__) || \
++  ((defined(__powerpc__) || defined(__ppc__)) && defined(__GLIBC__)) || \
+   defined(_M_IX86) || defined(_M_X64)
+ #define ABSL_HAVE_UNSCALED_CYCLECLOCK_IMPLEMENTATION 1
+ #else
+--- a/src/3rdparty/chromium/third_party/abseil-cpp/absl/debugging/internal/stacktrace_config.h
++++ b/src/3rdparty/chromium/third_party/abseil-cpp/absl/debugging/internal/stacktrace_config.h
+@@ -59,7 +59,7 @@
+ #elif defined(__i386__) || defined(__x86_64__)
+ #define ABSL_STACKTRACE_INL_HEADER \
+   "absl/debugging/internal/stacktrace_x86-inl.inc"
+-#elif defined(__ppc__) || defined(__PPC__)
++#elif defined(__ppc__) || defined(__PPC__) && defined(__GLIBC__)
+ #define ABSL_STACKTRACE_INL_HEADER \
+   "absl/debugging/internal/stacktrace_powerpc-inl.inc"
+ #elif defined(__aarch64__)
+--- a/src/3rdparty/chromium/base/allocator/partition_allocator/partition_alloc_config.h
++++ b/src/3rdparty/chromium/base/allocator/partition_allocator/partition_alloc_config.h
+@@ -100,7 +100,8 @@ static_assert(sizeof(void*) != 8, "");
+ // PUT_REF_COUNT_IN_PREVIOUS_SLOT does. In this case the refcount overlaps with
+ // the next pointer shadow for the smallest bucket.
+ #if !(defined(OS_MAC) && defined(ARCH_CPU_ARM64)) && \
+-    !BUILDFLAG(PUT_REF_COUNT_IN_PREVIOUS_SLOT)
++    !BUILDFLAG(PUT_REF_COUNT_IN_PREVIOUS_SLOT) && \
++    (!defined(__GLIBC) && !defined(__powerpc64__))
+ #define PA_HAS_FREELIST_HARDENING
+ #endif
+ 
+--- a/src/3rdparty/chromium/build/download_nacl_toolchains.py
++++ b/src/3rdparty/chromium/build/download_nacl_toolchains.py
+@@ -13,6 +13,8 @@ import sys
+ 
+ 
+ def Main(args):
++  if 'disable_nacl=1' in os.environ.get('GYP_DEFINES', ''):
++    return 0
+   script_dir = os.path.dirname(os.path.abspath(__file__))
+   src_dir = os.path.dirname(script_dir)
+   nacl_dir = os.path.join(src_dir, 'native_client')
+--- a/src/3rdparty/chromium/chrome/installer/linux/BUILD.gn
++++ b/src/3rdparty/chromium/chrome/installer/linux/BUILD.gn
+@@ -100,8 +100,6 @@ packaging_files = packaging_files_binari
+                     "$root_out_dir/xdg-mime",
+                     "$root_out_dir/xdg-settings",
+                     "$root_out_dir/locales/en-US.pak",
+-                    "$root_out_dir/MEIPreload/manifest.json",
+-                    "$root_out_dir/MEIPreload/preloaded_data.pb",
+                   ]
+ 
+ action_foreach("calculate_deb_dependencies") {
+@@ -321,7 +319,6 @@ group("installer_deps") {
+     ":theme_files",
+     "//chrome",
+     "//chrome:packed_resources",
+-    "//chrome/browser/resources/media/mei_preload:component",
+     "//components/crash/core/app:chrome_crashpad_handler",
+     "//sandbox/linux:chrome_sandbox",
+   ]
+--- /dev/null
++++ b/src/3rdparty/chromium/sandbox/linux/system_headers/ppc64_linux_syscalls.h
+@@ -0,0 +1,12 @@
++// Copyright 2014 The Chromium Authors. All rights reserved.
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++#ifndef SANDBOX_LINUX_SYSTEM_HEADERS_PPC64_LINUX_SYSCALLS_H_
++#define SANDBOX_LINUX_SYSTEM_HEADERS_PPC64_LINUX_SYSCALLS_H_
++
++#include <asm/unistd.h>
++
++//TODO: is it necessary to redefine syscall numbers for PPC64?
++
++#endif  // SANDBOX_LINUX_SYSTEM_HEADERS_PPC64_LINUX_SYSCALLS_H_
+--- /dev/null
++++ b/src/3rdparty/chromium/sandbox/linux/system_headers/ppc64_linux_ucontext.h
+@@ -0,0 +1,12 @@
++// Copyright 2014 The Chromium Authors. All rights reserved.
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++#ifndef SANDBOX_LINUX_SYSTEM_HEADERS_PPC64_LINUX_UCONTEXT_H_
++#define SANDBOX_LINUX_SYSTEM_HEADERS_PPC64_LINUX_UCONTEXT_H_
++
++#include <sys/ucontext.h>
++
++//TODO: is it necessary to redefine ucontext on PPC64?
++
++#endif  // SANDBOX_LINUX_SYSTEM_HEADERS_PPC64_LINUX_UCONTEXT_H_
+--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/util/net/http_transport_libcurl.cc
++++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/util/net/http_transport_libcurl.cc
+@@ -236,6 +236,12 @@ std::string UserAgent() {
+ #elif defined(ARCH_CPU_BIG_ENDIAN)
+     static constexpr char arch[] = "aarch64_be";
+ #endif
++#elif defined(__powerpc64__)
++#if defined(ARCH_CPU_LITTLE_ENDIAN)
++    static constexpr char arch[] = "ppc64le";
++#elif defined(ARCH_CPU_BIG_ENDIAN)
++    static constexpr char arch[] = "ppc64";
++#endif
+ #else
+ #error Port
+ #endif
+--- /dev/null
++++ b/src/3rdparty/chromium/third_party/dav1d/config/linux/ppc64/config.h
+@@ -0,0 +1,39 @@
++/*
++ * Autogenerated by the Meson build system.
++ * Do not edit, your changes will be lost.
++ */
++
++#pragma once
++
++#define ARCH_AARCH64 0
++
++#define ARCH_ARM 0
++
++#define ARCH_PPC64LE 1
++
++#define ARCH_X86 0
++
++#define ARCH_X86_32 0
++
++#define ARCH_X86_64 0
++
++#define CONFIG_16BPC 1
++
++#define CONFIG_8BPC 1
++
++// #define CONFIG_LOG 1 -- Logging is controlled by Chromium
++
++#define ENDIANNESS_BIG 0
++
++#define HAVE_ASM 1
++
++#define HAVE_CLOCK_GETTIME 1
++
++#define HAVE_DLSYM 1
++
++#define HAVE_GETAUXVAL 1
++
++#define HAVE_POSIX_MEMALIGN 1
++
++#define HAVE_UNISTD_H 1
++
diff --git a/srcpkgs/qt6-webengine/patches/0903-xxx-ppc64le-swiftshader.patch b/srcpkgs/qt6-webengine/patches/0903-xxx-ppc64le-swiftshader.patch
new file mode 100644
index 000000000000..1a8cd8368da1
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/0903-xxx-ppc64le-swiftshader.patch
@@ -0,0 +1,18 @@
+--- a/src/3rdparty/chromium/third_party/swiftshader/third_party/llvm-10.0/BUILD.gn
++++ b/src/3rdparty/chromium/third_party/swiftshader/third_party/llvm-10.0/BUILD.gn
+@@ -576,6 +576,7 @@ swiftshader_llvm_source_set("swiftshader
+     "llvm/lib/MC/MCAsmInfoCOFF.cpp",
+     "llvm/lib/MC/MCAsmInfoDarwin.cpp",
+     "llvm/lib/MC/MCAsmInfoELF.cpp",
++    "llvm/lib/MC/MCAsmInfoXCOFF.cpp",
+     "llvm/lib/MC/MCAsmMacro.cpp",
+     "llvm/lib/MC/MCAsmStreamer.cpp",
+     "llvm/lib/MC/MCAssembler.cpp",
+@@ -631,6 +632,7 @@ swiftshader_llvm_source_set("swiftshader
+     "llvm/lib/MC/MCWinCOFFStreamer.cpp",
+     "llvm/lib/MC/MCWinEH.cpp",
+     "llvm/lib/MC/MCXCOFFStreamer.cpp",
++    "llvm/lib/MC/MCXCOFFObjectTargetWriter.cpp",
+     "llvm/lib/MC/MachObjectWriter.cpp",
+     "llvm/lib/MC/StringTableBuilder.cpp",
+     "llvm/lib/MC/SubtargetFeature.cpp",
diff --git a/srcpkgs/qt6-webengine/patches/cross-build-examples.patch b/srcpkgs/qt6-webengine/patches/cross-build-examples.patch
new file mode 100644
index 000000000000..4598643cc0dc
--- /dev/null
+++ b/srcpkgs/qt6-webengine/patches/cross-build-examples.patch
@@ -0,0 +1,16 @@
+--- a/examples/CMakeLists.txt
++++ b/examples/CMakeLists.txt
+@@ -1,7 +1,6 @@
+ cmake_minimum_required(VERSION 3.16)
+ 
+ qt_examples_build_begin(EXTERNAL_BUILD)
+-if(NOT CMAKE_CROSSCOMPILING) #QTBUG-86533
+     if(TARGET Qt::WebEngineCore)
+         add_subdirectory(webenginequick)
+     endif()
+@@ -14,5 +13,4 @@ if(NOT CMAKE_CROSSCOMPILING) #QTBUG-8653
+     if(TARGET Qt::PdfWidgets)
+         add_subdirectory(pdfwidgets)
+     endif()
+-endif()
+ qt_examples_build_end()
diff --git a/srcpkgs/qt6-webengine/template b/srcpkgs/qt6-webengine/template
new file mode 100644
index 000000000000..d28470d317a3
--- /dev/null
+++ b/srcpkgs/qt6-webengine/template
@@ -0,0 +1,179 @@
+# Template file for 'qt6-webengine'
+pkgname=qt6-webengine
+version=6.3.1
+revision=1
+wrksrc="qtwebengine-everywhere-src-${version}"
+build_style=cmake
+configure_args="
+ -DQT_FEATURE_webengine_system_ffmpeg=ON
+ -DQT_FEATURE_webengine_system_libevent=ON
+ -DQT_FEATURE_webengine_system_gn=ON
+ -DQT_FEATURE_webengine_system_icu=ON
+ -DQT_FEATURE_webengine_webrtc_pipewire=ON
+ -DNinja_EXECUTABLE=$XBPS_WRAPPERDIR/ninja
+ $(vopt_bool examples QT_BUILD_EXAMPLES)
+ -DPKG_CONFIG_HOST_EXECUTABLE=${PKG_CONFIG_FOR_BUILD}"
+hostmakedepends="qt6-base-devel perl pkg-config nodejs python3-html5lib
+ qt6-declarative-devel protobuf gperf flex nss-devel libwebp-devel
+ icu-devel libevent-devel"
+makedepends="qt6-base-devel qt6-declarative-devel pulseaudio-devel
+ qt6-tools-devel qt6-websockets-devel libflac-devel
+ alsa-lib-devel libvpx-devel pciutils-devel opus-devel libxslt-devel
+ libxml2-devel freetype-devel lcms2-devel libwebp-devel icu-devel
+ re2-devel zlib-devel libpng-devel minizip-devel harfbuzz-devel
+ nss-devel libXcursor-devel libXcomposite-devel libXScrnSaver-devel
+ protobuf-devel ffmpeg-devel snappy-devel libevent-devel pipewire-devel
+ libxkbfile-devel qt6-location-devel qt6-webchannel-devel libxshmfence-devel"
+# Not working properly with HTTPS without those packages
+# Not strict dependencies, though
+depends="qt6-plugin-tls-openssl qt6-plugin-tls-qcertonly"
+short_desc="Cross-platform application and UI framework - Webengine"
+maintainer="John <me@johnnynator.dev>"
+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=ad7a33b21a956deda37c587d50f821ca3816403ae31ba9b5d59d01561ad66e47
+
+if [ -z "$CROSS_BUILD" ];then
+	configure_args+=" -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=TRUE"
+	configure_args+=" -DCMAKE_TOOLCHAIN_FILE=/usr/lib/cmake/Qt6/qt.toolchain.cmake"
+fi
+
+if [ "$XBPS_LIBC" = "musl" ]; then
+	hostmakedepends+=" musl-legacy-compat"
+fi
+
+if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
+	makedepends+=" musl-legacy-compat"
+fi
+
+if [ ! "$XBPS_WORDSIZE" = "$XBPS_TARGET_WORDSIZE" ]; then
+	broken="webengine can be built only if word size matches"
+fi
+
+if [ "$XBPS_WORDSIZE" -eq 32 ]; then
+	nodebug=yes
+	LDFLAGS="-Wl,--no-keep-memory"
+fi
+
+if [ "$XBPS_TARGET_ENDIAN" != "le" ]; then
+	broken="webengine only supports little endian"
+fi
+
+build_options="sndio examples"
+build_options_default=""
+desc_option_examples="Build examples"
+desc_option_sndio="Enable support for sndio"
+
+subpackages="qt6-webengine-devel"
+
+if [ "$build_option_examples" ]; then
+	subpackages+=" qt6-webengine-examples"
+fi
+
+_bootstrap_gn() {
+	# Bootstrap gn (generate ninja)
+	echo "Bootstrapping 'gn'"
+	cd ${wrksrc}/src/3rdparty/gn
+	CFLAGS="$CFLAGS_host" CXXFLAGS="$CXXFLAGS_host" LDFLAGS="$LDFLAGS_host" \
+	PKGCONFIG=/usr/bin/pkgconfig PKG_CONFIG_PATH="/usr/lib/pkgconfig:/usr/share/pkgconfig" \
+		python3 build/gen.py --no-last-commit-position --out-path \
+			${wrksrc}/src/3rdparty/gn/out/Release --cc "${CC_host:-$CC}" \
+			--cxx "${CXX_host:-$CXX}" --ld "${CXX_host:-$CXX}" --ar "${AR_host:-$AR}" \
+			--qt-version "${version}.qtwebengine.qt.io"
+	ninja -C out/Release gn
+	cd ${wrksrc}
+}
+
+_unbundle_libs() {
+	cd ${wrksrc}/src/3rdparty/chromium
+	echo Dropping bundled libs from chromium
+	# Use system-provided libraries.
+	# TODO: use_system_hunspell (upstream changes needed).
+	# TODO: use_system_libsrtp.
+	# TODO: use_system_libusb (http://crbug.com/266149).
+	# TODO: use_system_ssl (http://crbug.com/58087).
+	# TODO: use_system_sqlite (http://crbug.com/22208).
+	# TODO: use_system_icu (segfaults)
+	# use_system_protobuf
+	# use_system_v8=1
+	# use_system_zlib=1
+	# bzip2 jsoncpp minizip xdg_utils speex
+	system="
+		ffmpeg
+		flac
+		fontconfig
+		freetype
+		harfbuzz-ng
+		icu
+		libdrm
+		libevent
+		libjpeg
+		libpng
+		libwebp
+		libxml
+		libxslt
+		opus
+		re2
+		snappy
+	"
+	build/linux/unbundle/replace_gn_files.py --system-libraries ${system}
+}
+
+# Provide a wrapper to run ./xbps-src -j 1 build later
+_wrap_ninja() {
+	cat <<-'_EOF' >"$XBPS_WRAPPERDIR"/ninja
+	#!/bin/sh
+
+	exec /usr/bin/ninja $NINJAFLAGS "$@"
+	_EOF
+	chmod +x "$XBPS_WRAPPERDIR"/ninja
+}
+
+pre_configure() {
+	_bootstrap_gn
+	# _unbundle_libs
+	_wrap_ninja
+	export PATH="$PATH:${wrksrc}/src/3rdparty/gn/out/Release"
+}
+
+pre_build() {
+	export PATH="$PATH:${wrksrc}/src/3rdparty/gn/out/Release"
+	export NINJAFLAGS="$makejobs"
+
+}
+
+pre_install() {
+	export PATH="$PATH:${wrksrc}/src/3rdparty/gn/out/Release"
+}
+
+post_install() {
+	local _file
+	find "${DESTDIR}"/usr/lib/qt6/examples \
+		-path '*/lib/qt6/**/lib/qt6/*' -type f |
+	while read _file; do
+		mv "$_file" "${_file%/lib/qt6/*}"
+	done
+}
+
+qt6-webengine-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} qt6-webchannel-devel>=${version}_1
+	 qt6-declarative-devel>=${version}_1 qt6-location-devel>=${version}_1"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/pkgconfig
+		vmove usr/lib/qt6/mkspecs
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.prl"
+		vmove usr/share/qt6/modules
+	}
+}
+
+qt6-webengine-examples_package() {
+	short_desc+=" - sample browsers"
+	pkg_install() {
+		vmove usr/lib/qt6/examples
+	}
+}
diff --git a/srcpkgs/qt6-webengine/update b/srcpkgs/qt6-webengine/update
new file mode 100644
index 000000000000..844552465222
--- /dev/null
+++ b/srcpkgs/qt6-webengine/update
@@ -0,0 +1 @@
+pkgname="${pkgname/6-/}-everywhere-src"

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

* Re: WIP Qt6 webengine
  2022-08-07  4:36 [PR PATCH] WIP Qt6 webengine sgn
                   ` (34 preceding siblings ...)
  2022-08-15 13:51 ` [PR PATCH] [Updated] " sgn
@ 2022-08-15 13:57 ` sgn
  2022-11-14  3:53 ` github-actions
  2022-11-29  2:03 ` [PR PATCH] [Closed]: " github-actions
  37 siblings, 0 replies; 39+ messages in thread
From: sgn @ 2022-08-15 13:57 UTC (permalink / raw)
  To: ml

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

New comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/38509#issuecomment-1215044562

Comment:
`tst_qvectornd` passed with `-O0`, that seems like an incorrect optimization to me.

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

* Re: WIP Qt6 webengine
  2022-08-07  4:36 [PR PATCH] WIP Qt6 webengine sgn
                   ` (35 preceding siblings ...)
  2022-08-15 13:57 ` sgn
@ 2022-11-14  3:53 ` github-actions
  2022-11-29  2:03 ` [PR PATCH] [Closed]: " github-actions
  37 siblings, 0 replies; 39+ messages in thread
From: github-actions @ 2022-11-14  3:53 UTC (permalink / raw)
  To: ml

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

New comment by github-actions[bot] on void-packages repository

https://github.com/void-linux/void-packages/pull/38509#issuecomment-1313057959

Comment:
Pull Requests become stale 90 days after last activity and are closed 14 days after that.  If this pull request is still relevant bump it or assign it.

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

* Re: [PR PATCH] [Closed]: WIP Qt6 webengine
  2022-08-07  4:36 [PR PATCH] WIP Qt6 webengine sgn
                   ` (36 preceding siblings ...)
  2022-11-14  3:53 ` github-actions
@ 2022-11-29  2:03 ` github-actions
  37 siblings, 0 replies; 39+ messages in thread
From: github-actions @ 2022-11-29  2:03 UTC (permalink / raw)
  To: ml

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

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

WIP Qt6 webengine
https://github.com/void-linux/void-packages/pull/38509

Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->

Never tried to cross build
Functionality works (at least can view youtube video on x86_64-musl)

#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**
[ci skip]

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


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

end of thread, other threads:[~2022-11-29  2:03 UTC | newest]

Thread overview: 39+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-08-07  4:36 [PR PATCH] WIP Qt6 webengine sgn
2022-08-07  4:38 ` [PR PATCH] [Updated] " sgn
2022-08-08 10:13 ` sgn
2022-08-08 12:15 ` sgn
2022-08-09 13:18 ` sgn
2022-08-09 15:11 ` skmpz
2022-08-09 16:42 ` sgn
2022-08-09 16:45 ` [PR PATCH] [Updated] " sgn
2022-08-09 17:27 ` skmpz
2022-08-10  1:14 ` [PR PATCH] [Updated] " sgn
2022-08-10  1:15 ` sgn
2022-08-11  2:01 ` [PR PATCH] [Updated] " sgn
2022-08-14  7:44 ` skmpz
2022-08-14 10:52 ` [PR PATCH] [Updated] " sgn
2022-08-14 10:52 ` sgn
2022-08-14 11:22 ` skmpz
2022-08-14 11:22 ` skmpz
2022-08-14 11:39 ` sgn
2022-08-14 11:41 ` skmpz
2022-08-14 11:42 ` skmpz
2022-08-14 11:43 ` sgn
2022-08-14 11:45 ` [PR PATCH] [Updated] " sgn
2022-08-14 12:14 ` skmpz
2022-08-14 12:14 ` skmpz
2022-08-14 13:34 ` [PR PATCH] [Updated] " sgn
2022-08-14 13:48 ` sgn
2022-08-14 14:40 ` sgn
2022-08-14 15:10 ` sgn
2022-08-14 15:29 ` skmpz
2022-08-14 16:15 ` [PR PATCH] [Updated] " sgn
2022-08-14 17:17 ` sgn
2022-08-14 17:33 ` [PR PATCH] [Updated] " sgn
2022-08-14 17:44 ` sgn
2022-08-15  4:19 ` skmpz
2022-08-15  4:20 ` skmpz
2022-08-15 13:51 ` [PR PATCH] [Updated] " sgn
2022-08-15 13:57 ` sgn
2022-11-14  3:53 ` github-actions
2022-11-29  2:03 ` [PR PATCH] [Closed]: " github-actions

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).