Revision: 102367 https://trac.macports.org/changeset/102367 Author: jeremyhu@macports.org Date: 2013-01-31 23:34:51 -0800 (Thu, 31 Jan 2013) Log Message: ----------- webkit-gtk: don't backtrace() on Tiger (#37882) Modified Paths: -------------- trunk/dports/www/webkit-gtk/Portfile Added Paths: ----------- trunk/dports/www/webkit-gtk/files/execinfo.patch Modified: trunk/dports/www/webkit-gtk/Portfile =================================================================== --- trunk/dports/www/webkit-gtk/Portfile 2013-02-01 06:41:25 UTC (rev 102366) +++ trunk/dports/www/webkit-gtk/Portfile 2013-02-01 07:34:51 UTC (rev 102367) @@ -46,6 +46,7 @@ # bison-2.6.patch: No upstream bug (?) # ListableHandler.patch: https://trac.macports.org/ticket/37828 # optflags.patch: https://trac.macports.org/ticket/37839 +# execinfo.patch: https://trac.macports.org/ticket/37882 # ppc.patch: https://bugs.webkit.org/show_bug.cgi?id=96005 # tiger.patch: No upstream bug, http://trac.macports.org/ticket/35923 @@ -54,6 +55,7 @@ patchfiles \ case-insensitive.patch \ our-icu.patch \ + execinfo.patch \ xrender-check.patch \ ruby-1.8.patch \ ListableHandler.patch \ Added: trunk/dports/www/webkit-gtk/files/execinfo.patch =================================================================== --- trunk/dports/www/webkit-gtk/files/execinfo.patch (rev 0) +++ trunk/dports/www/webkit-gtk/files/execinfo.patch 2013-02-01 07:34:51 UTC (rev 102367) @@ -0,0 +1,35 @@ +diff -Naurp webkitgtk-1.10.2.orig/Source/JavaScriptCore/tools/CodeProfile.cpp webkitgtk-1.10.2/Source/JavaScriptCore/tools/CodeProfile.cpp +--- Source/JavaScriptCore/tools/CodeProfile.cpp 2013-01-31 22:39:07.000000000 -0800 ++++ Source/JavaScriptCore/tools/CodeProfile.cpp 2013-01-31 22:42:01.000000000 -0800 +@@ -36,7 +36,6 @@ + #if OS(DARWIN) + #include <cxxabi.h> + #include <dlfcn.h> +-#include <execinfo.h> + #endif + + namespace JSC { +diff -Naurp webkitgtk-1.10.2.orig/Source/WTF/wtf/Assertions.cpp webkitgtk-1.10.2/Source/WTF/wtf/Assertions.cpp +--- Source/WTF/wtf/Assertions.cpp 2012-11-23 12:12:16.000000000 -0800 ++++ Source/WTF/wtf/Assertions.cpp 2013-01-31 22:43:57.000000000 -0800 +@@ -61,8 +61,11 @@ + #if (OS(DARWIN) || OS(LINUX)) && !OS(ANDROID) + #include <cxxabi.h> + #include <dlfcn.h> ++#include <AvailabilityMacros.h> ++#if !OS(DARWIN) || MAC_OS_X_VERSION_MAX_ALLOWED >= 1050 + #include <execinfo.h> + #endif ++#endif + + #if OS(ANDROID) + #include "android/log.h" +@@ -268,7 +271,7 @@ void WTFReportArgumentAssertionFailure(c + + void WTFGetBacktrace(void** stack, int* size) + { +-#if (OS(DARWIN) || OS(LINUX)) && !OS(ANDROID) ++#if ((OS(DARWIN) && MAC_OS_X_VERSION_MAX_ALLOWED >= 1050)|| OS(LINUX)) && !OS(ANDROID) + *size = backtrace(stack, *size); + #elif OS(WINDOWS) && !OS(WINCE) + // The CaptureStackBackTrace function is available in XP, but it is not defined