From b2ecb6350c0752ace9a1bc534f0c00d2bdae1ebc Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Mon, 9 May 2022 13:11:31 +1000
Subject: [PATCH] kcrash: bump version

---
 ...ash-5.86.0.recipe => kcrash-5.93.0.recipe} | 16 ++++++++----
 ...5.86.0.patchset => kcrash-5.93.0.patchset} | 26 +++++++++----------
 2 files changed, 24 insertions(+), 18 deletions(-)
 rename kde-frameworks/kcrash/{kcrash-5.86.0.recipe => kcrash-5.93.0.recipe} (83%)
 rename kde-frameworks/kcrash/patches/{kcrash-5.86.0.patchset => kcrash-5.93.0.patchset} (50%)

diff --git a/kde-frameworks/kcrash/kcrash-5.86.0.recipe b/kde-frameworks/kcrash/kcrash-5.93.0.recipe
similarity index 83%
rename from kde-frameworks/kcrash/kcrash-5.86.0.recipe
rename to kde-frameworks/kcrash/kcrash-5.93.0.recipe
index ad39b0902..4f9705525 100644
--- a/kde-frameworks/kcrash/kcrash-5.86.0.recipe
+++ b/kde-frameworks/kcrash/kcrash-5.93.0.recipe
@@ -2,11 +2,11 @@ SUMMARY="Graceful handling of application crashes"
 DESCRIPTION="KCrash provides support for intercepting and handling \
 application crashes."
 HOMEPAGE="https://github.com/KDE/kcrash/"
-COPYRIGHT="2010-2021 KDE Organisation"
+COPYRIGHT="2010-2022 KDE Organisation"
 LICENSE="GNU LGPL v2"
 REVISION="1"
 SOURCE_URI="https://github.com/KDE/kcrash/archive/v$portVersion.tar.gz"
-CHECKSUM_SHA256="859319df4bb748c7357ef928e4f864f6158f0329fd67cd976412e6865411a11e"
+CHECKSUM_SHA256="222da2acf35e2e32b0ca61d02de777d078e3d0b240253fae459438bdb045ddb0"
 PATCHES="kcrash-$portVersion.patchset"
 
 ARCHITECTURES="all !x86_gcc2"
@@ -38,9 +38,9 @@ BUILD_REQUIRES="
 	extra_cmake_modules$secondaryArchSuffix >= $portVersion
 	devel:libKF5CoreAddons$secondaryArchSuffix == $portVersion
 	devel:libKF5WindowSystem$secondaryArchSuffix == $portVersion
-	devel:libQt5Core$secondaryArchSuffix >= 5.7
-	devel:libQt5Gui$secondaryArchSuffix >= 5.7
-	devel:libQt5Widgets$secondaryArchSuffix >= 5.7
+	devel:libQt5Core$secondaryArchSuffix
+	devel:libQt5Gui$secondaryArchSuffix
+	devel:libQt5Widgets$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
 	cmd:cmake
@@ -48,6 +48,11 @@ BUILD_PREREQUIRES="
 	cmd:make
 	"
 
+PATCH()
+{
+	sed -e '/platforms:/ a \ \ \ \ - name: Haiku' -i $sourceDir/metainfo.yaml
+}
+
 BUILD()
 {
 	mkdir -p build
@@ -57,6 +62,7 @@ BUILD()
 		-DCMAKE_BUILD_TYPE=Release \
 		-DECM_MKSPECS_INSTALL_DIR=$dataDir/Qt5/mkspecs \
 		-DECM_DIR=/system/data/cmake/Modules/ECM/cmake
+
 	make $jobArgs
 }
 
diff --git a/kde-frameworks/kcrash/patches/kcrash-5.86.0.patchset b/kde-frameworks/kcrash/patches/kcrash-5.93.0.patchset
similarity index 50%
rename from kde-frameworks/kcrash/patches/kcrash-5.86.0.patchset
rename to kde-frameworks/kcrash/patches/kcrash-5.93.0.patchset
index ee575eadc..42a824c2d 100644
--- a/kde-frameworks/kcrash/patches/kcrash-5.86.0.patchset
+++ b/kde-frameworks/kcrash/patches/kcrash-5.93.0.patchset
@@ -1,32 +1,32 @@
-From 71ac8a5c8a97ae4bfc5e24868de731ffcc64f649 Mon Sep 17 00:00:00 2001
+From 858c978f42889e6af4055947cb7ffb16d7fc7d94 Mon Sep 17 00:00:00 2001
 From: Sergei Reznikov <diver@gelios.net>
 Date: Mon, 14 Dec 2020 17:02:02 +0300
 Subject: Fix build on Haiku
 
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 3f4e85e..af6e6d4 100644
+index 14e0362..77126bf 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -18,7 +18,7 @@ include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE)
- include(KDECMakeSettings)
- include(KDEGitCommitHooks)
+@@ -20,7 +20,7 @@ include(ECMDeprecationSettings)
+ set(REQUIRED_QT_VERSION 5.15.2)
+ find_package(Qt${QT_MAJOR_VERSION} ${REQUIRED_QT_VERSION} CONFIG REQUIRED Core)
  
 -if (UNIX AND NOT APPLE AND NOT ANDROID)
 +if (UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAIKU)
-     find_package(X11)
-     find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED COMPONENTS X11Extras)
- endif()
+     option(WITH_X11 "Build with X11 integration" ON)
+ else()
+     set(WITH_X11 OFF)
 diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 0e8ce9a..2a036b4 100644
+index 7257657..aea4b94 100644
 --- a/src/CMakeLists.txt
 +++ b/src/CMakeLists.txt
-@@ -24,7 +24,7 @@ add_library(KF5::Crash ALIAS KF5Crash)
+@@ -27,7 +27,7 @@ generate_export_header(KF5Crash BASE_NAME KCrash)
  
- target_include_directories(KF5Crash INTERFACE "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR_KF5}/KCrash>")
+ target_include_directories(KF5Crash INTERFACE "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR_KF}/KCrash>")
  
--target_link_libraries(KF5Crash PUBLIC Qt5::Core)
-+target_link_libraries(KF5Crash PUBLIC Qt5::Core network)
+-target_link_libraries(KF5Crash PUBLIC Qt${QT_MAJOR_VERSION}::Core)
++target_link_libraries(KF5Crash PUBLIC Qt${QT_MAJOR_VERSION}::Core network)
  target_link_libraries(KF5Crash PRIVATE KF5::CoreAddons KF5::WindowSystem)
  
  # FIXME: It is needed to work around undefined reference error on FreeBSD