summaryrefslogtreecommitdiffstats
path: root/graphics/inkscape/files
diff options
context:
space:
mode:
Diffstat (limited to 'graphics/inkscape/files')
-rw-r--r--graphics/inkscape/files/patch-configure23
-rw-r--r--graphics/inkscape/files/patch-src::extension::db.cpp17
-rw-r--r--graphics/inkscape/files/patch-src::libnr::nr-matrix.cpp10
-rw-r--r--graphics/inkscape/files/patch-src::livarot::Path.cpp10
-rw-r--r--graphics/inkscape/files/patch-src::livarot::PathOutline.cpp10
-rw-r--r--graphics/inkscape/files/patch-src::remove-last.h19
6 files changed, 89 insertions, 0 deletions
diff --git a/graphics/inkscape/files/patch-configure b/graphics/inkscape/files/patch-configure
new file mode 100644
index 000000000..35d18d8c5
--- /dev/null
+++ b/graphics/inkscape/files/patch-configure
@@ -0,0 +1,23 @@
+--- configure.orig Sat Apr 10 03:28:51 2004
++++ configure Sat Apr 10 04:47:54 2004
+@@ -16589,17 +16589,12 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+
+-/* Override any gcc2 internal prototype to avoid an error. */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-/* We use char because int might match the return type of a gcc2
+- builtin and then its argument prototype would still apply. */
+-char dgettext ();
++#include <libintl.h>
++
+ int
+ main ()
+ {
+-dgettext ();
++dgettext ("","");
+ ;
+ return 0;
+ }
diff --git a/graphics/inkscape/files/patch-src::extension::db.cpp b/graphics/inkscape/files/patch-src::extension::db.cpp
new file mode 100644
index 000000000..47f6c986f
--- /dev/null
+++ b/graphics/inkscape/files/patch-src::extension::db.cpp
@@ -0,0 +1,17 @@
+--- 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::libnr::nr-matrix.cpp b/graphics/inkscape/files/patch-src::libnr::nr-matrix.cpp
new file mode 100644
index 000000000..e8da0f994
--- /dev/null
+++ b/graphics/inkscape/files/patch-src::libnr::nr-matrix.cpp
@@ -0,0 +1,10 @@
+--- src/libnr/nr-matrix.cpp.org Sun Feb 15 09:45:06 2004
++++ src/libnr/nr-matrix.cpp Sun Feb 15 09:44:32 2004
+@@ -9,6 +9,7 @@
+ * This code is in public domain
+ */
+
++#include <cstdio>
+ #include "nr-matrix.h"
+
+ NRMatrix *
diff --git a/graphics/inkscape/files/patch-src::livarot::Path.cpp b/graphics/inkscape/files/patch-src::livarot::Path.cpp
new file mode 100644
index 000000000..587ec22c4
--- /dev/null
+++ b/graphics/inkscape/files/patch-src::livarot::Path.cpp
@@ -0,0 +1,10 @@
+--- src/livarot/Path.cpp.orig Sat Apr 10 03:53:47 2004
++++ src/livarot/Path.cpp Sat Apr 10 03:53:52 2004
+@@ -7,6 +7,7 @@
+ */
+
+ #include <glib.h>
++#include <cstdio>
+ #include "Path.h"
+ #include <libnr/nr-point.h>
+ #include <libnr/nr-point-ops.h>
diff --git a/graphics/inkscape/files/patch-src::livarot::PathOutline.cpp b/graphics/inkscape/files/patch-src::livarot::PathOutline.cpp
new file mode 100644
index 000000000..bf21ea2a4
--- /dev/null
+++ b/graphics/inkscape/files/patch-src::livarot::PathOutline.cpp
@@ -0,0 +1,10 @@
+--- src/livarot/PathOutline.cpp.orig Sat Apr 10 04:09:41 2004
++++ src/livarot/PathOutline.cpp Sat Apr 10 04:34:35 2004
+@@ -9,6 +9,7 @@
+ #include "Path.h"
+ //#include "MyMath.h"
+ #include <math.h>
++#include <algorithm>
+ #include <libnr/nr-point-fns.h>
+
+ /*
diff --git a/graphics/inkscape/files/patch-src::remove-last.h b/graphics/inkscape/files/patch-src::remove-last.h
new file mode 100644
index 000000000..059f14ac7
--- /dev/null
+++ b/graphics/inkscape/files/patch-src::remove-last.h
@@ -0,0 +1,19 @@
+--- src/remove-last.h.orig Mon Apr 12 09:56:06 2004
++++ src/remove-last.h Mon Apr 12 09:56:47 2004
+@@ -2,6 +2,7 @@
+ #define __REMOVE_LAST_H__
+
+ #include <vector>
++#include <algorithm>
+ #include <glib.h>
+
+ template<class T>
+@@ -9,7 +10,7 @@
+ {
+ using std::vector;
+
+- typename vector<T>::reverse_iterator i(find(seq.rbegin(), seq.rend(), elem));
++ typename vector<T>::reverse_iterator i(std::find(seq.rbegin(), seq.rend(), elem));
+ g_assert( i != seq.rend() );
+ typename vector<T>::iterator ii(&*i);
+ seq.erase(ii);