From: Fredrik Fornwall <fredrik@fornwall.net>
Date: Tue, 25 Aug 2015 21:03:16 +0000 (-0400)
Subject: unrar: Update from 5.0.14 to 5.3.2
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/termux-packages/commitdiff_plain/542a284d1fbc8c55a945de365f0938bcfa814963?ds=sidebyside

unrar: Update from 5.0.14 to 5.3.2
---

diff --git a/packages/unrar/build.sh b/packages/unrar/build.sh
index 094298bd..a9b6d731 100644
--- a/packages/unrar/build.sh
+++ b/packages/unrar/build.sh
@@ -1,4 +1,4 @@
-TERMUX_PKG_VERSION=5.0.14
+TERMUX_PKG_VERSION=5.3.2
 TERMUX_PKG_HOMEPAGE=http://www.rarlab.com/
 TERMUX_PKG_DESCRIPTION="Tool for extracting files from .rar archives"
 TERMUX_PKG_SRCURL=http://www.rarlab.com/rar/unrarsrc-${TERMUX_PKG_VERSION}.tar.gz
diff --git a/packages/unrar/os.hpp.patch b/packages/unrar/os.hpp.patch
new file mode 100644
index 00000000..3f362f3b
--- /dev/null
+++ b/packages/unrar/os.hpp.patch
@@ -0,0 +1,14 @@
+Patch submitted to dev@rarlab.com on 2015-08-25.
+
+diff -u -r ../unrar/os.hpp ./os.hpp
+--- ../unrar/os.hpp	2015-08-04 06:22:40.000000000 -0400
++++ ./os.hpp	2015-08-25 16:58:59.525380417 -0400
+@@ -160,7 +160,7 @@
+ #define SAVE_LINKS
+ #endif
+ 
+-#if defined(__linux) && !defined (_ANDROID) || defined(__FreeBSD__)
++#if defined(__linux) && !defined(__ANDROID__) || defined(__FreeBSD__)
+ #include <sys/time.h>
+ #define USE_LUTIMES
+ #endif
diff --git a/packages/unrar/sys_statvfs.patch b/packages/unrar/sys_statvfs.patch
deleted file mode 100644
index b5a634a8..00000000
--- a/packages/unrar/sys_statvfs.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -u -r ../unrar/filefn.cpp ./filefn.cpp
---- ../unrar/filefn.cpp	2013-12-01 09:10:14.000000000 +0100
-+++ ./filefn.cpp	2014-02-13 00:16:54.000000000 +0100
-@@ -156,8 +156,8 @@
-   GetFilePath(Name,Root,ASIZE(Root));
-   char RootA[NM];
-   WideToChar(Root,RootA,ASIZE(RootA));
--  struct statvfs sfs;
--  if (statvfs(*RootA!=0 ? RootA:".",&sfs)!=0)
-+  struct statfs sfs;
-+  if (statfs(*RootA!=0 ? RootA:".",&sfs)!=0)
-     return 0;
-   int64 FreeSize=sfs.f_bsize;
-   FreeSize=FreeSize*sfs.f_bavail;
-diff -u -r ../unrar/os.hpp ./os.hpp
---- ../unrar/os.hpp	2013-12-01 09:10:14.000000000 +0100
-+++ ./os.hpp	2014-02-13 00:15:24.000000000 +0100
-@@ -130,7 +130,7 @@
-   #include <sys/sysctl.h>
- #endif
- #ifndef SFX_MODULE
--  #include <sys/statvfs.h>
-+  #include <sys/statfs.h>
- #endif
- #if defined(__FreeBSD__) || defined (__NetBSD__) || defined (__OpenBSD__) || defined(__APPLE__)
- #endif