From nobody Wed Jan 04 23:51:31 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 4NnRFw1L6Tz2qkbH; Wed, 4 Jan 2023 23:51:32 +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 4NnRFw01PJz3mvC; Wed, 4 Jan 2023 23:51:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1672876292; 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=cXVeiGUsUTPn5c4lrml5oIiznj02TdYKfzMbdHfrz2o=; b=Ys9O87BiUtGdUJNeA56qDWt04Qexzgqp1NEAx0uTJXIOiwLUrJ3aDmjQa+JHNjW3HUO4cB 7qoRzcqY8entUCefalFXICs4EYjZRLdpxQ4nvgxxuGDE++iTmdP2QQdJhZX0tpb58eCOtq zUrVrPZjLEYaZIddshdnCMeEWDbGgl0IXEivAwYok4zIW7lRxBT4UfGmIEPW4eccnMC5Yc v+YtLApE6SFZzoHc8nZI04Qf7U2FCRGjzGC1iyYJmPlrg2PqAvu7CckmJQpy3RMiyaWIqY iN5Gvajm1E7lhjV6feTU7itmdk8L7V/mBKgsj7xsVHCf0V34/fNbDzvCJBH8Mg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1672876292; 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=cXVeiGUsUTPn5c4lrml5oIiznj02TdYKfzMbdHfrz2o=; b=TswgAlaJBRMfQ6uNaXqIkZz20mFSKoB70wEn+8C1fipeCEDyndQcHx1PYiW6V/sj6ZM3SO JjGCEEOMTklgpi0/9wRjRZniO9bubbCg3VHLxdwocnQBBD03ACKTqVZcXUd5WAzGg26uYY pnFvv44SSgDq1CLFTaw93ASawwDDMDRsuIVAqdeeayAo0PrqGsvcDBvOnf9G8ChaS6Wbtq L2rBmjrM8nNisCaaQpTwwqbmwO5hRRkBtmrj83ea4sIv5/VQniUuAqWzvoX4ePg8NjaoUu MN8trseNRglL/3zOHyB9nc/OSbtJ8LPEf/pdYuhggk39cS/mZ4E8/MTsiRVacg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1672876292; a=rsa-sha256; cv=none; b=ndAHCo9WmERL9eJiOToLjQbdvxj/ydQPtaabjVfEULPdOmPdRwI4oNDYnBhvep7jRI4sGe ExT7wHyLRqZzoaiNGIInc+4n1ExjXTjkpdLmywEYYJmZR+5yY3Hb8CWCQRAc/MlGcH8iI1 XBG0GJi0vFHDIICvhfGjruwIArqLkD82us7m6oGDgrKtpwl/2T0A1J9Y/jfov88/kWi9rj JfjYHWGGiDXGr7mhL6D6Z3Z0I8Ib5MMpc+hC6hWg9Cv7RWlROEpauBiyiwMTBrjNZiTGRS roPqcibGEtCERnfz7R5Zo+uUX1Rq0u/ygILbNWDxaR/WPwH/kDxVumUHGO40dw== 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 4NnRFv6CVxzVC0; Wed, 4 Jan 2023 23:51:31 +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 304NpVb1084213; Wed, 4 Jan 2023 23:51:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 304NpVlq084212; Wed, 4 Jan 2023 23:51:31 GMT (envelope-from git) Date: Wed, 4 Jan 2023 23:51:31 GMT Message-Id: <202301042351.304NpVlq084212@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: 8796a113698a - 2023Q1 - x11-toolkits/wlroots: unbreak nesting under X11 after a8bed4f81662 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/2023Q1 X-Git-Reftype: branch X-Git-Commit: 8796a113698af5f94883404a8d249199b33dba17 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2023Q1 has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=8796a113698af5f94883404a8d249199b33dba17 commit 8796a113698af5f94883404a8d249199b33dba17 Author: Jan Beich AuthorDate: 2023-01-04 23:42:56 +0000 Commit: Jan Beich CommitDate: 2023-01-04 23:51:28 +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. (cherry picked from commit 9f5b7d7133bace0cdb8e53c6ce836fa78e7d5237) --- 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