admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

Merge pull request #4686 from sjackman/x11-requirement

Browse Source 
X11Requirement: Recent X11 client is sufficient
This commit is contained in:
Shaun Jackman 2018-08-14 14:31:11 -07:00 committed by GitHub
commit 2c68176ac2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Library/Homebrew/requirements/x11_requirement.rb
View File

@ -27,20 +27,16 @@ class X11Requirement < Requirement
satisfy build_env: false do
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
version = Utils.popen_read(which_xorg, "-version", err: :out)[/X Server (\d+\.\d+\.\d+)/, 1]
next true if $CHILD_STATUS.success? && version && Version.new(version) >= min_version
end
if which_xdpyinfo = which("xdpyinfo")
version = Utils.popen_read(which_xdpyinfo, "-version")[/^xdpyinfo (\d+\.\d+\.\d+)/, 1]
next true if $CHILD_STATUS.success? && version && Version.new(version) >= min_xdpyinfo_version
end
false
end
def message