Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] sway: fix `bindsym --to-code`.
@ 2023-06-12 15:02 mhmdanas
  2023-06-13 15:51 ` ahesford
                   ` (2 more replies)
  0 siblings, 3 replies; 4+ messages in thread
From: mhmdanas @ 2023-06-12 15:02 UTC (permalink / raw)
  To: ml

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

There is a new pull request by mhmdanas against master on the void-packages repository

https://github.com/mhmdanas/void-packages sway-fix-to-code
https://github.com/void-linux/void-packages/pull/44392

sway: fix `bindsym --to-code`.
<!-- 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/44392.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-sway-fix-to-code-44392.patch --]
[-- Type: text/x-diff, Size: 1978 bytes --]

From 008552fe4203e295c493230de7ec29041b5a2849 Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Mon, 12 Jun 2023 15:59:54 +0100
Subject: [PATCH] sway: fix `bindsym --to-code`.

---
 srcpkgs/sway/patches/7633.patch | 34 +++++++++++++++++++++++++++++++++
 srcpkgs/sway/template           |  2 +-
 2 files changed, 35 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/sway/patches/7633.patch

diff --git a/srcpkgs/sway/patches/7633.patch b/srcpkgs/sway/patches/7633.patch
new file mode 100644
index 000000000000..d7e0d5c94881
--- /dev/null
+++ b/srcpkgs/sway/patches/7633.patch
@@ -0,0 +1,34 @@
+From 872552b4d636379fca795d5db1aae71034d363f8 Mon Sep 17 00:00:00 2001
+From: Marko <marko@pepega.club>
+Date: Sat, 10 Jun 2023 19:55:24 +0200
+Subject: [PATCH] Fix #7535
+
+---
+https://github.com/swaywm/sway/pull/7633
+
+ sway/input/input-manager.c | 12 ++++++++++++
+ 1 file changed, 12 insertions(+)
+
+diff --git a/sway/input/input-manager.c b/sway/input/input-manager.c
+index 1115ba5ecc..5f7dfb4284 100644
+--- a/sway/input/input-manager.c
++++ b/sway/input/input-manager.c
+@@ -532,6 +532,18 @@ static void retranslate_keysyms(struct input_config *input_config) {
+ 			return;
+ 		}
+ 	}
++
++	for (int i = 0; i < config->input_type_configs->length; ++i) {
++		struct input_config *ic = config->input_type_configs->items[i];
++		if (ic->xkb_layout || ic->xkb_file) {
++			// this is the first config with xkb_layout or xkb_file
++			if (ic->identifier == input_config->identifier) {
++				translate_keysyms(ic);
++			}
++
++			return;
++		}
++	}
+ }
+ 
+ static void input_manager_configure_input(
diff --git a/srcpkgs/sway/template b/srcpkgs/sway/template
index 6a735c82e88f..25e4d85a08d8 100644
--- a/srcpkgs/sway/template
+++ b/srcpkgs/sway/template
@@ -1,7 +1,7 @@
 # Template file for 'sway'
 pkgname=sway
 version=1.8.1
-revision=1
+revision=2
 build_style=meson
 configure_args="-Dwerror=false -Db_ndebug=false"
 conf_files="/etc/sway/config"

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: sway: fix `bindsym --to-code`.
  2023-06-12 15:02 [PR PATCH] sway: fix `bindsym --to-code` mhmdanas
@ 2023-06-13 15:51 ` ahesford
  2023-06-13 18:30 ` [PR PATCH] [Closed]: " mhmdanas
  2023-06-13 18:30 ` mhmdanas
  2 siblings, 0 replies; 4+ messages in thread
From: ahesford @ 2023-06-13 15:51 UTC (permalink / raw)
  To: ml

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

New comment by ahesford on void-packages repository

https://github.com/void-linux/void-packages/pull/44392#issuecomment-1589586540

Comment:
This should wait until a new release. With a few critical exceptions, we don't backport fixes that aren't strictly required due to Void packaging complications.

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: sway: fix `bindsym --to-code`.
  2023-06-12 15:02 [PR PATCH] sway: fix `bindsym --to-code` mhmdanas
  2023-06-13 15:51 ` ahesford
  2023-06-13 18:30 ` [PR PATCH] [Closed]: " mhmdanas
@ 2023-06-13 18:30 ` mhmdanas
  2 siblings, 0 replies; 4+ messages in thread
From: mhmdanas @ 2023-06-13 18:30 UTC (permalink / raw)
  To: ml

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

New comment by mhmdanas on void-packages repository

https://github.com/void-linux/void-packages/pull/44392#issuecomment-1589826324

Comment:
Fair enough.

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PR PATCH] [Closed]: sway: fix `bindsym --to-code`.
  2023-06-12 15:02 [PR PATCH] sway: fix `bindsym --to-code` mhmdanas
  2023-06-13 15:51 ` ahesford
@ 2023-06-13 18:30 ` mhmdanas
  2023-06-13 18:30 ` mhmdanas
  2 siblings, 0 replies; 4+ messages in thread
From: mhmdanas @ 2023-06-13 18:30 UTC (permalink / raw)
  To: ml

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

There's a closed pull request on the void-packages repository

sway: fix `bindsym --to-code`.
https://github.com/void-linux/void-packages/pull/44392

Description:
<!-- 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
-->


^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2023-06-13 18:30 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-06-12 15:02 [PR PATCH] sway: fix `bindsym --to-code` mhmdanas
2023-06-13 15:51 ` ahesford
2023-06-13 18:30 ` [PR PATCH] [Closed]: " mhmdanas
2023-06-13 18:30 ` mhmdanas

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).