haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-23 12:10:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

kcrash6, bump version (#10949)

Browse Source
This commit is contained in:
Schrijvers Luc
2024-08-28 10:54:13 +02:00
committed by GitHub
parent 0485d9506c
commit 7adcfae886
3 changed files with 30 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
kde-frameworks/kcrash/kcrash6-6.2.0.recipe → kde-frameworks/kcrash/kcrash6-6.5.0.recipe
View File

@@ -6,7 +6,7 @@ COPYRIGHT="2010-2024 KDE Organisation"
LICENSE="GNU LGPL v2"
REVISION="1"
SOURCE_URI="https://download.kde.org/stable/frameworks/${portVersion%.*}/kcrash-${portVersion}.tar.xz"
CHECKSUM_SHA256="00b7b4885cb2a92e832816e9cc1da8cf5cccc4c4482c13648f020988c86cf588"
CHECKSUM_SHA256="870c6ce15132cc3040bc593447125ed3c256b698ba233b758430f4e725319bf3"
SOURCE_DIR="kcrash-$portVersion"
PATCHES="kcrash-$portVersion.patchset"
@@ -64,7 +64,9 @@ 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 \
-DBUILD_QCH=ON \
-DBUILD_TESTING=OFF
make -Cbuild $jobArgs
@@ -79,13 +81,13 @@ INSTALL()
packageEntries devel \
$developDir \
$dataDir/doc \
$documentationDir \
$libDir/cmake
}
TEST()
{
# 67% tests passed, 1 tests failed out of 3
export LIBRARY_PATH="$sourceDir/build/bin${LIBRARY_PATH:+:$LIBRARY_PATH}"
make -Cbuild test
export LIBRARY_PATH=$LIBRARY_PATH:$sourceDir/build/bin
ctest --test-dir build --output-on-failure
}

37
kde-frameworks/kcrash/patches/kcrash-6.2.0.patchset
View File

@@ -1,37 +0,0 @@
From 08fd8b8a2cbd606a1e735c2c7c39e322022029fd Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Sun, 25 Feb 2024 21:57:58 +1000
Subject: Fix build on Haiku
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4818ffa..fee977d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -23,7 +23,7 @@ include(ECMDeprecationSettings)
set(REQUIRED_QT_VERSION 6.5.0)
find_package(Qt6 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Core Gui)
-if (UNIX AND NOT APPLE AND NOT ANDROID)
+if (UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAIKU)
option(WITH_X11 "Build with X11 integration" ON)
else()
set(WITH_X11 OFF)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 3bdb2b5..fd3f1b7 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -47,6 +47,10 @@ target_include_directories(KF6Crash INTERFACE "$<INSTALL_INTERFACE:${KDE_INSTALL
target_link_libraries(KF6Crash PUBLIC Qt6::Core)
target_link_libraries(KF6Crash PRIVATE Qt6::Gui KF6::CoreAddons)
+if (HAIKU)
+ target_link_libraries(KF6Crash PRIVATE network)
+endif ()
+
# FIXME: It is needed to work around undefined reference error on FreeBSD
# caused by --no-undefined because the `environ' variable does not exist
# in libc.so.7 -- it is in crt1.o, and so not available to shared
--
2.43.2

24
kde-frameworks/kcrash/patches/kcrash-6.5.0.patchset Normal file
View File

@@ -0,0 +1,24 @@
From 6c9c8f122b6cf4a04585de415ecbf372d3e8c737 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Sun, 25 Feb 2024 21:57:58 +1000
Subject: Fix build on Haiku
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 16c520c..7bdf9d1 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -47,6 +47,10 @@ target_include_directories(KF6Crash INTERFACE "$<INSTALL_INTERFACE:${KDE_INSTALL
target_link_libraries(KF6Crash PUBLIC Qt6::Core)
target_link_libraries(KF6Crash PRIVATE Qt6::Gui Qt6::OpenGL KF6::CoreAddons)
+if (HAIKU)
+ target_link_libraries(KF6Crash PRIVATE network)
+endif ()
+
# FIXME: It is needed to work around undefined reference error on FreeBSD
# caused by --no-undefined because the `environ' variable does not exist
# in libc.so.7 -- it is in crt1.o, and so not available to shared
--
2.45.2