[115625] trunk/dports/graphics/inkscape-devel

[devans at macports.org]

Revision: 115625
          https://trac.macports.org/changeset/115625
Author:   devans at macports.org
Date:     2014-01-06 21:05:40 -0800 (Mon, 06 Jan 2014)
Log Message:
-----------
inkscape-devel: patch to fix build with boehmgc 7.4 (#42041), update to bzr 12885, bug hunt continues.

Modified Paths:
--------------
    trunk/dports/graphics/inkscape-devel/Portfile

Added Paths:
-----------
    trunk/dports/graphics/inkscape-devel/files/patch-boehmgc-7.4.diff

Modified: trunk/dports/graphics/inkscape-devel/Portfile
===================================================================
--- trunk/dports/graphics/inkscape-devel/Portfile	2014-01-07 03:46:45 UTC (rev 115624)
+++ trunk/dports/graphics/inkscape-devel/Portfile	2014-01-07 05:05:40 UTC (rev 115625)
@@ -5,7 +5,7 @@
 
 name            inkscape-devel
 conflicts       inkscape
-set bzr_rev     12878
+set bzr_rev     12885
 version         0.48.99.${bzr_rev}
 epoch           1
 license         GPL-2 LGPL-2.1
@@ -56,7 +56,8 @@
     ui_msg "--->  Fetching source from bzr repository: this may take a while"
 }
 
-patchfiles      patch-src-Makefile.am.diff
+patchfiles      patch-src-Makefile.am.diff \
+                patch-boehmgc-7.4.diff
 
 variant python26 conflicts python27 description {Configure to use Python version 2.6} {
     depends_lib-append \

Added: trunk/dports/graphics/inkscape-devel/files/patch-boehmgc-7.4.diff
===================================================================
--- trunk/dports/graphics/inkscape-devel/files/patch-boehmgc-7.4.diff	                        (rev 0)
+++ trunk/dports/graphics/inkscape-devel/files/patch-boehmgc-7.4.diff	2014-01-07 05:05:40 UTC (rev 115625)
@@ -0,0 +1,54 @@
+--- 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;
+ }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140106/e80d29dd/attachment.html>