Bug#1109849: unblock: stdgpu-contrib/1.3.0+git20220507.32e0517-3
Package: release.debian.org
Severity: normal
X-Debbugs-Cc: stdgpu-contrib@packages.debian.org, sanvila@debian.org, anbe@debian.org>
Control: affects -1 + src:stdgpu-contrib
User: release.debian.org@packages.debian.org
Usertags: unblock
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512
Please unblock package stdgpu-contrib
[ Reason ]
The stdgpu-contrib package FTBFS with the current nvidia toolchain
due to a version detection problem at build time. This upload fixes
the CMake script.
[ Impact ]
The stdgpu-contrib package will no longer build correctly in trixie if
cccl is updated.
[ Tests ]
The package has been built manually on all supported architectures.
[ Risks ]
There is no change in actual executable code, only the build system is
affected. The risk is virtually none, and the package has no reverse
dependencies anyway.
[ Checklist ]
[x] all changes are documented in the d/changelog
[x] I reviewed all changes and I approve them
[x] attach debdiff against the package in testing
[ Other info ]
FTBFS has been discussed at https://bugs.debian.org/1109841
According to Andreas, the cccl package needs to be updated for trixie to
prevent breakage in the nvidia toolchain, but I'm not seeing any unblock
requests yet.
This change is independent of the cccl fix in the sense that the package
will be buildable even if cccl is not updated in trixie.
unblock stdgpu-contrib/1.3.0+git20220507.32e0517-3
-----BEGIN PGP SIGNATURE-----
iQIzBAEBCgAdFiEEmwPruYMA35fCsSO/zIxr3RQD9MoFAmiDJDAACgkQzIxr3RQD
9MpMLg/7BCtSh7yVFYWj/azjv42tv+5OTj0sOyVxRWE8h3EUr7u6P26B1lvKjZLP
PDmEebH9TchzX5nS0KyvBSC5Dby4pkjzHJ3mZKKsidvB7TOGBsmX/D3cb39OkDjm
AmvrWrebhGwXWSYwVEqttMR3FeQL48X1QUqk9tJVe/gl7Jgg1OXKt3Uci+ZBbgAR
6DWJskuvlqqGL3P2eQWQo534DKo2Cay7uqbcVRDmOdoS0BIKMW25PdN4U+vq52NI
fmRjnHg7lNHSf73X6pDIqWl0P+vWZhZXgHNXnsArfq6Q+ckkZ1NCR8eEuXB4lWEg
Of4aPeGHqiPbDaj8Mcd70tcj8FdeY8cvNQE+oRTW7IaEcWJM7OJXfu14ZYXUfFLq
mfAbXrcnO01gtVGj0Ly0Lz0HhJwUzgAWJnHigT4RYTSySB4dJaU0JBB3LTCw+Eos
J4FxtG9Pn+gZxMuvh645rxJ0g26Iv3MwLVEYq/ldLmI/TiwJKDTlhh6RgjYH71YZ
mKYQJhzzjAdkdSJMcYRzzVXGsmIITBWzFIcxaWtBkzcqxmfF0ZxJBGm4ao1tGz1C
iLO2VvGBsYdSQIbu8V/SgdyEC1FjU56l3k3QS1RmCppSKVkXKs23WGtXHU+0TvZ4
W/sqL2ARdutE+J2NOggpQqrsmdBjTzsFZLGWZLHJ4dfK2EjV5ME=
=D0sd
-----END PGP SIGNATURE-----
diff --git a/debian/changelog b/debian/changelog
index 0a3c3f5..0c82ea1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+stdgpu-contrib (1.3.0+git20220507.32e0517-3) unstable; urgency=medium
+
+ * Fix Thrust version detection (Closes: #1109841)
+
+ -- Timo Röhling <roehling@debian.org> Fri, 25 Jul 2025 07:32:51 +0200
+
stdgpu-contrib (1.3.0+git20220507.32e0517-2) unstable; urgency=medium
* Merge stdgpu-contrib repo into stdgpu repo
diff --git a/debian/patches/0008-Fix-Thrust-version-detection.patch b/debian/patches/0008-Fix-Thrust-version-detection.patch
new file mode 100644
index 0000000..22a3e9a
--- /dev/null
+++ b/debian/patches/0008-Fix-Thrust-version-detection.patch
@@ -0,0 +1,24 @@
+From: =?utf-8?q?Timo_R=C3=B6hling?= <roehling@debian.org>
+Date: Fri, 25 Jul 2025 07:29:39 +0200
+Subject: Fix Thrust version detection
+
+Origin: upstream, https://github.com/stotko/stdgpu/commit/1f0b2d51718692ec9046fe1b36173a591c611bdb
+Bug: https://github.com/stotko/stdgpu/issues/407
+Bug-Debian: https://bugs.debian.org/1109841
+---
+ cmake/Findthrust.cmake | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/cmake/Findthrust.cmake b/cmake/Findthrust.cmake
+index 2837f84..70399fb 100644
+--- a/cmake/Findthrust.cmake
++++ b/cmake/Findthrust.cmake
+@@ -12,7 +12,7 @@ if(THRUST_INCLUDE_DIR)
+ THRUST_VERSION_STRING
+ REGEX "#define THRUST_VERSION[ \t]+([0-9x]+)")
+
+- string(REGEX REPLACE "#define THRUST_VERSION[ \t]+" "" THRUST_VERSION_STRING ${THRUST_VERSION_STRING})
++ string(REGEX REPLACE "#define THRUST_VERSION[ \t]+([0-9]+).*" "\\1" THRUST_VERSION_STRING ${THRUST_VERSION_STRING})
+
+ math(EXPR THRUST_VERSION_MAJOR "${THRUST_VERSION_STRING} / 100000")
+ math(EXPR THRUST_VERSION_MINOR "(${THRUST_VERSION_STRING} / 100) % 1000")
diff --git a/debian/patches/series b/debian/patches/series
index a5ecee7..82b063d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@
0005-Disable-enable_language-HIP-for-now.patch
0006-Handle-architecture-dependent-signedness-of-char-and.patch
0007-Fix-wrong-alignment-test-to-actually-provoke-wrong-a.patch
+0008-Fix-Thrust-version-detection.patch
Reply to: