gentoo auto-resync : 05:12:2024 - 02:07:17

4 files changed, 23 insertions, 2 deletions

diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
index 3788fc1a9463..83b39df684b1 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -9,6 +9,7 @@ AUX qtwebengine-6.7.2-musl-cstdint.patch 463 BLAKE2B ebc2d97974e960d295a6f5d908b
 AUX qtwebengine-6.7.3-missing-gn-deps-blink.patch 1677 BLAKE2B 6081d8e60712e50b6cd043ed4db645727f38676d91ec3b05e2bcf9acf790273a95e9f67adda7bda573cc73b331b0b565a6b485f91c1a34bbb20b1c4814ce16de SHA512 5e059420feaba3fa3fdf9ac1aabfc655550e4a47f2416d009a5e79643052511f14fe9758dde42026932e1f10976cea2f5d9129c807011eae5efe1d823253a0cc
 AUX qtwebengine-6.7.3-missing-gn-deps.patch 1379 BLAKE2B db39a7c9d374c905d35516fe2f5ee7026d99959215442996d517257431f59a4be4e43041378775c75fa7499fd2bd917e1deb6d8373d5f2cf5b93a9ff7636f767 SHA512 9638e515c294b32362eab9047e6cb926e535a3ee684f9dfac6cf2f7e8a24aa7825265ad768d91ec0a27f34266aef7443b59cc3256a8d0ee527ff8a60b44a735c
 AUX qtwebengine-6.8.1-QTBUG-131156.patch 7291 BLAKE2B 90993c2406631001e1f75f32da495e9d6c91a81d92e30b3902da45a08fe18b36cdddaf7763d58cdd48ea9f25566da3d107807e71bd47c5422e54c9fcbf07cd72 SHA512 0f9d2e14fa2abfe73fa691d91ad57fe833a9b70627d737c49f6928111a4d0a1d294a2a38620b1368b3fad6a347eff408a521fbc2cf4ff317ebf5a63b62c1efb6
+AUX qtwebengine-6.8.1-aarch64-xnnpack.patch 629 BLAKE2B 2809c1e159252c3131c318cd31fd6d7875a41ca477ffcc82b832838eeb0b89ed15baea25f95c894369b73fd41c7cfea0fcc880b5fc097b8e987b718300fb7d3b SHA512 b1e3330a2e6e8b352cf83b8c2e9b469772638d331b78c9f690208044a72a1bbefc5b3114affc5a512a8c0839ece197322a8382da8e8c3be18042a9c394034c31
 DIST qtwebengine-5.15.13_p20240510.tar.xz 301422784 BLAKE2B b63acccb4740ddb3dd5c76ef9808d946eb2c93b10b45125622adcb5c5e951644ac54612e7aeb9e009e00c5ca8913d3f8b5dfa530c274fec87c4a8377bf1068fb SHA512 0ccc1be0825f4cf2387879241a21f033b5a0198da4e93f2e0533296ec485b103c1ab35aa71a2a9d9c16364979d45d3dd2e13f7e6d0e2a21f94d85294c5819eb3
 DIST qtwebengine-5.15.14_p20240510-patchset.tar.xz 20780 BLAKE2B 516d4c628c4b027ab3a7159da006a57173be91de3eb4b7f308029953d4fd19fb3e790ca38e79d17fef75d8d9b392676650acb9285d5913f9ebecaa4136575c47 SHA512 492979d118d6bd9165ee194724e38b627d19c89dbe1daa6b2f55e4a8fc7676748a1eacb9623ee05e09140c2c4a2ac82ddafaef5c45630a117ce0ed14b240a474
 DIST qtwebengine-5.15.16_p20241115.tar.xz 301382752 BLAKE2B 08adfae6228a91f1f4b2a603a28881d9cf97f339d951217f3837d614ebb58aff9b0963220be04cc9a17869b6021a6d7687848bd8ccd1c8c49115a5e6944be84b SHA512 50e0bc7b4236859b4419f2f8eaf37e47c1994c30ca3bf584dd2f4996b5f8ba7cd31c8aae48c28f0fcd39c144490f5e451c7ecf5d340e7b10fa2e37666ef21100
@@ -22,7 +23,7 @@ EBUILD qtwebengine-5.15.14_p20240510.ebuild 7881 BLAKE2B aa91baabae24be838cfe8f2
 EBUILD qtwebengine-5.15.16_p20241115.ebuild 7881 BLAKE2B bf0e536936ff8e3995edf6812f3bb4a250b2cb26a9f1e78eb3cb80d46e95896a0fef41c65f81748fa04bc727aea3f417aaf99172428dc165b6858149692ee461 SHA512 cc7d6e29900e2909b460b4e1645e45452a002e4b143cfb831a798f9aaa7a7dc5e96b232e9726c18cfd46015c7c88a26be011358877f6d9e64792afef561af90d
 EBUILD qtwebengine-6.7.2.ebuild 10382 BLAKE2B 6f20f921189366edc8f501ee0e1d3811fb1e57dfa75b2ff4ac80a50028e6394068415f65ae1bfb84dd9ae7d08a546fdb13050a4c42035dbe0ce6baa1c753534f SHA512 2292f3a7e9b24cdb312b6e9c725d8ad1ed33ee160038bd15d8fac568e53473ef18fe3f4f8bf484009221521325933b7e568b90546a157d10c74faa119c6bf44d
 EBUILD qtwebengine-6.7.3.ebuild 9979 BLAKE2B 17fb965f42ceba78dea107944b68141281c164dd4a86d06cbe8f8a62281af044b84d9e249944aa9f0995610010a97ec55b152fda255545f48440be9852fa01c3 SHA512 b08934fba065e79143b804511e871eb32359290b8156343ebc27e019e65c36a4e6eeb1699f57b5b96980a5c52591e11386113913b900fddbb22a53357fccdf62
-EBUILD qtwebengine-6.8.1.ebuild 10073 BLAKE2B 4f575bc45bcf329e7a6f51c12e0fab8c01b2003ff6056545cd39ec3c89a13fcf5628c27b6a570c8a425eee69448218e9f7cb25c1cc1f01078319c9900dc137ee SHA512 a11eb0e9dae2b19d4987689a4b6c48392ef10b5281bf689797b0888707f90ba2639a9f5da200b93154aa7a0c494af57bb8275f778dddfcf344f3c4bb1183a2bc
-EBUILD qtwebengine-6.8.9999.ebuild 10027 BLAKE2B 0902b768824ccf3415c82a48672cf4d504531153c6cf8675f362d11eb4e06df6cd404f5dde2e3d693126d2df09f0c0f74929cc288fbcb75c3cdce244f2e527ee SHA512 a684514d47c6174aa3c457afc5e949d212b8f0ec9fda46e12c2830baceae5180303783c94430fd37d4c17f8d214dec4a70a4aa1f6b7a200a8bc5975d6bc6fa32
+EBUILD qtwebengine-6.8.1.ebuild 10122 BLAKE2B 5f915c0d9180d80008fcf1fc65edab42a25c18e9820387899584c04f5e4a4f15f006e9dd7e768d65abe3434daf532bbad1ceca4ecd45777a562ecb373cd761a5 SHA512 8ee62e39276b49ede884c74e9ee7b6578a303b3197413d01df9b64b86271544b46ffd30f8f141b0ce46a176892bbbfd4d84c8f809400d86cc7c68d98579ab9bd
+EBUILD qtwebengine-6.8.9999.ebuild 10076 BLAKE2B 24b8842f56bb9a8c6bb9e815bffbdf9001574d65c4bb30e6f75534ad0bcad1365c34e4e6e6d708ad94bd9d54a47de1cd966337845f4c3304aed103f16e2c3657 SHA512 5849fe56d76450bfafc9771df135be779c5544ff5e885fdc244011eccaa7d4260f25cc724e3288c3d0d5a50b98a40271a037bb99d270f4ceea6bce26368fec5e
 EBUILD qtwebengine-6.9999.ebuild 10027 BLAKE2B 0902b768824ccf3415c82a48672cf4d504531153c6cf8675f362d11eb4e06df6cd404f5dde2e3d693126d2df09f0c0f74929cc288fbcb75c3cdce244f2e527ee SHA512 a684514d47c6174aa3c457afc5e949d212b8f0ec9fda46e12c2830baceae5180303783c94430fd37d4c17f8d214dec4a70a4aa1f6b7a200a8bc5975d6bc6fa32
 MISC metadata.xml 1236 BLAKE2B 9a47d6cb2641ee53f22926095457c11f8da65a3705863a3ae0496d5bb656ac65acb744b5420deb95afee6ac9f141933b4f45690459e92c71089fe72727854a28 SHA512 9a640a386cc03804858fc02b24299896c03eff53a07db00862bab9d7dd259ca839e890921fcf222c8275cad16b418e423e7e485c03e74e01ab86979553251b4c
diff --git a/dev-qt/qtwebengine/files/qtwebengine-6.8.1-aarch64-xnnpack.patch b/dev-qt/qtwebengine/files/qtwebengine-6.8.1-aarch64-xnnpack.patch
new file mode 100644
index 000000000000..033934a2dc5b
--- /dev/null
+++ b/dev-qt/qtwebengine/files/qtwebengine-6.8.1-aarch64-xnnpack.patch
@@ -0,0 +1,18 @@
+Patch status: *seems* fixed in Qt 6.9+
+
+Temporary (lame) workaround for [1] given backporting[2] (which
+is believed to be the fix) does not seem trivial. A better fix
+is welcome if have one and can test it, but otherwise this can
+likely be removed in Qt 6.9.0.
+
+[1] https://bugs.gentoo.org/945843
+[2] https://github.com/google/XNNPACK/pull/1789
+--- a/src/3rdparty/chromium/third_party/xnnpack/BUILD.gn
++++ b/src/3rdparty/chromium/third_party/xnnpack/BUILD.gn
+@@ -27,4 +27,5 @@
+ 
++  cflags = [ "-Wno-error=incompatible-pointer-types" ]
+   if (is_clang || !is_win) {
+-    cflags = [
++    cflags += [
+       "-Wno-unused-function",
diff --git a/dev-qt/qtwebengine/qtwebengine-6.8.1.ebuild b/dev-qt/qtwebengine/qtwebengine-6.8.1.ebuild
index fb3569f4ffa9..2bdf65bdc2e4 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.8.1.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.8.1.ebuild
@@ -109,6 +109,7 @@ PATCHES=( "${WORKDIR}"/patches/${PN} )
 PATCHES+=(
 	# add extras as needed here, may merge in set if carries across versions
 	"${FILESDIR}"/${PN}-6.8.1-QTBUG-131156.patch
+	"${FILESDIR}"/${PN}-6.8.1-aarch64-xnnpack.patch
 )
 
 python_check_deps() {
diff --git a/dev-qt/qtwebengine/qtwebengine-6.8.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.8.9999.ebuild
index fe2e1400e79f..854bf4948352 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.8.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.8.9999.ebuild
@@ -108,6 +108,7 @@ PATCHES=( "${WORKDIR}"/patches/${PN} )
 
 PATCHES+=(
 	# add extras as needed here, may merge in set if carries across versions
+	"${FILESDIR}"/${PN}-6.8.1-aarch64-xnnpack.patch
 )
 
 python_check_deps() {