aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Beich <jbeich@FreeBSD.org>2023-01-04 23:42:56 +0000
committerJan Beich <jbeich@FreeBSD.org>2023-01-04 23:50:16 +0000
commit9f5b7d7133bace0cdb8e53c6ce836fa78e7d5237 (patch)
tree308921882c4fd8a691188674690e11e445d80d6f
parentbc5017985fdd6e88f413353c59b58a33bae457e9 (diff)
downloadports-9f5b7d7133bace0cdb8e53c6ce836fa78e7d5237.tar.gz
ports-9f5b7d7133bace0cdb8e53c6ce836fa78e7d5237.zip
x11-toolkits/wlroots: unbreak nesting under X11 after a8bed4f81662
$ pkg install xorg-minimal xterm sway $ echo "exec xterm" >~/.xinitrc $ startx $ sway -c /dev/null [...] Assertion failed: (buffer->n_busy > 0), function handle_x11_present_event, file backend/x11/output.c, line 682. or $ pkg install cage sway $ cage env -u WAYLAND_DISPLAY sway -c /dev/null [...] Assertion failed: (buffer->n_busy > 0), function handle_x11_present_event, file backend/x11/output.c, line 682.
-rw-r--r--x11-toolkits/wlroots/Makefile2
-rw-r--r--x11-toolkits/wlroots/distinfo2
2 files changed, 4 insertions, 0 deletions
diff --git a/x11-toolkits/wlroots/Makefile b/x11-toolkits/wlroots/Makefile
index 63d6721c7ae1..00cb04611bd0 100644
--- a/x11-toolkits/wlroots/Makefile
+++ b/x11-toolkits/wlroots/Makefile
@@ -1,6 +1,7 @@
PORTNAME= wlroots
DISTVERSION= 0.16.1
DISTVERSIONSUFFIX= -g${GL_COMMIT:C/(.{12}).*/\1/}
+PORTREVISION= 1
CATEGORIES= x11-toolkits
PATCH_SITES+= https://github.com/swaywm/${GL_PROJECT}/commit/:github
@@ -8,6 +9,7 @@ PATCHFILES+= fc0854d5f256.patch:-p1:github # https://gitlab.freedesktop.org/wlro
PATCHFILES+= 29cb694655db.patch:-p1:github # https://gitlab.freedesktop.org/wlroots/wlroots/-/merge_requests/2064
PATCHFILES+= 91a8ff42d26e.patch:-p1:github # https://gitlab.freedesktop.org/wlroots/wlroots/-/merge_requests/3318
PATCH_SITES+= ${GL_SITE}/${GL_ACCOUNT}/${GL_PROJECT}/-/commit/
+PATCHFILES+= bc8260f377b5.patch:-p1 # https://gitlab.freedesktop.org/wlroots/wlroots/-/merge_requests/3959
MAINTAINER= jbeich@FreeBSD.org
COMMENT= Modular Wayland compositor library
diff --git a/x11-toolkits/wlroots/distinfo b/x11-toolkits/wlroots/distinfo
index 91e6b6fb4764..800113826044 100644
--- a/x11-toolkits/wlroots/distinfo
+++ b/x11-toolkits/wlroots/distinfo
@@ -7,3 +7,5 @@ SHA256 (29cb694655db.patch) = ef36e6b7a0bea0b82469c395feac303f50bf940ae651d91370
SIZE (29cb694655db.patch) = 4233
SHA256 (91a8ff42d26e.patch) = 5c48b35841a3614fe589d8f31323deceaf6be2209b9350a128315cdfc6c95d2c
SIZE (91a8ff42d26e.patch) = 3659
+SHA256 (bc8260f377b5.patch) = caa3585bdca65cc1a4ed97204b4402430e627172d5661d161e530cfd73dcc98b
+SIZE (bc8260f377b5.patch) = 882