diff --git a/net-libs/libquotient/libquotient0.8_qt6-0.8.2.recipe b/net-libs/libquotient/libquotient0.8_qt6-0.8.2.recipe deleted file mode 100644 index 9bb757076..000000000 --- a/net-libs/libquotient/libquotient0.8_qt6-0.8.2.recipe +++ /dev/null @@ -1,96 +0,0 @@ -SUMMARY="A Qt6 library to write cross-platform clients for Matrix" -DESCRIPTION="The Quotient project aims to produce a Qt6-based SDK to develop \ -applications for Matrix. -libQuotient is a library that enables client applications. -It is the backbone of Quaternion, NeoChat and other projects. -Versions 0.5.x and older use the previous name - libQMatrixClient." -HOMEPAGE="https://github.com/quotient-im/libQuotient" -COPYRIGHT="Quotient contributors" -LICENSE="GNU LGPL v2.1" -REVISION="2" -SOURCE_URI="https://github.com/quotient-im/libQuotient/archive/refs/tags/$portVersion.tar.gz" -CHECKSUM_SHA256="12ff2fa8b80a934b9dd88fa3416a4b88e94bc0e18a8df0dcebfc90614dd2f5c9" -SOURCE_DIR="libQuotient-$portVersion" - -ARCHITECTURES="all !x86_gcc2" -SECONDARY_ARCHITECTURES="x86" - -libVersion="$portVersion" -libVersionCompat="$libVersion compat >= ${libVersion%.*}" - -PROVIDES=" - libquotient0.8_qt6$secondaryArchSuffix = $portVersion - lib:libQuotientQt6$secondaryArchSuffix = $libVersionCompat - " -REQUIRES=" - haiku$secondaryArchSuffix - lib:libcrypto$secondaryArchSuffix - lib:libGL$secondaryArchSuffix - lib:libolm$secondaryArchSuffix - lib:libQt6Core$secondaryArchSuffix - lib:libQt6Gui$secondaryArchSuffix - lib:libQt6Keychain$secondaryArchSuffix - lib:libQt6Multimedia$secondaryArchSuffix - lib:libQt6Network$secondaryArchSuffix - " -REPLACES=" - libquotient_qt6$secondaryArchSuffix - " - -PROVIDES_devel=" - libquotient0.8_qt6${secondaryArchSuffix}_devel = $portVersion - devel:libQuotientQt6$secondaryArchSuffix = $libVersionCompat - " -REQUIRES_devel=" - libquotient0.8_qt6$secondaryArchSuffix == $portVersion base - devel:libQt6Keychain$secondaryArchSuffix - " -CONFLICTS_devel=" - libquotient0.9_qt6${secondaryArchSuffix}_devel - " - -BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel - devel:libolm$secondaryArchSuffix - devel:libQt6Core$secondaryArchSuffix - devel:libQt6Keychain$secondaryArchSuffix - devel:libssl$secondaryArchSuffix >= 3 - " -BUILD_PREREQUIRES=" - cmd:cmake - cmd:gcc$secondaryArchSuffix - cmd:make - " - -BUILD() -{ - cmake -Bbuild -S. $cmakeDirArgs \ - -DCMAKE_BUILD_TYPE=Release \ - -DBUILD_WITH_QT6=ON \ - -DBUILD_TESTING=OFF \ - -DQuotient_ENABLE_E2EE=ON \ - -DBUILD_SHARED_LIBS=ON - make -Cbuild $jobArgs -} - -INSTALL() -{ - make -Cbuild install - - # get rid of dataDir with Android.mk - rm -rf $dataDir - - prepareInstalledDevelLib \ - libQuotientQt6 - fixPkgconfig - - packageEntries devel \ - $developDir \ - $libDir/cmake -} - -TEST() -{ -# 88% tests passed, 1 tests failed out of 8 - ctest --test-dir build --output-on-failure -} diff --git a/net-libs/libquotient/libquotient0.9_qt6-0.9.1.recipe b/net-libs/libquotient/libquotient_qt6-0.9.2.recipe similarity index 79% rename from net-libs/libquotient/libquotient0.9_qt6-0.9.1.recipe rename to net-libs/libquotient/libquotient_qt6-0.9.2.recipe index c1d3683e3..70e1ce57b 100644 --- a/net-libs/libquotient/libquotient0.9_qt6-0.9.1.recipe +++ b/net-libs/libquotient/libquotient_qt6-0.9.2.recipe @@ -9,7 +9,7 @@ COPYRIGHT="Quotient contributors" LICENSE="GNU LGPL v2.1" REVISION="1" SOURCE_URI="https://github.com/quotient-im/libQuotient/archive/refs/tags/$portVersion.tar.gz" -CHECKSUM_SHA256="0a1fd19c9f6e4d93c60fbec5ab4ca84961781e6d00105a4437ecd14aaea36bc9" +CHECKSUM_SHA256="5dc75f1e4e23c8aac445a0e31d354adf97af456e29d27c032d4d467d4664ca06" SOURCE_DIR="libQuotient-$portVersion" ARCHITECTURES="all !x86_gcc2" @@ -19,7 +19,8 @@ libVersion="$portVersion" libVersionCompat="$libVersion compat >= ${libVersion%.*}" PROVIDES=" - libquotient0.9_qt6$secondaryArchSuffix = $portVersion + libquotient_qt6$secondaryArchSuffix = $portVersion + cmd:quotest lib:libQuotientQt6$secondaryArchSuffix = $libVersionCompat " REQUIRES=" @@ -33,13 +34,16 @@ REQUIRES=" lib:libQt6Multimedia$secondaryArchSuffix lib:libQt6Network$secondaryArchSuffix " +REPLACES=" + libquotient0.9_qt6$secondaryArchSuffix + " PROVIDES_devel=" - libquotient0.9_qt6${secondaryArchSuffix}_devel = $portVersion + libquotient_qt6${secondaryArchSuffix}_devel = $portVersion devel:libQuotientQt6$secondaryArchSuffix = $libVersionCompat " REQUIRES_devel=" - libquotient0.9_qt6$secondaryArchSuffix == $portVersion base + libquotient_qt6$secondaryArchSuffix == $portVersion base devel:libolm$secondaryArchSuffix devel:libQt6Keychain$secondaryArchSuffix " @@ -55,23 +59,22 @@ BUILD_PREREQUIRES=" cmd:cmake cmd:gcc$secondaryArchSuffix cmd:make + cmd:pkg_config$secondaryArchSuffix " -defineDebugInfoPackage libquotient0.9_qt6$secondaryArchSuffix \ - $libDir/libQuotientQt6.so.$libVersion - BUILD() { - cmake -Bbuild -S. $cmakeDirArgs \ - -DCMAKE_BUILD_TYPE=Release \ + cmake -B build -S . -DCMAKE_BUILD_TYPE=Release \ + $cmakeDirArgs \ -DBUILD_SHARED_LIBS=ON \ - -DBUILD_TESTING=OFF - make -Cbuild $jobArgs + -DBUILD_TESTING=ON + + make -C build $jobArgs } INSTALL() { - make -Cbuild install + make -C build install # get rid of dataDir with Android.mk rm -rf $dataDir