diff options
Diffstat (limited to 'www/webkit-gtk2/files')
11 files changed, 175 insertions, 33 deletions
diff --git a/www/webkit-gtk2/files/extra-patch-JavaScriptCore_assembler_MacroAssemblerCodeRef.h b/www/webkit-gtk2/files/extra-patch-JavaScriptCore_assembler_MacroAssemblerCodeRef.h new file mode 100644 index 000000000000..dc03dce02dc1 --- /dev/null +++ b/www/webkit-gtk2/files/extra-patch-JavaScriptCore_assembler_MacroAssemblerCodeRef.h @@ -0,0 +1,11 @@ +--- JavaScriptCore/assembler/MacroAssemblerCodeRef.h.orig 2009-10-19 08:34:08.000000000 -0400 ++++ JavaScriptCore/assembler/MacroAssemblerCodeRef.h 2009-10-19 08:34:53.000000000 -0400 +@@ -69,7 +69,7 @@ public: + + template<typename FunctionType> + explicit FunctionPtr(FunctionType* value) +- : m_value(reinterpret_cast<void*>(value)) ++ : m_value((void*)(value)) + { + ASSERT_VALID_CODE_POINTER(m_value); + } diff --git a/www/webkit-gtk2/files/extra-patch-JavaScriptCore_jit_JITOpcodes.cpp b/www/webkit-gtk2/files/extra-patch-JavaScriptCore_jit_JITOpcodes.cpp new file mode 100644 index 000000000000..6e6ffe831486 --- /dev/null +++ b/www/webkit-gtk2/files/extra-patch-JavaScriptCore_jit_JITOpcodes.cpp @@ -0,0 +1,20 @@ +--- JavaScriptCore/jit/JITOpcodes.cpp.orig 2009-09-29 15:43:18.000000000 -0400 ++++ JavaScriptCore/jit/JITOpcodes.cpp 2009-11-01 13:09:39.000000000 -0500 +@@ -270,7 +270,7 @@ void JIT::privateCompileCTIMachineTrampo + emitGetFromCallFrameHeaderPtr(RegisterFile::ReturnPC, regT1); + move(ImmPtr(&globalData->exceptionLocation), regT2); + storePtr(regT1, regT2); +- move(ImmPtr(reinterpret_cast<void*>(ctiVMThrowTrampoline)), regT2); ++ move(ImmPtr((void*)(ctiVMThrowTrampoline)), regT2); + emitGetFromCallFrameHeaderPtr(RegisterFile::CallerFrame, callFrameRegister); + poke(callFrameRegister, OBJECT_OFFSETOF(struct JITStackFrame, callFrame) / sizeof (void*)); + restoreReturnAddressBeforeReturn(regT2); +@@ -1754,7 +1754,7 @@ void JIT::privateCompileCTIMachineTrampo + emitGetFromCallFrameHeaderPtr(RegisterFile::ReturnPC, regT1); + move(ImmPtr(&globalData->exceptionLocation), regT2); + storePtr(regT1, regT2); +- move(ImmPtr(reinterpret_cast<void*>(ctiVMThrowTrampoline)), regT2); ++ move(ImmPtr((void*)(ctiVMThrowTrampoline)), regT2); + emitGetFromCallFrameHeaderPtr(RegisterFile::CallerFrame, callFrameRegister); + poke(callFrameRegister, OBJECT_OFFSETOF(struct JITStackFrame, callFrame) / sizeof (void*)); + restoreReturnAddressBeforeReturn(regT2); 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 000000000000..4d4a76bce3f0 --- /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) + { 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 000000000000..59229e8bc82e --- /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()); + } + diff --git a/www/webkit-gtk2/files/extra-patch-JavaScriptCore_yarr_RegexJIT.h b/www/webkit-gtk2/files/extra-patch-JavaScriptCore_yarr_RegexJIT.h new file mode 100644 index 000000000000..c46912d7aee8 --- /dev/null +++ b/www/webkit-gtk2/files/extra-patch-JavaScriptCore_yarr_RegexJIT.h @@ -0,0 +1,11 @@ +--- JavaScriptCore/yarr/RegexJIT.h.orig 2009-10-09 23:47:41.000000000 -0400 ++++ JavaScriptCore/yarr/RegexJIT.h 2009-10-09 23:48:19.000000000 -0400 +@@ -73,7 +73,7 @@ public: + + int execute(const UChar* input, unsigned start, unsigned length, int* output) + { +- return reinterpret_cast<RegexJITCode>(m_ref.m_code.executableAddress())(input, start, length, output); ++ return ((RegexJITCode)m_ref.m_code.executableAddress())(input, start, length, output); + } + + private: diff --git a/www/webkit-gtk2/files/patch-GNUmakefile.in b/www/webkit-gtk2/files/patch-GNUmakefile.in new file mode 100644 index 000000000000..53333a520d38 --- /dev/null +++ b/www/webkit-gtk2/files/patch-GNUmakefile.in @@ -0,0 +1,13 @@ +--- GNUmakefile.in.orig 2009-07-28 12:36:13.000000000 +0200 ++++ GNUmakefile.in 2009-07-28 12:39:13.000000000 +0200 +@@ -8154,7 +8154,9 @@ libWebCoreJS_depfiles := $(patsubst \ + webinspectordir = ${datadir}/webkit-1.0/webinspector + dist_webinspector_DATA = \ + $(WebCore)/English.lproj/localizedStrings.js \ +- $(shell ls $(WebCore)/inspector/front-end/*.{js,html,css}) ++ $(shell ls $(WebCore)/inspector/front-end/*.js) \ ++ $(shell ls $(WebCore)/inspector/front-end/*.html) \ ++ $(shell ls $(WebCore)/inspector/front-end/*.css) + + webinspectorimagesdir = ${datadir}/webkit-1.0/webinspector/Images + dist_webinspectorimages_DATA = \ diff --git a/www/webkit-gtk2/files/patch-JavaScriptCore_wtf_Platform.h b/www/webkit-gtk2/files/patch-JavaScriptCore_wtf_Platform.h new file mode 100644 index 000000000000..1b4d9eec188f --- /dev/null +++ b/www/webkit-gtk2/files/patch-JavaScriptCore_wtf_Platform.h @@ -0,0 +1,11 @@ +--- JavaScriptCore/wtf/Platform.h.orig 2009-09-20 01:06:03.000000000 +0200 ++++ JavaScriptCore/wtf/Platform.h 2009-09-21 22:01:16.000000000 +0200 +@@ -626,7 +626,7 @@ + #endif + + #if !defined(WTF_USE_JSVALUE64) && !defined(WTF_USE_JSVALUE32) && !defined(WTF_USE_JSVALUE32_64) +-#if PLATFORM(X86_64) && (PLATFORM(DARWIN) || PLATFORM(LINUX)) ++#if PLATFORM(X86_64) && (PLATFORM(DARWIN) || PLATFORM(LINUX) || PLATFORM(FREEBSD)) + #define WTF_USE_JSVALUE64 1 + #elif PLATFORM(ARM) || PLATFORM(PPC64) + #define WTF_USE_JSVALUE32 1 diff --git a/www/webkit-gtk2/files/patch-WebKit_gtk_webkit.pc.in b/www/webkit-gtk2/files/patch-WebKit_gtk_webkit.pc.in index 006b49709b38..1d41c7c8db1c 100644 --- a/www/webkit-gtk2/files/patch-WebKit_gtk_webkit.pc.in +++ b/www/webkit-gtk2/files/patch-WebKit_gtk_webkit.pc.in @@ -1,8 +1,8 @@ ---- WebKit/gtk/webkit.pc.in.orig 2008-04-01 14:46:09.251210738 -0400 -+++ WebKit/gtk/webkit.pc.in 2008-04-01 14:46:21.218068816 -0400 -@@ -8,4 +8,4 @@ +--- WebKit/gtk/webkit.pc.in.orig 2009-05-13 20:55:10.000000000 +0800 ++++ WebKit/gtk/webkit.pc.in 2009-05-19 15:09:51.000000000 +0800 +@@ -8,4 +8,4 @@ Description: Web content engine for GTK+ Version: @VERSION@ - Requires: gtk+-2.0 + Requires: glib-2.0 gtk+-2.0 libsoup-2.4 Libs: -L${libdir} -lwebkit-1.0 -Cflags: -I${includedir}/webkit-1.0 +Cflags: -I${includedir}/webkit-1.0 -I${includedir}/webkit-1.0/webkit diff --git a/www/webkit-gtk2/files/patch-Webcore_plugins_PluginDatabase.cpp b/www/webkit-gtk2/files/patch-Webcore_plugins_PluginDatabase.cpp index ed0a5895fca9..2670c229d1b1 100644 --- a/www/webkit-gtk2/files/patch-Webcore_plugins_PluginDatabase.cpp +++ b/www/webkit-gtk2/files/patch-Webcore_plugins_PluginDatabase.cpp @@ -1,10 +1,10 @@ ---- WebCore/plugins/PluginDatabase.cpp.orig 2008-05-26 01:03:07.236973838 -0700 -+++ WebCore/plugins/PluginDatabase.cpp 2008-05-26 01:03:52.356436787 -0700 -@@ -281,6 +281,7 @@ +--- WebCore/plugins/PluginDatabase.cpp.orig 2008-11-02 03:12:05.000000000 +0800 ++++ WebCore/plugins/PluginDatabase.cpp 2009-05-19 15:09:51.000000000 +0800 +@@ -283,6 +283,7 @@ Vector<String> PluginDatabase::defaultPl userPluginPath.append(String("/.netscape/plugins")); paths.append(userPluginPath); -+ paths.append("%%BROWSER_PLUGINS%%"); ++ paths.append("%%BROWSER_PLUGINS_DIR%%"); paths.append("/usr/lib/browser/plugins"); paths.append("/usr/local/lib/mozilla/plugins"); paths.append("/usr/lib/firefox/plugins"); diff --git a/www/webkit-gtk2/files/patch-cairo b/www/webkit-gtk2/files/patch-cairo index 4bba0cc2a860..2c4293af518e 100644 --- a/www/webkit-gtk2/files/patch-cairo +++ b/www/webkit-gtk2/files/patch-cairo @@ -1,31 +1,11 @@ ---- WebCore/platform/graphics/BitmapImage.cpp -+++ WebCore/platform/graphics/BitmapImage.cpp -@@ -203,7 +203,7 @@ float BitmapImage::frameDurationAtIndex(size_t index) - bool BitmapImage::frameHasAlphaAtIndex(size_t index) +--- WebCore/platform/graphics/BitmapImage.cpp.orig 2009-03-04 03:34:16.000000000 +0800 ++++ WebCore/platform/graphics/BitmapImage.cpp 2009-05-19 15:09:51.000000000 +0800 +@@ -202,7 +202,7 @@ bool BitmapImage::isSizeAvailable() + NativeImagePtr BitmapImage::frameAtIndex(size_t index) { if (index >= frameCount()) - return 0; -+ return true; ++ return NULL; if (index >= m_frames.size() || !m_frames[index].m_frame) cacheFrame(index); ---- WebCore/platform/graphics/cairo/ImageCairo.cpp -+++ WebCore/platform/graphics/cairo/ImageCairo.cpp -@@ -76,6 +76,7 @@ BitmapImage::BitmapImage(cairo_surface_t* surface, ImageObserver* observer) - - m_frames.grow(1); - m_frames[0].m_frame = surface; -+ m_frames[0].m_hasAlpha = cairo_surface_get_content(surface) != CAIRO_CONTENT_COLOR; - checkForSolidColor(); - } - ---- WebCore/platform/graphics/cg/ImageCG.cpp -+++ WebCore/platform/graphics/cg/ImageCG.cpp -@@ -87,6 +87,7 @@ BitmapImage::BitmapImage(CGImageRef cgImage, ImageObserver* observer) - - m_frames.grow(1); - m_frames[0].m_frame = cgImage; -+ m_frames[0].m_hasAlpha = true; - checkForSolidColor(); - } - diff --git a/www/webkit-gtk2/files/patch-configure b/www/webkit-gtk2/files/patch-configure new file mode 100644 index 000000000000..08c05beeab7c --- /dev/null +++ b/www/webkit-gtk2/files/patch-configure @@ -0,0 +1,20 @@ +--- configure.orig 2009-06-15 17:23:17.000000000 +0200 ++++ configure 2009-06-15 20:19:44.000000000 +0200 +@@ -21204,7 +21204,7 @@ fi + + if test "$enable_jit" = "yes"; then + case "$host_cpu" in +- i*86|x86_64) ++ i*86|x86_64|amd64) + + cat >>confdefs.h <<\_ACEOF + #define ENABLE_JIT 1 +@@ -21243,7 +21243,7 @@ cat >>confdefs.h <<\_ACEOF + _ACEOF + + ;; +- x86_64) ++ x86_64|amd64) + + cat >>confdefs.h <<\_ACEOF + #define WTF_USE_JIT_STUB_ARGUMENT_REGISTER 1 |