summaryrefslogtreecommitdiffstats
path: root/www/webkit-gtk2
diff options
context:
space:
mode:
authormarcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059>2009-10-19 01:47:51 +0800
committermarcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059>2009-10-19 01:47:51 +0800
commit66f15b6d7585d880a38a8e9a80a030b8b998f2bc (patch)
tree52de17f6b56e064c561bc722c45b26b134d2ad6a /www/webkit-gtk2
parent613a61f15ef948a3a9fd00cd8eee93c0e31edb84 (diff)
downloadmarcuscom-ports-66f15b6d7585d880a38a8e9a80a030b8b998f2bc.tar
marcuscom-ports-66f15b6d7585d880a38a8e9a80a030b8b998f2bc.tar.gz
marcuscom-ports-66f15b6d7585d880a38a8e9a80a030b8b998f2bc.tar.bz2
marcuscom-ports-66f15b6d7585d880a38a8e9a80a030b8b998f2bc.tar.lz
marcuscom-ports-66f15b6d7585d880a38a8e9a80a030b8b998f2bc.tar.xz
marcuscom-ports-66f15b6d7585d880a38a8e9a80a030b8b998f2bc.tar.zst
marcuscom-ports-66f15b6d7585d880a38a8e9a80a030b8b998f2bc.zip
Add another 6.X build fix.
Reported by: avl git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@13131 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'www/webkit-gtk2')
-rw-r--r--www/webkit-gtk2/Makefile5
-rw-r--r--www/webkit-gtk2/files/extra-patch-JavaScriptCore_jit_JITStubCall.h65
2 files changed, 68 insertions, 2 deletions
diff --git a/www/webkit-gtk2/Makefile b/www/webkit-gtk2/Makefile
index 9a5d8888c..956932ce6 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.43 2009/10/07 10:23:28 kwm Exp $
+# $MCom: ports/www/webkit-gtk2/Makefile,v 1.44 2009/10/10 03:51:56 marcus Exp $
#
PORTNAME= webkit
@@ -69,7 +69,8 @@ PLIST_SUB+= STATIC="@comment "
.endif
.if ${OSVERSION} < 700000
-EXTRA_PATCHES+= ${FILESDIR}/extra-patch-JavaScriptCore_yarr_RegexJIT.h
+EXTRA_PATCHES+= ${FILESDIR}/extra-patch-JavaScriptCore_yarr_RegexJIT.h \
+ ${FILESDIR}/extra-patch-JavaScriptCore_jit_JITStubCall.h
.endif
post-patch:
diff --git a/www/webkit-gtk2/files/extra-patch-JavaScriptCore_jit_JITStubCall.h b/www/webkit-gtk2/files/extra-patch-JavaScriptCore_jit_JITStubCall.h
new file mode 100644
index 000000000..4d4a76bce
--- /dev/null
+++ b/www/webkit-gtk2/files/extra-patch-JavaScriptCore_jit_JITStubCall.h
@@ -0,0 +1,65 @@
+--- JavaScriptCore/jit/JITStubCall.h.orig 2009-10-18 13:44:09.000000000 -0400
++++ JavaScriptCore/jit/JITStubCall.h 2009-10-18 13:45:53.000000000 -0400
+@@ -36,7 +36,7 @@ namespace JSC {
+ public:
+ JITStubCall(JIT* jit, JSObject* (JIT_STUB *stub)(STUB_ARGS_DECLARATION))
+ : m_jit(jit)
+- , m_stub(reinterpret_cast<void*>(stub))
++ , m_stub((void*)(stub))
+ , m_returnType(Cell)
+ , m_stackIndex(stackIndexStart)
+ {
+@@ -44,7 +44,7 @@ namespace JSC {
+
+ JITStubCall(JIT* jit, JSPropertyNameIterator* (JIT_STUB *stub)(STUB_ARGS_DECLARATION))
+ : m_jit(jit)
+- , m_stub(reinterpret_cast<void*>(stub))
++ , m_stub((void*)(stub))
+ , m_returnType(Cell)
+ , m_stackIndex(stackIndexStart)
+ {
+@@ -52,7 +52,7 @@ namespace JSC {
+
+ JITStubCall(JIT* jit, void* (JIT_STUB *stub)(STUB_ARGS_DECLARATION))
+ : m_jit(jit)
+- , m_stub(reinterpret_cast<void*>(stub))
++ , m_stub((void*)(stub))
+ , m_returnType(VoidPtr)
+ , m_stackIndex(stackIndexStart)
+ {
+@@ -60,7 +60,7 @@ namespace JSC {
+
+ JITStubCall(JIT* jit, int (JIT_STUB *stub)(STUB_ARGS_DECLARATION))
+ : m_jit(jit)
+- , m_stub(reinterpret_cast<void*>(stub))
++ , m_stub((void*)(stub))
+ , m_returnType(Int)
+ , m_stackIndex(stackIndexStart)
+ {
+@@ -68,7 +68,7 @@ namespace JSC {
+
+ JITStubCall(JIT* jit, bool (JIT_STUB *stub)(STUB_ARGS_DECLARATION))
+ : m_jit(jit)
+- , m_stub(reinterpret_cast<void*>(stub))
++ , m_stub((void*)(stub))
+ , m_returnType(Int)
+ , m_stackIndex(stackIndexStart)
+ {
+@@ -76,7 +76,7 @@ namespace JSC {
+
+ JITStubCall(JIT* jit, void (JIT_STUB *stub)(STUB_ARGS_DECLARATION))
+ : m_jit(jit)
+- , m_stub(reinterpret_cast<void*>(stub))
++ , m_stub((void*)(stub))
+ , m_returnType(Void)
+ , m_stackIndex(stackIndexStart)
+ {
+@@ -85,7 +85,7 @@ namespace JSC {
+ #if USE(JSVALUE32_64)
+ JITStubCall(JIT* jit, EncodedJSValue (JIT_STUB *stub)(STUB_ARGS_DECLARATION))
+ : m_jit(jit)
+- , m_stub(reinterpret_cast<void*>(stub))
++ , m_stub((void*)(stub))
+ , m_returnType(Value)
+ , m_stackIndex(stackIndexStart)
+ {