diff options
author | Tobias C. Berner <tcberner@FreeBSD.org> | 2020-11-15 09:25:36 +0000 |
---|---|---|
committer | Tobias C. Berner <tcberner@FreeBSD.org> | 2020-11-15 09:25:36 +0000 |
commit | 1398e53a09e714479d268a5768875734d5e37a52 (patch) | |
tree | b9c9310e85df2bd8f337469525528459dc72655a /math/labplot | |
parent | Mark as BROKEN on aarch64. (diff) |
math/labplot: update to 2.8.1
We’re happy to announce the availability of the first minor patch release of
the big release we made two months ago. This release contains minor
improvements and bug fixes only.
Announcement:
https://labplot.kde.org/2020/11/13/labplot-2-8-1-released/
MFH: 2020Q4
Diffstat (limited to 'math/labplot')
-rw-r--r-- | math/labplot/Makefile | 3 | ||||
-rw-r--r-- | math/labplot/distinfo | 6 | ||||
-rw-r--r-- | math/labplot/files/patch-git_4255438c | 76 | ||||
-rw-r--r-- | math/labplot/pkg-plist | 4 |
4 files changed, 7 insertions, 82 deletions
diff --git a/math/labplot/Makefile b/math/labplot/Makefile index 56d3b11da413..223b46085298 100644 --- a/math/labplot/Makefile +++ b/math/labplot/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= labplot -DISTVERSION= 2.8.0 -PORTREVISION= 2 +DISTVERSION= 2.8.1 CATEGORIES= math kde MASTER_SITES= KDE/stable/${PORTNAME}/${PORTVERSION} diff --git a/math/labplot/distinfo b/math/labplot/distinfo index 2d54a1e832e5..e3b6fec2ff71 100644 --- a/math/labplot/distinfo +++ b/math/labplot/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1600793535 -SHA256 (labplot-2.8.0.tar.xz) = 8957c708ea572d9b7bfd7bdd1e9627bb1e10717c4b8cb10c7687ca6ca187a705 -SIZE (labplot-2.8.0.tar.xz) = 13117804 +TIMESTAMP = 1605430703 +SHA256 (labplot-2.8.1.tar.xz) = 726909a8335921c742c4d92f66663ecdb447ddee0d74568c50a22330c79e079a +SIZE (labplot-2.8.1.tar.xz) = 13203288 diff --git a/math/labplot/files/patch-git_4255438c b/math/labplot/files/patch-git_4255438c deleted file mode 100644 index 2f3d3eaaaad8..000000000000 --- a/math/labplot/files/patch-git_4255438c +++ /dev/null @@ -1,76 +0,0 @@ -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.3") - 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 - diff --git a/math/labplot/pkg-plist b/math/labplot/pkg-plist index 748722482d22..a5fcaa09f505 100644 --- a/math/labplot/pkg-plist +++ b/math/labplot/pkg-plist @@ -53,10 +53,13 @@ share/doc/HTML/en/labplot2/tutorial-xy-function9.png share/doc/HTML/en/labplot2/workbook.png share/doc/HTML/en/labplot2/worksheet.png share/icons/hicolor/128x128/apps/labplot2.png +share/icons/hicolor/150x150/apps/labplot2.png share/icons/hicolor/16x16/apps/labplot2.png share/icons/hicolor/22x22/apps/labplot2.png share/icons/hicolor/256x256/apps/labplot2.png +share/icons/hicolor/310x310/apps/labplot2.png share/icons/hicolor/32x32/apps/labplot2.png +share/icons/hicolor/44x44/apps/labplot2.png share/icons/hicolor/48x48/apps/labplot2.png share/icons/hicolor/512x512/apps/labplot2.png share/icons/hicolor/64x64/apps/labplot2.png @@ -137,7 +140,6 @@ share/kxmlgui5/labplot2/labplot2ui.rc %%DATADIR%%/datasets/OzDASL.json %%DATADIR%%/datasets/README.md %%DATADIR%%/datasets/Rdatasets.json -%%DATADIR%%/datasets/Socrata.json %%DATADIR%%/datasets/StatLib.json %%DATADIR%%/example_projects/Big-city-pop.lml %%DATADIR%%/example_projects/Rainfall.lml |