[neon/extras/labplot/Neon/release] debian: update the patches
Pino Toscano
null at kde.org
Wed Oct 2 14:04:05 BST 2024
Git commit c418b41204f176b9efb55b223d754a1d08499165 by Pino Toscano.
Committed on 13/07/2024 at 16:08.
Pushed by jriddell into branch 'Neon/release'.
update the patches
- upstream_matio-Fix-compilation-for-latest-version-1.5.27.patch: drop,
backported from upstream
M +3 -0 debian/changelog
D +0 -1 debian/patches/series
D +0 -34 debian/patches/upstream_matio-Fix-compilation-for-latest-version-1.5.27.patch
https://invent.kde.org/neon/extras/labplot/-/commit/c418b41204f176b9efb55b223d754a1d08499165
diff --git a/debian/changelog b/debian/changelog
index d778612..468c3f6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,9 @@ labplot (2.11.0-0r1) UNRELEASED; urgency=medium
- bump KF packages to 5.32.0
- add qtbase5-private-dev, libkf5purpose-dev, libeigen3-dev, and
libqt-advanced-docking-system-dev
+ * Update the patches:
+ - upstream_matio-Fix-compilation-for-latest-version-1.5.27.patch: drop,
+ backported from upstream
-- Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org> Sat, 13 Jul 2024 17:46:43 +0200
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 4e24f67..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-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
deleted file mode 100644
index d7eb0de..0000000
--- a/debian/patches/upstream_matio-Fix-compilation-for-latest-version-1.5.27.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-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
-
More information about the Neon-commits
mailing list