From a9720ff786cf53384bdd91e219d74362d71d5d01 Mon Sep 17 00:00:00 2001 From: Schrijvers Luc Date: Wed, 24 Jul 2024 12:42:15 +0200 Subject: [PATCH] kirigami_addons1 (KF6), bump version (#10739) --- ...0.recipe => kirigami_addons1-1.4.0.recipe} | 37 +++++++++++++++++-- 1 file changed, 33 insertions(+), 4 deletions(-) rename dev-libs/kirigami_addons/{kirigami_addons1-1.3.0.recipe => kirigami_addons1-1.4.0.recipe} (55%) diff --git a/dev-libs/kirigami_addons/kirigami_addons1-1.3.0.recipe b/dev-libs/kirigami_addons/kirigami_addons1-1.4.0.recipe similarity index 55% rename from dev-libs/kirigami_addons/kirigami_addons1-1.3.0.recipe rename to dev-libs/kirigami_addons/kirigami_addons1-1.4.0.recipe index 77067be17..3cde178f9 100644 --- a/dev-libs/kirigami_addons/kirigami_addons1-1.3.0.recipe +++ b/dev-libs/kirigami_addons/kirigami_addons1-1.4.0.recipe @@ -5,22 +5,37 @@ COPYRIGHT="2010-2024 KDE Organisation" LICENSE="GNU LGPL v2.1" REVISION="1" SOURCE_URI="https://download.kde.org/stable/kirigami-addons/kirigami-addons-$portVersion.tar.xz" -CHECKSUM_SHA256="f5e44d7a7d7dfd866c529bb004f7204013609a16c9757091fcdb2c6c5be00ff3" +CHECKSUM_SHA256="56e3ceb52055b5603320ea08b27d3673d32a391a8d58646d998227d8b51f0a93" SOURCE_DIR="kirigami-addons-$portVersion" ARCHITECTURES="all !x86_gcc2" SECONDARY_ARCHITECTURES="x86" +libVersion="$portVersion" +libVersionCompat="$libVersion compat >= ${libVersion%%.*}" + PROVIDES=" kirigami_addons1$secondaryArchSuffix = $portVersion + lib:libKirigamiAddonsStatefulApp$secondaryArchSuffix = $libVersionCompat " REQUIRES=" haiku$secondaryArchSuffix + lib:libGL$secondaryArchSuffix + # KF6 + lib:libKF6ConfigCore$secondaryArchSuffix + lib:libKF6CoreAddons$secondaryArchSuffix + lib:libKF6I18n$secondaryArchSuffix + # Qt6 + lib:libQt6Core$secondaryArchSuffix + lib:libQt6Gui$secondaryArchSuffix + lib:libQt6Network$secondaryArchSuffix + lib:libQt6Qml$secondaryArchSuffix + lib:libQt6Quick$secondaryArchSuffix " PROVIDES_devel=" kirigami_addons1${secondaryArchSuffix}_devel = $portVersion - devel:kirigami_addons1$secondaryArchSuffix + devel:libKirigamiAddonsStatefulApp$secondaryArchSuffix = $libVersionCompat " REQUIRES_devel=" kirigami_addons1$secondaryArchSuffix == $portVersion base @@ -31,6 +46,9 @@ BUILD_REQUIRES=" # KF6 extra_cmake_modules$secondaryArchSuffix devel:libKF6ConfigCore$secondaryArchSuffix + devel:libKF6CoreAddons$secondaryArchSuffix + devel:libKF6GlobalAccel$secondaryArchSuffix + devel:libKF6GuiAddons$secondaryArchSuffix devel:libKF6I18n$secondaryArchSuffix devel:libKirigami$secondaryArchSuffix # Qt6 @@ -46,12 +64,18 @@ BUILD_PREREQUIRES=" cmd:pkg_config$secondaryArchSuffix " +TEST_REQUIRES=" + qthaikuplugins$secondaryArchSuffix + devel:libQt6Multimedia$secondaryArchSuffix + " + BUILD() { cmake -Bbuild -S. $cmakeDirArgs \ -DCMAKE_BUILD_TYPE=Release \ -DKDE_INSTALL_QMLDIR=$dataDir/Qt6/qml \ - -DECM_DIR=/system/data/cmake/Modules/ECM/cmake + -DECM_DIR=/system/data/cmake/Modules/ECM/cmake \ + -Wno-dev make -C build $jobArgs } @@ -59,11 +83,16 @@ INSTALL() { make -C build install + prepareInstalledDevelLib \ + libKirigamiAddonsStatefulApp + packageEntries devel \ + $developDir \ $libDir/cmake } TEST() { - make check + # 80% tests passed, 1 tests failed out of 5 + ctest --test-dir build --output-on-failure }