Fix build with boehm-gc-7.4. From upstream bzr.

Depend on that version of boehm-gc and bump PKGREVISION.

4 files changed, 86 insertions, 3 deletions

diff --git a/graphics/inkscape/Makefile b/graphics/inkscape/Makefile
index 2fc68d27613..95f8629e142 100644
--- a/graphics/inkscape/Makefile
+++ b/graphics/inkscape/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.100 2014/02/12 23:18:01 tron Exp $
+# $NetBSD: Makefile,v 1.101 2014/04/17 06:20:27 wiz Exp $
 
 DISTNAME=	inkscape-0.48.4
-PKGREVISION=	18
+PKGREVISION=	19
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=inkscape/}
 EXTRACT_SUFX=	.tar.bz2
@@ -71,6 +71,7 @@ CONFIGURE_ARGS+= --with-gnome-vfs
 .endif
 
 BUILDLINK_API_DEPENDS.poppler-includes+= poppler-includes>=0.12.2
+BUILDLINK_API_DEPENDS.boehm-gc+=	boehm-gc>=7.4
 .include "../../devel/boehm-gc/buildlink3.mk"
 .include "../../devel/boost-headers/buildlink3.mk"
 .include "../../devel/pango/buildlink3.mk"
diff --git a/graphics/inkscape/distinfo b/graphics/inkscape/distinfo
index 2bc5a34b0ba..58d2a0da563 100644
--- a/graphics/inkscape/distinfo
+++ b/graphics/inkscape/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.49 2014/01/11 17:48:52 wiz Exp $
+$NetBSD: distinfo,v 1.50 2014/04/17 06:20:27 wiz Exp $
 
 SHA1 (inkscape-0.48.4.tar.bz2) = 5f26f6ad191d1e7c2a9fb69a438722beb172224c
 RMD160 (inkscape-0.48.4.tar.bz2) = b089ced7694a9803fac8588d93e7e6239c71d3e8
@@ -25,6 +25,8 @@ 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) = 02742a022a8a55852d7f0a39969153bf7f24f17e
 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_libnrtype_FontFactory.h) = 282e6ea4da7bb40c5ba8c861fdbe303259d3e864
 SHA1 (patch-src_libnrtype_Layout-TNG-OutIter.cpp) = 28870d9970946b629657f1663cbe8b325ef42b69
 SHA1 (patch-src_libvpsc_csolve__VPSC.h) = 33aa27678fa9e802af6ab95b9ea28b69d822c4cb
diff --git a/graphics/inkscape/patches/patch-src_gc-core.h b/graphics/inkscape/patches/patch-src_gc-core.h
new file mode 100644
index 00000000000..a9f7f6ba130
--- /dev/null
+++ b/graphics/inkscape/patches/patch-src_gc-core.h
@@ -0,0 +1,21 @@
+$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
new file mode 100644
index 00000000000..71309896a82
--- /dev/null
+++ b/graphics/inkscape/patches/patch-src_gc.cpp
@@ -0,0 +1,59 @@
+$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;
+ }