12 files changed, 56 insertions, 95 deletions
diff --git a/Ports/glib/patches/0001-poll.h-is-located-at-root.patch b/Ports/glib/patches/0001-poll.h-is-located-at-root-not-sys-poll.h.patch
index 05a4df6bbd..e62b3b4314 100644
--- a/Ports/glib/patches/0001-poll.h-is-located-at-root.patch
+++ b/Ports/glib/patches/0001-poll.h-is-located-at-root-not-sys-poll.h.patch
@@ -1,18 +1,17 @@
-From d39946bd24a98fbcee4740f14ccd85ed75f312c6 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Kenneth Myhra <kennethmyhra@gmail.com>
 Date: Thu, 12 Aug 2021 20:29:32 +0200
-Subject: [PATCH 01/12] meson.build: 'poll.h' is located at root, not
- 'sys/poll.h'
+Subject: [PATCH] 'poll.h' is located at root, not 'sys/poll.h'
 
 ---
  meson.build | 18 ++++++++++++++----
  1 file changed, 14 insertions(+), 4 deletions(-)
 
 diff --git a/meson.build b/meson.build
-index 1b54fdc..6b22e98 100644
+index a330b7b..0034898 100644
 --- a/meson.build
 +++ b/meson.build
-@@ -1717,7 +1717,11 @@ g_have_gnuc_varargs = cc.compiles('''
+@@ -1758,7 +1758,11 @@ g_have_gnuc_varargs = cc.compiles('''
  if cc.has_header('alloca.h')
    glibconfig_conf.set('GLIB_HAVE_ALLOCA_H', true)
  endif
@@ -25,7 +24,7 @@ index 1b54fdc..6b22e98 100644
  has_systypes = cc.has_header('sys/types.h')
  if has_syspoll
    glibconfig_conf.set('GLIB_HAVE_SYS_POLL_H', true)
-@@ -1725,9 +1729,15 @@ endif
+@@ -1766,9 +1770,15 @@ endif
  has_winsock2 = cc.has_header('winsock2.h')
  
  if has_syspoll and has_systypes
@@ -44,6 +43,3 @@ index 1b54fdc..6b22e98 100644
  elif has_winsock2
    poll_includes = '''
        #define _WIN32_WINNT @0@
--- 
-2.25.1
-
diff --git a/Ports/glib/patches/0002-use-glib-in-built-C_IN.patch b/Ports/glib/patches/0002-Use-glib-s-in-built-C_IN.patch
index 53233dea00..16b8603537 100644
--- a/Ports/glib/patches/0002-use-glib-in-built-C_IN.patch
+++ b/Ports/glib/patches/0002-Use-glib-s-in-built-C_IN.patch
@@ -1,7 +1,7 @@
-From a88e13c5461e50ddcad4b8ebeae8d15cee64368b Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Kenneth Myhra <kennethmyhra@gmail.com>
 Date: Thu, 12 Aug 2021 20:22:35 +0200
-Subject: [PATCH 02/12] gio/meson.build: Use glib's in-built C_IN
+Subject: [PATCH] Use glib's in-built C_IN
 
 Since we do not have C_IN and glib has functionality for providing it,
 let glib provide it.
@@ -10,7 +10,7 @@ let glib provide it.
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/gio/meson.build b/gio/meson.build
-index 49a37a7..b4ba866 100644
+index 543763e..bbedf47 100644
 --- a/gio/meson.build
 +++ b/gio/meson.build
 @@ -13,7 +13,7 @@ gnetworking_h_conf = configuration_data()
@@ -22,6 +22,3 @@ index 49a37a7..b4ba866 100644
    # Don't check for C_IN on Android since it does not define it in public
    # headers, we define it ourselves wherever necessary
    if not cc.compiles('''#include <sys/types.h>
--- 
-2.25.1
-
diff --git a/Ports/glib/patches/0003-let-glib-know-where-our-resolv.h-is.patch b/Ports/glib/patches/0003-Let-glib-know-where-our-resolv.h-is-located.patch
index b26017e2c5..c2c38e0ea1 100644
--- a/Ports/glib/patches/0003-let-glib-know-where-our-resolv.h-is.patch
+++ b/Ports/glib/patches/0003-Let-glib-know-where-our-resolv.h-is-located.patch
@@ -1,15 +1,14 @@
-From ba252fc514f8efa5af26fba2991caed73e2be771 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Kenneth Myhra <kennethmyhra@gmail.com>
 Date: Thu, 12 Aug 2021 20:25:48 +0200
-Subject: [PATCH 03/12] gio/meson.build: Let glib know where our 'resolv.h' is
- located
+Subject: [PATCH] Let glib know where our 'resolv.h' is located
 
 ---
  gio/meson.build | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/gio/meson.build b/gio/meson.build
-index b4ba866..849ea80 100644
+index bbedf47..b30cd7c 100644
 --- a/gio/meson.build
 +++ b/gio/meson.build
 @@ -34,7 +34,7 @@ endif
@@ -21,6 +20,3 @@ index b4ba866..849ea80 100644
    # res_query()
    res_query_test = '''#include <resolv.h>
                        int main (int argc, char ** argv) {
--- 
-2.25.1
-
diff --git a/Ports/glib/patches/0004-disable-IPV6-support.patch b/Ports/glib/patches/0004-Disable-IPV6-support.patch
index 704b1e35c1..712d17ad6b 100644
--- a/Ports/glib/patches/0004-disable-IPV6-support.patch
+++ b/Ports/glib/patches/0004-Disable-IPV6-support.patch
@@ -1,7 +1,7 @@
-From 3bc52eef1086032e2c0379b3f86ce19760db818e Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Kenneth Myhra <kennethmyhra@gmail.com>
 Date: Thu, 12 Aug 2021 20:33:11 +0200
-Subject: [PATCH 04/12] meson.build: Disable IPV6 support
+Subject: [PATCH] Disable IPV6 support
 
 Serenity does not have IPV6 support so disable it
 ---
@@ -9,10 +9,10 @@ Serenity does not have IPV6 support so disable it
  1 file changed, 2 insertions(+)
 
 diff --git a/meson.build b/meson.build
-index f4025d8..d1745de 100644
+index 0034898..26ece5a 100644
 --- a/meson.build
 +++ b/meson.build
-@@ -1789,6 +1789,8 @@ endforeach
+@@ -1840,6 +1840,8 @@ endforeach
  
  if host_system == 'windows'
    have_ipv6 = true
@@ -21,6 +21,3 @@ index f4025d8..d1745de 100644
  else
    have_ipv6 = cc.has_type('struct in6_addr', prefix: '#include <netinet/in.h>')
  endif
--- 
-2.25.1
-
diff --git a/Ports/glib/patches/0005-serenity-does-not-have-IN_MULTICAST.patch b/Ports/glib/patches/0005-Serenity-does-not-have-IN_MULTICAST-just-return-0.patch
index 2acb08906e..ef8938414c 100644
--- a/Ports/glib/patches/0005-serenity-does-not-have-IN_MULTICAST.patch
+++ b/Ports/glib/patches/0005-Serenity-does-not-have-IN_MULTICAST-just-return-0.patch
@@ -1,8 +1,7 @@
-From 192e9481041cb925c6934f51b75f27aaf3421432 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Kenneth Myhra <kennethmyhra@gmail.com>
 Date: Thu, 12 Aug 2021 20:35:16 +0200
-Subject: [PATCH 05/12] gio/ginetaddress.c: Serenity does not have
- IN_MULTICAST, just return 0
+Subject: [PATCH] Serenity does not have IN_MULTICAST, just return 0
 
 Since Serenity does not have IN_MULTICAST we just return 0
 ---
@@ -26,6 +25,3 @@ index ada32f8..7a0a0c2 100644
      }
    else
  #ifdef HAVE_IPV6
--- 
-2.25.1
-
diff --git a/Ports/glib/patches/0006-conflict-rename-gio-mount-function.patch b/Ports/glib/patches/0006-Rename-glib-gio-mount-function-to-gio_mount.patch
index b2bbdab3c7..ef568078a1 100644
--- a/Ports/glib/patches/0006-conflict-rename-gio-mount-function.patch
+++ b/Ports/glib/patches/0006-Rename-glib-gio-mount-function-to-gio_mount.patch
@@ -1,8 +1,7 @@
-From cadaea8b2c881bf4fcfa75a03fe07ae1addd4f43 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Kenneth Myhra <kennethmyhra@gmail.com>
 Date: Thu, 12 Aug 2021 20:38:51 +0200
-Subject: [PATCH 06/12] gio/gio-tool-mount.c: Rename glib/gio mount function to
- gio_mount
+Subject: [PATCH] Rename glib/gio mount function to gio_mount
 
 Somehow glib picks up on Serenity's mount function and gets confused
 ---
@@ -34,6 +33,3 @@ index c624268..24723c5 100644
            g_object_unref (file);
          }
      }
--- 
-2.25.1
-
diff --git a/Ports/glib/patches/0009-include-section-with-missing-functionality.patch b/Ports/glib/patches/0007-Include-arpa-compatibility-definitions.patch
index 964ba70167..a37d9c295c 100644
--- a/Ports/glib/patches/0009-include-section-with-missing-functionality.patch
+++ b/Ports/glib/patches/0007-Include-arpa-compatibility-definitions.patch
@@ -1,7 +1,7 @@
-From f4bbbbae7d502766e44c69f6c9286ef9ed0bf485 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Kenneth Myhra <kennethmyhra@gmail.com>
 Date: Thu, 12 Aug 2021 20:54:46 +0200
-Subject: [PATCH 09/12] gio/gthredresolver.c: Need to include this section
+Subject: [PATCH] Include arpa compatibility definitions
 
 Serenity is missing all that is defined in this section so let's
 include it.
@@ -10,7 +10,7 @@ include it.
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/gio/gthreadedresolver.c b/gio/gthreadedresolver.c
-index 93794b5..64c3b2e 100644
+index aeeb40e..3a48b27 100644
 --- a/gio/gthreadedresolver.c
 +++ b/gio/gthreadedresolver.c
 @@ -394,7 +394,7 @@ lookup_by_address_finish (GResolver     *resolver,
@@ -22,6 +22,3 @@ index 93794b5..64c3b2e 100644
  /* Copy from bionic/libc/private/arpa_nameser_compat.h
   * and bionic/libc/private/arpa_nameser.h */
  typedef struct {
--- 
-2.25.1
-
diff --git a/Ports/glib/patches/0010-stub-for-function-dn_expand.patch b/Ports/glib/patches/0008-Add-stub-for-function-dn_expand.patch
index 03c797ecf2..c82368ed8f 100644
--- a/Ports/glib/patches/0010-stub-for-function-dn_expand.patch
+++ b/Ports/glib/patches/0008-Add-stub-for-function-dn_expand.patch
@@ -1,8 +1,7 @@
-From 1fe4b3e57a1997dac79865b8b9790fae3597f175 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Kenneth Myhra <kennethmyhra@gmail.com>
 Date: Thu, 12 Aug 2021 20:56:26 +0200
-Subject: [PATCH 10/12] gio/gthreadedresolver.c: Add stub for function
- dn_expand.
+Subject: [PATCH] Add stub for function dn_expand.
 
 Serenity is missing dn_expand so include a stub for it
 ---
@@ -10,7 +9,7 @@ Serenity is missing dn_expand so include a stub for it
  1 file changed, 6 insertions(+)
 
 diff --git a/gio/gthreadedresolver.c b/gio/gthreadedresolver.c
-index 64c3b2e..ef709e0 100644
+index 3a48b27..8d51967 100644
 --- a/gio/gthreadedresolver.c
 +++ b/gio/gthreadedresolver.c
 @@ -462,6 +462,12 @@ typedef struct {
@@ -26,6 +25,3 @@ index 64c3b2e..ef709e0 100644
  #define dn_skipname __dn_skipname
  int dn_skipname(const u_char *, const u_char *);
  
--- 
-2.25.1
-
diff --git a/Ports/glib/patches/0011-ntohl-ntohs-located-in-arpa-inet.h.patch b/Ports/glib/patches/0009-ntohl-ntohs-is-located-in-arpa-inet.h.patch
index 676e9ab93d..ff96e9f8df 100644
--- a/Ports/glib/patches/0011-ntohl-ntohs-located-in-arpa-inet.h.patch
+++ b/Ports/glib/patches/0009-ntohl-ntohs-is-located-in-arpa-inet.h.patch
@@ -1,8 +1,7 @@
-From 821b33fbb3e93dfd3d43c98146a3399fd8ff1f41 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Kenneth Myhra <kennethmyhra@gmail.com>
 Date: Thu, 12 Aug 2021 20:59:25 +0200
-Subject: [PATCH 11/12] gio/xdgmime/xdgmimecache.c: ntohl/ntohs is located in
- 'arpa/inet.h'
+Subject: [PATCH] ntohl/ntohs is located in 'arpa/inet.h'
 
 In Serenity ntohl/ntohs is located in arpa/inet.h, other stuff glib
 needs is included in 'netinet/in.h'.
@@ -11,10 +10,10 @@ needs is included in 'netinet/in.h'.
  1 file changed, 5 insertions(+)
 
 diff --git a/gio/xdgmime/xdgmimecache.c b/gio/xdgmime/xdgmimecache.c
-index 769b578..625d8cc 100644
+index f80f122..45220cc 100644
 --- a/gio/xdgmime/xdgmimecache.c
 +++ b/gio/xdgmime/xdgmimecache.c
-@@ -34,7 +34,12 @@
+@@ -38,7 +38,12 @@
  #include <fnmatch.h>
  #include <assert.h>
  
@@ -27,6 +26,3 @@ index 769b578..625d8cc 100644
  
  #ifdef HAVE_MMAP
  #include <sys/mman.h>
--- 
-2.25.1
-
diff --git a/Ports/glib/patches/0012-include-strings.h-for-strcasecmp.patch b/Ports/glib/patches/0010-Include-strings.h-for-strcasecmp.patch
index e40d5aa630..d5fe2d75bf 100644
--- a/Ports/glib/patches/0012-include-strings.h-for-strcasecmp.patch
+++ b/Ports/glib/patches/0010-Include-strings.h-for-strcasecmp.patch
@@ -1,7 +1,7 @@
-From 5029cb921ae1420ef10d5ecb97d07ef9a9b5070a Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Kenneth Myhra <kennethmyhra@gmail.com>
 Date: Thu, 12 Aug 2021 21:03:13 +0200
-Subject: [PATCH 12/12] Include 'strings.h' for strcasecmp
+Subject: [PATCH] Include 'strings.h' for strcasecmp
 
 ---
  glib/glib-init.c | 3 +++
@@ -9,7 +9,7 @@ Subject: [PATCH 12/12] Include 'strings.h' for strcasecmp
  2 files changed, 6 insertions(+)
 
 diff --git a/glib/glib-init.c b/glib/glib-init.c
-index 2958fb5..ef49806 100644
+index e7b4984..340b358 100644
 --- a/glib/glib-init.c
 +++ b/glib/glib-init.c
 @@ -26,6 +26,9 @@
@@ -23,7 +23,7 @@ index 2958fb5..ef49806 100644
  #include <stdlib.h>
  #include <stdio.h>
 diff --git a/glib/gstrfuncs.c b/glib/gstrfuncs.c
-index b6ff60f..670d1aa 100644
+index 9273533..de22330 100644
 --- a/glib/gstrfuncs.c
 +++ b/glib/gstrfuncs.c
 @@ -32,6 +32,9 @@
@@ -36,6 +36,3 @@ index b6ff60f..670d1aa 100644
  #include <string.h>
  #include <locale.h>
  #include <errno.h>
--- 
-2.25.1
-
diff --git a/Ports/glib/patches/0013-nameser.h-is-not-needed.patch b/Ports/glib/patches/0011-Exclude-arpa-nameser.h-as-it-does-not-exist-on-Seren.patch
index 039f072ac3..eff61f7677 100644
--- a/Ports/glib/patches/0013-nameser.h-is-not-needed.patch
+++ b/Ports/glib/patches/0011-Exclude-arpa-nameser.h-as-it-does-not-exist-on-Seren.patch
@@ -1,7 +1,7 @@
-From fb55058ea91d87802c696aa58bcaf97a6ff5b827 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Kenneth Myhra <kennethmyhra@gmail.com>
 Date: Fri, 13 Aug 2021 22:32:25 +0200
-Subject: [PATCH 13/13] arpa/nameser.h is not needed, and Serenity does not have it at the moment.
+Subject: [PATCH] Exclude arpa/nameser.h as it does not exist on Serenity
 
 ---
  gio/gnetworking.h.in | 2 ++
@@ -21,6 +21,3 @@ index 2fa95ff..1d138cf 100644
  @NAMESER_COMPAT_INCLUDE@
  
  #ifndef T_SRV
--- 
-2.25.1
-
diff --git a/Ports/glib/patches/ReadMe.md b/Ports/glib/patches/ReadMe.md
index d7fd524f6b..dd07f28d05 100644
--- a/Ports/glib/patches/ReadMe.md
+++ b/Ports/glib/patches/ReadMe.md
@@ -1,67 +1,67 @@
 # Patches for glib on SerenityOS
 
-## `0001-poll.h-is-located-at-root.patch`
+## `0001-poll.h-is-located-at-root-not-sys-poll.h.patch`
 
-meson.build: 'poll.h' is located at root, not 'sys/poll.h'
+'poll.h' is located at root, not 'sys/poll.h'
 
 
-## `0002-use-glib-in-built-C_IN.patch`
+## `0002-Use-glib-s-in-built-C_IN.patch`
 
-gio/meson.build: Use glib's in-built C_IN
+Use glib's in-built C_IN
 
 Since we do not have C_IN and glib has functionality for providing it,
 let glib provide it.
 
-## `0003-let-glib-know-where-our-resolv.h-is.patch`
+## `0003-Let-glib-know-where-our-resolv.h-is-located.patch`
 
-gio/meson.build: Let glib know where our 'resolv.h' is located
+Let glib know where our 'resolv.h' is located
 
 
-## `0004-disable-IPV6-support.patch`
+## `0004-Disable-IPV6-support.patch`
 
-meson.build: Disable IPV6 support
+Disable IPV6 support
 
 Serenity does not have IPV6 support so disable it
 
-## `0005-serenity-does-not-have-IN_MULTICAST.patch`
+## `0005-Serenity-does-not-have-IN_MULTICAST-just-return-0.patch`
 
-gio/ginetaddress.c: Serenity does not have IN_MULTICAST, just return 0
+Serenity does not have IN_MULTICAST, just return 0
 
 Since Serenity does not have IN_MULTICAST we just return 0
 
-## `0006-conflict-rename-gio-mount-function.patch`
+## `0006-Rename-glib-gio-mount-function-to-gio_mount.patch`
 
-gio/gio-tool-mount.c: Rename glib/gio mount function to gio_mount
+Rename glib/gio mount function to gio_mount
 
 Somehow glib picks up on Serenity's mount function and gets confused
 
-## `0009-include-section-with-missing-functionality.patch`
+## `0007-Include-arpa-compatibility-definitions.patch`
 
-gio/gthredresolver.c: Need to include this section
+Include arpa compatibility definitions
 
 Serenity is missing all that is defined in this section so let's
 include it.
 
-## `0010-stub-for-function-dn_expand.patch`
+## `0008-Add-stub-for-function-dn_expand.patch`
 
-gio/gthreadedresolver.c: Add stub for function dn_expand.
+Add stub for function dn_expand.
 
 Serenity is missing dn_expand so include a stub for it
 
-## `0011-ntohl-ntohs-located-in-arpa-inet.h.patch`
+## `0009-ntohl-ntohs-is-located-in-arpa-inet.h.patch`
 
-gio/xdgmime/xdgmimecache.c: ntohl/ntohs is located in 'arpa/inet.h'
+ntohl/ntohs is located in 'arpa/inet.h'
 
 In Serenity ntohl/ntohs is located in arpa/inet.h, other stuff glib
 needs is included in 'netinet/in.h'.
 
-## `0012-include-strings.h-for-strcasecmp.patch`
+## `0010-Include-strings.h-for-strcasecmp.patch`
 
 Include 'strings.h' for strcasecmp
 
 
-## `0013-nameser.h-is-not-needed.patch`
+## `0011-Exclude-arpa-nameser.h-as-it-does-not-exist-on-Seren.patch`
 
-arpa/nameser.h is not needed, and Serenity does not have it at the moment.
+Exclude arpa/nameser.h as it does not exist on Serenity