From nobody Wed May 31 06:00:05 2023 X-Original-To: dev-commits-ports-branches@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 4QWJWn6NYXz4Y7JZ; Wed, 31 May 2023 06:00:05 +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 4QWJWn5w4Jz4K0K; Wed, 31 May 2023 06:00:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685512805; 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=YeVxtccNrTRRRxeOil9fazmSqpdSZI+kq6RWgrQ9ikc=; b=CjvW6EV7xOZ81c/+WbJ5ErIQBg50XgW4ehXObieoICjYx6w2EK6yjOQieGJVow6YYYwrSc 7Nlcik6ho0/be8VSCmkXcbtsnvVOXgYmks/sQTXEgptC0VMVsrakV1IhpsC51z7Z6ygj5M pIyVyffYKYZA9oYOgVD1o7sRm71m0H42dTBTAmQNOU57Ol4dl1Z8+AmRLJt97pQrJp5+c3 Cz2Wz4zXBWwZ23T/uN5B0HQwpAtXcQFRplyOmK76frRQVGM0JMQFBYTfNKSNWliEox3BL7 2P50b083HAx15PcZMHbf1WUB9nwp2zI6zRpSC11aXcHsLvt78g0YZQU4xJRAhA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685512805; 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=YeVxtccNrTRRRxeOil9fazmSqpdSZI+kq6RWgrQ9ikc=; b=tGGSMkIGhBc0K3qE+15S+DMl0CdKHhJVCznt2E+nhT2IHTD39REWNj5RUQiEmRGPWMETdp K+vbBuuxC1SKfrFq10/KGM1m7VF0SVuzq6zMYaLp7leDJ65EZl8JWlMttOqkY4YXen3c9A Zy4lavOXIRkF1qJTi9IucKyuFXCAh69HzjvsxoVMDWu86YfiDfdRGmCAMu9J5L8DedNE5X HFmzIH+5fx0d2rWWotJCODrJf/qeoSoQk1QW33Wp2tVBQzDRfl8WHwtHEqSZNCOx228+B+ 4LiXjBnresb4fwixaRfalemMjPve9+3THFdcmhFKDB6SkPXKesUD3CGHSyXKJg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1685512805; a=rsa-sha256; cv=none; b=PC6C7c6XEEpu/Q6xpkzs3V49bNyXmyecV29XJ1QKtE0vjushcRxOFB9qDLaJZFeP+H6kIc PZhX1jY7nqBT0AXSem8HMg4Ckq4kyUCz0DnjLlazzTgtXquPEFkY3xUHY7CiPLHKesfZsR LZgaBgNMB7RMr8GXd/ripQdaZaSaq6CuyRRmHA+Y6prJffZ7IPbHaf5O9WXggncvp8hZmv Dps2W8ZZtjW4r+Q30vAaHWReLkWQXTKoXI+EBAK0BN97cnpUbUpteQBqR7aKrWgcNw9nob m9fq+c64CMW1tvgzHV0a2YkOltOJYClXx3AlYT4fdtmI46pkFIHVNYvXsRaCSw== 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 4QWJWn4yyWzPCm; Wed, 31 May 2023 06:00:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 34V605hR086629; Wed, 31 May 2023 06:00:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34V605HZ086626; Wed, 31 May 2023 06:00:05 GMT (envelope-from git) Date: Wed, 31 May 2023 06:00:05 GMT Message-Id: <202305310600.34V605HZ086626@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Jan Beich Subject: git: c0ca77229e2a - 2023Q2 - x11-servers/xwayland-devel: allow concurrent instance after 1c4b6bc295c6 List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@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/2023Q2 X-Git-Reftype: branch X-Git-Commit: c0ca77229e2a8c7d41d3fd44af318d05a2249c0a Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2023Q2 has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=c0ca77229e2a8c7d41d3fd44af318d05a2249c0a commit c0ca77229e2a8c7d41d3fd44af318d05a2249c0a Author: Jan Beich AuthorDate: 2023-05-31 05:26:37 +0000 Commit: Jan Beich CommitDate: 2023-05-31 05:59:08 +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 (cherry picked from commit fb41bd9ef0438118ccc7e2e43d952fc8c2adcd63) --- 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