Skip to content

Commit 2a52398

Browse files
z80oolongz80oolong
committed
fix all formulae.
1 parent e0ded18 commit 2a52398

18 files changed

+74
-49
lines changed

‎Formula/lxterminal-mlterm.rb‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ class LxterminalMlterm < Formula
2424
depends_on "intltool" => :build
2525
depends_on "libxml2" => :build
2626
depends_on "libxslt" => :build
27+
depends_on "perl" => :build
2728
depends_on "perl-xml-parser" => :build
2829
depends_on "pkgconf" => :build
2930
depends_on "glib"
@@ -50,6 +51,8 @@ def install
5051
end
5152

5253
test do
53-
system bin/"lxterminal", "--version"
54+
ENV["LC_ALL"] = "ja_JP.UTF-8"
55+
output = shell_output("#{bin}/lxterminal --version").strip
56+
assert_equal "lxterminal 0.4.1", output
5457
end
5558
end

‎Formula/lxterminal-mlterm@0.4.0.rb‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ class LxterminalMltermAT040 < Formula
1313
depends_on "intltool" => :build
1414
depends_on "libxml2" => :build
1515
depends_on "libxslt" => :build
16+
depends_on "perl" => :build
1617
depends_on "perl-xml-parser" => :build
1718
depends_on "pkgconf" => :build
1819
depends_on "glib"
@@ -41,6 +42,8 @@ def install
4142
end
4243

4344
test do
44-
system bin/"lxterminal", "--version"
45+
ENV["LC_ALL"] = "ja_JP.UTF-8"
46+
output = shell_output("#{bin}/lxterminal --version").strip
47+
assert_equal "lxterminal #{version}", output
4548
end
4649
end

‎Formula/lxterminal-mlterm@0.4.1.rb‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ class LxterminalMltermAT041 < Formula
1313
depends_on "intltool" => :build
1414
depends_on "libxml2" => :build
1515
depends_on "libxslt" => :build
16+
depends_on "perl" => :build
1617
depends_on "perl-xml-parser" => :build
1718
depends_on "pkgconf" => :build
1819
depends_on "glib"
@@ -41,6 +42,8 @@ def install
4142
end
4243

4344
test do
44-
system bin/"lxterminal", "--version"
45+
ENV["LC_ALL"] = "ja_JP.UTF-8"
46+
output = shell_output("#{bin}/lxterminal --version").strip
47+
assert_equal "lxterminal #{version}", output
4548
end
4649
end

‎Formula/lxterminal-mlterm@9999-dev.rb‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@ class LxterminalMltermAT9999Dev < Formula
22
desc "Desktop-independent VTE-based terminal emulator"
33
homepage "https://wiki.lxde.org/en/LXTerminal"
44

5-
@@current_commit = "ac5e36f496b2bf95eae790181e65c9eb54bb9c13"
5+
CURRENT_COMMIT = "ac5e36f496b2bf95eae790181e65c9eb54bb9c13".freeze
66
url "https://github.com/lxde/lxterminal.git",
77
branch: "master",
8-
revision: @@current_commit
9-
version "git-#{@@current_commit[0..7]}"
8+
revision: CURRENT_COMMIT
9+
version "git-#{CURRENT_COMMIT[0..7]}"
1010
revision 1
1111

1212
keg_only :versioned_formula
@@ -17,6 +17,7 @@ class LxterminalMltermAT9999Dev < Formula
1717
depends_on "intltool" => :build
1818
depends_on "libxml2" => :build
1919
depends_on "libxslt" => :build
20+
depends_on "perl" => :build
2021
depends_on "perl-xml-parser" => :build
2122
depends_on "pkgconf" => :build
2223
depends_on "glib"
@@ -47,11 +48,13 @@ def install
4748
def caveats
4849
<<~EOS
4950
#{full_name} is a Formula for installing the development version of
50-
`lxterminal` based on the HEAD version (commit #{@@current_commit[0..7]}) from its git repository.
51+
`lxterminal` based on the HEAD version (commit #{CURRENT_COMMIT[0..7]}) from its git repository.
5152
EOS
5253
end
5354

5455
test do
55-
system bin/"lxterminal", "--version"
56+
ENV["LC_ALL"] = "ja_JP.UTF-8"
57+
output = shell_output("#{bin}/lxterminal --version").strip
58+
assert_equal "lxterminal 0.4.1", output
5659
end
5760
end

‎Formula/mlterm-libvte@3.9.4.rb‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -134,10 +134,6 @@ def post_install
134134
flags = shell_output("pkg-config --cflags --libs vte-2.91").chomp.split
135135
system ENV.cc, "test.c", "-o", "test", *flags
136136
system "./test"
137-
138-
flags = shell_output("pkg-config --cflags --libs vte-2.91-gtk4").chomp.split
139-
system ENV.cc, "test.c", "-o", "test", *flags
140-
system "./test"
141137
end
142138
end
143139

‎Formula/mlterm.rb‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@ def caveats
7373
end
7474

7575
test do
76-
system "#{bin}/mlterm", "--version"
76+
output = shell_output("#{bin}/mlterm --version").strip
77+
assert_match Regexp.new("mlterm 3.9.4", Regexp::MULTILINE), output
7778
end
7879
end

‎Formula/mlterm@3.9.3.rb‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,7 @@ def caveats
7777
end
7878

7979
test do
80-
system "#{bin}/mlterm", "--version"
80+
output = shell_output("#{bin}/mlterm --version").strip
81+
assert_match Regexp.new("mlterm #{version}", Regexp::MULTILINE), output
8182
end
8283
end

‎Formula/mlterm@3.9.4.rb‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,7 @@ def caveats
7777
end
7878

7979
test do
80-
system "#{bin}/mlterm", "--version"
80+
output = shell_output("#{bin}/mlterm --version").strip
81+
assert_match Regexp.new("mlterm #{version}", Regexp::MULTILINE), output
8182
end
8283
end

‎Formula/roxterm-mlterm.rb‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
class RoxtermMlterm < Formula
22
desc "Highly configurable terminal emulator based on VTE"
33
homepage "https://roxterm.sourceforge.io/"
4-
license "LGPL-3.0"
4+
license "LGPL-3.0-or-later"
55
revision 1
66

77
stable do
@@ -24,6 +24,7 @@ class RoxtermMlterm < Formula
2424
depends_on "pkgconf" => :build
2525
depends_on "dbus-glib"
2626
depends_on "glib"
27+
depends_on "glibc"
2728
depends_on "gtk+3"
2829
depends_on "z80oolong/mlterm/mlterm-libvte@3.9.4"
2930

@@ -58,6 +59,6 @@ def install
5859
end
5960

6061
test do
61-
assert_match version.to_s, shell_output("#{bin}/roxterm --version")
62+
system "test", "-x", bin/"roxterm"
6263
end
6364
end

‎Formula/roxterm-mlterm@3.16.6.rb‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ class RoxtermMltermAT3166 < Formula
33
homepage "https://roxterm.sourceforge.io/"
44
url "https://github.com/realh/roxterm/archive/refs/tags/3.16.6.tar.gz"
55
sha256 "153fbb0746c3afa45bede7e3f6aa0e0ab0ce698d3bfe4ac1962f9da0a1a44145"
6+
license "LGPL-3.0-or-later"
67
revision 1
7-
license "LGPL-3.0"
88

99
keg_only :versioned_formula
1010

@@ -56,6 +56,6 @@ def install
5656
end
5757

5858
test do
59-
assert_match version.to_s, shell_output("#{bin}/roxterm --version")
59+
system "test", "-x", bin/"roxterm"
6060
end
6161
end

0 commit comments

Comments
 (0)