diff --git a/net-news/rssguard/rssguard-4.1.1.recipe b/net-news/rssguard/rssguard-4.2.1.recipe similarity index 79% rename from net-news/rssguard/rssguard-4.1.1.recipe rename to net-news/rssguard/rssguard-4.2.1.recipe index 9d96e8ea7..0b42a129a 100644 --- a/net-news/rssguard/rssguard-4.1.1.recipe +++ b/net-news/rssguard/rssguard-4.2.1.recipe @@ -16,12 +16,12 @@ COPYRIGHT="2011-2022 Martin Rotter" LICENSE="GNU GPL v3" REVISION="1" SOURCE_URI="https://github.com/martinrotter/rssguard/archive/refs/tags/$portVersion.tar.gz" -CHECKSUM_SHA256="2f9a846f12a1c70ec2d8d474daff4e7caeb14ade332b75f40a9900aa7fbc4994" +CHECKSUM_SHA256="b404e3d8310c58ffb337bf1d2eb2c7cc10a692b00ed2666af30bd0153413cc05" SOURCE_FILENAME="rssguard-$portVersion.tar.gz" ADDITIONAL_FILES="rssguard.rdef.in" ARCHITECTURES="!x86_gcc2 x86_64" -SECONDARY_ARCHITECTURES="!x86" +SECONDARY_ARCHITECTURES="?x86" PROVIDES=" rssguard$secondaryArchSuffix = $portVersion @@ -41,12 +41,18 @@ REQUIRES=" lib:libQt5QmlModels$secondaryArchSuffix lib:libQt5Quick$secondaryArchSuffix lib:libQt5Sql$secondaryArchSuffix - lib:libQt5WebChannel$secondaryArchSuffix lib:libQt5WebEngineCore$secondaryArchSuffix lib:libQt5WebEngineWidgets$secondaryArchSuffix lib:libQt5Widgets$secondaryArchSuffix lib:libQt5Xml$secondaryArchSuffix + lib:libQt5WebChannel$secondaryArchSuffix " +if [ "$effectiveTargetArchitecture" = x86_64 ]; then + REQUIRES+=" + lib:libQt5WebEngineCore$secondaryArchSuffix + lib:libQt5WebEngineWidgets$secondaryArchSuffix + " +fi BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel @@ -62,37 +68,48 @@ BUILD_REQUIRES=" devel:libQt5Qml$secondaryArchSuffix devel:libQt5QmlModels$secondaryArchSuffix devel:libQt5Quick$secondaryArchSuffix - devel:libQt5WebChannel$secondaryArchSuffix devel:libQt5WebEngineCore$secondaryArchSuffix devel:libQt5WebEngineWidgets$secondaryArchSuffix devel:libQt5Widgets$secondaryArchSuffix devel:libQt5Xml$secondaryArchSuffix + devel:libQt5WebChannel$secondaryArchSuffix " +if [ "$effectiveTargetArchitecture" = x86_64 ]; then + BUILD_REQUIRES+=" + devel:libQt5WebEngineCore$secondaryArchSuffix + devel:libQt5WebEngineWidgets$secondaryArchSuffix + " +fi BUILD_PREREQUIRES=" + cmd:cmake cmd:g++$secondaryArchSuffix cmd:lrelease$secondaryArchSuffix >= 5 - cmd:make + cmd:ninja cmd:pkg_config$secondaryArchSuffix - cmd:qmake$secondaryArchSuffix >= 5 cmd:sed " defineDebugInfoPackage rssguard$secondaryArchSuffix \ "$appsDir"/RSSGuard/RSSGuard - BUILD() { - qmake . \ - PREFIX=$appsDir/RSSGuard \ - CONFIG+=release \ - USE_WEBENGINE=yes - make $jobArgs + maybe_webengine="-DUSE_WEBENGINE=OFF" + if [ "$effectiveTargetArchitecture" = x86_64 ]; then + maybe_webengine="-DUSE_WEBENGINE=ON" + fi + + cmake -S . -B build -G Ninja \ + -DCMAKE_BUILD_TYPE=RelWithDebInfo \ + -DCMAKE_INSTALL_PREFIX:PATH="$appsDir/RSSGuard" \ + $maybe_webengine + + ninja -C build $jobArgs } INSTALL() { - make install + ninja -C build install mv $appsDir/RSSGuard/bin/rssguard $appsDir/RSSGuard/RSSGuard rm -rf $appsDir/RSSGuard/{bin,include,share}