From 0fc15d3cb397d3a69fe2aad675c3a0dbf619a8d1 Mon Sep 17 00:00:00 2001 From: Schrijvers Luc Date: Wed, 19 Mar 2025 17:14:42 +0000 Subject: [PATCH] kcalc, bump to 24.12.3, switch to KF6 (#12021) --- kde-apps/kcalc/kcalc-23.08.5.recipe | 146 -------------------------- kde-apps/kcalc/kcalc-24.12.3.recipe | 153 ++++++++++++++++++++++++++++ 2 files changed, 153 insertions(+), 146 deletions(-) delete mode 100644 kde-apps/kcalc/kcalc-23.08.5.recipe create mode 100644 kde-apps/kcalc/kcalc-24.12.3.recipe diff --git a/kde-apps/kcalc/kcalc-23.08.5.recipe b/kde-apps/kcalc/kcalc-23.08.5.recipe deleted file mode 100644 index bea9ccd99..000000000 --- a/kde-apps/kcalc/kcalc-23.08.5.recipe +++ /dev/null @@ -1,146 +0,0 @@ -SUMMARY="A calculator which offers many more mathematical functions" -DESCRIPTION="KCalc has everything you would expect from a scientific calculator, plus: -* Trigonometric functions, logic operations and statistical calculations -* A results stack which enables convenient recall of previous calculation results -* Precision is user-definable -* The display allows cut and paste of numbers -* The display colors and font are configurable, aiding usability -* The use of key-bindings make it easy to use without a pointing device." -HOMEPAGE="https://apps.kde.org/en/kcalc" -COPYRIGHT="2010-2024 KDE Organisation" -LICENSE="GNU GPL v2" -REVISION="1" -SOURCE_URI="https://download.kde.org/stable/release-service/$portVersion/src/kcalc-$portVersion.tar.xz" -CHECKSUM_SHA256="e545d67389f25b480b4eff2c40617b4e97172717d297d86e5c07ff7a6317437e" -SOURCE_DIR="kcalc-$portVersion" -ADDITIONAL_FILES="kcalc.rdef.in" - -ARCHITECTURES="all !x86_gcc2" -SECONDARY_ARCHITECTURES="x86" - -PROVIDES=" - kcalc$secondaryArchSuffix = $portVersion - cmd:kcalc = $portVersion - app:KCalc$secondaryArchSuffix = $portVersion - lib:libkdeinit5_kcalc$secondaryArchSuffix = $portVersion - " -REQUIRES=" - haiku$secondaryArchSuffix - lib:libgmp$secondaryArchSuffix - lib:libkdeinit5_kded5$secondaryArchSuffix - lib:libkdeinit5_klauncher$secondaryArchSuffix - lib:libKF5Archive$secondaryArchSuffix - lib:libKF5Auth$secondaryArchSuffix - lib:libKF5Bookmarks$secondaryArchSuffix - lib:libKF5Codecs$secondaryArchSuffix - lib:libKF5Completion$secondaryArchSuffix - lib:libKF5ConfigCore$secondaryArchSuffix - lib:libKF5ConfigGui$secondaryArchSuffix - lib:libKF5ConfigWidgets$secondaryArchSuffix - lib:libKF5CoreAddons$secondaryArchSuffix - lib:libKF5Crash$secondaryArchSuffix - lib:libKF5DBusAddons$secondaryArchSuffix - lib:libKF5GuiAddons$secondaryArchSuffix - lib:libKF5I18n$secondaryArchSuffix - lib:libKF5IconThemes$secondaryArchSuffix - lib:libKF5ItemViews$secondaryArchSuffix - lib:libKF5Notifications$secondaryArchSuffix - lib:libKF5TextEditor$secondaryArchSuffix - lib:libKF5TextWidgets$secondaryArchSuffix - lib:libKF5WidgetsAddons$secondaryArchSuffix - lib:libKF5WindowSystem$secondaryArchSuffix - lib:libKF5XmlGui$secondaryArchSuffix - lib:libmpfr$secondaryArchSuffix - lib:libQt5Core$secondaryArchSuffix - lib:libQt5DBus$secondaryArchSuffix - lib:libQt5Gui$secondaryArchSuffix - lib:libQt5Widgets$secondaryArchSuffix - lib:libQt5Xml$secondaryArchSuffix - " - -BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel - extra_cmake_modules$secondaryArchSuffix >= 5.93 - devel:libgmp$secondaryArchSuffix - devel:libkdeinit5_klauncher$secondaryArchSuffix - devel:libKF5Archive$secondaryArchSuffix - devel:libKF5Auth$secondaryArchSuffix - devel:libKF5Bookmarks$secondaryArchSuffix - devel:libKF5Codecs$secondaryArchSuffix - devel:libKF5Completion$secondaryArchSuffix - devel:libKF5ConfigCore$secondaryArchSuffix - devel:libKF5ConfigWidgets$secondaryArchSuffix - devel:libKF5CoreAddons$secondaryArchSuffix - devel:libKF5Crash$secondaryArchSuffix - devel:libKF5DBusAddons$secondaryArchSuffix - devel:libKF5DocTools$secondaryArchSuffix - devel:libKF5GuiAddons$secondaryArchSuffix - devel:libKF5I18n$secondaryArchSuffix - devel:libKF5IconThemes$secondaryArchSuffix - devel:libKF5ItemModels$secondaryArchSuffix - devel:libKF5ItemViews$secondaryArchSuffix - devel:libKF5Notifications$secondaryArchSuffix - devel:libKF5TextEditor$secondaryArchSuffix - devel:libKF5TextWidgets$secondaryArchSuffix - devel:libKF5WidgetsAddons$secondaryArchSuffix - devel:libKF5WindowSystem$secondaryArchSuffix - devel:libKF5XmlGui$secondaryArchSuffix - devel:libmpfr$secondaryArchSuffix - devel:libQt5Core$secondaryArchSuffix - " -BUILD_PREREQUIRES=" - cmd:cmake - cmd:g++$secondaryArchSuffix - cmd:lrelease$secondaryArchSuffix >= 5 - cmd:make - cmd:pkg_config$secondaryArchSuffix - " - -BUILD() -{ - # disable docs generation - sed -e '/add_subdirectory(doc)/ s/^#*/#/' -i CMakeLists.txt - sed -e '/kdoctools_install(po)/ s/^#*/#/' -i CMakeLists.txt - - mkdir -p build - cd build - - cmake .. \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=$appsDir \ - -DCMAKE_INSTALL_LIBDIR=$libDir \ - -DCMAKE_INSTALL_DATADIR=$dataDir \ - -DCMAKE_INSTALL_DATAROOTDIR=$dataDir \ - -DSHARE_INSTALL_PREFIX=$dataDir \ - -DECM_DIR=/system/data/cmake/Modules/ECM/cmake - - make $jobArgs -} - -INSTALL() -{ - cd build - make install - - mv $appsDir/bin/kcalc $appsDir/KCalc - rm -rf $appsDir/bin - - mkdir -p $prefix/bin - ln -s $appsDir/KCalc $prefix/bin/kcalc - - local APP_SIGNATURE="application/x-vnd.kde-kcalc" - local MAJOR="`echo "$portVersion" | cut -d. -f1`" - local MIDDLE="`echo "$portVersion" | cut -d. -f2`" - local MINOR="`echo "$portVersion" | cut -d. -f3`" - local LONG_INFO="$SUMMARY" - sed \ - -e "s|@APP_SIGNATURE@|$APP_SIGNATURE|" \ - -e "s|@MAJOR@|$MAJOR|" \ - -e "s|@MIDDLE@|$MIDDLE|" \ - -e "s|@MINOR@|$MINOR|" \ - -e "s|@LONG_INFO@|$LONG_INFO|" \ - $portDir/additional-files/kcalc.rdef.in > kcalc.rdef - - addResourcesToBinaries kcalc.rdef $appsDir/KCalc - addAppDeskbarSymlink $appsDir/KCalc -} diff --git a/kde-apps/kcalc/kcalc-24.12.3.recipe b/kde-apps/kcalc/kcalc-24.12.3.recipe new file mode 100644 index 000000000..aaa274a66 --- /dev/null +++ b/kde-apps/kcalc/kcalc-24.12.3.recipe @@ -0,0 +1,153 @@ +SUMMARY="A calculator which offers many more mathematical functions" +DESCRIPTION="KCalc has everything you would expect from a scientific calculator, plus: +* Trigonometric functions, logic operations and statistical calculations +* A results stack which enables convenient recall of previous calculation results +* Precision is user-definable +* The display allows cut and paste of numbers +* The display colors and font are configurable, aiding usability +* The use of key-bindings make it easy to use without a pointing device." +HOMEPAGE="https://apps.kde.org/en/kcalc" +COPYRIGHT="2010-2025 KDE Organisation" +LICENSE="GNU GPL v2" +REVISION="1" +SOURCE_URI="https://download.kde.org/stable/release-service/$portVersion/src/kcalc-$portVersion.tar.xz" +CHECKSUM_SHA256="bba3ba665177ee9bab2a55fb32e04ae6041f5eaf305dd6901649b9b8ef359751" +SOURCE_DIR="kcalc-$portVersion" +ADDITIONAL_FILES="kcalc.rdef.in" + +ARCHITECTURES="all !x86_gcc2" +SECONDARY_ARCHITECTURES="x86" + +commandSuffix=$secondaryArchSuffix +commandBinDir=$binDir +if [ "$targetArchitecture" = x86_gcc2 ]; then + commandSuffix= + commandBinDir=$prefix/bin +fi + +PROVIDES=" + kcalc$secondaryArchSuffix = $portVersion + cmd:kcalc$commandSuffix = $portVersion + " +REQUIRES=" + haiku$secondaryArchSuffix + lib:libGL$secondaryArchSuffix + lib:libgmp$secondaryArchSuffix + lib:libmpfr$secondaryArchSuffix + # KF6 + lib:libKF6Archive$secondaryArchSuffix + lib:libKF6AuthCore$secondaryArchSuffix + lib:libKF6Bookmarks$secondaryArchSuffix + lib:libKF6Codecs$secondaryArchSuffix + lib:libKF6ColorScheme$secondaryArchSuffix + lib:libKF6Completion$secondaryArchSuffix + lib:libKF6ConfigCore$secondaryArchSuffix + lib:libKF6ConfigGui$secondaryArchSuffix + lib:libKF6ConfigWidgets$secondaryArchSuffix + lib:libKF6CoreAddons$secondaryArchSuffix + lib:libKF6Crash$secondaryArchSuffix + lib:libKF6DBusAddons$secondaryArchSuffix + lib:libKF6GuiAddons$secondaryArchSuffix + lib:libKF6I18n$secondaryArchSuffix + lib:libKF6IconThemes$secondaryArchSuffix + lib:libKF6ItemViews$secondaryArchSuffix + lib:libKF6Notifications$secondaryArchSuffix + lib:libKF6TextEditor$secondaryArchSuffix + lib:libKF6TextWidgets$secondaryArchSuffix + lib:libKF6WidgetsAddons$secondaryArchSuffix + lib:libKF6WindowSystem$secondaryArchSuffix + lib:libKF6XmlGui$secondaryArchSuffix + # Qt6 + lib:libQt6Core$secondaryArchSuffix + lib:libQt6Core5Compat$secondaryArchSuffix + lib:libQt6DBus$secondaryArchSuffix + lib:libQt6Gui$secondaryArchSuffix + lib:libQt6Qml$secondaryArchSuffix + lib:libQt6Widgets$secondaryArchSuffix + lib:libQt6Xml$secondaryArchSuffix + " + +BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel + devel:libgmp$secondaryArchSuffix + devel:libmpfr$secondaryArchSuffix + # KF6 + extra_cmake_modules$secondaryArchSuffix + devel:libKF6Archive$secondaryArchSuffix + devel:libKF6AuthCore$secondaryArchSuffix + devel:libKF6Bookmarks$secondaryArchSuffix + devel:libKF6Codecs$secondaryArchSuffix + devel:libKF6ColorScheme$secondaryArchSuffix + devel:libKF6Completion$secondaryArchSuffix + devel:libKF6ConfigCore$secondaryArchSuffix + devel:libKF6ConfigWidgets$secondaryArchSuffix + devel:libKF6CoreAddons$secondaryArchSuffix + devel:libKF6Crash$secondaryArchSuffix + devel:libKF6DBusAddons$secondaryArchSuffix + devel:libKF6DocTools$secondaryArchSuffix + devel:libKF6GuiAddons$secondaryArchSuffix + devel:libKF6I18n$secondaryArchSuffix + devel:libKF6IconThemes$secondaryArchSuffix + devel:libKF6ItemModels$secondaryArchSuffix + devel:libKF6ItemViews$secondaryArchSuffix + devel:libKF6Notifications$secondaryArchSuffix + devel:libKF6TextEditor$secondaryArchSuffix + devel:libKF6TextWidgets$secondaryArchSuffix + devel:libKF6WidgetsAddons$secondaryArchSuffix + devel:libKF6WindowSystem$secondaryArchSuffix + devel:libKF6XmlGui$secondaryArchSuffix + # Qt6 + devel:libQt6Core$secondaryArchSuffix + devel:libQt6Core5Compat$secondaryArchSuffix + devel:libQt6Qml$secondaryArchSuffix + " +BUILD_PREREQUIRES=" + cmd:cmake + cmd:g++$secondaryArchSuffix + cmd:make + cmd:msgfmt$secondaryArchSuffix + cmd:msgmerge$secondaryArchSuffix + cmd:pkg_config$secondaryArchSuffix + " + +PATCH() +{ + # disable docs generation + sed -e '/add_subdirectory(doc)/ s/^#*/#/' -i CMakeLists.txt + sed -e '/kdoctools_install(po)/ s/^#*/#/' -i CMakeLists.txt +} + +BUILD() +{ + cmake -B build -S . -DCMAKE_BUILD_TYPE=Release \ + $cmakeDirArgs \ + -DCMAKE_INSTALL_BINDIR=$commandBinDir \ + -DECM_DIR=/system/data/cmake/Modules/ECM/cmake \ + -Wno-dev + + make -C build $jobArgs +} + +INSTALL() +{ + make -Cbuild install + + # cleanup + rm -rf $dataDir/{applications,metainfo} + + local APP_SIGNATURE="application/x-vnd.kde-kcalc" + local MAJOR="`echo "$portVersion" | cut -d. -f1`" + local MIDDLE="`echo "$portVersion" | cut -d. -f2`" + local MINOR="`echo "$portVersion" | cut -d. -f3`" + local LONG_INFO="$SUMMARY" + sed \ + -e "s|@APP_SIGNATURE@|$APP_SIGNATURE|" \ + -e "s|@MAJOR@|$MAJOR|" \ + -e "s|@MIDDLE@|$MIDDLE|" \ + -e "s|@MINOR@|$MINOR|" \ + -e "s|@LONG_INFO@|$LONG_INFO|" \ + $portDir/additional-files/kcalc.rdef.in > kcalc.rdef + + addResourcesToBinaries kcalc.rdef $binDir/kcalc + addAppDeskbarSymlink $binDir/kcalc KCalc +}