beenull/ladybird
1
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2024-09-30 08:41:15 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

Ports: Update zstd's patches to use git patches

Browse source
This commit is contained in:
Ali Mohammad Pur 2022-05-16 23:59:02 +04:30 committed by Ali Mohammad Pur
parent a3ff011fcb
commit b321d2b563
Notes: sideshowbarker 2024-07-17 10:46:42 +09:00 
Author: https://github.com/alimpfard
Commit: https://github.com/SerenityOS/serenity/commit/b321d2b563
Pull-request: https://github.com/SerenityOS/serenity/pull/14055
Reviewed-by: https://github.com/danners
Reviewed-by: https://github.com/timschumi
4 changed files with 63 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
Ports/zstd/patches/fix_soname_flags.patch → Ports/zstd/patches/0001-Fix-linker-soname-flags.patch
View file

@ -1,6 +1,18 @@
--- zstd-1.5.2/lib/Makefile.orig 2022-01-08 01:21:29.874503163 +0000
+++ zstd-1.5.2/lib/Makefile 2022-01-08 01:21:43.026368517 +0000
@@ -69,22 +69,10 @@
From 119adcddd9faa0485a64c49fb461ed24d26499b6 Mon Sep 17 00:00:00 2001
From: Luke Wilde <lukew@serenityos.org>
Date: Sun, 13 Mar 2022 16:45:19 +0000
Subject: [PATCH 1/2] Fix linker soname flags
Co-Authored-By: EWouters <6179932+EWouters@users.noreply.github.com>
---
lib/Makefile | 20 ++++----------------
1 file changed, 4 insertions(+), 16 deletions(-)
diff --git a/lib/Makefile b/lib/Makefile
index ef20218..e4766c9 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -69,22 +69,10 @@ endif
# macOS linker doesn't support -soname, and use different extension
# see : https://developer.apple.com/library/mac/documentation/DeveloperTools/Conceptual/DynamicLibraries/100-Articles/DynamicLibraryDesignGuidelines.html
@ -27,3 +39,6 @@
.PHONY: all
all: lib
--
2.36.1

31
Ports/zstd/patches/0002-Make-platform.h-understand-that-serenity-is-posix-co.patch Normal file
View file

@ -0,0 +1,31 @@
From 71a4bdd121f346d97c398f92a7ff310132de497a Mon Sep 17 00:00:00 2001
From: Luke Wilde <lukew@serenityos.org>
Date: Sun, 13 Mar 2022 16:45:19 +0000
Subject: [PATCH 2/2] Make platform.h understand that serenity is
posix-compliant
Co-Authored-By: Brian Callahan <bcallah@openbsd.org>
---
programs/platform.h | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/programs/platform.h b/programs/platform.h
index b858e3b..8628c05 100644
--- a/programs/platform.h
+++ b/programs/platform.h
@@ -98,7 +98,11 @@ extern "C" {
# endif
# include <unistd.h> /* declares _POSIX_VERSION */
# if defined(_POSIX_VERSION) /* POSIX compliant */
-# define PLATFORM_POSIX_VERSION _POSIX_VERSION
+# if defined(__serenity__)
+# define PLATFORM_POSIX_VERSION 1
+# else
+# define PLATFORM_POSIX_VERSION _POSIX_VERSION
+# endif
# else
# define PLATFORM_POSIX_VERSION 1
# endif
--
2.36.1

14
Ports/zstd/patches/ReadMe.md Normal file
View file

@ -0,0 +1,14 @@
# Patches for zstd on SerenityOS
## `0001-Fix-linker-soname-flags.patch`
Fix linker soname flags
## `0002-Make-platform.h-understand-that-serenity-is-posix-co.patch`
Make platform.h understand that serenity is posix-compliant

15
Ports/zstd/patches/posix-compliance.patch
View file

@ -1,15 +0,0 @@
--- zstd-1.5.2/programs/platform.h.orig 2022-01-08 01:30:53.468728340 +0000
+++ zstd-1.5.2/programs/platform.h 2022-01-08 01:31:01.480646197 +0000
@@ -98,7 +98,11 @@
# endif
# include <unistd.h> /* declares _POSIX_VERSION */
# if defined(_POSIX_VERSION) /* POSIX compliant */
-# define PLATFORM_POSIX_VERSION _POSIX_VERSION
+# if defined(__serenity__)
+# define PLATFORM_POSIX_VERSION 1
+# else
+# define PLATFORM_POSIX_VERSION _POSIX_VERSION
+# endif
# else
# define PLATFORM_POSIX_VERSION 1
# endif