[med-svn] [Git][med-team/blimps][master] 2 commits: protect-protomat.patch: new: fix build failures in sift.

[Étienne Mollier (@emollier)]

Étienne Mollier pushed to branch master at Debian Med / blimps


Commits:
9d44fcf6 by Étienne Mollier at 2025-01-14T20:31:54+01:00
protect-protomat.patch: new: fix build failures in sift.

protomat.h is missing protection against multiple inclusions, causing
build failures in reverse build-dependencies.  See debian-med lists[1]
for more details on this one.

[1]: https://lists.debian.org/debian-med/2025/01/msg00001.html

- - - - -
326a9c88 by Étienne Mollier at 2025-01-14T20:33:07+01:00
d/changelog: ready for upload in unstable.

- - - - -


3 changed files:

- debian/changelog
- + debian/patches/protect-protomat.patch
- debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,13 @@
+blimps (3.9+ds-4) unstable; urgency=medium
+
+  * protect-protomat.patch: new: fix build failures in sift.
+    protomat.h is missing protection against multiple inclusions, causing
+    build failures in reverse build-dependencies.  See debian-med lists[1]
+    for more details on this one.
+    [1]: https://lists.debian.org/debian-med/2025/01/msg00001.html
+
+ -- Étienne Mollier <emollier at debian.org>  Tue, 14 Jan 2025 20:32:56 +0100
+
 blimps (3.9+ds-3) unstable; urgency=medium
 
   * Team upload.


=====================================
debian/patches/protect-protomat.patch
=====================================
@@ -0,0 +1,33 @@
+Description: protect protomat.h header file.
+ The sift package fails to build from source with the following error,
+ which stems from a lack header protection against multiple inclusions:
+ .
+  /usr/include/blimps/protomat.h: At top level:
+  /usr/include/blimps/protomat.h:74:8: error: redefinition of 'struct motif_struct'
+     74 | struct motif_struct {
+        |        ^~~~~~~~~~~~
+  In file included from /usr/include/blimps/blocksprogs.h:21:
+  /usr/include/blimps/protomat.h:74:8: note: originally defined here
+     74 | struct motif_struct {
+        |        ^~~~~~~~~~~~
+
+Author: Étienne Mollier <emollier at debian.org>
+Bug: https://lists.debian.org/debian-med/2025/01/msg00001.html
+Forwarded: no
+Last-Update: 2025-01-14
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- blimps.orig/include/protomat.h
++++ blimps/include/protomat.h
+@@ -1,3 +1,6 @@
++#ifndef PROTOMAT_H_
++#define PROTOMAT_H_
++
+ /*------------------------------------------------------------------------*/
+ /*(C) Copyright 1991-2006, Fred Hutchinson Cancer Research Center         */
+ /*      motifj.h  Header file for PROTOMAT programs                       */
+@@ -262,3 +265,4 @@
+ void pr_num_to_aa();
+ void pr_num_to_aa_space();
+ 
++#endif


=====================================
debian/patches/series
=====================================
@@ -4,3 +4,4 @@ hardening.patch
 avoid_privacy_breach.patch
 fixup-implicit-function-declaration.patch
 more_gets.patch
+protect-protomat.patch



View it on GitLab: https://salsa.debian.org/med-team/blimps/-/compare/1e2dc4bcffbc8396aedd00afa2f3870aef18d7d7...326a9c887b9f0fca5cf549a8bc569eef910a4778

-- 
View it on GitLab: https://salsa.debian.org/med-team/blimps/-/compare/1e2dc4bcffbc8396aedd00afa2f3870aef18d7d7...326a9c887b9f0fca5cf549a8bc569eef910a4778
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20250114/d22a954d/attachment-0001.htm>