Clean up some Cairo dependencies

Add a comment to Pango explaining why Cairo is required on Lion. Remove Cairo dependencies from Graphviz as the Pango dependency will include it if needed. Closes Homebrew#8821. Closes Homebrew#9238.
wesen · Jan 8, 2012 · b63c72c · b63c72c
1 parent a45381c
commit b63c72c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/Library/Formula/graphviz.rb b/Library/Formula/graphviz.rb
@@ -11,11 +11,7 @@ class Graphviz < Formula
 
   depends_on 'pkg-config' => :build
 
-  if ARGV.include? '--with-pangocairo'
-    depends_on 'pango'
-    depends_on 'cairo' if MacOS.leopard?
-  end
-
+  depends_on 'pango' if ARGV.include? '--with-pangocairo'
   depends_on 'swig' if build_bindings?
 
   def options

diff --git a/Library/Formula/pango.rb b/Library/Formula/pango.rb
@@ -14,7 +14,11 @@ class Pango < Formula
     depends_on 'fontconfig' # Leopard's fontconfig is too old.
     depends_on 'cairo' # Leopard doesn't come with Cairo.
   elsif MacOS.lion?
-    depends_on 'cairo' # links against system Cairo without this
+    # The Cairo library shipped with Lion contains a flaw that causes Graphviz
+    # to segfault. See the following ticket for information:
+    #
+    #   https://trac.macports.org/ticket/30370
+    depends_on 'cairo'
   end
 
   def install