diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.45.4.recipe b/sys-fs/e2fsprogs/e2fsprogs-1.45.6.recipe similarity index 97% rename from sys-fs/e2fsprogs/e2fsprogs-1.45.4.recipe rename to sys-fs/e2fsprogs/e2fsprogs-1.45.6.recipe index 288f8f1a1..df1cf2dcf 100644 --- a/sys-fs/e2fsprogs/e2fsprogs-1.45.4.recipe +++ b/sys-fs/e2fsprogs/e2fsprogs-1.45.6.recipe @@ -7,7 +7,7 @@ REVISION="1" SOURCE_URI="https://downloads.sourceforge.net/e2fsprogs/e2fsprogs-$portVersion.tar.gz https://sourceforge.mirrorservice.org/e/e2/e2fsprogs/e2fsprogs/v$portVersion/e2fsprogs-$portVersion.tar.gz https://fossies.org/linux/misc/e2fsprogs-$portVersion.tar.gz" -CHECKSUM_SHA256="e69c69839cf80cb55afa18b9a99ed8f2e559db0313e3d15ac5497ed7e1a34c4b" +CHECKSUM_SHA256="5f64ac50a2b60b8e67c5b382bb137dec39344017103caffc3a61554424f2d693" PATCHES="e2fsprogs-$portVersion.patchset" ARCHITECTURES="!x86_gcc2 x86 x86_64" diff --git a/sys-fs/e2fsprogs/patches/e2fsprogs-1.45.4.patchset b/sys-fs/e2fsprogs/patches/e2fsprogs-1.45.6.patchset similarity index 77% rename from sys-fs/e2fsprogs/patches/e2fsprogs-1.45.4.patchset rename to sys-fs/e2fsprogs/patches/e2fsprogs-1.45.6.patchset index 0a9dea7c1..7c69cbbcc 100644 --- a/sys-fs/e2fsprogs/patches/e2fsprogs-1.45.4.patchset +++ b/sys-fs/e2fsprogs/patches/e2fsprogs-1.45.6.patchset @@ -137,3 +137,46 @@ index ca24553..8bd3a14 100644 -- 2.16.1 + +From 56244924d08f0fa53f15e606231159a0d287222b Mon Sep 17 00:00:00 2001 +From: Jerome Duval +Date: Thu, 7 Jan 2021 20:23:58 +0100 +Subject: [PATCH] Haiku: type loff_t + +--- + lib/ext2fs/imager.c | 3 +++ + misc/e2fuzz.c | 4 ++++ + 2 files changed, 7 insertions(+) + +diff --git a/lib/ext2fs/imager.c b/lib/ext2fs/imager.c +index b3ede9a..a1addee 100644 +--- a/lib/ext2fs/imager.c ++++ b/lib/ext2fs/imager.c +@@ -37,6 +37,9 @@ + #ifndef HAVE_TYPE_SSIZE_T + typedef int ssize_t; + #endif ++#ifdef __HAIKU__ ++typedef off_t loff_t; ++#endif + + /* + * This function returns 1 if the specified block is all zeros +diff --git a/misc/e2fuzz.c b/misc/e2fuzz.c +index 7c0f776..97ffc4a 100644 +--- a/misc/e2fuzz.c ++++ b/misc/e2fuzz.c +@@ -42,6 +42,10 @@ static ssize_t my_pwrite(int fd, const void *buf, size_t count, off_t offset) + } + #endif /* !defined HAVE_PWRITE64 && !defined HAVE_PWRITE */ + ++#ifdef __HAIKU__ ++typedef off_t loff_t; ++#endif ++ + static int getseed(void) + { + int r; +-- +2.30.0 +