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

z*: migrate to pkgconf #197550

Merged
merged 15 commits into from
Nov 13, 2024
2 changes: 1 addition & 1 deletion Formula/z/zabbix.rb
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ class Zabbix < Formula
sha256 x86_64_linux: "d851e1afd7362e58ddb489d06f7990aafd7acc1ead3fa4758a3ebc964a8c4be2"
end

depends_on "pkg-config" => :build
depends_on "pkgconf" => :build
depends_on "openssl@3"
depends_on "pcre2"

Expand Down
4 changes: 1 addition & 3 deletions Formula/z/zbar.rb
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ class Zbar < Formula
depends_on "libtool" => :build
end

depends_on "pkg-config" => :build
depends_on "pkgconf" => :build
depends_on "xmlto" => :build

depends_on "imagemagick"
Expand All @@ -50,8 +50,6 @@ class Zbar < Formula
depends_on "dbus"
end

fails_with gcc: "5" # imagemagick is built with GCC

def install
ENV["XML_CATALOG_FILES"] = etc/"xml/catalog"

Expand Down
2 changes: 1 addition & 1 deletion Formula/z/zchunk.rb
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ class Zchunk < Formula

depends_on "meson" => :build
depends_on "ninja" => :build
depends_on "pkg-config" => :build
depends_on "pkgconf" => :build
depends_on "openssl@3"
depends_on "zstd"

Expand Down
2 changes: 1 addition & 1 deletion Formula/z/zenity.rb
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ class Zenity < Formula
depends_on "itstool" => :build
depends_on "meson" => :build
depends_on "ninja" => :build
depends_on "pkg-config" => :build
depends_on "pkgconf" => :build

depends_on "glib"
depends_on "gtk4"
Expand Down
4 changes: 2 additions & 2 deletions Formula/z/zeromq.rb
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ class Zeromq < Formula
end

depends_on "asciidoc" => :build
depends_on "pkg-config" => [:build, :test]
depends_on "pkgconf" => [:build, :test]
depends_on "xmlto" => :build

depends_on "libsodium"
Expand All @@ -49,7 +49,7 @@ def install
# https://github.com/Homebrew/homebrew-core/pull/35940#issuecomment-454177261

system "./autogen.sh" if build.head?
system "./configure", "--disable-dependency-tracking", "--prefix=#{prefix}", "--with-libsodium"
system "./configure", "--with-libsodium", *std_configure_args
system "make"
system "make", "install"
end
Expand Down
2 changes: 1 addition & 1 deletion Formula/z/zigmod.rb
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ class Zigmod < Formula
sha256 cellar: :any_skip_relocation, x86_64_linux: "41a39652f9ed4f90a02280a3064bfa9a16746fda7af518d886280e86dceeb068"
end

depends_on "pkg-config" => :build
depends_on "pkgconf" => :build
depends_on "zig"

def install
Expand Down
4 changes: 2 additions & 2 deletions Formula/z/zile.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
class Zile < Formula

Check warning on line 1 in Formula/z/zile.rb

View workflow job for this annotation

GitHub Actions / macOS 14-arm64

`brew linkage --cached --test --strict zile` failed on macOS Sonoma (14) on Apple Silicon!

gettext

Check warning on line 1 in Formula/z/zile.rb

View workflow job for this annotation

GitHub Actions / macOS 13-arm64

`brew linkage --cached --test --strict zile` failed on macOS Ventura (13) on Apple Silicon!

gettext

Check warning on line 1 in Formula/z/zile.rb

View workflow job for this annotation

GitHub Actions / macOS 15-arm64

`brew linkage --cached --test --strict zile` failed on macOS Sequoia (15) on Apple Silicon!

gettext

Check warning on line 1 in Formula/z/zile.rb

View workflow job for this annotation

GitHub Actions / macOS 14-x86_64

`brew linkage --cached --test --strict zile` failed on macOS Sonoma (14)!

gettext

Check warning on line 1 in Formula/z/zile.rb

View workflow job for this annotation

GitHub Actions / macOS 13-x86_64

`brew linkage --cached --test --strict zile` failed on macOS Ventura (13)!

gettext
desc "Text editor development kit"
homepage "https://www.gnu.org/software/zile/"
# Before bumping to a new version, check the NEWS file to make sure it is a
Expand Down Expand Up @@ -26,7 +26,7 @@
end

depends_on "help2man" => :build
depends_on "pkg-config" => :build
depends_on "pkgconf" => :build
depends_on "bdw-gc"
depends_on "glib"
depends_on "libgee"
Expand All @@ -38,7 +38,7 @@
# which causes src/eval.vala:87:32: error: incompatible function pointer types passing
ENV.append_to_cflags "-Wno-incompatible-function-pointer-types" if DevelopmentTools.clang_build_version >= 1500

system "./configure", "--disable-dependency-tracking", "--prefix=#{prefix}"
system "./configure", *std_configure_args
system "make", "install"
end

Expand Down
2 changes: 1 addition & 1 deletion Formula/z/zim.rb
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ class Zim < Formula
sha256 cellar: :any_skip_relocation, all: "f4824f56d36bfe7a27b6e5ca299247eb1e1a85416c112506303164ce6ac9f28f"
end

depends_on "pkg-config" => :build
depends_on "pkgconf" => :build
depends_on "adwaita-icon-theme"
depends_on "graphviz"
depends_on "gtk+3"
Expand Down
2 changes: 1 addition & 1 deletion Formula/z/zizmor.rb
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ class Zizmor < Formula
sha256 cellar: :any_skip_relocation, x86_64_linux: "b5f97ebc4657bba502de43e00a21177f858e1c2c91948b94ee051cfad331ecf3"
end

depends_on "pkg-config" => :build
depends_on "pkgconf" => :build
depends_on "rust" => :build

on_linux do
Expand Down
2 changes: 1 addition & 1 deletion Formula/z/zmap.rb
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ class Zmap < Formula
depends_on "byacc" => :build
depends_on "cmake" => :build
depends_on "gengetopt" => :build
depends_on "pkg-config" => :build
depends_on "pkgconf" => :build
depends_on "gmp"
depends_on "json-c"
depends_on "judy"
Expand Down
2 changes: 1 addition & 1 deletion Formula/z/znc.rb
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ class Znc < Formula
end

depends_on "cmake" => :build
depends_on "pkg-config" => :build
depends_on "pkgconf" => :build
depends_on "boost"
depends_on "icu4c@76"
depends_on "openssl@3"
Expand Down
2 changes: 1 addition & 1 deletion Formula/z/zola.rb
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ class Zola < Formula
sha256 cellar: :any_skip_relocation, x86_64_linux: "9d6138aa7ff35d309d8c8a3c17ab9552bb8b9465427701fc7cf5d869c2c6e940"
end

depends_on "pkg-config" => :build
depends_on "pkgconf" => :build
depends_on "rust" => :build
depends_on "oniguruma" # for onig_sys

Expand Down
2 changes: 1 addition & 1 deletion Formula/z/zookeeper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ class Zookeeper < Formula
depends_on "cppunit" => :build
depends_on "libtool" => :build
depends_on "maven" => :build
depends_on "pkg-config" => :build
depends_on "pkgconf" => :build

depends_on "openjdk"
depends_on "openssl@3"
Expand Down
2 changes: 1 addition & 1 deletion Formula/z/zurl.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
class Zurl < Formula

Check warning on line 1 in Formula/z/zurl.rb

View workflow job for this annotation

GitHub Actions / macOS 15-arm64

No bottle built for zurl!

zurl has unbottled dependencies, so a bottle will not be built.
include Language::Python::Virtualenv

desc "HTTP and WebSocket client worker with ZeroMQ interface"
Expand All @@ -21,7 +21,7 @@
sha256 cellar: :any_skip_relocation, x86_64_linux: "e03115779822a91ea2c4547dae103f6538beeab596a56251aad671519c1becd8"
end

depends_on "pkg-config" => :build
depends_on "pkgconf" => :build
depends_on "cmake" => :test # for scikit_build_core
depends_on "cython" => :test # use brew cython as building it in test can cause time out
depends_on "[email protected]" => :test
Expand Down
2 changes: 1 addition & 1 deletion Formula/z/zyre.rb
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ class Zyre < Formula
depends_on "libtool" => :build
end

depends_on "pkg-config" => :build
depends_on "pkgconf" => :build
depends_on "czmq"
depends_on "zeromq"

Expand Down
Loading