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

Ensure :cairo and :pixman resolve to standard formula deps

Browse Source 
We do not use X11 to satisfy these deps for consistency reasons,
but we should continue to support the symbols for compatibility.
This commit is contained in:
Jack Nagel 2013-02-02 00:09:28 -06:00
parent ade998696d
commit 2fed17f4d1
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Library/Homebrew/dependency_collector.rb
View File

@ -83,6 +83,10 @@ private
else else
X11Dependency::Proxy.for(spec.to_s, tag) X11Dependency::Proxy.for(spec.to_s, tag)
end end
when :cairo, :pixman
# We no longer use X11 psuedo-deps for cairo or pixman,
# so just return a standard formula dependency.
Dependency.new(spec.to_s, tag)
when :x11 then X11Dependency.new(spec.to_s, tag) when :x11 then X11Dependency.new(spec.to_s, tag)
when :xcode then XcodeDependency.new(tag) when :xcode then XcodeDependency.new(tag)
when :mysql then MysqlInstalled.new(tag) when :mysql then MysqlInstalled.new(tag)

2
Library/Homebrew/requirements.rb
View File

@ -107,7 +107,7 @@ class X11Dependency < Requirement
# Rather than instantiate it directly, a separate class is built # Rather than instantiate it directly, a separate class is built
# for each of the packages that we proxy to X11Dependency. # for each of the packages that we proxy to X11Dependency.
class Proxy < self class Proxy < self
PACKAGES = [:libpng, :freetype, :pixman, :fontconfig] PACKAGES = [:libpng, :freetype, :fontconfig]
def self.for(name, *tags) def self.for(name, *tags)
constant = name.capitalize constant = name.capitalize