aboutsummaryrefslogtreecommitdiffstats
path: root/Library
diff options
context:
space:
mode:
Diffstat (limited to 'Library')
-rw-r--r--Library/Formula/cairo.rb26
1 files changed, 5 insertions, 21 deletions
diff --git a/Library/Formula/cairo.rb b/Library/Formula/cairo.rb
index 20c872137..0ccd0541d 100644
--- a/Library/Formula/cairo.rb
+++ b/Library/Formula/cairo.rb
@@ -5,15 +5,17 @@ require 'formula'
class Cairo < Formula
homepage 'http://cairographics.org/'
- url 'http://cairographics.org/releases/cairo-1.12.2.tar.xz'
- mirror 'http://ftp-nyc.osuosl.org/pub/gentoo/distfiles/cairo-1.12.2.tar.xz'
- sha256 'b786bc4a70542bcb09f2d9d13e5e6a0c86408cbf6d1edde5f0de807eecf93f96'
+ url 'http://cairographics.org/releases/cairo-1.12.4.tar.xz'
+ mirror 'http://ftp-nyc.osuosl.org/pub/gentoo/distfiles/cairo-1.12.4.tar.xz'
+ sha256 'a467b2e1f04bfd3f848370ce5e82cfe0a7f712bac05a04d133bc34c94f677a28'
keg_only :provided_pre_mountain_lion
option :universal
option 'without-x', 'Build without X11 support'
+ env :std if build.universal?
+
depends_on :libpng
depends_on 'pixman'
depends_on 'pkg-config' => :build
@@ -21,9 +23,6 @@ class Cairo < Formula
depends_on 'glib' unless build.include? 'without-x'
depends_on :x11 unless build.include? 'without-x'
- # Fixes a build error with clang & universal, where a function was implicit.
- def patches; DATA; end
-
def install
ENV.universal_binary if build.universal?
@@ -39,18 +38,3 @@ class Cairo < Formula
system "make install"
end
end
-
-__END__
-diff --git a/configure b/configure
-index b75757d..1230da2 100755
---- a/configure
-+++ b/configure
-@@ -17939,7 +17939,7 @@ CAIRO_NONPKGCONFIG_LIBS="$LIBS"
-
- MAYBE_WARN="-Wall -Wextra \
- -Wold-style-definition -Wdeclaration-after-statement \
---Wmissing-declarations -Werror-implicit-function-declaration \
-+-Wmissing-declarations -Wimplicit-function-declaration \
- -Wnested-externs -Wpointer-arith -Wwrite-strings \
- -Wsign-compare -Wstrict-prototypes -Wmissing-prototypes \
- -Wpacked -Wswitch-enum -Wmissing-format-attribute \