From c80f63b9f83030161aef12d633788749e2948e88 Mon Sep 17 00:00:00 2001 From: Carlo Cabrera <30379873+carlocab@users.noreply.github.com> Date: Mon, 19 Aug 2024 13:12:40 +0800 Subject: [PATCH 1/4] lz4: fix Cellar reference in `.pc` file This breaks dependents when they hard-code references to lz4's Cellar path. --- Formula/l/lz4.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Formula/l/lz4.rb b/Formula/l/lz4.rb index 701b3fd81756b..63e0695c069b1 100644 --- a/Formula/l/lz4.rb +++ b/Formula/l/lz4.rb @@ -25,6 +25,8 @@ class Lz4 < Formula def install system "make", "install", "PREFIX=#{prefix}" + # Prevent dependents from hardcoding Cellar paths. + inreplace lib/"pkgconfig/liblz4.pc", prefix, opt_prefix end test do From ecd02e5bbfaf5d0671db9d3217829b3ffd4dbdc6 Mon Sep 17 00:00:00 2001 From: Carlo Cabrera <30379873+carlocab@users.noreply.github.com> Date: Mon, 19 Aug 2024 13:14:32 +0800 Subject: [PATCH 2/4] flann: revision bump (lz4 1.10.0) --- Formula/f/flann.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Formula/f/flann.rb b/Formula/f/flann.rb index 586ab89e86dd0..a211d7a09d8bc 100644 --- a/Formula/f/flann.rb +++ b/Formula/f/flann.rb @@ -4,7 +4,7 @@ class Flann < Formula url "https://github.com/flann-lib/flann/archive/refs/tags/1.9.2.tar.gz" sha256 "e26829bb0017f317d9cc45ab83ddcb8b16d75ada1ae07157006c1e7d601c8824" license "BSD-3-Clause" - revision 1 + revision 2 bottle do sha256 cellar: :any, arm64_sonoma: "0fab1e551748ea6c3baca0dc9d9ce5655a44f95129bc2c6cb7f6c9aa5b30be2e" From 149b58146e7c679d72c5be601c76b6cf0e72ecdc Mon Sep 17 00:00:00 2001 From: Carlo Cabrera <30379873+carlocab@users.noreply.github.com> Date: Mon, 19 Aug 2024 10:48:17 +0000 Subject: [PATCH 3/4] flann: update 1.9.2_2 bottle. --- Formula/f/flann.rb | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/Formula/f/flann.rb b/Formula/f/flann.rb index a211d7a09d8bc..1fcfa20e9c826 100644 --- a/Formula/f/flann.rb +++ b/Formula/f/flann.rb @@ -7,15 +7,13 @@ class Flann < Formula revision 2 bottle do - sha256 cellar: :any, arm64_sonoma: "0fab1e551748ea6c3baca0dc9d9ce5655a44f95129bc2c6cb7f6c9aa5b30be2e" - sha256 cellar: :any, arm64_ventura: "d423c6646420608d8d584b103e4cbc256f9d50238d586552df14bafa52487b2f" - sha256 cellar: :any, arm64_monterey: "747545821546c23623ec802d3c164e4f181624f3a1d15e644042849906bdfb7e" - sha256 cellar: :any, arm64_big_sur: "8712a0e27d6f169930b9ac66f82c904b7dece00c62ed467ce437a6d8e5109373" - sha256 cellar: :any, sonoma: "f3d6620ad52a9f87af013e11c0658255a6afd6bbe27832f119262ca68166c8b5" - sha256 cellar: :any, ventura: "ad4d33f860f42a3a4d21f803795ad2b3e96098eebbe7070644bb8743c131facc" - sha256 cellar: :any, monterey: "5ce0d7afdeb2958245953b190782f4e3db5b952d1ded939c82f17f419486cd1a" - sha256 cellar: :any, big_sur: "7aa9a99700760a0314c74bdb96c86538fce13444f30be5d1f53ce1ff9700adbe" - sha256 cellar: :any_skip_relocation, x86_64_linux: "be54a5e51865769fec93930f2a596c899bc451e4cbde4c4e139a0c1e8ce6e304" + sha256 cellar: :any, arm64_sonoma: "95cc1c8ebe8089d9f3b3cddcc4121b8758f27746f54ccb2a4e14120d31bced00" + sha256 cellar: :any, arm64_ventura: "b2c90010e7196565617ad2eece7f618f9e6ee94546e9712d45949574a510bf88" + sha256 cellar: :any, arm64_monterey: "72b11ab5cb95c3635aca8a29551ed61810a407fc03ab4cef01981c1edb5e8929" + sha256 cellar: :any, sonoma: "d9b4d3fc2e2bf9bfd4387ec0ebc63892946f32650cc6e6fc0428c80c46bb0de4" + sha256 cellar: :any, ventura: "c7530e21771003003ecbe1075341c8a2fbf6d126abee489b2c5531a8c4f46e0c" + sha256 cellar: :any, monterey: "226c0dc7a561f5860f667d2605fc9dfa22c535469eb9bc50ace723ed8f5a771b" + sha256 cellar: :any_skip_relocation, x86_64_linux: "9b54ae5296e98088861829c1b4a0bb994dddcf666c5e5f90814a6bc291bdacd4" end depends_on "cmake" => :build From 02fb15612ca09c0d7330deccb6e35a9c1590d98e Mon Sep 17 00:00:00 2001 From: Carlo Cabrera <30379873+carlocab@users.noreply.github.com> Date: Mon, 19 Aug 2024 10:48:18 +0000 Subject: [PATCH 4/4] lz4: update 1.10.0 bottle. --- Formula/l/lz4.rb | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/Formula/l/lz4.rb b/Formula/l/lz4.rb index 63e0695c069b1..abb2549208f08 100644 --- a/Formula/l/lz4.rb +++ b/Formula/l/lz4.rb @@ -14,13 +14,14 @@ class Lz4 < Formula end bottle do - sha256 cellar: :any, arm64_sonoma: "cf10ee811e95f338888acbb57ffaf269f1264ef906f037e045bfe66e97e74d7c" - sha256 cellar: :any, arm64_ventura: "bf458b5f3ae109a3512a4081708d22933bbbd18536e11641e86de957902dffa7" - sha256 cellar: :any, arm64_monterey: "3aa74a057067672ef332ea751e3e7cbe4364fbc501fdbc797cc4d9ea0425cbb3" - sha256 cellar: :any, sonoma: "05ee9befaf6fba64f9d0b96779d88dc7137cf126af7daae89177fe6a7743f85b" - sha256 cellar: :any, ventura: "1eb3faa150917c70c068c53bde3e092b2518b30387075ee61830903e8b53038b" - sha256 cellar: :any, monterey: "19f209768bc26606e925bff15f01e1af2fa586d3f1014dd124f671d600556896" - sha256 cellar: :any_skip_relocation, x86_64_linux: "eb6d36d225948f1089b94de15de8af8a0d9b089c62ba1644e8d9292028939d59" + rebuild 1 + sha256 cellar: :any, arm64_sonoma: "6590245dc4a919c46afa16366914cd4b5c0c4a8f4fb35a4f6ab89053f289ae5d" + sha256 cellar: :any, arm64_ventura: "03119aa78b7a96d4b8fde7553f5601ff104d59156aca4086a2af7aaec6cba5a4" + sha256 cellar: :any, arm64_monterey: "3ace9946a02899abcc0b8852863a62e70e1eec91deffa579512f0e6c493738a3" + sha256 cellar: :any, sonoma: "96c1ed07b013308a9c205a56c0232e45ae7da70e28200c9adb03ec78b294bffd" + sha256 cellar: :any, ventura: "c7bd3ba214fd8713268012f5bd71a95dee9623de0e373a38dc3426ea8b9293c3" + sha256 cellar: :any, monterey: "f78cc448808d04a0c31b108d7da962020e062179e29c7d0a2303db7866d8e449" + sha256 cellar: :any_skip_relocation, x86_64_linux: "a8082c2e40dc6d63850f43ea8fa095e55adf18fb0f25ec66bcaee2c4b4438205" end def install