Update to 0.41.

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@3674 df743ca5-7f9a-e211-a948-0013205c9059

5 files changed, 43 insertions, 22 deletions

diff --git a/graphics/inkscape/files/patch-src::dialogs::clonetiler.cpp b/graphics/inkscape/files/patch-src::dialogs::clonetiler.cpp
new file mode 100644
index 000000000..9eb52b651
--- /dev/null
+++ b/graphics/inkscape/files/patch-src::dialogs::clonetiler.cpp
@@ -0,0 +1,11 @@
+--- src/dialogs/clonetiler.cpp.orig	Fri Feb 18 02:32:13 2005
++++ src/dialogs/clonetiler.cpp	Fri Feb 18 02:33:24 2005
+@@ -868,7 +868,7 @@
+ clonetiler_xy_changed (GtkAdjustment *adj, gpointer data)
+ {
+     const gchar *pref = (const gchar *) data;
+-    prefs_set_int_attribute ("dialogs.clonetiler", pref, (int) round(adj->value));
++    prefs_set_int_attribute ("dialogs.clonetiler", pref, (int) rint(adj->value));
+ }
+ 
+ static void
diff --git a/graphics/inkscape/files/patch-src::extension::db.cpp b/graphics/inkscape/files/patch-src::extension::db.cpp
deleted file mode 100644
index 47f6c986f..000000000
--- a/graphics/inkscape/files/patch-src::extension::db.cpp
+++ /dev/null
@@ -1,17 +0,0 @@
---- src/extension/db.cpp.orig	Sat Jul 17 11:50:33 2004
-+++ src/extension/db.cpp	Sat Jul 17 11:52:55 2004
-@@ -80,7 +80,13 @@
- 
- 	if (key == NULL) return NULL;
- 
--	mod = (*moduledict.find(key)).second;
-+	std::map <const char *, Extension *, ltstr>::const_iterator i =
-+		moduledict.find(key);
-+
-+	if (i == moduledict.end())
-+		return NULL;
-+
-+	mod = i->second;
- 
- 	if ( !mod || mod->deactivated() )
- 		return NULL;
diff --git a/graphics/inkscape/files/patch-src::extension::internal::gnome.cpp b/graphics/inkscape/files/patch-src::extension::internal::gnome.cpp
new file mode 100644
index 000000000..bc44302eb
--- /dev/null
+++ b/graphics/inkscape/files/patch-src::extension::internal::gnome.cpp
@@ -0,0 +1,16 @@
+--- src/extension/internal/gnome.cpp.orig	Fri Feb 18 02:44:53 2005
++++ src/extension/internal/gnome.cpp	Fri Feb 18 02:45:56 2005
+@@ -183,6 +183,13 @@
+     return 0;
+ }
+ 
++unsigned int PrintGNOME::comment (Inkscape::Extension::Print * module,
++					const char * comment)
++{
++    // ignore comment
++    return 0;
++}
++
+ unsigned int
+ PrintGNOME::fill(Inkscape::Extension::Print *mod,
+ 		 NRBPath const *bpath, NRMatrix const *ctm, SPStyle const *style,
diff --git a/graphics/inkscape/files/patch-src::livarot::PathOutline.cpp b/graphics/inkscape/files/patch-src::livarot::PathOutline.cpp
index bf21ea2a4..aa01b7d1a 100644
--- a/graphics/inkscape/files/patch-src::livarot::PathOutline.cpp
+++ b/graphics/inkscape/files/patch-src::livarot::PathOutline.cpp
@@ -1,9 +1,9 @@
---- src/livarot/PathOutline.cpp.orig	Sat Apr 10 04:09:41 2004
-+++ src/livarot/PathOutline.cpp	Sat Apr 10 04:34:35 2004
+--- src/livarot/PathOutline.cpp.orig	Sat Oct 23 12:10:52 2004
++++ src/livarot/PathOutline.cpp	Fri Feb 18 00:28:16 2005
 @@ -9,6 +9,7 @@
- #include "Path.h"
- //#include "MyMath.h"
- #include <math.h>
+ #include "livarot/Path.h"
+ #include "livarot/path-description.h"
+ #include <cmath>
 +#include <algorithm>
  #include <libnr/nr-point-fns.h>
  
diff --git a/graphics/inkscape/files/patch-src::object-edit.cpp b/graphics/inkscape/files/patch-src::object-edit.cpp
new file mode 100644
index 000000000..5d53ed22d
--- /dev/null
+++ b/graphics/inkscape/files/patch-src::object-edit.cpp
@@ -0,0 +1,11 @@
+--- src/object-edit.cpp.orig	Fri Feb 18 02:09:25 2005
++++ src/object-edit.cpp	Fri Feb 18 02:25:08 2005
+@@ -839,7 +839,7 @@
+ 			spiral->rad = rad_new;
+ 			spiral->t0 = pow (r0 / spiral->rad, 1/spiral->exp);
+ 		}
+-		if (!std::isfinite(spiral->t0)) spiral->t0 = 0.0;
++		if (isinf(spiral->t0)) spiral->t0 = 0.0;
+ 		spiral->t0 = CLAMP (spiral->t0, 0.0, 0.999);	
+ 	}
+