Changes 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
64-bit compilation is now possible on Windows

24 files changed, 37 insertions, 625 deletions

diff --git a/graphics/inkscape/Makefile b/graphics/inkscape/Makefile
index 79eb8da1df0..b2af7106222 100644
--- a/graphics/inkscape/Makefile
+++ b/graphics/inkscape/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.108 2014/05/29 23:36:38 wiz Exp $
+# $NetBSD: Makefile,v 1.109 2014/07/29 07:03:27 adam Exp $
 
-DISTNAME=	inkscape-0.48.4
-PKGREVISION=	25
+DISTNAME=	inkscape-0.48.5
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=inkscape/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/graphics/inkscape/PLIST b/graphics/inkscape/PLIST
index 128b6fb0918..489f20b5216 100644
--- a/graphics/inkscape/PLIST
+++ b/graphics/inkscape/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.20 2012/06/01 20:23:10 drochner Exp $
+@comment $NetBSD: PLIST,v 1.21 2014/07/29 07:03:27 adam Exp $
 bin/inkscape
 bin/inkview
 man/el/man1/inkscape.el.1
@@ -23,7 +23,6 @@ share/icons/hicolor/48x48/apps/inkscape.png
 share/inkscape/clipart/README
 share/inkscape/clipart/draw-freely.ru.svg
 share/inkscape/clipart/draw-freely.svg
-share/inkscape/clipart/inkscape.logo.svg
 share/inkscape/clipart/orav.svg
 share/inkscape/clipart/tux.svg
 share/inkscape/examples/README
diff --git a/graphics/inkscape/distinfo b/graphics/inkscape/distinfo
index 17657a8071f..8ab4fb021ce 100644
--- a/graphics/inkscape/distinfo
+++ b/graphics/inkscape/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.52 2014/05/08 21:52:40 asau Exp $
+$NetBSD: distinfo,v 1.53 2014/07/29 07:03:27 adam Exp $
 
-SHA1 (inkscape-0.48.4.tar.bz2) = 5f26f6ad191d1e7c2a9fb69a438722beb172224c
-RMD160 (inkscape-0.48.4.tar.bz2) = b089ced7694a9803fac8588d93e7e6239c71d3e8
-Size (inkscape-0.48.4.tar.bz2) = 19712522 bytes
+SHA1 (inkscape-0.48.5.tar.bz2) = 83ddb0c96069638f712a869039989bfd7d79c6a8
+RMD160 (inkscape-0.48.5.tar.bz2) = c05e861dd458245193373f40790035339aac3e01
+Size (inkscape-0.48.5.tar.bz2) = 19719332 bytes
 SHA1 (patch-aa) = d946236902fc6cf0d2ddcbb9dd667b4d9c6f99d4
 SHA1 (patch-ab) = b70ffa613c054c26185d4728da4133aed6d88e63
-SHA1 (patch-ac) = 01caeac029e0ce7e4c4e2b6a9a80b76d9f9b495e
+SHA1 (patch-ac) = e6877bb4698c74622f0302328ad959b75b070ff9
 SHA1 (patch-ad) = 3136850b7d34370feb951fc8fdde8cda78d54d60
 SHA1 (patch-ae) = 2b3f06a545d3cf27f59d41619528c59ac142c758
 SHA1 (patch-af) = 5f9317fcb7a798afc569aada9683fb1c7f6ba4c7
@@ -15,27 +15,10 @@ SHA1 (patch-ai) = 1cd8e744848d6b52ffb4f07922e09689b5e43f61
 SHA1 (patch-aj) = 8564ee2d4e884dc31e4ad4232267f6fad09f71ee
 SHA1 (patch-ap) = 134a47053020547703906140ff744e875ca1284f
 SHA1 (patch-aq) = dd307f598741cd5f0ff35eb06dff7c685752a979
-SHA1 (patch-src_2geom_basic-intersection.cpp) = 743b13293191a74d4c0c22231e5ed7866219dfee
-SHA1 (patch-src_2geom_sbasis.h) = 483353f56f7fb01ca8c76241aca5e63d0513aba5
-SHA1 (patch-src_2geom_solve-bezier-parametric.cpp) = 71cca994451b1e7d5aba625600089d1e4a47888e
-SHA1 (patch-src_Makefile.in) = 4c07142f3a554a01d4c2b352df27c0a83ac4352b
-SHA1 (patch-src_color-profile.cpp) = 14932b25ed333925518d5140b3691a29e155cd9a
-SHA1 (patch-src_display_nr-filter-gaussian.cpp) = 344109eb4360560bfe8481b25588ef37e5140135
 SHA1 (patch-src_dom_io_domstream.cpp) = 6b525b8e730e4497afdf1da0ae27f0dc69bfad40
 SHA1 (patch-src_dom_io_domstream.h) = 9325fc9d211eb3349628a736283ed0c475399a8b
-SHA1 (patch-src_extension_internal_pdfinput_pdf-parser.cpp) = 783251007ef69f4c3af1f8840f2d6ba88d9b97db
+SHA1 (patch-src_extension_internal_pdfinput_pdf-parser.cpp) = cdf23f9d98c1c2096bf99b05b23b1d8184fc007c
 SHA1 (patch-src_extension_internal_pdfinput_pdf-parser.h) = 9e9e76049b9fdcc5192e225b4b477a104902894b
-SHA1 (patch-src_gc-core.h) = e23bba26094aa2203568fa5f2b98412994e87f19
-SHA1 (patch-src_gc.cpp) = 4395d00ffbcecb9f1d4947823312a2f176437840
 SHA1 (patch-src_io_inkjar.cpp) = 060d59225cfe7b66db5e9f41e76860df9ce12d01
-SHA1 (patch-src_libnrtype_FontFactory.h) = 282e6ea4da7bb40c5ba8c861fdbe303259d3e864
-SHA1 (patch-src_libnrtype_Layout-TNG-OutIter.cpp) = 28870d9970946b629657f1663cbe8b325ef42b69
-SHA1 (patch-src_libvpsc_csolve__VPSC.h) = 33aa27678fa9e802af6ab95b9ea28b69d822c4cb
-SHA1 (patch-src_live__effects_lpe-perp__bisector.h) = 08c911a629d1f247bddd001716ae9b0b04a2e357
-SHA1 (patch-src_remove-last.h) = 7ae01e509216680c063bbd8acdc0fb697ebf8552
-SHA1 (patch-src_sp-item-rm-unsatisfied-cns.cpp) = 40e25393233a18372ee86655e3730a7a87701a9b
-SHA1 (patch-src_trace_siox.cpp) = 1b91dd39a07dea9de34646e37ff11cca14abae24
-SHA1 (patch-src_ui_dialog_inkscape-preferences.cpp) = f95af6d326ddf7512b67f68efe0b23bc3ebe651e
-SHA1 (patch-src_ui_tool_node.h) = 18237624e07881cf9985b0a6f2c75bbc082bede6
-SHA1 (patch-src_ui_widget_registered-widget.h) = a5c16bcd28a015959121ed8b92423762f182a71b
-SHA1 (patch-src_widgets_desktop-widget.h) = 6528b3105590bfa8b5d33d428aa8c9cbc3561225
+SHA1 (patch-src_trace_siox.cpp) = daeff4626dace6997f64ab9c96b0bfb304e724c8
+SHA1 (patch-src_ui_tool_node.h) = 6ca23dddadcef8318bc81b7a67c69580db4a7b9f
diff --git a/graphics/inkscape/patches/patch-ac b/graphics/inkscape/patches/patch-ac
index af6a8bce7e6..8fba8dcaa0c 100644
--- a/graphics/inkscape/patches/patch-ac
+++ b/graphics/inkscape/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.9 2012/11/18 15:40:55 adam Exp $
+$NetBSD: patch-ac,v 1.10 2014/07/29 07:03:27 adam Exp $
 
---- configure.orig	2012-02-19 01:43:51.000000000 +0000
+--- configure.orig	2014-06-20 22:05:43.000000000 +0000
 +++ configure
-@@ -7349,7 +7349,6 @@ fi
+@@ -7483,7 +7483,6 @@ fi
    { $as_echo "$as_me:${as_lineno-$LINENO}: checking compiler support for -Werror=format-security" >&5
  $as_echo_n "checking compiler support for -Werror=format-security... " >&6; }
    ink_svd_CPPFLAGS="$CPPFLAGS"
@@ -10,16 +10,7 @@ $NetBSD: patch-ac,v 1.9 2012/11/18 15:40:55 adam Exp $
  
  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
-@@ -7450,7 +7449,7 @@ fi
- 
- ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS"
- 
--if test "x$GXX" = "xyes"; then
-+if 0; then
- 	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking GNU compiler version" >&5
- $as_echo_n "checking GNU compiler version... " >&6; }
- 
-@@ -7578,7 +7577,7 @@ cat >>confdefs.h <<_ACEOF
+@@ -7686,7 +7685,7 @@ cat >>confdefs.h <<_ACEOF
  #define GETTEXT_PACKAGE "$GETTEXT_PACKAGE"
  _ACEOF
  
@@ -28,7 +19,7 @@ $NetBSD: patch-ac,v 1.9 2012/11/18 15:40:55 adam Exp $
  
     for ac_header in locale.h
  do :
-@@ -8445,11 +8444,11 @@ for ax_openmp_flag in $ax_openmp_flags; 
+@@ -8553,11 +8552,11 @@ for ax_openmp_flag in $ax_openmp_flags; 
  #ifdef __cplusplus
  extern "C"
  #endif
@@ -42,7 +33,7 @@ $NetBSD: patch-ac,v 1.9 2012/11/18 15:40:55 adam Exp $
    ;
    return 0;
  }
-@@ -9620,11 +9619,11 @@ fi
+@@ -9731,11 +9730,11 @@ fi
  
  
  if test "x$with_python" = "xyes"; then
@@ -56,7 +47,7 @@ $NetBSD: patch-ac,v 1.9 2012/11/18 15:40:55 adam Exp $
          if test "$?" -gt "0"; then
              with_python="no"
          else
-@@ -9684,7 +9683,7 @@ if test "x$enable_lcms" = "xno"; then
+@@ -9795,7 +9794,7 @@ if test "x$enable_lcms" = "xno"; then
      have_lcms2=no
  else
      # Have to test LittleCms presence
@@ -65,7 +56,7 @@ $NetBSD: patch-ac,v 1.9 2012/11/18 15:40:55 adam Exp $
         # lcms 2.2 & 2.3 have problems on OSX
  
  pkg_failed=no
-@@ -11095,7 +11094,7 @@ $as_echo "#define HAVE_CAIRO_PDF 1" >>co
+@@ -11356,7 +11355,7 @@ $as_echo "#define HAVE_CAIRO_PDF 1" >>co
  
  fi
  
diff --git a/graphics/inkscape/patches/patch-src_2geom_basic-intersection.cpp b/graphics/inkscape/patches/patch-src_2geom_basic-intersection.cpp
deleted file mode 100644
index b3e9c6e5fc4..00000000000
--- a/graphics/inkscape/patches/patch-src_2geom_basic-intersection.cpp
+++ /dev/null
@@ -1,37 +0,0 @@
-$NetBSD: patch-src_2geom_basic-intersection.cpp,v 1.1 2012/11/16 00:54:04 joerg Exp $
-
---- src/2geom/basic-intersection.cpp.orig	2012-11-15 17:34:38.000000000 +0000
-+++ src/2geom/basic-intersection.cpp
-@@ -64,24 +64,27 @@ void find_intersections(std::vector< std
- 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 * sz];;
- 
-     /* Copy control points	*/
--    std::copy(p.begin(), p.end(), Vtemp[0]);
-+    for (unsigned i = 0; i < sz; ++i)
-+        Vtemp[0 * sz + i] = p[i];
- 
-     /* Triangle computation	*/
-     for (unsigned i = 1; i < sz; i++) {
-         for (unsigned j = 0; j < sz - i; j++) {
--            Vtemp[i][j] = lerp(t, Vtemp[i-1][j], Vtemp[i-1][j+1]);
-+            Vtemp[i * sz + j] = lerp(t, Vtemp[(i-1) * sz + j], Vtemp[(i-1) * sz + j+1]);
-         }
-     }
- 
-     left.resize(sz);
-     right.resize(sz);
-     for (unsigned j = 0; j < sz; j++)
--        left[j]  = Vtemp[j][0];
-+        left[j]  = Vtemp[j * sz];
-     for (unsigned j = 0; j < sz; j++)
--        right[j] = Vtemp[sz-1-j][j];
-+        right[j] = Vtemp[(sz-1-j) * sz + j];
-+
-+    delete[] Vtemp;
- }
- 
- 
diff --git a/graphics/inkscape/patches/patch-src_2geom_sbasis.h b/graphics/inkscape/patches/patch-src_2geom_sbasis.h
deleted file mode 100644
index b0af1b09639..00000000000
--- a/graphics/inkscape/patches/patch-src_2geom_sbasis.h
+++ /dev/null
@@ -1,51 +0,0 @@
-$NetBSD: patch-src_2geom_sbasis.h,v 1.1 2014/01/11 17:48:52 wiz Exp $
-
-Fix build with clang/libc++. From upstream via FreeBSD ports.
-
---- src/2geom/sbasis.h.orig	2011-07-08 18:25:09.000000000 +0000
-+++ src/2geom/sbasis.h
-@@ -75,10 +75,13 @@ public:
-         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 @@ public:
-     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 @@ SBasis shift(Linear const &a, int sh);
- 
- 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/patches/patch-src_2geom_solve-bezier-parametric.cpp b/graphics/inkscape/patches/patch-src_2geom_solve-bezier-parametric.cpp
deleted file mode 100644
index 7074db8ff65..00000000000
--- a/graphics/inkscape/patches/patch-src_2geom_solve-bezier-parametric.cpp
+++ /dev/null
@@ -1,39 +0,0 @@
-$NetBSD: patch-src_2geom_solve-bezier-parametric.cpp,v 1.1 2012/11/16 00:54:04 joerg Exp $
-
---- src/2geom/solve-bezier-parametric.cpp.orig	2012-11-15 17:42:23.000000000 +0000
-+++ src/2geom/solve-bezier-parametric.cpp
-@@ -191,24 +191,27 @@ Bezier(Geom::Point const *V, /* Control 
-        Geom::Point *Left,	/* RETURN left half ctl pts */
-        Geom::Point *Right)	/* RETURN right half ctl pts */
- {
--    Geom::Point Vtemp[degree+1][degree+1];
-+    const unsigned sz = degree + 1;
-+    Geom::Point *Vtemp = new Geom::Point[sz * sz];
- 
-     /* Copy control points	*/
--    std::copy(V, V+degree+1, Vtemp[0]);
-+    for (unsigned i = 0; i < sz; ++i)
-+        Vtemp[0 * sz + i] = V[i];
- 
-     /* Triangle computation	*/
-     for (unsigned i = 1; i <= degree; i++) {	
-         for (unsigned j = 0; j <= degree - i; j++) {
--            Vtemp[i][j] = lerp(t, Vtemp[i-1][j], Vtemp[i-1][j+1]);
-+            Vtemp[i * sz + j] = lerp(t, Vtemp[(i-1) * sz + j], Vtemp[(i-1) * sz + j+1]);
-         }
-     }
-     
-     for (unsigned j = 0; j <= degree; j++)
--        Left[j]  = Vtemp[j][0];
-+        Left[j]  = Vtemp[j * sz + 0];
-     for (unsigned j = 0; j <= degree; j++)
--        Right[j] = Vtemp[degree-j][j];
--
--    return (Vtemp[degree][0]);
-+        Right[j] = Vtemp[(degree-j) * sz + j];
-+    Geom::Point rv(Vtemp[degree * sz + 0]);
-+    delete[] Vtemp;
-+    return rv;
- }
- 
- };
diff --git a/graphics/inkscape/patches/patch-src_Makefile.in b/graphics/inkscape/patches/patch-src_Makefile.in
deleted file mode 100644
index 9842dc21293..00000000000
--- a/graphics/inkscape/patches/patch-src_Makefile.in
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-src_Makefile.in,v 1.1 2013/08/04 16:06:21 adam Exp $
-
---export-dynamic gives an error on OS X.
-
---- src/Makefile.in.orig	2012-12-15 16:56:07.000000000 +0000
-+++ src/Makefile.in
-@@ -3014,7 +3015,7 @@ DISTCLEANFILES = \
- libinkscape_a_SOURCES = $(ink_common_sources)
- inkscape_LDADD = $(all_libs)
- @PLATFORM_OSX_FALSE@inkscape_LDFLAGS = -Wl,--export-dynamic $(kdeldflags) $(mwindows)
--@PLATFORM_OSX_TRUE@inkscape_LDFLAGS = --export-dynamic $(kdeldflags) $(mwindows)
-+@PLATFORM_OSX_TRUE@inkscape_LDFLAGS = $(kdeldflags) $(mwindows)
- inkview_LDADD = $(all_libs)
- inkview_LDFLAGS = $(mwindows) 
- 
diff --git a/graphics/inkscape/patches/patch-src_color-profile.cpp b/graphics/inkscape/patches/patch-src_color-profile.cpp
deleted file mode 100644
index bfe05ab8e2e..00000000000
--- a/graphics/inkscape/patches/patch-src_color-profile.cpp
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-src_color-profile.cpp,v 1.1 2012/11/16 00:54:04 joerg Exp $
-
---- src/color-profile.cpp.orig	2012-11-15 16:10:51.000000000 +0000
-+++ src/color-profile.cpp
-@@ -103,6 +103,8 @@ extern guint update_in_progress;
- 
- static SPObjectClass *cprof_parent_class;
- 
-+namespace Inkscape {
-+
- class ColorProfileImpl {
- public:
- #if defined(HAVE_LIBLCMS1) || defined(HAVE_LIBLCMS2)
-@@ -129,6 +131,7 @@ public:
- #endif // defined(HAVE_LIBLCMS1) || defined(HAVE_LIBLCMS2)
- };
- 
-+}
- 
- 
- namespace Inkscape {
diff --git a/graphics/inkscape/patches/patch-src_display_nr-filter-gaussian.cpp b/graphics/inkscape/patches/patch-src_display_nr-filter-gaussian.cpp
deleted file mode 100644
index 33e8b21d23f..00000000000
--- a/graphics/inkscape/patches/patch-src_display_nr-filter-gaussian.cpp
+++ /dev/null
@@ -1,38 +0,0 @@
-$NetBSD: patch-src_display_nr-filter-gaussian.cpp,v 1.1 2012/11/16 00:54:04 joerg Exp $
-
---- src/display/nr-filter-gaussian.cpp.orig	2012-11-15 16:38:32.000000000 +0000
-+++ src/display/nr-filter-gaussian.cpp
-@@ -708,7 +708,7 @@ int FilterGaussian::render(FilterSlot &s
-         };
-     } else if ( scr_len_x > 0 ) { // !use_IIR_x
-         // Filter kernel for x direction
--        FIRValue kernel[scr_len_x+1];
-+        FIRValue *kernel = new FIRValue[scr_len_x+1];
-         _make_kernel(&kernel[0], deviation_x);
- 
-         // Filter (x)
-@@ -728,6 +728,7 @@ int FilterGaussian::render(FilterSlot &s
-         default:
-             assert(false);
-         };
-+        delete[] kernel;
-     } else if ( out != ssin ) { // out can be equal to ssin if resampling is used
-         nr_blit_pixblock_pixblock(out, ssin);
-     }
-@@ -770,7 +771,7 @@ int FilterGaussian::render(FilterSlot &s
-         };
-     } else if ( scr_len_y > 0 ) { // !use_IIR_y
-         // Filter kernel for y direction
--        FIRValue kernel[scr_len_y+1];
-+        FIRValue *kernel = new FIRValue[scr_len_y+1];
-         _make_kernel(&kernel[0], deviation_y);
- 
-         // Filter (y)
-@@ -790,6 +791,7 @@ int FilterGaussian::render(FilterSlot &s
-         default:
-             assert(false);
-         };
-+        delete[] kernel;
-     }
- 
-     for(int i=0; i<NTHREADS; i++) {
diff --git a/graphics/inkscape/patches/patch-src_extension_internal_pdfinput_pdf-parser.cpp b/graphics/inkscape/patches/patch-src_extension_internal_pdfinput_pdf-parser.cpp
index 53f5ce7762c..c49afb02949 100644
--- a/graphics/inkscape/patches/patch-src_extension_internal_pdfinput_pdf-parser.cpp
+++ b/graphics/inkscape/patches/patch-src_extension_internal_pdfinput_pdf-parser.cpp
@@ -1,9 +1,7 @@
-$NetBSD: patch-src_extension_internal_pdfinput_pdf-parser.cpp,v 1.2 2014/04/30 06:15:20 wiz Exp $
+$NetBSD: patch-src_extension_internal_pdfinput_pdf-parser.cpp,v 1.3 2014/07/29 07:03:27 adam Exp $
 
 Object.h is included in pdf-parser.h -- see patch for pdf-parser.h.
 
-Fix build with poppler-0.26.0.
-
 --- src/extension/internal/pdfinput/pdf-parser.cpp.orig	2012-12-13 17:00:46.000000000 +0000
 +++ src/extension/internal/pdfinput/pdf-parser.cpp
 @@ -38,7 +38,6 @@ extern "C" {
@@ -14,90 +12,3 @@ Fix build with poppler-0.26.0.
  #include "Array.h"
  #include "Dict.h"
  #include "Stream.h"
-@@ -861,7 +860,7 @@ void PdfParser::opSetExtGState(Object ar
- 	  isolated = knockout = gFalse;
- 	  if (!obj4.dictLookup(const_cast<char*>("CS"), &obj5)->isNull()) {
- #if defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI)
--	    blendingColorSpace = GfxColorSpace::parse(&obj5, NULL);
-+	    blendingColorSpace = GfxColorSpace::parse(&obj5, NULL, state);
- #else
- 	    blendingColorSpace = GfxColorSpace::parse(&obj5);
- #endif
-@@ -1085,9 +1084,9 @@ void PdfParser::opSetFillColorSpace(Obje
-   res->lookupColorSpace(args[0].getName(), &obj);
- #if defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI)
-   if (obj.isNull()) {
--    colorSpace = GfxColorSpace::parse(&args[0], NULL);
-+    colorSpace = GfxColorSpace::parse(&args[0], NULL, state);
-   } else {
--    colorSpace = GfxColorSpace::parse(&obj, NULL);
-+    colorSpace = GfxColorSpace::parse(&obj, NULL, state);
-   }
- #else
-   if (obj.isNull()) {
-@@ -1120,9 +1119,9 @@ void PdfParser::opSetStrokeColorSpace(Ob
-   res->lookupColorSpace(args[0].getName(), &obj);
- #if defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI)
-   if (obj.isNull()) {
--    colorSpace = GfxColorSpace::parse(&args[0], NULL);
-+    colorSpace = GfxColorSpace::parse(&args[0], NULL, state);
-   } else {
--    colorSpace = GfxColorSpace::parse(&obj, NULL);
-+    colorSpace = GfxColorSpace::parse(&obj, NULL, state);
-   }
- #else
-   if (obj.isNull()) {
-@@ -1213,7 +1212,7 @@ void PdfParser::opSetFillColorN(Object a
-     }
- #if defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI)
-     if (args[numArgs-1].isName() &&
--	(pattern = res->lookupPattern(args[numArgs-1].getName(), NULL))) {
-+	(pattern = res->lookupPattern(args[numArgs-1].getName(), NULL, state))) {
-       state->setFillPattern(pattern);
-       builder->updateStyle(state);
-     }
-@@ -1273,7 +1272,7 @@ void PdfParser::opSetStrokeColorN(Object
-     }
- #if defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI)
-     if (args[numArgs-1].isName() &&
--	(pattern = res->lookupPattern(args[numArgs-1].getName(), NULL))) {
-+	(pattern = res->lookupPattern(args[numArgs-1].getName(), NULL, state))) {
-       state->setStrokePattern(pattern);
-       builder->updateStyle(state);
-     }
-@@ -1711,7 +1710,7 @@ void PdfParser::opShFill(Object args[], 
-   GBool savedState = gFalse;
- 
- #if defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI)
--  if (!(shading = res->lookupShading(args[0].getName(), NULL))) {
-+  if (!(shading = res->lookupShading(args[0].getName(), NULL, state))) {
-     return;
-   }
- #else
-@@ -2727,7 +2726,7 @@ void PdfParser::doImage(Object *ref, Str
-     }
-     if (!obj1.isNull()) {
- #if defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI)
--      colorSpace = GfxColorSpace::parse(&obj1, NULL);
-+      colorSpace = GfxColorSpace::parse(&obj1, NULL, state);
- #else
-       colorSpace = GfxColorSpace::parse(&obj1);
- #endif
-@@ -2816,7 +2815,7 @@ void PdfParser::doImage(Object *ref, Str
- 	}
-       }
- #if defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI)
--      maskColorSpace = GfxColorSpace::parse(&obj1, NULL);
-+      maskColorSpace = GfxColorSpace::parse(&obj1, NULL, state);
- #else
-       maskColorSpace = GfxColorSpace::parse(&obj1);
- #endif
-@@ -3007,7 +3006,7 @@ void PdfParser::doForm(Object *str) {
-       transpGroup = gTrue;
-       if (!obj1.dictLookup(const_cast<char*>("CS"), &obj3)->isNull()) {
- #if defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI)
--	blendingColorSpace = GfxColorSpace::parse(&obj3, NULL);
-+	blendingColorSpace = GfxColorSpace::parse(&obj3, NULL, state);
- #else
- 	blendingColorSpace = GfxColorSpace::parse(&obj3);
- #endif
diff --git a/graphics/inkscape/patches/patch-src_gc-core.h b/graphics/inkscape/patches/patch-src_gc-core.h
deleted file mode 100644
index a9f7f6ba130..00000000000
--- a/graphics/inkscape/patches/patch-src_gc-core.h
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-src_gc-core.h,v 1.1 2014/04/17 06:20:27 wiz Exp $
-
-    Committer: Johan B. C. Engelen
-    Date: 2014-01-12 21:00:46 UTC
-    Revision ID: j.b.c.engelen@alumnus.utwente.nl-20140112210046-w4k02e3v5wkwg2za
-
-https://launchpad.net/bugs/1265072
-fix build with boehm-gc 7.4.0+ (patch by Vladimir Smirnov, slightly modified by me)
-
-
---- src/gc-core.h.orig	2012-02-14 03:22:17.000000000 +0000
-+++ src/gc-core.h
-@@ -57,7 +57,7 @@ struct Ops {
-                                            CleanupFunc *old_func,
-                                            void **old_data);
-     int (*general_register_disappearing_link)(void **p_ptr,
--                                              void *base);
-+                                              void const *base);
-     int (*unregister_disappearing_link)(void **p_ptr);
-     std::size_t (*get_heap_size)();
-     std::size_t (*get_free_bytes)();
diff --git a/graphics/inkscape/patches/patch-src_gc.cpp b/graphics/inkscape/patches/patch-src_gc.cpp
deleted file mode 100644
index 71309896a82..00000000000
--- a/graphics/inkscape/patches/patch-src_gc.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
-$NetBSD: patch-src_gc.cpp,v 1.1 2014/04/17 06:20:27 wiz Exp $
-
-    Committer: Johan B. C. Engelen
-    Date: 2014-01-12 21:00:46 UTC
-    Revision ID: j.b.c.engelen@alumnus.utwente.nl-20140112210046-w4k02e3v5wkwg2za
-
-https://launchpad.net/bugs/1265072
-fix build with boehm-gc 7.4.0+ (patch by Vladimir Smirnov, slightly modified by me)
-
-
---- src/gc.cpp.orig	2012-02-14 03:22:17.000000000 +0000
-+++ src/gc.cpp
-@@ -70,9 +70,13 @@ void *debug_base(void *ptr) {
-     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, void const *base) {
-+    char const *real_base = reinterpret_cast<char const *>(base) - debug_base_fixup();
-+#if (GC_MAJOR_VERSION >= 7 && GC_MINOR_VERSION >= 4)
-     return GC_general_register_disappearing_link(p_ptr, real_base);
-+#else // compatibility with older Boehm GC versions
-+    return GC_general_register_disappearing_link(p_ptr, const_cast<char *>(real_base));
-+#endif
- }
- 
- void dummy_do_init() {}
-@@ -90,7 +94,7 @@ void dummy_register_finalizer(void *, Cl
-     }
- }
- 
--int dummy_general_register_disappearing_link(void **, void *) { return false; }
-+int dummy_general_register_disappearing_link(void **, void const *) { return false; }
- 
- int dummy_unregister_disappearing_link(void **/*link*/) { return false; }
- 
-@@ -112,7 +116,11 @@ Ops enabled_ops = {
-     &GC_malloc_atomic_uncollectable,
-     &GC_base,
-     &GC_register_finalizer_ignore_self,
--    &GC_general_register_disappearing_link,
-+#if (GC_MAJOR_VERSION >= 7 && GC_MINOR_VERSION >= 4)
-+     &GC_general_register_disappearing_link,
-+#else // compatibility with older Boehm GC versions
-+    (int (*)(void**, const void*))(&GC_general_register_disappearing_link),
-+#endif
-     &GC_unregister_disappearing_link,
-     &GC_get_heap_size,
-     &GC_get_free_bytes,
-@@ -202,7 +210,7 @@ void stub_register_finalizer_ignore_self
-     die_because_not_initialized();
- }
- 
--int stub_general_register_disappearing_link(void **, void *) {
-+int stub_general_register_disappearing_link(void **, void const *) {
-     die_because_not_initialized();
-     return 0;
- }
diff --git a/graphics/inkscape/patches/patch-src_libnrtype_FontFactory.h b/graphics/inkscape/patches/patch-src_libnrtype_FontFactory.h
deleted file mode 100644
index c76a09cdabf..00000000000
--- a/graphics/inkscape/patches/patch-src_libnrtype_FontFactory.h
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-src_libnrtype_FontFactory.h,v 1.1 2013/12/15 08:29:07 markd Exp $
-
-Build with freetype 2.5.x
-
---- src/libnrtype/FontFactory.h.orig	2011-07-08 18:25:09.468790000 +0000
-+++ src/libnrtype/FontFactory.h
-@@ -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/patches/patch-src_libnrtype_Layout-TNG-OutIter.cpp b/graphics/inkscape/patches/patch-src_libnrtype_Layout-TNG-OutIter.cpp
deleted file mode 100644
index 6983c8a035e..00000000000
--- a/graphics/inkscape/patches/patch-src_libnrtype_Layout-TNG-OutIter.cpp
+++ /dev/null
@@ -1,55 +0,0 @@
-$NetBSD: patch-src_libnrtype_Layout-TNG-OutIter.cpp,v 1.1 2014/01/11 17:48:52 wiz Exp $
-
-Fix compilation with clang/libc++.
-
---- src/libnrtype/Layout-TNG-OutIter.cpp.orig	2011-07-08 18:25:09.000000000 +0000
-+++ src/libnrtype/Layout-TNG-OutIter.cpp
-@@ -197,7 +197,21 @@ Layout::iterator Layout::sourceToIterato
- 
- 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 @@ void Layout::getSourceOfCharacter(iterat
-     *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/patches/patch-src_libvpsc_csolve__VPSC.h b/graphics/inkscape/patches/patch-src_libvpsc_csolve__VPSC.h
deleted file mode 100644
index 44f430cd6cf..00000000000
--- a/graphics/inkscape/patches/patch-src_libvpsc_csolve__VPSC.h
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-src_libvpsc_csolve__VPSC.h,v 1.1 2013/03/28 21:43:07 joerg Exp $
-
---- src/libvpsc/csolve_VPSC.h.orig	2013-03-27 22:12:45.000000000 +0000
-+++ src/libvpsc/csolve_VPSC.h
-@@ -11,10 +11,6 @@
- #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/patches/patch-src_live__effects_lpe-perp__bisector.h b/graphics/inkscape/patches/patch-src_live__effects_lpe-perp__bisector.h
deleted file mode 100644
index f95f15a1520..00000000000
--- a/graphics/inkscape/patches/patch-src_live__effects_lpe-perp__bisector.h
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-src_live__effects_lpe-perp__bisector.h,v 1.1 2014/01/11 17:48:52 wiz Exp $
-
-Fix compilation with clang/libc++.
-
---- src/live_effects/lpe-perp_bisector.h.orig	2011-07-08 18:25:09.000000000 +0000
-+++ src/live_effects/lpe-perp_bisector.h
-@@ -27,7 +27,7 @@ namespace PB {
-   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 @@ public:
-     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/patches/patch-src_remove-last.h b/graphics/inkscape/patches/patch-src_remove-last.h
deleted file mode 100644
index 509de1633e5..00000000000
--- a/graphics/inkscape/patches/patch-src_remove-last.h
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-src_remove-last.h,v 1.1 2014/01/11 17:48:52 wiz Exp $
-
---- src/remove-last.h.orig	2011-07-08 18:25:09.000000000 +0000
-+++ src/remove-last.h
-@@ -10,10 +10,9 @@ inline void remove_last(std::vector<T> &
- {
-     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/patches/patch-src_sp-item-rm-unsatisfied-cns.cpp b/graphics/inkscape/patches/patch-src_sp-item-rm-unsatisfied-cns.cpp
deleted file mode 100644
index c8ce1e351e8..00000000000
--- a/graphics/inkscape/patches/patch-src_sp-item-rm-unsatisfied-cns.cpp
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-src_sp-item-rm-unsatisfied-cns.cpp,v 1.1 2014/01/11 17:48:52 wiz Exp $
-
-Fix compilation with clang/libc++.
-
---- src/sp-item-rm-unsatisfied-cns.cpp.orig	2011-07-08 18:25:09.000000000 +0000
-+++ src/sp-item-rm-unsatisfied-cns.cpp
-@@ -23,9 +23,9 @@ void sp_item_rm_unsatisfied_cns(SPItem &
-         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/patches/patch-src_trace_siox.cpp b/graphics/inkscape/patches/patch-src_trace_siox.cpp
index 29b67c38511..c7f4aacddd2 100644
--- a/graphics/inkscape/patches/patch-src_trace_siox.cpp
+++ b/graphics/inkscape/patches/patch-src_trace_siox.cpp
@@ -1,14 +1,14 @@
-$NetBSD: patch-src_trace_siox.cpp,v 1.1 2014/01/11 17:48:52 wiz Exp $
+$NetBSD: patch-src_trace_siox.cpp,v 1.2 2014/07/29 07:03:27 adam Exp $
 
 Fix compilation with clang/libc++.
 
---- src/trace/siox.cpp.orig	2011-07-08 18:25:09.000000000 +0000
+--- src/trace/siox.cpp.orig	2014-06-09 13:24:41.000000000 +0000
 +++ src/trace/siox.cpp
-@@ -19,6 +19,7 @@
+@@ -9,6 +9,7 @@
  
  #include <math.h>
  #include <stdarg.h>
 +#include <stdlib.h>
  #include <map>
  #include <algorithm>
- 
+ #include <cstdlib>
diff --git a/graphics/inkscape/patches/patch-src_ui_dialog_inkscape-preferences.cpp b/graphics/inkscape/patches/patch-src_ui_dialog_inkscape-preferences.cpp
deleted file mode 100644
index 4a665490aa0..00000000000
--- a/graphics/inkscape/patches/patch-src_ui_dialog_inkscape-preferences.cpp
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-src_ui_dialog_inkscape-preferences.cpp,v 1.1 2012/11/16 00:54:05 joerg Exp $
-
---- src/ui/dialog/inkscape-preferences.cpp.orig	2012-11-15 16:58:17.000000000 +0000
-+++ src/ui/dialog/inkscape-preferences.cpp
-@@ -1236,7 +1236,7 @@ void InkscapePreferences::initPageBitmap
-         gchar** splits = g_strsplit(choices.data(), ",", 0);
-         gint numIems = g_strv_length(splits);
- 
--        Glib::ustring labels[numIems];
-+        Glib::ustring *labels = new Glib::ustring[numIems];
-         int values[numIems];
-         for ( gint i = 0; i < numIems; i++) {
-             values[i] = i;
-@@ -1246,6 +1246,7 @@ void InkscapePreferences::initPageBitmap
-         _page_bitmaps.add_line( false, _("Bitmap editor:"), _misc_bitmap_editor, "", "", false);
- 
-         g_strfreev(splits);
-+        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/patches/patch-src_ui_tool_node.h b/graphics/inkscape/patches/patch-src_ui_tool_node.h
index a06293c8cf8..01b5244448b 100644
--- a/graphics/inkscape/patches/patch-src_ui_tool_node.h
+++ b/graphics/inkscape/patches/patch-src_ui_tool_node.h
@@ -1,28 +1,30 @@
-$NetBSD: patch-src_ui_tool_node.h,v 1.1 2014/01/11 17:48:52 wiz Exp $
+$NetBSD: patch-src_ui_tool_node.h,v 1.2 2014/07/29 07:03:27 adam Exp $
 
---- src/ui/tool/node.h.orig	2012-02-14 03:22:17.000000000 +0000
+--- src/ui/tool/node.h.orig	2014-07-29 04:46:51.000000000 +0000
 +++ src/ui/tool/node.h
-@@ -16,7 +16,9 @@
- #include <iosfwd>
+@@ -17,11 +17,7 @@
  #include <stdexcept>
  #include <cstddef>
+ 
+-#if __cplusplus >= 201103L
+ #include <functional>
+-#else
 -#include <tr1/functional>
-+
-+#include <functional>
-+
+-#endif
+ 
  #include <boost/utility.hpp>
  #include <boost/shared_ptr.hpp>
- #include <boost/optional.hpp>
-@@ -32,12 +34,6 @@ template <typename> class NodeIterator;
+@@ -38,13 +34,6 @@ template <typename> class NodeIterator;
  }
  }
  
+-#if __cplusplus < 201103L
 -namespace std {
 -namespace tr1 {
 -template <typename N> struct hash< Inkscape::UI::NodeIterator<N> >;
 -}
 -}
--
+-#endif
+ 
  namespace Inkscape {
  namespace UI {
- 
diff --git a/graphics/inkscape/patches/patch-src_ui_widget_registered-widget.h b/graphics/inkscape/patches/patch-src_ui_widget_registered-widget.h
deleted file mode 100644
index b7c26bd0fae..00000000000
--- a/graphics/inkscape/patches/patch-src_ui_widget_registered-widget.h
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-src_ui_widget_registered-widget.h,v 1.1 2012/11/16 00:54:05 joerg Exp $
-
---- src/ui/widget/registered-widget.h.orig	2012-11-15 16:20:03.000000000 +0000
-+++ src/ui/widget/registered-widget.h
-@@ -62,7 +62,7 @@ public:
-     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); }
-+    operator const Gtk::Widget *() { return dynamic_cast<Gtk::Widget*>(this); }
- 
- protected:
-     RegisteredWidget() : W() { construct(); }
diff --git a/graphics/inkscape/patches/patch-src_widgets_desktop-widget.h b/graphics/inkscape/patches/patch-src_widgets_desktop-widget.h
deleted file mode 100644
index 3897cc25ab6..00000000000
--- a/graphics/inkscape/patches/patch-src_widgets_desktop-widget.h
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-src_widgets_desktop-widget.h,v 1.1 2012/11/16 00:54:05 joerg Exp $
-
---- src/widgets/desktop-widget.h.orig	2012-11-15 16:18:43.000000000 +0000
-+++ src/widgets/desktop-widget.h
-@@ -239,7 +239,7 @@ struct SPDesktopWidget {
- private:
-     GtkWidget *tool_toolbox;
-     GtkWidget *aux_toolbox;
--    GtkWidget *commands_toolbox,;
-+    GtkWidget *commands_toolbox;
-     GtkWidget *snap_toolbox;
- 
-     static void init(SPDesktopWidget *widget);