diff options
| author | Adriaan de Groot <adridg@FreeBSD.org> | 2025-03-09 18:29:44 +0100 |
|---|---|---|
| committer | Adriaan de Groot <adridg@FreeBSD.org> | 2025-03-09 18:33:20 +0100 |
| commit | ab8a581e5f04ed124282429c73d263d9970c560a (patch) | |
| tree | a3aecf02b49e0c7008ab436fde1f0ad02256e4e8 /math/labplot | |
| parent | graphics/p5-Image-ExifTool-devel: Update 13.22 → 13.24 (diff) | |
math/labplot: add patch from upstream with compile-fix
A change in the return type from cellAt() means that
`auto *` is no longer a valid type; however, plain `auto`
can mean `std::shared_ptr<T>` or `T*` so use that ambiguity
in the patch to accept either the type (so retaining compatibility
with either version of the library that provides cellAt())
Diffstat (limited to 'math/labplot')
| -rw-r--r-- | math/labplot/Makefile | 2 | ||||
| -rw-r--r-- | math/labplot/files/patch-49b3f18e94586d9733db036a8031ab9d4ea6dd5c | 34 |
2 files changed, 35 insertions, 1 deletions
diff --git a/math/labplot/Makefile b/math/labplot/Makefile index 195bb8390f6f..11088a87b92a 100644 --- a/math/labplot/Makefile +++ b/math/labplot/Makefile @@ -1,6 +1,6 @@ PORTNAME= labplot DISTVERSION= 2.11.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= math kde MASTER_SITES= KDE/stable/${PORTNAME}/ diff --git a/math/labplot/files/patch-49b3f18e94586d9733db036a8031ab9d4ea6dd5c b/math/labplot/files/patch-49b3f18e94586d9733db036a8031ab9d4ea6dd5c new file mode 100644 index 000000000000..1fc5d8dba88a --- /dev/null +++ b/math/labplot/files/patch-49b3f18e94586d9733db036a8031ab9d4ea6dd5c @@ -0,0 +1,34 @@ +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 + |