[115623] trunk/dports/graphics/inkscape
devans at macports.org
devans at macports.org
Mon Jan 6 19:23:06 PST 2014
Revision: 115623
https://trac.macports.org/changeset/115623
Author: devans at macports.org
Date: 2014-01-06 19:23:06 -0800 (Mon, 06 Jan 2014)
Log Message:
-----------
inkscape: patch to fix build with boehmgc 7.4, increment revision.
Modified Paths:
--------------
trunk/dports/graphics/inkscape/Portfile
Added Paths:
-----------
trunk/dports/graphics/inkscape/files/patch-boehmgc-7.4.diff
Modified: trunk/dports/graphics/inkscape/Portfile
===================================================================
--- trunk/dports/graphics/inkscape/Portfile 2014-01-07 03:21:01 UTC (rev 115622)
+++ trunk/dports/graphics/inkscape/Portfile 2014-01-07 03:23:06 UTC (rev 115623)
@@ -6,7 +6,7 @@
name inkscape
conflicts inkscape-devel
version 0.48.4
-revision 24
+revision 25
license GPL-2 LGPL-2.1
maintainers devans
categories graphics gnome
@@ -50,6 +50,7 @@
patchfiles patch-thru-r9971.diff \
patch-r9972-thru-r10003.diff \
patch-r10004-thru-r10006.diff \
+ patch-boehmgc-7.4.diff \
patch-python-configure.ac.diff
variant python26 conflicts python27 description {Configure to use Python version 2.6} {
Added: trunk/dports/graphics/inkscape/files/patch-boehmgc-7.4.diff
===================================================================
--- trunk/dports/graphics/inkscape/files/patch-boehmgc-7.4.diff (rev 0)
+++ trunk/dports/graphics/inkscape/files/patch-boehmgc-7.4.diff 2014-01-07 03:23:06 UTC (rev 115623)
@@ -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/3a927c41/attachment.html>
More information about the macports-changes
mailing list