diff --git a/kde-apps/kcontacts/kcontacts-5.93.0.recipe b/kde-frameworks/kcontacts/kcontacts-5.115.0.recipe similarity index 52% rename from kde-apps/kcontacts/kcontacts-5.93.0.recipe rename to kde-frameworks/kcontacts/kcontacts-5.115.0.recipe index db823925d..d3fc7f09f 100644 --- a/kde-apps/kcontacts/kcontacts-5.93.0.recipe +++ b/kde-frameworks/kcontacts/kcontacts-5.115.0.recipe @@ -1,19 +1,22 @@ SUMMARY="Address book API based on KDE Frameworks" DESCRIPTION="KContact library provides vcard support." -HOMEPAGE="https://github.com/KDE/kcontacts/" +HOMEPAGE="https://invent.kde.org/frameworks/kcontacts" COPYRIGHT="2010-2022 KDE Organisation" LICENSE="GNU LGPL v2.1" -REVISION="2" -SOURCE_URI="https://github.com/KDE/kcontacts/archive/v$portVersion.tar.gz" -CHECKSUM_SHA256="8de1fdf871f29f6a29111e48a335ace9fc95c1c4469e71f26c8c51b33559091b" -SOURCE_DIR="kcontacts-$portVersion" +REVISION="1" +SOURCE_URI="$HOMEPAGE/-/archive/v$portVersion/kcontacts-v$portVersion.tar.bz2" +CHECKSUM_SHA256="721fd0a78a902fff582340f3062a1266b07ba9bfe72006d1031235b20ae38c3a" +SOURCE_DIR="kcontacts-v$portVersion" ARCHITECTURES="all !x86_gcc2" SECONDARY_ARCHITECTURES="x86" +libVersion="$portVersion" +libVersionCompat="$libVersion compat >= ${libVersion%%.*}" + PROVIDES=" kcontacts$secondaryArchSuffix = $portVersion - lib:libKF5Contacts$secondaryArchSuffix = $portVersion compat >= 5 + lib:libKF5Contacts$secondaryArchSuffix = $libVersionCompat " REQUIRES=" haiku$secondaryArchSuffix @@ -28,7 +31,7 @@ REQUIRES=" PROVIDES_devel=" kcontacts${secondaryArchSuffix}_devel = $portVersion - devel:libKF5Contacts$secondaryArchSuffix = $portVersion compat >= 5 + devel:libKF5Contacts$secondaryArchSuffix = $libVersionCompat " REQUIRES_devel=" kcontacts$secondaryArchSuffix == $portVersion base @@ -37,50 +40,50 @@ REQUIRES_devel=" BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel extra_cmake_modules$secondaryArchSuffix >= 5.93 - devel:libKF5Codecs$secondaryArchSuffix - devel:libKF5ConfigCore$secondaryArchSuffix - devel:libKF5ConfigWidgets$secondaryArchSuffix - devel:libKF5CoreAddons$secondaryArchSuffix - devel:libKF5I18n$secondaryArchSuffix + devel:libKF5Codecs$secondaryArchSuffix == $portVersion + devel:libKF5ConfigCore$secondaryArchSuffix == $portVersion + devel:libKF5ConfigWidgets$secondaryArchSuffix == $portVersion + devel:libKF5CoreAddons$secondaryArchSuffix == $portVersion + devel:libKF5I18n$secondaryArchSuffix == $portVersion devel:libQt5Core$secondaryArchSuffix " BUILD_PREREQUIRES=" cmd:cmake cmd:g++$secondaryArchSuffix cmd:make - cmd:python2 + cmd:python3 cmd:qdbuscpp2xml$secondaryArchSuffix >= 5 " +TEST_REQUIRES=" + qthaikuplugins + " + BUILD() { - mkdir -p build - cd build - - cmake .. $cmakeDirArgs \ + cmake -Bbuild -S. $cmakeDirArgs \ -DCMAKE_BUILD_TYPE=Release \ -DECM_MKSPECS_INSTALL_DIR=$dataDir/Qt5/mkspecs \ -DECM_DIR=/system/data/cmake/Modules/ECM/cmake - - make $jobArgs + make -Cbuild $jobArgs } INSTALL() { - cd build - make install + make -Cbuild install - prepareInstalledDevelLibs \ + prepareInstalledDevelLib \ libKF5Contacts packageEntries devel \ - $dataDir \ - $libDir/cmake \ - $developDir + $developDir \ + $dataDir/Qt5 \ + $libDir/cmake } TEST() { - cd build - make test + # 94% tests passed, 2 tests failed out of 32 + export LIBRARY_PATH="$sourceDir/build/bin${LIBRARY_PATH:+:$LIBRARY_PATH}" + make -Cbuild test }