gentoo auto-resync : 21:07:2024 - 12:30:10

6 files changed, 33 insertions, 4 deletions

diff --git a/dev-qt/qtquick3d/Manifest b/dev-qt/qtquick3d/Manifest
index 5f785bff35e0..5e39bcd9e338 100644
--- a/dev-qt/qtquick3d/Manifest
+++ b/dev-qt/qtquick3d/Manifest
@@ -1,8 +1,9 @@
 AUX qtquick3d-6.6.2-gcc14.patch 953 BLAKE2B 0119092790be34134af0989a7e4b78d565a741e3a72f0ae76c48106f68fb6867b3395706951e93e86343d3214c5d02b3b21eea175c1460e8c38d44c8f36ec605 SHA512 13352dc71f986888e5017f2e4a6267e1bc10c81c419d607de673212cb7d16132566e11a040c6ebfa5bde9834043eb1b38d6723f890c707af76f6490c1a8b3ffa
 AUX qtquick3d-6.6.2-x32abi.patch 439 BLAKE2B 293bbae94e4ffcf6cbeda420a2f2af0e7fd6112c4e69ddb7dc9bb87bd82374c6435e038e114da08508312d742924f701aec5f647f60519e55728efb7feeb18e5 SHA512 4d8fdd20a6d3e06772bbf3c025651daa4d33ced61dfd8191f946b19318826c41f8f3c0eea1aae3aaeb01766715287d237eacbae1741a807bf64a242aaddb323c
+AUX qtquick3d-6.7.2-gcc15.patch 1365 BLAKE2B 574cf06f28c4ff2c8415f302bf2061b1b38058cb152cc02283933b37fc91a57a4175a0d736110c142277c383294faad8946a444e99b9d5937ea89cf0009a6410 SHA512 f127dbf71c77ee0c69b09d86e6a5eb580113e247a76fa3abb7ddf3b235a15e02f7a484b7bfef196ffd4ccd68768bb8f69dc149f617b4fd40142d99d2b3d09c39
 DIST qtquick3d-everywhere-src-6.7.2.tar.xz 66202160 BLAKE2B 1f3741bb11d21804ec56aa5bfa00b590d94258cb119b4284aa2757fa00785a69aba243e06bf68ca625355a8e8a392249be2ac9679226c8d250320aeb6c4ccf0f SHA512 d5a4557a6f0ea73b43de9238b8cd42fc037c417e72443a8cae96e8be779f82d5fd9efe1a09258a4d5dd55c4791b84192cb72e31bb1d744b618951080fe6fa1e2
-EBUILD qtquick3d-6.7.2.ebuild 1042 BLAKE2B e6d457d178c43419d0725b80434d240bce4f91472d83dfd9ab367aa672b2c2c765477da601a5abfe0154c2dee99a9752731ad0e8b283dd84f1951a498fb638f6 SHA512 6a4469d5df6064b2cc0205ca2d53b25ac43f8bb5f2b01b0a3b209d92f8fa65bc39a7e42e46f776214c711334dad8c3eeff96652d11f5d38cf5c643ade01c3fce
-EBUILD qtquick3d-6.7.9999.ebuild 1047 BLAKE2B 160eaff9170302827436e7f0e655a165ef0944b06431cefa01f1f3868a73ea8dd605828adcbad4f26c42207648c3b749914154c669e3edd9f0ef136aa9868f64 SHA512 14f1d194977ed84ddcdeed65e94be09b2b294ce9172a437eaa12117870e87accc946cd6754bff0fecc3fe5f216efa354ffeda31b61eed3129d769e5054471486
-EBUILD qtquick3d-6.8.9999.ebuild 1238 BLAKE2B bd4ca7741647c874a96257a6530ad83ae3d4c6580e4c20e6cc9c79ed9472c1011db63f3dcc0894ce72642cd77c8d086aebd244a5a904e42e225efaf938cb1345 SHA512 e5932651031fb1b9a6f34585fd4fede6d1e268c8051405d0f868e87f2580115ecf5344074b568e9d63416849eb0ef05de5edb54f7db5c3139ac2d15bf3920677
-EBUILD qtquick3d-6.9999.ebuild 1238 BLAKE2B bd4ca7741647c874a96257a6530ad83ae3d4c6580e4c20e6cc9c79ed9472c1011db63f3dcc0894ce72642cd77c8d086aebd244a5a904e42e225efaf938cb1345 SHA512 e5932651031fb1b9a6f34585fd4fede6d1e268c8051405d0f868e87f2580115ecf5344074b568e9d63416849eb0ef05de5edb54f7db5c3139ac2d15bf3920677
+EBUILD qtquick3d-6.7.2.ebuild 1081 BLAKE2B 8a505568442fdcee697baecae2cd545ab213da2a1f3fc426052f3d24e1e235cf53f9852cb454a7b03943e863a049b376ac80c3edfadb49b68a136f6e176e482b SHA512 60b53323dbbc48d8f2c41f91f805fda4d85c86d6a9467a0b97a31c4698b5249682e0eb3d0a57e2d79de6012f4151cc9b96d91d6c09c38d9aa0089ef17393c612
+EBUILD qtquick3d-6.7.9999.ebuild 1086 BLAKE2B ec9e9a80e9607210074d4f2bb1dd3bbb2848b6df3f4e384c911a4d4d6125bfdd6cb93a525c0c483f00017f0e6b3fa3bde6cb92b5a19330a3f07211e61134cfe7 SHA512 abda722ed0932fd45e83ff776c0f21197bc96b5f763092cf7f82b33e297787d558ebb704939944808a58dce99a0d7b697793c7ef1155eb8c77456478d073fded
+EBUILD qtquick3d-6.8.9999.ebuild 1277 BLAKE2B 781dab7439add58a402d324fb9ad42872867dd1d2c752251bee23c48c4b23eaf738168d05a731a9da63cb285b620c38bf0553b394a65ae8da07fff7d6232f5f4 SHA512 2f8d2c279578e255644d4b7cadafce3d67862f95c0b95428c48d33c8baad3866c7178e10f10473de97e718d85a4aa4b2680a9d75d5804f0ff5ed0ead39ace5f3
+EBUILD qtquick3d-6.9999.ebuild 1277 BLAKE2B 781dab7439add58a402d324fb9ad42872867dd1d2c752251bee23c48c4b23eaf738168d05a731a9da63cb285b620c38bf0553b394a65ae8da07fff7d6232f5f4 SHA512 2f8d2c279578e255644d4b7cadafce3d67862f95c0b95428c48d33c8baad3866c7178e10f10473de97e718d85a4aa4b2680a9d75d5804f0ff5ed0ead39ace5f3
 MISC metadata.xml 534 BLAKE2B 09cf606ee911d677c4a1fb8879a70bcbb527d23f81d39fb3263aef5ad6222b7b0027069cd50b76232f45322b1da0499f2eed6264ef636f3ff0d04c0a5793ec2b SHA512 66438122b8b1d1ce0b2a98b36925944806d3616ce7f653004d2b1a76ad4dee62759bcb8f342e0aefb730765648ca9ad193f833c3596252df3dbca596a8daff08
diff --git a/dev-qt/qtquick3d/files/qtquick3d-6.7.2-gcc15.patch b/dev-qt/qtquick3d/files/qtquick3d-6.7.2-gcc15.patch
new file mode 100644
index 000000000000..37a0ea9c30e9
--- /dev/null
+++ b/dev-qt/qtquick3d/files/qtquick3d-6.7.2-gcc15.patch
@@ -0,0 +1,24 @@
+Newly caught as an error by gcc15.
+https://bugs.gentoo.org/936410
+https://github.com/RenderKit/embree/issues/486
+https://github.com/RenderKit/embree/commit/cda4cf1919bb2a748e78915fbd6e421a1056638d
+From: Daniel Opitz <daniel.opitz@intel.com>
+Date: Mon, 13 May 2024 10:17:51 +0200
+Subject: [PATCH] fix output operator, issue #486
+--- a/src/3rdparty/embree/kernels/geometry/pointi.h
++++ b/src/3rdparty/embree/kernels/geometry/pointi.h
+@@ -212,5 +212,5 @@
+     /*! output operator */
+-    friend __forceinline embree_ostream operator<<(embree_ostream cout, const PointMi& line)
++    friend __forceinline embree_ostream operator<<(embree_ostream cout, const PointMi& point)
+     {
+-      return cout << "Line" << M << "i {" << line.v0 << ", " << line.geomID() << ", " << line.primID() << "}";
++      return cout << "Point" << M << "i {" << point.geomID() << ", " << point.primID() << "}";
+     }
+--- a/src/3rdparty/embree/kernels/subdiv/bezier_curve.h
++++ b/src/3rdparty/embree/kernels/subdiv/bezier_curve.h
+@@ -137,3 +137,3 @@
+       friend embree_ostream operator<<(embree_ostream cout, const QuadraticBezierCurve& a) {
+-        return cout << "QuadraticBezierCurve ( (" << a.u.lower << ", " << a.u.upper << "), " << a.v0 << ", " << a.v1 << ", " << a.v2 << ")";
++        return cout << "QuadraticBezierCurve (" << a.v0 << ", " << a.v1 << ", " << a.v2 << ")";
+       }
diff --git a/dev-qt/qtquick3d/qtquick3d-6.7.2.ebuild b/dev-qt/qtquick3d/qtquick3d-6.7.2.ebuild
index 09ff3f5ce309..a5bf7527d264 100644
--- a/dev-qt/qtquick3d/qtquick3d-6.7.2.ebuild
+++ b/dev-qt/qtquick3d/qtquick3d-6.7.2.ebuild
@@ -32,6 +32,7 @@ DEPEND="
 PATCHES=(
 	"${FILESDIR}"/${PN}-6.6.2-gcc14.patch
 	"${FILESDIR}"/${PN}-6.6.2-x32abi.patch
+	"${FILESDIR}"/${PN}-6.7.2-gcc15.patch
 )
 
 CMAKE_SKIP_TESTS=(
diff --git a/dev-qt/qtquick3d/qtquick3d-6.7.9999.ebuild b/dev-qt/qtquick3d/qtquick3d-6.7.9999.ebuild
index 44521151cdbd..21502bc53a04 100644
--- a/dev-qt/qtquick3d/qtquick3d-6.7.9999.ebuild
+++ b/dev-qt/qtquick3d/qtquick3d-6.7.9999.ebuild
@@ -32,6 +32,7 @@ DEPEND="
 PATCHES=(
 	"${FILESDIR}"/${PN}-6.6.2-gcc14.patch
 	"${FILESDIR}"/${PN}-6.6.2-x32abi.patch
+	"${FILESDIR}"/${PN}-6.7.2-gcc15.patch
 )
 
 CMAKE_SKIP_TESTS=(
diff --git a/dev-qt/qtquick3d/qtquick3d-6.8.9999.ebuild b/dev-qt/qtquick3d/qtquick3d-6.8.9999.ebuild
index ea6e9c04ad8a..ff9c71b3433b 100644
--- a/dev-qt/qtquick3d/qtquick3d-6.8.9999.ebuild
+++ b/dev-qt/qtquick3d/qtquick3d-6.8.9999.ebuild
@@ -32,6 +32,7 @@ DEPEND="
 PATCHES=(
 	"${FILESDIR}"/${PN}-6.6.2-gcc14.patch
 	"${FILESDIR}"/${PN}-6.6.2-x32abi.patch
+	"${FILESDIR}"/${PN}-6.7.2-gcc15.patch
 )
 
 CMAKE_SKIP_TESTS=(
diff --git a/dev-qt/qtquick3d/qtquick3d-6.9999.ebuild b/dev-qt/qtquick3d/qtquick3d-6.9999.ebuild
index ea6e9c04ad8a..ff9c71b3433b 100644
--- a/dev-qt/qtquick3d/qtquick3d-6.9999.ebuild
+++ b/dev-qt/qtquick3d/qtquick3d-6.9999.ebuild
@@ -32,6 +32,7 @@ DEPEND="
 PATCHES=(
 	"${FILESDIR}"/${PN}-6.6.2-gcc14.patch
 	"${FILESDIR}"/${PN}-6.6.2-x32abi.patch
+	"${FILESDIR}"/${PN}-6.7.2-gcc15.patch
 )
 
 CMAKE_SKIP_TESTS=(