git: 7b24a5069c60 - main - math/labplot: Switch to KDE/QT 6 and prepare against poppler 24.12
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Mon, 10 Feb 2025 15:09:46 UTC
The branch main has been updated by lbartoletti:
URL: https://cgit.FreeBSD.org/ports/commit/?id=7b24a5069c604e195020eefd51740ee0d8000c0f
commit 7b24a5069c604e195020eefd51740ee0d8000c0f
Author: Loïc Bartoletti <lbartoletti@FreeBSD.org>
AuthorDate: 2025-01-26 07:15:00 +0000
Commit: Loïc Bartoletti <lbartoletti@FreeBSD.org>
CommitDate: 2025-02-10 15:09:43 +0000
math/labplot: Switch to KDE/QT 6 and prepare against poppler 24.12
---
math/labplot/Makefile | 19 ++++++++-----------
math/labplot/distinfo | 6 +++++-
math/labplot/files/patch-CMakeLists.txt | 11 +++++++++++
3 files changed, 24 insertions(+), 12 deletions(-)
diff --git a/math/labplot/Makefile b/math/labplot/Makefile
index cc607f468ad1..195bb8390f6f 100644
--- a/math/labplot/Makefile
+++ b/math/labplot/Makefile
@@ -1,8 +1,13 @@
PORTNAME= labplot
DISTVERSION= 2.11.1
+PORTREVISION= 1
CATEGORIES= math kde
MASTER_SITES= KDE/stable/${PORTNAME}/
+PATCH_SITES= https://invent.kde.org/education/labplot/-/commit/
+PATCHFILES+= 0230dfa31ad7e916aaa5f9d7be1a9bad0b768c27.patch:-p1 \
+ 0edfd2862a8f953cdd06ffe4940e1da5b7b5dc17.patch:-p1
+
MAINTAINER= kde@FreeBSD.org
COMMENT= Data plotting and function analysis tool by KDE
WWW= https://labplot.kde.org/
@@ -16,27 +21,19 @@ LIB_DEPENDS= libKUserFeedbackCore.so:deskutils/kuserfeedback \
liblz4.so:archivers/liblz4 \
libmarkdown.so:textproc/discount \
libpoppler.so:graphics/poppler \
- libpoppler-qt5.so:graphics/poppler-qt5
+ libpoppler-qt6.so:graphics/poppler-qt6
USES= bison cmake compiler:c++17-lang desktop-file-utils eigen:3 \
- kde:5 pkgconfig qt:5 shared-mime-info tar:xz xorg
+ kde:6 pkgconfig qt:6 shared-mime-info tar:xz xorg gettext
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_QT= base mqtt serialport svg
USE_XORG= x11 xcb
-# 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 LIBCERF MATLAB NETCDF ORCUS \
diff --git a/math/labplot/distinfo b/math/labplot/distinfo
index 9a6c27d6a3c4..beb23a80065c 100644
--- a/math/labplot/distinfo
+++ b/math/labplot/distinfo
@@ -1,3 +1,7 @@
-TIMESTAMP = 1724746145
+TIMESTAMP = 1737874014
SHA256 (labplot-2.11.1.tar.xz) = 53aa6ac8df39324d99463e60d88de25346b3928da5bb0f210b0563489046679d
SIZE (labplot-2.11.1.tar.xz) = 24180904
+SHA256 (0230dfa31ad7e916aaa5f9d7be1a9bad0b768c27.patch) = d29d4afbee032b93c87ca3dd7b9b8c1ddf16c3d0b384d037bd560aa630691437
+SIZE (0230dfa31ad7e916aaa5f9d7be1a9bad0b768c27.patch) = 954
+SHA256 (0edfd2862a8f953cdd06ffe4940e1da5b7b5dc17.patch) = 998d361b026aa5db9153c73ca930a1843098d8ba4b7b357b1508a6361bb3aa51
+SIZE (0edfd2862a8f953cdd06ffe4940e1da5b7b5dc17.patch) = 1412
diff --git a/math/labplot/files/patch-CMakeLists.txt b/math/labplot/files/patch-CMakeLists.txt
new file mode 100644
index 000000000000..d0a561aeba58
--- /dev/null
+++ b/math/labplot/files/patch-CMakeLists.txt
@@ -0,0 +1,11 @@
+--- CMakeLists.txt.orig 2025-01-26 06:27:45 UTC
++++ CMakeLists.txt
+@@ -14,7 +14,7 @@ set(KF_MIN_VERSION "5.32.0")
+ set(QT_MIN_VERSION "5.12.0")
+ set(KF_MAJOR_VERSION "5")
+ set(KF_MIN_VERSION "5.32.0")
+-#set(QT_VERSION_MAJOR "6")
++set(QT_VERSION_MAJOR "6")
+ if (QT_VERSION_MAJOR GREATER_EQUAL 6)
+ set(KF_MIN_VERSION "5.240.0")
+ find_package(ECM ${KF_MIN_VERSION} NO_MODULE)