From 68900d059cfa0329d2cfebe0591a24d27c8510a9 Mon Sep 17 00:00:00 2001 From: Augustin Cavalier Date: Sat, 20 Nov 2021 15:13:06 -0500 Subject: [PATCH] falkon: Fix directory deletion, use Ninja, bump revision. --- www-client/falkon/falkon-3.1.0.recipe | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/www-client/falkon/falkon-3.1.0.recipe b/www-client/falkon/falkon-3.1.0.recipe index f28f03e7e..82f1a58dd 100644 --- a/www-client/falkon/falkon-3.1.0.recipe +++ b/www-client/falkon/falkon-3.1.0.recipe @@ -5,7 +5,7 @@ through all major platforms." HOMEPAGE="https://falkon.org/" COPYRIGHT="2009-2019 Falkon Browser Team" LICENSE="GNU GPL v3" -REVISION="1" +REVISION="2" SOURCE_URI="https://download.kde.org/stable/falkon/3.1/falkon-$portVersion.tar.xz" CHECKSUM_SHA256="ce743cd80c0e2d525a784e29c9b487f73480119b0567f9ce8ef1f44cca527587" PATCHES="falkon-$portVersion.patchset" @@ -67,7 +67,7 @@ BUILD_REQUIRES=" BUILD_PREREQUIRES=" cmd:cmake cmd:g++$secondaryArchSuffix - cmd:make + cmd:ninja cmd:pkg_config$secondaryArchSuffix cmd:qdbuscpp2xml$secondaryArchSuffix >= 5 cmd:sed @@ -78,24 +78,27 @@ defineDebugInfoPackage falkon$secondaryArchSuffix \ BUILD() { - cmake -S . -B build \ + exit 0 + cmake -S . -B build -G Ninja \ -DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DCMAKE_INSTALL_PREFIX:PATH="$appsDir/Falkon" \ -DCMAKE_INSTALL_DATAROOTDIR:PATH="$dataDir" \ -DKDE_INSTALL_PLUGINDIR=$addOnsDir/Qt5 \ -DECM_MKSPECS_INSTALL_DIR=$dataDir/Qt5/mkspecs \ -DECM_DIR=/system/data/cmake/Modules/ECM/cmake - make -C build $jobArgs + cd build + ninja $jobArgs } INSTALL() { - make -C build install + cd build + ninja install mv $appsDir/Falkon/bin/falkon \ $appsDir/Falkon/Falkon - rm -rf $appsDir/Otter-Browser/bin + rm -rf $appsDir/Falkon/bin local APP_SIGNATURE="application/x-vnd.falkon" local MAJOR="`echo "$portVersion" | cut -d. -f1`"