From nobody Fri Sep 01 15:04:04 2023 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RchBX73Ngz4rPj8; Fri, 1 Sep 2023 15:04:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RchBX6YCfz4d1h; Fri, 1 Sep 2023 15:04:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693580644; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RjbY0rg8cZUIiuEHqwzAbeiCfvcxrt03gCzYMQU4o6s=; b=LI4jsG3TSxfogoeNAK+ljM2i4wOGGwck+pVtUJgVeF4Z7HX7BCrOnm7fbt8/c6qcfxwlnT FPtbkmkS4Nuq1DrVHZ4twvPMob+Jvl0TEBF+doueOxV0x39FCvg+2LKEfUclBDnWXZCuHi Bvvi6BHE7BkheUbdsp8aHFrqY+5oqqWc5zl04mezhcsNH3WLFNaOLVAPf2dLB3RazYBJKr RiwAT8C+7qMThadvLqDaeDUKa8caCEvVzi4ZFIpvHcu2Nudfejrufj6/fCvgknFrjkdZZL vu3CJBJ7vt3afpxyinJvmpfNkqIL9rBQ+2gIBhrIDvcNkXeByjAA9GhShJw2zw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1693580644; a=rsa-sha256; cv=none; b=ILAz2h0Y7BmZHhfVjx77LKJpzx9gJGIHI65FNJOBNC3Fq/r+1so0eO9yXchEobf0CDh/jg 8IUra6RkPISbX78dlOXwVgKpoMCukn/auacLi8+L4agu1eOBcQbVSVMzV3gGQ4fRdiNJTG CxJXvx+hlWIX04bI9dsDzpq6sKsPAh+fAPZfAflcT9cSVT9oe3B4Zu21pGWZ99WFDjNV48 p+dOxtBpZOm19m+Rvu2ojsS5hXXqCZKk2hZFssq2eWHw1B2R+mjd1ycSzHHov9/gEs7DEd UJd+LUB86Lx7Y0GTV6iFL4+4yqk/wAOXKlOX5OMzfow+ozUDX+Y5gBF9HWdSgg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693580644; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RjbY0rg8cZUIiuEHqwzAbeiCfvcxrt03gCzYMQU4o6s=; b=yHQaVZPYm/EuTUDF5FOT4nK6yMmdl2SgUvZqShd1+AK/1Bg/dYpt97EthrM4BuVa5E+4KP lxLrnBsSL2HhU+Bn1wiMfVHT7etgCRQwo2LlIRS6TLaLHARAHVhPUFCzhMNDBzKEQJ1+Ib HYZHGktY8z39OhP3KKDIPSs0foNZiwWIS1ejPgCuRDfP7wfP7Q2NqXX+whQokXSKj7eaJj BD/QPYAqcvYaDJLzgLELfzey90M+/V4R8Hugc4h4h/K2iUz270N0GgjfU6dRDzfAvPxxdu Znl+vJipD8Liluigi8pfnot2MIn+/zjcemrxaNx0SBwur9EiPbSq8F5tIm2WpQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RchBX5fyBz15Hc; Fri, 1 Sep 2023 15:04:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 381F44ca088723; Fri, 1 Sep 2023 15:04:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 381F44b3088720; Fri, 1 Sep 2023 15:04:04 GMT (envelope-from git) Date: Fri, 1 Sep 2023 15:04:04 GMT Message-Id: <202309011504.381F44b3088720@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jan Beich Subject: git: 5c5d4e555033 - main - x11-servers/xwayland-devel: drop -displayfd workaround after 3312d027696f List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5c5d4e555033a01ec476f94579c2bc603f2b3eee Auto-Submitted: auto-generated The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=5c5d4e555033a01ec476f94579c2bc603f2b3eee commit 5c5d4e555033a01ec476f94579c2bc603f2b3eee Author: Jan Beich AuthorDate: 2023-09-01 13:35:05 +0000 Commit: Jan Beich CommitDate: 2023-09-01 15:01:32 +0000 x11-servers/xwayland-devel: drop -displayfd workaround after 3312d027696f 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 fb41bd9ef0438118ccc7e2e43d952fc8c2adcd63. --- x11-servers/xwayland-devel/Makefile | 3 +-- x11-servers/xwayland-devel/distinfo | 2 -- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/x11-servers/xwayland-devel/Makefile b/x11-servers/xwayland-devel/Makefile index da21ae5d9f50..ede088d39a2c 100644 --- a/x11-servers/xwayland-devel/Makefile +++ b/x11-servers/xwayland-devel/Makefile @@ -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 diff --git a/x11-servers/xwayland-devel/distinfo b/x11-servers/xwayland-devel/distinfo index 29a621110afa..7005a22198ff 100644 --- a/x11-servers/xwayland-devel/distinfo +++ b/x11-servers/xwayland-devel/distinfo @@ -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