From dc9a30370c1c1aa3f69c72d9b6e5118d4fec83f8 Mon Sep 17 00:00:00 2001
From: Schrijvers Luc <begasus@gmail.com>
Date: Thu, 25 Jul 2024 08:29:06 +0200
Subject: [PATCH] cantor, bump version (#10745)

---
 .../{cantor-24.02.2.recipe => cantor-24.05.2.recipe}   |  7 ++++---
 ...cantor-24.02.2.patchset => cantor-24.05.2.patchset} | 10 +++++-----
 2 files changed, 9 insertions(+), 8 deletions(-)
 rename kde-apps/cantor/{cantor-24.02.2.recipe => cantor-24.05.2.recipe} (97%)
 rename kde-apps/cantor/patches/{cantor-24.02.2.patchset => cantor-24.05.2.patchset} (91%)

diff --git a/kde-apps/cantor/cantor-24.02.2.recipe b/kde-apps/cantor/cantor-24.05.2.recipe
similarity index 97%
rename from kde-apps/cantor/cantor-24.02.2.recipe
rename to kde-apps/cantor/cantor-24.05.2.recipe
index 730ad7ff8..5c0ca0401 100644
--- a/kde-apps/cantor/cantor-24.02.2.recipe
+++ b/kde-apps/cantor/cantor-24.05.2.recipe
@@ -21,7 +21,7 @@ COPYRIGHT="2016 Filipe Saraiva
 LICENSE="GNU GPL v2"
 REVISION="1"
 SOURCE_URI="https://download.kde.org/stable/release-service/$portVersion/src/cantor-$portVersion.tar.xz"
-CHECKSUM_SHA256="1cd6344e19b57ec98c103506920de412a5541b61377c43dcb5162ae39c2b9bf5"
+CHECKSUM_SHA256="41fb9b47ab194d393e4ff33f3afba24267b409f30801c09934f05c52e7ba533f"
 SOURCE_DIR="cantor-$portVersion"
 PATCHES="cantor-$portVersion.patchset"
 ADDITIONAL_FILES="cantor.rdef.in"
@@ -44,12 +44,12 @@ PROVIDES="
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
+	lib:libAnalitza$secondaryArchSuffix
 	lib:libgfortran$secondaryArchSuffix
 	lib:libpoppler$secondaryArchSuffix
 	lib:libpoppler_qt5$secondaryArchSuffix
 	lib:libspectre$secondaryArchSuffix
 	# KF5
-	lib:libAnalitza$secondaryArchSuffix
 	lib:libKF5Archive$secondaryArchSuffix
 	lib:libKF5Attica$secondaryArchSuffix
 	lib:libKF5Auth$secondaryArchSuffix
@@ -99,6 +99,7 @@ REQUIRES_devel="
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	shared_mime_info$secondaryArchSuffix
+	devel:libAnalitza$secondaryArchSuffix >= 8.0.0
 	devel:libluajit_5.1$secondaryArchSuffix
 	devel:libmarkdown$secondaryArchSuffix
 	devel:libpoppler$secondaryArchSuffix
@@ -107,7 +108,6 @@ BUILD_REQUIRES="
 	devel:libspectre$secondaryArchSuffix
 	# KF5
 	extra_cmake_modules$secondaryArchSuffix
-	devel:libAnalitza$secondaryArchSuffix
 	devel:libKF5Auth$secondaryArchSuffix
 	devel:libKF5Archive$secondaryArchSuffix
 	devel:libKF5Attica$secondaryArchSuffix
@@ -169,6 +169,7 @@ INSTALL()
 {
 	make -C build install
 
+	# don't mess with shared_mime_info files
 	rm -rf $dataDir/mime/{aliases,generic-icons,globs,globs2,icons,magic}
 	rm -rf $dataDir/mime/{mime.cache,subclasses,treemagic,types,version,XMLnamespaces}
 
diff --git a/kde-apps/cantor/patches/cantor-24.02.2.patchset b/kde-apps/cantor/patches/cantor-24.05.2.patchset
similarity index 91%
rename from kde-apps/cantor/patches/cantor-24.02.2.patchset
rename to kde-apps/cantor/patches/cantor-24.05.2.patchset
index f1bc10cd1..973c5051c 100644
--- a/kde-apps/cantor/patches/cantor-24.02.2.patchset
+++ b/kde-apps/cantor/patches/cantor-24.05.2.patchset
@@ -1,11 +1,11 @@
-From 9052868384ff9bdef315bc9b290b9018e826320c Mon Sep 17 00:00:00 2001
+From 1cf94c724ef70d59756a3d8a4d4588f3aba4102a Mon Sep 17 00:00:00 2001
 From: Schrijvers Luc <begasus@gmail.com>
 Date: Sun, 31 Mar 2024 16:00:23 +0200
 Subject: Disable DocTools
 
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 3cd3ba8..a6bfc9d 100644
+index 90855da..dfafd0b 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -45,7 +45,7 @@ find_package(KF5 ${KF5_MIN_VERSION} REQUIRED
@@ -27,10 +27,10 @@ index 3cd3ba8..a6bfc9d 100644
  endif(NOT WIN32)
  add_subdirectory(src)
 -- 
-2.43.2
+2.45.2
 
 
-From 92fc9824e49f62b4493bd832e06b59c36cf1e414 Mon Sep 17 00:00:00 2001
+From a8ec7431372d87cbdd78027bc2cc6a64b28193bd 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
@@ -59,5 +59,5 @@ index 2868373..e1ccef5 100644
  add_dependencies(Discount::Lib discount_project-build)
  
 -- 
-2.43.2
+2.45.2