diff --git a/app-utils/ripgrep/autobuild/beyond b/app-utils/ripgrep/autobuild/beyond index bd2c1cf3930..3c8400d6595 100644 --- a/app-utils/ripgrep/autobuild/beyond +++ b/app-utils/ripgrep/autobuild/beyond @@ -1,11 +1,11 @@ -install -Dm644 complete/_rg \ - "$PKGDIR"/usr/share/zsh/site-functions/_rg -install -Dm644 target/release/build/ripgrep-*/out/rg.bash \ - "$PKGDIR"/usr/share/bash-completion/completions/rg -install -Dm644 target/release/build/ripgrep-*/out/rg.fish \ - "$PKGDIR"/usr/share/fish/completions/rg.fish +abinfo "Installing completions ..." +mkdir -pv "$PKGDIR"/usr/share/zsh/site-functions \ + "$PKGDIR"/usr/share/bash-completion/completions \ + "$PKGDIR"/usr/share/fish/completions +"$PKGDIR"/usr/bin/rg --generate complete-zsh > "$PKGDIR"/usr/share/zsh/site-functions/_rg +"$PKGDIR"/usr/bin/rg --generate complete-bash > "$PKGDIR"/usr/share/bash-completion/completions/rg +"$PKGDIR"/usr/bin/rg --generate complete-fish > "$PKGDIR"/usr/share/fish/completions/rg.fish -install -Dm644 "target/release/build/ripgrep-"*/out/rg.1 \ - "$PKGDIR"/usr/share/man/man1/rg.1 -install -Dm644 "README.md" \ - "$PKGDIR"/usr/share/doc/ripgrep/README.md +abinfo "Installing manpages ..." +mkdir -pv "$PKGDIR"/usr/share/man/man1 +"$PKGDIR"/usr/bin/rg --generate man > "$PKGDIR"/usr/share/man/man1/rg.1 diff --git a/app-utils/ripgrep/autobuild/patches/0001-allow-lower-rustc-version-compile.patch b/app-utils/ripgrep/autobuild/patches/0001-allow-lower-rustc-version-compile.patch new file mode 100644 index 00000000000..bafe518523b --- /dev/null +++ b/app-utils/ripgrep/autobuild/patches/0001-allow-lower-rustc-version-compile.patch @@ -0,0 +1,10 @@ +--- a/Cargo.toml 2023-11-29 02:30:11.062071693 +0000 ++++ b/Cargo.toml 2023-11-29 02:30:47.494164136 +0000 +@@ -24,7 +24,6 @@ + build = "build.rs" + autotests = false + edition = "2021" +-rust-version = "1.72" + + [[bin]] + bench = false diff --git a/app-utils/ripgrep/autobuild/patches/0001-enable-lto.patch b/app-utils/ripgrep/autobuild/patches/0001-enable-lto.patch deleted file mode 100644 index bd62c0e701a..00000000000 --- a/app-utils/ripgrep/autobuild/patches/0001-enable-lto.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/Cargo.toml 2020-12-24 21:25:59.697821751 -0800 -+++ b/Cargo.toml 2020-12-24 21:26:17.370050321 -0800 -@@ -78,6 +78,7 @@ - pcre2 = ["grep/pcre2"] - - [profile.release] -+lto = true - debug = 1 - - [package.metadata.deb] diff --git a/app-utils/ripgrep/spec b/app-utils/ripgrep/spec index 2d321603bcf..d52874c4466 100644 --- a/app-utils/ripgrep/spec +++ b/app-utils/ripgrep/spec @@ -1,5 +1,4 @@ -VER=13.0.0 -REL=10 -SRCS="tbl::https://github.com/BurntSushi/ripgrep/archive/$VER.tar.gz" -CHKSUMS="sha256::0fb17aaf285b3eee8ddab17b833af1e190d73de317ff9648751ab0660d763ed2" +VER=14.0.3 +SRCS="git::commit=tags/$VER::https://github.com/BurntSushi/ripgrep" +CHKSUMS="SKIP" CHKUPDATE="anitya::id=15461"