sway: update to 1.11

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: sway: update to 1.11
From: kikadf (via pkgsrc-wip) <commit-notify%pkgsrc.org@localhost>
Date: Sat, 13 Dec 2025 16:20:37 +0000
Module Name:	pkgsrc-wip
Committed By:	kikadf <kikadf.01%gmail.com@localhost>
Pushed By:	kikadf
Date:		Sat Dec 13 17:20:01 2025 +0100
Changeset:	e64c3948d7d408d1b73aa14f1986d715f467d9d0

Modified Files:
	sway/DESCR
	sway/Makefile
	sway/PLIST
	sway/distinfo
Added Files:
	sway/files/startsway.sh
	sway/patches/patch-meson.build

Log Message:
sway: update to 1.11

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=e64c3948d7d408d1b73aa14f1986d715f467d9d0

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 sway/DESCR                     |  9 +++++-
 sway/Makefile                  | 70 +++++++++++++++++++++++++++++++++++-------
 sway/PLIST                     | 14 +++++++--
 sway/distinfo                  |  7 +++--
 sway/files/startsway.sh        | 12 ++++++++
 sway/patches/patch-meson.build | 15 +++++++++
 6 files changed, 110 insertions(+), 17 deletions(-)

diffs:
diff --git a/sway/DESCR b/sway/DESCR
index addec5b338..f168f4abcf 100644
--- a/sway/DESCR
+++ b/sway/DESCR
@@ -1 +1,8 @@
-sway is an i3-compatible compositor
+Sway is a tiling Wayland compositor and a drop-in replacement
+for the i3 window manager for X11. It works with your existing
+i3 configuration and supports most of i3's features, plus
+a few extras.
+Sway allows you to arrange your application windows logically,
+rather than spatially. Windows are arranged into a grid by
+default which maximizes the efficiency of your screen and can
+be quickly manipulated using only the keyboard.
diff --git a/sway/Makefile b/sway/Makefile
index b926dbaedc..d0e5946bd8 100644
--- a/sway/Makefile
+++ b/sway/Makefile
@@ -1,24 +1,72 @@
 # $NetBSD$
 
-DISTNAME=	sway-1.4
+DISTNAME=	sway-1.11
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_GITHUB:=swaywm/}
 
 MAINTAINER=	dan%alt.md@localhost
-HOMEPAGE=	https://github.com/swaywm/sway/
-COMMENT=	Sway is an i3-compatible Wayland compositor
+HOMEPAGE=	https://swaywm.org/
+COMMENT=	Tilling, i3-compatible Wayland compositor
 LICENSE=	mit
 
+USE_TOOLS+=	pkg-config
+TOOL_DEPENDS+=	scdoc-[0-9]*:../../textproc/scdoc
+
+EGDIR=		${PREFIX}/share/examples/sway
+OWN_DIRS+=	${PKG_SYSCONFDIR}/sway
+CONF_FILES=	${EGDIR}/config ${PKG_SYSCONFDIR}/sway/config
+
+INSTALLATION_DIRS+=	${PKGMANDIR}/man1
+INSTALLATION_DIRS+=	${PKGMANDIR}/man5
+INSTALLATION_DIRS+=	${PKGMANDIR}/man7
+
+post-install:
+	scdoc < ${WRKSRC}/sway/sway.1.scd > ${WRKSRC}/sway/sway.1
+	scdoc < ${WRKSRC}/sway/sway.5.scd > ${WRKSRC}/sway/sway.5
+	scdoc < ${WRKSRC}/sway/sway-bar.5.scd > ${WRKSRC}/sway/sway-bar.5
+	scdoc < ${WRKSRC}/sway/sway-input.5.scd > ${WRKSRC}/sway/sway-input.5
+	scdoc < ${WRKSRC}/sway/sway-ipc.7.scd > ${WRKSRC}/sway/sway-ipc.7
+	scdoc < ${WRKSRC}/sway/sway-output.5.scd > ${WRKSRC}/sway/sway-output.5
+	scdoc < ${WRKSRC}/swaynag/swaynag.1.scd > ${WRKSRC}/swaynag/swaynag.1
+	scdoc < ${WRKSRC}/swaynag/swaynag.5.scd > ${WRKSRC}/swaynag/swaynag.5
+	scdoc < ${WRKSRC}/swaybar/swaybar-protocol.7.scd > ${WRKSRC}/swaybar/swaybar-protocol.7
+	scdoc < ${WRKSRC}/swaymsg/swaymsg.1.scd > ${WRKSRC}/swaymsg/swaymsg.1
+	${INSTALL_MAN} ${WRKSRC}/sway/sway.1 \
+		${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/sway.1
+	${INSTALL_MAN} ${WRKSRC}/sway/sway.5 \
+		${DESTDIR}${PREFIX}/${PKGMANDIR}/man5/sway.5
+	${INSTALL_MAN} ${WRKSRC}/sway/sway-bar.5 \
+		${DESTDIR}${PREFIX}/${PKGMANDIR}/man5/sway-bar.5
+	${INSTALL_MAN} ${WRKSRC}/sway/sway-input.5 \
+		${DESTDIR}${PREFIX}/${PKGMANDIR}/man5/sway-input.5
+	${INSTALL_MAN} ${WRKSRC}/sway/sway-ipc.7 \
+		${DESTDIR}${PREFIX}/${PKGMANDIR}/man7/sway-ipc.7
+	${INSTALL_MAN} ${WRKSRC}/sway/sway-output.5 \
+		${DESTDIR}${PREFIX}/${PKGMANDIR}/man5/sway-output.5
+	${INSTALL_MAN} ${WRKSRC}/swaynag/swaynag.1 \
+		${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/swaynag.1
+	${INSTALL_MAN} ${WRKSRC}/swaynag/swaynag.5 \
+		${DESTDIR}${PREFIX}/${PKGMANDIR}/man5/swaynag.5
+	${INSTALL_MAN} ${WRKSRC}/swaybar/swaybar-protocol.7 \
+		${DESTDIR}${PREFIX}/${PKGMANDIR}/man7/swaybar-protocol.7
+	${INSTALL_MAN} ${WRKSRC}/swaymsg/swaymsg.1 \
+		${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/swaymsg.1
+	${INSTALL_SCRIPT} ${FILESDIR}/startsway.sh \
+		${DESTDIR}${PREFIX}/bin/startsway
+
+
 .include "../../wip/wlroots/buildlink3.mk"
-.include "../../wip/libinput/buildlink3.mk"
-.include "../../wip/libevdev/buildlink3.mk"
-.include "../../graphics/MesaLib/buildlink3.mk"
+.include "../../wip/libevdev-chunk/buildlink3.mk"
+.include "../../wip/basu/buildlink3.mk"
+.include "../../wip/seatd/buildlink3.mk"
+
+.include "../../devel/meson/build.mk"
 .include "../../devel/pango/buildlink3.mk"
-.include "../../graphics/cairo/buildlink3.mk"
-.include "../../x11/libxkbcommon/buildlink3.mk"
-.include "../../devel/wayland-protocols/buildlink3.mk"
-.include "../../devel/wayland/buildlink3.mk"
 .include "../../devel/pcre/buildlink3.mk"
+.include "../../devel/wayland/buildlink3.mk"
+.include "../../devel/wayland-protocols/buildlink3.mk"
+.include "../../graphics/cairo/buildlink3.mk"
+.include "../../graphics/gdk-pixbuf2/buildlink3.mk"
 .include "../../textproc/json-c/buildlink3.mk"
-.include "../../devel/meson/build.mk"
+.include "../../x11/libxkbcommon/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sway/PLIST b/sway/PLIST
index 61e41477a2..19ac74e442 100644
--- a/sway/PLIST
+++ b/sway/PLIST
@@ -1,10 +1,19 @@
 @comment $NetBSD$
+bin/startsway
 bin/sway
 bin/swaybar
 bin/swaymsg
 bin/swaynag
-etc/sway/config
-etc/sway/security.d/00-defaults
+man/man1/sway.1
+man/man1/swaymsg.1
+man/man1/swaynag.1
+man/man5/sway-bar.5
+man/man5/sway-input.5
+man/man5/sway-output.5
+man/man5/sway.5
+man/man5/swaynag.5
+man/man7/sway-ipc.7
+man/man7/swaybar-protocol.7
 share/backgrounds/sway/Sway_Wallpaper_Blue_1136x640.png
 share/backgrounds/sway/Sway_Wallpaper_Blue_1136x640_Portrait.png
 share/backgrounds/sway/Sway_Wallpaper_Blue_1366x768.png
@@ -16,6 +25,7 @@ share/backgrounds/sway/Sway_Wallpaper_Blue_768x1024_Portrait.png
 share/bash-completion/completions/sway
 share/bash-completion/completions/swaybar
 share/bash-completion/completions/swaymsg
+share/examples/sway/config
 share/fish/vendor_completions.d/sway.fish
 share/fish/vendor_completions.d/swaymsg.fish
 share/fish/vendor_completions.d/swaynag.fish
diff --git a/sway/distinfo b/sway/distinfo
index d2438cf9ce..22314942fd 100644
--- a/sway/distinfo
+++ b/sway/distinfo
@@ -1,5 +1,6 @@
 $NetBSD$
 
-RMD160 (sway-1.4.tar.gz) = 9987560d39a8fdb07e4616ae3080d8aee4a44cae
-SHA512 (sway-1.4.tar.gz) = 3b280bdfdbdae8fb9b4f555bc630c64e7c1d09f7b2c783b99413863a6b620d50cd2b6d10d63e11fdfb9c678fce9a403228ac52fa69fb52561ffbd06790505a71
-Size (sway-1.4.tar.gz) = 5514489 bytes
+BLAKE2s (sway-1.11.tar.gz) = 08578ebdaaafd31f89219294389dcad8e918b80181444b47f927a09e1132c737
+SHA512 (sway-1.11.tar.gz) = 7366b494308b8773e6051a67286e7abe422bb390f58def8df143d6334b949ef4c5df7e8086332053ff57ec65518f5b04f11a2c31bb57a31dd234eda82457aed5
+Size (sway-1.11.tar.gz) = 5583731 bytes
+SHA1 (patch-meson.build) = 40b74709af65b55b4f3e93a5fa45b783f88b6463
diff --git a/sway/files/startsway.sh b/sway/files/startsway.sh
new file mode 100644
index 0000000000..0add0eee1d
--- /dev/null
+++ b/sway/files/startsway.sh
@@ -0,0 +1,12 @@
+#!/bin/sh
+set -eu
+
+: ${XDG_CURRENT_DESKTOP:=sway}
+: ${XDG_RUNTIME_DIR:=/tmp/$(id -un)-runtime}
+: ${QT_QPA_PLATFORM:=wayland;xcb}
+
+export XDG_CURRENT_DESKTOP XDG_RUNTIME_DIR QT_QPA_PLATFORM
+
+[ -d "${XDG_RUNTIME_DIR}" ] || mkdir -p -m 700 "${XDG_RUNTIME_DIR}"
+
+exec /usr/pkg/bin/seatd-launch /usr/pkg/bin/sway "$@"
diff --git a/sway/patches/patch-meson.build b/sway/patches/patch-meson.build
new file mode 100644
index 0000000000..397b8e9349
--- /dev/null
+++ b/sway/patches/patch-meson.build
@@ -0,0 +1,15 @@
+$NetBSD$
+
+* Install config files to examples
+
+--- meson.build.orig	2025-12-13 15:37:00.995711394 +0000
++++ meson.build
+@@ -214,7 +214,7 @@ configure_file(
+ 	configuration: config,
+ 	input: 'config.in',
+ 	output: '@BASENAME@',
+-	install_dir: join_paths(sysconfdir, 'sway')
++	install_dir: join_paths(datadir, 'examples', 'sway')
+ )
+ 
+ install_data(
Prev by Date: Import gtk-layer-shell
Next by Date: basu: add buildlink3.mk, fix pkglints
Previous by Thread: Import gtk-layer-shell
Next by Thread: basu: add buildlink3.mk, fix pkglints
Indexes:
Home | Main Index | Thread Index | Old Index