Skip to content
This repository
Browse code

Depend on our cairo in GTK+ toolchain

Eventually we should try to just get this from XQuartz, but for now
let's depend on cairo for consistency.

Signed-off-by: Jack Nagel <jacknagel@gmail.com>
  • Loading branch information...
commit ec522f627d610c544468bf25a6005beab86011c9 1 parent 88aa937
Jack Nagel authored July 03, 2012
2  Library/Formula/cairomm.rb
@@ -7,7 +7,7 @@ class Cairomm < Formula
7 7
 
8 8
   depends_on 'pkg-config' => :build
9 9
   depends_on 'libsigc++'
10  
-  depends_on 'cairo' if MACOS_VERSION <= 10.6
  10
+  depends_on 'cairo'
11 11
 
12 12
   def install
13 13
     system "./configure", "--disable-dependency-tracking",
2  Library/Formula/gerbv.rb
@@ -7,7 +7,7 @@ class Gerbv < Formula
7 7
 
8 8
   depends_on 'pkg-config' => :build
9 9
   depends_on 'gtk+'
10  
-  depends_on 'cairo' if MacOS.leopard?
  10
+  depends_on 'cairo'
11 11
   depends_on :x11
12 12
 
13 13
   def install
1  Library/Formula/gtk+.rb
@@ -14,6 +14,7 @@ class Gtkx < Formula
14 14
   depends_on 'pango'
15 15
   depends_on 'jasper' => :optional
16 16
   depends_on 'atk' => :optional
  17
+  depends_on 'cairo'
17 18
   depends_on :x11
18 19
 
19 20
   fails_with :llvm do
17  Library/Formula/pango.rb
@@ -10,16 +10,13 @@ class Pango < Formula
10 10
   depends_on 'glib'
11 11
   depends_on :x11
12 12
 
13  
-  if MacOS.leopard?
14  
-    depends_on 'fontconfig' # Leopard's fontconfig is too old.
15  
-    depends_on 'cairo' # Leopard doesn't come with Cairo.
16  
-  elsif MacOS.lion?
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'
22  
-  end
  13
+  depends_on 'fontconfig' if MacOS.leopard?
  14
+
  15
+  # The Cairo library shipped with Lion contains a flaw that causes Graphviz
  16
+  # to segfault. See the following ticket for information:
  17
+  #   https://trac.macports.org/ticket/30370
  18
+  # We depend on our cairo on all platforms for consistency
  19
+  depends_on 'cairo'
23 20
 
24 21
   fails_with :llvm do
25 22
     build 2326

0 notes on commit ec522f6

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