diff --git a/Ports/mgba/patches/0001-Remove-use-of-futime-n-s.patch b/Ports/mgba/patches/0001-Remove-use-of-futime-n-s.patch deleted file mode 100644 index 64c1b99384..0000000000 --- a/Ports/mgba/patches/0001-Remove-use-of-futime-n-s.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Luke Wilde -Date: Wed, 13 Apr 2022 17:22:56 +0100 -Subject: [PATCH] Remove use of futime(n)s - -We do not currently support futimens or futimes. [futimens is a POSIX function,](https://pubs.opengroup.org/onlinepubs/9699919799/) -so this is an issue on our side. - -- [ ] Local? -- [ ] Should be merged to upstream? -- [X] Resolves issue(s) with our side of things -- [ ] Hack ---- - src/util/vfs/vfs-fd.c | 5 ----- - 1 file changed, 5 deletions(-) - -diff --git a/src/util/vfs/vfs-fd.c b/src/util/vfs/vfs-fd.c -index c15ab5c..8d8d5c8 100644 ---- a/src/util/vfs/vfs-fd.c -+++ b/src/util/vfs/vfs-fd.c -@@ -200,11 +200,6 @@ static bool _vfdSync(struct VFile* vf, void* buffer, size_t size) { - UNUSED(size); - struct VFileFD* vfd = (struct VFileFD*) vf; - #ifndef _WIN32 --#ifdef __HAIKU__ -- futimens(vfd->fd, NULL); --#else -- futimes(vfd->fd, NULL); --#endif - if (buffer && size) { - return msync(buffer, size, MS_ASYNC) == 0; - } diff --git a/Ports/mgba/patches/0002-Use-SDL-software-renderer-with-no-vsync.patch b/Ports/mgba/patches/0001-Use-SDL-software-renderer-with-no-vsync.patch similarity index 93% rename from Ports/mgba/patches/0002-Use-SDL-software-renderer-with-no-vsync.patch rename to Ports/mgba/patches/0001-Use-SDL-software-renderer-with-no-vsync.patch index 918aff55a8..938f18b95a 100644 --- a/Ports/mgba/patches/0002-Use-SDL-software-renderer-with-no-vsync.patch +++ b/Ports/mgba/patches/0001-Use-SDL-software-renderer-with-no-vsync.patch @@ -15,7 +15,7 @@ or vsync. 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/platform/sdl/sw-sdl2.c b/src/platform/sdl/sw-sdl2.c -index 48afc33..11bd58c 100644 +index 48afc33a60866fb6ddf4fa01ab6343b89171af07..11bd58cb4dc20f0f14a601c3dec62afa5ab25717 100644 --- a/src/platform/sdl/sw-sdl2.c +++ b/src/platform/sdl/sw-sdl2.c @@ -25,7 +25,7 @@ bool mSDLSWInit(struct mSDLRenderer* renderer) { diff --git a/Ports/mgba/patches/ReadMe.md b/Ports/mgba/patches/ReadMe.md index ea5fdbc326..bf7df7dd92 100644 --- a/Ports/mgba/patches/ReadMe.md +++ b/Ports/mgba/patches/ReadMe.md @@ -1,18 +1,6 @@ # Patches for mgba on SerenityOS -## `0001-Remove-use-of-futime-n-s.patch` - -Remove use of futime(n)s - -We do not currently support futimens or futimes. [futimens is a POSIX function,](https://pubs.opengroup.org/onlinepubs/9699919799/) -so this is an issue on our side. - -- [ ] Local? -- [ ] Should be merged to upstream? -- [X] Resolves issue(s) with our side of things -- [ ] Hack - -## `0002-Use-SDL-software-renderer-with-no-vsync.patch` +## `0001-Use-SDL-software-renderer-with-no-vsync.patch` Use SDL software renderer with no vsync