From 365d4a4b35875bbfdbd561c23cdd10d31e607048 Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Sun, 25 Feb 2018 15:40:39 +0100
Subject: [PATCH] e2fsprogs: patches to actually make e2fsck run.

---
 sys-fs/e2fsprogs/e2fsprogs-1.43.9.recipe      |  2 +-
 .../patches/e2fsprogs-1.43.9.patchset         | 51 ++++++++++++++++++-
 2 files changed, 51 insertions(+), 2 deletions(-)

diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.43.9.recipe b/sys-fs/e2fsprogs/e2fsprogs-1.43.9.recipe
index a79441861..81d0e2adb 100644
--- a/sys-fs/e2fsprogs/e2fsprogs-1.43.9.recipe
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.43.9.recipe
@@ -3,7 +3,7 @@ DESCRIPTION="Various tools to manage EXT2,3,4 filesystems (resize, etc)"
 HOMEPAGE="http://e2fsprogs.sourceforge.net/"
 SOURCE_URI="https://sourceforge.net/projects/e2fsprogs/files/e2fsprogs/v$portVersion/e2fsprogs-$portVersion.tar.gz"
 CHECKSUM_SHA256="5be0ffc01b9720a3f3ccfc86396016baf1334b98751fefa09e0c63eaffdc3897"
-REVISION="1"
+REVISION="2"
 ARCHITECTURES=""
 SECONDARY_ARCHITECTURES="x86"
 PATCHES="e2fsprogs-$portVersion.patchset"
diff --git a/sys-fs/e2fsprogs/patches/e2fsprogs-1.43.9.patchset b/sys-fs/e2fsprogs/patches/e2fsprogs-1.43.9.patchset
index 60633f98e..d2fed8c78 100644
--- a/sys-fs/e2fsprogs/patches/e2fsprogs-1.43.9.patchset
+++ b/sys-fs/e2fsprogs/patches/e2fsprogs-1.43.9.patchset
@@ -1,4 +1,4 @@
-From 75f0edc615ce0a91eb202ad35941ba678b40c5d9 Mon Sep 17 00:00:00 2001
+From 979be15e98d2eb0c9a3b0ccf24e52ae7c71a55ac Mon Sep 17 00:00:00 2001
 From: Adrien Destugues <pulkomandy@pulkomandy.tk>
 Date: Sun, 25 Feb 2018 14:25:11 +0100
 Subject: Ugly hacks to get things building on Haiku.
@@ -73,3 +73,52 @@ index deae05e..2e67e25 100644
 -- 
 2.16.1
 
+
+From a3dc9722a2ebbd0320e266c8de4d4b0a8404ab19 Mon Sep 17 00:00:00 2001
+From: Adrien Destugues <pulkomandy@pulkomandy.tk>
+Date: Sun, 25 Feb 2018 15:38:54 +0100
+Subject: Extra patches.
+
+
+diff --git a/lib/blkid/devname.c b/lib/blkid/devname.c
+index f3956da..ff950f8 100644
+--- a/lib/blkid/devname.c
++++ b/lib/blkid/devname.c
+@@ -43,6 +43,8 @@
+ 
+ #include "blkidP.h"
+ 
++#define makedev(maj,min) (min)
++
+ /*
+  * Find a dev struct in the cache by device name, if available.
+  *
+diff --git a/lib/blkid/devno.c b/lib/blkid/devno.c
+index 34ceb3c..4c9f34a 100644
+--- a/lib/blkid/devno.c
++++ b/lib/blkid/devno.c
+@@ -37,6 +37,8 @@
+ 
+ #include "blkidP.h"
+ 
++#define makedev(maj,min) (min)
++
+ char *blkid_strndup(const char *s, int length)
+ {
+ 	char *ret;
+diff --git a/lib/ext2fs/bmap64.h b/lib/ext2fs/bmap64.h
+index d8c7a3c..8ab1174 100644
+--- a/lib/ext2fs/bmap64.h
++++ b/lib/ext2fs/bmap64.h
+@@ -9,6 +9,8 @@
+  * %End-Header%
+  */
+ 
++#include <sys/time.h>
++
+ struct ext2_bmap_statistics {
+ 	int		type;
+ 	struct timeval	created;
+-- 
+2.16.1
+