Pierre Gruet pushed to branch master at Debian Med / libsis-jhdf5-java
Commits: 144f582f by Pierre Gruet at 2024-07-10T23:20:11+02:00 Raising Standards version to 4.7.0 (no change) - - - - - b2216f3c by Pierre Gruet at 2024-07-10T23:22:37+02:00 Building with gcc14 - - - - - f44532c7 by Pierre Gruet at 2024-07-10T23:23:41+02:00 Updating changelog - - - - - 745413dd by Pierre Gruet at 2024-07-10T23:24:03+02:00 Upload to unstable - - - - - 4 changed files: - debian/changelog - debian/control - + debian/patches/gcc14.patch - debian/patches/series Changes: ===================================== debian/changelog ===================================== @@ -1,3 +1,10 @@ +libsis-jhdf5-java (19.04.1+dfsg-5) unstable; urgency=medium + + * Building with gcc14 (Closes: #1075203) + * Raising Standards version to 4.7.0 (no change) + + -- Pierre Gruet <[email protected]> Wed, 10 Jul 2024 23:23:47 +0200 + libsis-jhdf5-java (19.04.1+dfsg-4) unstable; urgency=medium * Fixing the clean target (Closes: 1046647) ===================================== debian/control ===================================== @@ -24,7 +24,7 @@ Build-Depends: debhelper-compat (= 13), libhamcrest-java, libjmock2-java <!nocheck>, libobjenesis-java -Standards-Version: 4.6.2 +Standards-Version: 4.7.0 Vcs-Browser: https://salsa.debian.org/med-team/libsis-jhdf5-java Vcs-Git: https://salsa.debian.org/med-team/libsis-jhdf5-java.git Homepage: https://sissource.ethz.ch/sispub/jhdf5 ===================================== debian/patches/gcc14.patch ===================================== @@ -0,0 +1,48 @@ +Description: passing the right types, including const qualifiers, to build + using gcc14 +Author: Pierre Gruet <[email protected]> +Forwarded: no +Last-Update: 2024-07-10 + +--- a/source/c/jni/h5dImp.c ++++ b/source/c/jni/h5dImp.c +@@ -1372,7 +1372,7 @@ + jstring obj = (jstring) ENVPTR->GetObjectArrayElement(ENVPAR (jobjectArray)buf, i); + if (obj != 0) { + jsize length = ENVPTR->GetStringUTFLength(ENVPAR obj); +- const char *utf8 = ENVPTR->GetStringUTFChars(ENVPAR obj, 0); ++ char *utf8 = ENVPTR->GetStringUTFChars(ENVPAR obj, 0); + + if (utf8) { + h5str_vlconvert(utf8, did, tid, wdata+i, 0); +--- a/source/c/jni/h5pImp.c ++++ b/source/c/jni/h5pImp.c +@@ -5930,7 +5930,7 @@ + { + unsigned opts = 0; + +- if (H5Pget_chunk_opts((hid_t)dcpl_id, opts) < 0) ++ if (H5Pget_chunk_opts((hid_t)dcpl_id, &opts) < 0) + h5libraryError(env); + + return (jint)opts; +--- a/source/c/jni/h5util.c ++++ b/source/c/jni/h5util.c +@@ -511,7 +511,7 @@ + + cptr = HDcalloc((size_t)total_elmts, offset); + for (i = 0; i < total_elmts; i++) { +- h5str_convert(str, container, mtid, cptr + (i*offset), offset, expand_data); ++ h5str_convert(str, container, mtid, (hvl_t*)(cptr + (i*offset)), offset, expand_data); + /* remove array indicators */ + if ((*str)[0] == ',') + (*str)++; +@@ -539,7 +539,7 @@ + (*str)++; + cptr = HDcalloc(offset, sizeof(hvl_t)); + for (i = 0; (i*offset) < (int)size; i++) { +- h5str_convert(str, container, mtid, cptr + (i*offset), offset, expand_data); ++ h5str_convert(str, container, mtid, (hvl_t*)(cptr + (i*offset)), offset, expand_data); + /* remove vlen indicators */ + if ((*str)[0] == ',') + (*str)++; ===================================== debian/patches/series ===================================== @@ -6,3 +6,4 @@ loading_jni_in_java_file.patch declaring_final_variables.patch adapting_h5ar_script_to_debian.patch closing_writer_in_tests.patch +gcc14.patch View it on GitLab: https://salsa.debian.org/med-team/libsis-jhdf5-java/-/compare/96ffdcd5483433a08c308f894a0401ec502378d0...745413dd8616645ecfdc73375044124cde239ba9 -- This project does not include diff previews in email notifications. View it on GitLab: https://salsa.debian.org/med-team/libsis-jhdf5-java/-/compare/96ffdcd5483433a08c308f894a0401ec502378d0...745413dd8616645ecfdc73375044124cde239ba9 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
