From: mhmdanas <mhmdanas@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] sway: fix custom user keymaps.
Date: Thu, 12 Jan 2023 17:40:38 +0100 [thread overview]
Message-ID: <20230112164038.bMBR_p8t9p4_Mlnss-NXKYTZfE4I-yFDig79xmDgJD8@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-41358@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 1529 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: fix custom user keymaps.
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: 3556 bytes --]
From a97adca53e3805ce6793305d3932b528c88608fe 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 64f8e3e3be11f2c4c0952f1f526720edcc4ec5d2 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 | 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 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..1eca32f6b8e5 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"
next prev parent reply other threads:[~2023-01-12 16:40 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-12-30 3:18 [PR PATCH] sway: don't set capabilities on binary mhmdanas
2022-12-30 9:31 ` ardadem
2022-12-30 9:56 ` paper42
2022-12-30 13:52 ` mhmdanas
2022-12-30 13:52 ` mhmdanas
2023-01-05 5:39 ` Seltyk
2023-01-05 14:49 ` mhmdanas
2023-01-05 17:48 ` mhmdanas
2023-01-05 23:48 ` [PR PATCH] [Updated] " mhmdanas
2023-01-05 23:53 ` sway: fix custom user keymaps mhmdanas
2023-01-12 10:05 ` ardadem
2023-01-12 15:53 ` mhmdanas
2023-01-12 16:13 ` paper42
2023-01-12 16:40 ` mhmdanas [this message]
2023-01-12 21:08 ` [PR PATCH] [Merged]: " paper42
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230112164038.bMBR_p8t9p4_Mlnss-NXKYTZfE4I-yFDig79xmDgJD8@z \
--to=mhmdanas@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).