removing obsolete patches, as they're already merged upstream

4 files changed, 0 insertions, 87 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6f144815b3ff..c732c03e9bc5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -24,14 +24,10 @@ pkgbase = glfw-wayland-minecraft
 	conflicts = glfw
 	conflicts = glfw-wayland
 	source = https://github.com/glfw/glfw/archive/3.3.6.tar.gz
-	source = 0001-Wayland-Set-O_NONBLOCK-on-repeat-timerfd.patch
-	source = 0002-Wayland-Continue-poll-if-timerfd-can-t-be-read.patch
 	source = 0003-Don-t-crash-on-calls-to-focus-or-icon.patch
 	source = 0004-wayland-fix-broken-opengl-screenshots-on-mutter.patch
 	source = 0005-Add-warning-about-being-an-unofficial-patch.patch
 	sha512sums = 4c295c5f4c02f6ede125fce67c52a97450f552f3985b664745bd8a836c1d6d69c04727c956fd26ec61f1e5fd9c074a28dcf6b1d1800f118444eef066f048b201
-	sha512sums = a7f48ed4ada21aff8c9184ed5a87b960ab0691ed82581af1510c4f529ad86c44b2d16dc1dc3cc2b8de8c60ae804c8e85404a48df394fbfbeb6a7629fce6a21e0
-	sha512sums = f04d3280fbcefd06248a4e7746900df9fc798440b0b056a39c95005d0660a348335a02d1d76daed7a8c5b4d757ee285366a97a51fb5751f554a998a9b26ac250
 	sha512sums = 28a7a218a904175f6a51bf11bad359438276e83b2fa1a20b74377bbb418fa1b5867239c422f866d01c37315ebce9d916dbdda1140abed5ec0b23b04c43a57202
 	sha512sums = 99a65117e59473abdbc5e92062682117a6b5d20bb0bae2a92833ef2fa2f83e79e974721d70074f3f8c07f277476584102588002568e8c5e6ba01f63075672fe4
 	sha512sums = 997a3cd6470ee958e75422415e7582fb11ffa2e7b718cdf54005e203de480d589f3c49fd88b39b1c8d3c89cc1a9444cdc37b340a797c93fccd20dca0a08da747
diff --git a/0001-Wayland-Set-O_NONBLOCK-on-repeat-timerfd.patch b/0001-Wayland-Set-O_NONBLOCK-on-repeat-timerfd.patch
deleted file mode 100644
index 0699adad9c13..000000000000
--- a/0001-Wayland-Set-O_NONBLOCK-on-repeat-timerfd.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Stone Tickle <lattis@mochiro.moe>
-Date: Fri, 5 Jun 2020 12:51:25 +0900
-Subject: Wayland: Set O_NONBLOCK on repeat timerfd
-
-Fixes #1710
-Fixes #1711
----
- src/wl_init.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/wl_init.c b/src/wl_init.c
-index 0ce45a30..ba32707f 100644
---- a/src/wl_init.c
-+++ b/src/wl_init.c
-@@ -1169,7 +1169,7 @@ int _glfwPlatformInit(void)
- 
-     _glfw.wl.timerfd = -1;
-     if (_glfw.wl.seatVersion >= 4)
--        _glfw.wl.timerfd = timerfd_create(CLOCK_MONOTONIC, TFD_CLOEXEC);
-+        _glfw.wl.timerfd = timerfd_create(CLOCK_MONOTONIC, TFD_CLOEXEC | TFD_NONBLOCK);
- 
-     if (_glfw.wl.pointer && _glfw.wl.shm)
-     {
-@@ -1196,7 +1196,7 @@ int _glfwPlatformInit(void)
-             wl_cursor_theme_load(cursorTheme, 2 * cursorSize, _glfw.wl.shm);
-         _glfw.wl.cursorSurface =
-             wl_compositor_create_surface(_glfw.wl.compositor);
--        _glfw.wl.cursorTimerfd = timerfd_create(CLOCK_MONOTONIC, TFD_CLOEXEC);
-+        _glfw.wl.cursorTimerfd = timerfd_create(CLOCK_MONOTONIC, TFD_CLOEXEC | TFD_NONBLOCK);
-     }
- 
-     if (_glfw.wl.seat && _glfw.wl.dataDeviceManager)
diff --git a/0002-Wayland-Continue-poll-if-timerfd-can-t-be-read.patch b/0002-Wayland-Continue-poll-if-timerfd-can-t-be-read.patch
deleted file mode 100644
index f72f2dfb16c0..000000000000
--- a/0002-Wayland-Continue-poll-if-timerfd-can-t-be-read.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
-Date: Tue, 14 Dec 2021 09:29:01 +0100
-Subject: =?UTF-8?q?Wayland:=20Continue=20poll()=20if=20timerfd=20can?=
- =?UTF-8?q?=E2=80=99t=20be=20read?=
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-In the case the key repeat timerfd was interrupted before read(), the
-cursor timerfd wasn’t read at all even when it could.
-
-Related to #1711
----
- src/wl_window.c | 11 +++--------
- 1 file changed, 3 insertions(+), 8 deletions(-)
-
-diff --git a/src/wl_window.c b/src/wl_window.c
-index db32f449..ec4e60cd 100644
---- a/src/wl_window.c
-+++ b/src/wl_window.c
-@@ -867,10 +867,7 @@ static void handleEvents(int timeout)
-         if (fds[1].revents & POLLIN)
-         {
-             read_ret = read(_glfw.wl.timerfd, &repeats, sizeof(repeats));
--            if (read_ret != 8)
--                return;
--
--            if (_glfw.wl.keyboardFocus)
-+            if (read_ret == 8 && _glfw.wl.keyboardFocus)
-             {
-                 for (i = 0; i < repeats; ++i)
-                 {
-@@ -886,10 +883,8 @@ static void handleEvents(int timeout)
-         if (fds[2].revents & POLLIN)
-         {
-             read_ret = read(_glfw.wl.cursorTimerfd, &repeats, sizeof(repeats));
--            if (read_ret != 8)
--                return;
--
--            incrementCursorImage(_glfw.wl.pointerFocus);
-+            if (read_ret == 8)
-+                incrementCursorImage(_glfw.wl.pointerFocus);
-         }
-     }
-     else
diff --git a/PKGBUILD b/PKGBUILD
index 522742fdfe55..b66324900875 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -20,14 +20,10 @@ makedepends=('mesa' 'cmake' 'doxygen' 'vulkan-headers' 'vulkan-icd-loader'
              'extra-cmake-modules' 'wayland-protocols' 'libxi' 'libxrandr'
              'libxcursor' 'libxkbcommon' 'libxinerama')
 source=("https://github.com/glfw/glfw/archive/${pkgver}.tar.gz"
-        "0001-Wayland-Set-O_NONBLOCK-on-repeat-timerfd.patch"
-        "0002-Wayland-Continue-poll-if-timerfd-can-t-be-read.patch"
         "0003-Don-t-crash-on-calls-to-focus-or-icon.patch"
         "0004-wayland-fix-broken-opengl-screenshots-on-mutter.patch"
         "0005-Add-warning-about-being-an-unofficial-patch.patch")
 sha512sums=('4c295c5f4c02f6ede125fce67c52a97450f552f3985b664745bd8a836c1d6d69c04727c956fd26ec61f1e5fd9c074a28dcf6b1d1800f118444eef066f048b201'
-            'a7f48ed4ada21aff8c9184ed5a87b960ab0691ed82581af1510c4f529ad86c44b2d16dc1dc3cc2b8de8c60ae804c8e85404a48df394fbfbeb6a7629fce6a21e0'
-            'f04d3280fbcefd06248a4e7746900df9fc798440b0b056a39c95005d0660a348335a02d1d76daed7a8c5b4d757ee285366a97a51fb5751f554a998a9b26ac250'
             '28a7a218a904175f6a51bf11bad359438276e83b2fa1a20b74377bbb418fa1b5867239c422f866d01c37315ebce9d916dbdda1140abed5ec0b23b04c43a57202'
             '99a65117e59473abdbc5e92062682117a6b5d20bb0bae2a92833ef2fa2f83e79e974721d70074f3f8c07f277476584102588002568e8c5e6ba01f63075672fe4'
             '997a3cd6470ee958e75422415e7582fb11ffa2e7b718cdf54005e203de480d589f3c49fd88b39b1c8d3c89cc1a9444cdc37b340a797c93fccd20dca0a08da747')