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

---
 ...ibly-unused-variable-as-maybe_unused.patch | 25 +++++++++++++++++++
 Ports/harfbuzz/patches/ReadMe.md              |  7 ++++++
 Ports/harfbuzz/patches/unused.patch           | 12 ---------
 3 files changed, 32 insertions(+), 12 deletions(-)
 create mode 100644 Ports/harfbuzz/patches/0001-Mark-a-possibly-unused-variable-as-maybe_unused.patch
 create mode 100644 Ports/harfbuzz/patches/ReadMe.md
 delete mode 100644 Ports/harfbuzz/patches/unused.patch

diff --git a/Ports/harfbuzz/patches/0001-Mark-a-possibly-unused-variable-as-maybe_unused.patch b/Ports/harfbuzz/patches/0001-Mark-a-possibly-unused-variable-as-maybe_unused.patch
new file mode 100644
index 0000000000..43d7905f84
--- /dev/null
+++ b/Ports/harfbuzz/patches/0001-Mark-a-possibly-unused-variable-as-maybe_unused.patch
@@ -0,0 +1,25 @@
+From d9b8ddabdfcd3113fecdbffa8cc3538419f2d2b4 Mon Sep 17 00:00:00 2001
+From: Gunnar Beutner <gbeutner@serenityos.org>
+Date: Sat, 8 May 2021 05:23:29 +0200
+Subject: [PATCH] Mark a possibly-unused variable as [[maybe_unused]]
+
+---
+ src/hb-buffer.hh | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/hb-buffer.hh b/src/hb-buffer.hh
+index 8b432b5..ab18f2e 100644
+--- a/src/hb-buffer.hh
++++ b/src/hb-buffer.hh
+@@ -166,7 +166,7 @@ struct hb_buffer_t
+ #ifndef HB_NDEBUG
+     unsigned int end = start + count;
+     assert (end <= 8);
+-    unsigned int bits = (1u<<end) - (1u<<start);
++    [[maybe_unused]] unsigned int bits = (1u<<end) - (1u<<start);
+     assert (bits == (allocated_var_bits & bits));
+ #endif
+   }
+-- 
+2.36.1
+
diff --git a/Ports/harfbuzz/patches/ReadMe.md b/Ports/harfbuzz/patches/ReadMe.md
new file mode 100644
index 0000000000..f8463201cc
--- /dev/null
+++ b/Ports/harfbuzz/patches/ReadMe.md
@@ -0,0 +1,7 @@
+# Patches for harfbuzz on SerenityOS
+
+## `0001-Mark-a-possibly-unused-variable-as-maybe_unused.patch`
+
+Mark a possibly-unused variable as [[maybe_unused]]
+
+
diff --git a/Ports/harfbuzz/patches/unused.patch b/Ports/harfbuzz/patches/unused.patch
deleted file mode 100644
index f6d48ae3a2..0000000000
--- a/Ports/harfbuzz/patches/unused.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur harfbuzz-2.8.1/src/hb-buffer.hh harfbuzz-2.8.1.serenity/src/hb-buffer.hh
---- harfbuzz-2.8.1/src/hb-buffer.hh	2021-05-04 02:09:38.000000000 +0200
-+++ harfbuzz-2.8.1.serenity/src/hb-buffer.hh	2021-05-08 05:22:34.579810445 +0200
-@@ -166,7 +166,7 @@
- #ifndef HB_NDEBUG
-     unsigned int end = start + count;
-     assert (end <= 8);
--    unsigned int bits = (1u<<end) - (1u<<start);
-+    [[maybe_unused]] unsigned int bits = (1u<<end) - (1u<<start);
-     assert (bits == (allocated_var_bits & bits));
- #endif
-   }