From 1fc930d4efa8a8115529147146a0e4341f18410d Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Thu, 5 Jan 2023 23:45:36 +0000
Subject: [PATCH] sway: fix custom user keymaps.

---
 srcpkgs/sway/patches/7326.diff | 26 ++++++++++++++++++++++++++
 srcpkgs/sway/template          |  4 ++--
 2 files changed, 28 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/sway/patches/7326.diff

diff --git a/srcpkgs/sway/patches/7326.diff b/srcpkgs/sway/patches/7326.diff
new file mode 100644
index 00000000000..5c9c63063bc
--- /dev/null
+++ b/srcpkgs/sway/patches/7326.diff
@@ -0,0 +1,26 @@
+diff --git a/sway/config.c b/sway/config.c
+index 1f2bb68604..f5efa98a8e 100644
+--- a/sway/config.c
++++ b/sway/config.c
+@@ -37,7 +37,7 @@ struct sway_config *config = NULL;
+ 
+ static struct xkb_state *keysym_translation_state_create(
+ 		struct xkb_rule_names rules) {
+-	struct xkb_context *context = xkb_context_new(XKB_CONTEXT_NO_FLAGS);
++	struct xkb_context *context = xkb_context_new(XKB_CONTEXT_NO_SECURE_GETENV);
+ 	struct xkb_keymap *xkb_keymap = xkb_keymap_new_from_names(
+ 		context,
+ 		&rules,
+diff --git a/sway/input/keyboard.c b/sway/input/keyboard.c
+index 3f4a7289b9..45a588ecbf 100644
+--- a/sway/input/keyboard.c
++++ b/sway/input/keyboard.c
+@@ -754,7 +754,7 @@ static void handle_xkb_context_log(struct xkb_context *context,
+ 
+ struct xkb_keymap *sway_keyboard_compile_keymap(struct input_config *ic,
+ 		char **error) {
+-	struct xkb_context *context = xkb_context_new(XKB_CONTEXT_NO_FLAGS);
++	struct xkb_context *context = xkb_context_new(XKB_CONTEXT_NO_SECURE_GETENV);
+ 	if (!sway_assert(context, "cannot create XKB context")) {
+ 		return NULL;
+ 	}
diff --git a/srcpkgs/sway/template b/srcpkgs/sway/template
index db51ad2a359..1eca32f6b8e 100644
--- a/srcpkgs/sway/template
+++ b/srcpkgs/sway/template
@@ -1,14 +1,14 @@
 # Template file for 'sway'
 pkgname=sway
 version=1.8
-revision=1
+revision=2
 build_style=meson
 configure_args="-Dwerror=false -Db_ndebug=false"
 conf_files="/etc/sway/config"
 hostmakedepends="pkg-config wayland-devel scdoc"
 makedepends="wlroots-devel pcre2-devel json-c-devel pango-devel cairo-devel
  gdk-pixbuf-devel libevdev-devel"
-depends="libcap-progs swaybg xorg-server-xwayland"
+depends="libcap-progs swaybg xorg-server-xwayland libxkbcommon>=1.5.0_1"
 short_desc="Tiling Wayland compositor compatible with i3"
 maintainer="Olaf Mersmann <olafm@p-value.net>"
 license="MIT"