git: fb41bd9ef043 - main - x11-servers/xwayland-devel: allow concurrent instance after 1c4b6bc295c6
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 31 May 2023 05:58:59 UTC
The branch main has been updated by jbeich:
URL: https://cgit.FreeBSD.org/ports/commit/?id=fb41bd9ef0438118ccc7e2e43d952fc8c2adcd63
commit fb41bd9ef0438118ccc7e2e43d952fc8c2adcd63
Author: Jan Beich <jbeich@FreeBSD.org>
AuthorDate: 2023-05-31 05:26:37 +0000
Commit: Jan Beich <jbeich@FreeBSD.org>
CommitDate: 2023-05-31 05:58:35 +0000
x11-servers/xwayland-devel: allow concurrent instance after 1c4b6bc295c6
wlroots >= 0.16 spawns Xwayland with -displayfd. Starting a new
compositor re-created /tmp/.X11-unix/X0 thus breaking X11 connection
to an already running compositor.
Regressed by: https://gitlab.freedesktop.org/wlroots/wlroots/-/commit/4741e9d8410f
---
x11-servers/xwayland-devel/Makefile | 2 ++
x11-servers/xwayland-devel/distinfo | 2 ++
2 files changed, 4 insertions(+)
diff --git a/x11-servers/xwayland-devel/Makefile b/x11-servers/xwayland-devel/Makefile
index 3aabe7f51a1a..f71c243c8478 100644
--- a/x11-servers/xwayland-devel/Makefile
+++ b/x11-servers/xwayland-devel/Makefile
@@ -2,6 +2,7 @@ PORTNAME= xwayland
DISTVERSIONPREFIX= xorg-server-
DISTVERSION= 21.0.99.1-464
DISTVERSIONSUFFIX= -g${GL_COMMIT:C/(.{12}).*/\1/}
+PORTREVISION= 1
CATEGORIES= x11-servers
PKGNAMESUFFIX= -devel
@@ -9,6 +10,7 @@ PATCH_SITES+= https://github.com/mirror/${GL_PROJECT}/commit/:github
PATCHFILES+= cd6c9c1246af.patch:-p1:github # https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/432
PATCHFILES+= 3930d00746b0.patch:-p1:github # https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/432
PATCHFILES+= 3b0d1a3a2296.patch:-p1:github # https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/432
+PATCHFILES+= 459f07e344fd.patch:-p1:github # https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/844
PATCH_SITES+= ${GL_SITE}/${GL_ACCOUNT}/${GL_PROJECT}/-/commit/
PATCHFILES+= 8b9bf0a22640.patch:-p1 # https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1047
PATCHFILES+= 0c90fb305e9b.patch:-p1 # https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1051
diff --git a/x11-servers/xwayland-devel/distinfo b/x11-servers/xwayland-devel/distinfo
index b6a3d1a2714d..277c02554c48 100644
--- a/x11-servers/xwayland-devel/distinfo
+++ b/x11-servers/xwayland-devel/distinfo
@@ -9,6 +9,8 @@ SHA256 (3930d00746b0.patch) = acae16d3636d12e631a14e2584a4ae5d527dfb9897b897631f
SIZE (3930d00746b0.patch) = 18587
SHA256 (3b0d1a3a2296.patch) = 4e2c4165e9e287ed42cbb9a30eedf1a10f0fcbae0db6a222feb1783f9bb2ed29
SIZE (3b0d1a3a2296.patch) = 2513
+SHA256 (459f07e344fd.patch) = a5e5f033f5fd0f10eeb4f0c49f97bc9bce6532631284304dadfedab7e81ec589
+SIZE (459f07e344fd.patch) = 4965
SHA256 (8b9bf0a22640.patch) = a44b46488e9b038b546e756d96ee7e2856f58c8fa30b81ed02d75716fd2f07f2
SIZE (8b9bf0a22640.patch) = 3708
SHA256 (0c90fb305e9b.patch) = bb8ea8dc81ad9685388edbbac584717346ed8df575bd99ef9e86f0476a940c01