Update p7zip to 16.02

5 files changed, 11 insertions, 12 deletions

diff --git a/data/p7zip/_metadata/version b/data/p7zip/_metadata/version
index 8c2a27e8c..43c4e9120 100644
--- a/data/p7zip/_metadata/version
+++ b/data/p7zip/_metadata/version
@@ -1 +1 @@
-4.57
+16.02
diff --git a/data/p7zip/make.sh b/data/p7zip/make.sh
index 08f0c9867..1c39d6147 100644
--- a/data/p7zip/make.sh
+++ b/data/p7zip/make.sh
@@ -1,4 +1,4 @@
 pkg:setup
-mv -f makefile.macosx makefile.machine
+mv -f makefile.macosx_gcc_64bits makefile.machine
 make all2
 make install DEST_DIR="${PKG_DEST}" DEST_HOME="/usr"
diff --git a/data/p7zip/p7zip_16.02_src_all.tar.xz b/data/p7zip/p7zip_16.02_src_all.tar.xz
new file mode 100644
index 000000000..534cf0ef7
--- /dev/null
+++ b/data/p7zip/p7zip_16.02_src_all.tar.xz
diff --git a/data/p7zip/p7zip_4.57_src_all.tar.bz2 b/data/p7zip/p7zip_4.57_src_all.tar.bz2
deleted file mode 100644
index bf4981b26..000000000
--- a/data/p7zip/p7zip_4.57_src_all.tar.bz2
+++ /dev/null
diff --git a/data/p7zip/tools.diff b/data/p7zip/tools.diff
index eb1655b39..2aba1dea4 100644
--- a/data/p7zip/tools.diff
+++ b/data/p7zip/tools.diff
@@ -1,14 +1,13 @@
-diff -ru p7zip_4.57/makefile.macosx p7zip_4.57+iPhone/makefile.macosx
---- p7zip_4.57/makefile.macosx	2007-05-27 09:57:49.000000000 +0000
-+++ p7zip_4.57+iPhone/makefile.macosx	2008-01-23 08:09:43.000000000 +0000
-@@ -7,8 +7,8 @@
- 	-DNDEBUG -D_REENTRANT -DENV_UNIX \
+--- p7zip_16.02/makefile.macosx_gcc_64bits	2015-01-11 06:34:26.000000000 -1000
++++ p7zip_16.02+iPhone/makefile.macosx_gcc_64bits	2018-08-03 21:29:16.000000000 -1000
+@@ -9,8 +9,8 @@
+ 	-D_REENTRANT -DENV_UNIX \
  	$(LOCAL_FLAGS)
  
--CXX=c++ $(ALLFLAGS)
--CC=cc $(ALLFLAGS)
-+CXX=$${PKG_TARG}-g++ $(ALLFLAGS)
-+CC=$${PKG_TARG}-gcc $(ALLFLAGS)
+-CXX=c++
+-CC=cc
++CXX=$${PKG_TARG}-g++
++CC=$${PKG_TARG}-gcc
  LINK_SHARED=-bundle
  
- LOCAL_LIBS=
+ LOCAL_LIBS=-framework CoreFoundation