From b37772653837e4fbf20303da758f0d364c614c80 Mon Sep 17 00:00:00 2001 From: Schrijvers Luc Date: Wed, 1 May 2024 18:34:19 +0200 Subject: [PATCH] pimcommon, revbump, move qtdesigner plugins to the right path (#10401) --- kde-apps/pimcommon/pimcommon-23.08.5.recipe | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/kde-apps/pimcommon/pimcommon-23.08.5.recipe b/kde-apps/pimcommon/pimcommon-23.08.5.recipe index 17d6022cd..bbd4d6289 100644 --- a/kde-apps/pimcommon/pimcommon-23.08.5.recipe +++ b/kde-apps/pimcommon/pimcommon-23.08.5.recipe @@ -7,7 +7,7 @@ LICENSE="BSD (3-clause) GNU GPL v2 GNU GPL v3 GNU LGPL v2" -REVISION="1" +REVISION="2" SOURCE_URI="https://download.kde.org/stable/release-service/$portVersion/src/pimcommon-$portVersion.tar.xz" CHECKSUM_SHA256="5f5b1cc3cc2a0f204089d55ff8dae5236da147878fb0925080399090d05f4d2e" @@ -84,7 +84,7 @@ REQUIRES_devel=" BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel - extra_cmake_modules$secondaryArchSuffix >= 5.115 + extra_cmake_modules$secondaryArchSuffix devel:libGrantlee_Templates$secondaryArchSuffix devel:libKF5Archive$secondaryArchSuffix devel:libKF5Attica$secondaryArchSuffix @@ -141,16 +141,11 @@ BUILD_PREREQUIRES=" cmd:xsltproc " -PATCH() -{ - sed -e '/platforms:/ a \ \ \ \ - name: Haiku' -i $sourceDir/metainfo.yaml -} - BUILD() { cmake -Bbuild -S. $cmakeDirArgs \ -DCMAKE_BUILD_TYPE=Release \ - -DKDE_INSTALL_PLUGINDIR=$addOnsDir/Qt5 \ + -DKDE_INSTALL_QTPLUGINDIR=$addOnsDir/Qt5 \ -DKDE_INSTALL_QMLDIR=$dataDir/Qt5/qml \ -DECM_MKSPECS_INSTALL_DIR=$dataDir/Qt5/mkspecs \ -DECM_DIR=/system/data/cmake/Modules/ECM/cmake @@ -167,11 +162,11 @@ INSTALL() packageEntries devel \ $libDir/cmake \ - $dataDir/Qt5/mkspecs \ + $dataDir/Qt5 \ $developDir } TEST() { - make check + make -C build test }