From 5e8ab67f9be75738ea0e7ce551f09b06731b3361 Mon Sep 17 00:00:00 2001 From: Schrijvers Luc Date: Mon, 16 Dec 2024 19:12:07 +0100 Subject: [PATCH] KF6 frameworks, bump to 6.9.0 Part6 (#11458) --- ...{kdav6-6.7.0.recipe => kdav6-6.9.0.recipe} | 35 ++++-------- ....7.0.recipe => kdeclarative6-6.9.0.recipe} | 23 ++++---- ...desu6-6.7.0.recipe => kdesu6-6.9.0.recipe} | 20 +++---- ...su-6.7.0.patchset => kdesu-6.9.0.patchset} | 16 +++--- ...ssd6-6.7.0.recipe => kdnssd6-6.9.0.recipe} | 12 ++--- ...6-6.7.0.recipe => kholidays6-6.9.0.recipe} | 12 ++--- ...7.0.recipe => kimageformats6-6.9.0.recipe} | 28 +++++----- ...7.0.recipe => knotifyconfig6-6.9.0.recipe} | 47 ++++++---------- ...le6-6.7.0.recipe => kpeople6-6.9.0.recipe} | 54 ++++++------------- ...6-6.7.0.recipe => kplotting6-6.9.0.recipe} | 12 ++--- ....7.0.recipe => kquickcharts6-6.9.0.recipe} | 23 ++++---- 11 files changed, 113 insertions(+), 169 deletions(-) rename kde-frameworks/kdav/{kdav6-6.7.0.recipe => kdav6-6.9.0.recipe} (66%) rename kde-frameworks/kdeclarative/{kdeclarative6-6.7.0.recipe => kdeclarative6-6.9.0.recipe} (77%) rename kde-frameworks/kdesu/{kdesu6-6.7.0.recipe => kdesu6-6.9.0.recipe} (80%) rename kde-frameworks/kdesu/patches/{kdesu-6.7.0.patchset => kdesu-6.9.0.patchset} (89%) rename kde-frameworks/kdnssd/{kdnssd6-6.7.0.recipe => kdnssd6-6.9.0.recipe} (85%) rename kde-frameworks/kholidays/{kholidays6-6.7.0.recipe => kholidays6-6.9.0.recipe} (86%) rename kde-frameworks/kimageformats/{kimageformats6-6.7.0.recipe => kimageformats6-6.9.0.recipe} (78%) rename kde-frameworks/knotifyconfig/{knotifyconfig6-6.7.0.recipe => knotifyconfig6-6.9.0.recipe} (62%) rename kde-frameworks/kpeople/{kpeople6-6.7.0.recipe => kpeople6-6.9.0.recipe} (59%) rename kde-frameworks/kplotting/{kplotting6-6.7.0.recipe => kplotting6-6.9.0.recipe} (87%) rename kde-frameworks/kquickcharts/{kquickcharts6-6.7.0.recipe => kquickcharts6-6.9.0.recipe} (80%) diff --git a/kde-frameworks/kdav/kdav6-6.7.0.recipe b/kde-frameworks/kdav/kdav6-6.9.0.recipe similarity index 66% rename from kde-frameworks/kdav/kdav6-6.7.0.recipe rename to kde-frameworks/kdav/kdav6-6.9.0.recipe index 975299c2d..cfee8e599 100644 --- a/kde-frameworks/kdav/kdav6-6.7.0.recipe +++ b/kde-frameworks/kdav/kdav6-6.9.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="6629f2af0042eb1e0dc0c08b5180ac7b48dae6b5999e1dd0b678aed8b874c1d7" +CHECKSUM_SHA256="5ac5818e89bc9e8119f10a46bc3c8e54878db4e9a12c3a07481debc8d536cbd3" SOURCE_DIR="kdav-$portVersion" ARCHITECTURES="all !x86_gcc2" @@ -24,12 +24,9 @@ PROVIDES=" REQUIRES=" haiku$secondaryArchSuffix lib:libGL$secondaryArchSuffix - lib:libKF6ConfigCore$secondaryArchSuffix lib:libKF6CoreAddons$secondaryArchSuffix lib:libKF6I18n$secondaryArchSuffix lib:libKF6KIOCore$secondaryArchSuffix - lib:libKF6Service$secondaryArchSuffix - lib:libQt6Core$secondaryArchSuffix lib:libQt6DBus$secondaryArchSuffix lib:libQt6Gui$secondaryArchSuffix lib:libQt6Network$secondaryArchSuffix @@ -46,26 +43,12 @@ REQUIRES_devel=" BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel - extra_cmake_modules$secondaryArchSuffix >= $portVersion + extra_cmake_modules$secondaryArchSuffix qt6_tools${secondaryArchSuffix}_devel - devel:libKF6AuthCore$secondaryArchSuffix - devel:libKF6Bookmarks$secondaryArchSuffix - devel:libKF6Codecs$secondaryArchSuffix - devel:libKF6Completion$secondaryArchSuffix - devel:libKF6ConfigCore$secondaryArchSuffix - devel:libKF6ConfigWidgets$secondaryArchSuffix - devel:libKF6CoreAddons$secondaryArchSuffix == $portVersion - devel:libKF6I18n$secondaryArchSuffix == $portVersion - devel:libKF6KIOCore$secondaryArchSuffix == $portVersion - devel:libKF6ItemViews$secondaryArchSuffix - devel:libKF6JobWidgets$secondaryArchSuffix - devel:libKF6Service$secondaryArchSuffix - devel:libKF6Solid$secondaryArchSuffix - devel:libKF6WidgetsAddons$secondaryArchSuffix - devel:libKF6WindowSystem$secondaryArchSuffix - devel:libKF6XmlGui$secondaryArchSuffix + devel:libKF6CoreAddons$secondaryArchSuffix == $libVersion + devel:libKF6I18n$secondaryArchSuffix == $libVersion + devel:libKF6KIOCore$secondaryArchSuffix == $libVersion devel:libQt6Core$secondaryArchSuffix - devel:libQt6DBus$secondaryArchSuffix devel:libQt6Qml$secondaryArchSuffix " BUILD_PREREQUIRES=" @@ -83,19 +66,19 @@ TEST_REQUIRES=" qthaikuplugins$secondaryArchSuffix " -defineDebugInfoPackage kdav6$secondaryArchSuffix \ - $libDir/libKF6DAV.so.$libVersion +#defineDebugInfoPackage kdav6$secondaryArchSuffix \ +# $libDir/libKF6DAV.so.$libVersion BUILD() { - cmake -B build -S . -DCMAKE_BUILD_TYPE=RelWithDebInfo \ + cmake -B build -S . -DCMAKE_BUILD_TYPE=Release \ $cmakeDirArgs \ -DKDE_INSTALL_PLUGINDIR=$addOnsDir/Qt6 \ -DKDE_INSTALL_QMLDIR=$dataDir/Qt6/qml \ -DKDE_INSTALL_QTPLUGINDIR=$addOnsDir/Qt6 \ -DKDE_INSTALL_QTQCHDIR=$documentationDir/packages/qt6 \ - -DECM_MKSPECS_INSTALL_DIR=$dataDir/Qt6/mkspecs \ -DECM_DIR=/system/data/cmake/Modules/ECM/cmake \ + -DCMAKE_SKIP_RPATH=YES \ -DBUILD_QCH=ON \ -DBUILD_TESTING=OFF \ -Wno-dev diff --git a/kde-frameworks/kdeclarative/kdeclarative6-6.7.0.recipe b/kde-frameworks/kdeclarative/kdeclarative6-6.9.0.recipe similarity index 77% rename from kde-frameworks/kdeclarative/kdeclarative6-6.7.0.recipe rename to kde-frameworks/kdeclarative/kdeclarative6-6.9.0.recipe index fe052e996..9db6b0971 100644 --- a/kde-frameworks/kdeclarative/kdeclarative6-6.7.0.recipe +++ b/kde-frameworks/kdeclarative/kdeclarative6-6.9.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%.*}/kdeclarative-${portVersion}.tar.xz" -CHECKSUM_SHA256="f1f804f6bac2b229503cfd165ebd8ae093533888ae15e0e61474c6e328d535b9" +CHECKSUM_SHA256="1a266dd2a2912ffe632e455d823a76c9dbfb44977c07838bc44e457e5bec98eb" SOURCE_DIR="kdeclarative-$portVersion" ARCHITECTURES="all !x86_gcc2" @@ -36,16 +36,15 @@ REQUIRES_devel=" BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel - extra_cmake_modules$secondaryArchSuffix >= $portVersion + extra_cmake_modules$secondaryArchSuffix qt6_tools${secondaryArchSuffix}_devel - devel:libKF6ConfigCore$secondaryArchSuffix == $portVersion - devel:libKF6GlobalAccel$secondaryArchSuffix == $portVersion - devel:libKF6GuiAddons$secondaryArchSuffix == $portVersion - devel:libKF6I18n$secondaryArchSuffix == $portVersion - devel:libKF6WidgetsAddons$secondaryArchSuffix == $portVersion + devel:libKF6ConfigCore$secondaryArchSuffix == $libVersion + devel:libKF6GlobalAccel$secondaryArchSuffix == $libVersion + devel:libKF6GuiAddons$secondaryArchSuffix == $libVersion + devel:libKF6I18n$secondaryArchSuffix == $libVersion + devel:libKF6WidgetsAddons$secondaryArchSuffix == $libVersion devel:libQt6Core$secondaryArchSuffix devel:libQt6Qml$secondaryArchSuffix - devel:libQt6Quick$secondaryArchSuffix devel:libQt6ShaderTools$secondaryArchSuffix " BUILD_PREREQUIRES=" @@ -63,19 +62,19 @@ TEST_REQUIRES=" qthaikuplugins$secondaryArchSuffix " -defineDebugInfoPackage kdeclarative6$secondaryArchSuffix \ - $libDir/libKF6CalendarEvents.so.$libVersion +#defineDebugInfoPackage kdeclarative6$secondaryArchSuffix \ +# $libDir/libKF6CalendarEvents.so.$libVersion BUILD() { - cmake -B build -S . -DCMAKE_BUILD_TYPE=RelWithDebInfo \ + cmake -B build -S . -DCMAKE_BUILD_TYPE=Release \ $cmakeDirArgs \ -DKDE_INSTALL_PLUGINDIR=$addOnsDir/Qt6 \ -DKDE_INSTALL_QMLDIR=$dataDir/Qt6/qml \ -DKDE_INSTALL_QTPLUGINDIR=$addOnsDir/Qt6 \ -DKDE_INSTALL_QTQCHDIR=$documentationDir/packages/qt6 \ - -DECM_MKSPECS_INSTALL_DIR=$dataDir/Qt6/mkspecs \ -DECM_DIR=/system/data/cmake/Modules/ECM/cmake \ + -DCMAKE_SKIP_RPATH=YES \ -DBUILD_QCH=ON \ -DBUILD_TESTING=OFF \ -Wno-dev diff --git a/kde-frameworks/kdesu/kdesu6-6.7.0.recipe b/kde-frameworks/kdesu/kdesu6-6.9.0.recipe similarity index 80% rename from kde-frameworks/kdesu/kdesu6-6.7.0.recipe rename to kde-frameworks/kdesu/kdesu6-6.9.0.recipe index 2be4816a2..a689af546 100644 --- a/kde-frameworks/kdesu/kdesu6-6.7.0.recipe +++ b/kde-frameworks/kdesu/kdesu6-6.9.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="41091ea45c6e22e1411d89d1538b2c8bd98bdc1f38d59df3e9c423aac0224e28" +CHECKSUM_SHA256="1a84a461371ed0984e7ab225c974e80e5f1afb70dfce57582a9b67cdb40ed1ba" SOURCE_DIR="kdesu-$portVersion" PATCHES="kdesu-$portVersion.patchset" @@ -40,12 +40,12 @@ REQUIRES_devel=" BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel - extra_cmake_modules$secondaryArchSuffix >= $portVersion + extra_cmake_modules$secondaryArchSuffix qt6_tools${secondaryArchSuffix}_devel - devel:libKF6ConfigCore$secondaryArchSuffix == $portVersion - devel:libKF6CoreAddons$secondaryArchSuffix == $portVersion - devel:libKF6I18n$secondaryArchSuffix == $portVersion - devel:libKF6Pty$secondaryArchSuffix == $portVersion + devel:libKF6ConfigCore$secondaryArchSuffix == $libVersion + devel:libKF6CoreAddons$secondaryArchSuffix == $libVersion + devel:libKF6I18n$secondaryArchSuffix == $libVersion + devel:libKF6Pty$secondaryArchSuffix == $libVersion devel:libQt6Core$secondaryArchSuffix devel:libQt6Qml$secondaryArchSuffix " @@ -60,20 +60,20 @@ BUILD_PREREQUIRES=" cmd:pkg_config$secondaryArchSuffix " -defineDebugInfoPackage kdesu6$secondaryArchSuffix \ - $libDir/libKF6Su.so.$libVersion +#defineDebugInfoPackage kdesu6$secondaryArchSuffix \ +# $libDir/libKF6Su.so.$libVersion BUILD() { - cmake -B build -S . -DCMAKE_BUILD_TYPE=RelWithDebInfo \ + cmake -B build -S . -DCMAKE_BUILD_TYPE=Release \ $cmakeDirArgs \ -DKDE_INSTALL_PLUGINDIR=$addOnsDir/Qt6 \ -DKDE_INSTALL_QMLDIR=$dataDir/Qt6/qml \ -DKDE_INSTALL_QTPLUGINDIR=$addOnsDir/Qt6 \ -DKDE_INSTALL_QTQCHDIR=$documentationDir/packages/qt6 \ - -DECM_MKSPECS_INSTALL_DIR=$dataDir/Qt6/mkspecs \ -DECM_DIR=/system/data/cmake/Modules/ECM/cmake \ -DKDESU_USE_SUDO_DEFAULT=OFF \ + -DCMAKE_SKIP_RPATH=YES \ -DBUILD_QCH=ON \ -DBUILD_TESTING=OFF \ -Wno-dev diff --git a/kde-frameworks/kdesu/patches/kdesu-6.7.0.patchset b/kde-frameworks/kdesu/patches/kdesu-6.9.0.patchset similarity index 89% rename from kde-frameworks/kdesu/patches/kdesu-6.7.0.patchset rename to kde-frameworks/kdesu/patches/kdesu-6.9.0.patchset index e5cceb4f7..ff32f8c91 100644 --- a/kde-frameworks/kdesu/patches/kdesu-6.7.0.patchset +++ b/kde-frameworks/kdesu/patches/kdesu-6.9.0.patchset @@ -1,4 +1,4 @@ -From 7b39a13e3ace3efd238ccb36830bf150bfbbca5e Mon Sep 17 00:00:00 2001 +From 0356589c8ab830219b458a874bcb53c38ce2af24 Mon Sep 17 00:00:00 2001 From: Schrijvers Luc Date: Thu, 7 Mar 2024 17:55:01 +0100 Subject: Build fixes @@ -79,25 +79,23 @@ index 0d8598d..4b33595 100644 2.45.2 -From 9c2e4ee063037abb12a69683e3455c70f53aeaa5 Mon Sep 17 00:00:00 2001 +From 916b4edc2f101bfc91cc0487520f59a7e5fb857a Mon Sep 17 00:00:00 2001 From: Schrijvers Luc -Date: Fri, 17 May 2024 15:57:31 +0200 +Date: Tue, 12 Nov 2024 10:07:00 +0100 Subject: Link with libnetwork +Undefined references to socket/setsockopt/getsockopt,recv diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index d941c83..da02af1 100644 +index a72ecd5..769850f 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt -@@ -72,6 +72,12 @@ target_link_libraries(KF6Su +@@ -72,6 +72,9 @@ target_link_libraries(KF6Su KF6::ConfigCore # KConfigGroup ) +if(HAIKU) -+target_link_libraries(KF6Su -+ PRIVATE -+ network -+) ++target_link_libraries(KF6Su PRIVATE network) +endif() ecm_generate_headers(KDESu_CamelCase_HEADERS diff --git a/kde-frameworks/kdnssd/kdnssd6-6.7.0.recipe b/kde-frameworks/kdnssd/kdnssd6-6.9.0.recipe similarity index 85% rename from kde-frameworks/kdnssd/kdnssd6-6.7.0.recipe rename to kde-frameworks/kdnssd/kdnssd6-6.9.0.recipe index 9157aa1e4..e52146aad 100644 --- a/kde-frameworks/kdnssd/kdnssd6-6.7.0.recipe +++ b/kde-frameworks/kdnssd/kdnssd6-6.9.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="e9140475fc6e4ee1e0fe39a21816a3c003fcb1092222079f422fd02ad2a902a1" +CHECKSUM_SHA256="527c5659f44097fbeb53c2bf336d2a035fbf28535f7491662c6758259e1e765a" SOURCE_DIR="kdnssd-$portVersion" ARCHITECTURES="all !x86_gcc2" @@ -37,7 +37,7 @@ REQUIRES_devel=" BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel - extra_cmake_modules$secondaryArchSuffix >= $portVersion + extra_cmake_modules$secondaryArchSuffix qt6_tools${secondaryArchSuffix}_devel devel:libdns_sd$secondaryArchSuffix devel:libQt6Core$secondaryArchSuffix @@ -53,19 +53,19 @@ BUILD_PREREQUIRES=" cmd:pkg_config$secondaryArchSuffix " -defineDebugInfoPackage kdnssd6$secondaryArchSuffix \ - $libDir/libKF6DNSSD.so.$libVersion +#defineDebugInfoPackage kdnssd6$secondaryArchSuffix \ +# $libDir/libKF6DNSSD.so.$libVersion BUILD() { - cmake -B build -S . -DCMAKE_BUILD_TYPE=RelWithDebInfo \ + cmake -B build -S . -DCMAKE_BUILD_TYPE=Release \ $cmakeDirArgs \ -DKDE_INSTALL_PLUGINDIR=$addOnsDir/Qt6 \ -DKDE_INSTALL_QMLDIR=$dataDir/Qt6/qml \ -DKDE_INSTALL_QTPLUGINDIR=$addOnsDir/Qt6 \ -DKDE_INSTALL_QTQCHDIR=$documentationDir/packages/qt6 \ - -DECM_MKSPECS_INSTALL_DIR=$dataDir/Qt6/mkspecs \ -DECM_DIR=/system/data/cmake/Modules/ECM/cmake \ + -DCMAKE_SKIP_RPATH=YES \ -DBUILD_QCH=ON \ -DBUILD_TESTING=OFF \ -Wno-dev diff --git a/kde-frameworks/kholidays/kholidays6-6.7.0.recipe b/kde-frameworks/kholidays/kholidays6-6.9.0.recipe similarity index 86% rename from kde-frameworks/kholidays/kholidays6-6.7.0.recipe rename to kde-frameworks/kholidays/kholidays6-6.9.0.recipe index c973ecfc3..9fb4ab928 100644 --- a/kde-frameworks/kholidays/kholidays6-6.7.0.recipe +++ b/kde-frameworks/kholidays/kholidays6-6.9.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="2b543dfdeb6a52f4101fdf9f14802dd759d0a9fff060ea371f1f3b900dd335ab" +CHECKSUM_SHA256="b409eccbabfd6b29771953c6a0376e4f7e16c0d5336d5fe83b6f6b7a1f786e00" SOURCE_DIR="kholidays-$portVersion" ARCHITECTURES="all !x86_gcc2" @@ -37,7 +37,7 @@ REQUIRES_devel=" BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel - extra_cmake_modules$secondaryArchSuffix >= $portVersion + extra_cmake_modules$secondaryArchSuffix qt6_tools${secondaryArchSuffix}_devel devel:libbz2$secondaryArchSuffix devel:liblzma$secondaryArchSuffix @@ -56,19 +56,19 @@ BUILD_PREREQUIRES=" cmd:pkg_config$secondaryArchSuffix " -defineDebugInfoPackage kholidays6$secondaryArchSuffix \ - $libDir/libKF6Holidays.so.$libVersion +#defineDebugInfoPackage kholidays6$secondaryArchSuffix \ +# $libDir/libKF6Holidays.so.$libVersion BUILD() { - cmake -B build -S . -DCMAKE_BUILD_TYPE=RelWithDebInfo \ + cmake -B build -S . -DCMAKE_BUILD_TYPE=Release \ $cmakeDirArgs \ -DKDE_INSTALL_PLUGINDIR=$addOnsDir/Qt6 \ -DKDE_INSTALL_QMLDIR=$dataDir/Qt6/qml \ -DKDE_INSTALL_QTPLUGINDIR=$addOnsDir/Qt6 \ -DKDE_INSTALL_QTQCHDIR=$documentationDir/packages/qt6 \ - -DECM_MKSPECS_INSTALL_DIR=$dataDir/Qt6/mkspecs \ -DECM_DIR=/system/data/cmake/Modules/ECM/cmake \ + -DCMAKE_SKIP_RPATH=YES \ -DBUILD_QCH=ON \ -DBUILD_TESTING=OFF \ -Wno-dev diff --git a/kde-frameworks/kimageformats/kimageformats6-6.7.0.recipe b/kde-frameworks/kimageformats/kimageformats6-6.9.0.recipe similarity index 78% rename from kde-frameworks/kimageformats/kimageformats6-6.7.0.recipe rename to kde-frameworks/kimageformats/kimageformats6-6.9.0.recipe index f21815624..24b0f8d5f 100644 --- a/kde-frameworks/kimageformats/kimageformats6-6.7.0.recipe +++ b/kde-frameworks/kimageformats/kimageformats6-6.9.0.recipe @@ -7,19 +7,22 @@ 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="722850648ac167e4c0ee631571fde49e9fd15d004a127dd804a14f9f579b731f" +CHECKSUM_SHA256="8317dce66a773648c5c00f0a676156c4ee4e71d7c98540900c31b7b70a50f6df" SOURCE_DIR="kimageformats-$portVersion" ARCHITECTURES="all !x86_gcc2" SECONDARY_ARCHITECTURES="x86" +libVersion="$portVersion" + PROVIDES=" kimageformats6$secondaryArchSuffix = $portVersion " REQUIRES=" haiku$secondaryArchSuffix lib:libavif$secondaryArchSuffix -# lib:libjxl$secondaryArchSuffix + lib:libheif$secondaryArchSuffix + lib:libjxl$secondaryArchSuffix lib:liblcms2$secondaryArchSuffix lib:libKF6Archive$secondaryArchSuffix lib:libKF6ConfigCore$secondaryArchSuffix @@ -35,19 +38,20 @@ REQUIRES=" BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel - extra_cmake_modules$secondaryArchSuffix >= $portVersion + extra_cmake_modules$secondaryArchSuffix devel:libavif$secondaryArchSuffix >= 16 -# devel:libbrotlicommon$secondaryArchSuffix -# devel:libheif$secondaryArchSuffix -# devel:libhwy$secondaryArchSuffix -# devel:libjxl$secondaryArchSuffix + devel:libbrotlienc$secondaryArchSuffix + devel:libheif$secondaryArchSuffix + devel:libhwy$secondaryArchSuffix + devel:libImath_3_1$secondaryArchSuffix + devel:libjxl$secondaryArchSuffix >= 0.11 devel:liblcms2$secondaryArchSuffix - devel:libKF6Archive$secondaryArchSuffix == $portVersion + devel:libKF6Archive$secondaryArchSuffix == $libVersion devel:libOpenEXR_3_2$secondaryArchSuffix + devel:libOpenEXRUtil_3_2$secondaryArchSuffix devel:libQt6Core$secondaryArchSuffix devel:librav1e$secondaryArchSuffix devel:libraw$secondaryArchSuffix -# devel:libtiff$secondaryArchSuffix >= 6 devel:libsharpyuv$secondaryArchSuffix devel:libz$secondaryArchSuffix " @@ -66,15 +70,15 @@ TEST_REQUIRES=" BUILD() { - cmake -B build -S . -DCMAKE_BUILD_TYPE=RelWithDebInfo \ + cmake -B build -S . -DCMAKE_BUILD_TYPE=Release \ $cmakeDirArgs \ -DKDE_INSTALL_PLUGINDIR=$addOnsDir/Qt6 \ -DKDE_INSTALL_QMLDIR=$dataDir/Qt6/qml \ -DKDE_INSTALL_QTPLUGINDIR=$addOnsDir/Qt6 \ -DKDE_INSTALL_QTQCHDIR=$documentationDir/packages/qt6 \ - -DECM_MKSPECS_INSTALL_DIR=$dataDir/Qt6/mkspecs \ -DECM_DIR=/system/data/cmake/Modules/ECM/cmake \ - -DBUILD_QCH=ON \ + -DCMAKE_SKIP_RPATH=YES \ + -DKIMAGEFORMATS_HEIF=ON \ -DBUILD_TESTING=OFF \ -Wno-dev make -C build $jobArgs diff --git a/kde-frameworks/knotifyconfig/knotifyconfig6-6.7.0.recipe b/kde-frameworks/knotifyconfig/knotifyconfig6-6.9.0.recipe similarity index 62% rename from kde-frameworks/knotifyconfig/knotifyconfig6-6.7.0.recipe rename to kde-frameworks/knotifyconfig/knotifyconfig6-6.9.0.recipe index 6f33b93ef..7043c8266 100644 --- a/kde-frameworks/knotifyconfig/knotifyconfig6-6.7.0.recipe +++ b/kde-frameworks/knotifyconfig/knotifyconfig6-6.9.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="4227da7a18f9ba83b34bf54b6d3fc168dc0726bca149d2f89585bb54ab138295" +CHECKSUM_SHA256="19b030477e609ff576d2d80886733af209b5d0d2384dd1d11877cb9dc380a489" SOURCE_DIR="knotifyconfig-$portVersion" ARCHITECTURES="all !x86_gcc2" @@ -32,9 +32,7 @@ REQUIRES=" lib:libKF6Solid$secondaryArchSuffix lib:libKF6WidgetsAddons$secondaryArchSuffix lib:libopenal$secondaryArchSuffix - lib:libphonon4Qt6$secondaryArchSuffix lib:libQt6Core$secondaryArchSuffix - lib:libQt6DBus$secondaryArchSuffix lib:libQt6Gui$secondaryArchSuffix lib:libQt6Multimedia$secondaryArchSuffix lib:libQt6Network$secondaryArchSuffix @@ -51,34 +49,21 @@ REQUIRES_devel=" BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel - extra_cmake_modules$secondaryArchSuffix >= $portVersion + extra_cmake_modules$secondaryArchSuffix qt6_tools${secondaryArchSuffix}_devel - devel:libKF6Bookmarks$secondaryArchSuffix == $portVersion - devel:libKF6Codecs$secondaryArchSuffix == $portVersion - devel:libKF6ColorScheme$secondaryArchSuffix == $portVersion - devel:libKF6Completion$secondaryArchSuffix == $portVersion - devel:libKF6ConfigCore$secondaryArchSuffix == $portVersion - devel:libKF6ConfigWidgets$secondaryArchSuffix == $portVersion - devel:libKF6CoreAddons$secondaryArchSuffix == $portVersion - devel:libKF6I18n$secondaryArchSuffix == $portVersion - devel:libKF6ItemViews$secondaryArchSuffix == $portVersion - devel:libKF6JobWidgets$secondaryArchSuffix == $portVersion - devel:libKF6KIOCore$secondaryArchSuffix == $portVersion - devel:libKF6Notifications$secondaryArchSuffix == $portVersion - devel:libKF6Service$secondaryArchSuffix == $portVersion - devel:libKF6Solid$secondaryArchSuffix == $portVersion - devel:libKF6WidgetsAddons$secondaryArchSuffix == $portVersion - devel:libKF6WindowSystem$secondaryArchSuffix == $portVersion - devel:libKF6XmlGui$secondaryArchSuffix == $portVersion - devel:libphonon4Qt6$secondaryArchSuffix + devel:libKF6Completion$secondaryArchSuffix == $libVersion + devel:libKF6ConfigCore$secondaryArchSuffix == $libVersion + devel:libKF6CoreAddons$secondaryArchSuffix == $libVersion + devel:libKF6I18n$secondaryArchSuffix == $libVersion + devel:libKF6KIOCore$secondaryArchSuffix == $libVersion devel:libQt6Core$secondaryArchSuffix - devel:libQt6Dbus$secondaryArchSuffix - devel:libQt6Gui$secondaryArchSuffix devel:libQt6Multimedia$secondaryArchSuffix devel:libQt6Qml$secondaryArchSuffix - devel:libQt6Quick$secondaryArchSuffix - devel:libQt6QuickTest$secondaryArchSuffix - devel:libQt6Widgets$secondaryArchSuffix + # for test case + devel:libKF6ConfigWidgets$secondaryArchSuffix == $libVersion + devel:libKF6ColorScheme$secondaryArchSuffix == $libVersion + devel:libKF6Notifications$secondaryArchSuffix == $libVersion + devel:libKF6XmlGui$secondaryArchSuffix == $libVersion " BUILD_PREREQUIRES=" cmd:cmake @@ -95,19 +80,19 @@ TEST_REQUIRES=" qthaikuplugins " -defineDebugInfoPackage knotifyconfig6$secondaryArchSuffix \ - $libDir/libKF6NotifyConfig.so.$libVersion +#defineDebugInfoPackage knotifyconfig6$secondaryArchSuffix \ +# $libDir/libKF6NotifyConfig.so.$libVersion BUILD() { - cmake -B build -S . -DCMAKE_BUILD_TYPE=RelWithDebInfo \ + cmake -B build -S . -DCMAKE_BUILD_TYPE=Release \ $cmakeDirArgs \ -DKDE_INSTALL_PLUGINDIR=$addOnsDir/Qt6 \ -DKDE_INSTALL_QMLDIR=$dataDir/Qt6/qml \ -DKDE_INSTALL_QTPLUGINDIR=$addOnsDir/Qt6 \ -DKDE_INSTALL_QTQCHDIR=$documentationDir/packages/qt6 \ - -DECM_MKSPECS_INSTALL_DIR=$dataDir/Qt6/mkspecs \ -DECM_DIR=/system/data/cmake/Modules/ECM/cmake \ + -DCMAKE_SKIP_RPATH=YES \ -DBUILD_QCH=ON \ -DBUILD_TESTING=OFF \ -Wno-dev diff --git a/kde-frameworks/kpeople/kpeople6-6.7.0.recipe b/kde-frameworks/kpeople/kpeople6-6.9.0.recipe similarity index 59% rename from kde-frameworks/kpeople/kpeople6-6.7.0.recipe rename to kde-frameworks/kpeople/kpeople6-6.9.0.recipe index b61d4d8c4..7c6d0966c 100644 --- a/kde-frameworks/kpeople/kpeople6-6.7.0.recipe +++ b/kde-frameworks/kpeople/kpeople6-6.9.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="d36246bac50f5bf406f683fe61c92cb5e623a51de9ffed1104665e5f135ef888" +CHECKSUM_SHA256="27ee5b5f865d309374a53d4086dee14cf4e02f99dd9ae6fae71a7e3e02ad7422" SOURCE_DIR="kpeople-$portVersion" ARCHITECTURES="all !x86_gcc2" @@ -27,29 +27,14 @@ PROVIDES=" REQUIRES=" haiku$secondaryArchSuffix lib:libGL$secondaryArchSuffix - lib:libKF6AuthCore$secondaryArchSuffix - lib:libKF6CalendarCore$secondaryArchSuffix - lib:libKF6Codecs$secondaryArchSuffix - lib:libKF6ConfigCore$secondaryArchSuffix - lib:libKF6ConfigGui$secondaryArchSuffix - lib:libKF6ConfigWidgets$secondaryArchSuffix lib:libKF6CoreAddons$secondaryArchSuffix lib:libKF6I18n$secondaryArchSuffix - lib:libKF6IconThemes$secondaryArchSuffix lib:libKF6ItemViews$secondaryArchSuffix - lib:libKF6Package$secondaryArchSuffix - lib:libKF6Service$secondaryArchSuffix lib:libKF6WidgetsAddons$secondaryArchSuffix - lib:libKF6XmlGui$secondaryArchSuffix lib:libQt6Core$secondaryArchSuffix -# lib:libQt6DBus$secondaryArchSuffix lib:libQt6Gui$secondaryArchSuffix - lib:libQt6Network$secondaryArchSuffix - lib:libQt6Qml$secondaryArchSuffix - lib:libQt6Quick$secondaryArchSuffix - lib:libQt6QuickWidgets$secondaryArchSuffix + lib:libQt6Sql$secondaryArchSuffix lib:libQt6Widgets$secondaryArchSuffix - lib:libQt6Xml$secondaryArchSuffix " PROVIDES_devel=" @@ -64,22 +49,15 @@ REQUIRES_devel=" BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel - extra_cmake_modules$secondaryArchSuffix >= $portVersion + extra_cmake_modules$secondaryArchSuffix qt6_tools${secondaryArchSuffix}_devel - devel:libKF6AuthCore$secondaryArchSuffix == $portVersion - devel:libKF6CalendarCore$secondaryArchSuffix == $portVersion - devel:libKF6Codecs$secondaryArchSuffix == $portVersion - devel:libKF6ConfigCore$secondaryArchSuffix == $portVersion - devel:libKF6ConfigWidgets$secondaryArchSuffix == $portVersion - devel:libKF6Contacts$secondaryArchSuffix == $portVersion - devel:libKF6CoreAddons$secondaryArchSuffix == $portVersion - devel:libKF6I18n$secondaryArchSuffix == $portVersion - devel:libKF6Iconthemes$secondaryArchSuffix == $portVersion - devel:libKF6ItemViews$secondaryArchSuffix == $portVersion - devel:libKF6Package$secondaryArchSuffix == $portVersion - devel:libKF6Service$secondaryArchSuffix == $portVersion - devel:libKF6WidgetsAddons$secondaryArchSuffix == $portVersion - devel:libKF6XmlGui$secondaryArchSuffix == $portVersion + devel:libKF6Codecs$secondaryArchSuffix == $libVersion + devel:libKF6ConfigCore$secondaryArchSuffix == $libVersion + devel:libKF6Contacts$secondaryArchSuffix == $libVersion + devel:libKF6CoreAddons$secondaryArchSuffix == $libVersion + devel:libKF6I18n$secondaryArchSuffix == $libVersion + devel:libKF6ItemViews$secondaryArchSuffix == $libVersion + devel:libKF6WidgetsAddons$secondaryArchSuffix == $libVersion devel:libQt6Core$secondaryArchSuffix devel:libQt6Qml$secondaryArchSuffix " @@ -94,21 +72,21 @@ BUILD_PREREQUIRES=" cmd:pkg_config$secondaryArchSuffix " -defineDebugInfoPackage kpeople6$secondaryArchSuffix \ - $libDir/libKF6People.so.$libVersion \ - $libDir/libKF6PeopleBackend.so.$libVersion \ - $libDir/libKF6PeopleWidgets.so.$libVersion +#defineDebugInfoPackage kpeople6$secondaryArchSuffix \ +# $libDir/libKF6People.so.$libVersion \ +# $libDir/libKF6PeopleBackend.so.$libVersion \ +# $libDir/libKF6PeopleWidgets.so.$libVersion BUILD() { - cmake -B build -S . -DCMAKE_BUILD_TYPE=RelWithDebInfo \ + cmake -B build -S . -DCMAKE_BUILD_TYPE=Release \ $cmakeDirArgs \ -DKDE_INSTALL_PLUGINDIR=$addOnsDir/Qt6 \ -DKDE_INSTALL_QMLDIR=$dataDir/Qt6/qml \ -DKDE_INSTALL_QTPLUGINDIR=$addOnsDir/Qt6 \ -DKDE_INSTALL_QTQCHDIR=$documentationDir/packages/qt6 \ - -DECM_MKSPECS_INSTALL_DIR=$dataDir/Qt6/mkspecs \ -DECM_DIR=/system/data/cmake/Modules/ECM/cmake \ + -DCMAKE_SKIP_RPATH=YES \ -DBUILD_QCH=ON \ -DBUILD_TESTING=OFF \ -Wno-dev diff --git a/kde-frameworks/kplotting/kplotting6-6.7.0.recipe b/kde-frameworks/kplotting/kplotting6-6.9.0.recipe similarity index 87% rename from kde-frameworks/kplotting/kplotting6-6.7.0.recipe rename to kde-frameworks/kplotting/kplotting6-6.9.0.recipe index 64a00575d..9a3041d14 100644 --- a/kde-frameworks/kplotting/kplotting6-6.7.0.recipe +++ b/kde-frameworks/kplotting/kplotting6-6.9.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="130eedc234f0fedaf2c415de895c979454f64c3b049043327d43cd509e2386b3" +CHECKSUM_SHA256="5e1883d107de16ccd7a27323c5575bb1ec2fec22c44c9c3199b3de885f5c18f4" SOURCE_DIR="kplotting-$portVersion" ARCHITECTURES="all !x86_gcc2" @@ -44,7 +44,7 @@ TEST_REQUIRES=" BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel - extra_cmake_modules$secondaryArchSuffix >= $portVersion + extra_cmake_modules$secondaryArchSuffix qt6_tools${secondaryArchSuffix}_devel devel:libQt6Core$secondaryArchSuffix " @@ -59,19 +59,19 @@ BUILD_PREREQUIRES=" cmd:pkg_config$secondaryArchSuffix " -defineDebugInfoPackage kplotting6$secondaryArchSuffix \ - $libDir/libKF6Plotting.so.$libVersion +#defineDebugInfoPackage kplotting6$secondaryArchSuffix \ +# $libDir/libKF6Plotting.so.$libVersion BUILD() { - cmake -B build -S . -DCMAKE_BUILD_TYPE=RelWithDebInfo \ + cmake -B build -S . -DCMAKE_BUILD_TYPE=Release \ $cmakeDirArgs \ -DKDE_INSTALL_PLUGINDIR=$addOnsDir/Qt6 \ -DKDE_INSTALL_QMLDIR=$dataDir/Qt6/qml \ -DKDE_INSTALL_QTPLUGINDIR=$addOnsDir/Qt6 \ -DKDE_INSTALL_QTQCHDIR=$documentationDir/packages/qt6 \ - -DECM_MKSPECS_INSTALL_DIR=$dataDir/Qt6/mkspecs \ -DECM_DIR=/system/data/cmake/Modules/ECM/cmake \ + -DCMAKE_SKIP_RPATH=YES \ -DBUILD_QCH=ON \ -DBUILD_TESTING=OFF \ -Wno-dev diff --git a/kde-frameworks/kquickcharts/kquickcharts6-6.7.0.recipe b/kde-frameworks/kquickcharts/kquickcharts6-6.9.0.recipe similarity index 80% rename from kde-frameworks/kquickcharts/kquickcharts6-6.7.0.recipe rename to kde-frameworks/kquickcharts/kquickcharts6-6.9.0.recipe index acff8a7c2..b1b949184 100644 --- a/kde-frameworks/kquickcharts/kquickcharts6-6.7.0.recipe +++ b/kde-frameworks/kquickcharts/kquickcharts6-6.9.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="664047e7b622c0b865d7466817179455fb3851cbb15a8f2c38b8ab9cf85098a4" +CHECKSUM_SHA256="df17c336aeb885e0d533916bf5211910e4f0844f8bcc8b45423dd9a0a02839ef" SOURCE_DIR="kquickcharts-$portVersion" ARCHITECTURES="all !x86_gcc2" @@ -29,6 +29,7 @@ REQUIRES=" lib:libQt6Core$secondaryArchSuffix lib:libQt6Gui$secondaryArchSuffix lib:libQt6Network$secondaryArchSuffix + lib:libQt6OpenGL$secondaryArchSuffix lib:libQt6Qml$secondaryArchSuffix lib:libQt6Quick$secondaryArchSuffix " @@ -44,19 +45,15 @@ REQUIRES_devel=" BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel - extra_cmake_modules$secondaryArchSuffix >= $portVersion + extra_cmake_modules$secondaryArchSuffix devel:libQt6Core$secondaryArchSuffix devel:libQt6Qml$secondaryArchSuffix - devel:libQt6Quick$secondaryArchSuffix - devel:libQt6QuickControls2$secondaryArchSuffix - devel:libQt6Gui$secondaryArchSuffix - devel:libQt6Network$secondaryArchSuffix devel:libQt6ShaderTools$secondaryArchSuffix - devel:libQt6Test$secondaryArchSuffix - devel:libQt6Widgets$secondaryArchSuffix " BUILD_PREREQUIRES=" cmd:cmake + cmd:dot + cmd:doxygen cmd:g++$secondaryArchSuffix cmd:glslangValidator$secondaryArchSuffix cmd:make @@ -69,20 +66,20 @@ TEST_REQUIRES=" qthaikuplugins " -defineDebugInfoPackage kquickcharts6$secondaryArchSuffix \ - $libDir/libQuickCharts.so.$libVersion \ - $libDir/libQuickChartsControls.so.$libVersion +#defineDebugInfoPackage kquickcharts6$secondaryArchSuffix \ +# $libDir/libQuickCharts.so.$libVersion \ +# $libDir/libQuickChartsControls.so.$libVersion BUILD() { - cmake -B build -S . -DCMAKE_BUILD_TYPE=RelWithDebInfo \ + cmake -B build -S . -DCMAKE_BUILD_TYPE=Release \ $cmakeDirArgs \ -DKDE_INSTALL_PLUGINDIR=$addOnsDir/Qt6 \ -DKDE_INSTALL_QMLDIR=$dataDir/Qt6/qml \ -DKDE_INSTALL_QTPLUGINDIR=$addOnsDir/Qt6 \ -DKDE_INSTALL_QTQCHDIR=$documentationDir/packages/qt6 \ - -DECM_MKSPECS_INSTALL_DIR=$dataDir/Qt6/mkspecs \ -DECM_DIR=/system/data/cmake/Modules/ECM/cmake \ + -DCMAKE_SKIP_RPATH=YES \ -DBUILD_QCH=ON \ -DBUILD_TESTING=OFF \ -Wno-dev