<!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>[116612] users/devans/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/116612">116612</a></dd>
<dt>Author</dt> <dd>devans@macports.org</dd>
<dt>Date</dt> <dd>2014-01-30 12:07:41 -0800 (Thu, 30 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>user/devans/dports: librsvg, copy from trunk and update to version 2.40.1 for testing.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#usersdevansdportsgraphicslibrsvgPortfile">users/devans/dports/graphics/librsvg/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li>users/devans/dports/graphics/librsvg/</li>
<li><a href="#usersdevansdportsgraphicslibrsvgfilespatchreplacecanonicalizefilenamediff">users/devans/dports/graphics/librsvg/files/patch-replace-canonicalize-file-name.diff</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#usersdevansdportsgraphicslibrsvgfilespatchconfigurediff">users/devans/dports/graphics/librsvg/files/patch-configure.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="usersdevansdportsgraphicslibrsvgPortfile"></a>
<div class="modfile"><h4>Modified: users/devans/dports/graphics/librsvg/Portfile (116602 => 116612)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/graphics/librsvg/Portfile        2014-01-30 02:10:21 UTC (rev 116602)
+++ users/devans/dports/graphics/librsvg/Portfile        2014-01-30 20:07:41 UTC (rev 116612)
</span><span class="lines">@@ -5,8 +5,7 @@
</span><span class="cx"> PortGroup archcheck 1.0
</span><span class="cx">
</span><span class="cx"> name librsvg
</span><del>-version 2.36.4
-revision 5
</del><ins>+version 2.40.1
</ins><span class="cx"> license {GPL-2+ LGPL-2+}
</span><span class="cx"> set branch [join [lrange [split ${version} .] 0 1] .]
</span><span class="cx"> categories graphics gnome
</span><span class="lines">@@ -20,42 +19,34 @@
</span><span class="cx"> master_sites gnome:sources/${name}/${branch}/
</span><span class="cx"> use_xz yes
</span><span class="cx">
</span><del>-checksums rmd160 b9765edaccd7e40997a3a141e4d21c5a13f6f2a1 \
- sha256 1021935204798f4f0ad3004a09b583668ea94a48593461b147fdcff68a18e6c2
</del><ins>+checksums rmd160 6e0212214c7acc6d570d1dbb196bde3678e84525 \
+ sha256 8813b4fe776d5e7acbce28bacbaed30ccb0cec3734eb3632c711a16ebe2961d7
</ins><span class="cx">
</span><span class="cx"> depends_build port:pkgconfig
</span><span class="cx">
</span><del>-depends_lib port:libart_lgpl \
</del><ins>+depends_lib path:lib/pkgconfig/glib-2.0.pc:glib2 \
</ins><span class="cx"> path:lib/pkgconfig/cairo.pc:cairo \
</span><ins>+ path:lib/pkgconfig/pangocairo.pc:pango \
</ins><span class="cx"> port:libcroco \
</span><del>- port:fontconfig \
- port:freetype \
- path:lib/pkgconfig/glib-2.0.pc:glib2 \
- port:libgsf \
- port:libpng \
</del><span class="cx"> port:libxml2 \
</span><del>- path:lib/pkgconfig/pango.pc:pango \
- path:lib/pkgconfig/gdk-pixbuf-2.0.pc:gdk-pixbuf2
</del><ins>+ port:gdk-pixbuf2 \
+ port:gtk3 \
+ port:vala
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> set pyversion 2.7
</span><span class="cx"> depends_run port:python[join [split ${pyversion} "."] ""]
</span><span class="cx">
</span><del>-archcheck.files lib/libart_lgpl_2.dylib \
- lib/libcairo.dylib \
</del><ins>+archcheck.files lib/libcairo.dylib \
</ins><span class="cx"> lib/libcroco-0.6.dylib \
</span><del>- lib/libfontconfig.dylib \
- lib/libfreetype.dylib \
</del><span class="cx"> lib/libglib-2.0.dylib \
</span><del>- lib/libgsf-1.dylib \
- lib/libpango-1.0.dylib \
</del><ins>+ lib/libpangocairo-1.0.dylib \
</ins><span class="cx"> lib/libxml2.dylib
</span><span class="cx">
</span><del>-patch.pre_args -p1
-patchfiles patch-configure.diff
</del><ins>+patchfiles patch-replace-canonicalize-file-name.diff
</ins><span class="cx">
</span><del>-configure.args --disable-gtk-theme \
- --disable-gtk-doc \
</del><ins>+configure.args --enable-introspection=yes \
+ --enable-vala=yes \
</ins><span class="cx"> --disable-Bsymbolic
</span><span class="cx">
</span><span class="cx"> # librsvg's build process includes the gobject-introspection Makefile, causing
</span></span></pre></div>
<a id="usersdevansdportsgraphicslibrsvgfilespatchconfigurediff"></a>
<div class="delfile"><h4>Deleted: users/devans/dports/graphics/librsvg/files/patch-configure.diff (116602 => 116612)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/graphics/librsvg/files/patch-configure.diff        2014-01-30 02:10:21 UTC (rev 116602)
+++ users/devans/dports/graphics/librsvg/files/patch-configure.diff        2014-01-30 20:07:41 UTC (rev 116612)
</span><span class="lines">@@ -1,23 +0,0 @@
</span><del>---- a/configure        2012-09-09 11:55:12.000000000 -0700
-+++ b/configure        2012-09-09 11:57:25.000000000 -0700
-@@ -13747,16 +13747,16 @@
-
-
- if test "$have_gtk_2" = "yes"; then
-- HAVE_GTK_2_TRUE=
-- HAVE_GTK_2_FALSE='#'
-+ HAVE_GTK_2_TRUE='#'
-+ HAVE_GTK_2_FALSE=
- else
- HAVE_GTK_2_TRUE='#'
- HAVE_GTK_2_FALSE=
- fi
-
- if test "$have_gtk_3" = "yes"; then
-- HAVE_GTK_3_TRUE=
-- HAVE_GTK_3_FALSE='#'
-+ HAVE_GTK_3_TRUE='#'
-+ HAVE_GTK_3_FALSE=
- else
- HAVE_GTK_3_TRUE='#'
- HAVE_GTK_3_FALSE=
</del></span></pre></div>
<a id="usersdevansdportsgraphicslibrsvgfilespatchreplacecanonicalizefilenamediff"></a>
<div class="addfile"><h4>Added: users/devans/dports/graphics/librsvg/files/patch-replace-canonicalize-file-name.diff (0 => 116612)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/dports/graphics/librsvg/files/patch-replace-canonicalize-file-name.diff         (rev 0)
+++ users/devans/dports/graphics/librsvg/files/patch-replace-canonicalize-file-name.diff        2014-01-30 20:07:41 UTC (rev 116612)
</span><span class="lines">@@ -0,0 +1,45 @@
</span><ins>+From 02cb19835cb52bd84b0b5eaca1b4d6338417d261 Mon Sep 17 00:00:00 2001
+From: Antoine Jacoutot <ajacoutot@gnome.org>
+Date: Tue, 15 Oct 2013 07:36:30 +0000
+Subject: portability: canonicalize_file_name -> realpath
+
+canonicalize_file_name() is a GNU extension so let's use the portable
+realpath() instead.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=710163
+---
+diff --git a/rsvg-base.c b/rsvg-base.c
+index cb9f64a..fb829e7 100644
+--- rsvg-base.c
++++ rsvg-base.c
+@@ -50,6 +50,8 @@
+ #include <math.h>
+ #include <string.h>
+ #include <stdarg.h>
++#include <limits.h>
++#include <stdlib.h>
+
+ #include "rsvg-path.h"
+ #include "rsvg-paint-server.h"
+@@ -2190,8 +2192,7 @@ _rsvg_handle_allow_load (RsvgHandle *handle,
+ dir = g_file_get_path (base);
+ g_object_unref (base);
+
+- /* FIXME portability */
+- cdir = canonicalize_file_name (dir);
++ cdir = realpath (dir, NULL);
+ g_free (dir);
+ if (cdir == NULL)
+ goto deny;
+@@ -2200,8 +2201,7 @@ _rsvg_handle_allow_load (RsvgHandle *handle,
+ if (path == NULL)
+ goto deny;
+
+- /* FIXME portability */
+- cpath = canonicalize_file_name (path);
++ cpath = realpath (path, NULL);
+ g_free (path);
+
+ if (cpath == NULL)
+--
+cgit v0.9.2
</ins></span></pre>
</div>
</div>
</body>
</html>