diff --git a/kde-frameworks/prison/prison-5.115.0.recipe b/kde-frameworks/prison/prison-5.115.0.recipe index 97f49656d..321f1cd6c 100644 --- a/kde-frameworks/prison/prison-5.115.0.recipe +++ b/kde-frameworks/prison/prison-5.115.0.recipe @@ -5,7 +5,7 @@ two types of barcodes: QRCode and DataMatrix." HOMEPAGE="https://invent.kde.org/frameworks/prison/" COPYRIGHT="2010-2024 KDE Foundations" LICENSE="GNU LGPL v3" -REVISION="1" +REVISION="2" SOURCE_URI="https://download.kde.org/stable/frameworks/${portVersion%.*}/prison-$portVersion.tar.xz" CHECKSUM_SHA256="8964fc90ba2b3643d62cee9d01c46f4824670ed8c1bcd12ac3b129cebe4273de" @@ -22,7 +22,8 @@ libVersionCompat="$libVersion compat >= ${libVersion%%.*}" PROVIDES=" prison$secondaryArchSuffix = $portVersion - lib:libkf5prison$secondaryArchSuffix = $libVersionCompat + lib:libKF5Prison$secondaryArchSuffix = $libVersionCompat + lib:libKF5PrisonScanner$secondaryArchSuffix = $libVersionCompat " REQUIRES=" haiku$secondaryArchSuffix @@ -30,11 +31,13 @@ REQUIRES=" lib:libqrencode$secondaryArchSuffix lib:libQt5Core$secondaryArchSuffix lib:libQt5Gui$secondaryArchSuffix + lib:libZXing$secondaryArchSuffix " PROVIDES_devel=" prison${secondaryArchSuffix}_devel = $portVersion - devel:libkf5prison$secondaryArchSuffix = $libVersion + devel:libKF5Prison$secondaryArchSuffix = $libVersionCompat + devel:libKF5PrisonScanner$secondaryArchSuffix = $libVersionCompat " REQUIRES_devel=" prison$secondaryArchSuffix == $portVersion base @@ -42,11 +45,12 @@ REQUIRES_devel=" BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel - extra_cmake_modules$secondaryArchSuffix >= $portVersion + extra_cmake_modules$secondaryArchSuffix devel:libdmtx$secondaryArchSuffix devel:libqrencode$secondaryArchSuffix devel:libQt5Core$secondaryArchSuffix devel:libQt5Gui$secondaryArchSuffix + devel:libZXing$secondaryArchSuffix " BUILD_PREREQUIRES=" cmd:cmake @@ -54,31 +58,33 @@ BUILD_PREREQUIRES=" cmd:make " -PATCH() -{ - sed -e '/platforms:/ a \ \ \ \ - name: Haiku' -i $sourceDir/metainfo.yaml -} - BUILD() { - constantSystemDataDir="`finddir B_SYSTEM_DATA_DIRECTORY`" cmake -Bbuild -S. -DCMAKE_BUILD_TYPE=Release \ - -DECM_DIR="$constantSystemDataDir"/cmake/Modules/ECM/cmake \ + $cmakeDirArgs \ + -DKDE_INSTALL_QMLDIR=$dataDir/Qt5/qml \ + -DKDE_INSTALL_LOGGINGCATEGORIESDIR=$settingsDir/xdg \ -DECM_MKSPECS_INSTALL_DIR=$dataDir/Qt5/mkspecs \ - -DCMAKE_INSTALL_PREFIX:PATH=$prefix \ - -DCMAKE_INSTALL_LIBDIR:PATH=$libDir \ - -DCMAKE_INSTALL_INCLUDEDIR:PATH=$includeDir \ - -DKDE_INSTALL_LOGGINGCATEGORIESDIR=$settingsDir/xdg + -DECM_DIR=/system/data/cmake/Modules/ECM/cmake make -C build } INSTALL() { make -C build install - prepareInstalledDevelLib libKF5Prison + + prepareInstalledDevelLibs \ + libKF5Prison \ + libKF5PrisonScanner packageEntries devel \ $libDir/cmake \ - $dataDir \ + $dataDir/Qt5/mkspecs \ $developDir } + +TEST() +{ + export LIBRARY_PATH="$sourceDir/build/bin${LIBRARY_PATH:+:$LIBRARY_PATH}" + make -Cbuild test +}