git: b7970a832d9e - main - textproc/meilisearch: Fix build with rust 1.80.0
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 04 Sep 2024 04:32:24 UTC
The branch main has been updated by ashish:
URL: https://cgit.FreeBSD.org/ports/commit/?id=b7970a832d9e227317b98b05aa5389d2b0d0b961
commit b7970a832d9e227317b98b05aa5389d2b0d0b961
Author: Vladyslav Movchan <vladislav.movchan@gmail.com>
AuthorDate: 2024-09-03 20:00:38 +0000
Commit: Ashish SHUKLA <ashish@FreeBSD.org>
CommitDate: 2024-09-04 04:28:09 +0000
textproc/meilisearch: Fix build with rust 1.80.0
PR: 281254
---
textproc/meilisearch/Makefile | 2 +-
...s_time-0.3.34_src_format__description_parse_mod.rs | 19 +++++++++++++++++++
2 files changed, 20 insertions(+), 1 deletion(-)
diff --git a/textproc/meilisearch/Makefile b/textproc/meilisearch/Makefile
index 253bfe78b95c..8ef43a58af57 100644
--- a/textproc/meilisearch/Makefile
+++ b/textproc/meilisearch/Makefile
@@ -1,7 +1,7 @@
PORTNAME= meilisearch
DISTVERSIONPREFIX= v
DISTVERSION= 1.9.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= textproc
MASTER_SITES= https://github.com/meilisearch/mini-dashboard/releases/download/v${DASHBOARD_VERSION}/build.zip?dummy=/:mini_dashboard_assets \
https://dlwqk3ibdg1xh.cloudfront.net/:dic_upstream \
diff --git a/textproc/meilisearch/files/patch-cargo-crates_time-0.3.34_src_format__description_parse_mod.rs b/textproc/meilisearch/files/patch-cargo-crates_time-0.3.34_src_format__description_parse_mod.rs
new file mode 100644
index 000000000000..9f7deb98165f
--- /dev/null
+++ b/textproc/meilisearch/files/patch-cargo-crates_time-0.3.34_src_format__description_parse_mod.rs
@@ -0,0 +1,19 @@
+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)
+
+--- cargo-crates/time-0.3.34/src/format_description/parse/mod.rs.orig 2006-07-24 01:21:28 UTC
++++ cargo-crates/time-0.3.34/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())
+ }
+