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

Don't advise XQuartz upgrades for system X11

Browse Source 
Yeah, yeah. The XQuartz/X11 stuff is confusing.
This commit is contained in:
Jack Nagel 2012-11-12 19:42:26 -06:00
parent c6a8dd247e
commit 6b6e22ffae
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Library/Homebrew/cmd/doctor.rb
View File

@ -976,6 +976,7 @@ end
def check_for_latest_xquartz def check_for_latest_xquartz
quartz = MacOS::XQuartz.version quartz = MacOS::XQuartz.version
return unless quartz return unless quartz
return if MacOS::XQuartz.provided_by_apple?
quartz = Version.new(quartz) quartz = Version.new(quartz)
latest = Version.new(MacOS::XQuartz.latest_version) latest = Version.new(MacOS::XQuartz.latest_version)

6
Library/Homebrew/macos/xquartz.rb
View File

@ -16,6 +16,12 @@ module MacOS::XQuartz extend self
"2.7.4" "2.7.4"
end end
def provided_by_apple?
[FORGE_BUNDLE_ID, APPLE_BUNDLE_ID].find do |id|
MacOS.app_with_bundle_id(id)
end == APPLE_BUNDLE_ID
end
# This should really be private, but for compatibility reasons it must # This should really be private, but for compatibility reasons it must
# remain public. New code should use MacOS::XQuartz.{bin,lib,include} # remain public. New code should use MacOS::XQuartz.{bin,lib,include}
# instead, as that accounts for Xcode-only systems. # instead, as that accounts for Xcode-only systems.