Tue Apr 12 21:33:49 2016 UTC ()
Fix building with newer glibmm.


(adam)
diff -r1.127 -r1.128 pkgsrc/graphics/inkscape/Makefile
diff -r1.56 -r1.57 pkgsrc/graphics/inkscape/distinfo
diff -r0 -r1.1 pkgsrc/graphics/inkscape/patches/patch-src_ui_clipboard.cpp
cvs diff -r1.127 -r1.128 pkgsrc/graphics/inkscape/Makefile (expand / switch to unified diff)

--- pkgsrc/graphics/inkscape/Makefile 2016/04/11 19:01:53 1.127
+++ pkgsrc/graphics/inkscape/Makefile 2016/04/12 21:33:49 1.128
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1# $NetBSD: Makefile,v 1.127 2016/04/11 19:01:53 ryoon Exp $ 1# $NetBSD: Makefile,v 1.128 2016/04/12 21:33:49 adam Exp $
2 2
3DISTNAME= inkscape-0.91 3DISTNAME= inkscape-0.91
4PKGREVISION= 12 4PKGREVISION= 13
5CATEGORIES= graphics 5CATEGORIES= graphics
6#MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=inkscape/} 6#MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=inkscape/}
7MASTER_SITES= https://inkscape.global.ssl.fastly.net/media/resources/file/ 7MASTER_SITES= https://inkscape.global.ssl.fastly.net/media/resources/file/
8EXTRACT_SUFX= .tar.bz2 8EXTRACT_SUFX= .tar.bz2
9 9
10MAINTAINER= reed@reedmedia.net 10MAINTAINER= reed@reedmedia.net
11HOMEPAGE= http://www.inkscape.org/ 11HOMEPAGE= http://www.inkscape.org/
12COMMENT= Scalable Vector Graphics (SVG) editor 12COMMENT= Scalable Vector Graphics (SVG) editor
13LICENSE= gnu-gpl-v2 13LICENSE= gnu-gpl-v2
14 14
15.if !exists(/usr/bin/iconv) 15.if !exists(/usr/bin/iconv)
16BUILD_DEPENDS+= libiconv-[0-9]*:../../converters/libiconv 16BUILD_DEPENDS+= libiconv-[0-9]*:../../converters/libiconv
17.endif 17.endif
cvs diff -r1.56 -r1.57 pkgsrc/graphics/inkscape/distinfo (expand / switch to unified diff)

--- pkgsrc/graphics/inkscape/distinfo 2015/11/03 21:34:04 1.56
+++ pkgsrc/graphics/inkscape/distinfo 2016/04/12 21:33:49 1.57
@@ -1,16 +1,17 @@ @@ -1,16 +1,17 @@
1$NetBSD: distinfo,v 1.56 2015/11/03 21:34:04 agc Exp $ 1$NetBSD: distinfo,v 1.57 2016/04/12 21:33:49 adam Exp $
2 2
3SHA1 (inkscape-0.91.tar.bz2) = 9941ee467af570ac71a70f965cd9c48d4993b8f3 3SHA1 (inkscape-0.91.tar.bz2) = 9941ee467af570ac71a70f965cd9c48d4993b8f3
4RMD160 (inkscape-0.91.tar.bz2) = 77421bcb96c6ad4fe17e775e86b77d576b90cf32 4RMD160 (inkscape-0.91.tar.bz2) = 77421bcb96c6ad4fe17e775e86b77d576b90cf32
5SHA512 (inkscape-0.91.tar.bz2) = 3778ef7d4a1c759a7afc093e55eefb69a78dcb60332655cc8ab8c481f54a3e6550df6070178390eb08588245531906b8bef33301f0765a4d28d6c7506fcf3bc7 5SHA512 (inkscape-0.91.tar.bz2) = 3778ef7d4a1c759a7afc093e55eefb69a78dcb60332655cc8ab8c481f54a3e6550df6070178390eb08588245531906b8bef33301f0765a4d28d6c7506fcf3bc7
6Size (inkscape-0.91.tar.bz2) = 25858909 bytes 6Size (inkscape-0.91.tar.bz2) = 25858909 bytes
7SHA1 (patch-ag) = 6b6000f3940ec6db9404a206f9757928c1d5740b 7SHA1 (patch-ag) = 6b6000f3940ec6db9404a206f9757928c1d5740b
8SHA1 (patch-aj) = 31d6cc8bb179629023bd04bcac0fd935b2c9636d 8SHA1 (patch-aj) = 31d6cc8bb179629023bd04bcac0fd935b2c9636d
9SHA1 (patch-ap) = 412509a03d26e925548e3371529a1273db958611 9SHA1 (patch-ap) = 412509a03d26e925548e3371529a1273db958611
10SHA1 (patch-aq) = fb7de44d33fdc5895ce84ca8d44ff6a6c328c402 10SHA1 (patch-aq) = fb7de44d33fdc5895ce84ca8d44ff6a6c328c402
11SHA1 (patch-configure) = bda42cbbe460ab19ee3dfa6dcdf212300b1f7694 11SHA1 (patch-configure) = bda42cbbe460ab19ee3dfa6dcdf212300b1f7694
12SHA1 (patch-src_extension_internal_pdfinput_pdf-parser.cpp) = 7a1aab18cc36756fad1cddbb18cab1ef1431f590 12SHA1 (patch-src_extension_internal_pdfinput_pdf-parser.cpp) = 7a1aab18cc36756fad1cddbb18cab1ef1431f590
13SHA1 (patch-src_extension_internal_pdfinput_pdf-parser.h) = ba408f45544853f9323f8bd879bd55604072bb7a 13SHA1 (patch-src_extension_internal_pdfinput_pdf-parser.h) = ba408f45544853f9323f8bd879bd55604072bb7a
14SHA1 (patch-src_io_inkjar.cpp) = 060d59225cfe7b66db5e9f41e76860df9ce12d01 14SHA1 (patch-src_io_inkjar.cpp) = 060d59225cfe7b66db5e9f41e76860df9ce12d01
15SHA1 (patch-src_trace_siox.cpp) = daeff4626dace6997f64ab9c96b0bfb304e724c8 15SHA1 (patch-src_trace_siox.cpp) = daeff4626dace6997f64ab9c96b0bfb304e724c8
 16SHA1 (patch-src_ui_clipboard.cpp) = 06fd0f4b15b0c282027db36690d163e90aac06ed
16SHA1 (patch-src_ui_tool_node.h) = 2900ab737d6b9245aabefee5e79564bdbaec57bc 17SHA1 (patch-src_ui_tool_node.h) = 2900ab737d6b9245aabefee5e79564bdbaec57bc
File Added: pkgsrc/graphics/inkscape/patches/Attic/patch-src_ui_clipboard.cpp
$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);