zdoom/zdoom-macos-deps
0
0
Fork 0
mirror of https://github.com/ZDoom/zdoom-macos-deps.git synced 2025-02-17 17:11:29 +00:00
Code Issues Projects Releases Packages Wiki Activity

aedi: update 7zip to 23.01

Browse source
This commit is contained in:
alexey.lysiuk 2023-07-20 13:01:57 +03:00
parent e4fd95e132
commit e658e061fc
2 changed files with 26 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
aedi/target/tool_tier2.py
View file

@ -169,8 +169,8 @@ class SeverZipTarget(base.MakeTarget):
def prepare_source(self, state: BuildState): def prepare_source(self, state: BuildState):
state.download_source( state.download_source(
'https://www.7-zip.org/a/7z2201-src.tar.xz', 'https://7-zip.org/a/7z2301-src.tar.xz',
'393098730c70042392af808917e765945dc2437dee7aae3cfcc4966eb920fbc5', '356071007360e5a1824d9904993e8b2480b51b570e8c9faf7c0f58ebe4bf9f74',
patches='7zip-fix-errors') patches='7zip-fix-errors')
def detect(self, state: BuildState) -> bool: def detect(self, state: BuildState) -> bool:

67
patch/7zip-fix-errors.diff
View file

@ -1,46 +1,27 @@
--- a/CPP/7zip/7zip_gcc.mak --- a/C/Threads.c
+++ b/CPP/7zip/7zip_gcc.mak +++ b/C/Threads.c
@@ -17,10 +17,6 @@ @@ -371,10 +371,11 @@
PROGPATH_STATIC = $(O)/$(PROG)s
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) --- a/CPP/7zip/UI/Common/EnumDirItems.cpp
-CFLAGS_WARN_WALL = -Wall -Werror -Wextra +++ b/CPP/7zip/UI/Common/EnumDirItems.cpp
-endif @@ -287,7 +287,7 @@
-
# for object file CObjectVector<NFind::CDirEntry> entries;
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>
// for major()/minor(): - for (unsigned ttt = 0; ; ttt++)
-#if defined(__FreeBSD__) || defined(BSD) + for (;;)
+#if 1 {
#include <sys/types.h> bool found;
#else NFind::CDirEntry de;
#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>