filelight, bump to version 24.12.3, switch to KF6 (#12004)

This commit is contained in:
Schrijvers Luc
2025-03-17 16:33:41 +00:00
committed by GitHub
parent 34da7163a3
commit 26a5e1cf20
3 changed files with 184 additions and 158 deletions

View File

@@ -1,138 +0,0 @@
SUMMARY="An application to visualize the disk usage on your computer"
DESCRIPTION="Filelight allows you to understand exactly where your diskspace is being used by \
graphically representating your filesystem as a set of concentric segmented-rings.
Useful Tips
- Click on directories to center the view there
- Click on files to launch the application associated with them
- Middle click to open files/directories with your file browser
- Increase the window size to see more detail
- Hover over segments to find out more information
- You can specify a directory to scan on startup from the command line like this: \
*filelight /home/me/foobar*"
HOMEPAGE="https://kde.org/applications/utilities/filelight"
COPYRIGHT="2010-2022 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="b7fc4daefc0985dc4b0deeb3c25e09a1b85ff896560340e79cca5093d3f07522"
ADDITIONAL_FILES="filelight.rdef.in"
PATCHES="filelight-$portVersion.patchset"
ARCHITECTURES="all !x86_gcc2"
SECONDARY_ARCHITECTURES="x86"
GLOBAL_WRITABLE_FILES="
settings/xdg/filelightrc keep-old
"
libVersion="5.24.5"
libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
PROVIDES="
filelight$secondaryArchSuffix = $portVersion
app:FileLight$secondaryArchSuffix = $portVersion
"
REQUIRES="
haiku$secondaryArchSuffix
lib:libKF5Auth$secondaryArchSuffix
lib:libKF5Codecs$secondaryArchSuffix
lib:libKF5Completion$secondaryArchSuffix
lib:libKF5ConfigCore$secondaryArchSuffix
lib:libKF5ConfigGui$secondaryArchSuffix
lib:libKF5ConfigWidgets$secondaryArchSuffix
lib:libKF5CoreAddons$secondaryArchSuffix
lib:libKF5I18n$secondaryArchSuffix
lib:libKF5KIOCore$secondaryArchSuffix
lib:libKF5JobWidgets$secondaryArchSuffix
lib:libKF5Service$secondaryArchSuffix
lib:libKF5Solid$secondaryArchSuffix
lib:libKF5WidgetsAddons$secondaryArchSuffix
lib:libKF5WindowSystem$secondaryArchSuffix
lib:libKF5XmlGui$secondaryArchSuffix
lib:libQt5DBus$secondaryArchSuffix
lib:libQt5Gui$secondaryArchSuffix
lib:libQt5Network$secondaryArchSuffix
lib:libQt5Widgets$secondaryArchSuffix
lib:libQt5Xml$secondaryArchSuffix
"
BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel
extra_cmake_modules$secondaryArchSuffix
devel:libKF5Auth$secondaryArchSuffix
devel:libKF5Bookmarks$secondaryArchSuffix
devel:libKF5Codecs$secondaryArchSuffix
devel:libKF5Completion$secondaryArchSuffix
devel:libKF5ConfigCore$secondaryArchSuffix
devel:libKF5ConfigWidgets$secondaryArchSuffix
devel:libKF5CoreAddons$secondaryArchSuffix
devel:libKF5I18n$secondaryArchSuffix
devel:libKF5ItemViews$secondaryArchSuffix
devel:libKF5JobWidgets$secondaryArchSuffix
devel:libKF5KIOCore$secondaryArchSuffix
devel:libKF5Service$secondaryArchSuffix
devel:libKF5Solid$secondaryArchSuffix
devel:libKF5WidgetsAddons$secondaryArchSuffix
devel:libKF5WindowSystem$secondaryArchSuffix
devel:libKF5XmlGui$secondaryArchSuffix
devel:libQt5Core$secondaryArchSuffix
devel:libQt5DBus$secondaryArchSuffix
devel:libQt5Gui$secondaryArchSuffix
devel:libQt5Widgets$secondaryArchSuffix
"
BUILD_PREREQUIRES="
cmd:cmake
cmd:g++$secondaryArchSuffix
cmd:make
cmd:msgmerge
cmd:pkg_config$secondaryArchSuffix
cmd:qdbuscpp2xml$secondaryArchSuffix >= 5
"
BUILD()
{
cmake -Bbuild -S. -DCMAKE_BUILD_TYPE=Release \
$cmakeDirArgs \
-DCMAKE_INSTALL_BINDIR=$appsDir \
-DKDE_INSTALL_PLUGINDIR=$addOnsDir/Qt5 \
-DKDE_INSTALL_QMLDIR=$dataDir/Qt5/qml \
-DECM_MKSPECS_INSTALL_DIR=$dataDir/Qt5/mkspecs \
-DECM_DIR=/system/data/cmake/Modules/ECM/cmake \
-Wno-dev
make -C build $jobArgs
}
INSTALL()
{
make -C build install
mv $appsDir/filelight $appsDir/FileLight
# we are not linux
rm -rf $dataDir/{applications,icons,metainfo}
local MAJOR="`echo "$portVersion" | cut -d. -f1`"
local MIDDLE="`echo "$portVersion" | cut -d. -f2`"
local MINOR="`echo "$portVersion" | cut -d. -f3`"
local APP_NAME="FileLight"
local LONG_INFO="$SUMMARY"
local APP_SIGNATURE="application/x-vnd.filelight"
sed \
-e "s|@MAJOR@|$MAJOR|" \
-e "s|@MIDDLE@|$MIDDLE|" \
-e "s|@MINOR@|$MINOR|" \
-e "s|@LONG_INFO@|$LONG_INFO|" \
-e "s|@APP_NAME@|$APP_NAME|" \
-e "s|@APP_SIGNATURE@|$APP_SIGNATURE|" \
$portDir/additional-files/filelight.rdef.in > filelight.rdef
addResourcesToBinaries filelight.rdef $appsDir/FileLight
addAppDeskbarSymlink $appsDir/FileLight
}
TEST()
{
make check
}

View File

@@ -0,0 +1,155 @@
SUMMARY="An application to visualize the disk usage on your computer"
DESCRIPTION="Filelight allows you to understand exactly where your diskspace is being used by \
graphically representating your filesystem as a set of concentric segmented-rings.
Useful Tips
- Click on directories to center the view there
- Click on files to launch the application associated with them
- Middle click to open files/directories with your file browser
- Increase the window size to see more detail
- Hover over segments to find out more information
- You can specify a directory to scan on startup from the command line like this: \
*filelight /home/me/foobar*"
HOMEPAGE="https://kde.org/applications/utilities/filelight"
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="ec3a4345bb98cfc0bbe5f1faf9c021f3552155ee33f2e82623ae623746b187e9"
SOURCE_DIR="filelight-$portVersion"
PATCHES="filelight-$portVersion.patchset"
ADDITIONAL_FILES="filelight.rdef.in"
ARCHITECTURES="all !x86_gcc2"
SECONDARY_ARCHITECTURES="x86"
GLOBAL_WRITABLE_FILES="
settings/xdg/filelightrc keep-old
"
PROVIDES="
filelight$secondaryArchSuffix = $portVersion
app:Filelight$secondaryArchSuffix = $portVersion
"
REQUIRES="
haiku$secondaryArchSuffix
lib:libGL$secondaryArchSuffix
# KF6
lib:libKF6Codecs$secondaryArchSuffix
lib:libKF6ColorScheme$secondaryArchSuffix
lib:libKF6Completion$secondaryArchSuffix
lib:libKF6ConfigCore$secondaryArchSuffix
lib:libKF6ConfigGui$secondaryArchSuffix
lib:libKF6ConfigWidgets$secondaryArchSuffix
lib:libKF6CoreAddons$secondaryArchSuffix
lib:libKF6Crash$secondaryArchSuffix
lib:libKF6I18n$secondaryArchSuffix
lib:libKF6KIOCore$secondaryArchSuffix
lib:libKF6JobWidgets$secondaryArchSuffix
lib:libKF6Service$secondaryArchSuffix
lib:libKF6Solid$secondaryArchSuffix
lib:libKF6WidgetsAddons$secondaryArchSuffix
lib:libKF6WindowSystem$secondaryArchSuffix
lib:libKF6XmlGui$secondaryArchSuffix
# Qt6
lib:libQt6DBus$secondaryArchSuffix
lib:libQt6Gui$secondaryArchSuffix
lib:libQt6Qml$secondaryArchSuffix
lib:libQt6Quick$secondaryArchSuffix
lib:libQt6Network$secondaryArchSuffix
lib:libQt6Widgets$secondaryArchSuffix
lib:libQt6Xml$secondaryArchSuffix
"
BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel
kquickcharts6$secondaryArchSuffix
devel:libKirigamiAddonsStatefulApp$secondaryArchSuffix
devel:libqca_qt6$secondaryArchSuffix
# KF6
extra_cmake_modules$secondaryArchSuffix
qqc2_desktop_style6${secondaryArchSuffix}_devel
devel:libKF6Bookmarks$secondaryArchSuffix
devel:libKF6Codecs$secondaryArchSuffix
devel:libKF6ColorScheme$secondaryArchSuffix
devel:libKF6Completion$secondaryArchSuffix
devel:libKF6ConfigCore$secondaryArchSuffix
devel:libKF6ConfigWidgets$secondaryArchSuffix
devel:libKF6CoreAddons$secondaryArchSuffix
devel:libKF6Crash$secondaryArchSuffix
devel:libKF6I18n$secondaryArchSuffix
devel:libKF6ItemViews$secondaryArchSuffix
devel:libKF6JobWidgets$secondaryArchSuffix
devel:libKF6KIOCore$secondaryArchSuffix
devel:libKF6Service$secondaryArchSuffix
devel:libKF6Solid$secondaryArchSuffix
devel:libKF6WidgetsAddons$secondaryArchSuffix
devel:libKF6WindowSystem$secondaryArchSuffix
devel:libKF6XmlGui$secondaryArchSuffix
devel:libKirigami$secondaryArchSuffix
# Qt6
devel:libQt6Core$secondaryArchSuffix
devel:libQt6DBus$secondaryArchSuffix
devel:libQt6Gui$secondaryArchSuffix
devel:libQt6Quick$secondaryArchSuffix
devel:libQt6Widgets$secondaryArchSuffix
"
BUILD_PREREQUIRES="
cmd:cmake
cmd:g++$secondaryArchSuffix
cmd:make
cmd:msgfmt$secondaryArchSuffix
cmd:msgmerge$secondaryArchSuffix
cmd:pkg_config$secondaryArchSuffix
"
TEST_REQUIRES="
qthaikuplugins
"
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
make -C build $jobArgs
}
INSTALL()
{
make -C build install
# cleanup
rm -rf $dataDir/{applications,icons,metainfo}
mv $appsDir/filelight $appsDir/Filelight
local MAJOR="`echo "$portVersion" | cut -d. -f1`"
local MIDDLE="`echo "$portVersion" | cut -d. -f2`"
local MINOR="`echo "$portVersion" | cut -d. -f3`"
local APP_NAME="Filelight"
local LONG_INFO="$SUMMARY"
local APP_SIGNATURE="application/x-vnd.filelight"
sed \
-e "s|@MAJOR@|$MAJOR|" \
-e "s|@MIDDLE@|$MIDDLE|" \
-e "s|@MINOR@|$MINOR|" \
-e "s|@LONG_INFO@|$LONG_INFO|" \
-e "s|@APP_NAME@|$APP_NAME|" \
-e "s|@APP_SIGNATURE@|$APP_SIGNATURE|" \
$portDir/additional-files/filelight.rdef.in > filelight.rdef
addResourcesToBinaries filelight.rdef $appsDir/Filelight
addAppDeskbarSymlink $appsDir/Filelight
}
TEST()
{
# 67% tests passed, 1 tests failed out of 3
ctest --test-dir build --output-on-failure
}

View File

@@ -1,23 +1,23 @@
From d44232675b40f9bd50050d2f0579105dd7ce252d Mon Sep 17 00:00:00 2001
From df7ad25a2ba45f5fd8fad527231dca7f4d6eaad3 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
Subject: Fix for Haiku
diff --git a/autotests/directoryIteratorTest.cpp b/autotests/directoryIteratorTest.cpp
index 2b9c582..295283d 100644
index 3a8f61d..024ad0b 100644
--- a/autotests/directoryIteratorTest.cpp
+++ b/autotests/directoryIteratorTest.cpp
@@ -59,7 +59,7 @@ private Q_SLOTS:
@@ -63,7 +63,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:
#elif defined(Q_OS_LINUX)
QCOMPARE(file.size, 16 * DEV_BSIZE);
@@ -88,7 +88,7 @@ private Q_SLOTS:
QVERIFY(!symlink.isSkipable);
#ifdef Q_OS_WINDOWS
QCOMPARE(symlink.size, 7682);
@@ -26,22 +26,31 @@ index 2b9c582..295283d 100644
// CI keeps changing, we don't assert anything for freebsd.
#else
// We don't know the order, but one should be a duplicate
--
2.48.1
From 174d18744b04b98ef044574796c0e297404bc97e 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 77ee2f3..369a7ee 100644
index 27b7f1c..0458933 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;
@@ -8,6 +8,10 @@
#include <sys/param.h>
#endif
+#ifndef S_BLKSIZE
+#define S_BLKSIZE 512
+#endif
break;
}
}
+
static void outputError(const QByteArray &path)
{
/// show error message that stat or opendir may give
--
2.43.2
2.48.1