Wed Feb 1 22:01:44 2023 UTC ()
qt6-qtquick3d: add upstream bug report URL


(wiz)
diff -r1.2 -r1.3 pkgsrc/graphics/qt6-qtquick3d/distinfo
diff -r1.1 -r1.2 pkgsrc/graphics/qt6-qtquick3d/patches/patch-src_quick3dparticles_qquick3dparticleemitter.cpp
cvs diff -r1.2 -r1.3 pkgsrc/graphics/qt6-qtquick3d/distinfo (expand / switch to unified diff)

--- pkgsrc/graphics/qt6-qtquick3d/distinfo 2023/02/01 19:36:37 1.2
+++ pkgsrc/graphics/qt6-qtquick3d/distinfo 2023/02/01 22:01:44 1.3
@@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
1$NetBSD: distinfo,v 1.2 2023/02/01 19:36:37 wiz Exp $ 1$NetBSD: distinfo,v 1.3 2023/02/01 22:01:44 wiz Exp $
2 2
3BLAKE2s (qtquick3d-everywhere-src-6.4.1.tar.xz) = 8a561e8d9d7f5fe12afa1747c236ad3ded027992e36694c8e1f04b6b841d1017 3BLAKE2s (qtquick3d-everywhere-src-6.4.1.tar.xz) = 8a561e8d9d7f5fe12afa1747c236ad3ded027992e36694c8e1f04b6b841d1017
4SHA512 (qtquick3d-everywhere-src-6.4.1.tar.xz) = c62226eb1744c0213a901fcf4b56cb3cfa27c5b25881b8f068dbf8e0ed0846e7775e768fe97fe0dfe1ce3d3d4815700b2f3d75d6626d2ac3db1a6328995e454d 4SHA512 (qtquick3d-everywhere-src-6.4.1.tar.xz) = c62226eb1744c0213a901fcf4b56cb3cfa27c5b25881b8f068dbf8e0ed0846e7775e768fe97fe0dfe1ce3d3d4815700b2f3d75d6626d2ac3db1a6328995e454d
5Size (qtquick3d-everywhere-src-6.4.1.tar.xz) = 42793736 bytes 5Size (qtquick3d-everywhere-src-6.4.1.tar.xz) = 42793736 bytes
6SHA1 (patch-src_quick3dparticles_qquick3dparticleemitter.cpp) = 0ccaf87867d22d9a7ba34767e1f0cac7c28249cb 6SHA1 (patch-src_quick3dparticles_qquick3dparticleemitter.cpp) = d3400f38ef08505f41296ac87cf6cb07c30bc3a3
cvs diff -r1.1 -r1.2 pkgsrc/graphics/qt6-qtquick3d/patches/Attic/patch-src_quick3dparticles_qquick3dparticleemitter.cpp (expand / switch to unified diff)

--- pkgsrc/graphics/qt6-qtquick3d/patches/Attic/patch-src_quick3dparticles_qquick3dparticleemitter.cpp 2023/02/01 19:36:37 1.1
+++ pkgsrc/graphics/qt6-qtquick3d/patches/Attic/patch-src_quick3dparticles_qquick3dparticleemitter.cpp 2023/02/01 22:01:44 1.2
@@ -1,18 +1,20 @@ @@ -1,18 +1,20 @@
1$NetBSD: patch-src_quick3dparticles_qquick3dparticleemitter.cpp,v 1.1 2023/02/01 19:36:37 wiz Exp $ 1$NetBSD: patch-src_quick3dparticles_qquick3dparticleemitter.cpp,v 1.2 2023/02/01 22:01:44 wiz Exp $
2 2
3Fix 3Fix
4qquick3dparticleemitter.cpp:723:84: error: no matching function for call to 'min(float, __gnu_cxx::__enable_if<true, double>::__type)' 4qquick3dparticleemitter.cpp:723:84: error: no matching function for call to 'min(float, __gnu_cxx::__enable_if<true, double>::__type)'
5 5
 6https://bugreports.qt.io/browse/QTBUG-110870
 7
6--- src/quick3dparticles/qquick3dparticleemitter.cpp.orig 2022-11-08 19:27:13.000000000 +0000 8--- src/quick3dparticles/qquick3dparticleemitter.cpp.orig 2022-11-08 19:27:13.000000000 +0000
7+++ src/quick3dparticles/qquick3dparticleemitter.cpp 9+++ src/quick3dparticles/qquick3dparticleemitter.cpp
8@@ -716,11 +716,11 @@ void QQuick3DParticleEmitter::emitPartic 10@@ -716,11 +716,11 @@ void QQuick3DParticleEmitter::emitPartic
9 // max value 127*127 = 16129 degrees/second 11 // max value 127*127 = 16129 degrees/second
10 float sign; 12 float sign;
11 sign = rotVelX < 0.0f ? -1.0f : 1.0f; 13 sign = rotVelX < 0.0f ? -1.0f : 1.0f;
12- rotVelX = std::max(-127.0f, std::min(127.0f, sign * std::sqrt(abs(rotVelX)))); 14- rotVelX = std::max(-127.0f, std::min(127.0f, sign * std::sqrt(abs(rotVelX))));
13+ rotVelX = std::max(-127.0f, std::min<float>(127.0f, sign * std::sqrt(abs(rotVelX)))); 15+ rotVelX = std::max(-127.0f, std::min<float>(127.0f, sign * std::sqrt(abs(rotVelX))));
14 sign = rotVelY < 0.0f ? -1.0f : 1.0f; 16 sign = rotVelY < 0.0f ? -1.0f : 1.0f;
15- rotVelY = std::max(-127.0f, std::min(127.0f, sign * std::sqrt(abs(rotVelY)))); 17- rotVelY = std::max(-127.0f, std::min(127.0f, sign * std::sqrt(abs(rotVelY))));
16+ rotVelY = std::max(-127.0f, std::min<float>(127.0f, sign * std::sqrt(abs(rotVelY)))); 18+ rotVelY = std::max(-127.0f, std::min<float>(127.0f, sign * std::sqrt(abs(rotVelY))));
17 sign = rotVelZ < 0.0f ? -1.0f : 1.0f; 19 sign = rotVelZ < 0.0f ? -1.0f : 1.0f;
18- rotVelZ = std::max(-127.0f, std::min(127.0f, sign * std::sqrt(abs(rotVelZ)))); 20- rotVelZ = std::max(-127.0f, std::min(127.0f, sign * std::sqrt(abs(rotVelZ))));