Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 16 May 2020 23:24:20 +0000 (UTC)
From:      Jan Beich <jbeich@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r535505 - head/x11-wm/sway
Message-ID:  <202005162324.04GNOK5f088288@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: jbeich
Date: Sat May 16 23:24:20 2020
New Revision: 535505
URL: https://svnweb.freebsd.org/changeset/ports/535505

Log:
  x11-wm/sway: unbreak X11=off build after r535134
  
  ../sway/commands/xwayland/scale.c:23:12: error: no member named 'xwayland' in 'struct sway_server'
          if(server.xwayland.wlr_xwayland != NULL) {
             ~~~~~~ ^
  ../sway/commands/xwayland/scale.c:24:3: error: implicit declaration of function 'wlr_xwayland_set_scale' is invalid in C99 [-Werror,-Wimplicit-function-declaration]
                  wlr_xwayland_set_scale(server.xwayland.wlr_xwayland, scale);
                  ^
  ../sway/commands/xwayland/scale.c:24:3: note: did you mean 'xwayland_cmd_scale'?
  ../sway/commands/xwayland/scale.c:7:21: note: 'xwayland_cmd_scale' declared here
  struct cmd_results *xwayland_cmd_scale(int argc, char **argv) {
                      ^
  ../sway/commands/xwayland/scale.c:24:33: error: no member named 'xwayland' in 'struct sway_server'
                  wlr_xwayland_set_scale(server.xwayland.wlr_xwayland, scale);
                                         ~~~~~~ ^
  
  PR:		246498
  Reported by:	shamaz.mazum@gmail.com

Modified:
  head/x11-wm/sway/Makefile   (contents, props changed)
  head/x11-wm/sway/distinfo   (contents, props changed)

Modified: head/x11-wm/sway/Makefile
==============================================================================
--- head/x11-wm/sway/Makefile	Sat May 16 23:08:16 2020	(r535504)
+++ head/x11-wm/sway/Makefile	Sat May 16 23:24:20 2020	(r535505)
@@ -7,6 +7,7 @@ CATEGORIES=	x11-wm
 
 PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
 PATCHFILES+=	cd9d1038a822.patch:-p1 # https://github.com/swaywm/sway/pull/5090
+PATCHFILES+=	f98ca3ab7ca1.patch:-p1 # https://github.com/swaywm/sway/pull/5090
 
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	i3-compatible Wayland compositor

Modified: head/x11-wm/sway/distinfo
==============================================================================
--- head/x11-wm/sway/distinfo	Sat May 16 23:08:16 2020	(r535504)
+++ head/x11-wm/sway/distinfo	Sat May 16 23:24:20 2020	(r535505)
@@ -3,3 +3,5 @@ SHA256 (swaywm-sway-1.4_GH0.tar.gz) = e2805291fc01d49e
 SIZE (swaywm-sway-1.4_GH0.tar.gz) = 5514489
 SHA256 (cd9d1038a822.patch) = 4183dffdf4e3dbe70302d7e6e665cc83243a7166cf9bc2b8aacd7d56a9876069
 SIZE (cd9d1038a822.patch) = 8946
+SHA256 (f98ca3ab7ca1.patch) = 319a9658ea12403e6c73ed0c2c6f0deffd23ebe25b6ba81d7573f9984be95760
+SIZE (f98ca3ab7ca1.patch) = 2669



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202005162324.04GNOK5f088288>