haikuwebkit: Fix compilation on x86_64

haiku-libs/haikuwebkit/haikuwebkit-1.2.5.recipe

@@ -13,7 +13,7 @@ LICENSE="
 	MIT
 	"
 SRC_URI="https://github.com/haiku/webkit/archive/$portVersion.tar.gz"
-REVISION="1"
+REVISION="2"
 ARCHITECTURES="x86 x86_64"
 if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
 	# x86_gcc2 is fine as primary target architecture as long as we're building
@@ -27,6 +27,8 @@ CHECKSUM_MD5="044299eacba255ec05a97865543d2f1b"
 CHECKSUM_RMD160="11db0c4fcdc2c049867ef9480c34fa020ad6b49d"
 CHECKSUM_SHA512="60b0d83f98f732df3fa779581766570598e3cf0f7500bbf70322a61c53f29ad06a7781994779038844052ddf61752acd305eef6739c7917ca8e54b56503ff493"
 
+PATCHES="haikuwebkit-1.2.5.patchset"
+
 PROVIDES="
 	haikuwebkit$secondaryArchSuffix = $portVersion
 	lib:libWebKit$secondaryArchSuffix = $portVersion

haiku-libs/haikuwebkit/patches/haikuwebkit-1.2.5.patchset

@@ -0,0 +1,29 @@
+From 77b90ebb44229f5e920e95d517cd153c5c3c0ce8 Mon Sep 17 00:00:00 2001
+From: Jonathan Schleifer <js@webkeks.org>
+Date: Wed, 19 Mar 2014 00:52:39 +0100
+Subject: [PATCH] Fix compilation on x86_64
+
+---
+ Source/JavaScriptCore/offlineasm/asm.rb | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/Source/JavaScriptCore/offlineasm/asm.rb b/Source/JavaScriptCore/offlineasm/asm.rb
+index 8fe6228..0f5849c 100644
+--- a/Source/JavaScriptCore/offlineasm/asm.rb
++++ b/Source/JavaScriptCore/offlineasm/asm.rb
+@@ -209,7 +209,11 @@ class Assembler
+     
+     def self.labelReference(labelName)
+         if !$emitWinAsm
+-            "\" LOCAL_REFERENCE(#{labelName}) \""
++            if labelName == 'llint_throw_from_slow_path_trampoline'
++                "\" GLOBAL_REFERENCE(#{labelName}) \""
++            else
++                "\" LOCAL_REFERENCE(#{labelName}) \""
++            end
+         else
+             "#{labelName}"
+         end
+-- 
+Jonathan
+