[med-svn] [Git][med-team/sortmerna][master] 7 commits: c23.patch: new: fix build failure with bool redefinition.
Étienne Mollier (@emollier)
gitlab at salsa.debian.org
Sun Oct 5 22:02:39 BST 2025
Étienne Mollier pushed to branch master at Debian Med / sortmerna
Commits:
501671a2 by Étienne Mollier at 2025-10-05T22:45:51+02:00
c23.patch: new: fix build failure with bool redefinition.
Closes: #1097910
- - - - -
3ebb1d11 by Étienne Mollier at 2025-10-05T22:50:00+02:00
d/watch: port to v5 Github template.
- - - - -
52f631eb by Étienne Mollier at 2025-10-05T22:56:47+02:00
d/control: declare compliance to standards version 4.7.2.
- - - - -
93e5faa8 by Étienne Mollier at 2025-10-05T22:57:12+02:00
d/control: drop redundant Rules-Requires-Root: no.
- - - - -
921ec7e1 by Étienne Mollier at 2025-10-05T22:57:49+02:00
concurrentqueue.h.patch: normalize Last-Update.
- - - - -
52135fc4 by Étienne Mollier at 2025-10-05T22:58:55+02:00
d/copyright: point to the versioned LGPL-3.
- - - - -
f804d7fe by Étienne Mollier at 2025-10-05T23:02:13+02:00
d/changelog: ready for upload to unstable.
- - - - -
7 changed files:
- debian/changelog
- debian/control
- debian/copyright
- + debian/patches/c23.patch
- debian/patches/concurrentqueue.h.patch
- debian/patches/series
- debian/watch
Changes:
=====================================
debian/changelog
=====================================
@@ -1,3 +1,14 @@
+sortmerna (4.3.7-3) unstable; urgency=medium
+
+ * c23.patch: new: fix build failure with bool redefinition. (Closes: #1097910)
+ * d/watch: port to v5 Github template.
+ * d/control: declare compliance to standards version 4.7.2.
+ * d/control: drop redundant Rules-Requires-Root: no.
+ * concurrentqueue.h.patch: normalize Last-Update.
+ * d/copyright: point to the versioned LGPL-3.
+
+ -- Étienne Mollier <emollier at debian.org> Sun, 05 Oct 2025 23:01:51 +0200
+
sortmerna (4.3.7-2) unstable; urgency=medium
* Fix Python3.12 string syntax
=====================================
debian/control
=====================================
@@ -14,11 +14,10 @@ Build-Depends: debhelper-compat (= 13),
libzstd-dev,
rapidjson-dev,
libconcurrentqueue-dev
-Standards-Version: 4.7.0
+Standards-Version: 4.7.2
Vcs-Browser: https://salsa.debian.org/med-team/sortmerna
Vcs-Git: https://salsa.debian.org/med-team/sortmerna.git
Homepage: https://github.com/sortmerna/sortmerna
-Rules-Requires-Root: no
Package: sortmerna
Architecture: any-amd64 any-i386 x32
=====================================
debian/copyright
=====================================
@@ -66,7 +66,7 @@ License: LGPL-3+
GNU Lesser General Public License for more details.
.
On Debian systems you can find a copy of the GNU Lesser General
- Public License in /usr/share/common-licenses/LGPL.
+ Public License in /usr/share/common-licenses/LGPL-3.
License: Expat
Permission is hereby granted, free of charge, to any person obtaining
@@ -88,4 +88,3 @@ License: Expat
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.
-
=====================================
debian/patches/c23.patch
=====================================
@@ -0,0 +1,26 @@
+Description: i/ssw.h: do not define bool with C23.
+ This change fixes build failure with C standard 2023, which is notably
+ the default since gcc-15, which fails to build sortmerna with error:
+ .
+ /build/reproducible-path/sortmerna-4.3.7/include/ssw.h:38:23: error: ‘bool’ cannot be defined via ‘typedef’
+ 38 | typedef unsigned char bool;
+ | ^~~~
+ /build/reproducible-path/sortmerna-4.3.7/include/ssw.h:38:23: note: ‘bool’ is a keyword with ‘-std=c23’ onwards
+Author: Étienne Mollier <emollier at debian.org>
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1097910
+Forwarded: no
+Last-Update: 2025-10-05
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- sortmerna.orig/include/ssw.h
++++ sortmerna/include/ssw.h
+@@ -35,7 +35,9 @@
+ typedef struct _profile s_profile;
+
+ #ifndef __cplusplus
++#if !defined(__STDC_VERSION__) || __STDC_VERSION__ < 202311L
+ typedef unsigned char bool;
++#endif
+ static const bool False = 0;
+ static const bool True = 1;
+ #endif
=====================================
debian/patches/concurrentqueue.h.patch
=====================================
@@ -1,5 +1,5 @@
Author: Andreas Tille <tille at debian.org>
-Last-Update: Wed, 06 Sep 2023 19:31:43 +0200
+Last-Update: 2023-09-06
Description: Fix include statement for Debian packaged concurrentqueue
Bug-Debian: https://bugs.debian.org/1051325
Reviewed-By: Étienne Mollier <emollier at debian.org>
=====================================
debian/patches/series
=====================================
@@ -1,3 +1,4 @@
concurrentqueue.h.patch
gcc-13.patch
pyhon3.12-syntax.patch
+c23.patch
=====================================
debian/watch
=====================================
@@ -1,3 +1,6 @@
-version=4
-opts="filenamemangle=s%(?:.*?)?v?(\d[\d.]*)\.tar\.gz%sortmerna-$1.tar.gz%" \
- https://github.com/sortmerna/sortmerna/tags (?:.*?/)?v?(\d[\d.]*)\.tar\.gz
+Version: 5
+
+Template: Github
+Owner: sortmerna
+Project: sortmerna
+UVersion-Mangle: s/-beta/~beta/
View it on GitLab: https://salsa.debian.org/med-team/sortmerna/-/compare/ac72f3c65f2c2b0f883888c13e16004e15144e22...f804d7fe9a72fd25835b7a80e5fa32947a9bc8e1
--
View it on GitLab: https://salsa.debian.org/med-team/sortmerna/-/compare/ac72f3c65f2c2b0f883888c13e16004e15144e22...f804d7fe9a72fd25835b7a80e5fa32947a9bc8e1
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/20251005/87a27ff4/attachment-0001.htm>
More information about the debian-med-commit
mailing list