Modified: users/devans/GNOME-3/stable/dports/graphics/cairo/Portfile (128937 => 128938)
--- users/devans/GNOME-3/stable/dports/graphics/cairo/Portfile 2014-11-30 14:34:11 UTC (rev 128937)
+++ users/devans/GNOME-3/stable/dports/graphics/cairo/Portfile 2014-11-30 15:49:57 UTC (rev 128938)
@@ -30,8 +30,8 @@
advantage of display hardware acceleration when \
available (e.g. through the X Render Extension).
-checksums rmd160 87213a12c9789ff78dfbffbe4555aa28811c12c5 \
- sha256 2cf5f81432e77ea4359af9dcd0f4faf37d015934501391c311bfd2d19a0134b7
+checksums rmd160 87213a12c9789ff78dfbffbe4555aa28811c12c5 \
+ sha256 2cf5f81432e77ea4359af9dcd0f4faf37d015934501391c311bfd2d19a0134b7
depends_build port:pkgconfig
@@ -48,6 +48,9 @@
# Prevent cairo from using librsvg, libspectre, poppler.
patchfiles-append patch-configure.diff
+# Fix crash.
+patchfiles-append patch-src-cairo-tor-scan-converter.c.diff
+
# https://trac.macports.org/ticket/34137
compiler.blacklist-append {clang < 318.0.61}
@@ -56,15 +59,6 @@
compiler.blacklist-append gcc-4.0
}
-pre-configure {
- set pixman_minimum_version 0.20.2
- set pixman_installed_version [exec ${prefix}/bin/pkg-config pixman-1 --modversion]
- if {[vercmp ${pixman_installed_version} ${pixman_minimum_version}] < 0} {
- ui_error "${name} ${version} requires libpixman ${pixman_minimum_version} or later but you have libpixman ${pixman_installed_version}."
- return -code error "incompatible libpixman version"
- }
-}
-
configure.args --disable-gl \
--disable-quartz \
--disable-quartz-font \
@@ -104,6 +98,11 @@
configure.args-replace --disable-quartz-font --enable-quartz-font
configure.args-replace --disable-quartz-image --enable-quartz-image
}
+
+ default_variants +quartz
+ # Don't allow Quartz support to be disabled. Keep the variant for awhile in
+ # case any dependents are using the active_variants portgroup to check for it.
+ variant_set quartz
}
variant x11 {
@@ -121,6 +120,11 @@
}
default_variants +x11
+if {${os.platform} ne "darwin" || ${os.subplatform} ne "macosx"} {
+ # When not on OS X, don't allow X11 support to be disabled, since it is the
+ # only available option.
+ variant_set x11
+}
test.run yes
test.target check
Modified: users/devans/GNOME-3/stable/dports/graphics/cairo/files/patch-configure.diff (128937 => 128938)
--- users/devans/GNOME-3/stable/dports/graphics/cairo/files/patch-configure.diff 2014-11-30 14:34:11 UTC (rev 128937)
+++ users/devans/GNOME-3/stable/dports/graphics/cairo/files/patch-configure.diff 2014-11-30 15:49:57 UTC (rev 128938)
@@ -1,5 +1,5 @@
---- configure.orig 2014-10-13 18:47:29.000000000 -0700
-+++ configure 2014-11-28 14:01:43.000000000 -0800
+--- configure.orig 2014-10-13 20:47:29.000000000 -0500
++++ configure 2014-10-14 19:35:14.000000000 -0500
@@ -30634,7 +30634,7 @@
Copied: users/devans/GNOME-3/stable/dports/graphics/cairo/files/patch-src-cairo-tor-scan-converter.c.diff (from rev 128937, trunk/dports/graphics/cairo/files/patch-src-cairo-tor-scan-converter.c.diff) (0 => 128938)
--- users/devans/GNOME-3/stable/dports/graphics/cairo/files/patch-src-cairo-tor-scan-converter.c.diff (rev 0)
+++ users/devans/GNOME-3/stable/dports/graphics/cairo/files/patch-src-cairo-tor-scan-converter.c.diff 2014-11-30 15:49:57 UTC (rev 128938)
@@ -0,0 +1,15 @@
+https://bugs.freedesktop.org/show_bug.cgi?id=85372
+http://cgit.freedesktop.org/cairo/commit/?id=2de69581c28bf115852037ca41eba13cb7335976
+--- src/cairo-tor-scan-converter.c.orig
++++ src/cairo-tor-scan-converter.c
+@@ -1167,8 +1167,8 @@ can_do_full_row (struct active_list *active)
+
+ if (e->dy) {
+ struct quorem x = e->x;
+- x.quo += e->dxdy_full.quo - e->dxdy.quo/2;
+- x.rem += e->dxdy_full.rem - e->dxdy.rem/2;
++ x.quo += e->dxdy_full.quo;
++ x.rem += e->dxdy_full.rem;
+ if (x.rem < 0) {
+ x.quo--;
+ x.rem += e->dy;