From e166948704a764a4d8390edf3fbdba60696f0177 Mon Sep 17 00:00:00 2001 From: Sughosha Date: Tue, 7 Oct 2025 16:08:38 +0530 Subject: [PATCH] gnu: labplot: Update to 2.12.1. * gnu/packages/kde-education.scm (labplot): Update to 2.12.1. [arguments]<#:qtbase>: Use qtbase. <#:test-exclude>: Exclude "ParserTest", "ReadStatFilterTest" and "WorksheetElementTest". <#:phases>: In 'check phase, replace the tests to exclude with the test-exclude keyword. [native-inputs]: Replace qttools-5 with qttools; add kdoctools. [inputs]: Remove qtbase-5 and kdoctools-5; replace breeze-qt5 with breeze, karchive-5 with karchive, kcompletion-5 with kcompletion, kconfig-5 with kconfig, kconfigwidgets-5 with kconfigwidgets, kcoreaddons-5 with kcoreaddons, kcrash-5 with kcrash, ki18n-5 with ki18n, kiconthemes-5 with kiconthemes, kio-5 with kio, knewstuff-5 with knewstuff, kparts-5 with kparts, kservice-5 with kservice, ksyntaxhighlighting-5 with ksyntaxhighlighting, ktextwidgets-5 with ktextwidgets, kwidgetsaddons-5 with kwidgetsaddons, kxmlgui-5 with kxmlgui and qtsvg-5 with qtsvg; add discount, eigen, matio, orcus, purpose, poppler-qt6, qt-advanced-docking-system, qtwayland, qxlsx and zstd. Change-Id: I830ba54c1d12c6139b86958295c5e92ce5a3bb24 --- gnu/packages/kde-education.scm | 77 +++++++++++++++++++++------------- 1 file changed, 48 insertions(+), 29 deletions(-) diff --git a/gnu/packages/kde-education.scm b/gnu/packages/kde-education.scm index 1579289a68f..961bdf9a01a 100644 --- a/gnu/packages/kde-education.scm +++ b/gnu/packages/kde-education.scm @@ -32,8 +32,11 @@ #:use-module (gnu packages freedesktop) #:use-module (gnu packages kde-frameworks) #:use-module (gnu packages kde-plasma) + #:use-module (gnu packages libreoffice) + #:use-module (gnu packages markup) #:use-module (gnu packages maths) #:use-module (gnu packages ncurses) + #:use-module (gnu packages pdf) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) #:use-module (gnu packages qt) @@ -120,17 +123,18 @@ such as addition, trigonometric functions or derivatives.") (define-public labplot (package (name "labplot") - (version "2.11.1") + (version "2.12.1") (source (origin (method url-fetch) - (uri (string-append "mirror://kde/stable/labplot" + (uri (string-append "mirror://kde//stable/labplot" "/labplot-" version ".tar.xz")) (sha256 - (base32 "17b78s84hqq51chhzfx5in9b6ijkwa6xhq1y8sclscirvz46majk")))) + (base32 "0shhdinrynsi1lhny8ag0hw83r6iaqsk34a7gipmn3plvnzmb0g2")))) (build-system qt-build-system) (arguments - (list #:configure-flags + (list #:qtbase qtbase + #:configure-flags #~(list "-DENABLE_CANTOR=OFF" ;not packaged "-DENABLE_MQTT=OFF" ;not packaged (qtmqtt) ;; FIXME: readstat (optional dependency) is available in the @@ -138,43 +142,54 @@ such as addition, trigonometric functions or derivatives.") "-DENABLE_READSTAT=OFF" ;; This is a bundled library that is not packaged. "-DENABLE_LIBORIGIN=ON") + #:test-exclude + (string-append "(" + (string-join '("ParserTest" + "ReadStatFilterTest" + "WorksheetElementTest") + "|") + ")") #:phases #~(modify-phases %standard-phases (replace 'check - (lambda* (#:key tests? #:allow-other-keys) + (lambda* (#:key tests? (test-exclude "") #:allow-other-keys) (when tests? (setenv "HOME" (getcwd)) ;; This test fails, I don't know why. - (invoke "ctest" "-E" "(ParserTest|ReadStatFilterTest|\ -WorksheetElementTest)"))))))) + (invoke "ctest" "-E" test-exclude))))))) (native-inputs (list bison extra-cmake-modules + kdoctools pkg-config python-wrapper - qttools-5)) + qttools)) (inputs - (list breeze-qt5 ;for dark themes + (list breeze ;for dark themes breeze-icons ;for icons + discount + eigen gsl - karchive-5 - kcompletion-5 - kconfig-5 - kconfigwidgets-5 - kcoreaddons-5 - kcrash-5 - kdoctools-5 - ki18n-5 - kiconthemes-5 - kio-5 - knewstuff-5 - kparts-5 - kservice-5 - ksyntaxhighlighting-5 - ktextwidgets-5 - kwidgetsaddons-5 - kxmlgui-5 - qtbase-5 - qtsvg-5 + karchive + kcompletion + kconfig + kconfigwidgets + kcoreaddons + kcrash + ki18n + kiconthemes + kio + knewstuff + kparts + kservice + ksyntaxhighlighting + ktextwidgets + kwidgetsaddons + kxmlgui + matio + orcus + purpose + poppler-qt6 + qtsvg shared-mime-info ;; Optional. cfitsio @@ -183,8 +198,12 @@ WorksheetElementTest)"))))))) libcerf lz4 netcdf + qt-advanced-docking-system qtserialport - zlib)) + qtwayland + qxlsx + zlib + zstd)) (home-page "https://labplot.kde.org/") (synopsis "Interactive graphing and analysis of scientific data") (description "LabPlot is a tool for interactive graphing and analysis of