gentoo auto-resync : 22:02:2024 - 17:40:30

6 files changed, 22 insertions, 4 deletions

diff --git a/dev-qt/qtbase/Manifest b/dev-qt/qtbase/Manifest
index 83eb3d00f06f..8d4366dd08bb 100644
--- a/dev-qt/qtbase/Manifest
+++ b/dev-qt/qtbase/Manifest
@@ -2,9 +2,10 @@ AUX qtbase-6.5.2-hppa-forkfd-grow-stack.patch 1001 BLAKE2B 21fabd37d44ad496d2e11
 AUX qtbase-6.5.2-no-glx.patch 1298 BLAKE2B 83b399a1faa1bb976bc00b7d0b9721b2a2bc64f11f345d3ddb6019481c16f503a6faf1789c56fdbbb7a4d0bde5ffd9c1620dc677189d0e40008cef0ab02e732e SHA512 fcdd0ad2f0f6dadfea8ca00fbb93c18426eb4e12a8374f9f6d0c9fb2f4aa3bb9494e1c5eb0408066dbc4f9b5075c56f8b99a6336b9d66ac5558e99f38357f9ca
 AUX qtbase-6.5.2-no-symlink-check.patch 152 BLAKE2B 676ff8577f678fe3ed1e34e3fc8f7a9b16145259b2e23c432d4cb08465cb5d3a6685e557c9da862f3abb0d51459c7dc055155d804c3daef768bf0e9bdcc3b162 SHA512 6a82cb63812c7fa6d04e9ba9d017ce23ff1d620ec6ebcd575719678138d74e1298e3962d48e211ee72c9a533f03cb7a0fa47b428592a1402ec7ad1d1c487a4b4
 AUX qtbase-6.6.1-forkfd-childstack-size.patch 1003 BLAKE2B abc1bc5633032fc55fca91ef3dcc33617b11694d7a9d97e5eac21c0b4aae900082b7158da08b8514a3424364a3c35cb49d46fa11a0739aadbb73766b7fee949a SHA512 9e1dfb3452858131db286cb30915871e46178bb0891b604a257745fad133676cdf0df5273b6f681c49b1c3d3245f2c6e0a5025ce19efe6a0ed8bf5a1b3a5a5f0
+AUX qtbase-6.6.2-x32abi.patch 588 BLAKE2B 787230500a478aa11dc9b9625cd36d0d27eb3ef851b85004477c1505918e829e6b45cc4691bea10fb5afa78be79f6426d25fca86b090af96322c37d8d569bba6 SHA512 364fd14eb58227c3f9c5ba4a73c6c02e2250e16eb9e8c901ebc57ec89897cc630d02636814ec2551c8904115031f6f8b8e5f530b8fa59d5a674af78c8b85d789
 DIST qtbase-everywhere-src-6.6.2.tar.xz 48689304 BLAKE2B e00f4ac7ede0694b7934612f7dc3acdd50139d385492034c3046625a973d8adbca059e9d4081e248502cab8c673806cdb6b8bc5cee6d9356bbb0a7845db528a2 SHA512 ea343bcf269779a4e078ed8baddfbe6c5ec4a34275c7d72b3f3928da60feece2ddc9ce4a380c6536a4e1654b483cee8918f8ad3038904725d2dd1c653ae83ece
-EBUILD qtbase-6.6.2.ebuild 9836 BLAKE2B 9309ed0fa70080b127f3a3302a13641261970b1d754c440a98100e0745fbbf896122ae28eb383b45a58676f598ecce18d61ce7b9850a978f82cbeea662526f79 SHA512 88db8de199c1e60d95227e72960fd5d45b92164f7b965b5417305409f41d4141b73d012a948615dd3e2927e861c1141b3cbb0c320aee72e2a4afae991bed8e48
-EBUILD qtbase-6.6.9999.ebuild 9837 BLAKE2B e1c1da752bffc8664a66b91288a303cab648f6c340fc1ea4dd80609b57ac2658070fd6e6f104c2f3dc5c3349a9604902dcf3b255e3e74fc2a4f33bf237f047c3 SHA512 f5ec4dca8771a5d28f3df188dbbce0f640eeaae821e57ea2ab93e965c6b284db2a4670dfd34bc0e534506ff393bff8478d3abb6142df5a7b301c01295bba035a
-EBUILD qtbase-6.7.9999.ebuild 9928 BLAKE2B 083e2cc7b81128bb2fbd9d5a9d999e88a5badc55a701651431833be1c267f55c3777c64a3ecccaf08fe822791c93bd061443d5a2f857086818777cf465743ff2 SHA512 ac67c2f98a85c8c8e363ba5e929d3c80f14377b74b29dd7727175c56c04bddf8364c3bde610bef843a01492651d711c8bc6187455eba99953516afe035c0bb1e
-EBUILD qtbase-6.9999.ebuild 9928 BLAKE2B 083e2cc7b81128bb2fbd9d5a9d999e88a5badc55a701651431833be1c267f55c3777c64a3ecccaf08fe822791c93bd061443d5a2f857086818777cf465743ff2 SHA512 ac67c2f98a85c8c8e363ba5e929d3c80f14377b74b29dd7727175c56c04bddf8364c3bde610bef843a01492651d711c8bc6187455eba99953516afe035c0bb1e
+EBUILD qtbase-6.6.2.ebuild 9876 BLAKE2B 8505bd193eb70da82bb363c95c2cdb23914d9b913e2a69bb86b968547707b7679ce1be9e1d8a4b6a26b04982109bbcd48409ca374184069155af2699da527e34 SHA512 ef7d491bde4a72fb62ee6ddcb1b73ebfdf171852e811ec5990829d031afb0a14c4f3841b3f22ccb0a260fd8db9339edb94f50ade8d7312147516ca6ff7b5aba1
+EBUILD qtbase-6.6.9999.ebuild 9877 BLAKE2B 42340e1c9ea1feb1a2649145d982121ca50beef0631fce397ddfe666b5a2dda19214bbbfca4873d99919c1d2927692c73f6bdf3a96d51d7b6569f9c205c01fbb SHA512 e51ac94192cb7f7dffce5ffbf68fb9ac02e1e43f3aae36608be1bff98268ef2bbeec073f2da9a1edf0199a28a30364e3cdc663dd7d530c7655b38f807598446c
+EBUILD qtbase-6.7.9999.ebuild 9968 BLAKE2B 92b606897b4d1b0f8e35804bbf2542828fd2c456085592d6e6499929ee1076610037e64b64c7f313efcc8b3ce7c3738f5bdf22956d46df235be65809ee7307d7 SHA512 d6fb4a4db4ba4211ca96d93be9b54f647af611c8a63ac46b060ec40a84f9b3aa1f83a5a4930cf79c7917f20e9d559e81d6e279eec5e8ba2428d3943c560f2fae
+EBUILD qtbase-6.9999.ebuild 9968 BLAKE2B 92b606897b4d1b0f8e35804bbf2542828fd2c456085592d6e6499929ee1076610037e64b64c7f313efcc8b3ce7c3738f5bdf22956d46df235be65809ee7307d7 SHA512 d6fb4a4db4ba4211ca96d93be9b54f647af611c8a63ac46b060ec40a84f9b3aa1f83a5a4930cf79c7917f20e9d559e81d6e279eec5e8ba2428d3943c560f2fae
 MISC metadata.xml 1655 BLAKE2B 1f3bdbe5f14716d1825ff0ce6d3a9439a87c0c18abd0bb6a2286c9709e815205f2f6911ef5d053b57598aa54471d4316f87c9a4d36004be15f499447785f14bd SHA512 d1479bae177f75991241eacaa1300f43d644730fa3d6d7e6e039b8a212f1289b920b6e1aad7c56576857049f133492f5cf648c7931228c6c4ee272d93437e351
diff --git a/dev-qt/qtbase/files/qtbase-6.6.2-x32abi.patch b/dev-qt/qtbase/files/qtbase-6.6.2-x32abi.patch
new file mode 100644
index 000000000000..1204dcc5c25c
--- /dev/null
+++ b/dev-qt/qtbase/files/qtbase-6.6.2-x32abi.patch
@@ -0,0 +1,13 @@
+https://bugs.gentoo.org/925103
+--- a/src/corelib/thread/qthread.h
++++ b/src/corelib/thread/qthread.h
+@@ -166,5 +166,9 @@
+ #elif defined(Q_PROCESSOR_X86_64) && ((defined(Q_OS_LINUX) && defined(__GLIBC__)) || defined(Q_OS_FREEBSD))
+     // x86_64 Linux, BSD uses FS
++# if defined(__ILP32__)
++    __asm__("mov %%fs:%c1, %0" : "=r" (tid) : "i" (2 * sizeof(void*)) : );
++# else
+     __asm__("movq %%fs:%c1, %0" : "=r" (tid) : "i" (2 * sizeof(void*)) : );
++# endif
+ #elif defined(Q_PROCESSOR_X86_64) && defined(Q_OS_WIN)
+     // See https://en.wikipedia.org/wiki/Win32_Thread_Information_Block
diff --git a/dev-qt/qtbase/qtbase-6.6.2.ebuild b/dev-qt/qtbase/qtbase-6.6.2.ebuild
index fe273bc5f7c9..14520bcdd35c 100644
--- a/dev-qt/qtbase/qtbase-6.6.2.ebuild
+++ b/dev-qt/qtbase/qtbase-6.6.2.ebuild
@@ -137,6 +137,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-6.5.2-no-glx.patch
 	"${FILESDIR}"/${PN}-6.5.2-no-symlink-check.patch
 	"${FILESDIR}"/${PN}-6.6.1-forkfd-childstack-size.patch
+	"${FILESDIR}"/${PN}-6.6.2-x32abi.patch
 )
 
 src_prepare() {
diff --git a/dev-qt/qtbase/qtbase-6.6.9999.ebuild b/dev-qt/qtbase/qtbase-6.6.9999.ebuild
index d7b14a3f1a66..a39a20691815 100644
--- a/dev-qt/qtbase/qtbase-6.6.9999.ebuild
+++ b/dev-qt/qtbase/qtbase-6.6.9999.ebuild
@@ -137,6 +137,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-6.5.2-no-glx.patch
 	"${FILESDIR}"/${PN}-6.5.2-no-symlink-check.patch
 	"${FILESDIR}"/${PN}-6.6.1-forkfd-childstack-size.patch
+	"${FILESDIR}"/${PN}-6.6.2-x32abi.patch
 )
 
 src_prepare() {
diff --git a/dev-qt/qtbase/qtbase-6.7.9999.ebuild b/dev-qt/qtbase/qtbase-6.7.9999.ebuild
index e2aa70f1ea9b..c2827c3f3ac9 100644
--- a/dev-qt/qtbase/qtbase-6.7.9999.ebuild
+++ b/dev-qt/qtbase/qtbase-6.7.9999.ebuild
@@ -138,6 +138,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-6.5.2-hppa-forkfd-grow-stack.patch
 	"${FILESDIR}"/${PN}-6.5.2-no-symlink-check.patch
 	"${FILESDIR}"/${PN}-6.6.1-forkfd-childstack-size.patch
+	"${FILESDIR}"/${PN}-6.6.2-x32abi.patch
 )
 
 src_prepare() {
diff --git a/dev-qt/qtbase/qtbase-6.9999.ebuild b/dev-qt/qtbase/qtbase-6.9999.ebuild
index e2aa70f1ea9b..c2827c3f3ac9 100644
--- a/dev-qt/qtbase/qtbase-6.9999.ebuild
+++ b/dev-qt/qtbase/qtbase-6.9999.ebuild
@@ -138,6 +138,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-6.5.2-hppa-forkfd-grow-stack.patch
 	"${FILESDIR}"/${PN}-6.5.2-no-symlink-check.patch
 	"${FILESDIR}"/${PN}-6.6.1-forkfd-childstack-size.patch
+	"${FILESDIR}"/${PN}-6.6.2-x32abi.patch
 )
 
 src_prepare() {