1 files changed, 76 insertions, 0 deletions
diff --git a/math/labplot/files/patch-git_4255438c b/math/labplot/files/patch-git_4255438c
new file mode 100644
index 000000000000..2f5616ebb458
--- /dev/null
+++ b/math/labplot/files/patch-git_4255438c
@@ -0,0 +1,76 @@
+From 4255438c98ce274a4bbb381b706b6ba5b41816c7 Mon Sep 17 00:00:00 2001
+From: Stefan Gerlach <stefan.gerlach@uni-konstanz.de>
+Date: Mon, 14 Sep 2020 16:56:37 +0200
+Subject: [PATCH] [cantor] 20.08.1 still uses old code & minor formating fixes
+
+---
+ CMakeLists.txt                                      | 2 +-
+ src/backend/gsl/parser.y                            | 2 +-
+ src/kdefrontend/dockwidgets/XYEquationCurveDock.cpp | 2 +-
+ src/kdefrontend/widgets/ExpressionTextEdit.cpp      | 8 ++++----
+ 4 files changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 33b407046..57ad46dd8 100644
+--- CMakeLists.txt
++++ CMakeLists.txt
+@@ -230,7 +230,7 @@ IF (Cantor_FOUND)
+ 	ELSE ()
+ 		MESSAGE (STATUS "Cantor Library ${Cantor_VERSION} TOO OLD. Minimum usable version is 19.12")
+ 	ENDIF ()
+-	IF (${Cantor_VERSION} VERSION_GREATER "20.08")
++	IF (${Cantor_VERSION} VERSION_GREATER "20.08.1")
+ 		add_definitions (-DHAVE_NEW_CANTOR_LIBS)
+ 	ENDIF ()
+ ELSE ()
+diff --git a/src/backend/gsl/parser.y b/src/backend/gsl/parser.y
+index e90f9f7dc..10121a741 100644
+--- src/backend/gsl/parser.y
++++ src/backend/gsl/parser.y
+@@ -265,7 +265,7 @@ int yylex(param *p) {
+ 	pdebug("PARSER: yylex()\n");
+ 	char c;
+ 
+-	/* skip white space  */
++	/* skip white space */
+ 	while ((c = getcharstr(p)) == ' ' || c == '\t');
+ 
+ 	/* finish if reached EOF */
+diff --git a/src/kdefrontend/dockwidgets/XYEquationCurveDock.cpp b/src/kdefrontend/dockwidgets/XYEquationCurveDock.cpp
+index 8492a63a2..45e6a0f5a 100644
+--- src/kdefrontend/dockwidgets/XYEquationCurveDock.cpp
++++ src/kdefrontend/dockwidgets/XYEquationCurveDock.cpp
+@@ -71,7 +71,7 @@ void XYEquationCurveDock::setupGeneral() {
+ 
+ 	auto* gridLayout = dynamic_cast<QGridLayout*>(generalTab->layout());
+ 	if (gridLayout) {
+-		gridLayout->setContentsMargins(2,2,2,2);
++		gridLayout->setContentsMargins(2, 2, 2, 2);
+ 		gridLayout->setHorizontalSpacing(2);
+ 		gridLayout->setVerticalSpacing(2);
+ 	}
+diff --git a/src/kdefrontend/widgets/ExpressionTextEdit.cpp b/src/kdefrontend/widgets/ExpressionTextEdit.cpp
+index f6d26152b..e08b352d9 100644
+--- src/kdefrontend/widgets/ExpressionTextEdit.cpp
++++ src/kdefrontend/widgets/ExpressionTextEdit.cpp
+@@ -114,13 +114,13 @@ void ExpressionTextEdit::setExpressionType(XYEquationCurve::EquationType type) {
+ 	m_expressionType = type;
+ 	m_variables.clear();
+ 	if (type == XYEquationCurve::EquationType::Cartesian)
+-		m_variables<<"x";
++		m_variables << "x";
+ 	else if (type == XYEquationCurve::EquationType::Polar)
+-		m_variables<<"phi";
++		m_variables << "phi";
+ 	else if (type == XYEquationCurve::EquationType::Parametric)
+-		m_variables<<"t";
++		m_variables << "t";
+ 	else if (type == XYEquationCurve::EquationType::Implicit)
+-		m_variables<<"x"<<"y";
++		m_variables << "x" << "y";
+ 
+ 	m_highlighter->setVariables(m_variables);
+ }
+-- 
+GitLab
+