[144691] trunk/dports/www/webkit2-gtk/files/PR-152641.patch

[jeremyhu at macports.org]

Revision: 144691
          https://trac.macports.org/changeset/144691
Author:   jeremyhu at macports.org
Date:     2016-01-15 08:49:04 -0800 (Fri, 15 Jan 2016)
Log Message:
-----------
webkit2-gtk: Address another Mavericks build failure

Modified Paths:
--------------
    trunk/dports/www/webkit2-gtk/files/PR-152641.patch

Modified: trunk/dports/www/webkit2-gtk/files/PR-152641.patch
===================================================================
--- trunk/dports/www/webkit2-gtk/files/PR-152641.patch	2016-01-15 13:58:28 UTC (rev 144690)
+++ trunk/dports/www/webkit2-gtk/files/PR-152641.patch	2016-01-15 16:49:04 UTC (rev 144691)
@@ -1,24 +1,24 @@
 --- Source/JavaScriptCore/llvm/library/LLVMOverrides.cpp.orig	2015-10-27 03:17:11.000000000 -0700
 +++ Source/JavaScriptCore/llvm/library/LLVMOverrides.cpp	2016-01-01 14:56:49.000000000 -0800
-@@ -36,24 +36,13 @@ void (*g_llvmTrapCallback)(const char* m
+@@ -36,24 +36,5 @@ void (*g_llvmTrapCallback)(const char* m
  
  // If LLVM tries to raise signals, abort, or fail an assertion, then let
  // WebKit handle it instead of trapping.
 -extern "C" int raise(int signal);
- extern "C" void __assert_rtn(const char* function, const char* filename, int lineNumber, const char* expression) NO_RETURN;
+-extern "C" void __assert_rtn(const char* function, const char* filename, int lineNumber, const char* expression) NO_RETURN;
 -extern "C" void abort(void) NO_RETURN;
- 
+-
 -extern "C" int raise(int signal)
 -{
 -    g_llvmTrapCallback("raise(%d) called.", signal);
 -    return 0;
 -}
- extern "C" void __assert_rtn(const char* function, const char* filename, int lineNumber, const char* expression)
- {
-     if (function)
-         g_llvmTrapCallback("Assertion failed: (%s), function %s, file %s, line %d.", expression, function, filename, lineNumber);
-     g_llvmTrapCallback("Assertion failed: (%s), file %s, line %d.", expression, filename, lineNumber);
- }
+-extern "C" void __assert_rtn(const char* function, const char* filename, int lineNumber, const char* expression)
+-{
+-    if (function)
+-        g_llvmTrapCallback("Assertion failed: (%s), function %s, file %s, line %d.", expression, function, filename, lineNumber);
+-    g_llvmTrapCallback("Assertion failed: (%s), file %s, line %d.", expression, filename, lineNumber);
+-}
 -extern "C" void abort(void)
 -{
 -    g_llvmTrapCallback("abort() called.");
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160115/06b453a4/attachment-0001.html>