<!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>[128925] trunk/dports/graphics</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/128925">128925</a></dd>
<dt>Author</dt> <dd>ryandesign@macports.org</dd>
<dt>Date</dt> <dd>2014-11-29 21:48:19 -0800 (Sat, 29 Nov 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>cairo, cairo-devel: update to 1.14.0 (#45391) and make Quartz support always enabled (#44414)</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>
<li><a href="#trunkdportsgraphicscairodevelPortfile">trunk/dports/graphics/cairo-devel/Portfile</a></li>
<li><a href="#trunkdportsgraphicscairodevelfilespatchconfigurediff">trunk/dports/graphics/cairo-devel/files/patch-configure.diff</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportsgraphicscairofilespatchsrccairotorscanconvertercdiff">trunk/dports/graphics/cairo/files/patch-src-cairo-tor-scan-converter.c.diff</a></li>
<li><a href="#trunkdportsgraphicscairodevelfilespatchsrccairotorscanconvertercdiff">trunk/dports/graphics/cairo-devel/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 (128924 => 128925)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/graphics/cairo/Portfile 2014-11-30 02:03:08 UTC (rev 128924)
+++ trunk/dports/graphics/cairo/Portfile 2014-11-30 05:48:19 UTC (rev 128925)
</span><span class="lines">@@ -11,8 +11,7 @@
</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.12.16
-revision 2
</del><ins>+version 1.14.0
</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">@@ -31,8 +30,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 379283c2f5c9690bdfd69c629b8efd59be7a8670 \
- sha256 2505959eb3f1de3e1841023b61585bfd35684b9733c7b6a3643f4f4cbde6d846
</del><ins>+checksums rmd160 87213a12c9789ff78dfbffbe4555aa28811c12c5 \
+ sha256 2cf5f81432e77ea4359af9dcd0f4faf37d015934501391c311bfd2d19a0134b7
</ins><span class="cx">
</span><span class="cx"> depends_build port:pkgconfig
</span><span class="cx">
</span><span class="lines">@@ -49,6 +48,9 @@
</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><ins>+# Fix crash.
+patchfiles-append patch-src-cairo-tor-scan-converter.c.diff
+
</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 class="lines">@@ -57,15 +59,6 @@
</span><span class="cx"> compiler.blacklist-append gcc-4.0
</span><span class="cx"> }
</span><span class="cx">
</span><del>-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"
- }
-}
-
</del><span class="cx"> configure.args --disable-gl \
</span><span class="cx"> --disable-quartz \
</span><span class="cx"> --disable-quartz-font \
</span><span class="lines">@@ -105,6 +98,11 @@
</span><span class="cx"> configure.args-replace --disable-quartz-font --enable-quartz-font
</span><span class="cx"> configure.args-replace --disable-quartz-image --enable-quartz-image
</span><span class="cx"> }
</span><ins>+
+ 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
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> variant x11 {
</span><span class="lines">@@ -122,6 +120,11 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> default_variants +x11
</span><ins>+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
+}
</ins><span class="cx">
</span><span class="cx"> test.run yes
</span><span class="cx"> test.target check
</span></span></pre></div>
<a id="trunkdportsgraphicscairofilespatchconfigurediff"></a>
<div class="modfile"><h4>Modified: trunk/dports/graphics/cairo/files/patch-configure.diff (128924 => 128925)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/graphics/cairo/files/patch-configure.diff 2014-11-30 02:03:08 UTC (rev 128924)
+++ trunk/dports/graphics/cairo/files/patch-configure.diff 2014-11-30 05:48:19 UTC (rev 128925)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><del>---- configure.orig 2013-08-26 12:00:41.000000000 -0500
-+++ configure 2013-10-02 10:25:37.000000000 -0500
-@@ -30488,7 +30488,7 @@
</del><ins>+--- configure.orig 2014-10-13 20:47:29.000000000 -0500
++++ configure 2014-10-14 19:35:14.000000000 -0500
+@@ -30634,7 +30634,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>-@@ -30885,7 +30885,7 @@
</del><ins>+@@ -31031,7 +31031,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,11 +18,11 @@
</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>-@@ -31255,7 +31255,7 @@
</del><ins>+@@ -31401,7 +31401,7 @@
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><del>--LIBRSVG_VERSION_REQUIRED=2.15.0
</del><ins>+-LIBRSVG_VERSION_REQUIRED=2.35.0
</ins><span class="cx"> +LIBRSVG_VERSION_REQUIRED=99999
</span><span class="cx"> test_svg=no
</span><span class="cx"> any2ppm_svg=no
</span></span></pre></div>
<a id="trunkdportsgraphicscairofilespatchsrccairotorscanconvertercdiff"></a>
<div class="addfile"><h4>Added: trunk/dports/graphics/cairo/files/patch-src-cairo-tor-scan-converter.c.diff (0 => 128925)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/graphics/cairo/files/patch-src-cairo-tor-scan-converter.c.diff (rev 0)
+++ trunk/dports/graphics/cairo/files/patch-src-cairo-tor-scan-converter.c.diff 2014-11-30 05:48:19 UTC (rev 128925)
</span><span class="lines">@@ -0,0 +1,15 @@
</span><ins>+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;
</ins></span></pre></div>
<a id="trunkdportsgraphicscairodevelPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/graphics/cairo-devel/Portfile (128924 => 128925)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/graphics/cairo-devel/Portfile 2014-11-30 02:03:08 UTC (rev 128924)
+++ trunk/dports/graphics/cairo-devel/Portfile 2014-11-30 05:48:19 UTC (rev 128925)
</span><span class="lines">@@ -11,8 +11,7 @@
</span><span class="cx"> name cairo-devel
</span><span class="cx"> conflicts cairo
</span><span class="cx"> set my_name cairo
</span><del>-version 1.12.16
-revision 2
</del><ins>+version 1.14.0
</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">@@ -32,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 379283c2f5c9690bdfd69c629b8efd59be7a8670 \
- sha256 2505959eb3f1de3e1841023b61585bfd35684b9733c7b6a3643f4f4cbde6d846
</del><ins>+checksums rmd160 87213a12c9789ff78dfbffbe4555aa28811c12c5 \
+ sha256 2cf5f81432e77ea4359af9dcd0f4faf37d015934501391c311bfd2d19a0134b7
</ins><span class="cx">
</span><span class="cx"> depends_build port:pkgconfig
</span><span class="cx">
</span><span class="lines">@@ -50,6 +49,9 @@
</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><ins>+# Fix crash.
+patchfiles-append patch-src-cairo-tor-scan-converter.c.diff
+
</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 class="lines">@@ -58,15 +60,6 @@
</span><span class="cx"> compiler.blacklist-append gcc-4.0
</span><span class="cx"> }
</span><span class="cx">
</span><del>-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"
- }
-}
-
</del><span class="cx"> configure.args --disable-gl \
</span><span class="cx"> --disable-quartz \
</span><span class="cx"> --disable-quartz-font \
</span><span class="lines">@@ -106,6 +99,11 @@
</span><span class="cx"> configure.args-replace --disable-quartz-font --enable-quartz-font
</span><span class="cx"> configure.args-replace --disable-quartz-image --enable-quartz-image
</span><span class="cx"> }
</span><ins>+
+ 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
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> variant x11 {
</span><span class="lines">@@ -123,10 +121,15 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> default_variants +x11
</span><ins>+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
+}
</ins><span class="cx">
</span><span class="cx"> test.run yes
</span><span class="cx"> test.target check
</span><span class="cx">
</span><span class="cx"> livecheck.type regex
</span><span class="cx"> livecheck.url ${homepage}news/
</span><del>-livecheck.regex ${my_name}-(\[0-9\]+\\.\[0-9\]*\[13579\]\\.\[0-9\]+)
</del><ins>+livecheck.regex ${my_name}-(\[0-9.\]+)
</ins></span></pre></div>
<a id="trunkdportsgraphicscairodevelfilespatchconfigurediff"></a>
<div class="modfile"><h4>Modified: trunk/dports/graphics/cairo-devel/files/patch-configure.diff (128924 => 128925)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/graphics/cairo-devel/files/patch-configure.diff 2014-11-30 02:03:08 UTC (rev 128924)
+++ trunk/dports/graphics/cairo-devel/files/patch-configure.diff 2014-11-30 05:48:19 UTC (rev 128925)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><del>---- configure.orig 2013-08-26 12:00:41.000000000 -0500
-+++ configure 2013-10-02 10:25:37.000000000 -0500
-@@ -30488,7 +30488,7 @@
</del><ins>+--- configure.orig 2014-10-13 20:47:29.000000000 -0500
++++ configure 2014-10-14 19:35:14.000000000 -0500
+@@ -30634,7 +30634,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>-@@ -30885,7 +30885,7 @@
</del><ins>+@@ -31031,7 +31031,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,11 +18,11 @@
</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>-@@ -31255,7 +31255,7 @@
</del><ins>+@@ -31401,7 +31401,7 @@
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><del>--LIBRSVG_VERSION_REQUIRED=2.15.0
</del><ins>+-LIBRSVG_VERSION_REQUIRED=2.35.0
</ins><span class="cx"> +LIBRSVG_VERSION_REQUIRED=99999
</span><span class="cx"> test_svg=no
</span><span class="cx"> any2ppm_svg=no
</span></span></pre></div>
<a id="trunkdportsgraphicscairodevelfilespatchsrccairotorscanconvertercdiff"></a>
<div class="addfile"><h4>Added: trunk/dports/graphics/cairo-devel/files/patch-src-cairo-tor-scan-converter.c.diff (0 => 128925)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/graphics/cairo-devel/files/patch-src-cairo-tor-scan-converter.c.diff (rev 0)
+++ trunk/dports/graphics/cairo-devel/files/patch-src-cairo-tor-scan-converter.c.diff 2014-11-30 05:48:19 UTC (rev 128925)
</span><span class="lines">@@ -0,0 +1,15 @@
</span><ins>+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;
</ins></span></pre>
</div>
</div>
</body>
</html>