This needs the wlroot 0.18.1 update not yet committed and
libinput-openbsd 1.26.2 and wmenu 0.1.9 that I just commited.
comments ? ok ?
Index: Makefile
===================================================================
RCS file: /local/cvs/ports/wayland/sway/Makefile,v
diff -u -p -u -r1.11 Makefile
--- Makefile 6 Oct 2024 12:07:35 -0000 1.11
+++ Makefile 6 Nov 2024 09:11:37 -0000
@@ -2,8 +2,7 @@ COMMENT = i3-compatible Wayland composit
GH_ACCOUNT = swaywm
GH_PROJECT = sway
-GH_TAGNAME = 1.9
-REVISION = 0
+GH_TAGNAME = 1.10
CATEGORIES = wayland
@@ -14,10 +13,10 @@ PERMIT_PACKAGE = Yes
MODULES = devel/meson
-WANTLIB = evdev cairo glib-2.0 gobject-2.0 input json-c
-WANTLIB += pango-1.0 pangocairo-1.0 pcre2-8 pixman-1 pthread
+WANTLIB = cairo drm evdev gdk_pixbuf-2.0 glib-2.0 gobject-2.0 input
+WANTLIB += json-c pango-1.0 pangocairo-1.0 pcre2-8 pixman-1 pthread
WANTLIB += udev wayland-client wayland-cursor
-WANTLIB += wayland-server wlroots
+WANTLIB += wayland-server wlroots-0.18
WANTLIB += xcb-icccm xcb xkbcommon
WANTLIB += c m
@@ -34,7 +33,7 @@ LIB_DEPENDS = devel/json-c \
wayland/wlroots \
x11/xkbcommon
-RUN_DEPENDS = wayland/wmenu \
+RUN_DEPENDS = wayland/wmenu>=0.1.9 \
wayland/swaybg \
x11/gnome/themes-extra
Index: distinfo
===================================================================
RCS file: /local/cvs/ports/wayland/sway/distinfo,v
diff -u -p -u -r1.4 distinfo
--- distinfo 26 Feb 2024 18:22:16 -0000 1.4
+++ distinfo 6 Nov 2024 09:11:37 -0000
@@ -1,2 +1,2 @@
-SHA256 (sway-1.9.tar.gz) = tuTo10r3RCeCAXkrzERHRw/LkeFbvaR1xkfUdb+Oews=
-SIZE (sway-1.9.tar.gz) = 5581281
+SHA256 (sway-1.10.tar.gz) = PxX4+WI40ventE280TLebIGywGzDsHPxlfB/cQUHLM8=
+SIZE (sway-1.10.tar.gz) = 5581219
Index: patches/patch-common_stringop_c
===================================================================
RCS file: /local/cvs/ports/wayland/sway/patches/patch-common_stringop_c,v
diff -u -p -u -r1.1 patch-common_stringop_c
--- patches/patch-common_stringop_c 25 Nov 2023 11:21:32 -0000 1.1
+++ patches/patch-common_stringop_c 6 Nov 2024 09:11:37 -0000
@@ -1,7 +1,7 @@
Index: common/stringop.c
--- common/stringop.c.orig
+++ common/stringop.c
-@@ -6,7 +6,16 @@
+@@ -5,7 +5,16 @@
#include <stdlib.h>
#include <string.h>
#include <strings.h>
Index: patches/patch-config_in
===================================================================
RCS file: /local/cvs/ports/wayland/sway/patches/patch-config_in,v
diff -u -p -u -r1.2 patch-config_in
--- patches/patch-config_in 26 Feb 2024 18:22:16 -0000 1.2
+++ patches/patch-config_in 6 Nov 2024 09:11:37 -0000
@@ -3,17 +3,12 @@
Index: config.in
--- config.in.orig
+++ config.in
-@@ -14,11 +14,11 @@ set $down j
+@@ -14,7 +14,7 @@ set $down j
set $up k
set $right l
# Your preferred terminal emulator
-set $term foot
+set $term xterm
# Your preferred application launcher
- # 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 wmenu_path | wmenu | xargs swaymsg exec --
+ set $menu wmenu-run
- ### Output configuration
- #
Index: patches/patch-meson_build
===================================================================
RCS file: /local/cvs/ports/wayland/sway/patches/patch-meson_build,v
diff -u -p -u -r1.1 patch-meson_build
--- patches/patch-meson_build 25 Nov 2023 11:21:32 -0000 1.1
+++ patches/patch-meson_build 6 Nov 2024 09:11:37 -0000
@@ -1,11 +1,21 @@
Index: meson.build
--- meson.build.orig
+++ meson.build
-@@ -81,7 +81,6 @@ drm_full = dependency('libdrm') # only needed for drm_
- drm = drm_full.partial_dependency(compile_args: true, includes: true)
+@@ -29,6 +29,8 @@ add_project_arguments(
+ cc = meson.get_compiler('c')
+
+ is_freebsd = host_machine.system().startswith('freebsd')
++is_openbsd = host_machine.system().startswith('openbsd')
++
+ datadir = get_option('datadir')
+ sysconfdir = get_option('sysconfdir')
+ prefix = get_option('prefix')
+@@ -77,7 +79,7 @@ xcb = wlroots_features['xwayland'] ? dependency('xcb')
+ drm = dependency('libdrm')
libudev = wlroots_features['libinput_backend'] ? dependency('libudev') :
null_dep
math = cc.find_library('m')
-rt = cc.find_library('rt')
- xcb_icccm = dependency('xcb-icccm', required: get_option('xwayland'))
++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
Index: patches/patch-sway_config_bar_c
===================================================================
RCS file: /local/cvs/ports/wayland/sway/patches/patch-sway_config_bar_c,v
diff -u -p -u -r1.1 patch-sway_config_bar_c
--- patches/patch-sway_config_bar_c 25 Nov 2023 11:21:32 -0000 1.1
+++ patches/patch-sway_config_bar_c 6 Nov 2024 09:11:37 -0000
@@ -1,7 +1,7 @@
Index: sway/config/bar.c
--- sway/config/bar.c.orig
+++ sway/config/bar.c
-@@ -9,7 +9,9 @@
+@@ -8,7 +8,9 @@
#include <sys/types.h>
#include <sys/wait.h>
#include <unistd.h>
Index: patches/patch-sway_config_c
===================================================================
RCS file: /local/cvs/ports/wayland/sway/patches/patch-sway_config_c,v
diff -u -p -u -r1.2 patch-sway_config_c
--- patches/patch-sway_config_c 26 Feb 2024 18:22:16 -0000 1.2
+++ patches/patch-sway_config_c 6 Nov 2024 09:11:38 -0000
@@ -1,7 +1,7 @@
Index: sway/config.c
--- sway/config.c.orig
+++ sway/config.c
-@@ -4,7 +4,11 @@
+@@ -5,7 +5,11 @@
#include <stdlib.h>
#include <unistd.h>
#include <libgen.h>
@@ -13,7 +13,7 @@ Index: sway/config.c
#include <sys/types.h>
#include <sys/wait.h>
#include <sys/stat.h>
-@@ -661,6 +665,7 @@ void load_include_configs(const char *path, struct swa
+@@ -620,6 +624,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;
-@@ -670,6 +675,17 @@ void load_include_configs(const char *path, struct swa
+@@ -629,6 +634,17 @@ void load_include_configs(const char *path, struct swa
}
wordfree(&p);
}
Index: patches/patch-swaynag_config_c
===================================================================
RCS file: /local/cvs/ports/wayland/sway/patches/patch-swaynag_config_c,v
diff -u -p -u -r1.1 patch-swaynag_config_c
--- patches/patch-swaynag_config_c 25 Nov 2023 11:21:32 -0000 1.1
+++ patches/patch-swaynag_config_c 6 Nov 2024 09:11:38 -0000
@@ -1,7 +1,7 @@
Index: swaynag/config.c
--- swaynag/config.c.orig
+++ swaynag/config.c
-@@ -2,7 +2,11 @@
+@@ -1,7 +1,11 @@
#include <getopt.h>
#include <stdio.h>
#include <stdlib.h>
@@ -13,7 +13,7 @@ Index: swaynag/config.c
#include <unistd.h>
#include "log.h"
#include "list.h"
-@@ -378,6 +382,7 @@ char *swaynag_get_config_path(void) {
+@@ -377,6 +381,7 @@ char *swaynag_get_config_path(void) {
config_paths[1] = "$HOME/.config/swaynag/config";
}
@@ -21,7 +21,7 @@ Index: swaynag/config.c
wordexp_t p;
for (size_t i = 0; i < sizeof(config_paths) / sizeof(char *); ++i) {
if (wordexp(config_paths[i], &p, 0) == 0) {
-@@ -389,7 +394,19 @@ char *swaynag_get_config_path(void) {
+@@ -388,7 +393,19 @@ char *swaynag_get_config_path(void) {
free(path);
}
}
--
Matthieu Herrb
