Skip to content
This repository
Browse code

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 #8821.
Closes #9238.
  • Loading branch information...
commit e562953f76507f1a316b3ecb39bd936584603190 1 parent a2ca892
Charlie Sharpsteen authored December 24, 2011
6  Library/Formula/graphviz.rb
@@ -11,11 +11,7 @@ class Graphviz < Formula
11 11
 
12 12
   depends_on 'pkg-config' => :build
13 13
 
14  
-  if ARGV.include? '--with-pangocairo'
15  
-    depends_on 'pango'
16  
-    depends_on 'cairo' if MacOS.leopard?
17  
-  end
18  
-
  14
+  depends_on 'pango' if ARGV.include? '--with-pangocairo'
19 15
   depends_on 'swig' if build_bindings?
20 16
 
21 17
   def options
6  Library/Formula/pango.rb
@@ -14,7 +14,11 @@ class Pango < Formula
14 14
     depends_on 'fontconfig' # Leopard's fontconfig is too old.
15 15
     depends_on 'cairo' # Leopard doesn't come with Cairo.
16 16
   elsif MacOS.lion?
17  
-    depends_on 'cairo' # links against system Cairo without this
  17
+    # The Cairo library shipped with Lion contains a flaw that causes Graphviz
  18
+    # to segfault. See the following ticket for information:
  19
+    #
  20
+    #   https://trac.macports.org/ticket/30370
  21
+    depends_on 'cairo'
18 22
   end
19 23
 
20 24
   def install

0 notes on commit e562953

Please sign in to comment.
Something went wrong with that request. Please try again.