From db140665c57f709844badfb63f4dbba4201b66fc Mon Sep 17 00:00:00 2001 From: Michael Cho Date: Wed, 20 Nov 2024 23:43:32 -0500 Subject: [PATCH 01/14] sh4d0wup: migrate to `pkgconf` --- Formula/s/sh4d0wup.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Formula/s/sh4d0wup.rb b/Formula/s/sh4d0wup.rb index 6b2b04896549..7992180aa0da 100644 --- a/Formula/s/sh4d0wup.rb +++ b/Formula/s/sh4d0wup.rb @@ -15,7 +15,7 @@ class Sh4d0wup < Formula end depends_on "llvm" => :build - depends_on "pkg-config" => :build + depends_on "pkgconf" => :build depends_on "rust" => :build depends_on "pgpdump" => :test From 2d3fbc3b3e380d9302db6210e6de6f256291095b Mon Sep 17 00:00:00 2001 From: Michael Cho Date: Wed, 20 Nov 2024 23:44:03 -0500 Subject: [PATCH 02/14] shairport-sync: migrate to `pkgconf` --- Formula/s/shairport-sync.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Formula/s/shairport-sync.rb b/Formula/s/shairport-sync.rb index 2dfb05aa8165..2d9815f3da87 100644 --- a/Formula/s/shairport-sync.rb +++ b/Formula/s/shairport-sync.rb @@ -24,7 +24,7 @@ class ShairportSync < Formula depends_on "autoconf" => :build depends_on "automake" => :build - depends_on "pkg-config" => :build + depends_on "pkgconf" => :build depends_on "libao" depends_on "libconfig" depends_on "libdaemon" @@ -34,7 +34,7 @@ class ShairportSync < Formula depends_on "pulseaudio" def install - system "autoreconf", "-fvi" + system "autoreconf", "--force", "--install", "--verbose" args = %W[ --with-libdaemon --with-ssl=openssl From fb9c01ff97ec9d4f86e239b36db297c485327784 Mon Sep 17 00:00:00 2001 From: Michael Cho Date: Wed, 20 Nov 2024 23:44:28 -0500 Subject: [PATCH 03/14] shared-mime-info: migrate to `pkgconf` --- Formula/s/shared-mime-info.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Formula/s/shared-mime-info.rb b/Formula/s/shared-mime-info.rb index 3cecb0c21cd5..d3e28dc4c0ed 100644 --- a/Formula/s/shared-mime-info.rb +++ b/Formula/s/shared-mime-info.rb @@ -27,7 +27,7 @@ class SharedMimeInfo < Formula depends_on "itstool" => :build depends_on "meson" => :build depends_on "ninja" => :build - depends_on "pkg-config" => :build + depends_on "pkgconf" => :build depends_on "xmlto" => :build depends_on "glib" From 8c5e8de3718c1767e05fdfc98f46d5dd375fe1e3 Mon Sep 17 00:00:00 2001 From: Michael Cho Date: Wed, 20 Nov 2024 23:45:07 -0500 Subject: [PATCH 04/14] shibboleth-sp: migrate to `pkgconf` --- Formula/s/shibboleth-sp.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Formula/s/shibboleth-sp.rb b/Formula/s/shibboleth-sp.rb index bf428da16935..9356cb4ad5c8 100644 --- a/Formula/s/shibboleth-sp.rb +++ b/Formula/s/shibboleth-sp.rb @@ -19,7 +19,7 @@ class ShibbolethSp < Formula sha256 x86_64_linux: "0dd53cb012bdb80804df6c2ae04476966cc9f337b4e5b2df5ee5cdef9017191c" end - depends_on "pkg-config" => :build + depends_on "pkgconf" => :build depends_on "apr" depends_on "apr-util" From f0bac6689dcdc8447c740652fd54fd1abfdc86d9 Mon Sep 17 00:00:00 2001 From: Michael Cho Date: Wed, 20 Nov 2024 23:45:19 -0500 Subject: [PATCH 05/14] sigrok-cli: migrate to `pkgconf` --- Formula/s/sigrok-cli.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Formula/s/sigrok-cli.rb b/Formula/s/sigrok-cli.rb index 8b0d5ed83f97..d17f1e317c86 100644 --- a/Formula/s/sigrok-cli.rb +++ b/Formula/s/sigrok-cli.rb @@ -32,7 +32,7 @@ class SigrokCli < Formula depends_on "libtool" => :build end - depends_on "pkg-config" => :build + depends_on "pkgconf" => :build depends_on "glib" depends_on "libsigrok" depends_on "libsigrokdecode" From 6860c3fcacb8ad65b7824f5adce782bb09d1388f Mon Sep 17 00:00:00 2001 From: Michael Cho Date: Wed, 20 Nov 2024 23:45:59 -0500 Subject: [PATCH 06/14] sile: migrate to `pkgconf` --- Formula/s/sile.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Formula/s/sile.rb b/Formula/s/sile.rb index 52f3ddb25dd0..b9164f4c02c9 100644 --- a/Formula/s/sile.rb +++ b/Formula/s/sile.rb @@ -24,7 +24,7 @@ class Sile < Formula end depends_on "jq" => :build - depends_on "pkg-config" => :build + depends_on "pkgconf" => :build depends_on "poppler" => :build depends_on "rust" => :build From eba124e1eb734e2b33d4b0230b2b642767af94a3 Mon Sep 17 00:00:00 2001 From: Michael Cho Date: Wed, 20 Nov 2024 23:46:49 -0500 Subject: [PATCH 07/14] silicon: migrate to `pkgconf` --- Formula/s/silicon.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Formula/s/silicon.rb b/Formula/s/silicon.rb index 5eef8dd6622e..eb034744c740 100644 --- a/Formula/s/silicon.rb +++ b/Formula/s/silicon.rb @@ -20,7 +20,7 @@ class Silicon < Formula depends_on "harfbuzz" on_linux do - depends_on "pkg-config" => :build + depends_on "pkgconf" => :build depends_on "libxcb" depends_on "xclip" end @@ -30,7 +30,7 @@ def install end test do - (testpath/"test.rs").write <<~EOF + (testpath/"test.rs").write <<~RUST fn factorial(n: u64) -> u64 { match n { 0 => 1, @@ -41,10 +41,10 @@ def install fn main() { println!("10! = {}", factorial(10)); } - EOF + RUST system bin/"silicon", "-o", "output.png", "test.rs" - assert_predicate testpath/"output.png", :exist? + assert_path_exists testpath/"output.png" expected_size = [894, 630] assert_equal expected_size, File.read("output.png")[0x10..0x18].unpack("NN") end From b894062007fd10fb0169275b66ea8740f9b07302 Mon Sep 17 00:00:00 2001 From: Michael Cho Date: Wed, 20 Nov 2024 23:47:13 -0500 Subject: [PATCH 08/14] silk: migrate to `pkgconf` --- Formula/s/silk.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Formula/s/silk.rb b/Formula/s/silk.rb index e8dc4044a478..7a3d56a0fa70 100644 --- a/Formula/s/silk.rb +++ b/Formula/s/silk.rb @@ -19,7 +19,7 @@ class Silk < Formula sha256 x86_64_linux: "41438d609da5625f2a222397a1e8e5e85c82d2fe5aed69192e5b82394f52ebc0" end - depends_on "pkg-config" => :build + depends_on "pkgconf" => :build depends_on "glib" depends_on "libfixbuf" From e54c81a255b27e25e502e5cec772067d539ae902 Mon Sep 17 00:00:00 2001 From: Michael Cho Date: Wed, 20 Nov 2024 23:47:24 -0500 Subject: [PATCH 09/14] simple-mtpfs: migrate to `pkgconf` --- Formula/s/simple-mtpfs.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Formula/s/simple-mtpfs.rb b/Formula/s/simple-mtpfs.rb index d963c160e997..90c02f5459bc 100644 --- a/Formula/s/simple-mtpfs.rb +++ b/Formula/s/simple-mtpfs.rb @@ -13,7 +13,7 @@ class SimpleMtpfs < Formula depends_on "autoconf" => :build depends_on "autoconf-archive" => :build # required for AX_CXX_COMPILE_STDCXX_17 depends_on "automake" => :build - depends_on "pkg-config" => :build + depends_on "pkgconf" => :build depends_on "libfuse@2" depends_on "libmtp" depends_on "libusb" From b60e3cd88e0b76d17d06858f22c11e674566d7b0 Mon Sep 17 00:00:00 2001 From: Michael Cho Date: Wed, 20 Nov 2024 23:47:38 -0500 Subject: [PATCH 10/14] simple-scan: migrate to `pkgconf` --- Formula/s/simple-scan.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Formula/s/simple-scan.rb b/Formula/s/simple-scan.rb index 6f2c39da3cf7..5183125efcfe 100644 --- a/Formula/s/simple-scan.rb +++ b/Formula/s/simple-scan.rb @@ -20,7 +20,7 @@ class SimpleScan < Formula depends_on "itstool" => :build depends_on "meson" => :build depends_on "ninja" => :build - depends_on "pkg-config" => :build + depends_on "pkgconf" => :build depends_on "vala" => :build depends_on "cairo" From 7435d43313ca218cc0176c10164b8444f52e8162 Mon Sep 17 00:00:00 2001 From: Michael Cho Date: Wed, 20 Nov 2024 23:48:01 -0500 Subject: [PATCH 11/14] simple-tiles: migrate to `pkgconf` --- Formula/s/simple-tiles.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Formula/s/simple-tiles.rb b/Formula/s/simple-tiles.rb index cc6d0b8040e9..0c02319d76a7 100644 --- a/Formula/s/simple-tiles.rb +++ b/Formula/s/simple-tiles.rb @@ -16,7 +16,7 @@ class SimpleTiles < Formula sha256 cellar: :any_skip_relocation, x86_64_linux: "5b9bddf6bb8104fa5720df1b5a14e1f15710a09f04ccd9901555cc61bfd9d568" end - depends_on "pkg-config" => [:build, :test] + depends_on "pkgconf" => [:build, :test] depends_on "cairo" depends_on "gdal" @@ -59,7 +59,7 @@ def install return 0; } C - cflags = shell_output("pkg-config --cflags simple-tiles").chomp.split + cflags = shell_output("pkgconf --cflags simple-tiles").chomp.split system ENV.cc, "test.c", *cflags, "-L#{lib}", "-lsimple-tiles", "-o", "test" system "./test" end From cdd53b70e2940bfafb67033bca2fefb1239f34f4 Mon Sep 17 00:00:00 2001 From: Michael Cho Date: Wed, 20 Nov 2024 23:48:28 -0500 Subject: [PATCH 12/14] simutrans: migrate to `pkgconf` --- Formula/s/simutrans.rb | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/Formula/s/simutrans.rb b/Formula/s/simutrans.rb index df2ae27f4b98..0a09f5046017 100644 --- a/Formula/s/simutrans.rb +++ b/Formula/s/simutrans.rb @@ -27,7 +27,7 @@ class Simutrans < Formula end depends_on "cmake" => :build - depends_on "pkg-config" => :build + depends_on "pkgconf" => :build depends_on "fluid-synth" depends_on "fontconfig" depends_on "freetype" @@ -41,8 +41,6 @@ class Simutrans < Formula uses_from_macos "curl" uses_from_macos "zlib" - fails_with gcc: "5" - resource "pak64" do url "https://downloads.sourceforge.net/project/simutrans/pak64/124-2/simupak64-124-2.zip" sha256 "e690e4647a1a617032a3778a2457c8812cc4510afad0f5bf8524999468146d86" @@ -56,7 +54,7 @@ def install # These translations are dynamically generated. system "./tools/get_lang_files.sh" - system "cmake", "-B", "build", "-S", ".", *std_cmake_args, "-DSIMUTRANS_USE_REVISION=#{stable.specs[:revision]}" + system "cmake", "-B", "build", "-S", ".", "-DSIMUTRANS_USE_REVISION=#{stable.specs[:revision]}", *std_cmake_args system "cmake", "--build", "build" system "cmake", "--build", "build", "--target", "makeobj" system "cmake", "--build", "build", "--target", "nettool" From 1e79786771220488c963302d1ae6d8eb6fdf9497 Mon Sep 17 00:00:00 2001 From: Michael Cho Date: Wed, 20 Nov 2024 23:48:54 -0500 Subject: [PATCH 13/14] siril: migrate to `pkgconf` --- Formula/s/siril.rb | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Formula/s/siril.rb b/Formula/s/siril.rb index fd2241ea99af..d46aa63f5412 100644 --- a/Formula/s/siril.rb +++ b/Formula/s/siril.rb @@ -19,7 +19,7 @@ class Siril < Formula depends_on "cmake" => :build depends_on "meson" => :build depends_on "ninja" => :build - depends_on "pkg-config" => :build + depends_on "pkgconf" => :build depends_on "adwaita-icon-theme" depends_on "cairo" @@ -55,8 +55,6 @@ class Siril < Formula depends_on "libomp" end - fails_with gcc: "5" # ffmpeg is compiled with GCC - def install args = %w[ --force-fallback-for=kplot From f4996de7c67d0528d062712e01c69bab3a30e172 Mon Sep 17 00:00:00 2001 From: Michael Cho Date: Wed, 20 Nov 2024 23:49:18 -0500 Subject: [PATCH 14/14] sispmctl: migrate to `pkgconf` --- Formula/s/sispmctl.rb | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Formula/s/sispmctl.rb b/Formula/s/sispmctl.rb index b6cfadc1f0be..e6884ad44743 100644 --- a/Formula/s/sispmctl.rb +++ b/Formula/s/sispmctl.rb @@ -16,12 +16,11 @@ class Sispmctl < Formula sha256 x86_64_linux: "db43f15862bbace1e2af6f17b257da7d3522011d82f00fa581d78fea1faa47db" end - depends_on "pkg-config" => :build + depends_on "pkgconf" => :build depends_on "libusb-compat" def install - system "./configure", "--disable-dependency-tracking", - "--prefix=#{prefix}" + system "./configure", *std_configure_args system "make", "install" end