Merge pull request Homebrew#201229 from Homebrew/cfitsio-fix

cfitsio: fix pkgconfig path
andyhawks · Dec 15, 2024 · 16113ac · 16113ac
2 parents 5b804ca + 56fc18a
commit 16113ac
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 14 deletions.
diff --git a/Formula/c/cfitsio.rb b/Formula/c/cfitsio.rb
@@ -4,24 +4,31 @@ class Cfitsio < Formula
   url "https://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c/cfitsio-4.5.0.tar.gz"
   sha256 "e4854fc3365c1462e493aa586bfaa2f3d0bb8c20b75a524955db64c27427ce09"
   license "CFITSIO"
+  revision 1
 
   livecheck do
     url :homepage
     regex(/href=.*?cfitsio[._-]v?(\d+(?:\.\d+)+)\.t/i)
   end
 
   bottle do
-    sha256 cellar: :any,                 arm64_sequoia: "51a9f6adf5e55328d0d91199c0f5ac380e9e974a0f464c363697f371128947b3"
-    sha256 cellar: :any,                 arm64_sonoma:  "9d49c196f2c9d92d91687e1300c1c881f167971afe190fbce0198206af42c0f9"
-    sha256 cellar: :any,                 arm64_ventura: "2abbcb409ae95b067b962e680b9bf351248d71295dc709007dc56d16c277dfa4"
-    sha256 cellar: :any,                 sonoma:        "8bdc384b9c5f40ddb0c2a56e4dede3b7d010124a3d264057e016ce4f04a6f1fd"
-    sha256 cellar: :any,                 ventura:       "2f5cae21877f210e4b09cea1dd7bf25333710d53a27a1702265a08597af12067"
-    sha256 cellar: :any_skip_relocation, x86_64_linux:  "4f7005252adb0eecaa53ec23fe3f6d08c4505c1a1c69198c6838500bbd4c4664"
+    sha256 cellar: :any,                 arm64_sequoia: "e6139f7d1a4dfe717577e7226a84a1dd5d8d42040cc0a7c8354a75256b2b10d4"
+    sha256 cellar: :any,                 arm64_sonoma:  "1e7e4fda58375d9d078b921619e56faf26bd292929efe86d92b71eb87ff1d0b8"
+    sha256 cellar: :any,                 arm64_ventura: "d35c85a73544d6203d2b3f56ca42442df061a0a6e51c9a4afe3f98ca2d9345aa"
+    sha256 cellar: :any,                 sonoma:        "bd4d8e9a2605a35c33e104e61a9e698779b24436dcc034c71971b4710a6f9ddc"
+    sha256 cellar: :any,                 ventura:       "89f00358a0b2e72c71145d284ad6a87e9a83ad21bac6dafdf1030b486421f579"
+    sha256 cellar: :any_skip_relocation, x86_64_linux:  "4c62d02305a42040e5955fa82615f4b7be982d511cc166fbc85a0febbead1be5"
   end
 
   depends_on "cmake" => :build
   uses_from_macos "zlib"
 
+  # Fix pkg-config file location, should be removed on next release
+  patch do
+    url "https://github.com/HEASARC/cfitsio/commit/d2828ae5af42056bb4fde397f3205479d01a4cf1.patch?full_index=1"
+    sha256 "690d0bde53fc276f53b9a3f5d678ca1d03280fae7cfa84e7b59b87304fcdcb46"
+  end
+
   def install
     system "cmake", "-S", ".", "-B", "build", *std_cmake_args
     system "cmake", "--build", "build"

diff --git a/Formula/v/vips.rb b/Formula/v/vips.rb
@@ -11,13 +11,13 @@ class Vips < Formula
   end
 
   bottle do
-    rebuild 1
-    sha256 arm64_sequoia: "a29f5e97a297ea093c4a1516b76b44d389c6c08e213721beea24d38a77f644fe"
-    sha256 arm64_sonoma:  "03caa719e0ae47c6461ff1c4415c62b3cb7b4f06d7ce364d78c9d64477123fed"
-    sha256 arm64_ventura: "61345da3c9e08dd0d9ac3babd74d6f95c21fa565918a75bec92fe642f9a9ac76"
-    sha256 sonoma:        "93c1dc1ec9f93f931db8b1a214f0ad80383564c293d3e8f75b3c8a5719dfcff5"
-    sha256 ventura:       "83d9c9fb4e55d6c6912d97a24a6d672271748cfebb2070362991c718ab718bc2"
-    sha256 x86_64_linux:  "66b79e1b3205a38c5ee6dfdf7846a73a8c323aa235fb3024a0a45281d9d65140"
+    rebuild 2
+    sha256 arm64_sequoia: "d21c54f55b3a51f7a4fce360f996f8363d523b5a52ff37f93788d292e4fda75f"
+    sha256 arm64_sonoma:  "6160ce321b213ed0b4c323d6086742273e2814949943f7fa684b534513965bec"
+    sha256 arm64_ventura: "3f89494aca6ca8dcd2e1067c0ed1e775de4bcf633be4c1499ad1b7ebd0533da4"
+    sha256 sonoma:        "8969af30ed345a9a80215938dd02dae3158d61022cf2cefe8e017e5eb0e3e028"
+    sha256 ventura:       "b4d12ec545298204beeef2722f5dd914268176b5cdb6ece318b50aa578430381"
+    sha256 x86_64_linux:  "7d1acd4661c389afe2b37616d813a542e0b9d0cc58929c4868a5841d42e41815"
   end
 
   depends_on "gobject-introspection" => :build
@@ -58,7 +58,6 @@ class Vips < Formula
   def install
     # mozjpeg needs to appear before libjpeg, otherwise it's not used
     ENV.prepend_path "PKG_CONFIG_PATH", Formula["mozjpeg"].opt_lib/"pkgconfig"
-    ENV.prepend_path "PKG_CONFIG_PATH", Formula["cfitsio"].opt_lib/"pkgconfig"
 
     system "meson", "setup", "build", *std_meson_args
     system "meson", "compile", "-C", "build", "--verbose"