diff options
| author | Dominick Ng | 2011-09-09 11:17:43 +1000 |
|---|---|---|
| committer | Charlie Sharpsteen | 2011-09-14 03:41:36 -0700 |
| commit | 85ead600dc88d7cd0cc19d2c0b528c13bdbcdcce (patch) | |
| tree | c28496604390157140e86e139ba53dbb0b2ebda2 | |
| parent | b0b39e944ac962577ae3332243cec62e0bb6a462 (diff) | |
| download | homebrew-85ead600dc88d7cd0cc19d2c0b528c13bdbcdcce.tar.bz2 | |
pango, pixman, graphviz: Fixes for Lion PDF output
Related issue on MacPorts:
https://trac.macports.org/ticket/30370
Fixes #6631.
Fixes #7140.
Fixes #7463.
Closes #7523.
Signed-off-by: Charlie Sharpsteen <source@sharpsteen.net>
| -rw-r--r-- | Library/Formula/graphviz.rb | 3 | ||||
| -rw-r--r-- | Library/Formula/pango.rb | 2 | ||||
| -rw-r--r-- | Library/Formula/pixman.rb | 7 |
3 files changed, 11 insertions, 1 deletions
diff --git a/Library/Formula/graphviz.rb b/Library/Formula/graphviz.rb index 5a8557b28..7e44a9bbc 100644 --- a/Library/Formula/graphviz.rb +++ b/Library/Formula/graphviz.rb @@ -9,7 +9,8 @@ class Graphviz < Formula if ARGV.include? '--with-pdf' depends_on 'pango' - depends_on 'cairo' if MacOS.leopard? + depends_on 'cairo' if MacOS.leopard? or MacOS.lion? + depends_on 'gd' if MacOS.lion? end def options diff --git a/Library/Formula/pango.rb b/Library/Formula/pango.rb index 40fd2e2dd..fa91ff959 100644 --- a/Library/Formula/pango.rb +++ b/Library/Formula/pango.rb @@ -13,6 +13,8 @@ class Pango < Formula if MacOS.leopard? 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 end def install diff --git a/Library/Formula/pixman.rb b/Library/Formula/pixman.rb index e284e56d1..9655dac87 100644 --- a/Library/Formula/pixman.rb +++ b/Library/Formula/pixman.rb @@ -8,6 +8,13 @@ class Pixman < Formula depends_on 'pkg-config' => :build def install + if ENV.compiler == :llvm + if MacOS.xcode_version == "4.1" + ENV.clang + else + ENV.gcc_4_2 + end + end system "./configure", "--disable-dependency-tracking", "--prefix=#{prefix}", "--enable-gtk=no" # Don't need to build tests |