summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoradam <adam@pkgsrc.org>2016-04-12 21:33:49 +0000
committeradam <adam@pkgsrc.org>2016-04-12 21:33:49 +0000
commit0f9bbde2ec36e3b6a8d9f0d1a3c2755295b744e5 (patch)
tree1f08a1292cc7aa8756f51605ce56b29771406208
parent30f2a6a885c6c272e339667da388cccc4ef358ad (diff)
downloadpkgsrc-0f9bbde2ec36e3b6a8d9f0d1a3c2755295b744e5.tar.gz
Fix building with newer glibmm.
-rw-r--r--graphics/inkscape/Makefile4
-rw-r--r--graphics/inkscape/distinfo3
-rw-r--r--graphics/inkscape/patches/patch-src_ui_clipboard.cpp15
3 files changed, 19 insertions, 3 deletions
diff --git a/graphics/inkscape/Makefile b/graphics/inkscape/Makefile
index c04ac90c8fb..9a1a22f354a 100644
--- a/graphics/inkscape/Makefile
+++ b/graphics/inkscape/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.127 2016/04/11 19:01:53 ryoon Exp $
+# $NetBSD: Makefile,v 1.128 2016/04/12 21:33:49 adam Exp $
DISTNAME= inkscape-0.91
-PKGREVISION= 12
+PKGREVISION= 13
CATEGORIES= graphics
#MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=inkscape/}
MASTER_SITES= https://inkscape.global.ssl.fastly.net/media/resources/file/
diff --git a/graphics/inkscape/distinfo b/graphics/inkscape/distinfo
index fd457de2cef..cd50de0a932 100644
--- a/graphics/inkscape/distinfo
+++ b/graphics/inkscape/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.56 2015/11/03 21:34:04 agc Exp $
+$NetBSD: distinfo,v 1.57 2016/04/12 21:33:49 adam Exp $
SHA1 (inkscape-0.91.tar.bz2) = 9941ee467af570ac71a70f965cd9c48d4993b8f3
RMD160 (inkscape-0.91.tar.bz2) = 77421bcb96c6ad4fe17e775e86b77d576b90cf32
@@ -13,4 +13,5 @@ SHA1 (patch-src_extension_internal_pdfinput_pdf-parser.cpp) = 7a1aab18cc36756fad
SHA1 (patch-src_extension_internal_pdfinput_pdf-parser.h) = ba408f45544853f9323f8bd879bd55604072bb7a
SHA1 (patch-src_io_inkjar.cpp) = 060d59225cfe7b66db5e9f41e76860df9ce12d01
SHA1 (patch-src_trace_siox.cpp) = daeff4626dace6997f64ab9c96b0bfb304e724c8
+SHA1 (patch-src_ui_clipboard.cpp) = 06fd0f4b15b0c282027db36690d163e90aac06ed
SHA1 (patch-src_ui_tool_node.h) = 2900ab737d6b9245aabefee5e79564bdbaec57bc
diff --git a/graphics/inkscape/patches/patch-src_ui_clipboard.cpp b/graphics/inkscape/patches/patch-src_ui_clipboard.cpp
new file mode 100644
index 00000000000..56d0c502098
--- /dev/null
+++ b/graphics/inkscape/patches/patch-src_ui_clipboard.cpp
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_ui_clipboard.cpp,v 1.1 2016/04/12 21:33:49 adam Exp $
+
+Fix building with newer glibmm.
+
+--- src/ui/clipboard.cpp.orig 2016-04-12 21:18:03.000000000 +0000
++++ src/ui/clipboard.cpp
+@@ -1402,7 +1402,7 @@ void ClipboardManagerImpl::_inkscape_wai
+
+ Glib::ustring target;
+ if (atom_name) {
+- target = Glib::ScopedPtr<char>(atom_name).get(); //This frees the gchar*.
++ target = Glib::make_unique_ptr_gfree(atom_name).get(); //This frees the gchar*.
+ }
+
+ listTargets.push_back(target);