KDE_utilities, bump to 25.12.0 (#13471)

bump kwrite to 25.08.3
This commit is contained in:
Schrijvers Luc
2025-12-23 08:00:33 +01:00
committed by GitHub
parent 541dbe3b90
commit 1b11687d48
11 changed files with 102 additions and 206 deletions

View File

@@ -15,7 +15,7 @@ COPYRIGHT="2010-2025 KDE Organisation"
LICENSE="GNU GPL v2"
REVISION="1"
SOURCE_URI="https://download.kde.org/stable/release-service/$portVersion/src/filelight-$portVersion.tar.xz"
CHECKSUM_SHA256="6080649ed7621178a7aeff1d3070629caa3d91da4978bcc5b568c75bedf53185"
CHECKSUM_SHA256="355386cc10e88808eebf76fbc84094bc24b90d76afe28a9bda41b6b49381a5ab"
SOURCE_DIR="filelight-$portVersion"
PATCHES="filelight-$portVersion.patchset"
ADDITIONAL_FILES="filelight.rdef.in"
@@ -29,7 +29,8 @@ GLOBAL_WRITABLE_FILES="
PROVIDES="
filelight$secondaryArchSuffix = $portVersion
app:Filelight$secondaryArchSuffix = $portVersion
app:Filelight = $portVersion
cmd:filelight = $portVersion
"
REQUIRES="
haiku$secondaryArchSuffix
@@ -107,12 +108,17 @@ TEST_REQUIRES="
qthaikuplugins
"
PATCH()
{
# reset Qt version
sed -e 's|6.9.0|6.7.2|' CMakeLists.txt
}
BUILD()
{
cmake -B build -S . -DCMAKE_BUILD_TYPE=Release \
$cmakeDirArgs \
-DCMAKE_INSTALL_BINDIR=$appsDir \
-DECM_DIR=/system/data/cmake/Modules/ECM/cmake \
-DBUILD_TESTING=OFF \
-Wno-dev
@@ -126,7 +132,9 @@ INSTALL()
# cleanup
rm -rf $dataDir/{applications,icons,metainfo}
mkdir -p $prefix/bin
mv $appsDir/filelight $appsDir/Filelight
ln -s $appsDir/Filelight $prefix/bin/filelight
local MAJOR="`echo "$portVersion" | cut -d. -f1`"
local MIDDLE="`echo "$portVersion" | cut -d. -f2`"

View File

@@ -1,79 +0,0 @@
From f37c504bd9991d32a55929482e99427cbbfaa0de Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Mon, 4 Mar 2024 22:51:23 +1000
Subject: Fix for Haiku
diff --git a/autotests/directoryIteratorTest.cpp b/autotests/directoryIteratorTest.cpp
index 20806cf..625e5ea 100644
--- a/autotests/directoryIteratorTest.cpp
+++ b/autotests/directoryIteratorTest.cpp
@@ -65,7 +65,7 @@ private Q_SLOTS:
QVERIFY(!file.isSkippable);
#ifdef Q_OS_WINDOWS
QCOMPARE(file.size, 7682);
-#elif defined(Q_OS_FREEBSD)
+#elif defined(Q_OS_FREEBSD) || defined(Q_OS_HAIKU)
// CI keeps changing, we don't assert anything for freebsd.
#elif defined(Q_OS_LINUX)
QCOMPARE(file.size, 16 * DEV_BSIZE);
@@ -90,7 +90,7 @@ private Q_SLOTS:
QVERIFY(!symlink.isSkippable);
#ifdef Q_OS_WINDOWS
QCOMPARE(symlink.size, 7682);
-#elif defined(Q_OS_FREEBSD)
+#elif defined(Q_OS_FREEBSD) || defined(Q_OS_HAIKU)
// CI keeps changing, we don't assert anything for freebsd.
#else
// We don't know the order, but one should be a duplicate
--
2.50.1
From 8006288a82a995d14d1ca75bb14b0c6f415305d5 Mon Sep 17 00:00:00 2001
From: Luc Schrijvers <begasus@gmail.com>
Date: Sun, 16 Mar 2025 16:39:24 +0100
Subject: define S_BLKSIZE 512
diff --git a/src/posixWalker.cpp b/src/posixWalker.cpp
index 36f37a9..928e8a2 100644
--- a/src/posixWalker.cpp
+++ b/src/posixWalker.cpp
@@ -8,6 +8,10 @@
#include <sys/param.h>
#endif
+#ifndef S_BLKSIZE
+#define S_BLKSIZE 512
+#endif
+
static void outputError(const QByteArray &path)
{
/// show error message that stat or opendir may give
--
2.50.1
From 60644081cdb6df70a494c9ecefc393bf13d0c06a Mon Sep 17 00:00:00 2001
From: Luc Schrijvers <begasus@gmail.com>
Date: Sun, 17 Aug 2025 16:48:24 +0200
Subject: Reset Qt version
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0b95c97..0fecedc 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -18,7 +18,7 @@ project(Filelight VERSION ${FILELIGHT_VERSION})
set(PROJECT_VERSION ${RELEASE_SERVICE_VERSION})
set(KF_MIN_VERSION "6.5.0")
-set(QT_REQUIRED_VERSION "6.8.1")
+set(QT_REQUIRED_VERSION "6.7.0")
find_package(ECM ${KF_MIN_VERSION} REQUIRED NO_MODULE)
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH})
--
2.50.1

View File

@@ -0,0 +1,31 @@
From f37c504bd9991d32a55929482e99427cbbfaa0de Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Mon, 4 Mar 2024 22:51:23 +1000
Subject: Fix for Haiku
diff --git a/autotests/directoryIteratorTest.cpp b/autotests/directoryIteratorTest.cpp
index 20806cf..625e5ea 100644
--- a/autotests/directoryIteratorTest.cpp
+++ b/autotests/directoryIteratorTest.cpp
@@ -65,7 +65,7 @@ private Q_SLOTS:
QVERIFY(!file.isSkippable);
#ifdef Q_OS_WINDOWS
QCOMPARE(file.size, 7682);
-#elif defined(Q_OS_FREEBSD)
+#elif defined(Q_OS_FREEBSD) || defined(Q_OS_HAIKU)
// CI keeps changing, we don't assert anything for freebsd.
#elif defined(Q_OS_LINUX)
QCOMPARE(file.size, 16 * DEV_BSIZE);
@@ -90,7 +90,7 @@ private Q_SLOTS:
QVERIFY(!symlink.isSkippable);
#ifdef Q_OS_WINDOWS
QCOMPARE(symlink.size, 7682);
-#elif defined(Q_OS_FREEBSD)
+#elif defined(Q_OS_FREEBSD) || defined(Q_OS_HAIKU)
// CI keeps changing, we don't assert anything for freebsd.
#else
// We don't know the order, but one should be a duplicate
--
2.50.1