From 5228fa9d6e03fa3b71a44289a34bb03302ee7591 Mon Sep 17 00:00:00 2001 From: Schrijvers Luc Date: Tue, 29 Oct 2024 18:52:51 +0100 Subject: [PATCH] KF6 frameworks, bump to 6.7.0 (#11280) --- ...ica6-6.5.0.recipe => attica6-6.7.0.recipe} | 17 +++++++---- ...6-6.5.0.recipe => kcontacts6-6.7.0.recipe} | 27 ++++++++++------- ...5.0.recipe => kfilemetadata6-6.7.0.recipe} | 26 ++++++++++------- ...6-6.5.0.recipe => kidletime6-6.7.0.recipe} | 25 +++++++++++----- ...6.5.0.recipe => kitemmodels6-6.7.0.recipe} | 19 ++++++++---- ...6-6.5.0.recipe => knewstuff6-6.7.0.recipe} | 26 ++++++++++------- ...e6-6.5.0.recipe => kpackage6-6.7.0.recipe} | 28 +++++++++++------- ...rts6-6.5.0.recipe => kparts6-6.7.0.recipe} | 28 +++++++++++------- ...ui6-6.5.0.recipe => kxmlgui6-6.7.0.recipe} | 29 ++++++++++++------- ...6.5.0.recipe => syndication6-6.7.0.recipe} | 18 ++++++++---- 10 files changed, 158 insertions(+), 85 deletions(-) rename kde-frameworks/attica/{attica6-6.5.0.recipe => attica6-6.7.0.recipe} (81%) rename kde-frameworks/kcontacts/{kcontacts6-6.5.0.recipe => kcontacts6-6.7.0.recipe} (79%) rename kde-frameworks/kfilemetadata/{kfilemetadata6-6.5.0.recipe => kfilemetadata6-6.7.0.recipe} (83%) rename kde-frameworks/kidletime/{kidletime6-6.5.0.recipe => kidletime6-6.7.0.recipe} (78%) rename kde-frameworks/kitemmodels/{kitemmodels6-6.5.0.recipe => kitemmodels6-6.7.0.recipe} (84%) rename kde-frameworks/knewstuff/{knewstuff6-6.5.0.recipe => knewstuff6-6.7.0.recipe} (84%) rename kde-frameworks/kpackage/{kpackage6-6.5.0.recipe => kpackage6-6.7.0.recipe} (76%) rename kde-frameworks/kparts/{kparts6-6.5.0.recipe => kparts6-6.7.0.recipe} (85%) rename kde-frameworks/kxmlgui/{kxmlgui6-6.5.0.recipe => kxmlgui6-6.7.0.recipe} (86%) rename kde-frameworks/syndication/{syndication6-6.5.0.recipe => syndication6-6.7.0.recipe} (82%) diff --git a/kde-frameworks/attica/attica6-6.5.0.recipe b/kde-frameworks/attica/attica6-6.7.0.recipe similarity index 81% rename from kde-frameworks/attica/attica6-6.5.0.recipe rename to kde-frameworks/attica/attica6-6.7.0.recipe index e7b130648..b8a00084e 100644 --- a/kde-frameworks/attica/attica6-6.5.0.recipe +++ b/kde-frameworks/attica/attica6-6.7.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%.*}/attica-${portVersion}.tar.xz" -CHECKSUM_SHA256="6ce80618dc52a7a2c48a425617161ec46b7126d05ecb23076e655fde1d6010e6" +CHECKSUM_SHA256="daa5c07b474899e16b42710e03d0590936bce0f54800239d633d48caa3be0d7d" SOURCE_DIR="attica-$portVersion" ARCHITECTURES="all !x86_gcc2" @@ -43,7 +43,7 @@ BUILD_REQUIRES=" BUILD_PREREQUIRES=" cmd:cmake cmd:dot - cmd:doxygen >= 1.9 + cmd:doxygen cmd:g++$secondaryArchSuffix cmd:make cmd:pkg_config$secondaryArchSuffix @@ -57,21 +57,28 @@ TEST_REQUIRES=" jinja_python310 " +defineDebugInfoPackage attica6$secondaryArchSuffix \ + $libDir/libKF6Attica.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 \ -Wno-dev - make -Cbuild $jobArgs + make -C build $jobArgs } INSTALL() { - make -Cbuild install + make -C build install prepareInstalledDevelLib \ libKF6Attica diff --git a/kde-frameworks/kcontacts/kcontacts6-6.5.0.recipe b/kde-frameworks/kcontacts/kcontacts6-6.7.0.recipe similarity index 79% rename from kde-frameworks/kcontacts/kcontacts6-6.5.0.recipe rename to kde-frameworks/kcontacts/kcontacts6-6.7.0.recipe index 3131b2854..f6b093df7 100644 --- a/kde-frameworks/kcontacts/kcontacts6-6.5.0.recipe +++ b/kde-frameworks/kcontacts/kcontacts6-6.7.0.recipe @@ -5,7 +5,7 @@ COPYRIGHT="2010-2024 KDE Organisation" LICENSE="GNU LGPL v2.1" REVISION="1" SOURCE_URI="https://download.kde.org/stable/frameworks/${portVersion%.*}/kcontacts-$portVersion.tar.xz" -CHECKSUM_SHA256="b711e098469a5821044bf99bd74d0a16b804731a347cf53609a4bd1b5fa5fdc4" +CHECKSUM_SHA256="292f8104f9f31d62c59289a3a821766d1ec540f4fc513ffc3b6f7197602d42c5" SOURCE_DIR="kcontacts-$portVersion" ARCHITECTURES="all !x86_gcc2" @@ -53,33 +53,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 kcontacts6$secondaryArchSuffix \ + $libDir/libKF6Contacts.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 \ libKF6Contacts diff --git a/kde-frameworks/kfilemetadata/kfilemetadata6-6.5.0.recipe b/kde-frameworks/kfilemetadata/kfilemetadata6-6.7.0.recipe similarity index 83% rename from kde-frameworks/kfilemetadata/kfilemetadata6-6.5.0.recipe rename to kde-frameworks/kfilemetadata/kfilemetadata6-6.7.0.recipe index ed43e630c..2ea9f66e6 100644 --- a/kde-frameworks/kfilemetadata/kfilemetadata6-6.5.0.recipe +++ b/kde-frameworks/kfilemetadata/kfilemetadata6-6.7.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%.*}/kfilemetadata-${portVersion}.tar.xz" -CHECKSUM_SHA256="574419823d7fe389dfc6bc141b0a9151fdada6715b985c8269293c0c04fdc0f4" +CHECKSUM_SHA256="a6242a79e672b523ebf1b2554ebf83aca7a9d5065929b6f152731e9851d008d0" SOURCE_DIR="kfilemetadata-$portVersion" ARCHITECTURES="all !x86_gcc2" @@ -61,30 +61,36 @@ BUILD_REQUIRES=" BUILD_PREREQUIRES=" cmd:cmake cmd:dot - cmd:doxygen >= 1.9 + cmd:doxygen cmd:g++$secondaryArchSuffix cmd:make - cmd:msgfmt - cmd:msgmerge + cmd:msgfmt$secondaryArchSuffix + cmd:msgmerge$secondaryArchSuffix cmd:pkg_config$secondaryArchSuffix - cmd:python3 " +defineDebugInfoPackage kfilemetadata6$secondaryArchSuffix \ + $libDir/libKF6FileMetaData.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 \ libKF6FileMetaData diff --git a/kde-frameworks/kidletime/kidletime6-6.5.0.recipe b/kde-frameworks/kidletime/kidletime6-6.7.0.recipe similarity index 78% rename from kde-frameworks/kidletime/kidletime6-6.5.0.recipe rename to kde-frameworks/kidletime/kidletime6-6.7.0.recipe index cd3444c3c..bd54bbf0b 100644 --- a/kde-frameworks/kidletime/kidletime6-6.5.0.recipe +++ b/kde-frameworks/kidletime/kidletime6-6.7.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%.*}/kidletime-${portVersion}.tar.xz" -CHECKSUM_SHA256="b6dc7d6eadb642248000f165155a72d2dfab6c1a93e0130f8f83394a7628eaf6" +CHECKSUM_SHA256="60a6c70387b63e61147029ce57f170237271411630a3372a0e8d7240b8006aaf" SOURCE_DIR="kidletime-$portVersion" ARCHITECTURES="all !x86_gcc2" @@ -46,31 +46,40 @@ 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 kidletime6$secondaryArchSuffix \ + $libDir/libKF6IdleTime.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 \ - -DWITH_X11=OFF \ -DWITH_WAYLAND=OFF \ + -DWITH_X11=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 prepareInstalledDevelLib \ libKF6IdleTime diff --git a/kde-frameworks/kitemmodels/kitemmodels6-6.5.0.recipe b/kde-frameworks/kitemmodels/kitemmodels6-6.7.0.recipe similarity index 84% rename from kde-frameworks/kitemmodels/kitemmodels6-6.5.0.recipe rename to kde-frameworks/kitemmodels/kitemmodels6-6.7.0.recipe index 31a9773e0..4a457afef 100644 --- a/kde-frameworks/kitemmodels/kitemmodels6-6.5.0.recipe +++ b/kde-frameworks/kitemmodels/kitemmodels6-6.7.0.recipe @@ -21,7 +21,7 @@ COPYRIGHT="2010-2024 KDE Organisation" LICENSE="GNU LGPL v2" REVISION="1" SOURCE_URI="https://download.kde.org/stable/frameworks/${portVersion%.*}/kitemmodels-${portVersion}.tar.xz" -CHECKSUM_SHA256="36ec04b3fd25249a1ce9cfd08824f2c2e40ef4d54224e118e06fa21c5f9a4f76" +CHECKSUM_SHA256="0aa0205323baf2d519ebb8f96ce7ed5524a8164a7440d905f977418bfbe6d349" SOURCE_DIR="kitemmodels-$portVersion" ARCHITECTURES="all !x86_gcc2" @@ -60,31 +60,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 kitemmodels6$secondaryArchSuffix \ + $libDir/libKF6ItemModels.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 \ -Wno-dev - make -Cbuild $jobArgs + make -C build $jobArgs } INSTALL() { - make -Cbuild install + make -C build install prepareInstalledDevelLib \ libKF6ItemModels diff --git a/kde-frameworks/knewstuff/knewstuff6-6.5.0.recipe b/kde-frameworks/knewstuff/knewstuff6-6.7.0.recipe similarity index 84% rename from kde-frameworks/knewstuff/knewstuff6-6.5.0.recipe rename to kde-frameworks/knewstuff/knewstuff6-6.7.0.recipe index e385a4f3c..5775af3e5 100644 --- a/kde-frameworks/knewstuff/knewstuff6-6.5.0.recipe +++ b/kde-frameworks/knewstuff/knewstuff6-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%.*}/knewstuff-${portVersion}.tar.xz" -CHECKSUM_SHA256="815589a660b9a53a1fc18268b95914636124b6f3f3193c9404e0959f8b738c79" +CHECKSUM_SHA256="a4184622d430b64ec7cc4c77113df67c886f359cc89cc6313fbcc71764d23fa7" SOURCE_DIR="knewstuff-$portVersion" ARCHITECTURES="all !x86_gcc2" @@ -70,35 +70,41 @@ 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 knewstuff6$secondaryArchSuffix \ + $libDir/libKF6NewStuffCore.so.$libVersion \ + $libDir/libKF6NewStuffWidgets.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_QCH=ON \ -DBUILD_TESTING=OFF \ -Wno-dev - make -Cbuild $jobArgs + make -C build $jobArgs } INSTALL() { - make -Cbuild install + make -C build install prepareInstalledDevelLibs \ libKF6NewStuffCore \ diff --git a/kde-frameworks/kpackage/kpackage6-6.5.0.recipe b/kde-frameworks/kpackage/kpackage6-6.7.0.recipe similarity index 76% rename from kde-frameworks/kpackage/kpackage6-6.5.0.recipe rename to kde-frameworks/kpackage/kpackage6-6.7.0.recipe index d49c39f92..b53c87c31 100644 --- a/kde-frameworks/kpackage/kpackage6-6.5.0.recipe +++ b/kde-frameworks/kpackage/kpackage6-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%.*}/kpackage-${portVersion}.tar.xz" -CHECKSUM_SHA256="cf3452c1719112047f9a3bd00ab2e1e59ba7b6b4fe620a4353885308508db773" +CHECKSUM_SHA256="916c11f5972760d9a5039643fbc55cde9d11ec18f278d3d63793336ffa442865" SOURCE_DIR="kpackage-$portVersion" ARCHITECTURES="all !x86_gcc2" @@ -49,28 +49,36 @@ 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 " +defineDebugInfoPackage kpackage6$secondaryArchSuffix \ + $libDir/libKF6Package.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 \ libKF6Package diff --git a/kde-frameworks/kparts/kparts6-6.5.0.recipe b/kde-frameworks/kparts/kparts6-6.7.0.recipe similarity index 85% rename from kde-frameworks/kparts/kparts6-6.5.0.recipe rename to kde-frameworks/kparts/kparts6-6.7.0.recipe index 2a68c4187..942be6589 100644 --- a/kde-frameworks/kparts/kparts6-6.5.0.recipe +++ b/kde-frameworks/kparts/kparts6-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%.*}/kparts-${portVersion}.tar.xz" -CHECKSUM_SHA256="4eb5417b267f77c16c85482f919adfb5b7714a95239771c4aafbfeb90e4a371f" +CHECKSUM_SHA256="0b1b305050d61fcbefa7026b096dc6b47709d7435c69b18ab56a7e2ea57d759e" SOURCE_DIR="kparts-$portVersion" ARCHITECTURES="all !x86_gcc2" @@ -83,32 +83,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$secondaryArchSuffix " +defineDebugInfoPackage kparts6$secondaryArchSuffix \ + $libDir/libKF6Parts.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 \ libKF6Parts diff --git a/kde-frameworks/kxmlgui/kxmlgui6-6.5.0.recipe b/kde-frameworks/kxmlgui/kxmlgui6-6.7.0.recipe similarity index 86% rename from kde-frameworks/kxmlgui/kxmlgui6-6.5.0.recipe rename to kde-frameworks/kxmlgui/kxmlgui6-6.7.0.recipe index eaa21f745..668f13ae5 100644 --- a/kde-frameworks/kxmlgui/kxmlgui6-6.5.0.recipe +++ b/kde-frameworks/kxmlgui/kxmlgui6-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%.*}/kxmlgui-${portVersion}.tar.xz" -CHECKSUM_SHA256="75549dd54ae7b3e0bf01c6d82ebe2dcc797195ade223b6986dde9d688c5cd903" +CHECKSUM_SHA256="a451c16d70a591de13973079115f35905e3c42302f5c8c8ae3ec75d76a06fca1" SOURCE_DIR="kxmlgui-$portVersion" ARCHITECTURES="all !x86_gcc2" @@ -89,33 +89,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 kxmlgui6$secondaryArchSuffix \ + $libDir/libKF6XmlGui.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 \ libKF6XmlGui diff --git a/kde-frameworks/syndication/syndication6-6.5.0.recipe b/kde-frameworks/syndication/syndication6-6.7.0.recipe similarity index 82% rename from kde-frameworks/syndication/syndication6-6.5.0.recipe rename to kde-frameworks/syndication/syndication6-6.7.0.recipe index 2d7dd3cba..a11fe3c27 100644 --- a/kde-frameworks/syndication/syndication6-6.5.0.recipe +++ b/kde-frameworks/syndication/syndication6-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%.*}/syndication-${portVersion}.tar.xz" -CHECKSUM_SHA256="cdafc51c9271b00150b8d63bf250d6d040f7bc8c56907af61dc59a44c96c674e" +CHECKSUM_SHA256="c2a485229d8a430858d7f473fe8b133737d93d33a776e46eedfa77bb9e30ba24" SOURCE_DIR="syndication-$portVersion" ARCHITECTURES="all !x86_gcc2" @@ -48,20 +48,28 @@ BUILD_REQUIRES=" BUILD_PREREQUIRES=" cmd:cmake cmd:dot - cmd:doxygen >= 1.9 + cmd:doxygen cmd:g++$secondaryArchSuffix cmd:make cmd:pkg_config$secondaryArchSuffix " +defineDebugInfoPackage syndication6$secondaryArchSuffix \ + $libDir/libKF6Syndication.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 + -DBUILD_TESTING=OFF \ + -Wno-dev make -C build $jobArgs }