From a2402faaf31c8c28f55297438a25a487b9d01195 Mon Sep 17 00:00:00 2001
From: Ali Mohammad Pur <ali.mpfard@gmail.com>
Date: Mon, 16 May 2022 19:21:55 +0430
Subject: [PATCH] Ports: Update mruby's patches to use git patches

---
 .../patches/0001-Include-sys-select.h.patch   | 24 +++++++++++++++++++
 ... 0002-Add-a-build-conf-for-serenity.patch} | 20 ++++++++++++++--
 Ports/mruby/patches/ReadMe.md                 | 12 ++++++++++
 .../mruby/patches/include-sys-select-h.patch  | 10 --------
 4 files changed, 54 insertions(+), 12 deletions(-)
 create mode 100644 Ports/mruby/patches/0001-Include-sys-select.h.patch
 rename Ports/mruby/patches/{serenity-build-conf.patch => 0002-Add-a-build-conf-for-serenity.patch} (54%)
 create mode 100644 Ports/mruby/patches/ReadMe.md
 delete mode 100644 Ports/mruby/patches/include-sys-select-h.patch

diff --git a/Ports/mruby/patches/0001-Include-sys-select.h.patch b/Ports/mruby/patches/0001-Include-sys-select.h.patch
new file mode 100644
index 0000000000..95dc61ce4b
--- /dev/null
+++ b/Ports/mruby/patches/0001-Include-sys-select.h.patch
@@ -0,0 +1,24 @@
+From 2570626cb58a59e45251dffa409547919dc23df2 Mon Sep 17 00:00:00 2001
+From: Dante Catalfamo <dante.catalfamo@gmail.com>
+Date: Fri, 20 Aug 2021 00:38:31 -0400
+Subject: [PATCH 1/2] Include sys/select.h
+
+---
+ mrbgems/mruby-io/src/io.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/mrbgems/mruby-io/src/io.c b/mrbgems/mruby-io/src/io.c
+index 0469c05..0dae6ca 100644
+--- a/mrbgems/mruby-io/src/io.c
++++ b/mrbgems/mruby-io/src/io.c
+@@ -49,6 +49,7 @@
+   #include <sys/wait.h>
+   #include <sys/time.h>
+   #include <unistd.h>
++  #include <sys/select.h>
+   typedef size_t fsize_t;
+   typedef time_t ftime_t;
+   typedef suseconds_t fsuseconds_t;
+-- 
+2.36.1
+
diff --git a/Ports/mruby/patches/serenity-build-conf.patch b/Ports/mruby/patches/0002-Add-a-build-conf-for-serenity.patch
similarity index 54%
rename from Ports/mruby/patches/serenity-build-conf.patch
rename to Ports/mruby/patches/0002-Add-a-build-conf-for-serenity.patch
index 5caa4744e7..3c919ede9e 100644
--- a/Ports/mruby/patches/serenity-build-conf.patch
+++ b/Ports/mruby/patches/0002-Add-a-build-conf-for-serenity.patch
@@ -1,5 +1,18 @@
---- /dev/null	2021-08-20 13:32:02.136545596 -0400
-+++ mruby-3.0.0/build_config/serenity.rb	2021-08-20 14:18:09.673875364 -0400
+From 0b19221cc06f6fda8120d1f1bde79ce0a43db8d5 Mon Sep 17 00:00:00 2001
+From: Dante Catalfamo <dante.catalfamo@gmail.com>
+Date: Fri, 20 Aug 2021 00:38:31 -0400
+Subject: [PATCH 2/2] Add a build conf for serenity
+
+---
+ build_config/serenity.rb | 16 ++++++++++++++++
+ 1 file changed, 16 insertions(+)
+ create mode 100644 build_config/serenity.rb
+
+diff --git a/build_config/serenity.rb b/build_config/serenity.rb
+new file mode 100644
+index 0000000..b38f5ee
+--- /dev/null
++++ b/build_config/serenity.rb
 @@ -0,0 +1,16 @@
 +MRuby::CrossBuild.new('serenity') do |conf|
 +  conf.toolchain :gcc
@@ -17,3 +30,6 @@
 +
 +  conf.test_runner.command = 'env'
 +end
+-- 
+2.36.1
+
diff --git a/Ports/mruby/patches/ReadMe.md b/Ports/mruby/patches/ReadMe.md
new file mode 100644
index 0000000000..6f5b279ba3
--- /dev/null
+++ b/Ports/mruby/patches/ReadMe.md
@@ -0,0 +1,12 @@
+# Patches for mruby on SerenityOS
+
+## `0001-Include-sys-select.h.patch`
+
+Include sys/select.h
+
+
+## `0002-Add-a-build-conf-for-serenity.patch`
+
+Add a build conf for serenity
+
+
diff --git a/Ports/mruby/patches/include-sys-select-h.patch b/Ports/mruby/patches/include-sys-select-h.patch
deleted file mode 100644
index 2a143a6646..0000000000
--- a/Ports/mruby/patches/include-sys-select-h.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- mruby-3.0.0/mrbgems/mruby-io/src/io.c	2021-08-20 00:27:04.837317416 -0400
-+++ mruby-3.0.0.serenity/mrbgems/mruby-io/src/io.c	2021-08-20 00:28:51.960390750 -0400
-@@ -49,6 +49,7 @@
-   #include <sys/wait.h>
-   #include <sys/time.h>
-   #include <unistd.h>
-+  #include <sys/select.h>
-   typedef size_t fsize_t;
-   typedef time_t ftime_t;
-   typedef suseconds_t fsuseconds_t;