From c8c460aebe01762575280aac28bc35e83208c88e Mon Sep 17 00:00:00 2001
From: Schrijvers Luc <begasus@gmail.com>
Date: Mon, 1 Apr 2024 09:51:29 +0200
Subject: [PATCH] qalculate_qt, bump version, keep on par with libqalculate
 (#10282)

---
 .../patches/qalculate_qt-4.8.0.patchset       | 41 -------------------
 ...4.8.0.recipe => qalculate_qt-5.0.0.recipe} | 14 +++----
 2 files changed, 6 insertions(+), 49 deletions(-)
 delete mode 100644 sci-calculators/qalculate/patches/qalculate_qt-4.8.0.patchset
 rename sci-calculators/qalculate/{qalculate_qt-4.8.0.recipe => qalculate_qt-5.0.0.recipe} (88%)

diff --git a/sci-calculators/qalculate/patches/qalculate_qt-4.8.0.patchset b/sci-calculators/qalculate/patches/qalculate_qt-4.8.0.patchset
deleted file mode 100644
index 83d8428d6..000000000
--- a/sci-calculators/qalculate/patches/qalculate_qt-4.8.0.patchset
+++ /dev/null
@@ -1,41 +0,0 @@
-From 66d98a466055f22cff726b18367bfad4b880676a Mon Sep 17 00:00:00 2001
-From: Begasus <begasus@gmail.com>
-Date: Thu, 31 Aug 2023 15:07:57 +0200
-Subject: Add BINDIR target
-
-
-diff --git a/qalculate-qt.pro b/qalculate-qt.pro
-index 488329e..478950b 100644
---- a/qalculate-qt.pro
-+++ b/qalculate-qt.pro
-@@ -2,6 +2,9 @@ VERSION = 4.8.0
- isEmpty(PREFIX) {
- 	PREFIX = /usr/local
- }
-+isEmpty(BINDIR) {
-+	BINDIR = ${PREFIX}/bin
-+}
- isEmpty(DESKTOP_DIR) {
- 	DESKTOP_DIR = $$PREFIX/share/applications
- }
-@@ -79,7 +82,7 @@ qtPrepareTool(LRELEASE, lrelease) for(tsfile, TRANSLATIONS) {
- 
- unix:!equals(COMPILE_RESOURCES,"yes"):!android:!macx {
- 
--	target.path = $$PREFIX/bin
-+	target.path = $$BINDIR
- 
- 	qm.files = 	translations/qalculate-qt_ca.qm \
- 			translations/qalculate-qt_de.qm \
-@@ -119,7 +122,7 @@ unix:!equals(COMPILE_RESOURCES,"yes"):!android:!macx {
- 	RESOURCES = icons.qrc flags.qrc
- } else {
- 	RESOURCES = icons.qrc flags.qrc translations.qrc
--	target.path = $$PREFIX/bin
-+	target.path = $$BINDIR
- 	desktop.files = data/io.github.Qalculate.qalculate-qt.desktop
- 	desktop.path = $$DESKTOP_DIR
- 	appicon64.files = data/64/qalculate-qt.png
--- 
-2.37.3
-
diff --git a/sci-calculators/qalculate/qalculate_qt-4.8.0.recipe b/sci-calculators/qalculate/qalculate_qt-5.0.0.recipe
similarity index 88%
rename from sci-calculators/qalculate/qalculate_qt-4.8.0.recipe
rename to sci-calculators/qalculate/qalculate_qt-5.0.0.recipe
index e542080df..a1cd1c41f 100644
--- a/sci-calculators/qalculate/qalculate_qt-4.8.0.recipe
+++ b/sci-calculators/qalculate/qalculate_qt-5.0.0.recipe
@@ -12,9 +12,8 @@ COPYRIGHT="2003-2006, 2023 Hanna Knutsson"
 LICENSE="GNU GPL v2"
 REVISION="1"
 SOURCE_URI="https://github.com/Qalculate/qalculate-qt/releases/download/v$portVersion/qalculate-qt-$portVersion.tar.gz"
-CHECKSUM_SHA256="291ed711b5513272dc0b7c4fd846b884738401da2432a2f3d1c83004af2b932a"
+CHECKSUM_SHA256="4143033faba2851de992dc7da96a81362b11a447256b0df7cbc0fbfabbd34408"
 SOURCE_DIR="qalculate-qt-$portVersion"
-PATCHES="qalculate_qt-$portVersion.patchset"
 ADDITIONAL_FILES="qalculate_qt.rdef.in"
 
 ARCHITECTURES="all !x86_gcc2"
@@ -22,7 +21,7 @@ SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="
 	qalculate_qt$secondaryArchSuffix = $portVersion
-	app:Qalculate = $portVersion
+	cmd:qalculate = $portVersion
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
@@ -52,12 +51,11 @@ BUILD_PREREQUIRES="
 	"
 
 defineDebugInfoPackage qalculate_qt$secondaryArchSuffix \
-	$appsDir/Qalculate
+	$prefix/bin/qalculate
 
 BUILD()
 {
 	qmake . PREFIX=$prefix \
-		BINDIR=$appsDir \
 		MAN_DIR=$manDir \
 		TRANSLATIONS_DIR=$dataDir/Qt5/translations/qalculate-qt
 	make $jobArgs
@@ -67,7 +65,7 @@ INSTALL()
 {
 	make install
 
-	mv $appsDir/qalculate-qt $appsDir/Qalculate
+	mv $prefix/bin/qalculate-qt $prefix/bin/qalculate
 
 	# we are not linux
 	rm -rf $prefix/share
@@ -85,8 +83,8 @@ INSTALL()
 		-e "s|@LONG_INFO@|$LONG_INFO|" \
 		$portDir/additional-files/qalculate_qt.rdef.in > qalculate_qt.rdef
 
-	addResourcesToBinaries qalculate_qt.rdef $appsDir/Qalculate
-	addAppDeskbarSymlink $appsDir/Qalculate
+	addResourcesToBinaries qalculate_qt.rdef $prefix/bin/qalculate
+	addAppDeskbarSymlink $prefix/bin/qalculate Qalculate
 }
 
 TEST()