Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package cfitsio for openSUSE:Factory checked in at 2025-04-09 21:49:10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cfitsio (Old) and /work/SRC/openSUSE:Factory/.cfitsio.new.1907 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cfitsio" Wed Apr 9 21:49:10 2025 rev:32 rq:1267770 version:4.5.0 Changes: -------- --- /work/SRC/openSUSE:Factory/cfitsio/cfitsio.changes 2025-03-26 21:17:10.310969028 +0100 +++ /work/SRC/openSUSE:Factory/.cfitsio.new.1907/cfitsio.changes 2025-04-09 21:49:12.575438191 +0200 @@ -1,0 +2,5 @@ +Mon Apr 7 13:18:25 UTC 2025 - Friedrich Haubensak <hs...@mail.de> + +- add cfitsio-nullptr.patch to fix gcc15 compile time error + +------------------------------------------------------------------- New: ---- cfitsio-nullptr.patch BETA DEBUG BEGIN: New: - add cfitsio-nullptr.patch to fix gcc15 compile time error BETA DEBUG END: ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cfitsio.spec ++++++ --- /var/tmp/diff_new_pack.OzS8E5/_old 2025-04-09 21:49:13.179463626 +0200 +++ /var/tmp/diff_new_pack.OzS8E5/_new 2025-04-09 21:49:13.179463626 +0200 @@ -27,6 +27,8 @@ Source0: https://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c/%{name}-%{version}.tar.gz # PATCH-FIX-UPSTREAM cfitsio-cmake-devel-scripts-destination.patch badshah...@gmail.com -- Fix installation dir for pkgconfig and cmake scripts Patch1: cfitsio-cmake-devel-scripts-destination.patch +# PATCH-FIX-UPSTREAM cfitsio-nullptr.patch hs...@mail.de -- nullptr is keyword in C23 +Patch2: cfitsio-nullptr.patch BuildRequires: cmake >= 3.5 BuildRequires: gcc-c++ BuildRequires: gcc-fortran ++++++ cfitsio-nullptr.patch ++++++ github.com/HEASARC/cfitsio/commit/b4e8f7f >From b4e8f7ff49761b3c89782a4e7a722400e75bea85 Mon Sep 17 00:00:00 2001 From: Craig Gordon <craig.a.gor...@nasa.gov> Date: Thu, 16 Jan 2025 16:28:11 -0500 Subject: [PATCH] Converted all variables named 'nullptr' to 'nullpointer'. It was pointed out on Github that the upcoming gcc-15 now considers 'nullptr' to be a reserved keyword by default, as per the C23 standard. --- putcol.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/putcol.c b/putcol.c index 098b7dc0..e218d2ed 100644 --- a/putcol.c +++ b/putcol.c @@ -1226,7 +1226,7 @@ int ffiter(int n_cols, long rept, rowrept, width, tnull, naxes[9] = {1,1,1,1,1,1,1,1,1}, groups; double zeros = 0.; char message[FLEN_ERRMSG], keyname[FLEN_KEYWORD], nullstr[FLEN_VALUE]; - char **stringptr, *nullptr, *cptr; + char **stringptr, *nullpointer, *cptr; if (*status > 0) return(*status); @@ -2081,24 +2081,24 @@ int ffiter(int n_cols, { stringptr = cols[jj].array; dataptr = stringptr + 1; - nullptr = *stringptr; + nullpointer = *stringptr; nbytes = 2; } else { dataptr = (char *) cols[jj].array + col[jj].nullsize; - nullptr = (char *) cols[jj].array; + nullpointer = (char *) cols[jj].array; nbytes = col[jj].nullsize; } - if (memcmp(nullptr, &zeros, nbytes) ) + if (memcmp(nullpointer, &zeros, nbytes) ) { /* null value flag not zero; must check for and write nulls */ if (hdutype == IMAGE_HDU) { if (ffppn(cols[jj].fptr, cols[jj].datatype, felement, cols[jj].repeat * ntodo, dataptr, - nullptr, &tstatus) > 0) + nullpointer, &tstatus) > 0) break; } else @@ -2113,7 +2113,7 @@ int ffiter(int n_cols, if (ffpcn(cols[jj].fptr, cols[jj].datatype, cols[jj].colnum, frow, felement, cols[jj].repeat * ntodo, dataptr, - nullptr, &tstatus) > 0) + nullpointer, &tstatus) > 0) break; } }
