Skip to content

Commit 89d31c8

Browse files
authored
Merge pull request Homebrew#198410 from Homebrew/pkgconf-migrations-v-2
v*: migrate to `pkgconf` (part 2)
2 parents 720a7f1 + 8f74085 commit 89d31c8

File tree

8 files changed

+10
-12
lines changed

8 files changed

+10
-12
lines changed

Formula/v/vcsh.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ class Vcsh < Formula
1313
depends_on "autoconf" => :build
1414
depends_on "automake" => :build
1515
depends_on "libtool" => :build
16-
depends_on "pkg-config" => :build
16+
depends_on "pkgconf" => :build
1717

1818
def install
1919
system "autoreconf", "--force", "--install", "--verbose"

Formula/v/vectorscan.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ class Vectorscan < Formula
2121
depends_on "boost" => :build
2222
depends_on "cmake" => :build
2323
depends_on "pcre" => :build
24-
depends_on "pkg-config" => :build
24+
depends_on "pkgconf" => :build
2525
depends_on "ragel" => :build
2626

2727
# fix SQLite requirement check; included in next release

Formula/v/vgmstream.rb

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ class Vgmstream < Formula
3030
depends_on "automake" => :build
3131
depends_on "cmake" => :build
3232
depends_on "libtool" => :build
33-
depends_on "pkg-config" => :build
33+
depends_on "pkgconf" => :build
3434

3535
depends_on "ffmpeg"
3636
depends_on "jansson"
@@ -43,8 +43,6 @@ class Vgmstream < Formula
4343
depends_on "libogg"
4444
end
4545

46-
fails_with gcc: "5" # ffmpeg is compiled with GCC
47-
4846
def install
4947
ENV["LIBRARY_PATH"] = HOMEBREW_PREFIX/"lib"
5048
system "cmake", "-S", ".", "-B", "build",

Formula/v/vice.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ class Vice < Formula
2525
depends_on "autoconf" => :build
2626
depends_on "automake" => :build
2727
depends_on "dos2unix" => :build
28-
depends_on "pkg-config" => :build
28+
depends_on "pkgconf" => :build
2929
depends_on "texinfo" => :build
3030
depends_on "xa" => :build
3131
depends_on "yasm" => :build

Formula/v/vimpc.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ class Vimpc < Formula
2626
depends_on "autoconf" => :build
2727
depends_on "automake" => :build
2828
depends_on "libtool" => :build
29-
depends_on "pkg-config" => :build
29+
depends_on "pkgconf" => :build
3030

3131
depends_on "libmpdclient"
3232
depends_on "pcre"

Formula/v/vips.rb

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ class Vips < Formula
2222
depends_on "gobject-introspection" => :build
2323
depends_on "meson" => :build
2424
depends_on "ninja" => :build
25-
depends_on "pkg-config" => [:build, :test]
25+
depends_on "pkgconf" => [:build, :test]
2626
depends_on "cairo"
2727
depends_on "cfitsio"
2828
depends_on "cgif"
@@ -54,8 +54,6 @@ class Vips < Formula
5454
uses_from_macos "expat"
5555
uses_from_macos "zlib"
5656

57-
fails_with gcc: "5"
58-
5957
def install
6058
# mozjpeg needs to appear before libjpeg, otherwise it's not used
6159
ENV.prepend_path "PKG_CONFIG_PATH", Formula["mozjpeg"].opt_lib/"pkgconfig"

Formula/v/vipsdisp.rb

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,10 @@ class Vipsdisp < Formula
1616

1717
depends_on "meson" => :build
1818
depends_on "ninja" => :build
19-
depends_on "pkg-config" => :build
19+
depends_on "pkgconf" => :build
2020

21+
depends_on "cairo"
22+
depends_on "gdk-pixbuf"
2123
depends_on "glib"
2224
depends_on "gtk4"
2325
depends_on "hicolor-icon-theme"

Formula/v/vis.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ class Vis < Formula
1717
sha256 x86_64_linux: "6f7e0f61479a8c931556361f8c0dd42a913211ddff0a8b8dfb6b2240f6fb2c6b"
1818
end
1919

20-
depends_on "pkg-config" => :build
20+
depends_on "pkgconf" => :build
2121
depends_on "libtermkey"
2222
depends_on "lpeg"
2323
depends_on "lua"

0 commit comments

Comments
 (0)