Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

tmux-sessionizer: update to use libgit2 1.9 #203671

Merged
merged 2 commits into from
Jan 9, 2025
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
72 changes: 63 additions & 9 deletions Formula/t/tmux-sessionizer.rb
Original file line number Diff line number Diff line change
Expand Up @@ -4,25 +4,28 @@ class TmuxSessionizer < Formula
url "https://github.com/jrmoulton/tmux-sessionizer/archive/refs/tags/v0.4.4.tar.gz"
sha256 "9dfbe99a3c1fe7f48be0c1ab9056e49f36c4f85d023e24f874254f6791a9894e"
license "MIT"
revision 1
revision 2

bottle do
sha256 cellar: :any, arm64_sequoia: "4042bf4b217a95b253ea859c8c4426950ec8b0653fe873f8b5b2624399e36186"
sha256 cellar: :any, arm64_sonoma: "6d78bca70b4b810883e57ced9e19de3970f44e4817f7fc344f64f15b9c2598fd"
sha256 cellar: :any, arm64_ventura: "768a4b4e6037be396301f0dc9f121134034bd6388e800df6b3f68d1acc3a397a"
sha256 cellar: :any, sonoma: "a50d45fc6db7c4ce2f5190900adb7f278635d58dbdbb844e39c3d99f1dcea374"
sha256 cellar: :any, ventura: "b209c7ff2dd2e36422eda390fd21cab761b44b0378727de497068f9b8327c533"
sha256 cellar: :any_skip_relocation, x86_64_linux: "67cde82247503f1f870cfe96d88e70a55c91edbb14fb25cdc2098a90723f8ae1"
sha256 cellar: :any, arm64_sequoia: "36296ed7973d20aa0bb90e6b500a0136ed4f367553608f2c4dd1ef658345523f"
sha256 cellar: :any, arm64_sonoma: "53b15bddb62d79bde6f63a5cfc18910fee1e0c3f7201ee7c9dd1e0aab367ace9"
sha256 cellar: :any, arm64_ventura: "f0eadc021f990f7d2db80142244a4eb679aa1125984589e50b77b6d8a6d9c2a3"
sha256 cellar: :any, sonoma: "10ee6f3d53591391cb711b5ed9876bc152a4bdaddb9488ab0bd27315f6c98fc5"
sha256 cellar: :any, ventura: "9369b6cea10b3b085a0d92fd59dba3e9951ab319e378f1b4a47e02623b67a038"
sha256 cellar: :any_skip_relocation, x86_64_linux: "e65235329ebce9f8e96e603c471bcab6b377234c6a90171b837fce670f617ecf"
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 "libssh2"
depends_on "openssl@3"

uses_from_macos "zlib"

# patch to use libgit2 1.9, upstream pr ref, https://github.com/jrmoulton/tmux-sessionizer/pull/144
patch :DATA

def install
# Ensure that the `openssl` crate picks up the intended library.
ENV["OPENSSL_DIR"] = Formula["openssl@3"].opt_prefix
Expand All @@ -49,7 +52,7 @@ def check_binary_linkage(binary, library)
assert_match version.to_s, shell_output("#{bin}/tms --version")

[
Formula["libgit2@1.8"].opt_lib/shared_library("libgit2"),
Formula["libgit2"].opt_lib/shared_library("libgit2"),
Formula["libssh2"].opt_lib/shared_library("libssh2"),
Formula["openssl@3"].opt_lib/shared_library("libssl"),
Formula["openssl@3"].opt_lib/shared_library("libcrypto"),
Expand All @@ -59,3 +62,54 @@ def check_binary_linkage(binary, library)
end
end
end

__END__
diff --git a/Cargo.lock b/Cargo.lock
index 2274afd..18ec520 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1,6 +1,6 @@
# This file is automatically @generated by Cargo.
# It is not intended for manual editing.
-version = 3
+version = 4

[[package]]
name = "aho-corasick"
@@ -392,9 +392,9 @@ dependencies = [

[[package]]
name = "git2"
-version = "0.19.0"
+version = "0.20.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b903b73e45dc0c6c596f2d37eccece7c1c8bb6e4407b001096387c63d0d93724"
+checksum = "3fda788993cc341f69012feba8bf45c0ba4f3291fcc08e214b4d5a7332d88aff"
dependencies = [
"bitflags",
"libc",
@@ -496,9 +496,9 @@ checksum = "8e9489c2807c139ffd9c1794f4af0ebe86a828db53ecdc7fea2111d0fed085d1"

[[package]]
name = "libgit2-sys"
-version = "0.17.0+1.8.1"
+version = "0.18.0+1.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "10472326a8a6477c3c20a64547b0059e4b0d086869eee31e6d7da728a8eb7224"
+checksum = "e1a117465e7e1597e8febea8bb0c410f1c7fb93b1e1cddf34363f8390367ffec"
dependencies = [
"cc",
"libc",
diff --git a/Cargo.toml b/Cargo.toml
index d1ebcd4..bbf59e3 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -17,7 +17,7 @@ exclude = ["images/*"]

[dependencies]

-git2 = { version= "0.19", features = [ "vendored-openssl" ] }
+git2 = { version= "0.20", features = [ "vendored-openssl" ] }
clap = { version = "4.5", features = ["cargo", "derive"] }
serde_derive = "1.0"
serde = "1.0"
Loading