mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-10-18 19:49:40 +00:00
Code Issues Releases Activity

x11-servers/xwayland-devel: drop -displayfd workaround after 3312d02769

Browse Source 
Restore -nolock when using -displayfd for consistency with Xorg and Linux.
Now prints a benign warning for every used display e.g.,

$ for dpy in :0 :1 :2 :3; do daemon -f Xwayland $dpy; done
$ Xwayland -displayfd 1
_XSERVTransSocketUNIXCreateListener: ...SocketCreateListener() failed
_XSERVTransMakeAllCOTSServerListeners: server already running
_XSERVTransSocketUNIXCreateListener: ...SocketCreateListener() failed
_XSERVTransMakeAllCOTSServerListeners: server already running
_XSERVTransSocketUNIXCreateListener: ...SocketCreateListener() failed
_XSERVTransMakeAllCOTSServerListeners: server already running
_XSERVTransSocketUNIXCreateListener: ...SocketCreateListener() failed
_XSERVTransMakeAllCOTSServerListeners: server already running
4
[...]

See also https://lists.freedesktop.org/archives/xorg-devel/2015-March/045899.html
wlroots, kwin_wayland, mutter already create /tmp/.X*-lock files.

This reverts commit fb41bd9ef0.
This commit is contained in:
Jan Beich 2023-09-01 15:35:05 +02:00
parent 5a79b86ff2
commit 5c5d4e5550
2 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
x11-servers/xwayland-devel/Makefile
View File

@ -2,7 +2,7 @@ PORTNAME= xwayland
DISTVERSIONPREFIX= xorg-server-
DISTVERSION= 21.0.99.1-511
DISTVERSIONSUFFIX= -g8128a2155
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= x11-servers
PKGNAMESUFFIX= -devel
@ -10,7 +10,6 @@ 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

2
x11-servers/xwayland-devel/distinfo
View File

@ -9,8 +9,6 @@ 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