Commit Graph

34 Commits (4ff96069f7dc4983b8b2dc04c32b040351fc0e21)

Author SHA1 Message Date
Jack Nagel 53473b6bf5 Clean up MacOS version method usage
The MacOS.version? family of methods (other than "leopard?") are poorly
defined and lead to confusing code. Replace them in formulae with more
explicit comparisons.

"MacOS.version" is a special version object that can be compared to
numerics, symbols, and strings using the standard Ruby comparison
methods.

The old methods were moved to compat when the version comparison code
was merged, and they must remain there "forever", but they should not be
used in new code.

Signed-off-by: Jack Nagel <jacknagel@gmail.com>
2012-09-10 16:16:54 -05:00
Jack Nagel 73f3587e96 Sort out remaining XQuartz/stdenv issues
We use PKG_CONFIG_LIBDIR to reset the default search path, overriding
whatever is baked into the pkg-config executable. This way, we can later
append XQuartz paths here while still allowing any brewed libs to take
precedence, keg-only or not.

Hopefully this will resolve any remaining issues, and let us get rid of
some per-formula hacks.

c.f. Homebrew/homebrew#14474.

Signed-off-by: Jack Nagel <jacknagel@gmail.com>
2012-09-03 22:39:38 -05:00
Mike McQuaid 42b74a2828 cairo: depend on glib unless we don't want X. 2012-08-24 21:30:42 -07:00
Mike McQuaid 6744b4f576 Fix keg-only on pre-Mountain Lion formulae. 2012-08-23 09:49:08 -07:00
Mike McQuaid a5a816dc32 cairo: only keg-only on pre-Mountain Lion. 2012-08-23 08:40:41 -07:00
Jack Nagel 95d1e93cc4 Add :when_xquartz_installed as a keg-only reason
Using :when_xquartz_installed will tell the keg-only machinery to activate
if XQuartz is installed.

Signed-off-by: Jack Nagel <jacknagel@gmail.com>
2012-08-12 17:28:15 -05:00
Adam Vandenberg 6beacf37e1 cairo: use options dsl 2012-08-09 21:47:23 -07:00
Jack Nagel 3be3ab20d9 cairo: always depend on our pixman
Older versions of XQuartz, including the one distributed by Apple with
OS X, contain an insufficient version of pixman for recent cairo.

Potentially the :pixman dep could be taught to only delegate to XQuartz
if it is up to date enough, but until then, always depend on our pixman.

Fixes Homebrew/homebrew#14072.

Signed-off-by: Jack Nagel <jacknagel@gmail.com>
2012-08-09 01:07:09 -05:00
Jack Nagel c34d481f64 Use X11 module methods where applicable
Signed-off-by: Jack Nagel <jacknagel@gmail.com>
2012-08-09 00:21:14 -05:00
Adam Vandenberg 04a8655cf8 cairo: hotfix libpng dep 2012-08-08 21:09:36 -07:00
Mike McQuaid d6f76a1ea1 cairo: optionally don't depend on X11 2012-08-08 18:19:22 +01:00
Mike McQuaid 15218f3234 Revert "cairo, pixman: use sha1; sha256 is excessive"
This reverts commit 597928b77fb4947a13c10fb11b964f625460941e.
2012-08-05 08:29:30 +01:00
Mike McQuaid f4f5f24a21 cairo, pixman: use sha1; sha256 is excessive 2012-08-04 10:36:31 +01:00
Myles Borins 6986f635fe Cairo: point to pixman explicitly
Closes Homebrew/homebrew#13172.

Signed-off-by: Adam Vandenberg <flangy@gmail.com>
2012-07-02 22:15:29 -07:00
Birger J. Nordølum 851e094061 Cairo 1.12.2
Also added changes of Homebrew/homebrew#12047.

Closes Homebrew/homebrew#11286.

Signed-off-by: Jack Nagel <jacknagel@gmail.com>
2012-07-01 13:11:00 -05:00
nibbles 2bits e07b4558c2 cairo: fix llvm compile error, add --universal
Cairo-1.10.2 doesn't build well with link time optimization.
Patch `configure` to remove `-flto`.  This fixes the build error
with llvm.  This also fixes a build error when brewing cairo as
a universal library.
Add `--universal` option.  Works if gettext & glib are universal.
Patch `configure` to change `-Werror-implicit-function-declaration`
to a warning with `-Wimplicit-function-declaration`.  Fixes a
build error when universal & clang.
Tested on Lion with clang and llvm from XCode-4.3.3.
Tested by building py2cairo and `import cairo`.

Fixes Homebrew/homebrew#12923 and Homebrew/homebrew#10400

Signed-off-by: Adam Vandenberg <flangy@gmail.com>
2012-06-27 13:03:20 -07:00
Jack Nagel 64afeec6d4 Use new fails_with DSL syntax
Signed-off-by: Jack Nagel <jacknagel@gmail.com>
2012-04-01 12:39:59 -05:00
Jack Nagel 39d3d562b5 cairo: remove ENV.x11
This causes configure to pick the wrong libpixman on at least 10.6, and
issues with SVG on at least 10.7. So remove it, and we'll try to fix any
remaining issues with a different approach, e.g. special ENV vars for
freetype.

cf Homebrew/homebrew#11036, Homebrew/homebrew#11042, Homebrew/homebrew#11049.

Signed-off-by: Jack Nagel <jacknagel@gmail.com>
2012-03-20 17:53:59 -05:00
Adam Vandenberg d842662f34 Cairo: add ENV.x11
Freetype is not found correctly on all 10.7 setups, so be explicit
that this is X11 software.
2012-03-14 06:51:01 -07:00
Charlie Sharpsteen 4af32f5d34 Cairo: Don't build with XCB support on Leopard
The version of XCB included with Leopard is too old to build against.
2012-02-16 12:43:03 -08:00
Philip Paeps 9339af2562 cairo: build with xcb support
XCB is a more "modern" way of communicating with X11 servers than
straight XLib.  It is required by some X11 applications.  Enabling
support in cairo should not affect applications which don't use it
explicitly.

Closes Homebrew/homebrew#9598.

Signed-off-by: Jack Nagel <jacknagel@gmail.com>
2012-02-01 19:21:25 -06:00
Charlie Sharpsteen 57657959c7 Cairo: Bump fails_with_llvm version
Still failing on Xcode 4.2.1.
2011-12-25 15:49:45 -08:00
Max Howell 2c41a177ce Cario builds with LLVM 2011-09-08 11:39:49 +01:00
Adam Vandenberg 46cdc76d88 Cairo: use gcc 4.2 instead of llvm 2011-09-02 19:02:17 -07:00
Adam Vandenberg 03e0880dbd cairo: fails_with_llvm 2011-05-10 14:24:49 -07:00
Adam Vandenberg ed753d1f2e Fix cairo checksum 2011-03-28 08:53:37 -07:00
Birger J. Nordølum 9ce435360b Cairo 1.10.2
Signed-off-by: Adam Vandenberg <flangy@gmail.com>
2011-03-27 22:45:21 -07:00
Adam Vandenberg aad67b6025 Document keg-only system duplicates. 2011-03-15 22:04:38 -07:00
Adam Vandenberg d62c6d2349 cairo: use system libpng 2011-03-14 14:40:35 -07:00
Adam Vandenberg 4147b05c57 Use ruby style for inheritance. 2011-03-12 11:55:09 -08:00
Adam Vandenberg 19e5e6e64a Mark scons, cmake & pkg-config as build-time deps 2010-10-12 07:13:29 -07:00
Adam Vandenberg 7bd947eb0b Update formulae for version 0.7
* Use new "url" features
* Use keg_only DSL
* Use "skip_clean :all" DSL
* Whitespace and style cleanups
* Make bash invocations less silly
* Use new man2-man8 helpers
* Remove "FileUtils." since it is included in Formula
* Use real names for deps instead of aliases
* ENV.x11 now updates path, so remove that from individual brews
2010-08-07 18:08:53 -07:00
Jelle Schühmacher ed0991c9b3 Fixed a typo
Signed-off-by: Adam Vandenberg <flangy@gmail.com>
2010-05-26 08:50:08 -07:00
Adam Vandenberg b901cd391c Keg-only Cairo for Leopard. 2010-04-27 09:34:30 -07:00