<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[135960] trunk/dports/graphics/cairo</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/135960">135960</a></dd>
<dt>Author</dt> <dd>ryandesign@macports.org</dd>
<dt>Date</dt> <dd>2015-05-07 20:59:24 -0700 (Thu, 07 May 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>cairo: update to 1.14.2; add a note about the possible removal of Tiger support in the future</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsgraphicscairoPortfile">trunk/dports/graphics/cairo/Portfile</a></li>
<li><a href="#trunkdportsgraphicscairofilespatchconfigurediff">trunk/dports/graphics/cairo/files/patch-configure.diff</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportsgraphicscairofilespatchtigerdiff">trunk/dports/graphics/cairo/files/patch-tiger.diff</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkdportsgraphicscairofilespatchsrccairotorscanconvertercdiff">trunk/dports/graphics/cairo/files/patch-src-cairo-tor-scan-converter.c.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsgraphicscairoPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/graphics/cairo/Portfile (135959 => 135960)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -11,7 +11,8 @@
</span><span class="cx"> name cairo
</span><span class="cx"> conflicts cairo-devel
</span><span class="cx"> set my_name cairo
</span><del>-version 1.14.0
</del><ins>+version 1.14.2
+revision 1
</ins><span class="cx"> categories graphics
</span><span class="cx"> maintainers ryandesign
</span><span class="cx"> license {LGPL-2.1 MPL-1.1}
</span><span class="lines">@@ -30,8 +31,8 @@
</span><span class="cx"> advantage of display hardware acceleration when \
</span><span class="cx"> available (e.g. through the X Render Extension).
</span><span class="cx">
</span><del>-checksums rmd160 87213a12c9789ff78dfbffbe4555aa28811c12c5 \
- sha256 2cf5f81432e77ea4359af9dcd0f4faf37d015934501391c311bfd2d19a0134b7
</del><ins>+checksums rmd160 36cb30e1db06135bd291acc8a1f0a1f2d95ecb14 \
+ sha256 c919d999ddb1bbbecd4bbe65299ca2abd2079c7e13d224577895afa7005ecceb
</ins><span class="cx">
</span><span class="cx"> depends_build port:pkgconfig
</span><span class="cx">
</span><span class="lines">@@ -48,9 +49,24 @@
</span><span class="cx"> # Prevent cairo from using librsvg, libspectre, poppler.
</span><span class="cx"> patchfiles-append patch-configure.diff
</span><span class="cx">
</span><del>-# Fix crash.
-patchfiles-append patch-src-cairo-tor-scan-converter.c.diff
</del><ins>+# 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:
</ins><span class="cx">
</span><ins>+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
+"
+}
+
</ins><span class="cx"> # https://trac.macports.org/ticket/34137
</span><span class="cx"> compiler.blacklist-append {clang < 318.0.61}
</span><span class="cx">
</span></span></pre></div>
<a id="trunkdportsgraphicscairofilespatchconfigurediff"></a>
<div class="modfile"><h4>Modified: trunk/dports/graphics/cairo/files/patch-configure.diff (135959 => 135960)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><del>---- configure.orig 2014-10-13 20:47:29.000000000 -0500
-+++ configure 2014-10-14 19:35:14.000000000 -0500
-@@ -30634,7 +30634,7 @@
</del><ins>+--- configure.orig 2015-03-10 20:43:14.000000000 -0500
++++ configure 2015-03-15 19:19:36.000000000 -0500
+@@ -30801,7 +30801,7 @@
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -9,7 +9,7 @@
</span><span class="cx"> test_ps=no
</span><span class="cx"> any2ppm_ps=no
</span><span class="cx"> if test "x$use_ps" = "xyes"; then
</span><del>-@@ -31031,7 +31031,7 @@
</del><ins>+@@ -31198,7 +31198,7 @@
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> # poppler-0.17.4 fixes text-pattern and text-transform
</span><span class="lines">@@ -18,7 +18,7 @@
</span><span class="cx"> test_pdf=no
</span><span class="cx"> any2ppm_pdf=no
</span><span class="cx"> if test "x$use_pdf" = "xyes"; then
</span><del>-@@ -31401,7 +31401,7 @@
</del><ins>+@@ -31568,7 +31568,7 @@
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="trunkdportsgraphicscairofilespatchsrccairotorscanconvertercdiff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/graphics/cairo/files/patch-src-cairo-tor-scan-converter.c.diff (135959 => 135960)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,15 +0,0 @@
</span><del>-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;
</del></span></pre></div>
<a id="trunkdportsgraphicscairofilespatchtigerdifffromrev135955trunkdportsgraphicscairodevelfilespatchtigerdiff"></a>
<div class="copfile"><h4>Copied: trunk/dports/graphics/cairo/files/patch-tiger.diff (from rev 135955, trunk/dports/graphics/cairo-devel/files/patch-tiger.diff) (0 => 135960)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -0,0 +1,49 @@
</span><ins>+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;
+
</ins></span></pre>
</div>
</div>
</body>
</html>