[135960] trunk/dports/graphics/cairo
ryandesign at macports.org
ryandesign at macports.org
Thu May 7 20:59:24 PDT 2015
Revision: 135960
https://trac.macports.org/changeset/135960
Author: ryandesign at macports.org
Date: 2015-05-07 20:59:24 -0700 (Thu, 07 May 2015)
Log Message:
-----------
cairo: update to 1.14.2; add a note about the possible removal of Tiger support in the future
Modified Paths:
--------------
trunk/dports/graphics/cairo/Portfile
trunk/dports/graphics/cairo/files/patch-configure.diff
Added Paths:
-----------
trunk/dports/graphics/cairo/files/patch-tiger.diff
Removed Paths:
-------------
trunk/dports/graphics/cairo/files/patch-src-cairo-tor-scan-converter.c.diff
Modified: trunk/dports/graphics/cairo/Portfile
===================================================================
--- trunk/dports/graphics/cairo/Portfile 2015-05-08 03:50:17 UTC (rev 135959)
+++ trunk/dports/graphics/cairo/Portfile 2015-05-08 03:59:24 UTC (rev 135960)
@@ -11,7 +11,8 @@
name cairo
conflicts cairo-devel
set my_name cairo
-version 1.14.0
+version 1.14.2
+revision 1
categories graphics
maintainers ryandesign
license {LGPL-2.1 MPL-1.1}
@@ -30,8 +31,8 @@
advantage of display hardware acceleration when \
available (e.g. through the X Render Extension).
-checksums rmd160 87213a12c9789ff78dfbffbe4555aa28811c12c5 \
- sha256 2cf5f81432e77ea4359af9dcd0f4faf37d015934501391c311bfd2d19a0134b7
+checksums rmd160 36cb30e1db06135bd291acc8a1f0a1f2d95ecb14 \
+ sha256 c919d999ddb1bbbecd4bbe65299ca2abd2079c7e13d224577895afa7005ecceb
depends_build port:pkgconfig
@@ -48,9 +49,24 @@
# Prevent cairo from using librsvg, libspectre, poppler.
patchfiles-append patch-configure.diff
-# Fix crash.
-patchfiles-append patch-src-cairo-tor-scan-converter.c.diff
+# Restore support for Quartz on Tiger. Use this patch always, not just on Tiger,
+# so that cairo built on Leopard or later can still run on Tiger. Continued
+# support for Tiger is being discussed on the cairo mailing list.
+patchfiles-append patch-tiger.diff
+platform darwin 8 {
+ notes-append "
+The developers of Cairo may remove support for Mac OS X v10.4 Tiger soon. See:
+http://lists.cairographics.org/archives/cairo/2015-March/026057.html
+
+Many ports in MacPorts require Cairo, including anything that uses GTK+.\
+If you rely on Cairo on Tiger, please politely let the developers of Cairo know\
+by writing to their mailing list:
+
+http://lists.cairographics.org/mailman/listinfo/cairo
+"
+}
+
# https://trac.macports.org/ticket/34137
compiler.blacklist-append {clang < 318.0.61}
Modified: trunk/dports/graphics/cairo/files/patch-configure.diff
===================================================================
--- trunk/dports/graphics/cairo/files/patch-configure.diff 2015-05-08 03:50:17 UTC (rev 135959)
+++ trunk/dports/graphics/cairo/files/patch-configure.diff 2015-05-08 03:59:24 UTC (rev 135960)
@@ -1,6 +1,6 @@
---- configure.orig 2014-10-13 20:47:29.000000000 -0500
-+++ configure 2014-10-14 19:35:14.000000000 -0500
-@@ -30634,7 +30634,7 @@
+--- configure.orig 2015-03-10 20:43:14.000000000 -0500
++++ configure 2015-03-15 19:19:36.000000000 -0500
+@@ -30801,7 +30801,7 @@
@@ -9,7 +9,7 @@
test_ps=no
any2ppm_ps=no
if test "x$use_ps" = "xyes"; then
-@@ -31031,7 +31031,7 @@
+@@ -31198,7 +31198,7 @@
# poppler-0.17.4 fixes text-pattern and text-transform
@@ -18,7 +18,7 @@
test_pdf=no
any2ppm_pdf=no
if test "x$use_pdf" = "xyes"; then
-@@ -31401,7 +31401,7 @@
+@@ -31568,7 +31568,7 @@
Deleted: trunk/dports/graphics/cairo/files/patch-src-cairo-tor-scan-converter.c.diff
===================================================================
--- trunk/dports/graphics/cairo/files/patch-src-cairo-tor-scan-converter.c.diff 2015-05-08 03:50:17 UTC (rev 135959)
+++ trunk/dports/graphics/cairo/files/patch-src-cairo-tor-scan-converter.c.diff 2015-05-08 03:59:24 UTC (rev 135960)
@@ -1,15 +0,0 @@
-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;
Copied: trunk/dports/graphics/cairo/files/patch-tiger.diff (from rev 135955, trunk/dports/graphics/cairo-devel/files/patch-tiger.diff)
===================================================================
--- trunk/dports/graphics/cairo/files/patch-tiger.diff (rev 0)
+++ trunk/dports/graphics/cairo/files/patch-tiger.diff 2015-05-08 03:59:24 UTC (rev 135960)
@@ -0,0 +1,49 @@
+Revert this commit which removed Tiger support:
+http://cgit.freedesktop.org/cairo/commit/?id=70cc8f250b5669e757b4f044571ba0f71e3dea9e
+--- src/cairo-quartz-font.c.orig 2015-03-10 17:21:07.000000000 -0500
++++ src/cairo-quartz-font.c 2015-04-24 23:27:49.000000000 -0500
+@@ -81,6 +81,9 @@
+ static void (*CGContextSetAllowsFontSmoothingPtr) (CGContextRef, bool) = NULL;
+ static bool (*CGContextGetAllowsFontSmoothingPtr) (CGContextRef) = NULL;
+
++/* Not public in the least bit */
++static CGPathRef (*CGFontGetGlyphPathPtr) (CGFontRef fontRef, CGAffineTransform *textTransform, int unknown, CGGlyph glyph) = NULL;
++
+ /* CGFontGetHMetrics isn't public, but the other functions are public/present in 10.5 */
+ typedef struct {
+ int ascent;
+@@ -124,6 +127,7 @@
+ /* These have the same name in 10.4 and 10.5 */
+ CGFontGetUnitsPerEmPtr = dlsym(RTLD_DEFAULT, "CGFontGetUnitsPerEm");
+ CGFontGetGlyphAdvancesPtr = dlsym(RTLD_DEFAULT, "CGFontGetGlyphAdvances");
++ CGFontGetGlyphPathPtr = dlsym(RTLD_DEFAULT, "CGFontGetGlyphPath");
+
+ CGFontGetHMetricsPtr = dlsym(RTLD_DEFAULT, "CGFontGetHMetrics");
+ CGFontGetAscentPtr = dlsym(RTLD_DEFAULT, "CGFontGetAscent");
+@@ -140,6 +144,7 @@
+ CGFontGetGlyphsForUnicharsPtr &&
+ CGFontGetUnitsPerEmPtr &&
+ CGFontGetGlyphAdvancesPtr &&
++ CGFontGetGlyphPathPtr &&
+ (CGFontGetHMetricsPtr || (CGFontGetAscentPtr && CGFontGetDescentPtr && CGFontGetLeadingPtr)))
+ _cairo_quartz_font_symbols_present = TRUE;
+
+@@ -545,7 +550,6 @@
+ CGGlyph glyph = _cairo_quartz_scaled_glyph_index (scaled_glyph);
+ CGAffineTransform textMatrix;
+ CGPathRef glyphPath;
+- CTFontRef ctFont;
+ cairo_path_fixed_t *path;
+
+ if (glyph == INVALID_GLYPH) {
+@@ -560,9 +564,7 @@
+ -font->base.scale.yy,
+ 0, 0);
+
+- ctFont = CTFontCreateWithGraphicsFont (font_face->cgFont, 0.0, NULL, NULL);
+- glyphPath = CTFontCreatePathForGlyph (ctFont, glyph, &textMatrix);
+- CFRelease (ctFont);
++ glyphPath = CGFontGetGlyphPathPtr (font_face->cgFont, &textMatrix, 0, glyph);
+ if (!glyphPath)
+ return CAIRO_INT_STATUS_UNSUPPORTED;
+
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150507/6deba735/attachment.html>
More information about the macports-changes
mailing list