Skip to content

Commit 6f8e4d8

Browse files
authored
Merge pull request Homebrew#266443 from Homebrew/vim-gettext
vim texinfo rmw: update `gettext` dependency
2 parents 6c5ad7c + 706fd60 commit 6f8e4d8

File tree

3 files changed

+13
-11
lines changed

3 files changed

+13
-11
lines changed

Formula/r/rmw.rb

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,19 @@ class Rmw < Formula
2020
sha256 x86_64_linux: "3a5eab29ba4ed0ef73d00edf9e33fb2bd424d775973cfaed388360dca1938686"
2121
end
2222

23+
depends_on "gettext" => :build
2324
depends_on "meson" => :build
2425
depends_on "ninja" => :build
2526
depends_on "pkgconf" => :build
2627
depends_on "canfigger"
27-
depends_on "gettext"
2828
# Slightly buggy with system ncurses
2929
# https://github.com/theimpossibleastronaut/rmw/issues/205
3030
depends_on "ncurses"
3131

32+
on_macos do
33+
depends_on "gettext"
34+
end
35+
3236
def install
3337
system "meson", "setup", "build", "-Db_sanitize=none", *std_meson_args
3438
system "meson", "compile", "-C", "build", "--verbose"

Formula/t/texinfo.rb

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,11 @@ class Texinfo < Formula
2222
uses_from_macos "perl"
2323

2424
on_linux do
25-
depends_on "gettext"
2625
depends_on "libunistring"
2726
end
2827

2928
def install
30-
system "./configure", "--disable-dependency-tracking",
31-
"--disable-install-warnings",
32-
"--prefix=#{prefix}"
29+
system "./configure", "--disable-install-warnings", *std_configure_args
3330
system "make", "install"
3431
doc.install Dir["doc/refcard/txirefcard*"]
3532
end

Formula/v/vim.rb

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ class Vim < Formula
3333
sha256 x86_64_linux: "46b2beab009da10ef090c5f32f42f52504866b29ea008c251ae2402f7c7016e6"
3434
end
3535

36-
depends_on "gettext"
36+
depends_on "gettext" => :build
3737
depends_on "libsodium"
3838
depends_on "lua"
3939
depends_on "ncurses"
@@ -42,15 +42,16 @@ class Vim < Formula
4242

4343
uses_from_macos "perl"
4444

45+
on_macos do
46+
depends_on "gettext"
47+
end
48+
4549
on_linux do
4650
depends_on "acl"
4751
end
4852

49-
conflicts_with "ex-vi",
50-
because: "vim and ex-vi both install bin/ex and bin/view"
51-
52-
conflicts_with "macvim",
53-
because: "vim and macvim both install vi* binaries"
53+
conflicts_with "ex-vi", because: "vim and ex-vi both install bin/ex and bin/view"
54+
conflicts_with "macvim", because: "vim and macvim both install vi* binaries"
5455

5556
def install
5657
ENV.prepend_path "PATH", Formula["python@3.14"].opt_libexec/"bin"

0 commit comments

Comments
 (0)