Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package labplot-kf5 for openSUSE:Factory checked in at 2024-06-21 16:04:59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/labplot-kf5 (Old) and /work/SRC/openSUSE:Factory/.labplot-kf5.new.18349 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "labplot-kf5" Fri Jun 21 16:04:59 2024 rev:19 rq:1182242 version:2.10.1 Changes: -------- --- /work/SRC/openSUSE:Factory/labplot-kf5/labplot-kf5.changes 2023-09-02 22:08:23.588850452 +0200 +++ /work/SRC/openSUSE:Factory/.labplot-kf5.new.18349/labplot-kf5.changes 2024-06-21 16:05:22.890854918 +0200 @@ -1,0 +2,7 @@ +Thu Jun 20 17:06:51 UTC 2024 - Antonio Larrosa <[email protected]> + +- Add patches from upstream to fix a FTBFS: + * 0001-matio-Fix-compilation-for-latest-version-1.5.27.patch + * 0002-fix-warning.patch + +------------------------------------------------------------------- New: ---- 0001-matio-Fix-compilation-for-latest-version-1.5.27.patch 0002-fix-warning.patch BETA DEBUG BEGIN: New:- Add patches from upstream to fix a FTBFS: * 0001-matio-Fix-compilation-for-latest-version-1.5.27.patch * 0002-fix-warning.patch New: * 0001-matio-Fix-compilation-for-latest-version-1.5.27.patch * 0002-fix-warning.patch BETA DEBUG END: ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ labplot-kf5.spec ++++++ --- /var/tmp/diff_new_pack.LKzklQ/_old 2024-06-21 16:05:23.530878396 +0200 +++ /var/tmp/diff_new_pack.LKzklQ/_new 2024-06-21 16:05:23.530878396 +0200 @@ -1,7 +1,7 @@ # # spec file for package labplot-kf5 # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -30,6 +30,10 @@ Source: https://download.kde.org/stable/labplot/labplot-%{version}.tar.xz # PATCH-FIX-UPSTREAM Patch0: Fix-finding-liborigin-header-in-project-import-test.patch +# PATCH-FIX-UPSTREAM +Patch1: 0001-matio-Fix-compilation-for-latest-version-1.5.27.patch +# PATCH-FIX-UPSTREAM +Patch2: 0002-fix-warning.patch BuildRequires: bison BuildRequires: cantor-devel BuildRequires: extra-cmake-modules ++++++ 0001-matio-Fix-compilation-for-latest-version-1.5.27.patch ++++++ >From d6142308ffa492d9f7cea00fad3b4cd1babfd00c Mon Sep 17 00:00:00 2001 From: Stefan Gerlach <[email protected]> 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 7f7d502cfd..e87e391218 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(); -- GitLab ++++++ 0002-fix-warning.patch ++++++ >From c3783466746d5e2dfdbc7376897f94eb4505f896 Mon Sep 17 00:00:00 2001 From: Stefan Gerlach <[email protected]> Date: Sat, 1 Jun 2024 14:34:45 +0200 Subject: [PATCH] fix warning --- src/backend/datasources/filters/MatioFilter.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/backend/datasources/filters/MatioFilter.cpp b/src/backend/datasources/filters/MatioFilter.cpp index e87e391218..bae441f5cf 100644 --- a/src/backend/datasources/filters/MatioFilter.cpp +++ b/src/backend/datasources/filters/MatioFilter.cpp @@ -1162,10 +1162,11 @@ MatioFilterPrivate::readCurrentVar(const QString& fileName, AbstractDataSource* break; } - if (fields[i]->rank == 2) + if (fields[i]->rank == 2) { DEBUG(Q_FUNC_INFO << " rank = 2 (" << fields[i]->dims[0] << " x " << fields[i]->dims[1] << ")") - else + } else { DEBUG(Q_FUNC_INFO << " rank = " << fields[i]->rank) + } if (fields[i]->data_type == MAT_T_UINT16 || fields[i]->data_type == MAT_T_INT16) { auto* data = (mat_uint16_t*)fields[i]->data; -- GitLab
