aboutsummaryrefslogtreecommitdiffstats
path: root/Library/Formula
diff options
context:
space:
mode:
authorBirger J. Nordølum2011-05-15 22:38:34 +0200
committerAdam Vandenberg2012-02-11 20:26:38 -0800
commit2950da2af57fc5110a1e7cb0e9eba519908b7d61 (patch)
tree918fc3279e355408964b0fbaf2b2e8a9fc09239e /Library/Formula
parent2b2640a0e73a73fd47be0748b2b0c25f71a82ac8 (diff)
downloadhomebrew-2950da2af57fc5110a1e7cb0e9eba519908b7d61.tar.bz2
cairomm 1.10.0
Removed some patches. Closes #5636. Signed-off-by: Jack Nagel <jacknagel@gmail.com> Signed-off-by: Adam Vandenberg <flangy@gmail.com>
Diffstat (limited to 'Library/Formula')
-rw-r--r--Library/Formula/cairomm.rb61
1 files changed, 3 insertions, 58 deletions
diff --git a/Library/Formula/cairomm.rb b/Library/Formula/cairomm.rb
index f82b8851c..5acaac2d7 100644
--- a/Library/Formula/cairomm.rb
+++ b/Library/Formula/cairomm.rb
@@ -1,20 +1,13 @@
require 'formula'
class Cairomm < Formula
- url 'http://cairographics.org/releases/cairomm-1.8.4.tar.gz'
homepage 'http://cairographics.org/cairomm/'
- md5 '559afbc47484ba3fad265e38a3dafe90'
-
- # patch for universal compilation from:
- # http://trac.macports.org/browser/trunk/dports/graphics/cairomm/files/patch-quartz-lp64.diff
- def patches
- { :p0 => DATA }
- end
+ url 'http://cairographics.org/releases/cairomm-1.10.0.tar.gz'
+ sha256 '068d96c43eae7b0a3d98648cbfc6fbd16acc385858e9ba6d37b5a47e4dba398f'
depends_on 'pkg-config' => :build
depends_on 'libsigc++'
- # cairo is available on 10.6 via X11 but not on 10.5
- depends_on 'cairo' if MacOS.leopard?
+ depends_on 'cairo' if MACOS_VERSION <= 10.6
def install
system "./configure", "--disable-dependency-tracking",
@@ -22,51 +15,3 @@ class Cairomm < Formula
system "make install"
end
end
-
-
-__END__
-diff -urN cairomm/quartz_font.cc cairomm-1.8.2/cairomm/quartz_font.cc
---- cairomm/quartz_font.cc 2008-12-20 18:37:46.000000000 +0100
-+++ cairomm/quartz_font.cc 2009-09-20 17:45:13.000000000 +0200
-@@ -30,21 +30,23 @@
- check_object_status_and_throw_exception(*this);
- }
-
--QuartzFontFace::QuartzFontFace(ATSUFontID font_id) :
-- FontFace(cairo_quartz_font_face_create_for_atsu_font_id(font_id), true)
-+RefPtr<QuartzFontFace> QuartzFontFace::create(CGFontRef font)
- {
-- check_object_status_and_throw_exception(*this);
-+ return RefPtr<QuartzFontFace>(new QuartzFontFace(font));
- }
-
--RefPtr<QuartzFontFace> QuartzFontFace::create(CGFontRef font)
-+#if !__LP64__
-+QuartzFontFace::QuartzFontFace(ATSUFontID font_id) :
-+ FontFace(cairo_quartz_font_face_create_for_atsu_font_id(font_id), true)
- {
-- return RefPtr<QuartzFontFace>(new QuartzFontFace(font));
-+ check_object_status_and_throw_exception(*this);
- }
-
- RefPtr<QuartzFontFace> QuartzFontFace::create(ATSUFontID font_id)
- {
- return RefPtr<QuartzFontFace>(new QuartzFontFace(font_id));
- }
-+#endif
-
- }
-
-diff cairomm/quartz_font.h cairomm-1.8.2/cairomm/quartz_font.h
---- cairomm/quartz_font.h 2008-12-20 18:37:46.000000000 +0100
-+++ cairomm/quartz_font.h 2009-09-20 17:46:25.000000000 +0200
-@@ -54,7 +54,9 @@
- *
- * @since 1.8
- */
-+# if !__LP64__
- static RefPtr<QuartzFontFace> create(ATSUFontID font_id);
-+# endif
-
-
- protected: