aboutsummaryrefslogtreecommitdiffstats
path: root/Library/Formula
diff options
context:
space:
mode:
authorCharlie Sharpsteen2011-12-24 21:53:36 -0800
committerCharlie Sharpsteen2011-12-24 21:55:31 -0800
commite562953f76507f1a316b3ecb39bd936584603190 (patch)
treebb268a8d2d54c6668a2328a77c7d6a7e580e28c2 /Library/Formula
parenta2ca892ec88c32d62ca4db5219fe50fa5652370d (diff)
downloadhomebrew-e562953f76507f1a316b3ecb39bd936584603190.tar.bz2
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.
Diffstat (limited to 'Library/Formula')
-rw-r--r--Library/Formula/graphviz.rb6
-rw-r--r--Library/Formula/pango.rb6
2 files changed, 6 insertions, 6 deletions
diff --git a/Library/Formula/graphviz.rb b/Library/Formula/graphviz.rb
index 8c83f13b8..10625ebb1 100644
--- 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
index 2947f6bd3..e786f101a 100644
--- 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