From 8d370cf81d362885b57b61857c21145e9039189e Mon Sep 17 00:00:00 2001 From: Ali Mohammad Pur Date: Mon, 16 May 2022 19:21:42 +0430 Subject: [PATCH] Ports: Update libgpg-error's patches to use git patches --- .../patches/0001-Include-errno.h.patch | 24 +++++++++++++ .../0002-Stub-out-the-gpgrt-lock-impl.patch | 36 +++++++++++++++++++ Ports/libgpg-error/patches/ReadMe.md | 12 +++++++ Ports/libgpg-error/patches/includes.patch | 11 ------ Ports/libgpg-error/patches/syscfg.patch | 21 ----------- 5 files changed, 72 insertions(+), 32 deletions(-) create mode 100644 Ports/libgpg-error/patches/0001-Include-errno.h.patch create mode 100644 Ports/libgpg-error/patches/0002-Stub-out-the-gpgrt-lock-impl.patch create mode 100644 Ports/libgpg-error/patches/ReadMe.md delete mode 100644 Ports/libgpg-error/patches/includes.patch delete mode 100644 Ports/libgpg-error/patches/syscfg.patch diff --git a/Ports/libgpg-error/patches/0001-Include-errno.h.patch b/Ports/libgpg-error/patches/0001-Include-errno.h.patch new file mode 100644 index 0000000000..b1ee2caf49 --- /dev/null +++ b/Ports/libgpg-error/patches/0001-Include-errno.h.patch @@ -0,0 +1,24 @@ +From ea4d2441210e9bacb778e892227ed99ff496a9e1 Mon Sep 17 00:00:00 2001 +From: Gunnar Beutner +Date: Wed, 14 Apr 2021 04:32:34 +0200 +Subject: [PATCH 1/2] Include errno.h + +--- + src/mkerrcodes.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/mkerrcodes.c b/src/mkerrcodes.c +index 29c1cc2..a1cbd52 100644 +--- a/src/mkerrcodes.c ++++ b/src/mkerrcodes.c +@@ -22,6 +22,7 @@ + system, while this file will be run on the build system. */ + + #include ++#include + + #include "mkerrcodes.h" + +-- +2.36.1 + diff --git a/Ports/libgpg-error/patches/0002-Stub-out-the-gpgrt-lock-impl.patch b/Ports/libgpg-error/patches/0002-Stub-out-the-gpgrt-lock-impl.patch new file mode 100644 index 0000000000..3d4ac14437 --- /dev/null +++ b/Ports/libgpg-error/patches/0002-Stub-out-the-gpgrt-lock-impl.patch @@ -0,0 +1,36 @@ +From 473f87074e63a2786d42035c919e061c8574b7fe Mon Sep 17 00:00:00 2001 +From: Gunnar Beutner +Date: Wed, 14 Apr 2021 04:32:34 +0200 +Subject: [PATCH 2/2] Stub out the gpgrt lock impl + +--- + src/syscfg/lock-obj-pub.i686-pc-serenity.h | 17 +++++++++++++++++ + 1 file changed, 17 insertions(+) + create mode 100644 src/syscfg/lock-obj-pub.i686-pc-serenity.h + +diff --git a/src/syscfg/lock-obj-pub.i686-pc-serenity.h b/src/syscfg/lock-obj-pub.i686-pc-serenity.h +new file mode 100644 +index 0000000..016f396 +--- /dev/null ++++ b/src/syscfg/lock-obj-pub.i686-pc-serenity.h +@@ -0,0 +1,17 @@ ++## lock-obj-pub.i686-pc-serenity.h - NO LOCK SUPPORT ++## File created by gen-posix-lock-obj - DO NOT EDIT ++## To be included by mkheader into gpg-error.h ++ ++/* Dummy object - no locking available. */ ++typedef struct ++{ ++ long _vers; ++} gpgrt_lock_t; ++ ++#define GPGRT_LOCK_INITIALIZER {-1} ++## ++## Local Variables: ++## mode: c ++## buffer-read-only: t ++## End: ++## +-- +2.36.1 + diff --git a/Ports/libgpg-error/patches/ReadMe.md b/Ports/libgpg-error/patches/ReadMe.md new file mode 100644 index 0000000000..36f89926d1 --- /dev/null +++ b/Ports/libgpg-error/patches/ReadMe.md @@ -0,0 +1,12 @@ +# Patches for libgpg-error on SerenityOS + +## `0001-Include-errno.h.patch` + +Include errno.h + + +## `0002-Stub-out-the-gpgrt-lock-impl.patch` + +Stub out the gpgrt lock impl + + diff --git a/Ports/libgpg-error/patches/includes.patch b/Ports/libgpg-error/patches/includes.patch deleted file mode 100644 index f3959a4c1c..0000000000 --- a/Ports/libgpg-error/patches/includes.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -Naur libgpg-error-1.42/src/mkerrcodes.c libgpg-error-1.42.serenity/src/mkerrcodes.c ---- libgpg-error-1.42/src/mkerrcodes.c 2016-11-16 13:22:03.000000000 +0100 -+++ libgpg-error-1.42.serenity/src/mkerrcodes.c 2021-04-14 01:38:44.112242487 +0200 -@@ -22,6 +22,7 @@ - system, while this file will be run on the build system. */ - - #include -+#include - - #include "mkerrcodes.h" - diff --git a/Ports/libgpg-error/patches/syscfg.patch b/Ports/libgpg-error/patches/syscfg.patch deleted file mode 100644 index 3ad208d305..0000000000 --- a/Ports/libgpg-error/patches/syscfg.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -Naur libgpg-error-1.42/src/syscfg/lock-obj-pub.i686-pc-serenity.h libgpg-error-1.42.serenity/src/syscfg/lock-obj-pub.i686-pc-serenity.h ---- libgpg-error-1.42/src/syscfg/lock-obj-pub.i686-pc-serenity.h 1970-01-01 01:00:00.000000000 +0100 -+++ libgpg-error-1.42.serenity/src/syscfg/lock-obj-pub.i686-pc-serenity.h 2021-04-14 01:24:29.444700685 +0200 -@@ -0,0 +1,17 @@ -+## lock-obj-pub.i686-pc-serenity.h - NO LOCK SUPPORT -+## File created by gen-posix-lock-obj - DO NOT EDIT -+## To be included by mkheader into gpg-error.h -+ -+/* Dummy object - no locking available. */ -+typedef struct -+{ -+ long _vers; -+} gpgrt_lock_t; -+ -+#define GPGRT_LOCK_INITIALIZER {-1} -+## -+## Local Variables: -+## mode: c -+## buffer-read-only: t -+## End: -+##