From 310ca4fb9a3a1c0b3b618417c2f182a18f69dd25 Mon Sep 17 00:00:00 2001
From: Markus Volk <f_l_k@t-online.de>
Date: Fri, 20 Aug 2021 14:29:11 +0200
Subject: [PATCH] swaylock: update mismatched allocation function has already
 been fixed upstream; remove the patch and update to latest

---
 ...g-fix-mismatched-allocation-function.patch | 31 -------------------
 recipes-support/swaylock/swaylock_git.bb      |  5 ++-
 2 files changed, 2 insertions(+), 34 deletions(-)
 delete mode 100644 recipes-support/swaylock/files/0001-load_config-fix-mismatched-allocation-function.patch

diff --git a/recipes-support/swaylock/files/0001-load_config-fix-mismatched-allocation-function.patch b/recipes-support/swaylock/files/0001-load_config-fix-mismatched-allocation-function.patch
deleted file mode 100644
index 61fce4a..0000000
--- a/recipes-support/swaylock/files/0001-load_config-fix-mismatched-allocation-function.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 3e861934074148dc803e70508ad99dfbd0d14765 Mon Sep 17 00:00:00 2001
-From: Markus Volk <f_l_k@t-online.de>
-Date: Fri, 20 Aug 2021 13:42:57 +0200
-Subject: [PATCH] load_config: fix mismatched allocation function
-
-| In function 'load_config',
-|     inlined from 'main' at ../git/main.c:1138:23:
-| ../git/main.c:1060:25: error: 'free' called on pointer returned from a mismatched allocation function [-Werror=mismatched-dealloc]
-|  1060 |                         free(config);
-
-Signed-off-by: Markus Volk <f_l_k@t-online.de>
----
- main.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/main.c b/main.c
-index c65d68a..7921770 100644
---- a/main.c
-+++ b/main.c
-@@ -1057,7 +1057,7 @@ static int load_config(char *path, struct swaylock_state *state,
- 		char *flag = malloc(nread + 3);
- 		if (flag == NULL) {
- 			free(line);
--			free(config);
-+			fclose(config);
- 			swaylock_log(LOG_ERROR, "Failed to allocate memory");
- 			return 0;
- 		}
--- 
-2.25.1
-
diff --git a/recipes-support/swaylock/swaylock_git.bb b/recipes-support/swaylock/swaylock_git.bb
index 73dead1..a7c7401 100644
--- a/recipes-support/swaylock/swaylock_git.bb
+++ b/recipes-support/swaylock/swaylock_git.bb
@@ -18,12 +18,11 @@ DEPENDS = " \
 
 SRC_URI = " \
 	git://github.com/swaywm/swaylock.git;protocol=https \
-	file://0001-load_config-fix-mismatched-allocation-function.patch \
 "
 
 S = "${WORKDIR}/git"
-PV = "1.5"
-SRCREV = "${PV}"
+PV = "1.5+${SRCREV}"
+SRCREV = "2bf76009e1d279a4194d37b9ee4f2bf0d9424d62"
 
 PACKAGECONFIG[pam] = ",,libpam"
 PACKAGECONFIG[gdk-pixbuf] = ",,gdk-pixbuf"