Skip to content

Commit 96ec349

Browse files
authored
Merge pull request #203731 from Homebrew/git-workspace-libgit2-1.9
git-workspace: update to use libgit2 1.9
2 parents a779c21 + 6b2433b commit 96ec349

File tree

1 file changed

+15
-9
lines changed

1 file changed

+15
-9
lines changed

Formula/g/git-workspace.rb

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,22 +4,28 @@ class GitWorkspace < Formula
44
url "https://github.com/orf/git-workspace/archive/refs/tags/v1.8.0.tar.gz"
55
sha256 "b6499b70362730dbe1674fd07bd9aefef0bcd45ba4504ed0cce62ef2c7ecad1f"
66
license "MIT"
7-
revision 1
7+
revision 2
88

99
bottle do
10-
sha256 cellar: :any, arm64_sequoia: "7e3014c3ae6e598214600ff258e9feff56f15c8e7c9adca97531b3b0da45f741"
11-
sha256 cellar: :any, arm64_sonoma: "5fd7c6693cd59d753d788b3b0f4db497fe9a881f985177301207b1fc71c0b71a"
12-
sha256 cellar: :any, arm64_ventura: "91dcb531a3afab0d3f095eee50f31952c533c1805f0546311b85445da48163bf"
13-
sha256 cellar: :any, sonoma: "5539681a422dd24fabd97d4bde87a260db8c36db20ded02801d26e3c2f9241e8"
14-
sha256 cellar: :any, ventura: "bb9928d297f3534b54774f21ef1114326af4e9743ad7a4e26b1b5dc80337354c"
15-
sha256 cellar: :any_skip_relocation, x86_64_linux: "28872e2b1ca35ed93e46dad8f7cce54dbc0941073151c00a67040c2bbb59d6c0"
10+
sha256 cellar: :any, arm64_sequoia: "37536ae9e70e4244174267114d5727b34d002276e3daaf09ab03eea059288915"
11+
sha256 cellar: :any, arm64_sonoma: "bd263f8dcf6df3bc14102c2300a2735c07e3ca4d03e89d6b461c1266f64bc993"
12+
sha256 cellar: :any, arm64_ventura: "5063d18c73c5f99151cfb9c7bf9f057e401264104c2106198bdaf9d4ae1e1dad"
13+
sha256 cellar: :any, sonoma: "6a6a2b672032b44124896ae6d4817e9a8b4e86a69fa8fedc7eb15f28832cf4ed"
14+
sha256 cellar: :any, ventura: "5223e5ff55ff03b1aa3e6ba8621da0351156424bc6cb6657b0ffbed528a6414d"
15+
sha256 cellar: :any_skip_relocation, x86_64_linux: "a4cd16d0a2c3941d7abc2fd59a437ff96fd62b4f6dd552d52f1a8af4b8286c32"
1616
end
1717

1818
depends_on "pkgconf" => :build
1919
depends_on "rust" => :build
20-
depends_on "libgit2@1.8" # needs https://github.com/rust-lang/git2-rs/issues/1109 to support libgit2 1.9
20+
depends_on "libgit2"
2121
depends_on "openssl@3"
2222

23+
# patch to support libgit2 1.9, upstream pr ref, https://github.com/orf/git-workspace/pull/390
24+
patch do
25+
url "https://github.com/orf/git-workspace/commit/9250483b38f24ac60a025ddcd49b21f847d37b60.patch?full_index=1"
26+
sha256 "3d8201522021b5aacfb9b332c02ddac4c1ca409857cbe4acca226f229fd5ae8f"
27+
end
28+
2329
def install
2430
ENV["LIBGIT2_NO_VENDOR"] = "1"
2531
system "cargo", "install", *std_cargo_args
@@ -36,7 +42,7 @@ def install
3642
linkage_with_libgit2 = (bin/"git-workspace").dynamically_linked_libraries.any? do |dll|
3743
next false unless dll.start_with?(HOMEBREW_PREFIX.to_s)
3844

39-
File.realpath(dll) == (Formula["libgit2@1.8"].opt_lib/shared_library("libgit2")).realpath.to_s
45+
File.realpath(dll) == (Formula["libgit2"].opt_lib/shared_library("libgit2")).realpath.to_s
4046
end
4147

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

0 commit comments

Comments
 (0)