Skip to content

Commit b38dc93

Browse files
authored
Merge pull request #203668 from Homebrew/git-absorb-libgit2-1.9
git-absorb: update to use libgit2 1.9
2 parents 6b9848d + 8e1c879 commit b38dc93

File tree

1 file changed

+17
-9
lines changed

1 file changed

+17
-9
lines changed

Formula/g/git-absorb.rb

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,23 +7,31 @@ class GitAbsorb < Formula
77
revision 1
88

99
bottle do
10-
sha256 cellar: :any, arm64_sequoia: "30bdd79e994ae339882f9d9b758f808a430839e23d8f05cd165a3eca51e9825d"
11-
sha256 cellar: :any, arm64_sonoma: "633ec7dee3d9e2d67cb769cc40e4d98736ab0c3e3a0bb232462aba861ee47c4e"
12-
sha256 cellar: :any, arm64_ventura: "08385cd180f2c66dea7b196fd73afc5508f6e947f6e4ff3e45b1d2404d8d1b32"
13-
sha256 cellar: :any, sonoma: "b4b5c9c9f0f3ec884693cae8b837279d0b84cc3ad652598d29427ff22aceaa63"
14-
sha256 cellar: :any, ventura: "02bc3097f3b59424eab05c5e8df7184fb26896fad8050bdebc76c15324d26748"
15-
sha256 cellar: :any_skip_relocation, x86_64_linux: "55b65e73c6509e7cf7b4cfb2ca37f28f5d8df9f81859e82e80fd306b79fddb96"
10+
rebuild 1
11+
sha256 cellar: :any, arm64_sequoia: "678f0567eda10a1341972c676ad3c9433269609d5d8aeb03d2d899b015b85df2"
12+
sha256 cellar: :any, arm64_sonoma: "674145b9573fccdc080a3e61435cfe4e49f7ad939c48f58759ab088b3ce4decb"
13+
sha256 cellar: :any, arm64_ventura: "dda96ef119e6eabfe891707e7c049f0abb5ff6d9de1014597cc51ef5fa36febe"
14+
sha256 cellar: :any, sonoma: "aeaf6c2d75dd48a3eef2595dceec1edefbd7724e9ccf9e1acbaf7ae48ac6e65a"
15+
sha256 cellar: :any, ventura: "b7e617d3c205794b774a5ae137467e67ff1539f327ebedc1de287ad68b677e49"
16+
sha256 cellar: :any_skip_relocation, x86_64_linux: "0821ca7fbac6b09e07df65c0f8e74a3a5f04f5ddbbe1fa87eb5de0f3ca0327c5"
1617
end
1718

1819
depends_on "pkgconf" => :build
1920
depends_on "rust" => :build
20-
depends_on "[email protected]" # needs https://github.com/rust-lang/git2-rs/issues/1109 to support libgit2 1.9
21+
depends_on "libgit2"
22+
23+
# patch to use libgit2 1.9, upstream pr ref, https://github.com/tummychow/git-absorb/pull/138
24+
patch do
25+
url "https://github.com/tummychow/git-absorb/commit/a7d5688f426490a92b5bb73e3a2cfccc565747f8.patch?full_index=1"
26+
sha256 "cb6bf13ec90de7c434addf1467a259537d9a993f5d2481e6cba86b3543d38eed"
27+
end
2128

2229
def install
2330
ENV["LIBGIT2_NO_VENDOR"] = "1"
31+
2432
system "cargo", "install", *std_cargo_args
25-
man1.install "Documentation/git-absorb.1"
2633

34+
man1.install "Documentation/git-absorb.1"
2735
generate_completions_from_executable(bin/"git-absorb", "--gen-completions")
2836
end
2937

@@ -46,7 +54,7 @@ def install
4654
linkage_with_libgit2 = (bin/"git-absorb").dynamically_linked_libraries.any? do |dll|
4755
next false unless dll.start_with?(HOMEBREW_PREFIX.to_s)
4856

49-
File.realpath(dll) == (Formula["libgit2@1.8"].opt_lib/shared_library("libgit2")).realpath.to_s
57+
File.realpath(dll) == (Formula["libgit2"].opt_lib/shared_library("libgit2")).realpath.to_s
5058
end
5159

5260
assert linkage_with_libgit2, "No linkage with libgit2! Cargo is likely using a vendored version."

0 commit comments

Comments
 (0)