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

Jonathan Riddell null at kde.org
Mon Mar 1 16:42:34 GMT 2021


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

update patch

M  +1    -6    patch/std-isnan.diff
M  +1    -0    snapcraft.yaml

https://invent.kde.org/neon/extras/labplot/commit/6416e944613adb09490307cbf3f172a0c19fdf64

diff --git a/patch/std-isnan.diff b/patch/std-isnan.diff
index 4b184e6..ab56cea 100644
--- a/patch/std-isnan.diff
+++ b/patch/std-isnan.diff
@@ -77,7 +77,7 @@ index 76797e292..d6101a8f8 100644
  				m_lines.append(QLineF(m_logicalPoints.at(endIndex - 1), m_logicalPoints.at(endIndex)));
  
  			break;
-@@ -1464,17 +1464,17 @@ void XYCurvePrivate::updateLines() {
+@@ -1494,13 +1494,13 @@
  					skip++;
  				} else {
  					skip = 0;
@@ -86,11 +86,6 @@ index 76797e292..d6101a8f8 100644
  						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
diff --git a/snapcraft.yaml b/snapcraft.yaml
index f6d9feb..ebd49fc 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -52,6 +52,7 @@ parts:
         - kde-frameworks-5-qt-5-14-core18-sdk/latest/candidate
         after:
         - kde-frameworks-5-env
+        - patches
         plugin: cmake
         override-build: |-
             cd $SNAPCRAFT_PART_SRC


More information about the Neon-commits mailing list