summaryrefslogtreecommitdiff
path: root/x11-wm/sway
diff options
context:
space:
mode:
Diffstat (limited to 'x11-wm/sway')
-rw-r--r--x11-wm/sway/Makefile13
-rw-r--r--x11-wm/sway/distinfo6
-rw-r--r--x11-wm/sway/files/extra-patch-wordexp (renamed from x11-wm/sway/files/patch-common_stringop.c)0
-rw-r--r--x11-wm/sway/pkg-message3
4 files changed, 14 insertions, 8 deletions
diff --git a/x11-wm/sway/Makefile b/x11-wm/sway/Makefile
index fab1bfb892bd..caf623eafae1 100644
--- a/x11-wm/sway/Makefile
+++ b/x11-wm/sway/Makefile
@@ -1,5 +1,5 @@
PORTNAME= sway
-DISTVERSION= 1.11-rc2
+DISTVERSION= 1.11
CATEGORIES= x11-wm wayland
MAINTAINER= jbeich@FreeBSD.org
@@ -50,6 +50,15 @@ SWAYBG_RUN_DEPENDS= swaybg:x11/swaybg
X11_USE= XORG=xcb
X11_LIB_DEPENDS= libxcb-icccm.so:x11/xcb-util-wm
+.include <bsd.port.options.mk>
+
+# https://github.com/freebsd/freebsd-src/pull/1675
+.if ${OPSYS} == FreeBSD && (${OSVERSION} < 1305503 \
+ || ${OSVERSION} >= 1400000 && ${OSVERSION} < 1403505 \
+ || ${OSVERSION} >= 1500000 && ${OSVERSION} < 1500052)
+EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-wordexp
+.endif
+
post-patch:
# Let @sample handle default files under etc/
@${REINPLACE_CMD} -e '/config\.in/{ N; s/@BASENAME@/&.sample/; }' \
@@ -58,7 +67,7 @@ post-patch:
@${REINPLACE_CMD} -i .nogit -e 's/git.found()/false/' \
-e '/project_version/s/@0@/${DISTVERSIONFULL}/' \
${WRKSRC}/meson.build
-.if exists(${.CURDIR}/files/patch-common_stringop.c)
+.if exists(${.CURDIR}/files/extra-patch-wordexp)
# https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=275328
@${REINPLACE_CMD} -e 's/_POSIX_C_SOURCE=200809L/_XOPEN_SOURCE=700/' \
${WRKSRC}/meson.build
diff --git a/x11-wm/sway/distinfo b/x11-wm/sway/distinfo
index 42ccd7062940..cc3a65e6e973 100644
--- a/x11-wm/sway/distinfo
+++ b/x11-wm/sway/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1745787168
-SHA256 (swaywm-sway-1.11-rc2_GH0.tar.gz) = 156e31de674979a76956bf4eaedcd2d42946b4e983b817a15d6320ce2dee5871
-SIZE (swaywm-sway-1.11-rc2_GH0.tar.gz) = 5583520
+TIMESTAMP = 1749416947
+SHA256 (swaywm-sway-1.11_GH0.tar.gz) = 034ec4519326d6af5275814700dde46e852c5174614109affe4c86b2fbee062a
+SIZE (swaywm-sway-1.11_GH0.tar.gz) = 5583731
diff --git a/x11-wm/sway/files/patch-common_stringop.c b/x11-wm/sway/files/extra-patch-wordexp
index 5a9f187e11df..5a9f187e11df 100644
--- a/x11-wm/sway/files/patch-common_stringop.c
+++ b/x11-wm/sway/files/extra-patch-wordexp
diff --git a/x11-wm/sway/pkg-message b/x11-wm/sway/pkg-message
index 15b9e51475e8..6a2347801f07 100644
--- a/x11-wm/sway/pkg-message
+++ b/x11-wm/sway/pkg-message
@@ -3,9 +3,6 @@
message: <<EOM
Notes:
- sway(1) can use mac_priority(4) to avoid stutter during high load
-Known issues:
-- Broken on amdgpu since sway 1.11. Switch to swayfx for now.
- https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=286311
EOM
}
]