@@ -4,7 +4,7 @@ class Fselect < Formula
44 url "https://github.com/jhspetersson/fselect/archive/refs/tags/0.8.8.tar.gz"
55 sha256 "0f586c3870a66d4a3ab7b92409dcf0f68a23bd8031ec0cc3f1622efebe190c9e"
66 license any_of : [ "Apache-2.0" , "MIT" ]
7- revision 1
7+ revision 2
88
99 bottle do
1010 sha256 cellar : :any , arm64_sequoia : "9312998702ee83c806f9b8a81680b134a5b0673de1bfcb19e0d3e623e9c05fcf"
@@ -18,12 +18,15 @@ class Fselect < Formula
1818 depends_on "cmake" => :build # for libz-ng-sys
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
2424 uses_from_macos "bzip2"
2525 uses_from_macos "zlib"
2626
27+ # libgit2 1.9 build patch
28+ patch :DATA
29+
2730 def install
2831 ENV [ "LIBGIT2_NO_VENDOR" ] = "1"
2932 # Ensure the correct `openssl` will be picked up.
@@ -47,7 +50,7 @@ def check_binary_linkage(binary, library)
4750 assert_match "test.txt" , shell_output ( cmd ) . chomp
4851
4952 linked_libraries = [
50- Formula [ "libgit2@1.8 " ] . opt_lib /shared_library ( "libgit2" ) ,
53+ Formula [ "libgit2" ] . opt_lib /shared_library ( "libgit2" ) ,
5154 Formula [ "openssl@3" ] . opt_lib /shared_library ( "libcrypto" ) ,
5255 Formula [ "openssl@3" ] . opt_lib /shared_library ( "libssl" ) ,
5356 ]
@@ -58,3 +61,46 @@ def check_binary_linkage(binary, library)
5861 end
5962 end
6063end
64+
65+ __END__
66+ diff --git a/Cargo.lock b/Cargo.lock
67+ index 1df37fd..3845112 100644
68+ --- a/Cargo.lock
69+ +++ b/Cargo.lock
70+ @@ -650,9 +650,9 @@ checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f"
71+
72+ [[package]]
73+ name = "git2"
74+ -version = "0.19.0"
75+ +version = "0.20.0"
76+ source = "registry+https://github.com/rust-lang/crates.io-index"
77+ -checksum = "b903b73e45dc0c6c596f2d37eccece7c1c8bb6e4407b001096387c63d0d93724"
78+ +checksum = "3fda788993cc341f69012feba8bf45c0ba4f3291fcc08e214b4d5a7332d88aff"
79+ dependencies = [
80+ "bitflags 2.6.0",
81+ "libc",
82+ @@ -1074,9 +1074,9 @@ checksum = "5aaeb2981e0606ca11d79718f8bb01164f1d6ed75080182d3abf017e6d244b6d"
83+
84+ [[package]]
85+ name = "libgit2-sys"
86+ -version = "0.17.0+1.8.1"
87+ +version = "0.18.0+1.9.0"
88+ source = "registry+https://github.com/rust-lang/crates.io-index"
89+ -checksum = "10472326a8a6477c3c20a64547b0059e4b0d086869eee31e6d7da728a8eb7224"
90+ +checksum = "e1a117465e7e1597e8febea8bb0c410f1c7fb93b1e1cddf34363f8390367ffec"
91+ dependencies = [
92+ "cc",
93+ "libc",
94+ diff --git a/Cargo.toml b/Cargo.toml
95+ index ff8c0f0..abb5a71 100644
96+ --- a/Cargo.toml
97+ +++ b/Cargo.toml
98+ @@ -23,7 +23,7 @@ chrono = "0.4"
99+ chrono-english = "0.1"
100+ csv = "1.0"
101+ directories = "5.0"
102+ -git2 = "0.19.0"
103+ +git2 = "0.20.0"
104+ human-time = "0.1.6"
105+ humansize = "2.0"
106+ imagesize = "0.13"
0 commit comments