webkitgtk: Update patchset
This commit is contained in:
Alexpux
@@ -0,0 +1,355 @@
|
||||
From 62818a59067464897b974b64f4eec51caf771aba Mon Sep 17 00:00:00 2001
|
||||
From: "carlosgc@webkit.org"
|
||||
<carlosgc@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
|
||||
Date: Tue, 7 Apr 2015 09:23:10 +0000
|
||||
Subject: [PATCH] Unreviewed. Fix the build with newer GLib.
|
||||
|
||||
Source/WebCore:
|
||||
|
||||
Use WTF::GMutexLocker.
|
||||
|
||||
* platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp:
|
||||
(WebCore::MediaPlayerPrivateGStreamerBase::updateTexture):
|
||||
(WebCore::MediaPlayerPrivateGStreamerBase::triggerRepaint):
|
||||
(WebCore::MediaPlayerPrivateGStreamerBase::paint):
|
||||
* platform/graphics/gstreamer/VideoSinkGStreamer.cpp:
|
||||
(webkitVideoSinkTimeoutCallback):
|
||||
(webkitVideoSinkRender):
|
||||
(unlockBufferMutex):
|
||||
(webkitVideoSinkUnlockStop):
|
||||
(webkitVideoSinkStart):
|
||||
* platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp:
|
||||
(webKitWebSrcSetProperty):
|
||||
(webKitWebSrcGetProperty):
|
||||
(webKitWebSrcStop):
|
||||
(webKitWebSrcStart):
|
||||
(webKitWebSrcChangeState):
|
||||
(webKitWebSrcQueryWithParent):
|
||||
(webKitWebSrcGetUri):
|
||||
(webKitWebSrcSetUri):
|
||||
(webKitWebSrcNeedDataMainCb):
|
||||
(webKitWebSrcNeedDataCb):
|
||||
(webKitWebSrcEnoughDataMainCb):
|
||||
(webKitWebSrcEnoughDataCb):
|
||||
(webKitWebSrcSeekMainCb):
|
||||
(webKitWebSrcSeekDataCb):
|
||||
(webKitWebSrcSetMediaPlayer):
|
||||
(StreamingClient::createReadBuffer):
|
||||
(StreamingClient::handleResponseReceived):
|
||||
(StreamingClient::handleDataReceived):
|
||||
(StreamingClient::handleNotifyFinished):
|
||||
(ResourceHandleStreamingClient::wasBlocked):
|
||||
(ResourceHandleStreamingClient::cannotShowURL):
|
||||
|
||||
Source/WTF:
|
||||
|
||||
* wtf/gobject/GMutexLocker.h: Move to the WTF namespace.
|
||||
|
||||
git-svn-id: http://svn.webkit.org/repository/webkit/releases/WebKitGTK/webkit-2.4@182456 268f45cc-cd09-0410-ab3c-d52691b4dbfc
|
||||
---
|
||||
Source/WTF/ChangeLog | 6 +++
|
||||
Source/WTF/wtf/gobject/GMutexLocker.h | 2 +-
|
||||
Source/WebCore/ChangeLog | 39 +++++++++++++++++++
|
||||
.../gstreamer/MediaPlayerPrivateGStreamerBase.cpp | 6 +--
|
||||
.../graphics/gstreamer/VideoSinkGStreamer.cpp | 10 ++---
|
||||
.../gstreamer/WebKitWebSourceGStreamer.cpp | 44 +++++++++++-----------
|
||||
6 files changed, 76 insertions(+), 31 deletions(-)
|
||||
|
||||
diff --git a/Source/WTF/wtf/gobject/GMutexLocker.h b/Source/WTF/wtf/gobject/GMutexLocker.h
|
||||
index bf7864a..87b4063 100644
|
||||
--- a/Source/WTF/wtf/gobject/GMutexLocker.h
|
||||
+++ b/Source/WTF/wtf/gobject/GMutexLocker.h
|
||||
@@ -27,7 +27,7 @@
|
||||
#include <wtf/FastMalloc.h>
|
||||
#include <wtf/Noncopyable.h>
|
||||
|
||||
-namespace WebCore {
|
||||
+namespace WTF {
|
||||
|
||||
class GMutexLocker {
|
||||
WTF_MAKE_NONCOPYABLE(GMutexLocker); WTF_MAKE_FAST_ALLOCATED;
|
||||
diff --git a/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp b/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp
|
||||
index b6069b9..c656473 100644
|
||||
--- a/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp
|
||||
+++ b/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp
|
||||
@@ -316,7 +316,7 @@ void MediaPlayerPrivateGStreamerBase::muteChanged()
|
||||
#if USE(ACCELERATED_COMPOSITING) && USE(TEXTURE_MAPPER_GL) && !USE(COORDINATED_GRAPHICS)
|
||||
PassRefPtr<BitmapTexture> MediaPlayerPrivateGStreamerBase::updateTexture(TextureMapper* textureMapper)
|
||||
{
|
||||
- GMutexLocker lock(m_bufferMutex);
|
||||
+ WTF::GMutexLocker lock(m_bufferMutex);
|
||||
if (!m_buffer)
|
||||
return nullptr;
|
||||
|
||||
@@ -366,7 +366,7 @@ void MediaPlayerPrivateGStreamerBase::triggerRepaint(GstBuffer* buffer)
|
||||
g_return_if_fail(GST_IS_BUFFER(buffer));
|
||||
|
||||
{
|
||||
- GMutexLocker lock(m_bufferMutex);
|
||||
+ WTF::GMutexLocker lock(m_bufferMutex);
|
||||
gst_buffer_replace(&m_buffer, buffer);
|
||||
}
|
||||
|
||||
@@ -398,7 +398,7 @@ void MediaPlayerPrivateGStreamerBase::paint(GraphicsContext* context, const IntR
|
||||
if (!m_player->visible())
|
||||
return;
|
||||
|
||||
- GMutexLocker lock(m_bufferMutex);
|
||||
+ WTF::GMutexLocker lock(m_bufferMutex);
|
||||
if (!m_buffer)
|
||||
return;
|
||||
|
||||
diff --git a/Source/WebCore/platform/graphics/gstreamer/VideoSinkGStreamer.cpp b/Source/WebCore/platform/graphics/gstreamer/VideoSinkGStreamer.cpp
|
||||
index 651c7f4..7dd894e 100644
|
||||
--- a/Source/WebCore/platform/graphics/gstreamer/VideoSinkGStreamer.cpp
|
||||
+++ b/Source/WebCore/platform/graphics/gstreamer/VideoSinkGStreamer.cpp
|
||||
@@ -118,7 +118,7 @@ static gboolean webkitVideoSinkTimeoutCallback(gpointer data)
|
||||
WebKitVideoSink* sink = reinterpret_cast<WebKitVideoSink*>(data);
|
||||
WebKitVideoSinkPrivate* priv = sink->priv;
|
||||
|
||||
- GMutexLocker lock(priv->bufferMutex);
|
||||
+ WTF::GMutexLocker lock(priv->bufferMutex);
|
||||
GstBuffer* buffer = priv->buffer;
|
||||
priv->buffer = 0;
|
||||
priv->timeoutId = 0;
|
||||
@@ -140,7 +140,7 @@ static GstFlowReturn webkitVideoSinkRender(GstBaseSink* baseSink, GstBuffer* buf
|
||||
WebKitVideoSink* sink = WEBKIT_VIDEO_SINK(baseSink);
|
||||
WebKitVideoSinkPrivate* priv = sink->priv;
|
||||
|
||||
- GMutexLocker lock(priv->bufferMutex);
|
||||
+ WTF::GMutexLocker lock(priv->bufferMutex);
|
||||
|
||||
if (priv->unlocked)
|
||||
return GST_FLOW_OK;
|
||||
@@ -279,7 +279,7 @@ static void webkitVideoSinkGetProperty(GObject* object, guint propertyId, GValue
|
||||
|
||||
static void unlockBufferMutex(WebKitVideoSinkPrivate* priv)
|
||||
{
|
||||
- GMutexLocker lock(priv->bufferMutex);
|
||||
+ WTF::GMutexLocker lock(priv->bufferMutex);
|
||||
|
||||
if (priv->buffer) {
|
||||
gst_buffer_unref(priv->buffer);
|
||||
@@ -305,7 +305,7 @@ static gboolean webkitVideoSinkUnlockStop(GstBaseSink* baseSink)
|
||||
WebKitVideoSinkPrivate* priv = WEBKIT_VIDEO_SINK(baseSink)->priv;
|
||||
|
||||
{
|
||||
- GMutexLocker lock(priv->bufferMutex);
|
||||
+ WTF::GMutexLocker lock(priv->bufferMutex);
|
||||
priv->unlocked = false;
|
||||
}
|
||||
|
||||
@@ -330,7 +330,7 @@ static gboolean webkitVideoSinkStart(GstBaseSink* baseSink)
|
||||
{
|
||||
WebKitVideoSinkPrivate* priv = WEBKIT_VIDEO_SINK(baseSink)->priv;
|
||||
|
||||
- GMutexLocker lock(priv->bufferMutex);
|
||||
+ WTF::GMutexLocker lock(priv->bufferMutex);
|
||||
priv->unlocked = false;
|
||||
return TRUE;
|
||||
}
|
||||
diff --git a/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp b/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp
|
||||
index ab9b3f5..c7d8eca 100644
|
||||
--- a/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp
|
||||
+++ b/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp
|
||||
@@ -346,7 +346,7 @@ static void webKitWebSrcSetProperty(GObject* object, guint propID, const GValue*
|
||||
|
||||
switch (propID) {
|
||||
case PROP_IRADIO_MODE: {
|
||||
- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
|
||||
+ WTF::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
|
||||
priv->iradioMode = g_value_get_boolean(value);
|
||||
break;
|
||||
}
|
||||
@@ -364,7 +364,7 @@ static void webKitWebSrcGetProperty(GObject* object, guint propID, GValue* value
|
||||
WebKitWebSrc* src = WEBKIT_WEB_SRC(object);
|
||||
WebKitWebSrcPrivate* priv = src->priv;
|
||||
|
||||
- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
|
||||
+ WTF::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
|
||||
switch (propID) {
|
||||
case PROP_IRADIO_MODE:
|
||||
g_value_set_boolean(value, priv->iradioMode);
|
||||
@@ -417,7 +417,7 @@ static gboolean webKitWebSrcStop(WebKitWebSrc* src)
|
||||
|
||||
ASSERT(isMainThread());
|
||||
|
||||
- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
|
||||
+ WTF::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
|
||||
|
||||
bool seeking = priv->seekID;
|
||||
|
||||
@@ -476,7 +476,7 @@ static gboolean webKitWebSrcStart(WebKitWebSrc* src)
|
||||
|
||||
ASSERT(isMainThread());
|
||||
|
||||
- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
|
||||
+ WTF::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
|
||||
|
||||
priv->startID = 0;
|
||||
priv->corsAccessCheck = CORSNoCheck;
|
||||
@@ -573,7 +573,7 @@ static GstStateChangeReturn webKitWebSrcChangeState(GstElement* element, GstStat
|
||||
return ret;
|
||||
}
|
||||
|
||||
- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
|
||||
+ WTF::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
|
||||
switch (transition) {
|
||||
case GST_STATE_CHANGE_READY_TO_PAUSED:
|
||||
GST_DEBUG_OBJECT(src, "READY->PAUSED");
|
||||
@@ -604,7 +604,7 @@ static gboolean webKitWebSrcQueryWithParent(GstPad* pad, GstObject* parent, GstQ
|
||||
gst_query_parse_duration(query, &format, NULL);
|
||||
|
||||
GST_DEBUG_OBJECT(src, "duration query in format %s", gst_format_get_name(format));
|
||||
- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
|
||||
+ WTF::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
|
||||
if (format == GST_FORMAT_BYTES && src->priv->size > 0) {
|
||||
gst_query_set_duration(query, format, src->priv->size);
|
||||
result = TRUE;
|
||||
@@ -612,7 +612,7 @@ static gboolean webKitWebSrcQueryWithParent(GstPad* pad, GstObject* parent, GstQ
|
||||
break;
|
||||
}
|
||||
case GST_QUERY_URI: {
|
||||
- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
|
||||
+ WTF::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
|
||||
gst_query_set_uri(query, src->priv->uri);
|
||||
result = TRUE;
|
||||
break;
|
||||
@@ -653,7 +653,7 @@ static gchar* webKitWebSrcGetUri(GstURIHandler* handler)
|
||||
WebKitWebSrc* src = WEBKIT_WEB_SRC(handler);
|
||||
gchar* ret;
|
||||
|
||||
- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
|
||||
+ WTF::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
|
||||
ret = g_strdup(src->priv->uri);
|
||||
return ret;
|
||||
}
|
||||
@@ -668,7 +668,7 @@ static gboolean webKitWebSrcSetUri(GstURIHandler* handler, const gchar* uri, GEr
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
|
||||
+ WTF::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
|
||||
|
||||
g_free(priv->uri);
|
||||
priv->uri = 0;
|
||||
@@ -704,7 +704,7 @@ static gboolean webKitWebSrcNeedDataMainCb(WebKitWebSrc* src)
|
||||
|
||||
ASSERT(isMainThread());
|
||||
|
||||
- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
|
||||
+ WTF::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
|
||||
// already stopped
|
||||
if (!priv->needDataID)
|
||||
return FALSE;
|
||||
@@ -725,7 +725,7 @@ static void webKitWebSrcNeedDataCb(GstAppSrc*, guint length, gpointer userData)
|
||||
|
||||
GST_DEBUG_OBJECT(src, "Need more data: %u", length);
|
||||
|
||||
- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
|
||||
+ WTF::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
|
||||
if (priv->needDataID || !priv->paused) {
|
||||
return;
|
||||
}
|
||||
@@ -739,7 +739,7 @@ static gboolean webKitWebSrcEnoughDataMainCb(WebKitWebSrc* src)
|
||||
|
||||
ASSERT(isMainThread());
|
||||
|
||||
- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
|
||||
+ WTF::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
|
||||
// already stopped
|
||||
if (!priv->enoughDataID)
|
||||
return FALSE;
|
||||
@@ -760,7 +760,7 @@ static void webKitWebSrcEnoughDataCb(GstAppSrc*, gpointer userData)
|
||||
|
||||
GST_DEBUG_OBJECT(src, "Have enough data");
|
||||
|
||||
- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
|
||||
+ WTF::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
|
||||
if (priv->enoughDataID || priv->paused) {
|
||||
return;
|
||||
}
|
||||
@@ -774,7 +774,7 @@ static gboolean webKitWebSrcSeekMainCb(WebKitWebSrc* src)
|
||||
|
||||
ASSERT(isMainThread());
|
||||
|
||||
- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
|
||||
+ WTF::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
|
||||
// already stopped
|
||||
if (!priv->seekID)
|
||||
return FALSE;
|
||||
@@ -792,7 +792,7 @@ static gboolean webKitWebSrcSeekDataCb(GstAppSrc*, guint64 offset, gpointer user
|
||||
WebKitWebSrcPrivate* priv = src->priv;
|
||||
|
||||
GST_DEBUG_OBJECT(src, "Seeking to offset: %" G_GUINT64_FORMAT, offset);
|
||||
- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
|
||||
+ WTF::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
|
||||
if (offset == priv->offset && priv->requestedOffset == priv->offset)
|
||||
return TRUE;
|
||||
|
||||
@@ -811,7 +811,7 @@ static gboolean webKitWebSrcSeekDataCb(GstAppSrc*, guint64 offset, gpointer user
|
||||
void webKitWebSrcSetMediaPlayer(WebKitWebSrc* src, WebCore::MediaPlayer* player)
|
||||
{
|
||||
ASSERT(player);
|
||||
- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
|
||||
+ WTF::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
|
||||
src->priv->player = player;
|
||||
}
|
||||
|
||||
@@ -841,7 +841,7 @@ char* StreamingClient::createReadBuffer(size_t requestedSize, size_t& actualSize
|
||||
|
||||
mapGstBuffer(buffer);
|
||||
|
||||
- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
|
||||
+ WTF::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
|
||||
priv->buffer = adoptGRef(buffer);
|
||||
locker.unlock();
|
||||
|
||||
@@ -867,7 +867,7 @@ void StreamingClient::handleResponseReceived(const ResourceResponse& response, C
|
||||
return;
|
||||
}
|
||||
|
||||
- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
|
||||
+ WTF::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
|
||||
|
||||
priv->corsAccessCheck = corsAccessCheck;
|
||||
|
||||
@@ -966,7 +966,7 @@ void StreamingClient::handleDataReceived(const char* data, int length)
|
||||
WebKitWebSrc* src = WEBKIT_WEB_SRC(m_src);
|
||||
WebKitWebSrcPrivate* priv = src->priv;
|
||||
|
||||
- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
|
||||
+ WTF::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
|
||||
|
||||
GST_LOG_OBJECT(src, "Have %lld bytes of data", priv->buffer ? static_cast<long long>(gst_buffer_get_size(priv->buffer.get())) : length);
|
||||
|
||||
@@ -1035,7 +1035,7 @@ void StreamingClient::handleNotifyFinished()
|
||||
|
||||
GST_DEBUG_OBJECT(src, "Have EOS");
|
||||
|
||||
- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
|
||||
+ WTF::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
|
||||
if (!priv->seekID) {
|
||||
locker.unlock();
|
||||
gst_app_src_end_of_stream(priv->appsrc);
|
||||
@@ -1194,7 +1194,7 @@ void ResourceHandleStreamingClient::wasBlocked(ResourceHandle*)
|
||||
|
||||
GST_ERROR_OBJECT(src, "Request was blocked");
|
||||
|
||||
- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
|
||||
+ WTF::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
|
||||
uri.reset(g_strdup(src->priv->uri));
|
||||
locker.unlock();
|
||||
|
||||
@@ -1208,7 +1208,7 @@ void ResourceHandleStreamingClient::cannotShowURL(ResourceHandle*)
|
||||
|
||||
GST_ERROR_OBJECT(src, "Cannot show URL");
|
||||
|
||||
- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
|
||||
+ WTF::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
|
||||
uri.reset(g_strdup(src->priv->uri));
|
||||
locker.unlock();
|
||||
|
||||
--
|
||||
1.8.5.3
|
||||
|
||||
@@ -0,0 +1,30 @@
|
||||
From 2da1ce15dfc85cfbd390b4cfb9350a13a6b47003 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?=D0=A0=D1=83=D1=81=D0=BB=D0=B0=D0=BD=20=D0=98=D0=B6=D0=B1?=
|
||||
=?UTF-8?q?=D1=83=D0=BB=D0=B0=D1=82=D0=BE=D0=B2?= <lrn1986@gmail.com>
|
||||
Date: Mon, 13 Apr 2015 00:29:21 +0000
|
||||
Subject: [PATCH 01/20] [GTK][W32] Don't include non-existing
|
||||
WTF/WTFHeaderDetection.h in 2.4.x
|
||||
|
||||
WTF/WTFHeaderDetection.h seems to be from some other universe,
|
||||
there are no rules to generate it in webkit-2.4, except for MSVS projects.
|
||||
---
|
||||
Source/WTF/wtf/Platform.h | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/Source/WTF/wtf/Platform.h b/Source/WTF/wtf/Platform.h
|
||||
index d918b43..2ebdeea 100644
|
||||
--- a/Source/WTF/wtf/Platform.h
|
||||
+++ b/Source/WTF/wtf/Platform.h
|
||||
@@ -611,7 +611,9 @@
|
||||
#define HAVE_ALIGNED_MALLOC 1
|
||||
#define HAVE_ISDEBUGGERPRESENT 1
|
||||
|
||||
+#ifdef _MSC_VER
|
||||
#include <WTF/WTFHeaderDetection.h>
|
||||
+#endif
|
||||
|
||||
#endif
|
||||
|
||||
--
|
||||
1.8.5.3
|
||||
|
||||
@@ -1,11 +0,0 @@
|
||||
--- webkitgtk-2.4.8/Source/WTF/wtf/Platform.h.orig 2015-03-24 06:06:58.439159200 +0000
|
||||
+++ webkitgtk-2.4.8/Source/WTF/wtf/Platform.h 2015-03-24 06:10:16.432801200 +0000
|
||||
@@ -608,8 +608,6 @@
|
||||
#define HAVE_ALIGNED_MALLOC 1
|
||||
#define HAVE_ISDEBUGGERPRESENT 1
|
||||
|
||||
-#include <WTF/WTFHeaderDetection.h>
|
||||
-
|
||||
#endif
|
||||
|
||||
#if OS(WINDOWS)
|
||||
@@ -0,0 +1,28 @@
|
||||
From b9e96a5642c2e5137fae4a096723c403285e1ef2 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?=D0=A0=D1=83=D1=81=D0=BB=D0=B0=D0=BD=20=D0=98=D0=B6=D0=B1?=
|
||||
=?UTF-8?q?=D1=83=D0=BB=D0=B0=D1=82=D0=BE=D0=B2?= <lrn1986@gmail.com>
|
||||
Date: Mon, 13 Apr 2015 00:46:48 +0000
|
||||
Subject: [PATCH 02/20] [GTK][W32] Allow MinGW-GCC to use GCC asm code for
|
||||
weakCompareAndSwap
|
||||
|
||||
OS(WINDOWS) != COMPILER(MSVC)
|
||||
---
|
||||
Source/WTF/wtf/Atomics.h | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/Source/WTF/wtf/Atomics.h b/Source/WTF/wtf/Atomics.h
|
||||
index 3d18e3e..e6da897 100644
|
||||
--- a/Source/WTF/wtf/Atomics.h
|
||||
+++ b/Source/WTF/wtf/Atomics.h
|
||||
@@ -260,7 +260,7 @@ inline void memoryBarrierBeforeUnlock() { compilerFence(); }
|
||||
inline bool weakCompareAndSwap(uint8_t* location, uint8_t expected, uint8_t newValue)
|
||||
{
|
||||
#if ENABLE(COMPARE_AND_SWAP)
|
||||
-#if !OS(WINDOWS) && (CPU(X86) || CPU(X86_64))
|
||||
+#if (!OS(WINDOWS) || COMPILER(GCC)) && (CPU(X86) || CPU(X86_64))
|
||||
unsigned char result;
|
||||
asm volatile(
|
||||
"lock; cmpxchgb %3, %2\n\t"
|
||||
--
|
||||
1.8.5.3
|
||||
|
||||
@@ -1,11 +0,0 @@
|
||||
--- webkitgtk-2.2.3/Source/WTF/wtf/Atomics.h.orig 2013-12-04 19:49:26.788630335 +0100
|
||||
+++ webkitgtk-2.2.3/Source/WTF/wtf/Atomics.h 2013-12-04 19:50:17.217126505 +0100
|
||||
@@ -278,7 +278,7 @@
|
||||
inline bool weakCompareAndSwap(uint8_t* location, uint8_t expected, uint8_t newValue)
|
||||
{
|
||||
#if ENABLE(COMPARE_AND_SWAP)
|
||||
-#if !OS(WINDOWS) && (CPU(X86) || CPU(X86_64))
|
||||
+#if (!OS(WINDOWS) || COMPILER(GCC)) && (CPU(X86) || CPU(X86_64))
|
||||
unsigned char result;
|
||||
asm volatile(
|
||||
"lock; cmpxchgb %3, %2\n\t"
|
||||
@@ -0,0 +1,51 @@
|
||||
From b2deca683e0d57d9313c267d15c798f420ae3701 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?=D0=A0=D1=83=D1=81=D0=BB=D0=B0=D0=BD=20=D0=98=D0=B6=D0=B1?=
|
||||
=?UTF-8?q?=D1=83=D0=BB=D0=B0=D1=82=D0=BE=D0=B2?= <lrn1986@gmail.com>
|
||||
Date: Mon, 13 Apr 2015 02:03:42 +0000
|
||||
Subject: [PATCH 03/20] [W32] Use confgured Python interpreter
|
||||
|
||||
Configure script has tests for Python (AC_PATH_PROG(PYTHON, python)),
|
||||
use the interpretor they provide (which is overridable by user by
|
||||
the way of passing PYTHON=... to configure) instead of the first
|
||||
thing found in PATH.
|
||||
|
||||
Otherwise wrong version of Python might be used. Mingw-python,
|
||||
for example, which has commandline length limit, which results in
|
||||
errors like:
|
||||
/usr/bin/env: python: Argument list too long
|
||||
GNUmakefile:82317: recipe for target
|
||||
'DerivedSources/WebInspectorUI/GResourceBundle.xml' failed
|
||||
---
|
||||
Source/WebInspectorUI/GNUmakefile.am | 2 +-
|
||||
Tools/gtk/GNUmakefile.am | 2 +-
|
||||
2 files changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/Source/WebInspectorUI/GNUmakefile.am b/Source/WebInspectorUI/GNUmakefile.am
|
||||
index 67b2477..25cdc41 100644
|
||||
--- a/Source/WebInspectorUI/GNUmakefile.am
|
||||
+++ b/Source/WebInspectorUI/GNUmakefile.am
|
||||
@@ -13,7 +13,7 @@ ${GENSOURCES_WEBINSPECTOR_UI}/GResourceBundle.xml: GNUmakefile \
|
||||
$(srcdir)/Tools/gtk/generate-inspector-gresource-manifest.py
|
||||
$(AM_V_GEN)
|
||||
$(AM_V_at)mkdir -p ${GENSOURCES_WEBINSPECTOR_UI}
|
||||
- $(AM_V_at)$(srcdir)/Tools/gtk/generate-inspector-gresource-manifest.py --output $@ $(inspector_files)
|
||||
+ $(AM_V_at)$(PYTHON) $(srcdir)/Tools/gtk/generate-inspector-gresource-manifest.py --output $@ $(inspector_files)
|
||||
|
||||
${GENSOURCES_WEBINSPECTOR_UI}/GResourceBundle.c: DerivedSources/WebInspectorUI/GResourceBundle.xml
|
||||
$(AM_V_GEN)
|
||||
diff --git a/Tools/gtk/GNUmakefile.am b/Tools/gtk/GNUmakefile.am
|
||||
index 757207a..61cff01 100644
|
||||
--- a/Tools/gtk/GNUmakefile.am
|
||||
+++ b/Tools/gtk/GNUmakefile.am
|
||||
@@ -35,7 +35,7 @@ docs_build_dependencies += \
|
||||
gtkdoc-webkitdom.cfg
|
||||
|
||||
docs-build.stamp: $(docs_build_dependencies)
|
||||
- CC=$(CC) $(srcdir)/Tools/gtk/generate-gtkdoc
|
||||
+ CC=$(CC) $(PYTHON) $(srcdir)/Tools/gtk/generate-gtkdoc
|
||||
@touch docs-build.stamp
|
||||
|
||||
clean-local: doc-clean-local
|
||||
--
|
||||
1.8.5.3
|
||||
|
||||
@@ -0,0 +1,67 @@
|
||||
From 30f8d9bcdaaa8298b04dc9f79e068b1efc9bc4fa Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?=D0=A0=D1=83=D1=81=D0=BB=D0=B0=D0=BD=20=D0=98=D0=B6=D0=B1?=
|
||||
=?UTF-8?q?=D1=83=D0=BB=D0=B0=D1=82=D0=BE=D0=B2?= <lrn1986@gmail.com>
|
||||
Date: Mon, 13 Apr 2015 02:35:07 +0000
|
||||
Subject: [PATCH 04/20] [GTK][W32] Harmonize binary semaphore ifdefs
|
||||
|
||||
They should be either OS(WINDOWS) (in which case we'd need
|
||||
BinarySemaphoreWin.cpp, which is not shipped by WebKitGTK)
|
||||
or PLATFORM(WIN) (in which case Mutex/ThreadCondition-based
|
||||
implementation is used).
|
||||
|
||||
This fixes errors like:
|
||||
CXX Source/WTF/wtf/threads/libWTF_la-BinarySemaphore.lo
|
||||
../webkitgtk-2.4.8/Source/WTF/wtf/threads/BinarySemaphore.cpp: In constructor 'WTF::BinarySemaphore::BinarySemaphore()':
|
||||
../webkitgtk-2.4.8/Source/WTF/wtf/threads/BinarySemaphore.cpp:34:7: error: class 'WTF::BinarySemaphore' does not have any field named 'm_isSet'
|
||||
: m_isSet(false)
|
||||
^
|
||||
../webkitgtk-2.4.8/Source/WTF/wtf/threads/BinarySemaphore.cpp: In member function 'void WTF::BinarySemaphore::signal()':
|
||||
../webkitgtk-2.4.8/Source/WTF/wtf/threads/BinarySemaphore.cpp:44:24: error: 'm_mutex' was not declared in this scope
|
||||
MutexLocker locker(m_mutex);
|
||||
^
|
||||
../webkitgtk-2.4.8/Source/WTF/wtf/threads/BinarySemaphore.cpp:46:5: error: 'm_isSet' was not declared in this scope
|
||||
m_isSet = true;
|
||||
^
|
||||
../webkitgtk-2.4.8/Source/WTF/wtf/threads/BinarySemaphore.cpp:47:5: error: 'm_condition' was not declared in this scope
|
||||
m_condition.signal();
|
||||
^
|
||||
../webkitgtk-2.4.8/Source/WTF/wtf/threads/BinarySemaphore.cpp: In member function 'bool WTF::BinarySemaphore::wait(double)':
|
||||
../webkitgtk-2.4.8/Source/WTF/wtf/threads/BinarySemaphore.cpp:52:24: error: 'm_mutex' was not declared in this scope
|
||||
MutexLocker locker(m_mutex);
|
||||
^
|
||||
../webkitgtk-2.4.8/Source/WTF/wtf/threads/BinarySemaphore.cpp:55:13: error: 'm_isSet' was not declared in this scope
|
||||
while (!m_isSet) {
|
||||
^
|
||||
../webkitgtk-2.4.8/Source/WTF/wtf/threads/BinarySemaphore.cpp:56:21: error: 'm_condition' was not declared in this scope
|
||||
timedOut = !m_condition.timedWait(m_mutex, absoluteTime);
|
||||
^
|
||||
../webkitgtk-2.4.8/Source/WTF/wtf/threads/BinarySemaphore.cpp:62:5: error: 'm_isSet' was not declared in this scope
|
||||
m_isSet = false;
|
||||
^
|
||||
GNUmakefile:52762: recipe for target 'Source/WTF/wtf/threads/libWTF_la-BinarySemaphore.lo' failed
|
||||
---
|
||||
Source/WTF/wtf/threads/BinarySemaphore.h | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/Source/WTF/wtf/threads/BinarySemaphore.h b/Source/WTF/wtf/threads/BinarySemaphore.h
|
||||
index de51d47..cae1023 100644
|
||||
--- a/Source/WTF/wtf/threads/BinarySemaphore.h
|
||||
+++ b/Source/WTF/wtf/threads/BinarySemaphore.h
|
||||
@@ -41,12 +41,12 @@ public:
|
||||
WTF_EXPORT_PRIVATE void signal();
|
||||
WTF_EXPORT_PRIVATE bool wait(double absoluteTime);
|
||||
|
||||
-#if OS(WINDOWS)
|
||||
+#if PLATFORM(WIN)
|
||||
HANDLE event() const { return m_event; }
|
||||
#endif
|
||||
|
||||
private:
|
||||
-#if OS(WINDOWS)
|
||||
+#if PLATFORM(WIN)
|
||||
HANDLE m_event;
|
||||
#else
|
||||
bool m_isSet;
|
||||
--
|
||||
1.8.5.3
|
||||
|
||||
@@ -1,5 +1,27 @@
|
||||
--- webkitgtk-2.4.1.old/Source/JavaScriptCore/jit/JITStubsX86.h 2014-06-20 20:05:59 +0000
|
||||
+++ webkitgtk-2.4.1/Source/JavaScriptCore/jit/JITStubsX86.h 2014-06-20 19:42:30 +0000
|
||||
From 1a2a777aad7d67d2e8e53ca97453eb3d1fd209f9 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?=D0=A0=D1=83=D1=81=D0=BB=D0=B0=D0=BD=20=D0=98=D0=B6=D0=B1?=
|
||||
=?UTF-8?q?=D1=83=D0=BB=D0=B0=D1=82=D0=BE=D0=B2?= <lrn1986@gmail.com>
|
||||
Date: Mon, 13 Apr 2015 07:17:38 +0000
|
||||
Subject: [PATCH 05/20] Add missing gcc asm code for JIT
|
||||
|
||||
Fixes linking errors like these:
|
||||
CXXLD libjavascriptcoregtk-3.0.la
|
||||
Source\\JavaScriptCore\\interpreter\\.libs\\libjavascriptcoregtk_3_0_la-Interpreter.o: In function `executeCall':
|
||||
/webkitgtk-2.4.8-1/bld/../webkitgtk-2.4.8/Source/JavaScriptCore/interpreter/Interpreter.cpp:972: undefined reference to `_callToNativeFunction'
|
||||
Source\\JavaScriptCore\\interpreter\\.libs\\libjavascriptcoregtk_3_0_la-Interpreter.o: In function `executeConstruct':
|
||||
/webkitgtk-2.4.8-1/bld/../webkitgtk-2.4.8/Source/JavaScriptCore/interpreter/Interpreter.cpp:1040: undefined reference to `_callToNativeFunction'
|
||||
Source\\JavaScriptCore\\jit\\.libs\\libjavascriptcoregtk_3_0_la-JITCode.o: In function `execute':
|
||||
/webkitgtk-2.4.8-1/bld/../webkitgtk-2.4.8/Source/JavaScriptCore/jit/JITCode.cpp:48: undefined reference to `_callToJavaScript'
|
||||
Source\\JavaScriptCore\\jit\\.libs\\libjavascriptcoregtk_3_0_la-JITExceptions.o: In function `genericUnwind':
|
||||
/webkitgtk-2.4.8-1/bld/../webkitgtk-2.4.8/Source/JavaScriptCore/jit/JITExceptions.cpp:62: undefined reference to `_returnFromJavaScript'
|
||||
---
|
||||
Source/JavaScriptCore/jit/JITStubsX86.h | 220 ++++++++++++++++++++++++++++++++
|
||||
1 file changed, 220 insertions(+)
|
||||
|
||||
diff --git a/Source/JavaScriptCore/jit/JITStubsX86.h b/Source/JavaScriptCore/jit/JITStubsX86.h
|
||||
index a1fbdef..d18f17d 100644
|
||||
--- a/Source/JavaScriptCore/jit/JITStubsX86.h
|
||||
+++ b/Source/JavaScriptCore/jit/JITStubsX86.h
|
||||
@@ -32,6 +32,7 @@
|
||||
#define JITStubsX86_h
|
||||
|
||||
@@ -8,7 +30,7 @@
|
||||
|
||||
#if !CPU(X86)
|
||||
#error "JITStubsX86.h should only be #included if CPU(X86)"
|
||||
@@ -198,6 +199,225 @@ SYMBOL_STRING(ctiMasmProbeTrampolineEnd)
|
||||
@@ -198,6 +199,225 @@ SYMBOL_STRING(ctiMasmProbeTrampolineEnd) ":" "\n"
|
||||
);
|
||||
#endif // USE(MASM_PROBE)
|
||||
|
||||
@@ -234,3 +256,6 @@
|
||||
#endif // COMPILER(GCC)
|
||||
|
||||
#if COMPILER(MSVC)
|
||||
--
|
||||
1.8.5.3
|
||||
|
||||
@@ -1,11 +0,0 @@
|
||||
--- webkitgtk-2.2.3/Source/WTF/wtf/threads/BinarySemaphore.cpp.orig 2013-12-04 20:08:56.016394944 +0100
|
||||
+++ webkitgtk-2.2.3/Source/WTF/wtf/threads/BinarySemaphore.cpp 2013-12-04 20:09:22.055655312 +0100
|
||||
@@ -26,7 +26,7 @@
|
||||
#include "config.h"
|
||||
#include "BinarySemaphore.h"
|
||||
|
||||
-#if !PLATFORM(WIN)
|
||||
+#if !OS(WINDOWS)
|
||||
|
||||
namespace WTF {
|
||||
|
||||
@@ -0,0 +1,34 @@
|
||||
From eff935cade14c1dc731a29b6a02f260f348f885e Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?=D0=A0=D1=83=D1=81=D0=BB=D0=B0=D0=BD=20=D0=98=D0=B6=D0=B1?=
|
||||
=?UTF-8?q?=D1=83=D0=BB=D0=B0=D1=82=D0=BE=D0=B2?= <lrn1986@gmail.com>
|
||||
Date: Mon, 13 Apr 2015 08:33:29 +0000
|
||||
Subject: [PATCH 06/20] Use piOverTwoDouble instead of M_PI_2
|
||||
|
||||
Because M_PI_2 is not defined everywhere.
|
||||
Fixes errors like:
|
||||
CXX Source/WebCore/platform/graphics/freetype/libPlatformGtk_la-FontPlatformDataFreeType.lo
|
||||
../webkitgtk-2.4.8/Source/WebCore/platform/graphics/freetype/FontPlatformDataFreeType.cpp: In function 'void WebCore::rotateCairoMatrixForVerticalOrientation(cairo_matrix_t*)':
|
||||
../webkitgtk-2.4.8/Source/WebCore/platform/graphics/freetype/FontPlatformDataFreeType.cpp:123:34: error: 'M_PI_2' was not declared in this scope
|
||||
cairo_matrix_rotate(matrix, -M_PI_2);
|
||||
^
|
||||
GNUmakefile:51663: recipe for target 'Source/WebCore/platform/graphics/freetype/libPlatformGtk_la-FontPlatformDataFreeType.lo' failed
|
||||
---
|
||||
Source/WebCore/platform/graphics/freetype/FontPlatformDataFreeType.cpp | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/Source/WebCore/platform/graphics/freetype/FontPlatformDataFreeType.cpp b/Source/WebCore/platform/graphics/freetype/FontPlatformDataFreeType.cpp
|
||||
index 0b6cdd1..7c4d853 100644
|
||||
--- a/Source/WebCore/platform/graphics/freetype/FontPlatformDataFreeType.cpp
|
||||
+++ b/Source/WebCore/platform/graphics/freetype/FontPlatformDataFreeType.cpp
|
||||
@@ -120,7 +120,7 @@ static void rotateCairoMatrixForVerticalOrientation(cairo_matrix_t* matrix)
|
||||
// combination of rotation (R) and translation (T) applied on the
|
||||
// horizontal matrix (H). V = H . R . T, where R rotates by -90 degrees
|
||||
// and T translates by font size towards y axis.
|
||||
- cairo_matrix_rotate(matrix, -M_PI_2);
|
||||
+ cairo_matrix_rotate(matrix, -piOverTwoDouble);
|
||||
cairo_matrix_translate(matrix, 0.0, 1.0);
|
||||
}
|
||||
|
||||
--
|
||||
1.8.5.3
|
||||
|
||||
@@ -0,0 +1,29 @@
|
||||
From 91625d8f6bde23b34fcb1c8fb8316e0b0f8d8b78 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?=D0=A0=D1=83=D1=81=D0=BB=D0=B0=D0=BD=20=D0=98=D0=B6=D0=B1?=
|
||||
=?UTF-8?q?=D1=83=D0=BB=D0=B0=D1=82=D0=BE=D0=B2?= <lrn1986@gmail.com>
|
||||
Date: Mon, 13 Apr 2015 08:43:58 +0000
|
||||
Subject: [PATCH 07/20] [GTK][W32] Add missing includes to FileSystemGtk
|
||||
|
||||
Needed for GetModuleHandleExA() & Co.
|
||||
---
|
||||
Source/WebCore/platform/gtk/FileSystemGtk.cpp | 4 ++++
|
||||
1 file changed, 4 insertions(+)
|
||||
|
||||
diff --git a/Source/WebCore/platform/gtk/FileSystemGtk.cpp b/Source/WebCore/platform/gtk/FileSystemGtk.cpp
|
||||
index 9ebeca5..e741d1c 100644
|
||||
--- a/Source/WebCore/platform/gtk/FileSystemGtk.cpp
|
||||
+++ b/Source/WebCore/platform/gtk/FileSystemGtk.cpp
|
||||
@@ -23,6 +23,10 @@
|
||||
#include "config.h"
|
||||
#include "FileSystem.h"
|
||||
|
||||
+#if OS(WINDOWS)
|
||||
+#include <windows.h>
|
||||
+#endif
|
||||
+
|
||||
#include "FileMetadata.h"
|
||||
#include "UUID.h"
|
||||
#include <gio/gio.h>
|
||||
--
|
||||
1.8.5.3
|
||||
|
||||
@@ -1,10 +0,0 @@
|
||||
--- webkitgtk-2.4.8/Source/Platform/GNUmakefile.am.orig 2015-03-24 06:13:32.994761400 +0000
|
||||
+++ webkitgtk-2.4.8/Source/Platform/GNUmakefile.am 2015-03-24 06:14:09.445890100 +0000
|
||||
@@ -58,6 +58,7 @@
|
||||
-I$(srcdir)/Source/WebCore/platform/network/soup \
|
||||
-I$(srcdir)/Source/WebCore/platform/text \
|
||||
-I$(srcdir)/Source/WebCore/platform/text/icu \
|
||||
+ -I$(srcdir)/Source/WebCore/platform/win \
|
||||
-I$(srcdir)/Source/WebCore/platform/text/transcoder
|
||||
|
||||
noinst_LTLIBRARIES += \
|
||||
@@ -0,0 +1,40 @@
|
||||
From a75ba28de22695c3b3bfb06c9564e4959b4e4cb7 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?=D0=A0=D1=83=D1=81=D0=BB=D0=B0=D0=BD=20=D0=98=D0=B6=D0=B1?=
|
||||
=?UTF-8?q?=D1=83=D0=BB=D0=B0=D1=82=D0=BE=D0=B2?= <lrn1986@gmail.com>
|
||||
Date: Mon, 13 Apr 2015 10:21:42 +0000
|
||||
Subject: [PATCH 08/20] [W32] Move enum LineLayoutPath in RenderBlock
|
||||
|
||||
This removes the bitfield interruption, allowing more efficient
|
||||
packing.
|
||||
Otherwise compile-time assertion fails:
|
||||
In file included from ../webkitgtk-2.4.8/Source/WTF/wtf/PossiblyNull.h:29:0,
|
||||
from ../webkitgtk-2.4.8/Source/WTF/wtf/FastMalloc.h:27,
|
||||
from ../webkitgtk-2.4.8/Source/WebCore/config.h:74,
|
||||
from ../webkitgtk-2.4.8/Source/WebCore/rendering/RenderBlock.cpp:24:
|
||||
../webkitgtk-2.4.8/Source/WTF/wtf/Assertions.h:326:35: error: static assertion failed: RenderBlock_should_stay_small
|
||||
#define COMPILE_ASSERT(exp, name) static_assert((exp), #name)
|
||||
^
|
||||
../webkitgtk-2.4.8/Source/WebCore/rendering/RenderBlock.cpp:88:1: note: in expansion of macro 'COMPILE_ASSERT'
|
||||
COMPILE_ASSERT(sizeof(RenderBlock) == sizeof(SameSizeAsRenderBlock), RenderBlock_should_stay_small);
|
||||
^
|
||||
---
|
||||
Source/WebCore/rendering/RenderBlock.h | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/Source/WebCore/rendering/RenderBlock.h b/Source/WebCore/rendering/RenderBlock.h
|
||||
index 5aa29e0..c29b078 100644
|
||||
--- a/Source/WebCore/rendering/RenderBlock.h
|
||||
+++ b/Source/WebCore/rendering/RenderBlock.h
|
||||
@@ -611,8 +611,8 @@ public:
|
||||
unsigned m_beingDestroyed : 1;
|
||||
unsigned m_hasMarkupTruncation : 1;
|
||||
unsigned m_hasBorderOrPaddingLogicalWidthChanged : 1;
|
||||
- enum LineLayoutPath { UndeterminedPath, SimpleLinesPath, LineBoxesPath, ForceLineBoxesPath };
|
||||
unsigned m_lineLayoutPath : 2;
|
||||
+ enum LineLayoutPath { UndeterminedPath, SimpleLinesPath, LineBoxesPath, ForceLineBoxesPath };
|
||||
|
||||
// RenderRubyBase objects need to be able to split and merge, moving their children around
|
||||
// (calling moveChildTo, moveAllChildrenTo, and makeChildrenNonInline).
|
||||
--
|
||||
1.8.5.3
|
||||
|
||||
@@ -0,0 +1,49 @@
|
||||
From 3af08080d48481b6e187bc3319ad900689d7147e Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?=D0=A0=D1=83=D1=81=D0=BB=D0=B0=D0=BD=20=D0=98=D0=B6=D0=B1?=
|
||||
=?UTF-8?q?=D1=83=D0=BB=D0=B0=D1=82=D0=BE=D0=B2?= <lrn1986@gmail.com>
|
||||
Date: Mon, 13 Apr 2015 12:11:47 +0000
|
||||
Subject: [PATCH 09/20] [W32] Fix deleteObject prototypte, fix header case
|
||||
|
||||
Apparently, <T> is unneeded here:
|
||||
|
||||
In file included from ../webkitgtk-2.4.8/Source/WebCore/platform/graphics/win/GraphicsContextCairoWin.cpp:35:0:
|
||||
../webkitgtk-2.4.8/Source/WTF/wtf/win/GdiObject.h:114:58: error: function template partial specialization 'deleteObject<T>' is not allowed
|
||||
template<typename T> inline void deleteObject<T>(T object)
|
||||
^
|
||||
|
||||
As a bonus, change GdiObject.h -> GDIObject.h (this matters when
|
||||
cross-compiling or when using case-sensitive filesystems on W32).
|
||||
---
|
||||
Source/WTF/wtf/win/GDIObject.h | 2 +-
|
||||
Source/WebCore/platform/graphics/win/GraphicsContextCairoWin.cpp | 2 +-
|
||||
2 files changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/Source/WTF/wtf/win/GDIObject.h b/Source/WTF/wtf/win/GDIObject.h
|
||||
index e8b00be..4e01b3ce 100644
|
||||
--- a/Source/WTF/wtf/win/GDIObject.h
|
||||
+++ b/Source/WTF/wtf/win/GDIObject.h
|
||||
@@ -111,7 +111,7 @@ template<typename T> inline void swap(GDIObject<T>& a, GDIObject<T>& b)
|
||||
}
|
||||
|
||||
// Nearly all GDI types use the same DeleteObject call.
|
||||
-template<typename T> inline void deleteObject<T>(T object)
|
||||
+template<typename T> inline void deleteObject(T object)
|
||||
{
|
||||
if (object)
|
||||
::DeleteObject(object);
|
||||
diff --git a/Source/WebCore/platform/graphics/win/GraphicsContextCairoWin.cpp b/Source/WebCore/platform/graphics/win/GraphicsContextCairoWin.cpp
|
||||
index 1b2d865..3fb2ac0 100644
|
||||
--- a/Source/WebCore/platform/graphics/win/GraphicsContextCairoWin.cpp
|
||||
+++ b/Source/WebCore/platform/graphics/win/GraphicsContextCairoWin.cpp
|
||||
@@ -32,7 +32,7 @@
|
||||
|
||||
#include <cairo-win32.h>
|
||||
#include "GraphicsContextPlatformPrivateCairo.h"
|
||||
-#include <wtf/win/GdiObject.h>
|
||||
+#include <wtf/win/GDIObject.h>
|
||||
|
||||
using namespace std;
|
||||
|
||||
--
|
||||
1.8.5.3
|
||||
|
||||
@@ -1,14 +0,0 @@
|
||||
--- webkitgtk-2.2.3/Tools/TestWebKitAPI/Tests/WTF/MediaTime.cpp.orig 2013-12-05 08:22:08.604832230 +0100
|
||||
+++ webkitgtk-2.2.3/Tools/TestWebKitAPI/Tests/WTF/MediaTime.cpp 2013-12-05 08:23:27.257593978 +0100
|
||||
@@ -44,6 +44,11 @@
|
||||
#endif
|
||||
#endif
|
||||
|
||||
+#if COMPILER(MINGW) && !defined(M_PI)
|
||||
+// M_PI is only defined in MinGW in non-c++11 builds
|
||||
+#define M_PI 3.14159265358979323846
|
||||
+#endif
|
||||
+
|
||||
namespace WTF {
|
||||
|
||||
std::ostream& operator<<(std::ostream& out, const MediaTime& val)
|
||||
@@ -0,0 +1,40 @@
|
||||
From 22a1a49e1d5fecaa4ba6cee5d9ffba13fb1176fc Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?=D0=A0=D1=83=D1=81=D0=BB=D0=B0=D0=BD=20=D0=98=D0=B6=D0=B1?=
|
||||
=?UTF-8?q?=D1=83=D0=BB=D0=B0=D1=82=D0=BE=D0=B2?= <lrn1986@gmail.com>
|
||||
Date: Mon, 13 Apr 2015 13:52:29 +0000
|
||||
Subject: [PATCH 10/20] [ANGLE][W32] Don't hardcode ossource_posix.cpp in the
|
||||
makefile
|
||||
|
||||
Compile ossource_posix.cpp or ossource_win.cpp depending on the target.
|
||||
|
||||
Otherwise you get an error:
|
||||
../webkitgtk-2.4.8/Source/ThirdParty/ANGLE/src/compiler/ossource_posix.cpp:13:2: error: #error Trying to build a posix specific file in a non-posix build.
|
||||
---
|
||||
Source/ThirdParty/ANGLE/GNUmakefile.am | 7 ++++++-
|
||||
1 file changed, 6 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/Source/ThirdParty/ANGLE/GNUmakefile.am b/Source/ThirdParty/ANGLE/GNUmakefile.am
|
||||
index 4c14ac1..70904bb 100644
|
||||
--- a/Source/ThirdParty/ANGLE/GNUmakefile.am
|
||||
+++ b/Source/ThirdParty/ANGLE/GNUmakefile.am
|
||||
@@ -80,7 +80,6 @@ libANGLE_la_SOURCES = \
|
||||
Source/ThirdParty/ANGLE/src/compiler/MMap.h \
|
||||
Source/ThirdParty/ANGLE/src/compiler/NodeSearch.h \
|
||||
Source/ThirdParty/ANGLE/src/compiler/osinclude.h \
|
||||
- Source/ThirdParty/ANGLE/src/compiler/ossource_posix.cpp \
|
||||
Source/ThirdParty/ANGLE/src/compiler/OutputESSL.cpp \
|
||||
Source/ThirdParty/ANGLE/src/compiler/OutputESSL.h \
|
||||
Source/ThirdParty/ANGLE/src/compiler/OutputGLSLBase.cpp \
|
||||
@@ -161,3 +160,9 @@ libANGLE_la_SOURCES = \
|
||||
Source/ThirdParty/ANGLE/src/compiler/VersionGLSL.h \
|
||||
Source/ThirdParty/ANGLE/src/third_party/compiler/ArrayBoundsClamper.cpp \
|
||||
Source/ThirdParty/ANGLE/src/third_party/compiler/ArrayBoundsClamper.h
|
||||
+
|
||||
+if TARGET_WIN32
|
||||
+libANGLE_la_SOURCES += Source/ThirdParty/ANGLE/src/compiler/ossource_win.cpp
|
||||
+else
|
||||
+libANGLE_la_SOURCES += Source/ThirdParty/ANGLE/src/compiler/ossource_posix.cpp
|
||||
+endif
|
||||
--
|
||||
1.8.5.3
|
||||
|
||||
@@ -1,29 +0,0 @@
|
||||
--- webkitgtk-2.4.8/Source/WebCore/GNUmakefile.list.am.orig 2015-03-24 06:14:46.327573500 +0000
|
||||
+++ webkitgtk-2.4.8/Source/WebCore/GNUmakefile.list.am 2015-03-24 06:17:07.769534300 +0000
|
||||
@@ -6263,6 +6263,13 @@
|
||||
platformgtk_sources += \
|
||||
Source/WebCore/platform/cairo/WidgetBackingStoreCairo.h \
|
||||
Source/WebCore/platform/cairo/WidgetBackingStoreCairo.cpp
|
||||
+if USE_EGL
|
||||
+webcoregtk_sources += \
|
||||
+ Source/WebCore/platform/graphics/egl/GLContextEGL.cpp \
|
||||
+ Source/WebCore/platform/graphics/egl/GLContextEGL.h
|
||||
+endif # END USE_EGL
|
||||
+endif # END TARGET_X11_OR_WAYLAND
|
||||
+
|
||||
if USE_OPENGL
|
||||
platformgtk_sources += \
|
||||
Source/WebCore/platform/graphics/GLContext.cpp \
|
||||
@@ -6270,12 +6277,6 @@
|
||||
Source/WebCore/platform/gtk/RedirectedXCompositeWindow.cpp \
|
||||
Source/WebCore/platform/gtk/RedirectedXCompositeWindow.h
|
||||
endif # END USE_OPENGL
|
||||
-if USE_EGL
|
||||
-webcoregtk_sources += \
|
||||
- Source/WebCore/platform/graphics/egl/GLContextEGL.cpp \
|
||||
- Source/WebCore/platform/graphics/egl/GLContextEGL.h
|
||||
-endif # END USE_EGL
|
||||
-endif # END TARGET_X11_OR_WAYLAND
|
||||
|
||||
if TARGET_WIN32
|
||||
webcore_sources += \
|
||||
@@ -0,0 +1,74 @@
|
||||
From 723ff2fa4708a211734f469e3cc2092beb6bbf02 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?=D0=A0=D1=83=D1=81=D0=BB=D0=B0=D0=BD=20=D0=98=D0=B6=D0=B1?=
|
||||
=?UTF-8?q?=D1=83=D0=BB=D0=B0=D1=82=D0=BE=D0=B2?= <lrn1986@gmail.com>
|
||||
Date: Mon, 13 Apr 2015 15:31:56 +0000
|
||||
Subject: [PATCH 11/20] [W32] Change OpenGL checks to work on W32, add
|
||||
libopengl32
|
||||
|
||||
AGain, use OS(WINDOWS) for things that are W32 but not necessarily MSVC.
|
||||
Don't try to check for dlopen() on W32 (it might be available, but
|
||||
native code is already here, so use it).
|
||||
|
||||
Correctly cast the result of GetProcAddress(), because C++.
|
||||
|
||||
Link W32 version to -lOpenGL32 instead of -lGL, otherwise libtool complains:
|
||||
*** Warning: linker path does not have real file for library -lGL.
|
||||
---
|
||||
Source/WebCore/platform/graphics/OpenGLShims.cpp | 6 +++---
|
||||
Source/autotools/FindDependencies.m4 | 7 ++++++-
|
||||
2 files changed, 9 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/Source/WebCore/platform/graphics/OpenGLShims.cpp b/Source/WebCore/platform/graphics/OpenGLShims.cpp
|
||||
index 916a908..d77a8b0 100644
|
||||
--- a/Source/WebCore/platform/graphics/OpenGLShims.cpp
|
||||
+++ b/Source/WebCore/platform/graphics/OpenGLShims.cpp
|
||||
@@ -22,7 +22,7 @@
|
||||
#define DISABLE_SHIMS
|
||||
#include "OpenGLShims.h"
|
||||
|
||||
-#if !PLATFORM(WIN)
|
||||
+#if !OS(WINDOWS)
|
||||
#include <dlfcn.h>
|
||||
#endif
|
||||
|
||||
@@ -37,10 +37,10 @@ OpenGLFunctionTable* openGLFunctionTable()
|
||||
return &table;
|
||||
}
|
||||
|
||||
-#if PLATFORM(WIN)
|
||||
+#if OS(WINDOWS)
|
||||
static void* getProcAddress(const char* procName)
|
||||
{
|
||||
- return GetProcAddress(GetModuleHandleA("libGLESv2"), procName);
|
||||
+ return reinterpret_cast<void*>(GetProcAddress(GetModuleHandleA("libGLESv2"), procName));
|
||||
}
|
||||
#else
|
||||
typedef void* (*glGetProcAddressType) (const char* procName);
|
||||
diff --git a/Source/autotools/FindDependencies.m4 b/Source/autotools/FindDependencies.m4
|
||||
index 9a2c496..3ce3f76 100644
|
||||
--- a/Source/autotools/FindDependencies.m4
|
||||
+++ b/Source/autotools/FindDependencies.m4
|
||||
@@ -453,6 +453,9 @@ if test "$found_opengl" = "yes"; then
|
||||
if test "$enable_gles2" = "yes"; then
|
||||
acceleration_description="$acceleration_description (gles2"
|
||||
OPENGL_LIBS="-lGLESv2"
|
||||
+ elif test "$os_win32" = "yes"; then
|
||||
+ acceleration_description="$acceleration_description (gl"
|
||||
+ OPENGL_LIBS="-lopengl32"
|
||||
else
|
||||
acceleration_description="$acceleration_description (gl"
|
||||
OPENGL_LIBS="-lGL"
|
||||
@@ -467,7 +470,9 @@ if test "$found_opengl" = "yes"; then
|
||||
|
||||
# Check whether dlopen() is in the core libc like on FreeBSD, or in a separate
|
||||
# libdl like on GNU/Linux (in which case we want to link to libdl).
|
||||
- AC_CHECK_FUNC([dlopen], [], [AC_CHECK_LIB([dl], [dlopen], [OPENGL_LIBS="$OPENGL_LIBS -ldl"])])
|
||||
+ if test "$os_win32" = "no"; then
|
||||
+ AC_CHECK_FUNC([dlopen], [], [AC_CHECK_LIB([dl], [dlopen], [OPENGL_LIBS="$OPENGL_LIBS -ldl"])])
|
||||
+ fi
|
||||
|
||||
acceleration_description="$acceleration_description)"
|
||||
fi
|
||||
--
|
||||
1.8.5.3
|
||||
|
||||
@@ -1,47 +0,0 @@
|
||||
--- webkitgtk-2.2.3/Source/autotools/FindDependencies.m4.orig 2013-12-05 21:46:18.648151386 +0100
|
||||
+++ webkitgtk-2.2.3/Source/autotools/FindDependencies.m4 2013-12-05 21:48:03.347173354 +0100
|
||||
@@ -436,6 +436,9 @@
|
||||
if test "$enable_gles2" = "yes"; then
|
||||
acceleration_description="$acceleration_description (gles2"
|
||||
OPENGL_LIBS="-lGLESv2"
|
||||
+ elif test "$os_win32" = "yes"; then
|
||||
+ acceleration_description="$acceleration_description (gl"
|
||||
+ OPENGL_LIBS="-lopengl32"
|
||||
else
|
||||
acceleration_description="$acceleration_description (gl"
|
||||
OPENGL_LIBS="-lGL"
|
||||
@@ -450,7 +453,9 @@
|
||||
|
||||
# Check whether dlopen() is in the core libc like on FreeBSD, or in a separate
|
||||
# libdl like on GNU/Linux (in which case we want to link to libdl).
|
||||
- AC_CHECK_FUNC([dlopen], [], [AC_CHECK_LIB([dl], [dlopen], [OPENGL_LIBS="$OPENGL_LIBS -ldl"])])
|
||||
+ if test "$os_win32" = "no"; then
|
||||
+ AC_CHECK_FUNC([dlopen], [], [AC_CHECK_LIB([dl], [dlopen], [OPENGL_LIBS="$OPENGL_LIBS -ldl"])])
|
||||
+ fi
|
||||
|
||||
acceleration_description="$acceleration_description)"
|
||||
fi
|
||||
--- webkitgtk-2.4.8/Source/WebCore/platform/graphics/OpenGLShims.cpp.orig 2015-03-24 06:18:02.320461400 +0000
|
||||
+++ webkitgtk-2.4.8/Source/WebCore/platform/graphics/OpenGLShims.cpp 2015-03-24 06:19:23.355751600 +0000
|
||||
@@ -22,7 +22,7 @@
|
||||
#define DISABLE_SHIMS
|
||||
#include "OpenGLShims.h"
|
||||
|
||||
-#if !PLATFORM(WIN)
|
||||
+#if !OS(WINDOWS)
|
||||
#include <dlfcn.h>
|
||||
#endif
|
||||
|
||||
@@ -37,10 +37,10 @@
|
||||
return &table;
|
||||
}
|
||||
|
||||
-#if PLATFORM(WIN)
|
||||
+#if OS(WINDOWS)
|
||||
static void* getProcAddress(const char* procName)
|
||||
{
|
||||
- return GetProcAddress(GetModuleHandleA("libGLESv2"), procName);
|
||||
+ return reinterpret_cast<void*>(GetProcAddress(GetModuleHandleA("libGLESv2"), procName));
|
||||
}
|
||||
#else
|
||||
typedef void* (*glGetProcAddressType) (const char* procName);
|
||||
@@ -0,0 +1,33 @@
|
||||
From d917ab9a3ce0e92a863b8040e819755804a529f0 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?=D0=A0=D1=83=D1=81=D0=BB=D0=B0=D0=BD=20=D0=98=D0=B6=D0=B1?=
|
||||
=?UTF-8?q?=D1=83=D0=BB=D0=B0=D1=82=D0=BE=D0=B2?= <lrn1986@gmail.com>
|
||||
Date: Mon, 13 Apr 2015 16:14:33 +0000
|
||||
Subject: [PATCH 12/20] [W32][GTK] Use correct .la files as --library arguments
|
||||
for GI scanner
|
||||
|
||||
This way it plays well with W32 gobject-introspection library resolution
|
||||
code.
|
||||
Without that one would get things like:
|
||||
ERROR: can't resolve libraries to shared libraries: webkitgtk-3.0, javascriptcoregtk-3.0
|
||||
---
|
||||
Source/WebKit/gtk/GNUmakefile.am | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/Source/WebKit/gtk/GNUmakefile.am b/Source/WebKit/gtk/GNUmakefile.am
|
||||
index 2ba8541..5502f25 100644
|
||||
--- a/Source/WebKit/gtk/GNUmakefile.am
|
||||
+++ b/Source/WebKit/gtk/GNUmakefile.am
|
||||
@@ -311,8 +311,8 @@ WebKit-@WEBKITGTK_API_VERSION@.gir: $(G_IR_SCANNER) JavaScriptCore-@WEBKITGTK_AP
|
||||
--include=Gtk-@GTK_API_VERSION@ \
|
||||
--include=JavaScriptCore-@WEBKITGTK_API_VERSION@ \
|
||||
--include=Soup-2.4 \
|
||||
- --library=webkitgtk-@WEBKITGTK_API_VERSION@ \
|
||||
- --library=javascriptcoregtk-@WEBKITGTK_API_VERSION@ \
|
||||
+ --library=libwebkitgtk-@WEBKITGTK_API_MAJOR_VERSION@.@WEBKITGTK_API_MINOR_VERSION@.la \
|
||||
+ --library=libjavascriptcoregtk-@WEBKITGTK_API_MAJOR_VERSION@.@WEBKITGTK_API_MINOR_VERSION@.la \
|
||||
--libtool="$(LIBTOOL)" \
|
||||
--pkg=gobject-2.0 \
|
||||
--pkg=gtk+-@GTK_API_VERSION@ \
|
||||
--
|
||||
1.8.5.3
|
||||
|
||||
@@ -1,12 +0,0 @@
|
||||
--- webkitgtk-2.4.8/Tools/TestWebKitAPI/GNUmakefile.am.orig 2015-03-24 06:20:02.480719800 +0000
|
||||
+++ webkitgtk-2.4.8/Tools/TestWebKitAPI/GNUmakefile.am 2015-03-24 06:20:35.275884300 +0000
|
||||
@@ -111,8 +111,7 @@
|
||||
|
||||
noinst_PROGRAMS += \
|
||||
Programs/TestWebKitAPI/WTF/TestWTF \
|
||||
- Programs/TestWebKitAPI/JavaScriptCore/TestJavaScriptCore \
|
||||
- Programs/TestWebKitAPI/WebCore/TestWebCore
|
||||
+ Programs/TestWebKitAPI/JavaScriptCore/TestJavaScriptCore
|
||||
|
||||
if ENABLE_WEBKIT1
|
||||
noinst_PROGRAMS += \
|
||||
@@ -1,28 +1,106 @@
|
||||
--- webkitgtk-2.2.5/Source/WebCore/bindings/gobject/GNUmakefile.am.orig 2014-02-17 11:24:03.000000000 +0000
|
||||
+++ webkitgtk-2.2.5/Source/WebCore/bindings/gobject/GNUmakefile.am 2014-03-06 03:37:20.327460800 +0000
|
||||
@@ -491,7 +491,7 @@
|
||||
# Filter out SVG and IndexedDB for now
|
||||
gdom_feature_defines := $(filter-out ENABLE_INDEXED_DATABASE=1, $(filter-out ENABLE_SVG%, $(feature_defines))) ENABLE_INDEXED_DATABASE=0
|
||||
DerivedSources/webkitdom/WebKitDOM%.cpp DerivedSources/webkitdom/WebKitDOM%.h DerivedSources/webkitdom/WebKitDOM%Private.h: %.idl $(SCRIPTS_FOR_GENERATE_BINDINGS) $(WebCore)/bindings/scripts/CodeGeneratorGObject.pm $(WebCore)/bindings/gobject/GNUmakefile.am $(supplemental_dependency_file)
|
||||
- $(AM_V_GEN)$(PERL) -I$(WebCore)/bindings/scripts $(WebCore)/bindings/scripts/generate-bindings.pl --include $(WebCore)/Modules --include $(WebCore)/dom --include $(WebCore)/html --include $(WebCore)/css --include $(WebCore)/page --include $(WebCore)/fileapi --include $(WebCore)/xml --include $(WebCore)/svg --outputDir "$(GENSOURCES_WEBKITDOM)" --defines "LANGUAGE_GOBJECT=1 $(gdom_feature_defines)" --generator GObject --supplementalDependencyFile $(supplemental_dependency_file) $<
|
||||
+ $(AM_V_GEN)CC=$(CC) $(PERL) -I$(WebCore)/bindings/scripts $(WebCore)/bindings/scripts/generate-bindings.pl --include $(WebCore)/Modules --include $(WebCore)/dom --include $(WebCore)/html --include $(WebCore)/css --include $(WebCore)/page --include $(WebCore)/fileapi --include $(WebCore)/xml --include $(WebCore)/svg --outputDir "$(GENSOURCES_WEBKITDOM)" --defines "LANGUAGE_GOBJECT=1 $(gdom_feature_defines)" --generator GObject --supplementalDependencyFile $(supplemental_dependency_file) $<
|
||||
From a707d6c192cebc257f7aea00cc30ee5dbe7e9713 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?=D0=A0=D1=83=D1=81=D0=BB=D0=B0=D0=BD=20=D0=98=D0=B6=D0=B1?=
|
||||
=?UTF-8?q?=D1=83=D0=BB=D0=B0=D1=82=D0=BE=D0=B2?= <lrn1986@gmail.com>
|
||||
Date: Tue, 14 Apr 2015 10:42:31 +0000
|
||||
Subject: [PATCH 13/20] Ensure that generator-scripts get CC from configure
|
||||
|
||||
Various scripts check the CC environment variable to get the compiler to
|
||||
use. In absence of that variable they do various educated guesses.
|
||||
|
||||
They guess wrong when running in MSYS (find /usr/bin/gcc instead
|
||||
of /mingw/bin/gcc) and likely also guess wrong when cross-compiling.
|
||||
|
||||
Note that if the version of a "wrong" gcc is close enough to the "right" gcc,
|
||||
things might just work out somehow, but we shouldn't bet on that.
|
||||
---
|
||||
Source/JavaScriptCore/GNUmakefile.am | 20 ++++----
|
||||
Source/Platform/GNUmakefile.am | 4 +-
|
||||
Source/WebCore/GNUmakefile.am | 64 +++++++++++++-------------
|
||||
Source/WebCore/bindings/gobject/GNUmakefile.am | 6 +--
|
||||
Tools/TestWebKitAPI/GNUmakefile.am | 4 +-
|
||||
Tools/WebKitTestRunner/GNUmakefile.am | 4 +-
|
||||
6 files changed, 51 insertions(+), 51 deletions(-)
|
||||
|
||||
diff --git a/Source/JavaScriptCore/GNUmakefile.am b/Source/JavaScriptCore/GNUmakefile.am
|
||||
index ab058b6..3fa990f 100644
|
||||
--- a/Source/JavaScriptCore/GNUmakefile.am
|
||||
+++ b/Source/JavaScriptCore/GNUmakefile.am
|
||||
@@ -95,25 +95,25 @@ pkgconfig_DATA += Source/JavaScriptCore/javascriptcoregtk-@WEBKITGTK_API_VERSION
|
||||
$(shell mkdir -p DerivedSources/JavaScriptCore)
|
||||
|
||||
libwebkitdomincludedir = $(libwebkitgtkincludedir)/webkitdom
|
||||
nodist_libwebkitdominclude_HEADERS = \
|
||||
--- webkitgtk-2.2.5/Tools/WebKitTestRunner/GNUmakefile.am.orig 2014-02-17 11:24:14.000000000 +0000
|
||||
+++ webkitgtk-2.2.5/Tools/WebKitTestRunner/GNUmakefile.am 2014-03-06 03:38:06.219288300 +0000
|
||||
@@ -153,7 +153,7 @@
|
||||
Source/WebCore/bindings/scripts/generate-bindings.pl
|
||||
DerivedSources/JavaScriptCore/Lexer.lut.h: $(srcdir)/Source/JavaScriptCore/create_hash_table $(srcdir)/Source/JavaScriptCore/parser/Keywords.table
|
||||
- $(AM_V_GEN)$(PERL) $^ > $@
|
||||
+ $(AM_V_GEN)CC=$(CC) $(PERL) $^ > $@
|
||||
|
||||
DerivedSources/InjectedBundle/JS%.cpp: Tools/WebKitTestRunner/InjectedBundle/Bindings/%.idl $(code_generation_dependencies)
|
||||
- $(AM_V_GEN)$(PERL) \
|
||||
+ $(AM_V_GEN)CC=$(CC) $(PERL) \
|
||||
-I $(srcdir)/Source/WebCore/bindings/scripts \
|
||||
-I $(srcdir)/Tools/WebKitTestRunner/InjectedBundle/Bindings \
|
||||
$(srcdir)/Source/WebCore/bindings/scripts/generate-bindings.pl \
|
||||
--- webkitgtk-2.4.8/Source/WebCore/GNUmakefile.am.orig 2015-01-07 09:45:42.000000000 +0000
|
||||
+++ webkitgtk-2.4.8/Source/WebCore/GNUmakefile.am 2015-03-24 06:25:23.730513400 +0000
|
||||
@@ -150,13 +150,13 @@
|
||||
DerivedSources/JavaScriptCore/%.lut.h: $(srcdir)/Source/JavaScriptCore/create_hash_table $(srcdir)/Source/JavaScriptCore/runtime/%.cpp
|
||||
- $(AM_V_GEN)$(PERL) $^ -i > $@
|
||||
+ $(AM_V_GEN)CC=$(CC) $(PERL) $^ -i > $@
|
||||
|
||||
DerivedSources/JavaScriptCore/RegExpJitTables.h: $(srcdir)/Source/JavaScriptCore/create_regex_tables
|
||||
- $(AM_V_GEN)$(PYTHON) $^ > $@
|
||||
+ $(AM_V_GEN)CC=$(CC) $(PYTHON) $^ > $@
|
||||
|
||||
DerivedSources/JavaScriptCore/KeywordLookup.h: $(srcdir)/Source/JavaScriptCore/KeywordLookupGenerator.py $(srcdir)/Source/JavaScriptCore/parser/Keywords.table
|
||||
- $(AM_V_GEN)$(PYTHON) $^ > $@
|
||||
+ $(AM_V_GEN)CC=$(CC) $(PYTHON) $^ > $@
|
||||
|
||||
DerivedSources/JavaScriptCore/LLIntDesiredOffsets.h: $(javascriptcore_sources) $(llint_nosources) $(offlineasm_nosources)
|
||||
- $(AM_V_GEN)$(RUBY) $(srcdir)/Source/JavaScriptCore/offlineasm/generate_offset_extractor.rb $(srcdir)/Source/JavaScriptCore/llint/LowLevelInterpreter.asm $@
|
||||
+ $(AM_V_GEN)CC=$(CC) $(RUBY) $(srcdir)/Source/JavaScriptCore/offlineasm/generate_offset_extractor.rb $(srcdir)/Source/JavaScriptCore/llint/LowLevelInterpreter.asm $@
|
||||
$(AM_V_at)touch $@
|
||||
|
||||
$(Programs_LLIntOffsetsExtractor_OBJECTS): DerivedSources/JavaScriptCore/LLIntDesiredOffsets.h
|
||||
|
||||
DerivedSources/JavaScriptCore/LLIntAssembly.h: Programs/LLIntOffsetsExtractor$(EXEEXT)
|
||||
- $(AM_V_GEN)$(RUBY) $(srcdir)/Source/JavaScriptCore/offlineasm/asm.rb $(srcdir)/Source/JavaScriptCore/llint/LowLevelInterpreter.asm Programs/LLIntOffsetsExtractor$(EXEEXT) $@
|
||||
+ $(AM_V_GEN)CC=$(CC) $(RUBY) $(srcdir)/Source/JavaScriptCore/offlineasm/asm.rb $(srcdir)/Source/JavaScriptCore/llint/LowLevelInterpreter.asm Programs/LLIntOffsetsExtractor$(EXEEXT) $@
|
||||
$(AM_V_at)touch $@
|
||||
|
||||
$(libjavascriptcoregtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_OBJECTS): DerivedSources/JavaScriptCore/LLIntAssembly.h
|
||||
@@ -253,12 +253,12 @@ JavaScriptCore_INSPECTOR_DOMAINS := \
|
||||
$(JavaScriptCore)/inspector/protocol/Runtime.json
|
||||
|
||||
DerivedSources/JavaScriptCore/InspectorJS.json: $(INSPECTOR_SCRIPTS_DIR)/generate-combined-inspector-json.py $(JavaScriptCore_INSPECTOR_DOMAINS)
|
||||
- $(AM_V_GEN)$(PYTHON) $(INSPECTOR_SCRIPTS_DIR)/generate-combined-inspector-json.py $(JavaScriptCore)/inspector/protocol > $(GENSOURCES_JAVASCRIPTCORE)/InspectorJS.json
|
||||
+ $(AM_V_GEN)CC=$(CC) $(PYTHON) $(INSPECTOR_SCRIPTS_DIR)/generate-combined-inspector-json.py $(JavaScriptCore)/inspector/protocol > $(GENSOURCES_JAVASCRIPTCORE)/InspectorJS.json
|
||||
|
||||
# Inspector Backend Dispatchers, Frontend Dispatchers, Type Builders
|
||||
# Copy generated header files to DerivedSources/JavaScriptCore/inspector so that WebCore's ForwardingHeader style of #include <inspector/Foo.h> will work.
|
||||
DerivedSources/JavaScriptCore/InspectorJSBackendDispatchers.cpp: DerivedSources/JavaScriptCore/InspectorJS.json $(INSPECTOR_SCRIPTS_DIR)/CodeGeneratorInspector.py $(INSPECTOR_SCRIPTS_DIR)/CodeGeneratorInspectorStrings.py
|
||||
- $(AM_V_GEN)$(PYTHON) $(INSPECTOR_SCRIPTS_DIR)/CodeGeneratorInspector.py $< --output_h_dir $(GENSOURCES_JAVASCRIPTCORE) --output_cpp_dir $(GENSOURCES_JAVASCRIPTCORE) --output_js_dir $(GENSOURCES_JAVASCRIPTCORE) --output_type JavaScript
|
||||
+ $(AM_V_GEN)CC=$(CC) $(PYTHON) $(INSPECTOR_SCRIPTS_DIR)/CodeGeneratorInspector.py $< --output_h_dir $(GENSOURCES_JAVASCRIPTCORE) --output_cpp_dir $(GENSOURCES_JAVASCRIPTCORE) --output_js_dir $(GENSOURCES_JAVASCRIPTCORE) --output_type JavaScript
|
||||
$(AM_V_at)touch $@
|
||||
mkdir -p DerivedSources/JavaScriptCore/inspector
|
||||
cp DerivedSources/JavaScriptCore/InspectorJSTypeBuilders.h DerivedSources/JavaScriptCore/InspectorJSFrontendDispatchers.h DerivedSources/JavaScriptCore/InspectorJSBackendDispatchers.h DerivedSources/JavaScriptCore/inspector
|
||||
@@ -270,6 +270,6 @@ DerivedSources/JavaScriptCore/InspectorJSBackendCommands.js: DerivedSources/Java
|
||||
DerivedSources/JavaScriptCore/InspectorJSBackendDispatchers.h: DerivedSources/JavaScriptCore/InspectorJSBackendDispatchers.cpp
|
||||
|
||||
DerivedSources/JavaScriptCore/InjectedScriptSource.h: $(JavaScriptCore)/inspector/InjectedScriptSource.js $(INSPECTOR_SCRIPTS_DIR)/xxd.pl $(INSPECTOR_SCRIPTS_DIR)/jsmin.py
|
||||
- $(AM_V_GEN)$(PYTHON) $(INSPECTOR_SCRIPTS_DIR)/jsmin.py < $< > $(GENSOURCES_JAVASCRIPTCORE)/InjectedScriptSource.min.js
|
||||
- $(AM_V_at)$(PERL) $(INSPECTOR_SCRIPTS_DIR)/xxd.pl InjectedScriptSource_js $(GENSOURCES_JAVASCRIPTCORE)/InjectedScriptSource.min.js $@
|
||||
+ $(AM_V_GEN)CC=$(CC) $(PYTHON) $(INSPECTOR_SCRIPTS_DIR)/jsmin.py < $< > $(GENSOURCES_JAVASCRIPTCORE)/InjectedScriptSource.min.js
|
||||
+ $(AM_V_at)CC=$(CC) $(PERL) $(INSPECTOR_SCRIPTS_DIR)/xxd.pl InjectedScriptSource_js $(GENSOURCES_JAVASCRIPTCORE)/InjectedScriptSource.min.js $@
|
||||
$(AM_V_at)rm -rf $(GENSOURCES_JAVASCRIPTCORE)/InjectedScriptSource.min.js
|
||||
diff --git a/Source/Platform/GNUmakefile.am b/Source/Platform/GNUmakefile.am
|
||||
index faf3e8c..1930098 100644
|
||||
--- a/Source/Platform/GNUmakefile.am
|
||||
+++ b/Source/Platform/GNUmakefile.am
|
||||
@@ -126,8 +126,8 @@ libPlatformGtk_la_CPPFLAGS = \
|
||||
$(LIBSOUP_CFLAGS)
|
||||
|
||||
DerivedSources/Platform/ColorData.cpp: $(WebCore)/platform/ColorData.gperf $(WebCore)/make-hash-tools.pl
|
||||
- $(AM_V_GEN)$(PERL) $(WebCore)/make-hash-tools.pl $(GENSOURCES_PLATFORM) $(WebCore)/platform/ColorData.gperf
|
||||
+ $(AM_V_GEN)CC=$(CC) $(PERL) $(WebCore)/make-hash-tools.pl $(GENSOURCES_PLATFORM) $(WebCore)/platform/ColorData.gperf
|
||||
|
||||
DerivedSources/Platform/WebKitFontFamilyNames.cpp: DerivedSources/Platform/WebKitFontFamilyNames.h
|
||||
DerivedSources/Platform/WebKitFontFamilyNames.h: $(WebCore)/dom/make_names.pl $(WebCore)/bindings/scripts/Hasher.pm $(WebCore)/bindings/scripts/StaticString.pm $(WebCore)/css/WebKitFontFamilyNames.in
|
||||
- $(AM_V_GEN)$(PERL) -I$(WebCore)/bindings/scripts $< --fonts $(WebCore)/css/WebKitFontFamilyNames.in --outputDir "$(GENSOURCES_PLATFORM)"
|
||||
+ $(AM_V_GEN)CC=$(CC) $(PERL) -I$(WebCore)/bindings/scripts $< --fonts $(WebCore)/css/WebKitFontFamilyNames.in --outputDir "$(GENSOURCES_PLATFORM)"
|
||||
diff --git a/Source/WebCore/GNUmakefile.am b/Source/WebCore/GNUmakefile.am
|
||||
index cc2484b..c145ea7 100644
|
||||
--- a/Source/WebCore/GNUmakefile.am
|
||||
+++ b/Source/WebCore/GNUmakefile.am
|
||||
@@ -150,13 +150,13 @@ endif # END TARGET_WIN32
|
||||
$(GENSOURCES_WEBCORE)/XPathGrammar.h: $(GENSOURCES_WEBCORE)/XPathGrammar.cpp
|
||||
$(GENSOURCES_WEBCORE)/XPathGrammar.cpp: $(WebCore)/xml/XPathGrammar.y
|
||||
$(AM_V_GEN)
|
||||
@@ -38,7 +116,7 @@
|
||||
|
||||
# ----
|
||||
# SVG Support
|
||||
@@ -202,13 +202,13 @@
|
||||
@@ -202,13 +202,13 @@ endif # END_ENABLE_SVG
|
||||
DerivedSources/WebCore/SVGNames.cpp: DerivedSources/WebCore/SVGElementFactory.cpp
|
||||
DerivedSources/WebCore/JSSVGElementWrapperFactory.cpp: DerivedSources/WebCore/SVGElementFactory.cpp
|
||||
DerivedSources/WebCore/SVGElementFactory.cpp: $(WebCore)/dom/make_names.pl $(WebCore)/bindings/scripts/Hasher.pm $(WebCore)/bindings/scripts/StaticString.pm $(WebCore)/svg/svgtags.in $(WebCore)/svg/svgattrs.in
|
||||
@@ -54,7 +132,7 @@
|
||||
|
||||
if USE_TEXTURE_MAPPER_GL
|
||||
webcore_cppflags += \
|
||||
@@ -234,7 +234,7 @@
|
||||
@@ -234,7 +234,7 @@ DerivedSources/WebCore/CSSPropertyNames.cpp: DerivedSources/WebCore/CSSPropertyN
|
||||
DerivedSources/WebCore/CSSPropertyNames.h: $(WEBCORE_CSS_PROPERTY_NAMES) $(WebCore)/css/makeprop.pl
|
||||
$(AM_V_GEN)
|
||||
$(AM_V_at)cat $(WEBCORE_CSS_PROPERTY_NAMES) > CSSPropertyNames.in
|
||||
@@ -63,7 +141,7 @@
|
||||
$(AM_V_at)mv CSSPropertyNames* $(GENSOURCES_WEBCORE)
|
||||
|
||||
# Lower case all the values, as CSS values are case-insensitive
|
||||
@@ -242,29 +242,29 @@
|
||||
@@ -242,29 +242,29 @@ DerivedSources/WebCore/CSSValueKeywords.cpp: DerivedSources/WebCore/CSSValueKeyw
|
||||
DerivedSources/WebCore/CSSValueKeywords.h: $(WEBCORE_CSS_VALUE_KEYWORDS) $(WebCore)/css/makevalues.pl
|
||||
$(AM_V_GEN)
|
||||
$(AM_V_at)cat $(WEBCORE_CSS_VALUE_KEYWORDS) > CSSValueKeywords.in
|
||||
@@ -100,7 +178,7 @@
|
||||
|
||||
# user agent style sheets
|
||||
USER_AGENT_STYLE_SHEETS = \
|
||||
@@ -296,11 +296,11 @@
|
||||
@@ -296,11 +296,11 @@ SCRIPTS_FOR_PREPROCESS_IDLS = \
|
||||
|
||||
DerivedSources/WebCore/UserAgentStyleSheetsData.cpp: DerivedSources/WebCore/UserAgentStyleSheets.h
|
||||
DerivedSources/WebCore/UserAgentStyleSheets.h: $(WebCore)/css/make-css-file-arrays.pl $(WebCore)/bindings/scripts/preprocessor.pm $(USER_AGENT_STYLE_SHEETS)
|
||||
@@ -114,7 +192,7 @@
|
||||
|
||||
|
||||
# HTML tag and attribute names
|
||||
@@ -310,26 +310,26 @@
|
||||
@@ -310,26 +310,26 @@ DerivedSources/WebCore/HTMLElementFactory.h: DerivedSources/WebCore/HTMLNames.cp
|
||||
DerivedSources/WebCore/HTMLElementTypeHelpers.h: DerivedSources/WebCore/HTMLNames.h
|
||||
DerivedSources/WebCore/HTMLNames.cpp: DerivedSources/WebCore/HTMLNames.h
|
||||
DerivedSources/WebCore/HTMLNames.h: $(WebCore)/dom/make_names.pl $(WebCore)/bindings/scripts/Hasher.pm $(WebCore)/bindings/scripts/StaticString.pm $(WebCore)/html/HTMLTagNames.in $(WebCore)/html/HTMLAttributeNames.in
|
||||
@@ -148,7 +226,7 @@
|
||||
|
||||
dom_binding_idls += \
|
||||
DerivedSources/WebCore/InternalSettingsGenerated.idl
|
||||
@@ -356,11 +356,11 @@
|
||||
@@ -356,11 +356,11 @@ WebCore_INSPECTOR_DOMAINS := \
|
||||
$(WebCore)/inspector/protocol/Worker.json
|
||||
|
||||
DerivedSources/WebCore/InspectorWeb.json: $(INSPECTOR_SCRIPTS_DIR)/generate-combined-inspector-json.py $(WebCore_INSPECTOR_DOMAINS)
|
||||
@@ -162,7 +240,7 @@
|
||||
$(AM_V_at)touch $@
|
||||
DerivedSources/WebCore/InspectorWebTypeBuilders.h: DerivedSources/WebCore/InspectorWebTypeBuilders.cpp
|
||||
DerivedSources/WebCore/InspectorWebTypeBuilders.cpp: DerivedSources/WebCore/InspectorWebFrontendDispatchers.h
|
||||
@@ -370,16 +370,16 @@
|
||||
@@ -370,16 +370,16 @@ DerivedSources/WebCore/InspectorWebBackendCommands.js: DerivedSources/WebCore/In
|
||||
DerivedSources/WebCore/InspectorWebBackendDispatchers.h: DerivedSources/WebCore/InspectorWebBackendDispatchers.cpp
|
||||
|
||||
DerivedSources/WebCore/InspectorOverlayPage.h: $(WebCore)/inspector/InspectorOverlayPage.html $(WebCore)/inspector/InspectorOverlayPage.css $(WebCore)/inspector/InspectorOverlayPage.js
|
||||
@@ -185,7 +263,7 @@
|
||||
|
||||
if ENABLE_WEB_AUDIO
|
||||
# Installing HRTF database wav files
|
||||
@@ -448,7 +448,7 @@
|
||||
@@ -448,7 +448,7 @@ $(supplemental_dependency_file): $(SCRIPTS_FOR_PREPROCESS_IDLS) $(dom_binding_id
|
||||
$(AM_V_GEN)
|
||||
$(AM_V_at)true > $(idl_files_list)
|
||||
$(AM_V_at)($(foreach idl, $(dom_binding_idls), echo $(idl) &&) true) >> $(idl_files_list)
|
||||
@@ -194,7 +272,7 @@
|
||||
$(AM_V_at)touch $@
|
||||
|
||||
.PHONY: $(window_constructors_file) $(workerglobalscope_constructors_file) $(sharedworkerglobalscope_constructors_file) $(dedicatedworkerglobalscope_constructors_file)
|
||||
@@ -459,11 +459,11 @@
|
||||
@@ -459,11 +459,11 @@ DerivedSources/WebCore/JS%.cpp: DerivedSources/WebCore/JS%.h;
|
||||
|
||||
.SECONDARY:
|
||||
DerivedSources/WebCore/JS%.h: %.idl $(SCRIPTS_FOR_GENERATE_BINDINGS) $(WebCore)/bindings/scripts/CodeGeneratorJS.pm $(supplemental_dependency_file) $(idl_attributes_file)
|
||||
@@ -208,11 +286,13 @@
|
||||
|
||||
# See https://bugs.webkit.org/show_bug.cgi?id=76388
|
||||
# We need to introduce a manual dependency to prevent non-generated sources from
|
||||
--- webkitgtk-2.2.5/Source/WebCore/bindings/gobject/GNUmakefile.am.orig 2014-03-06 03:39:25.220820200 +0000
|
||||
+++ webkitgtk-2.2.5/Source/WebCore/bindings/gobject/GNUmakefile.am 2014-03-06 03:52:55.371196200 +0000
|
||||
@@ -466,10 +466,10 @@
|
||||
diff --git a/Source/WebCore/bindings/gobject/GNUmakefile.am b/Source/WebCore/bindings/gobject/GNUmakefile.am
|
||||
index 3d5e9dc..3f88ed3 100644
|
||||
--- a/Source/WebCore/bindings/gobject/GNUmakefile.am
|
||||
+++ b/Source/WebCore/bindings/gobject/GNUmakefile.am
|
||||
@@ -478,10 +478,10 @@ BUILT_SOURCES += \
|
||||
gdom_class_list := $(subst WebKitDOM,, $(filter-out %Private, $(basename $(notdir $(webkitgtk_gdom_built_sources)))))
|
||||
gdom_class_list += Custom EventTarget Object
|
||||
gdom_class_list += Custom EventTarget Object Deprecated
|
||||
DerivedSources/webkitdom/webkitdom.h: $(WebCore)/bindings/scripts/gobject-generate-headers.pl $(WebCore)/bindings/gobject/GNUmakefile.am
|
||||
- $(AM_V_GEN)echo $(gdom_class_list) | $(PERL) $< gdom > $@
|
||||
+ $(AM_V_GEN)echo $(gdom_class_list) | CC=$(CC) $(PERL) $< gdom > $@
|
||||
@@ -221,11 +301,22 @@
|
||||
- $(AM_V_GEN)echo $(gdom_class_list) | $(PERL) $< defines > $@
|
||||
+ $(AM_V_GEN)echo $(gdom_class_list) | CC=$(CC) $(PERL) $< defines > $@
|
||||
|
||||
# Because WebCore/bindings/gobject/WebKitDOMObject.h is static source but is also a distributed header
|
||||
# required by other distributed headers (both static and auto-generated), need to move this to the
|
||||
--- webkitgtk-2.2.5/Tools/TestWebKitAPI/GNUmakefile.am.orig 2014-03-06 03:39:24.734758500 +0000
|
||||
+++ webkitgtk-2.2.5/Tools/TestWebKitAPI/GNUmakefile.am 2014-03-06 03:53:30.491155900 +0000
|
||||
@@ -917,11 +917,11 @@
|
||||
gdom_symbol_files += $(patsubst %.h,%.symbols, $(filter DerivedSources/webkitdom/WebKitDOM%.h, $(webkitgtk_gdom_built_h_api)))
|
||||
|
||||
@@ -533,7 +533,7 @@ $(top_builddir)/DerivedSources/webkitdom/WebKitDOMDeprecated.h: $(WebCore)/bindi
|
||||
# Filter out SVG and IndexedDB for now
|
||||
gdom_feature_defines := $(filter-out ENABLE_INDEXED_DATABASE=1, $(filter-out ENABLE_SVG%, $(feature_defines))) ENABLE_INDEXED_DATABASE=0
|
||||
DerivedSources/webkitdom/WebKitDOM%.cpp DerivedSources/webkitdom/WebKitDOM%.h DerivedSources/webkitdom/WebKitDOM%Private.h: %.idl $(SCRIPTS_FOR_GENERATE_BINDINGS) $(WebCore)/bindings/scripts/CodeGeneratorGObject.pm $(WebCore)/bindings/gobject/GNUmakefile.am $(supplemental_dependency_file)
|
||||
- $(AM_V_GEN)$(PERL) -I$(WebCore)/bindings/scripts $(WebCore)/bindings/scripts/generate-bindings.pl --include $(WebCore)/Modules --include $(WebCore)/dom --include $(WebCore)/html --include $(WebCore)/css --include $(WebCore)/page --include $(WebCore)/fileapi --include $(WebCore)/xml --include $(WebCore)/svg --outputDir "$(GENSOURCES_WEBKITDOM)" --defines "LANGUAGE_GOBJECT=1 $(gdom_feature_defines)" --generator GObject --supplementalDependencyFile $(supplemental_dependency_file) $<
|
||||
+ $(AM_V_GEN)CC=$(CC) $(PERL) -I$(WebCore)/bindings/scripts $(WebCore)/bindings/scripts/generate-bindings.pl --include $(WebCore)/Modules --include $(WebCore)/dom --include $(WebCore)/html --include $(WebCore)/css --include $(WebCore)/page --include $(WebCore)/fileapi --include $(WebCore)/xml --include $(WebCore)/svg --outputDir "$(GENSOURCES_WEBKITDOM)" --defines "LANGUAGE_GOBJECT=1 $(gdom_feature_defines)" --generator GObject --supplementalDependencyFile $(supplemental_dependency_file) $<
|
||||
|
||||
libwebkitdomincludedir = $(libwebkitgtkincludedir)/webkitdom
|
||||
nodist_libwebkitdominclude_HEADERS = \
|
||||
diff --git a/Tools/TestWebKitAPI/GNUmakefile.am b/Tools/TestWebKitAPI/GNUmakefile.am
|
||||
index 2ea6173..94be896 100644
|
||||
--- a/Tools/TestWebKitAPI/GNUmakefile.am
|
||||
+++ b/Tools/TestWebKitAPI/GNUmakefile.am
|
||||
@@ -893,11 +893,11 @@ Programs_TestWebKitAPI_WebKit2Gtk_TestUIClient_LDFLAGS = $(webkit2gtk_tests_ldfl
|
||||
|
||||
|
||||
stamp-testwebkitapi-webcore-forwarding-headers: $(WebKit2)/Scripts/generate-forwarding-headers.pl $(Programs_TestWebKitAPI_WebCore_TestWebCore_SOURCES)
|
||||
@@ -239,8 +330,10 @@
|
||||
&& echo timestamp > $(@F)
|
||||
|
||||
BUILT_SOURCES += $(top_builddir)/stamp-testwebkitapi-webcore-forwarding-headers
|
||||
--- webkitgtk-2.2.5/Tools/WebKitTestRunner/GNUmakefile.am.orig 2014-03-06 03:39:25.221820300 +0000
|
||||
+++ webkitgtk-2.2.5/Tools/WebKitTestRunner/GNUmakefile.am 2014-03-06 03:54:14.746775700 +0000
|
||||
diff --git a/Tools/WebKitTestRunner/GNUmakefile.am b/Tools/WebKitTestRunner/GNUmakefile.am
|
||||
index 28a2d57..e664c56 100644
|
||||
--- a/Tools/WebKitTestRunner/GNUmakefile.am
|
||||
+++ b/Tools/WebKitTestRunner/GNUmakefile.am
|
||||
@@ -1,6 +1,6 @@
|
||||
|
||||
stamp-webkittestrunner-forwarding-headers: $(WebKit2)/Scripts/generate-forwarding-headers.pl $(Programs_WebKitTestRunner_SOURCES) $(Libraries_libTestRunnerInjectedBundle_la_SOURCES)
|
||||
@@ -249,74 +342,15 @@
|
||||
&& echo timestamp > $(@F)
|
||||
|
||||
BUILT_SOURCES += $(top_builddir)/stamp-webkittestrunner-forwarding-headers
|
||||
--- webkitgtk-2.4.8/Source/JavaScriptCore/GNUmakefile.am.orig 2015-03-24 06:23:10.630111800 +0000
|
||||
+++ webkitgtk-2.4.8/Source/JavaScriptCore/GNUmakefile.am 2015-03-24 06:27:35.103695600 +0000
|
||||
@@ -95,25 +95,25 @@
|
||||
$(shell mkdir -p DerivedSources/JavaScriptCore)
|
||||
@@ -157,7 +157,7 @@ code_generation_dependencies = \
|
||||
Source/WebCore/bindings/scripts/generate-bindings.pl
|
||||
|
||||
DerivedSources/JavaScriptCore/Lexer.lut.h: $(srcdir)/Source/JavaScriptCore/create_hash_table $(srcdir)/Source/JavaScriptCore/parser/Keywords.table
|
||||
- $(AM_V_GEN)$(PERL) $^ > $@
|
||||
+ $(AM_V_GEN)CC=$(CC) $(PERL) $^ > $@
|
||||
|
||||
DerivedSources/JavaScriptCore/%.lut.h: $(srcdir)/Source/JavaScriptCore/create_hash_table $(srcdir)/Source/JavaScriptCore/runtime/%.cpp
|
||||
- $(AM_V_GEN)$(PERL) $^ -i > $@
|
||||
+ $(AM_V_GEN)CC=$(CC) $(PERL) $^ -i > $@
|
||||
|
||||
DerivedSources/JavaScriptCore/RegExpJitTables.h: $(srcdir)/Source/JavaScriptCore/create_regex_tables
|
||||
- $(AM_V_GEN)$(PYTHON) $^ > $@
|
||||
+ $(AM_V_GEN)CC=$(CC) $(PYTHON) $^ > $@
|
||||
|
||||
DerivedSources/JavaScriptCore/KeywordLookup.h: $(srcdir)/Source/JavaScriptCore/KeywordLookupGenerator.py $(srcdir)/Source/JavaScriptCore/parser/Keywords.table
|
||||
- $(AM_V_GEN)$(PYTHON) $^ > $@
|
||||
+ $(AM_V_GEN)CC=$(CC) $(PYTHON) $^ > $@
|
||||
|
||||
DerivedSources/JavaScriptCore/LLIntDesiredOffsets.h: $(javascriptcore_sources) $(llint_nosources) $(offlineasm_nosources)
|
||||
- $(AM_V_GEN)$(RUBY) $(srcdir)/Source/JavaScriptCore/offlineasm/generate_offset_extractor.rb $(srcdir)/Source/JavaScriptCore/llint/LowLevelInterpreter.asm $@
|
||||
+ $(AM_V_GEN)CC=$(CC) $(RUBY) $(srcdir)/Source/JavaScriptCore/offlineasm/generate_offset_extractor.rb $(srcdir)/Source/JavaScriptCore/llint/LowLevelInterpreter.asm $@
|
||||
$(AM_V_at)touch $@
|
||||
|
||||
$(Programs_LLIntOffsetsExtractor_OBJECTS): DerivedSources/JavaScriptCore/LLIntDesiredOffsets.h
|
||||
|
||||
DerivedSources/JavaScriptCore/LLIntAssembly.h: Programs/LLIntOffsetsExtractor$(EXEEXT)
|
||||
- $(AM_V_GEN)$(RUBY) $(srcdir)/Source/JavaScriptCore/offlineasm/asm.rb $(srcdir)/Source/JavaScriptCore/llint/LowLevelInterpreter.asm Programs/LLIntOffsetsExtractor$(EXEEXT) $@
|
||||
+ $(AM_V_GEN)CC=$(CC) $(RUBY) $(srcdir)/Source/JavaScriptCore/offlineasm/asm.rb $(srcdir)/Source/JavaScriptCore/llint/LowLevelInterpreter.asm Programs/LLIntOffsetsExtractor$(EXEEXT) $@
|
||||
$(AM_V_at)touch $@
|
||||
|
||||
$(libjavascriptcoregtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_OBJECTS): DerivedSources/JavaScriptCore/LLIntAssembly.h
|
||||
@@ -253,12 +253,12 @@
|
||||
$(JavaScriptCore)/inspector/protocol/Runtime.json
|
||||
|
||||
DerivedSources/JavaScriptCore/InspectorJS.json: $(INSPECTOR_SCRIPTS_DIR)/generate-combined-inspector-json.py $(JavaScriptCore_INSPECTOR_DOMAINS)
|
||||
- $(AM_V_GEN)$(PYTHON) $(INSPECTOR_SCRIPTS_DIR)/generate-combined-inspector-json.py $(JavaScriptCore)/inspector/protocol > $(GENSOURCES_JAVASCRIPTCORE)/InspectorJS.json
|
||||
+ $(AM_V_GEN)CC=$(CC) $(PYTHON) $(INSPECTOR_SCRIPTS_DIR)/generate-combined-inspector-json.py $(JavaScriptCore)/inspector/protocol > $(GENSOURCES_JAVASCRIPTCORE)/InspectorJS.json
|
||||
|
||||
# Inspector Backend Dispatchers, Frontend Dispatchers, Type Builders
|
||||
# Copy generated header files to DerivedSources/JavaScriptCore/inspector so that WebCore's ForwardingHeader style of #include <inspector/Foo.h> will work.
|
||||
DerivedSources/JavaScriptCore/InspectorJSBackendDispatchers.cpp: DerivedSources/JavaScriptCore/InspectorJS.json $(INSPECTOR_SCRIPTS_DIR)/CodeGeneratorInspector.py $(INSPECTOR_SCRIPTS_DIR)/CodeGeneratorInspectorStrings.py
|
||||
- $(AM_V_GEN)$(PYTHON) $(INSPECTOR_SCRIPTS_DIR)/CodeGeneratorInspector.py $< --output_h_dir $(GENSOURCES_JAVASCRIPTCORE) --output_cpp_dir $(GENSOURCES_JAVASCRIPTCORE) --output_js_dir $(GENSOURCES_JAVASCRIPTCORE) --output_type JavaScript
|
||||
+ $(AM_V_GEN)CC=$(CC) $(PYTHON) $(INSPECTOR_SCRIPTS_DIR)/CodeGeneratorInspector.py $< --output_h_dir $(GENSOURCES_JAVASCRIPTCORE) --output_cpp_dir $(GENSOURCES_JAVASCRIPTCORE) --output_js_dir $(GENSOURCES_JAVASCRIPTCORE) --output_type JavaScript
|
||||
$(AM_V_at)touch $@
|
||||
mkdir -p DerivedSources/JavaScriptCore/inspector
|
||||
cp DerivedSources/JavaScriptCore/InspectorJSTypeBuilders.h DerivedSources/JavaScriptCore/InspectorJSFrontendDispatchers.h DerivedSources/JavaScriptCore/InspectorJSBackendDispatchers.h DerivedSources/JavaScriptCore/inspector
|
||||
@@ -270,6 +270,6 @@
|
||||
DerivedSources/JavaScriptCore/InspectorJSBackendDispatchers.h: DerivedSources/JavaScriptCore/InspectorJSBackendDispatchers.cpp
|
||||
|
||||
DerivedSources/JavaScriptCore/InjectedScriptSource.h: $(JavaScriptCore)/inspector/InjectedScriptSource.js $(INSPECTOR_SCRIPTS_DIR)/xxd.pl $(INSPECTOR_SCRIPTS_DIR)/jsmin.py
|
||||
- $(AM_V_GEN)$(PYTHON) $(INSPECTOR_SCRIPTS_DIR)/jsmin.py < $< > $(GENSOURCES_JAVASCRIPTCORE)/InjectedScriptSource.min.js
|
||||
- $(AM_V_at)$(PERL) $(INSPECTOR_SCRIPTS_DIR)/xxd.pl InjectedScriptSource_js $(GENSOURCES_JAVASCRIPTCORE)/InjectedScriptSource.min.js $@
|
||||
+ $(AM_V_GEN)CC=$(CC) $(PYTHON) $(INSPECTOR_SCRIPTS_DIR)/jsmin.py < $< > $(GENSOURCES_JAVASCRIPTCORE)/InjectedScriptSource.min.js
|
||||
+ $(AM_V_at)CC=$(CC) $(PERL) $(INSPECTOR_SCRIPTS_DIR)/xxd.pl InjectedScriptSource_js $(GENSOURCES_JAVASCRIPTCORE)/InjectedScriptSource.min.js $@
|
||||
$(AM_V_at)rm -rf $(GENSOURCES_JAVASCRIPTCORE)/InjectedScriptSource.min.js
|
||||
--- webkitgtk-2.2.5/Source/Platform/GNUmakefile.am.orig 2014-03-06 03:39:24.590740200 +0000
|
||||
+++ webkitgtk-2.2.5/Source/Platform/GNUmakefile.am 2014-03-06 03:55:39.352519200 +0000
|
||||
@@ -123,8 +123,8 @@
|
||||
$(LIBSOUP_CFLAGS)
|
||||
|
||||
DerivedSources/Platform/ColorData.cpp: $(WebCore)/platform/ColorData.gperf $(WebCore)/make-hash-tools.pl
|
||||
- $(AM_V_GEN)$(PERL) $(WebCore)/make-hash-tools.pl $(GENSOURCES_PLATFORM) $(WebCore)/platform/ColorData.gperf
|
||||
+ $(AM_V_GEN)CC=$(CC) $(PERL) $(WebCore)/make-hash-tools.pl $(GENSOURCES_PLATFORM) $(WebCore)/platform/ColorData.gperf
|
||||
|
||||
DerivedSources/Platform/WebKitFontFamilyNames.cpp: DerivedSources/Platform/WebKitFontFamilyNames.h
|
||||
DerivedSources/Platform/WebKitFontFamilyNames.h: $(WebCore)/dom/make_names.pl $(WebCore)/bindings/scripts/Hasher.pm $(WebCore)/bindings/scripts/StaticString.pm $(WebCore)/css/WebKitFontFamilyNames.in
|
||||
- $(AM_V_GEN)$(PERL) -I$(WebCore)/bindings/scripts $< --fonts $(WebCore)/css/WebKitFontFamilyNames.in --outputDir "$(GENSOURCES_PLATFORM)"
|
||||
+ $(AM_V_GEN)CC=$(CC) $(PERL) -I$(WebCore)/bindings/scripts $< --fonts $(WebCore)/css/WebKitFontFamilyNames.in --outputDir "$(GENSOURCES_PLATFORM)"
|
||||
DerivedSources/InjectedBundle/JS%.cpp: Tools/WebKitTestRunner/InjectedBundle/Bindings/%.idl $(code_generation_dependencies)
|
||||
- $(AM_V_GEN)$(PERL) \
|
||||
+ $(AM_V_GEN)CC=$(CC) $(PERL) \
|
||||
-I $(srcdir)/Source/WebCore/bindings/scripts \
|
||||
-I $(srcdir)/Tools/WebKitTestRunner/InjectedBundle/Bindings \
|
||||
$(srcdir)/Source/WebCore/bindings/scripts/generate-bindings.pl \
|
||||
--
|
||||
1.8.5.3
|
||||
|
||||
@@ -0,0 +1,47 @@
|
||||
From 15bb53231a42240baf882baeeb265b5bee861190 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?=D0=A0=D1=83=D1=81=D0=BB=D0=B0=D0=BD=20=D0=98=D0=B6=D0=B1?=
|
||||
=?UTF-8?q?=D1=83=D0=BB=D0=B0=D1=82=D0=BE=D0=B2?= <lrn1986@gmail.com>
|
||||
Date: Tue, 14 Apr 2015 10:48:26 +0000
|
||||
Subject: [PATCH 14/20] [W32][ANGLE] Silence two warnings in ANGLE
|
||||
|
||||
../webkitgtk-2.4.8/Source/ThirdParty/ANGLE/src/compiler/ParseContext.cpp:538:123: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
|
||||
if (op == EOpConstructStruct && !type->isArray() && int(type->getStruct()->fields().size()) != function.getParamCount()) {
|
||||
^
|
||||
../webkitgtk-2.4.8/Source/ThirdParty/ANGLE/src/compiler/depgraph/DependencyGraph.cpp:7:0: warning: ignoring #pragma warning [-Wunknown-pragmas]
|
||||
#pragma warning(disable: 4718)
|
||||
^
|
||||
---
|
||||
Source/ThirdParty/ANGLE/src/compiler/ParseContext.cpp | 2 +-
|
||||
Source/ThirdParty/ANGLE/src/compiler/depgraph/DependencyGraph.cpp | 2 ++
|
||||
2 files changed, 3 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/Source/ThirdParty/ANGLE/src/compiler/ParseContext.cpp b/Source/ThirdParty/ANGLE/src/compiler/ParseContext.cpp
|
||||
index 9a27952..a93d286 100644
|
||||
--- a/Source/ThirdParty/ANGLE/src/compiler/ParseContext.cpp
|
||||
+++ b/Source/ThirdParty/ANGLE/src/compiler/ParseContext.cpp
|
||||
@@ -535,7 +535,7 @@ bool TParseContext::constructorErrorCheck(const TSourceLoc& line, TIntermNode* n
|
||||
return true;
|
||||
}
|
||||
|
||||
- if (op == EOpConstructStruct && !type->isArray() && int(type->getStruct()->fields().size()) != function.getParamCount()) {
|
||||
+ if (op == EOpConstructStruct && !type->isArray() && int(type->getStruct()->fields().size()) != int(function.getParamCount())) {
|
||||
error(line, "Number of constructor parameters does not match the number of structure fields", "constructor");
|
||||
return true;
|
||||
}
|
||||
diff --git a/Source/ThirdParty/ANGLE/src/compiler/depgraph/DependencyGraph.cpp b/Source/ThirdParty/ANGLE/src/compiler/depgraph/DependencyGraph.cpp
|
||||
index ca661d6..3d306a3 100644
|
||||
--- a/Source/ThirdParty/ANGLE/src/compiler/depgraph/DependencyGraph.cpp
|
||||
+++ b/Source/ThirdParty/ANGLE/src/compiler/depgraph/DependencyGraph.cpp
|
||||
@@ -4,7 +4,9 @@
|
||||
// found in the LICENSE file.
|
||||
//
|
||||
|
||||
+#ifdef _MSC_VER
|
||||
#pragma warning(disable: 4718)
|
||||
+#endif
|
||||
|
||||
#include "compiler/depgraph/DependencyGraph.h"
|
||||
#include "compiler/depgraph/DependencyGraphBuilder.h"
|
||||
--
|
||||
1.8.5.3
|
||||
|
||||
@@ -0,0 +1,42 @@
|
||||
From dd36f7430eed1724cfa8bc30ceaa6159569ee9e8 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?=D0=A0=D1=83=D1=81=D0=BB=D0=B0=D0=BD=20=D0=98=D0=B6=D0=B1?=
|
||||
=?UTF-8?q?=D1=83=D0=BB=D0=B0=D1=82=D0=BE=D0=B2?= <lrn1986@gmail.com>
|
||||
Date: Tue, 14 Apr 2015 10:51:02 +0000
|
||||
Subject: [PATCH 15/20] [W32] Try to use pkg-config to detect ICU libraries
|
||||
|
||||
MinGW packages tend to have .pc files these days. Use them.
|
||||
|
||||
ICU naming and structure is complex enough to warrant this, and asking
|
||||
pkg-config might result in things like
|
||||
UNICODE_LIBS="-licui18n54 -licuuc54 -licudata54"
|
||||
instead of the default
|
||||
UNICODE_LIBS="-licui18n -licuuc"
|
||||
and pkg-config usually knows best.
|
||||
---
|
||||
Source/autotools/FindDependencies.m4 | 10 ++++++++--
|
||||
1 file changed, 8 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/Source/autotools/FindDependencies.m4 b/Source/autotools/FindDependencies.m4
|
||||
index 3ce3f76..a21e68d 100644
|
||||
--- a/Source/autotools/FindDependencies.m4
|
||||
+++ b/Source/autotools/FindDependencies.m4
|
||||
@@ -109,8 +109,14 @@ case "$host" in
|
||||
UNICODE_LIBS="-licucore"
|
||||
;;
|
||||
*-*-mingw*)
|
||||
- UNICODE_CFLAGS=""
|
||||
- UNICODE_LIBS="-licui18n -licuuc"
|
||||
+ PKG_CHECK_MODULES(ICU, icu-i18n, ,)
|
||||
+ if test "x$ICU_LIBS" = "x" ; then
|
||||
+ UNICODE_CFLAGS=""
|
||||
+ UNICODE_LIBS="-licui18n -licuuc"
|
||||
+ else
|
||||
+ UNICODE_CFLAGS="$ICU_CFLAGS"
|
||||
+ UNICODE_LIBS="$ICU_LIBS"
|
||||
+ fi
|
||||
AC_CHECK_HEADERS([unicode/uchar.h], [], [AC_MSG_ERROR([Could not find ICU headers.])])
|
||||
;;
|
||||
*)
|
||||
--
|
||||
1.8.5.3
|
||||
|
||||
@@ -0,0 +1,95 @@
|
||||
From 9a724e8caa5b27fdece040d3f698d9948f62ae6c Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?=D0=A0=D1=83=D1=81=D0=BB=D0=B0=D0=BD=20=D0=98=D0=B6=D0=B1?=
|
||||
=?UTF-8?q?=D1=83=D0=BB=D0=B0=D1=82=D0=BE=D0=B2?= <lrn1986@gmail.com>
|
||||
Date: Tue, 14 Apr 2015 10:57:41 +0000
|
||||
Subject: [PATCH 16/20] [W32][GTK] Work around name conflicts (NO_ERROR)
|
||||
|
||||
In file included from /mingw/include/_mingw.h:12:0,
|
||||
from ../webkitgtk-2.4.8/Source/WTF/wtf/Compiler.h:93,
|
||||
from ../webkitgtk-2.4.8/Source/WTF/wtf/Platform.h:32,
|
||||
from ../webkitgtk-2.4.8/Source/JavaScriptCore/config.h:30,
|
||||
from ../webkitgtk-2.4.8/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGLCommon.cpp:27:
|
||||
../webkitgtk-2.4.8/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGLCommon.cpp: In member function 'virtual int WebCore::Extensions3DOpenGLCommon::getGraphicsResetStatusARB()':
|
||||
../webkitgtk-2.4.8/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGLCommon.cpp:144:31: error: expected unqualified-id before numeric constant
|
||||
return GraphicsContext3D::NO_ERROR;
|
||||
|
||||
because NO_ERROR is also a macro defined in Windows headers. Ouch.
|
||||
Also expand this to the (PLATFORM(GTK) && OS(WINDOWS)) combination,
|
||||
in addition to the workaround for VERSION already present there.
|
||||
---
|
||||
Source/WebCore/html/canvas/WebGLRenderingContext.cpp | 8 ++++++++
|
||||
Source/WebCore/platform/graphics/GraphicsContext3D.h | 6 ++++--
|
||||
.../WebCore/platform/graphics/opengl/Extensions3DOpenGLCommon.cpp | 4 ++++
|
||||
.../platform/graphics/texmap/TextureMapperShaderProgram.cpp | 4 ++++
|
||||
4 files changed, 20 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/Source/WebCore/html/canvas/WebGLRenderingContext.cpp b/Source/WebCore/html/canvas/WebGLRenderingContext.cpp
|
||||
index fa5537b..758abeb 100644
|
||||
--- a/Source/WebCore/html/canvas/WebGLRenderingContext.cpp
|
||||
+++ b/Source/WebCore/html/canvas/WebGLRenderingContext.cpp
|
||||
@@ -85,6 +85,14 @@
|
||||
#include <wtf/text/CString.h>
|
||||
#include <wtf/text/StringBuilder.h>
|
||||
|
||||
+#if PLATFORM(WIN) || (PLATFORM(QT) && OS(WINDOWS)) || (PLATFORM(GTK) && OS(WINDOWS))
|
||||
+#undef NO_ERROR
|
||||
+#endif
|
||||
+
|
||||
+#if PLATFORM(GTK)
|
||||
+#undef VERSION
|
||||
+#endif
|
||||
+
|
||||
namespace WebCore {
|
||||
|
||||
const double secondsBetweenRestoreAttempts = 1.0;
|
||||
diff --git a/Source/WebCore/platform/graphics/GraphicsContext3D.h b/Source/WebCore/platform/graphics/GraphicsContext3D.h
|
||||
index 705c327..de53b04 100644
|
||||
--- a/Source/WebCore/platform/graphics/GraphicsContext3D.h
|
||||
+++ b/Source/WebCore/platform/graphics/GraphicsContext3D.h
|
||||
@@ -43,9 +43,11 @@
|
||||
#endif
|
||||
|
||||
// FIXME: Find a better way to avoid the name confliction for NO_ERROR.
|
||||
-#if PLATFORM(WIN)
|
||||
+#if PLATFORM(WIN) || (PLATFORM(QT) && OS(WINDOWS)) || (PLATFORM(GTK) && OS(WINDOWS))
|
||||
#undef NO_ERROR
|
||||
-#elif PLATFORM(GTK)
|
||||
+#endif
|
||||
+
|
||||
+#if PLATFORM(GTK)
|
||||
// This define is from the X11 headers, but it's used below, so we must undefine it.
|
||||
#undef VERSION
|
||||
#endif
|
||||
diff --git a/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGLCommon.cpp b/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGLCommon.cpp
|
||||
index f1713d8..3bd2b73 100644
|
||||
--- a/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGLCommon.cpp
|
||||
+++ b/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGLCommon.cpp
|
||||
@@ -49,6 +49,10 @@
|
||||
#include <wtf/MainThread.h>
|
||||
#include <wtf/Vector.h>
|
||||
|
||||
+#if PLATFORM(WIN) || (PLATFORM(QT) && OS(WINDOWS)) || (PLATFORM(GTK) && OS(WINDOWS))
|
||||
+#undef NO_ERROR
|
||||
+#endif
|
||||
+
|
||||
namespace WebCore {
|
||||
|
||||
Extensions3DOpenGLCommon::Extensions3DOpenGLCommon(GraphicsContext3D* context)
|
||||
diff --git a/Source/WebCore/platform/graphics/texmap/TextureMapperShaderProgram.cpp b/Source/WebCore/platform/graphics/texmap/TextureMapperShaderProgram.cpp
|
||||
index f4b9a7e..d8caeac 100644
|
||||
--- a/Source/WebCore/platform/graphics/texmap/TextureMapperShaderProgram.cpp
|
||||
+++ b/Source/WebCore/platform/graphics/texmap/TextureMapperShaderProgram.cpp
|
||||
@@ -29,6 +29,10 @@
|
||||
|
||||
#include <wtf/text/StringBuilder.h>
|
||||
|
||||
+#if PLATFORM(WIN) || (PLATFORM(QT) && OS(WINDOWS)) || (PLATFORM(GTK) && OS(WINDOWS))
|
||||
+#undef NO_ERROR
|
||||
+#endif
|
||||
+
|
||||
#define STRINGIFY(...) #__VA_ARGS__
|
||||
|
||||
namespace WebCore {
|
||||
--
|
||||
1.8.5.3
|
||||
|
||||
@@ -0,0 +1,56 @@
|
||||
From 1c8e4633f8b938a1aaa9a65d992c42bae46fe386 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?=D0=A0=D1=83=D1=81=D0=BB=D0=B0=D0=BD=20=D0=98=D0=B6=D0=B1?=
|
||||
=?UTF-8?q?=D1=83=D0=BB=D0=B0=D1=82=D0=BE=D0=B2?= <lrn1986@gmail.com>
|
||||
Date: Tue, 14 Apr 2015 11:02:02 +0000
|
||||
Subject: [PATCH 17/20] [W32] Also use GL-related files when compiling with
|
||||
MinGW
|
||||
|
||||
CXXLD libwebkitgtk-3.0.la
|
||||
./.libs/../source/webcore/platform/graphics/.libs/libplatform_la-graphicscontext3dprivate.o: In function `GraphicsContext3DPrivate':
|
||||
/src/mingw/webkitgtk-2.4.8-1\bld/../webkitgtk-2.4.8/Source/WebCore/platform/graphics/GraphicsContext3DPrivate.cpp:59: undefined reference to `__ZN7WebCore9GLContext14sharingContextEv'
|
||||
/src/mingw/webkitgtk-2.4.8-1\bld/../webkitgtk-2.4.8/Source/WebCore/platform/graphics/GraphicsContext3DPrivate.cpp:59: undefined reference to `__ZN7WebCore9GLContext22createOffscreenContextEPS0_'
|
||||
./.libs/../source/webcore/platform/graphics/.libs/libplatform_la-graphicscontext3dprivate.o: In function `platformContext':
|
||||
/src/mingw/webkitgtk-2.4.8-1\bld/../webkitgtk-2.4.8/Source/WebCore/platform/graphics/GraphicsContext3DPrivate.cpp:84: undefined reference to `__ZN7WebCore9GLContext10getCurrentEv'
|
||||
|
||||
Becuase GLContext.cpp is not used, which happens because it's under
|
||||
TARGET_X11_OR_WAYLAND condition in the GNUmakefile.list.am.
|
||||
Move TARGET_X11_OR_WAYLAND up a bit to free up GLContext.cpp (now only
|
||||
protected by USE_OPENGL).
|
||||
---
|
||||
Source/WebCore/GNUmakefile.list.am | 13 +++++++------
|
||||
1 file changed, 7 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/Source/WebCore/GNUmakefile.list.am b/Source/WebCore/GNUmakefile.list.am
|
||||
index 22956c7..443399d 100644
|
||||
--- a/Source/WebCore/GNUmakefile.list.am
|
||||
+++ b/Source/WebCore/GNUmakefile.list.am
|
||||
@@ -6267,6 +6267,13 @@ if TARGET_X11_OR_WAYLAND
|
||||
platformgtk_sources += \
|
||||
Source/WebCore/platform/cairo/WidgetBackingStoreCairo.h \
|
||||
Source/WebCore/platform/cairo/WidgetBackingStoreCairo.cpp
|
||||
+if USE_EGL
|
||||
+webcoregtk_sources += \
|
||||
+ Source/WebCore/platform/graphics/egl/GLContextEGL.cpp \
|
||||
+ Source/WebCore/platform/graphics/egl/GLContextEGL.h
|
||||
+endif # END USE_EGL
|
||||
+endif # END TARGET_X11_OR_WAYLAND
|
||||
+
|
||||
if USE_OPENGL
|
||||
platformgtk_sources += \
|
||||
Source/WebCore/platform/graphics/GLContext.cpp \
|
||||
@@ -6274,12 +6281,6 @@ platformgtk_sources += \
|
||||
Source/WebCore/platform/gtk/RedirectedXCompositeWindow.cpp \
|
||||
Source/WebCore/platform/gtk/RedirectedXCompositeWindow.h
|
||||
endif # END USE_OPENGL
|
||||
-if USE_EGL
|
||||
-webcoregtk_sources += \
|
||||
- Source/WebCore/platform/graphics/egl/GLContextEGL.cpp \
|
||||
- Source/WebCore/platform/graphics/egl/GLContextEGL.h
|
||||
-endif # END USE_EGL
|
||||
-endif # END TARGET_X11_OR_WAYLAND
|
||||
|
||||
if TARGET_WIN32
|
||||
webcore_sources += \
|
||||
--
|
||||
1.8.5.3
|
||||
|
||||
@@ -0,0 +1,56 @@
|
||||
From e7ce4cf2de87ec0cbe2d60738cd5ca9515d56c3a Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?=D0=A0=D1=83=D1=81=D0=BB=D0=B0=D0=BD=20=D0=98=D0=B6=D0=B1?=
|
||||
=?UTF-8?q?=D1=83=D0=BB=D0=B0=D1=82=D0=BE=D0=B2?= <lrn1986@gmail.com>
|
||||
Date: Tue, 14 Apr 2015 14:48:32 +0000
|
||||
Subject: [PATCH 18/20] Silence the warning about JSValue 'v' being
|
||||
uninitialized
|
||||
|
||||
This shouldn't really happen, as the enumeration only has two values,
|
||||
but gcc doesn't seem to understand it. Probably because it's a template.
|
||||
Also, 'v' is an object, so there's an uninitialized object that participates
|
||||
in a '=' operator, so that could be the cause for concern as well.
|
||||
|
||||
Fix this by completely separating two cases at the cost of code duplication.
|
||||
|
||||
Otherwise one would get this:
|
||||
../webkitgtk-2.4.8/Source/JavaScriptCore/runtime/JSObject.cpp: In member function 'JSC::ContiguousJSValues JSC::JSObject::genericConvertDoubleToContiguous(JSC::VM&) [with JSC::JSObject::DoubleToContiguousMode mode = (JSC::JSObject::DoubleToContiguousMode)0u; JSC::ContiguousJSValues = JSC::ContiguousData<JSC::WriteBarrier<JSC::Unknown> >]':
|
||||
../webkitgtk-2.4.8/Source/JavaScriptCore/runtime/JSObject.cpp:822:17: warning: 'v' is used uninitialized in this function [-Wuninitialized]
|
||||
---
|
||||
Source/JavaScriptCore/runtime/JSObject.cpp | 20 ++++++++++++--------
|
||||
1 file changed, 12 insertions(+), 8 deletions(-)
|
||||
|
||||
diff --git a/Source/JavaScriptCore/runtime/JSObject.cpp b/Source/JavaScriptCore/runtime/JSObject.cpp
|
||||
index 6910b7e..5f52fe0 100644
|
||||
--- a/Source/JavaScriptCore/runtime/JSObject.cpp
|
||||
+++ b/Source/JavaScriptCore/runtime/JSObject.cpp
|
||||
@@ -821,15 +821,19 @@ ContiguousJSValues JSObject::genericConvertDoubleToContiguous(VM& vm)
|
||||
}
|
||||
JSValue v;
|
||||
switch (mode) {
|
||||
- case EncodeValueAsDouble:
|
||||
- v = JSValue(JSValue::EncodeAsDouble, value);
|
||||
- break;
|
||||
- case RageConvertDoubleToValue:
|
||||
- v = jsNumber(value);
|
||||
- break;
|
||||
+ case EncodeValueAsDouble: {
|
||||
+ JSValue v = JSValue(JSValue::EncodeAsDouble, value);
|
||||
+ ASSERT(v.isNumber());
|
||||
+ currentAsValue->setWithoutWriteBarrier(v);
|
||||
+ break;
|
||||
+ }
|
||||
+ case RageConvertDoubleToValue: {
|
||||
+ JSValue v = jsNumber(value);
|
||||
+ ASSERT(v.isNumber());
|
||||
+ currentAsValue->setWithoutWriteBarrier(v);
|
||||
+ break;
|
||||
+ }
|
||||
}
|
||||
- ASSERT(v.isNumber());
|
||||
- currentAsValue->setWithoutWriteBarrier(v);
|
||||
}
|
||||
|
||||
setStructure(vm, Structure::nonPropertyTransition(vm, structure(), AllocateContiguous));
|
||||
--
|
||||
1.8.5.3
|
||||
|
||||
@@ -1,13 +0,0 @@
|
||||
--- webkitgtk-2.2.5/Source/WebKit/gtk/GNUmakefile.am.orig 2014-02-17 11:24:13.000000000 +0000
|
||||
+++ webkitgtk-2.2.5/Source/WebKit/gtk/GNUmakefile.am 2014-03-07 02:38:18.647631200 +0000
|
||||
@@ -301,8 +301,8 @@
|
||||
--include=Gtk-@GTK_API_VERSION@ \
|
||||
--include=JavaScriptCore-@WEBKITGTK_API_VERSION@ \
|
||||
--include=Soup-2.4 \
|
||||
- --library=webkitgtk-@WEBKITGTK_API_VERSION@ \
|
||||
- --library=javascriptcoregtk-@WEBKITGTK_API_VERSION@ \
|
||||
+ --library=libwebkitgtk-@WEBKITGTK_API_MAJOR_VERSION@.@WEBKITGTK_API_MINOR_VERSION@.la \
|
||||
+ --library=libjavascriptcoregtk-@WEBKITGTK_API_MAJOR_VERSION@.@WEBKITGTK_API_MINOR_VERSION@.la \
|
||||
--libtool="$(LIBTOOL)" \
|
||||
--pkg=gobject-2.0 \
|
||||
--pkg=gtk+-@GTK_API_VERSION@ \
|
||||
@@ -0,0 +1,188 @@
|
||||
From 00333182aa303b29975ac3aa656eaf29c4d5d0e5 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?=D0=A0=D1=83=D1=81=D0=BB=D0=B0=D0=BD=20=D0=98=D0=B6=D0=B1?=
|
||||
=?UTF-8?q?=D1=83=D0=BB=D0=B0=D1=82=D0=BE=D0=B2?= <lrn1986@gmail.com>
|
||||
Date: Tue, 14 Apr 2015 14:51:22 +0000
|
||||
Subject: [PATCH 19/20] [W32] Update windowsVersion() and
|
||||
osVersionForUAString()
|
||||
|
||||
Add support for newer Windows versions to windowsVersion(), handle all
|
||||
defined cases in osVersionForUAString(), avoiding warnings like
|
||||
../webkitgtk-2.4.8/Source/WebCore/platform/win/SystemInfo.cpp: In function 'WTF::String WebCore::osVersionForUAString()':
|
||||
../webkitgtk-2.4.8/Source/WebCore/platform/win/SystemInfo.cpp:94:12: warning: enumeration value 'WindowsCE5' not handled in switch [-Wswitch]
|
||||
repeated for each unhandled value
|
||||
---
|
||||
Source/WebCore/platform/win/SystemInfo.cpp | 107 +++++++++++++++++++++++++++--
|
||||
Source/WebCore/platform/win/SystemInfo.h | 9 +++
|
||||
2 files changed, 111 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/Source/WebCore/platform/win/SystemInfo.cpp b/Source/WebCore/platform/win/SystemInfo.cpp
|
||||
index c9edca0..de5e8dc 100644
|
||||
--- a/Source/WebCore/platform/win/SystemInfo.cpp
|
||||
+++ b/Source/WebCore/platform/win/SystemInfo.cpp
|
||||
@@ -29,6 +29,10 @@
|
||||
#include <windows.h>
|
||||
#include <wtf/text/WTFString.h>
|
||||
|
||||
+#ifndef SM_SERVERR2
|
||||
+#define SM_SERVERR2 89
|
||||
+#endif
|
||||
+
|
||||
namespace WebCore {
|
||||
|
||||
WindowsVersion windowsVersion(int* major, int* minor)
|
||||
@@ -65,15 +69,73 @@ WindowsVersion windowsVersion(int* major, int* minor)
|
||||
version = (minorVersion == 10) ? Windows98 : WindowsME;
|
||||
} else {
|
||||
if (majorVersion == 5) {
|
||||
- if (!minorVersion)
|
||||
+ switch (minorVersion) {
|
||||
+ default:
|
||||
+ case 0:
|
||||
version = Windows2000;
|
||||
+ break;
|
||||
+ case 1:
|
||||
+ version = WindowsXP;
|
||||
+ break;
|
||||
+ case 2:
|
||||
+ if (versionInfo.wProductType == VER_NT_WORKSTATION)
|
||||
+ version = WindowsXP64;
|
||||
+ else {
|
||||
+ if (GetSystemMetrics(SM_SERVERR2) == 0)
|
||||
+ version = WindowsServer2003;
|
||||
+ else
|
||||
+ version = WindowsServer2003R2;
|
||||
+ }
|
||||
+ break;
|
||||
+ }
|
||||
+ } else if (majorVersion == 6) {
|
||||
+ if (versionInfo.wProductType == VER_NT_WORKSTATION)
|
||||
+ switch (minorVersion) {
|
||||
+ default:
|
||||
+ case 0:
|
||||
+ version = WindowsVista;
|
||||
+ break;
|
||||
+ case 1:
|
||||
+ version = Windows7;
|
||||
+ break;
|
||||
+ case 2:
|
||||
+ version = Windows8;
|
||||
+ break;
|
||||
+ case 3:
|
||||
+ version = Windows81;
|
||||
+ break;
|
||||
+ }
|
||||
else
|
||||
- version = (minorVersion == 1) ? WindowsXP : WindowsServer2003;
|
||||
- } else if (majorVersion >= 6) {
|
||||
+ switch (minorVersion) {
|
||||
+ default:
|
||||
+ case 0:
|
||||
+ version = WindowsServer2008;
|
||||
+ break;
|
||||
+ case 1:
|
||||
+ version = WindowsServer2008R2;
|
||||
+ break;
|
||||
+ case 2:
|
||||
+ version = WindowsServer2012;
|
||||
+ break;
|
||||
+ case 3:
|
||||
+ version = WindowsServer2012R2;
|
||||
+ break;
|
||||
+ }
|
||||
+ } else if (majorVersion == 10) {
|
||||
if (versionInfo.wProductType == VER_NT_WORKSTATION)
|
||||
- version = (majorVersion == 6 && !minorVersion) ? WindowsVista : Windows7;
|
||||
+ switch (minorVersion) {
|
||||
+ default:
|
||||
+ case 0:
|
||||
+ version = Windows10;
|
||||
+ break;
|
||||
+ }
|
||||
else
|
||||
- version = WindowsServer2008;
|
||||
+ switch (minorVersion) {
|
||||
+ default:
|
||||
+ case 0:
|
||||
+ version = WindowsServer2016;
|
||||
+ break;
|
||||
+ }
|
||||
} else
|
||||
version = (majorVersion == 4) ? WindowsNT4 : WindowsNT3;
|
||||
}
|
||||
@@ -97,6 +159,9 @@ static String osVersionForUAString()
|
||||
case WindowsCE3:
|
||||
return "Windows CE";
|
||||
case WindowsCE4:
|
||||
+ case WindowsCE5:
|
||||
+ case WindowsCE6:
|
||||
+ case WindowsCE7:
|
||||
return "Windows CE .NET";
|
||||
case Windows3_1:
|
||||
return "Windows 3.1";
|
||||
@@ -106,8 +171,40 @@ static String osVersionForUAString()
|
||||
return "Windows 98";
|
||||
case WindowsME:
|
||||
return "Windows 98; Win 9x 4.90";
|
||||
+ case WindowsNT3:
|
||||
+ return "WinNT3.0";
|
||||
case WindowsNT4:
|
||||
return "WinNT4.0";
|
||||
+ case Windows2000:
|
||||
+ return "Windows 2000";
|
||||
+ case WindowsXP:
|
||||
+ return "Windows XP";
|
||||
+ case WindowsServer2003:
|
||||
+ return "Windows Server 2003";
|
||||
+ case WindowsXP64:
|
||||
+ return "Windows XP Professional x64 Edition";
|
||||
+ case WindowsServer2003R2:
|
||||
+ return "Windows Server 2003 R2";
|
||||
+ case WindowsVista:
|
||||
+ return "Windows Vista";
|
||||
+ case WindowsServer2008:
|
||||
+ return "Windows Server 2008";
|
||||
+ case Windows7:
|
||||
+ return "Windows 7";
|
||||
+ case WindowsServer2008R2:
|
||||
+ return "Windows Server 2008 R2";
|
||||
+ case Windows8:
|
||||
+ return "Windows 8";
|
||||
+ case WindowsServer2012:
|
||||
+ return "Windows Server 2012";
|
||||
+ case Windows81:
|
||||
+ return "Windows 8.1";
|
||||
+ case WindowsServer2012R2:
|
||||
+ return "Windows Server 2012 R2";
|
||||
+ case Windows10:
|
||||
+ return "Windows 10";
|
||||
+ case WindowsServer2016:
|
||||
+ return "Windows Server 2016";
|
||||
}
|
||||
|
||||
const char* familyName = (version >= WindowsNT3) ? "Windows NT " : "Windows CE ";
|
||||
diff --git a/Source/WebCore/platform/win/SystemInfo.h b/Source/WebCore/platform/win/SystemInfo.h
|
||||
index 2631ace..7bfb222 100644
|
||||
--- a/Source/WebCore/platform/win/SystemInfo.h
|
||||
+++ b/Source/WebCore/platform/win/SystemInfo.h
|
||||
@@ -54,9 +54,18 @@ enum WindowsVersion {
|
||||
Windows2000,
|
||||
WindowsXP,
|
||||
WindowsServer2003,
|
||||
+ WindowsXP64,
|
||||
+ WindowsServer2003R2,
|
||||
WindowsVista,
|
||||
WindowsServer2008,
|
||||
Windows7,
|
||||
+ WindowsServer2008R2,
|
||||
+ Windows8,
|
||||
+ WindowsServer2012,
|
||||
+ Windows81,
|
||||
+ WindowsServer2012R2,
|
||||
+ Windows10,
|
||||
+ WindowsServer2016,
|
||||
};
|
||||
|
||||
// If supplied, |major| and |minor| are set to the OSVERSIONINFO::dwMajorVersion
|
||||
--
|
||||
1.8.5.3
|
||||
|
||||
@@ -0,0 +1,29 @@
|
||||
From 0505839dc1793406aa37bc95ee51ea361e9508a0 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?=D0=A0=D1=83=D1=81=D0=BB=D0=B0=D0=BD=20=D0=98=D0=B6=D0=B1?=
|
||||
=?UTF-8?q?=D1=83=D0=BB=D0=B0=D1=82=D0=BE=D0=B2?= <lrn1986@gmail.com>
|
||||
Date: Tue, 14 Apr 2015 14:53:29 +0000
|
||||
Subject: [PATCH 20/20] [W32] Fixup dummy HeapStatistics implementation
|
||||
|
||||
GCC warns that exitWithFailure is marked as noreturn, but it does return:
|
||||
../webkitgtk-2.4.8/Source/JavaScriptCore/heap/HeapStatistics.cpp:135:1: warning: 'noreturn' function does return
|
||||
|
||||
Call exit(-1) to indicate that no, there is no returning from here.
|
||||
---
|
||||
Source/JavaScriptCore/heap/HeapStatistics.cpp | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/Source/JavaScriptCore/heap/HeapStatistics.cpp b/Source/JavaScriptCore/heap/HeapStatistics.cpp
|
||||
index f23def7..ba441f0 100644
|
||||
--- a/Source/JavaScriptCore/heap/HeapStatistics.cpp
|
||||
+++ b/Source/JavaScriptCore/heap/HeapStatistics.cpp
|
||||
@@ -132,6 +132,7 @@ void HeapStatistics::logStatistics()
|
||||
|
||||
void HeapStatistics::exitWithFailure()
|
||||
{
|
||||
+ exit(-1);
|
||||
}
|
||||
|
||||
void HeapStatistics::reportSuccess()
|
||||
--
|
||||
1.8.5.3
|
||||
|
||||
@@ -0,0 +1,68 @@
|
||||
From f90a814ad83d7c6279eaf1fc59d3d373ba7af259 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?=D0=A0=D1=83=D1=81=D0=BB=D0=B0=D0=BD=20=D0=98=D0=B6=D0=B1?=
|
||||
=?UTF-8?q?=D1=83=D0=BB=D0=B0=D1=82=D0=BE=D0=B2?= <lrn1986@gmail.com>
|
||||
Date: Tue, 14 Apr 2015 17:50:25 +0000
|
||||
Subject: [PATCH 21/21] [W32] Change printf format atribute to gnu_printf,
|
||||
MinGW compatibility
|
||||
|
||||
"printf" means "gnu_printf" when compiling for non-Windows and means
|
||||
"ms_printf" when compiling for Windows. The code, however, does seems to be
|
||||
assuming gnu_printf (judging by the use of %z and %l).
|
||||
|
||||
Fix this by explicitly specifying gnu_printf format style.
|
||||
To ensure that gnu-compatible printf implementation is used, compile
|
||||
with -D__USE_MINGW_ANSI_STDIO=1, it will automagically turn all *printf()
|
||||
invocations into __mingw_*printf(), which are gnu-compatible.
|
||||
|
||||
Only one function that won't be turned is _vsnprintf(). Ifdef its use and
|
||||
call vsnprintf() instead when __USE_MINGW_ANSI_STDIO != 0.
|
||||
---
|
||||
Source/WTF/wtf/Assertions.cpp | 11 ++++++++++-
|
||||
Source/WTF/wtf/Assertions.h | 4 ++--
|
||||
2 files changed, 12 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/Source/WTF/wtf/Assertions.cpp b/Source/WTF/wtf/Assertions.cpp
|
||||
index a370302..d846777 100644
|
||||
--- a/Source/WTF/wtf/Assertions.cpp
|
||||
+++ b/Source/WTF/wtf/Assertions.cpp
|
||||
@@ -116,12 +116,21 @@ static void vprintf_stderr_common(const char* format, va_list args)
|
||||
size_t size = 1024;
|
||||
|
||||
do {
|
||||
+ int printed;
|
||||
char* buffer = (char*)malloc(size);
|
||||
|
||||
if (buffer == NULL)
|
||||
break;
|
||||
|
||||
- if (_vsnprintf(buffer, size, format, args) != -1) {
|
||||
+#if defined(__USE_MINGW_ANSI_STDIO) && __USE_MINGW_ANSI_STDIO != 0
|
||||
+ /* vsnprintf is a macro for __mingw_vsnprintf */
|
||||
+ printed = vsnprintf(buffer, size, format, args);
|
||||
+#else
|
||||
+ /* _vsnprintf is always _vsnprintf from MS CRT */
|
||||
+ printed = _vsnprintf(buffer, size, format, args);
|
||||
+#endif
|
||||
+
|
||||
+ if (printed != -1) {
|
||||
#if OS(WINCE)
|
||||
// WinCE only supports wide chars
|
||||
wchar_t* wideBuffer = (wchar_t*)malloc(size * sizeof(wchar_t));
|
||||
diff --git a/Source/WTF/wtf/Assertions.h b/Source/WTF/wtf/Assertions.h
|
||||
index 4d968b8..cb7c7e4 100644
|
||||
--- a/Source/WTF/wtf/Assertions.h
|
||||
+++ b/Source/WTF/wtf/Assertions.h
|
||||
@@ -85,8 +85,8 @@
|
||||
/* WTF logging functions can process %@ in the format string to log a NSObject* but the printf format attribute
|
||||
emits a warning when %@ is used in the format string. Until <rdar://problem/5195437> is resolved we can't include
|
||||
the attribute when being used from Objective-C code in case it decides to use %@. */
|
||||
-#if COMPILER(GCC) && !defined(__OBJC__)
|
||||
-#define WTF_ATTRIBUTE_PRINTF(formatStringArgument, extraArguments) __attribute__((__format__(printf, formatStringArgument, extraArguments)))
|
||||
+#if COMPILER(GCC) && !defined(__OBJC__) && (!OS(WINDOWS) || (defined(__USE_MINGW_ANSI_STDIO) && __USE_MINGW_ANSI_STDIO != 0))
|
||||
+#define WTF_ATTRIBUTE_PRINTF(formatStringArgument, extraArguments) __attribute__((__format__(gnu_printf, formatStringArgument, extraArguments)))
|
||||
#else
|
||||
#define WTF_ATTRIBUTE_PRINTF(formatStringArgument, extraArguments)
|
||||
#endif
|
||||
--
|
||||
1.8.5.3
|
||||
|
||||
@@ -1,22 +0,0 @@
|
||||
--- webkitgtk-2.4.8/Tools/gtk/GNUmakefile.am.orig 2015-01-07 09:45:43.000000000 +0000
|
||||
+++ webkitgtk-2.4.8/Tools/gtk/GNUmakefile.am 2015-03-24 06:29:42.649391900 +0000
|
||||
@@ -35,7 +35,7 @@
|
||||
gtkdoc-webkitdom.cfg
|
||||
|
||||
docs-build.stamp: $(docs_build_dependencies)
|
||||
- CC=$(CC) $(srcdir)/Tools/gtk/generate-gtkdoc
|
||||
+ CC=$(CC) $(PYTHON) $(srcdir)/Tools/gtk/generate-gtkdoc
|
||||
@touch docs-build.stamp
|
||||
|
||||
clean-local: doc-clean-local
|
||||
--- webkitgtk-2.4.8/Source/WebInspectorUI/GNUmakefile.am.orig 2015-01-07 09:45:43.000000000 +0000
|
||||
+++ webkitgtk-2.4.8/Source/WebInspectorUI/GNUmakefile.am 2015-03-24 07:19:52.380579200 +0000
|
||||
@@ -13,7 +13,7 @@
|
||||
$(srcdir)/Tools/gtk/generate-inspector-gresource-manifest.py
|
||||
$(AM_V_GEN)
|
||||
$(AM_V_at)mkdir -p ${GENSOURCES_WEBINSPECTOR_UI}
|
||||
- $(AM_V_at)$(srcdir)/Tools/gtk/generate-inspector-gresource-manifest.py --output $@ $(inspector_files)
|
||||
+ $(AM_V_at)$(PYTHON) $(srcdir)/Tools/gtk/generate-inspector-gresource-manifest.py --output $@ $(inspector_files)
|
||||
|
||||
${GENSOURCES_WEBINSPECTOR_UI}/GResourceBundle.c: DerivedSources/WebInspectorUI/GResourceBundle.xml
|
||||
$(AM_V_GEN)
|
||||
@@ -1,25 +0,0 @@
|
||||
--- webkitgtk-2.2.5/Tools/gtk/gtkdoc.py.orig 2014-03-07 03:54:22.115118000 +0000
|
||||
+++ webkitgtk-2.2.5/Tools/gtk/gtkdoc.py 2014-03-07 03:58:35.546299600 +0000
|
||||
@@ -312,11 +312,18 @@
|
||||
ldflags = self.ldflags
|
||||
if self.library_path:
|
||||
ldflags = ' "-L%s" ' % self.library_path + ldflags
|
||||
- current_ld_library_path = env.get('LD_LIBRARY_PATH')
|
||||
- if current_ld_library_path:
|
||||
- env['RUN'] = 'LD_LIBRARY_PATH="%s:%s" ' % (self.library_path, current_ld_library_path)
|
||||
+ if os.name == 'nt' or sys.platform == 'cygwin':
|
||||
+ current_path = env.get('PATH')
|
||||
+ if current_path:
|
||||
+ env['RUN'] = 'PATH="%s:%s" ' % (self.library_path, current_path)
|
||||
+ else:
|
||||
+ env['RUN'] = 'PATH="%s" ' % self.library_path
|
||||
else:
|
||||
- env['RUN'] = 'LD_LIBRARY_PATH="%s" ' % self.library_path
|
||||
+ current_ld_library_path = env.get('LD_LIBRARY_PATH')
|
||||
+ if current_ld_library_path:
|
||||
+ env['RUN'] = 'LD_LIBRARY_PATH="%s:%s" ' % (self.library_path, current_ld_library_path)
|
||||
+ else:
|
||||
+ env['RUN'] = 'LD_LIBRARY_PATH="%s" ' % self.library_path
|
||||
|
||||
if ldflags:
|
||||
env['LDFLAGS'] = '%s %s' % (ldflags, env.get('LDFLAGS', ''))
|
||||
@@ -1,32 +0,0 @@
|
||||
--- webkitgtk-2.2.6/Source/WTF/wtf/ThreadingWin.cpp.orig 2014-03-19 07:53:02.000000000 +0000
|
||||
+++ webkitgtk-2.2.6/Source/WTF/wtf/ThreadingWin.cpp 2014-04-15 10:18:07.793755700 +0000
|
||||
@@ -212,14 +212,26 @@
|
||||
|
||||
static unsigned __stdcall wtfThreadEntryPoint(void* param)
|
||||
{
|
||||
- OwnPtr<ThreadFunctionInvocation> invocation = adoptPtr(static_cast<ThreadFunctionInvocation*>(param));
|
||||
- invocation->function(invocation->data);
|
||||
+ if (getenv ("WEBKIT_DONTFIX_INVOCATION_DESTRUCTOR"))
|
||||
+ {
|
||||
+ OwnPtr<ThreadFunctionInvocation> invocation = adoptPtr(static_cast<ThreadFunctionInvocation*>(param));
|
||||
+ invocation->function(invocation->data);
|
||||
|
||||
#if !USE(PTHREADS) && OS(WINDOWS)
|
||||
+ // Do the TLS cleanup.
|
||||
+ ThreadSpecificThreadExit();
|
||||
+#endif
|
||||
+ return 0;
|
||||
+ }
|
||||
+ else
|
||||
+ {
|
||||
+ OwnPtr<ThreadFunctionInvocation> invocation = adoptPtr(static_cast<ThreadFunctionInvocation*>(param));
|
||||
+ invocation->function(invocation->data);
|
||||
+ }
|
||||
+#if !USE(PTHREADS) && OS(WINDOWS)
|
||||
// Do the TLS cleanup.
|
||||
ThreadSpecificThreadExit();
|
||||
#endif
|
||||
-
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -1,14 +0,0 @@
|
||||
--- webkitgtk-2.4.8/Tools/GNUmakefile.am.orig 2015-03-24 06:37:08.188968200 +0000
|
||||
+++ webkitgtk-2.4.8/Tools/GNUmakefile.am 2015-03-24 06:37:37.567198800 +0000
|
||||
@@ -1,11 +1,6 @@
|
||||
noinst_PROGRAMS += \
|
||||
Programs/ImageDiff
|
||||
|
||||
-if ENABLE_WEBKIT1
|
||||
-noinst_PROGRAMS += \
|
||||
- Programs/DumpRenderTree
|
||||
-endif
|
||||
-
|
||||
# libWebCoreInternals
|
||||
# We must split off the window.internals implementation into a separate
|
||||
# convenience library because it requires a different include path order
|
||||
@@ -1,11 +0,0 @@
|
||||
--- a/Source/autotools/SetupCompilerFlags.m4
|
||||
+++ b/Source/autotools/SetupCompilerFlags.m4
|
||||
@@ -1,7 +1,7 @@
|
||||
# Use C99 as the language standard for C code.
|
||||
CFLAGS="$CFLAGS -pthread -std=c99"
|
||||
# Use the C++11 standard. Do not warn about C++11 incompatibilities.
|
||||
-CXXFLAGS="$CXXFLAGS -pthread -std=c++11 -Wno-c++11-compat"
|
||||
+CXXFLAGS="$CXXFLAGS -pthread -std=c++11 -Wno-c++11-compat -D__USE_MINGW_ANSI_STDIO=1"
|
||||
|
||||
# Clang requires suppression of unused arguments warnings.
|
||||
if test "$c_compiler" = "clang"; then
|
||||
@@ -1,45 +0,0 @@
|
||||
--- a/Source/JavaScriptCore/heap/HeapStatistics.cpp
|
||||
+++ b/Source/JavaScriptCore/heap/HeapStatistics.cpp
|
||||
@@ -132,6 +132,7 @@ void HeapStatistics::logStatistics()
|
||||
|
||||
void HeapStatistics::exitWithFailure()
|
||||
{
|
||||
+ exit(-1);
|
||||
}
|
||||
|
||||
void HeapStatistics::reportSuccess()
|
||||
--- a/Source/WTF/wtf/win/GDIObject.h
|
||||
+++ b/Source/WTF/wtf/win/GDIObject.h
|
||||
@@ -111,7 +111,7 @@ template<typename T> inline void swap(GDIObject<T>& a, GDIObject<T>& b)
|
||||
}
|
||||
|
||||
// Nearly all GDI types use the same DeleteObject call.
|
||||
-template<typename T> inline void deleteObject<T>(T object)
|
||||
+template<typename T> inline void deleteObject(T object)
|
||||
{
|
||||
if (object)
|
||||
::DeleteObject(object);
|
||||
--- a/Source/WebCore/platform/graphics/freetype/FontPlatformDataFreeType.cpp
|
||||
+++ b/Source/WebCore/platform/graphics/freetype/FontPlatformDataFreeType.cpp
|
||||
@@ -37,6 +37,10 @@
|
||||
#include <gdk/gdk.h>
|
||||
#endif
|
||||
|
||||
+#ifndef M_PI_2
|
||||
+#define M_PI_2 1.57079632679489661923
|
||||
+#endif
|
||||
+
|
||||
namespace WebCore {
|
||||
|
||||
cairo_subpixel_order_t convertFontConfigSubpixelOrder(int fontConfigOrder)
|
||||
--- a/Source/WebCore/platform/graphics/win/GraphicsContextCairoWin.cpp
|
||||
+++ b/Source/WebCore/platform/graphics/win/GraphicsContextCairoWin.cpp
|
||||
@@ -32,7 +32,7 @@
|
||||
|
||||
#include <cairo-win32.h>
|
||||
#include "GraphicsContextPlatformPrivateCairo.h"
|
||||
-#include <wtf/win/GdiObject.h>
|
||||
+#include <wtf/win/GDIObject.h>
|
||||
|
||||
using namespace std;
|
||||
|
||||
@@ -1,57 +0,0 @@
|
||||
--- a/Source/JavaScriptCore/runtime/JSObject.cpp
|
||||
+++ b/Source/JavaScriptCore/runtime/JSObject.cpp
|
||||
@@ -819,7 +819,7 @@ ContiguousJSValues JSObject::genericConvertDoubleToContiguous(VM& vm)
|
||||
currentAsValue->clear();
|
||||
continue;
|
||||
}
|
||||
- JSValue v;
|
||||
+ JSValue v = jsNumber(value);
|
||||
switch (mode) {
|
||||
case EncodeValueAsDouble:
|
||||
v = JSValue(JSValue::EncodeAsDouble, value);
|
||||
--- a/Source/ThirdParty/ANGLE/src/compiler/ParseContext.cpp
|
||||
+++ b/Source/ThirdParty/ANGLE/src/compiler/ParseContext.cpp
|
||||
@@ -535,7 +535,7 @@ bool TParseContext::constructorErrorCheck(const TSourceLoc& line, TIntermNode* n
|
||||
return true;
|
||||
}
|
||||
|
||||
- if (op == EOpConstructStruct && !type->isArray() && int(type->getStruct()->fields().size()) != function.getParamCount()) {
|
||||
+ if (op == EOpConstructStruct && !type->isArray() && int(type->getStruct()->fields().size()) != int(function.getParamCount())) {
|
||||
error(line, "Number of constructor parameters does not match the number of structure fields", "constructor");
|
||||
return true;
|
||||
}
|
||||
--- a/Source/ThirdParty/ANGLE/src/compiler/depgraph/DependencyGraph.cpp
|
||||
+++ b/Source/ThirdParty/ANGLE/src/compiler/depgraph/DependencyGraph.cpp
|
||||
@@ -4,7 +4,9 @@
|
||||
// found in the LICENSE file.
|
||||
//
|
||||
|
||||
+#ifdef _MSC_VER
|
||||
#pragma warning(disable: 4718)
|
||||
+#endif
|
||||
|
||||
#include "compiler/depgraph/DependencyGraph.h"
|
||||
#include "compiler/depgraph/DependencyGraphBuilder.h"
|
||||
--- a/Source/WTF/wtf/text/WTFString.h
|
||||
+++ b/Source/WTF/wtf/text/WTFString.h
|
||||
@@ -32,6 +32,9 @@
|
||||
#include <objc/objc.h>
|
||||
#endif
|
||||
|
||||
+/* avoid renaming to libintl_printf (see WTF_ATTRIBUTE_PRINTF) */
|
||||
+#undef printf
|
||||
+
|
||||
namespace WTF {
|
||||
|
||||
class CString;
|
||||
--- a/Source/autotools/ltmain.sh
|
||||
+++ b/Source/autotools/ltmain.sh
|
||||
@@ -4178,7 +4178,7 @@ EOF
|
||||
/* declarations of non-ANSI functions */
|
||||
#if defined(__MINGW32__)
|
||||
# ifdef __STRICT_ANSI__
|
||||
-int _putenv (const char *);
|
||||
+int __declspec(dllimport) _putenv (const char *);
|
||||
# endif
|
||||
#elif defined(__CYGWIN__)
|
||||
# ifdef __STRICT_ANSI__
|
||||
@@ -1,35 +0,0 @@
|
||||
--- webkitgtk-2.4.1.old/Source/autotools/FindDependencies.m4 2014-05-16 19:07:53 +0000
|
||||
+++ webkitgtk-2.4.1/Source/autotools/FindDependencies.m4 2014-05-17 07:38:01 +0000
|
||||
@@ -109,8 +109,14 @@ case "$host" in
|
||||
UNICODE_LIBS="-licucore"
|
||||
;;
|
||||
*-*-mingw*)
|
||||
- UNICODE_CFLAGS=""
|
||||
- UNICODE_LIBS="-licui18n -licuuc"
|
||||
+ PKG_CHECK_MODULES(ICU, icu-i18n, ,)
|
||||
+ if test "x$ICU_LIBS" = "x" ; then
|
||||
+ UNICODE_CFLAGS=""
|
||||
+ UNICODE_LIBS="-licui18n -licuuc"
|
||||
+ else
|
||||
+ UNICODE_CFLAGS="$ICU_CFLAGS"
|
||||
+ UNICODE_LIBS="$ICU_LIBS"
|
||||
+ fi
|
||||
AC_CHECK_HEADERS([unicode/uchar.h], [], [AC_MSG_ERROR([Could not find ICU headers.])])
|
||||
;;
|
||||
*)
|
||||
@@ -455,7 +461,14 @@ if test "$found_opengl" = "yes"; then
|
||||
OPENGL_LIBS="-lGLESv2"
|
||||
else
|
||||
acceleration_description="$acceleration_description (gl"
|
||||
- OPENGL_LIBS="-lGL"
|
||||
+ case "$host" in
|
||||
+ *-*-mingw*)
|
||||
+ OPENGL_LIBS="-lopengl32"
|
||||
+ ;;
|
||||
+ *)
|
||||
+ OPENGL_LIBS="-lGL"
|
||||
+ ;;
|
||||
+ esac
|
||||
fi
|
||||
if test "$enable_egl" = "yes"; then
|
||||
acceleration_description="$acceleration_description, egl"
|
||||
@@ -1,31 +0,0 @@
|
||||
--- webkitgtk-2.4.1.old/Source/WebCore/bindings/scripts/preprocessor.pm 2014-05-16 19:07:53 +0000
|
||||
+++ webkitgtk-2.4.1/Source/WebCore/bindings/scripts/preprocessor.pm 2014-05-17 07:38:01 +0000
|
||||
@@ -51,6 +51,8 @@ sub applyPreprocessor
|
||||
$preprocessor = "/usr/sfw/bin/gcc";
|
||||
} elsif (-x "/usr/bin/clang") {
|
||||
$preprocessor = "/usr/bin/clang";
|
||||
+ } elsif ($Config{osname} eq 'msys') {
|
||||
+ $preprocessor = "gcc";
|
||||
} else {
|
||||
$preprocessor = "/usr/bin/gcc";
|
||||
}
|
||||
@@ -71,7 +73,7 @@ sub applyPreprocessor
|
||||
@macros = map { "-D$_" } @macros;
|
||||
|
||||
my $pid = 0;
|
||||
- if ($Config{osname} eq "cygwin" || $Config{osname} eq 'MSWin32') {
|
||||
+ if ($Config{osname} eq "cygwin" || $Config{osname} eq 'MSWin32' || $Config{osname} eq 'msys') {
|
||||
# This call can fail if Windows rebases cygwin, so retry a few times until it succeeds.
|
||||
for (my $tries = 0; !$pid && ($tries < 20); $tries++) {
|
||||
eval {
|
||||
--- webkitgtk-2.4.1.old/Source/WebCore/dom/make_names.pl 2014-05-16 19:07:53 +0000
|
||||
+++ webkitgtk-2.4.1/Source/WebCore/dom/make_names.pl 2014-05-17 07:38:01 +0000
|
||||
@@ -69,6 +69,8 @@ if ($ENV{CC}) {
|
||||
$gccLocation = "/usr/sfw/bin/gcc";
|
||||
} elsif ($Config::Config{"osname"} eq "darwin" && $ENV{SDKROOT}) {
|
||||
chomp($gccLocation = `xcrun -find cc -sdk '$ENV{SDKROOT}'`);
|
||||
+} elsif ($Config::Config{"osname"} eq "msys") {
|
||||
+ $gccLocation = "gcc";
|
||||
} else {
|
||||
$gccLocation = "/usr/bin/cc";
|
||||
}
|
||||
@@ -1,56 +0,0 @@
|
||||
--- webkitgtk-2.4.1.old/Source/WTF/wtf/MathExtras.h 2014-05-16 19:07:53 +0000
|
||||
+++ webkitgtk-2.4.1/Source/WTF/wtf/MathExtras.h 2014-05-17 07:38:01 +0000
|
||||
@@ -67,6 +67,12 @@ const double piOverFourDouble = M_PI_4;
|
||||
const float piOverFourFloat = static_cast<float>(M_PI_4);
|
||||
#endif
|
||||
|
||||
+#ifndef M_SQRT2
|
||||
+const double sqrtOfTwoDouble = 1.41421356237309504880;
|
||||
+#else
|
||||
+const double sqrtOfTwoDouble = M_SQRT2;
|
||||
+#endif
|
||||
+
|
||||
#if OS(DARWIN)
|
||||
|
||||
// Work around a bug in the Mac OS X libc where ceil(-0.1) return +0.
|
||||
--- webkitgtk-2.4.1.old/Source/WebCore/platform/graphics/freetype/FontPlatformDataFreeType.cpp 2014-05-16 19:07:53 +0000
|
||||
+++ webkitgtk-2.4.1/Source/WebCore/platform/graphics/freetype/FontPlatformDataFreeType.cpp 2014-05-17 07:38:01 +0000
|
||||
@@ -32,6 +32,7 @@
|
||||
#include <ft2build.h>
|
||||
#include FT_TRUETYPE_TABLES_H
|
||||
#include <wtf/text/WTFString.h>
|
||||
+#include <wtf/MathExtras.h>
|
||||
|
||||
#if !PLATFORM(EFL)
|
||||
#include <gdk/gdk.h>
|
||||
@@ -120,7 +121,7 @@ static void rotateCairoMatrixForVertical
|
||||
// combination of rotation (R) and translation (T) applied on the
|
||||
// horizontal matrix (H). V = H . R . T, where R rotates by -90 degrees
|
||||
// and T translates by font size towards y axis.
|
||||
- cairo_matrix_rotate(matrix, -M_PI_2);
|
||||
+ cairo_matrix_rotate(matrix, -piOverTwoDouble);
|
||||
cairo_matrix_translate(matrix, 0.0, 1.0);
|
||||
}
|
||||
|
||||
--- webkitgtk-2.4.1.old/Source/WebCore/rendering/mathml/RenderMathMLMenclose.cpp 2014-05-16 19:07:53 +0000
|
||||
+++ webkitgtk-2.4.1/Source/WebCore/rendering/mathml/RenderMathMLMenclose.cpp 2014-05-17 07:38:01 +0000
|
||||
@@ -71,8 +71,8 @@ void RenderMathMLMenclose::computePrefer
|
||||
size_t notationalValueSize = notationValues.size();
|
||||
for (size_t i = 0; i < notationalValueSize; i++) {
|
||||
if (notationValues[i] == "circle") {
|
||||
- m_minPreferredLogicalWidth = minPreferredLogicalWidth() * float(M_SQRT2);
|
||||
- m_maxPreferredLogicalWidth = maxPreferredLogicalWidth() * float(M_SQRT2);
|
||||
+ m_minPreferredLogicalWidth = minPreferredLogicalWidth() * float(sqrtOfTwoDouble);
|
||||
+ m_maxPreferredLogicalWidth = maxPreferredLogicalWidth() * float(sqrtOfTwoDouble);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -86,7 +86,7 @@ void RenderMathMLMenclose::updateLogical
|
||||
size_t notationalValueSize = notationValues.size();
|
||||
for (size_t i = 0; i < notationalValueSize; i++)
|
||||
if (notationValues[i] == "circle")
|
||||
- setLogicalHeight(logicalHeight() * float(M_SQRT2));
|
||||
+ setLogicalHeight(logicalHeight() * float(sqrtOfTwoDouble));
|
||||
}
|
||||
|
||||
void RenderMathMLMenclose::paint(PaintInfo& info, const LayoutPoint& paintOffset)
|
||||
@@ -1,107 +0,0 @@
|
||||
diff --git a/Source/WTF/wtf/threads/BinarySemaphore.h b/Source/WTF/wtf/threads/BinarySemaphore.h
|
||||
index de51d47..cae1023 100644
|
||||
--- a/Source/WTF/wtf/threads/BinarySemaphore.h
|
||||
+++ b/Source/WTF/wtf/threads/BinarySemaphore.h
|
||||
@@ -41,12 +41,12 @@ public:
|
||||
WTF_EXPORT_PRIVATE void signal();
|
||||
WTF_EXPORT_PRIVATE bool wait(double absoluteTime);
|
||||
|
||||
-#if OS(WINDOWS)
|
||||
+#if PLATFORM(WIN)
|
||||
HANDLE event() const { return m_event; }
|
||||
#endif
|
||||
|
||||
private:
|
||||
-#if OS(WINDOWS)
|
||||
+#if PLATFORM(WIN)
|
||||
HANDLE m_event;
|
||||
#else
|
||||
bool m_isSet;
|
||||
diff --git a/Source/WebCore/platform/gtk/FileSystemGtk.cpp b/Source/WebCore/platform/gtk/FileSystemGtk.cpp
|
||||
index 9ebeca5..e741d1c 100644
|
||||
--- a/Source/WebCore/platform/gtk/FileSystemGtk.cpp
|
||||
+++ b/Source/WebCore/platform/gtk/FileSystemGtk.cpp
|
||||
@@ -23,6 +23,10 @@
|
||||
#include "config.h"
|
||||
#include "FileSystem.h"
|
||||
|
||||
+#if OS(WINDOWS)
|
||||
+#include <windows.h>
|
||||
+#endif
|
||||
+
|
||||
#include "FileMetadata.h"
|
||||
#include "UUID.h"
|
||||
#include <gio/gio.h>
|
||||
diff --git a/Source/WebCore/rendering/RenderBlock.h b/Source/WebCore/rendering/RenderBlock.h
|
||||
index 5aa29e0..c29b078 100644
|
||||
--- a/Source/WebCore/rendering/RenderBlock.h
|
||||
+++ b/Source/WebCore/rendering/RenderBlock.h
|
||||
@@ -611,8 +611,8 @@ public:
|
||||
unsigned m_beingDestroyed : 1;
|
||||
unsigned m_hasMarkupTruncation : 1;
|
||||
unsigned m_hasBorderOrPaddingLogicalWidthChanged : 1;
|
||||
- enum LineLayoutPath { UndeterminedPath, SimpleLinesPath, LineBoxesPath, ForceLineBoxesPath };
|
||||
unsigned m_lineLayoutPath : 2;
|
||||
+ enum LineLayoutPath { UndeterminedPath, SimpleLinesPath, LineBoxesPath, ForceLineBoxesPath };
|
||||
|
||||
// RenderRubyBase objects need to be able to split and merge, moving their children around
|
||||
// (calling moveChildTo, moveAllChildrenTo, and makeChildrenNonInline).
|
||||
--- a/Source/WebCore/platform/graphics/GraphicsContext3D.h
|
||||
+++ b/Source/WebCore/platform/graphics/GraphicsContext3D.h
|
||||
@@ -43,9 +43,11 @@
|
||||
#endif
|
||||
|
||||
// FIXME: Find a better way to avoid the name confliction for NO_ERROR.
|
||||
-#if PLATFORM(WIN)
|
||||
+#if PLATFORM(WIN) || (PLATFORM(QT) && OS(WINDOWS)) || (PLATFORM(GTK) && OS(WINDOWS))
|
||||
#undef NO_ERROR
|
||||
-#elif PLATFORM(GTK)
|
||||
+#endif
|
||||
+
|
||||
+#if PLATFORM(GTK)
|
||||
// This define is from the X11 headers, but it's used below, so we must undefine it.
|
||||
#undef VERSION
|
||||
#endif
|
||||
--- a/Source/WebCore/html/canvas/WebGLRenderingContext.cpp
|
||||
+++ b/Source/WebCore/html/canvas/WebGLRenderingContext.cpp
|
||||
@@ -85,6 +85,14 @@
|
||||
#include <wtf/text/CString.h>
|
||||
#include <wtf/text/StringBuilder.h>
|
||||
|
||||
+#if PLATFORM(WIN) || (PLATFORM(QT) && OS(WINDOWS)) || (PLATFORM(GTK) && OS(WINDOWS))
|
||||
+#undef NO_ERROR
|
||||
+#endif
|
||||
+
|
||||
+#if PLATFORM(GTK)
|
||||
+#undef VERSION
|
||||
+#endif
|
||||
+
|
||||
namespace WebCore {
|
||||
|
||||
const double secondsBetweenRestoreAttempts = 1.0;
|
||||
--- a/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGLCommon.cpp
|
||||
+++ b/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGLCommon.cpp
|
||||
@@ -49,6 +49,10 @@
|
||||
#include <wtf/MainThread.h>
|
||||
#include <wtf/Vector.h>
|
||||
|
||||
+#if PLATFORM(WIN) || (PLATFORM(QT) && OS(WINDOWS)) || (PLATFORM(GTK) && OS(WINDOWS))
|
||||
+#undef NO_ERROR
|
||||
+#endif
|
||||
+
|
||||
namespace WebCore {
|
||||
|
||||
Extensions3DOpenGLCommon::Extensions3DOpenGLCommon(GraphicsContext3D* context)
|
||||
--- a/Source/WebCore/platform/graphics/texmap/TextureMapperShaderProgram.cpp
|
||||
+++ b/Source/WebCore/platform/graphics/texmap/TextureMapperShaderProgram.cpp
|
||||
@@ -29,6 +29,10 @@
|
||||
|
||||
#include <wtf/text/StringBuilder.h>
|
||||
|
||||
+#if PLATFORM(WIN) || (PLATFORM(QT) && OS(WINDOWS)) || (PLATFORM(GTK) && OS(WINDOWS))
|
||||
+#undef NO_ERROR
|
||||
+#endif
|
||||
+
|
||||
#define STRINGIFY(...) #__VA_ARGS__
|
||||
|
||||
namespace WebCore {
|
||||
@@ -1,17 +0,0 @@
|
||||
--- webkitgtk-2.4.8/GNUmakefile.am.orig 2015-01-07 09:45:40.000000000 +0000
|
||||
+++ webkitgtk-2.4.8/GNUmakefile.am 2015-03-24 10:51:01.592364800 +0000
|
||||
@@ -182,7 +182,13 @@
|
||||
# It breaks the build on other platforms, so we use it conditionally
|
||||
if OS_WIN32
|
||||
no_undefined = -no-undefined
|
||||
-version_script = -export-symbols-regex "^(webkit_|k?JS).*"
|
||||
+#global:
|
||||
+# webkit_*;
|
||||
+# WebProcessMainGtk;
|
||||
+# NetworkProcessMain;
|
||||
+# _ZN6WebKit22WebGtkExtensionManager10initializeEPK14OpaqueWKBundlePKv;
|
||||
+# _ZN6WebKit22WebGtkExtensionManager6sharedEv;
|
||||
+version_script = -export-symbols-regex "^(webkit_|k?JS|WebProcessMainGtk|NetworkProcessMain|.*ZN6WebKit22WebGtkExtensionManager10initializeEPK14OpaqueWKBundlePKv|.*ZN6WebKit22WebGtkExtensionManager6sharedEv).*"
|
||||
endif
|
||||
|
||||
if OS_GNU
|
||||
@@ -1,301 +0,0 @@
|
||||
--- webkitgtk-2.4.8/Source/WTF/wtf/gobject/GMutexLocker.h.orig 2015-01-07 09:45:42.000000000 +0000
|
||||
+++ webkitgtk-2.4.8/Source/WTF/wtf/gobject/GMutexLocker.h 2015-03-24 20:50:18.848356400 +0000
|
||||
@@ -29,18 +29,18 @@
|
||||
|
||||
namespace WebCore {
|
||||
|
||||
-class GMutexLocker {
|
||||
- WTF_MAKE_NONCOPYABLE(GMutexLocker); WTF_MAKE_FAST_ALLOCATED;
|
||||
+class GWTFMutexLocker {
|
||||
+ WTF_MAKE_NONCOPYABLE(GWTFMutexLocker); WTF_MAKE_FAST_ALLOCATED;
|
||||
|
||||
public:
|
||||
- inline explicit GMutexLocker(GMutex* mutex)
|
||||
+ inline explicit GWTFMutexLocker(GMutex* mutex)
|
||||
: m_mutex(mutex)
|
||||
, m_val(0)
|
||||
{
|
||||
lock();
|
||||
}
|
||||
|
||||
- inline ~GMutexLocker() { unlock(); }
|
||||
+ inline ~GWTFMutexLocker() { unlock(); }
|
||||
|
||||
inline void lock()
|
||||
{
|
||||
--- webkitgtk-2.4.8/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp.orig 2015-01-07 09:45:43.000000000 +0000
|
||||
+++ webkitgtk-2.4.8/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp 2015-03-24 20:53:07.273243700 +0000
|
||||
@@ -316,7 +316,7 @@
|
||||
#if USE(ACCELERATED_COMPOSITING) && USE(TEXTURE_MAPPER_GL) && !USE(COORDINATED_GRAPHICS)
|
||||
PassRefPtr<BitmapTexture> MediaPlayerPrivateGStreamerBase::updateTexture(TextureMapper* textureMapper)
|
||||
{
|
||||
- GMutexLocker lock(m_bufferMutex);
|
||||
+ GWTFMutexLocker lock(m_bufferMutex);
|
||||
if (!m_buffer)
|
||||
return nullptr;
|
||||
|
||||
@@ -366,7 +366,7 @@
|
||||
g_return_if_fail(GST_IS_BUFFER(buffer));
|
||||
|
||||
{
|
||||
- GMutexLocker lock(m_bufferMutex);
|
||||
+ GWTFMutexLocker lock(m_bufferMutex);
|
||||
gst_buffer_replace(&m_buffer, buffer);
|
||||
}
|
||||
|
||||
@@ -398,7 +398,7 @@
|
||||
if (!m_player->visible())
|
||||
return;
|
||||
|
||||
- GMutexLocker lock(m_bufferMutex);
|
||||
+ GWTFMutexLocker lock(m_bufferMutex);
|
||||
if (!m_buffer)
|
||||
return;
|
||||
|
||||
--- webkitgtk-2.4.8/Source/WebCore/platform/graphics/gstreamer/VideoSinkGStreamer.cpp.orig 2015-01-07 09:45:43.000000000 +0000
|
||||
+++ webkitgtk-2.4.8/Source/WebCore/platform/graphics/gstreamer/VideoSinkGStreamer.cpp 2015-03-24 20:53:18.224134200 +0000
|
||||
@@ -118,7 +118,7 @@
|
||||
WebKitVideoSink* sink = reinterpret_cast<WebKitVideoSink*>(data);
|
||||
WebKitVideoSinkPrivate* priv = sink->priv;
|
||||
|
||||
- GMutexLocker lock(priv->bufferMutex);
|
||||
+ GWTFMutexLocker lock(priv->bufferMutex);
|
||||
GstBuffer* buffer = priv->buffer;
|
||||
priv->buffer = 0;
|
||||
priv->timeoutId = 0;
|
||||
@@ -140,7 +140,7 @@
|
||||
WebKitVideoSink* sink = WEBKIT_VIDEO_SINK(baseSink);
|
||||
WebKitVideoSinkPrivate* priv = sink->priv;
|
||||
|
||||
- GMutexLocker lock(priv->bufferMutex);
|
||||
+ GWTFMutexLocker lock(priv->bufferMutex);
|
||||
|
||||
if (priv->unlocked)
|
||||
return GST_FLOW_OK;
|
||||
@@ -279,7 +279,7 @@
|
||||
|
||||
static void unlockBufferMutex(WebKitVideoSinkPrivate* priv)
|
||||
{
|
||||
- GMutexLocker lock(priv->bufferMutex);
|
||||
+ GWTFMutexLocker lock(priv->bufferMutex);
|
||||
|
||||
if (priv->buffer) {
|
||||
gst_buffer_unref(priv->buffer);
|
||||
@@ -305,7 +305,7 @@
|
||||
WebKitVideoSinkPrivate* priv = WEBKIT_VIDEO_SINK(baseSink)->priv;
|
||||
|
||||
{
|
||||
- GMutexLocker lock(priv->bufferMutex);
|
||||
+ GWTFMutexLocker lock(priv->bufferMutex);
|
||||
priv->unlocked = false;
|
||||
}
|
||||
|
||||
@@ -330,7 +330,7 @@
|
||||
{
|
||||
WebKitVideoSinkPrivate* priv = WEBKIT_VIDEO_SINK(baseSink)->priv;
|
||||
|
||||
- GMutexLocker lock(priv->bufferMutex);
|
||||
+ GWTFMutexLocker lock(priv->bufferMutex);
|
||||
priv->unlocked = false;
|
||||
return TRUE;
|
||||
}
|
||||
--- webkitgtk-2.4.8/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp.orig 2015-01-07 09:45:43.000000000 +0000
|
||||
+++ webkitgtk-2.4.8/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp 2015-03-24 20:53:33.226039200 +0000
|
||||
@@ -346,7 +346,7 @@
|
||||
|
||||
switch (propID) {
|
||||
case PROP_IRADIO_MODE: {
|
||||
- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
|
||||
+ GWTFMutexLocker locker(GST_OBJECT_GET_LOCK(src));
|
||||
priv->iradioMode = g_value_get_boolean(value);
|
||||
break;
|
||||
}
|
||||
@@ -364,7 +364,7 @@
|
||||
WebKitWebSrc* src = WEBKIT_WEB_SRC(object);
|
||||
WebKitWebSrcPrivate* priv = src->priv;
|
||||
|
||||
- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
|
||||
+ GWTFMutexLocker locker(GST_OBJECT_GET_LOCK(src));
|
||||
switch (propID) {
|
||||
case PROP_IRADIO_MODE:
|
||||
g_value_set_boolean(value, priv->iradioMode);
|
||||
@@ -417,7 +417,7 @@
|
||||
|
||||
ASSERT(isMainThread());
|
||||
|
||||
- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
|
||||
+ GWTFMutexLocker locker(GST_OBJECT_GET_LOCK(src));
|
||||
|
||||
bool seeking = priv->seekID;
|
||||
|
||||
@@ -476,7 +476,7 @@
|
||||
|
||||
ASSERT(isMainThread());
|
||||
|
||||
- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
|
||||
+ GWTFMutexLocker locker(GST_OBJECT_GET_LOCK(src));
|
||||
|
||||
priv->startID = 0;
|
||||
priv->corsAccessCheck = CORSNoCheck;
|
||||
@@ -573,7 +573,7 @@
|
||||
return ret;
|
||||
}
|
||||
|
||||
- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
|
||||
+ GWTFMutexLocker locker(GST_OBJECT_GET_LOCK(src));
|
||||
switch (transition) {
|
||||
case GST_STATE_CHANGE_READY_TO_PAUSED:
|
||||
GST_DEBUG_OBJECT(src, "READY->PAUSED");
|
||||
@@ -604,7 +604,7 @@
|
||||
gst_query_parse_duration(query, &format, NULL);
|
||||
|
||||
GST_DEBUG_OBJECT(src, "duration query in format %s", gst_format_get_name(format));
|
||||
- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
|
||||
+ GWTFMutexLocker locker(GST_OBJECT_GET_LOCK(src));
|
||||
if (format == GST_FORMAT_BYTES && src->priv->size > 0) {
|
||||
gst_query_set_duration(query, format, src->priv->size);
|
||||
result = TRUE;
|
||||
@@ -612,7 +612,7 @@
|
||||
break;
|
||||
}
|
||||
case GST_QUERY_URI: {
|
||||
- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
|
||||
+ GWTFMutexLocker locker(GST_OBJECT_GET_LOCK(src));
|
||||
gst_query_set_uri(query, src->priv->uri);
|
||||
result = TRUE;
|
||||
break;
|
||||
@@ -653,7 +653,7 @@
|
||||
WebKitWebSrc* src = WEBKIT_WEB_SRC(handler);
|
||||
gchar* ret;
|
||||
|
||||
- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
|
||||
+ GWTFMutexLocker locker(GST_OBJECT_GET_LOCK(src));
|
||||
ret = g_strdup(src->priv->uri);
|
||||
return ret;
|
||||
}
|
||||
@@ -668,7 +668,7 @@
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
|
||||
+ GWTFMutexLocker locker(GST_OBJECT_GET_LOCK(src));
|
||||
|
||||
g_free(priv->uri);
|
||||
priv->uri = 0;
|
||||
@@ -704,7 +704,7 @@
|
||||
|
||||
ASSERT(isMainThread());
|
||||
|
||||
- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
|
||||
+ GWTFMutexLocker locker(GST_OBJECT_GET_LOCK(src));
|
||||
// already stopped
|
||||
if (!priv->needDataID)
|
||||
return FALSE;
|
||||
@@ -725,7 +725,7 @@
|
||||
|
||||
GST_DEBUG_OBJECT(src, "Need more data: %u", length);
|
||||
|
||||
- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
|
||||
+ GWTFMutexLocker locker(GST_OBJECT_GET_LOCK(src));
|
||||
if (priv->needDataID || !priv->paused) {
|
||||
return;
|
||||
}
|
||||
@@ -739,7 +739,7 @@
|
||||
|
||||
ASSERT(isMainThread());
|
||||
|
||||
- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
|
||||
+ GWTFMutexLocker locker(GST_OBJECT_GET_LOCK(src));
|
||||
// already stopped
|
||||
if (!priv->enoughDataID)
|
||||
return FALSE;
|
||||
@@ -760,7 +760,7 @@
|
||||
|
||||
GST_DEBUG_OBJECT(src, "Have enough data");
|
||||
|
||||
- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
|
||||
+ GWTFMutexLocker locker(GST_OBJECT_GET_LOCK(src));
|
||||
if (priv->enoughDataID || priv->paused) {
|
||||
return;
|
||||
}
|
||||
@@ -774,7 +774,7 @@
|
||||
|
||||
ASSERT(isMainThread());
|
||||
|
||||
- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
|
||||
+ GWTFMutexLocker locker(GST_OBJECT_GET_LOCK(src));
|
||||
// already stopped
|
||||
if (!priv->seekID)
|
||||
return FALSE;
|
||||
@@ -792,7 +792,7 @@
|
||||
WebKitWebSrcPrivate* priv = src->priv;
|
||||
|
||||
GST_DEBUG_OBJECT(src, "Seeking to offset: %" G_GUINT64_FORMAT, offset);
|
||||
- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
|
||||
+ GWTFMutexLocker locker(GST_OBJECT_GET_LOCK(src));
|
||||
if (offset == priv->offset && priv->requestedOffset == priv->offset)
|
||||
return TRUE;
|
||||
|
||||
@@ -811,7 +811,7 @@
|
||||
void webKitWebSrcSetMediaPlayer(WebKitWebSrc* src, WebCore::MediaPlayer* player)
|
||||
{
|
||||
ASSERT(player);
|
||||
- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
|
||||
+ GWTFMutexLocker locker(GST_OBJECT_GET_LOCK(src));
|
||||
src->priv->player = player;
|
||||
}
|
||||
|
||||
@@ -841,7 +841,7 @@
|
||||
|
||||
mapGstBuffer(buffer);
|
||||
|
||||
- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
|
||||
+ GWTFMutexLocker locker(GST_OBJECT_GET_LOCK(src));
|
||||
priv->buffer = adoptGRef(buffer);
|
||||
locker.unlock();
|
||||
|
||||
@@ -867,7 +867,7 @@
|
||||
return;
|
||||
}
|
||||
|
||||
- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
|
||||
+ GWTFMutexLocker locker(GST_OBJECT_GET_LOCK(src));
|
||||
|
||||
priv->corsAccessCheck = corsAccessCheck;
|
||||
|
||||
@@ -966,7 +966,7 @@
|
||||
WebKitWebSrc* src = WEBKIT_WEB_SRC(m_src);
|
||||
WebKitWebSrcPrivate* priv = src->priv;
|
||||
|
||||
- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
|
||||
+ GWTFMutexLocker locker(GST_OBJECT_GET_LOCK(src));
|
||||
|
||||
GST_LOG_OBJECT(src, "Have %lld bytes of data", priv->buffer ? static_cast<long long>(gst_buffer_get_size(priv->buffer.get())) : length);
|
||||
|
||||
@@ -1035,7 +1035,7 @@
|
||||
|
||||
GST_DEBUG_OBJECT(src, "Have EOS");
|
||||
|
||||
- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
|
||||
+ GWTFMutexLocker locker(GST_OBJECT_GET_LOCK(src));
|
||||
if (!priv->seekID) {
|
||||
locker.unlock();
|
||||
gst_app_src_end_of_stream(priv->appsrc);
|
||||
@@ -1194,7 +1194,7 @@
|
||||
|
||||
GST_ERROR_OBJECT(src, "Request was blocked");
|
||||
|
||||
- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
|
||||
+ GWTFMutexLocker locker(GST_OBJECT_GET_LOCK(src));
|
||||
uri.reset(g_strdup(src->priv->uri));
|
||||
locker.unlock();
|
||||
|
||||
@@ -1208,7 +1208,7 @@
|
||||
|
||||
GST_ERROR_OBJECT(src, "Cannot show URL");
|
||||
|
||||
- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
|
||||
+ GWTFMutexLocker locker(GST_OBJECT_GET_LOCK(src));
|
||||
uri.reset(g_strdup(src->priv->uri));
|
||||
locker.unlock();
|
||||
|
||||
@@ -59,24 +59,6 @@
|
||||
+ return false;
|
||||
+}
|
||||
+
|
||||
--- webkitgtk-2.2.3/Source/ThirdParty/ANGLE/GNUmakefile.am.orig 2013-12-04 23:12:01.034574086 +0100
|
||||
+++ webkitgtk-2.2.3/Source/ThirdParty/ANGLE/GNUmakefile.am 2013-12-04 23:19:09.719774371 +0100
|
||||
@@ -75,7 +75,6 @@
|
||||
Source/ThirdParty/ANGLE/src/compiler/MapLongVariableNames.h \
|
||||
Source/ThirdParty/ANGLE/src/compiler/MMap.h \
|
||||
Source/ThirdParty/ANGLE/src/compiler/osinclude.h \
|
||||
- Source/ThirdParty/ANGLE/src/compiler/ossource_posix.cpp \
|
||||
Source/ThirdParty/ANGLE/src/compiler/OutputESSL.cpp \
|
||||
Source/ThirdParty/ANGLE/src/compiler/OutputESSL.h \
|
||||
Source/ThirdParty/ANGLE/src/compiler/OutputGLSL.cpp \
|
||||
@@ -154,3 +153,10 @@
|
||||
Source/ThirdParty/ANGLE/src/compiler/VariableInfo.h \
|
||||
Source/ThirdParty/ANGLE/src/third_party/compiler/ArrayBoundsClamper.cpp \
|
||||
Source/ThirdParty/ANGLE/src/third_party/compiler/ArrayBoundsClamper.h
|
||||
+
|
||||
+if TARGET_WIN32
|
||||
+libANGLE_la_SOURCES += Source/ThirdParty/ANGLE/src/compiler/ossource_win.cpp
|
||||
+else
|
||||
+libANGLE_la_SOURCES += Source/ThirdParty/ANGLE/src/compiler/ossource_posix.cpp
|
||||
+endif
|
||||
+
|
||||
--
|
||||
1.8.5.3
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
_realname=webkitgtk
|
||||
pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}2" "${MINGW_PACKAGE_PREFIX}-${_realname}3")
|
||||
pkgver=2.4.8
|
||||
pkgrel=2
|
||||
pkgrel=3
|
||||
pkgdesc="GTK+ Web content engine library (mingw-w64)"
|
||||
arch=('any')
|
||||
url="http://webkitgtk.org/"
|
||||
@@ -46,61 +46,57 @@ depends=("${MINGW_PACKAGE_PREFIX}-angleproject"
|
||||
"${MINGW_PACKAGE_PREFIX}-xz"
|
||||
)
|
||||
source=(http://webkitgtk.org/releases/webkitgtk-${pkgver}.tar.xz
|
||||
0001-webkitgtk-remove-reference-to-nonexisting-header.mingw.patch
|
||||
0002-webkitgtk-mingw-use-gcc-asm.mingw.patch
|
||||
0005-webkitgtk-mingw-compile-fix.mingw.patch
|
||||
0007-webkitgtk-mingw-fix-includes.mingw.patch
|
||||
0008-webkit-fix-angle-windows-compilation.mingw.patch
|
||||
0009-webkitgtk-mingw-m-pi.mingw.patch
|
||||
0010-webkitgtk-prevent-multiple-plugins-definitions.mingw.patch
|
||||
0011-webkitgtk-mingw-opengl.mingw.patch
|
||||
0012-webkitgtk-dont-build-test-webkit-api.mingw.patch
|
||||
0017-make-sure-correct-gcc-is-used.mingw.patch
|
||||
0018-use-la-libs-for-g-i.all.patch
|
||||
0021-use-configured-python-for-this.all.patch
|
||||
0023-use-path-instead-of-ld-library-path-on.mingw.patch
|
||||
0027-destroy-invocation-before-return-switchable.all.patch
|
||||
0029-webkit-dont-build-dump-render-tree.all.patch
|
||||
0000-Unreviewed.-Fix-the-build-with-newer-GLib.all.patch
|
||||
0001-GTK-W32-Don-t-include-non-existing-WTF-WTFHeader.all.patch
|
||||
0002-GTK-W32-Allow-MinGW-GCC-to-use-GCC-asm-code-for-.all.patch
|
||||
0003-W32-Use-confgured-Python-interpreter.all.patch
|
||||
0004-GTK-W32-Harmonize-binary-semaphore-ifdefs.all.patch
|
||||
0005-Add-missing-gcc-asm-code-for-JIT.all.patch
|
||||
0006-Use-piOverTwoDouble-instead-of-M_PI_2.all.patch
|
||||
0007-GTK-W32-Add-missing-includes-to-FileSystemGtk.all.patch
|
||||
0008-W32-Move-enum-LineLayoutPath-in-RenderBlock.all.patch
|
||||
0009-W32-Fix-deleteObject-prototypte-fix-header-case.all.patch
|
||||
0010-ANGLE-W32-Don-t-hardcode-ossource_posix.cpp-in-t.all.patch
|
||||
0011-W32-Change-OpenGL-checks-to-work-on-W32-add-libo.all.patch
|
||||
0012-W32-GTK-Use-correct-.la-files-as-library-argumen.all.patch
|
||||
0013-Ensure-that-generator-scripts-get-CC-from-config.all.patch
|
||||
0014-W32-ANGLE-Silence-two-warnings-in-ANGLE.all.patch
|
||||
0015-W32-Try-to-use-pkg-config-to-detect-ICU-librarie.all.patch
|
||||
0016-W32-GTK-Work-around-name-conflicts-NO_ERROR.all.patch
|
||||
0017-W32-Also-use-GL-related-files-when-compiling-wit.all.patch
|
||||
0018-Silence-the-warning-about-JSValue-v-being-uninit.all.patch
|
||||
0019-W32-Update-windowsVersion-and-osVersionForUAStri.all.patch
|
||||
0020-W32-Fixup-dummy-HeapStatistics-implementation.all.patch
|
||||
0021-W32-Change-printf-format-atribute-to-gnu_printf-.all.patch
|
||||
0101-webkitgtk-2.4.3-gcc-asm.all.patch
|
||||
0103-webkitgtk-2.4.3-win-format.all.patch
|
||||
0104-webkitgtk-2.4.3-misc-win-errors.all.patch
|
||||
0105-webkitgtk-2.4.3-warnings.all.patch
|
||||
0106-enable-jit.all.patch
|
||||
1001-Source.autotools.FindDependencies.m4.all.patch
|
||||
1002-preprocessor.pm-make_names.pl.all.patch
|
||||
1004-math.h_related.all.patch
|
||||
1005-misc.all.patch
|
||||
3000-export-more-symbols-on-w32.all.patch
|
||||
4000-fix-gmutexlocker-conflict.all.patch)
|
||||
9999-ossource_win.cpp.all.patch)
|
||||
|
||||
prepare() {
|
||||
cd ${srcdir}/${_realname}-${pkgver}
|
||||
patch -p1 -i ${srcdir}/0001-webkitgtk-remove-reference-to-nonexisting-header.mingw.patch
|
||||
patch -p1 -i ${srcdir}/0002-webkitgtk-mingw-use-gcc-asm.mingw.patch
|
||||
patch -p1 -i ${srcdir}/0005-webkitgtk-mingw-compile-fix.mingw.patch
|
||||
patch -p1 -i ${srcdir}/0007-webkitgtk-mingw-fix-includes.mingw.patch
|
||||
patch -p1 -i ${srcdir}/0008-webkit-fix-angle-windows-compilation.mingw.patch
|
||||
patch -p1 -i ${srcdir}/0009-webkitgtk-mingw-m-pi.mingw.patch
|
||||
patch -p1 -i ${srcdir}/0010-webkitgtk-prevent-multiple-plugins-definitions.mingw.patch
|
||||
patch -p1 -i ${srcdir}/0011-webkitgtk-mingw-opengl.mingw.patch
|
||||
patch -p1 -i ${srcdir}/0012-webkitgtk-dont-build-test-webkit-api.mingw.patch
|
||||
patch -p1 -i ${srcdir}/0017-make-sure-correct-gcc-is-used.mingw.patch
|
||||
patch -p1 -i ${srcdir}/0018-use-la-libs-for-g-i.all.patch
|
||||
patch -p1 -i ${srcdir}/0021-use-configured-python-for-this.all.patch
|
||||
patch -p1 -i ${srcdir}/0023-use-path-instead-of-ld-library-path-on.mingw.patch
|
||||
patch -p1 -i ${srcdir}/0027-destroy-invocation-before-return-switchable.all.patch
|
||||
patch -p1 -i ${srcdir}/0029-webkit-dont-build-dump-render-tree.all.patch
|
||||
patch -p1 -i ${srcdir}/0000-Unreviewed.-Fix-the-build-with-newer-GLib.all.patch
|
||||
patch -p1 -i ${srcdir}/0001-GTK-W32-Don-t-include-non-existing-WTF-WTFHeader.all.patch
|
||||
patch -p1 -i ${srcdir}/0002-GTK-W32-Allow-MinGW-GCC-to-use-GCC-asm-code-for-.all.patch
|
||||
patch -p1 -i ${srcdir}/0003-W32-Use-confgured-Python-interpreter.all.patch
|
||||
patch -p1 -i ${srcdir}/0004-GTK-W32-Harmonize-binary-semaphore-ifdefs.all.patch
|
||||
patch -p1 -i ${srcdir}/0005-Add-missing-gcc-asm-code-for-JIT.all.patch
|
||||
patch -p1 -i ${srcdir}/0006-Use-piOverTwoDouble-instead-of-M_PI_2.all.patch
|
||||
patch -p1 -i ${srcdir}/0007-GTK-W32-Add-missing-includes-to-FileSystemGtk.all.patch
|
||||
patch -p1 -i ${srcdir}/0008-W32-Move-enum-LineLayoutPath-in-RenderBlock.all.patch
|
||||
patch -p1 -i ${srcdir}/0009-W32-Fix-deleteObject-prototypte-fix-header-case.all.patch
|
||||
patch -p1 -i ${srcdir}/0010-ANGLE-W32-Don-t-hardcode-ossource_posix.cpp-in-t.all.patch
|
||||
patch -p1 -i ${srcdir}/0011-W32-Change-OpenGL-checks-to-work-on-W32-add-libo.all.patch
|
||||
patch -p1 -i ${srcdir}/0012-W32-GTK-Use-correct-.la-files-as-library-argumen.all.patch
|
||||
patch -p1 -i ${srcdir}/0013-Ensure-that-generator-scripts-get-CC-from-config.all.patch
|
||||
patch -p1 -i ${srcdir}/0014-W32-ANGLE-Silence-two-warnings-in-ANGLE.all.patch
|
||||
patch -p1 -i ${srcdir}/0015-W32-Try-to-use-pkg-config-to-detect-ICU-librarie.all.patch
|
||||
patch -p1 -i ${srcdir}/0016-W32-GTK-Work-around-name-conflicts-NO_ERROR.all.patch
|
||||
patch -p1 -i ${srcdir}/0017-W32-Also-use-GL-related-files-when-compiling-wit.all.patch
|
||||
patch -p1 -i ${srcdir}/0018-Silence-the-warning-about-JSValue-v-being-uninit.all.patch
|
||||
patch -p1 -i ${srcdir}/0019-W32-Update-windowsVersion-and-osVersionForUAStri.all.patch
|
||||
patch -p1 -i ${srcdir}/0020-W32-Fixup-dummy-HeapStatistics-implementation.all.patch
|
||||
patch -p1 -i ${srcdir}/0021-W32-Change-printf-format-atribute-to-gnu_printf-.all.patch
|
||||
patch -p1 -i ${srcdir}/0101-webkitgtk-2.4.3-gcc-asm.all.patch
|
||||
patch -p1 -i ${srcdir}/0103-webkitgtk-2.4.3-win-format.all.patch
|
||||
patch -p1 -i ${srcdir}/0104-webkitgtk-2.4.3-misc-win-errors.all.patch
|
||||
patch -p1 -i ${srcdir}/0105-webkitgtk-2.4.3-warnings.all.patch
|
||||
patch -p1 -i ${srcdir}/0106-enable-jit.all.patch
|
||||
patch -p1 -i ${srcdir}/1001-Source.autotools.FindDependencies.m4.all.patch
|
||||
patch -p1 -i ${srcdir}/1002-preprocessor.pm-make_names.pl.all.patch
|
||||
patch -p1 -i ${srcdir}/1004-math.h_related.all.patch
|
||||
patch -p1 -i ${srcdir}/1005-misc.all.patch
|
||||
patch -p1 -i ${srcdir}/3000-export-more-symbols-on-w32.all.patch
|
||||
patch -p1 -i ${srcdir}/4000-fix-gmutexlocker-conflict.all.patch
|
||||
patch -p1 -i ${srcdir}/9999-ossource_win.cpp.all.patch
|
||||
|
||||
autoreconf --verbose --install -I Source/autotools
|
||||
|
||||
@@ -191,29 +187,27 @@ package_mingw-w64-x86_64-webkitgtk3() {
|
||||
}
|
||||
|
||||
md5sums=('bcdcef8e1ba28dbd5bb05f86c79f76b8'
|
||||
'2ae45596c0b2d632fdd8ead551bd462b'
|
||||
'f6274cc4664f531ceb4040aa706e8ef6'
|
||||
'd09eb8edbf720c331d01a58f65eaa0a6'
|
||||
'a14fdd341b980ca21064305e11990332'
|
||||
'60f28fd809bb3aa0c8c791325bb29d3d'
|
||||
'05fe8cc73be6493d8e2269b900d03cfb'
|
||||
'11328cfd06c73e26abe6468a7dfafa23'
|
||||
'db16e2d9e6d20f9568d98371b10b8719'
|
||||
'3cdc56cfae595eefce12414f027907b7'
|
||||
'c020b0863576574f6f9e17396f4f6cfa'
|
||||
'054075647ddf38b5e2b2f8226a5043f0'
|
||||
'8277aefbe66157e4673f63105c0ff0f1'
|
||||
'ab2a01c8c34bdec57a6b4fa71d9ccdaf'
|
||||
'eeff9b56a17c8c5165aa501404d6b9f3'
|
||||
'cd60095167b0f70f26c71e2898c776a5'
|
||||
'a5a9558ab8c206660b5e61d7a0805e78'
|
||||
'372611b19ea2bd9652706cf6e4e5fdad'
|
||||
'2e06d339b5216fb12bda8e986c48dc5c'
|
||||
'd1f88d7246a2049d2265fc1d9affa3cc'
|
||||
'91642c1f7cb4da6c0147a60d20ffd2d4'
|
||||
'0fd9213cb67b61a08e4e5c414a8b1199'
|
||||
'1bb1387de684f4c11c1c07df95b8a994'
|
||||
'e6c793b87285873ac882dda8b80fce0d'
|
||||
'0ec7e1c86d25b8d7623efa1b942dc2b1'
|
||||
'1f2848a4e572f0be29e7b704dcc9c98b'
|
||||
'd2f03b506d15c6888d0a9269a7b6fd1b'
|
||||
'6e754ac606c7ce7051b9da43283378e7'
|
||||
'76e800fe615ff86a023ee17bed346ffe'
|
||||
'e9033b7ef619a4f36a77f0b89764adf3'
|
||||
'62d764bb1e3a9cfe088e4cc01d862448'
|
||||
'c91d561284cf3ec11dccd0127fa4fc9b'
|
||||
'2b5b009af10ac715011fdd194532c2f6'
|
||||
'945f90dc7e42a5f05559bc0a7085c8a6'
|
||||
'da82f8f11315cfa5d1312988d283b6b1'
|
||||
'1b4edfd688ef9bfb1b1bccab9b8922e8'
|
||||
'23cda04f494c76bd0eb8575b24b05f26'
|
||||
'36cfb85d11164a489ab9616035827760'
|
||||
'e36f95bd1d0ffaf52046e584a7094b56'
|
||||
'dc979053d76c9c769aa5a2391523a52d'
|
||||
'03c9f2c8bdef2ef8fb42afcf47b46e05'
|
||||
'0f661078e789d307e0856ca0cb09fd15'
|
||||
'75926bb66e75c6d3158f4f4c5a74b59d'
|
||||
'58942deeaac6fabb63e51eaf2b3d65b6'
|
||||
'31ae582391c95d200b5337414e90da73'
|
||||
'dca0ab5e9a305f993ace0e519e6b6c4f'
|
||||
'1350a969b3b5c9c85c3524dd7be232e8'
|
||||
'f173518598f8c482ac946f5ff566a521'
|
||||
'6a761e17596562208cb6cd2ef6d413a2')
|
||||
'7e337b36b8e6e13416d7f49d372b57e7')
|
||||
|
||||
Reference in New Issue
Block a user