diff --git a/kde-frameworks/kcoreaddons/kcoreaddons6-6.2.0.recipe b/kde-frameworks/kcoreaddons/kcoreaddons6-6.5.0.recipe similarity index 76% rename from kde-frameworks/kcoreaddons/kcoreaddons6-6.2.0.recipe rename to kde-frameworks/kcoreaddons/kcoreaddons6-6.5.0.recipe index c5982f9f3..a60d85d2b 100644 --- a/kde-frameworks/kcoreaddons/kcoreaddons6-6.2.0.recipe +++ b/kde-frameworks/kcoreaddons/kcoreaddons6-6.5.0.recipe @@ -4,13 +4,13 @@ various tasks such as manipulating mime types, autosaving files, creating \ backup files, generating random sequences, performing text manipulations such \ as macro replacement, accessing user information and many more." HOMEPAGE="https://invent.kde.org/frameworks/kcoreaddons" -COPYRIGHT="2010-202 KDE Organisation" +COPYRIGHT="2010-2024 KDE Organisation" LICENSE="GNU LGPL v2" REVISION="1" SOURCE_URI="https://download.kde.org/stable/frameworks/${portVersion%.*}/kcoreaddons-${portVersion}.tar.xz" -CHECKSUM_SHA256="3f9836a3ce5e72883bf032587b745ce55435aa7627174579d2e018da717338ed" +CHECKSUM_SHA256="5e0e1d29dcd4e04e74584df1577d3ae9ffbd47ccdb84ee5622d1ed2373e5ef98" SOURCE_DIR="kcoreaddons-$portVersion" -PATCHES="kcoreaddons6-$portVersion.patchset" +PATCHES="kcoreaddons-$portVersion.patchset" ARCHITECTURES="all !x86_gcc2" SECONDARY_ARCHITECTURES="x86" @@ -41,6 +41,7 @@ REQUIRES_devel=" BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel extra_cmake_modules$secondaryArchSuffix >= $portVersion + shared_mime_info$secondaryArchSuffix qt6_tools${secondaryArchSuffix}_devel devel:libQt6Core$secondaryArchSuffix devel:libQt6Qml$secondaryArchSuffix @@ -53,11 +54,16 @@ BUILD_PREREQUIRES=" cmd:make " +TEST_REQUIRES=" + qthaikuplugins$secondaryArchSuffix + " + BUILD() { cmake -Bbuild -S. $cmakeDirArgs \ -DCMAKE_BUILD_TYPE=Release \ -DKDE_INSTALL_QMLDIR=$dataDir/Qt6/qml \ + -DKDE_INSTALL_QTQCHDIR=$documentationDir/packages/qt6 \ -DECM_DIR=/system/data/cmake/Modules/ECM/cmake \ -DBUILD_QCH=ON \ -DBUILD_TESTING=OFF \ @@ -69,18 +75,22 @@ INSTALL() { make -Cbuild install + # don't mess with shared_mime_info files + rm -rf $dataDir/mime/{aliases,generic-icons,globs,globs2,icons,magic} + rm -rf $dataDir/mime/{mime.cache,subclasses,treemagic,types,version,XMLnamespaces} + prepareInstalledDevelLib \ libKF6CoreAddons packageEntries devel \ $developDir \ - $dataDir/doc \ + $documentationDir \ $libDir/cmake } TEST() { - # 74% tests passed, 8 tests failed out of 31 (2 crashes) + # 77% tests passed, 7 tests failed out of 31 export LIBRARY_PATH="$sourceDir/build/bin${LIBRARY_PATH:+:$LIBRARY_PATH}" - make -Cbuild test + ctest --test-dir build --output-on-failure } diff --git a/kde-frameworks/kcoreaddons/patches/kcoreaddons6-6.2.0.patchset b/kde-frameworks/kcoreaddons/patches/kcoreaddons-6.5.0.patchset similarity index 86% rename from kde-frameworks/kcoreaddons/patches/kcoreaddons6-6.2.0.patchset rename to kde-frameworks/kcoreaddons/patches/kcoreaddons-6.5.0.patchset index 26d8d505d..4fc83bba6 100644 --- a/kde-frameworks/kcoreaddons/patches/kcoreaddons6-6.2.0.patchset +++ b/kde-frameworks/kcoreaddons/patches/kcoreaddons-6.5.0.patchset @@ -1,4 +1,4 @@ -From ee8fd3891ea0029b45267788d3794cbc51562be9 Mon Sep 17 00:00:00 2001 +From 8b0356308b856a8d6a6b3f812ea1c501db660d2b Mon Sep 17 00:00:00 2001 From: Sergei Reznikov Date: Sat, 23 Sep 2017 02:08:00 +0300 Subject: Fix build on Haiku @@ -18,10 +18,10 @@ index ecd376b..5d26c2c 100644 #define KSDC_SEMAPHORES_SUPPORTED 1 #endif diff --git a/src/lib/io/kfilesystemtype.cpp b/src/lib/io/kfilesystemtype.cpp -index 1c61d28..123cdb8 100644 +index fe3631f..d84337f 100644 --- a/src/lib/io/kfilesystemtype.cpp +++ b/src/lib/io/kfilesystemtype.cpp -@@ -224,12 +224,12 @@ KFileSystemType::Type determineFileSystemTypeImpl(const QByteArray &path) +@@ -227,12 +227,12 @@ KFileSystemType::Type determineFileSystemTypeImpl(const QByteArray &path) } #endif #else @@ -36,20 +36,20 @@ index 1c61d28..123cdb8 100644 KFileSystemType::Type KFileSystemType::fileSystemType(const QString &path) { -- -2.43.2 +2.45.2 -From d0d2e3814548516298bd52e97ba7af0be9d72837 Mon Sep 17 00:00:00 2001 +From dea02d505faa3110ab76455fc8ae52af6bb7610c Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Sun, 8 May 2022 21:42:30 +1000 Subject: Link with libnetwork diff --git a/src/lib/CMakeLists.txt b/src/lib/CMakeLists.txt -index 2c9693a..df96847 100644 +index 00ab870..90294df 100644 --- a/src/lib/CMakeLists.txt +++ b/src/lib/CMakeLists.txt -@@ -255,6 +255,10 @@ if(CMAKE_SYSTEM_NAME MATCHES "FreeBSD") +@@ -256,6 +256,10 @@ if(CMAKE_SYSTEM_NAME MATCHES "FreeBSD") target_link_libraries(KF6CoreAddons PRIVATE kvm) endif() @@ -61,10 +61,10 @@ index 2c9693a..df96847 100644 target_link_libraries(KF6CoreAddons PRIVATE Procstat::Procstat) endif() -- -2.43.2 +2.45.2 -From 3de8cbf92f30d0c8ab1cf612214e56ee928ec94b Mon Sep 17 00:00:00 2001 +From 80071ffbdd155aec13758d8e0ead49dc2be7de8e Mon Sep 17 00:00:00 2001 From: Begasus Date: Mon, 4 Dec 2023 11:19:46 +0100 Subject: Build fix(?) @@ -84,5 +84,5 @@ index b72d36e..c4ac44d 100644 uint lockSize = qMin(memlock.rlim_cur / 2, (rlim_t)size); // Note that lockSize might be less than what we need to mmap -- -2.43.2 +2.45.2