diff options
| author | William Roe | 2014-06-29 12:49:17 +0100 |
|---|---|---|
| committer | Jack Nagel | 2014-06-30 13:06:49 -0500 |
| commit | 3de670edc318bd0e92fcafcadb4ccf7863218a21 (patch) | |
| tree | 50da9b55eb2b537cecd5b137881457f75bc3aa0a /Library | |
| parent | 46be5d94112b3a81ce40714a508ce97d37fd458a (diff) | |
| download | homebrew-3de670edc318bd0e92fcafcadb4ccf7863218a21.tar.bz2 | |
pango: update x11 option to fix compatibility with cairo formula
The new way to depend on X11, using cairo.rb as a reference works (with
the `--without-x11` flag). This change allows pango to be built and
installed without installing XQuartz.
Closes #30532.
Closes #30570.
Signed-off-by: Jack Nagel <jacknagel@gmail.com>
Diffstat (limited to 'Library')
| -rw-r--r-- | Library/Formula/pango.rb | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/Library/Formula/pango.rb b/Library/Formula/pango.rb index 26f2f788e..17644391e 100644 --- a/Library/Formula/pango.rb +++ b/Library/Formula/pango.rb @@ -11,14 +11,12 @@ class Pango < Formula sha1 "73880906087275dcd394f0567136898bbf2dca94" => :lion end - option 'without-x', 'Build without X11 support' - depends_on 'pkg-config' => :build depends_on 'glib' depends_on 'cairo' depends_on 'harfbuzz' depends_on 'fontconfig' - depends_on :x11 if build.with? 'x' + depends_on :x11 => :recommended depends_on 'gobject-introspection' fails_with :llvm do @@ -36,7 +34,7 @@ class Pango < Formula --enable-introspection=yes ] - if build.without? "x" + if build.without? "x11" args << '--without-xft' else args << '--with-xft' |