Merge pull request #203731 from Homebrew/git-workspace-libgit2-1.9

git-workspace: update to use libgit2 1.9
Homebrew · Jan 9, 2025 · 96ec349 · 96ec349
2 parents a779c21 + 6b2433b
commit 96ec349
Showing 1 changed file with 15 additions and 9 deletions.
diff --git a/Formula/g/git-workspace.rb b/Formula/g/git-workspace.rb
@@ -4,22 +4,28 @@ class GitWorkspace < Formula
   url "https://github.com/orf/git-workspace/archive/refs/tags/v1.8.0.tar.gz"
   sha256 "b6499b70362730dbe1674fd07bd9aefef0bcd45ba4504ed0cce62ef2c7ecad1f"
   license "MIT"
-  revision 1
+  revision 2
 
   bottle do
-    sha256 cellar: :any,                 arm64_sequoia: "7e3014c3ae6e598214600ff258e9feff56f15c8e7c9adca97531b3b0da45f741"
-    sha256 cellar: :any,                 arm64_sonoma:  "5fd7c6693cd59d753d788b3b0f4db497fe9a881f985177301207b1fc71c0b71a"
-    sha256 cellar: :any,                 arm64_ventura: "91dcb531a3afab0d3f095eee50f31952c533c1805f0546311b85445da48163bf"
-    sha256 cellar: :any,                 sonoma:        "5539681a422dd24fabd97d4bde87a260db8c36db20ded02801d26e3c2f9241e8"
-    sha256 cellar: :any,                 ventura:       "bb9928d297f3534b54774f21ef1114326af4e9743ad7a4e26b1b5dc80337354c"
-    sha256 cellar: :any_skip_relocation, x86_64_linux:  "28872e2b1ca35ed93e46dad8f7cce54dbc0941073151c00a67040c2bbb59d6c0"
+    sha256 cellar: :any,                 arm64_sequoia: "37536ae9e70e4244174267114d5727b34d002276e3daaf09ab03eea059288915"
+    sha256 cellar: :any,                 arm64_sonoma:  "bd263f8dcf6df3bc14102c2300a2735c07e3ca4d03e89d6b461c1266f64bc993"
+    sha256 cellar: :any,                 arm64_ventura: "5063d18c73c5f99151cfb9c7bf9f057e401264104c2106198bdaf9d4ae1e1dad"
+    sha256 cellar: :any,                 sonoma:        "6a6a2b672032b44124896ae6d4817e9a8b4e86a69fa8fedc7eb15f28832cf4ed"
+    sha256 cellar: :any,                 ventura:       "5223e5ff55ff03b1aa3e6ba8621da0351156424bc6cb6657b0ffbed528a6414d"
+    sha256 cellar: :any_skip_relocation, x86_64_linux:  "a4cd16d0a2c3941d7abc2fd59a437ff96fd62b4f6dd552d52f1a8af4b8286c32"
   end
 
   depends_on "pkgconf" => :build
   depends_on "rust" => :build
-  depends_on "libgit2@1.8" # needs https://github.com/rust-lang/git2-rs/issues/1109 to support libgit2 1.9
+  depends_on "libgit2"
   depends_on "openssl@3"
 
+  # patch to support libgit2 1.9, upstream pr ref, https://github.com/orf/git-workspace/pull/390
+  patch do
+    url "https://github.com/orf/git-workspace/commit/9250483b38f24ac60a025ddcd49b21f847d37b60.patch?full_index=1"
+    sha256 "3d8201522021b5aacfb9b332c02ddac4c1ca409857cbe4acca226f229fd5ae8f"
+  end
+
   def install
     ENV["LIBGIT2_NO_VENDOR"] = "1"
     system "cargo", "install", *std_cargo_args
@@ -36,7 +42,7 @@ def install
     linkage_with_libgit2 = (bin/"git-workspace").dynamically_linked_libraries.any? do |dll|
       next false unless dll.start_with?(HOMEBREW_PREFIX.to_s)
 
-      File.realpath(dll) == (Formula["libgit2@1.8"].opt_lib/shared_library("libgit2")).realpath.to_s
+      File.realpath(dll) == (Formula["libgit2"].opt_lib/shared_library("libgit2")).realpath.to_s
     end
 
     assert linkage_with_libgit2, "No linkage with libgit2! Cargo is likely using a vendored version."