On Sun, 2010-05-02 at 20:57 +0900, Yasuaki Taniguchi/谷口康明 wrote:
> Hello,
>
> I'm trying to build webkit-1.1.90 from last week in order to analyze
> Bug# 616606
> however I haven't be able to complete to build it.
> Would you please provide me the patches against webkit-1.1.90?
You're trying to build webkit-1.1.90 from source? I cross-compiled it
on an opensuse 11.2 build using the attached patch.
Phil
Index: WebCore/platform/network/soup/ResourceHandleSoup
--- WebCore/platform/network/soup/ResourceHandleSoup.cpp (revision 56613)
+++ WebCore/platform/network/soup/ResourceHandleSoup.cpp (working copy)
@@ -853,7 +853,7 @@
return;
}
- response.setMimeType(g_file_info_get_content_type(info));
+ response.setMimeType(g_content_type_get_mime_type(g_file_info_get_content_type(info)));
response.setExpectedContentLength(g_file_info_get_size(info));
GTimeVal tv;
Index: JavaScriptCore/GNUmakefile.am
--- JavaScriptCore/GNUmakefile.am (revision 56613)
+++ JavaScriptCore/GNUmakefile.am (working copy)
@@ -562,7 +562,7 @@
Programs_minidom_LDADD = \
libJavaScriptCore.la \
-lm \
- -lstdc++
+ -lstdc++ -lwinmm
Programs_minidom_LDFLAGS = \
-no-install \
@@ -584,7 +584,7 @@
$(UNICODE_CFLAGS)
Programs_jsc_LDADD = \
- libJavaScriptCore.la
+ libJavaScriptCore.la -lwinmm
javascriptcore_dist += \
$(CREATE_HASH_TABLE) \
Index: JavaScriptCore/runtime/Collector.cpp
--- JavaScriptCore/runtime/Collector.cpp (revision 56613)
+++ JavaScriptCore/runtime/Collector.cpp (working copy)
@@ -201,7 +201,7 @@
#elif OS(WINCE)
void* address = VirtualAlloc(NULL, BLOCK_SIZE, MEM_COMMIT | MEM_RESERVE, PAGE_READWRITE);
#elif OS(WINDOWS)
-#if COMPILER(MINGW) && !defined(__MINGW64_VERSION_MAJOR)
+#if COMPILER(MINGW) && !COMPILER(MINGW64)
void* address = __mingw_aligned_malloc(BLOCK_SIZE, BLOCK_SIZE);
#else
void* address = _aligned_malloc(BLOCK_SIZE, BLOCK_SIZE);
@@ -292,7 +292,7 @@
#elif OS(WINCE)
VirtualFree(block, 0, MEM_RELEASE);
#elif OS(WINDOWS)
-#if COMPILER(MINGW) && !defined(__MINGW64_VERSION_MAJOR)
+#if COMPILER(MINGW) && !COMPILER(MINGW64)
__mingw_aligned_free(block);
#else
_aligned_free(block);
Index: JavaScriptCore/wtf/Platform.h
--- JavaScriptCore/wtf/Platform.h (revision 56613)
+++ JavaScriptCore/wtf/Platform.h (working copy)
@@ -79,9 +79,14 @@
#endif
/* COMPILER(MINGW) - MinGW GCC */
-#if defined(MINGW) || defined(__MINGW32__)
+/* COMPILER(MINGW64) - mingw-w64 GCC - only used as additional check to exclude mingw.org specific functions */
+#if defined (__MINGW32__)
#define WTF_COMPILER_MINGW 1
-#endif
+#include <_mingw.h> /* private MinGW header */
+# if defined (__MINGW64_VERSION_MAJOR) /* best way to check for mingw-w64 vs mingw.org */
+# define WTF_COMPILER_MINGW64 1
+# endif /* __MINGW64_VERSION_MAJOR */
+#endif /* __MINGW32__ */
/* COMPILER(WINSCW) - CodeWarrior for Symbian emulator */
#if defined(__WINSCW__)
@@ -912,6 +917,8 @@
#elif CPU(X86) && OS(WINDOWS) && COMPILER(MINGW) && GCC_VERSION >= 40100
#define ENABLE_JIT 1
#define WTF_USE_JIT_STUB_ARGUMENT_VA_LIST 1
+#elif CPU(X86_64) && OS(WINDOWS) && COMPILER(MINGW64) && GCC_VERSION >= 40100
+ #define ENABLE_JIT 1
#elif CPU(X86) && OS(WINDOWS) && COMPILER(MSVC)
#define ENABLE_JIT 1
#define WTF_USE_JIT_STUB_ARGUMENT_REGISTER 1
@@ -986,6 +993,7 @@
#if PLATFORM(QT)
#if (CPU(X86) && OS(WINDOWS) && COMPILER(MINGW) && GCC_VERSION >= 40100) \
+ || (CPU(X86_64) && OS(WINDOWS) && COMPILER(MINGW64) && GCC_VERSION >= 40100) \
|| (CPU(X86) && OS(WINDOWS) && COMPILER(MSVC)) \
|| (CPU(X86) && OS(LINUX) && GCC_VERSION >= 40100) \
|| (CPU(X86_64) && OS(LINUX) && GCC_VERSION >= 40100) \
Index: JavaScriptCore/wtf/unicode/glib/UnicodeGLib.cpp
--- JavaScriptCore/wtf/unicode/glib/UnicodeGLib.cpp (revision 56613)
+++ JavaScriptCore/wtf/unicode/glib/UnicodeGLib.cpp (working copy)
@@ -49,7 +49,7 @@
GOwnPtr<GError> gerror;
GOwnPtr<char> utf8src;
- utf8src.set(g_utf16_to_utf8(src, srcLength, 0, 0, &gerror.outPtr()));
+ utf8src.set(g_utf16_to_utf8(reinterpret_cast<const gunichar2*>(src), srcLength, 0, 0, &gerror.outPtr()));
if (gerror) {
*error = true;
return -1;
@@ -60,7 +60,7 @@
long utf16resultLength = -1;
GOwnPtr<UChar> utf16result;
- utf16result.set(g_utf8_to_utf16(utf8result.get(), -1, 0, &utf16resultLength, &gerror.outPtr()));
+ utf16result.set(reinterpret_cast<UChar*>(g_utf8_to_utf16(utf8result.get(), -1, 0, &utf16resultLength, &gerror.outPtr())));
if (gerror) {
*error = true;
return -1;
@@ -81,7 +81,7 @@
GOwnPtr<GError> gerror;
GOwnPtr<char> utf8src;
- utf8src.set(g_utf16_to_utf8(src, srcLength, 0, 0, &gerror.outPtr()));
+ utf8src.set(g_utf16_to_utf8(reinterpret_cast<const gunichar2*>(src), srcLength, 0, 0, &gerror.outPtr()));
if (gerror) {
*error = true;
return -1;
@@ -92,7 +92,7 @@
long utf16resultLength = -1;
GOwnPtr<UChar> utf16result;
- utf16result.set(g_utf8_to_utf16(utf8result.get(), -1, 0, &utf16resultLength, &gerror.outPtr()));
+ utf16result.set(reinterpret_cast<UChar*>(g_utf8_to_utf16(utf8result.get(), -1, 0, &utf16resultLength, &gerror.outPtr())));
if (gerror) {
*error = true;
return -1;
@@ -113,7 +113,7 @@
GOwnPtr<GError> gerror;
GOwnPtr<char> utf8src;
- utf8src.set(g_utf16_to_utf8(src, srcLength, 0, 0, &gerror.outPtr()));
+ utf8src.set(g_utf16_to_utf8(reinterpret_cast<const gunichar2*>(src), srcLength, 0, 0, &gerror.outPtr()));
if (gerror) {
*error = true;
return -1;
@@ -124,7 +124,7 @@
long utf16resultLength = -1;
GOwnPtr<UChar> utf16result;
- utf16result.set(g_utf8_to_utf16(utf8result.get(), -1, 0, &utf16resultLength, &gerror.outPtr()));
+ utf16result.set(reinterpret_cast<UChar*>(g_utf8_to_utf16(utf8result.get(), -1, 0, &utf16resultLength, &gerror.outPtr())));
if (gerror) {
*error = true;
return -1;
@@ -189,8 +189,8 @@
GOwnPtr<char> utf8a;
GOwnPtr<char> utf8b;
- utf8a.set(g_utf16_to_utf8(a, len, 0, 0, 0));
- utf8b.set(g_utf16_to_utf8(b, len, 0, 0, 0));
+ utf8a.set(g_utf16_to_utf8(reinterpret_cast<const gunichar2*>(a), len, 0, 0, 0));
+ utf8b.set(g_utf16_to_utf8(reinterpret_cast<const gunichar2*>(b), len, 0, 0, 0));
GOwnPtr<char> foldedA;
GOwnPtr<char> foldedB;
Index: JavaScriptCore/wtf/unicode/glib/UnicodeGLib.h
--- JavaScriptCore/wtf/unicode/glib/UnicodeGLib.h (revision 56613)
+++ JavaScriptCore/wtf/unicode/glib/UnicodeGLib.h (working copy)
@@ -34,7 +34,12 @@
#include <stdlib.h>
#include <string.h>
-typedef uint16_t UChar;
+#if !defined(WIN32) && !defined(_WIN32) && !defined(__WINSCW__) \
+ && !(defined(__CC_ARM) || defined(__ARMCC__)) /* RVCT */
+ typedef unsigned short UChar;
+#else
+ typedef wchar_t UChar;
+#endif
typedef int32_t UChar32;
namespace WTF {
Index: JavaScriptCore/jit/ExecutableAllocator.h
--- JavaScriptCore/jit/ExecutableAllocator.h (revision 56613)
+++ JavaScriptCore/jit/ExecutableAllocator.h (working copy)
@@ -285,7 +285,7 @@
inline ExecutablePool::ExecutablePool(size_t n)
{
size_t allocSize = roundUpAllocationSize(n, JIT_ALLOCATOR_PAGE_SIZE);
- Allocation mem = systemAlloc(allocSize);
+ const Allocation mem = systemAlloc(allocSize);
m_pools.append(mem);
m_freePtr = mem.pages;
if (!m_freePtr)
Index: GNUmakefile.am
--- GNUmakefile.am (revision 56613)
+++ GNUmakefile.am (working copy)
@@ -257,7 +257,7 @@
$(PNG_LIBS) \
$(SQLITE3_LIBS) \
$(UNICODE_LIBS) \
- $(XT_LIBS)
+ $(XT_LIBS) -lwinmm -lshlwapi
#
# Extra checks and flags
Index: WebKit/gtk/WebCoreSupport/EditorClientGtk.cpp
--- WebKit/gtk/WebCoreSupport/EditorClientGtk.cpp (revision 56613)
+++ WebKit/gtk/WebCoreSupport/EditorClientGtk.cpp (working copy)
@@ -637,7 +637,7 @@
if (!dicts)
return;
- gchar* ctext = g_utf16_to_utf8(const_cast<gunichar2*>(text), length, 0, 0, 0);
+ gchar* ctext = g_utf16_to_utf8(const_cast<gunichar2*>(reinterpret_cast<const gunichar2*>(text)), length, 0, 0, 0);
int utflen = g_utf8_strlen(ctext, -1);
PangoLanguage* language = pango_language_get_default();
Index: WebCore/dom/XMLTokenizerLibxml2.cpp
--- WebCore/dom/XMLTokenizerLibxml2.cpp (revision 56613)
+++ WebCore/dom/XMLTokenizerLibxml2.cpp (working copy)
@@ -908,7 +908,7 @@
if (m_parserStopped)
return;
-#if COMPILER(MSVC) || COMPILER(RVCT)
+#if OS(WINDOWS) || COMPILER(RVCT)
char m[1024];
vsnprintf(m, sizeof(m) - 1, message, args);
#else
@@ -922,7 +922,7 @@
else
handleError(type, m, lineNumber(), columnNumber());
-#if !COMPILER(MSVC) && !COMPILER(RVCT)
+#if !OS(WINDOWS) && !COMPILER(RVCT)
free(m);
#endif
}
Index: WebCore/plugins/PluginView.h
--- WebCore/plugins/PluginView.h (revision 56613)
+++ WebCore/plugins/PluginView.h (working copy)
@@ -312,7 +312,7 @@
bool m_haveInitialized;
bool m_isWaitingToStart;
-#if defined(XP_UNIX)
+#if defined(XP_UNIX) || PLATFORM(GTK)
bool m_needsXEmbed;
#endif
@@ -340,7 +340,7 @@
private:
-#if defined(XP_UNIX) || OS(SYMBIAN)
+#if defined(XP_UNIX) || OS(SYMBIAN) || PLATFORM(GTK)
void setNPWindowIfNeeded();
#elif defined(XP_MACOSX)
NP_CGContext m_npCgContext;
Index: WebCore/plugins/gtk/PluginViewGtk.cpp
--- WebCore/plugins/gtk/PluginViewGtk.cpp (revision 56613)
+++ WebCore/plugins/gtk/PluginViewGtk.cpp (working copy)
@@ -45,6 +45,7 @@
#include "Image.h"
#include "KeyboardEvent.h"
#include "MouseEvent.h"
+#include "NotImplemented.h"
#include "Page.h"
#include "PlatformKeyboardEvent.h"
#include "PlatformMouseEvent.h"
@@ -71,7 +72,7 @@
#include <cairo/cairo-xlib.h>
#include <gdk/gdkx.h>
#elif defined(GDK_WINDOWING_WIN32)
-#include "PluginMessageThrottlerWin.h"
+#include "win/PluginMessageThrottlerWin.h"
#include <gdk/gdkwin32.h>
#endif
@@ -706,6 +707,7 @@
gtk_widget_queue_draw(m_parentFrame->view()->hostWindow()->platformPageClient());
}
+#ifndef GDK_WINDOWING_WIN32
static Display* getPluginDisplay()
{
// The plugin toolkit might have a different X connection open. Since we're
@@ -719,6 +721,7 @@
return 0;
#endif
}
+#endif
#if defined(XP_UNIX)
static void getVisualAndColormap(int depth, Visual** visual, Colormap* colormap)
@@ -788,15 +791,16 @@
PluginView::setCurrentPluginView(this);
JSC::JSLock::DropAllLocks dropAllLocks(JSC::SilenceAssertionsOnly);
setCallingPlugin(true);
+#if defined(XP_UNIX)
m_plugin->pluginFuncs()->getvalue(m_instance, NPPVpluginNeedsXEmbed, &m_needsXEmbed);
+#endif
setCallingPlugin(false);
PluginView::setCurrentPluginView(0);
}
if (m_isWindowed) {
+ GtkWidget* pageClient = m_parentFrame->view()->hostWindow()->platformPageClient();
#if defined(XP_UNIX)
- GtkWidget* pageClient = m_parentFrame->view()->hostWindow()->platformPageClient();
-
if (m_needsXEmbed) {
// If our parent is not anchored the startup process will
// fail miserably for XEmbed plugins a bit later on when
@@ -817,7 +821,9 @@
#endif
} else {
setPlatformWidget(0);
+#if defined(XP_UNIX)
m_pluginDisplay = getPluginDisplay();
+#endif
}
show();
Index: WebCore/plugins/PluginView.cpp
--- WebCore/plugins/PluginView.cpp (revision 56613)
+++ WebCore/plugins/PluginView.cpp (working copy)
@@ -68,7 +68,7 @@
#include <wtf/ASCIICType.h>
#if OS(WINDOWS) && ENABLE(NETSCAPE_PLUGIN_API)
-#include "PluginMessageThrottlerWin.h"
+#include "win/PluginMessageThrottlerWin.h"
#endif
using JSC::ExecState;
@@ -333,7 +333,7 @@
JSC::JSLock::DropAllLocks dropAllLocks(JSC::SilenceAssertionsOnly);
#if ENABLE(NETSCAPE_PLUGIN_API)
-#ifdef XP_WIN
+#if defined(XP_WIN) && !PLATFORM(GTK)
// Unsubclass the window
if (m_isWindowed) {
#if OS(WINCE)
@@ -345,7 +345,7 @@
WNDPROC currentWndProc = (WNDPROC)GetWindowLongPtr(platformPluginWidget(), GWLP_WNDPROC);
if (currentWndProc == PluginViewWndProc)
- SetWindowLongPtr(platformPluginWidget(), GWLP_WNDPROC, (LONG)m_pluginWndProc);
+ SetWindowLongPtr(platformPluginWidget(), GWLP_WNDPROC, (LONG_PTR)m_pluginWndProc);
#endif
}
#endif // XP_WIN
Index: WebCore/plugins/win/PluginDatabaseWin.cpp
--- WebCore/plugins/win/PluginDatabaseWin.cpp (revision 56613)
+++ WebCore/plugins/win/PluginDatabaseWin.cpp (working copy)
@@ -34,7 +34,7 @@
#include <windows.h>
#include <shlwapi.h>
-#if COMPILER(MINGW)
+#if COMPILER(MINGW) && !defined(__MINGW64_VERSION_MAJOR)
#define _countof(x) (sizeof(x)/sizeof(x[0]))
#endif
@@ -104,7 +104,7 @@
DWORD pathStrSize = sizeof(pathStr);
DWORD type;
- result = SHGetValue(key, name, TEXT("Path"), &type, (LPBYTE)pathStr, &pathStrSize);
+ result = SHGetValueW(key, name, L"Path", &type, (LPBYTE)pathStr, &pathStrSize);
if (result != ERROR_SUCCESS || type != REG_SZ)
continue;
@@ -212,7 +212,7 @@
HKEY key;
LONG result;
- result = RegOpenKeyEx(HKEY_LOCAL_MACHINE, TEXT("Software\\Mozilla"), 0, KEY_READ, &key);
+ result = RegOpenKeyExW(HKEY_LOCAL_MACHINE, L"Software\\Mozilla", 0, KEY_READ, &key);
if (result == ERROR_SUCCESS) {
WCHAR name[128];
FILETIME lastModified;
@@ -229,7 +229,7 @@
HKEY extensionsKey;
// Try opening the key
- result = RegOpenKeyEx(key, extensionsPath.charactersWithNullTermination(), 0, KEY_READ, &extensionsKey);
+ result = RegOpenKeyExW(key, extensionsPath.charactersWithNullTermination(), 0, KEY_READ, &extensionsKey);
if (result == ERROR_SUCCESS) {
// Now get the plugins directory
@@ -237,7 +237,7 @@
DWORD pluginsDirectorySize = sizeof(pluginsDirectoryStr);
DWORD type;
- result = RegQueryValueEx(extensionsKey, TEXT("Plugins"), 0, &type, (LPBYTE)&pluginsDirectoryStr, &pluginsDirectorySize);
+ result = RegQueryValueExW(extensionsKey, L"Plugins", 0, &type, (LPBYTE)&pluginsDirectoryStr, &pluginsDirectorySize);
if (result == ERROR_SUCCESS && type == REG_SZ)
directories.append(String(pluginsDirectoryStr, pluginsDirectorySize / sizeof(WCHAR) - 1));
@@ -255,7 +255,7 @@
#if !OS(WINCE)
// The new WMP Firefox plugin is installed in \PFiles\Plugins if it can't find any Firefox installs
WCHAR pluginDirectoryStr[_MAX_PATH + 1];
- DWORD pluginDirectorySize = ::ExpandEnvironmentStringsW(TEXT("%SYSTEMDRIVE%\\PFiles\\Plugins"), pluginDirectoryStr, _countof(pluginDirectoryStr));
+ DWORD pluginDirectorySize = ::ExpandEnvironmentStringsW(L"%SYSTEMDRIVE%\\PFiles\\Plugins", pluginDirectoryStr, _countof(pluginDirectoryStr));
if (pluginDirectorySize > 0 && pluginDirectorySize <= _countof(pluginDirectoryStr))
directories.append(String(pluginDirectoryStr, pluginDirectorySize - 1));
@@ -265,7 +265,7 @@
WCHAR installationDirectoryStr[_MAX_PATH];
DWORD installationDirectorySize = sizeof(installationDirectoryStr);
- HRESULT result = SHGetValue(HKEY_LOCAL_MACHINE, TEXT("Software\\Microsoft\\MediaPlayer"), TEXT("Installation Directory"), &type, (LPBYTE)&installationDirectoryStr, &installationDirectorySize);
+ HRESULT result = SHGetValueW(HKEY_LOCAL_MACHINE, L"Software\\Microsoft\\MediaPlayer", L"Installation Directory", &type, (LPBYTE)&installationDirectoryStr, &installationDirectorySize);
if (result == ERROR_SUCCESS && type == REG_SZ)
directories.append(String(installationDirectoryStr, installationDirectorySize / sizeof(WCHAR) - 1));
@@ -277,7 +277,7 @@
WCHAR installationDirectoryStr[_MAX_PATH];
DWORD installationDirectorySize = sizeof(installationDirectoryStr);
- HRESULT result = SHGetValue(HKEY_LOCAL_MACHINE, TEXT("Software\\Apple Computer, Inc.\\QuickTime"), TEXT("InstallDir"), &type, (LPBYTE)&installationDirectoryStr, &installationDirectorySize);
+ HRESULT result = SHGetValueW(HKEY_LOCAL_MACHINE, L"Software\\Apple Computer, Inc.\\QuickTime", L"InstallDir", &type, (LPBYTE)&installationDirectoryStr, &installationDirectorySize);
if (result == ERROR_SUCCESS && type == REG_SZ) {
String pluginDir = String(installationDirectoryStr, installationDirectorySize / sizeof(WCHAR) - 1) + "\\plugins";
@@ -288,7 +288,7 @@
static inline void addAdobeAcrobatPluginDirectory(Vector<String>& directories)
{
HKEY key;
- HRESULT result = RegOpenKeyEx(HKEY_LOCAL_MACHINE, TEXT("Software\\Adobe\\Acrobat Reader"), 0, KEY_READ, &key);
+ HRESULT result = RegOpenKeyExW(HKEY_LOCAL_MACHINE, L"Software\\Adobe\\Acrobat Reader", 0, KEY_READ, &key);
if (result != ERROR_SUCCESS)
return;
@@ -319,7 +319,7 @@
DWORD acrobatInstallPathSize = sizeof(acrobatInstallPathStr);
String acrobatPluginKeyPath = "Software\\Adobe\\Acrobat Reader\\" + latestAcrobatVersionString + "\\InstallPath";
- result = SHGetValue(HKEY_LOCAL_MACHINE, acrobatPluginKeyPath.charactersWithNullTermination(), 0, &type, (LPBYTE)acrobatInstallPathStr, &acrobatInstallPathSize);
+ result = SHGetValueW(HKEY_LOCAL_MACHINE, acrobatPluginKeyPath.charactersWithNullTermination(), 0, &type, (LPBYTE)acrobatInstallPathStr, &acrobatInstallPathSize);
if (result == ERROR_SUCCESS) {
String acrobatPluginDirectory = String(acrobatInstallPathStr, acrobatInstallPathSize / sizeof(WCHAR) - 1) + "\\browser";
@@ -339,12 +339,12 @@
if (!cachedPluginDirectory) {
cachedPluginDirectory = true;
- int moduleFileNameLen = GetModuleFileName(0, moduleFileNameStr, _MAX_PATH);
+ int moduleFileNameLen = GetModuleFileNameW(0, moduleFileNameStr, _MAX_PATH);
if (!moduleFileNameLen || moduleFileNameLen == _MAX_PATH)
goto exit;
- if (!PathRemoveFileSpec(moduleFileNameStr))
+ if (!PathRemoveFileSpecW(moduleFileNameStr))
goto exit;
pluginsDirectory = String(moduleFileNameStr) + "\\Plugins";
@@ -358,15 +358,15 @@
#if !OS(WINCE)
WCHAR systemDirectoryStr[MAX_PATH];
- if (GetSystemDirectory(systemDirectoryStr, _countof(systemDirectoryStr)) == 0)
+ if (GetSystemDirectoryW(systemDirectoryStr, _countof(systemDirectoryStr)) == 0)
return;
WCHAR macromediaDirectoryStr[MAX_PATH];
- PathCombine(macromediaDirectoryStr, systemDirectoryStr, TEXT("macromed\\Flash"));
+ PathCombineW(macromediaDirectoryStr, systemDirectoryStr, L"macromed\\Flash");
directories.append(macromediaDirectoryStr);
- PathCombine(macromediaDirectoryStr, systemDirectoryStr, TEXT("macromed\\Shockwave 10"));
+ PathCombineW(macromediaDirectoryStr, systemDirectoryStr, L"macromed\\Shockwave 10");
directories.append(macromediaDirectoryStr);
#endif
}
Index: WebCore/GNUmakefile.am
--- WebCore/GNUmakefile.am (revision 56613)
+++ WebCore/GNUmakefile.am (working copy)
@@ -2821,6 +2821,12 @@
WebCore/mathml/MathMLTextElement.h \
WebCore/mathml/RenderMathMLBlock.cpp \
WebCore/mathml/RenderMathMLBlock.h \
+ WebCore/mathml/RenderMathMLMath.cpp \
+ WebCore/mathml/RenderMathMLMath.h \
+ WebCore/mathml/RenderMathMLOperator.cpp \
+ WebCore/mathml/RenderMathMLOperator.h \
+ WebCore/mathml/RenderMathMLRow.cpp \
+ WebCore/mathml/RenderMathMLRow.h \
WebCore/mathml/RenderMathMLSubSup.cpp \
WebCore/mathml/RenderMathMLSubSup.h \
WebCore/mathml/RenderMathMLUnderOver.cpp \
Index: WebCore/platform/text/TextStream.cpp
--- WebCore/platform/text/TextStream.cpp (revision 56613)
+++ WebCore/platform/text/TextStream.cpp (working copy)
@@ -108,7 +108,7 @@
return String::adopt(m_text);
}
-#if OS(WINDOWS) && PLATFORM(X86_64) && COMPILER(MSVC)
+#if OS(WINDOWS) && CPU(X86_64)
TextStream& TextStream::operator<<(__int64 i)
{
char buffer[printBufferSize];
Index: WebCore/platform/text/gtk/TextBreakIteratorGtk.cpp
--- WebCore/platform/text/gtk/TextBreakIteratorGtk.cpp (revision 56613)
+++ WebCore/platform/text/gtk/TextBreakIteratorGtk.cpp (working copy)
@@ -59,7 +59,7 @@
long utf8len;
GOwnPtr<char> utf8;
- utf8.set(g_utf16_to_utf8(string, length, 0, &utf8len, 0));
+ utf8.set(g_utf16_to_utf8(reinterpret_cast<const gunichar2*>(string), length, 0, &utf8len, 0));
// FIXME: assumes no surrogate pairs
Index: WebCore/platform/text/TextStream.h
--- WebCore/platform/text/TextStream.h (revision 56613)
+++ WebCore/platform/text/TextStream.h (working copy)
@@ -45,7 +45,7 @@
TextStream& operator<<(const char*);
TextStream& operator<<(void*);
TextStream& operator<<(const String&);
-#if OS(WINDOWS) && PLATFORM(X86_64) && COMPILER(MSVC)
+#if OS(WINDOWS) && CPU(X86_64)
TextStream& operator<<(unsigned __int64);
TextStream& operator<<(__int64);
#endif
Index: WebCore/platform/text/TextEncoding.cpp
--- WebCore/platform/text/TextEncoding.cpp (revision 56613)
+++ WebCore/platform/text/TextEncoding.cpp (working copy)
@@ -119,14 +119,14 @@
return newTextCodec(*this)->encode(reinterpret_cast<const UChar *>(str.utf16()), str.length(), handling);
#elif USE(GLIB_UNICODE)
GOwnPtr<char> UTF8Source;
- UTF8Source.set(g_utf16_to_utf8(characters, length, 0, 0, 0));
+ UTF8Source.set(g_utf16_to_utf8(reinterpret_cast<const gunichar2*>(characters), length, 0, 0, 0));
GOwnPtr<char> UTF8Normalized;
UTF8Normalized.set(g_utf8_normalize(UTF8Source.get(), -1, G_NORMALIZE_NFC));
long UTF16Length;
GOwnPtr<UChar> UTF16Normalized;
- UTF16Normalized.set(g_utf8_to_utf16(UTF8Normalized.get(), -1, 0, &UTF16Length, 0));
+ UTF16Normalized.set(reinterpret_cast<UChar*>(g_utf8_to_utf16(UTF8Normalized.get(), -1, 0, &UTF16Length, 0)));
return newTextCodec(*this)->encode(UTF16Normalized.get(), UTF16Length, handling);
#elif OS(WINCE)
Index: WebCore/platform/graphics/transforms/TransformationMatrix.h
--- WebCore/platform/graphics/transforms/TransformationMatrix.h (revision 56613)
+++ WebCore/platform/graphics/transforms/TransformationMatrix.h (working copy)
@@ -47,7 +47,7 @@
#endif
#if PLATFORM(WIN) || (PLATFORM(QT) && OS(WINDOWS)) || (PLATFORM(WX) && OS(WINDOWS))
-#if COMPILER(MINGW)
+#if COMPILER(MINGW) && !COMPILER(MINGW64)
typedef struct _XFORM XFORM;
#else
typedef struct tagXFORM XFORM;
Index: WebCore/platform/FileSystem.h
--- WebCore/platform/FileSystem.h (revision 56613)
+++ WebCore/platform/FileSystem.h (working copy)
@@ -64,7 +64,7 @@
class CString;
// PlatformModule
-#if OS(WINDOWS)
+#if OS(WINDOWS) && !PLATFORM(GTK)
typedef HMODULE PlatformModule;
#elif PLATFORM(QT)
#if defined(Q_WS_MAC)
@@ -109,7 +109,7 @@
#if PLATFORM(QT)
typedef QFile* PlatformFileHandle;
const PlatformFileHandle invalidPlatformFileHandle = 0;
-#elif OS(WINDOWS)
+#elif OS(WINDOWS) && !PLATFORM(GTK)
typedef HANDLE PlatformFileHandle;
// FIXME: -1 is INVALID_HANDLE_VALUE, defined in <winbase.h>. Chromium tries to
// avoid using Windows headers in headers. We'd rather move this into the .cpp.
@@ -144,7 +144,7 @@
// Methods for dealing with loadable modules
bool unloadModule(PlatformModule);
-#if PLATFORM(WIN)
+#if PLATFORM(WIN) && !PLATFORM(GTK)
String localUserSpecificStorageDirectory();
String roamingUserSpecificStorageDirectory();
Index: WebCore/platform/Arena.h
--- WebCore/platform/Arena.h (revision 56613)
+++ WebCore/platform/Arena.h (working copy)
@@ -40,11 +40,13 @@
#ifndef Arena_h
#define Arena_h
+#include <stdio.h>
+
#define ARENA_ALIGN_MASK 3
namespace WebCore {
-typedef unsigned long uword;
+typedef uintptr_t uword;
struct Arena {
Arena* next; // next arena
Index: WebCore/platform/KURL.cpp
--- WebCore/platform/KURL.cpp (revision 56613)
+++ WebCore/platform/KURL.cpp (working copy)
@@ -1422,7 +1422,7 @@
#elif USE(GLIB_UNICODE)
GOwnPtr<gchar> utf8Hostname;
GOwnPtr<GError> utf8Err;
- utf8Hostname.set(g_utf16_to_utf8(str, strLen, 0, 0, &utf8Err.outPtr()));
+ utf8Hostname.set(g_utf16_to_utf8(reinterpret_cast<const gunichar2*>(str), strLen, 0, 0, &utf8Err.outPtr()));
if (utf8Err)
return;
Index: WebKitTools/GNUmakefile.am
--- WebKitTools/GNUmakefile.am (revision 56613)
+++ WebKitTools/GNUmakefile.am (working copy)
@@ -1,4 +1,4 @@
-noinst_PROGRAMS += \
+bin_PROGRAMS += \
Programs/GtkLauncher \
Programs/DumpRenderTree
@@ -22,7 +22,7 @@
Programs_GtkLauncher_LDADD = \
libwebkit-1.0.la \
$(GTK_LIBS) \
- $(GLIB_LIBS)
+ $(GLIB_LIBS) -lwinmm
Programs_GtkLauncher_LDFLAGS = \
-no-fast-install \
@@ -88,7 +88,7 @@
$(GTK_LIBS) \
$(GLIB_LIBS) \
$(LIBSOUP_LIBS) \
- $(FREETYPE_LIBS)
+ $(FREETYPE_LIBS) -lwinmm
Programs_DumpRenderTree_LDFLAGS = \
-no-fast-install \
--- /dev/null 2009-12-16 00:58:22.000000000 +0100
+++ autogen.sh 2009-12-17 00:52:13.000000000 +0100
@@ -0,0 +1,63 @@
+#! /bin/sh
+
+# Allow invocation from a separate build directory; in that case, we change
+# to the source directory to run the auto*, then change back before running configure
+srcdir=`dirname $0`
+test -z "$srcdir" && srcdir=.
+
+ORIGDIR=`pwd`
+cd $srcdir
+
+GTKDOCIZE_FLAGS="--copy"
+LIBTOOLIZE_FLAGS="--force --automake"
+ACLOCAL_FLAGS="-I autotools"
+AUTOMAKE_FLAGS="--foreign --add-missing"
+
+DIE=0
+
+(autoconf --version) < /dev/null > /dev/null 2>&1 || {
+ echo
+ echo "You must have autoconf installed to compile $PROJECT."
+ echo "Install the appropriate package for your distribution,"
+ echo "or get the source tarball at http://ftp.gnu.org/gnu/autoconf/";
+ DIE=1
+}
+
+(automake --version) < /dev/null > /dev/null 2>&1 || {
+ echo
+ echo "You must have automake installed to compile $PROJECT."
+ echo "Install the appropriate package for your distribution,"
+ echo "or get the source tarball at http://ftp.gnu.org/gnu/automake/";
+ DIE=1
+}
+
+LIBTOOLIZE=libtoolize
+($LIBTOOLIZE --version) < /dev/null > /dev/null 2>&1 || {
+ LIBTOOLIZE=glibtoolize
+ ($LIBTOOLIZE --version) < /dev/null > /dev/null 2>&1 || {
+ echo
+ echo "You must have libtool installed to compile $PROJECT."
+ echo "Install the appropriate package for your distribution,"
+ echo "or get the source tarball at http://ftp.gnu.org/gnu/libtool/";
+ DIE=1
+ }
+}
+
+if test "$DIE" -eq 1; then
+ exit 1
+fi
+
+rm -rf $top_srcdir/autom4te.cache
+
+touch README INSTALL
+
+gtkdocize $GTKDOCIZE_FLAGS > /dev/null 2>&1 || echo "Warning: not running gtk-docize."
+aclocal $ACLOCAL_FLAGS || exit $?
+$LIBTOOLIZE $LIBTOOLIZE_FLAGS || exit $?
+autoheader || exit $?
+automake $AUTOMAKE_FLAGS || exit $?
+autoconf || exit $?
+
+cd $ORIGDIR || exit 1
+
+$srcdir/configure $AUTOGEN_CONFIGURE_ARGS "$@" || exit $?
_______________________________________________
gnucash-devel mailing list
[email protected]
https://lists.gnucash.org/mailman/listinfo/gnucash-devel
