kf6 frameworks, push bulk version bump nr4 (#10952)

2026-04-09 05:10:05 +02:00 · 2024-08-28 11:28:49 +02:00
parent 12f8a383fd
commit a5a1d93469
10 changed files with 70 additions and 36 deletions
--- a/kde-frameworks/attica/attica6-6.5.0.recipe
+++ b/kde-frameworks/attica/attica6-6.5.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="275fb00b3f483704d800484883a3789797a3198b0ce680d85313d9977ffde2f0"
+CHECKSUM_SHA256="6ce80618dc52a7a2c48a425617161ec46b7126d05ecb23076e655fde1d6010e6"
 SOURCE_DIR="attica-$portVersion"

 ARCHITECTURES="all !x86_gcc2"
@@ -49,10 +49,19 @@ BUILD_PREREQUIRES="
 	cmd:pkg_config$secondaryArchSuffix
 	"

+TEST_REQUIRES="
+	cmd:python3
+	cmd:pip3
+	markupsafe_python310
+	chardet_python310
+	jinja_python310
+	"
+
 BUILD()
 {
 	cmake -Bbuild -S. -DCMAKE_BUILD_TYPE=Release \
 		$cmakeDirArgs \
+		-DKDE_INSTALL_QTQCHDIR=$documentationDir/packages/qt6 \
 		-DECM_DIR=/system/data/cmake/Modules/ECM/cmake \
 		-DBUILD_QCH=ON \
 		-DBUILD_TESTING=OFF \
@@ -70,12 +79,15 @@ INSTALL()

 	packageEntries devel \
 		$developDir \
-		$dataDir/doc \
+		$documentationDir \
 		$libDir/cmake
 }

 TEST()
 {
+	pip3 install --user reuse
+	# 50% tests passed, 3 tests failed out of 6
 	export LIBRARY_PATH="$sourceDir/build/bin${LIBRARY_PATH:+:$LIBRARY_PATH}"
-	make -Cbuild test
+	ctest --test-dir build --output-on-failure
+	pip3 uninstall reuse -y
 }
--- a/kde-frameworks/kcontacts/kcontacts6-6.5.0.recipe
+++ b/kde-frameworks/kcontacts/kcontacts6-6.5.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="709ca19e9076f98751764d029b8d648c6a61b17262ba4821cf97f913ccbd1bf9"
+CHECKSUM_SHA256="b711e098469a5821044bf99bd74d0a16b804731a347cf53609a4bd1b5fa5fdc4"
 SOURCE_DIR="kcontacts-$portVersion"

 ARCHITECTURES="all !x86_gcc2"
@@ -56,6 +56,8 @@ BUILD_PREREQUIRES="
 	cmd:doxygen >= 1.9
 	cmd:g++$secondaryArchSuffix
 	cmd:make
+	cmd:msgfmt
+	cmd:msgmerge
 	cmd:python3
 	"

@@ -67,6 +69,8 @@ BUILD()
 {
 	cmake -Bbuild -S. $cmakeDirArgs \
 		-DCMAKE_BUILD_TYPE=Release \
+		-DKDE_INSTALL_QMLDIR=$dataDir/Qt6/qml \
+		-DKDE_INSTALL_QTQCHDIR=$documentationDir/packages/qt6 \
 		-DECM_DIR=/system/data/cmake/Modules/ECM/cmake \
 		-DBUILD_QCH=ON \
 		-DBUILD_TESTING=OFF
@@ -82,13 +86,13 @@ INSTALL()

 	packageEntries devel \
 		$libDir/cmake \
-		$dataDir/doc \
+		$documentationDir \
 		$developDir
 }

 TEST()
 {
-	# 88% tests passed, 4 tests failed out of 32
+	# 91% tests passed, 3 tests failed out of 32
 	export LIBRARY_PATH="$sourceDir/build/bin${LIBRARY_PATH:+:$LIBRARY_PATH}"
-	make -Cbuild test
+	ctest --test-dir build --output-on-failure
 }
--- a/kde-frameworks/kfilemetadata/kfilemetadata6-6.5.0.recipe
+++ b/kde-frameworks/kfilemetadata/kfilemetadata6-6.5.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="106941654024b6165da3fac2622fbebd35ff09f08345ad93a2b2c1abfa177e30"
+CHECKSUM_SHA256="574419823d7fe389dfc6bc141b0a9151fdada6715b985c8269293c0c04fdc0f4"
 SOURCE_DIR="kfilemetadata-$portVersion"

 ARCHITECTURES="all !x86_gcc2"
@@ -44,9 +44,9 @@ BUILD_REQUIRES="
 	qt6_tools${secondaryArchSuffix}_devel
 	devel:libepub$secondaryArchSuffix
 	devel:libexiv2$secondaryArchSuffix
-	devel:libavcodec$secondaryArchSuffix >= 59
-	devel:libavformat$secondaryArchSuffix >= 59
-	devel:libavutil$secondaryArchSuffix >= 57
+	devel:libavcodec$secondaryArchSuffix >= 60
+	devel:libavformat$secondaryArchSuffix >= 60
+	devel:libavutil$secondaryArchSuffix >= 58
 	devel:libKF6Archive$secondaryArchSuffix == $portVersion
 	devel:libKF6Codecs$secondaryArchSuffix == $portVersion
 	devel:libKF6ConfigCore$secondaryArchSuffix == $portVersion
@@ -64,6 +64,8 @@ BUILD_PREREQUIRES="
 	cmd:doxygen >= 1.9
 	cmd:g++$secondaryArchSuffix
 	cmd:make
+	cmd:msgfmt
+	cmd:msgmerge
 	cmd:pkg_config$secondaryArchSuffix
 	cmd:python3
 	"
@@ -73,6 +75,7 @@ BUILD()
 	cmake -Bbuild -S. $cmakeDirArgs \
 		-DCMAKE_BUILD_TYPE=Release \
 		-DKDE_INSTALL_PLUGINDIR=$addOnsDir/Qt6 \
+		-DKDE_INSTALL_QTQCHDIR=$documentationDir/packages/qt6 \
 		-DECM_DIR=/system/data/cmake/Modules/ECM/cmake \
 		-DBUILD_QCH=ON \
 		-DBUILD_TESTING=OFF
@@ -88,13 +91,13 @@ INSTALL()

 	packageEntries devel \
 		$developDir \
-		$dataDir/doc \
+		$documentationDir \
 		$libDir/cmake
 }

 TEST()
 {
-	# 92% tests passed, 2 tests failed out of 25
+	# 89% tests passed, 3 tests failed out of 28
 	export LIBRARY_PATH="$sourceDir/build/bin${LIBRARY_PATH:+:$LIBRARY_PATH}"
-	make -Cbuild test
+	ctest --test-dir build --output-on-failure
 }
--- a/kde-frameworks/kidletime/kidletime6-6.5.0.recipe
+++ b/kde-frameworks/kidletime/kidletime6-6.5.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="069182e4abfb83f93661d5bb0eaeb14b44e3705fa3492dbdb8ec03bfe6e3d9dc"
+CHECKSUM_SHA256="b6dc7d6eadb642248000f165155a72d2dfab6c1a93e0130f8f83394a7628eaf6"
 SOURCE_DIR="kidletime-$portVersion"

 ARCHITECTURES="all !x86_gcc2"
@@ -59,6 +59,7 @@ BUILD()
 {
 	cmake -Bbuild -S. $cmakeDirArgs \
 		-DCMAKE_BUILD_TYPE=Release \
+		-DKDE_INSTALL_QTQCHDIR=$documentationDir/packages/qt6 \
 		-DECM_DIR=/system/data/cmake/Modules/ECM/cmake \
 		-DWITH_X11=OFF \
 		-DWITH_WAYLAND=OFF \
@@ -76,14 +77,14 @@ INSTALL()

 	packageEntries devel \
 		$developDir \
-		$dataDir/doc \
+		$documentationDir \
 		$libDir/cmake
 }

 TEST()
 {
-	make -Cbuild test
 	# manual test, kf.idletime: Could not find any system poller plugin
 	# export LIBRARY_PATH="$sourceDir/build/bin${LIBRARY_PATH:+:$LIBRARY_PATH}"
+	ctest --test-dir build --output-on-failure
 	# build/bin/kidletime_example
 }
--- a/kde-frameworks/kitemmodels/kitemmodels6-6.5.0.recipe
+++ b/kde-frameworks/kitemmodels/kitemmodels6-6.5.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="c066888313260d75a207939334b056b4014ba7364b437325561790eb7b3742ba"
+CHECKSUM_SHA256="36ec04b3fd25249a1ce9cfd08824f2c2e40ef4d54224e118e06fa21c5f9a4f76"
 SOURCE_DIR="kitemmodels-$portVersion"

 ARCHITECTURES="all !x86_gcc2"
@@ -74,6 +74,7 @@ BUILD()
 	cmake -Bbuild -S. $cmakeDirArgs \
 		-DCMAKE_BUILD_TYPE=Release \
 		-DKDE_INSTALL_QMLDIR=$dataDir/Qt6/qml \
+		-DKDE_INSTALL_QTQCHDIR=$documentationDir/packages/qt6 \
 		-DECM_DIR=/system/data/cmake/Modules/ECM/cmake \
 		-DBUILD_QCH=ON \
 		-DBUILD_TESTING=OFF \
@@ -90,12 +91,12 @@ INSTALL()

 	packageEntries devel \
 		$developDir \
-		$dataDir/doc \
+		$documentationDir \
 		$libDir/cmake
 }

 TEST()
 {
 	export LIBRARY_PATH=$LIBRARY_PATH:$sourceDir/build/bin
-	make -Cbuild test
+	ctest --test-dir build --output-on-failure
 }
--- a/kde-frameworks/knewstuff/knewstuff6-6.5.0.recipe
+++ b/kde-frameworks/knewstuff/knewstuff6-6.5.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="f54962756b8eb98c67840352a1efea4698f15a17d4bc8282f65adb0db08c5780"
+CHECKSUM_SHA256="815589a660b9a53a1fc18268b95914636124b6f3f3193c9404e0959f8b738c79"
 SOURCE_DIR="knewstuff-$portVersion"

 ARCHITECTURES="all !x86_gcc2"
@@ -73,6 +73,8 @@ BUILD_PREREQUIRES="
 	cmd:doxygen >= 1.9
 	cmd:g++$secondaryArchSuffix
 	cmd:make
+	cmd:msgfmt
+	cmd:msgmerge
 	cmd:python3
 	"

@@ -86,6 +88,7 @@ BUILD()
 		-DCMAKE_BUILD_TYPE=Release \
 		-DKDE_INSTALL_QMLDIR=$dataDir/Qt6/qml \
 		-DKDE_INSTALL_QTPLUGINDIR=$addOnsDir/Qt6 \
+		-DKDE_INSTALL_QTQCHDIR=$documentationDir/packages/qt6 \
 		-DECM_DIR=/system/data/cmake/Modules/ECM/cmake \
 		-DBUILD_QCH=ON  \
 		-DBUILD_TESTING=OFF \
@@ -103,12 +106,12 @@ INSTALL()

 	packageEntries devel \
 		$developDir \
-		$dataDir/doc \
+		$documentationDir \
 		$libDir/cmake
 }

 TEST()
 {
 	export LIBRARY_PATH=$LIBRARY_PATH:$sourceDir/build/bin
-	make -Cbuild test
+	ctest --test-dir build --output-on-failure
 }
--- a/kde-frameworks/kpackage/kpackage6-6.5.0.recipe
+++ b/kde-frameworks/kpackage/kpackage6-6.5.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="78c8466d7201f2aa6809d98588242aef6314be4a47155617c529c6a0549f395d"
+CHECKSUM_SHA256="cf3452c1719112047f9a3bd00ab2e1e59ba7b6b4fe620a4353885308508db773"
 SOURCE_DIR="kpackage-$portVersion"

 ARCHITECTURES="all !x86_gcc2"
@@ -52,6 +52,8 @@ BUILD_PREREQUIRES="
 	cmd:doxygen >= 1.9
 	cmd:g++$secondaryArchSuffix
 	cmd:make
+	cmd:msgfmt
+	cmd:msgmerge
 	cmd:python3
 	"

@@ -59,6 +61,7 @@ BUILD()
 {
 	cmake -Bbuild -S. $cmakeDirArgs \
 		-DCMAKE_BUILD_TYPE=Release \
+		-DKDE_INSTALL_QTQCHDIR=$documentationDir/packages/qt6 \
 		-DECM_DIR=/system/data/cmake/Modules/ECM/cmake \
 		-DBUILD_QCH=ON \
 		-DBUILD_TESTING=OFF
@@ -74,12 +77,12 @@ INSTALL()

 	packageEntries devel \
 		$developDir \
-		$dataDir/doc \
+		$documentationDir \
 		$libDir/cmake
 }

 TEST()
 {
 	export LIBRARY_PATH="$sourceDir/build/bin${LIBRARY_PATH:+:$LIBRARY_PATH}"
-	make -Cbuild test
+	ctest --test-dir build --output-on-failure
 }
--- a/kde-frameworks/ktextwidgets/ktextwidgets6-6.5.0.recipe
+++ b/kde-frameworks/ktextwidgets/ktextwidgets6-6.5.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="469368c341265865e2562ab6d3be754db96896280bdca90c134127b1501ab5ed"
+CHECKSUM_SHA256="a99df1c634831e9d01f704009c951378108334a4258ad5b64f60f55e55770212"
 SOURCE_DIR="ktextwidgets-$portVersion"

 ARCHITECTURES="all !x86_gcc2"
@@ -87,6 +87,8 @@ BUILD_PREREQUIRES="
 	cmd:doxygen >= 1.9
 	cmd:g++$secondaryArchSuffix
 	cmd:make
+	cmd:msgfmt
+	cmd:msgmerge
 	cmd:python3
 	"

@@ -99,6 +101,7 @@ BUILD()
 	cmake -Bbuild -S. $cmakeDirArgs \
 		-DCMAKE_BUILD_TYPE=Release \
 		-DKDE_INSTALL_QTPLUGINDIR=$addOnsDir/Qt5 \
+		-DKDE_INSTALL_QTQCHDIR=$documentationDir/packages/qt6 \
 		-DECM_DIR=/system/data/cmake/Modules/ECM/cmake \
 		-DBUILD_QCH=ON \
 		-DBUILD_TESTING=OFF
@@ -114,12 +117,12 @@ INSTALL()

 	packageEntries devel \
 		$developDir \
-		$dataDir/doc \
+		$documentationDir \
 		$libDir/cmake
 }

 TEST()
 {
 	export LIBRARY_PATH="$sourceDir/build/bin${LIBRARY_PATH:+:$LIBRARY_PATH}"
-	make -Cbuild test
+	ctest --test-dir build --output-on-failure
 }
--- a/kde-frameworks/kxmlgui/kxmlgui6-6.5.0.recipe
+++ b/kde-frameworks/kxmlgui/kxmlgui6-6.5.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="ff22a79fca2737e33c5463d87fad2b46920c8d48c6583268a9ae27097a8ac902"
+CHECKSUM_SHA256="75549dd54ae7b3e0bf01c6d82ebe2dcc797195ade223b6986dde9d688c5cd903"
 SOURCE_DIR="kxmlgui-$portVersion"

 ARCHITECTURES="all !x86_gcc2"
@@ -41,7 +41,7 @@ REQUIRES="
 	lib:libKF6WidgetsAddons$secondaryArchSuffix
 	lib:libKF6WindowSystem$secondaryArchSuffix
 	lib:libQt6Core$secondaryArchSuffix
-	lib:libQt6DBus$secondaryArchSuffix
+#	lib:libQt6DBus$secondaryArchSuffix
 	lib:libQt6Gui$secondaryArchSuffix
 	lib:libQt6Network$secondaryArchSuffix
 	lib:libQt6PrintSupport$secondaryArchSuffix
@@ -78,7 +78,7 @@ BUILD_REQUIRES="
 	devel:libKF6WidgetsAddons$secondaryArchSuffix == $portVersion
 	devel:libKF6WindowSystem$secondaryArchSuffix == $portVersion
 	devel:libQt6Core$secondaryArchSuffix
-	devel:libQt6DBus$secondaryArchSuffix
+#	devel:libQt6DBus$secondaryArchSuffix
 	devel:libQt6Gui$secondaryArchSuffix
 	devel:libQt6Network$secondaryArchSuffix
 	devel:libQt6PrintSupport$secondaryArchSuffix
@@ -92,6 +92,8 @@ BUILD_PREREQUIRES="
 	cmd:doxygen >= 1.9
 	cmd:g++$secondaryArchSuffix
 	cmd:make
+	cmd:msgfmt
+	cmd:msgmerge
 	cmd:python3
 	"

@@ -104,6 +106,7 @@ BUILD()
 	cmake -Bbuild -S. $cmakeDirArgs \
 		-DCMAKE_BUILD_TYPE=Release \
 		-DKDE_INSTALL_QTPLUGINDIR=$addOnsDir/Qt5 \
+		-DKDE_INSTALL_QTQCHDIR=$documentationDir/packages/qt6 \
 		-DECM_DIR=/system/data/cmake/Modules/ECM/cmake \
 		-DBUILD_QCH=ON \
 		-DBUILD_TESTING=OFF
@@ -119,7 +122,7 @@ INSTALL()

 	packageEntries devel \
 		$developDir \
-		$dataDir/doc \
+		$documentationDir \
 		$libDir/cmake
 }

@@ -127,5 +130,5 @@ TEST()
 {
 	# 67% tests passed, 2 tests failed out of 6
 	export LIBRARY_PATH="$sourceDir/build/bin${LIBRARY_PATH:+:$LIBRARY_PATH}"
-	make -Cbuild test
+	ctest --test-dir build --output-on-failure
 }
--- a/kde-frameworks/syndication/syndication6-6.5.0.recipe
+++ b/kde-frameworks/syndication/syndication6-6.5.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="50ec3843a08ec7b185352c94b89bc2d2720ceaf17eb961a4c3da55f93d05af3c"
+CHECKSUM_SHA256="cdafc51c9271b00150b8d63bf250d6d040f7bc8c56907af61dc59a44c96c674e"
 SOURCE_DIR="syndication-$portVersion"

 ARCHITECTURES="all !x86_gcc2"
@@ -58,6 +58,7 @@ BUILD()
 {
 	cmake -Bbuild -S. $cmakeDirArgs \
 		-DCMAKE_BUILD_TYPE=Release \
+		-DKDE_INSTALL_QTQCHDIR=$documentationDir/packages/qt6 \
 		-DECM_DIR=/system/data/cmake/Modules/ECM/cmake \
 		-DBUILD_QCH=ON \
 		-DBUILD_TESTING=OFF
@@ -73,7 +74,7 @@ INSTALL()

 	packageEntries devel \
 		$developDir \
-		$dataDir/doc \
+		$documentationDir \
 		$libDir/cmake
 }