diff --git a/kde-frameworks/extra-cmake-modules/extra_cmake_modules-5.65.0.recipe b/kde-frameworks/extra-cmake-modules/extra_cmake_modules-5.65.0.recipe index de582f2d4..68dab94d7 100644 --- a/kde-frameworks/extra-cmake-modules/extra_cmake_modules-5.65.0.recipe +++ b/kde-frameworks/extra-cmake-modules/extra_cmake_modules-5.65.0.recipe @@ -7,10 +7,11 @@ commandline by the user." HOMEPAGE="https://projects.kde.org/projects/kdesupport/extra-cmake-modules/" COPYRIGHT="2010-2019 KDE Organisation" LICENSE="BSD (2-clause)" -REVISION="1" +REVISION="2" SOURCE_URI="https://download.kde.org/stable/frameworks/${portVersion%.*}/extra-cmake-modules-$portVersion.tar.xz" CHECKSUM_SHA256="41634536ca1165a758acd85aa11112177616019e2d3974693a92d1d9bc91c105" SOURCE_DIR="extra-cmake-modules-$portVersion" +PATCHES="extra_cmake_modules-$portVersion.patchset" ARCHITECTURES="!x86_gcc2 x86_64" SECONDARY_ARCHITECTURES="x86" diff --git a/kde-frameworks/extra-cmake-modules/patches/extra_cmake_modules-5.65.0.patchset b/kde-frameworks/extra-cmake-modules/patches/extra_cmake_modules-5.65.0.patchset new file mode 100644 index 000000000..7df1c949b --- /dev/null +++ b/kde-frameworks/extra-cmake-modules/patches/extra_cmake_modules-5.65.0.patchset @@ -0,0 +1,23 @@ +From 6f074d5b4ae795af81f253a0d2722184547919a1 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... +if the source directory is a git clone + + +diff --git a/kde-modules/KDECompilerSettings.cmake b/kde-modules/KDECompilerSettings.cmake +index 11e7f56..fdc081f 100644 +--- a/kde-modules/KDECompilerSettings.cmake ++++ b/kde-modules/KDECompilerSettings.cmake +@@ -74,7 +74,7 @@ include("${ECM_MODULE_DIR}/ECMSourceVersionControl.cmake") + # source directory is a git clone. + # Otherwise, leave it empty, to let distro packagers choose the flags. + ############################################################ +-if (ECM_SOURCE_UNDER_VERSION_CONTROL AND NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES) ++if (ECM_SOURCE_UNDER_VERSION_CONTROL AND NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES AND NOT HAIKU) + set(default_build_type "Debug") + message(STATUS "Setting build type to '${default_build_type}' as none was specified.") + set_property(CACHE CMAKE_BUILD_TYPE PROPERTY VALUE "${default_build_type}") +-- +2.24.0 +