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
+}