sway: fix custom user keymaps.

This commit is contained in:
mhmdanas 2023-01-05 23:45:36 +00:00 committed by Michal Vasilek
parent a431cbe437
commit 1fc930d4ef
2 changed files with 28 additions and 2 deletions

View File

@ -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;
}

View File

@ -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"