From 016bc9beaf1c79c899a552f86f8d85a29955bb2a Mon Sep 17 00:00:00 2001 From: Schrijvers Luc Date: Wed, 12 Feb 2025 12:20:07 +0100 Subject: [PATCH] kopeninghours, bump KF6 version (#11776) --- ...ecipe => kopeninghours_kf6-24.12.2.recipe} | 40 +++++++++++++++---- 1 file changed, 32 insertions(+), 8 deletions(-) rename dev-libs/kopeninghours/{kopeninghours24-24.12.0.recipe => kopeninghours_kf6-24.12.2.recipe} (69%) diff --git a/dev-libs/kopeninghours/kopeninghours24-24.12.0.recipe b/dev-libs/kopeninghours/kopeninghours_kf6-24.12.2.recipe similarity index 69% rename from dev-libs/kopeninghours/kopeninghours24-24.12.0.recipe rename to dev-libs/kopeninghours/kopeninghours_kf6-24.12.2.recipe index 86a2709c9..b264540a2 100644 --- a/dev-libs/kopeninghours/kopeninghours24-24.12.0.recipe +++ b/dev-libs/kopeninghours/kopeninghours_kf6-24.12.2.recipe @@ -3,49 +3,68 @@ DESCRIPTION="OSM opening hours expressions are used to describe when a feature i or closed. This format is not only used in OpenStreetMap itself, but in various other data \ sources or APIs needing such a description as well." HOMEPAGE="https://invent.kde.org/pim/kopeninghours" -COPYRIGHT="2010-2024 KDE Organisation" +COPYRIGHT="2010-2025 KDE Organisation" LICENSE="GNU GPL v2" REVISION="1" SOURCE_URI="https://download.kde.org/stable/release-service/$portVersion/src/kopeninghours-$portVersion.tar.xz" -CHECKSUM_SHA256="16d29db8c240306794ef5938ce8ef8bea05974c81f4ebe3adf828a14eb6c0656" +CHECKSUM_SHA256="6c80ff799ef3077ca329e0f57a6329731df2814540c1ea4004834d021d2022a9" SOURCE_DIR="kopeninghours-$portVersion" ARCHITECTURES="all !x86_gcc2" SECONDARY_ARCHITECTURES="x86" -libVersion="24.8.3" +libVersion="$portVersion" libVersionCompat="$libVersion compat >= ${libVersion%%.*}" PROVIDES=" - kopeninghours24$secondaryArchSuffix = $portVersion + kopeninghours_kf6$secondaryArchSuffix = $portVersion lib:libKOpeningHours$secondaryArchSuffix = $libVersionCompat " REQUIRES=" haiku$secondaryArchSuffix + # KF6 lib:libKF6Holidays$secondaryArchSuffix lib:libKF6I18n$secondaryArchSuffix + # Qt6 lib:libQt6Core$secondaryArchSuffix " +REPLACES=" + kopeninghours24$secondaryArchSuffix + " PROVIDES_devel=" - kopeninghours24${secondaryArchSuffix}_devel = $portVersion + kopeninghours_kf6${secondaryArchSuffix}_devel = $portVersion devel:libKOpeningHours$secondaryArchSuffix = $libVersionCompat " REQUIRES_devel=" - kopeninghours24$secondaryArchSuffix == $portVersion base + kopeninghours_kf6$secondaryArchSuffix == $portVersion base + " + +ARCHITECTURES_doc="any" + +PROVIDES_doc=" + kopeninghours_kf6${secondaryArchSuffix}_doc = $portVersion + " +REQUIRES_doc=" + kopeninghours_kf6${secondaryArchSuffix}_devel == $portVersion " BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel + # KF6 extra_cmake_modules$secondaryArchSuffix devel:libKF6Holidays$secondaryArchSuffix devel:libKF6I18n$secondaryArchSuffix + # Qt6 + qt6_tools${secondaryArchSuffix}_devel devel:libQt6Core$secondaryArchSuffix devel:libQt6Qml$secondaryArchSuffix " BUILD_PREREQUIRES=" cmd:bison cmd:cmake + cmd:dot + cmd:doxygen cmd:flex cmd:g++$secondaryArchSuffix cmd:make @@ -61,7 +80,9 @@ BUILD() -DBUILD_WITH_QT6=ON \ -DKDE_INSTALL_PLUGINDIR=$addOnsDir/Qt6 \ -DKDE_INSTALL_QMLDIR=$dataDir/Qt6/qml \ + -DKDE_INSTALL_QTQCHDIR=$documentationDir/packages/qt6_base \ -DECM_DIR=/system/data/cmake/Modules/ECM/cmake \ + -DBUILD_QCH=ON \ -Wno-dev make -C build $jobArgs @@ -77,11 +98,14 @@ INSTALL() packageEntries devel \ $developDir \ $libDir/cmake + + packageEntries doc \ + $documentationDir } TEST() { - # 71% tests passed, 2 tests failed out of 7 (1 crash) + # 71% tests passed, 2 tests failed out of 7 export LIBRARY_PATH="$sourceDir/build/bin${LIBRARY_PATH:+:$LIBRARY_PATH}" - make -C build test + ctest --test-dir build --output-on-failure }