Skip to content

Commit a349be1

Browse files
committed
jj: update to use libgit2 1.9
Signed-off-by: Rui Chen <[email protected]>
1 parent bb68c1a commit a349be1

File tree

1 file changed

+9
-3
lines changed

1 file changed

+9
-3
lines changed

Formula/j/jj.rb

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ class Jj < Formula
44
url "https://github.com/jj-vcs/jj/archive/refs/tags/v0.25.0.tar.gz"
55
sha256 "3a99528539e414a3373f24eb46a0f153d4e52f7035bb06df47bd317a19912ea3"
66
license "Apache-2.0"
7-
revision 1
7+
revision 2
88
head "https://github.com/martinvonz/jj.git", branch: "main"
99

1010
bottle do
@@ -18,10 +18,16 @@ class Jj < Formula
1818

1919
depends_on "pkgconf" => :build
2020
depends_on "rust" => :build
21-
depends_on "libgit2@1.8" # needs https://github.com/rust-lang/git2-rs/issues/1109 to support libgit2 1.9
21+
depends_on "libgit2"
2222
depends_on "openssl@3"
2323
uses_from_macos "zlib"
2424

25+
# patch to use libgit2 1.9, upstream pr ref, https://github.com/jj-vcs/jj/pull/5315
26+
patch do
27+
url "https://github.com/jj-vcs/jj/commit/b4f936ac302ee835aa274e4dd186b436781d5d2f.patch?full_index=1"
28+
sha256 "7b2f84de2c6bbdce9934384af2f7f2d0b7f7116c4726aeef87581010cdf1564e"
29+
end
30+
2531
def install
2632
ENV["LIBGIT2_NO_VENDOR"] = "1"
2733

@@ -45,7 +51,7 @@ def check_binary_linkage(binary, library)
4551
assert_predicate testpath/".jj", :exist?
4652

4753
[
48-
Formula["libgit2@1.8"].opt_lib/shared_library("libgit2"),
54+
Formula["libgit2"].opt_lib/shared_library("libgit2"),
4955
Formula["openssl@3"].opt_lib/shared_library("libcrypto"),
5056
Formula["openssl@3"].opt_lib/shared_library("libssl"),
5157
].each do |library|

0 commit comments

Comments
 (0)