[med-svn] [Git][med-team/libmems][master] 7 commits: gcc-14.patch: new: hint a constant type to fix a build failure.
Étienne Mollier (@emollier)
gitlab at salsa.debian.org
Wed Jul 17 19:46:21 BST 2024
Étienne Mollier pushed to branch master at Debian Med / libmems
Commits:
3509b897 by Étienne Mollier at 2024-07-17T20:17:42+02:00
gcc-14.patch: new: hint a constant type to fix a build failure.
Closes: #1075186
- - - - -
51a20b77 by Étienne Mollier at 2024-07-17T20:18:58+02:00
d/control: declare compliance to standards version 4.7.0.
- - - - -
266bb135 by Étienne Mollier at 2024-07-17T20:19:24+02:00
d/control: migrate from pkg-config to pkgconf.
- - - - -
6a79b909 by Étienne Mollier at 2024-07-17T20:30:25+02:00
d/libmems1t64.lintian-overrides: fix a mismatch.
- - - - -
05562125 by Étienne Mollier at 2024-07-17T20:44:15+02:00
d/rules: convert leftover header file with national encoding to utf8.
- - - - -
a420af20 by Étienne Mollier at 2024-07-17T20:44:45+02:00
d/s/lintian-overrides: new: flag error caused by t64 transission.
- - - - -
7ddb23a5 by Étienne Mollier at 2024-07-17T20:45:39+02:00
ready to upload to unstable.
- - - - -
7 changed files:
- debian/changelog
- debian/control
- debian/libmems1t64.lintian-overrides
- + debian/patches/gcc-14.patch
- debian/patches/series
- debian/rules
- + debian/source/lintian-overrides
Changes:
=====================================
debian/changelog
=====================================
@@ -1,3 +1,15 @@
+libmems (1.6.0+4725-11) unstable; urgency=medium
+
+ * gcc-14.patch: new: hint a constant type to fix a build failure.
+ (Closes: #1075186)
+ * d/control: declare compliance to standards version 4.7.0.
+ * d/control: migrate from pkg-config to pkgconf.
+ * d/libmems1t64.lintian-overrides: fix a mismatch.
+ * d/rules: convert leftover header file with national encoding to utf8.
+ * d/s/lintian-overrides: new: flag error caused by t64 transission.
+
+ -- Étienne Mollier <emollier at debian.org> Wed, 17 Jul 2024 20:45:19 +0200
+
libmems (1.6.0+4725-10) unstable; urgency=medium
* fix-system.patch: new: fix build failure on arm. (Closes: #1065765)
=====================================
debian/control
=====================================
@@ -4,15 +4,16 @@ Uploaders: Andreas Tille <tille at debian.org>,
Étienne Mollier <emollier at debian.org>
Section: science
Priority: optional
-Build-Depends: dpkg-dev (>= 1.22.5), debhelper-compat (= 13),
+Build-Depends: dpkg-dev (>= 1.22.5),
+ debhelper-compat (= 13),
d-shlibs (>= 0.106~),
- pkg-config,
+ pkgconf,
libgenome-dev,
libboost-filesystem-dev,
libboost-iostreams-dev,
libboost-program-options-dev,
libmuscle-dev
-Standards-Version: 4.5.1
+Standards-Version: 4.7.0
Vcs-Browser: https://salsa.debian.org/med-team/libmems
Vcs-Git: https://salsa.debian.org/med-team/libmems.git
Homepage: http://sourceforge.net/p/mauve/code/HEAD/tree/libMems/trunk/
=====================================
debian/libmems1t64.lintian-overrides
=====================================
@@ -1 +1 @@
-libmems1t64: package-name-doesnt-match-sonames libmems1
+libmems1t64: package-name-doesnt-match-sonames libMems1
=====================================
debian/patches/gcc-14.patch
=====================================
@@ -0,0 +1,47 @@
+Description: hint the compiler about a constant type.
+ This fixes the following build failure with gcc 14:
+ .
+ dmSML/aPOSIXaio.c:115:28: error: passing argument 1 of ‘aio_suspend’ from incompatible pointer type [-Wincompatible-pointer-types]
+ 115 | rval = aio_suspend(request_array, 1, &zero_wait);
+ | ^~~~~~~~~~~~~
+ | |
+ | struct aiocb **
+ In file included from /usr/include/features.h:502,
+ from /usr/include/x86_64-linux-gnu/sys/types.h:25,
+ from ../libMems/dmSML/asyncio.h:24,
+ from ../libMems/dmSML/aPOSIXaio.h:8,
+ from dmSML/aPOSIXaio.c:5:
+ /usr/include/aio.h:202:12: note: expected ‘const struct aiocb * const*’ but argument is of type ‘struct aiocb **’
+ 202 | extern int __REDIRECT_NTH (aio_suspend,
+ | ^~~~~~~~~~~~~~
+
+Author: Étienne Mollier <emollier at debian.org>
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1075186
+Forwarded: no
+Last-Update: 2024-07-17
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- libmems.orig/libMems/dmSML/aPOSIXaio.c
++++ libmems/libMems/dmSML/aPOSIXaio.c
+@@ -104,9 +104,9 @@
+ // PRECONDITION: file->queuetail is not null
+ // simply queries wether the first request submitted to the file has
+ // completed yet.
+-int QueryLastCompletePAIO( aFILE * file ){
++int QueryLastCompletePAIO( const aFILE * file ){
+ int rval;
+- struct aiocb *request_array[] = { file->queuetail->aio_cb };
++ const struct aiocb * request_array[] = { (const struct aiocb*)file->queuetail->aio_cb };
+ struct timespec zero_wait;
+
+ zero_wait.tv_sec = 0;
+--- libmems.orig/libMems/dmSML/aPOSIXaio.h
++++ libmems/libMems/dmSML/aPOSIXaio.h
+@@ -13,6 +13,6 @@
+ int WritePAIO( aFILE * file, aIORec * rec );
+ int ReadPAIO( aFILE * file, aIORec * rec );
+
+-int QueryLastCompletePAIO( aFILE * file );
++int QueryLastCompletePAIO( const aFILE * file );
+
+ #endif /* _aPOSIXaio_h_ */
=====================================
debian/patches/series
=====================================
@@ -8,3 +8,4 @@ boost1.62.patch
# automake_drop_version_info.patch
drop-version-number.patch
fix-system.patch
+gcc-14.patch
=====================================
debian/rules
=====================================
@@ -15,9 +15,13 @@ override_dh_install:
--override s/libGenome0-dev/libgenome-dev/ \
--override s/libMUSCLE1-dev/libmuscle-dev/ \
--movedev debian/tmp/usr/include usr \
- --movedev "debian/tmp/usr/lib/*/pkgconfig/*.pc" usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig \
+ --movedev "debian/tmp/usr/lib/*/pkgconfig/*.pc" \
+ usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig \
debian/tmp/usr/lib/*/*.so
find debian -name "lib*.la" -delete
+ # Convert a header file with leftover national encoding.
+ iconv -f ISO-8859-1 -t UTF-8 libMems/Matrix.h \
+ -o debian/libmems-dev/usr/include/libMems/Matrix.h
get-orig-source:
. debian/get-orig-source
=====================================
debian/source/lintian-overrides
=====================================
@@ -0,0 +1,2 @@
+# libmems1 was the former name of libmems1t64 during the t64 transission.
+version-substvar-for-external-package Conflicts ${source:Version} libmems1t64 -> libmems1 [debian/control:*]
View it on GitLab: https://salsa.debian.org/med-team/libmems/-/compare/47c2ae3f1b83e4da4151c606725e8bf18af8184e...7ddb23a597f2258828ad02fd46e25c98af171d09
--
This project does not include diff previews in email notifications.
View it on GitLab: https://salsa.debian.org/med-team/libmems/-/compare/47c2ae3f1b83e4da4151c606725e8bf18af8184e...7ddb23a597f2258828ad02fd46e25c98af171d09
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/20240717/525769ed/attachment-0001.htm>
More information about the debian-med-commit
mailing list