From 7bb4be7b9e586385e60daac782a8929abf69e8df Mon Sep 17 00:00:00 2001 From: Schrijvers Luc Date: Wed, 12 Feb 2025 10:19:53 +0100 Subject: [PATCH] kpkpass, bump KF6 version (#11771) --- ...12.0.recipe => kpkpass_kf6-24.12.2.recipe} | 40 ++++++++++++++----- 1 file changed, 29 insertions(+), 11 deletions(-) rename kde-apps/kpkpass/{kpkpass24-24.12.0.recipe => kpkpass_kf6-24.12.2.recipe} (75%) diff --git a/kde-apps/kpkpass/kpkpass24-24.12.0.recipe b/kde-apps/kpkpass/kpkpass_kf6-24.12.2.recipe similarity index 75% rename from kde-apps/kpkpass/kpkpass24-24.12.0.recipe rename to kde-apps/kpkpass/kpkpass_kf6-24.12.2.recipe index fe3a4a656..9b5bd4213 100644 --- a/kde-apps/kpkpass/kpkpass24-24.12.0.recipe +++ b/kde-apps/kpkpass/kpkpass_kf6-24.12.2.recipe @@ -7,53 +7,68 @@ The entry point in both cases is KPkPass::Pass to load an existing pass. Apple Wallet files are essentially ZIP files containing a JSON description of the pass, translated message catalogs and graphical assets to render the pass." HOMEPAGE="https://invent.kde.org/pim/kpkpass" -COPYRIGHT="2010-2024 KDE Organisation" +COPYRIGHT="2010-2025 KDE Organisation" LICENSE="GNU LGPL v2.1" -REVISION="3" +REVISION="1" SOURCE_URI="https://download.kde.org/stable/release-service/$portVersion/src/kpkpass-$portVersion.tar.xz" -CHECKSUM_SHA256="803f2a222e844f09b3ac68f0ee2c4032d2a3694c60b1188a9c5527e64e26c24b" +CHECKSUM_SHA256="56043984d03d14b7949afa4073cddd33c521136603a6a36a252c64ce87f4c7b4" SOURCE_DIR="kpkpass-$portVersion" ARCHITECTURES="all !x86_gcc2" SECONDARY_ARCHITECTURES="x86" -libVersion="6.3.0" +libVersion="6.3.2" libVersionCompat="$libVersion compat >= ${libVersion%%.*}" PROVIDES=" - kpkpass24$secondaryArchSuffix = $portVersion + kpkpass_kf6$secondaryArchSuffix = $portVersion lib:libKPim6PkPass$secondaryArchSuffix = $libVersionCompat " REQUIRES=" haiku$secondaryArchSuffix lib:libGL$secondaryArchSuffix - # KF 6 + # KF6 lib:libKF6Archive$secondaryArchSuffix # Qt6 lib:libQt6Core$secondaryArchSuffix lib:libQt6Gui$secondaryArchSuffix " +REPLACES=" + kpkpass24$secondaryArchSuffix + " PROVIDES_devel=" - kpkpass24${secondaryArchSuffix}_devel = $portVersion + kpkpass_kf6${secondaryArchSuffix}_devel = $portVersion devel:libKPim6PkPass$secondaryArchSuffix = $libVersionCompat " REQUIRES_devel=" - kpkpass24$secondaryArchSuffix == $portVersion base + kpkpass_kf6$secondaryArchSuffix == $portVersion base + " + +ARCHITECTURES_doc="any" + +PROVIDES_doc=" + kpkpass_kf6${secondaryArchSuffix}_doc = $portVersion + " +REQUIRES_doc=" + kpkpass_kf6$secondaryArchSuffix == $portVersion base " BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel shared_mime_info$secondaryArchSuffix - # KF 6 + # KF6 extra_cmake_modules$secondaryArchSuffix devel:libKF6Archive$secondaryArchSuffix # Qt6 + qt6_tools${secondaryArchSuffix}_devel devel:libQt6Core$secondaryArchSuffix devel:libQt6Gui$secondaryArchSuffix " BUILD_PREREQUIRES=" cmd:cmake + cmd:dot + cmd:doxygen cmd:g++$secondaryArchSuffix cmd:make cmd:msgfmt$secondaryArchSuffix @@ -65,9 +80,9 @@ BUILD() { cmake -B build -S . -DCMAKE_BUILD_TYPE=Release \ $cmakeDirArgs \ - -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 \ -DBUILD_TESTING=OFF \ -Wno-dev make -C build $jobArgs @@ -87,6 +102,9 @@ INSTALL() packageEntries devel \ $developDir \ $libDir/cmake + + packageEntries doc \ + $documentationDir } TEST()