git: 9f5b7d7133ba - main - x11-toolkits/wlroots: unbreak nesting under X11 after a8bed4f81662
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 04 Jan 2023 23:51:17 UTC
The branch main has been updated by jbeich:
URL: https://cgit.FreeBSD.org/ports/commit/?id=9f5b7d7133bace0cdb8e53c6ce836fa78e7d5237
commit 9f5b7d7133bace0cdb8e53c6ce836fa78e7d5237
Author: Jan Beich <jbeich@FreeBSD.org>
AuthorDate: 2023-01-04 23:42:56 +0000
Commit: Jan Beich <jbeich@FreeBSD.org>
CommitDate: 2023-01-04 23:50:16 +0000
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.
---
x11-toolkits/wlroots/Makefile | 2 ++
x11-toolkits/wlroots/distinfo | 2 ++
2 files changed, 4 insertions(+)
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