summaryrefslogtreecommitdiffstats
path: root/www
diff options
context:
space:
mode:
authormarcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059>2009-10-20 03:18:17 +0800
committermarcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059>2009-10-20 03:18:17 +0800
commitff210b08e231c7e5f0892dbeef1d9e6016626c15 (patch)
tree0fbb5769235badd1b485b427de3c2458e0199b80 /www
parent8c31ea55a5c2e86d5d1733f9d910ddad47345235 (diff)
downloadmarcuscom-ports-ff210b08e231c7e5f0892dbeef1d9e6016626c15.tar
marcuscom-ports-ff210b08e231c7e5f0892dbeef1d9e6016626c15.tar.gz
marcuscom-ports-ff210b08e231c7e5f0892dbeef1d9e6016626c15.tar.bz2
marcuscom-ports-ff210b08e231c7e5f0892dbeef1d9e6016626c15.tar.lz
marcuscom-ports-ff210b08e231c7e5f0892dbeef1d9e6016626c15.tar.xz
marcuscom-ports-ff210b08e231c7e5f0892dbeef1d9e6016626c15.tar.zst
marcuscom-ports-ff210b08e231c7e5f0892dbeef1d9e6016626c15.zip
Add yet another 6.X build fix.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@13148 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'www')
-rw-r--r--www/webkit-gtk2/Makefile5
-rw-r--r--www/webkit-gtk2/files/extra-patch-JavaScriptCore_jit_JITStubs.cpp11
2 files changed, 14 insertions, 2 deletions
diff --git a/www/webkit-gtk2/Makefile b/www/webkit-gtk2/Makefile
index 8cc141f46..959c434b0 100644
--- a/www/webkit-gtk2/Makefile
+++ b/www/webkit-gtk2/Makefile
@@ -3,7 +3,7 @@
# Whom: Michael Johnson <ahze@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/www/webkit-gtk2/Makefile,v 1.45 2009/10/18 17:47:51 marcus Exp $
+# $MCom: ports/www/webkit-gtk2/Makefile,v 1.46 2009/10/19 12:38:18 marcus Exp $
#
PORTNAME= webkit
@@ -72,7 +72,8 @@ PLIST_SUB+= STATIC="@comment "
EXTRA_PATCHES+= ${FILESDIR}/extra-patch-JavaScriptCore_yarr_RegexJIT.h \
${FILESDIR}/extra-patch-JavaScriptCore_jit_JITStubCall.h \
${FILESDIR}/extra-patch-JavaScriptCore_jit_JITOpcodes.cpp \
- ${FILESDIR}/extra-patch-JavaScriptCore_assembler_MacroAssemblerCodeRef.h
+ ${FILESDIR}/extra-patch-JavaScriptCore_assembler_MacroAssemblerCodeRef.h \
+ ${FILESDIR}/extra-patch-JavaScriptCore_jit_JITStubs.cpp
.endif
post-patch:
diff --git a/www/webkit-gtk2/files/extra-patch-JavaScriptCore_jit_JITStubs.cpp b/www/webkit-gtk2/files/extra-patch-JavaScriptCore_jit_JITStubs.cpp
new file mode 100644
index 000000000..59229e8bc
--- /dev/null
+++ b/www/webkit-gtk2/files/extra-patch-JavaScriptCore_jit_JITStubs.cpp
@@ -0,0 +1,11 @@
+--- JavaScriptCore/jit/JITStubs.cpp.orig 2009-10-19 15:13:27.000000000 -0400
++++ JavaScriptCore/jit/JITStubs.cpp 2009-10-19 15:13:46.000000000 -0400
+@@ -2672,7 +2672,7 @@ DEFINE_STUB_FUNCTION(EncodedJSValue, op_
+
+ if (!handler) {
+ *stackFrame.exception = exceptionValue;
+- STUB_SET_RETURN_ADDRESS(reinterpret_cast<void*>(ctiOpThrowNotCaught));
++ STUB_SET_RETURN_ADDRESS((void*)(ctiOpThrowNotCaught));
+ return JSValue::encode(jsNull());
+ }
+