From c39367d63614c7f3b38a9f66fb7b0a3202526db5 Mon Sep 17 00:00:00 2001 From: icp Date: Fri, 19 May 2023 00:33:24 +0530 Subject: [PATCH] difftastic: update to 0.47.0. Closes: #43930 [via git-merge-pr] --- .../patches/remove-inapplicable-tests.patch | 36 ------------------- srcpkgs/difftastic/template | 8 +++-- 2 files changed, 6 insertions(+), 38 deletions(-) delete mode 100644 srcpkgs/difftastic/patches/remove-inapplicable-tests.patch diff --git a/srcpkgs/difftastic/patches/remove-inapplicable-tests.patch b/srcpkgs/difftastic/patches/remove-inapplicable-tests.patch deleted file mode 100644 index 6b92b40fc2a..00000000000 --- a/srcpkgs/difftastic/patches/remove-inapplicable-tests.patch +++ /dev/null @@ -1,36 +0,0 @@ -From: Wilfred Hughes -Date: Fri, 31 Mar 2023 08:19:23 -0700 -Subject: [PATCH] Remove tests that no longer apply after 8b842387a - ---- - src/lines.rs | 10 ---------- - 1 file changed, 10 deletions(-) - -diff --git a/src/lines.rs b/src/lines.rs -index 6dcb67d7e..7b670ec05 100644 ---- a/src/lines.rs -+++ b/src/lines.rs -@@ -298,11 +298,6 @@ mod tests { - assert_eq!(codepoint_len("ƒoo"), 3); - } - -- #[test] -- fn test_split_line_empty() { -- assert_eq!(split_on_newlines(""), vec![""]); -- } -- - #[test] - fn test_split_line_single() { - assert_eq!(split_on_newlines("foo"), vec!["foo"]); -@@ -318,11 +313,6 @@ mod tests { - assert_eq!(split_on_newlines("foo\r\nbar"), vec!["foo", "bar"]); - } - -- #[test] -- fn test_split_line_with_trailing_newline() { -- assert_eq!(split_on_newlines("foo\nbar\n"), vec!["foo", "bar", ""]); -- } -- - #[test] - fn test_is_all_whiteapce() { - assert!(is_all_whitespace(" \n\t")); diff --git a/srcpkgs/difftastic/template b/srcpkgs/difftastic/template index d9a93ff6e81..4462c382642 100644 --- a/srcpkgs/difftastic/template +++ b/srcpkgs/difftastic/template @@ -1,6 +1,6 @@ # Template file for 'difftastic' pkgname=difftastic -version=0.46.0 +version=0.47.0 revision=1 build_style=cargo short_desc="Structural diff tool that understands syntax" @@ -9,7 +9,7 @@ license="MIT" homepage="https://difftastic.wilfred.me.uk" changelog="https://raw.githubusercontent.com/Wilfred/difftastic/master/CHANGELOG.md" distfiles="https://static.crates.io/crates/difftastic/difftastic-${version}.crate" -checksum=1e443445ea9d68d1538b6ad00d9eadfe5c382392b32c78034714ef7f6a3463ce +checksum=88178b3bb1f9d07d06abb7afc6374b4b5e0db5cb3563f13929a2fd61b6b99499 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then makedepends+=" libatomic-devel" @@ -19,6 +19,10 @@ if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then fi fi +pre_build() { + cargo update --package crossbeam-channel@0.5.4 --precise 0.5.8 # yanked +} + post_install() { vlicense LICENSE }