Merge pull request #3483 from sjackman/x11

Implement X11Requirement for Linux

3 files changed, 65 insertions, 13 deletions

diff --git a/Library/Homebrew/extend/os/mac/requirements/x11_requirement.rb b/Library/Homebrew/extend/os/mac/requirements/x11_requirement.rb
new file mode 100644
index 000000000..ae4f5b8ed
--- /dev/null
+++ b/Library/Homebrew/extend/os/mac/requirements/x11_requirement.rb
@@ -0,0 +1,42 @@
+require "requirement"
+
+class XQuartzRequirement < Requirement
+  include Comparable
+
+  fatal true
+  cask "xquartz"
+  download "https://xquartz.macosforge.org"
+
+  env { ENV.x11 }
+
+  def initialize(name = "x11", tags = [])
+    @name = name
+    # no-op on version specified as a tag argument
+    tags.shift if /(\d\.)+\d/ =~ tags.first
+    super(tags)
+  end
+
+  def min_version
+    MacOS::XQuartz.minimum_version
+  end
+
+  satisfy build_env: false do
+    next false unless MacOS::XQuartz.installed?
+    min_version <= MacOS::XQuartz.version
+  end
+
+  def message
+    "XQuartz #{min_version} (or newer) is required to install this formula. #{super}"
+  end
+
+  def <=>(other)
+    return unless other.is_a? X11Requirement
+    0
+  end
+
+  def inspect
+    "#<#{self.class.name}: #{name.inspect} #{tags.inspect}>"
+  end
+end
+
+X11Requirement = XQuartzRequirement
diff --git a/Library/Homebrew/extend/os/requirements/x11_requirement.rb b/Library/Homebrew/extend/os/requirements/x11_requirement.rb
new file mode 100644
index 000000000..664b6c7c0
--- /dev/null
+++ b/Library/Homebrew/extend/os/requirements/x11_requirement.rb
@@ -0,0 +1 @@
+require "extend/os/mac/requirements/x11_requirement" if OS.mac?
diff --git a/Library/Homebrew/requirements/x11_requirement.rb b/Library/Homebrew/requirements/x11_requirement.rb
index e0974107a..65ce6396f 100644
--- a/Library/Homebrew/requirements/x11_requirement.rb
+++ b/Library/Homebrew/requirements/x11_requirement.rb
@@ -4,8 +4,6 @@ class X11Requirement < Requirement
   include Comparable
 
   fatal true
-  cask "xquartz"
-  download "https://xquartz.macosforge.org"
 
   env { ENV.x11 }
 
@@ -17,24 +15,33 @@ class X11Requirement < Requirement
   end
 
   def min_version
-    # TODO: remove in https://github.com/Homebrew/brew/pull/3483
-    return Version::NULL unless OS.mac?
+    "1.12.2"
+  end
 
-    MacOS::XQuartz.minimum_version
+  def min_xdpyinfo_version
+    "1.3.0"
   end
 
   satisfy build_env: false do
-    # TODO: remove in https://github.com/Homebrew/brew/pull/3483
-    next false unless OS.mac?
-
-    next false unless MacOS::XQuartz.installed?
-    min_version <= MacOS::XQuartz.version
+    if which_xorg = which("Xorg")
+      version = Utils.popen_read which_xorg, "-version", err: :out
+      next false unless $CHILD_STATUS.success?
+      version = version[/X Server (\d+\.\d+\.\d+)/, 1]
+      next false unless version
+      Version.new(version) >= min_version
+    elsif which_xdpyinfo = which("xdpyinfo")
+      version = Utils.popen_read which_xdpyinfo, "-version"
+      next false unless $CHILD_STATUS.success?
+      version = version[/^xdpyinfo (\d+\.\d+\.\d+)/, 1]
+      next false unless version
+      Version.new(version) >= min_xdpyinfo_version
+    else
+      false
+    end
   end
 
   def message
-    s = "XQuartz #{min_version} (or newer) is required to install this formula."
-    s += super
-    s
+    "X11 is required to install this formula, either Xorg #{min_version} or xdpyinfo #{min_xdpyinfo_version}, or newer. #{super}"
   end
 
   def <=>(other)
@@ -46,3 +53,5 @@ class X11Requirement < Requirement
     "#<#{self.class.name}: #{name.inspect} #{tags.inspect}>"
   end
 end
+
+require "extend/os/requirements/x11_requirement"