summaryrefslogtreecommitdiff
path: root/textproc/ripgrep/files
diff options
context:
space:
mode:
authorMikael Urankar <mikael@FreeBSD.org>2023-11-28 16:21:06 +0100
committerMikael Urankar <mikael@FreeBSD.org>2024-01-08 14:00:38 +0100
commit54fa4cc8446424f9c3601ca39c789bdad38bb5ee (patch)
treebbc6516eecaffdb6743e18a7a44f353cd4275e5a /textproc/ripgrep/files
parentnet-mgmt/unifi8: Update to 8.0.26 (diff)
textproc/ripgrep: Update to 14.0.3
Changes: https://github.com/BurntSushi/ripgrep/releases/tag/14.0.0 https://github.com/BurntSushi/ripgrep/releases/tag/14.0.1 https://github.com/BurntSushi/ripgrep/releases/tag/14.0.2 https://github.com/BurntSushi/ripgrep/releases/tag/14.0.3 PR: 275408 Approved by: Petteri Valkonen (maintainer)
Diffstat (limited to 'textproc/ripgrep/files')
-rw-r--r--textproc/ripgrep/files/patch-crates_grep_src_lib.rs11
-rw-r--r--textproc/ripgrep/files/patch-powerpc72
-rw-r--r--textproc/ripgrep/files/patch-rust-1.6366
-rw-r--r--textproc/ripgrep/files/patch-rust-1.73.083
4 files changed, 0 insertions, 232 deletions
diff --git a/textproc/ripgrep/files/patch-crates_grep_src_lib.rs b/textproc/ripgrep/files/patch-crates_grep_src_lib.rs
deleted file mode 100644
index b7e972ec3a57..000000000000
--- a/textproc/ripgrep/files/patch-crates_grep_src_lib.rs
+++ /dev/null
@@ -1,11 +0,0 @@
---- crates/grep/src/lib.rs.orig 2023-07-19 16:11:20 UTC
-+++ crates/grep/src/lib.rs
-@@ -12,7 +12,7 @@ A cookbook and a guide are planned.
- A cookbook and a guide are planned.
- */
-
--#![deny(missing_docs)]
-+//#![deny(missing_docs)]
-
- pub extern crate grep_cli as cli;
- pub extern crate grep_matcher as matcher;
diff --git a/textproc/ripgrep/files/patch-powerpc b/textproc/ripgrep/files/patch-powerpc
deleted file mode 100644
index 36a4f8b168e6..000000000000
--- a/textproc/ripgrep/files/patch-powerpc
+++ /dev/null
@@ -1,72 +0,0 @@
---- cargo-crates/libc-0.2.97/src/unix/bsd/freebsdlike/freebsd/mod.rs.orig 2020-03-17 20:35:43 UTC
-+++ cargo-crates/libc-0.2.97/src/unix/bsd/freebsdlike/freebsd/mod.rs
-@@ -1486,6 +1486,9 @@ cfg_if! {
- } else if #[cfg(target_arch = "powerpc64")] {
- mod powerpc64;
- pub use self::powerpc64::*;
-+ } else if #[cfg(target_arch = "powerpc")] {
-+ mod powerpc;
-+ pub use self::powerpc::*;
- } else {
- // Unknown target_arch
- }
---- cargo-crates/libc-0.2.97/src/unix/bsd/freebsdlike/freebsd/powerpc.rs.orig 2021-06-23 22:40:24 UTC
-+++ cargo-crates/libc-0.2.97/src/unix/bsd/freebsdlike/freebsd/powerpc.rs
-@@ -0,0 +1,47 @@
-+pub type c_char = u8;
-+pub type c_long = i32;
-+pub type c_ulong = u32;
-+pub type wchar_t = i32;
-+pub type time_t = i64;
-+pub type suseconds_t = i32;
-+pub type register_t = i32;
-+
-+s! {
-+ pub struct stat {
-+ pub st_dev: ::dev_t,
-+ pub st_ino: ::ino_t,
-+ pub st_mode: ::mode_t,
-+ pub st_nlink: ::nlink_t,
-+ pub st_uid: ::uid_t,
-+ pub st_gid: ::gid_t,
-+ pub st_rdev: ::dev_t,
-+ pub st_atime: ::time_t,
-+ pub st_atime_nsec: ::c_long,
-+ pub st_mtime: ::time_t,
-+ pub st_mtime_nsec: ::c_long,
-+ pub st_ctime: ::time_t,
-+ pub st_ctime_nsec: ::c_long,
-+ pub st_size: ::off_t,
-+ pub st_blocks: ::blkcnt_t,
-+ pub st_blksize: ::blksize_t,
-+ pub st_flags: ::fflags_t,
-+ pub st_gen: u32,
-+ pub st_lspare: i32,
-+ pub st_birthtime: ::time_t,
-+ pub st_birthtime_nsec: ::c_long,
-+ }
-+}
-+
-+// should be pub(crate), but that requires Rust 1.18.0
-+cfg_if! {
-+ if #[cfg(libc_const_size_of)] {
-+ #[doc(hidden)]
-+ pub const _ALIGNBYTES: usize = ::mem::size_of::<::c_int>() - 1;
-+ } else {
-+ #[doc(hidden)]
-+ pub const _ALIGNBYTES: usize = 4 - 1;
-+ }
-+}
-+
-+pub const MAP_32BIT: ::c_int = 0x00080000;
-+pub const MINSIGSTKSZ: ::size_t = 2048; // 512 * 4
---- cargo-crates/crossbeam-utils-0.8.5/no_atomic.rs.orig 2021-07-12 16:01:05.023177000 +0200
-+++ cargo-crates/crossbeam-utils-0.8.5/no_atomic.rs 2021-07-12 16:01:16.538869000 +0200
-@@ -30,6 +30,7 @@
- "mipsel-unknown-none",
- "mipsisa32r6-unknown-linux-gnu",
- "mipsisa32r6el-unknown-linux-gnu",
-+ "powerpc-unknown-freebsd",
- "powerpc-unknown-linux-gnu",
- "powerpc-unknown-linux-gnuspe",
- "powerpc-unknown-linux-musl",
diff --git a/textproc/ripgrep/files/patch-rust-1.63 b/textproc/ripgrep/files/patch-rust-1.63
deleted file mode 100644
index 2d7ce8f19d61..000000000000
--- a/textproc/ripgrep/files/patch-rust-1.63
+++ /dev/null
@@ -1,66 +0,0 @@
---- Cargo.lock.orig 2021-06-12 14:12:24 UTC
-+++ Cargo.lock
-@@ -62,12 +62,6 @@ name = "cfg-if"
-
- [[package]]
- name = "cfg-if"
--version = "0.1.10"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"
--
--[[package]]
--name = "cfg-if"
- version = "1.0.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
-@@ -90,7 +84,7 @@ dependencies = [
- source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "06ed27e177f16d65f0f0c22a213e17c696ace5dd64b14258b52f9417ccb52db4"
- dependencies = [
-- "cfg-if 1.0.0",
-+ "cfg-if",
- "crossbeam-utils",
- ]
-
-@@ -100,7 +94,7 @@ dependencies = [
- source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "d82cfc11ce7f2c3faef78d8a684447b40d503d9681acebed6cb728d45940c4db"
- dependencies = [
-- "cfg-if 1.0.0",
-+ "cfg-if",
- "lazy_static",
- ]
-
-@@ -110,7 +104,7 @@ dependencies = [
- source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "80df024fbc5ac80f87dfef0d9f5209a252f2a497f7f42944cff24d8253cac065"
- dependencies = [
-- "cfg-if 1.0.0",
-+ "cfg-if",
- "packed_simd_2",
- ]
-
-@@ -329,7 +323,7 @@ dependencies = [
- source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "51b9bbe6c47d51fc3e1a9b945965946b4c44142ab8792c50835a980d362c2710"
- dependencies = [
-- "cfg-if 1.0.0",
-+ "cfg-if",
- ]
-
- [[package]]
-@@ -365,11 +359,11 @@ name = "packed_simd_2"
-
- [[package]]
- name = "packed_simd_2"
--version = "0.3.5"
-+version = "0.3.8"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "0e64858a2d3733fdd61adfdd6da89aa202f7ff0e741d2fc7ed1e452ba9dc99d7"
-+checksum = "a1914cd452d8fccd6f9db48147b29fd4ae05bea9dc5d9ad578509f72415de282"
- dependencies = [
-- "cfg-if 0.1.10",
-+ "cfg-if",
- "libm",
- ]
-
diff --git a/textproc/ripgrep/files/patch-rust-1.73.0 b/textproc/ripgrep/files/patch-rust-1.73.0
deleted file mode 100644
index c80b7ea2c842..000000000000
--- a/textproc/ripgrep/files/patch-rust-1.73.0
+++ /dev/null
@@ -1,83 +0,0 @@
-From a79edf4cfc54aad30a5630b217645c4b8274d8f7 Mon Sep 17 00:00:00 2001
-From: Oli Scherer <git-spam-no-reply9815368754983@oli-obk.de>
-Date: Mon, 10 Jul 2023 09:46:53 +0000
-Subject: [PATCH] Stop using old-style `simd_shuffle`
-
----
- src/codegen/llvm.rs | 20 +++++++-------------
- 1 file changed, 7 insertions(+), 13 deletions(-)
-
-diff --git third_party/rust/packed_simd_2/src/codegen/llvm.rs third_party/rust/packed_simd_2/src/codegen/llvm.rs
-index b4c09849..bb482fac 100644
---- cargo-crates/packed_simd_2-0.3.8/src/codegen/llvm.rs
-+++ cargo-crates/packed_simd_2-0.3.8/src/codegen/llvm.rs
-@@ -5,14 +5,8 @@ use crate::sealed::Shuffle;
- #[allow(unused_imports)] // FIXME: spurious warning?
- use crate::sealed::Simd;
-
--// Shuffle intrinsics: expanded in users' crates, therefore public.
- extern "platform-intrinsic" {
-- pub fn simd_shuffle2<T, U>(x: T, y: T, idx: [u32; 2]) -> U;
-- pub fn simd_shuffle4<T, U>(x: T, y: T, idx: [u32; 4]) -> U;
-- pub fn simd_shuffle8<T, U>(x: T, y: T, idx: [u32; 8]) -> U;
-- pub fn simd_shuffle16<T, U>(x: T, y: T, idx: [u32; 16]) -> U;
-- pub fn simd_shuffle32<T, U>(x: T, y: T, idx: [u32; 32]) -> U;
-- pub fn simd_shuffle64<T, U>(x: T, y: T, idx: [u32; 64]) -> U;
-+ fn simd_shuffle<T, I, U>(x: T, y: T, idx: I) -> U;
- }
-
- #[allow(clippy::missing_safety_doc)]
-@@ -22,7 +16,7 @@ where
- T: Simd,
- <T as Simd>::Element: Shuffle<[u32; 2], Output = U>,
- {
-- simd_shuffle2(x, y, IDX)
-+ simd_shuffle(x, y, IDX)
- }
-
- #[allow(clippy::missing_safety_doc)]
-@@ -32,7 +26,7 @@ where
- T: Simd,
- <T as Simd>::Element: Shuffle<[u32; 4], Output = U>,
- {
-- simd_shuffle4(x, y, IDX)
-+ simd_shuffle(x, y, IDX)
- }
-
- #[allow(clippy::missing_safety_doc)]
-@@ -42,7 +36,7 @@ where
- T: Simd,
- <T as Simd>::Element: Shuffle<[u32; 8], Output = U>,
- {
-- simd_shuffle8(x, y, IDX)
-+ simd_shuffle(x, y, IDX)
- }
-
- #[allow(clippy::missing_safety_doc)]
-@@ -52,7 +46,7 @@ where
- T: Simd,
- <T as Simd>::Element: Shuffle<[u32; 16], Output = U>,
- {
-- simd_shuffle16(x, y, IDX)
-+ simd_shuffle(x, y, IDX)
- }
-
- #[allow(clippy::missing_safety_doc)]
-@@ -62,7 +56,7 @@ where
- T: Simd,
- <T as Simd>::Element: Shuffle<[u32; 32], Output = U>,
- {
-- simd_shuffle32(x, y, IDX)
-+ simd_shuffle(x, y, IDX)
- }
-
- #[allow(clippy::missing_safety_doc)]
-@@ -72,7 +66,7 @@ where
- T: Simd,
- <T as Simd>::Element: Shuffle<[u32; 64], Output = U>,
- {
-- simd_shuffle64(x, y, IDX)
-+ simd_shuffle(x, y, IDX)
- }
-
- extern "platform-intrinsic" {