Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package casacore for openSUSE:Factory checked in at 2024-05-24 19:52:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/casacore (Old) and /work/SRC/openSUSE:Factory/.casacore.new.24587 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "casacore" Fri May 24 19:52:34 2024 rev:9 rq:1176623 version:3.5.0 Changes: -------- --- /work/SRC/openSUSE:Factory/casacore/casacore.changes 2024-05-07 18:05:56.648049271 +0200 +++ /work/SRC/openSUSE:Factory/.casacore.new.24587/casacore.changes 2024-05-24 19:52:45.121045512 +0200 @@ -1,0 +2,10 @@ +Wed May 22 05:19:22 UTC 2024 - Atri Bhattacharya <[email protected]> + +- Drop casacore-drop-mirlib.patch: Superseded in favour of better + patch casacore-mirlib-gcc14-compat.patch already committed + upstream. +- Add casacore-mirlib-gcc14-compat.patch: Resolve issues compiling + mirlib with gcc 14 (gh#casacore/casacore#1344, + gh#casacore/casacore#1353). + +------------------------------------------------------------------- Old: ---- casacore-drop-mirlib.patch New: ---- casacore-mirlib-gcc14-compat.patch BETA DEBUG BEGIN: Old: - Drop casacore-drop-mirlib.patch: Superseded in favour of better patch casacore-mirlib-gcc14-compat.patch already committed BETA DEBUG END: BETA DEBUG BEGIN: New:- Drop casacore-drop-mirlib.patch: Superseded in favour of better patch casacore-mirlib-gcc14-compat.patch already committed upstream. BETA DEBUG END: ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ casacore.spec ++++++ --- /var/tmp/diff_new_pack.aQdhxf/_old 2024-05-24 19:52:45.857072436 +0200 +++ /var/tmp/diff_new_pack.aQdhxf/_new 2024-05-24 19:52:45.857072436 +0200 @@ -1,5 +1,5 @@ # -# spec file for package casacore +# spec file # # Copyright (c) 2024 SUSE LLC # @@ -75,8 +75,8 @@ Source99: casacore-rpmlintrc # PATCH-FIX-UPSTREAM casacore-fitsio-header.patch [email protected] -- Fix location of cfitsio headers used in sources Patch1: casacore-fitsio-header.patch -# PATCH-FIX-UPSTREAM casacore-drop-mirlib.patch gh#casacore/casacore#1344 [email protected] -- Drop usused mirlib library; fixes builds against GCC 14 -Patch2: casacore-drop-mirlib.patch +# PATCH-FIX-UPSTREAM casacore-mirlib-gcc14-compat.patch gh#casacore/casacore#1344 [email protected] -- Fix builds against GCC 14; patch taken from upstream commit +Patch2: https://github.com/casacore/casacore/commit/a4516a86f935dea17502727c34f91955b73209ef.patch#/casacore-mirlib-gcc14-compat.patch BuildRequires: bison BuildRequires: blas-devel BuildRequires: cmake ++++++ casacore-mirlib-gcc14-compat.patch ++++++ >From bfe4051a266c892ffc82225f51a525b6002f151d Mon Sep 17 00:00:00 2001 From: Darrell Schiebel <[email protected]> Date: Thu, 9 May 2024 15:32:03 -0400 Subject: [PATCH] Resolve issues compiling mirlib with gcc 14 (fixes #1344) --- mirlib/uvio.c | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/mirlib/uvio.c b/mirlib/uvio.c index 0c8f930f18a..fa5a997f95f 100644 --- a/mirlib/uvio.c +++ b/mirlib/uvio.c @@ -370,6 +370,20 @@ #define MYABS(x) ( (x) > 0 ? (x) : -(x) ) +/************************************************************************** +*** GCC 14 detects problematic pointer passing: +*** +*** In file included from casacore/mirlib/uvio.c:288: +*** casacore/mirlib/miriad.h:182:51: note: expected âint8 *â {aka âlong long int *â} but argument is of type âoff_t *â {aka âlong int *â} +*** 182 | void rdhdl_c (int tno, Const char *keyword, int8 *value, int8 defval); +*** | ~~~~~~^~~~~ +*** +***************************************************************************/ +#define RDHDL_C( TNO, KEYWORD, VALUE, DEFVAL ) \ + { int8 value; \ + rdhdl_c( TNO, KEYWORD, &value, DEFVAL); \ + *VALUE = value; } + /*----------------------------------------------------------------------*/ /* */ /* Types and static variables. */ @@ -746,7 +760,7 @@ void uvopen_c(int *tno,Const char *name,Const char *status) #ifdef MIR4 /* figure out if to read old MIR3 or new MIR4 */ #if true - rdhdl_c(*tno,"vislen",&(uv->max_offset),hsize_c(uv->item)); + RDHDL_C(*tno,"vislen",&(uv->max_offset),hsize_c(uv->item)); #else int old_vislen; rdhdi_c(*tno,"vislen",&old_vislen,hsize_c(uv->item)); @@ -791,7 +805,7 @@ void uvopen_c(int *tno,Const char *name,Const char *status) #ifdef MIR4 /* figure out if to read old MIR3 or new MIR4 */ if (1) { - rdhdl_c(*tno,"vislen",&(uv->offset),hsize_c(uv->item)); + RDHDL_C(*tno,"vislen",&(uv->offset),hsize_c(uv->item)); } else { int old_vislen; rdhdi_c(*tno,"vislen",&old_vislen,hsize_c(uv->item)); @@ -811,8 +825,8 @@ void uvopen_c(int *tno,Const char *name,Const char *status) rdhda_c(*tno,"obstype",line,"",MAXLINE); if(!strcmp(line,"autocorrelation")) uv->flags |= UVF_AUTO; else if(!strcmp(line,"crosscorrelation")) uv->flags |= UVF_CROSS; - rdhdl_c(*tno,"ncorr",&(uv->corr_flags.offset),-1); - rdhdl_c(*tno,"nwcorr",&(uv->wcorr_flags.offset),-1); + RDHDL_C(*tno,"ncorr",&(uv->corr_flags.offset),-1); + RDHDL_C(*tno,"nwcorr",&(uv->wcorr_flags.offset),-1); if(uv->corr_flags.offset < 0 || uv->wcorr_flags.offset < 0) BUG('f',"Cannot append to uv file without 'ncorr' and/or 'nwcorr' items");
