git: 926bf479cc73 - main - textproc/angle-grinder: Unbreak build with Rust 1.52.0 (D30099)

Tobias Kortkamp tobik at FreeBSD.org
Sat May 8 10:55:04 UTC 2021 

The branch main has been updated by tobik:

URL: https://cgit.FreeBSD.org/ports/commit/?id=926bf479cc738b1860423ef23c40ae53f9ef80ee

commit 926bf479cc738b1860423ef23c40ae53f9ef80ee
Author:     Tobias Kortkamp <tobik at FreeBSD.org>
AuthorDate: 2021-05-08 10:12:21 +0000
Commit:     Tobias Kortkamp <tobik at FreeBSD.org>
CommitDate: 2021-05-08 10:40:41 +0000

    textproc/angle-grinder: Unbreak build with Rust 1.52.0 (D30099)
    
    error: cannot find macro `proc_macro_call` in this scope
      --> src/alias.rs:13:26
       |
    13 | const ALIASES_DIR: Dir = include_dir!("aliases");
       |                          ^^^^^^^^^^^^^^^^^^^^^^^
       |
    
    Update include_dir crate to the next minor version to remove the
    broken proc_macro_call-0.4.2 dependency.
    
    http://package18.nyi.freebsd.org/data/122amd64-default-foo/2021-05-07_12h05m44s/logs/errors/angle-grinder-0.16_2.log
    
    PR:             255608
---
 textproc/angle-grinder/Makefile               | 10 +++-------
 textproc/angle-grinder/distinfo               | 18 +++++-------------
 textproc/angle-grinder/files/patch-Cargo.toml | 11 +++++++++++
 3 files changed, 19 insertions(+), 20 deletions(-)

diff --git a/textproc/angle-grinder/Makefile b/textproc/angle-grinder/Makefile
index 9be8fca25af0..487d70075a0c 100644
--- a/textproc/angle-grinder/Makefile
+++ b/textproc/angle-grinder/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	angle-grinder
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.16
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	textproc
 
 MAINTAINER=	lcook at FreeBSD.org
@@ -81,7 +81,6 @@ CARGO_CRATES=	addr2line-0.14.1 \
 		getopts-0.2.21 \
 		getrandom-0.1.16 \
 		gimli-0.23.0 \
-		glob-0.2.11 \
 		glob-0.3.0 \
 		globset-0.4.6 \
 		globwalk-0.3.1 \
@@ -102,8 +101,8 @@ CARGO_CRATES=	addr2line-0.14.1 \
 		idna-0.2.0 \
 		ignore-0.4.17 \
 		im-13.0.0 \
-		include_dir-0.2.1 \
-		include_dir_impl-0.2.1 \
+		include_dir-0.4.1 \
+		include_dir_impl-0.4.1 \
 		indexmap-1.6.1 \
 		indicatif-0.13.0 \
 		iovec-0.1.4 \
@@ -163,9 +162,7 @@ CARGO_CRATES=	addr2line-0.14.1 \
 		predicates-1.0.6 \
 		predicates-core-1.0.1 \
 		predicates-tree-1.0.1 \
-		proc-macro-hack-0.4.2 \
 		proc-macro-hack-0.5.19 \
-		proc-macro-hack-impl-0.4.2 \
 		proc-macro-nested-0.1.6 \
 		proc-macro2-0.4.30 \
 		proc-macro2-1.0.24 \
@@ -214,7 +211,6 @@ CARGO_CRATES=	addr2line-0.14.1 \
 		strsim-0.8.0 \
 		structopt-0.2.18 \
 		structopt-derive-0.2.18 \
-		syn-0.14.9 \
 		syn-0.15.44 \
 		syn-1.0.58 \
 		synstructure-0.12.4 \
diff --git a/textproc/angle-grinder/distinfo b/textproc/angle-grinder/distinfo
index f9cf44349af8..05992f636a3b 100644
--- a/textproc/angle-grinder/distinfo
+++ b/textproc/angle-grinder/distinfo
@@ -1,4 +1,4 @@
-TIMESTAMP = 1611058567
+TIMESTAMP = 1620466191
 SHA256 (rust/crates/addr2line-0.14.1.tar.gz) = a55f82cfe485775d02112886f4169bde0c5894d75e79ead7eafe7e40a25e45f7
 SIZE (rust/crates/addr2line-0.14.1.tar.gz) = 31201
 SHA256 (rust/crates/adler-0.2.3.tar.gz) = ee2a4ec343196209d6594e19543ae87a39f96d5534d7174822a3ad825dd6ed7e
@@ -133,8 +133,6 @@ SHA256 (rust/crates/getrandom-0.1.16.tar.gz) = 8fc3cb4d91f53b50155bdcfd23f6a4c39
 SIZE (rust/crates/getrandom-0.1.16.tar.gz) = 25077
 SHA256 (rust/crates/gimli-0.23.0.tar.gz) = f6503fe142514ca4799d4c26297c4248239fe8838d827db6bd6065c6ed29a6ce
 SIZE (rust/crates/gimli-0.23.0.tar.gz) = 702175
-SHA256 (rust/crates/glob-0.2.11.tar.gz) = 8be18de09a56b60ed0edf84bc9df007e30040691af7acd1c41874faac5895bfb
-SIZE (rust/crates/glob-0.2.11.tar.gz) = 18065
 SHA256 (rust/crates/glob-0.3.0.tar.gz) = 9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574
 SIZE (rust/crates/glob-0.3.0.tar.gz) = 18724
 SHA256 (rust/crates/globset-0.4.6.tar.gz) = c152169ef1e421390738366d2f796655fec62621dabbd0fd476f905934061e4a
@@ -175,10 +173,10 @@ SHA256 (rust/crates/ignore-0.4.17.tar.gz) = b287fb45c60bb826a0dc68ff08742b9d88a2
 SIZE (rust/crates/ignore-0.4.17.tar.gz) = 53056
 SHA256 (rust/crates/im-13.0.0.tar.gz) = 8db49f8bc08d5cc4e2bb0f7d25a6d1db2c79bc6f7d7c86c96c657eb3d214125f
 SIZE (rust/crates/im-13.0.0.tar.gz) = 100016
-SHA256 (rust/crates/include_dir-0.2.1.tar.gz) = f41a8bee1894b3fb755d8f09ccd764650476358197a0582555f698fe84b0ae93
-SIZE (rust/crates/include_dir-0.2.1.tar.gz) = 9488
-SHA256 (rust/crates/include_dir_impl-0.2.1.tar.gz) = 0c4b029199aef0fb9921fdc5623843197e6f4a035774523817599a9f55e4bf3b
-SIZE (rust/crates/include_dir_impl-0.2.1.tar.gz) = 2141
+SHA256 (rust/crates/include_dir-0.4.1.tar.gz) = 871d135012075944c7d4b8365bd515a2e86bece05e960c6cc4f02c2d9c67308b
+SIZE (rust/crates/include_dir-0.4.1.tar.gz) = 3523
+SHA256 (rust/crates/include_dir_impl-0.4.1.tar.gz) = 0f47b210f2fd02a72ca7d8535f1c5a0a7af251e441ad1217f1cf44b923c15bce
+SIZE (rust/crates/include_dir_impl-0.4.1.tar.gz) = 2098
 SHA256 (rust/crates/indexmap-1.6.1.tar.gz) = 4fb1fa934250de4de8aef298d81c729a7d33d8c239daa3a7575e6b92bfc7313b
 SIZE (rust/crates/indexmap-1.6.1.tar.gz) = 49644
 SHA256 (rust/crates/indicatif-0.13.0.tar.gz) = 8572bccfb0665e70b7faf44ee28841b8e0823450cd4ad562a76b5a3c4bf48487
@@ -297,12 +295,8 @@ SHA256 (rust/crates/predicates-core-1.0.1.tar.gz) = fb3dbeaaf793584e29c58c7e3a82
 SIZE (rust/crates/predicates-core-1.0.1.tar.gz) = 8186
 SHA256 (rust/crates/predicates-tree-1.0.1.tar.gz) = aee95d988ee893cb35c06b148c80ed2cd52c8eea927f50ba7a0be1a786aeab73
 SIZE (rust/crates/predicates-tree-1.0.1.tar.gz) = 6355
-SHA256 (rust/crates/proc-macro-hack-0.4.2.tar.gz) = 463bf29e7f11344e58c9e01f171470ab15c925c6822ad75028cc1c0e1d1eb63b
-SIZE (rust/crates/proc-macro-hack-0.4.2.tar.gz) = 8746
 SHA256 (rust/crates/proc-macro-hack-0.5.19.tar.gz) = dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5
 SIZE (rust/crates/proc-macro-hack-0.5.19.tar.gz) = 15556
-SHA256 (rust/crates/proc-macro-hack-impl-0.4.2.tar.gz) = 38c47dcb1594802de8c02f3b899e2018c78291168a22c281be21ea0fb4796842
-SIZE (rust/crates/proc-macro-hack-impl-0.4.2.tar.gz) = 1566
 SHA256 (rust/crates/proc-macro-nested-0.1.6.tar.gz) = eba180dafb9038b050a4c280019bbedf9f2467b61e5d892dcad585bb57aadc5a
 SIZE (rust/crates/proc-macro-nested-0.1.6.tar.gz) = 6498
 SHA256 (rust/crates/proc-macro2-0.4.30.tar.gz) = cf3d2011ab5c909338f7887f4fc896d35932e29146c12c8d01da6b22a80ba759
@@ -399,8 +393,6 @@ SHA256 (rust/crates/structopt-0.2.18.tar.gz) = 16c2cdbf9cc375f15d1b4141bc48aeef4
 SIZE (rust/crates/structopt-0.2.18.tar.gz) = 26373
 SHA256 (rust/crates/structopt-derive-0.2.18.tar.gz) = 53010261a84b37689f9ed7d395165029f9cc7abb9f56bbfe86bee2597ed25107
 SIZE (rust/crates/structopt-derive-0.2.18.tar.gz) = 13088
-SHA256 (rust/crates/syn-0.14.9.tar.gz) = 261ae9ecaa397c42b960649561949d69311f08eeaea86a65696e6e46517cf741
-SIZE (rust/crates/syn-0.14.9.tar.gz) = 135921
 SHA256 (rust/crates/syn-0.15.44.tar.gz) = 9ca4b3b69a77cbe1ffc9e198781b7acb0c7365a883670e8f1c1bc66fba79a5c5
 SIZE (rust/crates/syn-0.15.44.tar.gz) = 184212
 SHA256 (rust/crates/syn-1.0.58.tar.gz) = cc60a3d73ea6594cd712d830cc1f0390fd71542d8c8cd24e70cc54cdfd5e05d5
diff --git a/textproc/angle-grinder/files/patch-Cargo.toml b/textproc/angle-grinder/files/patch-Cargo.toml
new file mode 100644
index 000000000000..b2ac5e224ff4
--- /dev/null
+++ b/textproc/angle-grinder/files/patch-Cargo.toml
@@ -0,0 +1,11 @@
+--- Cargo.toml.orig	2021-05-08 09:28:18 UTC
++++ Cargo.toml
+@@ -45,7 +45,7 @@ lazy_static = "1.2.0"
+ im = "13.0.0"
+ logfmt = "0.0.2"
+ strfmt = "0.1.6"
+-include_dir = "0.2.1"
++include_dir = "0.4.1"
+ toml = "0.4.10"
+ serde = { version = "1.0", features = ["derive"] }
+ chrono = "0.4"

More information about the dev-commits-ports-all mailing list