From 675ed1f91b66191963ffcbc0db6363607101f9a2 Mon Sep 17 00:00:00 2001
From: Schrijvers Luc <begasus@gmail.com>
Date: Sun, 27 Apr 2025 14:08:12 +0000
Subject: [PATCH] cantor, bump to 25.04.0 (#12259)

---
 ...r-24.12.3.recipe => cantor-25.04.0.recipe} | 28 ++++++++----
 ....12.3.patchset => cantor-25.04.0.patchset} | 45 +------------------
 2 files changed, 21 insertions(+), 52 deletions(-)
 rename kde-apps/cantor/{cantor-24.12.3.recipe => cantor-25.04.0.recipe} (90%)
 rename kde-apps/cantor/patches/{cantor-24.12.3.patchset => cantor-25.04.0.patchset} (53%)

diff --git a/kde-apps/cantor/cantor-24.12.3.recipe b/kde-apps/cantor/cantor-25.04.0.recipe
similarity index 90%
rename from kde-apps/cantor/cantor-24.12.3.recipe
rename to kde-apps/cantor/cantor-25.04.0.recipe
index d82f42cd2..1be85e3c3 100644
--- a/kde-apps/cantor/cantor-24.12.3.recipe
+++ b/kde-apps/cantor/cantor-25.04.0.recipe
@@ -20,9 +20,9 @@ COPYRIGHT="2010-2025 KDE Organisation
 	2016 Filipe Saraiva
 	2009-2015 Alexander Rieder"
 LICENSE="GNU GPL v2"
-REVISION="2"
+REVISION="1"
 SOURCE_URI="https://download.kde.org/stable/release-service/$portVersion/src/cantor-$portVersion.tar.xz"
-CHECKSUM_SHA256="28ae80a281bdb277f8a807feddadbecb8d3f797b6b5b804e1bf371f32a728245"
+CHECKSUM_SHA256="98f96661f20ad4c91fa5fe64bc0ecbef03d85969b64851c660d2d369682c3f00"
 SOURCE_DIR="cantor-$portVersion"
 PATCHES="cantor-$portVersion.patchset"
 ADDITIONAL_FILES="cantor.rdef.in"
@@ -46,9 +46,17 @@ PROVIDES="
 REQUIRES="
 	haiku$secondaryArchSuffix
 	lib:libGL$secondaryArchSuffix
+	lib:libAnalitza$secondaryArchSuffix
+	lib:libluajit_5.1$secondaryArchSuffix
+	lib:libmarkdown$secondaryArchSuffix
 	lib:libpoppler$secondaryArchSuffix
-	lib:libpoppler_Qt6$secondaryArchSuffix
+	lib:libpoppler_qt6$secondaryArchSuffix
+	lib:libpython3.10$secondaryArchSuffix
+	lib:libqalculate$secondaryArchSuffix
+#	lib:libRmath$secondaryArchSuffix
 	lib:libspectre$secondaryArchSuffix
+	lib:libxml2$secondaryArchSuffix
+	lib:libxslt$secondaryArchSuffix
 	# KF6
 	lib:libKF6Archive$secondaryArchSuffix
 	lib:libKF6Attica$secondaryArchSuffix
@@ -97,7 +105,7 @@ BUILD_REQUIRES="
 	devel:libluajit_5.1$secondaryArchSuffix
 	devel:libmarkdown$secondaryArchSuffix
 	devel:libpoppler$secondaryArchSuffix >= 144
-	devel:libpoppler_Qt6$secondaryArchSuffix >= 3.9
+	devel:libpoppler_Qt6$secondaryArchSuffix >= 3.9.0
 	devel:libqalculate$secondaryArchSuffix
 #	devel:libRmath$secondaryArchSuffix
 	devel:libspectre$secondaryArchSuffix
@@ -131,10 +139,12 @@ BUILD_REQUIRES="
 BUILD_PREREQUIRES="
 	cmd:cmake
 	cmd:g++$secondaryArchSuffix
-	cmd:make
+	cmd:ninja
 	cmd:msgfmt$secondaryArchSuffix
 	cmd:msgmerge$secondaryArchSuffix
 	cmd:pkg_config$secondaryArchSuffix
+	cmd:python3.10
+#	cmd:r
 	"
 
 TEST_REQUIRES="
@@ -143,20 +153,22 @@ TEST_REQUIRES="
 
 BUILD()
 {
-	cmake -B build -S . -DCMAKE_BUILD_TYPE=Release \
+	cmake -B build -S . -G Ninja -DCMAKE_BUILD_TYPE=Release \
 		$cmakeDirArgs \
 		-DKDE_INSTALL_PLUGINDIR=$addOnsDir/Qt6 \
 		-DECM_DIR=/system/data/cmake/Modules/ECM/cmake \
 		-DENABLE_EMBEDDED_DOCUMENTATION=OFF \
+		-DBUILD_DOC=OFF \
+		-DCMAKE_SKIP_RPATH=YES \
 		-DBUILD_TESTING=OFF \
 		-Wno-dev
 
-	make -C build $jobArgs
+	ninja -v -C build $jobArgs
 }
 
 INSTALL()
 {
-	make -C build install
+	ninja -C build install
 
 	# don't mess with shared_mime_info files
 	rm -rf $dataDir/mime/{aliases,generic-icons,globs,globs2,icons,magic}
diff --git a/kde-apps/cantor/patches/cantor-24.12.3.patchset b/kde-apps/cantor/patches/cantor-25.04.0.patchset
similarity index 53%
rename from kde-apps/cantor/patches/cantor-24.12.3.patchset
rename to kde-apps/cantor/patches/cantor-25.04.0.patchset
index 363e5ef4c..593ca3639 100644
--- a/kde-apps/cantor/patches/cantor-24.12.3.patchset
+++ b/kde-apps/cantor/patches/cantor-25.04.0.patchset
@@ -1,4 +1,4 @@
-From 006a307fe6b338c1d6873d6a5eae6ea8944546c9 Mon Sep 17 00:00:00 2001
+From df9e098c1ad0ff39736d8f3c5a3013e4306e17fc Mon Sep 17 00:00:00 2001
 From: Schrijvers Luc <begasus@gmail.com>
 Date: Sun, 31 Mar 2024 16:02:09 +0200
 Subject: Disable POSITION_INDEPENDENT_CODE
@@ -29,46 +29,3 @@ index bf676e7..b4be872 100644
 -- 
 2.48.1
 
-
-From 9d35fa49abcf8376abc89904e463938618d4b567 Mon Sep 17 00:00:00 2001
-From: Begasus <begasus@gmail.com>
-Date: Mon, 3 Mar 2025 07:34:27 +0100
-Subject: Fixes for DocTools
-
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 6d3fdad..9246a2e 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -44,7 +44,6 @@ find_package(KF6 ${KF_MIN_VERSION} REQUIRED
-     Config
-     Crash
-     Completion
--    DocTools
-     NewStuffCore
-     NewStuff
-     IconThemes
-@@ -57,6 +56,8 @@ find_package(KF6 ${KF_MIN_VERSION} REQUIRED
-     KIO
-     XmlGui
-     I18n
-+    OPTIONAL_COMPONENTS
-+        DocTools
- )
- 
- find_package(LibXml2 REQUIRED)
-@@ -139,9 +140,9 @@ set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -DQT_NO_DEBUG_OUTPUT")
- kde_enable_exceptions()
- 
- # FIXME Looks like docbook on Windows isn't buildable at all, so it is temporarily disabled
--if(NOT WIN32)
-+if(KF6DocTools_FOUND)
-     add_subdirectory(doc)
--endif(NOT WIN32)
-+endif()
- add_subdirectory(src)
- add_subdirectory(icons)
- 
--- 
-2.48.1
-