[PR PATCH] sway: update to 1.9.

[PR PATCH] sway: update to 1.9.

[AnInternetTroll]

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

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

https://github.com/AnInternetTroll/void-packages user/luca/sway
https://github.com/void-linux/void-packages/pull/48916

sway: update to 1.9.
- **sway: update to 1.9.**
- **grimshot: update to 1.9+0**

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

#### Local build testing
- I built this PR locally for my native architecture, (x86\_64-glibc)


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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-user/luca/sway-48916.patch --]
[-- Type: text/x-diff, Size: 4594 bytes --]

From 432a2692a433d4d455d0e520b4b535cfe83bcfe7 Mon Sep 17 00:00:00 2001
From: Luca Matei Pintilie <luca@lucamatei.com>
Date: Sat, 24 Feb 2024 19:44:42 +0100
Subject: [PATCH 1/2] sway: update to 1.9.

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

diff --git a/srcpkgs/sway/patches/7326.diff b/srcpkgs/sway/patches/7326.diff
deleted file mode 100644
index 5c9c63063bc428..00000000000000
--- a/srcpkgs/sway/patches/7326.diff
+++ /dev/null
@@ -1,26 +0,0 @@
-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 d45374290e6c0c..d330f02c3cc5dc 100644
--- a/srcpkgs/sway/template
+++ b/srcpkgs/sway/template
@@ -1,12 +1,12 @@
 # Template file for 'sway'
 pkgname=sway
-version=1.8.1
-revision=2
+version=1.9
+revision=1
 build_style=meson
 configure_args="-Dwerror=false -Db_ndebug=false"
 conf_files="/etc/sway/config"
 hostmakedepends="pkg-config wayland-devel scdoc"
-makedepends="wlroots0.16-devel pcre2-devel json-c-devel pango-devel cairo-devel
+makedepends="wlroots0.17-devel pcre2-devel json-c-devel pango-devel cairo-devel
  gdk-pixbuf-devel libevdev-devel"
 depends="libcap-progs swaybg xorg-server-xwayland libxkbcommon>=1.5.0_1"
 short_desc="Tiling Wayland compositor compatible with i3"
@@ -15,19 +15,8 @@ license="MIT"
 homepage="https://swaywm.org"
 changelog="https://github.com/swaywm/sway/releases"
 distfiles="https://github.com/swaywm/sway/archive/refs/tags/${version}.tar.gz"
-checksum=e9f575761342fc8fe0cfeea80c90f32ddfa8c543572fec179f40922346f47dff
+checksum=b6e4e8d74af744278201792bcc4447470fcb91e15bbda475c647d475bf8e7b0b
 
 post_install() {
 	vlicense LICENSE
-	vbin contrib/grimshot
-	vman contrib/grimshot.1
-}
-
-grimshot_package() {
-	short_desc="Helper for screenshots within sway"
-	depends="grim slurp sway wl-clipboard jq libnotify"
-	pkg_install() {
-		vmove usr/bin/grimshot
-		vmove usr/share/man/man1/grimshot.1
-	}
 }

From 978d8cba233fd26deb0da21e2329bacc3221f440 Mon Sep 17 00:00:00 2001
From: Luca Matei Pintilie <luca@lucamatei.com>
Date: Sat, 24 Feb 2024 19:45:06 +0100
Subject: [PATCH 2/2] grimshot: update to 1.9+0

---
 srcpkgs/grimshot          |  1 -
 srcpkgs/grimshot/template | 19 +++++++++++++++++++
 2 files changed, 19 insertions(+), 1 deletion(-)
 delete mode 120000 srcpkgs/grimshot
 create mode 100644 srcpkgs/grimshot/template

diff --git a/srcpkgs/grimshot b/srcpkgs/grimshot
deleted file mode 120000
index 3f4bb6581e9b96..00000000000000
--- a/srcpkgs/grimshot
+++ /dev/null
@@ -1 +0,0 @@
-sway
\ No newline at end of file
diff --git a/srcpkgs/grimshot/template b/srcpkgs/grimshot/template
new file mode 100644
index 00000000000000..761b83dd15bbbe
--- /dev/null
+++ b/srcpkgs/grimshot/template
@@ -0,0 +1,19 @@
+# Template file for 'grimshot'
+pkgname=grimshot
+version=1.9+0
+revision=1
+build_style=meta
+depends="grim slurp sway wl-clipboard jq libnotify"
+short_desc="Helper for screenshots within sway"
+maintainer="Luca Matei Pintilie <luca@lucamatei.com>"
+license="MIT"
+homepage="https://github.com/OctopusET/sway-contrib/"
+changelog="https://github.com/OctopusET/sway-contrib/releases/"
+distfiles="https://github.com/OctopusET/sway-contrib/archive/refs/tags/${version%+*}-contrib.${version#*+}.tar.gz"
+checksum=3233a4a1671973c950802b4efb0912d08c6e08c78c0998daffff2844683f3457
+
+do_install() {
+	vman grimshot.1
+	vbin grimshot
+	vlicense LICENSE
+}

Re: sway: update to 1.9.

[caughtquick]

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

New comment by caughtquick on void-packages repository

https://github.com/void-linux/void-packages/pull/48916#issuecomment-1963114348

Comment:
Sway uses `wmenu` as its default menu, and without it the default sway configuration is very hard to use (launch everything from terminal). Should `wmenu` be added as a dependency?

Re: sway: update to 1.9.

[AnInternetTroll]

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

New comment by AnInternetTroll on void-packages repository

https://github.com/void-linux/void-packages/pull/48916#issuecomment-1964690502

Comment:
Hi,

On Sun, Feb 25, 2024 at 04:10:20PM -0800, Abhijit Sipahimalani wrote:
>Sway uses `wmenu` as its default menu, and without it the default sway
>configuration is very hard to use (launch everything from terminal).
>Should `wmenu` be added as a dependency?

IMO no. Seems like the default config uses the following command:
>`dmenu_path | wmenu | xargs swaymsg exec --`

This brings in dmenu as a dependency as well, which brings X11 as a
dependency, which IMO is too far.

Making wmenu as a dependency of sway will also make it harder for users
to remove wmenu from their systems, as they'll have to add it as a
ignorepkg option in their xbps config.

I suppose an option would be to change this config line to something
else that isn't as dependency heavy, but I am not very familiar with all
options. Maybe wofi? It depends on gtk+3 so it might also be considered
too much.

Re: sway: update to 1.9.

[rationalize-zz]

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

New comment by rationalize-zz on void-packages repository

https://github.com/void-linux/void-packages/pull/48916#issuecomment-1964921198

Comment:
I am of the opinion that there should not be any additional dependencies added, for the following reasons:

- From a commit history perspective, the current merged version of Sway includes dmenu in the example config but does not count dmenu as a dependency.  This is also true of the Foot terminal emulator.
- From a consistency perspective, the example sway config calls Foot as the terminal emulator.  If dmenu/wmenu become dependencies by nature of being included the example config, consistency would also require including Foot as a dependency.  My opinion is that it would be better to not include any of these as dependencies.
- From a design intention perspective, a WM is not a DE.  WM should not become opinionated at a package level about which packages are "official" components of the WM.  An alternative here would be to create some sort of "Sway-DE" meta-package if it is decided that a "works fresh out of the box" experience is wanted for this WM.

Re: sway: update to 1.9.

[caughtquick]

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

New comment by caughtquick on void-packages repository

https://github.com/void-linux/void-packages/pull/48916#issuecomment-1965108913

Comment:
I definitely agree with the points made by @rationalize-zz, I use fuzzel and would have no use for the `wmenu` package, however it just doesn't sit right to me to have package ship in a "broken state", with errors in the config file by default just when run. Maybe just comment those parts of the config out?

Re: [PR REVIEW] sway: update to 1.9.

[ahesford]

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

New review comment by ahesford on void-packages repository

https://github.com/void-linux/void-packages/pull/48916#discussion_r1509185051

Comment:
```suggestion
distfiles="https://github.com/OctopusET/sway-contrib/archive/refs/tags/${version/+/-}.tar.gz"
```

Re: [PR REVIEW] sway: update to 1.9.

[ahesford]

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

New review comment by ahesford on void-packages repository

https://github.com/void-linux/void-packages/pull/48916#discussion_r1509183777

Comment:
```suggestion
version=1.9+contrib.0
```

Re: sway: update to 1.9.

[ahesford]

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

New comment by ahesford on void-packages repository

https://github.com/void-linux/void-packages/pull/48916#issuecomment-1973433835

Comment:
Do not add things like `wmenu` to `depends`. Users are expected to understand how to configure and use the packages they install. Sway will operate just fine without optional depenendencies like a menu or terminal emulator, whether or not the default (example) configuration specifies them. This might be a good application for optional dependencies in XBPS but, because XBPS does not support the concept, we don't hard-require optionals just so things work "out of the box".

Re: [PR PATCH] [Updated] sway: update to 1.9.

[AnInternetTroll]

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

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

https://github.com/AnInternetTroll/void-packages user/luca/sway
https://github.com/void-linux/void-packages/pull/48916

sway: update to 1.9.
- **sway: update to 1.9.**
- **grimshot: update to 1.9+0**

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

#### Local build testing
- I built this PR locally for my native architecture, (x86\_64-glibc)


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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-user/luca/sway-48916.patch --]
[-- Type: text/x-diff, Size: 4581 bytes --]

From 432a2692a433d4d455d0e520b4b535cfe83bcfe7 Mon Sep 17 00:00:00 2001
From: Luca Matei Pintilie <luca@lucamatei.com>
Date: Sat, 24 Feb 2024 19:44:42 +0100
Subject: [PATCH 1/2] sway: update to 1.9.

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

diff --git a/srcpkgs/sway/patches/7326.diff b/srcpkgs/sway/patches/7326.diff
deleted file mode 100644
index 5c9c63063bc428..00000000000000
--- a/srcpkgs/sway/patches/7326.diff
+++ /dev/null
@@ -1,26 +0,0 @@
-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 d45374290e6c0c..d330f02c3cc5dc 100644
--- a/srcpkgs/sway/template
+++ b/srcpkgs/sway/template
@@ -1,12 +1,12 @@
 # Template file for 'sway'
 pkgname=sway
-version=1.8.1
-revision=2
+version=1.9
+revision=1
 build_style=meson
 configure_args="-Dwerror=false -Db_ndebug=false"
 conf_files="/etc/sway/config"
 hostmakedepends="pkg-config wayland-devel scdoc"
-makedepends="wlroots0.16-devel pcre2-devel json-c-devel pango-devel cairo-devel
+makedepends="wlroots0.17-devel pcre2-devel json-c-devel pango-devel cairo-devel
  gdk-pixbuf-devel libevdev-devel"
 depends="libcap-progs swaybg xorg-server-xwayland libxkbcommon>=1.5.0_1"
 short_desc="Tiling Wayland compositor compatible with i3"
@@ -15,19 +15,8 @@ license="MIT"
 homepage="https://swaywm.org"
 changelog="https://github.com/swaywm/sway/releases"
 distfiles="https://github.com/swaywm/sway/archive/refs/tags/${version}.tar.gz"
-checksum=e9f575761342fc8fe0cfeea80c90f32ddfa8c543572fec179f40922346f47dff
+checksum=b6e4e8d74af744278201792bcc4447470fcb91e15bbda475c647d475bf8e7b0b
 
 post_install() {
 	vlicense LICENSE
-	vbin contrib/grimshot
-	vman contrib/grimshot.1
-}
-
-grimshot_package() {
-	short_desc="Helper for screenshots within sway"
-	depends="grim slurp sway wl-clipboard jq libnotify"
-	pkg_install() {
-		vmove usr/bin/grimshot
-		vmove usr/share/man/man1/grimshot.1
-	}
 }

From cd10fdee49c839711e397504bc762cc5410b3ae3 Mon Sep 17 00:00:00 2001
From: Luca Matei Pintilie <luca@lucamatei.com>
Date: Sat, 24 Feb 2024 19:45:06 +0100
Subject: [PATCH 2/2] grimshot: update to 1.9+0

---
 srcpkgs/grimshot          |  1 -
 srcpkgs/grimshot/template | 19 +++++++++++++++++++
 2 files changed, 19 insertions(+), 1 deletion(-)
 delete mode 120000 srcpkgs/grimshot
 create mode 100644 srcpkgs/grimshot/template

diff --git a/srcpkgs/grimshot b/srcpkgs/grimshot
deleted file mode 120000
index 3f4bb6581e9b96..00000000000000
--- a/srcpkgs/grimshot
+++ /dev/null
@@ -1 +0,0 @@
-sway
\ No newline at end of file
diff --git a/srcpkgs/grimshot/template b/srcpkgs/grimshot/template
new file mode 100644
index 00000000000000..d02569774cd154
--- /dev/null
+++ b/srcpkgs/grimshot/template
@@ -0,0 +1,19 @@
+# Template file for 'grimshot'
+pkgname=grimshot
+version=1.9+contrib.0
+revision=1
+build_style=meta
+depends="grim slurp sway wl-clipboard jq libnotify"
+short_desc="Helper for screenshots within sway"
+maintainer="Luca Matei Pintilie <luca@lucamatei.com>"
+license="MIT"
+homepage="https://github.com/OctopusET/sway-contrib/"
+changelog="https://github.com/OctopusET/sway-contrib/releases/"
+distfiles="https://github.com/OctopusET/sway-contrib/archive/refs/tags/${version/+/-}.tar.gz"
+checksum=3233a4a1671973c950802b4efb0912d08c6e08c78c0998daffff2844683f3457
+
+do_install() {
+	vman grimshot.1
+	vbin grimshot
+	vlicense LICENSE
+}

Re: [PR PATCH] [Updated] sway: update to 1.9.

[AnInternetTroll]

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

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

https://github.com/AnInternetTroll/void-packages user/luca/sway
https://github.com/void-linux/void-packages/pull/48916

sway: update to 1.9.
- **sway: update to 1.9.**
- **grimshot: update to 1.9+0**

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

#### Local build testing
- I built this PR locally for my native architecture, (x86\_64-glibc)


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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-user/luca/sway-48916.patch --]
[-- Type: text/x-diff, Size: 4589 bytes --]

From 432a2692a433d4d455d0e520b4b535cfe83bcfe7 Mon Sep 17 00:00:00 2001
From: Luca Matei Pintilie <luca@lucamatei.com>
Date: Sat, 24 Feb 2024 19:44:42 +0100
Subject: [PATCH 1/2] sway: update to 1.9.

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

diff --git a/srcpkgs/sway/patches/7326.diff b/srcpkgs/sway/patches/7326.diff
deleted file mode 100644
index 5c9c63063bc428..00000000000000
--- a/srcpkgs/sway/patches/7326.diff
+++ /dev/null
@@ -1,26 +0,0 @@
-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 d45374290e6c0c..d330f02c3cc5dc 100644
--- a/srcpkgs/sway/template
+++ b/srcpkgs/sway/template
@@ -1,12 +1,12 @@
 # Template file for 'sway'
 pkgname=sway
-version=1.8.1
-revision=2
+version=1.9
+revision=1
 build_style=meson
 configure_args="-Dwerror=false -Db_ndebug=false"
 conf_files="/etc/sway/config"
 hostmakedepends="pkg-config wayland-devel scdoc"
-makedepends="wlroots0.16-devel pcre2-devel json-c-devel pango-devel cairo-devel
+makedepends="wlroots0.17-devel pcre2-devel json-c-devel pango-devel cairo-devel
  gdk-pixbuf-devel libevdev-devel"
 depends="libcap-progs swaybg xorg-server-xwayland libxkbcommon>=1.5.0_1"
 short_desc="Tiling Wayland compositor compatible with i3"
@@ -15,19 +15,8 @@ license="MIT"
 homepage="https://swaywm.org"
 changelog="https://github.com/swaywm/sway/releases"
 distfiles="https://github.com/swaywm/sway/archive/refs/tags/${version}.tar.gz"
-checksum=e9f575761342fc8fe0cfeea80c90f32ddfa8c543572fec179f40922346f47dff
+checksum=b6e4e8d74af744278201792bcc4447470fcb91e15bbda475c647d475bf8e7b0b
 
 post_install() {
 	vlicense LICENSE
-	vbin contrib/grimshot
-	vman contrib/grimshot.1
-}
-
-grimshot_package() {
-	short_desc="Helper for screenshots within sway"
-	depends="grim slurp sway wl-clipboard jq libnotify"
-	pkg_install() {
-		vmove usr/bin/grimshot
-		vmove usr/share/man/man1/grimshot.1
-	}
 }

From 8f4dc2442e8e510f83ad22590e54bc0c2c673546 Mon Sep 17 00:00:00 2001
From: Luca Matei Pintilie <luca@lucamatei.com>
Date: Sat, 24 Feb 2024 19:45:06 +0100
Subject: [PATCH 2/2] grimshot: update to 1.9+contrib.0

---
 srcpkgs/grimshot          |  1 -
 srcpkgs/grimshot/template | 19 +++++++++++++++++++
 2 files changed, 19 insertions(+), 1 deletion(-)
 delete mode 120000 srcpkgs/grimshot
 create mode 100644 srcpkgs/grimshot/template

diff --git a/srcpkgs/grimshot b/srcpkgs/grimshot
deleted file mode 120000
index 3f4bb6581e9b96..00000000000000
--- a/srcpkgs/grimshot
+++ /dev/null
@@ -1 +0,0 @@
-sway
\ No newline at end of file
diff --git a/srcpkgs/grimshot/template b/srcpkgs/grimshot/template
new file mode 100644
index 00000000000000..d02569774cd154
--- /dev/null
+++ b/srcpkgs/grimshot/template
@@ -0,0 +1,19 @@
+# Template file for 'grimshot'
+pkgname=grimshot
+version=1.9+contrib.0
+revision=1
+build_style=meta
+depends="grim slurp sway wl-clipboard jq libnotify"
+short_desc="Helper for screenshots within sway"
+maintainer="Luca Matei Pintilie <luca@lucamatei.com>"
+license="MIT"
+homepage="https://github.com/OctopusET/sway-contrib/"
+changelog="https://github.com/OctopusET/sway-contrib/releases/"
+distfiles="https://github.com/OctopusET/sway-contrib/archive/refs/tags/${version/+/-}.tar.gz"
+checksum=3233a4a1671973c950802b4efb0912d08c6e08c78c0998daffff2844683f3457
+
+do_install() {
+	vman grimshot.1
+	vbin grimshot
+	vlicense LICENSE
+}

Re: sway: update to 1.9.

[AnInternetTroll]

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

New comment by AnInternetTroll on void-packages repository

https://github.com/void-linux/void-packages/pull/48916#issuecomment-1973818382

Comment:
On Fri, Mar 01, 2024 at 07:49:16AM -0800, Andrew J. Hesford wrote:
>@ahesford requested changes on this pull request.

Done, thanks!

Re: sway: update to 1.9.

[zdykstra]

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

New comment by zdykstra on void-packages repository

https://github.com/void-linux/void-packages/pull/48916#issuecomment-2013221360

Comment:
Is there anything left on this PR? Does it need more end-user testing?

Re: sway: update to 1.9.

[ahesford]

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

New comment by ahesford on void-packages repository

https://github.com/void-linux/void-packages/pull/48916#issuecomment-2013240801

Comment:
I think the consensus on IRC was to reject my suggest for `1.9+contrib.0` in favor of the original `1.9+0`, which would require the distfiles substitution `${version/+/-contrib.}`.

Re: [PR PATCH] [Updated] sway: update to 1.9.

[AnInternetTroll]

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

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

https://github.com/AnInternetTroll/void-packages user/luca/sway
https://github.com/void-linux/void-packages/pull/48916

sway: update to 1.9.
- **sway: update to 1.9.**
- **grimshot: update to 1.9+0**

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

#### Local build testing
- I built this PR locally for my native architecture, (x86\_64-glibc)


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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-user/luca/sway-48916.patch --]
[-- Type: text/x-diff, Size: 4581 bytes --]

From 46ac17427dc204c18192fb6e60001049494d31c7 Mon Sep 17 00:00:00 2001
From: Luca Matei Pintilie <luca@lucamatei.com>
Date: Sat, 24 Feb 2024 19:44:42 +0100
Subject: [PATCH 1/2] sway: update to 1.9.

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

diff --git a/srcpkgs/sway/patches/7326.diff b/srcpkgs/sway/patches/7326.diff
deleted file mode 100644
index 5c9c63063bc428..00000000000000
--- a/srcpkgs/sway/patches/7326.diff
+++ /dev/null
@@ -1,26 +0,0 @@
-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 d45374290e6c0c..d330f02c3cc5dc 100644
--- a/srcpkgs/sway/template
+++ b/srcpkgs/sway/template
@@ -1,12 +1,12 @@
 # Template file for 'sway'
 pkgname=sway
-version=1.8.1
-revision=2
+version=1.9
+revision=1
 build_style=meson
 configure_args="-Dwerror=false -Db_ndebug=false"
 conf_files="/etc/sway/config"
 hostmakedepends="pkg-config wayland-devel scdoc"
-makedepends="wlroots0.16-devel pcre2-devel json-c-devel pango-devel cairo-devel
+makedepends="wlroots0.17-devel pcre2-devel json-c-devel pango-devel cairo-devel
  gdk-pixbuf-devel libevdev-devel"
 depends="libcap-progs swaybg xorg-server-xwayland libxkbcommon>=1.5.0_1"
 short_desc="Tiling Wayland compositor compatible with i3"
@@ -15,19 +15,8 @@ license="MIT"
 homepage="https://swaywm.org"
 changelog="https://github.com/swaywm/sway/releases"
 distfiles="https://github.com/swaywm/sway/archive/refs/tags/${version}.tar.gz"
-checksum=e9f575761342fc8fe0cfeea80c90f32ddfa8c543572fec179f40922346f47dff
+checksum=b6e4e8d74af744278201792bcc4447470fcb91e15bbda475c647d475bf8e7b0b
 
 post_install() {
 	vlicense LICENSE
-	vbin contrib/grimshot
-	vman contrib/grimshot.1
-}
-
-grimshot_package() {
-	short_desc="Helper for screenshots within sway"
-	depends="grim slurp sway wl-clipboard jq libnotify"
-	pkg_install() {
-		vmove usr/bin/grimshot
-		vmove usr/share/man/man1/grimshot.1
-	}
 }

From 97b4e0d276c3b26b2b23ef143d30fd154640dcf7 Mon Sep 17 00:00:00 2001
From: Luca Matei Pintilie <luca@lucamatei.com>
Date: Sat, 24 Feb 2024 19:45:06 +0100
Subject: [PATCH 2/2] grimshot: update to 1.9+0

---
 srcpkgs/grimshot          |  1 -
 srcpkgs/grimshot/template | 19 +++++++++++++++++++
 2 files changed, 19 insertions(+), 1 deletion(-)
 delete mode 120000 srcpkgs/grimshot
 create mode 100644 srcpkgs/grimshot/template

diff --git a/srcpkgs/grimshot b/srcpkgs/grimshot
deleted file mode 120000
index 3f4bb6581e9b96..00000000000000
--- a/srcpkgs/grimshot
+++ /dev/null
@@ -1 +0,0 @@
-sway
\ No newline at end of file
diff --git a/srcpkgs/grimshot/template b/srcpkgs/grimshot/template
new file mode 100644
index 00000000000000..1b97d734355a2c
--- /dev/null
+++ b/srcpkgs/grimshot/template
@@ -0,0 +1,19 @@
+# Template file for 'grimshot'
+pkgname=grimshot
+version=1.9+0
+revision=1
+build_style=meta
+depends="grim slurp sway wl-clipboard jq libnotify"
+short_desc="Helper for screenshots within sway"
+maintainer="Luca Matei Pintilie <luca@lucamatei.com>"
+license="MIT"
+homepage="https://github.com/OctopusET/sway-contrib/"
+changelog="https://github.com/OctopusET/sway-contrib/releases/"
+distfiles="https://github.com/OctopusET/sway-contrib/archive/refs/tags/${version/+/-contrib.}.tar.gz"
+checksum=3233a4a1671973c950802b4efb0912d08c6e08c78c0998daffff2844683f3457
+
+do_install() {
+	vman grimshot.1
+	vbin grimshot
+	vlicense LICENSE
+}

Re: sway: update to 1.9.

[AnInternetTroll]

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

New comment by AnInternetTroll on void-packages repository

https://github.com/void-linux/void-packages/pull/48916#issuecomment-2013310682

Comment:
>I think the consensus on IRC was to reject my suggest for
>`1.9+contrib.0` in favor of the original `1.9+0`, which would require
>the distfiles substitution `${version/+/-contrib.}`.

@ahesford tbh I got also confused in that discussion. Anyway,
implemented those changes.

Re: [PR PATCH] [Merged]: sway: update to 1.9.

[ahesford]

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

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

sway: update to 1.9.
https://github.com/void-linux/void-packages/pull/48916

Description:
- **sway: update to 1.9.**
- **grimshot: update to 1.9+0**

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

#### Local build testing
- I built this PR locally for my native architecture, (x86\_64-glibc)