<!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>[121391] users/devans/dports/graphics/inkscape-0.91</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/121391">121391</a></dd>
<dt>Author</dt> <dd>devans@macports.org</dd>
<dt>Date</dt> <dd>2014-06-24 12:31:47 -0700 (Tue, 24 Jun 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>devans/dports: inkscape-0.91, patch to revert bzr 13429 that broke LPE Bend.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#usersdevansdportsgraphicsinkscape091Portfile">users/devans/dports/graphics/inkscape-0.91/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#usersdevansdportsgraphicsinkscape091filespatchrevertr134229diff">users/devans/dports/graphics/inkscape-0.91/files/patch-revert-r134229.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="usersdevansdportsgraphicsinkscape091Portfile"></a>
<div class="modfile"><h4>Modified: users/devans/dports/graphics/inkscape-0.91/Portfile (121390 => 121391)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/dports/graphics/inkscape-0.91/Portfile 2014-06-24 19:29:06 UTC (rev 121390)
+++ users/devans/dports/graphics/inkscape-0.91/Portfile 2014-06-24 19:31:47 UTC (rev 121391)
</span><span class="lines">@@ -53,6 +53,8 @@
</span><span class="cx"> port:libwpg \
</span><span class="cx"> port:gtkspell2
</span><span class="cx">
</span><ins>+patchfiles patch-revert-r134229.diff
+
</ins><span class="cx"> post-patch {
</span><span class="cx"> xinstall -m 755 ${filespath}/autogen.sh ${worksrcpath}
</span><span class="cx"> }
</span></span></pre></div>
<a id="usersdevansdportsgraphicsinkscape091filespatchrevertr134229diff"></a>
<div class="addfile"><h4>Added: users/devans/dports/graphics/inkscape-0.91/files/patch-revert-r134229.diff (0 => 121391)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/dports/graphics/inkscape-0.91/files/patch-revert-r134229.diff (rev 0)
+++ users/devans/dports/graphics/inkscape-0.91/files/patch-revert-r134229.diff 2014-06-24 19:31:47 UTC (rev 121391)
</span><span class="lines">@@ -0,0 +1,103 @@
</span><ins>+diff -ur src.orig/sp-lpe-item.cpp src/sp-lpe-item.cpp
+--- src.orig/sp-lpe-item.cpp 2014-06-24 12:03:08.000000000 -0700
++++ src/sp-lpe-item.cpp 2014-06-24 12:03:21.000000000 -0700
+@@ -50,6 +50,8 @@
+ #include <algorithm>
+
+ /* LPEItem base class */
++static void sp_lpe_item_enable_path_effects(SPLPEItem *lpeitem, bool enable);
++
+ static void lpeobject_ref_modified(SPObject *href, guint flags, SPLPEItem *lpeitem);
+
+ static void sp_lpe_item_create_original_path_recursive(SPLPEItem *lpeitem);
+@@ -113,7 +115,7 @@
+ this->current_path_effect = NULL;
+
+ // Disable the path effects while populating the LPE list
+- enablePathEffects(false);
++ sp_lpe_item_enable_path_effects(this, false);
+
+ // disconnect all modified listeners:
+ for ( std::list<sigc::connection>::iterator mod_it = this->lpe_modified_connection_list->begin();
+@@ -166,7 +168,7 @@
+ }
+ }
+
+- enablePathEffects(true);
++ sp_lpe_item_enable_path_effects(this, true);
+ }
+ break;
+
+@@ -407,7 +409,7 @@
+ sp_lpe_item_update_patheffect(this, false, true);
+
+ // Disable the path effects while preparing the new lpe
+- enablePathEffects(false);
++ sp_lpe_item_enable_path_effects(this, false);
+
+ // Add the new reference to the list of LPE references
+ HRefList hreflist;
+@@ -444,7 +446,7 @@
+ }
+
+ //Enable the path effects now that everything is ready to apply the new path effect
+- enablePathEffects(true);
++ sp_lpe_item_enable_path_effects(this, true);
+
+ // Apply the path effect
+ sp_lpe_item_update_patheffect(this, true, true);
+@@ -940,6 +942,24 @@
+ return forked;
+ }
+
++// Enable or disable the path effects of the item.
++// The counter allows nested calls
++static void sp_lpe_item_enable_path_effects(SPLPEItem *lpeitem, bool enable)
++{
++ if (enable) {
++ lpeitem->path_effects_enabled++;
++ }
++ else {
++ lpeitem->path_effects_enabled--;
++ }
++}
++
++// Are the path effects enabled on this item ?
++bool SPLPEItem::pathEffectsEnabled() const
++{
++ return path_effects_enabled > 0;
++}
++
+ /*
+ Local Variables:
+ mode:c++
+diff -ur src.orig/sp-lpe-item.h src/sp-lpe-item.h
+--- src.orig/sp-lpe-item.h 2014-06-24 12:03:08.000000000 -0700
++++ src/sp-lpe-item.h 2014-06-24 12:03:21.000000000 -0700
+@@ -39,13 +39,11 @@
+ typedef std::list<Inkscape::LivePathEffect::LPEObjectReference *> PathEffectList;
+
+ class SPLPEItem : public SPItem {
+-private:
+- mutable bool path_effects_enabled; // (mutable because preserves logical const-ness)
+-
+ public:
+- SPLPEItem();
+- virtual ~SPLPEItem();
++ SPLPEItem();
++ virtual ~SPLPEItem();
+
++ int path_effects_enabled;
+
+ PathEffectList* path_effect_list;
+ std::list<sigc::connection> *lpe_modified_connection_list; // this list contains the connections for listening to lpeobject parameter changes
+@@ -74,8 +72,7 @@
+
+ bool performPathEffect(SPCurve *curve);
+
+- void enablePathEffects(bool enable) const { path_effects_enabled = enable; }; // (const because logically const)
+- bool pathEffectsEnabled() const { return path_effects_enabled; };
++ bool pathEffectsEnabled() const;
+ bool hasPathEffect() const;
+ bool hasPathEffectOfType(int const type) const;
+ bool hasPathEffectRecursive() const;
</ins></span></pre>
</div>
</div>
</body>
</html>