user debian-rele...@lists.debian.org
usertag 1084909 + bsp-2024-10-at-sbg
tags 1084909 + patch
thank you
Dear maintainer,
I've prepared an NMU for catch2 (versioned as 3.7.1-0.2). The diff
is attached to this message.
Cheers
--
Sebastian Ramacher
diff -Nru catch2-3.7.1/debian/changelog catch2-3.7.1/debian/changelog
--- catch2-3.7.1/debian/changelog 2024-10-06 09:33:35.000000000 +0200
+++ catch2-3.7.1/debian/changelog 2024-10-18 19:30:29.000000000 +0200
@@ -1,3 +1,12 @@
+catch2 (3.7.1-0.2) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * debian/patches: Increase alignment to maximum to work around build issues
+ (Closes: #1084909)
+ * debian/rules: Build without -Werror
+
+ -- Sebastian Ramacher <sramac...@debian.org> Fri, 18 Oct 2024 19:30:29 +0200
+
catch2 (3.7.1-0.1) unstable; urgency=medium
* Non-maintainer upload
diff -Nru catch2-3.7.1/debian/patches/fix-alignment.patch catch2-3.7.1/debian/patches/fix-alignment.patch
--- catch2-3.7.1/debian/patches/fix-alignment.patch 1970-01-01 01:00:00.000000000 +0100
+++ catch2-3.7.1/debian/patches/fix-alignment.patch 2024-10-18 17:39:47.000000000 +0200
@@ -0,0 +1,20 @@
+--- a/src/catch2/benchmark/catch_constructor.hpp
++++ b/src/catch2/benchmark/catch_constructor.hpp
+@@ -18,7 +18,7 @@
+ namespace Benchmark {
+ namespace Detail {
+ template <typename T, bool Destruct>
+- struct ObjectStorage
++ struct alignas(alignof(T)) ObjectStorage
+ {
+ ObjectStorage() = default;
+
+@@ -67,7 +67,7 @@
+ # pragma GCC diagnostic pop
+ #endif
+
+- alignas( T ) unsigned char data[sizeof( T )]{};
++ alignas( alignof(T) ) unsigned char data[sizeof( T )]{};
+ };
+ } // namespace Detail
+
diff -Nru catch2-3.7.1/debian/patches/series catch2-3.7.1/debian/patches/series
--- catch2-3.7.1/debian/patches/series 1970-01-01 01:00:00.000000000 +0100
+++ catch2-3.7.1/debian/patches/series 2024-10-18 17:15:37.000000000 +0200
@@ -0,0 +1 @@
+fix-alignment.patch
diff -Nru catch2-3.7.1/debian/rules catch2-3.7.1/debian/rules
--- catch2-3.7.1/debian/rules 2024-10-06 09:31:32.000000000 +0200
+++ catch2-3.7.1/debian/rules 2024-10-18 17:51:16.000000000 +0200
@@ -16,4 +16,5 @@
dh_auto_configure -- \
-DCMAKE_INSTALL_LIBDIR=lib \
-DCMAKE_INSTALL_DOCDIR=/usr/share/doc/libcatch2-dev/docs \
- -DCATCH_DEVELOPMENT_BUILD=$(ENABLE_SELFTEST)
+ -DCATCH_DEVELOPMENT_BUILD=$(ENABLE_SELFTEST) \
+ -DCATCH_ENABLE_WERROR=OFF
