diff --git a/sci-calculators/qalculate/additional-files/qalculate_qt.rdef.in b/sci-calculators/qalculate/additional-files/qalculate_qt.rdef.in index 8786b50ad..e376bf57f 100644 --- a/sci-calculators/qalculate/additional-files/qalculate_qt.rdef.in +++ b/sci-calculators/qalculate/additional-files/qalculate_qt.rdef.in @@ -1,5 +1,5 @@ -resource app_flags B_MULTIPLE_LAUNCH | B_ARGV_ONLY; +resource app_flags B_SIGLE_LAUNCH; resource app_version { major = @MAJOR@, diff --git a/sci-calculators/qalculate/patches/qalculate_qt-4.8.0.patchset b/sci-calculators/qalculate/patches/qalculate_qt-4.8.0.patchset new file mode 100644 index 000000000..83d8428d6 --- /dev/null +++ b/sci-calculators/qalculate/patches/qalculate_qt-4.8.0.patchset @@ -0,0 +1,41 @@ +From 66d98a466055f22cff726b18367bfad4b880676a Mon Sep 17 00:00:00 2001 +From: Begasus +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.5.1.recipe b/sci-calculators/qalculate/qalculate_qt-4.8.0.recipe similarity index 86% rename from sci-calculators/qalculate/qalculate_qt-4.5.1.recipe rename to sci-calculators/qalculate/qalculate_qt-4.8.0.recipe index 867d3eb6a..e542080df 100644 --- a/sci-calculators/qalculate/qalculate_qt-4.5.1.recipe +++ b/sci-calculators/qalculate/qalculate_qt-4.8.0.recipe @@ -12,8 +12,9 @@ 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="fee346f061606b4263f703c58efb6e9d1a952be2a3cd240b254a0ce5a6e04cf3" +CHECKSUM_SHA256="291ed711b5513272dc0b7c4fd846b884738401da2432a2f3d1c83004af2b932a" SOURCE_DIR="qalculate-qt-$portVersion" +PATCHES="qalculate_qt-$portVersion.patchset" ADDITIONAL_FILES="qalculate_qt.rdef.in" ARCHITECTURES="all !x86_gcc2" @@ -21,7 +22,7 @@ SECONDARY_ARCHITECTURES="x86" PROVIDES=" qalculate_qt$secondaryArchSuffix = $portVersion - app:qalculate_qt = $portVersion + app:Qalculate = $portVersion " REQUIRES=" haiku$secondaryArchSuffix @@ -55,14 +56,21 @@ defineDebugInfoPackage qalculate_qt$secondaryArchSuffix \ BUILD() { - qmake . + qmake . PREFIX=$prefix \ + BINDIR=$appsDir \ + MAN_DIR=$manDir \ + TRANSLATIONS_DIR=$dataDir/Qt5/translations/qalculate-qt make $jobArgs } INSTALL() { - mkdir -p $appsDir - cp qalculate-qt $appsDir/Qalculate + make install + + mv $appsDir/qalculate-qt $appsDir/Qalculate + + # we are not linux + rm -rf $prefix/share local APP_SIGNATURE="application/x-vnd.qt5-qalculate_qt" local MAJOR="`echo "$portVersion" | cut -d. -f1`"