From 1311bfa8e3423aa6cebfa660d1519637945462c5 Mon Sep 17 00:00:00 2001 From: Schrijvers Luc Date: Sat, 14 Dec 2024 10:49:06 +0100 Subject: [PATCH] ECM, bump version (#11447) --- ...ules-6.7.0.recipe => extra_cmake_modules-6.9.0.recipe} | 8 ++++---- ...-6.7.0.patchset => extra_cmake_modules-6.9.0.patchset} | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) rename kde-frameworks/extra-cmake-modules/{extra_cmake_modules-6.7.0.recipe => extra_cmake_modules-6.9.0.recipe} (89%) rename kde-frameworks/extra-cmake-modules/patches/{extra_cmake_modules-6.7.0.patchset => extra_cmake_modules-6.9.0.patchset} (94%) diff --git a/kde-frameworks/extra-cmake-modules/extra_cmake_modules-6.7.0.recipe b/kde-frameworks/extra-cmake-modules/extra_cmake_modules-6.9.0.recipe similarity index 89% rename from kde-frameworks/extra-cmake-modules/extra_cmake_modules-6.7.0.recipe rename to kde-frameworks/extra-cmake-modules/extra_cmake_modules-6.9.0.recipe index 911cb950e..eac0b34b3 100644 --- a/kde-frameworks/extra-cmake-modules/extra_cmake_modules-6.7.0.recipe +++ b/kde-frameworks/extra-cmake-modules/extra_cmake_modules-6.9.0.recipe @@ -9,7 +9,7 @@ COPYRIGHT="2010-2024 KDE Organisation" LICENSE="BSD (2-clause)" REVISION="1" SOURCE_URI="https://download.kde.org/stable/frameworks/${portVersion%.*}/extra-cmake-modules-$portVersion.tar.xz" -CHECKSUM_SHA256="d81de82692d3d2bb77110332a65c8266252becc2c3f307ce814990ce5607b8dc" +CHECKSUM_SHA256="cec06b25e166edb71a1a973641c4f5fc3c8712dde3fb3e639db586515cc1642e" SOURCE_DIR="extra-cmake-modules-$portVersion" PATCHES="extra_cmake_modules-$portVersion.patchset" @@ -46,6 +46,7 @@ BUILD_PREREQUIRES=" cmd:make cmd:msgfmt$secondaryArchSuffix cmd:msgmerge$secondaryArchSuffix + cmd:pkg_config$secondaryArchSuffix cmd:python3 sphinx_python310 " @@ -56,7 +57,7 @@ BUILD() -DSHARE_INSTALL_DIR=$dataDir/cmake/Modules \ -DDOC_INSTALL_DIR=$docDir \ -DMAN_INSTALL_DIR=$manDir \ - -DBUILD_WITH_QT6=ON + -DBUILD_TESTING=OFF make -Cbuild $jobArgs } @@ -70,6 +71,5 @@ INSTALL() TEST() { - # 99% tests passed, 1 tests failed out of 95 - make -Cbuild test + ctest --test-dir build --output-on-failure -E KDEFetchTranslations } diff --git a/kde-frameworks/extra-cmake-modules/patches/extra_cmake_modules-6.7.0.patchset b/kde-frameworks/extra-cmake-modules/patches/extra_cmake_modules-6.9.0.patchset similarity index 94% rename from kde-frameworks/extra-cmake-modules/patches/extra_cmake_modules-6.7.0.patchset rename to kde-frameworks/extra-cmake-modules/patches/extra_cmake_modules-6.9.0.patchset index 2df2657b0..8f990559f 100644 --- a/kde-frameworks/extra-cmake-modules/patches/extra_cmake_modules-6.7.0.patchset +++ b/kde-frameworks/extra-cmake-modules/patches/extra_cmake_modules-6.9.0.patchset @@ -1,4 +1,4 @@ -From 8cd3ce0a727326dc7ee310057e329473852c0162 Mon Sep 17 00:00:00 2001 +From fd5382f1c23ab18396e210a64b6354d83409f516 Mon Sep 17 00:00:00 2001 From: Sergei Reznikov Date: Mon, 16 Dec 2019 16:01:30 +0300 Subject: don't default to using debug build type on Haiku... @@ -22,7 +22,7 @@ index 97657fb..7f83365 100644 2.45.2 -From 1dc1af3527d798798ece20e9c44ff5802dbdd06c Mon Sep 17 00:00:00 2001 +From 181f6ed9568a268494ce25b2af032b35a2a04fee Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Sun, 8 May 2022 21:16:49 +1000 Subject: Add Haiku platform check @@ -47,7 +47,7 @@ index 7e354dd..357f4b6 100644 2.45.2 -From 6abbfdd7c4a26892c78ea659c4d5299dd454edde Mon Sep 17 00:00:00 2001 +From 3591d58cd260d792e9334d8d025c3bbe4135af75 Mon Sep 17 00:00:00 2001 From: Schrijvers Luc Date: Wed, 28 Feb 2024 11:48:23 +0100 Subject: demote_unsupported_platform_error_to_a_warning