From nobody Sat Jul 29 17:46:41 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 4RCsPt1CPgz4qS5G; Sat, 29 Jul 2023 17:46:42 +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 4RCsPt0f8wz3tVH; Sat, 29 Jul 2023 17:46:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690652802; 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=sY0ReP1FJTE85bmFSYSVukjITCS++4xeRhcNUdKe0Yo=; b=F/AhY7+8K3Rc0nQbi9nJxr43HkkKDOkZ7hhpn4VA3ulKAgWT8jPdaWTgIt7ACSnDrtR97X nRhg5cRMUbt2I0mjBbrHyWuir/bCVdIbIWARG2xwd86AjT5aMURNBI3F9dnVJzbvuh6ZhL PGSGVQsMQ0dHzwdjQcGqUZSlvETIAVo6E9UFY3WXpPde906VYltgyzGODOc4QVlO5PSa26 OrRieBqB5fy9PFaaYwlwPe4FE0ET7oRAlU9mf6OISowqgTReYMnG3wUKQszonLNHimWNQn HcOApjnGH7uu7QVp1ZuOx8R9Iw892c+jLLKpxBskBnPSSR3bR4rOicUvylChUQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690652802; 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=sY0ReP1FJTE85bmFSYSVukjITCS++4xeRhcNUdKe0Yo=; b=dws87DXnEOvd/mAOKCBLGlW+BYMHzfflK3fh+Xc9n4ZDSoC5TUBjwsKXF1ql163qYmVaj8 y8Gd4yB3gz2U5C/SnHelxAscNyDI/MLlcw3M3WgQ8EsOIU2IOt1ngtmJsPSvb+LrWxb5P3 c4WuokJNC9HfdbBaYkCuvMqPhJI8Nlt6PHCK60jnR2CAhGDm6Rim5o0biienDeTLJbb9qp xfI7ZGRaqN78FMEF5A36qHltA2biKD3j0cqtarg1h5YioephaqnVFT0nQa5fSrb6PD7lzv Q5ge7rH/fbgSgpY527k+ZITVV2P8Nk7ajmv880qp4BvSRZHjrGxHc34sZn/yTA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690652802; a=rsa-sha256; cv=none; b=Q/ggI1xrBM4zGtBzPRVVMqHkfDxaFXY/OgFIdsprHTwCPLKrLvdjuAqE2C8gWlaavWaXqc F1GMak6d0BmqXdcL8Cp1LOuyH6e6V8LfG7VSiisTBFMGaddTMCyfkSTQJGxKpjOtncUxeg xCQlobOp93W/vhVxpN+sqTo6iBZWlhMq8mcRUONN8I6834MfuvcJqo2UpMGfyYQDO3GVMk d3ZahpMXUVHkA7/Sj6JeKQS/yMZHdibMm3DPrMXhuvWLarYo8GlfLUFFPflpriC2VSmFgA zYsK+7UUsfqNNzcYF/Id24QJFz5ESYIvrSqK0Jdvu91q62T0f6oT+VFxTTahaw== 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 4RCsPs6tFvzhSW; Sat, 29 Jul 2023 17:46:41 +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 36THkfC9008227; Sat, 29 Jul 2023 17:46:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36THkfqT008226; Sat, 29 Jul 2023 17:46:41 GMT (envelope-from git) Date: Sat, 29 Jul 2023 17:46:41 GMT Message-Id: <202307291746.36THkfqT008226@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: fe9f17097989 - 2023Q3 - x11-wm/swayfx: unbreak with wlroots/X11=off after e83c39ced11e 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/2023Q3 X-Git-Reftype: branch X-Git-Commit: fe9f170979898ca9d0c39e4760c0d54af2c2f849 Auto-Submitted: auto-generated The branch 2023Q3 has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=fe9f170979898ca9d0c39e4760c0d54af2c2f849 commit fe9f170979898ca9d0c39e4760c0d54af2c2f849 Author: Jan Beich AuthorDate: 2023-07-29 17:43:19 +0000 Commit: Jan Beich CommitDate: 2023-07-29 17:46:36 +0000 x11-wm/swayfx: unbreak with wlroots/X11=off after e83c39ced11e ../sway/tree/root.c:63:7: error: implicit declaration of function 'wlr_surface_is_xwayland_surface' is invalid in C99 [-Werror,-Wimplicit-function-declaration] if (wlr_surface_is_xwayland_surface(con->view->surface)) { ^ ../sway/tree/root.c:63:7: note: did you mean 'wlr_surface_is_layer_surface'? /usr/local/include/wlr/types/wlr_layer_shell_v1.h:144:6: note: 'wlr_surface_is_layer_surface' declared here bool wlr_surface_is_layer_surface(struct wlr_surface *surface); ^ ../sway/tree/root.c:64:44: error: implicit declaration of function 'wlr_xwayland_surface_from_wlr_surface' is invalid in C99 [-Werror,-Wimplicit-function-declaration] struct wlr_xwayland_surface *xsurface = wlr_xwayland_surface_from_wlr_surface(con->view->surface); ^ ../sway/tree/root.c:64:44: note: did you mean 'wlr_xdg_surface_from_wlr_surface'? /usr/local/include/wlr/types/wlr_xdg_shell.h:494:25: note: 'wlr_xdg_surface_from_wlr_surface' declared here struct wlr_xdg_surface *wlr_xdg_surface_from_wlr_surface( ^ ../sway/tree/root.c:64:33: error: incompatible integer to pointer conversion initializing 'struct wlr_xwayland_surface *' with an expression of type 'int' [-Werror,-Wint-conversion] struct wlr_xwayland_surface *xsurface = wlr_xwayland_surface_from_wlr_surface(con->view->surface); ^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ../sway/tree/root.c:65:4: error: implicit declaration of function 'wlr_xwayland_surface_set_minimized' is invalid in C99 [-Werror,-Wimplicit-function-declaration] wlr_xwayland_surface_set_minimized(xsurface, minimize); ^ (cherry picked from commit af7f9d91cd35e4dbdce78c18734b073bcd435368) --- x11-wm/swayfx/Makefile | 2 ++ x11-wm/swayfx/distinfo | 2 ++ 2 files changed, 4 insertions(+) diff --git a/x11-wm/swayfx/Makefile b/x11-wm/swayfx/Makefile index cfdcc406e212..e368f3c454b2 100644 --- a/x11-wm/swayfx/Makefile +++ b/x11-wm/swayfx/Makefile @@ -2,6 +2,8 @@ DISTVERSION= 0.3.2 PORTREVISION= 0 PKGNAMESUFFIX= ${GH_PROJECT:S/${PORTNAME}//} +PATCHFILES+= c47aa61c6492.patch:-p1 # https://github.com/WillPower3309/swayfx/pull/209 + COMMENT= Sway, but with eye candy! WWW= https://github.com/WillPower3309/swayfx diff --git a/x11-wm/swayfx/distinfo b/x11-wm/swayfx/distinfo index 7f0ff13f9f32..4c90c0c52c6c 100644 --- a/x11-wm/swayfx/distinfo +++ b/x11-wm/swayfx/distinfo @@ -1,6 +1,8 @@ TIMESTAMP = 1688699880 SHA256 (WillPower3309-swayfx-0.3.2_GH0.tar.gz) = 05b5cdc2d25e9f05817556d7053c02f8b89c9ef629405fcba5b4d240d4fd0545 SIZE (WillPower3309-swayfx-0.3.2_GH0.tar.gz) = 5684837 +SHA256 (c47aa61c6492.patch) = 243ae11c1c80ab428ca04c62e79ea140dd8d4cb9eb7e6c45dbb307ea8181d38b +SIZE (c47aa61c6492.patch) = 1422 SHA256 (cd9d1038a822.patch) = 266891cbe27a67f81740879dbe39819e3bf0f17b681bdc93087ae05987c2f88d SIZE (cd9d1038a822.patch) = 8968 SHA256 (f98ca3ab7ca1.patch) = b3a427b6edbf1c89bbf5fdeb5e3fc4c6708478e6d2031fcead87d29bf5c409fa