fix build

2 files changed, 26 insertions, 3 deletions

diff --git a/PKGBUILD b/PKGBUILD
index e322d19731ba..243f96a7ee96 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Will Price <will.price94+aur@gmail.com>
 
 pkgname=mediafire-fuse-git
-pkgver=0.90.r19.g95951eb
+pkgver=0.90.r20.gaa75530
 pkgrel=1
 pkgdesc="MediaFire shell and fuse driver"
 arch=('i686' 'x86_64' 'armv6' 'armv7')
@@ -15,13 +15,20 @@ conflicts=()
 replaces=()
 backup=()
 options=()
-source=('git+https://github.com/MediaFire/mediafire-fuse.git')
-md5sums=('SKIP')
+source=('git+https://github.com/MediaFire/mediafire-fuse.git'
+        fix_build.patch)
+md5sums=('SKIP'
+        '7f01552057bf5545535f48217f0feb07')
 
 pkgver() {
     cd "$srcdir/${pkgname%%-git}"
     git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
+}
 
+prepare() {
+    cd "${pkgname%%-git}"
+    patch --forward --strip=1 --input="${srcdir}/fix_build.patch"
+    sed -i 's/\-Werror//' CMakeLists.txt
 }
 
 build() {
diff --git a/fix_build.patch b/fix_build.patch
new file mode 100644
index 000000000000..9b829b32797e
--- /dev/null
+++ b/fix_build.patch
@@ -0,0 +1,16 @@
+diff --git a/fuse/hashtbl.c b/fuse/hashtbl.c
+index 5772a41..dcedb32 100644
+--- a/fuse/hashtbl.c
++++ b/fuse/hashtbl.c
+@@ -1891,8 +1891,9 @@ void folder_tree_cleanup_filecache(folder_tree * tree, uint64_t allowed_size)
+ 
+     for (;;) {
+         endp = NULL;
+-        retval = readdir_r(dirp, entryp, &endp);
+-        if (retval != 0) {
++        errno = 0;
++        endp = readdir(dirp);
++        if (!endp && errno) {
+             fprintf(stderr, "readdir_r failed\n");
+             free(entryp);
+             closedir(dirp);