Author: fernando Date: Sun Dec 1 11:45:00 2013 New Revision: 2786 Log: inkscape-0.48.4: patches to build with gc-7.4.0 and FreeType-2.5.1.
Added: trunk/inkscape/inkscape-0.48.4-freetype-1.patch trunk/inkscape/inkscape-0.48.4-gc-1.patch Added: trunk/inkscape/inkscape-0.48.4-freetype-1.patch ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/inkscape/inkscape-0.48.4-freetype-1.patch Sun Dec 1 11:45:00 2013 (r2786) @@ -0,0 +1,21 @@ +Submitted By: Fernando de Oliveira <famobr at yahoo dot com dot br> +Date: 2013-12-01 +Initial Package Version: 0.48.4 +Upstream Status: Committed +Origin: Upstream +URL: https://launchpadlibrarian.net/157792073/1255830-fix-freetype-includes-backport-0.48.x-v1.diff +Description: Fixes build with FreeType-2.5.1 + +diff -Naur inkscape-0.48.4/src/libnrtype/FontFactory.h.orig inkscape-0.48.4/src/libnrtype/FontFactory.h +--- inkscape-0.48.4/src/libnrtype/FontFactory.h.orig 2011-07-08 15:25:09.468790000 -0300 ++++ inkscape-0.48.4/src/libnrtype/FontFactory.h 2013-12-01 11:56:52.992005042 -0300 +@@ -31,7 +31,8 @@ + #include <pango/pangowin32.h> + #else + #include <pango/pangoft2.h> +-#include <freetype/freetype.h> ++#include <ft2build.h> ++#include FT_FREETYPE_H + #endif + + namespace Glib Added: trunk/inkscape/inkscape-0.48.4-gc-1.patch ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/inkscape/inkscape-0.48.4-gc-1.patch Sun Dec 1 11:45:00 2013 (r2786) @@ -0,0 +1,78 @@ +Submitted By: Armin K. <krejzi at email dot com> +Date: 2013-12-01 +Initial Package Version: 0.48.4 +Upstream Status: Unknown +Origin: Armin K. <krejzi at email dot com> +URL: +Description: Fixes build with gc-7.4.0 + +diff -Naur a/configure b/configure +--- a/configure 2012-12-15 17:56:08.450334780 +0100 ++++ b/configure 2013-12-01 17:34:15.643762526 +0100 +@@ -8959,8 +8959,8 @@ + # include <gc.h> + #endif + #include <stdio.h> +- extern unsigned GC_version; + int main(void){ ++ unsigned GC_version = GC_get_version(); + unsigned min = ((6 << 16) | (4 << 8) | 0); + printf("%d.%d.%d ",GC_version >> 16, (GC_version >> 8) & 0xFF, GC_version & 0xFF); + if (GC_version>=min) return 0; +diff -Naur a/configure.ac b/configure.ac +--- a/configure.ac 2012-12-15 17:50:19.205918190 +0100 ++++ b/configure.ac 2013-12-01 17:33:57.903433873 +0100 +@@ -263,8 +263,8 @@ + # include <gc.h> + #endif + #include <stdio.h> +- extern unsigned GC_version; + int main(void){ ++ unsigned GC_version = GC_get_version(); + unsigned min = ((6 << 16) | (4 << 8) | 0); + printf("%d.%d.%d ",GC_version >> 16, (GC_version >> 8) & 0xFF, GC_version & 0xFF); + if (GC_version>=min) return 0; +diff -Naur a/src/gc-core.h b/src/gc-core.h +--- a/src/gc-core.h 2012-02-14 04:22:17.670697000 +0100 ++++ b/src/gc-core.h 2013-12-01 17:32:03.286326073 +0100 +@@ -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)(); +diff -Naur a/src/gc.cpp b/src/gc.cpp +--- a/src/gc.cpp 2012-02-14 04:22:17.670697000 +0100 ++++ b/src/gc.cpp 2013-12-01 17:32:03.286326073 +0100 +@@ -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) { ++ const char *real_base=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; } + +@@ -202,7 +202,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; + } -- http://linuxfromscratch.org/mailman/listinfo/patches FAQ: http://www.linuxfromscratch.org/faq/ Unsubscribe: See the above information page
