Merge ~mirespace/ubuntu/+source/form:fix-gcc-14-new-standards into ubuntu/+source/form:ubuntu/oracular-devel

[Miriam España Acebal]

Hi team,

ppa for this is (all builds OK)

ppa:mirespace/plusone
https://launchpad.net/~mirespace/+archive/ubuntu/plusone

I've forwarded the changes to upstream [2].

The package doesn't have the tests enabled. However:
 - it is possible to make it run but with failures (I suppose that's why they are skipped in Debian). I'll open a bug for it in LP.
 - upstream's tests for the MP in Github are passing [3]

The fix was applied as proposed by [1], making the castings explicitly.

[1] https://gcc.gnu.org/gcc-14/porting_to.html#warnings-as-errors
[2] https://github.com/vermaseren/form/pull/549
[3] https://github.com/vermaseren/form/pull/549/checks

[Erich Eickmeyer (eeickmeyer)]

review: Approve (lgtm)

[Erich Eickmeyer (eeickmeyer)]

LGTM

review: Approve

[Miriam España Acebal (mirespace)]

Thanks Erich!

Marking this as Merged, as the packaged was sponsored and uploaded at

https://launchpad.net/ubuntu/oracular/+upload/34075526/+files/form_4.3.1+git20240409+ds-2ubuntu1_source.changes

diff --git a/debian/changelog b/debian/changelog
index 207abd2..26c49d6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+form (4.3.1+git20240409+ds-2ubuntu1) oracular; urgency=medium
+
+  * d/p/fix-gcc-14-incompatible-pointer-types: Adapt code to gcc-14
+    new standards making explicit castings (LP: #2075550).
+
+ -- Miriam España Acebal <[e-mail]>  Thu, 01 Aug 2024 15:50:07 +0200
+
 form (4.3.1+git20240409+ds-2build1) oracular; urgency=medium
 
   * No-change rebuild against mpi-defaults 1.17
diff --git a/debian/control b/debian/control
index 6a034c9..30ec1e3 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: form
 Section: science
 Priority: optional
-Maintainer: Debian Science Team <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Debian Science Team <[e-mail]>
 Uploaders: Alex Myczko <[e-mail]>
 Build-Depends: debhelper-compat (=13),
  mpi-default-dev,
diff --git a/debian/patches/fix-gcc-14-incompatible-pointer-types b/debian/patches/fix-gcc-14-incompatible-pointer-types
new file mode 100644
index 0000000..1d80428
--- /dev/null
+++ b/debian/patches/fix-gcc-14-incompatible-pointer-types
@@ -0,0 +1,90 @@
+Description: Fix incompatible-pointer-types error in GCC-14 
+ GCC no longer allows implicitly casting all pointer types to all
+ other pointer types.Therefore, this patch make the explicit casting
+ to the expected type where required.
+Author: Miriam España Acebal <[e-mail]>
+Forwarded: https://github.com/vermaseren/form/pull/549
+Last-Update: 2024-08-01 
+---
+--- a/sources/compcomm.c
++++ b/sources/compcomm.c
+@@ -122,19 +122,19 @@
+ 	,{"threadsortfilesynch",&(AC.ThreadSortFileSynch),1,  0}
+ 	,{"threadstats",	&(AC.ThreadStats),1,	0}
+ 	,{"finalstats",	    &(AC.FinalStats),1,	0}
+-	,{"fewerstats",		&(AC.ShortStatsMax),	10,		0}
+-	,{"fewerstatistics",&(AC.ShortStatsMax),	10,		0}
++	,{"fewerstats",		(int *)&(AC.ShortStatsMax),	10,		0}
++	,{"fewerstatistics",(int *)&(AC.ShortStatsMax),	10,		0}
+ 	,{"processstats",	&(AC.ProcessStats),1,	0}
+ 	,{"oldparallelstats",&(AC.OldParallelStats),1,0}
+ 	,{"parallel",	    &(AC.parallelflag),PARALLELFLAG,NOPARALLEL_USER}
+ 	,{"nospacesinnumbers",&(AO.NoSpacesInNumbers),1,0}
+-	,{"indentspace",    &(AO.IndentSpace),INDENTSPACE,0}
++	,{"indentspace",    (int *)&(AO.IndentSpace),INDENTSPACE,0}
+ 	,{"totalsize",		&(AM.PrintTotalSize),	1,	0}
+ 	,{"flag",			(int *)&(AC.debugFlags),	1,	0}
+ 	,{"oldfactarg",		&(AC.OldFactArgFlag),	1,	0}
+ 	,{"memdebugflag",	&(AC.MemDebugFlag),	1,	0}
+ 	,{"oldgcd", 		&(AC.OldGCDflag),	1,	0}
+-	,{"innertest",      &(AC.InnerTest),  1,  0}
++	,{"innertest",      (int *)&(AC.InnerTest),  1,  0}
+ 	,{"wtimestats",     &(AC.WTimeStatsFlag),  1,  0}
+ };
+ 
+--- a/sources/reshuf.c
++++ b/sources/reshuf.c
+@@ -2144,7 +2144,7 @@
+ 	passed on.
+ */
+ 	SHback = AN.SHvar;
+-	SH->finishuf = &FinishShuffle;
++	SH->finishuf = (FINISHUFFLE) &FinishShuffle;
+ 	SH->do_uffle = &DoShuffle;
+ 	SH->outterm = AT.WorkPointer;
+ 	AT.WorkPointer += *term;
+@@ -2638,7 +2638,7 @@
+ 	*AN.RepPoint = 1;
+ 
+ 	SHback = AN.SHvar;
+-	SH->finishuf = &FinishStuffle;
++	SH->finishuf = (FINISHUFFLE) &FinishStuffle;
+ 	SH->do_uffle = &DoStuffle;
+ 	SH->outterm = AT.WorkPointer;
+ 	AT.WorkPointer += *term;
+@@ -2737,9 +2737,9 @@
+ */
+ 	SH->stop1 = SH->ststop1;
+ 	SH->stop2 = SH->ststop2;
+-	SH->finishuf = &FinishShuffle;
++	SH->finishuf = (FINISHUFFLE) &FinishShuffle;
+ 	if ( Shuffle(from1,from2,to) ) goto stuffcall;
+-	SH->finishuf = &FinishStuffle;
++	SH->finishuf = (FINISHUFFLE) &FinishStuffle;
+ /*
+ 	Now we have to select a pair, one from 1 and one from 2.
+ */
+--- a/sources/float.c
++++ b/sources/float.c
+@@ -2321,15 +2321,15 @@
+ */
+ 			AT.WorkPointer += depth;
+ 			if ( first ) {
+-				if ( *t == MZV ) CalculateMZV(aux4,indexes,depth);
+-				else if ( *t == EULER ) CalculateEuler(aux4,indexes,depth);
+-				else if ( *t == MZVHALF ) CalculateMZVhalf(aux4,indexes,depth);
++				if ( *t == MZV ) CalculateMZV(aux4,(int *)indexes,depth);
++				else if ( *t == EULER ) CalculateEuler(aux4,(int *)indexes,depth);
++				else if ( *t == MZVHALF ) CalculateMZVhalf(aux4,(int *)indexes,depth);
+ 				first = 0;
+ 			}
+ 			else {
+-				if ( *t == MZV ) CalculateMZV(aux5,indexes,depth);
+-				else if ( *t == EULER ) CalculateEuler(aux5,indexes,depth);
+-				else if ( *t == MZVHALF ) CalculateMZVhalf(aux5,indexes,depth);
++				if ( *t == MZV ) CalculateMZV(aux5,(int *)indexes,depth);
++				else if ( *t == EULER ) CalculateEuler(aux5,(int *)indexes,depth);
++				else if ( *t == MZVHALF ) CalculateMZVhalf(aux5,(int *)indexes,depth);
+ 				mpf_mul(aux4,aux4,aux5);
+ 			}
+ 			*t = 0;
diff --git a/debian/patches/series b/debian/patches/series
index 4c29051..5e82f7d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 #fix-escaping
 #omit-march
+fix-gcc-14-incompatible-pointer-types