From 10287e9ae9f8baeace5105b09bf62b743db12ce1 Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Mon, 9 May 2022 11:15:13 +1000 Subject: [PATCH] extra-cmake-modules: bump version --- ...cipe => extra_cmake_modules-5.93.0.recipe} | 10 +++++-- ...et => extra_cmake_modules-5.93.0.patchset} | 27 ++++++++++++++++++- 2 files changed, 34 insertions(+), 3 deletions(-) rename kde-frameworks/extra-cmake-modules/{extra_cmake_modules-5.91.0.recipe => extra_cmake_modules-5.93.0.recipe} (87%) rename kde-frameworks/extra-cmake-modules/patches/{extra_cmake_modules-5.91.0.patchset => extra_cmake_modules-5.93.0.patchset} (51%) diff --git a/kde-frameworks/extra-cmake-modules/extra_cmake_modules-5.91.0.recipe b/kde-frameworks/extra-cmake-modules/extra_cmake_modules-5.93.0.recipe similarity index 87% rename from kde-frameworks/extra-cmake-modules/extra_cmake_modules-5.91.0.recipe rename to kde-frameworks/extra-cmake-modules/extra_cmake_modules-5.93.0.recipe index 0aaabd3c9..26b940f53 100644 --- a/kde-frameworks/extra-cmake-modules/extra_cmake_modules-5.91.0.recipe +++ b/kde-frameworks/extra-cmake-modules/extra_cmake_modules-5.93.0.recipe @@ -5,11 +5,11 @@ common software, ones that can be used directly in CMakeLists.txt files to \ perform common tasks and toolchain files that must be specified on the \ commandline by the user." HOMEPAGE="https://projects.kde.org/projects/kdesupport/extra-cmake-modules/" -COPYRIGHT="2010-2021 KDE Organisation" +COPYRIGHT="2010-2022 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="9717885e30aadf184fa71511930409cabbf08eb6627ea8b051de8804fbcec54c" +CHECKSUM_SHA256="093dea7b11647bc5f74e6971d47ef15b5c410cba2b4620acae00f008d5480b21" SOURCE_DIR="extra-cmake-modules-$portVersion" PATCHES="extra_cmake_modules-$portVersion.patchset" @@ -41,6 +41,11 @@ BUILD_PREREQUIRES=" cmd:qcollectiongenerator$secondaryArchSuffix " +PATCH() +{ + sed -e '/platforms:/ a \ \ \ \ - name: Haiku' -i $sourceDir/metainfo.yaml +} + BUILD() { mkdir -p build @@ -49,6 +54,7 @@ BUILD() cmake .. \ -DCMAKE_BUILD_TYPE=Release \ -DSHARE_INSTALL_DIR=$dataDir/cmake/Modules + make $jobArgs } diff --git a/kde-frameworks/extra-cmake-modules/patches/extra_cmake_modules-5.91.0.patchset b/kde-frameworks/extra-cmake-modules/patches/extra_cmake_modules-5.93.0.patchset similarity index 51% rename from kde-frameworks/extra-cmake-modules/patches/extra_cmake_modules-5.91.0.patchset rename to kde-frameworks/extra-cmake-modules/patches/extra_cmake_modules-5.93.0.patchset index 0e9fea383..a58b9de7a 100644 --- a/kde-frameworks/extra-cmake-modules/patches/extra_cmake_modules-5.91.0.patchset +++ b/kde-frameworks/extra-cmake-modules/patches/extra_cmake_modules-5.93.0.patchset @@ -1,4 +1,4 @@ -From 5f10d00edc9de8ca3b4263a85043d2bd457ec2bd Mon Sep 17 00:00:00 2001 +From d6038d0eb39858ef9e91c9384812c7ad1ec85a16 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... @@ -21,3 +21,28 @@ index 762cfc6..1cc5e38 100644 -- 2.30.2 + +From 52922b0d4ae5277e66a9a71606e48637bf09bd8b 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 + + +diff --git a/kde-modules/KDEMetaInfoPlatformCheck.cmake b/kde-modules/KDEMetaInfoPlatformCheck.cmake +index 7efcdb7..cb8318d 100644 +--- a/kde-modules/KDEMetaInfoPlatformCheck.cmake ++++ b/kde-modules/KDEMetaInfoPlatformCheck.cmake +@@ -42,6 +42,10 @@ if (NOT "${KF_IGNORE_PLATFORM_CHECK}") + if (WIN32) + set(_MetainfoFoundSupportedPlatform true) + endif() ++ elseif (${CMAKE_MATCH_1} STREQUAL "Haiku") ++ if (HAIKU) ++ set(_MetainfoFoundSupportedPlatform true) ++ endif() + elseif (${CMAKE_MATCH_1} STREQUAL "macOS") + if (CMAKE_SYSTEM_NAME MATCHES "Darwin") + set(_MetainfoFoundSupportedPlatform true) +-- +2.30.2 +