From nobody Sun Sep 1 04:24:57 2024 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4WxJh94P2tz5Mm7s; Sun, 01 Sep 2024 04:24:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WxJh93Gvkz4V7C; Sun, 1 Sep 2024 04:24:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1725164697; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Vwg0iSWW0iGkYTorzZM1v2Dndg+EERjOlraMm88FfLA=; b=So6kSU628VaL/K+9bNSywF8PPZEcn6HJynrodKSPKXijKlJfL5I4wtA+K4gdIXn7UE2YwU Yssc9Q8CmZWY9/5dTSdfRpIcrOjcsgNjB6pKAlI4DBH9r+shrFa5n2io7KeO7tft1y2LyE JL3QKSrimMUnWT5zkCY5dszjMaRyovo8Im6IKEIJXPShpJg3nlFTubhXBNJMhQDRLkslyW TcbzbHjjCzZ9hNNdre8X4dHAuMmUwLkSuteYkhPOB1+1RZu2cylprtMRcVw0bfInZzsyVj rl2V61D/QMg0Tzjd62q8khqxifvZCFZtSFeJJcV65XvCXQeD1GcHwodAU4lZ8Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725164697; a=rsa-sha256; cv=none; b=LRLhccq6j0GwPmajOocuKdhf0o2VPgaCMkIZJ4PTEpTzD1rBCw7Iim8D/qjB6ZaohQ2ARX YIs3WBlcPKBP/VCK3ScL7xNrgo2NVZEga/79/k3FQXLW/Ovy1pCmfyBnUY63LFusdck5iF 3pEC1V9mlPCGbzXiBME9kEurOfNQf/xyyzzWmTb/w182JvVBFaJpO6Oe6OxS6YmbVBrPOI N6KF38oemtcZoxkkT4CTxN73zRAjY5EqpBRyiRZczfGUmzYSLhMl+9h1X1YrZhTXVnX+DA L5hyQSGzG9z0B8Y7CRDc3pmcUsck1T685pNWjBsW/lDNitbllgldu+zFAFLScw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1725164697; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Vwg0iSWW0iGkYTorzZM1v2Dndg+EERjOlraMm88FfLA=; b=DyeGqumoYFEdxuaf3zaSGRU/iJEFS0RGgfRjfJXtcfWZf1ZDI9IxZ0rLIcDwDuc6eBj19b p6qFPnw6kKL+GWPqlhV6UvAUxGGkZiG5iFymdZBILitp/4kEnFaXvZnS/9Ka3/ftNZcA3g ONu2g/CBgIWeYupe5uaTfnBaLBf9o4cjE6X7Y5k1dKg+/VV73+TPh86KVaB+68ncZ18BOk TxghQiojpjAN+L2fSPDN8PTHEIFAQuF2xzOvIRj0j1Shvw8Jd4B5vzX7pusqHVm5orOZh+ 5QG30KAbDKOPJbmBE2AthfJdsbdcxbvqm0amIWJ8hP5qLpsOU7JOe3eOQx9+3g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4WxJh92RxGz1CZ8; Sun, 1 Sep 2024 04:24:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4814Ov5t015898; Sun, 1 Sep 2024 04:24:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4814OvXN015895; Sun, 1 Sep 2024 04:24:57 GMT (envelope-from git) Date: Sun, 1 Sep 2024 04:24:57 GMT Message-Id: <202409010424.4814OvXN015895@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: "Jason E. Hale" Subject: git: afc0601cc349 - main - math/labplot: Update to 2.11.1 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhale X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: afc0601cc34900dc639cf5cfb558e8e53d717e76 Auto-Submitted: auto-generated The branch main has been updated by jhale: URL: https://cgit.FreeBSD.org/ports/commit/?id=afc0601cc34900dc639cf5cfb558e8e53d717e76 commit afc0601cc34900dc639cf5cfb558e8e53d717e76 Author: Jason E. Hale AuthorDate: 2024-08-31 09:12:12 +0000 Commit: Jason E. Hale CommitDate: 2024-09-01 04:23:44 +0000 math/labplot: Update to 2.11.1 Support everything that FreeBSD currently has to offer. We don't have ports for Mqtt[5|6] nor for qt[5|6]advanceddocking at time of commit. Upstream seems to have had a problem with readstat on FreeBSD and disabled it by default [1], but the issue has not manifested here. Readstat support is now optional in case there is a problem that needs to be investigated further. Improve options descriptions, but keep them inline. [1] https://invent.kde.org/education/labplot/-/commit/b2c4bf27105f56e25e116505a67173205d91eeb8 Latest announcement (2.11.0): https://labplot.kde.org/2024/07/16/labplot-2-11-released/ --- math/labplot/Makefile | 92 ++++++++++++++-------- math/labplot/distinfo | 6 +- ...src_backend_cantorWorksheet_CantorWorksheet.cpp | 12 --- math/labplot/pkg-plist | 46 ++++++++++- 4 files changed, 108 insertions(+), 48 deletions(-) diff --git a/math/labplot/Makefile b/math/labplot/Makefile index 329698ce1977..8ec4391a0194 100644 --- a/math/labplot/Makefile +++ b/math/labplot/Makefile @@ -1,6 +1,5 @@ PORTNAME= labplot -DISTVERSION= 2.10.1 -PORTREVISION= 3 +DISTVERSION= 2.11.1 CATEGORIES= math kde MASTER_SITES= KDE/stable/${PORTNAME}/ @@ -11,49 +10,80 @@ WWW= https://labplot.kde.org/ LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/LICENSES/GPL-2.0-or-later.txt -LIB_DEPENDS= libgsl.so:math/gsl \ +LIB_DEPENDS= libKUserFeedbackCore.so:deskutils/kuserfeedback \ + libQXlsxQt5.so:devel/qxlsx@qt5 \ + libgsl.so:math/gsl \ liblz4.so:archivers/liblz4 \ - libspectre.so:print/libspectre \ - libsz.so:science/libaec \ - libreadstat.so:math/readstat - -USES= bison cmake compiler:c++11-lang desktop-file-utils kde:5 qt:5 \ - shared-mime-info tar:xz xorg -USE_KDE= archive attica auth bookmarks codecs completion config configwidgets \ - coreaddons crash guiaddons i18n iconthemes itemviews \ - jobwidgets kio newstuff notifications parts \ - service solid sonnet syntaxhighlighting textwidgets unitconversion \ - widgetsaddons windowsystem xmlgui \ + libmarkdown.so:textproc/discount \ + libpoppler.so:graphics/poppler \ + libpoppler-qt5.so:graphics/poppler-qt5 + +USES= bison cmake compiler:c++17-lang desktop-file-utils eigen:3 \ + kde:5 pkgconfig qt:5 shared-mime-info tar:xz xorg +USE_KDE= archive attica auth bookmarks codecs completion config \ + configwidgets coreaddons crash i18n iconthemes itemviews \ + jobwidgets kio newstuff parts purpose service solid \ + sonnet syntaxhighlighting textwidgets widgetsaddons \ + windowsystem xmlgui \ doctools:build ecm:build USE_QT= concurrent core dbus gui network printsupport serialport \ sql svg widgets xml \ buildtools:build qmake:build testlib:build -USE_XORG= x11 +USE_XORG= x11 xcb -CMAKE_OFF= ENABLE_LIBCERF -CMAKE_ON= CMAKE_DISABLE_FIND_PACKAGE_KUserFeedback +# Dark magic to make CMake oblivious to the presence of Qt6 components, which +# will exist even when building in a clean environment due to the dependency +# chain. Labplot 2.11+ is now Qt6/KF6-ready and eagerly wants to use them by +# default, but we're not quite there yet. +CMAKE_ARGS= -DCMAKE_IGNORE_PATH:PATH="${LOCALBASE}/lib/cmake/Qt6" DATADIR= ${PREFIX}/share/labplot2 -OPTIONS_DEFINE= CANTOR FITS FFTW3 HDF5 NETCDF +OPTIONS_DEFINE= CANTOR FITS FFTW3 HDF5 LIBCERF MATLAB NETCDF ORCUS \ + ORIGINLAB READSTAT OPTIONS_DEFAULT= ${OPTIONS_DEFINE} -CANTOR_DESC= Build with Cantor support -CANTOR_CMAKE_BOOL= ENABLE_CANTOR +CANTOR_DESC= KDE Cantor support CANTOR_LIB_DEPENDS= libcantorlibs.so:math/cantor \ - libpoppler.so:graphics/poppler \ - libpoppler-qt5.so:graphics/poppler-qt5 -FITS_DESC= Flexible Image Transport System Data Format (FITS) Library -FITS_CMAKE_BOOL= ENABLE_FITS -FITS_LIB_DEPENDS= libcfitsio.so:astro/cfitsio -FFTW3_DESC= Build with FFTW support -FFTW3_CMAKE_BOOL= ENABLE_FFTW + libspectre.so:print/libspectre +CANTOR_CMAKE_BOOL= ENABLE_CANTOR + +FFTW3_DESC= Speedier FFTs in the numerical and stats lib (NSL) FFTW3_LIB_DEPENDS= libfftw3.so:math/fftw3 -HDF5_DESC= Build with HDF5 support -HDF5_CMAKE_BOOL= ENABLE_HDF5 +FFTW3_CMAKE_BOOL= ENABLE_FFTW + +FITS_DESC= Flexible Image Transport System (FITS) data support +FITS_LIB_DEPENDS= libcfitsio.so:astro/cfitsio +FITS_CMAKE_BOOL= ENABLE_FITS + +HDF5_DESC= Reading and writing self-describing array data HDF5_LIB_DEPENDS= libhdf5.so:science/hdf5 -NETCDF_DESC= Build with NetCDF support -NETCDF_CMAKE_BOOL= ENABLE_NETCDF +HDF5_CMAKE_BOOL= ENABLE_HDF5 + +LIBCERF_DESC= Complex error functions support +LIBCERF_LIB_DEPENDS= libcerf.so:math/libcerf +LIBCERF_CMAKE_BOOL= ENABLE_LIBCERF + +MATLAB_DESC= MATLAB MAT file support +MATLAB_LIB_DEPENDS= libmatio.so:math/matio +MATLAB_CMAKE_BOOL= ENABLE_MATIO + +NETCDF_DESC= Interfaces for array-oriented data access NETCDF_LIB_DEPENDS= libnetcdf.so:science/netcdf +NETCDF_CMAKE_BOOL= ENABLE_NETCDF + +ORCUS_DESC= Spreadsheet processing filters (via liborcus) +ORCUS_LIB_DEPENDS= libixion-0.18.so:textproc/libixion \ + liborcus-0.18.so:devel/liborcus +ORCUS_CMAKE_BOOL= ENABLE_ORCUS + +ORIGINLAB_DESC= OriginLab project files support +ORIGINLAB_LIB_DEPENDS= liborigin.so:math/liborigin +ORIGINLAB_CMAKE_BOOL= ENABLE_LIBORIGIN + +READSTAT_DESC= SAS, SPSS, Stata data support +READSTAT_LIB_DEPENDS= libreadstat.so:math/readstat +READSTAT_USES= iconv +READSTAT_CMAKE_BOOL= ENABLE_READSTAT .include diff --git a/math/labplot/distinfo b/math/labplot/distinfo index 7b2474e41d08..9a6c27d6a3c4 100644 --- a/math/labplot/distinfo +++ b/math/labplot/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1689188489 -SHA256 (labplot-2.10.1.tar.xz) = 2b6e181517cfb6e0dfff7b895f3eb20c7ce359e6732d38545e0757c9aea2daef -SIZE (labplot-2.10.1.tar.xz) = 23193988 +TIMESTAMP = 1724746145 +SHA256 (labplot-2.11.1.tar.xz) = 53aa6ac8df39324d99463e60d88de25346b3928da5bb0f210b0563489046679d +SIZE (labplot-2.11.1.tar.xz) = 24180904 diff --git a/math/labplot/files/patch-src_backend_cantorWorksheet_CantorWorksheet.cpp b/math/labplot/files/patch-src_backend_cantorWorksheet_CantorWorksheet.cpp deleted file mode 100644 index c044def688b7..000000000000 --- a/math/labplot/files/patch-src_backend_cantorWorksheet_CantorWorksheet.cpp +++ /dev/null @@ -1,12 +0,0 @@ ---- src/backend/cantorWorksheet/CantorWorksheet.cpp.orig 2023-05-01 21:33:27 UTC -+++ src/backend/cantorWorksheet/CantorWorksheet.cpp -@@ -33,6 +33,9 @@ - #include - - #include -+#include -+#include -+#include - #include - - CantorWorksheet::CantorWorksheet(const QString &name, bool loading) diff --git a/math/labplot/pkg-plist b/math/labplot/pkg-plist index 5913b2ca80aa..13911e002d9c 100644 --- a/math/labplot/pkg-plist +++ b/math/labplot/pkg-plist @@ -1,4 +1,35 @@ bin/labplot2 +include/labplot/backend/core/AbstractAspect.h +include/labplot/backend/core/AbstractColumn.h +include/labplot/backend/core/AbstractPart.h +include/labplot/backend/core/column/Column.h +include/labplot/backend/core/column/ColumnPrivate.h +include/labplot/backend/gsl/parser.h +include/labplot/backend/lib/Interval.h +include/labplot/backend/lib/IntervalAttribute.h +include/labplot/backend/lib/Range.h +include/labplot/backend/lib/commandtemplates.h +include/labplot/backend/lib/macros.h +include/labplot/backend/lib/macrosCurve.h +include/labplot/backend/nsl/nsl_fit.h +include/labplot/backend/nsl/nsl_math.h +include/labplot/backend/worksheet/Worksheet.h +include/labplot/backend/worksheet/WorksheetElement.h +include/labplot/backend/worksheet/WorksheetElementContainer.h +include/labplot/backend/worksheet/plots/AbstractPlot.h +include/labplot/backend/worksheet/plots/PlotArea.h +include/labplot/backend/worksheet/plots/cartesian/Axis.h +include/labplot/backend/worksheet/plots/cartesian/BoxPlot.h +include/labplot/backend/worksheet/plots/cartesian/CartesianPlot.h +include/labplot/backend/worksheet/plots/cartesian/CartesianPlotLegend.h +include/labplot/backend/worksheet/plots/cartesian/Histogram.h +include/labplot/backend/worksheet/plots/cartesian/XYAnalysisCurve.h +include/labplot/backend/worksheet/plots/cartesian/XYCurve.h +include/labplot/backend/worksheet/plots/cartesian/XYEquationCurve.h +include/labplot/backend/worksheet/plots/cartesian/XYFitCurve.h +include/labplot/labplot.h +include/labplot/labplot_export.h +lib/liblabplot.so share/applications/org.kde.labplot2.desktop share/doc/HTML/ca/labplot2/index.cache.bz2 share/doc/HTML/ca/labplot2/index.docbook @@ -55,6 +86,8 @@ share/doc/HTML/nl/labplot2/index.cache.bz2 share/doc/HTML/nl/labplot2/index.docbook share/doc/HTML/pt_BR/labplot2/index.cache.bz2 share/doc/HTML/pt_BR/labplot2/index.docbook +share/doc/HTML/ru/labplot2/index.cache.bz2 +share/doc/HTML/ru/labplot2/index.docbook share/doc/HTML/sv/labplot2/index.cache.bz2 share/doc/HTML/sv/labplot2/index.docbook share/doc/HTML/uk/labplot2/export_spreadsheet_dialog.png @@ -160,11 +193,11 @@ share/icons/hicolor/scalable/apps/labplot-zoom-select-y.svg share/icons/hicolor/scalable/apps/labplot-zoom-select.svg share/icons/hicolor/scalable/apps/labplot-zoom.svg share/icons/hicolor/scalable/apps/labplot2.svgz -share/kxmlgui5/labplot2/labplot2ui.rc %%DATADIR%%/application-x-labplot2.ico %%DATADIR%%/color-schemes/Breeze.colors %%DATADIR%%/color-schemes/BreezeDark.colors %%DATADIR%%/color-schemes/BreezeHighContrast.colors +%%DATADIR%%/color-schemes/Dracula.colors %%DATADIR%%/color-schemes/Honeycomb.colors %%DATADIR%%/color-schemes/Norway.colors %%DATADIR%%/color-schemes/ObsidianCoast.colors @@ -185,6 +218,7 @@ share/kxmlgui5/labplot2/labplot2ui.rc %%DATADIR%%/colormaps/ColorCET (Rainbow).json %%DATADIR%%/colormaps/ColormapCollections.json %%DATADIR%%/colormaps/Diverging Color Maps for Scientific Visualization.json +%%DATADIR%%/colormaps/Dracula (Categorical).json %%DATADIR%%/colormaps/Scientific Colour Maps (Cyclic).json %%DATADIR%%/colormaps/Scientific Colour Maps (Diverging).json %%DATADIR%%/colormaps/Scientific Colour Maps (Multi-sequential).json @@ -202,6 +236,7 @@ share/kxmlgui5/labplot2/labplot2ui.rc %%DATADIR%%/datasets/README.md %%DATADIR%%/datasets/Rdatasets.json %%DATADIR%%/datasets/StatLib.json +%%DATADIR%%/datasets/seaborn.json %%DATADIR%%/examples/Analysis/Fit/ENSO.lml %%DATADIR%%/examples/Analysis/Fourier Filter/SOS Morse Signal.lml %%DATADIR%%/examples/Analysis/Hilbert Transformation/Time response of a super regenerative receiver.lml @@ -318,6 +353,7 @@ share/kxmlgui5/labplot2/labplot2ui.rc %%DATADIR%%/themes/Dark %%DATADIR%%/themes/DarkPastels %%DATADIR%%/themes/Default +%%DATADIR%%/themes/Dracula %%DATADIR%%/themes/GgplotDark %%DATADIR%%/themes/GgplotGrey %%DATADIR%%/themes/GreenOnBlack @@ -327,6 +363,7 @@ share/kxmlgui5/labplot2/labplot2ui.rc %%DATADIR%%/themes/RedOnBlack %%DATADIR%%/themes/Solarized %%DATADIR%%/themes/SolarizedLight +%%DATADIR%%/themes/Sparkline %%DATADIR%%/themes/Tufte %%DATADIR%%/themes/screenshots/BlackOnLightYellow.png %%DATADIR%%/themes/screenshots/BlackOnWhite.png @@ -336,6 +373,7 @@ share/kxmlgui5/labplot2/labplot2ui.rc %%DATADIR%%/themes/screenshots/Dark.png %%DATADIR%%/themes/screenshots/DarkPastels.png %%DATADIR%%/themes/screenshots/Default.png +%%DATADIR%%/themes/screenshots/Dracula.png %%DATADIR%%/themes/screenshots/GgplotDark.png %%DATADIR%%/themes/screenshots/GgplotGrey.png %%DATADIR%%/themes/screenshots/GreenOnBlack.png @@ -345,8 +383,10 @@ share/kxmlgui5/labplot2/labplot2ui.rc %%DATADIR%%/themes/screenshots/RedOnBlack.png %%DATADIR%%/themes/screenshots/Solarized.png %%DATADIR%%/themes/screenshots/SolarizedLight.png +%%DATADIR%%/themes/screenshots/Sparkline.png %%DATADIR%%/themes/screenshots/Tufte.png %%DATADIR%%/themes/screenshots/Unavailable.png +share/locale/ar/LC_MESSAGES/labplot2.mo share/locale/bs/LC_MESSAGES/labplot2.mo share/locale/ca/LC_MESSAGES/labplot2.mo share/locale/ca@valencia/LC_MESSAGES/labplot2.mo @@ -355,6 +395,7 @@ share/locale/da/LC_MESSAGES/labplot2.mo share/locale/de/LC_MESSAGES/labplot2.mo share/locale/el/LC_MESSAGES/labplot2.mo share/locale/en_GB/LC_MESSAGES/labplot2.mo +share/locale/eo/LC_MESSAGES/labplot2.mo share/locale/es/LC_MESSAGES/labplot2.mo share/locale/eu/LC_MESSAGES/labplot2.mo share/locale/fi/LC_MESSAGES/labplot2.mo @@ -379,13 +420,14 @@ share/locale/tr/LC_MESSAGES/labplot2.mo share/locale/uk/LC_MESSAGES/labplot2.mo share/locale/zh_CN/LC_MESSAGES/labplot2.mo share/locale/zh_TW/LC_MESSAGES/labplot2.mo -share/metainfo/org.kde.labplot2.appdata.xml share/man/ca/man1/labplot2.1.gz share/man/es/man1/labplot2.1.gz share/man/it/man1/labplot2.1.gz share/man/man1/labplot2.1.gz share/man/nl/man1/labplot2.1.gz share/man/pt_BR/man1/labplot2.1.gz +share/man/ru/man1/labplot2.1.gz share/man/sv/man1/labplot2.1.gz share/man/uk/man1/labplot2.1.gz +share/metainfo/org.kde.labplot2.appdata.xml share/mime/packages/labplot2.xml