<!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>[111805] 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/111805">111805</a></dd>
<dt>Author</dt> <dd>ryandesign@macports.org</dd>
<dt>Date</dt> <dd>2013-10-02 08:36:45 -0700 (Wed, 02 Oct 2013)</dd>
</dl>

<h3>Log Message</h3>
<pre>cairo, cairo-devel: update to 1.12.16</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>Removed Paths</h3>
<ul>
<li><a href="#trunkdportsgraphicscairodevelfilespatchllvmgccltodiff">trunk/dports/graphics/cairo-devel/files/patch-llvm-gcc-lto.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 (111804 => 111805)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/graphics/cairo/Portfile        2013-10-02 15:23:23 UTC (rev 111804)
+++ trunk/dports/graphics/cairo/Portfile        2013-10-02 15:36:45 UTC (rev 111805)
</span><span class="lines">@@ -11,7 +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.14
</del><ins>+version                     1.12.16
</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 +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  8198930d820f91480b69c8736b5b090b1a2e3100 \
-                            sha256  96d0d1e3f9b74d2ca3469ff187c5e5f25649b1ad35cf06f4f3a83847dff4ac13
</del><ins>+checksums                   rmd160  379283c2f5c9690bdfd69c629b8efd59be7a8670 \
+                            sha256  2505959eb3f1de3e1841023b61585bfd35684b9733c7b6a3643f4f4cbde6d846
</ins><span class="cx"> 
</span><span class="cx"> depends_build               port:pkgconfig
</span><span class="cx"> 
</span><span class="lines">@@ -41,7 +41,6 @@
</span><span class="cx">                             port:freetype \
</span><span class="cx">                             port:libpng \
</span><span class="cx">                             port:zlib \
</span><del>-                            port:lzo2 \
</del><span class="cx">                             port:expat
</span><span class="cx"> 
</span><span class="cx"> minimum_xcodeversions       {8 2.4.1}
</span><span class="lines">@@ -87,6 +86,9 @@
</span><span class="cx"> # Prevent cairo from using ghostscript.
</span><span class="cx"> configure.args-append       ac_cv_prog_GS=&quot;&quot;
</span><span class="cx"> 
</span><ins>+# Prevent cairo from using lzo2 because its GPL license makes cairo's effective license GPL too.
+configure.args-append       ac_cv_lib_lzo2_lzo2a_decompress=no
+
</ins><span class="cx"> variant opengl requires x11 description {Add OpenGL graphics interface} {
</span><span class="cx">     depends_lib-append      port:mesa
</span><span class="cx">     configure.args-delete   --disable-gl
</span></span></pre></div>
<a id="trunkdportsgraphicscairofilespatchconfigurediff"></a>
<div class="modfile"><h4>Modified: trunk/dports/graphics/cairo/files/patch-configure.diff (111804 => 111805)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/graphics/cairo/files/patch-configure.diff        2013-10-02 15:23:23 UTC (rev 111804)
+++ trunk/dports/graphics/cairo/files/patch-configure.diff        2013-10-02 15:36:45 UTC (rev 111805)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><del>---- configure.orig        2013-01-31 09:26:02.000000000 -0600
-+++ configure        2013-01-31 14:47:53.000000000 -0600
-@@ -30503,7 +30503,7 @@
</del><ins>+--- configure.orig        2013-08-26 12:00:41.000000000 -0500
++++ configure        2013-10-02 10:25:37.000000000 -0500
+@@ -30488,7 +30488,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 &quot;x$use_ps&quot; = &quot;xyes&quot;; then
</span><del>-@@ -30900,7 +30900,7 @@
</del><ins>+@@ -30885,7 +30885,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 &quot;x$use_pdf&quot; = &quot;xyes&quot;; then
</span><del>-@@ -31270,7 +31270,7 @@
</del><ins>+@@ -31255,7 +31255,7 @@
</ins><span class="cx">  
</span><span class="cx">  
</span><span class="cx">  
</span></span></pre></div>
<a id="trunkdportsgraphicscairodevelPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/graphics/cairo-devel/Portfile (111804 => 111805)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/graphics/cairo-devel/Portfile        2013-10-02 15:23:23 UTC (rev 111804)
+++ trunk/dports/graphics/cairo-devel/Portfile        2013-10-02 15:36:45 UTC (rev 111805)
</span><span class="lines">@@ -11,17 +11,18 @@
</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.11.4
-revision                    1
</del><ins>+version                     1.12.16
</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="cx"> homepage                    http://cairographics.org/
</span><span class="cx"> master_sites                ${homepage}snapshots/
</span><ins>+master_sites                ${homepage}releases/
</ins><span class="cx"> platforms                   darwin macosx
</span><span class="cx"> use_parallel_build          yes
</span><span class="cx"> dist_subdir                 ${my_name}
</span><span class="cx"> distname                    ${my_name}-${version}
</span><ins>+use_xz                      yes
</ins><span class="cx"> 
</span><span class="cx"> description                 a vector graphics library with cross-device output support
</span><span class="cx"> 
</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  18d4c3eb62727bbff02da36fef6426c485d535a5 \
-                            sha256  aa78ac12294b34f31cf2462343564996ea9f90de8c9f9da4eb6f9b3d10317e68
</del><ins>+checksums                   rmd160  379283c2f5c9690bdfd69c629b8efd59be7a8670 \
+                            sha256  2505959eb3f1de3e1841023b61585bfd35684b9733c7b6a3643f4f4cbde6d846
</ins><span class="cx"> 
</span><span class="cx"> depends_build               port:pkgconfig
</span><span class="cx"> 
</span><span class="lines">@@ -86,7 +87,10 @@
</span><span class="cx"> # Prevent cairo from using ghostscript.
</span><span class="cx"> configure.args-append       ac_cv_prog_GS=&quot;&quot;
</span><span class="cx"> 
</span><del>-variant opengl requires x11 conflicts no_x11 description {Add OpenGL graphics interface} {
</del><ins>+# Prevent cairo from using lzo2 because its GPL license makes cairo's effective license GPL too.
+configure.args-append       ac_cv_lib_lzo2_lzo2a_decompress=no
+
+variant opengl requires x11 description {Add OpenGL graphics interface} {
</ins><span class="cx">     depends_lib-append      port:mesa
</span><span class="cx">     configure.args-delete   --disable-gl
</span><span class="cx">     configure.args-append   --enable-gl --enable-glx
</span><span class="lines">@@ -103,13 +107,10 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-if {[string match *llvm-gcc* ${configure.compiler}]} {
-    patchfiles-append       patch-llvm-gcc-lto.diff
-}
-
-variant no_x11 conflicts opengl x11_xcb x11 description {Legacy compatibility variant} {}
-variant x11 conflicts no_x11 description {Enable X11 support} {
-    depends_lib-append      port:xrender port:xorg-xcb-util
</del><ins>+variant x11 {
+    depends_lib-append      port:xrender \
+                            port:xorg-libXext \
+                            port:xorg-xcb-util
</ins><span class="cx">     configure.args-delete   --disable-xlib \
</span><span class="cx">                             --without-x \
</span><span class="cx">                             --disable-xcb
</span><span class="lines">@@ -123,14 +124,8 @@
</span><span class="cx">                             --x-lib=${prefix}/lib
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-variant x11_xcb requires x11 conflicts no_x11 description {Legacy compatibility variant} {}
</del><ins>+default_variants            +x11
</ins><span class="cx"> 
</span><del>-if {[variant_isset no_x11]} {
-    default_variants -x11
-} else {
-    default_variants +x11
-}
-
</del><span class="cx"> test.run                    yes
</span><span class="cx"> test.target                 check
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkdportsgraphicscairodevelfilespatchconfigurediff"></a>
<div class="modfile"><h4>Modified: trunk/dports/graphics/cairo-devel/files/patch-configure.diff (111804 => 111805)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/graphics/cairo-devel/files/patch-configure.diff        2013-10-02 15:23:23 UTC (rev 111804)
+++ trunk/dports/graphics/cairo-devel/files/patch-configure.diff        2013-10-02 15:36:45 UTC (rev 111805)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><del>---- configure.orig        2012-03-23 14:35:31.000000000 -0500
-+++ configure        2012-04-12 06:11:54.000000000 -0500
-@@ -30131,7 +30131,7 @@
</del><ins>+--- configure.orig        2013-08-26 12:00:41.000000000 -0500
++++ configure        2013-10-02 10:25:37.000000000 -0500
+@@ -30488,7 +30488,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 &quot;x$use_ps&quot; = &quot;xyes&quot;; then
</span><del>-@@ -30528,7 +30528,7 @@
</del><ins>+@@ -30885,7 +30885,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 &quot;x$use_pdf&quot; = &quot;xyes&quot;; then
</span><del>-@@ -30898,7 +30898,7 @@
</del><ins>+@@ -31255,7 +31255,7 @@
</ins><span class="cx">  
</span><span class="cx">  
</span><span class="cx">  
</span></span></pre></div>
<a id="trunkdportsgraphicscairodevelfilespatchllvmgccltodiff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/graphics/cairo-devel/files/patch-llvm-gcc-lto.diff (111804 => 111805)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/graphics/cairo-devel/files/patch-llvm-gcc-lto.diff        2013-10-02 15:23:23 UTC (rev 111804)
+++ trunk/dports/graphics/cairo-devel/files/patch-llvm-gcc-lto.diff        2013-10-02 15:36:45 UTC (rev 111805)
</span><span class="lines">@@ -1,11 +0,0 @@
</span><del>---- configure.orig        2012-03-12 04:26:22.000000000 -0500
-+++ configure        2012-03-12 08:44:05.000000000 -0500
-@@ -17945,7 +17945,7 @@
- MAYBE_WARN=&quot;$MAYBE_WARN -erroff=E_ENUM_TYPE_MISMATCH_ARG \
-                         -erroff=E_ENUM_TYPE_MISMATCH_OP&quot;

--MAYBE_WARN=&quot;$MAYBE_WARN -fno-strict-aliasing -fno-common -flto&quot;
-+MAYBE_WARN=&quot;$MAYBE_WARN -fno-strict-aliasing -fno-common&quot;

- MAYBE_WARN=&quot;$MAYBE_WARN -Wp,-D_FORTIFY_SOURCE=2&quot;

</del></span></pre>
</div>
</div>

</body>
</html>