git: 507182cbd036 - main - math/labplot: finalize switch to Qt6/KF6 by updating to the latest snapshot
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 19 Mar 2025 14:13:17 UTC
The branch main has been updated by makc:
URL: https://cgit.FreeBSD.org/ports/commit/?id=507182cbd03695983aa9e72bce949ffb2eddafc7
commit 507182cbd03695983aa9e72bce949ffb2eddafc7
Author: Max Brazhnikov <makc@FreeBSD.org>
AuthorDate: 2025-03-19 14:11:30 +0000
Commit: Max Brazhnikov <makc@FreeBSD.org>
CommitDate: 2025-03-19 14:11:45 +0000
math/labplot: finalize switch to Qt6/KF6 by updating to the latest snapshot
2.11.1 requires lots of patching to properly build with Qt6,
therefore update directly to the latest shapshot.
Adjust USE_KDE components and restore CANTOR option.
---
math/labplot/Makefile | 37 +-
math/labplot/distinfo | 10 +-
.../patch-49b3f18e94586d9733db036a8031ab9d4ea6dd5c | 34 --
math/labplot/files/patch-CMakeLists.txt | 11 -
math/labplot/pkg-plist | 371 +++++++++++----------
5 files changed, 212 insertions(+), 251 deletions(-)
diff --git a/math/labplot/Makefile b/math/labplot/Makefile
index 11088a87b92a..5e675ea708ec 100644
--- a/math/labplot/Makefile
+++ b/math/labplot/Makefile
@@ -1,12 +1,8 @@
PORTNAME= labplot
-DISTVERSION= 2.11.1
-PORTREVISION= 2
+DISTVERSION= 2.11.80
CATEGORIES= math kde
MASTER_SITES= KDE/stable/${PORTNAME}/
-
-PATCH_SITES= https://invent.kde.org/education/labplot/-/commit/
-PATCHFILES+= 0230dfa31ad7e916aaa5f9d7be1a9bad0b768c27.patch:-p1 \
- 0edfd2862a8f953cdd06ffe4940e1da5b7b5dc17.patch:-p1
+DIST_SUBDIR= KDE/invent.kde.org
MAINTAINER= kde@FreeBSD.org
COMMENT= Data plotting and function analysis tool by KDE
@@ -15,36 +11,36 @@ WWW= https://labplot.kde.org/
LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/LICENSES/GPL-2.0-or-later.txt
-LIB_DEPENDS= libKUserFeedbackCore.so:deskutils/kuserfeedback \
- libQXlsxQt5.so:devel/qxlsx@qt5 \
+LIB_DEPENDS= libQXlsxQt6.so:devel/qxlsx@qt6 \
libgsl.so:math/gsl \
liblz4.so:archivers/liblz4 \
libmarkdown.so:textproc/discount \
libpoppler.so:graphics/poppler \
- libpoppler-qt6.so:graphics/poppler-qt6
+ libpoppler-qt6.so:graphics/poppler-qt6 \
+ libzstd.so:archivers/zstd
USES= bison cmake compiler:c++17-lang desktop-file-utils eigen:3 \
- kde:6 pkgconfig qt:6 shared-mime-info tar:xz xorg gettext
-USE_KDE= archive attica auth bookmarks codecs completion config \
- configwidgets coreaddons crash i18n iconthemes itemviews \
- jobwidgets kio newstuff parts purpose service solid \
- sonnet syntaxhighlighting textwidgets widgetsaddons \
- windowsystem xmlgui \
+ kde:6 pkgconfig qt:6 shared-mime-info xorg gettext
+USE_KDE= archive completion config configwidgets coreaddons crash \
+ i18n iconthemes kio newstuff parts purpose service \
+ syntaxhighlighting textwidgets userfeedback widgetsaddons \
+ xmlgui \
doctools:build ecm:build
USE_QT= base mqtt serialport svg
USE_XORG= x11 xcb
-DATADIR= ${PREFIX}/share/labplot2
+KDE_INVENT= 110f258e44a45354c5219e497409a22185fa2933 education labplot
+
+PLIST_SUB= SHLIB_VER=${PORTVERSION}
OPTIONS_DEFINE= CANTOR FITS FFTW3 HDF5 LIBCERF MATLAB NETCDF ORCUS \
ORIGINLAB READSTAT
-OPTIONS_DEFAULT:= ${OPTIONS_DEFINE:NCANTOR}
+OPTIONS_DEFAULT:= ${OPTIONS_DEFINE}
CANTOR_DESC= KDE Cantor support
CANTOR_LIB_DEPENDS= libcantorlibs.so:math/cantor \
libspectre.so:print/libspectre
CANTOR_CMAKE_BOOL= ENABLE_CANTOR
-CANTOR_IGNORE= has to be ported to KF6/Qt6 for Cantor support
FFTW3_DESC= Speedier FFTs in the numerical and stats lib (NSL)
FFTW3_LIB_DEPENDS= libfftw3.so:math/fftw3
@@ -84,4 +80,9 @@ READSTAT_LIB_DEPENDS= libreadstat.so:math/readstat
READSTAT_USES= iconv
READSTAT_CMAKE_BOOL= ENABLE_READSTAT
+post-patch:
+# workaround for undefined version, to be fixed upstream
+ ${REINPLACE_CMD} 's,QXLSX_VERSION_STRING,"1.5.0",' \
+ ${WRKSRC}/src/frontend/AboutDialog.cpp
+
.include <bsd.port.mk>
diff --git a/math/labplot/distinfo b/math/labplot/distinfo
index beb23a80065c..cab9c8a6c64b 100644
--- a/math/labplot/distinfo
+++ b/math/labplot/distinfo
@@ -1,7 +1,3 @@
-TIMESTAMP = 1737874014
-SHA256 (labplot-2.11.1.tar.xz) = 53aa6ac8df39324d99463e60d88de25346b3928da5bb0f210b0563489046679d
-SIZE (labplot-2.11.1.tar.xz) = 24180904
-SHA256 (0230dfa31ad7e916aaa5f9d7be1a9bad0b768c27.patch) = d29d4afbee032b93c87ca3dd7b9b8c1ddf16c3d0b384d037bd560aa630691437
-SIZE (0230dfa31ad7e916aaa5f9d7be1a9bad0b768c27.patch) = 954
-SHA256 (0edfd2862a8f953cdd06ffe4940e1da5b7b5dc17.patch) = 998d361b026aa5db9153c73ca930a1843098d8ba4b7b357b1508a6361bb3aa51
-SIZE (0edfd2862a8f953cdd06ffe4940e1da5b7b5dc17.patch) = 1412
+TIMESTAMP = 1742385981
+SHA256 (KDE/invent.kde.org/education-labplot-110f258e44a45354c5219e497409a22185fa2933_GL0.tar.gz) = f07431e38379ef27305cc96fbcc30d921489bd66b749e283baeffecd5c5095e6
+SIZE (KDE/invent.kde.org/education-labplot-110f258e44a45354c5219e497409a22185fa2933_GL0.tar.gz) = 33604624
diff --git a/math/labplot/files/patch-49b3f18e94586d9733db036a8031ab9d4ea6dd5c b/math/labplot/files/patch-49b3f18e94586d9733db036a8031ab9d4ea6dd5c
deleted file mode 100644
index 1fc5d8dba88a..000000000000
--- a/math/labplot/files/patch-49b3f18e94586d9733db036a8031ab9d4ea6dd5c
+++ /dev/null
@@ -1,34 +0,0 @@
-From 49b3f18e94586d9733db036a8031ab9d4ea6dd5c Mon Sep 17 00:00:00 2001
-From: Stefan Gerlach <stefan.gerlach@uni-konstanz.de>
-Date: Mon, 6 Jan 2025 15:59:30 +0100
-Subject: [PATCH] qxlsx: fix compilation
-
----
- src/backend/datasources/filters/XLSXFilter.cpp | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/backend/datasources/filters/XLSXFilter.cpp b/src/backend/datasources/filters/XLSXFilter.cpp
-index 931b373a57..86a5cccdb7 100644
---- src/backend/datasources/filters/XLSXFilter.cpp
-+++ src/backend/datasources/filters/XLSXFilter.cpp
-@@ -751,7 +751,7 @@ void XLSXFilterPrivate::parse(const QString& fileName, QTreeWidgetItem* parentIt
- bool XLSXFilterPrivate::dataRangeCanBeExportedToMatrix(const QXlsx::CellRange& range) const {
- for (int i = range.firstRow(); i <= range.lastRow(); ++i) {
- for (int j = range.firstColumn(); j <= range.lastColumn(); ++j) {
-- const auto* cell = m_document->cellAt(i, j);
-+ const auto cell = m_document->cellAt(i, j);
- if (cell && cell->cellType() != QXlsx::Cell::CellType::NumberType) {
- if (cell->cellType() == QXlsx::Cell::CellType::CustomType) {
- bool ok = false;
-@@ -786,7 +786,7 @@ QXlsx::Cell::CellType XLSXFilterPrivate::columnTypeInRange(const int column, con
- bool numeric = false, datetime = false;
- if (column >= range.firstColumn() && column <= range.lastColumn()) {
- for (int row = range.firstRow(); row <= range.lastRow(); ++row) {
-- const auto* cell = m_document->cellAt(row, column);
-+ const auto cell = m_document->cellAt(row, column);
- if (!cell)
- continue;
-
---
-GitLab
-
diff --git a/math/labplot/files/patch-CMakeLists.txt b/math/labplot/files/patch-CMakeLists.txt
deleted file mode 100644
index d0a561aeba58..000000000000
--- a/math/labplot/files/patch-CMakeLists.txt
+++ /dev/null
@@ -1,11 +0,0 @@
---- CMakeLists.txt.orig 2025-01-26 06:27:45 UTC
-+++ CMakeLists.txt
-@@ -14,7 +14,7 @@ set(KF_MIN_VERSION "5.32.0")
- set(QT_MIN_VERSION "5.12.0")
- set(KF_MAJOR_VERSION "5")
- set(KF_MIN_VERSION "5.32.0")
--#set(QT_VERSION_MAJOR "6")
-+set(QT_VERSION_MAJOR "6")
- if (QT_VERSION_MAJOR GREATER_EQUAL 6)
- set(KF_MIN_VERSION "5.240.0")
- find_package(ECM ${KF_MIN_VERSION} NO_MODULE)
diff --git a/math/labplot/pkg-plist b/math/labplot/pkg-plist
index 13911e002d9c..898e5f562202 100644
--- a/math/labplot/pkg-plist
+++ b/math/labplot/pkg-plist
@@ -1,142 +1,146 @@
-bin/labplot2
-include/labplot/backend/core/AbstractAspect.h
-include/labplot/backend/core/AbstractColumn.h
-include/labplot/backend/core/AbstractPart.h
-include/labplot/backend/core/column/Column.h
-include/labplot/backend/core/column/ColumnPrivate.h
-include/labplot/backend/gsl/parser.h
-include/labplot/backend/lib/Interval.h
-include/labplot/backend/lib/IntervalAttribute.h
-include/labplot/backend/lib/Range.h
-include/labplot/backend/lib/commandtemplates.h
+bin/labplot
+include/labplot/backend/datasources/filters/filters.h
+include/labplot/backend/gsl/Parser.h
+include/labplot/backend/gsl/ParserDeclarations.h
+include/labplot/backend/gsl/constants.h
+include/labplot/backend/gsl/functions.h
+include/labplot/backend/gsl/parserFunctionTypes.h
+include/labplot/backend/lib/Debug.h
include/labplot/backend/lib/macros.h
-include/labplot/backend/lib/macrosCurve.h
+include/labplot/backend/lib/macrosWarningStyle.h
+include/labplot/backend/nsl/nsl_conv.h
+include/labplot/backend/nsl/nsl_corr.h
+include/labplot/backend/nsl/nsl_dft.h
+include/labplot/backend/nsl/nsl_diff.h
+include/labplot/backend/nsl/nsl_filter.h
include/labplot/backend/nsl/nsl_fit.h
+include/labplot/backend/nsl/nsl_geom_linesim.h
+include/labplot/backend/nsl/nsl_hilbert.h
+include/labplot/backend/nsl/nsl_int.h
+include/labplot/backend/nsl/nsl_interp.h
+include/labplot/backend/nsl/nsl_kde.h
include/labplot/backend/nsl/nsl_math.h
-include/labplot/backend/worksheet/Worksheet.h
-include/labplot/backend/worksheet/WorksheetElement.h
-include/labplot/backend/worksheet/WorksheetElementContainer.h
-include/labplot/backend/worksheet/plots/AbstractPlot.h
-include/labplot/backend/worksheet/plots/PlotArea.h
-include/labplot/backend/worksheet/plots/cartesian/Axis.h
-include/labplot/backend/worksheet/plots/cartesian/BoxPlot.h
-include/labplot/backend/worksheet/plots/cartesian/CartesianPlot.h
-include/labplot/backend/worksheet/plots/cartesian/CartesianPlotLegend.h
-include/labplot/backend/worksheet/plots/cartesian/Histogram.h
-include/labplot/backend/worksheet/plots/cartesian/XYAnalysisCurve.h
-include/labplot/backend/worksheet/plots/cartesian/XYCurve.h
-include/labplot/backend/worksheet/plots/cartesian/XYEquationCurve.h
-include/labplot/backend/worksheet/plots/cartesian/XYFitCurve.h
+include/labplot/backend/nsl/nsl_sf_kernel.h
+include/labplot/backend/nsl/nsl_sf_stats.h
+include/labplot/backend/nsl/nsl_sf_window.h
+include/labplot/backend/nsl/nsl_smooth.h
+include/labplot/backend/worksheet/plots/cartesian/plots.h
include/labplot/labplot.h
include/labplot/labplot_export.h
+include/labplot/tools/TeXRenderer.h
+lib/cmake/labplot/LabPlotConfig.cmake
+lib/cmake/labplot/LabPlotConfigVersion.cmake
+lib/cmake/labplot/LabPlotTargets-%%CMAKE_BUILD_TYPE%%.cmake
+lib/cmake/labplot/LabPlotTargets.cmake
lib/liblabplot.so
-share/applications/org.kde.labplot2.desktop
-share/doc/HTML/ca/labplot2/index.cache.bz2
-share/doc/HTML/ca/labplot2/index.docbook
-share/doc/HTML/en/labplot2/datapicker_active_curve_data_spreadsheet.png
-share/doc/HTML/en/labplot2/datapicker_original_transformed_segments.png
-share/doc/HTML/en/labplot2/datapicker_segments.png
-share/doc/HTML/en/labplot2/example-FFT_python-1024x532.png
-share/doc/HTML/en/labplot2/example-fourier_filter-1024x532.png
-share/doc/HTML/en/labplot2/example-maxima_2-1024x532.png
-share/doc/HTML/en/labplot2/export_spreadsheet_dialog.png
-share/doc/HTML/en/labplot2/export_worksheet_dialog.png
-share/doc/HTML/en/labplot2/file_data_source.png
-share/doc/HTML/en/labplot2/import-dialog.png
-share/doc/HTML/en/labplot2/index.cache.bz2
-share/doc/HTML/en/labplot2/index.docbook
-share/doc/HTML/en/labplot2/labplot.png
-share/doc/HTML/en/labplot2/matrix.png
-share/doc/HTML/en/labplot2/matrix_function_values.png
-share/doc/HTML/en/labplot2/pe-context-menu.png
-share/doc/HTML/en/labplot2/project-explorer.png
-share/doc/HTML/en/labplot2/properties.png
-share/doc/HTML/en/labplot2/spreadsheet.png
-share/doc/HTML/en/labplot2/spreadsheet_generate_equidistant_values.png
-share/doc/HTML/en/labplot2/spreadsheet_generate_function_values.png
-share/doc/HTML/en/labplot2/spreadsheet_generate_multivariant_function_values.png
-share/doc/HTML/en/labplot2/spreadsheet_generate_random_values.png
-share/doc/HTML/en/labplot2/sub_window_tabbed_view_interfaces.png
-share/doc/HTML/en/labplot2/tutorial-spreadsheet1.png
-share/doc/HTML/en/labplot2/tutorial-spreadsheet2.png
-share/doc/HTML/en/labplot2/tutorial-spreadsheet3.png
-share/doc/HTML/en/labplot2/tutorial-spreadsheet4.png
-share/doc/HTML/en/labplot2/tutorial-spreadsheet5.png
-share/doc/HTML/en/labplot2/tutorial-spreadsheet6.png
-share/doc/HTML/en/labplot2/tutorial-spreadsheet7.png
-share/doc/HTML/en/labplot2/tutorial-spreadsheet8.png
-share/doc/HTML/en/labplot2/tutorial-spreadsheet9.png
-share/doc/HTML/en/labplot2/tutorial-xy-function1.png
-share/doc/HTML/en/labplot2/tutorial-xy-function10.png
-share/doc/HTML/en/labplot2/tutorial-xy-function2.png
-share/doc/HTML/en/labplot2/tutorial-xy-function3.png
-share/doc/HTML/en/labplot2/tutorial-xy-function4.png
-share/doc/HTML/en/labplot2/tutorial-xy-function5.png
-share/doc/HTML/en/labplot2/tutorial-xy-function6.png
-share/doc/HTML/en/labplot2/tutorial-xy-function7.png
-share/doc/HTML/en/labplot2/tutorial-xy-function8.png
-share/doc/HTML/en/labplot2/tutorial-xy-function9.png
-share/doc/HTML/en/labplot2/workbook.png
-share/doc/HTML/en/labplot2/worksheet.png
-share/doc/HTML/es/labplot2/index.cache.bz2
-share/doc/HTML/es/labplot2/index.docbook
-share/doc/HTML/it/labplot2/index.cache.bz2
-share/doc/HTML/it/labplot2/index.docbook
-share/doc/HTML/nl/labplot2/index.cache.bz2
-share/doc/HTML/nl/labplot2/index.docbook
-share/doc/HTML/pt_BR/labplot2/index.cache.bz2
-share/doc/HTML/pt_BR/labplot2/index.docbook
-share/doc/HTML/ru/labplot2/index.cache.bz2
-share/doc/HTML/ru/labplot2/index.docbook
-share/doc/HTML/sv/labplot2/index.cache.bz2
-share/doc/HTML/sv/labplot2/index.docbook
-share/doc/HTML/uk/labplot2/export_spreadsheet_dialog.png
-share/doc/HTML/uk/labplot2/export_worksheet_dialog.png
-share/doc/HTML/uk/labplot2/import-dialog.png
-share/doc/HTML/uk/labplot2/index.cache.bz2
-share/doc/HTML/uk/labplot2/index.docbook
-share/doc/HTML/uk/labplot2/labplot.png
-share/doc/HTML/uk/labplot2/matrix.png
-share/doc/HTML/uk/labplot2/matrix_function_values.png
-share/doc/HTML/uk/labplot2/pe-context-menu.png
-share/doc/HTML/uk/labplot2/project-explorer.png
-share/doc/HTML/uk/labplot2/properties.png
-share/doc/HTML/uk/labplot2/spreadsheet.png
-share/doc/HTML/uk/labplot2/spreadsheet_generate_equidistant_values.png
-share/doc/HTML/uk/labplot2/spreadsheet_generate_function_values.png
-share/doc/HTML/uk/labplot2/spreadsheet_generate_random_values.png
-share/doc/HTML/uk/labplot2/tutorial-spreadsheet1.png
-share/doc/HTML/uk/labplot2/tutorial-spreadsheet2.png
-share/doc/HTML/uk/labplot2/tutorial-spreadsheet3.png
-share/doc/HTML/uk/labplot2/tutorial-spreadsheet4.png
-share/doc/HTML/uk/labplot2/tutorial-spreadsheet5.png
-share/doc/HTML/uk/labplot2/tutorial-spreadsheet6.png
-share/doc/HTML/uk/labplot2/tutorial-spreadsheet7.png
-share/doc/HTML/uk/labplot2/tutorial-spreadsheet8.png
-share/doc/HTML/uk/labplot2/tutorial-spreadsheet9.png
-share/doc/HTML/uk/labplot2/tutorial-xy-function1.png
-share/doc/HTML/uk/labplot2/tutorial-xy-function10.png
-share/doc/HTML/uk/labplot2/tutorial-xy-function2.png
-share/doc/HTML/uk/labplot2/tutorial-xy-function3.png
-share/doc/HTML/uk/labplot2/tutorial-xy-function4.png
-share/doc/HTML/uk/labplot2/tutorial-xy-function5.png
-share/doc/HTML/uk/labplot2/tutorial-xy-function6.png
-share/doc/HTML/uk/labplot2/tutorial-xy-function7.png
-share/doc/HTML/uk/labplot2/tutorial-xy-function8.png
-share/doc/HTML/uk/labplot2/tutorial-xy-function9.png
-share/doc/HTML/uk/labplot2/workbook.png
-share/doc/HTML/uk/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
+lib/liblabplot.so.%%SHLIB_VER%%
+share/applications/org.kde.labplot.desktop
+share/doc/HTML/ca/labplot/index.cache.bz2
+share/doc/HTML/ca/labplot/index.docbook
+share/doc/HTML/en/labplot/datapicker_active_curve_data_spreadsheet.png
+share/doc/HTML/en/labplot/datapicker_original_transformed_segments.png
+share/doc/HTML/en/labplot/datapicker_segments.png
+share/doc/HTML/en/labplot/example-FFT_python-1024x532.png
+share/doc/HTML/en/labplot/example-fourier_filter-1024x532.png
+share/doc/HTML/en/labplot/example-maxima_2-1024x532.png
+share/doc/HTML/en/labplot/export_spreadsheet_dialog.png
+share/doc/HTML/en/labplot/export_worksheet_dialog.png
+share/doc/HTML/en/labplot/file_data_source.png
+share/doc/HTML/en/labplot/import-dialog.png
+share/doc/HTML/en/labplot/index.cache.bz2
+share/doc/HTML/en/labplot/index.docbook
+share/doc/HTML/en/labplot/labplot.png
+share/doc/HTML/en/labplot/matrix.png
+share/doc/HTML/en/labplot/matrix_function_values.png
+share/doc/HTML/en/labplot/pe-context-menu.png
+share/doc/HTML/en/labplot/project-explorer.png
+share/doc/HTML/en/labplot/properties.png
+share/doc/HTML/en/labplot/spreadsheet.png
+share/doc/HTML/en/labplot/spreadsheet_generate_equidistant_values.png
+share/doc/HTML/en/labplot/spreadsheet_generate_function_values.png
+share/doc/HTML/en/labplot/spreadsheet_generate_multivariant_function_values.png
+share/doc/HTML/en/labplot/spreadsheet_generate_random_values.png
+share/doc/HTML/en/labplot/sub_window_tabbed_view_interfaces.png
+share/doc/HTML/en/labplot/tutorial-spreadsheet1.png
+share/doc/HTML/en/labplot/tutorial-spreadsheet2.png
+share/doc/HTML/en/labplot/tutorial-spreadsheet3.png
+share/doc/HTML/en/labplot/tutorial-spreadsheet4.png
+share/doc/HTML/en/labplot/tutorial-spreadsheet5.png
+share/doc/HTML/en/labplot/tutorial-spreadsheet6.png
+share/doc/HTML/en/labplot/tutorial-spreadsheet7.png
+share/doc/HTML/en/labplot/tutorial-spreadsheet8.png
+share/doc/HTML/en/labplot/tutorial-spreadsheet9.png
+share/doc/HTML/en/labplot/tutorial-xy-function1.png
+share/doc/HTML/en/labplot/tutorial-xy-function10.png
+share/doc/HTML/en/labplot/tutorial-xy-function2.png
+share/doc/HTML/en/labplot/tutorial-xy-function3.png
+share/doc/HTML/en/labplot/tutorial-xy-function4.png
+share/doc/HTML/en/labplot/tutorial-xy-function5.png
+share/doc/HTML/en/labplot/tutorial-xy-function6.png
+share/doc/HTML/en/labplot/tutorial-xy-function7.png
+share/doc/HTML/en/labplot/tutorial-xy-function8.png
+share/doc/HTML/en/labplot/tutorial-xy-function9.png
+share/doc/HTML/en/labplot/workbook.png
+share/doc/HTML/en/labplot/worksheet.png
+share/doc/HTML/es/labplot/index.cache.bz2
+share/doc/HTML/es/labplot/index.docbook
+share/doc/HTML/it/labplot/index.cache.bz2
+share/doc/HTML/it/labplot/index.docbook
+share/doc/HTML/nl/labplot/index.cache.bz2
+share/doc/HTML/nl/labplot/index.docbook
+share/doc/HTML/pt_BR/labplot/index.cache.bz2
+share/doc/HTML/pt_BR/labplot/index.docbook
+share/doc/HTML/ru/labplot/index.cache.bz2
+share/doc/HTML/ru/labplot/index.docbook
+share/doc/HTML/sv/labplot/index.cache.bz2
+share/doc/HTML/sv/labplot/index.docbook
+share/doc/HTML/uk/labplot/export_spreadsheet_dialog.png
+share/doc/HTML/uk/labplot/export_worksheet_dialog.png
+share/doc/HTML/uk/labplot/import-dialog.png
+share/doc/HTML/uk/labplot/index.cache.bz2
+share/doc/HTML/uk/labplot/index.docbook
+share/doc/HTML/uk/labplot/labplot.png
+share/doc/HTML/uk/labplot/matrix.png
+share/doc/HTML/uk/labplot/matrix_function_values.png
+share/doc/HTML/uk/labplot/pe-context-menu.png
+share/doc/HTML/uk/labplot/project-explorer.png
+share/doc/HTML/uk/labplot/properties.png
+share/doc/HTML/uk/labplot/spreadsheet.png
+share/doc/HTML/uk/labplot/spreadsheet_generate_equidistant_values.png
+share/doc/HTML/uk/labplot/spreadsheet_generate_function_values.png
+share/doc/HTML/uk/labplot/spreadsheet_generate_random_values.png
+share/doc/HTML/uk/labplot/tutorial-spreadsheet1.png
+share/doc/HTML/uk/labplot/tutorial-spreadsheet2.png
+share/doc/HTML/uk/labplot/tutorial-spreadsheet3.png
+share/doc/HTML/uk/labplot/tutorial-spreadsheet4.png
+share/doc/HTML/uk/labplot/tutorial-spreadsheet5.png
+share/doc/HTML/uk/labplot/tutorial-spreadsheet6.png
+share/doc/HTML/uk/labplot/tutorial-spreadsheet7.png
+share/doc/HTML/uk/labplot/tutorial-spreadsheet8.png
+share/doc/HTML/uk/labplot/tutorial-spreadsheet9.png
+share/doc/HTML/uk/labplot/tutorial-xy-function1.png
+share/doc/HTML/uk/labplot/tutorial-xy-function10.png
+share/doc/HTML/uk/labplot/tutorial-xy-function2.png
+share/doc/HTML/uk/labplot/tutorial-xy-function3.png
+share/doc/HTML/uk/labplot/tutorial-xy-function4.png
+share/doc/HTML/uk/labplot/tutorial-xy-function5.png
+share/doc/HTML/uk/labplot/tutorial-xy-function6.png
+share/doc/HTML/uk/labplot/tutorial-xy-function7.png
+share/doc/HTML/uk/labplot/tutorial-xy-function8.png
+share/doc/HTML/uk/labplot/tutorial-xy-function9.png
+share/doc/HTML/uk/labplot/workbook.png
+share/doc/HTML/uk/labplot/worksheet.png
+share/icons/hicolor/128x128/apps/labplot.png
+share/icons/hicolor/150x150/apps/labplot.png
+share/icons/hicolor/16x16/apps/labplot.png
+share/icons/hicolor/22x22/apps/labplot.png
+share/icons/hicolor/256x256/apps/labplot.png
+share/icons/hicolor/310x310/apps/labplot.png
+share/icons/hicolor/32x32/apps/labplot.png
+share/icons/hicolor/44x44/apps/labplot.png
+share/icons/hicolor/48x48/apps/labplot.png
+share/icons/hicolor/512x512/apps/labplot.png
+share/icons/hicolor/64x64/apps/labplot.png
share/icons/hicolor/scalable/apps/labplot-1x-zoom.svg
share/icons/hicolor/scalable/apps/labplot-2x-zoom.svg
share/icons/hicolor/scalable/apps/labplot-3x-zoom.svg
@@ -159,6 +163,7 @@ share/icons/hicolor/scalable/apps/labplot-format-text-symbol.svg
share/icons/hicolor/scalable/apps/labplot-forward.svg
share/icons/hicolor/scalable/apps/labplot-json-array.svg
share/icons/hicolor/scalable/apps/labplot-json-object.svg
+share/icons/hicolor/scalable/apps/labplot-kaggle.svg
share/icons/hicolor/scalable/apps/labplot-matrix-new.svg
share/icons/hicolor/scalable/apps/labplot-matrix.svg
share/icons/hicolor/scalable/apps/labplot-maximize.svg
@@ -192,8 +197,9 @@ share/icons/hicolor/scalable/apps/labplot-zoom-select-x.svg
share/icons/hicolor/scalable/apps/labplot-zoom-select-y.svg
share/icons/hicolor/scalable/apps/labplot-zoom-select.svg
share/icons/hicolor/scalable/apps/labplot-zoom.svg
-share/icons/hicolor/scalable/apps/labplot2.svgz
-%%DATADIR%%/application-x-labplot2.ico
+share/icons/hicolor/scalable/apps/labplot.svgz
+share/icons/hicolor/scalable/apps/org.kde.labplot.svg
+%%DATADIR%%/application-x-labplot.ico
%%DATADIR%%/color-schemes/Breeze.colors
%%DATADIR%%/color-schemes/BreezeDark.colors
%%DATADIR%%/color-schemes/BreezeHighContrast.colors
@@ -257,7 +263,7 @@ share/icons/hicolor/scalable/apps/labplot2.svgz
%%DATADIR%%/examples/General/Tufte's Minimal Ink Design.lml
%%DATADIR%%/examples/Statistics/Same Data, Different Boxplots.lml
%%DATADIR%%/examples/Statistics/SameStats.lml
-%%DATADIR%%/labplot2.ico
+%%DATADIR%%/labplot.ico
%%DATADIR%%/latex/preview.sty
%%DATADIR%%/pics/colorchooser/colorchooser_hue.xpm
%%DATADIR%%/pics/colorchooser/colorchooser_saturation.xpm
@@ -386,48 +392,51 @@ share/icons/hicolor/scalable/apps/labplot2.svgz
%%DATADIR%%/themes/screenshots/Sparkline.png
%%DATADIR%%/themes/screenshots/Tufte.png
%%DATADIR%%/themes/screenshots/Unavailable.png
-share/locale/ar/LC_MESSAGES/labplot2.mo
-share/locale/bs/LC_MESSAGES/labplot2.mo
-share/locale/ca/LC_MESSAGES/labplot2.mo
-share/locale/ca@valencia/LC_MESSAGES/labplot2.mo
-share/locale/cs/LC_MESSAGES/labplot2.mo
-share/locale/da/LC_MESSAGES/labplot2.mo
-share/locale/de/LC_MESSAGES/labplot2.mo
-share/locale/el/LC_MESSAGES/labplot2.mo
-share/locale/en_GB/LC_MESSAGES/labplot2.mo
-share/locale/eo/LC_MESSAGES/labplot2.mo
-share/locale/es/LC_MESSAGES/labplot2.mo
-share/locale/eu/LC_MESSAGES/labplot2.mo
-share/locale/fi/LC_MESSAGES/labplot2.mo
-share/locale/fr/LC_MESSAGES/labplot2.mo
-share/locale/gl/LC_MESSAGES/labplot2.mo
-share/locale/hu/LC_MESSAGES/labplot2.mo
-share/locale/ia/LC_MESSAGES/labplot2.mo
-share/locale/it/LC_MESSAGES/labplot2.mo
-share/locale/ja/LC_MESSAGES/labplot2.mo
-share/locale/ka/LC_MESSAGES/labplot2.mo
-share/locale/lt/LC_MESSAGES/labplot2.mo
-share/locale/nds/LC_MESSAGES/labplot2.mo
-share/locale/nl/LC_MESSAGES/labplot2.mo
-share/locale/pl/LC_MESSAGES/labplot2.mo
-share/locale/pt/LC_MESSAGES/labplot2.mo
-share/locale/pt_BR/LC_MESSAGES/labplot2.mo
-share/locale/ru/LC_MESSAGES/labplot2.mo
-share/locale/sk/LC_MESSAGES/labplot2.mo
-share/locale/sl/LC_MESSAGES/labplot2.mo
-share/locale/sv/LC_MESSAGES/labplot2.mo
-share/locale/tr/LC_MESSAGES/labplot2.mo
-share/locale/uk/LC_MESSAGES/labplot2.mo
-share/locale/zh_CN/LC_MESSAGES/labplot2.mo
-share/locale/zh_TW/LC_MESSAGES/labplot2.mo
-share/man/ca/man1/labplot2.1.gz
-share/man/es/man1/labplot2.1.gz
-share/man/it/man1/labplot2.1.gz
-share/man/man1/labplot2.1.gz
-share/man/nl/man1/labplot2.1.gz
-share/man/pt_BR/man1/labplot2.1.gz
-share/man/ru/man1/labplot2.1.gz
-share/man/sv/man1/labplot2.1.gz
-share/man/uk/man1/labplot2.1.gz
-share/metainfo/org.kde.labplot2.appdata.xml
-share/mime/packages/labplot2.xml
+share/locale/ar/LC_MESSAGES/labplot.mo
+share/locale/bs/LC_MESSAGES/labplot.mo
+share/locale/ca/LC_MESSAGES/labplot.mo
+share/locale/ca@valencia/LC_MESSAGES/labplot.mo
+share/locale/cs/LC_MESSAGES/labplot.mo
+share/locale/da/LC_MESSAGES/labplot.mo
+share/locale/de/LC_MESSAGES/labplot.mo
+share/locale/el/LC_MESSAGES/labplot.mo
+share/locale/en_GB/LC_MESSAGES/labplot.mo
+share/locale/eo/LC_MESSAGES/labplot.mo
+share/locale/es/LC_MESSAGES/labplot.mo
+share/locale/eu/LC_MESSAGES/labplot.mo
+share/locale/fi/LC_MESSAGES/labplot.mo
+share/locale/fr/LC_MESSAGES/labplot.mo
+share/locale/gl/LC_MESSAGES/labplot.mo
+share/locale/hi/LC_MESSAGES/labplot.mo
+share/locale/hu/LC_MESSAGES/labplot.mo
+share/locale/ia/LC_MESSAGES/labplot.mo
+share/locale/it/LC_MESSAGES/labplot.mo
+share/locale/ja/LC_MESSAGES/labplot.mo
+share/locale/ka/LC_MESSAGES/labplot.mo
+share/locale/lt/LC_MESSAGES/labplot.mo
+share/locale/nds/LC_MESSAGES/labplot.mo
+share/locale/nl/LC_MESSAGES/labplot.mo
+share/locale/pl/LC_MESSAGES/labplot.mo
+share/locale/pt/LC_MESSAGES/labplot.mo
+share/locale/pt_BR/LC_MESSAGES/labplot.mo
+share/locale/ru/LC_MESSAGES/labplot.mo
+share/locale/sa/LC_MESSAGES/labplot.mo
+share/locale/sk/LC_MESSAGES/labplot.mo
+share/locale/sl/LC_MESSAGES/labplot.mo
+share/locale/sv/LC_MESSAGES/labplot.mo
+share/locale/tr/LC_MESSAGES/labplot.mo
+share/locale/uk/LC_MESSAGES/labplot.mo
+share/locale/zh_CN/LC_MESSAGES/labplot.mo
+share/locale/zh_TW/LC_MESSAGES/labplot.mo
+share/man/ca/man1/labplot.1.gz
+share/man/de/man1/labplot.1.gz
+share/man/es/man1/labplot.1.gz
+share/man/it/man1/labplot.1.gz
+share/man/man1/labplot.1.gz
+share/man/nl/man1/labplot.1.gz
+share/man/pt_BR/man1/labplot.1.gz
+share/man/ru/man1/labplot.1.gz
+share/man/sv/man1/labplot.1.gz
+share/man/uk/man1/labplot.1.gz
+share/metainfo/org.kde.labplot.appdata.xml
+share/mime/packages/labplot.xml