diff --git a/dev-libs/kpublictransport/kpublictransport24-24.12.0.recipe b/dev-libs/kpublictransport/kpublictransport_kf6-24.12.2.recipe similarity index 79% rename from dev-libs/kpublictransport/kpublictransport24-24.12.0.recipe rename to dev-libs/kpublictransport/kpublictransport_kf6-24.12.2.recipe index 7c11c9778..6c27d28fb 100644 --- a/dev-libs/kpublictransport/kpublictransport24-24.12.0.recipe +++ b/dev-libs/kpublictransport/kpublictransport_kf6-24.12.2.recipe @@ -21,11 +21,11 @@ fine-grained per query reply via KPublicTransport::Reply::attributions(). Wikidata licensed as CC0 as well as data from OpenStreetMap licensed as ODbL, so those should be \ appropriately credited in your application as well." HOMEPAGE="https://invent.kde.org/libraries/kpublictransport" -COPYRIGHT="2010-2024 KDE Organisation" +COPYRIGHT="2010-2025 KDE Organisation" LICENSE="GNU LGPL v2" REVISION="1" SOURCE_URI="https://download.kde.org/stable/release-service/$portVersion/src/kpublictransport-$portVersion.tar.xz" -CHECKSUM_SHA256="b1e0f9498219e5733d47d2c8b60082201ea285215e392831a587267e2c683250" +CHECKSUM_SHA256="f2a2391ccfd6f52f421a7cd8f93ee9b243f357d27c223b29b6b3c389c6a6f926" SOURCE_DIR="kpublictransport-$portVersion" ARCHITECTURES="all !x86_gcc2" @@ -35,39 +35,58 @@ libVersion="$portVersion" libVersionCompat="$libVersion compat >= ${libVersion%%.*}" PROVIDES=" - kpublictransport24$secondaryArchSuffix = $portVersion + kpublictransport_kf6$secondaryArchSuffix = $portVersion lib:libKPublicTransport$secondaryArchSuffix = $libVersionCompat lib:libKPublicTransportOnboard$secondaryArchSuffix = $libVersionCompat " REQUIRES=" haiku$secondaryArchSuffix lib:libGL$secondaryArchSuffix + # KF6 lib:libKF6I18n$secondaryArchSuffix + # Qt6 lib:libQt6Core$secondaryArchSuffix lib:libQt6Qml$secondaryArchSuffix lib:libz$secondaryArchSuffix " +REPLACES=" + kpublictransport24$secondaryArchSuffix + " PROVIDES_devel=" - kpublictransport24${secondaryArchSuffix}_devel = $portVersion + kpublictransport_kf6${secondaryArchSuffix}_devel = $portVersion devel:libKPublicTransport$secondaryArchSuffix = $libVersionCompat devel:libKPublicTransportOnboard$secondaryArchSuffix = $libVersionCompat " REQUIRES_devel=" - kpublictransport24$secondaryArchSuffix == $portVersion base + kpublictransport_kf6$secondaryArchSuffix == $portVersion base + " + +ARCHITECTURES_doc="any" + +PROVIDES_doc=" + kpublictransport_kf6${secondaryArchSuffix}_doc = $portVersion + " +REQUIRES_doc=" + kpublictransport_kf6${secondaryArchSuffix}_devel == $portVersion " BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel + devel:libprotobuf$secondaryArchSuffix >= 31 + devel:libz$secondaryArchSuffix + # KF6 extra_cmake_modules$secondaryArchSuffix devel:libKF6I18n$secondaryArchSuffix - devel:libprotobuf$secondaryArchSuffix >= 31 + # Qt6 + qt6_tools${secondaryArchSuffix}_devel devel:libQt6Core$secondaryArchSuffix devel:libQt6Qml$secondaryArchSuffix - devel:libz$secondaryArchSuffix " BUILD_PREREQUIRES=" cmd:cmake + cmd:dot + cmd:doxygen cmd:g++$secondaryArchSuffix cmd:make cmd:msgfmt$secondaryArchSuffix @@ -81,7 +100,10 @@ BUILD() $cmakeDirArgs \ -DKDE_INSTALL_PLUGINDIR=$addOnsDir/Qt6 \ -DKDE_INSTALL_QMLDIR=$dataDir/Qt6/qml \ - -DECM_DIR=/system/data/cmake/Modules/ECM/cmake + -DKDE_INSTALL_QTQCHDIR=$documentationDir/packages/qt6_base \ + -DECM_DIR=/system/data/cmake/Modules/ECM/cmake \ + -DBUILD_QCH=ON \ + -DBUILD_TESTING=OFF make -C build $jobArgs } @@ -97,10 +119,14 @@ INSTALL() packageEntries devel \ $developDir \ $libDir/cmake + + packageEntries doc \ + $documentationDir } TEST() { + # 80% tests passed, 10 tests failed out of 49 export LIBRARY_PATH="$sourceDir/build/bin${LIBRARY_PATH:+:$LIBRARY_PATH}" ctest --test-dir build --output-on-failure }