unrar: Update from 5.5.8 to 5.6.1

diff --git a/packages/unrar/build.sh b/packages/unrar/build.sh
index 7bbf5c7cb79fe11ebecb28f0d3ff47e294499efb..8a9c5e4388f6964dda8d4c72b7240d9d8a265545 100644 (file)
--- a/packages/unrar/build.sh
+++ b/packages/unrar/build.sh
@@ -1,7 +1,7 @@
-TERMUX_PKG_HOMEPAGE=http://www.rarlab.com/
+TERMUX_PKG_HOMEPAGE=https://www.rarlab.com/

 TERMUX_PKG_DESCRIPTION="Tool for extracting files from .rar archives"
 TERMUX_PKG_DESCRIPTION="Tool for extracting files from .rar archives"

-TERMUX_PKG_VERSION=5.5.8
-TERMUX_PKG_SRCURL=http://www.rarlab.com/rar/unrarsrc-${TERMUX_PKG_VERSION}.tar.gz
-TERMUX_PKG_SHA256=9b66e4353a9944bc140eb2a919ff99482dd548f858f5e296d809e8f7cdb2fcf4
+TERMUX_PKG_VERSION=5.6.1
+TERMUX_PKG_SHA256=67c339dffa95f6c1bedcca40045e99de5852919dbfaa06e4a9c8f18cd5064e70
+TERMUX_PKG_SRCURL=https://www.rarlab.com/rar/unrarsrc-${TERMUX_PKG_VERSION}.tar.gz

 TERMUX_PKG_DEPENDS="libandroid-support,readline"
 TERMUX_PKG_BUILD_IN_SRC=yes
 TERMUX_PKG_DEPENDS="libandroid-support,readline"
 TERMUX_PKG_BUILD_IN_SRC=yes

diff --git a/packages/unrar/makefile.patch b/packages/unrar/makefile.patch
index 06860e0ac449357d90ac7b44c8a9efe9ec169c91..1f07cce7080a63f518c977c0c2c88fc69de509a7 100644 (file)
--- a/packages/unrar/makefile.patch
+++ b/packages/unrar/makefile.patch
@@ -1,15 +1,15 @@
-diff -uNr unrar/makefile unrar.mod/makefile
---- unrar/makefile     2017-06-13 14:04:49.000000000 +0300
-+++ unrar.mod/makefile 2017-09-14 20:40:07.511902817 +0300
+diff -u -r ../unrar/makefile ./makefile
+--- ../unrar/makefile  2017-11-22 06:53:39.000000000 +0000
++++ ./makefile 2018-03-12 10:30:16.141557520 +0000

 @@ -2,14 +2,15 @@
  # Makefile for UNIX - unrar
  
  # Linux using GCC
 -CXX=c++
 @@ -2,14 +2,15 @@
  # Makefile for UNIX - unrar
  
  # Linux using GCC
 -CXX=c++

--CXXFLAGS=-O2
+-CXXFLAGS=-O2 -Wno-logical-op-parentheses -Wno-switch -Wno-dangling-else

 -LIBFLAGS=-fPIC
 +CXX?=c++
 -LIBFLAGS=-fPIC
 +CXX?=c++

-+CXXFLAGS?=-O2
++CXXFLAGS?=-O2 -Wno-logical-op-parentheses -Wno-switch -Wno-dangling-else

 +LIBFLAGS=$(LDFLAGS)
  DEFINES=-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -DRAR_SMP
 -STRIP=strip
 +LIBFLAGS=$(LDFLAGS)
  DEFINES=-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -DRAR_SMP
 -STRIP=strip