<!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>[129415] trunk/dports/graphics/inkscape</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/129415">129415</a></dd>
<dt>Author</dt> <dd>devans@macports.org</dd>
<dt>Date</dt> <dd>2014-12-12 19:08:39 -0800 (Fri, 12 Dec 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>inkscape: update upstream patches, add patch to fix build with poppler 0.29, increment revision.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsgraphicsinkscapePortfile">trunk/dports/graphics/inkscape/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportsgraphicsinkscapefilespatchpoppler0290diff">trunk/dports/graphics/inkscape/files/patch-poppler-0.29.0.diff</a></li>
<li><a href="#trunkdportsgraphicsinkscapefilespatchr10041thrur10043diff">trunk/dports/graphics/inkscape/files/patch-r10041-thru-r10043.diff</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkdportsgraphicsinkscapefilespatchr10041thrur10042diff">trunk/dports/graphics/inkscape/files/patch-r10041-thru-r10042.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsgraphicsinkscapePortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/graphics/inkscape/Portfile (129414 => 129415)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/graphics/inkscape/Portfile 2014-12-13 03:00:11 UTC (rev 129414)
+++ trunk/dports/graphics/inkscape/Portfile 2014-12-13 03:08:39 UTC (rev 129415)
</span><span class="lines">@@ -6,7 +6,7 @@
</span><span class="cx"> name inkscape
</span><span class="cx"> conflicts inkscape-devel
</span><span class="cx"> version 0.48.5
</span><del>-revision 5
</del><ins>+revision 6
</ins><span class="cx"> license GPL-2 LGPL-2.1
</span><span class="cx"> maintainers devans
</span><span class="cx"> categories graphics gnome
</span><span class="lines">@@ -48,7 +48,8 @@
</span><span class="cx"> port:gtkspell2
</span><span class="cx">
</span><span class="cx"> patchfiles patch-python-configure.ac.diff \
</span><del>- patch-r10041-thru-r10042.diff
</del><ins>+ patch-r10041-thru-r10043.diff \
+ patch-poppler-0.29.0.diff
</ins><span class="cx">
</span><span class="cx"> use_autoreconf yes
</span><span class="cx"> autoreconf.args -fvi
</span></span></pre></div>
<a id="trunkdportsgraphicsinkscapefilespatchpoppler0290diff"></a>
<div class="addfile"><h4>Added: trunk/dports/graphics/inkscape/files/patch-poppler-0.29.0.diff (0 => 129415)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/graphics/inkscape/files/patch-poppler-0.29.0.diff (rev 0)
+++ trunk/dports/graphics/inkscape/files/patch-poppler-0.29.0.diff 2014-12-13 03:08:39 UTC (rev 129415)
</span><span class="lines">@@ -0,0 +1,98 @@
</span><ins>+=== modified file 'configure.ac'
+--- configure.ac 2014-06-20 21:38:59 +0000
++++ configure.ac 2014-12-10 20:32:33 +0000
+@@ -593,6 +593,11 @@
+ AC_DEFINE(POPPLER_EVEN_NEWER_COLOR_SPACE_API, 1, [Use even newer color space API from Poppler >= 0.26.0])
+ fi
+
++PKG_CHECK_MODULES(POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API, poppler >= 0.29.0, popplernewernewcolorspaceapi=yes, popplernewernewcolorspaceapi=no)
++if test "x$popplernewernewcolorspaceapi" = "xyes"; then
++ AC_DEFINE(POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API, 1, [Use even newer new color space API from Poppler >= 0.29.0])
++fi
++
+ # Poppler's b604a008 commit changes this
+ AC_MSG_CHECKING([whether Poppler's GfxPatch no longer uses GfxColor])
+ popplergfxcolor="no"
+=== modified file 'src/extension/internal/pdfinput/pdf-parser.cpp'
+--- src/extension/internal/pdfinput/pdf-parser.cpp 2014-06-03 15:44:09 +0000
++++ src/extension/internal/pdfinput/pdf-parser.cpp 2014-12-10 20:32:30 +0000
+@@ -860,7 +860,9 @@
+ blendingColorSpace = NULL;
+ isolated = knockout = gFalse;
+ if (!obj4.dictLookup(const_cast<char*>("CS"), &obj5)->isNull()) {
+-#if defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API)
++#if defined(POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API)
++ blendingColorSpace = GfxColorSpace::parse(NULL, &obj5, NULL, NULL);
++#elif defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API)
+ blendingColorSpace = GfxColorSpace::parse(&obj5, NULL, NULL);
+ #elif defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI)
+ blendingColorSpace = GfxColorSpace::parse(&obj5, NULL);
+@@ -1085,7 +1087,13 @@
+
+ state->setFillPattern(NULL);
+ res->lookupColorSpace(args[0].getName(), &obj);
+-#if defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API)
++#if defined(POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API)
++ if (obj.isNull()) {
++ colorSpace = GfxColorSpace::parse(NULL, &args[0], NULL, NULL);
++ } else {
++ colorSpace = GfxColorSpace::parse(NULL, &obj, NULL, NULL);
++ }
++#elif defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API)
+ if (obj.isNull()) {
+ colorSpace = GfxColorSpace::parse(&args[0], NULL, NULL);
+ } else {
+@@ -1126,7 +1134,13 @@
+
+ state->setStrokePattern(NULL);
+ res->lookupColorSpace(args[0].getName(), &obj);
+-#if defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API)
++#if defined(POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API)
++ if (obj.isNull()) {
++ colorSpace = GfxColorSpace::parse(NULL, &args[0], NULL, NULL);
++ } else {
++ colorSpace = GfxColorSpace::parse(NULL, &obj, NULL, NULL);
++ }
++#elif defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API)
+ if (obj.isNull()) {
+ colorSpace = GfxColorSpace::parse(&args[0], NULL, NULL);
+ } else {
+@@ -2756,8 +2770,10 @@
+ }
+ }
+ if (!obj1.isNull()) {
+-#if defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API)
+- colorSpace = GfxColorSpace::parse(&obj1, NULL, NULL);
++#if defined(POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API)
++ colorSpace = GfxColorSpace::parse(NULL, &obj1, NULL, NULL);
++#elif defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API)
++ colorSpace = GfxColorSpace::parse(&obj1, NULL, NULL);
+ #elif defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI)
+ colorSpace = GfxColorSpace::parse(&obj1, NULL);
+ #else
+@@ -2847,8 +2863,10 @@
+ obj2.free();
+ }
+ }
+-#if defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API)
+- GfxColorSpace *maskColorSpace = GfxColorSpace::parse(&obj1, NULL, NULL);
++#if defined(POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API)
++ GfxColorSpace *maskColorSpace = GfxColorSpace::parse(NULL, &obj1, NULL, NULL);
++#elif defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API)
++ GfxColorSpace *maskColorSpace = GfxColorSpace::parse(&obj1, NULL, NULL);
+ #elif defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI)
+ maskColorSpace = GfxColorSpace::parse(&obj1, NULL);
+ #else
+@@ -3040,7 +3058,9 @@
+ if (obj1.dictLookup(const_cast<char*>("S"), &obj2)->isName(const_cast<char*>("Transparency"))) {
+ transpGroup = gTrue;
+ if (!obj1.dictLookup(const_cast<char*>("CS"), &obj3)->isNull()) {
+-#if defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API)
++#if defined(POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API)
++ blendingColorSpace = GfxColorSpace::parse(NULL, &obj3, NULL, NULL);
++#elif defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API)
+ blendingColorSpace = GfxColorSpace::parse(&obj3, NULL, NULL);
+ #elif defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI)
+ blendingColorSpace = GfxColorSpace::parse(&obj3, NULL);
+
+
</ins></span></pre></div>
<a id="trunkdportsgraphicsinkscapefilespatchr10041thrur10042diff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/graphics/inkscape/files/patch-r10041-thru-r10042.diff (129414 => 129415)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/graphics/inkscape/files/patch-r10041-thru-r10042.diff 2014-12-13 03:00:11 UTC (rev 129414)
+++ trunk/dports/graphics/inkscape/files/patch-r10041-thru-r10042.diff 2014-12-13 03:08:39 UTC (rev 129415)
</span><span class="lines">@@ -1,35 +0,0 @@
</span><del>-=== modified file 'src/io/inkjar.cpp'
---- src/io/inkjar.cpp 2013-11-12 20:52:11 +0000
-+++ src/io/inkjar.cpp 2014-09-12 15:05:40 +0000
-@@ -107,7 +107,7 @@
-
- bool JarFile::open()
- {
-- if ((fd = fopen(_filename, O_RDONLY)) < 0) {
-+ if (!(fd = fopen(_filename, "r"))) {
- fprintf(stderr, "open failed.\n");
- return false;
- }
-@@ -119,7 +119,7 @@
-
- bool JarFile::close()
- {
-- if (fd >= 0 && !fclose(fd)) {
-+ if (fd && !fclose(fd)) {
- inflateEnd(&_zs);
- return true;
- }
-
-=== modified file 'src/object-snapper.cpp'
---- src/object-snapper.cpp 2010-07-19 06:51:04 +0000
-+++ src/object-snapper.cpp 2014-09-12 15:05:40 +0000
-@@ -561,7 +561,7 @@
- // When it's within snapping range, then return it
- // (within snapping range == between p_min_on_cl and p_max_on_cl == 0 < ta < 1)
- Geom::Coord dist = Geom::L2(_snapmanager->getDesktop()->dt2doc(p_proj_on_cl) - p_inters);
-- SnappedPoint s(_snapmanager->getDesktop()->doc2dt(p_inters), p.getSourceType(), p.getSourceNum(), k->target_type, dist, getSnapperTolerance(), getSnapperAlwaysSnap(), true, k->target_bbox);
-+ SnappedPoint s(_snapmanager->getDesktop()->doc2dt(p_inters), p.getSourceType(), p.getSourceNum(), k->target_type, dist, getSnapperTolerance(), getSnapperAlwaysSnap(), true, false, k->target_bbox);
- sc.points.push_back(s);
- }
- }
-
</del></span></pre></div>
<a id="trunkdportsgraphicsinkscapefilespatchr10041thrur10043diff"></a>
<div class="addfile"><h4>Added: trunk/dports/graphics/inkscape/files/patch-r10041-thru-r10043.diff (0 => 129415)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/graphics/inkscape/files/patch-r10041-thru-r10043.diff (rev 0)
+++ trunk/dports/graphics/inkscape/files/patch-r10041-thru-r10043.diff 2014-12-13 03:08:39 UTC (rev 129415)
</span><span class="lines">@@ -0,0 +1,47 @@
</span><ins>+=== modified file 'src/color-profile.cpp'
+--- src/color-profile.cpp 2014-03-18 11:45:34 +0000
++++ src/color-profile.cpp 2014-10-30 18:35:32 +0000
+@@ -13,6 +13,7 @@
+ #include <gtk/gtk.h>
+ #endif // DEBUG_LCMS
+
++#include <unistd.h>
+ #include <cstring>
+ #include <string>
+ #include <io/sys.h>
+
+=== modified file 'src/io/inkjar.cpp'
+--- src/io/inkjar.cpp 2013-11-12 20:52:11 +0000
++++ src/io/inkjar.cpp 2014-09-12 15:05:40 +0000
+@@ -107,7 +107,7 @@
+
+ bool JarFile::open()
+ {
+- if ((fd = fopen(_filename, O_RDONLY)) < 0) {
++ if (!(fd = fopen(_filename, "r"))) {
+ fprintf(stderr, "open failed.\n");
+ return false;
+ }
+@@ -119,7 +119,7 @@
+
+ bool JarFile::close()
+ {
+- if (fd >= 0 && !fclose(fd)) {
++ if (fd && !fclose(fd)) {
+ inflateEnd(&_zs);
+ return true;
+ }
+
+=== modified file 'src/object-snapper.cpp'
+--- src/object-snapper.cpp 2010-07-19 06:51:04 +0000
++++ src/object-snapper.cpp 2014-09-12 15:05:40 +0000
+@@ -561,7 +561,7 @@
+ // When it's within snapping range, then return it
+ // (within snapping range == between p_min_on_cl and p_max_on_cl == 0 < ta < 1)
+ Geom::Coord dist = Geom::L2(_snapmanager->getDesktop()->dt2doc(p_proj_on_cl) - p_inters);
+- SnappedPoint s(_snapmanager->getDesktop()->doc2dt(p_inters), p.getSourceType(), p.getSourceNum(), k->target_type, dist, getSnapperTolerance(), getSnapperAlwaysSnap(), true, k->target_bbox);
++ SnappedPoint s(_snapmanager->getDesktop()->doc2dt(p_inters), p.getSourceType(), p.getSourceNum(), k->target_type, dist, getSnapperTolerance(), getSnapperAlwaysSnap(), true, false, k->target_bbox);
+ sc.points.push_back(s);
+ }
+ }
+
</ins></span></pre>
</div>
</div>
</body>
</html>