[neon/extras/labplot/Neon/release] debian: fix build with newer versions of matio

[Pino Toscano]

Git commit fb19eb20636f93ffad2a8d7dddfc83ad3510c714 by Pino Toscano.
Committed on 02/06/2024 at 17:39.
Pushed by jriddell into branch 'Neon/release'.

fix build with newer versions of matio

backport upstream commit d6142308ffa492d9f7cea00fad3b4cd1babfd00c

M  +5    -0    debian/changelog
A  +1    -0    debian/patches/series
A  +34   -0    debian/patches/upstream_matio-Fix-compilation-for-latest-version-1.5.27.patch

https://invent.kde.org/neon/extras/labplot/-/commit/fb19eb20636f93ffad2a8d7dddfc83ad3510c714

diff --git a/debian/changelog b/debian/changelog
index 6de796a..3097347 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,10 @@
 labplot (2.10.1-3) UNRELEASED; urgency=medium
 
+  [ Pino Toscano ]
+  * Backport upstream commit d6142308ffa492d9f7cea00fad3b4cd1babfd00c to fix the
+    build with newer versions of matio; patch
+    upstream_matio-Fix-compilation-for-latest-version-1.5.27.patch.
+    (Closes: #1072280)
 
  -- Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>  Sun, 02 Jun 2024 19:37:02 +0200
 
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..4e24f67
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+upstream_matio-Fix-compilation-for-latest-version-1.5.27.patch
diff --git a/debian/patches/upstream_matio-Fix-compilation-for-latest-version-1.5.27.patch b/debian/patches/upstream_matio-Fix-compilation-for-latest-version-1.5.27.patch
new file mode 100644
index 0000000..d7eb0de
--- /dev/null
+++ b/debian/patches/upstream_matio-Fix-compilation-for-latest-version-1.5.27.patch
@@ -0,0 +1,34 @@
+From d6142308ffa492d9f7cea00fad3b4cd1babfd00c Mon Sep 17 00:00:00 2001
+From: Stefan Gerlach <stefan.gerlach at uni-konstanz.de>
+Date: Sat, 27 Apr 2024 01:08:37 +0200
+Subject: [PATCH] matio: Fix compilation for latest version 1.5.27
+
+---
+ src/backend/datasources/filters/MatioFilter.cpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/backend/datasources/filters/MatioFilter.cpp b/src/backend/datasources/filters/MatioFilter.cpp
+index 7f7d502cf..e87e39121 100644
+--- a/src/backend/datasources/filters/MatioFilter.cpp
++++ b/src/backend/datasources/filters/MatioFilter.cpp
+@@ -328,7 +328,7 @@ QString MatioFilter::fileInfoString(const QString& fileName) {
+ 	info += QLatin1String("<br>");
+ 
+ 	size_t n;
+-	char** dir = Mat_GetDir(matfp, &n);
++	auto* dir = Mat_GetDir(matfp, &n);
+ 	info += i18n("Number of variables: ") + QString::number(n);
+ 	info += QStringLiteral("<br>");
+ 	if (dir && n < 10) { // only show variable info when there are not too many
+@@ -536,7 +536,7 @@ void MatioFilterPrivate::parse(const QString& fileName) {
+ 	}
+ 
+ 	// get names of all vars
+-	char** dir = Mat_GetDir(matfp, &varCount);
++	auto* dir = Mat_GetDir(matfp, &varCount);
+ 	DEBUG(Q_FUNC_INFO << ", found " << varCount << " vars")
+ 
+ 	varsInfo.clear();
+-- 
+2.43.0
+