From 96ac527e3c46e6714d620630f2b4fc0b339aafbb Mon Sep 17 00:00:00 2001
From: Kenneth Myhra <kennethmyhra@gmail.com>
Date: Tue, 7 Feb 2023 10:48:19 +0100
Subject: [PATCH] Ports: Update mc to 4.8.29

---
 Ports/AvailablePorts.md                       |  2 +-
 Ports/mc/package.sh                           |  4 +--
 ...xt.c-Include-strings.h-if-SerenityOS.patch |  2 +-
 ...c-Use-str_ncasecmp-instead-of-strnca.patch | 27 -------------------
 Ports/mc/patches/ReadMe.md                    |  9 -------
 5 files changed, 4 insertions(+), 40 deletions(-)
 delete mode 100644 Ports/mc/patches/0002-filemanager-ext.c-Use-str_ncasecmp-instead-of-strnca.patch

diff --git a/Ports/AvailablePorts.md b/Ports/AvailablePorts.md
index 5db3c83c9d..08f8abedda 100644
--- a/Ports/AvailablePorts.md
+++ b/Ports/AvailablePorts.md
@@ -160,7 +160,7 @@ This list is also available at [ports.serenityos.net](https://ports.serenityos.n
 | [`mandoc`](mandoc/)                                 | mandoc                                                          | 1.14.5                   | https://mandoc.bsd.lv/                                                         |
 | [`mawk`](mawk/)                                     | mawk                                                            | 1.3.4-20200120           | https://invisible-island.net/mawk/                                             |
 | [`mbedtls`](mbedtls/)                               | Mbed TLS                                                        | 3.1.0                    | https://tls.mbed.org/                                                          |
-| [`mc`](mc/)                                         | Midnight Commander                                              | 4.8.28                   | https://midnight-commander.org/                                                |
+| [`mc`](mc/)                                         | Midnight Commander                                              | 4.8.29                   | https://midnight-commander.org/                                                |
 | [`md4c`](md4c/)                                     | Markdown for C                                                  | 0.4.8                    | https://github.com/mity/md4c                                                   |
 | [`mgba`](mgba/)                                     | Game Boy, Game Boy Color and Game Boy Advance emulator          | 0.9.3                    | https://mgba.io/                                                               |
 | [`milkytracker`](milkytracker/)                     | milkytracker                                                    | 1.03.00                  | https://github.com/milkytracker/MilkyTracker                                   |
diff --git a/Ports/mc/package.sh b/Ports/mc/package.sh
index 1a75faeb21..be24d22d52 100755
--- a/Ports/mc/package.sh
+++ b/Ports/mc/package.sh
@@ -1,8 +1,8 @@
 #!/usr/bin/env -S bash ../.port_include.sh
 port=mc
-version=4.8.28
+version=4.8.29
 useconfigure=true
-files="http://ftp.midnight-commander.org/mc-${version}.tar.xz ${port}-${version}.tar.xz e994d9be9a7172e9ac4a4ad62107921f6aa312e668b056dfe5b8bcebbaf53803"
+files="http://ftp.midnight-commander.org/mc-${version}.tar.xz ${port}-${version}.tar.xz 01d8a3b94f58180cca5bf17257b5078d1fd6fd27a9b5c0e970ec767549540ad4"
 auth_type=sha256
 depends=("gettext" "glib" "libtool" "ncurses" "vim")
 configopts=(
diff --git a/Ports/mc/patches/0001-filemanager-ext.c-Include-strings.h-if-SerenityOS.patch b/Ports/mc/patches/0001-filemanager-ext.c-Include-strings.h-if-SerenityOS.patch
index ca2d0cfe2f..ffacd05315 100644
--- a/Ports/mc/patches/0001-filemanager-ext.c-Include-strings.h-if-SerenityOS.patch
+++ b/Ports/mc/patches/0001-filemanager-ext.c-Include-strings.h-if-SerenityOS.patch
@@ -12,7 +12,7 @@ Subject: [PATCH] filemanager/ext.c: Include strings.h if SerenityOS
  1 file changed, 3 insertions(+)
 
 diff --git a/src/filemanager/ext.c b/src/filemanager/ext.c
-index a18fda0..12bd8d5 100644
+index 3c54747ad4421eaceabe154dff08651d5c202678..9d78d1999d06f07b54b0706984d0a7397e1d3d34 100644
 --- a/src/filemanager/ext.c
 +++ b/src/filemanager/ext.c
 @@ -36,6 +36,9 @@
diff --git a/Ports/mc/patches/0002-filemanager-ext.c-Use-str_ncasecmp-instead-of-strnca.patch b/Ports/mc/patches/0002-filemanager-ext.c-Use-str_ncasecmp-instead-of-strnca.patch
deleted file mode 100644
index 3f67d0903f..0000000000
--- a/Ports/mc/patches/0002-filemanager-ext.c-Use-str_ncasecmp-instead-of-strnca.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Kenneth Myhra <kennethmyhra@gmail.com>
-Date: Tue, 11 Jan 2022 19:56:13 +0100
-Subject: [PATCH] filemanager/ext.c: Use str_ncasecmp instead of strncasecmp if
- SerenityOS
-
-- [ ] Local?
-- [X] Should be merged to upstream?
-- [ ] Resolves issue(s) with our side of things
-- [ ] Hack
----
- src/filemanager/ext.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/filemanager/ext.c b/src/filemanager/ext.c
-index 12bd8d5..53cda02 100644
---- a/src/filemanager/ext.c
-+++ b/src/filemanager/ext.c
-@@ -950,7 +950,7 @@ regex_command_for (void *target, const vfs_path_t * filename_vpath, const char *
-                 if (case_insense)
-                 {
-                     p += 2;
--                    cmp_func = strncasecmp;
-+                    cmp_func = str_ncasecmp;
-                 }
- 
-                 if (*p == '.' && file_len >= (size_t) (q - p))
diff --git a/Ports/mc/patches/ReadMe.md b/Ports/mc/patches/ReadMe.md
index 0e16c6cae9..c847ddb2da 100644
--- a/Ports/mc/patches/ReadMe.md
+++ b/Ports/mc/patches/ReadMe.md
@@ -9,12 +9,3 @@ filemanager/ext.c: Include strings.h if SerenityOS
 - [ ] Resolves issue(s) with our side of things
 - [ ] Hack
 
-## `0002-filemanager-ext.c-Use-str_ncasecmp-instead-of-strnca.patch`
-
-filemanager/ext.c: Use str_ncasecmp instead of strncasecmp if SerenityOS
-
-- [ ] Local?
-- [X] Should be merged to upstream?
-- [ ] Resolves issue(s) with our side of things
-- [ ] Hack
-