mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-24 17:18:51 +02:00
filelight, fix patchset (#12766)
This commit is contained in:
@@ -1,15 +1,15 @@
|
||||
From 29d06cd4c4d8e1860f8e75c46e5a6d8f04d215ab Mon Sep 17 00:00:00 2001
|
||||
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 3a8f61d..024ad0b 100644
|
||||
index 20806cf..625e5ea 100644
|
||||
--- a/autotests/directoryIteratorTest.cpp
|
||||
+++ b/autotests/directoryIteratorTest.cpp
|
||||
@@ -63,7 +63,7 @@ private Q_SLOTS:
|
||||
QVERIFY(!file.isSkipable);
|
||||
@@ -65,7 +65,7 @@ private Q_SLOTS:
|
||||
QVERIFY(!file.isSkippable);
|
||||
#ifdef Q_OS_WINDOWS
|
||||
QCOMPARE(file.size, 7682);
|
||||
-#elif defined(Q_OS_FREEBSD)
|
||||
@@ -17,8 +17,8 @@ index 3a8f61d..024ad0b 100644
|
||||
// CI keeps changing, we don't assert anything for freebsd.
|
||||
#elif defined(Q_OS_LINUX)
|
||||
QCOMPARE(file.size, 16 * DEV_BSIZE);
|
||||
@@ -88,7 +88,7 @@ private Q_SLOTS:
|
||||
QVERIFY(!symlink.isSkipable);
|
||||
@@ -90,7 +90,7 @@ private Q_SLOTS:
|
||||
QVERIFY(!symlink.isSkippable);
|
||||
#ifdef Q_OS_WINDOWS
|
||||
QCOMPARE(symlink.size, 7682);
|
||||
-#elif defined(Q_OS_FREEBSD)
|
||||
@@ -27,17 +27,17 @@ index 3a8f61d..024ad0b 100644
|
||||
#else
|
||||
// We don't know the order, but one should be a duplicate
|
||||
--
|
||||
2.48.1
|
||||
2.50.1
|
||||
|
||||
|
||||
From 1f96638b09903a9b5b0c5dbd632aee2ec9caaa7c Mon Sep 17 00:00:00 2001
|
||||
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 27b7f1c..0458933 100644
|
||||
index 36f37a9..928e8a2 100644
|
||||
--- a/src/posixWalker.cpp
|
||||
+++ b/src/posixWalker.cpp
|
||||
@@ -8,6 +8,10 @@
|
||||
@@ -52,5 +52,5 @@ index 27b7f1c..0458933 100644
|
||||
{
|
||||
/// show error message that stat or opendir may give
|
||||
--
|
||||
2.48.1
|
||||
2.50.1
|
||||
|
||||
|
||||
Reference in New Issue
Block a user