Re: [PR PATCH] [Updated] sway: don't set capabilities on binary.

[mhmdanas <mhmdanas@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 1537 bytes --]

There is an updated pull request by mhmdanas against master on the void-packages repository

https://github.com/mhmdanas/void-packages sway-dont-set-CAP_SYS_NICE
https://github.com/void-linux/void-packages/pull/41358

sway: don't set capabilities on binary.
Setting these capabilities on the Sway binary breaks loading custom keymaps in user directories.

Relevant:
- https://github.com/swaywm/sway/pull/7326 (this commit can be reverted when this PR is merged in a future Sway release)
- https://github.com/xkbcommon/libxkbcommon/pull/312

<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/41358.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-sway-dont-set-CAP_SYS_NICE-41358.patch --]
[-- Type: text/x-diff, Size: 3141 bytes --]

From beb910118de1a7ac91f79f3c7fd2aef1c11dff85 Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Thu, 5 Jan 2023 23:47:09 +0000
Subject: [PATCH 1/2] libxkbcommon: update to 1.5.0.

---
 srcpkgs/libxkbcommon/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libxkbcommon/template b/srcpkgs/libxkbcommon/template
index a7bc7d513c65..7a116d882835 100644
--- a/srcpkgs/libxkbcommon/template
+++ b/srcpkgs/libxkbcommon/template
@@ -1,6 +1,6 @@
 # Template file for 'libxkbcommon'
 pkgname=libxkbcommon
-version=1.4.1
+version=1.5.0
 revision=1
 build_style=meson
 # b_ndebug=false is needed to pass the test suite, as it relies on side effects
@@ -16,7 +16,7 @@ maintainer="Isaac Freund <mail@isaacfreund.com>"
 license="MIT"
 homepage="https://xkbcommon.org/"
 distfiles="https://github.com/xkbcommon/libxkbcommon/archive/xkbcommon-${version}.tar.gz"
-checksum=3b86670dd91441708dedc32bc7f684a034232fd4a9bb209f53276c9783e9d40e
+checksum=053e6a6a2c3179eba20c3ada827fb8833a6663b7ffd278fdb8530c3cbf924780
 
 post_install() {
 	vlicense LICENSE

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

---
 srcpkgs/sway/patches/7326.diff | 26 ++++++++++++++++++++++++++
 srcpkgs/sway/template          |  2 +-
 2 files changed, 27 insertions(+), 1 deletion(-)
 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 000000000000..5c9c63063bc4
--- /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 db51ad2a359d..26f3254fedb3 100644
--- a/srcpkgs/sway/template
+++ b/srcpkgs/sway/template
@@ -1,7 +1,7 @@
 # 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"