diff --git a/kde-frameworks/kauth/kauth6-6.5.0.recipe b/kde-frameworks/kauth/kauth6-6.7.0.recipe similarity index 80% rename from kde-frameworks/kauth/kauth6-6.5.0.recipe rename to kde-frameworks/kauth/kauth6-6.7.0.recipe index 49614573f..e7628157b 100644 --- a/kde-frameworks/kauth/kauth6-6.5.0.recipe +++ b/kde-frameworks/kauth/kauth6-6.7.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%.*}/kauth-${portVersion}.tar.xz" -CHECKSUM_SHA256="1af517a509da1c5ddb4420d7430894b751562e07cc4c134abe0dcb606358d394" +CHECKSUM_SHA256="173654eee2891acd41538d31ace8b9d7ae60863bc7faef1cacec7e21c7eb1223" SOURCE_DIR="kauth-$portVersion" ARCHITECTURES="all !x86_gcc2" @@ -47,30 +47,38 @@ BUILD_REQUIRES=" BUILD_PREREQUIRES=" cmd:cmake cmd:dot - cmd:doxygen >= 1.9 + cmd:doxygen cmd:g++$secondaryArchSuffix cmd:make + cmd:pkg_config$secondaryArchSuffix " TEST_REQUIRES=" lib:libdbus_1$secondaryArchSuffix " +defineDebugInfoPackage kauth6$secondaryArchSuffix \ + $libDir/libKF6AuthCore.so.$libVersion + BUILD() { - cmake -Bbuild -S. -DCMAKE_BUILD_TYPE=Release \ + cmake -B build -S . -DCMAKE_BUILD_TYPE=RelWithDebInfo \ $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 \ - -DBUILD_TESTING=OFF - make -Cbuild $jobArgs + -DBUILD_TESTING=OFF \ + -Wno-dev + make -C build $jobArgs } INSTALL() { - make -Cbuild install + make -C build install prepareInstalledDevelLib \ libKF6AuthCore diff --git a/kde-frameworks/kbookmarks/kbookmarks6-6.5.0.recipe b/kde-frameworks/kbookmarks/kbookmarks6-6.7.0.recipe similarity index 83% rename from kde-frameworks/kbookmarks/kbookmarks6-6.5.0.recipe rename to kde-frameworks/kbookmarks/kbookmarks6-6.7.0.recipe index 0ed330ce2..ef01b2dd3 100644 --- a/kde-frameworks/kbookmarks/kbookmarks6-6.5.0.recipe +++ b/kde-frameworks/kbookmarks/kbookmarks6-6.7.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%.*}/kbookmarks-${portVersion}.tar.xz" -CHECKSUM_SHA256="97dabceae5b0eac1107c49c50d1d7d9a7d26b9246c9ab53d123990525c55fbec" +CHECKSUM_SHA256="bd41a39df76515ee34e7df07b2600e1e5b67b1812cc959ec51585f2ebcc56573" SOURCE_DIR="kbookmarks-$portVersion" ARCHITECTURES="all !x86_gcc2" @@ -72,29 +72,39 @@ BUILD_REQUIRES=" BUILD_PREREQUIRES=" cmd:cmake cmd:dot - cmd:doxygen >= 1.9 + cmd:doxygen cmd:g++$secondaryArchSuffix cmd:make + cmd:pkg_config$secondaryArchSuffix " TEST_REQUIRES=" qthaikuplugins " +defineDebugInfoPackage kbookmarks6$secondaryArchSuffix \ + $libDir/libKF6Bookmarks.so.$libVersion \ + $libDir/libKF6BookmarksWidgets.so.$libVersion + BUILD() { - cmake -Bbuild -S. $cmakeDirArgs \ - -DCMAKE_BUILD_TYPE=Release \ + cmake -B build -S . -DCMAKE_BUILD_TYPE=RelWithDebInfo \ + $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 \ - -DBUILD_TESTING=OFF - make -Cbuild $jobArgs + -DBUILD_TESTING=OFF \ + -Wno-dev + make -C build $jobArgs } INSTALL() { - make -Cbuild install + make -C build install prepareInstalledDevelLibs \ libKF6Bookmarks \ diff --git a/kde-frameworks/kglobalaccel/kglobalaccel6-6.5.0.recipe b/kde-frameworks/kglobalaccel/kglobalaccel6-6.7.0.recipe similarity index 84% rename from kde-frameworks/kglobalaccel/kglobalaccel6-6.5.0.recipe rename to kde-frameworks/kglobalaccel/kglobalaccel6-6.7.0.recipe index 839acd4e0..e79714331 100644 --- a/kde-frameworks/kglobalaccel/kglobalaccel6-6.5.0.recipe +++ b/kde-frameworks/kglobalaccel/kglobalaccel6-6.7.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%.*}/kglobalaccel-${portVersion}.tar.xz" -CHECKSUM_SHA256="883a1cf48fc4b8ce22ab9f143b6bdd546ac30fbe29c90d4035fb2adf38a339a4" +CHECKSUM_SHA256="2a35b9e06c6601d602b3a45e278c49e11e4627939cfacffb1fdee0826a6f6e0b" SOURCE_DIR="kglobalaccel-$portVersion" ARCHITECTURES="all !x86_gcc2" @@ -70,29 +70,38 @@ BUILD_REQUIRES=" BUILD_PREREQUIRES=" cmd:cmake cmd:dot - cmd:doxygen >= 1.9 + cmd:doxygen cmd:g++$secondaryArchSuffix cmd:make + cmd:pkg_config$secondaryArchSuffix " TEST_REQUIRES=" qthaikuplugins$secondaryArchSuffix " +defineDebugInfoPackage kglobalaccel6$secondaryArchSuffix \ + $libDir/libKF6GlobalAccel.so.$libVersion + BUILD() { - cmake -Bbuild -S. $cmakeDirArgs \ - -DCMAKE_BUILD_TYPE=Release \ + cmake -B build -S . -DCMAKE_BUILD_TYPE=RelWithDebInfo \ + $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 \ - -DBUILD_TESTING=OFF - make -Cbuild $jobArgs + -DBUILD_TESTING=OFF \ + -Wno-dev + make -C build $jobArgs } INSTALL() { - make -Cbuild install + make -C build install prepareInstalledDevelLib \ libKF6GlobalAccel diff --git a/kde-frameworks/kio/kio6-6.5.0.recipe b/kde-frameworks/kio/kio6-6.7.0.recipe similarity index 90% rename from kde-frameworks/kio/kio6-6.5.0.recipe rename to kde-frameworks/kio/kio6-6.7.0.recipe index bac12eda2..64e471c90 100644 --- a/kde-frameworks/kio/kio6-6.5.0.recipe +++ b/kde-frameworks/kio/kio6-6.7.0.recipe @@ -15,7 +15,7 @@ COPYRIGHT="2010-2024 KDE Organisation" LICENSE="GNU LGPL v2" REVISION="1" SOURCE_URI="https://download.kde.org/stable/frameworks/${portVersion%.*}/kio-${portVersion}.tar.xz" -CHECKSUM_SHA256="9c8bf83534577a322d4633d241d9770bc8ba8a45624e2f041e1b8dbdbc198a13" +CHECKSUM_SHA256="df235019a07acd579920f6c655050e02dacf847c706f4b8279e755be46f9d990" SOURCE_DIR="kio-$portVersion" PATCHES="kio-$portVersion.patchset" @@ -123,12 +123,12 @@ BUILD_REQUIRES=" BUILD_PREREQUIRES=" cmd:cmake cmd:dot - cmd:doxygen >= 1.9 + cmd:doxygen cmd:g++$secondaryArchSuffix cmd:make - cmd:msgfmt - cmd:msgmerge - cmd:python3 + cmd:msgfmt$secondaryArchSuffix + cmd:msgmerge$secondaryArchSuffix + cmd:pkg_config$secondaryArchSuffix " TEST_REQUIRES=" @@ -142,25 +142,34 @@ PATCH() sed -e 's/kdoctools/#kdoctool/g' -i $sourceDir/CMakeLists.txt } +defineDebugInfoPackage kio6$secondaryArchSuffix \ + $libDir/libKF6KIOCore.so.$libVersion \ + $libDir/libKF6KIOFileWidgets.so.$libVersion \ + $libDir/libKF6KIOGui.so.$libVersion \ + $libDir/libKF6KIOWidgets.so.$libVersion + BUILD() { - cmake -Bbuild -S. $cmakeDirArgs \ - -DCMAKE_BUILD_TYPE=Release \ + cmake -B build -S . -DCMAKE_BUILD_TYPE=RelWithDebInfo \ + $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 \ -DKAUTH_HELPER_INSTALL_DIR:PATH=$addOnsDir/Qt6/kauth/helper \ -DECM_DIR=/system/data/cmake/Modules/ECM/cmake \ -DWITH_X11=OFF \ -DWITH_WAYLAND=OFF \ -DBUILD_QCH=ON \ - -DBUILD_TESTING=OFF - make -Cbuild $jobArgs + -DBUILD_TESTING=OFF \ + -Wno-dev + make -C build $jobArgs } INSTALL() { - make -Cbuild install + make -C build install # cleanup rm -rf $dataDir/applications diff --git a/kde-frameworks/kio/patches/kio-6.5.0.patchset b/kde-frameworks/kio/patches/kio-6.7.0.patchset similarity index 94% rename from kde-frameworks/kio/patches/kio-6.5.0.patchset rename to kde-frameworks/kio/patches/kio-6.7.0.patchset index d4c182fc9..ebde33f1e 100644 --- a/kde-frameworks/kio/patches/kio-6.5.0.patchset +++ b/kde-frameworks/kio/patches/kio-6.7.0.patchset @@ -1,4 +1,4 @@ -From 09214c74d519605f95115cbdd7df7574a6729bc9 Mon Sep 17 00:00:00 2001 +From ca1e6933b9cda36e4ca026132f07d0e9a5c0a92e Mon Sep 17 00:00:00 2001 From: Sergei Reznikov Date: Sun, 31 Oct 2021 13:15:08 +0300 Subject: Fix build on Haiku @@ -18,10 +18,10 @@ index 124e827..183c897 100644 struct timespec ut[2]; ut[0].tv_sec = early70sTime; diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt -index 7b1cb88..9422ab9 100644 +index bb6935b..d8a3400 100644 --- a/src/core/CMakeLists.txt +++ b/src/core/CMakeLists.txt -@@ -215,6 +215,10 @@ if (TARGET KF6::AuthCore) +@@ -214,6 +214,10 @@ if (TARGET KF6::AuthCore) target_link_libraries(KF6KIOCore PRIVATE KF6::AuthCore) #SlaveBase uses KAuth::Action endif() @@ -61,7 +61,7 @@ index a8a393a..93c6fea 100644 target_link_libraries(kio_file ${ACL_LIBS}) endif() diff --git a/src/kioworkers/file/file_unix.cpp b/src/kioworkers/file/file_unix.cpp -index 9999857..8bc8447 100644 +index 3ebf67d..d672114 100644 --- a/src/kioworkers/file/file_unix.cpp +++ b/src/kioworkers/file/file_unix.cpp @@ -69,6 +69,11 @@ @@ -76,7 +76,7 @@ index 9999857..8bc8447 100644 using namespace KIO; /* 512 kB */ -@@ -784,7 +789,7 @@ WorkerResult FileProtocol::copy(const QUrl &srcUrl, const QUrl &destUrl, int _mo +@@ -791,7 +796,7 @@ WorkerResult FileProtocol::copy(const QUrl &srcUrl, const QUrl &destUrl, int _mo // copy access and modification time if (!wasKilled()) { @@ -104,7 +104,7 @@ index 8d8c0ed..aa164e1 100644 2.45.2 -From b8441d70218f01e8fd7314e531dfe3610bba59ad Mon Sep 17 00:00:00 2001 +From ec511e01a35a6f9a2e013d404232ffe7237d45a9 Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Tue, 17 May 2022 21:28:27 +1000 Subject: Add OpenWith handler for Haiku @@ -210,14 +210,14 @@ index 0000000..9614b87 2.45.2 -From 56f192dbd65bfb283e4624e972d0ab57b287f266 Mon Sep 17 00:00:00 2001 +From f6ddb8c2cb4c9d8b883396efc1712aaf2ffbe295 Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Sun, 25 Feb 2024 23:14:26 +1000 Subject: Fix build diff --git a/src/kioworkers/file/file_unix.cpp b/src/kioworkers/file/file_unix.cpp -index 8bc8447..7a62ee1 100644 +index d672114..34778b7 100644 --- a/src/kioworkers/file/file_unix.cpp +++ b/src/kioworkers/file/file_unix.cpp @@ -72,6 +72,9 @@ @@ -234,7 +234,7 @@ index 8bc8447..7a62ee1 100644 2.45.2 -From 7d81047dfc2059311bef0f37c87338551ff75d40 Mon Sep 17 00:00:00 2001 +From 4cc5e8331021f1b37324bc7f03b5b72f2de10c86 Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Sun, 10 Mar 2024 15:28:06 +1000 Subject: Disable threads kio_file support for now. It's totally broken on diff --git a/kde-frameworks/kirigami/kirigami6-6.5.0.recipe b/kde-frameworks/kirigami/kirigami6-6.7.0.recipe similarity index 83% rename from kde-frameworks/kirigami/kirigami6-6.5.0.recipe rename to kde-frameworks/kirigami/kirigami6-6.7.0.recipe index 8a3443de8..bbaf4f8bf 100644 --- a/kde-frameworks/kirigami/kirigami6-6.5.0.recipe +++ b/kde-frameworks/kirigami/kirigami6-6.7.0.recipe @@ -10,7 +10,7 @@ COPYRIGHT="2010-2024 KDE Organisation" LICENSE="GNU LGPL v2" REVISION="1" SOURCE_URI="https://download.kde.org/stable/frameworks/${portVersion%.*}/kirigami-${portVersion}.tar.xz" -CHECKSUM_SHA256="43a73b161e1c85da3eadc63e7cc6c1b3c686aa56951b0d0e2df4a2cc1334759c" +CHECKSUM_SHA256="4d645a0374d33b9465e79e3e17170882e2cbda1526f45bc5b6b176dadda77d76" SOURCE_DIR="kirigami-$portVersion" PATCHES="1582.patch" @@ -66,34 +66,45 @@ BUILD_REQUIRES=" BUILD_PREREQUIRES=" cmd:cmake cmd:dot - cmd:doxygen >= 1.9 + cmd:doxygen cmd:g++$secondaryArchSuffix cmd:make + cmd:pkg_config$secondaryArchSuffix " TEST_REQUIRES=" qthaikuplugins$secondaryArchSuffix " +defineDebugInfoPackage kirigami6$secondaryArchSuffix \ + $libDir/libKirigami.so.$libVersion \ + $libDir/libKirigamiDelegates.so.$libVersion \ + $libDir/libKirigamiDialogs.so.$libVersion \ + $libDir/libKirigamiLayouts.so.$libVersion \ + $libDir/libKirigamiPlatform.so.$libVersion \ + $libDir/libKirigamiPrimitives.so.$libVersion + BUILD() { - cmake -Bbuild -S. $cmakeDirArgs \ - -DCMAKE_BUILD_TYPE=Release \ - -DKDE_INSTALL_QTPLUGINDIR=$addOnsDir/Qt6 \ + cmake -B build -S . -DCMAKE_BUILD_TYPE=RelWithDebInfo \ + $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 \ -DDESKTOP_ENABLED=OFF \ - -DUSE_DBUS=OFF \ - -DBUILD_QCH=ON \ -DBUILD_EXAMPLES=OFF \ - -DBUILD_TESTING=OFF - make -Cbuild $jobArgs + -DBUILD_QCH=ON \ + -DBUILD_TESTING=OFF \ + -Wno-dev + make -C build $jobArgs } INSTALL() { - make -Cbuild install + make -C build install prepareInstalledDevelLibs \ libKirigami \ diff --git a/kde-frameworks/kjobwidgets/kjobwidgets6-6.5.0.recipe b/kde-frameworks/kjobwidgets/kjobwidgets6-6.7.0.recipe similarity index 78% rename from kde-frameworks/kjobwidgets/kjobwidgets6-6.5.0.recipe rename to kde-frameworks/kjobwidgets/kjobwidgets6-6.7.0.recipe index bcb2cc8b9..250ea1f30 100644 --- a/kde-frameworks/kjobwidgets/kjobwidgets6-6.5.0.recipe +++ b/kde-frameworks/kjobwidgets/kjobwidgets6-6.7.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%.*}/kjobwidgets-${portVersion}.tar.xz" -CHECKSUM_SHA256="67c5dab1191ae6830d452751767e94991b34feaf4228f18ab042c2c120910ad8" +CHECKSUM_SHA256="16d7e7ab54235d6fa1eb213d3d637182e22fcbdbcb7b4b14032430a02a2f888a" SOURCE_DIR="kjobwidgets-$portVersion" ARCHITECTURES="all !x86_gcc2" @@ -54,28 +54,38 @@ BUILD_REQUIRES=" BUILD_PREREQUIRES=" cmd:cmake cmd:dot - cmd:doxygen >= 1.9 + cmd:doxygen cmd:g++$secondaryArchSuffix cmd:make + cmd:pkg_config$secondaryArchSuffix " TEST_REQUIRES=" qthaikuplugins " +defineDebugInfoPackage kjobwidgets6$secondaryArchSuffix \ + $libDir/libKF6JobWidgets.so.$libVersion + BUILD() { - cmake -Bbuild -S. $cmakeDirArgs \ - -DCMAKE_BUILD_TYPE=Release \ + cmake -B build -S . -DCMAKE_BUILD_TYPE=RelWithDebInfo \ + $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 - make -Cbuild $jobArgs + -DBUILD_QCH=ON \ + -DBUILD_TESTING=OFF \ + -Wno-dev + make -C build $jobArgs } INSTALL() { - make -Cbuild install + make -C build install prepareInstalledDevelLib \ libKF6JobWidgets diff --git a/kde-frameworks/ktextwidgets/ktextwidgets6-6.5.0.recipe b/kde-frameworks/ktextwidgets/ktextwidgets6-6.7.0.recipe similarity index 85% rename from kde-frameworks/ktextwidgets/ktextwidgets6-6.5.0.recipe rename to kde-frameworks/ktextwidgets/ktextwidgets6-6.7.0.recipe index 5b9018fd8..c27234b8b 100644 --- a/kde-frameworks/ktextwidgets/ktextwidgets6-6.5.0.recipe +++ b/kde-frameworks/ktextwidgets/ktextwidgets6-6.7.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%.*}/ktextwidgets-${portVersion}.tar.xz" -CHECKSUM_SHA256="a99df1c634831e9d01f704009c951378108334a4258ad5b64f60f55e55770212" +CHECKSUM_SHA256="23bb71450e39f437c06bd9af48e7893253c31ad10649b0901d0a8ec1ee18ae01" SOURCE_DIR="ktextwidgets-$portVersion" ARCHITECTURES="all !x86_gcc2" @@ -84,33 +84,40 @@ BUILD_REQUIRES=" BUILD_PREREQUIRES=" cmd:cmake cmd:dot - cmd:doxygen >= 1.9 + cmd:doxygen cmd:g++$secondaryArchSuffix cmd:make - cmd:msgfmt - cmd:msgmerge - cmd:python3 + cmd:msgfmt$secondaryArchSuffix + cmd:msgmerge$secondaryArchSuffix + cmd:pkg_config$secondaryArchSuffix " TEST_REQUIRES=" qthaikuplugins " +defineDebugInfoPackage ktextwidgets6$secondaryArchSuffix \ + $libDir/libKF6TextWidgets.so.$libVersion + BUILD() { - cmake -Bbuild -S. $cmakeDirArgs \ - -DCMAKE_BUILD_TYPE=Release \ - -DKDE_INSTALL_QTPLUGINDIR=$addOnsDir/Qt5 \ + cmake -B build -S . -DCMAKE_BUILD_TYPE=RelWithDebInfo \ + $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 \ - -DBUILD_TESTING=OFF - make -Cbuild $jobArgs + -DBUILD_TESTING=OFF \ + -Wno-dev + make -C build $jobArgs } INSTALL() { - make -Cbuild install + make -C build install prepareInstalledDevelLib \ libKF6TextWidgets diff --git a/kde-frameworks/kwallet/kwallet6-6.5.0.recipe b/kde-frameworks/kwallet/kwallet6-6.7.0.recipe similarity index 83% rename from kde-frameworks/kwallet/kwallet6-6.5.0.recipe rename to kde-frameworks/kwallet/kwallet6-6.7.0.recipe index 4792f3771..c4676f172 100644 --- a/kde-frameworks/kwallet/kwallet6-6.5.0.recipe +++ b/kde-frameworks/kwallet/kwallet6-6.7.0.recipe @@ -5,7 +5,7 @@ COPYRIGHT="2010-2024 KDE Organisation" LICENSE="GNU LGPL v2" REVISION="1" SOURCE_URI="https://download.kde.org/stable/frameworks/${portVersion%.*}/kwallet-${portVersion}.tar.xz" -CHECKSUM_SHA256="9eb9ef50a10319afdf8ddbab06bb76c05f43d8d4095483f2d8efed752d5d815a" +CHECKSUM_SHA256="ffb319ce0dfeea95389e1a2f4833d1099b894c81f1df7ab50dcfb796ea87ffa2" SOURCE_DIR="kwallet-$portVersion" PATCHES="kwallet-$portVersion.patchset" @@ -34,6 +34,7 @@ REQUIRES=" lib:libKF6ConfigCore$secondaryArchSuffix lib:libKF6ConfigWidgets$secondaryArchSuffix lib:libKF6CoreAddons$secondaryArchSuffix + lib:libKF6Crash$secondaryArchSuffix lib:libKF6DBusAddons$secondaryArchSuffix lib:libKF6I18n$secondaryArchSuffix lib:libKF6IconThemes$secondaryArchSuffix @@ -41,7 +42,7 @@ REQUIRES=" lib:libKF6Service$secondaryArchSuffix lib:libKF6WidgetsAddons$secondaryArchSuffix lib:libKF6WindowSystem$secondaryArchSuffix - lib:libqca_Qt6$secondaryArchSuffix + lib:libqca_qt6$secondaryArchSuffix lib:libQt6Core$secondaryArchSuffix lib:libQt6DBus$secondaryArchSuffix lib:libQt6Gui$secondaryArchSuffix @@ -69,6 +70,7 @@ BUILD_REQUIRES=" devel:libKF6ConfigCore$secondaryArchSuffix == $portVersion devel:libKF6ConfigWidgets$secondaryArchSuffix == $portVersion devel:libKF6CoreAddons$secondaryArchSuffix == $portVersion + devel:libKF6Crash$secondaryArchSuffix == $portVersion devel:libKF6DBusAddons$secondaryArchSuffix == $portVersion # devel:libKF6DocTools$secondaryArchSuffix == $portVersion devel:libKF6I18n$secondaryArchSuffix == $portVersion @@ -88,34 +90,43 @@ BUILD_REQUIRES=" BUILD_PREREQUIRES=" cmd:cmake cmd:dot - cmd:doxygen >= 1.9 + cmd:doxygen cmd:g++$secondaryArchSuffix cmd:make - cmd:msgfmt - cmd:msgmerge - cmd:python3 + cmd:msgfmt$secondaryArchSuffix + cmd:msgmerge$secondaryArchSuffix + cmd:pkg_config$secondaryArchSuffix " TEST_REQUIRES=" lib:libdbus_1$secondaryArchSuffix - lib:libqca_Qt6$secondaryArchSuffix + lib:libqca_qt6$secondaryArchSuffix devel:libnss3$secondaryArchSuffix " +defineDebugInfoPackage kwallet6$secondaryArchSuffix \ + $libDir/libKF6Wallet.so.$libVersion \ + $libDir/libKF6WalletBackend.so.$libVersion + BUILD() { - cmake -Bbuild -S. $cmakeDirArgs \ - -DCMAKE_BUILD_TYPE=Release \ + cmake -B build -S . -DCMAKE_BUILD_TYPE=RelWithDebInfo \ + $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 \ - -DBUILD_TESTING=OFF - make -Cbuild $jobArgs + -DBUILD_TESTING=OFF \ + -Wno-dev + make -C build $jobArgs } INSTALL() { - make -Cbuild install + make -C build install prepareInstalledDevelLibs \ libKF6Wallet \ diff --git a/kde-frameworks/kwallet/patches/kwallet-6.5.0.patchset b/kde-frameworks/kwallet/patches/kwallet-6.7.0.patchset similarity index 100% rename from kde-frameworks/kwallet/patches/kwallet-6.5.0.patchset rename to kde-frameworks/kwallet/patches/kwallet-6.7.0.patchset diff --git a/kde-frameworks/solid/patches/solid-6.5.0.patchset b/kde-frameworks/solid/patches/solid-6.7.0.patchset similarity index 100% rename from kde-frameworks/solid/patches/solid-6.5.0.patchset rename to kde-frameworks/solid/patches/solid-6.7.0.patchset diff --git a/kde-frameworks/solid/solid6-6.5.0.recipe b/kde-frameworks/solid/solid6-6.7.0.recipe similarity index 80% rename from kde-frameworks/solid/solid6-6.5.0.recipe rename to kde-frameworks/solid/solid6-6.7.0.recipe index 2d3f45aa3..76a7c6f17 100644 --- a/kde-frameworks/solid/solid6-6.5.0.recipe +++ b/kde-frameworks/solid/solid6-6.7.0.recipe @@ -13,7 +13,7 @@ COPYRIGHT="2010-2024 KDE Organisation" LICENSE="GNU LGPL v2" REVISION="1" SOURCE_URI="https://download.kde.org/stable/frameworks/${portVersion%.*}/solid-${portVersion}.tar.xz" -CHECKSUM_SHA256="e8237c6c9617bef4bf5fc74461bb7417ca57afe15d4f54878cfe8c806e706a5c" +CHECKSUM_SHA256="3673f17776c30d9523fe40b8f38e62be1037610050f782c136da1ac04b20e6e7" SOURCE_DIR="solid-$portVersion" PATCHES="solid-$portVersion.patchset" @@ -56,27 +56,35 @@ BUILD_PREREQUIRES=" cmd:bison cmd:cmake cmd:dot - cmd:doxygen >= 1.9 + cmd:doxygen cmd:flex cmd:g++$secondaryArchSuffix cmd:make + cmd:pkg_config$secondaryArchSuffix " +defineDebugInfoPackage solid6$secondaryArchSuffix \ + $libDir/libKF6Solid.so.$libVersion + BUILD() { - cmake -Bbuild -S. $cmakeDirArgs \ - -DCMAKE_BUILD_TYPE=Release \ + cmake -B build -S . -DCMAKE_BUILD_TYPE=RelWithDebInfo \ + $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 \ - -DBUILD_TESTING=OFF - make -Cbuild $jobArgs + -DBUILD_TESTING=OFF \ + -Wno-dev + make -C build $jobArgs } INSTALL() { - make -Cbuild install + make -C build install prepareInstalledDevelLib \ libKF6Solid diff --git a/kde-frameworks/sonnet/patches/sonnet-6.5.0.patchset b/kde-frameworks/sonnet/patches/sonnet-6.7.0.patchset similarity index 100% rename from kde-frameworks/sonnet/patches/sonnet-6.5.0.patchset rename to kde-frameworks/sonnet/patches/sonnet-6.7.0.patchset diff --git a/kde-frameworks/sonnet/sonnet6-6.5.0.recipe b/kde-frameworks/sonnet/sonnet6-6.7.0.recipe similarity index 86% rename from kde-frameworks/sonnet/sonnet6-6.5.0.recipe rename to kde-frameworks/sonnet/sonnet6-6.7.0.recipe index b56fb2cb0..ead39a4de 100644 --- a/kde-frameworks/sonnet/sonnet6-6.5.0.recipe +++ b/kde-frameworks/sonnet/sonnet6-6.7.0.recipe @@ -13,7 +13,7 @@ COPYRIGHT="2010-2024 KDE Organisation" LICENSE="GNU LGPL v2" REVISION="1" SOURCE_URI="https://download.kde.org/stable/frameworks/${portVersion%.*}/sonnet-${portVersion}.tar.xz" -CHECKSUM_SHA256="7e86b6f82b7951c3e81cea75f79baf7a8a0f884fcb024f02a6153a467a3de1aa" +CHECKSUM_SHA256="2f970d490effd668e64dd93ffef344a80db7e63130bb23df4fa0d6b14150e588" SOURCE_DIR="sonnet-$portVersion" PATCHES="sonnet-$portVersion.patchset" @@ -62,7 +62,7 @@ BUILD_REQUIRES=" BUILD_PREREQUIRES=" cmd:cmake cmd:dot - cmd:doxygen >= 1.9 + cmd:doxygen cmd:g++$secondaryArchSuffix cmd:make cmd:pkg_config$secondaryArchSuffix @@ -72,23 +72,29 @@ TEST_REQUIRES=" qthaikuplugins$secondaryArchSuffix " +defineDebugInfoPackage sonnet6$secondaryArchSuffix \ + $libDir/libKF6SonnetCore.so.$libVersion \ + $libDir/libKF6SonnetUi.so.$libVersion + BUILD() { - cmake -Bbuild -S. $cmakeDirArgs \ - -DCMAKE_BUILD_TYPE=Release \ + cmake -B build -S . -DCMAKE_BUILD_TYPE=RelWithDebInfo \ + $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 \ - -DBUILD_TESTING=OFF - make -Cbuild $jobArgs + -DBUILD_TESTING=OFF \ + -Wno-dev + make -C build $jobArgs } INSTALL() { - make -Cbuild install + make -C build install prepareInstalledDevelLibs \ libKF6SonnetCore \