Skip to content

Commit 848c883

Browse files
committed
Ports: Update p7zip's patches to use git patches
1 parent bb40ff8 commit 848c883

File tree

5 files changed

+93
-39
lines changed

5 files changed

+93
-39
lines changed
Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
From 706b58fb624701b102d18bc60f3d21b9c812c359 Mon Sep 17 00:00:00 2001
2+
From: John Brehm <cooljohnny3@gmail.com>
3+
Date: Mon, 16 May 2022 22:58:31 +0430
4+
Subject: [PATCH 1/3] Link with -ldl -liconv on serenity
5+
6+
---
7+
7zip/CMAKE/7za/CMakeLists.txt | 4 ++++
8+
1 file changed, 4 insertions(+)
9+
10+
diff --git a/7zip/CMAKE/7za/CMakeLists.txt b/7zip/CMAKE/7za/CMakeLists.txt
11+
index 7fc1102..9a3511d 100644
12+
--- a/7zip/CMAKE/7za/CMakeLists.txt
13+
+++ b/7zip/CMAKE/7za/CMakeLists.txt
14+
@@ -357,6 +357,10 @@ add_executable(7za
15+
"../../../../CPP/myWindows/wine_date_and_time.cpp"
16+
)
17+
18+
+IF(SERENITYOS)
19+
+ TARGET_LINK_LIBRARIES(7za ${CMAKE_THREAD_LIBS_INIT} dl iconv)
20+
+ENDIF(SERENITYOS)
21+
+
22+
23+
IF(APPLE)
24+
TARGET_LINK_LIBRARIES(7za ${COREFOUNDATION_LIBRARY} ${CMAKE_THREAD_LIBS_INIT})
25+
--
26+
2.36.1
27+
Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
From faeff47d7dce98869667575f1765fcacbce9da2b Mon Sep 17 00:00:00 2001
2+
From: John Brehm <cooljohnny3@gmail.com>
3+
Date: Mon, 16 May 2022 22:58:31 +0430
4+
Subject: [PATCH 2/3] Disable wctype related stuff
5+
6+
---
7+
myWindows/config.h | 2 +-
8+
1 file changed, 1 insertion(+), 1 deletion(-)
9+
10+
diff --git a/myWindows/config.h b/myWindows/config.h
11+
index 497d197..fa402c6 100644
12+
--- a/myWindows/config.h
13+
+++ b/myWindows/config.h
14+
@@ -36,7 +36,7 @@
15+
#define ENV_HAVE_TOWUPPER
16+
#endif
17+
18+
-
19+
+ #undef ENV_HAVE_WCTYPE_H
20+
21+
#if !defined(ENV_BEOS) && !defined(ANDROID_NDK)
22+
23+
--
24+
2.36.1
25+
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
From f62c28eb06da77e271e7ad2f2cf7fd09d112f0f1 Mon Sep 17 00:00:00 2001
2+
From: John Brehm <cooljohnny3@gmail.com>
3+
Date: Mon, 16 May 2022 22:58:31 +0430
4+
Subject: [PATCH 3/3] Add a missing strings.h include
5+
6+
---
7+
7zip/Archive/Zip/ZipItem.cpp | 1 +
8+
1 file changed, 1 insertion(+)
9+
10+
diff --git a/7zip/Archive/Zip/ZipItem.cpp b/7zip/Archive/Zip/ZipItem.cpp
11+
index 353e895..ad0a3da 100644
12+
--- a/7zip/Archive/Zip/ZipItem.cpp
13+
+++ b/7zip/Archive/Zip/ZipItem.cpp
14+
@@ -19,6 +19,7 @@
15+
#include "../Common/ItemNameUtils.h"
16+
17+
#include "ZipItem.h"
18+
+#include <strings.h>
19+
20+
namespace NArchive {
21+
namespace NZip {
22+
--
23+
2.36.1
24+

Ports/p7zip/patches/ReadMe.md

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
# Patches for p7zip on SerenityOS
2+
3+
## `0001-Link-with-ldl-liconv-on-serenity.patch`
4+
5+
Link with -ldl -liconv on serenity
6+
7+
8+
## `0002-Disable-wctype-related-stuff.patch`
9+
10+
Disable wctype related stuff
11+
12+
13+
## `0003-Add-a-missing-strings.h-include.patch`
14+
15+
Add a missing strings.h include
16+
17+

Ports/p7zip/patches/fixes.patch

Lines changed: 0 additions & 39 deletions
This file was deleted.

0 commit comments

Comments
 (0)