diff --git a/kde-frameworks/kdav/kdav6-6.9.0.recipe b/kde-frameworks/kdav/kdav6-6.11.0.recipe similarity index 88% rename from kde-frameworks/kdav/kdav6-6.9.0.recipe rename to kde-frameworks/kdav/kdav6-6.11.0.recipe index cfee8e599..55a7857d1 100644 --- a/kde-frameworks/kdav/kdav6-6.9.0.recipe +++ b/kde-frameworks/kdav/kdav6-6.11.0.recipe @@ -8,7 +8,7 @@ COPYRIGHT="2010-2024 KDE Organisation" LICENSE="GNU LGPL v2" REVISION="1" SOURCE_URI="https://download.kde.org/stable/frameworks/${portVersion%.*}/kdav-${portVersion}.tar.xz" -CHECKSUM_SHA256="5ac5818e89bc9e8119f10a46bc3c8e54878db4e9a12c3a07481debc8d536cbd3" +CHECKSUM_SHA256="9ca5586e672f5643988dcd604b6a030f59b3d5e78f1cf3725f2e4f257852340e" SOURCE_DIR="kdav-$portVersion" ARCHITECTURES="all !x86_gcc2" @@ -41,6 +41,15 @@ REQUIRES_devel=" kdav6$secondaryArchSuffix == $portVersion base " +ARCHITECTURES_doc="any" + +PROVIDES_doc=" + kdav6${secondaryArchSuffix}_doc = $portVersion + " +REQUIRES_doc=" + kdav6$secondaryArchSuffix == $portVersion base + " + BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel extra_cmake_modules$secondaryArchSuffix @@ -66,9 +75,6 @@ TEST_REQUIRES=" qthaikuplugins$secondaryArchSuffix " -#defineDebugInfoPackage kdav6$secondaryArchSuffix \ -# $libDir/libKF6DAV.so.$libVersion - BUILD() { cmake -B build -S . -DCMAKE_BUILD_TYPE=Release \ @@ -76,7 +82,7 @@ BUILD() -DKDE_INSTALL_PLUGINDIR=$addOnsDir/Qt6 \ -DKDE_INSTALL_QMLDIR=$dataDir/Qt6/qml \ -DKDE_INSTALL_QTPLUGINDIR=$addOnsDir/Qt6 \ - -DKDE_INSTALL_QTQCHDIR=$documentationDir/packages/qt6 \ + -DKDE_INSTALL_QTQCHDIR=$documentationDir/packages/qt6_base \ -DECM_DIR=/system/data/cmake/Modules/ECM/cmake \ -DCMAKE_SKIP_RPATH=YES \ -DBUILD_QCH=ON \ @@ -94,8 +100,10 @@ INSTALL() packageEntries devel \ $developDir \ - $documentationDir \ $libDir/cmake + + packageEntries doc \ + $documentationDir } TEST() diff --git a/kde-frameworks/kdeclarative/kdeclarative6-6.9.0.recipe b/kde-frameworks/kdeclarative/kdeclarative6-6.11.0.recipe similarity index 73% rename from kde-frameworks/kdeclarative/kdeclarative6-6.9.0.recipe rename to kde-frameworks/kdeclarative/kdeclarative6-6.11.0.recipe index 9db6b0971..f9ff27d50 100644 --- a/kde-frameworks/kdeclarative/kdeclarative6-6.9.0.recipe +++ b/kde-frameworks/kdeclarative/kdeclarative6-6.11.0.recipe @@ -8,8 +8,9 @@ COPYRIGHT="2010-2024 KDE Organisation" LICENSE="GNU LGPL v2" REVISION="1" SOURCE_URI="https://download.kde.org/stable/frameworks/${portVersion%.*}/kdeclarative-${portVersion}.tar.xz" -CHECKSUM_SHA256="1a266dd2a2912ffe632e455d823a76c9dbfb44977c07838bc44e457e5bec98eb" +CHECKSUM_SHA256="6ae811367bcbc8190f8a5d2ef39a8e6c72871c41ec26e2a4b0c38324a3e8596b" SOURCE_DIR="kdeclarative-$portVersion" +PATCHES="kdeclarative6-$portVersion.patchset" ARCHITECTURES="all !x86_gcc2" SECONDARY_ARCHITECTURES="x86" @@ -20,26 +21,43 @@ libVersionCompat="$libVersion compat >= ${libVersion%%.*}" PROVIDES=" kdeclarative6$secondaryArchSuffix = $portVersion lib:libKF6CalendarEvents$secondaryArchSuffix = $libVersionCompat + lib:libkquickcontrolsprivate$secondaryArchSuffix = $libVersionCompat " REQUIRES=" haiku$secondaryArchSuffix + lib:libGL$secondaryArchSuffix + lib:libKF6ConfigCore$secondaryArchSuffix + lib:libKF6GuiAddons$secondaryArchSuffix + lib:libKF6I18n$secondaryArchSuffix + lib:libKF6WidgetsAddons$secondaryArchSuffix lib:libQt6Core$secondaryArchSuffix + lib:libQt6Qml$secondaryArchSuffix + lib:libQt6Quick$secondaryArchSuffix " PROVIDES_devel=" kdeclarative6${secondaryArchSuffix}_devel = $portVersion devel:libKF6CalendarEvents$secondaryArchSuffix = $libVersionCompat + devel:libkquickcontrolsprivate$secondaryArchSuffix = $libVersionCompat " REQUIRES_devel=" kdeclarative6$secondaryArchSuffix == $portVersion base " +ARCHITECTURES_doc="any" + +PROVIDES_doc=" + kdeclarative6${secondaryArchSuffix}_doc = $portVersion + " +REQUIRES_doc=" + kdeclarative6$secondaryArchSuffix == $portVersion base + " + BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel extra_cmake_modules$secondaryArchSuffix qt6_tools${secondaryArchSuffix}_devel devel:libKF6ConfigCore$secondaryArchSuffix == $libVersion - devel:libKF6GlobalAccel$secondaryArchSuffix == $libVersion devel:libKF6GuiAddons$secondaryArchSuffix == $libVersion devel:libKF6I18n$secondaryArchSuffix == $libVersion devel:libKF6WidgetsAddons$secondaryArchSuffix == $libVersion @@ -62,9 +80,6 @@ TEST_REQUIRES=" qthaikuplugins$secondaryArchSuffix " -#defineDebugInfoPackage kdeclarative6$secondaryArchSuffix \ -# $libDir/libKF6CalendarEvents.so.$libVersion - BUILD() { cmake -B build -S . -DCMAKE_BUILD_TYPE=Release \ @@ -72,7 +87,7 @@ BUILD() -DKDE_INSTALL_PLUGINDIR=$addOnsDir/Qt6 \ -DKDE_INSTALL_QMLDIR=$dataDir/Qt6/qml \ -DKDE_INSTALL_QTPLUGINDIR=$addOnsDir/Qt6 \ - -DKDE_INSTALL_QTQCHDIR=$documentationDir/packages/qt6 \ + -DKDE_INSTALL_QTQCHDIR=$documentationDir/packages/qt6_base \ -DECM_DIR=/system/data/cmake/Modules/ECM/cmake \ -DCMAKE_SKIP_RPATH=YES \ -DBUILD_QCH=ON \ @@ -85,13 +100,16 @@ INSTALL() { make -C build install - prepareInstalledDevelLib \ - libKF6CalendarEvents + prepareInstalledDevelLibs \ + libKF6CalendarEvents \ + libkquickcontrolsprivate packageEntries devel \ $developDir \ - $documentationDir \ $libDir/cmake + + packageEntries doc \ + $documentationDir } TEST() diff --git a/kde-frameworks/kdeclarative/patches/kdeclarative6-6.11.0.patchset b/kde-frameworks/kdeclarative/patches/kdeclarative6-6.11.0.patchset new file mode 100644 index 000000000..7a5f67aab --- /dev/null +++ b/kde-frameworks/kdeclarative/patches/kdeclarative6-6.11.0.patchset @@ -0,0 +1,22 @@ +From c6a1bb3d5902ddd9701d3c73e958db3d32cec2db Mon Sep 17 00:00:00 2001 +From: Schrijvers Luc +Date: Fri, 10 Jan 2025 12:58:17 +0100 +Subject: Disable HAVE_KGLOBALACCEL on Haiku too + + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 36604f0..eeb4a24 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -31,7 +31,7 @@ find_package(KF6Config ${KF_DEP_VERSION} REQUIRED) + find_package(KF6GuiAddons ${KF_DEP_VERSION} REQUIRED) + + +-if(NOT WIN32 AND NOT APPLE AND NOT ANDROID) ++if(NOT WIN32 AND NOT APPLE AND NOT ANDROID AND NOT HAIKU) + find_package(KF6GlobalAccel ${KF_DEP_VERSION} REQUIRED) + set(HAVE_KGLOBALACCEL TRUE) + else() +-- +2.45.2 + diff --git a/kde-frameworks/kdesu/kdesu6-6.9.0.recipe b/kde-frameworks/kdesu/kdesu6-6.11.0.recipe similarity index 86% rename from kde-frameworks/kdesu/kdesu6-6.9.0.recipe rename to kde-frameworks/kdesu/kdesu6-6.11.0.recipe index a689af546..72b8adf9a 100644 --- a/kde-frameworks/kdesu/kdesu6-6.9.0.recipe +++ b/kde-frameworks/kdesu/kdesu6-6.11.0.recipe @@ -7,7 +7,7 @@ COPYRIGHT="2010-2024 KDE Organisation" LICENSE="GNU LGPL v2" REVISION="1" SOURCE_URI="https://download.kde.org/stable/frameworks/${portVersion%.*}/kdesu-$portVersion.tar.xz" -CHECKSUM_SHA256="1a84a461371ed0984e7ab225c974e80e5f1afb70dfce57582a9b67cdb40ed1ba" +CHECKSUM_SHA256="aacb49d313e79f106795c4dab7de9991e6fe4e724c2b4c19deefcd171f6a3ba7" SOURCE_DIR="kdesu-$portVersion" PATCHES="kdesu-$portVersion.patchset" @@ -38,6 +38,15 @@ REQUIRES_devel=" kdesu6$secondaryArchSuffix == $portVersion base " +ARCHITECTURES_doc="any" + +PROVIDES_doc=" + kdesu6${secondaryArchSuffix}_doc = $portVersion + " +REQUIRES_doc=" + kdesu6$secondaryArchSuffix == $portVersion base + " + BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel extra_cmake_modules$secondaryArchSuffix @@ -60,9 +69,6 @@ BUILD_PREREQUIRES=" cmd:pkg_config$secondaryArchSuffix " -#defineDebugInfoPackage kdesu6$secondaryArchSuffix \ -# $libDir/libKF6Su.so.$libVersion - BUILD() { cmake -B build -S . -DCMAKE_BUILD_TYPE=Release \ @@ -70,7 +76,7 @@ BUILD() -DKDE_INSTALL_PLUGINDIR=$addOnsDir/Qt6 \ -DKDE_INSTALL_QMLDIR=$dataDir/Qt6/qml \ -DKDE_INSTALL_QTPLUGINDIR=$addOnsDir/Qt6 \ - -DKDE_INSTALL_QTQCHDIR=$documentationDir/packages/qt6 \ + -DKDE_INSTALL_QTQCHDIR=$documentationDir/packages/qt6_base \ -DECM_DIR=/system/data/cmake/Modules/ECM/cmake \ -DKDESU_USE_SUDO_DEFAULT=OFF \ -DCMAKE_SKIP_RPATH=YES \ @@ -88,9 +94,11 @@ INSTALL() libKF6Su packageEntries devel \ - $libDir/cmake \ - $documentationDir \ - $developDir + $developDir \ + $libDir/cmake + + packageEntries doc \ + $documentationDir } TEST() diff --git a/kde-frameworks/kdesu/patches/kdesu-6.9.0.patchset b/kde-frameworks/kdesu/patches/kdesu-6.11.0.patchset similarity index 100% rename from kde-frameworks/kdesu/patches/kdesu-6.9.0.patchset rename to kde-frameworks/kdesu/patches/kdesu-6.11.0.patchset diff --git a/kde-frameworks/kdnssd/kdnssd6-6.9.0.recipe b/kde-frameworks/kdnssd/kdnssd6-6.11.0.recipe similarity index 85% rename from kde-frameworks/kdnssd/kdnssd6-6.9.0.recipe rename to kde-frameworks/kdnssd/kdnssd6-6.11.0.recipe index e52146aad..2d9f1511b 100644 --- a/kde-frameworks/kdnssd/kdnssd6-6.9.0.recipe +++ b/kde-frameworks/kdnssd/kdnssd6-6.11.0.recipe @@ -8,7 +8,7 @@ COPYRIGHT="2010-2024 KDE Organisation" LICENSE="GNU LGPL v2" REVISION="1" SOURCE_URI="https://download.kde.org/stable/frameworks/${portVersion%.*}/kdnssd-${portVersion}.tar.xz" -CHECKSUM_SHA256="527c5659f44097fbeb53c2bf336d2a035fbf28535f7491662c6758259e1e765a" +CHECKSUM_SHA256="69db354bb2a6faac16ec1eb77e6f71308f8ebd9205967c75db5bac937e799bd9" SOURCE_DIR="kdnssd-$portVersion" ARCHITECTURES="all !x86_gcc2" @@ -35,6 +35,15 @@ REQUIRES_devel=" kdnssd6$secondaryArchSuffix == $portVersion base " +ARCHITECTURES_doc="any" + +PROVIDES_doc=" + kdnssd6${secondaryArchSuffix}_doc = $portVersion + " +REQUIRES_doc=" + kdnssd6$secondaryArchSuffix == $portVersion base + " + BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel extra_cmake_modules$secondaryArchSuffix @@ -53,9 +62,6 @@ BUILD_PREREQUIRES=" cmd:pkg_config$secondaryArchSuffix " -#defineDebugInfoPackage kdnssd6$secondaryArchSuffix \ -# $libDir/libKF6DNSSD.so.$libVersion - BUILD() { cmake -B build -S . -DCMAKE_BUILD_TYPE=Release \ @@ -63,7 +69,7 @@ BUILD() -DKDE_INSTALL_PLUGINDIR=$addOnsDir/Qt6 \ -DKDE_INSTALL_QMLDIR=$dataDir/Qt6/qml \ -DKDE_INSTALL_QTPLUGINDIR=$addOnsDir/Qt6 \ - -DKDE_INSTALL_QTQCHDIR=$documentationDir/packages/qt6 \ + -DKDE_INSTALL_QTQCHDIR=$documentationDir/packages/qt6_base \ -DECM_DIR=/system/data/cmake/Modules/ECM/cmake \ -DCMAKE_SKIP_RPATH=YES \ -DBUILD_QCH=ON \ @@ -81,6 +87,8 @@ INSTALL() packageEntries devel \ $developDir \ - $documentationDir \ $libDir/cmake + + packageEntries doc \ + $documentationDir } diff --git a/kde-frameworks/kholidays/kholidays6-6.9.0.recipe b/kde-frameworks/kholidays/kholidays6-6.11.0.recipe similarity index 86% rename from kde-frameworks/kholidays/kholidays6-6.9.0.recipe rename to kde-frameworks/kholidays/kholidays6-6.11.0.recipe index 9fb4ab928..f877079a0 100644 --- a/kde-frameworks/kholidays/kholidays6-6.9.0.recipe +++ b/kde-frameworks/kholidays/kholidays6-6.11.0.recipe @@ -6,7 +6,7 @@ COPYRIGHT="2010-2024 KDE Organisation" LICENSE="GNU LGPL v2" REVISION="1" SOURCE_URI="https://download.kde.org/stable/frameworks/${portVersion%.*}/kholidays-${portVersion}.tar.xz" -CHECKSUM_SHA256="b409eccbabfd6b29771953c6a0376e4f7e16c0d5336d5fe83b6f6b7a1f786e00" +CHECKSUM_SHA256="ccdbfab5eafc043574900d66e0022326f6048e7dcdb09bc538dedea99889c6af" SOURCE_DIR="kholidays-$portVersion" ARCHITECTURES="all !x86_gcc2" @@ -35,6 +35,15 @@ REQUIRES_devel=" kholidays6$secondaryArchSuffix == $portVersion base " +ARCHITECTURES_doc="any" + +PROVIDES_doc=" + kholidays6${secondaryArchSuffix}_doc = $portVersion + " +REQUIRES_doc=" + kholidays6$secondaryArchSuffix == $portVersion base + " + BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel extra_cmake_modules$secondaryArchSuffix @@ -56,9 +65,6 @@ BUILD_PREREQUIRES=" cmd:pkg_config$secondaryArchSuffix " -#defineDebugInfoPackage kholidays6$secondaryArchSuffix \ -# $libDir/libKF6Holidays.so.$libVersion - BUILD() { cmake -B build -S . -DCMAKE_BUILD_TYPE=Release \ @@ -66,7 +72,7 @@ BUILD() -DKDE_INSTALL_PLUGINDIR=$addOnsDir/Qt6 \ -DKDE_INSTALL_QMLDIR=$dataDir/Qt6/qml \ -DKDE_INSTALL_QTPLUGINDIR=$addOnsDir/Qt6 \ - -DKDE_INSTALL_QTQCHDIR=$documentationDir/packages/qt6 \ + -DKDE_INSTALL_QTQCHDIR=$documentationDir/packages/qt6_base \ -DECM_DIR=/system/data/cmake/Modules/ECM/cmake \ -DCMAKE_SKIP_RPATH=YES \ -DBUILD_QCH=ON \ @@ -84,8 +90,10 @@ INSTALL() packageEntries devel \ $developDir \ - $documentationDir \ $libDir/cmake + + packageEntries doc \ + $documentationDir } TEST() diff --git a/kde-frameworks/kimageformats/kimageformats6-6.9.0.recipe b/kde-frameworks/kimageformats/kimageformats6-6.11.0.recipe similarity index 94% rename from kde-frameworks/kimageformats/kimageformats6-6.9.0.recipe rename to kde-frameworks/kimageformats/kimageformats6-6.11.0.recipe index 24b0f8d5f..4f292200d 100644 --- a/kde-frameworks/kimageformats/kimageformats6-6.9.0.recipe +++ b/kde-frameworks/kimageformats/kimageformats6-6.11.0.recipe @@ -7,7 +7,7 @@ COPYRIGHT="2010-2024 KDE Organisation" LICENSE="GNU LGPL v2" REVISION="1" SOURCE_URI="https://download.kde.org/stable/frameworks/${portVersion%.*}/kimageformats-${portVersion}.tar.xz" -CHECKSUM_SHA256="8317dce66a773648c5c00f0a676156c4ee4e71d7c98540900c31b7b70a50f6df" +CHECKSUM_SHA256="0c45787f97d00fc0257f7de3250d84e950de2a332c45e7528138f7cf843154cc" SOURCE_DIR="kimageformats-$portVersion" ARCHITECTURES="all !x86_gcc2" @@ -57,6 +57,8 @@ BUILD_REQUIRES=" " BUILD_PREREQUIRES=" cmd:cmake + cmd:dot + cmd:doxygen cmd:g++$secondaryArchSuffix cmd:make cmd:msgfmt$secondaryArchSuffix @@ -68,6 +70,7 @@ TEST_REQUIRES=" qthaikuplugins " +# no Qt documentation (yet?) BUILD() { cmake -B build -S . -DCMAKE_BUILD_TYPE=Release \ @@ -79,6 +82,7 @@ BUILD() -DECM_DIR=/system/data/cmake/Modules/ECM/cmake \ -DCMAKE_SKIP_RPATH=YES \ -DKIMAGEFORMATS_HEIF=ON \ + -DBUILD_QCH=ON \ -DBUILD_TESTING=OFF \ -Wno-dev make -C build $jobArgs diff --git a/kde-frameworks/knotifyconfig/knotifyconfig6-6.9.0.recipe b/kde-frameworks/knotifyconfig/knotifyconfig6-6.11.0.recipe similarity index 90% rename from kde-frameworks/knotifyconfig/knotifyconfig6-6.9.0.recipe rename to kde-frameworks/knotifyconfig/knotifyconfig6-6.11.0.recipe index 7043c8266..12bdfaf9c 100644 --- a/kde-frameworks/knotifyconfig/knotifyconfig6-6.9.0.recipe +++ b/kde-frameworks/knotifyconfig/knotifyconfig6-6.11.0.recipe @@ -6,7 +6,7 @@ COPYRIGHT="2010-2024 KDE Organisation" LICENSE="GNU LGPL v2" REVISION="1" SOURCE_URI="https://download.kde.org/stable/frameworks/${portVersion%.*}/knotifyconfig-${portVersion}.tar.xz" -CHECKSUM_SHA256="19b030477e609ff576d2d80886733af209b5d0d2384dd1d11877cb9dc380a489" +CHECKSUM_SHA256="612511161758144a9d3d99d4f0a9eb75931c3f8af5966e045a088023ca1d0c6f" SOURCE_DIR="knotifyconfig-$portVersion" ARCHITECTURES="all !x86_gcc2" @@ -47,6 +47,15 @@ REQUIRES_devel=" knotifyconfig6$secondaryArchSuffix == $portVersion base " +ARCHITECTURES_doc="any" + +PROVIDES_doc=" + knotifyconfig6${secondaryArchSuffix}_doc = $portVersion + " +REQUIRES_doc=" + knotifyconfig6$secondaryArchSuffix == $portVersion base + " + BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel extra_cmake_modules$secondaryArchSuffix @@ -80,9 +89,6 @@ TEST_REQUIRES=" qthaikuplugins " -#defineDebugInfoPackage knotifyconfig6$secondaryArchSuffix \ -# $libDir/libKF6NotifyConfig.so.$libVersion - BUILD() { cmake -B build -S . -DCMAKE_BUILD_TYPE=Release \ @@ -90,7 +96,7 @@ BUILD() -DKDE_INSTALL_PLUGINDIR=$addOnsDir/Qt6 \ -DKDE_INSTALL_QMLDIR=$dataDir/Qt6/qml \ -DKDE_INSTALL_QTPLUGINDIR=$addOnsDir/Qt6 \ - -DKDE_INSTALL_QTQCHDIR=$documentationDir/packages/qt6 \ + -DKDE_INSTALL_QTQCHDIR=$documentationDir/packages/qt6_base \ -DECM_DIR=/system/data/cmake/Modules/ECM/cmake \ -DCMAKE_SKIP_RPATH=YES \ -DBUILD_QCH=ON \ @@ -108,8 +114,10 @@ INSTALL() packageEntries devel \ $developDir \ - $documentationDir \ $libDir/cmake + + packageEntries doc \ + $documentationDir } TEST() diff --git a/kde-frameworks/kpeople/kpeople6-6.9.0.recipe b/kde-frameworks/kpeople/kpeople6-6.11.0.recipe similarity index 89% rename from kde-frameworks/kpeople/kpeople6-6.9.0.recipe rename to kde-frameworks/kpeople/kpeople6-6.11.0.recipe index 7c6d0966c..a66d4c054 100644 --- a/kde-frameworks/kpeople/kpeople6-6.9.0.recipe +++ b/kde-frameworks/kpeople/kpeople6-6.11.0.recipe @@ -9,7 +9,7 @@ COPYRIGHT="2010-2024 KDE Organisation" LICENSE="GNU LGPL v2" REVISION="1" SOURCE_URI="https://download.kde.org/stable/frameworks/${portVersion%.*}/kpeople-${portVersion}.tar.xz" -CHECKSUM_SHA256="27ee5b5f865d309374a53d4086dee14cf4e02f99dd9ae6fae71a7e3e02ad7422" +CHECKSUM_SHA256="3f67af43442358e7b4d9a0a81d86133707ffaae0f5e05c48aa1f390ec47ff96b" SOURCE_DIR="kpeople-$portVersion" ARCHITECTURES="all !x86_gcc2" @@ -47,6 +47,15 @@ REQUIRES_devel=" kpeople6$secondaryArchSuffix == $portVersion base " +ARCHITECTURES_doc="any" + +PROVIDES_doc=" + kpeople6${secondaryArchSuffix}_doc = $portVersion + " +REQUIRES_doc=" + kpeople6$secondaryArchSuffix == $portVersion base + " + BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel extra_cmake_modules$secondaryArchSuffix @@ -72,11 +81,6 @@ BUILD_PREREQUIRES=" cmd:pkg_config$secondaryArchSuffix " -#defineDebugInfoPackage kpeople6$secondaryArchSuffix \ -# $libDir/libKF6People.so.$libVersion \ -# $libDir/libKF6PeopleBackend.so.$libVersion \ -# $libDir/libKF6PeopleWidgets.so.$libVersion - BUILD() { cmake -B build -S . -DCMAKE_BUILD_TYPE=Release \ @@ -84,7 +88,7 @@ BUILD() -DKDE_INSTALL_PLUGINDIR=$addOnsDir/Qt6 \ -DKDE_INSTALL_QMLDIR=$dataDir/Qt6/qml \ -DKDE_INSTALL_QTPLUGINDIR=$addOnsDir/Qt6 \ - -DKDE_INSTALL_QTQCHDIR=$documentationDir/packages/qt6 \ + -DKDE_INSTALL_QTQCHDIR=$documentationDir/packages/qt6_base \ -DECM_DIR=/system/data/cmake/Modules/ECM/cmake \ -DCMAKE_SKIP_RPATH=YES \ -DBUILD_QCH=ON \ @@ -103,9 +107,11 @@ INSTALL() libKF6PeopleWidgets packageEntries devel \ - $libDir/cmake \ - $documentationDir \ - $developDir + $developDir \ + $libDir/cmake + + packageEntries doc \ + $documentationDir } TEST() diff --git a/kde-frameworks/kplotting/kplotting6-6.9.0.recipe b/kde-frameworks/kplotting/kplotting6-6.11.0.recipe similarity index 86% rename from kde-frameworks/kplotting/kplotting6-6.9.0.recipe rename to kde-frameworks/kplotting/kplotting6-6.11.0.recipe index 9a3041d14..4dc28b944 100644 --- a/kde-frameworks/kplotting/kplotting6-6.9.0.recipe +++ b/kde-frameworks/kplotting/kplotting6-6.11.0.recipe @@ -9,7 +9,7 @@ COPYRIGHT="2010-2024 KDE Organisation" LICENSE="GNU LGPL v2" REVISION="1" SOURCE_URI="https://download.kde.org/stable/frameworks/${portVersion%.*}/kplotting-${portVersion}.tar.xz" -CHECKSUM_SHA256="5e1883d107de16ccd7a27323c5575bb1ec2fec22c44c9c3199b3de885f5c18f4" +CHECKSUM_SHA256="ceb915cc026cd20ff10e8fdb3e4914ea61f73686a2d9fe6a8839a5ead14a9892" SOURCE_DIR="kplotting-$portVersion" ARCHITECTURES="all !x86_gcc2" @@ -38,6 +38,15 @@ REQUIRES_devel=" kplotting6$secondaryArchSuffix == $portVersion base " +ARCHITECTURES_doc="any" + +PROVIDES_doc=" + kplotting6${secondaryArchSuffix}_doc = $portVersion + " +REQUIRES_doc=" + kplotting6$secondaryArchSuffix == $portVersion base + " + TEST_REQUIRES=" qthaikuplugins " @@ -59,9 +68,6 @@ BUILD_PREREQUIRES=" cmd:pkg_config$secondaryArchSuffix " -#defineDebugInfoPackage kplotting6$secondaryArchSuffix \ -# $libDir/libKF6Plotting.so.$libVersion - BUILD() { cmake -B build -S . -DCMAKE_BUILD_TYPE=Release \ @@ -69,7 +75,7 @@ BUILD() -DKDE_INSTALL_PLUGINDIR=$addOnsDir/Qt6 \ -DKDE_INSTALL_QMLDIR=$dataDir/Qt6/qml \ -DKDE_INSTALL_QTPLUGINDIR=$addOnsDir/Qt6 \ - -DKDE_INSTALL_QTQCHDIR=$documentationDir/packages/qt6 \ + -DKDE_INSTALL_QTQCHDIR=$documentationDir/packages/qt6_base \ -DECM_DIR=/system/data/cmake/Modules/ECM/cmake \ -DCMAKE_SKIP_RPATH=YES \ -DBUILD_QCH=ON \ @@ -87,8 +93,10 @@ INSTALL() packageEntries devel \ $developDir \ - $documentationDir \ $libDir/cmake + + packageEntries doc \ + $documentationDir } TEST() diff --git a/kde-frameworks/kquickcharts/kquickcharts6-6.9.0.recipe b/kde-frameworks/kquickcharts/kquickcharts6-6.11.0.recipe similarity index 90% rename from kde-frameworks/kquickcharts/kquickcharts6-6.9.0.recipe rename to kde-frameworks/kquickcharts/kquickcharts6-6.11.0.recipe index b1b949184..3946c97b8 100644 --- a/kde-frameworks/kquickcharts/kquickcharts6-6.9.0.recipe +++ b/kde-frameworks/kquickcharts/kquickcharts6-6.11.0.recipe @@ -9,7 +9,7 @@ COPYRIGHT="2010-2024 KDE Organisation" LICENSE="GNU LGPL v2" REVISION="1" SOURCE_URI="https://download.kde.org/stable/frameworks/${portVersion%.*}/kquickcharts-$portVersion.tar.xz" -CHECKSUM_SHA256="df17c336aeb885e0d533916bf5211910e4f0844f8bcc8b45423dd9a0a02839ef" +CHECKSUM_SHA256="ffc35a7b0dde52acdae508925a555b76006cc9d4b78eb003e9a31cd439f2993f" SOURCE_DIR="kquickcharts-$portVersion" ARCHITECTURES="all !x86_gcc2" @@ -66,10 +66,7 @@ TEST_REQUIRES=" qthaikuplugins " -#defineDebugInfoPackage kquickcharts6$secondaryArchSuffix \ -# $libDir/libQuickCharts.so.$libVersion \ -# $libDir/libQuickChartsControls.so.$libVersion - +# no Qt documentation (yet?) BUILD() { cmake -B build -S . -DCMAKE_BUILD_TYPE=Release \ @@ -77,7 +74,7 @@ BUILD() -DKDE_INSTALL_PLUGINDIR=$addOnsDir/Qt6 \ -DKDE_INSTALL_QMLDIR=$dataDir/Qt6/qml \ -DKDE_INSTALL_QTPLUGINDIR=$addOnsDir/Qt6 \ - -DKDE_INSTALL_QTQCHDIR=$documentationDir/packages/qt6 \ + -DKDE_INSTALL_QTQCHDIR=$documentationDir/packages/qt6_base \ -DECM_DIR=/system/data/cmake/Modules/ECM/cmake \ -DCMAKE_SKIP_RPATH=YES \ -DBUILD_QCH=ON \