diff options
Diffstat (limited to 'Library/Formula')
| -rw-r--r-- | Library/Formula/cairo.rb | 9 | ||||
| -rw-r--r-- | Library/Formula/cairomm.rb | 2 | ||||
| -rw-r--r-- | Library/Formula/cogl.rb | 2 | ||||
| -rw-r--r-- | Library/Formula/gtk+3.rb | 2 | ||||
| -rw-r--r-- | Library/Formula/pdf2svg.rb | 2 |
5 files changed, 6 insertions, 11 deletions
diff --git a/Library/Formula/cairo.rb b/Library/Formula/cairo.rb index d883a02be..e17304a34 100644 --- a/Library/Formula/cairo.rb +++ b/Library/Formula/cairo.rb @@ -21,7 +21,7 @@ class Cairo < Formula depends_on :fontconfig depends_on :libpng depends_on 'pixman' - depends_on 'glib' => :recommended + depends_on 'glib' depends_on :x11 if build.with? 'x' def install @@ -30,6 +30,7 @@ class Cairo < Formula args = %W[ --disable-dependency-tracking --prefix=#{prefix} + --enable-gobject=yes ] if build.without? 'x' @@ -38,12 +39,6 @@ class Cairo < Formula args << '--with-x' end - if build.with? 'glib' - args << '--enable-gobject=yes' - else - args << '--enable-gobject=no' - end - args << '--enable-xcb=no' if MacOS.version <= :leopard system "./configure", *args diff --git a/Library/Formula/cairomm.rb b/Library/Formula/cairomm.rb index 0002fedb9..ac225afa5 100644 --- a/Library/Formula/cairomm.rb +++ b/Library/Formula/cairomm.rb @@ -9,7 +9,7 @@ class Cairomm < Formula depends_on 'pkg-config' => :build depends_on 'libsigc++' - depends_on 'cairo' => 'with-glib' + depends_on 'cairo' depends_on :x11 unless build.include? 'without-x' def install diff --git a/Library/Formula/cogl.rb b/Library/Formula/cogl.rb index fdd73e346..7131a0440 100644 --- a/Library/Formula/cogl.rb +++ b/Library/Formula/cogl.rb @@ -10,7 +10,7 @@ class Cogl < Formula option 'without-x', 'Build without X11 support' depends_on 'pkg-config' => :build - depends_on 'cairo' => 'with-glib' + depends_on 'cairo' depends_on 'glib' depends_on 'pango' depends_on :x11 => '2.5.1' unless build.without? 'x' diff --git a/Library/Formula/gtk+3.rb b/Library/Formula/gtk+3.rb index f1516f580..830511bc7 100644 --- a/Library/Formula/gtk+3.rb +++ b/Library/Formula/gtk+3.rb @@ -13,7 +13,7 @@ class Gtkx3 < Formula depends_on 'libtiff' depends_on 'gdk-pixbuf' depends_on 'pango' - depends_on 'cairo' => 'with-glib' + depends_on 'cairo' depends_on 'jasper' => :optional depends_on 'atk' depends_on 'at-spi2-atk' diff --git a/Library/Formula/pdf2svg.rb b/Library/Formula/pdf2svg.rb index 0bbadf305..60b35f863 100644 --- a/Library/Formula/pdf2svg.rb +++ b/Library/Formula/pdf2svg.rb @@ -8,7 +8,7 @@ class Pdf2svg < Formula depends_on "pkg-config" => :build depends_on :x11 - depends_on "poppler" => "with-glib" + depends_on "poppler" depends_on "gtk+" depends_on "cairo" |
