mirror of
https://github.com/SerenityOS/serenity
synced 2024-10-15 20:33:10 +00:00
Ports: Update p7zip's patches to use git patches
This commit is contained in:
parent
bb40ff80b2
commit
848c883bb6
|
@ -0,0 +1,27 @@
|
|||
From 706b58fb624701b102d18bc60f3d21b9c812c359 Mon Sep 17 00:00:00 2001
|
||||
From: John Brehm <cooljohnny3@gmail.com>
|
||||
Date: Mon, 16 May 2022 22:58:31 +0430
|
||||
Subject: [PATCH 1/3] Link with -ldl -liconv on serenity
|
||||
|
||||
---
|
||||
7zip/CMAKE/7za/CMakeLists.txt | 4 ++++
|
||||
1 file changed, 4 insertions(+)
|
||||
|
||||
diff --git a/7zip/CMAKE/7za/CMakeLists.txt b/7zip/CMAKE/7za/CMakeLists.txt
|
||||
index 7fc1102..9a3511d 100644
|
||||
--- a/7zip/CMAKE/7za/CMakeLists.txt
|
||||
+++ b/7zip/CMAKE/7za/CMakeLists.txt
|
||||
@@ -357,6 +357,10 @@ add_executable(7za
|
||||
"../../../../CPP/myWindows/wine_date_and_time.cpp"
|
||||
)
|
||||
|
||||
+IF(SERENITYOS)
|
||||
+ TARGET_LINK_LIBRARIES(7za ${CMAKE_THREAD_LIBS_INIT} dl iconv)
|
||||
+ENDIF(SERENITYOS)
|
||||
+
|
||||
|
||||
IF(APPLE)
|
||||
TARGET_LINK_LIBRARIES(7za ${COREFOUNDATION_LIBRARY} ${CMAKE_THREAD_LIBS_INIT})
|
||||
--
|
||||
2.36.1
|
||||
|
25
Ports/p7zip/patches/0002-Disable-wctype-related-stuff.patch
Normal file
25
Ports/p7zip/patches/0002-Disable-wctype-related-stuff.patch
Normal file
|
@ -0,0 +1,25 @@
|
|||
From faeff47d7dce98869667575f1765fcacbce9da2b Mon Sep 17 00:00:00 2001
|
||||
From: John Brehm <cooljohnny3@gmail.com>
|
||||
Date: Mon, 16 May 2022 22:58:31 +0430
|
||||
Subject: [PATCH 2/3] Disable wctype related stuff
|
||||
|
||||
---
|
||||
myWindows/config.h | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/myWindows/config.h b/myWindows/config.h
|
||||
index 497d197..fa402c6 100644
|
||||
--- a/myWindows/config.h
|
||||
+++ b/myWindows/config.h
|
||||
@@ -36,7 +36,7 @@
|
||||
#define ENV_HAVE_TOWUPPER
|
||||
#endif
|
||||
|
||||
-
|
||||
+ #undef ENV_HAVE_WCTYPE_H
|
||||
|
||||
#if !defined(ENV_BEOS) && !defined(ANDROID_NDK)
|
||||
|
||||
--
|
||||
2.36.1
|
||||
|
|
@ -0,0 +1,24 @@
|
|||
From f62c28eb06da77e271e7ad2f2cf7fd09d112f0f1 Mon Sep 17 00:00:00 2001
|
||||
From: John Brehm <cooljohnny3@gmail.com>
|
||||
Date: Mon, 16 May 2022 22:58:31 +0430
|
||||
Subject: [PATCH 3/3] Add a missing strings.h include
|
||||
|
||||
---
|
||||
7zip/Archive/Zip/ZipItem.cpp | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/7zip/Archive/Zip/ZipItem.cpp b/7zip/Archive/Zip/ZipItem.cpp
|
||||
index 353e895..ad0a3da 100644
|
||||
--- a/7zip/Archive/Zip/ZipItem.cpp
|
||||
+++ b/7zip/Archive/Zip/ZipItem.cpp
|
||||
@@ -19,6 +19,7 @@
|
||||
#include "../Common/ItemNameUtils.h"
|
||||
|
||||
#include "ZipItem.h"
|
||||
+#include <strings.h>
|
||||
|
||||
namespace NArchive {
|
||||
namespace NZip {
|
||||
--
|
||||
2.36.1
|
||||
|
17
Ports/p7zip/patches/ReadMe.md
Normal file
17
Ports/p7zip/patches/ReadMe.md
Normal file
|
@ -0,0 +1,17 @@
|
|||
# Patches for p7zip on SerenityOS
|
||||
|
||||
## `0001-Link-with-ldl-liconv-on-serenity.patch`
|
||||
|
||||
Link with -ldl -liconv on serenity
|
||||
|
||||
|
||||
## `0002-Disable-wctype-related-stuff.patch`
|
||||
|
||||
Disable wctype related stuff
|
||||
|
||||
|
||||
## `0003-Add-a-missing-strings.h-include.patch`
|
||||
|
||||
Add a missing strings.h include
|
||||
|
||||
|
|
@ -1,39 +0,0 @@
|
|||
diff --git a/7zip/Archive/Zip/ZipItem.cpp b/7zip/Archive/Zip/ZipItem.cpp
|
||||
index 353e895..ad0a3da 100644
|
||||
--- a/7zip/Archive/Zip/ZipItem.cpp
|
||||
+++ b/7zip/Archive/Zip/ZipItem.cpp
|
||||
@@ -19,6 +19,7 @@
|
||||
#include "../Common/ItemNameUtils.h"
|
||||
|
||||
#include "ZipItem.h"
|
||||
+#include <strings.h>
|
||||
|
||||
namespace NArchive {
|
||||
namespace NZip {
|
||||
diff --git a/7zip/CMAKE/7za/CMakeLists.txt b/7zip/CMAKE/7za/CMakeLists.txt
|
||||
index 469e325..32388ac 100644
|
||||
--- a/7zip/CMAKE/7za/CMakeLists.txt
|
||||
+++ b/7zip/CMAKE/7za/CMakeLists.txt
|
||||
@@ -357,6 +357,9 @@ add_executable(7za
|
||||
"../../../../myWindows/wine_date_and_time.cpp"
|
||||
)
|
||||
|
||||
+IF(SERENITYOS)
|
||||
+ TARGET_LINK_LIBRARIES(7za ${CMAKE_THREAD_LIBS_INIT} dl iconv)
|
||||
+ENDIF(SERENITYOS)
|
||||
|
||||
IF(APPLE)
|
||||
TARGET_LINK_LIBRARIES(7za ${COREFOUNDATION_LIBRARY} ${CMAKE_THREAD_LIBS_INIT})
|
||||
diff --git a/myWindows/config.h b/myWindows/config.h
|
||||
index 497d197..fa402c6 100644
|
||||
--- a/myWindows/config.h
|
||||
+++ b/myWindows/config.h
|
||||
@@ -36,7 +36,7 @@
|
||||
#define ENV_HAVE_TOWUPPER
|
||||
#endif
|
||||
|
||||
-
|
||||
+ #undef ENV_HAVE_WCTYPE_H
|
||||
|
||||
#if !defined(ENV_BEOS) && !defined(ANDROID_NDK)
|
||||
|
Loading…
Reference in a new issue