From 1f8af42feef19bdb2aa7f508c8486eea32a75993 Mon Sep 17 00:00:00 2001 From: Mike McQuaid Date: Wed, 22 Aug 2012 13:34:26 -0700 Subject: [PATCH] Don't use XQuartz for e.g. :libpng on 10.8. XQuartz isn't added to the default library paths so if something is linked against a Homebrew libpng then it doesn't work against the XQuartz libpng. The CLT provides X11 on Lion so don't request users install XQuartz if it isn't needed on Mountain Lion. Fixes Homebrew/homebrew#14325. --- Library/Homebrew/dependencies.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Library/Homebrew/dependencies.rb b/Library/Homebrew/dependencies.rb index c35bce9fd1..a8ff1a8ada 100644 --- a/Library/Homebrew/dependencies.rb +++ b/Library/Homebrew/dependencies.rb @@ -63,8 +63,8 @@ private # Xcode no longer provides autotools or some other build tools Dependency.new(spec.to_s) unless MacOS::Xcode.provides_autotools? when :libpng, :freetype, :pixman, :fontconfig, :cairo - if MacOS.version >= :lion - MacOS::XQuartz.installed? ? X11Dependency.new(tag) : Dependency.new(spec.to_s) + if MacOS.version >= :mountain_lion + Dependency.new(spec.to_s) else X11Dependency.new(tag) end