Index | Thread | Search

From:
Matthieu Herrb <matthieu@openbsd.org>
Subject:
update: sway 1.9
To:
ports@openbsd.org
Date:
Sat, 24 Feb 2024 19:34:16 +0100

Download raw body.

Thread
  • Matthieu Herrb:

    update: sway 1.9

Hi,

This updates sway to version 1.9.

I've changed the default config (and RDEP) to use wmenu as upstreams.

comments, ok ?

(also a gentle ping for my other wayland updates from last week)

Index: Makefile
===================================================================
RCS file: /local/cvs/ports/wayland/sway/Makefile,v
diff -u -p -u -r1.9 Makefile
--- Makefile	1 Dec 2023 20:52:37 -0000	1.9
+++ Makefile	24 Feb 2024 18:31:22 -0000
@@ -1,10 +1,9 @@
 COMMENT =	i3-compatible Wayland compositor
-REVISION = 	0
 
 GH_ACCOUNT =	swaywm
 GH_PROJECT =	sway
-GH_COMMIT =	bff991dfdc63ca3785a810ff4d913ddfd71677a1
-DISTNAME =	${GH_PROJECT}-1.8.1pl20231121
+GH_TAGNAME =	1.9
+
 CATEGORIES =	wayland
 
 HOMEPAGE =	https://github.com/swaywm/sway
@@ -35,7 +34,7 @@ LIB_DEPENDS =	devel/json-c \
 		wayland/wlroots \
 		x11/xkbcommon
 
-RUN_DEPENDS =	wayland/dmenu-wayland \
+RUN_DEPENDS =	wayland/wmenu \
 		wayland/swaybg \
 		x11/gnome/themes-extra
 
Index: distinfo
===================================================================
RCS file: /local/cvs/ports/wayland/sway/distinfo,v
diff -u -p -u -r1.3 distinfo
--- distinfo	25 Nov 2023 11:21:32 -0000	1.3
+++ distinfo	24 Feb 2024 18:31:22 -0000
@@ -1,2 +1,2 @@
-SHA256 (sway-1.8.1pl20231121-bff991df.tar.gz) = 6WbJ34/vaJ6cwLp6BYh/ogpnz2a0Qz/FPXA9CwhT9WA=
-SIZE (sway-1.8.1pl20231121-bff991df.tar.gz) = 5581167
+SHA256 (sway-1.9.tar.gz) = tuTo10r3RCeCAXkrzERHRw/LkeFbvaR1xkfUdb+Oews=
+SIZE (sway-1.9.tar.gz) = 5581281
Index: patches/patch-config_in
===================================================================
RCS file: /local/cvs/ports/wayland/sway/patches/patch-config_in,v
diff -u -p -u -r1.1 patch-config_in
--- patches/patch-config_in	1 Dec 2023 20:52:37 -0000	1.1
+++ patches/patch-config_in	24 Feb 2024 18:31:22 -0000
@@ -13,7 +13,7 @@ Index: config.in
  # Note: pass the final command to swaymsg so that the resulting window can be opened
  # on the original workspace that the command was run on.
 -set $menu dmenu_path | wmenu | xargs swaymsg exec --
-+set $menu dmenu-wl_path | dmenu-wl | xargs swaymsg exec --
++set $menu wmenu_path | wmenu | xargs swaymsg exec --
  
  ### Output configuration
  #
Index: patches/patch-sway_config_c
===================================================================
RCS file: /local/cvs/ports/wayland/sway/patches/patch-sway_config_c,v
diff -u -p -u -r1.1 patch-sway_config_c
--- patches/patch-sway_config_c	25 Nov 2023 11:21:32 -0000	1.1
+++ patches/patch-sway_config_c	24 Feb 2024 18:31:22 -0000
@@ -13,7 +13,7 @@ Index: sway/config.c
  #include <sys/types.h>
  #include <sys/wait.h>
  #include <sys/stat.h>
-@@ -656,6 +660,7 @@ void load_include_configs(const char *path, struct swa
+@@ -661,6 +665,7 @@ void load_include_configs(const char *path, struct swa
  		goto cleanup;
  	}
  
@@ -21,7 +21,7 @@ Index: sway/config.c
  	wordexp_t p;
  	if (wordexp(path, &p, 0) == 0) {
  		char **w = p.we_wordv;
-@@ -665,6 +670,17 @@ void load_include_configs(const char *path, struct swa
+@@ -670,6 +675,17 @@ void load_include_configs(const char *path, struct swa
  		}
  		wordfree(&p);
  	}


-- 
Matthieu Herrb