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

[devans at macports.org]

Revision: 115890
          https://trac.macports.org/changeset/115890
Author:   devans at macports.org
Date:     2014-01-13 09:02:37 -0800 (Mon, 13 Jan 2014)
Log Message:
-----------
inkscape-devel: update to bzr 12923, boehmgc 7.4 patch now incorporated upstream, embedded lib2geom updated, additional bug fixes.

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

Removed 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-13 16:54:56 UTC (rev 115889)
+++ trunk/dports/graphics/inkscape-devel/Portfile	2014-01-13 17:02:37 UTC (rev 115890)
@@ -5,7 +5,7 @@
 
 name            inkscape-devel
 conflicts       inkscape
-set bzr_rev     12913
+set bzr_rev     12923
 version         0.48.99.${bzr_rev}
 epoch           1
 license         GPL-2 LGPL-2.1
@@ -56,8 +56,7 @@
     ui_msg "--->  Fetching source from bzr repository: this may take a while"
 }
 
-patchfiles      patch-src-Makefile.am.diff \
-                patch-boehmgc-7.4.diff
+patchfiles      patch-src-Makefile.am.diff
 
 variant python26 conflicts python27 description {Configure to use Python version 2.6} {
     depends_lib-append \

Deleted: trunk/dports/graphics/inkscape-devel/files/patch-boehmgc-7.4.diff
===================================================================
--- trunk/dports/graphics/inkscape-devel/files/patch-boehmgc-7.4.diff	2014-01-13 16:54:56 UTC (rev 115889)
+++ trunk/dports/graphics/inkscape-devel/files/patch-boehmgc-7.4.diff	2014-01-13 17:02:37 UTC (rev 115890)
@@ -1,54 +0,0 @@
---- 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/20140113/2a7d2171/attachment.html>