Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 11 Jun 2023 13:24:27 GMT
From:      Jan Beich <jbeich@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 41c988ba8e81 - main - x11/eww: unbreak build after 6b9789547d5e
Message-ID:  <202306111324.35BDORaj076485@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by jbeich:

URL: https://cgit.FreeBSD.org/ports/commit/?id=41c988ba8e81ac7a42d41d8e8f4e456a73cb1559

commit 41c988ba8e81ac7a42d41d8e8f4e456a73cb1559
Author:     Jan Beich <jbeich@FreeBSD.org>
AuthorDate: 2023-06-11 13:09:32 +0000
Commit:     Jan Beich <jbeich@FreeBSD.org>
CommitDate: 2023-06-11 13:22:58 +0000

    x11/eww: unbreak build after 6b9789547d5e
    
    error[E0557]: feature has been removed
     --> crates/simplexpr/src/lib.rs:3:12
      |
    3 | #![feature(box_syntax)]
      |            ^^^^^^^^^^ feature has been removed
      |
      = note: replaced with `#[rustc_box]`
    
    error: `box_syntax` has been removed
      --> crates/simplexpr/src/eval.rs:72:58
       |
    72 |             BinOp(span, box a, op, box b) => BinOp(span, box a.try_map_var_refs(f)?, op, box b.try_map_var_refs(f)?),
       |                                                          ^^^^^^^^^^^^^^^^^^^^^^^^^^
       |
    help: use `Box::new()` instead
       |
    72 |             BinOp(span, box a, op, box b) => BinOp(span, Box::new(a.try_map_var_refs(f)?), op, box b.try_map_var_refs(f)?),
       |                                                          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
    
    error: `box_syntax` has been removed
      --> crates/simplexpr/src/eval.rs:72:90
       |
    72 |             BinOp(span, box a, op, box b) => BinOp(span, box a.try_map_var_refs(f)?, op, box b.try_map_var_refs(f)?),
       |                                                                                          ^^^^^^^^^^^^^^^^^^^^^^^^^^
       |
    help: use `Box::new()` instead
       |
    72 |             BinOp(span, box a, op, box b) => BinOp(span, box a.try_map_var_refs(f)?, op, Box::new(b.try_map_var_refs(f)?)),
       |                                                                                          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
    
    error: `box_syntax` has been removed
      --> crates/simplexpr/src/eval.rs:74:59
       |
    74 |             UnaryOp(span, op, box a) => UnaryOp(span, op, box a.try_map_var_refs(f)?),
       |                                                           ^^^^^^^^^^^^^^^^^^^^^^^^^^
       |
    help: use `Box::new()` instead
       |
    74 |             UnaryOp(span, op, box a) => UnaryOp(span, op, Box::new(a.try_map_var_refs(f)?)),
       |                                                           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
    
    error: `box_syntax` has been removed
      --> crates/simplexpr/src/eval.rs:76:30
       |
    76 |                 IfElse(span, box a.try_map_var_refs(f)?, box b.try_map_var_refs(f)?, box c.try_map_var_refs(f)?)
       |                              ^^^^^^^^^^^^^^^^^^^^^^^^^^
       |
    help: use `Box::new()` instead
       |
    76 |                 IfElse(span, Box::new(a.try_map_var_refs(f)?), box b.try_map_var_refs(f)?, box c.try_map_var_refs(f)?)
       |                              ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
    
    error: `box_syntax` has been removed
      --> crates/simplexpr/src/eval.rs:76:58
       |
    76 |                 IfElse(span, box a.try_map_var_refs(f)?, box b.try_map_var_refs(f)?, box c.try_map_var_refs(f)?)
       |                                                          ^^^^^^^^^^^^^^^^^^^^^^^^^^
       |
    help: use `Box::new()` instead
       |
    76 |                 IfElse(span, box a.try_map_var_refs(f)?, Box::new(b.try_map_var_refs(f)?), box c.try_map_var_refs(f)?)
       |                                                          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
    
    error: `box_syntax` has been removed
      --> crates/simplexpr/src/eval.rs:76:86
       |
    76 |                 IfElse(span, box a.try_map_var_refs(f)?, box b.try_map_var_refs(f)?, box c.try_map_var_refs(f)?)
       |                                                                                      ^^^^^^^^^^^^^^^^^^^^^^^^^^
       |
    help: use `Box::new()` instead
       |
    76 |                 IfElse(span, box a.try_map_var_refs(f)?, box b.try_map_var_refs(f)?, Box::new(c.try_map_var_refs(f)?))
       |                                                                                      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
    
    error: `box_syntax` has been removed
      --> crates/simplexpr/src/eval.rs:78:64
       |
    78 |             JsonAccess(span, box a, box b) => JsonAccess(span, box a.try_map_var_refs(f)?, box b.try_map_var_refs(f)?),
       |                                                                ^^^^^^^^^^^^^^^^^^^^^^^^^^
       |
    help: use `Box::new()` instead
       |
    78 |             JsonAccess(span, box a, box b) => JsonAccess(span, Box::new(a.try_map_var_refs(f)?), box b.try_map_var_refs(f)?),
       |                                                                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
    
    error: `box_syntax` has been removed
      --> crates/simplexpr/src/eval.rs:78:92
       |
    78 |             JsonAccess(span, box a, box b) => JsonAccess(span, box a.try_map_var_refs(f)?, box b.try_map_var_refs(f)?),
       |                                                                                            ^^^^^^^^^^^^^^^^^^^^^^^^^^
       |
    help: use `Box::new()` instead
       |
    78 |             JsonAccess(span, box a, box b) => JsonAccess(span, box a.try_map_var_refs(f)?, Box::new(b.try_map_var_refs(f)?)),
       |                                                                                            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
    
    Reported by:    pkg-fallout
---
 x11/eww/Makefile | 3 +++
 x11/eww/distinfo | 2 ++
 2 files changed, 5 insertions(+)

diff --git a/x11/eww/Makefile b/x11/eww/Makefile
index d9f70885835c..a89328d18fe1 100644
--- a/x11/eww/Makefile
+++ b/x11/eww/Makefile
@@ -5,6 +5,9 @@ PORTREVISION=	9
 CATEGORIES=	x11 wayland
 PKGNAMESUFFIX=	-${FLAVOR}
 
+PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
+PATCHFILES+=	f97d5919f3a4.patch:-p1 # https://github.com/elkowar/eww/pull/711
+
 MAINTAINER=	DtxdF@disroot.org
 COMMENT=	ElKowars wacky widgets
 WWW=		https://elkowar.github.io/eww
diff --git a/x11/eww/distinfo b/x11/eww/distinfo
index 8c338680405e..f19312ec1222 100644
--- a/x11/eww/distinfo
+++ b/x11/eww/distinfo
@@ -443,3 +443,5 @@ SHA256 (rust/crates/yansi-0.5.1.crate) = 09041cd90cf85f7f8b2df60c646f853b7f535ce
 SIZE (rust/crates/yansi-0.5.1.crate) = 16525
 SHA256 (elkowar-eww-v0.4.0_GH0.tar.gz) = 67f1dfdf856168d4b0e731acdd9e7bed034c09480ce2264f857d7e48f576fc8a
 SIZE (elkowar-eww-v0.4.0_GH0.tar.gz) = 325670
+SHA256 (f97d5919f3a4.patch) = 0189b61e665ac3591862c95792a1323d4e848a67e0224cae58a2038a05b736b8
+SIZE (f97d5919f3a4.patch) = 2910



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