From 03a77474fe96d9e59beda6681575c6b57e45de53 Mon Sep 17 00:00:00 2001
From: Schrijvers Luc <begasus@gmail.com>
Date: Sun, 27 Apr 2025 14:31:23 +0000
Subject: [PATCH] labplot, bump to 2.12.0 (#12260)

---
 ...ot-2.11.1.recipe => labplot-2.12.0.recipe} | 31 +++++++++----------
 .../labplot/patches/labplot-2.12.0.patchset   | 22 +++++++++++++
 2 files changed, 36 insertions(+), 17 deletions(-)
 rename sci-visualization/labplot/{labplot-2.11.1.recipe => labplot-2.12.0.recipe} (92%)
 create mode 100644 sci-visualization/labplot/patches/labplot-2.12.0.patchset

diff --git a/sci-visualization/labplot/labplot-2.11.1.recipe b/sci-visualization/labplot/labplot-2.12.0.recipe
similarity index 92%
rename from sci-visualization/labplot/labplot-2.11.1.recipe
rename to sci-visualization/labplot/labplot-2.12.0.recipe
index 5b3f51144..82f8e3814 100644
--- a/sci-visualization/labplot/labplot-2.11.1.recipe
+++ b/sci-visualization/labplot/labplot-2.12.0.recipe
@@ -10,12 +10,13 @@ Feature highlights:
 * Smooth data import and export to and from multiple formats
 * Available for Windows, macOS, Linux and FreeBSD."
 HOMEPAGE="https://invent.kde.org/education/labplot"
-COPYRIGHT="2010-2024 KDE Organisation"
+COPYRIGHT="2010-2025 KDE Organisation"
 LICENSE="GNU GPL v2"
-REVISION="3"
+REVISION="1"
 SOURCE_URI="https://download.kde.org/stable/labplot/labplot-$portVersion.tar.xz"
-CHECKSUM_SHA256="53aa6ac8df39324d99463e60d88de25346b3928da5bb0f210b0563489046679d"
+CHECKSUM_SHA256="25f1751261ec2d11312f0179049ea1f16db33b3a89800dc572d68ad8d267afe7"
 SOURCE_DIR="labplot-$portVersion"
+PATCHES="labplot-$portVersion.patchset"
 ADDITIONAL_FILES="labplot2.rdef.in"
 
 ARCHITECTURES="all !x86_gcc2"
@@ -23,7 +24,7 @@ SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="
 	labplot$secondaryArchSuffix = $portVersion
-	cmd:labplot2$secondaryArchSuffix = $portVersion
+	cmd:labplot$secondaryArchSuffix = $portVersion
 	lib:liblabplot$secondaryArchSuffix
 	"
 REQUIRES="
@@ -46,6 +47,7 @@ REQUIRES="
 	lib:libspectre$secondaryArchSuffix
 	lib:libxcb$secondaryArchSuffix
 	lib:libz$secondaryArchSuffix
+	lib:libzstd$secondaryArchSuffix
 	# KF6
 	lib:libKF6Archive$secondaryArchSuffix
 	lib:libKF6Attica$secondaryArchSuffix
@@ -111,6 +113,7 @@ BUILD_REQUIRES="
 	devel:libssp_nonshared$secondaryArchSuffix
 	devel:libxcb$secondaryArchSuffix
 	devel:libz$secondaryArchSuffix
+	devel:libzstd$secondaryArchSuffix
 	# KF6
 	extra_cmake_modules$secondaryArchSuffix
 	devel:libKF6Archive$secondaryArchSuffix
@@ -150,7 +153,7 @@ BUILD_PREREQUIRES="
 	cmd:bison
 	cmd:cmake
 	cmd:g++$secondaryArchSuffix
-	cmd:make
+	cmd:ninja
 	cmd:msgfmt$secondaryArchSuffix
 	cmd:msgmerge$secondaryArchSuffix
 	cmd:pkg_config$secondaryArchSuffix
@@ -160,29 +163,23 @@ TEST_REQUIRES="
 	qthaikuplugins$secondaryArchSuffix
 	"
 
-PATCH()
-{
-	# disable docs
-	sed -e '/	DocTools/ s/^#*/#/' -i CMakeLists.txt
-	sed -e '/add_subdirectory(doc)/ s/^#*/#/' -i CMakeLists.txt
-}
-
 BUILD()
 {
-	cmake -B build -S . -DCMAKE_BUILD_TYPE=Release \
+	cmake -B build -S . -G Ninja -DCMAKE_BUILD_TYPE=Release \
 		$cmakeDirArgs \
 		-DECM_DIR=/system/data/cmake/Modules/ECM/cmake \
+		-DCMAKE_SKIP_RPATH=YES \
 		-DENABLE_READSTAT=OFF  \
 		-DBUILD_TESTING=OFF \
 		-DENABLE_TESTS=OFF \
 		-Wno-dev
 
-	make -C build $jobArgs
+	ninja -v -C build $jobArgs
 }
 
 INSTALL()
 {
-	make -C build install
+	ninja -v -C build install
 
 	# don't mess with shared_mime_info files
 	rm -rf $dataDir/mime/{aliases,generic-icons,globs,globs2,icons,magic}
@@ -205,9 +202,9 @@ INSTALL()
 		-e "s|@APP_SIGNATURE@|$APP_SIGNATURE|" \
 		$portDir/additional-files/labplot2.rdef.in > labplot2.rdef
 
-	addResourcesToBinaries labplot2.rdef $binDir/labplot2
+	addResourcesToBinaries labplot2.rdef $binDir/labplot
 
-	addAppDeskbarSymlink $binDir/labplot2 LabPlot
+	addAppDeskbarSymlink $binDir/labplot LabPlot
 }
 
 TEST()
diff --git a/sci-visualization/labplot/patches/labplot-2.12.0.patchset b/sci-visualization/labplot/patches/labplot-2.12.0.patchset
new file mode 100644
index 000000000..7e67e1467
--- /dev/null
+++ b/sci-visualization/labplot/patches/labplot-2.12.0.patchset
@@ -0,0 +1,22 @@
+From 4589008cc71aa2d086d0ec9b2c44bc19816f4be7 Mon Sep 17 00:00:00 2001
+From: Luc Schrijvers <begasus@gmail.com>
+Date: Sat, 26 Apr 2025 19:12:21 +0200
+Subject: Don't default to xcb qt plugin on Haiku
+
+
+diff --git a/src/frontend/LabPlot.cpp b/src/frontend/LabPlot.cpp
+index 23bab67..50cf6dd 100644
+--- a/src/frontend/LabPlot.cpp
++++ b/src/frontend/LabPlot.cpp
+@@ -42,7 +42,7 @@
+ #endif
+ 
+ int main(int argc, char* argv[]) {
+-#if defined(Q_OS_UNIX) && !defined(Q_OS_DARWIN)
++#if defined(Q_OS_UNIX) && !defined(Q_OS_DARWIN) && !defined(Q_OS_HAIKU)
+ 	// the qads library has issues on wayland so we force qt to use x11 instead
+ 	// see https://invent.kde.org/education/labplot/-/issues/1067
+ 	QByteArray xcbQtQpaEnvVar("xcb");
+-- 
+2.48.1
+