[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198
mrobinson at webkit.org
mrobinson at webkit.org
Sun Feb 20 22:51:56 UTC 2011
The following commit has been merged in the webkit-1.3 branch:
commit e0abb38f483c4b5c78b0ea34a3c3c2d03bbecee7
Author: mrobinson at webkit.org <mrobinson at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Jan 12 18:11:44 2011 +0000
2011-01-12 Koan-Sin Tan <koansin.tan at gmail.com>
Reviewed by Martin Robinson.
[Gtk] WebKitGtk+ doesn't build on Mac OS X 10.6
https://bugs.webkit.org/show_bug.cgi?id=50867
* config.h: Don't disallow ctype for (OS(DARWIN) && PLATFORM(GTK))
Many GTK+ related files include <libintl.h> or <glib/gi18n-lib.h>.
On Mac, <libintl.h> includes <xlocale.h>. <xclocale.h> includes
<xlocale/_ctype.h>, which uses isacii().
* platform/UUID.cpp:
(WebCore::createCanonicalUUIDString): For OS(DARWIN) && !PLATFORM(CF)
use the Chromium Linux UUID generation.
2011-01-12 Koan-Sin Tan <koansin.tan at gmail.com>
Reviewed by Martin Robinson.
[Gtk] WebKitGtk+ doesn't build on Mac OS X 10.6
https://bugs.webkit.org/show_bug.cgi?id=50867
Fixed library extention for Mac in webkitdirs.pm and type conflict in
TestNetscapePlugin.cpp
* GNUmakefile.am: Don't use AppKit when compiling TestNetscapePlugin for GTK+
* Scripts/webkitdirs.pm:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@75619 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index accf8aa..74ed237 100644
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,18 @@
+2011-01-12 Koan-Sin Tan <koansin.tan at gmail.com>
+
+ Reviewed by Martin Robinson.
+
+ [Gtk] WebKitGtk+ doesn't build on Mac OS X 10.6
+ https://bugs.webkit.org/show_bug.cgi?id=50867
+
+ * config.h: Don't disallow ctype for (OS(DARWIN) && PLATFORM(GTK))
+ Many GTK+ related files include <libintl.h> or <glib/gi18n-lib.h>.
+ On Mac, <libintl.h> includes <xlocale.h>. <xclocale.h> includes
+ <xlocale/_ctype.h>, which uses isacii().
+ * platform/UUID.cpp:
+ (WebCore::createCanonicalUUIDString): For OS(DARWIN) && !PLATFORM(CF)
+ use the Chromium Linux UUID generation.
+
2011-01-12 Simon Fraser <simon.fraser at apple.com>
Reviewed by Eric Seidel.
diff --git a/Source/WebCore/config.h b/Source/WebCore/config.h
index 49eee8a..4d5c8fa 100644
--- a/Source/WebCore/config.h
+++ b/Source/WebCore/config.h
@@ -132,8 +132,10 @@
// this breaks compilation of <QFontDatabase>, at least, so turn it off for now
// Also generates errors on wx on Windows, presumably because these functions
-// are used from wx headers.
-#if !PLATFORM(QT) && !PLATFORM(WX) && !PLATFORM(CHROMIUM)
+// are used from wx headers. On GTK+ for Mac many GTK+ files include <libintl.h>
+// or <glib/gi18n-lib.h>, which in turn include <xlocale/_ctype.h> which uses
+// isacii().
+#if !PLATFORM(QT) && !PLATFORM(WX) && !PLATFORM(CHROMIUM) && !(OS(DARWIN) && PLATFORM(GTK))
#include <wtf/DisallowCType.h>
#endif
diff --git a/Source/WebCore/platform/UUID.cpp b/Source/WebCore/platform/UUID.cpp
index 5c2e076..c072f4a 100644
--- a/Source/WebCore/platform/UUID.cpp
+++ b/Source/WebCore/platform/UUID.cpp
@@ -39,11 +39,11 @@
#if OS(WINDOWS)
#include <objbase.h>
-#elif OS(DARWIN)
+#elif OS(DARWIN) && PLATFORM(CF)
#include <CoreFoundation/CoreFoundation.h>
#elif OS(LINUX) && !PLATFORM(CHROMIUM)
#include <stdio.h>
-#elif OS(LINUX) && PLATFORM(CHROMIUM)
+#elif (OS(LINUX) && PLATFORM(CHROMIUM)) || (OS(DARWIN) && !PLATFORM(CF))
#include <wtf/RandomNumber.h>
#include <wtf/text/StringBuilder.h>
#endif
@@ -71,7 +71,7 @@ String createCanonicalUUIDString()
String canonicalUuidStr = String(uuidStr + 1, num - 3).lower(); // remove opening and closing bracket and make it lower.
ASSERT(canonicalUuidStr[uuidVersionIdentifierIndex] == uuidVersionRequired);
return canonicalUuidStr;
-#elif OS(DARWIN)
+#elif OS(DARWIN) && PLATFORM(CF)
CFUUIDRef uuid = CFUUIDCreate(0);
CFStringRef uuidStrRef = CFUUIDCreateString(0, uuid);
String uuidStr(uuidStrRef);
@@ -93,7 +93,7 @@ String createCanonicalUUIDString()
String canonicalUuidStr = String(uuidStr).lower(); // make it lower.
ASSERT(canonicalUuidStr[uuidVersionIdentifierIndex] == uuidVersionRequired);
return canonicalUuidStr;
-#elif OS(LINUX) && PLATFORM(CHROMIUM)
+#elif (OS(LINUX) && PLATFORM(CHROMIUM)) || (OS(DARWIN) && !PLATFORM(CF))
unsigned randomData[4];
for (size_t i = 0; i < WTF_ARRAY_LENGTH(randomData); ++i)
randomData[i] = static_cast<unsigned>(randomNumber() * (std::numeric_limits<unsigned>::max() + 1.0));
diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index 8f8a6a8..c41743b 100644
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,16 @@
+2011-01-12 Koan-Sin Tan <koansin.tan at gmail.com>
+
+ Reviewed by Martin Robinson.
+
+ [Gtk] WebKitGtk+ doesn't build on Mac OS X 10.6
+ https://bugs.webkit.org/show_bug.cgi?id=50867
+
+ Fixed library extention for Mac in webkitdirs.pm and type conflict in
+ TestNetscapePlugin.cpp
+
+ * GNUmakefile.am: Don't use AppKit when compiling TestNetscapePlugin for GTK+
+ * Scripts/webkitdirs.pm:
+
2011-01-12 Mikhail Naganov <mnaganov at chromium.org>
Reviewed by Pavel Feldman.
diff --git a/Tools/GNUmakefile.am b/Tools/GNUmakefile.am
index 4813346..ebbafac 100644
--- a/Tools/GNUmakefile.am
+++ b/Tools/GNUmakefile.am
@@ -162,6 +162,11 @@ TestNetscapePlugin_libtestnetscapeplugin_la_CPPFLAGS = \
$(global_cppflags) \
$(javascriptcore_cppflags)
+# For the Gtk port we want to use XP_UNIX both on X11 and Mac
+if !TARGET_WIN32
+TestNetscapePlugin_libtestnetscapeplugin_la_CPPFLAGS += -DXP_UNIX
+endif
+
TestNetscapePlugin_libtestnetscapeplugin_la_SOURCES = \
Tools/DumpRenderTree/unix/TestNetscapePlugin/ForwardingHeaders/WebKit/npapi.h \
Tools/DumpRenderTree/unix/TestNetscapePlugin/ForwardingHeaders/WebKit/npfunctions.h \
diff --git a/Tools/Scripts/webkitdirs.pm b/Tools/Scripts/webkitdirs.pm
index 2525dd7..a1b758c 100644
--- a/Tools/Scripts/webkitdirs.pm
+++ b/Tools/Scripts/webkitdirs.pm
@@ -603,10 +603,11 @@ sub builtDylibPathForName
}
if (isGtk()) {
my $libraryDir = "$configurationProductDir/.libs/";
- if (-e $libraryDir . "libwebkitgtk-3.0.so") {
- return $libraryDir . "libwebkitgtk-3.0.so";
+ my $extension = isDarwin() ? "dylib" : "so";
+ if (-e $libraryDir . "libwebkitgtk-3.0.$extension") {
+ return $libraryDir . "libwebkitgtk-3.0.$extension";
}
- return $libraryDir . "libwebkitgtk-1.0.so";
+ return $libraryDir . "libwebkitgtk-1.0.$extension";
}
if (isEfl()) {
return "$configurationProductDir/$libraryName/../.libs/libewebkit.so";
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list