From 4862982fec9c7d639e08306664e1d9c81f2a7236 Mon Sep 17 00:00:00 2001 From: Schrijvers Luc Date: Tue, 23 Dec 2025 09:05:01 +0100 Subject: [PATCH] filelight, revert to 25.04.0 (#13475) --- ...5.08.3.recipe => filelight-25.04.0.recipe} | 8 +------- ....3.patchset => filelight-25.04.0.patchset} | 20 +++++++++---------- 2 files changed, 11 insertions(+), 17 deletions(-) rename kde-apps/filelight/{filelight-25.08.3.recipe => filelight-25.04.0.recipe} (96%) rename kde-apps/filelight/patches/{filelight-25.08.3.patchset => filelight-25.04.0.patchset} (78%) diff --git a/kde-apps/filelight/filelight-25.08.3.recipe b/kde-apps/filelight/filelight-25.04.0.recipe similarity index 96% rename from kde-apps/filelight/filelight-25.08.3.recipe rename to kde-apps/filelight/filelight-25.04.0.recipe index 0cc7d7f5d..4a57541e4 100644 --- a/kde-apps/filelight/filelight-25.08.3.recipe +++ b/kde-apps/filelight/filelight-25.04.0.recipe @@ -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="8a3a825c5a1c4f3662d7b786f75bf8faef6ac9f6723c8e8cd29e6cf15bda8080" +CHECKSUM_SHA256="fecf4123a0741a370269e3f98b723f6d0ab50a4140b49879103856c37d2acac9" SOURCE_DIR="filelight-$portVersion" PATCHES="filelight-$portVersion.patchset" ADDITIONAL_FILES="filelight.rdef.in" @@ -108,12 +108,6 @@ TEST_REQUIRES=" qthaikuplugins " -PATCH() -{ - # reset Qt version - sed -e 's|6.8.1|6.7.2|' CMakeLists.txt -} - BUILD() { cmake -B build -S . -DCMAKE_BUILD_TYPE=Release \ diff --git a/kde-apps/filelight/patches/filelight-25.08.3.patchset b/kde-apps/filelight/patches/filelight-25.04.0.patchset similarity index 78% rename from kde-apps/filelight/patches/filelight-25.08.3.patchset rename to kde-apps/filelight/patches/filelight-25.04.0.patchset index 1c4d1751f..1d81e23f5 100644 --- a/kde-apps/filelight/patches/filelight-25.08.3.patchset +++ b/kde-apps/filelight/patches/filelight-25.04.0.patchset @@ -1,15 +1,15 @@ -From a88f120df5f8c795eab24fd2a6cc333a67439645 Mon Sep 17 00:00:00 2001 +From 29d06cd4c4d8e1860f8e75c46e5a6d8f04d215ab 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 +index 3a8f61d..024ad0b 100644 --- a/autotests/directoryIteratorTest.cpp +++ b/autotests/directoryIteratorTest.cpp -@@ -65,7 +65,7 @@ private Q_SLOTS: - QVERIFY(!file.isSkippable); +@@ -63,7 +63,7 @@ private Q_SLOTS: + QVERIFY(!file.isSkipable); #ifdef Q_OS_WINDOWS QCOMPARE(file.size, 7682); -#elif defined(Q_OS_FREEBSD) @@ -17,8 +17,8 @@ index 20806cf..625e5ea 100644 // 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); +@@ -88,7 +88,7 @@ private Q_SLOTS: + QVERIFY(!symlink.isSkipable); #ifdef Q_OS_WINDOWS QCOMPARE(symlink.size, 7682); -#elif defined(Q_OS_FREEBSD) @@ -27,17 +27,17 @@ index 20806cf..625e5ea 100644 #else // We don't know the order, but one should be a duplicate -- -2.51.0 +2.48.1 -From 0e917c784bf91df09f5a7e908cd1a6a91be80efe Mon Sep 17 00:00:00 2001 +From 1f96638b09903a9b5b0c5dbd632aee2ec9caaa7c Mon Sep 17 00:00:00 2001 From: Luc Schrijvers 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 +index 27b7f1c..0458933 100644 --- a/src/posixWalker.cpp +++ b/src/posixWalker.cpp @@ -8,6 +8,10 @@ @@ -52,5 +52,5 @@ index 36f37a9..928e8a2 100644 { /// show error message that stat or opendir may give -- -2.51.0 +2.48.1