[125274] trunk/dports/graphics/inkscape

[devans at macports.org]

Revision: 125274
          https://trac.macports.org/changeset/125274
Author:   devans at macports.org
Date:     2014-09-12 08:37:01 -0700 (Fri, 12 Sep 2014)
Log Message:
-----------
inkscape: update to inkscape-0.48.x bzr 10042, boost build fix, additional bug fix.

Modified Paths:
--------------
    trunk/dports/graphics/inkscape/Portfile

Added Paths:
-----------
    trunk/dports/graphics/inkscape/files/patch-r10041-thru-r10042.diff

Removed Paths:
-------------
    trunk/dports/graphics/inkscape/files/patch-src-object-snapper.cpp-v3.diff

Modified: trunk/dports/graphics/inkscape/Portfile
===================================================================
--- trunk/dports/graphics/inkscape/Portfile	2014-09-12 14:55:11 UTC (rev 125273)
+++ trunk/dports/graphics/inkscape/Portfile	2014-09-12 15:37:01 UTC (rev 125274)
@@ -6,7 +6,7 @@
 name            inkscape
 conflicts       inkscape-devel
 version         0.48.5
-revision        2
+revision        3
 license         GPL-2 LGPL-2.1
 maintainers     devans
 categories      graphics gnome
@@ -48,7 +48,7 @@
                 port:gtkspell2
 
 patchfiles      patch-python-configure.ac.diff \
-                patch-src-object-snapper.cpp-v3.diff
+                patch-r10041-thru-r10042.diff
 
 variant python26 conflicts python27 description {Configure to use Python version 2.6} {
     depends_lib-append \

Added: trunk/dports/graphics/inkscape/files/patch-r10041-thru-r10042.diff
===================================================================
--- trunk/dports/graphics/inkscape/files/patch-r10041-thru-r10042.diff	                        (rev 0)
+++ trunk/dports/graphics/inkscape/files/patch-r10041-thru-r10042.diff	2014-09-12 15:37:01 UTC (rev 125274)
@@ -0,0 +1,35 @@
+=== 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);
+                     }
+                 }
+

Deleted: trunk/dports/graphics/inkscape/files/patch-src-object-snapper.cpp-v3.diff
===================================================================
--- trunk/dports/graphics/inkscape/files/patch-src-object-snapper.cpp-v3.diff	2014-09-12 14:55:11 UTC (rev 125273)
+++ trunk/dports/graphics/inkscape/files/patch-src-object-snapper.cpp-v3.diff	2014-09-12 15:37:01 UTC (rev 125274)
@@ -1,13 +0,0 @@
-=== modified file 'src/object-snapper.cpp'
---- src/object-snapper.cpp	2010-07-19 06:51:04 +0000
-+++ src/object-snapper.cpp	2014-08-15 15:43:28 +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);
-                     }
-                 }
-
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140912/98d7d520/attachment.html>