From 2f937b20b171627d2f887dfa8023cb4889830d12 Mon Sep 17 00:00:00 2001 From: Schrijvers Luc Date: Wed, 1 May 2024 10:29:46 +0200 Subject: [PATCH] ksyntax_highlighting, revbump, move qtdesigner plugin to the right place, cleanup (#10392) --- .../ksyntax_highlighting-5.115.0.recipe | 27 ++++++------------- 1 file changed, 8 insertions(+), 19 deletions(-) diff --git a/kde-frameworks/ksyntax_highlighting/ksyntax_highlighting-5.115.0.recipe b/kde-frameworks/ksyntax_highlighting/ksyntax_highlighting-5.115.0.recipe index 418d4c963..d5e970183 100644 --- a/kde-frameworks/ksyntax_highlighting/ksyntax_highlighting-5.115.0.recipe +++ b/kde-frameworks/ksyntax_highlighting/ksyntax_highlighting-5.115.0.recipe @@ -7,7 +7,7 @@ QSyntaxHighlighter sub-class." HOMEPAGE="https://invent.kde.org/frameworks/syntax-highlighting/" COPYRIGHT="2010-2024 KDE Organisation" LICENSE="GNU LGPL v2" -REVISION="1" +REVISION="2" SOURCE_URI="https://download.kde.org/stable/frameworks/${portVersion%.*}/syntax-highlighting-${portVersion}.tar.xz" CHECKSUM_SHA256="0622a719ac243023b87a1592291c55c66ac9c6e79ab7be04fbb68ed2d3f2de0a" SOURCE_DIR="syntax-highlighting-$portVersion" @@ -29,8 +29,7 @@ REQUIRES=" PROVIDES_devel=" ksyntax_highlighting${secondaryArchSuffix}_devel = $portVersion - devel:ksyntax_highlighting$secondaryArchSuffix = $portVersion compat >= 5 - devel:libkf5syntaxhighlighting$secondaryArchSuffix = $portVersion + devel:libKF5SyntaxHighlighting$secondaryArchSuffix = $portVersion compat >= 5 " REQUIRES_devel=" ksyntax_highlighting$secondaryArchSuffix == $portVersion base @@ -50,31 +49,22 @@ BUILD_PREREQUIRES=" cmd:perl " -PATCH() -{ - sed -e '/platforms:/ a \ \ \ \ - name: Haiku' -i $sourceDir/metainfo.yaml -} - BUILD() { - mkdir -p build - cd build - - cmake .. $cmakeDirArgs \ + cmake -Bbuild -S. $cmakeDirArgs \ -DCMAKE_BUILD_TYPE=Release \ -DKDE_INSTALL_PLUGINDIR=$addOnsDir/Qt5 \ + -DKDE_INSTALL_QMLDIR=$dataDir/Qt5/qml \ -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 \ libKF5SyntaxHighlighting packageEntries devel \ @@ -85,6 +75,5 @@ INSTALL() TEST() { - cd build - make test + make -Cbuild test }