diff --git a/dev-db/futuresql/futuresql-0.1.1.recipe b/dev-db/futuresql/futuresql_qt5-0.1.1.recipe similarity index 75% rename from dev-db/futuresql/futuresql-0.1.1.recipe rename to dev-db/futuresql/futuresql_qt5-0.1.1.recipe index 15ddb3631..02933f12c 100644 --- a/dev-db/futuresql/futuresql-0.1.1.recipe +++ b/dev-db/futuresql/futuresql_qt5-0.1.1.recipe @@ -10,16 +10,16 @@ Warning: The API is not finalized yet." HOMEPAGE="https://invent.kde.org/libraries/futuresql" COPYRIGHT="2022 Jonah BrĂ¼chert" LICENSE="BSD (2-clause)" -REVISION="2" -SOURCE_URI="$HOMEPAGE/-/archive/703c70ec0323da1a6e988f13b3078c11e60a375a/futuresql-703c70ec0323da1a6e988f13b3078c11e60a375a.tar.bz2" -CHECKSUM_SHA256="e3c30a7a98c1522e19f51b32c44540cc49a7b303868876a85ced814d1b5bd486" -SOURCE_DIR="futuresql-703c70ec0323da1a6e988f13b3078c11e60a375a" +REVISION="3" +SOURCE_URI="https://download.kde.org/stable/futuresql/futuresql-$portVersion.tar.xz" +CHECKSUM_SHA256="e44ed8d5a9618b3ca7ba2983ed9c5f7572e6e0a5b199f94868834b71ccbebd43" +SOURCE_DIR="futuresql-$portVersion" ARCHITECTURES="all !x86_gcc2" SECONDARY_ARCHITECTURES="!x86" PROVIDES=" - futuresql$secondaryArchSuffix = $portVersion + futuresql_qt5$secondaryArchSuffix = $portVersion lib:libfuturesql5$secondaryArchSuffix = 0 " REQUIRES=" @@ -29,16 +29,16 @@ REQUIRES=" " PROVIDES_devel=" - futuresql${secondaryArchSuffix}_devel = $portVersion + futuresql_qt5${secondaryArchSuffix}_devel = $portVersion devel:libfuturesql5$secondaryArchSuffix = 0 " REQUIRES_devel=" - futuresql$secondaryArchSuffix == $portVersion base + futuresql_qt5$secondaryArchSuffix == $portVersion base " BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel - extra_cmake_modules$secondaryArchSuffix >= 5.93.0 + extra_cmake_modules$secondaryArchSuffix devel:libQCoro5Core$secondaryArchSuffix devel:libQt5Core$secondaryArchSuffix " @@ -77,5 +77,6 @@ INSTALL() TEST() { - make check + export LIBRARY_PATH="$sourceDir/build/bin${LIBRARY_PATH:+:$LIBRARY_PATH}" + make -C build test } diff --git a/dev-db/futuresql/futuresql_qt6-0.1.1.recipe b/dev-db/futuresql/futuresql_qt6-0.1.1.recipe new file mode 100644 index 000000000..4a8e950f5 --- /dev/null +++ b/dev-db/futuresql/futuresql_qt6-0.1.1.recipe @@ -0,0 +1,77 @@ +SUMMARY="A non-blocking database framework for Qt" +DESCRIPTION="FutureSQL was in part inspired by Diesel, and provides a higher level of abstraction \ +than QtSql. Its features include non-blocking database access by default, relatively \ +boilderplate-free queries, automatic database migrations and simple mapping to objects. + +In order to make FutureSQL's use of templates less confusing, FutureSQL uses C++20 concepts, and \ +requires a C++20 compiler. + +Warning: The API is not finalized yet." +HOMEPAGE="https://invent.kde.org/libraries/futuresql" +COPYRIGHT="2022 Jonah BrĂ¼chert" +LICENSE="BSD (2-clause)" +REVISION="3" +SOURCE_URI="https://download.kde.org/stable/futuresql/futuresql-$portVersion.tar.xz" +CHECKSUM_SHA256="e44ed8d5a9618b3ca7ba2983ed9c5f7572e6e0a5b199f94868834b71ccbebd43" +SOURCE_DIR="futuresql-$portVersion" + +ARCHITECTURES="all !x86_gcc2" +SECONDARY_ARCHITECTURES="!x86" + +PROVIDES=" + futuresql_qt6$secondaryArchSuffix = $portVersion + lib:libfuturesql6$secondaryArchSuffix = 0 + " +REQUIRES=" + haiku$secondaryArchSuffix + lib:libQt6Core$secondaryArchSuffix + lib:libQt6Sql$secondaryArchSuffix + " + +PROVIDES_devel=" + futuresql_qt6${secondaryArchSuffix}_devel = $portVersion + devel:libfuturesql6$secondaryArchSuffix = 0 + " +REQUIRES_devel=" + futuresql_qt6$secondaryArchSuffix == $portVersion base + " + +BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel + extra_cmake_modules$secondaryArchSuffix + devel:libQCoro6Core$secondaryArchSuffix + devel:libQt6Core$secondaryArchSuffix + " +BUILD_PREREQUIRES=" + cmd:cmake + cmd:g++$secondaryArchSuffix + cmd:make + cmd:pkg_config$secondaryArchSuffix + " + +BUILD() +{ + cmake -Bbuild -S. $cmakeDirArgs \ + -DCMAKE_BUILD_TYPE=Release \ + -DBUILD_WITH_QT6=ON \ + -DECM_DIR=/system/data/cmake/Modules/ECM/cmake + make -C build $jobArgs +} + +INSTALL() +{ + make -C build install + + prepareInstalledDevelLib \ + libfuturesql6 + + packageEntries devel \ + $libDir/cmake \ + $developDir +} + +TEST() +{ + export LIBRARY_PATH="$sourceDir/build/bin${LIBRARY_PATH:+:$LIBRARY_PATH}" + make -C build test +}