Tools/ChangeLog

 12010-12-27 Koan-Sin Tan <koansin.tan@gmail.com>
 2
 3 Reviewed by NOBODY (OOPS!).
 4
 5 [Gtk] WebKitGtk+ doesn't build on Mac OS X 10.6
 6 https://bugs.webkit.org/show_bug.cgi?id=50867
 7
 8 Fixed library extention for Mac in webkitdirs.pm and type conflict in
 9 TestNetscapePlugin.cpp
 10
 11 * GNUmakefile.am: Don't use AppKit when compiling TestNetscapePlugin for Gtk
 12 * Scripts/webkitdirs.pm:
 13
1142010-12-27 Daniel Bates <dbates@rim.com>
215
316 Rubber-stamped by Martin Robinson.
74706

Tools/GNUmakefile.am

@@TestNetscapePlugin_libtestnetscapeplugin
162162 $(global_cppflags) \
163163 $(javascriptcore_cppflags)
164164
 165# For the Gtk port we want to use XP_UNIX both on X11 and Mac
 166if !TARGET_WIN32
 167TestNetscapePlugin_libtestnetscapeplugin_la_CPPFLAGS += -DXP_UNIX
 168endif
 169
165170TestNetscapePlugin_libtestnetscapeplugin_la_SOURCES = \
166171 Tools/DumpRenderTree/unix/TestNetscapePlugin/ForwardingHeaders/WebKit/npapi.h \
167172 Tools/DumpRenderTree/unix/TestNetscapePlugin/ForwardingHeaders/WebKit/npfunctions.h \
74706

Tools/Scripts/webkitdirs.pm

@@sub builtDylibPathForName
594594 }
595595 if (isGtk()) {
596596 my $libraryDir = "$configurationProductDir/$libraryName/../.libs/";
597  if (-e $libraryDir . "libwebkitgtk-3.0.so") {
598  return $libraryDir . "libwebkitgtk-3.0.so";
 597 my $extension = isDarwin() ? "dylib" : "so";
 598 if (-e $libraryDir . "libwebkitgtk-3.0.$extension") {
 599 return $libraryDir . "libwebkitgtk-3.0.$extension";
599600 }
600  return $libraryDir . "libwebkitgtk-1.0.so";
 601 return $libraryDir . "libwebkitgtk-1.0.$extension";
601602 }
602603 if (isEfl()) {
603604 return "$configurationProductDir/$libraryName/../.libs/libewebkit.so";
74706

WebCore/ChangeLog

 12010-12-27 Koan-Sin Tan <koansin.tan@gmail.com>
 2
 3 Reviewed by NOBODY (OOPS!).
 4
 5 [Gtk] WebKitGtk+ doesn't build on Mac OS X 10.6
 6 https://bugs.webkit.org/show_bug.cgi?id=50867
 7
 8 Many Gtk related files include <libintl.h> or <glib/gi18n-lib.h>.
 9 On Mac, <libintl.h> includes <xlocale.h>. <xclocale.h> includes
 10 <xlocale/_ctype.h>, which uses isacii(). If we disallow ctype in
 11 config.h, we'll have problem.
 12
 13 * config.h: don't disallow ctype for (OS(DARWIN) && PLATFORM(GTK))
 14 * platform/UUID.cpp:
 15 (WebCore::createCanonicalUUIDString): let OS(DARWIN) && PLATFORM(GTK) u
 16se the Chromium Linux one
 17
1182010-12-27 Daniel Bates <dbates@rim.com>
219
320 Reviewed by Antonio Gomes.
74706

WebCore/config.h

133133// this breaks compilation of <QFontDatabase>, at least, so turn it off for now
134134// Also generates errors on wx on Windows, presumably because these functions
135135// are used from wx headers.
136 #if !PLATFORM(QT) && !PLATFORM(WX) && !PLATFORM(CHROMIUM)
 136// OS(DARWIN) && PLATFORM(GTK): Many Gtk related files include <libintl.h> or
 137// <glib/gi18n-lib.h>. On Mac, these two include <xlocale.h>. <xclocale.h>
 138// includes <xlocale/_ctype.h>, which uses isacii(). If we disallow ctype,
 139// we'll have problem.
 140#if !PLATFORM(QT) && !PLATFORM(WX) && !PLATFORM(CHROMIUM) && !(OS(DARWIN) && PLATFORM(GTK))
137141#include <wtf/DisallowCType.h>
138142#endif
139143
74706

WebCore/platform/UUID.cpp

3939
4040#if OS(WINDOWS)
4141#include <objbase.h>
42 #elif OS(DARWIN)
 42#elif OS(DARWIN) && !PLATFORM(GTK)
4343#include <CoreFoundation/CoreFoundation.h>
4444#elif OS(LINUX) && !PLATFORM(CHROMIUM)
4545#include <stdio.h>
46 #elif OS(LINUX) && PLATFORM(CHROMIUM)
 46#elif OS(LINUX) && PLATFORM(CHROMIUM) || OS(DARWIN) && PLATFORM(GTK)
4747#include <wtf/RandomNumber.h>
4848#include <wtf/text/StringBuilder.h>
4949#endif

@@String createCanonicalUUIDString()
7171 String canonicalUuidStr = String(uuidStr + 1, num - 3).lower(); // remove opening and closing bracket and make it lower.
7272 ASSERT(canonicalUuidStr[uuidVersionIdentifierIndex] == uuidVersionRequired);
7373 return canonicalUuidStr;
74 #elif OS(DARWIN)
 74#elif OS(DARWIN) && !PLATFORM(GTK)
7575 CFUUIDRef uuid = CFUUIDCreate(0);
7676 CFStringRef uuidStrRef = CFUUIDCreateString(0, uuid);
7777 String uuidStr(uuidStrRef);

@@String createCanonicalUUIDString()
9393 String canonicalUuidStr = String(uuidStr).lower(); // make it lower.
9494 ASSERT(canonicalUuidStr[uuidVersionIdentifierIndex] == uuidVersionRequired);
9595 return canonicalUuidStr;
96 #elif OS(LINUX) && PLATFORM(CHROMIUM)
 96#elif OS(LINUX) && PLATFORM(CHROMIUM) || OS(DARWIN) && PLATFORM(GTK)
9797 unsigned randomData[4];
9898 for (size_t i = 0; i < WTF_ARRAY_LENGTH(randomData); ++i)
9999 randomData[i] = static_cast<unsigned>(randomNumber() * (std::numeric_limits<unsigned>::max() + 1.0));
74706