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

filelight: bump version

Browse Source
This commit is contained in:
Gerasim Troeglazov
2024-03-04 22:55:02 +10:00
parent 4bc4bee60d
commit 548ed7f818
2 changed files with 52 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
kde-apps/filelight/filelight-20.04.3.recipe → kde-apps/filelight/filelight-23.08.5.recipe
View File

@@ -14,9 +14,10 @@ HOMEPAGE="https://kde.org/applications/utilities/filelight"
COPYRIGHT="2010-2022 KDE Organisation"
LICENSE="GNU GPL v2"
REVISION="1"
SOURCE_URI="https://download.kde.org/Attic/release-service/20.04.3/src/filelight-$portVersion.tar.xz"
CHECKSUM_SHA256="d0939d0a04424978c06b675ac784c6a1ecbccbb67a31f5af661c6716bf38f0a4"
SOURCE_URI="https://download.kde.org/stable/release-service/$portVersion/src/filelight-$portVersion.tar.xz"
CHECKSUM_SHA256="b7fc4daefc0985dc4b0deeb3c25e09a1b85ff896560340e79cca5093d3f07522"
ADDITIONAL_FILES="filelight.rdef.in"
PATCHES="filelight-$portVersion.patchset"
ARCHITECTURES="all !x86_gcc2"
SECONDARY_ARCHITECTURES="x86"
@@ -25,7 +26,7 @@ GLOBAL_WRITABLE_FILES="
settings/xdg/filelightrc keep-old
"
libVersion="5.20.3"
libVersion="5.24.5"
libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
PROVIDES="
@@ -58,7 +59,7 @@ REQUIRES="
BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel
extra_cmake_modules$secondaryArchSuffix >= 5.93.0
extra_cmake_modules$secondaryArchSuffix
devel:libKF5Auth$secondaryArchSuffix
devel:libKF5Bookmarks$secondaryArchSuffix
devel:libKF5Codecs$secondaryArchSuffix

47
kde-apps/filelight/patches/filelight-23.08.5.patchset Normal file
View File

@@ -0,0 +1,47 @@
From d44232675b40f9bd50050d2f0579105dd7ce252d Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Mon, 4 Mar 2024 22:51:23 +1000
Subject: Fix fir Haiku
diff --git a/autotests/directoryIteratorTest.cpp b/autotests/directoryIteratorTest.cpp
index 2b9c582..295283d 100644
--- a/autotests/directoryIteratorTest.cpp
+++ b/autotests/directoryIteratorTest.cpp
@@ -59,7 +59,7 @@ private Q_SLOTS:
QVERIFY(!file.isSkipable);
#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.
#else
QCOMPARE(file.size, 16 * S_BLKSIZE);
@@ -82,7 +82,7 @@ private Q_SLOTS:
QVERIFY(!symlink.isSkipable);
#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
diff --git a/src/posixWalker.cpp b/src/posixWalker.cpp
index 77ee2f3..369a7ee 100644
--- a/src/posixWalker.cpp
+++ b/src/posixWalker.cpp
@@ -113,7 +113,11 @@ void POSIXWalker::next()
}
m_entry.isDir = S_ISDIR(statbuf.st_mode);
m_entry.isFile = S_ISREG(statbuf.st_mode);
+#if defined(Q_OS_HAIKU)
+ m_entry.size = statbuf.st_blocks * statbuf.st_blksize;
+#else
m_entry.size = statbuf.st_blocks * S_BLKSIZE;
+#endif
break;
}
}
--
2.43.2