From: Matthieu Herrb <matthieu@openbsd.org>
Subject: update: wayland/sway 0.11
To: ports@openbsd.org
Date: Sun, 17 Aug 2025 16:49:30 +0200

Update to sway 0.11. Again mostly to support wlroots 0.19
Other changes : https://github.com/swaywm/sway/releases/tag/1.11

Index: Makefile
===================================================================
RCS file: /local/cvs/ports/wayland/sway/Makefile,v
diff -u -p -u -r1.15 Makefile
--- Makefile	14 Aug 2025 15:10:34 -0000	1.15
+++ Makefile	15 Aug 2025 16:33:40 -0000
@@ -2,8 +2,7 @@ COMMENT =	i3-compatible Wayland composit
 
 GH_ACCOUNT =	swaywm
 GH_PROJECT =	sway
-GH_TAGNAME =	1.10.1
-REVISION =	0
+GH_TAGNAME =	1.11
 
 CATEGORIES =	wayland
 
Index: distinfo
===================================================================
RCS file: /local/cvs/ports/wayland/sway/distinfo,v
diff -u -p -u -r1.6 distinfo
--- distinfo	2 Mar 2025 09:21:55 -0000	1.6
+++ distinfo	15 Aug 2025 16:33:40 -0000
@@ -1,2 +1,2 @@
-SHA256 (sway-1.10.1.tar.gz) = hWWrOzWXgPArHcsk3EjltrgsZN2XynlXgsL7TKtiRXs=
-SIZE (sway-1.10.1.tar.gz) = 5582000
+SHA256 (sway-1.11.tar.gz) = A07EUZMm1q9SdYFHAN3kboUsUXRhQQmv/kyGsvvuBio=
+SIZE (sway-1.11.tar.gz) = 5583731
Index: patches/patch-meson_build
===================================================================
RCS file: /local/cvs/ports/wayland/sway/patches/patch-meson_build,v
diff -u -p -u -r1.2 patch-meson_build
--- patches/patch-meson_build	7 Nov 2024 09:45:25 -0000	1.2
+++ patches/patch-meson_build	15 Aug 2025 16:33:40 -0000
@@ -17,5 +17,5 @@ Index: meson.build
 -rt = cc.find_library('rt')
 +rt = cc.find_library('rt', required: not is_openbsd)
  xcb_icccm = wlroots_features['xwayland'] ? dependency('xcb-icccm') : null_dep
- threads = dependency('threads') # for pthread_setschedparam
+ threads = dependency('threads') # for pthread_setschedparam and pthread_atfork
  
Index: patches/patch-sway_config_c
===================================================================
RCS file: /local/cvs/ports/wayland/sway/patches/patch-sway_config_c,v
diff -u -p -u -r1.3 patch-sway_config_c
--- patches/patch-sway_config_c	7 Nov 2024 09:45:25 -0000	1.3
+++ patches/patch-sway_config_c	15 Aug 2025 16:33:40 -0000
@@ -13,7 +13,7 @@ Index: sway/config.c
  #include <sys/types.h>
  #include <sys/wait.h>
  #include <sys/stat.h>
-@@ -620,6 +624,7 @@ void load_include_configs(const char *path, struct swa
+@@ -604,6 +608,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;
-@@ -629,6 +634,17 @@ void load_include_configs(const char *path, struct swa
+@@ -613,6 +618,17 @@ void load_include_configs(const char *path, struct swa
  		}
  		wordfree(&p);
  	}
@@ -31,7 +31,7 @@ Index: sway/config.c
 +		char **w = p.gl_pathv;
 +		size_t i;
 +		for (i = 0; i < p.gl_pathc; ++i) {
-+			load_include_config(w[i], parent_dir, config, swaynag);
++			load_include_config(w[i], config, swaynag);
 +		}
 +		globfree(&p);
 +	}

-- 
Matthieu Herrb