diff --git a/kde-apps/kbruch/kbruch-23.08.5.recipe b/kde-apps/kbruch/kbruch-24.12.3.recipe similarity index 52% rename from kde-apps/kbruch/kbruch-23.08.5.recipe rename to kde-apps/kbruch/kbruch-24.12.3.recipe index 92eaf3277..4576224c1 100644 --- a/kde-apps/kbruch/kbruch-23.08.5.recipe +++ b/kde-apps/kbruch/kbruch-24.12.3.recipe @@ -14,83 +14,94 @@ factors. * Percentage exercise - in this exercise you have to calculate percentages." HOMEPAGE="https://invent.kde.org/education/kbruch" COPYRIGHT="2002-2011 Sebastian Stein - 2010-2024 KDE Organisation" + 2010-2025 KDE Organisation" LICENSE="GNU GPL v2" REVISION="1" SOURCE_URI="https://download.kde.org/stable/release-service/$portVersion/src/kbruch-$portVersion.tar.xz" -CHECKSUM_SHA256="db7d47e7823bc9ff5824a86e690638bdc8ae7507ff32ad772a80c63b87e01182" +CHECKSUM_SHA256="184c95c452c5e6146a54c8c91865560387222ac219b30dc0e103ddc70572953c" +SOURCE_DIR="kbruch-$portVersion" ADDITIONAL_FILES="kbruch.rdef.in" ARCHITECTURES="all !x86_gcc2" SECONDARY_ARCHITECTURES="x86" -libVersion="5.24.5" -libVersionCompat="$libVersion compat >= ${libVersion%%.*}" - PROVIDES=" kbruch$secondaryArchSuffix = $portVersion - cmd:kbruch$secondaryArchSuffix = $portVersion + app:KBruch$secondaryArchSuffix = $portVersion " REQUIRES=" haiku$secondaryArchSuffix - lib:libKF5Auth$secondaryArchSuffix - lib:libKF5AuthCore$secondaryArchSuffix - lib:libKF5Codecs$secondaryArchSuffix - lib:libKF5ConfigCore$secondaryArchSuffix - lib:libKF5ConfigWidgets$secondaryArchSuffix - lib:libKF5CoreAddons$secondaryArchSuffix - lib:libKF5Crash$secondaryArchSuffix - lib:libKF5I18n$secondaryArchSuffix - lib:libKF5WidgetsAddons$secondaryArchSuffix - lib:libKF5XmlGui$secondaryArchSuffix - lib:libQt5Core$secondaryArchSuffix + lib:libGL$secondaryArchSuffix + # KF6 + lib:libKF6AuthCore$secondaryArchSuffix + lib:libKF6AuthCore$secondaryArchSuffix + lib:libKF6Codecs$secondaryArchSuffix + lib:libKF6ColorScheme$secondaryArchSuffix + lib:libKF6ConfigCore$secondaryArchSuffix + lib:libKF6ConfigWidgets$secondaryArchSuffix + lib:libKF6CoreAddons$secondaryArchSuffix + lib:libKF6Crash$secondaryArchSuffix + lib:libKF6GuiAddons$secondaryArchSuffix + lib:libKF6I18n$secondaryArchSuffix + lib:libKF6WidgetsAddons$secondaryArchSuffix + lib:libKF6XmlGui$secondaryArchSuffix + # Qt6 + lib:libQt6Core$secondaryArchSuffix " BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel - extra_cmake_modules$secondaryArchSuffix >= 5.115 - devel:libKF5Auth$secondaryArchSuffix - devel:libKF5Codecs$secondaryArchSuffix - devel:libKF5ConfigCore$secondaryArchSuffix - devel:libKF5ConfigWidgets$secondaryArchSuffix - devel:libKF5CoreAddons$secondaryArchSuffix - devel:libKF5Crash$secondaryArchSuffix - devel:libKF5I18n$secondaryArchSuffix - devel:libKF5WidgetsAddons$secondaryArchSuffix - devel:libKF5XmlGui$secondaryArchSuffix - devel:libQt5Core$secondaryArchSuffix + extra_cmake_modules$secondaryArchSuffix + # KF6 + devel:libKF6AuthCore$secondaryArchSuffix + devel:libKF6Codecs$secondaryArchSuffix + devel:libKF6ColorScheme$secondaryArchSuffix + devel:libKF6ConfigCore$secondaryArchSuffix + devel:libKF6ConfigWidgets$secondaryArchSuffix + devel:libKF6CoreAddons$secondaryArchSuffix + devel:libKF6Crash$secondaryArchSuffix + devel:libKF6GuiAddons$secondaryArchSuffix + devel:libKF6I18n$secondaryArchSuffix + devel:libKF6WidgetsAddons$secondaryArchSuffix + devel:libKF6XmlGui$secondaryArchSuffix + # Qt6 + devel:libQt6Core$secondaryArchSuffix + devel:libQt6Qml$secondaryArchSuffix " BUILD_PREREQUIRES=" cmd:cmake cmd:g++$secondaryArchSuffix cmd:make - cmd:msgfmt - cmd:msgmerge + cmd:msgfmt$secondaryArchSuffix + cmd:msgmerge$secondaryArchSuffix cmd:pkg_config$secondaryArchSuffix - cmd:qdbuscpp2xml$secondaryArchSuffix >= 5 " BUILD() { - cmake -Bbuild -S. $cmakeDirArgs \ - -DCMAKE_BUILD_TYPE=Release \ - -DKDE_INSTALL_PLUGINDIR=$addOnsDir/Qt5 \ - -DKDE_INSTALL_QMLDIR=$dataDir/Qt5/qml \ - -DECM_MKSPECS_INSTALL_DIR=$dataDir/Qt5/mkspecs \ + cmake -Bbuild -S. -DCMAKE_BUILD_TYPE=Release \ + $cmakeDirArgs \ + -DCMAKE_INSTALL_BINDIR=$appsDir \ -DECM_DIR=/system/data/cmake/Modules/ECM/cmake - make -C build $jobArgs + + make -Cbuild $jobArgs } INSTALL() { - make -C build install + make -Cbuild install + + # cleanup + rm -rf $dataDir/{applications,icons,metainfo} + + mv $appsDir/kbruch $appsDir/KBruch local MAJOR="`echo "$portVersion" | cut -d. -f1`" local MIDDLE="`echo "$portVersion" | cut -d. -f2`" local MINOR="`echo "$portVersion" | cut -d. -f3`" local APP_NAME="KBruch" local LONG_INFO="$SUMMARY" - local APP_SIGNATURE="application/x-vnd.kbruch" + local APP_SIGNATURE="application/x-vnd.kde-kbruch" sed \ -e "s|@MAJOR@|$MAJOR|" \ -e "s|@MIDDLE@|$MIDDLE|" \ @@ -100,7 +111,6 @@ INSTALL() -e "s|@APP_SIGNATURE@|$APP_SIGNATURE|" \ $portDir/additional-files/kbruch.rdef.in > kbruch.rdef - addResourcesToBinaries kbruch.rdef $binDir/kbruch - - addAppDeskbarSymlink $binDir/kbruch KBruch + addResourcesToBinaries kbruch.rdef $appsDir/KBruch + addAppDeskbarSymlink $appsDir/KBruch }