[neon/extras/labplot/Neon/release] /: add patch

[Jonathan Riddell]

Git commit ec3bbab00b7f7e9ef4ad816753fffdde321bdfb4 by Jonathan Riddell.
Committed on 01/03/2021 at 16:28.
Pushed by jriddell into branch 'Neon/release'.

add patch

A  +122  -0    patch/std-isnan.diff
M  +9    -0    snapcraft.yaml

https://invent.kde.org/neon/extras/labplot/commit/ec3bbab00b7f7e9ef4ad816753fffdde321bdfb4

diff --git a/patch/std-isnan.diff b/patch/std-isnan.diff
new file mode 100644
index 0000000..4b184e6
--- /dev/null
+++ b/patch/std-isnan.diff
@@ -0,0 +1,122 @@
+diff --git a/src/backend/worksheet/plots/cartesian/XYCurve.cpp b/src/backend/worksheet/plots/cartesian/XYCurve.cpp
+index 76797e292..d6101a8f8 100644
+--- a/src/backend/worksheet/plots/cartesian/XYCurve.cpp
++++ b/src/backend/worksheet/plots/cartesian/XYCurve.cpp
+@@ -1222,11 +1222,11 @@ void XYCurvePrivate::addUniqueLine(QPointF p0, QPointF p1, QPointF& lastPoint, q
+ 	//QDEBUG(Q_FUNC_INFO << " :" << p0 << " ->" << p1 << ", lastPoint =" << lastPoint << ", pixelDiff =" << pixelDiff)
+ 	if (pixelDiff == 0) {
+ 		//QDEBUG("	pixelDiff == 0!")
+-		if (isnan(lastPoint.x()))	// save last point
++	  if (std::isnan(lastPoint.x()))	// save last point
+ 			lastPoint = p0;
+ 	} else {	// pixelDiff > 0
+ 		//QDEBUG("	pixelDiff =" << pixelDiff << ", last point : " << lastPoint)
+-		if (!isnan(lastPoint.x())) { // when previously lastPoint, draw a line
++		if (!std::isnan(lastPoint.x())) { // when previously lastPoint, draw a line
+ 			//QDEBUG("	REDUCED LINE from " << lastPoint << " to " << p0)
+ 			//TODO: only when line in scene
+ 			//if ((p0.x() >= plot->xMin() && p0.x() <= plot->xMax()) || (p1.x() >= plot->xMin() && p1.x() <= plot->xMax()))
+@@ -1343,7 +1343,7 @@ void XYCurvePrivate::updateLines() {
+ 				addLine(p0, p1, lastPoint, pixelDiff, numberOfPixelX);
+ 			}
+ 
+-			if (!isnan(lastPoint.x()))	// last line
++			if (!std::isnan(lastPoint.x()))	// last line
+ 				m_lines.append(QLineF(lastPoint, p1));
+ 
+ 			break;
+@@ -1361,7 +1361,7 @@ void XYCurvePrivate::updateLines() {
+ 				addLine(p0, tempPoint1, lastPoint, pixelDiff, numberOfPixelX);
+ 				addLine(tempPoint1, p1, lastPoint, pixelDiff, numberOfPixelX);
+ 			}
+-			if (!isnan(lastPoint.x()))	// last line
++			if (!std::isnan(lastPoint.x()))	// last line
+ 				m_lines.append(QLineF(lastPoint, p1));
+ 
+ 			break;
+@@ -1378,7 +1378,7 @@ void XYCurvePrivate::updateLines() {
+ 				addLine(p0, tempPoint1, lastPoint, pixelDiff, numberOfPixelX);
+ 				addLine(tempPoint1, p1, lastPoint, pixelDiff, numberOfPixelX);
+ 			}
+-			if (!isnan(lastPoint.x()))	// last line
++			if (!std::isnan(lastPoint.x()))	// last line
+ 				m_lines.append(QLineF(lastPoint, p1));
+ 
+ 			break;
+@@ -1398,7 +1398,7 @@ void XYCurvePrivate::updateLines() {
+ 				addLine(tempPoint1, tempPoint2, lastPoint, pixelDiff, numberOfPixelX);
+ 				addLine(tempPoint2, p1, lastPoint, pixelDiff, numberOfPixelX);
+ 			}
+-			if (!isnan(lastPoint.x()))	// last line
++			if (!std::isnan(lastPoint.x()))	// last line
+ 				m_lines.append(QLineF(lastPoint, p1));
+ 
+ 			break;
+@@ -1418,7 +1418,7 @@ void XYCurvePrivate::updateLines() {
+ 				addLine(tempPoint1, tempPoint2, lastPoint, pixelDiff, numberOfPixelX);
+ 				addLine(tempPoint2, p1, lastPoint, pixelDiff, numberOfPixelX);
+ 			}
+-			if (!isnan(lastPoint.x()))	// last line
++			if (!std::isnan(lastPoint.x()))	// last line
+ 				m_lines.append(QLineF(lastPoint, p1));
+ 
+ 			break;
+@@ -1438,13 +1438,13 @@ void XYCurvePrivate::updateLines() {
+ 					skip++;
+ 				} else {
+ 					skip = 0;
+-					if (!isnan(lastPoint.x())) {
++					if (!std::isnan(lastPoint.x())) {
+ 						lastPoint.setX(NAN);
+ 						m_lines.append(QLineF(lastPoint, p1));
+ 					}
+ 				}
+ 			}
+-			if (!isnan(lastPoint.x()))	// last line
++			if (!std::isnan(lastPoint.x()))	// last line
+ 				m_lines.append(QLineF(m_logicalPoints.at(endIndex - 1), m_logicalPoints.at(endIndex)));
+ 
+ 			break;
+@@ -1464,17 +1464,17 @@ void XYCurvePrivate::updateLines() {
+ 					skip++;
+ 				} else {
+ 					skip = 0;
+-					if (!isnan(lastPoint.x())) {
++					if (!std::isnan(lastPoint.x())) {
+ 						lastPoint.setX(NAN);
+ 						m_lines.append(QLineF(lastPoint, p1));
+ 					}
+-					if (!isnan(lastPoint.x()))	// last line
++					if (!std::isnan(lastPoint.x()))	// last line
+ 						m_lines.append(QLineF(m_logicalPoints[endIndex-1], m_logicalPoints[endIndex]));
+ 
+ 					break;
+ 				}
+ 			}
+-			if (!isnan(lastPoint.x()))	// last line
++			if (!std::isnan(lastPoint.x()))	// last line
+ 				m_lines.append(QLineF(m_logicalPoints.at(endIndex - 1), m_logicalPoints.at(endIndex)));
+ 
+ 			break;
+@@ -1573,7 +1573,7 @@ void XYCurvePrivate::updateLines() {
+ 						lastPoint, pixelDiff, numberOfPixelX);
+ 
+ 				// add last line
+-				if (!isnan(lastPoint.x()))
++				if (!std::isnan(lastPoint.x()))
+ 					m_lines.append(QLineF(QPointF(xinterp[xinterp.size() - 1], yinterp[yinterp.size() - 1]),
+ 								QPointF(x[numberOfPoints - 1], y[numberOfPoints - 1])));
+ 			}
+diff --git a/src/backend/worksheet/plots/cartesian/XYFitCurve.cpp b/src/backend/worksheet/plots/cartesian/XYFitCurve.cpp
+index a082f45bc..9953265cf 100644
+--- a/src/backend/worksheet/plots/cartesian/XYFitCurve.cpp
++++ b/src/backend/worksheet/plots/cartesian/XYFitCurve.cpp
+@@ -2161,7 +2161,7 @@ void XYFitCurvePrivate::writeSolverState(gsl_multifit_fdfsolver* s, double chi)
+ 	}
+ 
+ 	//current value of chi
+-	if (isnan(chi))
++	if (std::isnan(chi))
+ 		chi = gsl_blas_dnrm2(s->f);
+ 	state += QString::number(chi*chi);
+ 	state += ';';
diff --git a/snapcraft.yaml b/snapcraft.yaml
index b403b92..f6d9feb 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -40,6 +40,11 @@ package-repositories:
     url: http://origin.archive.neon.kde.org/user
     key-server: keyserver.ubuntu.com
 parts:
+    patches:
+        source: patch/
+        plugin: dump
+        prime: [-*]
+        stage: [std-isnan.diff]
     labplot:
         parse-info:
         - usr/share/metainfo/org.kde.labplot2.appdata.xml
@@ -48,6 +53,10 @@ parts:
         after:
         - kde-frameworks-5-env
         plugin: cmake
+        override-build: |-
+            cd $SNAPCRAFT_PART_SRC
+            patch -p1 < $SNAPCRAFT_STAGE/std-isnan.diff
+            snapcraftctl build
         build-packages:
         - libkf5xmlgui-data
         - libkf5xmlgui5