Accepting request 1311097 from KDE:Extra

- Add upstream changes:
  * 0001-Fix-build-with-Qt-6.10.patch
  * 0001-Added-the-missing-include-to-fix-the-build.patch

OBS-URL: https://build.opensuse.org/request/show/1311097
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/labplot?expand=0&rev=5

0001-Added-the-missing-include-to-fix-the-build.patch

@@ -0,0 +1,24 @@
+From c2db2ec28aa8958f7041ae5cd03ddae9f44e5aa3 Mon Sep 17 00:00:00 2001
+From: Alexander Semke <alexander.semke@web.de>
+Date: Sun, 12 Oct 2025 13:54:57 +0200
+Subject: [PATCH] Added the missing include to fix the build.
+
+---
+ src/backend/worksheet/plots/cartesian/XYFourierFilterCurve.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/backend/worksheet/plots/cartesian/XYFourierFilterCurve.cpp b/src/backend/worksheet/plots/cartesian/XYFourierFilterCurve.cpp
+index 5957bb22c..f6d0ed4b5 100644
+--- a/src/backend/worksheet/plots/cartesian/XYFourierFilterCurve.cpp
++++ b/src/backend/worksheet/plots/cartesian/XYFourierFilterCurve.cpp
+@@ -24,6 +24,7 @@ extern "C" {
+ #include "backend/nsl/nsl_sf_poly.h"
+ }
+ 
++#include <QElapsedTimer>
+ #include <QDebug> // qWarning()
+ #include <QIcon>
+ #include <QThreadPool>
+-- 
+2.51.0
+

0001-Fix-build-with-Qt-6.10.patch

@@ -0,0 +1,32 @@
+From 65ef37d0452994a3647ff5fde85a5951d27c30e7 Mon Sep 17 00:00:00 2001
+From: Nicolas Fella <nicolas.fella@gmx.de>
+Date: Thu, 9 Oct 2025 12:33:38 +0200
+Subject: [PATCH] Fix build with Qt 6.10
+
+The private API has been moved into a separate CMake package
+
+See https://bugreports.qt.io/browse/QTBUG-87776
+---
+ CMakeLists.txt | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index c4861c7..9e00100 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -51,7 +51,11 @@ find_package(Qt${QT_MAJOR_VERSION} ${QT_MIN_VERSION} NO_MODULE REQUIRED COMPONEN
+ )
+ 
+ # building QADS or Xlsx requires Qt${QT_VERSION_MAJOR}GuiPrivate (QADS is required, Xlsx is optional)
+-find_package(Qt${QT_MAJOR_VERSION}Gui ${QT_MIN_VERSION} CONFIG REQUIRED Private)
++if (Qt6Gui_VERSION VERSION_GREATER_EQUAL 6.10.0)
++    find_package(Qt6GuiPrivate ${QT_MIN_VERSION} CONFIG REQUIRED)
++else()
++    find_package(Qt${QT_MAJOR_VERSION}Gui ${QT_MIN_VERSION} CONFIG REQUIRED Private)
++endif()
+ 
+ find_package(KF${KF_MAJOR_VERSION} ${KF_MIN_VERSION} REQUIRED COMPONENTS
+     Archive
+-- 
+2.51.0
+

labplot-2.12.0.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:25f1751261ec2d11312f0179049ea1f16db33b3a89800dc572d68ad8d267afe7
-size 25659772

labplot-2.12.0.tar.xz.sig

@@ -1,14 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQGzBAABCAAdFiEEaNnx1kZwSOfQ63Uz5+r6MJZR4dAFAmgKw7wACgkQ5+r6MJZR
-4dC5KwwAqigv3ri3dYDPWptUe3wF8ME4Uf1xTtb2L5I2xk80PQj0gOaZXUW+xyYC
-e90Lmu9ctxPO/N3bd9QbfajZiEK1zDpyxu5P1ZFIgwzbIT/RD4JK0ZlzpkHo4bnU
-SfxNVvp8WqEOVlGRFaZkJU+RPkDNNLrUla/IyQfziFHm9iR81Qq7XA4Wao68xBHS
-275is94Vi3AYDTMD94SiNddJUsIlDGSX6AyvF4gSEQ41qvrRQQ4zKFEZGze6wH0+
-I79VRXc1BomH+Kqea4VFAPO4s8vW8dvK/3qIH0m44qnBtvTwzOMSRyIWyy5wzCMU
-/WPHza/yEjUVL4VBL3wfJikAiIx0BY1LNZtZeNdO0jF+8xaIldYcRkoU59lEWZYa
-TOPZ8u6j4PSHVkdEDuEWjY8OJwUwq0OGbsqyqVGwOodVMfdeiXXVRNHJ612su0xT
-35BSOhMl57hQkDeWs+WNlpbuIYOI0uUTlvF6oNNJ+rKvTwk3KIlrArcabhA0awu9
-onLssjo8
-=x02E
------END PGP SIGNATURE-----

labplot-2.12.1.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e28155bfddf40e5b6f7c4791313556d1e48138044f216f210d515b9f6d6c106a
+size 23900436

labplot-2.12.1.tar.xz.sig

@@ -0,0 +1,14 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQGzBAABCAAdFiEEaNnx1kZwSOfQ63Uz5+r6MJZR4dAFAmieatMACgkQ5+r6MJZR
+4dDjPwv/UdMiVXaGPuA9fVeJ+MMtiYMsBr1pon/3K7h3rogd+BLMy8COyYpwY8zk
+kPEth6NqtND5UicijQryPPSg615w/zwqXEb50jByHJUf1uYjbMwbOl5dxew8IVgD
+VJ1ggw1i9+Zmv3lz3qboucrSkkJpqXwUGuMHILiHeSXz0ZE0DiWPwhHFL0+sHnT7
+BWqfSV8oCpb43+ZW5+FhGcjBDgfrRpaCBXbimNVVVVoQ9dQWqU9cA5+qTLLJB193
+bBX2lsq3iRSQJYyfwU4798IWxYxWaKSthAqXelSJFajtLP2z2PHe+Roj8Kz8oCUB
+RBXTNXHGyysYl6sNpG5nmgRUv+yU3hQsxnzuaQINUEnIkSTb9oTZaarsdOvNVxrl
+D+XWt8dIbNbRpXDxktLdzm/i8QJPWu2rhaSp7P63B+M0Dlfl37/gzOQGnTRMb1Ue
+2MxBjptjI6n0+cnTYIL7iqhrXGOBq8H4adJBOETCR7Ri6mddmlbFM3wolVGxoj8I
+boLPc2Iq
+=7vBL
+-----END PGP SIGNATURE-----

labplot.changes

@@ -1,3 +1,58 @@
+-------------------------------------------------------------------
+Mon Oct 13 11:34:34 UTC 2025 - Christophe Marin <christophe@krop.fr>
+
+- Add upstream changes:
+  * 0001-Fix-build-with-Qt-6.10.patch
+  * 0001-Added-the-missing-include-to-fix-the-build.patch
+
+-------------------------------------------------------------------
+Wed Aug 20 08:02:42 UTC 2025 - Christophe Marin <christophe@krop.fr>
+
+- Drop netcdf build dependency on 32bit archs
+
+-------------------------------------------------------------------
+Tue Aug 19 07:23:46 UTC 2025 - Christophe Marin <christophe@krop.fr>
+
+- Update to 2.12.1
+  * Fix using default font for axis title
+  * Fix build with system QXlsx
+  * Fix build with system QADS 4.4
+  * Fix crash on import when no projects opened (kde#503800)
+  * Save rotation of axis title separately for x and y axis
+  * Fix disappearing axis ticks
+  * Fix crash when creating the data spreadsheet for analysis
+    curves (kde#504662)
+  * Fix crash when aspect is added and all docks in content area
+    are hidden (kde#504794, kde#502043)
+  * Fix crash when column or row was added to spreadsheet from
+    toolbar and no column or row was selected (kde#504839)
+  * Fix issue when the statistics spreadsheet was not shown if
+    the spreadsheet was a child of workbook
+  * Fix issue which caused the context menu of an aspect to not
+    be shown after being re-parented
+  * Handle Windows logical font “MS Shell Dlg 2”
+  * Fix crash when deleting a live-data source with missing
+    source file
+  * Parser: Remove not required function and reuse function
+    instead of copying (kde#506925)
+  * Fix the export of spreadsheets to SQLite, wrong format
+    was selected internally in the export dialog
+  * Fix the export to SQLite of text values in the spreadsheet
+    containing single quotes
+  * Fix FITS import and export issues
+  * Don’t show any error messages and NaN values in the process
+    behavior chart if no column or an empty column was selected
+  * Remove unwanted entries on the undo stack that were created
+    when modifying properties of the process behavior and run charts
+  * Improve the quality of the fit model preview in the properties
+    explorer and formula view in the random values dialog
+    on hi-dpi screens
+  * Initialize the parameters for the baseline subtraction with
+    reasonable values on first startup and improve the appearance
+    of the preview plot
+  * Fix save/load of the background color for the center value
+    label in the process behavior chart
+
 -------------------------------------------------------------------
 Mon Apr 28 10:48:21 UTC 2025 - Christophe Marin <christophe@krop.fr>
 

labplot.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package labplot
 #
-# Copyright (c) 2025 SUSE LLC
+# Copyright (c) 2025 SUSE LLC and contributors
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -19,8 +19,13 @@
 %define kf6_version 6.3
 %define qt6_version 6.5
 
+# netcdf build was disabled on 32bit archs (sr#1266211)
+%ifnarch s390x i586 %arm
+%bcond_without netcdf
+%endif
+
 Name:           labplot
-Version:        2.12.0
+Version:        2.12.1
 Release:        0
 Summary:        Data Visualization and Analysis software
 License:        GPL-2.0-or-later
@@ -31,6 +36,9 @@ Source1:        https://download.kde.org/stable/labplot/%{name}-%{version}.tar.x
 Source2:        labplot.keyring
 # PATCH-FIX-OPENSUSE
 Patch0:         0001-Fix-finding-liborigin-on-openSUSE.patch
+# PATCH-FIX-UPSTREAM -- Qt 6.10 build fixes
+Patch1:         0001-Fix-build-with-Qt-6.10.patch
+Patch2:         0001-Added-the-missing-include-to-fix-the-build.patch
 BuildRequires:  bison
 BuildRequires:  hdf5-devel
 BuildRequires:  kf6-extra-cmake-modules >= %{kf6_version}
@@ -79,7 +87,9 @@ BuildRequires:  pkgconfig(liblz4)
 BuildRequires:  pkgconfig(libmarkdown)
 BuildRequires:  pkgconfig(liborigin)
 BuildRequires:  pkgconfig(matio)
+%if %{with netcdf}
 BuildRequires:  pkgconfig(netcdf)
+%endif
 BuildRequires:  pkgconfig(poppler-qt6) >= 0.62.0
 BuildRequires:  pkgconfig(zlib)
 Requires:       qt6-sql-sqlite >= %{qt6_version}