Étienne Mollier pushed to branch master at Debian Med / phast
Commits: e910cab1 by Étienne Mollier at 2024-07-31T22:20:57+02:00 gcc-14.patch: fix build failure with gcc 14. Closes: #1075383 - - - - - 5dde684e by Étienne Mollier at 2024-07-31T22:21:43+02:00 d/control: add myself to uploaders. - - - - - d1439d6f by Étienne Mollier at 2024-07-31T22:21:59+02:00 d/control: declare compliance to standards version 4.7.0. - - - - - 70b9d45f by Étienne Mollier at 2024-07-31T22:23:59+02:00 d/p/clapack.patch: convert e acute to UTF-8. - - - - - 90c7243d by Étienne Mollier at 2024-07-31T22:24:36+02:00 ready to upload to unstable. - - - - - 5 changed files: - debian/changelog - debian/control - debian/patches/clapack.patch - + debian/patches/gcc-14.patch - debian/patches/series Changes: ===================================== debian/changelog ===================================== @@ -1,3 +1,12 @@ +phast (1.6+dfsg-6) unstable; urgency=medium + + * gcc-14.patch: fix build failure with gcc 14. (Closes: #1075383) + * d/control: add myself to uploaders. + * d/control: declare compliance to standards version 4.7.0. + * d/p/clapack.patch: convert e acute to UTF-8. + + -- Étienne Mollier <[email protected]> Wed, 31 Jul 2024 22:24:23 +0200 + phast (1.6+dfsg-5) unstable; urgency=medium * Team Upload. ===================================== debian/control ===================================== @@ -1,6 +1,7 @@ Source: phast Maintainer: Debian Med Packaging Team <[email protected]> -Uploaders: Andreas Tille <[email protected]> +Uploaders: Andreas Tille <[email protected]>, + Étienne Mollier <[email protected]> Section: science Priority: optional Build-Depends: debhelper-compat (= 13), @@ -10,7 +11,7 @@ Build-Depends: debhelper-compat (= 13), libtmglib-dev, libpcre2-dev, help2man -Standards-Version: 4.6.2 +Standards-Version: 4.7.0 Vcs-Browser: https://salsa.debian.org/med-team/phast Vcs-Git: https://salsa.debian.org/med-team/phast.git Homepage: http://compgen.cshl.edu/phast/ ===================================== debian/patches/clapack.patch ===================================== @@ -1,5 +1,5 @@ Author: Andreas Tille <[email protected]> -Author: Sbastien Villemot <[email protected]> +Author: Sébastien Villemot <[email protected]> Last-Update: 2017-09-10 Description: Use Debian package for BLAS/LAPACK (instead of obsolete clapack) - Use -lblas instead of -lblaswr ===================================== debian/patches/gcc-14.patch ===================================== @@ -0,0 +1,59 @@ +Description: fix multiple issues gone fatal with gcc 14. + This patch casts a few types to nudge several PCREs to build properly, + given a number of mismatches or confusions between pcre2_code and + pcre2_compile_context. The most notable change is probably the + modified signature of str_re_new, as otherwise the code would have to + include a huge amount of type casts for each and every call of + str_re_new. + +Author: Étienne Mollier <[email protected]> +Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1075383 +Forwarded: no +Last-Update: 2024-07-31 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +--- phast.orig/include/phast/stringsplus.h ++++ phast/include/phast/stringsplus.h +@@ -383,7 +383,7 @@ + expression syntax. + @result Newly allocated and compiled Regex object. + */ +-pcre2_code *str_re_new(const unsigned char *re_str); ++pcre2_compile_context *str_re_new(const unsigned char *re_str); + + /** Free resources associated with regular expression object. + @param re Regex object to free +--- phast.orig/src/lib/base/phast_stringsplus.c ++++ phast/src/lib/base/phast_stringsplus.c +@@ -463,12 +463,12 @@ + return (strncmp(&s->chars[s->length - len], substr, len) == 0); + } + +-pcre2_code *str_re_new(const unsigned char *re_str) { +- pcre2_code *re; ++pcre2_compile_context *str_re_new(const unsigned char *re_str) { ++ pcre2_compile_context *re; + int errorcode; + PCRE2_SIZE erroffset; + +- re = pcre2_compile(re_str, PCRE2_ZERO_TERMINATED, 0, &errorcode, &erroffset, NULL); ++ re = (pcre2_compile_context *)pcre2_compile(re_str, PCRE2_ZERO_TERMINATED, 0, &errorcode, &erroffset, NULL); + if (re == NULL) { + die("ERROR: cannot compile regular expression '%s' (%d): %d\n", + re_str, erroffset, errorcode); +@@ -529,13 +529,13 @@ + + + int str_re_match(String *s, pcre2_compile_context *re, List *l, int nsubexp) { +- return str_re_match_sub(s, re, l, 0, nsubexp, NULL); ++ return str_re_match_sub(s, (pcre2_code *)re, l, 0, nsubexp, NULL); + } + + int str_re_search(String *s, pcre2_compile_context *re, int start_offset, List *l, + int nsubexp) { + int first_match_idx, rc; +- rc = str_re_match_sub(s, re, l, start_offset, nsubexp, &first_match_idx); ++ rc = str_re_match_sub(s, (pcre2_code *)re, l, start_offset, nsubexp, &first_match_idx); + if (rc < 0) return rc; + return first_match_idx; + } ===================================== debian/patches/series ===================================== @@ -5,3 +5,4 @@ use_debian_packaged_help2man.patch hardening.patch fix_test_makefile.patch pcre2.patch +gcc-14.patch View it on GitLab: https://salsa.debian.org/med-team/phast/-/compare/1ecf52beedc6cab1372af683162a57c38c84d813...90c7243d2182cb7010151855f07c0c5709809063 -- View it on GitLab: https://salsa.debian.org/med-team/phast/-/compare/1ecf52beedc6cab1372af683162a57c38c84d813...90c7243d2182cb7010151855f07c0c5709809063 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
