Étienne Mollier pushed to branch master at Debian Med / ismrmrd
Commits: e2617763 by Étienne Mollier at 2025-11-28T18:33:42+01:00 struct-padding.patch: new: fix ftbfs on 32-bit. Closes: #1119868 - - - - - 5524ec48 by Étienne Mollier at 2025-11-28T18:34:56+01:00 d/control: drop redundant Rules-Requires-Root: no. - - - - - 706f0d88 by Étienne Mollier at 2025-11-28T18:41:08+01:00 d/copyright: drop unused license terms. - - - - - 41ac9f4c by Étienne Mollier at 2025-11-28T18:51:52+01:00 struct-padding.patch: forwarded upstream. Gbp-Dch: ignore - - - - - 9bfcd535 by Étienne Mollier at 2025-11-28T18:52:30+01:00 d/changelog: ready for upload to unstable. - - - - - 5 changed files: - debian/changelog - debian/control - debian/copyright - debian/patches/series - + debian/patches/struct-padding.patch Changes: ===================================== debian/changelog ===================================== @@ -1,3 +1,12 @@ +ismrmrd (1.14.3-2) unstable; urgency=medium + + * Team upload. + * struct-padding.patch: new: fix ftbfs on 32-bit. (Closes: #1119868) + * d/control: drop redundant Rules-Requires-Root: no. + * d/copyright: drop unused license terms. + + -- Étienne Mollier <[email protected]> Fri, 28 Nov 2025 18:52:17 +0100 + ismrmrd (1.14.3-1) unstable; urgency=medium * Team upload. ===================================== debian/control ===================================== @@ -21,7 +21,6 @@ Build-Depends-Indep: Vcs-Browser: https://salsa.debian.org/med-team/ismrmrd Vcs-Git: https://salsa.debian.org/med-team/ismrmrd.git Homepage: https://ismrmrd.github.io/ -Rules-Requires-Root: no Package: libismrmrd1.14 Architecture: any ===================================== debian/copyright ===================================== @@ -74,19 +74,6 @@ License: Expat IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -License: MPL-2.0 - The contents of this file are subject to the Mozilla Public License Version - 2.0 (the "License"); you may not use this file except in compliance with - the License. - . - Software distributed under the License is distributed on an "AS IS" basis, - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License - for the specific language governing rights and limitations under the - License. - . - On Debian systems, the complete text of the Mozilla Public License Version - 2.0 can be found in /usr/share/common-licenses/MPL-2.0. - License: GPL-3+ This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License version 3 as ===================================== debian/patches/series ===================================== @@ -3,3 +3,4 @@ Add-support-for-multiarch.patch remove-travis-build-status.patch add_static_lib.patch locale.patch +struct-padding.patch ===================================== debian/patches/struct-padding.patch ===================================== @@ -0,0 +1,32 @@ +Description: pad the ISMRMRD_WaveformHeader. + This change makes sure that the ISMRMRD_Waveform has the same size and + elements offsets, be it on 64-bit or 32-bit aligned platforms. This + change fixes the following issue caught on i386, and possibly other + 32-bit architectures: + . + In file included from /build/reproducible-path/ismrmrd-1.14.3/libsrc/waveform.cpp:7: + /build/reproducible-path/ismrmrd-1.14.3/include/ismrmrd/waveform.h:51:46: error: static assertion failed: ISMRMRD_WaveformHeader is not 40 bytes + 51 | static_assert(sizeof(ISMRMRD_WaveformHeader) == 40, "ISMRMRD_WaveformHeader is not 40 bytes"); + | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~ + /build/reproducible-path/ismrmrd-1.14.3/include/ismrmrd/waveform.h:51:46: note: the comparison reduces to '(36 == 40)' + /build/reproducible-path/ismrmrd-1.14.3/include/ismrmrd/waveform.h:53:55: error: static assertion failed: ISMRMRD WaveformHeader flags offset is not correct + 53 | static_assert(offsetof(ISMRMRD_WaveformHeader, flags) == 8, "ISMRMRD WaveformHeader flags offset is not correct"); + | ^ + /build/reproducible-path/ismrmrd-1.14.3/include/ismrmrd/waveform.h:53:55: note: the comparison reduces to '(4 == 8)' +Author: Étienne Mollier <[email protected]> +Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1119868 +Forwarded: https://github.com/ismrmrd/ismrmrd/pull/265 +Last-Update: 2025-11-28 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +--- ismrmrd.orig/include/ismrmrd/waveform.h ++++ ismrmrd/include/ismrmrd/waveform.h +@@ -26,6 +26,8 @@ + typedef struct ISMRMRD_WaveformHeader + { + uint16_t version; ++ uint16_t pad1; ++ uint32_t pad2; + /**< First unsigned int indicates the version */ + uint64_t flags; + /**< bit field with flags */ View it on GitLab: https://salsa.debian.org/med-team/ismrmrd/-/compare/074effda229b37c9dcc22b34c08afc3ca2bce5da...9bfcd535840df5184e7a79cae0aa44ab9082c016 -- View it on GitLab: https://salsa.debian.org/med-team/ismrmrd/-/compare/074effda229b37c9dcc22b34c08afc3ca2bce5da...9bfcd535840df5184e7a79cae0aa44ab9082c016 You're receiving this email because of your account on salsa.debian.org.
_______________________________________________ debian-med-commit mailing list [email protected] https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/debian-med-commit
