From e658e061fca895dbdec4ce6ed8c59040dfa80da9 Mon Sep 17 00:00:00 2001
From: "alexey.lysiuk" <alexey.lysiuk@gmail.com>
Date: Thu, 20 Jul 2023 13:01:57 +0300
Subject: [PATCH] aedi: update 7zip to 23.01

---
 aedi/target/tool_tier2.py  |  4 +--
 patch/7zip-fix-errors.diff | 67 ++++++++++++++------------------------
 2 files changed, 26 insertions(+), 45 deletions(-)

diff --git a/aedi/target/tool_tier2.py b/aedi/target/tool_tier2.py
index 0072ed56..fe6138b5 100644
--- a/aedi/target/tool_tier2.py
+++ b/aedi/target/tool_tier2.py
@@ -169,8 +169,8 @@ class SeverZipTarget(base.MakeTarget):
 
     def prepare_source(self, state: BuildState):
         state.download_source(
-            'https://www.7-zip.org/a/7z2201-src.tar.xz',
-            '393098730c70042392af808917e765945dc2437dee7aae3cfcc4966eb920fbc5',
+            'https://7-zip.org/a/7z2301-src.tar.xz',
+            '356071007360e5a1824d9904993e8b2480b51b570e8c9faf7c0f58ebe4bf9f74',
             patches='7zip-fix-errors')
 
     def detect(self, state: BuildState) -> bool:
diff --git a/patch/7zip-fix-errors.diff b/patch/7zip-fix-errors.diff
index 11ad8733..5a051c73 100644
--- a/patch/7zip-fix-errors.diff
+++ b/patch/7zip-fix-errors.diff
@@ -1,46 +1,27 @@
---- a/CPP/7zip/7zip_gcc.mak
-+++ b/CPP/7zip/7zip_gcc.mak
-@@ -17,10 +17,6 @@
- PROGPATH_STATIC = $(O)/$(PROG)s
+--- a/C/Threads.c
++++ b/C/Threads.c
+@@ -371,10 +371,11 @@
  
+ WRes Event_Set(CEvent *p)
+ {
++  int res1, res2;
+   RINOK(pthread_mutex_lock(&p->_mutex))
+   p->_state = True;
+-  int res1 = pthread_cond_broadcast(&p->_cond);
+-  int res2 = pthread_mutex_unlock(&p->_mutex);
++  res1 = pthread_cond_broadcast(&p->_cond);
++  res2 = pthread_mutex_unlock(&p->_mutex);
+   return (res2 ? res2 : res1);
+ }
  
--ifneq ($(CC), xlc)
--CFLAGS_WARN_WALL = -Wall -Werror -Wextra
--endif
--
- # for object file
- CFLAGS_BASE_LIST = -c
- # CFLAGS_BASE_LIST = -S
---- a/CPP/7zip/Archive/ApfsHandler.cpp
-+++ b/CPP/7zip/Archive/ApfsHandler.cpp
-@@ -983,7 +983,7 @@
- INODE_ALLOCATION_SPILLEDOVER  = 0x00010000,
- INODE_FAST_PROMOTE            = 0x00020000,
- */
--INODE_HAS_UNCOMPRESSED_SIZE   = 0x00040000,
-+INODE_HAS_UNCOMPRESSED_SIZE   = 0x00040000
- /*
- INODE_IS_PURGEABLE            = 0x00080000,
- INODE_WANTS_TO_BE_PURGEABLE   = 0x00100000,
---- a/CPP/7zip/Common/FileStreams.cpp
-+++ b/CPP/7zip/Common/FileStreams.cpp
-@@ -12,7 +12,7 @@
- #include <pwd.h>
+--- a/CPP/7zip/UI/Common/EnumDirItems.cpp
++++ b/CPP/7zip/UI/Common/EnumDirItems.cpp
+@@ -287,7 +287,7 @@
+   
+   CObjectVector<NFind::CDirEntry> entries;
  
- // for major()/minor():
--#if defined(__FreeBSD__) || defined(BSD)
-+#if 1
- #include <sys/types.h>
- #else
- #include <sys/sysmacros.h>
---- a/CPP/7zip/UI/Common/UpdateCallback.cpp
-+++ b/CPP/7zip/UI/Common/UpdateCallback.cpp
-@@ -9,7 +9,7 @@
- // #include <pwd.h>
- 
- // for major()/minor():
--#if defined(__FreeBSD__) || defined(BSD)
-+#if 1
- #include <sys/types.h>
- #else
- #include <sys/sysmacros.h>
+-  for (unsigned ttt = 0; ; ttt++)
++  for (;;)
+   {
+     bool found;
+     NFind::CDirEntry de;