<!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>[118848] trunk/dports/graphics/librsvg</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/118848">118848</a></dd>
<dt>Author</dt> <dd>devans@macports.org</dd>
<dt>Date</dt> <dd>2014-04-12 12:38:53 -0700 (Sat, 12 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>librsvg: update to version 2.40.2, add default variant +viewer that can be disabled by people who don't want gtk3 installed at the expense of the rsvg-view-3 utility (#43328, #43331).</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsgraphicslibrsvgPortfile">trunk/dports/graphics/librsvg/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportsgraphicslibrsvgfilespatchdisableviewerdiff">trunk/dports/graphics/librsvg/files/patch-disable-viewer.diff</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkdportsgraphicslibrsvgfilespatchreplacecanonicalizefilenamediff">trunk/dports/graphics/librsvg/files/patch-replace-canonicalize-file-name.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsgraphicslibrsvgPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/graphics/librsvg/Portfile (118847 => 118848)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/graphics/librsvg/Portfile 2014-04-12 17:03:02 UTC (rev 118847)
+++ trunk/dports/graphics/librsvg/Portfile 2014-04-12 19:38:53 UTC (rev 118848)
</span><span class="lines">@@ -5,7 +5,7 @@
</span><span class="cx"> PortGroup archcheck 1.0
</span><span class="cx">
</span><span class="cx"> name librsvg
</span><del>-version 2.40.1
</del><ins>+version 2.40.2
</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">@@ -19,10 +19,11 @@
</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 6e0212214c7acc6d570d1dbb196bde3678e84525 \
- sha256 8813b4fe776d5e7acbce28bacbaed30ccb0cec3734eb3632c711a16ebe2961d7
</del><ins>+checksums rmd160 06350bcebfa20965afcd15e1ced92e689277e9f9 \
+ sha256 48049b643294636df7de1a4b997414d699666f5dc44776945c218a257d2a291c
</ins><span class="cx">
</span><del>-depends_build port:pkgconfig
</del><ins>+depends_build port:pkgconfig \
+ port:gtk-doc
</ins><span class="cx">
</span><span class="cx"> depends_lib path:lib/pkgconfig/glib-2.0.pc:glib2 \
</span><span class="cx"> path:lib/pkgconfig/cairo.pc:cairo \
</span><span class="lines">@@ -30,7 +31,6 @@
</span><span class="cx"> port:libcroco \
</span><span class="cx"> port:libxml2 \
</span><span class="cx"> port:gdk-pixbuf2 \
</span><del>- port:gtk3 \
</del><span class="cx"> port:vala
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -43,8 +43,6 @@
</span><span class="cx"> lib/libpangocairo-1.0.dylib \
</span><span class="cx"> lib/libxml2.dylib
</span><span class="cx">
</span><del>-patchfiles patch-replace-canonicalize-file-name.diff
-
</del><span class="cx"> configure.args --enable-introspection=yes \
</span><span class="cx"> --enable-vala=yes \
</span><span class="cx"> --disable-Bsymbolic
</span><span class="lines">@@ -72,6 +70,22 @@
</span><span class="cx"> close $fp
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+# viewer variant can be disabled by people who don't want gtk3 installed
+# at the expense of the rsvg-view-3 utility (#43328)
+
+variant viewer description "Enable the build of the rsvg-view-3 utility." {
+ depends_lib-append port:gtk3
+}
+
+default_variants +viewer
+
+if {![variant_isset viewer]} {
+ patchfiles-append patch-disable-viewer.diff
+
+ use_autoreconf yes
+ autoreconf.args -fvi
+}
+
</ins><span class="cx"> post-destroot {
</span><span class="cx"> set python.branch ${pyversion}
</span><span class="cx"> set python.bin ${frameworks_dir}/Python.framework/Versions/${python.branch}/bin/python${python.branch}
</span></span></pre></div>
<a id="trunkdportsgraphicslibrsvgfilespatchdisableviewerdiff"></a>
<div class="addfile"><h4>Added: trunk/dports/graphics/librsvg/files/patch-disable-viewer.diff (0 => 118848)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/graphics/librsvg/files/patch-disable-viewer.diff (rev 0)
+++ trunk/dports/graphics/librsvg/files/patch-disable-viewer.diff 2014-04-12 19:38:53 UTC (rev 118848)
</span><span class="lines">@@ -0,0 +1,15 @@
</span><ins>+--- Makefile.am.orig 2014-04-12 10:51:16.000000000 -0700
++++ Makefile.am 2014-04-12 10:52:04.000000000 -0700
+@@ -8,9 +8,9 @@
+ lib_LTLIBRARIES = librsvg-@RSVG_API_MAJOR_VERSION@.la
+
+ bin_PROGRAMS = rsvg-convert
+-if HAVE_GTK_3
+-bin_PROGRAMS += rsvg-view-3
+-endif
++#if HAVE_GTK_3
++#bin_PROGRAMS += rsvg-view-3
++#endif
+
+ headers = \
+ rsvg.h \
</ins></span></pre></div>
<a id="trunkdportsgraphicslibrsvgfilespatchreplacecanonicalizefilenamediff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/graphics/librsvg/files/patch-replace-canonicalize-file-name.diff (118847 => 118848)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/graphics/librsvg/files/patch-replace-canonicalize-file-name.diff 2014-04-12 17:03:02 UTC (rev 118847)
+++ trunk/dports/graphics/librsvg/files/patch-replace-canonicalize-file-name.diff 2014-04-12 19:38:53 UTC (rev 118848)
</span><span class="lines">@@ -1,45 +0,0 @@
</span><del>-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
</del></span></pre>
</div>
</div>
</body>
</html>