Update to 0.48.5.

Adobe Illustrator SVG files containing entities can be loaded again
Support for Poppler 0.26
Support for Boehm-GC 7.4.0 and later
Several crash bugs were fixed

Remove the gnomevfs option.
Install all available manpages.

32 files changed, 22 insertions, 1209 deletions

diff --git a/graphics/inkscape/Makefile b/graphics/inkscape/Makefile
index 6873279cab8c..5fa4a4cb6087 100644
--- a/graphics/inkscape/Makefile
+++ b/graphics/inkscape/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	inkscape
-PORTVERSION=	0.48.4
-PORTREVISION=	8
+PORTVERSION=	0.48.5
 CATEGORIES=	graphics gnome
 MASTER_SITES=	SF
 MASTER_SITE_SUBDIR=${PORTNAME:tl}/${PORTNAME:tl}/${PORTVERSION}
@@ -29,16 +28,16 @@ GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
+CONFIGURE_ARGS=	--without-gnome-vfs
 
 python_OLD_CMD?=/usr/bin/env python
 python_CMD?=	${LOCALBASE}/bin/python2
 SHEBANG_FILES=	cxxtest/cxxtestgen.pl share/extensions/*.p[lm] \
 		share/extensions/*.py
 
-OPTIONS_DEFINE=	GNOMEVFS POPPLER
+OPTIONS_DEFINE=	POPPLER
 OPTIONS_DEFAULT=POPPLER
 POPPLER_DESC=	PDF preview rendering
-GNOMEVFS_DESC=	Use gnomevfs for loading files
 
 .include <bsd.port.options.mk>
 
@@ -47,13 +46,6 @@ _CCVERSION!=	${CC} --version
 CPPFLAGS+=	-Wno-mismatched-tags
 .endif
 
-.if ${PORT_OPTIONS:MGNOMEVFS}
-USE_GNOME+=		gnomevfs2
-CONFIGURE_ARGS+=	--with-gnome-vfs
-.else
-CONFIGURE_ARGS+=	--without-gnome-vfs
-.endif
-
 .if ${PORT_OPTIONS:MPOPPLER}
 LIB_DEPENDS+=		libpoppler-glib.so:${PORTSDIR}/graphics/poppler-glib
 CONFIGURE_ARGS+=	--enable-poppler-cairo
diff --git a/graphics/inkscape/distinfo b/graphics/inkscape/distinfo
index 0989450431aa..4a502aa4240e 100644
--- a/graphics/inkscape/distinfo
+++ b/graphics/inkscape/distinfo
@@ -1,2 +1,2 @@
-SHA256 (inkscape-0.48.4.tar.bz2) = 8741ad8cbb5aa5cee4f234ebc45479cff2479b16d903870693174bdede8a519d
-SIZE (inkscape-0.48.4.tar.bz2) = 19712522
+SHA256 (inkscape-0.48.5.tar.bz2) = 2b6ce684f9f2a0691ab454656424555cbda131db78e13973360684bc833ad969
+SIZE (inkscape-0.48.5.tar.bz2) = 19719332
diff --git a/graphics/inkscape/files/patch-Makefile.in b/graphics/inkscape/files/patch-Makefile.in
deleted file mode 100644
index 96072f3341a3..000000000000
--- a/graphics/inkscape/files/patch-Makefile.in
+++ /dev/null
@@ -1,25 +0,0 @@
---- Makefile.in.orig	2013-03-07 08:40:14.000000000 +0000
-+++ Makefile.in	2013-03-07 08:59:34.000000000 +0000
-@@ -421,11 +421,6 @@
- DISTCHECK_CONFIGURE_FLAGS = --enable-localinstall
- man_MANS = \
- 	inkscape.1 \
--	inkscape.el.1		\
--	inkscape.fr.1		\
--	inkscape.ja.1		\
--	inkscape.sk.1		\
--	inkscape.zh_TW.1		\
- 	inkview.1
- 
- EXTRA_DIST = \
-@@ -1351,9 +1346,7 @@
- 
- info-am:
- 
--install-data-am: install-GraphicsDATA install-man install-manelDATA \
--	install-manfrDATA install-manjaDATA install-manskDATA \
--	install-manzhtwDATA
-+install-data-am: install-GraphicsDATA install-man 
- 
- install-dvi: install-dvi-recursive
- 
diff --git a/graphics/inkscape/files/patch-beohm-gc-7.4 b/graphics/inkscape/files/patch-beohm-gc-7.4
deleted file mode 100644
index b610d097490b..000000000000
--- a/graphics/inkscape/files/patch-beohm-gc-7.4
+++ /dev/null
@@ -1,54 +0,0 @@
---- src/gc-core.h.old	2013-12-31 01:22:38.976653890 +0400
-+++ src/gc-core.h	2013-12-31 01:22:48.525653608 +0400
-@@ -57,7 +57,7 @@
-                                            CleanupFunc *old_func,
-                                            void **old_data);
-     int (*general_register_disappearing_link)(void **p_ptr,
--                                              void *base);
-+                                              const void *base);
-     int (*unregister_disappearing_link)(void **p_ptr);
-     std::size_t (*get_heap_size)();
-     std::size_t (*get_free_bytes)();
---- src/gc.cpp.old	2013-12-31 01:23:50.462651778 +0400
-+++ src/gc.cpp	2013-12-31 01:40:37.718622017 +0400
-@@ -70,8 +70,8 @@
-     return base + debug_base_fixup();
- }
- 
--int debug_general_register_disappearing_link(void **p_ptr, void *base) {
--    char *real_base=reinterpret_cast<char *>(base) - debug_base_fixup();
-+int debug_general_register_disappearing_link(void **p_ptr, const void *base) {
-+    char *real_base=const_cast<char *>(reinterpret_cast<const char *>(base)) - debug_base_fixup();
-     return GC_general_register_disappearing_link(p_ptr, real_base);
- }
- 
-@@ -90,7 +90,7 @@
-     }
- }
- 
--int dummy_general_register_disappearing_link(void **, void *) { return false; }
-+int dummy_general_register_disappearing_link(void **, const void *) { return false; }
- 
- int dummy_unregister_disappearing_link(void **/*link*/) { return false; }
- 
-@@ -112,7 +112,11 @@
-     &GC_malloc_atomic_uncollectable,
-     &GC_base,
-     &GC_register_finalizer_ignore_self,
-+#if (GC_MAJOR_VERSION >= 7 && GC_MINOR_VERSION >= 4)
-     &GC_general_register_disappearing_link,
-+#else
-+    (int (*)(void**, const void*))(&GC_general_register_disappearing_link),
-+#endif
-     &GC_unregister_disappearing_link,
-     &GC_get_heap_size,
-     &GC_get_free_bytes,
-@@ -202,7 +206,7 @@
-     die_because_not_initialized();
- }
- 
--int stub_general_register_disappearing_link(void **, void *) {
-+int stub_general_register_disappearing_link(void **, const void *) {
-     die_because_not_initialized();
-     return 0;
- }
diff --git a/graphics/inkscape/files/patch-configure b/graphics/inkscape/files/patch-configure
index c4f5d1426460..a775a80a07f9 100644
--- a/graphics/inkscape/files/patch-configure
+++ b/graphics/inkscape/files/patch-configure
@@ -1,15 +1,6 @@
---- configure.orig	2014-07-10 22:35:29.000000000 +0200
-+++ configure	2014-07-10 22:46:14.000000000 +0200
-@@ -7498,7 +7498,7 @@
- 	cc_vers_all=`expr $cc_vers_major '*' 1000000 + $cc_vers_minor '*' 1000 + $cc_vers_patch`
- 
- 	if test $cc_vers_major -lt 3; then
--		as_fn_error $? "gcc >= 3.0 is needed to compile inkscape" "$LINENO" 5
-+#		as_fn_error $? "gcc >= 3.0 is needed to compile inkscape" "$LINENO" 5
- 	fi
- fi
- 
-@@ -8961,10 +8961,11 @@
+--- configure.orig	2014-10-20 01:29:05.836430783 +0200
++++ configure	2014-10-20 01:29:05.872430406 +0200
+@@ -9046,10 +9046,11 @@
  			#include <stdio.h>
  			extern unsigned GC_version;
  			int main(void){
diff --git a/graphics/inkscape/files/patch-src_2geom_basic-intersection.cpp b/graphics/inkscape/files/patch-src_2geom_basic-intersection.cpp
deleted file mode 100644
index 48b6b6cda1af..000000000000
--- a/graphics/inkscape/files/patch-src_2geom_basic-intersection.cpp
+++ /dev/null
@@ -1,28 +0,0 @@
---- src/2geom/basic-intersection.cpp.orig	2013-10-17 12:28:59.000000000 +0200
-+++ src/2geom/basic-intersection.cpp	2013-10-17 13:17:08.000000000 +0200
-@@ -64,7 +64,12 @@
- void split(vector<Point> const &p, double t, 
-            vector<Point> &left, vector<Point> &right) {
-     const unsigned sz = p.size();
--    Geom::Point Vtemp[sz][sz];
-+    
-+    Geom::Point **Vtemp = new Geom::Point* [sz];
-+
-+    for (unsigned int i = 0; i < sz; ++i) {
-+        Vtemp[i] = new Geom::Point[sz];
-+    }
- 
-     /* Copy control points	*/
-     std::copy(p.begin(), p.end(), Vtemp[0]);
-@@ -82,6 +87,11 @@
-         left[j]  = Vtemp[j][0];
-     for (unsigned j = 0; j < sz; j++)
-         right[j] = Vtemp[sz-1-j][j];
-+
-+    for (unsigned int i = 0; i < sz; ++i)
-+        delete[] Vtemp[i];
-+
-+    delete[] Vtemp;
- }
- 
- 
diff --git a/graphics/inkscape/files/patch-src_2geom_sbasis.h b/graphics/inkscape/files/patch-src_2geom_sbasis.h
deleted file mode 100644
index 52f46f876598..000000000000
--- a/graphics/inkscape/files/patch-src_2geom_sbasis.h
+++ /dev/null
@@ -1,47 +0,0 @@
---- src/2geom/sbasis.h.orig	2013-10-16 23:20:03.000000000 +0200
-+++ src/2geom/sbasis.h	2013-10-16 23:27:50.000000000 +0200
-@@ -75,10 +75,13 @@
-         return d[i];
-     }
-     Linear& operator[](unsigned i) { return d.at(i); }
--    Linear const* begin() const { return (Linear const*)&*d.begin();}
--    Linear const* end() const { return (Linear const*)&*d.end();}
--    Linear* begin() { return (Linear*)&*d.begin();}
--    Linear* end() { return (Linear*)&*d.end();}
-+
-+    std::vector<Linear>::const_iterator begin() const { return d.begin(); }
-+    std::vector<Linear>::const_iterator end() const { return d.end(); }
-+
-+    std::vector<Linear>::iterator begin() { return d.begin(); }
-+    std::vector<Linear>::iterator end() { return d.end(); }
-+
-     bool empty() const {return d.empty();}
-     Linear &back() {return d.back();}
-     Linear const &back() const {return d.back();}
-@@ -87,7 +90,11 @@
-     void resize(unsigned n, Linear const& l) { d.resize(n, l);}
-     void reserve(unsigned n) { d.reserve(n);}
-     void clear() {d.clear();}
--    void insert(Linear* before, const Linear* src_begin, const Linear* src_end) { d.insert(std::vector<Linear>::iterator(before), src_begin, src_end);}
-+
-+    void insert(std::vector<Linear>::iterator before, std::vector<Linear>::const_iterator src_begin, std::vector<Linear>::const_iterator src_end) {
-+               d.insert(before, src_begin, src_end);
-+    }
-+
-     //void insert(Linear* aa, Linear* bb, Linear* cc} { d.insert(aa, bb, cc);}
-     Linear& at(unsigned i) { return d.at(i);}
-     //void insert(Linear* before, int& n, Linear const &l) { d.insert(std::vector<Linear>::iterator(before), n, l);}
-@@ -283,7 +290,12 @@
- 
- inline SBasis truncate(SBasis const &a, unsigned terms) {
-     SBasis c;
--    c.insert(c.begin(), a.begin(), a.begin() + std::min(terms, (unsigned)a.size()));
-+
-+    std::vector<Linear>::const_iterator e = a.begin();
-+    std::advance(e, std::min(terms, (unsigned)a.size()));
-+
-+    c.insert(c.begin(), a.begin(), e);
-+
-     return c;
- }
- 
diff --git a/graphics/inkscape/files/patch-src_2geom_solve-bezier-parametric.cpp b/graphics/inkscape/files/patch-src_2geom_solve-bezier-parametric.cpp
deleted file mode 100644
index f5460518c1de..000000000000
--- a/graphics/inkscape/files/patch-src_2geom_solve-bezier-parametric.cpp
+++ /dev/null
@@ -1,54 +0,0 @@
---- src/2geom/solve-bezier-parametric.cpp.orig	2013-10-17 12:28:59.000000000 +0200
-+++ src/2geom/solve-bezier-parametric.cpp	2013-10-17 13:19:47.000000000 +0200
-@@ -68,13 +68,20 @@
-         break;
-     }
- 
--    // Otherwise, solve recursively after subdividing control polygon
--    std::vector<Geom::Point> Left(degree + 1);    // New left and right
--    std::vector<Geom::Point> Right(degree + 1);   // control polygons
-+    /*
-+     * Otherwise, solve recursively after subdividing control polygon
-+     * New left and right control polygons
-+     */
-+    Geom::Point *Left  = new Geom::Point[degree+1];
-+    Geom::Point *Right = new Geom::Point[degree+1];
-+
-     Bezier(w, degree, 0.5, &Left[0], &Right[0]);
-     total_subs ++;
-     find_parametric_bezier_roots(&Left[0],  degree, solutions, depth + 1);
-     find_parametric_bezier_roots(&Right[0], degree, solutions, depth + 1);
-+
-+    delete[] Left;
-+    delete[] Right;
- }
- 
- 
-@@ -191,7 +198,10 @@
-        Geom::Point *Left,	/* RETURN left half ctl pts */
-        Geom::Point *Right)	/* RETURN right half ctl pts */
- {
--    Geom::Point Vtemp[degree+1][degree+1];
-+    Geom::Point **Vtemp = new Geom::Point* [degree+1];
-+
-+    for (unsigned int i = 0; i < degree+1; ++i)
-+        Vtemp[i] = new Geom::Point[degree+1];
- 
-     /* Copy control points	*/
-     std::copy(V, V+degree+1, Vtemp[0]);
-@@ -208,7 +218,14 @@
-     for (unsigned j = 0; j <= degree; j++)
-         Right[j] = Vtemp[degree-j][j];
- 
--    return (Vtemp[degree][0]);
-+    Geom::Point return_value = Vtemp[degree][0];
-+
-+    for (unsigned int i = 0; i < degree+1; ++i)
-+        delete[] Vtemp[i];
-+
-+    delete[] Vtemp;
-+
-+    return return_value;
- }
- 
- };
diff --git a/graphics/inkscape/files/patch-src_color-profile.cpp b/graphics/inkscape/files/patch-src_color-profile.cpp
deleted file mode 100644
index ce3548e2d609..000000000000
--- a/graphics/inkscape/files/patch-src_color-profile.cpp
+++ /dev/null
@@ -1,22 +0,0 @@
---- src/color-profile.cpp.orig	2013-10-17 12:28:59.000000000 +0200
-+++ src/color-profile.cpp	2013-10-17 12:34:25.000000000 +0200
-@@ -103,6 +103,8 @@
- 
- static SPObjectClass *cprof_parent_class;
- 
-+namespace Inkscape {
-+
- class ColorProfileImpl {
- public:
- #if defined(HAVE_LIBLCMS1) || defined(HAVE_LIBLCMS2)
-@@ -129,10 +131,6 @@
- #endif // defined(HAVE_LIBLCMS1) || defined(HAVE_LIBLCMS2)
- };
- 
--
--
--namespace Inkscape {
--
- #if defined(HAVE_LIBLCMS1) || defined(HAVE_LIBLCMS2)
- cmsColorSpaceSignature asICColorSpaceSig(ColorSpaceSig const & sig)
- {
diff --git a/graphics/inkscape/files/patch-src_display_nr-filter-gaussian.cpp b/graphics/inkscape/files/patch-src_display_nr-filter-gaussian.cpp
deleted file mode 100644
index 012687b102f2..000000000000
--- a/graphics/inkscape/files/patch-src_display_nr-filter-gaussian.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/display/nr-filter-gaussian.cpp.orig	2013-10-17 12:28:58.000000000 +0200
-+++ src/display/nr-filter-gaussian.cpp	2013-10-17 12:58:55.000000000 +0200
-@@ -708,7 +708,7 @@
-         };
-     } else if ( scr_len_x > 0 ) { // !use_IIR_x
-         // Filter kernel for x direction
--        FIRValue kernel[scr_len_x+1];
-+        std::vector<FIRValue> kernel(scr_len_x+1);
-         _make_kernel(&kernel[0], deviation_x);
- 
-         // Filter (x)
-@@ -770,7 +770,7 @@
-         };
-     } else if ( scr_len_y > 0 ) { // !use_IIR_y
-         // Filter kernel for y direction
--        FIRValue kernel[scr_len_y+1];
-+        std::vector<FIRValue> kernel(scr_len_y+1);
-         _make_kernel(&kernel[0], deviation_y);
- 
-         // Filter (y)
diff --git a/graphics/inkscape/files/patch-src_io_inkjar.cpp b/graphics/inkscape/files/patch-src_io_inkjar.cpp
deleted file mode 100644
index 87fbe1ae774a..000000000000
--- a/graphics/inkscape/files/patch-src_io_inkjar.cpp
+++ /dev/null
@@ -1,94 +0,0 @@
---- src/io/inkjar.cpp.orig	2013-10-16 23:28:46.000000000 +0200
-+++ src/io/inkjar.cpp	2013-10-16 23:34:00.000000000 +0200
-@@ -44,6 +44,7 @@
- 
- #include <cstring>
- #include <string>
-+#include <cstdio>
- #include <cstdlib>
- #include <glib.h>
- #include <zlib.h>
-@@ -68,7 +69,7 @@
- {
-     _filename = g_strdup(new_filename);
-     _last_filename = NULL;
--    fd = -1;
-+    fd = NULL;
- }
- 
- //fixme: the following should probably just return a const gchar* and not 
-@@ -104,7 +105,7 @@
- 
- bool JarFile::open()
- {
--    if ((fd = ::open(_filename, O_RDONLY)) < 0) {
-+    if ((fd = fopen(_filename, O_RDONLY)) < 0) {
- 	fprintf(stderr, "open failed.\n");
- 	return false;
-     }
-@@ -116,7 +117,7 @@
- 
- bool JarFile::close()
- {
--    if (fd >= 0 && !::close(fd)) {
-+    if (fd >= 0 && !fclose(fd)) {
- 	inflateEnd(&_zs);
- 	return true;
-     }
-@@ -256,7 +257,7 @@
-     
-     if (method == 8 || flags & 0x0008) {
- 	unsigned int file_length = 0;//uncompressed file length
--	lseek(fd, eflen, SEEK_CUR);
-+	fseek(fd, eflen, SEEK_CUR);
- 	guint8 *file_data = get_compressed_file(compressed_size, file_length, 
- 						crc, flags);
- 	if (file_data == NULL) {
-@@ -274,7 +275,7 @@
- 	}
- 	g_byte_array_append(gba, file_data, compressed_size);
-     } else {
--	lseek(fd, compressed_size+eflen, SEEK_CUR);
-+	fseek(fd, compressed_size+eflen, SEEK_CUR);
- 	g_byte_array_free(gba, FALSE);
- 	return NULL;
-     }
-@@ -313,7 +314,7 @@
- 	std::printf("%d bytes written\n", out_a);
- #endif
-     }
--    lseek(fd, eflen, SEEK_CUR);
-+    fseek(fd, eflen, SEEK_CUR);
-     g_free(bytes);
- 
-     if (!check_crc(crc, crc2, flags)) {
-@@ -328,7 +329,7 @@
- int JarFile::read(guint8 *buf, int count)
- {
-     int nbytes;
--    if ((nbytes = ::read(fd, buf, count)) != count) {
-+    if ((nbytes = fread(buf, 1, count, fd)) != count) {
- 	fprintf(stderr, "read error\n");
- 	exit(1);
- 	return 0;
-@@ -357,9 +358,8 @@
- 		
- 	if (!_zs.avail_in) {
- 	
--	    if ((nbytes = ::read(fd, in_buffer, 
--				 (leftover_in < RDSZ ? leftover_in : RDSZ))) 
--		< 0) {
-+	    if ((nbytes = fread(in_buffer, 1, 
-+		(leftover_in < RDSZ ? leftover_in : RDSZ), fd)) < 0) {
- 		fprintf(stderr, "jarfile read error");
- 	    }
- 	    _zs.avail_in = nbytes;
-@@ -537,7 +537,7 @@
- 		}
- 	    }
- 	} else if (gba->len > 0)
--	    ::write(1, gba->data, gba->len);
-+	    fwrite(gba->data, 1, gba->len, stdout);
- 	else
- 	    break;
-     }
diff --git a/graphics/inkscape/files/patch-src_io_inkjar.h b/graphics/inkscape/files/patch-src_io_inkjar.h
deleted file mode 100644
index d7c77b785f37..000000000000
--- a/graphics/inkscape/files/patch-src_io_inkjar.h
+++ /dev/null
@@ -1,28 +0,0 @@
---- src/io/inkjar.h.orig	2013-10-16 23:34:39.000000000 +0200
-+++ src/io/inkjar.h	2013-10-16 23:35:52.000000000 +0200
-@@ -27,6 +27,7 @@
- #endif
- 
- #include <glib.h>
-+#include <stdio.h>
- 
- namespace Inkjar {
- 
-@@ -91,7 +92,7 @@
- class JarFile {
- public:
- 
--    JarFile() : fd(-1), _filename(NULL), _last_filename(NULL) {}
-+    JarFile() : fd(NULL), _filename(NULL), _last_filename(NULL) {}
-     virtual ~JarFile();
-     JarFile(gchar const *new_filename);
-     
-@@ -106,7 +107,7 @@
- 
- private:
- 
--    int fd;
-+    FILE* fd;
-     gchar *_filename;
-     z_stream _zs;
-     gchar *_last_filename;
diff --git a/graphics/inkscape/files/patch-src_io_uristream.cpp b/graphics/inkscape/files/patch-src_io_uristream.cpp
deleted file mode 100644
index d1225745f2f2..000000000000
--- a/graphics/inkscape/files/patch-src_io_uristream.cpp
+++ /dev/null
@@ -1,199 +0,0 @@
---- src/io/uristream.cpp.orig	2011-07-08 20:25:09.468790000 +0200
-+++ src/io/uristream.cpp	2013-10-17 13:09:15.000000000 +0200
-@@ -104,7 +104,7 @@
-  *
-  */
- UriInputStream::UriInputStream(Inkscape::URI &source)
--                    throw (StreamException): uri(source)
-+                    : uri(source)
- {
-     //get information from uri
-     char const *schemestr = uri.getScheme();
-@@ -146,7 +146,7 @@
-  *
-  */
- UriInputStream::UriInputStream(FILE *source, Inkscape::URI &uri)
--    throw (StreamException): inf(source),
-+    : inf(source),
-                              uri(uri)
- {
-     scheme = SCHEME_FILE;
-@@ -160,7 +160,7 @@
- /**
-  *
-  */
--UriInputStream::~UriInputStream() throw(StreamException)
-+UriInputStream::~UriInputStream()
- {
-     close();
- }
-@@ -170,7 +170,7 @@
-  * this input stream without blocking by the next caller of a method for
-  * this input stream.
-  */
--int UriInputStream::available() throw(StreamException)
-+int UriInputStream::available()
- {
-     return 0;
- }
-@@ -180,7 +180,7 @@
-  *  Closes this input stream and releases any system resources
-  *  associated with the stream.
-  */
--void UriInputStream::close() throw(StreamException)
-+void UriInputStream::close()
- {
-     if (closed)
-         return;
-@@ -207,7 +207,7 @@
- /**
-  * Reads the next byte of data from the input stream.  -1 if EOF
-  */
--int UriInputStream::get() throw(StreamException)
-+int UriInputStream::get()
- {
-     int retVal = -1;
-     if (!closed)
-@@ -249,7 +249,6 @@
-  *
-  */
- UriReader::UriReader(Inkscape::URI &uri)
--                    throw (StreamException)
- {
-     inputStream = new UriInputStream(uri);
- }
-@@ -257,7 +256,7 @@
- /**
-  *
-  */
--UriReader::~UriReader() throw (StreamException)
-+UriReader::~UriReader()
- {
-     delete inputStream;
- }
-@@ -265,7 +264,7 @@
- /**
-  *
-  */
--int UriReader::available() throw(StreamException)
-+int UriReader::available()
- {
-     return inputStream->available();
- }
-@@ -273,7 +272,7 @@
- /**
-  *
-  */
--void UriReader::close() throw(StreamException)
-+void UriReader::close()
- {
-     inputStream->close();
- }
-@@ -281,8 +280,7 @@
- /**
-  *
-  */
--gunichar UriReader::get() throw(StreamException)
--{
-+gunichar UriReader::get(){
-     gunichar ch = (gunichar)inputStream->get();
-     return ch;
- }
-@@ -296,7 +294,7 @@
-  * Temporary kludge
-  */
- UriOutputStream::UriOutputStream(FILE* fp, Inkscape::URI &destination)
--                    throw (StreamException): closed(false),
-+                    : closed(false),
-                                              ownsFile(false),
-                                              outf(fp),
-                                              uri(destination),
-@@ -312,7 +310,7 @@
-  *
-  */
- UriOutputStream::UriOutputStream(Inkscape::URI &destination)
--                    throw (StreamException): closed(false),
-+                    : closed(false),
-                                              ownsFile(true),
-                                              outf(NULL),
-                                              uri(destination),
-@@ -353,7 +351,7 @@
- /**
-  *
-  */
--UriOutputStream::~UriOutputStream() throw(StreamException)
-+UriOutputStream::~UriOutputStream()
- {
-     close();
- }
-@@ -362,7 +360,7 @@
-  * Closes this output stream and releases any system resources
-  * associated with this stream.
-  */
--void UriOutputStream::close() throw(StreamException)
-+void UriOutputStream::close()
- {
-     if (closed)
-         return;
-@@ -391,7 +389,7 @@
-  *  Flushes this output stream and forces any buffered output
-  *  bytes to be written out.
-  */
--void UriOutputStream::flush() throw(StreamException)
-+void UriOutputStream::flush()
- {
-     if (closed)
-         return;
-@@ -415,7 +413,7 @@
- /**
-  * Writes the specified byte to this output stream.
-  */
--void UriOutputStream::put(int ch) throw(StreamException)
-+void UriOutputStream::put(int ch)
- {
-     if (closed)
-         return;
-@@ -453,7 +451,6 @@
-  *
-  */
- UriWriter::UriWriter(Inkscape::URI &uri)
--                    throw (StreamException)
- {
-     outputStream = new UriOutputStream(uri);
- }
-@@ -461,7 +458,7 @@
- /**
-  *
-  */
--UriWriter::~UriWriter() throw (StreamException)
-+UriWriter::~UriWriter()
- {
-     delete outputStream;
- }
-@@ -469,7 +466,7 @@
- /**
-  *
-  */
--void UriWriter::close() throw(StreamException)
-+void UriWriter::close()
- {
-     outputStream->close();
- }
-@@ -477,7 +474,7 @@
- /**
-  *
-  */
--void UriWriter::flush() throw(StreamException)
-+void UriWriter::flush()
- {
-     outputStream->flush();
- }
-@@ -485,7 +482,7 @@
- /**
-  *
-  */
--void UriWriter::put(gunichar ch) throw(StreamException)
-+void UriWriter::put(gunichar ch)
- {
-     int ich = (int)ch;
-     outputStream->put(ich);
diff --git a/graphics/inkscape/files/patch-src_io_uristream.h b/graphics/inkscape/files/patch-src_io_uristream.h
deleted file mode 100644
index 23771450ca74..000000000000
--- a/graphics/inkscape/files/patch-src_io_uristream.h
+++ /dev/null
@@ -1,92 +0,0 @@
---- src/io/uristream.h.orig	2013-10-16 23:43:05.000000000 +0200
-+++ src/io/uristream.h	2013-10-16 23:55:31.000000000 +0200
-@@ -35,17 +35,17 @@
- {
- 
- public:
--    UriInputStream(FILE *source, Inkscape::URI &uri) throw(StreamException);
-+    UriInputStream(FILE *source, Inkscape::URI &uri);
- 
--    UriInputStream(Inkscape::URI &source) throw(StreamException);
-+    UriInputStream(Inkscape::URI &source);
- 
--    virtual ~UriInputStream() throw(StreamException);
-+    virtual ~UriInputStream();
- 
--    virtual int available() throw(StreamException);
-+    virtual int available();
- 
--    virtual void close() throw(StreamException);
-+    virtual void close();
- 
--    virtual int get() throw(StreamException);
-+    virtual int get();
- 
- private:
- 
-@@ -74,15 +74,15 @@
- 
- public:
- 
--    UriReader(Inkscape::URI &source) throw(StreamException);
-+    UriReader(Inkscape::URI &source);
- 
--    virtual ~UriReader() throw(StreamException);
-+    virtual ~UriReader();
- 
--    virtual int available() throw(StreamException);
-+    virtual int available();
- 
--    virtual void close() throw(StreamException);
-+    virtual void close();
- 
--    virtual gunichar get() throw(StreamException);
-+    virtual gunichar get();
- 
- private:
- 
-@@ -106,17 +106,17 @@
- 
- public:
- 
--    UriOutputStream(FILE *fp, Inkscape::URI &destination) throw(StreamException);
-+    UriOutputStream(FILE *fp, Inkscape::URI &destination);
- 
--    UriOutputStream(Inkscape::URI &destination) throw(StreamException);
-+    UriOutputStream(Inkscape::URI &destination);
- 
--    virtual ~UriOutputStream() throw(StreamException);
-+    virtual ~UriOutputStream();
- 
--    virtual void close() throw(StreamException);
-+    virtual void close();
- 
--    virtual void flush() throw(StreamException);
-+    virtual void flush();
- 
--    virtual void put(int ch) throw(StreamException);
-+    virtual void put(int ch);
- 
- private:
- 
-@@ -145,15 +145,15 @@
- 
- public:
- 
--    UriWriter(Inkscape::URI &source) throw(StreamException);
-+    UriWriter(Inkscape::URI &source);
- 
--    virtual ~UriWriter() throw(StreamException);
-+    virtual ~UriWriter();
- 
--    virtual void close() throw(StreamException);
-+    virtual void close();
- 
--    virtual void flush() throw(StreamException);
-+    virtual void flush();
- 
--    virtual void put(gunichar ch) throw(StreamException);
-+    virtual void put(gunichar ch);
- 
- private:
- 
diff --git a/graphics/inkscape/files/patch-src_io_xsltstream.cpp b/graphics/inkscape/files/patch-src_io_xsltstream.cpp
deleted file mode 100644
index 8a4785deb161..000000000000
--- a/graphics/inkscape/files/patch-src_io_xsltstream.cpp
+++ /dev/null
@@ -1,98 +0,0 @@
---- src/io/xsltstream.cpp.orig	2013-10-16 23:56:16.000000000 +0200
-+++ src/io/xsltstream.cpp	2013-10-17 11:59:55.000000000 +0200
-@@ -30,7 +30,6 @@
-  *
-  */
- XsltStyleSheet::XsltStyleSheet(InputStream &xsltSource)
--               throw (StreamException)
-                    : stylesheet(NULL)
- {
-     if (!read(xsltSource)) {
-@@ -86,7 +85,6 @@
-  *
-  */ 
- XsltInputStream::XsltInputStream(InputStream &xmlSource, XsltStyleSheet &sheet)
--                        throw (StreamException)
-                         : BasicInputStream(xmlSource), stylesheet(sheet)
- {
-     //Load the data
-@@ -110,7 +108,7 @@
- /**
-  *
-  */ 
--XsltInputStream::~XsltInputStream() throw (StreamException)
-+XsltInputStream::~XsltInputStream()
- {
-     xmlFree(outbuf);
- }
-@@ -120,7 +118,7 @@
-  * this input stream without blocking by the next caller of a method for
-  * this input stream.
-  */ 
--int XsltInputStream::available() throw (StreamException)
-+int XsltInputStream::available()
- {
-     return outsize - outpos;
- }
-@@ -130,7 +128,7 @@
-  *  Closes this input stream and releases any system resources
-  *  associated with the stream.
-  */ 
--void XsltInputStream::close() throw (StreamException)
-+void XsltInputStream::close()
- {
-     closed = true;
- }
-@@ -138,7 +136,7 @@
- /**
-  * Reads the next byte of data from the input stream.  -1 if EOF
-  */ 
--int XsltInputStream::get() throw (StreamException)
-+int XsltInputStream::get()
- {
-     if (closed)
-         return -1;
-@@ -161,7 +159,6 @@
-  *
-  */ 
- XsltOutputStream::XsltOutputStream(OutputStream &dest, XsltStyleSheet &sheet)
--                     throw (StreamException)
-                      : BasicOutputStream(dest), stylesheet(sheet)
- {
-     flushed = false;
-@@ -170,7 +167,7 @@
- /**
-  *
-  */ 
--XsltOutputStream::~XsltOutputStream() throw (StreamException)
-+XsltOutputStream::~XsltOutputStream()
- {
-     //do not automatically close
- }
-@@ -179,7 +176,7 @@
-  * Closes this output stream and releases any system resources
-  * associated with this stream.
-  */ 
--void XsltOutputStream::close() throw (StreamException)
-+void XsltOutputStream::close()
- {
-     flush();
-     destination.close();
-@@ -189,7 +186,7 @@
-  *  Flushes this output stream and forces any buffered output
-  *  bytes to be written out.
-  */ 
--void XsltOutputStream::flush() throw (StreamException)
-+void XsltOutputStream::flush()
- {
-     if (flushed)
-         {
-@@ -230,7 +227,7 @@
- /**
-  * Writes the specified byte to this output stream.
-  */ 
--void XsltOutputStream::put(int ch) throw (StreamException)
-+void XsltOutputStream::put(int ch)
- {
-     gunichar uch = (gunichar) ch;
-     outbuf.push_back(uch);
diff --git a/graphics/inkscape/files/patch-src_io_xsltstream.h b/graphics/inkscape/files/patch-src_io_xsltstream.h
deleted file mode 100644
index 78c9412e2fb9..000000000000
--- a/graphics/inkscape/files/patch-src_io_xsltstream.h
+++ /dev/null
@@ -1,55 +0,0 @@
---- src/io/xsltstream.h.orig	2011-07-08 20:25:09.468790000 +0200
-+++ src/io/xsltstream.h	2013-10-17 13:10:26.000000000 +0200
-@@ -38,7 +38,7 @@
-     /**
-      * Constructor with loading
-      */
--    XsltStyleSheet(InputStream &source)  throw (StreamException);
-+    XsltStyleSheet(InputStream &source);
- 
-     /**
-      * Simple constructor, no loading
-@@ -73,16 +73,15 @@
- 
- public:
- 
--    XsltInputStream(InputStream &xmlSource, XsltStyleSheet &stylesheet)
--                        throw (StreamException);
-+    XsltInputStream(InputStream &xmlSource, XsltStyleSheet &stylesheet);
-     
--    virtual ~XsltInputStream() throw (StreamException);
-+    virtual ~XsltInputStream();
-     
--    virtual int available() throw (StreamException);
-+    virtual int available();
-     
--    virtual void close() throw (StreamException);
-+    virtual void close();
-     
--    virtual int get() throw (StreamException);
-+    virtual int get();
-     
- 
- private:
-@@ -110,16 +109,15 @@
- 
- public:
- 
--    XsltOutputStream(OutputStream &destination, XsltStyleSheet &stylesheet)
--                             throw (StreamException);
-+    XsltOutputStream(OutputStream &destination, XsltStyleSheet &stylesheet);
-     
--    virtual ~XsltOutputStream() throw (StreamException);
-+    virtual ~XsltOutputStream();
-     
--    virtual void close() throw (StreamException);
-+    virtual void close();
-     
--    virtual void flush() throw (StreamException);
-+    virtual void flush();
-     
--    virtual void put(int ch) throw (StreamException);
-+    virtual void put(int ch);
- 
- private:
- 
diff --git a/graphics/inkscape/files/patch-src_libgdl_gdl-dock-object.h b/graphics/inkscape/files/patch-src_libgdl_gdl-dock-object.h
deleted file mode 100644
index c043e1c00c23..000000000000
--- a/graphics/inkscape/files/patch-src_libgdl_gdl-dock-object.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/libgdl/gdl-dock-object.h.orig	2013-10-16 23:18:22.000000000 +0200
-+++ src/libgdl/gdl-dock-object.h	2013-10-17 12:02:38.000000000 +0200
-@@ -215,7 +215,7 @@
-     G_STMT_START {                            \
-     g_log (G_LOG_DOMAIN,                      \
- 	   G_LOG_LEVEL_DEBUG,                 \
--           "%s:%d (%s) %s [%p %d%s:%d]: "format, \
-+           "%s:%d (%s) %s [%p %d%s:%d]: " format, \
- 	   __FILE__,                          \
- 	   __LINE__,                          \
- 	   __PRETTY_FUNCTION__,               \
diff --git a/graphics/inkscape/files/patch-src_libnr_nr-matrix.cpp b/graphics/inkscape/files/patch-src_libnr_nr-matrix.cpp
deleted file mode 100644
index ff66627827ac..000000000000
--- a/graphics/inkscape/files/patch-src_libnr_nr-matrix.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/libnr/nr-matrix.cpp.org	2008-04-02 22:01:32.000000000 +0200
-+++ src/libnr/nr-matrix.cpp	2008-04-02 22:01:54.000000000 +0200
-@@ -11,6 +11,7 @@
-  * This code is in public domain
-  */
- 
-+#include <cstdio>
- #include <cstdlib>
- #include "nr-matrix.h"
- 
diff --git a/graphics/inkscape/files/patch-src_libnrtype_FontFactory.h b/graphics/inkscape/files/patch-src_libnrtype_FontFactory.h
deleted file mode 100644
index c913b8d6ae49..000000000000
--- a/graphics/inkscape/files/patch-src_libnrtype_FontFactory.h
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/libnrtype/FontFactory.h.orig	2013-12-08 11:01:49.000000000 +0100
-+++ src/libnrtype/FontFactory.h	2013-12-08 11:02:22.000000000 +0100
-@@ -31,7 +31,8 @@
- #include <pango/pangowin32.h>
- #else
- #include <pango/pangoft2.h>
--#include <freetype/freetype.h>
-+#include <ft2build.h>
-+#include FT_FREETYPE_H
- #endif
- 
- namespace Glib
diff --git a/graphics/inkscape/files/patch-src_libnrtype_Layout-TNG-OutIter.cpp b/graphics/inkscape/files/patch-src_libnrtype_Layout-TNG-OutIter.cpp
deleted file mode 100644
index 233676ea2eb8..000000000000
--- a/graphics/inkscape/files/patch-src_libnrtype_Layout-TNG-OutIter.cpp
+++ /dev/null
@@ -1,51 +0,0 @@
---- src/libnrtype/Layout-TNG-OutIter.cpp.orig	2011-07-08 20:25:09.468790000 +0200
-+++ src/libnrtype/Layout-TNG-OutIter.cpp	2013-10-17 13:12:08.000000000 +0200
-@@ -197,7 +197,21 @@
- 
- Layout::iterator Layout::sourceToIterator(void *source_cookie) const
- {
--    return sourceToIterator(source_cookie, Glib::ustring::const_iterator(std::string::const_iterator(NULL)));
-+    // simply copied from above... what is an iterator to NULL?
-+    unsigned source_index;
-+    if (_characters.empty()) return end();
-+    for (source_index = 0 ; source_index < _input_stream.size() ; source_index++)
-+        if (_input_stream[source_index]->source_cookie == source_cookie) break;
-+    if (source_index == _input_stream.size()) return end();
-+
-+    unsigned char_index = _sourceToCharacter(source_index);
-+
-+    if (_input_stream[source_index]->Type() != TEXT_SOURCE)
-+        return iterator(this, char_index);
-+
-+    InputStreamTextSource const *text_source = static_cast<InputStreamTextSource const *>(_input_stream[source_index]);
-+    //if (text_iterator <= text_source->text_begin) return iterator(this, char_index);
-+       return iterator(this, char_index);
- }
- 
- Geom::OptRect Layout::glyphBoundingBox(iterator const &it, double *rotation) const
-@@ -506,18 +520,20 @@
-     *source_cookie = stream_item->source_cookie;
-     if (text_iterator && stream_item->Type() == TEXT_SOURCE) {
-         InputStreamTextSource const *text_source = static_cast<InputStreamTextSource const *>(stream_item);
--        Glib::ustring::const_iterator text_iter_const = text_source->text_begin;
-+        Glib::ustring::iterator text_iter = const_cast<Glib::ustring*>(text_source->text)->begin();
-         unsigned char_index = it._char_index;
-         unsigned original_input_source_index = _spans[_characters[char_index].in_span].in_input_stream_item;
-         // confusing algorithm because the iterator goes forwards while the index goes backwards.
-         // It's just that it's faster doing it that way
-         while (char_index && _spans[_characters[char_index - 1].in_span].in_input_stream_item == original_input_source_index) {
--            ++text_iter_const;
-+            ++text_iter;
-             char_index--;
-         }
--        text_source->text->begin().base() + (text_iter_const.base() - text_source->text->begin().base());
--        *text_iterator = Glib::ustring::iterator(std::string::iterator(const_cast<char*>(&*text_source->text->begin().base() + (text_iter_const.base() - text_source->text->begin().base()))));
--             // the caller owns the string, so they're going to want a non-const iterator
-+        //text_source->text->begin().base() + (text_iter_const.base() - text_source->text->begin().base());
-+        // FIXME C++11
-+        //*text_iterator = Glib::ustring::iterator(std::string::iterator(const_cast<char*>(&*text_source->
-+        // the caller owns the string, so they're going to want a non-const iterator
-+        *text_iterator = text_iter;
-     }
- }
- 
diff --git a/graphics/inkscape/files/patch-src_libvpsc_csolve-VPSC.h b/graphics/inkscape/files/patch-src_libvpsc_csolve-VPSC.h
deleted file mode 100644
index 375fdb484c37..000000000000
--- a/graphics/inkscape/files/patch-src_libvpsc_csolve-VPSC.h
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/libvpsc/csolve_VPSC.h.bak	2011-07-08 20:25:09.468790000 +0200
-+++ src/libvpsc/csolve_VPSC.h	2013-10-17 12:54:54.000000000 +0200
-@@ -11,10 +11,7 @@
- #ifndef _CSOLVE_VPSC_H_
- #define _CSOLVE_VPSC_H_
- #ifdef __cplusplus
--class vpsc::Variable;
--class vpsc::Constraint;
--class vpsc::Solver;
--class vpsc::IncSolver;
-+
- using namespace vpsc;
- extern "C" {
- #else
diff --git a/graphics/inkscape/files/patch-src_livarot_Path.cpp b/graphics/inkscape/files/patch-src_livarot_Path.cpp
deleted file mode 100644
index 587ec22c418a..000000000000
--- a/graphics/inkscape/files/patch-src_livarot_Path.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- 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_live_effects_lpe-perp_bisector.h b/graphics/inkscape/files/patch-src_live_effects_lpe-perp_bisector.h
deleted file mode 100644
index d090a4228d18..000000000000
--- a/graphics/inkscape/files/patch-src_live_effects_lpe-perp_bisector.h
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/live_effects/lpe-perp_bisector.h.orig      2011-07-08 20:25:09.468790000 +0200
-+++ src/live_effects/lpe-perp_bisector.h
-@@ -27,7 +27,7 @@
-   class KnotHolderEntityEnd;
-   class KnotHolderEntityLeftEnd;
-   class KnotHolderEntityRightEnd;
--  void bisector_end_set(SPItem *item, Geom::Point const &p, bool left);
-+  void bisector_end_set(SPItem *item, Geom::Point const &p, bool left = true);
- }
- 
- class LPEPerpBisector : public Effect {
-@@ -46,7 +46,7 @@
-     friend class PB::KnotHolderEntityEnd;
-     friend class PB::KnotHolderEntityLeftEnd;
-     friend class PB::KnotHolderEntityRightEnd;
--    friend void PB::bisector_end_set(SPItem *item, Geom::Point const &p, bool left = true);
-+    friend void PB::bisector_end_set(SPItem *item, Geom::Point const &p, bool left);
- 
- private:
-     ScalarParam length_left;
diff --git a/graphics/inkscape/files/patch-src_remove-last.h b/graphics/inkscape/files/patch-src_remove-last.h
deleted file mode 100644
index a32590a33717..000000000000
--- a/graphics/inkscape/files/patch-src_remove-last.h
+++ /dev/null
@@ -1,15 +0,0 @@
---- src/remove-last.h.orig	2011-07-08 20:25:09.468790000 +0200
-+++ src/remove-last.h	2013-10-18 16:34:12.000000000 +0200
-@@ -10,10 +10,9 @@
- {
-     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);
-+    seq.erase(i.base());
- }
- 
- 
diff --git a/graphics/inkscape/files/patch-src_sp-item-rm-unsatisfied-cns.cpp b/graphics/inkscape/files/patch-src_sp-item-rm-unsatisfied-cns.cpp
deleted file mode 100644
index f656e69a1764..000000000000
--- a/graphics/inkscape/files/patch-src_sp-item-rm-unsatisfied-cns.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/sp-item-rm-unsatisfied-cns.cpp.orig	2011-07-08 20:25:09.468790000 +0200
-+++ src/sp-item-rm-unsatisfied-cns.cpp	2013-10-19 09:55:40.000000000 +0200
-@@ -23,9 +23,9 @@
-         g_assert( snappoint_ix < int(snappoints.size()) );
-         if (!approx_equal( sp_guide_distance_from_pt(cn.g, snappoints[snappoint_ix].getPoint()), 0) ) {
-             remove_last(cn.g->attached_items, SPGuideAttachment(&item, cn.snappoint_ix));
-+
-             g_assert( i < item.constraints.size() );
--            vector<SPGuideConstraint>::iterator const ei(&item.constraints[i]);
--            item.constraints.erase(ei);
-+            item.constraints.erase(item.constraints.begin() + i);
-         }
-     }
- }
diff --git a/graphics/inkscape/files/patch-src_trace_potrace_inkscape-potrace.cpp b/graphics/inkscape/files/patch-src_trace_potrace_inkscape-potrace.cpp
deleted file mode 100644
index 832ff9757702..000000000000
--- a/graphics/inkscape/files/patch-src_trace_potrace_inkscape-potrace.cpp
+++ /dev/null
@@ -1,124 +0,0 @@
---- src/trace/potrace/inkscape-potrace.cpp.orig	Sat Jun 24 22:46:26 2006
-+++ src/trace/potrace/inkscape-potrace.cpp	Sun Jun 25 01:29:20 2006
-@@ -54,6 +54,121 @@ static void potraceStatusCallback(double
-     //      (Inkscape::Trace::Potrace::PotraceTracingEngine *)userData;
- }
- 
-+#ifndef log2
-+static const double
-+ln2 = 0.6931471805599452862268,
-+two54   =  1.80143985094819840000e+16,  /* 43500000 00000000 */
-+Lg1 = 6.666666666666735130e-01,  /* 3FE55555 55555593 */
-+Lg2 = 3.999999999940941908e-01,  /* 3FD99999 9997FA04 */
-+Lg3 = 2.857142874366239149e-01,  /* 3FD24924 94229359 */
-+Lg4 = 2.222219843214978396e-01,  /* 3FCC71C5 1D8E78AF */
-+Lg5 = 1.818357216161805012e-01,  /* 3FC74664 96CB03DE */
-+Lg6 = 1.531383769920937332e-01,  /* 3FC39A09 D078C69F */
-+Lg7 = 1.479819860511658591e-01;  /* 3FC2F112 DF3E5244 */
-+
-+static const double zero = 0.0;
-+
-+#if BYTE_ORDER == BIG_ENDIAN
-+
-+typedef union
-+{
-+      double value;
-+        struct
-+	      {
-+		      u_int32_t msw;
-+		          u_int32_t lsw;
-+			    } parts;
-+} ieee_double_shape_type;
-+
-+#endif
-+
-+#if BYTE_ORDER == LITTLE_ENDIAN
-+
-+typedef union
-+{
-+      double value;
-+        struct
-+	      {
-+		      u_int32_t lsw;
-+		          u_int32_t msw;
-+			    } parts;
-+} ieee_double_shape_type;
-+
-+#endif
-+
-+#define EXTRACT_WORDS(ix0,ix1,d)                                \
-+    do {                                                            \
-+	  ieee_double_shape_type ew_u;                                  \
-+	  ew_u.value = (d);                                             \
-+	  (ix0) = ew_u.parts.msw;                                       \
-+	  (ix1) = ew_u.parts.lsw;                                       \
-+    } while (0)
-+
-+#define GET_HIGH_WORD(i,d)                                      \
-+    do {                                                            \
-+	  ieee_double_shape_type gh_u;                                  \
-+	  gh_u.value = (d);                                             \
-+	  (i) = gh_u.parts.msw;                                         \
-+    } while (0)
-+
-+#define SET_HIGH_WORD(d,v)                                      \
-+    do {                                                            \
-+	  ieee_double_shape_type sh_u;                                  \
-+	  sh_u.value = (d);                                             \
-+	  sh_u.parts.msw = (v);                                         \
-+	  (d) = sh_u.value;                                             \
-+    } while (0)
-+
-+static double
-+_log2(double x)
-+{
-+    double hfsq,f,s,z,R,w,t1,t2,dk;
-+    int32_t k,hx,i,j;
-+    u_int32_t lx;
-+
-+    EXTRACT_WORDS(hx,lx,x);
-+
-+    k=0;
-+    if (hx < 0x00100000) {			/* x < 2**-1022  */
-+	if (((hx&0x7fffffff)|lx)==0) 
-+	    return -two54/zero;		/* log(+-0)=-inf */
-+	if (hx<0) return (x-x)/zero;	/* log(-#) = NaN */
-+	k -= 54; x *= two54; /* subnormal number, scale up x */
-+	GET_HIGH_WORD(hx,x);
-+    }
-+    if (hx >= 0x7ff00000) return x+x;
-+    k += (hx>>20)-1023;
-+    hx &= 0x000fffff;
-+    i = (hx+0x95f64)&0x100000;
-+    SET_HIGH_WORD(x,hx|(i^0x3ff00000));	/* normalize x or x/2 */
-+    k += (i>>20);
-+    f = x-1.0;
-+    dk = (double)k;
-+    if((0x000fffff&(2+hx))<3) {	/* |f| < 2**-20 */
-+	if (f==zero)
-+	    return (dk);
-+	R = f*f*(0.5-0.33333333333333333*f);
-+	return (dk-(R-f)/ln2);
-+    }
-+    s = f/(2.0+f);
-+    z = s*s;
-+    i = hx-0x6147a;
-+    w = z*z;
-+    j = 0x6b851-hx;
-+    t1= w*(Lg2+w*(Lg4+w*Lg6));
-+    t2= z*(Lg1+w*(Lg3+w*(Lg5+w*Lg7)));
-+    i |= j;
-+    R = t2+t1;
-+    if(i>0) {
-+	hfsq=0.5*f*f;
-+	return (dk-(hfsq-s*(hfsq+R)-f)/ln2);
-+    } else
-+	return (dk-((s*(f-R))-f)/ln2);
-+}
-+
-+#define log2(x) _log2(x)
-+#endif
-+
- 
- 
- 
diff --git a/graphics/inkscape/files/patch-src_trace_siox.cpp b/graphics/inkscape/files/patch-src_trace_siox.cpp
deleted file mode 100644
index 5b0e03d5a163..000000000000
--- a/graphics/inkscape/files/patch-src_trace_siox.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/trace/siox.cpp.orig	2013-10-17 12:12:48.000000000 +0200
-+++ src/trace/siox.cpp	2013-10-17 12:13:01.000000000 +0200
-@@ -21,6 +21,7 @@
- #include <stdarg.h>
- #include <map>
- #include <algorithm>
-+#include <cstdlib>
- 
- 
- namespace org
diff --git a/graphics/inkscape/files/patch-src_ui_dialog_inkscape-preferences.cpp b/graphics/inkscape/files/patch-src_ui_dialog_inkscape-preferences.cpp
deleted file mode 100644
index 5293eaf95ea6..000000000000
--- a/graphics/inkscape/files/patch-src_ui_dialog_inkscape-preferences.cpp
+++ /dev/null
@@ -1,30 +0,0 @@
---- src/ui/dialog/inkscape-preferences.cpp.orig	2013-10-17 12:28:59.000000000 +0200
-+++ src/ui/dialog/inkscape-preferences.cpp	2013-10-17 13:14:45.000000000 +0200
-@@ -420,6 +420,7 @@
-     this->AddPage(_page_selector, _("Selector"), iter_tools, PREFS_PAGE_TOOLS_SELECTOR);
- 
-     AddSelcueCheckbox(_page_selector, "/tools/select", false);
-+    AddGradientCheckbox(_page_selector, "/tools/select", false);
-     _page_selector.add_group_header( _("When transforming, show:"));
-     _t_sel_trans_obj.init ( _("Objects"), "/tools/select/show", "content", true, 0);
-     _page_selector.add_line( true, "", _t_sel_trans_obj, "",
-@@ -1239,8 +1240,8 @@
-         gchar** splits = g_strsplit(choices.data(), ",", 0);
-         gint numIems = g_strv_length(splits);
- 
--        Glib::ustring labels[numIems];
--        int values[numIems];
-+        Glib::ustring *labels = new Glib::ustring[numIems];
-+        int *values = new int[numIems];
-         for ( gint i = 0; i < numIems; i++) {
-             values[i] = i;
-             labels[i] = splits[i];
-@@ -1249,6 +1250,8 @@
-         _page_bitmaps.add_line( false, _("Bitmap editor:"), _misc_bitmap_editor, "", "", false);
- 
-         g_strfreev(splits);
-+        delete[] values;
-+        delete[] labels;
-     }
- 
-     _bitmap_copy_res.init("/options/createbitmap/resolution", 1.0, 6000.0, 1.0, 1.0, PX_PER_IN, true, false);
diff --git a/graphics/inkscape/files/patch-src_ui_tool_node.h b/graphics/inkscape/files/patch-src_ui_tool_node.h
index db6e63e74f38..63287944d1c1 100644
--- a/graphics/inkscape/files/patch-src_ui_tool_node.h
+++ b/graphics/inkscape/files/patch-src_ui_tool_node.h
@@ -1,30 +1,11 @@
---- src/ui/tool/node.h.orig	2012-02-14 04:22:17.670697000 +0100
-+++ src/ui/tool/node.h	2013-10-17 12:47:44.000000000 +0200
-@@ -16,7 +16,13 @@
- #include <iosfwd>
- #include <stdexcept>
- #include <cstddef>
-+
-+#if __cplusplus >= 201103L
-+#include <functional>
-+#else
- #include <tr1/functional>
-+#endif
-+
- #include <boost/utility.hpp>
- #include <boost/shared_ptr.hpp>
- #include <boost/optional.hpp>
-@@ -32,11 +38,13 @@
+--- src/ui/tool/node.h.orig	2014-10-20 01:38:50.972399465 +0200
++++ src/ui/tool/node.h	2014-10-20 01:37:10.561420788 +0200
+@@ -38,7 +38,7 @@
  }
  }
  
+-#if __cplusplus < 201103L
 +#if __cplusplus < 201103L && !defined(_LIBCPP_VERSION)
  namespace std {
  namespace tr1 {
  template <typename N> struct hash< Inkscape::UI::NodeIterator<N> >;
- }
- }
-+#endif
- 
- namespace Inkscape {
- namespace UI {
diff --git a/graphics/inkscape/files/patch-src_ui_widget_registered-widget.h b/graphics/inkscape/files/patch-src_ui_widget_registered-widget.h
deleted file mode 100644
index 768863e599e1..000000000000
--- a/graphics/inkscape/files/patch-src_ui_widget_registered-widget.h
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/ui/widget/registered-widget.h.orig	2013-10-17 12:28:59.000000000 +0200
-+++ src/ui/widget/registered-widget.h	2013-10-17 12:36:51.000000000 +0200
-@@ -61,9 +61,6 @@
- 
-     bool is_updating() {if (_wr) return _wr->isUpdating(); else return false;}
- 
--    // provide automatic 'upcast' for ease of use. (do it 'dynamic_cast' instead of 'static' because who knows what W is)
--    operator const Gtk::Widget () { return dynamic_cast<Gtk::Widget*>(this); }
--
- protected:
-     RegisteredWidget() : W() { construct(); }
-     template< typename A >
diff --git a/graphics/inkscape/files/patch-src_widgets_desktop-widget.h b/graphics/inkscape/files/patch-src_widgets_desktop-widget.h
deleted file mode 100644
index 40f5c97df316..000000000000
--- a/graphics/inkscape/files/patch-src_widgets_desktop-widget.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/widgets/desktop-widget.h.orig	2013-10-17 12:28:59.000000000 +0200
-+++ src/widgets/desktop-widget.h	2013-10-17 12:38:00.000000000 +0200
-@@ -239,7 +239,7 @@
- private:
-     GtkWidget *tool_toolbox;
-     GtkWidget *aux_toolbox;
--    GtkWidget *commands_toolbox,;
-+    GtkWidget *commands_toolbox;
-     GtkWidget *snap_toolbox;
- 
-     static void init(SPDesktopWidget *widget);
diff --git a/graphics/inkscape/pkg-plist b/graphics/inkscape/pkg-plist
index 2f9382ecc873..7caeb860287e 100644
--- a/graphics/inkscape/pkg-plist
+++ b/graphics/inkscape/pkg-plist
@@ -1,7 +1,17 @@
 bin/inkscape
 bin/inkview
+man/el/man1/inkscape.el.1.gz
+man/fr/man1/inkscape.fr.1.gz
+man/ja/man1/inkscape.ja.1.gz
 man/man1/inkscape.1.gz
+man/man1/inkscape.el.1.gz
+man/man1/inkscape.fr.1.gz
+man/man1/inkscape.ja.1.gz
+man/man1/inkscape.sk.1.gz
+man/man1/inkscape.zh_TW.1.gz
 man/man1/inkview.1.gz
+man/sk/man1/inkscape.ja.1.gz
+man/zh_TW/man1/inkscape.zh_TW.1.gz
 share/applications/inkscape.desktop
 share/icons/hicolor/16x16/apps/inkscape.png
 share/icons/hicolor/22x22/apps/inkscape.png
@@ -12,7 +22,6 @@ share/icons/hicolor/48x48/apps/inkscape.png
 %%DATADIR%%/clipart/README
 %%DATADIR%%/clipart/draw-freely.ru.svg
 %%DATADIR%%/clipart/draw-freely.svg
-%%DATADIR%%/clipart/inkscape.logo.svg
 %%DATADIR%%/clipart/orav.svg
 %%DATADIR%%/clipart/tux.svg
 %%DATADIR%%/examples/README