Skip to content

Commit

Permalink
Merge pull request Homebrew#198583 from Homebrew/pkgconf-migrations-j
Browse files Browse the repository at this point in the history
j*: migrate to `pkgconf`
  • Loading branch information
BrewTestBot authored Nov 23, 2024
2 parents d7268e1 + 48e532d commit 4d85300
Show file tree
Hide file tree
Showing 16 changed files with 29 additions and 35 deletions.
12 changes: 4 additions & 8 deletions Formula/j/jack.rb
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ class Jack < Formula
depends_on "autoconf" => :build
depends_on "automake" => :build
depends_on "libtool" => :build
depends_on "pkg-config" => :build
depends_on "pkgconf" => :build
depends_on "berkeley-db@5" # keep berkeley-db < 6 to avoid AGPL-3.0 restrictions
depends_on "libsamplerate"

Expand Down Expand Up @@ -66,13 +66,9 @@ def install
end

test do
fork do
if OS.mac?
exec bin/"jackd", "-X", "coremidi", "-d", "dummy"
else
exec bin/"jackd", "-d", "dummy"
end
end
args = ["-d", "dummy"]
args += ["-X", "coremidi"] if OS.mac?
spawn bin/"jackd", *args

assert_match "jackdmp version #{version}", shell_output("#{bin}/jackd --version")
end
Expand Down
2 changes: 1 addition & 1 deletion Formula/j/jellyfish.rb
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ class Jellyfish < Formula
sha256 cellar: :any_skip_relocation, x86_64_linux: "105fae95b5a56dea674d9e6f97e6dadde81372f86b3c3dc8303548460dfb376e"
end

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

# Fix -flat_namespace being used on Big Sur and later.
Expand Down
9 changes: 5 additions & 4 deletions Formula/j/jigdo.rb
Original file line number Diff line number Diff line change
Expand Up @@ -24,21 +24,22 @@ class Jigdo < Formula
sha256 x86_64_linux: "244d944cf955deef5bfb200e61e3fae6cfc49038883f2c542e534b0c498dc4c6"
end

depends_on "pkg-config" => :build
depends_on "gettext" => :build # for msgfmt
depends_on "pkgconf" => :build
depends_on "berkeley-db@5" # keep berkeley-db < 6 to avoid AGPL incompatibility
depends_on "wget"

uses_from_macos "bzip2"
uses_from_macos "zlib"

on_linux do
depends_on "gettext" => :build # for msgfmt
on_macos do
depends_on "gettext"
end

def install
# Find our docbook catalog
ENV["XML_CATALOG_FILES"] = etc/"xml/catalog"
system "./configure", *std_configure_args, "--mandir=#{man}"
system "./configure", "--mandir=#{man}", *std_configure_args

# disable documentation building
(buildpath/"doc/Makefile").atomic_write "all:\n\techo hello"
Expand Down
2 changes: 1 addition & 1 deletion Formula/j/jikken.rb
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ class Jikken < Formula
sha256 cellar: :any_skip_relocation, x86_64_linux: "e16712754cad5e86d225ea36efb22b9275f31f46083a426ae4ba4d4b5c03455d"
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/j/jj.rb
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ class Jj < Formula
sha256 cellar: :any_skip_relocation, x86_64_linux: "98608443f34e51980f2381544ba42e385081ab690866b53c78f9495a7e1150de"
end

depends_on "pkg-config" => :build
depends_on "pkgconf" => :build
depends_on "rust" => :build
depends_on "libgit2"
depends_on "openssl@3"
Expand Down
2 changes: 1 addition & 1 deletion Formula/j/jnettop.rb
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ class Jnettop < Formula
sha256 cellar: :any_skip_relocation, x86_64_linux: "2e3617c2641b35e01517e783554157ece0999367fccf494fc9824618277464eb"
end

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

uses_from_macos "libpcap"
Expand Down
2 changes: 1 addition & 1 deletion Formula/j/john-jumbo.rb
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ class JohnJumbo < Formula
sha256 x86_64_linux: "2c1c1fa912ee63f865d0f61c11188f50d1d600e2c8af616175db78c9f51c154a"
end

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

Expand Down
2 changes: 1 addition & 1 deletion Formula/j/joplin-cli.rb
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ class JoplinCli < Formula
sha256 cellar: :any_skip_relocation, x86_64_linux: "7b1f734064440c1e742dbeb9bc55c4f633c1393783b70fc88deec51a990abeeb"
end

depends_on "pkg-config" => :build
depends_on "pkgconf" => :build
depends_on "python-setuptools" => :build # for node-gyp
depends_on "[email protected]" => :build
depends_on "glib"
Expand Down
2 changes: 1 addition & 1 deletion Formula/j/jose.rb
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ class Jose < Formula

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

Expand Down
5 changes: 3 additions & 2 deletions Formula/j/jp2a.rb
Original file line number Diff line number Diff line change
Expand Up @@ -15,16 +15,17 @@ class Jp2a < Formula
sha256 cellar: :any_skip_relocation, x86_64_linux: "00f6f42f5d2ef84ddc1a42004e9c44789be388385a454215e02dfa9b07c1bf43"
end

depends_on "pkg-config" => :build
depends_on "pkgconf" => :build
depends_on "jpeg-turbo"
depends_on "libexif"
depends_on "libpng"
depends_on "webp"

uses_from_macos "curl"
uses_from_macos "ncurses"

def install
system "./configure", *std_configure_args, "--disable-silent-rules"
system "./configure", "--disable-silent-rules", *std_configure_args
system "make", "install"
end

Expand Down
12 changes: 4 additions & 8 deletions Formula/j/jpeg-xl.rb
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,8 @@ class JpegXl < Formula
depends_on "cmake" => :build
depends_on "docbook-xsl" => :build
depends_on "doxygen" => :build
depends_on "pkg-config" => :build
depends_on "pkgconf" => [:build, :test]
depends_on "sphinx-doc" => :build
depends_on "pkg-config" => :test
depends_on "brotli"
depends_on "giflib"
depends_on "highway"
Expand All @@ -42,9 +41,6 @@ class JpegXl < Formula
uses_from_macos "libxslt" => :build # for xsltproc
uses_from_macos "python"

fails_with gcc: "5"
fails_with gcc: "6"

# These resources are versioned according to the script supplied with jpeg-xl to download the dependencies:
# https://github.com/libjxl/libjxl/tree/v#{version}/third_party
resource "sjpeg" do
Expand Down Expand Up @@ -78,7 +74,7 @@ def install

test do
system bin/"cjxl", test_fixtures("test.jpg"), "test.jxl"
assert_predicate testpath/"test.jxl", :exist?
assert_path_exists testpath/"test.jxl"

(testpath/"jxl_test.c").write <<~C
#include <jxl/encode.h>
Expand All @@ -94,7 +90,7 @@ def install
return EXIT_SUCCESS;
}
C
jxl_flags = shell_output("pkg-config --cflags --libs libjxl").chomp.split
jxl_flags = shell_output("pkgconf --cflags --libs libjxl").chomp.split
system ENV.cc, "jxl_test.c", *jxl_flags, "-o", "jxl_test"
system "./jxl_test"

Expand All @@ -112,7 +108,7 @@ def install
return EXIT_SUCCESS;
}
C
jxl_threads_flags = shell_output("pkg-config --cflags --libs libjxl_threads").chomp.split
jxl_threads_flags = shell_output("pkgconf --cflags --libs libjxl_threads").chomp.split
system ENV.cc, "jxl_threads_test.c", *jxl_threads_flags, "-o", "jxl_threads_test"
system "./jxl_threads_test"
end
Expand Down
2 changes: 1 addition & 1 deletion Formula/j/jrtplib.rb
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ class Jrtplib < Formula
end

depends_on "cmake" => :build
depends_on "pkg-config" => :build
depends_on "pkgconf" => :build
depends_on "jthread"

def install
Expand Down
2 changes: 1 addition & 1 deletion Formula/j/json-glib.rb
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ class JsonGlib < Formula
depends_on "gobject-introspection" => :build
depends_on "meson" => :build
depends_on "ninja" => :build
depends_on "pkg-config" => :build
depends_on "pkgconf" => :build

depends_on "glib"

Expand Down
4 changes: 2 additions & 2 deletions Formula/j/jsonrpc-glib.rb
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ class JsonrpcGlib < Formula
depends_on "gobject-introspection" => :build
depends_on "meson" => :build
depends_on "ninja" => :build
depends_on "pkg-config" => [:build, :test]
depends_on "pkgconf" => [:build, :test]
depends_on "vala" => :build

depends_on "glib"
Expand All @@ -44,7 +44,7 @@ def install
return 0;
}
C
pkg_config_cflags = shell_output("pkg-config --cflags --libs jsonrpc-glib-1.0").chomp.split
pkg_config_cflags = shell_output("pkgconf --cflags --libs jsonrpc-glib-1.0").chomp.split
system ENV.cc, "test.c", "-o", "test", *pkg_config_cflags
system "./test"
end
Expand Down
2 changes: 1 addition & 1 deletion Formula/j/jthread.rb
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ class Jthread < Formula
end

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

def install
system "cmake", ".", *std_cmake_args
Expand Down
2 changes: 1 addition & 1 deletion Formula/j/jupyter-r.rb
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ class JupyterR < Formula
sha256 cellar: :any_skip_relocation, x86_64_linux: "c5b13b7b57330d27afc80e134f7d27c2b5207a9abc00a92f081d2fa21f834ede"
end

depends_on "pkg-config" => :build
depends_on "pkgconf" => :build
depends_on "jupyterlab"
depends_on "r"
depends_on "zeromq"
Expand Down

0 comments on commit 4d85300

Please sign in to comment.