aboutsummarylogtreecommitdiffstats
path: root/0003-Don-t-crash-on-calls-to-focus-or-icon.patch
diff options
context:
space:
mode:
Diffstat (limited to '0003-Don-t-crash-on-calls-to-focus-or-icon.patch')
-rw-r--r--0003-Don-t-crash-on-calls-to-focus-or-icon.patch23
1 files changed, 10 insertions, 13 deletions
diff --git a/0003-Don-t-crash-on-calls-to-focus-or-icon.patch b/0003-Don-t-crash-on-calls-to-focus-or-icon.patch
index 7fdb135903c3..4ff500b74a49 100644
--- a/0003-Don-t-crash-on-calls-to-focus-or-icon.patch
+++ b/0003-Don-t-crash-on-calls-to-focus-or-icon.patch
@@ -1,36 +1,33 @@
-From db9b89fad9058172a844fe0a9faaae5a477c3fb3 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ecmel=20Berk=20Canl=C4=B1er?= <me@ecmelberk.com>
-Date: Fri, 25 Jun 2021 01:00:01 +0300
-Subject: [PATCH 2/3] Don't crash on calls to focus or icon
+Date: Tue, 28 Dec 2021 19:41:19 +0300
+Subject: Don't crash on calls to focus or icon
-Manually applying the following commit
- https://github.com/glfw/glfw/pull/1725/commits/e89e9aee41382508ed36594a4b028239cad5197b
---
- src/wl_window.c | 4 ----
- 1 file changed, 4 deletions(-)
+ src/wl_window.c | 6 ++----
+ 1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/src/wl_window.c b/src/wl_window.c
-index d10861cd..3f8987b8 100644
+index ec4e60cd..b8fc39e4 100644
--- a/src/wl_window.c
+++ b/src/wl_window.c
-@@ -1047,8 +1047,6 @@ void _glfwPlatformSetWindowTitle(_GLFWwindow* window, const char* title)
+@@ -1042,8 +1042,7 @@ void _glfwPlatformSetWindowTitle(_GLFWwindow* window, const char* title)
void _glfwPlatformSetWindowIcon(_GLFWwindow* window,
int count, const GLFWimage* images)
{
- _glfwInputError(GLFW_PLATFORM_ERROR,
- "Wayland: Setting window icon not supported");
++ fprintf(stderr, "!!! Ignoring Error: Wayland: Setting window icon not supported\n");
}
void _glfwPlatformGetWindowPos(_GLFWwindow* window, int* xpos, int* ypos)
-@@ -1236,8 +1234,6 @@ void _glfwPlatformRequestWindowAttention(_GLFWwindow* window)
+@@ -1231,8 +1230,7 @@ void _glfwPlatformRequestWindowAttention(_GLFWwindow* window)
void _glfwPlatformFocusWindow(_GLFWwindow* window)
{
- _glfwInputError(GLFW_PLATFORM_ERROR,
- "Wayland: Focusing a window requires user interaction");
++ fprintf(stderr, "!!! Ignoring Error: Wayland: Focusing a window requires user interaction\n");
}
void _glfwPlatformSetWindowMonitor(_GLFWwindow* window,
---
-2.32.0
-