Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 27 Sep 2024 22:37:52 GMT
From:      Nuno Teixeira <eduardo@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: cb9b655e5ac9 - main - editors/amp: Update to 0.7.1
Message-ID:  <202409272237.48RMbqnw072557@gitrepo.freebsd.org>

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

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

commit cb9b655e5ac9f64b7a00d3d1569da338dfe09c5d
Author:     Nuno Teixeira <eduardo@FreeBSD.org>
AuthorDate: 2024-09-27 22:36:09 +0000
Commit:     Nuno Teixeira <eduardo@FreeBSD.org>
CommitDate: 2024-09-27 22:37:15 +0000

    editors/amp: Update to 0.7.1
    
    ChangeLog: https://github.com/jmacdonald/amp/releases/tag/0.7.1
---
 editors/amp/Makefile                |  7 ++++---
 editors/amp/Makefile.crates         |  7 ++++---
 editors/amp/distinfo                | 20 +++++++++++---------
 editors/amp/files/patch-rust-1.80.0 | 25 -------------------------
 4 files changed, 19 insertions(+), 40 deletions(-)

diff --git a/editors/amp/Makefile b/editors/amp/Makefile
index 28b79a05488f..ca346b681b9f 100644
--- a/editors/amp/Makefile
+++ b/editors/amp/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	amp
-DISTVERSION=	0.7.0
-PORTREVISION=	6
+DISTVERSION=	0.7.1
 CATEGORIES=	editors
 
 MAINTAINER=	eduardo@FreeBSD.org
@@ -10,7 +9,9 @@ WWW=		https://amp.rs/
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-LIB_DEPENDS=	libonig.so:devel/oniguruma
+BUILD_DEPENDS=	git>0:devel/git
+LIB_DEPENDS=	libgit2.so:devel/libgit2 \
+		libonig.so:devel/oniguruma
 
 USES=		cargo
 USE_GITHUB=	yes
diff --git a/editors/amp/Makefile.crates b/editors/amp/Makefile.crates
index dfa339464224..48848497909e 100644
--- a/editors/amp/Makefile.crates
+++ b/editors/amp/Makefile.crates
@@ -94,6 +94,7 @@ CARGO_CRATES=	addr2line-0.21.0 \
 		net2-0.2.39 \
 		nix-0.24.3 \
 		nom-7.1.3 \
+		num-conv-0.1.0 \
 		num-traits-0.2.16 \
 		num_cpus-1.16.0 \
 		numtoa-0.1.0 \
@@ -132,7 +133,7 @@ CARGO_CRATES=	addr2line-0.21.0 \
 		safemem-0.3.3 \
 		same-file-1.0.6 \
 		scopeguard-1.2.0 \
-		scribe-0.8.1 \
+		scribe-0.8.4 \
 		serde-1.0.188 \
 		serde_derive-1.0.188 \
 		serde_json-1.0.106 \
@@ -148,9 +149,9 @@ CARGO_CRATES=	addr2line-0.21.0 \
 		termion-2.0.1 \
 		thiserror-1.0.50 \
 		thiserror-impl-1.0.50 \
-		time-0.3.31 \
+		time-0.3.36 \
 		time-core-0.1.2 \
-		time-macros-0.2.16 \
+		time-macros-0.2.18 \
 		tinytemplate-1.2.1 \
 		tinyvec-1.6.0 \
 		tinyvec_macros-0.1.1 \
diff --git a/editors/amp/distinfo b/editors/amp/distinfo
index 4ddcc10270d9..ae785107c0d2 100644
--- a/editors/amp/distinfo
+++ b/editors/amp/distinfo
@@ -1,4 +1,4 @@
-TIMESTAMP = 1706028848
+TIMESTAMP = 1727422642
 SHA256 (rust/crates/addr2line-0.21.0.crate) = 8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb
 SIZE (rust/crates/addr2line-0.21.0.crate) = 40807
 SHA256 (rust/crates/adler-1.0.2.crate) = f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe
@@ -191,6 +191,8 @@ SHA256 (rust/crates/nix-0.24.3.crate) = fa52e972a9a719cecb6864fb88568781eb706bac
 SIZE (rust/crates/nix-0.24.3.crate) = 266843
 SHA256 (rust/crates/nom-7.1.3.crate) = d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a
 SIZE (rust/crates/nom-7.1.3.crate) = 117570
+SHA256 (rust/crates/num-conv-0.1.0.crate) = 51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9
+SIZE (rust/crates/num-conv-0.1.0.crate) = 7444
 SHA256 (rust/crates/num-traits-0.2.16.crate) = f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2
 SIZE (rust/crates/num-traits-0.2.16.crate) = 50130
 SHA256 (rust/crates/num_cpus-1.16.0.crate) = 4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43
@@ -267,8 +269,8 @@ SHA256 (rust/crates/same-file-1.0.6.crate) = 93fc1dc3aaa9bfed95e02e6eadabb4baf7e
 SIZE (rust/crates/same-file-1.0.6.crate) = 10183
 SHA256 (rust/crates/scopeguard-1.2.0.crate) = 94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49
 SIZE (rust/crates/scopeguard-1.2.0.crate) = 11619
-SHA256 (rust/crates/scribe-0.8.1.crate) = d8934e26d4a73e4c35c6a249cc7e0fe641b625269d9c1751f1eb9eb008df4b31
-SIZE (rust/crates/scribe-0.8.1.crate) = 30007
+SHA256 (rust/crates/scribe-0.8.4.crate) = fd47965aa23f73c90766fd1f408f7808cb06be8c404bd4e2fcea2b8f06048deb
+SIZE (rust/crates/scribe-0.8.4.crate) = 31797
 SHA256 (rust/crates/serde-1.0.188.crate) = cf9e0fcba69a370eed61bcf2b728575f726b50b55cba78064753d708ddc7549e
 SIZE (rust/crates/serde-1.0.188.crate) = 76230
 SHA256 (rust/crates/serde_derive-1.0.188.crate) = 4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2
@@ -299,12 +301,12 @@ SHA256 (rust/crates/thiserror-1.0.50.crate) = f9a7210f5c9a7156bb50aa36aed4c95afb
 SIZE (rust/crates/thiserror-1.0.50.crate) = 19414
 SHA256 (rust/crates/thiserror-impl-1.0.50.crate) = 266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8
 SIZE (rust/crates/thiserror-impl-1.0.50.crate) = 15357
-SHA256 (rust/crates/time-0.3.31.crate) = f657ba42c3f86e7680e53c8cd3af8abbe56b5491790b46e22e19c0d57463583e
-SIZE (rust/crates/time-0.3.31.crate) = 121762
+SHA256 (rust/crates/time-0.3.36.crate) = 5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885
+SIZE (rust/crates/time-0.3.36.crate) = 119805
 SHA256 (rust/crates/time-core-0.1.2.crate) = ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3
 SIZE (rust/crates/time-core-0.1.2.crate) = 7191
-SHA256 (rust/crates/time-macros-0.2.16.crate) = 26197e33420244aeb70c3e8c78376ca46571bc4e701e4791c2cd9f57dcb3a43f
-SIZE (rust/crates/time-macros-0.2.16.crate) = 24356
+SHA256 (rust/crates/time-macros-0.2.18.crate) = 3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf
+SIZE (rust/crates/time-macros-0.2.18.crate) = 24361
 SHA256 (rust/crates/tinytemplate-1.2.1.crate) = be4d6b5f19ff7664e8c98d03e2139cb510db9b0a60b55f8e8709b689d939b6bc
 SIZE (rust/crates/tinytemplate-1.2.1.crate) = 26490
 SHA256 (rust/crates/tinyvec-1.6.0.crate) = 87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50
@@ -435,5 +437,5 @@ SHA256 (rust/crates/xml-rs-0.7.0.crate) = 3c1cb601d29fe2c2ac60a2b2e5e293994d87a1
 SIZE (rust/crates/xml-rs-0.7.0.crate) = 50980
 SHA256 (rust/crates/yaml-rust-0.4.5.crate) = 56c1936c4cc7a1c9ab21a1ebb602eb942ba868cbd44a99cb7cdc5892335e1c85
 SIZE (rust/crates/yaml-rust-0.4.5.crate) = 47783
-SHA256 (jmacdonald-amp-0.7.0_GH0.tar.gz) = d77946c042df6c27941f6994877e0e62c71807f245b16b41cf00dbf8b3553731
-SIZE (jmacdonald-amp-0.7.0_GH0.tar.gz) = 412101
+SHA256 (jmacdonald-amp-0.7.1_GH0.tar.gz) = 59a65c2c4592eed188433fe7c4bf2ba84206f217bdafc5a2c7f97623f5607c12
+SIZE (jmacdonald-amp-0.7.1_GH0.tar.gz) = 415699
diff --git a/editors/amp/files/patch-rust-1.80.0 b/editors/amp/files/patch-rust-1.80.0
deleted file mode 100644
index 332b9f4f5e80..000000000000
--- a/editors/amp/files/patch-rust-1.80.0
+++ /dev/null
@@ -1,25 +0,0 @@
-From 5b0c627366babea1636b35db641c0fec964ddbd1 Mon Sep 17 00:00:00 2001
-From: David Tolnay <dtolnay@gmail.com>
-Date: Fri, 15 Mar 2024 20:47:22 -0700
-Subject: [PATCH] Delete identity conversion in format_description::parse_owned
- (#671)
-
----
- time/src/format_description/parse/mod.rs | 4 +---
- 1 file changed, 1 insertion(+), 3 deletions(-)
-
-diff --git a/time/src/format_description/parse/mod.rs b/time/src/format_description/parse/mod.rs
-index 1fcc577c9..22ca52591 100644
---- cargo-crates/time-0.3.31/src/format_description/parse/mod.rs.orig	2024-08-28 19:19:31 UTC
-+++ cargo-crates/time-0.3.31/src/format_description/parse/mod.rs
-@@ -80,9 +80,7 @@ pub fn parse_owned<const VERSION: usize>(
-     let mut lexed = lexer::lex::<VERSION>(s.as_bytes());
-     let ast = ast::parse::<_, VERSION>(&mut lexed);
-     let format_items = format_item::parse(ast);
--    let items = format_items
--        .map(|res| res.map(Into::into))
--        .collect::<Result<Box<_>, _>>()?;
-+    let items = format_items.collect::<Result<Box<_>, _>>()?;
-     Ok(items.into())
- }
- 



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